diff --git a/.editorconfig b/.editorconfig
index 2d877d20b825..6844b559c7b5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -89,6 +89,13 @@ trim_trailing_whitespace = unset
 end_of_line = unset
 insert_final_newline = unset
 
+# see https://manual.jule.dev/project/code-style.html#indentions
+[*.jule]
+indent_style = tab
+
+[jule.mod]
+insert_final_newline = unset
+
 # Keep this hint at the bottom:
 # Please don't add entries for subfolders here.
 # Create <subfolder>/.editorconfig instead.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 21b1a014d933..9685de407b97 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -193,6 +193,10 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
 # nixos/kanidm: inherit lib, nixfmt
 8f18393d380079904d072007fb19dc64baef0a3a
 
+# fetchgit, fetchurl, fetchzip:
+# format after refactoring with lib.extendMkDerivation (#455994)
+aeddd850c6d3485fc1af2edfb111e58141d18dc1
+
 # fetchhg: format after refactoring with lib.extendMkDerivation and make overridable (#423539)
 34a5b1eb23129f8fb62c677e3760903f6d43228f
 
@@ -300,3 +304,6 @@ f7611cad5154a9096faa26d156a4079577bfae17
 90e7159c559021ac4f4cc1222000f08a91feff69 # !autorebase nix-shell --run treefmt
 c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt
 91a8fee3aaf79348aa2dc1552a29fc1b786c5133 # !autorebase nix-shell --run treefmt
+
+# aliases: keep-sorted
+48ce0739044bd6eba83c3a43bd4ad1046399cdad # !autorebase nix-shell --run treefmt
diff --git a/.github/labeler-development-branches.yml b/.github/labeler-development-branches.yml
index 5ce799c2f8d4..bb1c47a23fa0 100644
--- a/.github/labeler-development-branches.yml
+++ b/.github/labeler-development-branches.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version is only run for Pull Requests from development branches like staging-next, haskell-updates or python-updates.
 
 "4.workflow: package set update":
diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 65d54e81a0b2..99d1b85c3c7b 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label
 
 # keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
@@ -29,5 +29,6 @@
               - .github/actions/*
               - .github/workflows/*
               - ci/**/*.*
+              - maintainers/github-teams.json
 
 # keep-sorted end
diff --git a/.github/labeler.yml b/.github/labeler.yml
index adfc49ef6ee2..abec7c37288c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version uses `sync-labels: true`, meaning that a non-match will remove the label
 
 # keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 2c739bd56129..4aed9617cae4 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -64,7 +64,7 @@ This results in a key with the following semantics:
 
 ## Required Status Checks
 
-The "Required Status Checks" branch ruleset is implemented in two top-level workflows: `pr.yml` and `merge-group.yml`.
+The "Required Status Checks" branch ruleset is implemented in two top-level workflows: `pull-request-target.yml` and `merge-group.yml`.
 
 The PR workflow defines all checks that need to succeed to add a Pull Request to the Merge Queue.
 If no Merge Queue is set up for a branch, the PR workflow defines the checks required to merge into the target branch.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index fc2b80041ce7..b08714a31f12 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -40,6 +40,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: true
 
       - name: Log current API rate limits
         env:
@@ -48,7 +49,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@ca4972adce8039ff995e618f5fc02d1b7961f27a # v3.3.0
+        uses: korthout/backport-action@d07416681cab29bf2661702f925f020aaa962997 # v3.4.1
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           copy_labels_pattern: 'severity:\ssecurity'
@@ -56,8 +57,9 @@ jobs:
           pull_description: |-
             Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
 
-            * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
-              * Even as a non-committer, if you find that it is not acceptable, leave a comment.
+            **Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).**
+
+            Even as a non-committer, if you find that it is not acceptable, leave a comment.
 
       - name: Log current API rate limits
         env:
diff --git a/.github/workflows/labels.yml b/.github/workflows/bot.yml
similarity index 90%
rename from .github/workflows/labels.yml
rename to .github/workflows/bot.yml
index 3e520139bc28..6366f666de13 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/bot.yml
@@ -3,11 +3,13 @@
 # access to the GitHub API. This means that it should not evaluate user input in
 # a way that allows code injection.
 
-name: Labels
+name: Bot
 
 on:
   schedule:
-    - cron: '07,17,27,37,47,57 * * * *'
+    # Run every 10m
+    # i.e., at each of the listed minutes, every hour
+    - cron: '05,15,25,35,45,55 * * * *'
   workflow_call:
     inputs:
       headBranch:
@@ -21,7 +23,7 @@ on:
 concurrency:
   # This explicitly avoids using `run_id` for the concurrency key to make sure that only
   # *one* scheduled run can run at a time.
-  group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
+  group: bot-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
   # PR-triggered runs will be cancelled, but scheduled runs will be queued.
   cancel-in-progress: ${{ github.event_name != 'schedule' }}
 
@@ -36,7 +38,7 @@ defaults:
     shell: bash
 
 jobs:
-  update:
+  run:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     env:
@@ -46,6 +48,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: |
             ci/github-script
 
@@ -59,7 +62,10 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-administration: read
+          permission-contents: write
           permission-issues: write
+          permission-members: read
           permission-pull-requests: write
 
       - name: Log current API rate limits
@@ -67,13 +73,13 @@ jobs:
           GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
 
-      - name: Labels from API data and Eval results
+      - name: Run bot
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
           script: |
-            require('./ci/github-script/labels.js')({
+            require('./ci/github-script/bot.js')({
               github,
               context,
               core,
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3f27b3e46538..701ac0b80b92 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ name: Build
 on:
   workflow_call:
     inputs:
+      artifact-prefix:
+        required: true
+        type: string
       baseBranch:
         required: true
         type: string
@@ -46,13 +49,14 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
@@ -97,7 +101,7 @@ jobs:
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
           contains(fromJSON(inputs.baseBranch).type, 'primary')
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
-          name: nixos-manual-${{ matrix.name }}
+          name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }}
           path: nixos-manual
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index cc36502c89cf..e317903c2f8d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: |
             ci/github-script
@@ -73,13 +74,15 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout merge and target commits
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
+          target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -90,7 +93,7 @@ jobs:
           pushFilter: -source$
 
       - name: Build codeowners validator
-        run: nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A codeownersValidator
+        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
 
       - name: Validate codeowners
         env:
diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
new file mode 100644
index 000000000000..d09df6956c8c
--- /dev/null
+++ b/.github/workflows/comment.yml
@@ -0,0 +1,54 @@
+name: Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
+permissions:
+  pull-requests: write
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  # The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
+  # pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
+  # a reaction to these comments.
+  react:
+    name: React with eyes
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 2
+    if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+
+      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
+          script: |
+            const { handleMergeComment } = require('./ci/github-script/merge.js')
+            const { body, node_id } = context.payload.comment
+
+            await handleMergeComment({
+              github,
+              body,
+              node_id,
+              reaction: 'EYES',
+            })
diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/dismissed-review.yml
deleted file mode 100644
index db5799c80913..000000000000
--- a/.github/workflows/dismissed-review.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-name: Dismissed review
-
-on:
-  workflow_run:
-    workflows:
-      - Review dismissed
-    types: [completed]
-
-concurrency:
-  group: dismissed-review-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-permissions:
-  pull-requests: write
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  # The `check-cherry-picks` workflow creates review comments which reviewers
-  # are encouraged to manually dismiss if they're not relevant.
-  # When a CI-generated review is dismissed, this job automatically minimizes
-  # it, preventing it from cluttering the PR.
-  minimize:
-    name: Minimize as resolved
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 2
-    steps:
-      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        with:
-          script: |
-            // PRs from forks don't have any PRs associated by default.
-            // Thus, we request the PR number with an API call *to* the fork's repo.
-            // Multiple pull requests can be open from the same head commit, either via
-            // different base branches or head branches.
-            const { head_repository, head_sha, repository } = context.payload.workflow_run
-            await Promise.all(
-              (await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
-                owner: head_repository.owner.login,
-                repo: head_repository.name,
-                commit_sha: head_sha
-              }))
-              .filter(pull_request => pull_request.base.repo.id == repository.id)
-              .map(async (pull_request) =>
-                Promise.all(
-                  (await github.paginate(github.rest.pulls.listReviews, {
-                    owner: context.repo.owner,
-                    repo: context.repo.repo,
-                    pull_number: pull_request.number
-                  })).filter(review =>
-                    review.user?.login == 'github-actions[bot]' &&
-                    review.state == 'DISMISSED'
-                  ).map(review => github.graphql(`
-                    mutation($node_id:ID!) {
-                      minimizeComment(input: {
-                        classifier: RESOLVED,
-                        subjectId: $node_id
-                      })
-                      { clientMutationId }
-                    }`,
-                    { node_id: review.node_id }
-                  ))
-                )
-              )
-            )
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index f2c7a2c13568..ccd58fe1e9a9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -3,6 +3,9 @@ name: Eval
 on:
   workflow_call:
     inputs:
+      artifact-prefix:
+        required: true
+        type: string
       mergedSha:
         required: true
         type: string
@@ -11,9 +14,6 @@ on:
       systems:
         required: true
         type: string
-      defaultVersion:
-        required: true
-        type: string
       testVersions:
         required: false
         default: false
@@ -37,6 +37,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: |
             ci/supportedVersions.nix
@@ -44,13 +45,14 @@ jobs:
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           ref: ${{ inputs.mergedSha }}
           path: untrusted
           sparse-checkout: |
             ci/pinned.json
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Load supported versions
         id: versions
@@ -87,6 +89,7 @@ jobs:
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Check out the PR at merged and target commits
         uses: ./.github/actions/checkout
@@ -95,7 +98,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -108,9 +111,9 @@ jobs:
       - name: Evaluate the ${{ matrix.system }} output paths at the merge commit
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-          MATRIX_VERSION: ${{ matrix.version || inputs.defaultVersion }}
+          MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
         run: |
-          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned  -A eval.singleSystem \
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
             --argstr nixPath "$MATRIX_VERSION" \
@@ -119,21 +122,29 @@ jobs:
           # Note: Keep the same further down in sync!
 
       - name: Evaluate the ${{ matrix.system }} output paths at the target commit
-        if: inputs.targetSha
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-          # This must match the default version set in the Merge Queue.
-          VERSION: lixPackageSets.latest.lix
-        # This is very quick, because it pulls the eval results from Cachix.
         run: |
-          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
+          TARGET_DRV=$(nix-instantiate nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
-            --argstr nixPath "$VERSION" \
-            --out-link target
+            --argstr nixPath "nixVersions.latest")
+
+          # Try to fetch this from Cachix a few times, for up to 30 seconds. This avoids running Eval
+          # twice in the Merge Queue, when a later item finishes Eval at the merge commit earlier.
+          for _i in {1..6}; do
+            # Using --max-jobs 0 will cause nix-build to fail if this can't be substituted from cachix.
+            if nix-build "$TARGET_DRV" --max-jobs 0; then
+              break
+            fi
+            sleep 5
+          done
+
+          # Either fetches from Cachix or runs Eval itself. The fallback is required
+          # for pull requests into wip-branches without merge queue.
+          nix-build "$TARGET_DRV" --out-link target
 
       - name: Compare outpaths against the target branch
-        if: inputs.targetSha
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
@@ -144,22 +155,22 @@ jobs:
             --out-link diff
 
       - name: Upload outpaths diff and stats
-        if: inputs.targetSha
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
-          name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
+          name: ${{ inputs.artifact-prefix }}${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
           path: diff/*
 
   compare:
     runs-on: ubuntu-24.04-arm
     needs: [eval]
-    if: inputs.targetSha && !cancelled() && !failure()
+    if: ${{ !cancelled() && !failure() }}
     permissions:
       statuses: write
     timeout-minutes: 5
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Check out the PR at the target commit
         uses: ./.github/actions/checkout
@@ -168,14 +179,14 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Download output paths and eval stats for all systems
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
-          pattern: diff-*
+          pattern: ${{ inputs.artifact-prefix }}diff-*
           path: diff
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Combine all output paths and eval stats
         run: |
@@ -183,26 +194,31 @@ jobs:
             --arg diffDir ./diff \
             --out-link combined
 
+      - name: Upload the maintainer list
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: ${{ inputs.artifact-prefix }}maintainers
+          path: combined/maintainers.json
+
       - name: Compare against the target branch
         env:
-          AUTHOR_ID: ${{ github.event.pull_request.user.id }}
+          TARGET_SHA: ${{ inputs.mergedSha }}
         run: |
-          git -C nixpkgs/trusted diff --name-only ${{ inputs.mergedSha }} \
+          git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
           nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \
             --arg combinedDir ./combined \
             --arg touchedFilesJson ./touched-files.json \
-            --argstr githubAuthorId "$AUTHOR_ID" \
             --out-link comparison
 
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
 
       - name: Upload the comparison results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
-          name: comparison
+          name: ${{ inputs.artifact-prefix }}comparison
           path: comparison/*
 
       - name: Add eval summary to commit statuses
@@ -242,7 +258,7 @@ jobs:
     needs: [versions, eval]
     steps:
       - name: Download output paths and eval stats for all versions
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           pattern: "*-diff-*"
           path: versions
@@ -250,6 +266,7 @@ jobs:
       - name: Add version comparison table to job summary
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
+          ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
           SYSTEMS: ${{ inputs.systems }}
           VERSIONS: ${{ needs.versions.outputs.versions }}
         with:
@@ -257,6 +274,7 @@ jobs:
             const { readFileSync } = require('node:fs')
             const path = require('node:path')
 
+            const prefix = process.env.ARTIFACT_PREFIX
             const systems = JSON.parse(process.env.SYSTEMS)
             const versions = JSON.parse(process.env.VERSIONS)
 
@@ -272,7 +290,7 @@ jobs:
                   [{ data: version }].concat(
                     systems.map((system) => {
                       try {
-                        const artifact = path.join('versions', `${version}-diff-${system}`)
+                        const artifact = path.join('versions', `${prefix}${version}-diff-${system}`)
                         const time = Math.round(
                           parseFloat(
                             readFileSync(
@@ -284,16 +302,11 @@ jobs:
                         const diff = JSON.parse(
                           readFileSync(path.join(artifact, system, 'diff.json'), 'utf-8'),
                         )
-                        const attrs = [].concat(
-                          diff.added,
-                          diff.removed,
-                          diff.changed,
-                          diff.rebuilds
-                        ).filter(attr =>
-                          // Exceptions related to dev shells, which changed at some time between 2.18 and 2.24.
-                          !attr.startsWith('tests.devShellTools.nixos.') &&
-                          !attr.startsWith('tests.devShellTools.unstructuredDerivationInputEnv.')
-                        )
+                        const attrs = []
+                          .concat(diff.added, diff.removed, diff.changed, diff.rebuilds)
+                          // There are some special attributes, which are ignored for rebuilds.
+                          // These only have a single path component, because they lack the `.<system>` suffix.
+                          .filter((attr) => attr.split('.').length > 1)
                         if (attrs.length > 0) {
                           core.setFailed(
                             `${version} on ${system} has changed outpaths!\nNote: Please make sure to update ci/pinned.json separately from changes to other packages.`,
@@ -328,6 +341,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
@@ -335,7 +349,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Run misc eval tasks in parallel
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 1858f463ad83..486dac20207c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -26,13 +26,14 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
       # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -60,13 +61,14 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -87,6 +89,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout merge and target commits
         uses: ./.github/actions/checkout
@@ -94,7 +97,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 6298aaa4424d..fe3d8fcc27d0 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -4,6 +4,9 @@ on:
   merge_group:
   workflow_call:
     inputs:
+      artifact-prefix:
+        required: true
+        type: string
       mergedSha:
         required: true
         type: string
@@ -24,6 +27,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: |
             ci/supportedSystems.json
 
@@ -53,10 +57,10 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
       mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
+      targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }}
       systems: ${{ needs.prepare.outputs.systems }}
-      # This must match the version in Eval's target step.
-      defaultVersion: lixPackageSets.latest.lix
 
   # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.
   # It "needs" all the jobs that should block the Merge Queue.
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 63e3dfd13887..481a54191349 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -43,4 +43,5 @@ jobs:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
     name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
-    secrets: inherit
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index 054ac713fe74..edd4cb0b2df6 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -42,4 +42,5 @@ jobs:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
     name: ${{ format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
-    secrets: inherit
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 04c80ae9735c..606c03866e6f 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -11,6 +11,9 @@ on:
         description: Target branch to merge into.
         required: true
         type: string
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY:
+        required: true
 
 defaults:
   run:
@@ -32,6 +35,8 @@ jobs:
           permission-pull-requests: write
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
 
       - name: Find merge base between two branches
         if: contains(inputs.from, ' ')
diff --git a/.github/workflows/pr.yml b/.github/workflows/pull-request-target.yml
similarity index 85%
rename from .github/workflows/pr.yml
rename to .github/workflows/pull-request-target.yml
index a9d40fcdcf5d..f74ce93de354 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -3,14 +3,15 @@ name: PR
 on:
   pull_request_target:
   workflow_call:
+    inputs:
+      artifact-prefix:
+        required: true
+        type: string
     secrets:
       CACHIX_AUTH_TOKEN:
         required: true
       NIXPKGS_CI_APP_PRIVATE_KEY:
         required: true
-      OWNER_APP_PRIVATE_KEY:
-        # The Test workflow should not actually request reviews from owners.
-        required: false
 
 concurrency:
   group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
@@ -34,12 +35,19 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script
       - id: prepare
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
+          retries: 10
+          # The default for this includes code 422, which happens regularly for us when comparing commits:
+          #   422 - Server Error: Sorry, this diff is taking too long to generate.
+          # Listing all other values from here to effectively remove 422:
+          #   https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14
+          retry-exempt-status-codes: 400,401,403,404
           script: |
             require('./ci/github-script/prepare.js')({
               github,
@@ -83,16 +91,16 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
       systems: ${{ needs.prepare.outputs.systems }}
-      defaultVersion: nixVersions.latest
       testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
 
-  labels:
-    name: Labels
+  bot:
+    name: Bot
     needs: [prepare, eval]
-    uses: ./.github/workflows/labels.yml
+    uses: ./.github/workflows/bot.yml
     permissions:
       issues: write
       pull-requests: write
@@ -101,16 +109,6 @@ jobs:
     with:
       headBranch: ${{ needs.prepare.outputs.headBranch }}
 
-  reviewers:
-    name: Reviewers
-    needs: [prepare, eval]
-    if: |
-      needs.prepare.outputs.targetSha &&
-      !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development')
-    uses: ./.github/workflows/reviewers.yml
-    secrets:
-      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-
   build:
     name: Build
     needs: [prepare]
@@ -118,6 +116,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
       baseBranch: ${{ needs.prepare.outputs.baseBranch }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
 
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
new file mode 100644
index 000000000000..44ac3f0088d4
--- /dev/null
+++ b/.github/workflows/review.yml
@@ -0,0 +1,92 @@
+name: Review
+
+on:
+  workflow_run:
+    workflows:
+      - Reviewed
+    types: [completed]
+
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
+permissions:
+  pull-requests: write
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  process:
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 2
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+
+      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
+          script: |
+            const { handleMergeComment } = require('./ci/github-script/merge.js')
+
+            // PRs from forks don't have any PRs associated by default.
+            // Thus, we request the PR number with an API call *to* the fork's repo.
+            // Multiple pull requests can be open from the same head commit, either via
+            // different base branches or head branches.
+            const { head_repository, head_sha, repository } = context.payload.workflow_run
+            await Promise.all(
+              (await github.paginate(github.rest.repos.listPullRequestsAssociatedWithCommit, {
+                owner: head_repository.owner.login,
+                repo: head_repository.name,
+                commit_sha: head_sha
+              }))
+              .filter(pull_request => pull_request.base.repo.id == repository.id)
+              .map(async (pull_request) =>
+                Promise.all(
+                  (await github.paginate(github.rest.pulls.listReviews, {
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: pull_request.number
+                  })).map(review => {
+                    // The `check` workflow creates review comments which reviewers
+                    // are encouraged to manually dismiss if they're not relevant.
+                    // When a CI-generated review is dismissed, this job automatically minimizes
+                    // it, preventing it from cluttering the PR.
+                    if (review.user?.login == 'github-actions[bot]' && review.state == 'DISMISSED')
+                      return github.graphql(`
+                        mutation($node_id:ID!) {
+                          minimizeComment(input: {
+                            classifier: RESOLVED,
+                            subjectId: $node_id
+                          })
+                          { clientMutationId }
+                        }`,
+                        { node_id: review.node_id }
+                      )
+
+                    // The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
+                    // pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
+                    // a reaction to these comments.
+                    return handleMergeComment({
+                      github,
+                      body: review.body,
+                      node_id: review.node_id,
+                      reaction: 'EYES',
+                    })
+                  })
+                )
+              )
+            )
diff --git a/.github/workflows/review-dismissed.yml b/.github/workflows/reviewed.yml
similarity index 81%
rename from .github/workflows/review-dismissed.yml
rename to .github/workflows/reviewed.yml
index 988b4a47df14..d7d368739eaa 100644
--- a/.github/workflows/review-dismissed.yml
+++ b/.github/workflows/reviewed.yml
@@ -1,8 +1,8 @@
-name: Review dismissed
+name: Reviewed
 
 on:
   pull_request_review:
-    types: [dismissed]
+    types: [submitted, dismissed]
 
 permissions: {}
 
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
deleted file mode 100644
index 32290c179130..000000000000
--- a/.github/workflows/reviewers.yml
+++ /dev/null
@@ -1,170 +0,0 @@
-# This workflow will request reviews from the maintainers of each package
-# listed in the PR's most recent eval comparison artifact.
-
-name: Reviewers
-
-on:
-  pull_request_target:
-    types: [ready_for_review]
-  workflow_call:
-    secrets:
-      OWNER_APP_PRIVATE_KEY:
-        required: true
-
-concurrency:
-  group: reviewers-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  request:
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 20
-    steps:
-      - name: Check out the PR at the base commit
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          path: trusted
-          sparse-checkout: ci
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@7ab6e7fd29da88e74b1e314a4ae9ac6b5cda3801 # v31
-
-      - name: Build the requestReviews derivation
-        run: nix-build trusted/ci -A requestReviews
-
-      # For requesting reviewers, this job depends on a GitHub App with the following permissions:
-      # - Permissions:
-      #   - Repository > Administration: read-only
-      #   - Organization > Members: read-only
-      #   - Repository > Pull Requests: read-write
-      # - Install App on this repository, setting these variables:
-      #   - OWNER_APP_ID (variable)
-      #   - OWNER_APP_PRIVATE_KEY (secret)
-      #
-      # Can't use the token received from permissions above, because it can't get enough permissions.
-      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
-        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_APP_ID }}
-          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-          permission-administration: read
-          permission-members: read
-          permission-pull-requests: write
-
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Requesting code owner reviews
-        if: steps.app-token.outputs.token
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-          # Don't do anything on draft PRs
-          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: result/bin/request-code-owner-reviews.sh "$REPOSITORY" "$NUMBER" ci/OWNERS
-
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      # In the regular case, this workflow is called via workflow_call from the eval workflow directly.
-      # In the more special case, when a PR is undrafted an eval run will have started already.
-      - name: Wait for comparison to be done
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        id: eval
-        with:
-          script: |
-            const run_id = (await github.rest.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: context.eventName === 'pull_request' ? 'test.yml' : 'pr.yml',
-              event: context.eventName,
-              head_sha: context.payload.pull_request.head.sha
-            })).data.workflow_runs[0].id
-
-            core.setOutput('run-id', run_id)
-
-            // Waiting 120 * 5 sec = 10 min. max.
-            // The extreme case is an Eval run that just started when the PR is undrafted.
-            // Eval takes max 5-6 minutes, normally.
-            for (let i = 0; i < 120; i++) {
-              const result = await github.rest.actions.listWorkflowRunArtifacts({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                run_id,
-                name: 'comparison'
-              })
-              if (result.data.total_count > 0) return
-              await new Promise(resolve => setTimeout(resolve, 5000))
-            }
-            throw new Error("No comparison artifact found.")
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Download the comparison results
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
-        with:
-          run-id: ${{ steps.eval.outputs.run-id }}
-          github-token: ${{ github.token }}
-          pattern: comparison
-          path: comparison
-          merge-multiple: true
-
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Requesting maintainer reviews
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-          AUTHOR: ${{ github.event.pull_request.user.login }}
-          # Don't request reviewers on draft PRs
-          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: |
-          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
-          # There appears to be no API to request reviews based on GitHub IDs
-          jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
-
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml
new file mode 100644
index 000000000000..b848983b5aa2
--- /dev/null
+++ b/.github/workflows/teams.yml
@@ -0,0 +1,79 @@
+name: Teams
+
+on:
+  schedule:
+    # Every Tuesday at 19:42 (randomly chosen)
+    - cron: '42 19 * * 1'
+  workflow_dispatch:
+
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  sync:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      # Use a GitHub App to create the PR so that CI gets triggered and to
+      # request team member lists.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-administration: read
+          permission-contents: write
+          permission-members: read
+          permission-pull-requests: write
+
+      - name: Fetch source
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+            maintainers/github-teams.json
+
+      - name: Install dependencies
+        run: npm install bottleneck
+
+      - name: Synchronise teams
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.app-token.outputs.token }}
+          script: |
+            require('./ci/github-script/get-teams.js')({
+              github,
+              context,
+              core,
+              outFile: "maintainers/github-teams.json"
+            })
+
+      - name: Get GitHub App User Git String
+        id: user
+        env:
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          APP_SLUG: ${{ steps.app-token.outputs.app-slug }}
+        run: |
+          name="${APP_SLUG}[bot]"
+          userId=$(gh api "/users/$name" --jq .id)
+          email="$userId+$name@users.noreply.github.com"
+          echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT"
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        with:
+          token: ${{ steps.app-token.outputs.token }}
+          add-paths: maintainers/github-teams.json
+          author: ${{ steps.user.outputs.git-string }}
+          committer: ${{ steps.user.outputs.git-string }}
+          commit-message: "maintainers/github-teams.json: Automated sync"
+          branch: pr/github-team-sync
+          title: "maintainers/github-teams.json: Automated sync"
+          body: |
+            This is an automated PR to sync the GitHub teams with access to this repository to the `lib.teams` list.
+
+            This PR can be merged without taking any further action.
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0d5f20e3b57b..727a9f965845 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,12 +21,19 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script
       - id: prepare
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
+          retries: 10
+          # The default for this includes code 422, which happens regularly for us when comparing commits:
+          #   422 - Server Error: Sorry, this diff is taking too long to generate.
+          # Listing all other values from here to effectively remove 422:
+          #   https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14
+          retry-exempt-status-codes: 400,401,403,404
           script: |
             require('./ci/github-script/prepare.js')({
               github,
@@ -56,14 +63,16 @@ jobs:
 
             if (files.some(file => [
               '.github/actions/checkout/action.yml',
+              '.github/workflows/bot.yml',
               '.github/workflows/build.yml',
               '.github/workflows/check.yml',
               '.github/workflows/eval.yml',
-              '.github/workflows/labels.yml',
               '.github/workflows/lint.yml',
-              '.github/workflows/pr.yml',
-              '.github/workflows/reviewers.yml',
+              '.github/workflows/pull-request-target.yml',
               '.github/workflows/test.yml',
+              'ci/github-script/bot.js',
+              'ci/github-script/merge.js',
+              'ci/github-script/withRateLimit.js',
             ].includes(file))) core.setOutput('pr', true)
 
   merge-group:
@@ -77,6 +86,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: mg-
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
 
@@ -84,7 +94,7 @@ jobs:
     if: needs.prepare.outputs.pr
     name: PR
     needs: [prepare]
-    uses: ./.github/workflows/pr.yml
+    uses: ./.github/workflows/pull-request-target.yml
     # Those are actually only used on the pull_request_target event, but will throw an error if not set.
     permissions:
       issues: write
@@ -93,3 +103,5 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+    with:
+      artifact-prefix: pr-
diff --git a/.github/zizmor.yml b/.github/zizmor.yml
new file mode 100644
index 000000000000..f1b71580ebca
--- /dev/null
+++ b/.github/zizmor.yml
@@ -0,0 +1,12 @@
+# This file defines the ignore rules for zizmor.
+#
+# For rules that contain a high number of false positives, prefer listing them here
+# instead of adding ignore comments. Note that zizmor cannot ignore by line-within-a-string, so
+# there are some ignore items that encompass multiple problems within one `run` block. An issue
+# tracking this is at https://github.com/woodruffw/zizmor/issues/648.
+#
+# For more info, see the documentation: https://woodruffw.github.io/zizmor/usage/#ignoring-results
+
+rules:
+  dangerous-triggers:
+    disable: true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7a59925f5b0..d86cafd010fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -430,7 +430,7 @@ gitGraph
 
 Here's an overview of the different branches:
 
-| branch | `master` | `staging-next` | `staging` | [`staging-nixos`](#test-driver-rebuild) |
+| branch | `master` | `staging-next` | `staging` | [`staging-nixos`][test-driver-rebuild] |
 | --- | --- | --- | --- | --- |
 | Used for development | ✔️ | ❌ | ✔️ | ✔️ |
 | Built by Hydra | ✔️ | ✔️ | ❌ | ❌ |
@@ -501,7 +501,7 @@ Please note that changes to the Linux kernel are an exception to this rule.
 These PRs go to `staging-nixos`, see [the next section for more context](#changes-rebuilding-all-tests).
 
 ### Changes rebuilding all NixOS tests
-[test-driver-rebuild]: #changes-rebuilding-all-tests
+[test-driver-rebuild]: #changes-rebuilding-all-nixos-tests
 
 Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
 These changes pose a significant impact on the build infrastructure.
diff --git a/ci/OWNERS b/ci/OWNERS
index c21cb14fe11e..6edaa4beab9d 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -32,6 +32,8 @@
 /lib/asserts.nix            @infinisil @hsjobeki @Profpatsch
 /lib/path/*                 @infinisil @hsjobeki
 /lib/fileset                @infinisil @hsjobeki
+/maintainers/github-teams.json @infinisil
+/maintainers/computed-team-list.nix @infinisil
 ## Standard environment–related libraries
 /lib/customisation.nix      @alyssais @NixOS/stdenv
 /lib/derivations.nix        @alyssais @NixOS/stdenv
@@ -56,7 +58,8 @@
 /pkgs/top-level/by-name-overlay.nix              @infinisil @philiptaron
 /pkgs/stdenv                                     @philiptaron @NixOS/stdenv
 /pkgs/stdenv/generic                             @Ericson2314 @NixOS/stdenv
-/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @NixOS/stdenv
+/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @adisbladis @NixOS/stdenv
+/pkgs/stdenv/generic/meta-types.nix              @adisbladis @NixOS/stdenv
 /pkgs/stdenv/cross                               @Ericson2314 @NixOS/stdenv
 /pkgs/build-support                              @philiptaron
 /pkgs/build-support/cc-wrapper                   @Ericson2314
@@ -212,10 +215,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 /pkgs/development/r-modules         @jbedo
 
 # Rust
-/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt @figsoda
-/pkgs/build-support/rust @zowoq @winterqt @figsoda
+/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt
+/pkgs/build-support/rust @zowoq @winterqt
 /pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt
-/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
+/doc/languages-frameworks/rust.section.md @zowoq @winterqt
 
 # Tcl
 /pkgs/development/interpreters/tcl  @fgaz
@@ -341,7 +344,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/top-level/agda-packages.nix         @NixOS/agda
 /pkgs/development/libraries/agda          @NixOS/agda
 /doc/languages-frameworks/agda.section.md @NixOS/agda
-/nixos/tests/agda.nix                     @NixOS/agda
+/nixos/tests/agda                         @NixOS/agda
 
 # Idris
 /pkgs/development/idris-modules @Infinisil
@@ -444,8 +447,8 @@ pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
 /pkgs/os-specific/linux/zfs              @adamcstephens @amarshall
 
 # Zig
-/pkgs/development/compilers/zig @figsoda @RossComputerGuy
-/doc/hooks/zig.section.md       @figsoda @RossComputerGuy
+/pkgs/development/compilers/zig @RossComputerGuy
+/doc/hooks/zig.section.md       @RossComputerGuy
 
 # Buildbot
 nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
diff --git a/ci/README.md b/ci/README.md
index 797f231aea62..df5b196c49a4 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -10,6 +10,53 @@ In order to ensure that the needed packages are generally available without buil
 
 Run [`update-pinned.sh`](./update-pinned.sh) to update it.
 
+## GitHub specific code
+
+Some of the code is specific to GitHub.
+This code is currently spread out over multiple places and written in both Bash and JavaScript.
+The goal is to eventually have all GitHub specific code in `ci/github-script` and written in JavaScript via `actions/github-script`.
+A lot of code has already been migrated, but some Bash code still remains.
+New CI features need to be introduced in JavaScript, not Bash.
+
+## Nixpkgs merge bot
+
+The Nixpkgs merge bot empowers package maintainers by enabling them to merge PRs related to their own packages.
+It serves as a bridge for maintainers to quickly respond to user feedback, facilitating a more self-reliant approach.
+Especially when considering there are roughly 20 maintainers for every committer, this bot is a game-changer.
+
+Following [RFC 172] the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js).
+
+### Using the merge bot
+
+To merge a PR, maintainers can simply comment:
+```gfm
+@NixOS/nixpkgs-merge-bot merge
+```
+
+The next time the bot runs it will verify the below constraints, then (if satisfied) merge the PR.
+
+The merge bot will reference [#306934](https://github.com/NixOS/nixpkgs/issues/306934) on PRs it merges successfully, [#305350](https://github.com/NixOS/nixpkgs/issues/305350) for unsuccessful attempts, or [#371492](https://github.com/NixOS/nixpkgs/issues/371492) if an error occurs.
+These issues effectively list PRs the merge bot has interacted with.
+
+### Merge bot constraints
+
+To ensure security and a focused utility, the bot adheres to specific limitations:
+
+- The PR targets one of the [development branches](#branch-classification).
+- The PR only touches files of packages located under `pkgs/by-name/*`.
+- The PR is either:
+  - approved by a [committer][@NixOS/nixpkgs-committers].
+  - backported via label.
+  - opened by a [committer][@NixOS/nixpkgs-committers].
+  - opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
+- The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
+- The user attempting to merge is a maintainer of all packages touched by the PR.
+
+### Approving merge bot changes
+
+Changes to the bot can usually be approved by the [@NixOS/nixpkgs-ci] team, as with other CI changes.
+However, additional acknowledgement from the [@NixOS/nixpkgs-core] team is required for changes to what the merge bot will merge, who is eligible to use the merge bot, or similar changes in scope.
+
 ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
 
 Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does.
@@ -50,3 +97,10 @@ Some branches also have a version component, which is either `unstable` or `YY.M
 `ci/supportedBranches.js` is a script imported by CI to classify the base and head branches of a Pull Request.
 This classification will then be used to skip certain jobs.
 This script can also be run locally to print basic test cases.
+
+
+[@NixOS/nixpkgs-maintainers]: https://github.com/orgs/NixOS/teams/nixpkgs-maintainers
+[@NixOS/nixpkgs-committers]: https://github.com/orgs/NixOS/teams/nixpkgs-committers
+[@NixOS/nixpkgs-ci]: https://github.com/orgs/NixOS/teams/nixpkgs-ci
+[@NixOS/nixpkgs-core]: https://github.com/orgs/NixOS/teams/nixpkgs-core
+[RFC 172]: https://github.com/NixOS/rfcs/pull/172
diff --git a/ci/default.nix b/ci/default.nix
index 7b7424f4f5be..8712a44e0584 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -49,6 +49,8 @@ let
 
         programs.biome = {
           enable = true;
+          # Disable settings validation because its inputs are liable to hash mismatch
+          validate.enable = false;
           settings.formatter = {
             useEditorconfig = true;
           };
@@ -136,6 +138,8 @@ let
             [ "--config=${config}" ];
           includes = [ "*.md" ];
         };
+
+        programs.zizmor.enable = true;
       };
       fs = pkgs.lib.fileset;
       nixFilesSrc = fs.toSource {
@@ -152,7 +156,6 @@ let
 in
 rec {
   inherit pkgs fmt;
-  requestReviews = pkgs.callPackage ./request-reviews { };
   codeownersValidator = pkgs.callPackage ./codeowners-validator { };
 
   # FIXME(lf-): it might be useful to test other Nix implementations
diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index 6938e5dfe3cb..ff1bdabbb350 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -18,6 +18,7 @@
   lib ? import (path + "/lib"),
   trace ? false,
   path ? ./../..,
+  extraNixpkgsConfigJson ? "{}",
 }:
 let
 
@@ -46,6 +47,7 @@ let
 
   outpaths = import ./outpaths.nix {
     inherit path;
+    extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
     attrNamesOnly = true;
   };
 
diff --git a/ci/eval/chunk.nix b/ci/eval/chunk.nix
index 43c684074602..e1759c2c6615 100644
--- a/ci/eval/chunk.nix
+++ b/ci/eval/chunk.nix
@@ -8,6 +8,7 @@
   myChunk,
   includeBroken,
   systems,
+  extraNixpkgsConfigJson,
 }:
 
 let
@@ -17,6 +18,7 @@ let
   unfiltered = import ./outpaths.nix {
     inherit path;
     inherit includeBroken systems;
+    extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
   };
 
   # Turns the unfiltered recursive attribute set into one that is limited to myAttrpaths
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 3a025a0238f6..9791d26e9550 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -7,6 +7,7 @@
   python3,
   stdenvNoCC,
   makeWrapper,
+  codeowners,
 }:
 let
   python = python3.withPackages (ps: [
@@ -48,8 +49,7 @@ in
 {
   combinedDir,
   touchedFilesJson,
-  githubAuthorId,
-  byName ? false,
+  ownersFile ? ../../OWNERS,
 }:
 let
   # Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
@@ -156,23 +156,19 @@ let
                 # Only set this label when no other label with indication for staging has been set.
                 # This avoids confusion whether to target staging or batch this with kernel updates.
                 lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;
-            # Set the "11.by: package-maintainer" label to whether all packages directly
-            # changed are maintained by the PR's author.
-            "11.by: package-maintainer" =
-              maintainers ? ${githubAuthorId}
-              && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (
-                lib.flatten (lib.attrValues maintainers)
-              );
           };
       }
     );
 
-  maintainers = callPackage ./maintainers.nix { } {
-    changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
-    changedpathsjson = touchedFilesJson;
-    removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
-    inherit byName;
-  };
+  inherit
+    (callPackage ./maintainers.nix { } {
+      changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
+      changedpathsjson = touchedFilesJson;
+      removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
+    })
+    maintainers
+    packages
+    ;
 in
 runCommand "compare"
   {
@@ -180,9 +176,14 @@ runCommand "compare"
     nativeBuildInputs = map lib.getBin [
       jq
       cmp-stats
+      codeowners
     ];
     maintainers = builtins.toJSON maintainers;
-    passAsFile = [ "maintainers" ];
+    packages = builtins.toJSON packages;
+    passAsFile = [
+      "maintainers"
+      "packages"
+    ];
   }
   ''
     mkdir $out
@@ -224,5 +225,43 @@ runCommand "compare"
       } >> $out/step-summary.md
     fi
 
+    jq -r '.[]' "${touchedFilesJson}" > ./touched-files
+    readarray -t touchedFiles < ./touched-files
+    echo "This PR touches ''${#touchedFiles[@]} files"
+
+    # TODO: Move ci/OWNERS to Nix and produce owners.json instead of owners.txt.
+    touch "$out/owners.txt"
+    for file in "''${touchedFiles[@]}"; do
+        result=$(codeowners --file "${ownersFile}" "$file")
+
+        # Remove the file prefix and trim the surrounding spaces
+        read -r owners <<< "''${result#"$file"}"
+        if [[ "$owners" == "(unowned)" ]]; then
+            echo "File $file is unowned"
+            continue
+        fi
+        echo "File $file is owned by $owners"
+
+        # Split up multiple owners, separated by arbitrary amounts of spaces
+        IFS=" " read -r -a entries <<< "$owners"
+
+        for entry in "''${entries[@]}"; do
+            # GitHub technically also supports Emails as code owners,
+            # but we can't easily support that, so let's not
+            if [[ ! "$entry" =~ @(.*) ]]; then
+                echo -e "\e[33mCodeowner \"$entry\" for file $file is not valid: Must start with \"@\"\e[0m"
+                # Don't fail, because the PR for which this script runs can't fix it,
+                # it has to be fixed in the base branch
+                continue
+            fi
+            # The first regex match is everything after the @
+            entry=''${BASH_REMATCH[1]}
+
+            echo "$entry" >> "$out/owners.txt"
+        done
+
+    done
+
     cp "$maintainersPath" "$out/maintainers.json"
+    cp "$packagesPath" "$out/packages.json"
   ''
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index c3caf7403784..7f945f2c387f 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -5,33 +5,52 @@
   changedattrs,
   changedpathsjson,
   removedattrs,
-  byName ? false,
 }:
 let
   pkgs = import ../../.. {
     system = "x86_64-linux";
-    config = { };
-    overlays = [ ];
+    # We should never try to ping maintainers through package aliases, this can only lead to errors.
+    # One example case is, where an attribute is a throw alias, but then re-introduced in a PR.
+    # This would trigger the throw. By disabling aliases, we can fallback gracefully below.
+    config.allowAliases = false;
   };
 
-  changedpaths = builtins.fromJSON (builtins.readFile changedpathsjson);
+  changedpaths = lib.importJSON changedpathsjson;
 
-  anyMatchingFile =
-    filename: builtins.any (changed: lib.strings.hasSuffix changed filename) changedpaths;
+  # Extract attributes that changed from by-name paths.
+  # This allows pinging reviewers for pure refactors.
+  touchedattrs = lib.pipe changedpaths [
+    (lib.filter (changed: lib.hasPrefix "pkgs/by-name/" changed))
+    (map (lib.splitString "/"))
+    (map (path: lib.elemAt path 3))
+    lib.unique
+  ];
 
-  anyMatchingFiles = files: builtins.any anyMatchingFile files;
+  anyMatchingFile = filename: lib.any (lib.hasPrefix filename) changedpaths;
 
-  attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs) [
+  anyMatchingFiles = files: lib.any anyMatchingFile files;
+
+  sharded = name: "${lib.substring 0 2 name}/${name}";
+
+  attrsWithMaintainers = lib.pipe (changedattrs ++ removedattrs ++ touchedattrs) [
+    # An attribute can appear in changed/removed *and* touched
+    lib.unique
     (map (
       name:
       let
+        path = lib.splitString "." name;
         # Some packages might be reported as changed on a different platform, but
         # not even have an attribute on the platform the maintainers are requested on.
         # Fallback to `null` for these to filter them out below.
-        package = lib.attrByPath (lib.splitString "." name) null pkgs;
+        package = lib.attrByPath path null pkgs;
       in
       {
         inherit name package;
+        # Adds all files in by-name to each package, no matter whether they are discoverable
+        # via meta attributes below. For example, this allows pinging maintainers for
+        # updates to .json files.
+        # TODO: Support by-name package sets.
+        filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/";
         # TODO: Refactor this so we can ping entire teams instead of the individual members.
         # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
         maintainers = package.meta.maintainers or [ ];
@@ -40,25 +59,21 @@ let
     # No need to match up packages without maintainers with their files.
     # This also filters out attributes where `packge = null`, which is the
     # case for libintl, for example.
-    (builtins.filter (pkg: pkg.maintainers != [ ]))
+    (lib.filter (pkg: pkg.maintainers != [ ]))
   ];
 
   relevantFilenames =
     drv:
-    (lib.lists.unique (
-      map (pos: lib.strings.removePrefix (toString ../..) pos.file) (
-        builtins.filter (x: x != null) [
-          ((drv.meta or { }).maintainersPosition or null)
-          ((drv.meta or { }).teamsPosition or null)
-          (builtins.unsafeGetAttrPos "src" drv)
-          # broken because name is always set by stdenv:
-          #    # A hack to make `nix-env -qa` and `nix search` ignore broken packages.
-          #    # TODO(@oxij): remove this assert when something like NixOS/nix#1771 gets merged into nix.
-          #    name = assert validity.handled; name + lib.optionalString
-          #(builtins.unsafeGetAttrPos "name" drv)
-          (builtins.unsafeGetAttrPos "pname" drv)
-          (builtins.unsafeGetAttrPos "version" drv)
-
+    (lib.unique (
+      map (pos: lib.removePrefix "${toString ../../..}/" pos.file) (
+        lib.filter (x: x != null) [
+          (drv.meta.maintainersPosition or null)
+          (drv.meta.teamsPosition or null)
+          (lib.unsafeGetAttrPos "src" drv)
+          (lib.unsafeGetAttrPos "pname" drv)
+          (lib.unsafeGetAttrPos "version" drv)
+        ]
+        ++ lib.optionals (drv ? meta.position) [
           # Use ".meta.position" for cases when most of the package is
           # defined in a "common" section and the only place where
           # reference to the file with a derivation the "pos"
@@ -68,16 +83,16 @@ let
           #   "pkgs/tools/package-management/nix/default.nix:155"
           # We transform it to the following:
           #   { file = "pkgs/tools/package-management/nix/default.nix"; }
-          { file = lib.head (lib.splitString ":" (drv.meta.position or "")); }
+          { file = lib.head (lib.splitString ":" drv.meta.position); }
         ]
       )
     ));
 
   attrsWithFilenames = map (
-    pkg: pkg // { filenames = relevantFilenames pkg.package; }
+    pkg: pkg // { filenames = pkg.filenames ++ relevantFilenames pkg.package; }
   ) attrsWithMaintainers;
 
-  attrsWithModifiedFiles = builtins.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
+  attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
 
   listToPing = lib.concatMap (
     pkg:
@@ -89,10 +104,10 @@ let
     }) pkg.maintainers
   ) attrsWithModifiedFiles;
 
-  byMaintainer = lib.groupBy (ping: toString ping.${if byName then "github" else "id"}) listToPing;
-
-  packagesPerMaintainer = lib.attrsets.mapAttrs (
-    maintainer: packages: map (pkg: pkg.packageName) packages
-  ) byMaintainer;
+  byMaintainer = lib.groupBy (ping: toString ping.id) listToPing;
 in
-packagesPerMaintainer
+{
+  maintainers = lib.mapAttrs (_: lib.catAttrs "packageName") byMaintainer;
+
+  packages = lib.catAttrs "packageName" listToPing;
+}
diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 65a558d8be60..969622ee16f1 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -22,7 +22,7 @@ rec {
       splittedPath = lib.splitString "." packagePlatformPath;
 
       # ["python312Packages" "numpy" "aarch64-linux"] -> ["python312Packages" "numpy"]
-      packagePath = lib.sublist 0 (lib.length splittedPath - 1) splittedPath;
+      packagePath = lib.init splittedPath;
 
       # "python312Packages.numpy"
       name = lib.concatStringsSep "." packagePath;
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index c7310a5052d0..b8d3d3224a04 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -19,6 +19,17 @@
   nix,
 }:
 
+{
+  # The number of attributes per chunk, see ./README.md for more info.
+  chunkSize ? 5000,
+  # Whether to just evaluate a single chunk for quick testing
+  quickTest ? false,
+  # Don't try to eval packages marked as broken.
+  includeBroken ? false,
+  # Customize the config used to evaluate nixpkgs
+  extraNixpkgsConfig ? { },
+}:
+
 let
   nixpkgs =
     with lib.fileset;
@@ -66,6 +77,7 @@ let
             "$src/ci/eval/attrpaths.nix" \
             -A paths \
             -I "$src" \
+            --argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
             --option restrict-eval true \
             --option allow-import-from-derivation false \
             --option eval-system "${evalSystem}" > $out/paths.json
@@ -79,13 +91,6 @@ let
       evalSystem ? builtins.currentSystem,
       # The path to the `paths.json` file from `attrpathsSuperset`
       attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
-      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize ? 5000,
-
-      # Don't try to eval packages marked as broken.
-      includeBroken ? false,
-      # Whether to just evaluate a single chunk for quick testing
-      quickTest ? false,
     }:
     let
       singleChunk = writeShellScript "single-chunk" ''
@@ -95,6 +100,10 @@ let
         system=$3
         outputDir=$4
 
+        # Default is 5, higher values effectively disable the warning.
+        # This randomly breaks Eval.
+        export GC_LARGE_ALLOC_WARN_INTERVAL=1000
+
         export NIX_SHOW_STATS=1
         export NIX_SHOW_STATS_PATH="$outputDir/stats/$myChunk"
         echo "Chunk $myChunk on $system start"
@@ -107,12 +116,14 @@ let
           --option allow-import-from-derivation false \
           --query --available \
           --out-path --json \
+          --meta \
           --show-trace \
           --arg chunkSize "$chunkSize" \
           --arg myChunk "$myChunk" \
           --arg attrpathFile "${attrpathFile}" \
           --arg systems "[ \"$system\" ]" \
           --arg includeBroken ${lib.boolToString includeBroken} \
+          --argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
           -I ${nixpkgs} \
           -I ${attrpathFile} \
           > "$outputDir/result/$myChunk" \
@@ -200,6 +211,7 @@ let
         fi
 
         cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json
+        cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.meta)' > $out/${evalSystem}/meta.json
       '';
 
   diff = callPackage ./diff.nix { };
@@ -228,6 +240,14 @@ let
           })
         ' > $out/combined-diff.json
 
+        # Combine maintainers from all systems
+        cat ${diffDir}/*/maintainers.json | jq -s '
+          add | group_by(.package) | map({
+            key: .[0].package,
+            value: map(.maintainers) | flatten | unique
+          }) | from_entries
+        ' > $out/maintainers.json
+
         mkdir -p $out/before/stats
         for d in ${diffDir}/before/*; do
           cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d")
@@ -245,16 +265,13 @@ let
     {
       # Whether to evaluate on a specific set of systems, by default all are evaluated
       evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
-      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize ? 5000,
-      quickTest ? false,
     }:
     symlinkJoin {
       name = "nixpkgs-eval-baseline";
       paths = map (
         evalSystem:
         singleSystem {
-          inherit quickTest evalSystem chunkSize;
+          inherit evalSystem;
         }
       ) evalSystems;
     };
@@ -263,13 +280,7 @@ let
     {
       # Whether to evaluate on a specific set of systems, by default all are evaluated
       evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
-      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize ? 5000,
-      quickTest ? false,
       baseline,
-      # Which maintainer should be considered the author?
-      # Defaults to nixpkgs-ci which is not a maintainer and skips the check.
-      githubAuthorId ? "nixpkgs-ci",
       # What files have been touched? Defaults to none; use the expression below to calculate it.
       # ```
       # git diff --name-only --merge-base master HEAD \
@@ -286,14 +297,14 @@ let
             inherit evalSystem;
             beforeDir = baseline;
             afterDir = singleSystem {
-              inherit quickTest evalSystem chunkSize;
+              inherit evalSystem;
             };
           }
         ) evalSystems;
       };
       comparisonReport = compare {
         combinedDir = combine { diffDir = diffs; };
-        inherit touchedFilesJson githubAuthorId;
+        inherit touchedFilesJson;
       };
     in
     comparisonReport;
diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
index 692e2ec60194..bb8ba8088c7f 100644
--- a/ci/eval/diff.nix
+++ b/ci/eval/diff.nix
@@ -76,11 +76,36 @@ let
   afterAttrs = getAttrs after;
   diffAttrs = diff beforeAttrs afterAttrs;
   diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
+
+  # The maintainer list is not diffed, but just taken as is, to provide a map
+  # of maintainers on the target branch. A list of GitHub IDs is sufficient for
+  # all our purposes and reduces size massively.
+  meta = lib.importJSON "${after}/${evalSystem}/meta.json";
+  maintainers = lib.pipe meta [
+    (lib.mapAttrsToList (
+      k: v: {
+        # splits off the platform suffix
+        package = lib.pipe k [
+          (lib.splitString ".")
+          lib.init
+          (lib.concatStringsSep ".")
+        ];
+        maintainers = map (m: m.githubId) v.maintainers or [ ];
+      }
+    ))
+    # Some paths don't have a platform suffix, those will appear with an empty package here.
+    (lib.filter ({ package, maintainers }: package != "" && maintainers != [ ]))
+  ];
+  maintainersJson = writeText "maintainers.json" (builtins.toJSON maintainers);
 in
 runCommand "diff" { } ''
   mkdir -p $out/${evalSystem}
 
-  cp -r ${before} $out/before
-  cp -r ${after} $out/after
+  cp -r --no-preserve=mode ${before} $out/before
+  cp -r --no-preserve=mode ${after} $out/after
+  # JSON files will be processed above explicitly, so avoid copying over
+  # the source files to keep the artifacts smaller.
+  find $out/before $out/after -iname '*.json' -delete
   cp ${diffJson} $out/${evalSystem}/diff.json
+  cp ${maintainersJson} $out/${evalSystem}/maintainers.json
 ''
diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix
index 6d003dafc3c9..9abe08e1b165 100644
--- a/ci/eval/outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -11,6 +11,9 @@
 
   # Set this to `null` to build for builtins.currentSystem only
   systems ? builtins.fromJSON (builtins.readFile ../supportedSystems.json),
+
+  # Customize the config used to evaluate nixpkgs
+  extraNixpkgsConfig ? { },
 }:
 let
   lib = import (path + "/lib");
@@ -55,7 +58,8 @@ let
                 true;
 
             inHydra = true;
-          };
+          }
+          // extraNixpkgsConfig;
 
           __allowFileset = false;
         };
diff --git a/ci/github-script/labels.js b/ci/github-script/bot.js
similarity index 58%
rename from ci/github-script/labels.js
rename to ci/github-script/bot.js
index faf7693c0f04..2b52955307ae 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/bot.js
@@ -3,10 +3,142 @@ module.exports = async ({ github, context, core, dry }) => {
   const { DefaultArtifactClient } = require('@actions/artifact')
   const { readFile, writeFile } = require('node:fs/promises')
   const withRateLimit = require('./withRateLimit.js')
+  const { classify } = require('../supportedBranches.js')
+  const { handleMerge } = require('./merge.js')
+  const { handleReviewers } = require('./reviewers.js')
 
   const artifactClient = new DefaultArtifactClient()
 
-  async function handlePullRequest({ item, stats }) {
+  async function downloadMaintainerMap(branch) {
+    let run
+
+    const commits = (
+      await github.rest.repos.listCommits({
+        ...context.repo,
+        sha: branch,
+        // We look at 10 commits to find a maintainer map, but this is an arbitrary number. The
+        // head commit might not have a map, if the queue was bypassed to merge it. This happens
+        // frequently on staging-esque branches. The branch with the highest chance of getting
+        // 10 consecutive bypassing commits is the stable staging-next branch. Luckily, this
+        // also means that the number of PRs open towards that branch is very low, so falling
+        // back to slightly imprecise maintainer data from master only has a marginal effect.
+        per_page: 10,
+      })
+    ).data
+
+    for (const commit of commits) {
+      const run = (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          workflow_id: 'merge-group.yml',
+          status: 'success',
+          exclude_pull_requests: true,
+          per_page: 1,
+          head_sha: commit.sha,
+        })
+      ).data.workflow_runs[0]
+      if (!run) continue
+
+      const artifact = (
+        await github.rest.actions.listWorkflowRunArtifacts({
+          ...context.repo,
+          run_id: run.id,
+          name: 'maintainers',
+        })
+      ).data.artifacts[0]
+      if (!artifact) continue
+
+      await artifactClient.downloadArtifact(artifact.id, {
+        findBy: {
+          repositoryName: context.repo.repo,
+          repositoryOwner: context.repo.owner,
+          token: core.getInput('github-token'),
+        },
+        path: path.resolve(path.join('branches', branch)),
+        expectedHash: artifact.digest,
+      })
+
+      return JSON.parse(
+        await readFile(
+          path.resolve(path.join('branches', branch, 'maintainers.json')),
+          'utf-8',
+        ),
+      )
+    }
+
+    // We get here when none of the 10 commits we looked at contained a maintainer map.
+    // For the master branch, we don't have any fallback options, so we error out.
+    // For other branches, we select a suitable fallback below.
+    if (branch === 'master') throw new Error('No maintainer map found.')
+
+    const { stable, version } = classify(branch)
+
+    const release = `release-${version}`
+    if (stable && branch !== release) {
+      // Only fallback to the release branch from *other* stable branches.
+      // Explicitly avoids infinite recursion.
+      return await getMaintainerMap(release)
+    } else {
+      // Falling back to master as last resort.
+      // This can either be the case for unstable staging-esque or wip branches,
+      // or for the primary stable branch (release-XX.YY).
+      return await getMaintainerMap('master')
+    }
+  }
+
+  // Simple cache for maintainer maps to avoid downloading the same artifacts
+  // over and over again. Ultimately returns a promise, so the result must be
+  // awaited for.
+  const maintainerMaps = {}
+  function getMaintainerMap(branch) {
+    if (!maintainerMaps[branch]) {
+      maintainerMaps[branch] = downloadMaintainerMap(branch)
+    }
+    return maintainerMaps[branch]
+  }
+
+  // Caching the list of team members saves API requests when running the bot on the schedule and
+  // processing many PRs at once.
+  const members = {}
+  function getTeamMembers(team_slug) {
+    if (context.eventName === 'pull_request') {
+      // We have no chance of getting a token in the pull_request context with the right
+      // permissions to access the members endpoint below. Thus, we're pretending to have
+      // no members. This is OK; because this is only for the Test workflow, not for
+      // real use.
+      return []
+    }
+
+    if (!members[team_slug]) {
+      members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, {
+        org: context.repo.owner,
+        team_slug,
+        per_page: 100,
+      })
+    }
+
+    return members[team_slug]
+  }
+
+  // Caching users saves API requests when running the bot on the schedule and processing
+  // many PRs at once. It also helps to encapsulate the special logic we need, because
+  // actions/github doesn't support that endpoint fully, yet.
+  const users = {}
+  function getUser(id) {
+    if (!users[id]) {
+      users[id] = github
+        .request({
+          method: 'GET',
+          url: '/user/{id}',
+          id,
+        })
+        .then((resp) => resp.data)
+    }
+
+    return users[id]
+  }
+
+  async function handlePullRequest({ item, stats, events }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
     const pull_number = item.number
@@ -20,11 +152,75 @@ module.exports = async ({ github, context, core, dry }) => {
       })
     ).data
 
-    const reviews = await github.paginate(github.rest.pulls.listReviews, {
-      ...context.repo,
-      pull_number,
+    const maintainers = await getMaintainerMap(pull_request.base.ref)
+
+    const merge_bot_eligible = await handleMerge({
+      github,
+      context,
+      core,
+      log,
+      dry,
+      pull_request,
+      events,
+      maintainers,
+      getTeamMembers,
+      getUser,
     })
 
+    // When the same change has already been merged to the target branch, a PR will still be
+    // open and display the same changes - but will not actually have any effect. This causes
+    // strange CI behavior, because the diff of the merge-commit is empty, no rebuilds will
+    // be detected, no maintainers pinged.
+    // We can just check the temporary merge commit, and if it's empty the PR can safely be
+    // closed - there are no further changes.
+    // We only do this for PRs, which are non-empty to start with. This avoids closing PRs
+    // which have been created with an empty commit for notification purposes, for example
+    // the yearly election notification for voters.
+    if (pull_request.merge_commit_sha && pull_request.changed_files > 0) {
+      const commit = (
+        await github.rest.repos.getCommit({
+          ...context.repo,
+          ref: pull_request.merge_commit_sha,
+        })
+      ).data
+
+      if (commit.files.length === 0) {
+        const body = [
+          `The diff for the temporary merge commit ${pull_request.merge_commit_sha} is empty.`,
+          'The changes in this PR have almost certainly already been merged to the target branch.',
+        ].join('\n')
+
+        core.info(`PR #${item.number}: closed`)
+
+        if (!dry) {
+          await github.rest.issues.createComment({
+            ...context.repo,
+            issue_number: pull_number,
+            body,
+          })
+
+          await github.rest.pulls.update({
+            ...context.repo,
+            pull_number,
+            state: 'closed',
+          })
+        }
+
+        return {}
+      }
+    }
+
+    // Check for any human reviews other than GitHub actions and other GitHub apps.
+    // Accounts could be deleted as well, so don't count them.
+    const reviews = (
+      await github.paginate(github.rest.pulls.listReviews, {
+        ...context.repo,
+        pull_number,
+      })
+    ).filter(
+      (r) => r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',
+    )
+
     const approvals = new Set(
       reviews
         .filter((review) => review.state === 'APPROVED')
@@ -53,6 +249,7 @@ module.exports = async ({ github, context, core, dry }) => {
       // The second pass will then read the result from the first pass and set the label.
       '2.status: merge conflict':
         merge_commit_sha_valid && !pull_request.merge_commit_sha,
+      '2.status: merge-bot eligible': merge_bot_eligible,
       '12.approvals: 1': approvals.size === 1,
       '12.approvals: 2': approvals.size === 2,
       '12.approvals: 3+': approvals.size >= 3,
@@ -67,12 +264,24 @@ module.exports = async ({ github, context, core, dry }) => {
       (
         await github.rest.actions.listWorkflowRuns({
           ...context.repo,
+          workflow_id: 'pull-request-target.yml',
+          event: 'pull_request_target',
+          exclude_pull_requests: true,
+          head_sha: pull_request.head.sha,
+        })
+      ).data.workflow_runs[0] ??
+      // TODO: Remove this after 2026-02-01, at which point all pr.yml artifacts will have expired.
+      (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          // In older PRs, we need pr.yml instead of pull-request-target.yml.
           workflow_id: 'pr.yml',
           event: 'pull_request_target',
           exclude_pull_requests: true,
           head_sha: pull_request.head.sha,
         })
-      ).data.workflow_runs[0] ?? {}
+      ).data.workflow_runs[0] ??
+      {}
 
     // Newer PRs might not have run Eval to completion, yet.
     // Older PRs might not have an eval.yml workflow, yet.
@@ -80,13 +289,6 @@ module.exports = async ({ github, context, core, dry }) => {
     log('Last eval run', run_id ?? '<n/a>')
 
     if (conclusion === 'success') {
-      // Check for any human reviews other than GitHub actions and other GitHub apps.
-      // Accounts could be deleted as well, so don't count them.
-      const humanReviews = reviews.filter(
-        (r) =>
-          r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',
-      )
-
       Object.assign(prLabels, {
         // We only set this label if the latest eval run was successful, because if it was not, it
         // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
@@ -99,7 +301,7 @@ module.exports = async ({ github, context, core, dry }) => {
         '9.needs: reviewer':
           !pull_request.draft &&
           pull_request.requested_reviewers.length === 0 &&
-          humanReviews.length === 0,
+          reviews.length === 0,
       })
     }
 
@@ -134,22 +336,78 @@ module.exports = async ({ github, context, core, dry }) => {
         expectedHash: artifact.digest,
       })
 
-      const maintainers = new Set(
-        Object.keys(
-          JSON.parse(
-            await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
-          ),
-        ).map((m) => Number.parseInt(m, 10)),
-      )
-
       const evalLabels = JSON.parse(
         await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
       ).labels
 
+      // TODO: Get "changed packages" information from list of changed by-name files
+      // in addition to just the Eval results, to make this work for these packages
+      // when Eval results have expired as well.
+      let packages
+      try {
+        packages = JSON.parse(
+          await readFile(`${pull_number}/packages.json`, 'utf-8'),
+        )
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e
+        // TODO: Remove this fallback code once all old artifacts without packages.json
+        // have expired. This should be the case in ~ February 2026.
+        packages = Array.from(
+          new Set(
+            Object.values(
+              JSON.parse(
+                await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
+              ),
+            ).flat(1),
+          ),
+        )
+      }
+
       Object.assign(prLabels, evalLabels, {
-        '12.approved-by: package-maintainer':
-          maintainers.intersection(approvals).size > 0,
+        '11.by: package-maintainer':
+          Boolean(packages.length) &&
+          packages.every((pkg) =>
+            maintainers[pkg]?.includes(pull_request.user.id),
+          ),
+        '12.approved-by: package-maintainer': packages.some((pkg) =>
+          maintainers[pkg]?.some((m) => approvals.has(m)),
+        ),
       })
+
+      if (!pull_request.draft) {
+        let owners = []
+        try {
+          // TODO: Create owner map similar to maintainer map.
+          owners = (await readFile(`${pull_number}/owners.txt`, 'utf-8')).split(
+            '\n',
+          )
+        } catch (e) {
+          // Older artifacts don't have the owners.txt, yet.
+          if (e.code !== 'ENOENT') throw e
+        }
+
+        // We set this label earlier already, but the current PR state can be very different
+        // after handleReviewers has requested reviews, so update it in this case to prevent
+        // this label from flip-flopping.
+        prLabels['9.needs: reviewer'] = await handleReviewers({
+          github,
+          context,
+          core,
+          log,
+          dry,
+          pull_request,
+          reviews,
+          // TODO: Use maintainer map instead of the artifact.
+          maintainers: Object.keys(
+            JSON.parse(
+              await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
+            ),
+          ).map((id) => parseInt(id)),
+          owners,
+          getTeamMembers,
+          getUser,
+        })
+      }
     }
 
     return prLabels
@@ -210,9 +468,21 @@ module.exports = async ({ github, context, core, dry }) => {
 
       const itemLabels = {}
 
+      const events = await github.paginate(
+        github.rest.issues.listEventsForTimeline,
+        {
+          ...context.repo,
+          issue_number,
+          per_page: 100,
+        },
+      )
+
       if (item.pull_request || context.payload.pull_request) {
         stats.prs++
-        Object.assign(itemLabels, await handlePullRequest({ item, stats }))
+        Object.assign(
+          itemLabels,
+          await handlePullRequest({ item, stats, events }),
+        )
       } else {
         stats.issues++
         if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) {
@@ -224,13 +494,7 @@ module.exports = async ({ github, context, core, dry }) => {
       }
 
       const latest_event_at = new Date(
-        (
-          await github.paginate(github.rest.issues.listEventsForTimeline, {
-            ...context.repo,
-            issue_number,
-            per_page: 100,
-          })
-        )
+        events
           .filter(({ event }) =>
             [
               // These events are hand-picked from:
@@ -292,7 +556,7 @@ module.exports = async ({ github, context, core, dry }) => {
       const hasChanges = Object.keys(after).some(
         (name) => (before[name] ?? false) !== after[name],
       )
-      if (log('Has changes', hasChanges, !hasChanges)) return
+      if (log('Has label changes', hasChanges, !hasChanges)) return
 
       // Skipping labeling on a pull_request event, because we have no privileges.
       const labels = Object.entries(after)
@@ -310,14 +574,21 @@ module.exports = async ({ github, context, core, dry }) => {
     }
   }
 
-  await withRateLimit({ github, core }, async (stats) => {
+  // Controls level of parallelism. Applies to both the number of concurrent requests
+  // as well as the number of concurrent workers going through the list of PRs.
+  // We'll only boost concurrency when we're running many PRs in parallel on a schedule,
+  // but not for single PRs. This avoids things going wild, when we accidentally make
+  // too many API requests on treewides.
+  const maxConcurrent = context.payload.pull_request ? 1 : 20
+
+  await withRateLimit({ github, core, maxConcurrent }, async (stats) => {
     if (context.payload.pull_request) {
       await handle({ item: context.payload.pull_request, stats })
     } else {
       const lastRun = (
         await github.rest.actions.listWorkflowRuns({
           ...context.repo,
-          workflow_id: 'labels.yml',
+          workflow_id: 'bot.yml',
           event: 'schedule',
           status: 'success',
           exclude_pull_requests: true,
@@ -439,11 +710,23 @@ module.exports = async ({ github, context, core, dry }) => {
             arr.findIndex((firstItem) => firstItem.number === thisItem.number),
         )
 
-      ;(await Promise.allSettled(items.map((item) => handle({ item, stats }))))
-        .filter(({ status }) => status === 'rejected')
-        .map(({ reason }) =>
-          core.setFailed(`${reason.message}\n${reason.cause.stack}`),
-        )
+      // Instead of handling all items in parallel we set up some workers to handle the queue
+      // with more controlled parallelism. This avoids problems with `pull_request` fetched at
+      // the beginning getting out of date towards the end, because it took the whole job 20
+      // minutes or more to go through 100's of PRs.
+      await Promise.all(
+        Array.from({ length: maxConcurrent }, async () => {
+          while (true) {
+            const item = items.pop()
+            if (!item) break
+            try {
+              await handle({ item, stats })
+            } catch (e) {
+              core.setFailed(`${e.message}\n${e.cause.stack}`)
+            }
+          }
+        }),
+      )
     }
   })
 }
diff --git a/ci/github-script/get-teams.js b/ci/github-script/get-teams.js
new file mode 100644
index 000000000000..0a097d23eb2f
--- /dev/null
+++ b/ci/github-script/get-teams.js
@@ -0,0 +1,85 @@
+const excludeTeams = [
+  /^voters.*$/,
+  /^nixpkgs-maintainers$/,
+  /^nixpkgs-committers$/,
+]
+
+module.exports = async ({ github, context, core, outFile }) => {
+  const withRateLimit = require('./withRateLimit.js')
+  const { writeFileSync } = require('node:fs')
+
+  const org = context.repo.owner
+
+  const result = {}
+
+  await withRateLimit({ github, core }, async () => {
+    // Turn an Array of users into an Object, mapping user.login -> user.id
+    function makeUserSet(users) {
+      // Sort in-place and build result by mutation
+      users.sort((a, b) => (a.login > b.login ? 1 : -1))
+
+      return users.reduce((acc, user) => {
+        acc[user.login] = user.id
+        return acc
+      }, {})
+    }
+
+    // Process a list of teams and append to the result variable
+    async function processTeams(teams) {
+      for (const team of teams) {
+        core.notice(`Processing team ${team.slug}`)
+        if (!excludeTeams.some((regex) => team.slug.match(regex))) {
+          const members = makeUserSet(
+            await github.paginate(github.rest.teams.listMembersInOrg, {
+              org,
+              team_slug: team.slug,
+              role: 'member',
+            }),
+          )
+          const maintainers = makeUserSet(
+            await github.paginate(github.rest.teams.listMembersInOrg, {
+              org,
+              team_slug: team.slug,
+              role: 'maintainer',
+            }),
+          )
+          result[team.slug] = {
+            description: team.description,
+            id: team.id,
+            maintainers,
+            members,
+            name: team.name,
+          }
+        }
+        await processTeams(
+          await github.paginate(github.rest.teams.listChildInOrg, {
+            org,
+            team_slug: team.slug,
+          }),
+        )
+      }
+    }
+
+    const teams = await github.paginate(github.rest.repos.listTeams, {
+      ...context.repo,
+    })
+
+    await processTeams(teams)
+  })
+
+  // Sort the teams by team name
+  const sorted = Object.keys(result)
+    .sort()
+    .reduce((acc, key) => {
+      acc[key] = result[key]
+      return acc
+    }, {})
+
+  const json = `${JSON.stringify(sorted, null, 2)}\n`
+
+  if (outFile) {
+    writeFileSync(outFile, json)
+  } else {
+    console.log(json)
+  }
+}
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
new file mode 100644
index 000000000000..14d6fd3762ab
--- /dev/null
+++ b/ci/github-script/merge.js
@@ -0,0 +1,347 @@
+const { classify } = require('../supportedBranches.js')
+
+function runChecklist({
+  committers,
+  events,
+  files,
+  pull_request,
+  log,
+  maintainers,
+  user,
+  userIsMaintainer,
+}) {
+  const allByName = files.every(
+    ({ filename }) =>
+      filename.startsWith('pkgs/by-name/') && filename.split('/').length > 4,
+  )
+
+  const packages = files
+    .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
+    .map(({ filename }) => filename.split('/')[3])
+    .filter(Boolean)
+
+  const eligible = !packages.length
+    ? new Set()
+    : packages
+        .map((pkg) => new Set(maintainers[pkg]))
+        .reduce((acc, cur) => acc?.intersection(cur) ?? cur)
+
+  const approvals = new Set(
+    events
+      .filter(
+        ({ event, state, commit_id }) =>
+          event === 'reviewed' &&
+          state === 'approved' &&
+          // Only approvals for the current head SHA count, otherwise authors could push
+          // bad code between the approval and the merge.
+          commit_id === pull_request.head.sha,
+      )
+      .map(({ user }) => user?.id)
+      // Some users have been deleted, so filter these out.
+      .filter(Boolean),
+  )
+
+  const checklist = {
+    'PR targets a [development branch](https://github.com/NixOS/nixpkgs/blob/-/ci/README.md#branch-classification).':
+      classify(pull_request.base.ref).type.includes('development'),
+    'PR touches only files of packages in `pkgs/by-name/`.': allByName,
+    'PR is at least one of:': {
+      'Approved by a committer.': committers.intersection(approvals).size > 0,
+      'Backported via label.':
+        pull_request.user.login === 'nixpkgs-ci[bot]' &&
+        pull_request.head.ref.startsWith('backport-'),
+      'Opened by a committer.': committers.has(pull_request.user.id),
+      'Opened by r-ryantm.': pull_request.user.login === 'r-ryantm',
+    },
+  }
+
+  if (user) {
+    checklist[
+      `${user.login} is a member of [@NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers).`
+    ] = userIsMaintainer
+    if (allByName) {
+      // We can only determine the below, if all packages are in by-name, since
+      // we can't reliably relate changed files to packages outside by-name.
+      checklist[`${user.login} is a maintainer of all touched packages.`] =
+        eligible.has(user.id)
+    }
+  } else {
+    // This is only used when no user is passed, i.e. for labeling.
+    checklist['PR has maintainers eligible to merge.'] = eligible.size > 0
+  }
+
+  const result = Object.values(checklist).every((v) =>
+    typeof v === 'boolean' ? v : Object.values(v).some(Boolean),
+  )
+
+  log('checklist', JSON.stringify(checklist))
+  log('eligible', JSON.stringify(Array.from(eligible)))
+  log('result', result)
+
+  return {
+    checklist,
+    eligible,
+    result,
+  }
+}
+
+// The merge command must be on a separate line and not within codeblocks or html comments.
+// Codeblocks can have any number of ` larger than 3 to open/close. We only look at code
+// blocks that are not indented, because the later regex wouldn't match those anyway.
+function hasMergeCommand(body) {
+  return (body ?? '')
+    .replace(/<!--.*?-->/gms, '')
+    .replace(/(^`{3,})[^`].*?\1/gms, '')
+    .match(/^@NixOS\/nixpkgs-merge-bot merge\s*$/m)
+}
+
+async function handleMergeComment({ github, body, node_id, reaction }) {
+  if (!hasMergeCommand(body)) return
+
+  await github.graphql(
+    `mutation($node_id: ID!, $reaction: ReactionContent!) {
+      addReaction(input: {
+        content: $reaction,
+        subjectId: $node_id
+      })
+      { clientMutationId }
+    }`,
+    { node_id, reaction },
+  )
+}
+
+async function handleMerge({
+  github,
+  context,
+  core,
+  log,
+  dry,
+  pull_request,
+  events,
+  maintainers,
+  getTeamMembers,
+  getUser,
+}) {
+  const pull_number = pull_request.number
+
+  const committers = new Set(
+    (await getTeamMembers('nixpkgs-committers')).map(({ id }) => id),
+  )
+
+  const files = (
+    await github.rest.pulls.listFiles({
+      ...context.repo,
+      pull_number,
+      per_page: 100,
+    })
+  ).data
+
+  // Early exit to prevent treewides from using up a lot of API requests (and time!) to list
+  // all the files in the pull request. For now, the merge-bot will not work when 100 or more
+  // files are touched in a PR - which should be more than fine.
+  // TODO: Find a more efficient way of downloading all the *names* of the touched files,
+  // including an early exit when the first non-by-name file is found.
+  if (files.length >= 100) return false
+
+  // Only look through comments *after* the latest (force) push.
+  const lastPush = events.findLastIndex(
+    ({ event, sha, commit_id }) =>
+      ['committed', 'head_ref_force_pushed'].includes(event) &&
+      (sha ?? commit_id) === pull_request.head.sha,
+  )
+
+  const comments = events.slice(lastPush + 1).filter(
+    ({ event, body, user, node_id }) =>
+      ['commented', 'reviewed'].includes(event) &&
+      hasMergeCommand(body) &&
+      // Ignore comments where the user has been deleted already.
+      user &&
+      // Ignore comments which had already been responded to by the bot.
+      (dry ||
+        !events.some(
+          ({ event, body }) =>
+            ['commented'].includes(event) &&
+            // We're only testing this hidden reference, but not the author of the comment.
+            // We'll just assume that nobody creates comments with this marker on purpose.
+            // Additionally checking the author is quite annoying for local debugging.
+            body.match(new RegExp(`^<!-- comment: ${node_id} -->$`, 'm')),
+        )),
+  )
+
+  async function merge() {
+    if (dry) {
+      core.info(`Merging #${pull_number}... (dry)`)
+      return 'Merge completed (dry)'
+    }
+
+    // Using GraphQL mutations instead of the REST /merge endpoint, because the latter
+    // doesn't work with Merge Queues. We now have merge queues enabled on all development
+    // branches, so we don't need a fallback for regular merges.
+    try {
+      const resp = await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enqueuePullRequest(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          {
+            clientMutationId,
+            mergeQueueEntry { mergeQueue { url } }
+          }
+        }`,
+        { node_id: pull_request.node_id, sha: pull_request.head.sha },
+      )
+      return [
+        `:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`,
+      ]
+    } catch (e) {
+      log('Enqueing failed', e.response.errors[0].message)
+    }
+
+    // If required status checks are not satisfied, yet, the above will fail. In this case
+    // we can enable auto-merge. We could also only use auto-merge, but this often gets
+    // stuck for no apparent reason.
+    try {
+      await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enablePullRequestAutoMerge(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          { clientMutationId }
+        }`,
+        { node_id: pull_request.node_id, sha: pull_request.head.sha },
+      )
+      return [
+        `:heavy_check_mark: Enabled Auto Merge (#306934)`,
+        '',
+        '> [!TIP]',
+        '> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.',
+      ]
+    } catch (e) {
+      log('Auto Merge failed', e.response.errors[0].message)
+      throw new Error(e.response.errors[0].message)
+    }
+  }
+
+  for (const comment of comments) {
+    log('comment', comment.node_id)
+
+    async function react(reaction) {
+      if (dry) {
+        core.info(`Reaction ${reaction} on ${comment.node_id} (dry)`)
+        return
+      }
+
+      await handleMergeComment({
+        github,
+        body: comment.body,
+        node_id: comment.node_id,
+        reaction,
+      })
+    }
+
+    async function isMaintainer(username) {
+      try {
+        return (
+          (
+            await github.rest.teams.getMembershipForUserInOrg({
+              org: context.repo.owner,
+              team_slug: 'nixpkgs-maintainers',
+              username,
+            })
+          ).data.state === 'active'
+        )
+      } catch (e) {
+        if (e.status === 404) return false
+        else throw e
+      }
+    }
+
+    const { result, eligible, checklist } = runChecklist({
+      committers,
+      events,
+      files,
+      pull_request,
+      log,
+      maintainers,
+      user: comment.user,
+      userIsMaintainer: await isMaintainer(comment.user.login),
+    })
+
+    const body = [
+      `<!-- comment: ${comment.node_id} -->`,
+      `@${comment.user.login} wants to merge this PR.`,
+      '',
+      'Requirements to merge this PR with `@NixOS/nixpkgs-merge-bot merge`:',
+      ...Object.entries(checklist).flatMap(([msg, res]) =>
+        typeof res === 'boolean'
+          ? `- :${res ? 'white_check_mark' : 'x'}: ${msg}`
+          : [
+              `- :${Object.values(res).some(Boolean) ? 'white_check_mark' : 'x'}: ${msg}`,
+              ...Object.entries(res).map(
+                ([msg, res]) =>
+                  `  - ${res ? ':white_check_mark:' : ':white_large_square:'} ${msg}`,
+              ),
+            ],
+      ),
+      '',
+    ]
+
+    if (eligible.size > 0 && !eligible.has(comment.user.id)) {
+      const users = await Promise.all(
+        Array.from(eligible, async (id) => (await getUser(id)).login),
+      )
+      body.push(
+        '> [!TIP]',
+        '> Maintainers eligible to merge are:',
+        ...users.map((login) => `> - ${login}`),
+        '',
+      )
+    }
+
+    if (result) {
+      await react('ROCKET')
+      try {
+        body.push(...(await merge()))
+      } catch (e) {
+        // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
+        body.shift()
+        body.push(`:x: Merge failed with: ${e} (#371492)`)
+      }
+    } else {
+      await react('THUMBS_DOWN')
+      body.push(':x: Pull Request could not be merged (#305350)')
+    }
+
+    if (dry) {
+      core.info(body.join('\n'))
+    } else {
+      await github.rest.issues.createComment({
+        ...context.repo,
+        issue_number: pull_number,
+        body: body.join('\n'),
+      })
+    }
+
+    if (result) break
+  }
+
+  const { result } = runChecklist({
+    committers,
+    events,
+    files,
+    pull_request,
+    log,
+    maintainers,
+  })
+
+  // Returns a boolean, which indicates whether the PR is merge-bot eligible in principle.
+  // This is used to set the respective label in bot.js.
+  return result
+}
+
+module.exports = {
+  handleMerge,
+  handleMergeComment,
+}
diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
new file mode 100644
index 000000000000..07a77a5fec0d
--- /dev/null
+++ b/ci/github-script/reviewers.js
@@ -0,0 +1,143 @@
+async function handleReviewers({
+  github,
+  context,
+  core,
+  log,
+  dry,
+  pull_request,
+  reviews,
+  maintainers,
+  owners,
+  getTeamMembers,
+  getUser,
+}) {
+  const pull_number = pull_request.number
+
+  const requested_reviewers = new Set(
+    pull_request.requested_reviewers.map(({ login }) => login),
+  )
+  log(
+    'reviewers - requested_reviewers',
+    Array.from(requested_reviewers).join(', '),
+  )
+
+  const existing_reviewers = new Set(
+    reviews.map(({ user }) => user?.login).filter(Boolean),
+  )
+  log(
+    'reviewers - existing_reviewers',
+    Array.from(existing_reviewers).join(', '),
+  )
+
+  // Early sanity check, before we start making any API requests. The list of maintainers
+  // does not have duplicates so the only user to filter out from this list would be the
+  // PR author. Therefore, we check for a limit of 15+1, where 15 is the limit we check
+  // further down again.
+  // This is to protect against huge treewides consuming all our API requests for no
+  // reason.
+  if (maintainers.length > 16) {
+    core.warning('Too many potential reviewers, skipping review requests.')
+    // Return a boolean on whether the "needs: reviewers" label should be set.
+    return existing_reviewers.size === 0 && requested_reviewers.size === 0
+  }
+
+  const users = new Set([
+    ...(await Promise.all(
+      maintainers.map(async (id) => (await getUser(id)).login),
+    )),
+    ...owners.filter((handle) => handle && !handle.includes('/')),
+  ])
+  log('reviewers - users', Array.from(users).join(', '))
+
+  const teams = new Set(
+    owners
+      .map((handle) => handle.split('/'))
+      .filter(([org, slug]) => org === context.repo.owner && slug)
+      .map(([, slug]) => slug),
+  )
+  log('reviewers - teams', Array.from(teams).join(', '))
+
+  const team_members = new Set(
+    (await Promise.all(Array.from(teams, getTeamMembers)))
+      .flat(1)
+      .map(({ login }) => login),
+  )
+  log('reviewers - team_members', Array.from(team_members).join(', '))
+
+  const new_reviewers = users
+    .union(team_members)
+    // We can't request a review from the author.
+    .difference(new Set([pull_request.user?.login]))
+  log('reviewers - new_reviewers', Array.from(new_reviewers).join(', '))
+
+  // Filter users to repository collaborators. If they're not, they can't be requested
+  // for review. In that case, they probably missed their invite to the maintainers team.
+  const reviewers = (
+    await Promise.all(
+      Array.from(new_reviewers, async (username) => {
+        // TODO: Restructure this file to only do the collaborator check for those users
+        // who were not already part of a team. Being a member of a team makes them
+        // collaborators by definition.
+        try {
+          await github.rest.repos.checkCollaborator({
+            ...context.repo,
+            username,
+          })
+          return username
+        } catch (e) {
+          if (e.status !== 404) throw e
+          core.warning(
+            `PR #${pull_number}: User ${username} cannot be requested for review because they don't exist or are not a repository collaborator, ignoring. They probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>).`,
+          )
+        }
+      }),
+    )
+  ).filter(Boolean)
+  log('reviewers - reviewers', reviewers.join(', '))
+
+  if (reviewers.length > 15) {
+    core.warning(
+      `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
+    )
+    // Return a boolean on whether the "needs: reviewers" label should be set.
+    return existing_reviewers.size === 0 && requested_reviewers.size === 0
+  }
+
+  const non_requested_reviewers = new Set(reviewers)
+    .difference(requested_reviewers)
+    // We don't want to rerequest reviews from people who already reviewed.
+    .difference(existing_reviewers)
+  log(
+    'reviewers - non_requested_reviewers',
+    Array.from(non_requested_reviewers).join(', '),
+  )
+
+  if (non_requested_reviewers.size === 0) {
+    log('Has reviewer changes', 'false (skipped)')
+  } else if (dry) {
+    core.info(
+      `Requesting reviewers for #${pull_number}: ${Array.from(non_requested_reviewers).join(', ')} (dry)`,
+    )
+  } else {
+    // We had tried the "request all reviewers at once" thing in the past, but it didn't work out:
+    //   https://github.com/NixOS/nixpkgs/commit/034613f860fcd339bd2c20c8f6bc259a2f9dc034
+    // If we're hitting API errors here again, we'll need to investigate - and possibly reverse
+    // course.
+    await github.rest.pulls.requestReviewers({
+      ...context.repo,
+      pull_number,
+      reviewers,
+    })
+  }
+
+  // Return a boolean on whether the "needs: reviewers" label should be set.
+  return (
+    non_requested_reviewers.size === 0 &&
+    existing_reviewers.size === 0 &&
+    requested_reviewers.size === 0
+  )
+}
+
+module.exports = {
+  handleReviewers,
+}
diff --git a/ci/github-script/run b/ci/github-script/run
index 1d974cf5355f..8a2906606cac 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -65,22 +65,33 @@ program
   })
 
 program
-  .command('labels')
-  .description('Manage labels on pull requests.')
+  .command('bot')
+  .description('Run automation on pull requests and issues.')
   .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
   .argument('[pr]', 'Number of the Pull Request to label')
   .option('--no-dry', 'Make actual modifications')
   .action(async (owner, repo, pr, options) => {
-    const labels = (await import('./labels.js')).default
+    const bot = (await import('./bot.js')).default
     const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
     try {
       process.env.GITHUB_WORKSPACE = tmp
       process.chdir(tmp)
-      await run(labels, owner, repo, pr, options)
+      await run(bot, owner, repo, pr, options)
     } finally {
       rmSync(tmp, { recursive: true })
     }
   })
 
+program
+  .command('get-teams')
+  .description('Fetch the list of teams with GitHub and output it to a file')
+  .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
+  .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
+  .argument('[outFile]', 'Path to the output file (Example: github-teams.json). If not set, prints to stdout')
+  .action(async (owner, repo, outFile, options) => {
+    const getTeams = (await import('./get-teams.js')).default
+    await run(getTeams, owner, repo, undefined, { ...options, outFile })
+  })
+
 await program.parse()
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
index efc63057beb7..d1b1c756ea09 100644
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -1,4 +1,4 @@
-module.exports = async ({ github, core }, callback) => {
+module.exports = async ({ github, core, maxConcurrent = 1 }, callback) => {
   const Bottleneck = require('bottleneck')
 
   const stats = {
@@ -13,7 +13,7 @@ module.exports = async ({ github, core }, callback) => {
   //   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,
+    maxConcurrent,
     // Will be updated with first `updateReservoir()` call below.
     reservoir: 0,
   })
diff --git a/ci/nixpkgs-vet.nix b/ci/nixpkgs-vet.nix
index 7c11dffc4f9b..6bdf92eedb3f 100644
--- a/ci/nixpkgs-vet.nix
+++ b/ci/nixpkgs-vet.nix
@@ -32,6 +32,7 @@ runCommand "nixpkgs-vet"
   }
   ''
     export NIX_STATE_DIR=$(mktemp -d)
+    $NIXPKGS_VET_NIX_PACKAGE/bin/nix-store --init
 
     nixpkgs-vet --base ${filteredBase} ${filteredHead}
 
diff --git a/ci/parse.nix b/ci/parse.nix
index 26ac0f785fd4..14fd1e719547 100644
--- a/ci/parse.nix
+++ b/ci/parse.nix
@@ -20,24 +20,15 @@ runCommand "nix-parse-${nix.name}"
   ''
     export NIX_STORE_DIR=$TMPDIR/store
     export NIX_STATE_DIR=$TMPDIR/state
+    nix-store --init
 
     cd "${nixpkgs}"
 
-    # Passes all files to nix-instantiate at once.
-    # Much faster, but will only show first error.
-    parse-all() {
-      find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null 2>/dev/null
-    }
-
-    # Passes each file separately to nix-instantiate with -n1.
-    # Much slower, but will show all errors.
-    parse-each() {
-      find . -type f -iname '*.nix' | xargs -n1 -P $(nproc) nix-instantiate --parse >/dev/null
-    }
-
-    if ! parse-all; then
-      parse-each
-    fi
+    # This will only show the first parse error, not all of them. That's fine, because
+    # the other CI jobs will report in more detail. This job is about checking parsing
+    # across different implementations / versions, not about providing the best DX.
+    # Returning all parse errors requires significantly more resources.
+    find . -type f -iname '*.nix' | xargs -P $(nproc) nix-instantiate --parse >/dev/null
 
     touch $out
   ''
diff --git a/ci/pinned.json b/ci/pinned.json
index 4d5456837b2c..fa58242b75ab 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "e57b3b16ad8758fd681511a078f35c416a8cc939",
-      "url": "https://github.com/NixOS/nixpkgs/archive/e57b3b16ad8758fd681511a078f35c416a8cc939.tar.gz",
-      "hash": "04zp6jjd4xr6jfps84p8yh5ym5962mii4825fn75lqk14sz4rq56"
+      "revision": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24",
+      "url": "https://github.com/NixOS/nixpkgs/archive/12c1f0253aa9a54fdf8ec8aecaafada64a111e24.tar.gz",
+      "hash": "0zr033ybqjc5spwh7xnzkhbqgc6gh8waw6z76rpvadxckyqlfgiq"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
-      "url": "https://github.com/numtide/treefmt-nix/archive/5eda4ee8121f97b218f7cc73f5172098d458f1d1.tar.gz",
-      "hash": "1vqns9hjhmbnhdq2xvcmdxng11jrmcn9lpk2ncfh1f969z9lj8y9"
+      "revision": "4ef3dfdbb5ddfb9e39999a2f2b0c2637277859d4",
+      "url": "https://github.com/numtide/treefmt-nix/archive/4ef3dfdbb5ddfb9e39999a2f2b0c2637277859d4.tar.gz",
+      "hash": "0dhvpzcknsr2ybi3zz9mjggs93aqkfr24radvlw74y9620dziqw4"
     }
   },
   "version": 5
diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
deleted file mode 100644
index 075ff52fd564..000000000000
--- a/ci/request-reviews/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  makeWrapper,
-  coreutils,
-  codeowners,
-  jq,
-  curl,
-  github-cli,
-  gitMinimal,
-}:
-stdenvNoCC.mkDerivation {
-  name = "request-reviews";
-  src = lib.fileset.toSource {
-    root = ./.;
-    fileset = lib.fileset.unions [
-      ./get-code-owners.sh
-      ./request-reviewers.sh
-      ./request-code-owner-reviews.sh
-    ];
-  };
-  nativeBuildInputs = [ makeWrapper ];
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    for bin in *.sh; do
-      mv "$bin" "$out/bin"
-      wrapProgram "$out/bin/$bin" \
-        --set PATH ${
-          lib.makeBinPath [
-            coreutils
-            codeowners
-            jq
-            curl
-            github-cli
-            gitMinimal
-          ]
-        }
-    done
-  '';
-}
diff --git a/ci/request-reviews/get-code-owners.sh b/ci/request-reviews/get-code-owners.sh
deleted file mode 100755
index 13a377429b92..000000000000
--- a/ci/request-reviews/get-code-owners.sh
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/env bash
-
-# Get the code owners of the files changed by a PR, returning one username per line
-
-set -euo pipefail
-
-log() {
-    echo "$@" >&2
-}
-
-if (( "$#" < 4 )); then
-    log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REF HEAD_REF"
-    exit 1
-fi
-
-gitRepo=$1
-ownersFile=$2
-baseRef=$3
-headRef=$4
-
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-
-git -C "$gitRepo" diff --name-only --merge-base "$baseRef" "$headRef" > "$tmp/touched-files"
-readarray -t touchedFiles < "$tmp/touched-files"
-log "This PR touches ${#touchedFiles[@]} files"
-
-# Get the owners file from the base, because we don't want to allow PRs to
-# remove code owners to avoid pinging them
-git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
-
-# Associative array with the user as the key for easy de-duplication
-# Make sure to always lowercase keys to avoid duplicates with different casings
-declare -A users=()
-
-for file in "${touchedFiles[@]}"; do
-    result=$(codeowners --file "$tmp"/codeowners "$file")
-
-    # Remove the file prefix and trim the surrounding spaces
-    read -r owners <<< "${result#"$file"}"
-    if [[ "$owners" == "(unowned)" ]]; then
-        log "File $file is unowned"
-        continue
-    fi
-    log "File $file is owned by $owners"
-
-    # Split up multiple owners, separated by arbitrary amounts of spaces
-    IFS=" " read -r -a entries <<< "$owners"
-
-    for entry in "${entries[@]}"; do
-        # GitHub technically also supports Emails as code owners,
-        # but we can't easily support that, so let's not
-        if [[ ! "$entry" =~ @(.*) ]]; then
-            warn -e "\e[33mCodeowner \"$entry\" for file $file is not valid: Must start with \"@\"\e[0m" >&2
-            # Don't fail, because the PR for which this script runs can't fix it,
-            # it has to be fixed in the base branch
-            continue
-        fi
-        # The first regex match is everything after the @
-        entry=${BASH_REMATCH[1]}
-
-        if [[ "$entry" =~ (.*)/(.*) ]]; then
-            # Teams look like $org/$team
-            org=${BASH_REMATCH[1]}
-            team=${BASH_REMATCH[2]}
-
-            # Instead of requesting a review from the team itself,
-            # we request reviews from the individual users.
-            # This is because once somebody from a team reviewed the PR,
-            # the API doesn't expose that the team was already requested for a review,
-            # so we wouldn't be able to avoid rerequesting reviews
-            # without saving some some extra state somewhere
-
-            # We could also consider implementing a more advanced heuristic
-            # in the future that e.g. only pings one team member,
-            # but escalates to somebody else if that member doesn't respond in time.
-            gh api \
-                --cache=1h \
-                -H "Accept: application/vnd.github+json" \
-                -H "X-GitHub-Api-Version: 2022-11-28" \
-                "/orgs/$org/teams/$team/members" \
-                --jq '.[].login' > "$tmp/team-members"
-            readarray -t members < "$tmp/team-members"
-            log "Team $entry has these members: ${members[*]}"
-
-            for user in "${members[@]}"; do
-                users[${user,,}]=
-            done
-        else
-            # Everything else is a user
-            users[${entry,,}]=
-        fi
-    done
-
-done
-
-printf "%s\n" "${!users[@]}"
diff --git a/ci/request-reviews/request-code-owner-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh
deleted file mode 100755
index 663285ae03fe..000000000000
--- a/ci/request-reviews/request-code-owner-reviews.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-# Requests reviews for a PR
-
-set -euo pipefail
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-SCRIPT_DIR=$(dirname "$0")
-
-log() {
-    echo "$@" >&2
-}
-
-if (( $# < 3 )); then
-    log "Usage: $0 GITHUB_REPO PR_NUMBER OWNERS_FILE"
-    exit 1
-fi
-baseRepo=$1
-prNumber=$2
-ownersFile=$3
-
-log "Fetching PR info"
-prInfo=$(gh api \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  "/repos/$baseRepo/pulls/$prNumber")
-
-baseBranch=$(jq -r .base.ref <<< "$prInfo")
-log "Base branch: $baseBranch"
-prRepo=$(jq -r .head.repo.full_name <<< "$prInfo")
-log "PR repo: $prRepo"
-prBranch=$(jq -r .head.ref <<< "$prInfo")
-log "PR branch: $prBranch"
-prAuthor=$(jq -r .user.login <<< "$prInfo")
-log "PR author: $prAuthor"
-
-extraArgs=()
-if pwdRepo=$(git rev-parse --show-toplevel 2>/dev/null); then
-    # Speedup for local runs
-    extraArgs+=(--reference-if-able "$pwdRepo")
-fi
-
-log "Fetching Nixpkgs commit history"
-# We only need the commit history, not the contents, so we can do a tree-less clone using tree:0
-# https://github.blog/open-source/git/get-up-to-speed-with-partial-clone-and-shallow-clone/#user-content-quick-summary
-git clone --bare --filter=tree:0 --no-tags --origin upstream "${extraArgs[@]}" https://github.com/"$baseRepo".git "$tmp"/nixpkgs.git
-
-log "Fetching the PR commit history"
-# Fetch the PR
-git -C "$tmp/nixpkgs.git" remote add fork https://github.com/"$prRepo".git
-# This remote config is the same as --filter=tree:0 when cloning
-git -C "$tmp/nixpkgs.git" config remote.fork.partialclonefilter tree:0
-git -C "$tmp/nixpkgs.git" config remote.fork.promisor true
-
-git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
-headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
-
-log "Requesting reviews from code owners"
-"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \
-    "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor"
diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
deleted file mode 100755
index 1c105e385d28..000000000000
--- a/ci/request-reviews/request-reviewers.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/env bash
-
-# Request reviewers for a PR, reading line-separated usernames on stdin,
-# filtering for valid reviewers before using the API endpoint to request reviews:
-# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
-
-set -euo pipefail
-
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-
-log() {
-    echo "$@" >&2
-}
-
-effect() {
-    if [[ -n "${DRY_MODE:-}" ]]; then
-        log "Skipping in dry mode:" "${@@Q}"
-    else
-        "$@"
-    fi
-}
-
-if (( "$#" < 3 )); then
-    log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR"
-    exit 1
-fi
-
-baseRepo=$1
-prNumber=$2
-prAuthor=$3
-
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-
-declare -A users=()
-while read -r handle && [[ -n "$handle" ]]; do
-    users[${handle,,}]=
-done
-
-# Cannot request a review from the author
-if [[ -v users[${prAuthor,,}] ]]; then
-    log "One or more files are owned by the PR author, ignoring"
-    unset 'users[${prAuthor,,}]'
-fi
-
-gh api \
-    -H "Accept: application/vnd.github+json" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    "/repos/$baseRepo/pulls/$prNumber/reviews" \
-    --jq '.[].user.login' > "$tmp/already-reviewed-by"
-
-# And we don't want to rerequest reviews from people who already reviewed
-while read -r user; do
-    if [[ -v users[${user,,}] ]]; then
-        log "User $user is a potential reviewer, but has already left a review, ignoring"
-        unset 'users[${user,,}]'
-    fi
-done < "$tmp/already-reviewed-by"
-
-for user in "${!users[@]}"; do
-    if ! gh api \
-        -H "Accept: application/vnd.github+json" \
-        -H "X-GitHub-Api-Version: 2022-11-28" \
-        "/repos/$baseRepo/collaborators/$user" >&2; then
-        log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
-        unset 'users[$user]'
-    fi
-done
-
-if [[ "${#users[@]}" -gt 10 ]]; then
-    log "Too many reviewers (${!users[*]}), skipping review requests"
-    exit 0
-fi
-
-for user in "${!users[@]}"; do
-    log "Requesting review from: $user"
-
-    if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \
-        effect gh api \
-            --method POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
-            --input -); then
-        log "Failed to request review from $user: $response"
-    fi
-done
diff --git a/default.nix b/default.nix
index 5f759c13014d..747bdf57e74f 100644
--- a/default.nix
+++ b/default.nix
@@ -9,7 +9,7 @@ if missingFeatures != [ ] then
     This version of Nixpkgs requires an implementation of Nix with the following features:
     - ${builtins.concatStringsSep "\n- " missingFeatures}
 
-    Your are evaluating with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
+    You are evaluating with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
 
     - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
 
diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md
index fc6cc0fb4d35..f0b561d480e5 100644
--- a/doc/build-helpers/images/dockertools.section.md
+++ b/doc/build-helpers/images/dockertools.section.md
@@ -1,6 +1,6 @@
 # pkgs.dockerTools {#sec-pkgs-dockerTools}
 
-`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions).
+`pkgs.dockerTools` is a set of functions for creating and manipulating Docker images according to the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md).
 Docker itself is not used to perform any of the operations done by these functions.
 
 ## buildImage {#ssec-pkgs-dockerTools-buildImage}
@@ -130,7 +130,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 `config` (Attribute Set or Null; _optional_)
 
 : Used to specify the configuration of the containers that will be started off the generated image.
-  Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.0](https://github.com/moby/moby/blob/46f7ab808b9504d735d600e259ca0723f76fb164/image/spec/spec.md#image-json-field-descriptions).
+  Must be an attribute set, with each attribute as listed in the [Docker Image Specification v1.3.1](https://github.com/moby/docker-image-spec/blob/v1.3.1/spec.md#image-json-field-descriptions).
 
   _Default value:_ `null`.
 
@@ -138,7 +138,7 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 
 : Used to specify the image architecture.
   This is useful for multi-architecture builds that don't need cross compiling.
-  If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/main/config.md#properties), which should still be compatible with Docker.
+  If specified, its value should follow the [OCI Image Configuration Specification](https://github.com/opencontainers/image-spec/blob/v1.1.1/config.md#properties), which should still be compatible with Docker.
   According to the linked specification, all possible values for `$GOARCH` in [the Go docs](https://go.dev/doc/install/source#environment) should be valid, but will commonly be one of `386`, `amd64`, `arm`, or `arm64`.
 
   _Default value:_ the same value from `pkgs.go.GOARCH`.
@@ -202,6 +202,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 
   _Default value:_ `false`.
 
+`meta` (Attribute Set)
+
+: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes.
+
 `contents` **DEPRECATED**
 
 : This attribute is deprecated, and users are encouraged to use `copyToRoot` instead.
@@ -635,6 +639,10 @@ This allows the function to produce reproducible images.
 
   _Default value:_ `false`.
 
+`meta` (Attribute Set)
+
+: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes.
+
 `passthru` (Attribute Set; _optional_)
 
 : Use this to pass any attributes as [`passthru`](#chap-passthru) for the resulting derivation.
diff --git a/doc/build-helpers/testers.chapter.md b/doc/build-helpers/testers.chapter.md
index e4e8ddbb2c17..49407c6e9b8e 100644
--- a/doc/build-helpers/testers.chapter.md
+++ b/doc/build-helpers/testers.chapter.md
@@ -421,6 +421,11 @@ Check that two paths have the same contents.
 
 : A message that is printed last if the file system object contents at the two paths don't match exactly.
 
+`checkMetadata` (boolean)
+
+: Whether to fail on metadata differences, such as permissions or ownership.
+  Defaults to `true`.
+
 :::{.example #ex-testEqualContents-toyexample}
 
 # Check that two paths have the same contents
diff --git a/doc/hooks/cmake.section.md b/doc/hooks/cmake.section.md
index 427a03a73986..afaa5b21bcf1 100644
--- a/doc/hooks/cmake.section.md
+++ b/doc/hooks/cmake.section.md
@@ -30,6 +30,14 @@ This setting has no tangible effect when running the build in a sandboxed deriva
 
 The default value is `build`.
 
+#### `cmakeBuildType` {#cmake-build-type}
+
+Build type of cmake output.
+
+Internally populates the `CMAKE_BUILD_TYPE` cmake flag.
+
+The default value is `Release`.
+
 #### `dontUseCmakeConfigure` {#dont-use-cmake-configure}
 
 When set to true, don't use the predefined `cmakeConfigurePhase`.
diff --git a/doc/hooks/index.md b/doc/hooks/index.md
index cd04fd84495a..cd769cec0373 100644
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@@ -20,6 +20,7 @@ ghc.section.md
 gnome.section.md
 haredo.section.md
 installShellFiles.section.md
+julec.section.md
 just.section.md
 libiconv.section.md
 libxml2.section.md
diff --git a/doc/hooks/julec.section.md b/doc/hooks/julec.section.md
new file mode 100644
index 000000000000..f85619ac39e7
--- /dev/null
+++ b/doc/hooks/julec.section.md
@@ -0,0 +1,77 @@
+# julec.hook {#julec-hook}
+
+[Jule](https://jule.dev) is an effective programming language designed to build efficient, fast, reliable and safe software while maintaining simplicity.
+
+In Nixpkgs, `jule.hook` overrides the default build, check and install phases.
+
+## Example code snippet {#julec-hook-example-code-snippet}
+
+```nix
+{
+  julec,
+  clangStdenv,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  # ...
+
+  nativeBuildInputs = [ julec.hook ];
+
+  # Customize filenames if needed
+  JULE_SRC_DIR = "./src";
+  JULE_OUT_DIR = "./bin";
+  JULE_OUT_NAME = "hello-jule";
+  JULE_TEST_DIR = "./tests";
+  JULE_TEST_OUT_DIR = "./test-bin";
+  JULE_TEST_OUT_NAME = "hello-jule-test";
+
+  # ...
+})
+```
+
+## Variables controlling julec.hook {#julec-hook-variables}
+
+### `JULE_SRC_DIR` {#julec-hook-variable-jule-src-dir}
+
+Specifies the source directory containing `main.jule`.
+Default is `./src`.
+
+### `JULE_OUT_DIR` {#julec-hook-variable-jule-out-dir}
+
+Specifies the output directory for the compiled binary.
+Default is `./bin`.
+
+### `JULE_OUT_NAME` {#julec-hook-variable-jule-out-name}
+
+Specifies the name of the compiled binary.
+Default is `output`.
+
+### `JULE_TEST_DIR` {#julec-hook-variable-jule-test-dir}
+
+Specifies the directory containing test files.
+Default is the value of [`JULE_SRC_DIR`](#julec-hook-variable-jule-src-dir).
+
+### `JULE_TEST_OUT_DIR` {#julec-hook-variable-jule-test-out-dir}
+
+Specifies the output directory for compiled test binaries.
+Default is the value of [`JULE_OUT_DIR`](#julec-hook-variable-jule-out-dir).
+
+### `JULE_TEST_OUT_NAME` {#julec-hook-variable-jule-test-out-name}
+
+Specifies the name of the compiled test binary.
+Default is the value of [`JULE_OUT_NAME`](#julec-hook-variable-jule-out-name) with `-test` suffix.
+
+### `dontUseJulecBuild` {#julec-hook-variable-dontusejulecbuild}
+
+When set to true, doesn't use the predefined `julecBuildHook`.
+Default is false.
+
+### `dontUseJulecCheck` {#julec-hook-variable-dontusejuleccheck}
+
+When set to true, doesn't use the predefined `julecCheckHook`.
+Default is false.
+
+### `dontUseJulecInstall` {#julec-hook-variable-dontusejulecinstall}
+
+When set to true, doesn't use the predefined `julecInstallHook`.
+Default is false.
diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index a469cdd42188..01b70402cf48 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -26,23 +26,9 @@ All CUDA package sets include common CUDA packages like `libcublas`, `cudnn`, `t
 CUDA support is not enabled by default in Nixpkgs. To enable CUDA support, make sure Nixpkgs is imported with a configuration similar to the following:
 
 ```nix
+{ pkgs }:
 {
-  allowUnfreePredicate =
-    let
-      ensureList = x: if builtins.isList x then x else [ x ];
-    in
-    package:
-    builtins.all (
-      license:
-      license.free
-      || builtins.elem license.shortName [
-        "CUDA EULA"
-        "cuDNN EULA"
-        "cuSPARSELt EULA"
-        "cuTENSOR EULA"
-        "NVidia OptiX EULA"
-      ]
-    ) (ensureList package.meta.license);
+  allowUnfreePredicate = pkgs._cuda.lib.allowUnfreeCudaPredicate;
   cudaCapabilities = [ <target-architectures> ];
   cudaForwardCompat = true;
   cudaSupport = true;
@@ -63,45 +49,23 @@ The `cudaForwardCompat` boolean configuration option determines whether PTX supp
 
 ### Modifying CUDA package sets {#cuda-modifying-cuda-package-sets}
 
-CUDA package sets are created by using `callPackage` on `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets.
+CUDA package sets are defined in `pkgs/top-level/cuda-packages.nix`. A CUDA package set is created by `callPackage`-ing `pkgs/development/cuda-modules/default.nix` with an attribute set `manifests`, containing NVIDIA manifests for each redistributable. The manifests for supported redistributables are available through `_cuda.manifests` and live in `pkgs/development/cuda-modules/_cuda/manifests`.
 
-::: {.caution}
-The `cudaMajorMinorVersion` and `_cuda` attributes are not part of the CUDA package set fixed-point, but are instead provided by `callPackage` from the top-level in the construction of the package set. As such, they must be modified via the package set's `override` attribute.
-:::
+The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets. As a fixed-point, `_cuda` should be modified through its `extend` attribute.
 
 ::: {.caution}
 As indicated by the underscore prefix, `_cuda` is an implementation detail and no guarantees are provided with respect to its stability or API. The `_cuda` attribute set is exposed only to ease creation or modification of CUDA package sets by expert, out-of-tree users.
 :::
 
+Out-of-tree modifications of packages should use `overrideAttrs` to make any necessary modifications to the package expression.
+
 ::: {.note}
-The `_cuda` attribute set fixed-point should be modified through its `extend` attribute.
+The `_cuda` attribute set previously exposed `fixups`, an attribute set mapping from package name (`pname`) to a `callPackage`-compatible expression which provided to `overrideAttrs` on the result of a generic redistributable builder. This functionality has been removed in favor of including full package expressions for each redistributable package to ensure consistent attribute set membership across supported CUDA releases, platforms, and configurations.
 :::
 
-The `_cuda.fixups` attribute set is a mapping from package name (`pname`) to a `callPackage`-compatible expression which will be provided to `overrideAttrs` on the result of our generic builder.
-
-::: {.caution}
-Fixups are chosen from `_cuda.fixups` by `pname`. As a result, packages with multiple versions (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function (i.e., `_cuda.fixups.cudnn`, which is `pkgs/development/cuda-modules/fixups/cudnn.nix`).
-:::
-
-As an example, you can change the fixup function used for cuDNN for only the default CUDA package set with this overlay:
-
-```nix
-final: prev: {
-  cudaPackages = prev.cudaPackages.override (prevArgs: {
-    _cuda = prevArgs._cuda.extend (
-      _: prevAttrs: {
-        fixups = prevAttrs.fixups // {
-          cudnn = <your-fixup-function>;
-        };
-      }
-    );
-  });
-}
-```
-
 ### Extending CUDA package sets {#cuda-extending-cuda-package-sets}
 
-CUDA package sets are scopes and provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
+CUDA package sets are scopes and provide the usual `overrideScope` attribute for overriding package attributes (see the note about `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
 
 Inspired by `pythonPackagesExtensions`, the `_cuda.extensions` attribute is a list of extensions applied to every version of the CUDA package set, allowing modification of all versions of the CUDA package set without needing to know their names or explicitly enumerate and modify them. As an example, disabling `cuda_compat` across all CUDA package sets can be accomplished with this overlay:
 
@@ -115,6 +79,8 @@ final: prev: {
 }
 ```
 
+Redistributable packages are constructed by the `buildRedist` helper; see `pkgs/development/cuda-modules/buildRedist/default.nix` for the implementation.
+
 ### Using `cudaPackages` {#cuda-using-cudapackages}
 
 ::: {.caution}
@@ -194,7 +160,7 @@ In `pkgsForCudaArch`, the `cudaForwardCompat` option is set to `false` because e
 ::: {.caution}
 Not every version of CUDA supports every architecture!
 
-To illustrate: support for Blackwell (e.g., `sm_100`) was added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In that case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using cudaPackages.pkgs](#cuda-using-cudapackages-pkgs) for more details).
+To illustrate: support for Blackwell (e.g., `sm_100`) was added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In that case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using `cudaPackages.pkgs`](#cuda-using-cudapackages-pkgs) for more details).
 :::
 
 The `pkgsForCudaArch` attribute set makes it possible to access packages built for a specific architecture without needing to manually call `pkgs.extend` and supply a new `config`. As an example, `pkgsForCudaArch.sm_89.python3Packages.torch` provides PyTorch built for Ada Lovelace GPUs.
@@ -306,82 +272,41 @@ This section of the docs is still very much in progress. Feedback is welcome in
 
 ### Package set maintenance {#cuda-package-set-maintenance}
 
-The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
+The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
 
-All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update.
+While the monolithic CUDA Toolkit runfile installer is no longer provided, [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) provides a `symlinkJoin`-ed approximation which common libraries. The use of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) is discouraged: all new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) instead, as they are much easier to maintain and update.
 
 #### Updating redistributables {#cuda-updating-redistributables}
 
-1. Go to NVIDIA's index of CUDA redistributables: <https://developer.download.nvidia.com/compute/cuda/redist/>
-2. Make a note of the new version of CUDA available.
-3. Run
+Whenever a new version of a redistributable manifest is made available:
 
-   ```bash
-   nix run github:connorbaker/cuda-redist-find-features -- \
-      download-manifests \
-      --log-level DEBUG \
-      --version <newest CUDA version> \
-      https://developer.download.nvidia.com/compute/cuda/redist \
-      ./pkgs/development/cuda-modules/cuda/manifests
-   ```
+1. Check the corresponding README.md in `pkgs/development/cuda-modules/_cuda/manifests` for the URL to use when vendoring manifests.
+2. Update the manifest version used in construction of each CUDA package set in `pkgs/top-level/cuda-packages.nix`.
+3. Update package expressions in `pkgs/development/cuda-modules/packages`.
 
-   This will download a copy of the manifest for the new version of CUDA.
-4. Run
+Updating package expressions amounts to:
 
-   ```bash
-   nix run github:connorbaker/cuda-redist-find-features -- \
-      process-manifests \
-      --log-level DEBUG \
-      --version <newest CUDA version> \
-      https://developer.download.nvidia.com/compute/cuda/redist \
-      ./pkgs/development/cuda-modules/cuda/manifests
-   ```
-
-   This will generate a `redistrib_features_<newest CUDA version>.json` file in the same directory as the manifest.
-5. Update the `cudaVersionMap` attribute set in `pkgs/development/cuda-modules/cuda/extension.nix`.
-
-#### Updating cuTensor {#cuda-updating-cutensor}
-
-1. Repeat the steps present in [Updating CUDA redistributables](#cuda-updating-redistributables) with the following changes:
-   - Use the index of cuTensor redistributables: <https://developer.download.nvidia.com/compute/cutensor/redist>
-   - Use the newest version of cuTensor available instead of the newest version of CUDA.
-   - Use `pkgs/development/cuda-modules/cutensor/manifests` instead of `pkgs/development/cuda-modules/cuda/manifests`.
-   - Skip the step of updating `cudaVersionMap` in `pkgs/development/cuda-modules/cuda/extension.nix`.
+- adding fixes conditioned on newer releases, like added or removed dependencies
+- adding package expressions for new packages
+- updating `passthru.brokenConditions` and `passthru.badPlatformsConditions` with various constraints, (e.g., new releases removing support for various architectures)
 
 #### Updating supported compilers and GPUs {#cuda-updating-supported-compilers-and-gpus}
 
-1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
-
-#### Updating the CUDA Toolkit runfile installer {#cuda-updating-the-cuda-toolkit}
-
-::: {.warning}
-While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended, and it should be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
-
-To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available.
-:::
-
-1. Go to NVIDIA's CUDA Toolkit runfile installer download page: <https://developer.nvidia.com/cuda-downloads>
-2. Select the appropriate OS, architecture, distribution, and version, and installer type.
-
-   - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local)
-   - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work.
-
-3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running:
-
-   ```bash
-   nix store prefetch-file --hash-type sha256 <link>
-   ```
-
-4. Update `pkgs/development/cuda-modules/cudatoolkit/releases.nix` to include the release.
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix` to include any new GPUs supported by the new release of CUDA.
 
 #### Updating the CUDA package set {#cuda-updating-the-cuda-package-set}
 
-1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/all-packages.nix`.
+::: {.note}
+Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing.
+:::
 
-   - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing.
+::: {.warning}
+As described in [Using `cudaPackages.pkgs`](#cuda-using-cudapackages-pkgs), the current implementation fix for package set leakage involves creating a new instance for each non-default CUDA package sets. As such, We should limit the number of CUDA package sets which have `recurseForDerivations` set to true: `lib.recurseIntoAttrs` should only be applied to the default CUDA package set.
+:::
 
-2. Successfully build the closure of the new package set, updating `pkgs/development/cuda-modules/cuda/overrides.nix` as needed. Below are some common failures:
+1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/cuda-packages.nix` and inherit it in `pkgs/top-level/all-packages.nix`.
+2. Successfully build the closure of the new package set, updating expressions in `pkgs/development/cuda-modules/packages` as needed. Below are some common failures:
 
 | Unable to ...  | During ...                       | Reason                                           | Solution                   | Note                                                         |
 | -------------- | -------------------------------- | ------------------------------------------------ | -------------------------- | ------------------------------------------------------------ |
@@ -389,6 +314,13 @@ To ensure packages relying on the CUDA Toolkit runfile installer continue to bui
 | Find libraries | `configurePhase`                 | Missing dependency on a `dev` output             | Add the missing dependency | The `dev` output typically contains CMake configuration files |
 | Find libraries | `buildPhase` or `patchelf`       | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contains the libraries |
 
+::: {.note}
+Two utility derivations ease testing updates to the package set:
+
+- `cudaPackages.tests.redists-unpacked`: the `src` of each redistributable package unpacked and `symlinkJoin`-ed
+- `cudaPackages.tests.redists-installed`: each output of each redistributable package `symlinkJoin`-ed
+:::
+
 Failure to run the resulting binary is typically the most challenging to diagnose, as it may involve a combination of the aforementioned issues. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. Try the following debugging steps:
 
 1. First ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath).
diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md
index d99fe9337ecc..37e840935689 100644
--- a/doc/languages-frameworks/gradle.section.md
+++ b/doc/languages-frameworks/gradle.section.md
@@ -129,7 +129,7 @@ The update script does the following:
 `fetchDeps` takes the following arguments:
 
 - `attrPath` - the path to the package in nixpkgs (for example,
-  `"javaPackages.openjfx22"`). Used for update script metadata.
+  `"javaPackages.openjfx25"`). Used for update script metadata.
 - `pname` - an alias for `attrPath` for convenience. This is what you
   will generally use instead of `pkg` or `attrPath`.
 - `pkg` - the package to be used for fetching the dependencies. Defaults
diff --git a/doc/languages-frameworks/haskell.section.md b/doc/languages-frameworks/haskell.section.md
index d9246994676d..f81c1b77d84e 100644
--- a/doc/languages-frameworks/haskell.section.md
+++ b/doc/languages-frameworks/haskell.section.md
@@ -260,6 +260,14 @@ the same package with the `previousIntermediates` argument to support
 incremental builds. See [“Incremental builds”](#haskell-incremental-builds) for
 more information. Defaults to `false`.
 
+`dontConvertCabalFileToUnix`
+: By default, `haskellPackages.mkDerivation` converts the `.cabal` file of a
+given package to Unix line endings.
+This is intended to work around
+[Hackage converting revised `.cabal` files to DOS line endings](https://github.com/haskell/hackage-server/issues/316)
+which frequently causes patches to stop applying.
+You can pass `true` to disable this behavior.
+
 `enableLibraryProfiling`
 : Whether to enable [profiling][profiling] for libraries contained in the
 package. Enabled by default if supported.
@@ -1249,8 +1257,8 @@ it does for the unstable branches.
 ### Why is topic X not covered in this section? Why is section Y missing? {#haskell-why-not-covered}
 
 We have been working on [moving the nixpkgs Haskell documentation back into the
-nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this
-process has not been completed yet, you may find some topics missing here
+nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). <!-- krank:ignore-line -->
+Since this process has not been completed yet, you may find some topics missing here
 covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/).
 
 If you feel any important topic is not documented at all, feel free to comment
diff --git a/doc/languages-frameworks/idris2.section.md b/doc/languages-frameworks/idris2.section.md
index 953222b9b315..a9b524250a37 100644
--- a/doc/languages-frameworks/idris2.section.md
+++ b/doc/languages-frameworks/idris2.section.md
@@ -1,5 +1,57 @@
 # Idris2 {#sec-idris2}
 
+When developing using Idris2, by default the Idris compiler only has the minimal support libraries in its environment. This means that it will not attempt to read any libraries installed
+globally, for example in the `$HOME` directory. The recommended way to use Idris2 is to wrap the compiler in an environment that provides these packages per-project, for example in a
+devShell.
+
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  packages = [ (idris2.withPackages (p: [ p.idris2Api ])) ];
+}
+```
+or, alternatively if Nix is used to build the Idris2 project:
+
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  inputsFrom = [ (pkgs.callPackage ./package.nix { }) ];
+}
+```
+
+By default, the Idris2 compiler provided by Nixpkgs does not read globally installed packages, nor can install them. Running `idris2 --install` will fail because the Nix store is
+a read-only file-system. If globally-installed packages are desired rather than the above strategy, one can set `IDRIS2_PREFIX`, or additional `IDRIS2_PACKAGE_PATH` entries
+for the compiler to read from. The following snippet will append `$HOME/.idris2` to `$IDRIS2_PACKAGE_PATH`, and if such a variable does not exist, create it. The Nixpkg's Idris2
+compiler append a few required libraries to this path variable, but any paths in the user's environment will be prefixed to those libraries.
+
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  packages = [ (idris2.withPackages (p: [ p.idris2Api ])) ];
+  shellHook = ''
+    IDRIS2_PACKAGE_PATH="''${IDRIS2_PACKAGE_PATH:+$IDRIS2_PACKAGE_PATH}$HOME/.idris2"
+  '';
+}
+```
+The following snippet will allow the Idris2 to run `idris2 --install` successfully:
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  packages = [ (idris2.withPackages (p: [ p.idris2Api ])) ];
+  shellHook = ''
+    IDRIS2_PREFIX="$HOME/.idris2"
+  '';
+}
+```
+
 In addition to exposing the Idris2 compiler itself, Nixpkgs exposes an `idris2Packages.buildIdris` helper to make it a bit more ergonomic to build Idris2 executables or libraries.
 
 The `buildIdris` function takes an attribute set that defines at a minimum the `src` and `ipkgName` of the package to be built and any `idrisLibraries` required to build it. The `src` is the same source you're familiar with and the `ipkgName` must be the name of the `ipkg` file for the project (omitting the `.ipkg` extension). The `idrisLibraries` is a list of other library derivations created with `buildIdris`. You can optionally specify other derivation properties as needed but sensible defaults for `configurePhase`, `buildPhase`, and `installPhase` are provided.
@@ -56,3 +108,20 @@ lspPkg.executable
 ```
 
 The above uses the default value of `withSource = false` for the `idris2Api` but could be modified to include that library's source by passing `(idris2Api { withSource = true; })` to `idrisLibraries` instead. `idris2Api` in the above derivation comes built in with `idris2Packages`. This library exposes many of the otherwise internal APIs of the Idris2 compiler.
+
+The compiler package can be instantiated with packages on its `IDRIS2_PACKAGES` path from the `idris2Packages` set.
+
+```nix
+{
+  idris2,
+  devShell,
+}:
+let
+  myIdris = idris2.withPackages (p: [ p.idris2Api ]);
+in
+devShell {
+  packages = [ myIdris ];
+}
+```
+
+This search path is extended from the path already in the user's environment.
diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md
index 71269aa6c030..3f4b6c48e764 100644
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@@ -20,7 +20,7 @@ Each supported language or software ecosystem has its own package set named `<la
   $ nix repl '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable
   nix-repl> javaPackages.<tab>
   javaPackages.compiler               javaPackages.openjfx15              javaPackages.openjfx21              javaPackages.recurseForDerivations
-  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx22
+  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx25
   javaPackages.mavenfod               javaPackages.openjfx19              javaPackages.override
   javaPackages.openjfx11              javaPackages.openjfx20              javaPackages.overrideDerivation
   ```
diff --git a/doc/languages-frameworks/php.section.md b/doc/languages-frameworks/php.section.md
index 9f221679ce22..988fa659f0aa 100644
--- a/doc/languages-frameworks/php.section.md
+++ b/doc/languages-frameworks/php.section.md
@@ -214,6 +214,12 @@ code, while others choose not to.
 
 In Nix, there are multiple approaches to building a Composer-based project.
 
+::: {.warning}
+`buildComposerProject2` has a [known bug](https://github.com/NixOS/nixpkgs/issues/451395)
+where the `vendorHash` changes every time a Composer release happens that changes the
+`autoload.php` or vendored composer code.
+:::
+
 One such method is the `php.buildComposerProject2` helper function, which serves
 as a wrapper around `mkDerivation`.
 
diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 61c211c0dfcb..fad930c8206d 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -557,6 +557,19 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function).
   with the `pipInstallHook`.
 - `unittestCheckHook` will run tests with `python -m unittest discover`. See [example usage](#using-unittestcheckhook).
 
+#### Overriding build helpers {#overriding-python-build-helpers}
+
+Like many of the build helpers provided by Nixpkgs, Python build helpers typically provide a `<function>.override` attribute.
+It works like [`<pkg>.override`](#sec-pkg-override), and can be used to override the dependencies of each build helper.
+
+This allows specifying the stdenv to be used by `buildPythonPackage` or `buildPythonApplication`. The default (`python.stdenv`) can be overridden as follows:
+
+```nix
+buildPythonPackage.override { stdenv = customStdenv; } {
+  # package attrs...
+}
+```
+
 ## User Guide {#user-guide}
 
 ### Using Python {#using-python}
diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index 62ab8b309635..cf2062845426 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -273,6 +273,8 @@ To test that it works, you can then try using the gem with:
 NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])"
 ```
 
+To check the gems for any security vulnerabilities, run `./maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash`.
+
 ### Packaging applications {#packaging-applications}
 
 A common task is to add a Ruby executable to Nixpkgs; popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables. Otherwise, the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used.
diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index b4fb5d067f0d..b3305e259044 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -235,7 +235,7 @@ runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; } ''
 The font cache for LuaLaTeX is written to `$HOME`.
 Therefore, it is necessary to set `$HOME` to a writable path, e.g. [before using LuaLaTeX in nix derivations](https://github.com/NixOS/nixpkgs/issues/180639):
 ```nix
-runCommandNoCC "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
+runCommand "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
   mkdir $out
   echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex
   env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex
diff --git a/doc/old/cross.txt b/doc/old/cross.txt
deleted file mode 100644
index 0f958e772b78..000000000000
--- a/doc/old/cross.txt
+++ /dev/null
@@ -1,329 +0,0 @@
-Setting up a cross compiler with Nix
-
-"Cross compilation" means compiling a program on one machine for another
-type of machine. A typical use of cross compilation is to compile programs
-for embedded devices. These devices often don't have the computing power
-and memory to compile programs natively.
-
-For a fully working cross compiler the following are needed:
-
-* cross binutils: assembler, archiver, linker, etcetera that understand
-the format of the target system
-
-* cross compiler: a compiler that can generate binary code and object files
-for the target platform
-
-* cross C library: a library to link object files with to create fully
-functional programs
-
-Cross compilers are difficult to set up. A lot of people report that they
-cannot succeed in building a cross toolchain successfully. The answers
-usually consist of "download this pre-built toolchain", which is equally
-unhelpful.
-
-A toolchain is set up in five steps:
-
-1. build binutils to that can run on the host platform, but generate code
-for the target platform
-
-2. build Linux kernel headers for the target platform
-
-3. build a minimal C only version of GCC, that can run on the host platform
-and generate code for the target platform
-
-4. build a C library for the target platform. This includes the dynamic
-linker, C library, etc.
-
-5. build a full GCC
-
-****
-NB:
-
-Keep in mind that many programs are not very well suited for cross
-compilation. Either they are not intended to run on other platforms,
-because the code is highly platform specific, or the configuration process
-is not written with cross compilation in mind.
-
-Nix will not solve these problems for you!
-***
-
-This document describes to set up a cross compiler to generate code for
-arm-linux with uClibc and runs on i686-linux. The "stdenv" used is the
-default from the standard Nix packages collection.
-
-Step 1: build binutils for arm-linux in the stdenv for i686-linux
-
----
-{stdenv, fetchurl, noSysDirs}:
-
-stdenv.mkDerivation {
-  name = "binutils-2.16.1-arm";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2";
-    hash = "sha256-14pv+YKrL3NyFwbnv9MoWsZHgEZk5+pHhuZtAfkcVsU=";
-  };
-  inherit noSysDirs;
-  configureFlags = [ "--target=arm-linux" ];
-}
----
-
-This will compile binutils that will run on i686-linux, but knows the
-format used by arm-linux.
-
-Step 2: build kernel headers for the target architecture
-
-  default.nix for kernel-headers-arm:
-
----
-{stdenv, fetchurl}:
-
-assert stdenv.buildPlatform.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.13.1-arm";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2";
-    hash = "sha256-qtICDjfiA1HxWBrHqtB5DCv9s9/HyznKV1C6IxCrHYs=";
-  };
-}
----
-
-  builder.sh for kernel-headers-arm:
-
----
-source $stdenv/setup
-
-
-buildPhase() {
-    make include/linux/version.h
-}
-
-buildPhase=buildPhase
-
-
-installPhase() {
-    mkdir $out
-    mkdir $out/include
-    #cd $out/include
-    #ln -s asm-arm asm
-    make include/asm ARCH=arm
-    cp -prvd include/linux include/asm include/asm-arm include/asm-generic $out/include
-    echo -n > $out/include/linux/autoconf.h
-}
-
-installPhase=installPhase
-
-
-genericBuild
----
-
-Step 3: build a minimal GCC
-
-Extra/different parameters include the target platform and the kernel
-headers argument (this needs a major cleanup, as well as the name, it
-needs to be different!). Profiled compilers are disabled. The tarball
-used here is just gcc-core. For some reason it doesn't install nicely
-if the whole tarball is used (or is this some braino on my side? -- AH).
-
-Only C is used, because for other languages (such as C++) extra libraries
-need to be compiled, for which libraries compiled for the target system
-are needed.
-
-There is a bit of evilness going on. The cross compiled utilities need
-to be either copied to or be linked from the output tree of the compiler.
-(Is this really true? Back this up with arguments! -- AH)
-
-Symbolic links are not something we want inside the Nix store.
-
----
-{ stdenv, fetchurl, noSysDirs
-, langC ? true, langCC ? true, langF77 ? false
-, profiledCompiler ? false
-, binutilsArm
-, kernelHeadersArm
-}:
-
-assert langC;
-
-stdenv.mkDerivation {
-  name = "gcc-4.0.2-arm";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2";
-    hash = "sha256-LANmXRS7/fN2zF5JUJVd8OjNA5aCDsGLQKhSpxWA3Qk=";
-  };
-  # !!! apply only if noSysDirs is set
-  patches = [./no-sys-dirs.patch ./gcc-inhibit.patch];
-  inherit noSysDirs langC langCC langF77 profiledCompiler;
-  buildInputs = [binutilsArm];
-  inherit kernelHeadersArm binutilsArm;
-  platform = "arm-linux";
-}
----
-
-The builder.sh for a cross-compiler. Note that the binutils are prefixed
-with the architecture name, so arm-linux-ld instead of ld, etc. This is
-necessary because when we cross-compile a lot of programs look for these
-tools with these specific names. The standard gcc-wrapper does not take this
-into account yet.
-
----
-source $stdenv/setup
-
-
-export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-mkdir $NIX_FIXINC_DUMMY
-
-
-if test "$noSysDirs" = "1"; then
-
-    if test "$noSysDirs" = "1"; then
-        # Figure out what extra flags to pass to the gcc compilers
-        # being generated to make sure that they use our glibc.
-        if test -e $NIX_CC/nix-support/orig-glibc; then
-            glibc=$(cat $NIX_CC/nix-support/orig-glibc)
-            # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
-            # source in $NIX_CC/nix-support/add-flags, since that
-            # would cause *this* GCC to be linked against the
-            # *previous* GCC.  Need some more modularity there.
-            extraCFlags="-B$glibc/lib -isystem $glibc/include"
-            extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
-              -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
-
-            # Oh, what a hack.  I should be shot for this.
-            # In stage 1, we should link against the previous GCC, but
-            # not afterwards.  Otherwise we retain a dependency.
-            # However, ld-wrapper, which adds the linker flags for the
-            # previous GCC, is also used in stage 2/3.  We can prevent
-            # it from adding them by NIX_GLIBC_FLAGS_SET, but then
-            # gcc-wrapper will also not add them, thereby causing
-            # stage 1 to fail.  So we use a trick to only set the
-            # flags in gcc-wrapper.
-            hook=$(pwd)/ld-wrapper-hook
-            echo "NIX_GLIBC_FLAGS_SET=1" > $hook
-            export NIX_LD_WRAPPER_START_HOOK=$hook
-        fi
-
-        export NIX_EXTRA_CFLAGS=$extraCFlags
-        export NIX_EXTRA_LDFLAGS=$extraLDFlags
-        export CFLAGS=$extraCFlags
-        export CXXFLAGS=$extraCFlags
-        export LDFLAGS=$extraLDFlags
-    fi
-
-else
-    patches=""
-fi
-
-
-preConfigure=preConfigure
-preConfigure() {
-
-    # Determine the frontends to build.
-    langs="c"
-    if test -n "$langCC"; then
-        langs="$langs,c++"
-    fi
-    if test -n "$langF77"; then
-        langs="$langs,f77"
-    fi
-
-    # Cross compiler evilness
-    mkdir -p $out
-    mkdir -p $out/arm-linux
-    mkdir -p $out/arm-linux/bin
-    ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
-    ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
-    ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar
-    ln -s $binutilsArm/arm-linux/bin/ranlib $out/arm-linux/bin/ranlib
-
-    # Perform the build in a different directory.
-    mkdir ../build
-    cd ../build
-
-    configureScript=../$sourceRoot/configure
-    configureFlags="--enable-languages=$langs --target=$platform --disable-threads --disable-libmudflap --disable-shared --with-headers=$kernelHeadersArm/include --disable-multilib"
-}
-
-
-postInstall=postInstall
-postInstall() {
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
-
-    # Remove `fixincl' to prevent a retained dependency on the
-    # previous gcc.
-    rm -rf $out/libexec/gcc/*/*/install-tools
-}
-
-
-#if test -z "$profiledCompiler"; then
-    #makeFlags="bootstrap"
-#else
-    #makeFlags="profiledbootstrap"
-#fi
-
-genericBuild
----
-
-Step 4: build a C library for the target platform.
-
-The previous steps are enough to compile a C library. In our case we take
-uClibc. It's intended to be a small sized replacement for glibc. It is widely
-used in embedded environments.
-
-...
-
-Step 5: Build a compiler to link with the newly built C library.
-
-...
-
-If we restrict the compiler to just C programs it is relatively easy,
-since we only need to wrap the GCC we built in the previous step with all
-the right tools and the right C library. Successfully compiled programs with
-this compiler and verified to be working on a HP Jornada 820 running Linux
-are "patch", "make" and "wget".
-
-If we want to build C++ programs it gets a lot more difficult. GCC has a
-three step compilation process. In the first step a simple compiler, called
-xgcc, that can compile only C programs is built. With that compiler it
-compiles itself two more times: one time to build a full compiler, and another
-time to build a full compiler once again with the freshly built compiler from
-step 2. In the second and third step support for C++ is compiled, if this
-is configured.
-
-One of the libraries that has to be built for C++ support step is libstdc++.
-This library uses xgcc, even when cross compiling, since libstdc++ has to be
-compiled for arm-linux.
-
-One of the compiler flags that GCC uses for this compiler is called X_CFLAGS.
-This is used by the Nix build process to set the dynamic linker, glibc
-in the case of i686-linux using the default Nix packages collection.
-
-Obviously, since we need to compile libstc++ for arm-linux with uClibc linking
-will not be done correctly: you can't link object files built for arm-linux
-with a glibc built for i686-linux.
-
-Setting X_CFLAGS to use the uClibc libraries and dynamic linker will fail
-too. Earlier on in the build process these flags are used to compile important
-files like libgcc.a by the host system gcc, which does need to be linked
-to glibc. To make this work correctly you will need to carefully juggle
-with compilation flags. This is still work in progress for Nix.
-
-
----
-
-After successfully completing the whole toolchain you can start building
-packages with the newly built tools. To make everything build correctly
-you will need a stdenv for your target platform. Setting up this platform
-will take some effort. Right now there is a very experimental setup for
-arm-linux, which needs to be cleaned up before it is production ready.
-
-Please note that many packages are not well suited for cross-compilation.
-Even though the package itself might be very well portable often the
-buildscripts are not. One thing that we have seen that causes frequent
-build failures is the use of the LD variable. This is often set to 'ld'
-and not $(CROSS)-ld.
diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md
index fb71a78d6eb3..da46e0ee8f7d 100644
--- a/doc/packages/darwin-builder.section.md
+++ b/doc/packages/darwin-builder.section.md
@@ -64,13 +64,15 @@ builders = ssh-ng://builder@linux-builder ${ARCH}-linux /etc/nix/builder_ed25519
 builders-use-substitutes = true
 ```
 
-To allow Nix to connect to a remote builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`:
+To allow Nix to connect to the default remote builder, which does not run on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`:
 
 ```
 Host linux-builder
   Hostname localhost
   HostKeyAlias linux-builder
   Port 31022
+  User builder
+  IdentityFile /etc/nix/builder_ed25519
 ```
 
 … and then restart your Nix daemon to apply the change:
@@ -79,6 +81,8 @@ Host linux-builder
 $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
 ```
 
+Note that if the builder is running and you have created the above ssh conf file, you can ssh into the builder with `sudo ssh builder@linux-builder`.
+
 ## Example flake usage {#sec-darwin-builder-example-flake}
 
 ```nix
diff --git a/doc/packages/index.md b/doc/packages/index.md
index 623fbe357d54..dbfe60ca3227 100644
--- a/doc/packages/index.md
+++ b/doc/packages/index.md
@@ -22,6 +22,7 @@ lhapdf.section.md
 locales.section.md
 etc-files.section.md
 nginx.section.md
+nrfutil.section.md
 opengl.section.md
 shell-helpers.section.md
 python-tree-sitter.section.md
diff --git a/doc/packages/linux.section.md b/doc/packages/linux.section.md
index 8551c77d940d..9722b22fd2f5 100644
--- a/doc/packages/linux.section.md
+++ b/doc/packages/linux.section.md
@@ -5,7 +5,7 @@ The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/ke
 The function [`pkgs.buildLinux`](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/generic.nix) builds a kernel with [common configuration values](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/common-config.nix).
 This is the preferred option unless you have a very specific use case.
 Most kernels packaged in Nixpkgs are built that way, and it will also generate kernels suitable for NixOS.
-[`pkgs.linuxManualConfig`](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/manual-config.nix) requires a complete configuration to be passed.
+[`pkgs.linuxManualConfig`](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/build.nix) requires a complete configuration to be passed.
 It has fewer additional features than `pkgs.buildLinux`, which provides common configuration values and exposes the `features` attribute, as explained below.
 
 Both functions have an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`).
@@ -75,7 +75,7 @@ pkgs.linuxPackages_custom {
 
 :::
 
-Additional attributes can be used with `linuxManualConfig` for further customisation instead of `linuxPackages_custom`. You're encouraged to read [the `pkgs.linuxManualConfig` source code](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/manual-config.nix) to understand how to use them.
+Additional attributes can be used with `linuxManualConfig` for further customisation instead of `linuxPackages_custom`. You're encouraged to read [the `pkgs.linuxManualConfig` source code](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/build.nix) to understand how to use them.
 
 To edit the `.config` file for Linux X.Y from within Nix, proceed as follows:
 
diff --git a/doc/packages/nrfutil.section.md b/doc/packages/nrfutil.section.md
new file mode 100644
index 000000000000..5767b0e0b946
--- /dev/null
+++ b/doc/packages/nrfutil.section.md
@@ -0,0 +1,13 @@
+# nrfutil {#sec-nrfutil}
+
+nrfutil can be built with its installables as following:
+
+```nix
+(nrfutil.withExtensions [
+  "nrfutil-completion"
+  "nrfutil-device"
+  "nrfutil-trace"
+])
+```
+
+Keep in mind that all installables might not be available for every supported platform.
diff --git a/doc/redirects.json b/doc/redirects.json
index bb9f1188f88a..2570eec68018 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -58,9 +58,8 @@
   ],
   "cuda-updating-redistributables": [
     "index.html#cuda-updating-redistributables",
-    "index.html#updating-cuda-redistributables"
-  ],
-  "cuda-updating-cutensor": [
+    "index.html#updating-cuda-redistributables",
+    "index.html#updating-the-cuda-toolkit",
     "index.html#cuda-updating-cutensor",
     "index.html#updating-cutensor"
   ],
@@ -72,10 +71,6 @@
     "index.html#cuda-updating-the-cuda-package-set",
     "index.html#updating-the-cuda-package-set"
   ],
-  "cuda-updating-the-cuda-toolkit": [
-    "index.html#cuda-updating-the-cuda-toolkit",
-    "index.html#updating-the-cuda-toolkit"
-  ],
   "cuda-user-guide": [
     "index.html#cuda-user-guide"
   ],
@@ -124,6 +119,48 @@
   "inkscape-plugins": [
     "index.html#inkscape-plugins"
   ],
+  "libcxxhardeningextensive": [
+    "index.html#libcxxhardeningextensive"
+  ],
+  "libcxxhardeningfast": [
+    "index.html#libcxxhardeningfast"
+  ],
+  "julec-hook": [
+    "index.html#julec-hook"
+  ],
+  "julec-hook-example-code-snippet": [
+    "index.html#julec-hook-example-code-snippet"
+  ],
+  "julec-hook-variable-dontusejulecbuild": [
+    "index.html#julec-hook-variable-dontusejulecbuild"
+  ],
+  "julec-hook-variable-dontusejuleccheck": [
+    "index.html#julec-hook-variable-dontusejuleccheck"
+  ],
+  "julec-hook-variable-dontusejulecinstall": [
+    "index.html#julec-hook-variable-dontusejulecinstall"
+  ],
+  "julec-hook-variable-jule-out-dir": [
+    "index.html#julec-hook-variable-jule-out-dir"
+  ],
+  "julec-hook-variable-jule-out-name": [
+    "index.html#julec-hook-variable-jule-out-name"
+  ],
+  "julec-hook-variable-jule-src-dir": [
+    "index.html#julec-hook-variable-jule-src-dir"
+  ],
+  "julec-hook-variable-jule-test-dir": [
+    "index.html#julec-hook-variable-jule-test-dir"
+  ],
+  "julec-hook-variable-jule-test-out-dir": [
+    "index.html#julec-hook-variable-jule-test-out-dir"
+  ],
+  "julec-hook-variable-jule-test-out-name": [
+    "index.html#julec-hook-variable-jule-test-out-name"
+  ],
+  "julec-hook-variables": [
+    "index.html#julec-hook-variables"
+  ],
   "major-ghc-deprecation": [
     "index.html#major-ghc-deprecation"
   ],
@@ -216,6 +253,9 @@
   "sec-building-packages-with-llvm-using-clang-stdenv": [
     "index.html#sec-building-packages-with-llvm-using-clang-stdenv"
   ],
+  "sec-darwin-availability-checks": [
+    "index.html#sec-darwin-availability-checks"
+  ],
   "sec-darwin-libcxx-deployment-targets": [
     "index.html#sec-darwin-libcxx-deployment-targets"
   ],
@@ -322,6 +362,9 @@
   "sec-nixpkgs-release-25.05-notable-changes": [
     "release-notes.html#sec-nixpkgs-release-25.05-notable-changes"
   ],
+  "sec-nrfutil": [
+    "index.html#sec-nrfutil"
+  ],
   "sec-overlays-install": [
     "index.html#sec-overlays-install"
   ],
@@ -355,6 +398,24 @@
   "sec-pkg-overrideDerivation": [
     "index.html#sec-pkg-overrideDerivation"
   ],
+  "sec-platform-breakdown": [
+    "index.html#sec-platform-breakdown"
+  ],
+  "sec-platform-tier1": [
+    "index.html#sec-platform-tier1"
+  ],
+  "sec-platform-tier2": [
+    "index.html#sec-platform-tier2"
+  ],
+  "sec-platform-tier3": [
+    "index.html#sec-platform-tier3"
+  ],
+  "sec-platform-tier4-7": [
+    "index.html#sec-platform-tier4-7"
+  ],
+  "sec-platform-tiers": [
+    "index.html#sec-platform-tiers"
+  ],
   "sec-lib-makeOverridable": [
     "index.html#sec-lib-makeOverridable"
   ],
@@ -1190,7 +1251,8 @@
     "index.html#sec-purity-in-nixpkgs"
   ],
   "sec-hardening-in-nixpkgs": [
-    "index.html#sec-hardening-in-nixpkgs"
+    "index.html#sec-hardening-in-nixpkgs",
+    "index.html#pie"
   ],
   "sec-hardening-flags-enabled-by-default": [
     "index.html#sec-hardening-flags-enabled-by-default"
@@ -1225,9 +1287,6 @@
   "sec-hardening-flags-disabled-by-default": [
     "index.html#sec-hardening-flags-disabled-by-default"
   ],
-  "pie": [
-    "index.html#pie"
-  ],
   "shadowstack": [
     "index.html#shadowstack"
   ],
@@ -2366,6 +2425,9 @@
   "cmake-build-dir": [
     "index.html#cmake-build-dir"
   ],
+  "cmake-build-type": [
+    "index.html#cmake-build-type"
+  ],
   "dont-use-cmake-configure": [
     "index.html#dont-use-cmake-configure"
   ],
@@ -3765,6 +3827,9 @@
   "buildpythonpackage-parameters": [
     "index.html#buildpythonpackage-parameters"
   ],
+  "overriding-python-build-helpers": [
+    "index.html#overriding-python-build-helpers"
+  ],
   "overriding-python-packages": [
     "index.html#overriding-python-packages"
   ],
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 1d469c87dc7d..98d9f0826060 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -12,6 +12,18 @@
 - The default GHC version has been updated from 9.8 to 9.10.
   `haskellPackages` correspondingly uses Stackage LTS 24 (instead of LTS 23) as a baseline.
 
+- **This release of Nixpkgs requires macOS Sonoma 14.0 or newer, as announced in the 25.05 release notes.**
+  The default SDK is now 14.4, but the minimum version is 14.0.
+  cc-wrapper will enforce that availability annotations are used or an appropriate deployment target is set.
+  See the Darwin platform notes for details.
+
+- **We expect to drop support for `x86_64-darwin` by Nixpkgs 26.11,** in light of Apple’s announcement that macOS 26 will be the final version to support Intel Macs.
+  When support is fully removed, we will no longer build packages for the platform or guarantee that it can build at all.
+  This may happen in stages, depending on our available build and maintenance resources and decisions made by projects we rely on.
+
+  By the time of 26.11’s release, Homebrew will offer only limited [Tier 3](https://docs.brew.sh/Support-Tiers#tier-3) support for the platform, but MacPorts will likely continue to support it for a long time.
+  We also recommend users consider installing NixOS, which should continue to run on essentially all Intel Macs, especially after Apple stops security support for macOS 26 in 2028.
+
 - Darwin has switched to using the system libc++. This was done for improved compatibility and to avoid ODR violations.
   If a newer C++ library feature is not available on the default deployment target, you will need to increase the deployment target.
   See the Darwin platform documentation for more details.
@@ -30,6 +42,11 @@
 
 - Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs.
 
+- `reaction` has been updated to version 2, which includes some breaking changes.
+  For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
+
+- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)).
+
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 - `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing.
@@ -38,10 +55,16 @@
 
 - LLVM 12, 13, 14, 15, 16, and 17 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
 
+- The `vlock` output from kbd has been removed. Instead a new package `kbdVlock` has been introduced. Use this package now instead of the output.
+
 - GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.
 
 - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.
 
+- The `haskellPackages.mkDerivation` builder now converts packages' cabal files to Unix line endings before `patchPhase`. This behavior can be disabled using `dontConvertCabalFileToUnix`.
+
+- `webkitgtk_4_0` has been removed because it depends on an unmaintained version of security-critical libsoup library (`libsoup_2`) and the support will be [dropped upstream soon](https://webkitgtk.org/2025/10/07/webkitgtk-soup2-deprecation.html).
+
 - Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
   The latter was probably broken anyway.
   If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.
@@ -59,6 +82,9 @@
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 
+- The default glibc ELF ABI for the powerpc64-linux platform has been changed from ELFv2 back to ELFv1, due to the latter having less remaining issues when bootstrapping & building Nixpkgs packages on hardware.
+  If glibc ELFv2 is desired, use a fuller target triplet like `powerpc64-unknown-linux-gnuabielfv2` or the provided `ppc64-elfv2` platform example.
+
 - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
 
 - `buildGoModule` removes the compatibility layer of `CGO_ENABLED` not specified via `env`.
@@ -90,10 +116,16 @@
 
 - `forgejo` main program has been renamed to `bin/forgejo` from the previous `bin/gitea`.
 
+- the "pie" hardening flag has been removed. compilers are expected to enable PIE by default, as has been common practice since 2016 outside of nixpkgs. If a package needs "pie" disabled pass `-no-pie` in `CFLAGS`. It is unlikely this will be necessary in many cases; due to the prevalance of default PIE toolchains most packages incompatible with PIE already pass no-pie.
+
+- `wayclip` now uses the `ext-data-control-v1` Wayland protocol instead of `wlr-data-control-unstable-v1`.
+
 - `cudaPackages.cudatoolkit-legacy-runfile` has been removed.
 
 - `conduwuit` was removed due to upstream ceasing development and deleting their repository. For existing data, a migration to `matrix-conduit`, `matrix-continuwuity` or `matrix-tuwunel` may be possible.
 
+- `asciidoctor-with-extension` had its `asciidoctor-mathematical` extension removed, because it fails to build, and it is not maintained properly.
+
 - The `ghcInfo` and `controlPhases` functions have been removed from `haskell.lib.compose` and `haskell.lib`. They were unused and would return incorrect results.
 
   - Instead of using `controlPhases`, the `doCheck` attribute of derivations can be accessed which is more accurate. `doBenchmark` can't be introspected at the moment.
@@ -121,6 +153,8 @@
 
 - Zig 0.12 has been removed.
 
+- `services.forgejo.dump.age` now defaults to `4w`, which deletes dumps older than 4 weeks. This new behaviour could result in older backups being deleted.
+
 - `ansible-later` has been removed because it was discontinued by the author.
 
 - `k3s` airgap images passthru attributes have changed:
@@ -134,8 +168,12 @@
 
 - `meilisearch_1_11` has been removed, as it is no longer supported.
 
+- `budgie-desktop` has been updated [10.9.3](https://github.com/BuddiesOfBudgie/budgie-desktop/releases/tag/v10.9.3), this changes `XDG_CURRENT_DESKTOP` from `Budgie:GNOME` to `Budgie`.
+
 - Greetd and its original greeters (`tuigreet`, `gtkgreet`, `qtgreet`, `regreet`, `wlgreet`) were moved from `greetd` namespace to top level (`greetd.tuigreet` -> `tuigreet`, `greetd.greetd` -> `greetd`, etc). The original attrs are available for compatibility as passthrus of `greetd`, but will emit a warning. They will be removed in future releases.
 
+- `carla` no longer support `gtk2` override.
+
 - The `archipelago-minecraft` package was removed, as upstream no longer provides support for the Minecraft APWorld.
 
 - `pcp` has been removed because the upstream repo was archived and it hasn't been updated since 2021.
@@ -168,6 +206,8 @@
 
 - `proton-caller` has been removed due to lack of upstream maintenance.
 
+- `android-udev-rules` has been removed, as it is effectively superseded by built-in uaccess rules in systemd.
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
 
 - `mongodb-6_0` was removed as it is end of life as of 2025-07-31.
@@ -188,12 +228,15 @@
 
 - `sail-riscv` 0.8 follows [upstream](https://github.com/riscv/sail-riscv/blob/7cc4620eb1a57bfe04832baccdcf5727e9459bd4/doc/ChangeLog.md) and provides only a single binary, `sail_riscv_sim`.
 
+- `moar` has been updated from `1.33.0` to `2.0.0`, and renamed to `moor` following an upstream decision. See the [release notes](https://github.com/walles/moor/releases/tag/v2.0.0) for more.
+
 - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
   Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
 
-- NetBox was updated to `>= 4.3.0`. Have a look at the breaking changes
-  of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.2.0),
-  make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_3;` in your configuration.
+- NetBox was updated to `>= 4.4.0`. Have a look at the breaking changes
+  of the [4.3 release](https://github.com/netbox-community/netbox/releases/tag/v4.3.0)
+  and the [4.4 release](https://github.com/netbox-community/netbox/releases/tag/v4.4.0),
+  make the required changes to your database, if needed, then upgrade by setting `services.netbox.package = pkgs.netbox_4_4;` in your configuration.
 
 - `privatebin` has been updated to `2.0.0`. This release changes configuration defaults including switching the template and removing legacy features. See the [v2.0.0 changelog entry](https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.0) for details on how to upgrade.
 
@@ -207,6 +250,8 @@
 
 - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
 
+- `rabbitmq-server` has been updated from 4.0.9 to 4.1.4. The 4.1.0 release includes breaking changes. For more information read the [changelog of 4.1.0](https://github.com/rabbitmq/rabbitmq-server/releases/tag/v4.1.0)
+
 - `lxde` scope has been removed, and its packages have been moved the top-level.
 
 - `pulsemeeter` has been updated to `2.0.0`. The configuration file from older versions has to be deleted. For more information and instructions see the [v2.0.0 changelog entry](https://github.com/theRealCarneiro/pulsemeeter/releases/tag/v2.0.0).
@@ -217,6 +262,8 @@
 
 - The main binary of `tomlq` has been renamed from `tomlq` to `tq`.
 
+- `opensoldat` binaries and user configuration directory names have been prefixed by 'open', becoming opensoldat and opensoldatserver. Configuration will be moved automatically before launch when possible.
+
 - `emacs-macport` has been moved to a fork of Mitsuharu Yamamoto's patched source code starting with Emacs v30 as the original project seems to be currently dormant. All older versions of this package have been dropped.
   This introduces some backwards‐incompatible changes; see the NEWS for details.
   NEWS can be viewed from Emacs by typing `C-h n`, or by clicking `Help->Emacs News` from the menu bar.
@@ -228,6 +275,14 @@
 
 - `nodePackages.rimraf` has been removed, as it is a Javascript library, and packages that want to use it should depend directly on it instead.
 
+- `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues.
+
+- `qt5.full` and `qt6.full` aliases have been removed. Their use has always been discouraged, and downstream projects should use `qtN.env` with the right set of packages.
+
+- `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs.
+  Use `python3Packages.ddgs` instead.
+  See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -237,17 +292,29 @@
 
 - Added `gitConfig` and `gitConfigFile` option to the nixpkgs `config`, to allow for setting a default `gitConfigFile` for all `fetchgit` invocations.
 
+- Added `npmRegistryOverrides` and `npmRegistryOverridesString` option to the nixpkgs `config`, to allow for setting a default `npmRegistryOverridesString` for all `fetchNpmDeps` invocations.
+
 - The `dockerTools.streamLayeredImage` builder now uses a better algorithm for generating layered docker images, such that much more sharing is possible when the number of store paths exceeds the layer limit. It gives each of the largest store paths its own layer and adds dependencies to those layers when they aren't used elsewhere.
 
 - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes.
 
+- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
+
+  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
+
+- `cloudflare-ddns`: Added package cloudflare-ddns.
+
+- `clickhouse`: Added `serverConfig`, `usersConfig` configuration options accepting Nix attribute sets. Also added `extraServerConfig` and `extraUsersConfig` options accepting plain text (expecting XML configuration).
+
 - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. In particular, `--storage-data` was replaced with `--storage-conn-string` and `--storage-prefix-path`. If your configuration set `HBOX_STORAGE_DATA` manually, you must migrate it to `HBOX_STORAGE_CONN_STRING` and `HBOX_STORAGE_PREFIX_PATH`.
 
 - GIMP now defaults to version 3. Use `gimp2` for the old version.
 
 - `installShellCompletion`: now supports Nushell completion files
 
-- New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.
+- `idris2` supports being instantiated with a package environment with `idris.withPackages (p: [ ])`
+
+- New hardening flags `strictflexarrays1`, `strictflexarrays3`, `glibcxxassertions`, `libcxxhardeningfast` and `libcxxhardeningextensive` were made available.
 
 - `gramps` has been updated to 6.0.0
   Upstream recommends [backing up your Family Trees](https://gramps-project.org/wiki/index.php/Gramps_6.0_Wiki_Manual_-_Manage_Family_Trees#Backing_up_a_Family_Tree) before upgrading.
@@ -256,6 +323,8 @@
 
 - `forgejo-runner`: The upgrade to version 11 brings a license change from MIT to GPLv3-or-later.
 
+- `waydroid-nftables`: New variant of `waydroid` that supports nftables instead of iptables.
+
 - `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html).
 
 - `ffmpeg_8`, `ffmpeg_8-headless`, and `ffmpeg_8-full` have been added. The default version of FFmpeg remains ffmpeg_7 for now, though this may change before release.
@@ -263,7 +332,12 @@
 - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables.
   If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`.
 
-- A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
+- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.
+  Make sure to backup your data and configuration directories
+  and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).
+  **Important:** make sure you're running Jellyfin version `10.10.7` before upgrading,
+  and beware that the migration may take several hours depending on your library size and state.
+  The process must not be interrupted.
 
 - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.
 
@@ -281,6 +355,8 @@
 
 - `nix-prefetch-git`: Added a `--no-add-path` argument to disable adding the path to the store; this is useful when working with a [read-only store](https://nix.dev/manual/nix/2.28/command-ref/new-cli/nix3-help-stores#store-experimental-local-overlay-store-read-only).
 
+- `fetchNpmDeps`: Add `npmRegistryOverridesString` argument to pass NPM registry overrides to the fetcher.
+
 - `sftpman` has been updated to version 2, a rewrite in Rust which is mostly backward compatible but does include some changes to the CLI.
   For more information, [check the project's README](https://github.com/spantaleev/sftpman-rs#is-sftpman-v2-compatible-with-sftpman-v1).
 
@@ -290,39 +366,55 @@
 
 - `emacs` now disables the GC mark trace buffer by default. This improves GC performance by 5%, but can make GC issues harder to debug. This is configurable with `withGcMarkTrace`.
 
+- Passing `stdenv` to `buildPythonPackage` or `buildPythonApplication` has been deprecated and will trigger an error in a future release.
+  Instead, you should _override_ the python build helper, e.g., `(buildPythonPackage.override { stdenv = customStdenv; })`.
+  See [](#overriding-python-build-helpers).
+
 - `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.
 
+- `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.
+
 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)).
-
 ### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking}
 
-- `reaction` has been updated to version 2, which includes some breaking changes.
-  For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
+- `lib.literalExample` has been removed, use `lib.literalExpression` instead, or use `lib.literalMD` for a non-Nix description.
+
+- `lib.replaceChars` has been removed, it was a deprecated alias of `lib.replaceStrings`.
+
+- `lib.readPathsFromFile` has been removed, use a list instead
 
 - `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead.
 
+- `lib.strings.isCoercibleToString` has been in favor of either `lib.strings.isStringLike` or `lib.strings.isConvertibleWithToString`. Only use the latter if it needs to return true for null, numbers, booleans, or a list of those.
+
+- `lib.types.string` has been removed. See [this pull request](https://github.com/NixOS/nixpkgs/pull/66346) for better alternative types like `lib.types.str`.
+
+- `lib.modules.defaultPriority` has been removed, please use `lib.modules.defaultOverridePriority` instead.
+
 - `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead.
 
+- `lib.sources.pathType`, `lib.sources.pathIsDirectory` and `lib.sources.pathIsRegularFile` have been replaced by `lib.filesystem.pathType`, `lib.filesystem.pathIsDirectory` and `lib.filesystem.pathIsRegularFile` respectively.
+
 - `lib.attrsets.zip` has been removed, following its deprecation in 2013. Use `lib.attrsets.zipAttrsWith` instead.
 
 - `lib.attrsets.zipWithNames` has been removed, following its deprecation in 2009. Use `lib.attrsets.zipAttrsWithNames` instead.
 
 - `lib.options.mkPackageOptionMD` has been removed, following its deprecation in NixOS 24.11. Use `lib.options.mkPackageOption` instead.
 
+- `haskell.lib.addOptparseApplicativeCompletionScripts` has been removed, use `haskellPackages.generateOptparseApplicativeCompletions` instead.
+
 - The `buildPythonPackage` and `buildPythonApplication` functions now require
   an explicit `format` attribute. Previously the default format used setuptools
   and called `setup.py` from the source tree, which is deprecated.
   The modern alternative is to configure `pyproject = true` with `build-system = [ setuptools ]`.
 
-- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
-  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
-
 ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
 
+- `lib.options.mkAliasOptionModuleMD` is now obsolete; use the identical [`lib.options.mkAliasOptionModule`] instead.
+
 - `types.either` silently accepted mismatching types when used in `freeformType`. Module maintainers should fix the used type
   In most cases wrapping `either` with `attrsOf` should be sufficient.
 
@@ -331,10 +423,13 @@
   - `number`
   - `numbers.*`
 
+- `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell` have been deprecated in favor of `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU`.
+
 ### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}
 
-- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
+- `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU` have been added to address multiple issues in `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell`.
 
-  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
+- `ugrep`: Added `wrapWithFilterUtils` package flag for optionally wrapping `ugrep+` and `ug+` with filter utilities for grepping other file types.
+
+- `ugrep`: Added `createGrepReplacementLinks` package flag for optionally creating drop-in replacement symlinks for `gnugrep`.
 
-- `cloudflare-ddns`: Added package cloudflare-ddns.
diff --git a/doc/stdenv/platform-notes.chapter.md b/doc/stdenv/platform-notes.chapter.md
index 06662bbc76fa..99d7cf33fa48 100644
--- a/doc/stdenv/platform-notes.chapter.md
+++ b/doc/stdenv/platform-notes.chapter.md
@@ -47,6 +47,17 @@ See below for how to use a newer deployment target.
 For example, `std::print` depends on features that are only available on macOS 13.3 or newer.
 To make them available, set the deployment target to 13.3 using `darwinMinVersionHook`.
 
+#### Package fails to build due to missing API availability checks {#sec-darwin-availability-checks}
+
+This is normally a bug in the package or a misconfigured deployment target.
+* If it is using an API from a newer release (e.g., from macOS 26.0 while targeting macOS 14.0), it needs to use an availability check.
+  The code should be patched to use [`__builtin_available`](https://clang.llvm.org/docs/LanguageExtensions.html#objective-c-available).
+  Note that while the linked documentation is for Objective-C, it is applicable to C and C++ except that you use `__builtin_available` in place of `@available`.
+* If the package intends to require the newer platform (i.e., it does not support running on older versions with reduced functionality), use `darwinMinVersionHook` to set the deployment target to the required version.
+  See below for how to use a newer deployment target.
+* If the package actually handles this through some other mechanism (e.g., MoltenVK relies on the running platform’s MSL version), the error can be suppressed.
+  To suppress the error, add `-Wno-error=unguarded-availability` to `env.NIX_CFLAGS_COMPILE`.
+
 #### Package requires a non-default SDK or fails to build due to missing frameworks or symbols {#sec-darwin-troubleshooting-using-sdks}
 
 In some cases, you may have to use a non-default SDK.
@@ -106,13 +117,10 @@ The following is a list of Xcode versions, the SDK version in Nixpkgs, and the a
 Check your package’s documentation (platform support or installation instructions) to find which Xcode or SDK version to use.
 Generally, only the last SDK release for a major version is packaged.
 
-| Xcode version      | SDK version        | Nixpkgs attribute            |
-|--------------------|--------------------|------------------------------|
-| 12.0–12.5.1        | 11.3               | `apple-sdk_11` / `apple-sdk` |
-| 13.0–13.4.1        | 12.3               | `apple-sdk_12`               |
-| 14.0–14.3.1        | 13.3               | `apple-sdk_13`               |
-| 15.0–15.4          | 14.4               | `apple-sdk_14`               |
-| 16.0               | 15.0               | `apple-sdk_15`               |
+| Xcode version      | SDK version        | Nixpkgs attribute             |
+|--------------------|--------------------|-------------------------------|
+| 15.0–15.4          | 14.4               | `apple-sdk_14` / `apple-sdk`  |
+| 16.0               | 15.0               | `apple-sdk_15`                |
 
 
 #### Darwin Default SDK versions {#sec-darwin-troubleshooting-darwin-defaults}
diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md
index 24536c35b2c3..2a0b239740c0 100644
--- a/doc/stdenv/stdenv.chapter.md
+++ b/doc/stdenv/stdenv.chapter.md
@@ -1631,19 +1631,6 @@ The following flags are disabled by default and should be enabled with `hardenin
 
 This flag adds the `-fno-strict-aliasing` compiler option, which prevents the compiler from assuming code has been written strictly following the standard in regards to pointer aliasing and therefore performing optimizations that may be unsafe for code that has not followed these rules.
 
-#### `pie` {#pie}
-
-This flag is disabled by default for normal `glibc` based NixOS package builds, but enabled by default for
-
-  - `musl`-based package builds, except on Aarch64 and Aarch32, where there are issues.
-
-  - Statically-linked for OpenBSD builds, where it appears to be required to get a working binary.
-
-Adds the `-fPIE` compiler and `-pie` linker options. Position Independent Executables are needed to take advantage of Address Space Layout Randomization, supported by modern kernel versions. While ASLR can already be enforced for data areas in the stack and heap (brk and mmap), the code areas must be compiled as position-independent. Shared libraries already do this with the `pic` flag, so they gain ASLR automatically, but binary .text regions need to be build with `pie` to gain ASLR. When this happens, ROP attacks are much harder since there are no static locations to bounce off of during a memory corruption attack.
-
-Static libraries need to be compiled with `-fPIE` so that executables can link them in with the `-pie` linker option.
-If the libraries lack `-fPIE`, you will get the error `recompile with -fPIE`.
-
 #### `strictflexarrays1` {#strictflexarrays1}
 
 This flag adds the `-fstrict-flex-arrays=1` compiler option, which reduces the cases the compiler treats as "flexible arrays" to those declared with length `[1]`, `[0]` or (the correct) `[]`. This increases the coverage of fortify checks, because such arrays declared as the trailing element of a structure can normally not have their intended length determined by the compiler.
@@ -1688,6 +1675,18 @@ Adds the `-D_GLIBCXX_ASSERTIONS` compiler flag. This flag only has an effect on
 
 These checks may have an impact on performance in some cases.
 
+#### `libcxxhardeningfast` {#libcxxhardeningfast}
+
+Adds the `-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST` compiler flag. This flag only has an effect on libc++ targets, and when defined, enables a set of assertions that prevent undefined behavior caused by violating preconditions of the standard library. libc++ provides several hardening modes, and this "fast" mode contains a set of security-critical checks that can be done with relatively little overhead in constant time.
+
+Disabling `libcxxhardeningfast` implies disablement of checks from `libcxxhardeningextensive`.
+
+#### `libcxxhardeningextensive` {#libcxxhardeningextensive}
+
+Adds the `-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE` compiler flag. This flag only has an effect on libc++ targets, and when defined, enables a set of assertions that prevent undefined behavior caused by violating preconditions of the standard library. libc++ provides several hardening modes, and this "extensive" mode adds checks for undefined behavior that incur relatively little overhead but aren’t security-critical. The additional rigour impacts performance more than fast mode: benchmarking is recommended to determine if it is acceptable for a particular application.
+
+Enabling this flag implies enablement of checks from `libcxxhardeningfast`. Disabling this flag does not imply disablement of checks from `libcxxhardeningfast`.
+
 #### `pacret` {#pacret}
 
 This flag adds the `-mbranch-protection=pac-ret` compiler option on aarch64-linux targets. This uses ARM v8.3's Pointer Authentication feature to sign function return pointers before adding them to the stack. The pointer's authenticity is then validated before returning to its destination. This dramatically increases the difficulty of ROP exploitation techniques.
diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix
index 913aebe4ebe8..74778c7f9847 100644
--- a/doc/tests/manpage-urls.nix
+++ b/doc/tests/manpage-urls.nix
@@ -2,12 +2,12 @@
 {
   lib,
   runCommand,
-  invalidateFetcherByDrvHash,
+  testers,
   cacert,
   python3,
 }:
 
-invalidateFetcherByDrvHash (
+testers.invalidateFetcherByDrvHash (
   {
     name ? "manual_check-manpage-urls",
     script ? ./manpage-urls.py,
diff --git a/doc/using/platform-support.chapter.md b/doc/using/platform-support.chapter.md
index 3f91b3d5d980..d5a985c90d35 100644
--- a/doc/using/platform-support.chapter.md
+++ b/doc/using/platform-support.chapter.md
@@ -1,18 +1,49 @@
 # Platform Support {#chap-platform-support}
 
-Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI).
+Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is.
 
-Below is the list of the best supported platforms:
+## Tiers {#sec-platform-tiers}
 
-- `x86_64-linux`: Highest level of support.
-- `aarch64-linux`: Well supported, with most packages building successfully in CI.
-- `aarch64-darwin`: Receives better support than `x86_64-darwin`.
-- `x86_64-darwin`: Receives some support.
+### Tier 1 {#sec-platform-tier1}
 
-There are many other platforms with varying levels of support.
-The provisional platform list in [Appendix A] of [RFC046], while not up to date, can be used as guidance.
+[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work.
 
-A more formal definition of the platform support tiers is provided in [RFC046], but has not been fully implemented yet.
+### Tier 2 {#sec-platform-tier2}
 
-[RFC046]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
-[Appendix A]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#appendix-a-non-normative-description-of-platforms-in-november-2019
+[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support.
+
+### Tier 3 {#sec-platform-tier3}
+
+[Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) platforms may receive non-intrusive platform-specific fixes, have native bootstrap tools available with cross-build toolchains in binary cache, but updates might break builds on these platforms.
+
+### Tier 4-7 {#sec-platform-tier4-7}
+
+Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) indicate varying levels of minimal support going from receiving only limited fixes to platforms with no support, but a path to support.
+
+## Breakdown {#sec-platform-breakdown}
+
+| Triple                                | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support |
+| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- |
+| `x86_64-unknown-linux-gnu`            | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️            | ✔️            | ✔️                 | ✔️                      |
+| `aarch64-unknown-linux-gnu`           | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ✔️                      |
+| `x86_64-unknown-linux-musl`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
+| `aarch64-unknown-linux-musl`          | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
+| `x86_64-unknown-unknown-freebsd`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `arm64-apple-darwin`                  | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ❌\*                     |
+| `x86_64-apple-darwin`                 | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ❌\*                     |
+| `i686-unknown-linux-gnu`              | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
+| `riscv32-unknown-linux-gnu`           | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌             | ❌             | ❌                  | ✔️                      |
+| `riscv64-unknown-linux-gnu`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `loongarch64-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv6l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv6l-unknown-linux-musleabihf`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv7l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv5tel-unknown-linux-gnueabi`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `mips64el-unknown-linux-gnuabi64`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `mips64el-unknown-linux-gnuabin32`    | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `mipsel-unknown-linux-gnu`            | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `powerpc64le-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `s390x-unknown-linux-gnu`             | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+
+\* - Cross compiling is only supported on Darwin hosts.
diff --git a/lib/cli.nix b/lib/cli.nix
index 590ba691d386..f0ebeb76c4c2 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -1,6 +1,6 @@
 { lib }:
 
-rec {
+{
   /**
     Automatically convert an attribute set to command-line options.
 
@@ -20,6 +20,7 @@ rec {
     : The attributes to transform into arguments.
 
     # Examples
+
     :::{.example}
     ## `lib.cli.toGNUCommandLineShell` usage example
 
@@ -38,7 +39,10 @@ rec {
 
     :::
   */
-  toGNUCommandLineShell = options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
+  toGNUCommandLineShell =
+    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
+      "lib.cli.toGNUCommandLineShell is deprecated, please use lib.cli.toCommandLineShell or lib.cli.toCommandLineShellGNU instead."
+      (options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs));
 
   /**
     Automatically convert an attribute set to a list of command-line options.
@@ -55,7 +59,7 @@ rec {
 
     : The attributes to transform into arguments.
 
-    # Options
+    ## Options
 
     `mkOptionName`
 
@@ -85,6 +89,7 @@ rec {
     This is useful if the command requires equals, for example, `-c=5`.
 
     # Examples
+
     :::{.example}
     ## `lib.cli.toGNUCommandLine` usage example
 
@@ -111,38 +116,224 @@ rec {
     :::
   */
   toGNUCommandLine =
+    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
+      "lib.cli.toGNUCommandLine is deprecated, please use lib.cli.toCommandLine or lib.cli.toCommandLineShellGNU instead."
+      (
+        {
+          mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}",
+
+          mkBool ? k: v: lib.optional v (mkOptionName k),
+
+          mkList ? k: v: lib.concatMap (mkOption k) v,
+
+          mkOption ?
+            k: v:
+            if v == null then
+              [ ]
+            else if optionValueSeparator == null then
+              [
+                (mkOptionName k)
+                (lib.generators.mkValueStringDefault { } v)
+              ]
+            else
+              [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ],
+
+          optionValueSeparator ? null,
+        }:
+        options:
+        let
+          render =
+            k: v:
+            if builtins.isBool v then
+              mkBool k v
+            else if builtins.isList v then
+              mkList k v
+            else
+              mkOption k v;
+
+        in
+        builtins.concatLists (lib.mapAttrsToList render options)
+      );
+
+  /**
+    Converts the given attributes into a single shell-escaped command-line string.
+    Similar to `toCommandLineGNU`, but returns a single escaped string instead of an array of arguments.
+    For further reference see: [`lib.cli.toCommandLineGNU`](#function-library-lib.cli.toCommandLineGNU)
+  */
+  toCommandLineShellGNU =
+    options: attrs: lib.escapeShellArgs (lib.cli.toCommandLineGNU options attrs);
+
+  /**
+    Converts an attribute set into a list of GNU-style command line options.
+
+    `toCommandLineGNU` returns a list of string arguments.
+
+    # Inputs
+
+    `options`
+
+    : Options, see below.
+
+    `attrs`
+
+    : The attributes to transform into arguments.
+
+    ## Options
+
+    `isLong`
+
+    : A function that determines whether an option is long or short.
+
+    `explicitBool`
+
+    : Whether or not boolean option arguments should be formatted explicitly.
+
+    `formatArg`
+
+    : A function that turns the option argument into a string.
+
+    # Examples
+
+    :::{.example}
+    ## `lib.cli.toCommandLineGNU` usage example
+
+    ```nix
+    lib.cli.toCommandLineGNU {} {
+      v = true;
+      verbose = [true true false null];
+      i = ".bak";
+      testsuite = ["unit" "integration"];
+      e = ["s/a/b/" "s/b/c/"];
+      n = false;
+      data = builtins.toJSON {id = 0;};
+    }
+    => [
+      "--data={\"id\":0}"
+      "-es/a/b/"
+      "-es/b/c/"
+      "-i.bak"
+      "--testsuite=unit"
+      "--testsuite=integration"
+      "-v"
+      "--verbose"
+      "--verbose"
+    ]
+    ```
+
+    :::
+  */
+  toCommandLineGNU =
     {
-      mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}",
-
-      mkBool ? k: v: lib.optional v (mkOptionName k),
-
-      mkList ? k: v: lib.concatMap (mkOption k) v,
-
-      mkOption ?
-        k: v:
-        if v == null then
-          [ ]
-        else if optionValueSeparator == null then
-          [
-            (mkOptionName k)
-            (lib.generators.mkValueStringDefault { } v)
-          ]
-        else
-          [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ],
-
-      optionValueSeparator ? null,
+      isLong ? optionName: builtins.stringLength optionName > 1,
+      explicitBool ? false,
+      formatArg ? lib.generators.mkValueStringDefault { },
     }:
-    options:
     let
-      render =
-        k: v:
-        if builtins.isBool v then
-          mkBool k v
-        else if builtins.isList v then
-          mkList k v
-        else
-          mkOption k v;
-
+      optionFormat = optionName: {
+        option = if isLong optionName then "--${optionName}" else "-${optionName}";
+        sep = if isLong optionName then "=" else "";
+        inherit explicitBool formatArg;
+      };
     in
-    builtins.concatLists (lib.mapAttrsToList render options);
+    lib.cli.toCommandLine optionFormat;
+
+  /**
+    Converts the given attributes into a single shell-escaped command-line string.
+    Similar to `toCommandLine`, but returns a single escaped string instead of an array of arguments.
+    For further reference see: [`lib.cli.toCommandLine`](#function-library-lib.cli.toCommandLine)
+  */
+  toCommandLineShell =
+    optionFormat: attrs: lib.escapeShellArgs (lib.cli.toCommandLine optionFormat attrs);
+
+  /**
+    Converts an attribute set into a list of command line options.
+
+    `toCommandLine` returns a list of string arguments.
+
+    # Inputs
+
+    `optionFormat`
+
+    : The option format that describes how options and their arguments should be formatted.
+
+    `attrs`
+
+    : The attributes to transform into arguments.
+
+    # Examples
+    :::{.example}
+    ## `lib.cli.toCommandLine` usage example
+
+    ```nix
+    let
+      optionFormat = optionName: {
+        option = "-${optionName}";
+        sep = "=";
+        explicitBool = true;
+      };
+    in lib.cli.toCommandLine optionFormat {
+      v = true;
+      verbose = [true true false null];
+      i = ".bak";
+      testsuite = ["unit" "integration"];
+      e = ["s/a/b/" "s/b/c/"];
+      n = false;
+      data = builtins.toJSON {id = 0;};
+    }
+    => [
+      "-data={\"id\":0}"
+      "-e=s/a/b/"
+      "-e=s/b/c/"
+      "-i=.bak"
+      "-n=false"
+      "-testsuite=unit"
+      "-testsuite=integration"
+      "-v=true"
+      "-verbose=true"
+      "-verbose=true"
+      "-verbose=false"
+    ]
+    ```
+
+    :::
+  */
+  toCommandLine =
+    optionFormat: attrs:
+    let
+      handlePair =
+        k: v:
+        if k == "" then
+          lib.throw "lib.cli.toCommandLine only accepts non-empty option names."
+        else if builtins.isList v then
+          builtins.concatMap (handleOption k) v
+        else
+          handleOption k v;
+
+      handleOption = k: renderOption (optionFormat k) k;
+
+      renderOption =
+        {
+          option,
+          sep,
+          explicitBool,
+          formatArg ? lib.generators.mkValueStringDefault { },
+        }:
+        k: v:
+        if v == null || (!explicitBool && v == false) then
+          [ ]
+        else if !explicitBool && v == true then
+          [ option ]
+        else
+          let
+            arg = formatArg v;
+          in
+          if sep != null then
+            [ "${option}${sep}${arg}" ]
+          else
+            [
+              option
+              arg
+            ];
+    in
+    builtins.concatLists (lib.mapAttrsToList handlePair attrs);
 }
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 5fb39fdfe1d2..6159ce8ea27a 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -22,7 +22,6 @@ let
     filterAttrs
     optionalString
     flip
-    pathIsDirectory
     head
     pipe
     isDerivation
@@ -305,9 +304,10 @@ rec {
         arg:
         let
           loc = unsafeGetAttrPos arg fargs;
+          loc' = if loc != null then loc.file + ":" + toString loc.line else "<unknown location>";
         in
         "Function called without required argument \"${arg}\" at "
-        + "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}";
+        + "${loc'}${prettySuggestions (getSuggestions arg)}";
 
       # Only show the error for the first missing argument
       error = errorForArg (head (attrNames missingArgs));
@@ -763,11 +763,26 @@ rec {
     # Inputs
 
     `extendMkDerivation`-specific configurations
-    : `constructDrv`: Base build helper, the `mkDerivation`-like build helper to extend.
-    : `excludeDrvArgNames`: Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`.
-    : `extendDrvArgs` : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
-    : `inheritFunctionArgs`: Whether to inherit `__functionArgs` from the base build helper (default to `true`).
-    : `transformDrv`: Function to apply to the result derivation (default to `lib.id`).
+    : `constructDrv` (required)
+      : Base build helper, the `mkDerivation`-like build helper to extend.
+
+      `excludeDrvArgNames` (default to `[ ]`)
+      : Argument names not to pass from the input fixed-point arguments to `constructDrv`.
+        It doesn't apply to the updating arguments returned by `extendDrvArgs`.
+
+      `excludeFunctionArgNames` (default to `[ ]`)
+      : `__functionArgs` attribute names to remove from the result build helper.
+        `excludeFunctionArgNames` is useful for argument deprecation while avoiding ellipses.
+
+      `extendDrvArgs` (required)
+      : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
+
+      `inheritFunctionArgs` (default to `true`)
+      : Whether to inherit `__functionArgs` from the base build helper.
+        Set `inheritFunctionArgs` to `false` when `extendDrvArgs`'s `args` set pattern does not contain an ellipsis.
+
+      `transformDrv` (default to `lib.id`)
+      : Function to apply to the result derivation.
 
     # Type
 
@@ -776,6 +791,7 @@ rec {
       {
         constructDrv :: ((FixedPointArgs | AttrSet) -> a)
         excludeDrvArgNames :: [ String ],
+        excludeFunctionArgNames :: [ String ]
         extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet)
         inheritFunctionArgs :: Bool,
         transformDrv :: a -> a,
@@ -836,6 +852,7 @@ rec {
     {
       constructDrv,
       excludeDrvArgNames ? [ ],
+      excludeFunctionArgNames ? [ ],
       extendDrvArgs,
       inheritFunctionArgs ? true,
       transformDrv ? id,
@@ -850,10 +867,12 @@ rec {
       )
       # Add __functionArgs
       (
-        # Inherit the __functionArgs from the base build helper
-        optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
-        # Recover the __functionArgs from the derived build helper
-        // functionArgs (extendDrvArgs { })
+        removeAttrs (
+          # Inherit the __functionArgs from the base build helper
+          optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
+          # Recover the __functionArgs from the derived build helper
+          // functionArgs (extendDrvArgs { })
+        ) excludeFunctionArgNames
       )
     // {
       inherit
@@ -864,4 +883,139 @@ rec {
         transformDrv
         ;
     };
+
+  /**
+    Removes a prefix from the attribute names of a cross index.
+
+    A cross index (short for "Cross Platform Pair Index") is a 6-field structure
+    organizing values by cross-compilation platform relationships.
+
+    # Inputs
+
+    `prefix`
+    : The prefix to remove from cross index attribute names
+
+    `crossIndex`
+    : A cross index with prefixed names
+
+    # Type
+
+    ```
+    renameCrossIndexFrom :: String -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.renameCrossIndexFrom` usage example
+
+    ```nix
+    renameCrossIndexFrom "pkgs" { pkgsBuildBuild = ...; pkgsBuildHost = ...; ... }
+    => { buildBuild = ...; buildHost = ...; ... }
+    ```
+    :::
+  */
+  renameCrossIndexFrom = prefix: x: {
+    buildBuild = x."${prefix}BuildBuild";
+    buildHost = x."${prefix}BuildHost";
+    buildTarget = x."${prefix}BuildTarget";
+    hostHost = x."${prefix}HostHost";
+    hostTarget = x."${prefix}HostTarget";
+    targetTarget = x."${prefix}TargetTarget";
+  };
+
+  /**
+    Adds a prefix to the attribute names of a cross index.
+
+    A cross index (short for "Cross Platform Pair Index") is a 6-field structure
+    organizing values by cross-compilation platform relationships.
+
+    # Inputs
+
+    `prefix`
+    : The prefix to add to cross index attribute names
+
+    `crossIndex`
+    : A cross index to be prefixed
+
+    # Type
+
+    ```
+    renameCrossIndexTo :: String -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.renameCrossIndexTo` usage example
+
+    ```nix
+    renameCrossIndexTo "self" { buildBuild = ...; buildHost = ...; ... }
+    => { selfBuildBuild = ...; selfBuildHost = ...; ... }
+    ```
+    :::
+  */
+  renameCrossIndexTo = prefix: x: {
+    "${prefix}BuildBuild" = x.buildBuild;
+    "${prefix}BuildHost" = x.buildHost;
+    "${prefix}BuildTarget" = x.buildTarget;
+    "${prefix}HostHost" = x.hostHost;
+    "${prefix}HostTarget" = x.hostTarget;
+    "${prefix}TargetTarget" = x.targetTarget;
+  };
+
+  /**
+    Takes a function and applies it pointwise to each field of a cross index.
+
+    A cross index (short for "Cross Platform Pair Index") is a 6-field structure
+    organizing values by cross-compilation platform relationships.
+
+    # Inputs
+
+    `f`
+    : Function to apply to each cross index value
+
+    `crossIndex`
+    : A cross index to transform
+
+    # Type
+
+    ```
+    mapCrossIndex :: (a -> b) -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.mapCrossIndex` usage example
+
+    ```nix
+    mapCrossIndex (x: x * 10) { buildBuild = 1; buildHost = 2; ... }
+    => { buildBuild = 10; buildHost = 20; ... }
+    ```
+
+    ```nix
+    # Extract a package from package sets
+    mapCrossIndex (pkgs: pkgs.hello) crossIndexedPackageSets
+    ```
+    :::
+  */
+  mapCrossIndex =
+    f:
+    {
+      buildBuild,
+      buildHost,
+      buildTarget,
+      hostHost,
+      hostTarget,
+      targetTarget,
+    }:
+    {
+      buildBuild = f buildBuild;
+      buildHost = f buildHost;
+      buildTarget = f buildTarget;
+      hostHost = f hostHost;
+      hostTarget = f hostTarget;
+      targetTarget = f targetTarget;
+    };
 }
diff --git a/lib/default.nix b/lib/default.nix
index cbb58e302504..e10332ca58dd 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -63,7 +63,7 @@ let
       customisation = callLibs ./customisation.nix;
       derivations = callLibs ./derivations.nix;
       maintainers = import ../maintainers/maintainer-list.nix;
-      teams = callLibs ../maintainers/team-list.nix;
+      teams = callLibs ../maintainers/computed-team-list.nix;
       meta = callLibs ./meta.nix;
       versions = callLibs ./versions.nix;
 
@@ -344,7 +344,6 @@ let
         escapeRegex
         escapeURL
         escapeXML
-        replaceChars
         lowerChars
         upperChars
         toLower
@@ -377,7 +376,6 @@ let
         fixedWidthNumber
         toInt
         toIntBase10
-        readPathsFromFile
         fileContents
         ;
       inherit (self.stringsWithDeps)
@@ -399,6 +397,9 @@ let
         makeScopeWithSplicing
         makeScopeWithSplicing'
         extendMkDerivation
+        renameCrossIndexFrom
+        renameCrossIndexTo
+        mapCrossIndex
         ;
       inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
       inherit (self.generators) mkLuaInline;
@@ -495,7 +496,6 @@ let
         optionAttrSetToDocList'
         scrubOptionValue
         literalExpression
-        literalExample
         showOption
         showOptionWithDefLocs
         showFiles
diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix
index 3c51c6d4dab4..32bc00a227b3 100644
--- a/lib/fileset/default.nix
+++ b/lib/fileset/default.nix
@@ -101,6 +101,7 @@ let
 
   inherit (import ./internal.nix { inherit lib; })
     _coerce
+    _coerceResult
     _singleton
     _coerceMany
     _toSourceFilter
@@ -1005,4 +1006,49 @@ in
         {
           submodules = recurseSubmodules;
         };
+
+  /**
+    The empty fileset. It can be useful as a default value or as starting accumulator for a folding operation.
+
+    # Type
+
+    ```
+    empty :: FileSet
+    ```
+  */
+  empty = _emptyWithoutBase;
+
+  /**
+    Tests whether a given value is a fileset, or can be used in place of a fileset.
+
+    # Inputs
+
+    `value`
+
+    : The value to test
+
+    # Type
+
+    ```
+    isFileset :: Any -> Bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.fileset.isFileset` usage example
+
+    ```nix
+    isFileset ./.
+    => true
+
+    isFileset (unions [  ])
+    => true
+
+    isFileset 1
+    => false
+    ```
+
+    :::
+  */
+  isFileset = x: (_coerceResult "" x).success;
 }
diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix
index 59b8408ae8d6..342b284e1f71 100644
--- a/lib/fileset/internal.nix
+++ b/lib/fileset/internal.nix
@@ -165,14 +165,27 @@ rec {
       _noEval = throw _noEvalMessage;
     };
 
-  # Coerce a value to a fileset, erroring when the value cannot be coerced.
-  # The string gives the context for error messages.
-  # Type: String -> (fileset | Path) -> fileset
-  _coerce =
+  # Coerce a value to a fileset. Return a set containing the attribute `success`
+  # indicating whether coercing succeeded, and either `value` when `success ==
+  # true`, or an error `message` when `success == false`. The string gives the
+  # context for error messages.
+  #
+  # Type: String -> (fileset | Path) -> { success :: Bool, value :: fileset } ] -> { success :: Bool, message :: String }
+  _coerceResult =
+    let
+      ok = value: {
+        success = true;
+        inherit value;
+      };
+      error = message: {
+        success = false;
+        inherit message;
+      };
+    in
     context: value:
     if value._type or "" == "fileset" then
       if value._internalVersion > _currentVersion then
-        throw ''
+        error ''
           ${context} is a file set created from a future version of the file set library with a different internal representation:
               - Internal version of the file set: ${toString value._internalVersion}
               - Internal version of the library: ${toString _currentVersion}
@@ -184,27 +197,37 @@ rec {
             _currentVersion - value._internalVersion
           ) migrations;
         in
-        foldl' (value: migration: migration value) value migrationsToApply
+        ok (foldl' (value: migration: migration value) value migrationsToApply)
       else
-        value
+        ok value
     else if !isPath value then
       if value ? _isLibCleanSourceWith then
-        throw ''
+        error ''
           ${context} is a `lib.sources`-based value, but it should be a file set or a path instead.
               To convert a `lib.sources`-based value to a file set you can use `lib.fileset.fromSource`.
               Note that this only works for sources created from paths.''
       else if isStringLike value then
-        throw ''
+        error ''
           ${context} ("${toString value}") is a string-like value, but it should be a file set or a path instead.
               Paths represented as strings are not supported by `lib.fileset`, use `lib.sources` or derivations instead.''
       else
-        throw ''${context} is of type ${typeOf value}, but it should be a file set or a path instead.''
+        error ''${context} is of type ${typeOf value}, but it should be a file set or a path instead.''
     else if !pathExists value then
-      throw ''
+      error ''
         ${context} (${toString value}) is a path that does not exist.
             To create a file set from a path that may not exist, use `lib.fileset.maybeMissing`.''
     else
-      _singleton value;
+      ok (_singleton value);
+
+  # Coerce a value to a fileset, erroring when the value cannot be coerced.
+  # The string gives the context for error messages.
+  # Type: String -> (fileset | Path) -> fileset
+  _coerce =
+    context: value:
+    let
+      result = _coerceResult context value;
+    in
+    if result.success then result.value else throw result.message;
 
   # Coerce many values to filesets, erroring when any value cannot be coerced,
   # or if the filesystem root of the values doesn't match.
diff --git a/lib/licenses.nix b/lib/licenses.nix
index 09d708b570d2..c38379ed405b 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -172,6 +172,11 @@ lib.mapAttrs mkLicense (
       fullName = "Baekmuk License";
     };
 
+    bitstreamCharter = {
+      spdxId = "Bitstream-Charter";
+      fullName = "Bitstream Charter Font License";
+    };
+
     bitstreamVera = {
       spdxId = "Bitstream-Vera";
       fullName = "Bitstream Vera Font License";
@@ -615,11 +620,6 @@ lib.mapAttrs mkLicense (
       fullName = "Unspecified free software license";
     };
 
-    freeimage = {
-      spdxId = "FreeImage";
-      fullName = "FreeImage Public License v1.0";
-    };
-
     fsl11Mit = {
       fullName = "Functional Source License, Version 1.1, MIT Future License";
       spdxId = "FSL-1.1-MIT";
@@ -665,6 +665,11 @@ lib.mapAttrs mkLicense (
       url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-SOURCE-LICENSE.txt";
     };
 
+    gnuplot = {
+      spdxId = "gnuplot";
+      fullName = "gnuplot License";
+    };
+
     gpl1Only = {
       spdxId = "GPL-1.0-only";
       fullName = "GNU General Public License v1.0 only";
@@ -791,6 +796,12 @@ lib.mapAttrs mkLicense (
       free = false;
     };
 
+    intel-eula = {
+      fullName = "Intel End User License Agreement for Developer Tools";
+      url = "https://software.intel.com/sites/manageability/AMT_Implementation_and_Reference_Guide/WordDocuments/intelamtsdklicense.htm";
+      free = false;
+    };
+
     interbase = {
       spdxId = "Interbase-1.0";
       fullName = "Interbase Public License v1.0";
@@ -982,6 +993,11 @@ lib.mapAttrs mkLicense (
       fullName = "CMU License";
     };
 
+    mit-enna = {
+      spdxId = "MIT-enna";
+      fullName = "enna License";
+    };
+
     mit-feh = {
       spdxId = "MIT-feh";
       fullName = "feh License";
diff --git a/lib/modules.nix b/lib/modules.nix
index 5fc00e2acee8..a78bd1a92488 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1126,6 +1126,29 @@ let
       __toString = _: showOption loc;
     };
 
+  # Check that a type with v2 merge has a coherent check attribute.
+  # Throws an error if the type uses an ad-hoc `type // { check }` override.
+  # Returns the last argument like `seq`, allowing usage: checkV2MergeCoherence loc type expr
+  checkV2MergeCoherence =
+    loc: type: result:
+    if type.check.isV2MergeCoherent or false then
+      result
+    else
+      throw ''
+        The option `${showOption loc}' has a type `${type.description}' that uses
+        an ad-hoc `type // { check = ...; }' override, which is incompatible with
+        the v2 merge mechanism.
+
+        Please use `lib.types.addCheck` instead of `type // { check }' to add
+        custom validation. For example:
+
+          lib.types.addCheck baseType (value: /* your check */)
+
+        instead of:
+
+          baseType // { check = value: /* your check */; }
+      '';
+
   # Merge definitions of a value of a given type.
   mergeDefinitions = loc: type: defs: rec {
     defsFinal' =
@@ -1201,10 +1224,13 @@ let
         (
           if type.merge ? v2 then
             let
-              r = type.merge.v2 {
-                inherit loc;
-                defs = defsFinal;
-              };
+              # Check for v2 merge coherence
+              r = checkV2MergeCoherence loc type (
+                type.merge.v2 {
+                  inherit loc;
+                  defs = defsFinal;
+                }
+              );
             in
             r
             // {
@@ -1468,11 +1494,6 @@ let
   mkForce = mkOverride 50;
   mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
 
-  defaultPriority =
-    warnIf (oldestSupportedReleaseIsAtLeast 2305)
-      "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead."
-      defaultOverridePriority;
-
   mkFixStrictness = warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id;
 
   mkOrder = priority: content: {
@@ -1787,11 +1808,10 @@ let
     };
 
   /**
-    Transitional version of mkAliasOptionModule that uses MD docs.
-
-    This function is no longer necessary and merely an alias of `mkAliasOptionModule`.
+    Deprecated alias of mkAliasOptionModule that uses MD docs.
+    This function is no longer necessary will be removed in 26.05`.
   */
-  mkAliasOptionModuleMD = mkAliasOptionModule;
+  mkAliasOptionModuleMD = lib.warn "mkAliasOptionModuleMD is deprecated and will be removed in 26.05; please use mkAliasOptionModule." mkAliasOptionModule;
 
   /**
     mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b
@@ -2163,7 +2183,6 @@ private
   inherit
     defaultOrderPriority
     defaultOverridePriority
-    defaultPriority
     doRename
     evalModules
     evalOptionValue # for use by lib.types
diff --git a/lib/options.nix b/lib/options.nix
index 75f8bfa2535c..b1db6ff76e46 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -684,8 +684,6 @@ rec {
         inherit text;
       };
 
-  literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression;
-
   /**
     For use in the `defaultText` and `example` option attributes. Causes the
     given MD text to be inserted verbatim in the documentation, for when
diff --git a/lib/sources.nix b/lib/sources.nix
index 4d67ea30b62c..78335bd9f06d 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -509,22 +509,6 @@ let
 
 in
 {
-
-  pathType =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.sources.pathType has been moved to lib.filesystem.pathType."
-      lib.filesystem.pathType;
-
-  pathIsDirectory =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.sources.pathIsDirectory has been moved to lib.filesystem.pathIsDirectory."
-      lib.filesystem.pathIsDirectory;
-
-  pathIsRegularFile =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.sources.pathIsRegularFile has been moved to lib.filesystem.pathIsRegularFile."
-      lib.filesystem.pathIsRegularFile;
-
   inherit
     pathIsGitRepo
     commitIdFromGitRepo
diff --git a/lib/strings.nix b/lib/strings.nix
index 77d7bb939eb5..5d3183bcef06 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1467,9 +1467,6 @@ rec {
       [ "\"" "'" "<" ">" "&" ]
       [ "&quot;" "&apos;" "&lt;" "&gt;" "&amp;" ];
 
-  # warning added 12-12-2022
-  replaceChars = lib.warn "lib.replaceChars is a deprecated alias of lib.replaceStrings." builtins.replaceStrings;
-
   # Case conversion utilities.
   lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
   upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -2578,30 +2575,6 @@ rec {
     in
     lib.warnIf (!precise) "Imprecise conversion from float to string ${result}" result;
 
-  /**
-    Check whether a value `val` can be coerced to a string.
-
-    :::{.warning}
-    Soft-deprecated function. While the original implementation is available as
-    `isConvertibleWithToString`, consider using `isStringLike` instead, if suitable.
-    :::
-
-    # Inputs
-
-    `val`
-    : 1\. Function argument
-
-    # Type
-
-    ```
-    isCoercibleToString :: a -> bool
-    ```
-  */
-  isCoercibleToString =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles."
-      isConvertibleWithToString;
-
   /**
     Check whether a list or other value `x` can be passed to toString.
 
@@ -2842,60 +2815,6 @@ rec {
     else
       parsedInput;
 
-  /**
-    Read a list of paths from `file`, relative to the `rootPath`.
-    Lines beginning with `#` are treated as comments and ignored.
-    Whitespace is significant.
-
-    :::{.warning}
-    This function is deprecated and should be avoided.
-    :::
-
-    :::{.note}
-    This function is not performant and should be avoided.
-    :::
-
-    # Inputs
-
-    `rootPath`
-    : 1\. Function argument
-
-    `file`
-    : 2\. Function argument
-
-    # Type
-
-    ```
-    readPathsFromFile :: string -> string -> [string]
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.strings.readPathsFromFile` usage example
-
-    ```nix
-    readPathsFromFile /prefix
-      ./pkgs/development/libraries/qt-5/5.4/qtbase/series
-    => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch"
-         "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch"
-         "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch"
-         "/prefix/nix-profiles-library-paths.patch"
-         "/prefix/compose-search-path.patch" ]
-    ```
-
-    :::
-  */
-  readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead." (
-    rootPath: file:
-    let
-      lines = lib.splitString "\n" (readFile file);
-      removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
-      relativePaths = removeComments lines;
-      absolutePaths = map (path: rootPath + "/${path}") relativePaths;
-    in
-    absolutePaths
-  );
-
   /**
     Read the contents of a file removing the trailing \n
 
diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 7e78ceb4827a..cd1448d811fa 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -360,8 +360,8 @@ let
             null;
         # The canonical name for this attribute is darwinSdkVersion, but some
         # platforms define the old name "sdkVer".
-        darwinSdkVersion = final.sdkVer or "11.3";
-        darwinMinVersion = final.darwinSdkVersion;
+        darwinSdkVersion = final.sdkVer or "14.4";
+        darwinMinVersion = "14.0";
         darwinMinVersionVariable =
           if final.isMacOS then
             "MACOSX_DEPLOYMENT_TARGET"
@@ -491,6 +491,13 @@ let
                 }
                 .${cpu.name} or cpu.name;
               vendor_ = final.rust.platform.vendor;
+              abi_ =
+                # We're very explicit about the POWER ELF ABI w/ glibc in our parsing, while Rust is not.
+                # TODO: Somehow ensure that Rust actually *uses* the correct ABI, and not just a libc-based default.
+                if (lib.strings.hasPrefix "powerpc" cpu.name) && (lib.strings.hasPrefix "gnuabielfv" abi.name) then
+                  "gnu"
+                else
+                  abi.name;
             in
             # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.
             args.rust.rustcTarget or args.rustc.config or (
@@ -501,7 +508,7 @@ let
               if final.isWasi then
                 "${cpu_}-wasip1"
               else
-                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"
+                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi_}"}"
             );
 
           # The name of the rust target if it is standard, or the json file
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index cdd28b1ddde1..d05c05910523 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -23,7 +23,6 @@ rec {
 
   ppc64-elfv1 = {
     config = "powerpc64-unknown-linux-gnuabielfv1";
-    rust.rustcTarget = "powerpc64-unknown-linux-gnu";
   };
   ppc64-elfv2 = {
     config = "powerpc64-unknown-linux-gnuabielfv2";
@@ -303,15 +302,6 @@ rec {
     libc = "newlib";
   };
 
-  #
-  # Redox
-  #
-
-  x86_64-unknown-redox = {
-    config = "x86_64-unknown-redox";
-    libc = "relibc";
-  };
-
   #
   # Darwin
   #
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index bbb0fa9d5582..c76aa592fc28 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -919,9 +919,9 @@ rec {
           else if isLinux parsed || isWindows parsed then
             if isAarch32 parsed then
               if versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi
-            # Default ppc64 BE to ELFv2
+            # Default ppc64 BE to ELFv1
             else if isPower64 parsed && isBigEndian parsed then
-              abis.gnuabielfv2
+              abis.gnuabielfv1
             else
               abis.gnu
           else
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 59fbb1ccd63b..2ec670262649 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -3106,6 +3106,86 @@ runTests {
     expected = "-X PUT --data '{\"id\":0}' --retry 3 --url https://example.com/foo --url https://example.com/bar --verbose";
   };
 
+  testToCommandLine = {
+    expr =
+      let
+        optionFormat = optionName: {
+          option = "-${optionName}";
+          sep = "=";
+          explicitBool = true;
+        };
+      in
+      cli.toCommandLine optionFormat {
+        v = true;
+        verbose = [
+          true
+          true
+          false
+          null
+        ];
+        i = ".bak";
+        testsuite = [
+          "unit"
+          "integration"
+        ];
+        e = [
+          "s/a/b/"
+          "s/b/c/"
+        ];
+        n = false;
+        data = builtins.toJSON { id = 0; };
+      };
+
+    expected = [
+      "-data={\"id\":0}"
+      "-e=s/a/b/"
+      "-e=s/b/c/"
+      "-i=.bak"
+      "-n=false"
+      "-testsuite=unit"
+      "-testsuite=integration"
+      "-v=true"
+      "-verbose=true"
+      "-verbose=true"
+      "-verbose=false"
+    ];
+  };
+
+  testToCommandLineGNU = {
+    expr = cli.toCommandLineGNU { } {
+      v = true;
+      verbose = [
+        true
+        true
+        false
+        null
+      ];
+      i = ".bak";
+      testsuite = [
+        "unit"
+        "integration"
+      ];
+      e = [
+        "s/a/b/"
+        "s/b/c/"
+      ];
+      n = false;
+      data = builtins.toJSON { id = 0; };
+    };
+
+    expected = [
+      "--data={\"id\":0}"
+      "-es/a/b/"
+      "-es/b/c/"
+      "-i.bak"
+      "--testsuite=unit"
+      "--testsuite=integration"
+      "-v"
+      "--verbose"
+      "--verbose"
+    ];
+  };
+
   testSanitizeDerivationNameLeadingDots = testSanitizeDerivationName {
     name = "..foo";
     expected = "foo";
@@ -4661,4 +4741,82 @@ runTests {
     expected = "/non-existent/this/does/not/exist/for/real/please-dont-mess-with-your-local-fs/default.nix";
   };
 
+  # Tests for cross index utilities
+
+  testRenameCrossIndexFrom = {
+    expr = lib.renameCrossIndexFrom "pkgs" {
+      pkgsBuildBuild = "dummy-build-build";
+      pkgsBuildHost = "dummy-build-host";
+      pkgsBuildTarget = "dummy-build-target";
+      pkgsHostHost = "dummy-host-host";
+      pkgsHostTarget = "dummy-host-target";
+      pkgsTargetTarget = "dummy-target-target";
+    };
+    expected = {
+      buildBuild = "dummy-build-build";
+      buildHost = "dummy-build-host";
+      buildTarget = "dummy-build-target";
+      hostHost = "dummy-host-host";
+      hostTarget = "dummy-host-target";
+      targetTarget = "dummy-target-target";
+    };
+  };
+
+  testRenameCrossIndexTo = {
+    expr = lib.renameCrossIndexTo "self" {
+      buildBuild = "dummy-build-build";
+      buildHost = "dummy-build-host";
+      buildTarget = "dummy-build-target";
+      hostHost = "dummy-host-host";
+      hostTarget = "dummy-host-target";
+      targetTarget = "dummy-target-target";
+    };
+    expected = {
+      selfBuildBuild = "dummy-build-build";
+      selfBuildHost = "dummy-build-host";
+      selfBuildTarget = "dummy-build-target";
+      selfHostHost = "dummy-host-host";
+      selfHostTarget = "dummy-host-target";
+      selfTargetTarget = "dummy-target-target";
+    };
+  };
+
+  testMapCrossIndex = {
+    expr = lib.mapCrossIndex (x: x * 10) {
+      buildBuild = 1;
+      buildHost = 2;
+      buildTarget = 3;
+      hostHost = 4;
+      hostTarget = 5;
+      targetTarget = 6;
+    };
+    expected = {
+      buildBuild = 10;
+      buildHost = 20;
+      buildTarget = 30;
+      hostHost = 40;
+      hostTarget = 50;
+      targetTarget = 60;
+    };
+  };
+
+  testMapCrossIndexString = {
+    expr = lib.mapCrossIndex (x: "prefix-${x}") {
+      buildBuild = "bb";
+      buildHost = "bh";
+      buildTarget = "bt";
+      hostHost = "hh";
+      hostTarget = "ht";
+      targetTarget = "tt";
+    };
+    expected = {
+      buildBuild = "prefix-bb";
+      buildHost = "prefix-bh";
+      buildTarget = "prefix-bt";
+      hostHost = "prefix-hh";
+      hostTarget = "prefix-ht";
+      targetTarget = "prefix-tt";
+    };
+  };
+
 }
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 5cd781752317..505c1c5a5fe4 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -223,6 +223,26 @@ checkConfigError 'A definition for option .* is not of type .path in the Nix sto
 checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix
 checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix
 
+# types.externalPath
+checkConfigOutput '".*/foo/bar"' config.externalPath.ok1 ./types.nix
+checkConfigOutput '".*/"' config.externalPath.ok2 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad1 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad2 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad3 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad4 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad5 ./types.nix
+
+# types.fileset
+checkConfigOutput '^0$' config.filesetCardinal.ok1 ./fileset.nix
+checkConfigOutput '^1$' config.filesetCardinal.ok2 ./fileset.nix
+checkConfigOutput '^1$' config.filesetCardinal.ok3 ./fileset.nix
+checkConfigOutput '^1$' config.filesetCardinal.ok4 ./fileset.nix
+checkConfigOutput '^0$' config.filesetCardinal.ok5 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err1 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err2 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err3 ./fileset.nix
+checkConfigError 'A definition for option .* is not of type .fileset.. Definition values:\n.*' config.filesetCardinal.err4 ./fileset.nix
+
 # Check boolean option.
 checkConfigOutput '^false$' config.enable ./declare-enable.nix
 checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix
@@ -806,6 +826,25 @@ checkConfigError 'A definition for option .* is not of type .signed integer.*' c
 checkConfigOutput '^true$' config.v2checkedPass ./add-check.nix
 checkConfigError 'A definition for option .* is not of type .attribute set of signed integer.*' config.v2checkedFail ./add-check.nix
 
+# v2 merge check coherence
+# Tests checkV2MergeCoherence call in modules.nix (mergeDefinitions for lazyAttrsOf)
+checkConfigError 'ad-hoc.*override.*incompatible' config.adhocFail.foo ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in modules.nix (mergeDefinitions for lazyAttrsOf)
+checkConfigError 'ad-hoc.*override.*incompatible' config.adhocOuterFail.bar ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (either t1)
+checkConfigError 'ad-hoc.*override.*incompatible' config.eitherLeftFail ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (either t2)
+checkConfigError 'ad-hoc.*override.*incompatible' config.eitherRightFail ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (coercedTo coercedType)
+checkConfigError 'ad-hoc.*override.*incompatible' config.coercedFromFail.bar ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (coercedTo finalType)
+checkConfigError 'ad-hoc.*override.*incompatible' config.coercedToFail.foo ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (addCheck elemType)
+checkConfigError 'ad-hoc.*override.*incompatible' config.addCheckNested.foo ./v2-check-coherence.nix
+checkConfigError 'Please use.*lib.types.addCheck.*instead' config.adhocFail.foo ./v2-check-coherence.nix
+checkConfigError 'A definition for option .* is not of type .*' config.addCheckFail.bar.baz ./v2-check-coherence.nix
+checkConfigOutput '^true$' config.result ./v2-check-coherence.nix
+
 
 cat <<EOF
 ====== module tests ======
diff --git a/lib/tests/modules/fileset.nix b/lib/tests/modules/fileset.nix
new file mode 100644
index 000000000000..40b1a8ef601f
--- /dev/null
+++ b/lib/tests/modules/fileset.nix
@@ -0,0 +1,50 @@
+{ config, lib, ... }:
+
+let
+  inherit (lib)
+    mkOption
+    mkIf
+    types
+    mapAttrs
+    length
+    ;
+  inherit (lib.fileset)
+    empty
+    unions
+    toList
+    ;
+in
+
+{
+  options = {
+    fileset = mkOption { type = with types; lazyAttrsOf fileset; };
+
+    ## The following option is only here as a proxy to test `fileset` that does
+    ## not work so well with `modules.sh` because it is not JSONable. It exposes
+    ## the number of elements in the fileset.
+    filesetCardinal = mkOption { default = mapAttrs (_: fs: length (toList fs)) config.fileset; };
+  };
+
+  config = {
+    fileset.ok1 = empty;
+    fileset.ok2 = ./fileset;
+    fileset.ok3 = unions [
+      empty
+      ./fileset
+    ];
+    # fileset.ok4: see imports below
+    fileset.ok5 = mkIf false ./fileset;
+
+    fileset.err1 = 1;
+    fileset.err2 = "foo";
+    fileset.err3 = "./.";
+    fileset.err4 = [ empty ];
+
+  };
+
+  imports = [
+    { fileset.ok4 = ./fileset; }
+    { fileset.ok4 = empty; }
+    { fileset.ok4 = ./fileset; }
+  ];
+}
diff --git a/lib/tests/modules/fileset/keepme b/lib/tests/modules/fileset/keepme
new file mode 100644
index 000000000000..27b2fabd2c27
--- /dev/null
+++ b/lib/tests/modules/fileset/keepme
@@ -0,0 +1 @@
+Do not remove. This file is used by the tests in `../fileset.nix`.
diff --git a/lib/tests/modules/types.nix b/lib/tests/modules/types.nix
index e860dbac3319..0a566ea960c4 100644
--- a/lib/tests/modules/types.nix
+++ b/lib/tests/modules/types.nix
@@ -15,6 +15,7 @@ in
 {
   options = {
     pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; };
+    externalPath = mkOption { type = types.lazyAttrsOf types.externalPath; };
     assertions = mkOption { };
   };
   config = {
@@ -26,6 +27,13 @@ in
     pathInStore.bad3 = "${storeDir}/";
     pathInStore.bad4 = "${storeDir}/.links"; # technically true, but not reasonable
     pathInStore.bad5 = "/foo/bar";
+    externalPath.bad1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";
+    externalPath.bad2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";
+    externalPath.bad3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";
+    externalPath.bad4 = "";
+    externalPath.bad5 = "./foo/bar";
+    externalPath.ok1 = "/foo/bar";
+    externalPath.ok2 = "/";
 
     assertions =
       with lib.types;
@@ -380,7 +388,7 @@ in
       assert (pathWith { absolute = null; }).description == "path";
       assert (pathWith { inStore = false; }).description == "path not in the Nix store";
       assert (pathWith { inStore = null; }).description == "path";
-      assert (separatedString "").description == "Concatenated string";
+      assert (separatedString "").description == "strings concatenated with \"\"";
       assert (separatedString ",").description == "strings concatenated with \",\"";
       assert (separatedString "\n").description == ''strings concatenated with "\n"'';
       assert (separatedString ":").description == "strings concatenated with \":\"";
diff --git a/lib/tests/modules/v2-check-coherence.nix b/lib/tests/modules/v2-check-coherence.nix
new file mode 100644
index 000000000000..60e134ff483e
--- /dev/null
+++ b/lib/tests/modules/v2-check-coherence.nix
@@ -0,0 +1,117 @@
+# Tests for v2 merge check coherence
+{ lib, ... }:
+let
+  inherit (lib) types mkOption;
+
+  # The problematic pattern: overriding check with //
+  # This inner type should reject everything (check always returns false)
+  adhocOverrideType = (types.lazyAttrsOf types.raw) // {
+    check = _: false;
+  };
+
+  # Using addCheck is the correct way to add custom checks
+  properlyCheckedType = types.addCheck (types.lazyAttrsOf types.raw) (v: v ? foo);
+
+  # Using addCheck with a check that will fail
+  failingCheckedType = types.addCheck (types.lazyAttrsOf types.raw) (v: v ? foo);
+
+  # Ad-hoc override on outer type
+  adhocOuterType = types.lazyAttrsOf types.int // {
+    check = _: false;
+  };
+
+  # Ad-hoc override on left side of either
+  adhocEitherLeft = types.lazyAttrsOf types.raw // {
+    check = _: false;
+  };
+
+  # Ad-hoc override on coercedType in coercedTo
+  adhocCoercedFrom = types.lazyAttrsOf types.raw // {
+    check = _: false;
+  };
+
+  # Ad-hoc override on finalType in coercedTo
+  adhocCoercedTo = types.lazyAttrsOf types.raw // {
+    check = _: false;
+  };
+
+  # Ad-hoc override wrapped in addCheck
+  adhocAddCheck = types.addCheck (types.lazyAttrsOf types.raw // { check = _: false; }) (v: true);
+in
+{
+  # Test 1: Ad-hoc check override in nested type should be detected
+  options.adhocFail = mkOption {
+    type = types.lazyAttrsOf adhocOverrideType;
+    default = { };
+  };
+  config.adhocFail = {
+    foo = { };
+  };
+
+  # Test 1b: Ad-hoc check override in outer type should be detected
+  options.adhocOuterFail = mkOption {
+    type = adhocOuterType;
+    default = { };
+  };
+  config.adhocOuterFail.bar = 42;
+
+  # Test 1c: Ad-hoc check override on left side of either type
+  options.eitherLeftFail = mkOption {
+    type = types.either adhocEitherLeft types.int;
+  };
+  config.eitherLeftFail.foo = { };
+
+  # Test 1d: Ad-hoc check override on right side of either type
+  options.eitherRightFail = mkOption {
+    type = types.either types.int (types.lazyAttrsOf types.raw // { check = _: false; });
+  };
+  config.eitherRightFail.foo = { };
+
+  # Test 1e: Ad-hoc check override on coercedType in coercedTo
+  options.coercedFromFail = mkOption {
+    type = types.coercedTo adhocCoercedFrom (x: { bar = 1; }) (types.lazyAttrsOf types.int);
+  };
+  config.coercedFromFail = {
+    foo = { };
+  };
+
+  # Test 1f: Ad-hoc check override on finalType in coercedTo
+  options.coercedToFail = mkOption {
+    type = types.coercedTo types.str (x: { }) adhocCoercedTo;
+  };
+  config.coercedToFail.foo = { };
+
+  # Test 1g: Ad-hoc check override wrapped in addCheck
+  options.addCheckNested = mkOption {
+    type = adhocAddCheck;
+  };
+  config.addCheckNested.foo = { };
+
+  # Test 2: Using addCheck should work correctly
+  options.addCheckPass = mkOption {
+    type = types.lazyAttrsOf properlyCheckedType;
+    default = { };
+  };
+  config.addCheckPass.bar.foo = "value";
+
+  # Test 3: addCheck should validate values properly
+  options.addCheckFail = mkOption {
+    type = types.lazyAttrsOf failingCheckedType;
+    default = { };
+  };
+  config.addCheckFail.bar.baz = "value"; # Missing required 'foo' attribute
+
+  # Test 4: Normal v2 types should work without coherence errors
+  options.normalPass = mkOption {
+    type = types.lazyAttrsOf (types.attrsOf types.int);
+    default = { };
+  };
+  config.normalPass.foo.bar = 42;
+
+  # Success assertion - only checks things that should succeed
+  options.result = mkOption {
+    type = types.bool;
+    default = false;
+  };
+  config.result = true;
+}
diff --git a/lib/tests/teams.nix b/lib/tests/teams.nix
index ffe746a781ca..ed7db2b873f1 100644
--- a/lib/tests/teams.nix
+++ b/lib/tests/teams.nix
@@ -24,13 +24,21 @@ let
           default = false;
         };
         members = lib.mkOption {
-          type = types.listOf (types.submodule (import ./maintainer-module.nix { inherit lib; }));
+          type = types.listOf (types.submodule ./maintainer-module.nix);
           default = [ ];
         };
         github = lib.mkOption {
           type = types.str;
           default = "";
         };
+        githubId = lib.mkOption {
+          type = types.int;
+          default = 0;
+        };
+        githubMaintainers = lib.mkOption {
+          type = types.listOf (types.submodule ./maintainer-module.nix);
+          default = [ ];
+        };
       };
     };
 
diff --git a/lib/types.nix b/lib/types.nix
index d1220e18828d..e57ceafcbaa4 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -66,6 +66,11 @@ let
     fixupOptionType
     mergeOptionDecls
     ;
+  inherit (lib.fileset)
+    isFileset
+    unions
+    empty
+    ;
 
   inAttrPosSuffix =
     v: name:
@@ -106,6 +111,29 @@ let
     in
     if invalidDefs != [ ] then { message = "Definition values: ${showDefs invalidDefs}"; } else null;
 
+  # Check that a type with v2 merge has a coherent check attribute.
+  # Throws an error if the type uses an ad-hoc `type // { check }` override.
+  # Returns the last argument like `seq`, allowing usage: checkV2MergeCoherence loc type expr
+  checkV2MergeCoherence =
+    loc: type: result:
+    if type.check.isV2MergeCoherent or false then
+      result
+    else
+      throw ''
+        The option `${showOption loc}' has a type `${type.description}' that uses
+        an ad-hoc `type // { check = ...; }' override, which is incompatible with
+        the v2 merge mechanism.
+
+        Please use `lib.types.addCheck` instead of `type // { check }' to add
+        custom validation. For example:
+
+          lib.types.addCheck baseType (value: /* your check */)
+
+        instead of:
+
+          baseType // { check = value: /* your check */; }
+      '';
+
   outer_types = rec {
     isType = type: x: (x._type or "") == type;
 
@@ -559,11 +587,7 @@ let
         sep:
         mkOptionType rec {
           name = "separatedString";
-          description =
-            if sep == "" then
-              "Concatenated string" # for types.string.
-            else
-              "strings concatenated with ${builtins.toJSON sep}";
+          description = "strings concatenated with ${builtins.toJSON sep}";
           descriptionClass = "noun";
           check = isString;
           merge = loc: defs: concatStringsSep sep (getValues defs);
@@ -578,19 +602,6 @@ let
       commas = separatedString ",";
       envVar = separatedString ":";
 
-      # Deprecated; should not be used because it quietly concatenates
-      # strings, which is usually not what you want.
-      # We use a lib.warn because `deprecationMessage` doesn't trigger in nested types such as `attrsOf string`
-      string =
-        lib.warn
-          "The type `types.string` is deprecated. See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."
-          (
-            separatedString ""
-            // {
-              name = "string";
-            }
-          );
-
       passwdEntry =
         entryType:
         addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str))
@@ -612,6 +623,15 @@ let
         };
       };
 
+      fileset = mkOptionType {
+        name = "fileset";
+        description = "fileset";
+        descriptionClass = "noun";
+        check = isFileset;
+        merge = loc: defs: unions (map (x: x.value) defs);
+        emptyValue.value = empty;
+      };
+
       # A package is a top-level store path (/nix/store/hash-name). This includes:
       # - derivations
       # - more generally, attribute sets with an `outPath` or `__toString` attribute
@@ -656,6 +676,11 @@ let
         inStore = true;
       };
 
+      externalPath = pathWith {
+        absolute = true;
+        inStore = false;
+      };
+
       pathWith =
         {
           inStore ? null,
@@ -711,7 +736,10 @@ let
             optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType
           }";
           descriptionClass = "composite";
-          check = isList;
+          check = {
+            __functor = _self: isList;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -824,7 +852,10 @@ let
             (if lazy then "lazy attribute set" else "attribute set")
             + " of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
           descriptionClass = "composite";
-          check = isAttrs;
+          check = {
+            __functor = _self: isAttrs;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -1236,7 +1267,10 @@ let
 
           name = "submodule";
 
-          check = x: isAttrs x || isFunction x || path.check x;
+          check = {
+            __functor = _self: x: isAttrs x || isFunction x || path.check x;
+            isV2MergeCoherent = true;
+          };
         in
         mkOptionType {
           inherit name;
@@ -1420,7 +1454,10 @@ let
                 ) t2
               }";
           descriptionClass = "conjunction";
-          check = x: t1.check x || t2.check x;
+          check = {
+            __functor = _self: x: t1.check x || t2.check x;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -1430,7 +1467,7 @@ let
               let
                 t1CheckedAndMerged =
                   if t1.merge ? v2 then
-                    t1.merge.v2 { inherit loc defs; }
+                    checkV2MergeCoherence loc t1 (t1.merge.v2 { inherit loc defs; })
                   else
                     {
                       value = t1.merge loc defs;
@@ -1439,7 +1476,7 @@ let
                     };
                 t2CheckedAndMerged =
                   if t2.merge ? v2 then
-                    t2.merge.v2 { inherit loc defs; }
+                    checkV2MergeCoherence loc t2 (t2.merge.v2 { inherit loc defs; })
                   else
                     {
                       value = t2.merge loc defs;
@@ -1464,7 +1501,7 @@ let
                         One or more definitions did not pass the type-check of the 'either' type.
                         ${headError.message}
                         If `either`, `oneOf` or similar is used in freeformType, ensure that it is preceded by an 'attrsOf' such as: `freeformType = types.attrsOf (types.either t1 t2)`.
-                        Otherwise consider using the correct type for the option `${showOption loc}`.  This will be an error in Nixpkgs 26.06.
+                        Otherwise consider using the correct type for the option `${showOption loc}`.  This will be an error in Nixpkgs 26.05.
                       '' (mergeOneOption loc defs);
                     };
               in
@@ -1509,7 +1546,10 @@ let
           description = "${optionDescriptionPhrase (class: class == "noun") finalType} or ${
             optionDescriptionPhrase (class: class == "noun") coercedType
           } convertible to it";
-          check = x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;
+          check = {
+            __functor = _self: x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -1524,10 +1564,16 @@ let
                     // {
                       value =
                         let
-                          merged = coercedType.merge.v2 {
-                            inherit loc;
-                            defs = [ def ];
-                          };
+                          merged =
+                            if coercedType.merge ? v2 then
+                              checkV2MergeCoherence loc coercedType (
+                                coercedType.merge.v2 {
+                                  inherit loc;
+                                  defs = [ def ];
+                                }
+                              )
+                            else
+                              null;
                         in
                         if coercedType.merge ? v2 then
                           if merged.headError == null then coerceFunc def.value else def.value
@@ -1540,10 +1586,12 @@ let
                 );
               in
               if finalType.merge ? v2 then
-                finalType.merge.v2 {
-                  inherit loc;
-                  defs = finalDefs;
-                }
+                checkV2MergeCoherence loc finalType (
+                  finalType.merge.v2 {
+                    inherit loc;
+                    defs = finalDefs;
+                  }
+                )
               else
                 {
                   value = finalType.merge loc finalDefs;
@@ -1576,7 +1624,10 @@ let
         if elemType.merge ? v2 then
           elemType
           // {
-            check = x: elemType.check x && check x;
+            check = {
+              __functor = _self: x: elemType.check x && check x;
+              isV2MergeCoherent = true;
+            };
             merge = {
               __functor =
                 self: loc: defs:
@@ -1584,7 +1635,7 @@ let
               v2 =
                 { loc, defs }:
                 let
-                  orig = elemType.merge.v2 { inherit loc defs; };
+                  orig = checkV2MergeCoherence loc elemType (elemType.merge.v2 { inherit loc defs; });
                   headError' = if orig.headError != null then orig.headError else checkDefsForError check loc defs;
                 in
                 orig
diff --git a/maintainers/README.md b/maintainers/README.md
index 1bcaaea1a5c3..f06d4f221d51 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -32,7 +32,7 @@ Commit access to the Nixpkgs repository is not required for that.
 In order to do so, add yourself to the [`maintainer-list.nix`](./maintainer-list.nix), and then to the desired package's `meta.maintainers` list, and send a PR with the changes.
 
 If you're adding yourself as a maintainer as part of another PR (in which you become a maintainer of a package, for example), make your change to
-`maintainer-list.nix` in a separate commit titled `maintainers: add <name>`.
+`maintainer-list.nix` in a separate commit titled `maintainers: add <handle>`.
 
 ### Losing maintainer status
 
@@ -158,13 +158,17 @@ If the team lists no specific membership policy, feel free to merge changes to t
 > [!IMPORTANT]
 > If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
 
-A corresponding GitHub team can be created by any org member.
+#### Synced GitHub teams
+
+As an alternative to tracking team members in `team-list.nix`, a corresponding GitHub team can be created by any org member and its members subsequently managed directly on GitHub.
 When creating the team it should be created with the `nixpkgs-maintainers` team as parent.
 Once approved, the team will have the right privileges to be pinged and requested for review in Nixpkgs.
 
 > [!TIP]
 > The team name should be as short as possible; because it is nested under the maintainers group, no -maintainers suffix is needed.
 
+After the first [weekly team sync](../.github/workflows/team-sync.yml) with the new team, it's then also possible to link it to the entry in `team-list.nix` by setting its `github` field to the GitHub team name.
+
 # Maintainer scripts
 
 Various utility scripts, which are mainly useful for nixpkgs maintainers, are available under `./scripts/`.
diff --git a/maintainers/computed-team-list.nix b/maintainers/computed-team-list.nix
new file mode 100644
index 000000000000..7ee37f4283e3
--- /dev/null
+++ b/maintainers/computed-team-list.nix
@@ -0,0 +1,59 @@
+# Extends ./team-list.nix with synced GitHub information from ./github-teams.json
+{ lib }:
+let
+  githubTeams = lib.importJSON ./github-teams.json;
+  teams = import ./team-list.nix { inherit lib; };
+
+  # A fast maintainer id lookup table
+  maintainersById = lib.pipe lib.maintainers [
+    lib.attrValues
+    (lib.groupBy (attrs: toString attrs.githubId))
+    (lib.mapAttrs (_: lib.head))
+  ];
+
+  maintainerSetToList =
+    githubTeam:
+    lib.mapAttrsToList (
+      login: id:
+      maintainersById.${toString id}
+      or (throw "lib.teams: No maintainer entry for GitHub user @${login} who's part of the @NixOS/${githubTeam} team")
+    );
+
+in
+# TODO: Consider automatically exposing all GitHub teams under `lib.teams`,
+# so that no manual PRs are necessary to add such teams anymore
+lib.mapAttrs (
+  name: attrs:
+  if attrs ? github then
+    let
+      githubTeam =
+        githubTeams.${attrs.github}
+          or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
+    in
+    # TODO: Consider specifying `githubId` in team-list.nix and inferring `github` from it (or even dropping it)
+    # This would make renames easier because no additional place needs to keep track of them.
+    # Though in a future where all Nixpkgs GitHub teams are automatically exposed under `lib.teams`,
+    # this would also not be an issue anymore.
+    assert lib.assertMsg (!attrs ? githubId)
+      "lib.teams.${name}: Both `githubId` and `github` is set, but the former is synced from the latter";
+    assert lib.assertMsg (!attrs ? shortName)
+      "lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
+    assert lib.assertMsg (
+      !attrs ? scope
+    ) "lib.teams.${name}: Both `scope` and `github` is set, but the former is synced from the latter";
+    assert lib.assertMsg (
+      !attrs ? members
+    ) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
+    attrs
+    // {
+      githubId = githubTeam.id;
+      shortName = githubTeam.name;
+      scope = githubTeam.description;
+      members =
+        maintainerSetToList attrs.github githubTeam.maintainers
+        ++ maintainerSetToList attrs.github githubTeam.members;
+      githubMaintainers = maintainerSetToList attrs.github githubTeam.maintainers;
+    }
+  else
+    attrs
+) teams
diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
new file mode 100644
index 000000000000..289edd306687
--- /dev/null
+++ b/maintainers/github-teams.json
@@ -0,0 +1,985 @@
+{
+  "acme": {
+    "description": "Maintain ACME-related packages and modules.",
+    "id": 3806126,
+    "maintainers": {},
+    "members": {
+      "arianvp": 628387,
+      "emilazy": 18535642,
+      "m1cr0man": 3044438
+    },
+    "name": "ACME"
+  },
+  "agda": {
+    "description": "Maintain Agda-related packages and modules",
+    "id": 14416551,
+    "maintainers": {
+      "alexarice": 17208985,
+      "ncfavier": 4323933,
+      "turion": 303489
+    },
+    "members": {
+      "phijor": 10487782
+    },
+    "name": "agda"
+  },
+  "android": {
+    "description": "Maintain Android-related tooling in nixpkgs",
+    "id": 11821955,
+    "maintainers": {
+      "RossComputerGuy": 19699320,
+      "numinit": 369111
+    },
+    "members": {
+      "JohnRTitor": 50095635,
+      "adrian-gierakowski": 330177,
+      "hadilq": 5190539
+    },
+    "name": "Android"
+  },
+  "bazel": {
+    "description": "Maintenance of https://bazel.build/ and related packages",
+    "id": 5468470,
+    "maintainers": {
+      "Profpatsch": 3153638
+    },
+    "members": {
+      "aherrmann": 732652,
+      "avdv": 3471749,
+      "ethercrow": 222467,
+      "groodt": 343415,
+      "kalbasit": 87115,
+      "mboes": 51356,
+      "uri-canva": 33242106
+    },
+    "name": "Bazel"
+  },
+  "beam": {
+    "description": "Maintain BEAM-related packages and modules.",
+    "id": 4502493,
+    "maintainers": {
+      "happysalada": 5317234
+    },
+    "members": {
+      "Br1ght0ne": 12615679,
+      "DianaOlympos": 15774340,
+      "adamcstephens": 2071575,
+      "ankhers": 750786,
+      "gleber": 33185,
+      "minijackson": 1200507,
+      "savtrip": 42227195,
+      "yurrriq": 1866448
+    },
+    "name": "Beam"
+  },
+  "bootstrapping": {
+    "description": "coordinates efforts towards bootstrappable builds (see https://bootstrappable.org/)",
+    "id": 9141350,
+    "maintainers": {
+      "zeuner": 2545850
+    },
+    "members": {
+      "philiptaron": 43863
+    },
+    "name": "bootstrapping"
+  },
+  "categorization": {
+    "description": "Maintain the categorization system in Nixpkgs, per RFC 0146. This team has authority over all categorization issues in Nixpkgs. Matrix: https://matrix.to/#/%23nixpkgs-categorization:matrix.org",
+    "id": 11723948,
+    "maintainers": {
+      "7c6f434c": 1891350,
+      "Aleksanaa": 42209822,
+      "GetPsyched": 43472218,
+      "Lyndeno": 13490857,
+      "SigmaSquadron": 174749595,
+      "fgaz": 8182846,
+      "natsukium": 25083790,
+      "philiptaron": 43863,
+      "pyrotelekinetic": 29682759,
+      "tomodachi94": 68489118
+    },
+    "members": {},
+    "name": "Categorization"
+  },
+  "channel-updaters": {
+    "description": "Users who can update the Nixpkgs/NixOS channels",
+    "id": 3475569,
+    "maintainers": {},
+    "members": {
+      "nixos-channel-bot": 56695723
+    },
+    "name": "channel-updaters"
+  },
+  "coq": {
+    "description": "Coq proof assistant and package maintainers",
+    "id": 7617261,
+    "maintainers": {
+      "Alizter": 8614547,
+      "Zimmi48": 1108325,
+      "vbgl": 2612464
+    },
+    "members": {},
+    "name": "Coq"
+  },
+  "cosmic": {
+    "description": "Maintain the COSMIC DE and related packages.",
+    "id": 12734494,
+    "maintainers": {
+      "alyssais": 2768870,
+      "nyabinary": 97130632
+    },
+    "members": {
+      "HeitorAugustoLN": 44377258,
+      "Pandapip1": 45835846,
+      "a-kenji": 65275785,
+      "ahoneybun": 4884946,
+      "drakon64": 6444703,
+      "michaelBelsanti": 62124625,
+      "thefossguy": 44400303
+    },
+    "name": "COSMIC"
+  },
+  "crystal-lang": {
+    "description": "The Crystal Lang eco-system",
+    "id": 3806663,
+    "maintainers": {
+      "peterhoeg": 722550
+    },
+    "members": {
+      "Br1ght0ne": 12615679,
+      "manveru": 3507
+    },
+    "name": "crystal-lang"
+  },
+  "cuda-maintainers": {
+    "description": "Maintain CUDA-enabled packages",
+    "id": 5704451,
+    "maintainers": {
+      "ConnorBaker": 3880346,
+      "SomeoneSerge": 9720532,
+      "samuela": 226872
+    },
+    "members": {
+      "GaetanLepage": 33058747,
+      "prusnak": 42201
+    },
+    "name": "cuda-maintainers"
+  },
+  "darwin-core": {
+    "description": "Maintain core platform support and packages for macOS and other Apple platforms",
+    "id": 11265438,
+    "maintainers": {
+      "emilazy": 18535642
+    },
+    "members": {
+      "reckenrode": 7413633,
+      "toonn": 1486805
+    },
+    "name": "darwin-core"
+  },
+  "darwin-maintainers": {
+    "description": "Improve Darwin-support across Nixpkgs and help maintainers without access to Darwin hardware. Apply to join through https://github.com/NixOS/nixpkgs/issues/323144 to keep the process transparent.",
+    "id": 2385202,
+    "maintainers": {
+      "toonn": 1486805
+    },
+    "members": {
+      "0xMRTT": 105598867,
+      "21CSM": 81891917,
+      "Aleksanaa": 42209822,
+      "CorbanR": 1918683,
+      "Emin017": 99674037,
+      "Et7f3": 29592775,
+      "FlameFlag": 57304299,
+      "Guanran928": 68757440,
+      "LnL7": 689294,
+      "Mastermindaxe": 33257997,
+      "Moraxyc": 69713071,
+      "Prince213": 25235514,
+      "Samasaur1": 30577766,
+      "Sciencentistguy": 4983935,
+      "Steven0351": 24440751,
+      "afh": 16507,
+      "azuwis": 9315,
+      "booxter": 90200,
+      "carlossless": 498906,
+      "cideM": 4246921,
+      "cidkidnix": 67574902,
+      "copumpkin": 2623,
+      "devusb": 4951663,
+      "domenkozar": 126339,
+      "donn": 12652988,
+      "dwt": 57199,
+      "emilazy": 18535642,
+      "ethancedwards8": 60861925,
+      "fiddlerwoaroof": 808745,
+      "frogamic": 10263813,
+      "gador": 1883533,
+      "griff": 4368,
+      "groodt": 343415,
+      "gshpychka": 23005347,
+      "hexagonal-sun": 222664,
+      "heywoodlh": 18178614,
+      "iedame": 60272,
+      "isabelroses": 71222764,
+      "jonhermansen": 660911,
+      "juliusrickert": 5007494,
+      "jwiegley": 8460,
+      "kashw2": 15855440,
+      "kevingriffin": 209729,
+      "khaneliman": 1778670,
+      "kloenk": 12898828,
+      "konradmalik": 13033392,
+      "kubukoz": 894884,
+      "lutzmor": 9321736,
+      "magistau": 43097806,
+      "maljub01": 350635,
+      "martinjlowm": 110860,
+      "matteo-pacini": 3139724,
+      "matthewbauer": 19036,
+      "mexisme": 329349,
+      "mikroskeem": 3490861,
+      "mirkolenz": 5160954,
+      "mstone": 412508,
+      "n8henrie": 1234956,
+      "niklaskorz": 590517,
+      "ofalvai": 1694986,
+      "pasqui23": 6931743,
+      "prusnak": 42201,
+      "pupbrained": 33522919,
+      "reckenrode": 7413633,
+      "ryand56": 22267679,
+      "samrose": 115821,
+      "sarahec": 11277967,
+      "shaunsingh": 71196912,
+      "sikmir": 688044,
+      "siraben": 8219659,
+      "siriobalmelli": 23038812,
+      "starcraft66": 1858154,
+      "stepbrobd": 81826728,
+      "stephank": 89950,
+      "stephenstubbs": 18033664,
+      "t-monaghan": 62273348,
+      "thefloweringash": 42933,
+      "tricktron": 16036882,
+      "uncenter": 47499684,
+      "uri-canva": 33242106,
+      "usertam": 22500027,
+      "veprbl": 245573,
+      "viraptor": 188063,
+      "wegank": 9713184,
+      "willcohen": 5185341,
+      "willjr": 5904828,
+      "wldhx": 15619766,
+      "yeongsheng-tan": 809030,
+      "youhaveme9": 58213083,
+      "yzx9": 41458459,
+      "zachcoyle": 908716
+    },
+    "name": "darwin-maintainers"
+  },
+  "documentation-team": {
+    "description": "Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation",
+    "id": 6590023,
+    "maintainers": {
+      "alejandrosame": 1078000
+    },
+    "members": {
+      "hsjobeki": 50398876,
+      "wamirez": 24505474
+    },
+    "name": "Documentation Team"
+  },
+  "dotnet": {
+    "description": "Maintain the .NET ecosystem in nixpkgs",
+    "id": 8173604,
+    "maintainers": {
+      "corngood": 3077118,
+      "mdarocha": 11572618
+    },
+    "members": {
+      "GGG-KILLER": 5892127,
+      "IvarWithoutBones": 41924494,
+      "JamieMagee": 1358764,
+      "anpin": 6060545,
+      "meenzen": 22305878,
+      "raphaelr": 121178
+    },
+    "name": "Dotnet"
+  },
+  "emacs": {
+    "description": "",
+    "id": 2516946,
+    "maintainers": {
+      "jian-lin": 75130626,
+      "matthewbauer": 19036
+    },
+    "members": {
+      "AndersonTorres": 5954806,
+      "adisbladis": 63286,
+      "panchoh": 471059,
+      "ttuegel": 563054
+    },
+    "name": "emacs"
+  },
+  "enlightenment": {
+    "description": "Maintain Enlightenment desktop environment and related packages",
+    "id": 5937665,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {},
+    "name": "Enlightenment"
+  },
+  "exotic-platform-maintainers": {
+    "description": "",
+    "id": 3727378,
+    "maintainers": {
+      "Ericson2314": 1055245,
+      "matthewbauer": 19036
+    },
+    "members": {
+      "aaronjanse": 16829510,
+      "alyssais": 2768870,
+      "emilytrau": 13267947,
+      "minijackson": 1200507,
+      "r-burns": 52847440,
+      "siraben": 8219659,
+      "sternenseemann": 3154475
+    },
+    "name": "exotic-platform-maintainers"
+  },
+  "flutter": {
+    "description": "Maintain Flutter and Dart-related packages and build tools",
+    "id": 7718198,
+    "maintainers": {
+      "RossComputerGuy": 19699320
+    },
+    "members": {
+      "FlafyDev": 44374434,
+      "hacker1024": 20849728,
+      "mkg20001": 7735145
+    },
+    "name": "Flutter"
+  },
+  "freedesktop": {
+    "description": "Maintain Freedesktop.org packages for graphical desktop.",
+    "id": 3806136,
+    "maintainers": {},
+    "members": {
+      "jtojnar": 705123
+    },
+    "name": "Freedesktop"
+  },
+  "geospatial": {
+    "description": "Maintain geospatial, remote sensing and OpenStreetMap software",
+    "id": 7084621,
+    "maintainers": {
+      "imincik": 476346
+    },
+    "members": {
+      "autra": 1576598,
+      "l0b0": 168301,
+      "nh2": 399535,
+      "nialov": 47318483,
+      "sikmir": 688044,
+      "willcohen": 5185341
+    },
+    "name": "Geospatial"
+  },
+  "gitlab": {
+    "description": "Maintain GitLab-related packages and modules",
+    "id": 8157777,
+    "maintainers": {
+      "leona-ya": 11006031,
+      "xanderio": 6298052,
+      "yayayayaka": 73759599
+    },
+    "members": {
+      "talyz": 63433
+    },
+    "name": "GitLab"
+  },
+  "gnome": {
+    "description": "Maintain GNOME desktop environment and platform.",
+    "id": 3806133,
+    "maintainers": {},
+    "members": {
+      "bobby285271": 20080233,
+      "dasj19": 7589338,
+      "hedning": 71978,
+      "jtojnar": 705123
+    },
+    "name": "GNOME"
+  },
+  "golang": {
+    "description": "Maintain Golang compilers",
+    "id": 4020424,
+    "maintainers": {
+      "Mic92": 96200,
+      "kalbasit": 87115,
+      "zowoq": 59103226
+    },
+    "members": {
+      "katexochen": 49727155,
+      "mfrw": 4929861,
+      "qbit": 68368
+    },
+    "name": "golang"
+  },
+  "haskell": {
+    "description": "Maintain Haskell packages and infrastructure",
+    "id": 4769723,
+    "maintainers": {
+      "cdepillabout": 64804,
+      "maralorn": 1651325,
+      "sternenseemann": 3154475
+    },
+    "members": {
+      "wolfgangwalther": 9132420
+    },
+    "name": "Haskell"
+  },
+  "hyprland": {
+    "description": "Maintain Hyprland compositor and ecosystem.",
+    "id": 12048885,
+    "maintainers": {
+      "khaneliman": 1778670
+    },
+    "members": {
+      "JohnRTitor": 50095635,
+      "NotAShelf": 62766066,
+      "donovanglover": 2374245,
+      "fufexan": 36706276
+    },
+    "name": "hyprland"
+  },
+  "java": {
+    "description": "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects); frequently lingering in #jvm:nixos.org on Matrix",
+    "id": 11412419,
+    "maintainers": {
+      "FliegendeWurst": 12560461,
+      "Infinidoge": 22727114,
+      "chayleaf": 9590981,
+      "tomodachi94": 68489118
+    },
+    "members": {
+      "msgilligan": 61612
+    },
+    "name": "Java"
+  },
+  "k3s": {
+    "description": "Maintain K3s package, NixOS module, NixOS tests, update script",
+    "id": 7725877,
+    "maintainers": {
+      "Mic92": 96200,
+      "euank": 2147649,
+      "marcusramberg": 5526,
+      "wrmilling": 6162814
+    },
+    "members": {
+      "frederictobiasc": 26125115,
+      "heywoodlh": 18178614,
+      "rorosen": 76747196
+    },
+    "name": "k3s"
+  },
+  "kodi": {
+    "description": "Maintain Kodi related packages.",
+    "id": 4642467,
+    "maintainers": {
+      "aanderse": 7755101
+    },
+    "members": {
+      "cpages": 411324,
+      "edwtjo": 54799,
+      "minijackson": 1200507,
+      "peterhoeg": 722550,
+      "sephalon": 893474
+    },
+    "name": "kodi"
+  },
+  "kubernetes": {
+    "description": "Maintain the Kubernetes package and module",
+    "id": 5536808,
+    "maintainers": {
+      "johanot": 998763,
+      "offlinehacker": 585547,
+      "saschagrunert": 695473,
+      "srhb": 219362
+    },
+    "members": {},
+    "name": "kubernetes"
+  },
+  "linux-kernel": {
+    "description": "Maintain the Linux kernel",
+    "id": 13371617,
+    "maintainers": {
+      "alyssais": 2768870
+    },
+    "members": {
+      "K900": 386765,
+      "Ma27": 6025220,
+      "NeQuissimus": 628342,
+      "TredwellGit": 61860346
+    },
+    "name": "Linux kernel"
+  },
+  "lisp": {
+    "description": "Maintain the Lisp ecosystem",
+    "id": 7678368,
+    "maintainers": {
+      "7c6f434c": 1891350,
+      "Uthar": 15697697,
+      "hraban": 137852,
+      "lukego": 13791,
+      "nagy": 692274
+    },
+    "members": {},
+    "name": "lisp"
+  },
+  "lix-maintainers": {
+    "description": "Lix maintainers in nixpkgs/NixOS",
+    "id": 13838744,
+    "maintainers": {
+      "lf-": 6652840
+    },
+    "members": {
+      "9999years": 15312184,
+      "Qyriad": 1542224,
+      "RaitoBezarius": 314564,
+      "alois31": 36605164
+    },
+    "name": "Lix maintainers"
+  },
+  "llvm": {
+    "description": "Maintain LLVM package sets and related packages",
+    "id": 9955829,
+    "maintainers": {
+      "RossComputerGuy": 19699320,
+      "alyssais": 2768870
+    },
+    "members": {
+      "Ericson2314": 1055245,
+      "dtzWill": 817330,
+      "emilazy": 18535642,
+      "lovek323": 265084,
+      "rrbutani": 7833358,
+      "sternenseemann": 3154475
+    },
+    "name": "LLVM"
+  },
+  "loongarch64": {
+    "description": "Maintain LoongArch64 related packages and code",
+    "id": 13371619,
+    "maintainers": {
+      "Aleksanaa": 42209822
+    },
+    "members": {
+      "Cryolitia": 23723294,
+      "darkyzhou": 7220778,
+      "dramforever": 2818072,
+      "wegank": 9713184
+    },
+    "name": "loongarch64"
+  },
+  "lua": {
+    "description": "Maintain the lua ecosystem",
+    "id": 5255750,
+    "maintainers": {
+      "teto": 886074
+    },
+    "members": {
+      "7c6f434c": 1891350,
+      "Shados": 338268,
+      "khaneliman": 1778670,
+      "spencerpogo": 34356756
+    },
+    "name": "lua"
+  },
+  "lumina": {
+    "description": "Maintain lumina desktop environment and related packages",
+    "id": 5937661,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {},
+    "name": "Lumina"
+  },
+  "lxc": {
+    "description": "LXC, LXD, Incus",
+    "id": 9223525,
+    "maintainers": {
+      "adamcstephens": 2071575
+    },
+    "members": {
+      "aanderse": 7755101,
+      "jnsgruk": 668505,
+      "megheaiulian": 1788114,
+      "mkg20001": 7735145
+    },
+    "name": "LXC"
+  },
+  "lxqt": {
+    "description": "Maintain LXQt desktop environment and related packages",
+    "id": 5937679,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {},
+    "name": "LXQt"
+  },
+  "marketing-team": {
+    "description": "Marketing team [leader=@djacu]",
+    "id": 7709512,
+    "maintainers": {
+      "djacu": 7043297,
+      "tomberek": 178444
+    },
+    "members": {
+      "flyfloh": 74379,
+      "thilobillerbeck": 7442383
+    },
+    "name": "Marketing Team"
+  },
+  "mate": {
+    "description": "Maintainers of the MATE Desktop Environment",
+    "id": 5937667,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {
+      "bobby285271": 20080233
+    },
+    "name": "MATE"
+  },
+  "neovim": {
+    "description": "Maintain the vim and neovim text editors and related packages",
+    "id": 6748534,
+    "maintainers": {
+      "GaetanLepage": 33058747
+    },
+    "members": {
+      "PerchunPak": 68118654,
+      "khaneliman": 1778670,
+      "mrcjkb": 12857160
+    },
+    "name": "neovim"
+  },
+  "nix-formatting": {
+    "description": "Maintain the official Nix formatter and apply it to Nixpkgs: https://nixos.org/community/teams/formatting/",
+    "id": 9676823,
+    "maintainers": {
+      "infinisil": 20525370,
+      "jfly": 277474
+    },
+    "members": {
+      "0x4A6F": 9675338,
+      "MattSturgeon": 5046562,
+      "Sereja313": 112060595,
+      "dasJ": 4971975,
+      "piegamesde": 14054505
+    },
+    "name": "nix-formatting"
+  },
+  "nix-team": {
+    "description": "",
+    "id": 174820,
+    "maintainers": {
+      "tomberek": 178444
+    },
+    "members": {
+      "Ericson2314": 1055245,
+      "Mic92": 96200,
+      "edolstra": 1148549,
+      "xokdvium": 145775305
+    },
+    "name": "Nix team"
+  },
+  "nixos-release-managers": {
+    "description": "Manage the current nixpkgs/NixOS release",
+    "id": 3620128,
+    "maintainers": {
+      "jopejoe1": 34899572,
+      "leona-ya": 11006031
+    },
+    "members": {},
+    "name": "nixos-release-managers"
+  },
+  "nixpkgs-ci": {
+    "description": "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions",
+    "id": 13362067,
+    "maintainers": {
+      "philiptaron": 43863,
+      "wolfgangwalther": 9132420
+    },
+    "members": {
+      "MattSturgeon": 5046562,
+      "Mic92": 96200,
+      "zowoq": 59103226
+    },
+    "name": "Nixpkgs CI"
+  },
+  "nixpkgs-core": {
+    "description": "Provides leadership for and has authority over Nixpkgs.",
+    "id": 14317027,
+    "maintainers": {
+      "alyssais": 2768870,
+      "emilazy": 18535642,
+      "wolfgangwalther": 9132420
+    },
+    "members": {},
+    "name": "Nixpkgs core"
+  },
+  "nixpkgs-merge-bot": {
+    "description": "This team exists as a target for triggering the nixpkgs merge bot.",
+    "id": 13926892,
+    "maintainers": {},
+    "members": {},
+    "name": "nixpkgs-merge-bot"
+  },
+  "node": {
+    "description": "Maintains Node.js runtimes and build tooling.\r\n\r\n\"JS is hecked, thanks for coming to my TED Talk\" - @lilyinstarlight",
+    "id": 7309872,
+    "maintainers": {
+      "lilyinstarlight": 298109,
+      "winterqt": 78392041
+    },
+    "members": {},
+    "name": "Node"
+  },
+  "ocaml": {
+    "description": "Maintain the OCaml compiler and package set",
+    "id": 7553013,
+    "maintainers": {
+      "Alizter": 8614547,
+      "romildo": 1217934,
+      "ulrikstrid": 1607770
+    },
+    "members": {
+      "redianthus": 16472988
+    },
+    "name": "OCaml"
+  },
+  "pantheon": {
+    "description": "Maintain Pantheon desktop environment and platform",
+    "id": 4786995,
+    "maintainers": {
+      "davidak": 91113
+    },
+    "members": {
+      "bobby285271": 20080233
+    },
+    "name": "Pantheon"
+  },
+  "php": {
+    "description": "Maintain PHP related packages and extensions.",
+    "id": 3806182,
+    "maintainers": {},
+    "members": {
+      "Ma27": 6025220,
+      "aanderse": 7755101,
+      "piotrkwiecinski": 2151333,
+      "talyz": 63433
+    },
+    "name": "php"
+  },
+  "podman": {
+    "description": "Maintain Podman and CRI-O related packages and modules.",
+    "id": 3806184,
+    "maintainers": {},
+    "members": {
+      "saschagrunert": 695473,
+      "vdemeester": 6508
+    },
+    "name": "podman"
+  },
+  "postgres": {
+    "description": "Maintain the PostgreSQL package and plugins along with the NixOS module.",
+    "id": 11455958,
+    "maintainers": {
+      "Ma27": 6025220,
+      "thoughtpolice": 3416,
+      "wolfgangwalther": 9132420
+    },
+    "members": {},
+    "name": "postgres"
+  },
+  "qt-kde": {
+    "description": "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects",
+    "id": 4341481,
+    "maintainers": {
+      "ttuegel": 563054
+    },
+    "members": {
+      "FRidh": 2129135,
+      "K900": 386765,
+      "LunNova": 782440,
+      "NickCao": 15247171,
+      "SCOTT-HAMILTON": 24496705,
+      "SuperSandro2000": 7258858,
+      "bkchr": 5718007,
+      "ilya-fedin": 17829319,
+      "mjm": 1181,
+      "nyanloutre": 7677321,
+      "peterhoeg": 722550
+    },
+    "name": "Qt-KDE"
+  },
+  "reproducible": {
+    "description": "Team that is interested in reproducible builds",
+    "id": 7625643,
+    "maintainers": {
+      "raboof": 131856,
+      "zimbatm": 3248
+    },
+    "members": {
+      "Artturin": 56650223,
+      "Atemu": 18599032,
+      "RaitoBezarius": 314564,
+      "davidak": 91113,
+      "mschwaig": 3856390
+    },
+    "name": "reproducible"
+  },
+  "risc-v": {
+    "description": "RISC-V team",
+    "id": 13425811,
+    "maintainers": {
+      "0x4A6F": 9675338
+    },
+    "members": {
+      "DarkKirb": 23011243,
+      "dramforever": 2818072,
+      "fgaz": 8182846,
+      "jonhermansen": 660911
+    },
+    "name": "RISC-V"
+  },
+  "rocm": {
+    "description": "Maintain ROCm and related packages",
+    "id": 6921873,
+    "maintainers": {
+      "mschwaig": 3856390
+    },
+    "members": {
+      "Flakebi": 6499211,
+      "GZGavinZhao": 74938940,
+      "LunNova": 782440
+    },
+    "name": "rocm"
+  },
+  "rust": {
+    "description": "Maintain the Rust compiler toolchain and nixpkgs integration",
+    "id": 7304571,
+    "maintainers": {
+      "Mic92": 96200,
+      "winterqt": 78392041,
+      "zowoq": 59103226
+    },
+    "members": {
+      "tjni": 3806110
+    },
+    "name": "rust"
+  },
+  "scala": {
+    "description": "Maintain Scala-related packages and modules.",
+    "id": 11193149,
+    "maintainers": {
+      "dottybot": 12519979,
+      "hamzaremmal": 56235032
+    },
+    "members": {
+      "natsukagami": 9061737
+    },
+    "name": "Scala"
+  },
+  "sdl": {
+    "description": "Maintain core SDL libraries",
+    "id": 13033942,
+    "maintainers": {
+      "pbsds": 140964
+    },
+    "members": {
+      "LordGrimmauld": 49513131,
+      "evysgarden": 92547295,
+      "jansol": 2588851,
+      "marcin-serwin": 12128106
+    },
+    "name": "SDL"
+  },
+  "static": {
+    "description": "People interested in static builds (creation of `.a` files, fully static executables, etc.) and keeping them working",
+    "id": 5906550,
+    "maintainers": {
+      "nh2": 399535
+    },
+    "members": {
+      "Ericson2314": 1055245,
+      "aherrmann": 732652,
+      "alyssais": 2768870,
+      "basvandijk": 576355,
+      "cdepillabout": 64804,
+      "dtzWill": 817330,
+      "lorenzleutgeb": 542154,
+      "matthewbauer": 19036,
+      "r-burns": 52847440,
+      "rnhmjoj": 2817565,
+      "sternenseemann": 3154475
+    },
+    "name": "static"
+  },
+  "stdenv": {
+    "description": "Maintain the standard environment and its surrounding logic.",
+    "id": 11265412,
+    "maintainers": {
+      "RossComputerGuy": 19699320
+    },
+    "members": {
+      "Artturin": 56650223,
+      "Ericson2314": 1055245,
+      "emilazy": 18535642,
+      "philiptaron": 43863,
+      "reckenrode": 7413633
+    },
+    "name": "stdenv"
+  },
+  "systemd": {
+    "description": "Maintain systemd for NixOS",
+    "id": 3894007,
+    "maintainers": {
+      "flokli": 183879
+    },
+    "members": {
+      "ElvishJerricco": 1365692,
+      "LordGrimmauld": 49513131,
+      "aanderse": 7755101,
+      "arianvp": 628387
+    },
+    "name": "systemd"
+  },
+  "xen-project": {
+    "description": "Maintain the Xen Project Hypervisor and the related tooling ecosystem. Members listed as \"Maintainers\" are recipients of Xen Security Advisories sent to xsa@nixos.org.",
+    "id": 11127725,
+    "maintainers": {
+      "CertainLach": 6235312,
+      "SigmaSquadron": 174749595,
+      "hehongbo": 665472
+    },
+    "members": {
+      "digitalrane": 1829286
+    },
+    "name": "Xen Project"
+  },
+  "xfce": {
+    "description": "Maintainers of the Xfce Desktop Environment",
+    "id": 5421745,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {
+      "bobby285271": 20080233
+    },
+    "name": "Xfce"
+  }
+}
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a07d0e41b379..535ef1d43934 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -587,7 +587,7 @@
   };
   adamperkowski = {
     name = "Adam Perkowski";
-    email = "adas1per@protonmail.com";
+    email = "me@adamperkowski.dev";
     matrix = "@xx0a_q:matrix.org";
     github = "adamperkowski";
     githubId = 75480869;
@@ -685,12 +685,6 @@
     githubId = 260983;
     name = "Adrien Lemaire";
   };
-  AdsonCicilioti = {
-    name = "Adson Cicilioti";
-    email = "adson.cicilioti@live.com";
-    github = "AdsonCicilioti";
-    githubId = 6278398;
-  };
   adsr = {
     email = "as@php.net";
     github = "adsr";
@@ -1075,6 +1069,13 @@
       }
     ];
   };
+  alch-emi = {
+    email = "emi@alchemi.dev";
+    github = "Alch-Emi";
+    githubId = 38897201;
+    name = "Emi";
+    matrix = "@emi:the-apothecary.club";
+  };
   aldenparker = {
     github = "aldenparker";
     githubId = 32986873;
@@ -1112,6 +1113,12 @@
     githubId = 83360;
     name = "Aleksey Sidorov";
   };
+  alemonmk = {
+    email = "almk@rmntn.net";
+    github = "alemonmk";
+    githubId = 3955369;
+    name = "Lemon Lam";
+  };
   alerque = {
     email = "caleb@alerque.com";
     github = "alerque";
@@ -1644,6 +1651,14 @@
     githubId = 106511;
     name = "Andrew Kelley";
   };
+  andrewzah = {
+    name = "Andrew Zah";
+    github = "andrewzah";
+    githubId = 9789467;
+    email = "nix@andrewzah.com";
+    matrix = "@andrewzah:matrix.abare.party";
+    keys = [ { fingerprint = "D87B D9DC F11B ACD6 CDB4 0CB2 1373 2FB1 3E61 E0BE"; } ];
+  };
   Andy3153 = {
     name = "Andrei Dobrete";
     email = "andy3153@protonmail.com";
@@ -2329,7 +2344,7 @@
     email = "assistant.moetron@gmail.com";
     github = "Assistant";
     githubId = 2748721;
-    matrix = "@assistant:pygmalion.chat";
+    matrix = "@self:assistant.moe";
     name = "Assistant Moetron";
   };
   astavie = {
@@ -2358,12 +2373,6 @@
     name = "Vincent Fischer";
     keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE  C401 DE16 C7D1 536D A72F"; } ];
   };
-  astronaut0212 = {
-    email = "goatastronaut0212@outlook.com";
-    github = "goatastronaut0212";
-    githubId = 119769817;
-    name = "goatastronaut0212";
-  };
   asymmetric = {
     email = "lorenzo@mailbox.org";
     github = "asymmetric";
@@ -2487,6 +2496,7 @@
     github = "auscyber";
     name = "Ivy Pierlot";
     githubId = 12080502;
+    matrix = "@ivy:faggot.sh";
   };
   austin-artificial = {
     email = "austin.platt@artificial.io";
@@ -2630,13 +2640,6 @@
     github = "aware70";
     githubId = 7832566;
   };
-  awwpotato = {
-    email = "awwpotato@voidq.com";
-    matrix = "@awwpotato:envs.net";
-    github = "awwpotato";
-    githubId = 153149335;
-    name = "awwpotato";
-  };
   axertheaxe = {
     email = "axertheaxe@proton.me";
     github = "AxerTheAxe";
@@ -2874,12 +2877,6 @@
     githubId = 127523;
     name = "Herman Fries";
   };
-  BarinovMaxim = {
-    name = "Barinov Maxim";
-    email = "barinov274@gmail.com";
-    github = "barinov274";
-    githubId = 54442153;
-  };
   BarrOff = {
     name = "BarrOff";
     github = "BarrOff";
@@ -3837,6 +3834,11 @@
     githubId = 40476330;
     name = "brokenpip3";
   };
+  BronzeDeer = {
+    github = "BronzeDeer";
+    githubId = 74385045;
+    name = "Joël Pepper";
+  };
   brpaz = {
     email = "oss@brunopaz.dev";
     github = "brpaz";
@@ -4252,6 +4254,11 @@
     githubId = 498906;
     name = "Karolis Stasaitis";
   };
+  carlostome = {
+    name = "Carlos Tomé Cortiñas";
+    github = "carlostome";
+    githubId = 2206578;
+  };
   carlsverre = {
     email = "accounts@carlsverre.com";
     github = "carlsverre";
@@ -4920,12 +4927,6 @@
     githubId = 640797;
     name = "Roger Qiu";
   };
-  cmfwyp = {
-    email = "cmfwyp@riseup.net";
-    github = "cmfwyp";
-    githubId = 20808761;
-    name = "cmfwyp";
-  };
   cmm = {
     email = "repo@cmm.kakpryg.net";
     github = "cmm";
@@ -5032,12 +5033,6 @@
     githubId = 27779510;
     keys = [ { fingerprint = "FDF5 EF67 8CC1 FE22 1845  6A22 CF7B BB5B C756 1BD3"; } ];
   };
-  codsl = {
-    email = "codsl@riseup.net";
-    github = "codsl";
-    githubId = 6402559;
-    name = "codsl";
-  };
   codyopel = {
     email = "codyopel@gmail.com";
     github = "codyopel";
@@ -5244,12 +5239,6 @@
     githubId = 3077118;
     name = "David McFarland";
   };
-  coroa = {
-    email = "jonas@chaoflow.net";
-    github = "coroa";
-    githubId = 2552981;
-    name = "Jonas Hörsch";
-  };
   costrouc = {
     email = "chris.ostrouchov@gmail.com";
     github = "costrouc";
@@ -5316,12 +5305,6 @@
     githubId = 1957293;
     name = "Casey Ransom";
   };
-  CrazedProgrammer = {
-    email = "crazedprogrammer@gmail.com";
-    github = "CrazedProgrammer";
-    githubId = 12202789;
-    name = "CrazedProgrammer";
-  };
   creator54 = {
     email = "hi.creator54@gmail.com";
     github = "Creator54";
@@ -5578,6 +5561,13 @@
     githubId = 102048662;
     name = "Dalton Luce";
   };
+  da157 = {
+    email = "da157@voidq.com";
+    matrix = "@da157:catgirl.cloud";
+    github = "0xda157";
+    githubId = 153149335;
+    name = "0xda157";
+  };
   dabao1955 = {
     email = "dabao1955@163.com";
     github = "dabao1955";
@@ -5859,6 +5849,12 @@
       { fingerprint = "E8F9 0B80 908E 723D 0EDF  0916 5803 CDA5 9C26 A96A"; }
     ];
   };
+  datosh = {
+    email = "fabian@kammel.dev";
+    github = "datosh";
+    githubId = 6423339;
+    name = "Fabian Kammel";
+  };
   dav-wolff = {
     email = "nixpkgs@dav.dev";
     github = "dav-wolff";
@@ -5970,6 +5966,12 @@
     githubId = 49904992;
     name = "Dawid Sowa";
   };
+  dawnofmidnight = {
+    email = "dawnofmidnight@duck.com";
+    github = "dawnofmidnight";
+    githubId = 78233879;
+    name = "whispers";
+  };
   dawoox = {
     email = "contact@antoinebellanger.fr";
     github = "Dawoox";
@@ -6276,6 +6278,12 @@
     githubId = 19733;
     name = "Moritz Heidkamp";
   };
+  DerHalbGrieche = {
+    email = "vasilis12.manetas@gmail.com";
+    github = "DerHalbGrieche";
+    githubId = 77843198;
+    name = "Vasilis Manetas";
+  };
   DerickEddington = {
     email = "derick.eddington@pm.me";
     github = "DerickEddington";
@@ -7027,6 +7035,13 @@
     name = "Will Dietz";
     keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701  DEB9 FD42 C7D0 D414 94C8"; } ];
   };
+  dudeofawesome = {
+    email = "tourist-04.iced@icloud.com";
+    github = "dudeofawesome";
+    githubId = 1683595;
+    name = "Louis Orleans";
+    keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ];
+  };
   dudymas = {
     email = "jeremy.white@cloudposse.com";
     github = "dudymas";
@@ -7127,6 +7142,12 @@
     githubId = 90563298;
     name = "Dovydas Kersys";
   };
+  dyegoaurelio = {
+    name = "Dyego Aurelio";
+    email = "d@dyego.email";
+    github = "dyegoaurelio";
+    githubId = 42411160;
+  };
   dylan-gonzalez = {
     email = "dylcg10@gmail.com";
     github = "dylan-gonzalez";
@@ -7245,6 +7266,11 @@
     githubId = 8146736;
     name = "Florentin Eckl";
   };
+  eclairevoyant = {
+    githubId = 848000;
+    github = "eclairevoyant";
+    name = "éclairevoyant";
+  };
   edanaher = {
     email = "nixos@edanaher.net";
     github = "edanaher";
@@ -7730,6 +7756,13 @@
     githubId = 3422442;
     name = "Ruben Maher";
   };
+  er0k = {
+    email = "er0k@er0k.net";
+    github = "er0k";
+    githubId = 916239;
+    name = "er0k";
+    keys = [ { fingerprint = "60DE 4570 2E31 81A2 AF87  F075 B005 BA3C 8EE8 108D"; } ];
+  };
   eraserhd = {
     email = "jason.m.felice@gmail.com";
     github = "eraserhd";
@@ -7872,6 +7905,12 @@
     githubId = 21313906;
     name = "EsAu";
   };
+  esch = {
+    name = "Austin Eschweiler";
+    github = "Eschguy";
+    githubId = 8880292;
+    email = "austin.eschweiler@gmail.com";
+  };
   esclear = {
     github = "esclear";
     githubId = 7432848;
@@ -7977,7 +8016,7 @@
   };
   euxane = {
     name = "euxane";
-    email = "r9uhdi.nixpkgs@euxane.net";
+    email = "r9uhdi.nixpkgs@euxane.eu";
     github = "pacien";
     githubId = 1449319;
   };
@@ -8456,13 +8495,6 @@
     githubId = 52276064;
     name = "figboy9";
   };
-  figsoda = {
-    email = "figsoda@pm.me";
-    matrix = "@figsoda:matrix.org";
-    github = "figsoda";
-    githubId = 40620903;
-    name = "figsoda";
-  };
   fionera = {
     email = "nix@fionera.de";
     github = "fionera";
@@ -9031,6 +9063,12 @@
     githubId = 1313787;
     name = "Gabriella Gonzalez";
   };
+  GabrielMaguire = {
+    email = "gabrielmaguire@proton.me";
+    github = "GabrielMaguire";
+    githubId = 39974571;
+    name = "Gabriel Maguire";
+  };
   gabyx = {
     email = "gnuetzi@gmail.com";
     github = "gabyx";
@@ -9071,6 +9109,12 @@
     githubId = 7047019;
     name = "Florent Becker";
   };
+  galabovaa = {
+    name = "Ivet Galabova";
+    email = "galabovaa@gmail.com";
+    github = "galabovaa";
+    githubId = 4016566;
+  };
   galagora = {
     email = "lightningstrikeiv@gmail.com";
     github = "Galagora";
@@ -10965,6 +11009,12 @@
     githubId = 993484;
     name = "Greg Hale";
   };
+  imatpot = {
+    email = "nixpkgs@brnk.vc";
+    github = "imatpot";
+    githubId = 39416660;
+    name = "Mladen Branković";
+  };
   imgabe = {
     email = "gabrielpmonte@hotmail.com";
     github = "ImGabe";
@@ -11700,6 +11750,12 @@
     githubId = 29395089;
     name = "Jay Rovacsek";
   };
+  jaysa68 = {
+    email = "gh@jaysa.net";
+    github = "jaysa68";
+    githubId = 114126812;
+    name = "Jaysa Maria Garcia";
+  };
   jb55 = {
     email = "jb55@jb55.com";
     github = "jb55";
@@ -12890,6 +12946,12 @@
     github = "jthulhu";
     githubId = 23179762;
   };
+  jtliang24 = {
+    name = "Jiatao Liang";
+    email = "jtliang24@gmail.com";
+    github = "jtliang24";
+    githubId = 170479425;
+  };
   jtobin = {
     email = "jared@jtobin.io";
     github = "jtobin";
@@ -13943,6 +14005,14 @@
     githubId = 4032;
     name = "Kristoffer Thømt Ravneberg";
   };
+  krishnans2006 = {
+    email = "krishnans2006@gmail.com";
+    matrix = "@krishnans2006:matrix.org";
+    github = "krishnans2006";
+    githubId = 62958782;
+    name = "Krishnan Shankar";
+    keys = [ { fingerprint = "A30C 1843 F470 4843 5D54  3D68 29CB 06A8 40D0 E14A"; } ];
+  };
   kristian-brucaj = {
     email = "kbrucaj@gmail.com";
     github = "Flameslice";
@@ -13998,6 +14068,12 @@
     name = "Tomas Krupka";
     matrix = "@krupkat:matrix.org";
   };
+  kruziikrel13 = {
+    github = "kruziikrel13";
+    name = "Michael Petersen";
+    email = "dev@michaelpetersen.io";
+    githubId = 72793125;
+  };
   krzaczek = {
     name = "Pawel Krzaczkowski";
     email = "pawel@printu.pl";
@@ -14066,6 +14142,12 @@
     githubId = 629430;
     keys = [ { fingerprint = "2843 750C B1AB E256 94BE  40E2 D843 D30B 42CA 0E2D"; } ];
   };
+  KunyaKud = {
+    name = "KunyaKud";
+    email = "wafuu@posteo.net";
+    github = "KunyaKud";
+    githubId = 238898928;
+  };
   kupac = {
     github = "Kupac";
     githubId = 8224569;
@@ -14253,6 +14335,17 @@
     githubId = 55911173;
     name = "Gwendolyn Quasebarth";
   };
+  lajp = {
+    email = "lajp@iki.fi";
+    github = "lajp";
+    githubId = 31856315;
+    name = "Luukas Pörtfors";
+    keys = [
+      {
+        fingerprint = "24E8 E4CC 0295 F4ED B9E0  B4A6 C913 9B8D EA65 BD82";
+      }
+    ];
+  };
   lamarios = {
     matrix = "@lamarios:matrix.org";
     github = "lamarios";
@@ -14435,6 +14528,12 @@
     githubId = 4701504;
     name = "James Robinson";
   };
+  leha44581 = {
+    email = "leha55481@gmail.com";
+    github = "Leha44581";
+    githubId = 70238465;
+    name = "Leha";
+  };
   leifhelm = {
     email = "jakob.leifhelm@gmail.com";
     github = "leifhelm";
@@ -14537,6 +14636,12 @@
     githubId = 737767;
     name = "Thomas Gerbet";
   };
+  letgamer = {
+    github = "Letgamer";
+    githubId = 62446107;
+    matrix = "@letgamer:tchncs.de";
+    name = "Alex Stephan";
+  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lucabrunox";
@@ -14712,12 +14817,26 @@
     githubId = 67327023;
     keys = [ { fingerprint = "8185 29F9 BB4C 33F0 69BB  9782 D1AC CDCF 2B9B 9799"; } ];
   };
+  lillecarl = {
+    name = "Carl Andersson";
+    github = "lillecarl";
+    githubId = 207073;
+    email = "nixos@lillecarl.com";
+    matrix = "@lillecarl:matrix.org";
+  };
   lillycham = {
     email = "lillycat332@gmail.com";
     github = "lillycham";
     githubId = 54189319;
     name = "Lilly Cham";
   };
+  lilyball = {
+    email = "lily@ballards.net";
+    github = "lilyball";
+    githubId = 714;
+    matrix = "@esperlily:matrix.org";
+    name = "Lily Ballard";
+  };
   limeytexan = {
     email = "limeytexan@gmail.com";
     github = "limeytexan";
@@ -14757,12 +14876,6 @@
     matrix = "@link2xt:matrix.org";
     name = "link2xt";
   };
-  linquize = {
-    email = "linquize@yahoo.com.hk";
-    github = "linquize";
-    githubId = 791115;
-    name = "Linquize";
-  };
   linsui = {
     email = "linsui555@gmail.com";
     github = "linsui";
@@ -14782,6 +14895,12 @@
     githubId = 74221543;
     name = "Moritz Goltdammer";
   };
+  linuxmobile = {
+    email = "bdiez19@gmail.com";
+    github = "linuxmobile";
+    githubId = 10554636;
+    name = "Braian A. Diez";
+  };
   linuxwhata = {
     email = "linuxwhata@qq.com";
     matrix = "@lwa:envs.net";
@@ -15540,12 +15659,6 @@
     githubId = 1140462;
     name = "magenbluten";
   };
-  maggesi = {
-    email = "marco.maggesi@gmail.com";
-    github = "maggesi";
-    githubId = 1809783;
-    name = "Marco Maggesi";
-  };
   magicquark = {
     name = "magicquark";
     github = "magicquark";
@@ -15879,6 +15992,12 @@
     githubId = 1913876;
     name = "Markus Scherer";
   };
+  MarkusZoppelt = {
+    email = "markus@zoppelt.net";
+    github = "MarkusZoppelt";
+    githubId = 2495125;
+    name = "Markus Zoppelt";
+  };
   marmolak = {
     email = "hack.robin@gmail.com";
     github = "marmolak";
@@ -17258,6 +17377,17 @@
     githubId = 7831184;
     name = "John Mercier";
   };
+  mochienya = {
+    name = "mochienya";
+    github = "mochienya";
+    githubId = 187453775;
+    matrix = "@mochienya:matrix.org";
+    keys = [
+      {
+        fingerprint = "7A49 5110 84F4 EAF1 BE30  5CF0 CC3B E964 564F 9554";
+      }
+    ];
+  };
   mockersf = {
     email = "francois.mockers@vleue.com";
     github = "mockersf";
@@ -17282,12 +17412,6 @@
     githubId = 64710;
     name = "Matthew O'Gorman";
   };
-  Mogria = {
-    email = "m0gr14@gmail.com";
-    github = "mogria";
-    githubId = 754512;
-    name = "Mogria";
-  };
   mohe2015 = {
     name = "Moritz Hedtke";
     email = "Moritz.Hedtke@t-online.de";
@@ -17573,6 +17697,12 @@
     name = "Sean Gilligan";
     keys = [ { fingerprint = "3B66 ACFA D10F 02AA B1D5  2CB1 8DD0 D81D 7D1F C61A"; } ];
   };
+  mshnwq = {
+    email = "mshnwq.com@gmail.com";
+    github = "mshnwq";
+    githubId = 68467027;
+    name = "Hayan Al-Machnouk";
+  };
   msiedlarek = {
     email = "mikolaj@siedlarek.pl";
     github = "msiedlarek";
@@ -17986,6 +18116,12 @@
     name = "Nasir Hussain";
     keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C  9BE3 D812 6E55 9CE7 C35D"; } ];
   };
+  nasrally = {
+    email = "suffer.ring@ya.ru";
+    github = "nasrally";
+    githubId = 50599445;
+    name = "Nikita Grishko";
+  };
   nat-418 = {
     github = "nat-418";
     githubId = 93013864;
@@ -18657,6 +18793,12 @@
     github = "noahgitsham";
     githubId = 73707948;
   };
+  nobbele = {
+    name = "nobbele";
+    email = "realnobbele@gmail.com";
+    github = "nobbele";
+    githubId = 17962514;
+  };
   nobbz = {
     name = "Norbert Melzer";
     email = "timmelzer+nixpkgs@gmail.com";
@@ -18986,6 +19128,12 @@
     githubId = 1348;
     name = "Nate Smith";
   };
+  nxm = {
+    email = "szturomski@jakub.app";
+    name = "Jakub Szturomski";
+    github = "nxm";
+    githubId = 22380073;
+  };
   nyabinary = {
     name = "Niko Cantero";
     email = "nyanbinary@keemail.me";
@@ -19190,12 +19338,6 @@
     githubId = 5339261;
     keys = [ { fingerprint = "4258 3FE7 12E9 6071 E84D  53C7 6E1D A270 0B72 746D"; } ];
   };
-  oida = {
-    email = "oida@posteo.de";
-    github = "oida";
-    githubId = 7249506;
-    name = "oida";
-  };
   oidro = {
     github = "oidro";
     githubId = 31112680;
@@ -19474,6 +19616,12 @@
     githubId = 52569953;
     name = "Oskar Manhart";
   };
+  oskarwires = {
+    email = "me@usbcable.io";
+    github = "oskarwires";
+    githubId = 115482671;
+    name = "Oskar";
+  };
   osnyx = {
     email = "os@flyingcircus.io";
     github = "osnyx";
@@ -19926,12 +20074,6 @@
     githubId = 6498458;
     name = "pebble kite";
   };
-  pbogdan = {
-    email = "ppbogdan@gmail.com";
-    github = "pbogdan";
-    githubId = 157610;
-    name = "Piotr Bogdan";
-  };
   pborzenkov = {
     email = "pavel@borzenkov.net";
     github = "pborzenkov";
@@ -20840,12 +20982,6 @@
     githubId = 88623613;
     name = "ProggerX";
   };
-  proglodyte = {
-    email = "proglodyte23@gmail.com";
-    github = "proglodyte";
-    githubId = 18549627;
-    name = "Proglodyte";
-  };
   proglottis = {
     email = "proglottis@gmail.com";
     github = "proglottis";
@@ -21239,6 +21375,12 @@
     githubId = 39039420;
     name = "Quinn Dougherty";
   };
+  quinneden = {
+    email = "quinn@qeden.dev";
+    github = "quinneden";
+    githubId = 125415641;
+    name = "Quinn Edenfield";
+  };
   QuiNzX = {
     name = "QuiNz-";
     github = "QuiNzX";
@@ -21284,6 +21426,11 @@
     matrix = "@qyriad:katesiria.org";
     name = "Qyriad";
   };
+  qzylinra = {
+    github = "qzylinra";
+    githubId = 225773816;
+    name = "qzylinra";
+  };
   r-aizawa = {
     github = "Xantibody";
     githubId = 109563705;
@@ -21659,12 +21806,6 @@
       { fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; }
     ];
   };
-  redbaron = {
-    email = "ivanov.maxim@gmail.com";
-    github = "redbaron";
-    githubId = 16624;
-    name = "Maxim Ivanov";
-  };
   redfish64 = {
     email = "engler@gmail.com";
     github = "redfish64";
@@ -21855,6 +21996,11 @@
     githubId = 32239737;
     keys = [ { fingerprint = "91EB E870 1639 1323 642A  6803 B966 009D 57E6 9CC6"; } ];
   };
+  rexies = {
+    name = "Rexiel Scarlet";
+    github = "Rexcrazy804";
+    githubId = 37258415;
+  };
   rexxDigital = {
     email = "joellarssonpriv@gmail.com";
     github = "rexxDigital";
@@ -22005,12 +22151,6 @@
     githubId = 1810487;
     name = "Rika";
   };
-  rileyinman = {
-    email = "rileyminman@gmail.com";
-    github = "rileyinman";
-    githubId = 37246692;
-    name = "Riley Inman";
-  };
   rinx = {
     email = "rintaro.okamura@gmail.com";
     github = "rinx";
@@ -23057,18 +23197,17 @@
     githubId = 73446695;
     name = "Savinien Petitjean";
   };
-  savannidgerinel = {
-    email = "savanni@luminescent-dreams.com";
-    github = "savannidgerinel";
-    githubId = 8534888;
-    name = "Savanni D'Gerinel";
-  };
   savedra1 = {
     email = "michaelsavedra@gmail.com";
     github = "savedra1";
     githubId = 99875823;
     name = "Michael Savedra";
   };
+  savtrip = {
+    github = "savtrip";
+    githubId = 42227195;
+    name = "Sav Tripodi";
+  };
   savyajha = {
     email = "savya.jha@hawkradius.com";
     github = "savyajha";
@@ -23468,6 +23607,14 @@
     githubId = 5791019;
     name = "Jiuyang Liu";
   };
+  Sereja313 = {
+    name = "Sergey Gulin";
+    github = "Sereja313";
+    githubId = 112060595;
+    email = "sergeygulin96@gmail.com";
+    matrix = "@sereja:sereja.xyz";
+    keys = [ { fingerprint = "AEF0 79C6 7618 8929 4124  22DB 3AB4 2DF3 F50E 3420"; } ];
+  };
   serge = {
     email = "sb@canva.com";
     github = "serge-belov";
@@ -24114,6 +24261,11 @@
     name = "Sebastian Kowalak";
     matrix = "@scl:tchncs.de";
   };
+  skwig = {
+    name = "skwig";
+    github = "skwig";
+    githubId = 16136203;
+  };
   skyesoss = {
     name = "Skye Soss";
     matrix = "@skyesoss:matrix.org";
@@ -25651,12 +25803,6 @@
     githubId = 102452;
     name = "Niclas Thall";
   };
-  thammers = {
-    email = "jawr@gmx.de";
-    github = "tobias-hammerschmidt";
-    githubId = 2543259;
-    name = "Tobias Hammerschmidt";
-  };
   thanegill = {
     email = "me@thanegill.com";
     github = "thanegill";
@@ -25749,11 +25895,10 @@
     github = "thefossguy";
     githubId = 44400303;
   };
-  thehans255 = {
-    name = "Hans Jorgensen";
-    email = "foss-contact@thehans255.com";
-    github = "thehans255";
-    githubId = 15896573;
+  thegu5 = {
+    name = "Gus";
+    github = "thegu5";
+    githubId = 58223632;
   };
   thekostins = {
     name = "Konstantin";
@@ -25794,10 +25939,10 @@
   };
   theobori = {
     name = "Théo Bori";
-    email = "theo1.bori@epitech.eu";
+    email = "theobori@disroot.org";
     github = "theobori";
     githubId = 71843723;
-    keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D  A75C BDD5 7BE9 9D55 5965"; } ];
+    keys = [ { fingerprint = "0636 56A5 6E31 5FFD BE46  8522 6D22 B068 2CCF 9294"; } ];
   };
   theonlymrcat = {
     name = "Max Guppy";
@@ -25856,6 +26001,11 @@
     githubId = 91203390;
     name = "Felix Kimmel";
   };
+  thesn = {
+    github = "thesn10";
+    githubId = 38666407;
+    name = "TheSN";
+  };
   thesola10 = {
     email = "me@thesola.io";
     github = "Thesola10";
@@ -26023,6 +26173,12 @@
     githubId = 1761259;
     name = "Eric Roberts";
   };
+  thrix = {
+    email = "mvadkert@redhat.com";
+    github = "thrix";
+    githubId = 633969;
+    name = "Miroslav Vadkerti";
+  };
   thtrf = {
     email = "thtrf@proton.me";
     github = "thtrf";
@@ -27014,6 +27170,11 @@
     githubId = 5155100;
     name = "Utkarsh Gupta";
   };
+  utopiatopia = {
+    github = "utopiatopia";
+    githubId = 98685984;
+    name = "utopiatopia";
+  };
   uvnikita = {
     email = "uv.nikita@gmail.com";
     github = "uvNikita";
@@ -27377,12 +27538,6 @@
     githubId = 1476338;
     name = "Viktor Illmer";
   };
-  vklquevs = {
-    email = "vklquevs@gmail.com";
-    github = "vklquevs";
-    githubId = 1771234;
-    name = "vklquevs";
-  };
   vlaci = {
     email = "laszlo.vasko@outlook.com";
     github = "vlaci";
@@ -27578,12 +27733,6 @@
     githubId = 988849;
     name = "Vasiliy Yorkin";
   };
-  vyp = {
-    email = "elisp.vim@gmail.com";
-    github = "vyp";
-    githubId = 3889405;
-    name = "vyp";
-  };
   w-lfchen = {
     email = "w-lfchen@posteo.net";
     github = "w-lfchen";
@@ -27747,6 +27896,12 @@
     githubId = 43357387;
     keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5  2479 A776 D2AD 099E 8BC0"; } ];
   };
+  wetisobe = {
+    name = "Martin Woods";
+    github = "wetisobe";
+    email = "weti.sobe@pen-net.de";
+    githubId = 172606048;
+  };
   wetrustinprize = {
     email = "git@wetrustinprize.com";
     github = "wetrustinprize";
@@ -28662,6 +28817,12 @@
     githubId = 7040031;
     name = "Yannik Sander";
   };
+  yuannan = {
+    email = "brandon@emergence.ltd";
+    github = "yuannan";
+    githubId = 8006928;
+    name = "Yuannan (Brandon) Lin";
+  };
   yuka = {
     email = "yuka@yuka.dev";
     matrix = "@yuka:yuka.dev";
@@ -28939,6 +29100,13 @@
     github = "zeri42";
     githubId = 68825133;
   };
+  zerodya = {
+    name = "Nicola";
+    email = "nicola.pagliuca@pm.me";
+    matrix = "@zerodya:beeper.com";
+    github = "Zerodya";
+    githubId = 73220426;
+  };
   zestsystem = {
     email = "mk337337@gmail.com";
     github = "zestsystem";
@@ -28956,6 +29124,11 @@
     githubId = 1329212;
     name = "Andy Zhang";
   };
+  zhaithizaliel = {
+    name = "Zhaith Izaliel";
+    github = "Zhaith-Izaliel";
+    githubId = 39216756;
+  };
   zhaofengli = {
     email = "hello@zhaofeng.li";
     matrix = "@zhaofeng:zhaofeng.li";
@@ -29101,6 +29274,12 @@
     githubId = 332534;
     name = "Zach Shipko";
   };
+  zstg = {
+    email = "zestig@duck.com";
+    github = "zstg";
+    githubId = 69384921;
+    name = "ZeStig";
+  };
   ztzg = {
     email = "dd@crosstwine.com";
     github = "ztzg";
diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md
index 6ae6cb851bc4..fd6e8bd21f64 100644
--- a/maintainers/scripts/README.md
+++ b/maintainers/scripts/README.md
@@ -52,17 +52,6 @@ The maintainer is designated by a `selector` which must be one of:
 
 [`maintainer-list.nix`]: ../maintainer-list.nix
 
-### `get-maintainer-pings-between.sh`
-
-Gets which maintainers would be pinged between two Nixpkgs revisions.
-Outputs a JSON object on stdout mapping GitHub usernames to the attributes that they would be getting pinged for.
-
-Example:
-
-```sh
-maintainers/scripts/get-maintainer-pings-between.sh HEAD^ HEAD
-```
-
 ## Conventions
 
 ### `sha-to-sri.py`
diff --git a/maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash b/maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash
new file mode 100755
index 000000000000..6459e38d9842
--- /dev/null
+++ b/maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash
@@ -0,0 +1,6 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bundler-audit
+
+set -o errexit -o nounset -o pipefail
+
+bundle-audit check "$(nix-build --no-out-link maintainers/scripts/audit-ruby-packages/default.nix)"
diff --git a/maintainers/scripts/audit-ruby-packages/default.nix b/maintainers/scripts/audit-ruby-packages/default.nix
new file mode 100644
index 000000000000..47d394cb7875
--- /dev/null
+++ b/maintainers/scripts/audit-ruby-packages/default.nix
@@ -0,0 +1,15 @@
+let
+  pkgs = import ../../.. { };
+  lockFileBody = pkgs.lib.concatStringsSep "\n" (
+    pkgs.lib.mapAttrsToList (name: props: "    ${name} (${props.version})") (
+      pkgs.lib.filterAttrs (name: _props: name != "recurseForDerivations") pkgs.rubyPackages
+    )
+  );
+in
+pkgs.runCommand "bundle-audit" { } ''
+  mkdir "$out"
+  echo 'GEM' > "$out/Gemfile.lock"
+  echo '  remote: https://rubygems.org/' >> "$out/Gemfile.lock"
+  echo '  specs:' >> "$out/Gemfile.lock"
+  echo '${lockFileBody}' >> "$out/Gemfile.lock"
+''
diff --git a/maintainers/scripts/feature-freeze-teams.pl b/maintainers/scripts/feature-freeze-teams.pl
index 7d7574837ed7..4b1dd409b794 100755
--- a/maintainers/scripts/feature-freeze-teams.pl
+++ b/maintainers/scripts/feature-freeze-teams.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl -p perlPackages.JSON perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.TermReadKey
+#!nix-shell -i perl -p perl -p perlPackages.JSON github-cli
 
 # This script generates a list of teams to ping for the Feature Freeze announcement on Discourse.
 # It's intended to be used by Release Managers before creating such posts.
 #
-# The script interactively reads a GitHub username and a corresponding GitHub Personal Access token.
-# This is required to access the GitHub Teams API so the token needs at least the read:org privilege.
+# The script uses the credentials from the GitHub CLI (gh)
+# This is required to access the GitHub Teams API so it needs at least the read:org privilege.
 
 ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::ProhibitBacktickOperators)
 use strict;
@@ -14,39 +14,21 @@ use Carp;
 use Cwd 'abs_path';
 use File::Basename;
 use JSON qw(decode_json);
-use LWP::UserAgent;
-use Term::ReadKey qw(ReadLine ReadMode);
 
 sub github_team_members {
-    my ($team_name, $username, $token) = @_;
+    my ($team_name) = @_;
     my @ret;
 
-    my $req = HTTP::Request->new('GET', "https://api.github.com/orgs/NixOS/teams/$team_name/members", [ 'Accept' => 'application/vnd.github.v3+json' ]);
-    $req->authorization_basic($username, $token);
-    my $response = LWP::UserAgent->new->request($req);
-
-    if ($response->is_success) {
-        my $content = decode_json($response->decoded_content);
-        foreach (@{$content}) {
-            push @ret, $_->{'login'};
-        }
-    } else {
-        print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: " . $response->status_line;
+    my $content = decode_json(`gh api orgs/NixOS/teams/$team_name/members`);
+    foreach (@{$content}) {
+        push @ret, $_->{'login'};
     }
 
     return \@ret;
 }
 
-# Read GitHub credentials
-print {*STDERR} 'GitHub username: ';
-my $github_user = ReadLine(0);
-ReadMode('noecho');
-print {*STDERR} 'GitHub personal access token (no echo): ';
-my $github_token = ReadLine(0);
-ReadMode('restore');
-print {*STDERR} "\n";
-chomp $github_user;
-chomp $github_token;
+`gh auth status` or die "`gh` comes from `pkgs.github-cli`, or in one command:
+nix-shell -p github-cli --run 'gh auth login'\n";
 
 # Read nix output
 my $nix_version = `nix --version`;
@@ -60,7 +42,6 @@ if ($nix_version =~ m/2[.]3[.]/msx) {
 my $data = decode_json($out);
 
 # Process teams
-print {*STDERR} "\n";
 while (my ($team_nix_key, $team_config) = each %{$data}) {
     # Ignore teams that don't want to be or can't be pinged
     if (not defined $team_config->{enableFeatureFreezePing} or not $team_config->{enableFeatureFreezePing}) {
@@ -71,12 +52,12 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
         next;
     }
     #  Team name
-    print {*STDERR} "$team_config->{shortName}:";
+    print {*STDOUT} "$team_config->{shortName}:";
     # GitHub Teams
     my @github_members;
     if (defined $team_config->{github}) {
-        print {*STDERR} " \@NixOS/$team_config->{github}";
-        push @github_members, @{github_team_members($team_config->{github}, $github_user, $github_token)};
+        print {*STDOUT} " \@NixOS/$team_config->{github}";
+        push @github_members, @{github_team_members($team_config->{github})};
     }
     my %github_members = map { $_ => 1 } @github_members;
     # Members
@@ -88,9 +69,11 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
             if (defined $github_members{$github_handle}) {
                 next;
             }
-            print {*STDERR} " \@$github_handle";
+            print {*STDOUT} " \@$github_handle";
         }
     }
 
-    print {*STDERR} "\n";
+    print {*STDOUT} "\n";
 }
+
+print {*STDOUT} "Everyone else: \@NixOS/nixpkgs-committers\n";
diff --git a/maintainers/scripts/get-maintainer-pings-between.sh b/maintainers/scripts/get-maintainer-pings-between.sh
deleted file mode 100755
index 4b6d7ff78052..000000000000
--- a/maintainers/scripts/get-maintainer-pings-between.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p git jq
-
-# Outputs a list of maintainers that would be pinged across two nixpkgs revisions.
-# Authors:
-#  Morgan Jones (@numinit)
-#  Tristan Ross (@RossComputerGuy)
-
-set -euo pipefail
-
-if [ $# -lt 2 ]; then
-    echo "Usage: $0 <rev-from> <rev-to>" >&2
-    exit 1
-fi
-
-repo="$(git rev-parse --show-toplevel)"
-system="$(nix-instantiate --eval --expr builtins.currentSystem)"
-rev1="$(git -C "$repo" rev-parse "$1")"
-rev2="$(git -C "$repo" rev-parse "$2")"
-
-echo "Touched files:" >&2
-git -C "$repo" diff --name-only "$rev1" "$rev2" \
-    | jq --raw-input --slurp 'split("\n")[:-1]' | tee "$TMPDIR/touched-files.json" >&2
-
-# Runs an eval in the given worktree, outputting the path to $TMPDIR/$1.path.
-# $1: The revision SHA.
-eval_in_worktree() (
-    mkdir -p .worktree
-    local rev="$1"
-    local tree=".worktree/$rev"
-    if [ ! -d "$tree" ]; then
-        git -C "$repo" worktree add -f -d "$tree" "$rev" >&2
-    fi
-    cd "$tree"
-
-    local workdir="$TMPDIR/$rev"
-    rm -rf "$workdir"
-    mkdir -p "$workdir"
-
-    nix-build ci -A eval.attrpathsSuperset -o "$workdir/paths" >&2
-    mkdir -p "$workdir/intermediates"
-    nix-build ci -A eval.singleSystem \
-        --arg evalSystem "$system" \
-        --arg attrpathFile "$workdir/paths/paths.json" \
-        --arg chunkSize ${CHUNK_SIZE:-10000} \
-        -o "$workdir/intermediates/.intermediate-1" >&2
-
-    # eval.combine nix-build needs a directory, not a symlink
-    cp -RL "$workdir/intermediates/.intermediate-1" "$workdir/intermediates/intermediate-1"
-    chmod -R +w "$workdir/intermediates/intermediate-1"
-    rm -rf "$workdir/intermediates/.intermediate-1"
-
-    nix-build ci -A eval.combine \
-        --arg resultsDir "$workdir/intermediates" \
-        -o "$workdir/result" >&2
-)
-
-eval_in_worktree "$rev1" &
-pid1=$!
-eval_in_worktree "$rev2" &
-pid2=$!
-
-wait $pid1
-wait $pid2
-
-path1="$TMPDIR/$rev1"
-path2="$TMPDIR/$rev2"
-
-# Use the repo this script was executed in to get accurate maintainer info
-nix-build "$repo/ci" -A eval.compare \
-    --arg beforeResultDir "$path1/result" \
-    --arg afterResultDir "$path2/result" \
-    --arg touchedFilesJson "$TMPDIR/touched-files.json" \
-    --arg byName true \
-    -o comparison
-
-echo "Pinged maintainers (check $repo/comparison for more details)" >&2
-jq < comparison/maintainers.json
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 0889f7e1d9ed..e049064c7564 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -99,6 +99,11 @@ sed -r \
     -e '/ Agda /d' \
     -e '/ stack /d' \
     -e '/ git-annex /d' \
+    -e '/ hledger /d' \
+    -e '/ hledger-iadd /d' \
+    -e '/ hledger-lib /d' \
+    -e '/ hledger-ui /d' \
+    -e '/ hledger-web /d' \
     < "${tmpfile_new}" >> $stackage_config
 # Explanations:
 # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 817e95c48407..2acc4786f130 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -41,12 +41,12 @@ llscheck,,,,,,mrcjkb
 lmathx,,,,,5.3,alexshpilkin
 lmpfrlib,,,,,5.3,alexshpilkin
 loadkit,,,,,,alerque
-lpeg,,,,,,vyp
+lpeg,,,,,,
 lpeg_patterns,,,,,,
 lpeglabel,,,,1.6.0,,
 lrexlib-gnu,,,,,,
 lrexlib-oniguruma,,,,,,junestepp
-lrexlib-pcre,,,,,,vyp
+lrexlib-pcre,,,,,,
 lrexlib-posix,,,,,,
 lsp-progress.nvim,,,,,,gepbird
 lua-cjson,,,,,,
@@ -86,7 +86,7 @@ lualdap,,,,,,aanderse
 lualine.nvim,,,http://luarocks.org/dev,,,
 lualogging,,,,,,
 luaossl,,,,,5.1,
-luaposix,,,,34.1.1-1,,vyp lblasc
+luaposix,,,,34.1.1-1,,lblasc
 luaprompt,,,,,,Freed-Wu
 luarepl,,,,,,
 luarocks,,,,,,mrcjkb teto
@@ -96,7 +96,7 @@ luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb
 luasec,,,,,,flosse
 luasnip,,,,,,
 luasocket,,,,,,
-luasql-sqlite3,,,,,,vyp
+luasql-sqlite3,,,,,,
 luassert,,,,,,
 luasystem,,,,,,
 luatext,,,,,,
@@ -148,7 +148,7 @@ sofa,,,,,,f4z3r
 sqlite,,,,,,
 std._debug,,,,,,
 std.normalize,,,,,,
-stdlib,,,,41.2.2,,vyp
+stdlib,,,,41.2.2,,
 teal-language-server,,,,,,
 telescope-manix,,,,,,
 telescope.nvim,,,,,5.1,
@@ -159,5 +159,5 @@ tree-sitter-http,,,,0.0.33-1,,
 tree-sitter-norg,,,,,5.1,mrcjkb
 tree-sitter-orgmode,,,,,,
 vstruct,,,,,,
-vusted,,,,,,figsoda
+vusted,,,,,,
 xml2lua,,,,,,teto
diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py
index 3c5f8edc50ad..bceee1074844 100755
--- a/maintainers/scripts/remove-old-aliases.py
+++ b/maintainers/scripts/remove-old-aliases.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ ])" nix
 """
-A program to remove old aliases or convert old aliases to throws
+Converts old aliases to warnings, converts old warnings to throws, and removes old throws.
 Example usage:
 ./maintainers/scripts/remove-old-aliases.py --year 2018 --file ./pkgs/top-level/aliases.nix
 
@@ -31,22 +31,42 @@ def process_args() -> argparse.Namespace:
     arg_parser.add_argument(
         "--only-throws",
         action="store_true",
-        help="only operate on throws. e.g remove throws older than $date",
+        help="Deprecated, use --only throws instead",
+    )
+    arg_parser.add_argument(
+        "--only",
+        choices=["aliases", "warnings", "throws"],
+        help="Only act on the specified types"
+        "(i.e. only act on entries that are 'normal' aliases, warnings, or throws)."
+        "Can be repeated.",
+        action="append",
+        dest="operate_on",
     )
     arg_parser.add_argument("--file", required=True, type=Path, help="alias file")
     arg_parser.add_argument(
         "--dry-run", action="store_true", help="don't modify files, only print results"
     )
-    return arg_parser.parse_args()
+
+    parsed = arg_parser.parse_args()
+
+    if parsed.only_throws:
+        parsed.operate_on.append("throws")
+
+    if parsed.operate_on is None:
+        parsed.operate_on = ["aliases", "warnings", "throws"]
+
+    return parsed
 
 
 def get_date_lists(
-    txt: list[str], cutoffdate: datetimedate, only_throws: bool
-) -> tuple[list[str], list[str], list[str]]:
+    txt: list[str], cutoffdate: datetimedate
+) -> tuple[list[str], list[str], list[str], list[str], list[str]]:
     """get a list of lines in which the date is older than $cutoffdate"""
     date_older_list: list[str] = []
     date_older_throw_list: list[str] = []
+    date_older_warning_list: list[str] = []
     date_sep_line_list: list[str] = []
+    date_too_complex_list: list[str] = []
 
     for lineno, line in enumerate(txt, start=1):
         line = line.rstrip()
@@ -69,68 +89,104 @@ def get_date_lists(
         ):
             continue
 
-        if "=" not in line:
-            date_sep_line_list.append(f"{lineno} {line}")
+        if line.lstrip().startswith("inherit (") and ";" in line:
+            date_older_list.append(line)
+        elif "=" not in line:
+            date_sep_line_list.append(f"{lineno:>5} {line}")
         # 'if' lines could be complicated
         elif "if " in line and "if =" not in line:
-            print(f"RESOLVE MANUALLY {line}")
-        elif "throw" in line:
+            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif "= with " in line:
+            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif "warnAlias" in line or "warning" in line:
+            if 'warnAlias "' in line:
+                date_older_warning_list.append(line)
+            else:
+                date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif " = throw" in line:
             date_older_throw_list.append(line)
-        elif not only_throws:
+        else:
             date_older_list.append(line)
 
     return (
         date_older_list,
         date_sep_line_list,
+        date_too_complex_list,
         date_older_throw_list,
+        date_older_warning_list,
     )
 
 
-def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
-    """convert a list of lines to throws"""
-    converted_list = []
-    for line in date_older_list.copy():
+def convert(lines: list[str], convert_to: str) -> list[tuple[str, str]]:
+    """convert a list of lines to either "throws" or "warnings"."""
+    converted_lines = {}
+    for line in lines.copy():
         indent: str = " " * (len(line) - len(line.lstrip()))
-        before_equal = ""
-        after_equal = ""
-        try:
-            before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2))
-        except ValueError as err:
-            print(err, line, "\n")
-            date_older_list.remove(line)
-            continue
 
-        alias = before_equal
-        alias_unquoted = before_equal.strip('"')
-        replacement = next(x.strip(";:") for x in after_equal.split())
+        if "=" not in line:
+            assert "inherit (" in line
+            before, sep, after = line.partition("inherit (")
+            inside, sep, after = after.partition(")")
+            if not sep:
+                print(f"FAILED ON {line}")
+                continue
+            alias, *_ = after.strip().split(";")[0].split()
+            replacement = f"{inside.strip()}.{alias}"
+
+        else:
+            before_equal = ""
+            after_equal = ""
+            try:
+                before_equal, after_equal = (
+                    x.strip() for x in line.split("=", maxsplit=2)
+                )
+                if after_equal.startswith("warnAlias"):
+                    after_equal = after_equal.split("\"", maxsplit=3)[2].strip()
+            except ValueError as err:
+                print(err, line, "\n")
+                lines.remove(line)
+                continue
+
+            alias = before_equal
+            replacement = next(x.strip(";:") for x in after_equal.split())
+
+        alias_unquoted = alias.strip('"')
         replacement = replacement.removeprefix("pkgs.")
 
-        converted = (
-            f"{indent}{alias} = throw \"'{alias_unquoted}' has been"
-            f" renamed to/replaced by '{replacement}'\";"
-            f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}"
-        )
-        converted_list.append((line, converted))
+        if convert_to == "throws":
+            converted = (
+                f"{indent}{alias} = throw \"'{alias_unquoted}' has been"
+                f" renamed to/replaced by '{replacement}'\";"
+                f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}"
+            )
+            converted_lines[line] = converted
+        elif convert_to == "warnings":
+            converted = (
+                f"{indent}{alias} = warnAlias \"'{alias_unquoted}' has been"
+                f" renamed to/replaced by '{replacement}'\" {replacement};"
+                f" # Converted to warning {datetime.today().strftime('%Y-%m-%d')}"
+            )
+            converted_lines[line] = converted
+        else:
+            raise ValueError("'convert_to' must be either 'throws' or 'warnings'")
 
-    return converted_list
+    return converted_lines
 
 
 def generate_text_to_write(
     txt: list[str],
-    date_older_list: list[str],
-    converted_to_throw: list[tuple[str, str]],
-    date_older_throw_list: list[str],
+    converted_lines: dict[str, str],
 ) -> list[str]:
     """generate a list of text to be written to the aliasfile"""
     text_to_write: list[str] = []
     for line in txt:
         text_to_append: str = ""
-        if converted_to_throw:
-            for tupl in converted_to_throw:
-                if line == tupl[0]:
-                    text_to_append = f"{tupl[1]}\n"
-        if line not in date_older_list and line not in date_older_throw_list:
-            text_to_append = f"{line}\n"
+        try:
+            new_line = converted_lines[line]
+            if new_line is not None:
+                text_to_write.append(f"{new_line}\n")
+        except KeyError:
+            text_to_write.append(f"{line}\n")
         if text_to_append:
             text_to_write.append(text_to_append)
 
@@ -171,30 +227,48 @@ def main() -> None:
     """main"""
     args = process_args()
 
-    only_throws = args.only_throws
     aliasfile = Path(args.file).absolute()
     cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date()
 
     txt: list[str] = (aliasfile.read_text(encoding="utf-8")).splitlines()
 
     date_older_list: list[str] = []
-    date_sep_line_list: list[str] = []
+    date_older_warning_list: list[str] = []
     date_older_throw_list: list[str] = []
+    date_sep_line_list: list[str] = []
+    date_too_complex_list: list[str] = []
 
-    date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists(
-        txt, cutoffdate, only_throws
-    )
+    (
+        date_older_list,
+        date_sep_line_list,
+        date_too_complex_list,
+        date_older_throw_list,
+        date_older_warning_list,
+    ) = get_date_lists(txt, cutoffdate)
 
-    converted_to_throw: list[tuple[str, str]] = []
-    if date_older_list:
-        converted_to_throw = convert_to_throw(date_older_list)
-        print(" Will be converted to throws. ".center(100, "-"))
+    converted_lines: dict[str, str] = {}
+
+    if date_older_list and "aliases" in args.operate_on:
+        converted_lines.update(convert(date_older_list, "warnings"))
+        print(" Will be converted to warnings. ".center(100, "-"))
         for l_n in date_older_list:
             print(l_n)
 
-    if date_older_throw_list:
+    if date_older_warning_list and "warnings" in args.operate_on:
+        converted_lines.update(convert(date_older_warning_list, "throws"))
+        print(" Will be converted to throws. ".center(100, "-"))
+        for l_n in date_older_warning_list:
+            print(l_n)
+
+    if date_older_throw_list and "throws" in args.operate_on:
         print(" Will be removed. ".center(100, "-"))
         for l_n in date_older_throw_list:
+            converted_lines[l_n] = None
+            print(l_n)
+
+    if date_too_complex_list:
+        print(" Too complex, resolve manually. ".center(100, "-"))
+        for l_n in date_too_complex_list:
             print(l_n)
 
     if date_sep_line_list:
@@ -203,9 +277,7 @@ def main() -> None:
             print(l_n)
 
     if not args.dry_run:
-        text_to_write = generate_text_to_write(
-            txt, date_older_list, converted_to_throw, date_older_throw_list
-        )
+        text_to_write = generate_text_to_write(txt, converted_lines)
         write_file(aliasfile, text_to_write)
 
 
diff --git a/maintainers/scripts/update-typst-packages.py b/maintainers/scripts/update-typst-packages.py
index 2264f97d7706..f7b05dae7203 100755
--- a/maintainers/scripts/update-typst-packages.py
+++ b/maintainers/scripts/update-typst-packages.py
@@ -78,7 +78,14 @@ class TypstPackage:
             "nix-command",
         ]
         result = subprocess.run(cmd + [url], capture_output=True, text=True)
-        hash = re.search(r"hash\s+\'(sha256-.{44})\'", result.stderr).groups()[0]
+        # We currently rely on Typst Universe's github repository to
+        # track package dependencies. However, there might be an
+        # inconsistency between the registry and the repository. We
+        # skip packages that cannot be fetched from the registry.
+        if re.search(r"error: unable to download", result.stderr):
+            return url, None
+        else:
+            hash = re.search(r"hash\s+\'(sha256-.{44})\'", result.stderr).groups()[0]
         return url, hash
 
     def to_name_full(self):
@@ -86,10 +93,14 @@ class TypstPackage:
 
     def to_attrs(self):
         deps = set()
-        excludes = list(map(
-            lambda e: os.path.join(self.path, e),
-            self.meta["package"]["exclude"] if "exclude" in self.meta["package"] else [],
-        ))
+        excludes = list(
+            map(
+                lambda e: os.path.join(self.path, e),
+                self.meta["package"]["exclude"]
+                if "exclude" in self.meta["package"]
+                else [],
+            )
+        )
         for root, _, files in os.walk(self.path):
             for file in filter(lambda f: f.split(".")[-1] == "typ", files):
                 file_path = os.path.join(root, file)
@@ -110,6 +121,9 @@ class TypstPackage:
         )
         source_url, source_hash = self.source()
 
+        if not source_hash:
+            return None
+
         return dict(
             url=source_url,
             hash=source_hash,
@@ -152,11 +166,12 @@ def generate_typst_packages(preview_dir, output_file):
         def generate_package(pname, package_subtree):
             sorted_keys = sorted(package_subtree.keys(), key=Version, reverse=True)
             print(f"Generating metadata for {pname}")
-            return {
-                pname: OrderedDict(
-                    (k, package_subtree[k].to_attrs()) for k in sorted_keys
-                )
-            }
+            version_set = OrderedDict(
+                (k, a)
+                for k, a in [(k, package_subtree[k].to_attrs()) for k in sorted_keys]
+                if a is not None
+            )
+            return {pname: version_set} if len(version_set) > 0 else {}
 
         with concurrent.futures.ThreadPoolExecutor(max_workers=100) as executor:
             sorted_packages = sorted(package_tree.items(), key=lambda x: x[0])
diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py
index 10d197d5fe78..ca35f04d1285 100644
--- a/maintainers/scripts/update.py
+++ b/maintainers/scripts/update.py
@@ -92,7 +92,15 @@ async def attr_instantiation_worker(
 ) -> tuple[Path, str]:
     async with semaphore:
         eprint(f"Instantiating {attr_path}…")
-        return (await nix_instantiate(attr_path), attr_path)
+        try:
+            return (await nix_instantiate(attr_path), attr_path)
+        except Exception as e:
+            # Failure should normally terminate the script but
+            # looks like Python is buggy so we need to do it ourselves.
+            eprint(f"Failed to instantiate {attr_path}")
+            if e.stderr:
+                eprint(e.stderr.decode("utf-8"))
+            sys.exit(1)
 
 
 async def requisites_worker(
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index cb0c001ccd8b..857e84b7d286 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1,11 +1,9 @@
 /*
   List of maintainer teams.
     name = {
-      # Required
       members = [ maintainer1 maintainer2 ];
       scope = "Maintain foo packages.";
       shortName = "foo";
-      # Optional
       enableFeatureFreezePing = true;
       github = "my-subsystem";
     };
@@ -18,7 +16,12 @@
   - `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases
     - There is limited mention capacity in a single post, so this should be reserved for critical components
       or larger ecosystems within nixpkgs.
-  - `github` will ping the specified GitHub team as well
+  - `github` will ping the specified GitHub team and sync the `members`, `scope` and `shortName` fields from it
+  - `githubId` will be set automatically based on `github`
+
+  If `github` is specified and you'd like to be added to the team, contact one of the `githubMaintainers` of the team:
+
+      nix eval -f lib teams.someTeam.githubMaintainers --json | jq
 
   More fields may be added in the future.
 
@@ -37,7 +40,6 @@ with lib.maintainers;
       aanderse
       arianvp
       emily
-      flokli
       m1cr0man
     ];
     scope = "Maintain ACME-related packages and modules.";
@@ -46,27 +48,11 @@ with lib.maintainers;
   };
 
   agda = {
-    members = [
-      alexarice
-      ncfavier
-      phijor
-      turion
-    ];
-    scope = "Maintain Agda-related packages and modules.";
-    shortName = "Agda";
+    github = "agda";
   };
 
   android = {
-    members = [
-      adrian-gierakowski
-      hadilq
-      johnrtitor
-      numinit
-      RossComputerGuy
-    ];
-    scope = "Maintain Android-related tooling in nixpkgs.";
     github = "android";
-    shortName = "Android";
     enableFeatureFreezePing = true;
   };
 
@@ -107,19 +93,7 @@ with lib.maintainers;
   };
 
   beam = {
-    members = [
-      adamcstephens
-      ankhers
-      Br1ght0ne
-      DianaOlympos
-      gleber
-      happysalada
-      minijackson
-      yurrriq
-    ];
     github = "beam";
-    scope = "Maintain BEAM-related packages and modules.";
-    shortName = "BEAM";
     enableFeatureFreezePing = true;
   };
 
@@ -193,34 +167,11 @@ with lib.maintainers;
   };
 
   categorization = {
-    members = [
-      aleksana
-      fgaz
-      getpsyched
-      lyndeno
-      natsukium
-      philiptaron
-      pyrotelekinetic
-      raskin
-      sigmasquadron
-      tomodachi94
-    ];
     github = "categorization";
-    scope = "Maintain the categorization system in Nixpkgs, per RFC 146. This team has authority over all categorization issues in Nixpkgs.";
-    shortName = "Categorization";
   };
 
   ci = {
-    members = [
-      MattSturgeon
-      mic92
-      philiptaron
-      wolfgangwalther
-      zowoq
-    ];
     github = "nixpkgs-ci";
-    scope = "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions.";
-    shortName = "CI";
   };
 
   cinnamon = {
@@ -237,7 +188,6 @@ with lib.maintainers;
     members = [ floriansanderscc ];
     scope = "Maintain Clever Cloud related packages.";
     shortName = "CleverCloud";
-    github = "CleverCloud";
   };
 
   cloudposse = {
@@ -263,21 +213,7 @@ with lib.maintainers;
   };
 
   cosmic = {
-    members = [
-      a-kenji
-      ahoneybun
-      drakon64
-      griffi-gh
-      HeitorAugustoLN
-      nyabinary
-      pandapip1
-      qyliss
-      thefossguy
-      michaelBelsanti
-    ];
     github = "cosmic";
-    shortName = "cosmic";
-    scope = "Maintain the COSMIC DE and related packages.";
     enableFeatureFreezePing = true;
   };
 
@@ -291,15 +227,6 @@ with lib.maintainers;
   };
 
   cuda = {
-    members = [
-      connorbaker
-      GaetanLepage
-      prusnak
-      samuela
-      SomeoneSerge
-    ];
-    scope = "Maintain CUDA-enabled packages";
-    shortName = "Cuda";
     github = "cuda-maintainers";
   };
 
@@ -309,20 +236,14 @@ with lib.maintainers;
       xanderio
       blitz
       snu
+      e1mo
     ];
     scope = "Team for Cyberus Technology employees who collectively maintain packages.";
     shortName = "Cyberus Technology employees";
   };
 
   darwin = {
-    members = [
-      emily
-      reckenrode
-      toonn
-    ];
     github = "darwin-core";
-    scope = "Maintain core platform support and packages for macOS and other Apple platforms.";
-    shortName = "Darwin";
     enableFeatureFreezePing = true;
   };
 
@@ -366,10 +287,7 @@ with lib.maintainers;
   };
 
   docs = {
-    members = [ ];
     github = "documentation-team";
-    scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
-    shortName = "Docs";
     enableFeatureFreezePing = true;
   };
 
@@ -387,6 +305,17 @@ with lib.maintainers;
     shortName = "dotnet";
   };
 
+  electron = {
+    members = [
+      tomasajt
+      yayayayaka
+      teutat3s
+    ];
+    scope = "Maintainers of electron packages";
+    shortName = "electron";
+    enableFeatureFreezePing = true;
+  };
+
   emacs = {
     members = [
       AndersonTorres
@@ -399,31 +328,11 @@ with lib.maintainers;
   };
 
   enlightenment = {
-    members = [ romildo ];
     github = "enlightenment";
-    scope = "Maintain Enlightenment desktop environment and related packages.";
-    shortName = "Enlightenment";
-    enableFeatureFreezePing = true;
-  };
-
-  # Dummy group for the "everyone else" section
-  feature-freeze-everyone-else = {
-    members = [ ];
-    github = "nixpkgs-committers";
-    scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!";
-    shortName = "Everyone else";
     enableFeatureFreezePing = true;
   };
 
   flutter = {
-    members = [
-      mkg20001
-      RossComputerGuy
-      FlafyDev
-      hacker1024
-    ];
-    scope = "Maintain Flutter and Dart-related packages and build tools";
-    shortName = "flutter";
     enableFeatureFreezePing = false;
     github = "flutter";
   };
@@ -442,24 +351,11 @@ with lib.maintainers;
   };
 
   formatter = {
-    members = [
-      piegames
-      infinisil
-      das_j
-      _0x4A6F
-      MattSturgeon
-      jfly
-      # Not in the maintainer list
-      # Sereja313
-    ];
-    scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";
-    shortName = "Nix formatting team";
+    github = "nix-formatting";
   };
 
   freedesktop = {
-    members = [ jtojnar ];
-    scope = "Maintain Freedesktop.org packages for graphical desktop.";
-    shortName = "freedesktop.org packaging";
+    github = "freedesktop";
   };
 
   fslabs = {
@@ -484,18 +380,7 @@ with lib.maintainers;
   };
 
   geospatial = {
-    members = [
-      autra
-      imincik
-      l0b0
-      nh2
-      nialov
-      sikmir
-      willcohen
-    ];
     github = "geospatial";
-    scope = "Maintain geospatial, remote sensing and OpenStreetMap software.";
-    shortName = "Geospatial";
     enableFeatureFreezePing = true;
   };
 
@@ -512,15 +397,7 @@ with lib.maintainers;
   };
 
   gnome = {
-    members = [
-      bobby285271
-      hedning
-      jtojnar
-      dasj19
-    ];
     github = "gnome";
-    scope = "Maintain GNOME desktop environment and platform.";
-    shortName = "GNOME";
     enableFeatureFreezePing = true;
   };
 
@@ -535,17 +412,7 @@ with lib.maintainers;
   };
 
   golang = {
-    members = [
-      kalbasit
-      katexochen
-      mic92
-      zowoq
-      qbit
-      mfrw
-    ];
     github = "golang";
-    scope = "Maintain Golang compilers.";
-    shortName = "Go";
     enableFeatureFreezePing = true;
   };
 
@@ -561,15 +428,7 @@ with lib.maintainers;
   };
 
   haskell = {
-    members = [
-      cdepillabout
-      maralorn
-      sternenseemann
-      wolfgangwalther
-    ];
     github = "haskell";
-    scope = "Maintain Haskell packages and infrastructure.";
-    shortName = "Haskell";
     enableFeatureFreezePing = true;
   };
 
@@ -595,16 +454,7 @@ with lib.maintainers;
   };
 
   hyprland = {
-    members = [
-      donovanglover
-      fufexan
-      johnrtitor
-      khaneliman
-      NotAShelf
-    ];
     github = "hyprland";
-    scope = "Maintain Hyprland compositor and ecosystem";
-    shortName = "Hyprland";
     enableFeatureFreezePing = true;
   };
 
@@ -626,14 +476,6 @@ with lib.maintainers;
 
   java = {
     github = "java";
-    members = [
-      chayleaf
-      fliegendewurst
-      infinidoge
-      tomodachi94
-    ];
-    shortName = "Java";
-    scope = "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects)";
     enableFeatureFreezePing = true;
   };
 
@@ -651,7 +493,6 @@ with lib.maintainers;
 
   jitsi = {
     members = [
-      cleeyv
       novmar
       ryantm
       lassulus
@@ -673,17 +514,6 @@ with lib.maintainers;
 
   k3s = {
     github = "k3s";
-    members = [
-      euank
-      frederictobiasc
-      heywoodlh
-      marcusramberg
-      mic92
-      rorosen
-      wrmilling
-    ];
-    scope = "Maintain K3s package, NixOS module, NixOS tests, update script";
-    shortName = "K3s";
   };
 
   kodi = {
@@ -701,14 +531,7 @@ with lib.maintainers;
   };
 
   kubernetes = {
-    members = [
-      johanot
-      offline
-      saschagrunert
-      srhb
-    ];
-    scope = "Maintain the Kubernetes package and module";
-    shortName = "Kubernetes";
+    github = "kubernetes";
   };
 
   libretro = {
@@ -723,58 +546,21 @@ with lib.maintainers;
   };
 
   linux-kernel = {
-    members = [
-      TredwellGit
-      k900
-      ma27
-      nequissimus
-      qyliss
-    ];
-    scope = "Maintain the Linux kernel.";
-    shortName = "Linux Kernel";
+    github = "linux-kernel";
   };
 
   lisp = {
-    members = [
-      raskin
-      lukego
-      nagy
-      uthar
-      hraban
-    ];
     github = "lisp";
-    scope = "Maintain the Lisp ecosystem.";
-    shortName = "lisp";
     enableFeatureFreezePing = true;
   };
 
   lix = {
-    members = [
-      raitobezarius
-      qyriad
-      _9999years
-      lf-
-      alois31
-    ];
-    scope = "Maintain the Lix package manager inside of Nixpkgs.";
-    shortName = "Lix ecosystem";
+    github = "lix-maintainers";
     enableFeatureFreezePing = true;
   };
 
   llvm = {
-    members = [
-      dtzWill
-      emily
-      ericson2314
-      lovek323
-      qyliss
-      RossComputerGuy
-      rrbutani
-      sternenseemann
-    ];
     github = "llvm";
-    scope = "Maintain LLVM package sets and related packages";
-    shortName = "LLVM";
     enableFeatureFreezePing = true;
   };
 
@@ -786,23 +572,12 @@ with lib.maintainers;
   };
 
   loongarch64 = {
-    members = [
-      aleksana
-      Cryolitia
-      darkyzhou
-      dramforever
-      wegank
-    ];
     github = "loongarch64";
-    scope = "Maintain LoongArch64 related packages and code";
-    shortName = "LoongArch64";
     enableFeatureFreezePing = true;
   };
 
   lua = {
     github = "lua";
-    scope = "Maintain the lua ecosystem.";
-    shortName = "lua";
     enableFeatureFreezePing = true;
   };
 
@@ -817,10 +592,7 @@ with lib.maintainers;
   };
 
   lumina = {
-    members = [ romildo ];
     github = "lumina";
-    scope = "Maintain lumina desktop environment and related packages.";
-    shortName = "Lumina";
     enableFeatureFreezePing = true;
   };
 
@@ -836,23 +608,12 @@ with lib.maintainers;
   };
 
   lxqt = {
-    members = [ romildo ];
     github = "lxqt";
-    scope = "Maintain LXQt desktop environment and related packages.";
-    shortName = "LXQt";
     enableFeatureFreezePing = true;
   };
 
   marketing = {
-    members = [
-      djacu
-      flyfloh
-      thilobillerbeck
-      tomberek
-    ];
     github = "marketing-team";
-    scope = "Marketing of Nix/NixOS/nixpkgs.";
-    shortName = "Marketing";
     enableFeatureFreezePing = true;
   };
 
@@ -916,15 +677,7 @@ with lib.maintainers;
   };
 
   neovim = {
-    members = [
-      GaetanLepage
-      khaneliman
-      mrcjkb
-      perchun
-    ];
     github = "neovim";
-    scope = "Maintain the vim and neovim text editors and related packages.";
-    shortName = "Vim/Neovim";
   };
 
   nextcloud = {
@@ -982,10 +735,7 @@ with lib.maintainers;
   };
 
   ocaml = {
-    members = [ alizter ];
     github = "ocaml";
-    scope = "Maintain the OCaml compiler and package set.";
-    shortName = "OCaml";
     enableFeatureFreezePing = true;
   };
 
@@ -1017,13 +767,7 @@ with lib.maintainers;
   };
 
   pantheon = {
-    members = [
-      davidak
-      bobby285271
-    ];
     github = "pantheon";
-    scope = "Maintain Pantheon desktop environment and platform.";
-    shortName = "Pantheon";
     enableFeatureFreezePing = true;
   };
 
@@ -1039,36 +783,16 @@ with lib.maintainers;
   };
 
   php = {
-    members = [
-      aanderse
-      ma27
-      piotrkwiecinski
-      talyz
-    ];
     github = "php";
-    scope = "Maintain PHP related packages and extensions.";
-    shortName = "PHP";
     enableFeatureFreezePing = true;
   };
 
   podman = {
-    members = [
-      saschagrunert
-      vdemeester
-    ];
     github = "podman";
-    scope = "Maintain Podman and CRI-O related packages and modules.";
-    shortName = "Podman";
   };
 
   postgres = {
-    members = [
-      thoughtpolice
-      ma27
-      wolfgangwalther
-    ];
-    scope = "Maintain the PostgreSQL package and plugins along with the NixOS module.";
-    shortName = "PostgreSQL";
+    github = "postgres";
     enableFeatureFreezePing = true;
   };
 
@@ -1083,18 +807,7 @@ with lib.maintainers;
   };
 
   qt-kde = {
-    members = [
-      ilya-fedin
-      k900
-      LunNova
-      mjm
-      nickcao
-      SuperSandro2000
-      ttuegel
-    ];
     github = "qt-kde";
-    scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects.";
-    shortName = "Qt / KDE";
     enableFeatureFreezePing = true;
   };
 
@@ -1120,43 +833,12 @@ with lib.maintainers;
     shortName = "Red Code Labs";
   };
 
-  release = {
-    members = [ ];
-    github = "nixos-release-managers";
-    scope = "Manage the current nixpkgs/NixOS release.";
-    shortName = "Release";
-  };
-
   rocm = {
-    members = [
-      Flakebi
-      GZGavinZhao
-      LunNova
-      mschwaig
-    ];
     github = "rocm";
-    scope = "Maintain ROCm and related packages.";
-    shortName = "ROCm";
-  };
-
-  ruby = {
-    members = [ ];
-    scope = "Maintain the Ruby interpreter and related packages.";
-    shortName = "Ruby";
-    enableFeatureFreezePing = true;
   };
 
   rust = {
-    members = [
-      figsoda
-      mic92
-      tjni
-      winter
-      zowoq
-    ];
     github = "rust";
-    scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";
-    shortName = "Rust";
     enableFeatureFreezePing = true;
   };
 
@@ -1171,16 +853,7 @@ with lib.maintainers;
   };
 
   sdl = {
-    members = [
-      evythedemon
-      grimmauld
-      jansol
-      marcin-serwin
-      pbsds
-    ];
-    github = "SDL";
-    scope = "Maintain core SDL libraries.";
-    shortName = "SDL";
+    github = "sdl";
     enableFeatureFreezePing = true;
   };
 
@@ -1207,16 +880,6 @@ with lib.maintainers;
   };
 
   stdenv = {
-    members = [
-      artturin
-      emily
-      ericson2314
-      philiptaron
-      reckenrode
-      RossComputerGuy
-    ];
-    scope = "Maintain the standard environment and its surrounding logic.";
-    shortName = "stdenv";
     enableFeatureFreezePing = true;
     github = "stdenv";
   };
@@ -1246,23 +909,13 @@ with lib.maintainers;
       samasaur
       stephank
       trepetti
-      trundle
     ];
     scope = "Maintain Swift compiler suite for NixOS.";
     shortName = "Swift";
   };
 
   systemd = {
-    members = [
-      flokli
-      arianvp
-      elvishjerricco
-      aanderse
-      grimmauld
-    ];
     github = "systemd";
-    scope = "Maintain systemd for NixOS.";
-    shortName = "systemd";
     enableFeatureFreezePing = true;
   };
 
@@ -1312,14 +965,6 @@ with lib.maintainers;
   };
 
   xen = {
-    members = [
-      hehongbo
-      lach
-      sigmasquadron
-      rane
-    ];
-    scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem.";
-    shortName = "Xen Project Hypervisor";
     enableFeatureFreezePing = true;
     github = "xen-project";
   };
@@ -1337,7 +982,6 @@ with lib.maintainers;
 
   zig = {
     members = [
-      figsoda
       RossComputerGuy
     ];
     scope = "Maintain the Zig compiler toolchain and nixpkgs integration.";
diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md
index b7b9f04acd95..707e2e3d1345 100644
--- a/nixos/doc/manual/development/option-types.section.md
+++ b/nixos/doc/manual/development/option-types.section.md
@@ -31,6 +31,21 @@ merging is handled.
 :   A path that is contained in the Nix store. This can be a top-level store
     path like `pkgs.hello` or a descendant like `"${pkgs.hello}/bin/hello"`.
 
+`types.externalPath`
+
+:   A path that is not contained in the Nix store. Typical use cases are:
+    secrets, password or any other external file.
+
+::: {.warning}
+This type only validates that the path is not *currently* in the Nix store.
+It does NOT prevent the value from being copied to the store later when:
+- Referenced in a derivation
+- Used in certain path operations (e.g., `${path}` interpolation)
+- Passed to functions that copy to the store
+
+Users must still be careful about how they reference these paths.
+:::
+
 `types.pathWith` { *`inStore`* ? `null`, *`absolute`* ? `null` }
 
 :   A filesystem path. Either a string or something that can be coerced
@@ -316,22 +331,34 @@ A union of types is a type such that a value is valid when it is valid for at le
 
 If some values are instances of more than one of the types, it is not possible to distinguish which type they are meant to be instances of. If that's needed, consider using a [sum type](#sec-option-types-sums).
 
+<!-- SYNC WITH oneOf BELOW -->
 `types.either` *`t1 t2`*
 
 :   Type *`t1`* or type *`t2`*, e.g. `with types; either int str`.
     Multiple definitions cannot be merged.
 
+    ::: {.warning}
+    `either` and `oneOf` eagerly decide the active type based on the passed types' shallow check method. For composite types like `attrsOf` and `submodule`, which both match all attribute set definitions, the first type argument will be chosen for the returned option value, and this therefore also decides how nested values are checked and merged. For example, `either (attrsOf int) (submodule {...})` will always use `attrsOf int` for any attribute set value, even if it was intended as a submodule. This behavior is a trade-off that keeps the implementation simple and the evaluation order predictable, avoiding unexpected strictness problems such as infinite recursions. When proper type discrimination is needed, consider using a [sum type](#sec-option-types-sums) like `attrTag` instead.
+    :::
+
+<!-- SYNC WITH either ABOVE -->
 `types.oneOf` \[ *`t1 t2`* ... \]
 
 :   Type *`t1`* or type *`t2`* and so forth, e.g.
     `with types; oneOf [ int str bool ]`. Multiple definitions cannot be
     merged.
 
+    ::: {.warning}
+    `either` and `oneOf` eagerly decide the active type based on the passed types' shallow check method. For composite types like `attrsOf` and `submodule`, which both match all attribute set definitions, the first matching type in the list will be chosen for the returned option value, and this therefore also decides how nested values are checked and merged. For example, `oneOf [ (attrsOf int) (submodule {...}) ]` will always use `attrsOf int` for any attribute set value, even if it was intended as a submodule. This behavior is a trade-off that keeps the implementation simple and the evaluation order predictable, avoiding unexpected strictness problems such as infinite recursions. When proper type discrimination is needed, consider using a [sum type](#sec-option-types-sums) like `attrTag` instead.
+    :::
+
 `types.nullOr` *`t`*
 
 :   `null` or type *`t`*. Multiple definitions are merged according to
     type *`t`*.
 
+    This is mostly equivalent to `either (enum [ null ]) t`, but `nullOr` provides a `null` fallback for attribute values with `mkIf false` definitions in `lazyAttrsOf (nullOr t)`, whereas `either` would throw an error when the attribute is accessed.
+
 
 ## Sum types {#sec-option-types-sums}
 
diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md
index c46c9fac3606..424613abbb77 100644
--- a/nixos/doc/manual/development/settings-options.section.md
+++ b/nixos/doc/manual/development/settings-options.section.md
@@ -358,6 +358,16 @@ have a predefined type and string generator already declared under
 
     :   Outputs the xml with header.
 
+`pkgs.formats.plist` { escape ? true }
+
+:   A function taking an attribute set with values
+
+    `escape`
+
+    :   Whether to escape XML special characters in string values and keys.
+
+    It returns a set with Property list (plist) specific attributes `type` and `generate` as specified [below](#pkgs-formats-result).
+
 `pkgs.formats.pythonVars` { }
 
 :   A function taking an empty attribute set (for future extensibility)
diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json
index 3ddfa1b1c385..e7a60706ecfe 100644
--- a/nixos/doc/manual/redirects.json
+++ b/nixos/doc/manual/redirects.json
@@ -824,12 +824,6 @@
   "module-services-glance-quickstart": [
     "index.html#module-services-glance-quickstart"
   ],
-  "module-services-filesender": [
-    "index.html#module-services-filesender"
-  ],
-  "module-services-filesender-quickstart": [
-    "index.html#module-services-filesender-quickstart"
-  ],
   "module-services-discourse": [
     "index.html#module-services-discourse"
   ],
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index bf39afd98627..40a1a37483d7 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -166,6 +166,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [twingate](https://docs.twingate.com/docs/linux), a high performance, easy to use zero trust solution that enables access to private resources from any device with better security than a VPN.
 
+- [iio-niri](https://github.com/Zhaith-Izaliel/iio-niri), a utils that listens to `iio-sensor-proxy` and updates Niri output orientation depending on the accelerometer orientation.
+
 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
 
 - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index 1cbf71a7aad8..7f2e0f622c62 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -92,7 +92,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro
 
 - [FCast Receiver](https://fcast.org), an open-source alternative to Chromecast and AirPlay. Available as [programs.fcast-receiver](#opt-programs.fcast-receiver.enable).
 
-- [FileSender](https://filesender.org/), a file sharing software. Available as [services.filesender](#opt-services.filesender.enable).
+- [FileSender](https://filesender.org/), a file sharing software. Available as `services.filesender`.
 
 - [Firefly-iii](https://www.firefly-iii.org), a free and open source personal finance manager. Available as [services.firefly-iii](#opt-services.firefly-iii.enable).
 
@@ -178,7 +178,7 @@ The pre-existing `services.ankisyncd` has been marked deprecated and will be dro
 
 - [Scrutiny](https://github.com/AnalogJ/scrutiny), a S.M.A.R.T monitoring tool for hard disks with a web frontend. Available as [services.scrutiny](#opt-services.scrutiny.enable).
 
-- [SimpleSAMLphp](https://simplesamlphp.org/), an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius). Available as [services.simplesamlphp](#opt-services.simplesamlphp).
+- [SimpleSAMLphp](https://simplesamlphp.org/), an application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius). Available as `services.simplesamlphp`.
 
 - `systemd`'s `gateway`, `upload`, and `remote` services, which provide ways of sending journals across the network. Enable using [services.journald.gateway](#opt-services.journald.gateway.enable), [services.journald.upload](#opt-services.journald.upload.enable), and [services.journald.remote](#opt-services.journald.remote.enable).
 
diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 421e363b2260..869eb3f0fda5 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -379,6 +379,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release.
 
+- Netdata removed support for non cloud deployments in version 2, so the `withCloud` option has been removed.
+
 - The ZFS import service now respects `fileSystems.*.options = [ "noauto" ];` and does not add that pool's import service to `zfs-import.target`, meaning it will not be automatically imported at boot.
 
 - Default file names of images generated by several builders in `system.build` have been changed as outlined in the table below.
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index a030c95c8f8e..58e666ddc773 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -22,6 +22,14 @@
 
 - COSMIC DE has been updated to the beta version, bringing it closer to its first stable release. This includes updates to its core components, applications, and overall stability.
 
+- GNOME has been updated to version 49.
+
+  - Removes X11 session support. Though you can still run X11 apps using XWayland.
+  - gnome-session’s custom service manager was removed in favour of using systemd.
+  - GDM now allows multiple seats, which is useful for e.g. remote logins. Though we currently [limit this to five greeter instances](https://github.com/NixOS/nixpkgs/issues/458058).
+
+  Refer to the [GNOME release notes](https://release.gnome.org/49/) for more details.
+
 ## New Modules {#sec-release-25.11-new-modules}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -30,9 +38,13 @@
 
 - [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable).
 
+- [services.rsync](options.html#opt-services.rsync) has been added to simplify periodic directory syncing.
+
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
 - [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
 
+- [wayvnc](https://github.com/any1/wayvnc), VNC server for wlroots based Wayland compositors. Available as [programs.wayvnc](#opt-programs.wayvnc.enable).
+
 - [Pi-hole](https://pi-hole.net/), a DNS sinkhole for advertisements based on Dnsmasq. Available as [services.pihole-ftl](#opt-services.pihole-ftl.enable), and [services.pihole-web](#opt-services.pihole-web.enable) for the web GUI and API.
 
 - [Fediwall](https://fediwall.social), a web application for live displaying toots from mastodon, inspired by mastowall. Available as [services.fediwall](#opt-services.fediwall.enable).
@@ -45,6 +57,8 @@
 
 - [Homebridge](https://github.com/homebridge/homebridge), a lightweight Node.js server you can run on your home network that emulates the iOS HomeKit API. Available as [services.homebridge](#opt-services.homebridge.enable).
 
+- [XPPen](https://www.xp-pen.com/), the official closed-source driver for XP Pen tablets. Available as [programs.xppen](#opt-programs.xppen.enable).
+
 - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).
   Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable).
 
@@ -78,6 +92,8 @@
 
 - [Corteza](https://cortezaproject.org/), a low-code platform. Available as [services.corteza](#opt-services.corteza.enable).
 
+- [Warpgate](https://warpgate.null.page), a SSH, HTTPS, MySQL and Postgres bastion. Available as [services.warpgate](#opt-services.warpgate.enable). Note that you need to run `warpgate recover-access` to recover builtin admin account, as the initialisation script uses a throwaway value to initialise its database.
+
 - [TuneD](https://tuned-project.org/), a system tuning service for Linux. Available as [services.tuned](#opt-services.tuned.enable).
 
 - [yubikey-manager](https://github.com/Yubico/yubikey-manager), a tool for configuring YubiKey devices. Available as [programs.yubikey-manager](#opt-programs.yubikey-manager.enable).
@@ -92,6 +108,8 @@
 
 - [crowdsec](https://www.crowdsec.net/), a free, open-source and collaborative IPS. Available as [services.crowdsec](#opt-services.crowdsec.enable).
 
+- [crowdsec-firewall-bouncer](https://www.crowdsec.net/), the CrowdSec Remediation Component for fetching new and old decisions from a CrowdSec API and adding them to a blocklist used by supported firewalls. Available as [services.crowdsec-firewall-bouncer](#opt-services.crowdsec-firewall-bouncer.enable).
+
 - [tsidp](https://github.com/tailscale/tsidp), a simple OIDC / OAuth Identity Provider (IdP) server for your tailnet. Available as [services.tsidp](#opt-services.tsidp.enable).
 
 - [Newt](https://github.com/fosrl/newt), a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. Available as [services.newt](options.html#opt-services.newt.enable).
@@ -112,6 +130,8 @@
 
 - [ente](https://github.com/ente-io/ente), a service that provides a fully open source, end-to-end encrypted platform for photos and videos. Available as [services.ente.api](#opt-services.ente.api.enable) and  [services.ente.web](#opt-services.ente.web.enable).
 
+- [PairDrop](https://github.com/schlagmichdoch/pairdrop), a peer-to-peer file transfer web app. Available as [services.pairdrop](#opt-services.pairdrop.enable).
+
 - [SuiteNumérique Docs](https://github.com/suitenumerique/docs), a collaborative note taking, wiki and documentation web platform and alternative to Notion or Outline. Available as [services.lasuite-docs](#opt-services.lasuite-docs.enable).
 
 - [dwl](https://codeberg.org/dwl/dwl), a compact, hackable compositor for Wayland based on wlroots. Available as [programs.dwl](#opt-programs.dwl.enable).
@@ -144,6 +164,8 @@
 
 - [KMinion](https://github.com/redpanda-data/kminion), feature-rich Prometheus exporter for Apache Kafka. Available as [services.prometheus.exporters.kafka](options.html#opt-services.prometheus.exporters.kafka).
 
+- [Beszel](https://beszel.dev), a lightweight server monitoring hub with historical data, docker stats, and alerts. Available as [`services.beszel.agent`](options.html#opt-services.beszel.agent.enable) and [`services.beszel.hub`](options.html#opt-services.beszel.hub.enable).
+
 - [Spoolman](https://github.com/Donkie/Spoolman), a inventory management system for Filament spools. Available as [services.spoolman](#opt-services.spoolman.enable).
 
 - [Temporal](https://temporal.io/), a durable execution platform that enables
@@ -162,6 +184,8 @@
 
 - [Tenstorrent](https://tenstorrent.com) hardware module has been added.
 
+- [nixbit](https://github.com/pbek/nixbit), a GUI application for updating your NixOS system from a Nix Flakes Git repository. Available as [programs.nixbit](#opt-programs.nixbit.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -172,8 +196,15 @@
 
 - `hardware.amdgpu.amdvlk` and the `amdvlk` package have been removed, as they have been deprecated by AMD. These have been replaced with the RADV driver from Mesa, which is enabled by default.
 
+- Linux 5.4 and all its variants have been removed since mainline will reach its end of life within the support-span of 25.11.
+
 - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.
 
+- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
+  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
+
+- `services.parsoid` and the `nodePackages.parsoid` package have been removed, as the JavaScript-based version this module uses is not compatible with modern MediaWiki versions.
+
 - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.
 
 - `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed.
@@ -232,10 +263,14 @@
 
 - The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream.
 
+- `services.nixseparatedebuginfod.enable = true;` has been replaced by `services.nixseparatedebuginfod2.enable = true`. If you only use the official binary cache `https://cache.nixos.org` then no further configuration should be needed. If you have other https substituters, you can add them to `services.nixseparatedebuginfod2.subsituters`. SSH substituters are not supported by nixseparatedebuginfod2. Consider running nixseparatedebuginfod2 on the substituter instead, and pointing to it with the new option `environment.debuginfodServers`.
+
 - The `services.snapserver` module has been migrated to use the settings option and render a configuration file instead of passing every option over the command line.
 
 - The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version.
 
+- `services.journald.gateway.user` and `services.journald.gateway.system` now defaults to `false`. This new behaviour matches the default behaviour of the [`systemd-journal-gatewayd`](https://www.freedesktop.org/software/systemd/man/latest/systemd-journal-gatewayd.service.html) service itself.
+
 - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
 
 - The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
@@ -244,12 +279,20 @@
 
 - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
 
+- The `services.postfixadmin` module has been removed due to a lack of active maintainers.
+
 - `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.
 
 - `netbox-manage` script created by the `netbox` module no longer uses `sudo -u netbox` internally. It can be run as root and will change it's user to `netbox` using `runuser`
 
 - `services.gateone` has been removed as the package was removed such that it does not work.
 
+- `services.quorum` has been removed as the `quorum` package was broken and abandoned upstream.
+
+- `teleport` has been upgraded from major version 17 to major version 18.
+Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)
+and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
+
 - `services.dwm-status.extraConfig` was replaced by [RFC0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant [](#opt-services.dwm-status.settings), which is used to generate the config file. `services.dwm-status.order` is now moved to [](#opt-services.dwm-status.settings.order), as it's a part of the config file.
 
 - `gitversion` was updated to 6.3.0, which includes a number of breaking changes, old configurations may need updating or they will cause the tool to fail to run.
@@ -286,6 +329,8 @@
 
 - `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`
 
+- [`virtualisation.waydroid.package`](#opt-virtualisation.waydroid.package) now defaults to `waydroid-nftables` on systems with nftables enabled.
+
 - [`services.victorialogs.package`](#opt-services.victorialogs.package) now defaults to `victorialogs`, as `victoriametrics` no longer contains the VictoriaLogs binaries.
 
 - The `services.traccar.settings` attribute has been reworked. Instead of the previous flat attribute set the new implementation uses nested attribute sets. You need to update you configuration manually. For instance, `services.traccar.settings.loggerConsole` becomes `services.traccar.settings.logger.console`.
@@ -294,6 +339,8 @@
 
 - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
 
+- The `asterisk-lts` package was changed to v22 from v18. The default `asterisk` package was changed to v22 from v20. Asterisk version 18 has been dropped due to being EOL. The `asterisk-stable` (v20) package was unchanged. You may need to update /var/lib/asterisk to match the template files in `${asterisk-...}/var/lib/asterisk`.
+
 - NixOS display manager modules now strictly use tty1, where many of them previously used tty7. Options to configure display managers' VT have been dropped. A configuration with a display manager enabled will not start `getty@tty1.service`, even if the system is forced to boot into `multi-user.target` instead of `graphical.target`.
 
 - `river` 0.3.x has been renamed to `river-classic` upstream, and the package renamed accordingly. `programs.river` has been renamed to `programs.river-classic`.
@@ -302,6 +349,8 @@
 
 - The systemd target `kbrequest.target` is now unset by default, instead of being forcibly symlinked to `rescue.target`. In case you were relying on this behavior (Alt + ArrowUp on the tty causing the current target to be changed to `rescue.target`), you can restore it by setting `systemd.targets.rescue.aliases = [ "kbrequest.target" ];` in your configuration.
 
+- `miniflux` no longer uses the hstore PostgreSQL extension. Having the extension would prevent Miniflux from starting. In case you are managing your `miniflux` PostgreSQL database externally, disable the extension with `DROP EXTENSION IF EXISTS hstore;`.
+
 ## Other Notable Changes {#sec-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -325,6 +374,8 @@
 
 - `services.dnscrypt-proxy` gains a `package` option to specify dnscrypt-proxy package to use.
 
+- `boot.plymouth` now has a [`package`](#opt-boot.plymouth.package) option to specify the package used in the module.
+
 - `services.limesurvey` now supports nginx as reverse-proxy. Available through [services.limesurvey.webserver](#opt-services.limesurvey.webserver).
 
 - `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.
@@ -342,10 +393,16 @@
 
 - Due to [deprecation of gnome-session X11 support](https://blogs.gnome.org/alatiera/2025/06/08/the-x11-session-removal/), `services.desktopManager.pantheon` now defaults to pantheon-wayland session. The X11 session has been removed, see [this issue](https://github.com/elementary/session-settings/issues/91) for details.
 
-- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module is unmaintained and users are strongly recommended to switch to kernels that support the out-of-tree module.
+- `bcachefs` file systems will now use the out-of-tree module for supported kernels. The in-tree module has been removed, and users will need to switch to kernels that support the out-of-tree module.
+
+- `services.filesender` and the package `filesender` have been removed because they depend on `simplesamlphp`.
 
 - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.
 
+- `services.mattermost` has been updated to use the 10.11 ESR instead of 10.5. While this shouldn't break anyone, we also now package Mattermost 11 as mattermostLatest. Note that Mattermost 11 drops support for MySQL. The Mattermost module will assertion fail if you try to use MySQL with Mattermost 11; support for using MySQL with Mattermost will fully be removed in NixOS 26.
+
+- `simplesamlphp` has been removed since the package was severely outdated, unmaintained in nixpkgs and having known vulnerabilities.
+
 - `networking.wireless.networks.<name>` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this.
 
 - Revamp of the ACME certificate acquisication and renewal process to help scale systems with lots (100+) of certificates.
@@ -399,6 +456,8 @@
 
 - `services.xserver.desktopManager.deepin` and associated packages have been removed due to being unmaintained. See issue [#422090](https://github.com/NixOS/nixpkgs/issues/422090) for more details.
 
+- `services.matter-server` now hosts a debug dashboard on the configured port. Open the port on the firewall with `services.matter-server.openFirewall`.
+
 - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).
   With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.
 
@@ -429,3 +488,5 @@
 - The `open-webui` package's postgres support have been moved to optional dependencies to comply with upstream changes in 0.6.26.
 
 - `prl-tools` has been moved out of `linuxPackages` because Parallels Guest Tools become driverless since 26.1.0.
+
+- `services.opentelemetry-collector` has a new option `validateConfigFile` option that checks the configuration file during build. It is enabled by default if the configuration file is in the Nix store.
diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index 6abfac7b3191..9eb7f8b7e3e8 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -202,7 +202,7 @@ in
     _module.args = {
       hostPkgs =
         # Comment is in nixos/modules/misc/nixpkgs.nix
-        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs.__splicedPackages;
+        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs;
     };
 
     driver = withChecks driver;
diff --git a/nixos/modules/config/getaddrinfo.nix b/nixos/modules/config/getaddrinfo.nix
index f18651a9e031..ddea509bfa78 100644
--- a/nixos/modules/config/getaddrinfo.nix
+++ b/nixos/modules/config/getaddrinfo.nix
@@ -18,7 +18,7 @@ let
     [
       "# Generated by NixOS module networking.getaddrinfo"
       "# Do not edit manually!"
-      "reload ${if cfg.reload then "yes" else "no"}"
+      "reload ${lib.boolToYesNo cfg.reload}"
     ]
     ++ formatTableEntries "label" cfg.label
     ++ formatTableEntries "precedence" cfg.precedence
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 1e6c35a4ea31..196160ee481a 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -12,7 +12,7 @@ let
   ]
   ++ lib.pipe config.i18n.extraLocaleSettings [
     # See description of extraLocaleSettings for why is this ignored here.
-    (lib.filterAttrs (n: v: n != "LANGUAGE"))
+    (x: lib.removeAttrs x [ "LANGUAGE" ])
     (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))
     (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))
   ]
@@ -30,12 +30,12 @@ in
       glibcLocales = lib.mkOption {
         type = lib.types.path;
         default = pkgs.glibcLocales.override {
-          allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
+          allLocales = lib.elem "all" config.i18n.supportedLocales;
           locales = config.i18n.supportedLocales;
         };
         defaultText = lib.literalExpression ''
           pkgs.glibcLocales.override {
-            allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
+            allLocales = lib.elem "all" config.i18n.supportedLocales;
             locales = config.i18n.supportedLocales;
           }
         '';
@@ -149,7 +149,7 @@ in
         (
           !(
             (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ]
-            || lib.any (x: x == "all") config.i18n.supportedLocales
+            || lib.elem "all" config.i18n.supportedLocales
           )
         )
         ''
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 59f1b44483df..0399962418ad 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -30,7 +30,7 @@ let
     mapAttrs'
     mapAttrsToList
     match
-    mkAliasOptionModuleMD
+    mkAliasOptionModule
     mkDefault
     mkIf
     mkMerge
@@ -96,8 +96,8 @@ let
     only one of {option}`hashedPassword`, {option}`password`, or
     {option}`hashedPasswordFile` will be set.
 
-    In a system where [](#opt-systemd.sysusers.enable) is `true`, typically
-    only one of {option}`initialPassword`, {option}`initialHashedPassword`,
+    In a system where [](#opt-systemd.sysusers.enable) or [](#opt-services.userborn.enable) is `true`,
+    typically only one of {option}`initialPassword`, {option}`initialHashedPassword`,
     or {option}`hashedPasswordFile` will be set.
 
     If the option {option}`users.mutableUsers` is true, the password defined
@@ -377,7 +377,7 @@ let
 
         hashedPasswordFile = mkOption {
           type = with types; nullOr str;
-          default = cfg.users.${name}.passwordFile;
+          default = config.passwordFile;
           defaultText = literalExpression "null";
           description = ''
             The full path to a file that contains the hash of the user's
@@ -666,8 +666,8 @@ let
 in
 {
   imports = [
-    (mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
-    (mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ])
+    (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
+    (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
     (mkRenamedOptionModule
       [ "security" "initialRootPassword" ]
       [ "users" "users" "root" "initialHashedPassword" ]
@@ -871,10 +871,11 @@ in
         render.gid = ids.gids.render;
         sgx.gid = ids.gids.sgx;
         shadow.gid = ids.gids.shadow;
+        clock.gid = ids.gids.clock;
       };
 
       system.activationScripts.users =
-        if !config.systemd.sysusers.enable then
+        if !config.systemd.sysusers.enable && !config.services.userborn.enable then
           {
             supportsDryActivation = true;
             text = ''
@@ -925,7 +926,7 @@ in
       # This does not work when the users and groups are created by
       # systemd-sysusers because the users are created too late then.
       system.activationScripts.hashes =
-        if !config.systemd.sysusers.enable then
+        if !config.systemd.sysusers.enable && !config.services.userborn.enable then
           {
             deps = [ "users" ];
             text = ''
@@ -1033,6 +1034,7 @@ in
           cdrom = { };
           tape = { };
           kvm = { };
+          clock = { };
         };
       };
 
diff --git a/nixos/modules/config/vte.nix b/nixos/modules/config/vte.nix
index f7c639b627a0..75ac3bae4be3 100644
--- a/nixos/modules/config/vte.nix
+++ b/nixos/modules/config/vte.nix
@@ -9,7 +9,7 @@ let
   vteInitSnippet = ''
     # Show current working directory in VTE terminals window title.
     # Supports both bash and zsh, requires interactive shell.
-    . ${pkgs.vte.override { gtkVersion = null; }}/etc/profile.d/vte.sh
+    . ${pkgs.vte-gtk4}/etc/profile.d/vte.sh
   '';
 
 in
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index 9fe91fb6896d..2b2905bb2f0c 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ figsoda ]);
+    maintainers = lib.teams.freedesktop.members ++ [ ];
   };
 
   options = {
diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index 0d3163185b98..f3bd58443dc7 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -4,6 +4,15 @@
   ...
 }:
 {
+  imports = [
+    ./disk.nix
+    ./firmware.nix
+    ./keyboard.nix
+    ./networking
+    ./system.nix
+    ./virtualisation.nix
+  ];
+
   meta.maintainers = with lib.maintainers; [ mic92 ];
 
   options.hardware.facter = with lib; {
diff --git a/nixos/modules/hardware/facter/disk.nix b/nixos/modules/hardware/facter/disk.nix
new file mode 100644
index 000000000000..4bb76f16366d
--- /dev/null
+++ b/nixos/modules/hardware/facter/disk.nix
@@ -0,0 +1,28 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+in
+{
+  options.hardware.facter.detected.boot.disk.kernelModules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = lib.uniqueStrings (
+      facterLib.collectDrivers (
+        # A disk might be attached.
+        (report.hardware.firewire_controller or [ ])
+        # definitely important
+        ++ (report.hardware.disk or [ ])
+        ++ (report.hardware.storage_controller or [ ])
+      )
+    );
+    defaultText = "hardware dependent";
+    description = ''
+      List of kernel modules that are needed to access the disk.
+    '';
+  };
+
+  config = {
+    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;
+  };
+}
diff --git a/nixos/modules/hardware/facter/firmware.nix b/nixos/modules/hardware/facter/firmware.nix
new file mode 100644
index 000000000000..10962018890c
--- /dev/null
+++ b/nixos/modules/hardware/facter/firmware.nix
@@ -0,0 +1,24 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+  isBaremetal = config.hardware.facter.detected.virtualisation.none.enable;
+  hasAmdCpu = facterLib.hasAmdCpu report;
+  hasIntelCpu = facterLib.hasIntelCpu report;
+in
+{
+  config = lib.mkIf isBaremetal {
+    # none (e.g. bare-metal)
+    # provide firmware for devices that might not have been detected by nixos-facter
+    hardware.enableRedistributableFirmware = lib.mkDefault true;
+
+    # update microcode
+    hardware.cpu.amd.updateMicrocode = lib.mkIf hasAmdCpu (
+      lib.mkDefault config.hardware.enableRedistributableFirmware
+    );
+    hardware.cpu.intel.updateMicrocode = lib.mkIf hasIntelCpu (
+      lib.mkDefault config.hardware.enableRedistributableFirmware
+    );
+  };
+}
diff --git a/nixos/modules/hardware/facter/keyboard.nix b/nixos/modules/hardware/facter/keyboard.nix
new file mode 100644
index 000000000000..d19e17cd6901
--- /dev/null
+++ b/nixos/modules/hardware/facter/keyboard.nix
@@ -0,0 +1,21 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+in
+{
+  options.hardware.facter.detected.boot.keyboard.kernelModules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.usb_controller or [ ]));
+    defaultText = "hardware dependent";
+    example = [ "usbhid" ];
+    description = ''
+      List of kernel modules to include in the initrd to support the keyboard.
+    '';
+  };
+
+  config = {
+    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules;
+  };
+}
diff --git a/nixos/modules/hardware/facter/lib.nix b/nixos/modules/hardware/facter/lib.nix
new file mode 100644
index 000000000000..099254cbce8d
--- /dev/null
+++ b/nixos/modules/hardware/facter/lib.nix
@@ -0,0 +1,59 @@
+# Internal library functions for hardware.facter modules
+# Eventually we can think about moving this under lib/
+# These are facter-specific helpers for querying nixos-facter reports
+lib:
+let
+
+  inherit (lib) assertMsg;
+
+  # Query if a facter report contains a CPU with the given vendor name
+  hasCpu =
+    name:
+    {
+      hardware ? { },
+      ...
+    }:
+    let
+      cpus = hardware.cpu or [ ];
+    in
+    assert assertMsg (hardware != { }) "no hardware entries found in the report";
+    assert assertMsg (cpus != [ ]) "no cpu entries found in the report";
+    builtins.any (
+      {
+        vendor_name ? null,
+        ...
+      }:
+      assert assertMsg (vendor_name != null) "detail.vendor_name not found in cpu entry";
+      vendor_name == name
+    ) cpus;
+
+  # Extract all driver_modules from a list of hardware entries
+  collectDrivers = list: lib.catAttrs "driver_modules" list;
+
+  # Convert number to zero-padded 4-digit hex string (for USB device IDs)
+  toZeroPaddedHex =
+    n:
+    let
+      hex = lib.toHexString n;
+      len = builtins.stringLength hex;
+    in
+    if len == 1 then
+      "000${hex}"
+    else if len == 2 then
+      "00${hex}"
+    else if len == 3 then
+      "0${hex}"
+    else
+      hex;
+in
+{
+  inherit
+    hasCpu
+    collectDrivers
+    toZeroPaddedHex
+    ;
+
+  hasAmdCpu = hasCpu "AuthenticAMD";
+  hasIntelCpu = hasCpu "GenuineIntel";
+
+}
diff --git a/nixos/modules/hardware/facter/networking/default.nix b/nixos/modules/hardware/facter/networking/default.nix
new file mode 100644
index 000000000000..dfbc54c8396d
--- /dev/null
+++ b/nixos/modules/hardware/facter/networking/default.nix
@@ -0,0 +1,69 @@
+{ config, lib, ... }:
+let
+  # Filter network interfaces from facter report to only those suitable for DHCP
+  physicalInterfaces = lib.filter (
+    iface:
+    # Only include network interfaces suitable for DHCP:
+    # - Ethernet (most common)
+    # - WLAN (WiFi)
+    # - USB-Link (USB network adapters, tethering)
+    # - Network Interface (generic/unknown type)
+    # This implicitly excludes: Loopback, mainframe-specific interfaces (CTC, IUCV, HSI, ESCON)
+    # See: https://github.com/numtide/hwinfo/blob/ea251a74b88dcd53aebdd381194ab43d10fbbd79/src/ids/src/class#L817-L874
+    let
+      validTypes = [
+        "Ethernet"
+        "WLAN"
+        "USB-Link"
+        "Network Interface"
+      ];
+    in
+    lib.elem (iface.sub_class.name or "") validTypes
+  ) (config.hardware.facter.report.hardware.network_interface or [ ]);
+
+  # Extract interface names from unix_device_names
+  detectedInterfaceNames = lib.concatMap (iface: iface.unix_device_names or [ ]) physicalInterfaces;
+
+  # Get the interface names from the configuration (which defaults to detectedInterfaceNames)
+  interfaceNames = config.hardware.facter.detected.dhcp.interfaces;
+
+  # Generate per-interface DHCP config
+  perInterfaceConfig = lib.listToAttrs (
+    lib.map (name: {
+      inherit name;
+      value = {
+        useDHCP = lib.mkDefault true;
+      };
+    }) interfaceNames
+  );
+in
+{
+  imports = [
+    ./initrd.nix
+    ./intel.nix
+  ];
+
+  options.hardware.facter.detected.dhcp = {
+    enable = lib.mkEnableOption "Facter dhcp module" // {
+      default = builtins.length config.hardware.facter.report.hardware.network_interface or [ ] > 0;
+      defaultText = "hardware dependent";
+    };
+
+    interfaces = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = detectedInterfaceNames;
+      defaultText = lib.literalExpression "automatically detected from facter report";
+      description = "List of network interface names to configure with DHCP. Defaults to auto-detected physical interfaces.";
+      example = [
+        "eth0"
+        "wlan0"
+      ];
+    };
+  };
+  config = lib.mkIf config.hardware.facter.detected.dhcp.enable {
+    networking.useDHCP = lib.mkDefault true;
+
+    # Per-interface DHCP configuration
+    networking.interfaces = perInterfaceConfig;
+  };
+}
diff --git a/nixos/modules/hardware/facter/networking/initrd.nix b/nixos/modules/hardware/facter/networking/initrd.nix
new file mode 100644
index 000000000000..56be802b7cd9
--- /dev/null
+++ b/nixos/modules/hardware/facter/networking/initrd.nix
@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+let
+  facterLib = import ../lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+in
+{
+  options.hardware.facter.detected.boot.initrd.networking.kernelModules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.network_controller or [ ]));
+    defaultText = "hardware dependent";
+    description = ''
+      List of kernel modules to include in the initrd to support networking.
+    '';
+  };
+
+  config = lib.mkIf config.boot.initrd.network.enable {
+    boot.initrd.kernelModules = config.hardware.facter.detected.boot.initrd.networking.kernelModules;
+  };
+}
diff --git a/nixos/modules/hardware/facter/networking/intel.nix b/nixos/modules/hardware/facter/networking/intel.nix
new file mode 100644
index 000000000000..4ae693a3c636
--- /dev/null
+++ b/nixos/modules/hardware/facter/networking/intel.nix
@@ -0,0 +1,57 @@
+{ lib, config, ... }:
+let
+  inherit (config.hardware.facter) report;
+  cfg = config.hardware.facter.detected.networking.intel;
+in
+{
+  options.hardware.facter.detected.networking.intel = with lib; {
+    _2200BG.enable = mkEnableOption "the Facter Intel 2200BG module" // {
+
+      default = lib.any (
+        {
+          vendor ? { },
+          device ? { },
+          ...
+        }:
+        # vendor (0x8086) Intel Corp.
+        (vendor.value or 0) == 32902
+        && (lib.elem (device.value or 0) [
+          4163 # 0x1043
+          4175 # 0x104f
+          16928 # 0x4220
+          16929 # 0x4221
+          16931 # 0x4223
+          16932 # 0x4224
+        ])
+      ) (report.hardware.network_controller or [ ]);
+
+      defaultText = "hardware dependent";
+    };
+    _3945ABG.enable = mkEnableOption "the Facter Intel 3945ABG module" // {
+
+      default = lib.any (
+        {
+          vendor ? { },
+          device ? { },
+          ...
+        }:
+        # vendor (0x8086) Intel Corp.
+        (vendor.value or 0) == 32902
+        && (lib.elem (device.value or 0) [
+          16937 # 0x4229
+          16938 # 0x4230
+          16930 # 0x4222
+          16935 # 0x4227
+        ])
+      ) (report.hardware.network_controller or [ ]);
+
+      defaultText = "hardware dependent";
+    };
+  };
+
+  config = {
+    networking.enableIntel2200BGFirmware = lib.mkIf cfg._2200BG.enable (lib.mkDefault true);
+    hardware.enableRedistributableFirmware = lib.mkIf cfg._3945ABG.enable (lib.mkDefault true);
+  };
+
+}
diff --git a/nixos/modules/hardware/facter/system.nix b/nixos/modules/hardware/facter/system.nix
new file mode 100644
index 000000000000..ef51b0e44f1d
--- /dev/null
+++ b/nixos/modules/hardware/facter/system.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  options,
+  lib,
+  ...
+}:
+{
+  # Skip setting hostPlatform if it's read-only
+  nixpkgs =
+    lib.optionalAttrs
+      (config.hardware.facter.report.system or null != null && !options.nixpkgs.hostPlatform.readOnly)
+      {
+        hostPlatform = lib.mkDefault config.hardware.facter.report.system;
+      };
+}
diff --git a/nixos/modules/hardware/facter/virtualisation.nix b/nixos/modules/hardware/facter/virtualisation.nix
new file mode 100644
index 000000000000..15cf6bab5aee
--- /dev/null
+++ b/nixos/modules/hardware/facter/virtualisation.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  config,
+  options,
+  ...
+}:
+let
+  inherit (config.hardware.facter) report;
+  cfg = config.hardware.facter.detected.virtualisation;
+in
+{
+  options.hardware.facter.detected.virtualisation = {
+    virtio_scsi.enable = lib.mkEnableOption "Enable the Facter Virtualisation Virtio SCSI module" // {
+      default = lib.any (
+        { vendor, device, ... }:
+        # vendor (0x1af4) Red Hat, Inc.
+        (vendor.value or 0) == 6900
+        &&
+          # device (0x1004, 0x1048) Virtio SCSI
+          (lib.elem (device.value or 0) [
+            4100
+            4168
+          ])
+      ) (report.hardware.scsi or [ ]);
+      defaultText = "hardware dependent";
+    };
+    oracle.enable = lib.mkEnableOption "Enable the Facter Virtualisation Oracle module" // {
+      default = report.virtualisation or null == "oracle";
+      defaultText = "environment dependent";
+    };
+    parallels.enable = lib.mkEnableOption "Enable the Facter Virtualisation Parallels module" // {
+      default = report.virtualisation or null == "parallels";
+      defaultText = "environment dependent";
+    };
+    qemu.enable = lib.mkEnableOption "Enable the Facter Virtualisation Qemu module" // {
+      default = builtins.elem (report.virtualisation or null) [
+        "qemu"
+        "kvm"
+        "bochs"
+      ];
+      defaultText = "environment dependent";
+    };
+    hyperv.enable = lib.mkEnableOption "Enable the Facter Virtualisation Hyper-V module" // {
+      default = report.virtualisation or null == "microsoft";
+      defaultText = "environment dependent";
+    };
+    # no virtualisation detected
+    none.enable = lib.mkEnableOption "Enable the Facter Virtualisation None module" // {
+      default = report.virtualisation or null == "none";
+      defaultText = "environment dependent";
+    };
+  };
+
+  config = {
+
+    # KVM support
+    boot.kernelModules =
+      let
+        hasCPUFeature =
+          feature: lib.any ({ features, ... }: lib.elem feature features) (report.hardware.cpu or [ ]);
+      in
+      lib.mkMerge [
+        (lib.mkIf (hasCPUFeature "vmx") [ "kvm-intel" ])
+        (lib.mkIf (hasCPUFeature "svm") [ "kvm-amd" ])
+      ];
+
+    # virtio & qemu
+    boot.initrd = {
+      kernelModules = lib.optionals cfg.qemu.enable [
+        "virtio_balloon"
+        "virtio_console"
+        "virtio_rng"
+        "virtio_gpu"
+      ];
+
+      availableKernelModules = lib.mkMerge [
+        (lib.mkIf cfg.qemu.enable [
+          "virtio_net"
+          "virtio_pci"
+          "virtio_mmio"
+          "virtio_blk"
+          "9p"
+          "9pnet_virtio"
+        ])
+        (lib.mkIf cfg.virtio_scsi.enable [
+          "virtio_scsi"
+        ])
+      ];
+    };
+
+    virtualisation = {
+      # oracle
+      virtualbox.guest.enable = lib.mkIf cfg.oracle.enable (lib.mkDefault true);
+      # hyper-v
+      hypervGuest.enable = lib.mkIf cfg.hyperv.enable (lib.mkDefault true);
+    };
+
+    # parallels
+    hardware.parallels.enable = lib.mkIf cfg.parallels.enable (lib.mkDefault true);
+    nixpkgs.config = lib.mkIf (!options.nixpkgs.pkgs.isDefined && cfg.parallels.enable) {
+      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "prl-tools" ];
+    };
+  };
+}
diff --git a/nixos/modules/hardware/keyboard/qmk.nix b/nixos/modules/hardware/keyboard/qmk.nix
index 6690deca3506..b3fb02858b1d 100644
--- a/nixos/modules/hardware/keyboard/qmk.nix
+++ b/nixos/modules/hardware/keyboard/qmk.nix
@@ -8,15 +8,18 @@
 let
   cfg = config.hardware.keyboard.qmk;
   inherit (lib) mkEnableOption mkIf;
-
 in
 {
   options.hardware.keyboard.qmk = {
     enable = mkEnableOption "non-root access to the firmware of QMK keyboards";
+    keychronSupport = mkEnableOption "udev rules for keychron QMK based keyboards";
   };
 
   config = mkIf cfg.enable {
-    services.udev.packages = [ pkgs.qmk-udev-rules ];
+    services.udev.packages = [
+      pkgs.qmk-udev-rules
+    ]
+    ++ lib.optionals cfg.keychronSupport [ pkgs.keychron-udev-rules ];
     users.groups.plugdev = { };
   };
 }
diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
index 8dbfea78a516..23f656579fe6 100644
--- a/nixos/modules/hardware/printers.nix
+++ b/nixos/modules/hardware/printers.nix
@@ -10,7 +10,7 @@ let
   ensurePrinter =
     p:
     let
-      args = lib.cli.toGNUCommandLineShell { } (
+      args = lib.cli.toCommandLineShellGNU { } (
         {
           p = p.name;
           v = p.deviceUri;
diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index 1f276590f9c2..8f892b96438b 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -223,7 +223,7 @@ in
             }
             repartConfig = {
               Type = "esp";
-              Format = "fat";
+              Format = "vfat";
             };
           };
           "20-root" = {
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 76a1517d9dae..60ba783b0466 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -459,6 +459,11 @@ let
             }
           fi
         ''}
+        ${lib.optionalString config.boot.loader.grub.memtest86.enable ''
+          menuentry 'Memtest86+' --class debug {
+            linux (\$root)/boot/memtest.bin ${toString config.boot.loader.grub.memtest86.params}
+          }
+        ''}
         menuentry 'Firmware Setup' --class settings {
           fwsetup
           clear
diff --git a/nixos/modules/installer/cd-dvd/latest-kernel.nix b/nixos/modules/installer/cd-dvd/latest-kernel.nix
index 53b9af38ba0b..20190ebd2531 100644
--- a/nixos/modules/installer/cd-dvd/latest-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/latest-kernel.nix
@@ -2,6 +2,7 @@
 {
   boot.kernelPackages = pkgs.linuxPackages_latest;
   boot.supportedFilesystems.zfs = false;
+  boot.supportedFilesystems.bcachefs = true;
   environment.etc."nixos-generate-config.conf".text = ''
     [Defaults]
     Kernel=latest
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 949531d9a83c..b3cf6a063356 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -690,6 +690,7 @@ in
       rstudio-server = 324;
       localtimed = 325;
       automatic-timezoned = 326;
+      clock = 327;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 092852330437..0980e6f385a2 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -241,7 +241,7 @@ in
         PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}"
         PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}"
         PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}"
-        PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}"
+        PRUNE_BIND_MOUNTS="${lib.boolToYesNo cfg.pruneBindMounts}"
       '';
 
       systemPackages = [ cfg.package ];
@@ -267,7 +267,7 @@ in
         ''
           exec ${cfg.package}/bin/updatedb \
             --output ${toString cfg.output} ${lib.concatStringsSep " " args} \
-            --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \
+            --prune-bind-mounts ${lib.boolToYesNo cfg.pruneBindMounts} \
             ${lib.concatStringsSep " " cfg.extraFlags}
         '';
       serviceConfig = {
diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix
index dc6af4fe9692..50ae6d790789 100644
--- a/nixos/modules/misc/man-db.nix
+++ b/nixos/modules/misc/man-db.nix
@@ -82,6 +82,7 @@ in
           pkgs.runCommand "man-cache"
             {
               nativeBuildInputs = [ buildPackage ];
+              preferLocalBuild = true;
             }
             ''
               echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 07845a4ece8e..12b4a6453449 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -355,7 +355,7 @@ in
         # which is somewhat costly for Nixpkgs. With an explicit priority, we only
         # evaluate the wrapper to find out that the priority is lower, and then we
         # don't need to evaluate `finalPkgs`.
-        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs.__splicedPackages;
+        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs;
     };
 
     assertions =
diff --git a/nixos/modules/misc/nixpkgs/read-only.nix b/nixos/modules/misc/nixpkgs/read-only.nix
index db43615c12f0..fa372d13e545 100644
--- a/nixos/modules/misc/nixpkgs/read-only.nix
+++ b/nixos/modules/misc/nixpkgs/read-only.nix
@@ -63,7 +63,7 @@ in
       # find mistaken definitions
       builtins.seq cfg.config builtins.seq cfg.overlays builtins.seq cfg.hostPlatform builtins.seq
         cfg.buildPlatform
-        cfg.pkgs.__splicedPackages;
+        cfg.pkgs;
     nixpkgs.config = cfg.pkgs.config;
     nixpkgs.overlays = cfg.pkgs.overlays;
     nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform;
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 871244a929c0..2c58f4e2d2e2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -277,6 +277,7 @@
   ./programs/nix-index.nix
   ./programs/nix-ld.nix
   ./programs/nix-required-mounts.nix
+  ./programs/nixbit.nix
   ./programs/nm-applet.nix
   ./programs/nncp.nix
   ./programs/noisetorch.nix
@@ -352,6 +353,7 @@
   ./programs/wayland/uwsm.nix
   ./programs/wayland/waybar.nix
   ./programs/wayland/wayfire.nix
+  ./programs/wayland/wayvnc.nix
   ./programs/weylus.nix
   ./programs/winbox.nix
   ./programs/wireshark.nix
@@ -360,6 +362,7 @@
   ./programs/xfconf.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
+  ./programs/xppen.nix
   ./programs/xss-lock.nix
   ./programs/xwayland.nix
   ./programs/yazi.nix
@@ -397,7 +400,6 @@
   ./security/pam_mount.nix
   ./security/please.nix
   ./security/polkit.nix
-  ./security/rngd.nix
   ./security/rtkit.nix
   ./security/soteria.nix
   ./security/sudo-rs.nix
@@ -567,6 +569,7 @@
   ./services/desktops/gnome/gnome-online-miners.nix
   ./services/desktops/gnome/gnome-remote-desktop.nix
   ./services/desktops/gnome/gnome-settings-daemon.nix
+  ./services/desktops/gnome/gnome-software.nix
   ./services/desktops/gnome/gnome-user-share.nix
   ./services/desktops/gnome/localsearch.nix
   ./services/desktops/gnome/rygel.nix
@@ -599,7 +602,6 @@
   ./services/development/livebook.nix
   ./services/development/lorri.nix
   ./services/development/nixseparatedebuginfod2.nix
-  ./services/development/nixseparatedebuginfod.nix
   ./services/development/rstudio-server/default.nix
   ./services/development/vsmartcard-vpcd.nix
   ./services/development/zammad.nix
@@ -857,6 +859,7 @@
   ./services/misc/heisenbridge.nix
   ./services/misc/homepage-dashboard.nix
   ./services/misc/ihaskell.nix
+  ./services/misc/iio-niri.nix
   ./services/misc/input-remapper.nix
   ./services/misc/invidious-router.nix
   ./services/misc/irkerd.nix
@@ -900,7 +903,6 @@
   ./services/misc/packagekit.nix
   ./services/misc/paisa.nix
   ./services/misc/paperless.nix
-  ./services/misc/parsoid.nix
   ./services/misc/persistent-evdev.nix
   ./services/misc/pghero.nix
   ./services/misc/pinchflat.nix
@@ -924,6 +926,7 @@
   ./services/misc/rkvm.nix
   ./services/misc/rmfakecloud.nix
   ./services/misc/rshim.nix
+  ./services/misc/rsync.nix
   ./services/misc/safeeyes.nix
   ./services/misc/sdrplay.nix
   ./services/misc/servarr/lidarr.nix
@@ -973,6 +976,8 @@
   ./services/monitoring/apcupsd.nix
   ./services/monitoring/arbtt.nix
   ./services/monitoring/below.nix
+  ./services/monitoring/beszel-agent.nix
+  ./services/monitoring/beszel-hub.nix
   ./services/monitoring/bosun.nix
   ./services/monitoring/cadvisor.nix
   ./services/monitoring/certspotter.nix
@@ -987,6 +992,7 @@
   ./services/monitoring/gitwatch.nix
   ./services/monitoring/glances.nix
   ./services/monitoring/glpi-agent.nix
+  ./services/monitoring/go-csp-collector.nix
   ./services/monitoring/goss.nix
   ./services/monitoring/grafana-image-renderer.nix
   ./services/monitoring/grafana-reporter.nix
@@ -1296,6 +1302,7 @@
   ./services/networking/openconnect.nix
   ./services/networking/opengfw.nix
   ./services/networking/openvpn.nix
+  ./services/networking/opkssh/opkssh.nix
   ./services/networking/ostinato.nix
   ./services/networking/owamp.nix
   ./services/networking/pangolin.nix
@@ -1313,7 +1320,6 @@
   ./services/networking/pyload.nix
   ./services/networking/quassel.nix
   ./services/networking/quicktun.nix
-  ./services/networking/quorum.nix
   ./services/networking/r53-ddns.nix
   ./services/networking/radicale.nix
   ./services/networking/radvd.nix
@@ -1454,6 +1460,7 @@
   ./services/security/certmgr.nix
   ./services/security/cfssl.nix
   ./services/security/clamav.nix
+  ./services/security/crowdsec-firewall-bouncer.nix
   ./services/security/crowdsec.nix
   ./services/security/e-imzo.nix
   ./services/security/endlessh-go.nix
@@ -1494,6 +1501,7 @@
   ./services/security/vault-agent.nix
   ./services/security/vault.nix
   ./services/security/vaultwarden/default.nix
+  ./services/security/warpgate.nix
   ./services/security/yubikey-agent.nix
   ./services/system/automatic-timezoned.nix
   ./services/system/bpftune.nix
@@ -1586,7 +1594,6 @@
   ./services/web-apps/fediwall.nix
   ./services/web-apps/fider.nix
   ./services/web-apps/filebrowser.nix
-  ./services/web-apps/filesender.nix
   ./services/web-apps/firefly-iii-data-importer.nix
   ./services/web-apps/firefly-iii.nix
   ./services/web-apps/flarum.nix
@@ -1634,6 +1641,7 @@
   ./services/web-apps/lasuite-docs.nix
   ./services/web-apps/lasuite-meet.nix
   ./services/web-apps/lemmy.nix
+  ./services/web-apps/librespeed.nix
   ./services/web-apps/libretranslate.nix
   ./services/web-apps/limesurvey.nix
   ./services/web-apps/linkwarden.nix
@@ -1671,6 +1679,7 @@
   ./services/web-apps/openvscode-server.nix
   ./services/web-apps/openwebrx.nix
   ./services/web-apps/outline.nix
+  ./services/web-apps/pairdrop.nix
   ./services/web-apps/part-db.nix
   ./services/web-apps/peering-manager.nix
   ./services/web-apps/peertube-runner.nix
@@ -1702,7 +1711,6 @@
   ./services/web-apps/shiori.nix
   ./services/web-apps/sillytavern.nix
   ./services/web-apps/silverbullet.nix
-  ./services/web-apps/simplesamlphp.nix
   ./services/web-apps/slskd.nix
   ./services/web-apps/snipe-it.nix
   ./services/web-apps/snips-sh.nix
diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix
index f840dbbe8a73..cc27e46fcc7d 100644
--- a/nixos/modules/programs/_1password-gui.nix
+++ b/nixos/modules/programs/_1password-gui.nix
@@ -6,9 +6,7 @@
 }:
 
 let
-
   cfg = config.programs._1password-gui;
-
 in
 {
   imports = [
@@ -30,31 +28,32 @@ in
         '';
       };
 
-      package = lib.mkPackageOption pkgs "1Password GUI" {
-        default = [ "_1password-gui" ];
-      };
+      package =
+        lib.mkPackageOption pkgs "1Password GUI" {
+          default = [ "_1password-gui" ];
+        }
+        // {
+          apply =
+            pkg:
+            pkg.override {
+              inherit (cfg) polkitPolicyOwners;
+            };
+        };
     };
   };
 
-  config =
-    let
-      package = cfg.package.override {
-        polkitPolicyOwners = cfg.polkitPolicyOwners;
-      };
-    in
-    lib.mkIf cfg.enable {
-      environment.systemPackages = [ package ];
-      users.groups.onepassword.gid = config.ids.gids.onepassword;
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    users.groups.onepassword.gid = config.ids.gids.onepassword;
 
-      security.wrappers = {
-        "1Password-BrowserSupport" = {
-          source = "${package}/share/1password/1Password-BrowserSupport";
-          owner = "root";
-          group = "onepassword";
-          setuid = false;
-          setgid = true;
-        };
+    security.wrappers = {
+      "1Password-BrowserSupport" = {
+        source = "${cfg.package}/share/1password/1Password-BrowserSupport";
+        owner = "root";
+        group = "onepassword";
+        setuid = false;
+        setgid = true;
       };
-
     };
+  };
 }
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 28182df9cc23..4ae2569049ed 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -16,8 +16,6 @@
         type = lib.types.bool;
         description = ''
           Whether to configure system to use Android Debug Bridge (adb).
-          To grant access to a user, it must be part of adbusers group:
-          `users.users.alice.extraGroups = ["adbusers"];`
         '';
       };
     };
@@ -25,8 +23,6 @@
 
   ###### implementation
   config = lib.mkIf config.programs.adb.enable {
-    services.udev.packages = [ pkgs.android-udev-rules ];
     environment.systemPackages = [ pkgs.android-tools ];
-    users.groups.adbusers = { };
   };
 }
diff --git a/nixos/modules/programs/coolercontrol.nix b/nixos/modules/programs/coolercontrol.nix
index 03aa774ad846..7103526d79b5 100644
--- a/nixos/modules/programs/coolercontrol.nix
+++ b/nixos/modules/programs/coolercontrol.nix
@@ -13,18 +13,16 @@ in
   options = {
     programs.coolercontrol = {
       enable = lib.mkEnableOption "CoolerControl GUI & its background services";
-
-      nvidiaSupport = lib.mkOption {
-        type = lib.types.bool;
-        default = lib.elem "nvidia" config.services.xserver.videoDrivers;
-        defaultText = lib.literalExpression "lib.elem \"nvidia\" config.services.xserver.videoDrivers";
-        description = ''
-          Enable support for Nvidia GPUs.
-        '';
-      };
     };
   };
 
+  imports = [
+    # Added 2025-10-25
+    (lib.mkRemovedOptionModule [ "programs" "coolercontrol" "nvidiaSupport" ] ''
+      This option is deprecated as Nvidia drivers are automatically loaded at runtime.
+    '')
+  ];
+
   ##### implementation
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
@@ -36,29 +34,15 @@ in
 
         systemd = {
           packages = with pkgs.coolercontrol; [
-            coolercontrol-liqctld
             coolercontrold
           ];
 
           # https://github.com/NixOS/nixpkgs/issues/81138
           services = {
-            coolercontrol-liqctld.wantedBy = [ "multi-user.target" ];
             coolercontrold.wantedBy = [ "multi-user.target" ];
           };
         };
       }
-
-      # Nvidia support
-      (lib.mkIf cfg.nvidiaSupport {
-        systemd.services.coolercontrold.path =
-          let
-            nvidiaPkg = config.hardware.nvidia.package;
-          in
-          [
-            nvidiaPkg # nvidia-smi
-            nvidiaPkg.settings # nvidia-settings
-          ];
-      })
     ]
   );
 
diff --git a/nixos/modules/programs/envision.nix b/nixos/modules/programs/envision.nix
index 02f7ba5fdbeb..b31980f03eb8 100644
--- a/nixos/modules/programs/envision.nix
+++ b/nixos/modules/programs/envision.nix
@@ -34,7 +34,6 @@ in
     services.udev = {
       enable = true;
       packages = with pkgs; [
-        android-udev-rules
         xr-hardware
       ];
     };
diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix
index f9da88376ee9..e247ff1a7a33 100644
--- a/nixos/modules/programs/git.nix
+++ b/nixos/modules/programs/git.nix
@@ -115,5 +115,5 @@ in
     })
   ];
 
-  meta.maintainers = with lib.maintainers; [ figsoda ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/programs/kdeconnect.nix b/nixos/modules/programs/kdeconnect.nix
index f51eeb9c6ced..c1029c46b4ce 100644
--- a/nixos/modules/programs/kdeconnect.nix
+++ b/nixos/modules/programs/kdeconnect.nix
@@ -16,6 +16,7 @@
       implementation if you use Gnome
     '';
     package = lib.mkPackageOption pkgs [ "kdePackages" "kdeconnect-kde" ] {
+      nullable = true;
       example = "gnomeExtensions.gsconnect";
     };
   };
@@ -24,7 +25,7 @@
       cfg = config.programs.kdeconnect;
     in
     lib.mkIf cfg.enable {
-      environment.systemPackages = [
+      environment.systemPackages = lib.optionals (cfg.package != null) [
         cfg.package
       ];
       networking.firewall = rec {
diff --git a/nixos/modules/programs/nixbit.nix b/nixos/modules/programs/nixbit.nix
new file mode 100644
index 000000000000..23bc5273409a
--- /dev/null
+++ b/nixos/modules/programs/nixbit.nix
@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+  cfg = config.programs.nixbit;
+in
+{
+  options.programs.nixbit = {
+    enable = mkEnableOption "Nixbit configuration";
+
+    package = mkPackageOption pkgs "nixbit" { };
+
+    repository = mkOption {
+      type = types.str;
+      description = "Git repository URL for Nixbit";
+    };
+
+    forceAutostart = mkEnableOption "" // {
+      description = "Force creation of autostart desktop entry when application starts";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment = {
+      systemPackages = [ cfg.package ];
+
+      etc."nixbit.conf".text =
+        lib.optionalString (cfg.repository != "") ''
+          [Repository]
+          Url = ${cfg.repository}
+        ''
+        + ''
+          [Autostart]
+          Force = ${if cfg.forceAutostart then "true" else "false"}
+        '';
+    };
+  };
+}
diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix
index 71d5c8f0e51d..b8fc8e374936 100644
--- a/nixos/modules/programs/pay-respects.nix
+++ b/nixos/modules/programs/pay-respects.nix
@@ -16,7 +16,7 @@ let
     mkOption
     mkPackageOption
     optionalString
-    replaceChars
+    replaceStrings
     substring
     toLower
     types
@@ -142,7 +142,7 @@ in
               description = "The model used by `pay-respects` to generate command corrections.";
             };
             locale = mkOption {
-              default = toLower (replaceChars [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale));
+              default = toLower (replaceStrings [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale));
               example = "nl-be";
               type = str;
               description = ''
diff --git a/nixos/modules/programs/rust-motd.nix b/nixos/modules/programs/rust-motd.nix
index 994b5a61fb66..40ff445a2f5e 100644
--- a/nixos/modules/programs/rust-motd.nix
+++ b/nixos/modules/programs/rust-motd.nix
@@ -113,7 +113,7 @@ in
       }
     ];
     systemd.services.rust-motd = {
-      path = with pkgs; [ bash ];
+      path = with pkgs; [ bash ] ++ lib.optional (cfg.settings.fail_2_ban or { } != { }) fail2ban;
       documentation = [
         "https://github.com/rust-motd/rust-motd/blob/v${pkgs.rust-motd.version}/README.md"
       ];
diff --git a/nixos/modules/programs/sniffnet.nix b/nixos/modules/programs/sniffnet.nix
index 36c298b84e72..91d56871dac6 100644
--- a/nixos/modules/programs/sniffnet.nix
+++ b/nixos/modules/programs/sniffnet.nix
@@ -25,5 +25,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ figsoda ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 63d2bd865758..508d1961c770 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -339,37 +339,37 @@ in
 
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
-    environment.etc."ssh/ssh_config".text = ''
+    environment.etc."ssh/ssh_config".text = lib.concatStringsSep "\n" (
       # Custom options from `extraConfig`, to override generated options
-      ${cfg.extraConfig}
-
-      # Generated options from other settings
-      Host *
-      ${lib.optionalString cfg.systemd-ssh-proxy.enable ''
+      lib.optional (cfg.extraConfig != "") cfg.extraConfig
+      ++ [
+        ''
+          # Generated options from other settings
+          Host *
+        ''
+      ]
+      ++ lib.optional cfg.systemd-ssh-proxy.enable ''
         # See systemd-ssh-proxy(1)
         Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
-      ''}
-
-      GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
-
-      ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}
-      ${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}
-      ${lib.optionalString (cfg.forwardX11 != null)
-        "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"
-      }
-
-      ${lib.optionalString (
+      ''
+      ++ [
+        "GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}"
+      ]
+      ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"
+      ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"
+      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${lib.boolToYesNo cfg.forwardX11}"
+      ++ lib.optional (
         cfg.pubkeyAcceptedKeyTypes != [ ]
-      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
-      ${lib.optionalString (
+      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"
+      ++ lib.optional (
         cfg.hostKeyAlgorithms != [ ]
-      ) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"}
-      ${lib.optionalString (
+      ) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"
+      ++ lib.optional (
         cfg.kexAlgorithms != null
-      ) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"}
-      ${lib.optionalString (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"}
-      ${lib.optionalString (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"}
-    '';
+      ) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"
+      ++ lib.optional (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"
+      ++ lib.optional (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"
+    );
 
     environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
 
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index a8d1b7aefc70..5a791d0cea0f 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -256,7 +256,16 @@ in
       })
 
       (lib.mkIf cfg.remotePlay.openFirewall {
-        allowedTCPPorts = [ 27036 ];
+        # https://help.steampowered.com/en/faqs/view/3E3D-BE6B-787D-A5D2
+        # https://help.steampowered.com/en/faqs/view/2EA8-4D75-DA21-31EB
+        allowedTCPPorts = [
+          27036
+          27037
+        ];
+        allowedUDPPorts = [
+          10400
+          10401
+        ];
         allowedUDPPortRanges = [
           {
             from = 27031;
diff --git a/nixos/modules/programs/trippy.nix b/nixos/modules/programs/trippy.nix
index 6b906cb58f52..0de14f44cb22 100644
--- a/nixos/modules/programs/trippy.nix
+++ b/nixos/modules/programs/trippy.nix
@@ -25,5 +25,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ figsoda ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix
index cbabccb5d9c9..ee61c2ebad3e 100644
--- a/nixos/modules/programs/wayland/uwsm.nix
+++ b/nixos/modules/programs/wayland/uwsm.nix
@@ -16,7 +16,7 @@ let
         [Desktop Entry]
         Name=${opts.prettyName} (UWSM)
         Comment=${opts.comment}
-        Exec=${lib.getExe cfg.package} start -F ${opts.binPath}
+        Exec=${lib.getExe cfg.package} start -F -- ${opts.binPath} ${lib.strings.escapeShellArgs opts.extraArgs}
         Type=Application
       '';
       destination = "/share/wayland-sessions/${opts.name}-uwsm.desktop";
@@ -84,6 +84,13 @@ in
                 '';
                 example = "/run/current-system/sw/bin/ExampleCompositor";
               };
+              extraArgs = lib.mkOption {
+                type = with lib.types; listOf str;
+                default = [ ];
+                description = ''
+                  Extra command-line arguments pass to to the compsitor.
+                '';
+              };
             };
           }
         )
@@ -117,7 +124,12 @@ in
         name: value:
         mk_uwsm_desktop_entry {
           inherit name;
-          inherit (value) prettyName comment binPath;
+          inherit (value)
+            prettyName
+            comment
+            binPath
+            extraArgs
+            ;
         }
       ) cfg.waylandCompositors;
     };
diff --git a/nixos/modules/programs/wayland/wayvnc.nix b/nixos/modules/programs/wayland/wayvnc.nix
new file mode 100644
index 000000000000..0a19541c098d
--- /dev/null
+++ b/nixos/modules/programs/wayland/wayvnc.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+let
+  cfg = config.programs.wayvnc;
+in
+{
+  options.programs.wayvnc = {
+    enable = lib.mkEnableOption "wayvnc, VNC server for wlroots based Wayland compositors";
+    package = lib.mkPackageOption pkgs "wayvnc" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    # https://github.com/any1/wayvnc/blob/master/src/pam_auth.c
+    security.pam.services.wayvnc = { };
+  };
+
+  meta.maintainers = with lib.maintainers; [ qusic ];
+}
diff --git a/nixos/modules/programs/xppen.nix b/nixos/modules/programs/xppen.nix
new file mode 100644
index 000000000000..e3ce1f7f314f
--- /dev/null
+++ b/nixos/modules/programs/xppen.nix
@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.xppen;
+in
+
+{
+  options.programs.xppen = {
+    enable = lib.mkEnableOption "XPPen PenTablet application";
+    package = lib.mkPackageOption pkgs "xppen_4" {
+      example = "pkgs.xppen_3";
+      extraDescription = ''
+        Use xppen_4 for newer and xppen_3 for older tablets.
+        To check which version of the driver you need, go to
+        https://www.xp-pen.com/download/ then select your tablet
+        and look for the major version in the available files for Linux.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.uinput.enable = true;
+
+    environment.systemPackages = [ cfg.package ];
+
+    services.udev.packages = [ cfg.package ];
+
+    systemd.tmpfiles.rules = [
+      "d /var/lib/pentablet/conf/xppen 0777 - - -"
+    ];
+
+    systemd.services.xppen-create-config-dir = {
+      restartTriggers = [ cfg.package ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        TimeoutSec = 60;
+        ExecStart = pkgs.writeShellScript "xppen-create-config-dir" ''
+          readarray -d "" files < <(find ${cfg.package}/usr/lib/pentablet/conf -type f -print0)
+          for file in "''${files[@]}"; do
+            file_new="/var''${file#${cfg.package + "/usr"}}"
+            if [ ! -f $file_new ]; then
+              install -m 666 "''$file" "''$file_new"
+            fi
+          done
+        '';
+      };
+    };
+  };
+}
diff --git a/nixos/modules/programs/zoom-us.nix b/nixos/modules/programs/zoom-us.nix
index 9d31c8e3086a..f1626849215b 100644
--- a/nixos/modules/programs/zoom-us.nix
+++ b/nixos/modules/programs/zoom-us.nix
@@ -17,7 +17,11 @@
       # configuration elsewhere.
       config.programs.zoom-us.package.override (prev: {
         # Support pulseaudio if it's enabled on the system.
-        pulseaudioSupport = prev.pulseaudioSupport or config.services.pulseaudio.enable;
+        pulseaudioSupport =
+          prev.pulseaudioSupport or (
+            config.services.pulseaudio.enable
+            || (config.services.pipewire.enable && config.services.pipewire.pulse.enable)
+          );
 
         # Support Plasma 6 desktop environment if it's enabled on the system.
         plasma6XdgDesktopPortalSupport =
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a4ed680bd552..d7759c232fea 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib)
-    mkAliasOptionModuleMD
+    mkAliasOptionModule
     mkRemovedOptionModule
     ;
 in
@@ -18,7 +18,7 @@ in
 
     # This alias module can't be where _module.check is defined because it would
     # be added to submodules as well there
-    (mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
+    (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
 
     # Completely removed modules
     (mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]
@@ -228,9 +228,16 @@ in
       "services.morty has been removed from NixOS. As the morty package was unmaintained and removed and searxng, its main consumer, dropped support for it."
     )
     (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [ "services" "nixseparatedebuginfod" ]
+      "Use `services.nixseparatedebuginfod2.enable = true;` instead. If you only use the official binary cache, no additional configuration should be needed."
+    )
     (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
       This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
     '')
+    (mkRemovedOptionModule [ "services" "parsoid" ] ''
+      The Javascript version of Parsoid configured through this module does not work with modern MediaWiki versions,
+      and has been deprecated by upstream, so it has been removed. MediaWiki comes with a new PHP-based parser built-in, so there is no need for this module.
+    '')
     (mkRemovedOptionModule [ "services" "polipo" ] ''
       The polipo project is unmaintained and archived upstream.
     '')
@@ -241,6 +248,9 @@ in
       "services"
       "quagga"
     ] "the corresponding package has been removed from nixpkgs")
+    (mkRemovedOptionModule [ "services" "quorum" ] ''
+      The corresponding package was broken, abandoned upstream and thus removed from nixpkgs.
+    '')
     (mkRemovedOptionModule [
       "services"
       "railcar"
@@ -401,10 +411,22 @@ in
       services.invoiceplane has been removed since the service only supported PHP 8.1 which is EOL
       and removed from nixpkgs.
     '')
+    (mkRemovedOptionModule [ "services" "filesender" ] ''
+      services.filesender has been removed since it depends on simplesamlphp which was severely unmaintained.
+    '')
     (mkRemovedOptionModule [ "services" "postfixadmin" ] ''
       services.postfixadmin has been removed since it was unmaintained in nixpkgs and the version
       available only supported PHP 8.1 which is EOL.
     '')
+    (mkRemovedOptionModule [ "services" "simplesamlphp" ] ''
+      services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.
+    '')
+    (mkRemovedOptionModule [ "security" "rngd" ] ''
+      rngd is not necessary for any device that the kernel recognises
+      as an hardware RNG, as it will automatically run the krngd task
+      to periodically collect random data from the device and mix it
+      into the kernel's RNG.
+    '')
     # Do NOT add any option renames here, see top of the file
   ];
 }
diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 5875d13bf786..d7e9ab7ab162 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -1,4 +1,5 @@
 {
+  options,
   config,
   lib,
   pkgs,
@@ -10,11 +11,6 @@ let
   cfg = config.security.apparmor;
   enabledPolicies = lib.filterAttrs (n: p: p.state != "disable") cfg.policies;
   buildPolicyPath = n: p: lib.defaultTo (pkgs.writeText n p.profile) p.path;
-
-  # Accessing submodule options when not defined results in an error thunk rather than a regular option object
-  # We can emulate the behavior of `<option>.isDefined` by attempting to evaluate it instead
-  # This is required because getting isDefined on a submodule is not possible in global module asserts.
-  submoduleOptionIsDefined = value: (builtins.tryEval value).success;
 in
 
 {
@@ -130,7 +126,9 @@ in
           # which does not recurse into sub-directories.
         }
         {
-          assertion = lib.xor (policyCfg.path != null) (submoduleOptionIsDefined policyCfg.profile);
+          assertion =
+            lib.xor (policyCfg.path != null)
+              options.security.apparmor.policies.valueMeta.attrs.${policyName}.configuration.options.profile.isDefined;
           message = "`security.apparmor.policies.\"${policyName}\"` must define exactly one of either path or profile.";
         }
       ]) cfg.policies
diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix
index 03f8f5df9d5f..92f5aa8d66b2 100644
--- a/nixos/modules/security/apparmor/includes.nix
+++ b/nixos/modules/security/apparmor/includes.nix
@@ -19,7 +19,7 @@ let
           mode ? "r",
           trail ? "",
         }:
-        lib.optionalString (hasAttr path etc) "${mode} ${config.environment.etc.${path}.source}${trail},";
+        lib.optionalString (hasAttr path etc) "${config.environment.etc.${path}.source}${trail} ${mode},";
     in
     if isAttrs arg then go arg else go { path = arg; };
 in
@@ -93,19 +93,19 @@ in
     ];
     "abstractions/base" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/base"
-      r ${pkgs.stdenv.cc.libc}/share/locale/**,
-      r ${pkgs.stdenv.cc.libc}/share/locale.alias,
-      r ${config.i18n.glibcLocales}/lib/locale/locale-archive,
+      ${pkgs.stdenv.cc.libc}/share/locale/** r,
+      ${pkgs.stdenv.cc.libc}/share/locale.alias r,
+      ${config.i18n.glibcLocales}/lib/locale/locale-archive r,
       ${etcRule "localtime"}
-      r ${pkgs.tzdata}/share/zoneinfo/**,
-      r ${pkgs.stdenv.cc.libc}/share/i18n/**,
+      ${pkgs.tzdata}/share/zoneinfo/** r,
+      ${pkgs.stdenv.cc.libc}/share/i18n/** r,
     '';
     "abstractions/bash" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/bash"
 
       # bash inspects filesystems at startup
       # and /etc/mtab is linked to /proc/mounts
-      r @{PROC}/mounts,
+      @{PROC}/mounts r,
 
       # system-wide bash configuration
     ''
@@ -296,8 +296,8 @@ in
       # looking up users by name or id, groups by name or id, hosts by name
       # or IP, etc. These operations may be performed through files, dns,
       # NIS, NIS+, LDAP, hesiod, wins, etc. Allow them all here.
-      mr ${getLib pkgs.nss}/lib/libnss_*.so*,
-      mr ${getLib pkgs.nss}/lib64/libnss_*.so*,
+      ${getLib pkgs.nss}/lib/libnss_*.so* mr,
+      ${getLib pkgs.nss}/lib64/libnss_*.so* mr,
     ''
     + lib.concatMapStringsSep "\n" etcRule [
       "group"
@@ -431,6 +431,13 @@ in
     "abstractions/python" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/python"
     '';
+    "abstractions/golang" = ''
+      # Container-aware GOMAXPROCS
+      owner @{PROC}/@{pid}/mountinfo r,
+      owner @{PROC}/@{pid}/cgroup r,
+      @{sys}/fs/cgroup/**/{cpu.cfs_quota_us,cpu.cfs_period_us} r, # V1
+      @{sys}/fs/cgroup/**/cpu.max r, # V2
+    '';
     "abstractions/qt5" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/qt5"
     ''
@@ -456,11 +463,11 @@ in
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/ssl_certs"
 
       # For the NixOS module: security.acme
-      r /var/lib/acme/*/cert.pem,
-      r /var/lib/acme/*/chain.pem,
-      r /var/lib/acme/*/fullchain.pem,
+      /var/lib/acme/*/cert.pem r,
+      /var/lib/acme/*/chain.pem r,
+      /var/lib/acme/*/fullchain.pem r,
 
-      r /etc/pki/tls/certs/,
+      /etc/pki/tls/certs/ r,
 
     ''
     + lib.concatMapStringsSep "\n" etcRule [
@@ -503,8 +510,8 @@ in
     ];
     "abstractions/ssl_keys" = ''
       # security.acme NixOS module
-      r /var/lib/acme/*/full.pem,
-      r /var/lib/acme/*/key.pem,
+      /var/lib/acme/*/full.pem r,
+      /var/lib/acme/*/key.pem r,
     '';
     "abstractions/vulkan" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/vulkan"
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index bbe22fa6a5bc..f9e7fd6084c1 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -86,7 +86,7 @@ let
   prepareConfigValue =
     v:
     if lib.isBool v then
-      (if v then "yes" else "no")
+      lib.boolToYesNo v
     else if lib.isList v then
       lib.concatStringsSep " " (map prepareConfigValue v)
     else
diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix
index 659499a24258..b470783126e7 100644
--- a/nixos/modules/security/doas.nix
+++ b/nixos/modules/security/doas.nix
@@ -7,8 +7,6 @@
 let
   cfg = config.security.doas;
 
-  inherit (pkgs) doas;
-
   mkUsrString = user: toString user;
 
   mkGrpString = group: ":${toString group}";
@@ -67,6 +65,8 @@ in
       '';
     };
 
+    package = lib.mkPackageOption pkgs "doas" { };
+
     wheelNeedsPassword = lib.mkOption {
       type = with lib.types; bool;
       default = true;
@@ -256,11 +256,11 @@ in
       setuid = true;
       owner = "root";
       group = "root";
-      source = "${doas}/bin/doas";
+      source = lib.getExe cfg.package;
     };
 
     environment.systemPackages = [
-      doas
+      cfg.package
     ];
 
     security.pam.services.doas = {
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index b8ff3ae18856..3734bc89e402 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -6,8 +6,7 @@
 }:
 let
   cfg = config.security.duosec;
-
-  boolToStr = b: if b then "yes" else "no";
+  inherit (lib) boolToYesNo;
 
   configFilePam = ''
     [duo]
@@ -15,15 +14,15 @@ let
     host=${cfg.host}
     ${lib.optionalString (cfg.groups != "") ("groups=" + cfg.groups)}
     failmode=${cfg.failmode}
-    pushinfo=${boolToStr cfg.pushinfo}
-    autopush=${boolToStr cfg.autopush}
+    pushinfo=${boolToYesNo cfg.pushinfo}
+    autopush=${boolToYesNo cfg.autopush}
     prompts=${toString cfg.prompts}
-    fallback_local_ip=${boolToStr cfg.fallbackLocalIP}
+    fallback_local_ip=${boolToYesNo cfg.fallbackLocalIP}
   '';
 
   configFileLogin = configFilePam + ''
-    motd=${boolToStr cfg.motd}
-    accept_env_factor=${boolToStr cfg.acceptEnvFactor}
+    motd=${boolToYesNo cfg.motd}
+    accept_env_factor=${boolToYesNo cfg.acceptEnvFactor}
   '';
 in
 {
diff --git a/nixos/modules/security/ipa.nix b/nixos/modules/security/ipa.nix
index dd01aaf26b21..eded8dd6bcd2 100644
--- a/nixos/modules/security/ipa.nix
+++ b/nixos/modules/security/ipa.nix
@@ -7,7 +7,6 @@
 with lib;
 let
   cfg = config.security.ipa;
-  pyBool = x: if x then "True" else "False";
 
   ldapConf = pkgs.writeText "ldap.conf" ''
     # Turning this off breaks GSSAPI used with krb5 when rdns = false
@@ -236,50 +235,53 @@ in
 
     services.sssd = {
       enable = true;
-      config = ''
-        [domain/${cfg.domain}]
-        id_provider = ipa
-        auth_provider = ipa
-        access_provider = ipa
-        chpass_provider = ipa
+      settings = {
+        "domain/${cfg.domain}" = {
+          id_provider = "ipa";
+          auth_provider = "ipa";
+          access_provider = "ipa";
+          chpass_provider = "ipa";
 
-        ipa_domain = ${cfg.domain}
-        ipa_server = _srv_, ${cfg.server}
-        ipa_hostname = ${cfg.ipaHostname}
+          ipa_domain = cfg.domain;
+          ipa_server = "_srv_, ${cfg.server}";
+          ipa_hostname = cfg.ipaHostname;
 
-        cache_credentials = ${pyBool cfg.cacheCredentials}
-        krb5_store_password_if_offline = ${pyBool cfg.offlinePasswords}
-        ${optionalString ((toLower cfg.domain) != (toLower cfg.realm)) "krb5_realm = ${cfg.realm}"}
+          cache_credentials = cfg.cacheCredentials;
+          krb5_store_password_if_offline = cfg.offlinePasswords;
+          krb5_realm = lib.mkIf ((toLower cfg.domain) != (toLower cfg.realm)) cfg.realm;
 
-        dyndns_update = ${pyBool cfg.dyndns.enable}
-        dyndns_iface = ${cfg.dyndns.interface}
+          dyndns_update = cfg.dyndns.enable;
+          dyndns_iface = cfg.dyndns.interface;
 
-        ldap_tls_cacert = /etc/ipa/ca.crt
-        ldap_user_extra_attrs = mail:mail, sn:sn, givenname:givenname, telephoneNumber:telephoneNumber, lock:nsaccountlock
+          ldap_tls_cacert = "/etc/ipa/ca.crt";
+          ldap_user_extra_attrs = "mail:mail, sn:sn, givenname:givenname, telephoneNumber:telephoneNumber, lock:nsaccountlock";
+        };
 
-        [sssd]
-        services = nss, sudo, pam, ssh, ifp
-        domains = ${cfg.domain}
+        sssd = {
+          services = "nss, sudo, pam, ssh, ifp";
+          domains = cfg.domain;
+        };
 
-        [nss]
-        homedir_substring = /home
+        nss.homedir_substring = "/home";
 
-        [pam]
-        pam_pwd_expiration_warning = 3
-        pam_verbosity = 3
+        pam = {
+          pam_pwd_expiration_warning = 3;
+          pam_verbosity = 3;
+        };
 
-        [sudo]
+        sudo = { };
 
-        [autofs]
+        autofs = { };
 
-        [ssh]
+        ssh = { };
 
-        [pac]
+        pac = { };
 
-        [ifp]
-        user_attributes = +mail, +telephoneNumber, +givenname, +sn, +lock
-        allowed_uids = ${concatStringsSep ", " cfg.ifpAllowedUids}
-      '';
+        ifp = {
+          user_attributes = "+mail, +telephoneNumber, +givenname, +sn, +lock";
+          allowed_uids = concatStringsSep ", " cfg.ifpAllowedUids;
+        };
+      };
     };
 
     networking.timeServers = singleton cfg.server;
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 61b39cb8e2cf..c10449454c50 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -2298,7 +2298,7 @@ in
       ++ lib.optionals config.security.pam.enableFscrypt [ pkgs.fscrypt-experimental ]
       ++ lib.optionals config.security.pam.u2f.enable [ pkgs.pam_u2f ];
 
-    boot.supportedFilesystems = lib.optionals config.security.pam.enableEcryptfs [ "ecryptfs" ];
+    boot.supportedFilesystems = lib.mkIf config.security.pam.enableEcryptfs [ "ecryptfs" ];
 
     security.wrappers = {
       unix_chkpwd = {
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index 62deec4ca487..d6459c2598f9 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -170,9 +170,7 @@ in
           <pam_mount>
           <debug enable="${toString cfg.debugLevel}" />
           <!-- if activated, requires ofl from hxtools to be present -->
-          <logout wait="${toString cfg.logoutWait}" hup="${if cfg.logoutHup then "yes" else "no"}" term="${
-            if cfg.logoutTerm then "yes" else "no"
-          }" kill="${if cfg.logoutKill then "yes" else "no"}" />
+          <logout wait="${toString cfg.logoutWait}" hup="${lib.boolToYesNo cfg.logoutHup}" term="${lib.boolToYesNo cfg.logoutTerm}" kill="${lib.boolToYesNo cfg.logoutKill}" />
           <!-- set PATH variable for pam_mount module -->
           <path>${lib.makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)}</path>
           <!-- create mount point if not present -->
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
deleted file mode 100644
index 63636da4b290..000000000000
--- a/nixos/modules/security/rngd.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, ... }:
-let
-  removed =
-    k:
-    lib.mkRemovedOptionModule [
-      "security"
-      "rngd"
-      k
-    ];
-in
-{
-  imports = [
-    (removed "enable" ''
-      rngd is not necessary for any device that the kernel recognises
-      as an hardware RNG, as it will automatically run the krngd task
-      to periodically collect random data from the device and mix it
-      into the kernel's RNG.
-    '')
-    (removed "debug" "The rngd module was removed, so its debug option does nothing.")
-  ];
-}
diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index a5916f1173b7..f2cd256468da 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -57,10 +57,45 @@ in
     systemd.packages = [ package ];
 
     systemd.services.rtkit-daemon = {
-      serviceConfig.ExecStart = [
-        "" # Resets command from upstream unit.
-        "${package}/libexec/rtkit-daemon ${utils.escapeSystemdExecArgs cfg.args}"
-      ];
+      serviceConfig = {
+        ExecStart = [
+          "" # Resets command from upstream unit.
+          "${package}/libexec/rtkit-daemon ${utils.escapeSystemdExecArgs cfg.args}"
+        ];
+
+        # Needs to verify the user of the processes.
+        PrivateUsers = false;
+        # Needs to access other processes to modify their scheduling modes.
+        ProcSubset = "all";
+        ProtectProc = "default";
+        # Canary needs to be realtime.
+        RestrictRealtime = false;
+
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = "disconnected";
+        ProtectClock = true;
+        ProtectControlGroups = "strict";
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [ "AF_UNIX" ];
+        IPAddressDeny = "any";
+        RestrictNamespaces = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@mount" # Needs chroot(1)
+        ];
+        UMask = "0777";
+      };
     };
 
     users.users.rtkit = {
diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix
index 29eece1ef794..bc05c75669a3 100644
--- a/nixos/modules/security/tpm2.nix
+++ b/nixos/modules/security/tpm2.nix
@@ -39,7 +39,7 @@ let
           ima_log_file = cfg.fapi.imaLogFile;
         }
         // lib.optionalAttrs (cfg.fapi.ekCertLess != null) {
-          ek_cert_less = if cfg.fapi.ekCertLess then "yes" else "no";
+          ek_cert_less = lib.boolToYesNo cfg.fapi.ekCertLess;
         }
         // lib.optionalAttrs (cfg.fapi.ekFingerprint != null) { ek_fingerprint = cfg.fapi.ekFingerprint; }
       )
diff --git a/nixos/modules/services/accessibility/orca.nix b/nixos/modules/services/accessibility/orca.nix
index 3fe205498bfe..2ae7c4514edd 100644
--- a/nixos/modules/services/accessibility/orca.nix
+++ b/nixos/modules/services/accessibility/orca.nix
@@ -20,9 +20,7 @@ in
 
   config = mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ];
-    systemd.services.display-manager = lib.mkIf config.services.displayManager.enable {
-      path = [ cfg.package ];
-    };
+    systemd.packages = [ cfg.package ];
     services.speechd.enable = true;
   };
 }
diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix
index 967853ffc85c..39dab7105968 100644
--- a/nixos/modules/services/audio/mpdscribble.nix
+++ b/nixos/modules/services/audio/mpdscribble.nix
@@ -130,7 +130,7 @@ in
     passwordFile = lib.mkOption {
       default =
         if localMpd then
-          (lib.findFirst (c: lib.any (x: x == "read") c.permissions) {
+          (lib.findFirst (c: lib.elem "read" c.permissions) {
             passwordFile = null;
           } mpdCfg.credentials).passwordFile
         else
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index cc2e603bf3f9..45d8557e609d 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -10,6 +10,7 @@
 
 let
   inherit (lib)
+    boolToYesNo
     concatStringsSep
     literalExpression
     mapAttrsToList
@@ -21,16 +22,15 @@ let
     ;
   libDir = "/var/lib/bacula";
 
-  yes_no = bool: if bool then "yes" else "no";
   tls_conf =
     tls_cfg:
     optionalString tls_cfg.enable (
       concatStringsSep "\n" (
         [ "TLS Enable = yes;" ]
-        ++ optional (tls_cfg.require != null) "TLS Require = ${yes_no tls_cfg.require};"
+        ++ optional (tls_cfg.require != null) "TLS Require = ${boolToYesNo tls_cfg.require};"
         ++ optional (tls_cfg.certificate != null) ''TLS Certificate = "${tls_cfg.certificate}";''
         ++ [ ''TLS Key = "${tls_cfg.key}";'' ]
-        ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${yes_no tls_cfg.verifyPeer};"
+        ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${boolToYesNo tls_cfg.verifyPeer};"
         ++ optional (
           tls_cfg.allowedCN != [ ]
         ) "TLS Allowed CN = ${concatStringsSep " " (tls_cfg.allowedCN)};"
diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 9ab5d0baf8c7..46e7c7c2550a 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -108,9 +108,7 @@ let
       };
     };
 
-  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (
-    mapAttrsToList (n: v: v) cfg.taints
-  );
+  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (attrValues cfg.taints);
 in
 {
   imports = [
@@ -364,7 +362,6 @@ in
         '';
         serviceConfig = {
           Slice = "kubernetes.slice";
-          CPUAccounting = true;
           MemoryAccounting = true;
           Restart = "on-failure";
           RestartSec = "1000ms";
diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix
index a2df04e597d8..cb1020b7eab9 100644
--- a/nixos/modules/services/continuous-integration/github-runner/options.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/options.nix
@@ -187,9 +187,7 @@
             };
 
             package = lib.mkPackageOption pkgs "github-runner" { } // {
-              apply =
-                # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.
-                pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; });
+              apply = pkg: pkg.override { inherit (config) nodeRuntimes; };
             };
 
             ephemeral = lib.mkOption {
diff --git a/nixos/modules/services/continuous-integration/gitlab-runner.nix b/nixos/modules/services/continuous-integration/gitlab-runner.nix
index ed9a10cff6ed..eb305d1e9a19 100644
--- a/nixos/modules/services/continuous-integration/gitlab-runner.nix
+++ b/nixos/modules/services/continuous-integration/gitlab-runner.nix
@@ -275,7 +275,8 @@ in
       type = types.listOf types.package;
       default = [ ];
       description = ''
-        Extra packages to add to PATH for the gitlab-runner process.
+        Extra packages to add to `PATH` for the `gitlab-runner` process.
+        These packages won't be added to the system, use `environment.systemPackages` for that.
       '';
     };
     services = mkOption {
@@ -457,7 +458,7 @@ in
               default = "docker";
               description = ''
                 Select executor, eg. shell, docker, etc.
-                See [runner documentation](https://docs.gitlab.com/runner/executors/README.html) for more information.
+                See [runner executor documentation](https://docs.gitlab.com/runner/executors/) for more information.
               '';
             };
             buildsDir = mkOption {
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index 27b7a5b94db2..2161fc13ea59 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -504,7 +504,7 @@ in
         MAX_HEAP_SIZE = toString cfg.maxHeapSize;
         HEAP_NEWSIZE = toString cfg.heapNewSize;
         MALLOC_ARENA_MAX = toString cfg.mallocArenaMax;
-        LOCAL_JMX = if cfg.remoteJmx then "no" else "yes";
+        LOCAL_JMX = lib.boolToYesNo (!cfg.remoteJmx);
         JMX_PORT = toString cfg.jmxPort;
       };
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix
index 18251d2e4d77..de9371de513a 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixos/modules/services/databases/clickhouse.nix
@@ -6,9 +6,15 @@
 }:
 let
   cfg = config.services.clickhouse;
+  format = pkgs.formats.yaml { };
+
+  serverConfigFile = format.generate "config.yaml" cfg.serverConfig;
+  usersConfigFile = format.generate "users.yaml" cfg.usersConfig;
 in
 {
 
+  meta.maintainers = [ "thevar1able" ];
+
   ###### interface
 
   options = {
@@ -17,7 +23,86 @@ in
 
       enable = lib.mkEnableOption "ClickHouse database server";
 
-      package = lib.mkPackageOption pkgs "clickhouse" { };
+      package = lib.mkPackageOption pkgs "clickhouse" {
+        example = "pkgs.clickhouse-lts";
+      };
+
+      serverConfig = lib.mkOption {
+        type = format.type;
+        default = { };
+        example = lib.literalExpression ''
+          {
+            http_port = 8123;
+            tcp_port = 9000;
+
+            remote_servers = {
+              default = {
+                shard = {
+                  replica = [
+                    { host = "::"; port = "9000"; }
+                    { host = "::"; port = "9001"; }
+                    { host = "::"; port = "9002"; }
+                  ];
+                };
+              };
+            };
+          }
+        '';
+        description = ''
+          Your {file}`config.yaml` as a Nix attribute set.
+          Check the [documentation](https://clickhouse.com/docs/operations/configuration-files)
+          for possible options.
+        '';
+      };
+
+      usersConfig = lib.mkOption {
+        type = format.type;
+        default = { };
+        example = lib.literalExpression ''
+          {
+            profiles = {};
+
+            users = {
+              default = {
+                profile = "default";
+                password_sha256_hex = "36dd292533174299fb0c34665df468bb881756ca9eaf9757d0cfde38f9ededa1";  # `echo -n verysecret | sha256sum`
+              };
+            };
+          }
+        '';
+        description = ''
+          Your {file}`users.yaml` as a Nix attribute set.
+          Check the [documentation](https://clickhouse.com/docs/operations/configuration-files#user-settings)
+          for possible options.
+        '';
+      };
+
+      extraServerConfig = lib.mkOption {
+        type = lib.types.lines;
+        default = "";
+        example = ''
+          <clickhouse>
+            <max_connections>500</max_connections>
+            <keep_alive_timeout>3</keep_alive_timeout>
+          </clickhouse>
+        '';
+        description = "Additional raw XML configuration for ClickHouse server.";
+      };
+
+      extraUsersConfig = lib.mkOption {
+        type = lib.types.lines;
+        default = "";
+        example = ''
+          <clickhouse>
+            <users>
+              <readonly>
+                <profile>readonly</profile>
+              </readonly>
+            </users>
+          </clickhouse>
+        '';
+        description = "Additional raw XML configuration for ClickHouse server.";
+      };
 
     };
 
@@ -40,18 +125,15 @@ in
       description = "ClickHouse server";
 
       wantedBy = [ "multi-user.target" ];
-
       after = [ "network.target" ];
 
       serviceConfig = {
         Type = "notify";
         User = "clickhouse";
         Group = "clickhouse";
-        ConfigurationDirectory = "clickhouse-server";
         AmbientCapabilities = "CAP_SYS_NICE";
         StateDirectory = "clickhouse";
-        LogsDirectory = "clickhouse";
-        ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";
+        ExecStart = "${cfg.package}/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml";
         TimeoutStartSec = "infinity";
       };
 
@@ -69,6 +151,26 @@ in
       "clickhouse-server/users.xml" = {
         source = "${cfg.package}/etc/clickhouse-server/users.xml";
       };
+
+      "clickhouse-server/config.d/100-nixos-module-config.yaml" = lib.mkIf (cfg.serverConfig != { }) {
+        source = serverConfigFile;
+      };
+
+      "clickhouse-server/users.d/100-nixos-module-config.yaml" = lib.mkIf (cfg.usersConfig != { }) {
+        source = usersConfigFile;
+      };
+
+      "clickhouse-server/config.d/200-nixos-module-extra-config.xml" =
+        lib.mkIf (cfg.extraServerConfig != "")
+          {
+            text = cfg.extraServerConfig;
+          };
+
+      "clickhouse-server/users.d/200-nixos-module-extra-config.xml" =
+        lib.mkIf (cfg.extraUsersConfig != "")
+          {
+            text = cfg.extraUsersConfig;
+          };
     };
 
     environment.systemPackages = [ cfg.package ];
diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix
index e21deef91f33..1680965573c9 100644
--- a/nixos/modules/services/databases/lldap.nix
+++ b/nixos/modules/services/databases/lldap.nix
@@ -224,7 +224,7 @@ in
           fi
         ''
         + ''
-          ${lib.getExe cfg.package} run --config-file ${format.generate "lldap_config.toml" cfg.settings}
+          exec ${lib.getExe cfg.package} run --config-file ${format.generate "lldap_config.toml" cfg.settings}
         '';
       serviceConfig = {
         StateDirectory = "lldap";
diff --git a/nixos/modules/services/databases/pgbouncer.nix b/nixos/modules/services/databases/pgbouncer.nix
index 378cbc3f81bb..7aedd0b62085 100644
--- a/nixos/modules/services/databases/pgbouncer.nix
+++ b/nixos/modules/services/databases/pgbouncer.nix
@@ -420,7 +420,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         ExecStart = utils.escapeSystemdExecArgs [
-          (lib.getExe pkgs.pgbouncer)
+          (lib.getExe cfg.package)
           "/etc/${configPath}"
         ];
         RuntimeDirectory = "pgbouncer";
diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index 6b95478c70f2..af10dace3086 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -354,6 +354,60 @@ self: super: {
 }
 ```
 
+You can add a custom PostgreSQL extension to an environment by calling `postgresqlPackages.callPackage` on the derivation.
+In addition to the correct `postgresql` package, `callPackage` will provide additional functions to build those extensions:
+
+- `postgresqlBuildExtension`, extending `mkDerivation` for C and SQL extensions.
+- `buildPgrxExtension`, extending `mkDerivation` for pgrx (Rust) extensions.
+- `postgresqlTestExtension`, a helper to test these extensions on a PostgreSQL instance.
+
+We can define our extension as such:
+
+```nix
+# my-extension.nix
+{
+  postgresql,
+  postgresqlBuildExtension,
+  # other regular mkDerivation arguments
+  fetchFromGitHub,
+}:
+postgresqlBuildExtension (finalAttrs: {
+  pname = "myext";
+  # ...
+  src = fetchFromGitHub {
+    # ...
+  };
+  meta = {
+    platforms = postgresql.meta.platforms;
+    # other meta properties
+  };
+})
+```
+
+We can then build it with `callPackage`, for instance in a NixOS config:
+
+```nix
+{
+  services.postgresql.extensions =
+    ps: with ps; [
+      pg_repack
+      postgis
+      (ps.callPackage ./my-extension.nix { })
+    ];
+}
+```
+Or to include it in a shell environment:
+
+```nix
+{
+  postgresql_custom = self.postgresql_17.withPackages (ps: [
+    ps.pg_repack
+    ps.postgis
+    (ps.callPackage ./my-extension.nix { })
+  ]);
+}
+```
+
 ## Procedural Languages {#module-services-postgres-pls}
 
 PostgreSQL ships the additional procedural languages PL/Perl, PL/Python and PL/Tcl as extensions.
diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix
index 342e1d7e3d5a..4a3e6982b933 100644
--- a/nixos/modules/services/desktop-managers/cosmic.nix
+++ b/nixos/modules/services/desktop-managers/cosmic.nix
@@ -89,10 +89,13 @@ in
           cosmic-screenshot
           cosmic-term
           cosmic-wallpapers
+          glib
           hicolor-icon-theme
+          networkmanagerapplet
           playerctl
           pop-icon-theme
           pop-launcher
+          pulseaudio
           xdg-user-dirs
         ]
         ++ lib.optionals config.services.flatpak.enable [
diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix
index 91f4002e59d7..62b6df1ed4e4 100644
--- a/nixos/modules/services/desktop-managers/gnome.nix
+++ b/nixos/modules/services/desktop-managers/gnome.nix
@@ -297,8 +297,12 @@ in
 
       systemd.packages = [
         pkgs.gnome-flashback
+        pkgs.metacity
+        (pkgs.gnome-panel-with-modules.override {
+          panelModulePackages = cfg.flashback.panelModulePackages;
+        })
       ]
-      ++ map pkgs.gnome-flashback.mkSystemdTargetForWm flashbackWms;
+      ++ map pkgs.gnome-flashback.mkSystemdTargetForWm cfg.flashback.customSessions;
 
       environment.systemPackages = [
         pkgs.gnome-flashback
@@ -311,9 +315,7 @@ in
         wm: pkgs.gnome-flashback.mkWmApplication { inherit (wm) wmName wmLabel wmCommand; }
       ) flashbackWms)
       # For /share/pkgs.gnome-session/sessions/gnome-flashback-${wmName}.session
-      ++ (map (
-        wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel enableGnomePanel; }
-      ) flashbackWms);
+      ++ (map (wm: pkgs.gnome-flashback.mkGnomeSession { inherit (wm) wmName wmLabel; }) flashbackWms);
     })
 
     (lib.mkIf serviceCfg.core-os-services.enable {
@@ -444,38 +446,31 @@ in
 
     # Adapt from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/gnome-48/elements/core/meta-gnome-core-apps.bst
     (lib.mkIf serviceCfg.core-apps.enable {
-      environment.systemPackages = utils.removePackagesByName (
-        [
-          pkgs.baobab
-          pkgs.decibels
-          pkgs.epiphany
-          pkgs.gnome-text-editor
-          pkgs.gnome-calculator
-          pkgs.gnome-calendar
-          pkgs.gnome-characters
-          pkgs.gnome-clocks
-          pkgs.gnome-console
-          pkgs.gnome-contacts
-          pkgs.gnome-font-viewer
-          pkgs.gnome-logs
-          pkgs.gnome-maps
-          pkgs.gnome-music
-          pkgs.gnome-system-monitor
-          pkgs.gnome-weather
-          pkgs.loupe
-          pkgs.nautilus
-          pkgs.gnome-connections
-          pkgs.simple-scan
-          pkgs.snapshot
-          pkgs.totem
-          pkgs.yelp
-        ]
-        ++ lib.optionals config.services.flatpak.enable [
-          # Since PackageKit Nix support is not there yet,
-          # only install gnome-software if flatpak is enabled.
-          pkgs.gnome-software
-        ]
-      ) config.environment.gnome.excludePackages;
+      environment.systemPackages = utils.removePackagesByName [
+        pkgs.baobab
+        pkgs.decibels
+        pkgs.epiphany
+        pkgs.gnome-text-editor
+        pkgs.gnome-calculator
+        pkgs.gnome-calendar
+        pkgs.gnome-characters
+        pkgs.gnome-clocks
+        pkgs.gnome-console
+        pkgs.gnome-contacts
+        pkgs.gnome-font-viewer
+        pkgs.gnome-logs
+        pkgs.gnome-maps
+        pkgs.gnome-music
+        pkgs.gnome-system-monitor
+        pkgs.gnome-weather
+        pkgs.loupe
+        pkgs.nautilus
+        pkgs.gnome-connections
+        pkgs.simple-scan
+        pkgs.snapshot
+        pkgs.totem
+        pkgs.yelp
+      ] config.environment.gnome.excludePackages;
 
       # Enable default program modules
       # Since some of these have a corresponding package, we only
@@ -488,6 +483,12 @@ in
       programs.seahorse.enable = notExcluded pkgs.seahorse;
       services.gnome.sushi.enable = notExcluded pkgs.sushi;
 
+      # Since PackageKit Nix support is not there yet,
+      # only install gnome-software if flatpak is enabled.
+      services.gnome.gnome-software.enable = lib.mkIf config.services.flatpak.enable (
+        notExcluded pkgs.gnome-software
+      );
+
       # VTE shell integration for gnome-console
       programs.bash.vteIntegration = mkDefault true;
       programs.zsh.vteIntegration = mkDefault true;
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 529734bd503f..4dcfecd7746d 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -20,7 +20,7 @@ let
 
   activationScript = ''
     # will be rebuilt automatically
-    rm -fv "$HOME/.cache/ksycoca"*
+    rm -fv "''${XDG_CACHE_HOME:-$HOME/.cache}/ksycoca"*
   '';
 in
 {
@@ -91,6 +91,7 @@ in
           kio-admin # managing files as admin
           kio-extras # stuff for MTP, AFC, etc
           kio-fuse # fuse interface for KIO
+          knighttime # night mode switching daemon
           kpackage # provides kpackagetool tool
           kservice # provides kbuildsycoca6 tool
           kunifiedpush # provides a background service and a KCM
@@ -166,7 +167,6 @@ in
           spectacle
           ffmpegthumbs
           krdp
-          xwaylandvideobridge # exposes Wayland windows to X11 screen capture
         ]
         ++ lib.optionals config.hardware.sensor.iio.enable [
           # This is required for autorotation in Plasma 6
@@ -267,6 +267,7 @@ in
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
     services.libinput.enable = mkDefault true;
+    services.geoclue2.enable = mkDefault true;
 
     # Extra UDEV rules used by Solid
     services.udev.packages = [
diff --git a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
index e0241f02b969..3df01b59738d 100644
--- a/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
+++ b/nixos/modules/services/desktops/gnome/gnome-initial-setup.nix
@@ -77,9 +77,11 @@ in
     ];
 
     systemd.user.targets."gnome-session".wants = [
-      "gnome-initial-setup-copy-worker.service"
       "gnome-initial-setup-first-login.service"
-      "gnome-welcome-tour.service"
+    ];
+
+    systemd.user.targets."graphical-session-pre".wants = [
+      "gnome-initial-setup-copy-worker.service"
     ];
 
     systemd.user.targets."gnome-session@gnome-initial-setup".wants = [
@@ -89,6 +91,11 @@ in
     programs.dconf.profiles.gnome-initial-setup.databases = [
       "${pkgs.gnome-initial-setup}/share/gnome-initial-setup/initial-setup-dconf-defaults"
     ];
+
+    users = {
+      # TODO: switch to using provided gnome-initial-setup sysusers.d
+      groups.gnome-initial-setup = { };
+    };
   };
 
 }
diff --git a/nixos/modules/services/desktops/gnome/gnome-software.nix b/nixos/modules/services/desktops/gnome/gnome-software.nix
new file mode 100644
index 000000000000..ced2549a9e21
--- /dev/null
+++ b/nixos/modules/services/desktops/gnome/gnome-software.nix
@@ -0,0 +1,28 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+{
+  meta = {
+    maintainers = lib.teams.gnome.members;
+  };
+
+  options = {
+    services.gnome.gnome-software = {
+      enable = lib.mkEnableOption "GNOME Software, package manager for GNOME";
+    };
+  };
+
+  config = lib.mkIf config.services.gnome.gnome-software.enable {
+    environment.systemPackages = [
+      pkgs.gnome-software
+    ];
+
+    systemd.packages = [
+      pkgs.gnome-software
+    ];
+  };
+}
diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix
deleted file mode 100644
index db16b052c65f..000000000000
--- a/nixos/modules/services/development/nixseparatedebuginfod.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  cfg = config.services.nixseparatedebuginfod;
-  url = "127.0.0.1:${toString cfg.port}";
-in
-{
-  options = {
-    services.nixseparatedebuginfod = {
-      enable = lib.mkEnableOption "separatedebuginfod, a debuginfod server providing source and debuginfo for nix packages";
-      port = lib.mkOption {
-        description = "port to listen";
-        default = 1949;
-        type = lib.types.port;
-      };
-      nixPackage = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.nix;
-        defaultText = lib.literalExpression "pkgs.nix";
-        description = ''
-          The version of nix that nixseparatedebuginfod should use as client for the nix daemon. It is strongly advised to use nix version >= 2.18, otherwise some debug info may go missing.
-        '';
-      };
-      allowOldNix = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Do not fail evaluation when {option}`services.nixseparatedebuginfod.nixPackage` is older than nix 2.18.
-        '';
-      };
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.allowOldNix || (lib.versionAtLeast cfg.nixPackage.version "2.18");
-        message = "nixseparatedebuginfod works better when `services.nixseparatedebuginfod.nixPackage` is set to nix >= 2.18 (instead of ${cfg.nixPackage.name}). Set `services.nixseparatedebuginfod.allowOldNix` to bypass.";
-      }
-    ];
-
-    systemd.services.nixseparatedebuginfod = {
-      wantedBy = [ "multi-user.target" ];
-      wants = [ "nix-daemon.service" ];
-      after = [ "nix-daemon.service" ];
-      path = [ cfg.nixPackage ];
-      serviceConfig = {
-        ExecStart = [ "${pkgs.nixseparatedebuginfod}/bin/nixseparatedebuginfod -l ${url}" ];
-        Restart = "on-failure";
-        CacheDirectory = "nixseparatedebuginfod";
-        # nix does not like DynamicUsers in allowed-users
-        User = "nixseparatedebuginfod";
-        Group = "nixseparatedebuginfod";
-
-        # hardening
-        # Filesystem stuff
-        ProtectSystem = "strict"; # Prevent writing to most of /
-        ProtectHome = true; # Prevent accessing /home and /root
-        PrivateTmp = true; # Give an own directory under /tmp
-        PrivateDevices = true; # Deny access to most of /dev
-        ProtectKernelTunables = true; # Protect some parts of /sys
-        ProtectControlGroups = true; # Remount cgroups read-only
-        RestrictSUIDSGID = true; # Prevent creating SETUID/SETGID files
-        PrivateMounts = true; # Give an own mount namespace
-        RemoveIPC = true;
-        UMask = "0077";
-
-        # Capabilities
-        CapabilityBoundingSet = ""; # Allow no capabilities at all
-        NoNewPrivileges = true; # Disallow getting more capabilities. This is also implied by other options.
-
-        # Kernel stuff
-        ProtectKernelModules = true; # Prevent loading of kernel modules
-        SystemCallArchitectures = "native"; # Usually no need to disable this
-        ProtectKernelLogs = true; # Prevent access to kernel logs
-        ProtectClock = true; # Prevent setting the RTC
-
-        # Networking
-        RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-
-        # Misc
-        LockPersonality = true; # Prevent change of the personality
-        ProtectHostname = true; # Give an own UTS namespace
-        RestrictRealtime = true; # Prevent switching to RT scheduling
-        MemoryDenyWriteExecute = true; # Maybe disable this for interpreters like python
-        RestrictNamespaces = true;
-      };
-    };
-
-    users.users.nixseparatedebuginfod = {
-      isSystemUser = true;
-      group = "nixseparatedebuginfod";
-    };
-
-    users.groups.nixseparatedebuginfod = { };
-
-    nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") {
-      extra-allowed-users = [ "nixseparatedebuginfod" ];
-    };
-
-    environment.debuginfodServers = [ "http://${url}" ];
-  };
-}
diff --git a/nixos/modules/services/development/nixseparatedebuginfod2.nix b/nixos/modules/services/development/nixseparatedebuginfod2.nix
index 3cea2261ca1a..c9174f61b1be 100644
--- a/nixos/modules/services/development/nixseparatedebuginfod2.nix
+++ b/nixos/modules/services/development/nixseparatedebuginfod2.nix
@@ -10,20 +10,27 @@ let
   url = "127.0.0.1:${toString cfg.port}";
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "nixseparatedebuginfod2" "substituter" ] ''
+      Instead of `services.nixseparatedebuginfod2.substituter = "foo"`, set `services.nixseparatedebuginfod2.substituters = [ "foo" ]` (possibly with mkForce to override the default value).
+    '')
+  ];
   options = {
     services.nixseparatedebuginfod2 = {
       enable = lib.mkEnableOption "nixseparatedebuginfod2, a debuginfod server providing source and debuginfo for nix packages";
       port = lib.mkOption {
         description = "port to listen";
-        default = 1950;
+        default = 1949;
         type = lib.types.port;
       };
       package = lib.mkPackageOption pkgs "nixseparatedebuginfod2" { };
-      substituter = lib.mkOption {
-        description = "nix substituter to fetch debuginfo from. Either http/https substituters, or `local:` to use debuginfo present in the local store.";
-        default = "https://cache.nixos.org";
-        example = "local:";
-        type = lib.types.str;
+      substituters = lib.mkOption {
+        description = "nix substituter to fetch debuginfo from. Either http/https/file substituters, or `local:` to use debuginfo present in the local store.";
+        default = [
+          "local:"
+          "https://cache.nixos.org"
+        ];
+        type = lib.types.listOf lib.types.str;
       };
       cacheExpirationDelay = lib.mkOption {
         description = "keep unused cache entries for this long. A number followed by a unit";
@@ -38,15 +45,19 @@ in
       path = [ config.nix.package ];
       serviceConfig = {
         ExecStart = [
-          (utils.escapeSystemdExecArgs [
-            (lib.getExe cfg.package)
-            "--listen-address"
-            url
-            "--substituter"
-            cfg.substituter
-            "--expiration"
-            cfg.cacheExpirationDelay
-          ])
+          (utils.escapeSystemdExecArgs (
+            [
+              (lib.getExe cfg.package)
+              "--listen-address"
+              url
+              "--expiration"
+              cfg.cacheExpirationDelay
+            ]
+            ++ (lib.lists.concatMap (s: [
+              "--substituter"
+              s
+            ]) cfg.substituters)
+          ))
         ];
         Restart = "on-failure";
         CacheDirectory = "nixseparatedebuginfod2";
diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix
index bdf1822c4816..cd8a168c7347 100644
--- a/nixos/modules/services/display-managers/gdm.nix
+++ b/nixos/modules/services/display-managers/gdm.nix
@@ -183,10 +183,44 @@ in
       name = "gdm";
       uid = config.ids.uids.gdm;
       group = "gdm";
-      home = "/run/gdm";
       description = "GDM user";
     };
 
+    users.users.gdm-greeter = {
+      isSystemUser = true;
+      uid = 60578;
+      group = "gdm";
+      home = "/run/gdm";
+    };
+
+    users.users.gdm-greeter-1 = {
+      isSystemUser = true;
+      uid = 60579;
+      group = "gdm";
+      home = "/run/gdm-1";
+    };
+
+    users.users.gdm-greeter-2 = {
+      isSystemUser = true;
+      uid = 60580;
+      group = "gdm";
+      home = "/run/gdm-2";
+    };
+
+    users.users.gdm-greeter-3 = {
+      isSystemUser = true;
+      uid = 60581;
+      group = "gdm";
+      home = "/run/gdm-3";
+    };
+
+    users.users.gdm-greeter-4 = {
+      isSystemUser = true;
+      uid = 60582;
+      group = "gdm";
+      home = "/run/gdm-4";
+    };
+
     users.groups.gdm.gid = config.ids.gids.gdm;
 
     # GDM needs different xserverArgs, presumable because using wayland by default.
@@ -348,15 +382,15 @@ in
     # GDM LFS PAM modules, adapted somehow to NixOS
     security.pam.services = {
       gdm-launch-environment.text = ''
-        auth     required       pam_succeed_if.so audit quiet_success user = gdm
+        auth     required       pam_succeed_if.so audit quiet_success user ingroup gdm
         auth     optional       pam_permit.so
 
-        account  required       pam_succeed_if.so audit quiet_success user = gdm
+        account  required       pam_succeed_if.so audit quiet_success user ingroup gdm
         account  sufficient     pam_unix.so
 
         password required       pam_deny.so
 
-        session  required       pam_succeed_if.so audit quiet_success user = gdm
+        session  required       pam_succeed_if.so audit quiet_success user ingroup gdm
         session  required       pam_env.so conffile=/etc/pam/environment readenv=0
         session  optional       ${config.systemd.package}/lib/security/pam_systemd.so
         session  optional       pam_keyinit.so force revoke
diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix
index 3dded8ed0624..d9505c440a43 100644
--- a/nixos/modules/services/display-managers/ly.nix
+++ b/nixos/modules/services/display-managers/ly.nix
@@ -65,13 +65,7 @@ in
       package = mkPackageOption pkgs [ "ly" ] { };
 
       settings = mkOption {
-        type =
-          with lib.types;
-          attrsOf (oneOf [
-            str
-            int
-            bool
-          ]);
+        type = with lib.types; attrsOf iniFmt.lib.types.atom;
         default = { };
         example = {
           load = false;
diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix
index 71133248d607..461a96940123 100644
--- a/nixos/modules/services/finance/libeufin/common.nix
+++ b/nixos/modules/services/finance/libeufin/common.nix
@@ -48,7 +48,7 @@ libeufinComponent:
             DynamicUser = true;
             ExecStart =
               let
-                args = lib.cli.toGNUCommandLineShell { } {
+                args = lib.cli.toCommandLineShellGNU { } {
                   c = configFile;
                   L = if cfg.debug then "debug" else null;
                 };
@@ -80,7 +80,7 @@ libeufinComponent:
             initialAccountRegistration = lib.concatMapStringsSep "\n" (
               account:
               let
-                args = lib.cli.toGNUCommandLineShell { } {
+                args = lib.cli.toCommandLineShellGNU { } {
                   c = configFile;
                   inherit (account) username password name;
                   payto_uri = "payto://x-taler-bank/${bankHost}/${account.username}?receiver-name=${account.name}";
@@ -90,7 +90,7 @@ libeufinComponent:
               "${lib.getExe' cfg.package "libeufin-bank"} create-account ${args}"
             ) cfg.initialAccounts;
 
-            args = lib.cli.toGNUCommandLineShell { } {
+            args = lib.cli.toCommandLineShellGNU { } {
               c = configFile;
               L = if cfg.debug then "debug" else null;
             };
diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix
index 43eda28c095e..5412a7a53f9b 100644
--- a/nixos/modules/services/games/factorio.nix
+++ b/nixos/modules/services/games/factorio.nix
@@ -296,6 +296,15 @@ in
           Autosaving on connected Windows clients will be disabled regardless of autosave_only_on_server option.
         '';
       };
+      extraArgs = lib.mkOption {
+        type = lib.types.listOf lib.types.str;
+        default = [ ];
+        example = [
+          "--rcon-bind=localhost:27015"
+          "--rcon-password=..."
+        ];
+        description = "Extra command line arguments.";
+      };
     };
   };
 
@@ -340,6 +349,7 @@ in
           (playerListOption "server-adminlist" cfg.admins)
           (playerListOption "server-whitelist" cfg.allowedPlayers)
           (lib.optionalString (cfg.allowedPlayers != [ ]) "--use-server-whitelist")
+          cfg.extraArgs
         ];
 
         # Sandboxing
diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix
index f6cab16138c0..26b83882c12b 100644
--- a/nixos/modules/services/hardware/buffyboard.nix
+++ b/nixos/modules/services/hardware/buffyboard.nix
@@ -109,6 +109,22 @@ in
               This has a negative performance impact.
             '';
           };
+          options.quirks.ignore_unused_terminals = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = ''
+              If true, buffyboard won't automatically update the layout of a new terminal and
+              draw the keyboard, if the terminal is not opened by any process. In this case
+              SIGUSR1 should be sent to buffyboard to update the layout. This quirk was introduced
+              to resolve a race between buffyboard and systemd-logind according to the following scenario:
+              - A user switches to a new virtual terminal
+              - Buffyboard opens the terminal and changes the number of rows
+              - systemd-logind sees that the terminal is opened by some other process and don't start getty@.service
+
+              The race is resolved by enabling this option and installing a drop-in file
+              for getty@.service that sends SIGUSR1 to buffyboard.
+            '';
+          };
         };
         default = { };
       };
@@ -132,7 +148,6 @@ in
         ))
       ];
       wantedBy = [ "getty.target" ];
-      before = [ "getty.target" ];
     };
   };
 }
diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
index 81ee3fcf5ddd..9a599c4009da 100644
--- a/nixos/modules/services/hardware/handheld-daemon.nix
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
@@ -7,6 +7,10 @@
 with lib;
 let
   cfg = config.services.handheld-daemon;
+  hhdPackage = cfg.package.override {
+    withAdjustor = cfg.adjustor.enable;
+    adjustor = cfg.adjustor.package;
+  };
 in
 {
   options.services.handheld-daemon = {
@@ -18,6 +22,18 @@ in
       package = mkPackageOption pkgs "handheld-daemon-ui" { };
     };
 
+    adjustor = {
+      enable = mkEnableOption "Handheld Daemon TDP control plugin";
+      package = mkPackageOption pkgs "adjustor" { };
+      loadAcpiCallModule = mkOption {
+        type = types.bool;
+        description = ''
+          Whether to load the acpi_call kernel module.
+          Required for TDP control by adjustor on most devices.
+        '';
+      };
+    };
+
     user = mkOption {
       type = types.str;
       description = ''
@@ -28,13 +44,19 @@ in
 
   config = mkIf cfg.enable {
     services.handheld-daemon.ui.enable = mkDefault true;
+    services.handheld-daemon.adjustor.loadAcpiCallModule = mkDefault cfg.adjustor.enable;
     environment.systemPackages = [
-      cfg.package
+      hhdPackage
     ]
     ++ lib.optional cfg.ui.enable cfg.ui.package;
     services.udev.packages = [ cfg.package ];
     systemd.packages = [ cfg.package ];
 
+    boot.kernelModules = mkIf cfg.adjustor.loadAcpiCallModule [ "acpi_call" ];
+    boot.extraModulePackages = mkIf cfg.adjustor.loadAcpiCallModule [
+      config.boot.kernelPackages.acpi_call
+    ];
+
     systemd.services.handheld-daemon = {
       description = "Handheld Daemon";
 
@@ -48,7 +70,7 @@ in
       ];
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} --user ${cfg.user}";
+        ExecStart = "${lib.getExe hhdPackage} --user ${cfg.user}";
         Nice = "-12";
         Restart = "on-failure";
         RestartSec = "10";
@@ -56,5 +78,5 @@ in
     };
   };
 
-  meta.maintainers = [ maintainers.appsforartists ];
+  meta.maintainers = [ maintainers.toast ];
 }
diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index d5d1f23f1d98..daf865252653 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -101,14 +101,12 @@ let
   # removes NixOS special and unused attributes
   sensorToConf =
     { type, query, ... }@args:
-    (lib.filterAttrs (
-      k: v:
-      v != null
-      && !(lib.elem k [
+    (lib.filterAttrs (k: v: v != null) (
+      lib.removeAttrs args [
         "type"
         "query"
-      ])
-    ) args)
+      ]
+    ))
     // {
       "${type}" = query;
     };
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index ca9464d091c1..2a76e1a8b26f 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -156,7 +156,7 @@ let
 
         # Verify all the udev rules
         echo "Verifying udev rules using udevadm verify..."
-        udevadm verify --resolve-names=never --no-style $out
+        udevadm verify --resolve-names=late --no-style $out
         echo "OK"
 
         # If auto-configuration is disabled, then remove
@@ -179,7 +179,8 @@ let
         for i in $packages; do
           echo "Adding hwdb files for package $i"
           for j in $i/{etc,lib}/udev/hwdb.d/*; do
-            ln -s $j etc/udev/hwdb.d/$(basename $j)
+            # This must be a copy, not a symlink, because --root below will chase links within the root argument.
+            cp $j etc/udev/hwdb.d/$(basename $j)
           done
         done
 
@@ -461,6 +462,7 @@ in
       "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"
       "${config.boot.initrd.systemd.package}/lib/udev/ata_id"
       "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"
+      "${config.boot.initrd.systemd.package}/lib/udev/dmi_memory_id"
       "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"
       "${config.boot.initrd.systemd.package}/lib/udev/rules.d"
     ]
diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index cbde9ca600d0..02edf5c8c259 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -25,7 +25,7 @@ in
 
       enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
 
-      package = lib.mkPackageOption pkgs "udisks2" { };
+      package = lib.mkPackageOption pkgs "udisks" { };
 
       mountOnMedia = lib.mkOption {
         type = lib.types.bool;
diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix
index 5a8ad9806ef1..dd020181a6fe 100644
--- a/nixos/modules/services/hardware/undervolt.nix
+++ b/nixos/modules/services/hardware/undervolt.nix
@@ -16,7 +16,7 @@ let
         limit != null && window != null
       ) "Both power limit and window must be set";
       "${toString limit} ${toString window}";
-  cliArgs = lib.cli.toGNUCommandLine { } {
+  cliArgs = lib.cli.toCommandLineGNU { } {
     inherit (cfg)
       verbose
       temp
diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix
index 3b98408ec9cc..7ee7d0751303 100644
--- a/nixos/modules/services/home-automation/ebusd.nix
+++ b/nixos/modules/services/home-automation/ebusd.nix
@@ -170,7 +170,7 @@ in
         serviceConfig = {
           ExecStart =
             let
-              args = lib.cli.toGNUCommandLineShell { optionValueSeparator = "="; } (
+              args = lib.cli.toCommandLineShellGNU { } (
                 lib.foldr (a: b: a // b) { } [
                   {
                     inherit (cfg)
diff --git a/nixos/modules/services/home-automation/matter-server.nix b/nixos/modules/services/home-automation/matter-server.nix
index a0ff6ad33490..8231d108d135 100644
--- a/nixos/modules/services/home-automation/matter-server.nix
+++ b/nixos/modules/services/home-automation/matter-server.nix
@@ -25,6 +25,12 @@ in
       description = "Port to expose the matter-server service on.";
     };
 
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Whether to open the port in the firewall.";
+    };
+
     logLevel = lib.mkOption {
       type = lib.types.enum [
         "critical"
@@ -48,6 +54,8 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
+
     systemd.services.matter-server = {
       after = [ "network-online.target" ];
       before = [ "home-assistant.service" ];
diff --git a/nixos/modules/services/home-automation/wyoming/openwakeword.nix b/nixos/modules/services/home-automation/wyoming/openwakeword.nix
index 1b4e932c7b0f..cedca3e7330d 100644
--- a/nixos/modules/services/home-automation/wyoming/openwakeword.nix
+++ b/nixos/modules/services/home-automation/wyoming/openwakeword.nix
@@ -15,6 +15,7 @@ let
     mkEnableOption
     mkIf
     mkPackageOption
+    mkRemovedOptionModule
     types
     ;
 
@@ -28,8 +29,17 @@ let
 in
 
 {
+  imports = [
+    (mkRemovedOptionModule [
+      "services"
+      "wymoing"
+      "openwakeword"
+      "preLoadModels"
+    ] "Passing a list of models to preload was removed in wyoming-openwakeword 2.0")
+  ];
+
   options.services.wyoming.openwakeword = with types; {
-    enable = mkEnableOption "Wyoming openWakeWord server";
+    enable = mkEnableOption "Wyoming protocol server for openWakeWord wake word detection system";
 
     package = mkPackageOption pkgs "wyoming-openwakeword" { };
 
@@ -50,24 +60,6 @@ in
       '';
     };
 
-    preloadModels = mkOption {
-      type = listOf str;
-      default = [
-        "ok_nabu"
-      ];
-      example = [
-        # wyoming_openwakeword/models/*.tflite
-        "alexa"
-        "hey_jarvis"
-        "hey_mycroft"
-        "hey_rhasspy"
-        "ok_nabu"
-      ];
-      description = ''
-        List of wake word models to preload after startup.
-      '';
-    };
-
     threshold = mkOption {
       type = numbers.between 0.0 1.0;
       default = 0.5;
@@ -91,6 +83,16 @@ in
       apply = toString;
     };
 
+    refractorySeconds = mkOption {
+      type = either int float;
+      default = 2;
+      example = 1.5;
+      description = ''
+        Duration in seconds before a wake word can be detected again.
+      '';
+      apply = toString;
+    };
+
     extraArgs = mkOption {
       type = listOf str;
       default = [ ];
@@ -125,11 +127,9 @@ in
             cfg.threshold
             "--trigger-level"
             cfg.triggerLevel
+            "--refractory-seconds"
+            cfg.refractorySeconds
           ]
-          ++ (concatMap (model: [
-            "--preload-model"
-            model
-          ]) cfg.preloadModels)
           ++ (concatMap (dir: [
             "--custom-model-dir"
             (toString dir)
diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix
index 3ffd74451b6c..9ee7cf8ee44b 100644
--- a/nixos/modules/services/mail/cyrus-imap.nix
+++ b/nixos/modules/services/mail/cyrus-imap.nix
@@ -15,6 +15,7 @@ let
     optionalString
     generators
     mapAttrsToList
+    boolToYesNo
     ;
   inherit (lib.strings) concatStringsSep;
   inherit (lib.types)
@@ -63,7 +64,7 @@ let
         mkValueString =
           v:
           if builtins.isBool v then
-            if v then "yes" else "no"
+            boolToYesNo v
           else if builtins.isList v then
             concatStringsSep " " v
           else
diff --git a/nixos/modules/services/mail/mailpit.nix b/nixos/modules/services/mail/mailpit.nix
index 6bc368e91f5f..c3b888f15c9b 100644
--- a/nixos/modules/services/mail/mailpit.nix
+++ b/nixos/modules/services/mail/mailpit.nix
@@ -22,7 +22,7 @@ let
 
   isNonNull = v: v != null;
   genCliFlags =
-    settings: concatStringsSep " " (cli.toGNUCommandLine { } (filterAttrs (const isNonNull) settings));
+    settings: concatStringsSep " " (cli.toCommandLineGNU { } (filterAttrs (const isNonNull) settings));
 in
 {
   options.services.mailpit.instances = mkOption {
diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index e9b8a733ab53..a42c43fc4a48 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -8,7 +8,6 @@
 let
   inherit (lib)
     hasPrefix
-    literalExpression
     mkEnableOption
     mkIf
     mkMerge
@@ -143,7 +142,7 @@ in
               else
                 "inet:${cfg.settings.server.address}";
           in
-          [ "socketmap:${address}:QUERYwithTLSRPT" ];
+          [ "socketmap:${address}:${if config.services.tlsrpt.enable then "QUERYwithTLSRPT" else "QUERY"}" ];
       };
 
       systemd.services.postfix = {
diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 9715c8645dc3..bdfc53c83767 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -1243,7 +1243,7 @@ in
       "services.postfix.relayPort was removed in favor of services.postfix.settings.main.relayhost, which now takes a list of host:port."
     )
     (lib.mkRemovedOptionModule [ "services" "postfix" "extraConfig" ]
-      "services.postfix.extraConfig was replaced by the structured freeform service.postfix.settings.main option."
+      "services.postfix.extraConfig was replaced by the structured freeform services.postfix.settings.main option."
     )
     (lib.mkRenamedOptionModule
       [ "services" "postfix" "networks" ]
diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix
index 0933d2dd535d..353db2e2207c 100644
--- a/nixos/modules/services/mail/public-inbox.nix
+++ b/nixos/modules/services/mail/public-inbox.nix
@@ -403,7 +403,7 @@ in
       }
     ];
     services.public-inbox.settings = filterAttrsRecursive (n: v: v != null) {
-      publicinbox = mapAttrs (n: filterAttrs (n: v: n != "description")) cfg.inboxes;
+      publicinbox = mapAttrs (n: v: removeAttrs v [ "description" ]) cfg.inboxes;
     };
     users = {
       users.public-inbox = {
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 5b09cfb217fb..715376e24f88 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -211,9 +211,7 @@ let
         ''
           worker "${value.type}" {
             type = "${value.type}";
-            ${optionalString (value.enable != null)
-              "enabled = ${if value.enable != false then "yes" else "no"};"
-            }
+            ${optionalString (value.enable != null) "enabled = ${lib.boolToYesNo (value.enable != false)};"}
             ${mkBindSockets value.enable value.bindSockets}
             ${optionalString (value.count != null) "count = ${toString value.count};"}
             ${concatStringsSep "\n  " (map (each: ".include \"${each}\"") value.includes)}
diff --git a/nixos/modules/services/mail/tlsrpt.nix b/nixos/modules/services/mail/tlsrpt.nix
index 843e1477d7e0..52ed3793309d 100644
--- a/nixos/modules/services/mail/tlsrpt.nix
+++ b/nixos/modules/services/mail/tlsrpt.nix
@@ -9,6 +9,7 @@ let
   inherit (lib)
     mkEnableOption
     mkIf
+    mkMerge
     mkOption
     mkPackageOption
     types
@@ -59,8 +60,6 @@ let
   reportdConfigFile = format.generate "tlsrpt-reportd.cfg" {
     tlsrpt_reportd = dropNullValues cfg.reportd.settings;
   };
-
-  withPostfix = config.services.postfix.enable && cfg.configurePostfix;
 in
 
 {
@@ -286,71 +285,83 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
-    environment.etc = {
-      "tlsrpt/collectd.cfg".source = collectdConfigFile;
-      "tlsrpt/fetcher.cfg".source = fetcherConfigFile;
-      "tlsrpt/reportd.cfg".source = reportdConfigFile;
-    };
+  config = mkMerge [
+    (mkIf (cfg.enable && config.services.postfix.enable && cfg.configurePostfix) {
+      users.users.postfix.extraGroups = [
+        "tlsrpt"
+      ];
 
-    users.users.tlsrpt = {
-      isSystemUser = true;
-      group = "tlsrpt";
-    };
-    users.groups.tlsrpt = { };
-
-    users.users.postfix.extraGroups = lib.mkIf withPostfix [
-      "tlsrpt"
-    ];
-
-    systemd.services.tlsrpt-collectd = {
-      description = "TLSRPT datagram collector";
-      documentation = [ "man:tlsrpt-collectd(1)" ];
-
-      wantedBy = [ "multi-user.target" ];
-
-      restartTriggers = [ collectdConfigFile ];
-
-      serviceConfig = commonServiceSettings // {
-        ExecStart = toString (
-          [
-            (lib.getExe' cfg.package "tlsrpt-collectd")
-          ]
-          ++ cfg.collectd.extraFlags
-        );
-        IPAddressDeny = "any";
-        PrivateNetwork = true;
-        RestrictAddressFamilies = [ "AF_UNIX" ];
-        RuntimeDirectory = "tlsrpt";
-        RuntimeDirectoryMode = "0750";
-        UMask = "0157";
+      services.postfix.settings.main = {
+        smtp_tlsrpt_enable = true;
+        smtp_tlsrpt_socket_name = cfg.collectd.settings.socketname;
       };
-    };
 
-    systemd.services.tlsrpt-reportd = {
-      description = "TLSRPT report generator";
-      documentation = [ "man:tlsrpt-reportd(1)" ];
-
-      wantedBy = [ "multi-user.target" ];
-
-      restartTriggers = [ reportdConfigFile ];
-
-      serviceConfig = commonServiceSettings // {
-        ExecStart = toString (
-          [
-            (lib.getExe' cfg.package "tlsrpt-reportd")
-          ]
-          ++ cfg.reportd.extraFlags
-        );
-        RestrictAddressFamilies = [
-          "AF_INET"
-          "AF_INET6"
-          "AF_NETLINK"
-        ];
-        ReadWritePaths = lib.optionals withPostfix [ "/var/lib/postfix/queue/maildrop" ];
-        SupplementaryGroups = lib.optionals withPostfix [ "postdrop" ];
-        UMask = "0077";
+      systemd.services.tlsrpt-reportd.serviceConfig = {
+        ReadWritePaths = [ "/var/lib/postfix/queue/maildrop" ];
+        SupplementaryGroups = [ "postdrop" ];
       };
-    };
-  };
+    })
+
+    (mkIf cfg.enable {
+      environment.etc = {
+        "tlsrpt/collectd.cfg".source = collectdConfigFile;
+        "tlsrpt/fetcher.cfg".source = fetcherConfigFile;
+        "tlsrpt/reportd.cfg".source = reportdConfigFile;
+      };
+
+      users.users.tlsrpt = {
+        isSystemUser = true;
+        group = "tlsrpt";
+      };
+      users.groups.tlsrpt = { };
+
+      systemd.services.tlsrpt-collectd = {
+        description = "TLSRPT datagram collector";
+        documentation = [ "man:tlsrpt-collectd(1)" ];
+
+        wantedBy = [ "multi-user.target" ];
+
+        restartTriggers = [ collectdConfigFile ];
+
+        serviceConfig = commonServiceSettings // {
+          ExecStart = toString (
+            [
+              (lib.getExe' cfg.package "tlsrpt-collectd")
+            ]
+            ++ cfg.collectd.extraFlags
+          );
+          IPAddressDeny = "any";
+          PrivateNetwork = true;
+          RestrictAddressFamilies = [ "AF_UNIX" ];
+          RuntimeDirectory = "tlsrpt";
+          RuntimeDirectoryMode = "0750";
+          UMask = "0157";
+        };
+      };
+
+      systemd.services.tlsrpt-reportd = {
+        description = "TLSRPT report generator";
+        documentation = [ "man:tlsrpt-reportd(1)" ];
+
+        wantedBy = [ "multi-user.target" ];
+
+        restartTriggers = [ reportdConfigFile ];
+
+        serviceConfig = commonServiceSettings // {
+          ExecStart = toString (
+            [
+              (lib.getExe' cfg.package "tlsrpt-reportd")
+            ]
+            ++ cfg.reportd.extraFlags
+          );
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_NETLINK"
+          ];
+          UMask = "0077";
+        };
+      };
+    })
+  ];
 }
diff --git a/nixos/modules/services/matrix/synapse-auto-compressor.nix b/nixos/modules/services/matrix/synapse-auto-compressor.nix
index 54838328e80d..3c91e3873b00 100644
--- a/nixos/modules/services/matrix/synapse-auto-compressor.nix
+++ b/nixos/modules/services/matrix/synapse-auto-compressor.nix
@@ -30,7 +30,7 @@ in
   options = {
     services.synapse-auto-compressor = {
       enable = lib.mkEnableOption "synapse-auto-compressor";
-      package = lib.mkPackageOption pkgs "rust-synapse-state-compress" { };
+      package = lib.mkPackageOption pkgs "rust-synapse-compress-state" { };
       postgresUrl = lib.mkOption {
         default =
           let
diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index a940d5a866b9..ec5cf8aee8dd 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -3,6 +3,7 @@
   lib,
   options,
   pkgs,
+  utils,
   ...
 }:
 
@@ -1297,6 +1298,15 @@ in
           '';
         };
 
+        extraArgs = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          example = [ "--no-secrets-in-config" ];
+          description = ''
+            Extra command lines argument that are passed to synapse and workers.
+          '';
+        };
+
         extraConfigFiles = mkOption {
           type = types.listOf types.path;
           default = [ ];
@@ -1541,7 +1551,8 @@ in
                         ]
                         ++ cfg.extraConfigFiles
                       )}
-                      --keys-directory ${cfg.dataDir}
+                      --keys-directory ${cfg.dataDir} \
+                      ${utils.escapeSystemdExecArgs cfg.extraArgs}
                   '';
                 };
               }
@@ -1574,7 +1585,8 @@ in
                   ${concatMapStringsSep "\n  " (x: "--config-path ${x} \\") (
                     [ configFile ] ++ cfg.extraConfigFiles
                   )}
-                  --keys-directory ${cfg.dataDir}
+                  --keys-directory ${cfg.dataDir} \
+                  ${utils.escapeSystemdExecArgs cfg.extraArgs}
               '';
             };
           }
diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix
index 7bf801c6a4f5..64b356daae00 100644
--- a/nixos/modules/services/misc/devmon.nix
+++ b/nixos/modules/services/misc/devmon.nix
@@ -22,7 +22,7 @@ in
       path = [
         pkgs.udevil
         pkgs.procps
-        pkgs.udisks2
+        pkgs.udisks
         pkgs.which
       ];
       serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 2c2a59052d1b..f4abe2c8bf86 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -48,7 +48,7 @@ in
   options.services.dockerRegistry = {
     enable = lib.mkEnableOption "Docker Registry";
 
-    package = lib.mkPackageOption pkgs "docker-distribution" {
+    package = lib.mkPackageOption pkgs "distribution" {
       example = "gitlab-container-registry";
     };
 
diff --git a/nixos/modules/services/misc/forgejo.nix b/nixos/modules/services/misc/forgejo.nix
index 0b49cb6d726d..ceee3e080eb5 100644
--- a/nixos/modules/services/misc/forgejo.nix
+++ b/nixos/modules/services/misc/forgejo.nix
@@ -285,6 +285,19 @@ in
           description = "Filename to be used for the dump. If `null` a default name is chosen by forgejo.";
           example = "forgejo-dump";
         };
+
+        age = mkOption {
+          type = types.str;
+          default = "4w";
+          example = "5d";
+          description = ''
+            Age of backup used to decide what files to delete when cleaning.
+            If a file or directory is older than the current time minus the age field, it is deleted.
+
+            The format is described in
+            {manpage}`tmpfiles.d(5)`.
+          '';
+        };
       };
 
       lfs = {
@@ -596,7 +609,7 @@ in
     };
 
     systemd.tmpfiles.rules = [
-      "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
+      "d '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} ${cfg.dump.age} -"
       "z '${cfg.dump.backupDir}' 0750 ${cfg.user} ${cfg.group} - -"
       "d '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
       "z '${cfg.repositoryRoot}' 0750 ${cfg.user} ${cfg.group} - -"
diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix
index 85f3d2fa94a9..518a9c4f0065 100644
--- a/nixos/modules/services/misc/gammu-smsd.nix
+++ b/nixos/modules/services/misc/gammu-smsd.nix
@@ -11,7 +11,7 @@ let
     [gammu]
     Device = ${cfg.device.path}
     Connection = ${cfg.device.connection}
-    SynchronizeTime = ${if cfg.device.synchronizeTime then "yes" else "no"}
+    SynchronizeTime = ${lib.boolToYesNo cfg.device.synchronizeTime}
     LogFormat = ${cfg.log.format}
     ${lib.optionalString (cfg.device.pin != null) "PIN = ${cfg.device.pin}"}
     ${cfg.extraConfig.gammu}
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 127a7e73e83e..f0c21379ee3c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -588,12 +588,12 @@ in
             if versionAtLeast config.system.stateVersion "23.11" then
               pkgs.gitlab-container-registry
             else
-              pkgs.docker-distribution;
-          defaultText = literalExpression "pkgs.docker-distribution";
+              pkgs.distribution;
+          defaultText = literalExpression "pkgs.distribution";
           description = ''
             Container registry package to use.
 
-            External container registries such as `pkgs.docker-distribution` are not supported
+            External container registries such as `pkgs.distribution` are not supported
             anymore since GitLab 16.0.0.
           '';
         };
@@ -1179,7 +1179,7 @@ in
         (
           cfg.registry.enable
           && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0"
-          && cfg.registry.package == pkgs.docker-distribution
+          && cfg.registry.package == pkgs.distribution
         )
         ''
           Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
diff --git a/nixos/modules/services/misc/iio-niri.nix b/nixos/modules/services/misc/iio-niri.nix
new file mode 100644
index 000000000000..2c2810b0ee0f
--- /dev/null
+++ b/nixos/modules/services/misc/iio-niri.nix
@@ -0,0 +1,59 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    types
+    mkIf
+    getExe
+    escapeShellArgs
+    mkDefault
+    ;
+  cfg = config.services.iio-niri;
+in
+{
+  options.services.iio-niri = {
+    enable = mkEnableOption "IIO-Niri";
+
+    package = mkPackageOption pkgs "iio-niri" { };
+
+    niriUnit = mkOption {
+      type = types.nonEmptyStr;
+      default = "niri.service";
+      description = "The Niri **user** service unit to bind IIO-Niri's **user** service unit to.";
+    };
+
+    extraArgs = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Extra arguments to pass to IIO-Niri.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    hardware.sensor.iio.enable = mkDefault true;
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.user.services.iio-niri = {
+      description = "IIO-Niri";
+      wantedBy = [ cfg.niriUnit ];
+      bindsTo = [ cfg.niriUnit ];
+      partOf = [ cfg.niriUnit ];
+      after = [ cfg.niriUnit ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${getExe cfg.package} ${escapeShellArgs cfg.extraArgs}";
+        Restart = "on-failure";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ zhaithizaliel ];
+}
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index eac446817ae7..1b92947db696 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -12,7 +12,6 @@ let
   opt = options.services.mediatomb;
   name = cfg.package.pname;
   pkg = cfg.package;
-  optionYesNo = option: if option then "yes" else "no";
   # configuration on media directory
   mediaDirectory = {
     options = {
@@ -36,7 +35,7 @@ let
   };
   toMediaDirectory =
     d:
-    "<directory location=\"${d.path}\" mode=\"inotify\" recursive=\"${optionYesNo d.recursive}\" hidden-files=\"${optionYesNo d.hidden-files}\" />\n";
+    "<directory location=\"${d.path}\" mode=\"inotify\" recursive=\"${lib.boolToYesNo d.recursive}\" hidden-files=\"${lib.boolToYesNo d.hidden-files}\" />\n";
 
   transcodingConfig =
     if cfg.transcoding then
@@ -89,13 +88,13 @@ let
           <home>${cfg.dataDir}</home>
           <interface>${cfg.interface}</interface>
           <webroot>${pkg}/share/${name}/web</webroot>
-          <pc-directory upnp-hide="${optionYesNo cfg.pcDirectoryHide}"/>
+          <pc-directory upnp-hide="${lib.boolToYesNo cfg.pcDirectoryHide}"/>
           <storage>
             <sqlite3 enabled="yes">
               <database-file>${name}.db</database-file>
             </sqlite3>
           </storage>
-          <protocolInfo extend="${optionYesNo cfg.ps3Support}"/>
+          <protocolInfo extend="${lib.boolToYesNo cfg.ps3Support}"/>
           ${lib.optionalString cfg.dsmSupport ''
             <custom-http-headers>
               <add header="X-User-Agent: redsonic"/>
diff --git a/nixos/modules/services/misc/n8n.nix b/nixos/modules/services/misc/n8n.nix
index f3e9f698e35f..60c4e1cfd3f7 100644
--- a/nixos/modules/services/misc/n8n.nix
+++ b/nixos/modules/services/misc/n8n.nix
@@ -6,10 +6,17 @@
 }:
 let
   cfg = config.services.n8n;
-  format = pkgs.formats.json { };
-  configFile = format.generate "n8n.json" cfg.settings;
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "n8n" "settings" ] "Use services.n8n.environment instead.")
+    (lib.mkRemovedOptionModule [
+      "services"
+      "n8n"
+      "webhookUrl"
+    ] "Use services.n8n.environment.WEBHOOK_URL instead.")
+  ];
+
   options.services.n8n = {
     enable = lib.mkEnableOption "n8n server";
 
@@ -19,47 +26,66 @@ in
       description = "Open ports in the firewall for the n8n web interface.";
     };
 
-    settings = lib.mkOption {
-      type = format.type;
+    environment = lib.mkOption {
+      description = ''
+        Environment variables to pass to the n8n service.
+        See <https://docs.n8n.io/hosting/configuration/environment-variables/> for available options.
+      '';
+      type = lib.types.submodule {
+        freeformType = with lib.types; attrsOf str;
+        options = {
+          GENERIC_TIMEZONE = lib.mkOption {
+            type = with lib.types; nullOr str;
+            default = config.time.timeZone;
+            defaultText = lib.literalExpression "config.time.timeZone";
+            description = ''
+              The n8n instance timezone. Important for schedule nodes (such as Cron).
+            '';
+          };
+          N8N_PORT = lib.mkOption {
+            type = with lib.types; coercedTo port toString str;
+            default = 5678;
+            description = "The HTTP port n8n runs on.";
+          };
+          N8N_USER_FOLDER = lib.mkOption {
+            type = lib.types.path;
+            # This folder must be writeable as the application is storing
+            # its data in it, so the StateDirectory is a good choice
+            default = "/var/lib/n8n";
+            description = ''
+              Provide the path where n8n will create the .n8n folder.
+              This directory stores user-specific data, such as database file and encryption key.
+            '';
+            readOnly = true;
+          };
+          N8N_DIAGNOSTICS_ENABLED = lib.mkOption {
+            type = with lib.types; coercedTo bool toString str;
+            default = false;
+            description = ''
+              Whether to share selected, anonymous telemetry with n8n.
+              Note that if you set this to false, you can't enable Ask AI in the Code node.
+            '';
+          };
+          N8N_VERSION_NOTIFICATIONS_ENABLED = lib.mkOption {
+            type = with lib.types; coercedTo bool toString str;
+            default = false;
+            description = ''
+              When enabled, n8n sends notifications of new versions and security updates.
+            '';
+          };
+        };
+      };
       default = { };
-      description = ''
-        Configuration for n8n, see <https://docs.n8n.io/hosting/environment-variables/configuration-methods/>
-        for supported values.
-      '';
     };
-
-    webhookUrl = lib.mkOption {
-      type = lib.types.str;
-      default = "";
-      description = ''
-        WEBHOOK_URL for n8n, in case we're running behind a reverse proxy.
-        This cannot be set through configuration and must reside in an environment variable.
-      '';
-    };
-
   };
 
   config = lib.mkIf cfg.enable {
-    services.n8n.settings = {
-      # We use this to open the firewall, so we need to know about the default at eval time
-      port = lib.mkDefault 5678;
-    };
-
     systemd.services.n8n = {
-      description = "N8N service";
+      description = "n8n service";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment = {
-        # This folder must be writeable as the application is storing
-        # its data in it, so the StateDirectory is a good choice
-        N8N_USER_FOLDER = "/var/lib/n8n";
-        HOME = "/var/lib/n8n";
-        N8N_CONFIG_FILES = "${configFile}";
-        WEBHOOK_URL = "${cfg.webhookUrl}";
-
-        # Don't phone home
-        N8N_DIAGNOSTICS_ENABLED = "false";
-        N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
+      environment = cfg.environment // {
+        HOME = config.services.n8n.environment.N8N_USER_FOLDER;
       };
       serviceConfig = {
         Type = "simple";
@@ -88,7 +114,7 @@ in
     };
 
     networking.firewall = lib.mkIf cfg.openFirewall {
-      allowedTCPPorts = [ cfg.settings.port ];
+      allowedTCPPorts = [ (lib.toInt cfg.environment.N8N_PORT) ];
     };
   };
 }
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 8ab3372c75d7..14bb792790a7 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -686,7 +686,7 @@ in
           path = [ manage ];
           script = ''
             paperless-manage document_exporter ${cfg.exporter.directory} ${
-              lib.cli.toGNUCommandLineShell { } cfg.exporter.settings
+              lib.cli.toCommandLineShellGNU { } cfg.exporter.settings
             }
           '';
         };
diff --git a/nixos/modules/services/misc/parsoid.nix b/nixos/modules/services/misc/parsoid.nix
deleted file mode 100644
index b839309419d6..000000000000
--- a/nixos/modules/services/misc/parsoid.nix
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-
-  cfg = config.services.parsoid;
-
-  parsoid = pkgs.nodePackages.parsoid;
-
-  confTree = {
-    worker_heartbeat_timeout = 300000;
-    logging = {
-      level = "info";
-    };
-    services = [
-      {
-        module = "lib/index.js";
-        entrypoint = "apiServiceWorker";
-        conf = {
-          mwApis = map (x: if lib.isAttrs x then x else { uri = x; }) cfg.wikis;
-          serverInterface = cfg.interface;
-          serverPort = cfg.port;
-        };
-      }
-    ];
-  };
-
-  confFile = pkgs.writeText "config.yml" (
-    builtins.toJSON (lib.recursiveUpdate confTree cfg.extraConfig)
-  );
-
-in
-{
-  imports = [
-    (lib.mkRemovedOptionModule [
-      "services"
-      "parsoid"
-      "interwikis"
-    ] "Use services.parsoid.wikis instead")
-  ];
-
-  ##### interface
-
-  options = {
-
-    services.parsoid = {
-
-      enable = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Whether to enable Parsoid -- bidirectional
-          wikitext parser.
-        '';
-      };
-
-      wikis = lib.mkOption {
-        type = lib.types.listOf (lib.types.either lib.types.str lib.types.attrs);
-        example = [ "http://localhost/api.php" ];
-        description = ''
-          Used MediaWiki API endpoints.
-        '';
-      };
-
-      workers = lib.mkOption {
-        type = lib.types.int;
-        default = 2;
-        description = ''
-          Number of Parsoid workers.
-        '';
-      };
-
-      interface = lib.mkOption {
-        type = lib.types.str;
-        default = "127.0.0.1";
-        description = ''
-          Interface to listen on.
-        '';
-      };
-
-      port = lib.mkOption {
-        type = lib.types.port;
-        default = 8000;
-        description = ''
-          Port to listen on.
-        '';
-      };
-
-      extraConfig = lib.mkOption {
-        type = lib.types.attrs;
-        default = { };
-        description = ''
-          Extra configuration to add to parsoid configuration.
-        '';
-      };
-
-    };
-
-  };
-
-  ##### implementation
-
-  config = lib.mkIf cfg.enable {
-
-    systemd.services.parsoid = {
-      description = "Bidirectional wikitext parser";
-      wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
-      serviceConfig = {
-        ExecStart = "${parsoid}/lib/node_modules/parsoid/bin/server.js -c ${confFile} -n ${toString cfg.workers}";
-
-        DynamicUser = true;
-        User = "parsoid";
-        Group = "parsoid";
-
-        CapabilityBoundingSet = "";
-        NoNewPrivileges = true;
-        ProtectSystem = "strict";
-        ProtectHome = true;
-        PrivateTmp = true;
-        PrivateDevices = true;
-        ProtectHostname = true;
-        ProtectKernelTunables = true;
-        ProtectKernelModules = true;
-        ProtectControlGroups = true;
-        RestrictAddressFamilies = [
-          "AF_INET"
-          "AF_INET6"
-        ];
-        RestrictNamespaces = true;
-        LockPersonality = true;
-        #MemoryDenyWriteExecute = true;
-        RestrictRealtime = true;
-        RestrictSUIDSGID = true;
-        RemoveIPC = true;
-      };
-    };
-
-  };
-
-}
diff --git a/nixos/modules/services/misc/pinchflat.nix b/nixos/modules/services/misc/pinchflat.nix
index a4eee7463697..e33fb88cef63 100644
--- a/nixos/modules/services/misc/pinchflat.nix
+++ b/nixos/modules/services/misc/pinchflat.nix
@@ -147,7 +147,6 @@ in
         StateDirectory = baseNameOf stateDir;
         Environment = [
           "PORT=${builtins.toString cfg.port}"
-          "TZ=${config.time.timeZone}"
           "MEDIA_PATH=${cfg.mediaDir}"
           "CONFIG_PATH=${stateDir}"
           "DATABASE_PATH=${stateDir}/db/pinchflat.db"
@@ -160,6 +159,7 @@ in
           "PHX_SERVER=true"
         ]
         ++ optional cfg.selfhosted [ "RUN_CONTEXT=selfhosted" ]
+        ++ optional (!isNull config.time.timeZone) "TZ=${config.time.timeZone}"
         ++ attrValues (mapAttrs (name: value: name + "=" + builtins.toString value) cfg.extraConfig);
         EnvironmentFile = optional (cfg.secretsFile != null) cfg.secretsFile;
         ExecStartPre = "${lib.getExe' cfg.package "migrate"}";
diff --git a/nixos/modules/services/misc/rsync.nix b/nixos/modules/services/misc/rsync.nix
new file mode 100644
index 000000000000..f0768bf2771c
--- /dev/null
+++ b/nixos/modules/services/misc/rsync.nix
@@ -0,0 +1,194 @@
+{
+  config,
+  lib,
+  pkgs,
+  utils,
+  ...
+}:
+let
+  cfg = config.services.rsync;
+  inherit (lib) types;
+  inherit (utils.systemdUtils.unitOptions) unitOption;
+in
+{
+  options.services.rsync = {
+    enable = lib.mkEnableOption "periodic directory syncing via rsync";
+
+    package = lib.mkPackageOption pkgs "rsync" { };
+
+    jobs = lib.mkOption {
+      description = ''
+        Synchronization jobs to run.
+      '';
+      default = { };
+      type = types.attrsOf (
+        types.submodule {
+          options = {
+            sources = lib.mkOption {
+              type = types.nonEmptyListOf types.str;
+              example = [
+                "/srv/src1/"
+                "/srv/src2/"
+              ];
+              description = ''
+                Source directories.
+              '';
+            };
+
+            destination = lib.mkOption {
+              type = types.str;
+              example = "/srv/dst";
+              description = ''
+                Destination directory.
+              '';
+            };
+
+            settings = lib.mkOption {
+              type =
+                let
+                  simples = [
+                    types.bool
+                    types.str
+                    types.int
+                    types.float
+                  ];
+                in
+                types.attrsOf (
+                  types.oneOf (
+                    simples
+                    ++ [
+                      (types.listOf (types.oneOf simples))
+                    ]
+                  )
+                );
+              default = { };
+              example = {
+                verbose = true;
+                archive = true;
+                delete = true;
+                mkpath = true;
+              };
+              description = ''
+                Settings that should be passed to rsync via long options.
+                See {manpage}`rsync(1)` for available options.
+              '';
+            };
+
+            user = lib.mkOption {
+              type = types.str;
+              default = "root";
+              description = ''
+                The name of an existing user account under which the rsync process should run.
+              '';
+            };
+
+            group = lib.mkOption {
+              type = types.str;
+              default = "root";
+              description = ''
+                The name of an existing user group under which the rsync process should run.
+              '';
+            };
+
+            timerConfig = lib.mkOption {
+              type = types.nullOr (types.attrsOf unitOption);
+              default = {
+                OnCalendar = "daily";
+                Persistent = true;
+              };
+              description = ''
+                When to run the job.
+              '';
+            };
+
+            inhibit = lib.mkOption {
+              default = [ ];
+              type = types.listOf (types.strMatching "^[^:]+$");
+              example = [
+                "sleep"
+              ];
+              description = ''
+                Run the rsync process with an inhibition lock taken;
+                see {manpage}`systemd-inhibit(1)` for a list of possible operations.
+              '';
+            };
+          };
+        }
+      );
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd = lib.mkMerge (
+      lib.mapAttrsToList (
+        jobName: job:
+        let
+          systemdName = "rsync-job-${jobName}";
+          description = "Directory syncing via rsync job ${jobName}";
+        in
+        {
+          timers.${systemdName} = {
+            wantedBy = [
+              "timers.target"
+            ];
+            inherit description;
+            inherit (job) timerConfig;
+          };
+
+          services.${systemdName} = {
+            inherit description;
+
+            serviceConfig = {
+              Type = "oneshot";
+
+              ExecStart =
+                let
+                  settingsToCommandLine = lib.cli.toCommandLineGNU {
+                    isLong = _: true;
+                  };
+
+                  inhibitArgs = [
+                    (lib.getExe' config.systemd.package "systemd-inhibit")
+                    "--mode"
+                    "block"
+                    "--who"
+                    description
+                    "--what"
+                    (lib.concatStringsSep ":" job.inhibit)
+                    "--why"
+                    "Scheduled rsync job ${jobName}"
+                    "--"
+                  ];
+
+                  args =
+                    (lib.optionals (job.inhibit != [ ]) inhibitArgs)
+                    ++ [ (lib.getExe cfg.package) ]
+                    ++ (settingsToCommandLine job.settings)
+                    ++ [ "--" ]
+                    ++ job.sources
+                    ++ [ job.destination ];
+                in
+                utils.escapeSystemdExecArgs args;
+
+              User = job.user;
+              Group = job.group;
+
+              NoNewPrivileges = true;
+              PrivateDevices = true;
+              ProtectSystem = "full";
+              ProtectKernelTunables = true;
+              ProtectKernelModules = true;
+              ProtectControlGroups = true;
+              MemoryDenyWriteExecute = true;
+              LockPersonality = true;
+            };
+          };
+        }
+      ) cfg.jobs
+    );
+  };
+
+  meta.maintainers = [
+    lib.maintainers.lukaswrz
+  ];
+}
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 11374f9c014d..05351a040916 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -6,20 +6,59 @@
 }:
 let
   cfg = config.services.sssd;
+  settingsFormat = pkgs.formats.ini { };
 
   dataDir = "/var/lib/sssd";
   settingsFile = "${dataDir}/sssd.conf";
-  settingsFileUnsubstituted = pkgs.writeText "${dataDir}/sssd-unsubstituted.conf" cfg.config;
+  mkSettingsFileUnsubstituted =
+    settings:
+    let
+      pyBool = x: if x then "True" else "False";
+      finalSettings = lib.mapAttrs (
+        _: lib.mapAttrs (_: v: if lib.isBool v then pyBool v else v)
+      ) settings;
+    in
+    settingsFormat.generate "sssd-unsubstituted.conf" finalSettings;
+  settingsFileUnsubstituted =
+    if cfg.settings == { } then
+      pkgs.writeText "sssd-unsubstituted.conf" cfg.config
+    else
+      mkSettingsFileUnsubstituted cfg.settings;
 in
 {
   options = {
     services.sssd = {
       enable = lib.mkEnableOption "the System Security Services Daemon";
 
+      settings = lib.mkOption {
+        inherit (settingsFormat) type;
+        description = "Contents of {file}`sssd.conf`.";
+        default = { };
+        example = {
+          sssd = {
+            services = "nss, pam";
+            domains = "shadowutils";
+          };
+
+          nss = { };
+
+          pam = { };
+
+          "domain/shadowutils" = {
+            id_provider = "proxy";
+            proxy_lib_name = "files";
+            auth_provider = "proxy";
+            proxy_pam_target = "sssd-shadowutils";
+            proxy_fast_alias = true;
+          };
+        };
+      };
+
       config = lib.mkOption {
         type = lib.types.lines;
         description = "Contents of {file}`sssd.conf`.";
-        default = ''
+        default = "";
+        example = ''
           [sssd]
           services = nss, pam
           domains = shadowutils
@@ -80,6 +119,13 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = lib.xor (cfg.settings != { }) (cfg.config != "");
+          message = "services.sssd.settings and services.sssd.config are mutually exclusive";
+        }
+      ];
+
       # For `sssctl` to work.
       environment.etc."sssd/sssd.conf".source = settingsFile;
       environment.etc."sssd/conf.d".source = "${dataDir}/conf.d";
diff --git a/nixos/modules/services/monitoring/beszel-agent.nix b/nixos/modules/services/monitoring/beszel-agent.nix
new file mode 100644
index 000000000000..9cb4e1e57c7c
--- /dev/null
+++ b/nixos/modules/services/monitoring/beszel-agent.nix
@@ -0,0 +1,119 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.beszel.agent;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    BonusPlay
+    arunoruto
+  ];
+
+  options.services.beszel.agent = {
+    enable = lib.mkEnableOption "beszel agent";
+    package = lib.mkPackageOption pkgs "beszel" { };
+    openFirewall = (lib.mkEnableOption "") // {
+      description = "Whether to open the firewall port (default 45876).";
+    };
+
+    environment = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = { };
+      description = ''
+        Environment variables for configuring the beszel-agent service.
+        This field will end up public in /nix/store, for secret values (such as `KEY`) use `environmentFile`.
+
+        See <https://www.beszel.dev/guide/environment-variables#agent> for available options.
+      '';
+    };
+    environmentFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        File path containing environment variables for configuring the beszel-agent service in the format of an EnvironmentFile. See {manpage}`systemd.exec(5)`.
+      '';
+    };
+    extraPath = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      default = [ ];
+      description = ''
+        Extra packages to add to beszel path (such as nvidia-smi or rocm-smi).
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.beszel-agent = {
+      description = "Beszel Server Monitoring Agent";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+
+      environment = cfg.environment;
+      path =
+        cfg.extraPath
+        ++ lib.optionals (builtins.elem "nvidia" config.services.xserver.videoDrivers) [
+          (lib.getBin config.hardware.nvidia.package)
+        ]
+        ++ lib.optionals (builtins.elem "amdgpu" config.services.xserver.videoDrivers) [
+          (lib.getBin pkgs.rocmPackages.rocm-smi)
+        ]
+        ++ lib.optionals (builtins.elem "intel" config.services.xserver.videoDrivers) [
+          (lib.getBin pkgs.intel-gpu-tools)
+        ];
+
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/beszel-agent
+        '';
+
+        EnvironmentFile = cfg.environmentFile;
+
+        # adds ability to monitor docker/podman containers
+        SupplementaryGroups =
+          lib.optionals config.virtualisation.docker.enable [ "docker" ]
+          ++ lib.optionals (
+            config.virtualisation.podman.enable && config.virtualisation.podman.dockerSocket.enable
+          ) [ "podman" ];
+
+        DynamicUser = true;
+        User = "beszel-agent";
+        LockPersonality = true;
+        NoNewPrivileges = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = "strict";
+        ProtectHome = "read-only";
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        Restart = "on-failure";
+        RestartSec = "30s";
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallErrorNumber = "EPERM";
+        SystemCallFilter = [ "@system-service" ];
+        Type = "simple";
+        UMask = 27;
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
+      (
+        if (builtins.hasAttr "PORT" cfg.environment) then
+          (lib.strings.toInt cfg.environment.PORT)
+        else
+          45876
+      )
+    ];
+  };
+}
diff --git a/nixos/modules/services/monitoring/beszel-hub.nix b/nixos/modules/services/monitoring/beszel-hub.nix
new file mode 100644
index 000000000000..8028d13c39d3
--- /dev/null
+++ b/nixos/modules/services/monitoring/beszel-hub.nix
@@ -0,0 +1,114 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.beszel.hub;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    BonusPlay
+    arunoruto
+  ];
+
+  options.services.beszel.hub = {
+    enable = lib.mkEnableOption "beszel hub";
+
+    package = lib.mkPackageOption pkgs "beszel" { };
+
+    host = lib.mkOption {
+      default = "127.0.0.1";
+      type = lib.types.str;
+      example = "0.0.0.0";
+      description = "Host or address this beszel hub listens on.";
+    };
+    port = lib.mkOption {
+      default = 8090;
+      type = lib.types.port;
+      example = 3002;
+      description = "Port for this beszel hub to listen on.";
+    };
+
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/beszel-hub";
+      description = "Data directory of beszel-hub.";
+    };
+
+    environment = lib.mkOption {
+      type = with lib.types; attrsOf str;
+      default = { };
+      example = {
+        DISABLE_PASSWORD_AUTH = "true";
+      };
+      description = ''
+        Environment variables passed to the systemd service.
+        See <https://www.beszel.dev/guide/environment-variables#hub> for available options.
+      '';
+    };
+    environmentFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        Environment file to be passed to the systemd service.
+        Useful for passing secrets to the service to prevent them from being
+        world-readable in the Nix store. See {manpage}`systemd.exec(5)`.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.beszel-hub = {
+      description = "Beszel Server Monitoring Web App";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      environment = cfg.environment;
+
+      serviceConfig = {
+        ExecStartPre = [
+          "${cfg.package}/bin/beszel-hub migrate up"
+          "${cfg.package}/bin/beszel-hub history-sync"
+        ];
+        ExecStart = ''
+          ${cfg.package}/bin/beszel-hub serve --http='${cfg.host}:${toString cfg.port}'
+        '';
+
+        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
+        WorkingDirectory = cfg.dataDir;
+        StateDirectory = baseNameOf cfg.dataDir;
+        RuntimeDirectory = baseNameOf cfg.dataDir;
+        ReadWritePaths = cfg.dataDir;
+
+        DynamicUser = true;
+        User = "beszel-hub";
+        LockPersonality = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = "strict";
+        ProtectHome = "read-only";
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        DevicePolicy = "closed";
+        Restart = "on-failure";
+        RestartSec = "30s";
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        RestrictNamespaces = true;
+        SystemCallArchitectures = "native";
+        SystemCallErrorNumber = "EPERM";
+        SystemCallFilter = [ "@system-service" ];
+        UMask = 27;
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/go-csp-collector.nix b/nixos/modules/services/monitoring/go-csp-collector.nix
new file mode 100644
index 000000000000..6fafbb840740
--- /dev/null
+++ b/nixos/modules/services/monitoring/go-csp-collector.nix
@@ -0,0 +1,106 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.go-csp-collector;
+
+  inherit (lib)
+    boolToString
+    concatStringsSep
+    getExe
+    isBool
+    literalExpression
+    maintainers
+    mapAttrsToList
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+
+  settingsToArgs =
+    settings:
+    concatStringsSep " " (
+      mapAttrsToList (
+        name: value:
+        let
+          flag = "-${name}";
+        in
+        if isBool value then "${flag}=${boolToString value}" else "${flag} ${toString value}"
+      ) settings
+    );
+in
+{
+  meta.maintainers = with maintainers; [ stepbrobd ];
+
+  options.services.go-csp-collector = {
+    enable = mkEnableOption "go-csp-collector, a content security policy violation collector";
+
+    package = mkPackageOption pkgs "go-csp-collector" { };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType =
+          with types;
+          attrsOf (oneOf [
+            bool
+            path
+            str
+          ]);
+
+        options = {
+          port = mkOption {
+            type = types.port;
+            description = "The port to listen on.";
+            default = 8080;
+            example = 8080;
+          };
+
+          output-format = mkOption {
+            type = types.enum [
+              "text"
+              "json"
+            ];
+            description = "Define how the violation reports are formatted for output.";
+            default = "text";
+            example = "text";
+          };
+        };
+      };
+
+      description = ''
+        Settings for go-csp-collector. See
+        <https://github.com/jacobbednarz/go-csp-collector> for supported options.
+      '';
+
+      default = { };
+
+      example = literalExpression ''
+        {
+          debug = true;
+          health-check-path = "/health";
+        }
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.packages = [ cfg.package ];
+    systemd.services.go-csp-collector = {
+      description = "CSP violation collector";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ReadOnlyPaths = cfg.settings.filter-file or "";
+        ExecStart = [
+          ""
+          "${getExe cfg.package} ${settingsToArgs cfg.settings}"
+        ];
+      };
+    };
+  };
+}
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 9aad9e21fa6e..46da20bec8ad 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -126,7 +126,7 @@ let
       '';
 
   # Get a submodule without any embedded metadata:
-  _filter = x: filterAttrs (k: v: k != "_module") x;
+  _filter = x: removeAttrs x [ "_module" ];
 
   # https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
   grafanaTypes.datasourceConfig = types.submodule {
diff --git a/nixos/modules/services/monitoring/karma.nix b/nixos/modules/services/monitoring/karma.nix
index 50b8d384a4a3..771654dd6175 100644
--- a/nixos/modules/services/monitoring/karma.nix
+++ b/nixos/modules/services/monitoring/karma.nix
@@ -117,7 +117,7 @@ in
         Type = "simple";
         DynamicUser = true;
         Restart = "on-failure";
-        ExecStart = "${pkgs.karma}/bin/karma --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";
+        ExecStart = "${lib.getExe cfg.package} --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";
       };
     };
     networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.listen.port ];
diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix
index ef3593cf038c..3d8d3dbd8296 100644
--- a/nixos/modules/services/monitoring/librenms.nix
+++ b/nixos/modules/services/monitoring/librenms.nix
@@ -668,6 +668,9 @@ in
           ${artisanWrapper}/bin/librenms-artisan optimize
           echo "${package}" > ${cfg.dataDir}/package
         fi
+
+        # to make sure to not read an outdated .env file
+        ${artisanWrapper}/bin/librenms-artisan config:cache
       '';
     };
 
diff --git a/nixos/modules/services/monitoring/opentelemetry-collector.nix b/nixos/modules/services/monitoring/opentelemetry-collector.nix
index 125dec00b6cf..a722c7a88b5f 100644
--- a/nixos/modules/services/monitoring/opentelemetry-collector.nix
+++ b/nixos/modules/services/monitoring/opentelemetry-collector.nix
@@ -13,12 +13,27 @@ let
     mkOption
     types
     getExe
+    isStorePath
+    literalMD
     ;
 
   cfg = config.services.opentelemetry-collector;
   opentelemetry-collector = cfg.package;
 
   settingsFormat = pkgs.formats.yaml { };
+  generatedConf =
+    if cfg.configFile == null then
+      settingsFormat.generate "config.yaml" cfg.settings
+    else
+      cfg.configFile;
+  conf =
+    if cfg.validateConfigFile then
+      pkgs.runCommandLocal "config.yaml" { inherit generatedConf; } ''
+        cp $generatedConf $out
+        ${getExe opentelemetry-collector} validate --config=file:$out
+      ''
+    else
+      generatedConf;
 in
 {
   options.services.opentelemetry-collector = {
@@ -43,6 +58,11 @@ in
         Specify a path to a configuration file that Opentelemetry Collector should use.
       '';
     };
+
+    validateConfigFile = lib.mkEnableOption "Validate configuration file" // {
+      defaultText = literalMD "`true` if `configFile` is a store path";
+      default = isStorePath cfg.configFile;
+    };
   };
 
   config = mkIf cfg.enable {
@@ -61,28 +81,20 @@ in
       description = "Opentelemetry Collector Service Daemon";
       wantedBy = [ "multi-user.target" ];
 
-      serviceConfig =
-        let
-          conf =
-            if cfg.configFile == null then
-              settingsFormat.generate "config.yaml" cfg.settings
-            else
-              cfg.configFile;
-        in
-        {
-          ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
-          DynamicUser = true;
-          Restart = "always";
-          ProtectSystem = "full";
-          DevicePolicy = "closed";
-          NoNewPrivileges = true;
-          WorkingDirectory = "%S/opentelemetry-collector";
-          StateDirectory = "opentelemetry-collector";
-          SupplementaryGroups = [
-            # allow to read the systemd journal for opentelemetry-collector
-            "systemd-journal"
-          ];
-        };
+      serviceConfig = {
+        ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
+        DynamicUser = true;
+        Restart = "always";
+        ProtectSystem = "full";
+        DevicePolicy = "closed";
+        NoNewPrivileges = true;
+        WorkingDirectory = "%S/opentelemetry-collector";
+        StateDirectory = "opentelemetry-collector";
+        SupplementaryGroups = [
+          # allow to read the systemd journal for opentelemetry-collector
+          "systemd-journal"
+        ];
+      };
     };
   };
 }
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
index 7dc40293d464..61ca738fdd31 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
@@ -15,6 +15,7 @@ let
     nameValuePair
     toLower
     filterAttrs
+    removeAttrs
     escapeShellArg
     literalExpression
     mkIf
@@ -41,7 +42,7 @@ let
           )
         else
           nameValuePair (toLower name) value
-      ) (filterAttrs (n: _: !(n == "_module")) cfg.configuration)
+      ) (removeAttrs cfg.configuration [ "_module" ])
     )
   );
 
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index c543ac9a206e..2c4a82f0e044 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -13,11 +13,11 @@ let
     types
     concatStringsSep
     concatMapStringsSep
-    any
+    elem
     optionals
     ;
-  collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors;
-  collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors;
+  collectorIsEnabled = final: elem final cfg.enabledCollectors;
+  collectorIsDisabled = final: elem final cfg.disabledCollectors;
 in
 {
   port = 9100;
diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix
index baae16394edd..062d181b059a 100644
--- a/nixos/modules/services/monitoring/vnstat.nix
+++ b/nixos/modules/services/monitoring/vnstat.nix
@@ -10,11 +10,12 @@ in
 {
   options.services.vnstat = {
     enable = lib.mkEnableOption "update of network usage statistics via vnstatd";
+    package = lib.mkPackageOption pkgs "vnstat" { };
   };
 
   config = lib.mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.vnstat ];
+    environment.systemPackages = [ cfg.package ];
 
     users = {
       groups.vnstatd = { };
@@ -37,7 +38,7 @@ in
         "man:vnstat.conf(5)"
       ];
       serviceConfig = {
-        ExecStart = "${pkgs.vnstat}/bin/vnstatd -n";
+        ExecStart = "${cfg.package}/bin/vnstatd -n";
         ExecReload = "${pkgs.procps}/bin/kill -HUP $MAINPID";
 
         # Hardening (from upstream example service)
diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index fa9c7955afde..c5d7e365fe67 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -45,8 +45,6 @@ let
       partOf = [ "ceph-${daemonType}.target" ];
       wantedBy = [ "ceph-${daemonType}.target" ];
 
-      path = [ pkgs.getopt ];
-
       # Don't start services that are not yet initialized
       unitConfig.ConditionPathExists = "/var/lib/${stateDirectory}/keyring";
       startLimitBurst =
diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix
index 87d83971c706..de4718229797 100644
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@@ -167,7 +167,7 @@ in
       autoMigrate = lib.mkOption {
         type = lib.types.bool;
         default = true;
-        description = "Whether Kubo should try to run the fs-repo-migration at startup.";
+        description = "Whether Kubo should try to migrate its filesystem repository automatically.";
       };
 
       enableGC = lib.mkOption {
@@ -330,8 +330,8 @@ in
     environment.variables.IPFS_PATH = fakeKuboRepo;
 
     # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
-    boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 2500000;
-    boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000;
+    boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000;
+    boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000;
 
     programs.fuse = lib.mkIf cfg.autoMount {
       userAllowOther = true;
@@ -344,9 +344,6 @@ in
         createHome = false;
         uid = config.ids.uids.ipfs;
         description = "IPFS daemon user";
-        packages = [
-          pkgs.kubo-migrator
-        ];
       };
     };
 
@@ -377,6 +374,7 @@ in
       path = [
         "/run/wrappers"
         cfg.package
+        pkgs.kubo-fs-repo-migrations # Used by 'ipfs repo migrate --to=...'
       ];
       environment.IPFS_PATH = cfg.dataDir;
 
@@ -388,7 +386,7 @@ in
           rm -vf "$IPFS_PATH/api"
       ''
       + lib.optionalString cfg.autoMigrate ''
-        '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y
+        '${lib.getExe cfg.package}' repo migrate '--to=${cfg.package.repoVersion}' --allow-downgrade
       ''
       + ''
         fi
@@ -412,7 +410,7 @@ in
       serviceConfig = {
         ExecStart = [
           ""
-          "${cfg.package}/bin/ipfs daemon ${kuboFlags}"
+          "${lib.getExe cfg.package} daemon ${kuboFlags}"
         ];
         User = cfg.user;
         Group = cfg.group;
diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix
index 99d7b27011c2..eece8c8f13e5 100644
--- a/nixos/modules/services/network-filesystems/orangefs/server.nix
+++ b/nixos/modules/services/network-filesystems/orangefs/server.nix
@@ -7,7 +7,7 @@
 let
   cfg = config.services.orangefs.server;
 
-  aliases = lib.mapAttrsToList (alias: url: alias) cfg.servers;
+  aliases = lib.attrNames cfg.servers;
 
   # Maximum handle number is 2^63
   maxHandle = 9223372036854775806;
@@ -50,8 +50,8 @@ let
       </DataHandleRanges>
 
       <StorageHints>
-      TroveSyncMeta ${if fs.troveSyncMeta then "yes" else "no"}
-      TroveSyncData ${if fs.troveSyncData then "yes" else "no"}
+      TroveSyncMeta ${lib.boolToYesNo fs.troveSyncMeta}
+      TroveSyncData ${lib.boolToYesNo fs.troveSyncData}
       ${fs.extraStorageHints}
       </StorageHints>
 
diff --git a/nixos/modules/services/networking/anubis.md b/nixos/modules/services/networking/anubis.md
index 533ece7bfbd3..af5d3cf997bc 100644
--- a/nixos/modules/services/networking/anubis.md
+++ b/nixos/modules/services/networking/anubis.md
@@ -8,6 +8,34 @@ between a reverse proxy and the service to be protected.
 This module is designed to use Unix domain sockets as the socket paths can be automatically configured for multiple
 instances, but TCP sockets are also supported.
 
+Configuring multiple instances may look like the following.
+
+Notes:
+
+- Each instance as its runtime directory set to `anubis/anubis-<instance name>`.
+- When a single instance is declared with unix sockets, the runtime directory `anubis` is allowed for backward
+  compatibility.
+
+```nix
+{
+  services.anubis.instances."instance-1" = {
+    # Runtime directory: "anubis/anubis-instance-1".
+    settings = {
+      BIND = "/run/anubis/anubis-instance-1/anubis.sock";
+      TARGET = "http://localhost:8001";
+    };
+  };
+
+  services.anubis.instances."instance-2" = {
+    # Runtime directory: "anubis/anubis-instance-2".
+    settings = {
+      BIND = "/run/anubis/anubis-instance-2/anubis.sock";
+      TARGET = "http://localhost:8002";
+    };
+  };
+}
+```
+
 A minimal configuration with [nginx](#opt-services.nginx.enable) may look like the following:
 
 ```nix
diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix
index 968595d303d1..fefc7001677d 100644
--- a/nixos/modules/services/networking/anubis.nix
+++ b/nixos/modules/services/networking/anubis.nix
@@ -12,6 +12,28 @@ let
   enabledInstances = lib.filterAttrs (_: conf: conf.enable) cfg.instances;
   instanceName = name: if name == "" then "anubis" else "anubis-${name}";
 
+  unixAddr = network: addr: lib.strings.optionalString (network == "unix") addr;
+  unixSocketAddrs =
+    settings:
+    lib.filter (x: x != "") [
+      (unixAddr settings.BIND_NETWORK settings.BIND)
+      (unixAddr settings.METRICS_BIND_NETWORK settings.METRICS_BIND)
+    ];
+
+  runtimeDirectoryPrefix = name: "/run/anubis/${instanceName name}/";
+  instanceUsesUnixSockets = instance: lib.length (unixSocketAddrs instance.settings) > 0;
+  instanceUsesDedicatedRuntimeDirectory =
+    name: instance:
+    lib.any (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings);
+  useLegacyRuntimeDirectory =
+    # Set when:
+    # - Only one instance is configured with unix sockets.
+    # - No instance uses the new runtime directory prefix: /run/anubis/anubis-<name>.
+    lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) == 1
+    && !(lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) (
+      lib.attrsToList enabledInstances
+    ));
+
   commonSubmodule =
     isDefault:
     let
@@ -185,6 +207,7 @@ let
         default = "/run/anubis/${instanceName name}.sock";
         description = ''
           The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax.
+          Use the prefix "${runtimeDirectoryPrefix "<name>"}". The prefix "/run/anubis" is deprecated.
 
           Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`.
         '';
@@ -196,6 +219,7 @@ let
         description = ''
           The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for
           syntax.
+          Use the prefix "${runtimeDirectoryPrefix "<name>"}". The prefix "/run/anubis" is deprecated.
 
           The metrics server is enabled by default and may be disabled. However, due to implementation details, this is
           only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an
@@ -245,6 +269,23 @@ in
   };
 
   config = lib.mkIf (enabledInstances != { }) {
+    warnings = lib.optional useLegacyRuntimeDirectory ''Anubis service: runtime directory is going to be migrated from "anubis" to "anubis/anubis-<name>". Update services.anubis.instances.<name>.BIND to "${runtimeDirectoryPrefix "<name>"}anubis.sock" and services.anubis.instances.<name>.METRICS_BIND to "${runtimeDirectoryPrefix "<name>"}anubis-metrics.sock". Note: if <name> is "", use the prefix "/run/anubis/anubis".'';
+
+    assertions =
+      let
+        validInstanceUnixSocketAddrs =
+          { name, value }:
+          lib.all (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs value.settings);
+      in
+      [
+        {
+          assertion =
+            useLegacyRuntimeDirectory
+            || lib.all validInstanceUnixSocketAddrs (lib.attrsToList enabledInstances);
+          message = ''use the prefix "${runtimeDirectoryPrefix "<name>"}" in services.anubis.instances.<name>.BIND and services.anubis.instances.<name>.METRICS_BIND'';
+        }
+      ];
+
     users.users = lib.mkIf (cfg.defaultOptions.user == "anubis") {
       anubis = {
         isSystemUser = true;
@@ -288,19 +329,13 @@ in
             (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags
           );
           RuntimeDirectory =
-            if
-              lib.any (lib.hasPrefix "/run/anubis") (
-                with instance.settings;
-                [
-                  BIND
-                  METRICS_BIND
-                ]
-              )
-            then
+            if useLegacyRuntimeDirectory && instanceUsesUnixSockets instance then
+              # Warning: `anubis` will be deprecated eventually.
               "anubis"
+            else if instanceUsesUnixSockets instance then
+              "anubis/${instanceName name}"
             else
               null;
-
           # hardening
           NoNewPrivileges = true;
           CapabilityBoundingSet = null;
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index ab54eafb6877..28efc39f8bce 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -7,8 +7,6 @@
 let
   cfg = config.services.avahi;
 
-  yesNo = yes: if yes then "yes" else "no";
-
   avahiDaemonConf =
     with cfg;
     pkgs.writeText "avahi-daemon.conf" ''
@@ -21,8 +19,8 @@ let
         lib.optionalString (hostName != "") "host-name=${hostName}"
       }
       browse-domains=${lib.concatStringsSep ", " browseDomains}
-      use-ipv4=${yesNo ipv4}
-      use-ipv6=${yesNo ipv6}
+      use-ipv4=${lib.boolToYesNo ipv4}
+      use-ipv6=${lib.boolToYesNo ipv6}
       ${lib.optionalString (
         allowInterfaces != null
       ) "allow-interfaces=${lib.concatStringsSep "," allowInterfaces}"}
@@ -30,22 +28,22 @@ let
         denyInterfaces != null
       ) "deny-interfaces=${lib.concatStringsSep "," denyInterfaces}"}
       ${lib.optionalString (domainName != null) "domain-name=${domainName}"}
-      allow-point-to-point=${yesNo allowPointToPoint}
+      allow-point-to-point=${lib.boolToYesNo allowPointToPoint}
       ${lib.optionalString (cacheEntriesMax != null) "cache-entries-max=${toString cacheEntriesMax}"}
 
       [wide-area]
-      enable-wide-area=${yesNo wideArea}
+      enable-wide-area=${lib.boolToYesNo wideArea}
 
       [publish]
-      disable-publishing=${yesNo (!publish.enable)}
-      disable-user-service-publishing=${yesNo (!publish.userServices)}
-      publish-addresses=${yesNo (publish.userServices || publish.addresses)}
-      publish-hinfo=${yesNo publish.hinfo}
-      publish-workstation=${yesNo publish.workstation}
-      publish-domain=${yesNo publish.domain}
+      disable-publishing=${lib.boolToYesNo (!publish.enable)}
+      disable-user-service-publishing=${lib.boolToYesNo (!publish.userServices)}
+      publish-addresses=${lib.boolToYesNo (publish.userServices || publish.addresses)}
+      publish-hinfo=${lib.boolToYesNo publish.hinfo}
+      publish-workstation=${lib.boolToYesNo publish.workstation}
+      publish-domain=${lib.boolToYesNo publish.domain}
 
       [reflector]
-      enable-reflector=${yesNo reflector}
+      enable-reflector=${lib.boolToYesNo reflector}
       ${extraConfig}
     '';
 in
@@ -276,6 +274,8 @@ in
         Extra config to append to avahi-daemon.conf.
       '';
     };
+
+    debug = lib.mkEnableOption "debug logging";
   };
 
   config = lib.mkIf cfg.enable {
@@ -356,7 +356,7 @@ in
         NotifyAccess = "main";
         BusName = "org.freedesktop.Avahi";
         Type = "dbus";
-        ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf}";
+        ExecStart = "${cfg.package}/sbin/avahi-daemon --syslog -f ${avahiDaemonConf} ${lib.optionalString cfg.debug "--debug"}";
         ConfigurationDirectory = "avahi/services";
 
         # Hardening
diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index bc8934eb8fa1..899ee1914078 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -21,6 +21,14 @@ let
       })
     );
 
+  bindRndcMacType = "hmac-sha256";
+
+  bindRndcKeyFile = "/etc/bind/rndc.key";
+
+  bindNamedExe = lib.getExe' bindPkg "named";
+
+  bindRndcExe = lib.getExe' bindPkg "rndc";
+
   bindZoneOptions =
     { name, config, ... }:
     {
@@ -63,68 +71,90 @@ let
       };
     };
 
-  confFile = pkgs.writeText "named.conf" ''
-    include "/etc/bind/rndc.key";
-    controls {
-      inet 127.0.0.1 allow {localhost;} keys {"rndc-key";};
+  testRndcKey = pkgs.writeTextFile {
+    name = "testrndc.key";
+    text = ''
+      key "rndc-key" {
+        algorithm ${bindRndcMacType};
+        secret "0123456789abcdefghijklmnopqrstuvw=";
+      };
+    '';
+  };
+
+  confFile = pkgs.writeTextFile {
+    name = "named.conf";
+    checkPhase = ''
+      runHook preCheck
+      echo "Checking named configuration file...";
+      ${lib.getExe' bindPkg "named-checkconf"} -z $target -t ${cfg.directory}
+      runHook postCheck
+    '';
+    derivationArgs = {
+      doCheck = true;
+      postCheck = ''
+        substituteInPlace $target --replace-fail ${testRndcKey} ${bindRndcKeyFile}
+      '';
     };
 
-    acl cachenetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
-    acl badnetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
+    # The include path in the first line will be replaced in the postCheck hook.
+    text = ''
+      include "${testRndcKey}";
+      controls {
+        inet 127.0.0.1 allow {localhost;} keys {"rndc-key";};
+      };
 
-    options {
-      listen-on port ${toString cfg.listenOnPort} { ${
-        lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn
-      } };
-      listen-on-v6 port ${toString cfg.listenOnIpv6Port} { ${
-        lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6
-      } };
-      allow-query-cache { cachenetworks; };
-      blackhole { badnetworks; };
-      forward ${cfg.forward};
-      forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
-      directory "${cfg.directory}";
-      pid-file "/run/named/named.pid";
-      ${cfg.extraOptions}
-    };
+      acl cachenetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
+      acl badnetworks { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
 
-    ${cfg.extraConfig}
+      options {
+        listen-on { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOn} };
+        listen-on-v6 { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.listenOnIpv6} };
+        allow-query-cache { cachenetworks; };
+        blackhole { badnetworks; };
+        forward ${cfg.forward};
+        forwarders { ${lib.concatMapStrings (entry: " ${entry}; ") cfg.forwarders} };
+        directory "${cfg.directory}";
+        pid-file "/run/named/named.pid";
+        ${cfg.extraOptions}
+      };
 
-    ${lib.concatMapStrings (
-      {
-        name,
-        file,
-        master ? true,
-        slaves ? [ ],
-        masters ? [ ],
-        allowQuery ? [ ],
-        extraConfig ? "",
-      }:
-      ''
-        zone "${name}" {
-          type ${if master then "master" else "slave"};
-          file "${file}";
-          ${
-            if master then
-              ''
-                allow-transfer {
-                  ${lib.concatMapStrings (ip: "${ip};\n") slaves}
-                };
-              ''
-            else
-              ''
-                masters {
-                  ${lib.concatMapStrings (ip: "${ip};\n") masters}
-                };
-              ''
-          }
-          allow-query { ${lib.concatMapStrings (ip: "${ip}; ") allowQuery}};
-          ${extraConfig}
-        };
-      ''
-    ) (lib.attrValues cfg.zones)}
-  '';
+      ${cfg.extraConfig}
 
+      ${lib.concatMapStrings (
+        {
+          name,
+          file,
+          master ? true,
+          slaves ? [ ],
+          masters ? [ ],
+          allowQuery ? [ ],
+          extraConfig ? "",
+        }:
+        ''
+          zone "${name}" {
+            type ${if master then "master" else "slave"};
+            file "${file}";
+            ${
+              if master then
+                ''
+                  allow-transfer {
+                    ${lib.concatMapStrings (ip: "${ip};\n") slaves}
+                  };
+                ''
+              else
+                ''
+                  masters {
+                    ${lib.concatMapStrings (ip: "${ip};\n") masters}
+                  };
+                ''
+            }
+            allow-query { ${lib.concatMapStrings (ip: "${ip}; ") allowQuery}};
+            ${extraConfig}
+          };
+        ''
+      ) (lib.attrValues cfg.zones)}
+    '';
+  };
 in
 
 {
@@ -284,7 +314,8 @@ in
         defaultText = lib.literalExpression "confFile";
         description = ''
           Overridable config file to use for named. By default, that
-          generated by nixos.
+          generated by nixos. If overriden, it will not be checked by
+          named-checkconf.
         '';
       };
 
@@ -320,16 +351,16 @@ in
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
-        if ! [ -f "/etc/bind/rndc.key" ]; then
-          ${bindPkg.out}/sbin/rndc-confgen -c /etc/bind/rndc.key -a -A hmac-sha256 2>/dev/null
+        if ! [ -f ${bindRndcKeyFile} ]; then
+          ${lib.getExe' bindPkg "rndc-confgen"} -c ${bindRndcKeyFile} -a -A ${bindRndcMacType} 2>/dev/null
         fi
       '';
 
       serviceConfig = {
         Type = "forking"; # Set type to forking, see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=900788
-        ExecStart = "${bindPkg.out}/sbin/named ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraArgs}";
-        ExecReload = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
-        ExecStop = "${bindPkg.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
+        ExecStart = "${bindNamedExe} ${lib.optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraArgs}";
+        ExecReload = "${bindRndcExe} -k '${bindRndcKeyFile}' reload";
+        ExecStop = "${bindRndcExe} -k '${bindRndcKeyFile}' stop";
         User = bindUser;
         RuntimeDirectory = "named";
         RuntimeDirectoryPreserve = "yes";
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 54e488db9856..773387939a7c 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -6,7 +6,6 @@
 }:
 let
   cfg = config.services.ddclient;
-  boolToStr = bool: if bool then "yes" else "no";
   dataDir = "/var/lib/ddclient";
   StateDirectory = builtins.baseNameOf dataDir;
   RuntimeDirectory = StateDirectory;
@@ -33,10 +32,10 @@ let
     ${lib.optionalString (cfg.script != "") "script=${cfg.script}"}
     ${lib.optionalString (cfg.server != "") "server=${cfg.server}"}
     ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"}
-    ssl=${boolToStr cfg.ssl}
+    ssl=${lib.boolToYesNo cfg.ssl}
     wildcard=YES
-    quiet=${boolToStr cfg.quiet}
-    verbose=${boolToStr cfg.verbose}
+    quiet=${lib.boolToYesNo cfg.quiet}
+    verbose=${lib.boolToYesNo cfg.verbose}
     ${cfg.extraConfig}
     ${lib.concatStringsSep "," cfg.domains}
   '';
diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 7b78140b0563..20ed8da1123c 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -30,7 +30,7 @@ let
     map (i: i.name) (
       lib.filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces
     )
-    ++ lib.mapAttrsToList (i: _: i) config.networking.sits
+    ++ lib.attrNames config.networking.sits
     ++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ lib.flatten (
       lib.concatMap (
diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix
index fac18c6a246c..73c194ac060c 100644
--- a/nixos/modules/services/networking/frr.nix
+++ b/nixos/modules/services/networking/frr.nix
@@ -82,7 +82,7 @@ let
 
   isEnabled = service: cfg.${service}.enable;
 
-  daemonLine = d: "${d}=${if isEnabled d then "yes" else "no"}";
+  daemonLine = d: "${d}=${lib.boolToYesNo (isEnabled d)}";
 
   configFile =
     if cfg.configFile != null then
diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix
index 21679a3d8364..6d69090744be 100644
--- a/nixos/modules/services/networking/gns3-server.nix
+++ b/nixos/modules/services/networking/gns3-server.nix
@@ -187,7 +187,7 @@ in
 
       systemd.services.gns3-server =
         let
-          commandArgs = lib.cli.toGNUCommandLineShell { } {
+          commandArgs = lib.cli.toCommandLineShellGNU { } {
             config = "/etc/gns3/gns3_server.conf";
             pid = "/run/gns3/server.pid";
             log = cfg.log.file;
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
index d0cc0f230278..d08c08e6ec42 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -14,7 +14,13 @@ let
     mkMerge
     optional
     ;
-  inherit (lib.cli) toGNUCommandLine;
+  inherit (lib.cli) toCommandLine;
+
+  optionFormat = optionName: {
+    option = "-${optionName}";
+    sep = null;
+    explicitBool = false;
+  };
 
   cfg = config.services.hylafax;
   mapModems = lib.forEach (lib.attrValues cfg.modems);
@@ -23,9 +29,7 @@ let
     prefix: program: posArg: options:
     let
       start = "${prefix}${cfg.package}/spool/bin/${program}";
-      optionsList = toGNUCommandLine { mkOptionName = k: "-${k}"; } (
-        { q = cfg.spoolAreaPath; } // options
-      );
+      optionsList = toCommandLine optionFormat ({ q = cfg.spoolAreaPath; } // options);
       posArgList = optional (posArg != null) posArg;
     in
     "${start} ${escapeShellArgs (optionsList ++ posArgList)}";
diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix
index ddd95d33d131..41997a039ec0 100644
--- a/nixos/modules/services/networking/ifstate.nix
+++ b/nixos/modules/services/networking/ifstate.nix
@@ -198,7 +198,7 @@ in
         {
           assertion =
             initrdCfg.package.passthru.features.withWireguard
-            || !(builtins.any (kind: kind == "wireguard") initrdInterfaceTypes);
+            || !(builtins.elem "wireguard" initrdInterfaceTypes);
           message = "IfState initrd package is configured without the `wireguard` feature, but wireguard interfaces are configured. Please see the `boot.initrd.network.ifstate.package` option.";
         }
         {
diff --git a/nixos/modules/services/networking/kismet.nix b/nixos/modules/services/networking/kismet.nix
index 4e14e9fd51d4..c7d44846b178 100644
--- a/nixos/modules/services/networking/kismet.nix
+++ b/nixos/modules/services/networking/kismet.nix
@@ -28,7 +28,14 @@ let
     typeOf
     match
     ;
-  inherit (lib.lists) all isList flatten;
+  inherit (lib.lists)
+    all
+    isList
+    head
+    tail
+    flatten
+    foldl'
+    ;
   inherit (lib.attrsets)
     attrsToList
     filterAttrs
@@ -48,19 +55,60 @@ let
     in
     prev
     // {
-      check = value: prev.check value && (override type value);
+      check =
+        value:
+        let
+          prevResult = builtins.tryEval (prev.check value);
+          nextResult = builtins.tryEval (override type value);
+        in
+        prevResult.success && prevResult.value && nextResult.success && nextResult.value;
+
+      # We need to typecheck prior to merging, so deoptimize in case prev.merge is a functor.
+      merge = opts: prev.merge opts;
     };
 
   # Deep listOf.
-  listOf' = deep types.listOf (type: value: all type.check value);
+  inherit (types) listOf;
+  listOf' = deep listOf (type: value: all type.check value);
 
   # Deep attrsOf.
-  attrsOf' = deep types.attrsOf (type: value: all (item: type.check item.value) (attrsToList value));
+  inherit (types) attrsOf;
+  attrsOf' = deep attrsOf (type: value: all (item: type.check item.value) (attrsToList value));
+
+  # Deep either and oneOf that performs typecheck prior to merging.
+  inherit (types) either;
+  either' =
+    first: second:
+    let
+      prev = either first second;
+    in
+    prev
+    // {
+      check =
+        value:
+        let
+          firstResult = builtins.tryEval (first.check value);
+          secondResult = builtins.tryEval (second.check value);
+        in
+        firstResult.success && firstResult.value || secondResult.success && secondResult.value;
+
+      # We need to typecheck prior to merging, so deoptimize in case prev.merge is a functor.
+      merge = opts: prev.merge opts;
+    };
+
+  oneOf' =
+    ts:
+    let
+      head' =
+        if ts == [ ] then throw "types.oneOf needs to get at least one type in its argument" else head ts;
+      tail' = tail ts;
+    in
+    foldl' either' head' tail';
 
   # Kismet config atoms.
   atom =
     with types;
-    oneOf [
+    oneOf' [
       number
       bool
       str
@@ -68,7 +116,10 @@ let
 
   # Composite types.
   listOfAtom = listOf' atom;
-  atomOrList = with types; either atom listOfAtom;
+  atomOrList = oneOf' [
+    atom
+    listOfAtom
+  ];
   lists = listOf' atomOrList;
   kvPair = attrsOf' atomOrList;
   kvPairs = listOf' kvPair;
@@ -80,19 +131,17 @@ let
   # Toplevel config type.
   topLevel =
     let
-      topLevel' =
-        with types;
-        oneOf [
-          headerKvPairs
-          headerKvPair
-          kvPairs
-          kvPair
-          listOfAtom
-          lists
-          atom
-        ];
+      topLevel' = oneOf' [
+        headerKvPairs
+        headerKvPair
+        kvPairs
+        kvPair
+        listOfAtom
+        lists
+        atom
+      ];
     in
-    topLevel'
+    attrsOf' topLevel'
     // {
       description = "Kismet config stanza";
     };
@@ -239,7 +288,7 @@ in
         https://www.kismetwireless.net/docs/readme/configuring/configfiles/
       '';
       default = { };
-      type = with types; attrsOf topLevel;
+      type = topLevel;
       example = literalExpression ''
         {
           /* Examples for atoms */
diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix
index ccbddbf3d5a1..c723ff16d3cd 100644
--- a/nixos/modules/services/networking/miniupnpd.nix
+++ b/nixos/modules/services/networking/miniupnpd.nix
@@ -11,8 +11,8 @@ let
   cfg = config.services.miniupnpd;
   configFile = pkgs.writeText "miniupnpd.conf" ''
     ext_ifname=${cfg.externalInterface}
-    enable_natpmp=${if cfg.natpmp then "yes" else "no"}
-    enable_upnp=${if cfg.upnp then "yes" else "no"}
+    enable_natpmp=${boolToYesNo cfg.natpmp}
+    enable_upnp=${boolToYesNo cfg.upnp}
 
     ${concatMapStrings (range: ''
       listening_ip=${range}
diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix
index c67b4ac47390..9b1cf76860e3 100644
--- a/nixos/modules/services/networking/murmur.nix
+++ b/nixos/modules/services/networking/murmur.nix
@@ -401,40 +401,40 @@ in
     ];
 
     security.apparmor.policies."bin.mumble-server".profile = ''
+      abi <abi/4.0>,
       include <tunables/global>
 
-      ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} {
+      profile ${cfg.package}/bin/{mumble-server,.mumble-server-wrapped} {
         include <abstractions/base>
         include <abstractions/nameservice>
         include <abstractions/ssl_certs>
         include "${pkgs.apparmorRulesFromClosure { name = "mumble-server"; } cfg.package}"
-        pix ${cfg.package}/bin/.mumble-server-wrapped,
+        ${cfg.package}/bin/.mumble-server-wrapped pix,
 
-        r ${config.environment.etc."os-release".source},
-        r ${config.environment.etc."lsb-release".source},
-        owner rwk ${cfg.stateDir}/murmur.sqlite,
-        owner rw ${cfg.stateDir}/murmur.sqlite-journal,
-        owner r ${cfg.stateDir}/,
-        r /run/murmur/murmurd.pid,
-        r /run/murmur/murmurd.ini,
-        r ${configFile},
-    ''
-    + lib.optionalString cfg.logToFile ''
-      rw /var/log/murmur/murmurd.log,
-    ''
-    + lib.optionalString (cfg.sslCert != null) ''
-      r ${cfg.sslCert},
-    ''
-    + lib.optionalString (cfg.sslKey != null) ''
-      r ${cfg.sslKey},
-    ''
-    + lib.optionalString (cfg.sslCa != null) ''
-      r ${cfg.sslCa},
-    ''
-    + lib.optionalString (cfg.dbus != null) ''
-      dbus bus=${cfg.dbus}
-    ''
-    + ''
+        ${config.environment.etc."os-release".source} r,
+        ${config.environment.etc."lsb-release".source} r,
+        owner ${cfg.stateDir}/murmur.sqlite rwk,
+        owner ${cfg.stateDir}/murmur.sqlite-journal rw,
+        owner ${cfg.stateDir}/ r,
+        /run/murmur/murmurd.pid r,
+        /run/murmur/murmurd.ini r,
+        ${configFile} r,
+        ${lib.optionalString cfg.logToFile ''
+          /var/log/murmur/murmurd.log rw,
+        ''}
+        ${lib.optionalString (cfg.sslCert != null) ''
+          ${cfg.sslCert} r,
+        ''}
+        ${lib.optionalString (cfg.sslKey != null) ''
+          ${cfg.sslKey} r,
+        ''}
+        ${lib.optionalString (cfg.sslCa != null) ''
+          ${cfg.sslCa} r,
+        ''}
+        ${lib.optionalString (cfg.dbus != null) ''
+          dbus bus=${cfg.dbus},
+        ''}
+        include if exists <local/bin.mumble-server>
       }
     '';
   };
diff --git a/nixos/modules/services/networking/nats.nix b/nixos/modules/services/networking/nats.nix
index 57765c9d2449..4508fdc1f339 100644
--- a/nixos/modules/services/networking/nats.nix
+++ b/nixos/modules/services/networking/nats.nix
@@ -138,7 +138,15 @@ in
           Type = "simple";
           ExecStart = "${pkgs.nats-server}/bin/nats-server -c ${configFile}";
           ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
-          ExecStop = "${pkgs.coreutils}/bin/kill -SIGINT $MAINPID";
+
+          KillMode = "mixed";
+          KillSignal = "SIGUSR2";
+          SuccessExitStatus = [
+            0
+            "SIGUSR2"
+          ];
+
+          TimeoutStopSec = "150"; # must exceed lame_duck_duration, which defaults to 2min
           Restart = "on-failure";
 
           User = cfg.user;
diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index 7b9b7183394c..ba2c1be37c52 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -92,7 +92,6 @@ in
         services.netbird.clients.default = {
           port = 51820;
           name = "netbird";
-          systemd.name = "netbird";
           interface = "wt0";
           hardened = false;
         };
@@ -232,6 +231,14 @@ in
                 '';
               };
 
+              openInternalFirewall = mkOption {
+                type = bool;
+                default = true;
+                description = ''
+                  Opens up internal firewall ports for the NetBird's network interface.
+                '';
+              };
+
               hardened = mkOption {
                 type = bool;
                 default = true;
@@ -503,8 +510,11 @@ in
         interfaces = listToAttrs (
           toClientList (client: {
             name = client.interface;
-            value.allowedUDPPorts = optionals client.openFirewall [
-              5353 # required for the DNS forwarding/routing to work
+            value.allowedUDPPorts = optionals client.openInternalFirewall [
+              # note: those should be opened up by NetBird itself, but it needs additional
+              #  NixOS -specific debugging and tweaking before it works
+              5353 # <0.59.0 DNS forwarder port, kept for compatibility with those clients
+              22054 # >=0.59.0 DNS forwarder port
             ];
           })
         );
diff --git a/nixos/modules/services/networking/netbird/dashboard.nix b/nixos/modules/services/networking/netbird/dashboard.nix
index bee3aeadd55e..3cddb34a8ac0 100644
--- a/nixos/modules/services/networking/netbird/dashboard.nix
+++ b/nixos/modules/services/networking/netbird/dashboard.nix
@@ -135,10 +135,12 @@ in
                 "$AUTH_SUPPORTED_SCOPES"
                 "$NETBIRD_DRAG_QUERY_PARAMS"
                 "$NETBIRD_GOOGLE_ANALYTICS_ID"
+                "$NETBIRD_GOOGLE_TAG_MANAGER_ID"
                 "$NETBIRD_HOTJAR_TRACK_ID"
                 "$NETBIRD_MGMT_API_ENDPOINT"
                 "$NETBIRD_MGMT_GRPC_API_ENDPOINT"
                 "$NETBIRD_TOKEN_SOURCE"
+                "$NETBIRD_WASM_PATH"
                 "$USE_AUTH0"
               ];
             }
diff --git a/nixos/modules/services/networking/newt.nix b/nixos/modules/services/networking/newt.nix
index bc2d1cc001a9..9caa45351958 100644
--- a/nixos/modules/services/networking/newt.nix
+++ b/nixos/modules/services/networking/newt.nix
@@ -83,7 +83,7 @@ in
       };
       # the flag values will all be overwritten if also defined in the env file
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} ${lib.cli.toGNUCommandLineShell { } cfg.settings}";
+        ExecStart = "${lib.getExe cfg.package} ${lib.cli.toCommandLineShellGNU { } cfg.settings}";
         DynamicUser = true;
         StateDirectory = "newt";
         StateDirectoryMode = "0700";
diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 7ee1b7caafed..7275d25ad5e1 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -67,6 +67,9 @@ in
         There are other programs that use iptables internally too, such as
         libvirt. For information on how the two firewalls interact, see
         <https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F>.
+
+        Some network configurations may prevent VMs from having network access, see
+        <https://wiki.nixos.org/wiki/Networking#Virtualization>.
       '';
     };
 
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index bc6aa5ae3fff..46d9d084d7d7 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -100,19 +100,19 @@ let
       # interfaces
     ${forEach "  ip-address: " cfg.interfaces}
 
-      ip-freebind:         ${yesOrNo cfg.ipFreebind}
-      hide-version:        ${yesOrNo cfg.hideVersion}
+      ip-freebind:         ${boolToYesNo cfg.ipFreebind}
+      hide-version:        ${boolToYesNo cfg.hideVersion}
       identity:            "${cfg.identity}"
-      ip-transparent:      ${yesOrNo cfg.ipTransparent}
-      do-ip4:              ${yesOrNo cfg.ipv4}
+      ip-transparent:      ${boolToYesNo cfg.ipTransparent}
+      do-ip4:              ${boolToYesNo cfg.ipv4}
       ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
-      do-ip6:              ${yesOrNo cfg.ipv6}
+      do-ip6:              ${boolToYesNo cfg.ipv6}
       ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
-      log-time-ascii:      ${yesOrNo cfg.logTimeAscii}
+      log-time-ascii:      ${boolToYesNo cfg.logTimeAscii}
       ${maybeString "nsid: " cfg.nsid}
       port:                ${toString cfg.port}
-      reuseport:           ${yesOrNo cfg.reuseport}
-      round-robin:         ${yesOrNo cfg.roundRobin}
+      reuseport:           ${boolToYesNo cfg.reuseport}
+      round-robin:         ${boolToYesNo cfg.roundRobin}
       server-count:        ${toString cfg.serverCount}
       ${maybeToString "statistics: " cfg.statistics}
       tcp-count:           ${toString cfg.tcpCount}
@@ -121,7 +121,7 @@ let
       verbosity:           ${toString cfg.verbosity}
       ${maybeString "version: " cfg.version}
       xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout}
-      zonefiles-check:     ${yesOrNo cfg.zonefilesCheck}
+      zonefiles-check:     ${boolToYesNo cfg.zonefilesCheck}
       zonefiles-write:     ${toString cfg.zonefilesWrite}
 
       ${maybeString "rrl-ipv4-prefix-length: " cfg.ratelimit.ipv4PrefixLength}
@@ -134,7 +134,7 @@ let
     ${keyConfigFile}
 
     remote-control:
-      control-enable:    ${yesOrNo cfg.remoteControl.enable}
+      control-enable:    ${boolToYesNo cfg.remoteControl.enable}
       control-key-file:  "${cfg.remoteControl.controlKeyFile}"
       control-cert-file: "${cfg.remoteControl.controlCertFile}"
     ${forEach "  control-interface: " cfg.remoteControl.interfaces}
@@ -147,7 +147,6 @@ let
     ${cfg.extraConfig}
   '';
 
-  yesOrNo = b: if b then "yes" else "no";
   maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"'';
   maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}'';
   forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
@@ -183,8 +182,8 @@ let
       ${maybeToString "max-retry-time:   " zone.maxRetrySecs}
       ${maybeToString "min-retry-time:   " zone.minRetrySecs}
 
-      allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback}
-      multi-master-check: ${yesOrNo zone.multiMasterCheck}
+      allow-axfr-fallback: ${boolToYesNo zone.allowAXFRFallback}
+      multi-master-check: ${boolToYesNo zone.multiMasterCheck}
     ${forEach "  allow-notify: " zone.allowNotify}
     ${forEach "  request-xfr: " zone.requestXFR}
 
diff --git a/nixos/modules/services/networking/oink.nix b/nixos/modules/services/networking/oink.nix
index e98c1690ee52..5c76a7de5036 100644
--- a/nixos/modules/services/networking/oink.nix
+++ b/nixos/modules/services/networking/oink.nix
@@ -85,6 +85,10 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       script = "${cfg.package}/bin/oink -c ${oinkConfig}";
+      serviceConfig = {
+        Restart = "on-failure";
+        RestartSec = "10";
+      };
     };
   };
 }
diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix
index 3cb1e9c63d7d..4b92a230842d 100644
--- a/nixos/modules/services/networking/opengfw.nix
+++ b/nixos/modules/services/networking/opengfw.nix
@@ -390,7 +390,7 @@ in
 
         serviceConfig = rec {
           WorkingDirectory = cfg.dir;
-          ExecReload = "kill -HUP $MAINPID";
+          ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID";
           Restart = "always";
           User = cfg.user;
           StandardOutput = mkIf (cfg.logFile != null) "append:${cfg.logFile}";
diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 0bd9d2a2f474..cea5b180a353 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -11,8 +11,6 @@ let
 
   cfg = config.services.openvpn;
 
-  inherit (pkgs) openvpn;
-
   makeOpenVPNJob =
     cfg: name:
     let
@@ -77,7 +75,7 @@ let
         pkgs.net-tools
       ];
 
-      serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
+      serviceConfig.ExecStart = "@${config.services.openvpn.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
       serviceConfig.Restart = "always";
       serviceConfig.Type = "notify";
     };
@@ -85,13 +83,12 @@ let
   restartService = optionalAttrs cfg.restartAfterSleep {
     openvpn-restart = {
       wantedBy = [ "sleep.target" ];
-      path = [ pkgs.procps ];
       script =
         let
           unitNames = map (n: "openvpn-${n}.service") (builtins.attrNames cfg.servers);
         in
         "systemctl try-restart ${lib.escapeShellArgs unitNames}";
-      description = "Sends a signal to OpenVPN process to trigger a restart after return from sleep";
+      description = "Restart system OpenVPN connections when returning from sleep";
     };
   };
 
@@ -105,6 +102,7 @@ in
   ###### interface
 
   options = {
+    services.openvpn.package = lib.mkPackageOption pkgs "openvpn" { };
 
     services.openvpn.servers = mkOption {
       default = { };
@@ -255,7 +253,7 @@ in
       ))
       // restartService;
 
-    environment.systemPackages = [ openvpn ];
+    environment.systemPackages = [ cfg.package ];
 
     boot.kernelModules = [ "tun" ];
 
diff --git a/nixos/modules/services/networking/opkssh/opkssh.nix b/nixos/modules/services/networking/opkssh/opkssh.nix
new file mode 100644
index 000000000000..035b8f9f7ff4
--- /dev/null
+++ b/nixos/modules/services/networking/opkssh/opkssh.nix
@@ -0,0 +1,170 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.opkssh;
+
+  providerFile = pkgs.writeText "opkssh-providers" (
+    lib.concatStringsSep "\n" (
+      lib.mapAttrsToList (
+        name: provider: "${provider.issuer} ${provider.clientId} ${provider.lifetime}"
+      ) cfg.providers
+    )
+  );
+
+  authIdFile = pkgs.writeText "opkssh-auth-id" (
+    lib.concatStringsSep "\n" (
+      lib.map (auth: "${auth.user} ${auth.principal} ${auth.issuer}") cfg.authorizations
+    )
+  );
+in
+{
+  options.services.opkssh = {
+    enable = lib.mkEnableOption "OpenID Connect SSH authentication";
+
+    package = lib.mkPackageOption pkgs "opkssh" { };
+
+    user = lib.mkOption {
+      type = lib.types.str;
+      default = "opksshuser";
+      description = "System user for running opkssh";
+    };
+
+    group = lib.mkOption {
+      type = lib.types.str;
+      default = "opksshuser";
+      description = "System group for opkssh";
+    };
+
+    providers = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule {
+          options = {
+            issuer = lib.mkOption {
+              type = lib.types.str;
+              description = "Issuer URI";
+              example = "https://accounts.google.com";
+            };
+
+            clientId = lib.mkOption {
+              type = lib.types.str;
+              description = "OAuth client ID";
+            };
+
+            lifetime = lib.mkOption {
+              type = lib.types.enum [
+                "12h"
+                "24h"
+                "48h"
+                "1week"
+                "oidc"
+                "oidc-refreshed"
+              ];
+              default = "24h";
+              description = "Token lifetime";
+            };
+          };
+        }
+      );
+      default = {
+        google = {
+          issuer = "https://accounts.google.com";
+          clientId = "206584157355-7cbe4s640tvm7naoludob4ut1emii7sf.apps.googleusercontent.com";
+          lifetime = "24h";
+        };
+        microsoft = {
+          issuer = "https://login.microsoftonline.com/9188040d-6c67-4c5b-b112-36a304b66dad/v2.0";
+          clientId = "096ce0a3-5e72-4da8-9c86-12924b294a01";
+          lifetime = "24h";
+        };
+        github = {
+          issuer = "https://token.actions.githubusercontent.com";
+          clientId = "github";
+          lifetime = "oidc";
+        };
+      };
+      description = "OpenID Connect providers configuration";
+    };
+
+    authorizations = lib.mkOption {
+      type = lib.types.listOf (
+        lib.types.submodule {
+          options = {
+            user = lib.mkOption {
+              type = lib.types.str;
+              description = "Linux user to authorize";
+            };
+
+            principal = lib.mkOption {
+              type = lib.types.str;
+              description = "Principal identifier (email, repo, etc.)";
+            };
+
+            issuer = lib.mkOption {
+              type = lib.types.str;
+              description = "Issuer URI";
+            };
+          };
+        }
+      );
+      default = [ ];
+      description = "User authorization mappings";
+      example = lib.literalExpression ''
+        # This example refers to values in the providers example
+        # adjust your expressions as necessary
+        [
+          {
+            user = "alice";
+            principal = "alice@gmail.com";
+            inherit (config.services.opkssh.providers.google) issuer;
+          }
+          {
+            user = "bob";
+            principal = "repo:NixOs/nixpkgs:environment:production";
+            inherit (config.services.opkssh.providers.github) issuer;
+          }
+        ];
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    users.groups.${cfg.group} = { };
+    users.users.${cfg.user} = {
+      isSystemUser = true;
+      description = "OpenPubkey OpenID Connect SSH User";
+      group = cfg.group;
+    };
+
+    services.openssh = {
+      authorizedKeysCommand = "/run/wrappers/bin/opkssh verify %u %k %t";
+      authorizedKeysCommandUser = cfg.user;
+    };
+
+    security.wrappers."opkssh" = {
+      source = "${cfg.package}/bin/opkssh";
+      owner = "root";
+      group = "root";
+    };
+
+    environment.etc."opk/providers" = {
+      mode = "0640";
+      user = cfg.user;
+      group = cfg.group;
+      source = providerFile;
+    };
+
+    environment.etc."opk/auth_id" = {
+      mode = "0640";
+      user = cfg.user;
+      group = cfg.group;
+      source = authIdFile;
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ datosh ];
+}
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 3185dd1b9696..172f45c61331 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -21,7 +21,6 @@ let
     ];
   configType = with types; attrsOf (nullOr (oneOrMore valueType));
 
-  toBool = val: if val then "yes" else "no";
   serialize =
     val:
     with types;
@@ -32,7 +31,7 @@ let
     else if path.check val then
       toString val
     else if bool.check val then
-      toBool val
+      boolToYesNo val
     else if builtins.isList val then
       (concatMapStringsSep "," serialize val)
     else
diff --git a/nixos/modules/services/networking/quorum.nix b/nixos/modules/services/networking/quorum.nix
deleted file mode 100644
index d86d32bc2de4..000000000000
--- a/nixos/modules/services/networking/quorum.nix
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  config,
-  options,
-  pkgs,
-  lib,
-  ...
-}:
-let
-
-  inherit (lib)
-    mkEnableOption
-    mkIf
-    mkOption
-    literalExpression
-    types
-    optionalString
-    ;
-
-  cfg = config.services.quorum;
-  opt = options.services.quorum;
-  dataDir = "/var/lib/quorum";
-  genesisFile = pkgs.writeText "genesis.json" (builtins.toJSON cfg.genesis);
-  staticNodesFile = pkgs.writeText "static-nodes.json" (builtins.toJSON cfg.staticNodes);
-
-in
-{
-  options = {
-
-    services.quorum = {
-      enable = mkEnableOption "Quorum blockchain daemon";
-
-      user = mkOption {
-        type = types.str;
-        default = "quorum";
-        description = "The user as which to run quorum.";
-      };
-
-      group = mkOption {
-        type = types.str;
-        default = cfg.user;
-        defaultText = literalExpression "config.${opt.user}";
-        description = "The group as which to run quorum.";
-      };
-
-      port = mkOption {
-        type = types.port;
-        default = 21000;
-        description = "Override the default port on which to listen for connections.";
-      };
-
-      nodekeyFile = mkOption {
-        type = types.path;
-        default = "${dataDir}/nodekey";
-        description = "Path to the nodekey.";
-      };
-
-      staticNodes = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        example = [
-          "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0"
-        ];
-        description = "List of validator nodes.";
-      };
-
-      privateconfig = mkOption {
-        type = types.str;
-        default = "ignore";
-        description = "Configuration of privacy transaction manager.";
-      };
-
-      syncmode = mkOption {
-        type = types.enum [
-          "fast"
-          "full"
-          "light"
-        ];
-        default = "full";
-        description = "Blockchain sync mode.";
-      };
-
-      blockperiod = mkOption {
-        type = types.int;
-        default = 5;
-        description = "Default minimum difference between two consecutive block's timestamps in seconds.";
-      };
-
-      permissioned = mkOption {
-        type = types.bool;
-        default = true;
-        description = "Allow only a defined list of nodes to connect.";
-      };
-
-      rpc = {
-        enable = mkOption {
-          type = types.bool;
-          default = true;
-          description = "Enable RPC interface.";
-        };
-
-        address = mkOption {
-          type = types.str;
-          default = "0.0.0.0";
-          description = "Listening address for RPC connections.";
-        };
-
-        port = mkOption {
-          type = types.port;
-          default = 22004;
-          description = "Override the default port on which to listen for RPC connections.";
-        };
-
-        api = mkOption {
-          type = types.str;
-          default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul";
-          description = "API's offered over the HTTP-RPC interface.";
-        };
-      };
-
-      ws = {
-        enable = mkOption {
-          type = types.bool;
-          default = true;
-          description = "Enable WS-RPC interface.";
-        };
-
-        address = mkOption {
-          type = types.str;
-          default = "0.0.0.0";
-          description = "Listening address for WS-RPC connections.";
-        };
-
-        port = mkOption {
-          type = types.port;
-          default = 8546;
-          description = "Override the default port on which to listen for WS-RPC connections.";
-        };
-
-        api = mkOption {
-          type = types.str;
-          default = "admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul";
-          description = "API's offered over the WS-RPC interface.";
-        };
-
-        origins = mkOption {
-          type = types.str;
-          default = "*";
-          description = "Origins from which to accept websockets requests";
-        };
-      };
-
-      genesis = mkOption {
-        type = types.nullOr types.attrs;
-        default = null;
-        example = literalExpression ''
-          {
-                   alloc = {
-                     a47385db68718bdcbddc2d2bb7c54018066ec111 = {
-                       balance = "1000000000000000000000000000";
-                     };
-                   };
-                   coinbase = "0x0000000000000000000000000000000000000000";
-                   config = {
-                     byzantiumBlock = 4;
-                     chainId = 494702925;
-                     eip150Block = 2;
-                     eip155Block = 3;
-                     eip158Block = 3;
-                     homesteadBlock = 1;
-                     isQuorum = true;
-                     istanbul = {
-                       epoch = 30000;
-                       policy = 0;
-                     };
-                   };
-                   difficulty = "0x1";
-                   extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f85ad59438f0508111273d8e482f49410ca4078afc86a961b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0";
-                   gasLimit = "0x2FEFD800";
-                   mixHash = "0x63746963616c2062797a616e74696e65201111756c7420746f6c6572616e6365";
-                   nonce = "0x0";
-                   parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000";
-                   timestamp = "0x00";
-                   }'';
-        description = "Blockchain genesis settings.";
-      };
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.quorum ];
-    systemd.tmpfiles.rules = [
-      "d '${dataDir}' 0770 '${cfg.user}' '${cfg.group}' - -"
-    ];
-    systemd.services.quorum = {
-      description = "Quorum daemon";
-      after = [ "network.target" ];
-      wantedBy = [ "multi-user.target" ];
-      environment = {
-        PRIVATE_CONFIG = "${cfg.privateconfig}";
-      };
-      preStart = ''
-        if [ ! -d ${dataDir}/geth ]; then
-          if [ ! -d ${dataDir}/keystore ]; then
-            echo ERROR: You need to create a wallet before initializing your genesis file, run:
-            echo   # su -s /bin/sh - quorum
-            echo   $ geth --datadir ${dataDir} account new
-            echo and configure your genesis file accordingly.
-            exit 1;
-          fi
-          ln -s ${staticNodesFile} ${dataDir}/static-nodes.json
-          ${pkgs.quorum}/bin/geth --datadir ${dataDir} init ${genesisFile}
-        fi
-      '';
-      serviceConfig = {
-        User = cfg.user;
-        Group = cfg.group;
-        ExecStart = ''
-          ${pkgs.quorum}/bin/geth \
-                      --nodiscover \
-                      --verbosity 5 \
-                      --nodekey ${cfg.nodekeyFile} \
-                      --istanbul.blockperiod ${toString cfg.blockperiod} \
-                      --syncmode ${cfg.syncmode} \
-                      ${optionalString (cfg.permissioned) "--permissioned"} \
-                      --mine --miner.threads 1 \
-                      ${optionalString (cfg.rpc.enable) "--rpc --rpcaddr ${cfg.rpc.address} --rpcport ${toString cfg.rpc.port} --rpcapi ${cfg.rpc.api}"} \
-                      ${optionalString (cfg.ws.enable) "--ws --ws.addr ${cfg.ws.address} --ws.port ${toString cfg.ws.port} --ws.api ${cfg.ws.api} --ws.origins ${cfg.ws.origins}"} \
-                      --emitcheckpoints \
-                      --datadir ${dataDir} \
-                      --port ${toString cfg.port}'';
-        Restart = "on-failure";
-
-        # Hardening measures
-        PrivateTmp = "true";
-        ProtectSystem = "full";
-        NoNewPrivileges = "true";
-        PrivateDevices = "true";
-        MemoryDenyWriteExecute = "true";
-      };
-    };
-    users.users.${cfg.user} = {
-      name = cfg.user;
-      group = cfg.group;
-      description = "Quorum daemon user";
-      home = dataDir;
-      isSystemUser = true;
-    };
-    users.groups.${cfg.group} = { };
-  };
-}
diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index e64bf6a9e792..8603084f0658 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -13,7 +13,9 @@ let
 
   cfg = config.services.searx;
 
-  settingsFile = pkgs.writeText "settings.yml" (builtins.toJSON cfg.settings);
+  settingsFile = pkgs.writeText "settings.yml" (
+    builtins.toJSON (builtins.removeAttrs cfg.settings [ "redis" ])
+  );
 
   faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings;
   limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings;
@@ -79,12 +81,22 @@ in
       };
 
       settings = mkOption {
-        type = types.submodule {
-          freeformType = settingType;
-          imports = [
-            (mkRenamedOptionModule [ "redis" ] [ "valkey" ])
-          ];
-        };
+        type = types.submodule (
+          { config, ... }:
+          {
+            options = {
+              valkey = lib.mkOption {
+                internal = true;
+                default = { };
+              };
+            };
+            config.valkey = lib.mkIf (config ? redis) (
+              lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis
+            );
+
+            freeformType = settingType;
+          }
+        );
         default = { };
         example = literalExpression ''
           {
@@ -287,7 +299,9 @@ in
               ]
             )) "s"
           }://${cfg.domain}/";
-          valkey.url = lib.mkIf cfg.redisCreateLocally "unix://${config.services.redis.servers.searx.unixSocket}";
+          valkey = lib.mkIf cfg.redisCreateLocally {
+            url = "unix://${config.services.redis.servers.searx.unixSocket}";
+          };
         };
       };
 
diff --git a/nixos/modules/services/networking/smartdns.nix b/nixos/modules/services/networking/smartdns.nix
index d60c5cf19b84..761f3c3e6a14 100644
--- a/nixos/modules/services/networking/smartdns.nix
+++ b/nixos/modules/services/networking/smartdns.nix
@@ -23,7 +23,7 @@ let
     with generators;
     toKeyValue {
       mkKeyValue = mkKeyValueDefault {
-        mkValueString = v: if isBool v then if v then "yes" else "no" else mkValueStringDefault { } v;
+        mkValueString = v: if isBool v then boolToYesNo v else mkValueStringDefault { } v;
       } " ";
       listsAsDuplicateKeys = true; # Allowing duplications because we need to deal with multiple entries with the same key.
     } cfg.settings
diff --git a/nixos/modules/services/networking/snowflake-proxy.nix b/nixos/modules/services/networking/snowflake-proxy.nix
index 046ca5c7b5fc..a8e86bcde0d4 100644
--- a/nixos/modules/services/networking/snowflake-proxy.nix
+++ b/nixos/modules/services/networking/snowflake-proxy.nix
@@ -38,6 +38,13 @@ in
         type = with types; nullOr str;
         default = null;
       };
+
+      extraFlags = mkOption {
+        description = "Extra flags to pass to snowflake-proxy";
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "-metrics" ];
+      };
     };
   };
 
@@ -52,6 +59,7 @@ in
             ++ optional (cfg.capacity != null) "-capacity ${builtins.toString cfg.capacity}"
             ++ optional (cfg.relay != null) "-relay ${cfg.relay}"
             ++ optional (cfg.stun != null) "-stun ${cfg.stun}"
+            ++ cfg.extraFlags
           );
 
         # Security Hardening
diff --git a/nixos/modules/services/networking/soju.nix b/nixos/modules/services/networking/soju.nix
index 6965f3d4c73d..8b4a818cfe21 100644
--- a/nixos/modules/services/networking/soju.nix
+++ b/nixos/modules/services/networking/soju.nix
@@ -22,7 +22,6 @@ let
     ${listenCfg}
     hostname ${cfg.hostName}
     ${tlsCfg}
-    db sqlite3 ${stateDir}/soju.db
     ${logCfg}
     http-origin ${concatStringsSep " " cfg.httpOrigins}
     accept-proxy-ip ${concatStringsSep " " cfg.acceptProxyIP}
@@ -153,6 +152,7 @@ in
         ExecStart = "${lib.getExe' cfg.package "soju"} -config ${cfg.configFile}";
         StateDirectory = "soju";
         RuntimeDirectory = "soju";
+        WorkingDirectory = stateDir;
       };
     };
   };
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 10faf3e9d6f7..1301c3648011 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -21,7 +21,6 @@ let
     let
       # reports boolean as yes / no
       mkValueString =
-
         v:
         if lib.isInt v then
           toString v
@@ -178,8 +177,8 @@ in
 
 {
   imports = [
-    (lib.mkAliasOptionModuleMD [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
-    (lib.mkAliasOptionModuleMD [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
+    (lib.mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
+    (lib.mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
     (lib.mkRenamedOptionModule
       [ "services" "openssh" "challengeResponseAuthentication" ]
       [ "services" "openssh" "kbdInteractiveAuthentication" ]
@@ -456,7 +455,7 @@ in
                 default = "none"; # upstream default
                 description = ''
                   Specifies a file that lists principal names that are accepted for certificate authentication. The default
-                  is `"none"`, i.e. not to use	a principals file.
+                  is `"none"`, i.e. not to use a principals file.
                 '';
               };
               LogLevel = lib.mkOption {
@@ -485,7 +484,6 @@ in
               };
               UseDns = lib.mkOption {
                 type = lib.types.nullOr lib.types.bool;
-                # apply if cfg.useDns then "yes" else "no"
                 default = false;
                 description = ''
                   Specifies whether {manpage}`sshd(8)` should look up the remote host name, and to check that the resolved host name for
@@ -825,37 +823,29 @@ in
       authPrincipalsFiles != { }
     ) "/etc/ssh/authorized_principals.d/%u";
 
-    services.openssh.extraConfig = lib.mkOrder 0 ''
-      Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}
-
-      AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
-      ${lib.concatMapStrings (port: ''
-        Port ${toString port}
-      '') cfg.ports}
-
-      ${lib.concatMapStrings (
-        { port, addr, ... }:
+    services.openssh.extraConfig = lib.mkOrder 0 (
+      lib.concatStringsSep "\n" (
+        [
+          "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}"
+          "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}"
+        ]
+        ++ lib.map (port: ''Port ${toString port}'') cfg.ports
+        ++ lib.map (
+          { port, addr, ... }:
+          ''ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}''
+        ) cfg.listenAddresses
+        ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}"
+        ++ lib.optional cfg.allowSFTP ''Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}''
+        ++ [
+          "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}"
+        ]
+        ++ lib.optional (cfg.authorizedKeysCommand != "none") ''
+          AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
+          AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
         ''
-          ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}
-        ''
-      ) cfg.listenAddresses}
-
-      ${lib.optionalString cfgc.setXAuthLocation ''
-        XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
-      ''}
-      ${lib.optionalString cfg.allowSFTP ''
-        Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}
-      ''}
-      AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
-      ${lib.optionalString (cfg.authorizedKeysCommand != "none") ''
-        AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
-        AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
-      ''}
-
-      ${lib.flip lib.concatMapStrings cfg.hostKeys (k: ''
-        HostKey ${k.path}
-      '')}
-    '';
+        ++ lib.map (k: "HostKey ${k.path}") cfg.hostKeys
+      )
+    );
 
     system.checks = [
       (pkgs.runCommand "check-sshd-config"
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
index cb4ef1079016..82b38d18c639 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
@@ -97,7 +97,7 @@ rec {
       default = null;
       description = documentDefault description strongswanDefault;
     };
-    render = single (b: if b then "yes" else "no");
+    render = single boolToYesNo;
   };
   yes = true;
   no = false;
diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index bcdcfec9fc06..aa99f47acacb 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -1353,6 +1353,7 @@ in
         netmask = mkCommaSepListParam [ ] "Address or CIDR subnets";
         server = mkCommaSepListParam [ ] "Address or CIDR subnets";
         subnet = mkCommaSepListParam [ ] "Address or CIDR subnets";
+        p_cscf = mkCommaSepListParam [ ] "Address or CIDR subnets";
         split_include = mkCommaSepListParam [ ] "Address or CIDR subnets";
         split_exclude = mkCommaSepListParam [ ] "Address or CIDR subnets";
       }
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 9ff040191361..9ce2451b4231 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -7,7 +7,6 @@
 let
 
   cfg = config.services.stunnel;
-  yesNo = val: if val then "yes" else "no";
 
   verifyRequiredField = type: field: n: c: {
     assertion = lib.hasAttr field c;
@@ -23,13 +22,7 @@ let
 
   removeNulls = lib.mapAttrs (_: lib.filterAttrs (_: v: v != null));
   mkValueString =
-    v:
-    if v == true then
-      "yes"
-    else if v == false then
-      "no"
-    else
-      lib.generators.mkValueStringDefault { } v;
+    v: if lib.isBool v then lib.boolToYesNo v else lib.generators.mkValueStringDefault { } v;
   generateConfig =
     c:
     lib.generators.toINI {
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index c3baf59db455..f1fcaf855e96 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -117,6 +117,7 @@ let
             override = cfg.overrideFolders;
             conf = folders;
             baseAddress = curlAddressArgs "/rest/config/folders";
+            ignoreAddress = curlAddressArgs "/rest/db/ignores";
           };
         }
         [
@@ -142,7 +143,8 @@ let
                 let
                   jsonPreSecretsFile = pkgs.writeTextFile {
                     name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json";
-                    text = builtins.toJSON new_cfg;
+                    # Remove the ignorePatterns attribute, it is handled separately
+                    text = builtins.toJSON (builtins.removeAttrs new_cfg [ "ignorePatterns" ]);
                   };
                   injectSecretsJqCmd =
                     {
@@ -209,6 +211,13 @@ let
                 ''
                   ${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress}
                 ''
+                /*
+                  Check if we are configuring a folder which has ignore patterns.
+                  If it does, write the ignore patterns to the rest API.
+                */
+                + lib.optionalString ((conf_type == "dirs") && (new_cfg.ignorePatterns != null)) ''
+                  curl -d '{"ignore": ${builtins.toJSON new_cfg.ignorePatterns}}' -X POST ${s.ignoreAddress}?folder=${new_cfg.id}
+                ''
               ))
               (lib.concatStringsSep "\n")
             ]
@@ -649,6 +658,26 @@ in
                           Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux).
                         '';
                       };
+
+                      ignorePatterns = mkOption {
+                        type = types.nullOr (types.listOf types.str);
+                        default = null;
+                        description = ''
+                          Syncthing can be configured to ignore certain files in a folder using ignore patterns.
+                          Enter them as a list of strings, one string per line.
+                          See the Syncthing documentation for syntax: <https://docs.syncthing.net/users/ignoring.html>
+                          Patterns set using the WebUI will be overridden if you define this option.
+                          If you want to override the ignore patterns to be empty, use `ignorePatterns = []`.
+                          Deleting the `ignorePatterns` option will not remove the patterns from Syncthing automatically
+                          because patterns are only handled by the module if this option is defined. Either use
+                          `ignorePatterns = []` before deleting the option or remove the patterns afterwards using the WebUI.
+                        '';
+                        example = [
+                          "// This is a comment"
+                          "*.part // Firefox downloads and other things"
+                          "*.crdownload // Chrom(ium|e) downloads"
+                        ];
+                      };
                     };
                   }
                 )
@@ -918,7 +947,7 @@ in
           ExecStart =
             let
               args = lib.escapeShellArgs (
-                (lib.cli.toGNUCommandLine { } {
+                (lib.cli.toCommandLineGNU { } {
                   "no-browser" = true;
                   "gui-address" = (if isUnixGui then "unix://" else "") + cfg.guiAddress;
                   "config" = cfg.configDir;
diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix
index 7ed0cf51e561..f7221bdaf8c7 100644
--- a/nixos/modules/services/networking/tayga.nix
+++ b/nixos/modules/services/networking/tayga.nix
@@ -28,7 +28,7 @@ let
       log ${concatStringsSep " " cfg.log}
     ''}
 
-    wkpf-strict ${if cfg.wkpfStrict then "yes" else "no"}
+    wkpf-strict ${boolToYesNo cfg.wkpfStrict}
   '';
 
   addrOpts =
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 7ad0c53c17e9..219ca9fc13a9 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -9,8 +9,6 @@ with lib;
 let
   cfg = config.services.unbound;
 
-  yesOrNo = v: if v then "yes" else "no";
-
   toOption =
     indent: n: v:
     "${indent}${toString n}: ${v}";
@@ -22,7 +20,7 @@ let
     else if isInt v then
       (toOption indent n (toString v))
     else if isBool v then
-      (toOption indent n (yesOrNo v))
+      (toOption indent n (lib.boolToYesNo v))
     else if isString v then
       (toOption indent n v)
     else if isList v then
diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix
index 0dc9f5b8d91c..08a5f635e331 100644
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -101,15 +101,22 @@ let
         iproute2
         systemd
       ];
-      # networkd doesn't provide a mechanism for refreshing endpoints.
+      # networkd doesn't automatically refresh peer endpoints.
       # See: https://github.com/systemd/systemd/issues/9911
-      # This hack does the job but takes down the whole interface to do it.
       script = ''
-        ip link delete ${name} || :
+        touch /etc/systemd/network/40-${name}.netdev
         networkctl reload
       '';
     };
 
+  # netdev config must be a real file (not a symlink to a store file)
+  # so the refresh service can 'touch' it.
+  generateRefreshNetdevMode =
+    name: interface:
+    nameValuePair "systemd/network/40-${name}.netdev" {
+      mode = "0444";
+    };
+
 in
 {
   meta.maintainers = [ lib.maintainers.majiir ];
@@ -225,6 +232,7 @@ in
       networks = mapAttrs generateNetwork cfg.interfaces;
     };
 
+    environment.etc = mapAttrs' generateRefreshNetdevMode refreshEnabledInterfaces;
     systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces;
     systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // {
       systemd-networkd.serviceConfig.LoadCredential = flatten (
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 7d266d483fb1..771301852745 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -215,15 +215,6 @@ let
             This option can be set or overridden for individual peers.
 
             Setting this to `0` disables periodic refresh.
-
-            ::: {.warning}
-            When {option}`networking.wireguard.useNetworkd` is enabled, this
-            option deletes the Wireguard interface and brings it back up by
-            reconfiguring the network with `networkctl reload` on every refresh.
-            This could have adverse effects on your network and cause brief
-            connectivity blips. See [systemd/systemd#9911](https://github.com/systemd/systemd/issues/9911)
-            for an upstream feature request that can make this less hacky.
-            :::
           '';
         };
 
diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix
index ce6195ec1011..8d20b37eeea8 100644
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -26,7 +26,7 @@ let
         str
         (listOf str)
       ]);
-    generate = lib.cli.toGNUCommandLineShell { };
+    generate = lib.cli.toCommandLineShellGNU { };
   };
 
   hostPortToString = { host, port, ... }: "${host}:${toString port}";
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 71a258fbfee1..d33b4d97519b 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -31,7 +31,7 @@ let
       ${optionalString (srv.flags != "") "flags = ${srv.flags}"}
       socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"}
       ${optionalString (srv.port != 0) "port        = ${toString srv.port}"}
-      wait        = ${if srv.protocol == "udp" then "yes" else "no"}
+      wait        = ${lib.boolToYesNo (srv.protocol == "udp")}
       user        = ${srv.user}
       server      = ${srv.server}
       ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"}
diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index fd85f29e300e..9dc737bd7d0d 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -134,6 +134,6 @@ with lib;
   ];
 
   meta = {
-    inherit (pkgs.zeronet) maintainers;
+    inherit (pkgs.zeronet.meta) maintainers;
   };
 }
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index ce0b1159470a..37e15130b8cd 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -54,6 +54,7 @@ let
       cups-filters
       pkgs.ghostscript
     ]
+    ++ lib.optional cfg.browsed.enable cfg.browsed.package
     ++ cfg.drivers;
     pathsToLink = [
       "/lib"
diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix
index 72179533cfe8..ae42d30168ab 100644
--- a/nixos/modules/services/scheduling/prefect.nix
+++ b/nixos/modules/services/scheduling/prefect.nix
@@ -173,7 +173,6 @@ in
           ProtectKernelLogs = true;
           ProtectControlGroups = true;
           MemoryAccounting = true;
-          CPUAccounting = true;
 
           ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}";
           Restart = "always";
@@ -216,7 +215,6 @@ in
           ProtectKernelLogs = true;
           ProtectControlGroups = true;
           MemoryAccounting = true;
-          CPUAccounting = true;
           ExecStart = ''
             ${pkgs.prefect}/bin/prefect worker start \
               --pool ${poolName} \
diff --git a/nixos/modules/services/scheduling/scx.nix b/nixos/modules/services/scheduling/scx.nix
index 2a83788adfd8..dc2e5178dc58 100644
--- a/nixos/modules/services/scheduling/scx.nix
+++ b/nixos/modules/services/scheduling/scx.nix
@@ -101,14 +101,15 @@ in
 
       serviceConfig = {
         Type = "simple";
-        ExecStart = utils.escapeSystemdExecArgs (
-          [
-            (lib.getExe' cfg.package cfg.scheduler)
-          ]
-          ++ cfg.extraArgs
-        );
+        ExecStart = ''
+          ${pkgs.runtimeShell} -c 'exec ${cfg.package}/bin/''${SCX_SCHEDULER_OVERRIDE:-$SCX_SCHEDULER} ''${SCX_FLAGS_OVERRIDE:-$SCX_FLAGS}'
+        '';
         Restart = "on-failure";
       };
+      environment = {
+        SCX_SCHEDULER = cfg.scheduler;
+        SCX_FLAGS = lib.escapeShellArgs cfg.extraArgs;
+      };
 
       wantedBy = [ "multi-user.target" ];
     };
diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index 5dc438473a1d..059337e3a425 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -270,7 +270,7 @@ let
     lib.updateManyAttrsByPath [
       {
         path = lib.init pathList;
-        update = old: lib.filterAttrs (n: v: n != (lib.last pathList)) old;
+        update = old: lib.removeAttrs old [ (lib.last pathList) ];
       }
     ] set;
 in
diff --git a/nixos/modules/services/security/crowdsec-firewall-bouncer.nix b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix
new file mode 100644
index 000000000000..5091ba4156a4
--- /dev/null
+++ b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix
@@ -0,0 +1,390 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.crowdsec-firewall-bouncer;
+  format = pkgs.formats.yaml { };
+in
+{
+  options.services.crowdsec-firewall-bouncer =
+    let
+      inherit (lib)
+        types
+        mkOption
+        mkEnableOption
+        mkPackageOption
+        ;
+    in
+    {
+      enable = mkEnableOption "CrowdSec Firewall Bouncer";
+
+      package = mkPackageOption pkgs "crowdsec-firewall-bouncer" { };
+
+      createRulesets = mkOption {
+        type = types.bool;
+        description = ''
+          Whether to have the module create the appropriate firewall configuration
+          based on the bouncer settings.
+          You may disable this option to manually configure it.
+        '';
+        default = true;
+      };
+
+      registerBouncer = {
+        enable = mkOption {
+          type = types.bool;
+          description = ''
+            Whether to automatically register the bouncer to the locally running
+            `crowdsec` service.
+
+            When authenticating to an external CrowdSec API, you may use the
+            [](#opt-services.crowdsec-firewall-bouncer.secrets.apiKeyPath) option
+            instead.
+          '';
+          default = config.services.crowdsec.enable;
+          defaultText = lib.literalExpression ''config.services.crowdsec.enable'';
+        };
+        bouncerName = mkOption {
+          type = types.nonEmptyStr;
+          description = "Name to register the bouncer as to the CrowdSec API";
+          default = "crowdsec-firewall-bouncer";
+        };
+      };
+
+      secrets = {
+        apiKeyPath = mkOption {
+          type = types.nullOr types.path;
+          description = ''
+            Path to the API key to authenticate with a local CrowdSec API.
+
+            You need to call `cscli bouncers add <bouncer-name>` to register
+            the bouncer and get this API key.
+
+            When authenticating to the locally running `crowdsec` service, you may use the
+            [](#opt-services.crowdsec-firewall-bouncer.registerBouncer.enable) option instead.
+          '';
+          default = null;
+        };
+      };
+
+      settings = mkOption {
+        description = ''
+          Settings for the main CrowdSec Firewall Bouncer.
+
+          Refer to the defaults at <https://github.com/crowdsecurity/cs-firewall-bouncer/blob/main/config/crowdsec-firewall-bouncer.yaml>.
+        '';
+        default = { };
+        type = types.submodule {
+          freeformType = format.type;
+          options = {
+            mode = mkOption {
+              type = types.str;
+              description = "Firewall mode to use.";
+              default = if config.networking.nftables.enable then "nftables" else "iptables";
+              defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables" else "iptables"'';
+            };
+            api_url = mkOption {
+              type = types.str;
+              description = "URL of the local API.";
+              example = "http://127.0.0.1:8080";
+              default = "http://${config.services.crowdsec.settings.general.api.server.listen_uri}";
+              defaultText = lib.literalExpression ''http://$\{config.services.crowdsec.settings.general.api.server.listen_uri}'';
+            };
+            api_key = mkOption {
+              type = types.nullOr types.str;
+              description = ''
+                API key to authenticate with a local crowdsec API.
+
+                You need to call `cscli bouncers add <bouncer-name>` to register
+                the bouncer and get this API key.
+
+                Setting this option will store this secret in the Nix store.
+                Instead, you should set the `services.crowdsec-firewall-bouncer.secrets.apiKeyPath`
+                option, which will read the value at runtime.
+              '';
+              default = null;
+            };
+          };
+        };
+      };
+    };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          cfg.registerBouncer.enable || (cfg.secrets.apiKeyPath != null) || (cfg.settings.api_key != null);
+        message = ''
+          An API key must be set for the bouncer to be able to authenticate to a local crowdsec API.
+
+          See the `registerBouncer.enable` and `secrets.apiKeyPath` options of
+          `services.crowdsec-firewall-bouncer` for more information.
+        '';
+      }
+      {
+        assertion = !(cfg.registerBouncer.enable && (cfg.secrets.apiKeyPath != null));
+        message = ''
+          The `registerBouncer.enable` and `secrets.apiKeyPath` options of
+          `services.crowdsec-firewall-bouncer` are mutually exclusive.
+        '';
+      }
+      {
+        assertion = !(cfg.registerBouncer.enable && !config.services.crowdsec.enable);
+        message = ''
+          The `services.crowdsec-firewall-bouncer.registerBouncer.enable` option
+          requires the `crowdsec` service to be enabled.
+        '';
+      }
+      {
+        assertion = !(cfg.settings.mode == "ipset" && cfg.createRulesets);
+        message = ''
+          The crowdsec-firewall-bouncer module is currently not able to configure the firewall in "ipset" mode.
+
+          Either set the `services.crowdsec-firewall-bouncer.settings.mode` to "iptables" to leave the bouncer
+          manage the firewall configuration, or disable the `services.crowdsec-firewall-bouncer.createRulesets`
+          option and manually configure your firewall.
+        '';
+      }
+    ];
+
+    # Default settings
+    services.crowdsec-firewall-bouncer.settings = {
+      update_frequency = lib.mkDefault "10s";
+      log_mode = lib.mkDefault "stdout";
+      log_level = lib.mkDefault "info";
+
+      # iptables-specific config
+      blacklists_ipv4 = lib.mkDefault "crowdsec-blacklists";
+      blacklists_ipv6 = lib.mkDefault "crowdsec6-blacklists";
+      iptables_chains = lib.mkDefault [ "INPUT" ];
+
+      # nftables-specific config
+      nftables = {
+        ipv4 = {
+          enabled = lib.mkDefault true;
+          set-only = lib.mkDefault true;
+          table = lib.mkDefault "crowdsec";
+          chain = lib.mkDefault "crowdsec-chain";
+        };
+        ipv6 = {
+          enabled = lib.mkDefault true;
+          set-only = lib.mkDefault true;
+          table = lib.mkDefault "crowdsec6";
+          chain = lib.mkDefault "crowdsec6-chain";
+        };
+      };
+    };
+
+    # Use a placeholder for the api_key if it is to be read from a file at runtime
+    services.crowdsec-firewall-bouncer.settings.api_key = lib.mkIf (
+      cfg.registerBouncer.enable || (cfg.secrets.apiKeyPath != null)
+    ) "@API_KEY_FILE@";
+
+    networking.nftables.tables = lib.mkIf (cfg.settings.mode == "nftables") {
+      "${cfg.settings.nftables.ipv4.table}" =
+        lib.mkIf
+          (cfg.createRulesets && cfg.settings.nftables.ipv4.enabled && cfg.settings.nftables.ipv4.set-only)
+          {
+            family = "ip";
+            content = ''
+              set crowdsec-blacklists {
+                type ipv4_addr
+                flags timeout
+              }
+
+              chain ${cfg.settings.nftables.ipv4.chain} {
+                type filter hook input priority filter; policy accept;
+                ip saddr @crowdsec-blacklists drop
+              }
+            '';
+          };
+      "${cfg.settings.nftables.ipv6.table}" =
+        lib.mkIf
+          (cfg.createRulesets && cfg.settings.nftables.ipv6.enabled && cfg.settings.nftables.ipv6.set-only)
+          {
+            family = "ip6";
+            content = ''
+              set crowdsec6-blacklists {
+                type ipv6_addr
+                flags timeout
+              }
+
+              chain ${cfg.settings.nftables.ipv6.chain} {
+                type filter hook input priority filter; policy accept;
+                ip6 saddr @crowdsec6-blacklists drop
+              }
+            '';
+          };
+    };
+
+    systemd.services =
+      let
+        apiKeyFile = "/var/lib/crowdsec-firewall-bouncer-register/api-key.cred";
+      in
+      {
+        crowdsec-firewall-bouncer-register = lib.mkIf cfg.registerBouncer.enable rec {
+          description = "Register the CrowdSec Firewall Bouncer to the local CrowdSec service";
+          wantedBy = [ "multi-user.target" ];
+          after = [ "crowdsec.service" ];
+          wants = after;
+          script = ''
+            cscli=/run/current-system/sw/bin/cscli
+            if $cscli bouncers list --output json | ${lib.getExe pkgs.jq} -e -- ${lib.escapeShellArg "any(.[]; .name == \"${cfg.registerBouncer.bouncerName}\")"} >/dev/null; then
+              # Bouncer already registered. Verify the API key is still present
+              if [ ! -f ${apiKeyFile} ]; then
+                echo "Bouncer registered but API key is not present"
+                exit 1
+              fi
+            else
+              # Bouncer not registered
+              # Remove any previously saved API key
+              rm -f '${apiKeyFile}'
+              # Register the bouncer and save the new API key
+              if ! $cscli bouncers add --output raw -- ${lib.escapeShellArg cfg.registerBouncer.bouncerName} >${apiKeyFile}; then
+                # Failed to register the bouncer
+                rm ${apiKeyFile}
+                exit 1
+              fi
+            fi
+          '';
+          serviceConfig = {
+            Type = "oneshot";
+
+            # Run as crowdsec user to be able to use cscli
+            User = config.services.crowdsec.user;
+            Group = config.services.crowdsec.group;
+
+            StateDirectory = "crowdsec-firewall-bouncer-register";
+
+            ReadWritePaths = [
+              # Needs write permissions to add the bouncer
+              "/var/lib/crowdsec"
+            ];
+
+            DynamicUser = true;
+            LockPersonality = true;
+            PrivateDevices = true;
+            ProcSubset = "pid";
+            ProtectClock = true;
+            ProtectControlGroups = true;
+            ProtectHome = true;
+            ProtectHostname = true;
+            ProtectKernelLogs = true;
+            ProtectKernelModules = true;
+            ProtectKernelTunables = true;
+            ProtectProc = "invisible";
+            RestrictNamespaces = true;
+            RestrictRealtime = true;
+            SystemCallArchitectures = "native";
+
+            RestrictAddressFamilies = "none";
+            CapabilityBoundingSet = [ "" ];
+            SystemCallFilter = [
+              "@system-service"
+              "~@privileged"
+              "~@resources"
+            ];
+            UMask = "0077";
+          };
+        };
+
+        crowdsec-firewall-bouncer =
+          let
+            runtime-dir-name = "crowdsec-firewall-bouncer";
+            final-config-file = "/run/${runtime-dir-name}/config.yaml";
+            generateConfig = pkgs.writeShellScript "crowdsec-firewall-bouncer-config" ''
+              set -euo pipefail
+              umask 077
+
+              # Copy the template to the final location
+              cp ${format.generate "crowdsec-firewall-bouncer-config-template.yml" cfg.settings} ${final-config-file}
+              chmod 0600 ${final-config-file}
+
+              # Replace the api_key placeholder with the secret
+              ${lib.getExe pkgs.replace-secret} '@API_KEY_FILE@' "$CREDENTIALS_DIRECTORY/API_KEY_FILE" ${final-config-file}
+            '';
+          in
+          rec {
+            description = "CrowdSec Firewall Bouncer";
+            wantedBy = [ "multi-user.target" ];
+            after = [ "network.target" ] ++ (lib.optional config.services.crowdsec.enable "crowdsec.service");
+            wants = after;
+            requires = lib.optional cfg.registerBouncer.enable "crowdsec-firewall-bouncer-register.service";
+
+            # When using iptables/ipset modes, the bouncer calls external binaries so they must be added to the path.
+            # For nftables mode, it does not depend on external binaries.
+            path = lib.optionals ((cfg.settings.mode == "iptables") || (cfg.settings.mode == "ipset")) [
+              pkgs.iptables
+              pkgs.ipset
+            ];
+
+            serviceConfig = rec {
+              Type = "notify";
+              ExecStartPre = [
+                generateConfig
+                "${lib.getExe cfg.package} -c ${final-config-file} -t"
+              ];
+              ExecStart = [
+                "${lib.getExe cfg.package} -c ${final-config-file}"
+              ];
+
+              # Same as upstream
+              LimitNOFILE = 65536;
+              KillMode = "mixed";
+
+              # Load the api_key secret to be able to use it when generating the final config
+              LoadCredential =
+                if (cfg.registerBouncer.enable) then
+                  "API_KEY_FILE:${apiKeyFile}"
+                else if (cfg.secrets.apiKeyPath != null) then
+                  "API_KEY_FILE:${cfg.secrets.apiKeyPath}"
+                else
+                  null;
+
+              DynamicUser = true;
+              RuntimeDirectory = runtime-dir-name;
+
+              LockPersonality = true;
+              PrivateDevices = true;
+              ProcSubset = "pid";
+              ProtectClock = true;
+              ProtectControlGroups = true;
+              ProtectHome = true;
+              ProtectHostname = true;
+              ProtectKernelLogs = true;
+              ProtectKernelModules = true;
+              ProtectKernelTunables = true;
+              ProtectProc = "invisible";
+              RestrictNamespaces = true;
+              RestrictRealtime = true;
+              SystemCallArchitectures = "native";
+
+              RestrictAddressFamilies = [
+                "AF_NETLINK"
+                "AF_UNIX"
+                "AF_INET"
+                "AF_INET6"
+              ];
+              AmbientCapabilities = [
+                # Needed to be able to manipulate the rulesets
+                "CAP_NET_ADMIN"
+              ];
+              CapabilityBoundingSet = AmbientCapabilities;
+              SystemCallFilter = [
+                "@system-service"
+                "~@privileged"
+                "~@resources"
+              ];
+              UMask = "0077";
+            };
+          };
+      };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ nicomem ];
+  };
+}
diff --git a/nixos/modules/services/security/step-ca.nix b/nixos/modules/services/security/step-ca.nix
index d7ed2acf7664..746d3c0b3839 100644
--- a/nixos/modules/services/security/step-ca.nix
+++ b/nixos/modules/services/security/step-ca.nix
@@ -55,10 +55,13 @@ in
         '';
       };
       intermediatePasswordFile = lib.mkOption {
-        type = lib.types.pathWith {
-          inStore = false;
-          absolute = true;
-        };
+        type = lib.types.nullOr (
+          lib.types.pathWith {
+            inStore = false;
+            absolute = true;
+          }
+        );
+        default = null;
         example = "/run/keys/smallstep-password";
         description = ''
           Path to the file containing the password for the intermediate
@@ -104,11 +107,18 @@ in
           ReadWritePaths = ""; # override upstream
 
           # LocalCredential handles file permission problems arising from the use of DynamicUser.
-          LoadCredential = "intermediate_password:${cfg.intermediatePasswordFile}";
+          LoadCredential = lib.mkIf (
+            cfg.intermediatePasswordFile != null
+          ) "intermediate_password:${cfg.intermediatePasswordFile}";
 
           ExecStart = [
             "" # override upstream
-            "${cfg.package}/bin/step-ca /etc/smallstep/ca.json --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password"
+            (
+              "${cfg.package}/bin/step-ca /etc/smallstep/ca.json"
+              + lib.optionalString (
+                cfg.intermediatePasswordFile != null
+              ) " --password-file \${CREDENTIALS_DIRECTORY}/intermediate_password"
+            )
           ];
 
           # ProtectProc = "invisible"; # not supported by upstream yet
diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 92410e28a1ed..f1e27cbaa256 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -795,7 +795,7 @@ in
                     };
                     options.HiddenServiceMaxStreams = lib.mkOption {
                       description = (descriptionGeneric "HiddenServiceMaxStreams");
-                      type = with lib.types; nullOr (ints.between 0 65535);
+                      type = with lib.types; nullOr ints.u16;
                       default = null;
                     };
                     options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit";
diff --git a/nixos/modules/services/security/tsidp.nix b/nixos/modules/services/security/tsidp.nix
index 4b854cf183ca..5d1a32522875 100644
--- a/nixos/modules/services/security/tsidp.nix
+++ b/nixos/modules/services/security/tsidp.nix
@@ -164,7 +164,7 @@ in
           Type = "simple";
           ExecStart =
             let
-              args = lib.cli.toGNUCommandLineShell { mkOptionName = k: "-${k}"; } {
+              args = lib.cli.toCommandLineShellGNU { } {
                 dir = stateDir;
                 hostname = cfg.settings.hostName;
                 port = cfg.settings.port;
diff --git a/nixos/modules/services/security/warpgate.nix b/nixos/modules/services/security/warpgate.nix
new file mode 100644
index 000000000000..a52d0eefcb42
--- /dev/null
+++ b/nixos/modules/services/security/warpgate.nix
@@ -0,0 +1,444 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.warpgate;
+  yaml = pkgs.formats.yaml { };
+in
+{
+  options.services.warpgate =
+    let
+      inherit (lib.types)
+        nullOr
+        enum
+        str
+        bool
+        port
+        listOf
+        attrsOf
+        submodule
+        ;
+      inherit (lib.options) mkOption mkPackageOption literalExpression;
+    in
+    {
+      enable = mkOption {
+        description = ''
+          Whether to enable Warpgate.
+          This module will initialize Warpgate base on your config automatically. Please run `warpgate recover-access` to gain access.
+        '';
+        type = bool;
+        default = false;
+      };
+
+      package = mkPackageOption pkgs "warpgate" { };
+
+      databaseUrlFile = mkOption {
+        description = ''
+          Path to file containing database connection string with credentials.
+          Should be a one line file with: `database_url: <protocol>://<username>:<password>@<host>/<database>`.
+          See [SeaORM documentation](https://www.sea-ql.org/SeaORM/docs/install-and-config/connection/).
+        '';
+        type = nullOr str;
+        default = null;
+      };
+
+      settings = mkOption {
+        description = "Warpgate configuration.";
+        type = submodule {
+          freeformType = yaml.type;
+          options = {
+            sso_providers = mkOption {
+              description = "Configure OIDC single sign-on providers.";
+              default = [ ];
+              type = listOf (submodule {
+                freeformType = yaml.type;
+                options = {
+                  name = mkOption {
+                    description = "Internal identifier of SSO provider.";
+                    type = str;
+                  };
+                  label = mkOption {
+                    description = "SSO provider name displayed on login page.";
+                    type = str;
+                  };
+                  provider = mkOption {
+                    description = "SSO provider configurations.";
+                    type = attrsOf yaml.type;
+                  };
+                };
+              });
+              example = literalExpression ''
+                [
+                  {
+                    name = "3rd party SSO";
+                    label = "ACME SSO";
+                    provider = {
+                      type = "custom";
+                      client_id = "123...";
+                      client_secret = "BC...";
+                      issuer_url = "https://sso.acme.inc";
+                      scopes = ["email"];
+                    };
+                  }
+                  {
+                    ...
+                  }
+                ]
+              '';
+            };
+            recordings = {
+              enable = mkOption {
+                description = "Whether to enable session recording.";
+                default = true;
+                type = bool;
+              };
+              path = mkOption {
+                description = "Path to store session recordings.";
+                default = "/var/lib/warpgate/recordings";
+                type = str;
+              };
+            };
+            external_host = mkOption {
+              description = ''
+                Configure the domain name of this Warpgate instance.
+                See [HTTP domain binding](https://warpgate.null.page/http-domain-binding/).
+              '';
+              default = null;
+              type = nullOr str;
+            };
+            database_url = mkOption {
+              description = ''
+                Database connection string.
+                See [SeaORM documentation](https://www.sea-ql.org/SeaORM/docs/install-and-config/connection/).
+              '';
+              default = "sqlite:/var/lib/warpgate/db";
+              type = nullOr str;
+            };
+            ssh = {
+              enable = mkOption {
+                description = "Whether to enable SSH listener.";
+                default = false;
+                type = bool;
+              };
+              listen = mkOption {
+                description = "Listen endpoint of SSH listener.";
+                default = "[::]:2222";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The SSH listener is reachable via this port externally.";
+                default = null;
+                type = nullOr port;
+              };
+              keys = mkOption {
+                description = "Path to store SSH host & client keys.";
+                default = "/var/lib/warpgate/ssh-keys";
+                type = str;
+              };
+              host_key_verification = mkOption {
+                description = "Specify host key verification action when connecting to a SSH target with unknown/differing host key.";
+                default = "prompt";
+                type = enum [
+                  "prompt"
+                  "auto_accept"
+                  "auto_reject"
+                ];
+              };
+              inactivity_timeout = mkOption {
+                description = "How long can user be inactive until Warpgate terminates the connection.";
+                default = "5m";
+                type = str;
+              };
+              keepalive_interval = mkOption {
+                description = "If nothing is received from the client for this amount of time, server will send a keepalive message.";
+                default = null;
+                type = nullOr str;
+              };
+            };
+            http = {
+              listen = mkOption {
+                description = "Listen endpoint of HTTP listener.";
+                default = "[::]:8888";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The HTTP listener is reachable via this port externally.";
+                default = null;
+                type = nullOr port;
+              };
+              certificate = mkOption {
+                description = "Path to HTTPS listener certificate.";
+                default = "/var/lib/warpgate/tls.certificate.pem";
+                type = str;
+              };
+              key = mkOption {
+                description = "Path to HTTPS listener private key.";
+                default = "/var/lib/warpgate/tls.key.pem";
+                type = str;
+              };
+              sni_certificates = mkOption {
+                description = "Certificates for additional domains.";
+                default = [ ];
+                type = listOf (submodule {
+                  freeformType = yaml.type;
+                  options = {
+                    certificate = mkOption {
+                      description = "Path to certificate.";
+                      default = "";
+                      type = str;
+                    };
+                    key = mkOption {
+                      description = "Path to private key.";
+                      default = "";
+                      type = str;
+                    };
+                  };
+                });
+                example = literalExpression ''
+                  [
+                    {
+                      certificate = "/var/lib/warpgate/example.tld.pem";
+                      key = "/var/lib/warpgate/example.tld.key.pem";
+                    }
+                    {
+                      ...
+                    }
+                  ]
+                '';
+              };
+              trust_x_forwarded_headers = mkOption {
+                description = ''
+                  Trust X-Forwarded-* headers. Required when being reverse proxied.
+                  See [Running behind a reverse proxy](https://warpgate.null.page/reverse-proxy/).
+                '';
+                default = false;
+                type = bool;
+              };
+              session_max_age = mkOption {
+                description = "How long until a logged in session expires.";
+                default = "30m";
+                type = str;
+              };
+              cookie_max_age = mkOption {
+                description = "How long until logged in cookie expires.";
+                default = "1day";
+                type = str;
+              };
+            };
+            mysql = {
+              enable = mkOption {
+                description = "Whether to enable MySQL listener.";
+                default = false;
+                type = bool;
+              };
+              listen = mkOption {
+                description = "Listen endpoint of MySQL listener.";
+                default = "[::]:33306";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The MySQL listener is reachable via this port externally.";
+                default = null;
+                type = nullOr port;
+              };
+              certificate = mkOption {
+                description = "Path to MySQL listener certificate.";
+                default = "/var/lib/warpgate/tls.certificate.pem";
+                type = str;
+              };
+              key = mkOption {
+                description = "Path to MySQL listener private key.";
+                default = "/var/lib/warpgate/tls.key.pem";
+                type = str;
+              };
+            };
+            postgres = {
+              enable = mkOption {
+                description = "Whether to enable PostgreSQL listener.";
+                default = false;
+                type = bool;
+              };
+              listen = mkOption {
+                description = "Listen endpoint of PostgreSQL listener.";
+                default = "[::]:55432";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The PostgreSQL listener is reachable via this port externally.";
+                default = null;
+                type = nullOr str;
+              };
+              certificate = mkOption {
+                description = "Path to PostgreSQL listener certificate.";
+                default = "/var/lib/warpgate/tls.certificate.pem";
+                type = str;
+              };
+              key = mkOption {
+                description = "Path to PostgreSQL listener private key.";
+                default = "/var/lib/warpgate/tls.key.pem";
+                type = str;
+              };
+            };
+            log = {
+              retention = mkOption {
+                description = "How long Warpgate keep its logs.";
+                default = "7days";
+                type = str;
+              };
+              send_to = mkOption {
+                description = ''
+                  Path of UNIX socket of log forwarder.
+                  See [Log forwarding](https://warpgate.null.page/log-forwarding/);
+                '';
+                default = null;
+                type = nullOr str;
+              };
+            };
+            config_provider = mkOption {
+              description = ''
+                Source of truth of users.
+                DO NOT change this, Warpgate only implemented database provider.
+              '';
+              default = "database";
+              type = enum [
+                "file"
+                "database"
+              ];
+            };
+          };
+        };
+        default = { };
+        example = {
+          ssh = {
+            enable = true;
+            listen = "[::]:2211";
+          };
+          http = {
+            listen = "[::]:8011";
+          };
+        };
+      };
+    };
+
+  config =
+    let
+      inherit (lib.lists)
+        any
+        map
+        head
+        reverseList
+        ;
+      inherit (lib.strings) splitString toIntBase10;
+
+      preStartScript = pkgs.writers.writeBash "warpgate-init" ''
+        CFGFILE=/var/lib/warpgate/config.yaml
+        if [ ! -O $CFGFILE ] || [ ! -s $CFGFILE ]; then
+          INITPWD=$(tr -dc 'A-Za-z0-9!?%=' </dev/urandom 2>/dev/null | head -c 16)
+          ${lib.getExe cfg.package} \
+            --config $CFGFILE unattended-setup \
+            --data-path /var/lib/warpgate \
+            --http-port 8888 \
+            --admin-password $INITPWD
+        fi
+        ${
+          if cfg.databaseUrlFile != null then
+            ''
+              sed -e '/^database_url: null/d' ${yaml.generate "warpgate-config" cfg.settings} > $CFGFILE
+              cat /run/credentials/warpgate.service/databaseUrl >> $CFGFILE
+            ''
+          else
+            "cp --no-preserve=ownership ${yaml.generate "warpgate-config" cfg.settings} $CFGFILE"
+        }
+      '';
+      bindOnPrivilegedPorts = any (x: toIntBase10 x < 1025) (
+        map (x: head (reverseList (splitString ":" x))) (
+          [ cfg.settings.http.listen ]
+          ++ lib.optional cfg.settings.ssh.enable cfg.settings.ssh.listen
+          ++ lib.optional cfg.settings.mysql.enable cfg.settings.mysql.listen
+          ++ lib.optional cfg.settings.postgres.enable cfg.settings.postgres.listen
+        )
+      );
+    in
+    lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = !((cfg.databaseUrlFile != null) && (cfg.settings.database_url != null));
+          message = "You cannot configure databaseUrlFile and settings.database_url at the same time.";
+        }
+        {
+          assertion = !((cfg.databaseUrlFile == null) && (cfg.settings.database_url == null));
+          message = "Either databaseUrlFile or settings.database_url must be set; Set the other to null.";
+        }
+      ];
+
+      environment.systemPackages = [ cfg.package ];
+
+      systemd.services.warpgate = {
+        description = "Warpgate smart bastion";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        startLimitBurst = 5;
+        serviceConfig = {
+          LoadCredential = "${
+            if cfg.databaseUrlFile != null then "databaseUrl:${cfg.databaseUrlFile}" else ""
+          }";
+          ExecStartPre = preStartScript;
+          ExecStart = "${lib.getExe cfg.package} --config /var/lib/warpgate/config.yaml run";
+          DynamicUser = true;
+          RestartSec = 3;
+          Restart = "on-failure";
+          StateDirectory = "warpgate";
+          StateDirectoryMode = "0700";
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          ProtectHome = true;
+          PrivateDevices = true;
+          DeviceAllow = [
+            "/dev/null rw"
+            "/dev/urandom r"
+          ];
+          DevicePolicy = "strict";
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          RestrictNamespaces = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "full";
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          RemoveIPC = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+          ];
+        }
+        // (
+          if bindOnPrivilegedPorts then
+            {
+              AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+              CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+            }
+          else
+            {
+              PrivateUsers = true;
+            }
+        );
+      };
+    };
+
+  meta.maintainers = with lib.maintainers; [ alemonmk ];
+}
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index 674e075b9ad4..f52c4b4fb4e2 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -179,7 +179,7 @@ in
       serviceConfig.EnvironmentFile = "";
 
       environment.EARLYOOM_ARGS =
-        lib.cli.toGNUCommandLineShell { } {
+        lib.cli.toCommandLineShellGNU { } {
           m =
             "${toString cfg.freeMemThreshold}"
             + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}";
diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix
index 4f11e8df18ad..bde3ac811569 100644
--- a/nixos/modules/services/system/self-deploy.nix
+++ b/nixos/modules/services/system/self-deploy.nix
@@ -179,7 +179,7 @@ in
         ${gitWithRepo} checkout FETCH_HEAD
 
         nix-build${renderNixArgs cfg.nixArgs} ${
-          lib.cli.toGNUCommandLineShell { } {
+          lib.cli.toCommandLineShellGNU { } {
             attr = cfg.nixAttribute;
             out-link = outPath;
           }
diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix
index 96c0e6f65ae7..73b7581bd2b7 100644
--- a/nixos/modules/services/system/userborn.nix
+++ b/nixos/modules/services/system/userborn.nix
@@ -88,9 +88,6 @@ in
       }
     ];
 
-    system.activationScripts.users = lib.mkForce "";
-    system.activationScripts.hashes = lib.mkForce "";
-
     systemd = {
 
       # Create home directories, do not create /var/empty even if that's a user's
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 8454910654bf..87493ec6ba62 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -9,7 +9,7 @@
 let
   inherit (lib)
     mkRenamedOptionModule
-    mkAliasOptionModuleMD
+    mkAliasOptionModule
     mkEnableOption
     mkOption
     types
@@ -19,6 +19,8 @@ let
     optionalString
     optional
     mkDefault
+    mkOptionDefault
+    versionOlder
     escapeShellArgs
     optionalAttrs
     mkMerge
@@ -26,7 +28,6 @@ let
 
   cfg = config.services.transmission;
   opt = options.services.transmission;
-  inherit (config.environment) etc;
   apparmor = config.security.apparmor;
   rootDir = "/run/transmission";
   settingsDir = ".config/transmission-daemon";
@@ -51,7 +52,7 @@ in
         "rpc-port"
       ]
     )
-    (mkAliasOptionModuleMD
+    (mkAliasOptionModule
       [
         "services"
         "transmission"
@@ -177,17 +178,12 @@ in
             };
             umask = mkOption {
               type = types.either types.int types.str;
-              default = if cfg.package == pkgs.transmission_3 then 18 else "022";
-              defaultText = literalExpression "if cfg.package == pkgs.transmission_3 then 18 else \"022\"";
+              default = "022";
               description = ''
                 Sets transmission's file mode creation mask.
                 See the {manpage}`umask(2)` manpage for more information.
                 Users who want their saved torrents to be world-writable
                 may want to set this value to 0/`"000"`.
-
-                Keep in mind, that if you are using Transmission 3, this has to
-                be passed as a base 10 integer, whereas Transmission 4 takes
-                an octal number in a string instead.
               '';
             };
             utp-enabled = mkOption {
@@ -223,10 +219,19 @@ in
         };
       };
 
-      package = mkPackageOption pkgs "transmission" {
-        default = "transmission_3";
-        example = "pkgs.transmission_4";
-      };
+      package =
+        mkPackageOption pkgs "transmission" {
+          default = "transmission_4";
+          example = "pkgs.transmission_4";
+        }
+        // {
+          defaultText = ''
+            if lib.versionAtLeast config.system.stateVersion "25.11" then
+              pkgs.transmission_4
+            else
+              «error message»
+          '';
+        };
 
       downloadDirPermissions = mkOption {
         type = with types; nullOr str;
@@ -332,6 +337,19 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.transmission.package = mkIf (versionOlder config.system.stateVersion "25.11") (
+      mkOptionDefault (throw ''
+        `services.transmission.package` previously defaulted to
+        `pkgs.transmission_3`, which has been removed in favour
+        of `pkgs.transmission_4`.
+
+        Please set `services.transmission.package` to
+        `pkgs.transmission_4` explicitly. Note that upgrade
+        caused data loss for some users so backup is recommended
+        (see NixOS 24.11 release notes for details)
+      '')
+    );
+
     # Note that using systemd.tmpfiles would not work here
     # because it would fail when creating a directory
     # with a different owner than its parent directory, by saying:
@@ -567,23 +585,23 @@ in
       include "${cfg.package.apparmor}/bin.transmission-daemon"
     '';
     security.apparmor.includes."local/bin.transmission-daemon" = ''
-      r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE},
+      ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE} r,
 
-      owner rw ${cfg.home}/${settingsDir}/**,
-      rw ${cfg.settings.download-dir}/**,
+      owner ${cfg.home}/${settingsDir}/** rw,
+      ${cfg.settings.download-dir}/** rw,
       ${optionalString cfg.settings.incomplete-dir-enabled ''
-        rw ${cfg.settings.incomplete-dir}/**,
+        ${cfg.settings.incomplete-dir}/** rw,
       ''}
       ${optionalString cfg.settings.watch-dir-enabled ''
-        r${optionalString cfg.settings.trash-original-torrent-files "w"} ${cfg.settings.watch-dir}/**,
+        ${cfg.settings.watch-dir}/** r${optionalString cfg.settings.trash-original-torrent-files "w"},
       ''}
       profile dirs {
-        rw ${cfg.settings.download-dir}/**,
+        ${cfg.settings.download-dir}/** rw,
         ${optionalString cfg.settings.incomplete-dir-enabled ''
-          rw ${cfg.settings.incomplete-dir}/**,
+          ${cfg.settings.incomplete-dir}/** rw,
         ''}
         ${optionalString cfg.settings.watch-dir-enabled ''
-          r${optionalString cfg.settings.trash-original-torrent-files "w"} ${cfg.settings.watch-dir}/**,
+          ${cfg.settings.watch-dir}/** r${optionalString cfg.settings.trash-original-torrent-files "w"},
         ''}
       }
 
@@ -594,12 +612,12 @@ in
           # any existing profile for script-torrent-done-filename
           # FIXME: to be tested as I'm not sure it works well with NoNewPrivileges=
           # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs
-          px ${cfg.settings.script-torrent-done-filename} -> &@{dirs},
+          ${cfg.settings.script-torrent-done-filename} px -> &@{dirs},
         ''
       }
 
       ${optionalString (cfg.webHome != null) ''
-        r ${cfg.webHome}/**,
+        ${cfg.webHome}/** r,
       ''}
     '';
   };
diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index 5d8d92b5cae8..efe9abd37a01 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -637,6 +637,7 @@ in
         '';
       };
       appendConfig = ''
+        # frigate
         rtmp {
             server {
                 listen 1935;
@@ -653,6 +654,7 @@ in
         }
       '';
       appendHttpConfig = ''
+        # frigate
         map $sent_http_content_type $should_not_cache {
           'application/json' 0;
           default 1;
diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 6f4538964283..9c7250fb7d08 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -217,7 +217,6 @@ in
     };
 
     services = {
-      udev.packages = with pkgs; [ android-udev-rules ];
       avahi = {
         enable = true;
         publish = {
diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix
index af15471521f1..0e0bd29c4236 100644
--- a/nixos/modules/services/web-apps/actual.nix
+++ b/nixos/modules/services/web-apps/actual.nix
@@ -2,6 +2,7 @@
   lib,
   pkgs,
   config,
+  utils,
   ...
 }:
 let
@@ -16,7 +17,6 @@ let
     ;
 
   cfg = config.services.actual;
-  configFile = formatType.generate "config.json" cfg.settings;
   dataDir = "/var/lib/actual";
 
   formatType = pkgs.formats.json { };
@@ -34,7 +34,10 @@ in
 
     settings = mkOption {
       default = { };
-      description = "Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.";
+      description = ''
+        Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.
+        You can specify secret values in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly.
+      '';
       type = types.submodule {
         freeformType = formatType.type;
 
@@ -68,13 +71,20 @@ in
       description = "Actual server, a local-first personal finance app";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment.ACTUAL_CONFIG_PATH = configFile;
+      environment.ACTUAL_CONFIG_PATH = "/run/actual/config.json";
+
+      preStart = ''
+        # Generate config including secret values.
+        ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/actual/config.json"}
+      '';
+
       serviceConfig = {
         ExecStart = getExe cfg.package;
         DynamicUser = true;
         User = "actual";
         Group = "actual";
         StateDirectory = "actual";
+        RuntimeDirectory = "actual";
         WorkingDirectory = dataDir;
         LimitNOFILE = "1048576";
         PrivateTmp = true;
diff --git a/nixos/modules/services/web-apps/c2fmzq-server.nix b/nixos/modules/services/web-apps/c2fmzq-server.nix
index f1935e05407f..a7622d384cf3 100644
--- a/nixos/modules/services/web-apps/c2fmzq-server.nix
+++ b/nixos/modules/services/web-apps/c2fmzq-server.nix
@@ -25,10 +25,8 @@ let
           str
         ])
       );
-    generate = lib.cli.toGNUCommandLineShell {
-      mkBool = k: v: [
-        "--${k}=${if v then "true" else "false"}"
-      ];
+    generate = lib.cli.toCommandLineShellGNU {
+      explicitBool = true;
     };
   };
 in
diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix
index a5b74025318c..0d08ed6f168c 100644
--- a/nixos/modules/services/web-apps/discourse.nix
+++ b/nixos/modules/services/web-apps/discourse.nix
@@ -17,7 +17,10 @@ let
   upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_15;
 
   postgresqlPackage =
-    if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql;
+    if config.services.postgresql.enable then
+      config.services.postgresql.finalPackage
+    else
+      pkgs.postgresql;
 
   postgresqlVersion = lib.getVersion postgresqlPackage;
 
@@ -540,7 +543,7 @@ in
     assertions = [
       {
         assertion = (cfg.database.host != null) -> (cfg.database.passwordFile != null);
-        message = "When services.gitlab.database.host is customized, services.discourse.database.passwordFile must be set!";
+        message = "When services.discourse.database.host is customized, services.discourse.database.passwordFile must be set!";
       }
       {
         assertion = cfg.hostname != "";
@@ -694,6 +697,9 @@ in
 
     services.postgresql = lib.mkIf databaseActuallyCreateLocally {
       enable = true;
+      extensions = ps: [
+        ps.pgvector
+      ];
       ensureUsers = [ { name = "discourse"; } ];
     };
 
@@ -719,6 +725,7 @@ in
           psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'discourse'" | grep -q 1 || psql -tAc 'CREATE DATABASE "discourse" OWNER "discourse"'
           psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
           psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS hstore"
+          psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS vector"
         '';
 
         serviceConfig = {
@@ -805,8 +812,11 @@ in
 
           cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
           cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
+          cp -r ${cfg.package.assets.generated}/* /run/discourse/assets-generated/
           ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
           ln -sf /var/lib/discourse/backups /run/discourse/public/backups
+          # discourse creates images in this folder, and by default it only has u=rx
+          chmod 750 /run/discourse/public/images
 
           (
               umask u=rwx,g=,o=
@@ -839,6 +849,7 @@ in
           "assets/javascripts/plugins"
           "public"
           "sockets"
+          "assets-generated"
         ];
         RuntimeDirectoryMode = "0750";
         StateDirectory = map (p: "discourse/" + p) [
diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix
index 0a669ccad2a7..2ed5bbccd6e2 100644
--- a/nixos/modules/services/web-apps/dolibarr.nix
+++ b/nixos/modules/services/web-apps/dolibarr.nix
@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib)
-    any
     boolToString
     concatStringsSep
+    elem
     isBool
     isString
     mapAttrsToList
@@ -46,7 +46,7 @@ let
 
       toStr =
         k: v:
-        if (any (str: k == str) secretKeys) then
+        if (elem k secretKeys) then
           v
         else if isString v then
           "'${v}'"
diff --git a/nixos/modules/services/web-apps/filesender.md b/nixos/modules/services/web-apps/filesender.md
deleted file mode 100644
index 0f768857e905..000000000000
--- a/nixos/modules/services/web-apps/filesender.md
+++ /dev/null
@@ -1,55 +0,0 @@
-# FileSender {#module-services-filesender}
-
-[FileSender](https://filesender.org/software/) is a software that makes it easy to send and receive big files.
-
-## Quickstart {#module-services-filesender-quickstart}
-
-FileSender uses [SimpleSAMLphp](https://simplesamlphp.org/) for authentication, which needs to be configured separately.
-
-Minimal working instance of FileSender that uses password-authentication would look like this:
-
-```nix
-let
-  format = pkgs.formats.php { };
-in
-{
-  networking.firewall.allowedTCPPorts = [
-    80
-    443
-  ];
-  services.filesender = {
-    enable = true;
-    localDomain = "filesender.example.com";
-    configureNginx = true;
-    database.createLocally = true;
-
-    settings = {
-      auth_sp_saml_authentication_source = "default";
-      auth_sp_saml_uid_attribute = "uid";
-      storage_filesystem_path = "<STORAGE PATH FOR UPLOADED FILES>";
-      admin = "admin";
-      admin_email = "admin@example.com";
-      email_reply_to = "noreply@example.com";
-    };
-  };
-  services.simplesamlphp.filesender = {
-    settings = {
-      "module.enable".exampleauth = true;
-    };
-    authSources = {
-      admin = [ "core:AdminPassword" ];
-      default = format.lib.mkMixedArray [ "exampleauth:UserPass" ] {
-        "admin:admin123" = {
-          uid = [ "admin" ];
-          cn = [ "admin" ];
-          mail = [ "admin@example.com" ];
-        };
-      };
-    };
-  };
-}
-```
-
-::: {.warning}
-Example above uses hardcoded clear-text password, in production you should use other authentication method like LDAP. You can check supported authentication methods [in SimpleSAMLphp documentation](https://simplesamlphp.org/docs/stable/simplesamlphp-idp.html).
-:::
diff --git a/nixos/modules/services/web-apps/filesender.nix b/nixos/modules/services/web-apps/filesender.nix
deleted file mode 100644
index f2339e6e32b1..000000000000
--- a/nixos/modules/services/web-apps/filesender.nix
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  format = pkgs.formats.php { finalVariable = "config"; };
-
-  cfg = config.services.filesender;
-  simpleSamlCfg = config.services.simplesamlphp.filesender;
-  fpm = config.services.phpfpm.pools.filesender;
-
-  filesenderConfigDirectory = pkgs.runCommand "filesender-config" { } ''
-    mkdir $out
-    cp ${format.generate "config.php" cfg.settings} $out/config.php
-  '';
-in
-{
-  meta = {
-    maintainers = with lib.maintainers; [ nhnn ];
-    doc = ./filesender.md;
-  };
-
-  options.services.filesender = with lib; {
-    enable = mkEnableOption "FileSender";
-    package = mkPackageOption pkgs "filesender" { };
-    user = mkOption {
-      description = "User under which filesender runs.";
-      type = types.str;
-      default = "filesender";
-    };
-    database = {
-      createLocally = mkOption {
-        type = types.bool;
-        default = true;
-        description = ''
-          Create the PostgreSQL database and database user locally.
-        '';
-      };
-      hostname = mkOption {
-        type = types.str;
-        default = "/run/postgresql";
-        description = "Database hostname.";
-      };
-      port = mkOption {
-        type = types.port;
-        default = 5432;
-        description = "Database port.";
-      };
-      name = mkOption {
-        type = types.str;
-        default = "filesender";
-        description = "Database name.";
-      };
-      user = mkOption {
-        type = types.str;
-        default = "filesender";
-        description = "Database user.";
-      };
-      passwordFile = mkOption {
-        type = types.nullOr types.path;
-        default = null;
-        example = "/run/keys/filesender-dbpassword";
-        description = ''
-          A file containing the password corresponding to
-          [](#opt-services.filesender.database.user).
-        '';
-      };
-    };
-    settings = mkOption {
-      type = types.submodule {
-        freeformType = format.type;
-        options = {
-          site_url = mkOption {
-            type = types.str;
-            description = "Site URL. Used in emails, to build URLs for logging in, logging out, build URL for upload endpoint for web workers, to include scripts etc.";
-          };
-          admin = mkOption {
-            type = types.commas;
-            description = ''
-              UIDs (as per the configured saml_uid_attribute) of FileSender administrators.
-              Accounts with these UIDs can access the Admin page through the web UI.
-            '';
-          };
-          admin_email = mkOption {
-            type = types.commas;
-            description = ''
-              Email address of FileSender administrator(s).
-              Emails regarding disk full etc. are sent here.
-              You should use a role-address here.
-            '';
-          };
-          storage_filesystem_path = mkOption {
-            type = types.nullOr types.str;
-            description = "When using storage type filesystem this is the absolute path to the file system where uploaded files are stored until they expire. Your FileSender storage root.";
-          };
-          log_facilities = mkOption {
-            type = format.type;
-            default = [ { type = "error_log"; } ];
-            description = "Defines where FileSender logging is sent. You can sent logging to a file, to syslog or to the default PHP log facility (as configured through your webserver's PHP module). The directive takes an array of one or more logging targets. Logging can be sent to multiple targets simultaneously. Each logging target is a list containing the name of the logging target and a number of attributes which vary per log target. See below for the exact definiation of each log target.";
-          };
-        };
-      };
-      default = { };
-      description = ''
-        Configuration options used by FileSender.
-        See [](https://docs.filesender.org/filesender/v2.0/admin/configuration/)
-        for available options.
-      '';
-    };
-    configureNginx = mkOption {
-      type = types.bool;
-      default = true;
-      description = "Configure nginx as a reverse proxy for FileSender.";
-    };
-    localDomain = mkOption {
-      type = types.str;
-      example = "filesender.example.org";
-      description = "The domain serving your FileSender instance.";
-    };
-    poolSettings = mkOption {
-      type =
-        with types;
-        attrsOf (oneOf [
-          str
-          int
-          bool
-        ]);
-      default = {
-        "pm" = "dynamic";
-        "pm.max_children" = "32";
-        "pm.start_servers" = "2";
-        "pm.min_spare_servers" = "2";
-        "pm.max_spare_servers" = "4";
-        "pm.max_requests" = "500";
-      };
-      description = ''
-        Options for FileSender's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives.
-      '';
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    services.simplesamlphp.filesender = {
-      phpfpmPool = "filesender";
-      localDomain = cfg.localDomain;
-      settings.baseurlpath = lib.mkDefault "https://${cfg.localDomain}/saml";
-    };
-
-    services.phpfpm = {
-      pools.filesender = {
-        user = cfg.user;
-        group = config.services.nginx.group;
-        phpEnv = {
-          FILESENDER_CONFIG_DIR = toString filesenderConfigDirectory;
-          SIMPLESAMLPHP_CONFIG_DIR = toString simpleSamlCfg.configDir;
-        };
-        settings = {
-          "listen.owner" = config.services.nginx.user;
-          "listen.group" = config.services.nginx.group;
-        }
-        // cfg.poolSettings;
-      };
-    };
-
-    services.nginx = lib.mkIf cfg.configureNginx {
-      enable = true;
-      virtualHosts.${cfg.localDomain} = {
-        root = "${cfg.package}/www";
-        extraConfig = ''
-          index index.php;
-        '';
-        locations = {
-          "/".extraConfig = ''
-            try_files $uri $uri/ /index.php?args;
-          '';
-          "~ [^/]\\.php(/|$)" = {
-            extraConfig = ''
-              fastcgi_split_path_info  ^(.+\.php)(/.+)$;
-              fastcgi_pass  unix:${fpm.socket};
-              include ${pkgs.nginx}/conf/fastcgi.conf;
-              fastcgi_intercept_errors on;
-              fastcgi_param PATH_INFO       $fastcgi_path_info;
-              fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-            '';
-          };
-          "~ /\\.".extraConfig = "deny all;";
-        };
-      };
-    };
-
-    services.postgresql = lib.mkIf cfg.database.createLocally {
-      enable = true;
-      ensureDatabases = [ cfg.database.name ];
-      ensureUsers = [
-        {
-          name = cfg.database.user;
-          ensureDBOwnership = true;
-        }
-      ];
-    };
-
-    services.filesender.settings = lib.mkMerge [
-      (lib.mkIf cfg.database.createLocally {
-        db_host = "/run/postgresql";
-        db_port = "5432";
-        db_password = "."; # FileSender requires it even when on UNIX socket auth.
-      })
-      (lib.mkIf (!cfg.database.createLocally) {
-        db_host = cfg.database.hostname;
-        db_port = toString cfg.database.port;
-        db_password = format.lib.mkRaw "file_get_contents('${cfg.database.passwordFile}')";
-      })
-      {
-        site_url = lib.mkDefault "https://${cfg.localDomain}";
-        db_type = "pgsql";
-        db_username = cfg.database.user;
-        db_database = cfg.database.name;
-        "auth_sp_saml_simplesamlphp_url" = "/saml";
-        "auth_sp_saml_simplesamlphp_location" = "${simpleSamlCfg.libDir}";
-      }
-    ];
-
-    systemd.services.filesender-initdb = {
-      description = "Init filesender DB";
-
-      wantedBy = [
-        "multi-user.target"
-        "phpfpm-filesender.service"
-      ];
-      after = [ "postgresql.target" ];
-
-      restartIfChanged = true;
-
-      serviceConfig = {
-        Environment = [
-          "FILESENDER_CONFIG_DIR=${toString filesenderConfigDirectory}"
-          "SIMPLESAMLPHP_CONFIG_DIR=${toString simpleSamlCfg.configDir}"
-        ];
-        Type = "oneshot";
-        Group = config.services.nginx.group;
-        User = "filesender";
-        ExecStart = "${fpm.phpPackage}/bin/php ${cfg.package}/scripts/upgrade/database.php";
-      };
-    };
-
-    users.extraUsers.filesender = lib.mkIf (cfg.user == "filesender") {
-      home = "/var/lib/filesender";
-      group = config.services.nginx.group;
-      createHome = true;
-      isSystemUser = true;
-    };
-  };
-}
diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index bfa5670650dd..6cccc83ebaa0 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -172,7 +172,14 @@ in
     systemd.services.glance = {
       description = "Glance feed dashboard server";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      # adding nss-user-lookup.target is a fix for https://github.com/NixOS/nixpkgs/issues/409348
+      after = [
+        "network.target"
+        "nss-user-lookup.target"
+      ];
+      requires = [
+        "nss-user-lookup.target"
+      ];
       path = [ pkgs.replace-secret ];
 
       serviceConfig = {
@@ -208,6 +215,7 @@ in
             ${secretReplacements}
           '';
         ExecStart = "${getExe cfg.package} --config ${mergedSettingsFile}";
+        Restart = "on-failure";
         WorkingDirectory = "/var/lib/glance";
         EnvironmentFile = cfg.environmentFile;
         StateDirectory = "glance";
diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index 5d89a2757863..23017629a329 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -322,15 +322,32 @@ in
           "vector"
           "vchord"
         ];
-        sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" ''
-          ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
+        sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" (
+          # save previous version of vectorchord to trigger reindex on update
+          lib.optionalString cfg.database.enableVectorChord ''
+            SELECT COALESCE(installed_version, ''') AS vchord_version_before FROM pg_available_extensions WHERE name = 'vchord' \gset
+          ''
+          + ''
+            ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
+            ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
+            ALTER SCHEMA public OWNER TO ${cfg.database.user};
+          ''
+          + lib.optionalString cfg.database.enableVectors ''
+            ALTER SCHEMA vectors OWNER TO ${cfg.database.user};
+            GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
+          ''
+          # trigger reindex if vectorchord updates
+          # https://docs.immich.app/administration/postgres-standalone/#updating-vectorchord
+          + lib.optionalString cfg.database.enableVectorChord ''
+            SELECT COALESCE(installed_version, ''') AS vchord_version_after FROM pg_available_extensions WHERE name = 'vchord' \gset
 
-          ALTER SCHEMA public OWNER TO ${cfg.database.user};
-          ${lib.optionalString cfg.database.enableVectors "ALTER SCHEMA vectors OWNER TO ${cfg.database.user};"}
-          GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
-
-          ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
-        '';
+            SELECT (:'vchord_version_before' != ''' AND :'vchord_version_before' != :'vchord_version_after') AS has_vchord_updated \gset
+            \if :has_vchord_updated
+              REINDEX INDEX face_index;
+              REINDEX INDEX clip_index;
+            \endif
+          ''
+        );
       in
       [
         ''
@@ -415,7 +432,7 @@ in
           lib.mapAttrsToListRecursive (attrPath: _: ''
             tmp="$(mktemp)"
             ${lib.getExe pkgs.jq} --rawfile secret "$CREDENTIALS_DIRECTORY/${attrPathToIndex attrPath}" \
-              '${attrPathToIndex attrPath} = $secret' /run/immich/config.json > "$tmp"
+              '${attrPathToIndex attrPath} = ($secret | rtrimstr("\n"))' /run/immich/config.json > "$tmp"
             mv "$tmp" /run/immich/config.json
           '') cfg.secretSettings
         )
diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 2b93e942896c..29ec8c8ef9b1 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -7,16 +7,19 @@
 }:
 let
   cfg = config.services.invidious;
-  # To allow injecting secrets with jq, json (instead of yaml) is used
-  settingsFormat = pkgs.formats.json { };
+
   inherit (lib) types;
 
+  # This need to be JSON to reduce number of
+  # breaking changes, for backwards
+  # compatibility with pre-25.11
+  settingsFormat = pkgs.formats.json { };
   settingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
 
   generatedHmacKeyFile = "/var/lib/invidious/hmac_key";
   generateHmac = cfg.hmacKeyFile == null;
 
-  commonInvidousServiceConfig = {
+  commonInvidiousServiceConfig = {
     description = "Invidious (An alternative YouTube front-end)";
     wants = [ "network-online.target" ];
     after = [ "network-online.target" ] ++ lib.optional cfg.database.createLocally "postgresql.target";
@@ -59,9 +62,51 @@ let
       RuntimeRandomizedExtraSec = lib.mkDefault "5min";
     };
   };
+
+  configScript =
+    scaleIndex:
+    ''
+      configParts=()
+    ''
+    # autogenerated hmac_key
+    + lib.optionalString generateHmac ''
+      configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
+    ''
+    # generated settings file
+    + ''
+      configParts+=("$(< ${settingsFile})")
+    ''
+    # optional database password file
+    + lib.optionalString (cfg.database.host != null) ''
+      configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${cfg.database.passwordFile})")
+    ''
+    # optional extra settings file
+    + lib.optionalString (cfg.extraSettingsFile != null) ''
+      configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
+    ''
+    # explicitly specified hmac key file
+    + lib.optionalString (cfg.hmacKeyFile != null) ''
+      configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
+    ''
+    # configure threads for secondary instances
+    + lib.optionalString (scaleIndex > 0) ''
+      configParts+=('{"channel_threads":0, "feed_threads":0}')
+    ''
+    # configure different ports for the instances
+    + ''
+      configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
+    ''
+    # merge all parts into a single configuration with later elements overriding previous elements
+    + ''
+      mergedConfig="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
+      export INVIDIOUS_CONFIG=$(echo "$mergedConfig" | ${pkgs.yq-go}/bin/yq -P)
+
+      exec ${cfg.package}/bin/invidious
+    '';
+
   mkInvidiousService =
     scaleIndex:
-    lib.foldl' lib.recursiveUpdate commonInvidousServiceConfig [
+    lib.foldl' lib.recursiveUpdate commonInvidiousServiceConfig [
       # only generate the hmac file in the first service
       (lib.optionalAttrs (scaleIndex == 0) {
         preStart = lib.optionalString generateHmac ''
@@ -73,47 +118,10 @@ let
       })
       # configure the secondary services to run after the first service
       (lib.optionalAttrs (scaleIndex > 0) {
-        after = commonInvidousServiceConfig.after ++ [ "invidious.service" ];
-        wants = commonInvidousServiceConfig.wants ++ [ "invidious.service" ];
+        after = commonInvidiousServiceConfig.after ++ [ "invidious.service" ];
+        wants = commonInvidiousServiceConfig.wants ++ [ "invidious.service" ];
       })
-      {
-        script = ''
-          configParts=()
-        ''
-        # autogenerated hmac_key
-        + lib.optionalString generateHmac ''
-          configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
-        ''
-        # generated settings file
-        + ''
-          configParts+=("$(< ${lib.escapeShellArg settingsFile})")
-        ''
-        # optional database password file
-        + lib.optionalString (cfg.database.host != null) ''
-          configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})")
-        ''
-        # optional extra settings file
-        + lib.optionalString (cfg.extraSettingsFile != null) ''
-          configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
-        ''
-        # explicitly specified hmac key file
-        + lib.optionalString (cfg.hmacKeyFile != null) ''
-          configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
-        ''
-        # configure threads for secondary instances
-        + lib.optionalString (scaleIndex > 0) ''
-          configParts+=('{"channel_threads":0, "feed_threads":0}')
-        ''
-        # configure different ports for the instances
-        + ''
-          configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
-        ''
-        # merge all parts into a single configuration with later elements overriding previous elements
-        + ''
-          export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
-          exec ${cfg.package}/bin/invidious
-        '';
-      }
+      { script = configScript scaleIndex; }
     ];
 
   serviceConfig = {
diff --git a/nixos/modules/services/web-apps/librespeed.nix b/nixos/modules/services/web-apps/librespeed.nix
new file mode 100644
index 000000000000..2f7658339751
--- /dev/null
+++ b/nixos/modules/services/web-apps/librespeed.nix
@@ -0,0 +1,452 @@
+{
+  config,
+  lib,
+  options,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.librespeed;
+  opt = options.services.librespeed;
+
+  settingsFormat = pkgs.formats.toml { };
+
+  configFile = settingsFormat.generate "librespeed-rust-config.toml" cfg.settings;
+
+  librespeedAssets =
+    pkgs.runCommand "librespeed-assets"
+      {
+        serversList = ''
+          function get_servers() {
+            return ${builtins.toJSON cfg.frontend.servers}
+          }
+          function override_settings () {
+          ${lib.pipe cfg.frontend.settings [
+            (lib.mapAttrs (name: val: "  s.setParameter(${builtins.toJSON name},${builtins.toJSON val});"))
+            lib.attrValues
+            lib.concatLines
+          ]}
+          }
+        '';
+        passAsFile = [ "serversList" ];
+      }
+      ''
+        cp -r ${cfg.package}/assets $out
+        chmod +w "$out/servers_list.js"
+        cp "$serversListPath" "$out/servers_list.js"
+        substitute ${cfg.package}/assets/index.html $out/index.html \
+          --replace-fail "s.setParameter(\"telemetry_level\",\"basic\"); //enable telemetry" "override_settings();" \
+          --replace-fail "LibreSpeed Example" ${lib.escapeShellArg (lib.escapeXML cfg.frontend.pageTitle)} \
+          --replace-fail "PUT@YOUR_EMAIL.HERE" ${lib.escapeShellArg (lib.escapeXML cfg.frontend.contactEmail)} \
+          --replace-fail "TO BE FILLED BY DEVELOPER" ${lib.escapeShellArg (lib.escapeXML cfg.frontend.contactEmail)}
+      '';
+in
+{
+  options.services.librespeed = {
+    enable = lib.mkEnableOption "LibreSpeed server";
+    package = lib.mkPackageOption pkgs "librespeed-rust" { };
+
+    domain = lib.mkOption {
+      description = ''
+        If not `null`, this will add an entry to `services.librespeed.servers` and
+        configure librespeed to use TLS.
+      '';
+      default = null;
+      type = with lib.types; nullOr nonEmptyStr;
+    };
+
+    downloadIPDB = lib.mkOption {
+      description = ''
+        Whether to download the IP info database before starting librespeed.
+        Disable this if you want to use the Go implementation.
+      '';
+      default = !(cfg.secrets ? "ipinfo_api_key");
+      defaultText = lib.literalExpression ''!(config.${opt.secrets} ? "ipinfo_api_key")'';
+      type = lib.types.bool;
+    };
+
+    secrets = lib.mkOption {
+      description = ''
+        Attribute set of filesystem paths.
+        The contents of the specified paths will be read at service start time and merged with the attributes provided in `settings`.
+      '';
+      default = { };
+      type =
+        with lib.types;
+        nullOr (
+          attrsOf (pathWith {
+            inStore = false;
+            absolute = true;
+          })
+        );
+    };
+
+    settings = lib.mkOption {
+      description = ''
+        LibreSpeed configuration written as Nix expression.
+        All values set to `null` will be excluded from the evaluated config.
+        This is useful if you want to omit certain defaults when using a different LibreSpeed implementation.
+
+        See [github.com/librespeed](https://github.com/librespeed/speedtest-rust) for configuration help.
+      '';
+      default = {
+        assets_path =
+          if (cfg.frontend.enable && !cfg.frontend.useNginx) then
+            librespeedAssets
+          else
+            pkgs.writeTextDir "index.html" "";
+
+        bind_address = "::";
+        listen_port = 8989;
+        base_url = "backend";
+        worker_threads = "auto";
+
+        database_type = "none";
+        database_file = "/var/lib/librespeed/speedtest.sqlite";
+
+        # librespeed-rust will fail to start if the following config parameters are omitted.
+        ipinfo_api_key = "";
+        stats_password = "";
+
+        redact_ip_addresses = false;
+        result_image_theme = "light";
+
+        enable_tls = cfg.tlsCertificate != null && cfg.tlsKey != null;
+        tls_cert_file = lib.optionalString (
+          cfg.tlsCertificate != null
+        ) "/run/credentials/librespeed.service/cert.pem";
+        tls_key_file = lib.optionalString (
+          cfg.tlsKey != null
+        ) "/run/credentials/librespeed.service/key.pem";
+      };
+      defaultText = lib.literalExpression ''
+        {
+          assets_path = if (config.${opt.frontend.enable} && !config.${opt.frontend.useNginx}) then
+            librespeedAssets
+          else
+            pkgs.writeTextDir "index.html" "";
+
+          bind_address = "::";
+          listen_port = 8989;
+          base_url = "backend";
+          worker_threads = "auto";
+
+          database_type = "none";
+          database_file = "/var/lib/librespeed/speedtest.sqlite";
+
+          # librespeed-rust will fail to start if the following config parameters are omitted.
+          ipinfo_api_key = "";
+          stats_password = "";
+
+          redact_ip_addresses = false;
+          result_image_theme = "light";
+
+          enable_tls = config.${opt.tlsCertificate} != null && config.${opt.tlsKey} != null;
+          tls_cert_file = lib.optionalString (config.${opt.tlsCertificate} != null) "/run/credentials/librespeed.service/cert.pem";
+          tls_key_file = lib.optionalString (config.${opt.tlsKey} != null) "/run/credentials/librespeed.service/key.pem";
+        }
+      '';
+      type =
+        with lib.types;
+        nullOr (
+          attrsOf (oneOf [
+            (nullOr bool)
+            int
+            str
+            package
+          ])
+        );
+    };
+
+    useACMEHost = lib.mkOption {
+      type = with lib.types; nullOr nonEmptyStr;
+      default = null;
+      example = "speed.example.com";
+      description = ''
+        Use a certificate generated by the NixOS ACME module for the given host.
+        Note that this will not generate a new certificate - you will need to do so with `security.acme.certs`.
+      '';
+    };
+
+    tlsCertificate = lib.mkOption {
+      type = with lib.types; nullOr nonEmptyStr;
+      default =
+        if (cfg.useACMEHost != null) then
+          "${config.security.acme.certs.${cfg.useACMEHost}.directory}/cert.pem"
+        else
+          null;
+      defaultText = lib.literalExpression "lib.optionalString (config.${opt.useACMEHost} != null) \"\${config.security.acme.certs.\${config.${opt.useACMEHost}}.directory}/cert.pem\"";
+      description = "TLS certificate to use. Use together with `tlsKey`.";
+    };
+
+    tlsKey = lib.mkOption {
+      type = with lib.types; nullOr nonEmptyStr;
+      default =
+        if (cfg.useACMEHost != null) then
+          "${config.security.acme.certs.${cfg.useACMEHost}.directory}/key.pem"
+        else
+          null;
+      defaultText = lib.literalExpression "lib.optionalString (config.${opt.useACMEHost} != null) \"\${config.security.acme.certs.\${config.${opt.useACMEHost}}.directory}/key.pem\"";
+      description = "TLS private key to use. Use together with `tlsCertificate`.";
+    };
+
+    frontend = {
+      enable = lib.mkEnableOption "" // {
+        description = ''
+          Enables the LibreSpeed frontend and adds a nginx virtual host if
+          not explicitly disabled and `services.librespeed.domain` is not `null`.
+        '';
+      };
+
+      contactEmail = lib.mkOption {
+        description = "Email address listed in the privacy policy.";
+        type = lib.types.str;
+      };
+
+      pageTitle = lib.mkOption {
+        description = "Title of the webpage.";
+        default = "LibreSpeed";
+        type = lib.types.str;
+      };
+
+      useNginx = lib.mkOption {
+        description = ''
+          Configure nginx for the LibreSpeed frontend.
+          This will only create a virtual host for the frontend and won't proxy all requests because
+          the reported upload and download speeds are inaccurate if proxied.
+        '';
+        default = cfg.domain != null;
+        defaultText = lib.literalExpression "config.${opt.domain} != null";
+        type = lib.types.bool;
+      };
+
+      settings = lib.mkOption {
+        description = ''
+          Override default settings of the speedtest web client.
+          See [speedtest_worker.js][link] for a list of possible values.
+
+          [link]: https://github.com/librespeed/speedtest/blob/master/speedtest_worker.js#L39
+        '';
+        default = {
+          telemetry_level = "basic";
+        };
+        type = lib.types.nullOr (
+          lib.types.submodule {
+            freeformType =
+              with lib.types;
+              attrsOf (oneOf [
+                bool
+                int
+                str
+                float
+              ]);
+          }
+        );
+      };
+
+      servers = lib.mkOption {
+        description = "LibreSpeed servers that should appear in the server list.";
+        type = lib.types.listOf (
+          lib.types.submodule {
+            options = {
+              name = lib.mkOption {
+                description = "Name shown in the server list.";
+                type = lib.types.nonEmptyStr;
+              };
+
+              server = lib.mkOption {
+                description = "URL to the server. You may use `//` instead of `http://` or `https://`.";
+                type = lib.types.nonEmptyStr;
+              };
+
+              dlURL = lib.mkOption {
+                description = ''
+                  URL path to download test on this server.
+                  Append `.php` to the default value if the server uses the php implementation.
+                '';
+                default = "backend/garbage";
+                type = lib.types.nonEmptyStr;
+              };
+
+              ulURL = lib.mkOption {
+                description = ''
+                  URL path to upload test on this server.
+                  Append `.php` to the default value if the server uses the php implementation.
+                '';
+                default = "backend/empty";
+                type = lib.types.nonEmptyStr;
+              };
+
+              pingURL = lib.mkOption {
+                description = ''
+                  URL path to latency/jitter test on this server.
+                  Append `.php` to the default value if the server uses the php implementation.
+                '';
+                default = "backend/empty";
+                type = lib.types.nonEmptyStr;
+              };
+
+              getIpURL = lib.mkOption {
+                description = ''
+                  URL path to IP lookup on this server.
+                  Append `.php` to the default value if the server uses the php implementation.
+                '';
+                default = "backend/getIP";
+                type = lib.types.nonEmptyStr;
+              };
+            };
+          }
+        );
+      };
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = cfg.frontend.useNginx -> cfg.domain != null;
+        message = "${opt.frontend.useNginx} requires ${opt.domain} to be set.";
+      }
+    ];
+
+    security.acme.certs = lib.mkIf (cfg.useACMEHost != null) {
+      ${cfg.useACMEHost}.reloadServices = [ "librespeed.service" ];
+    };
+
+    services = {
+      librespeed = {
+        frontend.servers = lib.mkIf (cfg.frontend.enable && (cfg.domain != null)) [
+          {
+            name = cfg.domain;
+            server = "//${cfg.domain}";
+          }
+        ];
+        settings = lib.mapAttrs (n: v: lib.mkDefault v) opt.settings.default;
+      };
+
+      nginx.virtualHosts = lib.mkIf (cfg.frontend.enable && cfg.frontend.useNginx) {
+        ${cfg.domain} = {
+          forceSSL = true;
+          locations = {
+            "/".root = librespeedAssets;
+            "= /servers.json".return = "200 '${builtins.toJSON cfg.frontend.servers}'";
+            "/backend/" = {
+              proxyPass = "http://127.0.0.1:${toString cfg.settings.listen_port}/backend/";
+              extraConfig = # nginx
+              ''
+                client_max_body_size 0;
+                gzip off;
+                proxy_buffering off;
+                proxy_request_buffering off;
+              ''
+              + lib.optionalString (lib.elem "brotli" config.services.nginx.additionalModules) ''
+                brotli off;
+              ''
+              + lib.optionalString (lib.elem "zstd" config.services.nginx.additionalModules) ''
+                zstd off;
+              '';
+            };
+          };
+        };
+      };
+    };
+
+    systemd.services = {
+      librespeed-secrets = lib.mkIf (cfg.secrets != { }) {
+        description = "LibreSpeed secret helper";
+
+        ExecStart = lib.getExe (
+          pkgs.writeShellApplication {
+            name = "librespeed-secrets";
+            runtimeInputs = [ pkgs.coreutils ];
+            text = ''
+              cp ${configFile} ''${RUNTIME_DIRECTORY%%:*}/config.toml
+            ''
+            + lib.pipe cfg.secrets [
+              (lib.mapAttrs (
+                name: file: ''
+                  cat >>''${RUNTIME_DIRECTORY%%:*}/config.toml <<EOF
+                  ${name}="$(<${lib.escapeShellArg file})"
+                  EOF
+                ''
+              ))
+              (lib.concatLines lib.attrValues)
+            ];
+          }
+        );
+
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = true;
+          RuntimeDirectory = "librespeed";
+          UMask = "u=rw";
+        };
+      };
+
+      librespeed = {
+        description = "LibreSpeed server daemon";
+        wantedBy = [ "multi-user.target" ];
+        wants = [
+          "network.target"
+        ]
+        ++ lib.optionals (cfg.useACMEHost != null) [
+          "acme-finished-${cfg.useACMEHost}.target"
+        ];
+        requires = lib.optionals (cfg.secrets != { }) [ "librespeed-secrets.service" ];
+        after = [
+          "network.target"
+        ]
+        ++ lib.optionals (cfg.secrets != { }) [
+          "librespeed-secrets.service"
+        ]
+        ++ lib.optionals (cfg.useACMEHost != null) [
+          "acme-finished-${cfg.useACMEHost}.target"
+        ];
+
+        serviceConfig = {
+          Type = "simple";
+          Restart = "always";
+
+          DynamicUser = true;
+
+          LoadCredential = lib.mkIf (cfg.tlsCertificate != null && cfg.tlsKey != null) [
+            "cert.pem:${cfg.tlsCertificate}"
+            "key.pem:${cfg.tlsKey}"
+          ];
+
+          ExecStartPre = lib.mkIf cfg.downloadIPDB "${lib.getExe cfg.package} --update-ipdb";
+          ExecStart = "${lib.getExe cfg.package} -c ${
+            if (cfg.secrets == { }) then configFile else "\${RUNTIME_DIRECTORY%%:*}/config.toml"
+          }";
+          WorkingDirectory = "/var/cache/librespeed";
+          RuntimeDirectory = "librespeed";
+          RuntimeDirectoryPreserve = true;
+          StateDirectory = "librespeed";
+          CacheDirectory = "librespeed";
+          SyslogIdentifier = "librespeed";
+
+          RestrictSUIDSGID = true;
+          RestrictNamespaces = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          PrivateUsers = true;
+          ProtectHostname = true;
+          ProtectClock = true;
+          ProtectKernelTunables = true;
+          ProtectKernelModules = true;
+          ProtectKernelLogs = true;
+          ProtectControlGroups = true;
+          ProtectSystem = "strict";
+          ProtectHome = true;
+          ProtectProc = "invisible";
+          SystemCallArchitectures = "native";
+          SystemCallFilter = "@system-service";
+          SystemCallErrorNumber = "EPERM";
+          LockPersonality = true;
+          NoNewPrivileges = true;
+        };
+      };
+    };
+  };
+
+  meta.maintainers = lib.teams.c3d2.members;
+}
diff --git a/nixos/modules/services/web-apps/libretranslate.nix b/nixos/modules/services/web-apps/libretranslate.nix
index 1664b9ef4581..5ac68ad3c919 100644
--- a/nixos/modules/services/web-apps/libretranslate.nix
+++ b/nixos/modules/services/web-apps/libretranslate.nix
@@ -146,7 +146,7 @@ in
           Type = "simple";
           ExecStart = ''
             ${cfg.package}/bin/libretranslate ${
-              lib.cli.toGNUCommandLineShell { } (
+              lib.cli.toCommandLineShellGNU { } (
                 cfg.extraArgs
                 // {
                   inherit (cfg) host port threads;
diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index c1582b3ee9ff..9d71b8112cf4 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -838,6 +838,12 @@ in
               ));
             message = "There must be exactly one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";
           }
+          {
+            assertion =
+              databaseActuallyCreateLocally
+              -> lib.versionAtLeast config.services.postgresql.finalPackage.version "14";
+            message = "Mastodon requires at least PostgreSQL 14.";
+          }
         ];
 
         environment.systemPackages = [ mastodonTootctl ];
diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 39d380b4ed79..412a36c29c90 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -966,6 +966,13 @@ in
             or hostname, and services.mattermost.port to specify the port separately.
           '';
         }
+        {
+          # Can't use MySQL on version 11.
+          assertion = versionAtLeast cfg.package.version "11" -> cfg.database.driver == "postgres";
+          message = ''
+            Only Postgres is supported as the database driver in Mattermost 11 and later.
+          '';
+        }
       ];
     })
     (mkIf cfg.matterircd.enable {
diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index e4ffc1677626..03447395fef6 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -20,9 +20,11 @@ let
   boolToInt = b: if b then 1 else 0;
 
   pgbin = "${config.services.postgresql.package}/bin";
+  # The hstore extension is no longer needed as of v2.2.14
+  # and would prevent Miniflux from starting.
   preStart = pkgs.writeScript "miniflux-pre-start" ''
     #!${pkgs.runtimeShell}
-    ${pgbin}/psql "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore"
+    ${pgbin}/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"
   '';
 in
 
@@ -39,7 +41,7 @@ in
         description = ''
           Whether a PostgreSQL database should be automatically created and
           configured on the local host. If set to `false`, you need provision a
-          database yourself and make sure to create the hstore extension in it.
+          database yourself.
         '';
       };
 
@@ -205,15 +207,18 @@ in
     environment.systemPackages = [ cfg.package ];
 
     security.apparmor.policies."bin.miniflux".profile = ''
+      abi <abi/4.0>,
       include <tunables/global>
-      ${cfg.package}/bin/miniflux {
+
+      profile ${cfg.package}/bin/miniflux {
         include <abstractions/base>
         include <abstractions/nameservice>
         include <abstractions/ssl_certs>
+        include <abstractions/golang>
         include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}"
-        r ${cfg.package}/bin/miniflux,
-        r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size,
-        rw /run/miniflux/**,
+        ${cfg.package}/bin/miniflux r,
+        /run/miniflux/** rw,
+        include if exists <local/bin.miniflux>
       }
     '';
   };
diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix
index c61f217b4b68..440c0e89a389 100644
--- a/nixos/modules/services/web-apps/netbox.nix
+++ b/nixos/modules/services/web-apps/netbox.nix
@@ -109,10 +109,10 @@ in
     package = lib.mkOption {
       type = lib.types.package;
       default =
-        if lib.versionAtLeast config.system.stateVersion "25.11" then pkgs.netbox_4_3 else pkgs.netbox_4_2;
+        if lib.versionAtLeast config.system.stateVersion "25.11" then pkgs.netbox_4_4 else pkgs.netbox_4_2;
       defaultText = lib.literalExpression ''
         if lib.versionAtLeast config.system.stateVersion "25.11"
-        then pkgs.netbox_4_3
+        then pkgs.netbox_4_4
         else pkgs.netbox_4_2;
       '';
       description = ''
diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 87e69c402e10..67a756a4ea01 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -166,6 +166,7 @@ let
             --setenv OC_PASS \
             --setenv NC_PASS \
             --quiet \
+            -- \
             ${command}
         elif [[ "$USER" != nextcloud ]]; then
           if [[ -x /run/wrappers/bin/sudo ]]; then
@@ -174,6 +175,7 @@ let
               --preserve-env=OC_PASS \
               --preserve-env=NC_PASS \
               --user=nextcloud \
+              -- \
               ${command}
           else
             exec ${lib.getExe' pkgs.util-linux "runuser"} \
@@ -181,6 +183,7 @@ let
               --whitelist-environment=OC_PASS \
               --whitelist-environment=NC_PASS \
               --user=nextcloud \
+              -- \
               ${command}
           fi
         else
@@ -399,11 +402,11 @@ in
         {
           inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts;
           phonetrack = pkgs.fetchNextcloudApp {
-            name = "phonetrack";
+            appName = "phonetrack";
+            appVersion = "0.8.2";
             license = "agpl3Plus";
             sha512 = "f67902d1b48def9a244383a39d7bec95bb4215054963a9751f99dae9bd2f2740c02d2ef97b3b76d69a36fa95f8a9374dd049440b195f4dad2f0c4bca645de228";
             url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz";
-            version = "0.8.2";
           };
         }
       '';
@@ -644,7 +647,7 @@ in
         '';
       };
       adminuser = lib.mkOption {
-        type = lib.types.str;
+        type = lib.types.nullOr lib.types.str;
         default = "root";
         description = ''
           Username for the admin account. The username is only set during the
@@ -653,7 +656,7 @@ in
         '';
       };
       adminpassFile = lib.mkOption {
-        type = lib.types.str;
+        type = lib.types.nullOr lib.types.str;
         description = ''
           The full path to a file that contains the admin's password. The password is
           set only in the initial setup of Nextcloud by the systemd service `nextcloud-setup.service`.
@@ -1121,6 +1124,26 @@ in
               https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/db_conversion.html
             '';
           }
+          {
+            assertion =
+              lib.versionAtLeast overridePackage.version "32.0.0"
+              || (cfg.config.adminuser != null && cfg.config.adminpassFile != null);
+            message = ''
+              Disabling initial admin user creation is only available on Nextcloud >= 32.0.0.
+            '';
+          }
+          {
+            assertion = cfg.config.adminuser == null -> cfg.config.adminpassFile == null;
+            message = ''
+              If `services.nextcloud.config.adminuser` is null, `services.nextcloud.config.adminpassFile` must be null as well in order to disable initial admin user creation.
+            '';
+          }
+          {
+            assertion = cfg.config.adminpassFile == null -> cfg.config.adminuser == null;
+            message = ''
+              If `services.nextcloud.config.adminpassFile` is null, `services.nextcloud.config.adminuser` must be null as well in order to disable initial admin user creation.
+            '';
+          }
         ];
       }
 
@@ -1164,10 +1187,14 @@ in
                     arg = "DBPASS";
                     value = if c.dbpassFile != null then ''"$(<"$CREDENTIALS_DIRECTORY/dbpass")"'' else ''""'';
                   };
-                  adminpass = {
-                    arg = "ADMINPASS";
-                    value = ''"$(<"$CREDENTIALS_DIRECTORY/adminpass")"'';
-                  };
+                  adminpass =
+                    if c.adminpassFile != null then
+                      {
+                        arg = "ADMINPASS";
+                        value = ''"$(<"$CREDENTIALS_DIRECTORY/adminpass")"'';
+                      }
+                    else
+                      null;
                   installFlags = lib.concatStringsSep " \\\n    " (
                     lib.mapAttrsToList (k: v: "${k} ${toString v}") {
                       "--database" = ''"${c.dbtype}"'';
@@ -1178,15 +1205,16 @@ in
                       ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
                       ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
                       "--database-pass" = "\"\$${dbpass.arg}\"";
-                      "--admin-user" = ''"${c.adminuser}"'';
-                      "--admin-pass" = "\"\$${adminpass.arg}\"";
+                      ${if c.adminuser != null then "--admin-user" else null} = ''"${c.adminuser}"'';
+                      ${if adminpass != null then "--admin-pass" else null} = "\"\$${adminpass.arg}\"";
+                      ${if c.adminuser == null && adminpass == null then "--disable-admin-user" else null} = "";
                       "--data-dir" = ''"${datadir}/data"'';
                     }
                   );
                 in
                 ''
                   ${mkExport dbpass}
-                  ${mkExport adminpass}
+                  ${lib.optionalString (adminpass != null) (mkExport adminpass)}
                   ${lib.getExe occ} maintenance:install \
                       ${installFlags}
                 '';
@@ -1207,16 +1235,20 @@ in
               path = [ occ ];
               restartTriggers = [ overrideConfig ];
               script = ''
+                export OCC_BIN="${lib.getExe occ}"
+
                 ${lib.optionalString (c.dbpassFile != null) ''
                   if [ -z "$(<"$CREDENTIALS_DIRECTORY/dbpass")" ]; then
                     echo "dbpassFile ${c.dbpassFile} is empty!"
                     exit 1
                   fi
                 ''}
-                if [ -z "$(<"$CREDENTIALS_DIRECTORY/adminpass")" ]; then
-                  echo "adminpassFile ${c.adminpassFile} is empty!"
-                  exit 1
-                fi
+                ${lib.optionalString (c.adminpassFile != null) ''
+                  if [ -z "$(<"$CREDENTIALS_DIRECTORY/adminpass")" ]; then
+                    echo "adminpassFile ${c.adminpassFile} is empty!"
+                    exit 1
+                  fi
+                ''}
 
                 # Check if systemd-tmpfiles setup worked correctly
                 if [[ ! -O "${datadir}/config" ]]; then
@@ -1245,23 +1277,22 @@ in
                   ${occInstallCmd}
                 fi
 
-                ${lib.getExe occ} upgrade
+                $OCC_BIN upgrade
 
-                ${lib.getExe occ} config:system:delete trusted_domains
+                $OCC_BIN config:system:delete trusted_domains
 
                 ${lib.optionalString (cfg.extraAppsEnable && cfg.extraApps != { }) ''
                   # Try to enable apps
-                  ${lib.getExe occ} app:enable ${lib.concatStringsSep " " (lib.attrNames cfg.extraApps)}
+                  $OCC_BIN app:enable ${lib.concatStringsSep " " (lib.attrNames cfg.extraApps)}
                 ''}
 
                 ${occSetTrustedDomainsCmd}
               '';
               serviceConfig.Type = "oneshot";
               serviceConfig.User = "nextcloud";
-              serviceConfig.LoadCredential = [
-                "adminpass:${cfg.config.adminpassFile}"
-              ]
-              ++ runtimeSystemdCredentials;
+              serviceConfig.LoadCredential =
+                lib.optional (cfg.config.adminpassFile != null) "adminpass:${cfg.config.adminpassFile}"
+                ++ runtimeSystemdCredentials;
               # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent
               # an automatic creation of the database user.
               environment.NC_setup_create_db_user = "false";
diff --git a/nixos/modules/services/web-apps/open-web-calendar.nix b/nixos/modules/services/web-apps/open-web-calendar.nix
index 525c9eb8c28c..f136ef8b75f5 100644
--- a/nixos/modules/services/web-apps/open-web-calendar.nix
+++ b/nixos/modules/services/web-apps/open-web-calendar.nix
@@ -130,7 +130,7 @@ in
             open_web_calendar.app:app
         '';
         EnvironmentFile = settingsFormat.generate "open-web-calendar.env" cfg.settings;
-        ExecReload = "kill -s HUP $MAINPID";
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID";
         KillMode = "mixed";
         PrivateTmp = true;
         RuntimeDirectory = "open-web-calendar";
diff --git a/nixos/modules/services/web-apps/pairdrop.nix b/nixos/modules/services/web-apps/pairdrop.nix
new file mode 100644
index 000000000000..56de9b252e45
--- /dev/null
+++ b/nixos/modules/services/web-apps/pairdrop.nix
@@ -0,0 +1,152 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    boolToString
+    getExe
+    isBool
+    maintainers
+    mapAttrs
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    optionalAttrs
+    optionals
+    types
+    ;
+
+  cfg = config.services.pairdrop;
+
+  json = pkgs.formats.json { };
+in
+{
+  options.services.pairdrop = {
+    enable = mkEnableOption "pairdrop";
+
+    package = mkPackageOption pkgs "pairdrop" { };
+
+    port = mkOption {
+      type = types.port;
+      default = 3000;
+      example = 3010;
+      description = "The port to listen on.";
+    };
+
+    rtcConfig = mkOption {
+      type = json.type;
+      default = null;
+      example = {
+        sdpSemantics = "unified-plan";
+        iceServers = [
+          {
+            urls = "stun:stun.example.com:19302";
+          }
+        ];
+      };
+      description = ''
+        Configuration for STUN/TURN servers.
+        This is converted to JSON and written into a file automatically.
+        If you want to provide a file path instead, set `RTC_CONFIG` in {option}`services.pairdrop.environment`.
+      '';
+    };
+
+    environment = mkOption {
+      description = ''
+        Additional configuration (environment variables) for PairDrop, see
+        <https://github.com/schlagmichdoch/PairDrop/blob/master/docs/host-your-own.md#environment-variables>
+        for supported values.
+      '';
+
+      type = types.submodule {
+        freeformType =
+          with types;
+          attrsOf (oneOf [
+            bool
+            int
+            str
+          ]);
+
+        options = { };
+      };
+
+      default = { };
+
+      example = {
+        DEBUG_MODE = true;
+        RATE_LIMIT = 1;
+        IPV6_LOCALIZE = 4;
+        WS_FALLBACK = true;
+        SIGNALING_SERVER = "pairdrop.net";
+        RTC_CONFIG = "/etc/pairdrop/rtc-config.json";
+
+        DONATION_BUTTON_ACTIVE = false;
+        TWITTER_BUTTON_ACTIVE = false;
+        MASTODON_BUTTON_ACTIVE = false;
+        BLUESKY_BUTTON_ACTIVE = false;
+        CUSTOM_BUTTON_ACTIVE = false;
+        PRIVACYPOLICY_BUTTON_ACTIVE = false;
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    warnings = optionals (cfg.rtcConfig != null && cfg.environment ? RTC_CONFIG) [
+      "Both services.pairdrop.rtcConfig and services.pairdrop.environment.RTC_CONFIG are set. The environment variable will take precedence."
+    ];
+
+    systemd.services.pairdrop =
+      let
+        environment = {
+          PORT = toString cfg.port;
+        }
+        // (optionalAttrs (cfg.rtcConfig != null) {
+          RTC_CONFIG = json.generate "rtc-config.json" cfg.rtcConfig;
+        })
+        // (mapAttrs (_: v: if isBool v then boolToString v else toString v) cfg.environment);
+      in
+      {
+        inherit environment;
+
+        description = "PairDrop: Transfer Files Cross-Platform";
+        after = [ "network.target" ];
+        wantedBy = [ "multi-user.target" ];
+        serviceConfig = {
+          ExecStart = getExe cfg.package;
+
+          Type = "simple";
+          Restart = "on-failure";
+          RestartSec = 3;
+          DynamicUser = true;
+
+          # Hardening
+          CapabilityBoundingSet = "";
+          NoNewPrivileges = true;
+          PrivateUsers = true;
+          PrivateTmp = true;
+          PrivateDevices = true;
+          PrivateMounts = true;
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          ProtectHome = true;
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+          ];
+          RestrictNamespaces = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+        };
+      };
+  };
+
+  meta.maintainers = with maintainers; [ diogotcorreia ];
+}
diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix
index c3dceb859fea..f4aa61a4c910 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixos/modules/services/web-apps/selfoss.nix
@@ -148,7 +148,11 @@ in
         ls | grep -v data | while read line; do rm -rf $line; done || true
 
         # Create the files
-        cp -r "${pkgs.selfoss}/"* "${dataDir}"
+        cp -r \
+          "${pkgs.selfoss}/.htaccess" \
+          "${pkgs.selfoss}/.nginx.conf" \
+          "${pkgs.selfoss}/"* \
+          "${dataDir}"
         ln -sf "${selfoss-config}" "${dataDir}/config.ini"
         chown -R "${cfg.user}" "${dataDir}"
         chmod -R 755 "${dataDir}"
diff --git a/nixos/modules/services/web-apps/simplesamlphp.nix b/nixos/modules/services/web-apps/simplesamlphp.nix
deleted file mode 100644
index 46d8b69a174b..000000000000
--- a/nixos/modules/services/web-apps/simplesamlphp.nix
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-let
-  cfg = config.services.simplesamlphp;
-
-  format = pkgs.formats.php { finalVariable = "config"; };
-
-  generateConfig =
-    opts:
-    pkgs.runCommand "simplesamlphp-config" { } ''
-      mkdir $out
-      cp ${format.generate "config.php" opts.settings} $out/config.php
-      cp ${format.generate "authsources.php" opts.authSources} $out/authsources.php
-    '';
-in
-{
-  meta = {
-    maintainers = with lib.maintainers; [ nhnn ];
-  };
-
-  options.services.simplesamlphp =
-    with lib;
-    mkOption {
-      type = types.attrsOf (
-        types.submodule (
-          { config, ... }:
-          {
-            options = {
-              package = mkPackageOption pkgs "simplesamlphp" { };
-              configureNginx = mkOption {
-                type = types.bool;
-                default = true;
-                description = "Configure nginx as a reverse proxy for SimpleSAMLphp.";
-              };
-              phpfpmPool = mkOption {
-                type = types.str;
-                description = "The PHP-FPM pool that serves SimpleSAMLphp instance.";
-              };
-              localDomain = mkOption {
-                type = types.str;
-                description = "The domain serving your SimpleSAMLphp instance. This option modifies only /saml route.";
-              };
-              settings = mkOption {
-                type = types.submodule {
-                  freeformType = format.type;
-                  options = {
-                    baseurlpath = mkOption {
-                      type = types.str;
-                      example = "https://filesender.example.com/saml/";
-                      description = "URL where SimpleSAMLphp can be reached.";
-                    };
-                  };
-                };
-                default = { };
-                description = ''
-                  Configuration options used by SimpleSAMLphp.
-                  See [](https://simplesamlphp.org/docs/stable/simplesamlphp-install)
-                  for available options.
-                '';
-              };
-
-              authSources = mkOption {
-                type = format.type;
-                default = { };
-                description = ''
-                  Auth sources options used by SimpleSAMLphp.
-                '';
-              };
-
-              libDir = mkOption {
-                type = types.str;
-                readOnly = true;
-                description = ''
-                  Path to the SimpleSAMLphp library directory.
-                '';
-              };
-              configDir = mkOption {
-                type = types.str;
-                readOnly = true;
-                description = ''
-                  Path to the SimpleSAMLphp config directory.
-                '';
-              };
-            };
-            config = {
-              libDir = "${config.package}/share/php/simplesamlphp/";
-              configDir = "${generateConfig config}";
-            };
-          }
-        )
-      );
-      default = { };
-      description = "Instances of SimpleSAMLphp. This module is designed to work with already existing PHP-FPM pool and NGINX virtualHost.";
-    };
-
-  config = lib.mkIf (cfg != { }) {
-    services.phpfpm.pools = lib.mapAttrs' (
-      phpfpmName: opts:
-      lib.nameValuePair opts.phpfpmPool { phpEnv.SIMPLESAMLPHP_CONFIG_DIR = "${generateConfig opts}"; }
-    ) cfg;
-
-    services.nginx.virtualHosts = lib.mapAttrs' (
-      phpfpmName: opts:
-      lib.nameValuePair opts.localDomain (
-        lib.mkIf opts.configureNginx {
-          locations."^~ /saml/" = {
-            alias = "${opts.package}/share/php/simplesamlphp/www/";
-            extraConfig = ''
-                location ~ ^(?<prefix>/saml)(?<phpfile>.+?\.php)(?<pathinfo>/.*)?$ {
-                  include ${pkgs.nginx}/conf/fastcgi.conf;
-                  fastcgi_split_path_info  ^(.+\.php)(/.+)$;
-                  fastcgi_pass  unix:${config.services.phpfpm.pools.${phpfpmName}.socket};
-                  fastcgi_intercept_errors on;
-                  fastcgi_param SCRIPT_FILENAME $document_root$phpfile;
-                  fastcgi_param SCRIPT_NAME /saml$phpfile;
-                  fastcgi_param PATH_INFO $pathinfo if_not_empty;
-              }
-            '';
-          };
-        }
-      )
-    ) cfg;
-  };
-}
diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix
index 17c470ffaf99..36346ab5e012 100644
--- a/nixos/modules/services/web-apps/weblate.nix
+++ b/nixos/modules/services/web-apps/weblate.nix
@@ -374,7 +374,7 @@ in
               --bind='unix:///run/weblate.socket' \
               weblate.wsgi
           '';
-        ExecReload = "kill -s HUP $MAINPID";
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID";
         KillMode = "mixed";
         PrivateTmp = true;
         WorkingDirectory = dataDir;
diff --git a/nixos/modules/services/web-apps/zitadel.nix b/nixos/modules/services/web-apps/zitadel.nix
index c097d36d9039..6cfd1bbd4680 100644
--- a/nixos/modules/services/web-apps/zitadel.nix
+++ b/nixos/modules/services/web-apps/zitadel.nix
@@ -207,7 +207,7 @@ in
         configFile = settingsFormat.generate "config.yaml" cfg.settings;
         stepsFile = settingsFormat.generate "steps.yaml" cfg.steps;
 
-        args = lib.cli.toGNUCommandLineShell { } {
+        args = lib.cli.toCommandLineShellGNU { } {
           config = cfg.extraSettingsPaths ++ [ configFile ];
           steps = cfg.extraStepsPaths ++ [ stepsFile ];
           masterkeyFile = cfg.masterKeyFile;
diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix
index 992f4a46ff4b..493cd710c1bb 100644
--- a/nixos/modules/services/web-servers/fcgiwrap.nix
+++ b/nixos/modules/services/web-servers/fcgiwrap.nix
@@ -151,7 +151,7 @@ in
       serviceConfig = {
         ExecStart = ''
           ${pkgs.fcgiwrap}/sbin/fcgiwrap ${
-            cli.toGNUCommandLineShell { } (
+            cli.toCommandLineShellGNU { } (
               {
                 c = cfg.process.prefork;
               }
diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 979ae57c4228..aa18102fd766 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -10,7 +10,7 @@ with lib;
 let
   cfg = config.services.nginx;
   inherit (config.security.acme) certs;
-  vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
+  vhostsConfigs = attrValues virtualHosts;
   acmeEnabledVhosts = filter (
     vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null
   ) vhostsConfigs;
@@ -324,7 +324,7 @@ let
     mapAttrsToList (
       vhostName: vhost:
       let
-        onlySSL = vhost.onlySSL || vhost.enableSSL;
+        onlySSL = vhost.onlySSL;
         hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL;
 
         # First evaluation of defaultListen based on a set of listen lines.
@@ -1324,18 +1324,6 @@ in
   ];
 
   config = mkIf cfg.enable {
-    warnings =
-      let
-        deprecatedSSL =
-          name: config:
-          optional config.enableSSL ''
-            config.services.nginx.virtualHosts.<name>.enableSSL is deprecated,
-            use config.services.nginx.virtualHosts.<name>.onlySSL instead.
-          '';
-
-      in
-      flatten (mapAttrsToList deprecatedSSL virtualHosts);
-
     assertions =
       let
         hostOrAliasIsNull = l: l.root == null || l.alias == null;
@@ -1352,7 +1340,7 @@ in
             with host;
             count id [
               addSSL
-              (onlySSL || enableSSL)
+              onlySSL
               forceSSL
               rejectSSL
             ] <= 1
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 169c443d759a..547a85f5f700 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -170,12 +170,6 @@ with lib;
       '';
     };
 
-    enableSSL = mkOption {
-      type = types.bool;
-      visible = false;
-      default = false;
-    };
-
     forceSSL = mkOption {
       type = types.bool;
       default = false;
diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix
index 12118089a1f7..299aeaea6c14 100644
--- a/nixos/modules/services/x11/desktop-managers/phosh.nix
+++ b/nixos/modules/services/x11/desktop-managers/phosh.nix
@@ -145,6 +145,11 @@ let
 in
 
 {
+
+  meta = {
+    maintainers = with lib.maintainers; [ armelclo ];
+  };
+
   options = {
     services.xserver.desktopManager.phosh = {
       enable = lib.mkOption {
@@ -183,8 +188,11 @@ in
 
   config = lib.mkIf cfg.enable {
     # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
+    # Parts taken from nixos/modules/services/wayland/cage.nix
     systemd.services.phosh = {
       wantedBy = [ "graphical.target" ];
+      after = [ "getty@tty1.service" ];
+      conflicts = [ "getty@tty1.service" ];
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/phosh-session";
         User = cfg.user;
@@ -193,7 +201,7 @@ in
         WorkingDirectory = "~";
         Restart = "always";
 
-        TTYPath = "/dev/tty7";
+        TTYPath = "/dev/tty1";
         TTYReset = "yes";
         TTYVHangup = "yes";
         TTYVTDisallocate = "yes";
@@ -204,7 +212,7 @@ in
         StandardError = "journal";
 
         # Log this user with utmp, letting it show up with commands 'w' and 'who'.
-        UtmpIdentifier = "tty7";
+        UtmpIdentifier = "tty1";
         UtmpMode = "user";
       };
       environment = {
@@ -224,6 +232,16 @@ in
       };
     };
 
+    xdg.portal = {
+      enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-phosh
+        pkgs.xdg-desktop-portal-gnome
+        pkgs.xdg-desktop-portal-gtk
+      ];
+      configPackages = lib.mkDefault [ pkgs.phosh ];
+    };
+
     environment.systemPackages = [
       pkgs.phoc
       cfg.package
diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix
index 7d168124e67f..40381146c8a9 100644
--- a/nixos/modules/services/x11/display-managers/sx.nix
+++ b/nixos/modules/services/x11/display-managers/sx.nix
@@ -51,7 +51,6 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    figsoda
     thiagokokada
   ];
 }
diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index e75ec5c2019f..33d53930dff0 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -62,7 +62,7 @@ in
 {
 
   imports = [
-    (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
+    (mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
     (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
       This option corresponds to `refresh-rate`, which has been unused
       since picom v6 and was subsequently removed by upstream.
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 9bb6f30e41db..fdc2164f0f9d 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -177,7 +177,7 @@ let
     {
       postInstall = ''
         alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific'
-        echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias
+        echo "$alias" > $out/share/fonts/X11/Type1/fonts.alias
       '';
     }
   );
diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix
index 8ca9c96006a4..2cf34e899cae 100644
--- a/nixos/modules/system/boot/kernel_config.nix
+++ b/nixos/modules/system/boot/kernel_config.nix
@@ -6,7 +6,7 @@ let
     locs: defs:
     if defs == [ ] then
       abort "This case should never happen."
-    else if any (x: x == false) (getValues defs) then
+    else if elem false (getValues defs) then
       false
     else
       true;
diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index f4a4245f141c..a64f34eaefc3 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -51,6 +51,11 @@ def config(*path: str) -> Optional[Any]:
         result = result[component]
     return result
 
+
+def bool_to_yes_no(value: bool) -> str:
+    return 'yes' if value else 'no'
+
+
 def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str:
     basename = f'{profile}-{gen}-link' if gen is not None else profile
     profiles_dir = '/nix/var/nix/profiles'
@@ -377,10 +382,14 @@ def copy_file(from_path: str, to_path: str):
 
     paths[to_path] = True
 
-def option_from_config(name: str, config_path: List[str], conversion: Callable[[str], str] | None = None) -> str:
-    if config(*config_path):
-        return f'{name}: {conversion(config(*config_path)) if conversion else config(*config_path)}\n'
-    return ''
+
+def option_from_config(name: str, config_path: List[str]) -> str:
+    value = config(*config_path)
+    if value is None:
+        return ""
+    if isinstance(value, bool):
+        value = bool_to_yes_no(value)
+    return f"{name}: {config(*config_path)}\n"
 
 
 def install_bootloader() -> None:
@@ -439,8 +448,8 @@ def install_bootloader() -> None:
         profiles += [(profile, get_gens(profile))]
 
     timeout = config('timeout')
-    editor_enabled = 'yes' if config('enableEditor') else 'no'
-    hash_mismatch_panic = 'yes' if config('panicOnChecksumMismatch') else 'no'
+    editor_enabled = bool_to_yes_no(config('enableEditor'))
+    hash_mismatch_panic = bool_to_yes_no(config('panicOnChecksumMismatch'))
 
     last_gen = get_gens()[-1]
     last_gen_json = json.load(open(os.path.join(get_system_path('system', last_gen), 'boot.json'), 'r'))
diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index 0c38e92f96a7..35e81d2afcfb 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -229,10 +229,10 @@ in
       };
 
       wallpaperStyle = lib.mkOption {
-        default = "streched";
+        default = "stretched";
         type = lib.types.enum [
           "centered"
-          "streched"
+          "stretched"
           "tiled"
         ];
         description = ''
@@ -375,7 +375,7 @@ in
     }
     (lib.mkIf (cfg.style.wallpapers == [ defaultWallpaper ]) {
       boot.loader.limine.style.backdrop = lib.mkDefault "2F302F";
-      boot.loader.limine.style.wallpaperStyle = lib.mkDefault "streched";
+      boot.loader.limine.style.wallpaperStyle = lib.mkDefault "stretched";
     })
     (lib.mkIf cfg.enable {
       assertions = [
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 395632466f27..3636503992c5 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -6,13 +6,20 @@
   ...
 }:
 
-with lib;
-
 let
-
-  plymouth = pkgs.plymouth.override {
-    systemd = config.boot.initrd.systemd.package;
-  };
+  inherit (lib)
+    mkOption
+    mkEnableOption
+    optional
+    mkIf
+    mkBefore
+    mkAfter
+    literalExpression
+    types
+    literalMD
+    getExe'
+    escapeShellArg
+    ;
 
   cfg = config.boot.plymouth;
   opt = options.boot.plymouth;
@@ -53,7 +60,7 @@ let
   themesEnv = pkgs.buildEnv {
     name = "plymouth-themes";
     paths = [
-      plymouth
+      cfg.package
       plymouthLogos
     ]
     ++ cfg.themePackages;
@@ -85,7 +92,7 @@ let
   preStartQuitFixup = {
     serviceConfig.ExecStartPre = [
       ""
-      "${plymouth}/bin/plymouth quit --wait"
+      "${getExe' cfg.package "plymouth"} quit --wait"
     ];
   };
 
@@ -99,6 +106,19 @@ in
 
       enable = mkEnableOption "Plymouth boot splash screen";
 
+      package = mkOption {
+        description = "The plymouth package to use.";
+        type = types.package;
+        default = pkgs.plymouth.override {
+          systemd = config.boot.initrd.systemd.package;
+        };
+        defaultText = literalExpression ''
+          pkgs.plymouth.override {
+            systemd = config.boot.initrd.systemd.package;
+          }
+        '';
+      };
+
       font = mkOption {
         default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
         defaultText = literalExpression ''"''${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"'';
@@ -109,7 +129,7 @@ in
       };
 
       themePackages = mkOption {
-        default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
+        default = optional (cfg.theme == "breeze") nixosBreezePlymouth;
         defaultText = literalMD ''
           A NixOS branded variant of the breeze theme when
           `config.${opt.theme} == "breeze"`, otherwise
@@ -164,15 +184,15 @@ in
     boot.kernelParams = [ "splash" ];
 
     # To be discoverable by systemd.
-    environment.systemPackages = [ plymouth ];
+    environment.systemPackages = [ cfg.package ];
 
     environment.etc."plymouth/plymouthd.conf".source = configFile;
     environment.etc."plymouth/plymouthd.defaults".source =
-      "${plymouth}/share/plymouth/plymouthd.defaults";
+      "${cfg.package}/share/plymouth/plymouthd.defaults";
     environment.etc."plymouth/logo.png".source = cfg.logo;
     environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes";
     # XXX: Needed because we supply a different set of plugins in initrd.
-    environment.etc."plymouth/plugins".source = "${plymouth}/lib/plymouth";
+    environment.etc."plymouth/plugins".source = "${cfg.package}/lib/plymouth";
 
     systemd.tmpfiles.rules = [
       "d /run/plymouth 0755 root root 0 -"
@@ -181,7 +201,7 @@ in
       "L+ /run/plymouth/plugins - - - - /etc/plymouth/plugins"
     ];
 
-    systemd.packages = [ plymouth ];
+    systemd.packages = [ cfg.package ];
 
     systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ];
     systemd.services.plymouth-halt.wantedBy = [ "halt.target" ];
@@ -200,13 +220,13 @@ in
     systemd.services.emergency = preStartQuitFixup;
 
     boot.initrd.systemd = {
-      extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell
+      extraBin.plymouth = getExe' cfg.package "plymouth"; # for the recovery shell
       storePaths = [
-        "${lib.getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
-        "${plymouth}/bin/plymouthd"
-        "${plymouth}/sbin/plymouthd"
+        (getExe' config.boot.initrd.systemd.package "systemd-tty-ask-password-agent")
+        (getExe' cfg.package "plymouthd")
+        "${cfg.package}/sbin/plymouthd"
       ];
-      packages = [ plymouth ]; # systemd units
+      packages = [ cfg.package ]; # systemd units
 
       services.rescue = preStartQuitFixup;
       services.emergency = preStartQuitFixup;
@@ -215,7 +235,7 @@ in
         # Files
         "/etc/plymouth/plymouthd.conf".source = configFile;
         "/etc/plymouth/logo.png".source = cfg.logo;
-        "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
+        "/etc/plymouth/plymouthd.defaults".source = "${cfg.package}/share/plymouth/plymouthd.defaults";
         # Directories
         "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } (
           checkIfThemeExists
@@ -225,7 +245,7 @@ in
             mkdir -p $out/renderers
             # module might come from a theme
             cp ${themesEnv}/lib/plymouth/*.so $out
-            cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers
+            cp ${cfg.package}/lib/plymouth/renderers/*.so $out/renderers
             # useless in the initrd, and adds several megabytes to the closure
             rm $out/renderers/x11.so
           ''
@@ -306,10 +326,10 @@ in
       '')
     ];
 
-    boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
+    boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) (
       ''
-        copy_bin_and_libs ${plymouth}/bin/plymouth
-        copy_bin_and_libs ${plymouth}/bin/plymouthd
+        copy_bin_and_libs ${getExe' cfg.package "plymouth"}
+        copy_bin_and_libs ${getExe' cfg.package "plymouthd"}
 
       ''
       + checkIfThemeExists
@@ -320,12 +340,12 @@ in
         mkdir -p $out/lib/plymouth/renderers
         # module might come from a theme
         cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth
-        cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers
+        cp ${cfg.package}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers
         # useless in the initrd, and adds several megabytes to the closure
         rm $out/lib/plymouth/renderers/x11.so
 
         mkdir -p $out/share/plymouth/themes
-        cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
+        cp ${cfg.package}/share/plymouth/plymouthd.defaults $out/share/plymouth
 
         # Copy themes into working directory for patching
         mkdir themes
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 7fa7f2ada404..c87b3ecef4da 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -34,9 +34,6 @@ let
   # mounting `/`, like `/` on a loopback).
   fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
 
-  # Determine whether zfs-mount(8) is needed.
-  zfsRequiresMountHelper = any (fs: lib.elem "zfsutil" fs.options) fileSystems;
-
   # A utility for enumerating the shared-library dependencies of a program
   findLibs = pkgs.buildPackages.writeShellScriptBin "find-libs" ''
     set -euo pipefail
@@ -118,24 +115,9 @@ let
           copy_bin_and_libs $BIN
         done
 
-        ${optionalString zfsRequiresMountHelper ''
-          # Filesystems using the "zfsutil" option are mounted regardless of the
-          # mount.zfs(8) helper, but it is required to ensure that ZFS properties
-          # are used as mount options.
-          #
-          # BusyBox does not use the ZFS helper in the first place.
-          # util-linux searches /sbin/ as last path for helpers (stage-1-init.sh
-          # must symlink it to the store PATH).
-          # Without helper program, both `mount`s silently fails back to internal
-          # code, using default options and effectively ignore security relevant
-          # ZFS properties such as `setuid=off` and `exec=off` (unless manually
-          # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose).
-          copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount
-          copy_bin_and_libs ${config.boot.zfs.package}/bin/mount.zfs
-        ''}
-
         # Copy some util-linux stuff.
         copy_bin_and_libs ${pkgs.util-linux}/sbin/blkid
+        copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount
 
         # Copy dmsetup and lvm.
         copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
@@ -225,17 +207,7 @@ let
         # Make sure that the patchelf'ed binaries still work.
         echo "testing patched programs..."
         $out/bin/ash -c 'echo hello world' | grep "hello world"
-        ${
-          if zfsRequiresMountHelper then
-            ''
-              $out/bin/mount -V 1>&1 | grep -q "mount from util-linux"
-              $out/bin/mount.zfs -h 2>&1 | grep -q "Usage: mount.zfs"
-            ''
-          else
-            ''
-              $out/bin/mount --help 2>&1 | grep -q "BusyBox"
-            ''
-        }
+        $out/bin/mount -V 2>&1 | grep -q "mount from util-linux"
         $out/bin/blkid -V 2>&1 | grep -q 'libblkid'
         $out/bin/udevadm --version
         $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:"
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c7e81bb44335..3c827c3d6627 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -592,7 +592,7 @@ in
             '';
 
         enabledUpstreamSystemUnits = filter (n: !elem n cfg.suppressedSystemUnits) upstreamSystemUnits;
-        enabledUnits = filterAttrs (n: v: !elem n cfg.suppressedSystemUnits) cfg.units;
+        enabledUnits = removeAttrs cfg.units cfg.suppressedSystemUnits;
 
       in
       {
diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index f2b1b4fc7ede..04c814b7ec6e 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -568,9 +568,6 @@ in
         "${cfg.package.util-linux}/bin/umount"
         "${cfg.package.util-linux}/bin/sulogin"
 
-        # so NSS can look up usernames
-        "${pkgs.glibc}/lib/libnss_files.so.2"
-
         # Resolving sysroot symlinks without code exec
         "${config.system.nixos-init.package}/bin/chroot-realpath"
         # Find the etc paths
@@ -586,7 +583,8 @@ in
         "${pkgs.bashNonInteractive}/bin"
       ]
       ++ jobScripts
-      ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);
+      ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents)
+      ++ lib.optional (pkgs.stdenv.hostPlatform.libc == "glibc") "${pkgs.glibc}/lib/libnss_files.so.2";
 
       targets.initrd.aliases = [ "default.target" ];
       units =
diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index b6cf300d3bfb..b8c0a1a25d6d 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -8,7 +8,7 @@
 let
   cfg = config.services.journald.gateway;
 
-  cliArgs = lib.cli.toGNUCommandLineShell { } {
+  cliArgs = lib.cli.toCommandLineShellGNU { } {
     # If either of these are null / false, they are not passed in the command-line
     inherit (cfg)
       cert
@@ -75,7 +75,7 @@ in
     };
 
     system = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
       description = ''
         Serve entries from system services and the kernel.
@@ -85,7 +85,7 @@ in
     };
 
     user = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
       description = ''
         Serve entries from services for the current user.
@@ -108,18 +108,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        # This prevents the weird case were disabling "system" and "user"
-        # actually enables both because the cli flags are not present.
-        assertion = cfg.system || cfg.user;
-        message = ''
-          systemd-journal-gatewayd cannot serve neither "system" nor "user"
-          journals.
-        '';
-      }
-    ];
-
     systemd.additionalUpstreamSystemUnits = [
       "systemd-journal-gatewayd.socket"
       "systemd-journal-gatewayd.service"
diff --git a/nixos/modules/system/boot/systemd/journald-remote.nix b/nixos/modules/system/boot/systemd/journald-remote.nix
index 89baf421f591..7216c179b3a0 100644
--- a/nixos/modules/system/boot/systemd/journald-remote.nix
+++ b/nixos/modules/system/boot/systemd/journald-remote.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.journald.remote;
   format = pkgs.formats.systemd { };
 
-  cliArgs = lib.cli.toGNUCommandLineShell { } {
+  cliArgs = lib.cli.toCommandLineShellGNU { } {
     inherit (cfg) output;
     # "-3" specifies the file descriptor from the .socket unit.
     "listen-${cfg.listen}" = "-3";
diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix
index 4d2ca7f11f21..279da8f47c0b 100644
--- a/nixos/modules/system/boot/systemd/journald.nix
+++ b/nixos/modules/system/boot/systemd/journald.nix
@@ -79,8 +79,11 @@ in
     };
 
     services.journald.audit = lib.mkOption {
-      default = null;
-      type = lib.types.nullOr lib.types.bool;
+      default = "keep";
+      type = lib.types.oneOf [
+        lib.types.bool
+        (lib.types.enum [ "keep" ])
+      ];
       description = ''
         If enabled systemd-journald will turn on auditing on start-up.
         If disabled it will turn it off. If unset it will neither enable nor disable it, leaving the previous state unchanged.
diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix
index 82a87f00e97b..90c786ec5c22 100644
--- a/nixos/modules/system/boot/systemd/oomd.nix
+++ b/nixos/modules/system/boot/systemd/oomd.nix
@@ -50,10 +50,6 @@ in
       "systemd-oomd.socket"
     ];
 
-    systemd.services.systemd-oomd.after = [
-      "swap.target" # TODO: drop after systemd v258
-      "systemd-sysusers.service" # TODO: drop after systemd v257.8
-    ];
     systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ];
 
     environment.etc."systemd/oomd.conf".text = utils.systemdUtils.lib.settingsToSections cfg.settings;
diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix
index 48903742a919..d9a9631fba92 100644
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -71,7 +71,7 @@ in
     systemd.user.extraConfig = mkOption {
       default = "";
       type = types.lines;
-      example = "DefaultCPUAccounting=yes";
+      example = "DefaultTimeoutStartSec=60";
       description = ''
         Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for
         available options.
diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index f927ba1c9c90..c8286979ff41 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -41,10 +41,10 @@ in
         default = "never";
         example = "within_size";
         description = ''
-          never        - Do not allocate huge memory pages. This is the default.
-          always       - Attempt to allocate huge memory page every time a new page is needed.
-          within_size  - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
-          advise       - Only allocate huge memory pages if requested with madvise(2).
+          - `never`        - Do not allocate huge memory pages. This is the default.
+          - `always`       - Attempt to allocate huge memory page every time a new page is needed.
+          - `within_size`  - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
+          - `advise`       - Only allocate huge memory pages if requested with madvise(2).
         '';
       };
 
diff --git a/nixos/modules/tasks/filesystems/bcachefs.nix b/nixos/modules/tasks/filesystems/bcachefs.nix
index bbd9b40ad8e5..362f6ff32b10 100644
--- a/nixos/modules/tasks/filesystems/bcachefs.nix
+++ b/nixos/modules/tasks/filesystems/bcachefs.nix
@@ -242,14 +242,6 @@ in
           }
         ];
 
-        warnings = lib.mkIf cfg.modulePackage.meta.broken [
-          ''
-            Using unmaintained in-tree bcachefs kernel module. This
-            will be removed in 26.05. Please use a kernel supported
-            by the out-of-tree module package.
-          ''
-        ];
-
         # Bcachefs upstream recommends using the latest kernel
         boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
 
@@ -257,9 +249,7 @@ in
         system.fsPackages = [ cfg.package ];
         services.udev.packages = [ cfg.package ];
 
-        boot.extraModulePackages = lib.optionals (!cfg.modulePackage.meta.broken) [
-          cfg.modulePackage
-        ];
+        boot.extraModulePackages = [ cfg.modulePackage ];
 
         systemd = {
           packages = [ cfg.package ];
diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 3630b20f9ff3..d6a3fe29e0b4 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -60,10 +60,6 @@ let
     else
       pkgs.writeText "nfs.conf" nfsConfDeprecated;
 
-  requestKeyConfFile = pkgs.writeText "request-key.conf" ''
-    create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
-  '';
-
   cfg = config.services.nfs;
 
 in
@@ -162,7 +158,10 @@ in
         environment.etc = {
           "idmapd.conf".source = idmapdConfFile;
           "nfs.conf".source = nfsConfFile;
-          "request-key.conf".source = requestKeyConfFile;
+          "request-key.conf".text = ''
+            create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
+            create dns_resolver * * ${pkgs.keyutils}/bin/key.dns_resolver %k
+          '';
         };
 
         systemd.services.nfs-blkmap = {
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index e2a0bf3bd404..a65e0c00feba 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -717,6 +717,7 @@ in
         kernelModules = [ "zfs" ];
         extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
           copy_bin_and_libs ${cfgZfs.package}/sbin/zfs
+          copy_bin_and_libs ${cfgZfs.package}/sbin/mount.zfs
           copy_bin_and_libs ${cfgZfs.package}/sbin/zdb
           copy_bin_and_libs ${cfgZfs.package}/sbin/zpool
           copy_bin_and_libs ${cfgZfs.package}/lib/udev/vdev_id
@@ -725,6 +726,7 @@ in
         extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) ''
           $out/bin/zfs --help >/dev/null 2>&1
           $out/bin/zpool --help >/dev/null 2>&1
+          $out/bin/mount.zfs -h 2>&1 | grep -q "Usage: mount.zfs"
         '';
         postResumeCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
           lib.concatStringsSep "\n" (
@@ -796,6 +798,7 @@ in
           extraBin = {
             zpool = "${cfgZfs.package}/sbin/zpool";
             zfs = "${cfgZfs.package}/sbin/zfs";
+            "mount.zfs" = "${cfgZfs.package}/sbin/mount.zfs";
             awk = "${pkgs.gawk}/bin/awk";
           };
           storePaths = [
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 653fafb9b216..9e9a76cfbf1d 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -18,7 +18,7 @@ let
 
   interfaceRoutes = i: i.ipv4.routes ++ optionals cfg.enableIPv6 i.ipv6.routes;
 
-  dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no";
+  dhcpStr = useDHCP: boolToYesNo (useDHCP == true || useDHCP == null);
 
   slaves =
     concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
@@ -347,7 +347,7 @@ in
                         driverOpt:
                         assertTrace (elem driverOpt (knownOptions ++ unknownOptions))
                           "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd."
-                      ) (mapAttrsToList (k: _: k) do);
+                      ) (attrNames do);
                       "";
                     # get those driverOptions that have been set
                     filterSystemdOptions = filterAttrs (sysDOpt: kOpts: any (kOpt: do ? ${kOpt}) kOpts.optNames);
diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 4d4dc73bd5cb..76c538e080a2 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -1,53 +1,158 @@
-{ config, lib, ... }:
-
-with lib;
-
 {
-  ###### interface
-
+  config,
+  lib,
+  ...
+}:
+{
   options = {
-
     hardware.trackpoint = {
-
-      enable = mkOption {
+      enable = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = ''
           Enable sensitivity and speed configuration for trackpoints.
         '';
       };
 
-      sensitivity = mkOption {
+      sensitivity = lib.mkOption {
         default = 128;
         example = 255;
-        type = types.int;
+        type = lib.types.int;
         description = ''
-          Configure the trackpoint sensitivity. By default, the kernel
-          configures 128.
+          Trackpoint sensitivity.
         '';
       };
 
-      speed = mkOption {
+      inertia = lib.mkOption {
+        default = 6;
+        example = 10;
+        type = lib.types.int;
+        description = ''
+          Negative inertia factor. High values cause the cursor to snap backward when the trackpoint is released.
+        '';
+      };
+
+      reach = lib.mkOption {
+        default = 10;
+        example = 20;
+        type = lib.types.int;
+        description = ''
+          Backup range for z-axis press.
+        '';
+      };
+
+      draghys = lib.mkOption {
+        default = 255;
+        example = 200;
+        type = lib.types.int;
+        description = ''
+          The drag hysteresis controls how hard it is to drag with z-axis pressed.
+        '';
+      };
+
+      mindrag = lib.mkOption {
+        default = 20;
+        example = 30;
+        type = lib.types.int;
+        description = ''
+          Minimum amount of force needed to trigger dragging.
+        '';
+      };
+
+      speed = lib.mkOption {
         default = 97;
         example = 255;
-        type = types.int;
+        type = lib.types.int;
         description = ''
-          Configure the trackpoint speed. By default, the kernel
-          configures 97.
+          Speed of the trackpoint cursor.
         '';
       };
 
-      emulateWheel = mkOption {
+      thresh = lib.mkOption {
+        default = 8;
+        example = 10;
+        type = lib.types.int;
+        description = ''
+          Minimum value for z-axis force required to trigger a press or release, relative to the running average.
+        '';
+      };
+
+      upthresh = lib.mkOption {
+        default = 255;
+        example = 250;
+        type = lib.types.int;
+        description = ''
+          The offset from the running average required to generate a select (click) on z-axis on release.
+        '';
+      };
+
+      ztime = lib.mkOption {
+        default = 38;
+        example = 50;
+        type = lib.types.int;
+        description = ''
+          This attribute determines how sharp a press has to be in order to be recognized.
+        '';
+      };
+
+      jenks = lib.mkOption {
+        default = 135;
+        example = 100;
+        type = lib.types.int;
+        description = ''
+          Minimum curvature in degrees required to generate a double click without a release.
+        '';
+      };
+
+      skipback = lib.mkOption {
         default = false;
-        type = types.bool;
+        example = true;
+        type = lib.types.bool;
+        description = ''
+          When the skipback bit is set, backup cursor movement during releases from drags will be suppressed. The default value for this bit is 0.
+        '';
+      };
+
+      ext_dev = lib.mkOption {
+        default = true;
+        example = false;
+        type = lib.types.bool;
+        description = ''
+          Disable or enable external pointing device.
+        '';
+      };
+
+      press_to_select = lib.mkOption {
+        default = false;
+        example = true;
+        type = lib.types.bool;
+        description = ''
+          Setting this to true will enable the Press to Select functions like tapping the control stick to simulate a left click, and setting false will disable it.
+        '';
+      };
+
+      drift_time = lib.mkOption {
+        default = 5;
+        example = 100;
+        type = lib.types.int;
+        description = ''
+          This parameter controls the period of time to test for a 'hands off' condition (i.e. when no force is applied) before a drift (noise) calibration occurs.
+
+          IBM Trackpoints have a feature to compensate for drift by recalibrating themselves periodically. By default, if for 0.5 seconds there is no change in position, it's used as the new zero. This duration is too low. Often, the calibration happens when the trackpoint is in fact being used.
+        '';
+      };
+
+      emulateWheel = lib.mkOption {
+        default = false;
+        type = lib.types.bool;
         description = ''
           Enable scrolling while holding the middle mouse button.
         '';
       };
 
-      fakeButtons = mkOption {
+      fakeButtons = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = ''
           Switch to "bare" PS/2 mouse support in case Trackpoint buttons are not recognized
           properly. This can happen for example on models like the L430, T450, T450s, on
@@ -55,30 +160,45 @@ with lib;
         '';
       };
 
-      device = mkOption {
+      device = lib.mkOption {
         default = "TPPS/2 IBM TrackPoint";
-        type = types.str;
+        type = lib.types.str;
         description = ''
           The device name of the trackpoint. You can check with xinput.
           Some newer devices (example x1c6) use "TPPS/2 Elan TrackPoint".
         '';
       };
-
     };
-
   };
 
-  ###### implementation
-
   config =
     let
       cfg = config.hardware.trackpoint;
+      boolToStr = val: if val then "1" else "0";
     in
-    mkMerge [
-      (mkIf cfg.enable {
-        services.udev.extraRules = ''
-          ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="${cfg.device}", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}"
-        '';
+    lib.mkMerge [
+      (lib.mkIf cfg.enable {
+        services.udev.extraRules = (
+          builtins.concatStringsSep ", " [
+            "ACTION==\"add|change\""
+            "SUBSYSTEM==\"input\""
+            "ATTR{name}==\"${cfg.device}\""
+            "ATTR{device/sensitivity}=\"${toString cfg.sensitivity}\""
+            "ATTR{device/inertia}=\"${toString cfg.inertia}\""
+            "ATTR{device/reach}=\"${toString cfg.reach}\""
+            "ATTR{device/draghys}=\"${toString cfg.draghys}\""
+            "ATTR{device/mindrag}=\"${toString cfg.mindrag}\""
+            "ATTR{device/speed}=\"${toString cfg.speed}\""
+            "ATTR{device/thresh}=\"${toString cfg.thresh}\""
+            "ATTR{device/upthresh}=\"${toString cfg.upthresh}\""
+            "ATTR{device/ztime}=\"${toString cfg.ztime}\""
+            "ATTR{device/jenks}=\"${toString cfg.jenks}\""
+            "ATTR{device/skipback}=\"${boolToStr cfg.skipback}\""
+            "ATTR{device/ext_dev}=\"${boolToStr cfg.ext_dev}\""
+            "ATTR{device/press_to_select}=\"${boolToStr cfg.press_to_select}\""
+            "ATTR{device/drift_time}=\"${toString cfg.drift_time}\""
+          ]
+        );
 
         systemd.services.trackpoint = {
           wantedBy = [ "sysinit.target" ];
@@ -96,7 +216,7 @@ with lib;
         };
       })
 
-      (mkIf (cfg.emulateWheel) {
+      (lib.mkIf (cfg.emulateWheel) {
         services.xserver.inputClassSections = [
           ''
             Identifier "Trackpoint Wheel Emulation"
@@ -116,7 +236,7 @@ with lib;
         ];
       })
 
-      (mkIf cfg.fakeButtons {
+      (lib.mkIf cfg.fakeButtons {
         boot.extraModprobeConfig = "options psmouse proto=bare";
       })
     ];
diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix
index 9e061f851126..c43db34dbf99 100644
--- a/nixos/modules/virtualisation/containerd.nix
+++ b/nixos/modules/virtualisation/containerd.nix
@@ -90,7 +90,7 @@ in
         ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package;
       serviceConfig = {
         ExecStart = ''${pkgs.containerd}/bin/containerd ${
-          lib.concatStringsSep " " (lib.cli.toGNUCommandLine { } cfg.args)
+          lib.concatStringsSep " " (lib.cli.toCommandLineGNU { } cfg.args)
         }'';
         Delegate = "yes";
         KillMode = "process";
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 973bccc83891..ddaccf8199a1 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -166,7 +166,7 @@ in
       serviceConfig = {
         Type = "notify";
         ExecStart = "${cfg.package}/bin/crio";
-        ExecReload = "/bin/kill -s HUP $MAINPID";
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID";
         TasksMax = "infinity";
         LimitNOFILE = "1048576";
         LimitNPROC = "1048576";
diff --git a/nixos/modules/virtualisation/incus-virtual-machine.nix b/nixos/modules/virtualisation/incus-virtual-machine.nix
index d51e251aaba9..8899fc34bb85 100644
--- a/nixos/modules/virtualisation/incus-virtual-machine.nix
+++ b/nixos/modules/virtualisation/incus-virtual-machine.nix
@@ -25,7 +25,7 @@ in
 
       partitionTableType = "efi";
       format = "qcow2-compressed";
-      copyChannel = true;
+      copyChannel = config.system.installer.channel.enable;
     };
 
     fileSystems = {
diff --git a/nixos/modules/virtualisation/lxc-instance-common.nix b/nixos/modules/virtualisation/lxc-instance-common.nix
index 6449952f2a75..d589ad8028dc 100644
--- a/nixos/modules/virtualisation/lxc-instance-common.nix
+++ b/nixos/modules/virtualisation/lxc-instance-common.nix
@@ -27,7 +27,7 @@
   services.openssh.startWhenNeeded = lib.mkDefault true;
 
   # As this is intended as a standalone image, undo some of the minimal profile stuff
-  documentation.enable = true;
-  documentation.nixos.enable = true;
+  documentation.enable = lib.mkDefault true;
+  documentation.nixos.enable = lib.mkDefault true;
   services.logrotate.enable = true;
 }
diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index b6ab82b1acb5..8145c099eead 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -10,11 +10,13 @@ let
   json = pkgs.formats.json { };
 
   inherit (lib) mkOption types;
+  inherit (pkgs) stdenv;
 
   # Provides a fake "docker" binary mapping to podman
   dockerCompat =
     pkgs.runCommand "${cfg.package.pname}-docker-compat-${cfg.package.version}"
       {
+        nativeBuildInputs = [ pkgs.installShellFiles ];
         outputs = [
           "out"
           "man"
@@ -31,7 +33,14 @@ let
           basename=$(basename $f | sed s/podman/docker/g)
           ln -s $f $man/share/man/man1/$basename
         done
-      '';
+      ''
+    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      export HOME=$(mktemp -d) # work around `docker <cmd>`
+      installShellCompletion --cmd docker \
+        --bash <($out/bin/docker completion bash) \
+        --zsh <($out/bin/docker completion zsh) \
+        --fish <($out/bin/docker completion fish)
+    '';
 
 in
 {
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6893d39382ea..ca28ecc81968 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -136,14 +136,20 @@ let
             ''
               # Create a writable qcow2 image using the systemImage as a backing
               # image.
+              BACKING_SIZE_MB=$(( $(${lib.getExe' qemu "qemu-img"} info ${systemImage}/nixos.qcow2 --output=json | ${lib.getExe hostPkgs.jq} -r '."virtual-size"') / 1024 / 1024 ))
+              DISK_SIZE_MB=${toString cfg.diskSize}
+              if (( DISK_SIZE_MB < BACKING_SIZE_MB )); then
+                OVERLAY_SIZE_MB=$BACKING_SIZE_MB
+              else
+                OVERLAY_SIZE_MB=$DISK_SIZE_MB
+              fi
 
-              # CoW prevent size to be attributed to an image.
-              # FIXME: raise this issue to upstream.
               ${qemu}/bin/qemu-img create \
                 -f qcow2 \
                 -b ${systemImage}/nixos.qcow2 \
                 -F qcow2 \
-                "$NIX_DISK_IMAGE"
+                "$NIX_DISK_IMAGE" \
+                 ''${OVERLAY_SIZE_MB}M
             ''
           else if cfg.useDefaultFilesystems then
             ''
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 04d36c9ce82f..25de9ac0ce86 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -252,8 +252,8 @@ in
           --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
         VBoxManage modifyvm "$vmName" \
           --memory ${toString cfg.memorySize} \
-          ${lib.cli.toGNUCommandLineShell { } cfg.params}
-        VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
+          ${lib.cli.toCommandLineShellGNU { } cfg.params}
+        VBoxManage storagectl "$vmName" ${lib.cli.toCommandLineShellGNU { } cfg.storageController}
         VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
           --medium disk.vdi
         ${lib.optionalString (cfg.extraDisk != null) ''
diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix
index 407aa261b764..83113c1902df 100644
--- a/nixos/modules/virtualisation/waagent.nix
+++ b/nixos/modules/virtualisation/waagent.nix
@@ -370,7 +370,6 @@ in
         Type = "simple";
         Restart = "always";
         Slice = "azure.slice";
-        CPUAccounting = true;
         MemoryAccounting = true;
       };
     };
diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix
index a26bddc393ae..706ee115ba8c 100644
--- a/nixos/modules/virtualisation/waydroid.nix
+++ b/nixos/modules/virtualisation/waydroid.nix
@@ -25,7 +25,10 @@ in
 
   options.virtualisation.waydroid = {
     enable = lib.mkEnableOption "Waydroid";
-    package = lib.mkPackageOption pkgs "waydroid" { };
+    package = lib.mkPackageOption pkgs "waydroid" { } // {
+      default = if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid;
+      defaultText = lib.literalExpression ''if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid'';
+    };
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/nixos/tests/acme/http01-builtin.nix b/nixos/tests/acme/http01-builtin.nix
index d92737ed6fb1..a82ef6f5652a 100644
--- a/nixos/tests/acme/http01-builtin.nix
+++ b/nixos/tests/acme/http01-builtin.nix
@@ -126,7 +126,7 @@ in
                 DNS.1 = ${config.networking.fqdn}
               '';
               csrData =
-                pkgs.runCommandNoCC "csr-and-key"
+                pkgs.runCommand "csr-and-key"
                   {
                     buildInputs = [ pkgs.openssl ];
                   }
diff --git a/nixos/tests/aesmd.nix b/nixos/tests/aesmd.nix
index b7939508b0e3..f541cba289bf 100644
--- a/nixos/tests/aesmd.nix
+++ b/nixos/tests/aesmd.nix
@@ -3,7 +3,6 @@
   name = "aesmd";
   meta = {
     maintainers = with lib.maintainers; [
-      trundle
       veehaitch
     ];
   };
diff --git a/nixos/tests/agda.nix b/nixos/tests/agda/base.nix
similarity index 82%
rename from nixos/tests/agda.nix
rename to nixos/tests/agda/base.nix
index dfc733f4f576..9fafd2f46000 100644
--- a/nixos/tests/agda.nix
+++ b/nixos/tests/agda/base.nix
@@ -1,13 +1,7 @@
 { pkgs, ... }:
 
 let
-  hello-world = pkgs.writeText "hello-world" ''
-    {-# OPTIONS --guardedness #-}
-    open import IO
-    open import Level
-
-    main = run {0ℓ} (putStrLn "Hello World!")
-  '';
+  hello-world = ./files/HelloWorld.agda;
 in
 {
   name = "agda";
@@ -30,6 +24,9 @@ in
     };
 
   testScript = ''
+    # agda and agda-mode are in path
+    machine.succeed("agda --version")
+
     # Minimal script that typechecks
     machine.succeed("touch TestEmpty.agda")
     machine.succeed("agda TestEmpty.agda")
diff --git a/nixos/tests/agda/default.nix b/nixos/tests/agda/default.nix
new file mode 100644
index 000000000000..ad0527beac30
--- /dev/null
+++ b/nixos/tests/agda/default.nix
@@ -0,0 +1,5 @@
+{ runTest }:
+{
+  base = runTest ./base.nix;
+  override-with-backend = runTest ./override-with-backend.nix;
+}
diff --git a/nixos/tests/agda/files/HelloWorld.agda b/nixos/tests/agda/files/HelloWorld.agda
new file mode 100644
index 000000000000..5cef59109c4b
--- /dev/null
+++ b/nixos/tests/agda/files/HelloWorld.agda
@@ -0,0 +1,5 @@
+{-# OPTIONS --guardedness #-}
+open import IO
+open import Level
+
+main = run {0ℓ} (putStrLn "Hello World!")
diff --git a/nixos/tests/agda/files/TrivialBackend.hs b/nixos/tests/agda/files/TrivialBackend.hs
new file mode 100644
index 000000000000..0a37115eb80f
--- /dev/null
+++ b/nixos/tests/agda/files/TrivialBackend.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Agda.Main ( runAgda )
+
+main :: IO ()
+main = runAgda []
diff --git a/nixos/tests/agda/override-with-backend.nix b/nixos/tests/agda/override-with-backend.nix
new file mode 100644
index 000000000000..bb64a473ee5d
--- /dev/null
+++ b/nixos/tests/agda/override-with-backend.nix
@@ -0,0 +1,65 @@
+{ pkgs, ... }:
+let
+  mainProgram = "agda-trivial-backend";
+
+  hello-world = ./files/HelloWorld.agda;
+
+  agda-trivial-backend = pkgs.stdenvNoCC.mkDerivation {
+    name = "trivial-backend";
+    meta = { inherit mainProgram; };
+    version = "${pkgs.haskellPackages.Agda.version}";
+    src = ./files/TrivialBackend.hs;
+    buildInputs = [
+      (pkgs.haskellPackages.ghcWithPackages (pkgs: [ pkgs.Agda ]))
+    ];
+    dontUnpack = true;
+    buildPhase = ''
+      ghc $src -o ${mainProgram}
+    '';
+    installPhase = ''
+      mkdir -p $out/bin
+      cp ${mainProgram} $out/bin
+    '';
+  };
+in
+{
+  name = "agda-trivial-backend";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      carlostome
+    ];
+  };
+
+  nodes.machine =
+    { pkgs, ... }:
+    let
+      agdaPackages = pkgs.agdaPackages.override (oldAttrs: {
+        Agda = agda-trivial-backend;
+      });
+    in
+    {
+      environment.systemPackages = [
+        (agdaPackages.agda.withPackages {
+          pkgs = p: [ p.standard-library ];
+        })
+      ];
+      virtualisation.memorySize = 2000; # Agda uses a lot of memory
+    };
+
+  testScript = ''
+    # agda and agda-mode are not in path
+    machine.fail("agda --version")
+    machine.fail("agda-mode")
+    # backend is present
+    text = machine.succeed("${mainProgram} --help")
+    assert "${mainProgram}" in text
+    # Hello world
+    machine.succeed(
+        "cp ${hello-world} HelloWorld.agda"
+    )
+    machine.succeed("${mainProgram} -l standard-library -i . -c HelloWorld.agda")
+    # Check execution
+    text = machine.succeed("./HelloWorld")
+    assert "Hello World!" in text, f"HelloWorld does not run properly: output was {text}"
+  '';
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 86b223ad06f2..5ba61a707cd0 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -14,10 +14,15 @@
 # where said tests are unsupported.
 # Example callTest that just extracts the derivation from the test:
 #   callTest = t: t.test;
-
-with pkgs.lib;
-
 let
+  inherit (pkgs.lib)
+    isAttrs
+    isFunction
+    mapAttrs
+    elem
+    recurseIntoAttrs
+    ;
+
   # TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected)
   # TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix
   discoverTests =
@@ -203,7 +208,9 @@ in
   adguardhome = runTest ./adguardhome.nix;
   aesmd = runTestOn [ "x86_64-linux" ] ./aesmd.nix;
   agate = runTest ./web-servers/agate.nix;
-  agda = runTest ./agda.nix;
+  agda = import ./agda {
+    inherit runTest;
+  };
   age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix;
   agnos = discoverTests (import ./agnos.nix);
   agorakit = runTest ./web-apps/agorakit.nix;
@@ -266,6 +273,7 @@ in
   beanstalkd = runTest ./beanstalkd.nix;
   bees = runTest ./bees.nix;
   benchexec = runTest ./benchexec.nix;
+  beszel = runTest ./beszel.nix;
   binary-cache = runTest {
     imports = [ ./binary-cache.nix ];
     _module.args.compression = "zstd";
@@ -449,6 +457,7 @@ in
   devpi-server = runTest ./devpi-server.nix;
   dex-oidc = runTest ./dex-oidc.nix;
   dhparams = runTest ./dhparams.nix;
+  dictd = runTest ./dictd.nix;
   disable-installer-tools = runTest ./disable-installer-tools.nix;
   discourse = runTest {
     imports = [ ./discourse.nix ];
@@ -515,8 +524,7 @@ in
   ergochat = runTest ./ergochat.nix;
   esphome = runTest ./esphome.nix;
   etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
-  etcd = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix;
-  etcd-cluster = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix;
+  etcd = import ./etcd/default.nix { inherit pkgs runTest; };
   etebase-server = runTest ./etebase-server.nix;
   etesync-dav = runTest ./etesync-dav.nix;
   evcc = runTest ./evcc.nix;
@@ -532,7 +540,6 @@ in
   ferretdb = import ./ferretdb.nix { inherit pkgs runTest; };
   fider = runTest ./fider.nix;
   filebrowser = runTest ./filebrowser.nix;
-  filesender = runTest ./filesender.nix;
   filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;
   firefly-iii = runTest ./firefly-iii.nix;
   firefly-iii-data-importer = runTest ./firefly-iii-data-importer.nix;
@@ -639,6 +646,7 @@ in
   gns3-server = runTest ./gns3-server.nix;
   gnupg = runTest ./gnupg.nix;
   go-camo = runTest ./go-camo.nix;
+  go-csp-collector = runTest ./go-csp-collector.nix;
   go-httpbin = runTest ./go-httpbin.nix;
   go-neb = runTest ./go-neb.nix;
   goatcounter = runTest ./goatcounter.nix;
@@ -665,7 +673,10 @@ in
   guacamole-server = runTest ./guacamole-server.nix;
   guix = handleTest ./guix { };
   gvisor = runTest ./gvisor.nix;
-  h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; };
+  h2o = import ./web-servers/h2o {
+    inherit runTest;
+    inherit (pkgs) lib;
+  };
   hadoop = import ./hadoop {
     inherit handleTestOn;
     package = pkgs.hadoop;
@@ -718,6 +729,7 @@ in
   homepage-dashboard = runTest ./homepage-dashboard.nix;
   homer = handleTest ./homer { };
   honk = runTest ./honk.nix;
+  hoogle = runTest ./hoogle.nix;
   hostname = handleTest ./hostname.nix { };
   hound = runTest ./hound.nix;
   hub = runTest ./git/hub.nix;
@@ -732,14 +744,16 @@ in
   immich = runTest ./web-apps/immich.nix;
   immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix;
   immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
+  immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix;
   incron = runTest ./incron.nix;
-  incus = pkgs.recurseIntoAttrs (
-    handleTest ./incus {
-      lts = false;
-      inherit system pkgs;
-    }
-  );
-  incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
+  incus = import ./incus {
+    inherit runTestOn;
+    package = pkgs.incus;
+  };
+  incus-lts = import ./incus {
+    inherit runTestOn;
+    package = pkgs.incus-lts;
+  };
   influxdb = runTest ./influxdb.nix;
   influxdb2 = runTest ./influxdb2.nix;
   initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix;
@@ -750,7 +764,7 @@ in
   initrdNetwork = runTest ./initrd-network.nix;
   input-remapper = runTest ./input-remapper.nix;
   inspircd = runTest ./inspircd.nix;
-  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
+  installed-tests = recurseIntoAttrs (handleTest ./installed-tests { });
   installer = handleTest ./installer.nix { };
   installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
   intune = runTest ./intune.nix;
@@ -787,7 +801,7 @@ in
   keepalived = runTest ./keepalived.nix;
   keepassxc = runTest ./keepassxc.nix;
   kerberos = handleTest ./kerberos/default.nix { };
-  kernel-generic = handleTest ./kernel-generic.nix { };
+  kernel-generic = handleTest ./kernel-generic { };
   kernel-latest-ath-user-regd = runTest ./kernel-latest-ath-user-regd.nix;
   kernel-rust = handleTest ./kernel-rust.nix { };
   keter = runTest ./keter.nix;
@@ -804,7 +818,7 @@ in
   ksm = runTest ./ksm.nix;
   kthxbye = runTest ./kthxbye.nix;
   kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
-  kubo = import ./kubo { inherit recurseIntoAttrs runTest; };
+  kubo = import ./kubo { inherit runTest; };
   lact = runTest ./lact.nix;
   ladybird = runTest ./ladybird.nix;
   languagetool = runTest ./languagetool.nix;
@@ -854,6 +868,7 @@ in
   localsend = runTest ./localsend.nix;
   locate = runTest ./locate.nix;
   login = runTest ./login.nix;
+  logkeys = runTest ./logkeys.nix;
   logrotate = runTest ./logrotate.nix;
   loki = runTest ./loki.nix;
   #logstash = handleTest ./logstash.nix {};
@@ -886,7 +901,7 @@ in
   man = runTest ./man.nix;
   mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
   marytts = runTest ./marytts.nix;
-  mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
+  mastodon = recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
   mate = runTest ./mate.nix;
   mate-wayland = runTest ./mate-wayland.nix;
   matomo = runTest ./matomo.nix;
@@ -948,12 +963,13 @@ in
   mopidy = runTest ./mopidy.nix;
   morph-browser = runTest ./morph-browser.nix;
   mosquitto = runTest ./mosquitto.nix;
-  movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
+  movim = import ./web-apps/movim { inherit runTest; };
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = runTest ./mtp.nix;
   multipass = runTest ./multipass.nix;
   mumble = runTest ./mumble.nix;
+  munge = runTest ./munge.nix;
   munin = runTest ./munin.nix;
   # Fails on aarch64-linux at the PDF creation step - need to debug this on an
   # aarch64 machine..
@@ -995,6 +1011,7 @@ in
   netbox-upgrade = runTest ./web-apps/netbox-upgrade.nix;
   netbox_4_2 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_2; };
   netbox_4_3 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_3; };
+  netbox_4_4 = handleTest ./web-apps/netbox/default.nix { netbox = pkgs.netbox_4_4; };
   netdata = runTest ./netdata.nix;
   networking.networkd = handleTest ./networking/networkd-and-scripted.nix { networkd = true; };
   networking.networkmanager = handleTest ./networking/networkmanager.nix { };
@@ -1068,7 +1085,6 @@ in
     _module.args.withNg = true;
   };
   nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
-  nixseparatedebuginfod = runTest ./nixseparatedebuginfod.nix;
   nixseparatedebuginfod2 = runTest ./nixseparatedebuginfod2.nix;
   node-red = runTest ./node-red.nix;
   nomad = runTest ./nomad.nix;
@@ -1149,6 +1165,7 @@ in
   oxidized = handleTest ./oxidized.nix { };
   pacemaker = runTest ./pacemaker.nix;
   packagekit = runTest ./packagekit.nix;
+  pairdrop = runTest ./web-apps/pairdrop.nix;
   paisa = runTest ./paisa.nix;
   pam-file-contents = runTest ./pam/pam-file-contents.nix;
   pam-lastlog = runTest ./pam/pam-lastlog.nix;
@@ -1282,7 +1299,6 @@ in
   quake3 = runTest ./quake3.nix;
   quicktun = runTest ./quicktun.nix;
   quickwit = runTest ./quickwit.nix;
-  quorum = runTest ./quorum.nix;
   rabbitmq = runTest ./rabbitmq.nix;
   radarr = runTest ./radarr.nix;
   radicale = runTest ./radicale.nix;
@@ -1320,6 +1336,7 @@ in
   rss-bridge = handleTest ./web-apps/rss-bridge { };
   rss2email = handleTest ./rss2email.nix { };
   rstudio-server = runTest ./rstudio-server.nix;
+  rsync = runTest ./rsync.nix;
   rsyncd = runTest ./rsyncd.nix;
   rsyslogd = handleTest ./rsyslogd.nix { };
   rtkit = runTest ./rtkit.nix;
@@ -1358,6 +1375,7 @@ in
   silverbullet = runTest ./silverbullet.nix;
   simple = runTest ./simple.nix;
   sing-box = runTest ./sing-box.nix;
+  sks = runTest ./sks.nix;
   slimserver = runTest ./slimserver.nix;
   slipshow = runTest ./slipshow.nix;
   slurm = runTest ./slurm.nix;
@@ -1383,8 +1401,8 @@ in
   ssh-audit = runTest ./ssh-audit.nix;
   sshwifty = runTest ./web-apps/sshwifty/default.nix;
   sslh = handleTest ./sslh.nix { };
-  sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix { };
   sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { };
+  sssd-legacy-config = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-legacy-config.nix { };
   stalwart-mail = runTest ./stalwart/stalwart-mail.nix;
   stargazer = runTest ./web-servers/stargazer.nix;
   starship = runTest ./starship.nix;
@@ -1402,8 +1420,9 @@ in
   suricata = runTest ./suricata.nix;
   suwayomi-server = import ./suwayomi-server.nix {
     inherit runTest;
-    lib = pkgs.lib;
+    inherit (pkgs) lib;
   };
+  svnserve = runTest ./svnserve.nix;
   swap-file-btrfs = runTest ./swap-file-btrfs.nix;
   swap-partition = runTest ./swap-partition.nix;
   swap-random-encryption = runTest ./swap-random-encryption.nix;
@@ -1535,8 +1554,7 @@ in
   traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
   trafficserver = runTest ./trafficserver.nix;
   transfer-sh = runTest ./transfer-sh.nix;
-  transmission_3 = handleTest ./transmission.nix { transmission = pkgs.transmission_3; };
-  transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; };
+  transmission_4 = handleTest ./transmission.nix { };
   trezord = runTest ./trezord.nix;
   trickster = runTest ./trickster.nix;
   trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix;
@@ -1607,6 +1625,7 @@ in
   vsftpd = runTest ./vsftpd.nix;
   waagent = runTest ./waagent.nix;
   wakapi = runTest ./wakapi.nix;
+  warpgate = runTest ./warpgate.nix;
   warzone2100 = runTest ./warzone2100.nix;
   wasabibackend = runTest ./wasabibackend.nix;
   wastebin = runTest ./wastebin.nix;
diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index 761c31d6b8c6..b2b3b2f8fa82 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -1,4 +1,36 @@
 { lib, ... }:
+let
+  legacyBotPolicyJSON = ''
+    {
+      "bots": [
+        {
+          "import": "(data)/bots/_deny-pathological.yaml"
+        },
+        {
+          "import": "(data)/meta/ai-block-aggressive.yaml"
+        },
+        {
+          "import": "(data)/crawlers/_allow-good.yaml"
+        },
+        {
+          "import": "(data)/bots/aggressive-brazilian-scrapers.yaml"
+        },
+        {
+          "import": "(data)/common/keep-internet-working.yaml"
+        },
+        {
+          "name": "generic-browser",
+          "user_agent_regex": "Mozilla|Opera",
+          "action": "CHALLENGE"
+        }
+      ],
+      "dnsbl": false,
+      "status_codes": {
+        "CHALLENGE": 200,
+        "DENY": 200
+      }
+    }'';
+in
 {
   name = "anubis";
   meta.maintainers = with lib.maintainers; [
@@ -7,57 +39,75 @@
     ryand56
   ];
 
-  nodes.machine =
+  nodes.machineLegacy =
     { config, pkgs, ... }:
     {
       services.anubis = {
         defaultOptions = {
-          # Get default botPolicy
-          botPolicy = lib.importJSON "${config.services.anubis.package.src}/data/botPolicies.json";
+          botPolicy = builtins.fromJSON legacyBotPolicyJSON;
           settings = {
             DIFFICULTY = 3;
             USER_DEFINED_DEFAULT = true;
           };
         };
-        instances = {
-          "".settings = {
+
+        instances."".settings = {
+          TARGET = "http://localhost:8080";
+          DIFFICULTY = 5;
+          USER_DEFINED_INSTANCE = true;
+        };
+
+        instances."tcp" = {
+          user = "anubis-tcp";
+          group = "anubis-tcp";
+          settings = {
             TARGET = "http://localhost:8080";
-            DIFFICULTY = 5;
-            USER_DEFINED_INSTANCE = true;
-          };
-
-          "tcp" = {
-            user = "anubis-tcp";
-            group = "anubis-tcp";
-            settings = {
-              TARGET = "http://localhost:8080";
-              BIND = ":9000";
-              BIND_NETWORK = "tcp";
-              METRICS_BIND = ":9001";
-              METRICS_BIND_NETWORK = "tcp";
-            };
-          };
-
-          "unix-upstream" = {
-            group = "nginx";
-            settings.TARGET = "unix:///run/nginx/nginx.sock";
-          };
-
-          "botPolicy-default" = {
-            botPolicy = null;
-            settings.TARGET = "http://localhost:8080";
-          };
-
-          "botPolicy-file" = {
-            settings = {
-              TARGET = "http://localhost:8080";
-              POLICY_FNAME = "/etc/anubis-botPolicy.json";
-            };
+            BIND = "127.0.0.1:9000";
+            BIND_NETWORK = "tcp";
+            METRICS_BIND = "127.0.0.1:9001";
+            METRICS_BIND_NETWORK = "tcp";
           };
         };
       };
 
-      # Empty json for testing
+      users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
+      services.nginx = {
+        enable = true;
+        recommendedProxySettings = true;
+        virtualHosts."basic.localhost".locations = {
+          "/".proxyPass = "http://unix:${config.services.anubis.instances."".settings.BIND}";
+          "/metrics".proxyPass = "http://unix:${config.services.anubis.instances."".settings.METRICS_BIND}";
+        };
+
+        virtualHosts."tcp.localhost".locations = {
+          "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}";
+          "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}";
+        };
+
+        # emulate an upstream with nginx, listening on tcp and unix sockets.
+        virtualHosts."upstream.localhost" = {
+          default = true; # make nginx match this vhost for `localhost`
+          listen = [
+            { addr = "unix:/run/nginx/nginx.sock"; }
+            {
+              addr = "localhost";
+              port = 8080;
+            }
+          ];
+          locations."/" = {
+            tryFiles = "$uri $uri/index.html =404";
+            root = pkgs.runCommand "anubis-test-upstream" { } ''
+              mkdir $out
+              echo "it works" >> $out/index.html
+            '';
+          };
+        };
+      };
+    };
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
       environment.etc."anubis-botPolicy.json".text = lib.generators.toJSON { } {
         bots = [
           {
@@ -68,8 +118,73 @@
         ];
       };
 
+      services.anubis = {
+        defaultOptions = {
+          botPolicy = builtins.fromJSON legacyBotPolicyJSON;
+          settings = {
+            DIFFICULTY = 3;
+            USER_DEFINED_DEFAULT = true;
+          };
+        };
+
+        instances."".settings = {
+          TARGET = "http://localhost:8080";
+          DIFFICULTY = 5;
+          USER_DEFINED_INSTANCE = true;
+          BIND = "/run/anubis/anubis/anubis.sock";
+          METRICS_BIND = "/run/anubis/anubis/anubis-metrics.sock";
+        };
+
+        instances."tcp" = {
+          user = "anubis-tcp";
+          group = "anubis-tcp";
+          settings = {
+            TARGET = "http://localhost:8080";
+            BIND = "127.0.0.1:9000";
+            BIND_NETWORK = "tcp";
+            METRICS_BIND = "127.0.0.1:9001";
+            METRICS_BIND_NETWORK = "tcp";
+          };
+        };
+
+        instances."another-unix-listen" = {
+          settings = {
+            TARGET = "http://localhost:8080";
+            BIND = "/run/anubis/anubis-another-unix-listen/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-another-unix-listen/anubis-metrics.sock";
+          };
+        };
+
+        instances."unix-upstream" = {
+          group = "nginx";
+          settings = {
+            BIND = "/run/anubis/anubis-unix-upstream/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-unix-upstream/anubis-metrics.sock";
+            TARGET = "unix:///run/nginx/nginx.sock";
+          };
+        };
+
+        instances."botPolicy-default" = {
+          botPolicy = null;
+          settings = {
+            TARGET = "http://localhost:8080";
+            BIND = "/run/anubis/anubis-botPolicy-default/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-botPolicy-default/anubis-metrics.sock";
+          };
+        };
+
+        instances."botPolicy-file" = {
+          settings = {
+            TARGET = "http://localhost:8080";
+            POLICY_FNAME = "/etc/anubis-botPolicy.json";
+            BIND = "/run/anubis/anubis-botPolicy-file/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-botPolicy-file/anubis-metrics.sock";
+          };
+        };
+      };
+
       # support
-      users.users.nginx.extraGroups = [ config.services.anubis.defaultOptions.group ];
+      users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
       services.nginx = {
         enable = true;
         recommendedProxySettings = true;
@@ -79,12 +194,21 @@
         };
 
         virtualHosts."tcp.localhost".locations = {
-          "/".proxyPass = "http://localhost:9000";
-          "/metrics".proxyPass = "http://localhost:9001";
+          "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}";
+          "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}";
+        };
+
+        virtualHosts."another-unix-listen".locations = {
+          "/".proxyPass = "http://unix:${
+            config.services.anubis.instances."another-unix-listen".settings.BIND
+          }";
+          "/metrics".proxyPass = "http://unix:${
+            config.services.anubis.instances."another-unix-listen".settings.METRICS_BIND
+          }";
         };
 
         virtualHosts."unix.localhost".locations = {
-          "/".proxyPass = "http://unix:${config.services.anubis.instances.unix-upstream.settings.BIND}";
+          "/".proxyPass = "http://unix:${config.services.anubis.instances."unix-upstream".settings.BIND}";
         };
 
         # emulate an upstream with nginx, listening on tcp and unix sockets.
@@ -109,43 +233,61 @@
     };
 
   testScript = ''
-    for unit in ["nginx", "anubis", "anubis-tcp", "anubis-unix-upstream"]:
-      machine.wait_for_unit(unit + ".service")
+    with subtest("Legacy anubis service configuration: supports only a single RuntimeDirectory"):
+      for unit in ["nginx", "anubis", "anubis-tcp"]:
+        machineLegacy.wait_for_unit(unit + ".service")
 
-    for port in [9000, 9001]:
-      machine.wait_for_open_port(port)
+      machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis.sock")
+      machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis-metrics.sock")
 
-    for instance in ["anubis", "anubis-unix-upstream"]:
-      machine.wait_for_open_unix_socket(f"/run/anubis/{instance}.sock")
-      machine.wait_for_open_unix_socket(f"/run/anubis/{instance}-metrics.sock")
+      # Default unix socket mode with 1 instance listening on unix sockets.
+      machineLegacy.succeed('curl -f http://localhost:8080 | grep "it works"')
+      machineLegacy.succeed('curl -f http://basic.localhost | grep "it works"')
+      machineLegacy.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machineLegacy.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
 
-    # Default unix socket mode
-    machine.succeed('curl -f http://basic.localhost | grep "it works"')
-    machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
-    machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
+      # TCP mode.
+      machineLegacy.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machineLegacy.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued')
 
-    # TCP mode
-    machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')
-    machine.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued')
+    with subtest("Dedicated RuntimeDirectory"):
+      for unit in ["nginx", "anubis", "anubis-another-unix-listen", "anubis-tcp", "anubis-unix-upstream"]:
+        machine.wait_for_unit(unit + ".service")
 
-    # Upstream is a unix socket mode
-    machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"')
+      for port in [9000, 9001]:
+        machine.wait_for_open_port(port)
 
-    # Default user-defined environment variables
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"')
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"')
+      machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis.sock")
+      machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis-metrics.sock")
+      for instance in ["another-unix-listen", "unix-upstream"]:
+        machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis.sock")
+        machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis-metrics.sock")
 
-    # Instance-specific user-specified environment variables
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"')
-    machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"')
+      machine.succeed('curl -f http://basic.localhost | grep "it works"')
+      machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
 
-    # Make sure defaults don't overwrite themselves
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"')
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"')
+      machine.succeed('curl -f http://another-unix-listen.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machine.succeed('curl -f http://another-unix-listen.localhost/metrics | grep anubis_challenges_issued')
 
-    # Check correct BotPolicy settings are applied
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"')
-    machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="')
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"')
+      # Upstream is a unix socket mode.
+      machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"')
+
+      # Default user-defined environment variables.
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"')
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"')
+
+      # Instance-specific user-specified environment variables.
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"')
+      machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"')
+
+      # Make sure defaults don't overwrite themselves.
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"')
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"')
+
+      # Check correct BotPolicy settings are applied
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"')
+      machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="')
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"')
   '';
 }
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 77cb1d5332cb..9568c4fffb55 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -24,6 +24,7 @@
             publish.userServices = true;
             publish.workstation = true;
             extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
+            debug = true;
           };
         }
         // pkgs.lib.optionalAttrs networkd {
diff --git a/nixos/tests/beszel.nix b/nixos/tests/beszel.nix
new file mode 100644
index 000000000000..77a4a32a3747
--- /dev/null
+++ b/nixos/tests/beszel.nix
@@ -0,0 +1,119 @@
+{ pkgs, lib, ... }:
+{
+  name = "beszel";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes = {
+    hubHost =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        systemd.network.networks."01-eth1" = {
+          name = "eth1";
+          networkConfig.Address = "10.0.0.1/24";
+        };
+
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+        };
+
+        services.beszel.hub = {
+          enable = true;
+          host = "10.0.0.1";
+        };
+
+        networking.firewall.allowedTCPPorts = [
+          config.services.beszel.hub.port
+        ];
+
+        environment.systemPackages = [
+          config.services.beszel.hub.package
+        ];
+      };
+
+    agentHost =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        systemd.network.networks."01-eth1" = {
+          name = "eth1";
+          networkConfig.Address = "10.0.0.2/24";
+        };
+
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+        };
+
+        environment.systemPackages = with pkgs; [ jq ];
+
+        specialisation."agent".configuration = {
+          services.beszel.agent = {
+            enable = true;
+            environment.HUB_URL = "http://10.0.0.1:8090";
+            environment.KEY_FILE = "/var/lib/beszel-agent/id_ed25519.pub";
+            environment.TOKEN_FILE = "/var/lib/beszel-agent/token";
+            openFirewall = true;
+          };
+        };
+      };
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      hubCfg = nodes.hubHost.services.beszel.hub;
+      agentCfg = nodes.agentHost.specialisation."agent".configuration.services.beszel.agent;
+    in
+    ''
+      import json
+
+      start_all()
+
+      with subtest("Start hub"):
+        hubHost.wait_for_unit("beszel-hub.service")
+        hubHost.wait_for_open_port(${toString hubCfg.port}, "${toString hubCfg.host}")
+
+      with subtest("Register user"):
+        agentHost.succeed('curl -f --json \'${
+          builtins.toJSON {
+            email = "admin@example.com";
+            password = "password";
+          }
+        }\' "${agentCfg.environment.HUB_URL}/api/beszel/create-user"')
+        user = json.loads(agentHost.succeed('curl -f --json \'${
+          builtins.toJSON {
+            identity = "admin@example.com";
+            password = "password";
+          }
+        }\' ${agentCfg.environment.HUB_URL}/api/collections/users/auth-with-password').strip())
+
+      with subtest("Install agent credentials"):
+        agentHost.succeed("mkdir -p \"$(dirname '${agentCfg.environment.KEY_FILE}')\" \"$(dirname '${agentCfg.environment.TOKEN_FILE}')\"")
+        sshkey = agentHost.succeed(f"curl -H 'Authorization: {user["token"]}' -f ${agentCfg.environment.HUB_URL}/api/beszel/getkey | jq -r .key").strip()
+        utoken = agentHost.succeed(f"curl -H 'Authorization: {user["token"]}' -f ${agentCfg.environment.HUB_URL}/api/beszel/universal-token | jq -r .token").strip()
+        agentHost.succeed(f"echo '{sshkey}' > '${agentCfg.environment.KEY_FILE}'")
+        agentHost.succeed(f"echo '{utoken}' > '${agentCfg.environment.TOKEN_FILE}'")
+
+      with subtest("Register agent in hub"):
+        agentHost.succeed(f'curl -H \'Authorization: {user["token"]}\' -f --json \'{${
+          builtins.toJSON {
+            "host" = "10.0.0.2";
+            "name" = "agent";
+            "pkey" = "{sshkey}";
+            "port" = "45876";
+            "tkn" = "{utoken}";
+            "users" = ''{user['record']['id']}'';
+          }
+        }}\' "${agentCfg.environment.HUB_URL}/api/collections/systems/records"')
+
+      with subtest("Start agent"):
+        agentHost.succeed("/run/current-system/specialisation/agent/bin/switch-to-configuration switch")
+        agentHost.wait_for_unit("beszel-agent.service")
+        agentHost.wait_until_succeeds("journalctl -eu beszel-agent --grep 'SSH connection established'")
+        agentHost.wait_until_succeeds(f'curl -H \'Authorization: {user["token"]}\' -f ${agentCfg.environment.HUB_URL}/api/collections/systems/records | grep agentHost')
+    '';
+}
diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 812238b222b4..11758605a4eb 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -6,12 +6,12 @@
 # which only works if the first client successfully uses the UPnP-IGD
 # protocol to poke a hole in the NAT.
 
-{ pkgs, ... }:
+{ lib, hostPkgs, ... }:
 
 let
 
   # Some random file to serve.
-  file = pkgs.hello.src;
+  file = hostPkgs.hello.src;
 
   internalRouterAddress = "192.168.3.1";
   internalClient1Address = "192.168.3.2";
@@ -23,7 +23,6 @@ let
   transmissionConfig =
     { pkgs, ... }:
     {
-      environment.systemPackages = [ pkgs.transmission_3 ];
       services.transmission = {
         enable = true;
         settings = {
@@ -37,7 +36,7 @@ in
 
 {
   name = "bittorrent";
-  meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [
       rob
       bobvanderlinden
diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix
index a6c40f6a9ab4..6fbf13ca9111 100644
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@@ -42,23 +42,19 @@
     in
     ''
       with subtest("Wait for login"):
-          # wait_for_x() checks graphical-session.target, which is expected to be
-          # inactive on Budgie before Budgie manages user session with systemd.
-          # https://github.com/BuddiesOfBudgie/budgie-desktop/blob/39e9f0895c978f76/src/session/budgie-desktop.in#L16
-          #
-          # Previously this was unconditionally touched by xsessionWrapper but was
-          # changed in #233981 (we have Budgie:GNOME in XDG_CURRENT_DESKTOP).
-          # machine.wait_for_x()
+          machine.wait_for_x()
           machine.wait_until_succeeds('journalctl -t budgie-session-binary --grep "Entering running state"')
           machine.wait_for_file("${user.home}/.Xauthority")
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Budgie session components actually start"):
-          for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]:
-              machine.wait_until_succeeds(f"pgrep -f {i}")
+          for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "bsd-media-keys", "gsd-xsettings"]:
+              machine.wait_until_succeeds(f"pgrep {i}")
+          machine.wait_until_succeeds("pgrep -xf /run/current-system/sw/bin/org.buddiesofbudgie.budgie-desktop-view")
           # We don't check xwininfo for budgie-wm.
           # See https://github.com/NixOS/nixpkgs/pull/216737#discussion_r1155312754
           machine.wait_for_window("budgie-daemon")
@@ -66,7 +62,7 @@
 
       with subtest("Check if various environment variables are set"):
           cmd = "xargs --null --max-args=1 echo < /proc/$(pgrep -xf /run/current-system/sw/bin/budgie-wm)/environ"
-          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie:GNOME'")
+          machine.succeed(f"{cmd} | grep 'XDG_CURRENT_DESKTOP' | grep 'Budgie'")
           machine.succeed(f"{cmd} | grep 'BUDGIE_PLUGIN_DATADIR' | grep '${pkgs.budgie-desktop-with-plugins.pname}'")
           # From the nixos/budgie module
           machine.succeed(f"{cmd} | grep 'SSH_AUTH_SOCK' | grep 'gcr'")
diff --git a/nixos/tests/certmgr.nix b/nixos/tests/certmgr.nix
index 1a78e3150d8b..f6ef1b03fcab 100644
--- a/nixos/tests/certmgr.nix
+++ b/nixos/tests/certmgr.nix
@@ -1,6 +1,27 @@
 { runTest, pkgs, ... }:
 
 let
+  authKey = pkgs.writeText "auth-key" "1234ABCD";
+  cfsslConfig = pkgs.writeText "config.json" (
+    builtins.toJSON {
+      # also see `cfssl print-defaults config`
+      auth_keys = {
+        my_key = {
+          type = "standard";
+          key = "file:${authKey}";
+        };
+      };
+      signing = {
+        default = {
+          expiry = "168h";
+          auth_key = "my_key";
+          usages = [
+            "digital signature"
+          ];
+        };
+      };
+    }
+  );
   mkSpec =
     {
       host,
@@ -18,6 +39,7 @@ let
         label = "www_ca";
         profile = "three-month";
         remote = "localhost:8888";
+        auth_key_file = toString authKey;
       };
       certificate = {
         group = "nginx";
@@ -75,7 +97,10 @@ let
             ];
             networking.extraHosts = "127.0.0.1 imp.example.org decl.example.org";
 
-            services.cfssl.enable = true;
+            services.cfssl = {
+              enable = true;
+              configFile = toString cfsslConfig;
+            };
             systemd.services.cfssl.after = [
               "cfssl-init.service"
               "networking.target"
@@ -90,6 +115,9 @@ let
                 User = "cfssl";
                 Type = "oneshot";
                 WorkingDirectory = config.services.cfssl.dataDir;
+                # matches systemd.services.cfssl to run setup transparently
+                StateDirectory = baseNameOf config.services.cfssl.dataDir;
+                StateDirectoryMode = 700;
               };
               script = ''
                 ${pkgs.cfssl}/bin/cfssl genkey -initca ${
diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix
index d19ac920b388..e4118d82f4dd 100644
--- a/nixos/tests/cinnamon-wayland.nix
+++ b/nixos/tests/cinnamon-wayland.nix
@@ -42,7 +42,8 @@
           machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Wait for the Cinnamon shell"):
           # Correct output should be (true, '2')
diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix
index 9ff43a8dbbb7..1f8fb683efc7 100644
--- a/nixos/tests/cinnamon.nix
+++ b/nixos/tests/cinnamon.nix
@@ -53,7 +53,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Wait for the Cinnamon shell"):
           # Correct output should be (true, '2')
diff --git a/nixos/tests/clickhouse/default.nix b/nixos/tests/clickhouse/default.nix
index 88e01fcb1fdb..1299eb199f67 100644
--- a/nixos/tests/clickhouse/default.nix
+++ b/nixos/tests/clickhouse/default.nix
@@ -28,4 +28,10 @@
       inherit package;
     };
   };
+  ui = runTest {
+    imports = [ ./ui.nix ];
+    _module.args = {
+      inherit package;
+    };
+  };
 }
diff --git a/nixos/tests/clickhouse/ui.nix b/nixos/tests/clickhouse/ui.nix
new file mode 100644
index 000000000000..b49d8a8d8861
--- /dev/null
+++ b/nixos/tests/clickhouse/ui.nix
@@ -0,0 +1,118 @@
+{
+  lib,
+  pkgs,
+  package,
+  ...
+}:
+
+{
+  name = "clickhouse-ui";
+
+  nodes = {
+    browser =
+      {
+        config,
+        pkgs,
+        ...
+      }:
+      {
+        environment.systemPackages =
+          let
+            clickhouseSeleniumScript =
+              pkgs.writers.writePython3Bin "clickhouse-selenium-script"
+                {
+                  libraries = with pkgs.python3Packages; [ selenium ];
+                }
+                ''
+                  from selenium import webdriver
+                  from selenium.webdriver.common.by import By
+                  from selenium.webdriver.firefox.options import Options
+                  from selenium.webdriver.support.ui import WebDriverWait
+
+                  options = Options()
+                  options.add_argument("--headless")
+                  service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
+
+                  driver = webdriver.Firefox(options=options, service=service)
+                  driver.implicitly_wait(10)
+                  driver.get("http://clickhouse:8123/play")
+
+                  wait = WebDriverWait(driver, 60)
+
+                  assert len(driver.find_elements(
+                    By.ID, "query_div")) == 1
+
+                  server_info_element = driver.find_element(
+                    By.XPATH, "//span[@id='server_info']")
+                  assert "${
+                    lib.strings.replaceStrings [ "-stable" "-lts" ] [ "" "" ] package.version
+                  }" in server_info_element.text
+
+                  # Shouldn't show before query done
+                  assert len(driver.find_elements(
+                    By.CSS_SELECTOR, ".row-number")) == 0
+
+                  query_box = driver.find_element(
+                    By.XPATH, "//textarea[@id='query']")
+                  query_box.click()
+                  query_box.send_keys("SELECT 1")
+
+                  query_run_button = driver.find_element(
+                    By.XPATH, "//button[@id='run']").click()
+
+                  # Now verify results shown
+                  assert len(driver.find_elements(
+                    By.XPATH, "//div[@id='check-mark']")) == 1
+
+                  assert len(driver.find_elements(
+                    By.CSS_SELECTOR, ".row-number")) == 2
+
+                  driver.close()
+                '';
+          in
+          with pkgs;
+          [
+            curl
+            firefox-unwrapped
+            geckodriver
+            clickhouseSeleniumScript
+          ];
+      };
+
+    clickhouse =
+      { config, pkgs, ... }:
+      {
+        networking.firewall.allowedTCPPorts = [
+          8123
+          9000
+        ];
+
+        environment.etc = {
+          "clickhouse-server/config.d/listen.xml".text = ''
+            <clickhouse>
+              <listen_host>::</listen_host>
+            </clickhouse>
+          '';
+        };
+
+        services.clickhouse = {
+          enable = true;
+          inherit package;
+        };
+      };
+  };
+
+  testScript = ''
+    clickhouse.wait_for_unit("clickhouse")
+    clickhouse.wait_for_open_port(8123)
+    clickhouse.wait_for_open_port(9000)
+
+    browser.systemctl("start network-online.target")
+    browser.wait_for_unit("network-online.target")
+
+    browser.succeed("curl -kLs http://clickhouse:8123/play | grep 'ClickHouse Query'")
+
+    # Ensure the application is actually rendered by the Javascript
+    browser.succeed("PYTHONUNBUFFERED=1 clickhouse-selenium-script")
+  '';
+}
diff --git a/nixos/tests/dep-scan.nix b/nixos/tests/dep-scan.nix
index 7bfe6e9b94e4..82eb6923c5c8 100644
--- a/nixos/tests/dep-scan.nix
+++ b/nixos/tests/dep-scan.nix
@@ -31,16 +31,16 @@
     # the program will try to download them at runtime.
     # https://github.com/owasp-dep-scan/dep-scan/issues/443
     environment.etc."vdb/data.index.vdb6".source = pkgs.fetchurl {
-      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/72377024f9742c6e700a113fc7059b18f738081c/app-2y/data.index.vdb6";
-      hash = "sha256-/9RIL6KVwmUmcKteOhWlnzjtZzGUbmRzua5o4Z8Mu9I=";
+      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/40609f230dd7c83178e054e0219c367b49a2c920/app-2y/data.index.vdb6";
+      hash = "sha256-UyE0xiLT0T4ygBdEvDi4VQW/vxwalN6YV9EJ9RoLYy4=";
     };
     environment.etc."vdb/data.vdb6".source = pkgs.fetchurl {
-      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/72377024f9742c6e700a113fc7059b18f738081c/app-2y/data.vdb6";
-      hash = "sha256-6gCftnjal9ZMXV+25fVANdJRuI/CN083OOnc8yA5TTw=";
+      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/40609f230dd7c83178e054e0219c367b49a2c920/app-2y/data.vdb6";
+      hash = "sha256-k5QIowFD8H/hwaRz1p8RXlFEIrKjnFUtxtZTfD67B+U=";
     };
     environment.etc."vdb/vdb.meta".source = pkgs.fetchurl {
-      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/72377024f9742c6e700a113fc7059b18f738081c/app-2y/vdb.meta";
-      hash = "sha256-i0oI3ODrmm8PF9UGJ9gy9QzQ0SKjLo9DdqYX/kqoHak=";
+      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/40609f230dd7c83178e054e0219c367b49a2c920/app-2y/vdb.meta";
+      hash = "sha256-eQB0dHlNw31sKsRcVUByhIfuIN35+m3VAcBHIfusNPY=";
     };
     environment.variables = {
       VDB_HOME = "/tmp/vdb";
diff --git a/nixos/tests/dictd.nix b/nixos/tests/dictd.nix
new file mode 100644
index 000000000000..83faf870711f
--- /dev/null
+++ b/nixos/tests/dictd.nix
@@ -0,0 +1,29 @@
+{ lib, pkgs, ... }:
+{
+  name = "dictd";
+  meta.maintainers = with lib.maintainers; [
+    h7x4
+  ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.dictd = {
+        enable = true;
+        DBs = with pkgs.dictdDBs; [
+          jpn2eng
+          eng2jpn
+        ];
+      };
+    };
+
+  testScript = ''
+    machine.wait_for_unit("dictd.service")
+    machine.wait_for_open_port(2628)
+
+    machine.succeed("dict --serverinfo | grep 'On machine: up'")
+    machine.succeed("dict --dbs | grep '${pkgs.dictdDBs.jpn2eng.name}'")
+    machine.succeed("dict -d '${pkgs.dictdDBs.jpn2eng.name}' 例え | grep example")
+    machine.succeed("dict -d '${pkgs.dictdDBs.eng2jpn.name}' example | grep 例え")
+  '';
+}
diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix
index e4b15cd10076..fdf427291497 100644
--- a/nixos/tests/discourse.nix
+++ b/nixos/tests/discourse.nix
@@ -29,7 +29,7 @@ in
   nodes.discourse =
     { nodes, ... }:
     {
-      virtualisation.memorySize = 2048;
+      virtualisation.memorySize = 4096;
       virtualisation.cores = 4;
       virtualisation.useNixStoreImage = true;
       virtualisation.writableStore = false;
diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix
index 77e731feddbf..41dfc754e7fe 100644
--- a/nixos/tests/enlightenment.nix
+++ b/nixos/tests/enlightenment.nix
@@ -42,7 +42,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("First time wizard"):
           machine.wait_for_text("Default")  # Language
diff --git a/nixos/tests/etcd/default.nix b/nixos/tests/etcd/default.nix
new file mode 100644
index 000000000000..96add9670a95
--- /dev/null
+++ b/nixos/tests/etcd/default.nix
@@ -0,0 +1,43 @@
+{
+  pkgs,
+  runTest,
+  ...
+}:
+
+let
+  testEtcd =
+    path: oPkgs:
+    runTest (
+      let
+        etcdPkgs = pkgs // oPkgs;
+      in
+      pkgs.lib.recursiveUpdate {
+        meta = {
+          maintainers = etcdPkgs.etcd.meta.maintainers;
+          platforms = [
+            "aarch64-linux"
+            "x86_64-linux"
+          ];
+        };
+      } (import path etcdPkgs)
+    );
+  testEtcdPkg = pkg: path: testEtcd path { etcd = pkg; };
+  testEtcd_3_4 = testEtcdPkg pkgs.etcd_3_4;
+  testEtcd_3_5 = testEtcdPkg pkgs.etcd_3_5;
+  testEtcd_3_6 = testEtcdPkg pkgs.etcd_3_6;
+in
+
+{
+  "3_4" = {
+    multi-node = testEtcd_3_4 ./multi-node.nix;
+    single-node = testEtcd_3_4 ./single-node.nix;
+  };
+  "3_5" = {
+    multi-node = testEtcd_3_5 ./multi-node.nix;
+    single-node = testEtcd_3_5 ./single-node.nix;
+  };
+  "3_6" = {
+    multi-node = testEtcd_3_6 ./multi-node.nix;
+    single-node = testEtcd_3_6 ./single-node.nix;
+  };
+}
diff --git a/nixos/tests/etcd/etcd-cluster.nix b/nixos/tests/etcd/multi-node.nix
similarity index 97%
rename from nixos/tests/etcd/etcd-cluster.nix
rename to nixos/tests/etcd/multi-node.nix
index aa66c8498356..0ce36d0f14b6 100644
--- a/nixos/tests/etcd/etcd-cluster.nix
+++ b/nixos/tests/etcd/multi-node.nix
@@ -1,6 +1,5 @@
-# This test runs simple etcd cluster
+{ pkgs, etcd, ... }:
 
-{ lib, pkgs, ... }:
 let
   runWithOpenSSL =
     file: cmd:
@@ -77,6 +76,7 @@ let
     services = {
       etcd = {
         enable = true;
+        package = etcd;
         keyFile = etcd_key;
         certFile = etcd_cert;
         trustedCaFile = ca_pem;
@@ -99,10 +99,9 @@ let
     networking.firewall.allowedTCPPorts = [ 2380 ];
   };
 in
-{
-  name = "etcd-cluster";
 
-  meta.maintainers = with lib.maintainers; [ offline ];
+{
+  name = "etcd-multi-node";
 
   nodes = {
     node1 =
@@ -170,4 +169,5 @@ in
         node1.succeed("etcdctl put /foo/bar 'Hello degraded world'")
         node1.succeed("etcdctl get /foo/bar | grep 'Hello degraded world'")
   '';
+
 }
diff --git a/nixos/tests/etcd/etcd.nix b/nixos/tests/etcd/single-node.nix
similarity index 74%
rename from nixos/tests/etcd/etcd.nix
rename to nixos/tests/etcd/single-node.nix
index 9c423ef35185..0d2bdea166d9 100644
--- a/nixos/tests/etcd/etcd.nix
+++ b/nixos/tests/etcd/single-node.nix
@@ -1,11 +1,13 @@
-# This test runs simple etcd node
-{ lib, ... }:
+{ etcd, ... }:
+
 {
-  name = "etcd";
-  meta.maintainers = with lib.maintainers; [ offline ];
+  name = "etcd-single-node";
 
   nodes.node = {
-    services.etcd.enable = true;
+    services.etcd = {
+      enable = true;
+      package = etcd;
+    };
   };
 
   testScript = ''
@@ -19,4 +21,5 @@
         node.succeed("etcdctl put /foo/bar 'Hello world'")
         node.succeed("etcdctl get /foo/bar | grep 'Hello world'")
   '';
+
 }
diff --git a/nixos/tests/filesender.nix b/nixos/tests/filesender.nix
deleted file mode 100644
index b81b2ab04af3..000000000000
--- a/nixos/tests/filesender.nix
+++ /dev/null
@@ -1,146 +0,0 @@
-{ pkgs, lib, ... }:
-{
-  name = "filesender";
-  meta = {
-    maintainers = with lib.maintainers; [ nhnn ];
-    broken = pkgs.stdenv.hostPlatform.isAarch64; # selenium.common.exceptions.WebDriverException: Message: Unsupported platform/architecture combination: linux/aarch64
-  };
-
-  nodes.filesender =
-    { ... }:
-    let
-      format = pkgs.formats.php { };
-    in
-    {
-      networking.firewall.allowedTCPPorts = [ 80 ];
-
-      services.filesender.enable = true;
-      services.filesender.localDomain = "filesender";
-      services.filesender.settings = {
-        auth_sp_saml_authentication_source = "default";
-        auth_sp_saml_uid_attribute = "uid";
-        storage_filesystem_path = "/tmp";
-        site_url = "http://filesender";
-        force_ssl = false;
-        admin = "";
-        admin_email = "admin@localhost";
-        email_reply_to = "noreply@localhost";
-      };
-      services.simplesamlphp.filesender = {
-        settings = {
-          baseurlpath = "http://filesender/saml";
-          "module.enable".exampleauth = true;
-        };
-        authSources = {
-          admin = [ "core:AdminPassword" ];
-          default = format.lib.mkMixedArray [ "exampleauth:UserPass" ] {
-            "user:password" = {
-              uid = [ "user" ];
-              cn = [ "user" ];
-              mail = [ "user@nixos.org" ];
-            };
-          };
-        };
-      };
-    };
-
-  nodes.client =
-    {
-      pkgs,
-      nodes,
-      ...
-    }:
-    let
-      filesenderIP = (builtins.head (nodes.filesender.networking.interfaces.eth1.ipv4.addresses)).address;
-    in
-    {
-      networking.hosts.${filesenderIP} = [ "filesender" ];
-
-      environment.systemPackages =
-        let
-          username = "user";
-          password = "password";
-          browser-test =
-            pkgs.writers.writePython3Bin "browser-test"
-              {
-                libraries = [ pkgs.python3Packages.selenium ];
-                flakeIgnore = [
-                  "E124"
-                  "E501"
-                ];
-              }
-              ''
-                from selenium.webdriver.common.by import By
-                from selenium.webdriver import Firefox
-                from selenium.webdriver.firefox.options import Options
-                from selenium.webdriver.firefox.firefox_profile import FirefoxProfile
-                from selenium.webdriver.firefox.service import Service
-                from selenium.webdriver.support.ui import WebDriverWait
-                from selenium.webdriver.support import expected_conditions as EC
-                from subprocess import STDOUT
-                import string
-                import random
-                import logging
-                import time
-                selenium_logger = logging.getLogger("selenium")
-                selenium_logger.setLevel(logging.DEBUG)
-                selenium_logger.addHandler(logging.StreamHandler())
-                profile = FirefoxProfile()
-                profile.set_preference("browser.download.folderList", 2)
-                profile.set_preference("browser.download.manager.showWhenStarting", False)
-                profile.set_preference("browser.download.dir", "/tmp/firefox")
-                profile.set_preference("browser.helperApps.neverAsk.saveToDisk", "text/plain;text/txt")
-                options = Options()
-                options.profile = profile
-                options.add_argument('--headless')
-                service = Service(log_output=STDOUT)
-                driver = Firefox(options=options)
-                driver.set_window_size(1024, 768)
-                driver.implicitly_wait(30)
-                driver.get('http://filesender/')
-                wait = WebDriverWait(driver, 20)
-                wait.until(EC.title_contains("FileSender"))
-                driver.find_element(By.ID, "btn_logon").click()
-                wait.until(EC.title_contains("Enter your username and password"))
-                driver.find_element(By.ID, 'username').send_keys(
-                    '${username}'
-                )
-                driver.find_element(By.ID, 'password').send_keys(
-                    '${password}'
-                )
-                driver.find_element(By.ID, "submit_button").click()
-                wait.until(EC.title_contains("FileSender"))
-                wait.until(EC.presence_of_element_located((By.ID, "topmenu_logoff")))
-                test_string = "".join(random.choices(string.ascii_uppercase + string.digits, k=20))
-                with open("/tmp/test_file.txt", "w") as file:
-                    file.write(test_string)
-                driver.find_element(By.ID, "files").send_keys("/tmp/test_file.txt")
-                time.sleep(2)
-                driver.find_element(By.CSS_SELECTOR, '.start').click()
-                wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".download_link")))
-                download_link = driver.find_element(By.CSS_SELECTOR, '.download_link > textarea').get_attribute('value').strip()
-                driver.get(download_link)
-                wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".download")))
-                driver.find_element(By.CSS_SELECTOR, '.download').click()
-                wait.until(EC.presence_of_element_located((By.CSS_SELECTOR, ".ui-dialog-buttonset > button:nth-child(2)")))
-                driver.find_element(By.CSS_SELECTOR, ".ui-dialog-buttonset > button:nth-child(2)").click()
-                driver.close()
-                driver.quit()
-              '';
-        in
-        [
-          pkgs.firefox-unwrapped
-          pkgs.geckodriver
-          browser-test
-        ];
-    };
-
-  testScript = ''
-    start_all()
-    filesender.wait_for_file("/run/phpfpm/filesender.sock")
-    filesender.wait_for_open_port(80)
-    if "If you have received an invitation to access this site as a guest" not in client.wait_until_succeeds("curl -sS -f http://filesender"):
-      raise Exception("filesender returned invalid html")
-    client.succeed("browser-test")
-  '';
-}
diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
index d956d4fe32fb..bf624a6041b6 100644
--- a/nixos/tests/freshrss/extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -16,9 +16,8 @@
     };
   extraPythonPackages = p: [
     p.lxml
-    p.lxml-stubs
+    p.types-lxml
   ];
-  skipTypeCheck = true;
 
   testScript = ''
     machine.wait_for_unit("multi-user.target")
diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix
index bde20a8c95aa..66003daa09d9 100644
--- a/nixos/tests/gnome-extensions.nix
+++ b/nixos/tests/gnome-extensions.nix
@@ -105,7 +105,8 @@
           # wait for alice to be logged in
           machine.wait_for_unit("default.target", "${user.name}")
           # check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for GNOME Shell"):
           # correct output should be (true, 'false')
diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix
index 6df6e621995e..4f2c889eba88 100644
--- a/nixos/tests/gnome-flashback.nix
+++ b/nixos/tests/gnome-flashback.nix
@@ -26,8 +26,17 @@
 
       services.desktopManager.gnome.enable = true;
       services.desktopManager.gnome.debug = true;
-      services.desktopManager.gnome.flashback.enableMetacity = true;
-      services.displayManager.defaultSession = "gnome-flashback-metacity";
+
+      services.desktopManager.gnome.flashback.customSessions = [
+        {
+          # Intentionally a different name to test mkSystemdTargetForWm.
+          wmName = "metacitytest";
+          wmLabel = "Metacity";
+          wmCommand = "${pkgs.metacity}/bin/metacity";
+          enableGnomePanel = true;
+        }
+      ];
+      services.displayManager.defaultSession = "gnome-flashback-metacitytest";
     };
 
   testScript =
@@ -40,13 +49,14 @@
     ''
       with subtest("Login to GNOME Flashback with GDM"):
           machine.wait_for_x()
-          machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
+          machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"')
           # Wait for alice to be logged in"
           machine.wait_for_unit("default.target", "${user.name}")
           machine.wait_for_file("${xauthority}")
           machine.succeed("xauth merge ${xauthority}")
           # Check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for Metacity"):
           machine.wait_until_succeeds("pgrep metacity")
diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix
index 82d3bf3e08ce..9e9fdc9bdb9f 100644
--- a/nixos/tests/gnome-xorg.nix
+++ b/nixos/tests/gnome-xorg.nix
@@ -83,7 +83,8 @@
           machine.wait_for_file("${xauthority}")
           machine.succeed("xauth merge ${xauthority}")
           # Check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for GNOME Shell"):
           # correct output should be (true, 'false')
diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix
index 4d1b4c71ecd2..0bb2e7061133 100644
--- a/nixos/tests/gnome.nix
+++ b/nixos/tests/gnome.nix
@@ -76,7 +76,8 @@
           # wait for alice to be logged in
           machine.wait_for_unit("default.target", "${user.name}")
           # check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for GNOME Shell"):
           # correct output should be (true, 'false')
diff --git a/nixos/tests/go-csp-collector.nix b/nixos/tests/go-csp-collector.nix
new file mode 100644
index 000000000000..ec75b51506ff
--- /dev/null
+++ b/nixos/tests/go-csp-collector.nix
@@ -0,0 +1,66 @@
+{ lib, ... }:
+
+{
+  name = "go-csp-collector";
+  meta.maintainers = with lib.maintainers; [ stepbrobd ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.go-csp-collector = {
+        enable = true;
+        settings = {
+          debug = true;
+          port = 9999;
+          health-check-path = "/health";
+          filter-file = pkgs.writeText "filter" "chrome-extension://";
+        };
+      };
+    };
+
+  testScript = ''
+    import json
+
+    # health check
+    machine.wait_for_unit("go-csp-collector.service")
+    machine.wait_for_open_port(9999)
+    machine.succeed("curl -f http://localhost:9999/health")
+
+    # send valid csp report
+    machine.succeed(
+      "curl -f -X POST http://127.0.0.1:9999/ "
+      "-H 'Content-Type: application/csp-report' "
+      "-d '" + json.dumps({
+        "csp-report": {
+          "document-uri": "https://example.com/",
+          "referrer": "https://example.com/",
+          "violated-directive": "script-src",
+          "effective-directive": "script-src",
+          "original-policy": "script-src 'self'",
+          "blocked-uri": "https://example.org/malicious.js",
+          "status-code": 200
+        }
+      }) + "'"
+    )
+    logs = machine.succeed("journalctl -u go-csp-collector.service")
+    assert "level=debug" in logs, "debug mode not enabled"
+    assert "blocked_uri" in logs, "csp report not logged"
+    assert "https://example.org/malicious.js" in logs, "blocked uri not in logs"
+
+    # check rejection
+    machine.fail(
+      "curl -f -X POST http://[::1]:9999/ "
+      "-H 'Content-Type: application/csp-report' "
+      "-d '" + json.dumps({
+        "csp-report": {
+          "document-uri": "https://example.com/",
+          "blocked-uri": "chrome-extension://something",
+          "violated-directive": "script-src"
+        }
+      }) + "'"
+    )
+    logs = machine.succeed("journalctl -u go-csp-collector.service")
+    assert "invalid resource" in logs, "filter rejection not logged"
+    assert "chrome-extension://" in logs, "filtered uri pattern not in logs"
+  '';
+}
diff --git a/nixos/tests/hoogle.nix b/nixos/tests/hoogle.nix
new file mode 100644
index 000000000000..738680938e48
--- /dev/null
+++ b/nixos/tests/hoogle.nix
@@ -0,0 +1,31 @@
+{ lib, ... }:
+{
+  name = "hoogle";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.hoogle = {
+        enable = true;
+        packages =
+          hp: with hp; [
+            arrows
+            lens
+          ];
+      };
+    };
+
+  testScript =
+    { nodes, ... }:
+    let
+      cfg = nodes.machine.services.hoogle;
+    in
+    ''
+      machine.wait_for_unit("hoogle.service")
+      machine.wait_for_open_port(${toString cfg.port})
+
+      machine.succeed("curl http://${cfg.host}:${toString cfg.port} | grep '<title>Hoogle</title>'")
+      machine.succeed("curl 'http://${cfg.host}:${toString cfg.port}?hoogle=>>>' | grep Arrow")
+    '';
+}
diff --git a/nixos/tests/incus/default.nix b/nixos/tests/incus/default.nix
index 5a3b7b30a872..a09e4e8c3ace 100644
--- a/nixos/tests/incus/default.nix
+++ b/nixos/tests/incus/default.nix
@@ -1,51 +1,98 @@
 {
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../../.. { inherit system config; },
-  lts ? true,
-  ...
+  package,
+  runTestOn,
 }:
 let
-  incusTest = import ./incus-tests.nix;
+  incusRunTest =
+    config:
+    runTestOn [ "x86_64-linux" "aarch64-linux" ] {
+      imports = [
+        ./incus-tests-module.nix
+        ./incus-tests.nix
+      ];
+
+      tests.incus = {
+        inherit package;
+      }
+      // config;
+    };
 in
 {
-  all = incusTest {
-    inherit lts pkgs system;
-    allTests = true;
-  };
-
-  container = incusTest {
-    inherit lts pkgs system;
-    instanceContainer = true;
-  };
-
-  lvm = incusTest {
-    inherit lts pkgs system;
-    storageLvm = true;
-  };
-
-  openvswitch = incusTest {
-    inherit lts pkgs system;
-    networkOvs = true;
-  };
-
-  ui = import ./ui.nix {
-    inherit lts pkgs system;
-  };
-
-  virtual-machine = incusTest {
-    inherit lts pkgs system;
-    instanceVm = true;
-  };
-
-  zfs = incusTest {
-    inherit lts pkgs system;
-    storageZfs = true;
-  };
-
-  appArmor = incusTest {
-    inherit lts pkgs system;
+  # this is the main test which will test as much as possible
+  # run this for testing incus upgrades, also available in incus package tests
+  all = incusRunTest {
+    name = "all";
     appArmor = true;
-    allTests = true;
+    feature.user = true;
+
+    instances = {
+      c1 = {
+        type = "container";
+      };
+
+      vm1 = {
+        type = "virtual-machine";
+      };
+    };
+
+    network = {
+      ovs = true;
+    };
+
+    storage = {
+      lvm = true;
+      zfs = true;
+    };
+  };
+
+  # used in lxc tests to verify container functionality
+  container = incusRunTest {
+    name = "container";
+
+    instances.c1 = {
+      type = "container";
+    };
+  };
+
+  lvm = incusRunTest {
+    name = "lvm";
+
+    storage.lvm = true;
+  };
+
+  openvswitch = incusRunTest {
+    name = "openvswitch";
+
+    network.ovs = true;
+  };
+
+  ui = runTestOn [ "x86_64-linux" "aarch64-linux" ] {
+    imports = [ ./ui.nix ];
+
+    _module.args = { inherit package; };
+  };
+
+  virtual-machine = incusRunTest {
+    name = "virtual-machine";
+
+    instances = {
+      vm1 = {
+        type = "virtual-machine";
+      };
+
+      # disabled because never becomes available
+      # csm = {
+      #   type = "virtual-machine";
+      #   incusConfig.config = {
+      #     "security.csm" = true;
+      #   };
+      # };
+    };
+  };
+
+  zfs = incusRunTest {
+    name = "zfs";
+
+    storage.zfs = true;
   };
 }
diff --git a/nixos/tests/incus/incus-tests-module.nix b/nixos/tests/incus/incus-tests-module.nix
new file mode 100644
index 000000000000..085dbfbc8750
--- /dev/null
+++ b/nixos/tests/incus/incus-tests-module.nix
@@ -0,0 +1,262 @@
+{
+  lib,
+  pkgs,
+  ...
+}:
+let
+  jsonFormat = pkgs.formats.json { };
+in
+{
+  options.tests.incus = {
+    name = lib.mkOption {
+      type = lib.types.str;
+      description = "name appended to test";
+    };
+
+    package = lib.mkPackageOption pkgs "incus" { };
+
+    preseed = lib.mkOption {
+      description = "configuration provided to incus preseed. https://linuxcontainers.org/incus/docs/main/howto/initialize/#non-interactive-configuration";
+      type = lib.types.submodule {
+        freeformType = jsonFormat.type;
+      };
+    };
+
+    instances = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.submodule (
+          { name, config, ... }:
+          {
+            options = {
+              name = lib.mkOption {
+                type = lib.types.str;
+                default = name;
+              };
+
+              type = lib.mkOption {
+                type = lib.types.enum [
+                  "container"
+                  "virtual-machine"
+                ];
+
+              };
+
+              imageAlias = lib.mkOption {
+                type = lib.types.str;
+                description = "name of image when imported";
+                default = "nixos/${name}/${config.type}";
+              };
+
+              nixosConfig = lib.mkOption {
+                type = lib.types.attrsOf lib.types.anything;
+                default = { };
+              };
+
+              incusConfig = lib.mkOption {
+                type = lib.types.submodule {
+                  freeformType = jsonFormat.type;
+                };
+                description = "incus configuration provided at launch";
+                default = { };
+              };
+
+              testScript = lib.mkOption {
+                type = lib.types.str;
+                description = "final script provided to test runner";
+                readOnly = true;
+              };
+            };
+            config =
+              let
+                releases = import ../../release.nix {
+                  configuration = config.nixosConfig;
+                };
+
+                images = {
+                  container = {
+                    metadata =
+                      releases.incusContainerMeta.${pkgs.stdenv.hostPlatform.system}
+                      + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
+
+                    root =
+                      releases.incusContainerImage.${pkgs.stdenv.hostPlatform.system}
+                      + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs";
+                  };
+
+                  virtual-machine = {
+                    metadata = releases.incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system} + "/*/*.tar.xz";
+                    root = releases.incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system} + "/nixos.qcow2";
+                  };
+                };
+
+                root = images.${config.type}.root;
+                metadata = images.${config.type}.metadata;
+
+                image_id = "${config.type}/${config.name}";
+              in
+              {
+                incusConfig = lib.optionalAttrs (config.type == "virtual-machine") {
+                  config."security.secureboot" = false;
+                };
+
+                nixosConfig = {
+                  # Building documentation makes the test unnecessarily take a longer time:
+                  documentation.enable = lib.mkForce false;
+                  documentation.nixos.enable = lib.mkForce false;
+                  # including a channel forces images to be rebuilt on any changes
+                  system.installer.channel.enable = lib.mkForce false;
+
+                  environment.etc."nix/registry.json".text = lib.mkForce "{}";
+
+                  # Arbitrary sysctl setting changed from nixos default
+                  # used for verifying `distrobuilder.generator` properly allows
+                  # for containers to modify sysctl
+                  boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+                };
+
+                testScript = # python
+                ''
+                  with subtest("[${image_id}] image can be imported"):
+                      server.succeed("incus image import ${metadata} ${root} --alias ${config.imageAlias}")
+
+                  with subtest("[${image_id}] can be launched and managed"):
+                      instance_name = server.succeed("incus launch ${config.imageAlias}${
+                        lib.optionalString (config.type == "virtual-machine") " --vm"
+                      } --quiet < ${jsonFormat.generate "${config.name}.json" config.incusConfig}").split(":")[1].strip()
+                      server.wait_for_instance(instance_name)
+
+                  with subtest("[${image_id}] can successfully restart"):
+                      server.succeed(f"incus restart {instance_name}")
+                      server.wait_for_instance(instance_name)
+
+                  with subtest("[${image_id}] remains running when softDaemonRestart is enabled and service is stopped"):
+                      pid = server.succeed(f"incus info {instance_name} | grep 'PID'").split(":")[1].strip()
+                      server.succeed(f"ps {pid}")
+                      server.succeed("systemctl stop incus")
+                      server.succeed(f"ps {pid}")
+                      server.succeed("systemctl start incus")
+
+                  with subtest("[${image_id}] CPU limits can be managed"):
+                      server.set_instance_config(instance_name, "limits.cpu 1", restart=True)
+                      server.wait_instance_exec_success(instance_name, "nproc | grep '^1$'", timeout=90)
+
+                  with subtest("[${image_id}] CPU limits can be hotplug changed"):
+                      server.set_instance_config(instance_name, "limits.cpu 2")
+                      server.wait_instance_exec_success(instance_name, "nproc | grep '^2$'", timeout=90)
+
+                  with subtest("[${image_id}] exec has a valid path"):
+                      server.succeed(f"incus exec {instance_name} -- bash -c 'true'")
+
+                  with subtest("[${image_id}] software tpm can be configured"):
+                      # this can be hot added to containers, but stopping for vm
+                      server.succeed(f"incus stop {instance_name}")
+                      server.succeed(f"incus config device add {instance_name} vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0")
+                      server.succeed(f"incus start {instance_name}")
+                      server.wait_for_instance(instance_name)
+
+                      server.succeed(f"incus exec {instance_name} -- test -e /dev/tpm0")
+                      server.succeed(f"incus exec {instance_name} -- test -e /dev/tpmrm0")
+                ''
+                #
+                # container specific
+                #
+                +
+                  lib.optionalString (config.type == "container")
+                    # python
+                    ''
+                      # TODO troubleshoot VM hot memory resizing which was introduced in 6.12
+                      with subtest("[${image_id}] memory limits can be hotplug changed"):
+                          server.set_instance_config(instance_name, "limits.memory 512MB")
+                          # can't use lsmem since it sees the host's memory size
+                          server.wait_instance_exec_success(instance_name, "grep 'MemTotal:[[:space:]]*500000 kB' /proc/meminfo", timeout=1)
+
+                      # verify the patched container systemd generator from `pkgs.distrobuilder.generator`
+                      with subtest("[${image_id}] lxc-generator compatibility"):
+                          with subtest("[${image_id}] lxc-container generator configures plain container"):
+                              # default container is plain
+                              server.succeed(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+
+                              server.check_instance_sysctl(instance_name)
+
+                          with subtest("[${image_id}] lxc-container generator configures nested container"):
+                              server.set_instance_config(instance_name, "security.nesting=true", restart=True)
+
+                              server.fail(f"incus exec {instance_name} test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
+                              target = server.succeed(f"incus exec {instance_name} readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
+                              assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
+
+                              server.check_instance_sysctl(instance_name)
+
+                      with subtest("[${image_id}] lxcfs"):
+                          with subtest("[${image_id}] mounts lxcfs overlays"):
+                              server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
+                              server.succeed(f"incus exec {instance_name} mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
+
+                          with subtest("[${image_id}] supports per-instance lxcfs"):
+                              server.succeed(f"incus stop {instance_name}")
+                              server.fail(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'")
+
+                              server.succeed("incus config set instances.lxcfs.per_instance=true")
+
+                              server.succeed(f"incus start {instance_name}")
+                              server.wait_for_instance(instance_name)
+                              server.succeed(f"pgrep -a lxcfs | grep 'incus/devices/{instance_name}/lxcfs'")
+                    ''
+
+                #
+                # virtual-machine specific
+                #
+                +
+                  lib.optionalString (config.type == "virtual-machine")
+                    # python
+                    ''
+                      with subtest("[${image_id}] memory limits can be managed"):
+                          server.set_instance_config(instance_name, "limits.memory 384MB", restart=True)
+                          lsmem = json.loads(server.instance_succeed(instance_name, "lsmem --json"))
+                          memsize = lsmem["memory"][0]["size"]
+                          assert memsize == "384M", f"failed to manage memory limit. {memsize} != 384M"
+
+                      with subtest("[${image_id}] incus-agent is started"):
+                          server.succeed(f"incus exec {instance_name} systemctl is-active incus-agent")
+                    ''
+
+                +
+                  #
+                  # finalize
+                  #
+                  # python
+                  ''
+                    # this will leave the instances stopped
+                    with subtest("[${image_id}] stop with incus-startup.service"):
+                        pid = server.succeed(f"incus info {instance_name} | grep 'PID'").split(":")[1].strip()
+                        server.succeed(f"ps {pid}")
+                        server.succeed("systemctl stop incus-startup.service")
+                        server.wait_until_fails(f"ps {pid}", timeout=120)
+                        server.succeed("systemctl start incus-startup.service")
+
+                  '';
+
+              };
+          }
+        )
+      );
+      description = "";
+      default = { };
+    };
+
+    appArmor = lib.mkEnableOption "AppArmor during tests";
+
+    feature.user = lib.mkEnableOption "Validate incus user access feature";
+
+    network.ovs = lib.mkEnableOption "Validate OVS network integration";
+
+    storage = {
+      lvm = lib.mkEnableOption "Validate LVM storage integration";
+      zfs = lib.mkEnableOption "Validate ZFS storage integration";
+    };
+  };
+
+  config = {
+    tests.incus = { };
+  };
+}
diff --git a/nixos/tests/incus/incus-tests.nix b/nixos/tests/incus/incus-tests.nix
index fe8aed457bb5..10470b36a795 100644
--- a/nixos/tests/incus/incus-tests.nix
+++ b/nixos/tests/incus/incus-tests.nix
@@ -1,500 +1,218 @@
-import ../make-test-python.nix (
-  {
-    pkgs,
-    lib,
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 
-    lts ? true,
+let
+  cfg = config.tests.incus;
 
-    allTests ? false,
+  # limit building of VMs to these systems as nested virtualization is
+  # required to test VMs, but support for this is poor outside x86
+  # will print warnings on those systems rather than failing outright
+  vmsEnabled = lib.elem pkgs.stdenv.system [ "x86_64-linux" ];
 
-    appArmor ? false,
-    featureUser ? allTests,
-    initLegacy ? true,
-    initSystemd ? true,
-    instanceContainer ? allTests,
-    instanceVm ? allTests,
-    networkOvs ? allTests,
-    storageLvm ? allTests,
-    storageZfs ? allTests,
-    ...
-  }:
+  instanceScript = lib.pipe cfg.instances [
+    (lib.filterAttrs (
+      name: instance:
+      let
+        keep = instance.type != "virtual-machine" || vmsEnabled;
+      in
+      lib.warnIf (!keep) ''
+        Skipping virtual-machine ${name} as VMs are disabled on ${pkgs.stdenv.system}
+      '' keep
+    ))
+    (lib.foldlAttrs (
+      acc: name: instance:
+      acc + instance.testScript
+    ) "")
+  ];
+in
+{
+  name = "${cfg.package.name}-${cfg.name}";
 
-  let
-    releases =
-      init:
-      import ../../release.nix {
-        configuration = {
-          # Building documentation makes the test unnecessarily take a longer time:
-          documentation.enable = lib.mkForce false;
+  meta = {
+    maintainers = lib.teams.lxc.members;
+  };
 
-          boot.initrd.systemd.enable = init == "systemd";
+  nodes.server = {
+    virtualisation = {
+      cores = 2;
+      memorySize = 4096;
+      diskSize = 20 * 1024;
+      emptyDiskImages = [
+        # vdb for zfs
+        2048
+        # vdc for lvm
+        2048
+      ];
 
-          # Arbitrary sysctl modification to ensure containers can update sysctl
-          boot.kernel.sysctl."net.ipv4.ip_forward" = "1";
+      incus = {
+        enable = true;
+        package = cfg.package;
+
+        preseed = {
+          networks = [
+            {
+              name = "incusbr0";
+              type = "bridge";
+              config = {
+                "ipv4.address" = "10.0.10.1/24";
+                "ipv4.nat" = "true";
+              };
+            }
+          ]
+          ++ lib.optionals cfg.network.ovs [
+            {
+              name = "ovsbr0";
+              type = "bridge";
+              config = {
+                "bridge.driver" = "openvswitch";
+                "ipv4.address" = "10.0.20.1/24";
+                "ipv4.nat" = "true";
+              };
+            }
+          ];
+          profiles = [
+            {
+              name = "default";
+              devices = {
+                eth0 = {
+                  name = "eth0";
+                  network = "incusbr0";
+                  type = "nic";
+                };
+                root = {
+                  path = "/";
+                  pool = "default";
+                  size = "35GiB";
+                  type = "disk";
+                };
+              };
+            }
+          ];
+          storage_pools = [
+            {
+              name = "default";
+              driver = "dir";
+            }
+          ];
         };
       };
 
-    images = init: {
-      container = {
-        metadata =
-          (releases init).incusContainerMeta.${pkgs.stdenv.hostPlatform.system}
-          + "/tarball/nixos-image-lxc-*-${pkgs.stdenv.hostPlatform.system}.tar.xz";
-
-        rootfs =
-          (releases init).incusContainerImage.${pkgs.stdenv.hostPlatform.system}
-          + "/nixos-lxc-image-${pkgs.stdenv.hostPlatform.system}.squashfs";
-      };
-
-      virtual-machine = {
-        metadata =
-          (releases init).incusVirtualMachineImageMeta.${pkgs.stdenv.hostPlatform.system} + "/*/*.tar.xz";
-        disk = (releases init).incusVirtualMachineImage.${pkgs.stdenv.hostPlatform.system} + "/nixos.qcow2";
-      };
+      vswitch.enable = cfg.network.ovs;
     };
 
-    initVariants = lib.optionals initLegacy [ "legacy" ] ++ lib.optionals initSystemd [ "systemd" ];
+    boot.supportedFilesystems = { inherit (cfg.storage) zfs; };
+    boot.zfs.forceImportRoot = false;
 
-    canTestVm = instanceVm && pkgs.stdenv.isLinux && pkgs.stdenv.isx86_64;
-  in
-  {
-    name = "incus" + lib.optionalString lts "-lts";
+    environment.systemPackages = [ pkgs.parted ];
 
-    meta = {
-      maintainers = lib.teams.lxc.members;
+    networking.hostId = "01234567";
+    networking.firewall.trustedInterfaces = [ "incusbr0" ];
+    networking.nftables.enable = true;
+
+    security.apparmor.enable = cfg.appArmor;
+    services.dbus.apparmor = (if cfg.appArmor then "enabled" else "disabled");
+
+    services.lvm = {
+      boot.thin.enable = cfg.storage.lvm;
+      dmeventd.enable = cfg.storage.lvm;
     };
 
-    nodes.machine = {
-      virtualisation = {
-        cores = 2;
-        memorySize = 2048;
-        diskSize = 12 * 1024;
-        emptyDiskImages = [
-          # vdb for zfs
-          2048
-          # vdc for lvm
-          2048
-        ];
-
-        incus = {
-          enable = true;
-          package = if lts then pkgs.incus-lts else pkgs.incus;
-
-          preseed = {
-            networks = [
-              {
-                name = "incusbr0";
-                type = "bridge";
-                config = {
-                  "ipv4.address" = "10.0.10.1/24";
-                  "ipv4.nat" = "true";
-                };
-              }
-            ]
-            ++ lib.optionals networkOvs [
-              {
-                name = "ovsbr0";
-                type = "bridge";
-                config = {
-                  "bridge.driver" = "openvswitch";
-                  "ipv4.address" = "10.0.20.1/24";
-                  "ipv4.nat" = "true";
-                };
-              }
-            ];
-            profiles = [
-              {
-                name = "default";
-                devices = {
-                  eth0 = {
-                    name = "eth0";
-                    network = "incusbr0";
-                    type = "nic";
-                  };
-                  root = {
-                    path = "/";
-                    pool = "default";
-                    size = "35GiB";
-                    type = "disk";
-                  };
-                };
-              }
-            ];
-            storage_pools = [
-              {
-                name = "default";
-                driver = "dir";
-              }
-            ];
-          };
-        };
-
-        vswitch.enable = networkOvs;
-      };
-
-      boot.supportedFilesystems = lib.optionals storageZfs [ "zfs" ];
-      boot.zfs.forceImportRoot = false;
-
-      environment.systemPackages = [ pkgs.parted ];
-
-      networking.hostId = "01234567";
-      networking.firewall.trustedInterfaces = [ "incusbr0" ];
-
-      security.apparmor.enable = appArmor;
-      services.dbus.apparmor = (if appArmor then "enabled" else "disabled");
-
-      services.lvm = {
-        boot.thin.enable = storageLvm;
-        dmeventd.enable = storageLvm;
-      };
-
-      networking.nftables.enable = true;
-
-      users.users.testuser = {
-        isNormalUser = true;
-        shell = pkgs.bashInteractive;
-        group = "incus";
-        uid = 1000;
-      };
+    users.users.testuser = {
+      isNormalUser = true;
+      shell = pkgs.bashInteractive;
+      group = "incus";
+      uid = 1000;
     };
+  };
 
-    testScript = # python
-    ''
-      import json
-
-      def wait_for_instance(name: str, project: str = "default"):
-          machine.wait_until_succeeds(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- /run/current-system/sw/bin/systemctl is-system-running")
-
-
-      def wait_incus_exec_success(name: str, command: str, timeout: int = 900, project: str = "default"):
-          def check_command(_) -> bool:
-              status, _ = machine.execute(f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}")
-              return status == 0
-
-          with machine.nested(f"Waiting for successful exec: {command}"):
-            retry(check_command, timeout)
-
-
-      def set_config(name: str, config: str, restart: bool = False, unset: bool = False):
-          if restart:
-              machine.succeed(f"incus stop {name}")
-
-          if unset:
-            machine.succeed(f"incus config unset {name} {config}")
-          else:
-            machine.succeed(f"incus config set {name} {config}")
-
-          if restart:
-              machine.succeed(f"incus start {name}")
-              wait_for_instance(name)
-          else:
-              # give a moment to settle
-              machine.sleep(1)
-
-
-      def cleanup():
-          # avoid conflict between preseed and cleanup operations
-          machine.execute("systemctl kill incus-preseed.service")
-
-          instances = json.loads(machine.succeed("incus list --format json --all-projects"))
-          with subtest("Stopping all running instances"):
-              for instance in [a for a in instances if a['status'] == 'Running']:
-                  machine.execute(f"incus stop --force {instance['name']} --project {instance['project']}")
-                  machine.execute(f"incus delete --force {instance['name']} --project {instance['project']}")
-
-
-      def check_sysctl(name: str):
-          with subtest("systemd sysctl settings are applied"):
-              machine.succeed(f"incus exec {name} -- systemctl status systemd-sysctl")
-              sysctl = machine.succeed(f"incus exec {name} -- sysctl net.ipv4.ip_forward").strip().split(" ")[-1]
-              assert "1" == sysctl, f"systemd-sysctl configuration not correctly applied, {sysctl} != 1"
-
-
-      with subtest("Wait for startup"):
-          machine.wait_for_unit("incus.service")
-          machine.wait_for_unit("incus-preseed.service")
-
-
-      with subtest("Verify preseed resources created"):
-          machine.succeed("incus profile show default")
-          machine.succeed("incus network info incusbr0")
-          machine.succeed("incus storage show default")
-
-    ''
-    + lib.optionalString appArmor ''
-      with subtest("Verify AppArmor service is started without issue"):
-          # restart AppArmor service since the Incus AppArmor folders are
-          # created after AA service is started
-          machine.systemctl("restart apparmor.service")
-          machine.succeed("systemctl --no-pager -l status apparmor.service")
-          machine.wait_for_unit("apparmor.service")
-    ''
-    + lib.optionalString instanceContainer (
-      lib.foldl (
-        acc: variant:
-        acc
-        # python
-        + ''
-          metadata = "${(images variant).container.metadata}"
-          rootfs = "${(images variant).container.rootfs}"
-          alias = "nixos/container/${variant}"
-          variant = "${variant}"
-
-          with subtest("container image can be imported"):
-              machine.succeed(f"incus image import {metadata} {rootfs} --alias {alias}")
-
-
-          with subtest("container can be launched and managed"):
-              machine.succeed(f"incus launch {alias} container-{variant}1")
-              wait_for_instance(f"container-{variant}1")
-
-
-          with subtest("container mounts lxcfs overlays"):
-              machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/cpuinfo type fuse.lxcfs'")
-              machine.succeed(f"incus exec container-{variant}1 mount | grep 'lxcfs on /proc/meminfo type fuse.lxcfs'")
-
-
-          with subtest("container CPU limits can be managed"):
-              set_config(f"container-{variant}1", "limits.cpu 1", restart=True)
-              wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^1$'", timeout=90)
-
-
-          with subtest("container CPU limits can be hotplug changed"):
-              set_config(f"container-{variant}1", "limits.cpu 2")
-              wait_incus_exec_success(f"container-{variant}1", "nproc | grep '^2$'", timeout=90)
-
-
-          with subtest("container memory limits can be managed"):
-              set_config(f"container-{variant}1", "limits.memory 128MB", restart=True)
-              wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*125000 kB' /proc/meminfo", timeout=90)
-
-
-          with subtest("container memory limits can be hotplug changed"):
-              set_config(f"container-{variant}1", "limits.memory 256MB")
-              wait_incus_exec_success(f"container-{variant}1", "grep 'MemTotal:[[:space:]]*250000 kB' /proc/meminfo", timeout=90)
-
-
-          with subtest("container software tpm can be configured"):
-              machine.succeed(f"incus config device add container-{variant}1 vtpm tpm path=/dev/tpm0 pathrm=/dev/tpmrm0")
-              machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpm0")
-              machine.succeed(f"incus exec container-{variant}1 -- test -e /dev/tpmrm0")
-              machine.succeed(f"incus config device remove container-{variant}1 vtpm")
-              machine.fail(f"incus exec container-{variant}1 -- test -e /dev/tpm0")
-
-
-          with subtest("container lxc-generator compatibility"):
-              with subtest("lxc-container generator configures plain container"):
-                  # default container is plain
-                  machine.succeed(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
-
-                  check_sysctl(f"container-{variant}1")
-
-              with subtest("lxc-container generator configures nested container"):
-                  set_config(f"container-{variant}1", "security.nesting=true", restart=True)
-
-                  machine.fail(f"incus exec container-{variant}1 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
-                  target = machine.succeed(f"incus exec container-{variant}1 readlink -- -f /run/systemd/system/systemd-binfmt.service").strip()
-                  assert target == "/dev/null", "lxc generator did not correctly mask /run/systemd/system/systemd-binfmt.service"
-
-                  check_sysctl(f"container-{variant}1")
-
-              with subtest("lxc-container generator configures privileged container"):
-                  # Create a new instance for a clean state
-                  machine.succeed(f"incus launch {alias} container-{variant}2")
-                  wait_for_instance(f"container-{variant}2")
-
-                  machine.succeed(f"incus exec container-{variant}2 test -- -e /run/systemd/system/service.d/zzz-lxc-service.conf")
-
-                  check_sysctl(f"container-{variant}2")
-
-          with subtest("container supports per-instance lxcfs"):
-              machine.succeed(f"incus stop container-{variant}1")
-              machine.fail(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'")
-
-              machine.succeed("incus config set instances.lxcfs.per_instance=true")
-
-              machine.succeed(f"incus start container-{variant}1")
-              wait_for_instance(f"container-{variant}1")
-              machine.succeed(f"pgrep -a lxcfs | grep 'incus/devices/container-{variant}1/lxcfs'")
-
-
-          with subtest("container can successfully restart"):
-              machine.succeed(f"incus restart container-{variant}1")
-              wait_for_instance(f"container-{variant}1")
-
-
-          with subtest("container remains running when softDaemonRestart is enabled and service is stopped"):
-              pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()
-              machine.succeed(f"ps {pid}")
-              machine.succeed("systemctl stop incus")
-              machine.succeed(f"ps {pid}")
-              machine.succeed("systemctl start incus")
-
-              with subtest("containers stop with incus-startup.service"):
-                  pid = machine.succeed(f"incus info container-{variant}1 | grep 'PID'").split(":")[1].strip()
-                  machine.succeed(f"ps {pid}")
-                  machine.succeed("systemctl stop incus-startup.service")
-                  machine.wait_until_fails(f"ps {pid}", timeout=120)
-                  machine.succeed("systemctl start incus-startup.service")
-
-
-          cleanup()
-        ''
-      ) "" initVariants
-    )
-    + lib.optionalString canTestVm (
-      (lib.foldl (
-        acc: variant:
-        acc
-        # python
-        + ''
-          metadata = "${(images variant).virtual-machine.metadata}"
-          disk = "${(images variant).virtual-machine.disk}"
-          alias = "nixos/virtual-machine/${variant}"
-          variant = "${variant}"
-
-          with subtest("virtual-machine image can be imported"):
-              machine.succeed(f"incus image import {metadata} {disk} --alias {alias}")
-
-
-          with subtest("virtual-machine can be created"):
-              machine.succeed(f"incus create {alias} vm-{variant}1 --vm --config limits.memory=512MB --config security.secureboot=false")
-
-
-          with subtest("virtual-machine software tpm can be configured"):
-              machine.succeed(f"incus config device add vm-{variant}1 vtpm tpm path=/dev/tpm0")
-
-
-          with subtest("virtual-machine can be launched and become available"):
-              machine.succeed(f"incus start vm-{variant}1")
-              wait_for_instance(f"vm-{variant}1")
-
-
-          with subtest("virtual-machine incus-agent is started"):
-              machine.succeed(f"incus exec vm-{variant}1 systemctl is-active incus-agent")
-
-
-          with subtest("virtual-machine incus-agent has a valid path"):
-              machine.succeed(f"incus exec vm-{variant}1 -- bash -c 'true'")
-
-
-          with subtest("virtual-machine CPU limits can be managed"):
-              set_config(f"vm-{variant}1", "limits.cpu 1", restart=True)
-              wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^1$'", timeout=90)
-
-
-          with subtest("virtual-machine CPU limits can be hotplug changed"):
-              set_config(f"vm-{variant}1", "limits.cpu 2")
-              wait_incus_exec_success(f"vm-{variant}1", "nproc | grep '^2$'", timeout=90)
-
-
-          with subtest("virtual-machine can successfully restart"):
-              machine.succeed(f"incus restart vm-{variant}1")
-              wait_for_instance(f"vm-{variant}1")
-
-
-          with subtest("virtual-machine remains running when softDaemonRestart is enabled and service is stopped"):
-              pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip()
-              machine.succeed(f"ps {pid}")
-              machine.succeed("systemctl stop incus")
-              machine.succeed(f"ps {pid}")
-              machine.succeed("systemctl start incus")
-
-
-              with subtest("virtual-machines stop with incus-startup.service"):
-                  pid = machine.succeed(f"incus info vm-{variant}1 | grep 'PID'").split(":")[1].strip()
-                  machine.succeed(f"ps {pid}")
-                  machine.succeed("systemctl stop incus-startup.service")
-                  machine.wait_until_fails(f"ps {pid}", timeout=120)
-                  machine.succeed("systemctl start incus-startup.service")
-
-
-          cleanup()
-        ''
-      ) "" initVariants)
-      +
-        # python
-        ''
-          with subtest("virtual-machine can launch CSM (BIOS)"):
-              machine.succeed("incus init csm --vm --empty -c security.csm=true -c security.secureboot=false")
-              machine.succeed("incus start csm")
-
-
-          cleanup()
-        ''
-    )
+  testScript =
+    lib.readFile ./incus_machine.py
     +
-      lib.optionalString featureUser # python
-        ''
-          with subtest("incus-user allows restricted access for users"):
-              machine.fail("incus project show user-1000")
-              machine.succeed("su - testuser bash -c 'incus list'")
-              # a project is created dynamically for the user
-              machine.succeed("incus project show user-1000")
-              # users shouldn't be able to list storage pools
-              machine.fail("su - testuser bash -c 'incus storage list'")
-
-
-          with subtest("incus-user allows users to launch instances"):
-              machine.succeed("su - testuser bash -c 'incus image import ${(images "systemd").container.metadata} ${(images "systemd").container.rootfs} --alias nixos'")
-              machine.succeed("su - testuser bash -c 'incus launch nixos instance2'")
-              wait_for_instance("instance2", "user-1000")
-
-          cleanup()
-        ''
+      # python
+      ''
+        server = IncusHost(machine)
+      ''
     +
-      lib.optionalString networkOvs # python
+      lib.optionalString cfg.network.ovs # python
         ''
           with subtest("Verify openvswitch bridge"):
-              machine.succeed("incus network info ovsbr0")
+              server.succeed("incus network info ovsbr0")
 
 
           with subtest("Verify openvswitch bridge"):
-              machine.succeed("ovs-vsctl br-exists ovsbr0")
+              server.succeed("ovs-vsctl br-exists ovsbr0")
         ''
 
     +
-      lib.optionalString storageZfs # python
+      lib.optionalString cfg.storage.zfs # python
         ''
           with subtest("Verify zfs pool created and usable"):
-              machine.succeed(
+              server.succeed(
                   "zpool status",
                   "parted --script /dev/vdb mklabel gpt",
                   "zpool create zfs_pool /dev/vdb",
               )
 
-              machine.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
-              machine.succeed("zfs list zfs_pool/incus")
+              server.succeed("incus storage create zfs_pool zfs source=zfs_pool/incus")
+              server.succeed("zfs list zfs_pool/incus")
 
-              machine.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
-              machine.succeed("incus storage volume create zfs_pool test_vol --type block")
+              server.succeed("incus storage volume create zfs_pool test_fs --type filesystem")
+              server.succeed("incus storage volume create zfs_pool test_vol --type block")
 
-              machine.succeed("incus storage show zfs_pool")
-              machine.succeed("incus storage volume list zfs_pool")
-              machine.succeed("incus storage volume show zfs_pool test_fs")
-              machine.succeed("incus storage volume show zfs_pool test_vol")
+              server.succeed("incus storage show zfs_pool")
+              server.succeed("incus storage volume list zfs_pool")
+              server.succeed("incus storage volume show zfs_pool test_fs")
+              server.succeed("incus storage volume show zfs_pool test_vol")
 
-              machine.succeed("incus create zfs1 --empty --storage zfs_pool")
-              machine.succeed("incus list zfs1")
+              server.succeed("incus create zfs1 --empty --storage zfs_pool")
+              server.succeed("incus list zfs1")
         ''
 
     +
-      lib.optionalString storageLvm # python
+      lib.optionalString cfg.storage.lvm # python
         ''
           with subtest("Verify lvm pool created and usable"):
-              machine.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")
-              machine.succeed("vgs incus_pool")
+              server.succeed("incus storage create lvm_pool lvm source=/dev/vdc lvm.vg_name=incus_pool")
+              server.succeed("vgs incus_pool")
 
-              machine.succeed("incus storage volume create lvm_pool test_fs --type filesystem")
-              machine.succeed("incus storage volume create lvm_pool test_vol --type block")
+              server.succeed("incus storage volume create lvm_pool test_fs --type filesystem")
+              server.succeed("incus storage volume create lvm_pool test_vol --type block")
 
-              machine.succeed("incus storage show lvm_pool")
+              server.succeed("incus storage show lvm_pool")
 
-              machine.succeed("incus storage volume list lvm_pool")
-              machine.succeed("incus storage volume show lvm_pool test_fs")
-              machine.succeed("incus storage volume show lvm_pool test_vol")
+              server.succeed("incus storage volume list lvm_pool")
+              server.succeed("incus storage volume show lvm_pool test_fs")
+              server.succeed("incus storage volume show lvm_pool test_vol")
 
-              machine.succeed("incus create lvm1 --empty --storage lvm_pool")
-              machine.succeed("incus list lvm1")
-        '';
-  }
-)
+              server.succeed("incus create lvm1 --empty --storage lvm_pool")
+              server.succeed("incus list lvm1")
+        ''
+    +
+      lib.optionalString cfg.appArmor # python
+        ''
+          with subtest("Verify AppArmor service is started without issue"):
+              # restart AppArmor service since the Incus AppArmor folders are
+              # created after AA service is started
+              server.systemctl("restart apparmor.service")
+              server.succeed("systemctl --no-pager -l status apparmor.service")
+              server.wait_for_unit("apparmor.service")
+        ''
+    +
+      lib.optionalString cfg.feature.user # python
+        ''
+          with subtest("incus-user allows restricted access for users"):
+              server.fail("incus project show user-1000")
+              server.succeed("su - testuser bash -c 'incus list'")
+              # a project is created dynamically for the user
+              server.succeed("incus project show user-1000")
+              # users shouldn't be able to list storage pools
+              server.fail("su - testuser bash -c 'incus storage list'")
+              # user can create an instance
+              server.succeed("su - testuser bash -c 'incus create --empty'")
+        ''
+    + instanceScript;
+}
diff --git a/nixos/tests/incus/incus_machine.py b/nixos/tests/incus/incus_machine.py
new file mode 100644
index 000000000000..c25a7804b871
--- /dev/null
+++ b/nixos/tests/incus/incus_machine.py
@@ -0,0 +1,92 @@
+import json
+
+
+class IncusHost(Machine):
+    def __init__(self, base):
+        with subtest("Wait for startup"):
+            base.wait_for_unit("incus.service")
+            base.wait_for_unit("incus-preseed.service")
+
+        with subtest("Verify preseed resources created"):
+            base.succeed("incus profile show default")
+            base.succeed("incus network info incusbr0")
+            base.succeed("incus storage show default")
+
+        self._parent = base
+
+    # delegate attribute access to the parent
+    def __getattr__(self, name):
+        return getattr(self._parent, name)
+
+    def instance_exec(self, name: str, command: str, project: str = "default"):
+        return super().execute(
+            f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}"
+        )
+
+    def instance_succeed(self, name: str, command: str, project: str = "default"):
+        return super().succeed(
+            f"incus exec {name} --disable-stdin --force-interactive --project {project} -- {command}"
+        )
+
+    def wait_for_instance(self, name: str, project: str = "default"):
+        self.wait_instance_exec_success(
+            name,
+            "/run/current-system/sw/bin/systemctl is-system-running",
+            project=project,
+        )
+
+    def wait_instance_exec_success(
+        self, name: str, command: str, timeout: int = 900, project: str = "default"
+    ):
+        def check_command(_) -> bool:
+            status, _ = self.instance_exec(name, command, project)
+            return status == 0
+
+        with super().nested(
+            f"Waiting for successful instance exec, instance={name}, project={project}, command={command}"
+        ):
+            retry(check_command, timeout)
+
+    def set_instance_config(
+        self, name: str, config: str, restart: bool = False, unset: bool = False
+    ):
+        if restart:
+            super().succeed(f"incus stop {name}")
+
+        if unset:
+            super().succeed(f"incus config unset {name} {config}")
+        else:
+            super().succeed(f"incus config set {name} {config}")
+
+        if restart:
+            super().succeed(f"incus start {name}")
+            self.wait_for_instance(name)
+        else:
+            # give a moment to settle
+            super().sleep(1)
+
+    def cleanup(self):
+        # avoid conflict between preseed and cleanup operations
+        super().execute("systemctl kill incus-preseed.service")
+
+        instances = json.loads(
+            super().succeed("incus list --format json --all-projects")
+        )
+        for instance in [a for a in instances if a["status"] == "Running"]:
+            super().execute(
+                f"incus stop --force {instance['name']} --project {instance['project']}"
+            )
+            super().execute(
+                f"incus delete --force {instance['name']} --project {instance['project']}"
+            )
+
+    def check_instance_sysctl(self, name: str, project: str = "default"):
+        self.instance_succeed(name, "systemctl status systemd-sysctl", project)
+        sysctl = (
+            self.instance_succeed(name, "sysctl net.ipv4.ip_forward", project)
+            .strip()
+            .split(" ")[-1]
+        )
+        assert "1" == sysctl, (
+            f"systemd-sysctl configuration not correctly applied, {sysctl} != 1"
+        )
diff --git a/nixos/tests/incus/ui.nix b/nixos/tests/incus/ui.nix
index 300388a19f93..ca7b8c4cd0fa 100644
--- a/nixos/tests/incus/ui.nix
+++ b/nixos/tests/incus/ui.nix
@@ -1,84 +1,82 @@
-import ../make-test-python.nix (
-  {
-    pkgs,
-    lib,
-    lts ? true,
-    ...
-  }:
-  {
-    name = "incus-ui";
+{
+  pkgs,
+  lib,
+  package,
+  ...
+}:
+{
+  name = "incus-ui";
 
-    meta = {
-      maintainers = lib.teams.lxc.members;
-    };
+  meta = {
+    maintainers = lib.teams.lxc.members;
+  };
 
-    nodes.machine =
-      { lib, ... }:
-      {
+  nodes.machine =
+    { lib, ... }:
+    {
 
-        virtualisation.incus = {
-          enable = true;
-          package = if lts then pkgs.incus-lts else pkgs.incus;
+      virtualisation.incus = {
+        enable = true;
+        inherit package;
 
-          preseed.config."core.https_address" = ":8443";
-          ui.enable = true;
-        };
-
-        networking.nftables.enable = true;
-
-        environment.systemPackages =
-          let
-            seleniumScript =
-              pkgs.writers.writePython3Bin "selenium-script"
-                {
-                  libraries = with pkgs.python3Packages; [ selenium ];
-                }
-                ''
-                  from selenium import webdriver
-                  from selenium.webdriver.common.by import By
-                  from selenium.webdriver.firefox.options import Options
-                  from selenium.webdriver.support.ui import WebDriverWait
-
-                  options = Options()
-                  options.add_argument("--headless")
-                  service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
-
-                  driver = webdriver.Firefox(options=options, service=service)
-                  driver.implicitly_wait(10)
-                  driver.get("https://localhost:8443/ui")
-
-                  wait = WebDriverWait(driver, 60)
-
-                  assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0
-                  assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0
-
-                  driver.close()
-                '';
-          in
-          with pkgs;
-          [
-            curl
-            firefox-unwrapped
-            geckodriver
-            seleniumScript
-          ];
+        preseed.config."core.https_address" = ":8443";
+        ui.enable = true;
       };
 
-    testScript = ''
-      machine.wait_for_unit("incus.service")
-      machine.wait_for_unit("incus-preseed.service")
+      networking.nftables.enable = true;
 
-      # Check that the INCUS_UI environment variable is populated in the systemd unit
-      machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'")
+      environment.systemPackages =
+        let
+          seleniumScript =
+            pkgs.writers.writePython3Bin "selenium-script"
+              {
+                libraries = with pkgs.python3Packages; [ selenium ];
+              }
+              ''
+                from selenium import webdriver
+                from selenium.webdriver.common.by import By
+                from selenium.webdriver.firefox.options import Options
+                from selenium.webdriver.support.ui import WebDriverWait
 
-      # Ensure the endpoint returns an HTML page with 'Incus UI' in the title
-      machine.succeed("curl -kLs https://localhost:8443/ui | grep '<title>Incus UI</title>'")
+                options = Options()
+                options.add_argument("--headless")
+                service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
 
-      # Ensure the documentation is rendering correctly
-      machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep '<title>Incus documentation</title>'")
+                driver = webdriver.Firefox(options=options, service=service)
+                driver.implicitly_wait(10)
+                driver.get("https://localhost:8443/ui")
 
-      # Ensure the application is actually rendered by the Javascript
-      machine.succeed("PYTHONUNBUFFERED=1 selenium-script")
-    '';
-  }
-)
+                wait = WebDriverWait(driver, 60)
+
+                assert len(driver.find_elements(By.CLASS_NAME, "l-application")) > 0
+                assert len(driver.find_elements(By.CLASS_NAME, "l-navigation__drawer")) > 0
+
+                driver.close()
+              '';
+        in
+        with pkgs;
+        [
+          curl
+          firefox-unwrapped
+          geckodriver
+          seleniumScript
+        ];
+    };
+
+  testScript = ''
+    machine.wait_for_unit("incus.service")
+    machine.wait_for_unit("incus-preseed.service")
+
+    # Check that the INCUS_UI environment variable is populated in the systemd unit
+    machine.succeed("systemctl cat incus.service | grep 'INCUS_UI'")
+
+    # Ensure the endpoint returns an HTML page with 'Incus UI' in the title
+    machine.succeed("curl -kLs https://localhost:8443/ui | grep '<title>Incus UI</title>'")
+
+    # Ensure the documentation is rendering correctly
+    machine.succeed("curl -kLs https://localhost:8443/documentation/ | grep '<title>Incus documentation</title>'")
+
+    # Ensure the application is actually rendered by the Javascript
+    machine.succeed("PYTHONUNBUFFERED=1 selenium-script")
+  '';
+}
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index f911c43b0a68..d9df8f820ee7 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1451,9 +1451,9 @@ in
           "cat /proc/partitions >&2",
           "udevadm control --stop-exec-queue",
           "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 "
-          + "--raid-devices=2 /dev/vda5 /dev/vda6",
+          + "--raid-devices=2 --bitmap=internal /dev/vda5 /dev/vda6",
           "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 "
-          + "--raid-devices=2 /dev/vda7 /dev/vda8",
+          + "--raid-devices=2 --bitmap=internal /dev/vda7 /dev/vda8",
           "udevadm control --start-exec-queue",
           "udevadm settle",
           "mkswap -f /dev/md1 -L swap",
diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix
index 6b4a962e029f..e8fb233bccd5 100644
--- a/nixos/tests/jellyfin.nix
+++ b/nixos/tests/jellyfin.nix
@@ -4,12 +4,12 @@
   name = "jellyfin";
   meta.maintainers = with lib.maintainers; [ minijackson ];
 
-  nodes.machine =
-    { ... }:
-    {
-      services.jellyfin.enable = true;
-      environment.systemPackages = with pkgs; [ ffmpeg ];
-    };
+  nodes.machine = {
+    services.jellyfin.enable = true;
+    environment.systemPackages = with pkgs; [ ffmpeg ];
+    # Jellyfin fails to start if the data dir doesn't have at least 2GiB of free space
+    virtualisation.diskSize = 3 * 1024;
+  };
 
   # Documentation of the Jellyfin API: https://api.jellyfin.org/
   # Beware, this link can be resource intensive
@@ -30,6 +30,7 @@
 
       machine.wait_for_unit("jellyfin.service")
       machine.wait_for_open_port(8096)
+      machine.wait_until_succeeds("journalctl --since -1m --unit jellyfin --grep 'Startup complete'")
       machine.succeed("curl --fail http://localhost:8096/")
 
       machine.wait_until_succeeds("curl --fail http://localhost:8096/health | grep Healthy")
@@ -105,7 +106,7 @@
           folders_str = machine.succeed(api_get("/Library/VirtualFolders"))
           folders = json.loads(folders_str)
           print(folders)
-          return all(folder["RefreshStatus"] == "Idle" for folder in folders)
+          return all(folder.get("RefreshStatus") == "Idle" for folder in folders)
 
 
       retry(is_refreshed)
diff --git a/nixos/tests/k3s/auto-deploy-charts.nix b/nixos/tests/k3s/auto-deploy-charts.nix
index 827640b02fd4..18339e201482 100644
--- a/nixos/tests/k3s/auto-deploy-charts.nix
+++ b/nixos/tests/k3s/auto-deploy-charts.nix
@@ -82,15 +82,16 @@ import ../make-test-python.nix (
             values-file = testChart // {
               # Remove unsafeDiscardStringContext workaround when Nix can convert a string to a path
               # https://github.com/NixOS/nix/issues/12407
-              values = /.
-              + builtins.unsafeDiscardStringContext (
-                builtins.toFile "k3s-test-chart-values.yaml" ''
-                  runCommand: "echo 'Hello, file!'"
-                  image:
-                    repository: test.local/test
-                    tag: local
-                ''
-              );
+              values =
+                /.
+                + builtins.unsafeDiscardStringContext (
+                  builtins.toFile "k3s-test-chart-values.yaml" ''
+                    runCommand: "echo 'Hello, file!'"
+                    image:
+                      repository: test.local/test
+                      tag: local
+                  ''
+                );
             };
             # advanced chart that should get installed in the "test" namespace with a custom
             # timeout and overridden values
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 547de0d1ac8f..1e6b39be7eba 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -4,7 +4,7 @@ let
   serverDomain = certs.domain;
 
   # copy certs to store to work around mount namespacing
-  certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } ''
+  certsPath = pkgs.runCommand "snakeoil-certs" { } ''
     mkdir $out
     cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
     cp ${certs."${serverDomain}".key} $out/snakeoil.key
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index 9d918f156b2c..78f71fce90c6 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -8,7 +8,7 @@ let
   };
 
   # copy certs to store to work around mount namespacing
-  certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } ''
+  certsPath = pkgs.runCommand "snakeoil-certs" { } ''
     mkdir $out
     cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
     cp ${certs."${serverDomain}".key} $out/snakeoil.key
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
deleted file mode 100644
index 7d15e8bdc11a..000000000000
--- a/nixos/tests/kernel-generic.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  system ? builtins.currentSystem,
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-}@args:
-
-with pkgs.lib;
-
-let
-  testsForLinuxPackages =
-    linuxPackages:
-    (import ./make-test-python.nix (
-      { pkgs, ... }:
-      {
-        name = "kernel-${linuxPackages.kernel.version}";
-        meta = with pkgs.lib.maintainers; {
-          maintainers = [
-            nequissimus
-            atemu
-            ma27
-          ];
-        };
-
-        nodes.machine =
-          { ... }:
-          {
-            boot.kernelPackages = linuxPackages;
-          };
-
-        testScript = ''
-          assert "Linux" in machine.succeed("uname -s")
-          assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
-        '';
-      }
-    ) args);
-  kernels = pkgs.linuxKernel.vanillaPackages // {
-    inherit (pkgs.linuxKernel.packages)
-      linux_6_12_hardened
-      linux_rt_5_4
-      linux_rt_5_10
-      linux_rt_5_15
-      linux_rt_6_1
-      linux_rt_6_6
-      linux_libre
-
-      linux_testing
-      ;
-  };
-
-in
-mapAttrs (_: lP: testsForLinuxPackages lP) kernels
-// {
-  passthru = {
-    inherit testsForLinuxPackages;
-
-    # Useful for development testing of all Kernel configs without building full Kernel
-    configfiles = mapAttrs (_: lP: lP.kernel.configfile) kernels;
-
-    testsForKernel = kernel: testsForLinuxPackages (pkgs.linuxPackagesFor kernel);
-  };
-}
diff --git a/nixos/tests/kernel-generic/default.nix b/nixos/tests/kernel-generic/default.nix
new file mode 100644
index 000000000000..60337d82bb70
--- /dev/null
+++ b/nixos/tests/kernel-generic/default.nix
@@ -0,0 +1,105 @@
+{
+  system ? builtins.currentSystem,
+  config ? { },
+  pkgs ? import ../.. { inherit system config; },
+}@args:
+
+with pkgs.lib;
+
+let
+  patchedPkgs = pkgs.extend (
+    final: prev: {
+      kernelPackagesExtensions = prev.kernelPackagesExtensions ++ [
+        (
+          finalKernelPackages: _:
+          let
+            finalKernel = finalKernelPackages.kernel;
+          in
+          {
+            hello-world = final.stdenv.mkDerivation {
+              name = "hello-module";
+
+              nativeBuildInputs = finalKernel.moduleBuildDependencies;
+              makeFlags = finalKernel.commonMakeFlags ++ [
+                # Variable refers to the local Makefile.
+                "KDIR=${finalKernel.dev}/lib/modules/${finalKernel.modDirVersion}/build"
+                # Variable of the Linux src tree's main Makefile.
+                "INSTALL_MOD_PATH=$(out)"
+              ];
+
+              buildFlags = [ "modules" ];
+              installTargets = [ "modules_install" ];
+
+              src = ./hello-world-src;
+            };
+          }
+        )
+      ];
+    }
+  );
+
+  testsForLinuxPackages =
+    linuxPackages:
+    (import ../make-test-python.nix (
+      { pkgs, ... }:
+      {
+        name = "kernel-${linuxPackages.kernel.version}";
+        meta = with pkgs.lib.maintainers; {
+          maintainers = [
+            nequissimus
+            atemu
+            ma27
+          ];
+        };
+
+        nodes.machine =
+          { config, ... }:
+          {
+            # we could/would do something like below, but linuxPackages comes from outside
+            # the machine closure, so an overlay doesn't apply to the kernelPackages.
+            # nixpkgs.overlays = [
+            #   (final: prev: {
+            #     kernelPackagesExtensions = prev.kernelPackagesExtensions ++ [ helloWorldExtension ];
+            #   })
+            # ]
+
+            boot.kernelPackages = linuxPackages;
+
+            boot.extraModulePackages = [ config.boot.kernelPackages.hello-world ];
+
+            boot.kernelModules = [ "hello" ];
+          };
+
+        testScript = ''
+          assert "Linux" in machine.succeed("uname -s")
+          assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a")
+
+          assert "Hello world!" in machine.succeed("dmesg")
+        '';
+      }
+    ) args);
+  kernels = patchedPkgs.linuxKernel.vanillaPackages // {
+    inherit (patchedPkgs.linuxKernel.packages)
+      linux_6_12_hardened
+      linux_rt_5_10
+      linux_rt_5_15
+      linux_rt_6_1
+      linux_rt_6_6
+      linux_libre
+
+      linux_testing
+      ;
+  };
+
+in
+mapAttrs (_: lP: testsForLinuxPackages lP) kernels
+// {
+  passthru = {
+    inherit testsForLinuxPackages;
+
+    # Useful for development testing of all Kernel configs without building full Kernel
+    configfiles = mapAttrs (_: lP: lP.kernel.configfile) kernels;
+
+    testsForKernel = kernel: testsForLinuxPackages (patchedPkgs.linuxPackagesFor kernel);
+  };
+}
diff --git a/nixos/tests/kernel-generic/hello-world-src/Makefile b/nixos/tests/kernel-generic/hello-world-src/Makefile
new file mode 100644
index 000000000000..e6931ae44d7c
--- /dev/null
+++ b/nixos/tests/kernel-generic/hello-world-src/Makefile
@@ -0,0 +1,15 @@
+ifneq ($(KERNELRELEASE),)
+# kbuild part of makefile
+obj-m := hello.o
+else
+# normal makefile
+KDIR ?= /lib/modules/`uname -r`/build
+
+.PHONY: modules
+modules:
+	$(MAKE) -C $(KDIR) M=$$PWD modules
+
+.PHONY: modules_install
+modules_install:
+	$(MAKE) -C $(KDIR) M=$$PWD modules_install
+endif
diff --git a/nixos/tests/kernel-generic/hello-world-src/hello.c b/nixos/tests/kernel-generic/hello-world-src/hello.c
new file mode 100644
index 000000000000..abdf1c85903a
--- /dev/null
+++ b/nixos/tests/kernel-generic/hello-world-src/hello.c
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+#include <linux/module.h>
+#include <linux/printk.h>
+
+static int hello(void)
+{
+	pr_info("Hello world!");
+	return 0;
+}
+module_init(hello);
+
+static void goodbye(void)
+{
+	pr_info("Goodbye");
+}
+module_exit(goodbye);
+
+MODULE_LICENSE("MIT");
diff --git a/nixos/tests/kismet.nix b/nixos/tests/kismet.nix
index 878a341cedea..b4f2aac21184 100644
--- a/nixos/tests/kismet.nix
+++ b/nixos/tests/kismet.nix
@@ -69,7 +69,7 @@ in
         };
 
       station =
-        { config, ... }:
+        { config, pkgs, ... }:
         {
           networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
             {
@@ -98,10 +98,11 @@ in
               inherit serverAddress;
             };
           };
+          environment.systemPackages = [ pkgs.nettools ];
         };
 
       monitor =
-        { config, ... }:
+        { config, pkgs, ... }:
         {
           networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
             {
@@ -189,10 +190,10 @@ in
             };
           };
 
-          environment.systemPackages = with pkgs; [
+          environment.systemPackages = [
             config.services.kismet.package
             config.services.vwifi.package
-            jq
+            pkgs.jq
           ];
         };
     };
diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index ff943ef17763..8a6756b8f9e5 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -18,9 +18,7 @@ let
     }:
     let
       masterName = head (
-        filter (machineName: any (role: role == "master") machines.${machineName}.roles) (
-          attrNames machines
-        )
+        filter (machineName: lib.elem "master" machines.${machineName}.roles) (attrNames machines)
       );
       master = machines.${masterName};
       extraHosts = ''
diff --git a/nixos/tests/kubo/default.nix b/nixos/tests/kubo/default.nix
index 629922fc366d..a28df9823ebf 100644
--- a/nixos/tests/kubo/default.nix
+++ b/nixos/tests/kubo/default.nix
@@ -1,5 +1,5 @@
-{ recurseIntoAttrs, runTest }:
-recurseIntoAttrs {
+{ lib, runTest }:
+lib.recurseIntoAttrs {
   kubo = runTest ./kubo.nix;
   kubo-fuse = runTest ./kubo-fuse.nix;
 }
diff --git a/nixos/tests/limine/secure-boot.nix b/nixos/tests/limine/secure-boot.nix
index 52508f7eb385..9811734db5cb 100644
--- a/nixos/tests/limine/secure-boot.nix
+++ b/nixos/tests/limine/secure-boot.nix
@@ -26,10 +26,12 @@
       boot.loader.limine.secureBoot.enable = true;
       boot.loader.limine.secureBoot.createAndEnrollKeys = true;
       boot.loader.timeout = 0;
+
+      environment.systemPackages = [ pkgs.mokutil ];
     };
 
   testScript = ''
     machine.start()
-    assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status")
+    assert "SecureBoot enabled" in machine.succeed("mokutil --sb-state")
   '';
 }
diff --git a/nixos/tests/logkeys.nix b/nixos/tests/logkeys.nix
new file mode 100644
index 000000000000..eeb4c27ee2b0
--- /dev/null
+++ b/nixos/tests/logkeys.nix
@@ -0,0 +1,34 @@
+{ lib, ... }:
+{
+  name = "logkeys";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      imports = [ ./common/user-account.nix ];
+
+      services.getty.autologinUser = "alice";
+
+      services.logkeys = {
+        enable = true;
+        device = "virtio-kbd";
+      };
+
+      # logkeys doesn't support specifying a device in `by-path`.
+      # In order not to make the test dependend on the ordering of the input event devices,
+      # we'll create a custom symlink before starting the service.
+      systemd.services.logkeys.serviceConfig.ExecStartPre = [
+        "+${lib.getExe' pkgs.coreutils "ln"} -s /dev/input/by-path/pci-0000:00:0a.0-event-kbd /dev/input/virtio-kbd"
+      ];
+    };
+
+  testScript = ''
+    machine.wait_for_unit("getty@tty1.service")
+    machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+    machine.wait_for_unit("logkeys.service")
+
+    machine.send_chars("hello world\n")
+    machine.wait_until_succeeds("grep 'hello world' /var/log/logkeys.log")
+  '';
+}
diff --git a/nixos/tests/lxqt.nix b/nixos/tests/lxqt.nix
index 595b6dc3f9ba..a7b8120016aa 100644
--- a/nixos/tests/lxqt.nix
+++ b/nixos/tests/lxqt.nix
@@ -42,7 +42,8 @@
           machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if LXQt components actually start"):
           for i in ["openbox", "lxqt-session", "pcmanfm-qt", "lxqt-panel", "lxqt-runner"]:
diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix
index 45fd877c1ca4..81948d5a1ae1 100644
--- a/nixos/tests/mate.nix
+++ b/nixos/tests/mate.nix
@@ -41,7 +41,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if MATE session components actually start"):
           machine.wait_until_succeeds("pgrep marco")
diff --git a/nixos/tests/matrix/conduit.nix b/nixos/tests/matrix/conduit.nix
index 874e7672812b..02bf00886ba4 100644
--- a/nixos/tests/matrix/conduit.nix
+++ b/nixos/tests/matrix/conduit.nix
@@ -18,7 +18,7 @@ in
         virtualHosts.${name} = {
           enableACME = false;
           forceSSL = false;
-          enableSSL = false;
+          onlySSL = false;
 
           locations."/_matrix" = {
             proxyPass = "http://[::1]:6167";
diff --git a/nixos/tests/matter-server.nix b/nixos/tests/matter-server.nix
index 167cee21e07b..6d919850f3ce 100644
--- a/nixos/tests/matter-server.nix
+++ b/nixos/tests/matter-server.nix
@@ -16,6 +16,7 @@ in
         services.matter-server = {
           enable = true;
           port = 1234;
+          openFirewall = true;
         };
       };
   };
@@ -43,6 +44,9 @@ in
         with subtest("Check storage directory is created"):
             machine.succeed("ls /var/lib/matter-server/chip.json")
 
+        with subtest("Check dashboard loads"):
+            machine.succeed("curl -f 127.0.0.1:1234")
+
         with subtest("Check systemd hardening"):
             _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'")
             machine.log(output)
diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index 2783390b9082..bc795c2f5940 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -69,27 +69,11 @@ import ../make-test-python.nix (
         )
         extraConfig
       ];
-
-    makeMysql =
-      mattermostConfig: extraConfig:
-      lib.mkMerge [
-        mattermostConfig
-        (
-          { pkgs, config, ... }:
-          {
-            services.mattermost.database = {
-              driver = lib.mkForce "mysql";
-              peerAuth = lib.mkForce true;
-            };
-          }
-        )
-        extraConfig
-      ];
   in
   {
     name = "mattermost";
 
-    nodes = rec {
+    nodes = {
       postgresMutable = makeMattermost {
         mutableConfig = true;
         preferNixConfig = false;
@@ -174,25 +158,6 @@ import ../make-test-python.nix (
           MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
         '';
       } { };
-
-      mysqlMutable = makeMysql postgresMutable { };
-      mysqlMostlyMutable = makeMysql postgresMostlyMutable { };
-      mysqlImmutable = makeMysql postgresImmutable {
-        # Let's try to use this on MySQL.
-        services.mattermost.database = {
-          peerAuth = lib.mkForce true;
-          user = lib.mkForce "mmuser";
-          name = lib.mkForce "mmuser";
-        };
-      };
-      mysqlEnvironmentFile = makeMysql postgresEnvironmentFile {
-        services.mattermost.environmentFile = lib.mkForce (
-          pkgs.writeText "mattermost-env" ''
-            MM_SQLSETTINGS_DATASOURCE=mattermost@unix(/run/mysqld/mysqld.sock)/mattermost?charset=utf8mb4,utf8&writeTimeout=30s
-            MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
-          ''
-        );
-      };
     };
 
     testScript =
@@ -567,22 +532,6 @@ import ../make-test-python.nix (
             shutdown_queue.task_done()
         threading.Thread(target=shutdown_worker, daemon=True).start()
 
-        ${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
-          # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.
-          run_mattermost_tests(
-            shutdown_queue,
-            "${nodes.mysqlMutable.system.build.toplevel}",
-            mysqlMutable,
-            "${nodes.mysqlMostlyMutable.system.build.toplevel}",
-            "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}",
-            mysqlMostlyMutable,
-            "${nodes.mysqlImmutable.system.build.toplevel}",
-            mysqlImmutable,
-            "${nodes.mysqlEnvironmentFile.system.build.toplevel}",
-            mysqlEnvironmentFile
-          )
-        ''}
-
         run_mattermost_tests(
           shutdown_queue,
           "${nodes.postgresMutable.system.build.toplevel}",
diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix
index 87415eeff7c7..549dd4966439 100644
--- a/nixos/tests/miniflux.nix
+++ b/nixos/tests/miniflux.nix
@@ -80,9 +80,6 @@ in
             host sameuser miniflux samenet scram-sha-256
           '';
         };
-        systemd.services.postgresql-setup.postStart = lib.mkAfter ''
-          psql -tAd miniflux -c 'CREATE EXTENSION hstore;'
-        '';
         networking.firewall.allowedTCPPorts = [ config.services.postgresql.settings.port ];
       };
     externalDb =
diff --git a/nixos/tests/mpich-example.c b/nixos/tests/mpich-example.c
deleted file mode 100644
index c48e3c45b72e..000000000000
--- a/nixos/tests/mpich-example.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <mpi.h>
-
-int
-main (int argc, char *argv[])
-{
-  int rank, size, length;
-  char name[BUFSIZ];
-
-  MPI_Init (&argc, &argv);
-  MPI_Comm_rank (MPI_COMM_WORLD, &rank);
-  MPI_Comm_size (MPI_COMM_WORLD, &size);
-  MPI_Get_processor_name (name, &length);
-
-  printf ("%s: hello world from process %d of %d\n", name, rank, size);
-
-  MPI_Finalize ();
-
-  return EXIT_SUCCESS;
-}
diff --git a/nixos/tests/munge.nix b/nixos/tests/munge.nix
new file mode 100644
index 000000000000..38c47224b959
--- /dev/null
+++ b/nixos/tests/munge.nix
@@ -0,0 +1,28 @@
+{ lib, ... }:
+{
+  name = "munge";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      imports = [ ./common/user-account.nix ];
+
+      services.munge.enable = true;
+    };
+
+  testScript =
+    { nodes }:
+    let
+      aliceUid = toString nodes.machine.users.users.alice.uid;
+    in
+    ''
+      machine.succeed("mkdir -p /etc/munge && echo '${lib.strings.replicate 5 "hunter2"}' > /etc/munge/munge.key && chown munge: /etc/munge/munge.key")
+      machine.systemctl("restart munged.service")
+      machine.wait_for_unit("munged.service")
+
+      machine.succeed("sudo -u bob -- munge -u ${aliceUid} -s 'top secret' -o ./secret.txt")
+      machine.succeed("grep -v 'top secret' ./secret.txt")
+      machine.succeed("sudo -u alice unmunge -i ./secret.txt | grep 'top secret'")
+    '';
+}
diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix
index 56ffabaca1ed..673e322f786b 100644
--- a/nixos/tests/n8n.nix
+++ b/nixos/tests/n8n.nix
@@ -23,7 +23,7 @@ in
 
       services.n8n = {
         enable = true;
-        webhookUrl = webhookUrl;
+        environment.WEBHOOK_URL = webhookUrl;
       };
     };
 
@@ -32,5 +32,7 @@ in
     machine.wait_for_console_text("Editor is now accessible via")
     machine.succeed("curl --fail -vvv http://localhost:${toString port}/")
     machine.succeed("grep -qF ${webhookUrl} /etc/systemd/system/n8n.service")
+    machine.succeed("grep -qF 'HOME=/var/lib/n8n' /etc/systemd/system/n8n.service")
+    machine.fail("grep -qF 'GENERIC_TIMEZONE=' /etc/systemd/system/n8n.service")
   '';
 }
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
index b69a520bf544..f452a4bf1218 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@@ -30,8 +30,8 @@ let
         }
       ];
 
-      adminuser = "root";
-      adminpass = "hunter2";
+      adminuser = pkgs.lib.mkDefault "root";
+      adminpass = pkgs.lib.mkDefault "hunter2";
 
       test-helpers.rclone = "${pkgs.writeShellScript "rclone" ''
         set -euo pipefail
@@ -129,13 +129,16 @@ let
           }
         );
     in
-    map callNextcloudTest [
-      ./basic.nix
-      ./with-declarative-redis-and-secrets.nix
-      ./with-mysql-and-memcached.nix
-      ./with-postgresql-and-redis.nix
-      ./with-objectstore.nix
-    ];
+    map callNextcloudTest (
+      [
+        ./basic.nix
+        ./with-declarative-redis-and-secrets.nix
+        ./with-mysql-and-memcached.nix
+        ./with-postgresql-and-redis.nix
+        ./with-objectstore.nix
+      ]
+      ++ (pkgs.lib.optional (version >= 32) ./without-admin-user.nix)
+    );
 in
 listToAttrs (
   concatMap genTests [
diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
index fd02a0c1d3b3..336cdbc3db84 100644
--- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
+++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
@@ -35,7 +35,6 @@ runTest (
               logLevel = "debug";
             };
             extraAppsEnable = true;
-            extraApps.notify_push = config.services.nextcloud.package.packages.apps.notify_push;
             # This test also validates that we can use an "external" database
             database.createLocally = false;
             config = {
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 3a6b73bfe4e9..ed4eea689fd0 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -39,7 +39,7 @@ runTest (
             };
             extraAppsEnable = true;
             extraApps = with config.services.nextcloud.package.packages.apps; {
-              inherit notify_push notes;
+              inherit notes;
             };
             settings.trusted_proxies = [ "::1" ];
           };
diff --git a/nixos/tests/nextcloud/without-admin-user.nix b/nixos/tests/nextcloud/without-admin-user.nix
new file mode 100644
index 000000000000..260d3dfc6fea
--- /dev/null
+++ b/nixos/tests/nextcloud/without-admin-user.nix
@@ -0,0 +1,48 @@
+{
+  name,
+  pkgs,
+  testBase,
+  system,
+  ...
+}:
+
+with import ../../lib/testing-python.nix { inherit system pkgs; };
+runTest (
+  {
+    config,
+    lib,
+    ...
+  }:
+  rec {
+    inherit name;
+
+    meta.maintainers = lib.teams.nextcloud.members;
+
+    imports = [ testBase ];
+
+    nodes = {
+      nextcloud =
+        { config, pkgs, ... }:
+        {
+          services.nextcloud = {
+            config = {
+              dbtype = "sqlite";
+              adminuser = null;
+              adminpassFile = lib.mkForce null;
+            };
+          };
+        };
+    };
+
+    adminuser = "root";
+    # This needs to be a "secure" password, since the password_policy app is enabled after installation and will forbid "simple" passwords.
+    adminpass = "+CVpTwaOEktxsFc6";
+
+    # Manually create the adminuser to make the default set of tests pass.
+    # If adminuser was already created during the installation this command would not succeed.
+    # This user name must always match the default value in services.nextcloud.config.adminuser!
+    test-helpers.init = ''
+      nextcloud.succeed("OC_PASS=${adminpass} nextcloud-occ user:add ${adminuser} --password-from-env")
+    '';
+  }
+)
diff --git a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
index 270c268fcbd9..eddc68aa0a54 100644
--- a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
+++ b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-not-present" { } ''
+pkgs.runCommand "${feature}-not-present" { } ''
   if [[ -e /${feature}-files ]]; then
     echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway"
     exit 1
diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix
index 447fd49a300a..c5a13f2a749f 100644
--- a/nixos/tests/nix-required-mounts/test-require-feature.nix
+++ b/nixos/tests/nix-required-mounts/test-require-feature.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } ''
+pkgs.runCommand "${feature}-present" { requiredSystemFeatures = [ feature ]; } ''
   if [[ ! -e /${feature}-files ]]; then
     echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2
     exit 1
diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
index 86f275330936..9bf29de7fd24 100644
--- a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
+++ b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
@@ -2,7 +2,6 @@
   pkgs ? import <nixpkgs> { },
 }:
 
-pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; }
-  ''
-    touch $out
-  ''
+pkgs.runCommand "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } ''
+  touch $out
+''
diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/nixos/tests/nix-required-mounts/test-structured-attrs.nix
index 874910eee7bb..c0477258d230 100644
--- a/nixos/tests/nix-required-mounts/test-structured-attrs.nix
+++ b/nixos/tests/nix-required-mounts/test-structured-attrs.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-present-structured"
+pkgs.runCommand "${feature}-present-structured"
   {
     __structuredAttrs = true;
     requiredSystemFeatures = [ feature ];
diff --git a/nixos/tests/nix-store-veritysetup.nix b/nixos/tests/nix-store-veritysetup.nix
index 3b6a5e6a734f..031e1260e947 100644
--- a/nixos/tests/nix-store-veritysetup.nix
+++ b/nixos/tests/nix-store-veritysetup.nix
@@ -18,7 +18,7 @@
         partitions = {
           "nix-store" = {
             storePaths = [ config.system.build.toplevel ];
-            stripNixStorePrefix = true;
+            nixStorePrefix = "/";
             repartConfig = {
               Type = "linux-generic";
               Label = "nix-store";
@@ -89,7 +89,7 @@
         "-f",
         "qcow2",
         "-b",
-        "${nodes.machine.system.build.image}/${nodes.machine.image.repart.imageFile}",
+        "${nodes.machine.system.build.image}/${nodes.machine.image.fileName}",
         "-F",
         "raw",
         tmp_disk_image.name,
diff --git a/nixos/tests/nixseparatedebuginfod.nix b/nixos/tests/nixseparatedebuginfod.nix
deleted file mode 100644
index 7399cb405c07..000000000000
--- a/nixos/tests/nixseparatedebuginfod.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  secret-key = "key-name:/COlMSRbehSh6YSruJWjL+R0JXQUKuPEn96fIb+pLokEJUjcK/2Gv8Ai96D7JGay5gDeUTx5wdpPgNvum9YtwA==";
-  public-key = "key-name:BCVI3Cv9hr/AIveg+yRmsuYA3lE8ecHaT4Db7pvWLcA=";
-in
-{
-  name = "nixseparatedebuginfod";
-  # A binary cache with debug info and source for gnumake
-  nodes.cache =
-    { pkgs, ... }:
-    {
-      services.nix-serve = {
-        enable = true;
-        secretKeyFile = builtins.toFile "secret-key" secret-key;
-        openFirewall = true;
-      };
-      system.extraDependencies = [
-        pkgs.gnumake.debug
-        pkgs.gnumake.src
-        pkgs.sl
-      ];
-    };
-  # the machine where we need the debuginfo
-  nodes.machine = {
-    imports = [
-      ../modules/installer/cd-dvd/channel.nix
-    ];
-    services.nixseparatedebuginfod.enable = true;
-    nix.settings = {
-      substituters = lib.mkForce [ "http://cache:5000" ];
-      trusted-public-keys = [ public-key ];
-    };
-    environment.systemPackages = [
-      pkgs.valgrind
-      pkgs.gdb
-      pkgs.gnumake
-      (pkgs.writeShellScriptBin "wait_for_indexation" ''
-        set -x
-        while debuginfod-find debuginfo /run/current-system/sw/bin/make |& grep 'File too large'; do
-          sleep 1;
-        done
-      '')
-    ];
-  };
-  testScript = ''
-    start_all()
-    cache.wait_for_unit("nix-serve.service")
-    cache.wait_for_open_port(5000)
-    machine.wait_for_unit("nixseparatedebuginfod.service")
-    machine.wait_for_open_port(1949)
-
-    with subtest("show the config to debug the test"):
-      machine.succeed("nix --extra-experimental-features nix-command show-config |& logger")
-      machine.succeed("cat /etc/nix/nix.conf |& logger")
-    with subtest("check that the binary cache works"):
-      machine.succeed("nix-store -r ${pkgs.sl}")
-
-    # nixseparatedebuginfod needs .drv to associate executable -> source
-    # on regular systems this would be provided by nixos-rebuild
-    machine.succeed("nix-instantiate '<nixpkgs>' -A gnumake")
-
-    machine.succeed("timeout 600 wait_for_indexation")
-
-    # test debuginfod-find
-    machine.succeed("debuginfod-find debuginfo /run/current-system/sw/bin/make")
-
-    # test that gdb can fetch source
-    out = machine.succeed("gdb /run/current-system/sw/bin/make --batch -x ${builtins.toFile "commands" ''
-      start
-      l
-    ''}")
-    print(out)
-    assert 'main (int argc, char **argv, char **envp)' in out
-
-    # test that valgrind can display location information
-    # this relies on the fact that valgrind complains about gnumake
-    # because we also ask valgrind to show leak kinds
-    # which are usually false positives.
-    out = machine.succeed("valgrind --leak-check=full --show-leak-kinds=all make --version 2>&1")
-    print(out)
-    assert 'main.c' in out
-  '';
-}
diff --git a/nixos/tests/nixseparatedebuginfod2.nix b/nixos/tests/nixseparatedebuginfod2.nix
index 34741ac2fa71..aa35a91971e8 100644
--- a/nixos/tests/nixseparatedebuginfod2.nix
+++ b/nixos/tests/nixseparatedebuginfod2.nix
@@ -32,7 +32,7 @@
   nodes.machine = {
     services.nixseparatedebuginfod2 = {
       enable = true;
-      substituter = "http://cache";
+      substituters = [ "http://cache" ];
     };
     environment.systemPackages = [
       pkgs.valgrind
@@ -45,7 +45,7 @@
     cache.wait_for_unit("nginx.service")
     cache.wait_for_open_port(80)
     machine.wait_for_unit("nixseparatedebuginfod2.service")
-    machine.wait_for_open_port(1950)
+    machine.wait_for_open_port(1949)
 
     with subtest("check that the binary cache works"):
       machine.succeed("nix-store --extra-substituters http://cache --option require-sigs false -r ${pkgs.sl}")
diff --git a/nixos/tests/nominatim.nix b/nixos/tests/nominatim.nix
index 3919f245abd1..cff589f2807e 100644
--- a/nixos/tests/nominatim.nix
+++ b/nixos/tests/nominatim.nix
@@ -11,8 +11,8 @@ in
   name = "nominatim";
   meta = {
     maintainers = with lib.teams; [
-      geospatial
-      ngi
+      geospatial.members
+      ngi.members
     ];
   };
 
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 336f84a061b4..5ba36442274b 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -66,13 +66,14 @@
 
       with subtest("Login with elementary-greeter"):
           machine.send_chars("${user.password}\n")
-          machine.wait_until_succeeds('journalctl -t gnome-session-binary --grep "Entering running state"')
+          machine.wait_until_succeeds('journalctl -t gnome-session-service --grep "Entering running state"')
 
       with subtest("Wait for wayland server"):
           machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Pantheon components actually start"):
           pgrep_list = [
diff --git a/nixos/tests/prometheus/default.nix b/nixos/tests/prometheus/default.nix
index 53cfc80e8f64..2a9e81ca7c37 100644
--- a/nixos/tests/prometheus/default.nix
+++ b/nixos/tests/prometheus/default.nix
@@ -8,4 +8,5 @@
   prometheus-pair = runTest ./prometheus-pair.nix;
   pushgateway = runTest ./pushgateway.nix;
   remote-write = runTest ./remote-write.nix;
+  ui = runTest ./ui.nix;
 }
diff --git a/nixos/tests/prometheus/ui.nix b/nixos/tests/prometheus/ui.nix
new file mode 100644
index 000000000000..fb5ddcd58f55
--- /dev/null
+++ b/nixos/tests/prometheus/ui.nix
@@ -0,0 +1,86 @@
+{ lib, pkgs, ... }:
+
+{
+  name = "prometheus-ui";
+
+  nodes = {
+    browser =
+      { config, pkgs, ... }:
+      {
+        environment.systemPackages =
+          let
+            prometheusSeleniumScript =
+              pkgs.writers.writePython3Bin "prometheus-selenium-script"
+                {
+                  libraries = with pkgs.python3Packages; [ selenium ];
+                }
+                ''
+                  from selenium import webdriver
+                  from selenium.webdriver.common.by import By
+                  from selenium.webdriver.firefox.options import Options
+                  from selenium.webdriver.support.ui import WebDriverWait
+
+                  options = Options()
+                  options.add_argument("--headless")
+                  service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
+
+                  driver = webdriver.Firefox(options=options, service=service)
+                  driver.implicitly_wait(10)
+                  driver.get("http://prometheus:9090/")
+
+                  wait = WebDriverWait(driver, 60)
+
+                  assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-header")) > 0  # noqa: E501
+                  assert len(driver.find_elements(By.CLASS_NAME, "mantine-AppShell-main")) > 0  # noqa: E501
+
+                  driver.close()
+                '';
+          in
+          with pkgs;
+          [
+            curl
+            firefox-unwrapped
+            geckodriver
+            prometheusSeleniumScript
+          ];
+      };
+
+    prometheus =
+      { config, pkgs, ... }:
+      {
+        networking.firewall.allowedTCPPorts = [ config.services.prometheus.port ];
+
+        services.prometheus = {
+          enable = true;
+          globalConfig.scrape_interval = "2s";
+          scrapeConfigs = [
+            {
+              job_name = "prometheus";
+              static_configs = [
+                {
+                  targets = [
+                    "prometheus1:${toString config.services.prometheus.port}"
+                    "prometheus2:${toString config.services.prometheus.port}"
+                  ];
+                }
+              ];
+            }
+          ];
+        };
+      };
+  };
+
+  testScript = ''
+    prometheus.wait_for_unit("prometheus")
+    prometheus.wait_for_open_port(9090)
+    prometheus.wait_until_succeeds("curl -sSf http://localhost:9090/-/healthy")
+
+    browser.systemctl("start network-online.target")
+    browser.wait_for_unit("network-online.target")
+
+    browser.succeed("curl -kLs http://prometheus:9090/query | grep 'Prometheus Time Series Collection and Processing Server'")
+
+    # Ensure the application is actually rendered by the Javascript
+    browser.succeed("PYTHONUNBUFFERED=1 prometheus-selenium-script")
+  '';
+}
diff --git a/nixos/tests/quorum.nix b/nixos/tests/quorum.nix
deleted file mode 100644
index 0e67f3564070..000000000000
--- a/nixos/tests/quorum.nix
+++ /dev/null
@@ -1,103 +0,0 @@
-{ pkgs, ... }:
-let
-  keystore = {
-    address = "9377bc3936de934c497e22917b81aa8774ac3bb0";
-    crypto = {
-      cipher = "aes-128-ctr";
-      ciphertext = "ad8341d8ef225650403fd366c955f41095e438dd966a3c84b3d406818c1e366c";
-      cipherparams = {
-        iv = "2a09f7a72fd6dff7c43150ff437e6ac2";
-      };
-      kdf = "scrypt";
-      kdfparams = {
-        dklen = 32;
-        n = 262144;
-        p = 1;
-        r = 8;
-        salt = "d1a153845bb80cd6274c87c5bac8ac09fdfac5ff131a6f41b5ed319667f12027";
-      };
-      mac = "a9621ad88fa1d042acca6fc2fcd711f7e05bfbadea3f30f379235570c8e270d3";
-    };
-    id = "89e847a3-1527-42f6-a321-77de0a14ce02";
-    version = 3;
-  };
-  keystore-file = pkgs.writeText "keystore-file" (builtins.toJSON keystore);
-in
-{
-  name = "quorum";
-  meta = with pkgs.lib.maintainers; {
-    maintainers = [ mmahut ];
-  };
-
-  nodes = {
-    machine =
-      { ... }:
-      {
-        services.quorum = {
-          enable = true;
-          permissioned = false;
-          staticNodes = [
-            "enode://dd333ec28f0a8910c92eb4d336461eea1c20803eed9cf2c056557f986e720f8e693605bba2f4e8f289b1162e5ac7c80c914c7178130711e393ca76abc1d92f57@0.0.0.0:30303?discport=0"
-          ];
-          genesis = {
-            alloc = {
-              "189d23d201b03ae1cf9113672df29a5d672aefa3" = {
-                balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
-              };
-              "44b07d2c28b8ed8f02b45bd84ac7d9051b3349e6" = {
-                balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
-              };
-              "4c1ccd426833b9782729a212c857f2f03b7b4c0d" = {
-                balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
-              };
-              "7ae555d0f6faad7930434abdaac2274fd86ab516" = {
-                balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
-              };
-              c1056df7c02b6f1a353052eaf0533cc7cb743b52 = {
-                balance = "0x446c3b15f9926687d2c40534fdb564000000000000";
-              };
-            };
-            coinbase = "0x0000000000000000000000000000000000000000";
-            config = {
-              byzantiumBlock = 1;
-              chainId = 10;
-              eip150Block = 1;
-              eip150Hash = "0x0000000000000000000000000000000000000000000000000000000000000000";
-              eip155Block = 1;
-              eip158Block = 1;
-              homesteadBlock = 1;
-              isQuorum = true;
-              istanbul = {
-                epoch = 30000;
-                policy = 0;
-              };
-            };
-            difficulty = "0x1";
-            extraData = "0x0000000000000000000000000000000000000000000000000000000000000000f8aff869944c1ccd426833b9782729a212c857f2f03b7b4c0d94189d23d201b03ae1cf9113672df29a5d672aefa39444b07d2c28b8ed8f02b45bd84ac7d9051b3349e694c1056df7c02b6f1a353052eaf0533cc7cb743b52947ae555d0f6faad7930434abdaac2274fd86ab516b8410000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0";
-            gasLimit = "0xe0000000";
-            gasUsed = "0x0";
-            mixHash = "0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365";
-            nonce = "0x0";
-            number = "0x0";
-            parentHash = "0x0000000000000000000000000000000000000000000000000000000000000000";
-            timestamp = "0x5cffc201";
-          };
-        };
-      };
-  };
-
-  testScript = ''
-    start_all()
-    machine.succeed("mkdir -p /var/lib/quorum/keystore")
-    machine.succeed(
-        'cp ${keystore-file} /var/lib/quorum/keystore/UTC--2020-03-23T11-08-34.144812212Z--${keystore.address}'
-    )
-    machine.succeed(
-        "echo fe2725c4e8f7617764b845e8d939a65c664e7956eb47ed7d934573f16488efc1 > /var/lib/quorum/nodekey"
-    )
-    machine.succeed("systemctl restart quorum")
-    machine.wait_for_unit("quorum.service")
-    machine.sleep(15)
-    machine.succeed('geth attach /var/lib/quorum/geth.ipc --exec "eth.accounts" | grep ${keystore.address}')
-  '';
-}
diff --git a/nixos/tests/radicle-ci-broker.nix b/nixos/tests/radicle-ci-broker.nix
index 849192664571..6fb0953daac8 100644
--- a/nixos/tests/radicle-ci-broker.nix
+++ b/nixos/tests/radicle-ci-broker.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, ... }:
 
 let
-  seed-nid = "z6Mkg52RcwDrPKRzzHaYgBkHH3Gi5p4694fvPstVE9HTyMB6";
+  seed-nid = "z6MkhwX7wBkHQvcLazu2KDFK6UifGkLcoxNm2iA38fPH9LwU";
   seed-ssh-keys = import ./ssh-keys.nix pkgs;
 
   radicleConfig =
diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix
index 0c7c93359dae..21fc208d8255 100644
--- a/nixos/tests/radicle.nix
+++ b/nixos/tests/radicle.nix
@@ -6,7 +6,7 @@
 
 let
   # The Node ID depends on nodes.seed.services.radicle.privateKeyFile
-  seed-nid = "z6Mkg52RcwDrPKRzzHaYgBkHH3Gi5p4694fvPstVE9HTyMB6";
+  seed-nid = "z6MkhwX7wBkHQvcLazu2KDFK6UifGkLcoxNm2iA38fPH9LwU";
   seed-ssh-keys = import ./ssh-keys.nix pkgs;
   seed-tls-certs = import common/acme/server/snakeoil-certs.nix;
 
diff --git a/nixos/tests/restic-rest-server.nix b/nixos/tests/restic-rest-server.nix
index 9e6753d91b2a..c224515b586e 100644
--- a/nixos/tests/restic-rest-server.nix
+++ b/nixos/tests/restic-rest-server.nix
@@ -86,7 +86,7 @@ in
         "touch /opt/excluded_file_1 /opt/excluded_file_2",
 
         # test that remotebackup runs custom commands and produces a snapshot
-        "timedatectl set-time '2016-12-13 13:45'",
+        "date -s '2016-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
@@ -97,23 +97,23 @@ in
         "diff -ru ${testDir} /tmp/restore-1/opt",
 
         # test that we can create four snapshots in remotebackup and rclonebackup
-        "timedatectl set-time '2017-12-13 13:45'",
+        "date -s '2017-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-13 13:45'",
+        "date -s '2018-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-14 13:45'",
+        "date -s '2018-12-14 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-15 13:45'",
+        "date -s '2018-12-15 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-16 13:45'",
+        "date -s '2018-12-16 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix
index 68777215c035..68ce843879b3 100644
--- a/nixos/tests/restic.nix
+++ b/nixos/tests/restic.nix
@@ -247,7 +247,7 @@ in
 
     restic.succeed(
         # test that remotebackup runs custom commands and produces a snapshot
-        "timedatectl set-time '2016-12-13 13:45'",
+        "date -s '2016-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
@@ -255,7 +255,7 @@ in
 
     restic.succeed(
         # test that remotebackup runs custom commands and produces a snapshot
-        "timedatectl set-time '2016-12-13 13:45'",
+        "date -s '2016-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
@@ -297,27 +297,27 @@ in
         "grep 'check.* --some-check-option' /root/fake-restic.log",
 
         # test that we can create four snapshots in remotebackup and rclonebackup
-        "timedatectl set-time '2017-12-13 13:45'",
+        "date -s '2017-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-13 13:45'",
+        "date -s '2018-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-14 13:45'",
+        "date -s '2018-12-14 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-15 13:45'",
+        "date -s '2018-12-15 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-16 13:45'",
+        "date -s '2018-12-16 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
diff --git a/nixos/tests/rsync.nix b/nixos/tests/rsync.nix
new file mode 100644
index 000000000000..2a570adf20de
--- /dev/null
+++ b/nixos/tests/rsync.nix
@@ -0,0 +1,64 @@
+{
+  name = "rsync";
+
+  nodes.machine = {
+    users.users.test.isNormalUser = true;
+
+    services.rsync = {
+      enable = true;
+      jobs = {
+        root = {
+          sources = [ "/root/src/" ];
+          destination = "/root/dst";
+          settings = {
+            archive = true;
+            delete = true;
+            mkpath = true;
+          };
+          timerConfig = {
+            OnCalendar = "daily";
+            Persistent = false;
+          };
+          inhibit = [ "sleep" ];
+        };
+        user = {
+          sources = [ "/home/test/src/" ];
+          destination = "/home/test/dst";
+          settings = {
+            archive = true;
+            delete = true;
+            mkpath = true;
+          };
+          timerConfig = {
+            OnCalendar = "daily";
+            Persistent = false;
+          };
+          user = "test";
+          group = "users";
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    machine.start()
+
+    machine.wait_for_unit("multi-user.target")
+
+    machine.succeed("mkdir --parents /root/src")
+    machine.succeed("echo test data > /root/src/file.txt")
+    machine.start_job("rsync-job-root.service")
+    machine.succeed("""[[ 'test data' == "$(< /root/dst/file.txt)" ]]""")
+
+    machine.succeed("mkdir --parents /home/test/src")
+    machine.succeed("echo test data > /home/test/src/file.txt")
+    machine.start_job("rsync-job-user.service")
+    machine.succeed("""[[ 'test data' == "$(< /home/test/dst/file.txt)" ]]""")
+
+    machine.wait_for_unit("timers.target")
+    machine.require_unit_state("rsync-job-root.timer", "active")
+    machine.require_unit_state("rsync-job-user.timer", "active")
+
+    machine.shutdown()
+  '';
+}
diff --git a/nixos/tests/searx.nix b/nixos/tests/searx.nix
index 18199e6db3ed..71a9750ac275 100644
--- a/nixos/tests/searx.nix
+++ b/nixos/tests/searx.nix
@@ -97,7 +97,7 @@
             "${pkgs.curl}/bin/curl --fail http://localhost/searx >&2"
         )
         fancy.succeed(
-            "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/leaflet.js >&2"
+            "${pkgs.curl}/bin/curl --fail http://localhost/searx/static/themes/simple/js/searxng.core.min.js >&2"
         )
   '';
 }
diff --git a/nixos/tests/sftpgo.nix b/nixos/tests/sftpgo.nix
index c2090c8bb180..6d18c1c5581f 100644
--- a/nixos/tests/sftpgo.nix
+++ b/nixos/tests/sftpgo.nix
@@ -25,7 +25,7 @@ let
     groupName:
     # users.users attrset
     user:
-    lib.any (x: x == user.name) config.users.groups.${groupName}.members;
+    lib.elem user.name config.users.groups.${groupName}.members;
 
   # Generates a valid SFTPGo user configuration for a given user
   # Will be converted to JSON and loaded on application startup.
diff --git a/nixos/tests/sks.nix b/nixos/tests/sks.nix
new file mode 100644
index 000000000000..d56da6e8fe9e
--- /dev/null
+++ b/nixos/tests/sks.nix
@@ -0,0 +1,57 @@
+{ lib, pkgs, ... }:
+let
+  gpgKeyring = (
+    pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
+      mkdir -p $out
+      export GNUPGHOME=$out
+      cat > foo <<EOF
+        %echo Generating a basic OpenPGP key
+        %no-protection
+        Key-Type: DSA
+        Key-Length: 1024
+        Subkey-Type: ELG-E
+        Subkey-Length: 1024
+        Name-Real: Foo Example
+        Name-Email: foo@example.org
+        Expire-Date: 0
+        # Do a commit here, so that we can later print "done"
+        %commit
+        %echo done
+      EOF
+      gpg --batch --generate-key foo
+      rm $out/S.gpg-agent $out/S.gpg-agent.*
+    ''
+  );
+in
+{
+  name = "sks";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.gnupg ];
+
+      services.sks.enable = true;
+    };
+
+  testScript = ''
+    machine.wait_for_unit("sks-db.service")
+    machine.wait_for_open_port(11371)
+
+    response = machine.succeed("curl -f -s http://127.0.0.1:11371/")
+    assert "<title>SKS OpenPGP Public Key Server</title>" in response, "HTML title not found"
+
+    # Copy the keyring
+    machine.succeed("cp -R ${gpgKeyring} /tmp/GNUPGHOME")
+
+    # Extract our GPG key id
+    keyId = machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --list-keys | grep dsa1024 --after-context=1 | grep -v dsa1024").strip()
+
+    # Send the key to our local keyserver
+    machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId)
+
+    # Receive the key from our local keyserver to a separate directory
+    machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId)
+  '';
+}
diff --git a/nixos/tests/ssh-keys.nix b/nixos/tests/ssh-keys.nix
index 2c25778a2085..c07a95a30ef9 100644
--- a/nixos/tests/ssh-keys.nix
+++ b/nixos/tests/ssh-keys.nix
@@ -1,27 +1,35 @@
 pkgs: {
+  # This key is used in integration tests
+  # This is NOT a security issue
+  # It uses the test key defined in RFC 9500
+  # https://datatracker.ietf.org/doc/rfc9500/
   snakeOilPrivateKey = pkgs.writeText "privkey.snakeoil" ''
     -----BEGIN EC PRIVATE KEY-----
-    MHcCAQEEIHQf/khLvYrQ8IOika5yqtWvI0oquHlpRLTZiJy5dRJmoAoGCCqGSM49
-    AwEHoUQDQgAEKF0DYGbBwbj06tA3fd/+yP44cvmwmHBWXZCKbS+RQlAKvLXMWkpN
-    r1lwMyJZoSGgBHoUahoYjTh9/sJL7XLJtA==
+    MHcCAQEEIObLW92AqkWunJXowVR2Z5/+yVPBaFHnEedDk5WJxk/BoAoGCCqGSM49
+    AwEHoUQDQgAEQiVI+I+3gv+17KN0RFLHKh5Vj71vc75eSOkyMsxFxbFsTNEMTLjV
+    uKFxOelIgsiZJXKZNCX0FBmrfpCkKklCcg==
     -----END EC PRIVATE KEY-----
   '';
 
   snakeOilPublicKey = pkgs.lib.concatStrings [
     "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHA"
-    "yNTYAAABBBChdA2BmwcG49OrQN33f/sj+OHL5sJhwVl2Qim0vkUJQCry1zFpKTa"
-    "9ZcDMiWaEhoAR6FGoaGI04ff7CS+1yybQ= snakeoil"
+    "yNTYAAABBBEIlSPiPt4L/teyjdERSxyoeVY+9b3O+XkjpMjLMRcWxbEzRDEy41b"
+    "ihcTnpSILImSVymTQl9BQZq36QpCpJQnI= snakeoil"
   ];
 
+  # This key is used in integration tests
+  # This is NOT a security issue
+  # It uses the same key than the one used in OpenSSH fuzz tests
+  # https://github.com/openssh/openssh-portable/blob/V_9_9_P2/regress/misc/fuzz-harness/fixed-keys.h#L76-L85
   snakeOilEd25519PrivateKey = pkgs.writeText "privkey.snakeoil" ''
     -----BEGIN OPENSSH PRIVATE KEY-----
     b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-    QyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+QAAAJC89yCivPcg
-    ogAAAAtzc2gtZWQyNTUxOQAAACAYBTIWo1J4PkY4/7AhVyPT8xvAUI67tp+yYFFRdSm7+Q
-    AAAEDJmKp3lX6Pz0unTc0QZwrHb8Eyr9fJUopE9d2/+q+eCxgFMhajUng+Rjj/sCFXI9Pz
-    G8BQjru2n7JgUVF1Kbv5AAAACnRvbUBvemRlc2sBAgM=
+    QyNTUxOQAAACAz0F5hFTFS5nhUcmnyjFVoDw5L/P7kQU8JnBA2rWczAwAAAIhWlP99VpT/
+    fQAAAAtzc2gtZWQyNTUxOQAAACAz0F5hFTFS5nhUcmnyjFVoDw5L/P7kQU8JnBA2rWczAw
+    AAAEDE1rlcMC0s0X3TKVZAOVavZOywwkXw8tO5dLObxaCMEDPQXmEVMVLmeFRyafKMVWgP
+    Dkv8/uRBTwmcEDatZzMDAAAAAAECAwQF
     -----END OPENSSH PRIVATE KEY-----
   '';
 
-  snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBgFMhajUng+Rjj/sCFXI9PzG8BQjru2n7JgUVF1Kbv5 snakeoil";
+  snakeOilEd25519PublicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDPQXmEVMVLmeFRyafKMVWgPDkv8/uRBTwmcEDatZzMD snakeoil";
 }
diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index 9d18ef64f39d..f60232945adc 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -112,23 +112,25 @@ import ./make-test-python.nix (
           enable = true;
           # just for testing purposes, don't put this into the Nix store in production!
           environmentFile = "${pkgs.writeText "ldap-root" "LDAP_BIND_PW=${ldapRootPassword}"}";
-          config = ''
-            [sssd]
-            config_file_version = 2
-            services = nss, pam, sudo
-            domains = ${dbDomain}
+          settings = {
+            sssd = {
+              config_file_version = 2;
+              services = "nss, pam, sudo";
+              domains = dbDomain;
+            };
 
-            [domain/${dbDomain}]
-            auth_provider = ldap
-            id_provider = ldap
-            ldap_uri = ldaps://127.0.0.1:636
-            ldap_tls_reqcert = allow
-            ldap_tls_cacert = /etc/cert.pem
-            ldap_search_base = ${dbSuffix}
-            ldap_default_bind_dn = cn=${ldapRootUser},${dbSuffix}
-            ldap_default_authtok_type = password
-            ldap_default_authtok = $LDAP_BIND_PW
-          '';
+            "domain/${dbDomain}" = {
+              auth_provider = "ldap";
+              id_provider = "ldap";
+              ldap_uri = "ldaps://127.0.0.1:636";
+              ldap_tls_reqcert = "allow";
+              ldap_tls_cacert = "/etc/cert.pem";
+              ldap_search_base = dbSuffix;
+              ldap_default_bind_dn = "cn=${ldapRootUser},${dbSuffix}";
+              ldap_default_authtok_type = "password";
+              ldap_default_authtok = "$LDAP_BIND_PW";
+            };
+          };
         };
       };
 
diff --git a/nixos/tests/sssd-legacy-config.nix b/nixos/tests/sssd-legacy-config.nix
new file mode 100644
index 000000000000..f394c16fdea1
--- /dev/null
+++ b/nixos/tests/sssd-legacy-config.nix
@@ -0,0 +1,37 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+
+  {
+    name = "sssd-legacy-config";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ bbigras ];
+    };
+    nodes.machine.services.sssd = {
+      enable = true;
+      config = # ini
+        ''
+          [sssd]
+          services = nss, pam
+          domains = shadowutils
+
+          [nss]
+
+          [pam]
+
+          [domain/shadowutils]
+          id_provider = proxy
+          proxy_lib_name = files
+          auth_provider = proxy
+          proxy_pam_target = sssd-shadowutils
+          proxy_fast_alias = True
+        '';
+    };
+
+    testScript = ''
+      start_all()
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_unit("sssd.service")
+      machine.succeed("sssctl config-check")
+    '';
+  }
+)
diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix
deleted file mode 100644
index 5622eadf4e16..000000000000
--- a/nixos/tests/sssd.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-
-  {
-    name = "sssd";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ bbigras ];
-    };
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.sssd.enable = true;
-      };
-
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_unit("sssd.service")
-      machine.succeed("sssctl config-check")
-    '';
-  }
-)
diff --git a/nixos/tests/stub-ld.nix b/nixos/tests/stub-ld.nix
index c6d045f60c05..a6ba3da49e54 100644
--- a/nixos/tests/stub-ld.nix
+++ b/nixos/tests/stub-ld.nix
@@ -24,12 +24,6 @@ import ./make-test-python.nix (
         libDir = pkgs.stdenv.hostPlatform.libDir;
         ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
 
-        check32 = pkgs.stdenv.hostPlatform.isx86_64;
-        pkgs32 = pkgs.pkgsi686Linux;
-
-        libDir32 = pkgs32.stdenv.hostPlatform.libDir;
-        ldsoBasename32 = lib.last (lib.splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);
-
         test-exec =
           builtins.mapAttrs
             (
@@ -45,8 +39,6 @@ import ./make-test-python.nix (
               aarch64-linux.hash = "sha256-hnldbd2cctQIAhIKoEZLIWY8H3jiFBClkNy2UlyyvAs=";
             };
         exec-name = "rustic";
-
-        if32 = pythonStatement: if check32 then pythonStatement else "pass";
       in
       ''
         machine.start()
@@ -54,35 +46,26 @@ import ./make-test-python.nix (
 
         with subtest("Check for stub (enabled, initial)"):
             machine.succeed('test -L /${libDir}/${ldsoBasename}')
-            ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
 
         with subtest("Try FHS executable"):
             machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec')
             machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
             machine.succeed('grep -qi nixos outfile')
-            ${if32 "machine.copy_from_host('${
-              test-exec.${pkgs32.stdenv.hostPlatform.system}
-            }','test-exec32')"}
-            ${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
-            ${if32 "machine.succeed('grep -qi nixos outfile32')"}
 
         with subtest("Disable stub"):
             machine.succeed("/run/booted-system/specialisation/nostub/bin/switch-to-configuration test")
 
         with subtest("Check for stub (disabled)"):
             machine.fail('test -e /${libDir}/${ldsoBasename}')
-            ${if32 "machine.fail('test -e /${libDir32}/${ldsoBasename32}')"}
 
         with subtest("Create file in stub location (to be overwritten)"):
             machine.succeed('mkdir -p /${libDir};touch /${libDir}/${ldsoBasename}')
-            ${if32 "machine.succeed('mkdir -p /${libDir32};touch /${libDir32}/${ldsoBasename32}')"}
 
         with subtest("Re-enable stub"):
             machine.succeed("/run/booted-system/bin/switch-to-configuration test")
 
         with subtest("Check for stub (enabled, final)"):
             machine.succeed('test -L /${libDir}/${ldsoBasename}')
-            ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
       '';
   }
 )
diff --git a/nixos/tests/svnserve.nix b/nixos/tests/svnserve.nix
new file mode 100644
index 000000000000..4a537bbdd657
--- /dev/null
+++ b/nixos/tests/svnserve.nix
@@ -0,0 +1,60 @@
+{ pkgs, ... }:
+{
+  name = "svnserve";
+
+  nodes = {
+    server = {
+      virtualisation.vlans = [ 1 ];
+
+      networking = {
+        useNetworkd = true;
+        useDHCP = false;
+        firewall.allowedTCPPorts = [ 3690 ];
+      };
+
+      systemd.network.networks."01-eth1" = {
+        name = "eth1";
+        networkConfig.Address = "10.0.0.1/24";
+      };
+
+      services.svnserve.enable = true;
+
+      environment.systemPackages = [ pkgs.subversion ];
+    };
+
+    client =
+      { pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+        };
+
+        systemd.network.networks."01-eth1" = {
+          name = "eth1";
+          networkConfig.Address = "10.0.0.2/24";
+        };
+
+        environment.systemPackages = [ pkgs.subversion ];
+      };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+
+      server.wait_for_unit("svnserve")
+      server.wait_for_open_port(3690)
+      server.succeed("svnadmin create '${nodes.server.services.svnserve.svnBaseDir}/project'")
+      server.succeed("sed -i 's/# anon-access = read/anon-access = write/' '${nodes.server.services.svnserve.svnBaseDir}/project/conf/svnserve.conf'")
+
+      client.succeed("svn checkout svn://10.0.0.1/project")
+      client.succeed("cd ./project && echo hello > ./file.txt && svn add ./file.txt && svn commit -m 'Added file.txt'")
+
+      client.succeed("svn checkout svn://10.0.0.1/project project-copy")
+      client.succeed("grep hello project-copy/file.txt")
+    '';
+}
diff --git a/nixos/tests/swap-random-encryption.nix b/nixos/tests/swap-random-encryption.nix
index 0b88c21654ca..80601e89d108 100644
--- a/nixos/tests/swap-random-encryption.nix
+++ b/nixos/tests/swap-random-encryption.nix
@@ -78,7 +78,7 @@
       if not any(cipher_pattern.fullmatch(line) for line in results):
         raise Exception ("swap device encryption does not use the cipher specified in the configuration")
 
-      key_size_pattern = re.compile(r"\s*keysize:\s+512\s+bits\s*")
+      key_size_pattern = re.compile(r"\s*keysize:\s+512\s+\[?bits\]?\s*")
       if not any(key_size_pattern.fullmatch(line) for line in results):
         raise Exception ("swap device encryption does not use the key size specified in the configuration")
   '';
diff --git a/nixos/tests/sx.nix b/nixos/tests/sx.nix
index 8fc41621a7c4..ced01a2697a9 100644
--- a/nixos/tests/sx.nix
+++ b/nixos/tests/sx.nix
@@ -2,7 +2,6 @@
 {
   name = "sx";
   meta.maintainers = with lib.maintainers; [
-    figsoda
     thiagokokada
   ];
 
diff --git a/nixos/tests/syncthing/folders.nix b/nixos/tests/syncthing/folders.nix
index dbce02b279f2..264b2307aa39 100644
--- a/nixos/tests/syncthing/folders.nix
+++ b/nixos/tests/syncthing/folders.nix
@@ -42,6 +42,14 @@ in
                 }
               ];
             };
+            folders.baz = {
+              path = "/var/lib/syncthing/baz";
+              devices = [
+                "b"
+                "c"
+              ];
+              ignorePatterns = [ ];
+            };
           };
         };
       };
@@ -70,6 +78,16 @@ in
                 }
               ];
             };
+            folders.baz = {
+              path = "/var/lib/syncthing/baz";
+              devices = [
+                "a"
+                "c"
+              ];
+              ignorePatterns = [
+                "notB"
+              ];
+            };
           };
         };
       };
@@ -90,6 +108,16 @@ in
             ];
             type = "receiveencrypted";
           };
+          folders.baz = {
+            path = "/var/lib/syncthing/baz";
+            devices = [
+              "a"
+              "b"
+            ];
+            ignorePatterns = [
+              "notC"
+            ];
+          };
         };
       };
     };
@@ -131,5 +159,29 @@ in
 
     # Bar on C is untrusted, check that content is not in cleartext
     c.fail("grep -R plaincontent /var/lib/syncthing/bar")
+
+    # Test baz
+
+    a.wait_for_file("/var/lib/syncthing/baz")
+    b.wait_for_file("/var/lib/syncthing/baz")
+    c.wait_for_file("/var/lib/syncthing/baz")
+
+    # A creates the file notB, C should get it, B should ignore it
+    a.succeed("echo notB > /var/lib/syncthing/baz/notB")
+    a.succeed("echo controlA > /var/lib/syncthing/baz/controlA")
+    c.wait_for_file("/var/lib/syncthing/baz/notB")
+    c.wait_for_file("/var/lib/syncthing/baz/controlA")
+    b.wait_for_file("/var/lib/syncthing/baz/controlA")
+
+    # B creates the file notC, A should get it, C should ignore it
+    b.succeed("echo notC > /var/lib/syncthing/baz/notC")
+    b.succeed("echo controlB > /var/lib/syncthing/baz/controlB")
+    a.wait_for_file("/var/lib/syncthing/baz/notC")
+    a.wait_for_file("/var/lib/syncthing/baz/controlB")
+    c.wait_for_file("/var/lib/syncthing/baz/controlB")
+
+    # Check that files have been correctly ignored
+    b.fail("cat /var/lib/syncthing/baz/notB")
+    c.fail("cat /var/lib/syncthing/baz/notC")
   '';
 }
diff --git a/nixos/tests/systemd-initrd-luks-tpm2.nix b/nixos/tests/systemd-initrd-luks-tpm2.nix
index 20e203b0e86b..6cc42bbbda73 100644
--- a/nixos/tests/systemd-initrd-luks-tpm2.nix
+++ b/nixos/tests/systemd-initrd-luks-tpm2.nix
@@ -11,6 +11,7 @@
         useBootLoader = true;
         # Booting off the TPM2-encrypted device requires an available init script
         mountHostNixStore = true;
+        efi.OVMF = pkgs.OVMFFull; # this really should be the default. Only OVMFFull contains TCG
         useEFIBoot = true;
         tpm.enable = true;
       };
diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix
index 933b2ad41056..1a504a4ae4e0 100644
--- a/nixos/tests/systemd-initrd-swraid.nix
+++ b/nixos/tests/systemd-initrd-swraid.nix
@@ -48,7 +48,7 @@
 
   testScript = ''
     # Create RAID
-    machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90")
+    machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90 --bitmap=internal")
     machine.succeed("mkfs.ext4 -L testraid /dev/md0")
     machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt")
 
diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
index cc6975588ff6..8238bcea3f3a 100644
--- a/nixos/tests/systemd-machinectl.nix
+++ b/nixos/tests/systemd-machinectl.nix
@@ -166,7 +166,7 @@ in
     machine.succeed("ping -n -c 1 ${containerName}");
 
     # Test systemd-nspawn uses a user namespace
-    machine.succeed("test $(machinectl status ${containerName} | grep 'UID Shift: ' | wc -l) = 1")
+    machine.succeed("test $(machinectl status ${containerName} | grep 'ID Shift: ' | wc -l) = 1")
 
     # Test systemd-nspawn reboot
     machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot");
diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index fbece2a73dfc..f0bbdef76c61 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -244,7 +244,7 @@
           assert "0B read, 0B written" not in output
 
       with subtest("systemd per-unit accounting works"):
-          assert "IP traffic received: 84B sent: 84B" in output_ping
+          assert "IP Traffic: received 84B, sent 84B" in output_ping
 
       with subtest("systemd environment is properly set"):
           machine.systemctl("daemon-reexec")  # Rewrites /proc/1/environ
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index 0ddce92e8345..5186098b40cc 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -1,5 +1,5 @@
 import ./make-test-python.nix (
-  { pkgs, transmission, ... }:
+  { pkgs, ... }:
   {
     name = "transmission";
     meta = with pkgs.lib.maintainers; {
@@ -16,7 +16,6 @@ import ./make-test-python.nix (
         security.apparmor.enable = true;
 
         services.transmission.enable = true;
-        services.transmission.package = transmission;
       };
 
     testScript = ''
diff --git a/nixos/tests/vscode-remote-ssh.nix b/nixos/tests/vscode-remote-ssh.nix
index 3ceaba967fa6..7e563820b581 100644
--- a/nixos/tests/vscode-remote-ssh.nix
+++ b/nixos/tests/vscode-remote-ssh.nix
@@ -27,6 +27,8 @@ import ./make-test-python.nix (
     meta = {
       maintainers = [ ];
       timeout = 600;
+      # https://hydra.nixos.org/build/309924543/nixlog/1
+      broken = true;
     };
 
     nodes =
diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix
index 8badad20b03c..7cb0871ac9bc 100644
--- a/nixos/tests/vscodium.nix
+++ b/nixos/tests/vscodium.nix
@@ -45,6 +45,10 @@ let
           turion
         ];
 
+        # x86_64: https://github.com/NixOS/nixpkgs/pull/452801#issuecomment-3415680343
+        # aarch64: https://github.com/NixOS/nixpkgs/issues/207234
+        meta.broken = name == "wayland";
+
         enableOCR = true;
 
         testScript = ''
diff --git a/nixos/tests/warpgate.nix b/nixos/tests/warpgate.nix
new file mode 100644
index 000000000000..64ec9bd6dc22
--- /dev/null
+++ b/nixos/tests/warpgate.nix
@@ -0,0 +1,49 @@
+{
+  name = "warpgate";
+
+  nodes = {
+    machine = {
+      services.warpgate = {
+        enable = true;
+      };
+    };
+
+    machine2 = {
+      environment.etc."warpgate-db-url".text = "database: sqlite:/var/lib/warpgate/db/";
+      services.warpgate = {
+        enable = true;
+        databaseUrlFile = "/etc/warpgate-db-url";
+        settings = {
+          database_url = null;
+        };
+      };
+    };
+
+    machine3 = {
+      services.warpgate = {
+        enable = true;
+        settings = {
+          http.listen = "[::]:443";
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("warpgate.service")
+    machine.wait_for_open_port(8888)
+    machine.succeed("stat /var/lib/warpgate/db/db.sqlite3")
+    machine.succeed("curl -k --fail https://localhost:8888/@warpgate")
+    machine.shutdown()
+
+    machine2.wait_for_unit("warpgate.service")
+    machine2.wait_for_open_port(8888)
+    machine2.succeed("curl -k --fail https://localhost:8888/@warpgate")
+    machine2.shutdown()
+
+    machine3.wait_for_unit("warpgate.service")
+    machine3.wait_for_open_port(443)
+    machine3.succeed("curl -k --fail https://localhost/@warpgate")
+    machine3.shutdown()
+  '';
+}
diff --git a/nixos/tests/web-apps/immich-vectorchord-reindex.nix b/nixos/tests/web-apps/immich-vectorchord-reindex.nix
new file mode 100644
index 000000000000..65cd403feca7
--- /dev/null
+++ b/nixos/tests/web-apps/immich-vectorchord-reindex.nix
@@ -0,0 +1,74 @@
+{ ... }:
+{
+  name = "immich-vectorchord-reindex";
+
+  nodes.machine =
+    { lib, pkgs, ... }:
+    {
+      # These tests need a little more juice
+      virtualisation = {
+        cores = 2;
+        memorySize = 2048;
+        diskSize = 4096;
+      };
+
+      services.immich = {
+        enable = true;
+        environment.IMMICH_LOG_LEVEL = "verbose";
+      };
+
+      services.postgresql.extensions = lib.mkForce (ps: [
+        ps.pgvector
+        # pin vectorchord to an older version simulate version bump
+        (ps.vectorchord.overrideAttrs (prevAttrs': rec {
+          version = "0.5.2";
+          src = pkgs.fetchFromGitHub {
+            owner = "tensorchord";
+            repo = "vectorchord";
+            tag = version;
+            hash = "sha256-KGwiY5t1ivFiYex3D20y3sdiu3CT9LCDd2fPnRE56jM=";
+          };
+
+          cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+            inherit src;
+            hash = "sha256-Vn3c/xuUpQzERJ74I0qbvufTZtW3goefPa5B/nOUO48=";
+          };
+        }))
+      ]);
+
+      specialisation."immich-vectorchord-upgraded".configuration = {
+        # needs to be lower than mkForce, otherwise it does not get rid of the previous version
+        services.postgresql.extensions = lib.mkOverride 40 (ps: [
+          ps.pgvector
+          ps.vectorchord
+        ]);
+      };
+
+    };
+
+  testScript =
+    { nodes, ... }:
+    let
+      specBase = "${nodes.machine.system.build.toplevel}/specialisation";
+      vectorchordUpgraded = "${specBase}/immich-vectorchord-upgraded";
+    in
+    ''
+      def immich_works():
+        machine.wait_for_unit("immich-server.service")
+
+        machine.wait_for_open_port(2283) # Server
+        machine.wait_for_open_port(3003) # Machine learning
+        machine.succeed("curl --fail http://localhost:2283/")
+
+      immich_works()
+
+      machine.succeed("${vectorchordUpgraded}/bin/switch-to-configuration test")
+
+      # just tests that reindexing is triggered
+      machine.wait_until_succeeds(
+        "journalctl -o cat -u postgresql-setup.service | grep 'REINDEX'"
+      )
+
+      immich_works()
+    '';
+}
diff --git a/nixos/tests/web-apps/movim/default.nix b/nixos/tests/web-apps/movim/default.nix
index 7da1e7d88e67..daeb386b7563 100644
--- a/nixos/tests/web-apps/movim/default.nix
+++ b/nixos/tests/web-apps/movim/default.nix
@@ -1,6 +1,5 @@
-{ recurseIntoAttrs, runTest }:
-
-recurseIntoAttrs {
+{ lib, runTest }:
+lib.recurseIntoAttrs {
   ejabberd-h2o = runTest ./ejabberd-h2o.nix;
   prosody-nginx = runTest ./prosody-nginx.nix;
 }
diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix
index 29b553829dcb..5b60e8939ccb 100644
--- a/nixos/tests/web-apps/netbox-upgrade.nix
+++ b/nixos/tests/web-apps/netbox-upgrade.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, ... }:
 let
-  oldNetbox = "netbox_4_2";
-  newNetbox = "netbox_4_3";
+  oldNetbox = "netbox_4_3";
+  newNetbox = "netbox_4_4";
 
   apiVersion =
     version:
diff --git a/nixos/tests/web-apps/netbox/testScript.py b/nixos/tests/web-apps/netbox/testScript.py
index 7d0f9bff10c7..f6c2c9821e12 100644
--- a/nixos/tests/web-apps/netbox/testScript.py
+++ b/nixos/tests/web-apps/netbox/testScript.py
@@ -61,7 +61,7 @@ def compare(a: str, b: str):
     return 0
 
 with subtest("Home screen loads"):
-    machine.succeed(
+    machine.wait_until_succeeds(
         "curl -sSfL http://[::1]:8001 | grep '<title>Home | NetBox</title>'"
     )
 
diff --git a/nixos/tests/web-apps/pairdrop.nix b/nixos/tests/web-apps/pairdrop.nix
new file mode 100644
index 000000000000..bf404edfa7eb
--- /dev/null
+++ b/nixos/tests/web-apps/pairdrop.nix
@@ -0,0 +1,32 @@
+{ ... }:
+{
+  name = "pairdrop-nixos";
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.pairdrop = {
+        enable = true;
+        port = 1337;
+        environment = {
+          SIGNALING_SERVER = "pairdrop.net";
+          CUSTOM_BUTTON_ACTIVE = false;
+        };
+      };
+    };
+
+  testScript = ''
+    import json
+
+    machine.wait_for_unit("pairdrop.service")
+
+    machine.wait_for_open_port(1337)
+    machine.succeed("curl --fail http://localhost:1337/")
+
+    res = machine.succeed("curl --fail http://localhost:1337/config")
+    print(res)
+    cfg = json.loads(res)
+    assert cfg["signalingServer"] == "pairdrop.net/"
+    assert cfg["buttons"]["custom_button"]["active"] == "false"
+  '';
+}
diff --git a/nixos/tests/web-servers/h2o/default.nix b/nixos/tests/web-servers/h2o/default.nix
index d4a74ba71728..a9ddbda4acc5 100644
--- a/nixos/tests/web-servers/h2o/default.nix
+++ b/nixos/tests/web-servers/h2o/default.nix
@@ -1,6 +1,5 @@
-{ recurseIntoAttrs, runTest }:
-
-recurseIntoAttrs {
+{ lib, runTest }:
+lib.recurseIntoAttrs {
   basic = runTest ./basic.nix;
   mruby = runTest ./mruby.nix;
   tls-recommendations = runTest ./tls-recommendations.nix;
diff --git a/nixos/tests/xfce-wayland.nix b/nixos/tests/xfce-wayland.nix
index 17defe1b4d26..061efa002327 100644
--- a/nixos/tests/xfce-wayland.nix
+++ b/nixos/tests/xfce-wayland.nix
@@ -39,7 +39,8 @@
         machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-        machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+        # Change back to /dev/snd/timer after systemd-258.1
+        machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Xfce components actually start"):
         for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]:
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 0b88fb18870f..ae203c5ca26d 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -21,6 +21,7 @@
       environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
 
       programs.thunar.plugins = [ pkgs.xfce.thunar-archive-plugin ];
+      programs.ydotool.enable = true;
     };
 
   enableOCR = true;
@@ -38,13 +39,15 @@
         machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-        machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+        # Change back to /dev/snd/timer after systemd-258.1
+        machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Xfce components actually start"):
         machine.wait_for_window("xfce4-panel")
         machine.wait_for_window("Desktop")
-        for i in ["xfwm4", "xfsettingsd", "xfdesktop", "xfce4-screensaver", "xfce4-notifyd", "xfconfd"]:
-          machine.wait_until_succeeds(f"pgrep -f {i}")
+        for i in ["xfwm4", "xfsettingsd", "xfdesktop", "xfce4-notifyd", "xfconfd"]:
+          machine.wait_until_succeeds(f"pgrep {i}")
+        machine.wait_until_succeeds("pgrep -xf xfce4-screensaver")
 
       with subtest("Open whiskermenu"):
         machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfconf-query -c xfce4-panel -p /plugins/plugin-1 -t string -s whiskermenu -n >&2 &'")
@@ -62,6 +65,17 @@
         machine.succeed("su - ${user.name} -c 'DISPLAY=:0 xfce4-terminal >&2 &'")
         machine.wait_for_window("Terminal")
 
+      with subtest("Lock the screen"):
+        machine.succeed("su - ${user.name} -c '${bus} xflock4 >&2 &'")
+        machine.wait_until_succeeds("su - ${user.name} -c '${bus} xfce4-screensaver-command -q' | grep 'The screensaver is active'")
+        machine.sleep(5)
+        machine.succeed("ydotool click 0xC0")
+        machine.wait_for_text("${user.description}|Unlock")
+        machine.screenshot("screensaver")
+        machine.send_chars("${user.password}\n", delay=0.2)
+        machine.wait_until_succeeds("su - ${user.name} -c '${bus} xfce4-screensaver-command -q' | grep 'The screensaver is inactive'")
+        machine.sleep(2)
+
       with subtest("Open Thunar"):
         machine.succeed("su - ${user.name} -c 'DISPLAY=:0 thunar >&2 &'")
         machine.wait_for_window("Thunar")
diff --git a/pkgs/README.md b/pkgs/README.md
index 55c28934440f..4118b92c2e14 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -58,7 +58,7 @@ Because entries in the Nix store are inert and do nothing by themselves, package
   For example:
   * Any package which does not follow upstream security policies should be considered vulnerable.
     In particular, packages that vendor or fork web engines like Blink, Gecko or Webkit need to keep up with the frequent updates of those projects.
-  * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one active committer among the maintainers.
+  * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one committer among the maintainers, who actively reviews, merges and backports updates.
     This ensures no critical fixes are delayed unnecessarily, endangering unsuspecting users.
   * Services which typically work on web traffic are working on untrusted input.
   * Data (such as archives or rich documents) commonly shared over untrusted channels (e.g. email) is untrusted.
diff --git a/pkgs/applications/audio/clementine/default.nix b/pkgs/applications/audio/clementine/default.nix
index 2e886cb44a12..f259950ecb67 100644
--- a/pkgs/applications/audio/clementine/default.nix
+++ b/pkgs/applications/audio/clementine/default.nix
@@ -112,6 +112,21 @@ stdenv.mkDerivation (finalAttrs: {
       -e 's,-Wno-unused-private-field,,g'
     sed -i CMakeLists.txt \
       -e 's,libprotobuf.a,protobuf,g'
+
+    # CMake 3.0.0 is deprecated and no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace 3rdparty/{qsqlite,qtsingleapplication,qtiocompressor,qxt}/CMakeLists.txt \
+      cmake/{ParseArguments.cmake,Translations.cmake}                                          \
+      tests/CMakeLists.txt gst/moodbar/CMakeLists.txt                                          \
+      --replace-fail                                                                           \
+        "cmake_minimum_required(VERSION 3.0.0)" \
+        "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace 3rdparty/libmygpo-qt5/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required( VERSION 3.0.0 FATAL_ERROR )" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeLists.txt --replace-fail \
+        "cmake_policy(SET CMP0053 OLD)" \
+        ""
   '';
 
   preConfigure = ''
diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index b10cb501e12e..24dda36ca000 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/magnetophon/constant-detune-chorus";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.magnetophon ];
-    # ERROR3 : n is NaN in an Interval
-    broken = true;
   };
 }
diff --git a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
index 8a2974b8517b..220d3fe68d53 100644
--- a/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/VoiceOfFaust/default.nix
@@ -32,10 +32,6 @@ stdenv.mkDerivation rec {
     faust2lv2
   ];
 
-  # ld: crtbegin.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
-  # ld: failed to set dynamic section sizes: bad value
-  hardeningDisable = [ "pie" ];
-
   enableParallelBuilding = true;
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 8403a57e5fb5..20175c813f8a 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
 
 stdenv.mkDerivation rec {
   pname = "${lib.optionalString libOnly "lib"}mpg123";
-  version = "1.33.2";
+  version = "1.33.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
-    hash = "sha256-LFT6u/ppbc6PmxN8jvekKaBh+P5jPNfQpRGAmFXywhk=";
+    hash = "sha256-agxkct0VbiE8IGj0ARXru3OXjC2HPma64qJQ4tIZjSY=";
   };
 
   outputs = [
diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index f698a39440a6..1eff8ab97ee6 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "2.5";
 
   src = fetchFromGitHub {
-    owner = "audoban";
+    owner = "jsmitar";
     repo = "PlayBar2";
     rev = "v${version}";
     sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Mpris2 Client for Plasma5";
-    homepage = "https://github.com/audoban/PlayBar2";
+    homepage = "https://github.com/jsmitar/PlayBar2";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pjones ];
diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/applications/audio/qmidinet/default.nix
deleted file mode 100644
index 782ddc613260..000000000000
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchurl,
-  pkg-config,
-  qtbase,
-  qttools,
-  alsa-lib,
-  libjack2,
-}:
-
-mkDerivation rec {
-  version = "0.9.4";
-  pname = "qmidinet";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
-    sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  buildInputs = [
-    qtbase
-    qttools
-    alsa-lib
-    libjack2
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  meta = with lib; {
-    description = "MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
-    mainProgram = "qmidinet";
-    homepage = "http://qmidinet.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 8d6518a1e323..d1740db71df6 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -34,7 +34,7 @@
   withGstPlugins ? withGstreamerBackend,
   withGstreamerBackend ? true,
   gst_all_1,
-  withXineBackend ? true,
+  withXineBackend ? !withGstreamerBackend,
   xine-lib,
 
   # tests
@@ -148,6 +148,8 @@ python3.pkgs.buildPythonApplication rec {
     "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
     # upstream does actually not enforce source code linting
     "--ignore=tests/quality"
+    # marked as flaky, breaks in sandbox
+    "--deselect=tests/test_library_file.py::TWatchedFileLibrary::test_watched_adding"
   ]
   ++ lib.optionals (withXineBackend || !withGstPlugins) [
     "--ignore=tests/plugin/test_replaygain.py"
@@ -191,9 +193,6 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://quodlibet.readthedocs.io/en/latest";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [
-      coroa
-      pbogdan
-    ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index da5abd1baccb..9cde53585717 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -48,7 +48,7 @@
   ctestCheckHook,
 }:
 
-assert builtins.any (g: guiModule == g) [
+assert builtins.elem guiModule [
   "fltk"
   "ntk"
   "zest"
diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 97337f435042..f4c67304d565 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -10,6 +10,7 @@
   wrapQtAppsHook ? null,
   boost,
   libevent,
+  libsodium,
   zeromq,
   zlib,
   db48,
@@ -67,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     libevent
+    libsodium
     zeromq
     zlib
   ]
@@ -87,8 +89,8 @@ stdenv.mkDerivation (finalAttrs: {
       publicKeys = fetchFromGitHub {
         owner = "bitcoinknots";
         repo = "guix.sigs";
-        rev = "7ee29a9ffbd1c26ba065ba06055242a01c3e63ff";
-        sha256 = "sha256-ZW1I7Y35Pi4WZhgCCYSI5gPhcvbfnpBObhOUTqZGVvM=";
+        rev = "251a8f2141e5f8439175fdd7b6cd6819d743cc01";
+        sha256 = "sha256-pZOK/lD1m9x8mz1IB39kLA/27fBnLvEL3qrwTRjL9Ec=";
       };
 
       checksums = fetchurl {
@@ -98,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       signatures = fetchurl {
         url = "https://bitcoinknots.org/files/${majorVersion}.x/${finalAttrs.version}/SHA256SUMS.asc";
-        hash = "sha256-jy4gxuczCSsJQkkH3axMljuf7k2VdmLp4PkgRoQnoSY=";
+        hash = "sha256-fSjYdscQ4viuXutP43prWjrNT7cMaJ9J8SsUykNjJtw";
       };
 
       verifyBuilderKeys =
diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index f0080a1150da..4e986699d220 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -15,24 +15,23 @@
 stdenv.mkDerivation rec {
 
   pname = "nano-wallet";
-  version = "25.1";
+  version = "28.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "nano-node";
-    rev = "V${version}";
+    tag = "V${version}";
     fetchSubmodules = true;
-    hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE=";
+    hash = "sha256-Wo1Gd6dOnCoPiGmuJQhZmKKSg7LrKpfdvLNNKBYTUWI=";
   };
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+
   patches = [
-    # Fix gcc-13 build failure due to missing <cstdint> includes.
+    # fix issue with <algorithm> include
     (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1.patch";
-      stripLen = 1;
-      extraPrefix = "submodules/rocksdb/";
-      hash = "sha256-HhlIYyPzIZFuyzHTUPz3bXgXiaFSQ8pVrLLMzegjTgE=";
+      url = "https://github.com/nanocurrency/nano-node/commit/1835a04dbbd1f6970649d7f72c454831432dd01f.patch";
+      hash = "sha256-IpC4yaIbJzQWYIC0QGXYQ345g6JnD2+xZG30qAQ1ubo=";
     })
   ];
 
diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index ce7730c941c7..afd0337f0d75 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lightdm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
   };
 
diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 18422951f78b..29407ea9f3e3 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,16 +16,16 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.1.4.8"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4"
-    sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM=";
+    version = "2025.2.1.7"; # "Android Studio Otter | 2025.2.1"
+    sha256Hash = "sha256-Fq8foC10bkwYLYhS/zhZu6XBgnaO/qz6GKi4HWXnjLE=";
   };
   betaVersion = {
-    version = "2025.1.4.7"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4 RC 2"
-    sha256Hash = "sha256-KrKUsA7wFeI7IBa9VOp+MERqWIiMnNzLFO8oF0rCiIw=";
+    version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1"
+    sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
   };
   latestVersion = {
-    version = "2025.2.1.5"; # "Android Studio Otter | 2025.2.1 Canary 5"
-    sha256Hash = "sha256-Slpp29OMpG4i/9ykYBF/KMwnBgOTSuqObZrfdcMfDbQ=";
+    version = "2025.2.2.4"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 4"
+    sha256Hash = "sha256-i7IcD1/qOXJZM0Wzah9DIV9vsU6T2XemSvc5RK33jBI=";
   };
 in
 {
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 4172265c7d13..d49e05bb7069 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
-    rev = version;
+    tag = version;
     hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4=";
   };
 
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 1af06cdb0ba8..c43d9cb3179d 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -148,6 +148,6 @@ generatedEclipses
 
   ### Plugins
 
-  plugins = callPackage ./plugins.nix { };
+  plugins = lib.recurseIntoAttrs (callPackage ./plugins.nix { });
 
 }
diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix
index 7bef6596b62a..8a36c507afff 100644
--- a/pkgs/applications/editors/emacs/build-support/wrapper.nix
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix
@@ -125,9 +125,19 @@ runCommand (lib.appendToName "with-packages" emacs).name
             local origin_path=$2
             local dest_path=$3
 
-            # Add the path to the search path list, but only if it exists
+            # Add the path to the search path list, but only if it exists.
+            # Executables in /bin are linked by their resolved paths in case they are
+            # relative symlinks (which break when 'lndir'ed as is);
+            # see https://github.com/NixOS/nixpkgs/issues/395442
             if [[ -d "$pkg/$origin_path" ]]; then
-              $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
+              case "$origin_path" in
+                bin)
+                  for exe in $pkg/$origin_path/*; do
+                    ln -s "$(realpath "$exe")" "$out/$dest_path/$(basename "$exe")"
+                  done
+                  ;;
+                *) $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path";;
+              esac
             fi
           }
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
index 333465e93c29..9a473c284415 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix
@@ -116,7 +116,7 @@ in
             })
           ]
         else
-          previousAttrs.patches or null;
+          previousAttrs.patches or [ ];
       preBuild =
         if applyOrgRoamMissingPatch then
           previousAttrs.preBuild or ""
@@ -129,7 +129,7 @@ in
             popd
           ''
         else
-          previousAttrs.preBuild or null;
+          previousAttrs.preBuild or "";
     }
   );
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
index 0d44878b480c..91a20bd3647e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/lib-override-helper.nix
@@ -18,7 +18,7 @@ rec {
           if predicate finalAttrs previousAttrs then
             previousAttrs.packageRequires or [ ] ++ packageRequires
           else
-            previousAttrs.packageRequires or null;
+            previousAttrs.packageRequires or [ ];
       }
     );
 
@@ -89,7 +89,7 @@ rec {
           if predicate finalAttrs previousAttrs then
             previousAttrs.nativeBuildInputs or [ ] ++ [ pkgs.writableTmpDirAsHomeHook ]
           else
-            previousAttrs.nativeBuildInputs or null;
+            previousAttrs.nativeBuildInputs or [ ];
       }
     );
 }
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
index f804b2a65d32..005323cf11f0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
@@ -60,6 +60,7 @@ melpaBuild (finalAttrs: {
     eafPythonDeps =
       ps: with ps; [
         pysocks
+        pycookiecheat
       ];
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
index 8fd622b2cb08..cf2ffff8d4ff 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
@@ -6,11 +6,11 @@
 
 melpaBuild rec {
   pname = "ebuild-mode";
-  version = "1.78";
+  version = "1.79";
 
   src = fetchzip {
     url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
-    hash = "sha256-vpNjhW3U/b+A4O78vYKoMN0Gutd6fRcB4wb3dz1z2Cc=";
+    hash = "sha256-FV9e6QF85yPnowfmseo53/Q36W3wlOgTG0/X4r7OHiI=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 3901b4afcc17..86d1642db5a3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -16,7 +16,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "idris-community";
     repo = "idris2-mode";
-    rev = version;
+    tag = version;
     hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
index 638f5cd49b66..d2710cb6d462 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
@@ -14,7 +14,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "emacsmirror";
     repo = "rect-mark";
-    rev = version;
+    tag = version;
     hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
index e8bed9c51e4f..3f7608dc5ced 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "emacs-tree-sitter";
       repo = "emacs-tree-sitter";
-      rev = version;
+      tag = version;
       hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=";
     };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
index 246786989209..038cc7024b6e 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix
@@ -830,7 +830,7 @@ let
                     rm --recursive --verbose etc/elisp/screenshot
                   ''
                 else
-                  previousAttrs.preBuild or null;
+                  previousAttrs.preBuild or "";
             }
           );
 
@@ -897,7 +897,7 @@ let
                     rm --verbose --force test-bpr.el
                   ''
                 else
-                  previousAttrs;
+                  previousAttrs.preBuild or "";
             }
           );
 
@@ -991,7 +991,7 @@ let
                       })
                     ]
                   else
-                    previousAttrs.patches or null;
+                    previousAttrs.patches or [ ];
               }
             )
           );
@@ -1055,7 +1055,7 @@ let
                   ''
                   + previousAttrs.preBuild or ""
                 else
-                  previousAttrs.preBuild or null;
+                  previousAttrs.preBuild or "";
             }
           );
 
@@ -1221,7 +1221,7 @@ let
                     rm --verbose packages/javascript/test-suppport.el
                   ''
                 else
-                  previousAttrs.preBuild or null;
+                  previousAttrs.preBuild or "";
             }
           );
 
@@ -1392,7 +1392,7 @@ let
                     })
                   ]
                 else
-                  previousAttrs.patches or null;
+                  previousAttrs.patches or [ ];
             }
           );
 
@@ -1543,7 +1543,7 @@ let
                     })
                   ]
                 else
-                  previousAttrs.patches or null;
+                  previousAttrs.patches or [ ];
             }
           );
 
@@ -1561,7 +1561,7 @@ let
                   ''
                   + previousAttrs.preBuild or ""
                 else
-                  previousAttrs.preBuild or null;
+                  previousAttrs.preBuild or "";
             }
           );
 
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index bace8a010ee1..f9e5c7367dcd 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -53,14 +53,13 @@
   ncurses,
   nixosTests,
   pkg-config,
-  recurseIntoAttrs,
   sigtool,
   sqlite,
   replaceVars,
   systemdLibs,
   tree-sitter,
   texinfo,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   wrapGAppsHook3,
   zlib,
 
@@ -141,6 +140,8 @@ let
   ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [
     "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib"
   ];
+
+  withWebkitgtk = withXwidgets && stdenv.hostPlatform.isLinux;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname =
@@ -351,8 +352,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withXinput2 [
     libXi
   ]
-  ++ lib.optionals (withXwidgets && stdenv.hostPlatform.isLinux) [
-    webkitgtk_4_0
+  ++ lib.optionals withWebkitgtk [
+    webkitgtk_4_1
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     sigtool
@@ -494,7 +495,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit withNativeCompilation;
     inherit withTreeSitter;
     inherit withXwidgets;
-    pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
+    pkgs = lib.recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
     tests = {
       inherit (nixosTests) emacs-daemon;
       withPackages = callPackage ./build-support/wrapper-test.nix {
@@ -504,7 +505,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
-    broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
+    broken =
+      (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk;
     knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [
       "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30"
     ];
diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index c0c83c50f863..1d22271001e3 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -11,123 +11,123 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "47b84f1c853a63586743b28834dfd6b949672f3b0a7a67435907a7ef51730606",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.2.tar.gz",
-      "build_number": "252.26199.153"
+      "version": "2025.2.4",
+      "sha256": "72c89e91f6636aa53930288fe02466e5e09a50a3c8b6ed5ad2f69b35ec9bacc5",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.tar.gz",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "7cac5ce1fc16ee3e7500a675ebf235e3285d6e87c0d61e8370e847f3a48528a7",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.3.tar.gz",
-      "build_number": "252.26199.73"
+      "version": "2025.2.4",
+      "sha256": "37d0af4ec30b94c71d3507fe35b3b0bdd389903db7e2f1a8ed73353b22718476",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4.tar.gz",
+      "build_number": "252.26830.46"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "ea3d1a3539b93850326b0126e32b5d6d02b9530ee86dc0b079877967464316f6",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1.tar.gz",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "32cdc6178f4046b3056c50184fd5157eef0658875a6ff17c64eb451d1fb0f4fb",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2.tar.gz",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "d1e8c8c61da42adcc9300a2a005830db386698912071eace9813a5c170a9fff8",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.2.tar.gz",
-      "build_number": "252.26199.160"
+      "version": "2025.2.4",
+      "sha256": "8fcf16255ff0bdc2b25132abd6c7a30d577c73bf6106c17a96320b6a1abac4b2",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4.tar.gz",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "e5816136312a419b67cdfab203bd30e305cb2f8952eea76445e908c01f3113c0",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.2.tar.gz",
-      "build_number": "252.26199.158"
+      "version": "2025.2.4",
+      "sha256": "fb42978d55271e6fa3165b1d010b3e0bacb8cd5c4f4073712332c62f32d2ebab",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4.tar.gz",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "3f1adc095bf78f0949e3f62f6cf02be0c5c9e6528271f16caa3baa041e637664",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.2.tar.gz",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "3c152de654fa948e12e5fba4c04ed0200e472556a8081ddc2d4c22e5831d6020",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4.tar.gz",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "7150ece389a4bc8649f68b103018edeeb09205559671549410ded11de523da62",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.2.tar.gz",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "4d909f989d7fa0a002f5bc669e002e8ab336ee7091f32756a74549cd8c11f432",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4.tar.gz",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2",
-      "sha256": "619bfe35ee4f922582e9ebb12ff11b0374eddffa570f7f9abe480f50226b5788",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.tar.gz",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "1010c4cfed0d74a0088c80e966c0ea75ed1238dc5b8ae25111e8be3e06bde741",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.2.tar.gz",
-      "build_number": "252.26199.163",
+      "version": "2025.2.4",
+      "sha256": "ad2413006344762fb46dc47246e983053b08f763df5c0a2ba0f70ede79a76c3d",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4.tar.gz",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2025.2.1.1",
-      "sha256": "3397ebebc3531eca4c6b866e8223a5d53c04794dd847f2bbd7218c2b5d1b9a24",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.1.1.tar.gz",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "5290837893379aeff204d006dd0eeff030df9fb5d9328d619b6c90ddf3f0292e",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4.tar.gz",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2025.2.1.1",
-      "sha256": "280da5efe11f17d86e5173fe0cf05af4704b9c858f1c9c2fea6de6b2071ada83",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.1.1.tar.gz",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "f1613a171ab07ba0e7ccd13cb537af4da8920c89cf4a13c64a3f7ae72e803701",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4.tar.gz",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "1ebffac91d70f8ce64567955de35738bb52d5e81b45d8c67dd494ff3fa0301df",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.2.tar.gz",
-      "build_number": "252.26199.154"
+      "version": "2025.2.4",
+      "sha256": "cd428f7d6db5055cd2594c3d1ef91241843d263cb6301369d3121a847ffb6589",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4.tar.gz",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "f103c2c5ab074aace1ce4678d32fa80d8521a25bb6497130d1185662244cf46d",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.2.tar.gz",
-      "build_number": "252.26199.157"
+      "version": "2025.2.4",
+      "sha256": "9249ee0e99e24b3898065c5328f56814fb1a8b53afc192e81e7b70e0982eb116",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4.tar.gz",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "cc2cfd0af3967a5ce65af5064ccac03bfb2ee2a1ed7e18e8a2c1a009a6d3721c",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.2.tar.gz",
-      "build_number": "252.26199.159"
+      "version": "2025.2.4",
+      "sha256": "3da078b5e68bac2283c0dd60fe3ff17d6025d92d6237bc6fab74f1f35ff6fbe5",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.tar.gz",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "8bb3bed5c670514ced8614b29848c5d3b7ff4f4e86056cf5cdc5930951c87ff6",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.2.tar.gz",
-      "build_number": "252.26199.162"
+      "version": "2025.2.4",
+      "sha256": "218d0cb6acd1f63c9b2877738af808279796d3d7e13318b54b021c8526d49b86",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4.tar.gz",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -150,123 +150,123 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "b8749bbec247544767023a25b9e955a9cd462c573e1d08a24ef68c864d5d6859",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.153"
+      "version": "2025.2.4",
+      "sha256": "b89010db5272eb6490a0084bd3247c9de657ffd0d12a827147f2c77a406f85b5",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "33caa8e0fb4c76e2704bc2457d0b87209f53861517bb43a1c675811b0703a773",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26199.73"
+      "version": "2025.2.4",
+      "sha256": "7df40778500a599d565ba985d1583f3334903fbb731f53add526b19557208d97",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.26830.46"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "5568a7fb516694b4b2434454192f7525b8699e7852bda3caaba684ae455dc788",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1-aarch64.tar.gz",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "6881781e1020272cf3ceb4e50da66e24cbc4f35535e568131353cbfbd9d81968",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2-aarch64.tar.gz",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "331407afc012f97b5a80fcfced59e256222549038bfe028c7d00b0b4793ebc4a",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.160"
+      "version": "2025.2.4",
+      "sha256": "feecd98be28ce72ebdbc0d7d31d2c0bbc1fa968dc5f0fc093804398839ee4826",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "5873b53e586c1f376ec6e159c962be3400f0be964f8f0d542b55b4a99ff6c870",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.158"
+      "version": "2025.2.4",
+      "sha256": "09e5790b20c5ca952af8c86a6094e83aa250d9eb751d144800ba83701d3512a8",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "3ea855820772e36be4b37dd9e503e4fee9b1877dcb614b5baa36819370fa0208",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "7d7a7d54eb55b13206ead9c3ab115b05998a0a510c13ebf0b33541270112523c",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "d40c5fa210a28a23b9e1d736057a711b41c785e32841f5a27969074feee5df4d",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "f5687e1d0dc416d6f0fb89495d2b4ad4639d4896497db245272d1fe697b1037b",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2",
-      "sha256": "619bfe35ee4f922582e9ebb12ff11b0374eddffa570f7f9abe480f50226b5788",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.tar.gz",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "edc147816c4fed704206d3ca03e7fcdefde23208599d7732eb0a22af2af6f2ff",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.163",
+      "version": "2025.2.4",
+      "sha256": "60638fee7ed81f75bae931b96d540aa80e8753709f138b60a766a6e29771a3da",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
-      "version": "2025.2.1.1",
-      "sha256": "f501a424c1554fb529bc3de3ce7ce49587ef419ebfd85d8ec12ddb5eaf291022",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.1.1-aarch64.tar.gz",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "31613bce32e229fc85b991d060e521df13977c6dcf2325df0a0de924c199cd78",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
-      "version": "2025.2.1.1",
-      "sha256": "97a359d900e4010a1d1ca57a9ae9f496f16bb377798d8fe0ffbfb071bbbc191c",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.1.1-aarch64.tar.gz",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "91569e7ba9988af1aa4d9973f52dfa8af8a94f32a53faa8457c7ba17d25f43b3",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "36523ab3b94d1ee1b92794476870727faa1ca29fbd365b7c3239f199399f6dbe",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.154"
+      "version": "2025.2.4",
+      "sha256": "75c38a2bd94e31200fc4e3a6cfad83b35c65d36c9d61b9a7b208e3ec82f8c81a",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "f75616b41eff86d75f51dadb49f1033ff9af021f1d9ca354fc8f99eca251c4ac",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.157"
+      "version": "2025.2.4",
+      "sha256": "4071efa011638cf96f50962b4a7cdf1a28bbdc58af0ebc4c96ddfcc44de48621",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "d76cb3f3d7affbd9cab937e813f44bafdd2675160b909f27baa7fac042de0765",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.159"
+      "version": "2025.2.4",
+      "sha256": "03052ead61bd13eaa616d1126add5b6b6fa9dbc6ef591109b358005d5b630606",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.2",
-      "sha256": "aa8eaa8bb200a6fce42582cb37235f3abf77ca7bcad2c9b98c318686c45772e1",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.2-aarch64.tar.gz",
-      "build_number": "252.26199.162"
+      "version": "2025.2.4",
+      "sha256": "1a424cb2a6c82b4fd23e087264a91dfce3a8e78d49c8988f461deafa1aa73d37",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -289,123 +289,123 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "f9c42a3417db66bc88fc039829840662a650fdf79fc02619c5d6fd8a633f6606",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.2.dmg",
-      "build_number": "252.26199.153"
+      "version": "2025.2.4",
+      "sha256": "04383caba9ba670841dd336e546f2027b28286d23ea30298e66f422fbc081272",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.dmg",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "3b14fce3bef29338a4d369e0236f0972cec18cfa1e32563d37cb10bafa782226",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.3.dmg",
-      "build_number": "252.26199.73"
+      "version": "2025.2.4",
+      "sha256": "9267cd82c2589f6f2f52f71960a8ba201bd9f02b8c10dede99323b845360de7b",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4.dmg",
+      "build_number": "252.26830.46"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
-      "version": "2025.2.1",
-      "sha256": "f02bbae2d0f33b46cd5c7c2d21600851aa58b15665739df7bdcb4c333d12cda0",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1.dmg",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "9573f0450a6eb1877bf53705533c886962ea5985c83c7a2ef642cea796b8eae0",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2.dmg",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "1be3476dc9065e9b95f399cb24ff2e5793e09a390bf541695bc932a9f46a2321",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.2.dmg",
-      "build_number": "252.26199.160"
+      "version": "2025.2.4",
+      "sha256": "1d308fc4f4a1649cd51834babe17028ff763347fd461f43d2f9fffeb0ac6d47d",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4.dmg",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "d23f16afaa67f120ce987b59280805f01025e5b971d85544f33f0960035f3a1c",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.2.dmg",
-      "build_number": "252.26199.158"
+      "version": "2025.2.4",
+      "sha256": "0a54191caca25c4ef4f82a2fd44bbd90b44a59054034aa586e5c53d6fe7257b6",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4.dmg",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "112bfa1e1c065ec641f1a242e95b63d4fed1b7dfa1d7b57b6591d8230531adae",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.2.dmg",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "0a064d890b8152cb2d34a2b712e5850eabd15aa7fdeaaa64c047d32a1f0a07d4",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4.dmg",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "7e7b672525e29554e503eecc656de025a96b680d1ee223dfbfd762a1ca6430dd",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.2.dmg",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "045f0d832c9d9d3360dfaf82aece11c125b6ba1c879c86bc19568f3ee77e24e6",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4.dmg",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
-      "version": "2025.2",
-      "sha256": "7fd49bfac7e9150e2827d7c6b9f1ad24405963b50efa948492e3ec3202b0ac84",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2-macos.dmg",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "sha256": "e0b2644918ffe76b10001fc7904a58b2ec88cda2d317b10508d3bac784a490b2",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos.dmg",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "60413cba4c4492a51af0dd3a439a615a08ec5fbc31c28ee7bb1af8638708eb05",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.2.dmg",
-      "build_number": "252.26199.163",
+      "version": "2025.2.4",
+      "sha256": "ad55cc42a605da0495cfb965e4d13e0de6ab29f04b50d97457dab724628c96bb",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4.dmg",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2025.2.1.1",
-      "sha256": "651d1c0a264e9a4fc8c7e134d42ece4a15fd444cd74424a9ed054659e5346db7",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.1.1.dmg",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "2542b457478d14062aa14217f695b7ac078b447e3d1628eb7c1963e1223aa4e4",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4.dmg",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2025.2.1.1",
-      "sha256": "6d90ba78686a32fdd38a1cc13e06462f6be3490b6611d8c05e6092483161a74b",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.1.1.dmg",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "26a7bbaf2fb5d101bfa68ba085913a598c8898594f265044f56fd2c9ac051c06",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4.dmg",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "ccc7b35691ceb87e3b3103909617e1616c36dcc69cb73c1f7668591c6256ba35",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.2.dmg",
-      "build_number": "252.26199.154"
+      "version": "2025.2.4",
+      "sha256": "f8cabc370393b6be2bd244413fd5692714c02e11cf24eb9c32438367d2895750",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4.dmg",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "9ced0e4a5ebb0e47821d25a7b8d9a2c4a9a8ad821ffefa9b429821379da8486e",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.2.dmg",
-      "build_number": "252.26199.157"
+      "version": "2025.2.4",
+      "sha256": "2f418dbf559fcab77f4df7c602b8c6de996e4360bfa69feae7f1f0a9d1ecc1bf",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4.dmg",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "bcb442e4d22a71cd312cae2821187da82f9c58cdd03e5343a070b12af6a11f85",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.2.dmg",
-      "build_number": "252.26199.159"
+      "version": "2025.2.4",
+      "sha256": "71f0735c546b659d4d1ed9ce58411848146ac0216b4b971583ce682311e9e075",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.dmg",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2025.2.2",
-      "sha256": "74af775f515e7cc847ee572cf7720498e6afec3387af285a6685337272c61611",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.2.dmg",
-      "build_number": "252.26199.162"
+      "version": "2025.2.4",
+      "sha256": "dadcde8679597d7bb9d11518207b36a0b44a76407b84bbe7ebedba54db7bd8de",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4.dmg",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -428,123 +428,123 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "4dceb6ba2ae1d2fcaaa7f76090bbb18664da30d371d2e950afdffb0f9589ce7e",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.153"
+      "version": "2025.2.4",
+      "sha256": "7bdef6d73e0edfbc5ef02b7e74e5508e5b18a9c21afb5ba82488527d837e2a94",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
       "url-template": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "cfe4b7f9e9ede9fa15c0e0ce16e98ba3595051b5da1510c0085f89ff7bcbdf50",
-      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.3-aarch64.dmg",
-      "build_number": "252.26199.73"
+      "version": "2025.2.4",
+      "sha256": "13d41b91c0194078afed78974f5023a793822c46609e6273dfacd831bebecc83",
+      "url": "https://download.jetbrains.com/datagrip/datagrip-2025.2.4-aarch64.dmg",
+      "build_number": "252.26830.46"
     },
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
-      "version": "2025.2.1",
-      "sha256": "819e671e9928b7e7e5c46bd51d94464a79972ceb85e8d0922306120c6f87959a",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1-aarch64.dmg",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "a2a9cc1c0c515399206568e66add7693718918cef58fc16025effde3d768371b",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2-aarch64.dmg",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "1d9be57de8075eeefcc81ef249b15a60762f82909ca4002846dce13acedba56d",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.160"
+      "version": "2025.2.4",
+      "sha256": "22925a4f01d7c0e8a6b1820fb635584aa1ffd1f89652443243e625a379d31854",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "38dd5a302eba4ee5f92c5c5aa810b449b72301c89d209139e75c0efb6bdff919",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.158"
+      "version": "2025.2.4",
+      "sha256": "d122e1f1109f31373d4a479b99278f569da7cf3b9fea88b1b2077c6d598813bf",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "cc83bbb9531522085d2892499ddb5cb87909291d58ee3e34c06b131aeb2413fe",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "c4e1ae63bf8683d12d307d6eca13f9ddb688df932608eb258a1c66ee5d45b6c3",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "c93ef0205c18f8b9fd127df2d5f3486e3ad190a0408c374e1795aeaa7899dc8a",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.169"
+      "version": "2025.2.4",
+      "sha256": "2b5504f86c6969ed0564483b6886390cfc1bb1b3ab99e658881d60edf57c481f",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
-      "version": "2025.2",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2-macos-aarch64.dmg",
-      "sha256": "5f1822a639b199ec3c2ca7f2352277bfc1727e4e46976bdab71fabf7fe62a280",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos-aarch64.dmg",
+      "sha256": "d409c82b06cab622dc469d6929e291e40b81b21e1e4b784833d07eb7697f5f61",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "08c30cee02829ebca2956a5dc84221322cbd0ce02f33fb023d3d340cdcc2dac3",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.163",
+      "version": "2025.2.4",
+      "sha256": "d05c2e3e9106646bdf93731a034dcd82a359c7a91601d6456ed8ea88a75c3546",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2025.2.1.1",
-      "sha256": "1afba23b5cc19e42b56bcd35ddb173a9e47c643cb27d9f70aa7dccd3675a9082",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.1.1-aarch64.dmg",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "0b945c8687bf678baa51315ee4cbbfe3e24736fd029fed2ce527ff1563a1278b",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2025.2.1.1",
-      "sha256": "cf54ed7c544f5e21bd563da68725431235ea7b91bebad0ce3c5eecabfd6be0bc",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.1.1-aarch64.dmg",
-      "build_number": "252.25557.178"
+      "version": "2025.2.4",
+      "sha256": "bd1b97e396ed3e880973266db57ecde02af7f6810fcdb3da3899a88806473527",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "f6d1a148123519c33d2ec8822e7d83856af68cbb518ac822c638bbd4b1127ad2",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.154"
+      "version": "2025.2.4",
+      "sha256": "e6bd0a07f5922c05c73d9170bbaa2219534fa8e5350b99f37c6a4bc9eb7c0870",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "4fa2260b6ca45a3e21bd3aa64517cb5216113a4177ec2b7808f9883cf4a071b5",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.157"
+      "version": "2025.2.4",
+      "sha256": "6971de2913d969bd1d3edc775cb88f2ad6507c0c0a62177812ab546bd043dea9",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "a673c45f2183d28ac6ac37df9a8cd7084af432793f505589164096a425fa7801",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.159"
+      "version": "2025.2.4",
+      "sha256": "8bad55d714d388c115c0d35c297eb5bdb140bc024b2bf602efc8d07a3327cad9",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2025.2.2",
-      "sha256": "68fbdbb3abd2ef5ae69d8371f72fd61e39f4331e7b9aacb792a7b6b7b6d05e8f",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.2-aarch64.dmg",
-      "build_number": "252.26199.162"
+      "version": "2025.2.4",
+      "sha256": "9b0cbc4745a6e1ec2e9fdff4b3df5a12897ccd814746d515dfd52ccb2744fc4e",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index a866e49abbd2..d48a9cdcf5f8 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -17,17 +17,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip"
       },
       "name": "ideavim"
     },
@@ -36,7 +36,7 @@
         "idea-ultimate"
       ],
       "builds": {
-        "252.26199.169": "https://plugins.jetbrains.com/files/631/861064/python-252.26199.169.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/631/882374/python-252.27397.103.zip"
       },
       "name": "python"
     },
@@ -47,7 +47,7 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/1347/861692/scala-intellij-bin-2025.2.30.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/1347/882283/scala-intellij-bin-2025.2.48.zip"
       },
       "name": "scala"
     },
@@ -68,17 +68,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip"
       },
       "name": "stringmanipulation"
     },
@@ -99,17 +99,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip"
       },
       "name": "handlebars-mustache"
     },
@@ -130,17 +130,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/6954/809234/Kotlin-252.23892.360-IJ.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/6954/841446/Kotlin-252.25557.131-IJ.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip"
       },
       "name": "kotlin"
     },
@@ -161,17 +161,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.25557.178": "https://plugins.jetbrains.com/files/6981/846966/ini-252.25557.135.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip"
+        "252.26199.587": null,
+        "252.26830.46": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip"
       },
       "name": "ini"
     },
@@ -192,17 +192,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
       },
       "name": "acejump"
     },
@@ -223,17 +223,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip"
       },
       "name": "grep-console"
     },
@@ -254,17 +254,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip"
       },
       "name": "file-watchers"
     },
@@ -275,7 +275,7 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip"
       },
       "name": "maven-helper"
     },
@@ -296,17 +296,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip"
       },
       "name": "cucumber-for-java"
     },
@@ -316,8 +316,8 @@
         "phpstorm"
       ],
       "builds": {
-        "252.26199.163": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip"
       },
       "name": "symfony-plugin"
     },
@@ -327,8 +327,8 @@
         "phpstorm"
       ],
       "builds": {
-        "252.26199.163": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip"
       },
       "name": "php-annotations"
     },
@@ -346,14 +346,14 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.25557.178": "https://plugins.jetbrains.com/files/7322/841474/python-ce-252.25557.131.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip"
+        "252.26830.46": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip"
       },
       "name": "python-community-edition"
     },
@@ -373,18 +373,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip"
       },
       "name": "asciidoc"
     },
@@ -405,17 +405,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar"
+        "252.26199.587": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar"
       },
       "name": "wakatime"
     },
@@ -435,18 +435,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip"
       },
       "name": "gittoolbox"
     },
@@ -467,17 +467,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.25557.178": "https://plugins.jetbrains.com/files/7724/841415/clouds-docker-impl-252.25557.130.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip"
+        "252.26199.587": null,
+        "252.26830.46": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip"
       },
       "name": "docker"
     },
@@ -497,18 +497,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/8097/796399/graphql-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip"
+        "251.25410.129": null,
+        "252.26199.587": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip"
       },
       "name": "graphql"
     },
@@ -528,16 +528,16 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.25557.178": null,
-        "252.26199.153": null,
-        "252.26199.154": null,
-        "252.26199.157": null,
-        "252.26199.158": null,
-        "252.26199.162": null,
-        "252.26199.163": null,
-        "252.26199.169": null,
-        "252.26199.73": null
+        "252.26199.587": null,
+        "252.26830.46": null,
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.106": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.121": null,
+        "252.27397.92": null
       },
       "name": "-deprecated-rust"
     },
@@ -557,16 +557,16 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.25557.178": null,
-        "252.26199.153": null,
-        "252.26199.154": null,
-        "252.26199.157": null,
-        "252.26199.158": null,
-        "252.26199.162": null,
-        "252.26199.163": null,
-        "252.26199.169": null,
-        "252.26199.73": null
+        "252.26199.587": null,
+        "252.26830.46": null,
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.106": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.121": null,
+        "252.27397.92": null
       },
       "name": "-deprecated-rust-beta"
     },
@@ -587,17 +587,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/8195/819801/toml-252.23892.464.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/8195/846963/toml-252.25557.135.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip"
+        "252.26199.587": null,
+        "252.26830.46": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip"
       },
       "name": "toml"
     },
@@ -608,7 +608,7 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/8327/809293/Minecraft_Development-2025.1-1.8.6.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/8327/809294/Minecraft_Development-2025.2-1.8.6.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/8327/809294/Minecraft_Development-2025.2-1.8.6.zip"
       },
       "name": "minecraft-development"
     },
@@ -629,17 +629,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/8554/826552/featuresTrainer-252.23892.514.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/8554/834301/featuresTrainer-252.25557.79.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip"
       },
       "name": "ide-features-trainer"
     },
@@ -660,17 +660,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip"
       },
       "name": "nixidea"
     },
@@ -691,17 +691,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9164/796366/gherkin-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip"
       },
       "name": "gherkin"
     },
@@ -722,17 +722,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip"
       },
       "name": "-env-files"
     },
@@ -742,8 +742,8 @@
         "idea-ultimate"
       ],
       "builds": {
-        "252.26199.158": "https://plugins.jetbrains.com/files/9568/861058/go-plugin-252.26199.169.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/9568/861058/go-plugin-252.26199.169.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9568/882349/go-plugin-252.27397.103.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9568/882349/go-plugin-252.27397.103.zip"
       },
       "name": "go"
     },
@@ -764,17 +764,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.25557.178": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.153": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.154": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.157": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.158": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.159": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.162": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.163": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.169": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26199.73": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar"
+        "252.26199.587": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar"
       },
       "name": "ansi-highlighter-premium"
     },
@@ -795,17 +795,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
       },
       "name": "key-promoter-x"
     },
@@ -826,17 +826,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip"
       },
       "name": "randomness"
     },
@@ -857,17 +857,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip"
       },
       "name": "csv-editor"
     },
@@ -887,18 +887,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip"
       },
       "name": "rainbow-brackets"
     },
@@ -919,17 +919,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
       },
       "name": "dot-language"
     },
@@ -950,17 +950,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
       },
       "name": "hocon"
     },
@@ -980,16 +980,16 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip"
       },
       "name": "go-template"
     },
@@ -1009,18 +1009,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip"
       },
       "name": "extra-icons"
     },
@@ -1040,18 +1040,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/11349/861955/aws-toolkit-jetbrains-standalone-3.94.251.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/11349/879073/aws-toolkit-jetbrains-standalone-3.97.251.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip"
       },
       "name": "aws-toolkit"
     },
@@ -1060,7 +1060,7 @@
         "rider"
       ],
       "builds": {
-        "252.26199.154": "https://plugins.jetbrains.com/files/12024/834783/ReSharperPlugin.CognitiveComplexity-2025.2.0.zip"
+        "252.27397.121": "https://plugins.jetbrains.com/files/12024/834783/ReSharperPlugin.CognitiveComplexity-2025.2.0.zip"
       },
       "name": "cognitivecomplexity"
     },
@@ -1081,17 +1081,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip"
       },
       "name": "vscode-keymap"
     },
@@ -1112,17 +1112,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip"
       },
       "name": "eclipse-keymap"
     },
@@ -1143,17 +1143,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
       },
       "name": "rainbow-csv"
     },
@@ -1174,17 +1174,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip"
       },
       "name": "visual-studio-keymap"
     },
@@ -1205,17 +1205,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
       },
       "name": "indent-rainbow"
     },
@@ -1236,17 +1236,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip"
       },
       "name": "protocol-buffers"
     },
@@ -1267,17 +1267,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.25557.178": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.153": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.154": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.157": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.158": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.159": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.162": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.163": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.169": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26199.73": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
+        "252.26199.587": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
       },
       "name": "darcula-pitch-black"
     },
@@ -1298,17 +1298,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.25557.178": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.153": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.154": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.157": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.158": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.159": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.162": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.163": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.169": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26199.73": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
+        "252.26199.587": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
       },
       "name": "mario-progress-bar"
     },
@@ -1329,17 +1329,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.25557.178": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.153": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.154": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.157": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.158": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.159": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.162": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.163": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.169": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26199.73": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar"
+        "252.26199.587": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar"
       },
       "name": "which-key"
     },
@@ -1359,18 +1359,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip"
       },
       "name": "extra-toolwindow-colorful-icons"
     },
@@ -1390,18 +1390,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip"
       },
       "name": "github-copilot"
     },
@@ -1422,17 +1422,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
       },
       "name": "netbeans-6-5-keymap"
     },
@@ -1452,18 +1452,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip"
       },
       "name": "catppuccin-theme"
     },
@@ -1483,18 +1483,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip"
       },
       "name": "codeglance-pro"
     },
@@ -1514,18 +1514,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.25557.178": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.153": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.154": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.157": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.158": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.159": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.162": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.163": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.169": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar",
-        "252.26199.73": "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar"
+        "251.25410.129": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar"
       },
       "name": "gerry-themes"
     },
@@ -1546,17 +1546,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
       },
       "name": "better-direnv"
     },
@@ -1577,17 +1577,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip"
       },
       "name": "mermaid"
     },
@@ -1608,17 +1608,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
       },
       "name": "ferris"
     },
@@ -1639,17 +1639,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip"
       },
       "name": "code-complexity"
     },
@@ -1670,17 +1670,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
       },
       "name": "developer-tools"
     },
@@ -1696,14 +1696,14 @@
         "webstorm"
       ],
       "builds": {
-        "252.26199.153": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip"
       },
       "name": "dev-containers"
     },
@@ -1714,9 +1714,9 @@
         "rust-rover"
       ],
       "builds": {
-        "252.26199.153": "https://plugins.jetbrains.com/files/22407/860027/intellij-rust-252.26199.159.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/22407/860027/intellij-rust-252.26199.159.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/22407/860027/intellij-rust-252.26199.159.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip"
       },
       "name": "rust"
     },
@@ -1736,18 +1736,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip"
       },
       "name": "continue"
     },
@@ -1768,17 +1768,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/22857/826717/vcs-gitlab-IU-252.23892.515-IU.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/22857/829212/vcs-gitlab-IU-252.25557.35-IU.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip"
       },
       "name": "gitlab"
     },
@@ -1798,18 +1798,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip"
       },
       "name": "catppuccin-icons"
     },
@@ -1830,17 +1830,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
+        "252.26199.587": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
       },
       "name": "mermaid-chart"
     },
@@ -1860,18 +1860,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/23806/784029/Oxocarbon-1.4.6.zip",
-        "252.23892.529": null,
-        "252.25557.178": null,
-        "252.26199.153": null,
-        "252.26199.154": null,
-        "252.26199.157": null,
-        "252.26199.158": null,
-        "252.26199.159": null,
-        "252.26199.162": null,
-        "252.26199.163": null,
-        "252.26199.169": null,
-        "252.26199.73": null
+        "251.25410.129": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip"
       },
       "name": "oxocarbon"
     },
@@ -1891,18 +1891,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip"
       },
       "name": "extra-ide-tweaks"
     },
@@ -1922,18 +1922,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.25557.178": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.153": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.154": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.157": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.158": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.159": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.162": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.163": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.169": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip",
-        "252.26199.73": "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip"
       },
       "name": "extra-tools-pack"
     },
@@ -1950,15 +1950,15 @@
         "webstorm"
       ],
       "builds": {
-        "252.26199.153": null,
-        "252.26199.154": null,
-        "252.26199.157": null,
-        "252.26199.158": null,
-        "252.26199.159": null,
-        "252.26199.162": null,
-        "252.26199.163": null,
-        "252.26199.169": null,
-        "252.26199.73": null
+        "252.26830.46": null,
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.120": null,
+        "252.27397.121": null,
+        "252.27397.92": null
       },
       "name": "nix-lsp"
     },
@@ -1978,30 +1978,30 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/26084/804883/markdtask-2025.2.zip",
-        "252.25557.178": null,
-        "252.26199.153": null,
-        "252.26199.154": null,
-        "252.26199.157": null,
-        "252.26199.158": null,
-        "252.26199.159": null,
-        "252.26199.162": null,
-        "252.26199.163": null,
-        "252.26199.169": null,
-        "252.26199.73": null
+        "252.26830.46": null,
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.106": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.120": null,
+        "252.27397.121": null,
+        "252.27397.92": null
       },
       "name": "markdtask"
     }
   },
   "files": {
     "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip": "sha256-jk5JisClylJCL6PdQIUC5pyKb9ccEYJl7T7AyAkAkEE=",
-    "https://plugins.jetbrains.com/files/10080/834534/intellij-rainbow-brackets-2025.3.4.zip": "sha256-hB6m8uJ+QpLhYLiBzzcw6TB0yla4enKEJLN6aRLDcGU=",
+    "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip": "sha256-50IFDt9PC6IpjFLL8ggbybhf8dCi4U3ceKDfbDjEK6Q=",
     "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip": "sha256-25vtwXuBNiYL9E0pKG4dqJDkwX1FckAErdqRPKXybQA=",
     "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip": "sha256-GO0bXJsHx9O1A6M9NUCv9m4JwKHs5plwSssgx+InNqE=",
     "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip": "sha256-zX1nEdq84wwQvGhV664V5bNBPVTI4zWo306JtjXcGkE=",
     "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip": "sha256-XKv4jEKOk2O++VdHycGoLgICsusULbWRlQ0J5p+KgAE=",
-    "https://plugins.jetbrains.com/files/11058/857270/Extra_Icons-2025.1.14.zip": "sha256-iHyO6ZnEaP4rZMywGXZo6+PPMv+2KOjeWRLpdM8qAsU=",
-    "https://plugins.jetbrains.com/files/11349/861953/aws-toolkit-jetbrains-standalone-3.94.252.zip": "sha256-RABuHyvvbw1rGzvQpOk4tEpilVghQE75VzLIvRmFNfw=",
-    "https://plugins.jetbrains.com/files/11349/861955/aws-toolkit-jetbrains-standalone-3.94.251.zip": "sha256-y+AdD8SPKUpB1FU5bWknSkW+q1rhQR5j56pHP5s4NXE=",
+    "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip": "sha256-kc/C/c9zsMVO0ZrPI6XH/P9X4XaoprJxo3v9ZlWVCiw=",
+    "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip": "sha256-Un5ZwdJNDuR6Gkox9WiY6Ab8IY9YwBiSIogbeaYeciM=",
+    "https://plugins.jetbrains.com/files/11349/879073/aws-toolkit-jetbrains-standalone-3.97.251.zip": "sha256-QV0oxBSRsQVU+kLzRgaOSU0f7NcQPBXWHBiUvcry3KA=",
     "https://plugins.jetbrains.com/files/12024/834783/ReSharperPlugin.CognitiveComplexity-2025.2.0.zip": "sha256-XDBmYpBpLhuLGTB8aP0csK1NBEncmMUPKWoPJx2AVao=",
     "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip": "sha256-obbLL8n6gK8oFw8NnJbdAylPHfTv4GheBDnVFOUpwL0=",
     "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip": "sha256-V3Vk6UYLUSiSmypD+g0DCX1sPw3/wZqvLxFhbkTqY34=",
@@ -2012,19 +2012,19 @@
     "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip": "sha256-5qDjLRMNwn+1QVN8cKUYlakQ8aBRiTyGuA7se3l9BI0=",
     "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=",
     "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip": "sha256-h9GNGjqTc+h+x/0TRilKmqGoPsxhPmXIKoGC/s4/PKg=",
-    "https://plugins.jetbrains.com/files/1347/861692/scala-intellij-bin-2025.2.30.zip": "sha256-cfHmeInFoymKaqBNqhquPN1pde+hRpk61P9mibAuC+s=",
+    "https://plugins.jetbrains.com/files/1347/882283/scala-intellij-bin-2025.2.48.zip": "sha256-FUirdeHtISeqLDzBKNEViFg9EMqMGlh2xD9PhIMD9ZA=",
     "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip": "sha256-ZYn365EY8+VP1TKM4wBotMj1hYbSSr4J1K5oIZlE2SE=",
     "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip": "sha256-WK9ukN6g2tCmeljFXwv3F+xFI/VZKlIeFs8DXqPcIKA=",
     "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
     "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=",
     "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar": "sha256-Qujmu2j8nrgkbsRc+ei/musrNAI1UPC3vhwIjv53zxY=",
     "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip": "sha256-upipz12aBnfW5I+IpO7FFmrSyQNTqNWxYn4Bghu4LV4=",
-    "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip": "sha256-g07e6dfHkNbdiG54cqGBChxNsEHQ/5kMBhLlGkK6di4=",
-    "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip": "sha256-UN+4+QhGHloiSuaSf5KwTCaSorYBLb0h2OusmOjd64k=",
+    "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip": "sha256-5n8iX6LJ7mm95pUABEXzr7IjZuDdiBvrBY8qYoFaxTU=",
+    "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip": "sha256-PArPmySjlt/i/GKwm7qZxzjJh9xN2QAKaWTCFMN+yuE=",
     "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
-    "https://plugins.jetbrains.com/files/18682/852457/Catppuccin_Theme-3.5.1.zip": "sha256-dxZAIsXfdwsdTx+bp/1aaahw+D4HXOSEpyY7JWAhLys=",
-    "https://plugins.jetbrains.com/files/18824/859305/CodeGlancePro-1.9.9-signed.zip": "sha256-uAHkTDvFUEzdasYgyB0yn8yVMEHvB8dn+Z5jSoB5PQo=",
-    "https://plugins.jetbrains.com/files/18922/856642/GerryThemes.jar": "sha256-0QVCCkrgDWEX8tAkfPfiYRpaROd3ELGZn5TBGa3lJXQ=",
+    "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip": "sha256-F37RoWSV96ofEw7ckvhSS4nHaXUJOBuWecEhzaH2Zk4=",
+    "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip": "sha256-v/BwU04VevdH7I40yiU7wOMn6CsFmSc63TKAVAcMiJI=",
+    "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar": "sha256-ohVw2m/BeXssfTfsBm28RXrEW0gmqUmI/Q3Ob/SdTC4=",
     "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=",
     "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip": "sha256-QTh77pyi4lh7V0DGPFx9kERjFCop219d76wTDwD0SYY=",
     "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip": "sha256-N66Bh0AwHmg5N9PNguRAGtpJ/dLMWMp3rxjTgz9poFo=",
@@ -2032,25 +2032,24 @@
     "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip": "sha256-8agNBVenqaV9DlvRmFP7ul3IZfj9Dij8v/h8QMUb72E=",
     "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip": "sha256-lOPUSxlbgagD0SuXTw+fEdwTxxfUHP1Kl6L+u/oa4fs=",
     "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip": "sha256-uwonawWIgXi9OXZlQaZl/GDt/iHqsyAKV7ifCgcMqWU=",
-    "https://plugins.jetbrains.com/files/22407/860027/intellij-rust-252.26199.159.zip": "sha256-/7/PFoHjJpuuqvtW9P8L/cKtiA1o5gRCCROmkGW+dl4=",
-    "https://plugins.jetbrains.com/files/22707/857674/continue-intellij-extension-1.0.44.zip": "sha256-EvCNPNYeEtQRmNEbLizH6MEIqPNvTwsk2qJm873s8oo=",
-    "https://plugins.jetbrains.com/files/22857/826717/vcs-gitlab-IU-252.23892.515-IU.zip": "sha256-1fkImbCktws9WcnJSwnMiZ7ULc3hKj9TiFXuNDf+L/U=",
-    "https://plugins.jetbrains.com/files/22857/829212/vcs-gitlab-IU-252.25557.35-IU.zip": "sha256-7fLyaf7JNH3FwKSH+HsQcGNszzzVMUy2qsFmcWgW0/g=",
+    "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip": "sha256-gpfWoNR/RiWe36Og5eL9MROtrqKVlZRHxVqeFCaS7lo=",
+    "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip": "sha256-7553kxXry5sEJJn+Za4RsfUJGn/roAap8qDkaHjhfXQ=",
     "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip": "sha256-dJM8j5aLWD6elv46HtXUhPvYWTdAE77m/jwRqztIwDk=",
-    "https://plugins.jetbrains.com/files/23029/764814/Catppuccin_Icons-1.12.0.zip": "sha256-TZNCi4kRc7NNcV89j2UhT6y1+l1L512xTN/yTztjQfY=",
+    "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip": "sha256-bTqJlTkoOyBm370Ks6kFpvxzRJJ7CSucT298YBQtl/M=",
+    "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip": "sha256-fE0M8jYTYVIC0bbBDY9fWB+mgGcVIFkeee0VTAMXt2E=",
     "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=",
-    "https://plugins.jetbrains.com/files/23806/784029/Oxocarbon-1.4.6.zip": "sha256-+cLKIu8abGXZqJ3GutQsoQQg3s0wkmk5qKosW0O8RII=",
-    "https://plugins.jetbrains.com/files/23927/839297/Extra_IDE_Tweaks_Subscription-2025.1.12.zip": "sha256-EtPWFr7stHfRSVowuH3BN3r2oBx8mut2T+6Ij8LEgmE=",
-    "https://plugins.jetbrains.com/files/24559/857271/Extra_Tools_Pack-2025.1.16.zip": "sha256-l/PChea8RmVLlD3COrikZ3xTq2iwztbCsJkzKIvUcaQ=",
+    "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip": "sha256-952sONSgui6bSVFYfRhx1PbHWHas24y0SdHl5QhNIdQ=",
+    "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip": "sha256-mAJXZSYib+vH2DPsoLOfV+9wW9fWyUM/nXkwDwqg6FI=",
+    "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip": "sha256-sM8SLxkLnIXhkz2xoLV7uJ7oqNMAhliKQwDkSx2GKX4=",
     "https://plugins.jetbrains.com/files/26084/804883/markdtask-2025.2.zip": "sha256-2Vrm9k4ZqqpWl/EgDrAFNTpUeBhDSYt48JhAWlSWY1A=",
-    "https://plugins.jetbrains.com/files/631/861064/python-252.26199.169.zip": "sha256-SEX/CnP3d3itW9gzGx3QA3WyGRn2pRSDBjSbzBGOGM8=",
+    "https://plugins.jetbrains.com/files/631/882374/python-252.27397.103.zip": "sha256-v3EO4oMT8CaJJRWikKYKC4TyQ2uyCnP+o5nxLg94+1E=",
     "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip": "sha256-34s7pOsqMaGoVYhCuAZtylNwplQOtNQJUppepsl4F4Q=",
     "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip": "sha256-iWKLgk+eWhUmv/lH9+B2HI97d++EYvLwGgtRsJf4aSE=",
-    "https://plugins.jetbrains.com/files/6954/809234/Kotlin-252.23892.360-IJ.zip": "sha256-pQGVguF7zzzasLm2tlmtvqiPtdFN4Q5NKRwYx1r62fM=",
-    "https://plugins.jetbrains.com/files/6954/841446/Kotlin-252.25557.131-IJ.zip": "sha256-ogFUJ+BMATp7fM2vDjWkoGhLCRw9TN+ifopFlpP+q4Q=",
     "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip": "sha256-Fk/Df5MthwTWnhxv/u8/n2ITMLzZXKogj0tRRyPi5Zw=",
-    "https://plugins.jetbrains.com/files/6981/846966/ini-252.25557.135.zip": "sha256-9rrbHi+3fe/dlTkGGSnZ/fKh44vsLDOEbFCx5rPokfQ=",
-    "https://plugins.jetbrains.com/files/6981/861757/ini-252.26199.163.zip": "sha256-l+ETZNsDuQf+Cjh2vYi6/xi3th2QZeR+UflOtRRcKWI=",
+    "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip": "sha256-C1JXMUNESJ29psA661Z8/R5Jj1155YjVXdgDFcBY01k=",
+    "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip": "sha256-zzSRwttzhbdhyV/De6a1TDSg5746iosG91LBSAeLcUQ=",
+    "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip": "sha256-hETXYiz7bXDOWXjK9tUWST/VzaKdfU4hluuDWF3FTGY=",
+    "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip": "sha256-GaYYYsyBjAcWsBY3W+qx1Frx7GGbNdGIHg+gHnPHdJg=",
     "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip": "sha256-BW47ZEUINVnhV0RZ1np7Dkf3lfyrtKoZ9ej/SVct2Xs=",
     "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip": "sha256-KcRoHqvCcC6qRz58DHkQ6AFqnpyqPhETekuMWBQYYw8=",
     "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip": "sha256-jNHP/vaCaolmvNUQRGmIgSR1ykjDtKqyJ69UIn5cz70=",
@@ -2060,31 +2059,26 @@
     "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip": "sha256-ypJOPmcl4881TpMboomVvmspJ3I1sfm5a26l54cfFpo=",
     "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip": "sha256-SgldikXjVx6hUw3LqcN8/NxLLBfnr/LUc/SrIIACl7k=",
     "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip": "sha256-FQmHb4oo9TgXiJ4b7EEEELagOx31C9iQtsTRoqxCnO4=",
-    "https://plugins.jetbrains.com/files/7322/841474/python-ce-252.25557.131.zip": "sha256-OA3GRyoEzIqsIqKCwIHcMss8SSb5u/YqNUo9kEjszsA=",
-    "https://plugins.jetbrains.com/files/7322/861072/python-ce-252.26199.169.zip": "sha256-fzoj+iBfEEE6gjlGNtqfqpYXqwaEr2LFECNOglMyz5Y=",
-    "https://plugins.jetbrains.com/files/7391/807449/asciidoctor-intellij-plugin-0.44.8.zip": "sha256-6VpRIidsf8iWJeR3OarwwgS1NDXj9j6bLnxU/YBskeY=",
+    "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip": "sha256-7Tkcnl2km29lxQtBIX0ahKXShy16Lk1EBiwmKZBjpIc=",
+    "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip": "sha256-RjzA95Pc+UWa1XJklCw2qs6cLL0X8rlMedaxYt5L/G8=",
+    "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip": "sha256-k2nL2OupoiqQHkLAauo/bLJ2hQ5HVAXrGEQMkVel0eE=",
     "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar": "sha256-DobKZKokueqq0z75d2Fo3BD8mWX9+LpGdT9C7Eu2fHc=",
-    "https://plugins.jetbrains.com/files/7499/840762/gittoolbox-600.1.10_243-signed.zip": "sha256-AEkeSl3yUelw5jOEBXCPPeWZU/Q2cE9ekUSXN409iCw=",
-    "https://plugins.jetbrains.com/files/7724/841415/clouds-docker-impl-252.25557.130.zip": "sha256-u5BDqZlqkx9cEmDuri5+DN6E40YyF9G0f0gLehhtZ2s=",
-    "https://plugins.jetbrains.com/files/7724/861752/clouds-docker-impl-252.26199.163.zip": "sha256-izEzIQxn23ZV2ZClMmd6g9H0sd+jy+OoaISvX94H7hQ=",
-    "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip": "sha256-O+gSW36MwqQqUiZBQl8J4NFNK+jFowtT9k1ykhSraxM=",
-    "https://plugins.jetbrains.com/files/8097/796399/graphql-252.23892.201.zip": "sha256-eLh0p5vDNG7fUV7pqbIbkL30dpPj19NE9JbwcDwxZXs=",
+    "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip": "sha256-o6HEc0RuM/GRZL0ke+Zrr8uSZGMLL0dDlubuwHdnGJc=",
+    "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip": "sha256-abY9ZqQ0z80B2l6HNUJxF3ZyLdLjCYo0K6Y5mlDOZvc=",
+    "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip": "sha256-Y8yrKgPQVa/VnJIxoIBYsukBGlSPoX6GWnEdypTOUC0=",
     "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip": "sha256-wN3+7++f6i0MvEmOTiWZgAW1QzM5HiD7jSAMS8jWC5s=",
-    "https://plugins.jetbrains.com/files/8195/819801/toml-252.23892.464.zip": "sha256-CXbS+/k9a4YqYPRxd5OWGxtal2+5ECshavcOSrYqca0=",
-    "https://plugins.jetbrains.com/files/8195/846963/toml-252.25557.135.zip": "sha256-vICiXs86VP1gyMy594bCOcb5jZ+Ptw1Ui7r6dQwIveQ=",
-    "https://plugins.jetbrains.com/files/8195/861057/toml-252.26199.169.zip": "sha256-8miuDbuQkeB4Nc9DsI+NiGbZ9PdEFrFMfEG9sB4FJEM=",
+    "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip": "sha256-trwXodrcUo1SHloOm6hQa3IUBS9F+VxK5jYvOxtSOI8=",
+    "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip": "sha256-MVzOzED2tWhoq6p0p2j5f6Gd/TPbIyom4Cu/jdNwekk=",
     "https://plugins.jetbrains.com/files/8327/809293/Minecraft_Development-2025.1-1.8.6.zip": "sha256-mePVZa+63bheH85ylkbX9oOX1Nq/IYLAGHHseOJx520=",
     "https://plugins.jetbrains.com/files/8327/809294/Minecraft_Development-2025.2-1.8.6.zip": "sha256-NOuzQ+CL+Z8n5gwMBaberLyMvS5KNmXKwZ+j88+SFqU=",
-    "https://plugins.jetbrains.com/files/8554/826552/featuresTrainer-252.23892.514.zip": "sha256-AQLuTcRERFq2ZfzOqUGMte/pLe7/3g6G+9UqNMuUYiY=",
-    "https://plugins.jetbrains.com/files/8554/834301/featuresTrainer-252.25557.79.zip": "sha256-b+Xv06OhVZirdqR8qOsNv+6gXfBo6VOb27iuipmoEJY=",
     "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip": "sha256-euvA9ZNcFcQ6iZ5AC6tpyeJKTkAGzIq4jJ2sdLF0Fno=",
+    "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip": "sha256-evHs8vwjnUSjN20ewZaMCpKHQbbjOmN+TspNqOMhihM=",
     "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip": "sha256-JShheBoOBiWM9HubMUJvBn4H3DnWykvqPyrmetaCZiM=",
     "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip": "sha256-Boy61dRieXmWrnTMfqqYZbdG/DNQ24KdguKN2fcZ+eg=",
-    "https://plugins.jetbrains.com/files/9164/796366/gherkin-252.23892.201.zip": "sha256-KrC3EK4wYLSxWywF8I8nVx6tkclr1wAMya1Z1XF0QY8=",
     "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip": "sha256-y66kYTYD+R9Sert2JHWGwFFIgc5UJTssZrjgvzOjljk=",
     "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip": "sha256-0c/2qbuu+M6z0gvpme+Mkv23JlQKNTUU+9GL9mh2IFw=",
     "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip": "sha256-N0DNEtF3FDcRirfjfSCCVUbDIA4SB35F/9XY1tPXXmg=",
-    "https://plugins.jetbrains.com/files/9568/861058/go-plugin-252.26199.169.zip": "sha256-tt/vvW8EVNP9n9aTGtn+9pmxwz450p3a0Rclkg65aKw=",
+    "https://plugins.jetbrains.com/files/9568/882349/go-plugin-252.27397.103.zip": "sha256-bEDB8GfqxmY1Pqco2mYW55QQvleidHYOdjyj6sWEpKE=",
     "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar": "sha256-XYCD4kOHDeIKhti0T175xhBHR8uscaFN4c9CNlUaCDs=",
     "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar": "sha256-mp1k2BdksxbGH4zUp/7DnjcGi5OXJ7UekCfX6dWZOtU=",
     "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=",
diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index 0a1de3a871a2..40dfdc959d50 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -43,7 +43,7 @@ let
       src = fetchFromGitHub {
         owner = "clojupyter";
         repo = "clojupyter";
-        rev = version;
+        tag = version;
         sha256 = "sha256-BCzcPnLSonm+ELFU4JIIzLPlVnP0VzlrRSGxOd/LFow=";
       };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
index 843f4a07b71d..6c3d0acd67d4 100644
--- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
+++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
@@ -94,6 +94,9 @@ clangStdenv.mkDerivation rec {
       --replace-fail "simplisticCastAs" "castAs"
     substituteInPlace src/xmime_internal.hpp \
       --replace-fail "code.str()" "code.str().str()"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4.3)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   dontStrip = debug;
diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix
index 4496b943997b..2a72d84c47f7 100644
--- a/pkgs/applications/editors/jupyter/kernel.nix
+++ b/pkgs/applications/editors/jupyter/kernel.nix
@@ -62,7 +62,7 @@ in
                 "logo64"
                 "extraPaths"
               ];
-              kernel = lib.filterAttrs (n: v: (lib.any (x: x == n) allowedKernelKeys)) unfilteredKernel;
+              kernel = lib.filterAttrs (n: v: (lib.elem n allowedKernelKeys)) unfilteredKernel;
               config = builtins.toJSON (
                 kernel
                 // {
diff --git a/pkgs/applications/editors/kakoune/plugins/update-shell.nix b/pkgs/applications/editors/kakoune/plugins/update-shell.nix
index 787891309237..761ed6aad3ca 100644
--- a/pkgs/applications/editors/kakoune/plugins/update-shell.nix
+++ b/pkgs/applications/editors/kakoune/plugins/update-shell.nix
@@ -4,7 +4,7 @@
 
 with pkgs;
 let
-  pyEnv = python3.withPackages (ps: [ ps.gitpython ]);
+  pyEnv = python3.withPackages (ps: [ ps.nixpkgs-plugin-update ]);
 in
 
 mkShell {
diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py
index 9b06d0c06e9c..169304c9aa4e 100755
--- a/pkgs/applications/editors/kakoune/plugins/update.py
+++ b/pkgs/applications/editors/kakoune/plugins/update.py
@@ -13,12 +13,9 @@ import os
 import sys
 from pathlib import Path
 
-# Import plugin update library from maintainers/scripts/pluginupdate.py
+import nixpkgs_plugin_update
+
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))  # type: ignore
-sys.path.insert(
-    0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
-)
-import pluginupdate
 
 GET_PLUGINS = f"""with import <localpkgs> {{ }};
 let
@@ -53,10 +50,10 @@ lib.mapAttrs parse generated"""
 HEADER = "# This file has been @generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
 
 
-class KakouneEditor(pluginupdate.Editor):
+class KakouneEditor(nixpkgs_plugin_update.Editor):
     def generate_nix(
         self,
-        plugins: list[tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]],
+        plugins: list[tuple[nixpkgs_plugin_update.PluginDesc, nixpkgs_plugin_update.Plugin]],
         outfile: str,
     ):
         with open(outfile, "w+") as f:
@@ -88,7 +85,7 @@ in lib.fix' (lib.extends overrides packages)
         print(f"updated {outfile}")
 
     def update(self, args):
-        pluginupdate.update_plugins(self, args)
+        nixpkgs_plugin_update.update_plugins(self, args)
 
 
 def main():
diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index 2f5f9c7b07f8..5b5568892ec5 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -128,7 +128,7 @@ let
     }
   );
 in
-pkgs.recurseIntoAttrs rec {
+pkgs.lib.recurseIntoAttrs rec {
 
   inherit nmt;
 
diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 546b6e2600b3..9a8bbfae3208 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.23";
+  version = "0.26.24";
 
   src = fetchurl {
     url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-sExQmI6sJsUHaKtb1A9bNaNIxE1uDmqNVgVjzw6xo7E=";
+    sha256 = "sha256-MbIyPwL01PyHLD/BNdVLuQklglaB5ZHdJfSmgMDSZWo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 10388a6d822d..216f21518538 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
   };
 
+  patches = [
+    # Check if the patch can be removed next release
+    ./fix-build-with-qt-6-10.patch
+  ];
+
   buildInputs = [
     poppler
     qtbase
diff --git a/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch b/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch
new file mode 100644
index 000000000000..4de5263f6922
--- /dev/null
+++ b/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef6a4e6..b564be8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -386,7 +386,7 @@ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_AUTORCC ON)
+ 
+-find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)
++find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core CorePrivate Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)
+ 
+ qt_standard_project_setup()
+ 
diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 11875eaac7e1..eb20cd063c8e 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.1765";
+  version = "9.1.1869";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-bL6mqnke0uE0Bk7oYjJPiPtl/9Qk8fvCXrQVqAb7pPM=";
+    hash = "sha256-AHx4AHsJAsEE5LRzKgBeV3LoCaoHUB+0/gq7kOHObMk=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index fcb8a7de920e..943fd5b3b29e 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -7,20 +7,25 @@
   gettext,
   pkg-config,
   cscope,
-  ruby,
+  ruby_3_4,
   tcl,
   perl,
   luajit,
   darwin,
   libiconv,
   python3,
+  enablePython ? false,
+  rcodesign,
 }:
 
+let
+  inherit (lib) optional optionals optionalString;
+in
+
 # Try to match MacVim's documented script interface compatibility
 let
-  #perl = perl540;
-  # Ruby 3.3
-  #ruby = ruby_3_3;
+  # Ruby 3.4
+  ruby = ruby_3_4;
 
   # Building requires a few system tools to be in PATH.
   # Some of these we could patch into the relevant source files (such as xcodebuild and
@@ -35,13 +40,13 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "macvim";
 
-  version = "179";
+  version = "181";
 
   src = fetchFromGitHub {
     owner = "macvim-dev";
     repo = "macvim";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-L9LVXyeA09aMtNf+b/Oo+eLpeVEKTD1/oNWCiFn5FbU=";
+    hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow=";
   };
 
   enableParallelBuilding = true;
@@ -49,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     buildSymlinks
-  ];
+  ]
+  ++ optional stdenv.isAarch64 rcodesign;
   buildInputs = [
     gettext
     ncurses
@@ -58,8 +64,8 @@ stdenv.mkDerivation (finalAttrs: {
     ruby
     tcl
     perl
-    python3
-  ];
+  ]
+  ++ optional enablePython python3;
 
   patches = [ ./macvim.patch ];
 
@@ -71,14 +77,22 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-multibyte"
     "--enable-nls"
     "--enable-luainterp=dynamic"
+  ]
+  ++ optionals enablePython [
     "--enable-python3interp=dynamic"
+  ]
+  ++ [
     "--enable-perlinterp=dynamic"
     "--enable-rubyinterp=dynamic"
     "--enable-tclinterp=yes"
     "--without-local-dir"
     "--with-luajit"
     "--with-lua-prefix=${luajit}"
+  ]
+  ++ optionals enablePython [
     "--with-python3-command=${python3}/bin/python3"
+  ]
+  ++ [
     "--with-ruby-command=${ruby}/bin/ruby"
     "--with-tclsh=${tcl}/bin/tclsh"
     "--with-tlib=ncurses"
@@ -92,6 +106,13 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     echo "Patching file src/MacVim/MacVim.xcodeproj/project.pbxproj"
     sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj
+  ''
+  # Xcode 26.0 sets *_DEPLOYMENT_TARGET env vars for all platforms in shell script build phases.
+  # This breaks invocations of clang in those phases, as they target the wrong platform.
+  # Note: The shell script build phase in question uses /bin/zsh.
+  + ''
+    substituteInPlace src/MacVim/MacVim.xcodeproj/project.pbxproj \
+      --replace-fail 'make \' $'for x in ''${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake \\'
   '';
 
   # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a
@@ -101,7 +122,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       # ideally we'd recurse, but we don't need that right now
       inputs = [ ncurses ] ++ perl.propagatedBuildInputs;
-      ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs;
+      ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs ++ [ "-headerpad_max_install_names" ];
       cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs;
     in
     ''
@@ -131,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: {
     # as the scheme seems to have the wrong default.
     + ''
       configureFlagsArray+=(
-        XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData"
+        XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData LDFLAGS='\$(inherited) -headerpad_max_install_names' ENABLE_CODE_COVERAGE=NO"
         --with-xcodecfg="Release"
       )
     '';
@@ -149,9 +170,9 @@ stdenv.mkDerivation (finalAttrs: {
   # Xcode project or pass it as a flag to xcodebuild as well.
   postConfigure = ''
     substituteInPlace src/auto/config.mk \
-      --replace " -L${stdenv.cc.libc}/lib" "" \
-      --replace " -L${darwin.libunwind}/lib" "" \
-      --replace " -L${libiconv}/lib" ""
+      --replace-warn " -L${stdenv.cc.libc}/lib" "" \
+      --replace-warn " -L${darwin.libunwind}/lib" "" \
+      --replace-warn " -L${libiconv}/lib" ""
 
     # All the libraries we stripped have -osx- in their name as of this time.
     # Assert now that this pattern no longer appears in config.mk.
@@ -191,12 +212,21 @@ stdenv.mkDerivation (finalAttrs: {
     libperl=$(dirname $(find ${perl} -name "libperl.dylib"))
     install_name_tool -add_rpath ${luajit}/lib $exe
     install_name_tool -add_rpath ${tcl}/lib $exe
+  ''
+  + optionalString enablePython ''
     install_name_tool -add_rpath ${python3}/lib $exe
+  ''
+  + ''
     install_name_tool -add_rpath $libperl $exe
     install_name_tool -add_rpath ${ruby}/lib $exe
 
     # Remove manpages from tools we aren't providing
-    find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete
+    find $out/Applications/MacVim.app/Contents/man \( -name evim.1 -or -name eview.1 \) -delete
+    rm $out/Applications/MacVim.app/Contents/man/man1/mvim.1
+  ''
+  + optionalString stdenv.isAarch64 ''
+    # Resign the binary and set the linker-signed flag.
+    rcodesign sign --code-signature-flags linker-signed $exe
   '';
 
   # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and
@@ -212,33 +242,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Vim - the text editor - for macOS";
     homepage = "https://macvim.org/";
     license = licenses.vim;
-    maintainers = [ ];
+    maintainers = with maintainers; [ lilyball ];
     platforms = platforms.darwin;
     hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
-    # Needs updating to a newer MacVim for Python and Ruby version support
-    broken = true;
     knownVulnerabilities = [
-      "CVE-2023-46246"
-      "CVE-2023-48231"
-      "CVE-2023-48232"
-      "CVE-2023-48233"
-      "CVE-2023-48234"
-      "CVE-2023-48235"
-      "CVE-2023-48236"
-      "CVE-2023-48237"
-      "CVE-2023-48706"
-      "CVE-2023-5344"
-      "CVE-2023-5441"
-      "CVE-2023-5535"
-      "CVE-2024-22667"
-      "CVE-2024-41957"
-      "CVE-2024-41965"
-      "CVE-2024-43374"
-      "CVE-2024-47814"
-      "CVE-2025-1215"
-      "CVE-2025-22134"
-      "CVE-2025-24014"
-      "CVE-2025-26603"
       "CVE-2025-29768"
       "CVE-2025-53905"
       "CVE-2025-53906"
diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch
index 223778acf60c..767c59bd154c 100644
--- a/pkgs/applications/editors/vim/macvim.patch
+++ b/pkgs/applications/editors/vim/macvim.patch
@@ -199,16 +199,3 @@ index 6e33142..6185f45 100644
  #ifdef AMIGA
  # include "os_amiga.h"
  #endif
-diff --git a/src/vimtutor b/src/vimtutor
-index 3b154f2..e89f260 100755
---- a/src/vimtutor
-+++ b/src/vimtutor
-@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
- if test "$1" = "-g"; then
-     # Try to use the GUI version of Vim if possible, it will fall back
-     # on Vim if Gvim is not installed.
--    seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
-+    seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
-     shift
- fi
- 
diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 454b0496e86d..7dad6f4e806e 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -42,7 +42,7 @@ mapAliases (
     blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17
     BufOnly = BufOnly-vim;
     calendar = calendar-vim;
-    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01
+    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
     coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
     coffee-script = vim-coffee-script;
     coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
@@ -73,6 +73,7 @@ mapAliases (
     easymotion = vim-easymotion;
     echodoc = echodoc-vim;
     eighties = vim-eighties;
+    ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
     extradite = vim-extradite;
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
     fugitive = vim-fugitive;
@@ -119,6 +120,7 @@ mapAliases (
     repeat = vim-repeat;
     riv = riv-vim;
     rhubarb = vim-rhubarb;
+    rust-tools-nvim = lib.warnOnInstantiate "rust-tools-nvim is abandoned by upstream; you should use rustaceanvim" rust-tools-nvim;
     sensible = vim-sensible;
     signature = vim-signature;
     snipmate = vim-snipmate;
diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 72f38d3e94d4..c073c194ca1e 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -1,74 +1,62 @@
 {
+  lib,
   buildVimPlugin,
-  coc-basedpyright,
-  coc-clangd,
-  coc-css,
-  coc-diagnostic,
-  coc-docker,
-  coc-explorer,
-  coc-git,
-  coc-pyright,
-  coc-sh,
-  coc-spell-checker,
-  coc-toml,
+  pkgs,
 }:
-final: prev: {
-  coc-basedpyright = buildVimPlugin {
-    inherit (coc-basedpyright) pname version meta;
-    src = "${coc-basedpyright}/lib/node_modules/coc-basedpyright";
-  };
-
-  coc-clangd = buildVimPlugin {
-    inherit (coc-clangd) pname version meta;
-    src = "${coc-clangd}/lib/node_modules/coc-clangd";
-  };
-
-  coc-css = buildVimPlugin {
-    inherit (coc-css) pname version meta;
-    src = "${coc-css}/lib/node_modules/coc-css";
-  };
-
-  coc-diagnostic = buildVimPlugin {
-    inherit (coc-diagnostic) pname version meta;
-    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
-  };
-
-  coc-docker = buildVimPlugin {
-    inherit (coc-docker) pname version meta;
-    src = "${coc-docker}/lib/node_modules/coc-docker";
-  };
-
-  coc-explorer = buildVimPlugin {
-    inherit (coc-explorer) pname version meta;
-    src = "${coc-explorer}/lib/node_modules/coc-explorer";
-  };
-
-  coc-git = buildVimPlugin {
-    inherit (coc-git) pname version meta;
-    src = "${coc-git}/lib/node_modules/coc-git";
-  };
-
-  coc-pyright = buildVimPlugin {
-    pname = "coc-pyright";
-    inherit (coc-pyright) version meta;
-    src = "${coc-pyright}/lib/node_modules/coc-pyright";
-  };
-
-  coc-sh = buildVimPlugin {
-    pname = "coc-sh";
-    inherit (coc-sh) version meta;
-    src = "${coc-sh}/lib/node_modules/coc-sh";
-  };
-
-  coc-spell-checker = buildVimPlugin {
-    pname = "coc-spell-checker";
-    inherit (coc-spell-checker) version meta;
-    src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker";
-  };
-
-  coc-toml = buildVimPlugin {
-    pname = "coc-toml";
-    inherit (coc-toml) version meta;
-    src = "${coc-toml}/lib/node_modules/coc-toml";
-  };
-}
+final: prev:
+let
+  cocPackages = [
+    "coc-clangd"
+    "coc-cmake"
+    "coc-css"
+    "coc-diagnostic"
+    "coc-docker"
+    "coc-emmet"
+    "coc-eslint"
+    "coc-explorer"
+    "coc-flutter"
+    "coc-git"
+    "coc-haxe"
+    "coc-highlight"
+    "coc-html"
+    "coc-java"
+    "coc-jest"
+    "coc-json"
+    "coc-lists"
+    "coc-markdownlint"
+    "coc-pairs"
+    "coc-prettier"
+    "coc-pyright"
+    "coc-r-lsp"
+    "coc-rust-analyzer"
+    "coc-sh"
+    "coc-sh"
+    "coc-smartf"
+    "coc-snippets"
+    "coc-solargraph"
+    "coc-spell-checker"
+    "coc-sqlfluff"
+    "coc-stylelint"
+    "coc-sumneko-lua"
+    "coc-tabnine"
+    "coc-texlab"
+    "coc-toml"
+    "coc-toml"
+    "coc-vimlsp"
+    "coc-vimtex"
+    "coc-wxml"
+    "coc-basedpyright"
+    "coc-yaml"
+    "coc-yank"
+  ];
+in
+lib.genAttrs cocPackages (
+  pkg:
+  let
+    cocPkg = pkgs.${pkg};
+  in
+  buildVimPlugin {
+    inherit (cocPkg) pname version meta;
+    src = "${cocPkg}/lib/node_modules/${cocPkg.pname}";
+  }
+)
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 9dd5fc38be37..54d95e730d12 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -74,12 +74,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-10-08";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "f68deee85b8d734db1a9fbf63ce17a8164921267";
-      sha256 = "0jw5dswmkw2rjjia5g6dvj1fib032kc6k69zxbhnik4qg7blivdr";
+      rev = "db56110b19c702053e86d54b48d8d570c59d0b6b";
+      sha256 = "1k980vbvdyaam9q6bp9wng7v5774rqn2lapns43fnxrmf9whnc0q";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -204,12 +204,12 @@ final: prev: {
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2025-10-12";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "cfc0ae0184a96d1e69b0742c3db3075f7e0ecf2c";
-      sha256 = "03mbnz549sf8ra8mqh5qsw61irdlf3g6m58p9awzkyr37dkcfgg1";
+      rev = "a507822c0f67df661d1411f9274a65ca9cc832f5";
+      sha256 = "16xzmyz7l64q2hfimvfqi8cwysw6vci919dmn5n7ydws6h5pijag";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
     meta.hydraPlatforms = [ ];
@@ -217,12 +217,12 @@ final: prev: {
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2025-09-02";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "57c53693c99776385020e121a252cb35ac3edb72";
-      sha256 = "0b3j64nzcgwigsv6k465i3bw03d10rm54qvijzv331i82hs9nayf";
+      rev = "682e251efc9c4e0545d1f6bbc8c8639b198ecb1b";
+      sha256 = "1hxy2rcx17kjxpi2yh1p1hy4q9g7yap3kwqsyc4gys0hzmjv3n6a";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -308,12 +308,12 @@ final: prev: {
 
   NrrwRgn = buildVimPlugin {
     pname = "NrrwRgn";
-    version = "2022-02-13";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "NrrwRgn";
-      rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0";
-      sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah";
+      rev = "6a3f40bff37fcff7d4245932b47118f071b925f9";
+      sha256 = "1lc5wjwic8xvr3y746yny2a32d4p0lnxqj6ml1vyaszpidsimjih";
     };
     meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
     meta.hydraPlatforms = [ ];
@@ -412,12 +412,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-10-12";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "155d57353fbf0f9b0b8b7cdd7f8a7ee44bb7cd69";
-      sha256 = "17388q6ixkzp5zp2rn7n76wgq7bd0kgvrmyvwsvwkngrnj9w29cn";
+      rev = "976b31e094615b2c27009561b3c67a37c87c93c2";
+      sha256 = "1j51wbimw7fx30sx8rpc78aqx7j582lhywgb4vzd2d0r3irj3v10";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -581,12 +581,12 @@ final: prev: {
 
   YouCompleteMe = buildVimPlugin {
     pname = "YouCompleteMe";
-    version = "2024-12-16";
+    version = "2025-10-16";
     src = fetchFromGitHub {
       owner = "ycm-core";
       repo = "YouCompleteMe";
-      rev = "131b1827354871a4e984c1660b6af0fefca755c3";
-      sha256 = "14ja5wzbya8zfl66d1w0kzhpicpn9idhasral5xh9vqfmg3ql5rv";
+      rev = "b07b6f138ffa32362a928d6a7981c2a2bf2ac96f";
+      sha256 = "0743w1c41nl6nlzz4ccj7n1zfsbxjhaazv6jishcjhhhzyvnal06";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/ycm-core/YouCompleteMe/";
@@ -660,12 +660,12 @@ final: prev: {
 
   advanced-git-search-nvim = buildVimPlugin {
     pname = "advanced-git-search.nvim";
-    version = "2025-08-18";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "aaronhallaert";
       repo = "advanced-git-search.nvim";
-      rev = "ec0dabe38857bc7ba2097677e80155a572e0dfbe";
-      sha256 = "04rsv04xndk60sibwq4xx9mzkbv4444nhpk15mxnk15hp2784149";
+      rev = "e6d0fa39c7b058b4f3019912c3e26f854c4e36af";
+      sha256 = "0knc41f4yzahzxqq112lgwism2jlm2sz58pian03lxkjgnvrylwb";
     };
     meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/";
     meta.hydraPlatforms = [ ];
@@ -778,12 +778,12 @@ final: prev: {
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "2025-09-06";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "4217461c4859c4fac31ce3d2e22574218f244cf5";
-      sha256 = "044q1zgaz4r6s1b8v1d0k9ib50d81cm97byb10zaj3x0bq7r4f5m";
+      rev = "b9d7f56471084e7ac8070c90315170ef703217ff";
+      sha256 = "18ld6cai28xgf084ar77j1nm6ym50yk18365h1scfn4mg9vjbxqn";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.hydraPlatforms = [ ];
@@ -817,12 +817,12 @@ final: prev: {
 
   alpha-nvim = buildVimPlugin {
     pname = "alpha-nvim";
-    version = "2025-07-09";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "goolord";
       repo = "alpha-nvim";
-      rev = "2b3cbcdd980cae1e022409289245053f62fb50f6";
-      sha256 = "1ngim3ia9qbv1sxkscryvbn8xkw95rna5iy724yxgnq5sqxxg1jc";
+      rev = "3979b01cb05734331c7873049001d3f2bb8477f4";
+      sha256 = "12l57r2hl62b5kj9m2qr8gixybmp3p8k40dnripji5i8hyjw39jv";
     };
     meta.homepage = "https://github.com/goolord/alpha-nvim/";
     meta.hydraPlatforms = [ ];
@@ -830,12 +830,12 @@ final: prev: {
 
   amp-nvim = buildVimPlugin {
     pname = "amp.nvim";
-    version = "2025-10-09";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "sourcegraph";
       repo = "amp.nvim";
-      rev = "ccce82a82897b788d748e59cf09d958c3bfdd7e6";
-      sha256 = "17d1w93ihxpz8m06z7ab47s57669pq2qpj6ah7sdv9nik00incps";
+      rev = "621f1ca375fc2887d30a4ac32a8b6c582d28f9c0";
+      sha256 = "09f3md3khk5ccvhf897ddp387qjkvwwz5d9wjvlafb06cdixlagz";
     };
     meta.homepage = "https://github.com/sourcegraph/amp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1038,12 +1038,12 @@ final: prev: {
 
   asyncomplete-lsp-vim = buildVimPlugin {
     pname = "asyncomplete-lsp.vim";
-    version = "2025-10-09";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "asyncomplete-lsp.vim";
-      rev = "4b0cc02bef04f0f3ae196aacacc2156e0b842d29";
-      sha256 = "1hw2mv0wr9gw37g697sllznwbsqkdxackfvahywh172ph5bximai";
+      rev = "d5d91e1ad70edb00368c11d3e81008835ac14dd1";
+      sha256 = "0fp7vv5qh4mpg9plrzax3iy8jy6g815vpjlg83f0nqvcky8k3bk7";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/";
     meta.hydraPlatforms = [ ];
@@ -1090,12 +1090,12 @@ final: prev: {
 
   asyncomplete-vim = buildVimPlugin {
     pname = "asyncomplete.vim";
-    version = "2023-10-20";
+    version = "2025-10-18";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "asyncomplete.vim";
-      rev = "016590d2ca73cefe45712430e319a0ef004e2215";
-      sha256 = "1mpdhh9vmjasigw9r5zv5ikvia2vsqpm3l3bd3sqriwv597jcyb9";
+      rev = "17b654a87a834d4e835fb7467e562b4421ad9310";
+      sha256 = "1gfsz6w3k22m8n43czjkjijpmkacp75acgwj2gphm9vmbwmbl6x5";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/";
     meta.hydraPlatforms = [ ];
@@ -1142,12 +1142,12 @@ final: prev: {
 
   augment-vim = buildVimPlugin {
     pname = "augment.vim";
-    version = "2025-10-02";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "augmentcode";
       repo = "augment.vim";
-      rev = "3e357e385d59c1e641543f85e539c65021dc21b8";
-      sha256 = "0wsj5b3khfy2jwc276s4bjwpxs2vpc1hpaqqpdql2kj0dzqlfxv1";
+      rev = "96e8d6d16268e9fc2b0b1cc98ec754effa24690e";
+      sha256 = "0fkdyr8ak3j7jkccgcndzjkfxgx8mwjhb082lxw12sdaq9amgi6m";
     };
     meta.homepage = "https://github.com/augmentcode/augment.vim/";
     meta.hydraPlatforms = [ ];
@@ -1168,12 +1168,12 @@ final: prev: {
 
   auto-fix-return-nvim = buildVimPlugin {
     pname = "auto-fix-return.nvim";
-    version = "2025-08-12";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "Jay-Madden";
       repo = "auto-fix-return.nvim";
-      rev = "b3b672ac05039ea7e1527e99064f4221166b0f84";
-      sha256 = "1sfpbzznfkisslr21h4lv99fgd6kz3d5r0kdhiranjrj5wviqm5h";
+      rev = "700458d7e5b87b9434a07701bbc64fe4de0df486";
+      sha256 = "0s6ggdjap21l0pjlxjgk8izg8w4y4dz6983bmy11c7h9zb0iihrw";
     };
     meta.homepage = "https://github.com/Jay-Madden/auto-fix-return.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1233,12 +1233,12 @@ final: prev: {
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2025-10-07";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "517a75727d28a4d1ee9c79b56dde239a5408778f";
-      sha256 = "02zn9scv39hdl16k5qz35v33qvhxyql9cy8v7rzx1ajqxz9sxf5z";
+      rev = "292492ab7af4bd8b9e37e28508bc8ce995722fd5";
+      sha256 = "1bhnss104mn308ml5zhbpaw6cb0cn68bq8ws9g0268hr81frzx7p";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.hydraPlatforms = [ ];
@@ -1403,12 +1403,12 @@ final: prev: {
 
   barbar-nvim = buildVimPlugin {
     pname = "barbar.nvim";
-    version = "2025-08-12";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "549ee11d97057eae207bafa2c23c315942cca097";
-      sha256 = "107d46s7d4ljvb4ra6m14z6zd64mbvpnzcwcnwxjsf68g4d6a4n6";
+      rev = "fb4369940a07dda35fa4d7f54cf4a36aa00440e6";
+      sha256 = "0pnryr8m5dj1h0ki11b2mzq9wkcd8lg0l0w4pkyrd51a3dfa6wv1";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1429,12 +1429,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "2025-09-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "a2907cc3cd661e0f89f7db1f4fc304782a676a7d";
-      sha256 = "0acqa0b5n4l01ac9mbbxz2nbg8k8a50s0ajngg72l68q6m5z9mkm";
+      rev = "658bc3da344aa5e37efe10ec3ae4309a8035d102";
+      sha256 = "1gig4zqzm70msvl9achzr1gn90rmb670znc39jp7n66n45ifiq8j";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.hydraPlatforms = [ ];
@@ -1455,12 +1455,12 @@ final: prev: {
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "2025-09-27";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "db58475d3fd2a16f9b1467d6895e3c4c195ed7dd";
-      sha256 = "0q8s4215xmchi06lx0kqj1qw2f3svjq3yfdggyi065adm8di3k0r";
+      rev = "45b336ec52615dd1a3aa47848d894616dd6293a5";
+      sha256 = "14661jnzixfm62yf9nim8yh8j3rzqn101h9m5mb03ia37axdw5dy";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
     meta.hydraPlatforms = [ ];
@@ -1533,12 +1533,12 @@ final: prev: {
 
   blame-nvim = buildVimPlugin {
     pname = "blame.nvim";
-    version = "2025-09-24";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "FabijanZulj";
       repo = "blame.nvim";
-      rev = "d5f4ad5c8ebca3caecc773dda5983709c5a5da8f";
-      sha256 = "0vgwdb1x5vjsfw5xznnw00w9h1rfcc5h1cv4crfq8dh000iqmzr0";
+      rev = "f3f6153ea94e1120f2776f22bbbd63c4aeebaf32";
+      sha256 = "05q4wwz9rm1ycjg536ys3jsdqlnndhpm8jm6vb4wqlza3gqgm3h9";
     };
     meta.homepage = "https://github.com/FabijanZulj/blame.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1572,12 +1572,12 @@ final: prev: {
 
   blink-cmp-conventional-commits = buildVimPlugin {
     pname = "blink-cmp-conventional-commits";
-    version = "2025-02-18";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "disrupted";
       repo = "blink-cmp-conventional-commits";
-      rev = "e7ce3ddcc6d4044067d6d77ab41d480202e814ad";
-      sha256 = "0m72nyg3pm1ig04hvch6lzd4hy77dnmdxxmbq154qwkjhbm0bs6m";
+      rev = "c6eea4ecb755dffb7b57f42a1259447de7984974";
+      sha256 = "1d4mqmk342pq8isaixwvyppbv1g5ddc2a448ifa8yp4vgc7lk95d";
     };
     meta.homepage = "https://github.com/disrupted/blink-cmp-conventional-commits/";
     meta.hydraPlatforms = [ ];
@@ -1598,17 +1598,30 @@ final: prev: {
 
   blink-cmp-dictionary = buildVimPlugin {
     pname = "blink-cmp-dictionary";
-    version = "2025-06-20";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "Kaiser-Yang";
       repo = "blink-cmp-dictionary";
-      rev = "43b701fe9728a704bc63e4667c5d8b398bf129b2";
-      sha256 = "0zf7q6n7hl3p83f9idrryd0mzcw78ljgdcv5ak09946nh9nqsc5k";
+      rev = "944b3b215b01303672d4213758db7c5c5a1e3c92";
+      sha256 = "10lgn0pz7ywip8yq35fsbf7h8y16jfv4hqzhy72djx2bz2wrrjvv";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/";
     meta.hydraPlatforms = [ ];
   };
 
+  blink-cmp-env = buildVimPlugin {
+    pname = "blink-cmp-env";
+    version = "2025-09-13";
+    src = fetchFromGitHub {
+      owner = "bydlw98";
+      repo = "blink-cmp-env";
+      rev = "99af62c1f9aa46005e8f50ad4ccee581946546ca";
+      sha256 = "1wad8v0av1lfcfm8i07351n3zq41xil1fhfm8yj6kg96bk7cwk0c";
+    };
+    meta.homepage = "https://github.com/bydlw98/blink-cmp-env/";
+    meta.hydraPlatforms = [ ];
+  };
+
   blink-cmp-git = buildVimPlugin {
     pname = "blink-cmp-git";
     version = "2025-10-09";
@@ -1661,6 +1674,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  blink-cmp-tmux = buildVimPlugin {
+    pname = "blink-cmp-tmux";
+    version = "2025-05-23";
+    src = fetchFromGitHub {
+      owner = "mgalliou";
+      repo = "blink-cmp-tmux";
+      rev = "4586c705b6f80b536c34a61ed0d3cd4d7f08322d";
+      sha256 = "1d7kvpzjmasfk8lszwhpay46w1b11sas9s8542gdwqiv0l32dp7p";
+    };
+    meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/";
+    meta.hydraPlatforms = [ ];
+  };
+
   blink-cmp-words = buildVimPlugin {
     pname = "blink-cmp-words";
     version = "2025-08-06";
@@ -1674,6 +1700,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  blink-cmp-yanky = buildVimPlugin {
+    pname = "blink-cmp-yanky";
+    version = "2025-06-24";
+    src = fetchFromGitHub {
+      owner = "marcoSven";
+      repo = "blink-cmp-yanky";
+      rev = "473b987c2a7d80cca116f6faf087dba4dbfbb3c5";
+      sha256 = "1m0bkvp0bccavw46b6ycmhmx5bn7nx3w4z27linhlqd5gmlr1j0d";
+    };
+    meta.homepage = "https://github.com/marcoSven/blink-cmp-yanky/";
+    meta.hydraPlatforms = [ ];
+  };
+
   blink-compat = buildVimPlugin {
     pname = "blink.compat";
     version = "2025-05-28";
@@ -1689,12 +1728,12 @@ final: prev: {
 
   blink-copilot = buildVimPlugin {
     pname = "blink-copilot";
-    version = "2025-09-30";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "fang2hou";
       repo = "blink-copilot";
-      rev = "5d35fd07fcc148be20442da1bdd2407e03263d7d";
-      sha256 = "1686djbjrk3327d7varbzqwwfimz9irgpagl7yk8nnighfygz7mk";
+      rev = "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39";
+      sha256 = "0m3d88z83akivsjj7p07dgqmacpkalij3kziagkb6rf5d59dnfvh";
     };
     meta.homepage = "https://github.com/fang2hou/blink-copilot/";
     meta.hydraPlatforms = [ ];
@@ -1702,17 +1741,30 @@ final: prev: {
 
   blink-emoji-nvim = buildVimPlugin {
     pname = "blink-emoji.nvim";
-    version = "2025-05-24";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "moyiz";
       repo = "blink-emoji.nvim";
-      rev = "f22ce8cac02a6ece05368220f1e38bd34fe376f9";
-      sha256 = "1vnx779arsm4n1sjjwhraczp07am0i2n4m13jqv7ij01vd4c9wd4";
+      rev = "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06";
+      sha256 = "1hzzbx8sjjlwm0b2mdbi6wgkc87cf089pp2i3kycw7z0jsyk41wi";
     };
     meta.homepage = "https://github.com/moyiz/blink-emoji.nvim/";
     meta.hydraPlatforms = [ ];
   };
 
+  blink-indent = buildVimPlugin {
+    pname = "blink.indent";
+    version = "2025-11-07";
+    src = fetchFromGitHub {
+      owner = "Saghen";
+      repo = "blink.indent";
+      rev = "a8feeeae8510d16f26afbb5c81f2ad1ccea38d62";
+      sha256 = "1qm8h8yfkwf79hnfwn18qmk3546qzr3b9qzr6038lnbf54gzvkff";
+    };
+    meta.homepage = "https://github.com/Saghen/blink.indent/";
+    meta.hydraPlatforms = [ ];
+  };
+
   blink-nerdfont-nvim = buildVimPlugin {
     pname = "blink-nerdfont.nvim";
     version = "2025-02-06";
@@ -1728,12 +1780,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-10-12";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "2498b72753706d098e466c65167e80253ec2fe48";
-      sha256 = "01vw8n5yxzs11kfff5j5r6c15jki8hin97aqjywlm97792j3fjzx";
+      rev = "b0d25f47c3b50ccb4dbb26945f5e19d535701187";
+      sha256 = "1l96lg8qz6givg9l78bgdlxxnjj7nf9lz7c5s7clrvwcya1hhypq";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1949,12 +2001,12 @@ final: prev: {
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2025-10-08";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "af58927c55c9f3272c940ff02b3cee94a1249f26";
-      sha256 = "0gbaw3yqnxr75csl40rl3rc0ynsmvzc6jn78c07ksj0i510ib4n8";
+      rev = "234fc048de931a0e42ebcad675bf6559d75e23df";
+      sha256 = "0m6lg9fifx6izj6572jp0a5klmdly019hg2parvlqfyxwlksxlsq";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
     meta.hydraPlatforms = [ ];
@@ -2053,12 +2105,12 @@ final: prev: {
 
   checkmate-nvim = buildVimPlugin {
     pname = "checkmate.nvim";
-    version = "2025-10-11";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "bngarren";
       repo = "checkmate.nvim";
-      rev = "5ffa4af689505d41ec2462c4bfa4556daace7c91";
-      sha256 = "1hxc164rmfv2iqnq50k6kf7a6ljzzfjanl7apacm8hxdlyzv976v";
+      rev = "ebc9cbc305865e7f4952cd938d83fd992206245f";
+      sha256 = "0q9gssx8237lvhfr1f4zzvgalv5abggwv24sqd6m65lji9kfs8jd";
     };
     meta.homepage = "https://github.com/bngarren/checkmate.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2170,12 +2222,12 @@ final: prev: {
 
   claudecode-nvim = buildVimPlugin {
     pname = "claudecode.nvim";
-    version = "2025-09-29";
+    version = "2025-10-19";
     src = fetchFromGitHub {
       owner = "coder";
       repo = "claudecode.nvim";
-      rev = "ac2baef386d8078ef2a0aaa98580d25ec178f40a";
-      sha256 = "1cqmy7rgppw4ycl8vfpxl1059m6csnm7hxb24aw44znzi0niqws6";
+      rev = "1552086ebcce9f4a2ea3b9793018a884d6b60169";
+      sha256 = "02wf8g35y40f9xsc8ncnj11r18w35dp6a3cjnax54v9n2karz2ax";
     };
     meta.homepage = "https://github.com/coder/claudecode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2467,6 +2519,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  cmp-dotenv = buildVimPlugin {
+    pname = "cmp-dotenv";
+    version = "2024-06-05";
+    src = fetchFromGitHub {
+      owner = "SergioRibera";
+      repo = "cmp-dotenv";
+      rev = "4dd53aab60982f1f75848aec5e6214986263325e";
+      sha256 = "0pkkxfwsmp2rn77x8jbsb1j0avjx813n5kp4q6f0v0rfmjxk538i";
+    };
+    meta.homepage = "https://github.com/SergioRibera/cmp-dotenv/";
+    meta.hydraPlatforms = [ ];
+  };
+
   cmp-emoji = buildVimPlugin {
     pname = "cmp-emoji";
     version = "2024-03-19";
@@ -2924,12 +2989,12 @@ final: prev: {
 
   cmp_yanky = buildVimPlugin {
     pname = "cmp_yanky";
-    version = "2025-09-08";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "cmp_yanky";
-      rev = "9ed96f1d474c3bf7d445e943dc5d4a4277c19019";
-      sha256 = "0gfbdv29svr4bzk0c2psvq8ivss6y5qsd9nq6m1chvj6z9k25krl";
+      rev = "feea98d9b4d3ced314dc59b0f967ac2097c0b045";
+      sha256 = "087yan40lzzvkm2q3j7kxxh18x5hsg3v7mmn84xwvh07kq7kg6aj";
     };
     meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/";
     meta.hydraPlatforms = [ ];
@@ -2937,12 +3002,12 @@ final: prev: {
 
   cobalt2-nvim = buildVimPlugin {
     pname = "cobalt2.nvim";
-    version = "2025-10-02";
+    version = "2025-09-06";
     src = fetchFromGitHub {
       owner = "lalitmee";
       repo = "cobalt2.nvim";
-      rev = "b3fe7d51c7d07157a183c7f9c6ad0b562f491aa3";
-      sha256 = "0kjdswy1n8z7cwybzl8lcc9nlnljv94gdjmfkh39jjh02yqw5f06";
+      rev = "0cc17f3491feba19ed62b2d9622577f7822a0113";
+      sha256 = "06mmdiissgwpwh298nhcn16sgf38w1aq0bcjh4jh0ksnmglmsqv2";
     };
     meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3015,12 +3080,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-09-26";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "db6c23a19f7d39a2ba6f25c78d2e8ccd8e8db5ef";
-      sha256 = "0fax98vnzhajhmvs8vyv1ln7j8jvbgm690x8pa2b2kzmc35zk3x0";
+      rev = "2af9b441cb55ec4e2c54dace3f5fa8d581f2c884";
+      sha256 = "0zqx11054x5rrkjdwd5dzg00xjs9xhwbjf2qp7v6zy8nvy9hxscq";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3093,12 +3158,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-10-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "94f9120387aa80832c4f164f60a6804a27b9479c";
-      sha256 = "1cdndh9vfmawfq7js4cgb4cd0jjccyfz30x3giw8s49bayqbc5c6";
+      rev = "3e02000a14847aa49a90c297633d4be2f03702bc";
+      sha256 = "13bi04ryra8inzfaagh1l0vyh2x5zmxwxnww4pmax29z8cw7887j";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3418,12 +3483,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-10-08";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed";
-      sha256 = "0x1hi9na2d64r9vv6wm2azkdmhbvc5qpvwsp6akj21cvlvcnld7c";
+      rev = "cde4da5c1083d3527776fee69536107d98dae6c9";
+      sha256 = "0109c6y5kfckys2ikn6lv1m5zkmv7f4jy0l64nw3gr1wja1zr5vl";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3432,12 +3497,12 @@ final: prev: {
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2025-10-12";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "8c51801a9f2bc95be0e1a38c971b7177b009d0f6";
-      sha256 = "0jg2iwazr8cbkx8indji7jw98yn0xp3szzdrkm491lm0ldp1qzh5";
+      rev = "dab027e0cb710beb070424a117b9065279f6083d";
+      sha256 = "0ra30mszsp4w128066isqxc4glc587gyd5sz76v0p0yh21l1kg9c";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3510,12 +3575,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-10-09";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "92e08cd472653beaece28ad9c8508a851a613358";
-      sha256 = "031pfblrh4m1r9z05f5mzmxmvlwqzycmjyq3zk2nv538l7pi03i7";
+      rev = "5bde2cfe01f049f522eeb8b52c5c723407db8bdf";
+      sha256 = "09dwpn5siysyi86v49y9rb9sk3ghg9l4ws280wwd8r91j82xmipz";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3523,12 +3588,12 @@ final: prev: {
 
   copilot-lualine = buildVimPlugin {
     pname = "copilot-lualine";
-    version = "2025-04-05";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "AndreM222";
       repo = "copilot-lualine";
-      rev = "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333";
-      sha256 = "06kshzfzn3av27a1wrgaq93l6vz46a8084dd03addi2zw0rphaqn";
+      rev = "222e90bd8dcdf16ca1efc4e784416afb5f011c31";
+      sha256 = "0ngq7k2l31xinf5pza92ir472qyfja6yia216m9v7dhsvhynm0qx";
     };
     meta.homepage = "https://github.com/AndreM222/copilot-lualine/";
     meta.hydraPlatforms = [ ];
@@ -3575,12 +3640,12 @@ final: prev: {
 
   coq-thirdparty = buildVimPlugin {
     pname = "coq.thirdparty";
-    version = "2025-01-18";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "6ee3c221c308dca7071387267ac76c9272b184a9";
-      sha256 = "1ckk38c9szyhdg3kn09hs3xpgnvywwq7fmyzkp2vsjcz87n7180r";
+      rev = "2bd969a2bcd2624f9c260b1000957c7e665e308e";
+      sha256 = "08k5dd2w0ix47gfdbhqrmdy27dgabvlfx7aysnkp55kl3c00rv4p";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
     meta.hydraPlatforms = [ ];
@@ -3614,12 +3679,12 @@ final: prev: {
 
   cornelis = buildVimPlugin {
     pname = "cornelis";
-    version = "2025-07-30";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "agda";
       repo = "cornelis";
-      rev = "37641138d8c65a00d417a0f3b9d041b6b5c1a9dc";
-      sha256 = "0kaadvmg86j2094q39f53kq5sdwdy22z6h5pd9b4l3hnz7k85gkq";
+      rev = "8f7bdfe1a05dd3a310a9af3325bd4da2c78b567b";
+      sha256 = "1km6vni134pqh9izmqpdjs9wnff5k1fwbhy654ggnhsd7q9yjbqw";
     };
     meta.homepage = "https://github.com/agda/cornelis/";
     meta.hydraPlatforms = [ ];
@@ -3770,12 +3835,12 @@ final: prev: {
 
   ctrlp-vim = buildVimPlugin {
     pname = "ctrlp.vim";
-    version = "2024-10-21";
+    version = "2025-10-15";
     src = fetchFromGitHub {
       owner = "ctrlpvim";
       repo = "ctrlp.vim";
-      rev = "475a864e7f01dfc5c93965778417cc66e77f3dcc";
-      sha256 = "1xakj4yqra10hws4jh0h3x68x74qs2khk1318ckfq11zgz6d877s";
+      rev = "86872f021c4e245e3c583054fda82fb820a2faee";
+      sha256 = "1pmp7gdgp7yrgfn3mm1q346kdvll8w5jbiyxpgsyfqalkzafc5vs";
     };
     meta.homepage = "https://github.com/ctrlpvim/ctrlp.vim/";
     meta.hydraPlatforms = [ ];
@@ -3796,12 +3861,12 @@ final: prev: {
 
   cutlass-nvim = buildVimPlugin {
     pname = "cutlass.nvim";
-    version = "2023-12-18";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "cutlass.nvim";
-      rev = "1ac7e4b53d79410be52a9e464d44c60556282b3e";
-      sha256 = "0p00xjn6da7hj10vwnighsf1y0zmndfx9d2nb95whnq6awkbyr6f";
+      rev = "d01b5c1943050fcda8edf5c89d4419c41a65890e";
+      sha256 = "09hivhxpynvw1n8f2b2fzz7jq11vrm6dvyhj9qksikrgnabsiyh9";
     };
     meta.homepage = "https://github.com/gbprod/cutlass.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3872,6 +3937,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  dart-nvim = buildVimPlugin {
+    pname = "dart.nvim";
+    version = "2025-11-01";
+    src = fetchFromGitHub {
+      owner = "iofq";
+      repo = "dart.nvim";
+      rev = "8822aabbfef95eda2b22a8f7ee08912c762ef941";
+      sha256 = "1rmh2ql1xx4s212mcmmgv63abagl2z20k2njin9c7y5kcdppcdh0";
+    };
+    meta.homepage = "https://github.com/iofq/dart.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   dart-vim-plugin = buildVimPlugin {
     pname = "dart-vim-plugin";
     version = "2024-07-02";
@@ -4043,12 +4121,12 @@ final: prev: {
 
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
-    version = "2025-10-12";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "debugprint.nvim";
-      rev = "4d55a900f7aaa76a87af1e3806b9a5d1b213ab2f";
-      sha256 = "02ammjrivl7v5ga2k75bmjn9qxrmvznlfpbzlxlbs0f6afdjsyb3";
+      rev = "6b21243add2195e0918e062d6be86ad1d01e6d66";
+      sha256 = "0pvyhgw520843lz5gmi1z1lc7lzs621wpzlxs8mn8qr8nq0djz0w";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4173,12 +4251,12 @@ final: prev: {
 
   denops-vim = buildVimPlugin {
     pname = "denops.vim";
-    version = "2025-08-24";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "vim-denops";
       repo = "denops.vim";
-      rev = "a278b8342459e4687f24d4d575d72ff593326cee";
-      sha256 = "1k1zcqf88z6yxxwvs0mjcharmykqis57jh505s37xaff2zvmb114";
+      rev = "5cfca39988a36e42d81b925264fc846077a727e3";
+      sha256 = "1mwan663n7hhfg7hzlw0fmvbpspsfm0q3f3dbni0mf3sg1kh4070";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
     meta.hydraPlatforms = [ ];
@@ -4435,12 +4513,12 @@ final: prev: {
 
   devdocs-nvim = buildVimPlugin {
     pname = "devdocs.nvim";
-    version = "2025-03-09";
+    version = "2025-10-16";
     src = fetchFromGitHub {
       owner = "maskudo";
       repo = "devdocs.nvim";
-      rev = "1f39d611427af27befbf0edb3284ef0def830dd7";
-      sha256 = "11adw0b3kg0324gvpk9kb0s9crkg1rp1pgqgr1v08sc5lix7wjc5";
+      rev = "6175927cb2baa93934f10d7a1eca03055ebf0e94";
+      sha256 = "0h7vbp2hq68041l4z943qx4izxymsy4rrlr6c9rr212cyrs8ifsf";
     };
     meta.homepage = "https://github.com/maskudo/devdocs.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4630,12 +4708,12 @@ final: prev: {
 
   dracula-nvim = buildVimPlugin {
     pname = "dracula.nvim";
-    version = "2025-09-08";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "Mofiqul";
       repo = "dracula.nvim";
-      rev = "041d923368d540a1e438989ce8f915628081a56a";
-      sha256 = "0bl6hggv01pg5970nsi0vaf23mb46xzpjrkasi7134465lh0m1m3";
+      rev = "ae752c13e95fb7c5f58da4b5123cb804ea7568ee";
+      sha256 = "1bq0v2bf0wxz7l59rqr8n3mdg5sr7hh6zlddpm5p457qmrs90ic7";
     };
     meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4695,12 +4773,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-10-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "c55b216567234021da4a8118268ab51bdd2902ae";
-      sha256 = "0nj24wcp19jxm04x1z1nxq0ffi2hyzvvlmdqsz4594hkhixvgqk7";
+      rev = "e9cf21828228b30bc3c59957c0a1e7898d473767";
+      sha256 = "1nx1ciz5ig9l8dw3dzgs4awlszlwi31ab91ikywjblm2xh7ymb0m";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4721,12 +4799,12 @@ final: prev: {
 
   ecolog-nvim = buildVimPlugin {
     pname = "ecolog.nvim";
-    version = "2025-10-07";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "ph1losof";
       repo = "ecolog.nvim";
-      rev = "95ee6e265edbf682d6b2f35e857156009dec1861";
-      sha256 = "07d36ailqv4wgk7ljszxgnzgj9rwdsidmxca52i7mfk3aaha2jxx";
+      rev = "e4b2644a02d0b1c97a548ed93df6db13df90781f";
+      sha256 = "07a1d8gzd8bwzsadzy0lnb78w61qbicz2dndj1fhlnkdlyzhmsz5";
     };
     meta.homepage = "https://github.com/ph1losof/ecolog.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4734,12 +4812,12 @@ final: prev: {
 
   edge = buildVimPlugin {
     pname = "edge";
-    version = "2025-09-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "dfb013e84e8b8302d99ed75e664ccb2a05925ad3";
-      sha256 = "0hvyag79pqi52qiw0zxan9psc26ycmlbnxw6qr2v8mpzi666bgzq";
+      rev = "4145071bb0ea909511fa9a444eec80367b11296f";
+      sha256 = "09d64sbjsbl6lb42glni789scggz6h0smy7jm5rpq1h23k0iarsf";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
     meta.hydraPlatforms = [ ];
@@ -4760,12 +4838,12 @@ final: prev: {
 
   edgy-nvim = buildVimPlugin {
     pname = "edgy.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "edgy.nvim";
-      rev = "541705c0e2d67c8925d1c072ac11d30a644ca6a7";
-      sha256 = "16hrqbbqlm070yj9a5swkc9k2qqb1n0v4gh6hnlgq6hn4igpmcp8";
+      rev = "8bfd2808994a988c975694122f68624b8a219f5f";
+      sha256 = "0hwingrqjxvvb2wpq5s6z08idqzi766svghbqd9zavpqjhzb2wfh";
     };
     meta.homepage = "https://github.com/folke/edgy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4786,12 +4864,12 @@ final: prev: {
 
   editorconfig-vim = buildVimPlugin {
     pname = "editorconfig-vim";
-    version = "2025-04-21";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8";
-      sha256 = "1rsifgfdfjs6pmbvl6631xizsrdm1vv8vx63ak8q4rkdwxrc8vnv";
+      rev = "13b86c5c691785ffbf2d6508c621dabb08e93df0";
+      sha256 = "020i94wrdmjqfzkkrgmcs0626n65jbylg5kyz14llr108v3yxa4j";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -4800,12 +4878,12 @@ final: prev: {
 
   efmls-configs-nvim = buildVimPlugin {
     pname = "efmls-configs-nvim";
-    version = "2025-10-08";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "creativenull";
       repo = "efmls-configs-nvim";
-      rev = "9f82d2fe9919cd0c45c25d20c86c7728d3e162d3";
-      sha256 = "04733hb67kq99nq3xlni2pkdrlijw63fx36v559vs2i8majzxcpk";
+      rev = "11cc7a346f86b587a42a0348b41aa7c143e4ba1b";
+      sha256 = "1a740iqsc7l0cncg923g4h24lcg6rxziznx7yfzbczfgi9cqq9bw";
     };
     meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
     meta.hydraPlatforms = [ ];
@@ -4813,12 +4891,12 @@ final: prev: {
 
   elixir-tools-nvim = buildVimPlugin {
     pname = "elixir-tools.nvim";
-    version = "2025-09-29";
+    version = "2025-10-14";
     src = fetchFromGitHub {
       owner = "elixir-tools";
       repo = "elixir-tools.nvim";
-      rev = "51b026c1ed5fe32396e1cd94c2b67435b066a4fb";
-      sha256 = "0prns04rrygyw722afph4893vpc5i20vpc2aakf3bmxfag8f7ksm";
+      rev = "b51b48edc668924a6b2f6610f9a0aff34741d20e";
+      sha256 = "16wr6k9kc536k1yhp718msim3ygr22zm5ckv680jrz4s8qq5460l";
     };
     meta.homepage = "https://github.com/elixir-tools/elixir-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4931,12 +5009,12 @@ final: prev: {
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "2025-09-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "3fffb096f6ac11372944ac964c60f8af41d8809f";
-      sha256 = "0fwcdbbr9plmgzrahdswvh9rd5di17bxsgxf5zpk2fsdhz58pg6b";
+      rev = "17f101d7de851a7d3d705c22bc7c1760bce3cf6e";
+      sha256 = "03qwxhpx895vipqq6j85xp0j1il6xbsl9pvyn96x3yqmpyw1s7dc";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
     meta.hydraPlatforms = [ ];
@@ -5074,14 +5152,14 @@ final: prev: {
 
   fennel-vim = buildVimPlugin {
     pname = "fennel.vim";
-    version = "2020-11-15";
+    version = "2025-04-01";
     src = fetchFromGitHub {
-      owner = "bakpakin";
+      owner = "micampe";
       repo = "fennel.vim";
-      rev = "30b9beabad2c4f09b9b284caf5cd5666b6b4dc89";
-      sha256 = "1fvcn4q87d594nzxlj1597bmrixzlfqnl7k8f547skvvywx09kii";
+      rev = "0a5c89e7f31d2721a36f7043ee98e24e22e6325e";
+      sha256 = "12hcvc2c2dgxqs6x333fdc7f1fn4jz9vm6vm2g8iwlfhm70bcaab";
     };
-    meta.homepage = "https://github.com/bakpakin/fennel.vim/";
+    meta.homepage = "https://github.com/micampe/fennel.vim/";
     meta.hydraPlatforms = [ ];
   };
 
@@ -5166,12 +5244,12 @@ final: prev: {
 
   flash-nvim = buildVimPlugin {
     pname = "flash.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "flash.nvim";
-      rev = "2febce67ff9cf7638d2569d17c41af02c38401eb";
-      sha256 = "0j4wahallpj7xmq821mcvirdivf4qywdgd03m0i98gbgidp8lzfh";
+      rev = "fcea7ff883235d9024dc41e638f164a450c14ca2";
+      sha256 = "1xm26117d95qcnx2hpi8g469awmsr8wwdg1bmvipgjkzjys78y54";
     };
     meta.homepage = "https://github.com/folke/flash.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5257,12 +5335,12 @@ final: prev: {
 
   flutter-tools-nvim = buildVimPlugin {
     pname = "flutter-tools.nvim";
-    version = "2025-07-01";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "nvim-flutter";
       repo = "flutter-tools.nvim";
-      rev = "65b7399804315a1160933b64292d3c5330aa4e9f";
-      sha256 = "1wbw5k5a7iw6dqznv8z1xpg6yyx6sqb1cmspl18pa23cayvcsf12";
+      rev = "69db9cdac65ce536e20a8fc9a83002f007cc049c";
+      sha256 = "0nnvvqdamdi11jr6dkdm5anhv50fi7gfiyw10xd78182xjfmzlz8";
     };
     meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5336,12 +5414,12 @@ final: prev: {
 
   fortune-nvim = buildVimPlugin {
     pname = "fortune.nvim";
-    version = "2025-08-27";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "rubiin";
       repo = "fortune.nvim";
-      rev = "c5ad74c2eec74c6938ce813241ca1061ab1392eb";
-      sha256 = "0vhwczrgczikc16vl0w66zyg3wz9j1m85cln9qh9y0hsxdd5ipbh";
+      rev = "4df0e988dc3b9badcad98f4a9cbd340324d61269";
+      sha256 = "0capain2pz50aqkrzhkhl74mx3j7ywak2i91mhcnzghfqx61csj1";
     };
     meta.homepage = "https://github.com/rubiin/fortune.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5531,12 +5609,12 @@ final: prev: {
 
   gbprod-nord = buildVimPlugin {
     pname = "gbprod-nord";
-    version = "2025-09-29";
+    version = "2025-10-15";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "nord.nvim";
-      rev = "c0e33fc6a2587cdda67b4ee9eb26d01350a8f96b";
-      sha256 = "0i1ak45gxpsn3qqxwca5v0x8civ08sx7n1nswb8fmcp6jid6g9ix";
+      rev = "07647ad23e5b7fc1599a841dcd8f173b9aeb0419";
+      sha256 = "0g7vri04fvsn97ifkzp783mxzsq15xhbhq3bdax2vqdkzpn5nxps";
     };
     meta.homepage = "https://github.com/gbprod/nord.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5622,12 +5700,12 @@ final: prev: {
 
   git-blame-nvim = buildVimPlugin {
     pname = "git-blame.nvim";
-    version = "2025-09-04";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "f-person";
       repo = "git-blame.nvim";
-      rev = "9874ec1ec8bc53beb33b7cd82c092b85271a578b";
-      sha256 = "1lai0h98x25m8dy98g52hfhc5a7kjh70vw3hlff1pxzgayidi6cq";
+      rev = "5c536e2d4134d064aa3f41575280bc8a2a0e03d7";
+      sha256 = "1gd7l3qirq6s4y6bsgmsbbp48rlm1vx9afqj1kjmaa2m9jr5g9hh";
     };
     meta.homepage = "https://github.com/f-person/git-blame.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5791,12 +5869,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-10-02";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "db20146ef63322949af69b0955f80ee7d98145bd";
-      sha256 = "06przzv69hzc600vawnjakmql3fn99m6jz0531n1y5hpbrik3k5s";
+      rev = "81bb94c1d21648245eb14c69461f5c7f8c705752";
+      sha256 = "04xqsp0xp941yrskbdw3l003b9l81ar1c3vfjp0xbpwp6sgnz7as";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5908,12 +5986,12 @@ final: prev: {
 
   gruber-darker-nvim = buildVimPlugin {
     pname = "gruber-darker.nvim";
-    version = "2025-10-02";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "blazkowolf";
       repo = "gruber-darker.nvim";
-      rev = "d9d858d4b9774c36eb1e9d4463af8738b94f4f60";
-      sha256 = "1zndir3svzg0ccdy64m0g5vhdm0cj2s8pzi74bav4b9xs584acd2";
+      rev = "98a2e141981cbd5a194a97eae024bf55af854579";
+      sha256 = "0bxv33isymnbdzf71w79pfxkwi8ylhjiq3ir9ws2as1d73nnl6lv";
     };
     meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5973,12 +6051,12 @@ final: prev: {
 
   gruvbox-material = buildVimPlugin {
     pname = "gruvbox-material";
-    version = "2025-09-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "834dbf21836862300ced7444db4262b796330ab7";
-      sha256 = "0vlf94j9ijynvxyp0my2s9zz00c56cq4dp9039bcm6d059dkz3hf";
+      rev = "4bfc6983abc249c5943a60d8eb3980a3c2ababe1";
+      sha256 = "1s9kh1d8hbmdwsclb098lcr0rh5cj24wb5yrv217idn3bxypxf7z";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
     meta.hydraPlatforms = [ ];
@@ -6012,12 +6090,12 @@ final: prev: {
 
   guard-collection = buildVimPlugin {
     pname = "guard-collection";
-    version = "2025-08-24";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard-collection";
-      rev = "2fbf8449609ce522c36050e4e27235575c2d5439";
-      sha256 = "01xbpd4nm4c1gcxg5yqyk7g4d1fbdzkyc1x1m6ba7laq7cf15zql";
+      rev = "6bd5ad7941fc4c182f29c29a743eabc31fdac2e8";
+      sha256 = "1m20rdxaxgdq8sp8d2mxsjj2snxwzjg06c7l5ixj9rcapy7a0npq";
     };
     meta.homepage = "https://github.com/nvimdev/guard-collection/";
     meta.hydraPlatforms = [ ];
@@ -6025,12 +6103,12 @@ final: prev: {
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2025-10-11";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "5fd971c4a4d6112f14dc4024a6abf1db82b63c7b";
-      sha256 = "1g6l0yyhplav607ryyql0760crvdgzg5pzy26dbjijz99c5a8k6x";
+      rev = "8c1f379640628ccb119cf77e0c7950dd222aaf79";
+      sha256 = "196fm6v41mgxasyqkj3q1jrw0iwl30l138cvfzbm5wrd6rignnws";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6130,12 +6208,12 @@ final: prev: {
 
   harpoon2 = buildVimPlugin {
     pname = "harpoon2";
-    version = "2025-02-10";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "ThePrimeagen";
       repo = "harpoon";
-      rev = "ed1f853847ffd04b2b61c314865665e1dadf22c7";
-      sha256 = "1dcpdlna2lff9dlsh6i4v16qmn5r9279wdvn0ry3xg4abqwnzc9g";
+      rev = "87b1a3506211538f460786c23f98ec63ad9af4e5";
+      sha256 = "1d6fbqs1813nyarw3a4lckw746szw9sbxn9kch6lnxk5qxa8y159";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
     meta.hydraPlatforms = [ ];
@@ -6143,12 +6221,12 @@ final: prev: {
 
   haskell-scope-highlighting-nvim = buildVimPlugin {
     pname = "haskell-scope-highlighting.nvim";
-    version = "2024-12-18";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "kiyoon";
       repo = "haskell-scope-highlighting.nvim";
-      rev = "0b6238e1c5b2a53093e7d99a433ecdd4efff5db1";
-      sha256 = "013fa6vdjgw5jl7h9yvi68v8awg2zznrxz5gfgl6i1cv9ry2l900";
+      rev = "0ee8d06ef1a900977c9517e4fb2a55e5b5cbb03d";
+      sha256 = "0cdrxxp18lbsjjpssl68wp0ydqhpw9jmgxfn1hiqk26h718q4h14";
     };
     meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6208,12 +6286,12 @@ final: prev: {
 
   headhunter-nvim = buildVimPlugin {
     pname = "headhunter.nvim";
-    version = "2025-10-06";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "StackInTheWild";
       repo = "headhunter.nvim";
-      rev = "45eff1653c27a19c47c8a2dfed4897d4a434408d";
-      sha256 = "14p5kcn5drbfsklyvdajfgxyax6d5rpkn8qdnabibsqrw31bkj91";
+      rev = "de8b66662e9c5309b133708d30b08a6d180a7cfd";
+      sha256 = "0wwwyxcl5q60qvw1zqlp1g3r39gr8flgbyrd9905ixg30rr13z7z";
     };
     meta.homepage = "https://github.com/StackInTheWild/headhunter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6247,12 +6325,12 @@ final: prev: {
 
   helm-ls-nvim = buildVimPlugin {
     pname = "helm-ls.nvim";
-    version = "2025-09-11";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "qvalentin";
       repo = "helm-ls.nvim";
-      rev = "f36ecbd3e7b0b2ac8358a9d6a3213888e29943db";
-      sha256 = "01ad96y17yhwjr5a90v152r73j9a1qgx0r0gcaann4hs0328jfwz";
+      rev = "d6f3a8d4ad59b4f54cd734267dfb5411679ea608";
+      sha256 = "0hkb7mhm4dvs0x151193hvr69k1czsk7l0zbv0x2pr15rrmm3lsv";
     };
     meta.homepage = "https://github.com/qvalentin/helm-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6547,12 +6625,12 @@ final: prev: {
 
   idris2-nvim = buildVimPlugin {
     pname = "idris2-nvim";
-    version = "2025-05-22";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "idris2-nvim";
-      rev = "e3d4242a525ec8f1e0846f47b9730035a046100f";
-      sha256 = "009kl8kdwg56bydi0zmdkh9cggnyy4nakh2vd0l0l86fgji0rm5r";
+      rev = "19dcf61737293365c23c890ca622fa34aeb12780";
+      sha256 = "0ylixajcr3qc8lb4y8qjpxxlldxkc00kmslkl4b0bk7gxs8zldnc";
     };
     meta.homepage = "https://github.com/idris-community/idris2-nvim/";
     meta.hydraPlatforms = [ ];
@@ -6612,12 +6690,12 @@ final: prev: {
 
   inc-rename-nvim = buildVimPlugin {
     pname = "inc-rename.nvim";
-    version = "2025-09-28";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "smjonas";
       repo = "inc-rename.nvim";
-      rev = "7c79416330364976955ec8059fe3832b72ee1271";
-      sha256 = "1n64wf9c9bqi5lh76kv9a6ziv5i9p812mj5k8kg73i5c4z68www5";
+      rev = "2597bccb57d1b570fbdbd4adf88b955f7ade715b";
+      sha256 = "014hbrqwjlb5ij4ifgpbj6znp657k81yf7ws11hss5h3rx67m012";
     };
     meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6951,12 +7029,12 @@ final: prev: {
 
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
-    version = "2025-08-07";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "julelang";
       repo = "jule.nvim";
-      rev = "64f1cae1a5244d55136be3106b3f4edb30164f29";
-      sha256 = "1mb3lniqh4vl3kqivvs88l53cz9jk9ry18560lbizmva3l7q3zrr";
+      rev = "bf12f77901595b4ceea5de96e1aad6c353057411";
+      sha256 = "1ap5hkbxqiwbdkpcgf9hymgcx0zcy9irz0i4m3lx2827614ab12k";
     };
     meta.homepage = "https://github.com/julelang/jule.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6990,12 +7068,12 @@ final: prev: {
 
   kanagawa-nvim = buildVimPlugin {
     pname = "kanagawa.nvim";
-    version = "2025-10-03";
+    version = "2025-10-15";
     src = fetchFromGitHub {
       owner = "rebelot";
       repo = "kanagawa.nvim";
-      rev = "27f1e119f3a7e6d11d435a59e3262e6affda1f83";
-      sha256 = "0j9xipaj7gyx60r5hb5856252iw8izpmrncgldm2yh4i2axw0xbw";
+      rev = "aef7f5cec0a40dbe7f3304214850c472e2264b10";
+      sha256 = "048k6w6qf5hccii3drk4qdj5q5ar0hgbx7xgdfjqdizq6mci0xww";
     };
     meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7003,12 +7081,12 @@ final: prev: {
 
   kanagawa-paper-nvim = buildVimPlugin {
     pname = "kanagawa-paper.nvim";
-    version = "2025-10-06";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "thesimonho";
       repo = "kanagawa-paper.nvim";
-      rev = "b0c4d7ce2d3671ff3188030e585cc0c0a7b5e3a3";
-      sha256 = "0afin4sdakkx724r3nj730angfihi7lnqxi90np8c386jlq7fc9h";
+      rev = "8423e164a0fd2d1117a2e18c229cfd9e0635c82d";
+      sha256 = "1zvg0sfq4prfwnczvizsl00qpipjhwi970q45ry9w3j02blv042i";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7016,12 +7094,12 @@ final: prev: {
 
   kanso-nvim = buildVimPlugin {
     pname = "kanso.nvim";
-    version = "2025-08-16";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "webhooked";
       repo = "kanso.nvim";
-      rev = "151dbc23fe890d09c26df11b1208dd8129dca012";
-      sha256 = "1n8qak22wwakf82i9kiq8mq4gy5x6jxs39grcf5gw4bxd1sj3wl8";
+      rev = "81041940f469fba3c9eb6efe32eb3174281806df";
+      sha256 = "1vcmglqp5h202g81d83qlmzy6n76ml38qx06y6ifmmkvgq1g6070";
     };
     meta.homepage = "https://github.com/webhooked/kanso.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7133,12 +7211,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-09-28";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "0d50e9ce5c992fe507743d8641b36125e668aad4";
-      sha256 = "1svgdbxgsflkq2gn83vxd0m253pv8n664yjlgacfjr338vnxpyf2";
+      rev = "c328aeb219c4b77106917dd2698c90ea9657281b";
+      sha256 = "1hzy2mvvlh5gmya88inymsjxm7n52siaz3cg9jjn130jhr76mmsg";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -7212,12 +7290,12 @@ final: prev: {
 
   lazy-lsp-nvim = buildVimPlugin {
     pname = "lazy-lsp.nvim";
-    version = "2025-08-14";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "dundalek";
       repo = "lazy-lsp.nvim";
-      rev = "5ea87155f84629b0bd90853a0d035422d7acd3a5";
-      sha256 = "15chc4h9fiafppkzbh4ffykv08w48yi62iyvjjb4avwqnmgjswfq";
+      rev = "ccaaed19d7963bdc06000052eade993452b7ad86";
+      sha256 = "10f7fkhkisbmw7fp0prd8j5wknyb5gk64lhlgx8l2q53iv7fq5qm";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7225,12 +7303,12 @@ final: prev: {
 
   lazy-nvim = buildVimPlugin {
     pname = "lazy.nvim";
-    version = "2025-10-09";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1";
-      sha256 = "1zyxqdhlqniy0z4nrvisd5fjc75wb6nx4i53621di8k6r3il2541";
+      rev = "85c7ff3711b730b4030d03144f6db6375044ae82";
+      sha256 = "0hyh2dwh2ca7nf48cjsyrmbrnr1xyq530dsl4j6gl0fkg3i397l7";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7238,12 +7316,12 @@ final: prev: {
 
   lazydev-nvim = buildVimPlugin {
     pname = "lazydev.nvim";
-    version = "2025-10-08";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazydev.nvim";
-      rev = "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9";
-      sha256 = "1jzpwh6r2zw27aygacbjgf2fsfvlxkbqwbcvmgcz4c16v53d9721";
+      rev = "5231c62aa83c2f8dc8e7ba957aa77098cda1257d";
+      sha256 = "1sqy17m8lv4c1slpwyc7hnlp5iiqd0dav6r96szcyvbpahn4y3fn";
     };
     meta.homepage = "https://github.com/folke/lazydev.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7290,12 +7368,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-10-12";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "91aa0dc3a6a22090565b0b6e2530b8772a09a306";
-      sha256 = "0yf295x8513gzni8rck33ijkdqb4qz865zhvc7ms7naha5v6n4hy";
+      rev = "892a95683a8b037620235d330c6b83b9d617b332";
+      sha256 = "1rql217zwx5x4651ascy3ywkq369km190jrz9ad54vs2vicaqyq0";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7329,12 +7407,12 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2025-10-11";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "458aa5c77dbbcb0cddf6e30d1073ad0d1d63ab33";
-      sha256 = "1cqs8rpj2q9cdpxxkqs023i0k1y7y7qlhkz5qmi59l83jskppykd";
+      rev = "673517c316a0808a2f6948ed863e18c6cc03da21";
+      sha256 = "1zsr8c9zkbrb5gikijq0ag0496rpj4win5bdjizm8d73p1hfrrxc";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7381,12 +7459,12 @@ final: prev: {
 
   lensline-nvim = buildVimPlugin {
     pname = "lensline.nvim";
-    version = "2025-09-27";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "oribarilan";
       repo = "lensline.nvim";
-      rev = "9ae1e4a4d47533dc5bba301e790dcda44ec62be6";
-      sha256 = "0p8cylbpdlh7xvxzk4g4jbq5r3wnxaarv5ka0nb781msqlhqphv8";
+      rev = "ee938078aeee9751aafc20b055fcbb8aa579bb76";
+      sha256 = "1m7mj353jkfsgj3ad6ciyx7ms00z30byq449vnws06b40wyv79hh";
     };
     meta.homepage = "https://github.com/oribarilan/lensline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7693,12 +7771,12 @@ final: prev: {
 
   live-preview-nvim = buildVimPlugin {
     pname = "live-preview.nvim";
-    version = "2025-10-09";
+    version = "2025-10-19";
     src = fetchFromGitHub {
       owner = "brianhuster";
       repo = "live-preview.nvim";
-      rev = "bd099b730a9462cbcb1d0ea0b3b2205c084f573d";
-      sha256 = "1as35353pgzc76cc41k8wf292z60f3mgrzx2cjd0qy7fr8qzxkzp";
+      rev = "a1bb1b3a851df5276e53908276f5ae1d724d4812";
+      sha256 = "0mwjvqizm6rjpi33pxb5lpq0ag67kdfnqb5aalb7sz03rhs1k81y";
     };
     meta.homepage = "https://github.com/brianhuster/live-preview.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7732,12 +7810,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "2025-08-31";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "c31cd096eac44fee7e436ce34e8beed4b3c6befa";
-      sha256 = "0ak1hx9crd5l7ahm3vg5q2gbavwp35icppxr7bq4q922xbj60r9h";
+      rev = "ade8966eff57dcbe4a359dd26fb1ea97378ea03c";
+      sha256 = "11mkav5qd2ian851hkg65lks3sg4ijy1npnghnkchm4anmj8xymq";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.hydraPlatforms = [ ];
@@ -7797,12 +7875,12 @@ final: prev: {
 
   lsp-overloads-nvim = buildVimPlugin {
     pname = "lsp-overloads.nvim";
-    version = "2025-09-08";
+    version = "2025-10-17";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "lsp-overloads.nvim";
-      rev = "aecb7f4d69ad13e0de3fbcdeb46ac2649e7d9ba7";
-      sha256 = "0q9nalm5gwbxcs5zdsm0xk1qpjkl0fxfxcn7yj3ld1x60xsslqlp";
+      rev = "187912c9da30c2b4a1e8f2d3e3bc5dc899f91ea0";
+      sha256 = "054iz9fzal1mbnhpvfi6fg5p2lfbqa861x9k4l4aky4h7r8mpfv6";
     };
     meta.homepage = "https://github.com/Issafalcon/lsp-overloads.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7862,12 +7940,12 @@ final: prev: {
 
   lsp_signature-nvim = buildVimPlugin {
     pname = "lsp_signature.nvim";
-    version = "2025-07-31";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "lsp_signature.nvim";
-      rev = "62cadce83aaceed677ffe7a2d6a57141af7131ea";
-      sha256 = "131l83vfaj5b1yrsscrlbgs7rxl5n77275c1mpfbvafyy59ypg8f";
+      rev = "1e56259e00c70959a1b3fba908b8583722fb96bf";
+      sha256 = "13zaqnjqfiq9vqan3sm8x7nqwr49nwbnxnfdyxy0smaf30cmhf3c";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7927,12 +8005,12 @@ final: prev: {
 
   ltex_extra-nvim = buildVimPlugin {
     pname = "ltex_extra.nvim";
-    version = "2025-03-04";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "barreiroleo";
       repo = "ltex_extra.nvim";
-      rev = "67dc3465af8d8caa49a00aaff066289a94eb753e";
-      sha256 = "00l7snw6ji9zx1x99ck4js4n4mfi2spyzssfkwmf56q7w8h2v63b";
+      rev = "49ea83c231139d98b7c9668c99e7b4591421b056";
+      sha256 = "0kk1m74vwsx80vjyndg1c3xliqbdhmphgn87g70mx7yi0xxwncpl";
     };
     meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8042,6 +8120,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  maple-nvim = buildVimPlugin {
+    pname = "maple.nvim";
+    version = "2025-11-04";
+    src = fetchFromGitHub {
+      owner = "forest-nvim";
+      repo = "maple.nvim";
+      rev = "6fce52a264005884003567fd75978a4503ba8386";
+      sha256 = "0cpqf7a7cxf1xx62kxip0x7fzmsszzqymwr0087pj7n6ppwzb1f8";
+    };
+    meta.homepage = "https://github.com/forest-nvim/maple.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   mark-radar-nvim = buildVimPlugin {
     pname = "mark-radar.nvim";
     version = "2024-06-04";
@@ -8109,12 +8200,12 @@ final: prev: {
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-10-11";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "2f5d568937111968ea9d8aa9d77640979a84792d";
-      sha256 = "0ifg2mkvvaay68ygjndz5hxvb159zvpdizz0zdikl6743gpn4mgn";
+      rev = "5529dc4af26bbf00bf4ddcac797f8116baf6571e";
+      sha256 = "02rrrn1p71pcabfz4i9q59g295k69gxxm2clga2m4rdv92xjnzr7";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -8123,12 +8214,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2025-10-06";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "6bdb14f230de0904229ec367b410fb817e59b072";
-      sha256 = "17w1hdr3hifmx47qn1y15r9igd61gkkrwpcl68hj86720nsfiya7";
+      rev = "d7b5feb6e769e995f7fcf44d92f49f811c51d10c";
+      sha256 = "1249asya0kkrql0hw0zxdw8lkvm997kskwn3mk4vjj9vvsfpp903";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8136,12 +8227,12 @@ final: prev: {
 
   mason-null-ls-nvim = buildVimPlugin {
     pname = "mason-null-ls.nvim";
-    version = "2024-04-09";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "jay-babu";
       repo = "mason-null-ls.nvim";
-      rev = "de19726de7260c68d94691afb057fa73d3cc53e7";
-      sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys";
+      rev = "8e7806acaa87fae64f0bfde25bb4b87c18bd19b4";
+      sha256 = "0lsimv7w9317df3idifqkxcg3r3dl30l7d3nlvna17dcpjkc0m1s";
     };
     meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8162,12 +8253,12 @@ final: prev: {
 
   mason-nvim-dap-nvim = buildVimPlugin {
     pname = "mason-nvim-dap.nvim";
-    version = "2025-07-22";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "jay-babu";
       repo = "mason-nvim-dap.nvim";
-      rev = "86389a3dd687cfaa647b6f44731e492970034baa";
-      sha256 = "0x8b6h8p6awk0hhppbw8sadkmqn1inzaf5gw3kjg52zxqf9r9gky";
+      rev = "9a10e096703966335bd5c46c8c875d5b0690dade";
+      sha256 = "1szpnamiwzx02bjqhwky90w52rdssqk51ncq6kf96ps9a4agzm0f";
     };
     meta.homepage = "https://github.com/jay-babu/mason-nvim-dap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8201,12 +8292,12 @@ final: prev: {
 
   material-nvim = buildVimPlugin {
     pname = "material.nvim";
-    version = "2025-09-21";
+    version = "2025-10-18";
     src = fetchFromGitHub {
       owner = "marko-cerovac";
       repo = "material.nvim";
-      rev = "249289d9e75fa9ca054e6c6b98f56820e9719300";
-      sha256 = "089f1n2w1aqccf54dlp3x1098v8c7w7bwzn4ligq8vi4h2az7vvr";
+      rev = "8a34cb0d05e12a05b64edaf6ca1c3c7bde545628";
+      sha256 = "11d69cq0992pigvb9frird8n1mp6r0c0d4v3chdhsdas3k9j30ik";
     };
     meta.homepage = "https://github.com/marko-cerovac/material.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8331,12 +8422,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "11c57180bc9084089206e211ac7aa598bedc9673";
-      sha256 = "1j5gh95m3i85w5ygzdsswhs8skdbr5qjxl2frwzzi8qmvipiiip1";
+      rev = "0d3c9cf22e37b86b7a0dfbe7ef129ee7a5f4f93c";
+      sha256 = "1sapda1s8ddkx54cd9f4fmyzq3k2p32wql20a8v67mm2gniaxbdg";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.hydraPlatforms = [ ];
@@ -8344,12 +8435,12 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "2025-10-12";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
-      rev = "f42eeb70232fbc4761f2d895a173b117bfd11541";
-      sha256 = "1rqrx4bz4pwq25rz5h46fax0pp0ph31xjqz1ld3ncq4gi4mi6yx5";
+      rev = "60c61c8c63dca41b5ac6bfc36b52df69b1a03e6b";
+      sha256 = "1y8bkfl22h15jms5k4nphlyrpwxy8g61igxl2i2myxghwqag5rgb";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.hydraPlatforms = [ ];
@@ -8357,12 +8448,12 @@ final: prev: {
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.animate";
-      rev = "8ce6df739aa9d14c876bace722af28c3d09e9971";
-      sha256 = "1scq1r3v5k6qy2cgb8kzjp7xj86cq6ghji1wy42a6zqx85id4n0z";
+      rev = "0365de8b69331c25d0d0d7573407a7dc7719e578";
+      sha256 = "1c070l4mi8xj2cfx13z1p1qvc7gy0yizqq1yfn23widg8g9p8rzm";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.animate/";
     meta.hydraPlatforms = [ ];
@@ -8370,12 +8461,12 @@ final: prev: {
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "2025-10-06";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.base16";
-      rev = "0791663895f5b4ac1303461d5cb74fe4fa1e5804";
-      sha256 = "03zpcny5l146mmw6hdh4c01vnhsq7mgy2apzsa2rjfzl0k2zcrkw";
+      rev = "67638505e36a8ffe335655af2fe104138f60ab3d";
+      sha256 = "0p9qy5f3j2vdnggfhfiz80ivr8bpkglsdip5hsk1q3m33y4x462x";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.base16/";
     meta.hydraPlatforms = [ ];
@@ -8383,12 +8474,12 @@ final: prev: {
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "2025-10-06";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.basics";
-      rev = "6182df967709e3cd92b6e090c653cac4e872d6e3";
-      sha256 = "0jnmg5497497ikg3g3j7yccrwg7fmkx6b3gpsv9brp30qabchd68";
+      rev = "862b940b1ea67993893c6fd39ca1000beed1af46";
+      sha256 = "1ryl7ki67q2fphzrkxl8gpszsg7i8fqfvy6vrj82r2g152f66k8b";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.basics/";
     meta.hydraPlatforms = [ ];
@@ -8396,12 +8487,12 @@ final: prev: {
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bracketed";
-      rev = "0ea3cb6478e5fdeca33b53fd08683eb2e622f6ce";
-      sha256 = "0k3gw4w891sck9hghhj8aw4pzv2ip4ch1xnga78ai17b6kj9askl";
+      rev = "e50e3abcf6a3a5d234f58e4a247dfb3035f30a65";
+      sha256 = "0fsjzkf35drizr5am30by3f9021pvcdbz2a5nv9q8i9nn2524fr5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
     meta.hydraPlatforms = [ ];
@@ -8409,12 +8500,12 @@ final: prev: {
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bufremove";
-      rev = "1b5d7e7bc81cd02476bdd964c3d850c48eb91a07";
-      sha256 = "17g6m9cyfb2fhspyp43scxgp4kc5ylv1pfb23m1qljx25ysd0fp0";
+      rev = "10857aa39160c127694151828914df3131ba83b6";
+      sha256 = "12m9z1pzjgnpqi68rpa57sn95m0yj69mh0iy13w046r0pdcz0505";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bufremove/";
     meta.hydraPlatforms = [ ];
@@ -8422,12 +8513,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "6a42206a734befeb697da27afdf05f55ac2303fc";
-      sha256 = "0n8l66nfiq3h61w5faqig5xqk0m48vdc2pg2n9maida8hqyyz0l0";
+      rev = "e806253398f631c0c05a3cfe54fe479477ef9f4d";
+      sha256 = "1hh8mmb3aarn67c409jhv9bfdwqhnmrdgayngwysn5d2px7mqjx1";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.hydraPlatforms = [ ];
@@ -8435,12 +8526,12 @@ final: prev: {
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.colors";
-      rev = "a4184b9a517046ea11391cdaaf7dba25da134dce";
-      sha256 = "0nb5xrik84k1l43cspparqf5my7mngcfjzdk75a89bgadflxzc2w";
+      rev = "f43cab15ee0458acb13ac33a478b7e14fd4616eb";
+      sha256 = "13qqkdhhb48agf5nlx6sqx3z7177q3pq9pdj99p89cf1z6kna9is";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.colors/";
     meta.hydraPlatforms = [ ];
@@ -8448,12 +8539,12 @@ final: prev: {
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.comment";
-      rev = "c40bc46e72f41d3db265f6d86deb3dc259c0985d";
-      sha256 = "0hray8c4w0q167yz9j5nnpfh30h2ka1wgb7jwhc8dbnn94fvvbai";
+      rev = "a0c721115faff8d05505c0a12dab410084d9e536";
+      sha256 = "1r5hcq48b6hycmanlkrdv96zkahrwjqjgxgam0a1p8nx75jg9apa";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.comment/";
     meta.hydraPlatforms = [ ];
@@ -8461,12 +8552,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "27483b0ad3f2d269a6a0ce7564171817bca8fdf2";
-      sha256 = "1aqq4bba1p8d78ncwsaqzqvs31c9bdqnx9nr7zsxvx6gw5msfw80";
+      rev = "581934b58ff25cec7f68a3dfee66c9d1c42faf8e";
+      sha256 = "1spk0143n84l4382xc3ny6nw7qp9b6kdaj52svxzh82av0r030xy";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -8474,12 +8565,12 @@ final: prev: {
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cursorword";
-      rev = "d843392f739fcfd85969e2dadeb71c8e0221afb5";
-      sha256 = "1d52mdq1pi841hkln9qiirpkyzp9r3z10ff3ahyicb5mrb7czybp";
+      rev = "dda0f57d55bb1fa19423b7201b2ba892c7d2bb3c";
+      sha256 = "1qaq0xcaz8fc7sv7qdrm55z989jp6w24wbcl7qvc3a1hmgwz88ap";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
     meta.hydraPlatforms = [ ];
@@ -8487,12 +8578,12 @@ final: prev: {
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.deps";
-      rev = "4c11a93f841e9bfb001321796dae339c8cb57e44";
-      sha256 = "0z2sg6zbvwajap1ww3mm0r6l3wrcs8044dgmngndkn0h6pr8f3w6";
+      rev = "8f6f74a8b68dbad02f1813dff4ddae5afeee92df";
+      sha256 = "0qx879gxyq60wnn9kys7df54rzw0pwfhd2mamk4hswsn613hc65y";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.deps/";
     meta.hydraPlatforms = [ ];
@@ -8500,12 +8591,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "a2df2a9a485328c20252b7cadb11feb717020e45";
-      sha256 = "1l7k6dg8w9yvr01mdv0j37fr8f0ada9whgjx4ybnwkr1039iz8hp";
+      rev = "fbb93ea1728e7c9d0944df8bd022a68402bd2e7e";
+      sha256 = "0jrndrfxasdrq0avgc1cic28646vn68mq4zz1w8kcy8f7jn3bgw4";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.hydraPlatforms = [ ];
@@ -8513,12 +8604,12 @@ final: prev: {
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.doc";
-      rev = "16254b78d6cdb0e7c654b3d07dfed49a52df4ee0";
-      sha256 = "1kafd3zcvqnx25py7k30rpdkwgk0dkxb1kjzf6yhssmszssb94ms";
+      rev = "eb61bebe1d2b96835b1b67bb6e600cfc69ae4ad2";
+      sha256 = "0fcwgyxi3y6j8apcqhbgf8sz983bmriv5vyhwj9ix6qzpridvwj0";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.doc/";
     meta.hydraPlatforms = [ ];
@@ -8526,12 +8617,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "7efa774edf154fa06c037e903db8beacdc6f2850";
-      sha256 = "1960p3ips8hb9jvlcs6glnzcjls1g8rgfzqdhmc87hraavsi344j";
+      rev = "7a5231ff48e715daad4fe94448de0639bc227fdb";
+      sha256 = "0h40hawk4lfl9v80hkk458cbjlpjc68li95ikq7pccg0kdylgl2p";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.hydraPlatforms = [ ];
@@ -8539,12 +8630,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "51db5ded1b7ac4dd8ca4c22c66f156dac5309304";
-      sha256 = "025927ixm304qb8by37l4vgw7blafqbg6yasv99mzjq5xx469177";
+      rev = "dce9a4e4f14b3bf469e83c78aef393a090f4d057";
+      sha256 = "1rmazylfy7j54ii3b6shrrd4g66r37hr2x0qdn670bhvrm3m6kg4";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.hydraPlatforms = [ ];
@@ -8552,12 +8643,12 @@ final: prev: {
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.fuzzy";
-      rev = "b8af7f3633b3039b3f14db246dac2412fd1335f0";
-      sha256 = "14kwh0f7s3b9j3cdcb2655rm9jvaklwrj1m77l2dzhgx3sd5rlla";
+      rev = "18e9cc3d7406f44a145d074ad18b10e472509a18";
+      sha256 = "0b5d80744gcjp6nyzidby569p8s6jy0vkk29lk9msq0flxyb1lgg";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
     meta.hydraPlatforms = [ ];
@@ -8565,12 +8656,12 @@ final: prev: {
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini-git";
-      rev = "19600f7e3dee7e581479da4bd024551b080d90d4";
-      sha256 = "1783fhlfr73rww4vschpyxb53xh7s0dc4rjqbjcp88rnsql3qqk4";
+      rev = "832467238636e3dfa1db76de929996b6668c35ef";
+      sha256 = "1g59hk5y0p1mbmf8n279awiqm16c5bvl17082z71sk1faaq8z83r";
     };
     meta.homepage = "https://github.com/nvim-mini/mini-git/";
     meta.hydraPlatforms = [ ];
@@ -8578,12 +8669,12 @@ final: prev: {
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "2025-10-03";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hipatterns";
-      rev = "5629d5fba132b4ab0b3f0039549308421f65ff45";
-      sha256 = "0wyibqfms98i1c02sssz4sva0kk9dlpv06lfpcghjy7jxvnajva6";
+      rev = "add8d8abad602787377ec5d81f6b248605828e0f";
+      sha256 = "0282zk18fnlhdl59d9hll67njpzd54h5cv9vvkgns35kw9h42jhn";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
     meta.hydraPlatforms = [ ];
@@ -8591,12 +8682,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-10-12";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "1d565d51c91cc99756ed0a81f4c2243e3b1be584";
-      sha256 = "1apwyrq4p1ygmnsk3ni220jl3f2hzynkrqmbg9mw8a4hzypz3ajk";
+      rev = "83ad0612688241c5088fb1738a33a0503586d4be";
+      sha256 = "1dhl6d25ia6mf6lzvq2v74a0lizsxvxic23536cxmb3ygqis150p";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -8604,12 +8695,12 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a";
-      sha256 = "0k049j68sdbr41fy50ifyzy25nkb0brhbpwkf2w6iz0z4x4kqd4j";
+      rev = "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428";
+      sha256 = "0360yf87zq1zlnhhzxnnljh6c2q0s7h8a2c4bqi0k5k4j4fknyya";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.hydraPlatforms = [ ];
@@ -8617,12 +8708,12 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "e9fa0714fc753e1e737940577904e553ee340903";
-      sha256 = "0bv1bxqnkfkhwqphqy6mg6lp5038l5p08ljzx2zji2gkdckp5xk8";
+      rev = "0308f949f31769e509696af5d5f91cebb2159c69";
+      sha256 = "0z22icdlxa4d3bnc57inafd49lmpn3g6qj3y5qbcgrr3n2086asa";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.hydraPlatforms = [ ];
@@ -8630,12 +8721,12 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "7574c48a707aedcf1ad428a9cdefb8fdf871a638";
-      sha256 = "087g65xg1zcbzax9mx1dg4nf7n7gyj0rha1ib4idw1c7960pkmf4";
+      rev = "99799e8ca33fe936b81a70b5ab9a081f8794c8a1";
+      sha256 = "1ig56zibrqplicy2f7b189s1af5sx4pc10922n2j046dr6vdcslx";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.hydraPlatforms = [ ];
@@ -8643,12 +8734,12 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "5ff749990336e67195724d1dcddfea4e50057a19";
-      sha256 = "0cqqhm905an8daxw5pfy3jlywaqh71b200sgjd2mrb3rlnpbfg06";
+      rev = "7a089cb719adb7c2faa2a859038d69d58fcbee84";
+      sha256 = "1bslcspciqhdrsfqadij61i00jgaxklbx6q6gsd9i90j2yw9cndd";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.hydraPlatforms = [ ];
@@ -8656,12 +8747,12 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.keymap";
-      rev = "8849b592ded4c1ca99fca681be955f532befc05e";
-      sha256 = "1z400g6i71n6bcnza9y8i1fdkp08fk74npbq152ykhv6dd0p4c6i";
+      rev = "9a1ee970f05b113b3ce9ee6f330fe862706b7e49";
+      sha256 = "19b0rzbd7svwss0hwhh4bcqsswngkhp4xp182hw7fcvv3gqvqv1a";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
     meta.hydraPlatforms = [ ];
@@ -8669,12 +8760,12 @@ final: prev: {
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "2025-10-10";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.map";
-      rev = "70578281b12e4f4dce535c9b0faa8345a70ff2a9";
-      sha256 = "08dy13nq2vsl9r322g6hlzl5v30qx088biqnhn4kxjwv8agz78c5";
+      rev = "234eaf5cbcaee320d87e96465fbb534aa05b301e";
+      sha256 = "10jhyi9jbw2b1wjxl6ab7xlcn37pkbkccy9pni7xbpxpbgwqjnr5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.map/";
     meta.hydraPlatforms = [ ];
@@ -8682,12 +8773,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "2025-10-03";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "dd6c04962aea3693c6c52b4f1e06b139fdaf9b96";
-      sha256 = "1bpl6x653md0vn5vg4x8b28vj4xcp6r41zyyz30p8r4js1arc481";
+      rev = "61f29f871c34cbc221666384723e4523907323e3";
+      sha256 = "1i12n7n11f0jhbc86scamnvvlgyh7z6cvrrw8ryihqb0rzzsbhr9";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.hydraPlatforms = [ ];
@@ -8695,12 +8786,12 @@ final: prev: {
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.move";
-      rev = "f33406ae7d95b931c6a0d3ba11e50983fe800afb";
-      sha256 = "1gyqb5mg9xawz5y229psaw128iids33yizjh8wpff6ihnj1ymq18";
+      rev = "4d214202d71e0a4066b6288176bbe88f268f9777";
+      sha256 = "0hm9adfn4p3s4i97vqgpkbki6wz3r0g22l5mjyy0ffz8qdrdjvv5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.move/";
     meta.hydraPlatforms = [ ];
@@ -8708,12 +8799,12 @@ final: prev: {
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.notify";
-      rev = "7f3c4f05bb647bd2b8cb216c18db1768afe39ee0";
-      sha256 = "0j7gilwgl7dqvq5mm25rz8m9frlnf0g4dmxhhydbaamcc8x54ciw";
+      rev = "895630bc03d461609cbf64329203e7e007bb0db0";
+      sha256 = "1r1395hpxscyhawxm7l1s8w7ijixficlqqicxh2m4xxqc5n09vv2";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.notify/";
     meta.hydraPlatforms = [ ];
@@ -8721,12 +8812,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-10-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "1858276ae8d7931f230f50f6c7b9a62ed5b7ceb8";
-      sha256 = "02yazy6x007kdjkl99vzzrn1adwx7r3vxvrh26zr8rvky5jv4x7f";
+      rev = "42dbeaafb081a569b060b3b11101ca676a8f1193";
+      sha256 = "0yiydhkiwa4iw1w7sxsddc484af30590rmz06kbc0nj8lg679fnb";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8734,12 +8825,12 @@ final: prev: {
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.operators";
-      rev = "1d0d1e1570e5bd22e6df3bcb068d0a2ac0d30710";
-      sha256 = "1mcbx1pvf5cqbn6m2nav5qaydx0pjycmh6cwr247ws2rpl4y40a7";
+      rev = "0670bfbfe492f630e37f240dbc31bdc652292e4e";
+      sha256 = "1c5p7hvxbbyqwa5dmg53i3pzni3da1d53x492pk8kv7qzzq4fhm5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.operators/";
     meta.hydraPlatforms = [ ];
@@ -8747,12 +8838,12 @@ final: prev: {
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pairs";
-      rev = "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9";
-      sha256 = "01z80b55yg8sa1vfga8bq7jdl7glm93jxs8v390cyafshk4ajm98";
+      rev = "b316e68f2d242d5bd010deaab645daa27ed86297";
+      sha256 = "1x1a8z0r083mq529n4ryqa2s0vjzzjhmgl0j9l2ja3j09lwbv429";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
     meta.hydraPlatforms = [ ];
@@ -8760,12 +8851,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2025-10-03";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "96ee37d07043aeed90ae6ae32733b2d0db8f1c13";
-      sha256 = "1ylsbk19hb5phaynhrqps3j589z82bqp8p3i90x269cyr67xibyz";
+      rev = "08a72201bd71d2ee2b2572e810cf09f0bc55a3cd";
+      sha256 = "0gkxl63xgv59nr828mk0hzr8mh3dvjwfib7vm96fq8kkrs938i01";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.hydraPlatforms = [ ];
@@ -8773,12 +8864,12 @@ final: prev: {
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.sessions";
-      rev = "4ed3a6176e9f66915e4bf1ca66850e8c8073cfc2";
-      sha256 = "0b6q4ggcpmf4bpsadz7272awwp2yw52gh4ldk1paxrhqrgc52sm8";
+      rev = "6b69f4cf206ed8560669446a0310937d88e1c871";
+      sha256 = "0v229a2c2gl3a9gjl0fmb8xl9h52y96rdbvfhjzq4g2i3wplmw5c";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
     meta.hydraPlatforms = [ ];
@@ -8786,12 +8877,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "7610dc3aaf7fb09b9cc428273a8ba15ef8aef495";
-      sha256 = "1agh9b60l2my96zspzwi3xgssnz4g36w3m6nwbrs9q2q36gmazxz";
+      rev = "66c041fb00ec007b7a7044751c7d3792d0e028a8";
+      sha256 = "01iqls99by2s8nsm1l7hi075m1b5wz22vwl5c48wk6hdavd77acr";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.hydraPlatforms = [ ];
@@ -8799,12 +8890,12 @@ final: prev: {
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.splitjoin";
-      rev = "b0d57bb5d1ed154e5902ae2745f1a320a7642443";
-      sha256 = "1amhhmm4kh84pl24mvjwybr6vyq5v4pr5kl521rd7ppbz8ikispc";
+      rev = "9fcd8856efb95a505090c3225726466494076127";
+      sha256 = "11jvr6szgj8w86s8nv6ggc75h56va8xcrwxf7lwqm3nyvql3p0q9";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
     meta.hydraPlatforms = [ ];
@@ -8812,12 +8903,12 @@ final: prev: {
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.starter";
-      rev = "b43df0b0c66b14802e28d4761ed902704e3796e3";
-      sha256 = "1c6x0nm6q4vx8vkm53gzfr01av0cy722g4zk88ma5rrr10ychzj1";
+      rev = "8ee6ce6a4c9be47682516908557cc062c4d595a2";
+      sha256 = "1nzs8x2v99fdi8mwy52qkzsrx4a562mpzhxmbygayvcsl11fngxd";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.starter/";
     meta.hydraPlatforms = [ ];
@@ -8825,12 +8916,12 @@ final: prev: {
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.statusline";
-      rev = "faa39777ca729c6dafe86041207ba8db9321cb29";
-      sha256 = "104wbg5cm4944j9axsq9wjwnhj01p6gd3z46v4hfmd2j672jppd7";
+      rev = "14919901649d20d020e659c63c03baa75cd94f33";
+      sha256 = "1sbh34s35cz7dyphh6ksk7sy8w7v43xrc8mrwjydbc6g805sw3jp";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
     meta.hydraPlatforms = [ ];
@@ -8838,12 +8929,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "2025-10-09";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "444e155147e2b5159dd28a65f9736254c16cb817";
-      sha256 = "1b34pvaipvqwsb2kngzv5zvqrdmbr4q9v29qh1rwg80byifi33f4";
+      rev = "88c52297ed3e69ecf9f8652837888ecc727a28ee";
+      sha256 = "0w7f6g2gkb6c36kinml1qqvgrv72yyd1p8qk29zb6dlnahi3cgwq";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.hydraPlatforms = [ ];
@@ -8851,12 +8942,12 @@ final: prev: {
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.tabline";
-      rev = "40f0ec8ca166397a4f413d8396c56f5e01cc189c";
-      sha256 = "0yj5fzrs3w2y3k4mdcikl8my37z4lh0qj84i2mnmplylnamch0yv";
+      rev = "caf23615b9b99bacc79ecd60f61c4e6a8ec18c84";
+      sha256 = "09spn1qh91i9mdjpw72rxs8vi02pmr7pl6chz07rvmydf96jsqsa";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
     meta.hydraPlatforms = [ ];
@@ -8864,12 +8955,12 @@ final: prev: {
 
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.trailspace";
-      rev = "fab31f4955207cf84e28e7bed5cff35cccaf317f";
-      sha256 = "0gsrsp1jh5zdpw6j773w7hg4qfxfs4vl8r14975cnfczkrgjf2np";
+      rev = "f8083ca969e1b2098480c10f3c3c4d2ce3586680";
+      sha256 = "16n3vxqzg1ywc199xmh4l2x75cyi52xad380picbr5q4l7dda36g";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.trailspace/";
     meta.hydraPlatforms = [ ];
@@ -8877,12 +8968,12 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.visits";
-      rev = "4796c453678ca11f4aab68ab33f4d534a2d84e6d";
-      sha256 = "0x0qrg3py0sj30ys9ffm33zh3f3f5zlckkydg7dhwbdqzcgla48y";
+      rev = "f6b86565acc690aa111627433906be3d38e2ba81";
+      sha256 = "1lnv5p8yd77n9z7ckrh2mgd10fn52y0hv4g9kha5fygpyfy64z19";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.visits/";
     meta.hydraPlatforms = [ ];
@@ -8903,12 +8994,12 @@ final: prev: {
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "2025-10-11";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "e994d0ee275232ee375898e532a2e66213120912";
-      sha256 = "1cy4rsdnb24k53np33hwgj4mrlm2p5fivfmli1003dhqz1n1wb2s";
+      rev = "5d565cb23e0b365af14f9e9a2a45b2b46e7c4f3e";
+      sha256 = "0mb7lqy3h7hnm035lclsh205nv92bg0d2ql06xhi02x10c807mn4";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8955,12 +9046,12 @@ final: prev: {
 
   modicator-nvim = buildVimPlugin {
     pname = "modicator.nvim";
-    version = "2025-01-09";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "mawkler";
       repo = "modicator.nvim";
-      rev = "45b64561e109cd04de551b081fb947b4f856009e";
-      sha256 = "1p0giz93qaz1y09p6i4lagphi50j8316wjlrfr3h152dv96s1b2s";
+      rev = "0bc989b32a7ba3cab06cb79a433557384eb2a0be";
+      sha256 = "18qn7h88wlgkf76kqwxsgwlc5hr2n30xxz8wridk41si5iv8lz9x";
     };
     meta.homepage = "https://github.com/mawkler/modicator.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8994,12 +9085,12 @@ final: prev: {
 
   molten-nvim = buildVimPlugin {
     pname = "molten-nvim";
-    version = "2025-09-20";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "benlubas";
       repo = "molten-nvim";
-      rev = "c98f8c6d7a8a801b46e4766e000c574e0402c491";
-      sha256 = "0ldxxmr9kkm7ih6ysgmb5razczf27sz4fjhg0pr5gmigywkf2vk8";
+      rev = "4fd7be6a12b5efda5179db642f13bad60893acca";
+      sha256 = "1x0lihygp6p03zps3mgs7s4jy6dvwjldyg4x2ggvjyrf0sdrgqzg";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
     meta.hydraPlatforms = [ ];
@@ -9371,12 +9462,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-10-10";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "4c60a198e3f92098778a32a1c76d2bd7ba46a3b5";
-      sha256 = "1arlk0prqlvb7hbicgvyyrib641sazpwi3sy307xw9pcb36kzz8h";
+      rev = "f3df514fff2bdd4318127c40470984137f87b62e";
+      sha256 = "1yic7slj074qb3mwgv7cra8d70xcdrhizvyd9nszb0q0brg02c79";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9397,12 +9488,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-10-11";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "8786f12ca22cdf2a022bbad1af3650e9f8d2613a";
-      sha256 = "02x58mmm9xpnxrzlzmdnz0z7gkzvy3syvmq3d7gprara9pa7c2fd";
+      rev = "d66e4a13013cf68d7a3fdcdcf3d98d69b266e4f7";
+      sha256 = "049garf306h03hy50c58dic51zq7lrzgjsi76rz524mr0pan2gb4";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9475,12 +9566,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-09-29";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "90dcfa7b2bd5f3f35d1a7afe24dde9e2bc482cd4";
-      sha256 = "02cdkxvbw4xwcsm185s72zx2g0aky6vd4rvin03aj8j2gjnw20qj";
+      rev = "d2a2ae4415872fbddb2441920ab109ee52fd4916";
+      sha256 = "0ha5mz49gw5ck7ddb63raqg8874kavb82846lx66y0sw4y00wbl6";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9516,12 +9607,12 @@ final: prev: {
     pname = "neomodern.nvim";
     version = "2025-05-26";
     src = fetchFromGitHub {
-      owner = "cdmill";
+      owner = "casedami";
       repo = "neomodern.nvim";
       rev = "6fb1f29c092996fd3cef915a92b48992e0ba71d4";
       sha256 = "04yg1hd2dc0is305yd18rim4ldjmg3gxwiyqbx7h2kpm24krf6z7";
     };
-    meta.homepage = "https://github.com/cdmill/neomodern.nvim/";
+    meta.homepage = "https://github.com/casedami/neomodern.nvim/";
     meta.hydraPlatforms = [ ];
   };
 
@@ -9737,12 +9828,12 @@ final: prev: {
 
   neotest-go = buildVimPlugin {
     pname = "neotest-go";
-    version = "2024-05-19";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-go";
-      rev = "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6";
-      sha256 = "0wmxiv06zjjsr2fzp20p8lynn8wxqlx86r6zycan8v6kgs2vljh4";
+      rev = "59b50505053f9c45a9febb79e11a56206c3e3901";
+      sha256 = "0wl3xm7dq5mrin64h33lpq2yx0hiiwwkgxkvs49c1z14sz0c1nvf";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-go/";
     meta.hydraPlatforms = [ ];
@@ -9750,12 +9841,12 @@ final: prev: {
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-10-12";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "e207f660292cd0e899bd021b74422de9139f2825";
-      sha256 = "0k2mwwrrc70230kccp75mlixqsbblnyzfqcn7mnprdk9p68vgcs3";
+      rev = "2806bc07066a734d6ed94d45d2d2557a0e2195d8";
+      sha256 = "044q6vpjm9hd6qxh3ynqmbr3vi4lr9crg21v2cby4fgcbyjs2jxd";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9790,12 +9881,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-10-12";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "5266c115617186f17708344451f46ec88f3d1f6b";
-      sha256 = "0z37dll6v050ak8039i7vns2859w4vyifrz742dy0hj043k1q46n";
+      rev = "1e93a6f35e6409751acf99c34461c1bd2b8edc57";
+      sha256 = "1cnypjsbg5h66c7nqd7f6c2drkbm7i8hxs3rckhfzka28gmkgdxg";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9803,12 +9894,12 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "2025-10-11";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      rev = "4ee6cd5717d0e17ab668af07e5a3baa54fc04c65";
-      sha256 = "0lwdac332agjqsswxiyh8ax6w3rw9mpw3aqma5ixvfxgsrc53n1p";
+      rev = "fbdf5c3208007ccef1a8941e1229fc5f872c760e";
+      sha256 = "12v734jk1sybzpl4584bbpb4vkr9fm2dqs1lyhmvnqrwm6mn2mrv";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.hydraPlatforms = [ ];
@@ -9816,12 +9907,12 @@ final: prev: {
 
   neotest-jest = buildVimPlugin {
     pname = "neotest-jest";
-    version = "2025-09-24";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-jest";
-      rev = "2f657403aabab7d68eaa2cb9181dc4bb7fdd8a08";
-      sha256 = "0kvys4bcv1zwybc4qcym18qlz1s0pj8c545nzychwp7m839yzqps";
+      rev = "5dc15386a2b04080fd24901eb2450aaf787bd172";
+      sha256 = "0fyw2nvljs0d6x98cnsr5bwgxxxmncddp2dlsbqprxfy867qdnzc";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
     meta.hydraPlatforms = [ ];
@@ -9842,12 +9933,12 @@ final: prev: {
 
   neotest-mocha = buildVimPlugin {
     pname = "neotest-mocha";
-    version = "2025-08-30";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "adrigzr";
       repo = "neotest-mocha";
-      rev = "342664d54d2177cd0b21742ddf8c447ff278df46";
-      sha256 = "1dnsgyh0ybx8sy9ryqklh61h967gq2d44phd1d39ghzjn60zv7al";
+      rev = "bf24f5ba9bbb35ba5156b9642bccb80b8cc80eb0";
+      sha256 = "03rh4wj0jdsm4zbk80whnrv0k1bb06cjjs29rfv30jd10xg0drh0";
     };
     meta.homepage = "https://github.com/adrigzr/neotest-mocha/";
     meta.hydraPlatforms = [ ];
@@ -9907,12 +9998,12 @@ final: prev: {
 
   neotest-python = buildVimPlugin {
     pname = "neotest-python";
-    version = "2025-09-27";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-python";
-      rev = "7cab6e2ecc260bf61b97ca147574a470bd880cbd";
-      sha256 = "0sks1fj7bwpdzgwb3ahj1ki8kql9wwhds617b1ial6fk0s0b56iy";
+      rev = "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9";
+      sha256 = "07pz5kabiq59av8l75k5536rmqrxsnkv1cb2s4gvmklmbkmvkcny";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-python/";
     meta.hydraPlatforms = [ ];
@@ -9998,12 +10089,12 @@ final: prev: {
 
   neovim-ayu = buildVimPlugin {
     pname = "neovim-ayu";
-    version = "2025-08-20";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "cc78e880cce5dfc1187d144ed7251c746feff259";
-      sha256 = "1fdxapbm08g1hqdk31261c2fnfr4vawgb9pg0kxglc8lkyrn2w8b";
+      rev = "38caa8b5b969010b1dcae8ab1a569d7669a643d5";
+      sha256 = "18a7gj7l6ahhbb1hpsmb9gh21dmcd0fkjzgl4cncq42rjby7ysyq";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
     meta.hydraPlatforms = [ ];
@@ -10102,12 +10193,12 @@ final: prev: {
 
   nerdy-nvim = buildVimPlugin {
     pname = "nerdy.nvim";
-    version = "2025-08-04";
+    version = "2025-10-16";
     src = fetchFromGitHub {
       owner = "2KAbhishek";
       repo = "nerdy.nvim";
-      rev = "a8e3f70dc0232e956adfb12c647b7e9e2b2e6c89";
-      sha256 = "12vh8702j05gk4m0406sg9pjpc950v2kizf97wc6fi7168djvw1l";
+      rev = "f6ba335405d3070f90aea5e35eca4a08dec3851f";
+      sha256 = "04w9ipwijy5dng96az3l4jvs3qs5cnclalhljfq6rv0dh5jsa6z4";
     };
     meta.homepage = "https://github.com/2KAbhishek/nerdy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10154,12 +10245,12 @@ final: prev: {
 
   nfnl = buildVimPlugin {
     pname = "nfnl";
-    version = "2025-09-09";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "nfnl";
-      rev = "1003f43e3420475e181ce7cf609648a5e9ce35ca";
-      sha256 = "1n6dixfa3zqx54xrdx3ga3vj6qd11ns9wxyaz9pd6rrxj0x1pnc0";
+      rev = "fecf731e02bc51d88372c4f992fe1ef0c19c02ae";
+      sha256 = "05223ynf2acvwqi6784b3dfvimdg5xxyqq1zd4l788ggafy1zil3";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
     meta.hydraPlatforms = [ ];
@@ -10206,12 +10297,12 @@ final: prev: {
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "2025-10-11";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "7818d2b40d1e35bd351d673c0ffef4f4bb9230c6";
-      sha256 = "1mp7qqd6qfhw68pyr8xmx6bk3wjx7z3577jarqhgmya1nxmq2ndy";
+      rev = "2a92a9291a461d99c01b4cdcc8fa41ec17a2209d";
+      sha256 = "0p3wqwna2bv4c76iwgydcqrm39p1qm5zpgbyfsp0w9ycz9xhg78m";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -10271,12 +10362,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-10-09";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "1fcb8134ca2d812ef22e10c4b245a4684cc18f9b";
-      sha256 = "0289xwjk5ng7j2mfzj0703d1cwzwnby94i5y0g2cn24wzdmcs34p";
+      rev = "7d9a0496806cb206249eeb194b842865259d4e2c";
+      sha256 = "0nqw5snbjabh8w4ks8mh1plwd58r943b5kmsylkf9q8jfbx9p6zv";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10336,12 +10427,12 @@ final: prev: {
 
   noice-nvim = buildVimPlugin {
     pname = "noice.nvim";
-    version = "2025-10-08";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "38c702be0d8fea81527ee6a73e1e834e72481193";
-      sha256 = "0figj1b4bick7bc8xnxpkjkihps3d1qhl3ib1ry5hb5lljblrglp";
+      rev = "7bfd942445fb63089b59f97ca487d605e715f155";
+      sha256 = "02mc75dqn7h4ylgynpd9vsjx3y51rcys95l9ax1wiilgb4ay3b0l";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10349,12 +10440,12 @@ final: prev: {
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "2025-09-30";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "5cf63841461b49989972d35bf886e076a1ab3649";
-      sha256 = "16p9wipxm59rrlzwck9d7bp1i3f8yxn8kan1pddvkgr4sdmxxprf";
+      rev = "550197530c12b4838d685cf4e0d5eb4cca8d52c7";
+      sha256 = "1cqxacz6mz52qqflzh1p4fw2pm7vgpnw200c3z1xi9ysrr0k2pb9";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10453,12 +10544,12 @@ final: prev: {
 
   nvchad = buildVimPlugin {
     pname = "nvchad";
-    version = "2025-09-20";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "f107fabe11ac8013dc3435ecd5382bee872b1584";
-      sha256 = "0yaxwf1p1dkwagcbcag5hyrbam0gzsgla7wmk9w3cb9hy7l7iln2";
+      rev = "eb209a4a82aecabe609d8206b865e00a760fb644";
+      sha256 = "0acqyswcyw2606n4msk5anxqkzggqvsckvbkxdqdx562mqczyysz";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
     meta.hydraPlatforms = [ ];
@@ -10466,12 +10557,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2025-09-27";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "03b9718140375e7f3f5e4f3e04bc2b6c907440ec";
-      sha256 = "1fh33a0bc6iwc45bfa9hbbvfp170n9j98iba3plfffn4yj4i2rwb";
+      rev = "bea2af0a76c1098fac0988ad296aa028cad2a333";
+      sha256 = "0fv4qx354mndv6mx6s0qnglm5qgm774x6cmcgawm045bcfp29crd";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.hydraPlatforms = [ ];
@@ -10518,12 +10609,12 @@ final: prev: {
 
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
-    version = "2025-07-01";
+    version = "2025-10-12";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "23320e75953ac82e559c610bec5a90d9c6dfa743";
-      sha256 = "12lkkyl6ink1qrpggbjfck2ab3yfj5mpa6jfgkrw451d1ycd4rz5";
+      rev = "7a2c97cccd60abc559344042fefb1d5a85b3e33b";
+      sha256 = "1paswbxyhfz86y0sq2jig4mgnpi6hi0qnb9lf1rwqn5plgb204ki";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
     meta.hydraPlatforms = [ ];
@@ -10622,12 +10713,12 @@ final: prev: {
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "2025-08-13";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2";
-      sha256 = "1gxjpdm4i4bylx9wlp1ldbs8sskjz79pfysk7avy8zbk7d2mwman";
+      rev = "81e676d3203c9eb6e4c0ccf1eba1679296ef923f";
+      sha256 = "0pm1bmsbcqz4q3238fhggxdlwbaqj4bbsf2pg6r10qpbc6381xnm";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
     meta.hydraPlatforms = [ ];
@@ -10700,12 +10791,12 @@ final: prev: {
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-10-04";
+    version = "2025-10-17";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "881f7dc17c0b4204a1d844732f95539575350e5b";
-      sha256 = "0bzb64r6br5jnnnbapr1yiyj4d83mw01j621wzr7i3mimpxwdw3n";
+      rev = "e97dc47e134ffb33da008658fecfae8f8547c528";
+      sha256 = "1prkp8p1kkzgsrs5pwj4xbcdj3ncfhalhp5q332vci4qlk8qyb6a";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -10804,12 +10895,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-10-03";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "668e9e6e214a3cc8fe811b5c8d8b2776dc79378d";
-      sha256 = "04kw4jqwlsqgp1rrh5gaf3hv12q9rkvlf61biwvxk0ii3g4z43bn";
+      rev = "170560c18866c0ecd7ba290d9246cae42ddee906";
+      sha256 = "0cmrrdj9hbg97ysfyd6kh8v2cn19vq90rn09m1w7pqfrpal2bk2m";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -10856,12 +10947,12 @@ final: prev: {
 
   nvim-early-retirement = buildVimPlugin {
     pname = "nvim-early-retirement";
-    version = "2025-10-09";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-early-retirement";
-      rev = "dadde58b7b0d8dafb00b0dc6900cfe95b380d6fa";
-      sha256 = "0h7c7n03dyq7fpmgdnp508xmc8msdzz37r4lhd341hzyhf4h46j7";
+      rev = "9109589b542773c9ad2a34067a085874f255577b";
+      sha256 = "1nk4bs6kjwki4zby0q6zclwxgkp9bmz5i9ww90fsw61q8zll7niy";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/";
     meta.hydraPlatforms = [ ];
@@ -10908,12 +10999,12 @@ final: prev: {
 
   nvim-gdb = buildVimPlugin {
     pname = "nvim-gdb";
-    version = "2025-01-21";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "cf00140361cabcd4e55a987fd9770a92ee682301";
-      sha256 = "1y4m3m27bkzyjx8g2zd1ampgm84c2f10a7sd4v5qpirf9xiqhhqb";
+      rev = "4170767cbd43e3f4af2a160f2980fff5cd6ee962";
+      sha256 = "0xq5ci8bnr82a51brki1abifjc4ygwpm2mdy29mm7lsdzrjdv7bd";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
     meta.hydraPlatforms = [ ];
@@ -10921,12 +11012,12 @@ final: prev: {
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2025-09-08";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "cdf584d05ffc9d5c1f247079991552249e4f7487";
-      sha256 = "195hb7k463b1srwfr75xx2xz097fj67sh9gq9c7xi80rqycd23q6";
+      rev = "b9487d6c4ccdecf3c7cd4e3e7107b42c65e20106";
+      sha256 = "09shwasz5k50fg16issqj5i3hzjqraxjca03p42vd35dwmr7a4a3";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
     meta.hydraPlatforms = [ ];
@@ -11090,12 +11181,12 @@ final: prev: {
 
   nvim-jdtls = buildVimPlugin {
     pname = "nvim-jdtls";
-    version = "2025-10-08";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "380ac148f989e1291aac002dc959ecc68c5243d0";
-      sha256 = "0kyrzxgzvf9y8imkrfnvzympfqm04xqsclmkz4adfgb64s5b3m0q";
+      rev = "38d265ee4d45da73a083ca83e41de7d37567be5c";
+      sha256 = "0g7vagxilq1fygrc62zashdkv25aask1akpm2rvmdkga6gpf4dki";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
     meta.hydraPlatforms = [ ];
@@ -11155,12 +11246,12 @@ final: prev: {
 
   nvim-lightline-lsp = buildVimPlugin {
     pname = "nvim-lightline-lsp";
-    version = "2022-05-30";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "nvim-lightline-lsp";
-      rev = "0fe34eed830b223770111c6333fe48d9fca158d5";
-      sha256 = "08qxyr998d7zwnk0czfq4hif0q801fm2ijpbwql32kd6a62bnhjf";
+      rev = "7fa5e1a89932e3da3ca68a0825e304ba43438ad1";
+      sha256 = "1fvfmhv796ilciwh82k3hwbqvrkld887pdjrz5qhhg416075nl97";
     };
     meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/";
     meta.hydraPlatforms = [ ];
@@ -11168,12 +11259,12 @@ final: prev: {
 
   nvim-lilypond-suite = buildVimPlugin {
     pname = "nvim-lilypond-suite";
-    version = "2025-10-12";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "martineausimon";
       repo = "nvim-lilypond-suite";
-      rev = "5d5f433824f3658fe6446318c432338f9c58c57d";
-      sha256 = "1444sp9h4vyyammwzqi3b4mldk4ad4ipbrkv7yl3836czdgh4l04";
+      rev = "d26c1fd42060fa9a5d076a78b478b0fc3825974a";
+      sha256 = "1cx2jwb4smrf42crhbq94nsa0vy0ms43xwl10kkanc78vz5ap10i";
     };
     meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
     meta.hydraPlatforms = [ ];
@@ -11181,12 +11272,12 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-10-07";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "9da1fb942dd0668d5182f9c8dee801b9c190e2bb";
-      sha256 = "0lkfhkld811gqki3bbcl1s1f22a3bdi7gp97q1pjlymia391flf1";
+      rev = "8b349e822a36e9480aed96c6dd2f757f80524a35";
+      sha256 = "0g1g6ry3h2xn5ps5kvjgzar3cipgy4l0yfjcpk85b86f4x69662d";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -11233,12 +11324,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-10-11";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "ac98db2f9f06a56498ec890a96928774eae412c3";
-      sha256 = "0ncrknyldkaf2i053bkmzd7x58jflsyv6y5fr1wnbq26ynrxf245";
+      rev = "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0";
+      sha256 = "1lb85magzq9kghp9xkcxr0lnz975qkfvczk5i4d1q2i7yxzfns9l";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11337,12 +11428,12 @@ final: prev: {
 
   nvim-navic = buildVimPlugin {
     pname = "nvim-navic";
-    version = "2025-05-09";
+    version = "2025-10-14";
     src = fetchFromGitHub {
       owner = "smiteshp";
       repo = "nvim-navic";
-      rev = "f887d794a0f4594882814d7780980a949200a238";
-      sha256 = "0mxsnwvrjirpy2ichsilx6207z55xi42syg5d3fdgs2r1p1npggc";
+      rev = "099b4c8cdc3e9ea026ea6b2a0d315e2d28362242";
+      sha256 = "0ghr4p4qjy8q6qc249mwws8ndq2xdyqjcp2myazdbdm709xgapi6";
     };
     meta.homepage = "https://github.com/smiteshp/nvim-navic/";
     meta.hydraPlatforms = [ ];
@@ -11402,12 +11493,12 @@ final: prev: {
 
   nvim-numbertoggle = buildVimPlugin {
     pname = "nvim-numbertoggle";
-    version = "2025-08-13";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "sitiom";
       repo = "nvim-numbertoggle";
-      rev = "1416256538f01c1cf364805952fe7d143dc7ec56";
-      sha256 = "0knyz9icc1qd8ln9wgql8xjbi9kbva9yy9bz03csyraaabsh78k8";
+      rev = "923f9709989605fe2bc4b9de8a3625fa808f5cd6";
+      sha256 = "104l9pmq5gxa4y5xly382fbbq87zk5xd0dg0ijvqbmmm5lnjc8va";
     };
     meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/";
     meta.hydraPlatforms = [ ];
@@ -11415,12 +11506,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "2025-09-14";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "eba1fb2662fac78dc65f6182f68e82830a3d4ecf";
-      sha256 = "0la9rf61j09x2rn5li89fw269z7qspqpi6lzfn8h7wjkjdz4xki6";
+      rev = "d42d11008a32f5f8c92bca6fd63f6782f197d114";
+      sha256 = "06c086h6214c65g83z4ixvg1ifqsv8h56pcw5l9vwqfn413x02kw";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.hydraPlatforms = [ ];
@@ -11532,12 +11623,12 @@ final: prev: {
 
   nvim-rip-substitute = buildVimPlugin {
     pname = "nvim-rip-substitute";
-    version = "2025-09-08";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-rip-substitute";
-      rev = "42c4494386ed33af84424c9a249ab7a20f8a2a51";
-      sha256 = "0ppicrnd6x1yfpk65im8z5clk2xk0ix971biv447dxrrbxjg21zx";
+      rev = "cb41b3f155399597327c39b5d700f7c41f4c6121";
+      sha256 = "1r9dfq1gir035266s97b3h8f8y16gmsggk6h985vzkwpl1vglbjw";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/";
     meta.hydraPlatforms = [ ];
@@ -11545,12 +11636,12 @@ final: prev: {
 
   nvim-scissors = buildVimPlugin {
     pname = "nvim-scissors";
-    version = "2025-09-08";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-scissors";
-      rev = "7eb3a7ebcbbbaceb78cf4da69edc865864186b62";
-      sha256 = "0qzysfm4v3s0gi2bqzrzrq896w0lvyahcscbdgvj527y79739mk1";
+      rev = "9b4fc66427568b2139480fcc645dd7bb91884ade";
+      sha256 = "022hq99if908prjghm6wzjpj6dl3fkppggwxanc6z88rswzi4kyc";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/";
     meta.hydraPlatforms = [ ];
@@ -11649,12 +11740,12 @@ final: prev: {
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2025-09-08";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "220efa63c20830a9bf0593a57366b96dd5790212";
-      sha256 = "1hphzxr8k3i88kldh1dkq2kkc50ikyxg2gzcdjdh85v23lfq9sic";
+      rev = "80fdcc53e236b23f2c71d628ea5121e6d782f898";
+      sha256 = "0xqlsivw49aki1ymy6jc6yar4kw8rs8wb45p7kmlvs3wn86akjbp";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
     meta.hydraPlatforms = [ ];
@@ -11662,12 +11753,12 @@ final: prev: {
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2025-09-20";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "75de1782c781961e392efcca57601bf436f4d550";
-      sha256 = "1ik23ii18ndh4fbv92m24cccwh7l5ms8m601phd99lm2q9pybipf";
+      rev = "fcfa7e02323d57bfacc3a141f8a74498e1522064";
+      sha256 = "0jnrxsiyid1g63px4rmjs4kbzgjpqw636fffkigvhb813nl0vw0i";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -11714,12 +11805,12 @@ final: prev: {
 
   nvim-tinygit = buildVimPlugin {
     pname = "nvim-tinygit";
-    version = "2025-09-08";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-tinygit";
-      rev = "7e92bea3309faacdb63f489f7649336ace7875f6";
-      sha256 = "17v9x2qsz1ng9flkpmq7j3mbdc4m9b2lhzswi6lpngb97yqcx1y9";
+      rev = "a2910ba000901071cbcf347d4dd5c4a9c63fd510";
+      sha256 = "02sbv5c95c214gafhq3xb747hrf6ssfbkjjn3vlp142g5615bzmd";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/";
     meta.hydraPlatforms = [ ];
@@ -11727,12 +11818,12 @@ final: prev: {
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2025-10-07";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "e397756d2a79d74314ea4cd3efc41300e91c0ff0";
-      sha256 = "03kybd99qjpr7kyi1bp4yf59w60yiig00bzvw4i8fi4lq29kbdy7";
+      rev = "64e2192f5250796aa4a7f33c6ad888515af50640";
+      sha256 = "1m2a9r2wnxj0ck8gridwhn8qgy8bdzm2nymn5sy59z4pmbzjj9a0";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
     meta.hydraPlatforms = [ ];
@@ -11753,12 +11844,12 @@ final: prev: {
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "2025-09-10";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "41847d3dafb5004464708a3db06b14f12bde548a";
-      sha256 = "0p6pslcr1pqhz7nv66cnk6z5g1siwidzznbxr50zazb6rdpgqa7v";
+      rev = "ec308c7827b5f8cb2dd0ad303a059c945dd21969";
+      sha256 = "1x2q0y644n7pf6xzfwsayg5cy8kpihln955pggq8445c2avnrmj1";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
     meta.hydraPlatforms = [ ];
@@ -11831,12 +11922,12 @@ final: prev: {
 
   nvim-treesitter-textobjects = buildVimPlugin {
     pname = "nvim-treesitter-textobjects";
-    version = "2025-07-29";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "71385f191ec06ffc60e80e6b0c9a9d5daed4824c";
-      sha256 = "0pp8s0wljwhc93jp47ad4pigqm8q7v173374c1vpydhx09qwl4ga";
+      rev = "5ca4aaa6efdcc59be46b95a3e876300cfead05ef";
+      sha256 = "10qgbb381xr5v18pyvg46mzccqcdzdh575pmss725smx5g0q1zwm";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
     meta.hydraPlatforms = [ ];
@@ -11922,12 +12013,12 @@ final: prev: {
 
   nvim-unity = buildVimPlugin {
     pname = "nvim-unity";
-    version = "2025-08-22";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "apyra";
       repo = "nvim-unity";
-      rev = "22aa4a977bbe4a9cd2c09617f43744eda76fb315";
-      sha256 = "0hxpj6nh6w73mz29p4jpfapfc4nrmsnpcrw2cyggcrblfmm844f8";
+      rev = "624b0532bc6971c06eb9ba162c7afef29bb6e87a";
+      sha256 = "1gjmcbn7vk2j4r79mvdqw8c9p8fq86chr8vlf3x0nfjy6cr46wiy";
     };
     meta.homepage = "https://github.com/apyra/nvim-unity/";
     meta.hydraPlatforms = [ ];
@@ -11935,12 +12026,12 @@ final: prev: {
 
   nvim-various-textobjs = buildVimPlugin {
     pname = "nvim-various-textobjs";
-    version = "2025-09-10";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-various-textobjs";
-      rev = "237763835b65bdc64f0e19a31c040321813e4333";
-      sha256 = "1ijgabw62ssxnyaljwzx9slly7zgq855sdymjni8zqxnb9lj3bj2";
+      rev = "aede1580da8e2f9157b538e25a4f4823c59e7633";
+      sha256 = "0191m787m5m72cim8hp4p8qqj36s5ics9d11ryfry55034aahdqz";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/";
     meta.hydraPlatforms = [ ];
@@ -12091,12 +12182,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "2025-10-11";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "6b2a22a74d1c883e797764c28f75aa6b532a1ae4";
-      sha256 = "19sf0qkn0nljq0b6ds3dhrsaaay0xpg9qydh5kr5xbjp5n746vc4";
+      rev = "fcb33fb2ffccc8107b3d5ebbf93df4e0824ac8ce";
+      sha256 = "0cf9bibysjz14i990iqkzwb6zzf23z4pi6y37qxqb4xd9mxsa7x7";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12130,12 +12221,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-10-09";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "fded71669b61c6ccae9d8ade30f667c3c4962b48";
-      sha256 = "0dws2rf3kfzmj84nn0wj0dpfsbqgihmlxc0nf87zm01lq6afy5zz";
+      rev = "13ba3e8651ee02c52cb3e60ce78aff68acec97ea";
+      sha256 = "1av3z2n1w8p7pwp8c5dmpk02s8bk7l1k9zjbl1ik7s9j6ndpnvv8";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12169,12 +12260,12 @@ final: prev: {
 
   oklch-color-picker-nvim = buildVimPlugin {
     pname = "oklch-color-picker.nvim";
-    version = "2025-10-04";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "eero-lehtinen";
       repo = "oklch-color-picker.nvim";
-      rev = "da958405624e31336cc76ca0075f4a255e6c448a";
-      sha256 = "1x20bxdqyiygscxkn65vninai6p3pnr7q5cajps070kdjywg4gdn";
+      rev = "5ecc00741f6b7159af2d468c14e87a17715ab4c4";
+      sha256 = "1g4akgw13d17akd9xdmv9908l6j80w5idqd7621adfxmfa2h3cv7";
     };
     meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12234,12 +12325,12 @@ final: prev: {
 
   one-small-step-for-vimkind = buildVimPlugin {
     pname = "one-small-step-for-vimkind";
-    version = "2025-10-02";
+    version = "2025-10-14";
     src = fetchFromGitHub {
       owner = "jbyuki";
       repo = "one-small-step-for-vimkind";
-      rev = "99c22f1fa83eb9aa442cf13a23aed7197a2d4456";
-      sha256 = "1nzql49pwix8k0ilz8avx704h57dkrw5ch0r4zsm9g0adq7q2fk8";
+      rev = "8fdbb4ed7bd20f92d3c1344b1e619af9017c743d";
+      sha256 = "19fvx2v69psp5mwv6c8bbr2rir8njz8wgvm4kszghqa7p30jbva5";
     };
     meta.homepage = "https://github.com/jbyuki/one-small-step-for-vimkind/";
     meta.hydraPlatforms = [ ];
@@ -12247,12 +12338,12 @@ final: prev: {
 
   onedark-nvim = buildVimPlugin {
     pname = "onedark.nvim";
-    version = "2025-07-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "navarasu";
       repo = "onedark.nvim";
-      rev = "de495fabe171d48aed5525f002d14414efcecbb2";
-      sha256 = "1qci3rslcmv79fsfq21vjad6zmk6qp59z1g531w2k85psj6hlz41";
+      rev = "918e89e6993b2901eea47b9f4eb666d53c2542a6";
+      sha256 = "164a8qamldk098x28wq8z87vkg3m6gi8pscvn3ccbyf9b5rplr07";
     };
     meta.homepage = "https://github.com/navarasu/onedark.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12351,12 +12442,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "2025-10-10";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "NickvanDyke";
       repo = "opencode.nvim";
-      rev = "16ef8ca52f51e6064a55a1fd7d15e906cee55c24";
-      sha256 = "1jnvnd40g8i7mg60lf1rr5a6hjr2xhibgl7j5yvc250cw83q6mr2";
+      rev = "87cda19e743c0475f94bb5970dfe0d2816792c68";
+      sha256 = "03izfimswsdy5g7qlx3s0g25yn3yashnmz73a2miiz0r03645p6f";
     };
     meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12390,12 +12481,12 @@ final: prev: {
 
   org-roam-nvim = buildVimPlugin {
     pname = "org-roam.nvim";
-    version = "2025-09-19";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "chipsenkbeil";
       repo = "org-roam.nvim";
-      rev = "946c3289d8aa5a84b84458b8c9aa869c2a10f836";
-      sha256 = "0jzlvlbaas4kb1ii0d7yr842awk1sv1i9jy997s2nd26vd9rk61w";
+      rev = "57ebbd05ef143b0ad09e6fae3cd3b8b584b3e5a6";
+      sha256 = "04z86r6v0qg5jj1swrjki6bn8cnd2yfmxfj8b6hzs1xm5hhzjn69";
     };
     meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12442,12 +12533,12 @@ final: prev: {
 
   overseer-nvim = buildVimPlugin {
     pname = "overseer.nvim";
-    version = "2025-07-01";
+    version = "2025-10-19";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "overseer.nvim";
-      rev = "fe7b2f9ba263e150ab36474dfc810217b8cf7400";
-      sha256 = "1cix0mbyf2xqngay9bcj72jcrjg8hy8hw08mwanxacxf37qxi823";
+      rev = "c77c78b35d0b4d244e1cd77c25ec93a16fbbfc94";
+      sha256 = "1s74d640v3a0rvi3m9c197zabvjis41j7077bhbrf74j39xgvnz3";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/overseer.nvim/";
@@ -12573,12 +12664,12 @@ final: prev: {
 
   parrot-nvim = buildVimPlugin {
     pname = "parrot.nvim";
-    version = "2025-10-10";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "frankroeder";
       repo = "parrot.nvim";
-      rev = "e527fe9a89a3e958fbab9eac8ec9d52ca56bafcd";
-      sha256 = "1wl5rvsl7g0y4hy8fk1z1q512f4j5s7bp3x8c1ryw1hdv4276l0f";
+      rev = "ccb35e9fea98c1cc14ef5f8e8d0829bfbd1c103e";
+      sha256 = "0hmhkksmw0n7823r8ammymcqjnxj2cnjjlhjdrsbpxsnaz9mk9ka";
     };
     meta.homepage = "https://github.com/frankroeder/parrot.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12677,12 +12768,12 @@ final: prev: {
 
   persistence-nvim = buildVimPlugin {
     pname = "persistence.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "persistence.nvim";
-      rev = "51eef57272742b773468949f6bd0503ec3f83874";
-      sha256 = "1qyf4c4raij7dc6d0z60zv0kn6rhnqvf48kps89q7jjz8rp5kz60";
+      rev = "b20b2a7887bd39c1a356980b45e03250f3dce49c";
+      sha256 = "1qzf0nbff2pihdh0y2fxsmws6rjssm4b1rv2bzv26dhckq986aq0";
     };
     meta.homepage = "https://github.com/folke/persistence.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12951,12 +13042,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "2025-10-12";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      rev = "752632b4c2801ea6ee9b6b9ced927f7fdc781c19";
-      sha256 = "0ix8vngfp1z8iq8pfi78qyvlb0dk7il02cnc90nsavsih7v3xf1l";
+      rev = "deaec4c3606ade11f6ae89b4e9576065b3140d0e";
+      sha256 = "00iml75wgf05iy9cc8arxcsbbdzq218ryg23xkpf2x7jdc3810sm";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13003,12 +13094,12 @@ final: prev: {
 
   pum-vim = buildVimPlugin {
     pname = "pum.vim";
-    version = "2025-10-06";
+    version = "2025-10-16";
     src = fetchFromGitHub {
       owner = "Shougo";
       repo = "pum.vim";
-      rev = "a28f93692b5b7bae4d5f7ccd906f244149a39cf6";
-      sha256 = "0w9dfp5hhgwizs20s6gcsyaswqzwbip8ybaw3xnri7d5b3mvj3hq";
+      rev = "08734d52b03c354151dda3bb75a37a0ee39bbe7e";
+      sha256 = "1ri0chivm5fv7hgdljd5dls60kf1xhckg66lk5h4b3qkxpksmr2s";
     };
     meta.homepage = "https://github.com/Shougo/pum.vim/";
     meta.hydraPlatforms = [ ];
@@ -13290,12 +13381,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "2025-06-26";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "74b608dfee827c2372250519d433cc21cb083407";
-      sha256 = "15byk3sjilrdnkg212mf7zbh5s7sdsc0m36lmzm7ccfvg5is9hmc";
+      rev = "6784b54587e6d8a6b9ea199318512170ffb9e418";
+      sha256 = "1wl2167fly4r3yzpkhl0qlprcn1p4n6p6cg6g1dy3sas8mzzan98";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13381,12 +13472,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-10-09";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "d53856423be5ef3c267d26ee261b0981b372f718";
-      sha256 = "0biy2rb5da8xl4cijbadxg5k94pjwrwhp5d4j98p9k9g71hcglny";
+      rev = "060c911c62f995a9db4467dde6fafd699cf94d55";
+      sha256 = "195gj8saaqb2mw8qnry9cix8wn34bkz8ifvwfa2lzp9f1mzb6ri7";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13420,12 +13511,12 @@ final: prev: {
 
   resession-nvim = buildVimPlugin {
     pname = "resession.nvim";
-    version = "2025-06-01";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "resession.nvim";
-      rev = "84c81e5fd8a94dc85a60b97089536174e558e288";
-      sha256 = "1jhv172izp772fn07lf4a80kcd7sj2j5cq763h0xaafb4h03kjax";
+      rev = "05adc14db5c2d0eae064765101dd5e9c594c7851";
+      sha256 = "01r4bjvkl2bsi1rcrnk3y7k57jxy3giq908jja8yf4nn0hzvfrpd";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
@@ -13499,12 +13590,12 @@ final: prev: {
 
   rose-pine = buildVimPlugin {
     pname = "rose-pine";
-    version = "2025-08-24";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "72a04c4065345b51b56aed4859ea1d884f734097";
-      sha256 = "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8";
+      rev = "eb3ff49a4f2b4e8b06d27de529e44fa52a60ab8a";
+      sha256 = "110q4l61alp7jq8mv0zpcj655f04lkv6753f59rj4qdydrlgwi5z";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
     meta.hydraPlatforms = [ ];
@@ -13512,12 +13603,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2025-10-07";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "7d8819239c5e2c4a0d8150da1c00fa583f761704";
-      sha256 = "1vsswy5g8537kizy1wgnq4sk5hzazg5spc4skrlpmfs6h046pn6g";
+      rev = "7ba2dd0a5628c5ad3d8cc5a22e66ece3efc371bc";
+      sha256 = "0l7szb2f1f1mdbrbdm5wldh7xkn7mmwjmaphpa2k141kanfikp7q";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13577,12 +13668,12 @@ final: prev: {
 
   rzls-nvim = buildVimPlugin {
     pname = "rzls.nvim";
-    version = "2025-07-20";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "tris203";
       repo = "rzls.nvim";
-      rev = "1798c64830547d711b14dc2f3f47da15584d8aab";
-      sha256 = "1znmjcf6xd6b5mqggqj14h21gd5csal24h1y96hc168b7jaagyn8";
+      rev = "bbfe0f5429cc74ca53815875faf4710c2a54f01b";
+      sha256 = "0bgcpqcqx520fyhqzn9xqr1z4bpipw0wp2wbcwcw5y3gjsnc0dkp";
     };
     meta.homepage = "https://github.com/tris203/rzls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13642,12 +13733,12 @@ final: prev: {
 
   schema-companion-nvim = buildVimPlugin {
     pname = "schema-companion.nvim";
-    version = "2025-09-08";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "cenk1cenk2";
       repo = "schema-companion.nvim";
-      rev = "e94f5f8439705d772363817c9d2c6c9fc7562bd0";
-      sha256 = "13rfmrddrwkc1svslplajjnv9k4s2wzpjivdl02ilrjk3mpdynxj";
+      rev = "9a8cbeb9429958524331f49a4bd9c25cfbc2c208";
+      sha256 = "0r8cha1k800c694vbwswmy640f7f1bwrgs6wyiidhbgffpqmq5is";
     };
     meta.homepage = "https://github.com/cenk1cenk2/schema-companion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13668,12 +13759,12 @@ final: prev: {
 
   scope-nvim = buildVimPlugin {
     pname = "scope.nvim";
-    version = "2025-05-08";
+    version = "2025-10-15";
     src = fetchFromGitHub {
       owner = "tiagovla";
       repo = "scope.nvim";
-      rev = "6b4208f017da9b122d69ddc5841e040dffe7313c";
-      sha256 = "1qfxq9q0jy4nn82faff60vi0zp3xkxyzvdm461vymrcj17csnbsm";
+      rev = "228aabdb1b9cc74f0c0ccec88e79873857236e49";
+      sha256 = "08higv55pnybxp9qah7pvgzg86lcls0phczriqq9wjayblcdxi8y";
     };
     meta.homepage = "https://github.com/tiagovla/scope.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13822,14 +13913,27 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  showkeys = buildVimPlugin {
+    pname = "showkeys";
+    version = "2025-05-24";
+    src = fetchFromGitHub {
+      owner = "nvzone";
+      repo = "showkeys";
+      rev = "cb0a50296f11f1e585acffba8c253b9e8afc1f84";
+      sha256 = "1cvgfxvi5l753hn9ijzbb8x9bi2n12gd6n9j8lcvcq9xv43d4zws";
+    };
+    meta.homepage = "https://github.com/nvzone/showkeys/";
+    meta.hydraPlatforms = [ ];
+  };
+
   sidekick-nvim = buildVimPlugin {
     pname = "sidekick.nvim";
-    version = "2025-10-12";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "sidekick.nvim";
-      rev = "cebcd4415dc73e3713162e4ea317a6e91312f1a8";
-      sha256 = "0adicjhb4nwi4ckks9gf0pcy96aahx0x9icph08q1cfgvisr916x";
+      rev = "c2bdf8cfcd87a6be5f8b84322c1b5052e78e302e";
+      sha256 = "00vhdr01v1kak20z8vq4yf70p0w0m4knhiw1cri8az8a4wn8h6q0";
     };
     meta.homepage = "https://github.com/folke/sidekick.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13903,12 +14007,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-10-12";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "c697ea84309db323e4da82d29c1f23304e6910be";
-      sha256 = "1514f3w1rmr3k1vm68yc6b2gpyds1fwzjmn8wjr5y11y2kp8axdl";
+      rev = "1611946e397a8b42807a9ad527088bf7ebc9ce33";
+      sha256 = "1k5nppad6f3rbl26c4p48zl0xxxryw5ykx44s11b86z9hf478wgg";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13968,12 +14072,12 @@ final: prev: {
 
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
-    version = "2025-10-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "snacks.nvim";
-      rev = "38fbb948bcf2add5005bbc06402768dcd27a275e";
-      sha256 = "0is4psjqc0hdv8w5hzx986hsjb87144qfqvg1fz10ann8p96lrws";
+      rev = "9a15b317495cda991d3b4990f18aed47a9a9a891";
+      sha256 = "0m2aj9lqz88r93gyn5gchaarpxfkwwnnfbf0x4d79icl9gcv9ivv";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14046,12 +14150,12 @@ final: prev: {
 
   sonokai = buildVimPlugin {
     pname = "sonokai";
-    version = "2025-09-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "cf50520d1cddf7a4e7bccae650cdf0a6dd362a10";
-      sha256 = "0dji4a6a8b2c2hzhgjwzmcg9amxbjrs6lqjikf5dgnyfda6n86kw";
+      rev = "ec07018013b4683cf33f80ee4bdf3eca2621da33";
+      sha256 = "13cs2bydz4gwdxpid8ikxijz794n59mvzpmlv6g1zcli7n9h36rl";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
     meta.hydraPlatforms = [ ];
@@ -14189,12 +14293,12 @@ final: prev: {
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2025-09-04";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "b55d5ba3e2b2649317925c21a68f90c8f28ec3e9";
-      sha256 = "1q49bb0l5c9pdcp64p1hxw5xj5hvc72q8l6shnn75556bsafcx4x";
+      rev = "937f216a565ffd3345760b95bc6a0378234a76d0";
+      sha256 = "019lm4g94q020c7kpi8qacxnpvx0b5cc2a7vqfmvbzyd8ag5ardf";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -14359,12 +14463,12 @@ final: prev: {
 
   styler-nvim = buildVimPlugin {
     pname = "styler.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "styler.nvim";
-      rev = "aece087c9d4859bf30a5c1cd0a028593feff4b4a";
-      sha256 = "1j7rx2m56rrcb6q0vwvkqngj25flaa1d6h3s3jc9rrn9q2jqkjlk";
+      rev = "d73d868541a2536a96d057c793d53c50e5f407bb";
+      sha256 = "16b0kwnay6pbhfg0q32ylrr4xqzyfsvv88nxy0vbazsp4hmqfiv8";
     };
     meta.homepage = "https://github.com/folke/styler.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14882,12 +14986,12 @@ final: prev: {
 
   telescope-fzf-native-nvim = buildVimPlugin {
     pname = "telescope-fzf-native.nvim";
-    version = "2025-03-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-fzf-native.nvim";
-      rev = "1f08ed60cafc8f6168b72b80be2b2ea149813e55";
-      sha256 = "137a05qwbpcrcrfj4az7dwx5a43yyfib4crx1hi8bhjx9j5gqav7";
+      rev = "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c";
+      sha256 = "04x1zhfq24qglhfv3rk3s2j6arysxq27czvpm4w037386bi0q48a";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15144,12 +15248,12 @@ final: prev: {
 
   telescope_hoogle = buildVimPlugin {
     pname = "telescope_hoogle";
-    version = "2023-09-20";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "luc-tielen";
       repo = "telescope_hoogle";
-      rev = "5c2ae51bcf905a7101134a597e6f7be2dc05f975";
-      sha256 = "0nmzpyh9sdbvxf0hzvga748i4wnd0l6jmlwp8bmx84zazp93c667";
+      rev = "14be34fd5c464e3da0992ad094f157b0b8b098f9";
+      sha256 = "0m3gnjyz3xaga2i71bc2v3524i0ln5rna8ssmcs462n8sq895cb7";
     };
     meta.homepage = "https://github.com/luc-tielen/telescope_hoogle/";
     meta.hydraPlatforms = [ ];
@@ -15404,12 +15508,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "2025-09-13";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "930d1ba963f5224c20dba665fdf81ceded8c2745";
-      sha256 = "18xwbi7c6n890saq825k5lr1m1cjrjilxph7abi7aw0npf7r5whd";
+      rev = "6e4ec620befb7c9dd7ff26b092f33fc560cc1d73";
+      sha256 = "0fvvqb89mlg2k56h92v5igl0ha4j8rh036ib1j6s6ilxilv4z39i";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.hydraPlatforms = [ ];
@@ -15417,12 +15521,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "2025-09-13";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "89a72d0451b74e374845f592033a154c4434a06e";
-      sha256 = "0khs36p9c36cqghwh6i0821ik926b6m70jbj7n1plvril9kdqr18";
+      rev = "bb2a3347ae5631db596ae134945032cfcb56268b";
+      sha256 = "1ik70p4ax9yafn30pp8xyqvsfqzlvwhg63q4mip7lf620apg2g9x";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.hydraPlatforms = [ ];
@@ -15443,12 +15547,12 @@ final: prev: {
 
   tiny-glimmer-nvim = buildVimPlugin {
     pname = "tiny-glimmer.nvim";
-    version = "2025-09-04";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-glimmer.nvim";
-      rev = "84f6b0d8d83b098141e67072ef8f2606820a4454";
-      sha256 = "05911xc3rjxypl1w3j6phj384irs6c4jgbywhq5mf8g0pf1yzxga";
+      rev = "73b17b8a41ac7a61bfdcbe1cd3743c29d28d376e";
+      sha256 = "0yli2ffppi01r85nhm23f8iddqmanipg4xaq555bx46271iy90xx";
     };
     meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15456,12 +15560,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2025-10-01";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "6d8dc61a9c4077d9ec62a9c8998506dcd2a5b6af";
-      sha256 = "0rpndy1vbgsvhadc2f76mg9mdl52s2jv5748lz1hyqcl30axl6ny";
+      rev = "63dd87d195f28e01732e121c5ddfc0a74ccff54a";
+      sha256 = "08fcrccm1afpzbrkwy7q9nrs0l63jq9frprd0mr1d5vkq7ciy875";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15534,12 +15638,12 @@ final: prev: {
 
   todo-comments-nvim = buildVimPlugin {
     pname = "todo-comments.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "todo-comments.nvim";
-      rev = "19d461ddd543e938eb22505fb03fa878800270b6";
-      sha256 = "1kpzji8al0dsxcilh3jkndxsfgnhm5nclw36hkgly5ksslnpg8s2";
+      rev = "411503d3bedeff88484de572f2509c248e499b38";
+      sha256 = "1cvijn65ashf7vlcl47b6f56gjkjdkxzag34w4lljg0q5bzyfkjl";
     };
     meta.homepage = "https://github.com/folke/todo-comments.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15574,12 +15678,12 @@ final: prev: {
 
   tokyonight-nvim = buildVimPlugin {
     pname = "tokyonight.nvim";
-    version = "2025-10-10";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "d14614cbfc63b6037bfccd48bb982d2ad2003352";
-      sha256 = "03aqa2wm45jgnvvrwab1amnanqwd4awdkasawsspdkm6pc7774r2";
+      rev = "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd";
+      sha256 = "1s8qh9a8yajlfybcsky6rb31f0ihfhapm51531zn4xd0fyzy8dz3";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15653,12 +15757,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-10-03";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "2f6fc4957bf428764863aa35f57549e9246a3943";
-      sha256 = "1d6pswhz8alq4x37fhc0bldibzqmn1w05ipigk7xrbmkn2zb4a9k";
+      rev = "6b436021ccea7c3fde67cb42febfd4335ce3c73c";
+      sha256 = "1411yy2zy6sr39g0gn01sckn48zjwqghwbjvd1bs7ksvj09a5v42";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15706,12 +15810,12 @@ final: prev: {
 
   trouble-nvim = buildVimPlugin {
     pname = "trouble.nvim";
-    version = "2025-10-08";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "c098362fe603d3922095e7db595961e020bdf2d0";
-      sha256 = "1v4dx3ilmiwvspdwlfl7ia0zml8y0cb9jqlq5yzl6w3068b4m2di";
+      rev = "bd67efe408d4816e25e8491cc5ad4088e708a69a";
+      sha256 = "0cpwraxfvhnw0lvq26w58s15ynzyah9xn26bqn41acyi7ddclkz9";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15745,12 +15849,12 @@ final: prev: {
 
   ts-autotag-nvim = buildVimPlugin {
     pname = "ts-autotag.nvim";
-    version = "2025-10-02";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tronikelis";
       repo = "ts-autotag.nvim";
-      rev = "bfa97e1bdfac00bc2c788edb20400cc51b9bb493";
-      sha256 = "00jaq51hvdqg2a6c755vvigc9r0dkm3wfjicjf8aj7gpsyr6h7fk";
+      rev = "35f79f6253dff5cc43cf943d74c4b2734370a81d";
+      sha256 = "1qk0c4wlgch41nrhq51smvykc1gbhxvm4kmq8r69xxznm31mmzwp";
     };
     meta.homepage = "https://github.com/tronikelis/ts-autotag.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15758,12 +15862,12 @@ final: prev: {
 
   ts-comments-nvim = buildVimPlugin {
     pname = "ts-comments.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "ts-comments.nvim";
-      rev = "217ab9cc137fceb6659b53790bd25e608219abe1";
-      sha256 = "1ds48xh1lsyixlhf5a9mjlg8zqs03c1chgsjh063q6a1w4rlg9mb";
+      rev = "123a9fb12e7229342f807ec9e6de478b1102b041";
+      sha256 = "1819dm9grjz6v6y6b80bxdl24q16hrnk1psnlypsldf0j5gbf4ir";
     };
     meta.homepage = "https://github.com/folke/ts-comments.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15823,12 +15927,12 @@ final: prev: {
 
   twilight-nvim = buildVimPlugin {
     pname = "twilight.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "twilight.nvim";
-      rev = "c2650ddf665df997e4c7f57d7ef0e7352d4678a7";
-      sha256 = "0ka59109zp5aikcc20n7s6dnmn64a2dx62pp320q3a8x3l39lq5p";
+      rev = "664e752f4a219801265cc3fc18782b457b58c1e1";
+      sha256 = "02mriiwfzlxparrjc742vcqcf5kb1qy6ljf4c2k7xgd1yk1cb82p";
     };
     meta.homepage = "https://github.com/folke/twilight.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15849,12 +15953,12 @@ final: prev: {
 
   typescript-tools-nvim = buildVimPlugin {
     pname = "typescript-tools.nvim";
-    version = "2025-08-31";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "pmizio";
       repo = "typescript-tools.nvim";
-      rev = "bf11d98ad5736e1cbc1082ca9a03196d45c701f1";
-      sha256 = "0lsiw5rd89gclb84pkzkkn9hf6pdgsjcm9gs3ax45g8szal8z7gg";
+      rev = "db26c05e267239581c89f5c825fdb8c3cf6da0c5";
+      sha256 = "1pacl309w06qr70077c1vg2xgk2jx57f75c0nvw5mr1zvhgh2wca";
     };
     meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15888,12 +15992,12 @@ final: prev: {
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "2025-09-05";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "1603d37bb44ed2efa0b4378d1dfedc087b4f2141";
-      sha256 = "1yfpdccnk6qa38bv93hixr1libi7djs38jqr78c4m543qmyg5n2g";
+      rev = "64469f832c4d214683c12e0fceba98055cb1ce3b";
+      sha256 = "13340nd2rvvh3s9nyrg0kp72pxy6dpsh6nbh3zpqd7simlz1ys44";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15901,12 +16005,12 @@ final: prev: {
 
   typst-vim = buildVimPlugin {
     pname = "typst.vim";
-    version = "2025-04-27";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "kaarmu";
       repo = "typst.vim";
-      rev = "323539709e29a537ff39dfce6c05f175a8921504";
-      sha256 = "0di84i53g1azxr02jlfm9kzzg0fg1dprxn2llrm9in4wglxf9yix";
+      rev = "235e0423ab8b1ec83a29d8b1a45cfbd6c0296382";
+      sha256 = "0ydyx24d58zxr4gcsgm6750jyvx7nifb1w1sqwddz93n9a36fmnq";
     };
     meta.homepage = "https://github.com/kaarmu/typst.vim/";
     meta.hydraPlatforms = [ ];
@@ -15927,12 +16031,12 @@ final: prev: {
 
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
-    version = "2025-09-05";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "altermo";
       repo = "ultimate-autopair.nvim";
-      rev = "74163ac321c7d208a5bb9cdf8964114c7064d6c7";
-      sha256 = "05l123kbxk4p2jq629yppsjbvblc1zavrbb9pcixgnqra1shdn9m";
+      rev = "72e160cb1ce8c0db2ac4315f77d97420a2f4223d";
+      sha256 = "181x3v2a0ysynyd0gvqh1ddb2c8lk2fl91j1kv1zzhf5vx9g5bc0";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15979,12 +16083,12 @@ final: prev: {
 
   unified-nvim = buildVimPlugin {
     pname = "unified.nvim";
-    version = "2025-06-23";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "axkirillov";
       repo = "unified.nvim";
-      rev = "5831251be3a4d552f15a32565fe1a3f07c6a4a94";
-      sha256 = "1jz256licjs3vmzx9bf3ambk23m770qqvz9x07h6z8ixyyw8hky4";
+      rev = "6442680a541cd0fa8290b7b8894a61eeae4b2e26";
+      sha256 = "1x1gmi26qx4nr885hdc9lghfcac6ar1m0q3k9i12rj2rqa0i337r";
     };
     meta.homepage = "https://github.com/axkirillov/unified.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15992,12 +16096,12 @@ final: prev: {
 
   unimpaired-nvim = buildVimPlugin {
     pname = "unimpaired.nvim";
-    version = "2025-03-29";
+    version = "2025-10-16";
     src = fetchFromGitHub {
       owner = "tummetott";
       repo = "unimpaired.nvim";
-      rev = "75eb0cdee816f4642fe92ffd267a1fc1b02a0117";
-      sha256 = "07ri7vi4fzqdxn35646kswij61dpg63pq8f2d46jyifxzv1kbis7";
+      rev = "4995cb674cb4c5e442f0cd9d86f6f9c20333a0b8";
+      sha256 = "1w5jpv2smwy2mfds7rvvgfdi9jqb48cs1k9anryd7rcqwxk72jmy";
     };
     meta.homepage = "https://github.com/tummetott/unimpaired.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16018,12 +16122,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-10-11";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "ffa9b39e4ca10be174743494317a3321372c4989";
-      sha256 = "1cadhm6fmzgam5drkim55mprq96jc5bk6g72ibj3xw0ywxf3zjb9";
+      rev = "6bb338e7b9a905a5c2750f28a5e46fb08e653d8c";
+      sha256 = "0fwxyn6vy0apy6shai7yrlmlrb38yzpr1ry9ylgmnynhyfzi87kb";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -16044,12 +16148,12 @@ final: prev: {
 
   url-open = buildVimPlugin {
     pname = "url-open";
-    version = "2024-02-03";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "sontungexpt";
       repo = "url-open";
-      rev = "9f8f4a56ac709f26aa17d8ef921b272bf2262a30";
-      sha256 = "0caphlqkvz8labx54ap7nasvyx5kgsnp49zw98cvrd43hn60mrsa";
+      rev = "dce2a9bc51e4885ea80ca03da5b4d0f719aaf820";
+      sha256 = "002560m8yhx87rlalssjlrhs9w0yx1rijim7kq59kr5jk12gcsrm";
     };
     meta.homepage = "https://github.com/sontungexpt/url-open/";
     meta.hydraPlatforms = [ ];
@@ -16122,12 +16226,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2025-10-12";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      rev = "cdbfdc8cc1122b8aa9609a7a681c5c501976a387";
-      sha256 = "19zxbpqh2ygscjjs15kv9r2cp4g68xb4hj2bm8vn0akcisj56hbd";
+      rev = "dba28050887c2810b5ebf9e0143b4e919bd55757";
+      sha256 = "1zjbwaysdckllknp3xsa2wjyafic6aq0qygf1pf9l5lgp0hm6qqr";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16146,6 +16250,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  venv-selector-nvim = buildVimPlugin {
+    pname = "venv-selector.nvim";
+    version = "2025-11-05";
+    src = fetchFromGitHub {
+      owner = "linux-cultist";
+      repo = "venv-selector.nvim";
+      rev = "1ef6564d0bd0d9c4194711cfb696357a6119abd7";
+      sha256 = "1v8b9j4ysyiyjv7qy37sja4mmywfzil082llrjkw86lwglrjipja";
+    };
+    meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   verilog_systemverilog-vim = buildVimPlugin {
     pname = "verilog_systemverilog.vim";
     version = "2024-10-13";
@@ -16564,12 +16681,12 @@ final: prev: {
 
   vim-airline = buildVimPlugin {
     pname = "vim-airline";
-    version = "2025-09-22";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "159573187e9996d06cf26e49a533f424f4d70b43";
-      sha256 = "051h32i6mxnqjshnplm1n562jpi2z3ym6cf9nk093h28y24p0bw1";
+      rev = "6b51799f26c5fe262ebb04742ce7cdb011082ed7";
+      sha256 = "05cdf3nrphy6mczkvmr62dllb0vn28b68yzi9k4msnw8iw6jyfa3";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
     meta.hydraPlatforms = [ ];
@@ -16681,12 +16798,12 @@ final: prev: {
 
   vim-argwrap = buildVimPlugin {
     pname = "vim-argwrap";
-    version = "2023-12-26";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "FooSoft";
       repo = "vim-argwrap";
-      rev = "f3e26a5ad249d09467804b92e760d08b1cc457a1";
-      sha256 = "0qd9jzfilqr7kwgh251vcb9f4p55b9d73d90kxsa596b5wy5a494";
+      rev = "03615d1eed248408567bc8fa6a5a8c94ef3cd170";
+      sha256 = "1pydv9kh9l9f3dd9vn5llpx2c1zz8w6lrrcy3h244ixwawf9niy7";
     };
     meta.homepage = "https://github.com/FooSoft/vim-argwrap/";
     meta.hydraPlatforms = [ ];
@@ -16965,6 +17082,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-buftabline = buildVimPlugin {
+    pname = "vim-buftabline";
+    version = "2020-12-13";
+    src = fetchFromGitHub {
+      owner = "ap";
+      repo = "vim-buftabline";
+      rev = "73b9ef5dcb6cdf6488bc88adb382f20bc3e3262a";
+      sha256 = "1vs4km7fb3di02p0771x42y2bsn1hi4q6iwlbrj0imacd9affv5y";
+    };
+    meta.homepage = "https://github.com/ap/vim-buftabline/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-caddyfile = buildVimPlugin {
     pname = "vim-caddyfile";
     version = "2025-07-22";
@@ -17396,12 +17526,12 @@ final: prev: {
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2025-08-24";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373";
-      sha256 = "014hzw3fh7v9zp3i6s1rv11i0gg8wv1qz4acs9nmwlmyir400jz9";
+      rev = "236179fd6bdc2aabeb1326d428e6b29d41044d8e";
+      sha256 = "1gsg1nmsxzmv0hga68xg9j1v4qsknrgw8hhsp0flr167gmcy15w0";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
     meta.hydraPlatforms = [ ];
@@ -17708,12 +17838,12 @@ final: prev: {
 
   vim-endwise = buildVimPlugin {
     pname = "vim-endwise";
-    version = "2025-04-06";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-endwise";
-      rev = "eab530110d7a0d985902a3964894816b50dbf31a";
-      sha256 = "1lj12b0qim0n1x6aqvz79wl6415x9yi96yx22v3iycn00s6awpmj";
+      rev = "4994afb0cdf956d9a665a14b9c834869e602c396";
+      sha256 = "1x1y99cqzzkf7a76w5ksd9qm96m078wx60lpjv6i2ifcn6m9yz0f";
     };
     meta.homepage = "https://github.com/tpope/vim-endwise/";
     meta.hydraPlatforms = [ ];
@@ -17838,12 +17968,12 @@ final: prev: {
 
   vim-fern = buildVimPlugin {
     pname = "vim-fern";
-    version = "2025-05-28";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-fern";
-      rev = "88f6d81c2d2348cbfb3120931ce72268195859c6";
-      sha256 = "05pnmvnfwh5div389s7dwg42lbfd16l31bwigyclgqzvfxg66lpb";
+      rev = "cb60188e312e2218f78a760f38164bbe51932c0d";
+      sha256 = "1mba9g53bpl5y7zhgym5p3gpdknwzfi052mwf26xx9lavgprm4rb";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-fern/";
     meta.hydraPlatforms = [ ];
@@ -17942,12 +18072,12 @@ final: prev: {
 
   vim-floaterm = buildVimPlugin {
     pname = "vim-floaterm";
-    version = "2025-06-25";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea";
-      sha256 = "1blbvnip3z25dp3mn5mzgcz96bbw6dqpa1myiih4bppgilvr77gw";
+      rev = "a720490bd9dc02c5492e800aa08d4802f22b01f8";
+      sha256 = "0im1nf4pnrldzrycrx12nv5qzas7i01m7iizmq6yqlxpnrqrjw4c";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
     meta.hydraPlatforms = [ ];
@@ -18319,12 +18449,12 @@ final: prev: {
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "2025-10-08";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "6542bcb900a02bda79e3410e4ab704469553e549";
-      sha256 = "1wsjxrgn9f3rlizlcr2znxqqlx9b222268v5s0hjy37lzsp3as4l";
+      rev = "4d4192f17a15905ef2b0eca3c4bb5c93454cc6a8";
+      sha256 = "05zmqc505r73l7k28g01fjagzysqbicxlyhchzjqsmj8iwrsdsnn";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
     meta.hydraPlatforms = [ ];
@@ -18552,6 +18682,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-hy = buildVimPlugin {
+    pname = "vim-hy";
+    version = "2024-10-06";
+    src = fetchFromGitHub {
+      owner = "hylang";
+      repo = "vim-hy";
+      rev = "ab1699bfa636e7355ac0030189331251c49c7d61";
+      sha256 = "09v83a6ybj73043acpm2nps5s56sqg2pz456b4qgz2r7zjlgx5r9";
+    };
+    meta.homepage = "https://github.com/hylang/vim-hy/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-hybrid = buildVimPlugin {
     pname = "vim-hybrid";
     version = "2016-01-05";
@@ -18919,12 +19062,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2025-10-03";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "3deeee5998408ce5a0ff3959a0e6b4bce530c37e";
-      sha256 = "0h8xpnn3d45ny7jys8yivcss8qsmv7p704rd25ag4l4nbw7ivv7m";
+      rev = "c13e317dda76ea01c2521cbed2a5c552a96951bd";
+      sha256 = "0c3ywicf0c4z2r633flz9is73008phzcfs5bp2iv3gk6cr7i51m1";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.hydraPlatforms = [ ];
@@ -18971,12 +19114,12 @@ final: prev: {
 
   vim-latex-live-preview = buildVimPlugin {
     pname = "vim-latex-live-preview";
-    version = "2023-09-25";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
-      rev = "e1906cd4930a58ebaa5eb446436df23522eafb51";
-      sha256 = "1adfyk96prwbf8dmznnfqvz27jxq0fpjygdhbrcc8b2i93i2dia2";
+      rev = "9973568fc7275f70a4277d474821284128850034";
+      sha256 = "05ni1vc6scakhkaqv4vkxbzdpg2gji90c1qb6virk7jdsd8amqx5";
     };
     meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/";
     meta.hydraPlatforms = [ ];
@@ -19023,12 +19166,12 @@ final: prev: {
 
   vim-ledger = buildVimPlugin {
     pname = "vim-ledger";
-    version = "2025-10-09";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
-      rev = "4e825eb0075c0263364aa85feaa2870a68d586cc";
-      sha256 = "14ihpqaxr6h301nwmj61v72zgdb4s5jmjfnghyky3szl34gv2b60";
+      rev = "225969f63ddaa6104fd4234d6bc17dd37deea567";
+      sha256 = "1fqv9cg769cysblfbgr3kpiz4ggxsr20s07kr671sxz9hz2srfy1";
     };
     meta.homepage = "https://github.com/ledger/vim-ledger/";
     meta.hydraPlatforms = [ ];
@@ -19166,12 +19309,12 @@ final: prev: {
 
   vim-lsp = buildVimPlugin {
     pname = "vim-lsp";
-    version = "2025-10-06";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "04ef607075184e7b8481245a40a9010368511e98";
-      sha256 = "0pf5smslzs295dryl9zf640g8wsysjpx0dqa3dpijj38visi0i5q";
+      rev = "c0de72708afe7b90f54bd085933bf8b7eb9971a1";
+      sha256 = "1mj1kjfqa1v3rpr21mpvv6png3vk35jbchcyld3amz90l79hwhm9";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
     meta.hydraPlatforms = [ ];
@@ -19205,12 +19348,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "2025-10-11";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "8860e8fbba6c77f7cb170c94f02b09cdf006fe6f";
-      sha256 = "0xsaq4ykykr61v4czzpb5jqr68hzacbxz7gp6wzkdkb7jd7fwh3x";
+      rev = "19aef037e198fa5694b98a052f23e285bf113550";
+      sha256 = "0qbaspslipdkb7vflwd9qc50jl4qvsg4d8zjnkhm173dgq63czxc";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.hydraPlatforms = [ ];
@@ -19296,12 +19439,12 @@ final: prev: {
 
   vim-markdown = buildVimPlugin {
     pname = "vim-markdown";
-    version = "2024-09-20";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "vim-markdown";
-      rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51";
-      sha256 = "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834";
+      rev = "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397";
+      sha256 = "1g7fjnnmwkic6q7d12vb500yn4v21ifjwd6n45iva5xy5d250ibf";
     };
     meta.homepage = "https://github.com/preservim/vim-markdown/";
     meta.hydraPlatforms = [ ];
@@ -19335,12 +19478,12 @@ final: prev: {
 
   vim-matchup = buildVimPlugin {
     pname = "vim-matchup";
-    version = "2025-10-03";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "ca538c3bb02836510526ff7d07cf7e4c8e9a3b90";
-      sha256 = "0901b4pqnx3xwxm99ihy4yhp8dhfbb18ghj3d41whvbddc171zih";
+      rev = "1c276e12b49a83c1bdca74351187b8adea5da4b9";
+      sha256 = "1cb3y7kxa13nbzbsch8qz0qzdbhd46di2ds3yhx1hv5bcg500q5c";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
     meta.hydraPlatforms = [ ];
@@ -19465,12 +19608,12 @@ final: prev: {
 
   vim-moonfly-colors = buildVimPlugin {
     pname = "vim-moonfly-colors";
-    version = "2025-10-11";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-moonfly-colors";
-      rev = "8129169a07cb64fef644f73c3fd27db2e50e818a";
-      sha256 = "0fmhi9xih3imgavxrda9znl6wm3h9y94mf8nm4nfxvmd9cc5va8l";
+      rev = "ef85b89739bee184e204c89bc06280d62bd84039";
+      sha256 = "1jgyn9pg0ikvf92nva8irybnnxgca1bsqvqczgbhicc2b251wvjm";
     };
     meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -19491,12 +19634,12 @@ final: prev: {
 
   vim-mucomplete = buildVimPlugin {
     pname = "vim-mucomplete";
-    version = "2025-09-28";
+    version = "2025-10-15";
     src = fetchFromGitHub {
       owner = "lifepillar";
       repo = "vim-mucomplete";
-      rev = "deabc281e01ae3f395b1d377934bf2ab806dcf45";
-      sha256 = "0xkrlqibhzydl95w5z156dggjqdhkww6fgaim83vx5xcabnhimsm";
+      rev = "7ad72b26aa679a6dda3837441742b7bd95eed3eb";
+      sha256 = "072pkpnvnrv3ra94p3k3v3s26jgz5mgzrgbrbxcihlcgvcfvll34";
     };
     meta.homepage = "https://github.com/lifepillar/vim-mucomplete/";
     meta.hydraPlatforms = [ ];
@@ -19881,12 +20024,12 @@ final: prev: {
 
   vim-pandoc = buildVimPlugin {
     pname = "vim-pandoc";
-    version = "2025-04-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "a9896b7f7c09b7804dd9e200e7b96c18ecb5fa0b";
-      sha256 = "01282v4pfjzabixrnwlfrfy84d4xxczzgc38zgk4rz831ani3681";
+      rev = "c31d5c10b29c99cf1a344ae30e2ffa32cf2df743";
+      sha256 = "1xf4694592w8vhwybkag9bqvrd53wg8xcdmdafg1qsk9bbhq89gz";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
     meta.hydraPlatforms = [ ];
@@ -20037,12 +20180,12 @@ final: prev: {
 
   vim-plug = buildVimPlugin {
     pname = "vim-plug";
-    version = "2025-09-03";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "904dac1530cfec0880cd44e4f7f206eb2e9e3247";
-      sha256 = "0m6xgah7bsyppsm0g3zk3drapfymzlkbzkpl278byvnz3zqj6sy5";
+      rev = "3f17a5cc3d7b0b7699bb5963fef9435a839dada0";
+      sha256 = "1jh5iqq3qxsfqf1p2fr6gjjc3ri272b0qaf5i26ix5dvcl4jd55i";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
     meta.hydraPlatforms = [ ];
@@ -20557,12 +20700,12 @@ final: prev: {
 
   vim-sentence-chopper = buildVimPlugin {
     pname = "vim-sentence-chopper";
-    version = "2025-09-16";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "Konfekt";
       repo = "vim-sentence-chopper";
-      rev = "c855a92c12b6cb3accdb9535658720a6939d82ea";
-      sha256 = "0pbbg2k0xyyn890afsbvkwc3w1d3h4a3n452phj6hhg4z01kw6a8";
+      rev = "d2cd11c3ee08b8ab303b374af38a5671ec5007a0";
+      sha256 = "0yr6kb2znf72yh1kqk09r4hg4zjijy1g3g36jd0mbrbr1qqp6mbz";
     };
     meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/";
     meta.hydraPlatforms = [ ];
@@ -20570,12 +20713,12 @@ final: prev: {
 
   vim-sexp = buildVimPlugin {
     pname = "vim-sexp";
-    version = "2025-09-28";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "vim-sexp";
-      rev = "b8f74c5a7aea1290a9179223887a582898b3cd29";
-      sha256 = "0hxy5xbvslzq5zhrr1rqbq1x6cy538g4h9shbh0kzglic98sisw8";
+      rev = "d8df22690b146ce07fdaf49940e3214def76a69c";
+      sha256 = "19g7jymp3qmh9mx1kpj9yksykm4lhrsdpbvkzpw4sfhhw2mzxk4c";
     };
     meta.homepage = "https://github.com/guns/vim-sexp/";
     meta.hydraPlatforms = [ ];
@@ -20765,12 +20908,12 @@ final: prev: {
 
   vim-smt2 = buildVimPlugin {
     pname = "vim-smt2";
-    version = "2025-05-07";
+    version = "2025-10-17";
     src = fetchFromGitHub {
       owner = "bohlender";
       repo = "vim-smt2";
-      rev = "d9e42b02f8ddc8cb82c17feeb3c50a4e3a209e24";
-      sha256 = "1jb9hd3ihhkb1zvdfvad05f8y1j77xxgwqfvgyv5rpdl95wli905";
+      rev = "6887cc6dfc51d4e6461f3c99cde76c3538f0d33d";
+      sha256 = "0s926pf9silzz9ms1d4wfkjmi5cisy6n50a2n7h2rf6g5k6gzx5y";
     };
     meta.homepage = "https://github.com/bohlender/vim-smt2/";
     meta.hydraPlatforms = [ ];
@@ -20804,12 +20947,12 @@ final: prev: {
 
   vim-snippets = buildVimPlugin {
     pname = "vim-snippets";
-    version = "2025-09-04";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "f371d635f6f6350d34bbb483e37e383db322d145";
-      sha256 = "1jwqxjf9553hi41ynaw8xgffhz9gbkxkxcnhcbkzr179054kvz8x";
+      rev = "ededcf7581962ee616cadab360d5966f3307f11a";
+      sha256 = "1l9j1hs4r2pq9n4s5mysyfbrssrbsv3hclfjiwylci6vpb5jrmza";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
     meta.hydraPlatforms = [ ];
@@ -20869,12 +21012,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-10-11";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "72ab51ebaf2fb09bd8e8f06dbceea360eda1b6e2";
-      sha256 = "019dqi5j55appij3hajy58ykim832b2x1k3spxy5fj1lim6664gd";
+      rev = "449ad78bdbb5d860a53988e0ca29c6d7912fa070";
+      sha256 = "0zwl80y68aki3zky2j2sw785hfw5d4i25vg5a3nlp8s62k2s6ykf";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -20986,12 +21129,12 @@ final: prev: {
 
   vim-suda = buildVimPlugin {
     pname = "vim-suda";
-    version = "2024-12-08";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-suda";
-      rev = "9adda7d195222d4e2854efb2a88005a120296c47";
-      sha256 = "1fg892y34zabvivs0h9afdbsh1vp0s590lfxaq5jaf0xn3g35az3";
+      rev = "c492741b4679b3cdd4d9e34138209784e061d916";
+      sha256 = "1rddfpvlvb6873id8dpvxkf2d2r67i8zfzsn1k1z1d44v741vjn9";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-suda/";
     meta.hydraPlatforms = [ ];
@@ -21143,12 +21286,12 @@ final: prev: {
 
   vim-test = buildVimPlugin {
     pname = "vim-test";
-    version = "2025-09-30";
+    version = "2025-10-14";
     src = fetchFromGitHub {
       owner = "vim-test";
       repo = "vim-test";
-      rev = "ad4b7213568d59a5e37606ad65859e3a8e45dbd2";
-      sha256 = "0ksm8893v04sn4qmdj50x853mzb175dlprj8iclf9zimjjsgkcvc";
+      rev = "2c264d2a5dddb3a7ec927e4359a2b619a8c13a8c";
+      sha256 = "0y91q6rdwll52hh66ca8z6ljafm1nb8db3dgxx5w30haq4qdimv2";
     };
     meta.homepage = "https://github.com/vim-test/vim-test/";
     meta.hydraPlatforms = [ ];
@@ -21351,12 +21494,12 @@ final: prev: {
 
   vim-tpipeline = buildVimPlugin {
     pname = "vim-tpipeline";
-    version = "2025-05-06";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "vimpostor";
       repo = "vim-tpipeline";
-      rev = "cbaa8b5130c0c37f3ddafbc703775edbb3edcf78";
-      sha256 = "14qswdhw2lnhsjbn8wx1lfmmy652zd8jcgkh56dv3dnql21klx84";
+      rev = "bc6dfc10e26a8dd1ec2f0512050a8a0afaa9d090";
+      sha256 = "1fpmm71ksd3vjj8mh2ndyrgymyjg1zljxyjkxqz3153qgh2l8vm7";
     };
     meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
     meta.hydraPlatforms = [ ];
@@ -21637,12 +21780,12 @@ final: prev: {
 
   vim-wayland-clipboard = buildVimPlugin {
     pname = "vim-wayland-clipboard";
-    version = "2025-08-21";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "jasonccox";
       repo = "vim-wayland-clipboard";
-      rev = "7e9fb4e66d345e9898045b52df544c9e553ef5e4";
-      sha256 = "1bb2yaq13l65p8k77a2bml0lvazhzjan4k7f4n43szkby1dvhdll";
+      rev = "dc37e83e7484fa2085cdaf37f84408e12006165a";
+      sha256 = "1gkhlb93w68cgrwydb5wby1zzczapzqidapk8q842bxadaypkdll";
     };
     meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
     meta.hydraPlatforms = [ ];
@@ -21845,12 +21988,12 @@ final: prev: {
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2025-09-22";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "0b87b9af4c422e7e9cb700a903e95f47a0ddf4b9";
-      sha256 = "1ifplv74hanp7mqx492cn67kbhyyc42h91admllsi67gzmyjir8r";
+      rev = "bf0a44e2f1e985a1c3e70043891377d46125a8ab";
+      sha256 = "0b063sw12vv011l5021dc9fpfay8y1cc61lmxd4ig11lv6lcds5p";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
     meta.hydraPlatforms = [ ];
@@ -21962,12 +22105,12 @@ final: prev: {
 
   vimspector = buildVimPlugin {
     pname = "vimspector";
-    version = "2025-10-02";
+    version = "2025-10-17";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "0da16c67e5fc862ac8988d0580a58d40858f2456";
-      sha256 = "1ls1iv44iazrhxd216i4f9xyh5vjxji2rpclgpkngslypf9hvzf7";
+      rev = "97984cafcf5e15befa05ec134d644e5e4f1c07f3";
+      sha256 = "1dp2g8kmj4fndz9qff2dnv39qd6gbavd0byik3xk169jjlc2drri";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -21976,12 +22119,12 @@ final: prev: {
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2025-10-12";
+    version = "2025-10-13";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "7c7880d80166a5bb65e8c399843103cf0527b6ae";
-      sha256 = "0xg835xdil2kx8pvpk8vh1cdm7q6w7rf60n7vsdmyqyym37fb1n2";
+      rev = "be9deac3a23eeb145ccf11dd09080795838496ce";
+      sha256 = "1v65l6bqm8xm21nvyqnanrq0q1i85khvxxzgv5qv9n8cdi10f7jg";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
     meta.hydraPlatforms = [ ];
@@ -21989,12 +22132,12 @@ final: prev: {
 
   vimux = buildVimPlugin {
     pname = "vimux";
-    version = "2025-07-23";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "vimux";
-      rev = "04f299e53eb81883da0edea6a57018067f3b4938";
-      sha256 = "191z46bcgg9ajqbw2g34mvismqfi4gb94k35isp9dn4322lkhgk6";
+      rev = "614f0bb1fb598f97accdcea71d5f7b18d7d62436";
+      sha256 = "17hbhqxcd31w5sd98cia88rsnrnsychdhbvpqjscr4k8mr2awhch";
     };
     meta.homepage = "https://github.com/preservim/vimux/";
     meta.hydraPlatforms = [ ];
@@ -22093,12 +22236,12 @@ final: prev: {
 
   vs-tasks-nvim = buildVimPlugin {
     pname = "vs-tasks.nvim";
-    version = "2025-08-19";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "EthanJWright";
       repo = "vs-tasks.nvim";
-      rev = "d5a28e46a76ba1a6f9189e68168f5b963797303a";
-      sha256 = "0r7jyd7wfywnf7j9ym0f9b4lh4ng69nm3z6qm5jjhjhr51nkhs3k";
+      rev = "1dafea1a206590644d04a71159cd4f7651b6fb8e";
+      sha256 = "1c7kb5hx46f9g87iryjjpbcif1al96dlh0am1k7zzddd5hyjyq1l";
     };
     meta.homepage = "https://github.com/EthanJWright/vs-tasks.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22171,12 +22314,12 @@ final: prev: {
 
   which-key-nvim = buildVimPlugin {
     pname = "which-key.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "b4177e3eaf15fe5eb8357ebac2286d488be1ed00";
-      sha256 = "05g22fvbi7yhjnq16cszryc1aqs68v9mcrwgaa9xz0glj9bpwz9p";
+      rev = "3aab2147e74890957785941f0c1ad87d0a44c15a";
+      sha256 = "1dwri7gxqgb58pfy829s0ns709m0nrcj1cgz2wj1k09qfffri9mc";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22223,12 +22366,12 @@ final: prev: {
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2025-09-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "75a491775b498e5eac1de9c440b67942bdeab2a6";
-      sha256 = "1l4p93j5zi43n3i480pzx1s2p0w5yibvkihmliq4y3dqq0llw6f0";
+      rev = "44b8a6cc97bcb1e647c20874334a28460de71d45";
+      sha256 = "0kkjlwqgjvrngmq6vi0ms18yy1naxvvk1lqgzk5vmkpx43a9rda6";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
     meta.hydraPlatforms = [ ];
@@ -22405,12 +22548,12 @@ final: prev: {
 
   wtf-nvim = buildVimPlugin {
     pname = "wtf.nvim";
-    version = "2025-09-22";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "piersolenski";
       repo = "wtf.nvim";
-      rev = "62437210d1da5a4343a74ab859b59c8ba0d682a2";
-      sha256 = "0cr28yw7zg568qig3b0fpavrj15f3rx7vxihbkbd29x98f0xlpx3";
+      rev = "0b46f96e07d1eaf9b495027be4caa1fab2ffe295";
+      sha256 = "0jz309cxyqv1i2pq123h18pnid14yxlrjqdvhyzwfhafjh8pzjs9";
     };
     meta.homepage = "https://github.com/piersolenski/wtf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22418,12 +22561,12 @@ final: prev: {
 
   xeno-nvim = buildVimPlugin {
     pname = "xeno.nvim";
-    version = "2025-08-27";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "kyza0d";
       repo = "xeno.nvim";
-      rev = "4a1d3946b5c3b9b581e76a84746a06b0977b1fed";
-      sha256 = "1lbj321vz1gzgy4wdmzca74hrwzizy2i0645bqix0id4q3zm7lfd";
+      rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb";
+      sha256 = "13z0lq26g9yhzplsn3nm1prbvcgks1vjpz7q28m1hkkip6b9qcfd";
     };
     meta.homepage = "https://github.com/kyza0d/xeno.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22523,12 +22666,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-10-10";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "1242f9bf230b226da23ff2d8df5f6dd09383eb66";
-      sha256 = "0l86jk6c2wwyypl3w7zz1a8lyn4b5ymcbdiq9dx0dfbxj8ccmsl3";
+      rev = "667028e28f03286aaf6aaca3d63653ff731a3381";
+      sha256 = "0jpdhbqqh79csa00bhw1532qlck5xnij8n2z724z5d2k5ng9fqa7";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22614,12 +22757,12 @@ final: prev: {
 
   zen-mode-nvim = buildVimPlugin {
     pname = "zen-mode.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "zen-mode.nvim";
-      rev = "438a59c33763d79e34ceb394e012c3bfd6aa1084";
-      sha256 = "07h4a9ncnz2x4z8f46dvc60crylhpglh962axyz8j7kggsda9c2f";
+      rev = "8564ce6d29ec7554eb9df578efa882d33b3c23a7";
+      sha256 = "0kjiakg4w869j8pxjgzn0h9wi0wv40hzm6mc3igli7nv7ngp44mx";
     };
     meta.homepage = "https://github.com/folke/zen-mode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22679,12 +22822,12 @@ final: prev: {
 
   zk-nvim = buildVimPlugin {
     pname = "zk-nvim";
-    version = "2025-09-15";
+    version = "2025-10-12";
     src = fetchFromGitHub {
       owner = "zk-org";
       repo = "zk-nvim";
-      rev = "8e0446f448e03dfe76ab671724f4c8db7a46cd37";
-      sha256 = "1dwhwhyh0ywcs9mdgmzqf1plp8rzdahkl88wwzdlzix4i4i3lh6s";
+      rev = "575c3e8242d925c87e9a11fd7d304bc223d2f096";
+      sha256 = "17hm22xzz9wpks9m4i63in08dxsjy24rl463l730vv690sbrl0wr";
     };
     meta.homepage = "https://github.com/zk-org/zk-nvim/";
     meta.hydraPlatforms = [ ];
@@ -22705,12 +22848,12 @@ final: prev: {
 
   zotcite = buildVimPlugin {
     pname = "zotcite";
-    version = "2025-10-05";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "jalvesaq";
       repo = "zotcite";
-      rev = "203f706920de419b548b0fed066d2fbeb89878c9";
-      sha256 = "1wwqwmi4zm987h06y2cl4c1m3g0p14yd1iz70ps1w2m3785bwwb2";
+      rev = "11b0678865c2c0c6c0bc4054996b565c2cda4f75";
+      sha256 = "0ilf4n2wnja6li72ph2rs90w8hs54vys4kcicfh3cqx2038xp1c1";
     };
     meta.homepage = "https://github.com/jalvesaq/zotcite/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 3a24fa7562fe..03fe172d2380 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -6,39 +6,10 @@
 final: prev:
 let
   nodePackageNames = [
-    "coc-cmake"
-    "coc-emmet"
-    "coc-eslint"
-    "coc-flutter"
     "coc-go"
-    "coc-haxe"
-    "coc-highlight"
-    "coc-html"
-    "coc-java"
-    "coc-jest"
-    "coc-json"
-    "coc-lists"
     "coc-ltex"
-    "coc-markdownlint"
-    "coc-pairs"
-    "coc-prettier"
-    "coc-r-lsp"
-    "coc-rust-analyzer"
-    "coc-smartf"
-    "coc-snippets"
-    "coc-solargraph"
-    "coc-sqlfluff"
-    "coc-stylelint"
-    "coc-sumneko-lua"
-    "coc-tabnine"
-    "coc-texlab"
     "coc-tsserver"
     "coc-ultisnips"
-    "coc-vimlsp"
-    "coc-vimtex"
-    "coc-wxml"
-    "coc-yaml"
-    "coc-yank"
     "coc-nginx"
   ];
 
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index daf7f0cfd8f5..f79b73dc93db 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-10-12";
+  version = "0.0.27-unstable-2025-10-31";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "f092bb3ec0acf87b838e082209b6a7eddcbf5940";
-    hash = "sha256-zKDp9It/VgUD8BN5ktTmfbQX0s3SBo20T8no8nwsyfY=";
+    rev = "7f48770e66684e9a7d4d5b9c47505a23e0167a6e";
+    hash = "sha256-U8RnTBGW+dR26JATQ10JbM8R03qX/ovPjvelHw2J7fc=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
index 5a0247b9bbc5..52ac17aaf698 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
@@ -8,23 +8,26 @@
   nix-update-script,
 }:
 let
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.pairs";
     tag = "v${version}";
-    hash = "sha256-RTY/uGviyHlO+ZmLwOC5BabKr+kRDAXGZNdS9fVRPWA=";
+    hash = "sha256-IfnFSusQMm6LujE1AmihK9wEF2RSGfKYwpV2fedg0fc=";
   };
 
   blink-pairs-lib = rustPlatform.buildRustPackage {
     pname = "blink-pairs";
     inherit version src;
 
-    cargoHash = "sha256-j+zk0UMjvaVgsdF5iaRVO4Puf/XtGu08Cs92jKPaM1g=";
+    cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU=";
 
     env.RUSTC_BOOTSTRAP = 1;
 
+    # NOTE: Disabled upstream too
+    doCheck = false;
+
     nativeBuildInputs = [
       pkg-config
     ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
index 89a6d7e91767..ff7883e7b4b4 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/cmp-async-path/default.nix
@@ -7,14 +7,14 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "cmp-async-path";
-  version = "0-unstable-2025-04-13";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "FelipeLema";
     repo = "cmp-async-path";
-    rev = "0ed1492f59e730c366d261a5ad822fa37e44c325";
-    hash = "sha256-J1Iw7yNfvWq7Jul25Eyx4qk9lSiLpZt4TRvTYi1DXtk=";
+    rev = "b8aade3a0626f2bc1d3cd79affcd7da9f47f7ab1";
+    hash = "sha256-gaK2aemMX4fzH85idIPuVZ1+ay5vCNqgxU15J4Jz5wU=";
   };
 
   checkInputs = [ vimPlugins.nvim-cmp ];
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
new file mode 100644
index 000000000000..8f2f04b5ce86
--- /dev/null
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -0,0 +1,70 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  pkg-config,
+  perl,
+  openssl,
+  vimUtils,
+  nix-update-script,
+}:
+let
+  version = "65aeacf-unstable-2025-11-03";
+  src = fetchFromGitHub {
+    owner = "dmtrKovalenko";
+    repo = "fff.nvim";
+    rev = "65aeacf9e2c663c9af2b1003727aa25acac96db4";
+    hash = "sha256-rGfV/BxSwvcNZXmVUk54gni8fKFyoTsQl+gBtYci4jE=";
+  };
+  fff-nvim-lib = rustPlatform.buildRustPackage {
+    pname = "fff-nvim-lib";
+    inherit version src;
+
+    cargoHash = "sha256-ZZt4BlMgRik4LH92F5cgS84WI1Jeuw68jP+y1+QXfDE=";
+
+    nativeBuildInputs = [
+      pkg-config
+      perl
+    ];
+
+    buildInputs = [
+      openssl
+    ];
+
+    env = {
+      RUSTC_BOOTSTRAP = 1; # We need rust unstable features
+
+      OPENSSL_NO_VENDOR = true;
+    };
+  };
+in
+vimUtils.buildVimPlugin {
+  pname = "fff.nvim";
+  inherit version src;
+
+  postPatch = ''
+    substituteInPlace lua/fff/download.lua \
+      --replace-fail \
+        "return plugin_dir .. '/../target'" \
+        "return '${fff-nvim-lib}/lib'"
+  '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [ "--version=branch" ];
+      attrPath = "vimPlugins.fff-nvim.fff-nvim-lib";
+    };
+
+    # needed for the update script
+    inherit fff-nvim-lib;
+  };
+
+  meta = {
+    description = "Fast Fuzzy File Finder for Neovim";
+    homepage = "https://github.com/dmtrKovalenko/fff.nvim";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+    ];
+  };
+}
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix
similarity index 79%
rename from pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix
rename to pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix
index 8e6f58e1a105..7c29c2d21447 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix
@@ -1,9 +1,9 @@
 {
   vimUtils,
-  ethersync,
+  teamtype,
 }:
 vimUtils.buildVimPlugin rec {
-  inherit (ethersync)
+  inherit (teamtype)
     pname
     version
     src
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
index dc81b884361d..8d628bdd7767 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/vim-stationeers-ic10-syntax/default.nix
@@ -6,13 +6,13 @@
 }:
 vimUtils.buildVimPlugin {
   pname = "vim-ic10";
-  version = "0-unstable-2025-10-09";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitLab {
     owner = "LittleMorph";
     repo = "vim-ic10";
-    rev = "7e9cb3bf91f692e26e899a6d513fcee7dd60bf72";
-    hash = "sha256-7mQ8PEbqQS4E8Kg6nU+uTj9Nyke80FEcLpmV46B7GFA=";
+    rev = "74446a16078ef4f3d2088136b32af939fb6bc2a4";
+    hash = "sha256-YCxrSB7eRQ54iZhpcsAR930Uccj+2ZyogpYGKbcSlys=";
   };
 
   passthru.updateScript = nix-update-script {
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 3cac5d5714c1..5bae846989cb 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -21,12 +21,12 @@
 {
   ada = buildGrammar {
     language = "ada";
-    version = "0.0.0+rev=b23672d";
+    version = "0.0.0+rev=6c26c44";
     src = fetchFromGitHub {
       owner = "briot";
       repo = "tree-sitter-ada";
-      rev = "b23672d313b4c994ab96fd54f1b7ff15eac68a55";
-      hash = "sha256-XkJmrMppr1+1uPQwqAHcf1XBccwGexL0euXZBUX7xlM=";
+      rev = "6c26c4413965dc7bacbccfa66503bf6b8228e254";
+      hash = "sha256-kxm6MVUktOzH6WVKZxgGO9kFFEUXk7NFk+twidsDNM0=";
     };
     meta.homepage = "https://github.com/briot/tree-sitter-ada";
   };
@@ -242,12 +242,12 @@
   };
   c3 = buildGrammar {
     language = "c3";
-    version = "0.0.0+rev=057a75d";
+    version = "0.0.0+rev=e457069";
     src = fetchFromGitHub {
       owner = "c3lang";
       repo = "tree-sitter-c3";
-      rev = "057a75df0c866034d8edce989f701ee2cb0481d8";
-      hash = "sha256-MeeyiX9ZozGDbTNbO/Tvs97tQyzic5pu2sIPgXow2ok=";
+      rev = "e4570693b8064a83cd7826795d5ef29400313d3c";
+      hash = "sha256-gzlLKP/BE5sNM8tJ7ObKQNvd36CqWipFWhMkb4XqjjU=";
     };
     meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
   };
@@ -330,12 +330,12 @@
   };
   cmake = buildGrammar {
     language = "cmake";
-    version = "0.0.0+rev=cf97996";
+    version = "0.0.0+rev=c7b2a71";
     src = fetchFromGitHub {
       owner = "uyha";
       repo = "tree-sitter-cmake";
-      rev = "cf9799600b2ba5e6620fdabddec3b2db8306bc46";
-      hash = "sha256-OxViW7H5fNc5BP072ob7GGgx1EYc6TiQEut0wHGrE1c=";
+      rev = "c7b2a71e7f8ecb167fad4c97227c838439280175";
+      hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU=";
     };
     meta.homepage = "https://github.com/uyha/tree-sitter-cmake";
   };
@@ -518,14 +518,14 @@
   };
   diff = buildGrammar {
     language = "diff";
-    version = "0.0.0+rev=e42b8de";
+    version = "0.0.0+rev=2520c3f";
     src = fetchFromGitHub {
-      owner = "the-mikedavis";
+      owner = "tree-sitter-grammars";
       repo = "tree-sitter-diff";
-      rev = "e42b8def4f75633568f1aecfe01817bf15164928";
-      hash = "sha256-1ibGin1e6+geAQNoV/KLCBOoXYcZo7S5+Q2XgsZPIfU=";
+      rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed";
+      hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4=";
     };
-    meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
+    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff";
   };
   disassembly = buildGrammar {
     language = "disassembly";
@@ -562,12 +562,12 @@
   };
   dot = buildGrammar {
     language = "dot";
-    version = "0.0.0+rev=9ab8555";
+    version = "0.0.0+rev=80327ab";
     src = fetchFromGitHub {
       owner = "rydesun";
       repo = "tree-sitter-dot";
-      rev = "9ab85550c896d8b294d9b9ca1e30698736f08cea";
-      hash = "sha256-w4DInIT7mkTvQ6Hmi8yaAww6ktyNgRz0tPfBLGnOawQ=";
+      rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d";
+      hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y=";
     };
     meta.homepage = "https://github.com/rydesun/tree-sitter-dot";
   };
@@ -596,12 +596,12 @@
   };
   earthfile = buildGrammar {
     language = "earthfile";
-    version = "0.0.0+rev=a37c5ee";
+    version = "0.0.0+rev=5baef88";
     src = fetchFromGitHub {
       owner = "glehmann";
       repo = "tree-sitter-earthfile";
-      rev = "a37c5ee95ce401ca311c0ae1369d9cfb953e151d";
-      hash = "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4=";
+      rev = "5baef88717ad0156fd29a8b12d0d8245bb1096a8";
+      hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k=";
     };
     meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
   };
@@ -619,12 +619,12 @@
   };
   editorconfig = buildGrammar {
     language = "editorconfig";
-    version = "0.0.0+rev=911d701";
+    version = "0.0.0+rev=439a3fc";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-editorconfig";
-      rev = "911d7017566116b15c4b2c339e1dbe11fcf03f63";
-      hash = "sha256-c/rg3qgUO7RfmFhFSIPyl6npNieztaVv58u10p9JH3o=";
+      rev = "439a3fcdbf239db35f587936a36f48b704ba8357";
+      hash = "sha256-GJv+JYpcsBmNEQoTViXS5Xu4jEYTBKFod14COoeCe9g=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
   };
@@ -1082,12 +1082,12 @@
   };
   gomod = buildGrammar {
     language = "gomod";
-    version = "0.0.0+rev=6efb596";
+    version = "0.0.0+rev=2e88687";
     src = fetchFromGitHub {
       owner = "camdencheek";
       repo = "tree-sitter-go-mod";
-      rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c";
-      hash = "sha256-KD6Fio9qie3wbGAvQaYsMdYOK1QjnRrGExt1oL/6mis=";
+      rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a";
+      hash = "sha256-OfhV3lxdyIhA3XZYbafEtdOsQsTCSSCBrN3WbzSVg0g=";
     };
     meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
   };
@@ -1369,23 +1369,23 @@
   };
   hyprlang = buildGrammar {
     language = "hyprlang";
-    version = "0.0.0+rev=d626ec0";
+    version = "0.0.0+rev=b23e85d";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-hyprlang";
-      rev = "d626ec06e4d876fc41200a30b3e6f2b4714c7367";
-      hash = "sha256-f8CjiLd2tof+zfr7ze/CxZWtKRqQv8sK9Q21ZxEg6C8=";
+      rev = "b23e85dded5d150ffee0ac83c01cbeb1520aad2f";
+      hash = "sha256-COIl7ngqTzQQBxgmRNCwF8x7OHNGCrUa5G/hPrlXsmw=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang";
   };
   idl = buildGrammar {
     language = "idl";
-    version = "0.0.0+rev=3632e92";
+    version = "0.0.0+rev=86d434e";
     src = fetchFromGitHub {
       owner = "cathaysia";
       repo = "tree-sitter-idl";
-      rev = "3632e926ef4ba924b05993683111480af0d5c9e3";
-      hash = "sha256-fywOjqJ0yrG/QayyBXdc2iOtaytdc9bqd1leQ8kxR/0=";
+      rev = "86d434e732f971ecec24571e0dcb6b14c8b19952";
+      hash = "sha256-u+2KBpk9ctry5cHlvqarYS8l5ERFlWrs9D09u2C6cvI=";
     };
     meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
   };
@@ -1457,12 +1457,12 @@
   };
   javadoc = buildGrammar {
     language = "javadoc";
-    version = "0.0.0+rev=92f9d71";
+    version = "0.0.0+rev=3e9a823";
     src = fetchFromGitHub {
       owner = "rmuir";
       repo = "tree-sitter-javadoc";
-      rev = "92f9d7115598c1b012f5931a84ee5d50d46c0eb7";
-      hash = "sha256-A8aMgDKAPZ18qy7GMihBpNrmL52Zf/wAjsPQoMCL3oE=";
+      rev = "3e9a823a02d3115d74294f04c39bd2c958ec3da6";
+      hash = "sha256-qqkEGJn9ocHdr8SSeYcJ5kAZr11Ot7rvH1QVYYre8/Q=";
     };
     meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
   };
@@ -1624,12 +1624,12 @@
   };
   kitty = buildGrammar {
     language = "kitty";
-    version = "0.0.0+rev=064d1b4";
+    version = "0.0.0+rev=2e9b602";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "tree-sitter-kitty";
-      rev = "064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5";
-      hash = "sha256-DN6SWXZM1HedUtV7mDEEgictaI2V/pQHh5cg906qfO0=";
+      rev = "2e9b602ca676cac63887cca5a4535106f3475c82";
+      hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0=";
     };
     meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
   };
@@ -1891,12 +1891,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=7eadef0";
+    version = "0.0.0+rev=f1c4a94";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "7eadef0de98de1170cdffb68c0931e375fc1b046";
-      hash = "sha256-/zOS9fvfnFotySPw2+DY9ob8s+PYJrRgb1ymx2l5JAc=";
+      rev = "f1c4a9445c65fb4668a87bfb344d762d0356781d";
+      hash = "sha256-YX5DaGtuXBcLbSP0L1C52fPW4oDqeMGqewU48bfFmuQ=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2172,12 +2172,12 @@
   };
   pkl = buildGrammar {
     language = "pkl";
-    version = "0.0.0+rev=d62e832";
+    version = "0.0.0+rev=798222b";
     src = fetchFromGitHub {
       owner = "apple";
       repo = "tree-sitter-pkl";
-      rev = "d62e832b69a0aa3d4f87fc34ba62d931d6c23f55";
-      hash = "sha256-6sVPCbs3rLlEhK9Fj2sJGjNBmvaGrajSOoGo6G78buo=";
+      rev = "798222b4a29ba9a9715583e22242ab0f2ac6abc0";
+      hash = "sha256-BLm8KvzBZt6+ZvZ6umrdgs5E8D3rPTZNCx611s6h+kA=";
     };
     meta.homepage = "https://github.com/apple/tree-sitter-pkl";
   };
@@ -2417,12 +2417,12 @@
   };
   qmljs = buildGrammar {
     language = "qmljs";
-    version = "0.0.0+rev=0889da4";
+    version = "0.0.0+rev=0bec435";
     src = fetchFromGitHub {
       owner = "yuja";
       repo = "tree-sitter-qmljs";
-      rev = "0889da4632bba3ec6f39ef4102625654890c15c1";
-      hash = "sha256-Twj2taG7xFTPXTvzDcWeIqxUAkuhsybwZvtwK/HiruE=";
+      rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59";
+      hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g=";
     };
     meta.homepage = "https://github.com/yuja/tree-sitter-qmljs";
   };
@@ -2692,14 +2692,13 @@
   };
   scfg = buildGrammar {
     language = "scfg";
-    version = "0.0.0+rev=2f3709e";
+    version = "0.0.0+rev=d850fd4";
     src = fetchFromGitHub {
       owner = "rockorager";
       repo = "tree-sitter-scfg";
-      rev = "2f3709e7656fa2c443f92041c91a9f843f8cd625";
-      hash = "sha256-2/n+pSR6Ojahm8iBnpNsQscrXQqzZflKBA42gX29u50=";
+      rev = "d850fd470445d73de318a21d734d1e09e29b773c";
+      hash = "sha256-AnyOcQFA3N6AFZiG7eLS1xCm1qX6hko9lFV4oV9p/E8=";
     };
-    generate = true;
     meta.homepage = "https://github.com/rockorager/tree-sitter-scfg";
   };
   scheme = buildGrammar {
@@ -2861,12 +2860,12 @@
   };
   sparql = buildGrammar {
     language = "sparql";
-    version = "0.0.0+rev=d853661";
+    version = "0.0.0+rev=1ef52d3";
     src = fetchFromGitHub {
       owner = "GordianDziwis";
       repo = "tree-sitter-sparql";
-      rev = "d853661ca680d8ff7f8d800182d5782b61d0dd58";
-      hash = "sha256-0BV0y8IyeIPpuxTixlJL1PsDCuhXbGaImu8JU8WFoPU=";
+      rev = "1ef52d35a73a2a5f2e433ecfd1c751c1360a923b";
+      hash = "sha256-9DaV12dkcwF7/jWc4QaTQaHcKu5zO5evWlXGNZMdRqc=";
     };
     meta.homepage = "https://github.com/GordianDziwis/tree-sitter-sparql";
   };
@@ -2883,12 +2882,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "0.0.0+rev=4afe285";
+    version = "0.0.0+rev=d71f2bd";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "4afe285bb142542cee0aa7b689fec00a71df4741";
-      hash = "sha256-Qzrun7sIjX+jyz0oh4MotfTSXAcEYSM/2+CAWJkXgVo=";
+      rev = "d71f2bd7f0e3dba84df7025fc9314738d180e71e";
+      hash = "sha256-udLPpb8ihPb9mXNicwZdml2bKeIDC0RD5i7SPshrN2g=";
     };
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
   };
@@ -2960,12 +2959,12 @@
   };
   superhtml = buildGrammar {
     language = "superhtml";
-    version = "0.0.0+rev=aeaa0c7";
+    version = "0.0.0+rev=8b5bb27";
     src = fetchFromGitHub {
       owner = "kristoff-it";
       repo = "superhtml";
-      rev = "aeaa0c7d9ef983453952a2ee4983476fef0168f3";
-      hash = "sha256-3mCdFn2ZsRFn/UI+frWD0MTx8qdiZldveYffpZ7nd98=";
+      rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902";
+      hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A=";
     };
     location = "tree-sitter-superhtml";
     meta.homepage = "https://github.com/kristoff-it/superhtml";
@@ -3039,25 +3038,25 @@
   };
   systemverilog = buildGrammar {
     language = "systemverilog";
-    version = "0.0.0+rev=e88937e";
+    version = "0.0.0+rev=7c4b01b";
     src = fetchFromGitHub {
       owner = "gmlarumbe";
       repo = "tree-sitter-systemverilog";
-      rev = "e88937e66adc3ee7be0bfe40b7e937eafe4212bb";
-      hash = "sha256-wzsjHDn6ZdGfOlufARurxCTwT8HqMvyfsnIIpXzRUYs=";
+      rev = "7c4b01b7df2f6e7fa1f698c9d30ac8f93af18ed2";
+      hash = "sha256-u0a8yQfFwYbAhuT8VZjKPuTfBNwAaQ0e25CcIek0thc=";
     };
     meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
   };
   t32 = buildGrammar {
     language = "t32";
-    version = "0.0.0+rev=d4e26ab";
-    src = fetchFromGitLab {
+    version = "0.0.0+rev=2f604ad";
+    src = fetchFromGitHub {
       owner = "xasc";
       repo = "tree-sitter-t32";
-      rev = "d4e26ab7a730cfbe0cf84dba6ea3647989064839";
-      hash = "sha256-awbgOZaIqpdjsskSr6by2AyojVRU+gkLgS70abhPryE=";
+      rev = "2f604ad17a15c09d99648199da7f173eed8250dc";
+      hash = "sha256-9J8wy/7qW4vWsIzpDI+lVWr/6158jrod0nSk3ihXUPI=";
     };
-    meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32";
+    meta.homepage = "https://github.com/xasc/tree-sitter-t32";
   };
   tablegen = buildGrammar {
     language = "tablegen";
@@ -3542,12 +3541,12 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=fd546d4";
+    version = "0.0.0+rev=d1c0a65";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "fd546d43fe0a179b59dfdfb296082c584870e11b";
-      hash = "sha256-KbXPadsIADNqINBwjewDzkHHVoVhE6X0ltgWIPDGlrg=";
+      rev = "d1c0a65348272ff235e5553fcd9171b151d251b4";
+      hash = "sha256-hu2lfluEA9r6LiC1NvvqaWVOinKK0QylbxI3rYz5DO8=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };
@@ -3630,4 +3629,15 @@
     location = "tree-sitter-ziggy-schema";
     meta.homepage = "https://github.com/kristoff-it/ziggy";
   };
+  zsh = buildGrammar {
+    language = "zsh";
+    version = "0.0.0+rev=v0.34.0";
+    src = fetchFromGitHub {
+      owner = "georgeharker";
+      repo = "tree-sitter-zsh";
+      rev = "v0.34.0";
+      hash = "sha256-rMOLASmlXaCxEI7ZLXbBU0BMLZle++U0HzEqdVF5qyg=";
+    };
+    meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh";
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index f9b35edcf583..75623015e165 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -112,47 +112,53 @@ in
         let
           pluginsToCheck =
             map (grammar: grammarToPlugin grammar)
-              # true is here because there is `recurseForDerivations = true`
-              (lib.remove true (lib.attrValues tree-sitter-grammars));
+              # non-derivations are here because there is a `recurseForDerivations = true`
+              (lib.filter lib.isDerivation (lib.attrValues tree-sitter-grammars));
         in
         runCommand "nvim-treesitter-test-queries-are-present-for-custom-grammars" { CI = true; } ''
-          function check_grammar {
-            EXPECTED_FILES="$2/parser/$1.so `ls $2/queries/$1/*.scm`"
+          touch "$out"
 
-            echo
-            echo expected files for $1:
-            echo $EXPECTED_FILES
+          function check_grammar {
+            local grammar_name="$1"
+            local grammar_path="$2"
+
+            local grammar_queries=$(find -L "$grammar_path/queries/$grammar_name" -name '*.scm')
+            local EXPECTED_FILES="$grammar_path/parser/$grammar_name.so $grammar_queries"
+
+            echo ""
+            echo "expected files for $grammar_name:"
+            echo "$EXPECTED_FILES"
 
             # the derivation has only symlinks, and `find` doesn't count them as files
-            # so we cannot use `-type f`
-            for file in `find $2 -not -type d`; do
-              echo checking $file
+            # so we cannot use `-type f`, thus we use `-not -type d`
+            for file in $(find -L $2 -not -type d); do
+              echo "checking $file"
               # see https://stackoverflow.com/a/8063284
               if ! echo "$EXPECTED_FILES" | grep -wqF "$file"; then
-                echo $file is unexpected, exiting
+                echo "$file is unexpected, exiting"
                 exit 1
               fi
             done
           }
 
           ${lib.concatLines (lib.forEach pluginsToCheck (g: "check_grammar \"${g.grammarName}\" \"${g}\""))}
-          touch $out
         '';
 
       no-queries-for-official-grammars =
         let
-          pluginsToCheck =
-            # true is here because there is `recurseForDerivations = true`
-            (lib.remove true (lib.attrValues vimPlugins.nvim-treesitter-parsers));
+          pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter-parsers);
         in
         runCommand "nvim-treesitter-test-no-queries-for-official-grammars" { CI = true; } ''
-          touch $out
+          touch "$out"
 
           function check_grammar {
-            echo checking $1...
-            if [ -d $2/queries ]; then
-              echo Queries dir exists in $1
-              echo This is unexpected, see https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
+            local grammar_name="$1"
+            local grammar_path="$2"
+
+            echo "checking $1..."
+            if [ -d "$grammar_path/queries" ]; then
+              echo "Queries directory exists in $grammar_name"
+              echo "This is unexpected, see https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839"
               exit 1
             fi
           }
@@ -167,6 +173,6 @@ in
     (super.nvim-treesitter.meta or { })
     // {
       license = licenses.asl20;
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
     };
 }
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 1f2576aac937..f714b498bbc6 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -314,6 +314,14 @@ assertNoAdditions {
     };
   });
 
+  blink-cmp-env = super.blink-cmp-env.overrideAttrs {
+    dependencies = [ self.blink-cmp ];
+  };
+
+  blink-cmp-yanky = super.blink-cmp-yanky.overrideAttrs {
+    dependencies = [ self.blink-cmp ];
+  };
+
   bluloco-nvim = super.bluloco-nvim.overrideAttrs {
     dependencies = [ self.lush-nvim ];
   };
@@ -503,6 +511,10 @@ assertNoAdditions {
     checkInputs = [ self.nvim-cmp ];
   };
 
+  cmp-dotenv = super.cmp-dotenv.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
+
   cmp-fish = super.cmp-fish.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
   };
@@ -1614,6 +1626,7 @@ assertNoAdditions {
       "lazyvim.plugins.extras.editor.snacks_picker"
       "lazyvim.plugins.extras.editor.telescope"
       "lazyvim.plugins.extras.formatting.prettier"
+      "lazyvim.plugins.extras.lang.dotnet"
       "lazyvim.plugins.extras.lang.markdown"
       "lazyvim.plugins.extras.lang.omnisharp"
       "lazyvim.plugins.extras.lang.python"
@@ -1861,6 +1874,10 @@ assertNoAdditions {
       ];
   };
 
+  maple-nvim = super.maple-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
   markdown-preview-nvim =
     let
       # We only need its dependencies `node-modules`.
@@ -3185,6 +3202,12 @@ assertNoAdditions {
       "snacks.dashboard"
       "snacks.debug"
       "snacks.dim"
+      "snacks.explorer.init"
+      "snacks.gh.actions"
+      "snacks.gh.buf"
+      "snacks.gh.init"
+      "snacks.gh.render"
+      "snacks.gh.render.init"
       "snacks.git"
       "snacks.image.convert"
       "snacks.image.image"
@@ -3197,6 +3220,8 @@ assertNoAdditions {
       "snacks.picker.actions"
       "snacks.picker.config.highlights"
       "snacks.picker.core.list"
+      "snacks.picker.source.gh"
+      "snacks.picker.util.diff"
       "snacks.scratch"
       "snacks.scroll"
       "snacks.terminal"
@@ -4085,8 +4110,9 @@ assertNoAdditions {
 
   wiki-vim = super.wiki-vim.overrideAttrs {
     checkInputs = [
-      # Optional telescope integration
+      # Optional picker integration
       self.telescope-nvim
+      self.fzf-lua
     ];
   };
 
diff --git a/pkgs/applications/editors/vim/plugins/utils/update.py b/pkgs/applications/editors/vim/plugins/utils/update.py
index 9458b8f074d7..c167f0a92386 100755
--- a/pkgs/applications/editors/vim/plugins/utils/update.py
+++ b/pkgs/applications/editors/vim/plugins/utils/update.py
@@ -27,12 +27,11 @@ from typing import List, Tuple
 
 log = logging.getLogger("vim-updater")
 
-# Import plugin update library from maintainers/scripts/pluginupdate.py
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
 import importlib
 
-import pluginupdate
-from pluginupdate import PluginDesc, run_nix_expr
+import nixpkgs_plugin_update
+from nixpkgs_plugin_update import PluginDesc, run_nix_expr
 
 treesitter = importlib.import_module("nvim-treesitter.update")
 
@@ -44,15 +43,15 @@ HEADER = (
 NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter"
 
 
-class VimEditor(pluginupdate.Editor):
+class VimEditor(nixpkgs_plugin_update.Editor):
     nvim_treesitter_updated = False
 
     def generate_nix(
-        self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str
+        self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str
     ):
         log.info("Generating nix code")
         log.debug("Loading nvim-treesitter revision from nix...")
-        nvim_treesitter_rev = pluginupdate.run_nix_expr(
+        nvim_treesitter_rev = nixpkgs_plugin_update.run_nix_expr(
             "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev",
             self.nixpkgs,
             timeout=10,
@@ -64,7 +63,7 @@ class VimEditor(pluginupdate.Editor):
         log.debug("Loading list of lua plugins...")
         luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs, timeout=30)
 
-        def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:
+        def _isNeovimPlugin(plug: nixpkgs_plugin_update.Plugin) -> bool:
             """
             Whether it's a neovim-only plugin
             We can check if it's available in lua packages
@@ -103,7 +102,7 @@ class VimEditor(pluginupdate.Editor):
         print(f"updated {outfile}")
 
     def plugin2nix(
-        self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
+        self, pdesc: PluginDesc, plugin: nixpkgs_plugin_update.Plugin, isNeovim: bool
     ) -> str:
         if isNeovim:
             raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that")
@@ -129,7 +128,7 @@ class VimEditor(pluginupdate.Editor):
         return content
 
     def update(self, args):
-        pluginupdate.update_plugins(self, args)
+        nixpkgs_plugin_update.update_plugins(self, args)
 
         # TODO this should probably be skipped when running outside a nixpkgs checkout
         if self.nvim_treesitter_updated:
diff --git a/pkgs/applications/editors/vim/plugins/utils/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix
index 9560708fbb0e..369b1b79e9b6 100644
--- a/pkgs/applications/editors/vim/plugins/utils/updater.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix
@@ -24,8 +24,8 @@ buildPythonApplication {
   ];
 
   pythonPath = [
-    python3Packages.gitpython
     python3Packages.requests
+    python3Packages.nixpkgs-plugin-update
   ];
 
   dontUnpack = true;
@@ -43,12 +43,12 @@ buildPythonApplication {
         neovim-unwrapped
         nurl
       ]
-    }" --prefix PYTHONPATH : "${./.}:${../../../../../../maintainers/scripts/pluginupdate-py}" )
+    }" --prefix PYTHONPATH : "${./.}" )
     wrapPythonPrograms
   '';
 
   shellHook = ''
-    export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts/pluginupdate-py:$PYTHONPATH
+    export PYTHONPATH=pkgs/applications/editors/vim/plugins:$PYTHONPATH
   '';
 
   passthru.updateScript = writeShellScript "updateScript" ''
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 45494b1ea38f..d3ec2a41bd9b 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -122,16 +122,20 @@ https://github.com/Kaiser-Yang/blink-cmp-avante/,HEAD,
 https://github.com/disrupted/blink-cmp-conventional-commits/,HEAD,
 https://github.com/giuxtaposition/blink-cmp-copilot/,HEAD,
 https://github.com/Kaiser-Yang/blink-cmp-dictionary/,HEAD,
+https://github.com/bydlw98/blink-cmp-env/,HEAD,
 https://github.com/Kaiser-Yang/blink-cmp-git/,HEAD,
 https://github.com/erooke/blink-cmp-latex/,HEAD,
 https://github.com/alexandre-abrioux/blink-cmp-npm.nvim/,HEAD,
 https://github.com/ribru17/blink-cmp-spell/,HEAD,
+https://github.com/mgalliou/blink-cmp-tmux/,HEAD,
 https://github.com/archie-judd/blink-cmp-words/,HEAD,
+https://github.com/marcoSven/blink-cmp-yanky/,HEAD,
 https://github.com/fang2hou/blink-copilot/,HEAD,
 https://github.com/moyiz/blink-emoji.nvim/,HEAD,
 https://github.com/MahanRahmati/blink-nerdfont.nvim/,HEAD,
 https://github.com/mikavilpas/blink-ripgrep.nvim/,HEAD,
 https://github.com/Saghen/blink.compat/,HEAD,
+https://github.com/Saghen/blink.indent/,HEAD,
 https://github.com/dundalek/bloat.nvim/,HEAD,
 https://github.com/HampusHauffman/block.nvim/,HEAD,
 https://github.com/uloco/bluloco.nvim/,,
@@ -188,6 +192,7 @@ https://github.com/delphinus/cmp-ctags/,HEAD,
 https://github.com/rcarriga/cmp-dap/,HEAD,
 https://github.com/uga-rosa/cmp-dictionary/,HEAD,
 https://github.com/dmitmel/cmp-digraphs/,HEAD,
+https://github.com/SergioRibera/cmp-dotenv/,HEAD,
 https://github.com/hrsh7th/cmp-emoji/,,
 https://github.com/mtoohey31/cmp-fish/,HEAD,
 https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD,
@@ -297,6 +302,7 @@ https://github.com/JachymPutta/dailies.nvim/,HEAD,
 https://github.com/Koalhack/darcubox-nvim/,HEAD,
 https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
+https://github.com/iofq/dart.nvim/,HEAD,
 https://github.com/rizzatti/dash.vim/,HEAD,
 https://github.com/nvimdev/dashboard-nvim/,,
 https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,
@@ -388,7 +394,7 @@ https://github.com/pteroctopus/faster.nvim/,HEAD,
 https://github.com/konfekt/fastfold/,,
 https://github.com/madskjeldgaard/faust-nvim/,HEAD,
 https://github.com/lilydjwg/fcitx.vim/,fcitx5,
-https://github.com/bakpakin/fennel.vim/,,
+https://github.com/micampe/fennel.vim/,,
 https://github.com/wincent/ferret/,,
 https://github.com/bogado/file-line/,,
 https://github.com/lewis6991/fileline.nvim/,,
@@ -617,6 +623,7 @@ https://github.com/lopi-py/luau-lsp.nvim/,HEAD,
 https://github.com/mkasa/lushtags/,,
 https://github.com/Bilal2453/luvit-meta/,HEAD,
 https://github.com/dccsillag/magma-nvim/,HEAD,
+https://github.com/forest-nvim/maple.nvim/,HEAD,
 https://github.com/winston0410/mark-radar.nvim/,HEAD,
 https://github.com/iamcco/markdown-preview.nvim/,,
 https://github.com/tadmccorkle/markdown.nvim/,HEAD,
@@ -730,7 +737,7 @@ https://github.com/danymat/neogen/,HEAD,
 https://github.com/NeogitOrg/neogit/,,
 https://github.com/Shougo/neoinclude.vim/,,
 https://github.com/neomake/neomake/,,
-https://github.com/cdmill/neomodern.nvim/,HEAD,
+https://github.com/casedami/neomodern.nvim/,HEAD,
 https://github.com/Shougo/neomru.vim/,,
 https://github.com/neomutt/neomutt.vim/,HEAD,
 https://github.com/rafamadriz/neon/,,
@@ -1061,6 +1068,7 @@ https://github.com/jaxbot/semantic-highlight.vim/,,
 https://github.com/numirias/semshi/,,
 https://github.com/junegunn/seoul256.vim/,,
 https://github.com/osyo-manga/shabadou.vim/,,
+https://github.com/nvzone/showkeys/,HEAD,
 https://github.com/folke/sidekick.nvim/,HEAD,
 https://github.com/AndrewRadev/sideways.vim/,,
 https://github.com/skim-rs/skim.vim/,,
@@ -1239,6 +1247,7 @@ https://github.com/KabbAmine/vCoolor.vim/,,
 https://github.com/junegunn/vader.vim/,,
 https://github.com/vague-theme/vague.nvim/,HEAD,
 https://github.com/jbyuki/venn.nvim/,,
+https://github.com/linux-cultist/venv-selector.nvim/,HEAD,
 https://github.com/vhda/verilog_systemverilog.vim/,,
 https://github.com/vifm/vifm.vim/,,
 https://github.com/Konfekt/vim-CtrlXA/,,
@@ -1302,6 +1311,7 @@ https://github.com/mtikekar/vim-bsv/,,
 https://github.com/jeetsukumaran/vim-buffergator/,,
 https://github.com/bling/vim-bufferline/,,
 https://github.com/qpkorr/vim-bufkill/,,
+https://github.com/ap/vim-buftabline/,HEAD,
 https://github.com/isobit/vim-caddyfile/,HEAD,
 https://github.com/tpope/vim-capslock/,,
 https://github.com/kristijanhusak/vim-carbon-now-sh/,,
@@ -1424,6 +1434,7 @@ https://github.com/ntk148v/vim-horizon/,,
 https://github.com/jonsmithers/vim-html-template-literals/,,
 https://github.com/humanoid-colors/vim-humanoid-colorscheme/,,
 https://github.com/vim-utils/vim-husk/,,
+https://github.com/hylang/vim-hy/,HEAD,
 https://github.com/w0ng/vim-hybrid/,,
 https://github.com/kristijanhusak/vim-hybrid-material/,,
 https://github.com/noc7c9/vim-iced-coffee-script/,,
diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 9ec2a7a18d94..d430a956728f 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.17";
-    hash = "sha256-8R0BvDfQDJmWD038mywNVIYtmgzyzwSEbqnCHQBpjg8=";
+    version = "2.0.35";
+    hash = "sha256-1wN82mZk3zCGGFQ8FNwLFm1793U8GEC8p46BJiPNaUo=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
new file mode 100644
index 000000000000..043d6a9853d6
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "vscode-augment";
+    publisher = "augment";
+    version = "0.627.0";
+    hash = "sha256-ceaGN7xhVLcMFC+5jYijpqeTJa1zsgCsvQs5mf1ueYM=";
+  };
+
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/augment.vscode-augment/changelog";
+    description = "AI-powered coding assistant for VSCode";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=augment.vscode-augment";
+    homepage = "https://augmentcode.com/";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = [ lib.maintainers.matteopacini ];
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index 49ab14ef4ccc..7a91185146f2 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.536";
-    hash = "sha256-Q6T8Ab8kwOjdFM63SjTNEOgd+a6fL1PRGRredHzwg7U=";
+    version = "2.0.539";
+    hash = "sha256-nNlEBm89sVQzLMfQjeE4uBUH/bH/mw8mYF+3/JfB78U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
index ab7ec182ce25..c346ae961c75 100644
--- a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "biome";
     publisher = "biomejs";
-    version = "2025.7.41733";
-    hash = "sha256-wWyLIjNOBjIe72ed+wwfQWGH7Vzuea/0Xux0XJkhAkY=";
+    version = "2025.10.241456";
+    hash = "sha256-tihEFcDDYr/khLIcJbR5VSC/RujEvp/gcnWlokAqNBc=";
   };
 
   postInstall = ''
diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
index 88121258de9b..dd00d0294258 100644
--- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-zcP+oV7+xpXN5ZSvxw03XborEp2i9+3r1Hbv6sFq2rM=";
+          hash = "sha256-NuJK5BjEsGeNQ2lBOHc5zPVzblwaS51hMUiYNtpQVlw=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-/nP0e3IHZtmsgTzNlJk9WOtg3jm6kpVGBaC5RMIvaII=";
+          hash = "sha256-6+X7h6AHmCwTmH0gOoB9Mb8yEsmmyJEQ58sSVrqSTeA=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-WhIMbgMJE4FK83qmjCPobwNIzcGVU56jOw5v2Q4oIhU=";
+          hash = "sha256-mvYWAEKoQODGgZ4CaJ5xlGnwEBatMU2oecSM2hVmRog=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-gThzjcah7MWBKVkViDWJ5Z0epxy+9aWFpcFt4KI9zzQ=";
+          hash = "sha256-5EsFUBJie2zNtlwJYIcFndkNPDDsZlUAggLwF1QESug=";
         };
       };
     in
     {
       name = "continue";
       publisher = "Continue";
-      version = "1.2.9";
+      version = "1.2.10";
     }
     // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4cf6570771c5..d18f1fc16498 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -89,8 +89,8 @@ let
         mktplcRef = {
           publisher = "42Crunch";
           name = "vscode-openapi";
-          version = "4.38.0";
-          hash = "sha256-J9hZhPrHkJEFkiyD8eACiJwbsPfYGMK42FkcwkTQ0RE=";
+          version = "4.40.0";
+          hash = "sha256-nV7RZpDd+15YmINKrFSIlFurC955bnE4A8esrKWYVnE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog";
@@ -262,8 +262,8 @@ let
         mktplcRef = {
           name = "ng-template";
           publisher = "Angular";
-          version = "20.2.2";
-          hash = "sha256-2I5Pmd05zNGjM15tFo2yw6AGUKp3zxufVcoe4oSAO5U=";
+          version = "20.3.0";
+          hash = "sha256-o3e2qVKw/sfnFHbHHdRlB9UjEx1KLD1KVoaAsnlYjmY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Angular.ng-template/changelog";
@@ -443,6 +443,8 @@ let
         };
       };
 
+      augment.vscode-augment = callPackage ./augment.vscode-augment { };
+
       azdavis.millet = callPackage ./azdavis.millet { };
 
       b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { };
@@ -771,8 +773,8 @@ let
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.28";
-          hash = "sha256-xq12b0i0TsYZ5XxF1t9c2YrV7wAROjEjdLgBg3ZaLi0=";
+          version = "0.14.29";
+          hash = "sha256-58/yM4xP8ewpegNlVSWnyFIoAmEd7E/CigQgae7OgZY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";
@@ -1090,8 +1092,8 @@ let
         mktplcRef = {
           name = "csharpier-vscode";
           publisher = "csharpier";
-          version = "2.0.8";
-          hash = "sha256-rMc5ywTxVu6Dtxkzai4XQk1W2slCuT2j93p1zc6qtOI=";
+          version = "2.1.0";
+          hash = "sha256-CEge0EZr9DTNBpPQ71tqsVsA8ljgamB1gMBh8CZTTZE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog";
@@ -1152,8 +1154,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.14.135";
-          hash = "sha256-y7qfBzXqyGrZXrpIkbMA1TDEQsKcfPCLmllypNu51G0=";
+          version = "3.14.172";
+          hash = "sha256-bJnGao3RrbjeMSkRkakM6UA9piYGEzwMInoBOev2YeM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";
@@ -1264,8 +1266,8 @@ let
         mktplcRef = {
           publisher = "denoland";
           name = "vscode-deno";
-          version = "3.45.2";
-          hash = "sha256-U83RWIIorJdFuhr0/l2bIo5JthTFIvedWq52dsSGOx8=";
+          version = "3.46.1";
+          hash = "sha256-9lALQ0ZSIyCJB/nMm7p3Gnl5PtFRSMIqx4DR/B8LdXY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog";
@@ -1615,7 +1617,7 @@ let
         };
       };
 
-      ethersync.ethersync = callPackage ./ethersync.ethersync { };
+      teamtype.teamtype = callPackage ./teamtype.teamtype { };
 
       eugleo.magic-racket = callPackage ./eugleo.magic-racket { };
 
@@ -1723,8 +1725,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.28.3";
-          hash = "sha256-rRJrzCle1/epqJL+gaUb3QZwrmdaLvagUwxRx1Aq1ZY=";
+          version = "0.29.0";
+          hash = "sha256-eAfWsIVAqRRfBNDZZq4SilqR48daY5IezjGULaU8AzU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";
@@ -1896,8 +1898,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "codespaces";
-          version = "1.17.4";
-          hash = "sha256-0fhPOtHpjafuo+oCCRmLKYI7Q22eE3vliH9q//ab6Ag=";
+          version = "1.17.5";
+          hash = "sha256-xv7Yx2chKqKnC7tKcvXUKrL5DBW0eFT8hi0p9shwX04=";
         };
 
         meta = {
@@ -2283,8 +2285,8 @@ let
         mktplcRef = {
           name = "vscode-vibrancy-continued";
           publisher = "illixion";
-          version = "1.1.60";
-          hash = "sha256-GHAyC9ScrBV/huVXXrgbubrBmKIzUhYmCL2+GqoOjqc=";
+          version = "1.1.61";
+          hash = "sha256-1LjAIMjk7JjLTf49QvDaLeGGDD5SUCLC3/41RfVVhEM=";
         };
         meta = {
           downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued";
@@ -2348,8 +2350,8 @@ let
         mktplcRef = {
           name = "Ionide-fsharp";
           publisher = "Ionide";
-          version = "7.28.0";
-          hash = "sha256-d6AucdoKeVAobTj1cbELce2vcXsZW5TX74mkcnHPtkA=";
+          version = "7.28.3";
+          hash = "sha256-MUoYoElDVMZZHsUZ17fhfwZaHNAJ4j50lTqhhRw8EBI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";
@@ -2474,8 +2476,8 @@ let
         mktplcRef = {
           publisher = "jeff-hykin";
           name = "better-nix-syntax";
-          version = "2.2.3";
-          hash = "sha256-KhmkCMBWagi0JjZvupgaU7LA6hsGRE6SiHqdJlXyyX8=";
+          version = "2.3.0";
+          hash = "sha256-Zb4RFs2qkSMeQKkNXk4brrZBDiRK4e08taOOgdRWQEk=";
         };
         meta = {
           description = "Visual Studio Code extension providing Nix Syntax highlighting";
@@ -2641,8 +2643,8 @@ let
         mktplcRef = {
           name = "intellij-idea-keybindings";
           publisher = "k--kato";
-          version = "1.7.5";
-          hash = "sha256-DOSe0UhNMj6FRyHylnKYQsyhSLQQFvGfcmOBZSw+nVo=";
+          version = "1.7.6";
+          hash = "sha256-eSt4iT/o4mp17Dasr0gDr3SsQHX3R6jGmW4V/2KymnY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog";
@@ -2847,8 +2849,8 @@ let
         mktplcRef = {
           name = "vscode-ltex-plus";
           publisher = "ltex-plus";
-          version = "15.5.1";
-          hash = "sha256-BzIJ7gsjcMimLYeVxcvdP0fyIEmwCXxTxqil5o+810w=";
+          version = "15.6.1";
+          hash = "sha256-UOiYjA11P7xqPFgdR7eS63wOQl9dqWAqBxz3nklapqo=";
         };
         meta = {
           description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others";
@@ -3509,8 +3511,8 @@ let
         mktplcRef = {
           publisher = "mvllow";
           name = "rose-pine";
-          version = "2.14.0";
-          hash = "sha256-bjYumipeZM5tNl/cTHLcm/EyX4FU1AzQU3W53e0cGfc=";
+          version = "2.15.0";
+          hash = "sha256-4l4KzxrLU34dIHI7ycypyN0yi2jzRs8voAD5HE4fgII=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -3639,8 +3641,8 @@ let
         mktplcRef = {
           name = "ocaml-platform";
           publisher = "ocamllabs";
-          version = "1.32.3";
-          hash = "sha256-KUzLrt7y3I6szpWVGk0NtBfXncw6ovNAkm1HyHj+MDk=";
+          version = "1.32.4";
+          hash = "sha256-ySJ6SLm+L2LPGbnus/skbk4WUPJ3VMXpCMEins3F8cc=";
         };
       };
 
@@ -3766,8 +3768,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "6.17.1";
-          hash = "sha256-P+D6fQg30C2nJFv8z/+51cSk5etCvugAbRj7h7nyGd0=";
+          version = "6.19.0";
+          hash = "sha256-IeeKk4gYFq+zTYpKHAOgEh3EC2g6bbb0Qcys2m5DeAo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";
@@ -3844,8 +3846,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "java";
-          version = "1.46.0";
-          hash = "sha256-i7Nac47aJVdxxRgM8KCCI8zmwTCGxxy0PrejgjOCYXE=";
+          version = "1.47.0";
+          hash = "sha256-zxhNZJWi4mjENzHsO74FjOrztl5uZbVU3aMPO5DwGRo=";
         };
         buildInputs = [ jdk ];
         meta = {
@@ -4168,8 +4170,8 @@ let
         mktplcRef = {
           publisher = "shd101wyy";
           name = "markdown-preview-enhanced";
-          version = "0.8.19";
-          hash = "sha256-F87YInLUkPUpB2oifCCq1xWD41LUdqg8cusGw2wEYg0=";
+          version = "0.8.20";
+          hash = "sha256-+dwLuqtEYirQaw/tuG5m5Ugk0crKQQZM43TmslJsBBc=";
         };
         meta = {
           description = "Provides a live preview of markdown using either markdown-it or pandoc";
@@ -4215,8 +4217,8 @@ let
         mktplcRef = {
           name = "signageos-vscode-sops";
           publisher = "signageos";
-          version = "0.9.2";
-          hash = "sha256-qlFD8sMvdKpLkXiYT9UybgCvxUJrbXpAcnmPxk91Tbs=";
+          version = "0.9.3";
+          hash = "sha256-fOSLlszr6yLkRC9gy+MCnL+Y/1TXrmVWAWavpvXHj4U=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog";
@@ -4512,8 +4514,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.320.0";
-          hash = "sha256-CFkLAMSMWGSHQwD0diSTn3z+U95Y4uCSnHNMTOj+iAo=";
+          version = "3.321.0";
+          hash = "sha256-GIszVwrS0brC+3jT+48zUa0E2Q+DUau/WuoOfRDobb8=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -4733,8 +4735,8 @@ let
         mktplcRef = {
           name = "opa";
           publisher = "tsandall";
-          version = "0.19.0";
-          hash = "sha256-jRwZD4TwLMdwBdV59HonMkF2ds4heXHPtpw1sxq1RsA=";
+          version = "0.20.0";
+          hash = "sha256-1o7v9lncnmYWr9FPEjQmamfNW/Lui9A0V+l7bCjn/hw=";
         };
         meta = {
           changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md";
@@ -5018,8 +5020,8 @@ let
         mktplcRef = {
           name = "vscode-gradle";
           publisher = "vscjava";
-          version = "3.17.0";
-          hash = "sha256-SZRSSgi4/8cEHGvhoGf9J8hrSIQWn1sFTh4NSsJcMDg=";
+          version = "3.17.1";
+          hash = "sha256-3AGa1S6WN7zVaKxjHVba+CjXhEq8PjTD5HU5WY9pF4c=";
         };
 
         meta = {
@@ -5048,8 +5050,8 @@ let
         mktplcRef = {
           publisher = "vscjava";
           name = "vscode-java-dependency";
-          version = "0.26.1";
-          hash = "sha256-7CjI+l1M/yW7BgzP1YirNI72ub+JZ6HI/xagYzdfx0E=";
+          version = "0.26.3";
+          hash = "sha256-o7FWpesuG6qS1UFVaSQ97X3sWc/6vOOZPy/iid3nNJs=";
         };
         meta = {
           license = lib.licenses.mit;
@@ -5072,8 +5074,8 @@ let
         mktplcRef = {
           name = "vscode-java-pack";
           publisher = "vscjava";
-          version = "0.30.2";
-          hash = "sha256-uC3hf2OjncMqTRc9KTfrVvTwZOoPT0QXX7HCBTdblnQ=";
+          version = "0.30.4";
+          hash = "sha256-R7I1nLRkaQghlVs7eezzFbwTSiNSEJS2abIrMqv7654=";
         };
         meta = {
           description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more";
@@ -5138,8 +5140,8 @@ let
         mktplcRef = {
           name = "volar";
           publisher = "Vue";
-          version = "3.1.1";
-          hash = "sha256-l5x7fLznJGm2dPAbJlz4/5BDikM45h1W9GkmoC4Sv7k=";
+          version = "3.1.2";
+          hash = "sha256-DgLGTxUWBSjDr9m+lfmAPteZv1mX7OOlYynCrd+zU0o=";
         };
         meta = {
           changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";
diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index f4b6a6966a55..5b6bdc7566e4 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "basedpyright";
     publisher = "detachhead";
-    version = "1.31.7";
-    hash = "sha256-EGHtYGPfP9n675MLoFBqct0EEPwI2Ts8SnBzmSptVGc=";
+    version = "1.32.1";
+    hash = "sha256-nipb8ilZ43V/7WnDO0Lo7ctFdjAmHtH0WUkupFUSlMQ=";
   };
   meta = {
     changelog = "https://github.com/detachhead/basedpyright/releases";
diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
index 744005cb66d3..70523c30c6d4 100644
--- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix
@@ -7,19 +7,19 @@
 let
   supported = {
     x86_64-linux = {
-      hash = "sha256-2m1hVQ497zQs2pmk+F+5thO4cz7dP4dDEPznPBqKfX0=";
+      hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg=";
       arch = "linux-x64";
     };
     x86_64-darwin = {
-      hash = "sha256-U2BcDUiper4chL8rF4ZUSos7erfXaq1LNqYYsRe2GDk=";
+      hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8=";
       arch = "darwin-x64";
     };
     aarch64-linux = {
-      hash = "sha256-qYdYmPZPlf++cJWLbhvqeO0uePbAJE4hL2bVYlKbk0c=";
+      hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc=";
       arch = "linux-arm64";
     };
     aarch64-darwin = {
-      hash = "sha256-oN3CWc/OLbeuyKfdPoh26yUQzH3d6YfpxacByWM43qk=";
+      hash = "sha256-6NhhAhE+r3m5tY1eR8ibKeMivmCqPooAt2rkWjWkv2w=";
       arch = "darwin-arm64";
     };
   };
@@ -33,7 +33,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = base // {
     publisher = "docker";
     name = "docker";
-    version = "0.17.0";
+    version = "0.18.0";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
index d75c424fd981..a4fb9a86b9bf 100644
--- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
@@ -13,19 +13,19 @@ let
   vsix = stdenvNoCC.mkDerivation (finalAttrs: {
     name = "gitlens-${finalAttrs.version}.zip";
     pname = "gitlens-vsix";
-    version = "17.6.1";
+    version = "17.6.2";
 
     src = fetchFromGitHub {
       owner = "gitkraken";
       repo = "vscode-gitlens";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-D0huUzjvyJTLxGgtTl1ZUQVwJx2uwO/uWGvcGfT8MyA=";
+      hash = "sha256-RN5PH8OvMUSqvVqt00VhfYQyazBBU5YLxzUEXaVB0+A=";
     };
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 2;
-      hash = "sha256-ZJAXjG1OF3Ey0LKJ4zadoRmbJg+qX2wAZCV4Ozrbyyg=";
+      hash = "sha256-R8E25vkc9kLjAEQ8UqxFhfvVbW5qMCWQUt3iWqJoSPE=";
     };
 
     postPatch = ''
diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
index 93e87a47131c..2cc632eb5b82 100644
--- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "harper";
     publisher = "elijah-potter";
     version = harper.version;
-    hash = "sha256-m9PN1BZf6rLrNnX8meX2TjGx8zGLl0GgnHEgQirh9Oc=";
+    hash = "sha256-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
index 927de91fccee..89cf74e10627 100644
--- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "fstar-vscode-assistant";
     publisher = "FStarLang";
-    version = "0.21.0";
-    hash = "sha256-p1Gh7HKcEXGiObzFt0P/hGS0e5g8ekktmAqSWi6sJwA=";
+    version = "0.22.0";
+    hash = "sha256-jDHVN34f/HlE74+uXt4tx8cDjh9pG4nKZG5CaHKT9oE=";
   };
   meta = {
     description = "Interactive editing mode VS Code extension for F*";
diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index 0b8b3e68b430..787ae0f892e9 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -16,19 +16,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-4yljDypIsx2bFKgCe0nL7Ljnzq6+efMRMBlpl1T6mU0=";
+        hash = "sha256-ZAw/n+JmsH/F8VwQzLfB3oPuofeiL6dtHXLiVMxxvCc=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-heiercuubJUhzOiRNPRvcBQfvbOtM6albpWvOkHlgsI=";
+        hash = "sha256-qxytVpmDpHEc1bjEpKPrnINKbh/qNiG5vD3KdQ7vwGs=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-U3VA9GjyP00bhZid3mdODLfmFW5WmtXmikPByDjELXA=";
+        hash = "sha256-/FK16O23iZgEc9bnvyquf0TcbCuraG9jVverlcWZymU=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-uCOQnQ8x5OGPl/139jAZ12PdbWczS2KOQHLFxjEQnL4=";
+        hash = "sha256-1BQ0YXQNd8yjGxA6NLxsfZZemwYNqRzyGQCZln9ChJA=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csdevkit";
     publisher = "ms-dotnettools";
-    version = "1.50.51";
+    version = "1.70.3";
     inherit (extInfo) hash arch;
   };
   sourceRoot = "extension"; # This has more than one folder.
diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
index d5f1568372ad..f8fcfcf39cb0 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-pyright";
     name = "pyright";
-    version = "1.1.406";
-    hash = "sha256-Lz8x/op0RUluE7R6xssg2nVviT0O1tZXUopzKt0f99U=";
+    version = "1.1.407";
+    hash = "sha256-x236ExuITXKqDoRgjDhnq9WnBbI1DvIIW/PXEYx2oVA=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
index 9e7d22319a7d..8f1704c5f510 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2025.10.0";
-    hash = "sha256-NDCNiKLCU7/2VH43eTyOMBTZ3oxzA7JwCBit9+JHfmY=";
+    version = "2025.14.1";
+    hash = "sha256-zmIv93uKBxgyI1cYh9WeF2g8ujm0Z++eoLN01aXaDF8=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 33c278c911ac..2b1207a94c8f 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-LUJ0e/ndyeeRsC2h7JJL6zymmPDWxW0cPGBceuC7+X0=";
+    hash = "sha256-803feSIFyuBTyGGDH4zZ4hRGXRNN+J2y1p0C9I9qMro=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
index 5fc3cec8a9c9..0be0ff82b558 100644
--- a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
@@ -8,7 +8,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     name = "oracle-java";
     publisher = "oracle";
     version = "24.1.2";
-    hash = "sha256-sw+FJbpdkHABKgnRsA5tS6FYEjBD0/iVRCHHzf49Xx4=";
+    hash = "sha256-RX+Yq7fVmN797qlvSWV9hOqQV3lpWBzDjOMm/1sbv0k=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
index 109e1ffdf423..a9c961c9ab9c 100644
--- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "material-icon-theme";
     publisher = "PKief";
-    version = "5.27.0";
-    hash = "sha256-vP5jMijMIKHUmvSaTX+eEO6Z3dzUCR6S/ZdPxjJHIT8=";
+    version = "5.28.0";
+    hash = "sha256-VZFeEaWe5JZQegOJ674vHxQAFuWFG5lttnWwSQ5AY5g=";
   };
   meta = {
     description = "Material Design Icons for Visual Studio Code";
diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index 318667ab88e5..bb2eba5d4764 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.32.7";
-    hash = "sha256-cnjF/laOw7A+nAtBOMWXi4M6NoOK/4kWHne4qlyn4wM=";
+    version = "3.36.1";
+    hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g=";
   };
 
   meta = {
diff --git a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix
similarity index 60%
rename from pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
rename to pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix
index b359b9c74088..67356471a408 100644
--- a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix
@@ -5,16 +5,16 @@
 
 vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
-    publisher = "ethersync";
-    name = "ethersync";
-    version = "0.6.0";
-    hash = "sha256-KuidePUxQ+FhnIGTUf6i+WxBQfbQVlq68xbuOeEouIE=";
+    publisher = "teamtype";
+    name = "teamtype";
+    version = "0.8.0";
+    hash = "sha256-p9bynTMmCn6pu7SVEABeSawv9VjWpE8KecQOeIsE/LE=";
   };
 
   meta = {
     description = "Extension for real-time co-editing of local text files";
-    downloadPage = "https://marketplace.visualstudio.com/items?itemName=ethersync.ethersync";
-    homepage = "https://github.com/ethersync/ethersync/tree/main/vscode-plugin";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=teamtype.teamtype";
+    homepage = "https://github.com/teamtype/teamtype/tree/main/vscode-plugin";
     license = lib.licenses.agpl3Plus;
     maintainers = [ lib.maintainers.ethancedwards8 ];
     teams = [ lib.teams.ngi ];
diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index bcf31ed0bbfc..6d1eb3fee9f0 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-Jqi9NTrKSweDpZ+YtXeiH77XPRgsKVJXlA4Fds7m8T0=";
+          hash = "sha256-zhn3pZ8Q6clAsYXsdHGMYZJHMGL8VGIUs7fsmUkU2nE=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-8inRXcCkKbEm3D6+o5pEyUkkjj+58CgIGufHG5Qsl5Y=";
+          hash = "sha256-ubs0zMmPP/YBBZ3Nn41R8b4E2Rwi83xK6EKhsaUHXsk=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-sTwJVM6XxbT2JAJWqAhMA/GJvP1GOnMfIezj+MMaiJ8=";
+          hash = "sha256-GUNJFIiCSXpw/lIfHOerbbs/j3KAut75u08wCktTqCk=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-eJ/hKySxQDEh1hr36BAk0D7K6t4f9qj54T2Fc1Eq1t0=";
+          hash = "sha256-fL8OmeekDzj3t5lFirc4C5kYlaAGh4/BanmWsPj2BGI=";
         };
       };
     in
     {
       name = "visualjj";
       publisher = "visualjj";
-      version = "0.17.1";
+      version = "0.19.0";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");
diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
index b7c8acc9d1fa..e2f36e392fdb 100644
--- a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-sqlite3-editor";
     publisher = "yy0931";
-    version = "1.0.208";
-    hash = "sha256-4NOyMHp42RS7qsx0Zy86kqQzKgQkh3WprRoEI6GIXvg=";
+    version = "1.0.210";
+    hash = "sha256-SuLGdTDZssXu5NeBhdFyT1+MIWo9B7BohG7YfB0SX7I=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog";
diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 57f7e03d9012..167c821bc06f 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -36,20 +36,20 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-i1MFtqfWiAsvxgyc/MZlOdo/Py6PQlJmjHGeYnhygso=";
-      x86_64-darwin = "sha256-HElY2mOgYxfE5LULFMpipmd/igDAapd6G2VlZeCGWTI=";
-      aarch64-linux = "sha256-NiVXjiii9Df3mRkDVULsiLgRhfJKX+H2/VYuxUImFzI=";
-      aarch64-darwin = "sha256-IDqupYgoslZb7Po8nimOTwojTJ0TO5efgfTqtTQ+dUI=";
-      armv7l-linux = "sha256-cN4EXCM5v5ULZUb+glqbI9g+oOsjELB+OWEGDVxN/Y4=";
+      x86_64-linux = "sha256-MqZQ8aER3wA1StlXH1fRImg3Z3dnfdWvIWLq2SEGeok=";
+      x86_64-darwin = "sha256-mA8Qpif6drxQDIK8dqp+45P7GHe+2AYS7utsBVeOjAc=";
+      aarch64-linux = "sha256-RXnlJmT+LfLYByS0IKurGCfTBSDw52b3YIQD26L+lL0=";
+      aarch64-darwin = "sha256-p9EFEk1enIHr0LtKr+W7e9OW5n8AdeQEaWNLWe8+Lao=";
+      armv7l-linux = "sha256-X6VhFrlV4S08bPgARVmIAcizYqz2V4sQrwIGzkeDLuE=";
     }
     .${system} or throwSystem;
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.105.0";
+  version = "1.105.1";
 
   # This is used for VS Code - Remote SSH test
-  rev = "03c265b1adee71ac88f833e065f7bb956b60550a";
+  rev = "7d842fb85a0275a4a8e4d7e040d2625abbf7f084";
 in
 callPackage ./generic.nix {
   pname = "vscode" + lib.optionalString isInsiders "-insiders";
@@ -82,7 +82,7 @@ callPackage ./generic.nix {
     src = fetchurl {
       name = "vscode-server-${rev}.tar.gz";
       url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-      hash = "sha256-0tGqGDMmLURqdQwqFWCO10d/RkVha8iC0Uv/JFp9nNQ=";
+      hash = "sha256-lMNmzwFh8Wn1xXCTpTnQZozzIRaO5aMJ2wP42u2zWIs=";
     };
     stdenv = stdenvNoCC;
   };
diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index 029e30ebde83..496a86337f80 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-XtYKg8SmODBHcbi+n70OrvZnl+YYbn8fxC8lhW4ZJ8g=";
-      x86_64-darwin = "sha256-jRryZ7YsgrPGl8La2GT4ntPjYjW7Va1DWr4x4fmDOao=";
-      aarch64-linux = "sha256-GUSd7wkn/AefoN9y5m0fGs9n0/XWCNosfppGNzLsqfQ=";
-      aarch64-darwin = "sha256-eesfcTp2mIVxFnWDe8umf9d4zIBSskiLsUw5Tp6K7/8=";
-      armv7l-linux = "sha256-bH4oz5EIpQls8SleSStxGHmhKCJHTmR4wPYJSu4biMI=";
+      x86_64-linux = "sha256-+aMcRAM1mOu2rLCVGtkygGgM/8VNeteM66BOlmQCIpA=";
+      x86_64-darwin = "sha256-A/5l3LZn7SYNLkixNAfcb0HJlXY9dN9tjDT/KJ4Ycqk=";
+      aarch64-linux = "sha256-LxVKn5ld2mhsV9ya2V9zXEjtEZRAUWupMgkWXSgrL+8=";
+      aarch64-darwin = "sha256-jF18swYLWCtT0GerSLkT01M1sGZmkAb6bRZlRL5Bna4=";
+      armv7l-linux = "sha256-MlN22vWh0FiqgYQqZ1YjhAEtPRGaGv4Rz3J3LF6udts=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.105.06808";
+  version = "1.105.17075";
   pname = "vscodium";
 
   executableName = "codium";
diff --git a/pkgs/applications/emulators/box64/default.nix b/pkgs/applications/emulators/box64/default.nix
index 894c6711a23e..1960fc844bcd 100644
--- a/pkgs/applications/emulators/box64/default.nix
+++ b/pkgs/applications/emulators/box64/default.nix
@@ -21,13 +21,13 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "box64";
-  version = "0.3.6";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "ptitSeb";
     repo = "box64";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Z8r7aonVj7VSifgLKx/L7VRdGNnQtTvS4mjI+2+uPxY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PVzv1790UhWbqLmw/93+mU3Gw8lQek7NBls4LXks4wQ=";
   };
 
   # Setting cpu doesn't seem to work (or maybe isn't enough / gets overwritten by the wrapper's arch flag?), errors about unsupported instructions for target
diff --git a/pkgs/applications/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix
deleted file mode 100644
index c2b4751b5adb..000000000000
--- a/pkgs/applications/emulators/gens-gs/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  SDL,
-  nasm,
-  zlib,
-  libpng,
-  libGLU,
-  libGL,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gens-gs";
-  version = "7";
-
-  src = fetchurl {
-    url = "http://retrocdn.net/images/6/6d/Gens-gs-r${version}.tar.gz";
-    sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtk2
-    SDL
-    nasm
-    zlib
-    libpng
-    libGLU
-    libGL
-  ];
-
-  # Work around build failures on recent GTK.
-  # See http://ubuntuforums.org/showthread.php?p=10535837
-  env.NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
-
-  meta = with lib; {
-    homepage = "https://segaretro.org/Gens/GS";
-    description = "Genesis/Mega Drive emulator";
-    platforms = [ "i686-linux" ];
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index 18f4d7d686f2..138ce2e99ed4 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "3e666a36bb3d5b3fa1573b62a9928bd441b618b7";
-    hash = "sha256-PIuCTGd9N8wQcfZWEIAVhZr31gJ0onca734Bn0GsVsk=";
+    rev = "d5c2b28ee6931ae43a4a79455937693ae8ccc8a1";
+    hash = "sha256-67SLilFN88TVdbtpb97dw87QVLJWIib44kifVvZMXYE=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
index f897e38fba5d..5b120ac1db09 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-psx" + lib.optionalString withHw "-hw";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-psx-libretro";
-    rev = "4968db4255bd8853137132c5d0809becd7638026";
-    hash = "sha256-MVcz+c5ExZZuda5ene4nhidd/zZNvXcAg+wCinQisME=";
+    rev = "6ac3c05aeddeb6dd5f28f448354d1f8e2e5d6810";
+    hash = "sha256-Y/ct+nDlbIZNRxRQJVsgaQs3mFODfuhToZdXairaesk=";
   };
 
   extraBuildInputs = lib.optionals withHw [
diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index 21d55863beb9..db0bd46bd5c0 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bluemsx";
-  version = "0-unstable-2025-09-27";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bluemsx-libretro";
-    rev = "7074551cf50ebdae78c8cce4e77560f9fc4575ca";
-    hash = "sha256-kmG0LCvWG+4wM+hwZ8TYQid12nZuQpNbaljym+glbz4=";
+    rev = "1f8aeb9ac3f3a4202736ac22e1785f01a834b975";
+    hash = "sha256-VnTL7MLhB/WEHm9930OvM84I5Vp4AaAI6qh7I4QRkVw=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix
index cdb25e403ac5..ae63e12c2afe 100644
--- a/pkgs/applications/emulators/libretro/cores/bsnes.nix
+++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bsnes";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-10-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bsnes-libretro";
-    rev = "e0e6cef46582a436e8b08a339f4751411dc5bd63";
-    hash = "sha256-fIlTIF1042oWIHxqD7h7MdUfb6QDfIP0jqVlBNOTBmY=";
+    rev = "57155d8037463346307123daabeaa27298e0f956";
+    hash = "sha256-eQaeAdQ7OWRzPVSbNOPUmMKIvkztZYGm2tzBavJO4Gs=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 1d52812f13a1..180cf0bb6301 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-09-28";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "150a8e02ec53bfd5fc571587dab902c075f9e291";
-    hash = "sha256-3l566sa5sCjeppUD06chpTZ21CnfEzdRpZKM7jxkS2M=";
+    rev = "11a9e9e451b5013c6a19d58b26bbc75316f4080d";
+    hash = "sha256-+dD1JWYvD03pzW97PZbick3+GdriowrDCylww+YyBls=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 67b9bf9d928d..0fa8f419c63b 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "9726100ba22a558290860a2648e1e6a8b8719478";
-    hash = "sha256-mhXuHPwXtvuA8ltaLF3uOsBwLE0evJ2RiCrNX5hnRXM=";
+    rev = "442a0e901c3d7d60c94f21caf46c0535233086f6";
+    hash = "sha256-ewwF7btf5EEBmGzAVuH4LavrDpmVzEBD/BE1/T/p6bM=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix
index f08e15ac8948..3d530034d18c 100644
--- a/pkgs/applications/emulators/libretro/cores/flycast.nix
+++ b/pkgs/applications/emulators/libretro/cores/flycast.nix
@@ -8,13 +8,13 @@
 }:
 mkLibretroCore {
   core = "flycast";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "flyinghead";
     repo = "flycast";
-    rev = "af5f67c15d52b16d35e95671a5b74502288c4397";
-    hash = "sha256-eMkyNwGdgyYDmwqYy3xzzSTYqUcoKpQkDYFP8bQdz58=";
+    rev = "5d628f8167947bc8a2a7608d52e4ff8b71b9ef34";
+    hash = "sha256-QKUAVJsJL1Ff8KNz6lpMU/IZNb1I09++AqqccIBdAPw=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix
index 70c202e6b30a..87f426946fc9 100644
--- a/pkgs/applications/emulators/libretro/cores/gambatte.nix
+++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gambatte";
-  version = "0-unstable-2025-09-18";
+  version = "0-unstable-2025-10-10";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gambatte-libretro";
-    rev = "0092232a0aaef0ded0ead1c2003ccf7a85ccdfc0";
-    hash = "sha256-baiTlYArNSBz79Cm16Sg3VZEp909zMkF/ExqhrPYN80=";
+    rev = "b75225203ffea8b65124bb31acb598e91e7f22d9";
+    hash = "sha256-q2gq4eBa1I89PROkxTt7XGIjI2H1eWFDi6lMH+emlmg=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index ab9d5f5c667f..c17c8fb73dbf 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "252a94c0c40047b52d9ecced567846a9dd5b2020";
-    hash = "sha256-Eys3iDJfi3bRuPjWRK34CEAN5o5MC+of1ktT7z2DdAI=";
+    rev = "cecccacf767b1c8e86af3e315223b052a7f81b95";
+    hash = "sha256-x2ClmCtWIF9HS8Yb+8cNm9MSxwcwSm05G+hZGWBz2OY=";
   };
 
   meta = {
diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix
index b2743bf45d3e..0b45c6636ce9 100644
--- a/pkgs/applications/emulators/libretro/cores/gpsp.nix
+++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "gpsp";
-  version = "0-unstable-2025-09-17";
+  version = "0-unstable-2025-10-07";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "gpsp";
-    rev = "a545aafaf4e654a488f4588f4f302d8413a58066";
-    hash = "sha256-94J5WqlvBgfF/0aj0Pu61psG5pbhJVsZOiIbMdZ+ryQ=";
+    rev = "74db5e5c73020626a1118b97d3735b5636d65d9d";
+    hash = "sha256-/tu+g0VDcRIycqxB4TQmDROtrp2PBNKoR4fzdajGeIM=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index f23616c03969..ae4f1ca10acf 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2025-09-26";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "61743c76180f1ad454227ed1be0261a071d37d67";
-    hash = "sha256-R7zBl8Y5tnG+CkFgyTdwlGlCLwG/9Svs3hsJJp12fOY=";
+    rev = "a90e86e100f79533f257ac2b30ccefe26a76daad";
+    hash = "sha256-BD5DFl9EzSgnKBjF/TPXL8yvoyc3B1Ktzcwug8CEK38=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
index 7d73845701dd..a28afb58f016 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003-plus.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003-plus";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-10-05";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-plus-libretro";
-    rev = "59b8a9fb06a47a3ce6aecd09b07f3f001e3d9b08";
-    hash = "sha256-hfC/6UqUSDd2FWpcCVcw4pkAtyHJGCgvG4UKlkM+fpk=";
+    rev = "870e8ba3fa4e6635e2eb9d85c939589498659c32";
+    hash = "sha256-FU7GKuLssyGuWeHQZGjborz/QdgAxw3JKe9Hstq9ckk=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix
index 57cce733e2ec..e20163bf9ff0 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003";
-  version = "0-unstable-2025-08-26";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-libretro";
-    rev = "dfddf4db86a3acd5997ce9419c7afd00ff6587a0";
-    hash = "sha256-GJRawFdlHCfBRiErJJ3ZvZDF1gvYVkuQvKXV1qUCCRQ=";
+    rev = "3570605767a447c13b087a5946189bcbafe11e1d";
+    hash = "sha256-BcPiNYEi6uE8aSpPDNgZ8vmzSnZJUparEM3CEdexbPo=";
   };
 
   # Fix build with GCC 14
diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix
index 25b01a635a13..c4166818f3e8 100644
--- a/pkgs/applications/emulators/libretro/cores/nestopia.nix
+++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nestopia";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nestopia";
-    rev = "3ac52e67c4a7fa696ee37e48bbcec93611277288";
-    hash = "sha256-TDv+HTOtNEmel1lZlnlAGMVM8nEYdHLH7Rw6WBviGGw=";
+    rev = "e9429844f2e16a284a8cdf663589634fd4c6345f";
+    hash = "sha256-Ss4AuIuwEbaQOUcnGfXbJbEw/1HkyGZSRD2ody+wSSU=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index 9d8380bc2644..b79d1979bc1d 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-09-22";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "a3d84f977b721cda752299739fec525addce1ef9";
-    hash = "sha256-NVuz52c0zt/c8b3uoJWpKO2TMM9PFh/thQt8CfRFZhk=";
+    rev = "77c62d3a942e219bc9d072b4800fa0881208ce2a";
+    hash = "sha256-ROrANubftSJwGl9THdAIRhSFOy1uHZ6v2kAmYWLDhN0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index cb789b79d809..e6799c37037d 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-11-08";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "2f4b1adc98d36a4d3fdd0a413d65a7a0b306ed4c";
-    hash = "sha256-9azuw2uCwc1cpqnrqCBGp4uS2AHOc2gBJIaOTSullvs=";
+    rev = "5646e471699de213b0fd30eecc50628322b0a8e2";
+    hash = "sha256-TZqqABGy2smTsIScDKb4hMAyghyN8jW6RMba1o6/nNU=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index 908f8094aacd..3a8150cbb2f2 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2025-09-24";
+  version = "0-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "94115094ead4da7342bd638bb4cc293ae7d297c0";
-    hash = "sha256-tXSQursZcV/gsLlydVRD1KUR8t2zztfby7cDno1xtHc=";
+    rev = "abfc018c90799eb55b773fc46d486167d8b3c762";
+    hash = "sha256-7PXUGUfhieYz8rLDhfLq09AcJbEcTLC/peYYN/B07c4=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/libretro/cores/vba-m.nix b/pkgs/applications/emulators/libretro/cores/vba-m.nix
index 04b25cbcedca..1a25a66478dd 100644
--- a/pkgs/applications/emulators/libretro/cores/vba-m.nix
+++ b/pkgs/applications/emulators/libretro/cores/vba-m.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "vbam";
-  version = "0-unstable-2024-10-21";
+  version = "0-unstable-2025-11-05";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "vbam-libretro";
-    rev = "379dd97301458a51fb69dd93ba21b64f81e01ef2";
-    hash = "sha256-UbXSHdKfa91MpcYityo+aILbI0DfkLqZh8YfGcRx/BI=";
+    rev = "d0787aee43d260675da203c2f85ba9fa226c0c66";
+    hash = "sha256-WhsiKsDk7jEIklrOw1YFCcWSlAmLK4vCCji3Mnsgwmw=";
   };
 
   makefile = "Makefile";
diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix
index 9ac68c4ffcea..4665547f501d 100644
--- a/pkgs/applications/emulators/wine/base.nix
+++ b/pkgs/applications/emulators/wine/base.nix
@@ -40,12 +40,6 @@ let
     };
   } ./setup-hook-darwin.sh;
 
-  # Using the 14.4 SDK allows Wine to use `os_sync_wait_on_address` for its futex implementation on Darwin.
-  # It does an availability check, so older systems will still work.
-  darwinFrameworks = lib.optionals stdenv.hostPlatform.isDarwin (
-    toBuildInputs pkgArches (pkgs: [ pkgs.apple-sdk_14 ])
-  );
-
   # Building Wine with these flags isn’t supported on Darwin. Using any of them will result in an evaluation failures
   # because they will put Darwin in `meta.badPlatforms`.
   darwinUnsupportedFlags = [
@@ -168,7 +162,6 @@ stdenv.mkDerivation (
           pkgs.libGL
           pkgs.libdrm
         ]
-        ++ lib.optionals stdenv.hostPlatform.isDarwin darwinFrameworks
         ++ lib.optionals x11Support (
           with pkgs.xorg;
           [
@@ -213,11 +206,7 @@ stdenv.mkDerivation (
     # LD_LIBRARY_PATH.
     NIX_LDFLAGS = toString (
       map (path: "-rpath " + path) (
-        map (x: "${lib.getLib x}/lib") (
-          [ stdenv.cc.cc ]
-          # Avoid adding rpath references to non-existent framework `lib` paths.
-          ++ lib.subtractLists darwinFrameworks finalAttrs.buildInputs
-        )
+        map (x: "${lib.getLib x}/lib") [ stdenv.cc.cc ]
         # libpulsecommon.so is linked but not found otherwise
         ++ lib.optionals supportFlags.pulseaudioSupport (
           map (x: "${lib.getLib x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ]))
diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index fada543b6e9d..44eaf9aed9b5 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -133,9 +133,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.15";
+    version = "10.18";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-MH4hI3xui96iZvlG0x8J7SexlX35oDUW2Ccf0T4cJh0=";
+    hash = "sha256-Uftyc9ZdCd6gMsSl4hl7EnJLJ8o2DhpiKyNz0e5QrXs=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-VzHM4Qm0XDP7suCT5dmJgoDJmZ1DLg6qqOUVQzNc0g4=";
+      hash = "sha256-vhIjeEbWLpcKtkBd/KeAeaLKOUZt7LAkH6GTebs3ROM=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";
@@ -168,9 +168,9 @@ rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "10.2.0";
+      version = "10.3.0";
       url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
-      hash = "sha256-Th7T8C6S0FMTPQPd++/PbbSk3CMamu0zZ7FxF6iIR9g=";
+      hash = "sha256-zs5cYxgAlN/98B0PvjYqS2BuUoC5jN/RuFaM35tXL5g=";
     };
 
     updateScript = writeShellScript "update-wine-unstable" ''
diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix
index 7273d9e40e39..6e4b807d7bf0 100644
--- a/pkgs/applications/emulators/yabause/default.nix
+++ b/pkgs/applications/emulators/yabause/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   version = "0.9.15";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz";
+    url = "https://web.archive.org/web/20250129091147/http://free.downloads.tuxfamily.net/yabause/releases/${version}/yabause-${version}.tar.gz";
     sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
   };
 
@@ -47,8 +47,16 @@ mkDerivation rec {
     "-DYAB_NETWORK=ON"
     "-DYAB_OPTIMIZED_DMA=ON"
     "-DYAB_PORTS=qt"
+    "-DSH2_DYNAREC=OFF" # https://github.com/Yabause/yabause/issues/270
   ];
 
+  postPatch = ''
+    substituteInPlace {./,src/,src/runner/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/{c68k,musashi}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Open-source Sega Saturn emulator";
     mainProgram = "yabause";
diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 5d294fc73a28..47ac7b7b66d6 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -85,13 +85,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.2-7";
+  version = "7.1.2-8";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-9ARCYftoXiilpJoj+Y+aLCEqLmhHFYSrHfgA5DQHbGo=";
+    hash = "sha256-2jSQ59Wi6/1dbS/AgM1DfW6WlwoYuJlnTLoM8Mc6Ji8=";
   };
 
   outputs = [
diff --git a/pkgs/applications/graphics/gimp/2.0/default.nix b/pkgs/applications/graphics/gimp/2.0/default.nix
index 90a9061d52f9..c68a0b03d6a3 100644
--- a/pkgs/applications/graphics/gimp/2.0/default.nix
+++ b/pkgs/applications/graphics/gimp/2.0/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   replaceVars,
   autoreconfHook,
   pkg-config,
@@ -88,6 +89,70 @@ stdenv.mkDerivation (finalAttrs: {
     # This has already been fixed for the upcoming GIMP 3, but the fix has not been backported to 2.x yet
     # (see https://gitlab.gnome.org/GNOME/gimp/-/issues/9080)
     ./force-enable-libheif.patch
+    (fetchurl {
+      name = "CVE-2025-2760.patch";
+      # https://gitlab.gnome.org/GNOME/gimp/-/commit/c17b324910204a47828d6fbb542bdcefbd66bcc1
+      url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-2760.patch";
+      hash = "sha256-BH5cCyg0IjfamHPchZ0HBe8EAPrWeHINQ6r7FHaz0qw=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-2761.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/0806bc76ca74543d20e1307ccf6aebd26395c56c.patch";
+      hash = "sha256-I5dyD3gLbVdk5bTft3TveTWgBN7RouNpIByKbCYmGbo=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-5473.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/c855d1df60ebaf5ef8d02807d448eb088f147a2b.patch";
+      hash = "sha256-QO8u5XQD3XR+sUN//LsvWpTxHe0i9m4VvdnsUGnor/0=";
+    })
+    (fetchurl {
+      name = "CVE-2025-6035.patch";
+      # https://gitlab.gnome.org/GNOME/gimp/-/commit/548bc3a46d54711d974aae9ce1bce291376c0436
+      url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-6035.patch";
+      hash = "sha256-cbALgUEUO8k5jaN5Y7jUR/dHJ9rHF06m9zEM/AOcFDk=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-48797_1.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/8d309dd0385fdd298520b69148542375f56ef977.patch";
+      hash = "sha256-/JAUhbPko0EdHGSCnZIWVqPcXpdvRML5Fqx5w/B3P8k=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-48797_2.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/97f8c2e468cffce70c6772e74cbff8eda4e8c180.patch";
+      hash = "sha256-tNG2fpZ0iRk0thrcxjZqb/zgvf4ctmXEy8iSOz5ufCo=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-48797_3.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/d7f0829ae995ca7ca9c64851a1ed03b11702ef1c.patch";
+      hash = "sha256-Byvc0i8TS33ZAKONxkrS0iFdWTXZP2w8Ma+k15DGVkw=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-48797_4.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/ffb7cad1a402377927bc2dc62dad324ae03cec92.patch";
+      hash = "sha256-PZvP4B3U+YalxWwmLhXyTZRacTtkG289JUWsQtZW4BE=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-48798_1.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/ebf0b569a63f15b5dc7532f16936104af1e09f02.patch";
+      hash = "sha256-VyPbSyRTo+sYg2JkAH3h5exYHDMqIEHc9gYRcM/8wzg=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-48798_2.patch";
+      url = "https://gitlab.gnome.org/GNOME/gimp/-/commit/e7523ed41271e48a909011b8598d496c1be642e2.patch";
+      hash = "sha256-ACoxobr2ySpH9VJVdJyWxQpZXOTSEs1me4Q0Rq3bDaE=";
+    })
+    (fetchurl {
+      name = "CVE-2025-10922.patch";
+      # https://gitlab.gnome.org/GNOME/gimp/-/commit/0f309f9a8d82f43fa01383bc5a5c41d28727d9e3
+      url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-10922.patch";
+      hash = "sha256-xkhmlOqk2QiOi4Le7v6e9PdTNxVHpSmuZJTTqKdThUo=";
+    })
+    (fetchurl {
+      name = "CVE-2025-10934.patch";
+      # https://gitlab.gnome.org/GNOME/gimp/-/commit/5c3e2122d53869599d77ef0f1bdece117b24fd7c
+      url = "https://salsa.debian.org/gnome-team/gimp/-/raw/4cb293ec1a3b273281d5d9daf94b833c293797d7/debian/patches/CVE-2025-10934.patch";
+      hash = "sha256-MmYdh74cky/dF3UTHC0xpDW6+aa8Vzh+4ADHCDtIDzo=";
+    })
   ];
 
   # error: possibly undefined macro: AM_NLS
@@ -181,7 +246,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   env = {
     NIX_CFLAGS_COMPILE = toString (
-      [ ]
+      [
+        "-Wno-error=int-conversion" # Needed for CVE-2025-10934 patch
+      ]
       ++ lib.optionals stdenv.cc.isGNU [ "-Wno-error=incompatible-pointer-types" ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DGDK_OSX_BIG_SUR=16" ]
     );
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 3bb56a1eab85..4220b8d1de2f 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -99,13 +99,23 @@ stdenv.mkDerivation (finalAttrs: {
     })
     (fetchpatch {
       name = "fix-build-poppler-25.06.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/97bd8f29a61e691ceea98ca2444b974cf4256ae0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/40f5b15b7e29908b79c54e81db6f340936102e08.patch";
       hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
     })
     (fetchpatch {
       name = "fix-build-poppler-25.07.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch";
-      hash = "sha256-3Yj+neSRSSQPeeZkHJ0P6v3Sis/lg9xiygktI6Z+zDY=";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/8ae83ca81bbaebcc0ff0abe82300d56d2c94e6f9.patch";
+      hash = "sha256-s7UMnv1pAiQA/HL5CEdBwCn4v/tsphc0MSnBJAoqolY=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.09.0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/f48b429827dca510b41a5671d467e574ef348625.patch";
+      hash = "sha256-9CfmkTGMVHjZiiE3zvi4YOrytcir8a7O2z3PrhjcohI=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.10.0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/4dba481fe898c6317696d50b109f5aed8f269c19.patch";
+      hash = "sha256-FFCkMU+Ec2qobG4ru89NPcM9Gxw8ZyFV+6jpW8ZwgE4=";
     })
   ];
 
diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix
index b6d37dfc5649..ec6edb230aff 100644
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -1,106 +1,103 @@
 {
-  stdenv,
   lib,
+
+  stdenv,
   fetchFromGitHub,
-  libGLU,
-  qtbase,
-  qtscript,
-  qtxmlpatterns,
-  lib3ds,
-  bzip2,
-  muparser,
-  eigen,
-  glew,
-  gmp,
-  levmar,
-  qhull,
+  fetchpatch,
+
+  # nativeBuildInputs
   cmake,
-  cgal,
-  boost,
-  mpfr,
-  xercesc,
-  onetbb,
-  embree,
-  vcg,
-  libigl,
-  corto,
-  openctm,
-  structuresynth,
-  wrapQtAppsHook,
   python3Packages,
+
+  # propagatedBuildInputs
+  meshlab,
+
+  # buildInputs
+  libsForQt5,
+  llvmPackages,
+  glew,
+  vcg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pymeshlab";
-  version = "2023.12";
+  version = "2025.7";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "pymeshlab";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-IOlRdXoUPOJt67g3HqsLchV5aL+JUEks2y1Sy+wpwsg=";
-    fetchSubmodules = true;
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LCR2/AyX9uVX4xhZareUL6YlpUsCFiGDMBB5nFp+H6k=";
   };
 
-  buildInputs = [
-    libGLU
-    qtbase
-    qtscript
-    qtxmlpatterns
-    lib3ds
-    bzip2
-    muparser
-    eigen
-    glew
-    gmp
-    levmar
-    qhull
-    cgal
-    boost
-    mpfr
-    xercesc
-    onetbb
-    embree
-    vcg
-    libigl
-    corto
-    structuresynth
-    openctm
+  patches = [
+    # CMake: allow use of system-provided meshlab & pybind11
+    # ref. https://github.com/cnr-isti-vclab/PyMeshLab/pull/445
+    # merged upstream
+    (fetchpatch {
+      url = "https://github.com/cnr-isti-vclab/PyMeshLab/commit/b363caae4362746b3f9e9326fe7b72a2ec7824d9.patch";
+      hash = "sha256-euKfOx/T0qdeMx79dpEalzmdWsr4nbDFJfKdksvULBw=";
+    })
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
     python3Packages.pybind11
   ];
 
+  nativeCheckInputs = [
+    python3Packages.pythonImportsCheckHook
+  ];
+
   propagatedBuildInputs = [
+    meshlab
     python3Packages.numpy
   ];
 
-  preConfigure = ''
-    substituteInPlace src/meshlab/src/external/libigl.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
-    substituteInPlace src/meshlab/src/external/nexus.cmake \
-      --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
-    substituteInPlace src/meshlab/src/external/levmar.cmake \
-      --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
-      --replace-warn "MD5 ''${LEVMAR_MD5}" ""
-    substituteInPlace src/meshlab/src/external/ssynth.cmake \
-      --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
-      --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-  '';
+  buildInputs = [
+    glew
+    libsForQt5.qtbase
+    vcg
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
+
+  dontWrapQtApps = true;
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab"
-    "-DVCGDIR=${vcg.src}"
   ];
 
+  # Get io & filter plugins from meshlab, to avoild render, decorate & edit ones
+  postInstall =
+    let
+      plugins =
+        if stdenv.hostPlatform.isDarwin then
+          "Applications/meshlab.app/Contents/PlugIns"
+        else
+          "lib/meshlab/plugins";
+      pyPlugins = if stdenv.hostPlatform.isDarwin then "PlugIns" else "lib/plugins";
+    in
+    ''
+      install -D -t $out/${python3Packages.python.sitePackages}/pymeshlab/${pyPlugins} \
+        ${meshlab}/${plugins}/libio_* \
+        ${meshlab}/${plugins}/libfilter_*
+    '';
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf \
+      --add-needed ${meshlab}/lib/meshlab/libmeshlab-common.so \
+      $out/${python3Packages.python.sitePackages}/pymeshlab/pmeshlab.*.so
+  '';
+
+  pythonImportsCheck = [ "pymeshlab" ];
+
   meta = {
     description = "Open source mesh processing python library";
     homepage = "https://github.com/cnr-isti-vclab/PyMeshLab";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ nim65s ];
-    platforms = with lib.platforms; linux;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 })
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index fe173e376ba5..d549af53f21e 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,9 +1,10 @@
 {
+  lib,
   callPackage,
-  lowPrio,
 }:
 
 let
+  inherit (lib) lowPrio;
   base3 = callPackage ./tesseract3.nix { };
   base4 = callPackage ./tesseract4.nix { };
   base5 = callPackage ./tesseract5.nix { };
diff --git a/pkgs/applications/graphics/unigine-sanctuary/default.nix b/pkgs/applications/graphics/unigine-sanctuary/default.nix
index 050890c62b70..dbbccc45c736 100644
--- a/pkgs/applications/graphics/unigine-sanctuary/default.nix
+++ b/pkgs/applications/graphics/unigine-sanctuary/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     homepage = "https://benchmark.unigine.com/sanctuary";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/applications/graphics/unigine-superposition/default.nix b/pkgs/applications/graphics/unigine-superposition/default.nix
index 8510096d8d20..c1bd6e8c12f7 100644
--- a/pkgs/applications/graphics/unigine-superposition/default.nix
+++ b/pkgs/applications/graphics/unigine-superposition/default.nix
@@ -143,7 +143,7 @@ buildFHSEnv {
     homepage = "https://benchmark.unigine.com/superposition";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "unigine-superposition";
   };
diff --git a/pkgs/applications/graphics/unigine-tropics/default.nix b/pkgs/applications/graphics/unigine-tropics/default.nix
index 8a1e2f384e38..bbcf0648369c 100644
--- a/pkgs/applications/graphics/unigine-tropics/default.nix
+++ b/pkgs/applications/graphics/unigine-tropics/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation {
     homepage = "https://benchmark.unigine.com/tropics";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/applications/graphics/xournalpp/default.nix b/pkgs/applications/graphics/xournalpp/default.nix
index a64f5fee2efa..0d1eb3e9bab3 100644
--- a/pkgs/applications/graphics/xournalpp/default.nix
+++ b/pkgs/applications/graphics/xournalpp/default.nix
@@ -84,7 +84,10 @@ stdenv.mkDerivation rec {
     homepage = "https://xournalpp.github.io/";
     changelog = "https://github.com/xournalpp/xournalpp/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ sikmir ];
+    maintainers = with lib.maintainers; [
+      sikmir
+      iedame
+    ];
     platforms = lib.platforms.unix;
     mainProgram = "xournalpp";
   };
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 5403e4d5e95b..25914f8fdb97 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Attempto";
     repo = "Clex";
-    rev = version;
+    tag = version;
     sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp";
   };
 
diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix
index 164ec577ac57..e5396ceae468 100644
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@@ -16,13 +16,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ausweisapp";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
     rev = finalAttrs.version;
-    hash = "sha256-xY5V5Z6HVtkFzLzWOVRTKdms356OO0EKnG+Nymurowo=";
+    hash = "sha256-vMvCnYSj7y6ETGoudV1YJwI2bibXePSkR4nQ4T5HqTo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix
index 77a3f7228a1a..1f38613ce6cf 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/applications/misc/chewing-editor/default.nix
@@ -1,46 +1,53 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
+  gtest,
   cmake,
   pkg-config,
   libchewing,
+  qt5,
   qtbase,
   qttools,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "chewing-editor";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "chewing";
     repo = "chewing-editor";
-    rev = version;
-    sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w";
+    tag = version;
+    hash = "sha256-gF3OotO/xb3Dc0YjVwAKIYnuEPIrgjpGR2tdjOBT4aI=";
   };
 
   doCheck = true;
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
+    gtest
     libchewing
     qtbase
     qttools
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform chewing user phrase editor";
     mainProgram = "chewing-editor";
     longDescription = ''
       chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance.
     '';
     homepage = "https://github.com/chewing/chewing-editor";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.ShamrockLee ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 5d97c06610a3..d0f69520f4cc 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   ninja,
   qtbase,
@@ -19,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "CopyQ";
-  version = "11.0.0";
+  version = "13.0.0";
 
   src = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    hash = "sha256-/t+8YsqeX0tlxwQDDNTalttCDIgGhpLbzYe3UqY04xM=";
+    hash = "sha256-wxjUL5mGXAMNVGP+dAh1NrE9tw71cJW9zmLsaCVphTo=";
   };
 
   nativeBuildInputs = [
@@ -48,12 +49,21 @@ stdenv.mkDerivation rec {
     kdePackages.kconfig
     kdePackages.kstatusnotifieritem
     kdePackages.knotifications
+    kdePackages.kguiaddons
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_QT6" true)
   ];
 
+  patches = [
+    # https://github.com/hluk/CopyQ/pull/3268
+    (fetchpatch2 {
+      url = "https://github.com/hluk/CopyQ/commit/103903593c37c9db5406d276e0097fbf18d2a8c4.patch?full_index=1";
+      hash = "sha256-zywE6ntMw+WvTyilXwvd4lfQRAAB9R/AGpwtwwPFZZE=";
+    })
+  ];
+
   meta = {
     homepage = "https://hluk.github.io/CopyQ";
     description = "Clipboard Manager with Advanced Features";
diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
index 4531a57317ec..50a38084194e 100644
--- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   qt6,
   cmake,
   ninja,
@@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5KGaMCL9BCGZwK7HQz87B1qrNvx5SQyMooZw4MwMdCc=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-building-with-Qt-610";
+      url = "https://gitlab.com/cubocore/coreapps/coreshot/-/commit/a01c943bec46eea261f545957dbafafc3ea370bb.patch";
+      hash = "sha256-SD4bYM8nBnGPO8iS8htFZZFUdimbLmpqxgWPioLMjsM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
index 0a028ddb8351..6948ca925f1e 100644
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  udisks2,
+  udisks,
   qt6,
   cmake,
   ninja,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     qt6.qtbase
-    udisks2
+    udisks
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 5817acd8b1c1..30e521755fde 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -92,6 +92,10 @@ buildDubPackage (
       # We get around this by manually pre-fetching the submodule and copying it into the right place
       cp -r --no-preserve=all ${cimgui-src}/* "$cimgui_dir/deps/cimgui"
 
+      # bump cmake minimum version to a version supported by cmake 4
+      substituteInPlace "$cimgui_dir/deps/cimgui/CMakeLists.txt" \
+          --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+
       # Disable the original cmake fetcher script
       substituteInPlace "$cimgui_dir/deps/CMakeLists.txt" \
           --replace-fail "PullSubmodules(" "# PullSubmodules(" \
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 4f05aa627d64..fd7690db657a 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
   };
 
+  patches = [
+    ./remove-Werror.patch
+  ];
+
   nativeBuildInputs = [
     qmake
     pkg-config
diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/applications/misc/kiwix/remove-Werror.patch
new file mode 100644
index 000000000000..da035478b99f
--- /dev/null
+++ b/pkgs/applications/misc/kiwix/remove-Werror.patch
@@ -0,0 +1,12 @@
+diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
+index c1f4f93..bf10828 100644
+--- a/kiwix-desktop.pro
++++ b/kiwix-desktop.pro
+@@ -27,7 +27,6 @@ QMAKE_CXXFLAGS += -std=c++17
+ QMAKE_LFLAGS +=  -std=c++17
+ 
+ !win32 {
+-    QMAKE_CXXFLAGS += -Werror
+     equals(QT_MAJOR_VERSION, 6):equals(QT_MINOR_VERSION, 6) {
+         # Fail the build on errors, except for 'template-id-cdtor' due to a problem with Qt headers.
+         # This can be removed when the Ubuntu package is fixed.
diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix
index cfdbd309ba45..4c27e2d95981 100644
--- a/pkgs/applications/misc/openambit/default.nix
+++ b/pkgs/applications/misc/openambit/default.nix
@@ -11,7 +11,6 @@
   udev,
   zlib,
 }:
-
 mkDerivation rec {
   pname = "openambit";
   version = "0.5";
@@ -33,6 +32,20 @@ mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.0)' 'cmake_minimum_required(VERSION 3.10)'
+
+    substituteInPlace src/libambit/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required (VERSION 3.1.3)' 'cmake_minimum_required(VERSION 3.10)'
+
+    substituteInPlace src/movescount/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.5)' 'cmake_minimum_required(VERSION 3.10)'
+
+    substituteInPlace src/openambit/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.5)' 'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   nativeBuildInputs = [
     cmake
     qttools
diff --git a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock b/pkgs/applications/misc/openbangla-keyboard/Cargo.lock
index d0bfd1e1783e..1bde0909ddfd 100644
--- a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock
+++ b/pkgs/applications/misc/openbangla-keyboard/Cargo.lock
@@ -4,105 +4,108 @@ version = 3
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
+ "cfg-if",
  "getrandom",
  "once_cell",
+ "serde",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "edit-distance"
-version = "2.1.0"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b"
+checksum = "e3f497e87b038c09a155dfd169faa5ec940d0644635555ef6bd464ac20e97397"
 
 [[package]]
 name = "emojicon"
-version = "0.3.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349cbfb1ca5301d8492ff741487f98fed75957c5e8fee41485e3413359099ef9"
+checksum = "328e1bb7f1b2b87859d560af9ca245e7a0ca664adad1879cb6bd2d49b7501fd4"
+
+[[package]]
+name = "fst"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
+ "r-efi",
  "wasi",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "okkhor"
-version = "0.5.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ef452078c9fb34be8842a52484bf9271e01ac2795e3d15ee90357fb45c102f"
+checksum = "0bc911c392067af1e3c7cde21774ea70dd285b4125b5e3d5febc283b76b9d6a4"
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "phf"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
  "phf_macros",
  "phf_shared",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
  "rand",
@@ -110,85 +113,65 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
 dependencies = [
  "phf_generator",
  "phf_shared",
- "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
  "siphasher",
 ]
 
 [[package]]
 name = "poriborton"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c081c9ef49e856f39ccd59e4943582b1e47225eb01b0debc1d388c4daa55b0dd"
+checksum = "964aa77aab32f321000ec0b121ab2a27565e051fb7ff979c22d6e21a90376f14"
 dependencies = [
- "matches",
  "phf",
 ]
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[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",
 ]
 
@@ -197,9 +180,6 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
 
 [[package]]
 name = "regex"
@@ -240,52 +220,72 @@ dependencies = [
  "okkhor",
  "poriborton",
  "regex",
+ "rustversion",
  "serde_json",
  "stringplus",
+ "upodesh",
 ]
 
 [[package]]
-name = "ryu"
-version = "1.0.15"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.226"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "stringplus"
@@ -295,20 +295,9 @@ checksum = "9057d3b491a3eee749e52560657c4d93b0badc04fb3fa8dae3c942c5c066f222"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -317,18 +306,68 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "upodesh"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af0dcd57dc7aa39411df5c9c8046ee7439a619e7881a43aba328bd533ae54a91"
+dependencies = [
+ "fst",
+ "once_cell",
+ "serde",
+ "serde_json",
+]
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.14.7+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix
index b2239c5d38a8..510402f40417 100644
--- a/pkgs/applications/misc/openbangla-keyboard/default.nix
+++ b/pkgs/applications/misc/openbangla-keyboard/default.nix
@@ -12,34 +12,22 @@
   ibus,
   qtbase,
   zstd,
-  fetchpatch,
   withFcitx5Support ? false,
   withIbusSupport ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openbangla-keyboard";
-  version = "unstable-2023-07-21";
+  version = "2.0.0-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "openbangla";
     repo = "openbangla-keyboard";
-    # no upstream release in 3 years
-    # fcitx5 support was added over a year after the last release
-    rev = "780bd40eed16116222faff044bfeb61a07af158f";
-    hash = "sha256-4CR4lgHB51UvS/RLc0AEfIKJ7dyTCOfDrQdGLf9de8E=";
+    rev = "723e348ad2cb0607684d907ce8a9457e12993f4f";
+    hash = "sha256-XAcL4gBcu84DMR6o9JSJ/PmI1PsDdTETknD6C48E8ek=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # prevents runtime crash when fcitx5-based IM attempts to look in /usr
-    (fetchpatch {
-      name = "use-CMAKE_INSTALL_PREFIX-for-loading-data.patch";
-      url = "https://github.com/OpenBangla/OpenBangla-Keyboard/commit/f402472780c29eaa6b4cc841a70289adf171462b.diff";
-      hash = "sha256-YahvtyOxe8F40Wfe+31C6fdmm197QN26/Q67oinOplk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -62,8 +50,8 @@ stdenv.mkDerivation rec {
     ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src cargoRoot postPatch;
-    hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY=";
+    inherit (finalAttrs) src cargoRoot postPatch;
+    hash = "sha256-UrS12fcXIIT3xhl/nyegwROBMCIepi6n07CS5CEA2BY=";
   };
 
   cmakeFlags =
@@ -76,7 +64,7 @@ stdenv.mkDerivation rec {
 
   cargoRoot = "src/engine/riti";
   postPatch = ''
-    cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock
+    cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock
   '';
 
   meta = {
@@ -85,9 +73,12 @@ stdenv.mkDerivation rec {
     mainProgram = "openbangla-gui";
     homepage = "https://openbangla.github.io/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ hqurve ];
+    maintainers = with lib.maintainers; [
+      hqurve
+      johnrtitor
+    ];
     platforms = lib.platforms.linux;
     # never built on aarch64-linux since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
   };
-}
+})
diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/applications/misc/opentrack/default.nix
deleted file mode 100644
index 097378626fe3..000000000000
--- a/pkgs/applications/misc/opentrack/default.nix
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  pkgs,
-  mkDerivation,
-  lib,
-  callPackage,
-  fetchzip,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  ninja,
-  copyDesktopItems,
-  qtbase,
-  qttools,
-  opencv4,
-  procps,
-  eigen,
-  libXdmcp,
-  libevdev,
-  makeDesktopItem,
-  fetchurl,
-  fetchpatch,
-  wineWowPackages,
-  onnxruntime,
-}:
-let
-  version = "2023.3.0";
-
-  aruco = callPackage ./aruco.nix { };
-
-  # license.txt inside the zip file is MIT
-  xplaneSdk = fetchzip {
-    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip";
-    hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo=";
-  };
-in
-mkDerivation {
-  pname = "opentrack";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "opentrack";
-    repo = "opentrack";
-    rev = "opentrack-${version}";
-    hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4=";
-  };
-
-  patches = [
-    # https://github.com/opentrack/opentrack/pull/1754
-    (fetchpatch {
-      url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch";
-      hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    ninja
-    copyDesktopItems
-  ];
-  buildInputs = [
-    qtbase
-    qttools
-    opencv4
-    procps
-    eigen
-    libXdmcp
-    libevdev
-    aruco
-    onnxruntime
-  ]
-  ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
-  dontWrapQtApps = true;
-
-  cmakeFlags = [
-    "-GNinja"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
-    "-DSDK_XPLANE=${xplaneSdk}"
-  ]
-  ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ];
-
-  postInstall = ''
-    wrapQtApp $out/bin/opentrack
-  '';
-
-  desktopItems = [
-    (makeDesktopItem rec {
-      name = "opentrack";
-      exec = "opentrack";
-      icon = fetchurl {
-        url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";
-        hash = "sha256-9k3jToEpdW14ErbNGHM4c0x/LH7k14RmtvY4dOYnITQ=";
-      };
-      desktopName = name;
-      genericName = "Head tracking software";
-      categories = [ "Utility" ];
-    })
-  ];
-
-  meta = {
-    homepage = "https://github.com/opentrack/opentrack";
-    description = "Head tracking software for MS Windows, Linux, and Apple OSX";
-    mainProgram = "opentrack";
-    changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}";
-    license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ zaninime ];
-  };
-}
diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index c3e100db084b..2d3389ff0faa 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -26,6 +26,10 @@ mkDerivation rec {
     sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g=";
   };
 
+  patches = [
+    # fix error "The LOCATION property may not be read from target" and ensure proper linking of Qt modules so build don't fail
+    ./fix-cmake-qt-linking-and-location.patch
+  ];
   nativeBuildInputs = [
     cmake
     gcc-arm-embedded
@@ -44,6 +48,12 @@ mkDerivation rec {
     sed -i companion/src/burnconfigdialog.cpp \
       -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' \
       -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0023 OLD)" "cmake_policy(SET CMP0023 NEW)"
+    substituteInPlace companion/src/thirdparty/maxlibqt/src/widgets/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch b/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
new file mode 100644
index 000000000000..857fca37716c
--- /dev/null
+++ b/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
@@ -0,0 +1,27 @@
+--- a/companion/src/CMakeLists.txt
++++ b/companion/src/CMakeLists.txt
+@@ -313,8 +313,8 @@
+ qt5_wrap_cpp(companion_SRCS ${companion_MOC_HDRS})
+ 
+ add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
+-target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB})
+-
++target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB}
++Qt5::Network Qt5::PrintSupport)
+ PrintTargetReport("${COMPANION_NAME}")
+ 
+ ############# Standalone simulator ###############
+@@ -371,11 +371,11 @@
+   string(TOLOWER ${PCB} FLAVOUR)
+ endif()
+ if(POLICY CMP0026)
+-  cmake_policy(SET CMP0026 OLD)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
++  cmake_policy(SET CMP0026 NEW)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
+ endif()
+ 
+ if(SIMU_TARGET)
+-  get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
++  set(current_plugin $<TARGET_FILE:opentx-${FLAVOUR}-simulator>)
+   list(APPEND simulator_plugins "${current_plugin}")
+ endif()
+ 
diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix
index c8964cdd63f7..34a35397b4d7 100644
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "organicmaps";
-  version = "2025.10.07-1";
+  version = "2025.10.23-22";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     tag = "${finalAttrs.version}-android";
-    hash = "sha256-132C3k8KvnQNC/AOoBlikl+AsRQdaaH00U3AFA4jo1Q=";
+    hash = "sha256-4TSN4G5tUvtzSXASDfOE1xiitQx9wE2/ZydFwpov+UM=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index 2d73912750a6..f6b12b600ba7 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -3,63 +3,95 @@
   stdenv,
   makeDesktopItem,
   fetchurl,
-  jdk21,
+  temurin-jre-bin-21,
+  javaPackages,
   wrapGAppsHook3,
-  glib,
+  dpkg,
+  xorg,
+  gtk3,
+  libGL,
+  alsa-lib,
   nix-update-script,
+  desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pdfsam-basic";
-  version = "5.3.2";
+  version = "5.4.1";
 
   src = fetchurl {
-    url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam-basic_${version}-1_amd64.deb";
-    hash = "sha256-Y0Q9uT6cyxIYTX0JxoS0r3TamPT1iLXr94Zex30AeWo=";
+    url = "https://github.com/torakiki/pdfsam/releases/download/v${finalAttrs.version}/pdfsam-basic_${finalAttrs.version}-1_amd64.deb";
+    hash = "sha256-iM0avC0YwxaB2prWbiKJZ9Fzd/HcdDWJg5IWRmNlVkM=";
   };
 
-  unpackPhase = ''
-    ar vx ${src}
-    tar xvf data.tar.gz
-  '';
-
-  nativeBuildInputs = [ wrapGAppsHook3 ];
-  buildInputs = [ glib ];
-
-  preFixup = ''
-    gappsWrapperArgs+=(--set JAVA_HOME "${jdk21}" --set PDFSAM_JAVA_PATH "${jdk21}")
-  '';
+  nativeBuildInputs = [
+    dpkg
+    wrapGAppsHook3
+    desktop-file-utils
+  ];
 
   installPhase = ''
-    cp -R opt/pdfsam-basic/ $out/
-    mkdir -p "$out"/share/icons
-    cp --recursive ${desktopItem}/share/applications $out/share
-    cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg
+    runHook preInstall
+    desktop-file-edit usr/share/applications/pdfsam-basic.desktop \
+         --set-key="Exec" --set-value="pdfsam-basic %F" \
+         --set-key="Path" --set-value="$out/share/pdfsam-basic" \
+         --set-icon="pdfsam-basic"
+       mkdir $out
+       cp -r usr/share $out/share
+       mkdir $out/share/pdfsam-basic
+       cp -r opt/pdfsam-basic/lib $out/share/pdfsam-basic/lib
+       install -Dm0644 opt/pdfsam-basic/splash.png $out/share/pdfsam-basic/splash.png
+       install -Dm0644 opt/pdfsam-basic/icon.svg $out/share/icons/hicolor/scalable/apps/pdfsam-basic.svg
+       mkdir $out/bin
+       makeWrapper ${temurin-jre-bin-21}/bin/java $out/bin/pdfsam-basic \
+         "''${gappsWrapperArgs[@]}" \
+         --set JAVA_HOME ${temurin-jre-bin-21} \
+         --set PDFSAM_JAVA_PATH ${temurin-jre-bin-21} \
+         --prefix LD_LIBRARY_PATH : ${
+           lib.makeLibraryPath [
+             javaPackages.openjfx25 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717
+             xorg.libXxf86vm
+             xorg.libXtst
+             gtk3
+             libGL
+             alsa-lib
+           ]
+         } \
+         --add-flags ${
+           lib.escapeShellArg (
+             lib.escapeShellArgs [
+               "--enable-preview"
+               "--module-path"
+               "${placeholder "out"}/share/pdfsam-basic/lib"
+               "--module"
+               "org.pdfsam.basic/org.pdfsam.basic.App"
+               "-Xmx512M"
+               "-splash:${placeholder "out"}/share/pdfsam-basic/splash.png"
+               "-Dapp.name=\"pdfsam-basic\""
+               "-Dapp.pid=\"$$\""
+               "-Dapp.home=\"${placeholder "out"}/share/pdfsam-basic\""
+               "-Dbasedir=\"${placeholder "out"}/share/pdfsam-basic\""
+               "-Dprism.lcdtext=false"
+             ]
+           )
+         }
+    runHook postInstall
   '';
 
-  desktopItem = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
-    comment = meta.description;
-    desktopName = "PDFsam Basic";
-    genericName = "PDF Split and Merge";
-    mimeTypes = [ "application/pdf" ];
-    categories = [ "Office" ];
-  };
+  dontWrapGApps = true;
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/torakiki/pdfsam";
     description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
     mainProgram = "pdfsam-basic";
-    sourceProvenance = with sourceTypes; [
+    sourceProvenance = with lib.sourceTypes; [
       binaryBytecode
       binaryNativeCode
     ];
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ _1000101 ];
+    maintainers = with lib.maintainers; [ _1000101 ];
   };
-}
+})
diff --git a/pkgs/applications/misc/prusa-slicer/default.nix b/pkgs/applications/misc/prusa-slicer/default.nix
index da9d218a932b..947500522390 100644
--- a/pkgs/applications/misc/prusa-slicer/default.nix
+++ b/pkgs/applications/misc/prusa-slicer/default.nix
@@ -62,12 +62,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prusa-slicer";
-  version = "2.9.3";
+  version = "2.9.4";
 
   src = fetchFromGitHub {
     owner = "prusa3d";
     repo = "PrusaSlicer";
-    hash = "sha256-B2uHrh09xKehmxnk3I4MHIjBfB/pGgFXC6R5k10JoJY=";
+    hash = "sha256-1ilgr9RaIoWvj0TDVc20XjjUUcNtnicR7KlE0ii3GQE=";
     rev = "version_${finalAttrs.version}";
   };
 
diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix
index b3cbb9572923..708e965c0978 100644
--- a/pkgs/applications/misc/q4wine/default.nix
+++ b/pkgs/applications/misc/q4wine/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  mkDerivation,
+  stdenv,
   cmake,
   sqlite,
   qtbase,
@@ -15,15 +15,15 @@
   which, # runtime deps.
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "q4wine";
-  version = "1.3.13";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "brezerk";
     repo = "q4wine";
     rev = "v${version}";
-    sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h";
+    sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/razergenie/default.nix b/pkgs/applications/misc/razergenie/default.nix
index 04cd8c67714f..9e72a1dde834 100644
--- a/pkgs/applications/misc/razergenie/default.nix
+++ b/pkgs/applications/misc/razergenie/default.nix
@@ -5,22 +5,20 @@
   meson,
   ninja,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  qt6,
   cmake,
 }:
 
 let
   libopenrazer = stdenv.mkDerivation (finalAttrs: {
     pname = "libopenrazer";
-    version = "0.3.0";
+    version = "0.4.0";
 
     src = fetchFromGitHub {
       owner = "z3ntu";
       repo = "libopenrazer";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-bU8Zsm/hM4HbPcoD191zwxU3x7f0i51evtVeD4jqw0U=";
+      hash = "sha256-2RH4mevJS5HaEkb5lDNwoMaMNACXJGUVA5RWSYSsakI=";
     };
 
     nativeBuildInputs = [
@@ -30,8 +28,8 @@ let
     ];
 
     buildInputs = [
-      qtbase
-      qttools
+      qt6.qtbase
+      qt6.qttools
     ];
 
     dontWrapQtApps = true;
@@ -46,13 +44,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "razergenie";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "z3ntu";
     repo = "RazerGenie";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kw7/Qf6L63PBuyq3TfgU2iGAKX0qLGiq6JgLnN+3tu4=";
+    hash = "sha256-TxW6IUHmEaNdJPeEGwo57a3EGH6MMyitVTmzStVmZjc=";
   };
 
   postUnpack = ''ln -s ${libopenrazer} libopenrazer'';
@@ -62,12 +60,12 @@ stdenv.mkDerivation (finalAttrs: {
     meson
     ninja
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qttools
+    qt6.qtbase
+    qt6.qttools
     libopenrazer
   ];
 
@@ -75,10 +73,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/z3ntu/RazerGenie";
     description = "Qt application for configuring your Razer devices under GNU/Linux";
     mainProgram = "razergenie";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       f4814n
-      Mogria
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 6ac94dc2906b..aec14488480b 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -70,12 +70,12 @@ let
       ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
 
       configureFlags = [
-        "--enable-randr=${if withRandr then "yes" else "no"}"
-        "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
-        "--enable-drm=${if withDrm then "yes" else "no"}"
-        "--enable-vidmode=${if withVidmode then "yes" else "no"}"
-        "--enable-quartz=${if withQuartz then "yes" else "no"}"
-        "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+        "--enable-randr=${lib.boolToYesNo withRandr}"
+        "--enable-geoclue2=${lib.boolToYesNo withGeoclue}"
+        "--enable-drm=${lib.boolToYesNo withDrm}"
+        "--enable-vidmode=${lib.boolToYesNo withVidmode}"
+        "--enable-quartz=${lib.boolToYesNo withQuartz}"
+        "--enable-corelocation=${lib.boolToYesNo withCoreLocation}"
       ]
       ++ lib.optionals (pname == "gammastep") [
         "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/"
diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
deleted file mode 100644
index 520781f67cfc..000000000000
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  makeWrapper,
-
-  autoreconfHook,
-  pkg-config,
-
-  waylandSupport ? true,
-  x11Support ? true,
-
-  cairo,
-  glib,
-  libnotify,
-  rofi-unwrapped,
-  wl-clipboard,
-  xclip,
-  xdotool,
-  wtype,
-}:
-
-import ./versions.nix (
-  {
-    version,
-    hash,
-    patches,
-  }:
-  stdenv.mkDerivation rec {
-    pname = "rofi-emoji";
-    inherit version;
-
-    src = fetchFromGitHub {
-      owner = "Mange";
-      repo = "rofi-emoji";
-      rev = "v${version}";
-      inherit hash;
-    };
-
-    inherit patches;
-
-    postPatch = ''
-      patchShebangs clipboard-adapter.sh
-    '';
-
-    postFixup = ''
-      chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
-      wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
-       --prefix PATH ":" ${
-         lib.makeBinPath (
-           [ libnotify ]
-           ++ lib.optionals waylandSupport [
-             wl-clipboard
-             wtype
-           ]
-           ++ lib.optionals x11Support [
-             xclip
-             xdotool
-           ]
-         )
-       }
-    '';
-
-    nativeBuildInputs = [
-      autoreconfHook
-      pkg-config
-      makeWrapper
-    ];
-
-    buildInputs = [
-      cairo
-      glib
-      libnotify
-      rofi-unwrapped
-    ]
-    ++ lib.optionals waylandSupport [
-      wl-clipboard
-      wtype
-    ]
-    ++ lib.optionals x11Support [ xclip ];
-
-    meta = with lib; {
-      description = "Emoji selector plugin for Rofi";
-      homepage = "https://github.com/Mange/rofi-emoji";
-      license = licenses.mit;
-      maintainers = with maintainers; [
-        cole-h
-        Mange
-      ];
-      platforms = platforms.linux;
-    };
-  }
-)
diff --git a/pkgs/applications/misc/rofi-emoji/versions.nix b/pkgs/applications/misc/rofi-emoji/versions.nix
deleted file mode 100644
index 20b79d584634..000000000000
--- a/pkgs/applications/misc/rofi-emoji/versions.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-generic: {
-  v4 = generic {
-    version = "4.0.0";
-    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
-    patches = [
-      # Look for plugin-related files in $out/lib/rofi
-      ./0001-Patch-plugindir-to-output.patch
-    ];
-  };
-  v3 = generic {
-    version = "3.4.1";
-    hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0=";
-    patches = [
-      # Look for plugin-related files in $out/lib/rofi
-      ./0001-Patch-plugindir-to-output.patch
-    ];
-  };
-}
diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix
deleted file mode 100644
index 13f9e91244e5..000000000000
--- a/pkgs/applications/misc/rofi-rbw/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchFromGitHub,
-  configargparse,
-  hatchling,
-  rbw,
-
-  waylandSupport ? false,
-  wl-clipboard,
-  wtype,
-
-  x11Support ? false,
-  xclip,
-  xdotool,
-}:
-
-buildPythonApplication rec {
-  pname = "rofi-rbw";
-  version = "1.5.1";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "fdw";
-    repo = "rofi-rbw";
-    tag = version;
-    hash = "sha256-Qdbz3UjWMCuJUzR6UMt/apt+OjMAr2U7uMtv9wxEZKE=";
-  };
-
-  nativeBuildInputs = [
-    hatchling
-  ];
-
-  buildInputs = [
-    rbw
-  ]
-  ++ lib.optionals waylandSupport [
-    wl-clipboard
-    wtype
-  ]
-  ++ lib.optionals x11Support [
-    xclip
-    xdotool
-  ];
-
-  propagatedBuildInputs = [ configargparse ];
-
-  pythonImportsCheck = [ "rofi_rbw" ];
-
-  wrapper_paths = [
-    rbw
-  ]
-  ++ lib.optionals waylandSupport [
-    wl-clipboard
-    wtype
-  ]
-  ++ lib.optionals x11Support [
-    xclip
-    xdotool
-  ];
-
-  wrapper_flags =
-    lib.optionalString waylandSupport "--typer wtype --clipboarder wl-copy"
-    + lib.optionalString x11Support "--typer xdotool --clipboarder xclip";
-
-  preFixup = ''
-    makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath wrapper_paths} --add-flags "${wrapper_flags}")
-  '';
-
-  meta = with lib; {
-    description = "Rofi frontend for Bitwarden";
-    homepage = "https://github.com/fdw/rofi-rbw";
-    license = licenses.mit;
-    maintainers = with maintainers; [
-      equirosa
-      dit7ya
-    ];
-    platforms = platforms.linux;
-    mainProgram = "rofi-rbw";
-  };
-}
diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 64b4b4563509..b85b0f0bd903 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.0.2";
+  version = "2.0.3";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FZruyQ3ckWp9nUmCet4uTeU7TKukmW1D73Rx8EUUsVI=";
+    hash = "sha256-vvbzXwujOIk3g/SvNM3JGkt956RN9VR0Pcx5nzg1IU0=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix
index c0c61e87264e..5c79c5ffe5e7 100644
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -25,14 +25,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tellico";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "office";
     repo = "tellico";
     rev = "v${version}";
-    hash = "sha256-+ky47wbyGAsBLx9q4ya/Vm9jiqEAbFfhloOytAyUYCQ=";
+    hash = "sha256-eScAOd1da05fqXtbcz8oEJiObB7CUxiYReSrr3R7ybM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index bdf7ec15c384..4f84bf31bc34 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -10,13 +10,13 @@
 
 mkDerivation rec {
   pname = "twmn";
-  version = "2025_03_06";
+  version = "2025_10_23";
 
   src = fetchFromGitHub {
     owner = "sboli";
     repo = "twmn";
     tag = version;
-    hash = "sha256-JQhONBcTJUzsKJY6YstC6HB4d/t8vf155/lN4UUv4l4=";
+    hash = "sha256-/yQtwoolGhtn19I+vus27OjaZgXXfhnWKQi+rUMozCY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/xppen/default.nix b/pkgs/applications/misc/xppen/default.nix
new file mode 100644
index 000000000000..27bc92f168b3
--- /dev/null
+++ b/pkgs/applications/misc/xppen/default.nix
@@ -0,0 +1,19 @@
+{
+  callPackage,
+}:
+
+# to update: try to find the latest 3.x.x or 4.x.x .tar.gz on https://www.xp-pen.com/download
+{
+  xppen_3 = callPackage ./generic.nix {
+    pname = "xppen_3";
+    version = "3.4.9-240607";
+    url = "https://www.xp-pen.com/download/file.html?id=2901&pid=819&ext=gz";
+    hash = "sha256-ZXeTlDjhryXamb7x2LxDdOtf8R9rgKPyUsdx96XchWM=";
+  };
+  xppen_4 = callPackage ./generic.nix {
+    pname = "xppen_4";
+    version = "4.0.7-250117";
+    url = "https://www.xp-pen.com/download/file.html?id=3652&pid=1211&ext=gz";
+    hash = "sha256-sH05Qquo2u0npSlv8Par/mn1w/ESO9g42CCGwBauHhU=";
+  };
+}
diff --git a/pkgs/applications/misc/xppen/generic.nix b/pkgs/applications/misc/xppen/generic.nix
new file mode 100644
index 000000000000..a48a20b2ef4c
--- /dev/null
+++ b/pkgs/applications/misc/xppen/generic.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  qt5,
+  libusb1,
+  pname,
+  version,
+  url,
+  hash,
+}:
+
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchzip {
+    name = "XPPenLinux${version}.tar.gz";
+    extension = "tar.gz";
+    inherit url hash;
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt5.qtbase
+    libusb1
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    rm -r App/usr/lib/pentablet/{lib,platforms,PenTablet.sh}
+    mkdir -p $out/{bin,usr}
+    cp -r App/lib $out/lib
+    cp -r App/usr/share $out/share
+    cp -r App/usr/lib $out/usr/lib
+
+    # hack: edit the binary directly
+    # TODO: replace it with buildFHSEnv if possible? last time it caused other issues
+    sed -i 's#/usr/lib/pentablet#/var/lib/pentablet#g' $out/usr/lib/pentablet/PenTablet
+    ln -s $out/usr/lib/pentablet/PenTablet $out/bin/PenTablet
+
+    substituteInPlace $out/share/applications/xppentablet.desktop \
+      --replace-fail "/usr/lib/pentablet/PenTablet.sh" "PenTablet" \
+      --replace-fail "/usr/share/icons/hicolor/256x256/apps/xppentablet.png" "xppentablet"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "XPPen driver";
+    downloadPage = "https://www.xp-pen.com/download/";
+    homepage = "https://www.xp-pen.com/";
+    license = lib.licenses.unfree;
+    mainProgram = "PenTablet";
+    maintainers = with lib.maintainers; [
+      gepbird
+      nasrally
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix
index a721ebfa285f..fa6eabd52df1 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/pkgs/applications/misc/xygrib/default.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall =
     if stdenv.hostPlatform.isDarwin then
       ''
diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index c6ecf713938d..8ff6cef784f7 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -32,11 +32,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zathura";
-  version = "0.5.12";
+  version = "0.5.13";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura/download/zathura-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6Ehw+/lrdmuCJKPzps58z6Nu+jtpGcyKL792XqTf5HY=";
+    hash = "sha256-YwIXO81G+JflIJyIOltRrR2rSUbC84YcujdKO4DY88E=";
   };
 
   outputs = [
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   # add support for more image formats
   env.GDK_PIXBUF_MODULE_FILE = gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
     extraLoaders = [
-      libheif.out
+      libheif.lib
       libjxl
       librsvg
       webp-pixbuf-loader
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e9ffcd726d0e..729b0bc9d5cd 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -467,10 +467,13 @@ let
       # Chromium reads initial_preferences from its own executable directory
       # This patch modifies it to read /etc/chromium/initial_preferences
       ./patches/chromium-initial-prefs.patch
+    ]
+    ++ lib.optionals (!chromiumVersionAtLeast "142") [
       # https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956
       # https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29
       # Rebased variant of patch to build M126+ with LLVM 17.
       # staging-next will bump LLVM to 18, so we will be able to drop this soon.
+      # Started failing to apply with M142, but this is no longer needed anyway.
       ./patches/chromium-126-llvm-17.patch
     ]
     ++ lib.optionals (!chromiumVersionAtLeast "140") [
@@ -529,7 +532,7 @@ let
       # electron 35 (M134) and 36 (M136)
       ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
     ]
-    ++ lib.optionals (chromiumVersionAtLeast "141") [
+    ++ lib.optionals (versionRange "141" "142") [
       (fetchpatch {
         # Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'"
         # by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157
@@ -539,6 +542,49 @@ let
         revert = true;
         hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw=";
       })
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "142" && lib.versionOlder rustcVersion "1.90") [
+      (fetchpatch {
+        # Fix "ld.lld: error: undefined symbol: __rustc::__rust_alloc_error_handler_should_panic'"
+        # with Rust < 1.90 by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6935385
+        name = "chromium-142-Revert-rust-Remove-the-old-__rust_alloc_error_handler_should_panic-symbol.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/e33287758f2234d6aabfc5d4e011c4e81e3a47cf^!?format=TEXT";
+        decode = "base64 -d";
+        revert = true;
+        hash = "sha256-0vRDz7wwGCsqm38fVvkLLzOOtEtd8CnqyjDLgGofh/o=";
+      })
+    ]
+    ++ lib.optionals (versionRange "142" "143") [
+      (fetchpatch {
+        # Fix https://issues.chromium.org/issues/450752866 by backporting
+        # https://chromium-review.googlesource.com/c/chromium/src/+/7030724 from M143
+        name = "chromium-142-Backport-Add-missing-include-for-FormFieldData-type-completeness.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/069d424e41f42c6f4a4551334eafc7cfaed6e880^!?format=TEXT";
+        decode = "base64 -d";
+        hash = "sha256-0ueOCHYheSFHRFzEat3TDhnU3Avf0TcNBBBpTkz+saw=";
+      })
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "142" && lib.versionOlder rustcVersion "1.91") [
+      # Fix the following error when compiling CrabbyAvif with Rust < 1.91 due to
+      # https://github.com/rust-lang/rust/pull/142681 by reverting
+      # https://github.com/webmproject/CrabbyAvif/pull/663 and
+      # https://github.com/webmproject/CrabbyAvif/pull/654 and
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6960510
+      #
+      #  error: cannot find attribute `sanitize` in this scope
+      #    --> ../../third_party/crabbyavif/src/src/capi/io.rs:210:41
+      #      |
+      #  210 |     #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
+      #      |                                         ^^^^^^^^
+      #
+      ./patches/chromium-142-crabbyavif-rust-no_sanitize.patch
+      (fetchpatch {
+        name = "chromium-142-crabbyavif-Revert-Enable-disable_cfi-feature.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/9415f40bc6f853547f791e633be638c71368ce56^!?format=TEXT";
+        decode = "base64 -d";
+        revert = true;
+        hash = "sha256-bYcJqPMbE7hMvhZVnzqHok1crUAdqrzqxr+4IHNzAtg=";
+      })
     ];
 
     postPatch =
@@ -568,7 +614,9 @@ let
         /* Generated by lastchange.py, do not edit.*/
         #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_
         #define SKIA_EXT_SKIA_COMMIT_HASH_H_
-        #define SKIA_COMMIT_HASH "${upstream-info.DEPS."src/third_party/skia".rev}-"
+        #define SKIA_COMMIT_HASH "${upstream-info.DEPS."src/third_party/skia".rev}${
+          lib.optionalString (!chromiumVersionAtLeast "142") "-"
+        }"
         #endif  // SKIA_EXT_SKIA_COMMIT_HASH_H_
         EOF
 
@@ -576,6 +624,15 @@ let
 
         mkdir -p third_party/jdk/current/bin
       ''
+      + lib.optionalString (!isElectron && chromiumVersionAtLeast "142") ''
+        cat << EOF > gpu/webgpu/dawn_commit_hash.h
+        /* Generated by lastchange.py, do not edit.*/
+        #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+        #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+        #define DAWN_COMMIT_HASH "${upstream-info.DEPS."src/third_party/dawn".rev}"
+        #endif  // GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+        EOF
+      ''
       + ''
         # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
         substituteInPlace BUILD.gn \
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index fb83f6edc0c6..be1a0ffd43f0 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,28 +1,28 @@
 {
   "chromium": {
-    "version": "141.0.7390.107",
+    "version": "142.0.7444.134",
     "chromedriver": {
-      "version": "141.0.7390.108",
-      "hash_darwin": "sha256-TvfBtM4vEYmBiUiZmdALHouufc95l9lcptGUafhT/a4=",
-      "hash_darwin_aarch64": "sha256-xe9/tivLgzkUHRo/39ytgGl32Q/Gml8Vg7Jptf1jtGw="
+      "version": "142.0.7444.135",
+      "hash_darwin": "sha256-i34SR1pfHcAA4N4ppIioa7r33PnvY0OYA8/+U1bQFs8=",
+      "hash_darwin_aarch64": "sha256-dsbjEDkZ0AVghazgF5w9O3aUWZNSy8R9WiHn9m/Sa9g="
     },
     "deps": {
       "depot_tools": {
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "gn": {
-        "version": "0-unstable-2025-08-29",
-        "rev": "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
-        "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
+        "version": "0-unstable-2025-09-18",
+        "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+        "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "1c008349f76ff3a317bf28316fc5008c0120deb4",
-        "hash": "sha256-NRqWOkGrg/Y4wZi4WQDJ6CvsDpeseVgTc/iAnuPRy/U=",
+        "rev": "b6965f826881a60c51151cfc0a0175966a0a4e81",
+        "hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -32,28 +32,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "d1877a8622be9c5a692dc5ed9ea5a54a78c9360e",
-        "hash": "sha256-Vtz6Xj4ktP/8q2QDVt2bQnwkz7eDKuPx9KswagxgqmY="
+        "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
+        "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "9ce37ed6b68eda96a67199e6564ceb958ad4b37e",
-        "hash": "sha256-2URJyICEyBwIXJRDkJt1B27DXq6nLZTCbW7dD8MBQk0="
+        "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
+        "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "f7f5a32b3e9582092d8a4511acec036a09ae8524",
-        "hash": "sha256-8hqb7ZtY3PAC8R9S0KTay79xlD8QBKjy0ZR5oUVr4p0="
+        "rev": "864f61dc9253d56586ada34c388278565ef513f6",
+        "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "92fb77dfd4d86aa120730359f5e4d6bb47f1c129",
-        "hash": "sha256-n7U+CKQ839Oa35JpygygPUhk9JqWIyafJRj0jYSMlwg="
+        "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
+        "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "46f8689c0b3999bd4b3a60adef01ceb3d8c0071f",
-        "hash": "sha256-qItKSIS5p4iIN+iSXgXYbFXq1CFFgwQV5NCQxunl0Zg="
+        "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
+        "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -72,8 +72,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "c6edf98e7fab2385c90caac6211f00b62e9b773d",
-        "hash": "sha256-i08iEbbV+RAvSQKxWutCSjpZkfcbTQdRUZkgtPZfLck="
+        "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
+        "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -82,8 +82,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "62826931e84c49c94192065c896931576d8273c8",
-        "hash": "sha256-YZFFKQKFyJUvrfG1bm84Hl3AGOkSgpqefwY5mHh1O0A="
+        "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
+        "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "bb55ea10fcef3759e4db7ef8a473a9ceac2c6aa6",
-        "hash": "sha256-NIy3fOwfheHeGo0MX8tmZbaGMBwqM5+k7cCypeoS6GI="
+        "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7",
+        "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -107,13 +107,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "15469c3d00394c8c365d1b1951fcf6255c589afb",
-        "hash": "sha256-Bd/Q181NBMJkLwkEmttNvjNBQqtRRT7p+nbevqvt2HI="
+        "rev": "c67cffddd65aba724950e062343fa1cc89560b33",
+        "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
-        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
+        "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
+        "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY="
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "9caf49389e5e0564d18e0504c6cfa45c88b4e4fd",
-        "hash": "sha256-d6WHeELxGtZ7nZzHIm18QaHY+2sc8KSRJgdH+vTuWN8="
+        "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831",
+        "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -142,8 +142,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "4e0f5364a3692f4122de0874ebb0f5550a27c867",
-        "hash": "sha256-ocnWUgw3rBYTsKS7j+Zq6hTGhhB4VRgifASMqBO66Os="
+        "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
+        "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -162,33 +162,38 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "0558b1933531e6379ac5875129b92aac9d1ce035",
-        "hash": "sha256-247bXbblup/bg+iWeIwlUxLinvvQK5hX+Jm0jKiaEbM="
+        "rev": "18f1cc77dea7254258eeee21839d1c249b506576",
+        "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
-        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
+        "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
+        "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
-        "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-        "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY="
+        "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
+        "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI="
       },
       "src/third_party/google_benchmark/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
         "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
         "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w="
       },
+      "src/third_party/libpfm4/src": {
+        "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git",
+        "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+        "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ="
+      },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "40e035a9e5d721b3b7c15c46259d782ffe7d9e96",
-        "hash": "sha256-m2WNsjSwlg57ACftIDCcIWJ/jwbD7FU43lhGcpGDhCw="
+        "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
+        "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "44ba5b579bf2f5c8548ad5016664fef8458c43b4",
-        "hash": "sha256-b8+7NGE9SelVFFuDOVr/k/nrk3jr/r8zwuW7vpm4c74="
+        "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
+        "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -197,8 +202,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "3c5077921dbacc75db5768cf4fc0b1d9ca05d2e0",
-        "hash": "sha256-w/tFeyek51/izvLSMkGP3RCW2j6KJdIa3l1PzxKjnaM="
+        "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
+        "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -222,8 +227,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "e414c0446436ed34151de3158d18f8ae32e55d03",
-        "hash": "sha256-748MwxVi7oONccrirjUWgtDNBWWijrXSXlZdHoowYz0="
+        "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+        "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -232,13 +237,13 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "ed91ea4a3cd063cbace42360d769983fb08163b4",
-        "hash": "sha256-vauYEQW9iTs8VZwyKAYeahLl9LTzkOR0krzcBR4VYus="
+        "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
+        "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "b560604e8f2261a2c685c28359b69af74b92a196",
-        "hash": "sha256-vgWATYq/7UXnFhfdJZ0JXvGpr4eI08sSU115MWpD1js="
+        "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
+        "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI="
       },
       "src/third_party/crossbench-web-tests": {
         "url": "https://chromium.googlesource.com/chromium/web-tests.git",
@@ -247,13 +252,13 @@
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "9c2c4cc7cf6c82ad460e1f3b49f34bb702d5fe11",
-        "hash": "sha256-qj1vR0FW2jiR2v18Nv8RqYgy/UEw2rgGUsQ68EhdHos="
+        "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
+        "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -267,8 +272,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
-        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
+        "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+        "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -282,8 +287,8 @@
       },
       "src/third_party/federated_compute/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
-        "rev": "cf49f95f941eb872f596522890055878240c3a22",
-        "hash": "sha256-R8KE0Whpb4qsZ6HxWG4/uFSsrT2nnpwNV2nQcNYHEXg="
+        "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
+        "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk="
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -297,28 +302,28 @@
       },
       "src/third_party/flatbuffers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
-        "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-        "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM="
+        "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
+        "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E="
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
-        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
+        "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
+        "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
-        "rev": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
-        "hash": "sha256-nDJH3Jmztrglr9hnwegfS7NNLAXklnwdeH9iWWwwZt4="
+        "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+        "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg="
       },
       "src/third_party/gemmlowp/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git",
-        "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-        "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA="
+        "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+        "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs="
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "61a423426089e65c27699d824303f209026b2f05",
-        "hash": "sha256-XaSl1YJk5TUR72PDbKwnn5IGT46VR7ip1wVxUMEkvu8="
+        "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
+        "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -352,8 +357,8 @@
       },
       "src/third_party/oak/src": {
         "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git",
-        "rev": "bd9e19ed20525444be0882bd5848ec475ac8c040",
-        "hash": "sha256-F/qSxLpbPPOBjY4/Gowq6HUINb1hH+ll9T+mDMGeJ7c="
+        "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
+        "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8="
       },
       "src/third_party/ots/src": {
         "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git",
@@ -397,8 +402,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "169baf17795850fd4b2c29e4d52136aa8d955b61",
-        "hash": "sha256-jcpUwHKWV4aWJSOZ4AlFk5YXZoTuXrrSE4jmwrrvoKI="
+        "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
+        "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -412,18 +417,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "4703185b29b381e5651eb1caed66630f623bf752",
-        "hash": "sha256-f3IPUpLB0jYrBwwJCBzatJgzayGtUxV6NsCLU2TiIqs="
+        "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
+        "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "4c70b98d1ebc8a210f2919be7ccabbcf23061cb5",
-        "hash": "sha256-PHtOD9HWxgwlfmcoDDHYyjhHpV/LclCVIk+ci9eUaIc="
+        "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55",
+        "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "5f27145da57a32eb8db215c40fe867a20beea987",
-        "hash": "sha256-ZbrbLnL/5LYu8cW06KnjNaUjMSlJCrzl0ywthOjNeX0="
+        "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
+        "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -432,8 +437,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "f8e3d7e50ed5c7ac071a9d90d3ee36cb68a8678c",
-        "hash": "sha256-7JF4A2ayMOAFOP3DH2Z2iBx9MHvMN9hogCY5unJZDbQ="
+        "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
+        "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -527,8 +532,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "b122dc0932009e78f928386c5081bb69d3c2de5c",
-        "hash": "sha256-y5yD3YwsQjWZn60VPUH4H2D1AwkBoGGmTNpyxGneciY="
+        "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
+        "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -542,8 +547,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "36edc5fa8b2da5aa00b8c2c68b25ffd64219d0ba",
-        "hash": "sha256-RTgcspt8hOHN79ZD5jjwuX7XFrFkuAJemIXmjoBKVMk="
+        "rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
+        "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -577,8 +582,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "9756d3a568a78213678eeb52e044b9658e195e15",
-        "hash": "sha256-LK1b2O4pgLyGBViXLid2w6+DxtstK44msyOJUNFn1ek="
+        "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
+        "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -592,13 +597,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "0a74b90b9a53b2033de1a53ed8401730f906a453",
-        "hash": "sha256-eTq4d9nE9J6ZbX2b7QK5gVacApSv6EQXUmvy1P641Eo="
+        "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
+        "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "43afaf571d990c0f3275c6800cf3ed42138bdc26",
-        "hash": "sha256-I5MrV4zYZjH0iSnc1aZ95xAg6e3OxQXX/rQoD8/OQIk="
+        "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
+        "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -607,8 +612,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
-        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
+        "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+        "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -627,8 +632,8 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
-        "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE="
+        "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
+        "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -637,13 +642,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "629f034fd4473fca4ee8886ed886943672fc72fa",
-        "hash": "sha256-iWtSJ8AL2rbjltg+FHO/w4mL1XHsemCc39lEFWKAVGA="
+        "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a",
+        "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "5eefbe51d17d2e379fa2d7353827e0ccb1e1f601",
-        "hash": "sha256-hjihCH6CykIfNcQ8TWCD8+buN0ZBYDwQr4I2Z2hUmxM="
+        "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
+        "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -662,8 +667,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f",
-        "hash": "sha256-YNQYUe3xgnPny6tYmlYOjC6/jszy896y+/u5aXjthvU="
+        "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
+        "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -672,18 +677,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
-        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
+        "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+        "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "a493d027dfa1ebf220dea834757f5114494f0f92",
-        "hash": "sha256-n52ZDzn4/SxcdUzCENBpUfjJk3+0IQSe+qj9FVgFn2w="
+        "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
+        "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "3289b1d61b69a6c66c4b7cd2c6d3ab2a6df031e5",
-        "hash": "sha256-9xGshr6ts0TdER7Sy86XpKrUItukeM59ozCIwkFy26A="
+        "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
+        "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -692,38 +697,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "3397e1e4fe0a9964e1837c2934b81835093494b8",
-        "hash": "sha256-Yp+HE/XIPJD/Baj9Nvs3H7J5Bx816qkYFpL6zARyY/8="
+        "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
+        "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "392b4893c4955125c1873c33a97f2a8ee8363bd3",
-        "hash": "sha256-HMzQps2F9TAnHHPvBeqowADHPlTvfRWUekE37AKMcaw="
+        "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
+        "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "d1cd37e925510a167d4abef39340dbdea47d8989",
-        "hash": "sha256-WUj4nmr4SJFTDoaOuZBVfqOrJykzW9Kg2sqaplm8E1A="
+        "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
+        "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "fe92c7d7e54664b1d3f3a0d734fd6f2ffd92e485",
-        "hash": "sha256-9Oe3JIuOT/yc+pUgKptnex9gKQFsHo1uBb3zeTegL6Q="
+        "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
+        "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "8ce6f121d1fcbdf60f0f4264e23fbcd247b9101d",
-        "hash": "sha256-3OcmtPp8mhrVYrPoCe9qnisXllMhYLdZ4dEulDhlq8k="
+        "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
+        "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "a528f95dc2f92bdd83c0c32efe2d13c806428c9d",
-        "hash": "sha256-7VEYvq1x+BYPuMGi47a7/R9ZrIR9CoIaV15wLpk97bg="
+        "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
+        "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "88a897d5921f737c9826fdd4db1ae2010d23dbb3",
-        "hash": "sha256-X5JFPq+4rqpfKLO7ImHOcR1nvO3+PCCglP0+hhUeiJ0="
+        "rev": "83d96b88de7b85c3f29545170857e54e348421b2",
+        "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -762,18 +767,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "b500efdd5fdd62404322ab9ecd70b938ac59a47f",
-        "hash": "sha256-gGyXYaHH0nk3rbJTtazNyj9vO4PqDPJ0OG1/CisrIq0="
+        "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
+        "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
-        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
+        "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
+        "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "d2eaa5570fc9959f8dbde32912a16366b8ee75f4",
-        "hash": "sha256-vWz+CAlgvavAmoCgy+D5FDGSyYoe15vfKI2fw33K8cc="
+        "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
+        "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -792,44 +797,44 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "63e7e89ddc0cf5671d2659cd34a3eb64a008dd63",
-        "hash": "sha256-cqzSTeRziIZFdArk6Ty/1JyeSM8w/aH2buoNy5GOIdg="
+        "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+        "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "e128976193546dceb24249206a02ff8f444f7120",
-        "hash": "sha256-09KBWIUdz53TOSGhi32BJ2/FIA/BXxRNvgZMZJYiWgw="
+        "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96",
+        "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ad8af0fc661d278e87627fcaa3a7cf795ee80dd8",
-        "hash": "sha256-NOhavmx5NYJx6MSDwRS6RXHcn3DB7kNlTjIFZr6rMMY="
+        "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d",
+        "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs="
       }
     }
   },
   "ungoogled-chromium": {
-    "version": "141.0.7390.76",
+    "version": "142.0.7444.134",
     "deps": {
       "depot_tools": {
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "gn": {
-        "version": "0-unstable-2025-08-29",
-        "rev": "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
-        "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
+        "version": "0-unstable-2025-09-18",
+        "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+        "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "ungoogled-patches": {
-        "rev": "141.0.7390.76-1",
-        "hash": "sha256-AFbZ3GP/mPCCbYTkYIYRE8+wlxEoMc4XTq3ZSh8Qgxg="
+        "rev": "142.0.7444.134-1",
+        "hash": "sha256-kwKzDTte0wPnx+tUmIaQ2EVf6HHacunmBbwLlUqYnOI="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "d6fcfbb51aac4df61d06692d4a62fd8b9aaf3c3a",
-        "hash": "sha256-PefndHEz3LALHSCsw6tuNiobQVzsTrseUmf4lqnpNpM=",
+        "rev": "b6965f826881a60c51151cfc0a0175966a0a4e81",
+        "hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -839,28 +844,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "d1877a8622be9c5a692dc5ed9ea5a54a78c9360e",
-        "hash": "sha256-Vtz6Xj4ktP/8q2QDVt2bQnwkz7eDKuPx9KswagxgqmY="
+        "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
+        "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "9ce37ed6b68eda96a67199e6564ceb958ad4b37e",
-        "hash": "sha256-2URJyICEyBwIXJRDkJt1B27DXq6nLZTCbW7dD8MBQk0="
+        "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
+        "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "f7f5a32b3e9582092d8a4511acec036a09ae8524",
-        "hash": "sha256-8hqb7ZtY3PAC8R9S0KTay79xlD8QBKjy0ZR5oUVr4p0="
+        "rev": "864f61dc9253d56586ada34c388278565ef513f6",
+        "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "92fb77dfd4d86aa120730359f5e4d6bb47f1c129",
-        "hash": "sha256-n7U+CKQ839Oa35JpygygPUhk9JqWIyafJRj0jYSMlwg="
+        "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
+        "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "46f8689c0b3999bd4b3a60adef01ceb3d8c0071f",
-        "hash": "sha256-qItKSIS5p4iIN+iSXgXYbFXq1CFFgwQV5NCQxunl0Zg="
+        "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
+        "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -879,8 +884,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "c6edf98e7fab2385c90caac6211f00b62e9b773d",
-        "hash": "sha256-i08iEbbV+RAvSQKxWutCSjpZkfcbTQdRUZkgtPZfLck="
+        "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
+        "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -889,8 +894,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "62826931e84c49c94192065c896931576d8273c8",
-        "hash": "sha256-YZFFKQKFyJUvrfG1bm84Hl3AGOkSgpqefwY5mHh1O0A="
+        "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
+        "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -899,8 +904,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "bb55ea10fcef3759e4db7ef8a473a9ceac2c6aa6",
-        "hash": "sha256-NIy3fOwfheHeGo0MX8tmZbaGMBwqM5+k7cCypeoS6GI="
+        "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7",
+        "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -914,13 +919,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "15469c3d00394c8c365d1b1951fcf6255c589afb",
-        "hash": "sha256-Bd/Q181NBMJkLwkEmttNvjNBQqtRRT7p+nbevqvt2HI="
+        "rev": "c67cffddd65aba724950e062343fa1cc89560b33",
+        "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
-        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
+        "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
+        "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY="
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -939,8 +944,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "9caf49389e5e0564d18e0504c6cfa45c88b4e4fd",
-        "hash": "sha256-d6WHeELxGtZ7nZzHIm18QaHY+2sc8KSRJgdH+vTuWN8="
+        "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831",
+        "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -949,8 +954,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "4e0f5364a3692f4122de0874ebb0f5550a27c867",
-        "hash": "sha256-ocnWUgw3rBYTsKS7j+Zq6hTGhhB4VRgifASMqBO66Os="
+        "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
+        "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -969,33 +974,38 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "0558b1933531e6379ac5875129b92aac9d1ce035",
-        "hash": "sha256-247bXbblup/bg+iWeIwlUxLinvvQK5hX+Jm0jKiaEbM="
+        "rev": "18f1cc77dea7254258eeee21839d1c249b506576",
+        "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
-        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
+        "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
+        "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
-        "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-        "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY="
+        "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
+        "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI="
       },
       "src/third_party/google_benchmark/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
         "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
         "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w="
       },
+      "src/third_party/libpfm4/src": {
+        "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git",
+        "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+        "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ="
+      },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "40e035a9e5d721b3b7c15c46259d782ffe7d9e96",
-        "hash": "sha256-m2WNsjSwlg57ACftIDCcIWJ/jwbD7FU43lhGcpGDhCw="
+        "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
+        "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "44ba5b579bf2f5c8548ad5016664fef8458c43b4",
-        "hash": "sha256-b8+7NGE9SelVFFuDOVr/k/nrk3jr/r8zwuW7vpm4c74="
+        "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
+        "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -1004,8 +1014,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "3c5077921dbacc75db5768cf4fc0b1d9ca05d2e0",
-        "hash": "sha256-w/tFeyek51/izvLSMkGP3RCW2j6KJdIa3l1PzxKjnaM="
+        "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
+        "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1029,8 +1039,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "e414c0446436ed34151de3158d18f8ae32e55d03",
-        "hash": "sha256-748MwxVi7oONccrirjUWgtDNBWWijrXSXlZdHoowYz0="
+        "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+        "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1039,13 +1049,13 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "ed91ea4a3cd063cbace42360d769983fb08163b4",
-        "hash": "sha256-vauYEQW9iTs8VZwyKAYeahLl9LTzkOR0krzcBR4VYus="
+        "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
+        "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "b560604e8f2261a2c685c28359b69af74b92a196",
-        "hash": "sha256-vgWATYq/7UXnFhfdJZ0JXvGpr4eI08sSU115MWpD1js="
+        "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
+        "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI="
       },
       "src/third_party/crossbench-web-tests": {
         "url": "https://chromium.googlesource.com/chromium/web-tests.git",
@@ -1054,13 +1064,13 @@
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "9c2c4cc7cf6c82ad460e1f3b49f34bb702d5fe11",
-        "hash": "sha256-qj1vR0FW2jiR2v18Nv8RqYgy/UEw2rgGUsQ68EhdHos="
+        "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
+        "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1074,8 +1084,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
-        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
+        "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+        "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1089,8 +1099,8 @@
       },
       "src/third_party/federated_compute/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
-        "rev": "cf49f95f941eb872f596522890055878240c3a22",
-        "hash": "sha256-R8KE0Whpb4qsZ6HxWG4/uFSsrT2nnpwNV2nQcNYHEXg="
+        "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
+        "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk="
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -1104,28 +1114,28 @@
       },
       "src/third_party/flatbuffers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
-        "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-        "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM="
+        "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
+        "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E="
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
-        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
+        "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
+        "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
-        "rev": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
-        "hash": "sha256-nDJH3Jmztrglr9hnwegfS7NNLAXklnwdeH9iWWwwZt4="
+        "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+        "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg="
       },
       "src/third_party/gemmlowp/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git",
-        "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-        "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA="
+        "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+        "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs="
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "61a423426089e65c27699d824303f209026b2f05",
-        "hash": "sha256-XaSl1YJk5TUR72PDbKwnn5IGT46VR7ip1wVxUMEkvu8="
+        "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
+        "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1159,8 +1169,8 @@
       },
       "src/third_party/oak/src": {
         "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git",
-        "rev": "bd9e19ed20525444be0882bd5848ec475ac8c040",
-        "hash": "sha256-F/qSxLpbPPOBjY4/Gowq6HUINb1hH+ll9T+mDMGeJ7c="
+        "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
+        "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8="
       },
       "src/third_party/ots/src": {
         "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git",
@@ -1204,8 +1214,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "169baf17795850fd4b2c29e4d52136aa8d955b61",
-        "hash": "sha256-jcpUwHKWV4aWJSOZ4AlFk5YXZoTuXrrSE4jmwrrvoKI="
+        "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
+        "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1219,18 +1229,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "4703185b29b381e5651eb1caed66630f623bf752",
-        "hash": "sha256-f3IPUpLB0jYrBwwJCBzatJgzayGtUxV6NsCLU2TiIqs="
+        "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
+        "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "4c70b98d1ebc8a210f2919be7ccabbcf23061cb5",
-        "hash": "sha256-PHtOD9HWxgwlfmcoDDHYyjhHpV/LclCVIk+ci9eUaIc="
+        "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55",
+        "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "5f27145da57a32eb8db215c40fe867a20beea987",
-        "hash": "sha256-ZbrbLnL/5LYu8cW06KnjNaUjMSlJCrzl0ywthOjNeX0="
+        "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
+        "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1239,8 +1249,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "f8e3d7e50ed5c7ac071a9d90d3ee36cb68a8678c",
-        "hash": "sha256-7JF4A2ayMOAFOP3DH2Z2iBx9MHvMN9hogCY5unJZDbQ="
+        "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
+        "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1334,8 +1344,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "b122dc0932009e78f928386c5081bb69d3c2de5c",
-        "hash": "sha256-y5yD3YwsQjWZn60VPUH4H2D1AwkBoGGmTNpyxGneciY="
+        "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
+        "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1349,8 +1359,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "36edc5fa8b2da5aa00b8c2c68b25ffd64219d0ba",
-        "hash": "sha256-RTgcspt8hOHN79ZD5jjwuX7XFrFkuAJemIXmjoBKVMk="
+        "rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
+        "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1384,8 +1394,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "9756d3a568a78213678eeb52e044b9658e195e15",
-        "hash": "sha256-LK1b2O4pgLyGBViXLid2w6+DxtstK44msyOJUNFn1ek="
+        "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
+        "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1399,13 +1409,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "0a74b90b9a53b2033de1a53ed8401730f906a453",
-        "hash": "sha256-eTq4d9nE9J6ZbX2b7QK5gVacApSv6EQXUmvy1P641Eo="
+        "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
+        "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "43afaf571d990c0f3275c6800cf3ed42138bdc26",
-        "hash": "sha256-I5MrV4zYZjH0iSnc1aZ95xAg6e3OxQXX/rQoD8/OQIk="
+        "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
+        "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1414,8 +1424,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
-        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
+        "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+        "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1434,8 +1444,8 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
-        "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE="
+        "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
+        "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -1444,13 +1454,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "629f034fd4473fca4ee8886ed886943672fc72fa",
-        "hash": "sha256-iWtSJ8AL2rbjltg+FHO/w4mL1XHsemCc39lEFWKAVGA="
+        "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a",
+        "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "5eefbe51d17d2e379fa2d7353827e0ccb1e1f601",
-        "hash": "sha256-hjihCH6CykIfNcQ8TWCD8+buN0ZBYDwQr4I2Z2hUmxM="
+        "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
+        "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1469,8 +1479,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f",
-        "hash": "sha256-YNQYUe3xgnPny6tYmlYOjC6/jszy896y+/u5aXjthvU="
+        "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
+        "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1479,18 +1489,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
-        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
+        "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+        "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "a493d027dfa1ebf220dea834757f5114494f0f92",
-        "hash": "sha256-n52ZDzn4/SxcdUzCENBpUfjJk3+0IQSe+qj9FVgFn2w="
+        "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
+        "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "3289b1d61b69a6c66c4b7cd2c6d3ab2a6df031e5",
-        "hash": "sha256-9xGshr6ts0TdER7Sy86XpKrUItukeM59ozCIwkFy26A="
+        "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
+        "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1499,38 +1509,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "3397e1e4fe0a9964e1837c2934b81835093494b8",
-        "hash": "sha256-Yp+HE/XIPJD/Baj9Nvs3H7J5Bx816qkYFpL6zARyY/8="
+        "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
+        "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "392b4893c4955125c1873c33a97f2a8ee8363bd3",
-        "hash": "sha256-HMzQps2F9TAnHHPvBeqowADHPlTvfRWUekE37AKMcaw="
+        "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
+        "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "d1cd37e925510a167d4abef39340dbdea47d8989",
-        "hash": "sha256-WUj4nmr4SJFTDoaOuZBVfqOrJykzW9Kg2sqaplm8E1A="
+        "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
+        "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "fe92c7d7e54664b1d3f3a0d734fd6f2ffd92e485",
-        "hash": "sha256-9Oe3JIuOT/yc+pUgKptnex9gKQFsHo1uBb3zeTegL6Q="
+        "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
+        "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "8ce6f121d1fcbdf60f0f4264e23fbcd247b9101d",
-        "hash": "sha256-3OcmtPp8mhrVYrPoCe9qnisXllMhYLdZ4dEulDhlq8k="
+        "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
+        "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "a528f95dc2f92bdd83c0c32efe2d13c806428c9d",
-        "hash": "sha256-7VEYvq1x+BYPuMGi47a7/R9ZrIR9CoIaV15wLpk97bg="
+        "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
+        "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "88a897d5921f737c9826fdd4db1ae2010d23dbb3",
-        "hash": "sha256-X5JFPq+4rqpfKLO7ImHOcR1nvO3+PCCglP0+hhUeiJ0="
+        "rev": "83d96b88de7b85c3f29545170857e54e348421b2",
+        "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1569,18 +1579,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "b500efdd5fdd62404322ab9ecd70b938ac59a47f",
-        "hash": "sha256-gGyXYaHH0nk3rbJTtazNyj9vO4PqDPJ0OG1/CisrIq0="
+        "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
+        "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
-        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
+        "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
+        "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "bc7452c444245f7999be5711b1802e900f25540b",
-        "hash": "sha256-Bqsd8b14ORREk/J3Tfs7OJXny0FdwUHO/sfCSEMEUSE="
+        "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
+        "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1599,18 +1609,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "63e7e89ddc0cf5671d2659cd34a3eb64a008dd63",
-        "hash": "sha256-cqzSTeRziIZFdArk6Ty/1JyeSM8w/aH2buoNy5GOIdg="
+        "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+        "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "e128976193546dceb24249206a02ff8f444f7120",
-        "hash": "sha256-09KBWIUdz53TOSGhi32BJ2/FIA/BXxRNvgZMZJYiWgw="
+        "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96",
+        "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ad8af0fc661d278e87627fcaa3a7cf795ee80dd8",
-        "hash": "sha256-NOhavmx5NYJx6MSDwRS6RXHcn3DB7kNlTjIFZr6rMMY="
+        "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d",
+        "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs="
       }
     }
   }
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch
new file mode 100644
index 000000000000..0dd08dbb41b9
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch
@@ -0,0 +1,48 @@
+diff --git a/third_party/crabbyavif/src/src/capi/io.rs b/third_party/crabbyavif/src/src/capi/io.rs
+index e7994ce3129c4d7f46553f527bf8f10376ff9ed8..60a3c13b788a560e9669db013e3b8e88e5f9947b 100644
+--- a/third_party/crabbyavif/src/src/capi/io.rs
++++ b/third_party/crabbyavif/src/src/capi/io.rs
+@@ -207,7 +207,7 @@ impl Drop for avifIOWrapper {
+ }
+ 
+ impl crate::decoder::IO for avifIOWrapper {
+-    #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
++    #[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))]
+     fn read(&mut self, offset: u64, size: usize) -> AvifResult<&[u8]> {
+         // SAFETY: Calling into a C function.
+         let res = unsafe {
+diff --git a/third_party/crabbyavif/src/src/lib.rs b/third_party/crabbyavif/src/src/lib.rs
+index 90fa41188905a8aaf7b74594937b3a335ceed18d..a05f0a5e8b6cbffbf6e1a0f5fefc8a1e1480273f 100644
+--- a/third_party/crabbyavif/src/src/lib.rs
++++ b/third_party/crabbyavif/src/src/lib.rs
+@@ -13,7 +13,7 @@
+ // limitations under the License.
+ 
+ #![deny(unsafe_op_in_unsafe_fn)]
+-#![cfg_attr(feature = "disable_cfi", feature(sanitize))]
++#![cfg_attr(feature = "disable_cfi", feature(no_sanitize))]
+ 
+ #[macro_use]
+ mod internal_utils;
+diff --git a/third_party/crabbyavif/src/src/reformat/libyuv.rs b/third_party/crabbyavif/src/src/reformat/libyuv.rs
+index 9df874ccf7b6a943c6dcebe495ce15b7a7e9cd66..3f68c16f2b2e8e22b3edfd0dcedbb95fe34887f9 100644
+--- a/third_party/crabbyavif/src/src/reformat/libyuv.rs
++++ b/third_party/crabbyavif/src/src/reformat/libyuv.rs
+@@ -372,7 +372,7 @@ fn find_conversion_function(
+ // Returns Ok(Some(false)) if only YUV was converted and alpha
+ // needs to be imported separately.
+ // Returns Ok(None) if the conversion is not implemented.
+-#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))]
+ pub(crate) fn yuv_to_rgb(image: &image::Image, rgb: &mut rgb::Image) -> AvifResult<Option<bool>> {
+     if (rgb.depth != 8 && rgb.depth != 10) || !image.depth_valid() {
+         return Ok(None); // Not implemented.
+@@ -833,7 +833,7 @@ fn rgb_to_yuv_conversion_function(
+     }
+ }
+ 
+-#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))]
+ pub(crate) fn rgb_to_yuv(rgb: &rgb::Image, image: &mut image::Image) -> AvifResult<Option<()>> {
+     let conversion_function = match rgb_to_yuv_conversion_function(rgb, image) {
+         Some(conversion_function) => conversion_function,
diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 1ff0a0b50920..ce4c0c84701f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "144.0";
+  version = "144.0.2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ach/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ach/firefox-144.0.2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "be55ffa2ee01d8facb5c06298a8509b637558af419e62d3512ccafae2dfdacd5";
+      sha256 = "7e45794db35ddf1413c56e095d0d49a41c4edf458c3173f15525aa6d93ffa220";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/af/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/af/firefox-144.0.2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "9d0f64458d6620894a40a5129688fea3a7acd0f9ec609b7de03deea6f01ec507";
+      sha256 = "550f1996154e0f56c674f83c384b312f99aea4a517be1c0741a1afa6e4089b42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/an/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/an/firefox-144.0.2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "e2c15a01d6a4a7f24d2c4c7ff084ab3063de9865fd23767c85fb23a0e5e84f7d";
+      sha256 = "ea0199428b3ee2ca105d58741746b434dfbc1930b58e52c4106d193677f2d536";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ar/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ar/firefox-144.0.2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "4f9f8d1e1f44b6db46bb7b82cda80f236b60fae1c907b666fd43d4f526423ec5";
+      sha256 = "cd666dea75d9cfa9feb2d477e69435703347552ca943dd143d6e4957fb1becb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ast/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ast/firefox-144.0.2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "3691a010fb0976f8cd033f4a928fc188cd0ff2b41645d687a6dee8c473042068";
+      sha256 = "dc055903b566aef91ddd6908b93d46231795f7604ae74bc89b17083ef91c72e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/az/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/az/firefox-144.0.2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "269a4a41b3fa28e371ec9954a2e6f2bd3e667d22fc921fcc9e238f0e7805dfe9";
+      sha256 = "4fa4ed8d2bb0734ab3d562d0784a4c8e1d049b381361598bbc8cb50bfb4c36bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/be/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/be/firefox-144.0.2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "7675eb7951d133b9c4a92670658999f18f7a0e66b8d7810f37eeeb8650511bed";
+      sha256 = "b56cb8e5d82ec4ded34448177044e3244ee8fa1c3b29f5671a263e56aae95223";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/bg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/bg/firefox-144.0.2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9d7201beacc0d804d0fad6e6b4790b52e75f1ac2ea1d31a966e9c4d203323fb6";
+      sha256 = "8e94d5ebb9ad9e29abd2ee1ec263225fdc72b51beccc61686431ea7a570093c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/bn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/bn/firefox-144.0.2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "39bf88cf6ec78bfb552259d2292ddf47c455ff3992e16beda0d4ebce976a587b";
+      sha256 = "94aad140d24f47b16272ddf780d68e214dd95ed865e4bdf16808e07773a4a728";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/br/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/br/firefox-144.0.2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "1962638b0523fa5250d1c1eeb381b142fadb5494e56cb69035342cc0cfdfe655";
+      sha256 = "1a95629d4603e2fe2486cce81d6be7df8de8e451cc95a3333e795d4ef4853378";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/bs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/bs/firefox-144.0.2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "0bdb284b63005e93b3a962d6bf92fdd56c7dc5dddb625d14dce9aae0428ac00f";
+      sha256 = "8c1882f2fddc4dd6cdd9ed51e0b594cd7fb6a87196e70b28c1be1e253e43a62a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ca-valencia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ca-valencia/firefox-144.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "bbb6a772df7e18798741a8f23c0f9a73f4e40a6c791e30bd07632dd9c36219ee";
+      sha256 = "a26c623ce88560f6e5d2375fa06550369d8234c3f4d02bf9e266759d279068fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ca/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ca/firefox-144.0.2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6b61816b7737f6568ec067875c80a6c24292d7651e69b131b0645da099eb0bf6";
+      sha256 = "636edf0457323271f043ad473d05613f9ad5bb759ecf888ffff1cae5a0522fdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/cak/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/cak/firefox-144.0.2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "f8bde5a2c4cc3ca1c38352fcc138bc9bc4a537190cbb807a391cbb3d90b708c0";
+      sha256 = "59367101a287b02b802610b932456258cabe6553e61054d8549ea0265b4d029a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/cs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/cs/firefox-144.0.2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "14f0bf903d30587102898e5098ea7a8b3bfa1d94ac5f645862dc37258fd50041";
+      sha256 = "4ffa115b5fc7b6f15398d11377f92857023b0b8fa09c06ff3795cf164f3e8c34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/cy/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/cy/firefox-144.0.2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "22d5c7adfee4b01e1a460364b09dfcdaee2e2fb24a8d87c25774aa585e3ebd49";
+      sha256 = "27387bc01562958a6eb2e38ead13aa3a1d252b5e3c1c7c67a707170c26c09096";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/da/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/da/firefox-144.0.2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "382249f9252a9bed2ccab9a5e77da9353c827b3b2cd568838b1460ef1e743d3e";
+      sha256 = "6a1c63862d99822655804ee9a0879d0c8aabf735ed4a1ebe70662325c1cbec6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/de/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/de/firefox-144.0.2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "77da66e91a5e7247dcbd35f4e45034aa5ea5b08ede1652edbc2e9fe99ee7ce6b";
+      sha256 = "ba9c3a60300e3f29f36338ceb786ebb7d2ee1770bc42c2a5232f7e4565c38f00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/dsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/dsb/firefox-144.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "b46f781e1912e0cc686abaa6765a73c406ef4a4092fae821266f26a7614f60b1";
+      sha256 = "e4e5bf0a216ec5ce0783314010497ecd7c9dd5aa633ae6dfdf4ebc6b33fee327";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/el/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/el/firefox-144.0.2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "d9d8a306dc1b2ab4f1345a4409f83ccf14fe57b7b115f7672833325aa09d1bff";
+      sha256 = "e7f876dda346ee86eecd119035d175f8c0f08c3218b0e74cd525e02efcb41d85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/en-CA/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/en-CA/firefox-144.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "b9b5a7222913e72e754d6adf67f9dcdda7e54011c10c33c3909aae5d02269b5e";
+      sha256 = "1d342ffd6b2fa8ba7dcd5f44b530cc6bf8b844c56f1a40eae8f04dc15464b9c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/en-GB/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/en-GB/firefox-144.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "078ab7c094bd6829949cfb4cc3a7b26744383daf41a0212df064bca28cb9ff42";
+      sha256 = "f9045b1748fec6f315a1fb915a6a396ad39720980beeed9f3042b9204a7393bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/en-US/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/en-US/firefox-144.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c66a48222ff67d51560240d321895c6926c9b3af345cbf688ced8517781d88d1";
+      sha256 = "19cada8e7b6f4f00c450411578b4c241d2d50a0a566a1cbe8181fa950b6c0ad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/eo/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/eo/firefox-144.0.2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "28b6afa9848d4950f9652f07fec046e48c49e303be950926b5a9ebeef7a3f21c";
+      sha256 = "77e8fef411b7f6d62d17c6767ef2a24fb29bec7d7dea8cb6961441f96be9e7d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-AR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-AR/firefox-144.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "9080e57c1cdc44f390d332f5a96fc925d253cb12acce2f88ff8dcd565d2be705";
+      sha256 = "d34a7501644715db101c91da6a82ce2a44f33acf6b26cf425fc4939cd0471f9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-CL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-CL/firefox-144.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "cb385809d728a027ea040a336badd6be2e7dc5ebba81ea21f824cb51f33c853f";
+      sha256 = "e022d3542480bc182c610164974b1f5f7e0a2e65d49fc12e7fab2081ecf89c6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-ES/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-ES/firefox-144.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "a8be90aab2980be453fff05a6a2f4ed96feb5e204f59435794c44bdec16856ee";
+      sha256 = "4dc4c0126139e6ea1a0b3106e8d48e588c6686af553939897eed7456ce02ff79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-MX/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-MX/firefox-144.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "f4d7e7cf40726fe8254e4ecd2115fafee017e0f12a68d43b1e221b7d52d50252";
+      sha256 = "5df3a223ccc615d199d675888df57062245c9da4838f17f0fa5c33a5068a7eb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/et/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/et/firefox-144.0.2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "f667da54acaab66b245d24f294e0d71cf7655b11fe16f330dfece746d4ff2ed9";
+      sha256 = "6cfdb806d7b9f2340d70f03f9aeecd0ca0bf7d80ff0ab3cda49daf163d0f887e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/eu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/eu/firefox-144.0.2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "28fb4a5dd0079213fe821bf5dfea60dbcb4111a890c5243de987735aed10fc8c";
+      sha256 = "a40c96c721d6df8cc0eb64d0b416ef0f671ba764a3f3b722e19f943ebd4acf81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fa/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fa/firefox-144.0.2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "63110ed4374666edaf20034019c767fb6d5e0c1c1b363138e5aa9d5f4ae467d8";
+      sha256 = "131e402bacecc004a6a1315c7f04979b0dd1cc9e9f42f0daa0ef69d0341a3d56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ff/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ff/firefox-144.0.2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "dff605e5b4ba7a26930eb1ee2fc7c7cf60034589b08a0412bcafb7a9a541daaa";
+      sha256 = "73ba6eeea0b27cfe195bfa6dc1d8240385b71900c5615494ecb3f2ad975a5fd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fi/firefox-144.0.2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "46081d738543c68f4db60b9ad960f0989e24006b78caeeec1adaa49870d03027";
+      sha256 = "c04e53e58435bfd68aba287c554c552f75e43d7477c1715427161135e8177b33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fr/firefox-144.0.2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "68b095185faaabd71061b64fd65d09641fabe3df32da47ee25f6593792adde84";
+      sha256 = "db6a56735af0fe0a63b86fcbb83dd4e1b6db9381f74327105cd0f3c0e76eb2a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fur/firefox-144.0.2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "efd71bc4d8c3840ac3721d0f2f76df1ea3bacfb823cf5d3a63fb6857b51a309b";
+      sha256 = "b432475a2672f18b0ba8f5c603118f0ed4f2c66c98f811219e6bf7f4fa7bf78d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fy-NL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fy-NL/firefox-144.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "705627dfe8a06e0ef42ab61d4b34e1747e924e7028aa4261ad90d3fafa6f1b48";
+      sha256 = "bfc2faf0abe3ed44defea419823b08d972363a46db2802a38f609a7e19427596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ga-IE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ga-IE/firefox-144.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "9dd4de9d0a2cc21ea4af728583609fd11ac5d4e7ca6a9b9dcd82831fa51f56eb";
+      sha256 = "ec5d53eb8adbdc9956d5f70bb4e5592bfc89dece55f1f0a1ce88aaf0649a0fa7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gd/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gd/firefox-144.0.2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "9ed22b88b9f1099805b2936cbef5f73961e117753844c8d91ed4fa11acba0f70";
+      sha256 = "7c300672d9adeacdc56c39c0a153fe4eaa181b41d32ef724affa021dd42b2a55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gl/firefox-144.0.2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "b7489a9fbe0b96dc8ffbe5368dadb0a68c14d2fad2f070c41fdcbdda61014ca8";
+      sha256 = "c67d19f9cabe8b99e45bf40c5def74b8a8ad7bd35ac37d4c3bd2c2bebc30b906";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gn/firefox-144.0.2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "98d4d62ac3d879cc550baf7d2418953d43fa66dd5709c8e94cbf402e9e51076d";
+      sha256 = "3b4eb76cf6aae9457c9607965fbab83978e452e1423886e74f5ba37a23a8553b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gu-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gu-IN/firefox-144.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "fe7ff566f458a2facd83e4cf89937ad8a07f1f05e3b24da2bedb7aa0fa20b1d2";
+      sha256 = "5aaf7873735a9680404246583ccaec89a6bb10203a6348b9a45d85addf7bb426";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/he/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/he/firefox-144.0.2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9f214ce4854b4e2bfc3e3dc677a5ce260a3a28b6f35da0a84f6b3e1f97ffc86d";
+      sha256 = "0ea295cdab9db2c5cdd1b4130eeca030674702d7beb8337a77793e637e9e6730";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hi-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hi-IN/firefox-144.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "f0e4f1e738df3945047a988f4e58fdd18e5bcc0a312d9aa39c2e0cc70a8f12f7";
+      sha256 = "de17f4171bb06a809c88e847180fec1f9623faeb08d3446726c535a10cbf21c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hr/firefox-144.0.2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "0a1eb62bc52711f13b86c09a6d03a9b27fab1a6230a921b141a64134d25c52c4";
+      sha256 = "dcb72bcceecd709e7d108ae7add24d7b6778d51d5b2c6fcb6626c9be1db71122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hsb/firefox-144.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "499361c7665affecf9ab5f15708e6c7e14e7f8bec19d3f4b604e5953fca67ad7";
+      sha256 = "626720c530f780f76a4b85bfcda0efc95111ddddecfe9a6c9b51e9069f303f86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hu/firefox-144.0.2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "921000c92a187c897c433244b1c1f7896c529007374d26aaa18b8b653fcabc6c";
+      sha256 = "3421a30ffa161a1b53226c71b840261c929740faa9afefc10257615ddce82856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hy-AM/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hy-AM/firefox-144.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1cbaae8f2e2838aa39dedd1fa4b9be1ebe571139c7870ebd131263b54f4935b7";
+      sha256 = "b91cf0cecde24b0df85e08fd4a16da8807a0b17b22617b58e694f44c5ceb5e99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ia/firefox-144.0.2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "67f88d2dbd6691e11bdabef43253386a0bc9d744146c9bc65f34c19fdfa32371";
+      sha256 = "be3692e5e768314323b5fb91d1580b4393518cca11fa0ab3ce955cae846bc216";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/id/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/id/firefox-144.0.2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "32728ddd685a352880518cbc3b34e3f693336a89e205882d971d6f210acd9fdf";
+      sha256 = "f3f0777d5dc18accbe01b0482655d99fbacdb06dfc950efc9e270b8aa965455a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/is/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/is/firefox-144.0.2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8853c2a4bda3b86c9aa703c4db6a3986b028a87807b67b9eb8e49690df9b54dc";
+      sha256 = "a7ce692c905ae4f21851ee87cf47629d6f5dac9815570fb2ad66b663bde614fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/it/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/it/firefox-144.0.2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ead0547000403fca1cd952c5e93d1270567149b1aa6ab09a37d0af8c57430609";
+      sha256 = "5af46b899c60155352918163234e2b9f7c350d33f0286e1f66d4875b8fc1034e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ja/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ja/firefox-144.0.2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "e3cedd5d28e9e6492ad9787254e9f43d0609088d44fdd6f7a85d0c35f5629e30";
+      sha256 = "08a924da54992e394f2593cca82ae2fff78f0ee8bc7924331b4405534f155078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ka/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ka/firefox-144.0.2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c6924bb295a86c42d0bd423018a80ab48c475bac112746b64de57214887fa05b";
+      sha256 = "319f77233c56ac7759c136b12b074e8203d4ce62a64348cb57b8655959b3f874";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/kab/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/kab/firefox-144.0.2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "b2187c0915d0551ed4870a5d3696061a4f42e2051d4ae6ac97ce0dfe77b27702";
+      sha256 = "2fbab95d7d83b506ed62a157f8260db7177fb1e19906a6b44b36d4a35420fae0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/kk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/kk/firefox-144.0.2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "155916174558b7e122ff6d0b0380000d7595a73f64c77bf8ed9ae4354573af64";
+      sha256 = "af9049f19742948d707f0f3b82587307bda66f051b03370d78afa3aceeda131b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/km/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/km/firefox-144.0.2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "edf1395cd31e8bfa3ffb96193f20f2691d3dc87cccb74bfb6d2f1e164234067e";
+      sha256 = "2e424fffca692783a50ba570edb30c9e26bd8917427145e741799d9eeedf0a42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/kn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/kn/firefox-144.0.2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "925e184ae4c6406d4159afe3ec0e66b7ea79423162a83bd490c70d0be72a0ae8";
+      sha256 = "3636c150313f13a04a4fe5032385fa98afb6aa7704edabd8acc6882082bb0bdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ko/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ko/firefox-144.0.2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "f1c3d043c6ccabaa89329e3946430446166f1ebe6879cec4ce3e28e234aef1e0";
+      sha256 = "dcda0089ecc7f122f295b4935fff81529c80109610eac2badbbac11e4bbc5317";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/lij/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/lij/firefox-144.0.2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "39314fa98ea8063c7cee7f93aa0534d0e1e6b9e6a67b5893c05d6f7f32d9230e";
+      sha256 = "6c4db883c3deaffa774c0993d6db3dded3366f01c9f0124ee0837b7104ae19ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/lt/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/lt/firefox-144.0.2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "30b0a7b031d73546a2f735d6fc26abeaae89cd0d4f6de7f7b64cff4358454f9d";
+      sha256 = "9d2b558ab824ab2dea88b11acba5990f2e8a0fcae2daab27728d8f9555145404";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/lv/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/lv/firefox-144.0.2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "d7e6fbea3f4b3a152aec7e0a8f3796a3f61afccb599d8bbb04c71b22a7d484ee";
+      sha256 = "1e77f42c42200645c2a4e4f4ac21945caaa922e8f52b51f598392dfdf45a02f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/mk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/mk/firefox-144.0.2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "5f4d7fc88ab4e2d5c55ae65231535c2cbf6bec831071278e97f29dbb7d57acf9";
+      sha256 = "3ec9a4456c39c0476a586c1f6c1ad9ec3a8a44f53e872f9497ab5908228eafed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/mr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/mr/firefox-144.0.2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "003a9e0aeaf7de5a1d053c75e6d81bd4f082cb399037ec0a127a5333c1c70327";
+      sha256 = "a02e1653a141f5d47ba366d067cf982e6a6e775d3df426625fb79ef9f74cbf40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ms/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ms/firefox-144.0.2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f9999a7503047a6b6de2f06fd6fd88d3f2c02fde643406018bdd80da5b1f8d5f";
+      sha256 = "7414325720e6bf0ea71ce8287f003d21ef8d727130fea95e33427e5248c9c113";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/my/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/my/firefox-144.0.2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "b3f8cce1ab39a2d38bd82c5b4969fb4324697057545acdacdfc15aa11b379051";
+      sha256 = "6567e01178377dcd4b99d8436ed91d3a3b981ec807f6e837eb8f3492f1bb2912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/nb-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/nb-NO/firefox-144.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "29273a950b53df2f68f09ebb64c99f827e82de93b9f30fe9e9cffc0deb9e721c";
+      sha256 = "a808557c7c43dadbd8b47544d6d2fdc6cafe00f6cdceab81e1b3389d779ab07b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ne-NP/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ne-NP/firefox-144.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "77bbbcaabd8173f656d00cecf52369dfd1c5a0c6e8531ef7966bf24bf1cc816a";
+      sha256 = "b462561412d9a976b5c97ec6f68cae7a2cd5a4489ed542288cb6525c109c1833";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/nl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/nl/firefox-144.0.2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "7c2855d50e7851a9919b3ad4f2a18ace6a656083deb8fd190582fa8e294e73cd";
+      sha256 = "40e56ae3e7ab86b392c902cda465f8de50ae26f4060c2517faa6c715690037d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/nn-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/nn-NO/firefox-144.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "60e73e8192cc0f615e8b701559d25bcfd3b359c276bbcc9f8827921155f916de";
+      sha256 = "2ce7c2375cfc076cf9434c671eb6d7e9231f6e2100c395ecc7ab0169e249cb84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/oc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/oc/firefox-144.0.2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "7ceecbd1b31c204bf3d7be2d17f4ad7591b31aa792815c3d614417e7278fc491";
+      sha256 = "2031a489accc3b3e0fe173d55bbb0894b30e566143357d2fbf5a5796f8d62e55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pa-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pa-IN/firefox-144.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c9285d410de6da406f12c3ec4fc9a813fde6f148508c9e49d6c5b6082378c268";
+      sha256 = "893bc03dfc5c0373051b3730c986cf3a6445a5bdb63ea821e9c69120eaa336aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pl/firefox-144.0.2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "3ea776a9173e438aab5711290389f43412a754fddef9fd43941b3603664b8bbd";
+      sha256 = "6610c954f80923fc5880c6501ecb5753612d2cf65f7ddf6bbc99aa8fa4006a4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pt-BR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pt-BR/firefox-144.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "876f23fa5d649e3a9ff55570cf77549c9031e49da42a26bfbd4267bac9ad99a5";
+      sha256 = "e8a65ec70a395527e47e4c758140bffac7ead085503c41685fd69f4c3e0e01b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pt-PT/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pt-PT/firefox-144.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "eb4a39968d70d0a97732b1563854f97a8bc896f64dfab3999177d3498fed2cbd";
+      sha256 = "4752f5cd1b731b541f9756ee4b13f519aec6f7246212c4ad612563b3c6b6bf16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/rm/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/rm/firefox-144.0.2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "a7538f119ea6a7f11b8e3ba8ea9a4afa6016f0155858984e039af1625ff7e7dd";
+      sha256 = "84d896edd16b19802e1215cf1504d4d83734cd68f545a3bbd261d9b1d0705a41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ro/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ro/firefox-144.0.2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "c368b70a2ca5ca40bcb1cdb3cf53b4ec677a702d330ec12719db2d968d91f371";
+      sha256 = "80f072a8b791fc4a2341ebeb0c93235e384cbbf8dad17d0420297eaa1dc5bd45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ru/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ru/firefox-144.0.2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "8ca463714672186ee5de9723209a111c20a00fde428a686179c296986cdbfbf6";
+      sha256 = "cc51ac11860edda1ec99aace92df84b6e5560afeb0bf8048d2091f2c5635011d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sat/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sat/firefox-144.0.2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "dd57205808104242491060041ddca045e0226e67cbb3f94a8fd34e108bb0177f";
+      sha256 = "c4d47f92537e48b03cdc530b20400d29c831f7f2da5720a5f7ef7126c1f83e7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sc/firefox-144.0.2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "65149571f5a37f4c99d61ff74a40c4c23b82ac7e0d9b41557ecaf6bd3aaddac8";
+      sha256 = "7a01d54992be2184b5d3fb94e70666d2482258eb38a600889a504a1ed90467ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sco/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sco/firefox-144.0.2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "9a4b067092fd3373fbdb47bc787b613c4cec9a0198af32348b8e8be79d901043";
+      sha256 = "247d8489f7214326d20aa94aa9b762fea29022662d73f1f878d8f0a1ee828226";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/si/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/si/firefox-144.0.2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "a379ab8b6157ef55bdea77a6e20e09dd6ef3387898102b9a3dad0a0715cec286";
+      sha256 = "4d4e4ed53d9115db40359eca310835eaf52f1965f3c240f29fd6493f7a3f5854";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sk/firefox-144.0.2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "2aa0159f9479cdf873839672f79ca087f267b7cd26d37d055be0931a7223aea2";
+      sha256 = "c2d9371e56ccbbcc1e6bd5b19d2beaa1c2c29373a158accbbb273b713a09a985";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/skr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/skr/firefox-144.0.2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "15a6ef4c520d39fe1ab1356525f677298825b80fe15e0b6e4a0b615ff4acd291";
+      sha256 = "95d178307507d0b64e7a6aa3a69a7237489abdc55da934453d7b1dad4102922d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sl/firefox-144.0.2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "3e5a7acdacd9198911f6335df3e54550db52130dcc85ab97ce6be1d76e18d0af";
+      sha256 = "2b8804ce516065930145bf3c90a6b6fe1e780bc5e89b386bc7ea044aeb6f1ef4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/son/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/son/firefox-144.0.2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "c7086156bb168f5e91cf499ab0525195d311b317a76266d6024be18f3c9ebbf5";
+      sha256 = "751edd86d6f5202947d89950322cd0cc19b256ed38847f0da6687cb3f4105a69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sq/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sq/firefox-144.0.2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "f72554ea9cb28b75f74a5b86e48f3d2f7307b1598e8e3e594a45638d95c66c45";
+      sha256 = "ea96f34dbc754b77fe49cd6672c129efac397979e8f010178bf7b146ba9ab9fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sr/firefox-144.0.2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d28a8599d3a8c34b02a79a2dc70df49aebec0fd9a3fd0731fab05f0d7335edc8";
+      sha256 = "d3500b8094c20f3473f5f579a6a3816c6ef9e02a8b1b9e45071d3d883a1c9f86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sv-SE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sv-SE/firefox-144.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "f42e5a86ddd9ae45537fcf025cad9c55fece462c976e2e9596ac2e21a66893ed";
+      sha256 = "29ef15a65eec545488c89c52e5bc0f049455fef00f2b5ad40021f63f5ce8f07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/szl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/szl/firefox-144.0.2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "25d4850f4716b19645bb1793c37ff8daf377a648acde9e1743738c75a12e2b15";
+      sha256 = "7b82227c5acf5ecc35140763a0ae7f1e46c35e489be9dd1ee758a59b2ffdcf8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ta/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ta/firefox-144.0.2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "560a720659530e14a0945f74aa70d25bd6a84d28661f821085d477687189c4ec";
+      sha256 = "0b792958ab94f2bf0f34ad210878c0ece850bbe1e5ec7e509bc038670fa0bcdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/te/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/te/firefox-144.0.2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "42d53e201651a3e0ad7892eda166a220cafb582426ee5adad5f037c0a9553397";
+      sha256 = "bed6a5dbec4b1b1575521016e844a7184b27228a03344d3d478873e7429830ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/tg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/tg/firefox-144.0.2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "d6b3249784c1c5026d1031bfdeaab9380fbd96682b40dfab6299e9f6e79f78c4";
+      sha256 = "7299c4b3d3195849539b6bcbf75d72ac60020012d50c8cbd70f4d9145ecb3a76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/th/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/th/firefox-144.0.2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "794fb0c1db204bbbdc6437a3334804be1c7e7fa09da06a0de29f987dcb5724ea";
+      sha256 = "307b8a89aab146adc47be50e0f6edbbe11c0810d086a71d4c595c008f6a59bd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/tl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/tl/firefox-144.0.2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "1851391956be259f3acd5a20cb32e6098a589391562389c7286c81c8600095d3";
+      sha256 = "7c1af9bda50ed54b78478907031daf86bb230fd859d57a315ddf3f6363661e4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/tr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/tr/firefox-144.0.2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "9d9a247455b7b4206f73288d1cfd70f7139f24c10c8edbb53ef3ec86850c11f2";
+      sha256 = "2f917f19f2ad6700faad72db136016b924e7ada721fbd5bef874f7bb2cd6d67d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/trs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/trs/firefox-144.0.2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "7973f887e3c421e597072fec24c8cf15f5fb2be494e57cac2314bb3a57e05b17";
+      sha256 = "e98313cf291ab1faf0163999d5f9dbf3d100c98592b6e6a1f200c848ef0c3ac0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/uk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/uk/firefox-144.0.2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "cde879b9c5fa0759940604503fe3f285e6dc2ba3c5f80f98405a4e5a01dc4609";
+      sha256 = "4e0924cead5c2945b06668137bc185f09f52ff53c6b91fc2c73b355dbd2b6ae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ur/firefox-144.0.2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "29e66f36b763d2aa5bb29e695419f498ddfc627c8be8e351a149d60725ee2e27";
+      sha256 = "c850b863e2a39d396f7ed9192f6638ada1f3156159bb3d3eb4360910b6480f66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/uz/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/uz/firefox-144.0.2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "0efddad50b0a075cee00faf6e68ca68dccec1d5fa4e2e0a8a383e600f294f877";
+      sha256 = "281d0f78c7c2d56d053038d8dccdabfb1735aa1192b97344f20449bc24324ebb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/vi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/vi/firefox-144.0.2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "375860037ce103a53f948b013855fa9c6f77877a7a95f8a5ba1d7941e4dd167e";
+      sha256 = "274b5e1c392a627f5af0dfefe08c201a5785612b4a95d63ecb15131166f28a05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/xh/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/xh/firefox-144.0.2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "dc91aaad44ecb49b84e6a03c47e1eedc8672f2a4423aee4d2aedf199194e614f";
+      sha256 = "b8604821fbcd4d4f2017a9d52beea18053273e3ce301a6d28499f6e92ba9cc97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/zh-CN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/zh-CN/firefox-144.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "2ae803b84c714a9ee7bd000833653033d511cfd16c3baa86b786912d753bb81c";
+      sha256 = "181038eaf941ae282e3b62de2dd3da98612592993331ab9c84e2e0520da3108c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/zh-TW/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/zh-TW/firefox-144.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "48ecde05a52f0750a7d72b86f3c653f28a189fa5ae682fab955c0b97b2d3dfa9";
+      sha256 = "20736e75d4099a2899660cb347381ba442088bf355aedbaccf4a74e1ee6631e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ach/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ach/firefox-144.0.2.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "9197a7176c36f47e51ec761292327489b1df0281a9ea1018ffb841e0166e81d7";
+      sha256 = "7b39806600029498d6f28c6ac5f371625838819e05e8bbfe3f3daa72eb186d82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/af/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/af/firefox-144.0.2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "ff77d967df1a159c686442e98d34b9d3c8c2780843c7ea174dab6286d56ae0c3";
+      sha256 = "6829e00e5a55f1e5d8013f210a9932de2d4c75d600de816eb35379cd13f60dd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/an/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/an/firefox-144.0.2.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "4f078a802cfabc1583834e55b2f9f84ff318a112a2371f4aacdc2e7416eb43cf";
+      sha256 = "a611d5bfc8805ec751a8dc88dc2f107dc9716bcac9ccc6f3e2cf1b0a95151b71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ar/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ar/firefox-144.0.2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "1e603f99b854c646eb75fd9c0375f8746c4b216dd806d3a649dd3bce9e363afe";
+      sha256 = "605041c0962a533a7ed7ecd3712c93f4725f92eb469e45348a2e7bbe95c7206a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ast/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ast/firefox-144.0.2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "881c65fefc0c275e4554bc1d33027559bf6746bff00c39a78a9f5c6a1050e8ae";
+      sha256 = "5f6192dcc095a99aa1f3314184b14e7ca20ebf40430d786948870c376fab0f57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/az/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/az/firefox-144.0.2.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "1a991d0150176decfded5dfb11a66742c74c62c4526d6941a77382c411ef9e9c";
+      sha256 = "48279f92ef20b353b66bbd19ab612cdd48736983949e2f5e913189443b7fcec5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/be/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/be/firefox-144.0.2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "ee9ed7f542f7b5db38c0e972c96e9ba7ffc9a818c0874c740da4856958becf21";
+      sha256 = "ac0d61c4c77dc9a874c2e2c252e20c2c8258b4cd66ac032a3c47f777745eac13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/bg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/bg/firefox-144.0.2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "e2d5a878424b73330969ffe900ed20b6e5a1e1db549b2a00b8f3002ce712d702";
+      sha256 = "161a820d3e22e87c0ad4890a1ca81298af26fe66e72f1860de8428d3b8918a9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/bn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/bn/firefox-144.0.2.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "a498d514a42cc61b6f2aa8ccfd19fa7763e382390dfb65f3e5d4c5c6f51e8ee9";
+      sha256 = "7e9ab5597134ee92bb126363918a249d6bcd83b728571d97ee973a60c3e82d69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/br/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/br/firefox-144.0.2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "a3a59ac4f2b704e155b32f33f3f4a7131902ed28b189e248750529a95ffa4121";
+      sha256 = "f57b8f13b6715b0ec2e9b36f5f96fc4e8ab098c8e206c8792d644644bc12353e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/bs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/bs/firefox-144.0.2.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "bd62218ae38347200a903bd8cf67fd0b8616749b1f6b78e487c5cb005af97578";
+      sha256 = "102117546666381824c38718f625f8ff202f9c25bdb2ce3de52dc1bdcd78e159";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ca-valencia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ca-valencia/firefox-144.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "f6671614653f15728b87caac4614b61f0548fca79698e9b6d34a018b9307db8a";
+      sha256 = "32dab2c72f8344db1d724e5c70b98cb00ed4d344605eb439db5a6df27cb44040";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ca/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ca/firefox-144.0.2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "44253b8a49a5ab7899b0361a1b9448d780d2a3cd6d85de36e25ae620a36499df";
+      sha256 = "66d955990cc8f88b6d4c248854e2800a6d584f1a8c5e5625720a6dcd1f4c41e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/cak/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/cak/firefox-144.0.2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "a57c69066d604ef27e75a3333cd4ddbc30748103bd4d14e74904cb91c0541fa7";
+      sha256 = "4c79ee03e898a4b23a168164003a0be88d023e63bea5d1f387b17dd5eaf86398";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/cs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/cs/firefox-144.0.2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "381f72b8062de44a11ffcf6a100b608c3bc948a29163a291ae9e36bee31d1e1b";
+      sha256 = "71510f758802d552d8cbd8df29464b0f3c54d409970b3788902f2dcd37ffbb01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/cy/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/cy/firefox-144.0.2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "cb453857270076f2addf46036b3fb742e9207694165e0c64fbf00009f381b1e7";
+      sha256 = "1ca7e8f48a1c62c2ab70b8b8b322d5bf99068bc7da5f4183ba4d8be51a21d977";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/da/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/da/firefox-144.0.2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "8614bba0a5dd151e10c237201599864eeb09a24e88acdd996602753c94465dae";
+      sha256 = "fbd24bac75bf1fe5ea8405b154a316d0517ccf7f9ebc2749bed81e67479ab6cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/de/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/de/firefox-144.0.2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "ff4461332696ccf4c21f264ff3352da51dd5bfe77a00c30ace2773d13a87c837";
+      sha256 = "cb4e0b1808a53f05b5b25b03373e24c5bae2223c37064408defbb1961e2f6999";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/dsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/dsb/firefox-144.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "1660b74dfc9535530f1b1a88543546188314e459486eeee586adf457e457d9fa";
+      sha256 = "cae50c1efc9fb41482cfb501b2983481127096d4a0b73bd3f9dbb3bd55d2dd35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/el/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/el/firefox-144.0.2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "66009a2d56838b7aa6913bf9a99f6e80c9c39fa09623c9fcc0c0469c1d65b5d8";
+      sha256 = "eb26bbb640efcd9495baa3ebf49cd138e7ca454b9a11802546f7124fb594e8a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/en-CA/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/en-CA/firefox-144.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "dd8a70bbc27b2c5a3580b1e5dc52dd31e90b101e3729a2fdd10436955f87ff92";
+      sha256 = "e750294777493004f572d9071112fb16ab29ee053ee4240bd7daabc79ec307fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/en-GB/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/en-GB/firefox-144.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "18009a2a7b7b250955f02a4f605d1cc6deaeff0420dd3be368a48f87a1817da3";
+      sha256 = "16309d074480b266aa515e2d85c315cd75700a22b2baadf9d43b5f161ec6fced";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/en-US/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/en-US/firefox-144.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "46ffbaf8ab3b68ae7ef3feaffe2339782ecbbd521d08adce61e712cf63589563";
+      sha256 = "ca5e152d9413163f1c4e1a2f674a72643a22c12b1e167e5a5c93166ed0612aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/eo/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/eo/firefox-144.0.2.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "b9d679c4432dfb1fbceb993084126c17d283ebc3e4b87bacf9b18e6a26f4d4ce";
+      sha256 = "ffefbbc63df45c978e7e44f33b0bef7e2439171cd4ac8e6217588f673df8e354";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-AR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-AR/firefox-144.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "92ab4b67073e61964fa5a8351b1bc4730f8104d21f4160baf65e01c81a10fb0f";
+      sha256 = "e8a5cd8e9377a1f70c6396ead4c7f2b3a45367259a2c7c21880534f27552474b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-CL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-CL/firefox-144.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "ac1f8e08550d6d0c0195a2e7375797abddc62fa4cbf0ceb31601dcaf42c453af";
+      sha256 = "ac2f9b548be3756da028d0697ec2999e10fe02d49a57867d0b4e2934a36319a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-ES/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-ES/firefox-144.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "ccfd4ea5a33eeed4adbed3eba6b0375020b5cedd0a8d80cf3d9e6267da4c78be";
+      sha256 = "f0bcb6e96ae74eaf804fa0913798ce665fb5f6b8a4d6d172305c16af375e4ef8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-MX/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-MX/firefox-144.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "6ac94047e4b12f6baa91e6adab71abff4630a12e59f433d2e3b1acc62f9ee589";
+      sha256 = "a480b132546a912fb7821455b24151a51a9722a55905bffac397b3fabf5c177e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/et/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/et/firefox-144.0.2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "dbf04452d283423bf57fbb4009b4650ef058e14e403f3b49269ac385bea2719f";
+      sha256 = "063fbbaa120db7f99547f2be78ae55fc1ee3413c66069a627e60db3b68eb9e7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/eu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/eu/firefox-144.0.2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "b11ab98d0503136482e32d77dd98bfd496188c234576c32df399c8f715a39f61";
+      sha256 = "cee23b86c63280932182228774e0a3340580f6ac9a161ef31ff248401cafbd33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fa/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fa/firefox-144.0.2.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "b1c6362ce81e8790cc3113a94c4ba8e3eb29c24e6abef807ed723c7d211f3fe9";
+      sha256 = "88fafbaa3d9c57399ad62b7e5e914ea468c7d952d10c7039fdcbc28e42380645";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ff/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ff/firefox-144.0.2.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "15b5f1771644b750063c020925f01230a57361a9d3825329eb4df2743394b6eb";
+      sha256 = "53e2869a5595bf5931161681078e46f277d354c6f99263c1073b223fa56df195";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fi/firefox-144.0.2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "4050a4d898787fac35f78c3539253d036a62340b0ee0785befa3da256c826ba3";
+      sha256 = "020d9e13002b6f6294219320d3fa20f4b71bebc46e0aa70890da7f6fb77ab58e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fr/firefox-144.0.2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "a6f8b17a3ee1800eec433e645c055a08d9dd9dd5c646d21ce6ecc7d73efb7e5c";
+      sha256 = "8cc2b5cb74929faa90c3f311159622d0734d936c6b40e843cec292969975ef3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fur/firefox-144.0.2.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "ebe3b75a723dc8f387f9f47442cf976954a75806b6b301fd2a9812254d569aa0";
+      sha256 = "949b3d57eadea30b6ae2b33e2613c705954e239f3f18e2795391396c40ddeee5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fy-NL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fy-NL/firefox-144.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "81cd1ddbf4c737a57674c2b4a9870213992d42bcef6e65bb909dff5078cb1a46";
+      sha256 = "c88fc015306d758a39ed588f029b1e9e2315d247edc461fac2f197849a21aae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ga-IE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ga-IE/firefox-144.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "2869ff9d9d3768036322e6d02eed7791a03acb0bb0ebaed2431042232adc78df";
+      sha256 = "e44c978632e912ba8b99b657dab61d5d702cc723cb26fda33ee608a128de2825";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gd/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gd/firefox-144.0.2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "4b723dd2084b9a45987e318744a44fccd28ec6f38aaaa61c232e086e7ddc22ce";
+      sha256 = "1c98d1a876614a701047ad06b1b112b3f9a71671b74e031f6b7e6263ac96952d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gl/firefox-144.0.2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "9e38b6ef7ed6783855d63af6324db0a5c6a48021ec57f17ebfce17208081835a";
+      sha256 = "ad3b0afeb730fa902fcbd8e36b97be83fa4b5e7c12b8f892a60706914c8e7ac9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gn/firefox-144.0.2.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "63cad4b437385eaff4ed50f39bef8bc76b2658aaaf3c0ab60372fe7104bfb04c";
+      sha256 = "60017d4518161585ac9df2f7a3cce4281b8e9c0fad3f59597984a12bc2a49d82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gu-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gu-IN/firefox-144.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "0ffb4d87adcb1ac2bdbcf4b303c099e72e14a2691d135187bd66a433297e7c1a";
+      sha256 = "d6ee3f920e8fa6d50d92050e08a35d361d3898a00cd8005267847032f3a6114c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/he/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/he/firefox-144.0.2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "c7208127bf5c648e4775b7ac05eaba02f5790f5aba82a3456692ccfdb29f1af2";
+      sha256 = "64e6eabf5693bfad0afac3535f10f20a8fd8f2bae53f6e67c39825f51c40a69c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hi-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hi-IN/firefox-144.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "dc8ef116c747bce1186af82d7870cde7c7f7bf662666cd90ffaac31d4300079c";
+      sha256 = "1d7b475b0456aad5b0e75db4284c5614f11491dcb2239192715dd4b0b192225c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hr/firefox-144.0.2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "cd201ee73e3d783817859cbe358cb15c6d582fb8ec4990ece87f75b511754dd0";
+      sha256 = "4adbde9ae8da1ff36c460bedcc1b822ed5c549940e5c06a638ee17b5d62d4243";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hsb/firefox-144.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "42724a186d370a1e3d16011a67348d475ff095c59d12bab1b66b5e583089e7c4";
+      sha256 = "5757b883bb505ab7ec45564412d268f4edc3f8c55d537dcec8621303dc911f5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hu/firefox-144.0.2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "b0622282a99c87b857cd23c6f8dbef08f997e8a0e46ff08f3b35a974d231d9db";
+      sha256 = "1e1835822f7537573db4444a6b2b1d7405098b9062fa850c7041eef64a5ea330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hy-AM/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hy-AM/firefox-144.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "86c4468f30842a56f3852ade44850ebae97f5168fe3de5663d09a9edfcb66a22";
+      sha256 = "3fc0e6b65ce4d3dba9d8e72f3f6a604daee66a84668ec9a4908e6841a7ab8855";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ia/firefox-144.0.2.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "bed81f31650c0e9b32176f339d5fe09fc5d72c987542d2a661fd150eb218f6e5";
+      sha256 = "400ff72b0708b197e946d7e8abd711b99c9c9911d13fe73f404ebf89fae2c031";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/id/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/id/firefox-144.0.2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2ea6385784dd1df09081749e708ecb539062082bc19fc6a64a704a0738fa91f7";
+      sha256 = "4e5efbef2adc58be98c5e36733068027b358c98f6932a9e82b24a183a048ee72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/is/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/is/firefox-144.0.2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "9c991c092c6490e816decb96763b26899835186ae33377d83d3dbfc9b8906cd5";
+      sha256 = "43bde968368a63c32275ab7019c02232d9200f3f21c042fcdf2ad91c94176620";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/it/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/it/firefox-144.0.2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "1b14405d7826889f0035ea9cf6cae90bf1004b63120ddc1296d4f5f038a87301";
+      sha256 = "3d558aa80380bee0ac81ae7f35cba77e09ca9e1e73fadcc245f595d12d97ed7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ja/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ja/firefox-144.0.2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "3e4bab59a4c76491c94ec14e8b9a8470c94362ed710049a7f415fed6270ff6bd";
+      sha256 = "49cc0d04c38a504dbe9214560493cae03b0d4e9825a5564a09f29af61d38e6a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ka/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ka/firefox-144.0.2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "2c615519e57387585e1414afe3ea2f28c8438537a872840aedc7e24ae91308a1";
+      sha256 = "e7681e399042d47ac3a15794093901d3f986c75309221938d475edfb8b417f09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/kab/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/kab/firefox-144.0.2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "df1a0a738df7e8ce99258a4bc3611e3dfb6e25192539eb02836e7fb6986ce9e2";
+      sha256 = "376e98a4699c0cdca2e554dc562aad6d3decbaf5e8f30717a1e66c24728e66c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/kk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/kk/firefox-144.0.2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "3b986efb6ba7d2ad39075c23486a5cc307a0b60ad5c4caff168e8b413bbe4f36";
+      sha256 = "eb34c13e17c87808e7e5c25fdee5e339bd53176e0a245da012bf4d7a19a7e3b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/km/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/km/firefox-144.0.2.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "f4a26dff7f59e8af745bdef604330e08b3fe3e130aab47156ae91a65fe909c3e";
+      sha256 = "8a438855f9bf282cee760b4b9a9fb76e2f07a825e27c6192137d6346b44ac8e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/kn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/kn/firefox-144.0.2.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "411a048b170b873a9236e98899c43301dfb3120515998c71a47de49b61889de2";
+      sha256 = "86bbc6bae4064464aa2634d3be45b9afd1d174dee5fb9f0a718dd014040818ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ko/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ko/firefox-144.0.2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "7017df2d5032b02290cb473c8182bb15e1367d1b195c024aede29c33db814dd6";
+      sha256 = "b1407a96e6c7e5b52d51d8658e9b08d365807366a25d549d39ad0c1f30b8b6e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/lij/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/lij/firefox-144.0.2.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "af6cb9daaebe1df157db23e106794261823e14ef9555cc99d0d54313df9f1b47";
+      sha256 = "2a620434d1478642128f9822082c68ba1c1a1894749e3bdc191425c07d35ee59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/lt/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/lt/firefox-144.0.2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "7aca137af26a57b5bba9801357950de55af8e8a8188637cbbfe06135e6d58f83";
+      sha256 = "4da70978d044db5f8fcff53b92d65becf1dc332fcea97eda4ed5b34ef6b62075";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/lv/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/lv/firefox-144.0.2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "c2397a9486927268241e1d2cc3d80258d014115a6df6bc0785e26551d3526a38";
+      sha256 = "c6c7d90cf8943c9e6be37f9a51ba91899e8a3b61169fc983d6cfed9dce45391b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/mk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/mk/firefox-144.0.2.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "042423d01745a124c7a76b649eebcb91b187c4153f2ce8aab43745c35c0c90e2";
+      sha256 = "9611d0500e8a59977c958b4e4da72b774ef3be89eb0aa29d0a65412da861b8b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/mr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/mr/firefox-144.0.2.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "b20f8ab986003cffcb49ee57149586f3d0ebcf63b7476a33d030ef47828e66a8";
+      sha256 = "b83ea428ef39ae7c39a6252bccb786ddaf5a254bd0859b1676a5a5383355c4fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ms/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ms/firefox-144.0.2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "617a8020fc8dcf4a7f102d25a2d805fee853bc64b575fdbf07f414a249633d3a";
+      sha256 = "7999d3685972d6d6ab3f6f8d1ba5423677c15990afa2efb6a8bf16948fbb2fb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/my/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/my/firefox-144.0.2.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "183a1077fca94ce124e1c40fa7fdb73459054b1a77cd3e9531123bb189a4ad02";
+      sha256 = "46228bed0be400a766ec01af64ec525cd46150e22f06f2da8f846256450cdddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/nb-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/nb-NO/firefox-144.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "5e8432770b66a5dc89131cc4c15dbcaf7ab4c92b97c3c2c4286db675c12241b9";
+      sha256 = "53a1c7761fc37229eb168d71243249278e6bb5f6bbf6de11d3b71546a04a952a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ne-NP/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ne-NP/firefox-144.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "56e43841651cd9f53224f1193f26d2750b2cfaa7779b9613f21b295ba57c6dd3";
+      sha256 = "6d49c881e82f563bdd89b991540b6db98101c5d84b164a029353fa2f4b215c3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/nl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/nl/firefox-144.0.2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "c7ee1b2f914960c3484a2df0e2841213cb49b7023e54440d8820ee8c7468f37b";
+      sha256 = "0584812b1bcf47e9ecdf640b76586547d7e1558302ada5dd0c4e1c12078bf70e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/nn-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/nn-NO/firefox-144.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "b723933e06e4125a560cdb2fe01d8b2f93fe311be7b2533b3e5e3528eb2e2ebf";
+      sha256 = "7398023d526ba8b4541e9116fc4682fdf46567e86328fc4007fe828e0ac75c7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/oc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/oc/firefox-144.0.2.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "9c96f77ad2075da7c31022bc0353ea3312a717ab119f8ba0c7813de28e6b03db";
+      sha256 = "6b6e59dfe45edd4eb594660a3ec2fcb15b98ca9abad5120fd2e13ef1a489cc82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pa-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pa-IN/firefox-144.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "baae1fb1244779f570043e1f1d415c030def26843860cc31ff6c16b2410f4620";
+      sha256 = "8dd14d1e7eb65e0734bf9fc9abbe8f61d688947e374f0afd60dc23c94b7f8b40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pl/firefox-144.0.2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "e557c4b44c1ef6665035c3b4d70ce4b795c9497300ebe1f85cb39a0b06a9fb5b";
+      sha256 = "5401e903267427d89e0993b8065b7073a99da0096e2a4f1bd9ae6add2d411b1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pt-BR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pt-BR/firefox-144.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "5cd2dfe143afcf4381d9eb395f12ddbd348a116f652ee0a197bee31bbd5fdd53";
+      sha256 = "92bfc4f59b5a8941e6b56c44451e309963efa9770b154aec1b0eb2e1905c4a53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pt-PT/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pt-PT/firefox-144.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "d5f2b4c619ba38835152b65808acfb193649d17b1d86c5b9b2d93c45b8c97f44";
+      sha256 = "51601c5f5a7ca0ef722c2b5ae58dfabec5be43d185f2cbe7bbbb4bf1cbdf8c49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/rm/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/rm/firefox-144.0.2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "e9c7962a4d6c4b513c2bdee8d72bc31af4ff5debcfe34fd9ad9c3aa1cfcb6276";
+      sha256 = "fb679d3e2344e8ebe6e4f847d80075b17f3eccdbc842fabe87f0d81f17de91f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ro/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ro/firefox-144.0.2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "ebb0555c385dbf52fd8de2fd54131f4fe8632e7ec40609d2c4c409cdd34a3e55";
+      sha256 = "d59c196e0d58ccdb6ca5860ef5ea4a47325fed37b0d15fb0445a1faa0ccf4e54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ru/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ru/firefox-144.0.2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "bf56783f4829d44d405b26443f06a3d43c7e390a5c391589d63af151d5a50f4b";
+      sha256 = "676c164ef9c057c3f3a036dfa7daa92072084650a329bea73299bb4b4df78730";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sat/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sat/firefox-144.0.2.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "8a98c043e78ddba6c17c1c657e89fa20771f3fd3a801856324c92729933a3e1f";
+      sha256 = "335c2a78fa39496183886ec76d972386b8978c02c2aaceade8e1e3ab2639a05c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sc/firefox-144.0.2.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "7859acb38a46a28d1a524b8623593739b839bf4144da1b02969cd3d8db2007f0";
+      sha256 = "5acab2be3edfb7527f817b68f7c4dd79c302ee4b9dd50610a8a436453bbb4485";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sco/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sco/firefox-144.0.2.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "e731574543c18710de36315f2ebadd7f559d1cd25ffdd5097b9ae2048b7699bc";
+      sha256 = "a05965f5a422e99c62aac63f31a16fe9b8ecf14b13712a9eb585e9d6336774e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/si/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/si/firefox-144.0.2.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "c8db1ce5b9e07ed11f9dc4b9aef0339f70fbe0dca499429fc65cef9e990a8e2b";
+      sha256 = "ad085502904d55d84865d42db4ae503420a049ea131f3a8b4d8f43f8fdf2b767";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sk/firefox-144.0.2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "62364f44f922c72eb9a0e3a02e9c7b5d467342af9e7cb513fdaf661fb46a1860";
+      sha256 = "2d3cd5a3b33222770697e394ecd688720667a726bdba9aca7512c8873f379d9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/skr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/skr/firefox-144.0.2.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "f67e0b7d517ad09092e03c2bd629df3a442d4aea2dc223b1968d131384068086";
+      sha256 = "7822098895520cb420f226ce2ec083b9eb30bd6c1b34c00d4da1d5bbe60407c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sl/firefox-144.0.2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "28be22798a0fcf65410de1a154b4aab545e99706b36a3996bafbf32479361aa8";
+      sha256 = "061d1f685cc629b60fe3893ce4d4400a32573b1e2a42e9d9ef51f3b1ddc0f1bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/son/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/son/firefox-144.0.2.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "3cc1314862a52863d9278e3a3a4865a6d449ce79e151a05bc69a814a27ab0bec";
+      sha256 = "22152c6865574e00c274eec47e0dca5689c7ef3b53711a4c7ffdb5e6d26e890f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sq/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sq/firefox-144.0.2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "20439a47650da9526b9568b3cdcc98264e9768056aa49f0108a069edb02b9b91";
+      sha256 = "e68e14298bd89f3432de3629baf3a646a796b741ff7fcbc430f3029f026730fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sr/firefox-144.0.2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "59098ca2bcdd4194849cc276e93b9a1d0c673d555cb66d2ded4f10470622f1d9";
+      sha256 = "179991eccdfb8949f28462cc885daf29cff1ca708b462feaedf76222efb2ad96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sv-SE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sv-SE/firefox-144.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "3ea87b1e77ffd080e70c5714fd5c94855b1919ef3b78b04f8003a4eb01179998";
+      sha256 = "84c5898d6724ce3fc7eaa4c12b3071f1739caced9b1d99b41d2596343806bf99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/szl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/szl/firefox-144.0.2.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "2b5e98696226aedbbc11d56c5380f6adbeea8c6d82f4697b6a21b751ccc24014";
+      sha256 = "2a07f8031917f2c2e26d7f2c47600f560da4e8495194756163be4611b9c18b75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ta/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ta/firefox-144.0.2.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "995cfa80377698fa061599ade0e8146ed27ef920290b10d8421764f806f8cc40";
+      sha256 = "b2665383ddadbd324cde72d08c483cabfbb581fd57d6d13bfacaaf7fd6007006";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/te/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/te/firefox-144.0.2.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "8bd71af712895b00650dd2862c8e871192e6d4ab033cc72abea3586bd4b33261";
+      sha256 = "3dc65e4d8d866e8f055b34e7afd4bd9f3efc069c5c00d47422b265cf5f2092bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/tg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/tg/firefox-144.0.2.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "fbcee6d0c2f972dd6d4635231669163ff1d658b40de804449ae7ea265dfeb00a";
+      sha256 = "f94650f8a08103e393f458f7405022a0eb43843613ebb129e9dc8b2ed294664c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/th/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/th/firefox-144.0.2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "54eccbdf6f5f141c8734328144cdfb830ebcd98ef4da68e7f351350a7ce9ab6b";
+      sha256 = "3fb5450d8b5f9cfd03ce6bc7b09b4eee8ff0ef2e9ffcbd7538c1c26a8009d316";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/tl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/tl/firefox-144.0.2.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "1db8fc8099987139ce73d90565cf541b7cd27d473aead5167536fb32b5a13a9e";
+      sha256 = "7528eb73e2983efb90ded2f92583a9c0bdbcba62ea37fc6ecfcf9363ec5e73fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/tr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/tr/firefox-144.0.2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "d0150ad7ce2e12b7d3ad0316f13bf09389930f575fce05c8b05821bad23bb69c";
+      sha256 = "ae9b472de5befda28c03656dd85196a63e0532db5c850b4eb6661bb5e57d8f90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/trs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/trs/firefox-144.0.2.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "b1ae51b5b599fa2159689329f4becdb7cdb880c6afefa6d35c6aec1f1e59f2ac";
+      sha256 = "379662316f3d4e9ecd0974e3dfbb0b2394fc8aca317f06688d87f921be7c7884";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/uk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/uk/firefox-144.0.2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b6f7374c42c970eda8508747d7d2a04881ca4fdf640dfe1da2e9ff6070554144";
+      sha256 = "b27207ed4b16fe5bd1a315ada9264b9763462d047277cb1e6bb71c7cceb54060";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ur/firefox-144.0.2.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "fa78ad0f604d2f9e4c65002fece257a1d99bd128c47b5ae553f744a236dc901d";
+      sha256 = "50180daedf6e2f1aa24a05094d5d6dcf0ca0f0f1f33f5a8a735b0a9ae4f0e2dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/uz/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/uz/firefox-144.0.2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "3ad4dc6f4d061f5f44ab31ca89bec1b7665c17f80bdab981583bfceac67fb8fd";
+      sha256 = "34942e61850abc56b367e38e4a46d61d8d7aff0876290ac7e3c890b3c41b987a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/vi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/vi/firefox-144.0.2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "044c2bb1e09aeea04b3d1c11f3f1236ac18eef9a9fa9bf00c4cc31c4ed4c44da";
+      sha256 = "b9e06af98a1e1092db57096b0615569ca8d1381a45482d9c0729c43400532576";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/xh/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/xh/firefox-144.0.2.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "e6313d5fe3143685c8da6c381523740fa8d92462a203ac922687909562ead1de";
+      sha256 = "2c40080a642634e96e59a17fa3667bce17b3e6299ac2866082b5d15d918d39b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/zh-CN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/zh-CN/firefox-144.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "5197bf5491718a5eb7d9157ecc13e06ac3ae08384d84ba31c75b92bccc5db028";
+      sha256 = "8c3e12e6cce8bfdab7bd829448aef9f6965ce591495aac59a14eae5c4f1338f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/zh-TW/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/zh-TW/firefox-144.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "88858a13eca01af516d113bd16692a5166ba9f406aa4db81899dd52f52b68c92";
+      sha256 = "d0eb482258ade0045d342d66152e005b4ad56621bc1270cc81e004796d3427c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ach/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ach/firefox-144.0.2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "977d28e0187b3a752ccfd9079456619ad4159ad8ff2aa97bf2ade77b1ec3d6c8";
+      sha256 = "7c2555837c2888059a63a5075fce76073927229472f55d2093069f3d58e42583";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/af/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/af/firefox-144.0.2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "a0fd46deb1e5d06ae1e9ba36281c677b190c63f64c9ccb301e50376e9508b0a3";
+      sha256 = "5a44f2452ea484ebc462bfb54883f496be58c9eda975b5388f9b56f309f90ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/an/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/an/firefox-144.0.2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "f1a7f4c06fdd334336deca8d74c15ebdb8de03628c1c303744a0e4f356422338";
+      sha256 = "808f20c408e35e36bb78c9054c90e9c4a20243890466cd4705558de072a1a0bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ar/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ar/firefox-144.0.2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "83ea0adf5a613fe39cc1ca9c13c42cad2ef921dab634e39c39cd2dfb0d26f8a3";
+      sha256 = "ff60d8471f4df7deb20de7eaf3284ec2b373b730095179349b7c771208ef0286";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ast/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ast/firefox-144.0.2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "fd0a68fb69fc9dfdd4c9399a38b42b28cb56011de93f339cd9b89b65f86b9882";
+      sha256 = "337a7908aec3b42f7ad1c32c542ef3bf26f227a691f889f85c4e9a6cf045de0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/az/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/az/firefox-144.0.2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "50b43273b131a33c1cc6ee050f5294ed3c4e914651f2760953f16b3e78a9350a";
+      sha256 = "640cfd65c84569022798e10cc0905fe76d5f8a0460274248176c0eeb1dfeaeca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/be/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/be/firefox-144.0.2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "2491d02b258dc8fba365559795b104a3073180263b16e49099173adaff2cda7d";
+      sha256 = "d3e87b7cdb7270df9b874d4ca1fe385c871522928163cfa3c66b2d174fc8bf20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/bg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/bg/firefox-144.0.2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "dd734a7e075f5c9fdd6ea5d7e44a07de7c8155d77d4bfd1b274a16286b2a9e43";
+      sha256 = "43167969b585cf5bfbff7584ac547ac1af1d9220f2407b64dfdec0331fcb9ac3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/bn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/bn/firefox-144.0.2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "2ae3fd4686495479106bd271b4863d33eb83cbfaf412bfdb24762578ffe8c450";
+      sha256 = "dc2f24f0205798cd1774475449da40c74e0b37c99d9810fcbf29fc025582028f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/br/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/br/firefox-144.0.2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "331e6dbe744c92cc2c94f3e81daf9cc0c4609a7133543093edcc381a0207933d";
+      sha256 = "cd4c5110d7a0a1faee62516671ca47f9c3078e4bae4b3546886e1b4f522bf452";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/bs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/bs/firefox-144.0.2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "350c8a3f4b8ba257a769909ca2d69b9f72c95d182705299dce386e8115d85acf";
+      sha256 = "77b8bcca21d816840d5b951979911a22e923557958f5423cba113e149dc6a641";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ca-valencia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ca-valencia/firefox-144.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "1161b93a7c47e2f57148ff13f4b3cecc55efe4c44002b8e13e139eea55e090e7";
+      sha256 = "26380615ef64560e13a3fd1e7eb6c11a2ce5a07fb7008abec90be09ecee32b97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ca/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ca/firefox-144.0.2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "ab58c68bdf394f05db6f5224ca0c08131a5ae40fe9236e4ce7dc2aa8e80b0997";
+      sha256 = "363fc40bafc6fe8b71358a49b35d2c86ef7b58a28cd12493fb14884da56cdfed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/cak/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/cak/firefox-144.0.2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "b23fe334ae1a4b24d684f8c6a062eaf50f6cbff39e2b4f167464cf411e4f2842";
+      sha256 = "08d42711c8cdf338db538b106631bf0c531c61854aaa04c9c4bd5d7fc3d312e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/cs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/cs/firefox-144.0.2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "5bf6194661c1b08eb63e047d7e3703bc5883c2651a8553d617e803eb8a90378e";
+      sha256 = "a53e52a79785aca06054b06fb118bcbf972f71f3a8abdab5fcabfe34cf98a68a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/cy/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/cy/firefox-144.0.2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "19bd22d7ee9f01b63c756a8ae4843b1c237fa621303f497293f411e916b60f0f";
+      sha256 = "a66c1dacdc0fa49353eb5a4a7e06ce974babd128769dfb7d3e7430f4f051475b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/da/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/da/firefox-144.0.2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "cef6a185c2e9ef7332ec24b862f113da11472bcd28606c733dc6ed6cbc7c9163";
+      sha256 = "8abe1a1e2d978d6bdaccf85be3bc9b1a526ad8853f104d6ac630df3e8f2e606a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/de/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/de/firefox-144.0.2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "1098b67b168abfa976ca1ffa6e0cf3a3d13b80bd0aedda4db2832a0dfceab56d";
+      sha256 = "f0aab54f9d57812fdfbab4288240604efe938f397bc9680ade57ffdcba1f2763";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/dsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/dsb/firefox-144.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "5493bbddc991d5ab5d06eedabaf5f02fd84025d6f1a82da8afed9f6328f707bc";
+      sha256 = "4fd77b40e1f13238e749b9a35b6589cc16b8e6ec8e7ea18ed8ca06124e0b9fed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/el/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/el/firefox-144.0.2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "6b568f4fad946f48037337e1304a9ed6c7a260555bee15df07891ea7f79622af";
+      sha256 = "1bd67f05938fffc3eb5b12bef39c5907a27a33a269f422f79cd4ae1d6b7e131a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/en-CA/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/en-CA/firefox-144.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "f306d9907759a68f18ed4376d6b095fc8058fcdd06240cb6c38d0b702b8906ad";
+      sha256 = "f1962db369ffbae87a6ce01e1067cd0984ae990bcedbb5d8c0fc48aa4bc818fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/en-GB/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/en-GB/firefox-144.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "654f879bc895c0998a5b7db991a11985380e425ef4911420edd1c223d4f8b1de";
+      sha256 = "ad92239c1d5e9e24a4f7e3d96e226283699f7250f1b5429282d2d86a57f296a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/en-US/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/en-US/firefox-144.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "4ef449ffc5af2972b1e91e2fc0753c3f5e103f067e42b7b2cc32f18ceb3a9591";
+      sha256 = "2206979f709bccc687193c5238cb299c7e0b16d0bc56cdd5326740adb8e324e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/eo/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/eo/firefox-144.0.2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "047ff72b370f4118e016761e844bb341730ec808991f4b3066bf7842875de640";
+      sha256 = "48f61836a0aaa25e263e395245de0cf556e368682c4cbe74716156478d10b4a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-AR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-AR/firefox-144.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "5771a469b1833014931b5fdfd2724a190a375b3ad79f1cb9cdf005ab33563685";
+      sha256 = "4038c0528d1d7852af8b402f54d9c817ff7859536f7753887c36f150cc8fb2fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-CL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-CL/firefox-144.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "d4bbb66893b0bd9adecf1749f8b19bb5ced01b87e8c9120790291d6a33bf9b8d";
+      sha256 = "6fa9affd9c99aa98843882cdd63458f60bbbf965b8c8eb3c404f27469967993c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-ES/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-ES/firefox-144.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "ee01aff419aefbb0bf0f3e7ebe08f347bdb283cab5ada98274294e56610d4c8a";
+      sha256 = "ad850af7f9cff924ea48c8fecf5ff97b0cf4aed7f763a9802797610dd903c9b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-MX/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-MX/firefox-144.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "ed784b215f1cfbf59ba1ac607212576e29118ec16599dba9c7256887eca65028";
+      sha256 = "365f61676faf611b15862febac8ff176ddff8fa79dd4e0f2bb04f3221e07b018";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/et/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/et/firefox-144.0.2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "e339ba56ea317d17157c91503b519495ac71fa3cfa09d2625df0c800e1b86dfc";
+      sha256 = "e72df1edfc99aa3e9e39dcff27db54ce55f39cb6cdd6ec9fd0e8e42d9405a1eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/eu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/eu/firefox-144.0.2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "0fcf3b03d405a38c95b47b91b845cf27d3f700cd2058241b90b4b3c45f085194";
+      sha256 = "4450a44c0f4e229b739ff2e3c1085f254a2b7f826f16017f4ac654e1f668efcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fa/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fa/firefox-144.0.2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "74c76c31b4687e4fecff55b6e26bc9c3570ee99e6c3b0715eb362dc6bbb0ff97";
+      sha256 = "2f058dded29d181a1b5ac97de227369cc3ec74e84fab06614777065246193544";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ff/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ff/firefox-144.0.2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "07a7ec35c7553d60229b9d8e7c9b54f2a555292386e6715da953a839d6c97fe8";
+      sha256 = "a15965d38a97347f00b7ab2c7e2cd7fffe12adbf91d4e6b2aa1e8e7583bfd24b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fi/firefox-144.0.2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "7a9727431bd9396cd96ce6914ebf375caf0e64023a047497e5ef68c18da42ee2";
+      sha256 = "5c719d0e332cc47c4cb7c3cb84f07808c8382fb71d2cfea5b96583c8ab8f5b88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fr/firefox-144.0.2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "6eafdeac0ea54c6179f36de52e1c0803671b95bf765934c3defe70276bb3e5c8";
+      sha256 = "d3340d892081d122179624384c3a97bea9c30af769bc12ad12fef8d08cf40d22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fur/firefox-144.0.2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "9d0156949f2a98102f496bca1c657e6dd064562a585c3bb174c89bf2081198b6";
+      sha256 = "3bd30e834673c7ac89435b59645a00944d6b4034b6639124bcd4d3ec34dd35b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fy-NL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fy-NL/firefox-144.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "09ae16dc09de7e8de85e4dcc9f3be262eb09e0f088be3ab90263d20b7b381eb4";
+      sha256 = "7f4ada0986dcb7c6d08be19c68cb8234332aa3c4efa2c8478ae14bbca3365b0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ga-IE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ga-IE/firefox-144.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "96bd17c277097ec766b6b980c79654c506d783aa872ae60006da771ac20fe522";
+      sha256 = "1b2605055a52a23ef6e8971dd5ddd50433158f9cc37ebfdf6f14fb36adbbeaa6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gd/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gd/firefox-144.0.2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "8fc9ba4ea83184be945363a329ea58c8104b9330b8de3315068a87189e380d72";
+      sha256 = "bf897afeaf9d1b5d8b770c639f53cc14b0f46a9080dcd222d8e674ca81b4770f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gl/firefox-144.0.2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "2c05e4b1b8d5fdb332d2ff6715a87c1e4917c238a92baf459a402ccf5d905147";
+      sha256 = "e02ec017aaaa135e38e4219941603589aacde9ac1e28861b7bef3b90f897ba42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gn/firefox-144.0.2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "c691a83597cadf1f552b496a5d0d0f325682b1ec8db3273f3dc4b7b97c2b0903";
+      sha256 = "ada1b5d56386eff6c8de047e153576acb31ed6f61f8faaffdbc7798100f421ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gu-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gu-IN/firefox-144.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "a1dd3e60f7ccfaec8aaade12fd6daf3137b4efe077bc0eb2c8e3f23ede3dbccc";
+      sha256 = "48f4b1875e81598db4bb9a7429232f03d75298e36aaada8238c6f608ef26d581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/he/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/he/firefox-144.0.2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "a1c61306257dab570c29c53fd4dca842a58657a816988d8154e1ce550ee2768a";
+      sha256 = "37ad4cba65ae77673fb8f825bdd8c81d0ad35450da2f026b11d355b4e996dd52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hi-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hi-IN/firefox-144.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "d9406932b45a393fed2e9709de9ed947cc7047bc945c287e801bfea30ffc1fac";
+      sha256 = "9314f27f0e2f7645f512101a57437f8dc1d3473114297bf1cfe658b95499223d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hr/firefox-144.0.2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "967434bc928f4ac864d8927ee343c004800a626eae99244da25dca5568063195";
+      sha256 = "c5fa96303a4705d405a589e4067ca92d946308afefa815a8902e32ba5b347b91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hsb/firefox-144.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "b08dc9846037f228cf8a370109320f24036c9c2370781f9e66585cc0f484ce33";
+      sha256 = "dfdeb6d88379e22b9d17a7b7851fe35ceae2b343c160cc5d8eff0c34376ef77d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hu/firefox-144.0.2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "3c6d102b6510dd20156f5491226c8daebe93d21f48cf20763093d6006c30b91c";
+      sha256 = "74d50886eb50d7d127ace85c8007e1e417a18e50053a804dab3a5abd9497df2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hy-AM/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hy-AM/firefox-144.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "44d305c5295833d3cacc99e5270c8788a894a210df4a469baf4e5bc1eecf9c28";
+      sha256 = "a55a0e50e12c7521c176fe70b13c4dbd9370b326b3519638afca181d5914978a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ia/firefox-144.0.2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "69fa736947780cc6274bf7ab828102acc5df4ceac1114e61c8dd470205805caa";
+      sha256 = "749f237834b6780f9b6266d9cc64a84c0370839006f787ffd0fddddf4444131a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/id/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/id/firefox-144.0.2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "cac310d27ccb503aebd63f021458e75e1a560579984893516ec54328e36dbe1e";
+      sha256 = "622678dd1c86cd7d2f62555896256abc494f19f37ef9c71acefc5d13e64ad709";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/is/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/is/firefox-144.0.2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "cc351c14e000d4f09244e8c2bd4309c6dbb2954ef29f451454591f6ae7de1be1";
+      sha256 = "36c7b6e0ee07fd3d51d151f5ce2537f2f93cd2f2e172143cdde2cf9c48b96211";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/it/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/it/firefox-144.0.2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "ffe217b8c0c9be1837bf9baddee817c4a4b8bdb65fc54c76f4ee999cc0b1818e";
+      sha256 = "8d7928ecc4c353f6d89e0eee6badd26d4b1252e00e9dcafe2bc1dfc03a5b8ffd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ja/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ja/firefox-144.0.2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "6ed97bcf1f73aea3b3ffe0c9cfccfef39c5c952aabfe32f43a8d2ffef9f5bdc2";
+      sha256 = "a1cd0d20229ceb468a3a902d08f44f47930e03ba4831033c3386296d2b60f13e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ka/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ka/firefox-144.0.2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "aad03ca002d39d0fb6daa83e4981567a380b793e5ad1f145a42210b9e508eb4c";
+      sha256 = "20852aefa99c2f156238fc22bbd0bde27e5667fb21da4d20fe19d0565565ad79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/kab/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/kab/firefox-144.0.2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "b7070d75bd21ed5dd3d0c41210d60da6dcdae91813ea2d133bbdb787a01e8a42";
+      sha256 = "443a672ef160170593fac4834b390fe64bea9f66e440cad06b9772f532c3b69e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/kk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/kk/firefox-144.0.2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "88861dd252e896921f408bc3fabd61a1389df73fa52bfc10925f6102829a349f";
+      sha256 = "64e0b26a4a306ffcac30f3481cf93f81ceadbb880b2df6f82714f07f226f1da9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/km/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/km/firefox-144.0.2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "4dc643aced535bd03c5ead74cbd88dffddd7b50f6e8b17ea3d4d200cc12c7e6e";
+      sha256 = "baff9398eae07c75b59073c13c8808142bf82946381ca599491b1ac7de6eb6e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/kn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/kn/firefox-144.0.2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "2084841b8e6817ed29b023c1c2ad2f36807f14522a9e7cf71b3ea8fdf77682d4";
+      sha256 = "3a90204a0cd82455854e531823438f9653d6164e11f19dd7dd3f6efdd2ee9456";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ko/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ko/firefox-144.0.2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "17da54729e21788cc64df81db2afda2c7ec3be4674f74cd8ba357a76943f89bf";
+      sha256 = "7fc3de510e9d77df6890214c2423724f6430adfca4618dd41974e200444012f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/lij/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/lij/firefox-144.0.2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "0a8c3b2249f27c1929edbf53bdb0654260ca13692a52d18dac053bc771655fb1";
+      sha256 = "fe72000de02e168e1842c8b358d0e79b83027c4ca0b483ed961c677c8799a568";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/lt/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/lt/firefox-144.0.2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "58ab2d3bcd5d70c88221826fff86f74de06b71c226f4c4b3ee6d49d7a5178125";
+      sha256 = "8cd0a3904280044ac27be7f7a41f213d3615e9a944280fc99022fbcad2db9739";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/lv/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/lv/firefox-144.0.2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "910494fde942523b4611dd7776e51f3443b89683a7750782c08e904c435c1380";
+      sha256 = "bac75641e144591aec642ed9d7f43baa225bed8e8dfe2f18b030b2297de6307d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/mk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/mk/firefox-144.0.2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "73302c4e3967b18380f2bef3fb0b5f2e2fe9874231a541bf4880b37f0b1b7f5e";
+      sha256 = "5ff8ec59af2c4a4372f7d464f3349ae20eefaddc0fe240cc4dd6413de18d05ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/mr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/mr/firefox-144.0.2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "35a622225a1f49415c65ab91b0c0b632c7ac9d51e05d7c5dd348237c44fd919d";
+      sha256 = "c2b35e8d3b65b8f135e32e99e9ec4dfc6e34f1e618eb0b8f9818d4446f34cfab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ms/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ms/firefox-144.0.2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "eb4beeabd1dfa0cec6095da3b89652488954ef9dd3b7d324457c0570bb1ba4d6";
+      sha256 = "6a2e16593d9878fed8cc9ad3586a4ae3621aa146b1bf06eb5309b5e62edfcbaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/my/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/my/firefox-144.0.2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "deb2c6c5c54e9594ace400e05745d3dfae771393836433bfb8813a92f843b2c7";
+      sha256 = "740baaaf886fc64150880c403d88ef068bf3eb17dcc4a178c281db47fccbf261";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/nb-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/nb-NO/firefox-144.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "c83b00cec208387a2f2d066a88f28b7e1ce8c92cd7c3047c89e7c18b25ddcd80";
+      sha256 = "6d56cec362cb924ee7f76d4b8bec19a714e0ac79214e7ed2787da67881de71c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ne-NP/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ne-NP/firefox-144.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "f260a14d11ad67959b9553cbb605ccceb91f16558aa04a782070a5612cfc69be";
+      sha256 = "e270e47111cc4395ccc068a5f1594d784468b5bc3f0cce120ac88abd31dc3eac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/nl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/nl/firefox-144.0.2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "4e50397759820ca0806e7a5767b5813cb7e3af58b5ecfcd0c4813c58b99ac392";
+      sha256 = "0b8be00e56be50fde136d96992e5e564be10233de6ad90b2ea3356af2d09e56f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/nn-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/nn-NO/firefox-144.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "fd498a5b0d348b0ca8c36b69cc81efd5e6ea79291b5ceacd6fbd56b603abff8e";
+      sha256 = "0a1dd7574e494243e1b401adeb786a92c5259fd5affbdc7ee4703d8fa3d0949e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/oc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/oc/firefox-144.0.2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "cddd6d64c16f924cf0f3682c04f883eae1b0a65b7d020d236628ea0218ac86fc";
+      sha256 = "0a4f22f941aa56fadcc5533b9312f1cfae340f9a62335cafa8e47783747a0fc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pa-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pa-IN/firefox-144.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "ba9537658679d6aca5f03bd22439dfedaf2949dac92870ee5bd2db10317ac3f6";
+      sha256 = "321f7bbb801d6d2aec74a9a3549671849c0eac473a526f9494f2c76950243bbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pl/firefox-144.0.2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "79cce7cf2edee1cb1a22a00e598718103ccb84966a9dbc4a4d21c78f151fdd88";
+      sha256 = "75acf6189febeacbaa7ed3b03fe16db0ca1a9b6f10c88012cbacf24e3adf4bdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pt-BR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pt-BR/firefox-144.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "b021bf8f42b11c964cf660d7f3c2ae8e7f21c70623ed0da4831f5942953de4bf";
+      sha256 = "bb1a100bacfeaa1d906f552b799861b4bf752b64334813269afbb650df841fc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pt-PT/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pt-PT/firefox-144.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "1373e0fa839939e0c40d378e4c2ae3e0d324ea53c842b2483ff8c9c33999410d";
+      sha256 = "4cef73eb6bd8dac6660a15b413c8545168afcb700a441a5004ff47bf43744116";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/rm/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/rm/firefox-144.0.2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "cabed3fb21c46d774c88d3841a7861559a8709ec7bd0df3de81d8b29a0b053fc";
+      sha256 = "3f34c4814b434a97c07be2efbfa48eeef78eacae80e67aad87f73c9b19956bff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ro/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ro/firefox-144.0.2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "eb5aa563f2b31d8f6c1ac1b5cd9f110667a376d21564d492d7595c3237af495e";
+      sha256 = "0f2d5b75c50a923427c88992d698a411d754c7e8f531da972ab42326aebaca98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ru/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ru/firefox-144.0.2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "b77c8bebc17033e2aab6d1e1f56336a4ba6e36dc303979fa55bd64701b1643c9";
+      sha256 = "5a51d3234a56c7a4bf56671f4d7828b9690ff14d3f6a025685a22d022ee805c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sat/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sat/firefox-144.0.2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "7432b1298fa9d71e781b3751f54c2f28420a2f2eeaaf89ef6e4268fbbb0d4a47";
+      sha256 = "c8571a71dc975c60af0232c8542065f401deac714d6f7bb8fc9ce846ab34b229";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sc/firefox-144.0.2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "408f80bed47bd8f73d5bc4b02d182c81c166ee56caadf03d908685fa2338e819";
+      sha256 = "5dbb848fae2294e1265f79f70aecc88b4940398e9935c1d8310892f233369288";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sco/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sco/firefox-144.0.2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "96bd897c26ff462b13e3fb4752910ec4cd4c0b73cf60470aaae02a252b67c6bd";
+      sha256 = "ed05a7743123632c945153226a4976c49c7b891eb27b11695f67058e8c379c07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/si/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/si/firefox-144.0.2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "a021fc38960791bfc5d4eb55cda526762f04e899a14c38da57bce64ed389ed6a";
+      sha256 = "97aa03f4dc9c0b761c68af64ca7aa3623afb7f38ed9994eeb573360e803dc510";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sk/firefox-144.0.2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "96aa9368a4cbed0e63222314c550ed3c63b47c175408a46cbd91099d529154ea";
+      sha256 = "0c6d4af97b31a355f8c9104bbb57df4e94f3640b4c329d560c28b96eebb76991";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/skr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/skr/firefox-144.0.2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "968aac06dd991cf7dba4b691e759cf68ecfdb9756dfdccd02acc344d07cce86e";
+      sha256 = "4f73ead3ce7f65e282b03ef99f3acc4a812530640b4950bfd79b4daaff2c0c26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sl/firefox-144.0.2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "40d305693c7c9f241533fccf6f2f8a537badffcc621377d7e8338c09dd7364c6";
+      sha256 = "af79294db660a209a97c9abb7cfdd2fa6638e9be92fc3b104c1495547c0a3d96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/son/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/son/firefox-144.0.2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "dd28d86b98f4ce5e65fd905b2f1563ceb6dfceab88702cdb842c91586afee0cf";
+      sha256 = "55388851e113f1b2bb4572faf4bed5f4e940a33a4c6e9ca021900ab198aca5af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sq/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sq/firefox-144.0.2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "e1560d11ef6e460109a009d12bc759e3fbfa164916164c577d146b5af6189db1";
+      sha256 = "359bacaaf2d2b22d3775fea9c5c370c700a0e75ba6f982c4df00381adf8f9138";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sr/firefox-144.0.2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "ac99527789e4e43f7bc177b6f97402c906dc25bdb4ab2579e97f911b0dfd9d81";
+      sha256 = "82da85b20b9d073101182c77474d4b72fb0a714f93c96e2b5faa1debd32c2160";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sv-SE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sv-SE/firefox-144.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "f9a9bc817cbb035f83ef8beead78f7cedfb59f329fff6c5a33bbd97b73b79552";
+      sha256 = "49c8135c26b17439669211570342034d0d2014c9ef51ad0928d47ed13a7c1e62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/szl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/szl/firefox-144.0.2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "5675dd4ec15275841d777e277d7522c36ebc82fa80c41da9aa4741f7e81d9679";
+      sha256 = "45ac47e291ef9ab2a62a7d6e98f88bf322fc87025d1b218cc1c71fa73db6cf35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ta/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ta/firefox-144.0.2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "73a7fac61dc3b896d8b125dc849a9ecb3aee1b600222938938f1d007b3470655";
+      sha256 = "0ff47ccd6e495865cfb22eef3df1114cd8c73102aaf1ddfb437fb994c40c3794";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/te/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/te/firefox-144.0.2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "c90da176f9861e91570497b3c34b863167439cd2264a64930c8728672b4f79e3";
+      sha256 = "fe876921a313a6bf3b1204bcbb3765ba5491467862ed2963823935f4bbea248b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/tg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/tg/firefox-144.0.2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "f229c636cf344ad9b0b5a80e66b436a879b1066e89bf66630f7a8b3ecdc5787b";
+      sha256 = "c6dc6eaa11851f1b0987840faa140e552844abf936eb22f8b7c3726843c25390";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/th/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/th/firefox-144.0.2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "8941dc84be5d30cf7af79a498ac722cecfa22fa86efa42d003781b81d31b5b3f";
+      sha256 = "9c146b5997fe2ff2d3645cc2196480e63d7021a89f75e114d4f477d469ab6a9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/tl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/tl/firefox-144.0.2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "e68485dd4c47c886a0b75d1aefc99e47219c4de7b3da9d7471e97f491a5a0009";
+      sha256 = "b930af8df1eb8f7f3725b92e926fd841ffc13f24af5a17aa6e88082bfacaf081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/tr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/tr/firefox-144.0.2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "48076d8ad971333a824afd6d5e5021a196a6c8b916c130c1709b148f26e3124d";
+      sha256 = "2dac88705bd1c8e68998dedc426883b3625816f23bd5c544e5ec5c362fa4eaec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/trs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/trs/firefox-144.0.2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "3c8deda2c9a4a398c3d51210e36c2d4759e988ee3580e1f561ad1f881d8d485e";
+      sha256 = "f74ee12d8d2e177cc1163f7d6ccab6c9fa07d0ff588ac4fac7b7434d4eaf5d06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/uk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/uk/firefox-144.0.2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "0a2c77653fe2775cd8c782f4650e4777fc5f1d5824f02d5bf7fae5fbd2486c31";
+      sha256 = "fd985ad21dca19a790434240af067e822aa089a1bfc148c26e06aa44a84a5a9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ur/firefox-144.0.2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "3af39f96710ea7f5390192f833a3d5e20158dfb3cb8f5096ad7ccc8db4b8988c";
+      sha256 = "487c28f6cc97e275f8aef94138c8561787ed49904f88e16c4b4df59c22908fcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/uz/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/uz/firefox-144.0.2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "390936902fbcf7145863b249fd58ac3ae76c0bd46f518b73a211354d022f23b2";
+      sha256 = "72ce0909f74e9ef9a48dda4c86d8e5693771c818765dd86ae52bbca8252f5f67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/vi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/vi/firefox-144.0.2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "0c4f5df8a4708990b6b6f4806fed323f031e14faa51a8120e42471b2003b5d8d";
+      sha256 = "b303b06fa58de68d591f5e9de9796425de9fd7836916087591499be5110d5869";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/xh/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/xh/firefox-144.0.2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "e2c4814ccd47e915200d59076c5bd1dde4c1ed1ccd2e239897e1bcce02791ffd";
+      sha256 = "a8b5968c3fd7df7c999f900d2fecdf57c3c2e5791730c8d112ce7b60dfc79e3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/zh-CN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/zh-CN/firefox-144.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "8a5bfc84936fd37a02d420aef0de6f51912e3b7f53562f63dd969ec0aebcc17a";
+      sha256 = "651b38321cfcf9c1e787d6b500f9c5bc1386cbbdfc1799ba69ab82fe53ff58c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/zh-TW/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/zh-TW/firefox-144.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "b9b7f5cb3a60b5cc44bbaa92b8a5bb570ecb54c506494815e8a5bcb617a43c6c";
+      sha256 = "f4b7d0de26eda1c1cb6079d84cc5416d2406928cd0cdd87aa2e4f76f8b85f001";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ach/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ach/Firefox%20144.0.2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "4276b946e9fdb3d002055282ed0aa7f8a1e2543b940dfa3f0bc1bdc2bd9085cf";
+      sha256 = "7a9ce1bb8395f49647e691632e3d32d779f99eb1623b561812ed43d26d8be3a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/af/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/af/Firefox%20144.0.2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "2f8ab55d6fb725508cc11111511e86a4884ab7b49c4f97f10fd90693079bcf67";
+      sha256 = "c7dfcfc6e62f11abf00fab9f2093ec0601a5a8066911bd33c24c5a936d538e8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/an/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/an/Firefox%20144.0.2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "1d588447cfd14c3d6a265731bf98878a2cfc2ec64696042fc6997a8436b77414";
+      sha256 = "693cdac108fe7680a676d4fdf36f63a8cbcbf4dfde51c2bc3e27157ec815f90d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ar/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ar/Firefox%20144.0.2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "b1bcff90539f56d2fc2711ffd0f45b9c5f9f0794ed48719a10a1756f987777ed";
+      sha256 = "959b68b21517d9d1e8192be25611de1424b725f99f995c709763a36db3755854";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ast/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ast/Firefox%20144.0.2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "87382b1b361221171e7ede3605938c16547ae4ec953bf23b3fc22b8f4a82e81d";
+      sha256 = "4ebf24cff0c330f01edec369663fd5baab7eb0c5bf3dc7e1fbe43a2adcdd039c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/az/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/az/Firefox%20144.0.2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "319e3dd31b582bed12ff29437d9a3f41f4f67566ec8b5a30490035d1cfd3f53a";
+      sha256 = "a65dfe53524352938256f8b805b8aafa5e7197a3cf5a3400ec8bbd8e435dbfaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/be/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/be/Firefox%20144.0.2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "78596d7c4bb996d7251c58f13ea064ec1351337daa6e36ebf31cd59f4f05ddb3";
+      sha256 = "058a574583b7bbec515695e3f898bae96319ec9940ee871a033b2abb4d84c587";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/bg/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/bg/Firefox%20144.0.2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "fd8a6094da140a56d4dab7b8a21cee40604d0034bb9b042d0df9b3d1c83b4e0c";
+      sha256 = "d0c5f95fa371bd163cd02207744c26d39b1b3339360156396dfb5532d498eb8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/bn/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/bn/Firefox%20144.0.2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "69488f334bb8b2656348dc7f22dac1d12c32981c20592c1ce76208175d543a05";
+      sha256 = "c3f90353e9ac074160432072fec14aea4b4d09efcd1ac9fd459c3065c204d67a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/br/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/br/Firefox%20144.0.2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "a7fbcbc187aa3216e90556802f7154912c9b4cfce5a829f6b20c578d9beb5181";
+      sha256 = "dd5a4a324b2f314fd1d5644c395e37873e898b7621b29bdae5992bf3f1df17b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/bs/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/bs/Firefox%20144.0.2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "6cc071934a0d80f144883477294c45d71f43bd30e065c483dd6f7c0cac0554b5";
+      sha256 = "948226df4c000ff7c4604d67e5b097a7415c977413f16314acdae621ca51bb46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ca-valencia/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ca-valencia/Firefox%20144.0.2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "76aa9af0cfeb14264edf64162b7d0e9419ea5267c3217cbd4da31d2ed7391468";
+      sha256 = "38bc2b0650e150c0681e32e799406dc4541edc79e3f1f1b0157bd3db07e26767";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ca/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ca/Firefox%20144.0.2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "5b9317700e19061b0dcc582218ee2a49b910a6df4150821dd7a92e752b661217";
+      sha256 = "e6b1c9c5f108769820f8cc42421b79c786716e4ddef85c71455f4c09aa976a7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/cak/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/cak/Firefox%20144.0.2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "afe6b73514ae263bbbbac0fc512c9eb68a2fdfda5707ecb8a91fb6e759a750b2";
+      sha256 = "eec02351b2b1f78954fb1c9334cac67d13d45889e9522d4bc565bfe45334a7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/cs/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/cs/Firefox%20144.0.2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "a6c5c8d8dacd797287e61c4e4df0ca6e80be7f80f9c17b09929f486c02922a80";
+      sha256 = "62e1c999f3f9d94f7a91f49db871fb06c6bc9d2685e243765eb7dc2c81902ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/cy/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/cy/Firefox%20144.0.2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "065d475b851901fff7de64baa4cfb0be6179ffe0526dbb23e994b4f7e3bc1476";
+      sha256 = "1e3ee62c6ed2c9f0fcf6bf87520451d60ece74b050fd5f9d118873ee3a4517cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/da/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/da/Firefox%20144.0.2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "98bfa21c2fc04073a9c667c7f41fbf69b983421197f9b60b52ca02012d98e818";
+      sha256 = "61b653dac4e3bdc41475a37b2bf013dd6b1a7229c16a4037c97098172da69ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/de/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/de/Firefox%20144.0.2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "8a899c5771a0093b1a69acbc67d3a3a0371ed0a8f2b5ebad649c82cfd3fa3a78";
+      sha256 = "3804296264d2b3eebd8b882d8065da45060edd738b9fbef39295e852463230e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/dsb/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/dsb/Firefox%20144.0.2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "673bf924d975d448b96ecadd6dc08a32d199a6f70f35a559fbbe63d630d2d930";
+      sha256 = "45374fcacf60d97ece40360e3c9301737fa5e30de089446b1e0b78164d2c7069";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/el/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/el/Firefox%20144.0.2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "5ba4f0c5fd7d62dd215cf24f7672706ffa15af601c4fa0909f6406018b7c2d47";
+      sha256 = "1d946b84b13915b56e1ca58d2a91e2e31a560ff3d987e2d71094101e66faba55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/en-CA/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/en-CA/Firefox%20144.0.2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "2b7079d5096dacb58ee126b3471f0c3f18fc6aef98c3347148940b8329069e04";
+      sha256 = "7611eede075757116e5e10e1986e4d26bbcddc2d5c710261f65be1b99050fa47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/en-GB/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/en-GB/Firefox%20144.0.2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "2a56a7d5364a352c21974fb8ad4ee2537a77382827f3e8c0611c297061523a1c";
+      sha256 = "b3fa73254a255372da7ee7803f7680715b9d0edc8916268779d92495aeefc81c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/en-US/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/en-US/Firefox%20144.0.2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "1e444b80921bc999d56c05a7decc1eaf88c0297cac5b90416299af2c77f5ecc9";
+      sha256 = "c67e649a9ef2d23c929ca1b9a87b10591e06303cdf0d9e2395e64bcf7bc0f673";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/eo/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/eo/Firefox%20144.0.2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "5ffd379725835541e75757476fab0391b8bbed08a56cf0a8103656dbbd4d200e";
+      sha256 = "cd52fdaa3ff67a7e2b32e028cdf8ebe3c5257d28a7d6f10d31532fa0f0c1469b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-AR/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-AR/Firefox%20144.0.2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "42bddd11b033a4e46644826a96eb36d4b1427b59472e108fe97afefcf99c9ac8";
+      sha256 = "6f21eb46f02ab9e531c2296c81e9498e9e361360d6ed1415d81b634ce87e8081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-CL/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-CL/Firefox%20144.0.2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "fb51f95601673c5fc3aad32b503c1421b4fd476fb18606e1e251341098c7e120";
+      sha256 = "8581f22c0c8800a16568b1468311438c9756511cf5f4e8c0980434734bda1d46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-ES/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-ES/Firefox%20144.0.2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "8bfbc38a15c62a47513dc591dbc5eda1c0ae6104ce542ad2221e81942d1a6f4f";
+      sha256 = "4aeb90c31abf0641205730e43171e76b53bc01f13addfc6f463e6c48a4ce949a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-MX/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-MX/Firefox%20144.0.2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "4ebbea288a29e4fe600bbc30b5d88cfecfe6f862a9e71146b930e5213bc05769";
+      sha256 = "9a1be5e56bed32527a9fb1d7f507346c75e32826625f4fc11d771064a87dba45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/et/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/et/Firefox%20144.0.2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "1035ff3369fdfd4de1f47788d57a76d68e2c97deda16ca20c32ad289bee9e743";
+      sha256 = "d2ea753f8fb71ffe24d4d53f92daffcf82c6a4b50843db629ee1af7b815942ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/eu/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/eu/Firefox%20144.0.2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "46a874673321699a38e2a7f8fc7f4516ddc3b328061338ed54abe2b5ea4709f9";
+      sha256 = "d1fc326e7434b5436eee91f9f570f4c22529bf7cd846599181452ba171407944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fa/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fa/Firefox%20144.0.2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "fac34940780efac83ff08168cd9ba153c997a2e551419504bbe4df86b54d5fd1";
+      sha256 = "56377e11aca9742783afa0c726ba341bb5e9cd643e3c40b4a05ebe7a830292cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ff/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ff/Firefox%20144.0.2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "40550b728d1116b197ce151c8f0ab81cf2e05dcb7771aacf42ab3adfe9e8dcbe";
+      sha256 = "cc0e79905312f4ddb7b1099db346302f4fd389cb891d48db6cff9385250983ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fi/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fi/Firefox%20144.0.2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "11a664fc41e46e0661b12046ba0ecbba66475ae1e755f89e9a34889afea3b12d";
+      sha256 = "99b86c8a4d6dd173886c9261e450133b0f6844143c1fb96f4732b20de627af70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fr/Firefox%20144.0.2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "b82dd2d38d31191b37307e0044ec44632fb7edee2e8365ba2de7ab5b13189eb0";
+      sha256 = "a83d4387f5899b428bab86c21402f44ed19476ed58f4e1f97d875dabdfb8f0e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fur/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fur/Firefox%20144.0.2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "5d3e157feed0ba1d27f263c6964e28be17c71ba0784b17f20493335e8cde6067";
+      sha256 = "a32e215c3ebef1592a940fdb7e525c547dfa0bbd589c49fd0b1d2deef4047e4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fy-NL/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fy-NL/Firefox%20144.0.2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "a511b5a5d0b716e66a4c29a2459243547dbfc0965801a4758c8e2028fa7dab8a";
+      sha256 = "0637899c4fdde5992a9aae2e0e18bcd6386032af80441701d2d46ec081255d1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ga-IE/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ga-IE/Firefox%20144.0.2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "1b59c37b8bae3181664e27fc85604de24916f84713025cfed0e98a1e0e9b383a";
+      sha256 = "b0b79d284fbe4ad1566e1217ade5c0b1a48b6812d323a328d2bb4b3c5d25fe63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gd/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gd/Firefox%20144.0.2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "06773bb70fcbf04549c510e514c218cef3baf085161b444bc5e379df578e01d7";
+      sha256 = "120f76abcfdb684f0ce0aab8265ca8858343d4f3842740a3742745905cedf192";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gl/Firefox%20144.0.2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "73167d60d07a1746fbb4fbcd1bde0ab6ad5075e7a79bbc9f2cfb63d4b19e2ce1";
+      sha256 = "ff15e91f72512d9c4230f0e16bb811547d92716f7bc2662cfb6d06cda3d17969";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gn/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gn/Firefox%20144.0.2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "a4d649fbb82b591b711278d15f69dd0eae4f3543558f6f2e48e6011dee9e2773";
+      sha256 = "8f0bc7a86d28f5cf692005af7fc77f9fa64ade5ff454d482ec1093a9f96b4fcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gu-IN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gu-IN/Firefox%20144.0.2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "ea77edfa32600b15d2571cb5e2c6730d45c1c84bfd6af235ff92430767d84f46";
+      sha256 = "232d555624bb3e817c2b6bc192929e82c7dd560fc5a0cffc332f5cd910df8d5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/he/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/he/Firefox%20144.0.2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "13251f1038a448d942f51311d33acc04db4332b7b7173f29d066cab2148969d3";
+      sha256 = "a0beaecfe477ed4775d802091c56f6e4c43b6afff0bb992ef00aaf107ae33f5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hi-IN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hi-IN/Firefox%20144.0.2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "cdea9dcf544c1ed44f0876f0a15c30620dcfb036dda05206bad27d3bb07bcad6";
+      sha256 = "5d8ed923974930d2e1e0940ae5569cb4e4d4b37f2158ebc2c9feafbdc5e65869";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hr/Firefox%20144.0.2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "2ba6b74c9313419a5ceab2f6a80bc9601de99d10cc13c253d4670ac7817d41b8";
+      sha256 = "78f50233724f210915d44ec5fbc2161a6bdf1080c8c73efdf44e813ab2414650";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hsb/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hsb/Firefox%20144.0.2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "5926795f229e7d72bde486a1451742074a210d23b71637c3a1b5109271c9affd";
+      sha256 = "8b3fb11a118f22d8b866bf31a501f5f22165f6b1eebb818867858469350f64ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hu/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hu/Firefox%20144.0.2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "96160986546f66f3aac74e0f350ddf623f93d87246f282a4dc1c5c5eee46a423";
+      sha256 = "26855be8cec28cf4432ab24e10d39d461dee658f1e50b9f5cc86d9acd6c06806";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hy-AM/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hy-AM/Firefox%20144.0.2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "e9418b6815cbd29124357ecfb32d9ed5d28149860349066d5b34c48e3969857a";
+      sha256 = "009c380ccc9de0d5e939d02d220122a77bba6bb448006bf0f572886e807eaa3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ia/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ia/Firefox%20144.0.2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "e8d7acc6cc15db58b6026aa1605541d2fccd77da083dd35995fdad058258cbea";
+      sha256 = "e078f44af56f2e070293600940e199e8e569fa665f55fdd06673d18e1b5682a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/id/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/id/Firefox%20144.0.2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "039f9c0f1a5fcda8b47ac7032a108daff85deb89c18a2309df80d6cf54991468";
+      sha256 = "97d8417d2a84ff3cbd9552baed29f729b51c9534f1912ca4134b24feb758b6a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/is/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/is/Firefox%20144.0.2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "83fbe22d2f4e156d5c110d3ac0d08c7b461f2cdaac6cc852d1711dfd367a9460";
+      sha256 = "7204c7a2773d68f3270625c5f668c601c85a9a5b31128b3bd5f36d34c48d2681";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/it/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/it/Firefox%20144.0.2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "4ec979be830e23c1737e60bf1cc82ab5ad64a579f00c338708e6ae06f358fb39";
+      sha256 = "e633ccda088721a891a56100a7962f299a8982535705f7259c41ac3f843e92b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ja-JP-mac/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ja-JP-mac/Firefox%20144.0.2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "94e20e600ff8910ed3f54c45b372f1100ed384fa6e5881e2cf582d64d7723b38";
+      sha256 = "63aa3419071b7d7fa7ec722f5f7c615148b98a6f5c78f7e2f21eaf82a6262eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ka/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ka/Firefox%20144.0.2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "ccba239d6993bd3af0e94c7d858384ee2445f2e0846e1a2d8be940fc0becad4d";
+      sha256 = "a94e53608f565512b3549a1204710f920683a3d80b6fcae833ff5b421349cfc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/kab/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/kab/Firefox%20144.0.2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "db8babfd04de5c3e40f14e41238e4b5fd55775662755ea9966be284c4ee42d1a";
+      sha256 = "b1f4555a2997e8ace91dd2e092adeab920338e2d0f506801e7cae0fbdf0054ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/kk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/kk/Firefox%20144.0.2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "3c5696a4c2fbc8fe6ec40225b2605a42bb8d989f4b78f02e384fbdb6534c280b";
+      sha256 = "5280acd5bdd00f985a578e9b0573f83c460f2a91a64bfab70dfd7f04143a7dca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/km/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/km/Firefox%20144.0.2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "5cae18e877dbfc8340c401d1477fe65cef9768486e609f1f41a286800de73ef2";
+      sha256 = "e72cd6553f4c995be36f7d3cfdfc219c74934604e4ae9520b0ae55a037810002";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/kn/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/kn/Firefox%20144.0.2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "16cdc4eacab04cf0254c8af6c70d0f652d38400167c82c8966e70c83d7471eeb";
+      sha256 = "aed6abdf8ac8a933f4c07a6cdc82a5e5e71bdb0aead65831a687307b0d006911";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ko/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ko/Firefox%20144.0.2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c2e91c02dd631405baf187de66a7f603fc74677427ad6bef623c48a25270fb35";
+      sha256 = "440d17a6653a7c715bfaaa6fbb1e8f588d17c808c3b2e51ddd8548946c0b90c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/lij/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/lij/Firefox%20144.0.2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "80fb2c726c34a12b6d08321e812cbda27d339e4512e043ab669a36597b483a50";
+      sha256 = "85cd057cadbc76c195aabbf7dae470723cbc07672f523d338864b1d269b38fb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/lt/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/lt/Firefox%20144.0.2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "b4d56d4b208409a631b3d4d7b132cd807189e8b482a9a7e2a5e99d1dfc7bdd5c";
+      sha256 = "9f4b0cb079f3cebf8794afe23164e684ab75fd4ee90d019fdd588a2f646c183a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/lv/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/lv/Firefox%20144.0.2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "16bc890c2c5bc1f25717a381a8dd1de05408bb1ac2d57f25a29e885fb06bbb2b";
+      sha256 = "d7c427bac9d58c388469d7ccd0da86f6b8318ae90fedf773cc8462a7227a51f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/mk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/mk/Firefox%20144.0.2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "7440e342bacb25d2c9869599434386fb92c947d5f0980be0fb2c382efaeb07a0";
+      sha256 = "6fb61929c542d4cf85ab746f3cc4a94f9a119c5e90ca1a4694aa037f109466ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/mr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/mr/Firefox%20144.0.2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "80bd295a4e031a5da31b8f9cf12bc806f95bc106811ab79f7603bc0e9b71b059";
+      sha256 = "ed72fba45951d2b52ff3c4cd2c9b7c6a8d2b3dc829fb28b908262222672021e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ms/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ms/Firefox%20144.0.2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b59abd9035792d95c8ae5b57c4757843c1a5947ad97b3a9b1274c10ca433554f";
+      sha256 = "ce642d00e1e7e92646d4fe6e61b88056b23f7583b066c4594270c983eea3f2c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/my/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/my/Firefox%20144.0.2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "d03dddb65f99c87576808b6454cce59b13c22399a3868b60160cfb7136b47420";
+      sha256 = "a1564ab56a04d335bf0678bba8853b759eea2a1e29452d818c6f03c1983f304b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/nb-NO/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/nb-NO/Firefox%20144.0.2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ec6d9879a6d7ad3eb3815269f8417409cf0b68ffa7d81f975956ed9da3725b72";
+      sha256 = "c0d4d5bdaa7929c8142cbb7afec863e623d926897a90d16898a721fb477880b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ne-NP/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ne-NP/Firefox%20144.0.2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "9f47f263204ce4ce85b0055c01e787e6b57eb3c774eedc788ed9157edbcd74e7";
+      sha256 = "097fade524b0e3d91fde5f3784051d72378073d99551ff5b1b8354715efa75ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/nl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/nl/Firefox%20144.0.2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "7f4e390eb8c282ebfd3fc350414eccb75c40fd73d739cc6cd531fd9e27c2420b";
+      sha256 = "d60d706c96649ae46843580c03c1958c01ce2f224f3560bfc3174a84ededd988";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/nn-NO/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/nn-NO/Firefox%20144.0.2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "b24eb701b7872b8f73a75d971d4441dad0d670b2ebddb164589054c11345f2bb";
+      sha256 = "d2ef83f90c3eb26bf631548f4a6ab0ce0cc0e8fbd83c095e24e524c8300be6ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/oc/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/oc/Firefox%20144.0.2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "69c1e0ef56821a5d8dd439e4e14d1a27e01581f89b384a3a25ab14c7c5e7eaa9";
+      sha256 = "ee56c979f776ec5c16e791b10ec3890e0038f63a3e92729653181856decfe932";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pa-IN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pa-IN/Firefox%20144.0.2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "dde4f090f0966e3f476c52c12e23360dbf11fd0a5fd0b84318551539b35659e8";
+      sha256 = "50c6c2e27645c912e53929aeebf204e65253b5d8acdb445cf646a67fbea6bb95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pl/Firefox%20144.0.2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "7ff025e78563d008873b52b8ae3dc0136c16ca08ba225755f5a2963b7d63d8de";
+      sha256 = "e91e76f76e64b3e78f7a58fa7a34b8b4abf6be441e1d56f47a9f911c2f792b69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pt-BR/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pt-BR/Firefox%20144.0.2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "6f712f5b83ee6403093b659f566348e284844564400ba14180b03f6e2ac8328c";
+      sha256 = "0913be45b7148d972e8646071876b2187861ce9ed1cccf67a7856255ae12dbd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pt-PT/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pt-PT/Firefox%20144.0.2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "04a681a4f2fa1875e7b0cd0304ea2263a9a7c2303a110dbf3c7447cf5f77158f";
+      sha256 = "a1e08dba05a83790f5ad63a52a8913c8b5036739debc0925b81b99badccd4256";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/rm/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/rm/Firefox%20144.0.2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "818b3c96cafc11a2d1ffd67aaf7569341a5f9b718c9102db9a94f2d4e4b72016";
+      sha256 = "12b3d413e7227248fe502c1eca88df32c09cbf84c732ac65cbaa0239cd9d6d64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ro/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ro/Firefox%20144.0.2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "4d0c078f6a4f8d26946b00a71031645fd01e7c1978fc0b736297218172bb5312";
+      sha256 = "8701dd604404640abd26bafd43782705d8a9a2cd8263e1ed580de53ed30572a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ru/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ru/Firefox%20144.0.2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "e6fef5b53ca85472df3f70d45db7a4f1f8e58adba7bc4f06770e259a68f1a568";
+      sha256 = "4f9279a41916bae0f22d8c4c2161b5ca08dc073f0585d964c33d696c7d34fbb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sat/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sat/Firefox%20144.0.2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "893ce0e0b6da456d1a8f4161f9371eae51b2c3c41458f7cbf7578b8abb2d0e96";
+      sha256 = "240993509d9a95fc9da0f02cb412ce0031dc0c8d9ec1ba92d29d673af19cbe02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sc/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sc/Firefox%20144.0.2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "a4426974e29f754738cd1c1faca7fbdfb3fd626082ea0d40c08338319038c81f";
+      sha256 = "5f0fc83e96029766f706775a54a6025240278ffcae2d5489e84c1822d1b8b53d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sco/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sco/Firefox%20144.0.2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "ca0fb81dcbbaf4e77ec9fa286ef0b619e0ad4c25e3d2bb1e9c5bc76810bc6820";
+      sha256 = "e4318148ab4d190de351a639cfd50696adf3bd95eca666163f3226ce57470167";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/si/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/si/Firefox%20144.0.2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "b07692d747214eda21cb981612493fac20bc9f918e4108b301d1a176a1e81815";
+      sha256 = "fbc3ef939bfb5aea12122ff275b9427ecf03ce18d21dc31e631a1c3d51b71e11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sk/Firefox%20144.0.2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "df95fdba11ebc15bc728a143af8acca91cc0a9274f7ee869afcfaae7c0e669b4";
+      sha256 = "e4c5886d978d5efcbe34aeeb9688ff6d9d3cc98730b153cb5d9ba98e02cb5352";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/skr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/skr/Firefox%20144.0.2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "72cdddfcdc7798db253959b39b6ae03522763b25fa4532b8352144d38c2f2b5d";
+      sha256 = "395772a5e7bd42d46283a9b443bcf959ee57bb90a49ada511c1805b32c18908a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sl/Firefox%20144.0.2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "b8a298eb59fd39d577cbc92cf708cfa46c4bca8563c84f85dc07a680c9c75d07";
+      sha256 = "9bf967196cb7152b014a55bfec6f2fbdcd5eba9445f858cd0340974ce069eb95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/son/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/son/Firefox%20144.0.2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "58b3c9fdfc36461c9791dae9b8466751a5038043e01202db35229220eb6850c8";
+      sha256 = "2dd1e18f1d757eaecf6c930bf88bedcbc6b3bf733f5e101237e78c5df7b36ab3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sq/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sq/Firefox%20144.0.2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "fa798195257309e071be28126751ab5fa1388aa0e1e24bf23790dded0f100b2f";
+      sha256 = "6adf1095aaef4dff690875ec7da5ca1b8b9cc67d504b8fbe74a98dbf9e97b3cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sr/Firefox%20144.0.2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "89ea3b70af3c5c99a0020d2113a6905a6680a5966f6b51b9c2ee389c0aad9193";
+      sha256 = "0caefa89b22fdcb323f0c24c519d139127ea5cc79ef2a68ebe5c0eadde3df621";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sv-SE/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sv-SE/Firefox%20144.0.2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "d21256313648c267a92a97a795a3c7d62e7b8d7270d8865b49e725a3a9e50885";
+      sha256 = "fe652cc5adeb6902f6efe78fce0eebce6fb9c5f487e8444fc8b3e3e13b8d007b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/szl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/szl/Firefox%20144.0.2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "b1d6b79b3acddcd48da313098debc82b25eb839ea569334b609bb3d793ee5ac4";
+      sha256 = "fb3a8d69b00b869eae9f69645163ef2733d28144d670b6f371bc00b6e321dccf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ta/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ta/Firefox%20144.0.2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "9abff19859cf0c3df2cbeeba0e5e79ed5fcfe93b659a25056dbe997ec1ddc69a";
+      sha256 = "36caf69dd0a35c5e5bcf09ba44a9abbe4191cc46862322a6e56da5b46dc7018c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/te/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/te/Firefox%20144.0.2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "a52d31546f1083520ca13692aaec2db9aeac3db9b11c4a09c82041e95a19ea92";
+      sha256 = "c2038ee75753d0323fc64f929a70cc13998c702429fa8efd988e1283868ffd22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/tg/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/tg/Firefox%20144.0.2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "f151f83a9b727f918c5ab44f6991b20102cb2c3197a729af7d77ec3a09be1e69";
+      sha256 = "36f97c166e88eb9ca7c4521cb22e5f6b0b69aa98a93568a023e114cc61e813b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/th/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/th/Firefox%20144.0.2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "09e95a74b23a93f282e64bed309e078a5dfb9a7d9231dbadef439326a2e3fa18";
+      sha256 = "9182a0d15c9482243f03766fa0bde4f6a1b7ce994b0a39bbd6d4c6f3376c5a70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/tl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/tl/Firefox%20144.0.2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "380578292291aaf57c2343927941fcaadb124214b463b30ccd9c84485d0026b3";
+      sha256 = "1a70e01dca9e0c9cf9729ab55f3c81abdcee8339b97e8ed21adb085763c273ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/tr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/tr/Firefox%20144.0.2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "614e5426ea0c5a9bf9d9c2c903ecc9fbebcc36a821a550f2b2680457ef0f63d3";
+      sha256 = "8a9f393371faa0cad41aa412faa2019b3e03777bee7c66e89ccfe5c5f2735b32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/trs/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/trs/Firefox%20144.0.2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "32d7669f8f87afcd03b131000f17f00e5b55a1479133155723476475d3b921e6";
+      sha256 = "972668d4c01fbbea3150436cffd932874943b6e565c89d841eca12ded3a46715";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/uk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/uk/Firefox%20144.0.2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "31a74a758cef43e1d7d4c71e31d742bd79a0c5b9e5946135b8298d06cdedf5b5";
+      sha256 = "ea53b9ee7ba12338375b5e5b9bf5d1d0f3ffffece0ab0c79b435778fc793e6e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ur/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ur/Firefox%20144.0.2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "b9e17a696d53dafac98d1c2164ea3b1b619e8bf8b344be30d182f99fd892b5cc";
+      sha256 = "3b5f0e2fa45f4f1184ccc67ef499afba51e7fa55977eba7e83dee3f4bdcc9441";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/uz/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/uz/Firefox%20144.0.2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "e9ea930995fdafb634f9a896f3cadc79a920354fc16df64603167680a62098cd";
+      sha256 = "3f76b49db69eeafb97d4f038a1e52fdfdd450df1e98fda48a22f48c5e2a82a95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/vi/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/vi/Firefox%20144.0.2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "232925d4435628448f27146075519a11763b828b07ee69002fd8ab8718ef7129";
+      sha256 = "6f1b2e8e87439b8330cec73a9ea76259c3a1adca3a7d2081acea66766c4d689d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/xh/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/xh/Firefox%20144.0.2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "c1e4f9ad80580a99498d04656f64b6d8f4293114b51e928b6264845997cd61ca";
+      sha256 = "14fdb87d01dcaa0938c3c22901b6387b1d334eac07fad2b70d6e1409f09497e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/zh-CN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/zh-CN/Firefox%20144.0.2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "44ee593ece0711a3eb67fdc8803c88bced8fa887578202dc4d356139cf4acf52";
+      sha256 = "adb2af0387752f7af7f86e6556e78dd9c91ea8fa710304a3e2e3e50ae2dce929";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/zh-TW/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/zh-TW/Firefox%20144.0.2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "14f924e6184cf01091ea3dffb18f1f684325dccada852b8db39df0beaf532b44";
+      sha256 = "1eef9697bd2e14233ee5ea6324522585967a7f8a5770f11bc72f98ebe4aa71d5";
     }
   ];
 }
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 86b09c0b85a4..3bfbca592ae1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "144.0b9";
+  version = "145.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7";
+    sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769";
   };
 
   meta = {
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 5a5bf633bd9a..c65b04e5ac36 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "144.0b9";
+  version = "145.0b9";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247";
+    sha512 = "36000021b8f30eb5e80ce3b2e4ae05499e8b8cbdec93ba97dfb9c8f107cbe80202a13c4923491c01c8c245fc1810bb6fc82a46a06817ab7e70a47c04385b306e";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but
diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 4718b256ce42..d3e07cd16f76 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,17 +9,20 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "144.0";
+  version = "144.0.2";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "e1f924ed006a31f5333ea6af219c1fb90d4866e5889ac634c324a3e80b042a7e0b2b9aeb798672ea1a434fbf817fc0b82a12ec0fb405a48e3a2ca21cc394445e";
+    sha512 = "87eebabab2c85eb32b2d1161e520f56e271a4893c8cd4d8225fc7b498a9883496315854a758478fb4edd061674a9f7c0503e9b9f0eb4503b1f89203774d02f97";
   };
 
   meta = {
     changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
     description = "Web browser built from Firefox source tree";
     homepage = "http://www.mozilla.com/en-US/firefox/";
-    maintainers = with lib.maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [
+      booxter # darwin
+      hexa
+    ];
     platforms = lib.platforms.unix;
     broken = stdenv.buildPlatform.is32bit;
     # since Firefox 60, build on 32-bit platforms fails with "out of memory".
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index be43ccc85ad6..c144a5076e75 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -116,7 +116,7 @@ let
         ++ lib.optional smartcardSupport opensc
         ++ pkcs11Modules
         ++ lib.optionals (!isDarwin) gtk_modules;
-      gtk_modules = [ libcanberra-gtk3 ];
+      gtk_modules = lib.optionals (!isDarwin) [ libcanberra-gtk3 ];
 
       # Darwin does not rename bundled binaries
       launcherName = "${applicationName}${lib.optionalString (!isDarwin) nameSuffix}";
diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index be1a3e715912..ce0d83ce9482 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "143.0.4-1",
+  "packageVersion": "144.0.2-1",
   "source": {
-    "rev": "143.0.4-1",
-    "hash": "sha256-RyLz5se2AqXAmsa/MckiUgcBfRxZVVsrNg2L757qOuo="
+    "rev": "144.0.2-1",
+    "hash": "sha256-cSuLUia4hlpSKrl+smWiDg1MUKOwymhizkAwc9ReEXs="
   },
   "firefox": {
-    "version": "143.0.4",
-    "hash": "sha512-K8veTnLqQenMyYg2kBY1NQtdx7UMYY4Zq2EDonrcDwF8o/p1VTeMivbuHzoU0Ck1KJ/isNNdhA1hD1rAeojktg=="
+    "version": "144.0.2",
+    "hash": "sha512-h+66urLIXrMrLRFh5SD1bicaSJPIzU2CJfx7SYqYg0ljFYVKdYR4+07dBhZ0qffAUD6bnw60UDsfiSA3dNAvlw=="
   }
 }
diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 96e0a2ab8a93..10841acb7672 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.9.0.1";
+  version = "33.9.1";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-QhER20l8GP0wQ0pDVwBZbYb2FImbX0kiUS9RCcR7gvg=";
+          hash = "sha256-muFqS3NpYX0Walhd+RFIZh7pUKQ5ZbPMZJasm9+rqTE=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-13lq59H8xGNbZHalZo87xAaoQg61t2v+B/LXnPoEyoU=";
+          hash = "sha256-lRFXpv+dp3ALVSiEDwE4kiaVjBX5XuVZeugEr+St53I=";
         };
       };
 
diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index caa60413028a..61f6526bab8e 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.30.3";
+      version = "3.30.4";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-Z2kYUak/zzO0IsKQyQ6sb3UD4QUZ9+9vGGVfl4qdPF8=";
+        hash = "sha256-WhEdSmJxTLOYke7Jszca+P7dWCLs9tZF074Okl4vDpw=";
       };
 
-      vendorHash = "sha256-C9sge+xNTsW30PF2wJhRUNI1YEmXInD+xcboCtcC9kc=";
+      vendorHash = "sha256-W+rHPYCuP9rK/f8yYutP4Cac8cJ6XKtoVAxCeqPtpsM=";
 
       inherit doCheck subPackages;
 
diff --git a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix
index 778ed6261df0..2f8b27c170fd 100644
--- a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix
+++ b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix
@@ -21,13 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
     "hadoop-${finalAttrs.version}-src/hadoop-yarn-project/hadoop-yarn/"
     + "hadoop-yarn-server/hadoop-yarn-server-nodemanager/src";
 
+  postPatch = ''
+    sed -i -r 's/(cmake_minimum_required\(VERSION) [0-9.]+/\1 3.10/' CMakeLists.txt
+  '';
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openssl ];
   cmakeFlags = [ "-DHADOOP_CONF_DIR=/run/wrappers/yarn-nodemanager/etc/hadoop" ];
 
   installPhase = ''
     mkdir $out
-    mv target/var/empty/local/bin $out/
+    mv target/usr/local/bin $out/
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index dc3759d31ea4..b771864c5b65 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -144,6 +144,8 @@ let
 
       passthru = { inherit tests; };
 
+      # The recursiveUpdate below breaks default meta.position, so manually override it.
+      pos = __curPos;
       meta =
         with lib;
         recursiveUpdate {
diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
index f41ab8f499a7..3253dc38c6a5 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "helm-dt";
-  version = "0.4.10";
+  version = "0.4.11";
 
   src = fetchFromGitHub {
     owner = "vmware-labs";
     repo = "distribution-tooling-for-helm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2Owm5x42R+BXGPrTz4Kaw8vboy4G6Jx93JWganOUlfo=";
+    hash = "sha256-k7+t52UU5dfElD7885AppO2+mccjQwh2mRImByUfAaE=";
   };
 
-  vendorHash = "sha256-CIVgNS74V75etC9WBzoxu6aoMHlUYxWd22h2NG1uNn0=";
+  vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
new file mode 100644
index 000000000000..f511cbde3870
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix
@@ -0,0 +1,10 @@
+{
+  traefik-crd = {
+    url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-34.2.1+up34.2.0.tgz";
+    sha256 = "0bnvkp1bxfsccgdnvpq3ni3p2h8jyvj0iclbqj0rsls8vv1jnp9z";
+  };
+  traefik = {
+    url = "https://k3s.io/k3s-charts/assets/traefik/traefik-34.2.1+up34.2.0.tgz";
+    sha256 = "16ljy2ncn2kc4kr3m93w2kfw4vjk8is3cp3i2lx4b7afbmi75zyw";
+  };
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch b/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch
new file mode 100644
index 000000000000..15a0cbb28137
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_34/go_runc_require.patch
@@ -0,0 +1,15 @@
+diff --git a/scripts/package-cli b/scripts/package-cli
+index a15d754926..bc450dbe4e 100755
+--- a/scripts/package-cli
++++ b/scripts/package-cli
+@@ -3,7 +3,10 @@ set -e -x
+ 
+ cd $(dirname $0)/..
+ 
++runc_require=$(grep "github.com/opencontainers/runc" go.mod | awk -F '=> ' '{print $2}' | xargs -0 printf 'require %s')
++echo "$runc_require" >> go.mod
+ . ./scripts/version.sh
++sed -i '$d' go.mod
+ 
+ GO=${GO-go}
+ 
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
new file mode 100644
index 000000000000..1d838a36651c
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json
@@ -0,0 +1,26 @@
+{
+  "airgap-images-amd64-tar-gz": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz",
+    "sha256": "076c53d96bbca9ed7aee5a4e398933787c55c59fd58e617581ce885e22759793"
+  },
+  "airgap-images-amd64-tar-zst": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst",
+    "sha256": "27355d2838c727180f0a8ded8aec0ac14e2186bd50487a3c3f29500884121aa7"
+  },
+  "airgap-images-arm-tar-gz": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.gz",
+    "sha256": "7292bafb04a8800b7efdc096a4e4f00d972dcf9a009f7ccca311a0bc9b23eda1"
+  },
+  "airgap-images-arm-tar-zst": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm.tar.zst",
+    "sha256": "64e166d1b037ed87566c444261365bdd54745de6cf8acf1ae4698ddf34ca69a7"
+  },
+  "airgap-images-arm64-tar-gz": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz",
+    "sha256": "b1f649125466251088aec6fcd56b86df29d7674eb3ae6ab596448ddfd60cc9e0"
+  },
+  "airgap-images-arm64-tar-zst": {
+    "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst",
+    "sha256": "78380791cb61262b78d61c2b52fd77e0eedde6c0351e53d11e2cfb9034ec5937"
+  }
+}
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch b/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch
new file mode 100644
index 000000000000..7788762eaf2b
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_34/version_sh_go_list.patch
@@ -0,0 +1,18 @@
+diff --git a/scripts/version.sh b/scripts/version.sh
+index 37500a3b788d..96a6e6205472 100755
+--- a/scripts/version.sh
++++ b/scripts/version.sh
+@@ -10,11 +10,11 @@ if [ -z "$NO_DAPPER" ]; then
+ fi
+
+ get-module-version(){
+-  go list -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1
++  go list -mod=readonly -e -m -f '{{if .Replace}}{{.Replace.Version}}{{else}}{{.Version}}{{end}}' $1
+ }
+
+ get-module-path(){
+-  go list -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1
++  go list -mod=readonly -m -f '{{if .Replace}}{{.Replace.Path}}{{else}}{{.Path}}{{end}}' $1
+ }
+
+ PKG_CONTAINERD_K3S=$(get-module-path github.com/containerd/containerd/v2)
diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
new file mode 100644
index 000000000000..6dfebc63f175
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix
@@ -0,0 +1,15 @@
+{
+  k3sVersion = "1.34.1+k3s1";
+  k3sCommit = "24fc436e6ea59c56ebc37727baa4e6c9a201ee01";
+  k3sRepoSha256 = "0fjkjsmig7xdn1filph2wbp69jva0jdkv8ax68wymvbqq4rn3s0k";
+  k3sVendorHash = "sha256-87YMUWhwfFwm5bzcL42b7JFJbVWsoRtubH4jjYH/7mc=";
+  chartVersions = import ./chart-versions.nix;
+  imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json);
+  k3sRootVersion = "0.15.0";
+  k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0";
+  k3sCNIVersion = "1.7.1-k3s1";
+  k3sCNISha256 = "0k1qfmsi5bqgwd5ap8ndimw09hsxn0cqf4m5ad5a4mgl6akw6dqz";
+  containerdVersion = "2.1.4-k3s2";
+  containerdSha256 = "18z6i6mzvllhglarsc6npn4k0m4akg7wm1rqc4a926dag47mgh8j";
+  criCtlVersion = "1.34.0-k3s2";
+}
diff --git a/pkgs/applications/networking/cluster/k3s/README.md b/pkgs/applications/networking/cluster/k3s/README.md
index dcc2bffcc69e..7ad2a4be131f 100644
--- a/pkgs/applications/networking/cluster/k3s/README.md
+++ b/pkgs/applications/networking/cluster/k3s/README.md
@@ -9,6 +9,7 @@ K3s is a simplified [Kubernetes](https://wiki.nixos.org/wiki/Kubernetes) version
 ## Configuration Examples
 
 * [Nvidia GPU Passthru](docs/examples/NVIDIA.md)
+* [Intel GPU Passthru](docs/examples/INTEL.md)
 * [Storage Examples](docs/examples/STORAGE.md)
 
 ## Cluster Maintenance and Troubleshooting
diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index c4f52dd566e4..2e002dd47777 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -68,7 +68,7 @@ lib:
   socat,
   sqlite,
   stdenv,
-  su,
+  shadow,
   systemdMinimal,
   util-linuxMinimal,
   yq-go,
@@ -203,8 +203,9 @@ let
 
     # Let killall expect "containerd-shim" in the Nix store
     substituteInPlace install.sh \
+      --replace-fail '"''${K3S_DATA_DIR}"' "" \
       --replace-fail '/data/[^/]*/bin/containerd-shim' \
-        '/nix/store/.*k3s-containerd.*/bin/containerd-shim'
+        '/nix/store/[^/]*k3s-containerd[^/]*/bin/containerd-shim'
 
     remove_matching_line() {
       line_to_delete=$(grep -n "$1" install.sh | cut -d : -f 1 || true)
@@ -372,7 +373,7 @@ buildGoModule (finalAttrs: {
     conntrack-tools
     runc
     bash
-    su
+    shadow # kubelet wants 'getsubids' when using user namespaces
   ];
 
   k3sKillallDeps = [
@@ -478,5 +479,7 @@ buildGoModule (finalAttrs: {
   }
   // (lib.mapAttrs (_: value: fetchurl value) imagesVersions);
 
-  meta = baseMeta;
+  meta = baseMeta // {
+    mainProgram = "k3s";
+  };
 })
diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix
index c1e6635c0c65..aac1f555d094 100644
--- a/pkgs/applications/networking/cluster/k3s/default.nix
+++ b/pkgs/applications/networking/cluster/k3s/default.nix
@@ -41,4 +41,27 @@ in
       ];
     }
   ) extraArgs;
+
+  k3s_1_34 =
+    (common (
+      (import ./1_34/versions.nix)
+      // {
+        updateScript = [
+          ./update-script.sh
+          "34"
+        ];
+      }
+    ) extraArgs).overrideAttrs
+      {
+        patches = [
+          # Sets -mod=readonly for go list commands in scripts/version.sh to prevent go from using
+          # the (intentional) incomplete vendor directory. Additionally, sets -e for go list to
+          # change handling of erroneous packages.
+          ./1_34/version_sh_go_list.patch
+          # Adds explicit require of opencontainers/runc to go.mod before version.sh is called and
+          # removes it afterwards so that later build commands don't complain about inconsistent
+          # vendoring.
+          ./1_34/go_runc_require.patch
+        ];
+      };
 }
diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md b/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md
new file mode 100644
index 000000000000..467208b44457
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md
@@ -0,0 +1,168 @@
+# Intel GPU Support in k3s
+
+This article makes the following assumptions:
+1. `services.k3s.enable` is already set to true
+2. The Linux kernel running is modern enough to support your GPU out of the box
+3. The desired driver is `i915` -- modify as needed for other drivers
+
+> Note: at the time of writing, the author was using an Intel Arc A770 in k3s. The majority of this guide likely should work on other Kubernetes distributions, and will likely work identically for integrated graphics capabilities.
+
+### Enable the Intel driver in NixOS
+
+Add the following NixOS configuration to enable the Intel driver (necessary on headless deployments):
+
+```
+services.xserver.videoDrivers = [ "i915" ];
+```
+
+After rebuilding the configuration, reboot the host for the GPU driver to be assigned to the GPU. Use the following command to ensure the GPU is using the i915 kernel:
+
+```
+sudo lspci -k
+```
+
+i.e. the output looks like this on a host with the Intel Arc A770:
+
+```
+❯ sudo lspci -k | grep -A 3 'Arc'
+03:00.0 VGA compatible controller: Intel Corporation DG2 [Arc A770] (rev 08)
+        Subsystem: ASRock Incorporation Device 6010
+        Kernel driver in use: i915
+        Kernel modules: i915, xe
+```
+
+## Install Intel Node Feature Discovery (NFD) in k3s
+
+Intel's device plugin for kubernetes provides Node Feature Discovery (NFD). NFD allows for GPU capabilities on a node to be automatically discovered if a discrete GPU is installed and the Intel drivers have been properly assigned.
+
+> Documentation for Intel NFD installation is here for reference: [Install with NFD](https://intel.github.io/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/README.html#install-with-nfd)
+
+The following commands will install NFD in the cluster (assumes `curl`, `jq` and `kubectl` are all installed/configured):
+
+```
+# Use the latest release
+export LATEST_RELEASE=$(curl -s https://api.github.com/repos/intel/intel-device-plugins-for-kubernetes/releases/latest | jq -r '.tag_name')
+
+# Use Kustomize to deploy the configuration
+kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd?ref=$LATEST_RELEASE"
+kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/node-feature-rules?ref=$LATEST_RELEASE"
+kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/gpu_plugin/overlays/nfd_labeled_nodes?ref=$LATEST_RELEASE"
+```
+
+NFD should automatically apply relevant labels to your node. This can be verified with the following command:
+
+```
+kubectl get nodes -o yaml | grep gpu.intel.com | sort -u
+```
+
+Output should look similar to the following:
+
+```
+❯ kubectl get nodes -o yaml | grep gpu.intel.com | sort -u
+      gpu.intel.com/device-id.0300-56a0.count: "1"
+      gpu.intel.com/device-id.0300-56a0.present: "true"
+      gpu.intel.com/family: A_Series
+      gpu.intel.com/i915: "1"
+      gpu.intel.com/i915_monitoring: "0"
+      nfd.node.kubernetes.io/feature-labels: gpu.intel.com/device-id.0300-56a0.count,gpu.intel.com/device-id.0300-56a0.present,gpu.intel.com/family,intel.feature.node.kubernetes.io/gpu
+```
+
+> Note: `gpu.intel.com/i915: "1"` indicates only one pod can use the GPU -- see below for a fix.
+
+Now, GPU-enabled pods can be run with this configuration:
+
+```
+spec:
+  containers:
+    resources:
+      requests:
+        gpu.intel.com/i915: "1"
+      limits:
+        gpu.intel.com/i915: "1"
+```
+
+### Allowing more than one pod to use the GPU
+
+In the default configuration, only one pod can use the GPU. To enable multiple pods to use the GPU, apply the following Kustomize patch:
+
+```
+patches:
+- target:
+    kind: DaemonSet
+    name: intel-gpu-plugin
+  patch: |
+    - op: add
+      path: /spec/template/spec/containers/0/args
+      value:
+        - -shared-dev-num=10
+```
+
+Or, manually edit the `intel-gpu-plugin` DaemonSet to run with `-shared-dev-num=10` (or however many max pods can access the GPU), like so:
+
+```
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: intel-gpu-plugin
+spec:
+    spec:
+      containers:
+      - args:
+        - -shared-dev-num=10
+```
+
+Verify the number has been applied like so:
+
+```
+kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u
+```
+
+i.e. in this configuration, up to 10 pods can use the GPU:
+
+```
+❯ kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u
+    gpu.intel.com/i915: "10"
+```
+
+### Test pod
+
+This is a complete pod configuration for reference/testing:
+
+```
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: intel-gpu-test
+  namespace: default
+spec:
+  containers:
+  - name: intel-gpu-test
+    image: docker.io/ubuntu:24.04
+    command: [ "/bin/bash", "-c", "--" ]
+    args: [ "while true; do sleep 30; done;" ]
+    resources:
+      requests:
+        gpu.intel.com/i915: "1"
+      limits:
+        gpu.intel.com/i915: "1"
+```
+
+Once the pod is running, use the following command to test that the GPU is available:
+
+```
+kubectl exec -n default -it pod/intel-gpu-test -- ls /dev/dri
+```
+
+If the GPU is available, the output will look like the following:
+
+```
+❯ kubectl exec -n default -it pod/intel-gpu-test -- ls /dev/dri
+by-path  card1  renderD128
+```
+
+Delete the pod so as to not count against the GPU limit:
+
+```
+kubectl delete -n default pod/intel-gpu-test
+```
diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index b43c63ecef0d..490b926c7e27 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -17,14 +17,14 @@
 
 buildGoModule rec {
   inherit pname;
-  version = "2.12.0";
+  version = "2.12.1";
   tags = lib.optionals enableGateway [ "gateway" ];
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     tag = version;
-    hash = "sha256-5syQFcYBY/xKipIsAJdjVrXYXt7NNjjCeXiDVNO9NTo=";
+    hash = "sha256-9s89fiBFIP6azB1SDCZkTlQWAQ2C6htQXRMvyWrNch0=";
   };
 
   vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";
diff --git a/pkgs/applications/networking/cluster/linkerd/generic.nix b/pkgs/applications/networking/cluster/linkerd/generic.nix
index ef5835bcd6db..20f07da27e2b 100644
--- a/pkgs/applications/networking/cluster/linkerd/generic.nix
+++ b/pkgs/applications/networking/cluster/linkerd/generic.nix
@@ -31,11 +31,6 @@ buildGoModule rec {
     env GOFLAGS="" go generate ./jaeger/static
     env GOFLAGS="" go generate ./multicluster/static
     env GOFLAGS="" go generate ./viz/static
-
-    # Necessary for building Musl
-    if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then
-        export GOFLAGS="-buildmode=pie $GOFLAGS"
-    fi
   '';
 
   tags = [
diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index bf4c61a47591..90792ef3dd29 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -8,6 +8,8 @@
   RSupport ? true,
   R,
   nixosTests,
+  # needeed in situations where hadoop's jdk version is too old
+  jdk21_headless,
 }:
 
 let
@@ -28,7 +30,15 @@ let
         R
         pysparkPython
         ;
-      inherit (finalAttrs.hadoop) jdk;
+      jdk =
+        if
+          (
+            (lib.versionAtLeast finalAttrs.version "4") && (lib.versionOlder finalAttrs.hadoop.jdk.version "21")
+          )
+        then
+          jdk21_headless
+        else
+          finalAttrs.hadoop.jdk;
       src = fetchzip {
         url =
 
@@ -96,6 +106,11 @@ in
   # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08).
   # A better policy is to keep these versions around, and clean up EOL versions just before
   # a new NixOS release.
+  spark_4_0 = spark {
+    pname = "spark";
+    version = "4.0.1";
+    hash = "sha256-AW+EQ83b4orJO3+dUPPDlTRAH/D94U7KQBKvKjguChY=";
+  };
   spark_3_5 = spark {
     pname = "spark";
     version = "3.5.5";
diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index b39f437f904d..89894ddcb3f5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -82,7 +82,9 @@ let
       passthru = attrs // {
         inherit provider-source-address;
         updateScript = writeShellScript "update" ''
-          ./pkgs/applications/networking/cluster/terraform-providers/update-provider "${owner}_${lib.removePrefix "terraform-provider-" repo}"
+          ./pkgs/applications/networking/cluster/terraform-providers/update-provider "${
+            lib.replaceStrings [ "registry.terraform.io/" "/" ] [ "" "_" ] provider-source-address
+          }"
         '';
       };
     }
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 2718b93cac25..306afcfc4a30 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,49 +27,49 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-BF1Js7K6CqxcE5+H/fWFsSvhrNr1UCg2T4Bz9BOSF0w=",
+    "hash": "sha256-+51Roeyn0+vNo3dCLMD8kyiOXf6ATVAQlEZ4O7B7zCw=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.45.0",
+    "rev": "v4.46.1",
     "spdx": "MIT",
-    "vendorHash": "sha256-t3BENz/43pI33HkWrFnV3ISE3oZOAWyYodjKQcnyE/4="
+    "vendorHash": "sha256-8cChWCS8yV69djpoeElLgaorpbHY2Jg04WKY3e+pvsg="
   },
   "akamai_akamai": {
-    "hash": "sha256-cM3/GwtS4Y7WG1Rg3D58FOvzfwMSNhcggD3bwJcWgE8=",
+    "hash": "sha256-gz4yhT9Vge1Q0KPQ16+EU/25xK5Ac1OsbL0aJ8wJxVc=",
     "homepage": "https://registry.terraform.io/providers/akamai/akamai",
     "owner": "akamai",
     "repo": "terraform-provider-akamai",
-    "rev": "v9.0.1",
+    "rev": "v9.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-bS9fFfttu58a2S3CNLO3FOlLPuk/2h1D0bjO6nJbfP8="
+    "vendorHash": "sha256-2dGMtSLIiBuhZt4XmcBGfkghU4kCsMsiRFWKMbdmSB8="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-QZaOnNCfVKBTkDSdNw8mQbF8NfJUhEeN2y3tVt1J1D0=",
+    "hash": "sha256-4dj49kVEPPFfd8N86L5czVOpdCkE4H7OKnIzZY8pMv4=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.260.1",
+    "rev": "v1.262.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-+Hc2NCCnJ0fB86fvgE4Kak8fwlsXIiv8avIhE/RoWeM="
+    "vendorHash": "sha256-GvnQrgczdnxpWCq8/vHcpcKeYf8v+GU/edx2CgPA/40="
   },
   "aminueza_minio": {
-    "hash": "sha256-A730CkOsaQArSLYdiUQg3pmrGA8gvYokqiwcL2tDqao=",
+    "hash": "sha256-snQZbGdHTY41aA6iK0PFO5SJ958xnsWPPLGv+H9uV2Y=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v3.8.0",
+    "rev": "v3.11.3",
     "spdx": "AGPL-3.0",
     "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
   },
   "auth0_auth0": {
-    "hash": "sha256-+Kc0fXO6E4U9NdRjI1VGM7RMuBVvP/5GeU6jpEjLgr0=",
+    "hash": "sha256-+Bd+Nc16DqKcO6srCyNjYoEWvckJA8z5GyoGYylh2rg=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.31.0",
+    "rev": "v1.33.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-H1RjKU852ovkrdJrhvedbQS835hN0atDNDCtAcGJMBo="
+    "vendorHash": "sha256-xeng27kJrugxYZfZatrTLG0gql3xDJlnDWJ9pNFOp0c="
   },
   "aviatrixsystems_aviatrix": {
     "hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",
@@ -91,22 +91,22 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-zKkXfSIVVW0QxQB/fJNowy1mQPfXlv6HFcNaNlBSIvY=",
+    "hash": "sha256-1iOsY90WvcR6ZL9ZgkDr4ctKUZLgVsN0kzw5vg6O2Wc=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.11",
+    "rev": "v1.22.13",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "bpg_proxmox": {
-    "hash": "sha256-Pa0JfrZIL1y1O5Ay9D/QDtp8721tQaFjXCIsYX3J/DE=",
+    "hash": "sha256-VVLezja8qq+2sZHwHsXJ5oIAG76+Z60hkcGP7oNPIqA=",
     "homepage": "https://registry.terraform.io/providers/bpg/proxmox",
     "owner": "bpg",
     "repo": "terraform-provider-proxmox",
-    "rev": "v0.84.1",
+    "rev": "v0.86.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-+v4swQIR/QrhhZjeoqrUrZQ5q+9W+6F5k+njTQ7LiLw="
+    "vendorHash": "sha256-01KdQygPJap5cmk8bItHCtHIbBYHYti20KNQDj4uC68="
   },
   "brightbox_brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",
@@ -145,13 +145,13 @@
     "vendorHash": "sha256-iEQdSvQOCwvxhqh+veQ59uDVoXjCxsysxzkF4DHAf1E="
   },
   "checkly_checkly": {
-    "hash": "sha256-nKD9qjIRudq/MK+c8eC+hv8oDiW+ycYVnDO8+DHg3W4=",
+    "hash": "sha256-UfaiZe5qSbnoyoYx1E1yXG8cQyBbG+wbJiBXR7jm0bE=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.14.0",
+    "rev": "v1.15.0",
     "spdx": null,
-    "vendorHash": "sha256-Lz8ixBnWqecxBqS+XVrpkVg1X2Ew28axO+jmo+Zb8cE="
+    "vendorHash": "sha256-Puf8Rex1o3P1XAO+LIXBWx9MTUUsaD+iJQkFLjqVJA0="
   },
   "ciscodevnet_aci": {
     "hash": "sha256-+aD4M07xXMTbvp69IuGlO3rSkVEi5NVe5fqEPkWNeM0=",
@@ -181,22 +181,22 @@
     "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
   },
   "cloudamqp_cloudamqp": {
-    "hash": "sha256-WjmZTm04m0iTrXg2/B4I64ccXnfT+qYHZzaYgnJRy3c=",
+    "hash": "sha256-h/QAHh5hpTtpyKcq6LqqJunN9+U2GIEpm8+yEeevHjM=",
     "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
     "owner": "cloudamqp",
     "repo": "terraform-provider-cloudamqp",
-    "rev": "v1.37.0",
+    "rev": "v1.38.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-p/vZYmNBkUGHjZHYzmixOzOWi55YUrbbEdVbOeX1JIs="
+    "vendorHash": "sha256-q942GCRd5czCdlpLYsXzj8Kt91GjCpyzhOkgWfkyHo8="
   },
   "cloudflare_cloudflare": {
-    "hash": "sha256-Lc9bC1dM4wNe+ZN2EYFRYfoZosocBEOI9SHvxJIOQCY=",
+    "hash": "sha256-Fx8Vh/2ALKIA3AlPEca+A0flVL7hHHNJM4Cfdklpq28=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v5.11.0",
+    "rev": "v5.12.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-N1vG3U7gxEbVbBax7g6AfHr2Aj1ypVefsEIuvZyLPYQ="
+    "vendorHash": "sha256-PZsYazLRmURTrtIq6KBUKPlzxewzbUzJTXN6YWbK288="
   },
   "cloudfoundry-community_cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",
@@ -264,13 +264,13 @@
     "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
   },
   "datadog_datadog": {
-    "hash": "sha256-J3fkSivj89bLNu+4HHd+9Q4tI731jTTozGNSgxbuwug=",
+    "hash": "sha256-bl9hs1mjzmh8ePH94/PZTXt4yGz5+Ma0YFpxI+it6eg=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v3.75.0",
+    "rev": "v3.79.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-DzJGSfqDOteTX+rQJ7NY/GvAaGhNAhOzE91Je40UhnU="
+    "vendorHash": "sha256-l+eOOc+Mi3z0VQDX+7+JrNNTRKDAOr3JKFw1WJt8OIE="
   },
   "datadrivers_nexus": {
     "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",
@@ -300,11 +300,11 @@
     "vendorHash": null
   },
   "digitalocean_digitalocean": {
-    "hash": "sha256-Twj59NRaUwx1YsgzAQm7XYbOZaJlJ/pDLzP/jam4D/8=",
+    "hash": "sha256-XNRfSqBtgYOnu2n2uO9eJv5G58a8k01g23UandDzIHw=",
     "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
     "owner": "digitalocean",
     "repo": "terraform-provider-digitalocean",
-    "rev": "v2.67.0",
+    "rev": "v2.68.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -345,49 +345,58 @@
     "vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U="
   },
   "drfaust92_bitbucket": {
-    "hash": "sha256-CJ86MKT2FKf5KbHZegZBbyNoAGe9hg59q8E5urNDqAo=",
+    "hash": "sha256-/rfJeZ1tnQgA7mijCzYeSz0c8Vp7aYURuLKXSuIu8z0=",
     "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket",
     "owner": "DrFaust92",
     "repo": "terraform-provider-bitbucket",
-    "rev": "v2.49.0",
+    "rev": "v2.50.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ok73U0WWFGXp5TJ7sp7U9umq7DlChCw7fSyFmbifwKE="
+    "vendorHash": "sha256-u/ycUCnEYlCBrDcI0VCkob4CGXrXYdGWwiw5EeJyuiw="
+  },
+  "e-breuninger_netbox": {
+    "hash": "sha256-iCaCt8ZbkxCk43QEyj3PeHYuKPCPVU2oQ78aumH/l6k=",
+    "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox",
+    "owner": "e-breuninger",
+    "repo": "terraform-provider-netbox",
+    "rev": "v5.0.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
   },
   "equinix_equinix": {
-    "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=",
+    "hash": "sha256-WjJxZzrsyHHjsVK4pZf3ByTcFBXbIlw7JiMp9uMv19I=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v4.3.0",
+    "rev": "v4.7.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-BzlSPZ11K9wZXd66jh3CAL+5qco6m0Hb/QiVtAi1Ub8="
+    "vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4="
   },
   "exoscale_exoscale": {
-    "hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=",
+    "hash": "sha256-w7OI4cieF5RtClKUrlnOTE0HSmI1lZ8X+hqMJpzQENo=",
     "homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
     "owner": "exoscale",
     "repo": "terraform-provider-exoscale",
-    "rev": "v0.65.1",
+    "rev": "v0.66.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "f5networks_bigip": {
-    "hash": "sha256-oJIIhIBQXx5u2OwYcyMo4uRdzWdWLz2PlO9r9ZSRIzo=",
+    "hash": "sha256-iUKdsdJ38GE5Q0rbLpnWthKBFBylfe59rfjmQGbCDY0=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.24.0",
+    "rev": "v1.24.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "fastly_fastly": {
-    "hash": "sha256-nevSFpLx1N+rM6ps0jstLem/VdAPIhnTaJefLpfLG/A=",
+    "hash": "sha256-3jXm7uY93g2NE6HfaWKQqQr05AvnCKvzt3981thgV8Q=",
     "homepage": "https://registry.terraform.io/providers/fastly/fastly",
     "owner": "fastly",
     "repo": "terraform-provider-fastly",
-    "rev": "v8.3.0",
+    "rev": "v8.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-5T6pwozD0RKDzdd2XAMuHY651jEvo6V6s1gvwYTHTRI="
+    "vendorHash": "sha256-NBp18Ult6o1hQUEZX1r9I0ebfY9VnwVY4QhChIjsGSI="
   },
   "flexibleenginecloud_flexibleengine": {
     "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",
@@ -417,13 +426,13 @@
     "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA="
   },
   "gitlabhq_gitlab": {
-    "hash": "sha256-wggQtY+E4O/iWo0OrjPlxK8j2aLavRAG31RpOOC08AY=",
+    "hash": "sha256-MeOpJGcYwOLReHFjsQe3dpgd96sNc825V1pZQbJCKdE=",
     "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab",
     "owner": "gitlabhq",
     "repo": "terraform-provider-gitlab",
-    "rev": "v18.4.1",
+    "rev": "v18.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-29uvPCepGHRPohGY7viaPD9VQPPj9XB/plragACC4e4="
+    "vendorHash": "sha256-rCL9TzEMe7zyJFmNvgNpyMiT8x0MCrUsdSQ9zU1c4pQ="
   },
   "go-gandi_gandi": {
     "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=",
@@ -453,20 +462,20 @@
     "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
   },
   "grafana_grafana": {
-    "hash": "sha256-KVNwgn7swWXRNJNpXV8oy++s+CrDZhMPDDP40qIZIlY=",
+    "hash": "sha256-RHADl2x2Tr22P53PJ0gXrAmxe+1mm6A3k0B8+92iDYg=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.10.0",
+    "rev": "v4.12.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-JS0moRxd+Vxzg4Wq5Med4/daVSZPver+JifAdgt2sQk="
+    "vendorHash": "sha256-xCwnCYP3QjIGkO844rczU6cHd6Pk8SKzRfO3mJK3XVc="
   },
   "gridscale_gridscale": {
-    "hash": "sha256-gkOAV1iKv7r2OouHAemlresb9sLcjZ5i8tLQazQrgyA=",
+    "hash": "sha256-XdBGD94kMLcB3ycZABVT+skiPg7rYyR4ycfvnubj6JM=",
     "homepage": "https://registry.terraform.io/providers/gridscale/gridscale",
     "owner": "gridscale",
     "repo": "terraform-provider-gridscale",
-    "rev": "v2.2.2",
+    "rev": "v2.2.3",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -480,22 +489,22 @@
     "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
   },
   "hashicorp_aws": {
-    "hash": "sha256-Y/ZDYj6kJ4LaIPk443scDGNAj6J3Y7SqkNFFUaSOj0o=",
+    "hash": "sha256-wavy4GE4VrXhDYqWAJsexxFPDM/Roo+YKp/DqVw8+jU=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v6.16.0",
+    "rev": "v6.19.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-LYrda07sa7I4aOmr+mOQRN0NkA9ZI7VxOSWFkqGEKQ4="
+    "vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-qxCrBJo8oPy9+2e7Pq9Ex5jslJMEkfOzpTdhn/ouV0c=",
+    "hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.58.0",
+    "rev": "v1.62.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BNc2pwbIBPkLiUaGjBbUayysgIgS58AUA9nfr/KGMZo="
+    "vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk="
   },
   "hashicorp_azuread": {
     "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",
@@ -507,11 +516,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-gpIIj/nSMjhenXs2LbdJV5hdXoMKieueJ6o4xIG7HtA=",
+    "hash": "sha256-kFjvjaUDmiK3IfO/hioTTTkUetij4CSYJ359bxmpG40=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.47.0",
+    "rev": "v4.51.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -525,13 +534,13 @@
     "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw="
   },
   "hashicorp_consul": {
-    "hash": "sha256-kLoJKnqbjsrzBqFNPpG59UOYlp2UKYsS7b6cu5xImp8=",
+    "hash": "sha256-SlXzhH9EQJAAcSAog6XzbeenzseXNEUfXdYtURpUcUw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/consul",
     "owner": "hashicorp",
     "repo": "terraform-provider-consul",
-    "rev": "v2.22.0",
+    "rev": "v2.22.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ODAqEy04jptTR2dggCm9Vs2xxVt02SVVgGAUa06+9YY="
+    "vendorHash": "sha256-HQXioE9mbc+0Qf6MGiXKXSfmbUUtkUafA01GEXbLQfE="
   },
   "hashicorp_dns": {
     "hash": "sha256-+M4i5tvGrjGRBwB9bFp6YYhbz3qGRcg9W6PhD59Rfbk=",
@@ -552,31 +561,31 @@
     "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
   },
   "hashicorp_google": {
-    "hash": "sha256-lJ5XBL983pKdZdN8scof+uJ16CJAOXp1NIxWmJCa4O0=",
+    "hash": "sha256-sGdKvVyQkYVM2zZ6fVgUr2ANgQVwJjvlcbSUAUagsqU=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.6.0",
+    "rev": "v7.9.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-cQybnUaDLVmQrtFkiI5k3OwqN9Oks+J1H2kbkNjO4jc="
+    "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-YefUWAHgBiZebigcCmn5poVkg6ZxHjILzL5JXhrGKFY=",
+    "hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.6.0",
+    "rev": "v7.9.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Bii3UrY1WbhewgsURxq7gGVqT1WSszFkif0V88hiyZo="
+    "vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
   },
   "hashicorp_helm": {
-    "hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",
+    "hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/helm",
     "owner": "hashicorp",
     "repo": "terraform-provider-helm",
-    "rev": "v3.0.2",
+    "rev": "v3.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
+    "vendorHash": "sha256-qzwm0R51jvElo+T8ypkHrlQy/MH8c/o+NWIS+YrQ4uw="
   },
   "hashicorp_http": {
     "hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=",
@@ -678,11 +687,11 @@
     "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4="
   },
   "heroku_heroku": {
-    "hash": "sha256-VGx2J7huF05HU/59Hyo2rxwV3SR+kVJWtrfWoRmln2o=",
+    "hash": "sha256-hR4DvSneqG/5P4tYljcuFxQ34AnDIjIt+JMn1BhloeU=",
     "homepage": "https://registry.terraform.io/providers/heroku/heroku",
     "owner": "heroku",
     "repo": "terraform-provider-heroku",
-    "rev": "v5.3.1",
+    "rev": "v5.3.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -696,22 +705,22 @@
     "vendorHash": "sha256-jwDezL9gI6A9pCdD1CUgEOJT8dqVuPX/sFjTO4Jiqs4="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-uMWYrO5X8+CrafIN+NyYX3C1U2r9JAsAsAG5czlxyDY=",
+    "hash": "sha256-k0XUu+QyxTLGp+r+gBbHx1+wqVCC5Xy2D4fMqWTCMOo=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.79.0",
+    "rev": "v1.80.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-+Ux/Xp598uRpRgBfVucrl8GYkpaKcmZ5h67ExdBEchY=",
+    "hash": "sha256-QnXzIWs6Ts6qAz9qiTT+9Zd7gKx3tQGswgDH2D7z7gw=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.83.3",
+    "rev": "v1.84.3",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-G6kqcQMpNKioBEWNDGIYCJaoYv6EPAbu2Nh/8EkQGAA="
+    "vendorHash": "sha256-AfdcXD39h5y+AJF7pQ76qxH7FgOp/ya5AWFo/pAUoxc="
   },
   "icinga_icinga2": {
     "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@@ -732,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-rmIoyGlkw2f56UwD0mfI5MiHPDFDuhtsoPmerIrJcGs=",
+    "hash": "sha256-Xicv5L4DnSoIs4vCXDVawHzxKI7PzTfdBZ4+0jzg1uc=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.6.0",
+    "rev": "v6.7.5",
     "spdx": "MIT",
     "vendorHash": null
   },
@@ -787,22 +796,22 @@
     "vendorHash": "sha256-UuLHaOEG6jmOAgfdNOtLyUimlAr3g6K8n3Ehu64sKqk="
   },
   "keycloak_keycloak": {
-    "hash": "sha256-59+rVoS49w6aGFqpvcgoiYAFebsQLjXbPrhvZHMYV3s=",
+    "hash": "sha256-1iElc1BemBqQ10FRozd+Pi5jkcMS/d9pexp+VKdO4BY=",
     "homepage": "https://registry.terraform.io/providers/keycloak/keycloak",
     "owner": "keycloak",
     "repo": "terraform-provider-keycloak",
-    "rev": "v5.4.0",
+    "rev": "v5.5.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-pnOwYupql5EWoA0l72RENXeAQELaFHlDorJLQKJUz+c="
+    "vendorHash": "sha256-OZG8EA8xtskbLZgHzWm865wjnhRCsWdNepNMHfdtkyw="
   },
   "kislerdm_neon": {
-    "hash": "sha256-D1KWC2D4OLMUSWKzQmiZaDrATCv4SEUWwk6SK/o1U5M=",
+    "hash": "sha256-O7VYLD1qyH5oXv02OxrhQW+J1VysiHwbwW+Fzq4VKkE=",
     "homepage": "https://registry.terraform.io/providers/kislerdm/neon",
     "owner": "kislerdm",
     "repo": "terraform-provider-neon",
-    "rev": "v0.9.0",
+    "rev": "v0.11.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-8WY2iEOFOwx7zDMps5cctxzv1stRseS/OUaHkMDuBYs="
+    "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
   },
   "kreuzwerker_docker": {
     "hash": "sha256-THMGfpRrPFReRdYusdrJGnUKEUtxy4Pu+HdcceK2FNc=",
@@ -823,13 +832,13 @@
     "vendorHash": "sha256-b9+0YLuv9AVszGDQ2v+VbYameN16PCdE3jUhL9efK6M="
   },
   "linode_linode": {
-    "hash": "sha256-ofgX6ih/UHd1Lm36KgS7BG8QY7ENhywHY2IhQ/ebfqM=",
+    "hash": "sha256-t6vHW9t3MWsPsGUh44OXvYTfHa03qiH3lveKK0dit9Q=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v3.4.0",
+    "rev": "v3.5.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-iZGbGd16fHtYKXh25O7LLcrjwm4Ceeak5dTN9t5rZGk="
+    "vendorHash": "sha256-8LbFq29JvQX3Trn81fr3YMjFwW+OTWAyK6OVAkh0I3A="
   },
   "loafoe_htpasswd": {
     "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=",
@@ -850,13 +859,13 @@
     "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8="
   },
   "lxc_incus": {
-    "hash": "sha256-ecTodsExnc96AoyYKutPLNu5UQrVObcWQwFUcv9oCB4=",
+    "hash": "sha256-N+3OHJGK67iITA8DGDMZSYmCdkhPkXRlv4NzOLpu4y8=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v0.5.1",
+    "rev": "v1.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gyU+RiCtf5gl5RDuAalYHgXqvU2sioxnL6ZfOwn6vYE="
+    "vendorHash": "sha256-eTCRjnC86O2q6YZj6ltOfiBKbFCeFR1zsF3QiJ73SYA="
   },
   "marcofranssen_dexidp": {
     "hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=",
@@ -877,13 +886,13 @@
     "vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
   },
   "metio_migadu": {
-    "hash": "sha256-Ld7+cL/Ei06Z3Lkx6HyrBP0dPX3S9KYPNwnRG86xsRk=",
+    "hash": "sha256-Itfy/EZiBI6j4GU9I3pQGpsMkykN8FVZ4FPhcUre8a0=",
     "homepage": "https://registry.terraform.io/providers/metio/migadu",
     "owner": "metio",
     "repo": "terraform-provider-migadu",
-    "rev": "2025.10.2",
+    "rev": "2025.10.30",
     "spdx": "0BSD",
-    "vendorHash": "sha256-3/rZWHBQZMvu1nCM/SCdL0TkJ2cxtOCQqGgIblnR9+k="
+    "vendorHash": "sha256-LMCFXZYZ9qwuu0/hA8mRNktCwwC4DRaqveW2dAJWQTQ="
   },
   "mongey_kafka": {
     "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",
@@ -904,13 +913,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "mongodb_mongodbatlas": {
-    "hash": "sha256-evMjL6I9q80olTkuigJLbAHTDU4nYXNaMVf8cq6yZsM=",
+    "hash": "sha256-a5oTDhV1e0wX7HR1xyZM1KM9D4/8EghhKFF0PkvPjqM=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v2.0.1",
+    "rev": "v2.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BWItAEI+ST5wN/CyTHljFJvutJiDHYjV4HEeLtmhC2o="
+    "vendorHash": "sha256-MejX7qApT4Aq/LzUExpi92yCb4Id/yfY6z/rduOs+so="
   },
   "namecheap_namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",
@@ -940,22 +949,22 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "newrelic_newrelic": {
-    "hash": "sha256-XF62BlLPEF9CYPO00HV05T6djLyMvyC/N4HlYg5MM0I=",
+    "hash": "sha256-1OpvSayWq194591u/z9oHz80ZmPA9fSZpKSBwDHL/tk=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.70.5",
+    "rev": "v3.74.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-45psSf69IetY0o8LjBDEv2GnOxaOzaQcPCnV2YHPXGs="
+    "vendorHash": "sha256-7zUUV3cqVesItNnE/EcO5/l+nafV04JdoNkmTxnulio="
   },
   "ns1-terraform_ns1": {
-    "hash": "sha256-JJ+Zcf7r8bB1a8l+DtHhjT4Ce2VqRIkD1fS+EWI6QtI=",
+    "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=",
     "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
     "owner": "ns1-terraform",
     "repo": "terraform-provider-ns1",
-    "rev": "v2.7.1",
+    "rev": "v2.7.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-HC2MCVF3gS4nXKplC1pGrdjbhjRzr03ajqZ7pQIgSOc="
+    "vendorHash": "sha256-TBMJn9UIRub0N2yI+eGgPMvxSsPQo+xRSMB7qDO8lyw="
   },
   "numtide_linuxbox": {
     "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",
@@ -994,13 +1003,13 @@
     "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
   },
   "okta_okta": {
-    "hash": "sha256-O4zZ+D/+GTGf7Q7hHKlAcBg/0C7nCrhCV0St+LohedA=",
+    "hash": "sha256-7vjNorBNdfF3cTu1ANx+5Uh5chAL54lWZ7R9cMI/gpA=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.2.0",
+    "rev": "v6.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oE4nB0dFsiz82kj9QOr0vIjD3aBR+jxeAW5/ZWUxp44="
+    "vendorHash": "sha256-gLFMFVw44jJcuVzY6OcUHJ74rRCIQuon4p9RNoQPLPs="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",
@@ -1021,38 +1030,38 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-3+ravOgTUzGXKd/e12opM/xcm0Vqaz4lLbpo3MLetrg=",
+    "hash": "sha256-VrhloC601pG6jcBbrKc/ldhtWwzJzhkLdHj1/UPOUqk=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.49",
+    "rev": "v1.36.51",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Nvq1/t5TlLSBon8jlPmPUduQtFGKBLQRTZKBmpYHV1M="
+    "vendorHash": "sha256-57F7YS7r+/O8qSWfNhrT/5XAaq7CfX7RchY/45WBauw="
   },
   "opsgenie_opsgenie": {
-    "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
+    "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
     "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
     "owner": "opsgenie",
     "repo": "terraform-provider-opsgenie",
-    "rev": "v0.6.37",
+    "rev": "v0.6.40",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-LnR1bXTr+j7tKALZll/dwUI+o9TepPGS0mAHGxYK7g0=",
+    "hash": "sha256-R+Khf/BCDaFf1ExD3+zUIEoL/egRw0ube83cP3opO/I=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v7.22.0",
+    "rev": "v7.24.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-G6pLpThqKuCDx4QdTYvJYpba56ZWaxPML/3H1oslw34=",
+    "hash": "sha256-PNVbGn+MTb1139uDVSLBCKVMtDmY/c8uJCiTSBtbZAE=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.8.0",
+    "rev": "v2.9.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1066,11 +1075,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-3Dv2EOh/4xa7rjJBikIhbSQaskncGjxHYaS6WqHriKo=",
+    "hash": "sha256-VcVvToBrmgLWiv7NpC6DEvXlq+bIydYat/g6E/8Uyhc=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.30.2",
+    "rev": "v3.30.5",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1093,13 +1102,13 @@
     "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
   },
   "poseidon_ct": {
-    "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=",
+    "hash": "sha256-Y0hBXxd9Ll5DY6hljZlI2QpTM/lWBZomQ47iAHbNuAs=",
     "homepage": "https://registry.terraform.io/providers/poseidon/ct",
     "owner": "poseidon",
     "repo": "terraform-provider-ct",
-    "rev": "v0.13.0",
+    "rev": "v0.14.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
+    "vendorHash": "sha256-blWCf8O0B7INdZnlhOup6oihFEMY3UTmC1CF+0DJqUU="
   },
   "poseidon_matchbox": {
     "hash": "sha256-B1PxdbqXrB1ioB5utI4LI6rkhwHmaAiYkSxRAcjJnAA=",
@@ -1120,13 +1129,13 @@
     "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-HlUjEeyomuLqlKFq5U+dpgyBOxrxHALqywVbJM9Fm/s=",
+    "hash": "sha256-8UlBt9gmQflO5sB++U4Ih40+6p+U6N8PE1npQYg9D8U=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v4.3.2",
+    "rev": "v4.3.7",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
+    "vendorHash": "sha256-IpWN8hCZlXm9hbPr2VcjzU7wtqivUk2h+LOaaz4KyP4="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",
@@ -1138,22 +1147,22 @@
     "vendorHash": null
   },
   "sacloud_sakuracloud": {
-    "hash": "sha256-hS4hXmi30yiIkWNqXKhuIE3UtzcWrfu4w6XR6B9Vebc=",
+    "hash": "sha256-kiAl/qdLbXzBCwgms3Y7TD/Ez2Hq0ifZ1SLVIPa9Bmk=",
     "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
     "owner": "sacloud",
     "repo": "terraform-provider-sakuracloud",
-    "rev": "v2.30.0",
+    "rev": "v2.31.1",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-at8i4gCFrJxE9fVIL5uI7iSFex0gLXu1SnlPKlZAmrY="
+    "vendorHash": "sha256-BREv9hd6Oa/S8NjpRoLcF8uUFykEyffQO0LCuA3WFmc="
   },
   "sap_btp": {
-    "hash": "sha256-pz5+Hhu3pBTjBOVzpUXI589PZzKJtoUrOpTC8/TNEE0=",
+    "hash": "sha256-55SNzeOaMyaidEbCjGPNF20qhQgddNHOl2xNqd7OZU4=",
     "homepage": "https://registry.terraform.io/providers/SAP/btp",
     "owner": "SAP",
     "repo": "terraform-provider-btp",
-    "rev": "v1.16.1",
+    "rev": "v1.17.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-pCBmeisWcyw/Box1yrWwYj+hSrsqmToiiom2jS8I1SU="
+    "vendorHash": "sha256-v+yPo9ueuhC8QNEeiQGngk7o5t+QeIJaxqKE5Yb1eug="
   },
   "sapcc_ccloud": {
     "hash": "sha256-Dpx0eugcHCJV8GNPqjxx4P9ohgJgB10DTnHr+CeN/iQ=",
@@ -1165,13 +1174,13 @@
     "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-FT9V0qAs6NSULqOMsW9uolc1WgueUnU4vfL4rntMA1A=",
+    "hash": "sha256-dZWoqco5C/QMBek+m+kLe1cl86NLe9EHMh6XV+TOFf4=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.60.4",
+    "rev": "v2.62.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OcKCtH4ciGrKwidTQC+yTWMyMfShJMsTnsKOyBxwLDg="
+    "vendorHash": "sha256-SUGyDQ23ZgRbf2yGm+ih3nwMp90ckadG6Zeu6Am/fU8="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",
@@ -1183,13 +1192,13 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "selectel_selectel": {
-    "hash": "sha256-J0hz5qtT3bBKqoZ9SkZn0oxix1fIQRmwv7feME7CljM=",
+    "hash": "sha256-qGqoljx5G7fmqrnhfVll+hX1afR3+3blcY1Hob5ujYY=",
     "homepage": "https://registry.terraform.io/providers/selectel/selectel",
     "owner": "selectel",
     "repo": "terraform-provider-selectel",
-    "rev": "v6.8.0",
+    "rev": "v7.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TQXj2Em665zhCqXiT2BG1xxvVCo0/G2SaQKUbqGwcQM="
+    "vendorHash": "sha256-K70gvX9XcMoDCNQk9k7dtBBQxYSiS3TkqGBxMK3pOK0="
   },
   "siderolabs_talos": {
     "hash": "sha256-PPD4blyXt4/IalzwEn4+lvuD1Qx7VuUD/CUJILDRI5k=",
@@ -1219,31 +1228,31 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-pYe8xmqudCkRvXNHJ4bSm9uitcDfpRlaGij7CrjQjd8=",
+    "hash": "sha256-lmg7PUwcX1NwuyBEGcZZJbRhpUT9eVUQAf740gk9aAU=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.34.0",
+    "rev": "v1.35.1",
     "spdx": "MIT",
-    "vendorHash": "sha256-DLiS2fqr/gNdZGkhvqjdgpICY0QTlE/Ejl3m29Vanm4="
+    "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-Lx7L9S6uw++51LehLJSESJXXjLUhpMP4LRVGme85y6k=",
+    "hash": "sha256-nhep3042bOUSQKCsS8gOIYLImgXnHmBNsDlXWOCixwI=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.21.2",
+    "rev": "v9.22.3",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TMoZ1uR7G9oC7/9CiwC9rIJazqB9g6Xb+vxvYX2T9RY="
+    "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-bbQ7WDizMnCF95E/iXOSSx0e5K2wMtUW39OxT/45Jn4=",
+    "hash": "sha256-IcphMRvrv762wF1GxPAOyv/z6M+Cor9BEL0llKdr5n8=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.228.0",
+    "rev": "v1.230.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-huHeWKzq/4cHAU4P7q9bOiJ2cAFqevZ80BsCyPiujxw="
+    "vendorHash": "sha256-mcsiXXueAETbv3KIJiAw7xtGAWiaXAXPo1JTNhLao5s="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",
@@ -1255,31 +1264,31 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic_sumologic": {
-    "hash": "sha256-0vWAKROcci1v9QRnBEyN5o9kD3c3YYAKimixRbC3mpk=",
+    "hash": "sha256-5b+hCWXyafLeCA7F5RlUj2GpO7Ipy8UVAQxjQaoYnJA=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.1.6",
+    "rev": "v3.1.7",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-nLZgUNWv2e3yTl7/ntSP//BNAaidJxzYA5+v2pJCYDM=",
+    "hash": "sha256-hqcnyBWB7PWTTRCOczgF6hSBibvlGl+x9EkYn3vi4v8=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v2.1.0",
+    "rev": "v3.1.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },
   "tailscale_tailscale": {
-    "hash": "sha256-3sStrkhEZqtR+G5kTFSx++Yxa26h00Y2fa8DI6/8ftY=",
+    "hash": "sha256-EiaQKO4Pg+89Mc8nwSarKhHBtr+yEKWEyZ4i0LeOfu4=",
     "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
     "owner": "tailscale",
     "repo": "terraform-provider-tailscale",
-    "rev": "v0.22.0",
+    "rev": "v0.24.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-Di4Mc67GrGue0fN47APjJKiWSCw5MRuYF4tS9hP6HLw="
+    "vendorHash": "sha256-GhXplzkv0ouWSo4fNs7C0h87sFguhre6ez4d0Pgd/5w="
   },
   "telmate_proxmox": {
     "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=",
@@ -1300,11 +1309,11 @@
     "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-SfkTyjf0sPrVcOs27JYuLu4ebjelsVUV/L061KU1xOs=",
+    "hash": "sha256-aBZukPo+T1GItIQLJhCRMcSMZxV71gw+HIjBN6pxtmA=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.29",
+    "rev": "v1.82.34",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },
@@ -1327,13 +1336,13 @@
     "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE="
   },
   "terraform-lxd_lxd": {
-    "hash": "sha256-ToK0Zua7e4CPm+8ZLIVw+dpt4bbahqWvvCKhjrAeW7s=",
+    "hash": "sha256-bbu7GRwIWcAFB/ZcB47IFlaloUt3D05l6QKTQMSljFU=",
     "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
     "owner": "terraform-lxd",
     "repo": "terraform-provider-lxd",
-    "rev": "v2.5.0",
+    "rev": "v2.6.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-zGHbDQhr1UjF6jcK4NHw90eTVrC+R76G8Fg7vJht20c="
+    "vendorHash": "sha256-yUQaUkqc8Q8vLtfBWsgzraxIiRWAEKZVOAycIFc5r5c="
   },
   "terraform-provider-openstack_openstack": {
     "hash": "sha256-vACjj5wo2zqNls0VgKeylEW5rrsNv1jz5iKoEywBAEc=",
@@ -1345,13 +1354,13 @@
     "vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE="
   },
   "terraform-routeros_routeros": {
-    "hash": "sha256-k+q4n20bvYK7nn9ZGQEQH70xt6ugNKzK58XyzwrKh0Q=",
+    "hash": "sha256-X7HyHSVYNTOM1gPc9MEfs50o2pquKT8SbFXtVfQ44eQ=",
     "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
     "owner": "terraform-routeros",
     "repo": "terraform-provider-routeros",
-    "rev": "v1.88.0",
+    "rev": "v1.90.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gkXP+0w5PDscLaiNK+WsJxz3eYhae5ajxHUmkYuBvwI="
+    "vendorHash": "sha256-AHl0rUuAASk+3qH0C1bRl8IgKWKY+g5rMhzf5/IHQIA="
   },
   "timohirt_hetznerdns": {
     "hash": "sha256-wmXZ6+5Ex3G2JUdw2is2VIo/X1X0V1Auw5KmYpGllug=",
@@ -1362,6 +1371,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y="
   },
+  "topicusonderwijs_octodns": {
+    "hash": "sha256-ji1XD2CoLpTf4slPJcADwpceWmr3a8l9v7043gKOl/s=",
+    "homepage": "https://registry.terraform.io/providers/topicusonderwijs/octodns",
+    "owner": "topicusonderwijs",
+    "repo": "terraform-provider-octodns",
+    "rev": "v1.1.2",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-Mn2K1xt2oB4F+3IuraKngB+3egGrxvzhthy1oLxGyCs="
+  },
   "trozz_pocketid": {
     "hash": "sha256-rUCjvJKLZE+cSsHZdntBF9WpZDtIkVkukmLGEvGVC8s=",
     "homepage": "https://registry.terraform.io/providers/Trozz/pocketid",
@@ -1399,13 +1417,13 @@
     "vendorHash": null
   },
   "vancluever_acme": {
-    "hash": "sha256-Gi8Lpyl/gWGhMbHE27vtTiluMvs9o7UlNsaYs6c1ecQ=",
+    "hash": "sha256-I3x6oiyM29xAvvsrDF8WfZLvgA5bmdta8yDAxeNjTvM=",
     "homepage": "https://registry.terraform.io/providers/vancluever/acme",
     "owner": "vancluever",
     "repo": "terraform-provider-acme",
-    "rev": "v2.36.0",
+    "rev": "v2.38.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-88WR4NT1JhJ3JQHcRQXHxTUvD00vRj3dDNPXViSYSUs="
+    "vendorHash": "sha256-6kRbFB8KCvh8kbSy557AJn5BvYs2e0iBqbWvtVFXPrI="
   },
   "venafi_venafi": {
     "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",
@@ -1471,21 +1489,21 @@
     "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8="
   },
   "wgebis_mailgun": {
-    "hash": "sha256-fuJnzloJa0S1r3/22Wecbq1oF8oRQP2nrrmwCONHITA=",
+    "hash": "sha256-/AYzQgMWo2cPjEMlrOSZLn4IVq4At09KFXkIpc7L5p0=",
     "homepage": "https://registry.terraform.io/providers/wgebis/mailgun",
     "owner": "wgebis",
     "repo": "terraform-provider-mailgun",
-    "rev": "v0.7.7",
+    "rev": "v0.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8="
+    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-5dqOMkm+/uSvNdN+9WLaulHFmDvSiXv/1ZOZUDOFvZs=",
+    "hash": "sha256-uiNLW1Xis+14xksJ9OAItQX60HMyCC6b1ey/0nqlDro=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.164.0",
+    "rev": "v0.169.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2UCLAK9MtDD0RF34MPdaD4E7n3cDjbn1emU2Vu7c2zs="
+    "vendorHash": "sha256-MXDGI1s9dRwpbJ45ivPyy26jjTC552r3xqnLG6Sx3yY="
   }
 }
diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 373a717d69c5..a1e73f5b8030 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -194,9 +194,9 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.13.4";
-    hash = "sha256-i+oXt5Olu0OC6rshQJUsjdEVQLeEoIt+Zrmbs3k3mWU=";
-    vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";
+    version = "1.13.5";
+    hash = "sha256-F8fpTI6kPrjOM+4N67uBCpsxMLQUR6sXzTr1SYFI9Ww=";
+    vendorHash = "sha256-3skDvOcDlTOv8okiGmaB0bvkoMrQjutGdvpxcradqUk=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
       inherit plugins;
diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index e783aef616c7..b2ab9dd0c9d8 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   asciidoctor,
   autoreconfHook,
   pkg-config,
@@ -42,6 +43,12 @@ stdenv.mkDerivation rec {
 
     # https://github.com/dns-stats/compactor/pull/91
     ./patches/update-golden-cbor2diag-output.patch
+
+    # https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb
+    (fetchpatch {
+      url = "https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb.patch";
+      hash = "sha256-eEaVS5rfrLkRGc668PwVfb/xw3n1SoCm30xEf1NjbeY=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix
new file mode 100644
index 000000000000..ad08bf4996b5
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/linphone/bc-mbedtls/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+
+  cmake,
+  ninja,
+  perl, # Project uses Perl for scripting and testing
+  python3,
+}:
+let
+  rev = "1d452d3852321cb55c07307cb506b25759134b76";
+in
+stdenv.mkDerivation {
+  pname = "mbedtls";
+  # taken from `ChangeLog`
+  version = "3.6.1-unstable-2025-08-11";
+
+  src = fetchFromGitLab {
+    inherit rev;
+
+    domain = "gitlab.linphone.org";
+    group = "BC";
+    owner = "public/external";
+    repo = "mbedtls";
+    sha256 = "sha256-jQpRn2F21sPKKAiaqsUvaKyuR80AnedG/hAyiNamKjc=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    perl
+    python3
+  ];
+
+  strictDeps = true;
+
+  # trivialautovarinit on clang causes test failures
+  hardeningDisable = lib.optional stdenv.cc.isClang "trivialautovarinit";
+
+  cmakeFlags = [
+    # tests don't compile, due to how BC sets up threading
+    "-DENABLE_TESTING=OFF"
+    "-DENABLE_PROGRAMS=OFF"
+
+    "-DUSE_SHARED_MBEDTLS_LIBRARY=${if stdenv.hostPlatform.isStatic then "off" else "on"}"
+
+    # Avoid a dependency on jsonschema and jinja2 by not generating source code
+    # using python. In releases, these generated files are already present in
+    # the repository and do not need to be regenerated. See:
+    # https://github.com/Mbed-TLS/mbedtls/releases/tag/v3.3.0 below "Requirement changes".
+    "-DGEN_FILES=off"
+  ];
+
+  # Parallel checking causes test failures
+  # https://github.com/Mbed-TLS/mbedtls/issues/4980
+  enableParallelChecking = false;
+
+  meta = {
+    homepage = "https://gitlab.linphone.org/BC/public/external/mbedtls";
+    changelog = "https://gitlab.linphone.org/BC/public/external/mbedtls/-/blob/${rev}/ChangeLog";
+    description = "Portable cryptographic and TLS library, formerly known as PolarSSL (Linphone fork)";
+    license = with lib.licenses; [
+      asl20 # or
+      gpl2Plus
+    ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ naxdy ];
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix b/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix
index 55830150633f..c9e47a388d10 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/bctoolbox/default.nix
@@ -2,7 +2,7 @@
   bcunit,
   bc-decaf,
   mkLinphoneDerivation,
-  openssl,
+  bc-mbedtls,
   lib,
 
   # tests
@@ -14,15 +14,14 @@ mkLinphoneDerivation (finalAttrs: {
   propagatedBuildInputs = [
     bcunit
     bc-decaf
-    openssl
+    bc-mbedtls
   ];
 
   cmakeFlags = [
     "-DENABLE_STRICT=NO"
 
-    # mbedtils does not build
-    "-DENABLE_MBEDTLS=NO"
-    "-DENABLE_OPENSSL=YES"
+    "-DENABLE_MBEDTLS=YES"
+    "-DENABLE_OPENSSL=NO"
   ];
 
   strictDeps = true;
diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 2ed07af8eeb3..2c215062250f 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonApplication rec {
   pname = "matrix-commander";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
     rev = "v${version}";
-    hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
+    hash = "sha256-eNgnjErPi5q9yA/2iEg3+CoN2xbopmFOpbgU/7GhoAQ=";
   };
 
   format = "pyproject";
diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 3cea1541e636..f7c4235b16a8 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -158,8 +158,6 @@ stdenv.mkDerivation rec {
   ++ lib.concatMap (p: p.buildInputs) enabledPlugins
   ++ extraBuildInputs;
 
-  hardeningEnable = [ "pie" ];
-
   env.NIX_CFLAGS_COMPILE =
     "-I${python}/include/${python.libPrefix}"
     # Fix '_res_9_init: undefined symbol' error
diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 2be6ae59feb1..293b28e074c7 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -11,7 +11,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "maestral-qt";
-  version = "1.9.4";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = python3.pythonOlder "3.7";
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "SamSchott";
     repo = "maestral-qt";
     tag = "v${version}";
-    hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc=";
+    hash = "sha256-FCn9ELbodk+zCJNmlOVoxE/KSSqbxy5HTB1vpiu7AJA=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/applications/networking/mailreaders/astroid/default.nix b/pkgs/applications/networking/mailreaders/astroid/default.nix
index 796742c045af..ce71099f1391 100644
--- a/pkgs/applications/networking/mailreaders/astroid/default.nix
+++ b/pkgs/applications/networking/mailreaders/astroid/default.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     sed -i "s~gvim ~${vim}/bin/vim -g ~g" src/config.cc
     sed -i "s~ -geom 10x10~~g" src/config.cc
+
+    # Switch to girepository-2.0
+    substituteInPlace src/plugin/gir_main.c \
+      --replace-fail "<girepository.h>" "<girepository/girepository.h>" \
+      --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 6213da291bd8..98adbb9c6a3b 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -46,11 +46,11 @@
 
 stdenv.mkDerivation rec {
   pname = "evolution";
-  version = "3.56.2";
+  version = "3.58.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
+    hash = "sha256-Nz/hdFow9x8RN1XvKvwwp6F2imA2GVpk2wUplacaGr8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/darwin.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/darwin.nix
new file mode 100644
index 000000000000..3e2197c84b48
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/darwin.nix
@@ -0,0 +1,36 @@
+{
+  pname,
+  version,
+  src,
+  nativeBuildInputs,
+  passthru,
+  meta,
+  stdenv,
+  undmg,
+}:
+
+stdenv.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    ;
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = nativeBuildInputs ++ [ undmg ];
+
+  # don't break code signing
+  dontFixup = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    mv Thunderbird*.app "$out/Applications/${passthru.applicationName}.app"
+
+    runHook postInstall
+  '';
+
+  inherit passthru meta;
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 06377f89c6fe..d262481af354 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -10,12 +10,9 @@
   fetchurl,
   config,
   wrapGAppsHook3,
-  autoPatchelfHook,
-  alsa-lib,
   curl,
   gtk3,
   writeScript,
-  writeText,
   xidel,
   coreutils,
   gnused,
@@ -23,32 +20,39 @@
   gnupg,
   runtimeShell,
   systemLocale ? config.i18n.defaultLocale or "en_US",
-  patchelfUnstable, # have to use patchelfUnstable to support --no-clobber-old-sections
   generated,
   versionSuffix ? "",
   applicationName ? "Thunderbird",
+  # linux dependencies
+  writeText,
+  autoPatchelfHook,
+  patchelfUnstable,
+  alsa-lib,
+  # darwin dependencies
+  undmg,
 }:
 
 let
   inherit (generated) version sources;
 
+  pname = "thunderbird-bin";
+
   mozillaPlatforms = {
     i686-linux = "linux-i686";
     x86_64-linux = "linux-x86_64";
+    # bundles are universal and can be re-used for both darwin architectures
+    aarch64-darwin = "mac";
+    x86_64-darwin = "mac";
   };
 
-  arch = mozillaPlatforms.${stdenv.hostPlatform.system};
+  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
+
+  arch = mozillaPlatforms.${stdenv.hostPlatform.system} or throwSystem;
 
   isPrefixOf = prefix: string: builtins.substring 0 (builtins.stringLength prefix) string == prefix;
 
   sourceMatches = locale: source: (isPrefixOf source.locale locale) && source.arch == arch;
 
-  policies = {
-    DisableAppUpdate = true;
-  }
-  // config.thunderbird.policies or { };
-  policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; });
-
   defaultSource = lib.findFirst (sourceMatches "en-US") { } sources;
 
   mozLocale =
@@ -59,50 +63,23 @@ let
 
   source = lib.findFirst (sourceMatches mozLocale) defaultSource sources;
 
-  pname = "thunderbird-bin";
-in
-
-stdenv.mkDerivation {
-  inherit pname version;
-
   src = fetchurl {
     inherit (source) url sha256;
   };
 
-  nativeBuildInputs = [
-    wrapGAppsHook3
-    autoPatchelfHook
-    patchelfUnstable
-  ];
-  buildInputs = [
-    alsa-lib
-  ];
-  # Thunderbird uses "relrhack" to manually process relocations from a fixed offset
-  patchelfFlags = [ "--no-clobber-old-sections" ];
+  meta = {
+    changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
+    description = "Mozilla Thunderbird, a full-featured email client (binary package)";
+    homepage = "http://www.mozilla.org/thunderbird/";
+    mainProgram = "thunderbird";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.mpl20;
+    maintainers = with lib.maintainers; [ lovesegfault ];
+    platforms = builtins.attrNames mozillaPlatforms;
+    hydraPlatforms = [ ];
+  };
 
-  patchPhase = ''
-    # Don't download updates from Mozilla directly
-    echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
-  '';
-
-  installPhase = ''
-    mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
-    cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"
-
-    mkdir -p "$out/bin"
-    ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
-
-    # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib"
-    ln -s "$out/usr/lib" "$out/lib"
-
-    gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
-
-    # See: https://github.com/mozilla/policy-templates/blob/master/README.md
-    mkdir -p "$out/lib/thunderbird-bin-${version}/distribution";
-    ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json";
-  '';
-
-  passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {
+  updateScript = import ./../../browsers/firefox-bin/update.nix {
     inherit
       pname
       writeScript
@@ -120,22 +97,48 @@ stdenv.mkDerivation {
     baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";
   };
 
+  nativeBuildInputs = [
+    wrapGAppsHook3
+  ];
+
   passthru = {
-    inherit applicationName;
+    inherit
+      applicationName
+      updateScript
+      gtk3
+      ;
     binaryName = "thunderbird";
     gssSupport = true;
-    gtk3 = gtk3;
   };
 
-  meta = {
-    changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/";
-    description = "Mozilla Thunderbird, a full-featured email client (binary package)";
-    homepage = "http://www.mozilla.org/thunderbird/";
-    mainProgram = "thunderbird";
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ lovesegfault ];
-    platforms = builtins.attrNames mozillaPlatforms;
-    hydraPlatforms = [ ];
-  };
-}
+in
+if stdenv.hostPlatform.isDarwin then
+  import ./darwin.nix {
+    inherit
+      pname
+      version
+      src
+      nativeBuildInputs
+      passthru
+      meta
+      stdenv
+      undmg
+      ;
+  }
+else
+  import ./linux.nix {
+    inherit
+      pname
+      version
+      src
+      nativeBuildInputs
+      passthru
+      meta
+      stdenv
+      config
+      writeText
+      autoPatchelfHook
+      patchelfUnstable
+      alsa-lib
+      ;
+  }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/linux.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/linux.nix
new file mode 100644
index 000000000000..d94874055d43
--- /dev/null
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/linux.nix
@@ -0,0 +1,70 @@
+{
+  pname,
+  version,
+  src,
+  nativeBuildInputs,
+  passthru,
+  meta,
+  stdenv,
+  config,
+  writeText,
+  autoPatchelfHook,
+  patchelfUnstable,
+  alsa-lib,
+}:
+
+let
+  policies = {
+    DisableAppUpdate = true;
+  }
+  // config.thunderbird.policies or { };
+
+  policiesJson = writeText "thunderbird-policies.json" (builtins.toJSON { inherit policies; });
+in
+stdenv.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    ;
+
+  nativeBuildInputs = nativeBuildInputs ++ [
+    autoPatchelfHook
+    patchelfUnstable
+  ];
+
+  buildInputs = [
+    alsa-lib
+  ];
+
+  # Thunderbird uses "relrhack" to manually process relocations from a fixed offset
+  patchelfFlags = [ "--no-clobber-old-sections" ];
+
+  postPatch = ''
+    # Don't download updates from Mozilla directly
+    echo 'pref("app.update.auto", "false");' >> defaults/pref/channel-prefs.js
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$prefix/usr/lib/thunderbird-bin-${version}"
+    cp -r * "$prefix/usr/lib/thunderbird-bin-${version}"
+
+    mkdir -p "$out/bin"
+    ln -s "$prefix/usr/lib/thunderbird-bin-${version}/thunderbird" "$out/bin/"
+
+    # wrapThunderbird expects "$out/lib" instead of "$out/usr/lib"
+    ln -s "$out/usr/lib" "$out/lib"
+
+    gappsWrapperArgs+=(--argv0 "$out/bin/.thunderbird-wrapped")
+
+    # See: https://github.com/mozilla/policy-templates/blob/master/README.md
+    mkdir -p "$out/lib/thunderbird-bin-${version}/distribution";
+    ln -s ${policiesJson} "$out/lib/thunderbird-bin-${version}/distribution/policies.json";
+
+    runHook postInstall
+  '';
+
+  inherit passthru meta;
+}
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index e17dac25316c..e93ffbfa246e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.3.1esr";
+  version = "140.4.0esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/af/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/af/thunderbird-140.4.0esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "e956f9633664fbea309bfaa7e61be6e393f8cd9f15c282f2c6489c2664e8162f";
+      sha256 = "9e7479434b4c228b3305b9f199aa986f454b7dc3c016a8290779d897d2bf2ca4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ar/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ar/thunderbird-140.4.0esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "9ed23fd8154194da58dfa601a1d582645151ddfa8261fb29882bc6df960d289f";
+      sha256 = "9b1bfa25f5e30974332e21541b4d481b53440a08b885f04e77a1e63c822553b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ast/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ast/thunderbird-140.4.0esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "0b352e82a6ff35dc7f5cc733f8bd27913a145665eefc5cc073b055699e55ea1f";
+      sha256 = "b73fca0ffbeef0cab7fe709f7ac36ff885e04cac141a03f574a37660f31061fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/be/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/be/thunderbird-140.4.0esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "acf154e3aac9ba3476a7eb66eb8acd661fdd6bc8a3a14f3df45b9e84f413684c";
+      sha256 = "5c8cf71aeed0930901b777e3af2be05f8539d4b5572272b96d064ca6c5cfbb43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/bg/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/bg/thunderbird-140.4.0esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "2d6fe53a1c65a722e469e4c2951c32e9b6d549f6684e72d9622e9a0de13e88d2";
+      sha256 = "0fdd856a077c9bd05f9d0db1b51e9cbcbb63cc18aeca91eace69f2bb2e6962f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/br/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/br/thunderbird-140.4.0esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "ba866ad75eebbbb857f487949a5b3e94ae801f24a1a101c6f68d2e03cf7d33f4";
+      sha256 = "c99f08fb9ef698bee4776c49e596a9eb1087df0a898b4171a7e694c97ffff7b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ca/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ca/thunderbird-140.4.0esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "953e7d88493c83fd7069fb9a2c2b40108f9c7b80dc87eabba447f018fe8789fd";
+      sha256 = "d330bd3366c25b8e4fe25c1b09a666bed678df72a53c7932dc091f65e9f8a728";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cak/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cak/thunderbird-140.4.0esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "bb8766aa96bf876b7c594c3a454baa12d1e3006f6d7d99b05a540e7689ef63a0";
+      sha256 = "e57ec80db6d5c8237d888d51a3b064bb395c3409be2fbf553f51025782c199aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cs/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cs/thunderbird-140.4.0esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f8ec6daa98ebdbcf0386c3e3637101b06c6641f1e7bd9ddb43f27d5839a21712";
+      sha256 = "1d2067204a024a99cfe8b7684860caf6f74d64dbe63c6535026aebd8bd4c85a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cy/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cy/thunderbird-140.4.0esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "2a6958a2333335d29a3d52b374792b11562efd080f72a90b8c764aa930165c5d";
+      sha256 = "34831a0cffd3bb229edb880ac5790437cd0f6e7797936b90f7d744f8e37fd88e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/da/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/da/thunderbird-140.4.0esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dc68ab3c693832d16bb5e4ef6bf4cdddef3002c908ad8d89f92f7c1c8af059dd";
+      sha256 = "73e4e88d6780b1c833895ac95b9cbba958dd94f9c2ecac47019bbf3ab7975fc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/de/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/de/thunderbird-140.4.0esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d4c0f68036223d0d07615239fc11261a0b55369c449f93b5e6e1388a33bb521e";
+      sha256 = "f490462e072b9ed530c1d40c0ad897dca0edac3d470d9c113d936bb0c4d80ae7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/dsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/dsb/thunderbird-140.4.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "d8c1a6caf6f133f38bb3b8fd1ef6dc0e8c73e9ba1c026da6806896ed6bb2800f";
+      sha256 = "ab3816f52bf003c0423359b558ef1d3716e151937cfcee860bab294bc2abf9f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/el/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/el/thunderbird-140.4.0esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "09cfaa0bdd0dca490dac907823be0f4904280bd465be8f372befd0a40198f98c";
+      sha256 = "ef27570d7c9598df0b05c178cd976b48b68ab97973cca97ff5fba485b94b5023";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-CA/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-CA/thunderbird-140.4.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "429cce649039c4cdfe7d7191a0fc5d63505ae62fbdf6052280850d0a5ce09f75";
+      sha256 = "7144e845b5322773b1bc83374b65a5949b977ab1514584902360e8bf48d3b9cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-GB/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-GB/thunderbird-140.4.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "e5334909c6d9e994890930c68d16af1bc87c2a919edd1ddcbf94dfa248587280";
+      sha256 = "82da909b7beff292511a5cf5dfa1d1abd48736c32b320853771c6bec8b45954e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-US/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-US/thunderbird-140.4.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c83d482d6319b52f37145398de4968eca2088f5ba9e1da0797fff8534c8ceaac";
+      sha256 = "86b461f0f53969e0da2e097ae7b353e90728c7064bddf1740d3548ca36f8d679";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-AR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-AR/thunderbird-140.4.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "2e4d597b016d7644f2833fe90166fb19987fca8a3b7a7919de12d166fb1cf9d8";
+      sha256 = "f26300b57e09dc77dddb528c3567fd3e3e3862308b64548f0e8ef764ad8e00ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-ES/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-ES/thunderbird-140.4.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "f164b261572c8b0dccc01353a7a4c8548272cd58c76a55387b9f573e8586d6e8";
+      sha256 = "784091614b011ee33cc77e447724605982b1a51ad9742e9fa42b379c65feccdc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-MX/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-MX/thunderbird-140.4.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "28623be55dc8636b3d41cae572e5c34c1ec743fbb939a9989ff61852add1c258";
+      sha256 = "a6f84d6d512a4fa29966d6f4e834e63239bd2cb19915aebef3a04b09a0fc6ade";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/et/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/et/thunderbird-140.4.0esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "3ffe29447c94c79d16930a1be2ca274e3d65e729e830d5b304b2d3ad727ecb3f";
+      sha256 = "2022fb0653d798484ca7facdcbe51cdd0f1246a57ee4586e3a15e3347295a822";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/eu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/eu/thunderbird-140.4.0esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "1eabcd128257ba2f97218b43653c7a8269a686961bb579599fb3fdcdbaa2d706";
+      sha256 = "8246129b0f728f910c7213893251e4b9ae3a82a6044e586a9899ed642cb53c4e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fi/thunderbird-140.4.0esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "dfbde834b2827c71e911b389786c809f7c05801b1bbbbd824ab9db4cdbeb1e50";
+      sha256 = "76daa6d966fbc65e7e88fd85c9cd6d04e9a7391baa9c260f2d2f28dbac2af242";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fr/thunderbird-140.4.0esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5fd7c4b0711a78f9087095e528402f0fe5a6e770da74d7dd4884f5d0da9006a9";
+      sha256 = "77ce1cb334889472a9d2a8c1c5e448d0a3e3bf68767bc4e21b9e1b1f4e276427";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fy-NL/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fy-NL/thunderbird-140.4.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "e373fbc067f55f1c26a3874607499e3b0c7e32896d5e644f40a8b201951224a4";
+      sha256 = "703c98a57f0bcc603c0cfdee4af06a9fcfd37f0770f93fd2036b78d98736fe98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ga-IE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ga-IE/thunderbird-140.4.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "1693d0f2a785f6d07dc3c6c6e7a6185366b879841230e6203f6a641f4f87adea";
+      sha256 = "d2b0141eaa64ed130f9098edc5671d02cf1abc16f6636a49b9a72ce334a7639c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gd/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/gd/thunderbird-140.4.0esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "838fd1a6af7326ea8554b08d5b9f5b2626687b35ef317cb9e6a491d4c9c41acb";
+      sha256 = "23bc5c1f4aa6125c80b7a09ca20dd2d572004b7627d9c7cf08eb4053a1d45dd0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/gl/thunderbird-140.4.0esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "f50487f1bbbd2929e373cdbc157b46ee1807eb688e7ae39de93d6ded24a0b0f4";
+      sha256 = "185ba84a675a4556209e3ac4d59c5bc29c9aca27f27a72df21ca772eb4f12d0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/he/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/he/thunderbird-140.4.0esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e8c0d2e8732cad25cc59920416babae37e41a203ca0403e34b47f451cef75326";
+      sha256 = "565c4cbbca17a804021d8bebd27d4a5359456dabdaed546b7511c3436f72f6a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hr/thunderbird-140.4.0esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "6a7f0a9e1699439a95359d1308f53a65ca6c43c6fde7a783869ca7f485095f1a";
+      sha256 = "de2c998771fe24a62d3b9ebc7d731e4953a2cbd9b6c2cfa5e704af1ebc14276f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hsb/thunderbird-140.4.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "5cdf82e0cc6481080e9d4462908158032f12b6968da3afb2e20db7c3b6802d87";
+      sha256 = "012bdb4197d09e61b2c439cef50d3bf63b87efd4dc515d78b0740c51bd0e998b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hu/thunderbird-140.4.0esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "662d03dd63318d1cd387d63c3451992b0f86d54c8ca362e722301db9a1419d03";
+      sha256 = "d7ac0038cc7ecf98450af9d84b029b80501e6c380d2d93f3c75f7fe66c04050a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hy-AM/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hy-AM/thunderbird-140.4.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "eb7296de57519701feae045894777714a52bb0993bdae7b540d4e88153978b2d";
+      sha256 = "b987dfa97aabc384aeac5ee2c9863742bc50c284298a915713b15ded16b061ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/id/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/id/thunderbird-140.4.0esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "41d80326c0b7b1ca341ddd2dfa1e61d61f962e47680da37970945253f5664d7b";
+      sha256 = "99f372091e98e94c6694eb68e0524d7df574b3c46a642ee48cfa3a08dffb1f99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/is/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/is/thunderbird-140.4.0esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "b51fb83ed7711b9f57780839ddfcb785b31640d7b5d3a6a9f43e9d6a9ce8a52a";
+      sha256 = "b4d093d0c594dfffde08d61ad00903d1823d0f017e438c214d1dec6d371aa55c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/it/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/it/thunderbird-140.4.0esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "f9b65a59c9f3b86d357a12dffb5839e5db51a62ec274e78e0919fd3f6964bf17";
+      sha256 = "34777daa70b34d0f1bccb960c5f533013ab6a21f573035b7de272ad037b6896d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ja/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ja/thunderbird-140.4.0esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "d37693281d5a3d0eedca544f119b3dd77aae3b0d7d15c162336e6d7aa6619a33";
+      sha256 = "80c9e021d4becaef8445b4c07d3d4ab5a24801399be682424b6c9008b53e8b1d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ka/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ka/thunderbird-140.4.0esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c5d56da1151b5f1e1bbfe6f80b3c60531a053ef15f7cf01205fbdb6b0599c0e4";
+      sha256 = "6860257e57a462300a7c12a6e38da9486cb7aaf2d98fd8f1ed784297d0b8ae75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kab/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/kab/thunderbird-140.4.0esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "136ba1746163a811136d9e3b220039e74b4d987027e693a5c387a8f9491bdfbc";
+      sha256 = "f5c7736d8d5241a639cfb0d07745851e41abb06b63ced06f43a89625e1070da7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/kk/thunderbird-140.4.0esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "d3f34e5a7f45bd6c8915964faaf62dbd0bba3affe14ed3e690ec225f34067b2c";
+      sha256 = "e706c43bab79837b9fcc86db23280be1deab36c64bfa63ea8bdd39165967799b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ko/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ko/thunderbird-140.4.0esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "ff13e6ba995f2178e60d6d6a3ef18733945319f7be5dde45520f9c8c48131547";
+      sha256 = "951515b4b0ea6c1d08762bfbfca898e0a03a679dad307ffbe7fa38de1339dd2e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lt/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/lt/thunderbird-140.4.0esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "e061e0e159bc68f623b0f8f80faed4ef069d3855f32b546dccb8ef9c9017bc3f";
+      sha256 = "6f3d25bac59daaf3d32f4a067eedc0a8ea62f425eba8647eca68bb88b6e4b75a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lv/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/lv/thunderbird-140.4.0esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3b678a9dade8e7e5e99d6cd14abb79b9873a7df5522a224386f0f72ed1c02c0e";
+      sha256 = "83cec3a24afbec3f8f800b4f1598ca541541129a553275c9315473b2461c2679";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ms/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ms/thunderbird-140.4.0esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "50b1c3e4143dbba8369836854d002e044c0735562b990e2dcf34e9c25e25c27d";
+      sha256 = "6ea0e003d0303f627d8adfc698ef654e03e678d982bd90b643b6c242c00872c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nb-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nb-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "8acf2090a3e4b116826069ece232538eeb84fa519d9060536950044f5fd9c353";
+      sha256 = "9b2079b576b66ceea88b3d973fa2e6bf7568c208eaab6e2f6a8a1d6f842300ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nl/thunderbird-140.4.0esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "dfd2f250932a5fa400dd808b0b2afcef244976744389f7e68113a279d9ed6953";
+      sha256 = "9d81daccda08998bc4a50f66b9b5be13a9c2e9a68f424d15e51284095df74726";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nn-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nn-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "136229be6bcaa7d306a6796ee947be4dcb85d16423581fb22485bfdb803e6991";
+      sha256 = "24c5a0c63e00014d880d4a6127f27da8205f5b78f1788bee61babef7c0e2028e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pa-IN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pa-IN/thunderbird-140.4.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "788312b3105bbb376b8d5fa634c22a7e67a6b18535ffc29566c8ab94622222a4";
+      sha256 = "65117032aaf4733dde8b9aa4666d59b67c2edd67a9966d37020d0f710fbd62e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pl/thunderbird-140.4.0esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "13de91e131bc03c7e223e6d4e3dc0f751898029e8dee122d668487ab2beed46a";
+      sha256 = "3937967a1e9af3626b201f55c755a9191ecef2db4ab787dca680e972cda4da8c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-BR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pt-BR/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "b0be7c8d1093ce5bb4188b7f29e138b415a5b981b86ef4b7d61ff1ffbe4d2fa3";
+      sha256 = "5fa0ca3c8791b422990e6313504d7f2ca770df87509a3ede2eac24f3b33cceda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-PT/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pt-PT/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "fc72f8be624ea97ab3df23f96d9060117c4599a0b150df9e52f6fc8cf5e52f57";
+      sha256 = "b2e8c123afad95ce3c6b874329ac8331273dc94d68636b77c975f17af9585527";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/rm/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/rm/thunderbird-140.4.0esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "d5833f037c0fe6a058660d5b20974690ac95666125e621b66154f523f2994bb1";
+      sha256 = "3188d7d85179f4a967ddd8d5ea07bbfe0332ed29a55dea8e7d06326b91333e09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ro/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ro/thunderbird-140.4.0esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "2d92168df1964adddb4ebdbd4631c2518a2726a877f072a9893c962d3d6188f9";
+      sha256 = "72945101d3ec5c4e5c5f15a3cb15ea701299bf435f42ca524262e8c8df1032f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ru/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ru/thunderbird-140.4.0esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "54d31a257426a014ccf389db7ce828262fae25672259ffadb41831bc90572640";
+      sha256 = "2bffef84ce47c2c11c90b02bbb2513ad7b350dcc4de46f44feef953341311104";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sk/thunderbird-140.4.0esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "335d00c141b40803163407b8901eb02d1770b2d9e26a7f04268482cd11135ca4";
+      sha256 = "6effb978b4531ce8f895921442ec297643a9764ced9499f0ff145e67af0778e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sl/thunderbird-140.4.0esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "02f5d100993b535eb9797125e18bcd8b019d5932b7939633d04c50cf92f57513";
+      sha256 = "ed6b0be98a5c2ae8da73d461ff1bc1c99870720a6ab700208a5923fec10d0c6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sq/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sq/thunderbird-140.4.0esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "acc27f3458cc19087985ef1f1c404f98eca8b2c8c799f13fdbe0b9e121e2cbc6";
+      sha256 = "49d04626241932d1b34528bde9e906a080c1472cd9f4d577e3fd603cb2539377";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sr/thunderbird-140.4.0esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "5b377c0df4d23cf93d8b8dca9fd4c62089f4dcf5122885b93043765fd41ee479";
+      sha256 = "d73974341c4a43f858671860b77e1db26068755f664e51f8338b21a229ffa4a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sv-SE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sv-SE/thunderbird-140.4.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "e124daec978a8bcf3fa42241e1cf8deacb375da6a4278535f23e7c9c4cad1bdc";
+      sha256 = "6c56554d7d649a45f126e841637f7c3582e01b764856c17735b8f64c8643012c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/th/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/th/thunderbird-140.4.0esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e736d9238bc6b4080c48cc8f0e261d044f7684b8d868a17f759c672bd473cdbc";
+      sha256 = "81c03a0e3e17bec6141515532782e5cb5cd7e109bb6c612b28bb68e4b659ed45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/tr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/tr/thunderbird-140.4.0esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "a8d79f5317d042679dd0bce602a0b719f6883b02b76f5ec69e2b6dae84c99fc8";
+      sha256 = "28dc594425f84da8494b612dca6cae0dbee934b41a741a1f95e0163cf0e9c9a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/uk/thunderbird-140.4.0esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "a8876dda0a5a79b58ee2e4fbf9c429c6a050b9e399b4a2f467425ebc9d0e7b1f";
+      sha256 = "a892ff9e2adad8118f3cb88ec4775d36d30b96472069e9db43f29a094d590c40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uz/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/uz/thunderbird-140.4.0esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "99a143e3cd7da83ca51ed31cb517430206c86dcd747e7ded3ea4454f29dd9f04";
+      sha256 = "5427a8bdaedcd7c25a84c1ec516185930ceb2c20cb5be812a302d9681702f2f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/vi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/vi/thunderbird-140.4.0esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "beac93fff89368f9e5f70e26efac6491034212e7ebcbb40e397ab5e6b227b31a";
+      sha256 = "64bca02a6d78136c71048701eaf62f7211f2765c0f5de2a810f8662097388ec6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-CN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/zh-CN/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "32795b0feb937927c80bb5c62b4587b13103cab00d25f7b1f57ad53af145540d";
+      sha256 = "bca2b193a249b7915457fd0a39020ba7edf559ec5d48339b890824c072b6c275";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-TW/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/zh-TW/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7e57b8ffec05080c1ccd6f329660790aa8eec84679c768a0a7b7b40ed098aaaf";
+      sha256 = "135a64f9dca152b1553990824d04acf1240f60f8b2039fdd1095ae3402c7143e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/af/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/af/thunderbird-140.4.0esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "141cbcdc5d7f1d5c45de0614f25c0001232f250ae039e2a029d7b721a1822632";
+      sha256 = "653a06ca6cee5dec110a4a091230655f5d94b04d78841c27b6c4049da824da9a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ar/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ar/thunderbird-140.4.0esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "2e2c0d221e19b930e617e93e63d5a11a86bcaca7b3ba667beb0b924ff0ddd6fb";
+      sha256 = "62a7e19b6574354979510de8f953da0a0dbf25f17a4a89ff3192afe04e0e8123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ast/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ast/thunderbird-140.4.0esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "24261039a298823db9a9513ba3579118cb1b780234716236454714e3ad9242b0";
+      sha256 = "35ecadc31d5edb35749265ab6169be8f6733d17d9b6d03cde182c046a12bad53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/be/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/be/thunderbird-140.4.0esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "f07f276975c2353ffe69c037568d79396bbd0d9c0c3d6e9047936ded98dfa059";
+      sha256 = "c6abcf864f94c02af2417aeee4858edaf886baa1911a90aed80aa63f9d2c8059";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/bg/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/bg/thunderbird-140.4.0esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "f31880553d9bc597d7d5009e0d10cfca2f7170f5c0bdd7f41e10be53ccc8c2d2";
+      sha256 = "7d827acbc34d41dd0385c5b1a2d8ffeb744f67dadbf8f66dc5b00bb2c2b4d151";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/br/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/br/thunderbird-140.4.0esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "e56f2e56aee20a094d5362b56a455d0a3531df6ca1e5069d891b0635d16a0e26";
+      sha256 = "02d56833bb8d8d8f008c0bafcd712c78239781254c1233a08f99a12b8c65c3f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ca/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ca/thunderbird-140.4.0esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "d963a7daf319f196fb799aadc605c4927fe40795754fc8d7ecc26254d1ca376f";
+      sha256 = "b55449b13271a1ca31fe33dd185eb96edcef8ac633b0abd9d1b9d5b7e060765f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cak/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cak/thunderbird-140.4.0esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "215e52a11c0f5fb8563ad9432c3578002cbfa840998b7419db09644f898e6ca3";
+      sha256 = "374afe03f3bdf66a4d97aff966186f481353e166176df7336a656a4f27b0f76c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cs/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cs/thunderbird-140.4.0esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "71405c6a56bfb7b46d646199ff82109ef75c25f1e2b7e07ade7428c5ebfece07";
+      sha256 = "b044018ee411e306f050b1f04decc11497b8002b302684452c2dce295f5ae004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cy/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cy/thunderbird-140.4.0esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "96db58c3fc25f8196932fa11defe3c5a4a59682a8214a80691b09c9b0d5892eb";
+      sha256 = "142a974d535c452f37c05b3f7a114341985c570372d336c37562c61cfc28d3c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/da/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/da/thunderbird-140.4.0esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "69242a3c5cc752142291db634c92286266d4460d020471d12f1ea02baaf391d3";
+      sha256 = "8561acea814f0e538dcaef45b41b97d00db11bc9bd4770c029c9ea0b57e87cca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/de/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/de/thunderbird-140.4.0esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "8f36f835c7347c68267f620b3fa976c2708374447b2e9739452954023b94646c";
+      sha256 = "c756bfe660c3a55b48f5dfc5718a54e2715052319c0ea080bf46d66f724429d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/dsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/dsb/thunderbird-140.4.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "2d18cdf766b28b78293f6f49ba92956504669c04490e5ae8421727032fb0c698";
+      sha256 = "b45b5d8ccab07292e81e402c957f0a33b81dfe4b3c79f5d9fa338dd8e4aa8447";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/el/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/el/thunderbird-140.4.0esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "93f112a14887a4afdd0a33794c60c3b3cef2f2ed04019219b0994e534744c561";
+      sha256 = "085798ab3239a5bf6cfc2c3305f2aabb5f9257635b18ac00daf702dfa053c4da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-CA/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-CA/thunderbird-140.4.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "096c889f4b020b48c2a4ef1e7f66b5b401b30f3d9304e74cdd8c75737bf781f5";
+      sha256 = "8b85baac387d996b715a17640ebba501ac604f153821d8d545360b6fcaaf25aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-GB/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-GB/thunderbird-140.4.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "3ac3ae104e943e18522a21454328b4c89a8b4b626564aea82ec1b9306819e561";
+      sha256 = "0d38e70b450c8b22f9105351992f3a6c445f814d7a3ecd75a66284d128ed9896";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-US/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-US/thunderbird-140.4.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "978c2831a7b5e913d4d261cfa97af0c5900ba32e60a7cccf5425c8ff23f11c95";
+      sha256 = "3ba3abc8e65bc421a35708aeb5daa8a8d8d8940c51808eeaf64abf120b62f7aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-AR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-AR/thunderbird-140.4.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "6182bec17e34784998c7e4cd76bfdc9712653f30a94331dfdb61d38b1540bf7b";
+      sha256 = "eb4e6fb7219056961a9d6d8c3ab085fccf6c54c13ff401c9c72dd2f1155aedb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-ES/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-ES/thunderbird-140.4.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "16416a0317dd208aac9e1d44067ec5f0ba609399033324d736f980f08409d1be";
+      sha256 = "31b1e812bc548265acde111fb0130b7000e03d9569f0270d417979684ddc5f99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-MX/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-MX/thunderbird-140.4.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "9cad4cf6d2efefecd36236b407b7a2204c02319cb673ac05921ed1afef0f0f4e";
+      sha256 = "a80db313e50fed30f82e372390e74a742fc2a1697ba85f7a268bf482459c340a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/et/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/et/thunderbird-140.4.0esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "bd9fdece5679755582a058a3b8dee9bbe47f12b6264e08c3a977bb395c72248b";
+      sha256 = "043b7ff50a97880cf5206462456188028ab752b745b3a320ad8b06d8576a7a32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/eu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/eu/thunderbird-140.4.0esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "6799ed256d553d1ba2338811a31cd47ee57a9d54c7db597062391f95b669921d";
+      sha256 = "62d37c6a5f0f3d059156b8a0c74a4714a1c03ed333ecb49896662ceca30095d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fi/thunderbird-140.4.0esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c862d5bdf205a75b0304ccbee85ecb725cdfad848b75d99a6f6567ae59ef7cc7";
+      sha256 = "29ed3c3e8f268dcbac74f2d2b5bb678ca820ce23719c50da783774d172deb484";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fr/thunderbird-140.4.0esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "196d1972c9f71cd8152f0dccf6642961b8b360423ad74a3facb40ca10b095b3a";
+      sha256 = "befe452b31cb658e8aba6c0daa57c7dfcd1eaf8ce55763527351e3954ad6863b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fy-NL/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fy-NL/thunderbird-140.4.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "a2f7a4dc94fb17c0ceed511c6e591feb1894e1d707d4d74d69729f621690cd11";
+      sha256 = "9acd83439e772bf06dd4db587e55c5489a172206a68683466d33f528004bebf1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ga-IE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ga-IE/thunderbird-140.4.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1786bc27d6849b482192dd2d2054f8a04ebf804399e8a99ddb67c98cbd57cdf7";
+      sha256 = "7d7535c2ab59093c16277c0fc890288d08475b9004f738422eccb059a24acc32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gd/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/gd/thunderbird-140.4.0esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "35dbb7deab2e51d189dc2403f0b07b033c0d02d2208759a0469e530851576922";
+      sha256 = "3a8880b124ee76086376e0467244397e4fe89c6761da929a11b54067d9f117cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/gl/thunderbird-140.4.0esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "92112627e51a1475b2d99e5db525de0c5584008411f41651f66078cefe0124ef";
+      sha256 = "d26d3a80c189f4c96b25ce921b5b818b71976d4d9aa15aff65a860ad7f6969f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/he/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/he/thunderbird-140.4.0esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "809376eebee2424dc7642f659a394269d143030faf5d29e9e76f548d68dbc1e2";
+      sha256 = "91a8eb69c96c29c8e285444bacfa433e53203745de0d0515fa37a42d76d52e6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hr/thunderbird-140.4.0esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "68463819531333131e3d160acf4c52a02914cbde0213da1f9337e98d5206057c";
+      sha256 = "017e8f5acdc15ca9c54b3563797584a45bf35597b40f081764576e1c163cc3c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hsb/thunderbird-140.4.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "dbd7bc581ffdc9a00028ccc4582582371518f001bbe25856177d5477907cd69a";
+      sha256 = "77ef3bf47873f02ba8dc4f71da5b2dc6688aa8fbeafaeb14e5e1cd2c24ce9cb3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hu/thunderbird-140.4.0esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "6a4fe0caeec91ef7a28bb3c958de33d4aecfa67ba80b7227e1bae6a2d9a25b41";
+      sha256 = "5a3e5da48dbd8e70487466eafc47af1dacfe1d87927c78d95c9c3cb472c9793e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hy-AM/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hy-AM/thunderbird-140.4.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "65f58458b447a59000d3e5ab32af9c95bb3b58857ec7501631f7e7b44f378aee";
+      sha256 = "0fdd8e334e60b37cfd16b6809bf0c44c593092f2ba4b4bbdb02a6f9b1d00b513";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/id/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/id/thunderbird-140.4.0esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d8ddd3f21ae3917649ec55a6509596dc4aa83cbb8f90ac0faace100f06b87bd3";
+      sha256 = "b96547d1a2f5ccf89a993c716304da0956d0b4661bd09fb2e3cc829fb22d9642";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/is/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/is/thunderbird-140.4.0esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "fc75b9242bfb4b8d7688c0ff0f8426924b9376ef9e989725c971bcf39fde47b8";
+      sha256 = "2cb684532b4e2d90a521a6313878b0c0a492c3570ff60ebf7a865c11f54bca57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/it/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/it/thunderbird-140.4.0esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "de12e0c38756d5ece677d773bb3674b125b918644d6eb58de347404363067332";
+      sha256 = "2956dc8fa8608e7aa39bb7af0c818a30d87ed3ca7d17827511c0802173f71d2a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ja/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ja/thunderbird-140.4.0esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "2262dcf37e3742b580e86f0dacc077e1a855879b8ca2056888f6817f7c0376c0";
+      sha256 = "577c6c2050e266937ecf63844ae2c82809593ceb0a78673a4590a18703258a92";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ka/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ka/thunderbird-140.4.0esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "86bebe321ee191f714626b48fe9650e5b5eab11683b428312ba5e6d405fc236e";
+      sha256 = "87087c07a1fa4f1dbc0b7cd13f1a601e001f159091d00532acaea0a1a561a88b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kab/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/kab/thunderbird-140.4.0esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "7bee584e9c44edf6b86e329deed33dddbf43f9c427c9bf499754829d166eba8e";
+      sha256 = "1f92f15bbddc682785023f47c1ae9d53c7a67eb28ec2ad976d44e94a127455c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/kk/thunderbird-140.4.0esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "909190b3e17f1b52e5c0512b5385d71cfd14cc0be92899f27ea07c41f4fc8351";
+      sha256 = "d53cb8293321e123e89da7515d255673d141f93c476890eec91fd677fa221994";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ko/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ko/thunderbird-140.4.0esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "2c931f1ddcc65e5020f978e4a5cb49583e170bcb48cc72dff6697770430ad6fe";
+      sha256 = "830b77adc70c000ab9646d737323134b94da7537643ee552a9dd802628b0b0cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lt/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/lt/thunderbird-140.4.0esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "06c55ea902253d74c648a957c048ab921edf706539b1adcb3a63e4046efa687e";
+      sha256 = "64a00d688166d6ee20be52c863bc401da8170de84dc72e9860eab430b36eca99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lv/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/lv/thunderbird-140.4.0esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "636dd4ddfc78815789b7952ebfce1445690d121fc841fc386da9c5bd59db4f28";
+      sha256 = "77e843c6d3c54d770f110e8b00e930b035992403ee7577fc497419bb32ca1832";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ms/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ms/thunderbird-140.4.0esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "8b571092ddf88999761e6da188e6521d0880db20f1ae3b1958ae624f6c447f4e";
+      sha256 = "96fc422bd79875357fe766fc7813505c358310d9a7c6c67a14e9a0468d7e56a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nb-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nb-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "f061ffcfef6a56898cf66bf2261f74408b0d01e89dc5e6ff53dc94a9554f243f";
+      sha256 = "4c6d1624e3e0fd78b59ef4fad8ffa05347e071123ae285ca91c5cc1df7fb2f0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nl/thunderbird-140.4.0esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "531298208ce88fcd05cbcd9bc03de473714f2c77f11a8485b97bdaf271834b92";
+      sha256 = "3f8b5bbc97b22763509c9df58a350b79acbf06ab7b7547256d3e59b4a4207f98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nn-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nn-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "bc55ecda12d0dc53a6704d6229536003f4a720ae9c787b50d4e6f6bb4445a61a";
+      sha256 = "71398757f66e9a302928a885e51e5992ef644717f0b187e78fd7d26186a8ee20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pa-IN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pa-IN/thunderbird-140.4.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "abfdaa63bcbd4428530df6459a108f0a7c8bc6e80f3fbafa8e4899e8f05eb39a";
+      sha256 = "16d133a601befc0487e0b801ee2228859b332b97fd63ba53f3b309d94b9bf394";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pl/thunderbird-140.4.0esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "08f5fdbeb52a6cdcd9969fa233e2c985a640c9c0a59df61ae2fd7b0004f1fe46";
+      sha256 = "b3de96dcfa150a834347d247a6aedcf8ebd4207ad1026db65471a0b27343c32f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-BR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pt-BR/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "c866a05e3c72d6e05073d1373cd7bdfb3fb8faf746375ec4f51e3946caa22f46";
+      sha256 = "a3261296ac9c53cbf2a512dfb0a1c3f76a47dbfa1318ccfeec72c441fec11b78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-PT/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pt-PT/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "3936990bc963741ad780721dad715ba958c71818614523fb46621fb0dec147c6";
+      sha256 = "3f04c4c9089a2879110a25494c367f8536938ac46dfb0da7773e9fba969b6484";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/rm/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/rm/thunderbird-140.4.0esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ca044dc761fe2bebec563a37757b563cdfe2eec18e4cf2d451a1b7bd0e03a46f";
+      sha256 = "960901f039310fc784e40a18aa9df2c9a4c1aaa1dd1e2644fa73aaf38245f262";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ro/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ro/thunderbird-140.4.0esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "13b98157852329a91240498112f841f03d90c239c41c57d0a31eec6a2eb01ad0";
+      sha256 = "950bad41fa8870f96d96a6ca02978284485177247e0d001ed892b65d15043567";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ru/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ru/thunderbird-140.4.0esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "461a8c8433a5f49b979f03377f0ac7f2a81307660a83c4727b677a1487fd2a15";
+      sha256 = "5e91ee670f3b7f7c6583df05f32178340ce1661b7cd55133b55567c94507dd36";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sk/thunderbird-140.4.0esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "a24ccc5a44a459a5c15d9dd59ba4395a31abccd0bf9238c9ca1c0f229716d5ee";
+      sha256 = "8a542d2341ea2a6021f0e06e348a0863fd8b4740804c20993158fde498052db1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sl/thunderbird-140.4.0esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "0c5fc0afeb40f6bf238e541e56ce414a43ef54fa195888c3862aa78f5c371326";
+      sha256 = "9bc0da52da2a2eca87ffbe7c88abded935d40050693b9f2197d9d804e4edca3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sq/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sq/thunderbird-140.4.0esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "429bcc3349926e2ff220320092bfa0e24babb315dca3dc61a66f1f7a6b54c9c4";
+      sha256 = "70bb5a66dff94c7c3a3466d6c56d099c0afdec01cc417799d2e84554dad16d25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sr/thunderbird-140.4.0esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "442d0363c258c61cdb1690380181712f9159d1b3a3a9a12df62efe403f145797";
+      sha256 = "f454f8a278f4b74d2488b0633d87a97c85afec2f92d4a5746f4b883609f2c921";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sv-SE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sv-SE/thunderbird-140.4.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "055c4212a3650e53f43ab6fa859e03e7475fe0b6da1b4a87c5671dec827f53eb";
+      sha256 = "2d82dce3eb19d242321cc1f0d693f26007f87e5150ca1326d3a470e317a1df02";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/th/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/th/thunderbird-140.4.0esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "37a9840af005b2aca0e024223bdc388f19b6e9d8ab381519266667b01eda8eac";
+      sha256 = "7993bd083a6ad9dd278197feecec87a8b912287b8e75d4ec4db1732b99f19a7d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/tr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/tr/thunderbird-140.4.0esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "dbc8ae7228249b490dc845e3030e1c625facd625f322b6c1ba1b5201038a7f2c";
+      sha256 = "ba88ee6a56e2fec8ac64349ddcf94376c2c6f2bd20cec079d677fc6b1f92f3c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/uk/thunderbird-140.4.0esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "5436eca8f68ee7833c2e3a3bcee56db0d3d66b3bd3a98059c07508181f4c8116";
+      sha256 = "a178dcf466e3f68d3f4538939079e3ecf04b9d504eaa27d9c6722f272a511c12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uz/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/uz/thunderbird-140.4.0esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "af154fd7ec1c00bf8b5e0f8c2d8a03050caf5030923fa579736507cadc60f9d4";
+      sha256 = "99ed1858ff772bd1ea99bbe56dd5d631317e1849d7bfee3b288345b6579d3742";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/vi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/vi/thunderbird-140.4.0esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "2c0310ea5985ef44a8edf9cbb2505e14f79f18d88852a1d6830b150daf4bdae9";
+      sha256 = "495f013bc162106a4cf15710c8c52fb22ab9c8983aa44e3371d9e99d1cc0c517";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-CN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/zh-CN/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "d20df69fe34109f124e939af4dc52234c9e36e106491dac8f1fa8b82bd638871";
+      sha256 = "f744c06612923b08fff2de9a5bb978b8da1a0dc0512a84b14beca5d449779e94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-TW/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/zh-TW/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "d837f2211c60a8d9c14cf2ce125806631061f6bab758247d8baec0797207ef42";
+      sha256 = "d7693ba6cfd087d370276ad062404a7cf62b6ed20cff20f48cfdac354945e4b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/af/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/af/Thunderbird%20140.4.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "20f115cd2954afbaceeef193405212e80711cf76d0e0b6199a7edfd292bac237";
+      sha256 = "2b9f86934b94ab0341ac43f3ff668012f46e12630df25ead6597f150aafd25e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ar/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ar/Thunderbird%20140.4.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "63a4e846d880eb81fb2a8fb81face1dd9ac0a0815a82a14f0e5c3cde898d33aa";
+      sha256 = "cfa4570ad1891a744cfd51415cdc3c0ec95523f73a9827623c3633cc80c05986";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ast/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ast/Thunderbird%20140.4.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "4338e715e946f662471891008b5bc6e7adc8393cf5a96ab86a382ce04cbce6c5";
+      sha256 = "d51481eaa3c4b2a055d666fdd7f345ffa6dea80400548ee63cec74eda1285547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/be/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/be/Thunderbird%20140.4.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "c4210d35120f742302b26db54acb8a6310c8c287908f996de72914010324786b";
+      sha256 = "6be488c6788b722285db1fca3ae6ac470f08a3a6878303d836e789b516fbd203";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/bg/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/bg/Thunderbird%20140.4.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "edbbda1f4982b1730b0f722bbf17cc05ad8b70e66c16af7812885e40e3606098";
+      sha256 = "93594488a516d5056589ba103394dde8b43fd70e9cbf8559ca5d91d3de56b321";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/br/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/br/Thunderbird%20140.4.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "f1fa61c3db825155265371a382ce9fc3ea07fcdf375a6b0d10035afcd4f9aac2";
+      sha256 = "6ce35f02916b1ec15d7a386ac1426a2014cbc0750f4a6dfdf5f0c22278ec7be4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ca/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ca/Thunderbird%20140.4.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "75f5bf743b9d1fafa3f7f2ddf8689ed01ac507e8d4b896e3177f4c995f59706f";
+      sha256 = "0252b5b1415ae3e5fe6293ca43c250d7481b1bf0076686ca7bf64e21743b3a6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cak/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cak/Thunderbird%20140.4.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "79c78160253c67a3e3429806703a9840ee9b5df047b6b4c0095ad4eeb683af66";
+      sha256 = "6c49a96f648868f795fbe435f069a8efbef15c63a6d65b3e3dc2cf7bfbc79d1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cs/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cs/Thunderbird%20140.4.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "115c1e9acd7dc63b8ef5b3d47d53d4b061137a2bb2d9d5cb015f098de6222b85";
+      sha256 = "ce445f8af666fc8cb34cd0df92e327a60138f63567803453b6ecc291e97959fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cy/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cy/Thunderbird%20140.4.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "6f690c8e1fa4465a147045c8f4b5f0e0bdc29723d69677a5fc29a66653954da2";
+      sha256 = "fb5f92217bd85a29ed1a75c799cf4b14bd980c3166c9aff829180c443bce6ab6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/da/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/da/Thunderbird%20140.4.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "ef54483cab54bfa8d00577c3741ab3c856190798ddfd154bd355822f7af7df8e";
+      sha256 = "cbda1405b9280bfc344a8ea9e225cdfe9e5c9c12bed22183a34d76a9fee6de59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/de/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/de/Thunderbird%20140.4.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "a2972ac2e3227e05b95b34df8ea9dbd46c3d8b6164bddba830af562b1c87ce1e";
+      sha256 = "fb8b7f3c43f10ddab84719f5df783e412cbcdd4e3e524b4e617d331339243491";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/dsb/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/dsb/Thunderbird%20140.4.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "9bc1a18d9987eb3a99767a6479cec05a8e3427a59235c3e0ddd585584cff915e";
+      sha256 = "a095527bb12b1934118531e031afc98f1f4872381c9b5ff0f5c31d255484698a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/el/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/el/Thunderbird%20140.4.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "c97bfbf95583470c947478a4c97d8cc92702e7ec8ceda7f633b1acd0ef08ab61";
+      sha256 = "7d8e522a227219a7eb911a5fe505f05d2c8796c6455cb84da46a149ef0299ffe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-CA/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-CA/Thunderbird%20140.4.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "1a8f768a30315f0c5014d859b32ed0f5c5c1c72811b81c18a89fba9df7ed6d09";
+      sha256 = "ece5a57536fa76d3aabcb4b762fd6d546d5e90c9a4deaf3449435b74786b26bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-GB/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-GB/Thunderbird%20140.4.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "00930cbc380314c64919c41efaeff5ac236f1828ac8f8fef7611c857da29a860";
+      sha256 = "e530d5a57bd3ba2425656c8f71682251533d099436d03da5ac5fdeff55033f82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-US/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-US/Thunderbird%20140.4.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "9b44c8ad3bfba131ab62d67c3a5af11ba73dd37edd19f9ed299380aa6d1ce9b0";
+      sha256 = "eb0a1bc6ddbeb9cfdafa51098608d3f5eb4ad5a4ac6d8000d10bc8d0c4f1f1de";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-AR/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-AR/Thunderbird%20140.4.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "32686eb688f3a732acc6401b0e0883ee21860e0395808ef876fe39016e161952";
+      sha256 = "375de958e67df4c3ea923e22cc8d3f6a927849c454c1172a032d00287a12b537";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-ES/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-ES/Thunderbird%20140.4.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "b515957a2a876f7d2fab1007c52746909abaacd221a894014291f4baa46a75bc";
+      sha256 = "64eb6e25c5f67b0051778b461b5ec0f61cd4a3daf66daaa5dd718dfe47a6677f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-MX/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-MX/Thunderbird%20140.4.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "ad97b8b7cac5028d315e9b003600aeaaa16046545e58b5d7d825c1ce5ff958ac";
+      sha256 = "0c1ba25c421ac64c125c322c546388f1b73e0276460a0256ff140ee4cb8230fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/et/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/et/Thunderbird%20140.4.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "77d9cf797a1a5df00634178b672dea6227025d4d0919a1f42254421e9ab72468";
+      sha256 = "ff8c80fdf745473cb4c1ca1b7751d03849138c32ba72eb94ad2919505497556f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/eu/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/eu/Thunderbird%20140.4.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "e9665feb488e63a974c5e137685856dd46ae74d9d09b3db32ca623366b019a82";
+      sha256 = "24dc4be9dfc2342c9b649d9fdb5ecd5dfd98b109c5f57aa2d7517269924e36df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fi/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fi/Thunderbird%20140.4.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "75083a46cb5b4fc0a5beba54fc8c96d54473fdfd58dcf48ca9f29f7e9006d236";
+      sha256 = "87343610642c8314d104f6bb97524660be3fdbfaa3b138fc247b1d4bcbdd5aa0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fr/Thunderbird%20140.4.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "4d37be8922dccf766c6c04b15823de2f8f30b9c9ef0816b9f464ba25b2edf5c1";
+      sha256 = "5ae2035849c929f9b565ef69849b902d6e81dca34dd06f5d91ae491cd6bdda19";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fy-NL/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fy-NL/Thunderbird%20140.4.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "5346cb9a49fa822940000dea8401f537f02af2ea4fd97f377ca2ec8286b7e056";
+      sha256 = "a20274e0ed2581ae4435266f24653ee8d00982133ad7f7eb7fc2c11b0e64cd9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ga-IE/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ga-IE/Thunderbird%20140.4.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "ba48461b4db3b3994487f7bc85f5e0e7c279afa85a07ce29c8713d618e08b24e";
+      sha256 = "f4b61cebd660abce11dbfa62291aa8b0067b4b64515c4dff54619dc33330bf3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gd/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/gd/Thunderbird%20140.4.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "f60a683e321af703876c0db82d8a0688f6b1c6ad973f131c81d69dd92d23cb8e";
+      sha256 = "57e511186cff193c0872e45a2f3a5948351f2c1c01edf6b09b4ad3e63965da49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/gl/Thunderbird%20140.4.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "0a912b86029f48d9398a44cd003700d91c718e221e755d842a5747493faaa799";
+      sha256 = "893b8013605c2046e7e8cde74ce1c094b06163235ea25de5d0cd8716b9c58606";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/he/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/he/Thunderbird%20140.4.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "ba7b5793af2091ec563ff56fe3583b0d60a4f3a11bd9dd12acc158e2e08609e4";
+      sha256 = "87087c308b4850153bf8dbd23282437973842595a5cc39c5cba975f2a5d8ed88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hr/Thunderbird%20140.4.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "c4cdd8c36b112eb9a7740323ee1afc86b4b60b78f15a8b38740f6cb7d7234c94";
+      sha256 = "5a0bed361a38af3bbce176f7f5c84a16eaa0d0077ef79ac10878da7173a8f4e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hsb/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hsb/Thunderbird%20140.4.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "d76cd753cbc5476b7c1c9b9089a800ad703b79e9f00a5b411c533bd4e12e9864";
+      sha256 = "560e2af4758eea43cc3e91947d9bcac1d229df45c980bb5b3037b6b91cce799c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hu/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hu/Thunderbird%20140.4.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "7fecb8178db42fb1624847991a88197cb7a25ad0b5b43da3c0ec5dd5e9ef7ed4";
+      sha256 = "2cd75e419d4e5ed054e761cb908eb7376b01faccf2535447b11fcf8d50d79939";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hy-AM/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hy-AM/Thunderbird%20140.4.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "7cb89e818872a645d5f427dcfedde9b9be60c8770dc346875f634a50f124e7ee";
+      sha256 = "4f39be919b15d2b36b22003bb4aed0fb9b48ee517d60a9cadcbe0cfcdc759903";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/id/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/id/Thunderbird%20140.4.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "df77301b219a03897931bf94c9c6e677149f7c02dabacbea080a43f47d5e2e08";
+      sha256 = "5d8915b78bd539e87011a585c6e439ad27ccb40188f3999a30fff53e79d71263";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/is/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/is/Thunderbird%20140.4.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "47aac46979211e862345d767f22a0739ac1adb385e11cdc7f53bda47f3f59d92";
+      sha256 = "4cad9a68ea2e713a81376caaa85335b5dd8d3febfc06b9fec04f2f49861be88f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/it/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/it/Thunderbird%20140.4.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "7844c40d0cf241bcc6dc3e5f695f0aee540500ca23b62d43d3a65acb2b3fe1e0";
+      sha256 = "b5c8bb87de852fd8d45ec09c366de6a939cc020bf4c56bcbe74ae862c854cddc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ja-JP-mac/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ja-JP-mac/Thunderbird%20140.4.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "6773857a1d1e275c19616a00d859cb122a0bb62bf2edf3809e81ad3ecf837e0c";
+      sha256 = "76d516e46a3f2bd5fc0da7ee0d6c73f8ec14685fc1fce7cfd18ee408c6c0fa30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ka/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ka/Thunderbird%20140.4.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "a5d6516204d4dceed0dd2fe5a021a30bbae66e3f0c8743749179fb1119e1d3f7";
+      sha256 = "ed617ed9ac2a7c68d116dffa9b7ecc0f359968d1d3663ab461367158e8d0a004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kab/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/kab/Thunderbird%20140.4.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "67f8fc4a908d1a93fc8d3338c887569d3eb17bd2f177bf430b309bd954f9718f";
+      sha256 = "a79feaef4fb690c9a56d139921676475f3cf8ce259e9d1f201d005437ecedaec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kk/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/kk/Thunderbird%20140.4.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "97a00e5a3b9fa2a93ea74f0fdf6a4a6d85cd97701e064eeb28fb288f09a4b7f1";
+      sha256 = "55872e2ab16ab4af4267b137a6f54029c34e34828109cacf8b21b45add5b123a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ko/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ko/Thunderbird%20140.4.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "8626dae3c88f63bbf7b4d324279102240ed26cebf53ff5a794f48fe218fb84e5";
+      sha256 = "1ef3cb988025f9e638c7ecbe5e90d839ed1135c99db12432b5a4e955799287b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lt/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/lt/Thunderbird%20140.4.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "17b6759a5671eb94feed2481fc80f211b37d95f89879f71ddefa74da5ab9f245";
+      sha256 = "f9d6057adb85028064b00cf7f10cd8338b2130ecf491b2195e65af3e797f0d41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lv/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/lv/Thunderbird%20140.4.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "fec5316838fcb3d5c08381bd425c7b3395baf836b43c14c988862138fa7f7856";
+      sha256 = "8d544eaa938ea79d6268748bb283bd92b1448c059ca646fdaf36c4471c8acd00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ms/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ms/Thunderbird%20140.4.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b086d9eab3043be43fccb8c86635ab205f267df86e7e711c5378e9652e4666a0";
+      sha256 = "b1112f7b01008a9c968a7880842f1650b6d8b15b74ae196d481422ce46d8f775";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nb-NO/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nb-NO/Thunderbird%20140.4.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "fff8619e734a0e1d2445e2a1b5f483f16acc7821fcd4a4e362de1de5e2f966dc";
+      sha256 = "daa01be94e6b2a830d606795563a24e68fe60990b9c9cb71231653cea29767b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nl/Thunderbird%20140.4.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "33dc51ec3b5bc0791df31c84883c8e246fa8a477a251359b0200b40a0f5eeadd";
+      sha256 = "a7f000a5241c94142d6386f69a886a3736493a5702ad5ff647abec6a5fd90c6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nn-NO/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nn-NO/Thunderbird%20140.4.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7f8b72cc02e6162713ed05c0b2bf80057ed935604b45241f4638dcf2c095969c";
+      sha256 = "6494f87cde0f105ae0b3d051ece6c92dfd3e878853410e29f25d6a70ee928f74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pa-IN/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pa-IN/Thunderbird%20140.4.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "858a024b316f96b629f1042c2cfad47c54da571887e5600d57b05856420bfdd6";
+      sha256 = "704d3065d7a47a9c7af2d45c0139811c2e168c4d8a501fc45a36ed06b170eb12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pl/Thunderbird%20140.4.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "20124dc0ffda461f68ae1efc1e7277f439126d73d02f0c659961591853b7eadd";
+      sha256 = "c305ee51b4e0d3ff187d729f7841586e3f17e28430918f9c93e15bea9e3121c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-BR/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pt-BR/Thunderbird%20140.4.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "d9691bc4f1fa9c95ec2b140ea005eb292293de90cf70d30700f10c63b430c41a";
+      sha256 = "014d2e9b86a455e7666ca53fc1f7ce3f65f97404d9c2a3232e0c688ca1cfe8ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-PT/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pt-PT/Thunderbird%20140.4.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "4b3a13d53f3c5042db0ee51df9d830e3f4fcb3f5beb76d08a4d7e879c33f752d";
+      sha256 = "df1b3fc88b7fdd32a6d43dcd4bfa73bdf3ba7480f7318800eeac410c4d9e29b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/rm/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/rm/Thunderbird%20140.4.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "7e1b52adac3cfd0f99251d6d50eb4db7537d65cd2728f7e6ff318cef1388b34a";
+      sha256 = "03387e02dc528c23603759a063e56aa4d1beef35124cb62bb0d826fdfe3a8135";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ro/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ro/Thunderbird%20140.4.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "e671f0073aa33f92ab9d8876d105dd03bc2127d0ad9e27f450e9c40436780d67";
+      sha256 = "0a65227549c1f1db305d96b8bd55670f6cb5d81c174f919f8dd255d190aa13e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ru/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ru/Thunderbird%20140.4.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "4402f6f45c5e187cbe324f078439cb8638cdd66128e667761b7c494f363e6306";
+      sha256 = "7e7c650538d825081b56dd77a1f8274e5df2583657a0b15fb44956b1c1b98f91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sk/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sk/Thunderbird%20140.4.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "515a38a46266d3e3da73dcd530a8d503194e6107b2a600c5592fcc0f57408181";
+      sha256 = "7af96995e67e314cd278623abf9af23778af25323cae3dcfa8fa9af7b8165c7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sl/Thunderbird%20140.4.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "bd1b726a9246a8100b3205568c727e7d1f63a7d383b8b9453af7a15ecd236261";
+      sha256 = "7d659882c6a9270ebc6cacf396db2735bab463b0cd69b551946a6a95c08f53c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sq/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sq/Thunderbird%20140.4.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "766cd20dc1f533a398cb360681833ba48e11f6fe6929503082ab2c6ec2c76d3a";
+      sha256 = "d50e1e2cffefb92e708bf6f32864d34fda53e03046a22015fa945a9dabbfca5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sr/Thunderbird%20140.4.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "f7573ef1e846ebc0b32025e948a261602278f49eadb94b4d925f57ea50bf15f0";
+      sha256 = "ca5afcb5032e9072d94ebbb3542213785e8e3402384b6ef6298a948faa2841f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sv-SE/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sv-SE/Thunderbird%20140.4.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "2a17943aa5793632c0659cdc900392e350eea8e9610787923e75ba6d962ba6c4";
+      sha256 = "65e2775d6c2f3c95928889c3faae8a03412eba5f0f4cca0d9fa28ca6f853b879";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/th/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/th/Thunderbird%20140.4.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c76af30c8339fe81ba5f1a96ab3975943377ecf01bb862a3f2806ba4a35ed7cb";
+      sha256 = "38f9ed2272ddf921886546d8be2db62a24e9e4c8fad4073806fb47fde589017b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/tr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/tr/Thunderbird%20140.4.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "b23c300baa227ee40d580498437cb68444e49a6e5006ade9eca64e49f4bf04f7";
+      sha256 = "2e6ddd14745d0577c553166791323a8b83e571900b56eeccb65f4358abb5b2a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uk/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/uk/Thunderbird%20140.4.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "54f58b050f72a98143bc6ed14a64723879a76986d113bcd95ee7e6c8a27ad82b";
+      sha256 = "9986d7cd69b8e6561ad72af8bd3096e7df0ae5710f0c0ea2a8d995730e881665";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uz/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/uz/Thunderbird%20140.4.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "15711d642b42cb5e75a4b7bc5e8de929f296d7dff14ff17225b5ff54ea028896";
+      sha256 = "4b9ef669d6899b0353cddcfa0589285cd12bb45ede26604c2aaf176e8cc9fe55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/vi/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/vi/Thunderbird%20140.4.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "b9499aaa463763e4bd1970d73e33bfef0fbadcf2e2d04689b8c45ac22d4959cd";
+      sha256 = "f749a2f83d2ce179e485cb93ee2b71313924adfadda0786d6b0de77abee3a7c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-CN/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/zh-CN/Thunderbird%20140.4.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "5b0ed3b9d0f0efc6ea79012e78a0f23a522d81e9efcff9f9a53fed4819184cc0";
+      sha256 = "14cc428227819eff46e6d4a28c530a72afa7b795c897d194bbb1fb130ed734f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-TW/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/zh-TW/Thunderbird%20140.4.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "c98421d56e8b46ab9768a45d2d55d0b7657671184abaf8b6834b359b48ef76ec";
+      sha256 = "d7eb52fe22b210177bd27f8a10da57f510bb37ab62d5c0deaff2a21ba5c0e734";
     }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index c38825023973..5df2cc543e16 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "143.0.1";
+  version = "144.0.1";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/af/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/af/thunderbird-144.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "eb96c74840f957b29ce055f548d621f4dbbd30a0c31d2225c38852b18fa1635e";
+      sha256 = "2eaef7a844b0b96fd1e9db361245baef31a4e7b2afb60b7c76d2cf3a8ac58d80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ar/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ar/thunderbird-144.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "3d120c6be88235a6471fefa10476a1857d1994554f5ddb54042260f7204b12d7";
+      sha256 = "2d4b293fc767a446e2e4ed25e732628a0117b0bfdb9ee09375a283a061faef39";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ast/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ast/thunderbird-144.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "2019429d4124fffdf3271967f759676c4b9dcc72065ae6bcf31c5a77814bfd37";
+      sha256 = "5bece4acfa5fbb551d253ceade81c464b97ccb235cf3c7bd2277de752f8da2c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/be/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/be/thunderbird-144.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "248a799c5e45d40d684690bcf556319e0751e67189950e1acabac9c8f24f27dd";
+      sha256 = "a9654f6e0dfc6c5dfbaa63725390edc2a3d5b7fad37f3b8800124d4c0b29fdfb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/bg/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/bg/thunderbird-144.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "1e11141519e57f2df3675e2f4a9530adbcfd8a8e60ec0edee472fbc1b04fc67d";
+      sha256 = "c75bf9947d561ce28282dac114dba20907adbb64b9df04b30d41f5964b9ef888";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/br/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/br/thunderbird-144.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "9f7ae4984cadf5a87e1fd214e64d9a71e5877d6d29929d356740d632b3de2600";
+      sha256 = "00f643b8057c385d8b806b9d51645eb50722eed77efe0a21caeeaf1ee14583b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ca/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ca/thunderbird-144.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "892f3b136e486fa2c42d0f1b822139641cb76b03ca25cd2257fd315b1b6093bd";
+      sha256 = "9229a0cea3fd7ee22531d9e38913e742cd98692c4ba7a85cc8dd585b7fb5cbb1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/cak/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/cak/thunderbird-144.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "febcd1c02e39ed1f848ba44d63036e1f4a7a58b4fd694a281de9a6a2229a5337";
+      sha256 = "8c22440c075a9d64524dd713d8c9a8817505325e7172368a3b737b2b74ccbb6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/cs/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/cs/thunderbird-144.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "7a1bcd0cb53e19be2c4690ab9742c8a2000adbc0a7d9fad9c34f76a69ff0b2ab";
+      sha256 = "8ac1be7213a0630c1bbfdaa04991d159171466ec81da5fb13c1391ca39cdf50d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/cy/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/cy/thunderbird-144.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "2e266fe8552297f62a53578d7b199beed77a0e61079f77aa00e0cc81d55d2a51";
+      sha256 = "c4e59f830f548d1ee0c9a08cb7ee8c9b36dcc96fbddc5b6448dbfbf53cf50907";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/da/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/da/thunderbird-144.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "f121888a0cc498112528f910f02f7709b7480c9417bad76fdb3a45948c65a85c";
+      sha256 = "5c985a7adeb9b01f0a2b2f90dde73b7c09f6c333d280072931de8b8e19c556e8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/de/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/de/thunderbird-144.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "e4279aa3cb03291d158fa16e63a47cd13b52b1bd82503955f215ac5e0962f43d";
+      sha256 = "cac38327aafce3819998a5b71c210cbc757fec9e61802255a39c3534df41a94b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/dsb/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/dsb/thunderbird-144.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "47b9f677fef9b793bf1c5f3e0eae4851c33f9cd24184467f1551c7819f1ae0d6";
+      sha256 = "69ad7365bdfea6652d2cc2c7f2950269d9cd7bcc6c51ed8726d542e29cb08ef8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/el/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/el/thunderbird-144.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "68765c41868729c471d82781a9d869ab24e7ab675a523078b9e00b043fdf27fa";
+      sha256 = "e172680c3559e08b2ace167a38db61099e952431f8906a25c09cd79e528c517a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/en-CA/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/en-CA/thunderbird-144.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "346f2e03db29e39613a4ab3dfe75efc4931913ffbb8c31dc2556721a8efbd6cd";
+      sha256 = "f11f685a168af61710f311cfaeb7df205c88dab1772b71c35819fb2c9c1dddff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/en-GB/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/en-GB/thunderbird-144.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "c6b673764f51d18f0aac1a1ac9eebb6ac1cae16d17db9dfaea73c145a6d8874c";
+      sha256 = "2822e047a90dd3ef26d792c7fcee69822f799d74205ac37cc59b9a53f6915af5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/en-US/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/en-US/thunderbird-144.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "bf54e51cc92f7a4455b437b64ffc3b4a9bedd1c22da91cf92d4724fa5dea02b7";
+      sha256 = "bc2f1b9b09d3c4a9e66667862f9ee629b0e000c65217f7d4592f7654bcc7f957";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/es-AR/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/es-AR/thunderbird-144.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "264a801c412575a7bc63ecb9a1b20cd92673ae34924fb08c25bb79aeb8207c0f";
+      sha256 = "d601c69a1c486231cf30d4676f7e75b96ad3043c365e0a1f96f93c54af7b8b85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/es-ES/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/es-ES/thunderbird-144.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "1838a352be56c2a20755a50ed19b7125dca7017cff4bacbbd5b80a67e7572fbd";
+      sha256 = "7e439bc19094917e96a1f30a196f6a7cacde0356d33edc0dbc76d2c0ae04324f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/es-MX/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/es-MX/thunderbird-144.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "1a22275a0ba7985637167af1abb4677b00328e6a548abb0ff4a1d553973c66e9";
+      sha256 = "07992bb01703d8d0d4faffeca8b4040a7a778aea6b685237ad6374287d644fe9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/et/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/et/thunderbird-144.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "a36d5d2ccafd543d4fe5ad979caf762f625c142daa47e0207b847fd8bc63bc81";
+      sha256 = "ca9637f6efd47004c51dbb6ffc25873eeebd401b1a6adeee7c6718274c282278";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/eu/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/eu/thunderbird-144.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "3932f06666f8e168efbc97c27ababc09e552e2d486ec3fb5227c2f77658f3807";
+      sha256 = "8b79818c1183471034b8e15b10dee3b709e1b6b6de25e56900514fb1867bc1ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/fi/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/fi/thunderbird-144.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "933d82aaf1e73aa1e4a76930e3d4ff96e3b7e6ddfdad09b0cb6908a11f1fc8e0";
+      sha256 = "30319f1d8a64d1d5cb45a8e4b48e08f3acccdfd2cfd9098f985570a7ad15fbf6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/fr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/fr/thunderbird-144.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "35191e2d6ae4ec6a76aa713e682388912777b05af9f0169116c27c28cf06742f";
+      sha256 = "4ea5b46400eb21716bba08c8ff5a476c21b7e2caebceae23ef0f8a0ae3f89a9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/fy-NL/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/fy-NL/thunderbird-144.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "b0d6fbd68c6b06aef1a825422fcd4877077306735f2a888c7d91c7f52fe55de4";
+      sha256 = "4c358143bde9419c986d91571f473211fca571dc5e86b08884fbc644e6e09dfe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ga-IE/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ga-IE/thunderbird-144.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "4f868cbc7b3ea3ed8e8ac497d1758a96bdecf16db4d5cd8281fe11bd031e2ab1";
+      sha256 = "1a2d20d1ac7f5aa1fa943fc2293d032fd803b96434d2b71274c8b9409e244169";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/gd/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/gd/thunderbird-144.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "e5ab7d353c9fc3bd642be2b27ecf8dd4d3a43e35e84759a58a751411a2f053a9";
+      sha256 = "0f017e22289d4e58085eb281a488466231b387d8ef0dfdb6c23700619335b28c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/gl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/gl/thunderbird-144.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "de518d20ee05c53a9a6e554ebb59e67c91355c42b115b37032209baa5bec57d7";
+      sha256 = "d3968b0c9bd2c3ca67225f4da13c740b8060d14d3167cf02dca7280c1da8c800";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/he/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/he/thunderbird-144.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "269e09328a9e9d3d0ce20af51ac6088ea0a3449eb18559269f3ff25182ffefff";
+      sha256 = "e91bf4535535053defa087edb072b4532a963206785e9928ce2be6bd4f2f8c03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/hr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hr/thunderbird-144.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "1506b3402d48d74d495cadd080037a4341c1fa2ac5fe35f28f71e9242bbe024a";
+      sha256 = "0abd3881f98b25c4460f74cb314b105f296a79b98be95a3e393c3b1c7827c5ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/hsb/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hsb/thunderbird-144.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "e1e9bda516853a6a9633b7acab3b2348dc7e95ba323781cbe77e0f3b0405edc7";
+      sha256 = "e1e691da2d35c1028c03578b7eb1e4c27f525a327e069d6e905221092935bd37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/hu/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hu/thunderbird-144.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "d1ffb77a4eb7d6a2aa81a9122f544110285e13d07adab0ad61b5e82b9e5c35e9";
+      sha256 = "8f081961c4d726b42829832b67762c9890cffa245e05ec6dd83e18883da7e3ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/hy-AM/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hy-AM/thunderbird-144.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4aab75bdfc7a18cd19af0b9dfafe9192373c0c0f39588025219c7a71c5e6138b";
+      sha256 = "22c8c53ad7e35293334663269066867e263f1c0cda1b130e72a9091040181a5c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/id/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/id/thunderbird-144.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "2b1d4f3dac6316c3bf4d3f2433116deca8db0c9e14d0e6ccb645870331851da5";
+      sha256 = "9e475931040eda58e861e5b445fdca66d23808328514d5139f59b20184912424";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/is/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/is/thunderbird-144.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "7249c6d698a9cdd4e9df414f7e7f7873cd534372ffe23ed7b134f53edf79fa34";
+      sha256 = "b998793160c7052d8a85a21009c442a2faad834ef174c1271c5bfcaf8d849b50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/it/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/it/thunderbird-144.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "b54fb861ef8febf6b14505f4a8bcb758abb3ec6517003dba8abf1b074ce44065";
+      sha256 = "730958edd5452e8a2b6fcad37d09602b3f6c8fa8c345cd9c24154f864a83b7a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ja/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ja/thunderbird-144.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "11dbd6393ffe5fd0023266d204610a6697c0bb31a493e3166c62e00b90f8e385";
+      sha256 = "4ca93d071f8cb63941e91615bb34df822644db0ba654b46b249dbbb3611068e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ka/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ka/thunderbird-144.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c4941d89458d45b6ad51f1b7ac775ef57ef2ec18c29e1de69587959cd2fd8425";
+      sha256 = "9ce2c43ac9db1eac62afcb7f704f51395c97937504412a9c6f20fbbaaf179c2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/kab/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/kab/thunderbird-144.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "cf280d6b3d1fe2c364d70fc9dc110594fb06a4ddfd64e2b4009452b81cbc67c0";
+      sha256 = "fc75310b68369d00aaf8369d640dbe3ea51cc6272985ba8a6cfd8e1cb711a140";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/kk/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/kk/thunderbird-144.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "9c82ee099d776d1396055223cecc1e2c706941e25af258ef9379bd74a1af9dca";
+      sha256 = "4aaff43f29ded8eecfa21537062ee64162cbd2b603814d08a8379c9751f3afe0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ko/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ko/thunderbird-144.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "a44a3098ab2447cd78c654bd9dbd11be0c97a54478f3ee5f3493dbf182eba345";
+      sha256 = "f95a153a913bc74ff410ceb25d4955c55d386a920c28fe137aee94bc2dedc7f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/lt/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/lt/thunderbird-144.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "75fab1cde72fc832e4ed70d6a8dbb89cbe002eed397ccc717347beb39708064c";
+      sha256 = "a28d27f6357a0c918fe21f666338c845c66bf1fd337b45bcbbf325fe9212e1bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/lv/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/lv/thunderbird-144.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "f0bdec833209a1fca1fe62896305fca8860422da1bd2564267cbc21be4b123ec";
+      sha256 = "4353343e330518fe144b9064fa1af0cebb0c43fff3776ef4ee55193d4cefac2a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ms/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ms/thunderbird-144.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "af920cd50f8118353db51efa21fe9a64e0064816d7a935d1f192b09439ce7a58";
+      sha256 = "c970d0bb2e477f1aac161d50c3028fb5e05d3632cebc9c86ab6be1b10fc3b3e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/nb-NO/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/nb-NO/thunderbird-144.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "42c7fb74de2fa4922a68bd57f50552cc5eb322736e397798214d394d1dc89174";
+      sha256 = "c31c05863ebca12a8c1e0edabb628a4f75643f536f13863291ca5512848edfcc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/nl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/nl/thunderbird-144.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "bfcfc099893c1d13a0e7967a818391f3972fb8aed684f178d0b7f911aedb002e";
+      sha256 = "aeb5af8126b8e4bc9d1cfd9d7708d4359e4c2119296c480a82bbbaa07a938056";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/nn-NO/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/nn-NO/thunderbird-144.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "98f8f3adcf2de72b9754e58416c7a5fea80687ff7bcb79c94bdfaea6108653c8";
+      sha256 = "1467647d4315070308a160b12463c327feefdbd1c5995c00b2484662ab61b279";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/pa-IN/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pa-IN/thunderbird-144.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "064bee1ab7126dcf7acd699764bb836a9ce4e33f7f33e11b26c4ae2806de8085";
+      sha256 = "241b275a831862af53758690e86549e7846ced0aff23abf0ec7064a71983b6d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/pl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pl/thunderbird-144.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "c35d131b9b061ae728edf63b6101cad6fcb8e754eaa7d4dde7be72a09f633adf";
+      sha256 = "087470f8d19ae0cf148323f0144fb389be373490ec4d5506194959cf341b84ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/pt-BR/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pt-BR/thunderbird-144.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "e55e4b97295a7e2ed59868f5196db1dbe14dccbf773d435f58030516d7d682f3";
+      sha256 = "6f441114b414be6f65747492022fb3aa51120c85a7e2e46a21409776ac97862c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/pt-PT/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pt-PT/thunderbird-144.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "8f20181843498a6cebff92101903aa6a72205fd73e1b2cdd74c4d8aa2a3654b7";
+      sha256 = "e1715feedb2c0d68863bcf231fdc0b73bc3e9450c1e10ab4c6ad3a19c1f56e09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/rm/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/rm/thunderbird-144.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "aa17b1357bcdfb0b26c4c9cee4572ce0a6766fc0d4b53d3320a8f780f2f8d61a";
+      sha256 = "106e92fbd6812fd42dc8bb6e48d205ff130a8b95cc7d121e88b63df5df2aac00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ro/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ro/thunderbird-144.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "3938179d5fd0953efc590728183356f0d5e978af2d2a72638cd2e948fbe22a2c";
+      sha256 = "dee95f50515f305cd17d5d4ab29b57ebbcaf790717a0c9d070a2b3cfea091c0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/ru/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ru/thunderbird-144.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "ac06572dd4d6d1f348c83fff1b8df0eb73ed308eb31602d5b19e83b6c9bd4da2";
+      sha256 = "fa3e951752051baf68869fc3b9e8361be26a8ace3f683b46c9035b4b9b296a46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/sk/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sk/thunderbird-144.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "69b22edf77a22c96390c93eb17e9bbe4dea984d59a296b259540fa56765afcf6";
+      sha256 = "db57519f1254039333f48145b22531f7eae00ffbafc857fb70b7cb979d008b3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/sl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sl/thunderbird-144.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "e76807b25bc86aafb223cc05f68fb96bd23b90d307a41533f15d088fda221586";
+      sha256 = "4a465b766f799f37cb484f1b7aeafec72e22faab9c74262b33ccbc4c5906be8c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/sq/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sq/thunderbird-144.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "8153e80bda06ad7497517bb3665c0797ccd5d1ad186623f53f1a90d5ff51a278";
+      sha256 = "f9ab51bc21b0eee776498f2f3a16a7b73e31cc4e48a26fb52367d7a711ad210f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/sr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sr/thunderbird-144.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "6b27a28142d211b696c85ae5e6b916865b4fefb2e7dce4c5fc951186ecd6f322";
+      sha256 = "c0a625270bf3647c187bb8872b0400232bc3fb30fe5f1a936ef7fa61b555b3f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/sv-SE/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sv-SE/thunderbird-144.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "4f25dd915beac16e7721702e741e361c6893ac811b8ddf304d01638dc6cd9697";
+      sha256 = "82f806ffec3073d8526a2486f85034084f2cb95552bfdcb9e7e22cb1098617b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/th/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/th/thunderbird-144.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "56ffa8c1da004cbe581d730070b10bf71932f61ef9d3934bfb1b8769451efb11";
+      sha256 = "5f7621438f0bb8924f7b6109764201d0f0662af8936762b7bccd2d7a8d1267e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/tr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/tr/thunderbird-144.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "1a1b27bd5c7b992f7b28d6d07c806c7c57867ea01732141983b3d9318b2d6ffe";
+      sha256 = "e9d0b46c28a46d250595939c7d460871dfc42d3f970f0aaa9cb9a367c632ca63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/uk/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/uk/thunderbird-144.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "c27f209c46c331c314d84278f79d0eaab3cb5ec8107de8a279dcc0434baeeea2";
+      sha256 = "4fd49301a6c85c7563e6d6a69802af6fb6e3f93e64e7068d15eb14e4a5b05742";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/uz/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/uz/thunderbird-144.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "6893a8e9b2e97ac10271811ef56f3423ca42376b56d132d078d87152e1ff33ee";
+      sha256 = "3f76efe4502d19f91b07263dab1f7f214affdea2aaa183758b751a1059f1bbbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/vi/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/vi/thunderbird-144.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "4254641267f5582a85d4a335be2205aa04a099fd35a62aa362a26acb267ad584";
+      sha256 = "e6865a6dcc0fc7910639347fb67e089a40fe3798f98b6799c969f7e7675c518c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/zh-CN/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/zh-CN/thunderbird-144.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "bca449a46ebc66bc639e18e647841d0b20c63fd84099e685631a4cc6f179cc89";
+      sha256 = "3a46a1b47717f127c9839419c05f72a52b4668d821603130e75a17fbc28beb4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-x86_64/zh-TW/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/zh-TW/thunderbird-144.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "61ef0f6dac757de0856692682fd76974b92ddb8273fa27e5403471c022809b53";
+      sha256 = "e93bccca9f943112c59994da68836bb1e79cb466994b895cffd77aaa1d86a355";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/af/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/af/thunderbird-144.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "9b8bbf1fe1cd9a5e74179936b9cc104e188022081aba417276cf9d22dabab478";
+      sha256 = "8d87c551127f928af2f7d312a22e63dc32fa42f429102e44ff4d438326ec0f17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ar/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ar/thunderbird-144.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "d4b28b4e70c89391b012cd2c4ea121823594cabc7cc41925dd0244858cbec4c4";
+      sha256 = "dbeeae3590792c4368aaa128b617c7fd4abd2dd5181a81e03ee271cef3837bbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ast/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ast/thunderbird-144.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "1aaa5852346a609ebce56b657c73697871274843b3c7bace73ed7eb886af91a9";
+      sha256 = "f12289f26fc49199ea4dd3873f0126c2cb24eeb19a19345691596b90064d3249";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/be/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/be/thunderbird-144.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "0bab4347e06f084c0e8ddef5353ef163618de318b029165f94dd0749155b4f0e";
+      sha256 = "70e81a825b6a0fdc2fbd58d1a1308d3aa8b7c2e3b2a3f39f87f7de410a9a6948";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/bg/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/bg/thunderbird-144.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "813f43f5658a31efc4452ea73e614570b5b05f4cbd6269da2648399551096706";
+      sha256 = "945ad45745ce69561471f0ee7648683dec23d7b3c58483bf99ec40dd9452349a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/br/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/br/thunderbird-144.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "0e02c027dc52cb58df898864afa583bd0450c59a98cb289c25457d604d7e0f94";
+      sha256 = "cb83bf2b71c696945c746c6b0d4bb7dc4d49b50331e6468a701c486dd9fd1779";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ca/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ca/thunderbird-144.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "e12bc8601040219cb470213c1afb21ebaac120d477f125b5f28a2bd06e510070";
+      sha256 = "2b56d9309155df32d9e5493da7c8668308fe79f889613f90f567b856e99eea96";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/cak/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/cak/thunderbird-144.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "7ad3621a258be10e99f296087dea871bcf1f0a88fef4e157ee6e81e515d8d581";
+      sha256 = "1a6452216f161b7926b7d5856bef87220733821b76708d7fbf16870c380b0142";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/cs/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/cs/thunderbird-144.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "3006ccbdde72b07b5ed7512be35508533a85899d6b765f093234af79fbcd3b6c";
+      sha256 = "23e791a9f4108b3c84aa8bf17b323ef276682527ee6123b4eb4038e328c97cd3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/cy/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/cy/thunderbird-144.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "ad902fc939ffeb9f1eea3e5f465c77e60e362f091bfd13fe4e32edce61a8a88b";
+      sha256 = "18d6608e99db288aebc42f45b207ac53405f00c7131eec2fbdaca3e43addc058";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/da/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/da/thunderbird-144.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "48dd5ac7b0c2fa2df964cd211d53cf4e9a74d7f8b90d070dcfa582d373193eee";
+      sha256 = "d08828cfc4ad0f9e21cfe308eb0f3ee5d2af1a79691ac2d11f2fea97d887de88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/de/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/de/thunderbird-144.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "9d4f98b8961e1c8a80470dac33c1de7f6b3b29d2472b1d1ca4a35c40a3268f83";
+      sha256 = "5881bf2aff7e355e4e60f3e1a73ccdd72f31f19981d31cd870dded2de4203bab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/dsb/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/dsb/thunderbird-144.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "e9c5b21fbeeeab7c1bec98c2e46f7330cf456c2c5e3729c6a59ac9d505cc31be";
+      sha256 = "e7bd39bd050ecbbf8f38c6bdf4bbb92de16af9ea53206dd2df38eb4c69dbdcbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/el/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/el/thunderbird-144.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "af3eb07bc01cc651a21976cf3098035fb02561f1f0d60e3b48c7b485d834361f";
+      sha256 = "eb8e4f41eb19988d3d1b6f750b82ec54930a8f95c75d9c5792707711323cac05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/en-CA/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/en-CA/thunderbird-144.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "2d34be5101ce9619278bad18c299b79fe0831a7201d003a9291ca4559a77e560";
+      sha256 = "d738c83c17a3f62aaab1dca4d83528c0e657a67fc44f939f69c0a4b9400df9cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/en-GB/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/en-GB/thunderbird-144.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "0ff1d7af1807d2cacc32ae5b99a3024bccfbb63e497c9bdab37878f064d5c19b";
+      sha256 = "869ccc308fc3da57a3027a4c1d60687406f5cc827d701b0e0970a08e66ed4a9b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/en-US/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/en-US/thunderbird-144.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "2d80e9fdecc326dccf58c38795e1dea217353aef39a1708f3172b1c33cc4651a";
+      sha256 = "8ce035d6bb82841e051c05664dc365e3ac056115d4f48a724fcbb008a8d56a31";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/es-AR/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/es-AR/thunderbird-144.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "4cec7c8e2141311f0d4518c98c973e2a77ef52a624b4e378825deb09d563f4e4";
+      sha256 = "f67a33d6bcd8bc85ea271b1f0ed6b5293ed3635a915180478aaa186989336007";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/es-ES/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/es-ES/thunderbird-144.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "40595dde2daa222162dc645a225f80c73b9658c8b96ae0f96bbe040d52b240cc";
+      sha256 = "502f9ed9f9d17405af499220dcf299af7be9f8ae90776d6c140aaecdc3535dda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/es-MX/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/es-MX/thunderbird-144.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "420a131dfeb0ff9ce3f53d38bb1ae57b7f980543a9393ef72904b9d40dc4cd6e";
+      sha256 = "d6772acdef3faf5c4de5de5fc97ae36f3ea8ef1083d1097224c34edbde76e465";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/et/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/et/thunderbird-144.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "fb26dd8f2fcae7378521b4f43223b4913fd0fe4cf98d8f4e7f508c34dd8936cc";
+      sha256 = "39fd78ba4ea9895e37133bb26c62234437513f43871e46e58b5cf6dc58efa32e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/eu/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/eu/thunderbird-144.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "4b4edcb571eb7d12aee8b664a074011ab591b03a3c8d0c834b1f8a8492254018";
+      sha256 = "fd4cff6039fc8d452955013c0d2268ca2d5b62e0a914fd3e74067129a2638989";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/fi/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/fi/thunderbird-144.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "0c984a2cc7a569535f53f100212aa55948749906f4a2e5dcf0cb2735d9214bb9";
+      sha256 = "057eefee02f1a4dbb1f931537a83514d7b4bde5555f240c033e90d768f96f455";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/fr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/fr/thunderbird-144.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "bbd3d46d284b7bcf4be97208d8ec677e6b6019bd897ae6a016eb1ba78dab30c9";
+      sha256 = "c8c615a8d2d01a06aa4e8621b7fc093130af76dea0c8285bd55d37e4a6a64648";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/fy-NL/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/fy-NL/thunderbird-144.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "f77743de45577001eb209830c081df380b378e794e120216184c874feebd0aa4";
+      sha256 = "1718a343ac13458231a4888247b5f29c53d77d5cec08ebdcaf4bba69b5851ac5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ga-IE/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ga-IE/thunderbird-144.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "96d070e4ee314bcd59dbdc741142038ace4a53874757a1e8618b8165ec94d478";
+      sha256 = "1bc195ef047cacb03e594196c0fc8d2759b1dea9f14e068476298f86f4fa9e16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/gd/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/gd/thunderbird-144.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "3c5aa2089ccf361cde6a87736f95ae969fa9cd9b292bc4283490bea8fc0c5362";
+      sha256 = "ba937f7fc0297150aaced07bc3e2979ae22c20bb071f89bcdfb3e875ccef9b7a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/gl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/gl/thunderbird-144.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "89fb13a7d35f999e2a028254328545e2810d3ebfce979acf2d5c398ce5ffcf77";
+      sha256 = "8f89d7f2d94b84642f7e567a7a9e5984334d6c521e50cea707d2c35703c9cb57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/he/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/he/thunderbird-144.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "28115757e2528a992b1933f66733feb96a1921e13f4d1ad7c44431440a02d536";
+      sha256 = "3e62d0dba485bb147f0a28b6ce39aee49243d8fe47fa220fe6ed7f36aa292133";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/hr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hr/thunderbird-144.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "75e8b56666954c974b50b3b382c3c5d9d29c3b10fb44cbb0bd7b14c49e674b05";
+      sha256 = "64c96845d9e8f28cf5cb213cb601be5cb6dbace58720863a936c071658e52c9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/hsb/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hsb/thunderbird-144.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "b0adfb145180e61c470767c4abb6ebce71da298dc48212da66202850adfbbda9";
+      sha256 = "657bf6ad82a32de00fec9f4b17b6355b76cc8ba7f8d727ec517e1867a947042a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/hu/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hu/thunderbird-144.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "3a4d147f813a0661780774ff8c5662179555a5e66fd7b7ae069c0e7f4492837a";
+      sha256 = "4cfc559d502b6e0d5de49faa207243ca20aa3282e14924297b6e447e7a78858e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/hy-AM/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hy-AM/thunderbird-144.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "8fbe1a12c71b9aec7360ab89f4a7cbd3e360b4be5b1fb3b3caf9adb76a2c1e2c";
+      sha256 = "86adcfefb98752cbb4614623f63b672e4b57d00903a411a3491a028866122b63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/id/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/id/thunderbird-144.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "6637fd5b5a79c8be7468864747a044a120521419b25897e1ad7fd7be74643ed2";
+      sha256 = "260022085fee9bca54ac3dbea3f754d155f2c06834d6594487d55d59576d8662";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/is/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/is/thunderbird-144.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "71133daa5d2c5e12ace60c8bc09e758d08566c5396a119fc161ea71ff02cde6a";
+      sha256 = "610e5837ca0922f094d5c60e86c3696c6c57f290f1d89b97ea2aa9de3d703954";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/it/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/it/thunderbird-144.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "53d66db585cf2777da525ae056e5a5f0878c99c33c67b5c054c8257ed31eba1e";
+      sha256 = "c9f1d50e01225745adee7119aa1e56d8a9855a56183e2ab611586a24e3da9b0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ja/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ja/thunderbird-144.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "f9f7856370f829d9466af378024f96baa8aa689da11dd7661b9446caceccd2d5";
+      sha256 = "e87a2ddb57d1375196492482eebb30fd8af9714af5104545e21e3097b2d59fa9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ka/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ka/thunderbird-144.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "3c050bdfe35a915a44a1b8bc78169636a6cfda0a3c55f1a39aa2c160fd48d06f";
+      sha256 = "2c4e2e6a4f547c338710179676a7111c1a373c3e26e899662b518b5c728c7547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/kab/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/kab/thunderbird-144.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "c68741f6756d9faced52a5f26f6983396a248c46206731fd2dfd38cc57e61810";
+      sha256 = "3985cbcb10d181d199121ae409e4cca9abc8931af7ad836e9e6519fd792a99ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/kk/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/kk/thunderbird-144.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "aaedd7777593303a4c1b2031ddbbb4f1e881e8b2437c6ca28c54442be46c86d5";
+      sha256 = "6b9d554a13d9e8c32fdf6aca42646b4f86180270d93568e3cda30af1f21014df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ko/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ko/thunderbird-144.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "b7afbaaf18769748af4f75735702db08ccb7fc246cd746f3b3775091bee52783";
+      sha256 = "5f7e7decb4cc20e6e8911b8caef0d3db5b7a5a7ac3fd357aefb6abf445acd28a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/lt/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/lt/thunderbird-144.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "dc6068ff4638ff7ff300ff839c719bdeff84b9b52917fd7ab61ae8ad968e9f2f";
+      sha256 = "11c01efbaebe0b698ea2acb02c6d0cd4d6ace36efc92bfb5331630be528aeb96";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/lv/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/lv/thunderbird-144.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "ce3ccac4a9c293792fc54b0b6f354d1af304b286bd2e2aeb2ecc7f17da7e9257";
+      sha256 = "500a3e9a1ae0214cd7c6fdd7adeefdb324330fe3cce33fd5138c6338ac8d5e97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ms/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ms/thunderbird-144.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "68f54064519a7d3b6680b653c16c55df4420bb6620dc7a8436c703b6128b5d83";
+      sha256 = "4a7b22c3e59a895693c48d50e17afd29a7d30cab1064a7b4f4873bdfac74e1e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/nb-NO/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/nb-NO/thunderbird-144.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "741af1d2648eb328759f39cc83bfd6ff262999f3fbbbd1d0ba82e775cd85ee36";
+      sha256 = "bfe89c74b7ae95eb9e4ea75f6887bb9ba702ef963504f761f8ac17fda3146c75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/nl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/nl/thunderbird-144.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "7719c5d1a643ae101b81b9cea1096095ff2b7b7c6f6c967474cd5879f9b51bf5";
+      sha256 = "aa82158433a38a5e3f7789829b72ecb90d2a077c1c8fbe0114ccda2b50196f5a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/nn-NO/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/nn-NO/thunderbird-144.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "172e274e323deeb406664df1fb6b4f4e583b2165db5326cd5cc384f574b6d854";
+      sha256 = "6b9190f4de5721e72c218b91a091fc70a1ea572b4dfd9f5e7a37060f9c80b94c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/pa-IN/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pa-IN/thunderbird-144.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "a3e5b8f76009fdfd70a25795403578d2eefc38532792e9a23bee47641eb17fa1";
+      sha256 = "987577b397607ba06925ed5c4778e60f5d4ec90df0a24fd78350afc3a4f40272";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/pl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pl/thunderbird-144.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "605948d2fa7dfcb79fd5f4d064cb67690dc88a0517edcb77ca833bab37f85e53";
+      sha256 = "47faac054b19425840029ea4ad7c5189542a0998311d08eb115e4b3859e0e50d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/pt-BR/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pt-BR/thunderbird-144.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "a389c95e3a0897ba9a4e3634d357f782c1d40662db503f70902be797975c22ce";
+      sha256 = "60253469a4d479e45fa036230808f079356dbc31608ae94198b7ec2b5fe87bf7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/pt-PT/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pt-PT/thunderbird-144.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "0502f15bd0555e7832ce9c30749f9a6ec54fa68f232376ca7399a6cf2fdf7ed6";
+      sha256 = "458ecf5e00aaeaa417ba77fe3803a43f906fdab788a51f3e19a86502fc2c8d63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/rm/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/rm/thunderbird-144.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "9061976aa0630d1ff369adf8ff042b66758ab5d56d7c4ef72f8a7efbb6139676";
+      sha256 = "f70f7b4da88a69f4ba1318bf4cadc4759abde316af6d6791eab9404189997a9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ro/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ro/thunderbird-144.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "1c6ae3aa75981b95140ff2b261eab0f5a7053e99c95d8d700714e580da351aa6";
+      sha256 = "001d2f0acb268549bf35ea9f68139c462d41be5e58fce20fab61248a50585e69";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/ru/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ru/thunderbird-144.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "c1b0e22974cdd660c0b67e9ca56fccf9521fdd4893d05a201a75ff90bc54a964";
+      sha256 = "47db9c0e8be8629516781fbae5efdcc5f0845200831d0c7904b5eb6bdd2415cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/sk/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sk/thunderbird-144.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "430b9aa4578a882255439453c291f82ded930573f0bb821e6406b5e5c6bc3606";
+      sha256 = "c92e424ca762cad2be6a16e9a478b66bf2c6aa1f4fdc6e6b8a945d8c4ed07b55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/sl/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sl/thunderbird-144.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "408bd7b657a4d69a4c3a20fe7b8732aa0f2f25025d41360d82422eccafa1beee";
+      sha256 = "9bda88037c11717a805a414a56c587b3f661a1493da934d00d80703ebd5ef275";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/sq/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sq/thunderbird-144.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "8dd0cfe5fde270a8330c340fe09fc46547e0006231bd49eb3486a213d5c9a3c9";
+      sha256 = "349052077ce905897589e237a94c97730ed7e3f50adae9f00d80d3ccfe7ac1ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/sr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sr/thunderbird-144.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "67c410b84102e1769bec8f121d98fe1a74fa4be300bfde374570b31890a1e009";
+      sha256 = "1c88f68d61c95acabc6d4893af53a524f081b51bc9e77032b2e7fd4969fefba8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/sv-SE/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sv-SE/thunderbird-144.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "aa3845994a1d0346537f020430c8e1d4870d2a704e78864fdfcddce275158adf";
+      sha256 = "e5f7748667f16460ebefbda113a6d7eacd8f27e6e119475cac7d341c77835a18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/th/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/th/thunderbird-144.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "8731394e3a707dec97d914b6b7adc2ac583b0bc3ab6a8fcca07f9330e7600e3d";
+      sha256 = "25ca184c7e3d9ea560bfece7696f0b57685a60ae2174108bb3ac7bc09eeef8ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/tr/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/tr/thunderbird-144.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "e3e10e51a9a1e10b195652ab22968200577cdad5ab7c1a3737dc951753b2b512";
+      sha256 = "4edbd170c9121fddd7656576b2314642350495dc1091cbb46a22cb9b91175332";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/uk/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/uk/thunderbird-144.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "c2dd44dabbe655f4d5904d002b9a3c538da03e4ac0f2eab736e69ef1bbbb1f26";
+      sha256 = "a187c1fa157f7d03b61fff62bafc11504dc0740de7071a8c365c3a44c3def2cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/uz/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/uz/thunderbird-144.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "65a62223cee859e1cdaaf4ea75c391f5c38779d01a2de18a95b82e18e4824bec";
+      sha256 = "d5e660266413f432bcfd4516fca0ff8c819ed8c37faed1a70450758e3ed39aaa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/vi/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/vi/thunderbird-144.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "b6ca9fcc1157acd6761a2db4f738a93270518912ee3305d31ab14976b1a9a510";
+      sha256 = "d895b83095f1868c61518d235129309bac5cbb4fb01211772984221bb5ce488d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/zh-CN/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/zh-CN/thunderbird-144.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "5a4e36bbc01aa5fe1904f2b4b1db943349c33c60dee9b92919784e8743a27b27";
+      sha256 = "4769aeb54e07535f8aa579258b6277735aece5dd28981f02082dda2d31f4ef54";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/linux-i686/zh-TW/thunderbird-143.0.1.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/zh-TW/thunderbird-144.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "846773c5b8a8d563410f6decb605719d8c2575873b15e9aba5d79e036c640924";
+      sha256 = "5a5bcf60c84a3f33af891e90a24a9455d88fbe0b4f5dd4b514b8baab9dda6a05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/af/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/af/Thunderbird%20144.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "dd352459679060cdcf69763a347101b1248d571e8e6cf38f87a82fd1da93cc1b";
+      sha256 = "50707c752c5ce123afc26478fac24fad8622d3a55e5ba533d66af091d28de65a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ar/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ar/Thunderbird%20144.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "27d32439dfc680f2c7f0cc01d5ef92c7c8596bf8def48bac08493c4042797151";
+      sha256 = "df673e63ac5722b2da586c63c7a0f840ad9fb0fe184bca23127d774956c6ba84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ast/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ast/Thunderbird%20144.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "ccd0a7a5284c5f0ad26b94dadd144d454a051136661386adfb9d7f4d3ef77490";
+      sha256 = "657fa539d3616f1c369279869e72853cf55c483091cf3eb0315f2dfc9f322fd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/be/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/be/Thunderbird%20144.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "9e3374e329522627cd34f1e97b98922dbf7392fbdda22d2aadc40bd05ee5e90d";
+      sha256 = "12e7cdbf669eae2f0a6f0e662fc06f74276fba74b7dce7823c34f82ce2c616a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/bg/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/bg/Thunderbird%20144.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "03b38133d68b822d4185278235cdf1913bb376017a85bc6f1a05baf4fe2a921c";
+      sha256 = "6975acc34c2e8c08e1b44d05793efabc34843ff56cc8c76291e0f1809d9888e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/br/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/br/Thunderbird%20144.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "108c6f2a9f0861dc4837fc0925cf47d64f515dc60fd3d1df578b843d43796293";
+      sha256 = "97985e5d3ef7bd31cd457530ff2719b8caa162517dbd4b4fb6c6e5d11db78bf4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ca/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ca/Thunderbird%20144.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "4f10e508a4d69006411028bcfaac1aabd2fcc5ecb045eddf858be1b17163c870";
+      sha256 = "fc1eeb6ac4f1151b0f7d4c7ab8f7bcc197bef4e6b9b3761bfafa7c23e27b1838";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/cak/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/cak/Thunderbird%20144.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "6c8a7366e15a770cd06af0b239b34febeaf8dd9774a1071f8e1208fa0c57e2ef";
+      sha256 = "27063f6a6d0c5f50bbac34076e2dfd5340d84567223265eb92da067ea2076f1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/cs/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/cs/Thunderbird%20144.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "8b633e05261b289c674c16da81c3ed03cae243c3ba8b5dbec729513dc6fe2403";
+      sha256 = "9b230019117857a585aff0cdd0ecbe72fe47bcb4b9067a66292dbfd5aabaf767";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/cy/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/cy/Thunderbird%20144.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "94ee26ce741a368f4ec1af50856a3f8fe4fae3645855eee7b39b2e0385202d62";
+      sha256 = "11fadeee8c4d2df4ec0d3f7e207b6e86c8e93c1ce43885a4b6965c871ed1c282";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/da/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/da/Thunderbird%20144.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "34c6bbedd5fca5d50c353b0453e6853457f931886e5f737aeb738f742b9ba3e9";
+      sha256 = "259f8901a03776317b72da8ff6638a175f701eb0eae3f556600d49f23807c4e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/de/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/de/Thunderbird%20144.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "edc540792ee4ff8971cfcc5eccc0fcea2d7f795cab28b2b7f2ba4a0c3a33edf8";
+      sha256 = "aa5272e750450b125fbd963a6aed81428007579361d6918489368c0ae421886e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/dsb/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/dsb/Thunderbird%20144.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "6e841fe7c78e16a735555f2dcfcb11b9f49595f97cf78da1deb53e27a00ecbe9";
+      sha256 = "614331a903e45f09050b46b77c795eb738e4cee8e1af4607e69677e832560ee7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/el/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/el/Thunderbird%20144.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "8d81356e3f73a9c8d06916122ebb52994a1538b9d1d18582e68d73da6c05c993";
+      sha256 = "75319feaac6353b5d5181d8419222b8dc6788e9b58c7560f0b233bbd6cafcf89";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/en-CA/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/en-CA/Thunderbird%20144.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "aae9441427b133624f6f8ba6f8ca749f09a93f469822ce6527342d5729455652";
+      sha256 = "8f6e71257b09084dcb863539cf3d804774ec4129431dd52306d3964cfa60c8b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/en-GB/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/en-GB/Thunderbird%20144.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "c64f7afa7129142c5c7b41ce77b954318640d4168766976c5cefd2a8e833a1bf";
+      sha256 = "a70bc82bf7d8a5be669c3184d53a31864fe2b133c69b0d394db10b753213d2c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/en-US/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/en-US/Thunderbird%20144.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "de252ac86143c2855a9ef5fde1abbeef59d67db552eedd3c948ccc2a2de46eb0";
+      sha256 = "4123ab05561df67d256953dcb914f94ca669489852c71c9bbdfc63fe7f62bd82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/es-AR/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/es-AR/Thunderbird%20144.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "d1cb550cbf5243454923c467d4413e8c94baf770849b3b4217a68a12bb9cb478";
+      sha256 = "fe7ba2b4232a9d777acc983dcf3f9d7478c6ba900354c48e10279321c4a4aac4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/es-ES/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/es-ES/Thunderbird%20144.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "6b529eec2bee456ae3734a0786a498ce1115cc04dbdd0d08280adb283c596f2d";
+      sha256 = "76f2d93fdb799a0aed7661d249e9d91c87d5a403b08e4e0374a9f1e0552e5958";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/es-MX/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/es-MX/Thunderbird%20144.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "0d1bc387a4c79642598a1e6db40daf3466fa1c4cea1eb17caf6da626695cee1f";
+      sha256 = "955833013658aee3e9348f6a7759b14eed107b79a8700bc868c04769eba20f4e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/et/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/et/Thunderbird%20144.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "1fa5cbd5dad1903415558069691d9885356d7c5f15c64f62ac5b63ca537f7894";
+      sha256 = "4498db08bace5d6ba58bc7c77b13bbe60c2d1b31262b1fe1f76d205f76be64ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/eu/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/eu/Thunderbird%20144.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "d2fbe2080f2e4135fcd8e72297c1a9d2488a947e77388867a60f09e8240bb7ff";
+      sha256 = "13fb18ac26e231da7873473156ebb95a5d43b186c1322783fee40dd121391abc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/fi/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/fi/Thunderbird%20144.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "09b114231a9b13eddbdf6729b303309f85b5c9fbeeaa658b9ec20f58d9725143";
+      sha256 = "553a67509868d4fe6ac579dc21272eb7a07e27942a6f65fe4411ddf70a84119b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/fr/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/fr/Thunderbird%20144.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "1189984f0cbd79389f9c3ba54e653c1c89964b67071417cc0fc7c12f8fa35c31";
+      sha256 = "f89b49f4529d4037541b654b0462854ea79c178ecab4110cd23f658c8236bc43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/fy-NL/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/fy-NL/Thunderbird%20144.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "05f9a3a0bee5980c824493bb0d3c8cddef2aa318446f4bbf0c454f34d3895547";
+      sha256 = "648dfc6c384734bbd9965d4c514994fa9837be5a2aefd1404eac0c737be6a89a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ga-IE/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ga-IE/Thunderbird%20144.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "dd6ddf3d80b9e5125f19597559f6971a6e236b9ee8029bfc659d4c24059c68c5";
+      sha256 = "763c0d2ca92035b2e887fa5f09d1c10532bd8e1dad7fd45af5d49f1d9e1aeb32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/gd/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/gd/Thunderbird%20144.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "31d1d38bb3f40730d0945ae68c68f4e0987d4731d2139207f196333f8fb74017";
+      sha256 = "9d6ad8dcd65767271fad6f4ec759360ae5e84b15d3852851765d010e6b546c6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/gl/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/gl/Thunderbird%20144.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "11c400e4df3e94482f33ba0a1d4de7ebd47c8e2d076f9cbd10a209e9ac078d7e";
+      sha256 = "0209f3c446b2e29792318c71e983869fd683ad0b1daddc36d568b780f80cbd29";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/he/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/he/Thunderbird%20144.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "00642933bf93afb060847a5b81b1749620be8f95c56df06ff909a47a04167b1c";
+      sha256 = "235dbaf8fbfb9d4e02c6fa732ede8668265f5c3f2c5400b014cb47821e68dc09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/hr/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hr/Thunderbird%20144.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "59761be2654ebd2adba96dc85a452b1785df1101051107bed78170d9b777f406";
+      sha256 = "55a47d9f0159933313c0d25e8e97509e35b972c1ad672a6f4dd76f7e861b32f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/hsb/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hsb/Thunderbird%20144.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "2f2388a5ca54c590e138a02615f69d90df95ebd36aad58a177640aa642b71e0b";
+      sha256 = "39a90b407058e349792217026cf391a62ed8c88978e6e175973aaa83451f12d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/hu/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hu/Thunderbird%20144.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "ed9db5b0833c0cbef411e84364e3b043ba25d3139f380ed7a9bf5db8f542b38d";
+      sha256 = "9fb24545d83a80f23d0c94535f77257cb5df6f8db3d312e2902ab370845bb2f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/hy-AM/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hy-AM/Thunderbird%20144.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "8785c79a23d5eb6fc2dc8a558b3eaad41accfcc4fca39983a1eb1ff6dc30b333";
+      sha256 = "44b5e96ea52157f6f537d5e9ce013aac337cdb89167d80e362e26fa8883622e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/id/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/id/Thunderbird%20144.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "7f6a2b65ac4344304cfbf4661240619926372fd00109b50012935aeab51031d9";
+      sha256 = "abd62036a090d55136f320eba57333df867c3d5543d7f1522ec352939c905713";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/is/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/is/Thunderbird%20144.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "5485a839d1ef2fc71cc33760d21b6fe61ec184f519a870cfed03a8d914fc3755";
+      sha256 = "c719b4ed5eb4983051155b91289618cd96c61a1bb64d74a74dd4e566776a3f55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/it/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/it/Thunderbird%20144.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "dfb7e7a21e55d44e7f99cfd378a83c9f2e4cd400be7619f0497bff6eca0e7c43";
+      sha256 = "8617593f1b979a9ecaa78cb4965ff84df516c460c3d8d2566ef06583f4d5009e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ja-JP-mac/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ja-JP-mac/Thunderbird%20144.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "84efb6cb88fa6bc0ddc65fed2c165d89eb95e5152b557d4fb4c1596ed6394730";
+      sha256 = "f5d0be7a510700e178c67309c60553056f739208de0eb81560ed243a0934aab6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ka/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ka/Thunderbird%20144.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "882d933a5d9473bcc4a04700c1e7cc33358853ab9e917d3bd71faeed74d94237";
+      sha256 = "2ea0aed9890263214c10109703f38b0ce93259a70c90e5ae90a7de2b53d5e946";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/kab/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/kab/Thunderbird%20144.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "99f65709e9ea2cef0c84427b3f53768581f1736e77bf5482ea1b3010f3fb4ff3";
+      sha256 = "1dbbe5ef5f622e1fd4c412a94351ea9eac5ac3fa9d5d7b3ac7c630113f166442";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/kk/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/kk/Thunderbird%20144.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "36f61e98bc544c530002dabfae6bcce81b9b6d199940f0093f03550451160a04";
+      sha256 = "836b3bde5a9b926798213db199a4db85c7c720029a1c4ccd6fd0896e59d7e188";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ko/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ko/Thunderbird%20144.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "769c0b207a898b0fe68348ecda8d1dbd9b4584b04bb7828cd55acb5227cb805a";
+      sha256 = "2c76b53abd508079176d9901ba5a4afdd44dc5ce54844b98342600f1cc02f6bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/lt/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/lt/Thunderbird%20144.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "8496605c6ac5a20af459fd18c52490538096b8603a74bb3dc096eb92aedff1ad";
+      sha256 = "3bac44098ab4c7b28496a8939fa9a5649b305cc9425c406d78cf60d2135d36f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/lv/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/lv/Thunderbird%20144.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "ae6ebf248e69c03b320aea62714497ee125a820f1f58f81579d1cf8427b57442";
+      sha256 = "d3482f7a5e1261e73d54ff7ffdb928e66813a90b0f1f94166930fd74a3fdbff9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ms/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ms/Thunderbird%20144.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "94eb7f0f9f9b7d608db8dd1f9295e3a8eceb6d7d71b4a3038baf50ff32cb9d40";
+      sha256 = "78ef6a32739fd239d8c81ebcc1bd932ce4c6380e895a66106f6bb6a5ca13dd35";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/nb-NO/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/nb-NO/Thunderbird%20144.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ff94e8cf70605d8da308da6a4739f2c7a33d1897bed1279d53dcf6168a03a36f";
+      sha256 = "25224fa9365ec7735f4937a6ef12c97d0586a621b18394e82514aa398b8a2ddf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/nl/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/nl/Thunderbird%20144.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "293f122147af3aec3858ebe6a9f4bd54da3e687a253124fb38b4b2531e642355";
+      sha256 = "5b217a285a068ad49b95a64db3b6f618bd6dad054baaab3dc87cf2e021a97edd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/nn-NO/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/nn-NO/Thunderbird%20144.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "23239148c3f104b6933dcfe8ddd9de55413b44c09896e272912457ede36bfa49";
+      sha256 = "4257d101741b23fd4930c4617627e4990a5695a4e5847efa86660b9c0b3ddcaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/pa-IN/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pa-IN/Thunderbird%20144.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "75aef01ae8be7447a2076c14c3eec72040ecba3a3706893dad4cf85d5ad81791";
+      sha256 = "b98f8a371c9917c0e8068e314ca0bc478935eacdb88e393523b733e6c0b19920";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/pl/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pl/Thunderbird%20144.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "2b2a2dabcae9e25d0ea269a5fafa53e078d5afdf22efb488d57013126e3c200f";
+      sha256 = "4dae823128c5aedfaf4cc5f5d43e657bd15e5702838bc1de61b5e5df2d75ecaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/pt-BR/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pt-BR/Thunderbird%20144.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "0a97d23a862f2c69f139378ad062018acd843a2ed449ff822e7b21d4a3504c98";
+      sha256 = "a6424d3b36bae7b9bac4e03453823ee2ecc9853fad02c5ac5fd2b5a39c84bc25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/pt-PT/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pt-PT/Thunderbird%20144.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "ce52947bdabe31a6b575f7bc0e5fe17362bc37d48c90657fdda3642a44160f27";
+      sha256 = "e259cb6c33d3fdc4d589e2e7eda963325f17430f52157b82e2ccdb38ed6260a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/rm/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/rm/Thunderbird%20144.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "12044114f5dbbdbc63c7c1f6fce6c01cdd34ee946830ce824b9f0251fce58676";
+      sha256 = "dac16df1214df18a401421c3628984a403d21b23e979b4e7a5b33ae6dee181a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ro/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ro/Thunderbird%20144.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "078dd5e1bc99629c9890ea8dc37e4f50826a86000519c6331b9ec9e60e7d2cd0";
+      sha256 = "ab51b61453707c00a7278b9008f349ed1e23261993837655d563ff01ced93cf2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/ru/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ru/Thunderbird%20144.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "c42bb87ffe88ddd3c446ece5859cf6ed3e94123a8368455f90d92e6cba4696fe";
+      sha256 = "17bcce9b523f57aa8acb70458061fe79705e72747cefdff6155da4e34a5f6189";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/sk/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sk/Thunderbird%20144.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "81d767229ffd58e2b81d013c5101206a259a06097fe1fe41fda3ab47fe8dde5a";
+      sha256 = "7681b5c664d1a2b81d5bd6adf1b11891b00aa55cccb63ce7c3e5a1bacb652d72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/sl/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sl/Thunderbird%20144.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "6812d6cdca415479b2be292e29b5ecc9894ca520946a0d98e2783fca6b2022af";
+      sha256 = "a5c3def0dc36de407874b70640043c8836949efdf90093109d6053c840882ab1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/sq/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sq/Thunderbird%20144.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "1921d87e174cbee32986ddabbc1e932901a572377ca74080dc40732e12dcd111";
+      sha256 = "5d3a2118f5002ddb88fcc2e8e420b43229aa6e7be2ee7bef865a8bb8e9a7bae2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/sr/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sr/Thunderbird%20144.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "0841f1d43c0db0f381d7705de0d3f4e681c228b42a145a336f988aed8f146b1b";
+      sha256 = "f51aa78643ccc4c5fcc3c2f0be107f20df63e4a06274dff01ad30468729a95bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/sv-SE/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sv-SE/Thunderbird%20144.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "765e4038047a2ff3fd830c13270dc185ebbf0dcc2e0fb88dcb0eea42a03a4e0d";
+      sha256 = "895cbf0d4a9ce7778a17bce6939832b38e7e388f72363f8e902b6797ad71cf8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/th/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/th/Thunderbird%20144.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "770889e66a4eaa0744106bbe2c2fe9d7cf31e3d770136a5dd236ec1ffa201a85";
+      sha256 = "5146cb8f18b9bc96cb1e398d232441fcb25b3cd41a425d2825387d865e2197e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/tr/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/tr/Thunderbird%20144.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "6f77ba8a3d7e0f935bf3f5678ca53c945ee228c5f882eec55cbb1f34216a5fc4";
+      sha256 = "584194757dfb731b845c995ee710714b55e3fa442e010724976326a26c6ad5fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/uk/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/uk/Thunderbird%20144.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "5b97866a71fe3bf2ccbfc45f63ac289f20c76538188c315079356dcf8f349e14";
+      sha256 = "fe9d57bb5ba05366b294e4f5181f79d3c0a8a5e62514d741844dc24e9734a918";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/uz/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/uz/Thunderbird%20144.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "4ff45bc614a1dbe0f91ea4b2f621f878184527e97766c3c2b99c34a51e08fa55";
+      sha256 = "3f4f64d3c15b940be52a269043a5c245addf52370f0ea7938b7654364d8ddc7a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/vi/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/vi/Thunderbird%20144.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "95403ee19e658d66a4f72268fc8243f3a158bc61ba2d4f0907c10dad9b8767bb";
+      sha256 = "0d96bf5ce3b0a1f5ed31219a55c165c33cd60e4e51b9c50fe7b747d43d7b7491";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/zh-CN/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/zh-CN/Thunderbird%20144.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "3cf136a0733c0dcb7b5d662c904e81e7c9873165a0d291df0c3dbb1f5f09a524";
+      sha256 = "5c80d9ad363d43f29a706ebedbafb47e39de04da402d222e316deafbc649edcd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/143.0.1/mac/zh-TW/Thunderbird%20143.0.1.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/zh-TW/Thunderbird%20144.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "63e86e3a8b8a99be685d2500e5497af70ac6fd9b997df1f197a0dcb4c24cb151";
+      sha256 = "a26c5d121f630f75f546d996096ee4edcadd26a0b7d7d796089d318761a3093b";
     }
   ];
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index d3b9aec99a8a..2daec752a2ff 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -47,23 +47,7 @@ let
       extraPatches = [
         # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.
         (if lib.versionOlder version "140" then ./no-buildconfig.patch else ./no-buildconfig-tb140.patch)
-      ]
-      ++ lib.optional (lib.versionAtLeast version "140") (fetchpatch2 {
-        # https://bugzilla.mozilla.org/show_bug.cgi?id=1982003
-        name = "rustc-1.89.patch";
-        url = "https://raw.githubusercontent.com/openbsd/ports/3ef8a2538893109bea8211ef13a870822264e096/mail/mozilla-thunderbird/patches/patch-third_party_rust_allocator-api2_src_stable_vec_mod_rs";
-        extraPrefix = "";
-        hash = "sha256-eL+RNVLMkj8x/8qQJVUFHDdDpS0ahV1XEN1L0reaYG4=";
-      })
-      ++ lib.optionals (lib.versionOlder version "139") [
-        # clang-19 fixes for char_traits build issue
-        # https://github.com/rnpgp/rnp/pull/2242/commits/e0790a2c4ff8e09d52522785cec1c9db23d304ac
-        # https://github.com/rnpgp/sexpp/pull/54/commits/46744a14ffc235330bb99cebfaf294829c31bba4
-        # Remove when upstream bumps bundled rnp version: https://bugzilla.mozilla.org/show_bug.cgi?id=1893950
-        ./0001-Removed-lookup-against-basic_string-uint8_t.patch
-        ./0001-Implemented-char_traits-for-SEXP-octet_t.patch
       ];
-
       extraPassthru = {
         icu73 = icu73';
         icu77 = icu77';
@@ -75,6 +59,7 @@ let
         homepage = "https://thunderbird.net/";
         mainProgram = "thunderbird";
         maintainers = with lib.maintainers; [
+          booxter # darwin
           lovesegfault
           pierron
           vcunat
@@ -101,8 +86,8 @@ rec {
   thunderbird = thunderbird-latest;
 
   thunderbird-latest = common {
-    version = "143.0.1";
-    sha512 = "5f4fd5e4f5bc9fee9852d51b8e675f7c9c605660332c24aa0c90e5437301b468153c1788720bc80a53cfc1c3bf95a4bdb622a0533b8f11fb9853b290485c47c6";
+    version = "144.0.1";
+    sha512 = "e1859ecd247260c9303a335d14f51d2b80bca7fe0125c41cf6f6bdf1331072dcef490d75fba588b37db5410ce2e7084bbe1c8f568d40c46303891ae2bfbe431c";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-latest";
@@ -115,8 +100,8 @@ rec {
   thunderbird-140 = common {
     applicationName = "Thunderbird ESR";
 
-    version = "140.3.0esr";
-    sha512 = "82a9c4aa250b01e0e4d53890b0337972e46504636831c1b6307b841c4c5aeec86482b2da3c1666c46e870a75f6cb54db9f759664688b382ad66efa647145d900";
+    version = "140.4.0esr";
+    sha512 = "23a7c99f51a346f9df6e0da257040a78da0b9afd70966a0fd5c0f5a4dcd4806520f8d510a382cf5d76a099aa889219a5eec185b774a6a9b65c4ccdcb75662554";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-140";
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 957313668a15..6820ec4208a2 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -155,12 +155,6 @@ let
       patches = [
         ./disable-overlay-build.patch
         ./fix-plugin-copy.patch
-        # Can be removed before the next update of Mumble, as that fix was upstreamed
-        # fix version display in MacOS Finder
-        (fetchpatch {
-          url = "https://github.com/mumble-voip/mumble/commit/fbd21bd422367bed19f801bf278562f567cbb8b7.patch";
-          sha256 = "sha256-qFhC2j/cOWzAhs+KTccDIdcgFqfr4y4VLjHiK458Ucs=";
-        })
       ];
 
       postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -224,14 +218,14 @@ let
     } source;
 
   source = rec {
-    version = "1.5.735";
+    version = "1.5.857";
 
     # Needs submodules
     src = fetchFromGitHub {
       owner = "mumble-voip";
       repo = "mumble";
-      rev = "v${version}";
-      hash = "sha256-JRnGgxkf5ct6P71bYgLbCEUmotDLS2Evy6t8R7ac7D4=";
+      tag = "v${version}";
+      hash = "sha256-4ySak2nzT8p48waMgBc9kLrvFB8716e7p0G4trzuh1k=";
       fetchSubmodules = true;
     };
   };
diff --git a/pkgs/applications/networking/p2p/transmission/4.nix b/pkgs/applications/networking/p2p/transmission/4.nix
index be91f8d4bf07..a49cc0c788fa 100644
--- a/pkgs/applications/networking/p2p/transmission/4.nix
+++ b/pkgs/applications/networking/p2p/transmission/4.nix
@@ -175,21 +175,22 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     mkdir $apparmor
     cat >$apparmor/bin.transmission-daemon <<EOF
+    abi <abi/4.0>,
     include <tunables/global>
-    $out/bin/transmission-daemon {
+    profile $out/bin/transmission-daemon {
       include <abstractions/base>
       include <abstractions/nameservice>
       include <abstractions/ssl_certs>
       include "${apparmorRules}"
-      r @{PROC}/sys/kernel/random/uuid,
-      r @{PROC}/sys/vm/overcommit_memory,
-      r @{PROC}/@{pid}/environ,
-      r @{PROC}/@{pid}/mounts,
-      rwk /tmp/tr_session_id_*,
+      @{PROC}/sys/kernel/random/uuid r,
+      @{PROC}/sys/vm/overcommit_memory r,
+      @{PROC}/@{pid}/environ r,
+      @{PROC}/@{pid}/mounts r,
+      /tmp/tr_session_id_* rwk,
 
-      r $out/share/transmission/public_html/**,
+      $out/share/transmission/public_html/** r,
 
-      include <local/bin.transmission-daemon>
+      include if exists <local/bin.transmission-daemon>
     }
     EOF
     install -Dm0444 -t $out/share/icons ../qt/icons/transmission.svg
diff --git a/pkgs/applications/networking/protonvpn-cli/2.nix b/pkgs/applications/networking/protonvpn-cli/2.nix
deleted file mode 100644
index a707832771a6..000000000000
--- a/pkgs/applications/networking/protonvpn-cli/2.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchFromGitHub,
-  pythonOlder,
-  requests,
-  docopt,
-  pythondialog,
-  jinja2,
-  distro,
-  dialog,
-  iptables,
-  openvpn,
-}:
-
-buildPythonApplication rec {
-  pname = "protonvpn-cli_2";
-  version = "2.2.12";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "Rafficer";
-    repo = "linux-cli-community";
-    # There is a tag and branch with the same name
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-vNbqjdkIRK+MkYRKUUe7W5Ytc1PU1t5ZLr9fPDOZXUs=";
-  };
-
-  propagatedBuildInputs = [
-    requests
-    docopt
-    pythondialog
-    jinja2
-    distro
-    dialog
-    openvpn
-    iptables
-  ];
-
-  # No tests
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Linux command-line client for ProtonVPN using Openvpn";
-    homepage = "https://github.com/Rafficer/linux-cli-community";
-    maintainers = with maintainers; [
-      jtcoolen
-      jefflabonte
-      shamilton
-    ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "protonvpn";
-  };
-}
diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix
deleted file mode 100644
index 1d77b76825ea..000000000000
--- a/pkgs/applications/networking/protonvpn-cli/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  pythonOlder,
-  fetchFromGitHub,
-  protonvpn-nm-lib,
-  pythondialog,
-  dialog,
-  wrapGAppsNoGuiHook,
-  gobject-introspection,
-  glib,
-}:
-
-buildPythonApplication rec {
-  pname = "protonvpn-cli";
-  version = "3.13.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "protonvpn";
-    repo = "linux-cli";
-    tag = version;
-    sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";
-  };
-
-  nativeBuildInputs = [
-    wrapGAppsNoGuiHook
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-  ];
-
-  propagatedBuildInputs = [
-    protonvpn-nm-lib
-    pythondialog
-    dialog
-  ];
-
-  dontWrapGApps = true;
-
-  makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-  ];
-
-  # Project has a dummy test
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Linux command-line client for ProtonVPN";
-    homepage = "https://github.com/protonvpn/linux-cli";
-    maintainers = [ ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "protonvpn-cli";
-  };
-}
diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
index 46ed77495f2e..5240664a0f1a 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix
@@ -54,7 +54,7 @@
   symlinkJoin,
   systemd,
   tzdata,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   which,
   xorg,
   zlib,
@@ -173,7 +173,7 @@ stdenv.mkDerivation rec {
     speex
     stdenv.cc.cc
     (lib.getLib systemd)
-    webkitgtk_4_0
+    # webkitgtk_4_0
     xorg.libXScrnSaver
     xorg.libXaw
     xorg.libXmu
@@ -313,6 +313,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     license = licenses.unfree;
     description = "Citrix Workspace";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index d6ff00df10c1..ea7e86b4295e 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     "out"
     "dev"
   ];
-  version = "15.70.4";
+  version = "15.71.4";
 
   src =
     let
@@ -39,11 +39,11 @@ mkDerivation rec {
     {
       x86_64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_amd64.deb";
-        hash = "sha256-VF/afz1PUnoPhc/Bi2P3eTAz6l0aecWEnl0Tcehv4RA=";
+        hash = "sha256-DztZRVBIFdLkZX1a89tVwJvJicgsm5YTux0ezyWL1+w=";
       };
       aarch64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_arm64.deb";
-        hash = "sha256-XronqLbPnXrCUF8v6oVjUO2xv4OM8MyJLffbv8/FEcg=";
+        hash = "sha256-lKEAuMsScbnEkgR6VFykEyar55u/Fdt5VcCWnKPwJLU=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index a030ed2c47fe..a80ee39d368d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -9,6 +9,7 @@
   buildPackages,
   c-ares,
   cmake,
+  darwinMinVersionHook,
   fixDarwinDylibNames,
   flex,
   gettext,
@@ -25,6 +26,7 @@
   libpcap,
   libsmi,
   libssh,
+  libxml2,
   lua5_4,
   lz4,
   makeWrapper,
@@ -56,7 +58,7 @@ assert withQt -> qt6 != null;
 
 stdenv.mkDerivation rec {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.4.9";
+  version = "4.6.0";
 
   outputs = [
     "out"
@@ -67,7 +69,7 @@ stdenv.mkDerivation rec {
     repo = "wireshark";
     owner = "wireshark";
     rev = "v${version}";
-    hash = "sha256-0+uPXSNabsYNGn+4753WNoUBe9lJ2EH3i3J36lqI4Ak=";
+    hash = "sha256-XkHcVN3xCYwnS69nJ4/AT76Iaggt1GXA6JWi+IG15IM=";
   };
 
   patches = [
@@ -111,6 +113,7 @@ stdenv.mkDerivation rec {
     libpcap
     libsmi
     libssh
+    libxml2
     lua5_4
     lz4
     minizip
@@ -145,6 +148,8 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     gmp
+    # Required by Qt 6
+    (darwinMinVersionHook "12.0")
   ];
 
   strictDeps = true;
@@ -190,7 +195,7 @@ stdenv.mkDerivation rec {
       flags+=(-change @rpath/"$(basename "$file")" "$file")
     done
 
-    for file in $out/lib/wireshark/extcap/*; do
+    for file in $out/libexec/wireshark/extcap/*; do
       if [ -L "$file" ]; then continue; fi
       echo "$file: fixing dylib references"
       # note that -id does nothing on binaries
@@ -208,7 +213,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns
     mkdir -p $out/Applications/Wireshark.app/Contents/PlugIns
     cp -r $out/lib/wireshark/plugins $out/Applications/Wireshark.app/Contents/PlugIns/wireshark
-    cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap
+    cp -r $out/libexec/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index c38d5913d2ea..4dccabbf7fbf 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -19,7 +19,6 @@
   enableZstd ? true,
   zstd,
   nixosTests,
-  fakeroot,
 }:
 
 stdenv.mkDerivation rec {
@@ -58,9 +57,6 @@ stdenv.mkDerivation rec {
   ++ lib.optional enableOpenSSL openssl
   ++ lib.optional enableXXHash xxHash;
 
-  # fakeroot doesn't work well on darwin anymore, apparently
-  checkInputs = lib.optionals (!stdenv.isDarwin) [ fakeroot ];
-
   configureFlags = [
     (lib.enableFeature enableLZ4 "lz4")
     (lib.enableFeature enableOpenSSL "openssl")
diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index 97b84cd59dbc..012a4a8b1661 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -19,13 +19,13 @@ let
     }:
     buildGoModule rec {
       pname = stname;
-      version = "2.0.8";
+      version = "2.0.10";
 
       src = fetchFromGitHub {
         owner = "syncthing";
         repo = "syncthing";
         tag = "v${version}";
-        hash = "sha256-QkCLFztzaH9MvgP6HWUr5Z8yIrKlY6/t2VaZwai/H8Q=";
+        hash = "sha256-N0+i5sj/cTPDv6q428b3Y0hsPRxIl96+RIuS1AyeTbc=";
       };
 
       vendorHash = "sha256-iYTAnEy0MqJaTz/cdpteealyviwVrpwDzVigo8nnXqs=";
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 11d1711c0ed7..f569aa5267cc 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -6,7 +6,7 @@
   fetchpatch2,
   lib,
   pam,
-  python311,
+  python3,
   libxslt,
   perl,
   perlPackages,
@@ -156,6 +156,7 @@
   lp_solve,
   xmlsec,
   libcmis,
+  frozen-containers,
 }:
 
 assert builtins.elem variant [
@@ -221,16 +222,7 @@ let
     main = importVariant "main.nix";
     help = importVariant "help.nix";
     translations = importVariant "translations.nix";
-    deps = (importVariant "deps.nix") ++ [
-      # TODO: Why is this needed?
-      rec {
-        name = "unowinreg.dll";
-        url = "https://dev-www.libreoffice.org/extern/${md5name}";
-        sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
-        md5 = "185d60944ea767075d27247c3162b3bc";
-        md5name = "${md5}-${name}";
-      }
-    ];
+    deps = importVariant "deps.nix";
   };
   srcs = {
     third_party = map (
@@ -313,22 +305,42 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
     ./readd-explicit-zlib-link.patch
-
   ]
-  ++ lib.optionals (lib.versionOlder version "25.8") [
+  ++ lib.optionals (lib.versionOlder version "25.8.2.1") [
+    # Backport patch to fix build with Poppler 25.09
+    (fetchpatch2 {
+      url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
+      includes = [ "sdext/*" ];
+      hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
+    })
+    # Fix build with Poppler 25.10
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
+      hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
+    })
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
+    # Fix build with Poppler 25.10
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";
+      hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
+    })
+  ]
+  ++ lib.optionals (variant == "collabora") [
     # Backport patch to fix build with Poppler 25.05
     (fetchpatch2 {
       url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";
       includes = [ "sdext/*" ];
       hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
     })
-  ]
-  ++ lib.optionals (lib.versionOlder version "24.8") [
-    (fetchpatch2 {
-      name = "icu74-compat.patch";
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
-      hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
-    })
+    # Currently included in the condition above
+    # Uncomment if Collabora is again the only version needing it
+    # Remove if Collabora is updated far enough not to need it anymore
+    ## Fix build with Poppler 25.10
+    #(fetchpatch2 {
+    #  url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
+    #  hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
+    #})
   ]
   ++ lib.optionals (variant == "collabora") [
     ./fix-unpack-collabora.patch
@@ -367,7 +379,7 @@ stdenv.mkDerivation (finalAttrs: {
     perlPackages.ArchiveZip
     perlPackages.IOCompress
     pkg-config
-    python311
+    python3
     unzip
     zip
   ]
@@ -464,13 +476,14 @@ stdenv.mkDerivation (finalAttrs: {
       pam
       poppler
       libpq
-      python311
+      python3
       sane-backends
       unixODBC
       util-linux
       which
       xmlsec
       zlib
+      frozen-containers
     ]
     ++ optionals kdeIntegration [
       qt6.qtbase
@@ -563,10 +576,10 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-system-orcus"
     "--with-system-postgresql"
     "--with-system-xmlsec"
+    "--with-system-frozen"
 
     # TODO: package these as system libraries
     "--without-system-altlinuxhyph"
-    "--without-system-frozen"
     "--without-system-libeot"
     "--without-system-libfreehand"
     "--without-system-libmspub"
@@ -594,30 +607,21 @@ stdenv.mkDerivation (finalAttrs: {
 
     # cannot find headers, no idea why
     "--without-system-boost"
+
+    "--without-system-java-websocket"
   ]
   ++ optionals kdeIntegration [
     "--enable-kf6"
     "--enable-qt6"
   ]
   ++ optionals withJava [
+    "--with-system-rhino"
+    "--with-rhino-jar=${rhino}/share/java/js.jar"
+
     "--with-system-beanshell"
     "--with-ant-home=${ant.home}"
     "--with-beanshell-jar=${bsh}"
-  ]
-  ++ (
-    if variant == "fresh" || variant == "collabora" then
-      [
-        "--with-system-rhino"
-        "--with-rhino-jar=${rhino}/share/java/js.jar"
-
-        "--without-system-java-websocket"
-      ]
-    else
-      [
-        # our Rhino is too new for older versions
-        "--without-system-rhino"
-      ]
-  );
+  ];
 
   env = {
     # FIXME: this is a hack, because the right cflags are not being picked up
@@ -679,7 +683,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru = {
     inherit srcs;
     jdk = if withJava then jre' else null;
-    python = python311; # for unoconv
+    python = python3; # for unoconv
     updateScript = [
       ./update.sh
       # Pass it this file name as argument
diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
index 43bb332be8cf..1fa0009d97c2 100644
--- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
@@ -38,66 +38,16 @@
      m_pDoc->InsertTab(0, u"Formula"_ustr);
  
      sc::AutoCalcSwitch aACSwitch(*m_pDoc, true); // turn auto calc on.
---- a/sw/qa/extras/layout/layout3.cxx
-+++ b/sw/qa/extras/layout/layout3.cxx
-@@ -3640,6 +3642,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf104209VertRTL)
-
- CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)
- {
-+    return; // fails due to missing font: Noto Sans Hebrew
-     // Verify that line breaking a first bidi portion correctly underflows in LTR text
-     createSwDoc("tdf56408-ltr.fodt");
-     auto pXmlDoc = parseLayoutDump();
-@@ -3654,6 +3656,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408LTR)
- 
- CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)
- {
-+    return; // fails due to missing font: Noto Sans Hebrew
-     // Verify that line breaking a first bidi portion correctly underflows in RTL text
-     createSwDoc("tdf56408-rtl.fodt");
-     auto pXmlDoc = parseLayoutDump();
-@@ -3671,6 +3671,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408RTL)
-
- CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)
- {
-+    return; // fails due to missing font: Noto Sans Hebrew
-     // The fix for tdf#56408 introduced a change to line breaking between text with
-     // direction changes. This test verifies behavior in the trivial case, when a
-     // break opportunity exists at the direction change boundary.
-@@ -3684,6 +3687,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408NoUnderflow)
- 
- CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf56408AfterFieldCrash)
- {
-+    return; // fails due to missing font: Noto Sans Hebrew
-     // Verify there is no crash/assertion for underflow after a number field
-     createSwDoc("tdf56408-after-field.fodt");
- }
-@@ -3722,6 +3722,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf146081)
-
- CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)
- {
-+    return; // fails due to missing font: Noto Sans Hebrew
-     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
-     createSwDoc("tdf157829-ltr.fodt");
-     auto pXmlDoc = parseLayoutDump();
-@@ -3736,6 +3740,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829LTR)
- 
- CPPUNIT_TEST_FIXTURE(SwLayoutWriter3, TestTdf157829RTL)
- {
-+    return; // fails due to missing Noto Sans Hebrew
-     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
-     createSwDoc("tdf157829-rtl.fodt");
-     auto pXmlDoc = parseLayoutDump();
 --- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
 +++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
-@@ -700,6 +700,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll)
+@@ -447,6 +447,8 @@ CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAll)
  
  CPPUNIT_TEST_FIXTURE(SwTiledRenderingTest, testSearchAllNotifications)
  {
 +    return; // flaky on GTK
 +
-     SwXTextDocument* pXTextDocument = createDoc("search.odt");
-     SwWrtShell* pWrtShell = pXTextDocument->GetDocShell()->GetWrtShell();
+     createDoc("search.odt");
+     SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
      setupLibreOfficeKitViewCallback(pWrtShell->GetSfxViewShell());
 @@ -970,6 +972,8 @@ namespace {
  
@@ -132,9 +82,9 @@
  {
 +    return; // flaky on GTK
 +
-     comphelper::LibreOfficeKit::setActive();
-     SwXTextDocument* pXTextDocument = createDoc("shape.fodt");
+     createDoc("shape.fodt");
  
+     SwWrtShell* pWrtShell = getSwDocShell()->GetWrtShell();
 --- a/sw/qa/extras/odfexport/odfexport2.cxx
 +++ b/sw/qa/extras/odfexport/odfexport2.cxx
 @@ -1711,6 +1711,7 @@ CPPUNIT_TEST_FIXTURE(Test, testMidnightRedlineDatetime)
@@ -165,3 +115,94 @@
      aMediaDescriptor[u"FilterName"_ustr] <<= u"writer_pdf_Export"_ustr;
      saveAsPDF(u"tdf164106.fodt");
  
+--- a/sw/qa/extras/layout/layout4.cxx
++++ b/sw/qa/extras/layout/layout4.cxx
+@@ -1518,6 +1518,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf104209VertRTL)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR)
+ {
++    return; // fails due to missing font: Noto Sans Hebrew
+     // Verify that line breaking a first bidi portion correctly underflows in LTR text
+     createSwDoc("tdf56408-ltr.fodt");
+     auto pXmlDoc = parseLayoutDump();
+@@ -1532,6 +1533,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408LTR)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL)
+ {
++    return; // fails due to missing font: Noto Sans Hebrew
+     // Verify that line breaking a first bidi portion correctly underflows in RTL text
+     createSwDoc("tdf56408-rtl.fodt");
+     auto pXmlDoc = parseLayoutDump();
+@@ -1546,6 +1548,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408RTL)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow)
+ {
++    return; // fails due to missing font: Noto Sans Hebrew
+     // The fix for tdf#56408 introduced a change to line breaking between text with
+     // direction changes. This test verifies behavior in the trivial case, when a
+     // break opportunity exists at the direction change boundary.
+@@ -1562,6 +1565,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408NoUnderflow)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf56408AfterFieldCrash)
+ {
++    return; // fails due to missing font: Noto Sans Hebrew
+     // Verify there is no crash/assertion for underflow after a number field
+     createSwDoc("tdf56408-after-field.fodt");
+ }
+@@ -1619,6 +1623,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf164907_rowHeightAtLeast)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR)
+ {
++    return; // fails due to missing font: Noto Sans Hebrew
+     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
+     createSwDoc("tdf157829-ltr.fodt");
+     auto pXmlDoc = parseLayoutDump();
+@@ -1633,6 +1638,7 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829LTR)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf157829RTL)
+ {
++    return; // fails due to missing font: Noto Sans Hebrew
+     // Verify that line breaking inside a bidi portion triggers underflow to previous bidi portions
+     createSwDoc("tdf157829-rtl.fodt");
+     auto pXmlDoc = parseLayoutDump();
+--- a/sw/qa/extras/layout/layout5.cxx
++++ b/sw/qa/extras/layout/layout5.cxx
+@@ -1544,6 +1544,8 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf144450)
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter5, testTdf166152)
+ {
++    return; // fails due to missing font: Noto Sans
++
+     createSwDoc("tdf166152.fodt");
+ 
+     auto* pWrtShell = getSwDocShell()->GetWrtShell();
+--- a/unoxml/qa/unit/rdftest.cxx
++++ b/unoxml/qa/unit/rdftest.cxx
+@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293)
+
+ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess)
+ {
++    return; // fails on aarch64
+     loadFromURL(u"private:factory/swriter"_ustr);
+
+     uno::Reference<rdf::XDocumentMetadataAccess> xDocumentMetadataAccess(mxComponent,
+--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
+@@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature)
+ 
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf164106SplitReorderedClusters)
+ {
++    return; // fails due to missing font: Noto Sans
+     saveAsPDF(u"tdf164106.fodt");
+ 
+     auto pPdfDocument = parsePDFExport();
+--- i/sc/qa/extras/scsolverobj.cxx
++++ w/sc/qa/extras/scsolverobj.cxx
+@@ -74,6 +74,7 @@ void ScSolverSettingsObj::testCellRangeAddress(const uno::Any& rExpected, const
+ // Creates a model using the XSolverSettings API checks if it is accessible via the API
+ void ScSolverSettingsObj::testXSolverSettings()
+ {
++    return;
+     uno::Reference<sheet::XSpreadsheetDocument> xDoc(mxComponent, uno::UNO_QUERY_THROW);
+     uno::Reference<container::XIndexAccess> xIndex(xDoc->getSheets(), uno::UNO_QUERY_THROW);
+     uno::Reference<sheet::XSpreadsheet> xSheet(xIndex->getByIndex(0), uno::UNO_QUERY_THROW);
diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
index 244935348161..fa66144a0cca 100644
--- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
@@ -151,3 +151,40 @@ index e37df27fd817..937c12e8c4c5 100644
      createSwDoc();
      SwDoc* pDoc = getSwDoc();
      IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+
+--- a/sw/qa/extras/layout/layout4.cxx	2025-11-05 10:23:47.982125220 +0100
++++ b/sw/qa/extras/layout/layout4.cxx	2025-11-05 10:24:21.813125756 +0100
+@@ -1647,6 +1647,7 @@
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf162314)
+ {
++    return ; // Missing glyphs in the system font version
+     // Regression test for bidi portion line breaking where the portion layout ends with underflow,
+     // but the bidi portion should not be truncated.
+     createSwDoc("tdf162314.fodt");
+--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:25:25.693126767 +0100
++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:27:38.216128865 +0100
+@@ -5127,6 +5127,7 @@
+ // tdf#134226 - Tests that shaping is not broken by invisible spans
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf134226)
+ {
++    return ; // flaky layout test; depends on system font versions?
+     saveAsPDF(u"tdf134226-shadda-in-hidden-span.fodt");
+     std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport();
+ 
+@@ -5605,6 +5606,7 @@
+ // tdf#151748 - Textboxes should validate kashida positions
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf151748KashidaSpace)
+ {
++    return ; // flaky layout test; depends on the system font versions?
+     saveAsPDF(u"tdf151748.fodt");
+ 
+     auto pPdfDocument = parsePDFExport();
+@@ -5665,6 +5667,7 @@
+ // tdf#163105 - Writer kashida justification should expand spaces
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf163105SwKashidaSpaceExpansion)
+ {
++    return ; // flaky layout test; depends on the system font versions?
+     saveAsPDF(u"tdf163105-kashida-spaces.fodt");
+ 
+     auto pPdfDocument = parsePDFExport();
diff --git a/pkgs/applications/office/libreoffice/src-fresh/deps.nix b/pkgs/applications/office/libreoffice/src-fresh/deps.nix
index 6e808a0b2496..a0a96f5a26e3 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/deps.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/deps.nix
@@ -147,11 +147,11 @@
     md5name = "b9fa82fbeb8cb7a701101060e4f3e1e4ef7c38f574b2859d3ecbe43604c21f83-libetonyek-0.1.12.tar.xz";
   }
   {
-    name = "expat-2.7.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/expat-2.7.1.tar.xz";
-    sha256 = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30";
+    name = "expat-2.7.2.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/expat-2.7.2.tar.xz";
+    sha256 = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c";
     md5 = "";
-    md5name = "354552544b8f99012e5062f7d570ec77f14b412a3ff5c7d8d0dae62c0d217c30-expat-2.7.1.tar.xz";
+    md5name = "21b778b34ec837c2ac285aef340f9fb5fa063a811b21ea4d2412a9702c88995c-expat-2.7.2.tar.xz";
   }
   {
     name = "Firebird-3.0.7.33374-0.tar.bz2";
@@ -413,11 +413,11 @@
     md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz";
   }
   {
-    name = "freetype-2.13.3.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/freetype-2.13.3.tar.xz";
-    sha256 = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289";
+    name = "freetype-2.14.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/freetype-2.14.1.tar.xz";
+    sha256 = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc";
     md5 = "";
-    md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz";
+    md5name = "32427e8c471ac095853212a37aef816c60b42052d4d9e48230bab3bdf2936ccc-freetype-2.14.1.tar.xz";
   }
   {
     name = "frozen-1.2.0.tar.gz";
@@ -448,11 +448,11 @@
     md5name = "b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc-graphite2-minimal-1.3.14.tgz";
   }
   {
-    name = "harfbuzz-11.4.3.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/harfbuzz-11.4.3.tar.xz";
-    sha256 = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d";
+    name = "harfbuzz-11.5.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/harfbuzz-11.5.1.tar.xz";
+    sha256 = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1";
     md5 = "";
-    md5name = "6660415ad48fa1a46e4fa75fcdb70ff819c452153f08677d34ffb29eda66415d-harfbuzz-11.4.3.tar.xz";
+    md5name = "972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1-harfbuzz-11.5.1.tar.xz";
   }
   {
     name = "hsqldb_1_8_0.zip";
@@ -581,18 +581,18 @@
     md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip";
   }
   {
-    name = "libjpeg-turbo-3.1.1.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.1.tar.gz";
-    sha256 = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72";
+    name = "libjpeg-turbo-3.1.2.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libjpeg-turbo-3.1.2.tar.gz";
+    sha256 = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6";
     md5 = "";
-    md5name = "304165ae11e64ab752e9cfc07c37bfdc87abd0bfe4bc699e59f34036d9c84f72-libjpeg-turbo-3.1.1.tar.gz";
+    md5name = "560f6338b547544c4f9721b18d8b87685d433ec78b3c644c70d77adad22c55e6-libjpeg-turbo-3.1.2.tar.gz";
   }
   {
-    name = "language-subtag-registry-2025-07-15.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-07-15.tar.bz2";
-    sha256 = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052";
+    name = "language-subtag-registry-2025-08-25.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2";
+    sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39";
     md5 = "";
-    md5name = "2689f0a9a1fc21442d8097951fbca6d7013f9f9847f0b5e87144bd8e1355e052-language-subtag-registry-2025-07-15.tar.bz2";
+    md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2";
   }
   {
     name = "lcms2-2.17.tar.gz";
@@ -609,11 +609,11 @@
     md5name = "d2931cdad266e633510f9970e1a2f346055e351bb19f9b78912475b8074c36f6-libassuan-3.0.2.tar.bz2";
   }
   {
-    name = "libatomic_ops-7.8.2.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.2.tar.gz";
-    sha256 = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51";
+    name = "libatomic_ops-7.8.4.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libatomic_ops-7.8.4.tar.gz";
+    sha256 = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5";
     md5 = "";
-    md5name = "d305207fe207f2b3fb5cb4c019da12b44ce3fcbc593dfd5080d867b1a2419b51-libatomic_ops-7.8.2.tar.gz";
+    md5name = "2356e002e80ef695875e971d6a4fd8c61ca5c6fa4fd1bf31cce54a269c8bfcd5-libatomic_ops-7.8.4.tar.gz";
   }
   {
     name = "libeot-0.01.tar.bz2";
@@ -679,11 +679,11 @@
     md5name = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea-xmlsec1-1.3.7.tar.gz";
   }
   {
-    name = "libxml2-2.14.5.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz";
-    sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b";
+    name = "libxml2-2.14.6.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.14.6.tar.xz";
+    sha256 = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a";
     md5 = "";
-    md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz";
+    md5name = "7ce458a0affeb83f0b55f1f4f9e0e55735dbfc1a9de124ee86fb4a66b597203a-libxml2-2.14.6.tar.xz";
   }
   {
     name = "libxslt-1.1.43.tar.xz";
@@ -700,18 +700,18 @@
     md5name = "26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz";
   }
   {
-    name = "lxml-6.0.1.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/lxml-6.0.1.tar.gz";
-    sha256 = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690";
+    name = "lxml-6.0.2.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/lxml-6.0.2.tar.gz";
+    sha256 = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62";
     md5 = "";
-    md5name = "2b3a882ebf27dd026df3801a87cf49ff791336e0f94b0fad195db77e01240690-lxml-6.0.1.tar.gz";
+    md5name = "cd79f3367bd74b317dda655dc8fcfa304d9eb6e4fb06b7168c5cf27f96e0cd62-lxml-6.0.2.tar.gz";
   }
   {
-    name = "mariadb-connector-c-3.3.15-src.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.15-src.tar.gz";
-    sha256 = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe";
+    name = "mariadb-connector-c-3.3.17-src.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/mariadb-connector-c-3.3.17-src.tar.gz";
+    sha256 = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01";
     md5 = "";
-    md5name = "b593fdd3d5b8964a9feec2bf57a13e6cc8f178a4fe948e89f60ede9c53d621fe-mariadb-connector-c-3.3.15-src.tar.gz";
+    md5name = "a5abb7331508988f7287b481c1839bd929261ce38352cd0fde6c002c300e0c01-mariadb-connector-c-3.3.17-src.tar.gz";
   }
   {
     name = "mdds-3.1.0.tar.xz";
@@ -728,11 +728,11 @@
     md5name = "e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0-mDNSResponder-878.200.35.tar.gz";
   }
   {
-    name = "meson-1.8.0.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/meson-1.8.0.tar.gz";
-    sha256 = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f";
+    name = "meson-1.8.3.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/meson-1.8.3.tar.gz";
+    sha256 = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf";
     md5 = "";
-    md5name = "0a9b23311271519bd03dca12d7d8b0eab582c3a2c5da433d465b6e519dc88e2f-meson-1.8.0.tar.gz";
+    md5name = "f118aa910fc0a137cc2dd0122232dbf82153d9a12fb5b0f5bb64896f6a157abf-meson-1.8.3.tar.gz";
   }
   {
     name = "libmspub-0.1.4.tar.xz";
@@ -756,11 +756,11 @@
     md5name = "19279f70707bbe5ffa619f2dc319f888cec0c4a8d339dc0a21330517bd6f521d-mythes-1.2.5.tar.xz";
   }
   {
-    name = "nss-3.115.1-with-nspr-4.37.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/nss-3.115.1-with-nspr-4.37.tar.gz";
-    sha256 = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320";
+    name = "nss-3.116-with-nspr-4.37.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/nss-3.116-with-nspr-4.37.tar.gz";
+    sha256 = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10";
     md5 = "";
-    md5name = "5ff67daaa778ff302ccacdd00e665ce71da59f05dcdaab62bcdab6e23c90d320-nss-3.115.1-with-nspr-4.37.tar.gz";
+    md5name = "af6f21bae9f16534988842597871754450fd6cdbd786750e7cd069f8d231ce10-nss-3.116-with-nspr-4.37.tar.gz";
   }
   {
     name = "libodfgen-0.1.8.tar.xz";
@@ -798,11 +798,11 @@
     md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz";
   }
   {
-    name = "openssl-3.0.17.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz";
-    sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce";
+    name = "openssl-3.0.18.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-3.0.18.tar.gz";
+    sha256 = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b";
     md5 = "";
-    md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz";
+    md5name = "d80c34f5cf902dccf1f1b5df5ebb86d0392e37049e5d73df1b3abae72e4ffe8b-openssl-3.0.18.tar.gz";
   }
   {
     name = "liborcus-0.20.1.tar.xz";
@@ -840,18 +840,18 @@
     md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz";
   }
   {
-    name = "tiff-4.7.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/tiff-4.7.0.tar.xz";
-    sha256 = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017";
+    name = "tiff-4.7.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/tiff-4.7.1.tar.xz";
+    sha256 = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba";
     md5 = "";
-    md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
+    md5name = "b92017489bdc1db3a4c97191aa4b75366673cb746de0dce5d7a749d5954681ba-tiff-4.7.1.tar.xz";
   }
   {
-    name = "poppler-25.08.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz";
-    sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d";
+    name = "poppler-25.09.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/poppler-25.09.1.tar.xz";
+    sha256 = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658";
     md5 = "";
-    md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";
+    md5name = "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658-poppler-25.09.1.tar.xz";
   }
   {
     name = "poppler-data-0.4.12.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/src-fresh/help.nix b/pkgs/applications/office/libreoffice/src-fresh/help.nix
index f699007bc73b..314832020879 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/help.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/help.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "1dghyg96daa9iff7njanfy8v0lqql3i9vy6cqysdq141rgdbglql";
-  url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-help-25.8.1.1.tar.xz";
+  sha256 = "0pzb8xaiqzwqs0l3pdb857vk3z26n2zwqicmyj0paxaw0cndx7xv";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-help-25.8.2.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-fresh/main.nix b/pkgs/applications/office/libreoffice/src-fresh/main.nix
index da90604b5aab..ec1097e528fb 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/main.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/main.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "0gig194j66rxf678n236r7wnqv12w1bknm1kkjj8155y59n2qkjv";
-  url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-25.8.1.1.tar.xz";
+  sha256 = "0pn1swdy3vpi5phh4br1q3mly6b349qbanmwalv8v0fzqgpa4b00";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-25.8.2.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/pkgs/applications/office/libreoffice/src-fresh/translations.nix
index 27f4cc4d4aeb..396afcb84eb3 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/translations.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/translations.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "0x1vx27w8kw4qfjhhdmh5zx68svh27yiy43f057qd61rbnds0p85";
-  url = "https://download.documentfoundation.org/libreoffice/src/25.8.1/libreoffice-translations-25.8.1.1.tar.xz";
+  sha256 = "0c184wz9c55q7q87wnf0jy87cws01rwqsqc2cyilv2r5sy7ih0gv";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.8.2/libreoffice-translations-25.8.2.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-fresh/version.nix b/pkgs/applications/office/libreoffice/src-fresh/version.nix
index 2f0e9dc54fed..84598b00df3b 100644
--- a/pkgs/applications/office/libreoffice/src-fresh/version.nix
+++ b/pkgs/applications/office/libreoffice/src-fresh/version.nix
@@ -1 +1 @@
-"25.8.1.1"
+"25.8.2.2"
diff --git a/pkgs/applications/office/libreoffice/src-still/deps.nix b/pkgs/applications/office/libreoffice/src-still/deps.nix
index 9301730b3521..a81ab062be11 100644
--- a/pkgs/applications/office/libreoffice/src-still/deps.nix
+++ b/pkgs/applications/office/libreoffice/src-still/deps.nix
@@ -14,11 +14,11 @@
     md5name = "daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c-phc-winner-argon2-20190702.tar.gz";
   }
   {
-    name = "boost_1_85_0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/boost_1_85_0.tar.xz";
-    sha256 = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a";
+    name = "boost_1_86_0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/boost_1_86_0.tar.xz";
+    sha256 = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c";
     md5 = "";
-    md5name = "4e23218ff5036d57afd20f7cdab2e94cdbf6ba9c509d656ace643a81c40a985a-boost_1_85_0.tar.xz";
+    md5name = "efd6d4ce7e8571ba86f77a30bee2d3dd8dccd306721351464fc6998dd00b0c8c-boost_1_86_0.tar.xz";
   }
   {
     name = "box2d-2.4.1.tar.gz";
@@ -105,11 +105,11 @@
     md5name = "89c5c6665337f56fd2db36bc3805a5619709d51fb136e51937072f63fcc717a7-cppunit-1.15.1.tar.gz";
   }
   {
-    name = "curl-8.12.1.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/curl-8.12.1.tar.xz";
-    sha256 = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202";
+    name = "curl-8.14.1.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/curl-8.14.1.tar.xz";
+    sha256 = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd";
     md5 = "";
-    md5name = "0341f1ed97a26c811abaebd37d62b833956792b7607ea3f15d001613c76de202-curl-8.12.1.tar.xz";
+    md5name = "f4619a1e2474c4bbfedc88a7c2191209c8334b48fa1f4e53fd584cc12e9120dd-curl-8.14.1.tar.xz";
   }
   {
     name = "libe-book-0.1.3.tar.xz";
@@ -161,11 +161,11 @@
     md5name = "acb85cedafa10ce106b1823fb236b1b3e5d942a5741e8f8435cc8ccfec0afe76-Firebird-3.0.7.33374-0.tar.bz2";
   }
   {
-    name = "fontconfig-2.15.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/fontconfig-2.15.0.tar.xz";
-    sha256 = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e";
+    name = "fontconfig-2.16.2.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/fontconfig-2.16.2.tar.xz";
+    sha256 = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2";
     md5 = "";
-    md5name = "63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e-fontconfig-2.15.0.tar.xz";
+    md5name = "165b8fd2a119864c87464b233986c4a1bc09efb09c65de1ca40cc1e85ffb77e2-fontconfig-2.16.2.tar.xz";
   }
   {
     name = "crosextrafonts-20130214.tar.gz";
@@ -315,11 +315,11 @@
     md5name = "b12a1ff762680681b7ce4d98dd29a7f54d90f5bcadd10c955afc640a27b3a268-NotoSansLisu-v2.102.zip";
   }
   {
-    name = "culmus-0.133.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/culmus-0.133.tar.gz";
-    sha256 = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05";
+    name = "culmus-0.140.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/culmus-0.140.tar.gz";
+    sha256 = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3";
     md5 = "";
-    md5name = "c0c6873742d07544f6bacf2ad52eb9cb392974d56427938dc1dfbc8399c64d05-culmus-0.133.tar.gz";
+    md5name = "6daed104481007752a76905000e71c0093c591c8ef3017d1b18222c277fc52e3-culmus-0.140.tar.gz";
   }
   {
     name = "libre-hebrew-1.0.tar.gz";
@@ -343,11 +343,11 @@
     md5name = "cae999a9fc5638cb69cf0812e8bca1437ef1ebbf094f8b3c5b3f0a3ea2ef8c3a-Amiri-1.001.zip";
   }
   {
-    name = "ReemKufi-1.7.zip";
-    url = "https://dev-www.libreoffice.org/src/ReemKufi-1.7.zip";
-    sha256 = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4";
+    name = "ReemKufi-1.8.zip";
+    url = "https://dev-www.libreoffice.org/src/ReemKufi-1.8.zip";
+    sha256 = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc";
     md5 = "";
-    md5name = "2359f036c7bddeb4d5529d7b3c9139c3288c920cc26053d417cdbb563eafe0a4-ReemKufi-1.7.zip";
+    md5name = "6bf586b0473edaaca19dbd594c25e2bf6111952b8643a262976b7fa75ef345dc-ReemKufi-1.8.zip";
   }
   {
     name = "Scheherazade-2.100.zip";
@@ -356,6 +356,55 @@
     md5 = "";
     md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip";
   }
+  {
+    name = "Agdasima-2.002.zip";
+    url = "https://dev-www.libreoffice.org/src/Agdasima-2.002.zip";
+    sha256 = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3";
+    md5 = "";
+    md5name = "b4c17499f8bc183320ffdcf1f8491c778dd68a237adc056dc08e1fcb2da488f3-Agdasima-2.002.zip";
+  }
+  {
+    name = "Bacasime_Antique-2.000.zip";
+    url = "https://dev-www.libreoffice.org/src/Bacasime_Antique-2.000.zip";
+    sha256 = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a";
+    md5 = "";
+    md5name = "81127cebc97d4ee0b950c2bc2d6be0ed29abfe0d5988435eb9a39e382557250a-Bacasime_Antique-2.000.zip";
+  }
+  {
+    name = "Belanosima-2.000.zip";
+    url = "https://dev-www.libreoffice.org/src/Belanosima-2.000.zip";
+    sha256 = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449";
+    md5 = "";
+    md5name = "9c30e9e7cdb0797b651113a77f6b789659b8d8598a466b2ba92754e9dec30449-Belanosima-2.000.zip";
+  }
+  {
+    name = "Caprasimo-1.001.zip";
+    url = "https://dev-www.libreoffice.org/src/Caprasimo-1.001.zip";
+    sha256 = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b";
+    md5 = "";
+    md5name = "f066d27cfc99b6601083be102d08b4039da8d2834e2795aabd890f16c6fd1b9b-Caprasimo-1.001.zip";
+  }
+  {
+    name = "Lugrasimo-1.001.zip";
+    url = "https://dev-www.libreoffice.org/src/Lugrasimo-1.001.zip";
+    sha256 = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503";
+    md5 = "";
+    md5name = "db24dff31e8ddf6a113556c947a219f9534b072852e9ce2079a08c94854a7503-Lugrasimo-1.001.zip";
+  }
+  {
+    name = "Lumanosimo-1.010.zip";
+    url = "https://dev-www.libreoffice.org/src/Lumanosimo-1.010.zip";
+    sha256 = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f";
+    md5 = "";
+    md5name = "d4545ad6afded9a55d9a7728cfc7453cf5637861db87aafe0a730676a0cb960f-Lumanosimo-1.010.zip";
+  }
+  {
+    name = "Lunasima-2.009.zip";
+    url = "https://dev-www.libreoffice.org/src/Lunasima-2.009.zip";
+    sha256 = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393";
+    md5 = "";
+    md5name = "4302809cf4b95b481bec53de87484d919b391c90a518d065f6c775fd435a5393-Lunasima-2.009.zip";
+  }
   {
     name = "libfreehand-0.1.2.tar.xz";
     url = "https://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz";
@@ -371,11 +420,11 @@
     md5name = "0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289-freetype-2.13.3.tar.xz";
   }
   {
-    name = "frozen-1.1.1.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/frozen-1.1.1.tar.gz";
-    sha256 = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45";
+    name = "frozen-1.2.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/frozen-1.2.0.tar.gz";
+    sha256 = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823";
     md5 = "";
-    md5name = "f7c7075750e8fceeac081e9ef01944f221b36d9725beac8681cbd2838d26be45-frozen-1.1.1.tar.gz";
+    md5name = "ed8339c017d7c5fe019ac2c642477f435278f0dc643c1d69d3f3b1e95915e823-frozen-1.2.0.tar.gz";
   }
   {
     name = "glm-1.0.1.zip";
@@ -385,11 +434,11 @@
     md5name = "09c5716296787e1f7fcb87b1cbdbf26814ec1288ed6259ccd30d5d9795809fa5-glm-1.0.1.zip";
   }
   {
-    name = "gpgme-1.24.2.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/gpgme-1.24.2.tar.bz2";
-    sha256 = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581";
+    name = "gpgme-1.24.3.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/gpgme-1.24.3.tar.bz2";
+    sha256 = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd";
     md5 = "";
-    md5name = "e11b1a0e361777e9e55f48a03d89096e2abf08c63d84b7017cfe1dce06639581-gpgme-1.24.2.tar.bz2";
+    md5name = "bfc17f5bd1b178c8649fdd918956d277080f33df006a2dc40acdecdce68c50dd-gpgme-1.24.3.tar.bz2";
   }
   {
     name = "graphite2-minimal-1.3.14.tgz";
@@ -434,25 +483,25 @@
     md5name = "0e279003f5199f80031c6dcd08f79d6f65a0505139160e7df0d09b226bff4023-IAccessible2-1.3+git20231013.3d8c7f0.tar.gz";
   }
   {
-    name = "icu4c-74_2-src.tgz";
-    url = "https://dev-www.libreoffice.org/src/icu4c-74_2-src.tgz";
-    sha256 = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c";
+    name = "icu4c-75_1-src.tgz";
+    url = "https://dev-www.libreoffice.org/src/icu4c-75_1-src.tgz";
+    sha256 = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef";
     md5 = "";
-    md5name = "68db082212a96d6f53e35d60f47d38b962e9f9d207a74cfac78029ae8ff5e08c-icu4c-74_2-src.tgz";
+    md5name = "cb968df3e4d2e87e8b11c49a5d01c787bd13b9545280fc6642f826527618caef-icu4c-75_1-src.tgz";
   }
   {
-    name = "icu4c-74_2-data.zip";
-    url = "https://dev-www.libreoffice.org/src/icu4c-74_2-data.zip";
-    sha256 = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6";
+    name = "icu4c-75_1-data.zip";
+    url = "https://dev-www.libreoffice.org/src/icu4c-75_1-data.zip";
+    sha256 = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1";
     md5 = "";
-    md5name = "c28c3ca5f4ba3384781797138a294ca360988d4322674ad4d51e52f5d9b0a2b6-icu4c-74_2-data.zip";
+    md5name = "a5104212dc317a64f9b035723ea706f2f4fd5a0f37b7923fae7aeb9d1d0061b1-icu4c-75_1-data.zip";
   }
   {
-    name = "Java-WebSocket-1.5.6.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.5.6.tar.gz";
-    sha256 = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f";
+    name = "Java-WebSocket-1.6.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/Java-WebSocket-1.6.0.tar.gz";
+    sha256 = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728";
     md5 = "";
-    md5name = "167e86561cd7b5ed21b67d7543536134edcb14b373892739b28c417566a3832f-Java-WebSocket-1.5.6.tar.gz";
+    md5name = "f3ce29efde338707241d47ab4784b19a1e3658bfa0564b5bc5f80c27e5118728-Java-WebSocket-1.6.0.tar.gz";
   }
   {
     name = "flow-engine-0.9.4.zip";
@@ -539,18 +588,18 @@
     md5name = "2fdc3feb6e9deb17adec9bafa3321419aa19f8f4e5dea7bf8486844ca22207bf-libjpeg-turbo-2.1.5.1.tar.gz";
   }
   {
-    name = "language-subtag-registry-2025-03-10.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-03-10.tar.bz2";
-    sha256 = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39";
+    name = "language-subtag-registry-2025-08-25.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/language-subtag-registry-2025-08-25.tar.bz2";
+    sha256 = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39";
     md5 = "";
-    md5name = "555968dd413c69fe2c072a29e0f1a2a48856533d923ffd8377ff86f6ea701b39-language-subtag-registry-2025-03-10.tar.bz2";
+    md5name = "9b008d21f97bbf37c5aefd07805ff5500524bccbe8c39d623e184b1ed425ff39-language-subtag-registry-2025-08-25.tar.bz2";
   }
   {
-    name = "lcms2-2.16.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/lcms2-2.16.tar.gz";
-    sha256 = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51";
+    name = "lcms2-2.17.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/lcms2-2.17.tar.gz";
+    sha256 = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074";
     md5 = "";
-    md5name = "d873d34ad8b9b4cea010631f1a6228d2087475e4dc5e763eb81acc23d9d45a51-lcms2-2.16.tar.gz";
+    md5name = "d11af569e42a1baa1650d20ad61d12e41af4fead4aa7964a01f93b08b53ab074-lcms2-2.17.tar.gz";
   }
   {
     name = "libassuan-3.0.2.tar.bz2";
@@ -581,11 +630,11 @@
     md5name = "df0a59d413a5b202573d8d4f5159e33a8538da4f8e8e60979facc64d6290cebd-libexttextcat-3.4.7.tar.xz";
   }
   {
-    name = "libffi-3.4.4.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libffi-3.4.4.tar.gz";
-    sha256 = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676";
+    name = "libffi-3.5.2.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libffi-3.5.2.tar.gz";
+    sha256 = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc";
     md5 = "";
-    md5name = "d66c56ad259a82cf2a9dfc408b32bf5da52371500b84745f7fb8b645712df676-libffi-3.4.4.tar.gz";
+    md5name = "f3a3082a23b37c293a4fcd1053147b371f2ff91fa7ea1b2a52e335676bac82dc-libffi-3.5.2.tar.gz";
   }
   {
     name = "libgpg-error-1.55.tar.bz2";
@@ -616,25 +665,25 @@
     md5name = "296272d93435991308eb73607600c034b558807a07e829e751142e65ccfa9d08-ltm-1.3.0.tar.xz";
   }
   {
-    name = "libwebp-1.5.0.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/libwebp-1.5.0.tar.gz";
-    sha256 = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c";
+    name = "libwebp-1.6.0.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/libwebp-1.6.0.tar.gz";
+    sha256 = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564";
     md5 = "";
-    md5name = "7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c-libwebp-1.5.0.tar.gz";
+    md5name = "e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564-libwebp-1.6.0.tar.gz";
   }
   {
-    name = "xmlsec1-1.3.5.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.5.tar.gz";
-    sha256 = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917";
+    name = "xmlsec1-1.3.6.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/xmlsec1-1.3.6.tar.gz";
+    sha256 = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f";
     md5 = "";
-    md5name = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917-xmlsec1-1.3.5.tar.gz";
+    md5name = "952b626ad3f3be1a4598622dab52fdab2a8604d0837c1b00589f3637535af92f-xmlsec1-1.3.6.tar.gz";
   }
   {
-    name = "libxml2-2.13.8.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libxml2-2.13.8.tar.xz";
-    sha256 = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a";
+    name = "libxml2-2.14.5.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libxml2-2.14.5.tar.xz";
+    sha256 = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b";
     md5 = "";
-    md5name = "277294cb33119ab71b2bc81f2f445e9bc9435b893ad15bb2cd2b0e859a0ee84a-libxml2-2.13.8.tar.xz";
+    md5name = "03d006f3537616833c16c53addcdc32a0eb20e55443cba4038307e3fa7d8d44b-libxml2-2.14.5.tar.xz";
   }
   {
     name = "libxslt-1.1.43.tar.xz";
@@ -735,18 +784,18 @@
     md5name = "37206cf981e8409d048b59ac5839621ea107ff49af72beb9d7769a2f41da8d90-onlineupdate-c003be8b9727672e7d30972983b375f4c200233f-2.tar.xz";
   }
   {
-    name = "openldap-2.6.9.tgz";
-    url = "https://dev-www.libreoffice.org/src/openldap-2.6.9.tgz";
-    sha256 = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff";
+    name = "openldap-2.6.10.tgz";
+    url = "https://dev-www.libreoffice.org/src/openldap-2.6.10.tgz";
+    sha256 = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516";
     md5 = "";
-    md5name = "2cb7dc73e9c8340dff0d99357fbaa578abf30cc6619f0521972c555681e6b2ff-openldap-2.6.9.tgz";
+    md5name = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516-openldap-2.6.10.tgz";
   }
   {
-    name = "openssl-3.0.16.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/openssl-3.0.16.tar.gz";
-    sha256 = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86";
+    name = "openssl-3.0.17.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/openssl-3.0.17.tar.gz";
+    sha256 = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce";
     md5 = "";
-    md5name = "57e03c50feab5d31b152af2b764f10379aecd8ee92f16c985983ce4a99f7ef86-openssl-3.0.16.tar.gz";
+    md5name = "dfdd77e4ea1b57ff3a6dbde6b0bdc3f31db5ac99e7fdd4eaf9e1fbb6ec2db8ce-openssl-3.0.17.tar.gz";
   }
   {
     name = "liborcus-0.19.2.tar.xz";
@@ -763,11 +812,11 @@
     md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz";
   }
   {
-    name = "pdfium-6425.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/pdfium-6425.tar.bz2";
-    sha256 = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c";
+    name = "pdfium-6764.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/pdfium-6764.tar.bz2";
+    sha256 = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49";
     md5 = "";
-    md5name = "fe0291b96d7352bac530d13ef2e5fd63ad9980e0128911f88b957b5992508f1c-pdfium-6425.tar.bz2";
+    md5name = "59d5df3b38312b069d96a8de9d4f8d7f44a29835c9dc82bd792ea02be86c4e49-pdfium-6764.tar.bz2";
   }
   {
     name = "pixman-0.42.2.tar.gz";
@@ -777,11 +826,11 @@
     md5name = "ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e-pixman-0.42.2.tar.gz";
   }
   {
-    name = "libpng-1.6.47.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/libpng-1.6.47.tar.xz";
-    sha256 = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631";
+    name = "libpng-1.6.50.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/libpng-1.6.50.tar.xz";
+    sha256 = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307";
     md5 = "";
-    md5name = "b213cb381fbb1175327bd708a77aab708a05adde7b471bc267bd15ac99893631-libpng-1.6.47.tar.xz";
+    md5name = "4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307-libpng-1.6.50.tar.xz";
   }
   {
     name = "tiff-4.7.0.tar.xz";
@@ -791,11 +840,11 @@
     md5name = "273a0a73b1f0bed640afee4a5df0337357ced5b53d3d5d1c405b936501f71017-tiff-4.7.0.tar.xz";
   }
   {
-    name = "poppler-25.04.0.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/poppler-25.04.0.tar.xz";
-    sha256 = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d";
+    name = "poppler-25.08.0.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/poppler-25.08.0.tar.xz";
+    sha256 = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d";
     md5 = "";
-    md5name = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d-poppler-25.04.0.tar.xz";
+    md5name = "425ed4d4515a093bdcdbbaac6876f20617451edc710df6a4fd6c45dd67eb418d-poppler-25.08.0.tar.xz";
   }
   {
     name = "poppler-data-0.4.12.tar.gz";
@@ -805,18 +854,18 @@
     md5name = "c835b640a40ce357e1b83666aabd95edffa24ddddd49b8daff63adb851cdab74-poppler-data-0.4.12.tar.gz";
   }
   {
-    name = "postgresql-13.19.tar.bz2";
-    url = "https://dev-www.libreoffice.org/src/postgresql-13.19.tar.bz2";
-    sha256 = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea";
+    name = "postgresql-14.19.tar.bz2";
+    url = "https://dev-www.libreoffice.org/src/postgresql-14.19.tar.bz2";
+    sha256 = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80";
     md5 = "";
-    md5name = "482cce0a9f8d24c2447cfc7b2817e55f86d51afe5f7f1a85214bf93644e774ea-postgresql-13.19.tar.bz2";
+    md5name = "727e9e334bc1a31940df808259f69fe47a59f6d42174b22ae62d67fe7a01ad80-postgresql-14.19.tar.bz2";
   }
   {
-    name = "Python-3.9.22.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/Python-3.9.22.tar.xz";
-    sha256 = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec";
+    name = "Python-3.10.18.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/Python-3.10.18.tar.xz";
+    sha256 = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f";
     md5 = "";
-    md5name = "8c136d199d3637a1fce98a16adc809c1d83c922d02d41f3614b34f8b6e7d38ec-Python-3.9.22.tar.xz";
+    md5name = "ae665bc678abd9ab6a6e1573d2481625a53719bc517e9a634ed2b9fefae3817f-Python-3.10.18.tar.xz";
   }
   {
     name = "libqxp-0.0.2.tar.xz";
@@ -826,11 +875,11 @@
     md5name = "e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c-libqxp-0.0.2.tar.xz";
   }
   {
-    name = "raptor2-2.0.15.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
-    sha256 = "ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed";
-    md5 = "a39f6c07ddb20d7dd2ff1f95fa21e2cd";
-    md5name = "a39f6c07ddb20d7dd2ff1f95fa21e2cd-raptor2-2.0.15.tar.gz";
+    name = "raptor2-2.0.16.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/raptor2-2.0.16.tar.gz";
+    sha256 = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680";
+    md5 = "";
+    md5name = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680-raptor2-2.0.16.tar.gz";
   }
   {
     name = "rasqal-0.9.33.tar.gz";
@@ -854,18 +903,18 @@
     md5name = "5892ca6796f7a2a93d580832e907e849b19d980b40d326a283b18877ab6de0c5-librevenge-0.0.5.tar.bz2";
   }
   {
-    name = "rhino-1.7.14.zip";
-    url = "https://dev-www.libreoffice.org/src/rhino-1.7.14.zip";
-    sha256 = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c";
+    name = "rhino-1.7.15.zip";
+    url = "https://dev-www.libreoffice.org/src/rhino-1.7.15.zip";
+    sha256 = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa";
     md5 = "";
-    md5name = "bf4d2d0c5ff8889fd494486db09291cb7965f0bf2f93ef005d3b08070a5a4f5c-rhino-1.7.14.zip";
+    md5name = "42fce6baf1bf789b62bf938b8e8ec18a1ac92c989dd6e7221e9531454cbd97fa-rhino-1.7.15.zip";
   }
   {
-    name = "skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
-    url = "https://dev-www.libreoffice.org/src/skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
-    sha256 = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01";
+    name = "skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
+    url = "https://dev-www.libreoffice.org/src/skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
+    sha256 = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d";
     md5 = "";
-    md5name = "2223ebce534458a37826e8fe4f24635b0712cde7ed1bd3208f089f6fdd796e01-skia-m116-2ddcf183eb260f63698aa74d1bb380f247ad7ccd.tar.xz";
+    md5name = "53f55303821158b6de9e6b90f1cc3a548611a7e430c1a0883ff159a8db89677d-skia-m130-3c64459d5df2fa9794b277f0959ed8a92552bf4c.tar.xz";
   }
   {
     name = "libstaroffice-0.0.7.tar.xz";
@@ -931,11 +980,11 @@
     md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz";
   }
   {
-    name = "zxcvbn-c-2.5.tar.gz";
-    url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.5.tar.gz";
-    sha256 = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd";
+    name = "zxcvbn-c-2.6.tar.gz";
+    url = "https://dev-www.libreoffice.org/src/zxcvbn-c-2.6.tar.gz";
+    sha256 = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a";
     md5 = "";
-    md5name = "77d6c6ecb35952a8d8ce7f736b7a2bf466275c48210e309b73782d6b7e84dffd-zxcvbn-c-2.5.tar.gz";
+    md5name = "11e39f6776f9c82c68b2acb94336e32697d4ab6cdb4ac16f9583ccbdd735113a-zxcvbn-c-2.6.tar.gz";
   }
   {
     name = "zxing-cpp-2.2.1.tar.gz";
diff --git a/pkgs/applications/office/libreoffice/src-still/help.nix b/pkgs/applications/office/libreoffice/src-still/help.nix
index dc23461a2d8d..7ded287747c9 100644
--- a/pkgs/applications/office/libreoffice/src-still/help.nix
+++ b/pkgs/applications/office/libreoffice/src-still/help.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "0139rsgny1n554qycwmwsxyirr4afbw2q0r326s2mz6bxfg817qm";
-  url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-help-24.8.7.2.tar.xz";
+  sha256 = "0spbylki80y5ny45hrjmhjfax7m1pps0k4blyjbi8knpxr2cnak4";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-help-25.2.6.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/main.nix b/pkgs/applications/office/libreoffice/src-still/main.nix
index cec518b7d4df..1bc471ec7b52 100644
--- a/pkgs/applications/office/libreoffice/src-still/main.nix
+++ b/pkgs/applications/office/libreoffice/src-still/main.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "1swl16qznhzbchjzx6rp0a388s1ndwpdqswjpz1mxga514dlgpzh";
-  url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-24.8.7.2.tar.xz";
+  sha256 = "0ix7d20qa396cf8gvzicma9l257js97840hvkavrdk2pyznq5286";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-25.2.6.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/translations.nix b/pkgs/applications/office/libreoffice/src-still/translations.nix
index 878b8f3ae73b..f0330ed0a9de 100644
--- a/pkgs/applications/office/libreoffice/src-still/translations.nix
+++ b/pkgs/applications/office/libreoffice/src-still/translations.nix
@@ -1,5 +1,5 @@
 { fetchurl, ... }:
 fetchurl {
-  sha256 = "0r4zvy4xlhz23bk4vmh03qa1d5qdrcjg4fppy0q92yclxkrnzlgh";
-  url = "https://download.documentfoundation.org/libreoffice/src/24.8.7/libreoffice-translations-24.8.7.2.tar.xz";
+  sha256 = "1kgqfk59qs4lqlgw32csh0wgyyqi3hzy1wv3dl7rm960n0im7xqh";
+  url = "https://download.documentfoundation.org/libreoffice/src/25.2.6/libreoffice-translations-25.2.6.2.tar.xz";
 }
diff --git a/pkgs/applications/office/libreoffice/src-still/version.nix b/pkgs/applications/office/libreoffice/src-still/version.nix
index 1ca4acb8d8c9..fb516bd04a58 100644
--- a/pkgs/applications/office/libreoffice/src-still/version.nix
+++ b/pkgs/applications/office/libreoffice/src-still/version.nix
@@ -1 +1 @@
-"24.8.7.2"
+"25.2.6.2"
diff --git a/pkgs/applications/office/pdfmixtool/default.nix b/pkgs/applications/office/pdfmixtool/default.nix
deleted file mode 100644
index f19bd4dadf93..000000000000
--- a/pkgs/applications/office/pdfmixtool/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  mkDerivation,
-  fetchFromGitLab,
-  fetchpatch,
-  fetchpatch2,
-  cmake,
-  pkg-config,
-  qtbase,
-  qttools,
-  qpdf,
-  podofo,
-  imagemagick,
-}:
-
-mkDerivation rec {
-  pname = "pdfmixtool";
-  version = "1.1.1";
-
-  src = fetchFromGitLab {
-    owner = "scarpetta";
-    repo = "pdfmixtool";
-    rev = "v${version}";
-    hash = "sha256-fgtRKUG6J/CM6cXUTHWAPemqL8loWZT3wZmGdRHldq8=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    imagemagick
-    qtbase
-    qttools
-    qpdf
-    podofo
-  ];
-
-  patches = [
-    # fix incompatibility with qpdf11.3.0 usage of c++17 - delete this patch when we reach pdfmixtool version > v1.1.1
-    (fetchpatch {
-      url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/bd5f78c3a4d977d9b0c74302ce2521c737189b43.diff";
-      hash = "sha256-h2g5toFqgEEnObd2TYQms1a1WFTgN7VsIHyy0Uyq4/I=";
-    })
-    # https://gitlab.com/scarpetta/pdfmixtool/-/merge_requests/14
-    (fetchpatch2 {
-      url = "https://gitlab.com/scarpetta/pdfmixtool/-/commit/268291317ccd1805dc1c801ff88641ba06c6a7f0.patch";
-      hash = "sha256-56bDoFtE+IOQHcV9xPfyrgYYFvTfB0QiLIfRl91irb0=";
-    })
-  ];
-
-  meta = with lib; {
-    description = "Application to split, merge, rotate and mix PDF files";
-    mainProgram = "pdfmixtool";
-    homepage = "https://gitlab.com/scarpetta/pdfmixtool";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ onny ];
-  };
-}
diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix
index cf9b3be83409..3d49bd8229f9 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/applications/radio/pothos/default.nix
@@ -46,6 +46,20 @@ mkDerivation rec {
     ./cstring.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace spuce/{,spuce}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
+
+  '';
+
   # poco 1.14 requires c++17
   NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
 
diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/applications/science/biology/hh-suite/default.nix
index 51f12d9ae6ea..5cb62d1318df 100644
--- a/pkgs/applications/science/biology/hh-suite/default.nix
+++ b/pkgs/applications/science/biology/hh-suite/default.nix
@@ -41,6 +41,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optional stdenv.cc.isClang openmp ++ lib.optional enableMpi mpi;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/ffindex/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Remote protein homology detection suite";
     homepage = "https://github.com/soedinglab/hh-suite";
diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 16f9a3e64db2..a5d60ed8cae6 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -16,15 +16,22 @@
 
 stdenv.mkDerivation {
   pname = "minc-tools";
-  version = "2.3.06-unstable-2023-08-12";
+  version = "2.3.06-unstable-2024-11-28";
 
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "minc-tools";
-    rev = "c86a767dbb63aaa05ee981306fa09f6133bde427";
-    hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4=";
+    rev = "a72077d92266f9ea4c49b6dd3efd5766b81a104c";
+    hash = "sha256-YafO5UjeADO/658Xm973JtqldRYkGQ4v8m1oNJoZrbM=";
   };
 
+  # Fix for CMake > 4 in which the old policy for CMP0026 was removed.
+  # Note this breaks the tests, but they are not enabled anyway.
+  # Upstream issue: https://github.com/BIC-MNI/minc-tools/issues/123
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail "SET CMP0026 OLD" "SET CMP0026 NEW"
+  '';
+
   nativeBuildInputs = [
     cmake
     flex
@@ -58,12 +65,12 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/BIC-MNI/minc-tools";
     description = "Command-line utilities for working with MINC files";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.free;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix
index 24f967cb7d0f..4a18b8857166 100644
--- a/pkgs/applications/science/chemistry/avogadro2/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro2/default.nix
@@ -7,6 +7,7 @@
   avogadrolibs,
   molequeue,
   hdf5,
+  jkqtplotter,
   openbabel,
   qttools,
   wrapQtAppsHook,
@@ -17,20 +18,20 @@ let
   avogadroI18N = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadro-i18n";
-    tag = "1.101.0";
-    hash = "sha256-3qFx/rc5xqfrLq3Kr5b/Rid2LR/gfP6uqhhATyQL6Y8=";
+    tag = "1.102.1";
+    hash = "sha256-doY+AWJ0GiE6VsTolgmFIRcRVl52lTgwNJLpXgVQ57c=";
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avogadro2";
-  version = "1.101.0";
+  version = "1.102.1";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
-    rev = version;
-    hash = "sha256-F8to1DyeyyhsivkXDB/KH10/7teVnsoSU/ZHIsNISqc=";
+    rev = finalAttrs.version;
+    hash = "sha256-nBkOiw6JO/cG1Ob9gw7Tt/076OoRaRRmDc/a9YAfZCA=";
   };
 
   postUnpack = ''
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
     molequeue
     eigen
     hdf5
+    jkqtplotter
     qttools
   ];
 
@@ -62,4 +64,4 @@ stdenv.mkDerivation rec {
     inherit (mesa.meta) platforms;
     license = licenses.bsd3;
   };
-}
+})
diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
deleted file mode 100644
index b99c2201ec09..000000000000
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  qtbase,
-  qttools,
-  qtsvg,
-  qwt6_1,
-}:
-
-mkDerivation rec {
-  pname = "caneda";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "Caneda";
-    repo = "Caneda";
-    rev = version;
-    sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    qtbase
-    qttools
-    qtsvg
-    qwt6_1
-  ];
-
-  meta = {
-    description = "Open source EDA software focused on easy of use and portability";
-    mainProgram = "caneda";
-    homepage = "http://caneda.org";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
-    platforms = with lib.platforms; linux;
-  };
-}
diff --git a/pkgs/applications/science/electronics/dsview/cmake4.patch b/pkgs/applications/science/electronics/dsview/cmake4.patch
new file mode 100644
index 000000000000..b9674dc7d01c
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/cmake4.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d12bd0db..f904000b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ##
+ 
+-cmake_minimum_required(VERSION 2.8.6)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project(DSView)
+ 
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 379cd27af0b9..17b1a69380ae 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Fix absolute install paths
     ./install.patch
+    ./cmake4.patch
   ];
 
   # /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? []
diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 34abc1d75534..aade996079f6 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -48,12 +48,22 @@ stdenv.mkDerivation rec {
 
   cargoRoot = "libs/librepcb/rust-core";
 
+  postPatch = ''
+    substituteInPlace libs/muparser/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libs/type_safe{/,/external/debug_assert/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libs/googletest{/,/googlemock/,/googletest/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Free EDA software to develop printed circuit boards";
     homepage = "https://librepcb.org/";
     maintainers = with maintainers; [
       luz
       thoughtpolice
+      iedame
     ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
diff --git a/pkgs/applications/science/electronics/linux-gpib/common.nix b/pkgs/applications/science/electronics/linux-gpib/common.nix
index e121c6c005f0..1e47424cce1f 100644
--- a/pkgs/applications/science/electronics/linux-gpib/common.nix
+++ b/pkgs/applications/science/electronics/linux-gpib/common.nix
@@ -4,12 +4,12 @@
   lib,
 }:
 rec {
-  version = "4.3.6";
+  version = "4.3.7";
   inherit pname;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/${version}/linux-gpib-${version}.tar.gz";
-    hash = "sha256-Gze4xrvkhEgn+J5Jhrycezjp2uhlD1v6aX0WGv4J2Jg=";
+    hash = "sha256-s/+BJgaGXIW1iwEqQhim/juC0XfIwKvHlcsi20HzrWg=";
   };
 
   unpackPhase = ''
diff --git a/pkgs/applications/science/electronics/linux-gpib/kernel.nix b/pkgs/applications/science/electronics/linux-gpib/kernel.nix
index 49d280757d14..9529f2ee1713 100644
--- a/pkgs/applications/science/electronics/linux-gpib/kernel.nix
+++ b/pkgs/applications/science/electronics/linux-gpib/kernel.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation (
 
     makeFlags = [
       "LINUX_SRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+      "LINUX_SSRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
     ];
 
     installFlags = [
diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index c58c52007b21..a07a3bf556f9 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -70,6 +70,7 @@ let
     "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
     "8.20.1".sha256 = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
   };
   releaseRev = v: "V${v}";
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix
index 92c6456b3918..c8e9d1ee32f2 100644
--- a/pkgs/applications/science/logic/hol_light/default.nix
+++ b/pkgs/applications/science/logic/hol_light/default.nix
@@ -78,7 +78,6 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     maintainers = with maintainers; [
       thoughtpolice
-      maggesi
       vbgl
     ];
   };
diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix
index e4d6845360e0..1f0a8b063d6a 100644
--- a/pkgs/applications/science/logic/rocq-core/default.nix
+++ b/pkgs/applications/science/logic/rocq-core/default.nix
@@ -23,6 +23,7 @@ let
 
   release = {
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
   };
   releaseRev = v: "V${v}";
diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index c03d1825e152..6d382ed87d3d 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -32,6 +32,9 @@ let
     description = "Security protocol verification in the symbolic model";
     maintainers = [ lib.maintainers.thoughtpolice ];
     hydraPlatforms = lib.platforms.linux; # maude is broken on darwin
+    # Has been broken for a while now:
+    # https://hydra.nixos.org/job/nixpkgs/trunk/tamarin-prover.x86_64-linux
+    broken = true;
   };
 
   # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries
diff --git a/pkgs/applications/science/math/caffe/cmake-minimum-required.patch b/pkgs/applications/science/math/caffe/cmake-minimum-required.patch
new file mode 100644
index 000000000000..218196a65a7b
--- /dev/null
+++ b/pkgs/applications/science/math/caffe/cmake-minimum-required.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08f56a33..c5291fd7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.7)
++cmake_minimum_required(VERSION 3.10)
+ if(POLICY CMP0046)
+   cmake_policy(SET CMP0046 NEW)
+ endif()
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index a022fcd8e1dd..46f792e67ec5 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -112,9 +112,11 @@ stdenv.mkDerivation rec {
   propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
 
   patches = [
+    ./cmake-minimum-required.patch
     ./darwin.patch
     ./glog-cmake.patch
     ./random-shuffle.patch
+    ./random-shuffle-includes.patch
     (fetchpatch {
       name = "support-opencv4";
       url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch";
diff --git a/pkgs/applications/science/math/caffe/random-shuffle-includes.patch b/pkgs/applications/science/math/caffe/random-shuffle-includes.patch
new file mode 100644
index 000000000000..bfc1f4e459e9
--- /dev/null
+++ b/pkgs/applications/science/math/caffe/random-shuffle-includes.patch
@@ -0,0 +1,14 @@
+diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
+index 01213691..f42e7bea 100644
+--- a/src/caffe/layers/hdf5_data_layer.cpp
++++ b/src/caffe/layers/hdf5_data_layer.cpp
+@@ -6,7 +6,9 @@ TODO:
+   :: don't forget to update hdf5_daa_layer.cu accordingly
+ - add ability to shuffle filenames if flag is set
+ */
++#include <algorithm>
+ #include <fstream>  // NOLINT(readability/streams)
++#include <random>
+ #include <string>
+ #include <vector>
+ 
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 891dd15194f4..bd38d90accc6 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -19,16 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
   };
 
-  nativeBuildInputs = [
-    binutils
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-    fixDarwinDylibNames
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    autoSignDarwinBinariesHook
-  ];
+  nativeBuildInputs =
+    lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      binutils
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      fixDarwinDylibNames
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
   env = {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
index b0509a8e97a9..6ad49d7655ba 100644
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
+++ b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
 
   buildCommand = ''
     mkdir -pv $out/repos
-    ${lib.concatMapStrings (
-      r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n"
-    ) (import ./src-libs.nix)}
+    ${lib.concatMapStrings (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") (
+      import ./src-libs.nix
+    )}
 
     ${mkscript "$out/bin/checkout-git.sh" ''
       if test "$#" -ne 4; then
diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 1fa111378329..39a7b666e042 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -77,5 +77,7 @@ stdenv.mkDerivation rec {
 
     maintainers = [ ];
     platforms = lib.platforms.all;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 4684bccc31e0..956cf1f81569 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   lib,
   cmake,
   qtbase,
@@ -13,18 +14,26 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vite";
-  version = "unstable-2022-05-17";
+  version = "1.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.inria.fr";
     owner = "solverstack";
     repo = "vite";
-    rev = "6d497cc519fac623e595bd174e392939c4de845c";
-    hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-z2M4BazLzO/NCcq/VKb+tgrZ6QUs+AX0BbzJW809Krg=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://gitlab.inria.fr/solverstack/vite/-/commit/0359f78c8b11ced3a79ac4d73f4ecb9087eba1e8.patch";
+      hash = "sha256-UMg21ZlwyRSVQ4CD1oKNUkT+RNxqOIQi2WNBLbYPkJg=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     qttools
@@ -51,7 +60,7 @@ stdenv.mkDerivation {
 
     homepage = "http://vite.gforge.inria.fr/";
     license = lib.licenses.cecill20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 31d4b31dc56c..031b996a2b87 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -20,7 +20,7 @@
   cpuAcceleration ? null,
 }:
 
-# CUDA is only implemented for single precission
+# CUDA is only implemented for single precision
 assert enableCuda -> singlePrec;
 
 let
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
deleted file mode 100644
index 2dc770421e9f..000000000000
--- a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ python3 }:
-
-{
-  version,
-  src,
-  meta,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "coolercontrol-liqctld";
-  inherit version src;
-  sourceRoot = "${src.name}/coolercontrol-liqctld";
-  format = "pyproject";
-
-  nativeBuildInputs = with python3.pkgs; [ setuptools ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    liquidctl
-    setproctitle
-    fastapi
-    uvicorn
-  ];
-
-  postInstall = ''
-    install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"
-    substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \
-      --replace-fail '/usr/bin' "$out/bin"
-  '';
-
-  meta = meta // {
-    description = "${meta.description} (Liquidctl Daemon)";
-    mainProgram = "coolercontrol-liqctld";
-  };
-}
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index 0f687c9d5278..d2af32efee38 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
@@ -11,7 +11,7 @@ buildNpmPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui";
 
-  npmDepsHash = "sha256-FFVCE3/E+eiTvTeU53cc1Mdbrl5J3+YgYUYltpnGXz0=";
+  npmDepsHash = "sha256-MhMHo6wjkaSCyevwzAKCvSsJTmAq9rYFG1ZVUAkRc0Y=";
 
   postBuild = ''
     cp -r dist $out
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index 394bd3f6a393..50987847a587 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -4,6 +4,9 @@
   libdrm,
   coolercontrol,
   runtimeShell,
+  addDriverRunpath,
+  python3Packages,
+  liquidctl,
 }:
 
 {
@@ -17,10 +20,17 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs=";
+  cargoHash = "sha256-4aSEEBtxwTyAx5CPa2fDBhx5U+Ql2X/tKPQHLIsm3I0=";
 
   buildInputs = [ libdrm ];
 
+  nativeBuildInputs = [
+    addDriverRunpath
+    python3Packages.wrapPython
+  ];
+
+  pythonPath = [ liquidctl ];
+
   postPatch = ''
     # copy the frontend static resources to a directory for embedding
     mkdir -p ui-build
@@ -37,10 +47,17 @@ rustPlatform.buildRustPackage {
       --replace-fail '/usr/bin' "$out/bin"
   '';
 
+  postFixup = ''
+    addDriverRunpath "$out/bin/coolercontrold"
+
+    buildPythonPath "$pythonPath"
+    wrapProgram "$out/bin/coolercontrold" \
+      --prefix PATH : $program_PATH \
+      --prefix PYTHONPATH : $program_PYTHONPATH
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = coolercontrol.coolercontrold;
-    # coolercontrold prints its version with "v" prefix
-    version = "v${version}";
   };
 
   meta = meta // {
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 009525ec8eb3..d11e7f40aa6c 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -5,20 +5,23 @@
 }:
 
 let
-  version = "2.1.0";
+  version = "3.0.1";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
     rev = version;
-    hash = "sha256-xIc0ZecQGyjMQWVaucKomu7SbaHy+ymg5dkOjHjtJ9c=";
+    hash = "sha256-PvEj3xYJVpHNfd5p7kyw+eW9S/g1FB/YiFgWEJDDbus=";
   };
 
   meta = {
     description = "Monitor and control your cooling devices";
     homepage = "https://gitlab.com/coolercontrol/coolercontrol";
     license = lib.licenses.gpl3Plus;
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with lib.maintainers; [
       codifryed
       OPNA2608
@@ -33,6 +36,4 @@ in
   coolercontrold = applySharedDetails (callPackage ./coolercontrold.nix { });
 
   coolercontrol-gui = applySharedDetails (callPackage ./coolercontrol-gui.nix { });
-
-  coolercontrol-liqctld = applySharedDetails (callPackage ./coolercontrol-liqctld.nix { });
 }
diff --git a/pkgs/applications/system/systemdgenie/default.nix b/pkgs/applications/system/systemdgenie/default.nix
deleted file mode 100644
index 0131be7ebc71..000000000000
--- a/pkgs/applications/system/systemdgenie/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  stdenv,
-  lib,
-  cmake,
-  extra-cmake-modules,
-  kxmlgui,
-  fetchFromGitLab,
-  kdelibs4support,
-  wrapQtAppsHook,
-}:
-stdenv.mkDerivation rec {
-  pname = "systemdgenie";
-  version = "0.99.0";
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    repo = "SystemdGenie";
-    owner = "system";
-    rev = "v${version}";
-    hash = "sha256-y+A2OuK1ZooPY5W0SsXEb1aaOAJ2b7QSwiumolmAaR4=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    kxmlgui
-    kdelibs4support
-  ];
-
-  meta = with lib; {
-    description = "Systemd management utility";
-    mainProgram = "systemdgenie";
-    homepage = "https://kde.org";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.pasqui23 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
index ec2d08862ecd..ff7c1b1a2d7d 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
@@ -32,5 +32,8 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/mkamensky/Text-Bidi";
     maintainers = with maintainers; [ doronbehar ];
     platforms = with platforms; unix;
+    # Quote from the README:
+    # same terms as the Perl 5 programming language system itself
+    license = perlPackages.perl.meta.license;
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index da50d1b751ba..98fb59bf9795 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "urxvt-tabbedex";
-  version = "19.21";
+  version = "22.32";
 
   src = fetchFromGitHub {
     owner = "mina86";
     repo = "urxvt-tabbedex";
     rev = "v${version}";
-    sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77";
+    sha256 = "sha256-4+4iPFoy1j5xjXRM5kBauhff44Y7/ik/+ZLZ1prc+Xo=";
   };
 
   nativeBuildInputs = [ perl ];
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mina86/urxvt-tabbedex";
     maintainers = [ ];
     platforms = with platforms; unix;
+    license = lib.licenses.gpl3Plus;
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
index eec7b86883eb..8bd75245da0e 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
@@ -16,7 +16,9 @@
 }:
 
 let
-  availablePlugins = rxvt-unicode-plugins;
+  availablePlugins = lib.filterAttrs (
+    _: v: (lib.isDerivation v && (v.meta.license.free or false))
+  ) rxvt-unicode-plugins;
 
   # Transform the string "self" to the plugin itself.
   # It's needed for plugins like bidi who depends on the perl
diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix
index cc7369fd0fbf..f6421fc64f78 100644
--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@@ -79,7 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://www.fossil-scm.org/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ maggesi ];
     platforms = platforms.all;
     mainProgram = "fossil";
   };
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix
index 0e3fd51885d6..5ca46db3dcf9 100644
--- a/pkgs/applications/version-management/git/default.nix
+++ b/pkgs/applications/version-management/git/default.nix
@@ -60,7 +60,7 @@ assert sendEmailSupport -> perlSupport;
 assert svnSupport -> perlSupport;
 
 let
-  version = "2.51.0";
+  version = "2.51.2";
   svn = subversionClient.override { perlBindings = perlSupport; };
   gitwebPerlLibs = with perlPackages; [
     CGI
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
         }.tar.xz"
       else
         "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    hash = "sha256-YKfCJRzC5YjVzYe65WcmBhfG3gwi3KnNv8TH0riZC2I=";
+    hash = "sha256-Iz1xQ6LVjmB1Xu6bdvVZ7HPqKzwpf1tQMWKs6VlmtOM=";
   };
 
   outputs = [ "out" ] ++ lib.optional withManual "doc";
@@ -489,6 +489,12 @@ stdenv.mkDerivation (finalAttrs: {
     disable_test t5319-multi-pack-index
     disable_test t6421-merge-partial-clone
     disable_test t7504-commit-msg-hook
+    disable_test t5515-fetch-merge-logic
+    disable_test t4104-apply-boundary
+    disable_test t7002-mv-sparse-checkout
+    disable_test t4122-apply-symlink-inside
+    disable_test t7513-interpret-trailers
+    disable_test t2200-add-update
 
     # Fails reproducibly on ZFS on Linux with formD normalization
     disable_test t0021-conversion
diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
deleted file mode 100644
index 5f43c165dcba..000000000000
--- a/pkgs/applications/version-management/monotone-viz/default.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  ocamlPackages,
-  gnome2,
-  pkg-config,
-  makeWrapper,
-  glib,
-  libtool,
-  libpng,
-  bison,
-  expat,
-  fontconfig,
-  gd,
-  pango,
-  libjpeg,
-  libwebp,
-  libX11,
-  libXaw,
-}:
-# We need an old version of Graphviz for format compatibility reasons.
-# This version is vulnerable, but monotone-viz will never feed it bad input.
-let
-  graphviz_2_0 = import ./graphviz-2.0.nix {
-    inherit
-      lib
-      stdenv
-      fetchurl
-      pkg-config
-      libX11
-      libpng
-      libjpeg
-      expat
-      libXaw
-      bison
-      libtool
-      fontconfig
-      pango
-      gd
-      libwebp
-      ;
-  };
-in
-let
-  inherit (gnome2) libgnomecanvas;
-in
-let
-  inherit (ocamlPackages) ocaml lablgtk camlp4;
-in
-stdenv.mkDerivation rec {
-  version = "1.0.2";
-  pname = "monotone-viz";
-
-  nativeBuildInputs = [
-    pkg-config
-    makeWrapper
-    ocaml
-    camlp4
-  ];
-  buildInputs = [
-    lablgtk
-    libgnomecanvas
-    glib
-    graphviz_2_0
-  ];
-  src = fetchurl {
-    url = "http://oandrieu.nerim.net/monotone-viz/${pname}-${version}-nolablgtk.tar.gz";
-    sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
-  };
-
-  prePatch = "ln -s . a; ln -s . b";
-  patchFlags = [ "-p0" ];
-  patches = [
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-dot.patch";
-      hash = "sha256-e348703+IzM4m/3cpe6Z9VebZgTK8+3lRLdaTfXHwSI=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-new-stdio.patch";
-      hash = "sha256-9xQzJ+oYz06fDFOe1YOOisEZnwiwShqr2Rt7IXiu6Zo=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/monotone-viz/raw/c9f4c1bebe01bb471df05d8a37ca4b6d630574ec/f/monotone-viz-1.0.2-typefix.patch";
-      hash = "sha256-52VGXDJKx4ZGvZRO8QCXdTGsWR0m1pqQnEOby7PMQdg=";
-    })
-  ];
-
-  preConfigure = ''
-    appendToVar configureFlags "--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
-  '';
-
-  postInstall = ''
-    wrapProgram "$out/bin/monotone-viz" --prefix PATH : "${graphviz_2_0}/bin/"
-  '';
-
-  meta = {
-    description = "Monotone ancestry visualiser";
-    mainProgram = "monotone-viz";
-    license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.raskin ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix b/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
deleted file mode 100644
index 88fa657da437..000000000000
--- a/pkgs/applications/version-management/monotone-viz/graphviz-2.0.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  libX11,
-  libpng,
-  libjpeg,
-  expat,
-  libXaw,
-  bison,
-  libtool,
-  fontconfig,
-  pango,
-  gd,
-  libwebp,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "graphviz";
-  version = "2.0";
-
-  src = fetchurl {
-    url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-${version}.tar.gz";
-    sha256 = "39b8e1f2ba4cc1f5bdc8e39c7be35e5f831253008e4ee2c176984f080416676c";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    libX11
-    libpng
-    libjpeg
-    expat
-    libXaw
-    bison
-    libtool
-    fontconfig
-    pango
-    gd
-    libwebp
-  ];
-
-  hardeningDisable = [
-    "format"
-    "fortify"
-  ];
-
-  configureFlags = [
-    "--with-pngincludedir=${libpng.dev}/include"
-    "--with-pnglibdir=${libpng.out}/lib"
-    "--with-jpegincludedir=${libjpeg.dev}/include"
-    "--with-jpeglibdir=${libjpeg.out}/lib"
-    "--with-expatincludedir=${expat.dev}/include"
-    "--with-expatlibdir=${expat.out}/lib"
-    "--with-ltdl-include=${libtool}/include"
-    "--with-ltdl-lib=${libtool.lib}/lib"
-  ]
-  ++ lib.optional (libX11 == null) "--without-x";
-
-  meta = {
-    description = "Program for visualising graphs";
-    homepage = "http://www.graphviz.org/";
-    branch = "2.0";
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/applications/version-management/monotone/botan2.nix b/pkgs/applications/version-management/monotone/botan2.nix
new file mode 100644
index 000000000000..616dffa0adbe
--- /dev/null
+++ b/pkgs/applications/version-management/monotone/botan2.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkgsStatic,
+  python3,
+  docutils,
+  bzip2,
+  zlib,
+  darwin,
+  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
+  enableForMonotone ? false, # Is it being imported for Monotone use?
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "botan";
+  version = "2.19.5";
+
+  __structuredAttrs = true;
+  enableParallelBuilding = true;
+  strictDeps = true;
+
+  outputs = [
+    "bin"
+    "out"
+    "dev"
+    "doc"
+    "man"
+  ];
+
+  src = fetchurl {
+    url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
+  };
+
+  nativeBuildInputs = [
+    python3
+    docutils
+  ];
+
+  buildInputs = [
+    bzip2
+    zlib
+  ];
+
+  buildTargets = [
+    "cli"
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
+  ++ lib.optionals static [ "static" ]
+  ++ lib.optionals (!static) [ "shared" ];
+
+  botanConfigureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--bindir=${placeholder "bin"}/bin"
+    "--docdir=${placeholder "doc"}/share/doc"
+    "--mandir=${placeholder "man"}/share/man"
+    "--no-install-python-module"
+    "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
+    "--with-bzip2"
+    "--with-zlib"
+    "--with-rst2man"
+    "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    "--cc=clang"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
+    "--os=mingw"
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+    python configure.py ''${botanConfigureFlags[@]}
+    runHook postConfigure
+  '';
+
+  preInstall = ''
+    if [ -d src/scripts ]; then
+      patchShebangs src/scripts
+    fi
+  '';
+
+  postInstall = ''
+    cd "$out"/lib/pkgconfig
+    ln -s botan-*.pc botan.pc || true
+  '';
+
+  doCheck = true;
+
+  meta = with lib; {
+    description = "Cryptographic algorithms library";
+    homepage = "https://botan.randombit.net";
+    mainProgram = "botan";
+    maintainers = with maintainers; [
+      raskin
+    ];
+    platforms = platforms.unix;
+    license = licenses.bsd2;
+    knownVulnerabilities = lib.optional (
+      !enableForMonotone
+    ) "Botan2 is EOL and its full interface surface contains unpatched vulnerabilities";
+  };
+})
diff --git a/pkgs/applications/version-management/monotone/default.nix b/pkgs/applications/version-management/monotone/default.nix
index b72173aef2fd..0d2b3537dfaa 100644
--- a/pkgs/applications/version-management/monotone/default.nix
+++ b/pkgs/applications/version-management/monotone/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   boost,
   zlib,
-  botan2,
   libidn,
   lua,
   pcre,
@@ -19,11 +18,14 @@
   autoreconfHook,
   texinfo,
   fetchpatch,
+  callPackage,
 }:
 
 let
   version = "1.1-unstable-2021-05-01";
   perlVersion = lib.getVersion perl;
+
+  botan = callPackage ./botan2.nix { enableForMonotone = true; };
 in
 
 assert perlVersion != "";
@@ -79,7 +81,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     boost
     zlib
-    botan2
+    botan
     libidn
     lua
     pcre
diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index 444adfbdab90..cb654c45de32 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
@@ -1,35 +1,43 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   cmake,
   qtbase,
+  qt5compat,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qgit";
-  version = "2.11";
+  version = "2.13";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-DmwxOy71mIklLQ7V/qMzi8qCMtKa9nWHlkjEr/9HJIU=";
+    rev = "qgit-${finalAttrs.version}";
+    hash = "sha256-hOx6FYccutycp+F3iesj48STFeBM/2r5cw2f5FkBIjY=";
   };
 
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
 
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    qtbase
+    qt5compat
+  ];
 
-  meta = with lib; {
-    license = licenses.gpl2Only;
+  meta = {
+    license = lib.licenses.gpl2Only;
     homepage = "https://github.com/tibirna/qgit";
     description = "Graphical front-end to Git";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       peterhoeg
       markuskowa
     ];
     inherit (qtbase.meta) platforms;
     mainProgram = "qgit";
   };
-}
+})
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 4a87cbd4f308..d99296d0c509 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -27,6 +27,7 @@
   perl ? null,
   sasl ? null,
   serf ? null,
+  nixosTests,
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -156,6 +157,8 @@ let
         nativeCheckInputs = [ python3 ];
         doCheck = false; # fails 10 out of ~2300 tests
 
+        passthru.tests = { inherit (nixosTests) svnserve; };
+
         meta = with lib; {
           description = "Version control system intended to be a compelling replacement for CVS in the open source community";
           license = licenses.asl20;
diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index 3d5e30808ae2..6e4b6d9f18eb 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -21,13 +21,13 @@
 
 mkDerivation rec {
   pname = "anilibria-winmaclinux";
-  version = "2.2.30";
+  version = "2.2.32";
 
   src = fetchFromGitHub {
     owner = "anilibria";
     repo = "anilibria-winmaclinux";
     rev = version;
-    hash = "sha256-iueodizzG0r50ZO2aowR5hR3AyLv8RsSJL1xnnCNMJc=";
+    hash = "sha256-Wxzv1iLJ+OWw+g6ndBX36AR2v9cSu2uZysegz97+XaM=";
   };
 
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index c8cf97449ff9..fc2bc01b8a5b 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -8,13 +8,13 @@
 let
   drv = stdenv.mkDerivation rec {
     pname = "controller-topology-project";
-    version = "1.0.7";
+    version = "1.0.8";
 
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
       rev = "v${version}";
-      sha256 = "sha256-LzwMKsoip+ajmmk4qUJynOmhhf3Auivn8Af8VRGWkTA=";
+      sha256 = "sha256-hYakxkGAF6kh2nTLwKdnLVqtQLvEgayvexTfqvfoLuw=";
     };
 
     postPatch = ''
diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
index 0c57f5e20ed1..7e2bb9a17a5f 100644
--- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix
+++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix
@@ -17,13 +17,13 @@ in
 buildKodiAddon rec {
   pname = "jellyfin";
   namespace = "plugin.video.jellyfin";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin-kodi";
     rev = "v${version}";
-    sha256 = "sha256-5CJenvNmyNwrlNfF4jPap99oj21T96TeExbod8+KKTA=";
+    sha256 = "sha256-Pi8q64VykEfyIm9VlNOkWFeEhEhl7D6KLnNLpVsY+iU=";
   };
 
   nativeBuildInputs = [ python ];
diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 22719bf31bb4..6d1275a055f3 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -3,7 +3,6 @@
   lib,
   fetchFromGitHub,
   fetchzip,
-  fetchpatch,
   autoconf,
   automake,
   libtool,
@@ -245,31 +244,16 @@ stdenv.mkDerivation (
   in
   {
     pname = "kodi";
-    version = "21.2";
+    version = "21.3";
     kodiReleaseName = "Omega";
 
     src = fetchFromGitHub {
       owner = "xbmc";
       repo = "xbmc";
       rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}";
-      hash = "sha256-RdTJcq6FPerQx05dU3r8iyaorT4L7162hg5RdywsA88=";
+      hash = "sha256-36wBAqGEDCRZ4t1ygTg03Pyk7Gg9quUTUGD3SBp6nCk=";
     };
 
-    patches = [
-      # Backport to fix build with Pipewire 1.4
-      # FIXME: remove in the next update
-      (fetchpatch {
-        url = "https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch";
-        hash = "sha256-JzzrMJvAufrxTxtWnzknUS9JLJEed+qdtVnIYYe9LCw=";
-      })
-      # Backport to fix build with cURL 8.16
-      # FIXME: remove in the next update
-      (fetchpatch {
-        url = "https://github.com/xbmc/xbmc/commit/957b4faa0b765bc91e64c6d33f07e853decae0d0.patch";
-        hash = "sha256-zsqcZSjsApcgs/oEdFFlcwldGCVZxCsDG02ogs+q2uw=";
-      })
-    ];
-
     # make  derivations declared in the let binding available here, so
     # they can be overridden
     inherit
diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b11bccf732b1..0ea229fa5f45 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -9,6 +9,7 @@
   config,
   docutils,
   fetchFromGitHub,
+  fetchpatch,
   ffmpeg,
   freefont_ttf,
   freetype,
@@ -112,6 +113,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-x8cDczKIX4+KrvRxZ+72TGlEQHd4Kx7naq0CSoOZGHA=";
   };
 
+  patches = [
+    # ffmpeg-8 compat:
+    #   https://github.com/mpv-player/mpv/pull/16145
+    (fetchpatch {
+      name = "ffmpeg-8.patch";
+      url = "https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9.patch";
+      hash = "sha256-ANNoTtIJBARHbm5IgrE0eEZyzmNhOnbVgve7iqCBzQg=";
+    })
+  ];
+
   postPatch = lib.concatStringsSep "\n" [
     # Don't reference compile time dependencies or create a build outputs cycle
     # between out and dev
diff --git a/pkgs/applications/video/mpv/scripts/bdanmaku.nix b/pkgs/applications/video/mpv/scripts/bdanmaku.nix
new file mode 100644
index 000000000000..05d8924e5e74
--- /dev/null
+++ b/pkgs/applications/video/mpv/scripts/bdanmaku.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildLua,
+  fetchFromGitHub,
+  nix-update-script,
+  biliass,
+}:
+
+buildLua {
+  pname = "bdanmaku";
+  version = "0-unstable-2025-01-15";
+
+  scriptPath = "bdanmaku.lua";
+  src = fetchFromGitHub {
+    owner = "UlyssesZh";
+    repo = "bdanmaku";
+    rev = "c9f2dca413a7148a662f006b8c524ccbd7a1945b";
+    hash = "sha256-XbkKXZoC+Rqn0gSyyw8sn2VJO73MlatOS0lm2tcwcfY=";
+  };
+
+  passthru.extraWrapperArgs = [
+    "--prefix"
+    "PATH"
+    ":"
+    (lib.makeBinPath [ biliass ])
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Mpv plugin to correctly display Bilibili danmaku, powered by biliass";
+    homepage = "https://github.com/UlyssesZh/bdanmaku";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+  };
+}
diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix
index 7c85120bcf6b..adb0d76f4159 100644
--- a/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -10,13 +10,13 @@
 
 buildLua rec {
   pname = "mpvacious";
-  version = "0.40";
+  version = "0.41";
 
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "mpvacious";
     rev = "v${version}";
-    sha256 = "sha256-PxLbv9aGVQV4Gea2H/GcWv/yuaRSqBRqbzRXu612kLE=";
+    sha256 = "sha256-bOW9hKDZ+S+/MJmZHN6N5rcZ9h6/s0bSPagYV7Zc2Yo=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix
index fabfefd3e03e..7501c9e5ee1b 100644
--- a/pkgs/applications/video/mpv/scripts/occivink.nix
+++ b/pkgs/applications/video/mpv/scripts/occivink.nix
@@ -19,12 +19,12 @@ let
     let
       self = rec {
         pname = camelToKebab name;
-        version = "0-unstable-2025-03-09";
+        version = "0-unstable-2025-11-01";
         src = fetchFromGitHub {
           owner = "occivink";
           repo = "mpv-scripts";
-          rev = "65aa1da29570e9c21b49292725ec5dd719ab6bb4";
-          hash = "sha256-pca24cZY2ZNxkY1XP2T2WKo1UbD8gsGn+EskGH+CggE=";
+          rev = "01f3e99558915bb715b614d7f4b052230360eb21";
+          hash = "sha256-v3TGsCzSg+a1vrOgI5NbTVf8Bh/iMRRgwMy194sNq1Y=";
         };
         passthru.updateScript = unstableGitUpdater { };
 
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
index f789a4553da5..a3ed87ee74a2 100644
--- a/pkgs/applications/video/mpv/scripts/thumbnail.nix
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -32,6 +32,6 @@ buildLua rec {
     changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 850d6b5a520d..64938df8bbbd 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -6,6 +6,7 @@
   ninja,
   nv-codec-headers-12,
   fetchFromGitHub,
+  fetchpatch2,
   addDriverRunpath,
   autoAddDriverRunpath,
   cudaSupport ? config.cudaSupport,
@@ -97,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./fix-nix-plugin-path.patch
+    # Fix build with Qt 6.10 https://github.com/obsproject/obs-studio/pull/12328
+    (fetchpatch2 {
+      url = "https://github.com/obsproject/obs-studio/commit/26dfacbd4f5217258a2f1c5472a544c65a182d10.patch?full_index=1";
+      hash = "sha256-gEWDzZ+GPCR+rmytXcbiBcvzLg8VwZCveMKkvho3COI=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix
index b502735cf32f..4b364e96e80a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-vnc";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-vnc";
     tag = "${finalAttrs.version}";
-    hash = "sha256-eTvKACeVFFw6DOFAiWaG/m14jYyzZc61e79S8oVWrCs=";
+    hash = "sha256-bveTfyhHH7RAM24Lp0mWlt52ao9Rn6vCuKjfQH+B8Rw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index 57c7bdcc24fe..086f3be3a4a6 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.mit;
     mainProgram = "streamlink-twitch-gui";
-    maintainers = with maintainers; [ rileyinman ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 00521e0feb27..41eb546cff0d 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -32,8 +32,6 @@
   socat,
   libslirp,
   libcbor,
-  apple-sdk_13,
-  darwinMinVersionHook,
   guestAgentSupport ?
     (with stdenv.hostPlatform; isLinux || isNetBSD || isOpenBSD || isSunOS || isWindows) && !minimal,
   numaSupport ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32 && !minimal,
@@ -128,14 +126,6 @@ assert lib.assertMsg (
 
 let
   hexagonSupport = hostCpuTargets == null || lib.elem "hexagon" hostCpuTargets;
-
-  # needed in buildInputs and depsBuildBuild
-  # check log for warnings eg: `warning: 'hv_vm_config_get_max_ipa_size' is only available on macOS 13.0`
-  # to indicate if min version needs to get bumped.
-  darwinSDK = [
-    apple-sdk_13
-    (darwinMinVersionHook "13")
-  ];
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -146,17 +136,16 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString nixosTestRunner "-for-vm-tests"
     + lib.optionalString toolsOnly "-utils"
     + lib.optionalString userOnly "-user";
-  version = "10.1.0";
+  version = "10.1.2";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4FFzSbUMpz6+wvqFsGBQ1cRjymXHOIM72PwfFfGAvlE=";
+    hash = "sha256-nXXzMcGly5tuuP2fZPVj7C6rNGyCLLl/izXNgtPxFHk=";
   };
 
   depsBuildBuild = [
     buildPackages.stdenv.cc
   ]
-  ++ lib.optionals stdenv.buildPlatform.isDarwin darwinSDK
   ++ lib.optionals hexagonSupport [ pkg-config ];
 
   nativeBuildInputs = [
@@ -205,7 +194,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (!userOnly) [ curl ]
   ++ lib.optionals ncursesSupport [ ncurses ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin darwinSDK
   ++ lib.optionals seccompSupport [ libseccomp ]
   ++ lib.optionals numaSupport [ numactl ]
   ++ lib.optionals alsaSupport [ alsa-lib ]
diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix
index a554dbc68ea4..f46042addf88 100644
--- a/pkgs/applications/virtualization/singularity/packages.nix
+++ b/pkgs/applications/virtualization/singularity/packages.nix
@@ -9,19 +9,19 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "apptainer";
-        version = "1.4.3";
+        version = "1.4.4";
         projectName = "apptainer";
 
         src = fetchFromGitHub {
           owner = "apptainer";
           repo = "apptainer";
           tag = "v${version}";
-          hash = "sha256-VUtTv6kH08CCOLlRq4lPyOOlduf/oSiGcQ3cHl7ks8I=";
+          hash = "sha256-d3XcN+Jc9KHzVCHOatgpId/DeY/HhVkI9eF+48rzxO4=";
         };
 
         # Override vendorHash with overrideAttrs.
         # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
-        vendorHash = "sha256-Q56kFnWw5TqeNGyv2n9QempfIdfPXX1qzdf/G68Pfp8=";
+        vendorHash = "sha256-l8c85M9IdLNhZ40FkC+zH+0wHKcYHcXFbhMklCLULzs=";
 
         extraDescription = " (previously known as Singularity)";
         extraMeta.homepage = "https://apptainer.org";
@@ -46,19 +46,19 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "singularity-ce";
-        version = "4.3.3";
+        version = "4.3.4";
         projectName = "singularity";
 
         src = fetchFromGitHub {
           owner = "sylabs";
           repo = "singularity";
           tag = "v${version}";
-          hash = "sha256-gQuakfQgB5gLVYLmmThy06CyGBhlBOCJI9jaEm7ucf0=";
+          hash = "sha256-+KW9XaYXNzOpUier8FJ4lbKx7uJ8jNKHkt2QX2Kiehs=";
         };
 
         # Override vendorHash with overrideAttrs.
         # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
-        vendorHash = "sha256-z8bLbudm1b5xFCAUpL/m90vxwLJlBqpQCjAEjSYOQH8=";
+        vendorHash = "sha256-JCRUhY00Zj6rlmyDW+RKoGNKhmxesgHn9XdO8h2DAj4=";
 
         extraConfigureFlags = [
           # Do not build squashfuse from the Git submodule sources, use Nixpkgs provided version
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index c14fb2a67ed0..3694ae88d1e5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -72,13 +72,13 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.2.2";
+  virtualboxVersion = "7.2.4";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "sha256-sOY7+4VTJ67PESLNozOQwzc05f/tcvEj9e33hqjOE5M=";
+  virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
 
-  kvmPatchVboxVersion = "7.2.0";
-  kvmPatchVersion = "20250903";
-  kvmPatchHash = "sha256-JTE9Kr+nJ6HLeDrzL2EVyDQhxzn3UsoQVIQ6zNCwioY=";
+  kvmPatchVboxVersion = "7.2.4";
+  kvmPatchVersion = "20251103";
+  kvmPatchHash = "sha256-VhSuRYiZLg8hIGatf27u/nBBBtB1zz4ePxtiRYy84Hw=";
 
   # The KVM build is not compatible to VirtualBox's kernel modules. So don't export
   # modsrc at all.
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 42701f6efead..cb3a6cea45db 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -4,7 +4,7 @@
   virtualbox,
 }:
 let
-  virtualboxExtPackVersion = "7.2.2";
+  virtualboxExtPackVersion = "7.2.4";
 in
 fetchurl rec {
   name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
     let
-      value = "a7f5904e35b3c34c000f74e0364f1d1c0efdb126a4d3c4a264244959711c7f42";
+      value = "b80ee54252442ec025d6a7b2b9c3f32526ab5c2d91a0ffa2385be3ed83bcff0b";
     in
     assert (builtins.stringLength value) == 64;
     value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index 654e9a78a867..61862a140ae3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl {
   url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
-  sha256 = "sha256-QkV0h/tfEXJl/kG/iypSFEnCz/dclQKdj2Z/fataRAk=";
+  sha256 = "66fa60b041fcda5d8b2ed22ba91bfafafaa3a5ff05c7d8ba01fbbe639669e153";
   meta = {
     description = "Guest additions ISO for VirtualBox";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 642a4f59c770..3f9c665fd945 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -4,6 +4,7 @@
   callPackage,
   lib,
   dbus,
+  kmod,
   xorg,
   zlib,
   patchelf,
@@ -12,9 +13,9 @@
   libX11,
 }:
 let
-  virtualboxVersion = "7.2.2";
+  virtualboxVersion = "7.2.4";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "sha256-sOY7+4VTJ67PESLNozOQwzc05f/tcvEj9e33hqjOE5M=";
+  virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
 
   platform =
     if stdenv.hostPlatform.isAarch64 then
@@ -81,6 +82,7 @@ stdenv.mkDerivation {
     patchelf
     makeWrapper
     virtualBoxNixGuestAdditionsBuilder
+    kmod
   ]
   ++ kernel.moduleBuildDependencies;
 
@@ -140,6 +142,11 @@ stdenv.mkDerivation {
     # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd
     # either. (#18457)
 
+    mkdir -p $out/etc/depmod.d
+    for mod in $out/lib/modules/*/misc/*; do
+      echo "override $(modinfo -F name "$mod") * misc" >> $out/etc/depmod.d/vbox.conf
+    done
+
     runHook postInstall
   '';
 
diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 3a83551b6e51..c8b3fcbfa762 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postFixup = ''
     wrapProgram $out/bin/Hypr --prefix PATH : ${lib.makeBinPath [ xmodmap ]}
   '';
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
index 1219059e4aad..64d49a770e5e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
@@ -37,7 +37,6 @@ let
 
   plugins = lib.mergeAttrsList [
     { hy3 = import ./hy3.nix; }
-    { hycov = import ./hycov.nix; }
     { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; }
     { hyprfocus = import ./hyprfocus.nix; }
     { hyprgrass = import ./hyprgrass.nix; }
@@ -45,6 +44,7 @@ let
     { hyprsplit = import ./hyprsplit.nix; }
     (import ./hyprland-plugins.nix)
     (lib.optionalAttrs config.allowAliases {
+      hycov = throw "hyprlandPlugins.hycov has been removed because it has been marked as broken since September 2024."; # Added 2025-10-12
       hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; # Added 2025-05-09
     })
   ];
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
deleted file mode 100644
index 51da0e82573e..000000000000
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  mkHyprlandPlugin,
-  cmake,
-  fetchFromGitHub,
-  nix-update-script,
-}:
-
-mkHyprlandPlugin (finalAttrs: {
-  pluginName = "hycov";
-  version = "0.41.2.1";
-
-  src = fetchFromGitHub {
-    owner = "DreamMaoMao";
-    repo = "hycov";
-    tag = finalAttrs.version;
-    hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Clients overview for Hyprland plugin";
-    homepage = "https://github.com/DreamMaoMao/hycov";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ donovanglover ];
-    platforms = lib.platforms.linux;
-    broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link
-  };
-})
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
index 92299aaa88d6..2368ed33d678 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
@@ -7,13 +7,13 @@
 
 mkHyprlandPlugin {
   pluginName = "hypr-dynamic-cursors";
-  version = "0-unstable-2025-10-12";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "VirtCode";
     repo = "hypr-dynamic-cursors";
-    rev = "d0e9f7320711fc83967cf6b172e8ed40c565631b";
-    hash = "sha256-Zr9eBntl3vfoIjmgSF9MgDAW+YGbYa1auttah7qqqTc=";
+    rev = "7336d7a7cf81422d0d8a574e9e9ba6fe8eab8dfc";
+    hash = "sha256-ZaiEZnsm7LlpDL/C/D4vO5QHgv9GdFrO9Fd2qlyvVRc=";
   };
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
index b1bf74e06722..7d0fbc2f1e16 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix
@@ -12,13 +12,13 @@
 
 mkHyprlandPlugin {
   pluginName = "hyprgrass";
-  version = "0.8.2-unstable-2025-05-08";
+  version = "0.8.2-unstable-2025-10-08";
 
   src = fetchFromGitHub {
     owner = "horriblename";
     repo = "hyprgrass";
-    rev = "7cf3779b5cdc6fa62fdc733b30c31a5b8e48609c";
-    hash = "sha256-8Sl2V23EYcZMniBLmKenxH7bMLTGC6Q84ntyFvOUkWU=";
+    rev = "fdfa60d464a18ae20b7a7bc63c0d2336f37c164b";
+    hash = "sha256-2Y2D2wuNqSldprawq8BSca90gSYSR5ZKL5ZW2YAV2F8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
index 1497950a082e..3bc837a2319d 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
@@ -13,13 +13,13 @@ let
             mkHyprlandPlugin,
           }:
           let
-            version = "0.51.0";
+            version = "0.52.0";
 
             hyprland-plugins-src = fetchFromGitHub {
               owner = "hyprwm";
               repo = "hyprland-plugins";
               tag = "v${version}";
-              hash = "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=";
+              hash = "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=";
             };
           in
           mkHyprlandPlugin {
diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
index f8391e555cb0..dffe4664239a 100644
--- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix
@@ -28,13 +28,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-hyprland";
-  version = "1.3.10";
+  version = "1.3.11";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "xdg-desktop-portal-hyprland";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-js2sLRtsOUA/aT10OCDaTjO80yplqwOIaLUqEe0nMx0=";
+    hash = "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index b8645053b6e9..72e1d8dbd124 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -45,7 +45,7 @@ let
     }:
     let
       libraryFile = mkLibraryFile pkgs;
-      pname = "agdaWithPackages";
+      pname = "${Agda.meta.mainProgram}WithPackages";
       version = Agda.version;
     in
     runCommand "${pname}-${version}"
@@ -68,10 +68,12 @@ let
       }
       ''
         mkdir -p $out/bin
-        makeWrapper ${lib.getExe Agda} $out/bin/agda \
+        makeWrapper ${lib.getExe Agda} $out/bin/${Agda.meta.mainProgram} \
           ${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \
           --add-flags "--library-file=${libraryFile}"
-        ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
+        if [ -e ${lib.getExe' Agda "agda-mode"} ]; then
+          ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
+        fi
       '';
 
   withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };
@@ -116,7 +118,7 @@ let
         else
           ''
             runHook preBuild
-            agda --build-library
+            ${lib.getExe agdaWithPkgs} --build-library
             runHook postBuild
           '';
 
diff --git a/pkgs/build-support/bintools-wrapper/add-hardening.sh b/pkgs/build-support/bintools-wrapper/add-hardening.sh
index db9553c3fc76..6ce4faf1720b 100644
--- a/pkgs/build-support/bintools-wrapper/add-hardening.sh
+++ b/pkgs/build-support/bintools-wrapper/add-hardening.sh
@@ -15,7 +15,7 @@ for flag in @hardening_unsupported_flags@; do
 done
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
-  declare -a allHardeningFlags=(pie relro bindnow)
+  declare -a allHardeningFlags=(relro bindnow)
   declare -A hardeningDisableMap=()
 
   # Determine which flags were effectively disabled so we can report below.
@@ -36,16 +36,6 @@ fi
 
 for flag in "${!hardeningEnableMap[@]}"; do
   case $flag in
-    pie)
-      if [[ ! (" ${params[*]} " =~ " -shared " \
-            || " ${params[*]} " =~ " -static " \
-            || " ${params[*]} " =~ " -r " \
-            || " ${params[*]} " =~ " -Ur " \
-            || " ${params[*]} " =~ " -i ") ]]; then
-        if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
-        hardeningLDFlags+=('-pie')
-      fi
-      ;;
     relro)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling relro >&2; fi
       hardeningLDFlags+=('-z' 'relro')
diff --git a/pkgs/build-support/bintools-wrapper/default.nix b/pkgs/build-support/bintools-wrapper/default.nix
index 4ceddfa59db5..8f5613e9e7bb 100644
--- a/pkgs/build-support/bintools-wrapper/default.nix
+++ b/pkgs/build-support/bintools-wrapper/default.nix
@@ -49,30 +49,15 @@
     "format"
     "fortify"
     "fortify3"
+    "libcxxhardeningextensive"
+    "libcxxhardeningfast"
     "pic"
     "relro"
     "stackclashprotection"
     "stackprotector"
     "strictoverflow"
     "zerocallusedregs"
-  ]
-  ++ lib.optional (
-    with stdenvNoCC;
-    lib.any (x: x) [
-      # OpenBSD static linking requires PIE
-      (with targetPlatform; isOpenBSD && isStatic)
-      (lib.all (x: x) [
-        # Musl-based platforms will keep "pie", other platforms will not.
-        # If you change this, make sure to update section `{#sec-hardening-in-nixpkgs}`
-        # in the nixpkgs manual to inform users about the defaults.
-        (targetPlatform.libc == "musl")
-        # Except when:
-        #    - static aarch64, where compilation works, but produces segfaulting dynamically linked binaries.
-        #    - static armv7l, where compilation fails.
-        (!(targetPlatform.isAarch && targetPlatform.isStatic))
-      ])
-    ]
-  ) "pie",
+  ],
 }:
 
 assert propagateDoc -> bintools ? man;
diff --git a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch b/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch
deleted file mode 100644
index c6e28f11be2f..000000000000
--- a/pkgs/build-support/build-mozilla-mach/142-relax-apple-sdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
-index 37c00230c853..dd89bea24392 100644
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
-     )
- 
-     def mac_sdk_min_version():
--        return "15.5"
-+        return "15.2"
- 
-     @depends(
-         "--with-macos-sdk",
diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index b578050bf8c9..c064d5d4266f 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -58,9 +58,7 @@ in
   pkgsCross, # wasm32 rlbox
   python3,
   runCommand,
-  rustc,
   rust-cbindgen,
-  rustPlatform,
   unzip,
   which,
   wrapGAppsHook3,
@@ -89,7 +87,6 @@ in
   nasm,
   nspr,
   nss_esr,
-  nss_3_115,
   nss_latest,
   onnxruntime,
   pango,
@@ -101,6 +98,7 @@ in
   # Darwin
   apple-sdk_14,
   apple-sdk_15,
+  apple-sdk_26,
   cups,
   rsync, # used when preparing .app directory
 
@@ -202,9 +200,25 @@ assert elfhackSupport -> isElfhackPlatform stdenv;
 let
   inherit (lib) enableFeature;
 
+  rustPackages =
+    pkgs:
+    (pkgs.rust.override (
+      # aarch64-darwin firefox crashes on loading favicons due to a llvm 21 bug:
+      # https://github.com/NixOS/nixpkgs/issues/453372
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1995582#c16
+      lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) {
+        llvmPackages = pkgs.llvmPackages_20;
+      }
+    )).packages.stable;
+
+  toRustC = pkgs: (rustPackages pkgs).rustc;
+
+  rustc = toRustC pkgs;
+  inherit (rustPackages pkgs) rustPlatform;
+
   # Target the LLVM version that rustc is built with for LTO.
   llvmPackages0 = rustc.llvmPackages;
-  llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages;
+  llvmPackagesBuildBuild0 = (toRustC pkgsBuildBuild).llvmPackages;
 
   # Force the use of lld and other llvm tools for LTO
   llvmPackages = llvmPackages0.override {
@@ -219,7 +233,7 @@ let
   # LTO requires LLVM bintools including ld.lld and llvm-ar.
   buildStdenv = overrideCC llvmPackages.stdenv (
     llvmPackages.stdenv.cc.override {
-      bintools = if ltoSupport then buildPackages.rustc.llvmPackages.bintools else stdenv.cc.bintools;
+      bintools = if ltoSupport then (toRustC buildPackages).llvmPackages.bintools else stdenv.cc.bintools;
     }
   );
 
@@ -314,15 +328,6 @@ buildStdenv.mkDerivation {
       # https://hg-edge.mozilla.org/mozilla-central/rev/aa8a29bd1fb9
       ./139-wayland-drag-animation.patch
     ]
-    ++
-      lib.optionals
-        (
-          lib.versionAtLeast version "141.0.2"
-          || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0")
-        )
-        [
-          ./142-relax-apple-sdk.patch
-        ]
     ++ extraPatches;
 
   postPatch = ''
@@ -361,9 +366,11 @@ buildStdenv.mkDerivation {
     rustc
     unzip
     which
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    pkg-config
     wrapGAppsHook3
   ]
-  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]
   ++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]
   ++ lib.optionals crashreporterSupport [
@@ -451,6 +458,7 @@ buildStdenv.mkDerivation {
       (
         stdenv.hostPlatform.isDarwin
         && lib.versionAtLeast version "143"
+        && lib.versionOlder version "145"
         && lib.versionOlder apple-sdk_15.version "15.4"
       )
       ''
@@ -541,7 +549,14 @@ buildStdenv.mkDerivation {
     zip
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)
+    (
+      if lib.versionAtLeast version "145" then
+        apple-sdk_26
+      else if lib.versionAtLeast version "138" then
+        apple-sdk_15
+      else
+        apple-sdk_14
+    )
     cups
   ]
   ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (
@@ -572,14 +587,7 @@ buildStdenv.mkDerivation {
       xorg.pixman
       xorg.xorgproto
       zlib
-      (
-        if (lib.versionAtLeast version "144") then
-          nss_latest
-        else if (lib.versionAtLeast version "143") then
-          nss_3_115
-        else
-          nss_esr
-      )
+      (if (lib.versionAtLeast version "144") then nss_latest else nss_esr)
     ]
     ++ lib.optional alsaSupport alsa-lib
     ++ lib.optional jackSupport libjack2
diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index f2fdf36f79e5..f66acf3d5e75 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -15,7 +15,7 @@ $SIG{__DIE__}  = sub { die "pkgs.buildEnv error: ", @_ };
 my $out = $ENV{"out"};
 my $extraPrefix = $ENV{"extraPrefix"};
 
-my @pathsToLink = split ' ', $ENV{"pathsToLink"};
+my @pathsToLink = @{decode_json $ENV{"pathsToLinkJSON"}};
 
 sub isInPathsToLink($path) {
     $path = "/" if $path eq "";
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index dbeb2a629f20..5996239a16b4 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -105,6 +105,7 @@ lib.makeOverridable (
           nativeBuildInputs
           buildInputs
           ;
+        pathsToLinkJSON = builtins.toJSON pathsToLink;
         pkgs = builtins.toJSON chosenOutputs;
         extraPathsFrom = lib.optional includeClosures (writeClosure pathsForClosure);
         preferLocalBuild = true;
diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
index 2b7cd00783a5..865e0d054820 100644
--- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
+++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh
@@ -35,3 +35,7 @@ elif [[ $0 != *cpp ]]; then
         extraBefore+=(-mabi=@explicitAbiValue@)
     fi
 fi
+
+if [[ "@darwinMinVersion@" ]]; then
+    extraBefore+=(-Werror=unguarded-availability)
+fi
diff --git a/pkgs/build-support/cc-wrapper/add-hardening.sh b/pkgs/build-support/cc-wrapper/add-hardening.sh
index 4fd6d4b32463..98369ff82076 100644
--- a/pkgs/build-support/cc-wrapper/add-hardening.sh
+++ b/pkgs/build-support/cc-wrapper/add-hardening.sh
@@ -25,6 +25,13 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then
   hardeningEnableMap["strictflexarrays1"]=1
 fi
 
+# libcxxhardeningextensive implies libcxxhardeningfast enablement - make explicit before
+# we filter unsupported flags because unsupporting libcxxhardeningextensive
+# doesn't mean we should unsupport libcxxhardeningfast too
+if [[ -n "${hardeningEnableMap[libcxxhardeningextensive]-}" ]]; then
+  hardeningEnableMap["libcxxhardeningfast"]=1
+fi
+
 
 # Remove unsupported flags.
 for flag in @hardening_unsupported_flags@; do
@@ -37,6 +44,10 @@ for flag in @hardening_unsupported_flags@; do
   if [[ "$flag" = 'strictflexarrays1' ]] ; then
     unset -v "hardeningEnableMap['strictflexarrays3']"
   fi
+  # libcxxhardeningfast being unsupported implies libcxxhardeningextensive is unsupported
+  if [[ "$flag" = 'libcxxhardeningfast' ]] ; then
+    unset -v "hardeningEnableMap['libcxxhardeningextensive']"
+  fi
 done
 
 
@@ -50,9 +61,14 @@ if [[ -n "${hardeningEnableMap[strictflexarrays3]-}" ]]; then
   unset -v "hardeningEnableMap['strictflexarrays1']"
 fi
 
+# now make libcxxhardeningfast and libcxxhardeningextensive mutually exclusive
+if [[ -n "${hardeningEnableMap[libcxxhardeningextensive]-}" ]]; then
+  unset -v "hardeningEnableMap['libcxxhardeningfast']"
+fi
+
 
 if (( "${NIX_DEBUG:-0}" >= 1 )); then
-  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pie pic strictoverflow glibcxxassertions format trivialautovarinit zerocallusedregs)
+  declare -a allHardeningFlags=(fortify fortify3 shadowstack stackprotector stackclashprotection nostrictaliasing pacret strictflexarrays1 strictflexarrays3 pic strictoverflow libcxxhardeningfast libcxxhardeningextensive glibcxxassertions format trivialautovarinit zerocallusedregs)
   declare -A hardeningDisableMap=()
 
   # Determine which flags were effectively disabled so we can report below.
@@ -115,27 +131,26 @@ for flag in "${!hardeningEnableMap[@]}"; do
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling glibcxxassertions >&2; fi
       hardeningCFlagsBefore+=('-D_GLIBCXX_ASSERTIONS')
       ;;
+    libcxxhardeningfast)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling libcxxhardeningfast >&2; fi
+      hardeningCFlagsBefore+=('-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST')
+      ;;
+    libcxxhardeningextensive)
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling libcxxhardeningextensive >&2; fi
+      hardeningCFlagsBefore+=('-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE')
+      ;;
     stackprotector)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackprotector >&2; fi
       hardeningCFlagsBefore+=('-fstack-protector-strong' '--param' 'ssp-buffer-size=4')
       ;;
     stackclashprotection)
-      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stack-clash-protection >&2; fi
+      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling stackclashprotection >&2; fi
       hardeningCFlagsBefore+=('-fstack-clash-protection')
       ;;
     nostrictaliasing)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling nostrictaliasing >&2; fi
       hardeningCFlagsBefore+=('-fno-strict-aliasing')
       ;;
-    pie)
-      # NB: we do not use `+=` here, because PIE flags must occur before any PIC flags
-      if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling CFlags -fPIE >&2; fi
-      hardeningCFlagsBefore=('-fPIE' "${hardeningCFlagsBefore[@]}")
-      if [[ ! (" ${params[*]} " =~ " -shared " || " ${params[*]} " =~ " -static ") ]]; then
-        if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling LDFlags -pie >&2; fi
-        hardeningCFlagsBefore=('-pie' "${hardeningCFlagsBefore[@]}")
-      fi
-      ;;
     pic)
       if (( "${NIX_DEBUG:-0}" >= 1 )); then echo HARDENING: enabling pic >&2; fi
       hardeningCFlagsBefore+=('-fPIC')
diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index eb5b99643dba..246c1b1f65f6 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -140,6 +140,15 @@ if [ "$NIX_ENFORCE_NO_NATIVE_@suffixSalt@" = 1 ]; then
     params=(${kept+"${kept[@]}"})
 fi
 
+# Some build systems such as Bazel and SwiftPM use `clang` instead of `clang++`,
+# which will find the libc++ headers in the sysroot for C++ files.
+if [[ "$isCxx" = 0 && "@isClang@" ]]; then
+# This duplicates the behavior of a native toolchain, which can find the
+# libc++ headers but requires `-lc++` to be specified explicitly when linking.
+    isCxx=1
+    cxxLibrary=0
+fi
+
 if [[ "$isCxx" = 1 ]]; then
     if [[ "$cxxInclude" = 1 ]]; then
         #
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 3c6126786fcc..f5f6d7a98be5 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -753,14 +753,14 @@ stdenvNoCC.mkDerivation {
     # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903)
     + optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) ''
       for dir in ${gccForLibs}/include/c++/*; do
-        include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags
+        include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags
       done
       for dir in ${gccForLibs}/include/c++/*/${targetPlatform.config}; do
-        include -isystem "$dir" >> $out/nix-support/libcxx-cxxflags
+        include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags
       done
     ''
     + optionalString (libcxx.isLLVM or false) ''
-      include -isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
+      include -cxx-isystem "${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags
       echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags
     ''
     # GCC NG friendly libc++
diff --git a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
index 56f20a4f63a3..80fef886e122 100644
--- a/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
+++ b/pkgs/build-support/dart/build-dart-application/hooks/dart-config-hook.sh
@@ -9,6 +9,9 @@ dartConfigHook() {
     echo "Installing dependencies"
     mkdir -p .dart_tool
     cp "$packageConfig" .dart_tool/package_config.json
+    chmod u+w .dart_tool/package_config.json
+    @python3@ @workspacePackageConfigScript@
+    chmod u-w .dart_tool/package_config.json
     @python3@ @packageGraphScript@ > .dart_tool/package_graph.json
 
     packagePath() {
diff --git a/pkgs/build-support/dart/build-dart-application/hooks/default.nix b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
index 64f1019f882f..a22db27f4d97 100644
--- a/pkgs/build-support/dart/build-dart-application/hooks/default.nix
+++ b/pkgs/build-support/dart/build-dart-application/hooks/default.nix
@@ -14,6 +14,7 @@
     substitutions.jq = "${jq}/bin/jq";
     substitutions.python3 = lib.getExe (python3.withPackages (ps: with ps; [ pyyaml ]));
     substitutions.packageGraphScript = ../../pub2nix/package-graph.py;
+    substitutions.workspacePackageConfigScript = ../workspace-package-config.py;
   } ./dart-config-hook.sh;
   dartBuildHook = makeSetupHook {
     name = "dart-build-hook";
diff --git a/pkgs/build-support/dart/build-dart-application/workspace-package-config.py b/pkgs/build-support/dart/build-dart-application/workspace-package-config.py
new file mode 100644
index 000000000000..7d7d00988f9a
--- /dev/null
+++ b/pkgs/build-support/dart/build-dart-application/workspace-package-config.py
@@ -0,0 +1,42 @@
+import json
+import re
+from pathlib import Path
+
+import yaml
+
+
+def main() -> None:
+    with Path("pubspec.yaml").open("r", encoding="utf-8") as f:
+        pubspec = yaml.load(f, Loader=yaml.CSafeLoader)
+    if not pubspec.get("workspace"):
+        return
+    with Path(".dart_tool/package_config.json").open("r", encoding="utf-8") as f:
+        package_config = json.load(f)
+    for package_path in pubspec.get("workspace", []):
+        with (Path(package_path) / "pubspec.yaml").open("r", encoding="utf-8") as f:
+            package_pubspec = yaml.load(f, Loader=yaml.CSafeLoader)
+        m = re.match(
+            r"^[ \t]*(\^|>=|>)?[ \t]*([0-9]+\.[0-9]+)\.[0-9]+.*$",
+            package_pubspec.get("environment", {}).get("sdk", ""),
+        )
+        if m:
+            languageVersion = m.group(2)
+        elif package_pubspec.get("environment", {}).get("sdk") == "any":
+            languageVersion = "null"
+        else:
+            languageVersion = "2.7"
+        if not any(
+            pkg["name"] == package_pubspec["name"] for pkg in package_config["packages"]
+        ):
+            package_config["packages"].append({
+                "name": package_pubspec["name"],
+                "rootUri": Path(package_path).resolve().as_uri(),
+                "packageUri": "lib/",
+                "languageVersion": languageVersion,
+            })
+    with Path(".dart_tool/package_config.json").open("w", encoding="utf-8") as f:
+        json.dump(package_config, f, sort_keys=True, indent=4)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 909dc1321b76..aeb1ec0492d6 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -113,7 +113,7 @@ let
   compressorForImage =
     compressor: imageName:
     compressors.${compressor}
-      or (throw "in docker image ${imageName}: compressor must be one of: [${toString builtins.attrNames compressors}]");
+      or (throw "in docker image ${imageName}: compressor must be one of: [${toString (builtins.attrNames compressors)}]");
 
 in
 rec {
@@ -579,10 +579,16 @@ rec {
     {
       name,
       compressor ? "gz",
+      meta ? { },
       ...
     }@args:
     let
-      stream = streamLayeredImage (removeAttrs args [ "compressor" ]);
+      stream = streamLayeredImage (
+        removeAttrs args [
+          "compressor"
+          "meta"
+        ]
+      );
       compress = compressorForImage compressor name;
     in
     runCommand "${baseNameOf name}.tar${compress.ext}" {
@@ -592,6 +598,7 @@ rec {
         inherit stream;
       };
       nativeBuildInputs = compress.nativeInputs;
+      inherit meta;
     } "${stream} | ${compress.compress} > $out"
   );
 
@@ -641,6 +648,8 @@ rec {
       includeNixDB ? false,
       # Deprecated.
       contents ? null,
+      # Meta options to set on the resulting derivation.
+      meta ? { },
     }:
 
     let
@@ -735,6 +744,7 @@ rec {
                 lib.head (
                   lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath))
                 );
+            inherit meta;
           }
           ''
             ${lib.optionalString (tag == null) ''
@@ -1008,6 +1018,7 @@ rec {
       includeStorePaths ? true,
       includeNixDB ? false,
       passthru ? { },
+      meta ? { },
       # Pipeline used to produce docker layers. If not set, popularity contest
       # algorithm is used. If set, maxLayers is ignored as the author of the
       # pipeline can use one of the available functions (like "limit_layers")
@@ -1233,6 +1244,7 @@ rec {
               isExe = true;
             };
             nativeBuildInputs = [ makeWrapper ];
+            inherit meta;
           }
           ''
             makeWrapper $streamScript $out --add-flags $conf
@@ -1241,7 +1253,8 @@ rec {
     result
   );
 
-  # This function streams a docker image that behaves like a nix-shell for a derivation
+  # This function streams a docker image that behaves like a nix-shell for a derivation.
+  #
   # Docs: doc/build-helpers/images/dockertools.section.md
   # Tests: nixos/tests/docker-tools-nix-shell.nix
   streamNixShellImage =
@@ -1251,6 +1264,9 @@ rec {
       tag ? null,
       uid ? 1000,
       gid ? 1000,
+      # Default to `/build` instead of a non-existent `/homeless-shelter` for backwards compatibility.
+      #
+      # https://github.com/NixOS/nix/issues/6379
       homeDirectory ? "/build",
       shell ? bashInteractive + "/bin/bash",
       command ? null,
@@ -1357,10 +1373,14 @@ rec {
         binSh
         usrBinEnv
         (fakeNss.override {
-          # Allows programs to look up the build user's home directory
+          # Allows programs to look up the build user's home directory.
+          #
           # https://github.com/NixOS/nix/blob/2.32.0/src/libstore/unix/build/linux-derivation-builder.cc#L409-L416
-          # Slightly differs however: We use the passed-in homeDirectory instead of sandboxBuildDir.
-          # We're doing this because it's arguably a bug in Nix that sandboxBuildDir is used here: https://github.com/NixOS/nix/issues/6379
+          #
+          # This slightly differs, however, since we use the passed-in `homeDirectory` instead of `sandboxBuildDir`.
+          # We're doing this because it is arguably a bug in Nix that `sandboxBuildDir` is used here.
+          #
+          # https://github.com/NixOS/nix/issues/6379
           extraPasswdLines = [
             "nixbld:x:${toString uid}:${toString gid}:Build user:${homeDirectory}:/noshell"
           ];
@@ -1373,12 +1393,11 @@ rec {
       fakeRootCommands = ''
         # Effectively a single-user installation of Nix, giving the user full
         # control over the Nix store. Needed for building the derivation this
-        # shell is for, but also in case one wants to use Nix inside the
-        # image
+        # shell is for, but also in case one wants to use Nix inside the image.
         mkdir -p ./nix/{store,var/nix} ./etc/nix
         chown -R ${toString uid}:${toString gid} ./nix ./etc/nix
 
-        # Gives the user control over the build directory
+        # Gives the user control over the build directory.
         mkdir -p .${sandboxBuildDir}
         chown -R ${toString uid}:${toString gid} .${sandboxBuildDir}
       '';
@@ -1403,7 +1422,8 @@ rec {
       config.Env = lib.mapAttrsToList (name: value: "${name}=${value}") envVars;
     };
 
-  # Wrapper around streamNixShellImage to build an image from the result
+  # Wrapper around `streamNixShellImage` to build an image from the result.
+  #
   # Docs: doc/build-helpers/images/dockertools.section.md
   # Tests: nixos/tests/docker-tools-nix-shell.nix
   buildNixShellImage =
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index b904f188a4af..3293821f1dd5 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -77,6 +77,8 @@ let
           "${nginxPort}/tcp" = { };
         };
       };
+
+      meta.description = "Basic nginx docker image example";
     };
 
 in
@@ -91,6 +93,8 @@ rec {
       paths = [ pkgs.bashInteractive ];
       pathsToLink = [ "/bin" ];
     };
+
+    meta.description = "Basic example image";
   };
 
   # 2. service example, layered on another image
@@ -138,6 +142,8 @@ rec {
         Retries = 3;
       };
     };
+
+    meta.description = "Service example, layered on another image";
   };
 
   # 3. another service example
@@ -204,6 +210,8 @@ rec {
         "USER=nobody"
       ];
     };
+
+    meta.description = "nix example to play with the container nix store";
   };
 
   # 7. example of adding something on top of an image pull by our
diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 45c7599b1c74..5a8ea3cf0488 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -20,182 +20,213 @@ let
       appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${shortRev}";
     in
     "${lib.sources.urlToName url}${if append == "" then appendShort else append}";
+
+  getRevWithTag =
+    {
+      rev ? null,
+      tag ? null,
+    }:
+    if tag != null && rev != null then
+      throw "fetchgit requires one of either `rev` or `tag` to be provided (not both)."
+    else if tag != null then
+      "refs/tags/${tag}"
+    else if rev != null then
+      rev
+    else
+      # FIXME fetching HEAD if no rev or tag is provided is problematic at best
+      "HEAD";
 in
 
 lib.makeOverridable (
-  lib.fetchers.withNormalizedHash { } (
-    # NOTE Please document parameter additions or changes in
-    #   ../../../doc/build-helpers/fetchers.chapter.md
-    {
-      url,
-      tag ? null,
-      rev ? null,
-      name ? urlToName {
-        inherit url;
-        rev = lib.revOrTag rev tag;
-        # when rootDir is specified, avoid invalidating the result when rev changes
-        append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
-      },
-      leaveDotGit ? deepClone || fetchTags,
-      outputHash ? lib.fakeHash,
-      outputHashAlgo ? null,
-      fetchSubmodules ? true,
-      deepClone ? false,
-      branchName ? null,
-      sparseCheckout ? lib.optional (rootDir != "") rootDir,
-      nonConeMode ? rootDir != "",
-      nativeBuildInputs ? [ ],
-      # Shell code executed before the file has been fetched.  This, in
-      # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to
-      # run operations between the checkout completing and deleting the .git
-      # directory.
-      preFetch ? "",
-      # Shell code executed after the file has been fetched
-      # successfully. This can do things like check or transform the file.
-      postFetch ? "",
-      preferLocalBuild ? true,
-      fetchLFS ? false,
-      # Shell code to build a netrc file for BASIC auth
-      netrcPhase ? null,
-      # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
-      # needed for netrcPhase
-      netrcImpureEnvVars ? [ ],
-      meta ? { },
-      allowedRequisites ? null,
-      # fetch all tags after tree (useful for git describe)
-      fetchTags ? false,
-      # make this subdirectory the root of the result
-      rootDir ? "",
-      # GIT_CONFIG_GLOBAL (as a file)
-      gitConfigFile ? config.gitConfigFile,
-    }:
+  lib.extendMkDerivation {
+    constructDrv = stdenvNoCC.mkDerivation;
 
-    /*
-      NOTE:
-      fetchgit has one problem: git fetch only works for refs.
-      This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks
-      and checking whether a commit belongs to a ref is expensive. This may
-      change in the future when some caching is added to git (?)
-      Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
-      Cloning branches will make the hash check fail when there is an update.
-      But not all patches we want can be accessed by tags.
+    excludeDrvArgNames = [
+      # Additional stdenv.mkDerivation arguments from derived fetchers.
+      "derivationArgs"
 
-      The workaround is getting the last n commits so that it's likely that they
-      still contain the hash we want.
+      # Hashes, handled by `lib.fetchers.withNormalizedHash`
+      # whose outputs contain outputHash* attributes.
+      "hash"
+      "sha256"
+    ];
 
-      for now : increase depth iteratively (TODO)
+    extendDrvArgs =
+      finalAttrs:
+      lib.fetchers.withNormalizedHash { } (
+        # NOTE Please document parameter additions or changes in
+        #   ../../../doc/build-helpers/fetchers.chapter.md
+        {
+          url,
+          tag ? null,
+          rev ? null,
+          name ? urlToName {
+            inherit url;
+            rev = lib.revOrTag finalAttrs.revCustom finalAttrs.tag;
+            # when rootDir is specified, avoid invalidating the result when rev changes
+            append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
+          },
+          leaveDotGit ? deepClone || fetchTags,
+          outputHash ? lib.fakeHash,
+          outputHashAlgo ? null,
+          fetchSubmodules ? true,
+          deepClone ? false,
+          branchName ? null,
+          sparseCheckout ? lib.optional (rootDir != "") rootDir,
+          nonConeMode ? rootDir != "",
+          nativeBuildInputs ? [ ],
+          # Shell code executed before the file has been fetched.  This, in
+          # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to
+          # run operations between the checkout completing and deleting the .git
+          # directory.
+          preFetch ? "",
+          # Shell code executed after the file has been fetched
+          # successfully. This can do things like check or transform the file.
+          postFetch ? "",
+          preferLocalBuild ? true,
+          fetchLFS ? false,
+          # Shell code to build a netrc file for BASIC auth
+          netrcPhase ? null,
+          # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
+          # needed for netrcPhase
+          netrcImpureEnvVars ? [ ],
+          passthru ? { },
+          meta ? { },
+          allowedRequisites ? null,
+          # fetch all tags after tree (useful for git describe)
+          fetchTags ? false,
+          # make this subdirectory the root of the result
+          rootDir ? "",
+          # GIT_CONFIG_GLOBAL (as a file)
+          gitConfigFile ? config.gitConfigFile,
+          # Additional stdenvNoCC.mkDerivation arguments.
+          # It is typically for derived fetchers to pass down additional arguments,
+          # and the specified arguments have lower precedence than other mkDerivation arguments.
+          derivationArgs ? { },
+        }:
 
-      real fix: ask git folks to add a
-      git fetch $HASH contained in $BRANCH
-      facility because checking that $HASH is contained in $BRANCH is less
-      expensive than fetching --depth $N.
-      Even if git folks implemented this feature soon it may take years until
-      server admins start using the new version?
-    */
+        /*
+          NOTE:
+          fetchgit has one problem: git fetch only works for refs.
+          This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks
+          and checking whether a commit belongs to a ref is expensive. This may
+          change in the future when some caching is added to git (?)
+          Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
+          Cloning branches will make the hash check fail when there is an update.
+          But not all patches we want can be accessed by tags.
 
-    assert nonConeMode -> (sparseCheckout != [ ]);
-    assert fetchTags -> leaveDotGit;
-    assert rootDir != "" -> !leaveDotGit;
+          The workaround is getting the last n commits so that it's likely that they
+          still contain the hash we want.
 
-    let
-      revWithTag =
-        let
-          warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both).";
-          otherIsNull = other: lib.assertMsg (other == null) warningMsg;
-        in
-        if tag != null then
-          assert (otherIsNull rev);
-          "refs/tags/${tag}"
-        else if rev != null then
-          assert (otherIsNull tag);
-          rev
+          for now : increase depth iteratively (TODO)
+
+          real fix: ask git folks to add a
+          git fetch $HASH contained in $BRANCH
+          facility because checking that $HASH is contained in $BRANCH is less
+          expensive than fetching --depth $N.
+          Even if git folks implemented this feature soon it may take years until
+          server admins start using the new version?
+        */
+
+        assert nonConeMode -> (sparseCheckout != [ ]);
+        assert fetchTags -> leaveDotGit;
+        assert rootDir != "" -> !leaveDotGit;
+
+        if builtins.isString sparseCheckout then
+          # Changed to throw on 2023-06-04
+          throw
+            "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
         else
-          # FIXME fetching HEAD if no rev or tag is provided is problematic at best
-          "HEAD";
-    in
+          derivationArgs
+          // {
+            inherit name;
 
-    if builtins.isString sparseCheckout then
-      # Changed to throw on 2023-06-04
-      throw
-        "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
-    else
-      stdenvNoCC.mkDerivation {
-        inherit name;
+            builder = ./builder.sh;
+            fetcher = ./nix-prefetch-git;
 
-        builder = ./builder.sh;
-        fetcher = ./nix-prefetch-git;
+            nativeBuildInputs = [
+              git
+              cacert
+            ]
+            ++ lib.optionals fetchLFS [ git-lfs ]
+            ++ nativeBuildInputs;
 
-        nativeBuildInputs = [
-          git
-          cacert
-        ]
-        ++ lib.optionals fetchLFS [ git-lfs ]
-        ++ nativeBuildInputs;
+            inherit outputHash outputHashAlgo;
+            outputHashMode = "recursive";
 
-        inherit outputHash outputHashAlgo;
-        outputHashMode = "recursive";
+            # git-sparse-checkout(1) says:
+            # > When the --stdin option is provided, the directories or patterns are read
+            # > from standard in as a newline-delimited list instead of from the arguments.
+            sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout;
 
-        # git-sparse-checkout(1) says:
-        # > When the --stdin option is provided, the directories or patterns are read
-        # > from standard in as a newline-delimited list instead of from the arguments.
-        sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout;
+            inherit
+              url
+              leaveDotGit
+              fetchLFS
+              fetchSubmodules
+              deepClone
+              branchName
+              nonConeMode
+              preFetch
+              postFetch
+              fetchTags
+              rootDir
+              gitConfigFile
+              ;
+            inherit tag;
+            revCustom = rev;
+            rev = getRevWithTag {
+              inherit (finalAttrs) tag;
+              rev = finalAttrs.revCustom;
+            };
 
-        inherit
-          url
-          leaveDotGit
-          fetchLFS
-          fetchSubmodules
-          deepClone
-          branchName
-          nonConeMode
-          preFetch
-          postFetch
-          fetchTags
-          rootDir
-          gitConfigFile
-          ;
-        rev = revWithTag;
+            postHook =
+              if netrcPhase == null then
+                null
+              else
+                ''
+                  ${netrcPhase}
+                  # required that git uses the netrc file
+                  mv {,.}netrc
+                  export NETRC=$PWD/.netrc
+                  export HOME=$PWD
+                '';
 
-        postHook =
-          if netrcPhase == null then
-            null
-          else
-            ''
-              ${netrcPhase}
-              # required that git uses the netrc file
-              mv {,.}netrc
-              export NETRC=$PWD/.netrc
-              export HOME=$PWD
-            '';
+            impureEnvVars =
+              lib.fetchers.proxyImpureEnvVars
+              ++ netrcImpureEnvVars
+              ++ [
+                "GIT_PROXY_COMMAND"
+                "NIX_GIT_SSL_CAINFO"
+                "SOCKS_SERVER"
 
-        impureEnvVars =
-          lib.fetchers.proxyImpureEnvVars
-          ++ netrcImpureEnvVars
-          ++ [
-            "GIT_PROXY_COMMAND"
-            "NIX_GIT_SSL_CAINFO"
-            "SOCKS_SERVER"
+                # This is a parameter intended to be set by setup hooks or preFetch
+                # scripts that want per-URL control over HTTP proxies used by Git
+                # (if per-URL control isn't needed, `http_proxy` etc. will
+                # suffice). It must be a whitespace-separated (with backslash as an
+                # escape character) list of pairs like this:
+                #
+                #   http://domain1/path1 proxy1 https://domain2/path2 proxy2
+                #
+                # where the URLs are as documented in the `git-config` manual page
+                # under `http.<url>.*`, and the proxies are as documented on the
+                # same page under `http.proxy`.
+                "FETCHGIT_HTTP_PROXIES"
+              ];
 
-            # This is a parameter intended to be set by setup hooks or preFetch
-            # scripts that want per-URL control over HTTP proxies used by Git
-            # (if per-URL control isn't needed, `http_proxy` etc. will
-            # suffice). It must be a whitespace-separated (with backslash as an
-            # escape character) list of pairs like this:
-            #
-            #   http://domain1/path1 proxy1 https://domain2/path2 proxy2
-            #
-            # where the URLs are as documented in the `git-config` manual page
-            # under `http.<url>.*`, and the proxies are as documented on the
-            # same page under `http.proxy`.
-            "FETCHGIT_HTTP_PROXIES"
-          ];
+            inherit preferLocalBuild meta allowedRequisites;
 
-        inherit preferLocalBuild meta allowedRequisites;
+            passthru = {
+              gitRepoUrl = url;
+            }
+            // passthru;
+          }
+      );
 
-        passthru = {
-          gitRepoUrl = url;
-          inherit tag;
-        };
-      }
-  )
+    # No ellipsis.
+    inheritFunctionArgs = false;
+  }
 )
+// {
+  inherit getRevWithTag;
+}
diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index dfe210f32c41..ae5ff338264a 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -11,7 +11,8 @@ lib.makeOverridable (
     repo,
     tag ? null,
     rev ? null,
-    name ? repoRevToNameMaybe repo (lib.revOrTag rev tag) "github",
+    # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation
+    # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github",
     fetchSubmodules ? false,
     leaveDotGit ? null,
     deepClone ? false,
@@ -22,6 +23,7 @@ lib.makeOverridable (
     sparseCheckout ? lib.optional (rootDir != "") rootDir,
     githubBase ? "github.com",
     varPrefix ? null,
+    passthru ? { },
     meta ? { },
     ... # For hash agility
   }@args:
@@ -109,10 +111,10 @@ lib.makeOverridable (
 
     gitRepoUrl = "${baseUrl}.git";
 
-    revWithTag = if tag != null then "refs/tags/${tag}" else rev;
-
     fetcherArgs =
-      (
+      finalAttrs:
+      passthruAttrs
+      // (
         if useFetchGit then
           {
             inherit
@@ -124,9 +126,20 @@ lib.makeOverridable (
               fetchLFS
               ;
             url = gitRepoUrl;
+            inherit passthru;
+            derivationArgs = {
+              inherit
+                githubBase
+                owner
+                repo
+                ;
+            };
           }
           // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
         else
+          let
+            revWithTag = finalAttrs.rev;
+          in
           {
             # Use the API endpoint for private repos, as the archive URI doesn't
             # support access with GitHub's fine-grained access tokens.
@@ -136,7 +149,7 @@ lib.makeOverridable (
             url =
               if private then
                 let
-                  endpoint = "/repos/${owner}/${repo}/tarball/${revWithTag}";
+                  endpoint = "/repos/${finalAttrs.owner}/${finalAttrs.repo}/tarball/${revWithTag}";
                 in
                 if githubBase == "github.com" then
                   "https://api.github.com${endpoint}"
@@ -145,23 +158,34 @@ lib.makeOverridable (
               else
                 "${baseUrl}/archive/${revWithTag}.tar.gz";
             extension = "tar.gz";
-
+            derivationArgs = {
+              inherit
+                githubBase
+                owner
+                repo
+                tag
+                ;
+              rev = fetchgit.getRevWithTag {
+                inherit (finalAttrs) tag;
+                rev = finalAttrs.revCustom;
+              };
+              revCustom = rev;
+            };
             passthru = {
               inherit gitRepoUrl;
-            };
+            }
+            // passthru;
           }
       )
       // privateAttrs
-      // passthruAttrs
       // {
-        inherit name;
+        # TODO(@ShamrockLee): Change back to `inherit name;` after reconstruction with lib.extendMkDerivation
+        name =
+          args.name
+            or (repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github");
+        meta = newMeta;
       };
   in
 
   fetcher fetcherArgs
-  // {
-    meta = newMeta;
-    inherit owner repo tag;
-    rev = revWithTag;
-  }
 )
diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index 822c3991fa29..8a2b0ffa31d6 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -21,6 +21,8 @@ lib.makeOverridable (
     deepClone ? false,
     forceFetchGit ? false,
     sparseCheckout ? [ ],
+    private ? false,
+    varPrefix ? null,
     ... # For hash agility
   }@args:
 
@@ -51,14 +53,57 @@ lib.makeOverridable (
       "tag"
       "fetchSubmodules"
       "forceFetchGit"
+      "private"
+      "varPrefix"
       "leaveDotGit"
       "deepClone"
     ];
 
+    varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITLAB_PRIVATE_";
     useFetchGit =
       fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != [ ]);
     fetcher = if useFetchGit then fetchgit else fetchzip;
 
+    privateAttrs = lib.optionalAttrs private (
+      lib.throwIfNot (protocol == "https") "private token login is only supported for https" {
+        netrcPhase = ''
+          if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
+            echo "Error: Private fetchFromGitLab requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
+            exit 1
+          fi
+        ''
+        + (
+          if useFetchGit then
+            # GitLab supports HTTP Basic Authentication only when Git is used:
+            # https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html#project-access-tokens
+            ''
+              cat > netrc <<EOF
+              machine ${domain}
+                      login ''$${varBase}USERNAME
+                      password ''$${varBase}PASSWORD
+              EOF
+            ''
+          else
+            # Access via the GitLab API requires a custom header and does not work
+            # with HTTP Basic Authentication:
+            # https://docs.gitlab.com/ee/api/#personalprojectgroup-access-tokens
+            ''
+              # needed because fetchurl always sets --netrc-file if a netrcPhase is present
+              touch netrc
+
+              cat > private-token <<EOF
+              PRIVATE-TOKEN: ''$${varBase}PASSWORD
+              EOF
+              curlOpts="$curlOpts --header @./private-token"
+            ''
+        );
+        netrcImpureEnvVars = [
+          "${varBase}USERNAME"
+          "${varBase}PASSWORD"
+        ];
+      }
+    );
+
     gitRepoUrl = "${protocol}://${domain}/${slug}.git";
 
     fetcherArgs =
@@ -84,6 +129,7 @@ lib.makeOverridable (
             };
           }
       )
+      // privateAttrs
       // passthruAttrs
       // {
         inherit name;
diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix
index 138ac8fb10cf..f24b4e44c07f 100644
--- a/pkgs/build-support/fetchnextcloudapp/default.nix
+++ b/pkgs/build-support/fetchnextcloudapp/default.nix
@@ -39,6 +39,10 @@ applyPatches {
       ${if longDescription == null then null else "longDescription"} = longDescription;
       ${if homepage == null then null else "homepage"} = homepage;
       inherit maintainers teams;
+      sourceProvenance = with lib.sourceTypes; [
+        fromSource
+        binaryBytecode # vendored deps, compiled vue templates, etc
+      ];
     };
   };
   prePatch = ''
diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix
index d291c57429c1..71530bddff37 100644
--- a/pkgs/build-support/fetchpypi/default.nix
+++ b/pkgs/build-support/fetchpypi/default.nix
@@ -1,7 +1,7 @@
 # `fetchPypi` function for fetching artifacts from PyPI.
 {
+  lib,
   fetchurl,
-  makeOverridable,
 }:
 
 let
@@ -46,7 +46,7 @@ let
     compute (removeAttrs attrs [ "format" ]);
 
 in
-makeOverridable (
+lib.makeOverridable (
   {
     format ? "setuptools",
     sha256 ? "",
diff --git a/pkgs/build-support/fetchtorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix
index 5848c3e25f00..d3828602594e 100644
--- a/pkgs/build-support/fetchtorrent/default.nix
+++ b/pkgs/build-support/fetchtorrent/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   runCommand,
-  transmission_3_noSystemd,
+  transmission_4,
   rqbit,
   writeShellScript,
   formats,
@@ -97,7 +97,7 @@ runCommand name
     ]
     ++ (
       if (backend == "transmission") then
-        [ transmission_3_noSystemd ]
+        [ transmission_4 ]
       else if (backend == "rqbit") then
         [ rqbit ]
       else
@@ -132,7 +132,6 @@ runCommand name
             --portmap \
             --finish ${transmissionFinishScript} \
             --download-dir "$downloadedDirectory" \
-            --config-dir "$HOME"/.config/transmission \
             "$url"
       ''
     else
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index d524c760c1a3..5ffb70e3a9f8 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -53,252 +53,282 @@ let
 
 in
 
-{
-  # URL to fetch.
-  url ? "",
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
 
-  # Alternatively, a list of URLs specifying alternative download
-  # locations.  They are tried in order.
-  urls ? [ ],
+  excludeDrvArgNames = [
+    # Passed via passthru
+    "url"
 
-  # Additional curl options needed for the download to succeed.
-  # Warning: Each space (no matter the escaping) will start a new argument.
-  # If you wish to pass arguments with spaces, use `curlOptsList`
-  curlOpts ? "",
+    # Additional stdenv.mkDerivation arguments from derived fetchers.
+    "derivationArgs"
 
-  # Additional curl options needed for the download to succeed.
-  curlOptsList ? [ ],
+    # Hash attributes will be map to the corresponding outputHash*
+    "hash"
+    "sha1"
+    "sha256"
+    "sha512"
+  ];
 
-  # Name of the file.  If empty, use the basename of `url' (or of the
-  # first element of `urls').
-  name ? "",
+  extendDrvArgs =
+    finalAttrs:
+    {
+      # URL to fetch.
+      url ? "",
 
-  # for versioned downloads optionally take pname + version.
-  pname ? "",
-  version ? "",
+      # Alternatively, a list of URLs specifying alternative download
+      # locations.  They are tried in order.
+      urls ? [ ],
 
-  # SRI hash.
-  hash ? "",
+      # Additional curl options needed for the download to succeed.
+      # Warning: Each space (no matter the escaping) will start a new argument.
+      # If you wish to pass arguments with spaces, use `curlOptsList`
+      curlOpts ? "",
 
-  # Legacy ways of specifying the hash.
-  outputHash ? "",
-  outputHashAlgo ? "",
-  sha1 ? "",
-  sha256 ? "",
-  sha512 ? "",
+      # Additional curl options needed for the download to succeed.
+      curlOptsList ? [ ],
 
-  recursiveHash ? false,
+      # Name of the file when pname + version is unspecified.
+      # Default to the basename of `url' (or of the first element of `urls').
+      name ? null,
 
-  # Shell code to build a netrc file for BASIC auth
-  netrcPhase ? null,
+      # for versioned downloads optionally take pname + version.
+      pname ? null,
+      version ? null,
 
-  # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
-  # needed for netrcPhase
-  netrcImpureEnvVars ? [ ],
+      # SRI hash.
+      hash ? "",
 
-  # Shell code executed after the file has been fetched
-  # successfully. This can do things like check or transform the file.
-  postFetch ? "",
+      # Legacy ways of specifying the hash.
+      outputHash ? "",
+      outputHashAlgo ? "",
+      sha1 ? "",
+      sha256 ? "",
+      sha512 ? "",
 
-  # Whether to download to a temporary path rather than $out. Useful
-  # in conjunction with postFetch. The location of the temporary file
-  # is communicated to postFetch via $downloadedFile.
-  downloadToTemp ? false,
+      recursiveHash ? false,
 
-  # If true, set executable bit on downloaded file
-  executable ? false,
+      # Shell code to build a netrc file for BASIC auth
+      netrcPhase ? null,
 
-  # If set, don't download the file, but write a list of all possible
-  # URLs (resulting from resolving mirror:// URLs) to $out.
-  showURLs ? false,
+      # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
+      # needed for netrcPhase
+      netrcImpureEnvVars ? [ ],
 
-  # Meta information, if any.
-  meta ? { },
+      # Shell code executed after the file has been fetched
+      # successfully. This can do things like check or transform the file.
+      postFetch ? "",
 
-  # Passthru information, if any.
-  passthru ? { },
-  # Doing the download on a remote machine just duplicates network
-  # traffic, so don't do that by default
-  preferLocalBuild ? true,
+      # Whether to download to a temporary path rather than $out. Useful
+      # in conjunction with postFetch. The location of the temporary file
+      # is communicated to postFetch via $downloadedFile.
+      downloadToTemp ? false,
 
-  # Additional packages needed as part of a fetch
-  nativeBuildInputs ? [ ],
-}@args:
+      # If true, set executable bit on downloaded file
+      executable ? false,
 
-let
-  preRewriteUrls =
-    if urls != [ ] && url == "" then
-      (
-        if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}"
-      )
-    else if urls == [ ] && url != "" then
-      (
-        if lib.isString url then
-          [ url ]
-        else
-          throw "`url` is not a string: ${lib.generators.toPretty { } urls}"
-      )
-    else
-      throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}";
+      # If set, don't download the file, but write a list of all possible
+      # URLs (resulting from resolving mirror:// URLs) to $out.
+      showURLs ? false,
+
+      # Meta information, if any.
+      meta ? { },
+
+      # Passthru information, if any.
+      passthru ? { },
+      # Doing the download on a remote machine just duplicates network
+      # traffic, so don't do that by default
+      preferLocalBuild ? true,
+
+      # Additional packages needed as part of a fetch
+      nativeBuildInputs ? [ ],
+
+      # Additional stdenvNoCC.mkDerivation arguments.
+      # It is typically for derived fetchers to pass down additional arguments,
+      # and the specified arguments have lower precedence than other mkDerivation arguments.
+      derivationArgs ? { },
+    }@args:
 
-  urls_ =
     let
-      u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls);
-    in
-    if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u;
-
-  hash_ =
-    if
-      with lib.lists;
-      length (
-        filter (s: s != "") [
-          hash
-          outputHash
-          sha1
-          sha256
-          sha512
-        ]
-      ) > 1
-    then
-      throw "multiple hashes passed to fetchurl: ${lib.generators.toPretty { } urls_}"
-    else
-
-    if hash != "" then
-      {
-        outputHashAlgo = null;
-        outputHash = hash;
-      }
-    else if outputHash != "" then
-      if outputHashAlgo != "" then
-        { inherit outputHashAlgo outputHash; }
-      else
-        throw "fetchurl was passed outputHash without outputHashAlgo: ${lib.generators.toPretty { } urls_}"
-    else if sha512 != "" then
-      {
-        outputHashAlgo = "sha512";
-        outputHash = sha512;
-      }
-    else if sha256 != "" then
-      {
-        outputHashAlgo = "sha256";
-        outputHash = sha256;
-      }
-    else if sha1 != "" then
-      {
-        outputHashAlgo = "sha1";
-        outputHash = sha1;
-      }
-    else if cacert != null then
-      {
-        outputHashAlgo = "sha256";
-        outputHash = "";
-      }
-    else
-      throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}";
-
-  resolvedUrl =
-    let
-      mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url;
-      mirrorName = lib.head mirrorSplit;
-      mirrorList =
-        if lib.hasAttr mirrorName mirrors then
-          mirrors."${mirrorName}"
+      preRewriteUrls =
+        if urls != [ ] && url == "" then
+          (
+            if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}"
+          )
+        else if urls == [ ] && url != "" then
+          (
+            if lib.isString url then
+              [ url ]
+            else
+              throw "`url` is not a string: ${lib.generators.toPretty { } urls}"
+          )
         else
-          throw "unknown mirror:// site ${mirrorName}";
-    in
-    if mirrorSplit == null || mirrorName == null then
-      url
-    else
-      "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
-in
+          throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}";
 
-assert
-  (lib.isList curlOpts)
-  -> lib.warn ''
-    fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${
-      lib.generators.toPretty { multiline = false; } curlOpts
-    }), which is not supported anymore.
-    - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
-      curlOpts = ${lib.strings.escapeNixString (toString curlOpts)};
-    - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
-      curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' true;
+      urls_ =
+        let
+          u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls);
+        in
+        if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u;
 
-stdenvNoCC.mkDerivation (
-  (
-    if (pname != "" && version != "") then
-      { inherit pname version; }
-    else
-      {
-        name =
-          if showURLs then
-            "urls"
-          else if name != "" then
-            name
+      hash_ =
+        if
+          with lib.lists;
+          length (
+            filter (s: s != "") [
+              hash
+              outputHash
+              sha1
+              sha256
+              sha512
+            ]
+          ) > 1
+        then
+          throw "multiple hashes passed to fetchurl: ${lib.generators.toPretty { } urls_}"
+        else
+
+        if hash != "" then
+          {
+            outputHashAlgo = null;
+            outputHash = hash;
+          }
+        else if outputHash != "" then
+          if outputHashAlgo != "" then
+            { inherit outputHashAlgo outputHash; }
           else
-            baseNameOf (toString (builtins.head urls_));
-      }
-  )
-  // {
-    builder = ./builder.sh;
+            throw "fetchurl was passed outputHash without outputHashAlgo: ${lib.generators.toPretty { } urls_}"
+        else if sha512 != "" then
+          {
+            outputHashAlgo = "sha512";
+            outputHash = sha512;
+          }
+        else if sha256 != "" then
+          {
+            outputHashAlgo = "sha256";
+            outputHash = sha256;
+          }
+        else if sha1 != "" then
+          {
+            outputHashAlgo = "sha1";
+            outputHash = sha1;
+          }
+        else if cacert != null then
+          {
+            outputHashAlgo = "sha256";
+            outputHash = "";
+          }
+        else
+          throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}";
 
-    nativeBuildInputs = [ curl ] ++ nativeBuildInputs;
+      resolvedUrl =
+        let
+          mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url;
+          mirrorName = lib.head mirrorSplit;
+          mirrorList =
+            if lib.hasAttr mirrorName mirrors then
+              mirrors."${mirrorName}"
+            else
+              throw "unknown mirror:// site ${mirrorName}";
+        in
+        if mirrorSplit == null || mirrorName == null then
+          url
+        else
+          "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
+    in
 
-    urls = urls_;
+    derivationArgs
+    // {
+      name =
+        if finalAttrs.pname or null != null && finalAttrs.version or null != null then
+          "${finalAttrs.pname}-${finalAttrs.version}"
+        else if showURLs then
+          "urls"
+        else if name != null then
+          name
+        else
+          baseNameOf (toString (lib.head urls_));
 
-    # If set, prefer the content-addressable mirrors
-    # (http://tarballs.nixos.org) over the original URLs.
-    preferHashedMirrors = false;
+      builder = ./builder.sh;
 
-    # New-style output content requirements.
-    inherit (hash_) outputHashAlgo outputHash;
+      nativeBuildInputs = [ curl ] ++ nativeBuildInputs;
 
-    # Disable TLS verification only when we know the hash and no credentials are
-    # needed to access the resource
-    SSL_CERT_FILE =
-      if
-        (
-          hash_.outputHash == ""
-          || hash_.outputHash == lib.fakeSha256
-          || hash_.outputHash == lib.fakeSha512
-          || hash_.outputHash == lib.fakeHash
-          || netrcPhase != null
-        )
-      then
-        "${cacert}/etc/ssl/certs/ca-bundle.crt"
-      else
-        "/no-cert-file.crt";
+      urls = urls_;
 
-    outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
+      # If set, prefer the content-addressable mirrors
+      # (http://tarballs.nixos.org) over the original URLs.
+      preferHashedMirrors = false;
 
-    inherit curlOpts;
-    curlOptsList = lib.escapeShellArgs curlOptsList;
-    inherit
-      showURLs
-      mirrorsFile
-      postFetch
-      downloadToTemp
-      executable
-      ;
+      # New-style output content requirements.
+      inherit (hash_) outputHashAlgo outputHash;
 
-    impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;
+      # Disable TLS verification only when we know the hash and no credentials are
+      # needed to access the resource
+      SSL_CERT_FILE =
+        if
+          (
+            hash_.outputHash == ""
+            || hash_.outputHash == lib.fakeSha256
+            || hash_.outputHash == lib.fakeSha512
+            || hash_.outputHash == lib.fakeHash
+            || netrcPhase != null
+          )
+        then
+          "${cacert}/etc/ssl/certs/ca-bundle.crt"
+        else
+          "/no-cert-file.crt";
 
-    nixpkgsVersion = lib.trivial.release;
+      outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
 
-    inherit preferLocalBuild;
-
-    postHook =
-      if netrcPhase == null then
-        null
-      else
+      curlOpts = lib.warnIf (lib.isList curlOpts) (
+        let
+          url = toString (builtins.head urls_);
+          curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts;
+          curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts);
+          curlOptsListElementsRepresentation =
+            lib.concatMapStringsSep " " lib.strings.escapeNixString
+              curlOpts;
+        in
         ''
-          ${netrcPhase}
-          curlOpts="$curlOpts --netrc-file $PWD/netrc"
-        '';
+          fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore.
+          - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
+            curlOpts = ${curlOptsAsStringRepresentation};
+          - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
+            curlOptsList = [ ${curlOptsListElementsRepresentation} ];
+        ''
+      ) curlOpts;
 
-    inherit meta;
-    passthru = {
-      inherit url resolvedUrl;
-    }
-    // passthru;
-  }
-)
+      curlOptsList = lib.escapeShellArgs curlOptsList;
+
+      inherit
+        showURLs
+        mirrorsFile
+        postFetch
+        downloadToTemp
+        executable
+        ;
+
+      impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;
+
+      nixpkgsVersion = lib.trivial.release;
+
+      inherit preferLocalBuild;
+
+      postHook =
+        if netrcPhase == null then
+          null
+        else
+          ''
+            ${netrcPhase}
+            curlOpts="$curlOpts --netrc-file $PWD/netrc"
+          '';
+
+      inherit meta;
+      passthru = {
+        inherit url resolvedUrl;
+      }
+      // passthru;
+    };
+
+  # No ellipsis
+  inheritFunctionArgs = false;
+}
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 7e1452ae54a2..4376fef41085 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -14,96 +14,112 @@
   glibcLocalesUtf8,
 }:
 
-{
-  url ? "",
-  urls ? [ ],
-  name ? repoRevToNameMaybe (if url != "" then url else builtins.head urls) null "unpacked",
-  nativeBuildInputs ? [ ],
-  postFetch ? "",
-  extraPostFetch ? "",
+lib.extendMkDerivation {
+  constructDrv = fetchurl;
 
-  # Optionally move the contents of the unpacked tree up one level.
-  stripRoot ? true,
-  # Allows to set the extension for the intermediate downloaded
-  # file. This can be used as a hint for the unpackCmdHooks to select
-  # an appropriate unpacking tool.
-  extension ? null,
-
-  # the rest are given to fetchurl as is
-  ...
-}@args:
-
-assert
-  (extraPostFetch != "")
-  -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." true;
-
-let
-  tmpFilename =
-    if extension != null then
-      "download.${extension}"
-    else
-      baseNameOf (if url != "" then url else builtins.head urls);
-in
-
-fetchurl (
-  {
-    inherit name;
-    recursiveHash = true;
-
-    downloadToTemp = true;
-
-    # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle
-    # UTF-8 aware locale:
-    #   https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263
-    nativeBuildInputs =
-      lib.optionals withUnzip [
-        unzip
-        glibcLocalesUtf8
-      ]
-      ++ nativeBuildInputs;
-
-    postFetch = ''
-      unpackDir="$TMPDIR/unpack"
-      mkdir "$unpackDir"
-      cd "$unpackDir"
-
-      renamed="$TMPDIR/${tmpFilename}"
-      mv "$downloadedFile" "$renamed"
-      unpackFile "$renamed"
-      chmod -R +w "$unpackDir"
-    ''
-    + (
-      if stripRoot then
-        ''
-          if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
-            echo "error: zip file must contain a single file or directory."
-            echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
-            exit 1
-          fi
-          fn=$(cd "$unpackDir" && ls -A)
-          if [ -f "$unpackDir/$fn" ]; then
-            mkdir $out
-          fi
-          mv "$unpackDir/$fn" "$out"
-        ''
-      else
-        ''
-          mv "$unpackDir" "$out"
-        ''
-    )
-    + ''
-      ${postFetch}
-      ${extraPostFetch}
-      chmod 755 "$out"
-    '';
-    # ^ Remove non-owner write permissions
-    # Fixes https://github.com/NixOS/nixpkgs/issues/38649
-  }
-  // removeAttrs args [
-    "stripRoot"
+  excludeDrvArgNames = [
     "extraPostFetch"
-    "postFetch"
+
+    # Pass via derivationArgs
     "extension"
-    "nativeBuildInputs"
-  ]
-)
+    "stripRoot"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      url ? "",
+      urls ? [ ],
+      name ? repoRevToNameMaybe (if url != "" then url else builtins.head urls) null "unpacked",
+      nativeBuildInputs ? [ ],
+      postFetch ? "",
+      extraPostFetch ? "",
+
+      # Optionally move the contents of the unpacked tree up one level.
+      stripRoot ? true,
+      # Allows to set the extension for the intermediate downloaded
+      # file. This can be used as a hint for the unpackCmdHooks to select
+      # an appropriate unpacking tool.
+      extension ? null,
+
+      # Additional stdenvNoCC.mkDerivation arguments.
+      # It is typically for derived fetchers to pass down additional arguments,
+      # and the specified arguments have lower precedence than other mkDerivation arguments.
+      derivationArgs ? { },
+
+      # the rest are given to fetchurl as is
+      ...
+    }@args:
+
+    let
+      tmpFilename =
+        if finalAttrs.extension != null then
+          "download.${finalAttrs.extension}"
+        else
+          baseNameOf (if url != "" then url else builtins.head urls);
+    in
+
+    {
+      inherit name;
+      recursiveHash = true;
+
+      downloadToTemp = true;
+
+      # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle
+      # UTF-8 aware locale:
+      #   https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263
+      nativeBuildInputs =
+        lib.optionals withUnzip [
+          unzip
+          glibcLocalesUtf8
+        ]
+        ++ nativeBuildInputs;
+
+      postFetch = ''
+        unpackDir="$TMPDIR/unpack"
+        mkdir "$unpackDir"
+        cd "$unpackDir"
+
+        renamed="$TMPDIR/${tmpFilename}"
+        mv "$downloadedFile" "$renamed"
+        unpackFile "$renamed"
+        chmod -R +w "$unpackDir"
+      ''
+      + (
+        if finalAttrs.stripRoot then
+          ''
+            if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
+              echo "error: zip file must contain a single file or directory."
+              echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
+              exit 1
+            fi
+            fn=$(cd "$unpackDir" && ls -A)
+            if [ -f "$unpackDir/$fn" ]; then
+              mkdir $out
+            fi
+            mv "$unpackDir/$fn" "$out"
+          ''
+        else
+          ''
+            mv "$unpackDir" "$out"
+          ''
+      )
+      + ''
+        ${postFetch}
+        ${lib.warnIf (extraPostFetch != "")
+          "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'."
+          extraPostFetch
+        }
+        chmod 755 "$out"
+      '';
+      # ^ Remove non-owner write permissions
+      # Fixes https://github.com/NixOS/nixpkgs/issues/38649
+
+      derivationArgs = derivationArgs // {
+        inherit
+          extension
+          stripRoot
+          ;
+      };
+    };
+}
diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index c1c644e4294e..ce699c213454 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -24,8 +24,8 @@ lib.extendMkDerivation {
       modRoot ? "./",
 
       # The SRI hash of the vendored dependencies.
-      # If `vendorHash` is `null`, no dependencies are fetched and
-      # the build relies on the vendor folder within the source.
+      # If `null`, it means the project either has no external dependencies
+      # or the vendored dependencies are already present in the source tree.
       vendorHash ? throw (
         if args ? vendorSha256 then
           "buildGoModule: Expect vendorHash instead of vendorSha256"
@@ -250,6 +250,12 @@ lib.extendMkDerivation {
             export GOPATH="$TMPDIR/go"
             export GOPROXY=off
             export GOSUMDB=off
+            if [ -f "$NIX_CC_FOR_TARGET/nix-support/dynamic-linker" ]; then
+              export GO_LDSO=$(cat $NIX_CC_FOR_TARGET/nix-support/dynamic-linker)
+            fi
+            if [ "$CGO_ENABLED" = "0" ]; then
+              export GOFLAGS="-buildmode=exe $GOFLAGS"
+            fi
             cd "$modRoot"
           ''
           + lib.optionalString (finalAttrs.vendorHash != null) ''
@@ -266,13 +272,6 @@ lib.extendMkDerivation {
             }
           ''
           + ''
-
-            # currently pie is only enabled by default in pkgsMusl
-            # this will respect the `hardening{Disable,Enable}` flags if set
-            if [[ $NIX_HARDENING_ENABLE =~ "pie" ]]; then
-              export GOFLAGS="-buildmode=pie $GOFLAGS"
-            fi
-
             runHook postConfigure
           ''
         );
diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
index 7fabd80eec1f..d954bb010df2 100644
--- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
+++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
@@ -29,7 +29,11 @@ npmConfigHook() {
     fi
 
     local -r cacheLockfile="$npmDeps/package-lock.json"
-    local -r srcLockfile="$PWD/package-lock.json"
+    if [[ -f npm-shrinkwrap.json ]]; then
+        local -r srcLockfile="$PWD/npm-shrinkwrap.json"
+    else
+        local -r srcLockfile="$PWD/package-lock.json"
+    fi
 
     echo "Validating consistency between $srcLockfile and $cacheLockfile"
 
diff --git a/pkgs/build-support/node/fetch-npm-deps/default.nix b/pkgs/build-support/node/fetch-npm-deps/default.nix
index cac50cb7401a..1f5ea5a5f17b 100644
--- a/pkgs/build-support/node/fetch-npm-deps/default.nix
+++ b/pkgs/build-support/node/fetch-npm-deps/default.nix
@@ -12,6 +12,7 @@
   cacert,
   prefetch-npm-deps,
   fetchNpmDeps,
+  config,
 }:
 
 {
@@ -68,6 +69,7 @@
             hash,
             forceGitDeps ? false,
             forceEmptyCache ? false,
+            npmRegistryOverridesString ? "{}",
           }:
           testers.invalidateFetcherByDrvHash fetchNpmDeps {
             inherit
@@ -75,6 +77,7 @@
               hash
               forceGitDeps
               forceEmptyCache
+              npmRegistryOverridesString
               ;
 
             src = makeTestSrc { inherit name src; };
@@ -175,6 +178,23 @@
 
           hash = "sha256-FhxlJ0HdJMPiWe7+n1HaGLWOr/2HJEPwiS65uqXZM8Y=";
         };
+
+        # Test that npmRegistryOverrides work
+        npmRegistryOverrides = makeTest {
+          name = "npm-registry-overrides";
+
+          src = fetchurl {
+            url = "https://cyberchaos.dev/yuka/trainsearch/-/raw/e3cba6427e8ecfd843d0f697251ddaf5e53c2327/package-lock.json";
+            postFetch = "sed -i 's/registry.npmjs.org/broken.link/' $out";
+            hash = "sha256-Qo24ei1d9Ql4zCLjQJ04zVgS4qhBUpew9NZrhrsBds4=";
+          };
+
+          npmRegistryOverridesString = builtins.toJSON {
+            "broken.link" = "https://registry.npmjs.org";
+          };
+
+          hash = "sha256-QGObVDd9qVtf/U78+ayP6RHVWsU+HXhg70BFblQ1PZs=";
+        };
       };
 
     meta = with lib; {
@@ -192,6 +212,9 @@
       forceGitDeps ? false,
       forceEmptyCache ? false,
       nativeBuildInputs ? [ ],
+      # A string with a JSON attrset specifying registry mirrors, for example
+      #   {"registry.example.org": "my-mirror.local/registry.example.org"}
+      npmRegistryOverridesString ? config.npmRegistryOverridesString,
       ...
     }@args:
     let
@@ -243,6 +266,8 @@
         # `{ "registry.example.com": "example-registry-bearer-token", ... }`
         impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_NPM_TOKENS" ];
 
+        NIX_NPM_REGISTRY_OVERRIDES = npmRegistryOverridesString;
+
         SSL_CERT_FILE =
           if
             (
diff --git a/pkgs/build-support/node/fetch-npm-deps/src/util.rs b/pkgs/build-support/node/fetch-npm-deps/src/util.rs
index 36e2333a3e1a..835f77a2f52c 100644
--- a/pkgs/build-support/node/fetch-npm-deps/src/util.rs
+++ b/pkgs/build-support/node/fetch-npm-deps/src/util.rs
@@ -18,6 +18,22 @@ use std::{
 use url::Url;
 
 pub fn get_url(url: &Url) -> Result<Body, anyhow::Error> {
+    let url_ = url.clone();
+    let mut url = url.clone();
+    // Respect NIX_NPM_REGISTRY_OVERRIDES environment variable, which should be a JSON mapping in the shape of:
+    // `{ "registry.example.com": "my-registry.local", ... }`
+    if let Some(host) = url.host_str() {
+        if let Ok(npm_mirrors) = env::var("NIX_NPM_REGISTRY_OVERRIDES") {
+            if let Ok(mirrors) = serde_json::from_str::<Map<String, Value>>(&npm_mirrors) {
+                if let Some(mirror) = mirrors.get(host).and_then(serde_json::Value::as_str) {
+                    let mirror_url = Url::parse(mirror)?;
+                    url.set_path(&(mirror_url.path().to_owned() + url.path()));
+                    url.set_host(Some(mirror_url.host_str().expect(format!("Mirror URL without host part: {mirror_url}").as_str())))?;
+                    eprintln!("Replaced URL {url_} with {url}");
+                }
+            }
+        }
+    }
     let mut request = Request::get(url.as_str()).redirect_policy(RedirectPolicy::Limit(10));
 
     // Respect SSL_CERT_FILE if environment variable exists
diff --git a/pkgs/build-support/ocaml/oasis.nix b/pkgs/build-support/ocaml/oasis.nix
index 269a433caad4..de8b7039e84e 100644
--- a/pkgs/build-support/ocaml/oasis.nix
+++ b/pkgs/build-support/ocaml/oasis.nix
@@ -20,48 +20,47 @@
   ...
 }@args:
 
-if args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion then
-  throw "${pname}-${version} is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation (
+  args
+  // {
+    name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  stdenv.mkDerivation (
-    args
-    // {
-      name = "ocaml${ocaml.version}-${pname}-${version}";
+    nativeBuildInputs = [
+      ocaml
+      findlib
+      ocamlbuild
+      ocaml_oasis
+    ]
+    ++ nativeBuildInputs;
 
-      nativeBuildInputs = [
-        ocaml
-        findlib
-        ocamlbuild
-        ocaml_oasis
-      ]
-      ++ nativeBuildInputs;
+    inherit createFindlibDestdir;
+    inherit dontStrip;
 
-      inherit createFindlibDestdir;
-      inherit dontStrip;
+    strictDeps = true;
 
-      strictDeps = true;
+    buildPhase = ''
+      runHook preBuild
+      oasis setup
+      ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out
+      ocaml setup.ml -build
+      runHook postBuild
+    '';
 
-      buildPhase = ''
-        runHook preBuild
-        oasis setup
-        ocaml setup.ml -configure --prefix $OCAMLFIND_DESTDIR --exec-prefix $out
-        ocaml setup.ml -build
-        runHook postBuild
-      '';
+    checkPhase = ''
+      runHook preCheck
+      ocaml setup.ml -test
+      runHook postCheck
+    '';
 
-      checkPhase = ''
-        runHook preCheck
-        ocaml setup.ml -test
-        runHook postCheck
-      '';
+    installPhase = ''
+      runHook preInstall
+      mkdir -p $out
+      ocaml setup.ml -install
+      runHook postInstall
+    '';
 
-      installPhase = ''
-        runHook preInstall
-        mkdir -p $out
-        ocaml setup.ml -install
-        runHook postInstall
-      '';
-
-    }
-  )
+    meta = args.meta // {
+      broken = args ? minimumOCamlVersion && lib.versionOlder ocaml.version args.minimumOCamlVersion;
+    };
+  }
+)
diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
index 53503194cfa4..83dda99f33cd 100644
--- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
+++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
@@ -10,9 +10,9 @@ declare -g composerNoPlugins
 declare -g composerNoScripts
 
 declare -ga composerFlags=()
-[[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev)
-[[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins)
-[[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts)
+[[ -n "${composerNoDev-}" ]] && composerFlags+=(--no-dev)
+[[ -n "${composerNoPlugins-}" ]] && composerFlags+=(--no-plugins)
+[[ -n "${composerNoScripts-}" ]] && composerFlags+=(--no-scripts)
 
 preConfigureHooks+=(composerVendorConfigureHook)
 preBuildHooks+=(composerVendorBuildHook)
diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix
index 47b633da8faf..d686533f69e0 100644
--- a/pkgs/build-support/prefer-remote-fetch/default.nix
+++ b/pkgs/build-support/prefer-remote-fetch/default.nix
@@ -22,6 +22,12 @@ self: super: {
   fetchrepoproject = args: super.fetchrepoproject ({ preferLocalBuild = false; } // args);
   fetchs3 = args: super.fetchs3 ({ preferLocalBuild = false; } // args);
   fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args);
-  fetchurl = args: super.fetchurl ({ preferLocalBuild = false; } // args);
+  fetchurl =
+    fpArgs:
+    super.fetchurl (
+      super.lib.extends (finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }) (
+        super.lib.toFunction fpArgs
+      )
+    );
   mkNugetSource = args: super.mkNugetSource ({ preferLocalBuild = false; } // args);
 }
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 27afc3a117fa..2359587665b8 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -69,7 +69,7 @@ vmTools.runInLinuxImage (
           # the log file
           export PAGER=cat
           ${checkinstall}/sbin/checkinstall --nodoc -y -D \
-            --fstrans=${if fsTranslation then "yes" else "no"} \
+            --fstrans=${lib.boolToYesNo fsTranslation} \
             --requires="${lib.concatStringsSep "," debRequires}" \
             --provides="${lib.concatStringsSep "," debProvides}" \
             ${
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 208714152c56..d5c56858c6a4 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -228,7 +228,7 @@ let
 in
 rec {
 
-  tests =
+  tests = lib.recurseIntoAttrs (
     let
       cases = rec {
         libPath = {
@@ -774,6 +774,7 @@ rec {
           # On Darwin, the debug symbols are in a separate directory.
           "./bin/test_binary1.dSYM/Contents/Info.plist"
           "./bin/test_binary1.dSYM/Contents/Resources/DWARF/test_binary1"
+          "./bin/test_binary1.dSYM/Contents/Resources/Relocations/${stdenv.hostPlatform.rust.platform.arch}/test_binary1.yml"
         ];
       };
 
@@ -910,13 +911,14 @@ rec {
                 test -x '${pkg}/bin/rcgen' && touch $out
               ''
           );
-    };
+    }
+  );
   test = releaseTools.aggregate {
     name = "buildRustCrate-tests";
     meta = {
       description = "Test cases for buildRustCrate";
       maintainers = [ ];
     };
-    constituents = builtins.attrValues tests;
+    constituents = builtins.attrValues (lib.filterAttrs (_: v: lib.isDerivation v) tests);
   };
 }
diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix
index 7efbc8a9ea36..7ad39a58935c 100644
--- a/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/pkgs/build-support/rust/build-rust-package/default.nix
@@ -15,6 +15,16 @@
   windows,
 }:
 
+let
+  interpolateString =
+    s:
+    if lib.isList s then
+      lib.concatMapStringsSep " " (s: "${s}") (lib.filter (s: s != null) s)
+    else if s == null then
+      ""
+    else
+      "${s}";
+in
 lib.extendMkDerivation {
   constructDrv = stdenv.mkDerivation;
 
@@ -23,6 +33,7 @@ lib.extendMkDerivation {
     "cargoUpdateHook"
     "cargoLock"
     "useFetchCargoVendor"
+    "RUSTFLAGS"
   ];
 
   extendDrvArgs =
@@ -77,11 +88,19 @@ lib.extendMkDerivation {
     assert lib.warnIf (args ? useFetchCargoVendor)
       "buildRustPackage: `useFetchCargoVendor` is non‐optional and enabled by default as of 25.05, remove it"
       true;
+    {
+      env = {
+        PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
+        RUST_LOG = logLevel;
+        RUSTFLAGS =
+          lib.optionalString (
+            stdenv.hostPlatform.isDarwin && buildType == "debug"
+          ) "-C split-debuginfo=packed "
+          # Workaround the existing RUSTFLAGS specified as a list.
+          + interpolateString (args.RUSTFLAGS or "");
+      }
+      // args.env or { };
 
-    lib.optionalAttrs (stdenv.hostPlatform.isDarwin && buildType == "debug") {
-      RUSTFLAGS = "-C split-debuginfo=packed " + (args.RUSTFLAGS or "");
-    }
-    // {
       cargoDeps =
         if cargoVendorDir != null then
           null
@@ -143,15 +162,6 @@ lib.extendMkDerivation {
 
       patches = cargoPatches ++ patches;
 
-      PKG_CONFIG_ALLOW_CROSS = if stdenv.buildPlatform != stdenv.hostPlatform then 1 else 0;
-
-      postUnpack = ''
-        eval "$cargoDepsHook"
-
-        export RUST_LOG=${logLevel}
-      ''
-      + (args.postUnpack or "");
-
       configurePhase =
         args.configurePhase or ''
           runHook preConfigure
diff --git a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
index 1c779a6541d8..4ba6760a1a23 100644
--- a/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
+++ b/pkgs/build-support/rust/hooks/cargo-setup-hook.sh
@@ -1,6 +1,8 @@
 cargoSetupPostUnpackHook() {
     echo "Executing cargoSetupPostUnpackHook"
 
+    eval "${cargoDepsHook-}"
+
     # Some cargo builds include build hooks that modify their own vendor
     # dependencies. This copies the vendor directory into the build tree and makes
     # it writable. If we're using a tarball, the unpackFile hook already handles
diff --git a/pkgs/build-support/setup-hooks/copy-desktop-items.sh b/pkgs/build-support/setup-hooks/copy-desktop-items.sh
index 313ebc980344..6d9e8966ec81 100644
--- a/pkgs/build-support/setup-hooks/copy-desktop-items.sh
+++ b/pkgs/build-support/setup-hooks/copy-desktop-items.sh
@@ -28,8 +28,10 @@ copyDesktopItems() {
         return
     fi
 
+    concatTo desktopItemsArray desktopItems
+
     applications="${!outputBin}/share/applications"
-    for desktopItem in $desktopItems; do
+    for desktopItem in "${desktopItemsArray[@]}"; do
         if [[ -f "$desktopItem" ]]; then
             echo "Copying '$desktopItem' into '${applications}'"
             install -D -m 444 -t "${applications}" "$desktopItem"
diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index afe2af40f91a..3fc871d31203 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -75,7 +75,7 @@ let
 
     pnpmDeps = pnpm_10.fetchDeps {
       inherit src pname version;
-      fetcherVersion = 1;
+      fetcherVersion = 2;
       hash = pnpmHash;
     };
 
@@ -152,7 +152,6 @@ buildGoModule (finalAttrs: {
   patches = extPatches ++ [
     ./0001-fix-add-nix-path-to-exec-env.patch
     ./rdpclient.patch
-    ./tsh.patch
   ];
 
   # Reduce closure size for client machines
diff --git a/pkgs/build-support/teleport/tsh.patch b/pkgs/build-support/teleport/tsh.patch
deleted file mode 100644
index d35c7c99ccaa..000000000000
--- a/pkgs/build-support/teleport/tsh.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
-index 5de21c69d0..3995c19e3c 100644
---- a/tool/tsh/common/tsh.go
-+++ b/tool/tsh/common/tsh.go
-@@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
- 	}
- 
- 	var err error
--	cf.executablePath, err = os.Executable()
-+	tempBinaryPath, err := os.Executable()
- 	if err != nil {
- 		return trace.Wrap(err)
- 	}
-+	cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
- 
- 	// configs
- 	setEnvFlags(&cf)
diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index c35e03cada76..ac31c22ab4a2 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -57,6 +57,7 @@
       actual,
       expected,
       postFailureMessage ? null,
+      checkMetadata ? true,
     }:
     runCommand "equal-contents-${lib.strings.toLower assertion}"
       {
@@ -66,12 +67,13 @@
           expected
           postFailureMessage
           ;
+        excludeMetadata = if checkMetadata then "no" else "yes";
         nativeBuildInputs = [ diffoscopeMinimal ];
       }
       ''
         echo "Checking:"
         printf '%s\n' "$assertion"
-        if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata=no -- "$actual" "$expected"
+        if ! diffoscope --no-progress --text-color=always --exclude-directory-metadata="$excludeMetadata" -- "$actual" "$expected"
         then
           echo
           echo 'Contents must be equal, but were not!'
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index bd4e9209ce67..8f2110bdfa58 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -812,7 +812,13 @@ rec {
       strip ? true,
     }:
     let
-      nimCompileCmdArgs = lib.cli.toGNUCommandLineShell { optionValueSeparator = ":"; } (
+      optionFormat = optionName: {
+        option = "--${optionName}";
+        sep = ":";
+        explicitBool = false;
+      };
+
+      nimCompileCmdArgs = lib.cli.toCommandLineShell optionFormat (
         {
           d = "release";
           nimcache = ".";
diff --git a/pkgs/by-name/_1/_1fps/package.nix b/pkgs/by-name/_1/_1fps/package.nix
index 305b2f3ae821..90fef1a29cbb 100644
--- a/pkgs/by-name/_1/_1fps/package.nix
+++ b/pkgs/by-name/_1/_1fps/package.nix
@@ -4,7 +4,6 @@
   buildGoModule,
   xorg,
   stdenv,
-  apple-sdk_14,
 }:
 buildGoModule rec {
   pname = "1fps";
@@ -25,8 +24,7 @@ buildGoModule rec {
     xorg.libX11
     xorg.libXtst
     xorg.libXi
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14;
+  ];
 
   meta = {
     description = "Encrypted Screen Sharing";
diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index 203aac1dbe54..67ea511875f7 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       joelburget
       khaneliman
+      iedame
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix
index b1f68bf68035..5d16e783a215 100644
--- a/pkgs/by-name/_1/_1password-gui/package.nix
+++ b/pkgs/by-name/_1/_1password-gui/package.nix
@@ -33,9 +33,9 @@ let
     maintainers = with lib.maintainers; [
       khaneliman
       timstott
-      savannidgerinel
       sebtm
       bdd
+      iedame
     ];
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index b3e7dc491ceb..dff1ac361bb6 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,56 +1,56 @@
 {
   "stable": {
     "linux": {
-      "version": "8.11.12",
+      "version": "8.11.16",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.12.x64.tar.gz",
-          "hash": "sha256-znzmaEYOLVw6nUBk20oMdSngkO8iiSTHvM1y/t3Z55Y="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz",
+          "hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.12.arm64.tar.gz",
-          "hash": "sha256-ENuvB8GExhHWjJ97JV0qc2cIn9HqXb202dzIxu1fz2A="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz",
+          "hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE="
         }
       }
     },
     "darwin": {
-      "version": "8.11.12",
+      "version": "8.11.16",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.12-x86_64.zip",
-          "hash": "sha256-mr7DsYIEh21pHQX0cq9JlTZ4lHhkyYHCmwMaxEiK+5g="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip",
+          "hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.12-aarch64.zip",
-          "hash": "sha256-34ylS5Xq9By6nuUkEmLoi0wR5hAQx1vBhrYFq4mjSDs="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip",
+          "hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos="
         }
       }
     }
   },
   "beta": {
     "linux": {
-      "version": "8.11.14-19.BETA",
+      "version": "8.11.18-34.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-19.BETA.x64.tar.gz",
-          "hash": "sha256-b9D+1iSkXJ23ZImB2XtNL/3uA4mcHw5o0blNU2sZX4Y="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-34.BETA.x64.tar.gz",
+          "hash": "sha256-1x0FwxQ6oWGdcJ7Up9S+f423IpFAMEJ08WQnbgaesVU="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-19.BETA.arm64.tar.gz",
-          "hash": "sha256-hDrmXWPdlmyc9gtbMJ+M3tGlL6QdavrYi5vH4HF8a/Q="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-34.BETA.arm64.tar.gz",
+          "hash": "sha256-ita34logGU5zd6USi4XgOQosWooebHssyIobPZ8wlVg="
         }
       }
     },
     "darwin": {
-      "version": "8.11.14-19.BETA",
+      "version": "8.11.18-34.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-x86_64.zip",
-          "hash": "sha256-ULmPdLwFObQBM0CrEkBVgSFIEEeHtn3G0grC0WhWmbs="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-34.BETA-x86_64.zip",
+          "hash": "sha256-NONcgqasLQd9nQnEQfibcYLPagvt2VuIFUxgkTMVRxE="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-19.BETA-aarch64.zip",
-          "hash": "sha256-lK0ATvTCPrwkLkPkkTBuPo8S2g/W4q9BNdSv3fdZorM="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-34.BETA-aarch64.zip",
+          "hash": "sha256-SVPXpEFBI0mutj/J5vvb2o20za+5d/zzB7altIHADYw="
         }
       }
     }
diff --git a/pkgs/by-name/_1/_1password-gui/update-sources.py b/pkgs/by-name/_1/_1password-gui/update-sources.py
index c0e9bbb08803..bdf257cb1664 100755
--- a/pkgs/by-name/_1/_1password-gui/update-sources.py
+++ b/pkgs/by-name/_1/_1password-gui/update-sources.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python3 -p python3 gnupg
+#!nix-shell -i python3 -p python3 sequoia-sq
 import json
 import os
 import shutil
@@ -9,8 +9,7 @@ import tempfile
 from collections import OrderedDict
 
 DOWNLOADS_BASE_URL = "https://downloads.1password.com"
-OP_PGP_KEYID = "3FEF9748469ADBE15DA7CA80AC2D62742012EA22"
-
+OP_PGP_KEY_URL = "https://downloads.1password.com/linux/keys/1password.asc"
 
 class Sources(OrderedDict):
     def __init__(self):
@@ -21,43 +20,39 @@ class Sources(OrderedDict):
         with open("sources.json", "w") as fp:
             print(json.dumps(self, indent=2), file=fp)
 
-class GPG:
+
+class PGP:
     def __new__(cls):
         if not hasattr(cls, "_instance"):
             cls._instance = super().__new__(cls)
         return cls._instance
 
     def __init__(self):
-        if hasattr(self, "gnupghome"):
+        if hasattr(self, "signer_file"):
             return
 
-        self.gpg = shutil.which("gpg")
-        self.gpgv = shutil.which("gpgv")
-        self.gnupghome = tempfile.mkdtemp(prefix="1password-gui-gnupghome.")
-        self.env = {"GNUPGHOME": self.gnupghome}
-        self._run(
-            self.gpg,
-            "--no-default-keyring",
-            "--keyring",
-            "trustedkeys.kbx",
-            "--keyserver",
-            "keyserver.ubuntu.com",
-            "--receive-keys",
-            OP_PGP_KEYID,
-        )
+        self.sq = shutil.which("sq")
+        if (self.sq is None):
+            raise SystemExit(f"sequoia sq not found")
 
-    def __del__(self):
-        shutil.rmtree(self.gnupghome)
+        self.signer_file, _ = nix_store_prefetch(OP_PGP_KEY_URL)
+
+    def verify(self, sig, tarball):
+        args = [
+            self.sq,
+            "--batch",
+            "--home=none",
+            "verify",
+            f"--signer-file={self.signer_file}",
+            f"--signature-file={sig}",
+            tarball
+        ]
 
-    def _run(self, *args):
         try:
-            subprocess.run(args, env=self.env, check=True, capture_output=True)
+            subprocess.run(args, check=True, capture_output=True)
         except subprocess.CalledProcessError as cpe:
             print(cpe.stderr, file=sys.stderr)
-            raise SystemExit(f"gpg error: {cpe.cmd}")
-
-    def verify(self, sigfile, datafile):
-        return self._run(self.gpgv, sigfile, datafile)
+            raise SystemExit(f"sq error: {cpe.cmd}")
 
 
 def nix_store_prefetch(url):
@@ -89,7 +84,7 @@ def download(channel, os, version, arch):
     # Linux release tarballs come with detached PGP signatures.
     if os == "linux":
         store_path_sig, _ = nix_store_prefetch(url + ".sig")
-        GPG().verify(store_path_sig, store_path_tarball)
+        PGP().verify(store_path_sig, store_path_tarball)
 
     return url, hash
 
diff --git a/pkgs/by-name/_2/_2ship2harkinian/package.nix b/pkgs/by-name/_2/_2ship2harkinian/package.nix
index 628c25666d95..ae11ddc63bb3 100644
--- a/pkgs/by-name/_2/_2ship2harkinian/package.nix
+++ b/pkgs/by-name/_2/_2ship2harkinian/package.nix
@@ -150,9 +150,6 @@ stdenv.mkDerivation (finalAttrs: {
   # Linking fails without this
   hardeningDisable = [ "format" ];
 
-  # Pie needs to be enabled or else it segfaults
-  hardeningEnable = [ "pie" ];
-
   preConfigure = ''
     # mirror 2ship's stb
     mkdir stb
diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/by-name/_3/_3llo/Gemfile
similarity index 100%
rename from pkgs/tools/misc/3llo/Gemfile
rename to pkgs/by-name/_3/_3llo/Gemfile
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/by-name/_3/_3llo/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/3llo/Gemfile.lock
rename to pkgs/by-name/_3/_3llo/Gemfile.lock
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/by-name/_3/_3llo/gemset.nix
similarity index 100%
rename from pkgs/tools/misc/3llo/gemset.nix
rename to pkgs/by-name/_3/_3llo/gemset.nix
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/by-name/_3/_3llo/package.nix
similarity index 74%
rename from pkgs/tools/misc/3llo/default.nix
rename to pkgs/by-name/_3/_3llo/package.nix
index 45c1e633d050..42ea5c65b4b7 100644
--- a/pkgs/tools/misc/3llo/default.nix
+++ b/pkgs/by-name/_3/_3llo/package.nix
@@ -1,4 +1,7 @@
-{ lib, bundlerApp }:
+{
+  lib,
+  bundlerApp,
+}:
 
 bundlerApp {
   pname = "3llo";
@@ -7,9 +10,9 @@ bundlerApp {
 
   exes = [ "3llo" ];
 
-  meta = with lib; {
+  meta = {
     description = "Trello interactive CLI on terminal";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/qcam/3llo";
     maintainers = [ ];
   };
diff --git a/pkgs/by-name/64/64tass/package.nix b/pkgs/by-name/_6/_64tass/package.nix
similarity index 100%
rename from pkgs/by-name/64/64tass/package.nix
rename to pkgs/by-name/_6/_64tass/package.nix
diff --git a/pkgs/by-name/_8/_86Box/package.nix b/pkgs/by-name/_8/_86Box/package.nix
index ba0c7f5e5871..00d56eba252d 100644
--- a/pkgs/by-name/_8/_86Box/package.nix
+++ b/pkgs/by-name/_8/_86Box/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "86Box";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchFromGitHub {
     owner = "86Box";
     repo = "86Box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EkKqDkVK0QpGC/1F5DDHzlD05/JVnMZ6rSLuT2OPoHo=";
+    hash = "sha256-JcKLtREGSNA0IOGM5kqFjAya155KeYV/nqynG4dVv4w=";
   };
 
   patches = [ ./darwin.patch ];
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
       owner = "86Box";
       repo = "roms";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-ek/TbQJfrYXmpAmYeL8uSehsKxh1oDil7ebW4oFr7Cs=";
+      hash = "sha256-DmOxQ+E7bHF5St70YqPbIzMoADS8dtp2nDXvrhcAVw4=";
     };
     updateScript = ./update.sh;
   };
diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix
index 916bfe05d6a8..1d5b56aba11d 100644
--- a/pkgs/by-name/_9/_9menu/package.nix
+++ b/pkgs/by-name/_9/_9menu/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   pkg-config,
   meson,
   ninja,
@@ -9,15 +10,15 @@
   libXext,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "9menu";
-  version = "unstable-2021-02-24";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner = "arnoldrobbins";
     repo = "9menu";
-    rev = "00cbf99c48dc580ca28f81ed66c89a98b7a182c8";
-    sha256 = "arca8Gbr4ytiCk43cifmNj7SUrDgn1XB26zAhZrVDs0=";
+    tag = "9menu-release-${finalAttrs.version}";
+    hash = "sha256-J0vHArLH8WDCOvbbF4TYd9b75+5UkhnVdhbbeiUJ4SM=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +31,13 @@ stdenv.mkDerivation {
     libXext
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "9menu-release-([0-9.]+)"
+    ];
+  };
+
   meta = {
     homepage = "https://github.com/arnoldrobbins/9menu";
     description = "Simple X11 menu program for running commands";
@@ -38,4 +46,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     platforms = libX11.meta.platforms;
   };
-}
+})
diff --git a/pkgs/by-name/aa/aaaaxy/package.nix b/pkgs/by-name/aa/aaaaxy/package.nix
index 48b64b136123..fdde52c8e985 100644
--- a/pkgs/by-name/aa/aaaaxy/package.nix
+++ b/pkgs/by-name/aa/aaaaxy/package.nix
@@ -22,17 +22,17 @@
 
 buildGoModule rec {
   pname = "aaaaxy";
-  version = "1.6.288";
+  version = "1.6.301";
 
   src = fetchFromGitHub {
     owner = "divVerent";
     repo = "aaaaxy";
     tag = "v${version}";
-    hash = "sha256-8oWrQCj1B7o2kw0mbg9ynXpu/r85uqa+2UxRH44G8ZQ=";
+    hash = "sha256-MWJ1k7Ps9jZa+AVNrvqRGMr3Mb0jd54NxGGylDI8VXo=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-g37+5IquBaRMGw48V/pCsJaeKlGR5a2Hj3NFcrolQ7g=";
+  vendorHash = "sha256-2tx+Uba2x2jYiEUUiHkr2nTp0BB6BgiAdW7UgRBQqSU=";
 
   buildInputs = [
     alsa-lib
diff --git a/pkgs/by-name/ab/abbreviate/package.nix b/pkgs/by-name/ab/abbreviate/package.nix
index 779f6bb0cde9..cb9c397c1db4 100644
--- a/pkgs/by-name/ab/abbreviate/package.nix
+++ b/pkgs/by-name/ab/abbreviate/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/dnnrly/abbreviate";
     changelog = "https://github.com/dnnrly/abbreviate/releases/tag/${src.rev}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index e69274fb39b5..da69e5021756 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     tag = "v${version}";
-    hash = "sha256-cx5Kq5V0XTUJdqEDI0iDICIygbYkGu8JwdCACNLMgtY=";
+    hash = "sha256-QR3wc+eltIpmdNpyzQqJd4Zo40JVlTzRBNSr11tE0X8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ab/abseil-cpp/package.nix b/pkgs/by-name/ab/abseil-cpp/package.nix
index 8fee318a4947..a264041af441 100644
--- a/pkgs/by-name/ab/abseil-cpp/package.nix
+++ b/pkgs/by-name/ab/abseil-cpp/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abseil-cpp";
-  version = "20250814.0";
+  version = "20250814.1";
 
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
     tag = finalAttrs.version;
-    hash = "sha256-6Ro7miql9+wcArsOKTjlyDSyD91rmmPsIfO5auk9kiI=";
+    hash = "sha256-SCQDORhmJmTb0CYm15zjEa7dkwc+lpW2s1d4DsMRovI=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ac/actiona/package.nix b/pkgs/by-name/ac/actiona/package.nix
index 0e022282ced7..b1c68d2a4c00 100644
--- a/pkgs/by-name/ac/actiona/package.nix
+++ b/pkgs/by-name/ac/actiona/package.nix
@@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bluez
     libnotify
-    opencv
+    # NOTE: Specifically not using lib.getOutput here because it would select the out output of opencv, which changes
+    # semantics since make-derivation uses lib.getDev on the dependency arrays, which won't touch derivations with
+    # specified outputs.
+    (opencv.cxxdev or opencv)
     qt6.qtbase
     qt6.qtmultimedia
     qt6.qttools
diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix
index 72cda1076f42..ff6a634f47b4 100644
--- a/pkgs/by-name/ac/actionlint/package.nix
+++ b/pkgs/by-name/ac/actionlint/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "actionlint";
-  version = "1.7.7";
+  version = "1.7.8";
 
   subPackages = [ "cmd/actionlint" ];
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "rhysd";
     repo = "actionlint";
     tag = "v${version}";
-    hash = "sha256-dmd6AWL96sG+Cb+CVtCUhaStfsx8qRnvpcB2OjfLenU=";
+    hash = "sha256-0bUWsEBfIZdl+wPt4nysZ5SbSz8AaRg1WutqMxCqdfk=";
   };
 
-  vendorHash = "sha256-4SkhMRDXHKYxKK3POqtti/esj2cqx0Dl92q/qzzaqH0=";
+  vendorHash = "sha256-JWdVcX1wAituPb0N4Sg6tM9gsygEPFUblBPH2YcpBvE=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix
index 56ba6f4e4915..66d78633c3ed 100644
--- a/pkgs/by-name/ac/activemq/package.nix
+++ b/pkgs/by-name/ac/activemq/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "6.1.7";
+  version = "6.1.8";
 in
 stdenvNoCC.mkDerivation {
   pname = "activemq";
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchurl {
     url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
-    hash = "sha256-dcxBEJqJd0XUSsonNYVo88vgzVj8a7/wNag8Td9I0xY=";
+    hash = "sha256-BCrdMR698xAsl+8nY8DpwdZZH6LH2C5FBNZ2sRUmtBk=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index 7f641a452ad0..5f955f2f4b48 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "3.2.7";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${version}";
-    hash = "sha256-IDJgrjmIqhnIZuzBAckowpmhRypb1a1NB1P5YZz4E1A=";
+    hash = "sha256-MzQ8Tefwct4/LlTWA8BpnnHMSzWmKvnf0OO5exAzIfI=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ad/adaptivecpp/package.nix b/pkgs/by-name/ad/adaptivecpp/package.nix
index a59389109be1..3c17cb88edbf 100644
--- a/pkgs/by-name/ad/adaptivecpp/package.nix
+++ b/pkgs/by-name/ad/adaptivecpp/package.nix
@@ -10,7 +10,7 @@
   makeWrapper,
   config,
   cudaPackages,
-  rocmPackages_6,
+  rocmPackages,
   ompSupport ? true,
   openclSupport ? false,
   rocmSupport ? config.rocmSupport,
@@ -23,7 +23,6 @@
 }:
 let
   inherit (llvmPackages) stdenv;
-  rocmPackages = rocmPackages_6;
   llvmPackages = llvmPackages_18;
 in
 stdenv.mkDerivation (finalAttrs: {
diff --git a/pkgs/by-name/ad/adjustor/package.nix b/pkgs/by-name/ad/adjustor/package.nix
new file mode 100644
index 000000000000..74bb9d0916f4
--- /dev/null
+++ b/pkgs/by-name/ad/adjustor/package.nix
@@ -0,0 +1,55 @@
+{
+  fetchFromGitHub,
+  lib,
+  python3Packages,
+  # Dependencies
+  kmod,
+  util-linux,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "adjustor";
+  version = "3.11.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hhd-dev";
+    repo = "adjustor";
+    tag = "v${version}";
+    hash = "sha256-BS0zV8nan61fTUs3v6nmGBuqPEDjATxBG792ZrrreAI=";
+  };
+
+  # This package relies on several programs expected to be on the user's PATH.
+  # We take a more reproducible approach by patching the absolute path to each of these required
+  # binaries.
+  postPatch = ''
+    substituteInPlace src/adjustor/core/acpi.py \
+      --replace-fail '"modprobe"' '"${lib.getExe' kmod "modprobe"}"'
+    substituteInPlace src/adjustor/fuse/utils.py \
+      --replace-fail 'f"mount' 'f"${lib.getExe' util-linux "mount"}'
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    rich
+    pyroute2
+    fuse
+    pygobject3
+    dbus-python
+    kmod
+  ];
+
+  # This package doesn't have upstream tests.
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/hhd-dev/adjustor/";
+    description = "Adjustor TDP plugin for Handheld Daemon";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.toast ];
+    mainProgram = "hhd";
+  };
+}
diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix
index 6ee9594edb57..0b31e2d5449b 100644
--- a/pkgs/by-name/ad/adminer/package.nix
+++ b/pkgs/by-name/ad/adminer/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "adminer";
-  version = "5.4.0";
+  version = "5.4.1";
 
   # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
   src = fetchurl {
     url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip";
-    hash = "sha256-n6bmvUIrIiOaNCPEA5L+frbesnircbm0mTqmWxYRpwM=";
+    hash = "sha256-+Ki46mR+E82F/spU0DBM7kWelY3zA9bdFad44HeZ5Lo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix
index 962d9c4ecb07..33cf4825cb9e 100644
--- a/pkgs/by-name/ad/adminneo/package.nix
+++ b/pkgs/by-name/ad/adminneo/package.nix
@@ -8,29 +8,22 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adminneo";
-  version = "5.1.1";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "adminneo-org";
     repo = "adminneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ckz0LvKLY6xm3thPmY/ry8G5kkt29rmDsG/D6NNeRoY=";
+    hash = "sha256-x92APmqRbH9XxMJjQASwHAgD0SWTK63MMYwkbiEq7U8=";
   };
 
   nativeBuildInputs = [
     php
   ];
 
-  # Package provides a Makefile, which is currently broken
-  # https://github.com/adminneo-org/adminneo/issues/161
-  # As soon, as this is fixed, the buildPhase can be removed
-  buildPhase = ''
-    runHook preBuild
-
-    ${php}/bin/php bin/compile.php
-
-    runHook postBuild
-  '';
+  makeFlags = [
+    "PHP=${php}/bin/php"
+  ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ad/adwaita-fonts/package.nix b/pkgs/by-name/ad/adwaita-fonts/package.nix
index b47d77a85334..1512f1b9ba5f 100644
--- a/pkgs/by-name/ad/adwaita-fonts/package.nix
+++ b/pkgs/by-name/ad/adwaita-fonts/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adwaita-fonts";
-  version = "48.2";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-fonts/${lib.versions.major finalAttrs.version}/adwaita-fonts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FW9+kvL4LlJ/xzwwnbsjfApKXDqVvF7pSl77aUfFU+A=";
+    hash = "sha256-MVfGIOtbcrJasVbRlKpOsiP5hw1Uf+g/298G0+e+yzc=";
   };
 
   nativeBuildInputs = [
@@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   meta = {
     description = "Adwaita Sans, a variation of Inter, and Adwaita Mono, Iosevka customized to match Inter";
     homepage = "https://gitlab.gnome.org/GNOME/adwaita-fonts";
-    license = lib.licenses.gpl3Plus;
+    license = lib.licenses.ofl;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.qxrein ];
     teams = [ lib.teams.gnome ];
diff --git a/pkgs/by-name/ad/adwaita-icon-theme/package.nix b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
index c4fe4a7e27ae..77383abe1725 100644
--- a/pkgs/by-name/ad/adwaita-icon-theme/package.nix
+++ b/pkgs/by-name/ad/adwaita-icon-theme/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "adwaita-icon-theme";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/adwaita-icon-theme/${lib.versions.major version}/adwaita-icon-theme-${version}.tar.xz";
-    hash = "sha256-hHBoiIZQ2WcxFb5tvyv9wxpGrrxSimqdtEIOYOZWuNQ=";
+    hash = "sha256-ZRZkYdGyeKqUL1mqjQ/M8RCNccZfNyxiZuFyRJeRdVw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index 878962a650ec..2c0e7597bbd1 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -11,6 +11,7 @@
   dante,
   gawk,
   versionCheckHook,
+  bashNonInteractive,
   nix-update-script,
 }:
 
@@ -52,6 +53,7 @@ buildGoModule (finalAttrs: {
   buildInputs = [
     python3Packages.python
     gawk
+    bashNonInteractive
   ]
   ++ lib.optional withNotmuch notmuch;
 
@@ -73,14 +75,6 @@ buildGoModule (finalAttrs: {
           dante
         ]
       }
-    wrapProgram $out/libexec/aerc/filters/html-unsafe \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          w3m
-          dante
-        ]
-      }
-    patchShebangs $out/libexec/aerc/filters
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/ae/aeron/package.nix b/pkgs/by-name/ae/aeron/package.nix
index e24a4db1c012..c8234842d170 100644
--- a/pkgs/by-name/ae/aeron/package.nix
+++ b/pkgs/by-name/ae/aeron/package.nix
@@ -8,49 +8,483 @@
 
 let
   pname = "aeron";
-  version = "1.44.1";
+  version = "1.49.0";
   groupId = "io.aeron";
 
-  aeronAll_1_40_0 = fetchMavenArtifact {
-    inherit groupId;
-    version = "1.40.0";
-    artifactId = "aeron-all";
-    hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA==";
-  };
-
-  aeronSamples_1_40_0 = fetchMavenArtifact {
-    inherit groupId;
-    version = "1.40.0";
-    artifactId = "aeron-samples";
-    hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg==";
-  };
-
-  aeronAll_1_42_1 = fetchMavenArtifact {
+  aeronAll_1_49_0 = fetchMavenArtifact {
     inherit groupId;
     artifactId = "aeron-all";
-    version = "1.42.1";
-    hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA==";
+    version = "1.49.0";
+    hash = "sha256-n3qoLs+iYzrb95skr29DrpQPHsWBZL6IygnayNJ1s6Q=";
   };
 
-  aeronSamples_1_42_1 = fetchMavenArtifact {
+  aeronSamples_1_49_0 = fetchMavenArtifact {
     inherit groupId;
-    version = "1.42.1";
+    version = "1.49.0";
     artifactId = "aeron-samples";
-    hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg==";
+    hash = "sha256-ePhAUBebeZP5exfBOGpUTTntAeZIdsolPuyhpbv0GVo=";
   };
 
-  aeronAll_1_43_0 = fetchMavenArtifact {
+  aeronAll_1_48_6 = fetchMavenArtifact {
     inherit groupId;
     artifactId = "aeron-all";
-    version = "1.43.0";
-    hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q==";
+    version = "1.48.6";
+    hash = "sha256-IWURDka8Qudit1nN/aHi4DHOAxpj++/1iSAbI5QNaBg=";
   };
 
-  aeronSamples_1_43_0 = fetchMavenArtifact {
+  aeronSamples_1_48_6 = fetchMavenArtifact {
     inherit groupId;
-    version = "1.43.0";
+    version = "1.48.6";
     artifactId = "aeron-samples";
-    hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg==";
+    hash = "sha256-L5DFzZSfBRSGZOxDkfX1CTYyRNawd8tJLQaLZzYQTew=";
+  };
+
+  aeronAll_1_48_5 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.48.5";
+    hash = "sha256-yPLTh8bYBRwG0y5Tc+Z9TSSoYZSe55RQOb22LbBL804=";
+  };
+
+  aeronSamples_1_48_5 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.48.5";
+    artifactId = "aeron-samples";
+    hash = "sha256-poxiGXdA2SWJQ1oFe8kh2q5T5GOytrxcAhkNv5k64Qo=";
+  };
+
+  aeronAll_1_48_4 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.48.4";
+    hash = "sha256-6a8rgdNPkbYqo8N/7tSS4LxDF1j0s4JvDlYNSUSgrog=";
+  };
+
+  aeronSamples_1_48_4 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.48.4";
+    artifactId = "aeron-samples";
+    hash = "sha256-nB5YqF+jd2C8f++1pH36aZNtuscfP5ZMKx/6W3iiz4I=";
+  };
+
+  aeronAll_1_48_3 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.48.3";
+    hash = "sha256-VEyowi5J7mJWQ+Xj8dO7iL2cHLkeEzcJZkk5yyuDeuU=";
+  };
+
+  aeronSamples_1_48_3 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.48.3";
+    artifactId = "aeron-samples";
+    hash = "sha256-/E7fF8Np8D3/DYHYLeRjLPkP3AQJ5kTYvZRsQmyUBzk=";
+  };
+
+  aeronAll_1_48_2 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.48.2";
+    hash = "sha256-PQFlitiG43NO8zx/JfXiu7R5x/cYU/o5/x9U4/CioEw=";
+  };
+
+  aeronSamples_1_48_2 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.48.2";
+    artifactId = "aeron-samples";
+    hash = "sha256-nQ4kv/nQV0zkDgCL716AtRzEK/FDenHZMFNOhgVkd3s=";
+  };
+
+  aeronAll_1_48_1 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.48.1";
+    hash = "sha256-ZRf4YZLxF1O6GhWpCFS/PJqIHyti3dHCXPoxuuiJEz0=";
+  };
+
+  aeronSamples_1_48_1 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.48.1";
+    artifactId = "aeron-samples";
+    hash = "sha256-wtCOtwtp6hQUm7SfCV5yP4bwxufs8kRgA4V9/LRoAls=";
+  };
+
+  aeronAll_1_48_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.48.0";
+    hash = "sha256-eUc9tdR6iOGivovzX00VxLuHvEcXMFKxs2oJqug+ayA=";
+  };
+
+  aeronSamples_1_48_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.48.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-31WO354XNsR2sZNPoh9kCNfSTz/ZM44IoRnmsx1iwMU=";
+  };
+
+  aeronAll_1_47_7 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.7";
+    hash = "sha256-8j2nKjAjZ3tpGbCPtQ3opGL4y3vVR2kC5Wh8xQvVG8Q=";
+  };
+
+  aeronSamples_1_47_7 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.7";
+    artifactId = "aeron-samples";
+    hash = "sha256-zKan26LpNFOAst78qN0S9tmG59oKKowVphCYKfMu1lg=";
+  };
+
+  aeronAll_1_47_5 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.5";
+    hash = "sha256-Hi7I/N+L4l05rNjfqPf4fUEFOAzt8FWx5T9UDAdVOLI=";
+  };
+
+  aeronSamples_1_47_5 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.5";
+    artifactId = "aeron-samples";
+    hash = "sha256-VFFfZKosTfMx1/C8qgSZNpYGP9oqN2y+rcbyTNH7vYE=";
+  };
+
+  aeronAll_1_47_4 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.4";
+    hash = "sha256-PHc3vcRYI1rIJanrNyz7wCFE9znzPZMprPGO+oO8Tgc=";
+  };
+
+  aeronSamples_1_47_4 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.4";
+    artifactId = "aeron-samples";
+    hash = "sha256-z/FubK2sIDm8KtlaNwrO1nTlZrw+PC9tjGoiWbe7wBE=";
+  };
+
+  aeronAll_1_47_3 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.3";
+    hash = "sha256-K5pVvHY0jltueoEjTv8tr9z/EtTwkhLjgE9Qw+mtN50=";
+  };
+
+  aeronSamples_1_47_3 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.3";
+    artifactId = "aeron-samples";
+    hash = "sha256-6HU7ykfDXlrQCdB5hYjZsQV+s0yFybXKqN8QHkEqSrw=";
+  };
+
+  aeronAll_1_47_2 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.2";
+    hash = "sha256-qQAp3YcuIoxIJKgxoZ1ahNGRjS+b+Vr6PicN3S4xYUw=";
+  };
+
+  aeronSamples_1_47_2 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.2";
+    artifactId = "aeron-samples";
+    hash = "sha256-GVmAxQQZrfixMqylDh/TNXJk4cF0Z1Tg/iTaeohRrdw=";
+  };
+
+  aeronAll_1_47_1 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.1";
+    hash = "sha256-QoKJxdkrZ8P7JwCFUGZ1lukG/Q4MgwksAp1R5RdVea0=";
+  };
+
+  aeronSamples_1_47_1 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.1";
+    artifactId = "aeron-samples";
+    hash = "sha256-FPkDrp0vyStm62Kf+F160KTXhNu5CdaQaB48uJkNC78=";
+  };
+
+  aeronAll_1_47_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.47.0";
+    hash = "sha256-CfWsJBpk637o+CKkvpAMS+muEY/8tCh4SkEML8kYY1k=";
+  };
+
+  aeronSamples_1_47_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.47.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-QVlBif/EmzFTB3XPLWXRdZME46Ipky+O300AH+kd9+M=";
+  };
+
+  aeronAll_1_46_9 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.9";
+    hash = "sha256-HlIZfQHb3lKE773cE3bWZfAmkUkHD9qhUqHwlPLSvrw=";
+  };
+
+  aeronSamples_1_46_9 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.9";
+    artifactId = "aeron-samples";
+    hash = "sha256-o1PcXx8/z+rDHzTP/zSK2LjLM1TRmqSxW/KtCNBzsuc=";
+  };
+
+  aeronAll_1_46_8 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.8";
+    hash = "sha256-+Y6kz+rvnzw4Q/K00Y1us3XQAkHpUSoe1nAS9yS6U4I=";
+  };
+
+  aeronSamples_1_46_8 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.8";
+    artifactId = "aeron-samples";
+    hash = "sha256-7kT+Ueg9RxrjKmLSfuUMpqbhUkGwGq0P3fpw2J1ruyg=";
+  };
+
+  aeronAll_1_46_7 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.7";
+    hash = "sha256-3tLtPFtzmR4xxDmnViopTl1VZvlVw6noEImiimtbnVU=";
+  };
+
+  aeronSamples_1_46_7 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.7";
+    artifactId = "aeron-samples";
+    hash = "sha256-XaG8r2a2xXRUqdgK491KOSlptSu7dM3vzEHAh91aBqI=";
+  };
+
+  aeronAll_1_46_6 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.6";
+    hash = "sha256-PMcXyzpjBkBC4qnb76D+22qPdgs7mhagZDWvGt9CXwk=";
+  };
+
+  aeronSamples_1_46_6 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.6";
+    artifactId = "aeron-samples";
+    hash = "sha256-JBf5531tiRY8w1lSPfic2TnepNln6CJ3PC9S56Fi68Q=";
+  };
+
+  aeronAll_1_46_5 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.5";
+    hash = "sha256-ozFVbbNqqYb+giORCtTkNBcn06F0Lfu12Eyd5r/E370=";
+  };
+
+  aeronSamples_1_46_5 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.5";
+    artifactId = "aeron-samples";
+    hash = "sha256-0U/Ye9VcCeCtpBdBE7JUaEHe4wsE+yoa+ndLPVJiuBs=";
+  };
+
+  aeronAll_1_46_4 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.4";
+    hash = "sha256-9TMGUZ9NUYMXihSFElifeqpJc0Sz7ks9NOcvjUSofaM=";
+  };
+
+  aeronSamples_1_46_4 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.4";
+    artifactId = "aeron-samples";
+    hash = "sha256-qo+HRhsdK/LLpAcZz4M4gxlngnokYIaJc1F/KMX8sDQ=";
+  };
+
+  aeronAll_1_46_3 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.3";
+    hash = "sha256-lToJIeTM84rAA/oiNqRNdYs5Ropfuw9WJ08Nb0m87MQ=";
+  };
+
+  aeronSamples_1_46_3 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.3";
+    artifactId = "aeron-samples";
+    hash = "sha256-MRNGUCOW3w7gctNLsle39Zus89RBS1ukc34o4pzHOnU=";
+  };
+
+  aeronAll_1_46_2 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.2";
+    hash = "sha256-2iwmx1X1gbjUabRyCR6Ek6iuDKhtvgEonwBdbF0h3MY=";
+  };
+
+  aeronSamples_1_46_2 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.2";
+    artifactId = "aeron-samples";
+    hash = "sha256-jv8tWpuuRnCQSlGGtd9ger562IF/5x0wSEtrlM1s1Ks=";
+  };
+
+  aeronAll_1_46_1 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.1";
+    hash = "sha256-KH2mt64ewpdwLOM7q95l0j3ftLOCu3uICcaVUXe/vyY=";
+  };
+
+  aeronSamples_1_46_1 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.1";
+    artifactId = "aeron-samples";
+    hash = "sha256-IF9dRX/EUUF8An/baMxb9iEXq/wZlvvgdzKIk2c8+aA=";
+  };
+
+  aeronAll_1_46_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.46.0";
+    hash = "sha256-ngFeYSDJxxqxawtGrALZrsjRO9WlPdnhdO9NuZKhPr8=";
+  };
+
+  aeronSamples_1_46_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.46.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-arnWZD5znkrnn4usKG2R3gdUXljYKvoibFQ0b466iks=";
+  };
+
+  aeronAll_1_45_2 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.45.2";
+    hash = "sha256-m1FJwC+1ZZlCPTU9KksLq7ozP3X1v7/kZaCb/vFwveQ=";
+  };
+
+  aeronSamples_1_45_2 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.45.2";
+    artifactId = "aeron-samples";
+    hash = "sha256-RB51I7WjV19pT7FCUH9FVrcbt64vjPIjMjRxgLIzEjw=";
+  };
+
+  aeronAll_1_45_1 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.45.1";
+    hash = "sha256-cD50jk95OAcdPKJuc45t1O6WVRgM2j1gMZ5IudbL4U8=";
+  };
+
+  aeronSamples_1_45_1 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.45.1";
+    artifactId = "aeron-samples";
+    hash = "sha256-QSC5Yp35eJjUHByShdQWDP14jW1Y3pL3osLDGLsxsqg=";
+  };
+
+  aeronAll_1_45_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.45.0";
+    hash = "sha256-gImfORn61k1fVyqPfr5Uk2Hu5yPfnShCXIUB3qSuFnI=";
+  };
+
+  aeronSamples_1_45_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.45.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-7o37/YzQHTBguTlpoIXFa8JNFtyG7zKKnVdijIqAeDY=";
+  };
+
+  aeronAll_1_44_7 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.7";
+    hash = "sha256-ZbM17fXbCZQWYjE1QG6MO506sMqth9ukD1an3RbxypA=";
+  };
+
+  aeronSamples_1_44_7 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.7";
+    artifactId = "aeron-samples";
+    hash = "sha256-vBtx5bN4JtOhvQwoHAof1Y7uLPiadQCNscw5eiaYDec=";
+  };
+
+  aeronAll_1_44_6 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.6";
+    hash = "sha256-FJSPOvjXgcuqQQn8VuXz87sj4qfN7Ayt0CHg6CE2uHA=";
+  };
+
+  aeronSamples_1_44_6 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.6";
+    artifactId = "aeron-samples";
+    hash = "sha256-9NKudRW06/Q7xg/tDaVixBy1J0Pv3Y6FGOq0oG/IXO0=";
+  };
+
+  aeronAll_1_44_5 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.5";
+    hash = "sha256-s9Jo2sU4obp6OrfLZjJvRlXYpyg3gsVnYH5xNQSjQSQ=";
+  };
+
+  aeronSamples_1_44_5 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.5";
+    artifactId = "aeron-samples";
+    hash = "sha256-hvRBaMoEM2KTHDXLruRnrUMi7VQH8QdDr79y1pLk/PA=";
+  };
+
+  aeronAll_1_44_4 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.4";
+    hash = "sha256-CfoB7zJ4ZWZXOvy7fZoCg5zCiHI+6CTxLd7UgWslC5I=";
+  };
+
+  aeronSamples_1_44_4 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.4";
+    artifactId = "aeron-samples";
+    hash = "sha256-ZGkYlQCV60R1Ua3ecqBkCD3CN2r+/opx1oI1lKsqC7w=";
+  };
+
+  aeronAll_1_44_3 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.3";
+    hash = "sha256-uqjLQUE6IEvGMwZqUOocL0NfK+dPIaQAJTAILIK6Kao=";
+  };
+
+  aeronSamples_1_44_3 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.3";
+    artifactId = "aeron-samples";
+    hash = "sha256-EfkhMx4iQIDqk3jnVf1oEvb21sN9GyLwJJjok619YW0=";
+  };
+
+  aeronAll_1_44_2 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.2";
+    hash = "sha256-C3xr8OeVVpnmE70j+5meawWg+56/FhIBqQm9BTwbOj4=";
+  };
+
+  aeronSamples_1_44_2 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.2";
+    artifactId = "aeron-samples";
+    hash = "sha256-laY1xdgaBwwCVdAUrJtrFW2rduguRdcpTaglcWa0jB0=";
   };
 
   aeronAll_1_44_1 = fetchMavenArtifact {
@@ -67,8 +501,176 @@ let
     hash = "sha256-ZSuTed45BRzr4JJuGeXghUgEifv/FpnCzTNJWa+nwjo=";
   };
 
-  aeronAll = aeronAll_1_44_1;
-  aeronSamples = aeronSamples_1_44_1;
+  aeronAll_1_44_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.44.0";
+    hash = "sha256-j7WXJaIQZPKOTLmZg+nGxLUowYAuZYj062pmxS0ycnk=";
+  };
+
+  aeronSamples_1_44_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.44.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-DXsYKnFvQT2BRGZyLXIfLBxglZMFRKBG3VDXD0UITLU=";
+  };
+
+  aeronAll_1_43_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.43.0";
+    hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q==";
+  };
+
+  aeronSamples_1_43_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.43.0";
+    artifactId = "aeron-samples";
+    hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg==";
+  };
+
+  aeronAll_1_42_1 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.42.1";
+    hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA==";
+  };
+
+  aeronSamples_1_42_1 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.42.1";
+    artifactId = "aeron-samples";
+    hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg==";
+  };
+
+  aeronAll_1_42_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.42.0";
+    hash = "sha256-rcUKHUh2rsBvO8kn2x+wYFRuM9XV21hINwFG7ej6uyw=";
+  };
+
+  aeronSamples_1_42_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.42.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-dmLEuEcgUuoEBEM0zW+c+0o6oOpIk+5FCzZgP5j1jXk=";
+  };
+
+  aeronAll_1_41_6 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.6";
+    hash = "sha256-YUfQ98lGEeGjl1LB12tP9fON+KycMUJFI7ntqsYa3O8=";
+  };
+
+  aeronSamples_1_41_6 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.6";
+    artifactId = "aeron-samples";
+    hash = "sha256-vaO2meykLq5aK6Y0DINcVCq920Qns8GCFu18CavCvis=";
+  };
+
+  aeronAll_1_41_5 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.5";
+    hash = "sha256-+yYOBwRsWgAtmDplB9dltU76wTX650KharSkMjWlG6M=";
+  };
+
+  aeronSamples_1_41_5 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.5";
+    artifactId = "aeron-samples";
+    hash = "sha256-1RHFDMtaAJHKNdz32Aeo6YplvoMDJerQRi10NUyp/OI=";
+  };
+
+  aeronAll_1_41_4 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.4";
+    hash = "sha256-Z06nAaCO1LU6ChNm4YnipuUNgusY7iY6WhV8AeBPRoE=";
+  };
+
+  aeronSamples_1_41_4 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.4";
+    artifactId = "aeron-samples";
+    hash = "sha256-9gyKDu7R/Q8HtkCR5D1ohZnVa1jIOv5Z0lgOcRIumCw=";
+  };
+
+  aeronAll_1_41_3 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.3";
+    hash = "sha256-aQ+oZ6oqi853fZfwRcGpgRsuEAfP7AJsu5C0pfwxlzU=";
+  };
+
+  aeronSamples_1_41_3 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.3";
+    artifactId = "aeron-samples";
+    hash = "sha256-FTiz5IrPoE1zWNjAym4ynjvny0p8uP7QzizK1jCJKgM=";
+  };
+
+  aeronAll_1_41_2 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.2";
+    hash = "sha256-0XSoKbFnhEwOlx0+9cJj/Qf6XAUjtskun9BwIq/WxW8=";
+  };
+
+  aeronSamples_1_41_2 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.2";
+    artifactId = "aeron-samples";
+    hash = "sha256-7ht2Jklvx3cfk2PopRjUVDQ0Uo+5M5262SI91ItS9Ow=";
+  };
+
+  aeronAll_1_41_1 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.1";
+    hash = "sha256-/JufYICrSefm9nGlVcfQHcUkYMnzrZcNDjB8fAfSKGE=";
+  };
+
+  aeronSamples_1_41_1 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.1";
+    artifactId = "aeron-samples";
+    hash = "sha256-6/o1t6/ehYYhMqU6pYQ0uScZhsZTuowr0uwJ3TbmtHk=";
+  };
+
+  aeronAll_1_41_0 = fetchMavenArtifact {
+    inherit groupId;
+    artifactId = "aeron-all";
+    version = "1.41.0";
+    hash = "sha256-g2dFf+htF72ByJCcjKuHtLuehLtjjjpqjvWq1rTkmYg=";
+  };
+
+  aeronSamples_1_41_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.41.0";
+    artifactId = "aeron-samples";
+    hash = "sha256-nUX9JM0p06m0XyH4ugPXQ0+Fc9ydmhJlaND+VUCZ788=";
+  };
+
+  aeronAll_1_40_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.40.0";
+    artifactId = "aeron-all";
+    hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA==";
+  };
+
+  aeronSamples_1_40_0 = fetchMavenArtifact {
+    inherit groupId;
+    version = "1.40.0";
+    artifactId = "aeron-samples";
+    hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg==";
+  };
+
+  aeronAll = aeronAll_1_49_0;
+  aeronSamples = aeronSamples_1_49_0;
 
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index c2bf85af259f..7decfcfb3c6e 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -4,7 +4,7 @@
   stdenvNoCC,
   fetchFromGitHub,
   rustPlatform,
-  electron_37,
+  electron,
   nodejs_22,
   yarn-berry_4,
   cacert,
@@ -28,7 +28,6 @@ let
   hostPlatform = stdenvNoCC.hostPlatform;
   nodePlatform = hostPlatform.node.platform;
   nodeArch = hostPlatform.node.arch;
-  electron = electron_37;
   nodejs = nodejs_22;
   yarn-berry = yarn-berry_4.override { inherit nodejs; };
   productName = if buildType != "stable" then "AFFiNE-${buildType}" else "AFFiNE";
@@ -37,17 +36,17 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = binName;
 
-  version = "0.24.1";
+  version = "0.25.3";
   src = fetchFromGitHub {
     owner = "toeverything";
     repo = "AFFiNE";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yq5TD5yInv+0d1S6M58I8CneCAGUwH0ThGrEJfLIrX0=";
+    hash = "sha256-pSKTmxkQGxw+A8gnQHI7RScSGkPz0fOXVb1tUId//fg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-tRDc7Rky59Rh08QTNiG3yopErHJzARxN8BZGrSUECLE=";
+    hash = "sha256-h057oF2hsbx1GzbZMdGUFQQgBupMWvEMKQSxx59EM6U=";
   };
   yarnOfflineCache = stdenvNoCC.mkDerivation {
     name = "yarn-offline-cache";
@@ -92,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     dontInstall = true;
     outputHashMode = "recursive";
-    outputHash = "sha256-U2FGvdtGiM97aXmbfNIfi87hvwDkd1dvlAABYiDgAGI=";
+    outputHash = "sha256-46oU8e4kTkD4EI8Xey95AwWT18LIeSsY8ffeKxw08pg=";
   };
 
   buildInputs = lib.optionals hostPlatform.isDarwin [
diff --git a/pkgs/by-name/ag/agorakit/package.nix b/pkgs/by-name/ag/agorakit/package.nix
index c1c9595eccac..c5f8c722327d 100644
--- a/pkgs/by-name/ag/agorakit/package.nix
+++ b/pkgs/by-name/ag/agorakit/package.nix
@@ -27,7 +27,7 @@ php82.buildComposerProject2 (finalAttrs: {
     runHook postInstall
   '';
 
-  vendorHash = "sha256-tBB3Zl/N1XqPTD84at5WoGrD0G5rJbobk4E8BFOSm+M=";
+  vendorHash = "sha256-cg9OIBvWX69yU6U6Ag/T3jScG2OUdpTqc+KwP6VyUHo=";
   composerStrictValidation = false;
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ah/ahk_x11/package.nix b/pkgs/by-name/ah/ahk_x11/package.nix
index c1cb30dd4c1b..d426783ec477 100644
--- a/pkgs/by-name/ah/ahk_x11/package.nix
+++ b/pkgs/by-name/ah/ahk_x11/package.nix
@@ -20,7 +20,7 @@
 # NOTICE: AHK_X11 from this package does not support compiling scripts into portable executables.
 let
   pname = "ahk_x11";
-  version = "1.0.6";
+  version = "1.0.7";
 
   inherit (xorg)
     libXinerama
@@ -37,7 +37,7 @@ crystal.buildCrystalPackage {
     owner = "phil294";
     repo = "AHK_X11";
     tag = version;
-    hash = "sha256-t2fGUIG3T8azx22lFhFAkABHwkePv9uThhlH+fwDj8E=";
+    hash = "sha256-VuqLlRgNyF6/4aVq1sNlVjOMih0TdHXbr0CqhA4QT6Y=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ah/ahk_x11/shards.nix b/pkgs/by-name/ah/ahk_x11/shards.nix
index 2961987c9413..a33b1c0d874c 100644
--- a/pkgs/by-name/ah/ahk_x11/shards.nix
+++ b/pkgs/by-name/ah/ahk_x11/shards.nix
@@ -1,60 +1,60 @@
 {
-  atspi = {
+  "atspi" = {
     url = "https://github.com/phil294/atspi.cr.git";
     rev = "7aec8d3604313da415e54e654c1dc6b33ae05d8d";
     sha256 = "1r6k9f00a2y406hqsgq0r58zlfmg3xbzqjmfh93nwqs4m6h0shml";
   };
-  cron_parser = {
+  "cron_parser" = {
     url = "https://github.com/kostya/cron_parser.git";
     rev = "v0.4.0";
     sha256 = "17fgg2nvyx99v05l10h6cnxfr7swz8yaxhmnk4l47kg2spi8w90a";
   };
-  future = {
+  "future" = {
     url = "https://github.com/crystal-community/future.cr.git";
     rev = "v1.0.0";
     sha256 = "1mji2djkrf4vxgs432kgkzxx54ybzk636789k2vsws3sf14l74i8";
   };
-  gi-crystal = {
+  "gi-crystal" = {
     url = "https://github.com/hugopl/gi-crystal.git";
     rev = "v0.23.0";
     sha256 = "0ykb7sy62036brix12sj416h6gx85liq2kivwkh2cmf71lk02cqr";
   };
-  gtk3 = {
+  "gtk3" = {
     url = "https://github.com/phil294/gtk3.cr.git";
     rev = "3e6cdc45c1c39d82c215b4cdf0bbb9b5598460e1";
     sha256 = "0x25p85kp2f6gbsi36nyddhji7mmmqa7v4xs18bddf3kbgh72nw3";
   };
-  harfbuzz = {
+  "harfbuzz" = {
     url = "https://github.com/hugopl/harfbuzz.cr.git";
-    rev = "v0.2.0";
-    sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
+    rev = "v0.2.1";
+    sha256 = "08zx5q1mm1h4lzfr38dk8nk7mx1y955zdjl6n48rl619bc1ywdpg";
   };
-  notify = {
+  "notify" = {
     url = "https://github.com/phil294/notify.cr.git";
     rev = "0c9880e6169e09f0db1cb40432e0b76651d15ad3";
     sha256 = "1waasvhx4n817d8gqk3fza4ac4a9d71f80cfii5dbh2aqzhqf070";
   };
-  pango = {
+  "pango" = {
     url = "https://github.com/hugopl/pango.cr.git";
     rev = "v0.3.1";
     sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv";
   };
-  tasker = {
+  "tasker" = {
     url = "https://github.com/spider-gazelle/tasker.git";
     rev = "v2.1.4";
     sha256 = "0254sl279nrw5nz43dz5gm89ah1zrw5bvxfma81navpx5gfg9pyb";
   };
-  x11 = {
+  "x11" = {
     url = "https://github.com/phil294/x11-cr.git";
     rev = "5a937d647d8eac29106602fcdeb161a78eb3d59d";
     sha256 = "11rflkxrg1dl5c80llwan4qs47ir7w7lgqdmhy2z907kxbrfkznr";
   };
-  x_do = {
+  "x_do" = {
     url = "https://github.com/phil294/x_do.cr.git";
     rev = "94f755a4f18a9a9820e9738b371cbe6b49731926";
     sha256 = "099mrhyb8kly6isk7xr1mzxbxfm4xizmyyw2ylmlx4ywynz9iyl6";
   };
-  xtst = {
+  "xtst" = {
     url = "https://github.com/phil294/xtst-cr.git";
     rev = "f731b708e1789d039258ecd62f7b0d1107a00b78";
     sha256 = "1vhzn1ck7ifkvhw5f9kpljsa278va039wa6f3hhd8w6gr2zqvzk8";
diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix
index 22b8ca8b173e..ef36ab1eecc5 100644
--- a/pkgs/by-name/ai/ain/package.nix
+++ b/pkgs/by-name/ai/ain/package.nix
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/jonaslu/ain";
     changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ain";
   };
 })
diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 4d8bc5240a7e..e36ffb8c68c4 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "air-formatter";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "air";
     tag = finalAttrs.version;
-    hash = "sha256-FGucu5emmBtxVloun7Kh+MWKZDYdKw+75L7g3GqQ7Tw=";
+    hash = "sha256-LNU//dQico54GhZdehynEuukfGuU8rQvfFO4zvRsZL0=";
   };
 
-  cargoHash = "sha256-+cksQnHNXGyqbu+CoGhCEmQux7zfLIt5K5rWABfppDo=";
+  cargoHash = "sha256-9HRDUTYzKLYuh9KCcnvPXB6gDKcht79TOZZ3ze9+gbg=";
 
   useNextest = true;
 
diff --git a/pkgs/applications/audio/airwave/default.nix b/pkgs/by-name/ai/airwave/package.nix
similarity index 97%
rename from pkgs/applications/audio/airwave/default.nix
rename to pkgs/by-name/ai/airwave/package.nix
index 9789485488be..688088085810 100644
--- a/pkgs/applications/audio/airwave/default.nix
+++ b/pkgs/by-name/ai/airwave/package.nix
@@ -1,14 +1,10 @@
 {
   lib,
-  stdenv,
   multiStdenv,
   fetchFromGitHub,
-  requireFile,
-  unzip,
   wine,
   cmake,
   makeWrapper,
-  wrapQtAppsHook,
   file,
   libX11,
   qt5,
@@ -46,7 +42,7 @@ multiStdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     makeWrapper
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 767d6522c18d..968e9111e87a 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-10-05";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "5889ed48beefd556adca76ed3e4b1b4982531dbd";
-    hash = "sha256-zpuzKpuYGe0xpUrBeWpaCYEBy9mGOX5R3LAeiWPCQ3s=";
+    rev = "d27f470c0796a32d8241a0be25f74a0fc63e7f8d";
+    hash = "sha256-tSbGn7t4EeH5xtvjRRQQneaLP4VEf8ix+0m/v6eosXw=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables
diff --git a/pkgs/applications/misc/aitrack/default.nix b/pkgs/by-name/ai/aitrack/package.nix
similarity index 90%
rename from pkgs/applications/misc/aitrack/default.nix
rename to pkgs/by-name/ai/aitrack/package.nix
index 7fa8e8e9d610..75543c9ffa9f 100644
--- a/pkgs/applications/misc/aitrack/default.nix
+++ b/pkgs/by-name/ai/aitrack/package.nix
@@ -3,12 +3,10 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  wrapQtAppsHook,
   opencv,
   spdlog,
   onnxruntime,
-  qtx11extras,
+  libsForQt5,
 }:
 stdenv.mkDerivation {
   pname = "aitrack";
@@ -23,14 +21,14 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     opencv
     spdlog
-    qtx11extras
+    libsForQt5.qtx11extras
     onnxruntime
   ];
 
diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index 27515f5e717b..91a4425ffda5 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.9";
+  version = "0.0.11";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LhFFmzL9jTrUqYlHNMWVZBuiZFB0oFLA409byFWFIl0=";
+    hash = "sha256-VkX9zqR10h5bvFAfnNpei3f89dv7RQoZysjSRvxkdHQ=";
   };
 
-  vendorHash = "sha256-tglqpX/SbqcqMXkByrzuadczXLPvPFXvslNkh1rSgWU=";
+  vendorHash = "sha256-qN7qqzMnl3l3Z40Mfv9jNWP7Ux7bgDCxKm+QocoruRk=";
 
   subPackages = [ "cmd/aks-mcp" ];
 
diff --git a/pkgs/by-name/al/alacarte/package.nix b/pkgs/by-name/al/alacarte/package.nix
index 697494c31942..0a0bf87c16ce 100644
--- a/pkgs/by-name/al/alacarte/package.nix
+++ b/pkgs/by-name/al/alacarte/package.nix
@@ -17,14 +17,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "alacarte";
-  version = "3.56.0";
+  version = "3.58.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "alacarte";
     tag = version;
-    hash = "sha256-sH/2ULI1QEqmgFIFFnOwsx2/+TMt+bPu0l0LUcnBgWg=";
+    hash = "sha256-U3shnQ1GlDvOQFfjYVfAhCVRVQpTyLwEzHqKIbBChas=";
   };
 
   format = "other";
diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 7ff0058a9bf3..e84329a308d5 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -42,9 +42,9 @@ let
     wayland
   ];
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alacritty";
-  version = "0.15.1" + lib.optionalString withGraphics "-graphics";
+  version = if !withGraphics then "0.16.1" else "0.16.1-graphics";
 
   src =
     # by default we want the official package
@@ -52,23 +52,23 @@ rustPlatform.buildRustPackage rec {
       fetchFromGitHub {
         owner = "alacritty";
         repo = "alacritty";
-        tag = "v${version}";
-        hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-IOPhnJ76kZ2djJjxJEUwWPvHDeeXbJAn1ClipTH7nWs=";
       }
     # optionally we want to build the sixels feature fork
     else
       fetchFromGitHub {
         owner = "ayosec";
         repo = "alacritty";
-        tag = "v${version}";
-        hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM=";
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-e+o0GLy05qXEY4T57dCuqhukTKBSm1WIHzPUV8uswRI=";
       };
 
   cargoHash =
     if !withGraphics then
-      "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M="
+      "sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
     else
-      "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ=";
+      "sha256-VR+URXqsB9zCOSow/f/aWXUlrp6j2XeK0zKESQGzMek=";
 
   nativeBuildInputs = [
     cmake
@@ -144,14 +144,29 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     description = "Cross-platform, GPU-accelerated terminal emulator";
-    homepage = "https://github.com/alacritty/alacritty";
+    homepage =
+      if !withGraphics then
+        "https://github.com/alacritty/alacritty"
+      else
+        "https://github.com/ayosec/alacritty";
     license = lib.licenses.asl20;
     mainProgram = "alacritty";
-    maintainers = with lib.maintainers; [
-      Br1ght0ne
-      rvdp
-    ];
+    maintainers =
+      with lib.maintainers;
+      if !withGraphics then
+        [
+          Br1ght0ne
+          rvdp
+        ]
+      else
+        [
+          afh
+        ];
     platforms = lib.platforms.unix;
-    changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
+    changelog =
+      if !withGraphics then
+        "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"
+      else
+        "https://github.com/ayosec/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
-}
+})
diff --git a/pkgs/by-name/al/albedo/package.nix b/pkgs/by-name/al/albedo/package.nix
index 798163a70791..39cecc4e030d 100644
--- a/pkgs/by-name/al/albedo/package.nix
+++ b/pkgs/by-name/al/albedo/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "albedo";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "coreruleset";
     repo = "albedo";
     tag = "v${version}";
-    hash = "sha256-4ZQTOix5bCn4EmrabiG4L74F2++cQhIbvtgNKBW7aDk=";
+    hash = "sha256-H/ViMVzuuQYORDiNXBgs7imy+c4IaL2pY5KVN6ecJoo=";
   };
 
-  vendorHash = "sha256-qZga699UjBsPmOUSN66BFInl8Bmk42HiVn0MfPlxRE4=";
+  vendorHash = "sha256-FBkHpTn4jG6iw1GYAuGHh2WCRro4mRgumYoGMkmv6qU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index 3ad42236da59..e6a9f06ee7eb 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.32.1";
+  version = "33.0.1";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v2SMY0KGFwwybsiMu1W1wBWdyoDEFF3hWd4LeaT8Nts=";
+    hash = "sha256-zHLyvFzLR7Ryk6eoD+Lp+w4bIj7MAeREK0YzRXYnx6c=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix
index aadbb7714255..7ada5f42977e 100644
--- a/pkgs/by-name/al/alexandria/package.nix
+++ b/pkgs/by-name/al/alexandria/package.nix
@@ -3,7 +3,7 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   openssl,
   nodejs,
   npmHooks,
@@ -52,13 +52,15 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [
     openssl
-    webkitgtk_4_0
+    # webkitgtk_4_0
     gtk3
     librsvg
     libappindicator-gtk3
   ];
 
   meta = {
+    # webkitgtk_4_0 was removed
+    broken = true;
     homepage = "https://github.com/btpf/Alexandria";
     changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}";
     description = "Minimalistic cross-platform eBook reader";
diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix
index 714642fb83e7..75de069fe85e 100644
--- a/pkgs/by-name/al/alfis/package.nix
+++ b/pkgs/by-name/al/alfis/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alfis";
-  version = "0.8.5";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
     tag = "v${version}";
-    hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
+    hash = "sha256-gRk4kvIV+5cCUFaJvGbTAR44678Twa28iMGZ75lJz2c=";
   };
 
-  cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec=";
+  cargoHash = "sha256-Ge0+7ClXlJFT6CyluHF7k4stsX+KuYp/riro1pvrcKM=";
 
   nativeBuildInputs = [
     pkg-config
@@ -52,8 +52,5 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ misuzu ];
     platforms = lib.platforms.unix;
     mainProgram = "alfis";
-    # needs libsoup-2.4, which is soon going to be removed
-    # https://github.com/NixOS/nixpkgs/pull/450065
-    broken = withGui;
   };
 }
diff --git a/pkgs/by-name/al/alibuild/package.nix b/pkgs/by-name/al/alibuild/package.nix
index 9011e7e30b26..f189ed911464 100644
--- a/pkgs/by-name/al/alibuild/package.nix
+++ b/pkgs/by-name/al/alibuild/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alibuild";
-  version = "1.17.30";
+  version = "1.17.31";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gLJQnQgFrB/4YTB8rpYicC97avuw0EhO4hUaxYYwvbE=";
+    hash = "sha256-agAWJaaaHGN2oQaaIkMNEeU712bkWXEPH3jP8oH5Qjs=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/al/aligator/package.nix b/pkgs/by-name/al/aligator/package.nix
index 9b4057e58267..0fdd49972d1c 100644
--- a/pkgs/by-name/al/aligator/package.nix
+++ b/pkgs/by-name/al/aligator/package.nix
@@ -4,8 +4,6 @@
   fontconfig,
   llvmPackages,
   nix-update-script,
-  python3Packages,
-  pythonSupport ? false,
   stdenv,
 
   # nativeBuildInputs
@@ -23,18 +21,19 @@
   pinocchio,
 
   # checkInputs
+  catch2_3,
   gbenchmark,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "aligator";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "Simple-Robotics";
     repo = "aligator";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x9vOj5Dy2SaQOLBCM13wZ/4SxgBz+99K/UxJqhKTg3c=";
+    hash = "sha256-OyCJa2iTkCxVLooSKdVgBd0y7rHObo4vFcc56t48TSY=";
   };
 
   outputs = [
@@ -49,48 +48,33 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     graphviz
     pkg-config
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.python
-    python3Packages.pythonImportsCheckHook
   ];
+
   buildInputs = [
     fmt
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     llvmPackages.openmp
   ];
+
   propagatedBuildInputs = [
-    suitesparse
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.crocoddyl
-    python3Packages.matplotlib
-    python3Packages.pinocchio
-  ]
-  ++ lib.optionals (!pythonSupport) [
     crocoddyl
     pinocchio
+    suitesparse
   ];
+
   checkInputs = [
+    catch2_3
     gbenchmark
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.matplotlib
-    python3Packages.pytest
   ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
     (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true)
     (lib.cmakeBool "BUILD_CROCODDYL_COMPAT" true)
     (lib.cmakeBool "BUILD_WITH_OPENMP_SUPPORT" true)
     (lib.cmakeBool "BUILD_WITH_CHOLMOD_SUPPORT" true)
     (lib.cmakeBool "GENERATE_PYTHON_STUBS" false) # this need git at configure time
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && pythonSupport) [
-    # ignore one failing test for now
-    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'aligator-test-py-rollout|aligator-test-py-frames'")
   ];
 
   # Fontconfig error: Cannot load default config file: No such file: (null)
@@ -105,7 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   doCheck = true;
-  pythonImportsCheck = [ "aligator" ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/al/alisthelper/package.nix b/pkgs/by-name/al/alisthelper/package.nix
index beb88f6738b6..e13e899ed337 100644
--- a/pkgs/by-name/al/alisthelper/package.nix
+++ b/pkgs/by-name/al/alisthelper/package.nix
@@ -1,37 +1,34 @@
 {
   lib,
+  flutter332,
   fetchFromGitHub,
-  flutter327,
-  libayatana-appindicator,
   copyDesktopItems,
+  libayatana-appindicator,
   makeDesktopItem,
   runCommand,
-  yq,
-  alisthelper,
+  yq-go,
   _experimental-update-script-combinators,
-  gitUpdater,
+  nix-update-script,
 }:
 
-flutter327.buildFlutterApplication {
-  pname = "alisthelper";
-  version = "0.2.0-unstable-2025-01-04";
-
+let
   src = fetchFromGitHub {
     owner = "Xmarmalade";
     repo = "alisthelper";
-    rev = "181a1207df0c9eb8336097b9a9249342dd9df097";
-    hash = "sha256-6FJd+8eJoRK3cEdkLCgr7q4L6kEeSsMMkiVRx6Pa5jk=";
+    rev = "84a4f025ce184eb9cd910b90397eef8edaa95127";
+    hash = "sha256-Ju7AnUq59sk15YCvXhunr5r2/e2i26lWF3+pVY3oWzo=";
   };
+in
+flutter332.buildFlutterApplication {
+  pname = "alisthelper";
+  version = "0.2.0-unstable-2025-08-05";
+  inherit src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  nativeBuildInputs = [
-    copyDesktopItems
-  ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
-  buildInputs = [
-    libayatana-appindicator
-  ];
+  buildInputs = [ libayatana-appindicator ];
 
   preBuild = ''
     packageRun build_runner build
@@ -47,30 +44,35 @@ flutter327.buildFlutterApplication {
   ];
 
   postInstall = ''
-    install -Dm644 assets/alisthelper.png -t $out/share/pixmaps
+    install -D --mode=0644 assets/alisthelper.png -t $out/share/pixmaps
   '';
 
   passthru = {
     pubspecSource =
       runCommand "pubspec.lock.json"
         {
-          buildInputs = [ yq ];
-          inherit (alisthelper) src;
+          inherit src;
+          nativeBuildInputs = [ yq-go ];
         }
         ''
-          cat $src/pubspec.lock | yq > $out
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
         '';
     updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "alisthelper.pubspecSource" ./pubspec.lock.json)
+      (nix-update-script { extraArgs = [ "--version=branch" ]; })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "alisthelper.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
     ];
   };
 
   meta = {
-    description = "Designed to simplify the use of the desktop version of alist";
+    description = "Designed to simplify the use of the desktop version of alist/openlist";
     homepage = "https://github.com/Xmarmalade/alisthelper";
     mainProgram = "alisthelper";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/al/alisthelper/pubspec.lock.json b/pkgs/by-name/al/alisthelper/pubspec.lock.json
index 44d75b9d3915..593c5f3943b6 100644
--- a/pkgs/by-name/al/alisthelper/pubspec.lock.json
+++ b/pkgs/by-name/al/alisthelper/pubspec.lock.json
@@ -4,87 +4,81 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.3"
+      "version": "85.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "7.6.0"
     },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161",
+        "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.3"
+      "version": "0.13.4"
     },
     "archive": {
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "build": {
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
+        "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "3.0.0"
     },
     "build_config": {
       "dependency": "transitive",
@@ -100,41 +94,41 @@
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948",
+        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.3"
+      "version": "4.0.4"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e",
+        "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.3"
+      "version": "3.0.0"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573",
+        "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.14"
+      "version": "2.6.0"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
+        "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.0"
+      "version": "9.2.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -150,31 +144,31 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2",
+        "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.3"
+      "version": "8.11.0"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "ci": {
       "dependency": "transitive",
@@ -200,11 +194,11 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -220,11 +214,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "convert": {
       "dependency": "transitive",
@@ -270,81 +264,81 @@
       "dependency": "transitive",
       "description": {
         "name": "custom_lint",
-        "sha256": "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9",
+        "sha256": "9656925637516c5cf0f5da018b33df94025af2088fe09c8ae2ca54c53f2d9a84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.6"
     },
     "custom_lint_builder": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_builder",
-        "sha256": "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759",
+        "sha256": "6cdc8e87e51baaaba9c43e283ed8d28e59a0c4732279df62f66f7b5984655414",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.6"
     },
     "custom_lint_core": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_core",
-        "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5",
+        "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.5"
     },
     "custom_lint_visitor": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_visitor",
-        "sha256": "bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9",
+        "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0+6.11.0"
+      "version": "1.0.0+7.7.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "3.1.1"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260",
+        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.7.0"
+      "version": "5.8.0+1"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.1"
     },
     "fake_async": {
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "fast_gbk": {
       "dependency": "direct main",
@@ -360,11 +354,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
@@ -390,11 +384,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc",
+        "sha256": "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+12"
+      "version": "0.5.1+14"
     },
     "file_selector_ios": {
       "dependency": "transitive",
@@ -420,11 +414,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+3"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -450,11 +444,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -476,21 +470,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.14.2"
+      "version": "0.14.4"
     },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -524,21 +518,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
+        "sha256": "da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.7"
+      "version": "3.2.0"
     },
     "freezed_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+        "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.1.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -554,11 +548,11 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "graphs": {
       "dependency": "transitive",
@@ -574,21 +568,21 @@
       "dependency": "transitive",
       "description": {
         "name": "hotreloader",
-        "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e",
+        "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.3.0"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -604,31 +598,31 @@
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.4"
     },
     "intl": {
       "dependency": "transitive",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "transitive",
@@ -640,26 +634,6 @@
       "source": "hosted",
       "version": "1.0.5"
     },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.1"
-    },
-    "json2yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json2yaml",
-        "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
     "json_annotation": {
       "dependency": "direct main",
       "description": {
@@ -674,41 +648,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c",
+        "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.0"
+      "version": "6.10.0"
     },
     "launch_at_startup": {
       "dependency": "direct main",
       "description": {
         "name": "launch_at_startup",
-        "sha256": "1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84",
+        "sha256": "7db33398b76ec0ed9e27f9f4640553e239977437564046625e215be89c91f084",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.1"
+      "version": "0.5.1"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -724,21 +698,21 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "logger": {
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1",
+        "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.6.1"
     },
     "logging": {
       "dependency": "transitive",
@@ -750,25 +724,15 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -794,11 +758,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -814,41 +778,41 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.2"
+      "version": "8.3.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.2.0"
     },
     "path": {
       "dependency": "transitive",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_provider": {
       "dependency": "direct main",
@@ -864,11 +828,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -914,11 +878,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
@@ -950,25 +914,35 @@
       "source": "hosted",
       "version": "1.5.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
+    },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -984,21 +958,21 @@
       "dependency": "transitive",
       "description": {
         "name": "riverpod_analyzer_utils",
-        "sha256": "c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8",
+        "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.8"
+      "version": "0.5.10"
     },
     "riverpod_lint": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_lint",
-        "sha256": "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99",
+        "sha256": "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.3"
+      "version": "2.6.5"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -1064,21 +1038,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1114,11 +1088,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -1144,11 +1118,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.0.0"
     },
     "shortid": {
       "dependency": "transitive",
@@ -1170,61 +1144,61 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "a466773de768eb95bdf681e0a92e7c8010d44bb247b62130426c83ece33aeaed",
+        "sha256": "b02c531f453c328a1343818c64d730357ac140860147c9a29030fdfc82039266",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.32.0"
+      "version": "4.8.1"
     },
     "slang_build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "slang_build_runner",
-        "sha256": "b2e0c63f3c801a4aa70b4ca43173893d6eb7d5a421fc9d97ad983527397631b3",
+        "sha256": "3679d6ab1373a9e5c0894d29d612abd2f75f969b0ef2f19cafaed2d1b9e49d39",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.32.0"
+      "version": "4.8.0"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "1a98e878673996902fa5ef0b61ce5c245e41e4d25640d18af061c6aab917b0c7",
+        "sha256": "7a5e55f2b1ec99e06354a5213b992d34017efacccba8ffc6066cfc5517cc0282",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.32.0"
+      "version": "4.8.0"
     },
     "source_gen": {
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "fc787b1f89ceac9580c3616f899c9a447413cbdac1df071302127764c023a134",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "3.0.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.5"
+      "version": "1.3.6"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1240,11 +1214,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "state_notifier": {
       "dependency": "transitive",
@@ -1260,11 +1234,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
@@ -1280,31 +1254,31 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.4"
     },
     "timing": {
       "dependency": "transitive",
@@ -1320,11 +1294,11 @@
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "f231031c5c0eb4ad514e18ddaab27a912ddbe50335c594bc28fb0f9972ab6a84",
+        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.1"
+      "version": "0.5.0"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1340,31 +1314,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1400,21 +1374,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "transitive",
@@ -1440,81 +1414,81 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "15.0.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.9.0"
+      "version": "5.14.0"
     },
     "win32_registry": {
       "dependency": "transitive",
       "description": {
         "name": "win32_registry",
-        "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
+        "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.5"
+      "version": "2.1.0"
     },
     "window_manager": {
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -1548,7 +1522,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.6.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.27.0"
   }
 }
diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index b395e999da58..f111d93990d1 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.305";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${version}";
-    hash = "sha256-zbDG6Mr+CVMoIfB7Jy99VrSNdAER+qYh3fbzoI6tMiE=";
+    hash = "sha256-8nwCVhUMQLXnWcrA9XSOM6R+Y7E+H+gwSYXDjk2WtAs=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-WbMyxOSCWtlngqQHtKfkWq9bYlXUmvijGwt3zM9JoNY=";
+  vendorHash = "sha256-lmlCPBEqopmoNjkihVOh8zKSKsS4HmaDQ+QAEJ/pEvA=";
 
   subPackages = [ "main" ];
 
diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index edf22fb4eccd..e698cc15e9e6 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2235";
+  version = "2.0.2257";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-I2E1V296tljsvtpfU5xlUkKNEeEZb4qtM1WDLXQZHbg=";
+    hash = "sha256-CtNbv7PAUAdUuUQsEzOlg/oykGgWe+NPUWWeucTVajw=";
   };
 
-  npmDepsHash = "sha256-p1IBNK6dRBnEUEZ4bIMoGcVSPoecnKWgRtuUJTYW7q8=";
+  npmDepsHash = "sha256-9rGaeLl4Mq5oo+XKBU54wNtK6F+2Bndr2EORITo1moo=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index d7817a81488c..92ef58cba418 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -22,16 +22,23 @@
   pipewire,
 }:
 
-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      bibtexparser = self.bibtexparser_2;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "8.1.1";
+  version = "8.2.2";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-zZYz7hJocjhxFqsPgUj2jjNLOsoyHWLsZUBmCJyc87M=";
+    hash = "sha256-i1qNLV+oKkZlS/v8jfJJc67lJBuW6j2Uz93vb1StD6g=";
   };
 
   nativeBuildInputs = [
@@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   dependencies =
-    with python3Packages;
+    with pythonPackages;
     [
       pygobject3
       requests
@@ -74,7 +81,7 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ lib.flatten (builtins.attrValues optional-dependencies);
 
-  optional-dependencies = with python3Packages; {
+  optional-dependencies = with pythonPackages; {
     speech-to-text = [
       openai-whisper
       pyaudio
diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix
index e36add0cc407..42fa7a0d2381 100644
--- a/pkgs/by-name/al/altair/package.nix
+++ b/pkgs/by-name/al/altair/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "altair";
-  version = "8.2.5";
+  version = "8.3.0";
 
   src = fetchurl {
     url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-P0CVJFafrsvWzDWyJZEds812m3yUDpo4eocysEIQqrw=";
+    sha256 = "sha256-uLqtrF5WWJ5+6bN/h4u/vdvTlbQtZID1osujfuJad4U=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix
index 51fc6edee604..c0ed153c0a47 100644
--- a/pkgs/by-name/al/altus/package.nix
+++ b/pkgs/by-name/al/altus/package.nix
@@ -7,12 +7,12 @@
 
 let
   pname = "altus";
-  version = "5.7.1";
+  version = "5.7.2";
 
   src = fetchurl {
     name = "altus-${version}.AppImage";
     url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage";
-    hash = "sha256-G0jKBnobMKJWZmLtyYLpdruNxEVGt5rZHPFJYJkY8Y4=";
+    hash = "sha256-sB4ONFLTNN2Dd3LIVtpXIGTyHDFcXako7nlKxzNEOtA=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/al/alure/package.nix b/pkgs/by-name/al/alure/package.nix
index 67a36b9b1534..8dc838ea4ced 100644
--- a/pkgs/by-name/al/alure/package.nix
+++ b/pkgs/by-name/al/alure/package.nix
@@ -6,22 +6,28 @@
   openal,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "alure";
   version = "1.2";
 
   src = fetchurl {
-    url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2";
-    sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
+    url = "http://deb.debian.org/debian/pool/main/a/alure/alure_${finalAttrs.version}.orig.tar.bz2";
+    hash = "sha256-Rl5q2uaJJ746AjkDdkZi1kQE5AxMFS0WDjqIOLHXD3E=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openal ];
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Utility library to help manage common tasks with OpenAL applications";
     homepage = "https://github.com/kcat/alure";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ iedame ];
   };
-}
+})
diff --git a/pkgs/by-name/al/alure2/package.nix b/pkgs/by-name/al/alure2/package.nix
index e9c5af6d9df4..b3183af7a0ac 100644
--- a/pkgs/by-name/al/alure2/package.nix
+++ b/pkgs/by-name/al/alure2/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
     libsndfile
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming";
     homepage = "https://github.com/kcat/alure";
diff --git a/pkgs/by-name/am/am2rlauncher/package.nix b/pkgs/by-name/am/am2rlauncher/package.nix
index 5e3b02984760..40a7e4d860a5 100644
--- a/pkgs/by-name/am/am2rlauncher/package.nix
+++ b/pkgs/by-name/am/am2rlauncher/package.nix
@@ -5,7 +5,7 @@
   glibc,
   gtk3,
   libappindicator,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   e2fsprogs,
   libnotify,
   libgit2,
@@ -67,7 +67,7 @@ buildDotnetModule {
     glibc
     gtk3
     libappindicator
-    webkitgtk_4_0
+    # webkitgtk_4_0
     e2fsprogs
     libnotify
     libgit2
@@ -116,6 +116,8 @@ buildDotnetModule {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     homepage = "https://github.com/AM2R-Community-Developers/AM2RLauncher";
     description = "Front-end for dealing with AM2R updates and mods";
     longDescription = ''
diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
index cdaf829d7581..e7b0af1bea7f 100644
--- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
+++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "amazon-cloudwatch-agent";
-  version = "1.300059.0";
+  version = "1.300061.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-cloudwatch-agent";
     tag = "v${version}";
-    hash = "sha256-xon1M3xusoFngeZ2CJprS1z4fcrWeKCKaAtAfv4SBWw=";
+    hash = "sha256-Qt17JyD9zW914nVcxcpY3af42CqKJtKBEISSMy6/ong=";
   };
 
-  vendorHash = "sha256-79BaMjl1bzQcl3FUvpwRsPneQRyfabU481eLgWA1U6Y=";
+  vendorHash = "sha256-g06fRyuCRypOP6AvHTp73ml5JycAdp2OeceU4GAesvA=";
 
   # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
   subPackages = [
diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 8690a64d5509..235b5a2c1d07 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -3,24 +3,27 @@
   fetchFromGitHub,
   rustPlatform,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.17.1";
+  version = "1.18.1";
+
+  passthru.updateScript = nix-update-script { };
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-bRin4JKnBsWLvk+dIwHWAf4KKD1n6FOf2wICYNZpHd4=";
+    tag = finalAttrs.version;
+    hash = "sha256-wAcxXDEadPgyb3OpQXWxOEX3AMtf0ubx0J/H9Iff+rk=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-Isa7kxnov4D+Sd7b4LJW52TIR864CDFkAjAHJoVQRcA=";
+  cargoHash = "sha256-jjx9HBJQ5eTS8+0Wus8hfNPZ+eETKHjjX3BsEq2LRn0=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix
index c1ce7a669fad..429e0ef8a062 100644
--- a/pkgs/by-name/am/ameba/package.nix
+++ b/pkgs/by-name/am/ameba/package.nix
@@ -1,10 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  crystal,
+  crystal_1_17,
   coreutils,
 }:
-
+let
+  crystal = crystal_1_17;
+in
 crystal.buildCrystalPackage rec {
   pname = "ameba";
   version = "1.6.4";
diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix
index 5bae30e36630..384fbcd30146 100644
--- a/pkgs/by-name/am/amiberry/package.nix
+++ b/pkgs/by-name/am/amiberry/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   copyDesktopItems,
   makeWrapper,
@@ -28,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64=";
   };
 
+  patches = [
+    # cmake-4 support
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/BlitterStudio/amiberry/commit/dbd85a37147603875b9ca51a9409c65a26c0d60a.patch?full_index=1";
+      hash = "sha256-w8Z9yhNafbXWv3nV8GDNpks2R1+M12uG1mWWrwVaEUk=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     copyDesktopItems
diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix
index 2073de8fc4b6..4693f5c78aab 100644
--- a/pkgs/by-name/am/amnezia-vpn/package.nix
+++ b/pkgs/by-name/am/amnezia-vpn/package.nix
@@ -81,13 +81,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "amnezia-vpn";
-  version = "4.8.10.0";
+  version = "4.8.11.0";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amnezia-client";
     tag = finalAttrs.version;
-    hash = "sha256-w1uBhp47XRinZpSuKeFaASOIOyjRDkDA81uqW4pK3F4=";
+    hash = "sha256-JZ6cGqLybHgy6xIklH3A//XNXiXlsM4NixGmk0KoubU=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index 83d69c2a7c8e..7a393abfde79 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.1760546826-g6984fa"
+        "@sourcegraph/amp": "^0.0.1762056193-g37ad2e"
       }
     },
     "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1760546826-g6984fa",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1760546826-g6984fa.tgz",
-      "integrity": "sha512-QKtu4XFbdi+B9mmkbu64RGPO2gcCtvHFCr3pSojnBQWVMLUjVJpj51dTSNYhBs8pABmJoRA6n8TGNRyaosl7aQ==",
+      "version": "0.0.1762056193-g37ad2e",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1762056193-g37ad2e.tgz",
+      "integrity": "sha512-dWhc7ajnw1QGCYwrOGwCbpyzedf5n2RoTCM97ibpzgpphDLCdyGTXh2XTC6mrxM2CNQLp5jJaWxvcDk9nM80Vg==",
       "dependencies": {
         "@napi-rs/keyring": "1.1.9"
       },
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 425621864f1a..0dfeb0d3eac1 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.1760546826-g6984fa";
+  version = "0.0.1762056193-g37ad2e";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-aEUBTpQMQ2fgSfioRNXvdkKy4eLTw5XqkeSrt5T5498=";
+    hash = "sha256-so/nlX4N9qhNLsK0OllmpfiqzyEBtPrt7KD/MoAChGc=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-/s1wZhdwvVGOJoasgBs5eCWcvSuIriWi+bfz/Np8h+Y=";
+  npmDepsHash = "sha256-xhN5XJs8E7yCRQWRPlH9iZyh5FocUjFMto5QweaV8aI=";
 
   propagatedBuildInputs = [
     ripgrep
diff --git a/pkgs/by-name/am/ams-lv2/package.nix b/pkgs/by-name/am/ams-lv2/package.nix
deleted file mode 100644
index 00b4916fe55e..000000000000
--- a/pkgs/by-name/am/ams-lv2/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cairo,
-  fftw,
-  gtkmm2,
-  lv2,
-  lvtk,
-  pkg-config,
-  wafHook,
-  python3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ams-lv2";
-  version = "1.2.2";
-
-  src = fetchFromGitHub {
-    owner = "blablack";
-    repo = "ams-lv2";
-    rev = version;
-    sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    wafHook
-    python3
-  ];
-  buildInputs = [
-    cairo
-    fftw
-    gtkmm2
-    lv2
-    lvtk
-  ];
-
-  postPatch = ''
-    # U was removed in python 3.11 because it had no effect
-    substituteInPlace waflib/*.py \
-      --replace "m='rU" "m='r"
-  '';
-
-  meta = with lib; {
-    description = "LV2 port of the internal modules found in Alsa Modular Synth";
-    homepage = "https://github.com/blablack/ams-lv2";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.linux;
-    # Build uses `-msse` and `-mfpmath=sse`
-    badPlatforms = [ "aarch64-linux" ];
-    # `ModuleNotFoundError: No module named 'imp'`
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index c75658b642e2..efb0627dc95a 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -79,6 +79,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     echo "find_package(Threads)" >> cmake/options.cmake
+
+    substituteInPlace src/libs/ec/abstracts/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8)" "CMAKE_MINIMUM_REQUIRED (VERSION 3.10)"
   '';
 
   # aMule will try to `dlopen' libupnp and libixml, so help it
diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 24488ad5690e..bfd5a058b881 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-09-09";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "0f5d7883cc4c49b8e9c51d5512ba145b5289eb05";
-    hash = "sha256-8zzUp1am6nu/6EnQkPTDkd/TLb2SBgSSyNpUyv44Zr8=";
+    rev = "aa23ab23e6847c77a39fe9e8ebc274ab87c391d7";
+    hash = "sha256-cSpqwzTT4Nx7PK7mLUF13w/JgPlfvRdqZW0EsuY1b8M=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
deleted file mode 100644
index 4c118124e02b..000000000000
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  udevCheckHook,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "android-udev-rules";
-  version = "20250525";
-
-  src = fetchFromGitHub {
-    owner = "M0Rf30";
-    repo = "android-udev-rules";
-    rev = finalAttrs.version;
-    hash = "sha256-4ODU9EoVYV+iSu6+M9ePed45QkOZgWkDUlFTlWJ8ttQ=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-    install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules
-    runHook postInstall
-  '';
-
-  nativeBuildInputs = [
-    udevCheckHook
-  ];
-  doInstallCheck = true;
-
-  meta = {
-    homepage = "https://github.com/M0Rf30/android-udev-rules";
-    description = "Android udev rules list aimed to be the most comprehensive on the net";
-    longDescription = ''
-      Android udev rules list aimed to be the most comprehensive on the net.
-      To use on NixOS, simply add this package to services.udev.packages:
-      ```nix
-      services.udev.packages = [ pkgs.android-udev-rules ];
-      ```
-    '';
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    teams = [ lib.teams.android ];
-  };
-})
diff --git a/pkgs/by-name/an/anew/package.nix b/pkgs/by-name/an/anew/package.nix
index 1475a5072812..387152175add 100644
--- a/pkgs/by-name/an/anew/package.nix
+++ b/pkgs/by-name/an/anew/package.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
     mainProgram = "anew";
     homepage = "https://github.com/tomnomnom/anew";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix
index 5a42a3887571..2b0caacc36b2 100644
--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "anewer";
     homepage = "https://github.com/ysf/anewer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/angular-language-server/package.nix b/pkgs/by-name/an/angular-language-server/package.nix
index 54219bea2d4b..9e5375612f96 100644
--- a/pkgs/by-name/an/angular-language-server/package.nix
+++ b/pkgs/by-name/an/angular-language-server/package.nix
@@ -16,11 +16,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "angular-language-server";
-  version = "20.2.2";
+  version = "20.3.0";
   src = fetchurl {
     name = "angular-language-server-${finalAttrs.version}.zip";
     url = "https://github.com/angular/vscode-ng-language-service/releases/download/v${finalAttrs.version}/ng-template.vsix";
-    hash = "sha256-2I5Pmd05zNGjM15tFo2yw6AGUKp3zxufVcoe4oSAO5U=";
+    hash = "sha256-o3e2qVKw/sfnFHbHHdRlB9UjEx1KLD1KVoaAsnlYjmY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/an/animdl/package.nix b/pkgs/by-name/an/animdl/package.nix
index 28a2ecab20fd..99dc42e8e962 100644
--- a/pkgs/by-name/an/animdl/package.nix
+++ b/pkgs/by-name/an/animdl/package.nix
@@ -21,6 +21,7 @@ python3Packages.buildPythonApplication {
   ];
 
   pythonRelaxDeps = [
+    "click"
     "cssselect"
     "httpx"
     "lxml"
@@ -55,12 +56,11 @@ python3Packages.buildPythonApplication {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Highly efficient, powerful and fast anime scraper";
     homepage = "https://github.com/justfoolingaround/animdl";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "animdl";
-    maintainers = with maintainers; [ passivelemon ];
-    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ passivelemon ];
   };
 }
diff --git a/pkgs/games/anki/bin.nix b/pkgs/by-name/an/anki-bin/package.nix
similarity index 100%
rename from pkgs/games/anki/bin.nix
rename to pkgs/by-name/an/anki-bin/package.nix
diff --git a/pkgs/games/anki/sync-server.nix b/pkgs/by-name/an/anki-sync-server/package.nix
similarity index 100%
rename from pkgs/games/anki/sync-server.nix
rename to pkgs/by-name/an/anki-sync-server/package.nix
diff --git a/pkgs/games/anki/addons/adjust-sound-volume/default.nix b/pkgs/by-name/an/anki/addons/adjust-sound-volume/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/adjust-sound-volume/default.nix
rename to pkgs/by-name/an/anki/addons/adjust-sound-volume/default.nix
diff --git a/pkgs/games/anki/addons/anki-connect/default.nix b/pkgs/by-name/an/anki/addons/anki-connect/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/anki-connect/default.nix
rename to pkgs/by-name/an/anki/addons/anki-connect/default.nix
diff --git a/pkgs/games/anki/addons/anki-quizlet-importer-extended/default.nix b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/anki-quizlet-importer-extended/default.nix
rename to pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix
diff --git a/pkgs/games/anki/addons/anki-utils.nix b/pkgs/by-name/an/anki/addons/anki-utils.nix
similarity index 100%
rename from pkgs/games/anki/addons/anki-utils.nix
rename to pkgs/by-name/an/anki/addons/anki-utils.nix
diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/by-name/an/anki/addons/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/default.nix
rename to pkgs/by-name/an/anki/addons/default.nix
diff --git a/pkgs/games/anki/addons/local-audio-yomichan/default.nix b/pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/local-audio-yomichan/default.nix
rename to pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix
diff --git a/pkgs/games/anki/addons/passfail2/default.nix b/pkgs/by-name/an/anki/addons/passfail2/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/passfail2/default.nix
rename to pkgs/by-name/an/anki/addons/passfail2/default.nix
diff --git a/pkgs/games/anki/addons/puppy-reinforcement/default.nix b/pkgs/by-name/an/anki/addons/puppy-reinforcement/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/puppy-reinforcement/default.nix
rename to pkgs/by-name/an/anki/addons/puppy-reinforcement/default.nix
diff --git a/pkgs/games/anki/addons/recolor/default.nix b/pkgs/by-name/an/anki/addons/recolor/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/recolor/default.nix
rename to pkgs/by-name/an/anki/addons/recolor/default.nix
diff --git a/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch b/pkgs/by-name/an/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
similarity index 100%
rename from pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
rename to pkgs/by-name/an/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
diff --git a/pkgs/games/anki/addons/review-heatmap/default.nix b/pkgs/by-name/an/anki/addons/review-heatmap/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/review-heatmap/default.nix
rename to pkgs/by-name/an/anki/addons/review-heatmap/default.nix
diff --git a/pkgs/games/anki/addons/reviewer-refocus-card/default.nix b/pkgs/by-name/an/anki/addons/reviewer-refocus-card/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/reviewer-refocus-card/default.nix
rename to pkgs/by-name/an/anki/addons/reviewer-refocus-card/default.nix
diff --git a/pkgs/games/anki/addons/yomichan-forvo-server/default.nix b/pkgs/by-name/an/anki/addons/yomichan-forvo-server/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/yomichan-forvo-server/default.nix
rename to pkgs/by-name/an/anki/addons/yomichan-forvo-server/default.nix
diff --git a/pkgs/games/anki/missing-hashes.json b/pkgs/by-name/an/anki/missing-hashes.json
similarity index 100%
rename from pkgs/games/anki/missing-hashes.json
rename to pkgs/by-name/an/anki/missing-hashes.json
diff --git a/pkgs/games/anki/default.nix b/pkgs/by-name/an/anki/package.nix
similarity index 94%
rename from pkgs/games/anki/default.nix
rename to pkgs/by-name/an/anki/package.nix
index e94887da7ad0..ec4f2405a974 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/by-name/an/anki/package.nix
@@ -14,7 +14,7 @@
   nixosTests,
   nodejs,
   jq,
-  protobuf,
+  protobuf_31,
   python3,
   python3Packages,
   qt6,
@@ -24,6 +24,7 @@
   writeShellScriptBin,
   yarn,
   yarn-berry_4,
+  runCommand,
 
   swift,
 
@@ -34,12 +35,12 @@ let
   yarn-berry = yarn-berry_4;
 
   pname = "anki";
-  version = "25.07.5";
-  rev = "7172b2d26684c7ef9d10e249bd43dc5bf73ae00c";
+  version = "25.09.2";
+  rev = "3890e12c9e48c028c3f12aa58cb64bd9f8895e30";
 
-  srcHash = "sha256-nWxRr55Hm40V3Ijw+WetBKNoreLpcvRscgbOZa0REcY=";
-  cargoHash = "sha256-H/xwPPL6VupSZGLPEThhoeMcg12FvAX3fmNM6zYfqRQ=";
-  yarnHash = "sha256-adHnV345oDm20R8zGdEiEW+8/mTQAz4oxraybRfmwew=";
+  srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A=";
+  cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM=";
+  yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg=";
   pythonDeps = map (meta: {
     url = meta.url;
     path = toString (fetchurl meta);
@@ -72,10 +73,7 @@ let
     exec ${yarn}/bin/yarn "$@"
   '';
 
-  uvWheels = stdenv.mkDerivation {
-    name = "uv-wheels";
-    phases = [ "installPhase" ];
-
+  uvWheels = runCommand "uv-wheels" {
     # otherwise, it's too long of a string
     passAsFile = [ "installCommand" ];
     installCommand = ''
@@ -98,9 +96,7 @@ let
         fi
       '') pythonDeps
     ));
-
-    installPhase = ''bash $installCommandPath'';
-  };
+  } "bash $installCommandPath";
 in
 
 python3Packages.buildPythonApplication rec {
@@ -120,7 +116,6 @@ python3Packages.buildPythonApplication rec {
     ./patches/disable-auto-update.patch
     ./patches/remove-the-gl-library-workaround.patch
     ./patches/skip-formatting-python-code.patch
-    ./patches/fix-compilation-under-rust-1.89.patch
     # Used in with-addons.nix
     ./patches/allow-setting-addons-folder.patch
   ];
@@ -181,7 +176,7 @@ python3Packages.buildPythonApplication rec {
     # https://github.com/ankitects/anki/blob/24.11/docs/linux.md#packaging-considerations
     OFFLINE_BUILD = "1";
     NODE_BINARY = lib.getExe nodejs;
-    PROTOC_BINARY = lib.getExe protobuf;
+    PROTOC_BINARY = lib.getExe protobuf_31;
     PYTHON_BINARY = lib.getExe python3;
     UV_BINARY = lib.getExe uv;
     UV_NO_MANAGED_PYTHON = "1";
diff --git a/pkgs/games/anki/patches/allow-setting-addons-folder.patch b/pkgs/by-name/an/anki/patches/allow-setting-addons-folder.patch
similarity index 100%
rename from pkgs/games/anki/patches/allow-setting-addons-folder.patch
rename to pkgs/by-name/an/anki/patches/allow-setting-addons-folder.patch
diff --git a/pkgs/games/anki/patches/disable-auto-update.patch b/pkgs/by-name/an/anki/patches/disable-auto-update.patch
similarity index 100%
rename from pkgs/games/anki/patches/disable-auto-update.patch
rename to pkgs/by-name/an/anki/patches/disable-auto-update.patch
diff --git a/pkgs/games/anki/patches/remove-the-gl-library-workaround.patch b/pkgs/by-name/an/anki/patches/remove-the-gl-library-workaround.patch
similarity index 100%
rename from pkgs/games/anki/patches/remove-the-gl-library-workaround.patch
rename to pkgs/by-name/an/anki/patches/remove-the-gl-library-workaround.patch
diff --git a/pkgs/games/anki/patches/skip-formatting-python-code.patch b/pkgs/by-name/an/anki/patches/skip-formatting-python-code.patch
similarity index 100%
rename from pkgs/games/anki/patches/skip-formatting-python-code.patch
rename to pkgs/by-name/an/anki/patches/skip-formatting-python-code.patch
diff --git a/pkgs/games/anki/update.sh b/pkgs/by-name/an/anki/update.sh
similarity index 100%
rename from pkgs/games/anki/update.sh
rename to pkgs/by-name/an/anki/update.sh
diff --git a/pkgs/games/anki/uv-deps.json b/pkgs/by-name/an/anki/uv-deps.json
similarity index 99%
rename from pkgs/games/anki/uv-deps.json
rename to pkgs/by-name/an/anki/uv-deps.json
index f1180b3f999e..f5ee5be647c6 100644
--- a/pkgs/games/anki/uv-deps.json
+++ b/pkgs/by-name/an/anki/uv-deps.json
@@ -28,8 +28,8 @@
     "hash": "sha256-tIslN4eXaeA+n0uH18N++dn6LlRw4hFkcdcJZmthV3M="
   },
   {
-    "url": "https://files.pythonhosted.org/packages/b3/9f/c4d3e635ddbd2c6c24ff5454e96900fd2061b9abbb0198b9283446780d08/anki_mac_helper-0.1.0-py3-none-any.whl",
-    "hash": "sha256-7USauifqO8eZkFSvoQ2s8I74Vu169GUm2chZnYF5phg="
+    "url": "https://files.pythonhosted.org/packages/40/82/edb6194704defec181dddce8bc6a53c4afc72fa1f2bb4d68ffe244567767/anki_mac_helper-0.1.1-py3-none-any.whl",
+    "hash": "sha256-d0ppz58P5tS1SUni1liKVKdv9R54y/wmtSfR7TxbNOM="
   },
   {
     "url": "https://files.pythonhosted.org/packages/15/58/5260205b9968c20b6457ed82f48f9e3d6edf2f1f95103161798b73aeccf0/astroid-3.3.10-py3-none-any.whl",
diff --git a/pkgs/games/anki/with-addons.nix b/pkgs/by-name/an/anki/with-addons.nix
similarity index 100%
rename from pkgs/games/anki/with-addons.nix
rename to pkgs/by-name/an/anki/with-addons.nix
diff --git a/pkgs/by-name/an/anko/package.nix b/pkgs/by-name/an/anko/package.nix
index 946599af780d..92b1714e84c7 100644
--- a/pkgs/by-name/an/anko/package.nix
+++ b/pkgs/by-name/an/anko/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     description = "Scriptable interpreter written in golang";
     homepage = "https://github.com/mattn/anko";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index b38642dc3616..ebd133b45456 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2025-10-07";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "486d5585f3a3fe2075f2903f5b2e36518dd82e37";
-    hash = "sha256-jXTxgStRsp8+Z7JLtwI6+OLd0n/wX58Mxg1dbzDb0p0=";
+    rev = "0b268719d9a83c2296b5ce9fcc02bec9ad0f83f9";
+    hash = "sha256-LEVXZ9VUMAqDG39Kaew+JYedEqdlfxb5RdyG1X8PVpI=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix
index aacfad5371b2..d8fe94d1c988 100644
--- a/pkgs/by-name/an/ansible-doctor/package.nix
+++ b/pkgs/by-name/an/ansible-doctor/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ansible-doctor";
-  version = "7.2.1";
+  version = "7.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "ansible-doctor";
     tag = "v${version}";
-    hash = "sha256-2cJ1wV3hqoqSvLq3c7/J5nh1GTTcj9sexRhX3hfPoTc=";
+    hash = "sha256-4Mep9JA4I5zCciglK/yn4Jxu0EIjHi7WUWeKlLcVcP8=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/an/antimony/package.nix b/pkgs/by-name/an/antimony/package.nix
index 05c29ae9e698..2e9a10ff08d8 100644
--- a/pkgs/by-name/an/antimony/package.nix
+++ b/pkgs/by-name/an/antimony/package.nix
@@ -16,19 +16,19 @@
 }:
 
 let
-  gitRev = "8b805c674adad536f9dd552b4be75fadcb3c7db6";
+  gitRev = "b4b000937376a0ecf7ca1a2e708fb243624e7bdd";
   gitBranch = "develop";
   gitTag = "0.9.3";
 in
 stdenv.mkDerivation {
   pname = "antimony";
-  version = "2022-11-23";
+  version = "0.9.3-unstable-2025-10-12";
 
   src = fetchFromGitHub {
     owner = "mkeeter";
     repo = "antimony";
     rev = gitRev;
-    sha256 = "NmOuBewfHqtAim2cNP62LXgRjVWuVUGweV46sY1qjGk=";
+    hash = "sha256-O+nzL9XMCbtQiJx4xRs9w8a7uVqroZgxGnY0cydeqmw=";
   };
 
   patches = [ ./paths-fix.patch ];
diff --git a/pkgs/by-name/an/antora/test/default.nix b/pkgs/by-name/an/antora/test/default.nix
index ce5e0d5f50bb..b473a87b1434 100644
--- a/pkgs/by-name/an/antora/test/default.nix
+++ b/pkgs/by-name/an/antora/test/default.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation {
       # The --to-dir and --ui-bundle-url options are not included in the
       # playbook due to Antora and Nix limitations.
       antora ${
-        lib.cli.toGNUCommandLineShell { } {
+        lib.cli.toCommandLineShellGNU { } {
           cache-dir = "$(mktemp --directory)";
           extension = if antora-lunr-extension-test then antora-lunr-extension else false;
           to-dir = placeholder "out";
diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 98ebf26eb7ca..eb12f2b5b96f 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -15,21 +15,21 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.22.0";
+  version = "1.23.1";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LOYBl9r00AJljGvlacd506cLeMr8Ndh817/ZIw46Uu0=";
+    hash = "sha256-nE6LXB0+q313UatT3f4Cn/hbTxc4mSMHQnUm0xzTuvE=";
   };
 
-  vendorHash = "sha256-/iTAbwYSHTz9SrJ0vrAXsA+3yS0jUreJDF52gju9CgU=";
+  vendorHash = "sha256-45SQUDvTX2xc8jJ8NXerbqRkQhBv6xyOPypJQf+tExU=";
 
   npmDeps = fetchNpmDeps {
     name = "anubis-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-s+OxVf6Iysobfuo0nAh5qF157opD2sR5D+7awAx6GTs=";
+    hash = "sha256-zlJD/Mv39bUHx+q+QSXpYWhELvbk7MCNWXLWcB4SP2A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix
index 63224ae3fe9f..298e7313c18e 100644
--- a/pkgs/by-name/an/anytype-heart/package.nix
+++ b/pkgs/by-name/an/anytype-heart/package.nix
@@ -28,6 +28,8 @@ buildGoModule (finalAttrs: {
   #  https://github.com/anyproto/anytype-ts/blob/v<anytype-ts-version>/middleware.version
   version = "0.44.5";
 
+  # Update only together with 'anytype' package.
+  # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "anyproto";
     repo = "anytype-heart";
diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index faa37966618c..99fc95a94be3 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.71.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     tag = "v${version}";
-    hash = "sha256-WZvaPYiz1pHW6OLl6ahV3/b9RXW6S/c/kbQxJFfAn28=";
+    hash = "sha256-psyv/J1/7H8s34qqZD4s7Ls1mn2lht5VbNxZrXPC0iw=";
   };
 
-  vendorHash = "sha256-KW5+THuV7U09ZV0eShLCDJYDPOM09/bUi7t0WiVx6pk=";
+  vendorHash = "sha256-IpL9RIhO9ivXKHczca4m6R6jmcNEn5KXqNxWmtU30qE=";
 
   subPackages = [ "cmd/api-linter" ];
 
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/by-name/ap/apitrace/package.nix
similarity index 97%
rename from pkgs/applications/graphics/apitrace/default.nix
rename to pkgs/by-name/ap/apitrace/package.nix
index e33100980a8b..b85d3de67aea 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/by-name/ap/apitrace/package.nix
@@ -8,12 +8,11 @@
   procps,
   python3,
   libdwarf,
-  qtbase,
-  wrapQtAppsHook,
   libglvnd,
   gtest,
   brotli,
   enableGui ? true,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
     brotli
   ]
   ++ lib.optionals enableGui [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   nativeBuildInputs = [
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
     python3
   ]
   ++ lib.optionals enableGui [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ap/apkeditor/arsclib/default.nix b/pkgs/by-name/ap/apkeditor/arsclib/default.nix
index 37e9d0d9ec59..56625eb1af31 100644
--- a/pkgs/by-name/ap/apkeditor/arsclib/default.nix
+++ b/pkgs/by-name/ap/apkeditor/arsclib/default.nix
@@ -8,8 +8,8 @@
 let
   self = REAndroidLibrary {
     pname = "arsclib";
-    # 1.3.5 is not new enough for APKEditor because of API changes
-    version = "1.3.5-unstable-2024-10-21";
+    # 1.3.8 is not new enough for APKEditor because of API changes
+    version = "1.3.8-unstable-2025-09-23";
     projectName = "ARSCLib";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # This is the latest commit at the time of packaging.
       # It can be changed to a stable release ("V${version}")
       # if it is compatible with APKEditor.
-      rev = "ed6ccf00e56d7cce13e8648ad46a2678a6093248";
-      hash = "sha256-jzd7xkc4O+P9hlGsFGGl2P3pqVvV5+mDyKTRUuGfFSA=";
+      rev = "7238433395dea6f7d0fce3139f1659063ac31f42";
+      hash = "sha256-93eskC/qdkkNAZFYqSzoFxhmWgzTvDyZmZxOvwELGCs=";
     };
 
     mitmCache = gradle.fetchDeps {
diff --git a/pkgs/by-name/ap/apkeditor/jcommand/default.nix b/pkgs/by-name/ap/apkeditor/jcommand/default.nix
index 43b6ce8cae4c..b2e5a0c021ba 100644
--- a/pkgs/by-name/ap/apkeditor/jcommand/default.nix
+++ b/pkgs/by-name/ap/apkeditor/jcommand/default.nix
@@ -8,7 +8,7 @@
 let
   self = REAndroidLibrary {
     pname = "jcommand";
-    version = "0-unstable-2024-09-20";
+    version = "0-unstable-2025-01-21";
     projectName = "JCommand";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # it is hard to determine the actual commit that APKEditor is intended to use,
       # so I think we should use the latest commit that doesn't break compilation or basic functionality.
       # Currently this is the latest commit at the time of packaging.
-      rev = "714b6263c28dabb34adc858951cf4bc60d6c3fed";
-      hash = "sha256-6Em+1ddUkZBCYWs88qtfeGnxISZchFrHgDL8fsgZoQg=";
+      rev = "27d5fd21dc7da268182ea81e59007af890adb06e";
+      hash = "sha256-sbblGrp16rMGGGt7xAFd9F3ACeadYYEymBEL+s5BZ1E=";
     };
 
     mitmCache = gradle.fetchDeps {
diff --git a/pkgs/by-name/ap/apkeditor/package.nix b/pkgs/by-name/ap/apkeditor/package.nix
index 04f1d608a952..8647e87359d1 100644
--- a/pkgs/by-name/ap/apkeditor/package.nix
+++ b/pkgs/by-name/ap/apkeditor/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   callPackage,
+  versionCheckHook,
 
   jre,
   gradle,
@@ -54,7 +55,7 @@ let
   apkeditor =
     let
       pname = "apkeditor";
-      version = "1.4.1";
+      version = "1.4.5";
       projectName = "APKEditor";
     in
     REAndroidLibrary {
@@ -69,8 +70,8 @@ let
       src = fetchFromGitHub {
         owner = "REAndroid";
         repo = "APKEditor";
-        tag = "v${version}";
-        hash = "sha256-a72j9qGjJXnTFeqLez2rhBSArFVYCX+Xs7NQd8CY5Yk=";
+        tag = "V${version}";
+        hash = "sha256-yuNMyEnxTjHPSBPWVD8b+f612hWGGayZHKHxtWtxXDg=";
       };
 
       patches = [
@@ -99,8 +100,15 @@ let
           --add-flags "-jar $out/${apkeditor.outJar}"
       '';
 
+      doInstallCheck = true;
+      nativeInstallCheckInputs = [ versionCheckHook ];
+
+      passthru.updateScript = ./update.sh;
+
       meta = {
         description = "Powerful android apk resources editor";
+        homepage = "https://github.com/REAndroid/APKEditor";
+        changelog = "https://github.com/REAndroid/APKEditor/releases/tag/V${version}";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license = lib.licenses.asl20;
         platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ap/apkeditor/smali/default.nix b/pkgs/by-name/ap/apkeditor/smali/default.nix
index de6b87c8e82e..ee0032ad27d0 100644
--- a/pkgs/by-name/ap/apkeditor/smali/default.nix
+++ b/pkgs/by-name/ap/apkeditor/smali/default.nix
@@ -8,7 +8,7 @@
 let
   self = REAndroidLibrary {
     pname = "smali";
-    version = "0-unstable-2024-10-15";
+    version = "0-unstable-2024-11-24";
     projectName = "smali";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # it is hard to determine the actual commit that APKEditor is intended to use,
       # so I think we should use the latest commit that doesn't break compilation or basic functionality.
       # Currently this is the latest commit at the time of packaging.
-      rev = "c781eafb31f526abce9fdf406ce2c925fec20d28";
-      hash = "sha256-6tkvikgWMUcKwzsgbfpxlB6NZBAlZtTE34M3qPQw7Y4=";
+      rev = "76b35b4e0c9e8c874ca3e374bb943bba8d280770";
+      hash = "sha256-PhRBjiIKA4EIiafPplZNBErXG8V84Xn0cZLWVPmJelQ=";
     };
 
     patches = [
diff --git a/pkgs/by-name/ap/apkeditor/update.sh b/pkgs/by-name/ap/apkeditor/update.sh
new file mode 100755
index 000000000000..45b43b916690
--- /dev/null
+++ b/pkgs/by-name/ap/apkeditor/update.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+set -euo pipefail
+
+GITHUB_TOKEN="${GITHUB_TOKEN:-}"
+
+nixpkgs_attr() {
+  nix-instantiate --eval --raw --attr "$1"
+}
+
+github_api() {
+  local token_opt=()
+  if [[ -n "$GITHUB_TOKEN" ]]; then
+    token_opt=(-H "Authorization: Bearer $GITHUB_TOKEN")
+  fi
+  curl -fsS "${token_opt[@]}" "https://api.github.com$1"
+}
+
+update_mitm_cache() {
+  if [[ -z "$(nixpkgs_attr "$1.mitmCache.name")" ]]; then
+    return
+  fi
+  "$(nix-build -A "$1.mitmCache.updateScript")"
+}
+
+update() {
+  echo "Updating $1..." >&2
+
+  local owner="$(nixpkgs_attr "$1.src.owner")"
+  local repo="$(nixpkgs_attr "$1.src.repo")"
+
+  local old_version="$(nixpkgs_attr "$1.version")"
+  local use_last_commit=0
+  if [[ "$old_version" == *unstable* ]]; then
+    use_last_commit=1
+  fi
+
+  if (( use_last_commit )); then
+    local repo_info="$(github_api "/repos/$owner/$repo/commits?per_page=1" | jq ".[0]")"
+    local new_rev="$(echo "$repo_info" | jq -r .sha)"
+    local date="$(echo "$repo_info" | jq -r .commit.author.date)"
+    date="$(date -u -d "$date" +%Y-%m-%d)"
+    local new_version="${old_version%%-unstable*}-unstable-$(date -u -d "$date" +%Y-%m-%d)"
+    update-source-version "$1" "$new_version" --rev="$new_rev" --ignore-same-version --ignore-same-hash
+  else
+    local tag="$(github_api "/repos/$owner/$repo/releases/latest" | jq -r .tag_name)"
+    local new_version="${tag#V}"
+    update-source-version "$1" "$new_version" --ignore-same-version --ignore-same-hash
+  fi
+
+  update_mitm_cache "$1"
+}
+
+update apkeditor.passthru.deps.arsclib
+update apkeditor.passthru.deps.smali
+update apkeditor.passthru.deps.jcommand
+update apkeditor
diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index 03da54fb580c..30c3b94bbda8 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "0.30.15";
+  version = "0.30.20";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eFcj/Yo0qvIgZKiKkm4DNhslOLokFmLoj7QrjeK/iT8=";
+    hash = "sha256-ZmvEBWCtJ2GQO8sqjeSYMclMkVxjSiLBdrRf8N9zXiQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-mZg8OXPMeBAJYQWB0vrZC5fo0+xuU8ho/IE2j624RV8=";
+  vendorHash = "sha256-JFDwztOEupORbkhOm/Vl5SuTaLbdp8YXXRO0jVJI/Uk=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ap/appcleaner/package.nix b/pkgs/by-name/ap/appcleaner/package.nix
index 8f03b1dc92c2..c353691274a7 100644
--- a/pkgs/by-name/ap/appcleaner/package.nix
+++ b/pkgs/by-name/ap/appcleaner/package.nix
@@ -25,12 +25,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Uninstall unwanted apps";
     homepage = "https://freemacsoft.net/appcleaner";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ emilytrau ];
-    platforms = platforms.darwin;
+    maintainers = with lib.maintainers; [
+      emilytrau
+      iedame
+    ];
+    platforms = lib.platforms.darwin;
   };
 })
diff --git a/pkgs/by-name/ap/appcsxcad/package.nix b/pkgs/by-name/ap/appcsxcad/package.nix
index ae9504c3d2fa..4d1a5b3d82b5 100644
--- a/pkgs/by-name/ap/appcsxcad/package.nix
+++ b/pkgs/by-name/ap/appcsxcad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   csxcad,
   qcsxcad,
@@ -25,6 +26,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-KrsnCnRZRTbkgEH3hOETrYhseg5mCHPqhAbYyHlS3sk=";
   };
 
+  patches = [
+    # ref. https://github.com/thliebig/AppCSXCAD/pull/14 merged upstream
+    (fetchpatch {
+      name = "update-minimum-cmake-required.patch";
+      url = "https://github.com/thliebig/AppCSXCAD/commit/9585207eb08195c3f1c47dc9d6a80b563a3272e0.patch";
+      hash = "sha256-2+C3cqQMU3UL12h0f7EdBZVqeJVSPhDVbMOcqbOY0gg=";
+    })
+    (fetchpatch {
+      name = "remove-cmp0020-policy.patch";
+      url = "https://github.com/thliebig/AppCSXCAD/commit/688c07cd847f463a2a42f01d41751374b4f787c8.patch";
+      hash = "sha256-pa6imzrUoVA3Ebc4UGPACJ6qjYiHOjB5aQ9FN/CUpVM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     qt6.wrapQtAppsHook
diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix
new file mode 100644
index 000000000000..a4519d548f3d
--- /dev/null
+++ b/pkgs/by-name/ap/appfire-cli/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  makeBinaryWrapper,
+  coreutils,
+  findutils,
+  jre,
+
+  testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "appfire-cli";
+  version = "12.1.0";
+
+  src = fetchzip {
+    url = "https://appfire.atlassian.net/wiki/download/attachments/60562669/acli-${finalAttrs.version}-distribution.zip";
+    hash = "sha256-6p8i5ec8IAygACdsdzP8g5u24mQZ7Ci684xuu/kAADo=";
+  };
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/{,doc/}appfire-cli
+    cp -r acli.sh lib $out/share/appfire-cli
+    cp -r README.txt license $out/share/doc/appfire-cli
+
+    ACLI_SHELL=${finalAttrs.passthru.shellNames.${stdenv.hostPlatform.system} or "unsupport"}
+    if test -f $ACLI_SHELL; then
+      install -Dm755 $ACLI_SHELL $out/share/appfire-cli/$ACLI_SHELL
+    fi
+
+    substituteInPlace $out/share/appfire-cli/acli.sh \
+      --replace-fail 'java $' '${lib.getExe jre} $' \
+      --replace-fail '(find' '(${lib.getExe findutils}' \
+      --replace-fail dirname ${lib.getExe' coreutils "dirname"} \
+      --replace-fail uname ${lib.getExe' coreutils "uname"}
+    makeBinaryWrapper $out/share/appfire-cli/acli.sh $out/bin/acli
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    shellNames = {
+      "x86_64-linux" = "bin/shell-linux-amd64";
+      "aarch64-linux" = "bin/shell-linux-arm64";
+      "x86_64-darwin" = "bin/shell-macos-amd64";
+      "aarch64-darwin" = "bin/shell-macos-arm64";
+    };
+    # versionCheckHook cannot be used because appfire-cli requires $HOME to be set
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "acli -a getClientInfo";
+    };
+  };
+
+  meta = {
+    description = "Integrated family of CLIs for Atlassian, Atlassian-related, and other applications";
+    longDescription = ''
+      Appfire CLI (ACLI) is an integrated family of CLIs for Atlassian,
+      Atlassian-related, and other applications.
+
+      ACLI provides a consistent and reliable automation platform that allows
+      users, administrators, script writers, and DevOps developers to perform
+      tasks, implement business processes, or apply general automation with
+      Atlassian products.
+
+      The CLIs are built on the Atlassian remote APIs and deliver a higher
+      level, client-based API that is easier to use and more powerful than
+      the underlying product APIs.
+
+      The upstream documentation describes configuring acli by placing
+      {file}`acli.properties` in the same directory as {file}`acli.sh`.
+      Since the /nix/store is not writable, you can instead place the file
+      at {file}`$HOME/acli.properties` to achieve the same effect.
+    '';
+    homepage = "https://apps.appf.re/acli";
+    license = lib.licenses.unfreeRedistributable;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = with lib.maintainers; [ twey ];
+    mainProgram = "acli";
+    inherit (jre.meta) platforms;
+  };
+})
diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix
index b0ff7b158f7e..1ffd5111dd79 100644
--- a/pkgs/by-name/ap/appimageupdate/package.nix
+++ b/pkgs/by-name/ap/appimageupdate/package.nix
@@ -19,26 +19,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "appimageupdate";
-  version = "2.0.0-alpha-1-20230526";
+  version = "2.0.0-alpha-1-20251018";
 
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "AppImageUpdate";
     rev = finalAttrs.version;
-    hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
+    hash = "sha256-S3MRBTtPc4S6lqvAZpbZFgOVgsX6GpHZ8PkwEtipT1M=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "include-algorithm-header.patch";
-      url = "https://github.com/AppImageCommunity/AppImageUpdate/commit/5e91de84aba775ba8d3a4771e4f7f06056f9b764.patch";
-      hash = "sha256-RX2HFAlGsEjXona7cL3WdwwiiA0u9CnfvHMC6S0DeLY=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \
       --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' \
       --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \
       --replace-fail '<local dev build>' '<nixpkgs build>'
diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix
index e3353ebd71b8..473216d965f1 100644
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNpmPackage,
   copyDesktopItems,
-  electron_36,
+  electron_38,
   fetchFromGitHub,
   makeDesktopItem,
   makeWrapper,
@@ -10,7 +10,7 @@
 }:
 
 let
-  electron = electron_36;
+  electron = electron_38;
   version = "2025.8.2";
 in
 
diff --git a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
index 68704a0d4a4c..10935377cd22 100644
--- a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
@@ -42,7 +42,6 @@ in
 self: super: {
   buildPhase = super.buildPhase or "" + ''
     mkdir -p System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
-    ln -s A System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/Current
     ln -s Versions/Current/Headers System/Library/PrivateFrameworks/CoreSymbolication.framework/Headers
     cp '${CoreSymbolication}/include/'*.h System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
   '';
diff --git a/pkgs/by-name/ap/apple-sdk/common/plists.nix b/pkgs/by-name/ap/apple-sdk/common/plists.nix
index 33bb1f134c12..70184d89429b 100644
--- a/pkgs/by-name/ap/apple-sdk/common/plists.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/plists.nix
@@ -2,15 +2,28 @@
   lib,
   stdenvNoCC,
   xcodePlatform,
+  sdkVersion,
 }:
 
 let
   inherit (lib.generators) toPlist;
 
-  Info = {
-    CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}";
-    Type = "Platform";
+  Info = rec {
+    CFBundleIdentifier = "com.apple.platform.${Name}";
+    DefaultProperties = {
+      COMPRESS_PNG_FILES = "NO";
+      DEPLOYMENT_TARGET_SETTING_NAME = stdenvNoCC.hostPlatform.darwinMinVersionVariable;
+      STRIP_PNG_TEXT = "NO";
+    };
+    Description = if stdenvNoCC.hostPlatform.isMacOS then "macOS" else "iOS";
+    FamilyDisplayName = Description;
+    FamilyIdentifier = lib.toLower xcodePlatform;
+    FamilyName = Description;
+    Identifier = CFBundleIdentifier;
+    MinimumSDKVersion = stdenvNoCC.hostPlatform.darwinMinVersion;
     Name = lib.toLower xcodePlatform;
+    Type = "Platform";
+    Version = sdkVersion;
   };
 
   # These files are all based off of Xcode spec files found in
diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
index fe58181980b6..f9551b5b9bad 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
@@ -56,16 +56,19 @@ self: super: {
       darwin.libsbuf
       # Shipped with the SDK only as a library with no headers
       (lib.getLib darwin.libutil)
-      # Required by some SDK headers
-      cupsHeaders
     ]
     # x86_64-darwin links the object files from Csu when targeting very old releases
     ++ lib.optionals stdenvNoCC.hostPlatform.isx86_64 [ darwin.Csu ];
 
   # The Darwin module for Swift requires certain headers to be included in the SDK (and not just be propagated).
   buildPhase = super.buildPhase or "" + ''
-    for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'*; do
+    for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'* '${cupsHeaders}/include/'*; do
       ln -s "$header" "usr/include/$(basename "$header")"
     done
   '';
+
+  # Exported to allow the headers to pass the requisites check in the stdenv bootstrap.
+  passthru = (super.passthru or { }) // {
+    cups-headers = cupsHeaders;
+  };
 }
diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
index f993441c757e..ff0094df60e0 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
@@ -3,11 +3,12 @@
   pkgsBuildHost,
   stdenv,
   stdenvNoCC,
+  sdkVersion,
 }:
 
 let
   plists = import ./plists.nix {
-    inherit lib stdenvNoCC;
+    inherit lib stdenvNoCC sdkVersion;
     xcodePlatform = if stdenvNoCC.hostPlatform.isMacOS then "MacOSX" else "iPhoneOS";
   };
   inherit (pkgsBuildHost) darwin cctools xcbuild;
@@ -38,11 +39,15 @@ self: super: {
     # Include `libtool` in the toolchain, so `xcrun -find libtool` can find it without requiring `cctools.libtool`
     # as a `nativeBuildInput`.
     mkdir -p "$toolchainsPath/usr/bin"
-    ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
+    if [ -e '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' ]; then
+      ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
+    fi
 
     # Include additional binutils required by some packages (such as Chromium).
     for tool in lipo nm otool size strip; do
-      ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
+      if [ -e '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool ]; then
+        ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
+      fi
     done
   '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
index 2dc99f12620d..c67485419908 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
@@ -1,538 +1,4 @@
 {
-  "11.3": {
-    "CarbonHeaders": {
-      "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
-      "version": "18.1"
-    },
-    "CommonCrypto": {
-      "hash": "sha256-92v9tuNLqvalwYV4AqQllA8yN9fqGjSpc4MNAmFPrbk=",
-      "version": "60178.100.1"
-    },
-    "IOAudioFamily": {
-      "hash": "sha256-dSSbt9ZoL/Tq2xXwvvXsDmD3Xru7igzdK1MxGL1K+Aw=",
-      "version": "300.6.1"
-    },
-    "IOBDStorageFamily": {
-      "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
-      "version": "20.100.1"
-    },
-    "IOCDStorageFamily": {
-      "hash": "sha256-w0YhZ38RBfnxSc74Q8r5UdK+WiWOSAX46r5hahHLnSg=",
-      "version": "59"
-    },
-    "IODVDStorageFamily": {
-      "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
-      "version": "43"
-    },
-    "IOFWDVComponents": {
-      "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
-      "version": "208"
-    },
-    "IOFireWireAVC": {
-      "hash": "sha256-7H3WcZC/HuS9xsTNDWRqt+1JzUNK4ndvd4u2ru0GGRE=",
-      "version": "428"
-    },
-    "IOFireWireFamily": {
-      "hash": "sha256-2xppN8RJ9cxrHWjPQ4bUIjtupPbzfmrm3rXnT/9QVfc=",
-      "version": "483"
-    },
-    "IOFireWireSBP2": {
-      "hash": "sha256-kfhmZy8veqI3/XHDtOTKmKj6P7s+j0B+BiAbcjhGq0M=",
-      "version": "442"
-    },
-    "IOFireWireSerialBusProtocolTransport": {
-      "hash": "sha256-WDq2Ak72Jw6gYNIKgZkiexA6LzccrPn1kpSbW5U50ek=",
-      "version": "257.40.1"
-    },
-    "IOGraphics": {
-      "hash": "sha256-kEP4RWIZwu3ZPIq9IAPUKM0gIXHr8xD50SnGNFCQRcI=",
-      "version": "585.1"
-    },
-    "IOHIDFamily": {
-      "hash": "sha256-QASfvttke+AUx55In4DD4vsQGzC3nbe+MugQQ4ddXGU=",
-      "version": "1633.100.36"
-    },
-    "IOKitUser": {
-      "hash": "sha256-NQCRrufElx00B7CqqslBi5BTxf5Zs4lcMcJig4Eab0k=",
-      "version": "1845.100.19"
-    },
-    "IONetworkingFamily": {
-      "hash": "sha256-HqTKzrX75mMFYYbxNKwPdXmI7h7t/QWuO3W1Qo//zIo=",
-      "version": "151.40.1"
-    },
-    "IOSerialFamily": {
-      "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
-      "version": "93"
-    },
-    "IOStorageFamily": {
-      "hash": "sha256-dy6CYz/z6SwPw0YfC6GLZO2u62Xy8otMDUNrZ5JhTDY=",
-      "version": "260.100.1"
-    },
-    "IOUSBFamily": {
-      "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
-      "version": "630.4.5"
-    },
-    "Libc": {
-      "hash": "sha256-v01g/EtMW/STZQ1neKDMyUGL7sgaCzlwXN0VDaj/Mf0=",
-      "version": "1439.100.3"
-    },
-    "Libinfo": {
-      "hash": "sha256-T7KO6zfswjyTIKSdZJCbvfsdqQfPMLj5nheX9iSIl9o=",
-      "version": "542.40.3"
-    },
-    "Libm": {
-      "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
-      "version": "2026"
-    },
-    "Libnotify": {
-      "hash": "sha256-vcDjdwB5OiTEUdl8ISezzpoHeFttkdvkulY/YbUOZjk=",
-      "version": "279.40.4"
-    },
-    "Librpcsvc": {
-      "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
-      "version": "26"
-    },
-    "Libsystem": {
-      "hash": "sha256-24T9aD4W71prcpr3MnnaU3pfxIzIwkOz39OyhCwPO/E=",
-      "version": "1292.100.5"
-    },
-    "OpenDirectory": {
-      "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
-      "version": "146"
-    },
-    "Security": {
-      "hash": "sha256-o5MyyqDpERvNPvbEfXNgqMIq0YpQV0+ju72C9g/9OdI=",
-      "version": "59754.100.106"
-    },
-    "architecture": {
-      "hash": "sha256-pIX9pEXE1Xjll9qwiWrMRwqw6G4g0isto/ALHsmkUSc=",
-      "version": "279"
-    },
-    "configd": {
-      "hash": "sha256-WEorIW5Vl8E9/aB0RBTY2bhkfVOF3tckjNztGDOOueA=",
-      "version": "1109.101.1"
-    },
-    "copyfile": {
-      "hash": "sha256-3BHFM67dvwUpinzF0pSX3QiUbIsqtLo77WzB3tMbTW4=",
-      "version": "173.40.2"
-    },
-    "dtrace": {
-      "hash": "sha256-FfyaYjEMDeL9wGdUyZ4eJdkbkp/WpdTGyBvaorwKSi8=",
-      "version": "370.40.1"
-    },
-    "dyld": {
-      "hash": "sha256-dtDTh6YqubBI4Z+QeytwGgUmU6tutvonIWHqzw6zuxo=",
-      "version": "851.27"
-    },
-    "eap8021x": {
-      "hash": "sha256-Ap7qumn/oKYe424n2NW6QkuivgDyLoJgDfl30Q5O7Jo=",
-      "version": "304.100.1"
-    },
-    "hfs": {
-      "hash": "sha256-MSnc1pB8DcB+mn308snTD1uRQ7Ro4aWyFuLdWjHtAG4=",
-      "version": "556.100.11"
-    },
-    "launchd": {
-      "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
-      "version": "842.1.4"
-    },
-    "libclosure": {
-      "hash": "sha256-UgmMnDUosaC2yI7IyQ7mkNwZ6/oft77ay+SmGSoycIw=",
-      "version": "79"
-    },
-    "libdispatch": {
-      "hash": "sha256-K8QL9NfjGsj8c0jbocKegmKBqydimpKu8yRXnQQqdH8=",
-      "version": "1271.100.5"
-    },
-    "libmalloc": {
-      "hash": "sha256-k3dJk7S0Lom3B28vRI9QxIuo0AOkd9OHzWO7MandfUw=",
-      "version": "317.100.9"
-    },
-    "libplatform": {
-      "hash": "sha256-BSIGgKj5B6Dr0KQiIl2LSA3+ZEhzk/snQeCauErcq6k=",
-      "version": "254.80.2"
-    },
-    "libpthread": {
-      "hash": "sha256-cGaDXLTztUYppbMvv41qj5RqONXfhfdHpt9dqY6+5Lc=",
-      "version": "454.100.8"
-    },
-    "mDNSResponder": {
-      "hash": "sha256-eqcv174vIwWYXrIhzph+KO1zG8TdK5jRFVgsaAlV9es=",
-      "version": "1310.100.10"
-    },
-    "objc4": {
-      "hash": "sha256-rqOPyN9S4KbMhCCVvtyEmGxTWzy+tsh0kfu3k47szXo=",
-      "version": "818.2"
-    },
-    "ppp": {
-      "hash": "sha256-pSOlu/yXQhopCHDLnmhUnQeU89MkXhkQB0ZrN9r3qyk=",
-      "version": "877.40.2"
-    },
-    "removefile": {
-      "hash": "sha256-B79A9AQ1/cB+zlmVKWcEXVOJHW6rOrX40S/hrMuWqXU=",
-      "version": "49.101.1"
-    },
-    "xnu": {
-      "hash": "sha256-M1XWippH55VUJu4aosRFX8j9aOm/PONYVjPZOPufD80=",
-      "version": "7195.101.1"
-    }
-  },
-  "12.3": {
-    "CarbonHeaders": {
-      "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
-      "version": "18.1"
-    },
-    "CommonCrypto": {
-      "hash": "sha256-HTGBUE6vHjS80CFTiIQ8F17m8Yd2ZRHccvFu2CA2P9U=",
-      "version": "60191.100.1"
-    },
-    "IOAudioFamily": {
-      "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=",
-      "version": "340.2"
-    },
-    "IOBDStorageFamily": {
-      "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
-      "version": "22"
-    },
-    "IOCDStorageFamily": {
-      "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
-      "version": "61"
-    },
-    "IODVDStorageFamily": {
-      "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
-      "version": "43"
-    },
-    "IOFWDVComponents": {
-      "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
-      "version": "208"
-    },
-    "IOFireWireAVC": {
-      "hash": "sha256-ruAomp5Lv7zuPu9vHsNKoPtDvD1AIrRARsPMpcx/fh0=",
-      "version": "430"
-    },
-    "IOFireWireFamily": {
-      "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=",
-      "version": "487"
-    },
-    "IOFireWireSBP2": {
-      "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=",
-      "version": "445"
-    },
-    "IOFireWireSerialBusProtocolTransport": {
-      "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=",
-      "version": "260"
-    },
-    "IOGraphics": {
-      "hash": "sha256-lzxBrPLlF01+2jFKRJtSnwpf0r05C0H3tM7Q0N1RUPA=",
-      "version": "594"
-    },
-    "IOHIDFamily": {
-      "hash": "sha256-EQQHAS8WKUoTxZscixylc2ZMoD4UYBlHRUj2O7Ikgac=",
-      "version": "1787.100.13"
-    },
-    "IOKitUser": {
-      "hash": "sha256-Cdfa/YXM0W4O15femcU0G1Xcpbm+iADWIBWIdzoeuTE=",
-      "version": "1955.100.5"
-    },
-    "IONetworkingFamily": {
-      "hash": "sha256-odUZJQq8lb3UYk7F8dBi1Hds00M+kwdlyGwZkVkSwTg=",
-      "version": "160.100.2"
-    },
-    "IOSerialFamily": {
-      "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
-      "version": "93"
-    },
-    "IOStorageFamily": {
-      "hash": "sha256-2b32qe1z7Z+Od1dVlAGdM142DdF8cBaRC+ElysSuAQ4=",
-      "version": "290.100.6"
-    },
-    "IOUSBFamily": {
-      "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
-      "version": "630.4.5"
-    },
-    "Libc": {
-      "hash": "sha256-obalDxsbE+7gm7YwznUbfxL7MCriamQFP3DrXleNwU4=",
-      "version": "1507.100.9"
-    },
-    "Libinfo": {
-      "hash": "sha256-OjnnSHEcifcWarVyXiHvYg/9jbCQy5/lzaq6fJRriy0=",
-      "version": "554"
-    },
-    "Libm": {
-      "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
-      "version": "2026"
-    },
-    "Libnotify": {
-      "hash": "sha256-JXG0kHEdoIs6krVZ4+KsRVES4AuNjnQi8qF+XKSp5jE=",
-      "version": "301"
-    },
-    "Librpcsvc": {
-      "hash": "sha256-8e8E9TkRTAep3/miyqhF/mSkNdlym12W+AVhXF94+Bg=",
-      "version": "26"
-    },
-    "Libsystem": {
-      "hash": "sha256-mPPAxo67wWLtemO+PuKg1Ui0zKEfjnYVj/qX1/0kNBs=",
-      "version": "1311.100.3"
-    },
-    "OpenDirectory": {
-      "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
-      "version": "146"
-    },
-    "Security": {
-      "hash": "sha256-cIqfXcfQOZonxaKndH80xC5YmmveHw+TxHOxqvc9u8I=",
-      "version": "60158.100.133"
-    },
-    "architecture": {
-      "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
-      "version": "280.100.2"
-    },
-    "configd": {
-      "hash": "sha256-X34mjXdil4HeBLyqY4tyBWdmpjsOFTJDdDE81UQf708=",
-      "version": "1163.100.19.0.2"
-    },
-    "copyfile": {
-      "hash": "sha256-3/zI3j/m9b13hebjCsOLry3Mf8ADdWJgrtQOdD0huG0=",
-      "version": "180.100.3"
-    },
-    "dtrace": {
-      "hash": "sha256-q8H6slCN4RwJ5TxC5s3og6cIbjALySP5ODfVw6a/a+M=",
-      "version": "375"
-    },
-    "dyld": {
-      "hash": "sha256-v1kk/Z3eI2sufNm2rx3FRbA/f9BeKJ3t9i9W7tTksXg=",
-      "version": "955"
-    },
-    "eap8021x": {
-      "hash": "sha256-SayP1d2KWoRShykBA/NrQCuRnPoxlTiaLwifoqm0Gkg=",
-      "version": "315.100.2"
-    },
-    "hfs": {
-      "hash": "sha256-q1yOIei98oudGAoBMNPRTV5EOYpXFL7iYmlCYsKsG0o=",
-      "version": "583.100.10"
-    },
-    "launchd": {
-      "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
-      "version": "842.1.4"
-    },
-    "libclosure": {
-      "hash": "sha256-Ez75a0m+fJas7mGqFeDjjpc7sFDnyirRbtLMTYQDVxw=",
-      "version": "79.1"
-    },
-    "libdispatch": {
-      "hash": "sha256-/VbSUtnWyToWOUyAAg/3wImbJ2w5k1tbJkt827x2lIE=",
-      "version": "1325.100.36"
-    },
-    "libmalloc": {
-      "hash": "sha256-tyYce5nk0N923MbzoGzkGqunoKwArbTiZl8PCppYpso=",
-      "version": "374.100.5"
-    },
-    "libplatform": {
-      "hash": "sha256-JUD2NdS310OhZ0F8gnOvoD8AgEtWRtPahKDw5iE2QJU=",
-      "version": "273.100.5"
-    },
-    "libpthread": {
-      "hash": "sha256-al8QumtH7/D04oJ4LUSYW+6OdX0Ko3S3rwYU53n9/54=",
-      "version": "486.100.11"
-    },
-    "mDNSResponder": {
-      "hash": "sha256-hsV0VYTPoO5YpaxrUXpXFy97LxlERzrQT0FRfCMOwic=",
-      "version": "1557.101.2"
-    },
-    "objc4": {
-      "hash": "sha256-MKXnfZL46VtmAQMolqd7ATF9fYjCNstapGQfcH4uVwo=",
-      "version": "841.13"
-    },
-    "ppp": {
-      "hash": "sha256-YyCE19T3rcM1G5jdXuYXuBXblJgR/nelvjpq+9maMhw=",
-      "version": "884"
-    },
-    "removefile": {
-      "hash": "sha256-xF1VtTUhoiGsFQsvuFnFYemwiCdsKeriFJv51vRLqmw=",
-      "version": "60"
-    },
-    "xnu": {
-      "hash": "sha256-bfFmDfRBSvoWMdQYVstsJRbcq+15lDjVFqk+0XYWpy8=",
-      "version": "8020.101.4"
-    }
-  },
-  "13.3": {
-    "CarbonHeaders": {
-      "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
-      "version": "18.1"
-    },
-    "CommonCrypto": {
-      "hash": "sha256-tftAQbs5xIOc5VZLVAKXAUvle9WO/i33/pQ3D64l/yI=",
-      "version": "600016.100.4"
-    },
-    "IOAudioFamily": {
-      "hash": "sha256-CuBFZeX2JTKIab2xpp+Yvn66bCl4+aKOv9TvzJef20c=",
-      "version": "440.2"
-    },
-    "IOBDStorageFamily": {
-      "hash": "sha256-UgLMsQBe1QLzlbScmPmASBN7VH4YBmNOUX2CEDezjmE=",
-      "version": "22"
-    },
-    "IOCDStorageFamily": {
-      "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
-      "version": "61"
-    },
-    "IODVDStorageFamily": {
-      "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
-      "version": "43"
-    },
-    "IOFWDVComponents": {
-      "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
-      "version": "208"
-    },
-    "IOFireWireAVC": {
-      "hash": "sha256-IUytBKhhCgg0vtI+7q8d5kxpOUgO3tQD7TMy++jrorc=",
-      "version": "431"
-    },
-    "IOFireWireFamily": {
-      "hash": "sha256-W0KOF4hkA7kFOnL1ThAeFU/YlhFVqoqk9uzGjcBppX8=",
-      "version": "487"
-    },
-    "IOFireWireSBP2": {
-      "hash": "sha256-bItnRQIaGUxMyiU0q+4N8e5+jYiDEOUPmsrKhBFXvok=",
-      "version": "445"
-    },
-    "IOFireWireSerialBusProtocolTransport": {
-      "hash": "sha256-P7egeaD9SSa+YyrIRzM44gILKbIL7vezXK3M6q3MBOI=",
-      "version": "260"
-    },
-    "IOGraphics": {
-      "hash": "sha256-KubCz8DNwf1WuF7LrtARM2VJugFDP0wfHoUhnIz/faQ=",
-      "version": "596.1"
-    },
-    "IOHIDFamily": {
-      "hash": "sha256-7UFMBdF5k9aVFVuoL2riozzKmn8uOt87Aitt8j6XkN8=",
-      "version": "1915.100.21"
-    },
-    "IOKitUser": {
-      "hash": "sha256-hgFRHPAuoqSf6aRUBUyfU2y2+dBUA34DKwLHLwhPNms=",
-      "version": "2022.100.19"
-    },
-    "IONetworkingFamily": {
-      "hash": "sha256-SwZvXLSB9cMHssZU4dCogGVoV64qYdGN1CGYV3FZ6tk=",
-      "version": "170"
-    },
-    "IOSerialFamily": {
-      "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
-      "version": "93"
-    },
-    "IOStorageFamily": {
-      "hash": "sha256-g4oCrxM5VtHm8h1M+zM81Ar1LsaaiJZLej5fT8EHPG4=",
-      "version": "302.100.1"
-    },
-    "IOUSBFamily": {
-      "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
-      "version": "630.4.5"
-    },
-    "Libc": {
-      "hash": "sha256-dqbdWtBuaRq3IHnSUPH2aj8h/X4zCwUNSOeSdwfKvN8=",
-      "version": "1534.100.14"
-    },
-    "Libinfo": {
-      "hash": "sha256-iUyndeUXx7FFZ/jgJ6jRwda3IChOaMs4dZW/ISuAJ1E=",
-      "version": "564.101.1"
-    },
-    "Libm": {
-      "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
-      "version": "2026"
-    },
-    "Libnotify": {
-      "hash": "sha256-7AwTfogvCUMdoabxf413ENWXtFTOM6AUldccoPQ89sU=",
-      "version": "312"
-    },
-    "Librpcsvc": {
-      "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
-      "version": "31"
-    },
-    "Libsystem": {
-      "hash": "sha256-IIksf0yCg3GdME3HofYzD1MRC+ofsPhHcxddmNd7V2M=",
-      "version": "1319.100.3"
-    },
-    "OpenDirectory": {
-      "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
-      "version": "146"
-    },
-    "Security": {
-      "hash": "sha256-lPq58QIx+H9DouTXAUJSMf1X7dj9V6xu3c8VWr2R1IY=",
-      "version": "60420.101.4"
-    },
-    "architecture": {
-      "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
-      "version": "282"
-    },
-    "configd": {
-      "hash": "sha256-M/fRAnUw2wObhCQp9a6zQbCGhACCQHpju4/1+KGlkjg=",
-      "version": "1241.100.11"
-    },
-    "copyfile": {
-      "hash": "sha256-te3WcQudrXPqnTM1s/AtsTdu7VIXf5dIASy+IGnIxv0=",
-      "version": "191.100.3"
-    },
-    "dtrace": {
-      "hash": "sha256-7jAG66hG9qmqpRbECazMD1Pyi53CWTOGNnZca1NpcxE=",
-      "version": "397"
-    },
-    "dyld": {
-      "hash": "sha256-OkDOTV86EB44LxsqwTD4ZncMcr7iqSHXxw+6U+AP7oU=",
-      "version": "1066.8"
-    },
-    "eap8021x": {
-      "hash": "sha256-FMG+IGVPpcwrRe2/OKpFycrY/EFPZkge2vX61NgorGg=",
-      "version": "336.100.6"
-    },
-    "hfs": {
-      "hash": "sha256-Au5VDrYRBerI1I6rjC0lVDwB5IBwGARrAdcTI4M+Fx0=",
-      "version": "627.100.6"
-    },
-    "launchd": {
-      "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
-      "version": "842.1.4"
-    },
-    "libclosure": {
-      "hash": "sha256-V1tpp/XG6baETunJt029rI6wp6moYSnFprt+bNGaQ40=",
-      "version": "87"
-    },
-    "libdispatch": {
-      "hash": "sha256-d1VObN11bNdtNJlZQqp2y8yP4lit5Wbj+4/aN3StsPc=",
-      "version": "1415.100.11"
-    },
-    "libmalloc": {
-      "hash": "sha256-jcR1AO/chcZzfAvELkC+U3q9tzxqPdwgLcHrnkQmN4M=",
-      "version": "425.100.7"
-    },
-    "libplatform": {
-      "hash": "sha256-+BB23YGGT0hA326Dh+3k2UvAqBdEJ84A6yGA/ccrihg=",
-      "version": "292.100.1"
-    },
-    "libpthread": {
-      "hash": "sha256-/l17vMWhfAs0YhIHi+l84vGVxpGFOzocvxxii7B+WUk=",
-      "version": "514.100.2"
-    },
-    "mDNSResponder": {
-      "hash": "sha256-M4yfQsdlKwes5M2QOEEfjv7ldSVZw7oGXLISaDcObjs=",
-      "version": "1807.101.2"
-    },
-    "objc4": {
-      "hash": "sha256-qOV9YfP59WP8Izp+IvM/aiYTW8fCoq21uxU64OcIHk8=",
-      "version": "876"
-    },
-    "ppp": {
-      "hash": "sha256-Sg5c5qOSk5TaS4pgXZ+eAy/iuGBa1oFML0dkj463DcE=",
-      "version": "1010"
-    },
-    "removefile": {
-      "hash": "sha256-oQorWHlJ0ctekCTUsLXHko8k1aCKBJ00A2FHkRd4B3E=",
-      "version": "68"
-    },
-    "xnu": {
-      "hash": "sha256-w9/lDZ/E54YzYQkOWptNpX5GomgI/fvZLAy7NY3O+IQ=",
-      "version": "8796.101.5"
-    }
-  },
   "14.4": {
     "CarbonHeaders": {
       "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
@@ -888,5 +354,183 @@
       "hash": "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=",
       "version": "11417.121.6"
     }
+  },
+  "26.0": {
+    "CarbonHeaders": {
+      "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
+      "version": "18.1"
+    },
+    "CommonCrypto": {
+      "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=",
+      "version": "600035"
+    },
+    "IOAudioFamily": {
+      "hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=",
+      "version": "700.2"
+    },
+    "IOBDStorageFamily": {
+      "hash": "sha256-OcQUJ3nEfrpvWX/npnedJ4PECIGWFSLiM0PKoiH911w=",
+      "version": "26"
+    },
+    "IOCDStorageFamily": {
+      "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
+      "version": "62"
+    },
+    "IODVDStorageFamily": {
+      "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
+      "version": "46"
+    },
+    "IOFWDVComponents": {
+      "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
+      "version": "208"
+    },
+    "IOFireWireAVC": {
+      "hash": "sha256-qR9lSTa7PN5Z9Nis4tfuXlcZGMIU48dete/NPD0UBbE=",
+      "version": "436"
+    },
+    "IOFireWireFamily": {
+      "hash": "sha256-hmErAXjLWIelqJaCrB8J4IiIxyB7S6EHFY+AY9YhmKQ=",
+      "version": "492"
+    },
+    "IOFireWireSBP2": {
+      "hash": "sha256-Xk+PDnUaO9q46nQwHwTKf/QXtGclfs0wTWiUbcV7e4s=",
+      "version": "454"
+    },
+    "IOFireWireSerialBusProtocolTransport": {
+      "hash": "sha256-cM/VFhVWNVwdJYk+mme0UYttQd7eJwd7Hlo7KNRyHY0=",
+      "version": "262"
+    },
+    "IOGraphics": {
+      "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=",
+      "version": "599"
+    },
+    "IOHIDFamily": {
+      "hash": "sha256-YLnabX90g4Q8LxjwVuJF6KODCDxychWV+VJaNG9d8fI=",
+      "version": "2222.0.24"
+    },
+    "IOKitUser": {
+      "hash": "sha256-ngwi8YMUqE0q8j7Lr5cqJwi2V+IDu3ie3bduotHIUJU=",
+      "version": "100222.0.4"
+    },
+    "IONetworkingFamily": {
+      "hash": "sha256-ZF5ML41Y1l1liQn32qTkcl4mMvx9Xdizb9VgvTzVTL4=",
+      "version": "186"
+    },
+    "IOSerialFamily": {
+      "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
+      "version": "93"
+    },
+    "IOStorageFamily": {
+      "hash": "sha256-1FKSF622qeXPGngA3UmQ2M/IU1pdlMoYBPbXytUFDaQ=",
+      "version": "331"
+    },
+    "IOUSBFamily": {
+      "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
+      "version": "630.4.5"
+    },
+    "Libc": {
+      "hash": "sha256-k+HQ+qgye0ORFm0hU8WzE4ysbbEoFZ7wcbVl5giDH/E=",
+      "version": "1725.0.11"
+    },
+    "Libinfo": {
+      "hash": "sha256-4InBEPi0n2EMo/8mIBib1Im4iTKRcRJ4IlAcLCigVGk=",
+      "version": "600"
+    },
+    "Libm": {
+      "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
+      "version": "2026"
+    },
+    "Libnotify": {
+      "hash": "sha256-p8cJZlBYOFmI1NDHXGYjgcv8z9Ldc1amZuYlxxJfeVY=",
+      "version": "344.0.1"
+    },
+    "Librpcsvc": {
+      "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
+      "version": "31"
+    },
+    "Libsystem": {
+      "hash": "sha256-/NlSwPaoTVx+bl9hYsfz3C5MuLdqGv4vdAh0KDbDKmY=",
+      "version": "1356"
+    },
+    "OpenDirectory": {
+      "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
+      "version": "146"
+    },
+    "Security": {
+      "hash": "sha256-oxOvZsDoNYZNiWf+MASHrR4Q2o5oaqvK2We51hH7CO8=",
+      "version": "61901.0.87.0.1"
+    },
+    "architecture": {
+      "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
+      "version": "282"
+    },
+    "configd": {
+      "hash": "sha256-58or+OQP788UgQKO7Y8k8pY/enaSqH971ks7xCPu8fA=",
+      "version": "1385.0.7"
+    },
+    "copyfile": {
+      "hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=",
+      "version": "230.0.1.0.1"
+    },
+    "dtrace": {
+      "hash": "sha256-5HpH6Cg8vWWzOX5ADD//izKDvqGnzV05Giju8lmGeyA=",
+      "version": "413"
+    },
+    "dyld": {
+      "hash": "sha256-jzoFLwbms0rUwzyjYif/r6Rmr4kyn+as/bhc4paEPeY=",
+      "version": "1323.3"
+    },
+    "eap8021x": {
+      "hash": "sha256-17bseWT4OWMA8hF+YSDDjxhVyJpbpP2xwv8dGti1YoM=",
+      "version": "368.0.3"
+    },
+    "hfs": {
+      "hash": "sha256-OkgqZ03gwn2hTuHxZrPDmQOrY4Dwu7MrX+BfG+PTgvE=",
+      "version": "704.0.3.0.2"
+    },
+    "launchd": {
+      "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
+      "version": "842.1.4"
+    },
+    "libclosure": {
+      "hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=",
+      "version": "96"
+    },
+    "libdispatch": {
+      "hash": "sha256-L0+Ho9dAlMXVpqFEGIcIMsJc0gULckRulUImNEZe5MU=",
+      "version": "1542.0.4"
+    },
+    "libmalloc": {
+      "hash": "sha256-482hgm1ESr3LWC/JhuQNGNu9smsa2Eap49/eH+YNAio=",
+      "version": "792.1.1"
+    },
+    "libplatform": {
+      "hash": "sha256-wGZ2Im81mRXx6epgj/tbOJpg89CEbAr0Z8oFEpkyNMU=",
+      "version": "359.1.2"
+    },
+    "libpthread": {
+      "hash": "sha256-VuMpQjxuMsdHsFq0q6QIWSWi88gVF2jNzIfti20Gkbw=",
+      "version": "539"
+    },
+    "mDNSResponder": {
+      "hash": "sha256-iRqCpPAQDRjgRbRz3s6q2oyzq6xo+w4FTBai79104Zo=",
+      "version": "2881.0.25"
+    },
+    "objc4": {
+      "hash": "sha256-Nlgr36yLvGkUJIEFQ5w8FAB0r2syEsRTw0KuUShNT8E=",
+      "version": "950"
+    },
+    "ppp": {
+      "hash": "sha256-FzHZ05o7JxwgTqz0e3D68b/DiLu2x2ErzGMh0U78fLo=",
+      "version": "1020.1.1"
+    },
+    "removefile": {
+      "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
+      "version": "84"
+    },
+    "xnu": {
+      "hash": "sha256-Cuf7kPtsn4CPXqyZmxVsJlA5i+Ikryp8ezJyGrvT63c=",
+      "version": "12377.1.9"
+    }
   }
 }
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
index 6c0b1ecabf46..b58641c2602a 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
@@ -1,28 +1,4 @@
 {
-  "11": {
-    "urls": [
-      "https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg",
-      "https://web.archive.org/web/20250210235110/https://swcdn.apple.com/content/downloads/02/62/071-54303-A_EU2CL1YVT7/943i95dpeyi2ghlnj2mgyq3t202t5gf18b/CLTools_macOSNMOS_SDK.pkg"
-    ],
-    "version": "11.3",
-    "hash": "sha256-/go8utcx3jprf6c8V/DUbXwsmNYSFchOAai1OaJs3Bg="
-  },
-  "12": {
-    "urls": [
-      "https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg",
-      "https://web.archive.org/web/20250210235341/https://swcdn.apple.com/content/downloads/24/42/002-83793-A_74JRE8GVAT/rlnkct919wgc5c0pjq986z5bb9h62uvni2/CLTools_macOSNMOS_SDK.pkg"
-    ],
-    "version": "12.3",
-    "hash": "sha256-qG21ssNUmkqxPLTXALGP2N/RBHu8NMlI1dWvGlV+Wm8="
-  },
-  "13": {
-    "urls": [
-      "https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg",
-      "https://web.archive.org/web/20250210235949/https://swcdn.apple.com/content/downloads/15/62/032-84673-A_7A1TG1RF8Z/xpc8q44ggn2pkn82iwr0fi1zeb9cxi8ath/CLTools_macOSNMOS_SDK.pkg"
-    ],
-    "version": "13.3",
-    "hash": "sha256-zZ4pbgoXunLGwdYDemxOfyH4CE5WGfMy2s5jN+0q4B4="
-  },
   "14": {
     "urls": [
       "https://swcdn.apple.com/content/downloads/14/48/052-59890-A_I0F5YGAY0Y/p9n40hio7892gou31o1v031ng6fnm9sb3c/CLTools_macOSNMOS_SDK.pkg",
@@ -38,5 +14,13 @@
     ],
     "version": "15.5",
     "hash": "sha256-HBiSJuw1XBUK5R/8Sj65c3rftSEvQl/O9ZZVp/g1Amo="
+  },
+  "26": {
+    "urls": [
+      "https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg",
+      "https://web.archive.org/web/20250915230423/https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg"
+    ],
+    "version": "26.0",
+    "hash": "sha256-54UtisDXHCxs7vO4fZSWOYwxLbdouLxWwGisez+tlAc="
   }
 }
diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix
index 04b32f07a642..2a0dabd97ae0 100644
--- a/pkgs/by-name/ap/apple-sdk/package.nix
+++ b/pkgs/by-name/ap/apple-sdk/package.nix
@@ -41,7 +41,7 @@ let
     # Avoid infinite recursions by not propagating certain packages, so they can themselves build with the SDK.
     ++ lib.optionals (!enableBootstrap) [
       (callPackage ./common/propagate-inputs.nix { })
-      (callPackage ./common/propagate-xcrun.nix { })
+      (callPackage ./common/propagate-xcrun.nix { inherit sdkVersion; })
     ]
     # This has to happen last.
     ++ [
@@ -58,12 +58,6 @@ stdenvNoCC.mkDerivation (
 
     dontConfigure = true;
 
-    # TODO(@connorbaker):
-    # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750.
-    # Fails due to a reflexive symlink:
-    # $out/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/A
-    dontCheckForBrokenSymlinks = true;
-
     strictDeps = true;
 
     setupHooks = [
@@ -96,6 +90,11 @@ stdenvNoCC.mkDerivation (
         ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
         ln -s "${sdkName}" "$sdkpath/MacOSX.sdk"
 
+        # Swift adds these locations to its search paths. Avoid spurious warnings by making sure they exist.
+        mkdir -p "$platformPath/Developer/Library/Frameworks"
+        mkdir -p "$platformPath/Developer/Library/PrivateFrameworks"
+        mkdir -p "$platformPath/Developer/usr/lib"
+
         runHook postInstall
       '';
 
diff --git a/pkgs/by-name/ap/applesauce/package.nix b/pkgs/by-name/ap/applesauce/package.nix
index 0351a00a2919..ea721fe91a14 100644
--- a/pkgs/by-name/ap/applesauce/package.nix
+++ b/pkgs/by-name/ap/applesauce/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "applesauce";
-  version = "0.5.19";
+  version = "0.5.20";
 
   src = fetchFromGitHub {
     owner = "Dr-Emann";
     repo = "applesauce";
     tag = "applesauce-cli-v${finalAttrs.version}";
-    hash = "sha256-OJZOB7h3qFkaCaPi+EJxIFX8q/Q38vtI0CmDK4PMD1g=";
+    hash = "sha256-KiivMFp772x/rFHh9PpDBjCxxC/6n6+KyAaZTmhnZV0=";
   };
 
-  cargoHash = "sha256-gQQpvS2LtlDBXjTqQvSUCXv5UCiQm1kiS/yPcG5KGxY=";
+  cargoHash = "sha256-WyDHp34NQi3/OotM4+4/d4ySOSYg+PDDmnLUn5R9yaU=";
 
   meta = {
     description = "Transparent compression for Apple File System Compression (AFSC)";
diff --git a/pkgs/by-name/ap/appres/package.nix b/pkgs/by-name/ap/appres/package.nix
new file mode 100644
index 000000000000..21d45efb2ea3
--- /dev/null
+++ b/pkgs/by-name/ap/appres/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  meson,
+  ninja,
+  xorgproto,
+  libx11,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "appres";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/appres-${finalAttrs.version}.tar.xz";
+    hash = "sha256-ERSxiSOf2HqNHbQz7ctEhjRtKZEhMrkeru5WZ/E7gZ8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxt
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to list X application resource database";
+    longDescription = ''
+      The appres program prints the resources seen by an application (or subhierarchy of an
+      application) with the specified class and instance names.
+      It can be used to determine which resources a particular program will load.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/appres";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "appres";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ap/apprun-cli/package.nix b/pkgs/by-name/ap/apprun-cli/package.nix
index 1ae19d83a0c5..359b95048205 100644
--- a/pkgs/by-name/ap/apprun-cli/package.nix
+++ b/pkgs/by-name/ap/apprun-cli/package.nix
@@ -7,23 +7,30 @@
 
 buildGoModule rec {
   pname = "apprun-cli";
-  version = "0.3.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "fujiwara";
     repo = "apprun-cli";
     tag = "v${version}";
-    hash = "sha256-k8ZFDWIuUjYqDIm7JdiqjeF2qaPX0SaOgqk4oud09Lc=";
+    hash = "sha256-3M+kRXTQ0yaxQc9E5T9UThqEda2S1F77SJzX7burZlU=";
   };
 
-  vendorHash = "sha256-WQRDkxL52RQmZn2aeE13pU4YGk8UjuZtS1lTNb53/hQ=";
+  vendorHash = "sha256-i3ZthsZVxAYQDX6ZA1bU81F4BbYSsWdu1sOAiY7FK7Y=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      # Until a stable version is released, v0 tags are incorrectly recognized as the latest,
+      # so specify minor releases
+      "^v0.([0-9.]+)$"
+    ];
+  };
 
   meta = {
     description = "CLI for sakura AppRun";
diff --git a/pkgs/by-name/ap/apr/package.nix b/pkgs/by-name/ap/apr/package.nix
index 8ded7258aca7..f9feea54a782 100644
--- a/pkgs/by-name/ap/apr/package.nix
+++ b/pkgs/by-name/ap/apr/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       # These answers are valid on x86_64-linux and aarch64-linux.
       # TODO: provide all valid answers for BSD.
       "ac_cv_file__dev_zero=yes"
-      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+      "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
       "apr_cv_tcp_nodelay_with_cork=yes"
       "ac_cv_define_PTHREAD_PROCESS_SHARED=yes"
       "apr_cv_process_shared_works=yes"
diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 435edc7d3274..23a8155b79bb 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -54,7 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "aranym";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     platforms = lib.platforms.unix;
+    # never successfully built on Hydra for darwin or aarch64 linux
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 })
diff --git a/pkgs/by-name/ar/arc_unpacker/package.nix b/pkgs/by-name/ar/arc_unpacker/package.nix
index e11506a976c6..667b723b868b 100644
--- a/pkgs/by-name/ar/arc_unpacker/package.nix
+++ b/pkgs/by-name/ar/arc_unpacker/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation {
     cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
     sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
     sed '1i#include <vector>' -i src/flow/cli_facade.h # gcc14
+
+    # cmake-4 support
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8.8)' \
+      'cmake_minimum_required(VERSION 3.10)'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 8be48491c5bb..0f723a613e20 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -2,7 +2,6 @@
   lib,
   SDL2,
   callPackage,
-  fetchpatch2,
   cmake,
   espeak-ng,
   ffmpeg,
@@ -28,6 +27,7 @@
   libvncserver,
   libxcb,
   libxkbcommon,
+  luajit,
   makeWrapper,
   libgbm,
   mupdf,
@@ -48,7 +48,7 @@
   xz,
   # Boolean flags
   buildManPages ? true,
-  useBuiltinLua ? true,
+  useBuiltinLua ? false,
   useEspeak ? !stdenv.hostPlatform.isDarwin,
   useStaticLibuvc ? true,
   useStaticOpenAL ? true,
@@ -62,14 +62,6 @@
 stdenv.mkDerivation (finalAttrs: {
   inherit (sources.letoram-arcan) pname version src;
 
-  patches = [
-    # (encode) remove deprecated use of pts/channel-layout
-    (fetchpatch2 {
-      url = "https://github.com/letoram/arcan/commit/e717c1b5833bdc2dea7dc6f64eeaf39c683ebd26.patch?full_index=1";
-      hash = "sha256-nUmOWfphGtGiLehUa78EJWqTlD7SvqJgl8lnn90vTFU=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     makeWrapper
@@ -117,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilwm
     xz
   ]
+  ++ lib.optionals (!useBuiltinLua) [ luajit ]
   ++ lib.optionals useEspeak [ espeak-ng ];
 
   cmakeFlags = [
@@ -206,6 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl2Plus
     ];
     maintainers = [ ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ar/arcan/sources.nix b/pkgs/by-name/ar/arcan/sources.nix
index fbc7645a1bf2..8197cc1fb668 100644
--- a/pkgs/by-name/ar/arcan/sources.nix
+++ b/pkgs/by-name/ar/arcan/sources.nix
@@ -7,13 +7,13 @@
     let
       self = {
         pname = "arcan";
-        version = "0.6.3.3";
+        version = "0.7.0.1";
 
         src = fetchFromGitHub {
           owner = "letoram";
           repo = "arcan";
-          rev = self.version;
-          hash = "sha256-YH3VGU3gSR5gqHnAlA2vrzU8vasKd0hOpc+2ludnV+Y=";
+          tag = self.version;
+          hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI=";
         };
       };
     in
@@ -21,13 +21,13 @@
 
   letoram-openal = {
     pname = "letoram-openal";
-    version = "0.6.2";
+    version = "0.6.2-unstable-2025-06-26";
 
     src = fetchFromGitHub {
       owner = "letoram";
       repo = "openal";
-      rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
-      hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
+      rev = "731bdaefeb9cfcc52267bb8fc884248e4420e9ec";
+      hash = "sha256-jrgZRekhEiztJ8vodWnCpeYmT54Ei/c27XrD5S98gjk=";
     };
   };
 
diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix
index bb28256d053e..fc055a1c11b7 100644
--- a/pkgs/by-name/ar/archi/package.nix
+++ b/pkgs/by-name/ar/archi/package.nix
@@ -15,23 +15,23 @@
   makeDesktopItem,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "Archi";
-  version = "5.6.0";
+  version = "5.7.0";
 
   src =
     {
       "x86_64-linux" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz";
-        hash = "sha256-zPgsRfbhN22Sph/5AvP7y2uHdgy1cZRcsm+O1dVLNHc=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Linux64-${finalAttrs.version}.tgz";
+        hash = "sha256-MIUlWt3GP/1oQAeq4W2xnhG63a2zhGldgyoyZ9lNOiI=";
       };
       "x86_64-darwin" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg";
-        hash = "sha256-NZWMQzLsPcJ7cZoYFUxXxLIu7yCIHE5pw9+UqjtG7Cc=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-${finalAttrs.version}.dmg";
+        hash = "sha256-wIlhJ6XmhL5rMb5zwHJYwamCwV13PK53wi9uEXIga5I=";
       };
       "aarch64-darwin" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg";
-        hash = "sha256-a80QyJT+mizT4bxhJ/1rXnQGbq0Zxwmqb74n2QH4H3I=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-Silicon-${finalAttrs.version}.dmg";
+        hash = "sha256-2/w4+aKfjfTGLjjl/nOouFtnv7/kjmfezkrmSa4ablc=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
       desktopName = "Archi";
       exec = "Archi";
       type = "Application";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
       icon = "archi";
       categories = [
         "Development"
@@ -107,20 +107,20 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) archi; };
 
-  meta = with lib; {
+  meta = {
     description = "ArchiMate modelling toolkit";
     longDescription = ''
       Archi is an open source modelling toolkit to create ArchiMate
       models and sketches.
     '';
     homepage = "https://www.archimatetool.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
       earldouglas
       paumr
     ];
     mainProgram = "Archi";
   };
-}
+})
diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix
index 995cc280bb6d..01a345330bb9 100644
--- a/pkgs/by-name/ar/archipelago/package.nix
+++ b/pkgs/by-name/ar/archipelago/package.nix
@@ -1,35 +1,87 @@
 {
   lib,
+  pkgs,
+  stdenvNoCC,
   appimageTools,
+  autoPatchelfHook,
+  makeWrapper,
+  gobject-introspection,
+  openssl,
+  lttng-ust,
+  mtdev,
+  xsel,
+  xclip,
+  zenity,
   fetchurl,
   nix-update-script,
-  extraPackages ? [ ],
 }:
-let
+stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "archipelago";
-  version = "0.6.3";
+  version = "0.6.4";
   src = fetchurl {
-    url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${version}/Archipelago_${version}_linux-x86_64.AppImage";
-    hash = "sha256-PetlGYsdhyvThIFqy+7wbPLAXDcgN2Kcl2WF3rta8PA=";
+    url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage";
+    hash = "sha256-7yzRYLmrOuiubXOu/ljuBsWvphdJ+07v0LJD0Ae8BTQ=";
   };
 
-  appimageContents = appimageTools.extractType2 { inherit pname version src; };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
-  extraPkgs =
-    pkgs:
-    [
-      pkgs.xsel
-      pkgs.xclip
-      pkgs.mtdev
-    ]
-    ++ extraPackages;
-  extraInstallCommands = ''
-    install -Dm444 ${appimageContents}/archipelago.desktop -t $out/share/applications
+  dontUnpack = true;
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = finalAttrs.runtimeDependencies;
+
+  runtimeDependencies = [
+    gobject-introspection
+    lttng-ust
+    openssl
+  ]
+  ++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs
+  ++ appimageTools.defaultFhsEnvArgs.multiPkgs pkgs;
+
+  libraryPath = lib.makeLibraryPath [
+    mtdev
+  ];
+
+  binPath = lib.makeBinPath [
+    xsel
+    xclip
+    zenity
+  ];
+
+  appimageContents = appimageTools.extractType2 { inherit (finalAttrs) pname version src; };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp ${finalAttrs.appimageContents}/AppRun $out/bin/archipelago
+
+    mkdir -p $out/lib/opt
+    cp -r ${finalAttrs.appimageContents}/opt/* $out/lib/opt
+
+    wrapProgram $out/bin/archipelago \
+      --set APPDIR $out/lib \
+      --prefix LD_LIBRARY_PATH : "${finalAttrs.libraryPath}" \
+      --prefix PATH : "${finalAttrs.binPath}"
+
+    install -Dm444 ${finalAttrs.appimageContents}/archipelago.desktop -t $out/share/applications
     substituteInPlace $out/share/applications/archipelago.desktop \
       --replace-fail 'opt/Archipelago/ArchipelagoLauncher' "archipelago"
-    cp -r ${appimageContents}/usr/share/icons $out/share
+    cp -r ${finalAttrs.appimageContents}/usr/share/icons $out/share
+
+    runHook postInstall
+  '';
+
+  preFixup = ''
+    patchelf \
+      --replace-needed libcrypto.so.1.0.0 libcrypto.so \
+      --replace-needed libssl.so.1.0.0 libssl.so \
+      $out/lib/opt/Archipelago/EnemizerCLI/System.Security.Cryptography.Native.OpenSsl.so
+
+    patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so \
+      $out/lib/opt/Archipelago/EnemizerCLI/libcoreclrtraceptprovider.so
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -37,7 +89,7 @@ appimageTools.wrapType2 {
   meta = {
     description = "Multi-Game Randomizer and Server";
     homepage = "https://archipelago.gg";
-    changelog = "https://github.com/ArchipelagoMW/Archipelago/releases/tag/${version}";
+    changelog = "https://github.com/ArchipelagoMW/Archipelago/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mit;
     mainProgram = "archipelago";
     maintainers = with lib.maintainers; [
@@ -46,4 +98,4 @@ appimageTools.wrapType2 {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/ardour/as-flags.patch b/pkgs/by-name/ar/ardour/as-flags.patch
similarity index 100%
rename from pkgs/applications/audio/ardour/as-flags.patch
rename to pkgs/by-name/ar/ardour/as-flags.patch
diff --git a/pkgs/applications/audio/ardour/default-plugin-search-paths.patch b/pkgs/by-name/ar/ardour/default-plugin-search-paths.patch
similarity index 100%
rename from pkgs/applications/audio/ardour/default-plugin-search-paths.patch
rename to pkgs/by-name/ar/ardour/default-plugin-search-paths.patch
diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/by-name/ar/ardour/package.nix
similarity index 100%
rename from pkgs/applications/audio/ardour/default.nix
rename to pkgs/by-name/ar/ardour/package.nix
diff --git a/pkgs/by-name/ar/arduino-ide/package.nix b/pkgs/by-name/ar/arduino-ide/package.nix
index 10ef56583a6d..76b6d956d922 100644
--- a/pkgs/by-name/ar/arduino-ide/package.nix
+++ b/pkgs/by-name/ar/arduino-ide/package.nix
@@ -32,7 +32,10 @@ appimageTools.wrapType2 {
     changelog = "https://github.com/arduino/arduino-ide/releases/tag/${version}";
     license = lib.licenses.agpl3Only;
     mainProgram = "arduino-ide";
-    maintainers = with lib.maintainers; [ clerie ];
+    maintainers = with lib.maintainers; [
+      clerie
+      iedame
+    ];
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix
index 8c5be1fea7eb..adb13af633d1 100644
--- a/pkgs/by-name/ar/ares-cli/package.nix
+++ b/pkgs/by-name/ar/ares-cli/package.nix
@@ -14,10 +14,6 @@ buildNpmPackage rec {
     hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY=";
   };
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   dontNpmBuild = true;
   npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0=";
 
diff --git a/pkgs/by-name/ar/ares/package.nix b/pkgs/by-name/ar/ares/package.nix
index 39d4bb316fba..de25382b4cbc 100644
--- a/pkgs/by-name/ar/ares/package.nix
+++ b/pkgs/by-name/ar/ares/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   alsa-lib,
-  apple-sdk_14,
+  apple-sdk,
   cmake,
   fetchFromGitHub,
   gtk3,
@@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
     moltenvk
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     (replaceVars ./darwin-build-fixes.patch {
-      sdkVersion = apple-sdk_14.version;
+      sdkVersion = apple-sdk.version;
     })
   ];
 
diff --git a/pkgs/by-name/ar/argagg/package.nix b/pkgs/by-name/ar/argagg/package.nix
index b38cbd6b3e45..96b449861fc1 100644
--- a/pkgs/by-name/ar/argagg/package.nix
+++ b/pkgs/by-name/ar/argagg/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required( VERSION 2.8 )" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     homepage = "https://github.com/vietjtnguyen/argagg";
     description = "Argument Aggregator";
diff --git a/pkgs/by-name/ar/argbash/package.nix b/pkgs/by-name/ar/argbash/package.nix
index 1d8bcc797194..4a4eb2ec8b69 100644
--- a/pkgs/by-name/ar/argbash/package.nix
+++ b/pkgs/by-name/ar/argbash/package.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = [ ];
     platforms = lib.platforms.all;
+    mainProgram = "argbash";
   };
 })
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 5492ae34eab8..40e50b6b8176 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -69,6 +69,6 @@ rustPlatform.buildRustPackage rec {
       # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ar/argocd-autopilot/package.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix
index 3121f2648aa1..6a4ff5e379b7 100644
--- a/pkgs/by-name/ar/argocd-autopilot/package.nix
+++ b/pkgs/by-name/ar/argocd-autopilot/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "argocd-autopilot";
-  version = "0.4.19";
+  version = "0.4.20";
 
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = "argocd-autopilot";
     rev = "v${version}";
-    sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM=";
+    sha256 = "sha256-JLh41ZWiDcDrUtd8d+Ak5TFca4L6VHzUguS55P9lmj0=";
   };
 
-  vendorHash = "sha256-GzSkA8JO0LEVeGIRKkr1Ff1P8WhNIEvRmry91agYJRo=";
+  vendorHash = "sha256-Ur0BfIg4lZakjx01UOL4n5/O1yjTJJcGuDxWVDqUOyY=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 0dd904c7cd23..a5569cc2e9d2 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "3.1.8";
+  version = "3.1.9";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-xySxnRw8MvMi4BJ/h8+4Lhf2ontC05hAliMG2e3xnQg=";
+    hash = "sha256-l8MlEVfw8BoHS/ZCtxzi7M0xMMOvotXYnconB+3x/1k=";
   };
 
   ui = stdenv.mkDerivation {
diff --git a/pkgs/by-name/ar/argpp/package.nix b/pkgs/by-name/ar/argpp/package.nix
new file mode 100644
index 000000000000..131a31a75a89
--- /dev/null
+++ b/pkgs/by-name/ar/argpp/package.nix
@@ -0,0 +1,38 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  tinycmmc,
+}:
+
+stdenv.mkDerivation {
+  pname = "argpp";
+  version = "0-unstable-2022-08-14";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "argpp";
+    rev = "9e1d54f8ed20af0aa5857e6653ab605b2ab63d5c";
+    sha256 = "sha256-unfAFxgvv1BOUEqrYYMFfouGe2xIcKJ3ithCel1P9sc=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    gtest
+    tinycmmc
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
+    description = "Argument Parser for C++";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
+  };
+}
diff --git a/pkgs/by-name/ar/arguments/package.nix b/pkgs/by-name/ar/arguments/package.nix
index 39ce653de6a5..eb23f0d13cca 100644
--- a/pkgs/by-name/ar/arguments/package.nix
+++ b/pkgs/by-name/ar/arguments/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/${owner}/arguments";
     description = "Library for argument handling for MINC programs";
diff --git a/pkgs/by-name/ar/arjun-cnf/package.nix b/pkgs/by-name/ar/arjun-cnf/package.nix
index b257a607c94c..0542eef55abc 100644
--- a/pkgs/by-name/ar/arjun-cnf/package.nix
+++ b/pkgs/by-name/ar/arjun-cnf/package.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
     louvain-community
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "CNF minimizer and minimal independent set calculator";
     homepage = "https://github.com/meelgroup/arjun";
diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix
index f9e6c80fc37a..c93acbe332ef 100644
--- a/pkgs/by-name/ar/arkade/package.nix
+++ b/pkgs/by-name/ar/arkade/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "arkade";
-  version = "0.11.50";
+  version = "0.11.51";
 
   src = fetchFromGitHub {
     owner = "alexellis";
     repo = "arkade";
     tag = version;
-    hash = "sha256-EM4bd++oDQBqcMIcjobvoNzzsQKgkCC0yekY1s/AoNM=";
+    hash = "sha256-So7ZudZFOC6ImnHfvb+/FxpN0cNVeD2EW+Mu4Y3VPj8=";
   };
 
   env.CGO_ENABLED = 0;
diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix
index cb9b12a48148..35eafcb5edb2 100644
--- a/pkgs/by-name/ar/arkenfox-userjs/package.nix
+++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arkenfox-userjs";
-  version = "140.0";
+  version = "140.1";
 
   src = fetchurl {
-    url = "https://raw.githubusercontent.com/arkenfox/user.js/${finalAttrs.version}/user.js";
-    hash = "sha256-/cz0dnQXKa3c/DqUTAEwBV0I9Tc3x6uzU6rtYijg3Zo=";
+    url = "https://raw.githubusercontent.com/arkenfox/user.js/refs/tags/${finalAttrs.version}/user.js";
+    hash = "sha256-jxzIiARi+GXD+GSGPr1exeEHjR/LsXSUQPGZ+hF36xg=";
   };
 
   dontUnpack = true;
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/arkenfox/user.js/releases/tag/${finalAttrs.version}";
     description = "Comprehensive user.js template for configuration and hardening";
     homepage = "https://github.com/arkenfox/user.js";
     license = lib.licenses.mit;
diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix
index f81a7db70d85..4404a640e21e 100644
--- a/pkgs/by-name/ar/armadillo/package.nix
+++ b/pkgs/by-name/ar/armadillo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "15.0.3";
+  version = "15.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-n1XsEPCpH7ZHmrTtKzelJEWu6RdwaiONFwtSIMAi/kM=";
+    hash = "sha256-pbgQnaPBaYAvUaFNO9EkY5XCS7ylVgF2CwyWo8Cy+Po=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index f814aad03c33..146fe963c05e 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -10,6 +10,7 @@
   python3,
   which,
   boost,
+  curl,
   ftgl,
   freetype,
   glew,
@@ -70,11 +71,11 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "813b684ab0de8ee9737c9fc1f9b90ba0543dd418";
-          hash = "sha256-01jWE9rSBJn+JS8p8LTFqIGquOY1avXsAZnfYfo5pPk=";
+          rev = "3675f21cd5be4932a7a168b321576e0b09e64aaf";
+          hash = "sha256-d2vPFAyx6LhEIxtEUdhrlqqYeCY0NnETlq7TVvX5vVo=";
         in
         dedicatedServer: {
-          version = "${unstableVersionMajor}-${builtins.substring 0 8 rev}";
+          version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
           extraBuildInputs = [
             protobuf
@@ -97,11 +98,11 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
       "${latestVersionMajor}-sty+ct+ap" =
         let
-          rev = "5a17cc9fb6e1e27a358711afbd745ae54d4a8c60";
-          hash = "sha256-111C1j/hSaASGcvYy3//TyHs4Z+3fuiOvCmtcWLdFd4=";
+          rev = "c907ee3efd76f3b1e6eb41257cf7127f3eab280c";
+          hash = "sha256-d5uWBSz07OinbGHoxUQ64go3eOugLu/tWNjeihobQdo=";
         in
         dedicatedServer: {
-          version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}";
+          version = "${latestVersionMajor}-sty+ct+ap-${lib.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
@@ -127,13 +128,13 @@ let
 
       # Split the version into the major and minor parts
       versionParts = lib.splitString "-" resolvedParams.version;
-      splitVersion = lib.splitVersion (builtins.elemAt versionParts 0);
-      majorVersion = builtins.concatStringsSep "." (lib.lists.take 2 splitVersion);
+      splitVersion = lib.splitVersion (lib.elemAt versionParts 0);
+      majorVersion = lib.concatStringsSep "." (lib.lists.take 2 splitVersion);
 
       minorVersionPart =
         parts: sep: expectedSize:
-        if builtins.length parts > expectedSize then
-          sep + (builtins.concatStringsSep sep (lib.lists.drop expectedSize parts))
+        if lib.length parts > expectedSize then
+          sep + (lib.concatStringsSep sep (lib.lists.drop expectedSize parts))
         else
           "";
 
@@ -172,8 +173,11 @@ let
       ++ lib.optional dedicatedServer "--enable-dedicated"
       ++ lib.optional (!dedicatedServer) "--enable-music";
 
-      buildInputs =
-        lib.singleton (libxml2.override { enableHttp = true; }) ++ (resolvedParams.extraBuildInputs or [ ]);
+      buildInputs = [
+        (libxml2.override { enableHttp = true; })
+        curl
+      ]
+      ++ (resolvedParams.extraBuildInputs or [ ]);
 
       nativeBuildInputs = [
         autoconf
diff --git a/pkgs/by-name/ar/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch
deleted file mode 100644
index b8820f8aa55b..000000000000
--- a/pkgs/by-name/ar/arrayfire/no-assets.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12d6e557c..cc004555d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -321,11 +321,6 @@ if(NOT TARGET nonstd::span-lite)
- 
- endif()
- 
--af_dep_check_and_populate(${assets_prefix}
--  URI https://github.com/arrayfire/assets.git
--  REF master
--)
--set(ASSETS_DIR ${${assets_prefix}_SOURCE_DIR})
- 
- # when crosscompiling use the bin2cpp file from the native bin directory
- if(CMAKE_CROSSCOMPILING)
-@@ -473,18 +468,6 @@ install(FILES ${ArrayFire_BINARY_DIR}/include/af/version.h
-         DESTINATION "${AF_INSTALL_INC_DIR}/af/"
-         COMPONENT headers)
- 
--# install the examples irrespective of the AF_BUILD_EXAMPLES value
--# only the examples source files are installed, so the installation of these
--# source files does not depend on AF_BUILD_EXAMPLES
--# when AF_BUILD_EXAMPLES is OFF, the examples source is installed without
--# building the example executables
--install(DIRECTORY examples/ #NOTE The slash at the end is important
--    DESTINATION ${AF_INSTALL_EXAMPLE_DIR}
--    COMPONENT examples)
--
--install(DIRECTORY ${ASSETS_DIR}/examples/ #NOTE The slash at the end is important
--    DESTINATION ${AF_INSTALL_EXAMPLE_DIR}
--    COMPONENT examples)
- 
- install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/"
-     DESTINATION LICENSES
diff --git a/pkgs/by-name/ar/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch
deleted file mode 100644
index f7903e74112d..000000000000
--- a/pkgs/by-name/ar/arrayfire/no-download.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeModules/AFconfigure_deps_vars.cmake b/CMakeModules/AFconfigure_deps_vars.cmake
-index aac332f5a..e9e711159 100644
---- a/CMakeModules/AFconfigure_deps_vars.cmake
-+++ b/CMakeModules/AFconfigure_deps_vars.cmake
-@@ -94,7 +94,7 @@ macro(af_dep_check_and_populate dep_prefix)
-         URL            ${adcp_args_URI}
-         URL_HASH       ${adcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -104,7 +104,7 @@ macro(af_dep_check_and_populate dep_prefix)
-         QUIET
-         URL            ${adcp_args_URI}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -116,7 +116,7 @@ macro(af_dep_check_and_populate dep_prefix)
-         GIT_REPOSITORY ${adcp_args_URI}
-         GIT_TAG        ${adcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
diff --git a/pkgs/by-name/ar/arrayfire/package.nix b/pkgs/by-name/ar/arrayfire/package.nix
deleted file mode 100644
index 0cc0623a995d..000000000000
--- a/pkgs/by-name/ar/arrayfire/package.nix
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  blas,
-  boost,
-  clblast,
-  cmake,
-  config,
-  cudaPackages,
-  fetchFromGitHub,
-  fftw,
-  fftwFloat,
-  fmt_9,
-  forge,
-  freeimage,
-  gtest,
-  lapack,
-  lib,
-  libGL,
-  mesa,
-  ocl-icd,
-  opencl-clhpp,
-  pkg-config,
-  python3,
-  span-lite,
-  stdenv,
-  # NOTE: We disable tests by default, because they cannot be run easily on
-  # non-NixOS systems when either CUDA or OpenCL support is enabled (CUDA and
-  # OpenCL need access to drivers that are installed outside of Nix on
-  # non-NixOS systems).
-  doCheck ? false,
-  cpuSupport ? true,
-  cudaSupport ? config.cudaSupport,
-  # OpenCL needs mesa which is broken on Darwin
-  openclSupport ? !stdenv.hostPlatform.isDarwin,
-  # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by
-  # telling Nix where to find the drivers. If you know the version of the
-  # Nvidia driver that is installed on your system, you can do:
-  #
-  # arrayfire.override {
-  #   nvidiaComputeDrivers =
-  #     callPackage
-  #       (prev.linuxPackages.nvidiaPackages.mkDriver {
-  #         version = cudaVersion; # our driver version
-  #         sha256_64bit = cudaHash; # sha256 of the .run binary
-  #         useGLVND = false;
-  #         useProfiles = false;
-  #         useSettings = false;
-  #         usePersistenced = false;
-  #         ...
-  #       })
-  #       { libsOnly = true; };
-  # }
-  nvidiaComputeDrivers ? null,
-  fetchpatch,
-}:
-
-# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw
-# exceptions, which means that it isn't really supported yet...
-assert blas.isILP64 == false;
-
-stdenv.mkDerivation rec {
-  pname = "arrayfire";
-  version = "3.9.0";
-
-  src = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "arrayfire";
-    rev = "v3.9.0";
-    hash = "sha256-80fxdkaeAQ5u0X/UGPaI/900cdkZ/vXNcOn5tkZ+C3Y=";
-  };
-
-  # We cannot use the clfft from Nixpkgs because ArrayFire maintain a fork
-  # of clfft where they've modified the CMake build system, and the
-  # CMakeLists.txt of ArrayFire assumes that we're using that fork.
-  #
-  # This can be removed once ArrayFire upstream their changes.
-  clfft = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "clfft";
-    rev = "760096b37dcc4f18ccd1aac53f3501a83b83449c";
-    sha256 = "sha256-vJo1YfC2AJIbbRj/zTfcOUmi0Oj9v64NfA9MfK8ecoY=";
-  };
-  glad = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "glad";
-    rev = "ef8c5508e72456b714820c98e034d9a55b970650";
-    sha256 = "sha256-u9Vec7XLhE3xW9vzM7uuf+b18wZsh/VMtGbB6nMVlno=";
-  };
-  threads = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "threads";
-    rev = "4d4a4f0384d1ac2f25b2c4fc1d57b9e25f4d6818";
-    sha256 = "sha256-qqsT9woJDtQvzuV323OYXm68pExygYs/+zZNmg2sN34=";
-  };
-  test-data = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "arrayfire-data";
-    rev = "a5f533d7b864a4d8f0dd7c9aaad5ff06018c4867";
-    sha256 = "sha256-AWzhsrDXyZrQN2bd0Ng/XlE8v02x7QWTiFTyaAuRXSw=";
-  };
-  # ArrayFire fails to compile with newer versions of spdlog, so we can't use
-  # the one in Nixpkgs. Once they upgrade, we can switch to using spdlog from
-  # Nixpkgs.
-  spdlog = fetchFromGitHub {
-    owner = "gabime";
-    repo = "spdlog";
-    rev = "v1.9.2";
-    hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
-  };
-
-  cmakeFlags = [
-    "-DBUILD_TESTING=ON"
-    # We do not build examples, because building tests already takes long enough...
-    "-DAF_BUILD_EXAMPLES=OFF"
-    # No need to build forge, because it's a separate package
-    "-DAF_BUILD_FORGE=OFF"
-    "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'"
-    # Prevent ArrayFire from trying to download some matrices from the Internet
-    "-DAF_TEST_WITH_MTX_FILES=OFF"
-    # Have to use the header-only version, because we're not using the version
-    # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared
-    # library, because ArrayFire's CMake files do not run the install step of
-    # spdlog.
-    "-DAF_WITH_SPDLOG_HEADER_ONLY=ON"
-    (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF")
-    (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF")
-    (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF")
-  ]
-  ++ lib.optionals cudaSupport [
-    # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake
-    # locate cudatoolkit.
-    "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib"
-  ];
-
-  # ArrayFire have a repo with assets for the examples. Since we don't build
-  # the examples anyway, remove the dependency on assets.
-  patches = [
-    ./no-assets.patch
-    ./no-download.patch
-    # Fix for newer opencl-clhpp. Remove with the next release.
-    (fetchpatch {
-      url = "https://github.com/arrayfire/arrayfire/pull/3562.patch";
-      hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50";
-    })
-  ];
-
-  postPatch = ''
-    mkdir -p ./extern/af_glad-src
-    mkdir -p ./extern/af_threads-src
-    mkdir -p ./extern/af_test_data-src
-    mkdir -p ./extern/ocl_clfft-src
-    mkdir -p ./extern/spdlog-src
-    cp -R --no-preserve=mode,ownership ${glad}/* ./extern/af_glad-src/
-    cp -R --no-preserve=mode,ownership ${threads}/* ./extern/af_threads-src/
-    cp -R --no-preserve=mode,ownership ${test-data}/* ./extern/af_test_data-src/
-    cp -R --no-preserve=mode,ownership ${clfft}/* ./extern/ocl_clfft-src/
-    cp -R --no-preserve=mode,ownership ${spdlog}/* ./extern/spdlog-src/
-
-    # libaf.so (the unified backend) tries to load the right shared library at
-    # runtime, and the search paths are hard-coded... We tweak them to point to
-    # the installation directory in the Nix store.
-    substituteInPlace src/api/unified/symbol_manager.cpp \
-      --replace '"/opt/arrayfire-3/lib/",' \
-                "\"$out/lib/\", \"/opt/arrayfire-3/lib/\","
-  '';
-
-  inherit doCheck;
-  checkPhase =
-    let
-      LD_LIBRARY_PATH = builtins.concatStringsSep ":" (
-        [
-          "${forge}/lib"
-          "${freeimage}/lib"
-        ]
-        ++ lib.optional cudaSupport "${cudaPackages.cudatoolkit}/lib64"
-        # On non-NixOS systems, help the tests find Nvidia drivers
-        ++ lib.optional (nvidiaComputeDrivers != null) "${nvidiaComputeDrivers}/lib"
-      );
-      ctestFlags = builtins.concatStringsSep " " (
-        # We have to run with "-j1" otherwise various segfaults occur on non-NixOS systems.
-        [
-          "--output-on-errors"
-          "-j1"
-        ]
-        # See https://github.com/arrayfire/arrayfire/issues/3484
-        ++ lib.optional openclSupport "-E '(inverse_dense|cholesky_dense)'"
-      );
-    in
-    ''
-      export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-    ''
-    +
-      # On non-NixOS systems, help the tests find Nvidia drivers
-      lib.optionalString (openclSupport && nvidiaComputeDrivers != null) ''
-        export OCL_ICD_VENDORS=${nvidiaComputeDrivers}/etc/OpenCL/vendors
-      ''
-    + ''
-      # Note: for debugging, enable AF_TRACE=all
-      AF_PRINT_ERRORS=1 ctest ${ctestFlags}
-    '';
-
-  buildInputs = [
-    blas
-    boost.dev
-    boost.out
-    clblast
-    fftw
-    fftwFloat
-    # We need fmt_9 because ArrayFire fails to compile with newer versions.
-    fmt_9
-    forge
-    freeimage
-    gtest
-    lapack
-    libGL
-    ocl-icd
-    opencl-clhpp
-    span-lite
-  ]
-  ++ lib.optionals cudaSupport [
-    cudaPackages.cudatoolkit
-    cudaPackages.cudnn
-    cudaPackages.cuda_cccl
-  ]
-  ++ lib.optionals openclSupport [
-    mesa
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python3
-  ];
-
-  meta = with lib; {
-    description = "General-purpose library for parallel and massively-parallel computations";
-    longDescription = ''
-      A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
-    '';
-    license = licenses.bsd3;
-    homepage = "https://arrayfire.com/";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      chessai
-      twesterhout
-    ];
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index f2965d965d20..e3f226194dcc 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "art";
-  version = "1.25.9";
+  version = "1.25.10";
 
   src = fetchFromGitHub {
     owner = "artpixls";
     repo = "ART";
     tag = version;
-    hash = "sha256-dg0msZ0aeyl4L7RqqGur9Lalu1QtE0igEc54WT5F+SQ=";
+    hash = "sha256-qGrkRsdQppfIolxAhxWnJrbYotELKga6X7CFY55xCKk=";
   };
 
   # Fix the build with CMake 4.
diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix
index 12998fe7e581..d866c43f04df 100644
--- a/pkgs/by-name/ar/artem/package.nix
+++ b/pkgs/by-name/ar/artem/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/finefindus/artem";
     changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "artem";
   };
 }
diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix
index a0366a98acb4..e4a7a3925245 100644
--- a/pkgs/by-name/ar/artisan/package.nix
+++ b/pkgs/by-name/ar/artisan/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "artisan";
-  version = "3.2.0";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
-    hash = "sha256-p8M9Z0z/0unJPOLXVOnN8INO4v0D5Ojjug42xT77oqQ=";
+    hash = "sha256-aAxFfghEf+MRDZBd0FD5OphOOVhz3Nt2wUOmhrwXGh4=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix
new file mode 100644
index 000000000000..9ee50a47a602
--- /dev/null
+++ b/pkgs/by-name/ar/artix-games-launcher/package.nix
@@ -0,0 +1,36 @@
+{
+  appimageTools,
+  stdenv,
+  fetchurl,
+  lib,
+}:
+let
+  pname = "artix-games-launcher";
+  version = "2.20";
+  src = fetchurl {
+    url = "https://web.archive.org/web/20250924101414/https://launch.artix.com/latest/Artix_Games_Launcher-x86_64.AppImage";
+    hash = "sha256-8eVXOm5g92wErWa6lbTXrCL04MWYlObjonHJk+oUI3E=";
+  };
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    install -m 444 -D ${appimageContents}/ArtixGamesLauncher.desktop $out/share/applications/ArtixGamesLauncher.desktop
+    install -m 444 -D ${appimageContents}/ArtixLogo.png $out/share/icons/ArtixLogo.png
+    substituteInPlace $out/share/applications/ArtixGamesLauncher.desktop --replace-fail 'Exec=ArtixGameLauncher %u' 'Exec=artix-games-launcher %u'
+  '';
+
+  meta = {
+    description = "Launcher for games by Artix Entertainment";
+    homepage = "https://www.artix.com/downloads/artixlauncher";
+    license = lib.licenses.unfree;
+    mainProgram = "artix-game-launcher";
+    maintainers = with lib.maintainers; [ jtliang24 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix
index 79e2ebeed923..3c9e24e534a5 100644
--- a/pkgs/by-name/ar/artyFX/package.nix
+++ b/pkgs/by-name/ar/artyFX/package.nix
@@ -40,6 +40,15 @@ stdenv.mkDerivation rec {
     ntk
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required (VERSION 2.6)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace src/avtk/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required (VERSION 2.6)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   meta = with lib; {
     homepage = "http://openavproductions.com/artyfx/";
     description = "LV2 plugin bundle of artistic realtime effects";
diff --git a/pkgs/by-name/as/asciicam/package.nix b/pkgs/by-name/as/asciicam/package.nix
index 167cc22354ca..414d2d811d3e 100644
--- a/pkgs/by-name/as/asciicam/package.nix
+++ b/pkgs/by-name/as/asciicam/package.nix
@@ -17,16 +17,14 @@ buildGoModule {
 
   vendorHash = "sha256-Qnt1wo/yKC3Ce4JoZBIWtXyzlkh4bWz9vyE349iRsjk=";
 
-  ldflags = [
-    "-s"
-    "-w"
-  ];
+  ldflags = [ "-s" ];
 
-  meta = with lib; {
+  meta = {
     description = "Displays your webcam on the terminal";
     homepage = "https://github.com/muesli/asciicam";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "asciicam";
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
similarity index 90%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
index 12c132a81d1c..a13c8e6750bc 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
+++ b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
@@ -4,7 +4,6 @@ gem 'asciidoctor-bibtex'
 gem 'asciidoctor-diagram'
 gem 'asciidoctor-epub3'
 gem 'asciidoctor-html5s'
-gem 'asciidoctor-mathematical'
 gem 'asciidoctor-multipage'
 gem 'asciidoctor-pdf'
 gem 'asciidoctor-reducer'
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
similarity index 93%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
index 203407169bda..cc72aec9ea67 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
+++ b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
@@ -29,10 +29,6 @@ GEM
     asciidoctor-html5s (0.5.1)
       asciidoctor (>= 1.5.7, < 3.0)
       thread_safe (~> 0.3.4)
-    asciidoctor-mathematical (0.3.5)
-      asciidoctor (~> 2.0)
-      asciimath (~> 2.0)
-      mathematical (~> 1.6.0)
     asciidoctor-multipage (0.0.19)
       asciidoctor (>= 2.0.11, < 2.1)
     asciidoctor-pdf (2.3.19)
@@ -50,7 +46,6 @@ GEM
       asciidoctor (~> 2.0)
     asciidoctor-revealjs (5.1.0)
       asciidoctor (>= 2.0.0, < 3.0.0)
-    asciimath (2.0.5)
     bibtex-ruby (6.1.0)
       latex-decode (~> 0.0)
       racc (~> 1.7)
@@ -75,8 +70,6 @@ GEM
     hashery (2.1.2)
     latex-decode (0.4.0)
     logger (1.6.1)
-    mathematical (1.6.20)
-      ruby-enum (>= 0.4, < 2.0)
     matrix (0.4.2)
     mime-types (3.6.0)
       logger
@@ -119,7 +112,6 @@ GEM
       ffi (~> 1.0)
     rexml (3.3.9)
     rouge (4.4.0)
-    ruby-enum (1.0.0)
     ruby-rc4 (0.1.5)
     rubyzip (2.3.2)
     sass (3.7.4)
@@ -141,7 +133,6 @@ DEPENDENCIES
   asciidoctor-diagram
   asciidoctor-epub3
   asciidoctor-html5s
-  asciidoctor-mathematical
   asciidoctor-multipage
   asciidoctor-pdf
   asciidoctor-reducer
@@ -151,4 +142,4 @@ DEPENDENCIES
   rouge
 
 BUNDLED WITH
-   2.5.16
+   2.5.22
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
similarity index 93%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
index f03701683895..6eae05955d11 100644
--- a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
+++ b/pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
@@ -134,21 +134,6 @@
     };
     version = "0.5.1";
   };
-  asciidoctor-mathematical = {
-    dependencies = [
-      "asciidoctor"
-      "asciimath"
-      "mathematical"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1lxfq7qn3ql642pva6jh3h1abm9j9daxg5icfn1h73k6cjsmcisp";
-      type = "gem";
-    };
-    version = "0.3.5";
-  };
   asciidoctor-multipage = {
     dependencies = [ "asciidoctor" ];
     groups = [ "default" ];
@@ -204,16 +189,6 @@
     };
     version = "5.1.0";
   };
-  asciimath = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ny2qql3lgh7gx54psji2lm4mmbwyiwy00a17w26rjyh6cy55491";
-      type = "gem";
-    };
-    version = "2.0.5";
-  };
   bibtex-ruby = {
     dependencies = [
       "latex-decode"
@@ -363,17 +338,6 @@
     };
     version = "1.6.1";
   };
-  mathematical = {
-    dependencies = [ "ruby-enum" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0y103dvfjswm5r0xafyjrw6ybvz1qrqfa4lvpk9gdhbzwpaiwy4r";
-      type = "gem";
-    };
-    version = "1.6.20";
-  };
   matrix = {
     groups = [ "default" ];
     platforms = [ ];
@@ -617,16 +581,6 @@
     };
     version = "4.4.0";
   };
-  ruby-enum = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ry6ha94a5jqbj5y3x9k0szyy3jgnsfyxvva98nivg6yx1dfyrz7";
-      type = "gem";
-    };
-    version = "1.0.0";
-  };
   ruby-rc4 = {
     groups = [ "default" ];
     platforms = [ ];
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/by-name/as/asciidoctor-with-extensions/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/package.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/by-name/as/asciidoctor/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile
rename to pkgs/by-name/as/asciidoctor/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/by-name/as/asciidoctor/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/by-name/as/asciidoctor/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/gemset.nix
rename to pkgs/by-name/as/asciidoctor/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/by-name/as/asciidoctor/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/default.nix
rename to pkgs/by-name/as/asciidoctor/package.nix
diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 850b9fa8084c..722988ea6fd6 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -2,29 +2,34 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "agg";
-  version = "1.5.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "agg";
-    rev = "v${version}";
-    hash = "sha256-bCE59NeITaCwgajgyXgP6jxtV7aPihPaZ/Uzh39Po1k=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6UenPE6mmmvliaIuGdQj/FrlmoJvmBJgfo0hW+uRaxM=";
   };
 
   strictDeps = true;
 
-  cargoHash = "sha256-KQ4g4hWy8FZH4nLiB0874r8FCINXJboZ4C1dAAPA8Gc=";
+  cargoHash = "sha256-VpbjvrMhzS1zrcMNWBjTLda6o3ea2cwpnEDUouwyp8w=";
 
-  meta = with lib; {
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";
     homepage = "https://github.com/asciinema/agg";
-    changelog = "https://github.com/asciinema/agg/releases/tag/${src.rev}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/asciinema/agg/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "agg";
   };
-}
+})
diff --git a/pkgs/by-name/as/askalono/package.nix b/pkgs/by-name/as/askalono/package.nix
index 98d73845c109..dc23859eb1ee 100644
--- a/pkgs/by-name/as/askalono/package.nix
+++ b/pkgs/by-name/as/askalono/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jpeddicord/askalono";
     changelog = "https://github.com/jpeddicord/askalono/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "askalono";
   };
 }
diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix
index 20e3a2019d04..226d4ddf51eb 100644
--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -8,7 +8,7 @@
 }:
 let
   pname = "asm-lsp";
-  version = "0.10.0";
+  version = "0.10.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -17,14 +17,14 @@ rustPlatform.buildRustPackage {
     owner = "bergercookie";
     repo = "asm-lsp";
     rev = "v${version}";
-    hash = "sha256-RAyiE+Msmr/Qt5v7rWuUTAji383XLKxeMQJove2b1NE=";
+    hash = "sha256-vEilIoIK6fxZBhmyDueP2zvbh1/t2wd4cnq/0y6p+TI=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
-  cargoHash = "sha256-41iWqgywfFdqf3TzZT5peh39jiSZw8FRTI1AeL5CroY=";
+  cargoHash = "sha256-D91n+sx8qwkn/rEWP5ftS/mhmRru43TmKZUyvAc47H0=";
 
   # tests expect ~/.cache/asm-lsp to be writable
   preCheck = ''
diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix
index 183254f19388..e09e2ed5723f 100644
--- a/pkgs/by-name/as/assimp/package.nix
+++ b/pkgs/by-name/as/assimp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   zlib,
   nix-update-script,
@@ -23,6 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ixtqK+3iiL17GEbEVHz5S6+gJDDQP7bVuSfRMJMGEOY=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/assimp/assimp/pull/6283
+    (fetchpatch {
+      name = "assimp-fix-invalid-vector-gcc15.patch";
+      url = "https://github.com/assimp/assimp/commit/59bc03d931270b6354690512d0c881eec8b97678.patch";
+      hash = "sha256-O+JPwcOdyFtmFE7eZojHo1DUavF5EhLYlUyxtYo/KF4=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
@@ -34,12 +45,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "ASSIMP_BUILD_ASSIMP_TOOLS" true)
+    (lib.cmakeBool "ASSIMP_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
   ];
 
   # Some matrix tests fail on non-86_64-linux:
   # https://github.com/assimp/assimp/issues/6246
   # https://github.com/assimp/assimp/issues/6247
-  doCheck = !(stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isx86_64);
+  # On Darwin, the bundled googletest is not compatible with Clang 21.
+  #  contrib/googletest/googletest/include/gtest/gtest-printers.h:498:35:
+  #  error: implicit conversion from 'char16_t' to 'char32_t' may change the meaning of the represented code unit
+  #  [-Werror,-Wcharacter-conversion]
+  doCheck = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64;
   checkPhase = ''
     runHook preCheck
     bin/unit
diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 7789f0e5ee9d..94c1cc3909fd 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ast-grep";
-  version = "0.39.6";
+  version = "0.39.7";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     tag = finalAttrs.version;
-    hash = "sha256-ZZ9GQcvNj038GUEKCGO9X+t1U5vqcztrm97o7y8RLGM=";
+    hash = "sha256-D/fdy2oMwlXVMzoSCcYSz1fiazVCypvj4X3G6vBWBUw=";
   };
 
   # error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-BPw/BczPspW3pvkLwR2PBCkEzcVKmHK5r18KBvwAAa8=";
+  cargoHash = "sha256-AuVD3n+T9UNLw6+IuM9l2AoMb7eEFhr+ZlktYZQYI80=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
index 6c9af1bc9d09..3c99f0030cc5 100644
--- a/pkgs/by-name/as/asterisk-module-sccp/package.nix
+++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix
@@ -40,5 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Replacement for the SCCP channel driver in Asterisk";
     license = lib.licenses.gpl1Only;
     maintainers = with lib.maintainers; [ das_j ];
+    # https://github.com/chan-sccp/chan-sccp/issues/609
+    broken = lib.versionAtLeast (lib.getVersion asterisk) "21";
   };
 })
diff --git a/pkgs/by-name/as/astromenace/package.nix b/pkgs/by-name/as/astromenace/package.nix
index d59a9d6f0c9e..72aea1f8232d 100644
--- a/pkgs/by-name/as/astromenace/package.nix
+++ b/pkgs/by-name/as/astromenace/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/rpms/astromenace/raw/5e6bc02d115a53007dc47ef8223d8eaa25607588/f/astromenace-gcc13.patch";
       hash = "sha256-pkmTVR86vS+KCICxAp+d7upNWVnSNxwdKmxnbtqIvgU=";
     })
+
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/viewizard/astromenace/commit/eb42ddb1e86a3e67787bfd5e33ff2afdd6307142.patch";
+      hash = "sha256-TQVcnDrKBFvcyYhWeeEQSRjuirtJ7wYFQV+f3bHikdA=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/as/astronomer/package.nix b/pkgs/by-name/as/astronomer/package.nix
index 7df5c42af4e4..6e7325ebdcae 100644
--- a/pkgs/by-name/as/astronomer/package.nix
+++ b/pkgs/by-name/as/astronomer/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/Ullaakut/astronomer";
     changelog = "https://github.com/Ullaakut/astronomer/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "astronomer";
   };
 }
diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix
index 20be5951493f..afb4a3537142 100644
--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "astyle";
-  version = "3.6.12";
+  version = "3.6.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-Gd6wahq25QELlsKBuuNQVg2XicvIluMD82EBeYMv0r4=";
+    hash = "sha256-BIt0sUxuAff66OY7dn2jMwOrOdkCKv4zBVzkueVvFi0=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix
index d27dcb359fea..aa025acb6583 100644
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@@ -18,16 +18,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "asusctl";
-  version = "6.1.15";
+  version = "6.1.17";
 
   src = fetchFromGitLab {
     owner = "asus-linux";
     repo = "asusctl";
     tag = version;
-    hash = "sha256-ckazulETorMaYc860ELV/kABPv9+YF+EvpapNqNnXuI=";
+    hash = "sha256-rNLQYCE7NZAel2fr5VoAMlm7QkH1KrySKdEn2+WMPo8=";
   };
 
-  cargoHash = "sha256-qryRfwffP+AiaFjZ6mw5GHI/xlV1EhOsdhJhJw6Zn74=";
+  cargoHash = "sha256-/vMVSGUO6Zu/8GSTq1jsXLWVP9sWsuD7fJty3NnKXf4=";
 
   postPatch = ''
     files="
diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index ce1ac1d6e498..0240dba85cc9 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "async-profiler";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchFromGitHub {
     owner = "jvm-profiling-tools";
     repo = "async-profiler";
     rev = "v${version}";
-    hash = "sha256-82aZK9y1Y5PaYtIG7FqnrbYU+bQ3nNzOCn+3lFzyeCA=";
+    hash = "sha256-y/MQgXoaJSwc6QjTPGQRFNyVoR1ENQ7rDmtCwR5F/oM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix
index 97efa5cc60e4..c9879d33eed5 100644
--- a/pkgs/by-name/at/at-spi2-core/package.nix
+++ b/pkgs/by-name/at/at-spi2-core/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -12,6 +13,7 @@
     && stdenv.hostPlatform.emulatorAvailable buildPackages,
   gsettings-desktop-schemas,
   makeWrapper,
+  python3,
   dbus,
   glib,
   dconf,
@@ -27,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   pname = "at-spi2-core";
-  version = "2.56.2";
+  version = "2.58.0";
 
   outputs = [
     "out"
@@ -37,15 +39,25 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor version}/at-spi2-core-${version}.tar.xz";
-    hash = "sha256-4bHJg2qJR4UvdEDDLiMXkjTHa9mM2cxAAfN2QF+LeDs=";
+    hash = "sha256-390zANong6IZaf+t4oiYF/t8GQak75JJfrpllps9q1o=";
   };
 
+  # TODO apply unconditionally on rebuild
+  patches = lib.optionals stdenv.isDarwin [
+    (fetchpatch {
+      name = "timersub.patch";
+      url = "https://github.com/GNOME/at-spi2-core/commit/02108ea1b96db0189b2d4a9eceb843e1f13b7bdf.diff";
+      hash = "sha256-pVBhawfRnJoXmovl9CAmzh+YWJkbvlOVrCs8XanjP00=";
+    })
+  ];
+
   nativeBuildInputs = [
     glib
     meson
     ninja
     pkg-config
     makeWrapper
+    python3
   ]
   ++ lib.optionals withIntrospection [
     gobject-introspection
diff --git a/pkgs/by-name/at/atac/package.nix b/pkgs/by-name/at/atac/package.nix
index 789ef0d73019..cf4fafdb9f4e 100644
--- a/pkgs/by-name/at/atac/package.nix
+++ b/pkgs/by-name/at/atac/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "atac";
-  version = "0.22.0";
+  version = "0.22.1";
 
   src = fetchFromGitHub {
     owner = "Julien-cpsn";
     repo = "ATAC";
     rev = "v${version}";
-    hash = "sha256-zMCz0WRqIS2htf9TMfq6BlupU8dj5PrziEMxisjkOEc=";
+    hash = "sha256-PXSjyMe7Rcoeczm/cqFgn1Ra66T9cA34NdfaqLTljmc=";
   };
 
-  cargoHash = "sha256-U+8JElXGNsiPUM9bLmqXYudRmg+K+VJLAgKLGqiVddc=";
+  cargoHash = "sha256-qjg5yxWRcNnmrl91kogUEOfFOs06tcgmK2hpqx6nftU=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/at/atlassian-cli/package.nix b/pkgs/by-name/at/atlassian-cli/package.nix
deleted file mode 100644
index 3e1d1ddcc3e3..000000000000
--- a/pkgs/by-name/at/atlassian-cli/package.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  jre,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "atlassian-cli";
-  version = "9.6.0";
-
-  src = fetchzip {
-    url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
-    sha256 = "sha256-55ydhprVC9NdDMUrKbpSAEQBb9zRYgwOc7k8aP4R89A=";
-  };
-
-  tools = [
-    "agile"
-    "bamboo"
-    "bitbucket"
-    "confluence"
-    "csv"
-    "hipchat"
-    "jira"
-    "servicedesk"
-    "structure"
-    "tempo"
-    "trello"
-    "upm"
-  ];
-
-  installPhase = ''
-    mkdir -p $out/{bin,share/doc/atlassian-cli}
-    cp -r lib $out/share/java
-    cp -r README.txt license $out/share/doc/atlassian-cli
-    for tool in $tools
-    do
-      substitute ${./wrapper.sh} $out/bin/$tool \
-        --subst-var out \
-        --subst-var-by jre ${jre} \
-        --subst-var-by tool $tool
-      chmod +x $out/bin/$tool
-    done
-  '';
-
-  meta = with lib; {
-    description = "Integrated family of CLI’s for various Atlassian applications";
-    homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview";
-    license = licenses.unfreeRedistributable;
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    maintainers = with maintainers; [ twey ];
-    inherit (jre.meta) platforms;
-  };
-}
diff --git a/pkgs/by-name/at/atlassian-cli/wrapper.sh b/pkgs/by-name/at/atlassian-cli/wrapper.sh
deleted file mode 100755
index 80b60dbc468c..000000000000
--- a/pkgs/by-name/at/atlassian-cli/wrapper.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-tool=@tool@
-user=ATLASSIAN_${tool^^}_USER
-host=ATLASSIAN_${tool^^}_HOST
-pass=ATLASSIAN_${tool^^}_PASS
-
-[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli
-if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ]
-then
-    >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli'
-    exit 1
-fi
-
-@jre@/bin/java \
-    -jar @out@/share/java/@tool@-cli-* \
-    --server "${!host}" \
-    --user "${!user}" \
-    --password "${!pass}" \
-    "$@"
diff --git a/pkgs/by-name/at/atmos/package.nix b/pkgs/by-name/at/atmos/package.nix
index 80e4cd80f986..b63eeef11134 100644
--- a/pkgs/by-name/at/atmos/package.nix
+++ b/pkgs/by-name/at/atmos/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "atmos";
-  version = "1.194.0";
+  version = "1.194.1";
 
   src = fetchFromGitHub {
     owner = "cloudposse";
     repo = "atmos";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xWKdKhuSGwVnRuIaphZ+/5MAoo8tbbbN/WB5OvZYD+w=";
+    hash = "sha256-vQVkuvmqVbwvpcfzgNfI0aGKhEIaQC2626nBppoNsuM=";
   };
 
-  vendorHash = "sha256-wFYR53mDaoiidE/IkSf6eDat3yTHPqxswd0iPBP2GUE=";
+  vendorHash = "sha256-5ScxdWUoxs4unQ0IdTpQ0s6Dr0uOmdaRmYRWknVUGOU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix
index 7889da55ebd2..0b3714faf8cd 100644
--- a/pkgs/by-name/at/atproto-goat/package.nix
+++ b/pkgs/by-name/at/atproto-goat/package.nix
@@ -2,31 +2,29 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "atproto-goat";
-  version = "0-unstable-2025-02-01";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "goat";
-    rev = "e79169f1d8fba9838274b1106d74751fc54eeb9c";
-    hash = "sha256-cLS44J6MlSSti7NRd9vSsdWXoYiMGwt3odg5p60W6ew=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xbvSO3keFheklnzPNEceS01CjIG3pPB+8e2M+3PD85U=";
   };
 
   postPatch = ''
     substituteInPlace main.go \
-      --replace-fail "versioninfo.Short()" '"${version}"' \
+      --replace-fail "versioninfo.Short()" '"${finalAttrs.version}"' \
       --replace-fail '"github.com/earthboundkid/versioninfo/v2"' ""
   '';
 
-  vendorHash = "sha256-l9oSdTAO1YxfrBjMWJDzlmhaZkbo90FGTk5LedjbZB8=";
+  vendorHash = "sha256-hLsMme054E23NV8GDHsmZTYh/vY/w8gKWvpVIPeAiCY=";
 
-  passthru.updateScript = unstableGitUpdater {
-    hardcodeZeroVersion = true;
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Go AT protocol CLI tool";
@@ -38,4 +36,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ pyrox0 ];
     mainProgram = "goat";
   };
-}
+})
diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix
index b4638170f815..be7053870fca 100644
--- a/pkgs/by-name/at/atuin/package.nix
+++ b/pkgs/by-name/at/atuin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "atuin";
-  version = "18.8.0";
+  version = "18.10.0";
 
   src = fetchFromGitHub {
     owner = "atuinsh";
     repo = "atuin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FJEXIxdeg6ExXvrQ3dtugMK5xw+NwWyB+ld9rj7okoU=";
+    hash = "sha256-bfSa3RtVXxHt3usDqqpE/oXKKDUZOrf+tD9uL59fr6M=";
   };
 
-  cargoHash = "sha256-xJPSMu22Bq9Panrafsd5vUSnEQYuJB19OEZaAq8z0mw=";
+  cargoHash = "sha256-67ffivZVCly1GWA3fJ9mT8nGv2EGd6eCthbaIu/IW3M=";
 
   # atuin's default features include 'check-updates', which do not make sense
   # for distribution builds. List all other default features.
@@ -41,13 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh <($out/bin/atuin gen-completions -s zsh)
   '';
 
-  passthru = {
-    tests = {
-      inherit (nixosTests) atuin;
-    };
-    updateScript = nix-update-script { };
-  };
-
   checkFlags = [
     # tries to make a network access
     "--skip=registration"
@@ -56,11 +49,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # PermissionDenied (Operation not permitted)
     "--skip=change_password"
     "--skip=multi_user_test"
-    "--skip=store::var::tests::build_vars"
-    # Tries to touch files
-    "--skip=build_aliases"
   ];
 
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
+  passthru = {
+    tests = {
+      inherit (nixosTests) atuin;
+    };
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Replacement for a shell history which records additional commands context with optional encrypted synchronization between machines";
     homepage = "https://github.com/atuinsh/atuin";
diff --git a/pkgs/by-name/au/audiality2/package.nix b/pkgs/by-name/au/audiality2/package.nix
index 61e83d4fac5d..d6c6e328fa7d 100644
--- a/pkgs/by-name/au/audiality2/package.nix
+++ b/pkgs/by-name/au/audiality2/package.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8)' \
+      'cmake_minimum_required(VERSION 3.5)'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/au/audiomatch/package.nix b/pkgs/by-name/au/audiomatch/package.nix
new file mode 100644
index 000000000000..a813bc814fa5
--- /dev/null
+++ b/pkgs/by-name/au/audiomatch/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  chromaprint,
+  fetchFromGitHub,
+  python3Packages,
+}:
+python3Packages.buildPythonPackage rec {
+  version = "0.2.2";
+  pname = "audiomatch";
+  pyproject = true;
+  src = fetchFromGitHub {
+    owner = "unmade";
+    repo = "audiomatch";
+    tag = version;
+    hash = "sha256-I7gTP2lwg4EDNmI+tVmI721/nEDShb7q21tD9tRbskY=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+     --replace-fail 'poetry>=0.12,<1.0' "poetry-core" \
+     --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
+
+    substituteInPlace src/audiomatch/fingerprints.py \
+     --replace-fail 'fpcalc' '${lib.getExe chromaprint}'
+  '';
+
+  build-system = [
+    python3Packages.poetry-core
+    python3Packages.distutils
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+  ];
+
+  meta = {
+    homepage = "https://github.com/unmade/audiomatch";
+    description = "A small command-line tool to find similar audio files";
+    changelog = "https://github.com/unmade/audiomatch/releases/tag/${version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    mainProgram = "audiomatch";
+    maintainers = with lib.maintainers; [ leha44581 ];
+  };
+}
diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix
index 7395ada94e13..d16ea8e58677 100644
--- a/pkgs/by-name/au/audit/package.nix
+++ b/pkgs/by-name/au/audit/package.nix
@@ -117,8 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pythonImportsCheck = [ "audit" ];
 
-  enableParallelChecking = false;
-  doCheck = true;
+  doCheck = false;
 
   postInstall = ''
     installShellCompletion --bash init.d/audit.bash_completion
@@ -156,6 +155,11 @@ stdenv.mkDerivation (finalAttrs: {
       static = pkgsStatic.audit or null;
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
       audit = nixosTests.audit;
+      # Broken on a hardened kernel
+      package = finalAttrs.finalPackage.overrideAttrs (previousAttrs: {
+        pname = previousAttrs.pname + "-test";
+        doCheck = true;
+      });
     };
   };
 
diff --git a/pkgs/by-name/au/august/package.nix b/pkgs/by-name/au/august/package.nix
index 0d9090a3eff1..e0966fb5608a 100644
--- a/pkgs/by-name/au/august/package.nix
+++ b/pkgs/by-name/au/august/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ag";
   };
 }
diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index f2d34eb7490d..86840cb136c5 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth0-cli";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${version}";
-    hash = "sha256-HII1qRJ4or5gncSVUA41DmkC8EQ9w6fdmMM15JTUFsw=";
+    hash = "sha256-y+vNIXwSNVWwR6uSyLqsk366Y558sZxK4RYG/Cres/4=";
   };
 
-  vendorHash = "sha256-g/vpUbtWFKyoPObpd9yOdsbzD/8d0SjAUZzL7A92bio=";
+  vendorHash = "sha256-eqeicg4ZWd/oOjaULXKjI5t8+4lSl5HFG3fOaeF5zB4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index d9a8783ab369..f03d6b67f963 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -15,13 +15,13 @@
 let
   nodejs = nodejs_24;
 
-  version = "2025.8.4";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     owner = "goauthentik";
     repo = "authentik";
     rev = "version/${version}";
-    hash = "sha256-pIzDaoDWc58cY/XhsyweCwc4dfRvkaT/zqsV1gDSnCI=";
+    hash = "sha256-HowB6DTGCqz770fKYbnE+rQ11XRV0WSNkLD+HSWZwz8=";
   };
 
   meta = {
@@ -48,8 +48,8 @@ let
 
     outputHash =
       {
-        "aarch64-linux" = "sha256-fa/WGRb4lWSXMqBmGhCd+N2fZr1YZKsskr3Oowp8gRE=";
-        "x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q=";
+        "aarch64-linux" = "sha256-aXXlzTsZp5mOrsxy9oHNzcc+1cFSnbC9RmtawBohmLI=";
+        "x86_64-linux" = "sha256-Hi0HXzwTLuer0v4IKF3aim0tVe7AVLi67DiMimrIq5s=";
       }
       .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
 
@@ -119,8 +119,8 @@ let
 
     outputHash =
       {
-        "aarch64-linux" = "sha256-4JkNwQACS3tiiLuj41cGRWNspljVQxlsJvCM9KE2JrQ=";
-        "x86_64-linux" = "sha256-LD+zXc8neRbEwq1mx9y7b+08p8hxvo/RW6QzsFQgaUs=";
+        "aarch64-linux" = "sha256-t/jyzG3ibTW3fu8Gl1tWkSjMG6Lek/7JDccDrZX6sD0=";
+        "x86_64-linux" = "sha256-8I1YAKvgWjM3p9O1mCetZvhZelrfB31w0ZwkZBUEoh4=";
       }
       .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform");
     outputHashMode = "recursive";
@@ -205,10 +205,32 @@ let
   python = python312.override {
     self = python;
     packageOverrides = final: prev: {
-      # https://github.com/goauthentik/authentik/pull/14709
-      django = final.django_5_1;
+      # https://github.com/goauthentik/authentik/pull/16324
+      django = final.django_5_2;
 
-      django-dramatiq-postgres = prev.buildPythonPackage {
+      django-channels-postgres = final.buildPythonPackage {
+        pname = "django-channels-postgres";
+        inherit version src meta;
+        pyproject = true;
+
+        sourceRoot = "${src.name}/packages/django-channels-postgres";
+
+        build-system = with final; [ hatchling ];
+
+        propagatedBuildInputs =
+          with final;
+          [
+            channels
+            django
+            django-pgtrigger
+            msgpack
+            psycopg
+            structlog
+          ]
+          ++ psycopg.optional-dependencies.pool;
+      };
+
+      django-dramatiq-postgres = final.buildPythonPackage {
         pname = "django-dramatiq-postgres";
         inherit version src meta;
         pyproject = true;
@@ -222,6 +244,7 @@ let
           [
             cron-converter
             django
+            django-pglock
             django-pgtrigger
             dramatiq
             structlog
@@ -230,10 +253,25 @@ let
           ++ dramatiq.optional-dependencies.watch;
       };
 
+      django-postgres-cache = final.buildPythonPackage {
+        pname = "django-postgres-cache";
+        inherit version src meta;
+        pyproject = true;
+
+        sourceRoot = "${src.name}/packages/django-postgres-cache";
+
+        build-system = with final; [ hatchling ];
+
+        propagatedBuildInputs = with final; [
+          django
+          django-postgres-extra
+        ];
+      };
+
       # Running authentik currently requires a custom version.
       # Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section.
       # See https://github.com/goauthentik/authentik/pull/14057 for latest version bump.
-      djangorestframework = prev.buildPythonPackage {
+      djangorestframework = final.buildPythonPackage {
         pname = "djangorestframework";
         version = "3.16.0";
         format = "setuptools";
@@ -286,18 +324,7 @@ let
         };
       });
 
-      tenant-schemas-celery = prev.tenant-schemas-celery.overrideAttrs (_: rec {
-        version = "3.0.0";
-
-        src = fetchFromGitHub {
-          owner = "maciej-gol";
-          repo = "tenant-schemas-celery";
-          tag = version;
-          hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg=";
-        };
-      });
-
-      authentik-django = prev.buildPythonPackage {
+      authentik-django = final.buildPythonPackage {
         pname = "authentik-django";
         inherit version src meta;
         pyproject = true;
@@ -326,14 +353,13 @@ let
           with final;
           [
             argon2-cffi
-            celery
             channels
-            channels-redis
             cryptography
             dacite
             deepmerge
             defusedxml
             django
+            django-channels-postgres
             django-countries
             django-cte
             django-dramatiq-postgres
@@ -342,8 +368,9 @@ let
             django-model-utils
             django-pglock
             django-pgtrigger
+            django-postgres-cache
+            django-postgres-extra
             django-prometheus
-            django-redis
             django-storages
             django-tenants
             djangoql
@@ -354,7 +381,6 @@ let
             drf-spectacular
             duo-client
             fido2
-            flower
             geoip2
             geopy
             google-api-python-client
@@ -383,7 +409,6 @@ let
             setproctitle
             structlog
             swagger-spec-validator
-            tenant-schemas-celery
             twilio
             ua-parser
             unidecode
@@ -396,7 +421,6 @@ let
             zxcvbn
           ]
           ++ django-storages.optional-dependencies.s3
-          ++ opencontainers.optional-dependencies.reggie
           ++ psycopg.optional-dependencies.c
           ++ psycopg.optional-dependencies.pool
           ++ uvicorn.optional-dependencies.standard;
@@ -431,7 +455,7 @@ let
 
     env.CGO_ENABLED = 0;
 
-    vendorHash = "sha256-wTTEDBRYCW1UFaeX49ufLT0c17sacJzcCaW/8cPNYR4=";
+    vendorHash = "sha256-m2shrCwoVdbtr8B83ZcAyG+J6dEys2xdjtlfFFF4CDo=";
 
     postInstall = ''
       mv $out/bin/server $out/bin/authentik
diff --git a/pkgs/by-name/au/auto-editor/lock.json b/pkgs/by-name/au/auto-editor/lock.json
new file mode 100644
index 000000000000..e772f3c9743b
--- /dev/null
+++ b/pkgs/by-name/au/auto-editor/lock.json
@@ -0,0 +1,28 @@
+{
+  "depends": [
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/w556rbsnv2fxb229av2iq180ri9x0d9j-source",
+      "rev": "77469f58916369bc3863194cabb05238577fb257",
+      "sha256": "18wjz5yqzr1dz6286p2w02fk2xjr54l477g90bz4pskjcqrqnjbv",
+      "url": "https://github.com/khchen/tinyre/archive/77469f58916369bc3863194cabb05238577fb257.tar.gz",
+      "ref": "1.6.0",
+      "packages": [
+        "tinyre"
+      ],
+      "srcDir": ""
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
+      "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
+      "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
+      "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
+      "ref": "v0.2.1",
+      "packages": [
+        "checksums"
+      ],
+      "srcDir": "src"
+    }
+  ]
+}
diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index a1fe3fa99ecb..d633900da86c 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -1,43 +1,100 @@
 {
   lib,
-  python3Packages,
+  buildNimPackage,
   fetchFromGitHub,
+
+  withHEVC ? true,
+  withWhisper ? false,
+
+  ffmpeg,
   yt-dlp,
+  lame,
+  libopus,
+  libvpx,
+  x264,
+  x265,
+  dav1d,
+  svt-av1,
+  whisper-cpp,
+
+  python3,
+  python3Packages,
+  nimble,
+  nim,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildNimPackage rec {
   pname = "auto-editor";
-  version = "28.0.2";
-  pyproject = true;
+  version = "29.3.1";
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-ozw5ZPvKP7aTBBItQKNx85hZ1T4IxX9NYCcNHC5UuuM=";
+    hash = "sha256-Nne6niGnhaEQNvvFURmF0N9oyuG1ZvJ4NzxddJdSQtY=";
   };
 
-  postPatch = ''
-    substituteInPlace auto_editor/__main__.py \
-      --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"'
-  '';
+  lockFile = ./lock.json;
 
-  build-system = with python3Packages; [ setuptools ];
-
-  dependencies = with python3Packages; [
-    basswood-av
-    numpy
+  buildInputs = [
+    ffmpeg
+    lame
+    libopus
+    libvpx
+    x264
+    dav1d
+    svt-av1
+  ]
+  ++ lib.optionals withHEVC [
+    x265
+  ]
+  ++ lib.optionals withWhisper [
+    whisper-cpp
   ];
 
-  checkPhase = ''
-    runHook preCheck
+  nimFlags = [
+    "--passc:-Wno-incompatible-pointer-types"
+  ]
+  ++ lib.optionals withHEVC [
+    "-d:enable_hevc"
+  ]
+  ++ lib.optionals withWhisper [
+    "-d:enable_whisper"
+  ];
 
-    $out/bin/auto-editor test all
+  postPatch = ''
+    substituteInPlace src/log.nim \
+      --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"'
 
-    runHook postCheck
+    # buildNimPackage hack
+    substituteInPlace ae.nimble \
+      --replace-fail '"main=auto-editor"' '"main"'
   '';
 
-  pythonImportsCheck = [ "auto_editor" ];
+  # TODO: Fix checks
+  /*
+    nativeCheckInputs = [
+      python3Packages.av
+      python3
+    ];
+
+    checkPhase = ''
+      runHook preCheck
+
+      nim c \
+      ${if withHEVC then "-d:enable_hevc" else ""} \
+      ${if withWhisper then "-d:enable_whisper" else ""} \
+      -r $src/src/rationals
+
+      python3 $src/tests/test.py
+
+      runHook postCheck
+    '';
+  */
+
+  postInstall = ''
+    mv $out/bin/main $out/bin/auto-editor
+  '';
 
   meta = {
     changelog = "https://github.com/WyattBlue/auto-editor/releases/tag/${src.tag}";
@@ -45,6 +102,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://auto-editor.com/";
     license = lib.licenses.unlicense;
     mainProgram = "auto-editor";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      utopiatopia
+    ];
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 0bf929f6b0c7..c407155b262e 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -13,12 +13,12 @@
 
 let
   pname = "autobrr";
-  version = "1.66.1";
+  version = "1.68.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-4vfcSkTEFPqQ0r6uLg3o2pa1xcPuWn54+zYpWS/JEKE=";
+    hash = "sha256-BURejp9ncaSfUw7dq80rFECjWwNSGcRxOTHRBXon67k=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
@@ -41,7 +41,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 1;
-      hash = "sha256-kbLdXF5pAVIha07MCgq1yUShQwxj8xLt2mKzU4NYhwU=";
+      hash = "sha256-59CNJq0D5TJBL9zccBOjZif+xbNibWDiAQq51BqqQhg=";
     };
 
     postBuild = ''
@@ -61,7 +61,7 @@ buildGoModule rec {
     src
     ;
 
-  vendorHash = "sha256-hQXXBx4pACKqwG0ctkymZpCv3VLzFx2JCHuKzqumWbg=";
+  vendorHash = "sha256-6K//pt5xg1wEHAVe+vP7wicWQ8L/ty3f1PkZhBm8mCE=";
 
   preBuild = ''
     cp -r ${autobrr-web}/* web/dist
diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 7d5e98be0386..5be8284b0124 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -2,28 +2,34 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "automatic-timezoned";
-  version = "2.0.92";
+  version = "2.0.101";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
-    rev = "v${version}";
-    sha256 = "sha256-X1B2L8bh3iXPZ5NpaH+VP67i/ykmd0IVXu0dg6XmUGo=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-OiBFFXdaBYBSToEzWafxNLBC12J1f3mO7DMzKESRxSY=";
   };
 
-  cargoHash = "sha256-4ZV5ef033cZdMJaQD0gLNaKe8XfQzhF7mADm7N0NxvA=";
+  cargoHash = "sha256-vX7QGLPuU08KhAJUujgqtPmzW3Ji38W1YiEZ4KbI2mE=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "Automatically update system timezone based on location";
     homepage = "https://github.com/maxbrunet/automatic-timezoned";
-    changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ maxbrunet ];
+    maintainers = [ lib.maintainers.maxbrunet ];
     platforms = lib.platforms.linux;
     mainProgram = "automatic-timezoned";
   };
-}
+})
diff --git a/pkgs/by-name/au/autorandr/package.nix b/pkgs/by-name/au/autorandr/package.nix
index 02da6e73800e..7cd2591fae8b 100644
--- a/pkgs/by-name/au/autorandr/package.nix
+++ b/pkgs/by-name/au/autorandr/package.nix
@@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/phillipberndt/autorandr/";
     description = "Automatically select a display configuration based on connected devices";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ coroa ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "autorandr";
   };
diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix
index e18289c0540b..8e8a2aba61a5 100644
--- a/pkgs/by-name/au/autotiling-rs/package.nix
+++ b/pkgs/by-name/au/autotiling-rs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "autotiling-rs";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "ammgws";
     repo = "autotiling-rs";
     rev = "v${version}";
-    sha256 = "sha256-S/6LRQTHdPGZkmbTAb0ufNoXE1nD+rIQ2ASJ8jjFS3E=";
+    sha256 = "sha256-21XIKZ2rzuQMpkaOhGu1pg4J3OGOzHNQ20Rcw1V4BfI=";
   };
 
-  cargoHash = "sha256-riQ1nOs4fBj9y/jK0nS7Y85vMejLrKrEJzNnsQKkoeg=";
+  cargoHash = "sha256-+5GibhSkiKmgRrESKrliKLrrtUQ7iv2sFz46OFwAIwE=";
 
   meta = with lib; {
     description = "Autotiling for sway (and possibly i3)";
diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix
index ab6433678b3f..02bb6c87346b 100644
--- a/pkgs/by-name/av/avalanche-cli/package.nix
+++ b/pkgs/by-name/av/avalanche-cli/package.nix
@@ -14,17 +14,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "avalanche-cli";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = "avalanche-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/HwZUsggBeuSZLYQDWUU4rfktnvwVolE5mKiZW4IXXs=";
+    hash = "sha256-1sQdQTWlUNWM8F/9/DZjn/WS3F0RTG4hglmoN2jjOyc=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-JQEWEqseg5q0b8rPlO/19V1BLbWBdXldoWgUiqI9Qh4=";
+  vendorHash = "sha256-bId5FDdpgI8DTtY44cgATf41qLu8udLR00XioZOAh/Y=";
 
   # Fix error: 'Caught SIGILL in blst_cgo_init'
   # https://github.com/bnb-chain/bsc/issues/1521
diff --git a/pkgs/by-name/av/avalonia/deps.json b/pkgs/by-name/av/avalonia/deps.json
index a4594c6e3f8f..ac5c240205ec 100644
--- a/pkgs/by-name/av/avalonia/deps.json
+++ b/pkgs/by-name/av/avalonia/deps.json
@@ -887,8 +887,8 @@
   },
   {
     "pname": "Microsoft.WindowsDesktop.App.Ref",
-    "version": "8.0.20",
-    "hash": "sha256-EDrxjwHRVTirMADYU+po/ANd6LaoehL/9RSiuZEsIB0="
+    "version": "8.0.21",
+    "hash": "sha256-RufsU8Mr81jK6fIbULBgkv0BRVmobXL38L8rBwBjJyg="
   },
   {
     "pname": "Mono.Cecil",
diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix
index dd569261f2d9..5dab013d0db8 100644
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "avbroot";
-  version = "3.23.1";
+  version = "3.23.2";
 
   src = fetchFromGitHub {
     owner = "chenxiaolong";
     repo = "avbroot";
     tag = "v${version}";
-    hash = "sha256-ExP1ifZBiAQO0JntUsVPCVtItnX3JTv2QhbOcdbw8zo=";
+    hash = "sha256-rS3V+D7dBt/px0UNC8ZZyQ4FzNsjTykMSeXbjFF6iis=";
   };
 
-  cargoHash = "sha256-sLW8sHb9rdE9IGfHTFPnH3JmqqKQK7CMIWohHwgss2c=";
+  cargoHash = "sha256-XX2u281qTwI6/GwujseIiAmlsYPgxkA7cxyIljv29tk=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/av/avfs/package.nix b/pkgs/by-name/av/avfs/package.nix
index 4effeb22b398..d2c21467567c 100644
--- a/pkgs/by-name/av/avfs/package.nix
+++ b/pkgs/by-name/av/avfs/package.nix
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
     description = "Virtual filesystem that allows browsing of compressed files";
     platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Only;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/av/avidemux/package.nix b/pkgs/by-name/av/avidemux/package.nix
index b570d6036af6..2343a70b463d 100644
--- a/pkgs/by-name/av/avidemux/package.nix
+++ b/pkgs/by-name/av/avidemux/package.nix
@@ -80,6 +80,21 @@ stdenv.mkDerivation rec {
         stripLen = 1;
       }
     } avidemux_core/ffmpeg_package/patches/
+
+    # Those CMake versions are deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace {avidemux_plugins,avidemux_core,avidemux/{cli,qt4}}/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.0)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace avidemux/gtk/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace avidemux/qt4/xdg_data/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.11)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace addons/fontGen/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/av/avro-c/package.nix b/pkgs/by-name/av/avro-c/package.nix
index ad598d511e08..a50794c48e62 100644
--- a/pkgs/by-name/av/avro-c/package.nix
+++ b/pkgs/by-name/av/avro-c/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avro-c";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
-    sha256 = "sha256-dDM9QxB5w113DO9plstN4EBY0Z6BvQuaNjvP04V1A38=";
+    sha256 = "sha256-tk4xuUcZSZVJYiqpLx2W0XQpZ87SYaCTG2O+O76Qfyw=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index f1e60d1a16c2..836d04605c63 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "await";
-  version = "2.1.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "slavaGanzin";
     repo = "await";
     tag = version;
-    hash = "sha256-p0rB1fPfBL1Vj4p7IZtmLhfB5LwwyRaiCVSeDZAXJAo=";
+    hash = "sha256-UfEjcf8NuLRzu/57aS738Do/lXzYX5lrus1xgZ7dask=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/aw/awf/package.nix b/pkgs/by-name/aw/awf/package.nix
deleted file mode 100644
index 9423dda218c6..000000000000
--- a/pkgs/by-name/aw/awf/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  gtk2,
-  gtk3,
-  pkg-config,
-  wrapGAppsHook3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "awf";
-  version = "1.4.0";
-
-  src = fetchFromGitHub {
-    owner = "valr";
-    repo = "awf";
-    rev = "v${version}";
-    sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gtk2
-    gtk3
-  ];
-
-  autoreconfPhase = ''
-    patchShebangs ./autogen.sh
-    ./autogen.sh
-  '';
-
-  meta = with lib; {
-    description = "Widget Factory";
-    longDescription = ''
-      A widget factory is a theme preview application for gtk2 and
-      gtk3. It displays the various widget types provided by gtk2/gtk3
-      in a single window allowing to see the visual effect of the
-      applied theme.
-    '';
-    homepage = "https://github.com/valr/awf";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ michalrus ];
-  };
-}
diff --git a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
index 423e02117daf..2f7667e33d2c 100644
--- a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
+++ b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "aws-codeartifact-proxy";
-  version = "0.6.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "sktan";
     repo = "aws-codeartifact-proxy";
     rev = "v${version}";
-    hash = "sha256-+P0AIg5m7nePy+Yd445nVfLVxya80Om9lJTPKZeTshc=";
+    hash = "sha256-dcUJ2r0VBUNk8kKY1fPkUHoJi1fhAQbd2K+9MC/ddGE=";
   };
   sourceRoot = "${src.name}/src";
 
-  vendorHash = "sha256-3MO+mRCstXw0FfySiyMSs1vaao7kUYIyJB2gAp1IE48=";
+  vendorHash = "sha256-5D/aKNU7ZtDMJW+KImBwN4bhpSexsldtCtA3IIHJrQU=";
 
   meta = {
     description = "AWS CodeArtifact proxy to allow unauthenticated read access";
diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
index dce0c6a561c0..b5a07237c8b9 100644
--- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
+++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
@@ -12,9 +12,11 @@ let
     self = localPython;
     packageOverrides = final: prev: {
       urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {
-        pyproject = true;
         version = "1.26.18";
-        nativeBuildInputs = with final; [ setuptools ];
+        build-system = with final; [
+          setuptools
+        ];
+        postPatch = null;
         src = prev.src.override {
           inherit version;
           hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";
diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix
index a4c4b639a9f6..479a0aae9943 100644
--- a/pkgs/by-name/aw/aws-lambda-rie/package.nix
+++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "aws-lambda-runtime-interface-emulator";
-  version = "1.27";
+  version = "1.28";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lambda-runtime-interface-emulator";
     rev = "v${version}";
-    sha256 = "sha256-moOCuAq6eliNutP5oZGC33VJZXkuGCEKLdMqIwC+Bo4=";
+    sha256 = "sha256-BEyztLEn2S3gkmb7WV+tZ6Cmjt3/h8mVToSQQ6qjmRo=";
   };
 
   vendorHash = "sha256-+tgB9Z39Oq43PZoF85DG1Z/CGeoXXTKAML7Z6DZ1XvM=";
diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index 4a84309316c6..f571c25b9782 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -9,22 +9,25 @@
 }:
 buildGoModule rec {
   pname = "aws-vault";
-  version = "7.2.0";
+  version = "7.7.5";
 
   src = fetchFromGitHub {
-    owner = "99designs";
+    owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${version}";
-    hash = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c=";
+    hash = "sha256-K91GNyvtjDO6UMU9cC+TbUdMWdXrPlKLU8u5cbEMdRA=";
   };
 
-  vendorHash = "sha256-4bJKDEZlO0DzEzTQ7m+SQuzhe+wKmL6wLueqgSz/46s=";
+  proxyVendor = true;
+  vendorHash = "sha256-3AL3vjKqzjrzgPrLLwIgWpn1hRB6soTMbaRly/fvziA=";
 
   nativeBuildInputs = [
     installShellFiles
     makeWrapper
   ];
 
+  env.CGO_ENABLED = "0";
+
   postInstall = ''
     # make xdg-open overrideable at runtime
     # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links
@@ -55,8 +58,11 @@ buildGoModule rec {
   meta = with lib; {
     description = "Vault for securely storing and accessing AWS credentials in development environments";
     mainProgram = "aws-vault";
-    homepage = "https://github.com/99designs/aws-vault";
+    homepage = "https://github.com/ByteNess/aws-vault";
     license = licenses.mit;
-    maintainers = with maintainers; [ zimbatm ];
+    maintainers = with maintainers; [
+      zimbatm
+      er0k
+    ];
   };
 }
diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix
index bdcf2e63b8b8..3362e90367a0 100644
--- a/pkgs/by-name/aw/aws-workspaces/package.nix
+++ b/pkgs/by-name/aw/aws-workspaces/package.nix
@@ -1,8 +1,10 @@
 {
+  lib,
   callPackage,
   writeShellApplication,
   buildFHSEnv,
   webkitgtk_4_1,
+  ffmpeg,
   gtk3,
   pango,
   atk,
@@ -33,14 +35,12 @@ let
       echo "Release: 22.04"
     '';
   };
-  pname = "aws-workspaces";
-
 in
 buildFHSEnv {
-  inherit pname;
+  pname = "aws-workspaces";
   inherit (workspacesclient) version;
 
-  runScript = "${workspacesclient}/bin/workspacesclient";
+  runScript = lib.getExe workspacesclient;
 
   includeClosures = true;
 
@@ -49,6 +49,7 @@ buildFHSEnv {
     custom_lsb_release
     webkitgtk_4_1
     gtk3
+    ffmpeg
     pango
     atk
     cairo
@@ -64,7 +65,7 @@ buildFHSEnv {
 
   # expected executable doesn't match the name of this package
   extraInstallCommands = ''
-    mv $out/bin/${pname} $out/bin/workspacesclient
+    mv $out/bin/aws-workspaces $out/bin/${workspacesclient.meta.mainProgram}
 
     ln -s ${workspacesclient}/share $out/
   '';
diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix
index 1c253b989b34..5fe548b6eef5 100644
--- a/pkgs/by-name/aw/awsbck/package.nix
+++ b/pkgs/by-name/aw/awsbck/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "awsbck";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "awsbck";
     rev = "v${version}";
-    hash = "sha256-IFdhfBri1k5u7NfC1HTSegKCtRDK2fz+WkjwHOtp1qk=";
+    hash = "sha256-WWYUMamMDtnvOR7vjoKd1Kn8vJBAAa9Jj8MFPRGQfEQ=";
   };
 
-  cargoHash = "sha256-9RKsnGjbP0iQsC2iCq6LTleILHvX0powQu15oopE2XY=";
+  cargoHash = "sha256-eo7NBGDPhu+v07dUUw/k1O62gxbeXh1PdPogTjg6l8I=";
 
   # tests run in CI on the source repo
   doCheck = false;
diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index 951ffa898bce..e8df0f738cdc 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -25,14 +25,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.25.1";
+  version = "3.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     tag = version;
-    hash = "sha256-objIzpYMyuFjEc85H9dXhQez3MZfNu3lWSWm6+E2iJs=";
+    hash = "sha256-6PeOn0owjEjTWdEwgXILiGq+6T5GBBc61viiG5GNeYo=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix
index 4a7029bab9d6..57fa92699d2e 100644
--- a/pkgs/by-name/ay/ayugram-desktop/package.nix
+++ b/pkgs/by-name/ay/ayugram-desktop/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  fetchpatch2,
   fetchFromGitHub,
   nix-update-script,
   telegram-desktop,
@@ -23,6 +23,15 @@ telegram-desktop.override {
         fetchSubmodules = true;
       };
 
+      # fix build failure with Qt 6.10
+      patches = fetchpatch2 {
+        name = "fix-build-with-qt-610.patch";
+        url = "https://github.com/desktop-app/cmake_helpers/commit/682f1b57.patch";
+        hash = "sha256-DHwgxAEFc1byQkVvrPwyctQKvUsK/KQ/cnzRv6PQuTM=";
+        stripLen = 1;
+        extraPrefix = "cmake/";
+      };
+
       passthru.updateScript = nix-update-script { };
 
       meta = previousAttrs.meta // {
diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index 441aed3cd297..b77ea0de0c3e 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.7.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X7+/2pXbpHFm22lwWy6LvyjIy6sxmYSiMrYV3faAZl4=";
+    hash = "sha256-1MJVU1YhjIpY4C3cpmXKVTg/vFdCEgQZoOALLQW/7LM=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
     ./version-build-info.patch
   ];
 
-  vendorHash = "sha256-PHrpUlAG/PBe3NKUGBQ1U7dCcqkSlErWX2dp9ZPB3+8=";
+  vendorHash = "sha256-ucsTrouw0/MAVzrXb2mot9ccD5v6scu8SJMJR51R48E=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -59,7 +59,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/netr0m/az-pim-cli";
     changelog = "https://github.com/netr0m/az-pim-cli/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "az-pim-cli";
   };
 })
diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 723afbd6da93..9f696c48b8a6 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -42,8 +42,7 @@
   gamemode,
   enableGamemode ? lib.meta.availableOn stdenv.hostPlatform gamemode,
   nix-update-script,
-  darwinMinVersionHook,
-  apple-sdk_12,
+  fetchpatch2,
 }:
 let
   inherit (lib)
@@ -65,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # https://github.com/azahar-emu/azahar/pull/1305
     ./fix-zstd-seekable-include.patch
+
+    # TODO: Remove in next release
+    (fetchpatch2 {
+      url = "https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch?full_index=1";
+      hash = "sha256-9rmRbv7VFMhHly5qTGaeBLpvtWMu6HkCGUUM+t78Meg=";
+    })
   ];
 
   strictDeps = true;
@@ -122,10 +127,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ optionals stdenv.hostPlatform.isDarwin [
     moltenvk
-
-    # error: 'lowPowerModeEnabled' is unavailable: not available on macOS
-    apple-sdk_12
-    (darwinMinVersionHook "12.0")
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json
index 46fea7c8919b..0944d497f7b6 100644
--- a/pkgs/by-name/az/azure-cli/extensions-generated.json
+++ b/pkgs/by-name/az/azure-cli/extensions-generated.json
@@ -50,9 +50,9 @@
   },
   "aks-preview": {
     "pname": "aks-preview",
-    "version": "18.0.0b33",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b33-py2.py3-none-any.whl",
-    "hash": "sha256-Zkp5Nzl+eQ7PPniDF7/K5II2xIG6OKC3Rhm3ZTpyILc=",
+    "version": "18.0.0b44",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-18.0.0b44-py2.py3-none-any.whl",
+    "hash": "sha256-lpkKTYjIReWC5J+amHDnR/jhOjXwCmV0MkoiX+nmwiE=",
     "description": "Provides a preview for upcoming AKS features"
   },
   "alb": {
@@ -71,16 +71,16 @@
   },
   "amg": {
     "pname": "amg",
-    "version": "2.8.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.8.0-py3-none-any.whl",
-    "hash": "sha256-E4Id15eoKStqeQynaHisZLcZsiApMf6uV/J8xWz/s5w=",
+    "version": "2.8.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.8.1-py3-none-any.whl",
+    "hash": "sha256-nsp7EJIf9/hfpbbpAlNQBQ//U2oR0zWV+LqJtlyCoLM=",
     "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension"
   },
   "amlfs": {
     "pname": "amlfs",
-    "version": "1.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amlfs-1.1.0-py3-none-any.whl",
-    "hash": "sha256-RbZNYIHcVsgziXGOHHcawoJSpEzphcv1loHY9dBpPvA=",
+    "version": "1.2.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amlfs-1.2.0-py3-none-any.whl",
+    "hash": "sha256-0YpGEyCw7MfO9FFEpGIi1ICDMIkM6FAt6djWsBw2ct4=",
     "description": "Microsoft Azure Command-Line Tools Amlfs Extension"
   },
   "apic-extension": {
@@ -141,9 +141,9 @@
   },
   "azure-firewall": {
     "pname": "azure-firewall",
-    "version": "1.3.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.3.0-py2.py3-none-any.whl",
-    "hash": "sha256-AkelAJEIignnFomg7HJTrjl8UA1oeQZQTWjRqibUdDE=",
+    "version": "1.5.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_firewall-1.5.0-py2.py3-none-any.whl",
+    "hash": "sha256-wE/LgTfxqeHOkkybF8pp7TSLJe+WPqjKiEaYe/C8phs=",
     "description": "Manage Azure Firewall resources"
   },
   "azurelargeinstance": {
@@ -295,9 +295,9 @@
   },
   "datadog": {
     "pname": "datadog",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-1.0.0-py3-none-any.whl",
-    "hash": "sha256-VCcoKbYC+F8EbEMRzCMBX3a6LvdkkYKfM5OuC7WhUQI=",
+    "version": "2.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datadog-2.0.0-py3-none-any.whl",
+    "hash": "sha256-pdot6RlORnPubrsL8UWrqwUYFuGBYCPd+9DYG6fLklM=",
     "description": "Microsoft Azure Command-Line Tools Datadog Extension"
   },
   "datafactory": {
@@ -309,9 +309,9 @@
   },
   "datamigration": {
     "pname": "datamigration",
-    "version": "1.0.0b6",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0b6-py3-none-any.whl",
-    "hash": "sha256-4YPJCSMBr+10f+FRQtOiqwbhE6POAHpYFQcdESJppzg=",
+    "version": "1.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/datamigration-1.0.0-py3-none-any.whl",
+    "hash": "sha256-V1WEF92FjdcBBiaCjxs/DteG3c43sqb3qKCY+eiEg4c=",
     "description": "Microsoft Azure Command-Line Tools DataMigrationManagementClient Extension"
   },
   "dataprotection": {
@@ -449,16 +449,16 @@
   },
   "firmwareanalysis": {
     "pname": "firmwareanalysis",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-1.0.0-py3-none-any.whl",
-    "hash": "sha256-HD3xRB3nbtsIvtBawnndKwK9b6tooLmkld/X7M4+kss=",
+    "version": "2.0.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/firmwareanalysis-2.0.1-py3-none-any.whl",
+    "hash": "sha256-3qo7mm+ZyPXZ7l2ggaOde+JimEbpYG//Te54yNc5oXE=",
     "description": "Microsoft Azure Command-Line Tools Firmwareanalysis Extension"
   },
   "fleet": {
     "pname": "fleet",
-    "version": "1.6.2",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.6.2-py3-none-any.whl",
-    "hash": "sha256-YZpmg1dWiZOerGTgotBstzYB9FgnxPKGurS7OP01Wbc=",
+    "version": "1.8.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.8.0-py3-none-any.whl",
+    "hash": "sha256-3JX3KQ4eSr3CQ5UkvssOcCHaAeIFsm0/xWd5JYaL0G4=",
     "description": "Microsoft Azure Command-Line Tools Fleet Extension"
   },
   "fluid-relay": {
@@ -594,13 +594,6 @@
     "hash": "sha256-d/Yzd3mdYssQDJO9kSTZKHC2hY4OleQ1XQf1pLDfax0=",
     "description": "Microsoft Azure Command-Line Tools IpGroup Extension"
   },
-  "k8s-extension": {
-    "pname": "k8s-extension",
-    "version": "1.6.7",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-1.6.7-py3-none-any.whl",
-    "hash": "sha256-TU2bAc44Zpd//GyziclX7V8BU1cExK/SduKLV++FxqE=",
-    "description": "Microsoft Azure Command-Line Tools K8s-extension Extension"
-  },
   "k8s-runtime": {
     "pname": "k8s-runtime",
     "version": "2.0.0",
@@ -659,9 +652,9 @@
   },
   "managednetworkfabric": {
     "pname": "managednetworkfabric",
-    "version": "8.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-8.1.0-py3-none-any.whl",
-    "hash": "sha256-HWfTuuYq3P02F3zaK8s8HLkqRcdP7/dWwCy/nX/y4u8=",
+    "version": "8.2.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/managednetworkfabric-8.2.1-py3-none-any.whl",
+    "hash": "sha256-lVW++ZSooBiMtWpiFpxpaBygDBckM7OZPYZNZko7/Cs=",
     "description": "Support for managednetworkfabric commands based on 2024-06-15-preview API version"
   },
   "managementpartner": {
@@ -736,9 +729,9 @@
   },
   "neon": {
     "pname": "neon",
-    "version": "1.0.0b6",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.0b6-py3-none-any.whl",
-    "hash": "sha256-qCyfYQIDoZo8l1bPYDJsLTFfBQJEi7/FyNL6jmS1tTc=",
+    "version": "1.0.1b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/neon-1.0.1b1-py3-none-any.whl",
+    "hash": "sha256-JG8Y+6/aF8xtsnBledcvxfJ4K+yhS47CS6pIvK7orm8=",
     "description": "Microsoft Azure Command-Line Tools Neon Extension"
   },
   "network-analytics": {
@@ -750,10 +743,10 @@
   },
   "networkcloud": {
     "pname": "networkcloud",
-    "version": "3.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-3.0.0-py3-none-any.whl",
-    "hash": "sha256-ZNWvZ6Ptc8QM0HWzCtR6RZnw9PaobrVKjjfcCI9didc=",
-    "description": "Support for Azure Operator Nexus network cloud commands based on 2025-02-01 API version"
+    "version": "4.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-4.0.0-py3-none-any.whl",
+    "hash": "sha256-ynLpfG9y08tW1RPaNmhQbaoZS7ORBWqhLeJ2LD+yk6Y=",
+    "description": "Support for Azure Operator Nexus network cloud commands based on 2025-09-01 API version"
   },
   "new-relic": {
     "pname": "new-relic",
@@ -785,9 +778,9 @@
   },
   "nsp": {
     "pname": "nsp",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.0.0-py3-none-any.whl",
-    "hash": "sha256-nlRya9v8U6q/sjGV5XNgsSLDBeVPPSF/to4KIvvckvE=",
+    "version": "1.1.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/nsp-1.1.0-py3-none-any.whl",
+    "hash": "sha256-eQj6LXghyS+Qt6V06NNSf0QBDorSJsJW1B+iPBsB37U=",
     "description": "Microsoft Azure Command-Line Tools Nsp Extension"
   },
   "offazure": {
@@ -825,13 +818,6 @@
     "hash": "sha256-/k47qFwfZZZqBZKR5G6+t8lW8o2isVtUGwSSdltiOZI=",
     "description": "Microsoft Azure Command-Line Tools PeeringManagementClient Extension"
   },
-  "playwright-cli-extension": {
-    "pname": "playwright-cli-extension",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/playwright_cli_extension-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-bxsHF5TdEdT97up3pngs5HrNKOUJgHQpTrpxgWu42i0=",
-    "description": "Microsoft Azure Command-Line Tools PlaywrightCliExtension Extension"
-  },
   "portal": {
     "pname": "portal",
     "version": "1.0.0b2",
@@ -890,9 +876,9 @@
   },
   "redisenterprise": {
     "pname": "redisenterprise",
-    "version": "1.2.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.1-py3-none-any.whl",
-    "hash": "sha256-Yu06kpzoZJLt8l5Ft9R6Au9VS6rFr9v9bmrqlp0IDGg=",
+    "version": "1.2.3",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/redisenterprise-1.2.3-py3-none-any.whl",
+    "hash": "sha256-HTioMOjcy0gBdlrP5Ffd9Pf0SByAiRzkBM9zdPBM/Pw=",
     "description": "Microsoft Azure Command-Line Tools RedisEnterprise Extension"
   },
   "reservation": {
@@ -932,9 +918,9 @@
   },
   "scvmm": {
     "pname": "scvmm",
-    "version": "1.2.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.2.0-py2.py3-none-any.whl",
-    "hash": "sha256-Cq6dSNRIM/vWgwDCaxTRhosVR9dCD5URYQUI+eBpN0Y=",
+    "version": "1.2.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/scvmm-1.2.1-py2.py3-none-any.whl",
+    "hash": "sha256-D1T8ZJCOC/GRph4117z8FsQKFgrA1o/l6S6JveP3Los=",
     "description": "Microsoft Azure Command-Line Tools SCVMM Extension"
   },
   "self-help": {
@@ -951,6 +937,20 @@
     "hash": "sha256-VRFUS040KwOkpCY2F8YD2HRCrVF5zp2MDR/RCRX5O3o=",
     "description": "Microsoft Azure Command-Line Tools Sentinel Extension"
   },
+  "sftp": {
+    "pname": "sftp",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/sftp-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-cE8b2ZgoG9DO64ekT3FpcRuTAOYX94pzESYJ9lUe7LI=",
+    "description": "Secure access to Azure Storage blob data via SFTP with SSH certificates"
+  },
+  "site": {
+    "pname": "site",
+    "version": "1.0.0b1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b1-py3-none-any.whl",
+    "hash": "sha256-OZ2569Gt1U+UzNHe4jsO3nTMUjipqGaCKoKbN0PDXpA=",
+    "description": "Microsoft Azure Command-Line Tools Site Extension"
+  },
   "site-recovery": {
     "pname": "site-recovery",
     "version": "1.0.0",
@@ -1002,16 +1002,16 @@
   },
   "storage-discovery": {
     "pname": "storage-discovery",
-    "version": "1.0.0b1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_discovery-1.0.0b1-py3-none-any.whl",
-    "hash": "sha256-qa4B0qEbeg09vZRN1E4J2E5LvwbrPd2OG1V/WOhfI1o=",
+    "version": "1.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_discovery-1.0.0-py3-none-any.whl",
+    "hash": "sha256-kr/NvTWq4HyZa1hlPI8Gv0HFhkVS2iZIqtpsN/t/Yug=",
     "description": "Microsoft Azure Command-Line Tools StorageDiscovery Extension"
   },
   "storage-mover": {
     "pname": "storage-mover",
-    "version": "1.1.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.1.0-py3-none-any.whl",
-    "hash": "sha256-fXaKylCqmJeKDZKcRs/+YL9IilJ2ZUhdpjGzNETK4kw=",
+    "version": "1.2.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.2.0-py3-none-any.whl",
+    "hash": "sha256-jIZ2WTXHeK2+DeBOfU8tKN5abXARPzDu45YP5nSNzXA=",
     "description": "Microsoft Azure Command-Line Tools StorageMover Extension"
   },
   "storagesync": {
@@ -1023,9 +1023,9 @@
   },
   "stream-analytics": {
     "pname": "stream-analytics",
-    "version": "1.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.0-py3-none-any.whl",
-    "hash": "sha256-FUQ/2Kc9MZpcn7xYbJcn0c4aMeEf0/PH5Py8l60Haqo=",
+    "version": "1.0.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.1-py3-none-any.whl",
+    "hash": "sha256-LQbplYfwJBMr03IehPFE0qHdwc3v5Nw/Zfs+z8jgKZ0=",
     "description": "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension"
   },
   "subscription": {
@@ -1072,9 +1072,9 @@
   },
   "virtual-network-manager": {
     "pname": "virtual-network-manager",
-    "version": "2.0.1",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-2.0.1-py3-none-any.whl",
-    "hash": "sha256-p/qdOH8arVdfUoslBT0Al26hMihL8VPMClfNZhwtxto=",
+    "version": "3.0.1",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/virtual_network_manager-3.0.1-py3-none-any.whl",
+    "hash": "sha256-vY9LN/k44HIVB3bkSC+We5/26yzhOVeBYkEeG6wQOT8=",
     "description": "Microsoft Azure Command-Line Tools NetworkManagementClient Extension"
   },
   "virtual-network-tap": {
@@ -1114,9 +1114,9 @@
   },
   "workload-orchestration": {
     "pname": "workload-orchestration",
-    "version": "2.0.0",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-2.0.0-py3-none-any.whl",
-    "hash": "sha256-19yRNNBkY4h+KR4RMeu8rGox1kFKDYOdaNM/dEwSrSU=",
+    "version": "4.0.0",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/workload_orchestration-4.0.0-py3-none-any.whl",
+    "hash": "sha256-FiAi5pfW67mYqtQJcUlMLwArKQroXD0GoSX82WZH0RQ=",
     "description": "Microsoft Azure Command-Line Tools WorkloadOperations Extension"
   },
   "workloads": {
@@ -1128,9 +1128,9 @@
   },
   "zones": {
     "pname": "zones",
-    "version": "1.0.0b4",
-    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b4-py3-none-any.whl",
-    "hash": "sha256-isb/41prZrUTuM4GYR4tL6KyBlmArIyNM9y4eMk28OQ=",
+    "version": "1.0.0b5",
+    "url": "https://azcliprod.blob.core.windows.net/cli-extensions/zones-1.0.0b5-py3-none-any.whl",
+    "hash": "sha256-T3X8c6AG7Lh6qPWp3YvEV36KoKghaATB304GSYWbpDQ=",
     "description": "Microsoft Azure Command-Line Tools Zones Extension"
   }
 }
diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix
index af60b55b8caa..9c1ab1ed328a 100644
--- a/pkgs/by-name/az/azure-cli/extensions-manual.nix
+++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix
@@ -83,9 +83,9 @@
 
   containerapp = mkAzExtension rec {
     pname = "containerapp";
-    version = "1.2.0b3";
+    version = "1.2.0b4";
     url = "https://azcliprod.blob.core.windows.net/cli-extensions/containerapp-${version}-py2.py3-none-any.whl";
-    hash = "sha256-UK7fbWI7NoW8sBo3OEafXX3DolFNQXhFDMHUoE1h/qA=";
+    hash = "sha256-v2Mu46qVpDKjGARgGkKzQm5QcK4Msj4XgdgWZwI8fS0=";
     description = "Microsoft Azure Command-Line Tools Containerapp Extension";
     propagatedBuildInputs = with python3Packages; [
       docker
@@ -95,6 +95,19 @@
     meta.maintainers = with lib.maintainers; [ giggio ];
   };
 
+  k8s-extension = mkAzExtension rec {
+    pname = "k8s-extension";
+    version = "1.7.0";
+    url = "https://azcliprod.blob.core.windows.net/cli-extensions/k8s_extension-${version}-py3-none-any.whl";
+    hash = "sha256-gyQxHfsXd+V6w2jMBNiYpE1MrqFeHei9RlsVhXgOjW8=";
+    description = "Microsoft Azure Command-Line Tools K8s-extension Extension";
+    propagatedBuildInputs = with python3Packages; [
+      kubernetes
+      oras
+    ];
+    meta.maintainers = [ ];
+  };
+
   rdbms-connect = mkAzExtension rec {
     pname = "rdbms-connect";
     version = "1.0.7";
@@ -161,6 +174,7 @@
   hdinsightonaks = throw "The 'hdinsightonaks' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8956
   logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459
   pinecone = throw "The 'pinecone' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8763
+  playwright-cli-extension = throw "The 'playwright-cli-extension' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/9156
   sap-hana = throw "The 'sap-hana' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8904
   spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652
   spring-cloud = throw "The 'spring-cloud' extension for azure-cli was deprecated upstream"; # Added 2025-07-01 https://github.com/Azure/azure-cli-extensions/pull/8897
diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix
index 8bd266429572..5d35697911ef 100644
--- a/pkgs/by-name/az/azure-cli/package.nix
+++ b/pkgs/by-name/az/azure-cli/package.nix
@@ -26,14 +26,14 @@
 }:
 
 let
-  version = "2.77.0";
+  version = "2.78.0";
 
   src = fetchFromGitHub {
     name = "azure-cli-${version}-src";
     owner = "Azure";
     repo = "azure-cli";
     tag = "azure-cli-${version}";
-    hash = "sha256-+AvfZIeGxQ+27gpg1y3fMMN7fBP4ATXr7By+dJpux3k=";
+    hash = "sha256-kSZ9nFKEXDQtExSuGxyym5xHKVDnOB4QmDG3AZjGGEI=";
   };
 
   # put packages that needs to be overridden in the py package scope
diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix
index 819a186f2d20..f93c6f4bcaf9 100644
--- a/pkgs/by-name/az/azure-cli/python-packages.nix
+++ b/pkgs/by-name/az/azure-cli/python-packages.nix
@@ -234,11 +234,11 @@ let
 
       # ImportError: cannot import name 'AdvancedThreatProtectionName' from 'azure.mgmt.sql.models'
       azure-mgmt-sql = super.azure-mgmt-sql.overridePythonAttrs (attrs: rec {
-        version = "4.0.0b20";
+        version = "4.0.0b22";
         src = fetchPypi {
           pname = "azure_mgmt_sql"; # Different from src.pname in the original package.
           inherit version;
-          hash = "sha256-mphqHUet4AhmL8aUoRbrGOjbookCHR3Ex+unpOq7aQM=";
+          hash = "sha256-ku3YN9W9Cyx4zsKxAs4k9/oeDXApzi2uqAURqa72H0k=";
         };
       });
 
@@ -251,14 +251,6 @@ let
       azure-mgmt-synapse =
         overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip"
           "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k=";
-
-      # Observed error during runtime:
-      # AttributeError: Can't get attribute 'NormalizedResponse' on <module 'msal.throttled_http_client' from
-      # '/nix/store/xxx-python3.12-msal-1.32.0/lib/python3.12/site-packages/msal/throttled_http_client.py'>.
-      # Did you mean: '_msal_public_app_kwargs'?
-      msal =
-        overrideAzureMgmtPackage super.msal "1.32.3" "tar.gz"
-          "sha256-XuoDhonHilpwyo7L4SRUWLVahXvQlu+2mJxpuhWYXTU=";
     };
   };
 in
diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
index 2e46e4172aee..2efd6aa75085 100644
--- a/pkgs/by-name/az/azure-storage-azcopy/package.nix
+++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.30.1";
+  version = "10.31.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     tag = "v${version}";
-    hash = "sha256-lHgOQ9Ff3RSi49peDETx98QMnLrANfBvkAx8c+ubiG0=";
+    hash = "sha256-5ZnQhaQScTK+jeoshwhheVF6//Jiosu7vMfi8s7bQJw=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-WTsngwFA4J1CuAePKwPew/FZNrHJ9IoDCQFv63WAlzo=";
+  vendorHash = "sha256-KhlFWo0MuukOtn95T/2ppw21fiGHrcV7CA7RYqK7frs=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index 024b29001b65..65598aeaebdc 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.7.1";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-fCs9C86IO1aTzBFZiA7SaVlk0Zdm/ItWtLhE8Ii2W0A=";
+    hash = "sha256-xJcztNSYVTDyoRahROxBwIqq28GLhwqmIxHwDPX7Xho=";
   };
 
-  vendorHash = "sha256-ScFHEIarDvxd9R6eUONdECmtK+5aZRdo71khljLz8c4=";
+  vendorHash = "sha256-+iNFWKFNON4HX2mf4O29zAdElEkIGIx55Wi9MRtg1dg=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix
index 968dd12d36e8..8a1bc83b608a 100644
--- a/pkgs/by-name/ba/backdown/package.nix
+++ b/pkgs/by-name/ba/backdown/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/backdown";
     changelog = "https://github.com/Canop/backdown/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "backdown";
   };
 }
diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix
index 37dbc1ff7f45..6b59dea21ab1 100644
--- a/pkgs/by-name/ba/backgroundremover/package.nix
+++ b/pkgs/by-name/ba/backgroundremover/package.nix
@@ -5,13 +5,14 @@
   fetchFromGitHub,
   fetchurl,
   gitUpdater,
+  imagemagick,
 }:
 
 let
   p = python3.pkgs;
   self = p.buildPythonApplication rec {
     pname = "backgroundremover";
-    version = "0.3.0";
+    version = "0.3.4";
     pyproject = true;
 
     build-system = [
@@ -21,8 +22,8 @@ let
     src = fetchFromGitHub {
       owner = "nadermx";
       repo = "backgroundremover";
-      rev = "v${version}";
-      hash = "sha256-fWazMDjc+EoXvO7Iq+zwtJaMEU64ajpO6JtlvU5T0nc=";
+      tag = "v${version}";
+      hash = "sha256-7C31wlokX3M4csZ4ZbOqxowQvh8DMQJJcENKgQWNTa8=";
     };
 
     models = runCommand "background-remover-models" { } ''
@@ -36,9 +37,6 @@ let
       rm -rf *dist
       substituteInPlace backgroundremover/bg.py backgroundremover/u2net/detect.py \
         --replace-fail 'os.path.expanduser(os.path.join("~", ".u2net", model_name + ".pth"))' "os.path.join(\"$models\", model_name + \".pth\")"
-
-      substituteInPlace backgroundremover/bg.py \
-        --replace-fail 'import moviepy.editor' 'import moviepy'
     '';
 
     pythonRelaxDeps = [
@@ -87,11 +85,15 @@ let
           in
           runCommand "backgroundremover-image-test.png"
             {
-              buildInputs = [ self ];
+              buildInputs = [
+                self
+                imagemagick
+              ];
             }
             ''
+              convert ${demoImage} input.png
               export NUMBA_CACHE_DIR=$(mktemp -d)
-              backgroundremover -i ${demoImage} -o $out
+              backgroundremover -i input.png -o $out
             '';
       };
       updateScript = gitUpdater { rev-prefix = "v"; };
diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 56315431180a..2a4f0b1a5f8b 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -14,13 +14,13 @@
 }:
 let
   pname = "backrest";
-  version = "1.9.2";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "garethgeorge";
     repo = "backrest";
     tag = "v${version}";
-    hash = "sha256-3lAWViC9K34R8la/z57kjGJmMmletGd8pJ1dDt+BeKQ=";
+    hash = "sha256-8WWs7XEVKAc/XmeL+dsw25azfLjUbHKp2MsB6Be14VE=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -64,7 +64,7 @@ buildGoModule {
       internal/resticinstaller/resticinstaller.go
   '';
 
-  vendorHash = "sha256-oycV8JAJQF/PNc7mmYGzkZbpG8pMwxThmuys9e0+hcc=";
+  vendorHash = "sha256-cYqK/sddLI38K9bzCpnomcZOYbSRDBOEru4Y26rBLFw=";
 
   nativeBuildInputs = [
     gzip
@@ -93,6 +93,7 @@ buildGoModule {
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         "TestBackup" # relies on ionice
         "TestCancelBackup"
+        "TestFirstRun" # e2e test requires networking
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix
index 74007248fd63..9397eab8c4dd 100644
--- a/pkgs/by-name/ba/bacula/package.nix
+++ b/pkgs/by-name/ba/bacula/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ]
   ++
     lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
-      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+      "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # bacula’s `configure` script fails to detect CoreFoundation correctly,
     # but these symbols are available in the nixpkgs CoreFoundation framework.
diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix
index 9e48ffbf4064..8192fb1dda7f 100644
--- a/pkgs/by-name/ba/badkeys/package.nix
+++ b/pkgs/by-name/ba/badkeys/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "badkeys";
-  version = "0.0.14";
+  version = "0.0.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "badkeys";
     repo = "badkeys";
     tag = "v${version}";
-    hash = "sha256-+vG0/RO36JPJQ6PB7y6PBAqs4KkMRR21GdTdx/UHHKE=";
+    hash = "sha256-unBPdNrXwWh1EkbTZKAy4E0aASpeyT+mz3liASTzj4o=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix
index 9f3372510b09..887eb08e4be6 100644
--- a/pkgs/by-name/ba/badvpn/package.nix
+++ b/pkgs/by-name/ba/badvpn/package.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=-O3 ${
       lib.optionalString (!debug) "-DNDEBUG"
     }");
+    sed -e \
+      's/cmake_minimum_required(VERSION 2[.]8)/cmake_minimum_required(VERSION 3.5)/' \
+      -i CMakeLists.txt
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix
index 6738a39984ba..57a3993d5dee 100644
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "baidupcs-go";
-  version = "3.9.9";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "qjfoidnh";
     repo = "BaiduPCS-Go";
     rev = "v${version}";
-    hash = "sha256-x0oEuj8LoR0yUkKOzI27u3AIFVDDV7vMHCqvjENHwv8=";
+    hash = "sha256-synfJtYZmIiK2SoTG0rt+qZ0ixXIXDXnrNL2s5eDtQY=";
   };
 
-  vendorHash = "sha256-hW+IrzS5+DublQUIIcecL08xoauTjba9qnAtpzNeDXw=";
+  vendorHash = "sha256-oOZeBCHpAasi9K77xA+8HxZErGWKwb4OaWzWhHagtQE=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/ba/baikal/package.nix b/pkgs/by-name/ba/baikal/package.nix
index 32213d3922ff..08103ccf5225 100644
--- a/pkgs/by-name/ba/baikal/package.nix
+++ b/pkgs/by-name/ba/baikal/package.nix
@@ -21,5 +21,7 @@ php.buildComposerProject2 (finalAttrs: {
     homepage = "https://sabre.io/baikal/";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ wrvsrx ];
+    # vendorHash non-reproducible
+    broken = true;
   };
 })
diff --git a/pkgs/by-name/ba/bakelite/package.nix b/pkgs/by-name/ba/bakelite/package.nix
index 252f4b36a2da..2505599b78e1 100644
--- a/pkgs/by-name/ba/bakelite/package.nix
+++ b/pkgs/by-name/ba/bakelite/package.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
     hash = "sha256-rRJrtCcgfbqC/4qQiTVeUUcPqoJlNfitYRqIO58AmpA=";
   };
 
-  hardeningEnable = [ "pie" ];
   preBuild = ''
     # pipe2() is only exposed with _GNU_SOURCE
     # Upstream makefile explicitly uses -O3 to improve SHA-3 performance
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index 70829af2c23e..66c633728fad 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -9,7 +9,6 @@
   python3,
   udev,
   cctools,
-  apple-sdk_12,
 }:
 
 let
@@ -22,20 +21,17 @@ let
 in
 buildNpmPackage' rec {
   pname = "balena-cli";
-  version = "22.4.10";
+  version = "22.4.13";
 
   src = fetchFromGitHub {
     owner = "balena-io";
     repo = "balena-cli";
     rev = "v${version}";
-    hash = "sha256-KvFyqVrb5C89B4BeZCqdDZtneX7kWyaLF0oI8SqrsGw=";
+    hash = "sha256-nke7EQscVPu1A/d4DKi7pSb6/MQgeFtG+zhMZT+bhWk=";
   };
 
-  npmDepsHash = "sha256-ty+D/p4cDlWkruUD0J4IzaEWIFp/fe4KBGqorV+qmrw=";
+  npmDepsHash = "sha256-GQXbXkOt8nkOB2OeEcKsp1yJd5lXS+KKout/5ffLgD0=";
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
   makeCacheWritable = true;
 
   nativeBuildInputs = [
@@ -47,13 +43,9 @@ buildNpmPackage' rec {
     cctools
   ];
 
-  buildInputs =
-    lib.optionals stdenv.hostPlatform.isLinux [
-      udev
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      apple-sdk_12
-    ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    udev
+  ];
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/balena";
diff --git a/pkgs/by-name/ba/balsa/package.nix b/pkgs/by-name/ba/balsa/package.nix
index b1fbefb4e7cf..eff97be1b660 100644
--- a/pkgs/by-name/ba/balsa/package.nix
+++ b/pkgs/by-name/ba/balsa/package.nix
@@ -19,7 +19,7 @@
   ninja,
   pkg-config,
   sqlite,
-  webkitgtk_4_0,
+  webkitgtk_4_1,
   wrapGAppsHook3,
 }:
 
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
     openssl
     sqlite
-    webkitgtk_4_0
+    webkitgtk_4_1
   ];
 
   mesonFlags = [
diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 441b62d5a67f..b3a178601789 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -56,13 +56,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bambu-studio";
-  version = "02.02.02.56";
+  version = "02.03.01.51";
 
   src = fetchFromGitHub {
     owner = "bambulab";
     repo = "BambuStudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vg+sEIztFBfzROl2surRd4l/afZ+tGMtG65m3kDIPAY=";
+    hash = "sha256-SnWOTFymTVHzYqraMzohOrpM0UuLW+PRfZBqkFASEWs=";
   };
 
   nativeBuildInputs = [
@@ -117,6 +117,10 @@ stdenv.mkDerivation (finalAttrs: {
     ./patches/dont-link-opencv-world-bambu.patch
     # Don't link osmesa
     ./patches/no-osmesa.patch
+    # Don't link cereal
+    ./patches/no-cereal.patch
+    # Cmake 4 support
+    ./patches/cmake.patch
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/ba/bambu-studio/patches/cmake.patch b/pkgs/by-name/ba/bambu-studio/patches/cmake.patch
new file mode 100644
index 000000000000..7ed1752bad92
--- /dev/null
+++ b/pkgs/by-name/ba/bambu-studio/patches/cmake.patch
@@ -0,0 +1,200 @@
+diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
+index 76ddb0d2f..4d30f6865 100644
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -123,7 +123,7 @@ if (OPENVDB_FIND_MODULE_PATH)
+ endif ()
+ # ###########################################################################
+ 
+-cmake_minimum_required(VERSION 3.3)
++cmake_minimum_required(VERSION 3.3...3.10)
+ # Monitoring <PackageName>_ROOT variables
+ if(POLICY CMP0074)
+   cmake_policy(SET CMP0074 NEW)
+diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
+index 54b9a2497..3b4a32829 100644
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ #
+ 
+ project(BambuStudio-deps)
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.2...3.10)
+ 
+ include(ExternalProject)
+ include(ProcessorCount)
+diff --git a/deps/EXPAT/expat/CMakeLists.txt b/deps/EXPAT/expat/CMakeLists.txt
+index 585a678b8..77d3c13d8 100644
+--- a/deps/EXPAT/expat/CMakeLists.txt
++++ b/deps/EXPAT/expat/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ 
+ project(EXPAT)
+ 
+diff --git a/deps/GLEW/glew/CMakeLists.txt b/deps/GLEW/glew/CMakeLists.txt
+index 513ee4ebb..e262f65e8 100644
+--- a/deps/GLEW/glew/CMakeLists.txt
++++ b/deps/GLEW/glew/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ project(GLEW)
+ 
+ find_package(OpenGL REQUIRED)
+diff --git a/sandboxes/opencsg/CMakeLists.txt b/sandboxes/opencsg/CMakeLists.txt
+index ace8f4d53..304ff4e01 100644
+--- a/sandboxes/opencsg/CMakeLists.txt
++++ b/sandboxes/opencsg/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ 
+ project(OpenCSG-example)
+ 
+diff --git a/src/Shiny/CMakeLists.txt b/src/Shiny/CMakeLists.txt
+index abdb96a72..7e6f16500 100644
+--- a/src/Shiny/CMakeLists.txt
++++ b/src/Shiny/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(Shiny)
+ 
+ add_library(Shiny STATIC
+diff --git a/src/admesh/CMakeLists.txt b/src/admesh/CMakeLists.txt
+index 217976318..6450abc87 100644
+--- a/src/admesh/CMakeLists.txt
++++ b/src/admesh/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(admesh)
+ 
+ add_library(admesh STATIC
+diff --git a/src/boost/CMakeLists.txt b/src/boost/CMakeLists.txt
+index e8c9e11ce..3c62ccf7e 100644
+--- a/src/boost/CMakeLists.txt
++++ b/src/boost/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(nowide)
+ 
+ add_library(nowide STATIC
+diff --git a/src/clipper/CMakeLists.txt b/src/clipper/CMakeLists.txt
+index f62508820..44aa59f23 100644
+--- a/src/clipper/CMakeLists.txt
++++ b/src/clipper/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(clipper)
+ 
+ add_library(clipper STATIC
+diff --git a/src/earcut/CMakeLists.txt b/src/earcut/CMakeLists.txt
+index 08c7bb1be..cb10fea7b 100644
+--- a/src/earcut/CMakeLists.txt
++++ b/src/earcut/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.2...3.10)
+ project(earcut_hpp LANGUAGES CXX C)
+ 
+ option(EARCUT_BUILD_TESTS "Build the earcut test program" ON)
+diff --git a/src/glu-libtess/CMakeLists.txt b/src/glu-libtess/CMakeLists.txt
+index 8fca992a3..662b5593e 100644
+--- a/src/glu-libtess/CMakeLists.txt
++++ b/src/glu-libtess/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(glu-libtess)
+ 
+ add_library(glu-libtess STATIC 
+diff --git a/src/imgui/CMakeLists.txt b/src/imgui/CMakeLists.txt
+index 592e78c8e..718a05439 100644
+--- a/src/imgui/CMakeLists.txt
++++ b/src/imgui/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(imgui)
+ 
+ add_library(imgui STATIC
+diff --git a/src/imguizmo/CMakeLists.txt b/src/imguizmo/CMakeLists.txt
+index fec443180..461d4f684 100644
+--- a/src/imguizmo/CMakeLists.txt
++++ b/src/imguizmo/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(imguizmo)
+ 
+ add_library(imguizmo STATIC
+diff --git a/src/libigl/CMakeLists.txt b/src/libigl/CMakeLists.txt
+index f023826a5..449a3cbef 100644
+--- a/src/libigl/CMakeLists.txt
++++ b/src/libigl/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ project(libigl)
+ 
+ add_library(libigl INTERFACE)
+diff --git a/src/minilzo/CMakeLists.txt b/src/minilzo/CMakeLists.txt
+index c5122ccf0..97e749e04 100644
+--- a/src/minilzo/CMakeLists.txt
++++ b/src/minilzo/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(minilzo)
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ 
+ add_library(minilzo INTERFACE)
+ 
+diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt
+index 04d562b76..e3d6fbc6f 100644
+--- a/src/miniz/CMakeLists.txt
++++ b/src/miniz/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(miniz)
+ 
+ add_library(miniz INTERFACE)
+diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
+index ab9aba9af..350539681 100644
+--- a/src/qhull/CMakeLists.txt
++++ b/src/qhull/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif()
+ else(Qhull_FOUND)
+ 
+ project(qhull)
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ 
+ # Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def, qhull_p-exports.def, qhull_r-exports.def, qhull-warn.pri
+ set(qhull_VERSION2 "2015.2 2016/01/18")  # not used, See global.c, global_r.c, rbox.c, rbox_r.c
+diff --git a/src/semver/CMakeLists.txt b/src/semver/CMakeLists.txt
+index 4b61a7456..76a231074 100644
+--- a/src/semver/CMakeLists.txt
++++ b/src/semver/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(semver)
+ 
+ add_library(semver STATIC
+diff --git a/tests/cpp17/CMakeLists.txt b/tests/cpp17/CMakeLists.txt
+index 4e151ecbf..2ac0a9e3d 100644
+--- a/tests/cpp17/CMakeLists.txt
++++ b/tests/cpp17/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.1...3.10)
+ 
+ project(Cpp17Test)
+ 
diff --git a/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch b/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch
new file mode 100644
index 000000000000..b1c591a58d0e
--- /dev/null
+++ b/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch
@@ -0,0 +1,40 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0b4b9a8..8c22f60 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE)
+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
+ endif ()
+
+-target_link_libraries(BambuStudio libslic3r cereal)
++target_link_libraries(BambuStudio libslic3r)
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 4481362..7d41af3 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -574,7 +574,6 @@ set(OCCT_LIBS
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 0a852a4..2da0533 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -671,8 +671,8 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES})
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto)
+-#target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
++target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto)
++#target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
+
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)
diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix
index 1d439116a757..f88ee2795720 100644
--- a/pkgs/by-name/ba/bandwhich/package.nix
+++ b/pkgs/by-name/ba/bandwhich/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
     ];
     platforms = lib.platforms.unix;
     mainProgram = "bandwhich";
diff --git a/pkgs/by-name/ba/baobab/package.nix b/pkgs/by-name/ba/baobab/package.nix
index d6355480fcb5..8aec38204f3c 100644
--- a/pkgs/by-name/ba/baobab/package.nix
+++ b/pkgs/by-name/ba/baobab/package.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "baobab";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/baobab/${lib.versions.major version}/baobab-${version}.tar.xz";
-    hash = "sha256-VFklBNSdgH8jWRvn5+7xDGyd/LesUnuBw6zVh4eyb9o=";
+    hash = "sha256-GVwBgtxNf2lN0LTuNucuD0q3V4JfwjgjNAnuwt9IP64=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix
index 77a50d2a1670..6f1b79be95e8 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -31,14 +31,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "4.2.0";
   pname = "baresip";
 
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${version}";
-    hash = "sha256-KbjdwvXUiNvHb6AXt38M9gkhliiie+8frvuqYJEsnJE=";
+    hash = "sha256-kC1pqquIddjqIvGSIE9Rzlvr6qzTXF+mFsZlIzFBExI=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix
index 839749ebdb86..f8410b421a34 100644
--- a/pkgs/by-name/ba/bartib/package.nix
+++ b/pkgs/by-name/ba/bartib/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple timetracker for the command line";
     homepage = "https://github.com/nikolassv/bartib";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "bartib";
   };
 }
diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix
index ca6badfda00d..e066d25885d7 100644
--- a/pkgs/by-name/ba/base16384/package.nix
+++ b/pkgs/by-name/ba/base16384/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "fumiama";
     repo = "base16384";
     rev = "v${version}";
-    hash = "sha256-Xkub0sWT+1oJlznDnnV1mDgQNiMQj8gsWemrCOAYYgE=";
+    hash = "sha256-qaDnv+KpXMYdx6eqH7pU0pEjSpU5xg9I7afxpoO3iGs=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index e889350a11c6..92bcd13f2e96 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -18,16 +18,16 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.31.6";
+  version = "1.32.1";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-SqG51pxkJQ/YrknSOMy6KWn1pvdgJa5CLnFl5naAPMA=";
+    hash = "sha256-bxqUH5MYwp8MLD8ve8afgN3qe3hCPRu0l7QO7m1ZSzA=";
   };
 
-  npmDepsHash = "sha256-dwtMl5dFpol+J+cM6EHiwO+F93Iyurwx9Kr317IGtVw=";
+  npmDepsHash = "sha256-zNmZ4wXxe31NnQ+VlTLoPM2zTDmKdw1D28pi/roybdQ=";
   npmWorkspace = "packages/pyright";
 
   preBuild = ''
diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix
index fdec25367b2d..1d7ef107008a 100644
--- a/pkgs/by-name/ba/bash-completion/package.nix
+++ b/pkgs/by-name/ba/bash-completion/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "bash-completion";
-  version = "2.16.0";
+  version = "2.17.0";
 
   # Using fetchurl because fetchGithub or fetchzip will have trouble on
   # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   # See discussion in https://github.com/NixOS/nixpkgs/issues/107768
   src = fetchurl {
     url = "https://github.com/scop/bash-completion/releases/download/${version}/bash-completion-${version}.tar.xz";
-    hash = "sha256-M2m9XkGKdfuZCGOSWu1bQgOYrOuzIOxMAwaz6uI/EHo=";
+    hash = "sha256-3Z2CXklkNfs766Oue+qfd+gh6JRmfQdDHR1MjFcLnlg=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ba/bash-git-prompt/package.nix b/pkgs/by-name/ba/bash-git-prompt/package.nix
index 9bcee20b24b3..2f943a887c38 100644
--- a/pkgs/by-name/ba/bash-git-prompt/package.nix
+++ b/pkgs/by-name/ba/bash-git-prompt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     owner = "magicmonty";
     repo = "bash-git-prompt";
     rev = "e733ada3e93fd9fdb6e9d1890e38e6e523522da7";
-    hash = "sha256-FWeYzISY4+cS2xg6skfcpTXgbkBs41E/EzEb3JNdFoQ=";
+    hash = "sha256-6uUoYSjpGJGOgnLiIR0SdmLZKPG4GNB+e2Y9HpJUODQ=";
   };
 
   buildInputs = [ python3 ];
diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
index 400d318dbfdb..d68235a1105e 100644
--- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
+++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bash-pinyin-completion-rs";
-  version = "0.3.2";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "AOSC-Dev";
     repo = "bash-pinyin-completion-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r+B11TgMOhwslqygv72S9uhF7v79MAzUu5XHlD/P3HY=";
+    hash = "sha256-XmxJYzDnA/7v/U3fFzNd2BQu43q6zYGSk/tJ0I6aKBo=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ba/bat/package.nix b/pkgs/by-name/ba/bat/package.nix
index e1f8bd59e419..9128100012ce 100644
--- a/pkgs/by-name/ba/bat/package.nix
+++ b/pkgs/by-name/ba/bat/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bat";
-  version = "0.25.0";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "sharkdp";
     repo = "bat";
     rev = "v${version}";
-    hash = "sha256-82IhLhw0TdaMh21phBxcUZ5JI5xOXb0DrwnBmPwyfAQ=";
+    hash = "sha256-JWpdAO+OCqoWa6KVR8sxvHHy1SdR4BmRO0oU0ZAOWl0=";
   };
 
-  cargoHash = "sha256-EnEc+B62dK3q6in8yn5wdeVmBw8XMkP8YKpCN7lCPnc=";
+  cargoHash = "sha256-wb86yWWnRHs1vG8+oyhs6bUD4x7AdWvIvPPNBcLs4Hs=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ba/bato/package.nix b/pkgs/by-name/ba/bato/package.nix
index f1d635ddd900..46de5d468ba6 100644
--- a/pkgs/by-name/ba/bato/package.nix
+++ b/pkgs/by-name/ba/bato/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bato";
-  version = "0.1.7";
+  version = "0.2.1";
 
   src = fetchFromGitHub {
     owner = "doums";
     repo = "bato";
     rev = "v${version}";
-    hash = "sha256-i2gw8vXiKutq26ACzkVXH3kED7jAngSv2mNo9P3qXnA=";
+    hash = "sha256-pq+i4NGl7yv+vmMoYVT9JRvOsuV7nBqXpsebgMcNEY0=";
   };
 
-  cargoHash = "sha256-bGbLQaYfNLem47iMPsNeKm4pP3+Pij9SJ3Nq5VWX3hE=";
+  cargoHash = "sha256-ZVzIoq+s2Xw996NoQMIGHUqo2uXJMu9lXfY5Us9NMPg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ba/batticonplus/package.nix b/pkgs/by-name/ba/batticonplus/package.nix
new file mode 100644
index 000000000000..d83eacc1dacb
--- /dev/null
+++ b/pkgs/by-name/ba/batticonplus/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  gettext,
+  glib,
+  gtk3,
+  libnotify,
+  wrapGAppsHook3,
+  libayatana-appindicator,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "batticonplus";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "artist4xlibre";
+    repo = "batticonplus";
+    tag = "v${version}";
+    hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    libnotify
+    libayatana-appindicator
+  ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "WITH_APPINDICATOR=1"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Lightweight battery status icon for the system tray and notifier (based on cbatticon)";
+    mainProgram = "batticonplus";
+    homepage = "https://github.com/artist4xlibre/batticonplus";
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ yechielw ];
+  };
+}
diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix
index 539b563e10aa..7952a07757c8 100644
--- a/pkgs/by-name/ba/bazel_7/package.nix
+++ b/pkgs/by-name/ba/bazel_7/package.nix
@@ -108,23 +108,23 @@ let
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
-          hash = "sha256-CYL1paAtzTbfl7TfsqwJry/dkoTO/yZdHrX0NSA1+Ig=";
+          hash = "sha256-94KFvsS7fInXFTQZPzMq6DxnHQrRktljwACyAz8adSw=";
         }
       else if stdenv.hostPlatform.system == "aarch64-linux" then
         fetchurl {
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
-          hash = "sha256-6DzTEx218/Qq38eMWvXOX/t9VJDyPczz6Edh4eHdOfg=";
+          hash = "sha256-wfuZLSHa77wr0A4ZLF5DqH7qyOljYNXM2a5imoS+nGQ";
         }
       else if stdenv.hostPlatform.system == "x86_64-darwin" then
         fetchurl {
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
-          hash = "sha256-Ut00wXzJezqlvf49RcTjk4Im8j3Qv7R77t1iWpU/HwU=";
+          hash = "sha256-qAb9s6R5+EbqVfWHUT7sk1sOrbDEPv4EhgXH7nC46Zw=";
         }
       else
         fetchurl {
           # stdenv.hostPlatform.system == "aarch64-darwin"
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
-          hash = "sha256-ArEXuX0JIa5NT04R0n4sCTA4HfQW43NDXV0EGcaibyQ=";
+          hash = "sha256-4bRp4OvkRIvhpZ2r/eFJdwrByECHy3rncDEM1tClFYo=";
         };
 
     nativeBuildInputs = defaultShellUtils;
diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix
index 1dc491c51398..d859784b4714 100644
--- a/pkgs/by-name/ba/bazel_8/examples.nix
+++ b/pkgs/by-name/ba/bazel_8/examples.nix
@@ -108,10 +108,10 @@ in
     bazelVendorDepsFOD = {
       outputHash =
         {
-          aarch64-darwin = "sha256-D5bwW35QuLLhVE22FDyV9Nl8N7ULx71wCHbzB81+Xx0=";
-          aarch64-linux = "sha256-F5X/cwtHR6sVFe1DzNDaEnGMIPR0SnXq2iIxhQeqIV8=";
-          x86_64-darwin = "sha256-DXuPy68m3p6hlgEid7tpY8fGgvJWQTXth6h2kMSNFCc=";
-          x86_64-linux = "sha256-oNLDccQ/XPg1Nl/9V14NdgiQsRoTvpaA6hyynMb414A=";
+          aarch64-darwin = "sha256-0QtaPtcBljyhiJGwA8ctSpi+UQp/9q/ZoHUHORizmlY=";
+          aarch64-linux = "sha256-zpiwQ8OB8KhY+kxSXlSOd/zmoH1VGYDGgojf4Or04pQ=";
+          x86_64-darwin = "sha256-+tCDSuYkon1DEARwWTYABJbmysSNAK9vy0tCm8YsGjQ=";
+          x86_64-linux = "sha256-wCWSRc20Yr/hdXn8szbhLAX7Oy3G5keyHTTdO0msnks=";
         }
         .${stdenv.hostPlatform.system};
       outputHashAlgo = "sha256";
diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix
index fedc156f1161..18cbc6cd3190 100644
--- a/pkgs/by-name/ba/bazel_8/package.nix
+++ b/pkgs/by-name/ba/bazel_8/package.nix
@@ -31,7 +31,7 @@
   cctools,
   # Allow to independently override the jdks used to build and run respectively
   jdk_headless,
-  version ? "8.4.1",
+  version ? "8.4.2",
 }:
 
 let
@@ -45,7 +45,7 @@ let
 
   src = fetchzip {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-DqJqW7C1QODOS+vJrs/+ixsP3coZh80VdpPM4g0vxFI=";
+    hash = "sha256-5oNYKHPaDkpunl6oC104Rh1wAEMWfLfvCFdGHlXZn4o=";
     stripRoot = false;
   };
 
@@ -144,9 +144,7 @@ stdenv.mkDerivation rec {
     # Nixpkgs toolcahins do not support that (yet?) and get confused.
     # Also add an explicit /usr/bin prefix that will be patched below.
     (replaceVars ./patches/xcode.patch {
-      usrBinEnv = "${coreutils}/bin/env";
       clangDarwin = "${stdenv.cc}/bin/clang";
-      codesign = "${darwin.sigtool}/bin/codesign";
     })
 
     # Revert preference for apple_support over rules_cc toolchain for now
diff --git a/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch b/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
index 4a72bbd5e6f5..9dcd1ba1ac12 100644
--- a/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
+++ b/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
@@ -8,11 +8,11 @@ index b3dde1c838..a54bf8141d 100644
  
 -# Depend on apple_support first and then rules_cc so that the Xcode toolchain
 -# from apple_support wins over the generic Unix toolchain from rules_cc.
--bazel_dep(name = "apple_support", version = "1.18.1")
+-bazel_dep(name = "apple_support", version = "1.23.1")
 +# Not Depend on apple_support first and then rules_cc so that the Xcode toolchain
 +# from apple_support not wins over the generic Unix toolchain from rules_cc.
  bazel_dep(name = "rules_cc", version = "0.1.1")
-+bazel_dep(name = "apple_support", version = "1.18.1")
++bazel_dep(name = "apple_support", version = "1.23.1")
  
  # repo_name needs to be used, until WORKSPACE mode is to be supported in bazel_tools
  bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
diff --git a/pkgs/by-name/ba/bazel_8/patches/xcode.patch b/pkgs/by-name/ba/bazel_8/patches/xcode.patch
index 52931a34f354..1dd1ad2cb33d 100644
--- a/pkgs/by-name/ba/bazel_8/patches/xcode.patch
+++ b/pkgs/by-name/ba/bazel_8/patches/xcode.patch
@@ -12,20 +12,16 @@ index 1bad14cba7..d312fe08bb 100755
    cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator
  fi
 diff --git a/tools/osx/BUILD b/tools/osx/BUILD
-index 0358fb0ffe..1e6eae1f33 100644
+index 5b99589ad4..3d3269772b 100644
 --- a/tools/osx/BUILD
 +++ b/tools/osx/BUILD
-@@ -27,9 +27,9 @@ exports_files([
+@@ -27,7 +27,7 @@ exports_files([
  ])
  
  DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
 -  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
--      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
--  env -i codesign --identifier $@ --force --sign - $@
 +  @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
-+      -framework Foundation -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
-+  @usrBinEnv@ @codesign@ --identifier $@ --force --sign - $@
+       -framework Foundation -arch arm64 -arch x86_64 -o $@ $<
  """
  
- genrule(
 
diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix
new file mode 100644
index 000000000000..2c39f1e6ca57
--- /dev/null
+++ b/pkgs/by-name/bb/bbedit/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  _7zz,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "bbedit";
+  version = "15.5.3";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/BBSW-download/BBEdit_${finalAttrs.version}.dmg";
+    hash = "sha256-8TSn0+mbvv+55Jh1VCvTfl+rNSzG9TjlQq5vA71wVmw=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ _7zz ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -r *.app "$out/Applications"
+
+    runHook postInstall
+  '';
+
+  # app bundle may be messed up by standard fixup
+  dontFixup = true;
+
+  meta = {
+    description = "Powerful and full-featured professional HTML and text editor for macOS";
+    homepage = "https://www.barebones.com/products/bbedit/";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ iedame ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
index e2eab3c2b944..b9b4667a4d99 100644
--- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix
@@ -38,11 +38,12 @@ stdenv.mkDerivation {
 
     inherit (bcachefs-tools.meta)
       homepage
+      downloadPage
       license
       maintainers
       platforms
       ;
 
-    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.18");
+    broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "6.19");
   };
 }
diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index f9a7a663738b..338a0451683b 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -19,7 +19,7 @@
   rustPlatform,
   makeWrapper,
   nix-update-script,
-  testers,
+  versionCheckHook,
   nixosTests,
   installShellFiles,
   fuseSupport ? false,
@@ -28,15 +28,25 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bcachefs-tools";
-  version = "1.31.7";
+  version = "1.31.13";
 
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gKtOyaDN9hQo45Rk9hMabKRefOG+ooaCrtLBCPx0fT8=";
+    hash = "sha256-IHc4tsEqXbxOLQXu75A3WtFqhv6NS0AlPsWt0pM8LdU=";
   };
 
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-w8dcbaJBCsn02JFPXzhOj2Ozuti0Xkr6mssdZhYKEFs=";
+  };
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     cargo
@@ -45,14 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
     rustPlatform.bindgenHook
     makeWrapper
     installShellFiles
-    udevCheckHook
   ];
 
   buildInputs = [
     libaio
     keyutils
     lz4
-
     libsodium
     liburcu
     libuuid
@@ -63,16 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional fuseSupport fuse3;
 
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    src = finalAttrs.src;
-    hash = "sha256-INnv9kRgM8RRMwBnC6Vwj9S5FfI5gMscU//aNzHF+8w=";
-  };
-
-  outputs = [
-    "out"
-    "dkms"
-  ];
-
   makeFlags = [
     "PREFIX=${placeholder "out"}"
     "VERSION=${finalAttrs.version}"
@@ -84,6 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
     "PKGCONFIG_UDEVDIR=$(out)/lib/udev"
   ]
   ++ lib.optional fuseSupport "BCACHEFS_FUSE=1";
+
+  enableParallelBuilding = true;
+
   installFlags = [
     "install"
     "install_dkms"
@@ -97,18 +98,18 @@ stdenv.mkDerivation (finalAttrs: {
   # FIXME: Try enabling this once the default linux kernel is at least 6.7
   doCheck = false; # needs bcachefs module loaded on builder
 
-  doInstallCheck = true;
-
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace-fail "target/release/bcachefs" "target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/bcachefs"
-  '';
-
   preCheck = lib.optionalString (!fuseSupport) ''
     rm tests/test_fuse.py
   '';
   checkFlags = [ "BCACHEFS_TEST_USE_VALGRIND=no" ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    udevCheckHook
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd bcachefs \
       --bash <($out/sbin/bcachefs completions bash) \
@@ -116,16 +117,16 @@ stdenv.mkDerivation (finalAttrs: {
       --fish <($out/sbin/bcachefs completions fish)
   '';
 
+  outputs = [
+    "out"
+    "dkms"
+  ];
+
   passthru = {
     # See NOTE in linux-kernels.nix
     kernelModule = import ./kernel-module.nix finalAttrs.finalPackage;
 
     tests = {
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "${finalAttrs.meta.mainProgram} version";
-        version = "${finalAttrs.version}";
-      };
       smoke-test = nixosTests.bcachefs;
       inherit (nixosTests.installer) bcachefsSimple bcachefsEncrypted bcachefsMulti;
     };
@@ -133,11 +134,10 @@ stdenv.mkDerivation (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  enableParallelBuilding = true;
-
   meta = {
     description = "Tool for managing bcachefs filesystems";
     homepage = "https://bcachefs.org/";
+    downloadPage = "https://github.com/koverstreet/bcachefs-tools";
     license = lib.licenses.gpl2Only;
     maintainers = with lib.maintainers; [
       davidak
diff --git a/pkgs/by-name/be/beammp-launcher/package.nix b/pkgs/by-name/be/beammp-launcher/package.nix
new file mode 100644
index 000000000000..a6dec6c17019
--- /dev/null
+++ b/pkgs/by-name/be/beammp-launcher/package.nix
@@ -0,0 +1,72 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  copyDesktopItems,
+  installShellFiles,
+  makeDesktopItem,
+
+  cmake,
+  curl,
+  httplib,
+  nlohmann_json,
+  openssl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "beammp-launcher";
+  version = "2.7.0";
+
+  src = fetchFromGitHub {
+    owner = "BeamMP";
+    repo = "BeamMP-Launcher";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+qdDGOLds2j00BRijFAZ8DMrnjvigs+z+w9+wbitJno=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    installShellFiles
+
+    cmake
+  ];
+
+  buildInputs = [
+    curl
+    httplib
+    nlohmann_json
+    openssl
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      categories = [ "Game" ];
+      comment = "Launcher for the BeamMP mod for BeamNG.drive";
+      desktopName = "BeamMP-Launcher";
+      exec = "BeamMP-Launcher";
+      name = "BeamMP-Launcher";
+      terminal = true;
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    installBin "BeamMP-Launcher"
+    copyDesktopItems
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Launcher for the BeamMP mod for BeamNG.drive";
+    homepage = "https://github.com/BeamMP/BeamMP-Launcher";
+    license = lib.licenses.agpl3Only;
+    mainProgram = "BeamMP-Launcher";
+    maintainers = with lib.maintainers; [
+      Andy3153
+      mochienya
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index ec3891a548dd..ee8fcd7d7123 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.1.253";
+  version = "4.1.311";
   src = fetchurl {
-    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
-    hash = "sha256-/vjJmDP183M8B/g0IIcWytB5NUoteWMZlef0j8nZdOQ=";
+    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
+    hash = "sha256-r7WPuxPlqcUQ937TcBBG93Uo9WCY1wnH3Jm2PWI9siU=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;
diff --git a/pkgs/by-name/be/beets-minimal/package.nix b/pkgs/by-name/be/beets-minimal/package.nix
new file mode 100644
index 000000000000..de0125445743
--- /dev/null
+++ b/pkgs/by-name/be/beets-minimal/package.nix
@@ -0,0 +1,5 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication python3.pkgs.beets-minimal
diff --git a/pkgs/by-name/be/beets/package.nix b/pkgs/by-name/be/beets/package.nix
new file mode 100644
index 000000000000..0d8837e0c0d8
--- /dev/null
+++ b/pkgs/by-name/be/beets/package.nix
@@ -0,0 +1,5 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication python3.pkgs.beets
diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index 3ad7b9e939d0..ff134c25206c 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.56.0";
+  version = "4.57.1";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-TayHN6Vsp1mkDNqa6mc5HWGPIfyeJQdzOGBnE6SioZ0=";
+    hash = "sha256-OiXdeoxaik+ynoLSR/fWieLIhcx5Y/G1fY2aTL2yBFM=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index 3e8754604c92..6be77b9f5eef 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "bento";
-  version = "1.11.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${version}";
-    hash = "sha256-F5RUOcD6nKH5NS0nK78d94FtXduI/6AVJJ0qArP8Ziw=";
+    hash = "sha256-KW/qq2hntXcG26atA1yRJUzSMns0e1n2U5nascU1Ci8=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-hBjj3voqWvwURGsgIgySLyxfm0JKu4qHe/HLcUO0Fa0=";
+  vendorHash = "sha256-YPCC8xK4lRtRzNjx6U8O7/+PqhhOaM/QofnOvH1rg9Y=";
 
   subPackages = [
     "cmd/bento"
diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix
index 38c057312fb1..ee2b22f4817f 100644
--- a/pkgs/by-name/be/bespokesynth/package.nix
+++ b/pkgs/by-name/be/bespokesynth/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   gitUpdater,
-  apple-sdk_11,
   cmake,
   pkg-config,
   ninja,
@@ -120,9 +119,6 @@ stdenv.mkDerivation (finalAttrs: {
     xcb-util-cursor
     pcre
     mount
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
   ];
 
   postInstall =
diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 79f012fdaea4..bd0a1c254d5c 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -4,16 +4,17 @@
   fetchFromGitHub,
   nix-update-script,
   buildNpmPackage,
+  nixosTests,
 }:
 buildGoModule rec {
   pname = "beszel";
-  version = "0.13.2";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
     tag = "v${version}";
-    hash = "sha256-5akfgX3533NkeszP/by9ZfwTmMPdG5/JKFjswP1FRp8=";
+    hash = "sha256-IQ39OtYG2VDyHIPFRR0VNK56czGlJly66Bwb/NYIBxY=";
   };
 
   webui = buildNpmPackage {
@@ -47,7 +48,7 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/internal/site";
 
-    npmDepsHash = "sha256-7+3K8MhA+FXWRXQR5edUYbL/XcxPmUqWQPxl5k8u1xs=";
+    npmDepsHash = "sha256-Wtq/pesnovOyAnFta/wI+j8rml8XWORvOLz/Q82sy8g=";
   };
 
   vendorHash = "sha256-IfwgL4Ms5Uho1l0yGCyumbr1N/SN+j5HaFl4hACkTsQ=";
@@ -62,18 +63,24 @@ buildGoModule rec {
     mv $out/bin/hub $out/bin/beszel-hub
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--subpackage"
-      "webui"
-    ];
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "webui"
+      ];
+    };
+    tests.nixos = nixosTests.beszel;
   };
 
   meta = {
     homepage = "https://github.com/henrygd/beszel";
     changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}";
     description = "Lightweight server monitoring hub with historical data, docker stats, and alerts";
-    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    maintainers = with lib.maintainers; [
+      bot-wxt1221
+      arunoruto
+    ];
     license = lib.licenses.mit;
   };
 }
diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index 9463954c82e5..fbc3bf55cddb 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bevelbar";
-  version = "24.07";
+  version = "25.08";
 
   src = fetchurl {
     url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-PUYgbJCII0JecetoY3dMBUgrtaVhlLKeaJY27JJ78RQ=";
+    hash = "sha256-XGnvpPNonMVCaMgSqJIiklBMLam/k4XLHUrgnhxoxNI=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/bi/bibata-cursors/package.nix b/pkgs/by-name/bi/bibata-cursors/package.nix
index 0c0253b4ae8e..7f390649f010 100644
--- a/pkgs/by-name/bi/bibata-cursors/package.nix
+++ b/pkgs/by-name/bi/bibata-cursors/package.nix
@@ -64,7 +64,6 @@ stdenvNoCC.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       rawkode
-      AdsonCicilioti
     ];
   };
 }
diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix
index 0d6dbed84676..ccc47ea66539 100644
--- a/pkgs/by-name/bi/biber/package.nix
+++ b/pkgs/by-name/bi/biber/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   perlPackages,
   shortenPerlShebang,
   texlive,
@@ -15,6 +16,15 @@ perlPackages.buildPerlModule {
 
   src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
 
+  # Test suite checks years that are out of range with 32bit integers
+  patches = lib.optionals stdenv.hostPlatform.is32bit [
+    (fetchpatch {
+      name = "biber-skip-64bit-only-tests.patch";
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/65871ad2d20b8ab39caf25a0aaec3ab95fbcf511/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch";
+      hash = "sha256-6Tbp62uZuFPoSKZrXerObg+gcSyLwC66IAcvcP+KcHM=";
+    })
+  ];
+
   buildInputs = with perlPackages; [
     autovivification
     BusinessISBN
diff --git a/pkgs/by-name/bi/biblesync/package.nix b/pkgs/by-name/bi/biblesync/package.nix
index 486244f71329..58201c9ea269 100644
--- a/pkgs/by-name/bi/biblesync/package.nix
+++ b/pkgs/by-name/bi/biblesync/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   cmake,
   libuuid,
@@ -19,6 +20,15 @@ stdenv.mkDerivation rec {
     sha256 = "0prmd12jq2cjdhsph5v89y38j7hhd51dr3r1hivgkhczr3m5hf4s";
   };
 
+  patches = [
+    # Fix cmake-4 support
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/karlkleinpaste/biblesync/commit/4b00f9fd3d0c858947eee18206ef44f9f6bd2283.patch?full_index=1";
+      hash = "sha256-CVYhYBDneLN3Ogvye01EQCc9zxjSwaKBzk1fBaKINug=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
diff --git a/pkgs/by-name/bi/bicgl/package.nix b/pkgs/by-name/bi/bicgl/package.nix
index 7c7327b31c5e..76231816053c 100644
--- a/pkgs/by-name/bi/bicgl/package.nix
+++ b/pkgs/by-name/bi/bicgl/package.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
     "-DBICPL_DIR=${bicpl}/lib"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/${owner}/bicgl";
     description = "Brain Imaging Centre graphics library";
diff --git a/pkgs/by-name/bi/bicpl/package.nix b/pkgs/by-name/bi/bicpl/package.nix
index 32c0e6e1bf16..c783217ab8cb 100644
--- a/pkgs/by-name/bi/bicpl/package.nix
+++ b/pkgs/by-name/bi/bicpl/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation {
   pname = "bicpl";
-  version = "unstable-2024-05-14";
+  version = "0-unstable-2025-10-24";
 
   # master is not actively maintained, using develop and develop-apple branches
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "bicpl";
-    rev = "7e1e791483cf135fe29b8eecd7a360aa892823ae";
-    hash = "sha256-SvbtPUfEYp3IGivG+5yFdJF904miyMk+s15zwW7e7b4=";
+    rev = "dc9828841e38c6b7c523f3ab8a4c23eeb9e4272b";
+    hash = "sha256-wU/Qmtk6rbwxYqealV2On7W0schrYH85oKIUCpT4IXQ=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix
index ef6fa1cd71e7..63619e92bbfe 100644
--- a/pkgs/by-name/bi/biglybt/package.nix
+++ b/pkgs/by-name/bi/biglybt/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  swt,
   fetchurl,
   jre,
   wrapGAppsHook3,
@@ -16,7 +17,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4=";
   };
 
-  nativeBuildInputs = [ wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    swt
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    swt
+  ];
+
+  runtimeDeps = [
+    swt
+  ];
 
   configurePhase = ''
     runHook preConfigure
@@ -34,6 +46,11 @@ stdenv.mkDerivation rec {
 
     cp -r ./* $out/share/biglybt/
 
+    ln -s ${swt}/lib/* $out/share/biglybt/
+    rm -rf $out/share/biglybt/swt/*.jar $out/share/biglybt/swt/J17/*.jar
+    ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/swt-$(uname -m).jar
+    ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/J17/swt-$(uname -m).jar
+
     ln -s $out/share/biglybt/biglybt.desktop $out/share/applications/
 
     ln -s $out/share/biglybt/biglybt.svg $out/share/icons/hicolor/scalable/apps/
diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
index b6cbffb51dd9..290f197fd0a2 100644
--- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
+++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bign-handheld-thumbnailer";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "MateusRodCosta";
     repo = "bign-handheld-thumbnailer";
     tag = "v${version}";
-    hash = "sha256-qS1bKEkZPmNMfiLUZVlx8EAXMMYCcGGTTZFhWwlZ3gQ=";
+    hash = "sha256-+iWf5ybCUHlZz3Ybw3bwLKzlsmiVwep2alVDvL9bG2A=";
   };
 
-  cargoHash = "sha256-LyT0HDR51/bYnXtavgtff1nCKuJn41UmZuH/uJmykkk=";
+  cargoHash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8=";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix
index 9231a87d3df7..0a55cfc7081c 100644
--- a/pkgs/by-name/bi/bilibili/sources.nix
+++ b/pkgs/by-name/bi/bilibili/sources.nix
@@ -1,6 +1,6 @@
 # Generated by ./update.sh - do not update manually!
 {
-  version = "1.17.2-2";
-  arm64-hash = "sha256-wKjbsuXDq9gsa6d0QgrOm2aBHcqDR23ZhH5Hl9cx0wM=";
-  x86_64-hash = "sha256-pVg1bXBD+tXbDEoKpd2KnL5jNE0Pi6SI+DIJE8Z5cHc=";
+  version = "1.17.3-1";
+  arm64-hash = "sha256-BzWByQ9ConOHZvyTRp5ogWo9esRiD5Ub/TOeuYJTggA=";
+  x86_64-hash = "sha256-FCc1NO8Law7fMBqyBxQB4NJR0ZN/ZYZ0wakGrnNw4DU=";
 }
diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index 2dc8abf92679..bfe4d355766d 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -20,11 +20,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "binaryninja-free";
-  version = "5.1.8005";
+  version = "5.1.8104";
 
   src = fetchurl {
     url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip";
-    hash = "sha256-vXR0TXcQwEoYz1qiGO3TYajUt+QR9wfV0es6yTZvYLs=";
+    hash = "sha256-s7lRvQhegW/bgZc6XnAowTl1ZZPIN0/BJe+u3p9qHsE=";
   };
 
   icon = fetchurl {
diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index 4d506f669dd6..f77606459334 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.13";
+  version = "9.20.15";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FR+TdurTF+ZGpdDJ8BwGA4bYkRGNdDen+Cm7lyfHs0w=";
+    hash = "sha256-1is4+uSLqD/KYYERLQxxAY2LDyzihdx53GoDZ3Isyrs=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix
deleted file mode 100644
index 97e6c2589aa7..000000000000
--- a/pkgs/by-name/bi/bindle/package.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "bindle";
-  version = "0.9.1";
-
-  src = fetchFromGitHub {
-    owner = "deislabs";
-    repo = "bindle";
-    rev = "v${version}";
-    sha256 = "sha256-xehn74fqP0tEtP4Qy9TRGv+P2QoHZLxRHzGoY5cQuv0=";
-  };
-
-  postPatch = ''
-    rm .cargo/config
-  '';
-
-  doCheck = false; # Tests require a network
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ];
-
-  cargoHash = "sha256-cTgR1yp6TFwotm5VEG5e0O7R1zCMbQmcH2zmRmF7cjI=";
-
-  cargoBuildFlags = [
-    "--bin"
-    "bindle"
-    "--bin"
-    "bindle-server"
-    "--all-features"
-  ];
-
-  meta = with lib; {
-    description = "Object Storage for Collections";
-    homepage = "https://github.com/deislabs/bindle";
-    license = licenses.asl20;
-    maintainers = [ ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix
index b7b14e7f0651..6441a3980039 100644
--- a/pkgs/by-name/bi/binocle/package.nix
+++ b/pkgs/by-name/bi/binocle/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix
index 334afeff26f7..f619ad313517 100644
--- a/pkgs/by-name/bi/bio-gappa/package.nix
+++ b/pkgs/by-name/bi/bio-gappa/package.nix
@@ -34,6 +34,17 @@ stdenv.mkDerivation (finalAttrs: {
     xz
   ];
 
+  # CMake 2.8.7 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 2.8.7 FATAL_ERROR)" \
+      "cmake_minimum_required (VERSION 3.10  FATAL_ERROR)"
+    substituteInPlace libs/genesis/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" \
+      "cmake_minimum_required (VERSION 3.10   FATAL_ERROR)"
+  '';
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin
diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index 967588c95784..caa43f611851 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.2.6";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-5QxcKVo6niV+K63JRBhs6/RUR6jru20f+DeitfqEuRI=";
+    hash = "sha256-81eM8EK2ORtsEyOTTgNFZxK8pCPBKq7YSfUmIVL91VI=";
   };
 
-  cargoHash = "sha256-/POhRQ2HIaBwk9VeMdkK7dAZ90EmB49oCvQEUScgjpY=";
+  cargoHash = "sha256-6F6UJJRETOr476h12OHcT1U4iTAkoVuomikIvlrWyqE=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/biomejs/biome/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       isabelroses
       wrbbz
     ];
diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/by-name/bi/birdtray/package.nix
similarity index 64%
rename from pkgs/applications/misc/birdtray/default.nix
rename to pkgs/by-name/bi/birdtray/package.nix
index ce8673ed6c09..73cd238cd10c 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/by-name/bi/birdtray/package.nix
@@ -1,31 +1,32 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
 
   cmake,
   pkg-config,
-  qtbase,
-  qttools,
-  qtx11extras,
+  libsForQt5,
+
+  nix-update-script,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "birdtray";
   version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "gyunaev";
     repo = "birdtray";
-    rev = "v${version}";
-    sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     qtbase
     qttools
     qtx11extras
@@ -41,12 +42,14 @@ mkDerivation rec {
   # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
   qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Mail system tray notification icon for Thunderbird";
     mainProgram = "birdtray";
     homepage = "https://github.com/gyunaev/birdtray";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ Flakebi ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ Flakebi ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/bi/bison/package.nix b/pkgs/by-name/bi/bison/package.nix
index d1c015601320..6b5fbd750de3 100644
--- a/pkgs/by-name/bi/bison/package.nix
+++ b/pkgs/by-name/bi/bison/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ m4 ];
 
   enableParallelBuilding = true;
+  # tests are flaky / timing sensitive on FreeBSD
+  enableParallelChecking = !stdenv.hostPlatform.isFreeBSD;
 
   # Normal check and install check largely execute the same test suite
   doCheck = false;
diff --git a/pkgs/by-name/bi/bitbox/package.nix b/pkgs/by-name/bi/bitbox/package.nix
index 70d2a9bc4bb3..938bb3b458ee 100644
--- a/pkgs/by-name/bi/bitbox/package.nix
+++ b/pkgs/by-name/bi/bitbox/package.nix
@@ -21,14 +21,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "bitbox";
-  version = "4.48.1";
+  version = "4.48.6";
 
   src = fetchFromGitHub {
     owner = "BitBoxSwiss";
     repo = "bitbox-wallet-app";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-zpkjYnGsmPKjxUpp2H1qSzqthOO1mTmki3bPqo35sBo=";
+    hash = "sha256-qNcwBaJywWMo/Bb1QkOM9FQ76Sf2DqULUr+W583ufAk=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/bi/bitcomet/package.nix b/pkgs/by-name/bi/bitcomet/package.nix
index 40395e291687..0ad83f9207b6 100644
--- a/pkgs/by-name/bi/bitcomet/package.nix
+++ b/pkgs/by-name/bi/bitcomet/package.nix
@@ -6,7 +6,7 @@
   fetchurl,
   desktop-file-utils,
   dpkg,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   runScript ? "BitComet",
 }:
 
@@ -15,6 +15,8 @@ let
   version = "2.15.0";
 
   meta = {
+    # webkitgtk_4_0 was removed
+    broken = true;
     homepage = "https://www.bitcomet.com";
     description = "BitTorrent download client";
     mainProgram = "BitComet";
@@ -82,7 +84,7 @@ buildFHSEnv {
     pkgs:
     [
       bitcomet
-      webkitgtk_4_0
+      # webkitgtk_4_0
     ]
     ++ appimageTools.defaultFhsEnvArgs.targetPkgs pkgs;
 
diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 3eb2e43690b3..0241eb4d667c 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,18 +6,23 @@
 }:
 buildGoModule rec {
   pname = "bitrise";
-  version = "2.33.2";
+  version = "2.34.6";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${version}";
-    hash = "sha256-ckiozGSk8a0bzTzj8PuN55rrL2r95BylYRUHZdQF+Kc=";
+    hash = "sha256-wA+IknAOkVxTwBohw8D4suksENoWymqPJycbfx6cFYQ=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access
   doCheck = false;
 
+  # resolves error: main module (github.com/bitrise-io/bitrise/v2) does not contain package github.com/bitrise-io/bitrise/v2/integrationtests/config
+  excludedPackages = [
+    "./integrationtests"
+  ];
+
   vendorHash = null;
   ldflags = [
     "-X github.com/bitrise-io/bitrise/version.Commit=${src.rev}"
diff --git a/pkgs/by-name/bi/bitwarden-cli/package.nix b/pkgs/by-name/bi/bitwarden-cli/package.nix
index 99fe107c25f7..3d4b525e2021 100644
--- a/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -14,13 +14,13 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "bitwarden-cli";
-  version = "2025.9.0";
+  version = "2025.10.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     tag = "cli-v${finalAttrs.version}";
-    hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to=";
+    hash = "sha256-A7bxAdFDChr7yiexV70N3tqhaUVAwJdGhhRKJyX0ra8=";
   };
 
   patches = [
@@ -34,7 +34,7 @@ buildNpmPackage (finalAttrs: {
 
   nodejs = nodejs_22;
 
-  npmDepsHash = "sha256-bn39QlZXNUa/GEZhJsjLiG3PRYdQ/Y36Tvef2fXH8yQ=";
+  npmDepsHash = "sha256-fX6VGSQIpcyz3x9PzLlZ4a4W/CFiY/lx2VEAry45qo8=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     perl
diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index c71124bd9ce4..486745feac1f 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
-  apple-sdk_14,
   buildNpmPackage,
   cargo,
   copyDesktopItems,
   darwin,
-  electron_36,
+  electron_37,
   fetchFromGitHub,
+  fetchpatch2,
   gnome-keyring,
   jq,
   llvmPackages_18,
@@ -25,7 +25,7 @@
 let
   description = "Secure and free password manager for all of your devices";
   icon = "bitwarden";
-  electron = electron_36;
+  electron = electron_37;
 
   # argon2 npm dependency is using `std::basic_string<uint8_t>`, which is no longer allowed in LLVM 19
   buildNpmPackage' = buildNpmPackage.override {
@@ -34,13 +34,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bitwarden-desktop";
-  version = "2025.9.0";
+  version = "2025.10.0";
 
   src = fetchFromGitHub {
     owner = "bitwarden";
     repo = "clients";
     rev = "desktop-v${version}";
-    hash = "sha256-vxGyDYtv0O5U4pnVrQm/BOIpDtpcDUOyFFdBDehQ2to=";
+    hash = "sha256-A7bxAdFDChr7yiexV70N3tqhaUVAwJdGhhRKJyX0ra8=";
   };
 
   patches = [
@@ -55,6 +55,11 @@ buildNpmPackage' rec {
     ./skip-afterpack-and-aftersign.patch
     # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
     ./dont-use-platform-triple.patch
+
+    (fetchpatch2 {
+      url = "https://github.com/bitwarden/clients/commit/cd56d01894c38cf046a7e44dcacc7e0ff2aa2a37.patch?full_index=1";
+      hash = "sha256-NRZiM+Y/ifh77vS+8mldbiwv/vPDr1JUOJzSu2tFMS8=";
+    })
   ];
 
   postPatch = ''
@@ -87,7 +92,7 @@ buildNpmPackage' rec {
     "--ignore-scripts"
   ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-R3IyNrSHcqz+Sz/OHbg16To0WXRu8S4mpWcJchEPwdY=";
+  npmDepsHash = "sha256-Qhj8Lh25vNnJzbUm/M+mKIc6Fa5plSCiy53vjevs7Tc=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit
@@ -97,7 +102,7 @@ buildNpmPackage' rec {
       cargoRoot
       patches
       ;
-    hash = "sha256-sKK/8YNLNYVg7L3IFGaWEVK91eC17gS54jib6G0RUGI=";
+    hash = "sha256-fgnf+yT3UV8dHTE2tDHdBWTBW+LHAYI/JGgfS0J/Bgk=";
   };
   cargoRoot = "apps/desktop/desktop_native";
 
@@ -124,10 +129,6 @@ buildNpmPackage' rec {
     darwin.autoSignDarwinBinariesHook
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
-  ];
-
   preBuild = ''
     if [[ $(jq --raw-output '.devDependencies.electron' < package.json | grep -E --only-matching '^[0-9]+') != ${lib.escapeShellArg (lib.versions.major electron.version)} ]]; then
       echo 'ERROR: electron version mismatch'
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix b/pkgs/by-name/bi/bitwig-studio3/package.nix
similarity index 81%
rename from pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
rename to pkgs/by-name/bi/bitwig-studio3/package.nix
index 7c6c91615465..a65d3b08be92 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio3.nix
+++ b/pkgs/by-name/bi/bitwig-studio3/package.nix
@@ -21,13 +21,13 @@
   makeWrapper,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bitwig-studio";
   version = "3.3.11";
 
   src = fetchurl {
-    url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
-    sha256 = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
+    url = "https://downloads.bitwig.com/stable/${finalAttrs.version}/bitwig-studio-${finalAttrs.version}.deb";
+    hash = "sha256-cF8gVPjM0KUcKOW09uFccp4/lzbUmZcBkVOwr/A/8Yw=";
   };
 
   nativeBuildInputs = [
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     (lib.getLib stdenv.cc.cc)
   ];
 
-  ldLibraryPath = lib.strings.makeLibraryPath buildInputs;
+  ldLibraryPath = lib.strings.makeLibraryPath finalAttrs.buildInputs;
 
   installPhase = ''
     runHook preInstall
@@ -86,13 +86,13 @@ stdenv.mkDerivation rec {
       patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" $f
       wrapProgram $f \
         "''${gappsWrapperArgs[@]}" \
-        --prefix LD_LIBRARY_PATH : "${ldLibraryPath}" \
+        --prefix LD_LIBRARY_PATH : "${finalAttrs.ldLibraryPath}" \
         --prefix PATH : "${lib.makeBinPath [ ffmpeg ]}" \
         --suffix PATH : "${lib.makeBinPath [ xdg-utils ]}"
     done
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Digital audio workstation";
     longDescription = ''
       Bitwig Studio is a multi-platform music-creation system for
@@ -100,13 +100,13 @@ stdenv.mkDerivation rec {
       editing tools and a super-fast workflow.
     '';
     homepage = "https://www.bitwig.com/";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       bfortz
       michalrus
       mrVanDalo
     ];
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
   };
-}
+})
diff --git a/pkgs/by-name/bk/bkcrack/package.nix b/pkgs/by-name/bk/bkcrack/package.nix
index 75c7ae1fb3bb..9e11a3a4e776 100644
--- a/pkgs/by-name/bk/bkcrack/package.nix
+++ b/pkgs/by-name/bk/bkcrack/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bkcrack";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "kimci86";
     repo = "bkcrack";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MFY+YBw9cpmUHrL7fpop63ty0ZdESlAgrWRYwK0IowY=";
+    hash = "sha256-VZOHQzTsA/yfVhmrr4ISWnFif0o5an9w4gpRWS85ySU=";
   };
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 531d21ac4992..c8046c46e19b 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,52 +16,52 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.42";
+  version = "1.92.48";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-vj/Z7fGQqUfWOpCi2TV4tiu2LCdTPhUJXeinL09LgeM=";
-        "8.2" = "sha256-K1h0fH9PH/LT+8EecJ0GTJxpuc4hszG9mbcvNc/6bEs=";
-        "8.3" = "sha256-U0meas8ZMPnlDuMsMoGLYBZsRBrrSmTSuryhFRmzZ/4=";
-        "8.4" = "sha256-znvTd6QR+rfRQG1w0SEWgEDxzBWiVWOf7VH25b2Sryo=";
+        "8.1" = "sha256-QrZxLPpybFhx07zaorbziEumcTFhPvcr7Jp+YPev978=";
+        "8.2" = "sha256-tdKr+LWQVC1yFUpJeUMDXbADNf5YEDbtFQaKDDBPH5g=";
+        "8.3" = "sha256-1Bix9VvBj2fJxFrLe3oQgOoWUw56yBOBgHr5TFVy/kM=";
+        "8.4" = "sha256-WAPBF6WC2zjE8lcs+oYlDc4uw9AL3xh74BwthTGWRR0=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-B2FcYKVz4sDSUlI5QifUCbX7XZME2XqaAhUVnHH+C2s=";
-        "8.2" = "sha256-k6C7Wl9O0icBQjYOjO0Hy0NitKbM9TOxTV0F4OM04LQ=";
-        "8.3" = "sha256-4EaRYLJ1I7oH0Ux1/IrOD67iWVKx9GU1uMVUA0AwrRk=";
-        "8.4" = "sha256-aNcl27Do6NoCuUHiFeDwTSVU1m0imxrMR+yiyq7/owQ=";
+        "8.1" = "sha256-sVvlvZU1orXVcoL//6LREjKoolBMYCbp1kdLGmu2n5A=";
+        "8.2" = "sha256-+ki66xW3g/LB2gtkb2RR3NOQa53ni+ZwcyMMz9sAPlY=";
+        "8.3" = "sha256-OyljLCFUyrdKh11760t9KdqJ4PX2dVYNEL09xJZed3Q=";
+        "8.4" = "sha256-QH8vFkFDGyR+MaSX5cVfxPN8MOfyAuWhMKVfqPUhjnk=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-5PcD4HnlZmgkP+fsZhBaDGbDQCoQ/Om3om3cpouTF8s=";
-        "8.2" = "sha256-wIa2Yv4q0d3jtNvMAFTq8d3Gznl88uhqyvCBtwJtMkY=";
-        "8.3" = "sha256-Fwhv7rVGsmXFcBR5E17S4tt1mEzYlxbzaz996sqbwxs=";
-        "8.4" = "sha256-ftsKeJ/TOJAavNt8VGSzJR+Bo/KcW+o5Dym2flbHxag=";
+        "8.1" = "sha256-1mgubWu32VjdoQSzHrdpGOBeh0cwPUwplMg4KlZZT0o=";
+        "8.2" = "sha256-7xc4lLE6ZHUstFxTWQ9ACdGuM+gk5oDGvKwFew65Mpk=";
+        "8.3" = "sha256-yBSSEb6clcn01Jl3rsVrak5xaOgYq8NuWE/m+hwtzxY=";
+        "8.4" = "sha256-+YdfU0t9r1rqK0FYKkZYvJXSFscmSZqn59mpEYBdgck=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-MR4Icjufw5dSxRKv1gJPP38Vow+PZp2/OofKOGkr/Nk=";
-        "8.2" = "sha256-RRwF0NKhGxZH0SNOGzr2eVg6ZDDThNgd9HBgv+Q9wCw=";
-        "8.3" = "sha256-91uv7sxf19+12/Rja1SehbIKBiE+teZv+F0lOi7KUEQ=";
-        "8.4" = "sha256-v4SnkF4DtPpB5TBiSnJYJs+KRI5IpIcKeQECVCrkdLw=";
+        "8.1" = "sha256-xadHLt5wwbjYVFPJ85Crim2jwpCFIB3u3UrKguo5dKs=";
+        "8.2" = "sha256-yypsjRm5wQFWpnxwki0ySmabhW4OnRuxghCgF3g/gC8=";
+        "8.3" = "sha256-xbZnN0FAMSb5PKU6UFjC60+d/Y9rINyFjrBsJpSKUhA=";
+        "8.4" = "sha256-7iX3Pa7+hxY4rKM9hfaoMJWwGC8MbYjOpSY+iP3vUhc=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-HzBzT8pTsc/iIMDcEQlb24f8EIYdhRqxKjb7FxB6OaY=";
-        "8.2" = "sha256-Tr9quIzQWmSMHpvZ18u2OoCP16CHpcbWxKyZeY4zJJM=";
-        "8.3" = "sha256-PmPxE29qwHJKSaTdoZQiJcwobkDMKMEcEB8ZZWFonb4=";
-        "8.4" = "sha256-f+Hn9yCtaDmWendB85ca4+6xd9eG3y+5tLTV7Qi9lPA=";
+        "8.1" = "sha256-CpbeEqyi/QyapWuZQI16E6cNalvRZVCmvHy2dv/RSQo=";
+        "8.2" = "sha256-v68HLqnFKm88LAMbC8VCJgdWSuW4fWCQyPm1kNgG/K4=";
+        "8.3" = "sha256-QLsyUKKbqi/1leNKqADbvsRmwe2f387tQ4NlKGiftOc=";
+        "8.4" = "sha256-hc+BxTod1UcMYIBsiC/MPE9IbNO1/q+MIU+xv6dF/YU=";
       };
     };
   };
diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
index 9a57031ac34a..f28b0e06d8c1 100644
--- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
+++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackmagic-desktop-video";
-  version = "15.1";
+  version = "15.2";
 
   buildInputs = [
     autoPatchelfHook
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       {
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-nZXfUbUyk9PDhBeXUHGt6T95hfMMDEH1oOgcm1wwi3E=";
+        outputHash = "sha256-OCpzKmwa4HbKTGSeVxBlYXB6TNe5uqLhtowLwAQjIJQ=";
 
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
diff --git a/pkgs/by-name/bl/blahaj/package.nix b/pkgs/by-name/bl/blahaj/package.nix
index 258da854cfb8..b834d213e8fe 100644
--- a/pkgs/by-name/bl/blahaj/package.nix
+++ b/pkgs/by-name/bl/blahaj/package.nix
@@ -1,13 +1,16 @@
 {
   lib,
   stdenv,
-  crystal,
+  crystal_1_17,
   fetchFromGitHub,
   # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/
   multithreading ? true,
   static ? stdenv.hostPlatform.isStatic,
 }:
 
+let
+  crystal = crystal_1_17;
+in
 crystal.buildCrystalPackage rec {
   pname = "blahaj";
   version = "2.2.0";
diff --git a/pkgs/by-name/bl/blas-reference/package.nix b/pkgs/by-name/bl/blas-reference/package.nix
deleted file mode 100644
index 155e23add196..000000000000
--- a/pkgs/by-name/bl/blas-reference/package.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  gfortran,
-  # Whether to build with ILP64 interface
-  blas64 ? false,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "blas";
-  version = "3.12.0";
-
-  src = fetchurl {
-    url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
-    sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0=";
-  };
-
-  passthru = { inherit blas64; };
-
-  nativeBuildInputs = [
-    cmake
-    gfortran
-  ];
-
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optional blas64 "-DBUILD_INDEX64=ON";
-
-  postInstall =
-    let
-      canonicalExtension =
-        if stdenv.hostPlatform.isLinux then
-          "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}"
-        else
-          stdenv.hostPlatform.extensions.sharedLibrary;
-    in
-    lib.optionalString blas64 ''
-      ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension}
-    '';
-
-  preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    for fn in $(find $out/lib -name "*.so*"); do
-      if [ -L "$fn" ]; then continue; fi
-      install_name_tool -id "$fn" "$fn"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.publicDomain;
-    maintainers = [ maintainers.markuskowa ];
-    homepage = "http://www.netlib.org/blas/";
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index dc4f903ade7f..9b7fe43f35e6 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -16,7 +16,7 @@
   embree,
   fetchzip,
   fetchFromGitHub,
-  ffmpeg,
+  ffmpeg_7,
   fftw,
   fftwFloat,
   freetype,
@@ -207,7 +207,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "-DLIBDIR=/does-not-exist"
-    "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
+    "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include"
   ];
 
   preConfigure = ''
@@ -239,7 +239,7 @@ stdenv'.mkDerivation (finalAttrs: {
   buildInputs = [
     alembic
     boost
-    ffmpeg
+    ffmpeg_7
     fftw
     fftwFloat
     freetype
@@ -434,9 +434,7 @@ stdenv'.mkDerivation (finalAttrs: {
     # They comment two licenses: GPLv2 and Blender License, but they
     # say: "We've decided to cancel the BL offering for an indefinite period."
     # OptiX, enabled with cudaSupport, is non-free.
-    license =
-      with lib.licenses;
-      [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; });
+    license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport nvidiaCudaRedist;
 
     platforms = [
       "aarch64-linux"
diff --git a/pkgs/games/blightmud/default.nix b/pkgs/by-name/bl/blightmud/package.nix
similarity index 89%
rename from pkgs/games/blightmud/default.nix
rename to pkgs/by-name/bl/blightmud/package.nix
index 23595aa070c2..aa9341e472c3 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/by-name/bl/blightmud/package.nix
@@ -9,14 +9,14 @@
   withTTS ? false,
   speechd-minimal,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blightmud";
   version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "blightmud";
     repo = "blightmud";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
   };
 
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
     in
     builtins.concatStringsSep " " (map skipFlag skipList);
 
-  meta = with lib; {
+  meta = {
     description = "Terminal MUD client written in Rust";
     mainProgram = "blightmud";
     longDescription = ''
@@ -72,8 +72,8 @@ rustPlatform.buildRustPackage rec {
       friendly mode.
     '';
     homepage = "https://github.com/Blightmud/Blightmud";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ cpu ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ cpu ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})
diff --git a/pkgs/by-name/bl/blint/package.nix b/pkgs/by-name/bl/blint/package.nix
index 66bf4acccfc3..d5cb89843651 100644
--- a/pkgs/by-name/bl/blint/package.nix
+++ b/pkgs/by-name/bl/blint/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "blint";
-  version = "3.0.1";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "blint";
     tag = "v${version}";
-    hash = "sha256-E4hOTDYJzavWM0/YGclhddS0eZE9eJLQmeS4Fpbysic=";
+    hash = "sha256-RloxQlnhl4zCto6QO09UZs+29QRCpL0/PJCzYrVi8ng=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix
index e5e44fddc2f2..4929a9ac66e3 100644
--- a/pkgs/by-name/bl/blitz/package.nix
+++ b/pkgs/by-name/bl/blitz/package.nix
@@ -44,6 +44,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # CMake 4 is no longer retro compatible with versions < 3.5
+  # cmake_minimum_required was already to an upper version, but not cmake_policy
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_policy(VERSION 3.1)" \
+      ""
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix
index 5f866a0e7470..aafab547514c 100644
--- a/pkgs/by-name/bl/blockattack/package.nix
+++ b/pkgs/by-name/bl/blockattack/package.nix
@@ -9,6 +9,7 @@
   fetchFromGitHub,
   gettext,
   gitUpdater,
+  libx11,
   ninja,
   physfs,
   pkg-config,
@@ -18,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "blockattack";
-  version = "2.9.0";
+  version = "2.10.0";
 
   src = fetchFromGitHub {
     owner = "blockattack";
     repo = "blockattack-game";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6mPj6A7mYm4CXkSSemNPn1CPkd7+01yr8KvCBM3a5po=";
+    hash = "sha256-sp/D0MSLWV1iV89UULlz8IrP5nmiMv6PsoGf1WM5kGw=";
   };
 
   nativeBuildInputs = [
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     SDL2_ttf
     SDL2_ttf
     boost
+    libx11
     physfs
   ];
 
diff --git a/pkgs/by-name/bl/bloodspilot-client/package.nix b/pkgs/by-name/bl/bloodspilot-client/package.nix
index 7436908119bb..a6396e8aaad3 100644
--- a/pkgs/by-name/bl/bloodspilot-client/package.nix
+++ b/pkgs/by-name/bl/bloodspilot-client/package.nix
@@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "bloodspilot-client-sdl";
     homepage = "http://bloodspilot.sf.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bl/bloodspilot-server/package.nix b/pkgs/by-name/bl/bloodspilot-server/package.nix
index bae259847895..d7991a6a5e58 100644
--- a/pkgs/by-name/bl/bloodspilot-server/package.nix
+++ b/pkgs/by-name/bl/bloodspilot-server/package.nix
@@ -28,7 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "xpilots";
     homepage = "http://bloodspilot.sf.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix
index da4665d51bc8..4e2f45c4f595 100644
--- a/pkgs/by-name/bl/bluebubbles/package.nix
+++ b/pkgs/by-name/bl/bluebubbles/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter327,
+  flutter329,
   fetchFromGitHub,
   autoPatchelfHook,
   webkitgtk_4_1,
@@ -10,7 +10,7 @@
   mpv,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "bluebubbles";
   version = "1.15.4";
 
diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix
index b5fa9f683711..925c1508555e 100644
--- a/pkgs/by-name/bl/bluej/package.nix
+++ b/pkgs/by-name/bl/bluej/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     (makeDesktopItem {
       name = "BlueJ";
       desktopName = "BlueJ";
-      exec = "BlueJ";
+      exec = "bluej";
       icon = "bluej";
       comment = "A simple powerful Java IDE";
       categories = [
diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix
index 13d5c1226156..da8193a8e798 100644
--- a/pkgs/by-name/bl/bluemap/package.nix
+++ b/pkgs/by-name/bl/bluemap/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "bluemap";
-  version = "5.12";
+  version = "5.13";
 
   src = fetchurl {
     url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
-    hash = "sha256-k+tSIlgOj7o7aHPdJzXSW1zxx2pZ67TB3aJ4Fv7U0pM=";
+    hash = "sha256-NDnslNJ3B6Cjxr6qem9xRX71ddHP014cGynJZdiFDpE=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index 40e24646d585..58b1ae48e455 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -21,13 +21,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pds";
-  version = "0.4.182";
+  version = "0.4.188";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "pds";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FNfM3kr0PTJp9mKYtzd6uH5mUfupqv0aA3sAPRq+pF4=";
+    hash = "sha256-t8KdyEygXdbj/5Rhj8W40e1o8mXprELpjsKddHExmo0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/service";
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     fetcherVersion = 2;
-    hash = "sha256-pUCICsuuc3CeWGeJ6il0etLQkntPF9MKRiJsiNDfroo=";
+    hash = "sha256-D+yjUPnBkeEkC3hV5z5n6IDswbpvHsK5aYj7POYATCY=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix
index b194a7884134..1330442ab55a 100644
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   cmake,
   gdk-pixbuf,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
     sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
   };
 
+  patches = [
+    # Pull cmake-4 fix:
+    #   https://github.com/sonald/blur-effect/pull/7
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/sonald/blur-effect/commit/76322ad8bd0e653726a6791eb8ebcc829cbb1b38.patch?full_index=1";
+      hash = "sha256-f0PBhfdrcLCZBzYx+j8+qIG9boW3S4CSyz+bS9vFKRc=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 6cdfb11e2954..a762ea5eadda 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -3,7 +3,6 @@
   bc,
   fetchurl,
   getopt,
-  ksh,
   pkgsMusl ? { },
   stdenv,
   tzdata,
@@ -39,9 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
   nativeCheckInputs = [
     bc
     tzdata
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.libc != "musl") [
-    ksh
   ];
 
   # The generated makefile is a small wrapper for calling ./boot-strap with a
@@ -57,13 +53,17 @@ stdenv.mkDerivation (finalAttrs: {
   # * directive-export{,-gmake}: another failure related to TZ variables
   # * opt-keep-going-indirect: not yet known
   # * varmod-localtime: musl doesn't support TZDIR and this test relies on impure, implicit paths
-  env.BROKEN_TESTS = lib.concatStringsSep " " [
-    "cmd-interrupt"
-    "directive-export"
-    "directive-export-gmake"
-    "opt-keep-going-indirect"
-    "varmod-localtime"
-  ];
+  env.BROKEN_TESTS = lib.concatStringsSep " " (
+    [
+      "cmd-interrupt"
+      "directive-export"
+      "directive-export-gmake"
+      "opt-keep-going-indirect"
+      "varmod-localtime"
+    ]
+    # TODO: drop the name-conditioning on stdenv rebuild
+    ++ lib.optional (stdenv.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin") "export"
+  );
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 4f7db4c8d37d..32adfde8f911 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.25";
+  version = "0.9.26";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-imbTZLq7yFxh/qaigySNaBBLqkJS1zY/gwjLslj3Jv4=";
+    hash = "sha256-EZc+cageuhPSIwyHAW6JTbSGQwlHCl9YpUHzHZ0ygx0=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 9b88c6d4ab60..fb98264a223e 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation rec {
   pname = "boinc";
-  version = "8.2.5";
+  version = "8.2.6";
 
   src = fetchFromGitHub {
     name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-e5XkGAnMvqG/rRc9Vpw9QNPbpkTwcJ//DDuBqfrSRhE=";
+    hash = "sha256-ci5KwQgeWVSvq04S3cEpeMmFz/qXUxqO2pcZZw17BUU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bo/bombardier/package.nix b/pkgs/by-name/bo/bombardier/package.nix
index db1a64994eca..9b5f385893b2 100644
--- a/pkgs/by-name/bo/bombardier/package.nix
+++ b/pkgs/by-name/bo/bombardier/package.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
     homepage = "https://github.com/codesenberg/bombardier";
     changelog = "https://github.com/codesenberg/bombardier/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "bombardier";
   };
 }
diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix
index 960cbd64c5db..1e200709409c 100644
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@@ -15,7 +15,7 @@ buildDotnetModule rec {
     owner = "boogie-org";
     repo = "boogie";
     tag = "v${version}";
-    hash = "sha256-OuNzxzcoWrDCmUfQNXEif5wIY+L5jql14231m7nNBe4=";
+    hash = "sha256-tmcio1GCyfMhjnbBE/pUqYso5HCu4SLHOYx/t0/PZTQ=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
diff --git a/pkgs/by-name/bo/bookworm/package.nix b/pkgs/by-name/bo/bookworm/package.nix
index 1195f4b90ae9..d68f8da9219f 100644
--- a/pkgs/by-name/bo/bookworm/package.nix
+++ b/pkgs/by-name/bo/bookworm/package.nix
@@ -24,7 +24,7 @@
   unar,
   unzip,
   vala,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   wrapGAppsHook3,
 }:
 
@@ -60,7 +60,7 @@ stdenv.mkDerivation {
     poppler
     python3
     sqlite
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   postPatch = ''
@@ -92,6 +92,8 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Simple, focused eBook reader";
     mainProgram = "com.github.babluboy.bookworm";
     longDescription = ''
diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix
index ab80bc3fbdf7..5de394bf3bb0 100644
--- a/pkgs/by-name/bo/boolector/package.nix
+++ b/pkgs/by-name/bo/boolector/package.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   lib,
   python3,
-  fetchpatch,
   cmake,
   lingeling,
   btor2tools,
@@ -13,23 +12,19 @@
 
 stdenv.mkDerivation rec {
   pname = "boolector";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "boolector";
     repo = "boolector";
     tag = version;
-    hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg=";
+    hash = "sha256-CKhaPaWUB6Fz0LfnCl81LVmTebCWzTvZLKeC0KH3by4=";
   };
 
-  patches = [
-    # present in master - remove after 3.2.3
-    (fetchpatch {
-      name = "update-unit-tests-to-cpp-14.patch";
-      url = "https://github.com/Boolector/boolector/commit/cc13f371c0c5093d98638ddd213dc835ef3aadf3.patch";
-      hash = "sha256-h8DBhAvUu+wXBwmvwRhHnJv3XrbEpBpvX9D1FI/+avc=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/bo/bootdev-cli/package.nix b/pkgs/by-name/bo/bootdev-cli/package.nix
index b52025961641..b479570937af 100644
--- a/pkgs/by-name/bo/bootdev-cli/package.nix
+++ b/pkgs/by-name/bo/bootdev-cli/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "bootdev-cli";
-  version = "1.20.4";
+  version = "1.20.5";
 
   src = fetchFromGitHub {
     owner = "bootdotdev";
     repo = "bootdev";
     tag = "v${version}";
-    hash = "sha256-ayjHhnnP6YWKMItsAw+nnScf1/eEHN2f7cOIkskE3mM=";
+    hash = "sha256-iVL2nRQb4A7UfhiQSBBbaxM1Yqc2pESvRfQ3xSjGq10=";
   };
 
   vendorHash = "sha256-jhRoPXgfntDauInD+F7koCaJlX4XDj+jQSe/uEEYIMM=";
diff --git a/pkgs/by-name/bo/bootspec/package.nix b/pkgs/by-name/bo/bootspec/package.nix
index 307733da90f4..208d5ed30900 100644
--- a/pkgs/by-name/bo/bootspec/package.nix
+++ b/pkgs/by-name/bo/bootspec/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "bootspec";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "bootspec";
     rev = "v${version}";
-    hash = "sha256-WDEaTxj5iT8tvasd6gnMhRgNoEdDi9Wi4ke8sVtNpt8=";
+    hash = "sha256-FeNBn/HeOanvFSCH9gNBCwlSJx1EhhEdrgX2rbXdZgI=";
   };
 
-  cargoHash = "sha256-ZJKoL1vYfAG1rpCcE1jRm7Yj2dhooJ6iQ91c6EGF83E=";
+  cargoHash = "sha256-vJVOseAvIGNxos180Z5OHgo3u/2iyeOgOetXTJxyZx0=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index ce5fac7b8dd4..be12bcedeedd 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -4,7 +4,6 @@
   acl,
   e2fsprogs,
   fetchFromGitHub,
-  fetchpatch,
   libb2,
   lz4,
   openssh,
@@ -21,24 +20,16 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "borgbackup";
     repo = "borg";
     tag = version;
-    hash = "sha256-1RRizsHY6q1ruofTkRZ4sSN4k6Hoo+sG85w2zz+7yL8=";
+    hash = "sha256-KoOulgOkMgnkN3I0Gw9z0YKZvqvPJ0A9sIAxRLOlchU=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "allow-msgpack-1.1.1.patch";
-      url = "https://github.com/borgbackup/borg/commit/f6724bfef2515ed5bf66c9a0434655c60a82aae2.patch";
-      hash = "sha256-UfLaAFKEAHvbIR5WDYJY7bz3aiffdwAXJKfzZZU+NT8=";
-    })
-  ];
-
   postPatch = ''
     # sandbox does not support setuid/setgid/sticky bits
     substituteInPlace src/borg/testsuite/archiver.py \
@@ -129,6 +120,11 @@ python.pkgs.buildPythonApplication rec {
     "test_get_keys_dir"
     "test_get_security_dir"
     "test_get_config_dir"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Tests create files with append-only flags that cause cleanup issues on macOS
+    "test_extract_restores_append_flag"
+    "test_file_status_excluded"
   ];
 
   preCheck = ''
diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 48dc20d37d26..3f3d27ddaff1 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "2.0.7";
+  version = "2.0.11";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HunKXVuDGTdH+CzIQbtkN0oRMocQ7gVh6Mf6L7wlhAY=";
+    hash = "sha256-X8IrLAH0rwUOGWMx9tDHIL8DeII35YCOeZyD979x/gk=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -67,10 +67,10 @@ python3Packages.buildPythonApplication rec {
       # there is another "sleep", so choose the one with the space after it
       # due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544
       substitute sample/systemd/borgmatic.service \
-                 $out/lib/systemd/system/borgmatic.service \
-                 --replace /root/.local/bin/borgmatic $out/bin/borgmatic \
-                 --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \
-                 --replace "sleep " "${coreutils}/bin/sleep "
+        $out/lib/systemd/system/borgmatic.service \
+        --replace-fail /root/.local/bin/borgmatic $out/bin/borgmatic \
+        --replace-fail systemd-inhibit ${systemd}/bin/systemd-inhibit \
+        --replace-fail "sleep " "${coreutils}/bin/sleep "
     '';
 
   passthru.tests = {
diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 92cb25cba6aa..ea8695903891 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -5,18 +5,18 @@
   cmake,
   ninja,
   perl,
-  buildGoModule,
+  gitUpdater,
 }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
-buildGoModule (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "boringssl";
-  version = "0.20250818.0";
+  version = "0.20251002.0";
 
   src = fetchgit {
     url = "https://boringssl.googlesource.com/boringssl";
     tag = finalAttrs.version;
-    hash = "sha256-lykIlC0tvjtjjS/rQTeX4vK9PgI+A8EnasEC+HYspvg=";
+    hash = "sha256-/78GCbyB37lada0fA8MsOYXVJSUCM7CuC2pHCpy9qto=";
   };
 
   patches = [
@@ -30,61 +30,35 @@ buildGoModule (finalAttrs: {
     perl
   ];
 
-  vendorHash = "sha256-IXmnoCYLoiQ/XL2wjksRFv5Kwsje0VNkcupgGxG6rSY=";
-  proxyVendor = true;
-
-  # hack to get both go and cmake configure phase
-  # (if we use postConfigure then cmake will loop runHook postConfigure)
-  preBuild = ''
-    cmakeConfigurePhase
-  ''
-  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-    export GOARCH=$(go env GOHOSTARCH)
-  '';
-
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isGNU [
       # Needed with GCC 12 but breaks on darwin (with clang)
       "-Wno-error=stringop-overflow"
     ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "-Wno-error=character-conversion"
+    ]
   );
 
-  buildPhase = ''
-    ninjaBuildPhase
-  '';
-
-  # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
-  cmakeFlags = [
-    "-GNinja"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $bin/bin $dev $out/lib
-
-    install -Dm755 bssl -t $bin/bin
-    install -Dm644 {libcrypto,libdecrepit,libpki,libssl}.a -t $out/lib
-
-    cp -r ../include $dev
-
-    runHook postInstall
-  '';
-
   outputs = [
     "out"
     "bin"
     "dev"
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Free TLS/SSL implementation";
     mainProgram = "bssl";
     homepage = "https://boringssl.googlesource.com";
-    maintainers = [ lib.maintainers.thoughtpolice ];
+    maintainers = with lib.maintainers; [
+      thoughtpolice
+      theoparis
+      niklaskorz
+    ];
     license = with lib.licenses; [
-      openssl
+      asl20
       isc
       mit
       bsd3
diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix
index 305b8ee840b0..09630854b0f6 100644
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@@ -9,13 +9,13 @@
 buildGoModule rec {
   pname = "bosh-cli";
 
-  version = "7.9.11";
+  version = "7.9.13";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "bosh-cli";
     rev = "v${version}";
-    sha256 = "sha256-yODZexoUPs6CLyv/Wpy4lcNMYQVnS651ZJC0HEvEh1s=";
+    sha256 = "sha256-/9rtm1JdyfnCG60YeM9jJ0koeo0d1qfVJ8zHAHoBCGQ=";
   };
   vendorHash = null;
 
diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
new file mode 100644
index 000000000000..04fdafff9153
--- /dev/null
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -0,0 +1,182 @@
+{
+  lib,
+  stdenv,
+  libcxxStdenv,
+  fetchurl,
+  pkgsStatic,
+  runCommandLocal,
+  binutils,
+  python3,
+  docutils,
+  bzip2,
+  zlib,
+  jitterentropy,
+  esdm,
+  tpm2-tss,
+  static ? stdenv.hostPlatform.isStatic,
+  windows,
+
+  # build ESDM RNG plugin
+  withEsdm ? false,
+  # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
+  withTpm2 ? false,
+  policy ? null,
+}@args:
+
+assert lib.assertOneOf "policy" policy [
+  # no explicit policy is given. The defaults by the library are used
+  null
+  # only allow BSI approved algorithms, FFI and SHAKE for XMSS
+  "bsi"
+  # only allow NIST approved algorithms in FIPS 140
+  "fips140"
+  # only allow "modern" algorithms
+  "modern"
+];
+let
+  stdenv = if static then libcxxStdenv else args.stdenv;
+
+  # (based on same workaround from capnproto package)
+  #
+  # HACK: work around https://github.com/NixOS/nixpkgs/issues/177129
+  # Though this is an issue between Clang and GCC,
+  # so it may not get fixed anytime soon...
+  empty-libgcc_eh =
+    runCommandLocal "empty-libgcc_eh"
+      {
+        nativeBuildInputs = [ binutils ];
+      }
+      ''
+        mkdir -p "$out"/lib
+        ${stdenv.cc.targetPrefix}ar r "$out"/lib/libgcc_eh.a
+      '';
+in
+stdenv.mkDerivation (finalAttrs: {
+  version = "3.9.0";
+  pname = "botan";
+
+  __structuredAttrs = true;
+  enableParallelBuilding = true;
+  strictDeps = true;
+
+  outputs = [
+    "bin"
+    "out"
+    "dev"
+    "doc"
+    "man"
+  ];
+
+  src = fetchurl {
+    url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
+    hash = "sha256-jD8oS1jd1C6OQ+n6hqcSnYfqfD93aoDT2mPsIHIrCIM=";
+  };
+
+  nativeBuildInputs = [
+    python3
+    docutils
+  ];
+
+  buildInputs = [
+    bzip2
+    zlib
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
+    tpm2-tss
+  ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
+    jitterentropy
+  ]
+  ++
+    lib.optionals
+      (lib.versionAtLeast finalAttrs.version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW)
+      [
+        esdm
+      ]
+  ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
+    windows.pthreads
+  ];
+
+  propagatedBuildInputs = lib.optional static empty-libgcc_eh;
+
+  buildTargets = [
+    "cli"
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
+  ++ lib.optionals static [ "static" ]
+  ++ lib.optionals (!static) [ "shared" ];
+
+  botanConfigureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--bindir=${placeholder "bin"}/bin"
+    "--docdir=${placeholder "doc"}/share/doc"
+    "--mandir=${placeholder "man"}/share/man"
+    "--no-install-python-module"
+    "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
+    "--with-bzip2"
+    "--with-zlib"
+    "--with-rst2man"
+    "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    "--cc=clang"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
+    "--with-tpm2"
+  ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
+    "--enable-modules=jitter_rng"
+  ]
+  ++
+    lib.optionals
+      (lib.versionAtLeast finalAttrs.version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW)
+      [
+        "--enable-modules=esdm_rng"
+      ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.8.0" && policy != null) [
+    "--module-policy=${policy}"
+  ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.8.0" && policy == "bsi") [
+    "--enable-module=ffi"
+    "--enable-module=shake"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
+    "--os=mingw"
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+    python configure.py ''${botanConfigureFlags[@]}
+    runHook postConfigure
+  '';
+
+  preInstall = ''
+    if [ -d src/scripts ]; then
+      patchShebangs src/scripts
+    fi
+  '';
+
+  postInstall = ''
+    cd "$out"/lib/pkgconfig
+    ln -s botan-*.pc botan.pc || true
+  '';
+
+  doCheck = true;
+
+  passthru.tests = {
+    static = pkgsStatic.botan3;
+  };
+
+  meta = with lib; {
+    description = "Cryptographic algorithms library";
+    homepage = "https://botan.randombit.net";
+    mainProgram = "botan";
+    maintainers = with maintainers; [
+      raskin
+      thillux
+      nikstur
+    ];
+    platforms = platforms.unix ++ platforms.windows;
+    license = licenses.bsd2;
+  };
+})
diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index be62985a1590..5aec3d925137 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -32,13 +32,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.24";
+  version = "52.0";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     tag = version;
-    hash = "sha256-cKW2b8MVpVksDnthn9kPBtUoCiiCMTQ993KTJSJuZDE=";
+    hash = "sha256-nly5DldxJtgBLpXdVpfQwu3qTQm9E0MmC3i4QGYbOEw=";
   };
 
   patches = [
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index 158eb53b8d0d..9afdac3ebfdf 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bottom";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "ClementTsang";
     repo = "bottom";
     tag = version;
-    hash = "sha256-xX7W137OCMbdOsuFSv7lvKn67jDUKuKmtTSRt5Bb3i0=";
+    hash = "sha256-7rVvKAqK8hqICnSr/Ax9ndsIZAdTaUyOAoVZ13W5BJs=";
   };
 
-  cargoHash = "sha256-IG+6UUQhFanWjNprjwlPsFHfzxU+TGeNR82xiy+4bWg=";
+  cargoHash = "sha256-OXprj84ixm5KFayWsHuxCB3p5Ob/oZgsk3u3lqkOiuk=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "btm";
     maintainers = with lib.maintainers; [
       berbiche
-      figsoda
       gepbird
     ];
   };
diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix
index 5286edb36f81..7349d505e7ce 100644
--- a/pkgs/by-name/bo/bowtie2/package.nix
+++ b/pkgs/by-name/bo/bowtie2/package.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   # TODO: check with other distros and report upstream
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "-m64" ""
+      --replace-fail "-m64" "" \
+      --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' \
+        'cmake_minimum_required(VERSION 3.5 FATAL_ERROR)'
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix
index dcb6898b8991..a95fd79f0655 100644
--- a/pkgs/by-name/bo/boxxy/package.nix
+++ b/pkgs/by-name/bo/boxxy/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       dit7ya
-      figsoda
     ];
     platforms = platforms.linux;
     broken = stdenv.hostPlatform.isAarch64;
diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index da7814cc6d12..0d4a929b82d1 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.83.112";
+  version = "1.84.135";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-IqPxbt3nCIrrqr3yVS0gDdiYsQ2OXVm3dabY8AH7IK0=";
+      hash = "sha256-DekkbvOpVn+NDSzltiafsS7cE2QbVn47mIaVvXUQUUM=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-Q0V5V9JYGAgKAV3L43fy5I8ojIcxyU7C5OnqvatlkPE=";
+      hash = "sha256-mPZqszSPkMC77eUY+CpTzYbbDKMKt7LoM6lncgBqSFo=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-bHePzMfb/FcCkH2aWqi8669mYcfTT/908ZasxOhFDHk=";
+      hash = "sha256-yC1XS1NdJ6kTd16kK/MlVV5KYoMVgRAr8/JLOdr+r74=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-DNtEb7stYQ5uG+L7pdXXQZp/6dtx9eUlLgM0MpNLJac=";
+      hash = "sha256-Au42zUX21ZFvfNyrNRb3sWH+c+DGqqGUulbK02Xjrsg=";
     };
   };
 
diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix
index f85c107c54db..f52dfb233f9b 100644
--- a/pkgs/by-name/br/breitbandmessung/package.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   asar,
   dpkg,
-  electron_36,
+  electron_38,
   makeWrapper,
   nixosTests,
   undmg,
@@ -13,7 +13,7 @@
 let
   inherit (stdenv.hostPlatform) system;
 
-  electron = electron_36;
+  electron = electron_38;
 
   sources = import ./sources.nix;
 
diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix
index a077e5a1c169..ff7cc19b750f 100644
--- a/pkgs/by-name/br/brill/package.nix
+++ b/pkgs/by-name/br/brill/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   version = "4.000.073";
 
   src = fetchzip {
-    url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip";
+    url = "https://web.archive.org/web/20250719162541/https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip";
     hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4=";
     stripRoot = false;
   };
diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix
index 5885c511d333..a2bba6ec5aa2 100644
--- a/pkgs/by-name/br/brltty/package.nix
+++ b/pkgs/by-name/br/brltty/package.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY=";
   };
 
+  depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [
-    pkg-config
     python3.pkgs.cython
     python3.pkgs.setuptools
     tcl # One of build scripts require tclsh
diff --git a/pkgs/by-name/br/browsers/package.nix b/pkgs/by-name/br/browsers/package.nix
index bd9d28648c09..00315961502c 100644
--- a/pkgs/by-name/br/browsers/package.nix
+++ b/pkgs/by-name/br/browsers/package.nix
@@ -12,18 +12,18 @@
   pango,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "browsers";
-  version = "0.7.0";
+  version = "0.7.2";
 
   src = fetchFromGitHub {
     owner = "Browsers-software";
     repo = "browsers";
-    tag = version;
-    hash = "sha256-s03BEscaYdSitLtlqbX/tgGSLRHuXc9Ht+3RMCUIdY8=";
+    tag = finalAttrs.version;
+    hash = "sha256-1RWGAEiSJWDoScKuUB5LL1tQyTw5NRnld7Fi93vP0BA=";
   };
 
-  cargoHash = "sha256-tz4ju0NwgG5yb1VndYqyf+g631izPl904KYDUvawO28=";
+  cargoHash = "sha256-M1KAZPjNu4j5b5Ml2J9OHpD+/jeF8WRP6EzfmLnb0hY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
     mv $out/share/applications/software.Browsers.template.desktop $out/share/applications/software.Browsers.desktop
     substituteInPlace \
         $out/share/applications/software.Browsers.desktop \
-        --replace-fail 'Exec=€ExecCommand€' 'Exec=${pname} %u'
+        --replace-fail 'Exec=€ExecCommand€' 'Exec=${finalAttrs.pname} %u'
     cp -r resources $out
     for size in 16 32 128 256 512; do
       install -m 444 \
@@ -58,9 +58,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Open the right browser at the right time";
     homepage = "https://browsers.software";
-    changelog = "https://github.com/Browsers-software/browsers/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/Browsers-software/browsers/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ravenz46 ];
     mainProgram = "browsers";
   };
-}
+})
diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix
index 15a8007156e6..6a1ab78df485 100644
--- a/pkgs/by-name/br/browsr/package.nix
+++ b/pkgs/by-name/br/browsr/package.nix
@@ -97,6 +97,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://juftin.com/browsr";
     changelog = "https://github.com/juftin/browsr/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix
index 6dce2ef52efd..573a0f78f0b3 100644
--- a/pkgs/by-name/br/bruijn/generated.nix
+++ b/pkgs/by-name/br/bruijn/generated.nix
@@ -24,8 +24,8 @@ mkDerivation {
   pname = "bruijn";
   version = "0.1.0.0";
   src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/31ba54046e33618905fc99e0b079bd3aa2594284.tar.gz";
-    sha256 = "11b3i32y36i29haym4agn1pgik20byldihgs2qsi5p7vy17z0a78";
+    url = "https://github.com/marvinborner/bruijn/archive/c37a9d27b9f654b1e0118d32269a1548800b062b.tar.gz";
+    sha256 = "1a667693agsc559yy4k04gxv1hlsgkn3aw64yvg876fbn5dr7sk3";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt
index 758d57bf33ac..7b5b0a92b554 100644
--- a/pkgs/by-name/br/bruijn/version.txt
+++ b/pkgs/by-name/br/bruijn/version.txt
@@ -1 +1 @@
-0-unstable-2025-09-28
+0-unstable-2025-11-01
diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
index 9088460b5ffd..811fb768f17d 100644
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -1,5 +1,7 @@
 {
   lib,
+  stdenv,
+  clang_20,
   buildNpmPackage,
   bruno,
   pkg-config,
@@ -24,7 +26,8 @@ buildNpmPackage {
 
   nativeBuildInputs = [
     pkg-config
-  ];
+  ]
+  ++ lib.optional stdenv.isDarwin clang_20; # clang_21 breaks gyp builds
 
   buildInputs = [
     pango
diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index b6d25b670993..6d5bd7e5153c 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  clang_20,
   fetchFromGitHub,
   buildNpmPackage,
   nix-update-script,
@@ -19,25 +20,26 @@
 
 buildNpmPackage rec {
   pname = "bruno";
-  version = "2.12.0";
+  version = "2.13.2";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     tag = "v${version}";
-    hash = "sha256-5yYcclJBb5kKaDr9irkLQBa6Tg8yO1LWh89ntBiMQho=";
+    hash = "sha256-oYp4sSL36HrDyK+YJfjvSQuYV0NdYcB6UeTGksbrcuI=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json
     '';
   };
 
-  npmDepsHash = "sha256-mLl8igkdujzI4Fz4SoUrCdnI2KUo6DsNtPdAhwjYpac=";
+  npmDepsHash = "sha256-TkPjT2SW5KgbaZiSCjWEd1UTqSsFq+MI58bMShkm/yI=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   nativeBuildInputs = [
     pkg-config
   ]
+  ++ lib.optional stdenv.isDarwin clang_20 # clang_21 breaks gyp builds
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     makeWrapper
     copyDesktopItems
diff --git a/pkgs/by-name/bt/btc-rpc-explorer/package.nix b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
index b8074f93fbc4..93e32a9f67f5 100644
--- a/pkgs/by-name/bt/btc-rpc-explorer/package.nix
+++ b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
@@ -20,10 +20,6 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-eYA2joO4wcV10xJeYLqCbvM2szWlqofmugoHHD9D30U=";
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   makeCacheWritable = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix
index 08b6df49b264..64be27f6899b 100644
--- a/pkgs/by-name/bt/btrfs-assistant/package.nix
+++ b/pkgs/by-name/bt/btrfs-assistant/package.nix
@@ -12,6 +12,7 @@
   util-linux,
   enableSnapper ? true,
   nix-update-script,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,6 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-hFWYT+YIgnqBigpPkGdsLj6rcg4CjJffAyXlR23QP0Y=";
   };
 
+  patches = [
+    # Disable -Werror
+    # https://gitlab.com/btrfs-assistant/btrfs-assistant/-/issues/134
+    (fetchpatch {
+      url = "https://gitlab.com/btrfs-assistant/btrfs-assistant/-/commit/edc0a13bac5189a1a910f5adab01b2d5b60c76f6.diff";
+      hash = "sha256-kGyp5OaSGk4OvhtyNSygJEW+wAJksK8opxtLPbhA+10=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     git
diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index fd8e3bce91c4..ffa5dac48db6 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "6.16";
+  version = "6.17";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    hash = "sha256-Makw+HN8JhioJK1L0f3YP1QQPg6qFaqtxIT/rjNGb8U=";
+    hash = "sha256-J31pbJ15cT/1r7U8fv69zq0uamAHeJsXQuxBH05Moik=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/bucklespring/default.nix b/pkgs/by-name/bu/bucklespring-libinput/package.nix
similarity index 80%
rename from pkgs/applications/audio/bucklespring/default.nix
rename to pkgs/by-name/bu/bucklespring-libinput/package.nix
index a20e15feb87c..8a7f15686481 100644
--- a/pkgs/applications/audio/bucklespring/default.nix
+++ b/pkgs/by-name/bu/bucklespring-libinput/package.nix
@@ -15,17 +15,14 @@
   libX11,
 }:
 
-let
-  inherit (lib) optionals;
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "bucklespring";
   version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "bucklespring";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "0prhqibivxzmz90k79zpwx3c97h8wa61rk5ihi9a5651mnc46mna";
   };
 
@@ -38,13 +35,13 @@ stdenv.mkDerivation rec {
     openal
     alure
   ]
-  ++ optionals legacy [
+  ++ lib.optionals legacy [
     libXtst
     libX11
   ]
-  ++ optionals (!legacy) [ libinput ];
+  ++ lib.optionals (!legacy) [ libinput ];
 
-  makeFlags = optionals (!legacy) [ "libinput=1" ];
+  makeFlags = lib.optionals (!legacy) [ "libinput=1" ];
 
   installPhase = ''
     runHook preInstall
@@ -58,7 +55,7 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Nostalgia bucklespring keyboard sound";
     mainProgram = "buckle";
     longDescription = ''
@@ -67,8 +64,8 @@ stdenv.mkDerivation rec {
       <code>users.users.alice.extraGroups = [ "input" ];</code>
     '';
     homepage = "https://github.com/zevv/bucklespring";
-    license = licenses.gpl2Only;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
index bd0b1dcf1d0e..f2c93edc49b6 100644
--- a/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-analogue-clock-applet/package.nix
@@ -8,7 +8,7 @@
   vala,
   budgie-desktop,
   gtk3,
-  libpeas,
+  libpeas2,
   nix-update-script,
 }:
 
@@ -33,9 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     budgie-desktop
     gtk3
-    libpeas
+    libpeas2
   ];
 
+  postPatch = ''
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace meson.build \
+      --replace-fail "dependency('libpeas-1.0')" "dependency('libpeas-2')"
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index b638f9246ba0..1dc34f6398af 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -61,7 +61,7 @@
   shared-mime-info,
   testers,
   tzdata,
-  udisks2,
+  udisks,
   upower,
   webp-pixbuf-loader,
   wrapGAppsHook3,
@@ -70,14 +70,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "budgie-control-center";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "BuddiesOfBudgie";
     repo = "budgie-control-center";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-W5PF7BPdQdg/7xJ4J+fEnuDdpoG/lyhX56RDnX2DXoY=";
+    hash = "sha256-Je3X1V4U2t0LMxWwtoYZKEI56IS4zK/w6OL615tqKkk=";
   };
 
   patches = [
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     networkmanager
     polkit
     samba
-    udisks2
+    udisks
     upower
   ];
 
diff --git a/pkgs/by-name/bu/budgie-desktop/package.nix b/pkgs/by-name/bu/budgie-desktop/package.nix
index 71957c7f352a..8e14de959279 100644
--- a/pkgs/by-name/bu/budgie-desktop/package.nix
+++ b/pkgs/by-name/bu/budgie-desktop/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   accountsservice,
   alsa-lib,
   budgie-screensaver,
@@ -10,6 +9,7 @@
   glib,
   gnome-desktop,
   gnome-settings-daemon,
+  gobject-introspection,
   graphene,
   gst_all_1,
   gtk-doc,
@@ -19,10 +19,12 @@
   libcanberra-gtk3,
   libgee,
   libGL,
+  libgudev,
   libnotify,
-  libpeas,
+  libpeas2,
   libpulseaudio,
   libuuid,
+  libwacom,
   libwnck,
   magpie,
   libgbm,
@@ -35,6 +37,7 @@
   polkit,
   sassc,
   testers,
+  udev,
   upower,
   vala,
   validatePkgConfig,
@@ -45,14 +48,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "budgie-desktop";
-  version = "10.9.2";
+  version = "10.9.3-unstable-2025-09-13";
 
   src = fetchFromGitHub {
     owner = "BuddiesOfBudgie";
     repo = "budgie-desktop";
-    tag = "v${finalAttrs.version}";
+    rev = "68d5136613fa1b15d39cc67ada3085590ec162ae";
     fetchSubmodules = true;
-    hash = "sha256-lDsQlUAa79gnM8wC5pwyquvFyEiayH4W4gD/uyC5Koo=";
+    hash = "sha256-xqN06CGS4xyUwnJCsLplYzKtO/V8hDmb6UNJu/nhQHs=";
   };
 
   outputs = [
@@ -63,31 +66,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./plugins.patch
-
-    # Adapt to libxfce4windowing v4.19.8
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/627
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/ba8170b4f3108f9de28331b6a98a9d92bb0ed4de.patch";
-      hash = "sha256-T//1/NmaV81j0jiIYK7vEp8sgKCgF2i10D+Rk9qAAeE=";
-    })
-
-    # Resolve vala 0.56.18 compact class inheritance removal
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/679
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/46c83b1265b4230668da472d9ef6926941678418.patch";
-      hash = "sha256-qnA8iBEctZbE86qIPudI1vMbgFy4xDWrxxej517ORws=";
-    })
-
-    # Add override for overlay-key to prevent crash with mutter-common v48-rc
-    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/683
-    (fetchpatch {
-      url = "https://github.com/BuddiesOfBudgie/budgie-desktop/commit/c24091bb424abe99ebcdd33eedd37068f735ad2a.patch";
-      hash = "sha256-4WEkscftOGZmzH7imMTmcTDPH6eHMeEhgto+R5NNlh0=";
-    })
   ];
 
   nativeBuildInputs = [
     docbook-xsl-nons
+    gobject-introspection
     gtk-doc
     intltool
     meson
@@ -115,21 +98,30 @@ stdenv.mkDerivation (finalAttrs: {
     libcanberra-gtk3
     libgee
     libGL
+    libgudev
     libnotify
     libpulseaudio
     libuuid
+    libwacom
     libwnck
     magpie
     libgbm
     polkit
     sassc
+    udev
     upower
     xfce.libxfce4windowing
   ];
 
   propagatedBuildInputs = [
     # budgie-1.0.pc, budgie-raven-plugin-1.0.pc
-    libpeas
+    libpeas2
+  ];
+
+  mesonFlags = [
+    # FIXME: The meson option name is confusing
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/pull/739#discussion_r2359421711
+    "-Dbsd-libexecdir=${gnome-settings-daemon}/libexec"
   ];
 
   passthru = {
diff --git a/pkgs/by-name/bu/budgie-desktop/plugins.patch b/pkgs/by-name/bu/budgie-desktop/plugins.patch
index 9fa40adaa5dc..f8d5ac40adfe 100644
--- a/pkgs/by-name/bu/budgie-desktop/plugins.patch
+++ b/pkgs/by-name/bu/budgie-desktop/plugins.patch
@@ -1,175 +1,45 @@
-diff --git a/meson.build b/meson.build
-index 6c6e473e..9b8fb73a 100644
---- a/meson.build
-+++ b/meson.build
-@@ -88,11 +88,6 @@ datadir = join_paths(prefix, get_option('datadir'))
- localedir = join_paths(prefix, get_option('localedir'))
- podir = join_paths(meson.source_root(), 'po')
+diff --git a/src/panel/plugin/plugin-manager.c b/src/panel/plugin/plugin-manager.c
+index 1f0d32d60..2f46cee6e 100644
+--- a/src/panel/plugin/plugin-manager.c
++++ b/src/panel/plugin/plugin-manager.c
+@@ -115,12 +115,26 @@ static void budgie_panel_plugin_manager_init(BudgiePanelPluginManager *self) {
+ 	}
  
--cdata.set_quoted('DATADIR', datadir)
--cdata.set_quoted('SYSCONFDIR', confdir)
--cdata.set_quoted('LOCALEDIR', localedir)
--cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
--
- # Handle i18n on the .desktop file
- # Originally stolem from TingPing:
- # https://github.com/vinszent/gnome-twitch/blob/master/data/meson.build
-@@ -111,23 +106,10 @@ cdata.set_quoted('MODULEDIR', plugin_libdir)
- cdata.set_quoted('MODULE_DATA_DIR', plugin_datadir)
- cdata.set_quoted('RAVEN_PLUGIN_LIBDIR', raven_plugin_libdir)
- cdata.set_quoted('RAVEN_PLUGIN_DATADIR', raven_plugin_datadir)
--
--if prefix == '/usr' or prefix == '/usr/local'
--    cdata.set('HAS_SECONDARY_PLUGIN_DIRS', true)
--
--    if prefix == '/usr'
--        secondary_libdir_root = join_paths(prefix, 'local', get_option('libdir'), meson.project_name())
--        secondary_datadir_root = join_paths(prefix, 'local', get_option('datadir'), meson.project_name())
--    else
--        secondary_libdir_root = join_paths('/usr', get_option('libdir'), meson.project_name())
--        secondary_datadir_root = join_paths('/usr', get_option('datadir'), meson.project_name())
--    endif
--
--    cdata.set_quoted('MODULEDIR_SECONDARY', join_paths(secondary_libdir_root, 'plugins'))
--    cdata.set_quoted('MODULE_DATA_DIR_SECONDARY', join_paths(secondary_datadir_root, 'plugins'))
--    cdata.set_quoted('RAVEN_PLUGIN_LIBDIR_SECONDARY', join_paths(secondary_libdir_root, 'raven-plugins'))
--    cdata.set_quoted('RAVEN_PLUGIN_DATADIR_SECONDARY', join_paths(secondary_datadir_root, 'raven-plugins'))
--endif
-+cdata.set_quoted('DATADIR', datadir)
-+cdata.set_quoted('SYSCONFDIR', confdir)
-+cdata.set_quoted('LOCALEDIR', localedir)
-+cdata.set_quoted('PACKAGE_URL', 'https://buddiesofbudgie.org')
+ 	/* System path */
+-	peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY, BUDGIE_MODULE_DATA_DIRECTORY);
++	const gchar* libdir = NULL;
++	const gchar* datadir = NULL;
++	libdir = g_getenv("BUDGIE_PLUGIN_LIBDIR");
++	if (libdir != NULL) {
++		g_debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
++	} else {
++		g_debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", BUDGIE_MODULE_DIRECTORY);
++		libdir = BUDGIE_MODULE_DIRECTORY;
++	}
  
- with_bluetooth = get_option('with-bluetooth')
- if with_bluetooth == true
-diff --git a/src/config/budgie-config.c b/src/config/budgie-config.c
-index 3ffe3632..da53e054 100644
---- a/src/config/budgie-config.c
-+++ b/src/config/budgie-config.c
-@@ -11,7 +11,6 @@
+-	if (BUDGIE_HAS_SECONDARY_PLUGIN_DIRS) {
+-		peas_engine_add_search_path(self->engine, BUDGIE_MODULE_DIRECTORY_SECONDARY, BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY);
++	datadir = g_getenv("BUDGIE_PLUGIN_DATADIR");
++	if (datadir != NULL) {
++		g_debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
++	} else {
++		g_debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", BUDGIE_MODULE_DATA_DIRECTORY);
++		datadir = BUDGIE_MODULE_DATA_DIRECTORY;
+ 	}
  
- #ifndef CONFIG_H_INCLUDED
- #include "config.h"
--#include <stdbool.h>
- #include <stddef.h>
- 
- /**
-@@ -22,20 +21,6 @@ const char* BUDGIE_MODULE_DATA_DIRECTORY = MODULE_DATA_DIR;
- const char* BUDGIE_RAVEN_PLUGIN_LIBDIR = RAVEN_PLUGIN_LIBDIR;
- const char* BUDGIE_RAVEN_PLUGIN_DATADIR = RAVEN_PLUGIN_DATADIR;
- 
--#ifdef HAS_SECONDARY_PLUGIN_DIRS
--const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = true;
--const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = MODULEDIR_SECONDARY;
--const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = MODULE_DATA_DIR_SECONDARY;
--const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = RAVEN_PLUGIN_LIBDIR_SECONDARY;
--const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = RAVEN_PLUGIN_DATADIR_SECONDARY;
--#else
--const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS = false;
--const char* BUDGIE_MODULE_DIRECTORY_SECONDARY = NULL;
--const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY = NULL;
--const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY = NULL;
--const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY = NULL;
--#endif
--
- const char* BUDGIE_DATADIR = DATADIR;
- const char* BUDGIE_VERSION = PACKAGE_VERSION;
- const char* BUDGIE_WEBSITE = PACKAGE_URL;
-diff --git a/src/config/budgie-config.h b/src/config/budgie-config.h
-index b7581203..11df4347 100644
---- a/src/config/budgie-config.h
-+++ b/src/config/budgie-config.h
-@@ -12,7 +12,6 @@
- #ifndef _BUDGIE_CONFIG_H_
- #define _BUDGIE_CONFIG_H_
- 
--#include <stdbool.h>
- #include <stddef.h>
- 
- /* i.e. /usr/lib/budgie-desktop */
-@@ -27,12 +26,6 @@ extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR;
- /* i.e. /usr/share/budgie-desktop/raven-plugins */
- extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR;
- 
--extern const bool BUDGIE_HAS_SECONDARY_PLUGIN_DIRS;
--extern const char* BUDGIE_MODULE_DIRECTORY_SECONDARY;
--extern const char* BUDGIE_MODULE_DATA_DIRECTORY_SECONDARY;
--extern const char* BUDGIE_RAVEN_PLUGIN_LIBDIR_SECONDARY;
--extern const char* BUDGIE_RAVEN_PLUGIN_DATADIR_SECONDARY;
--
- /* i.e. /usr/share/ */
- extern const char* BUDGIE_DATADIR;
- 
-diff --git a/src/config/budgie-config.vapi b/src/config/budgie-config.vapi
-index 5eb445d1..7d27e348 100644
---- a/src/config/budgie-config.vapi
-+++ b/src/config/budgie-config.vapi
-@@ -22,21 +22,6 @@ namespace Budgie {
- 	[CCode (cheader_filename="budgie-config.h")]
- 	public extern const string RAVEN_PLUGIN_DATADIR;
- 
--	[CCode (cheader_filename="budgie-config.h")]
--	public extern const bool HAS_SECONDARY_PLUGIN_DIRS;
--
--	[CCode (cheader_filename="budgie-config.h")]
--	public extern const string? MODULE_DIRECTORY_SECONDARY;
--
--	[CCode (cheader_filename="budgie-config.h")]
--    public extern const string? MODULE_DATA_DIRECTORY_SECONDARY;
--
--	[CCode (cheader_filename="budgie-config.h")]
--	public extern const string? RAVEN_PLUGIN_LIBDIR_SECONDARY;
--
--	[CCode (cheader_filename="budgie-config.h")]
--	public extern const string? RAVEN_PLUGIN_DATADIR_SECONDARY;
--
-     [CCode (cheader_filename="budgie-config.h")]
-     public extern const string DATADIR;
- 
-diff --git a/src/panel/plugin_manager.vala b/src/panel/plugin_manager.vala
-index f4f2e4da..3dfee49a 100644
---- a/src/panel/plugin_manager.vala
-+++ b/src/panel/plugin_manager.vala
-@@ -40,13 +40,26 @@ namespace Budgie {
- 			}
- 
- 			/* System path */
--			var dir = Environment.get_user_data_dir();
--			engine.add_search_path(Budgie.MODULE_DIRECTORY, Budgie.MODULE_DATA_DIRECTORY);
--			if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
--				engine.add_search_path(Budgie.MODULE_DIRECTORY_SECONDARY, Budgie.MODULE_DATA_DIRECTORY_SECONDARY);
-+			var libdir = Environment.get_variable("BUDGIE_PLUGIN_LIBDIR");
-+			if (libdir != null) {
-+				debug("BUDGIE_PLUGIN_LIBDIR is set to %s", libdir);
-+			} else {
-+				debug("BUDGIE_PLUGIN_LIBDIR is unset, defaulting to %s", Budgie.MODULE_DIRECTORY);
-+				libdir = Budgie.MODULE_DIRECTORY;
-+ 			}
++	peas_engine_add_search_path(self->engine, libdir, datadir);
 +
-+			var datadir = Environment.get_variable("BUDGIE_PLUGIN_DATADIR");
-+			if (datadir != null) {
-+				debug("BUDGIE_PLUGIN_DATADIR is set to %s", datadir);
-+			} else {
-+				debug("BUDGIE_PLUGIN_DATADIR is unset, defaulting to %s", Budgie.MODULE_DATA_DIRECTORY);
-+				datadir = Budgie.MODULE_DATA_DIRECTORY;
- 			}
- 
-+			engine.add_search_path(libdir, datadir);
-+
- 			/* User path */
-+			var dir = Environment.get_user_data_dir();
- 			var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "plugins");
- 			var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "data");
- 			engine.add_search_path(user_mod, hdata);
+ 	/* User path */
+ 	user_data_dir = g_get_user_data_dir();
+ 	user_mod_dir = g_build_path(G_DIR_SEPARATOR_S, user_data_dir, "budgie-desktop", "plugins", NULL);
 diff --git a/src/raven/plugin_manager.vala b/src/raven/plugin_manager.vala
-index 01f32553..2826b7e5 100644
+index 1ff139c9a..809b9b82a 100644
 --- a/src/raven/plugin_manager.vala
 +++ b/src/raven/plugin_manager.vala
-@@ -51,13 +51,26 @@ namespace Budgie {
- 			}
+@@ -51,11 +51,24 @@ namespace Budgie {
  
  			/* System path */
--			var dir = Environment.get_user_data_dir();
+ 			var dir = Environment.get_user_data_dir();
 -			engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR, Budgie.RAVEN_PLUGIN_DATADIR);
 -			if (Budgie.HAS_SECONDARY_PLUGIN_DIRS) {
 -				engine.add_search_path(Budgie.RAVEN_PLUGIN_LIBDIR_SECONDARY, Budgie.RAVEN_PLUGIN_DATADIR_SECONDARY);
@@ -192,7 +62,5 @@ index 01f32553..2826b7e5 100644
 +			engine.add_search_path(libdir, datadir);
 +
  			/* User path */
-+			var dir = Environment.get_user_data_dir();
  			var user_mod = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-plugins");
  			var hdata = Path.build_path(Path.DIR_SEPARATOR_S, dir, "budgie-desktop", "raven-data");
- 			engine.add_search_path(user_mod, hdata);
diff --git a/pkgs/by-name/bu/budgie-media-player-applet/package.nix b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
index b0228b8c9ae4..9e2f0419ae0c 100644
--- a/pkgs/by-name/bu/budgie-media-player-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-media-player-applet/package.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace meson.build --replace-fail "/usr" "$out"
+
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace budgie-media-player-applet.plugin.in \
+      --replace-fail "Loader=@PYTHON@" "Loader=python"
   '';
 
   postFixup = ''
diff --git a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
index b4bb9cb2ae23..14ca2c0c4188 100644
--- a/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
+++ b/pkgs/by-name/bu/budgie-systemmonitor-applet/package.nix
@@ -7,7 +7,7 @@
   gtk3,
   libgee,
   libgtop,
-  libpeas,
+  libpeas2,
   meson,
   ninja,
   nix-update-script,
@@ -45,9 +45,15 @@ stdenv.mkDerivation (finalAttrs: {
     gtk3
     libgee
     libgtop
-    libpeas
+    libpeas2
   ];
 
+  postPatch = ''
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace meson.build \
+      --replace-fail "dependency('libpeas-1.0', version: '>= 1.8.0')" "dependency('libpeas-2')"
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
index 8a90ba6725ed..4c398702469d 100644
--- a/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
+++ b/pkgs/by-name/bu/budgie-user-indicator-redux/package.nix
@@ -7,7 +7,7 @@
   gtk3,
   intltool,
   libgee,
-  libpeas,
+  libpeas2,
   meson,
   ninja,
   nix-update-script,
@@ -40,10 +40,16 @@ stdenv.mkDerivation (finalAttrs: {
     budgie-desktop
     gtk3
     libgee
-    libpeas
+    libpeas2
     sassc
   ];
 
+  postPatch = ''
+    # https://github.com/BuddiesOfBudgie/budgie-desktop/issues/749
+    substituteInPlace meson.build \
+      --replace-fail "dependency('libpeas-1.0', version: '>= 1.26.0')" "dependency('libpeas-2')"
+  '';
+
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index efa965fd1ed4..4a4e4cc2c31b 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "buf";
-  version = "1.58.0";
+  version = "1.59.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RR5SjcMwU3Dcems7ovPlgH6Cp0sQ+Uqsztn6JATBfQo=";
+    hash = "sha256-2EFtRwLbwcgCLxEdZNYATlqFD3BJ+tRKscFAUBAzQOY=";
   };
 
-  vendorHash = "sha256-5n4+wIvefYkrvkYQKw++GuWnsewLXEZYC0w40Lh9N6g=";
+  vendorHash = "sha256-o6aE+qdsWGURJraebfhbVEwx6MJYs9Fw8B5FcoKHNgo=";
 
   patches = [
     # Skip a test that requires networking to be available to work.
diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
index e66dbc9a3e0a..e5bf43638479 100644
--- a/pkgs/by-name/bu/buffrs/package.nix
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "buffrs";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "helsing-ai";
     repo = "buffrs";
     tag = "v${version}";
-    hash = "sha256-VHzPOFOkwz3QlDt25gBbishM4ujtEPFjA21WuiNVw00=";
+    hash = "sha256-c1QMPFVc9k3hTK7Y1aimXbJ4IKBNmAt9aYtiUIchG8E=";
   };
 
-  cargoHash = "sha256-/cdBt23VSmwN/C2XdHeeRjUSqLWiEheqVl+hfEDKIP0=";
+  cargoHash = "sha256-6592v/ednZDaKfMcaMCAmJOh4ZhZdBwIpEZiqsbF4hU=";
 
   # Disabling tests meant to work over the network, as they will fail
   # inside the builder.
diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix
index 9e07c3591857..37f670b19e8c 100644
--- a/pkgs/by-name/bu/buffybox/package.nix
+++ b/pkgs/by-name/bu/buffybox/package.nix
@@ -1,6 +1,5 @@
 {
   fetchFromGitLab,
-  fetchpatch2,
   inih,
   lib,
   libdrm,
@@ -16,30 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffybox";
-  version = "3.3.0";
+  version = "3.4.2-unstable-2025-10-25";
+  # 3.4.2 would be preferred but there are 3 commits past 3.4.2 that are really nice to have
 
   src = fetchFromGitLab {
     domain = "gitlab.postmarketos.org";
     owner = "postmarketOS";
     repo = "buffybox";
     fetchSubmodules = true; # to use its vendored lvgl
-    rev = "dce41a6f07a2b63c3136409b7bcd0078299fadf9";
-    hash = "sha256-n5RQg7kGS+lg7sRe5Defl3nDEha0vhc/FbwywD5wBsg=";
+    rev = "437ff2cbd7fd35ba6ca2d46624e7fcf8c5f3f954";
+    hash = "sha256-1GRsntNc3byHmZKLG/ZRXvbo96DjmLrA0bVYtMAlKsQ=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # This fixes a bug that might annoy you if you use something like PKCS#11
-      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/d8214b522a3cc72cd4639a1dd114103a02e9218c.patch";
-      hash = "sha256-WxKuioJ1Fo5ARRYF/R4yULDVB4pq11phljzVGdWTV6s=";
-    })
-    (fetchpatch2 {
-      # Fixes up UB
-      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/4e13c312241420cbb3e5cc7d4f0dd3e5d17449be.patch";
-      hash = "sha256-7yX6gGsptwijx+ZedSJWJKhwaoBVpxIbGK+ZiMLsIhc=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];
diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index 42df5efb43ba..7e920fcc4b65 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-h9XkvgYa7m7LxeUuQ8aFFxNcTULfjQ5gR7vRN9Y89rI=";
+    hash = "sha256-yW75G96Ca27FB2EzAt77640aDVWYZEFA5NcAnZMPOLg=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/bu/bulletty/package.nix b/pkgs/by-name/bu/bulletty/package.nix
index 653592f22499..9251f04ed060 100644
--- a/pkgs/by-name/bu/bulletty/package.nix
+++ b/pkgs/by-name/bu/bulletty/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bulletty";
-  version = "0.1.8";
+  version = "0.1.9";
 
   src = fetchFromGitHub {
     owner = "CrociDB";
     repo = "bulletty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MVXz3ozAL26EYWAsarFbRR0cmAtaRpxcQROsLye56yE=";
+    hash = "sha256-fNMUdZ5WoDUVShiKl4pitkcOlHYTKXUVfiAHVqpdWmo=";
   };
 
-  cargoHash = "sha256-Q9h9VUTeFvP6pkQKj7y2pKVpoeg1hyoAbXMhAaO5zh8=";
+  cargoHash = "sha256-ZdJtFPEjPDQSUEtdPv3uIH44wa6mGPzm/KRp5VTOb1Y=";
 
   # perl is required for bulletty package build for openssl
   nativeBuildInputs = with pkgs; [
diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 971ef0f69307..9311c7f83886 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -17,7 +17,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.3.1";
   pname = "bun";
 
   src =
@@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-hYSOP5ZIHvyr51pQD9O5S5u5VoaretCjiSl2x74VA2o=";
+        hash = "sha256-ronylWETMwdRWqPdpdXv3R6dJod+yFtPGAABNDGqmO0=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        hash = "sha256-aLfc2Go159XhVrN+TO9LSrbWs3/SF5VwwOgV8TiQ/r0=";
+        hash = "sha256-ZWZqGEOeiR5XUbZmED/lkahRnxG2bsS9hlTFUV1P/4o=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-RWGVArQmNX03XFnxhgbqTKLC1ZQoyG9EKZUKHP7oahU=";
+        hash = "sha256-pILjoY8BpW13NvpuQXjbNdoeVr3cgjJa10jhXKAdigs=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        hash = "sha256-YMOdkri9CQYnUkyYswEvDAjciQJM/ap8nJjLX9Q1k3Y=";
+        hash = "sha256-QAgkyCv8wIVDZbytoRz1PXOE7LHiw9oOLAosalJ9Vik=";
       };
     };
     updateScript = writeShellScript "update-bun" ''
diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix
index 1b6ac8a1cff1..07f1b71d99dc 100644
--- a/pkgs/by-name/bu/bundler/package.nix
+++ b/pkgs/by-name/bu/bundler/package.nix
@@ -13,8 +13,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.7.1";
-  source.sha256 = "sha256-CtWgAqh5d2sqmL5lL1V6yHMb4zU2EtY/pO8bJwbcHgs=";
+  version = "2.7.2";
+  source.sha256 = "sha256-Heyvni4ay5G2WGopJcjz9tojNKgnMaYv8t7RuDwoOHE=";
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index 926134c09716..8d250a144294 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2025.9.5";
+  version = "2025.10.1";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-L1izUW+VUyL+oRW5mgNXt5FZRfsStd2mK/WmkBvSkis=";
+        hash = "sha256-aLP8jVHuKmp4yzcd1KsgidAhWUxoJo0beGwq/6I4n4A=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-Mhzp3w229TzVCpoVj6gXRsfurFtrkdK2/6pfAi3nrh8=";
+        hash = "sha256-HiYdJrnTg0HkCt+lXKkhfGawp/NZQmhH4sGytlpiLU8=";
       };
 
   src = fetchurl {
diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix
index d42e48bf131f..4951b32c5115 100644
--- a/pkgs/by-name/bu/bustools/package.nix
+++ b/pkgs/by-name/bu/bustools/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8.12)' \
+      'cmake_minimum_required(VERSION 3.5)'
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = bustools;
     command = "bustools version";
diff --git a/pkgs/by-name/c-/c-periphery/package.nix b/pkgs/by-name/c-/c-periphery/package.nix
index 944b87401682..b18ae01f640a 100644
--- a/pkgs/by-name/c-/c-periphery/package.nix
+++ b/pkgs/by-name/c-/c-periphery/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "c-periphery";
-  version = "2.4.3";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "vsergeev";
     repo = "c-periphery";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-azqGw7KW6/UrQ4eUPkeH8d6l6sSbotNMAAbn5pNMOB8=";
+    hash = "sha256-lGBDf10kolwPrURwUEtiSCJYdyxZqJN/B1SnY08Ytns=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index e5d5c2952b49..23e21acdc82c 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "c2patool";
-  version = "0.23.4";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2pa-rs";
     tag = "c2patool-v${finalAttrs.version}";
-    hash = "sha256-6y7IKuYnwSSrfe44U+fNU8Q9YdHOq2Btvie6ZqTIBRw=";
+    hash = "sha256-rjw2gej36l5s4xvUp1XKxyzhWNff2wswOYrsIP78VZ0=";
   };
 
-  cargoHash = "sha256-JnbvX/EkvatP/xlY+cTtRjVV+Rz2jjFIsqIvOFXqB5Q=";
+  cargoHash = "sha256-ZRmlTys0lX5FkgYBD81bdeHbX6viZW4hfFqpcq+S4WY=";
 
   # use the non-vendored openssl
   env.OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/c9/c99sh/package.nix b/pkgs/by-name/c9/c99sh/package.nix
new file mode 100644
index 000000000000..ad578c879673
--- /dev/null
+++ b/pkgs/by-name/c9/c99sh/package.nix
@@ -0,0 +1,88 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  patsh,
+  bashNonInteractive,
+  pkg-config,
+  gcc,
+  gsl,
+  targetPackages,
+  cc ? targetPackages.stdenv.cc,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "c99sh";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "RhysU";
+    repo = "c99sh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nLq6J1PRROTOSvScyyXUqwtj10MEfQCHC8YYNd+JxkA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ patsh ];
+
+  # Used by `patsh`
+  buildInputs = [
+    bashNonInteractive
+    pkg-config
+  ];
+
+  postPatch = ''
+    patsh c99sh \
+      --force --store-dir ${builtins.storeDir} --path "$HOST_PATH"
+
+    patchShebangs .
+
+    substituteInPlace c99sh \
+      --replace-fail -cc -${lib.getExe' cc "cc"} \
+      --replace-fail -c++ -${lib.getExe' cc "c++"}
+  '';
+
+  # FIXME: `patchShebangs` doesn't function in cross-builds
+  doCheck = !stdenvNoCC.hostPlatform.isDarwin;
+
+  nativeCheckInputs = [
+    pkg-config
+    gcc
+  ];
+
+  checkInputs = [ gsl ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    ./tests
+
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir --parents $out/bin
+    cp --no-dereference c*sh $out/bin # c11sh and cxxsh
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Shebang-friendly script for \"interpreting\" C files";
+    longDescription = ''
+      Shebang-friendly script for \"interpreting\" single C99, C11,
+      and C++ files, including rcfile support
+    '';
+    homepage = "https://github.com/RhysU/c99sh";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "c99sh";
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/ca/cabin/package.nix b/pkgs/by-name/ca/cabin/package.nix
index 87b866fe2d41..dc4c872944e5 100644
--- a/pkgs/by-name/ca/cabin/package.nix
+++ b/pkgs/by-name/ca/cabin/package.nix
@@ -40,7 +40,7 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "http://www.impallari.com/cabin";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/ca/cadical/package.nix b/pkgs/by-name/ca/cadical/package.nix
index c25118a876dc..dc1e4dd47166 100644
--- a/pkgs/by-name/ca/cadical/package.nix
+++ b/pkgs/by-name/ca/cadical/package.nix
@@ -84,6 +84,8 @@ stdenv.mkDerivation rec {
     install -Dm0755 build/mobical "$out/bin/mobical"
     install -Dm0644 src/ccadical.h "$dev/include/ccadical.h"
     install -Dm0644 src/cadical.hpp "$dev/include/cadical.hpp"
+    install -Dm0644 src/cadical.hpp "$dev/include/cadical/cadical.hpp"
+    install -Dm0644 src/tracer.hpp "$dev/include/cadical/tracer.hpp"
     install -Dm0644 build/libcadical.a "$lib/lib/libcadical.a"
     mkdir -p "$out/share/doc/${pname}/"
     install -Dm0755 {LICEN?E,README*,VERSION} "$out/share/doc/${pname}/"
diff --git a/pkgs/by-name/ca/caesura/package.nix b/pkgs/by-name/ca/caesura/package.nix
index 812674c5767b..bb1ed2b88df5 100644
--- a/pkgs/by-name/ca/caesura/package.nix
+++ b/pkgs/by-name/ca/caesura/package.nix
@@ -30,16 +30,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "caesura";
-  version = "0.25.2";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "RogueOneEcho";
     repo = "caesura";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rpaOFmD/0/c5F6TIS7vGn7G3+rLOoBZKMW/HuzroUxM=";
+    hash = "sha256-atB7IrG9KchFOc1EXChlsqlrZs7mQ9tiXmdw1SptLI0=";
   };
 
-  cargoHash = "sha256-agdhYEhhw3gMdZmYiQZVeLARkMsYQ/AWLTrpiaH0mtA=";
+  cargoHash = "sha256-Iz/RYmuCc5XuyktYIN/zDrbyPpRU2eps0yqExPu+5J8=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix
index 727afc713046..fe6a3cb29f06 100644
--- a/pkgs/by-name/ca/cairo/package.nix
+++ b/pkgs/by-name/ca/cairo/package.nix
@@ -100,8 +100,10 @@ stdenv.mkDerivation (
             linux = "true";
             freebsd = "true";
             netbsd = "false";
+            windows = "false";
           }
-          .${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unknown value for ipc_rmid_deferred_release")
+          .${stdenv.hostPlatform.parsed.kernel.name}
+            or (throw "Unknown value for ipc_rmid_deferred_release on ${stdenv.hostPlatform.parsed.kernel.name}")
         }
       ''}"
     ];
diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
index 85e259d42d11..261a03cc9a8c 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
@@ -797,7 +797,16 @@ def run():
             "nixos-install",
             "--no-root-passwd",
             "--root",
-            root_mount_point
+            root_mount_point,
+            # Nix requires its build directory to have no
+            # world-writable parent directories. The chroot store that
+            # nixos-install uses will use the state dir in the chroot
+            # for the build-dir, but the chroot is under /tmp, which
+            # is writable. It doesn't have to be in the chroot though,
+            # so we can just realign it with the host state dir.
+            "--option",
+            "build-dir",
+            "/nix/var/nix/builds",
         ]
     )
 
diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 28652699dad5..157633ae5fa7 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -38,27 +38,31 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "8.12.0";
+  version = "8.13.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ZY7FXpJCWJ3495SPW3Px/oNt5CkffMzmCb8Qt12dluw=";
+    hash = "sha256-31CFoVkXXks1NdePNOvFklfJFT36kmLL4vsgDnTaXyQ=";
   };
 
-  patches = [
-    #  allow for plugin update check, but no calibre version check
-    (fetchpatch {
-      name = "0001-only-plugin-update.patch";
-      url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch";
-      hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8=";
-    })
-    (fetchpatch {
-      name = "0007-Hardening-Qt-code.patch";
-      url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
-      hash = "sha256-V/ZUTH0l4QSfM0dHrgLGdJjF/CCQ0S/fnCP/ZKD563U=";
-    })
-  ]
-  ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+  patches =
+    let
+      debian-source = "ds+_0.10.5-1";
+    in
+    [
+      #  allow for plugin update check, but no calibre version check
+      (fetchpatch {
+        name = "0001-only-plugin-update.patch";
+        url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${finalAttrs.version}+${debian-source}/debian/patches/0001-only-plugin-update.patch";
+        hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8=";
+      })
+      (fetchpatch {
+        name = "0007-Hardening-Qt-code.patch";
+        url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${finalAttrs.version}+${debian-source}/debian/patches/hardening/0007-Hardening-Qt-code.patch";
+        hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U=";
+      })
+    ]
+    ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
   prePatch = ''
     sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \
@@ -138,14 +142,12 @@ stdenv.mkDerivation (finalAttrs: {
         # the following are distributed with calibre, but we use upstream instead
         odfpy
       ]
-      ++
-        lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms)
-          [
-            # much of calibre's functionality is usable without a web
-            # browser, so we enable building on platforms which qtwebengine
-            # does not support by simply omitting qtwebengine.
-            pyqt6-webengine
-          ]
+      ++ lib.optionals (lib.lists.elem stdenv.hostPlatform.system pyqt6-webengine.meta.platforms) [
+        # much of calibre's functionality is usable without a web
+        # browser, so we enable building on platforms which qtwebengine
+        # does not support by simply omitting qtwebengine.
+        pyqt6-webengine
+      ]
       ++ lib.optional unrarSupport unrardll
     ))
     piper-tts
@@ -217,29 +219,45 @@ stdenv.mkDerivation (finalAttrs: {
   installCheckInputs = with python3Packages; [
     psutil
   ];
-  installCheckPhase = ''
-    runHook preInstallCheck
+  installCheckPhase =
+    let
+      excludedTestNames = [
+        "test_7z" # we don't include 7z support
+        "test_zstd" # we don't include zstd support
+        "test_qt" # we don't include svg or webp support
+        "test_import_of_all_python_modules" # explores actual file paths, gets confused
+        "test_websocket_basic" # flaky
 
-    ETN='--exclude-test-name'
-    EXCLUDED_FLAGS=(
-      $ETN 'test_7z'  # we don't include 7z support
-      $ETN 'test_zstd'  # we don't include zstd support
-      $ETN 'test_qt'  # we don't include svg or webp support
-      $ETN 'test_import_of_all_python_modules'  # explores actual file paths, gets confused
-      $ETN 'test_websocket_basic'  # flakey
-      # hangs with cuda enabled, also:
-      # eglInitialize: Failed to get system egl display
-      # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
-      $ETN 'test_recipe_browser_webengine'
+        # hangs with cuda enabled, also:
+        # eglInitialize: Failed to get system egl display
+        # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
+        "test_recipe_browser_webengine"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+        # https://github.com/microsoft/onnxruntime/issues/10038
+        "test_piper"
 
-      ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038
-      ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}
-    )
+        # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
+        #  what():  /build/source/include/onnxruntime/core/common/logging/logging.h:371
+        # static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger()
+        # Attempt to use DefaultLogger but none has been registered.
+        "test_plugins"
+      ]
+      ++ lib.optionals (!unrarSupport) [
+        "test_unrar"
+      ];
 
-    python setup.py test ''${EXCLUDED_FLAGS[@]}
+      testFlags = lib.concatStringsSep " " (
+        lib.map (testName: "--exclude-test-name ${testName}") excludedTestNames
+      );
+    in
+    ''
+      runHook preInstallCheck
 
-    runHook postInstallCheck
-  '';
+      python setup.py test ${testFlags}
+
+      runHook postInstallCheck
+    '';
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--url=https://github.com/kovidgoyal/calibre" ];
diff --git a/pkgs/by-name/ca/caligula/package.nix b/pkgs/by-name/ca/caligula/package.nix
index 79412e36f1f9..4c4b320a8181 100644
--- a/pkgs/by-name/ca/caligula/package.nix
+++ b/pkgs/by-name/ca/caligula/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "caligula";
-  version = "0.4.8";
+  version = "0.4.10";
 
   src = fetchFromGitHub {
     owner = "ifd3f";
     repo = "caligula";
     rev = "v${version}";
-    hash = "sha256-VwbVDfiGiVFefsxoQ1FBDHyYLp0sOKnnVZctklyO+Tw=";
+    hash = "sha256-oaSt6wzMzaGHPyuJ5NVcAJLblHQcHJA5a7o2wkJgZkU=";
   };
 
-  cargoHash = "sha256-kTVmwfUNDibYGsHGQvtZiBiHyyotkHMhTY/dvaATy8k=";
+  cargoHash = "sha256-B09aKzNNhgXKg3PCYmlMz3/oOeeh1FQAL7+tywg/81Q=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/ca/calligraphy/package.nix b/pkgs/by-name/ca/calligraphy/package.nix
index 815923e84192..d67e8edcdfd3 100644
--- a/pkgs/by-name/ca/calligraphy/package.nix
+++ b/pkgs/by-name/ca/calligraphy/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "calligraphy";
     maintainers = with lib.maintainers; [
       aleksana
-      awwpotato
+      da157
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix
index 9d7f988d7009..1e6be24d57a3 100644
--- a/pkgs/by-name/ca/cameractrls/package.nix
+++ b/pkgs/by-name/ca/cameractrls/package.nix
@@ -40,14 +40,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "cameractrls";
-  version = "0.6.7";
+  version = "0.6.8";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "soyersoyer";
     repo = "cameractrls";
     rev = "v${version}";
-    hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw=";
+    hash = "sha256-kc5/HbtDZHJHR2loo8Zs555GRW6ynSdBLr3Uowo+OEA=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix
index 25ac7d8603a8..9ea760afb4e4 100644
--- a/pkgs/by-name/ca/candy-icons/package.nix
+++ b/pkgs/by-name/ca/candy-icons/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "candy-icons";
-  version = "0-unstable-2025-09-09";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "EliverLara";
     repo = "candy-icons";
-    rev = "40cbbc8821db020e2668c309cd5a7bbfabd0be06";
-    hash = "sha256-wJ86TUjiVYT64QunDk85Jji5vo0Os+D9t/fsyKRM+P0=";
+    rev = "1be42f22a36813b8b992f37c1ce56d886a4f97cf";
+    hash = "sha256-suQ2yvKsMbm0a4Qg9D3THMa1gCpZSlOF0plD0H8vYy8=";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/by-name/ca/caneda/package.nix b/pkgs/by-name/ca/caneda/package.nix
new file mode 100644
index 000000000000..4e157aa9ee5d
--- /dev/null
+++ b/pkgs/by-name/ca/caneda/package.nix
@@ -0,0 +1,49 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  libsForQt5,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "caneda";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "Caneda";
+    repo = "Caneda";
+    rev = finalAttrs.version;
+    sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/c/caneda/0.4.0-2/debian/patches/fix_cmake_minimum_version.patch";
+      hash = "sha256-MRkCA0GWcI6yEo4Ej+F67k0iNG1JHeLNhH0Rbz1QWoA=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtsvg
+    libsForQt5.qwt6_1
+  ];
+
+  meta = {
+    description = "Open source EDA software focused on easy of use and portability";
+    changelog = "https://github.com/Caneda/Caneda/releases/tag/${finalAttrs.version}";
+    mainProgram = "caneda";
+    homepage = "http://caneda.org";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ magicquark ];
+    platforms = with lib.platforms; linux;
+  };
+})
diff --git a/pkgs/by-name/ca/canokey-usbip/package.nix b/pkgs/by-name/ca/canokey-usbip/package.nix
index ee1b53bc1222..4fde140277b4 100644
--- a/pkgs/by-name/ca/canokey-usbip/package.nix
+++ b/pkgs/by-name/ca/canokey-usbip/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -i 's/COMMAND git describe.*\(>>.*\)/COMMAND echo ${finalAttrs.src.rev} \1/' canokey-core/CMakeLists.txt
+
+    # CMake 2.8.12 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace canokey-core/canokey-crypto/mbedtls/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.12)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -31,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     NIX_CFLAGS_COMPILE = toString [
       "-Wno-error=incompatible-pointer-types"
+      (lib.optionalString stdenv.cc.isClang "-Wno-error=documentation")
     ];
   };
 
diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index 52305fa26472..7f64c6c1d881 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   qt6,
   perl,
+  fetchpatch2,
 
   # Cantata doesn't build with cdparanoia enabled so we disable that
   # default for now until I (or someone else) figure it out.
@@ -31,7 +32,7 @@
   libmtp,
   withOnlineServices ? true,
   withDevices ? true,
-  udisks2,
+  udisks,
   withDynamic ? true,
   withHttpServer ? true,
   withLibVlc ? true,
@@ -155,7 +156,7 @@ let
     {
       names = [ "UDISKS2" ];
       enable = withUdisks;
-      pkgs = [ udisks2 ];
+      pkgs = [ udisks ];
     }
   ];
 
@@ -176,6 +177,18 @@ stdenv.mkDerivation (finalAttrs: {
     # patchShebangs the playlists scripts, making that unnecessary (perl will
     # always be available because it's a dependency)
     ./dont-check-for-perl-in-PATH.diff
+
+    # remove following patches in next release
+    (fetchpatch2 {
+      name = "fix-build-with-qt-610-qfile-open.patch";
+      url = "https://github.com/nullobsi/cantata/pull/89.patch";
+      hash = "sha256-c7hdecX2oo9jTlLc6zd7LVjgZj4w89zN+eEw7ol/hmI=";
+    })
+    (fetchpatch2 {
+      name = "fix-build-with-qt-610-invalidateFilter-deprecated.patch";
+      url = "https://github.com/nullobsi/cantata/pull/90.patch";
+      hash = "sha256-dMxbC/p5mD/TQZEXORbvNON7Zzbvq0khaIR89lU5cO4=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix
index 45dd91b43b7d..a8204ea3f101 100644
--- a/pkgs/by-name/ca/capnproto-rust/package.nix
+++ b/pkgs/by-name/ca/capnproto-rust/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "capnproto-rust";
-  version = "0.21.4";
+  version = "0.23.2";
 
   src = fetchCrate {
     crateName = "capnpc";
     inherit version;
-    hash = "sha256-pJF0S6mRxPjpwa367eOUgc7GBeKgUwux1GgUIJE8JuI=";
+    hash = "sha256-dmLR1jMH90axlylkA3m48FK367c67o4CgIc+M6gKz0o=";
   };
 
-  cargoHash = "sha256-nPDfBpY7WtNr1St6HAymWBLho5n0UXibqDjVA1vXeNg=";
+  cargoHash = "sha256-g3/SpeqVtNCu35jj7apAg64/R5R/m1Z2jbKMARph7jo=";
 
   postInstall = ''
     mkdir -p $out/include/capnp
diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix
index 17d78ba28d9b..a59ef46cfc20 100644
--- a/pkgs/by-name/ca/caprine/package.nix
+++ b/pkgs/by-name/ca/caprine/package.nix
@@ -90,7 +90,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/sindresorhus/caprine";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      astronaut0212
       khaneliman
     ];
     inherit (electron.meta) platforms;
diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix
index 2e22bd1fb448..374dc58ff5df 100644
--- a/pkgs/by-name/ca/capslock/package.nix
+++ b/pkgs/by-name/ca/capslock/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "capslock";
-  version = "0.2.8";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "capslock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7FMsW51LYEjEXcil6e64tAHaBeDAYRnBBX4E1PjSXtU=";
+    hash = "sha256-ls7+aXEelxKXhittK4orv9xgPKw1pE87yZdoSHBUgK8=";
   };
 
-  vendorHash = "sha256-UOpreQceWgwbQ+Qup4iEStQqJA77uiiupfTUFxNBIcM=";
+  vendorHash = "sha256-2nK+yxgLmrXjt41gYSXvkpZ2glu6PAtO18Nrt1tmup4=";
 
   subPackages = [ "cmd/capslock" ];
 
diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix
index c63246a73824..3ddff2102dc8 100644
--- a/pkgs/by-name/ca/capypdf/package.nix
+++ b/pkgs/by-name/ca/capypdf/package.nix
@@ -11,11 +11,12 @@
   libpng,
   libtiff,
   zlib,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "capypdf";
-  version = "0.17.0";
+  version = "0.18.0";
 
   outputs = [
     "out"
@@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jpakkane";
     repo = "capypdf";
     rev = finalAttrs.version;
-    hash = "sha256-hdutgZhJwUi+wwtYt3+hSiyBImchUtbpVd0RCPWEr0Q=";
+    hash = "sha256-FivwBSpaIpkdKPYk7FuwpcBCYq59XH7SouA47rmGSaQ=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libtiff
     zlib
-  ];
+  ]
+  # error: 'to_chars' is unavailable: introduced in macOS 13.3
+  ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3");
 
   meta = {
     description = "Fully color managed PDF generation library";
diff --git a/pkgs/by-name/ca/carapace/package.nix b/pkgs/by-name/ca/carapace/package.nix
index f1c4a7db2c8d..bb5c46c581e7 100644
--- a/pkgs/by-name/ca/carapace/package.nix
+++ b/pkgs/by-name/ca/carapace/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "carapace";
-  version = "1.5.0";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "carapace-sh";
     repo = "carapace-bin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BMj0bjoqUIT4zVs6CRqeBqfSQ17NNyeE+AAtTTnv4bo=";
+    hash = "sha256-KeIaA+v0jJzyEo6ZE+mwzMM8wjsbtdYipAhzkotRR+o=";
   };
 
-  vendorHash = "sha256-UOqHQPF+5luabuLM95+VR+tsb1+3+MUpaJmjbZqCNvs=";
+  vendorHash = "sha256-bDPCLAkX9AofyzZMz8rV9RgbFlF0GwzVlal2N7you08=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index cb2762589585..ef527579df55 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       evanjs
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "cargo-about";
diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix
index 1b36989bb011..fd8ecb5d28d4 100644
--- a/pkgs/by-name/ca/cargo-all-features/package.nix
+++ b/pkgs/by-name/ca/cargo-all-features/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix
index af23cd400b46..4dd7a3a2dae4 100644
--- a/pkgs/by-name/ca/cargo-audit/package.nix
+++ b/pkgs/by-name/ca/cargo-audit/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       basvandijk
-      figsoda
       jk
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index 2be387f51be6..c81559855a73 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
       mit
       unlicense
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 2802095cff1d..c894974e9a07 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -6,20 +6,21 @@
   bzip2,
   xz,
   zstd,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binstall";
-  version = "1.15.6";
+  version = "1.15.9";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
-    rev = "v${version}";
-    hash = "sha256-TzO7xz58nvuT6r8SN0cUKdW0x1yR1FlpsnGhU67SNOA=";
+    tag = "v${version}";
+    hash = "sha256-v/tilaoDLZDV0VbMTT/DfqSNO4Ezyu3AWGzMftMubqc=";
   };
 
-  cargoHash = "sha256-cYjsSPHcWYobosSlB2tLda3NSGUTxE5DyA4AxAF8C/8=";
+  cargoHash = "sha256-itYqZi1tSWVwqGfNFSBh4/+PoLrQZQTnla4lOCjoX8Q=";
 
   nativeBuildInputs = [
     pkg-config
@@ -57,12 +58,16 @@ rustPlatform.buildRustPackage rec {
     "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "-V";
+
   meta = {
     description = "Tool for installing rust binaries as an alternative to building from source";
     mainProgram = "cargo-binstall";
     homepage = "https://github.com/cargo-bins/cargo-binstall";
     changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index f286cc526ec4..1931d584ce77 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bundle-licenses";
-  version = "4.0.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "cargo-bundle-licenses";
     rev = "v${version}";
-    hash = "sha256-pTxZ9s8ZccylMfEiifYmJuBB+riZ37QJSAMpVuSgLzs=";
+    hash = "sha256-L3hmgDwzL6lLa0LCg/V5QeNK2U1u2dJMO4+t6W1UvxI=";
   };
 
-  cargoHash = "sha256-4zolwQzK6dnFIcS2NwuxYZRS2AGcUGHh+KQzDkI0J6c=";
+  cargoHash = "sha256-HHBFT4u0NPjhKJa3KNg8/AgkgNoFUkMWmioVaXYlD2M=";
 
   meta = with lib; {
     description = "Generate a THIRDPARTY file with all licenses in a cargo project";
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
index 4370667d428a..02a620561354 100644
--- a/pkgs/by-name/ca/cargo-bundle/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix
index de921f429c71..522e1d9b5ee2 100644
--- a/pkgs/by-name/ca/cargo-careful/package.nix
+++ b/pkgs/by-name/ca/cargo-careful/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-clone/package.nix b/pkgs/by-name/ca/cargo-clone/package.nix
index bf423c530b57..bf152c0164b3 100644
--- a/pkgs/by-name/ca/cargo-clone/package.nix
+++ b/pkgs/by-name/ca/cargo-clone/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
       janlikar
     ];
diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix
index ee0b436be25b..8e4fb5c2138e 100644
--- a/pkgs/by-name/ca/cargo-codspeed/package.nix
+++ b/pkgs/by-name/ca/cargo-codspeed/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
       mit
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "cargo-codspeed";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index c964957264d5..237829ae0dcf 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/bytecodealliance/cargo-component";
     changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "cargo-component";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index 22b518fb9157..e03271e5b52c 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 34ffdbf04277..d7764f7b33c2 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
       jk
     ];
diff --git a/pkgs/by-name/ca/cargo-depgraph/package.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix
index 532c43065468..8eaeac653937 100644
--- a/pkgs/by-name/ca/cargo-depgraph/package.nix
+++ b/pkgs/by-name/ca/cargo-depgraph/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/${src.rev}/item/CHANGELOG.md";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix
index 291dbda66c4d..3ef32320070d 100644
--- a/pkgs/by-name/ca/cargo-dephell/package.nix
+++ b/pkgs/by-name/ca/cargo-dephell/package.nix
@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index 13da78be49a6..08e47f46bfba 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index a536a53db570..61bd4e6f3511 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-dist";
-  version = "0.30.0";
+  version = "0.30.2";
 
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
     rev = "v${version}";
-    hash = "sha256-+Nzli2SDzG+CBNSZ5z2mAuucS2a3WS7HqtUJs2JxIbo=";
+    hash = "sha256-1stUmm7rtNB2z2srOzDvQ9QaGsS0CySBOHt118vmJoM=";
   };
 
-  cargoHash = "sha256-QjWBuI3hZkDNqyCNfFpz6qvZUYHEKRQZ4gbZGxkMaiw=";
+  cargoHash = "sha256-Il5PVJHoNdifqUcXxKR+j+Lgga0kIsl7IJp9oGanZ+c=";
 
   nativeBuildInputs = [
     pkg-config
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
       mistydemeo
     ];
diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix
index a4955014c697..2a67b7cc8d5e 100644
--- a/pkgs/by-name/ca/cargo-duplicates/package.nix
+++ b/pkgs/by-name/ca/cargo-duplicates/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Keruspe/cargo-duplicates";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix
index 00cb3e0e06aa..0d9cce570a27 100644
--- a/pkgs/by-name/ca/cargo-edit/package.nix
+++ b/pkgs/by-name/ca/cargo-edit/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
       gerschtli
       jb55
       killercup
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 6ef51fc8b5f6..5aca7c581568 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -2,33 +2,41 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-expand";
-  version = "1.0.117";
+  version = "1.0.118";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
-    tag = version;
-    hash = "sha256-IpqDab4JYZoWvtuEU4DkKimOhgZ/c5WsH58cVj4RzGU=";
+    tag = finalAttrs.version;
+    hash = "sha256-+n4eiwcToXtWMPmvE41kOcZHzgugjekxQkodDagDjhI=";
   };
 
-  cargoHash = "sha256-sAXRA+gStgMDi02yObN7lO2G4vQUeYqmUF09tC7k/Q0=";
+  cargoHash = "sha256-Di7Nnp8qYqpTkKmmUYoKxSkntepG80vVF2AkaN5yW+U=";
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";
-    changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}";
+    changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [
       mit
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       xrelkd
+      defelo
     ];
     mainProgram = "cargo-expand";
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index 74055bd7015d..fe3d6fe8156c 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -78,7 +78,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       turbomack
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix
index 0fc950dec036..b4670705aefe 100644
--- a/pkgs/by-name/ca/cargo-guppy/package.nix
+++ b/pkgs/by-name/ca/cargo-guppy/package.nix
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index 34f41e4ae16c..9f823bb9f775 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -2,14 +2,15 @@
   lib,
   rustPlatform,
   fetchCrate,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-hack";
   version = "0.6.39";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-0+2bgjCgkZA8oYo5jkykB2US+LVVNo1tVk4smxYB6f4=";
   };
 
@@ -18,15 +19,25 @@ rustPlatform.buildRustPackage rec {
   # some necessary files are absent in the crate version
   doCheck = false;
 
+  # versionCheckHook doesn't support multiple arguments yet
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/cargo-hack hack --version | grep -F 'cargo-hack ${finalAttrs.version}'
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo subcommand to provide various options useful for testing and continuous integration";
     mainProgram = "cargo-hack";
     homepage = "https://github.com/taiki-e/cargo-hack";
-    changelog = "https://github.com/taiki-e/cargo-hack/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/taiki-e/cargo-hack/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ defelo ];
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index 8f18dc31b309..a03ee537c969 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -6,54 +6,48 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-hakari";
-  version = "0.9.35";
+  version = "0.9.36";
 
   src = fetchFromGitHub {
     owner = "guppy-rs";
     repo = "guppy";
-    tag = "cargo-hakari-${version}";
-    hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc=";
+    tag = "cargo-hakari-${finalAttrs.version}";
+    hash = "sha256-qEYdJhLt4f3+RZz3/T6/vlQgrQYK6S5dNEmu8QH/wj0=";
   };
 
-  cargoHash = "sha256-yAk0hMB3OEaaIuNqiJtl1K5P19pOGtiyt4cvU+Nb814=";
+  cargoHash = "sha256-NrPfdVAi0QblJKFsHTL0BGQWUnqQEpIJwW3HBVHFZpE=";
 
   cargoBuildFlags = [
     "-p"
     "cargo-hakari"
   ];
-  cargoTestFlags = [
-    "-p"
-    "cargo-hakari"
-  ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Manage workspace-hack packages to speed up builds in large workspaces";
-    mainProgram = "cargo-hakari";
     longDescription = ''
       cargo hakari is a command-line application to manage workspace-hack crates.
       Use it to speed up local cargo build and cargo check commands by 15-95%,
       and cumulatively by 20-25% or more.
     '';
     homepage = "https://crates.io/crates/cargo-hakari";
-    changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md";
+    changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${finalAttrs.version}/tools/cargo-hakari/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       macalinao
       nartsiss
     ];
+    mainProgram = "cargo-hakari";
   };
-}
+})
diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix
index 413863c60ef2..8b3e3fff7c49 100644
--- a/pkgs/by-name/ca/cargo-info/package.nix
+++ b/pkgs/by-name/ca/cargo-info/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index 169220d1d0be..09dcfbd91cd1 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      figsoda
       oxalica
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix
index 39933fc46a34..107adda8b752 100644
--- a/pkgs/by-name/ca/cargo-license/package.nix
+++ b/pkgs/by-name/ca/cargo-license/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ mit ];
     maintainers = with maintainers; [
       basvandijk
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index 38f4982e9d04..9ef4b933eefe 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index 709debde0024..8190fd61baf6 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix
index 9a4afd026d87..80ea5a05c23f 100644
--- a/pkgs/by-name/ca/cargo-lock/package.nix
+++ b/pkgs/by-name/ca/cargo-lock/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index 4e95d8380472..102c7b768319 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/bnjbvr/cargo-machete/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index ff48f1e3326e..3a263eb4fabf 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      figsoda
       xrelkd
     ];
     mainProgram = "cargo-make";
diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
index 19393089819f..e34ee1e278a8 100644
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "cargo-mobile2";
-  version = "0.21.0";
+  version = "0.22.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -18,14 +18,14 @@ rustPlatform.buildRustPackage {
     owner = "tauri-apps";
     repo = "cargo-mobile2";
     rev = "cargo-mobile2-v${version}";
-    hash = "sha256-cWOEjXfbUn0aOl53d9mqQHSRvowVsOOy+mtd0+c935Y=";
+    hash = "sha256-+U/uTbTGa3NPK5WpyvR5C5L1ozl+fa15pNNWYZJXgnk=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   # sourceRoot = "${src.name}/tooling/cli";
 
-  cargoHash = "sha256-WS4emnsXotVXQblMcy7165lBvK1423Bi41gXPY5FA9I=";
+  cargoHash = "sha256-fMtFvPrWMLHE4N9WJv6J4pqHbHPnNKhQWz5qEvB8jKQ=";
 
   preBuild = ''
     mkdir -p $out/share/
diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index 6b260b63966b..b98c0b3538ea 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-modules";
-  version = "0.24.3";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "regexident";
     repo = "cargo-modules";
     tag = "v${version}";
-    hash = "sha256-ZotG9eYVwNb123dQ6D4bsVCb7vS/jc/I67JPrQnJ59U=";
+    hash = "sha256-FghGqRV9KaRPZ7l3t/AB7f1XufOsNdiGFUk8GUwAxtY=";
   };
 
-  cargoHash = "sha256-CNOzNaA/bOvuBsON42m0cPEvAcqpCp1oNNOetuDEN04=";
+  cargoHash = "sha256-Lt5zqhBpHlPYoPgIVmVYu35SnuguqPw5Qg0oTL5cgCs=";
 
   checkFlags = [
     "--skip=cfg_test::with_tests::smoke"
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/regexident/cargo-modules/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
-      figsoda
       rvarago
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index 0356b2b16e52..3a90d9d2c976 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sourcefrog/cargo-mutants";
     changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch b/pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch
new file mode 100644
index 000000000000..ffd49c79d4dc
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch
@@ -0,0 +1,62 @@
+diff --git a/nextest-runner/Cargo.toml b/nextest-runner/Cargo.toml
+index 776c9341..06196bd2 100644
+--- a/nextest-runner/Cargo.toml
++++ b/nextest-runner/Cargo.toml
+@@ -118,7 +118,7 @@ nix.workspace = true
+ #
+ # Also, usdt 0.6.0 fails to compile on x86_64-apple-darwin, so restrict it to
+ # aarch64-apple-darwin.
+-[target.'cfg(any(all(target_arch = "x86_64", any(target_os = "linux", target_os = "freebsd", target_os = "illumos")), all(target_arch = "aarch64", any(target_os = "macos", target_os = "freebsd", target_os = "illumos"))))'.dependencies]
++[target.'cfg(any(all(target_arch = "x86_64", any(target_os = "linux", target_os = "freebsd", target_os = "illumos")), all(target_arch = "aarch64", any(target_os = "freebsd", target_os = "illumos"))))'.dependencies]
+ usdt = "0.6.0"
+ 
+ [target.'cfg(windows)'.dependencies]
+diff --git a/nextest-runner/src/usdt.rs b/nextest-runner/src/usdt.rs
+index 7732eeb4..af69015b 100644
+--- a/nextest-runner/src/usdt.rs
++++ b/nextest-runner/src/usdt.rs
+@@ -28,7 +28,7 @@ use serde::Serialize;
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ ))]
+ pub fn register_probes() -> Result<(), usdt::Error> {
+@@ -43,7 +43,7 @@ pub fn register_probes() -> Result<(), usdt::Error> {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ )))]
+ pub fn register_probes() -> Result<(), std::convert::Infallible> {
+@@ -57,7 +57,7 @@ pub fn register_probes() -> Result<(), std::convert::Infallible> {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ ))]
+ #[usdt::provider(provider = "nextest")]
+@@ -135,7 +135,7 @@ pub mod usdt_probes {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ ))]
+ #[macro_export]
+@@ -246,7 +246,7 @@ macro_rules! fire_usdt {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ )))]
+ #[macro_export]
diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index 77b2be8479f5..b8e34fcbc070 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
@@ -7,16 +8,21 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-nextest";
-  version = "0.9.105";
+  version = "0.9.110";
 
   src = fetchFromGitHub {
     owner = "nextest-rs";
     repo = "nextest";
     rev = "cargo-nextest-${version}";
-    hash = "sha256-IBw6adO9Mzv878n+glLJTNeFykx6bGxfrPGxl014/7o=";
+    hash = "sha256-ipxPE3nugBJt/gLUdy/LQOTqat1Li2ovVPq3i81Yd/w=";
   };
 
-  cargoHash = "sha256-qHiifv1je7oNwOGYeT/QGcfagiXcLTCTG2kHV1rJJ4o=";
+  # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
+  patches = lib.optionals stdenv.isDarwin [
+    ./no-dtrace-macos.patch
+  ];
+
+  cargoHash = "sha256-9IvBgn+2taygTU+RjUWoiS3yI1LzejvzrYJ7VoiHpJI=";
 
   cargoBuildFlags = [
     "-p"
@@ -40,7 +46,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with maintainers; [
       ekleog
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index 09d717388e31..ed4dedbb900e 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = "cargo-outdated";
     rev = "v${version}";
-    hash = "sha256-ey11ANSflWGnCsn6M9GupgC4DE5mWww6vw5pK0CFdLo=";
+    hash = "sha256-r7FtuXx9+OmVAdL6+9s2bYHjsURmX60+2c7+2FjkSRs=";
   };
 
-  cargoHash = "sha256-PYlVXGfitsjEGiw07L5b+L8pfxvtkHshIjTXeuPUTdk=";
+  cargoHash = "sha256-l4UfmntTRlqRq1040FTzAn/QU33+owv569tcWNXSGN0=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index 507b2cf647aa..ead15cb184a1 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "cargo-play";
     homepage = "https://github.com/fanzeyi/cargo-play";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index d9bf09e84f5e..e823b3455f98 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-rdme";
-  version = "1.4.9";
+  version = "1.5.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-ostDwjj93WhDfBKJY9xpKd74knQi9z9UFb5Q84waHuM=";
+    hash = "sha256-TmV6Fc5vlc4fm9w4+iuxmnonwsEbqoJ3jvpIyQOuxjg=";
   };
 
-  cargoHash = "sha256-pk7tYvN2Drn+Gpk170ITsAF38dVWjk+RBfrnb0YpZc4=";
+  cargoHash = "sha256-EjIvKf1XgHubvyWPOAjysNH4nD0xqOWYg1FeiPSYh4c=";
 
   meta = {
     description = "Cargo command to create the README.md from your crate's documentation";
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 1155e61faedf..ce9d07b8d308 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       gerschtli
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index da4f2d0b8cd7..a9c71a50977f 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -68,7 +68,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index a9b2a53bb0be..9e6f15f78155 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-show-asm";
-  version = "0.2.52";
+  version = "0.2.54";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-tQX2A09tnQwq3rr/eQUfTHma4JMpGC89Loy2lH4bAEk=";
+    hash = "sha256-AF8fFPdiSZ/odPg3Kp72+LlJ+ox0PU+dH1fhPSt61n8=";
   };
 
-  cargoHash = "sha256-DsK2eKr2eimkwLURij2n7hdOPej6NSi5hNOaLhKRPbA=";
+  cargoHash = "sha256-cSlM0Ci0fXhAw7vfTxdkL9a4L9r76XdaR5URYYGAdd0=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       oxalica
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index a7c4216409fa..9de6d2810b68 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://shuttle.rs";
     changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix
index 3f2fcea8443d..606cb8a23ed8 100644
--- a/pkgs/by-name/ca/cargo-sort/package.nix
+++ b/pkgs/by-name/ca/cargo-sort/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix
index 5aa96ac9102e..23ef43511a4e 100644
--- a/pkgs/by-name/ca/cargo-supply-chain/package.nix
+++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
       zlib
     ]; # any of three
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index c16b90ba73c7..97f9f4989d4c 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index be41b31ba7a8..80c2986f4e77 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tarpaulin";
-  version = "0.33.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     tag = version;
-    hash = "sha256-yCuyeBL/7Dh9+V7fWvKkmj9OLGh88Jre7o0+TQXem9U=";
+    hash = "sha256-HJgcFQrHINm4BPfZ4c5ZHQYBTSBVYdSl/n0qBlSsNOI=";
   };
 
-  cargoHash = "sha256-S3cIcw6ZDAn8DVbCM7T5t7R3t45iGuh5600KeKQNXS8=";
+  cargoHash = "sha256-/IIO462dN1v7r05uDGo+QbH8gkSGa93StjLleP/KUPw=";
 
   nativeBuildInputs = [
     pkg-config
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       hugoreeves
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index dedff8b05ab8..cc4c43735845 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tauri";
-  version = "2.8.4";
+  version = "2.9.3";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${finalAttrs.version}";
-    hash = "sha256-fp/ODsbZTQdMkkRu9QqTQfavq0RPfSzZm1l4sE1hacc=";
+    hash = "sha256-cpD4eh0qxwPmGMDAzI1AHVLEe4WU80xGzeZIT56iMpc=";
   };
 
-  cargoHash = "sha256-l1IF9R+KeXAjs8Dy59mZNOCX0eoskotBPbltKU3nHQ8=";
+  cargoHash = "sha256-H+HwPoUlCU7lDMZSQetaKQvCTowPnAvBres2QPJu5+Q=";
 
   nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
     pkg-config
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index fd5f5f359972..ae91d53e172f 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
 
     fetcherVersion = 1;
-    hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8=";
+    hash = "sha256-gHniZv847JFrmKnTUZcgyWhFl/ovJ5IfKbbM5I21tZc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix
index bfe22cef9c51..f90f7f29abf9 100644
--- a/pkgs/by-name/ca/cargo-temp/package.nix
+++ b/pkgs/by-name/ca/cargo-temp/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index 0e872eb99b12..1f874a778725 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.59";
+  version = "0.1.60";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = "cargo-udeps";
     rev = "v${version}";
-    sha256 = "sha256-oA/oWXTaQPY7bCBUP52b+PACZXV+32G3/STh+sec6AI=";
+    sha256 = "sha256-NW9yjFUV+o7vv5bYD8nxSWHOXOBnDEk36xze90wYuNg=";
   };
 
-  cargoHash = "sha256-X+Y2ialZnwusy3XVnXiTcGmSYsKsFOmEOL4Gc5SgXWU=";
+  cargoHash = "sha256-vQvtc/CwV1aHeREzmzO8k1FcebbEp3FKMAJb0v2aQig=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix
index c66297f90f10..8ec65814ae99 100644
--- a/pkgs/by-name/ca/cargo-ui/package.nix
+++ b/pkgs/by-name/ca/cargo-ui/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage rec {
       gpl3Only
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix
index 77fc9f796577..6367350f5fb8 100644
--- a/pkgs/by-name/ca/cargo-unused-features/package.nix
+++ b/pkgs/by-name/ca/cargo-unused-features/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/timonpost/cargo-unused-features";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "unused-features";
diff --git a/pkgs/by-name/ca/cargo-vet/package.nix b/pkgs/by-name/ca/cargo-vet/package.nix
index 3422c9e8b3ba..a5361f65fbb5 100644
--- a/pkgs/by-name/ca/cargo-vet/package.nix
+++ b/pkgs/by-name/ca/cargo-vet/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       jk
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
index ccee8368d05a..b4776756e690 100644
--- a/pkgs/by-name/ca/cargo-workspaces/package.nix
+++ b/pkgs/by-name/ca/cargo-workspaces/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       macalinao
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 790f7705fe26..1fc98aaabd9b 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xwin";
-  version = "0.20.0";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${version}";
-    hash = "sha256-R9CdgsBuyPYOFG4aW59JjxvNkc6IXXjsHR7359wcNGk=";
+    hash = "sha256-M7OO2yO5BvNTqJLI50g25M5aupdOxmlZ3eealmP51Kc=";
   };
 
-  cargoHash = "sha256-0oe7zh7fZv2P88DBtTirmW7HvLP0jgJ5Je88IL4v+l8=";
+  cargoHash = "sha256-DwQGmdSzEjzqfsvqczAMJfi9gJjK2b9FAGmMi7rGKuw=";
 
   meta = with lib; {
     description = "Cross compile Cargo project to Windows MSVC target with ease";
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 7d6d71cf46cd..f5f7927f82ee 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/messense/cargo-zigbuild";
     changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/by-name/ca/carla/package.nix
similarity index 78%
rename from pkgs/applications/audio/carla/default.nix
rename to pkgs/by-name/ca/carla/package.nix
index 779f3ba6815b..5e89d64292bf 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/by-name/ca/carla/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   alsa-lib,
   file,
   fluidsynth,
@@ -12,19 +11,16 @@
   libsndfile,
   pkg-config,
   python3Packages,
+  libsForQt5,
   which,
-  gtk2 ? null,
   gtk3 ? null,
-  qtbase ? null,
   withFrontend ? true,
-  withGtk2 ? true,
   withGtk3 ? true,
   withQt ? true,
-  wrapQtAppsHook ? null,
 }:
 
-assert withQt -> qtbase != null;
-assert withQt -> wrapQtAppsHook != null;
+assert withQt -> libsForQt5.qtbase != null;
+assert withQt -> libsForQt5.wrapQtAppsHook != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "carla";
@@ -33,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "falkTX";
     repo = "carla";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-21QaFCIjGjRTcJtf2nwC5RcVJF8JgcFPIbS8apvf9tw=";
   };
 
@@ -41,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.wrapPython
     pkg-config
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   pythonPath =
@@ -61,8 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libsndfile
   ]
-  ++ lib.optional withQt qtbase
-  ++ lib.optional withGtk2 gtk2
+  ++ lib.optional withQt libsForQt5.qtbase
   ++ lib.optional withGtk3 gtk3;
 
   propagatedBuildInputs = finalAttrs.pythonPath;
@@ -77,11 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
         filename="$(basename -- "$file")"
         substituteInPlace "$file" --replace-fail '--with-appname="$0"' "--with-appname=\"$filename\""
     done
-  ''
-  + lib.optionalString withGtk2 ''
-    # Will try to dlopen() libgtk-x11-2.0 at runtime when using the bridge.
-    substituteInPlace source/bridges-ui/Makefile \
-        --replace-fail '$(CXX) $(OBJS_GTK2)' '$(CXX) $(OBJS_GTK2) -lgtk-x11-2.0'
   '';
 
   dontWrapQtApps = true;
@@ -108,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://kx.studio/Applications:Carla";
     description = "Audio plugin host";
     longDescription = ''
@@ -117,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
       It uses JACK as the default and preferred audio driver but also
       supports native drivers like ALSA, DirectSound or CoreAudio.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.minijackson ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ minijackson ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix
index 269a445c48a4..586fa9f3d9ed 100644
--- a/pkgs/by-name/ca/catch2_3/package.nix
+++ b/pkgs/by-name/ca/catch2_3/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "catch2";
-  version = "3.10.0";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "catchorg";
     repo = "Catch2";
     tag = "v${version}";
-    hash = "sha256-eeqqzHMeXLRiXzbY+ay8gJ/YDuxDj3f6+d6eXA1uZHE=";
+    hash = "sha256-7Dx7PhtRwkbo8vHF57sAns2fQZ442D3cMyCt25RvzJc=";
   };
 
   patches = lib.optionals stdenv.cc.isClang [
@@ -40,9 +40,9 @@ stdenv.mkDerivation rec {
     "-DCATCH_BUILD_TESTING=${if doCheck then "ON" else "OFF"}"
     "-DCATCH_ENABLE_WERROR=OFF"
   ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && doCheck) [
+  ++ lib.optionals (stdenv.cc.isClang && doCheck) [
     # test has a faulty path normalization technique that won't work in
-    # our darwin build environment https://github.com/catchorg/Catch2/issues/1691
+    # our darwin/LLVM build environment https://github.com/catchorg/Catch2/issues/1691
     "-DCMAKE_CTEST_ARGUMENTS=-E;ApprovalTests"
   ];
 
diff --git a/pkgs/by-name/ca/catnip-gtk4/package.nix b/pkgs/by-name/ca/catnip-gtk4/package.nix
index 605abed2efc5..c47310df3bc0 100644
--- a/pkgs/by-name/ca/catnip-gtk4/package.nix
+++ b/pkgs/by-name/ca/catnip-gtk4/package.nix
@@ -44,7 +44,7 @@ buildGoModule {
     description = "GTK4 frontend for catnip";
     homepage = "https://github.com/diamondburned/catnip-gtk4";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "catnip-gtk4";
   };
 }
diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 66fc3b97967f..84033d22dfe9 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
   pkg-config,
   portaudio,
-  testers,
-  catnip,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "catnip";
   version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "noriah";
     repo = "catnip";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-M9VGpDsBambe9kXyEgDg53pKOSL2zH1ugfSbRgAiaCo=";
   };
 
@@ -31,22 +31,25 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = catnip;
-    };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Terminal audio visualizer for linux/unix/macOS/windows";
     homepage = "https://github.com/noriah/catnip";
-    changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "catnip";
   };
-}
+})
diff --git a/pkgs/by-name/ca/cauwugo/package.nix b/pkgs/by-name/ca/cauwugo/package.nix
index 11f333fa354e..d13a988ab137 100644
--- a/pkgs/by-name/ca/cauwugo/package.nix
+++ b/pkgs/by-name/ca/cauwugo/package.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index d38e8e92463b..854022c69459 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ccache";
-  version = "4.11.3";
+  version = "4.12.1";
 
   src = fetchFromGitHub {
     owner = "ccache";
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
         exit 1
       fi
     '';
-    hash = "sha256-w41e73Zh5HhYhgLPtaaSiJ48BklBNtnK9S859tol5wc=";
+    hash = "sha256-EfX5cLb23VpRbImXTfOTS+dHq6UTd6ecuPWdmz4nLDs=";
   };
 
   outputs = [
@@ -61,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    patchShebangs --build test/fake-compilers
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cc/cccc/package.nix b/pkgs/by-name/cc/cccc/package.nix
index 0629cda4e5c8..437a93ea8e5b 100644
--- a/pkgs/by-name/cc/cccc/package.nix
+++ b/pkgs/by-name/cc/cccc/package.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
     homepage = "https://cccc.sourceforge.net/";
     license = lib.licenses.gpl2;
     platforms = lib.platforms.unix;
-    maintainers = [ lib.maintainers.linquize ];
+    maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/cc/ccemux/package.nix b/pkgs/by-name/cc/ccemux/package.nix
index b0efaa8b42bb..b6ba73ad22ff 100644
--- a/pkgs/by-name/cc/ccemux/package.nix
+++ b/pkgs/by-name/cc/ccemux/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.mit;
     maintainers = with maintainers; [
-      CrazedProgrammer
       viluon
     ];
     mainProgram = "ccemux";
diff --git a/pkgs/by-name/cc/cctools/meson.build b/pkgs/by-name/cc/cctools/meson.build
index bfb4f06285d7..6c0a18016203 100644
--- a/pkgs/by-name/cc/cctools/meson.build
+++ b/pkgs/by-name/cc/cctools/meson.build
@@ -12,7 +12,7 @@ project(
             '-DCCTB_PROJECT=cctools',
             '-DCCTB_PROJVERS=cctools-@version@',
             '-DCCTB_VERSION=@version@',
-            '-DCURRENT_PROJECT_VERSION="@version@"',
+            '-DCURRENT_PROJECT_VERSION="cctools-@version@"',
             '-DCODEDIRECTORY_SUPPORT',
             '-DLTO_SUPPORT',
         ],
diff --git a/pkgs/by-name/cd/cdk/package.nix b/pkgs/by-name/cd/cdk/package.nix
index 157c0d4e7ac0..e948031c33a2 100644
--- a/pkgs/by-name/cd/cdk/package.nix
+++ b/pkgs/by-name/cd/cdk/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdk";
-  version = "5.0-20251001";
+  version = "5.0-20251014";
 
   src = fetchurl {
     url = "https://invisible-mirror.net/archives/cdk/cdk-${finalAttrs.version}.tgz";
-    hash = "sha256-GLGW5gGmVTPQ3/MmJvu4h1FNhojng9f2CYtLTrxk2FM=";
+    hash = "sha256-DtRpScaApfQuNCzEiizmC8/CzIue67F2h3takfgpQ1w=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 60b6929118ca..902019cf6073 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.2.5";
+  version = "1.2.8";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-Ty+W5uiFkr8MBhWUweHsFQnIZ8R+oJoCcvQabHFdu7U=";
+    hash = "sha256-nMKIvRV6lfJgpzPGQVOeFBjkjt3RcFHw8sXiFRP+Vok=";
   };
 
-  vendorHash = "sha256-YjkO3QTQZlCfbKm/uYNVwnyQ/1Tde77YB2m7CqKsRtM=";
+  vendorHash = "sha256-n0/9VLnB4y0YSbc6fu9SP0sWfGFSh7QgZfJkHMJB80U=";
 
   subPackages = [ "cmd/cdncheck/" ];
 
diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix
index cad73a5bf830..58d22ae24816 100644
--- a/pkgs/by-name/cd/cdwe/package.nix
+++ b/pkgs/by-name/cd/cdwe/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Configurable cd wrapper that lets you define your environment per directory";
     homepage = "https://github.com/synoet/cdwe";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "cdwe";
   };
 }
diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix
index d695a0b1d238..ff0f443c234a 100644
--- a/pkgs/by-name/cd/cdxgen/package.nix
+++ b/pkgs/by-name/cd/cdxgen/package.nix
@@ -5,7 +5,7 @@
   makeWrapper,
   node-gyp,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   python3,
   stdenv,
   xcbuild,
@@ -13,20 +13,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdxgen";
-  version = "11.0.3";
+  version = "11.10.0";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cdxgen";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-H83HEiBdXBIhSR18EtYcQey6aXy8URSjpeNVEs3UBm8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RmgR6OfNrZUYFyn36zTHERIHlzszaFqTX8b4Rf2TF/U=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     nodejs
     node-gyp # required for sqlite3 bindings
-    pnpm_9.configHook
+    pnpm_10.configHook
     python3 # required for sqlite3 bindings
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin [
@@ -34,10 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     cctools.libtool
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-7NrDYd4H0cPQs8w4lWlB0BhqcYZVo6/9zf0ujPjBzsE=";
+    fetcherVersion = 2;
+    hash = "sha256-o5pNgn+ZqaEfsWO97jXkRyPH+0pffR6TBZcF6nApWVg=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index e4c1fdaba998..3f2a5de27983 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     homepage = "https://github.com/google/cel-go";
     changelog = "https://github.com/google/cel-go/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ce/celestegame/celeste/default.nix b/pkgs/by-name/ce/celestegame/celeste.nix
similarity index 94%
rename from pkgs/by-name/ce/celestegame/celeste/default.nix
rename to pkgs/by-name/ce/celestegame/celeste.nix
index e56467ec5e04..7158be54b3a6 100644
--- a/pkgs/by-name/ce/celestegame/celeste/default.nix
+++ b/pkgs/by-name/ce/celestegame/celeste.nix
@@ -8,10 +8,11 @@
   unzip,
   yq,
   dotnet-runtime_8,
+  everest,
 
   executableName ? "Celeste",
   desktopItems ? null,
-  everest ? null,
+  withEverest ? false,
   overrideSrc ? null,
   writableDir ? null,
   launchFlags ? "",
@@ -36,12 +37,12 @@ let
   phome = "$out/lib/Celeste";
 
   launchFlags' =
-    if launchFlags != "" && everest == null then
+    if launchFlags != "" && !withEverest then
       lib.warn "launchFlags is useless without Everest." ""
     else
       launchFlags;
   launchEnv' =
-    if launchEnv != "" && everest == null then
+    if launchEnv != "" && !withEverest then
       lib.warn "launchEnv is useless without Everest." ""
     else
       ''
@@ -91,7 +92,7 @@ stdenvNoCC.mkDerivation {
     mkdir -p ${phome}
     unzip -q $src -d ${phome}
   ''
-  + lib.optionalString (everest != null) ''
+  + lib.optionalString withEverest ''
     cp -r ${everest}/* $out
     chmod -R +w ${phome} # Files copied from other derivations are not writable by default
 
@@ -137,7 +138,7 @@ stdenvNoCC.mkDerivation {
       # https://github.com/EverestAPI/Everest/blob/7bd41c26850bbdfef937e2ed929174e864101c4c/Celeste.Mod.mm/Mod/Everest/BOOT.cs#L188-L201
       # It is hardcoded that it launches Celeste instead of Celeste-unwrapped.
       # Therefore, we need to prevent it from restarting.
-      lib.optionalString (everest != null) "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux"
+      lib.optionalString withEverest "--prefix LD_LIBRARY_PATH : ${phome}/lib64-linux"
     } --chdir ${phome}
 
     icon=$out/share/icons/hicolor/512x512/apps/Celeste.png
@@ -149,7 +150,7 @@ stdenvNoCC.mkDerivation {
   dontStrip = true;
   dontPatchShebangs = true;
   postFixup =
-    lib.optionalString (everest != null) ''
+    lib.optionalString withEverest ''
       rm -r ${phome}/Mods # Currently it is empty.
       ln -s "${writableDir}"/{Mods,LogHistory,CrashLogs,${everestLogFilename}} -t ${phome}
     ''
diff --git a/pkgs/by-name/ce/celestegame/package.nix b/pkgs/by-name/ce/celestegame/package.nix
index dd9afc490cff..0339ed298f2b 100644
--- a/pkgs/by-name/ce/celestegame/package.nix
+++ b/pkgs/by-name/ce/celestegame/package.nix
@@ -7,10 +7,11 @@
   writeShellScript,
   autoPatchelfHook,
   runtimeShell,
+  # Override this to everest-bin if you want to use steam-run.
+  everest,
 
+  withEverest ? false,
   overrideSrc ? null,
-  # A package. Omit to build without Everest.
-  everest ? null,
   # If build with Everest, must set writableDir to the path of a writable dir
   # so that the mods can be installed there.
   # It must be an absolute path.
@@ -29,8 +30,8 @@
 
 # For those who would like to use steam-run or alike to launch Celeste
 # (useful when using the `olympus` package with its `celesteWrapper` argument overridden),
-# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`, and if you want Everest,
-# override `everest` to `celestegame.passthru.everest-bin` instead of `celestegame.passthru.everest`
+# install `celestegame.passthru.celeste-unwrapped` instead of `celestegame`,
+# and if you want Everest, override `everest` to `everest-bin`
 # (steam-run cannot launch the latter for some currently unclear reason).
 # For those who would like to launch Celeste without the need of any additional wrapper like steam-run,
 # install `celestegame` with the `writableDir` argument overridden.
@@ -41,7 +42,7 @@ let
   executableName = "Celeste";
 
   writableDir' =
-    if writableDir == null && everest != null then
+    if writableDir == null && withEverest then
       lib.warn "writableDir is not set, so mods will not work." "/tmp"
     else
       writableDir;
@@ -49,10 +50,11 @@ let
 
   everestLogFilename = "everest-log.txt";
 
-  celeste = callPackage ./celeste {
+  celeste = callPackage ./celeste.nix {
     inherit
       executableName
       everest
+      withEverest
       overrideSrc
       launchFlags
       launchEnv
@@ -77,7 +79,7 @@ let
 in
 buildFHSEnv {
   inherit pname executableName;
-  version = celeste.version + (lib.optionalString (everest != null) "+everest.${everest.version}");
+  version = celeste.version + (lib.optionalString withEverest "+everest.${everest.version}");
 
   multiPkgs =
     pkgs:
@@ -175,7 +177,7 @@ buildFHSEnv {
       exec $NIX_CELESTE_LAUNCHER"' "$@"' > "${writableDir'}/Celeste"
       chmod +x "${writableDir'}/Celeste"
     ''
-    + lib.optionalString (everest != null) ''
+    + lib.optionalString withEverest ''
       mkdir -p "${writableDir'}"/{LogHistory,Mods,CrashLogs}
       touch "${writableDir'}/${everestLogFilename}"
 
@@ -203,10 +205,6 @@ buildFHSEnv {
   );
 
   passthru.celeste-unwrapped = celeste;
-  passthru.everest = callPackage ./everest { };
-  passthru.everest-bin = callPackage ./everest-bin { };
-
-  passthru.updateScript = ./update.sh;
 
   meta = {
     inherit (celeste.meta)
diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix
index e1ec149139c5..67233f787ed6 100644
--- a/pkgs/by-name/ce/centrifugo/package.nix
+++ b/pkgs/by-name/ce/centrifugo/package.nix
@@ -16,16 +16,16 @@ let
 in
 buildGoModule rec {
   pname = "centrifugo";
-  version = "6.3.1";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "centrifugal";
     repo = "centrifugo";
     rev = "v${version}";
-    hash = "sha256-1LP33LXGb+W23Mej/kOOl4wIuP/ZKj5ICOabH0WjKWk=";
+    hash = "sha256-tkhYt9KqxSp2uvFLUz9SMiyP/M8EmVlnFWFI7RZWtYQ=";
   };
 
-  vendorHash = "sha256-cSiRXIm9Iz0FmialBfcs04e5OUZn/ap9q/MEmGzWz+M=";
+  vendorHash = "sha256-KdmkhgfF+9n5VL5GyKBXO9isCozY8DDSdP1pCGQE2D4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/by-name/ce/ceph/arrow-cpp-19.nix
similarity index 96%
rename from pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
rename to pkgs/by-name/ce/ceph/arrow-cpp-19.nix
index d4226feffb52..eb2d7ecc628c 100644
--- a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
+++ b/pkgs/by-name/ce/ceph/arrow-cpp-19.nix
@@ -106,6 +106,12 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-WTpe/eT3himlCHN/R78w1sF0HG859mE2ZN70U+9N8Ag=";
       stripLen = 1;
     })
+    (fetchpatch2 {
+      name = "cmake-fix.patch";
+      url = "https://github.com/apache/arrow/commit/48c0bbbd4a2eedcca518caeb7f7547c7988dc740.patch?full_index=1";
+      hash = "sha256-i/vZy/61VYP+mo1AxfoiBSjTip04vhFOh3hGjHCJy6g=";
+      stripLen = 1; # applying patch from within `cpp/` subdirectory
+    })
   ];
 
   # versions are all taken from
diff --git a/pkgs/tools/filesystems/ceph/boost-1.85.patch b/pkgs/by-name/ce/ceph/boost-1.85.patch
similarity index 100%
rename from pkgs/tools/filesystems/ceph/boost-1.85.patch
rename to pkgs/by-name/ce/ceph/boost-1.85.patch
diff --git a/pkgs/tools/filesystems/ceph/boost-1.86-PyModule.patch b/pkgs/by-name/ce/ceph/boost-1.86-PyModule.patch
similarity index 100%
rename from pkgs/tools/filesystems/ceph/boost-1.86-PyModule.patch
rename to pkgs/by-name/ce/ceph/boost-1.86-PyModule.patch
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography-vectors.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix
rename to pkgs/by-name/ce/ceph/old-python-packages/cryptography-vectors.nix
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
similarity index 93%
rename from pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
rename to pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
index 38d7e112fa61..f10d285617a7 100644
--- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
+++ b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
@@ -109,10 +109,12 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # save compute time by not running benchmarks
     "tests/bench"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # aarch64-darwin forbids W+X memory, but this tests depends on it:
     # * https://cffi.readthedocs.io/en/latest/using.html#callbacks
+    # furthermore, this test fails with OpenSSL 3.6.0, probably due to:
+    # * https://github.com/openssl/openssl/issues/28757
+    # * https://github.com/openssl/openssl/issues/28770
+    # * https://github.com/openssl/openssl/issues/28888
     "tests/hazmat/backends/test_openssl_memleak.py"
   ];
 
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch b/pkgs/by-name/ce/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
rename to pkgs/by-name/ce/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix b/pkgs/by-name/ce/ceph/old-python-packages/trustme.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix
rename to pkgs/by-name/ce/ceph/old-python-packages/trustme.nix
diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix
new file mode 100644
index 000000000000..e2b1d67d4759
--- /dev/null
+++ b/pkgs/by-name/ce/ceph/package.nix
@@ -0,0 +1,659 @@
+{
+  lib,
+  stdenv,
+  runCommand,
+  fetchurl,
+  fetchFromGitHub,
+  fetchPypi,
+  fetchpatch2,
+  callPackage,
+
+  # Build time
+  autoconf,
+  automake,
+  cmake,
+  ensureNewerSourcesHook,
+  # To see which `fmt` version Ceph upstream recommends, check its `src/fmt` submodule.
+  #
+  # Ceph does not currently build with `fmt_10`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557
+  # If we want to switch for that before upstream fixes it, use this patch:
+  # https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899648638
+  fmt_9,
+  git,
+  libtool,
+  makeWrapper,
+  nasm,
+  pkg-config,
+  which,
+  openssl,
+
+  # Tests
+  nixosTests,
+
+  # Runtime dependencies
+
+  # Remove once Ceph supports arrow-cpp >= 20, see:
+  # * https://tracker.ceph.com/issues/71269
+  # * https://github.com/NixOS/nixpkgs/issues/406306
+  ceph-arrow-cpp ? callPackage ./arrow-cpp-19.nix { },
+  babeltrace,
+  # Note when trying to upgrade boost:
+  # * When upgrading Ceph, it's recommended to check which boost version Ceph uses on Fedora,
+  #   and default to that.
+  # * The version that Ceph downloads if `-DWITH_SYSTEM_BOOST:BOOL=ON` is not given
+  #   is declared in `cmake/modules/BuildBoost.cmake` line `set(boost_version ...)`.
+  #
+  # If you want to upgrade to boost >= 1.86, you need a Ceph version that
+  # has this PR in:
+  #     https://github.com/ceph/ceph/pull/61312
+  boost183,
+  bzip2,
+  cryptsetup,
+  cunit,
+  e2fsprogs,
+  doxygen,
+  getopt,
+  gperf,
+  graphviz,
+  gnugrep,
+  gtest,
+  icu,
+  kmod,
+  libcap,
+  libcap_ng,
+  libnbd,
+  libnl,
+  libxml2,
+  lmdb,
+  lttng-ust,
+  # Ceph currently requires >= 5.3
+  lua5_4,
+  lvm2,
+  lz4,
+  oath-toolkit,
+  openldap,
+  parted,
+  python311, # to get an idea which Python versions are supported by Ceph, see upstream `do_cmake.sh` (see `PYBUILD=` variable)
+  rdkafka,
+  rocksdb,
+  snappy,
+  openssh,
+  sqlite,
+  utf8proc,
+  xfsprogs,
+  zlib,
+  zstd,
+
+  # Dependencies of overridden Python dependencies, hopefully we can remove these soon.
+  rustPlatform,
+
+  # Optional Dependencies
+  curl ? null,
+  expat ? null,
+  fuse ? null,
+  libatomic_ops ? null,
+  libedit ? null,
+  libs3 ? null,
+  yasm ? null,
+
+  # Mallocs
+  gperftools ? null,
+  jemalloc ? null,
+
+  # Crypto Dependencies
+  cryptopp ? null,
+  nspr ? null,
+  nss ? null,
+
+  # Linux Only Dependencies
+  linuxHeaders,
+  systemd,
+  util-linux,
+  libuuid,
+  udev,
+  keyutils,
+  rdma-core,
+  rabbitmq-c,
+  libaio ? null,
+  libxfs ? null,
+  liburing ? null,
+  zfs ? null,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+}:
+
+# We must have one crypto library
+assert cryptopp != null || (nss != null && nspr != null);
+
+let
+  shouldUsePkg =
+    pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
+
+  optYasm = shouldUsePkg yasm;
+  optExpat = shouldUsePkg expat;
+  optCurl = shouldUsePkg curl;
+  optFuse = shouldUsePkg fuse;
+  optLibedit = shouldUsePkg libedit;
+  optLibatomic_ops = shouldUsePkg libatomic_ops;
+  optLibs3 = shouldUsePkg libs3;
+
+  optJemalloc = shouldUsePkg jemalloc;
+  optGperftools = shouldUsePkg gperftools;
+
+  optCryptopp = shouldUsePkg cryptopp;
+  optNss = shouldUsePkg nss;
+  optNspr = shouldUsePkg nspr;
+
+  optLibaio = shouldUsePkg libaio;
+  optLibxfs = shouldUsePkg libxfs;
+  optZfs = shouldUsePkg zfs;
+
+  # Downgrade rocksdb, 7.10 breaks ceph
+  rocksdb' = rocksdb.overrideAttrs {
+    version = "7.9.2";
+    src = fetchFromGitHub {
+      owner = "facebook";
+      repo = "rocksdb";
+      rev = "refs/tags/v7.9.2";
+      hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM=";
+    };
+  };
+
+  hasRadosgw = optExpat != null && optCurl != null && optLibedit != null;
+
+  # Malloc implementation (can be jemalloc, tcmalloc or null)
+  malloc = if optJemalloc != null then optJemalloc else optGperftools;
+
+  # We prefer nss over cryptopp
+  cryptoStr =
+    if optNss != null && optNspr != null then
+      "nss"
+    else if optCryptopp != null then
+      "cryptopp"
+    else
+      "none";
+
+  cryptoLibsMap = {
+    nss = [
+      optNss
+      optNspr
+    ];
+    cryptopp = [ optCryptopp ];
+    none = [ ];
+  };
+
+  getMeta = description: {
+    homepage = "https://ceph.io/en/";
+    inherit description;
+    license = with lib.licenses; [
+      lgpl21
+      gpl2Only
+      bsd3
+      mit
+      publicDomain
+    ];
+    maintainers = with lib.maintainers; [
+      adev
+      ak
+      johanot
+      krav
+      nh2
+      benaryorg
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+
+  ceph-common =
+    with python.pkgs;
+    buildPythonPackage {
+      pname = "ceph-common";
+      format = "setuptools";
+      inherit src version;
+
+      sourceRoot = "ceph-${version}/src/python-common";
+
+      propagatedBuildInputs = [
+        pyyaml
+      ];
+
+      nativeCheckInputs = [
+        pytestCheckHook
+      ];
+
+      disabledTests = [
+        # requires network access
+        "test_valid_addr"
+      ];
+
+      meta = getMeta "Ceph common module for code shared by manager modules";
+    };
+
+  # Watch out for python <> boost compatibility
+  python = python311.override {
+    self = python;
+    packageOverrides =
+      self: super:
+      let
+        bcryptOverrideVersion = "4.0.1";
+      in
+      {
+        # Ceph does not support the following yet:
+        # * `bcrypt` > 4.0
+        # * `cryptography` > 40
+        # See:
+        # * https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602
+        # * Upstream issue: https://tracker.ceph.com/issues/63529
+        #   > Python Sub-Interpreter Model Used by ceph-mgr Incompatible With Python Modules Based on PyO3
+        # * Moved to issue: https://tracker.ceph.com/issues/64213
+        #   > MGR modules incompatible with later PyO3 versions - PyO3 modules may only be initialized once per interpreter process
+
+        bcrypt = super.bcrypt.overridePythonAttrs (old: rec {
+          pname = "bcrypt";
+          version = bcryptOverrideVersion;
+          src = fetchPypi {
+            inherit pname version;
+            hash = "sha256-J9N1kDrIJhz+QEf2cJ0W99GNObHskqr3KvmJVSplDr0=";
+          };
+          cargoRoot = "src/_bcrypt";
+          cargoDeps = rustPlatform.fetchCargoVendor {
+            inherit
+              pname
+              version
+              src
+              cargoRoot
+              ;
+            hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M=";
+          };
+        });
+
+        # We pin the older `cryptography` 40 here;
+        # this also forces us to pin other packages, see below
+        cryptography = self.callPackage ./old-python-packages/cryptography.nix { };
+
+        # This is the most recent version of `pyopenssl` that's still compatible with `cryptography` 40.
+        # See https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602
+        # and https://github.com/pyca/pyopenssl/blob/d9752e44127ba36041b045417af8a0bf16ec4f1e/CHANGELOG.rst#2320-2023-05-30
+        pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
+          version = "23.1.1";
+          src = fetchPypi {
+            pname = "pyOpenSSL";
+            inherit version;
+            hash = "sha256-hBSYub7GFiOxtsR+u8AjZ8B9YODhlfGXkIF/EMyNsLc=";
+          };
+          disabledTests = old.disabledTests or [ ] ++ [
+            "test_export_md5_digest"
+          ];
+          disabledTestPaths = old.disabledTestPaths or [ ] ++ [
+            "tests/test_ssl.py"
+          ];
+          propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [
+            self.flaky
+          ];
+          # hack: avoid building docs due to incompatibility with current sphinx
+          nativeBuildInputs = [ openssl ]; # old.nativeBuildInputs but without sphinx*
+          outputs = lib.filter (o: o != "doc") old.outputs;
+        });
+
+        # This is the most recent version of `trustme` that's still compatible with `cryptography` 40.
+        # See https://github.com/NixOS/nixpkgs/issues/359723
+        # and https://github.com/python-trio/trustme/commit/586f7759d5c27beb44da60615a71848eb2a5a490
+        trustme = self.callPackage ./old-python-packages/trustme.nix { };
+
+        fastapi = super.fastapi.overridePythonAttrs (old: {
+          # Flaky test:
+          #     ResourceWarning: Unclosed <MemoryObjectSendStream>
+          # Unclear whether it's flaky in general or only in this overridden package set.
+          doCheck = false;
+        });
+
+        # Ceph does not support `kubernetes` >= 19, see:
+        #     https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1900324090
+        kubernetes = super.kubernetes.overridePythonAttrs (old: rec {
+          version = "18.20.0";
+          src = fetchFromGitHub {
+            owner = "kubernetes-client";
+            repo = "python";
+            rev = "v${version}";
+            sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1";
+            fetchSubmodules = true;
+          };
+        });
+
+      };
+  };
+
+  boost' = boost183.override {
+    enablePython = true;
+    inherit python;
+  };
+
+  # TODO: split this off in build and runtime environment
+  ceph-python-env = python.withPackages (
+    ps: with ps; [
+      ceph-common
+
+      # build time
+      cython_0
+
+      # debian/control
+      bcrypt
+      cherrypy
+      influxdb
+      jinja2
+      kubernetes
+      natsort
+      numpy
+      pecan
+      prettytable
+      pyjwt
+      pyopenssl
+      python-dateutil
+      pyyaml
+      requests
+      routes
+      scikit-learn
+      scipy
+      setuptools
+      sphinx
+      virtualenv
+      werkzeug
+
+      # src/cephadm/zipapp-reqs.txt
+      markupsafe
+
+      # src/pybind/mgr/requirements-required.txt
+      cryptography
+      jsonpatch
+
+      # src/tools/cephfs/shell/setup.py
+      cmd2
+      colorama
+    ]
+  );
+  inherit (ceph-python-env.python) sitePackages;
+
+  version = "19.2.3";
+  src = fetchurl {
+    url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";
+    hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";
+  };
+in
+stdenv.mkDerivation {
+  pname = "ceph";
+  inherit src version;
+
+  patches = [
+    ./boost-1.85.patch
+
+    (fetchpatch2 {
+      name = "ceph-boost-1.86-uuid.patch";
+      url = "https://github.com/ceph/ceph/commit/01306208eac492ee0e67bff143fc32d0551a2a6f.patch?full_index=1";
+      hash = "sha256-OnDrr72inzGXXYxPFQevsRZImSvI0uuqFHqtFU2dPQE=";
+    })
+
+    # See:
+    # * <https://github.com/boostorg/python/issues/394>
+    # * <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>
+    # * <https://github.com/ceph/ceph/pull/60999>
+    ./boost-1.86-PyModule.patch
+
+    (fetchpatch2 {
+      name = "ceph-cmake-4.patch";
+      url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
+      hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
+    })
+
+    # See:
+    # * <https://github.com/ceph/ceph/pull/55560>
+    # * <https://github.com/ceph/ceph/pull/60575>
+    (fetchpatch2 {
+      name = "ceph-systemd-sans-cluster-name.patch";
+      url = "https://github.com/ceph/ceph/commit/5659920c7c128cb8d9552580dbe23dd167a56c31.patch?full_index=1";
+      hash = "sha256-Uch8ZghyTowUvSq0p/RxiVpdG1Yqlww9inpVksO6zyk=";
+    })
+    (fetchpatch2 {
+      name = "ceph-systemd-prefix.patch";
+      url = "https://github.com/ceph/ceph/commit/9b38df488d7101b02afa834ea518fd52076d582a.patch?full_index=1";
+      hash = "sha256-VcbJhCGTUdNISBd6P96Mm5M3fFVmZ8r7pMl+srQmnIQ=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    autoconf # `autoreconf` is called, e.g. for `qatlib_ext`
+    automake # `aclocal` is called, e.g. for `qatlib_ext`
+    cmake
+    fmt_9
+    git
+    makeWrapper
+    libtool # used e.g. for `qatlib_ext`
+    nasm
+    pkg-config
+    python
+    python.pkgs.python # for the toPythonPath function
+    python.pkgs.wrapPython
+    which
+    (ensureNewerSourcesHook { year = "1980"; })
+    # for building docs/man-pages presumably
+    doxygen
+    graphviz
+  ];
+
+  buildInputs =
+    cryptoLibsMap.${cryptoStr}
+    ++ [
+      ceph-arrow-cpp
+      babeltrace
+      boost'
+      bzip2
+      # Adding `ceph-python-env` here adds the env's `site-packages` to `PYTHONPATH` during the build.
+      # This is important, otherwise the build system may not find the Python deps and then
+      # silently skip installing ceph-volume and other Ceph python tools.
+      ceph-python-env
+      cryptsetup
+      cunit
+      e2fsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
+      gperf
+      gtest
+      icu
+      libcap
+      libnbd
+      libnl
+      libxml2
+      lmdb
+      lttng-ust
+      lua5_4
+      lvm2 # according to `debian/control` file, e.g. `pvs` command used by `src/ceph-volume/ceph_volume/api/lvm.py`
+      lz4
+      malloc
+      oath-toolkit
+      openldap
+      optLibatomic_ops
+      optLibs3
+      optYasm
+      parted # according to `debian/control` file, used by `src/ceph-volume/ceph_volume/util/disk.py`
+      rdkafka
+      rocksdb'
+      snappy
+      openssh # according to `debian/control` file, `ssh` command used by `cephadm`
+      sqlite
+      utf8proc
+      xfsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
+      zlib
+      zstd
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      keyutils
+      libcap_ng
+      liburing
+      libuuid
+      linuxHeaders
+      optLibaio
+      optLibxfs
+      optZfs
+      rabbitmq-c
+      rdma-core
+      udev
+      util-linux
+    ]
+    ++ lib.optionals hasRadosgw [
+      optCurl
+      optExpat
+      optFuse
+      optLibedit
+    ];
+
+  # Picked up, amongst others, by `wrapPythonPrograms`.
+  pythonPath = [
+    ceph-python-env
+    "${placeholder "out"}/${ceph-python-env.sitePackages}"
+  ];
+
+  # * `unset AS` because otherwise the Ceph CMake build errors with
+  #       configure: error: No modern nasm or yasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512) and yasm should be 1.2.0 or later.
+  #   because the code at
+  #       https://github.com/intel/isa-l/blob/633add1b569fe927bace3960d7c84ed9c1b38bb9/configure.ac#L99-L191
+  #   doesn't even consider using `nasm` or `yasm` but instead uses `$AS`
+  #   from `gcc-wrapper`.
+  #   (Ceph's error message is extra confusing, because it says
+  #   `No modern nasm or yasm found` when in fact it found e.g. `nasm`
+  #   but then uses `$AS` instead.
+  # * replace /sbin and /bin based paths with direct nix store paths
+  # * increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters
+  preConfigure = ''
+    unset AS
+
+    substituteInPlace src/common/module.c \
+      --replace "char command[128];" "char command[256];" \
+      --replace "/sbin/modinfo"  "${kmod}/bin/modinfo" \
+      --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \
+      --replace "/bin/grep" "${gnugrep}/bin/grep"
+
+    # Patch remount to use full path to mount(8), otherwise ceph-fuse fails when run
+    # from a systemd unit for example.
+    substituteInPlace src/client/fuse_ll.cc \
+      --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
+
+    substituteInPlace systemd/*.service.in \
+      --replace-quiet "/bin/kill" "${util-linux}/bin/kill"
+
+    substituteInPlace src/{ceph-osd-prestart.sh,ceph-post-file.in,init-ceph.in} \
+       --replace-fail "GETOPT=/usr/local/bin/getopt" "GETOPT=${getopt}/bin/getopt" \
+       --replace-fail "GETOPT=getopt" "GETOPT=${getopt}/bin/getopt"
+
+    # The install target needs to be in PYTHONPATH for "*.pth support" check to succeed
+    export PYTHONPATH=$PYTHONPATH:$lib/${sitePackages}:$out/${sitePackages}
+    patchShebangs src/
+  '';
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
+
+    "-DWITH_CEPHFS_SHELL:BOOL=ON"
+    "-DWITH_SYSTEMD:BOOL=${if withSystemd then "ON" else "OFF"}"
+    "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
+    # `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
+    #     CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
+    #     Command failed: 2
+    #
+    #        'make' 'opentelemetry_trace' 'opentelemetry_exporter_jaeger_trace'
+    #
+    #     See also
+    #
+    #        /build/ceph-18.2.0/build/src/opentelemetry-cpp/src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-*.log
+    # and that file contains:
+    #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc: In member function 'virtual void opentelemetry::v1::exporter::jaeger::TUDPTransport::close()':
+    #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc:71:7: error: '::close' has not been declared; did you mean 'pclose'?
+    #       71 |     ::THRIFT_CLOSESOCKET(socket_);
+    #          |       ^~~~~~~~~~~~~~~~~~
+    # Looks like `close()` is somehow not included.
+    # But the relevant code is already removed in `open-telemetry` 1.10: https://github.com/open-telemetry/opentelemetry-cpp/pull/2031
+    # So it's probably not worth trying to fix that for this Ceph version,
+    # and instead just disable Ceph's Jaeger support.
+    "-DWITH_JAEGER:BOOL=OFF"
+    "-DWITH_TESTS:BOOL=OFF"
+
+    # Use our own libraries, where possible
+    "-DWITH_SYSTEM_ARROW:BOOL=ON" # Only used if other options enable Arrow support.
+    "-DWITH_SYSTEM_BOOST:BOOL=ON"
+    "-DWITH_SYSTEM_GTEST:BOOL=ON"
+    "-DWITH_SYSTEM_ROCKSDB:BOOL=ON"
+    "-DWITH_SYSTEM_UTF8PROC:BOOL=ON"
+    "-DWITH_SYSTEM_ZSTD:BOOL=ON"
+
+    # Use our own python libraries too, see:
+    #     https://github.com/NixOS/nixpkgs/pull/344993#issuecomment-2391046329
+    "-DCEPHADM_BUNDLED_DEPENDENCIES=none"
+
+    # TODO breaks with sandbox, tries to download stuff with npm
+    "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF"
+    # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
+    ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON";
+
+  preBuild =
+    # The legacy-option-headers target is not correctly empbedded in the build graph.
+    # It also contains some internal race conditions that we work around by building with `-j 1`.
+    # Upstream discussion for additional context at https://tracker.ceph.com/issues/63402.
+    ''
+      cmake --build . --target legacy-option-headers -j 1
+    '';
+
+  postFixup = ''
+    wrapPythonPrograms
+    wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"
+
+    # Test that ceph-volume exists since the build system has a tendency to
+    # silently drop it with misconfigurations.
+    test -f $out/bin/ceph-volume
+
+    # Assert that getopt patch from preConfigure covered all instances
+    ! grep -F -r 'GETOPT=getopt' $out
+    ! grep -F -r 'GETOPT=/usr/local/bin/getopt' $out
+
+    mkdir -p $client/{bin,etc,${sitePackages},share/bash-completion/completions}
+    cp -r $out/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $client/bin
+    cp -r $out/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $client/bin
+    cp -r $out/bin/rbd-replay* $client/bin
+    cp -r $out/sbin/mount.ceph $client/bin
+    cp -r $out/sbin/mount.fuse.ceph $client/bin
+    ln -s bin $client/sbin
+    cp -r $out/${sitePackages}/* $client/${sitePackages}
+    cp -r $out/etc/bash_completion.d $client/share/bash-completion/completions
+    # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
+    substituteInPlace $client/bin/ceph          --replace $out $client
+    substituteInPlace $client/bin/.ceph-wrapped --replace $out $client
+  '';
+
+  outputs = [
+    "out"
+    "lib"
+    "client"
+    "dev"
+    "doc"
+    "man"
+  ];
+
+  doCheck = false; # uses pip to install things from the internet
+
+  # Takes 7+h to build with 2 cores.
+  requiredSystemFeatures = [ "big-parallel" ];
+
+  meta = getMeta "Distributed storage system";
+
+  passthru = {
+    inherit version;
+    inherit python; # to be able to test our overridden packages above individually with `nix-build -A`
+    arrow-cpp = ceph-arrow-cpp;
+    tests = {
+      inherit (nixosTests)
+        ceph-multi-node
+        ceph-single-node
+        ceph-single-node-bluestore
+        ceph-single-node-bluestore-dmcrypt
+        ;
+    };
+  };
+}
diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 7d51f9738edd..a60a6e8da809 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "certinfo";
-  version = "1.0.38";
+  version = "1.0.39";
 
   src = fetchFromGitHub {
     owner = "pete911";
     repo = "certinfo";
     rev = "v${version}";
-    sha256 = "sha256-3CAl/Kf20JMcq7aLOviwxpHkYXnOd2WXqC8o2TLEXGY=";
+    sha256 = "sha256-U3uVQiALtI7aWkIPQyHxSzMTD6AjAMoOEjkbPO07SdA=";
   };
 
   # clipboard functionality not working on Darwin
diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix
index 7d97bb020849..e26469e27af1 100644
--- a/pkgs/by-name/cf/cfitsio/package.nix
+++ b/pkgs/by-name/cf/cfitsio/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   gitUpdater,
   cmake,
   bzip2,
@@ -12,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cfitsio";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "HEASARC";
-    repo = finalAttrs.pname;
-    tag = "${finalAttrs.pname}-${finalAttrs.version}";
-    hash = "sha256-WLsX23hNhaITjCvMEV7NUEvyDfQiObSJt1qFC12z7wY=";
+    repo = "cfitsio";
+    tag = "cfitsio-${finalAttrs.version}";
+    hash = "sha256-nKxX3YNRJZpmcP8/0O2pMsYjcH6vzAWMpqaHYO+HoUo=";
   };
 
   outputs = [
@@ -30,12 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./cfitsio-pc-cmake.patch
-
-    (fetchpatch {
-      name = "cfitsio-fix-cmake-4.patch";
-      url = "https://github.com/HEASARC/cfitsio/commit/101e0880fca41e2223df7eec56d9e84e90b9ed56.patch";
-      hash = "sha256-rufuqOBfE7ItTYwsGdu9G4BXSz4vZd52XmJi09kqrCM=";
-    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix
index 86eb84d06828..cbbd6cbdc633 100644
--- a/pkgs/by-name/cf/cfripper/package.nix
+++ b/pkgs/by-name/cf/cfripper/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cfripper";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = "cfripper";
     tag = "v${version}";
-    hash = "sha256-9cnOy7XBN3BRjUh6ST9RsKpAPJ8wrzJHtKMKhp7sg1g=";
+    hash = "sha256-4qDZANerC46CV0/+6dItNDCKSPsd5HjiK1+BFZktouw=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/cg/cgoban/package.nix b/pkgs/by-name/cg/cgoban/package.nix
index be71bec127e6..cddcbf93d391 100644
--- a/pkgs/by-name/cg/cgoban/package.nix
+++ b/pkgs/by-name/cg/cgoban/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     homepage = "https://www.gokgs.com/";
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.free;
-    maintainers = with maintainers; [ savannidgerinel ];
+    maintainers = [ ];
     platforms = temurin-jre-bin-17.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix
index 918a95f10788..8148e58cef54 100644
--- a/pkgs/by-name/ch/changedetection-io/package.nix
+++ b/pkgs/by-name/ch/changedetection-io/package.nix
@@ -2,18 +2,19 @@
   lib,
   fetchFromGitHub,
   python3,
+  gitUpdater,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "changedetection-io";
-  version = "0.49.4";
+  version = "0.50.14";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     tag = version;
-    hash = "sha256-EmtJ8XXPb75W4VPj4Si9fdzVLDKVfm+8P6UZZlMpMdI=";
+    hash = "sha256-zxCb2mmCicjDxilj/l8HabJm2FsFQB0yLNaRiIDltwI=";
   };
 
   pythonRelaxDeps = true;
@@ -22,14 +23,13 @@ python3.pkgs.buildPythonApplication rec {
     with python3.pkgs;
     [
       apprise
-      beautifulsoup4
-      brotli
       babel
+      beautifulsoup4
+      blinker
+      brotli
       chardet
       cryptography
-      dnspython
       elementpath
-      eventlet
       extruct
       feedgen
       flask
@@ -39,45 +39,62 @@ python3.pkgs.buildPythonApplication rec {
       flask-login
       flask-paginate
       flask-restful
+      flask-socketio
       flask-wtf
+      gevent
       greenlet
       inscriptis
+      janus
       jinja2
       jinja2-time
-      jsonpath-ng
       jq
+      jsonpath-ng
+      jsonschema
+      levenshtein
       loguru
       lxml
+      openapi-core
+      openpyxl
       paho-mqtt
-      playwright
-      pyee
-      pyppeteer
+      panzi-json-logic
+      pluggy
+      price-parser
+      psutil
+      pyppeteer-ng
+      # pyppeteerstealth
+      python-engineio
+      python-magic
+      python-socketio
       pytz
+      referencing
       requests
+      requests-file
       selenium
-      setuptools
       timeago
-      urllib3
+      tzdata
       validators
       werkzeug
       wtforms
     ]
-    ++ requests.optional-dependencies.socks;
+    ++ requests.optional-dependencies.socks
+    ++ openapi-core.optional-dependencies.flask;
 
   # tests can currently not be run in one pytest invocation and without docker
   doCheck = false;
 
-  nativeCheckInputs = with python3.pkgs; [
-    pytest-flask
-    pytestCheckHook
-  ];
+  pythonImportsCheck = [ "changedetectionio" ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
     description = "Self-hosted free open source website change detection tracking, monitoring and notification service";
     homepage = "https://github.com/dgtlmoon/changedetection.io";
     changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mikaelfangel ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      mikaelfangel
+      thanegill
+    ];
     mainProgram = "changedetection.io";
   };
 }
diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index 4a53390b5fd3..76e753d1ae33 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -43,7 +43,6 @@ buildGoModule rec {
     changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ch/chart-testing/package.nix b/pkgs/by-name/ch/chart-testing/package.nix
index 976e0c9c48fa..de3c2d68332a 100644
--- a/pkgs/by-name/ch/chart-testing/package.nix
+++ b/pkgs/by-name/ch/chart-testing/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "chart-testing";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "chart-testing";
     rev = "v${version}";
-    hash = "sha256-59a86yR/TDAWGCsj3pbDjXJGMvyHYnjsnxzjWr61PuU=";
+    hash = "sha256-wdUUo19bFf3ov+Rd+JV6CtbH9TWGC73lWRrNLOfNGR8=";
   };
 
-  vendorHash = "sha256-aVXISRthJxxvtrfC0DpewLHCiJPh4tO+SKl3Q9uP14k=";
+  vendorHash = "sha256-29rGyStJsnhJiO01DIFf/ROaYsXGg3YRJatdzC6A7JU=";
 
   postPatch = ''
     substituteInPlace pkg/config/config.go \
diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index e80f64164f39..42aaf3a64f51 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.16.4";
+  version = "1.17.0";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-hLYOiSIOOTjBH0bxWeji7IzH9F38+e10MCXm88YgYdQ=";
+    hash = "sha256-1TXaRZmmN8dYhCODDBXYDIE/0Rf4K5/4MAliuAZjmJw=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix
index 8937af5b3287..f589409a1c01 100644
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@@ -10,10 +10,10 @@
 
 let
   pname = "chatzone-desktop";
-  version = "5.4.1";
+  version = "5.5.0";
   src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.4.1/872/chatzone-desktop-linux-5.4.1.AppImage";
-    hash = "sha256-ONr8rIP7oXtafACkW4fDHfYew83F4R8un+hGdVI75iA=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.5.0/925/chatzone-desktop-linux-5.5.0.AppImage";
+    hash = "sha256-2Ly0qABTqleqH0AoAIJ+JNYFyoikxZroiFrYwSxBtdw=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in
diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix
index 7cff735e0c6c..2b1df7be436b 100644
--- a/pkgs/by-name/ch/check-jsonschema/package.nix
+++ b/pkgs/by-name/ch/check-jsonschema/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "check-jsonschema";
-  version = "0.34.0";
+  version = "0.34.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-jsonschema";
     repo = "check-jsonschema";
     tag = version;
-    hash = "sha256-NFP013ZG+Ltiqe+CLed4zeSQCS9E1r1L+b2AsYLMDW4=";
+    hash = "sha256-TI8NW8ULsig/YL6LC8L//YS0lSIUS2Ns9awFJ50ov2k=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix
index 6f5ccb4f6396..8d5aec83de0b 100644
--- a/pkgs/by-name/ch/checkip/package.nix
+++ b/pkgs/by-name/ch/checkip/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "checkip";
-  version = "0.47.7";
+  version = "0.49.0";
 
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = "checkip";
     tag = "v${version}";
-    hash = "sha256-bjKRHIY9OIEft//g8VHKHTUrwWn8UU38SPP4IdPbIQE=";
+    hash = "sha256-zhc32H4EUjFbU5weab+IQYARSrJXD8zqkxHLgO5jIJs=";
   };
 
-  vendorHash = "sha256-hTjSOufyrOKdY6wdPXvbpXwgWiHIRI+t4ByqHBY6cPQ=";
+  vendorHash = "sha256-5sUBrzo6wJfaMMvgNflcjB2QNSIeaD2TN7qBao53NFs=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index daf89824c593..bd243df7ba47 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.483";
+  version = "3.2.490";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-KkJ0XfPS0vJNcI03pusYLx/nqXFeY4b6+KoT7aCokQI=";
+    hash = "sha256-QK4dPF+3F53chmN2WSDkVkrnB+XFSAKWuxqQe1M8nu8=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix
index eb67c1d1b27a..e1d0989d0997 100644
--- a/pkgs/by-name/ch/checkpwn/package.nix
+++ b/pkgs/by-name/ch/checkpwn/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/brycx/checkpwn";
     changelog = "https://github.com/brycx/checkpwn/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "checkpwn";
   };
 }
diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
index 95f0f12aaa98..5a930e546f9e 100644
--- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json
+++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
@@ -1,4 +1,12 @@
 {
+  "@biomejs/cli-darwin-arm64@npm:2.2.4": "5cd937e3a57ce9ba97e63e1062fd2b2cdfa1ba6506bee78e9b62a5e1499b8d9845e7a197e62de98a284012505a5abdd1b66a203613972166e46628ca02567e19",
+  "@biomejs/cli-darwin-x64@npm:2.2.4": "75cd8b221a7e4be8871650e0494016dc4116974fce8fff2e8f9cf085745abafcfa9e06a08c845f1d01f6a87d45fb5a5672972fbb51fbd891f35a49ec15cd2ce0",
+  "@biomejs/cli-linux-arm64-musl@npm:2.2.4": "5deb4f40d412442e81cbaf878d3e1adbf1fdae22cf5d178f5d56ce984bc6566962f99f162d7347201de0500a317ee3727ef32730b0ee6237a0814755f1ed7307",
+  "@biomejs/cli-linux-arm64@npm:2.2.4": "20c86551b3b71c342264e60cc9ceab2c16bfef935f318701d384dec26721e38757f94811a108cdabd3360b99309be44bb005388290d91f11b5869aba80d13a1d",
+  "@biomejs/cli-linux-x64-musl@npm:2.2.4": "6163fa95778bcee9b79aedb36117df9865f0f784bbb8bf55ba6df4544fd3b7fa5cf3e32eb77d863034d480c3c7c5014dadc5d137b8688e64e64e5093d5c1be1c",
+  "@biomejs/cli-linux-x64@npm:2.2.4": "84fbf9d4b681ad4426c5de492b4ab9200a15d4f61a71c69d4b6bfbe8f03f46e69bb951a93a85d71e0073bcf3ee1874530dad2eac3dbdd72c6084dfb59c83a1fd",
+  "@biomejs/cli-win32-arm64@npm:2.2.4": "39d4e2ac5a41b7c092bc9a3ef1889a557b47eb15f9057db823681c1483702ee6fe96a5b2e54a444ca6e867db5d41f2e9f6a1a6dd86d13fcb686dab5d19d02333",
+  "@biomejs/cli-win32-x64@npm:2.2.4": "741c77e74d4fcfbf74f3f5db2e29cb6bca90cd7b1c5e6af3b0cc8b5c3210b0b1f82019733e9849d18fa9fc4fe96fb4633974a2146447cc914249caf0636741e7",
   "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
   "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
   "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
@@ -57,19 +65,20 @@
   "@napi-rs/system-ocr-darwin-x64@npm:1.0.2": "92b68b7e6a4be82b24fcc952d2c820e07bf68fb625d3c69edbcbf13227be508302f87ba9b0ff50d415c76ac16493d11040b6cc55a5b25f4414f3af5c00ab4597",
   "@napi-rs/system-ocr-win32-arm64-msvc@npm:1.0.2": "5c6945c5053380ee33df277df77ac813cc44763e9f305ea0b0990d3960269676ffe88bdd33038fa378d055c9986b7ecc31cbabc7f8fb51e077c59364a9ea29ec",
   "@napi-rs/system-ocr-win32-x64-msvc@npm:1.0.2": "9d6ebdaa753cea6f6e2e5b1b01ba293a7cd79ffd265bf5144f96f09bd596df21612662d7f62973886dd75725a029971cc3f11451ab95933bca5441b02593f352",
-  "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
-  "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
-  "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
-  "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750",
-  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144",
-  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1",
-  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e",
-  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0",
-  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690",
-  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d",
-  "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
-  "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
-  "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
+  "@oxlint-tsgolint/darwin-arm64@npm:0.2.0": "89b0844bb4be9406efbda457fcf9be852039f6c48dc24547135451417e98fe1cd5c0a13a66cd559cad1b70901fc6ee55532dc9975929384c09e071256e6cfb70",
+  "@oxlint-tsgolint/darwin-x64@npm:0.2.0": "307de5743240c6f01d7087c6c620b608b0c51d36431df7e345a6699939ea16129494c449b6dd8351277bc37c92ba1e92020cc1155a88efbe2a124f44fc78b5b1",
+  "@oxlint-tsgolint/linux-arm64@npm:0.2.0": "4292cc00a8f5b6d06eb83abd8bfb80b369eb5d7ede91b6e80716bf81a81df557b47a59690a3af7ab858008ce4d02b50c74bbe0fc7530eaadbcc12cd8f1ff0c4c",
+  "@oxlint-tsgolint/linux-x64@npm:0.2.0": "c73ebab4bc4c7891873043479ee89894a575ba93f91fc0793cfc2f38f68d58b8b09980c5c9ebd037c404687e38d2f15966e9bfeab9685b40522266ef909fb047",
+  "@oxlint-tsgolint/win32-arm64@npm:0.2.0": "6735f85196fc4c2aa5885cb7bf8b956b460f6b003589959bb83d0cab049a7fe8257a228e7bba403dba08e57b944c2a78c97087ded3e104edb340d964f604fd77",
+  "@oxlint-tsgolint/win32-x64@npm:0.2.0": "3621b288e32c42bc71ff33b083e5ae7c941a6b13654d10a1647ebe706fe3077ae581fc85cffc70ca6d956d610abeeb254fc19ecfc3d3ecb4dde2ce1ef3b5be03",
+  "@oxlint/darwin-arm64@npm:1.15.0": "f6350a1c41a9056730dcd2cf7c10475a179f9561b01587e02becbb690c40ad597ed2796c9798c709ef8fcd43f789fea99734e51cb307f5ae9a35484fa0b95122",
+  "@oxlint/darwin-x64@npm:1.15.0": "ee808953fb0091ae283bac113b393a7cbf7820b26d5f8447d9a6b4357202260f9ef0612fb4fdb4ce7e386945c3bf5eb2ecaa5950d32f1e3400b6f0a977c9bfed",
+  "@oxlint/linux-arm64-gnu@npm:1.15.0": "fce42e368fff682bfdd374cc414e1f942dc37a168c58d1ca3ab67f3ea11596aa7f0a7f7ed59bef7d1701708df283f6b076ea89f6684f3ce9efcdccf8db392dee",
+  "@oxlint/linux-arm64-musl@npm:1.15.0": "35029e792bbfe5eb70dfeecd59a20f7cfc7b55f88ed15c3d02fa5ce64f12e4136b640a245f432e195217dec028f1f389c6236c079d35de2309e68b1f6bf9e8b6",
+  "@oxlint/linux-x64-gnu@npm:1.15.0": "959f2887182015cd034a877fc0f8c5beaeb95a1800978a8ad3c1ba036ff3d3308fe0c4bbd99094cdc24b83bdd0314e638e376670a5b8ba6e1c926adb94110e4d",
+  "@oxlint/linux-x64-musl@npm:1.15.0": "47e0ced945de40ae987067d25c1c8968b5650efd2ea1baa3319677d197130376ab7077d71c2dc940d8ab4bb2fed41d9049dd10e9312f7f1039cf42e68ace06d6",
+  "@oxlint/win32-arm64@npm:1.15.0": "d5e2933f5cff87c4e2a676e14345a1874b8c806b65ac662384a8ce93f8855132d6ea6092bee370f531e8d80d9bdd62721659f38370b0841476c4fc488d4e850a",
+  "@oxlint/win32-x64@npm:1.15.0": "f54c36908a63656f2a8e803ab94be45d7b59bfcbe7519ec951d1ae2f42f9019d247c97a1e61a1d74acaa05bba19873999c15a2cd1dc0cefc4e2a7a5be92e88c6",
   "@rolldown/binding-android-arm64@npm:1.0.0-beta.34": "98334e08fe3f9acafa1e0c337d74138a93892dbb2b03e53b79ab3fff5cecb34406493af97e454b3c76e27ac1f9f65496d54cf7c904a2cdba4bf1eabddb5bbd50",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34": "d753421b3ee4da8ed6b67072064947a17122e138609652ce5534e97aff420e63a463c2fab0a678a1b0483b1e323c8392d671e5c8b415ade92f54e98235ebde62",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
@@ -97,16 +106,35 @@
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34": "70bbbc04e01c437a58c89f7b8ec249a9e43eb7b4336323efaf7abf46fa6445f087ee1286edb454658b9f4f4e54daf906059cc8484613be2d5b174c905dc44518",
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
   "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
-  "@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665",
-  "@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa",
-  "@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c",
-  "@swc/core-linux-arm64-gnu@npm:1.11.21": "203995730e55bfe640055a7adbb0c6b133c698aa018394d0338d00d311b10f874e46cdc0579585fb443505a3361b3da185436ad9fea553ecbed697a4f810ea7e",
-  "@swc/core-linux-arm64-musl@npm:1.11.21": "9618139c32eefd5acf184fc0c5e09986f170cec1069296a274c32b694a5a2129ae7aa21b8d016d5c186574929f05d456c6f4babdd0e528021dee4c51605da2d8",
-  "@swc/core-linux-x64-gnu@npm:1.11.21": "886a4f4a3ad6d0d3b437a250bf36b0395b34f4731381ce1cbbe43b05fb7ab4aa12a23c3f0e33bc4b2703ebcdad9a7e3fc18b7481a79e372ecc331c1e3eca1437",
-  "@swc/core-linux-x64-musl@npm:1.11.21": "069f33ba7b9376494f7345efed1c845e201857bbe5ba165ca8026760989344eaf0e5efbbc7f711a6c776385aa5ad383cee75543687c024854acb296c4e4752c1",
-  "@swc/core-win32-arm64-msvc@npm:1.11.21": "05ea5df6614075ec8487a91cb047a30aebeef3f142232a2feb0a475c85f2d64a876aef4183849f43480b9b5786afad7b3cb2bc1f53060d71ab6ff439a71317f3",
-  "@swc/core-win32-ia32-msvc@npm:1.11.21": "ad1ba754c36131238f2ac8ec51ffc4b987888b45b3008c0fbdd31d85d6fc039f8dd9c5d188c24cb72c4f4f345090a4dcfbcbfd840e954b7aeeb2974e0baf0e4a",
-  "@swc/core-win32-x64-msvc@npm:1.11.21": "0fb0c108c2e4a3bd82251f7552c9daa8c243829617bee7d954d1b0e021214184ead5c08dd108b3a5ac2d501797db794246a25867970ef2082f844f47b5b25070",
+  "@swc/core-darwin-arm64@npm:1.13.3": "f3cdf75ccc7b66d8c4b2bb7a5664542a904821bd7f08f91e3e399112dcb4436ee9a7df306a80e58a80a31b20b9b69f830a2dca91d74e62bbe6c72cde84c75d66",
+  "@swc/core-darwin-x64@npm:1.13.3": "c3515f878f50eb6730da948c10aec867b16f64fefbbc72fdfd9bde385ce84cfc606e87534dd77fbc817fc08bb144a2ea61e1c3e5fffd6b2e9a68b71eebb49a77",
+  "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "8ec4f056982f779e55ad7d52f4f5ee4928ee48620977b2c4d3f47232d5cea119f47adaad9ca7bb7b1f261535ce5c19c0b2506c41da76e90c7fc7fc3a0e505d06",
+  "@swc/core-linux-arm64-gnu@npm:1.13.3": "d2804f542f5f78681ad4cc643dd32c7c948d94b7d2878fadcc465d0cbc4480147ed99298b4eed8f3c5d9cceba8bd1b1cc0f79e1754f23d6af5ccdcb6616b37b6",
+  "@swc/core-linux-arm64-musl@npm:1.13.3": "5d62f789505e5d72a08add9c35a12d85c23c18068dc627fb97deaea8be6d4910e2fd7afb63c03bbcefdf95a45ab4bf0c8534edf12d177c7facd2571d1c0ec2a5",
+  "@swc/core-linux-x64-gnu@npm:1.13.3": "a3d17ea9fb821fbced3d251fb03558bc25d29d5c289f96d87001f2ce17838c6de4e31365da9b95d21ed68b1dcfb6790c34457d7e0ce5c8a38dac7c0ed51937db",
+  "@swc/core-linux-x64-musl@npm:1.13.3": "fc7f7197f7fac7c068fd408d454ad62ff91f956db603d17b6133db7f28f606899fcd31075ca206970e9fce6a69a9e18dc33a82e1094ec142fc906b02be3a5d19",
+  "@swc/core-win32-arm64-msvc@npm:1.13.3": "bb4b197e4ffbf02dd5d3714af345fd41f7b6d6606d08f88f164be468ddade90c2e9912964b7da18863246ebe5b368dfd6a6f52fae4ffa517ab52f73d3cd9b8b3",
+  "@swc/core-win32-ia32-msvc@npm:1.13.3": "c244aa591eb71dac4316b2062e19217710f76fa217c84517e3c64c5cbbfa6a74ccab3322a92f183d47f34fff371bc1ddce93ad2c88c2f72a0265a6d009b0dbeb",
+  "@swc/core-win32-x64-msvc@npm:1.13.3": "b1ab6ee1ce12249259995c2997586e289225eb12066c95d14f829152a48a389eb5a3f99312f7953e4f62a1e0468c61900d59e3583be53b64d7854df2a4716b80",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.13": "fbdff27e98b9781cd54b1e959b8ab5dc60ef7a9dd9cb0b01b947441f0e88c9b0e25b66a72de37c8a099e09e444f38e134f33be13490af6d35070c6f9375a55b0",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.13": "1814b1f5773b1e5f70f86bcb533733bc64ffe9b01200d999981052dbfac2c05c92e3a79c08aa42a78725dadaa04b67652b4466738494a94135dce5d2996ae4be",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.13": "bfb11311a1d76631543dcfdbba1fa9a96464bd4730d51c8b6694745de62f08f93d07f5763aaea5895e3f35998d185be44373605a8d6da95b2df4a2db9a450d55",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.13": "e7ed50f10e35bbc3ef46a0bf8b12a478ec09de8fb4d2054605106b2f9402eda8a2c0e2521a85cb740ad0407ff4c9aa367021b1577e5cd75fac91a365cbf55804",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.13": "bd882a8a8c34e6d6f6318fd4e717995e811a0eee322e2de37a9abd6e488bc2771fd0ba14bbca237e3e544a2d9fc9c1cf33620a77eb45cf1848d03ee27b17baef",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.13": "9d575d7e6b7fae40e363c8de6f7d8db06e057c9b1cec12279e2e794e07af22d1866de0f2e7d7387d6de505e03efd042385b862303b89438cb903458ffd351fd3",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.13": "9a43e73d911da442b9014f90c5dada89fa58d114f92509c8a706cd26fe17630abf3de8ae1cb32e651389ca2349ce42f99b8d4837eafc399cfef65e9894e61013",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.13": "15ba6fea2bd318e0053497e73638bffae4501762536796483442ef8dd6600d9085cb29916573286acab15533fe10139853e11f4c1fc59ba4da3192c0b0915b56",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.13": "364d9299460d703c0ef4d8fbe413f30288233e2aee81f1a77984a8c7831e4e997a4c49bfe0f16d0495b7102444db6abc82b75bac99babe4b78929fd906a5136e",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.13": "39f07aca836ff9c24c498af84d504fd1e28e21d7eb9202156217ae9ce519274532d5dfa6056c5ae62d175753e2cf74d6f0d6077f28c3c0b75dca468573eed9f0",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.13": "99c2cbdcb0144164f84ba2a31241232a7bb2cf68201e8f0c22da57be47a92a2b5302ec3c1f822fe48cb49ba4e1dc587374b07f004360c3de724c3ad5f9ba4b0f",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.13": "ce35239ff4439e717aec9c31f5315ece74b47e444eccb288ee195ac63d84699d4116397e87698e717f7dd1b8b27be1049f3605e04fb7a78b720d25cde5b82340",
+  "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20250915.1": "9aaa1e3b19f80dd19df4e0aeeba682ab8df25855a0673dc8e4fa9a60fdf5c330f66776c7fac0ed0d4308792e115f75dc6e6fa9c0557647715b4d35c4fd440927",
+  "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20250915.1": "44b68a689879364b150b38d9075814d5d502fae9188b7b73b630c5812e0a4f2c3fe07b854f5df6ddc87802a5bbc566b9240f187c78de855d647654980d5508e0",
+  "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20250915.1": "9f7b57723ffba13e32e535f5de7cd98e8b607b3609c8cc830b97c09415e1a0a93b09555da12d9994efbbfdcbdfb1e2724b9ee4fa272490757241493f3e15934b",
+  "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20250915.1": "b39223bc14371d963bc6614c8b0e0215c81a2a39cbed686e0848a47511c379e23491a8b086d2b44df7f519994ef2314039153b1101d6ad188c61f0fadad2f1e8",
+  "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20250915.1": "c4efcb6cd0ca92eb12f31f6032d2025d3771a9e6ef98f5fe22de97cc6bc4b09e8793fd5e3bf3136a6bf5999534db299794a5d7f59a7ba42dcf4b49ffa538783d",
+  "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20250915.1": "e32b96a6fff599b138965903c50c546290ea257f812f6c5ad85d84d9c2550039d314f1eb801f00728aecbe757f39a7361f890dcc39798277c2c662c7c3caff84",
+  "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20250915.1": "6df4add8a206102964baf252953444ef21861d89eeba7936311e8bd4ac2c37b01e3a870fcb1fe6bed6b2b402ed80cc229bdf11e4c13bf32b6fe942e4f11abf10",
   "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
   "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
   "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 2c02468c7299..5e8bc1f788c4 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   yarn-berry_4,
   nodejs,
-  python3,
   electron_37,
+  autoPatchelfHook,
   makeWrapper,
   writableTmpDirAsHomeHook,
   makeDesktopItem,
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.5.11";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XJFqoluI3ZwmqxhKpJANqOxkYP3Va7pXXyWOHSLopwc=";
+    hash = "sha256-9oEMnGaloY3tFY/qpjTlYbO7n1ORIK49s3N9SGSMvHE=";
   };
 
   postPatch = ''
@@ -42,17 +42,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-k23HzIN8QAkV/IREM5fHHeaMjO+cIthpLNrLKn4g7tY=";
+    hash = "sha256-LstTTVKXVL6hIC5TiUKeBIcDFaRPdmEjO2LmvVXB7dQ=";
   };
 
   nativeBuildInputs = [
     yarn-berry.yarnBerryConfigHook
     yarn-berry
+    autoPatchelfHook
     makeWrapper
     writableTmpDirAsHomeHook
     copyDesktopItems
-    (python3.withPackages (ps: with ps; [ setuptools ]))
     nodejs
+    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
   ];
 
   env = {
@@ -63,11 +64,15 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
+    cp -r "${electron.dist}" $HOME/.electron-dist
+    chmod -R u+w $HOME/.electron-dist
+
     yarn run electron-vite build
-    yarn run electron-builder --linux --dir \
-      --config electron-builder.yml \
-      -c.electronDist="${electron}/libexec/electron" \
-      -c.electronVersion=${electron.version}
+    yarn run electron-builder --dir \
+      --config=electron-builder.yml \
+      --config.mac.identity=null \
+      --config.electronDist="$HOME/.electron-dist" \
+      --config.electronVersion=${electron.version}
 
     runHook postBuild
   '';
@@ -88,7 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv "dist/mac-${stdenv.hostPlatform.darwinArch}/Cherry Studio.app" "$out/Applications/Cherry Studio.app"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     mkdir -p $out/opt/cherry-studio
     ${
       if stdenv.hostPlatform.isAarch64 then
@@ -102,7 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags $out/opt/cherry-studio/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
-
+  ''
+  + ''
     runHook postInstall
   '';
 
@@ -113,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/CherryHQ/cherry-studio";
     changelog = "https://github.com/CherryHQ/cherry-studio/releases/tag/v${finalAttrs.version}";
     mainProgram = "cherry-studio";
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     license = with lib.licenses; [ agpl3Only ];
   };
 })
diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix
index 34bbe713dc0e..b4d993e7bb48 100644
--- a/pkgs/by-name/ch/cherrybomb/package.nix
+++ b/pkgs/by-name/ch/cherrybomb/package.nix
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/blst-security/cherrybomb";
     changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index 0eea53f8bd98..c09310a7a1ab 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "chez-scheme";
-  version = "10.2.0";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "ChezScheme";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wAEnuC6hktCK/l00G48jYD9fwdyiXkzHjC2YYVeCJXo=";
+    hash = "sha256-5h9W4Tdn8EKEhdecKttLOn8J2OfNp5iaIg017UIk3CI=";
     # Vendored nanopass and stex
     fetchSubmodules = true;
   };
diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index 4716ccdf019c..c5020954c8d1 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -7,16 +7,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "chezmoi";
-  version = "2.65.0";
+  version = "2.66.2";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-neUltKkmNUtTajTwfWIIM9sJfDSXuAqJT3uLq6vR5NE=";
+    hash = "sha256-TYEVMxebA4dvWMmgx4bMv1UKO2YGH+D+lZuiAu8ZmI4=";
   };
 
-  vendorHash = "sha256-NQ7k9bydAJDOGRX3bvRGkX5FuU8Va1IjUa6h0JEiLzo=";
+  vendorHash = "sha256-g9bzsmLKJ7pCmTnO8N9Um1FDBvQA0mqw14fwGYMb/K0=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 778471e975ad..835331ebcd98 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.3.2";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-k5fxU3HWhlYlBjmHNsj4lin7LHdwswbwm5bCVmCMjg8=";
+    hash = "sha256-gDD/1NKqPH84nr+EjTFfMGZkZfskQujn+uRGrnGs/fg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-oR1SCEbMMDfQyvhoUJzBiK4VHCZwx+o/PaZBfxPB2K8=";
+  cargoHash = "sha256-jSdUKkZBgpMN05FmZUXHqBszuDAByf6bzIaaRNfymGY=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url
diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/by-name/ch/chiaki-ng/package.nix
similarity index 71%
rename from pkgs/games/chiaki-ng/default.nix
rename to pkgs/by-name/ch/chiaki-ng/package.nix
index 3ec054b901ed..8c38f73641da 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/by-name/ch/chiaki-ng/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   stdenv,
   cmake,
   pkg-config,
@@ -8,13 +9,6 @@
   python3,
   ffmpeg,
   libopus,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qtwayland,
-  qtdeclarative,
-  qtwebengine,
   SDL2,
   libevdev,
   udev,
@@ -33,6 +27,7 @@
   lcms2,
   libdovi,
   xxHash,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,15 +37,23 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7pDQnlElnBkW+Nr6R+NaylZbsGH8dB31nd7jxYD66yQ=";
     fetchSubmodules = true;
   };
 
+  patches = [
+    # fix for building with Qt >= 6.10 -- remove when updating past 1.9.9
+    (fetchpatch {
+      url = "https://github.com/streetpea/chiaki-ng/commit/fe5bfd87998c7ca67ade76436e31ab9924000c8b.patch";
+      hash = "sha256-7Eo5tcmhgbQszBrgtTGrnH34GewJXXAYSKqvqGN/viI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     protobuf
     python3
     python3.pkgs.wrapPython
@@ -61,12 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ffmpeg
     libopus
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtdeclarative
-    qtwayland
-    qtwebengine
+    kdePackages.qtbase
+    kdePackages.qtmultimedia
+    kdePackages.qtsvg
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
     protobuf
     SDL2
     curlFull
@@ -108,16 +111,16 @@ stdenv.mkDerivation (finalAttrs: {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://streetpea.github.io/chiaki-ng/";
     description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
     #
     # See also: <https://github.com/spdx/license-list-XML/issues/939>
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ devusb ];
-    platforms = platforms.linux;
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ devusb ];
+    platforms = lib.platforms.linux;
     mainProgram = "chiaki";
   };
 })
diff --git a/pkgs/games/chiaki/default.nix b/pkgs/by-name/ch/chiaki/package.nix
similarity index 64%
rename from pkgs/games/chiaki/default.nix
rename to pkgs/by-name/ch/chiaki/package.nix
index 608664d61ad5..76bba18cd7c4 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/by-name/ch/chiaki/package.nix
@@ -6,24 +6,20 @@
   pkg-config,
   ffmpeg,
   libopus,
-  mkDerivation,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
   SDL2,
   libevdev,
   udev,
-  qtmacextras,
   nanopb,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "chiaki";
   version = "2.2.0";
 
   src = fetchgit {
     url = "https://git.sr.ht/~thestr4ng3r/chiaki";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk=";
   };
@@ -31,14 +27,21 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+    'cmake_minimum_required(VERSION 3.2)' \
+    'cmake_minimum_required(VERSION 3.5)'
+  '';
+
   buildInputs = [
     ffmpeg
     libopus
-    qtbase
-    qtmultimedia
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtsvg
     SDL2
     nanopb
   ]
@@ -47,19 +50,19 @@ mkDerivation rec {
     udev
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    qtmacextras
+    libsForQt5.qtmacextras
   ];
 
   doCheck = true;
 
   installCheckPhase = "$out/bin/chiaki --help";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.sr.ht/~thestr4ng3r/chiaki";
     description = "Free and Open Source PlayStation Remote Play Client";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "chiaki";
   };
-}
+})
diff --git a/pkgs/by-name/ch/chicago95/package.nix b/pkgs/by-name/ch/chicago95/package.nix
new file mode 100644
index 000000000000..d3a9e61289a7
--- /dev/null
+++ b/pkgs/by-name/ch/chicago95/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "chicago95";
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner = "grassmunk";
+    repo = "Chicago95";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-EHcDIct2VeTsjbQWnKB2kwSFNb97dxuydAu+i/VquBA=";
+  };
+
+  nativeBuildInputs = [ gtk3 ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes
+    mv Theme/Chicago95 $out/share/themes
+
+    mkdir -p $out/share/icons
+    mv Icons/Chicago95 $out/share/icons
+    gtk-update-icon-cache $out/share/icons/Chicago95
+
+    mkdir -p $out/share/sddm/themes
+    tar -xzf KDE/SDDM/Chicago95.tar.gz -C "$out/share/sddm/themes/"
+
+    mkdir -p $out/share/fonts
+    cp Fonts/vga_font/* $out/share/fonts
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Windows 95 theme for GTK";
+    homepage = "https://github.com/grassmunk/Chicago95";
+    changelog = "https://github.com/grassmunk/Chicago95/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      gpl3Plus
+      mit
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ GabrielMaguire ];
+  };
+})
diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index ff62fe6c1ad4..2b8bcba2d8f1 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-10-09";
+  version = "0.4.0-unstable-2025-10-30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "abd542d16e7351ae7fff3c56b40172315dcf690c";
-    hash = "sha256-ncO+/M4ZU0yZOd2DeL9ZCmZS+FhrByeiOtlY/By7bmQ=";
+    rev = "a3b973cceb46e431423b3599fb365668958963d5";
+    hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
index 05b8e3e5b12c..79d6f3f60367 100644
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-concentratord";
-  version = "4.5.2";
+  version = "4.5.3";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-concentratord";
     rev = "v${version}";
-    hash = "sha256-g7GlpibXAS3Nup/mYB2DEP+6UWjYHbSnPHRdpl+3ukA=";
+    hash = "sha256-D/zp3stjV0EUnUZlEVQ7YwFlczTxG0f0ABPban0JhPM=";
   };
 
-  cargoHash = "sha256-2ukynvY3ybu5t22PA5sbx3ehlA5aHjbw9v+0y9Bf4TY=";
+  cargoHash = "sha256-7l/42l1rFX7HXdhgA34FXWpQjksGCnHeARC5YupA2nE=";
 
   buildInputs = [
     libloragw-2g4
diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
index e2e700e9197a..87c66935d2fb 100644
--- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-mqtt-forwarder";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-mqtt-forwarder";
     rev = "v${version}";
-    hash = "sha256-HopcEwj/WOialvttVJ6bTyRRTqrgfIJ/dYKti5T87Os=";
+    hash = "sha256-qkktkydg5Xe6q5IFalkxtGjO2zK9mZVMnKOBassiEtk=";
   };
 
-  cargoHash = "sha256-uR+Y8+/XbIQdbGOoS/tHBo/r7DLiwiRiaXQ7CjaPpoI=";
+  cargoHash = "sha256-rQPmFmra9Gd8XDP9HuTZZru780RmmqWEKX2iuuRkZQw=";
 
   nativeBuildInputs = [ protobuf ];
 
diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
index f1f69318444c..45acd2ff014d 100644
--- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix
+++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "chirpstack-rest-api";
-  version = "4.14.1";
+  version = "4.15.0";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-rest-api";
     rev = "v${version}";
-    hash = "sha256-DHDrnChRikVDJhdCcoHlFn3sYfjEvWpzUsMkuIoqQiw=";
+    hash = "sha256-YSMdE0f3usedyUItSvdtJ77L/x4rwrgIJa1TTg9ODek=";
   };
 
-  vendorHash = "sha256-BthdLFhzrAiZTI/afsNgKhgCj1QQHabU37sH9ovIDdU=";
+  vendorHash = "sha256-+lAfgFb45WxZYh5fzONECRwTlXA64nl58rfstOPsDEg=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix
index f31d82f28468..db5df2fb21e5 100644
--- a/pkgs/by-name/ch/chit/package.nix
+++ b/pkgs/by-name/ch/chit/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/peterheesterman/chit";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix
index 04a74c40d901..7a36bdfd60f8 100644
--- a/pkgs/by-name/ch/choose-gui/package.nix
+++ b/pkgs/by-name/ch/choose-gui/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   xcbuild,
-  apple-sdk_11,
 }:
 
 stdenv.mkDerivation rec {
@@ -19,8 +18,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ xcbuild ];
 
-  buildInputs = [ apple-sdk_11 ];
-
   buildPhase = ''
     runHook preBuild
     xcodebuild -configuration Release SYMROOT="./output" HOME="$(mktemp -d)" build
diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index a5fc34ebfda2..b65941f8d089 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -1,38 +1,21 @@
 {
   alsa-lib,
-  at-spi2-core,
-  brotli,
   cmake,
   curl,
-  dbus,
   libepoxy,
   fetchFromGitHub,
-  libglut,
   freetype,
-  gtk2-x11,
   lib,
   libGL,
   libXcursor,
-  libXdmcp,
   libXext,
   libXinerama,
   libXrandr,
-  libXtst,
-  libdatrie,
   libjack2,
-  libpsl,
-  libselinux,
-  libsepol,
-  libsysprof-capture,
-  libthai,
   libxkbcommon,
   lv2,
-  pcre,
   pkg-config,
-  python3,
-  sqlite,
   stdenv,
-  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,34 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     alsa-lib
-    at-spi2-core
-    brotli
     curl
-    dbus
     libepoxy
-    libglut
     freetype
-    gtk2-x11
     libGL
     libXcursor
-    libXdmcp
     libXext
     libXinerama
     libXrandr
-    libXtst
-    libdatrie
     libjack2
-    libpsl
-    libselinux
-    libsepol
-    libsysprof-capture
-    libthai
     libxkbcommon
     lv2
-    pcre
-    python3
-    sqlite
-    util-linuxMinimal
   ];
 
   cmakeFlags = [
@@ -88,6 +54,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"
   ];
 
+  postPatch = ''
+    substituteInPlace modules/chowdsp_wdf/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   installPhase = ''
     mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin
     cp -r ChowKick_artefacts/Release/LV2/ChowKick.lv2 $out/lib/lv2
@@ -95,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: {
     cp ChowKick_artefacts/Release/Standalone/ChowKick  $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Chowdhury-DSP/ChowKick";
     description = "Kick synthesizer based on old-school drum machine circuits";
-    license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ magnetophon ];
-    platforms = platforms.linux;
+    license = [ lib.licenses.bsd3 ];
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
     mainProgram = "ChowKick";
   };
 })
diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index b3a80202c92c..02d631076bb6 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -97,7 +97,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeBuildType = "Release";
 
-  postPatch = "cd Plugin";
+  postPatch = ''
+    cd Plugin
+    substituteInPlace modules/RTNeural/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
 
   installPhase = ''
     mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/
diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix
index 89674dc9f6a0..70e5fd0e8b8a 100644
--- a/pkgs/by-name/ch/chromaprint/package.nix
+++ b/pkgs/by-name/ch/chromaprint/package.nix
@@ -75,12 +75,12 @@ stdenv.mkDerivation (finalAttrs: {
       };
 
       # sha256 because actual output of fpcalc is quite long
-      expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac";
+      expectedHash = "e2895130bcbe7190184379021daa60c5f5d476da4a2fecb06df7160819662e20";
     in
     ''
       runHook preCheck
       tests/all_tests
-      ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"}
+      ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc -plain ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"}
       runHook postCheck
     '';
 
diff --git a/pkgs/by-name/ch/chrome-pak-customizer/package.nix b/pkgs/by-name/ch/chrome-pak-customizer/package.nix
index 26f5711143f6..4788ec02120a 100644
--- a/pkgs/by-name/ch/chrome-pak-customizer/package.nix
+++ b/pkgs/by-name/ch/chrome-pak-customizer/package.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Simple batch tool to customize pak files in chrome or chromium-based browser";
     homepage = "https://github.com/myfreeer/chrome-pak-customizer";
diff --git a/pkgs/by-name/ch/chrony/package.nix b/pkgs/by-name/ch/chrony/package.nix
index 602da83f6b2f..024e59cce880 100644
--- a/pkgs/by-name/ch/chrony/package.nix
+++ b/pkgs/by-name/ch/chrony/package.nix
@@ -62,8 +62,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   doCheck = true;
 
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
   passthru.tests = {
     inherit (nixosTests) chrony chrony-ptp;
   };
diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix
index 4a6cf1ce92ae..f43c48e79fed 100644
--- a/pkgs/by-name/ch/chsrc/package.nix
+++ b/pkgs/by-name/ch/chsrc/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chsrc";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "RubyMetric";
     repo = "chsrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W59c78U7fZ4nlSm4Yn7sySYdMqS848aGAzqHh+BVEpA=";
+    hash = "sha256-AgyaaKPCyqivCMd6VrV1Fiu6D/bvgW/faztVByjghiQ=";
   };
 
   nativeBuildInputs = [ texinfo ];
diff --git a/pkgs/by-name/ci/ciftilib/package.nix b/pkgs/by-name/ci/ciftilib/package.nix
index 83a58b6bc351..a9c37a0f4f0b 100644
--- a/pkgs/by-name/ci/ciftilib/package.nix
+++ b/pkgs/by-name/ci/ciftilib/package.nix
@@ -38,11 +38,19 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "CMAKE_POLICY(VERSION 2.8.7)" "CMAKE_POLICY(VERSION 3.10)" \
+      --replace-fail "CMAKE_POLICY(SET CMP0045 OLD)" ""
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/Washington-University/CiftiLib";
     description = "Library for reading and writing CIFTI files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     license = licenses.bsd2;
   };
 }
diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index 59f2c448423b..950f2384ae0d 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "cilium-cli";
     tag = "v${version}";
-    hash = "sha256-zmVSryOp+4QDm83yJFwUld/NlZEHZtV0BJABqBcMirE=";
+    hash = "sha256-6/ECHhPV9rJHcHFVAvkwtlZi96rjhEe2PjEvXtv8OMY=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index 81d2b034dad9..d5c1082760ab 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SUbEanFIvjj2wyy/nuq+91F5on7wuLWcpVt1U8XWjRI=";
+    hash = "sha256-M1p8rwdNEsKvZ1ssxsFyfiIBS8tKrXhuz85CKM4dSRw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
-  cargoHash = "sha256-NL5vsuSNKduRW2TaXWFA0pjszVa8EYU5cRaTZHCooLU=";
+  cargoHash = "sha256-Ie6xq21JoJ37j/BjdVrsiJ3JULVEV5ZwN3hf9NhfXVA=";
 
   postPatch =
     let
diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 3b2220d8588b..42a1e2e9e47d 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     tag = "v${version}";
-    hash = "sha256-Hn49a+nGtF5kJ1ZM+rOXWH+dFG1nMSI/rIDF+9qlQk4=";
+    hash = "sha256-RPFEquxMRnNW+L6azcDmrIKXG27DAF2PxDmSB3ErOHk=";
   };
 
-  npmDepsHash = "sha256-896W5XbAGUcUa8gxeR72hg9fwTaUOR5a5hex8vS33gU=";
+  npmDepsHash = "sha256-h4Ipmmo0Jf6/rzCAKtLLCYrUi1anVKZSgy/kcEKDQJg=";
 
   nativeBuildInputs = [
     python3
diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index 44cb132e9f12..75045a06a51f 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.155.0";
+  version = "0.156.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "cirrus-cli";
     rev = "v${version}";
-    hash = "sha256-HMEd1G7CTK4P3fQ34wMOgd4GJ/7YALEL0UaqljB/44Y=";
+    hash = "sha256-9ha87R/TN0Tjl4VWoCEMKc+hnSTcFaeIURndrF2uMR0=";
   };
 
-  vendorHash = "sha256-ag1HzNrSqGTJGXxhdspxHsJRBu7tuB5nDFiEWh1VOsU=";
+  vendorHash = "sha256-czH0s9zxj6A8RMa4i6u3+2rIr8vfBe9ECTnAbQ7kK5E=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"
diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index 7578339877a7..3707b7df9731 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-0F8RF2vbuuLv39yIYQk7TdBw8CImcnMFQ9r+GSHGGiY=";
+    hash = "sha256-OnbIZAFlYQ6ofpipVZ7Y9LmLI68JSWY44Sn0+/DDS14=";
   };
 
   vendorHash = "sha256-TsaGXDUTvTsfDIBhM9+JwL2swEw/qSivn3NTA0tWkZw=";
diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index b52a910f59da..f6f2ce3a71dc 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec {
       url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch";
       hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8=";
     })
+    # Fix build failure with Rust 1.89.0 (https://github.com/cjdelisle/cjdns/pull/1271)
+    (fetchpatch {
+      url = "https://github.com/cjdelisle/cjdns/commit/68b786aca5bfa427e5f58c029e4d9cc74969ef87.patch";
+      hash = "sha256-FmrooDzrIWUIAnzwZTVDXI+Cl8pMngPqxsJjUHVhry8=";
+    })
   ];
 
   cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";
@@ -81,8 +86,9 @@ rustPlatform.buildRustPackage rec {
   passthru.tests.basic = nixosTests.cjdns;
 
   meta = {
-    homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
+    homepage = "https://github.com/cjdelisle/cjdns";
+    changelog = "https://github.com/cjdelisle/cjdns/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix
index 435a85ea4cb5..5d4aad31b6f4 100644
--- a/pkgs/by-name/cl/claude-code-router/package.nix
+++ b/pkgs/by-name/cl/claude-code-router/package.nix
@@ -13,20 +13,15 @@ let
 in
 buildNpmPackage' (finalAttrs: {
   pname = "claude-code-router";
-  version = "1.0.59";
+  version = "1.0.64";
 
   src = fetchFromGitHub {
     owner = "musistudio";
     repo = "claude-code-router";
-    rev = "4617d66492cf37539d9567044f6ffec7844af2ee";
-    hash = "sha256-LC1JIOLaNLYNIIDofgFj+is4mwLjRjD3aAOt/nHRUmo=";
+    rev = "1a4462a92362e8c41d4539dc1a79fb85fccf9559";
+    hash = "sha256-q818e8PcKjdBqYk6WfGLKQ8pybXWVxmNV8KX7GjEQq0=";
   };
 
-  patches = [
-    # pnpm install --fix-lockfile --lockfile-only
-    ./pnpm-lock.patch
-  ];
-
   postPatch = ''
     substituteInPlace src/cli.ts \
       --replace-fail '"node"' '"${lib.getExe nodejs_24}"'
@@ -34,9 +29,9 @@ buildNpmPackage' (finalAttrs: {
 
   npmDeps = null;
   pnpmDeps = pnpm_9.fetchDeps {
-    inherit (finalAttrs) pname src patches;
+    inherit (finalAttrs) pname src;
     fetcherVersion = 2;
-    hash = "sha256-aPAY7JhzzYQero8f0/w3jtf5IwpDnoZCXGQKzRbj9aU=";
+    hash = "sha256-BLPGTbDvvI40kuXfE/p3+s9hkE0reXr7OJA6UGXN4ys=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch b/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch
deleted file mode 100644
index b060b630d425..000000000000
--- a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -356,6 +356,12 @@
-     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-     engines: {node: '>= 8'}
- 
-+  '@types/mute-stream@0.0.4':
-+    resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==}
-+
-+  '@types/node@22.18.9':
-+    resolution: {integrity: sha512-5yBtK0k/q8PjkMXbTfeIEP/XVYnz1R9qZJ3yUicdEW7ppdDJfe+MqXEhpqDL3mtn4Wvs1u0KLEG0RXzCgNpsSg==}
-+
-   '@types/node@24.7.0':
-     resolution: {integrity: sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==}
- 
-@@ -904,6 +910,9 @@
-     resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
-     engines: {node: '>=10'}
- 
-+  safer-buffer@2.1.2:
-+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-+
-   secure-json-parse@4.1.0:
-     resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==}
- 
-@@ -1026,11 +1035,18 @@
-   tr46@0.0.3:
-     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
- 
-+  type-fest@0.21.3:
-+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-+    engines: {node: '>=10'}
-+
-   typescript@5.9.3:
-     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
-     engines: {node: '>=14.17'}
-     hasBin: true
- 
-+  undici-types@6.21.0:
-+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
-+
-   undici-types@7.14.0:
-     resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==}
- 
-@@ -1253,7 +1269,7 @@
-       '@inquirer/figures': 1.0.13
-       '@inquirer/type': 2.0.0
-       '@types/mute-stream': 0.0.4
--      '@types/node': 22.18.8
-+      '@types/node': 22.18.9
-       '@types/wrap-ansi': 3.0.0
-       ansi-escapes: 4.3.2
-       cli-width: 4.1.0
-@@ -1386,6 +1402,14 @@
-       '@nodelib/fs.scandir': 2.1.5
-       fastq: 1.19.1
- 
-+  '@types/mute-stream@0.0.4':
-+    dependencies:
-+      '@types/node': 24.7.0
-+
-+  '@types/node@22.18.9':
-+    dependencies:
-+      undici-types: 6.21.0
-+
-   '@types/node@24.7.0':
-     dependencies:
-       undici-types: 7.14.0
-@@ -1956,6 +1980,8 @@
- 
-   safe-stable-stringify@2.5.0: {}
- 
-+  safer-buffer@2.1.2: {}
-+
-   secure-json-parse@4.1.0: {}
- 
-   semver@5.7.2: {}
-@@ -2054,8 +2080,12 @@
- 
-   tr46@0.0.3: {}
- 
-+  type-fest@0.21.3: {}
-+
-   typescript@5.9.3: {}
- 
-+  undici-types@6.21.0: {}
-+
-   undici-types@7.14.0: {}
- 
-   undici@7.16.0: {}
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 4d7863b7ee79..eebf0b81eb5b 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.15",
+  "version": "2.0.35",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.15",
+      "version": "2.0.35",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 49cba4d5eca1..370e33bc8d25 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.17";
+  version = "2.0.35";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-uQ+iosjjs6dUT8MtnFwubJqp85pBtBYkmIXTlRGufQw=";
+    hash = "sha256-cPy2xudIH1OVVzDlq5YAg1uFu59h6zDOvXpKaJ+fuP8=";
   };
 
-  npmDepsHash = "sha256-g03tfNJjx/KIUu14/mqranKR4G8mo9ig74iRgCdiJuE=";
+  npmDepsHash = "sha256-07MUZ8i6K/uLodyDM1kFnhGGkRB2uVf88CkbaAVw5jk=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh
index b9aed11abae8..a3fe5d871a99 100755
--- a/pkgs/by-name/cl/claude-code/update.sh
+++ b/pkgs/by-name/cl/claude-code/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell --pure -i bash --packages nodejs nix-update git
+#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git cacert
 
 set -euo pipefail
 
diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix
index e284e350b80f..f77834528d23 100644
--- a/pkgs/by-name/cl/clblas/package.nix
+++ b/pkgs/by-name/cl/clblas/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  llvmPackages_19,
   fetchFromGitHub,
   fetchpatch,
   cmake,
@@ -12,15 +13,19 @@
   opencl-headers,
 }:
 
-stdenv.mkDerivation rec {
+let
+  stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
+in
+
+stdenv'.mkDerivation (finalAttrs: {
   pname = "clblas";
   version = "2.12";
 
   src = fetchFromGitHub {
     owner = "clMathLibraries";
     repo = "clBLAS";
-    rev = "v${version}";
-    sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ=";
   };
 
   patches = [
@@ -33,6 +38,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
+
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/library/tools/tplgen/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   preConfigure = ''
@@ -59,15 +69,15 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/clMathLibraries/clBLAS";
     description = "Software library containing BLAS functions written in OpenCL";
     longDescription = ''
       This package contains a library of BLAS functions on top of OpenCL.
     '';
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
-}
+})
diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 10f9dcc93525..6f15691e9a9a 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "4.1.0";
+  version = "4.3.0";
 
   nodejs = nodejs_22;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-ntKxMlRBE0WoaO2Fmpymhm7y7kCwe197sotNzpK92C4=";
+    hash = "sha256-YC6wfa8bz21LhOH5YIRZ94rLxWl4f1m24jmAAsTvbS0=";
   };
 
-  npmDepsHash = "sha256-GsJlrz41q9GvFpYZcauuGXgMCG6mqSuI5gy+hxlJfUQ=";
+  npmDepsHash = "sha256-KCaLAlJtLsTpjWR8PQtgFYJg0zX5vtu78DKowjE6ygI=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix
index e81f6aac8ceb..5c1ed6fba19c 100644
--- a/pkgs/by-name/cl/clfft/package.nix
+++ b/pkgs/by-name/cl/clfft/package.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i '/-m64/d;/-m32/d' CMakeLists.txt
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required( VERSION 2.6 )' \
+      'cmake_minimum_required( VERSION 3.5 ) '
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix
index 75d614d1a623..6504ad9ade7b 100644
--- a/pkgs/by-name/cl/clickable/package.nix
+++ b/pkgs/by-name/cl/clickable/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "clickable";
-  version = "8.5.0";
+  version = "8.6.0";
   format = "pyproject";
 
   src = fetchFromGitLab {
     owner = "clickable";
     repo = "clickable";
     rev = "v${version}";
-    hash = "sha256-hQkRntdOlWLK+vVrdiWEkYIMK+ymEEC5ajh7+L2fH2g=";
+    hash = "sha256-rgIp4LCSUamImYhgFeG+XEpgnxHcKylWRB2CCx9u5S0=";
   };
 
   build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix
index 53ad8758f507..6399e1fecb17 100644
--- a/pkgs/by-name/cl/clickhouse/generic.nix
+++ b/pkgs/by-name/cl/clickhouse/generic.nix
@@ -1,8 +1,8 @@
 {
   lts ? false,
   version,
+  rev,
   hash,
-  nixUpdateExtraArgs ? [ ],
 }:
 
 {
@@ -27,6 +27,7 @@
   cargo,
   rustPlatform,
   nix-update-script,
+  versionCheckHook,
 }:
 let
   llvmStdenv = llvmPackages_19.stdenv;
@@ -34,6 +35,7 @@ in
 llvmStdenv.mkDerivation (finalAttrs: {
   pname = "clickhouse";
   inherit version;
+  inherit rev;
 
   src = fetchFromGitHub rec {
     owner = "ClickHouse";
@@ -127,6 +129,36 @@ llvmStdenv.mkDerivation (finalAttrs: {
     cargoSetupPostPatchHook() { true; }
   '';
 
+  # Set the version the same way as ClickHouse CI does.
+  #
+  # https://github.com/clickhouse/clickhouse/blob/31127f21f8bb7ff21f737c4822de10ef5859c702/ci/jobs/scripts/clickhouse_version.py#L11-L20
+  # https://github.com/clickhouse/clickhouse/blob/31127f21f8bb7ff21f737c4822de10ef5859c702/ci/jobs/build_clickhouse.py#L179
+  preConfigure =
+    let
+      gitTagName = finalAttrs.version;
+      versionStr = builtins.elemAt (lib.splitString "-" gitTagName) 0;
+
+      parts = lib.splitVersion versionStr;
+
+      major = builtins.elemAt parts 0;
+      minor = builtins.elemAt parts 1;
+      patch = builtins.elemAt parts 2;
+
+      # The full commit hash is already available here:
+      gitHash = rev;
+    in
+    ''
+      cat <<'EOF' > cmake/autogenerated_versions.txt
+      SET(VERSION_REVISION 0)
+      SET(VERSION_MAJOR ${major})
+      SET(VERSION_MINOR ${minor})
+      SET(VERSION_PATCH ${patch})
+      SET(VERSION_GITHASH ${gitHash})
+      SET(VERSION_DESCRIBE ${gitTagName})
+      SET(VERSION_STRING ${versionStr})
+      EOF
+    '';
+
   cmakeFlags = [
     "-DENABLE_CHDIG=OFF"
     "-DENABLE_TESTS=OFF"
@@ -152,6 +184,12 @@ llvmStdenv.mkDerivation (finalAttrs: {
   # https://github.com/ClickHouse/ClickHouse/issues/49988
   hardeningDisable = [ "fortify" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  preVersionCheck = ''
+    version=${builtins.head (lib.splitString "-" version)}
+  '';
+
   postInstall = ''
     sed -i -e '\!<log>/var/log/clickhouse-server/clickhouse-server\.log</log>!d' \
       $out/etc/clickhouse-server/config.xml
@@ -176,23 +214,27 @@ llvmStdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests = if lts then nixosTests.clickhouse-lts else nixosTests.clickhouse;
 
-    updateScript = nix-update-script {
-      extraArgs = nixUpdateExtraArgs;
-    };
+    updateScript = [
+      ./update.sh
+
+      (if lts then ./lts.nix else ./package.nix)
+    ];
   };
 
   meta = with lib; {
     homepage = "https://clickhouse.com";
     description = "Column-oriented database management system";
     license = licenses.asl20;
-    maintainers = with maintainers; [
-      orivej
-      mbalatsko
-      thevar1able
-    ];
+    changelog = "https://github.com/ClickHouse/ClickHouse/blob/v${version}/CHANGELOG.md";
+
+    mainProgram = "clickhouse";
 
     # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
     platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin);
     broken = stdenv.buildPlatform != stdenv.hostPlatform;
+
+    maintainers = with maintainers; [
+      thevar1able
+    ];
   };
 })
diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix
index 3d7bae589f65..e7818bfc885d 100644
--- a/pkgs/by-name/cl/clickhouse/lts.nix
+++ b/pkgs/by-name/cl/clickhouse/lts.nix
@@ -1,11 +1,6 @@
 import ./generic.nix {
-  version = "25.8.8.26-lts";
-  hash = "sha256-jzgfbM0WRdbSr0OXB9t0e1BjZQwZaEwIfzg7W4Z11c0=";
+  version = "25.8.11.66-lts";
+  rev = "fa393206741c830da77b8f1bcf18c753161932c8";
+  hash = "sha256-VUdT5STQqcWevYJjtuLdTeDGZHNl3JkkDSgcckjSZbw=";
   lts = true;
-  nixUpdateExtraArgs = [
-    "--version-regex"
-    "^v?(.*-lts)$"
-    "--override-filename"
-    "pkgs/by-name/cl/clickhouse/lts.nix"
-  ];
 }
diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 1fc35212e7d4..c787f82df7aa 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,11 +1,6 @@
 import ./generic.nix {
-  version = "25.9.2.1-stable";
-  hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo=";
+  version = "25.10.1.3832-stable";
+  rev = "f95c1af632a1c4fb9c69a501d05ae04a393b8f81";
+  hash = "sha256-UqdwZRJWMo2KTlZ1W3MnbXg1EhK/ifjQRciPcWiFYTk=";
   lts = false;
-  nixUpdateExtraArgs = [
-    "--version-regex"
-    "^v?(.*-stable|.*-lts)$"
-    "--override-filename"
-    "pkgs/by-name/cl/clickhouse/package.nix"
-  ];
 }
diff --git a/pkgs/by-name/cl/clickhouse/update.sh b/pkgs/by-name/cl/clickhouse/update.sh
new file mode 100755
index 000000000000..7ca2b419d322
--- /dev/null
+++ b/pkgs/by-name/cl/clickhouse/update.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p jq nix
+
+set -euo pipefail
+echoerr() { echo "$@" 1>&2; }
+
+fetchgithub() {
+    set +eo pipefail
+    nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g'
+    set -eo pipefail
+}
+
+fname="$1"
+echoerr "Working on $fname"
+shift
+
+# Fetch latest tags from the repo, leave only stable and lts, use version sort in reverse order.
+all_tags=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} https://api.github.com/repos/ClickHouse/ClickHouse/tags \
+           | jq -r '.[].name | select(test("-(stable|lts)$"))' \
+           | sort -Vr)
+
+# Fail if no tags found
+if [[ -z "$all_tags" ]]; then
+    echoerr "Error: no suitable tag found in ClickHouse repo"
+    exit 1
+fi
+
+pname="clickhouse"
+if [[ "$fname" == *lts.nix ]]; then
+    all_tags=$(echo "$all_tags" | grep -- "-lts$")
+    pname="clickhouse-lts"
+fi
+
+latest_tag=$(echo "$all_tags" | head -n1)
+version=${latest_tag##v}
+
+# Do nothing if latest version is already there.
+if grep -q "version = \"$version\"" "$fname"; then
+    echoerr "Version $version is already the latest in $fname"
+    exit 0
+fi
+
+echoerr "Latest tag for $fname: $latest_tag (version $version)"
+
+# Get the annotated tag commit SHA.
+rev=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/clickhouse/clickhouse/git/ref/tags/$latest_tag" \
+      | jq -r '.object.sha')
+rev=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/clickhouse/clickhouse/git/tags/$rev" \
+      | jq -r '.object.sha')
+echoerr "Resolved commit hash for tag $latest_tag: $rev"
+
+# Update version.
+sed -i -E "s@(version = \").*(\";)@\1$version\2@" "$fname"
+grep -q "$version" "$fname"
+
+# Update Git hash.
+sed -i -E "s@(rev = \").*(\";)@\1$rev\2@" "$fname"
+grep -q "$rev" "$fname"
+
+# Update source hash.
+# First, put lib.fakeHash value.
+tmp_src_hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+sed -i -E "s@(hash = \").*(\";)@\1$tmp_src_hash\2@" "$fname"
+grep -q "$tmp_src_hash" "$fname"
+
+# Next, we need to run actual build due to presence of postFetch script.
+echoerr "Running fetchFromGitHub on $pname to get new sources hash"
+
+src_hash=$(fetchgithub "$pname.src")
+if [[ -z "$src_hash" ]]; then
+    echoerr "Error: failed to get source hash from nix-build"
+    exit 1
+fi
+
+# Finally, update the source hash.
+echoerr "New src hash: $src_hash"
+sed -i -E "s@(hash = \").*(\";)@\1$src_hash\2@" "$fname"
+grep -q "$src_hash" "$fname"
diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index 28b59322c36e..4c7893ac66f0 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "25.09";
+  version = "25.09.2";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-qX9EZHuDtEcYCU8YOMbHTo3JDAAJ8nc6N7F/+AAEpn4=";
+    hash = "sha256-iLzVDWTdKkpAjmuyCnSnqyWiv6CgdzQwNTmWZH/x7gM=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool
diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix
index 90dbd6bb13cc..4161641879d4 100644
--- a/pkgs/by-name/cl/clima/package.nix
+++ b/pkgs/by-name/cl/clima/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/clima";
     changelog = "https://github.com/Canop/clima/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "clima";
   };
 }
diff --git a/pkgs/by-name/cl/clingo/package.nix b/pkgs/by-name/cl/clingo/package.nix
index 28474d20c47f..af8d7f3372c8 100644
--- a/pkgs/by-name/cl/clingo/package.nix
+++ b/pkgs/by-name/cl/clingo/package.nix
@@ -3,6 +3,8 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  withPython ? false,
+  python ? null,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +20,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
+  cmakeFlags =
+    if withPython then
+      [
+        "-DCLINGO_BUILD_WITH_PYTHON=ON"
+        "-DPYTHON_EXECUTABLE=${lib.getExe python.pythonOnBuildForHost}"
+      ]
+    else
+      [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
+
+  propagatedBuildInputs = lib.optionals withPython (
+    with python.pkgs;
+    [
+      python
+      cffi
+    ]
+  );
+
+  pythonImportsCheck = [
+    "clingo"
+  ];
 
   meta = {
     description = "ASP system to ground and solve logic programs";
diff --git a/pkgs/by-name/cl/cliquer/package.nix b/pkgs/by-name/cl/cliquer/package.nix
index 9cdceddfe00a..8984752c560d 100644
--- a/pkgs/by-name/cl/cliquer/package.nix
+++ b/pkgs/by-name/cl/cliquer/package.nix
@@ -3,10 +3,11 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.22";
+  version = "1.23";
   pname = "cliquer";
 
   # autotoolized version of the original cliquer
@@ -14,13 +15,14 @@ stdenv.mkDerivation rec {
     owner = "dimpase";
     repo = "autocliquer";
     rev = "v${version}";
-    sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4";
+    hash = "sha256-SGpur3sF1dYQU97wprERUqlr6LIX+NyXZVl0eSEd3uM=";
   };
 
   doCheck = true;
 
   nativeBuildInputs = [
     autoreconfHook
+    pkg-config
   ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix
index b91308d2e0f0..37f904d2f3f8 100644
--- a/pkgs/by-name/cl/clive/package.nix
+++ b/pkgs/by-name/cl/clive/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   ];
 
   ldflags = [
-    "-X github.com/koki-develop/clive/cmd.version=${version}"
+    "-X github.com/koki-develop/clive/cmd.version=v${version}"
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix
index ba67056efcf5..8d477c1bf8de 100644
--- a/pkgs/by-name/cl/clj-kondo/package.nix
+++ b/pkgs/by-name/cl/clj-kondo/package.nix
@@ -6,11 +6,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "clj-kondo";
-  version = "2025.07.28";
+  version = "2025.09.22";
 
   src = fetchurl {
     url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar";
-    sha256 = "sha256-ioKRFkm+zBAAM7oyR4F6rTHEhViuRNuMXcr1xwnjcms=";
+    sha256 = "sha256-TD7GlvYfGbFaM3qIEngIRbBVKEQ2g2sdAjE/oO1ZlHw=";
   };
 
   extraNativeImageBuildArgs = [
diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix
index a1cbf19d55bc..81f7d56faaf0 100644
--- a/pkgs/by-name/cl/cljfmt/package.nix
+++ b/pkgs/by-name/cl/cljfmt/package.nix
@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "cljfmt";
-  version = "0.13.4";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-i6ZUhN7gwADw0tZFPOjiGpC/po8us5QSAJAW7n3LgIU=";
+    hash = "sha256-DlPnni5p0zdauAtBEoCrh6S/STT8nvZJAJ90VjXlZLA=";
   };
 
   extraNativeImageBuildArgs = [
diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index ea1ad5cb8345..3003dac20179 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.43.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "cloud-nuke";
     tag = "v${version}";
-    hash = "sha256-TDZiX4Ik07Ysz3I7gdEF8SVJnt+EBPlH0RBIaE7+1KQ=";
+    hash = "sha256-Xv8m8hCg0kw82+AWCNKW0jcYyguR5SDHq/ldflR/iOA=";
   };
 
   vendorHash = "sha256-Qml8P9m8quUZAarsS7h3TGbcXBCJ2fRD3uyi8Do+lAw=";
diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix
index 496b0e7a761e..bcefbc878f88 100644
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -91,6 +91,9 @@ stdenv.mkDerivation rec {
     "-DPLUGIN_STANDARD_QRANSAC_SD=OFF" # not compatible with GPL, broken on non-x86
     "-DPLUGIN_STANDARD_QSRA=ON"
     "-DPLUGIN_STANDARD_QCLOUDLAYERS=ON"
+    # Fix the build with CMake 4, by overriding the minimum version globally, as support for < 3.5 was removed
+    # Ideally this can be removed at some time, but there are a lot of dependencies (e.g. plugins) which have a lower minimum version configured.
+    (lib.strings.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
   ];
 
   dontWrapGApps = true;
diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index ef365b0fe97a..1f039361ddbb 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.9";
+  version = "0.9.13";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-IM8KcR5fNxLlzIvrrc5SD9ZK/+rtGnMudd8JrbTZ/1U=";
-        aarch64-linux = "sha256-bi+ihd+EFQ9GFL4l7aHeI/YhCIfFC90x48Y6EKaq2S8=";
-        x86_64-darwin = "sha256-62eNxxXYT0jjxl/5l+hz54Iq0S+BkoH8/z49e9BbDc0=";
-        aarch64-darwin = "sha256-5j2qvw6yN2MjHXfz1i1Q+xr1gmgKrzSAhFUFJEqu3ek=";
+        x86_64-linux = "sha256-jSmPbx7t4hJiUgPeKz6iugEMJ5RZ27+sJQFHx5YtEGs=";
+        aarch64-linux = "sha256-UWdVDTj1a+knGNMpXRZvxFlaX6y76Tx631Z0xMnRTjQ=";
+        x86_64-darwin = "sha256-iNUwjiTRwq4VszBw7qdhtinsxf8zMkTnEb66V/MSB48=";
+        aarch64-darwin = "sha256-HvNoiHlCzYW+A3QilpqukcCsBVLn18QfXyVPopgJe/0=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index b6e17a5f80a7..f666fc411b1d 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.10.0";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = version;
-    hash = "sha256-20w702JEdW+4gENvP5heleE09tJPeG4QiW5F4qcdVp0=";
+    hash = "sha256-5GEvmal1ZaUp1wOEsjngDSXj9AuAm1PyUw92xq/YT58=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index e930b812b59a..e65f863b9e48 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.7.1";
+  version = "2.7.6";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-My0z4MW/9O0+ErIh7SEWU3KGJ4UQDmhwJICtBgQ4+q8=";
+    hash = "sha256-p9PmWRKvKGGZrexZJwYtb+LYto9npZ606QVo4pvDBak=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index 1bb8543c735d..18821557d659 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-2l9Mk9CWmmzTflyC+ZWr2A7NyT78rf0bXQETvCYlLuM=";
+    hash = "sha256-qORhusO2YrjrM4TP+WmAdhXdP9y5IWJcFQy69HhixNc=";
   };
 
-  vendorHash = "sha256-hnyw2n82nFBN+6Km9usIKSMSTxucdY497J957mP2eEo=";
+  vendorHash = "sha256-vRY7/SrhsLzh6sM1zaOLVUUn4DxoatScyRlHjVOPJlY=";
 
   subPackages = [ "cmd/clusterctl" ];
 
diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index 7e3b689f4567..3f099d56c7f9 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString isMinimalBuild "-minimal"
     + lib.optionalString cursesUI "-cursesUI"
     + lib.optionalString qt5UI "-qt5UI";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI=";
+    hash = "sha256-ZD8EGCt7oyOrMfUm94UTT7ecujGIqFIgbvBHP+4oKhU=";
   };
 
   patches = [
@@ -80,9 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ]
   ++ [
-    # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134
-    ./fix-curl-8.16.patch
-
     # Remove references to non‐Nix search paths.
     ./remove-impure-search-paths.patch
   ];
diff --git a/pkgs/by-name/cm/cmake/setup-hook.sh b/pkgs/by-name/cm/cmake/setup-hook.sh
index 5e84594934f4..01302284eb4f 100755
--- a/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -39,13 +39,6 @@ cmakeConfigurePhase() {
     prependToVar cmakeFlags "-DCMAKE_RANLIB=$(command -v $RANLIB)"
     prependToVar cmakeFlags "-DCMAKE_STRIP=$(command -v $STRIP)"
 
-    # on macOS we want to prefer Unix-style headers to Frameworks
-    # because we usually do not package the framework
-    prependToVar cmakeFlags "-DCMAKE_FIND_FRAMEWORK=LAST"
-
-    # correctly detect our clang compiler
-    prependToVar cmakeFlags "-DCMAKE_POLICY_DEFAULT_CMP0025=NEW"
-
     # This installs shared libraries with a fully-specified install
     # name. By default, cmake installs shared libraries with just the
     # basename as the install name, which means that, on Darwin, they
diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 8cb501df30fd..fb1e8e4e54ca 100644
--- a/pkgs/by-name/cm/cmdstan/package.nix
+++ b/pkgs/by-name/cm/cmdstan/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "cmdstan";
-  version = "2.36.0";
+  version = "2.37.0";
 
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstan";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo=";
+    hash = "sha256-bKkzzFkMF8+Ufz/EdKLJdB290Fvc2t8b47xB8oPz/sk=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index a03afd123977..e23ad8c6bebd 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.4.0";
+  version = "12.8.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-A/2/pk9ncGZwxiA4BOcpiPZcLiyRB0dTmf/tw3yDikc=";
+    hash = "sha256-tgussiogV9w7HR7QJ+XAq/kaMq0igFt+FhgfHLobG18=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-i0atpv6vtbbpTKuh9aJU6oPILCqdshB0MVbgOn6fppw=";
+  vendorHash = "sha256-V2h+n6JVi3vPcNFVvnBTIq9+gorbTFi30mdBuraH/LU=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 08bbd94b9e98..5210397c707c 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "12.5.1";
+  version = "12.7.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-F85GYOOheQ1Gx4NAWErfRwUjmjjRIv6EbXrlUPt9TX4=";
+    hash = "sha256-IriF6vr2Kw7h44zFd7hMhybseqtlYepjfQl+Z54fdbQ=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-ayv4qwiOHbZkLWIA8RIJ2GiS2QZlDeJnnbDXIHP7BCE=";
+  vendorHash = "sha256-P0spAsBp3jv0Nn4gVYTd+5WbWQgGZ83fyzxT3i0ncHs=";
 
   subPackages = [ "apps/cnspec" ];
 
diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix
index 22c9d456f0c1..c06b312e5ef9 100644
--- a/pkgs/by-name/co/coal/package.nix
+++ b/pkgs/by-name/co/coal/package.nix
@@ -9,21 +9,20 @@
   jrl-cmakemodules,
   assimp,
   octomap,
+  pkg-config,
   qhull,
-  pythonSupport ? false,
-  python3Packages,
   zlib,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coal";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "coal-library";
     repo = "coal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2X1chL4tYQXo50W/C5z+IVA1DGPcPdA378lh+7Bs2OE=";
+    hash = "sha256-7Ww1vAzKaCccBpBQU1hzI7Jk+oXw73zhnH594Xn9gbw=";
   };
 
   strictDeps = true;
@@ -31,10 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     doxygen
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.numpy
-    python3Packages.pythonImportsCheckHook
+    pkg-config
   ];
 
   propagatedBuildInputs = [
@@ -43,28 +39,18 @@ stdenv.mkDerivation (finalAttrs: {
     octomap
     qhull
     zlib
-  ]
-  ++ lib.optionals (!pythonSupport) [
     boost
     eigen
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.boost
-    python3Packages.eigenpy
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "COAL_BACKWARD_COMPATIBILITY_WITH_HPP_FCL" true)
     (lib.cmakeBool "COAL_HAS_QHULL" true)
     (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
   ];
 
   doCheck = true;
-  pythonImportsCheck = [
-    "coal"
-    "hppfcl"
-  ];
 
   outputs = [
     "dev"
diff --git a/pkgs/by-name/co/coan/package.nix b/pkgs/by-name/co/coan/package.nix
index 4d8b95642712..4c29315ea0c2 100644
--- a/pkgs/by-name/co/coan/package.nix
+++ b/pkgs/by-name/co/coan/package.nix
@@ -46,5 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://coan2.sourceforge.net/";
     license = licenses.bsd3;
     platforms = platforms.all;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/co/coc-cmake/package.nix b/pkgs/by-name/co/coc-cmake/package.nix
new file mode 100644
index 000000000000..74bbc83fc6f4
--- /dev/null
+++ b/pkgs/by-name/co/coc-cmake/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  pnpm_8,
+  fetchFromGitHub,
+  npmHooks,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "coc-cmake";
+  version = "0-unstable-2024-10-21";
+
+  src = fetchFromGitHub {
+    owner = "voldikss";
+    repo = "coc-extensions";
+    rev = "69c81e04fd3350bb75b09232d8ccf26d20075111";
+    hash = "sha256-VZRHpy0OTmoQyOEa0vIJl/VkV52r0HEtTzY1fjr6yQ0=";
+  };
+
+  pnpmDeps = pnpm_8.fetchDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmWorkspaces
+      ;
+    fetcherVersion = 2;
+    hash = "sha256-wQ9dcqY7BVXc7wpsHlYNpc7utL1+MkdTCu77Wh8+QWc=";
+  };
+
+  pnpmWorkspaces = [ "coc-cmake" ];
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm_8.configHook
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run build coc-cmake
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/lib/node_modules
+    mv packages/coc-cmake $out/lib/node_modules/coc-cmake
+    mv node_modules/.pnpm/ $out/lib/node_modules/.pnpm
+    runHook postInstall
+  '';
+
+})
diff --git a/pkgs/by-name/co/coc-diagnostic/package.nix b/pkgs/by-name/co/coc-diagnostic/package.nix
index f34b3287e046..8a8c8d1bc30a 100644
--- a/pkgs/by-name/co/coc-diagnostic/package.nix
+++ b/pkgs/by-name/co/coc-diagnostic/package.nix
@@ -7,7 +7,6 @@
   yarnBuildHook,
   nodejs,
   npmHooks,
-  nix-update-script,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coc-diagnostic";
@@ -38,8 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     unlink $out/lib/node_modules/coc-diagnostic/node_modules/.bin/node-which
   '';
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Diagnostic-languageserver extension for coc.nvim";
     homepage = "https://github.com/iamcco/coc-diagnostic";
diff --git a/pkgs/by-name/co/coc-emmet/package.nix b/pkgs/by-name/co/coc-emmet/package.nix
new file mode 100644
index 000000000000..78b43c0d3196
--- /dev/null
+++ b/pkgs/by-name/co/coc-emmet/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-emmet";
+  version = "1.1.6";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-emmet";
+    tag = finalAttrs.version;
+    hash = "sha256-0f9wSn7W+8Pxce7hbdfNpL33oykuVGNifNnSPPdhKb8=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-8oo/XG9WxgKIbhfBWiGry+SZJdQIFe/T5i9S0hgjmp0=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Emmet extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-emmet";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-eslint/package.nix b/pkgs/by-name/co/coc-eslint/package.nix
new file mode 100644
index 000000000000..c6380b7cf82e
--- /dev/null
+++ b/pkgs/by-name/co/coc-eslint/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-eslint";
+  version = "3.0.15";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-eslint";
+    tag = finalAttrs.version;
+    hash = "sha256-41mUQpiFzBWMRoK7aQu0Gu4FBsYZdHbHPzrSMZR6RLQ=";
+  };
+
+  npmDepsHash = "sha256-g5gLAtBmwsHBCDHPfcVPETH7+djh0piJ6nJYSsy9GJQ=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Eslint extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-eslint";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-flutter/package.nix b/pkgs/by-name/co/coc-flutter/package.nix
new file mode 100644
index 000000000000..1451c935e879
--- /dev/null
+++ b/pkgs/by-name/co/coc-flutter/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  esbuild,
+  buildGoModule,
+  yarnBuildHook,
+  yarnInstallHook,
+  yarnConfigHook,
+  nodejs,
+  fetchYarnDeps,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+let
+  esbuild' =
+    let
+      version = "0.9.0";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-+4oNM39cN7zCld4WwLVDHQFyvVhdsqKTLLiF2a9+KP0=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "coc-flutter";
+  version = "1.9.3-unstable-2023-03-22";
+
+  src = fetchFromGitHub {
+    owner = "iamcco";
+    repo = "coc-flutter";
+    rev = "883c269eaacbeddbd4fb08e32e6a05051933429d";
+    hash = "sha256-K3NvqZnAEj/qfsvomYl7dPtEo3ad7w1dCfZHjMRwbAA=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-aEjfhjkMlHSdISfG9baRfaUiTUbj8TPZi2edAFiqKlg=";
+  };
+
+  nativeBuildInputs = [
+    yarnBuildHook
+    yarnConfigHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Flutter support for (Neo)vim";
+    homepage = "https://github.com/iamcco/coc-flutter";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-haxe/package.nix b/pkgs/by-name/co/coc-haxe/package.nix
new file mode 100644
index 000000000000..ba184cbf75fe
--- /dev/null
+++ b/pkgs/by-name/co/coc-haxe/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-haxe";
+  version = "0.21.1";
+
+  src = fetchFromGitHub {
+    owner = "vantreeseba";
+    repo = "coc-haxe";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iveWhxkrX8EaBfh8IwKrTLw1AiGBmNva9G0p3rMwOi8=";
+  };
+
+  npmDepsHash = "sha256-1RrhUyICnYDM9qC9dEZLDPQdsFqcu8Nn/enfm+PgM00=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Haxe language server extension for coc.nvim";
+    homepage = "https://github.com/vantreeseba/coc-haxe";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-highlight/package.nix b/pkgs/by-name/co/coc-highlight/package.nix
new file mode 100644
index 000000000000..1e013743718e
--- /dev/null
+++ b/pkgs/by-name/co/coc-highlight/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-highlight";
+  version = "2.0.4";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-highlight";
+    tag = finalAttrs.version;
+    hash = "sha256-VksCqyB8b3Bk2BsnYFr6cJINqUzVY+px3TCiWzqFTzE=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-z9pJXGdUXNU8Bfhp7PUPZk7rCCAhnQpcmXUoHUaFAIU=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  yarnBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Highlight extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-highlight";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-html/package.nix b/pkgs/by-name/co/coc-html/package.nix
new file mode 100644
index 000000000000..b1cb3dc0b246
--- /dev/null
+++ b/pkgs/by-name/co/coc-html/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-html";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-html";
+    tag = finalAttrs.version;
+    hash = "sha256-dMjkG/djycRhRPIMCQ1PYvfXVxlWHtcNjouW+bCm59I=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-hb8H7tI4OouLBTwuSx3UVw7I52HTYxOFkAVJGaIKHzI=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Html language server extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-html";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-java/package.nix b/pkgs/by-name/co/coc-java/package.nix
new file mode 100644
index 000000000000..ff4341114e2e
--- /dev/null
+++ b/pkgs/by-name/co/coc-java/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-java";
+  version = "1.26.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-java";
+    tag = finalAttrs.version;
+    hash = "sha256-OKqZk1pt8qt6O+kHYdhAAha5S8YTJBFQPn7oIrjGZgI=";
+  };
+
+  npmDepsHash = "sha256-FF7EAf6SvO1sGMIE8FCS7MbnpVwVUwVg0SVUsX+i7zg=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Java extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-java";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-jest/package-lock-fix.patch b/pkgs/by-name/co/coc-jest/package-lock-fix.patch
new file mode 100644
index 000000000000..2a00c3d4843f
--- /dev/null
+++ b/pkgs/by-name/co/coc-jest/package-lock-fix.patch
@@ -0,0 +1,61 @@
+diff --git i/package-lock.json w/package-lock.json
+index 9ffdc5f..1aac77b 100644
+--- i/package-lock.json
++++ w/package-lock.json
+@@ -23,6 +23,8 @@
+     },
+     "node_modules/@chemzqm/tsconfig": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz",
++      "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -453,16 +455,22 @@
+     },
+     "node_modules/@types/node": {
+       "version": "13.11.1",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz",
++      "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/@types/which": {
+       "version": "1.3.2",
++      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
++      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/coc.nvim": {
+       "version": "0.0.79-next.11",
++      "resolved": "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.79-next.11.tgz",
++      "integrity": "sha512-1AAP2N4dno8ee2Sn2EHcVhuyhz7GS+VosqBq1W18KGmN/Ht3ry1kNsX7rsTeM/qroadvjtsIC5kM2ke239AiJw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -516,11 +524,15 @@
+     },
+     "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"
+     },
+     "node_modules/typescript": {
+       "version": "4.1.3",
++      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
++      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
+       "dev": true,
+       "license": "Apache-2.0",
+       "bin": {
+@@ -533,6 +545,8 @@
+     },
+     "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": {
diff --git a/pkgs/by-name/co/coc-jest/package.nix b/pkgs/by-name/co/coc-jest/package.nix
new file mode 100644
index 000000000000..7880a4a69630
--- /dev/null
+++ b/pkgs/by-name/co/coc-jest/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage {
+  pname = "coc-jest";
+  version = "1.1.5-unstable-2025-04-19";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-jest";
+    rev = "0ce2cd21c535e0c6c86102bc4da95337cb29948b";
+    hash = "sha256-jEwQxZWyKh5tgdRD0f/jQ3q9B/fIGD9Pd8AYDsBj4LQ=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-4X6lmblZnAF+4ZmrWYwfigO90Ah7I+B4tbMpFrguxMU=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Jest extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-jest";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/by-name/co/coc-jest/update.sh b/pkgs/by-name/co/coc-jest/update.sh
new file mode 100755
index 000000000000..22bf46d8400a
--- /dev/null
+++ b/pkgs/by-name/co/coc-jest/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Clone source
+git clone "https://github.com/neoclide/coc-jest" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update --version=branch "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/by-name/co/coc-json/package.nix b/pkgs/by-name/co/coc-json/package.nix
new file mode 100644
index 000000000000..bf70392609dc
--- /dev/null
+++ b/pkgs/by-name/co/coc-json/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-json";
+  version = "1.9.3";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-json";
+    tag = finalAttrs.version;
+    hash = "sha256-iYGhjU9qaRh7Jlc/LLbZIvfPsJR+2FMy2L3weVn2rFA=";
+  };
+
+  npmDepsHash = "sha256-ois2uyIrF8dRgSGt5NhjYoWw8OqFPRmlG5y952boj1Y=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "JSON language extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-json";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-lists/package.nix b/pkgs/by-name/co/coc-lists/package.nix
new file mode 100644
index 000000000000..18ebcc1978be
--- /dev/null
+++ b/pkgs/by-name/co/coc-lists/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-lists";
+  version = "1.5.4";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-lists";
+    tag = finalAttrs.version;
+    hash = "sha256-jt7JnGRXGgG+tbk0GySZeVAlOeTL/pX6+6WK3Qv6mYg=";
+  };
+
+  npmDepsHash = "sha256-9GndvIt7kQwT/wcS0qmeB0aIRNI/8UoW5b1JfoVAfn0=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Common lists for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-lists";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix
new file mode 100644
index 000000000000..94ebe58feec0
--- /dev/null
+++ b/pkgs/by-name/co/coc-markdownlint/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage {
+  pname = "coc-markdownlint";
+  version = "0-unstable-2025-11-01";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-markdownlint";
+    rev = "4e507d516ccb0e0287c95d909db85676d786e9bd";
+    hash = "sha256-fNUmrwjCiMYZHXkI4RPn4BMRxiWW+BoVEvaSMIsEMeQ=";
+  };
+
+  npmDepsHash = "sha256-JMXeWQZMYkhUqE5DdYBRRhyHDAqr9VkKATRQE6eOGys=";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Markdownlint extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-markdownlint";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/by-name/co/coc-pairs/package-lock-fix.patch b/pkgs/by-name/co/coc-pairs/package-lock-fix.patch
new file mode 100644
index 000000000000..05f1a8c9970a
--- /dev/null
+++ b/pkgs/by-name/co/coc-pairs/package-lock-fix.patch
@@ -0,0 +1,28 @@
+diff --git c/package-lock.json i/package-lock.json
+index ee9b22f..4d693ab 100644
+--- c/package-lock.json
++++ i/package-lock.json
+@@ -1,12 +1,12 @@
+ {
+   "name": "coc-pairs",
+-  "version": "1.5.1",
++  "version": "1.5.2",
+   "lockfileVersion": 3,
+   "requires": true,
+   "packages": {
+     "": {
+       "name": "coc-pairs",
+-      "version": "1.5.1",
++      "version": "1.5.2",
+       "license": "MIT",
+       "devDependencies": {
+         "@chemzqm/tsconfig": "^0.0.3",
+@@ -20,6 +20,8 @@
+     },
+     "node_modules/@chemzqm/tsconfig": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz",
++      "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==",
+       "dev": true,
+       "license": "MIT"
+     },
diff --git a/pkgs/by-name/co/coc-pairs/package.nix b/pkgs/by-name/co/coc-pairs/package.nix
new file mode 100644
index 000000000000..7cd3e79d9533
--- /dev/null
+++ b/pkgs/by-name/co/coc-pairs/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-pairs";
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-pairs";
+    tag = finalAttrs.version;
+    hash = "sha256-CUNnNS8mRjyVyjFw4dLnFpskdZNn/+UjVwOcuZJkeNw=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-yIMed7x5EzJMMhsA/O08kLpVYMujyJq1qol/KilxxTs=";
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Basic auto pairs extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-pairs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-pairs/update.sh b/pkgs/by-name/co/coc-pairs/update.sh
new file mode 100755
index 000000000000..cd854c58b701
--- /dev/null
+++ b/pkgs/by-name/co/coc-pairs/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git curl jq
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Get latest tag
+NEW_VERSION=$(curl "https://api.github.com/repos/neoclide/coc-pairs/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up to date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+# Clone source
+git clone "https://github.com/neoclide/coc-pairs" -b "$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/by-name/co/coc-prettier/package.nix b/pkgs/by-name/co/coc-prettier/package.nix
new file mode 100644
index 000000000000..d632e4ec547a
--- /dev/null
+++ b/pkgs/by-name/co/coc-prettier/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-prettier";
+  version = "11.0.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-prettier";
+    tag = finalAttrs.version;
+    hash = "sha256-QD31kF7HIsh7C6ykt+x7utLEmN7msprGstoRa3PC7j8=";
+  };
+
+  npmDepsHash = "sha256-vKkW3PbeN3KtJHLvr0HBMiDx9XZgyBZD40gENDnoOSs=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Prettier extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-prettier";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-r-lsp/package.nix b/pkgs/by-name/co/coc-r-lsp/package.nix
new file mode 100644
index 000000000000..af8c885ff0ac
--- /dev/null
+++ b/pkgs/by-name/co/coc-r-lsp/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-r-lsp";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-r-lsp";
+    tag = finalAttrs.version;
+    hash = "sha256-pjxnNzWOqlVWNNvEF9Yx1aQa4i3BpJoenuGQmY/k1QA=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-BUg1ZhJn3pF2cQB6b1Fe0jsd9gi2ZyMhCt7SXtjvY54=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "R LSP client for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-r-lsp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
new file mode 100644
index 000000000000..e41f5bcd892d
--- /dev/null
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage {
+  pname = "coc-rust-analyzer";
+  version = "0-unstable-2025-11-01";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-rust-analyzer";
+    rev = "6cc74fcaed6b011b98e9f8483fb608dff53147be";
+    hash = "sha256-2XSx4eR9GgMbWY+IOEKuhCAVesxoZbh/KsLr0It0Cks=";
+  };
+
+  npmDepsHash = "sha256-94kuqDNsCcPuvTVeprEdjNOPw8pdpDp3IOvuoKdSEgU=";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Rust-analyzer extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-rust-analyzer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/by-name/co/coc-smartf/package.nix b/pkgs/by-name/co/coc-smartf/package.nix
new file mode 100644
index 000000000000..debc471d419f
--- /dev/null
+++ b/pkgs/by-name/co/coc-smartf/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.12.22";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-smartf";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-smartf";
+    tag = finalAttrs.version;
+    hash = "sha256-CL0jWwMj6sFXEx+D1Orc4Fivbl33qE2P3yRJB0qqQFQ=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-s1TStKyDPydBxMLfszhKHGyQeFIC6bDPtssNm9hdZNs=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Make jump to character easier";
+    homepage = "https://github.com/neoclide/coc-smartf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-snippets/package.nix b/pkgs/by-name/co/coc-snippets/package.nix
new file mode 100644
index 000000000000..68a13262d155
--- /dev/null
+++ b/pkgs/by-name/co/coc-snippets/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-snippets";
+  version = "3.4.7";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-snippets";
+    tag = finalAttrs.version;
+    hash = "sha256-xaExEsNy6uuYUTeyXaon4DAoRIF6OpIZis59oetR36c=";
+  };
+
+  npmDepsHash = "sha256-tRyFtfL3Jc+uajELVdJoDteY3lnq0Bx8UQTaz2HtbW0=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Snippets solution for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-snippets";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-solargraph/package.nix b/pkgs/by-name/co/coc-solargraph/package.nix
new file mode 100644
index 000000000000..a21fb429acc1
--- /dev/null
+++ b/pkgs/by-name/co/coc-solargraph/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.8.29";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-WpnWdx0Oi1KBWiS/CEd88hYU/3ka1x1AA71ipYJgT5A=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-solargraph";
+  version = "1.2.4";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-solargraph";
+    tag = finalAttrs.version;
+    hash = "sha256-AUulj0tcgkXrQS9k1zhB0LKWJxvIlVtxSQK+nYGm73s=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-FPxvwqx7TfJBM+O8TY64swJVYlWIbCvVbzVJYthHjO0=";
+  };
+
+  yarnBuildScript = "prepare";
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Solargraph extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-solargraph";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-spell-checker/package.nix b/pkgs/by-name/co/coc-spell-checker/package.nix
index 9ef1edc43bae..afb716ce7d1c 100644
--- a/pkgs/by-name/co/coc-spell-checker/package.nix
+++ b/pkgs/by-name/co/coc-spell-checker/package.nix
@@ -7,7 +7,6 @@
   yarnBuildHook,
   yarnInstallHook,
   nodejs,
-  nix-update-script,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coc-spell-checker";
@@ -35,8 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   NODE_OPTIONS = "--openssl-legacy-provider";
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Basic spell checker that works well with camelCase code for (Neo)vim";
     homepage = "https://github.com/iamcco/coc-spell-checker";
diff --git a/pkgs/by-name/co/coc-sqlfluff/package.nix b/pkgs/by-name/co/coc-sqlfluff/package.nix
new file mode 100644
index 000000000000..278987f8446a
--- /dev/null
+++ b/pkgs/by-name/co/coc-sqlfluff/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.16.17";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-sqlfluff";
+  version = "0.11.4";
+
+  src = fetchFromGitHub {
+    owner = "yaegassy";
+    repo = "coc-sqlfluff";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hTe0rtjIKdlPSvwcHI2m0sRkVfmW8eQ/63WLmPsiovI=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-Pz7OCAiPIMVCAYe9OGWKMLfGSwK8ulA/JW55eB8xJqw=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "SQLFluff extension for coc.nvim";
+    homepage = "https://github.com/yaegassy/coc-sqlfluff";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-stylelint/package.nix b/pkgs/by-name/co/coc-stylelint/package.nix
new file mode 100644
index 000000000000..abd256ec6090
--- /dev/null
+++ b/pkgs/by-name/co/coc-stylelint/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-stylelint";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-stylelint";
+    tag = finalAttrs.version;
+    hash = "sha256-EurfiE1xeJhyH4Idb/hf/eItwmv75lan1csz0KJMBXs=";
+  };
+
+  # Fix yarn.lock file
+  postPatch = ''
+    substituteInPlace yarn.lock \
+      --replace-fail "http://registry.npmjs.org" "https://registry.yarnpkg.com"
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src postPatch;
+    hash = "sha256-rcHjbiMDrgCHweRMDlfcMvAJT4VULks44fbpctPpZps=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Stylelint extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-stylelint";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
new file mode 100644
index 000000000000..b29492f48824
--- /dev/null
+++ b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
@@ -0,0 +1,1000 @@
+diff --git i/package-lock.json w/package-lock.json
+index 8ff8254..9ea50fc 100644
+--- i/package-lock.json
++++ w/package-lock.json
+@@ -227,6 +227,8 @@
+     },
+     "node_modules/@esbuild/win32-x64": {
+       "version": "0.20.2",
++      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
++      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+       "cpu": [
+         "x64"
+       ],
+@@ -343,6 +345,8 @@
+     },
+     "node_modules/@isaacs/cliui": {
+       "version": "8.0.2",
++      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
++      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -359,6 +363,8 @@
+     },
+     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+       "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
++      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -370,11 +376,15 @@
+     },
+     "node_modules/@isaacs/cliui/node_modules/emoji-regex": {
+       "version": "9.2.2",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
++      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/@isaacs/cliui/node_modules/string-width": {
+       "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
++      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -391,6 +401,8 @@
+     },
+     "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+       "version": "7.1.0",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
++      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -427,6 +439,8 @@
+     },
+     "node_modules/@nodelib/fs.scandir": {
+       "version": "2.1.5",
++      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
++      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -439,6 +453,8 @@
+     },
+     "node_modules/@nodelib/fs.stat": {
+       "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
++      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -447,6 +463,8 @@
+     },
+     "node_modules/@nodelib/fs.walk": {
+       "version": "1.2.8",
++      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
++      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -459,6 +477,8 @@
+     },
+     "node_modules/@pkgjs/parseargs": {
+       "version": "0.11.0",
++      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
++      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+       "dev": true,
+       "license": "MIT",
+       "optional": true,
+@@ -594,6 +614,8 @@
+     },
+     "node_modules/@types/fs-extra": {
+       "version": "11.0.4",
++      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz",
++      "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -609,6 +631,8 @@
+     },
+     "node_modules/@types/jsonfile": {
+       "version": "6.1.4",
++      "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz",
++      "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -632,6 +656,8 @@
+     },
+     "node_modules/@types/node-fetch": {
+       "version": "2.6.11",
++      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz",
++      "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -659,6 +685,8 @@
+     },
+     "node_modules/@types/yauzl": {
+       "version": "2.10.0",
++      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
++      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+       "dev": true,
+       "license": "MIT",
+       "optional": true,
+@@ -1952,6 +1980,8 @@
+     },
+     "node_modules/ansi-regex": {
+       "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
++      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -1960,6 +1990,8 @@
+     },
+     "node_modules/ansi-styles": {
+       "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
++      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2040,6 +2072,8 @@
+     },
+     "node_modules/array-union": {
+       "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
++      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -2157,6 +2191,8 @@
+     },
+     "node_modules/asynckit": {
+       "version": "0.4.0",
++      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
++      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -2178,6 +2214,8 @@
+     },
+     "node_modules/balanced-match": {
+       "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
++      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -2211,6 +2249,8 @@
+     },
+     "node_modules/braces": {
+       "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
++      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2254,6 +2294,8 @@
+     },
+     "node_modules/buffer-crc32": {
+       "version": "0.2.13",
++      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
++      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -2380,6 +2422,8 @@
+     },
+     "node_modules/chalk": {
+       "version": "4.1.2",
++      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
++      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2550,6 +2594,8 @@
+     },
+     "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": {
+@@ -2561,11 +2607,15 @@
+     },
+     "node_modules/color-name": {
+       "version": "1.1.4",
++      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
++      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/combined-stream": {
+       "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
++      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2620,6 +2670,8 @@
+     },
+     "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": {
+@@ -2699,6 +2751,8 @@
+     },
+     "node_modules/debug": {
+       "version": "4.3.4",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
++      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2763,6 +2817,8 @@
+     },
+     "node_modules/delayed-stream": {
+       "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
++      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -2777,6 +2833,8 @@
+     },
+     "node_modules/dir-glob": {
+       "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
++      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2812,6 +2870,8 @@
+     },
+     "node_modules/eastasianwidth": {
+       "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
++      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -2823,11 +2883,15 @@
+     },
+     "node_modules/emoji-regex": {
+       "version": "8.0.0",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
++      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/end-of-stream": {
+       "version": "1.4.4",
++      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
++      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3037,6 +3101,8 @@
+     },
+     "node_modules/esbuild": {
+       "version": "0.20.2",
++      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
++      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+       "dev": true,
+       "hasInstallScript": true,
+       "license": "MIT",
+@@ -3083,6 +3149,8 @@
+     },
+     "node_modules/escape-string-regexp": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
++      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -3473,6 +3541,8 @@
+     },
+     "node_modules/esrecurse": {
+       "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
++      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+       "dev": true,
+       "license": "BSD-2-Clause",
+       "dependencies": {
+@@ -3484,6 +3554,8 @@
+     },
+     "node_modules/estraverse": {
+       "version": "5.3.0",
++      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
++      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+       "dev": true,
+       "license": "BSD-2-Clause",
+       "engines": {
+@@ -3543,6 +3615,8 @@
+     },
+     "node_modules/executable": {
+       "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
++      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3554,6 +3628,8 @@
+     },
+     "node_modules/extract-zip": {
+       "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
++      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+       "dev": true,
+       "license": "BSD-2-Clause",
+       "dependencies": {
+@@ -3607,6 +3683,8 @@
+     },
+     "node_modules/fastq": {
+       "version": "1.13.0",
++      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
++      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3615,6 +3693,8 @@
+     },
+     "node_modules/fd-slicer": {
+       "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
++      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3635,6 +3715,8 @@
+     },
+     "node_modules/fill-range": {
+       "version": "7.0.1",
++      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
++      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3727,6 +3809,8 @@
+     },
+     "node_modules/foreground-child": {
+       "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
++      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3742,6 +3826,8 @@
+     },
+     "node_modules/form-data": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
++      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3755,6 +3841,8 @@
+     },
+     "node_modules/fs-extra": {
+       "version": "11.2.0",
++      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
++      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3879,6 +3967,8 @@
+     },
+     "node_modules/get-stream": {
+       "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
++      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3942,6 +4032,8 @@
+     },
+     "node_modules/glob": {
+       "version": "10.3.10",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
++      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3963,6 +4055,8 @@
+     },
+     "node_modules/glob-parent": {
+       "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
++      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3974,6 +4068,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3982,6 +4078,8 @@
+     },
+     "node_modules/glob/node_modules/minimatch": {
+       "version": "9.0.3",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
++      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -4027,6 +4125,8 @@
+     },
+     "node_modules/globby": {
+       "version": "11.1.0",
++      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
++      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -4059,6 +4159,8 @@
+     },
+     "node_modules/graceful-fs": {
+       "version": "4.2.10",
++      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
++      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -4080,6 +4182,8 @@
+     },
+     "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": {
+@@ -4195,6 +4299,8 @@
+     },
+     "node_modules/imurmurhash": {
+       "version": "0.1.4",
++      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
++      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4430,6 +4536,8 @@
+     },
+     "node_modules/is-extglob": {
+       "version": "2.1.1",
++      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
++      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4451,6 +4559,8 @@
+     },
+     "node_modules/is-fullwidth-code-point": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
++      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4475,6 +4585,8 @@
+     },
+     "node_modules/is-glob": {
+       "version": "4.0.3",
++      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
++      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -4522,6 +4634,8 @@
+     },
+     "node_modules/is-number": {
+       "version": "7.0.0",
++      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
++      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4711,6 +4825,8 @@
+     },
+     "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"
+     },
+@@ -4730,6 +4846,8 @@
+     },
+     "node_modules/jackspeak": {
+       "version": "2.3.6",
++      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
++      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+       "dev": true,
+       "license": "BlueOak-1.0.0",
+       "dependencies": {
+@@ -4813,6 +4931,8 @@
+     },
+     "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"
+     },
+@@ -4848,6 +4968,8 @@
+     },
+     "node_modules/jsonfile": {
+       "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
++      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -4949,6 +5071,8 @@
+     },
+     "node_modules/lodash.merge": {
+       "version": "4.6.2",
++      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
++      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -4967,6 +5091,8 @@
+     },
+     "node_modules/lru-cache": {
+       "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -5021,6 +5147,8 @@
+     },
+     "node_modules/merge2": {
+       "version": "1.4.1",
++      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
++      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5049,6 +5177,8 @@
+     },
+     "node_modules/micromatch": {
+       "version": "4.0.5",
++      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
++      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5061,6 +5191,8 @@
+     },
+     "node_modules/mime-db": {
+       "version": "1.52.0",
++      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
++      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5069,6 +5201,8 @@
+     },
+     "node_modules/mime-types": {
+       "version": "2.1.35",
++      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
++      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5113,6 +5247,8 @@
+     },
+     "node_modules/minipass": {
+       "version": "7.0.4",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
++      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+       "dev": true,
+       "license": "ISC",
+       "engines": {
+@@ -5170,6 +5306,8 @@
+     },
+     "node_modules/ms": {
+       "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
++      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5194,6 +5332,8 @@
+     },
+     "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"
+     },
+@@ -5205,6 +5345,8 @@
+     },
+     "node_modules/node-fetch": {
+       "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5236,6 +5378,8 @@
+     },
+     "node_modules/node-version-compare": {
+       "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/node-version-compare/-/node-version-compare-1.0.3.tgz",
++      "integrity": "sha512-unO5GpBAh5YqeGULMLpmDT94oanSDMwtZB8KHTKCH/qrGv8bHN0mlDj9xQDAicCYXv2OLnzdi67lidCrcVotVw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5471,6 +5615,8 @@
+     },
+     "node_modules/once": {
+       "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
++      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -5625,6 +5771,8 @@
+     },
+     "node_modules/path-key": {
+       "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
++      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5639,6 +5787,8 @@
+     },
+     "node_modules/path-scurry": {
+       "version": "1.10.1",
++      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
++      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+       "dev": true,
+       "license": "BlueOak-1.0.0",
+       "dependencies": {
+@@ -5654,6 +5804,8 @@
+     },
+     "node_modules/path-scurry/node_modules/lru-cache": {
+       "version": "10.2.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
++      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+       "dev": true,
+       "license": "ISC",
+       "engines": {
+@@ -5662,6 +5814,8 @@
+     },
+     "node_modules/path-type": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
++      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5676,6 +5830,8 @@
+     },
+     "node_modules/pend": {
+       "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
++      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5693,6 +5849,8 @@
+     },
+     "node_modules/picomatch": {
+       "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
++      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5704,6 +5862,8 @@
+     },
+     "node_modules/pify": {
+       "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
++      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5818,6 +5978,8 @@
+     },
+     "node_modules/pump": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
++      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5836,6 +5998,8 @@
+     },
+     "node_modules/queue-microtask": {
+       "version": "1.2.3",
++      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
++      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+       "dev": true,
+       "funding": [
+         {
+@@ -6102,6 +6266,8 @@
+     },
+     "node_modules/reusify": {
+       "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
++      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6111,6 +6277,8 @@
+     },
+     "node_modules/rimraf": {
+       "version": "5.0.5",
++      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
++      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -6128,6 +6296,8 @@
+     },
+     "node_modules/run-parallel": {
+       "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
++      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+       "dev": true,
+       "funding": [
+         {
+@@ -6236,6 +6406,8 @@
+     },
+     "node_modules/shebang-command": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
++      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6247,6 +6419,8 @@
+     },
+     "node_modules/shebang-regex": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
++      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6274,6 +6448,8 @@
+     },
+     "node_modules/signal-exit": {
+       "version": "4.1.0",
++      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
++      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+       "dev": true,
+       "license": "ISC",
+       "engines": {
+@@ -6291,6 +6467,8 @@
+     },
+     "node_modules/slash": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
++      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6360,6 +6538,8 @@
+     },
+     "node_modules/string-width": {
+       "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6374,6 +6554,8 @@
+     "node_modules/string-width-cjs": {
+       "name": "string-width",
+       "version": "4.2.3",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
++      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6466,6 +6648,8 @@
+     },
+     "node_modules/strip-ansi": {
+       "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6478,6 +6662,8 @@
+     "node_modules/strip-ansi-cjs": {
+       "name": "strip-ansi",
+       "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
++      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6525,6 +6711,8 @@
+     },
+     "node_modules/supports-color": {
+       "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
++      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6595,11 +6783,15 @@
+     },
+     "node_modules/text-table": {
+       "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
++      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/to-regex-range": {
+       "version": "5.0.1",
++      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
++      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6638,6 +6830,8 @@
+     },
+     "node_modules/tr46": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -6770,6 +6964,8 @@
+     },
+     "node_modules/typescript": {
+       "version": "4.9.5",
++      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
++      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+       "dev": true,
+       "license": "Apache-2.0",
+       "bin": {
+@@ -6829,6 +7025,8 @@
+     },
+     "node_modules/universalify": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
++      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6902,11 +7100,15 @@
+     },
+     "node_modules/webidl-conversions": {
+       "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+       "dev": true,
+       "license": "BSD-2-Clause"
+     },
+     "node_modules/whatwg-url": {
+       "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6916,6 +7118,8 @@
+     },
+     "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": {
+@@ -7013,6 +7217,8 @@
+     },
+     "node_modules/wrap-ansi": {
+       "version": "8.1.0",
++      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
++      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7030,6 +7236,8 @@
+     "node_modules/wrap-ansi-cjs": {
+       "name": "wrap-ansi",
+       "version": "7.0.0",
++      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
++      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7046,6 +7254,8 @@
+     },
+     "node_modules/wrap-ansi/node_modules/ansi-regex": {
+       "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
++      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -7057,6 +7267,8 @@
+     },
+     "node_modules/wrap-ansi/node_modules/ansi-styles": {
+       "version": "6.2.1",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
++      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -7068,11 +7280,15 @@
+     },
+     "node_modules/wrap-ansi/node_modules/emoji-regex": {
+       "version": "9.2.2",
++      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
++      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/wrap-ansi/node_modules/string-width": {
+       "version": "5.1.2",
++      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
++      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7089,6 +7305,8 @@
+     },
+     "node_modules/wrap-ansi/node_modules/strip-ansi": {
+       "version": "7.1.0",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
++      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7103,6 +7321,8 @@
+     },
+     "node_modules/wrappy": {
+       "version": "1.0.2",
++      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
++      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -7126,6 +7346,8 @@
+     },
+     "node_modules/yallist": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -7199,6 +7421,8 @@
+     },
+     "node_modules/yauzl": {
+       "version": "2.10.0",
++      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
++      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
diff --git a/pkgs/by-name/co/coc-sumneko-lua/package.nix b/pkgs/by-name/co/coc-sumneko-lua/package.nix
new file mode 100644
index 000000000000..1de2513c650e
--- /dev/null
+++ b/pkgs/by-name/co/coc-sumneko-lua/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.20.2";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+buildNpmPackage (finalAttrs: {
+  pname = "coc-sumneko-lua";
+  version = "0.0.42";
+
+  src = fetchFromGitHub {
+    owner = "xiyaowong";
+    repo = "coc-sumneko-lua";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-B5XvhhBbVeBQI6nWVskaopx2pJYFBiFCfbPwwwloFig=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-NEUDQm4hzhGJyEdiBBrSWa8fMw3DcnnPJJo0m+HgZ5U=";
+
+  nativeBuildInputs = [ esbuild' ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Lua extension using sumneko lua-language-server for coc.nvim";
+    homepage = "https://github.com/xiyaowong/coc-sumneko-lua";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-sumneko-lua/update.sh b/pkgs/by-name/co/coc-sumneko-lua/update.sh
new file mode 100755
index 000000000000..5634158b4792
--- /dev/null
+++ b/pkgs/by-name/co/coc-sumneko-lua/update.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git curl jq
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Get latest tag
+NEW_VERSION=$(curl "https://api.github.com/repos/xiyaowong/coc-sumneko-lua/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
+# Trim leading "v" for version comparisons
+NEW_VERSION=${NEW_VERSION:1}
+
+# exit early if no change
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+# Clone source
+git clone "https://github.com/xiyaowong/coc-sumneko-lua" -b "v$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/by-name/co/coc-tabnine/package.nix b/pkgs/by-name/co/coc-tabnine/package.nix
new file mode 100644
index 000000000000..ea7d850dd90b
--- /dev/null
+++ b/pkgs/by-name/co/coc-tabnine/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.8.33";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-u/3YHQZskgbkaXV7RF8G9kMMx1A25hHhHv+VQdZZ4EU=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-tabnine";
+  version = "1.3.7";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-tabnine";
+    tag = finalAttrs.version;
+    hash = "sha256-7l4gCpArP1pp/SfYiyzjLc8VH7HVhwx2slorQcuA6k4=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-Pg/AQv9/VTUXTu6q71vQ+0AMNswHEoCOAWnWIeuy/lQ=";
+  };
+
+  yarnBuildScript = "prepare";
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tabnine extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-tabnine";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-texlab/package.nix b/pkgs/by-name/co/coc-texlab/package.nix
new file mode 100644
index 000000000000..c260c3059447
--- /dev/null
+++ b/pkgs/by-name/co/coc-texlab/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.25.0";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-texlab";
+  version = "0-unstable-2025-07-22";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-texlab";
+    rev = "a4ad3f259d94086f4971b22b97833e8a72226782";
+    hash = "sha256-6W+L/LdF6g0Xwhv+9VtjjfzRjlbN7OaqHbSXtO3cfZ0=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-g2IwfO1IMktTtflR2m7c99wOYLJYmD2I7hBbCNy+XFA=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "TexLab extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-texlab";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix
new file mode 100644
index 000000000000..7090854bc472
--- /dev/null
+++ b/pkgs/by-name/co/coc-vimlsp/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-vimlsp";
+  version = "0.8.0-unstable-2023-06-26";
+
+  src = fetchFromGitHub {
+    owner = "iamcco";
+    repo = "coc-vimlsp";
+    rev = "9e88f053201b8b224a6849ce8f891f526e75a28b";
+    hash = "sha256-U5nJRn0UZsGfyDR4gZN2E+TSWk0A7RXJqMRQMK3QV00=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-K5hC3YrzSxULt0SiX7r+b8uNWdnvqGe+/GBvZiFzW0c=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "vim-language-server extension for coc.nvim";
+    homepage = "https://github.com/iamcco/coc-vimlsp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-vimtex/package.nix b/pkgs/by-name/co/coc-vimtex/package.nix
new file mode 100644
index 000000000000..e886d7c86f1d
--- /dev/null
+++ b/pkgs/by-name/co/coc-vimtex/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-vimtex";
+  version = "1.1.5";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-vimtex";
+    tag = finalAttrs.version;
+    hash = "sha256-Z0vhgpdzh3GY9o6qnYWkeaUtjtoJ6PdqtDpRQHQXCjI=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-XEDPfnEkUTVCpxBp/DAdrRDvxYrTo/e+PTQGmtSy58c=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "VimTeX extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-vimtex";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-wxml/package.nix b/pkgs/by-name/co/coc-wxml/package.nix
new file mode 100644
index 000000000000..1bcea339cc24
--- /dev/null
+++ b/pkgs/by-name/co/coc-wxml/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-wxml";
+  version = "1.0.9";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-wxml";
+    tag = finalAttrs.version;
+    hash = "sha256-6tI+rIgoKGafBSxbPumCquAahJVR3rUzJB4VWQR+qw0=";
+  };
+
+  # Fix yarn.lock file
+  postPatch = ''
+    substituteInPlace yarn.lock \
+      --replace-fail "http://registry.npmjs.org" "https://registry.yarnpkg.com"
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src postPatch;
+    hash = "sha256-s2doN+DeVJPIWe/vOuAH7cYl/S/v8S4yeTG6KIWKphA=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Wxml extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-wxml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-yaml/package-lock-fix.patch b/pkgs/by-name/co/coc-yaml/package-lock-fix.patch
new file mode 100644
index 000000000000..9475bac1997f
--- /dev/null
+++ b/pkgs/by-name/co/coc-yaml/package-lock-fix.patch
@@ -0,0 +1,89 @@
+diff --git i/package-lock.json w/package-lock.json
+index 294a466..424d557 100644
+--- i/package-lock.json
++++ w/package-lock.json
+@@ -1,12 +1,12 @@
+ {
+   "name": "coc-yaml",
+-  "version": "1.9.0",
++  "version": "1.9.1",
+   "lockfileVersion": 3,
+   "requires": true,
+   "packages": {
+     "": {
+       "name": "coc-yaml",
+-      "version": "1.9.0",
++      "version": "1.9.1",
+       "license": "MIT",
+       "dependencies": {
+         "prettier": "2.0.5"
+@@ -27,6 +27,8 @@
+     },
+     "node_modules/@chemzqm/tsconfig": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz",
++      "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -464,6 +466,8 @@
+     },
+     "node_modules/ansi-styles": {
+       "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
++      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -533,6 +537,8 @@
+     },
+     "node_modules/fs-extra": {
+       "version": "10.0.0",
++      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
++      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -546,11 +552,15 @@
+     },
+     "node_modules/graceful-fs": {
+       "version": "4.2.9",
++      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
++      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+       "dev": true,
+       "license": "ISC"
+     },
+     "node_modules/jsonfile": {
+       "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
++      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -562,6 +572,8 @@
+     },
+     "node_modules/prettier": {
+       "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
++      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+       "license": "MIT",
+       "bin": {
+         "prettier": "bin-prettier.js"
+@@ -572,6 +584,8 @@
+     },
+     "node_modules/request-light": {
+       "version": "0.5.7",
++      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.7.tgz",
++      "integrity": "sha512-i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -591,6 +605,8 @@
+     },
+     "node_modules/universalify": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
++      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
diff --git a/pkgs/by-name/co/coc-yaml/package.nix b/pkgs/by-name/co/coc-yaml/package.nix
new file mode 100644
index 000000000000..623fa936ddc8
--- /dev/null
+++ b/pkgs/by-name/co/coc-yaml/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-yaml";
+  version = "1.9.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-yaml";
+    tag = finalAttrs.version;
+    hash = "sha256-JzIajdgVOVJupxmHrw9GuGDZS863YaUa5FomT2tqBpc=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-2XFXeF2ork6cPrYU2avpXSoAvLa7If6AtYtBGoxL/2g=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Yaml language server extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-yaml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-yaml/update.sh b/pkgs/by-name/co/coc-yaml/update.sh
new file mode 100755
index 000000000000..d3e958140a2d
--- /dev/null
+++ b/pkgs/by-name/co/coc-yaml/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git curl jq
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Get latest tag
+NEW_VERSION=$(curl "https://api.github.com/repos/neoclide/coc-yaml/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
+
+# exit early if no change
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+# Clone source
+git clone "https://github.com/neoclide/coc-yaml" -b "$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update --version="$NEW_VERSION" "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/by-name/co/coc-yank/package.nix b/pkgs/by-name/co/coc-yank/package.nix
new file mode 100644
index 000000000000..e6e433f48e85
--- /dev/null
+++ b/pkgs/by-name/co/coc-yank/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.25.0";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-yank";
+  version = "1.2.5";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-yank";
+    tag = finalAttrs.version;
+    hash = "sha256-AREGlb8YDRwma9QtLeoted5S0ordS8Hcd2umYQfKq9g=";
+  };
+
+  npmDepsHash = "sha256-ISHILT/FBy2Y0UWaQkjMm5ZsYacNt3M54IJ8ckYjq3A=";
+
+  nativeBuildInputs = [ esbuild' ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Yank highlight and persist yank history support for vim";
+    homepage = "https://github.com/neoclide/coc-yank";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index 7f93bbd32809..4744288b360e 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -44,13 +44,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "348";
+  version = "350";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-JO+tHrG1fxfDRdGHIDZ6TBLug/6p/vB8RkxC9TLoOuk=";
+    hash = "sha256-DOMX3msM5Ko7TDMRS+GcAf+gmyogjSExNEM9sjK0cCY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/co/cocoapods-beta/package.nix b/pkgs/by-name/co/cocoapods-beta/package.nix
new file mode 100644
index 000000000000..0d7850267707
--- /dev/null
+++ b/pkgs/by-name/co/cocoapods-beta/package.nix
@@ -0,0 +1,10 @@
+{
+  lib,
+  cocoapods,
+}:
+
+lib.lowPrio (
+  cocoapods.override {
+    beta = true;
+  }
+)
diff --git a/pkgs/development/tools/cocoapods/Gemfile b/pkgs/by-name/co/cocoapods/Gemfile
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile
rename to pkgs/by-name/co/cocoapods/Gemfile
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta b/pkgs/by-name/co/cocoapods/Gemfile-beta
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile-beta
rename to pkgs/by-name/co/cocoapods/Gemfile-beta
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/by-name/co/cocoapods/Gemfile-beta.lock
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile-beta.lock
rename to pkgs/by-name/co/cocoapods/Gemfile-beta.lock
diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/by-name/co/cocoapods/Gemfile.lock
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile.lock
rename to pkgs/by-name/co/cocoapods/Gemfile.lock
diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/by-name/co/cocoapods/gemset-beta.nix
similarity index 100%
rename from pkgs/development/tools/cocoapods/gemset-beta.nix
rename to pkgs/by-name/co/cocoapods/gemset-beta.nix
diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/by-name/co/cocoapods/gemset.nix
similarity index 100%
rename from pkgs/development/tools/cocoapods/gemset.nix
rename to pkgs/by-name/co/cocoapods/gemset.nix
diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/by-name/co/cocoapods/package.nix
similarity index 100%
rename from pkgs/development/tools/cocoapods/default.nix
rename to pkgs/by-name/co/cocoapods/package.nix
diff --git a/pkgs/development/tools/cocoapods/update b/pkgs/by-name/co/cocoapods/update
similarity index 100%
rename from pkgs/development/tools/cocoapods/update
rename to pkgs/by-name/co/cocoapods/update
diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 6a6bc4982611..e8fcb71c6e19 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cocogitto";
-  version = "6.3.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
     tag = version;
-    hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
+    hash = "sha256-aAVoPPeuJN6QPcuc3oBF93dP6U+74bAoSDw93XR01Vo=";
   };
 
-  cargoHash = "sha256-wfq1W9zjC0phPUr6SaLv8Ia5aQk/+1ujOTo0241X7AY=";
+  cargoHash = "sha256-yDpZHkRKsWXXHuSKnzhGrjsFLUFZEpC23tcU3FeUZK8=";
 
   # Test depend on git configuration that would likely exist in a normal user environment
   # and might be failing to create the test repository it works in.
diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix
new file mode 100644
index 000000000000..4bc273b76ee9
--- /dev/null
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "cocoon";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "haileyok";
+    repo = "cocoon";
+    tag = finalAttrs.version;
+    hash = "sha256-2zvbPhvYoKlQTZDjpo6LRr9DLKzSmcH0qnU1oJ+7k04=";
+  };
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  vendorHash = "sha256-5WnME+AVrXfvHX2yPbFoL6QgZoCMAJmBj47OM7miOfc=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "ATProtocol Personal Data Server written in Go with a SQLite block and blob store";
+    changelog = "https://github.com/haileyok/cocoon/releases/${finalAttrs.version}";
+    homepage = "https://github.com/haileyok/cocoon";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ isabelroses ];
+    mainProgram = "cocoon";
+  };
+})
diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 553c3235aaa0..174f22f7b21d 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/linux/x64/Cursor-1.7.38-x86_64.AppImage";
-      hash = "sha256-52QJVbXO3CYeL4vVZ249xabS7AoYFDOxKCQ6m3vB+vE=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage";
+      hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/linux/arm64/Cursor-1.7.38-aarch64.AppImage";
-      hash = "sha256-4yUjLAiC7wZYYmAnVNUbRuvLBrpAfC/Kb9y/nONtwkM=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage";
+      hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-x56I8XaOvFK7GDlfyAHD18DdUwZrKf7hlXAROplqKU0=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-14H1jvVmSsywkFm6M3BFLAwUzorehrbVvo9OJo6cEdk=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.7.38";
+  version = "2.0.64";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix
index 75379f724145..0c64b41bb0fa 100644
--- a/pkgs/by-name/co/codeberg-pages/package.nix
+++ b/pkgs/by-name/co/codeberg-pages/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "codeberg-pages";
-  version = "6.3";
+  version = "6.4";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Codeberg";
     repo = "pages-server";
     rev = "v${version}";
-    hash = "sha256-5+4yKcXyKSg7Q2h7W3G6AYkIOmYA4D4DDjdLK57lwdw=";
+    hash = "sha256-xNsob0fW6SaqVKBIgRFj0YZUymHKWWfWZ5UqGkHWOmA=";
   };
 
-  vendorHash = "sha256-EefUX5MEQrJGtUbX/bINcMSJQjnnLzKQt04hENY8G2E=";
+  vendorHash = "sha256-nSFUBIO3ssnwVHcjHRgUWjIK+swZP9PEJOTwM7esIgo=";
 
   postPatch = ''
     # disable httptest
diff --git a/pkgs/by-name/co/codeblocks/package.nix b/pkgs/by-name/co/codeblocks/package.nix
index 93c28e9d333b..ef647155ab38 100644
--- a/pkgs/by-name/co/codeblocks/package.nix
+++ b/pkgs/by-name/co/codeblocks/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    maintainers = [ lib.maintainers.linquize ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     description = "Open source, cross platform, free C, C++ and Fortran IDE";
     longDescription = ''
diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index fc04d5d9194e..45d274a0adec 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.13";
+  version = "0.3.16";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-46RSHbr9vVyVYXAV/+A6PSz2qokDwQjY51jnIQ11Dls=";
+    hash = "sha256-kunYcWwb4b8ryQYZpG623RcyZaiWTGTKCXjfUq8iz+o=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-/7ci8of8KfD7ne3XjXA+tVq1x3HmQWKWh1wO4zA0Elg=";
+  cargoHash = "sha256-cHcSmTEW4xpZkrv4a2lgTlK2VU7+kOvZiEo//jrnd8E=";
 
   # Integration tests require internet access for dictionaries
   doCheck = false;
diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 28635eaee437..cdab79a2c6d4 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.501"
+        "codebuff": "^1.0.508"
       }
     },
     "node_modules/chownr": {
@@ -18,9 +18,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.501",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.501.tgz",
-      "integrity": "sha512-ZTvQce7Qj5tjWt63AJujjGkCDLLWAXm3vrKOKlfUKXPXJQfbM8TYljB2+fnMEkjgShZ3Fg+nSEIb1q7hcuBTbQ==",
+      "version": "1.0.508",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.508.tgz",
+      "integrity": "sha512-iNxa+WYeJpr+zhOwyk/F+tpptKwdWTmj0Fo8H7w+KII/ydtufnqNYGoSMJ0tGHhHaL1l0T+alO+FAr7RyjuM/Q==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index 63eb9948803e..a6ed2da84ebe 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "codebuff";
-  version = "1.0.501";
+  version = "1.0.508";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
-    hash = "sha256-WW599dxu7LdL2pU0nb4zZb3ek67MlTpJ/H9aa7SWhi8=";
+    hash = "sha256-hLDW/WZXXo9bYNF5uU0+Mmf//phLSPXU3yKXNBNACz0=";
   };
 
-  npmDepsHash = "sha256-M8BD9XMnn6ETifLl0j4fe2+UDaAGOA9mN2SsmXSfMPM=";
+  npmDepsHash = "sha256-G8nFBQaAro325jpxI115Jpdl6n3yyrG9sASyZdQ/aLI=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index c88ffaf1d593..8c62003995aa 100644
--- a/pkgs/by-name/co/codecrafters-cli/package.nix
+++ b/pkgs/by-name/co/codecrafters-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "codecrafters-cli";
-  version = "40";
+  version = "44";
 
   src = fetchFromGitHub {
     owner = "codecrafters-io";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-JtjzulWeikUR1tJFBjssZuNhiXtQVR9IP2xABz06X/U=";
+    hash = "sha256-eyKQMMF9EEF55r+Q1QcqiswctXCqetgnAKQJTwaC60s=";
     # A shortened git commit hash is part of the version output, and is
     # needed at build time. Use the `.git` directory to retrieve the
     # commit SHA, and remove the directory afterwards since it is not needed
diff --git a/pkgs/by-name/co/codemov/package.nix b/pkgs/by-name/co/codemov/package.nix
index f4321e49c307..667f41b45ed0 100644
--- a/pkgs/by-name/co/codemov/package.nix
+++ b/pkgs/by-name/co/codemov/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
     description = "Create a video of how a git repository's code changes over time";
     homepage = "https://github.com/sloganking/codemov";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "codemov";
   };
 }
diff --git a/pkgs/by-name/co/codeql/package.nix b/pkgs/by-name/co/codeql/package.nix
index a6ca9faf8fa7..0dc0bacc1a4f 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.23.0";
+  version = "2.23.3";
 
   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-8T1aOy2okhwj2rFz3jUpUm2JaJcrXdB6KpSD8btCEx4=";
+    hash = "sha256-Y6E3itwm/BZuNAs4b1roynEEdpOArfKPh+vNQidu+y8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index dc3290228648..ab969d17d3c7 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -15,21 +15,21 @@ let
 
   channels = {
     stable = {
-      version = "2.23.4";
+      version = "2.26.3";
       hash = {
-        x86_64-linux = "sha256-tpU26+3NrfOUWgd4Wav1fhTMtErh2CXt3Nr8BTIUdbc=";
-        x86_64-darwin = "sha256-07pSXm++a9VWcnc4AgrR7OaaDw2ki2XMtr8PZkWW2Vw=";
-        aarch64-linux = "sha256-Rm1CIVK7qPLizK+0H3Eb2qwPEj1TjHtIqdBr+Z+21eA=";
-        aarch64-darwin = "sha256-H5MLnRokC5Wb3FrotprunG+kx0qwT8/Ou6ScO7N2h+E=";
+        x86_64-linux = "sha256-CqV3fCx3TtMLFjzo0Y7/vpAgXyOLABiFyqS8N5pA6xc=";
+        x86_64-darwin = "sha256-PDPU3k1Bao5ibLFx3Zjbh1xsxSpJWUOOHuRbuwMmYDg=";
+        aarch64-linux = "sha256-iq9LPHK6wPSdDRQqWRPr7OfN/HoESIIkOxf9luRS9ck=";
+        aarch64-darwin = "sha256-n+jUocq1MaDRe14gibeA+ujLoGcSCdKQ58wihcTmdlI=";
       };
     };
     mainline = {
-      version = "2.24.2";
+      version = "2.27.3";
       hash = {
-        x86_64-linux = "sha256-Al3bvIsSnU0vdNAkZknpP/rxJIP6UGUIeIZ6kw84SuM=";
-        x86_64-darwin = "sha256-0+n69BWKIgKFUCQzW4AMRW4QdRQcZkK5Ioiu4d4RvnE=";
-        aarch64-linux = "sha256-2JkEO7hhLY9e22OTYLhzv+Zb0aP6PRVG8ZX5r686o0Q=";
-        aarch64-darwin = "sha256-7CJQEj7VA3SwaZeimng6BPDtw14LXt7+1E7HxVs8kYM=";
+        x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA=";
+        x86_64-darwin = "sha256-j41nX7CQhLsjVCBp6vaxmOcbXKXXz/iFm/TY2HXLWHA=";
+        aarch64-linux = "sha256-dsjwZSoC2bQj4Zn/M7SlN83ZKMEpBjs78J4PrNGDHxE=";
+        aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI=";
       };
     };
   };
diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix
index fd1422621570..061b3b816509 100644
--- a/pkgs/by-name/co/codesnap/package.nix
+++ b/pkgs/by-name/co/codesnap/package.nix
@@ -4,25 +4,32 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  openssl,
+  pkg-config,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codesnap";
-  version = "0.10.9";
+  version = "0.12.10";
 
   src = fetchFromGitHub {
-    owner = "mistricky";
-    repo = "CodeSnap";
-    tag = "v${version}";
-    hash = "sha256-EtMEUtLSgYrb0izPPCh432uX2p/8Ykf2caAR+8ZdxhU=";
+    owner = "codesnap-rs";
+    repo = "codesnap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BIdqSEsQIV5Z2mYMgoW0gtBaMNxhEsAbZbs/KDJEK4E=";
   };
 
-  cargoHash = "sha256-atvSygt1Xi+rPxcJb0zdRBnL6SpSkyCcGxs1z2hWXGA=";
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  cargoHash = "sha256-xenMTuCy3ABEBddH759m0AgMJUlsS0eFj473Y6qjzkY=";
 
   cargoBuildFlags = [
     "-p"
     "codesnap-cli"
   ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
+
+  OPENSSL_NO_VENDOR = true;
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -35,9 +42,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command-line tool for generating beautiful code snippets";
     homepage = "https://github.com/mistricky/CodeSnap";
-    changelog = "https://github.com/mistricky/CodeSnap/releases/tag/v${version}";
+    changelog = "https://github.com/mistricky/CodeSnap/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "codesnap";
   };
-}
+})
diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix
index 06ac2da90570..af0979e42d0d 100644
--- a/pkgs/by-name/co/codevis/package.nix
+++ b/pkgs/by-name/co/codevis/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sloganking/codevis";
     changelog = "https://github.com/sloganking/codevis/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "codevis";
   };
 }
diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 8111ba57d56a..0a2afc4c8aab 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.46.0";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-o898VjjPKevr1VRlRhJUNWsrHEGEn7jkdzWBj+DpbCs=";
+    hash = "sha256-CIKoOfqZwCCCDFXnRdU7haxfiyvrgGD3vSwXZpE9DUU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-Qp5zezXjVdOp8OylLgUZRLc0HQlgII6nOZodnOrok6U=";
+  cargoHash = "sha256-FN20afqRVdGl17+fbzNoXqF8BY+dPtGi1lvwB6w+ieE=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index 3e3d42799c5c..aa362b81e5e9 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coin";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "coin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2lfy33Qx0AjKDfwwRn7hjaz7mPQsr7MRB9v75qshGjM=";
+    hash = "sha256-XBkb8CbfAXBwOO9JkExpsy8HxtbZo3/fnU6cReuSETI=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libX11;
 
-  cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ];
-
   meta = with lib; {
     homepage = "https://github.com/coin3d/coin";
     description = "High-level, retained-mode toolkit for effective 3D graphics development";
diff --git a/pkgs/by-name/co/colloid-gtk-theme/package.nix b/pkgs/by-name/co/colloid-gtk-theme/package.nix
index cfb00d16cabc..79d6bd2c1687 100644
--- a/pkgs/by-name/co/colloid-gtk-theme/package.nix
+++ b/pkgs/by-name/co/colloid-gtk-theme/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenvNoCC,
   fetchFromGitHub,
-  gnome-themes-extra,
   gtk-engine-murrine,
   jdupes,
   sassc,
@@ -55,14 +54,14 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants"
   tweaks
 
   stdenvNoCC.mkDerivation
-  rec {
+  (finalAttrs: {
     inherit pname;
     version = "2025-07-31";
 
     src = fetchFromGitHub {
       owner = "vinceliuice";
       repo = "colloid-gtk-theme";
-      tag = version;
+      tag = finalAttrs.version;
       hash = "sha256-0pXbeeBAkk6v2DBWfUYhWWdyrQhgr/JfDbhyS33maMM=";
     };
 
@@ -71,10 +70,6 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants"
       sassc
     ];
 
-    buildInputs = [
-      gnome-themes-extra
-    ];
-
     propagatedUserEnvPkgs = [
       gtk-engine-murrine
     ];
@@ -98,11 +93,11 @@ lib.checkListOfEnum "colloid-gtk-theme: theme variants"
       runHook postInstall
     '';
 
-    meta = with lib; {
+    meta = {
       description = "Modern and clean Gtk theme";
       homepage = "https://github.com/vinceliuice/Colloid-gtk-theme";
-      license = licenses.gpl3Only;
-      platforms = platforms.unix;
-      maintainers = [ maintainers.romildo ];
+      license = lib.licenses.gpl3Only;
+      platforms = lib.platforms.unix;
+      maintainers = [ lib.maintainers.romildo ];
     };
-  }
+  })
diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix
index babe6beab93b..24608e78d058 100644
--- a/pkgs/by-name/co/colmap/package.nix
+++ b/pkgs/by-name/co/colmap/package.nix
@@ -55,7 +55,7 @@ let
   ]
   ++ lib.optionals cudaSupport [
     cudatoolkit
-    cudaPackages.cuda_cudart.static
+    (lib.getOutput "static" cudaPackages.cuda_cudart)
   ]
   ++ lib.optional stdenv'.cc.isClang llvmPackages.openmp;
 
@@ -129,7 +129,7 @@ stdenv'.mkDerivation {
     mainProgram = "colmap";
     homepage = "https://colmap.github.io/index.html";
     license = licenses.bsd3;
-    platforms = platforms.unix;
+    platforms = if cudaSupport then platforms.linux else platforms.unix;
     maintainers = with maintainers; [
       lebastr
       usertam
diff --git a/pkgs/by-name/co/colpack/package.nix b/pkgs/by-name/co/colpack/package.nix
index 897b137cd2c9..56bb94293a0e 100644
--- a/pkgs/by-name/co/colpack/package.nix
+++ b/pkgs/by-name/co/colpack/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = [
-    "--enable-openmp=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
+    "--enable-openmp=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
     "--enable-examples=no"
   ];
 
diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix
index dd96be7b040b..5667c5231ed1 100644
--- a/pkgs/by-name/co/comaps/package.nix
+++ b/pkgs/by-name/co/comaps/package.nix
@@ -15,28 +15,35 @@
   nix-update-script,
 }:
 let
-  mapRev = 250822;
+  # https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
+  mapRev = 250906;
 
   worldMap = fetchurl {
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
-    hash = "sha256-OksUAix8yw0WQiJUwfMrjOCd/OwuRjdCOUjjGpnG2S8=";
+    hash = "sha256-0LjCDVk3vShmn+yHc/SvfJzrj170pO52CqbdKWqTsI4=";
   };
 
   worldCoasts = fetchurl {
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
-    hash = "sha256-1OvKZJ3T/YJu6t/qTYliIVkwsT8toBSqGHUpDEk9i2k=";
+    hash = "sha256-2BP6ET8DM3v0KMlzYx+lS0l26WSONQpb4fCMri8Aj2o=";
   };
+
+  pythonEnv = python3.withPackages (
+    ps: with ps; [
+      protobuf
+    ]
+  );
 in
 organicmaps.overrideAttrs (oldAttrs: rec {
   pname = "comaps";
-  version = "2025.08.31-15";
+  version = "2025.10.20-1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "comaps";
     repo = "comaps";
     tag = "v${version}";
-    hash = "sha256-uRShcyMevNb/UE5+l8UabiGSr9TccVWp5xVoqI7+Oh8=";
+    hash = "sha256-9L7wyIXieKkKSrudnmPyiLPu4Jfp10xWi5o5lGslLWc=";
     fetchSubmodules = true;
   };
 
@@ -50,14 +57,16 @@ organicmaps.overrideAttrs (oldAttrs: rec {
 
   postPatch = (oldAttrs.postPatch or "") + ''
     rm -f 3party/boost/b2
+    substituteInPlace configure.sh \
+      --replace-fail "git submodule update --init --recursive --depth 1" ""
+
+    patchShebangs tools/unix/generate_categories.sh
+    substituteInPlace tools/python/categories/json_to_txt.py \
+      --replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"
   '';
 
   nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
-    (python3.withPackages (
-      ps: with ps; [
-        protobuf
-      ]
-    ))
+    pythonEnv
     optipng
   ];
 
diff --git a/pkgs/by-name/co/comaps/remove-lto.patch b/pkgs/by-name/co/comaps/remove-lto.patch
index 8959eed2af12..a894f0079e8b 100644
--- a/pkgs/by-name/co/comaps/remove-lto.patch
+++ b/pkgs/by-name/co/comaps/remove-lto.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c559bf5..42ed617 100644
+index 3ba193a9..01e696e3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -106,7 +106,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+@@ -104,7 +104,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
  elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
    add_definitions(-DRELEASE)
    if (NOT MSVC)
@@ -11,7 +11,7 @@ index c559bf5..42ed617 100644
    endif()
  else()
    message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
-@@ -116,19 +116,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+@@ -114,19 +114,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
    add_compile_options(-fno-omit-frame-pointer)
  endif()
  
@@ -21,7 +21,7 @@ index c559bf5..42ed617 100644
 -  add_compile_options(-fno-fat-lto-objects)
 -  # To fix ar and ranlib "plugin needed to handle lto object".
 -  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
--  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)
 -  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
 -  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
 -  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
diff --git a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
index 01527c53b2a8..01634f925256 100644
--- a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
+++ b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
@@ -1,5 +1,5 @@
 diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
-index 5178ae0..abe103f 100644
+index dd851d7d..1b4e3ed3 100644
 --- a/3party/CMakeLists.txt
 +++ b/3party/CMakeLists.txt
 @@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
@@ -21,4 +21,34 @@ index 5178ae0..abe103f 100644
 +
  add_subdirectory(agg)
  add_subdirectory(bsdiff-courgette)
- add_subdirectory(minizip)
+ add_subdirectory(glaze)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ba193a9..dd2df855 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,25 +225,6 @@ endif()
+ # Used in qt/ and shaders/
+ find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
+-execute_process(
+-    COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf; 
+-print(google.protobuf.__version__)"
+-    RESULT_VARIABLE PROTOBUF_CHECK
+-    OUTPUT_VARIABLE PROTOBUF_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    ERROR_QUIET
+-)
+-
+-if(PROTOBUF_CHECK EQUAL 0)
+-    if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
+-        message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
+-    else()
+-        message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
+-    endif()
+-else()
+-    message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
+-endif()
+-
+
+ add_subdirectory(libs)
+
diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index 954e5ff444b8..19e68775bf79 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -10,6 +10,7 @@
   gtk4,
   gtksourceview5,
   libadwaita,
+  libportal,
   libspelling,
   meson,
   ninja,
@@ -20,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "commit";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "Commit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yNzMFOd0IN5EUKG7ztCEbQzQ9RHc+D4iC1OiBauMSwE=";
+    hash = "sha256-ACgt1xZTiHYiCTUvfQ+KP5TYm8tMimGizK1dn9UXzao=";
     fetchSubmodules = true;
   };
 
@@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     gjs
     gtksourceview5
     libadwaita
+    libportal
     libspelling
   ];
 
diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix
index ef7dc20cfcd8..06eaa4e96a6b 100644
--- a/pkgs/by-name/co/commonsIo/package.nix
+++ b/pkgs/by-name/co/commonsIo/package.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.19.0";
+  version = "2.20.0";
   pname = "commons-io";
 
   src = fetchurl {
     url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "sha256-zhS4nMCrwL2w2qNXco5oRkXSiOzzepD6EiZzmCgfnNI=";
+    sha256 = "sha256-+hNGq8TV4g8w9Q2df9kpYniBg1h8dOX6mF/1kk4VLcw=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index a39ece4aa553..8691ada41e4f 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/adaszko/complgen";
     changelog = "https://github.com/adaszko/complgen/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix
index d6da37a19c5d..25fe02a5e476 100644
--- a/pkgs/by-name/co/compose2nix/package.nix
+++ b/pkgs/by-name/co/compose2nix/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "compose2nix";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "aksiksi";
     repo = "compose2nix";
     rev = "v${version}";
-    hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw=";
+    hash = "sha256-0QCYgzxg0upnrVGDXbX9GgSHyzeMP3yqNor2t8DVwiU=";
   };
 
-  vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges=";
+  vendorHash = "sha256-8boWHIGvenGugKq+8ysPCsUib7QQ0ov+jbKFDKpls3g=";
 
   passthru.tests = {
     version = testers.testVersion {
diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index 1a914083b8d8..5989b16545b5 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "composer-require-checker";
-  version = "4.16.1";
+  version = "4.18.0";
 
   # Upstream no longer provides the composer.lock in their release artifact
   src = fetchgit {
     url = "https://github.com/maglnet/ComposerRequireChecker";
     tag = finalAttrs.version;
-    hash = "sha256-UAofdc8mqSnJXhCTABSf9JZERqur86lzNDI66EHgEQE=";
+    hash = "sha256-8y8ziaWCno389ti263N+xinADoPZZGXqhTHoc9ZkF4Y=";
   };
 
-  vendorHash = "sha256-bNeQEfwXly3LFuEKeSK6J6pRfQF6TNwUqu3SdTswmFI=";
+  vendorHash = "sha256-BDGxHoDLSEdukN+zv8QNZPtVXfRpp/o95ysGFs0wl9Q=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix
index 519b4f9f4b91..13534de903f1 100644
--- a/pkgs/by-name/co/compsize/package.nix
+++ b/pkgs/by-name/co/compsize/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     mainProgram = "compsize";
     homepage = "https://github.com/kilobyte/compsize";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ CrazedProgrammer ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 8773e0922cdc..63fde4cf6859 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.44.0";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
     rev = "v${version}";
-    sha256 = "sha256-qwwROwIFG9/pX8t92EHriaN3O4Z2IpQGylVKhbp/0IU=";
+    sha256 = "sha256-HPAhm0NWWHzdO4eOXxRN4ha4ucQ3O36XvAw09iPdhIc=";
   };
 
-  cargoHash = "sha256-Ybyrk+I0nzHFkEaWDovTOGPC26i7BXcNtFgFjmCHIwM=";
+  cargoHash = "sha256-/LdoXx0em/wp3IurQekQhudtrxbT0sxiNwTTXfE2K4M=";
 
   meta = {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/kivikakk/comrak/blob/v${version}/changelog.txt";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
-      figsoda
       kivikakk
     ];
   };
diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix
index 8ebd8825a82a..dd36990c60b0 100644
--- a/pkgs/by-name/co/conda/package.nix
+++ b/pkgs/by-name/co/conda/package.nix
@@ -27,6 +27,7 @@
   ],
   # Any extra nixpkgs you'd like available in the FHS env for Conda to use
   extraPkgs ? [ ],
+  runScript ? "bash -l",
 }:
 
 # How to use this package?
@@ -43,7 +44,7 @@
 # $ conda-shell
 # $ conda install spyder
 let
-  version = "25.3.1-1";
+  version = "25.9.1-1";
 
   src =
     let
@@ -59,21 +60,15 @@ let
     fetchurl {
       url = "https://repo.anaconda.com/miniconda/Miniconda3-py313_${version}-Linux-${arch}.sh";
       hash = selectSystem {
-        x86_64-linux = "sha256-U6hhCUY8/XC6esqzltQW5iMBKRTu4ARynh7Nb+lOjGk=";
-        aarch64-linux = "sha256-TKoMJmq3JrRAzK1Ap0d0FnSU4AHaXeKBt08tVnPkrOk=";
+        x86_64-linux = "sha256-YCJxTaIphgl7vvoT2rPZVyV/7wThw30evTZFtbmbydQ=";
+        aarch64-linux = "sha256-oN5FYsNoqLXKQ4WEP0BWhMeb6nqjt111E/+ZwMZDXVE=";
       };
     };
 
-  conda = (
-    let
-      libPath = lib.makeLibraryPath [
-        zlib # libz.so.1
-      ];
-    in
+  conda =
     runCommand "install-conda"
       {
         nativeBuildInputs = [ makeWrapper ];
-        buildInputs = [ zlib ];
       }
       # on line 10, we have 'unset LD_LIBRARY_PATH'
       # we have to comment it out however in a way that the number of bytes in the
@@ -82,24 +77,25 @@ let
       # of bytes from the top of the installer script
       # and unsetting the library path prevents the zlib library from being discovered
       ''
-        mkdir -p $out/bin
+        mkdir --parents $out/bin
 
         sed 's/unset LD_LIBRARY_PATH/#nset LD_LIBRARY_PATH/' ${src} > $out/bin/miniconda-installer.sh
         chmod +x $out/bin/miniconda-installer.sh
 
-        makeWrapper                            \
-          $out/bin/miniconda-installer.sh      \
-          $out/bin/install-conda               \
+        makeWrapper $out/bin/miniconda-installer.sh $out/bin/install-conda \
           --add-flags "-p ${installationPath}" \
-          --add-flags "-b"                     \
-          --prefix "LD_LIBRARY_PATH" : "${libPath}"
-      ''
-  );
+          --add-flags "-b" \
+          --prefix "LD_LIBRARY_PATH" : "${
+            lib.makeLibraryPath [
+              zlib # libz.so.1
+            ]
+          }"
+      '';
 in
 
 buildFHSEnv {
   pname = "conda-shell";
-  inherit version;
+  inherit version runScript;
 
   targetPkgs =
     pkgs:
@@ -109,25 +105,26 @@ buildFHSEnv {
       extraPkgs
     ]);
 
-  profile = ''
-    # Add conda to PATH
-    export PATH=${installationPath}/bin:$PATH
-    # Paths for gcc if compiling some C sources with pip
-    export NIX_CFLAGS_COMPILE="-I${installationPath}/include"
-    export NIX_CFLAGS_LINK="-L${installationPath}lib"
-    # Some other required environment variables
-    export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-    export QTCOMPOSE=${xorg.libX11}/share/X11/locale
-    export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
-    # Allows `conda activate` to work properly
-    condaSh=${installationPath}/etc/profile.d/conda.sh
-    if [ ! -f $condaSh ]; then
-      install-conda
-    fi
-    source $condaSh
-  '';
-
-  runScript = "bash -l";
+  profile =
+    let
+      condaSh = "${installationPath}/etc/profile.d/conda.sh";
+    in
+    ''
+      # Add conda to PATH
+      export PATH=${installationPath}/bin:$PATH
+      # Paths for gcc if compiling some C sources with pip
+      export NIX_CFLAGS_COMPILE="-I${installationPath}/include"
+      export NIX_CFLAGS_LINK="-L${installationPath}/lib"
+      # Some other required environment variables
+      export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+      export QTCOMPOSE=${xorg.libX11}/share/X11/locale
+      export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
+      # Allows `conda activate` to work properly
+      if [ ! -f ${condaSh} ]; then
+        install-conda
+      fi
+      source ${condaSh}
+    '';
 
   meta = {
     description = "Package manager for Python";
diff --git a/pkgs/by-name/co/confetty/package.nix b/pkgs/by-name/co/confetty/package.nix
index e70c90bdfc2c..f73697100581 100644
--- a/pkgs/by-name/co/confetty/package.nix
+++ b/pkgs/by-name/co/confetty/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Confetti in your TTY";
     homepage = "https://github.com/maaslalani/confetty";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "confetty";
   };
 }
diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix
index c545f2e0aecb..dd5dec0b6b6e 100644
--- a/pkgs/by-name/co/confluent-cli/package.nix
+++ b/pkgs/by-name/co/confluent-cli/package.nix
@@ -7,7 +7,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "confluent-cli";
-  version = "4.39.1";
+  version = "4.41.0";
 
   # To get the latest version:
   # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1
@@ -26,10 +26,10 @@ stdenv.mkDerivation (finalAttrs: {
     fetchurl {
       url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz";
       hash = selectSystem {
-        x86_64-linux = "sha256-8KhsFMQXoIPp1oZR5Q6u1yNoNvrCulbWq/rb6pMLhTU=";
-        aarch64-linux = "sha256-gLsNOAd9xzSbmenXhUN9nDGyFObtB2IG2z+OxHjrMSM=";
-        x86_64-darwin = "sha256-t0PcZd3n2Bayct4/h/JtCJwyKYjtMaXmOvvrlJ6LzGc=";
-        aarch64-darwin = "sha256-sSJd87dzsYLCdpP3tw4cMTyhnxmku70g1rCqhxGImGA=";
+        x86_64-linux = "sha256-JY0emiNT2l0wIa8jgaiVu2sMfIwY+II6h0uDLzeGhqc=";
+        aarch64-linux = "sha256-jWLIOolU+b1sKz1X8QdsFAwF0xsFj8VwIRZi3Y8C9z0=";
+        x86_64-darwin = "sha256-pPnAbHdhFgrux3XG+GXdT2NCQDSpZqopDoZTlyuQOMk=";
+        aarch64-darwin = "sha256-pS+coSuTrzWuVDu+Yp/m/FnP1kcQKXvROrcWuATM7mU=";
       };
     };
 
diff --git a/pkgs/by-name/co/conglomerate/package.nix b/pkgs/by-name/co/conglomerate/package.nix
index 5c4fc39a8ddc..a200d9fe49c9 100644
--- a/pkgs/by-name/co/conglomerate/package.nix
+++ b/pkgs/by-name/co/conglomerate/package.nix
@@ -47,6 +47,11 @@ stdenv.mkDerivation {
     "-DBICPL_DIR=${bicpl}/lib"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postFixup = ''
     for p in $out/bin/*; do
       wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${
diff --git a/pkgs/by-name/co/conkeyscan/package.nix b/pkgs/by-name/co/conkeyscan/package.nix
index 84db874f792b..9260aa7c73a9 100644
--- a/pkgs/by-name/co/conkeyscan/package.nix
+++ b/pkgs/by-name/co/conkeyscan/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
 let
@@ -34,6 +35,15 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-xYCms+Su7FmaG7KVHZpzfD/wx9Gepz11t8dEK/YDfvI=";
   };
 
+  patches = [
+    # https://github.com/CompassSecurity/conkeyscan/pull/3
+    (fetchpatch {
+      name = "replace-random-user-agent-with-fake-useragent.patch";
+      url = "https://github.com/nagapraneethk/conkeyscan/commit/f6cf61cc42fcc07930a06891b6c4a2653bfbf47f.patch";
+      hash = "sha256-zfHU/KsgzQvn/kNsWZy1hGZaBHw/he1zDTUHHV/BHFc=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace-fail "{{VERSION_PLACEHOLDER}}" "${version}"
@@ -47,7 +57,7 @@ python.pkgs.buildPythonApplication rec {
     clize
     loguru
     pysocks
-    random-user-agent
+    fake-useragent
     readchar
     requests-ratelimiter
   ];
diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix
index 0f3ed3d244cf..ecd7044c3d67 100644
--- a/pkgs/by-name/co/connectome-workbench/package.nix
+++ b/pkgs/by-name/co/connectome-workbench/package.nix
@@ -6,57 +6,57 @@
   cmake,
   libGL,
   libGLU,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "connectome-workbench";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Washington-University";
     repo = "workbench";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg=";
+    hash = "sha256-f1T0i4x7rr3u/3ZvJ4cEAb377e7YcaGMKa2uUslVqR0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  patches = [
-    # remove after next release:
-    (fetchpatch {
-      name = "fix-missing-includes-in-CZIlib";
-      url = "https://github.com/Washington-University/workbench/commit/7ba3345d161d567a4b628ceb02ab4471fc96cb20.diff";
-      hash = "sha256-DMrJOr/2Wr4o4Z3AuhWfMZTX8f/kOYWwZQzBUwIrTd8=";
-      relative = "src";
-    })
-  ];
-
   postPatch = ''
-    substituteInPlace CMakeLists.txt  \
-      --replace-fail "ADD_SUBDIRECTORY ( Tests )" ""  \
-      --replace-fail "ENABLE_TESTING()" ""
-  '';
-  # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
-  # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
-  # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
+    substituteInPlace kloewe/{cpuinfo,dot}/CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  ''
+  +
+    # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
+    # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
+    # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
+    ''
+      substituteInPlace CMakeLists.txt  \
+        --replace-fail "ADD_SUBDIRECTORY ( Tests )" ""  \
+        --replace-fail "ENABLE_TESTING()" ""
+    '';
 
   env.NIX_CFLAGS_COMPILE = "-fpermissive";
 
   nativeBuildInputs = [
     cmake
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     libGL
     libGLU
   ]
-  ++ (with libsForQt5; [
+  ++ (with qt6; [
     qtbase
+    qt5compat
   ]);
   # note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly
 
+  cmakeFlags = [
+    "-DWORKBENCH_USE_QT6=TRUE"
+    "-DWORKBENCH_USE_QT5=FALSE"
+  ];
+
   meta = {
     description = "Visualization and discovery tool used to map neuroimaging data";
     homepage = "https://www.humanconnectome.org/software/connectome-workbench";
diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index 63b181c26168..29a2eadcdbc0 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "containerlab";
-  version = "0.69.3";
+  version = "0.71.0";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RJNJ5LUCGaARn5NOSepTL/0Owr/ozFUYAvlynDTyqfY=";
+    hash = "sha256-wfkkRQ0F8G57pEuyLP1qjoZGkDNW/Ix4Nh3ZKoWK+w8=";
   };
 
-  vendorHash = "sha256-28Q1R6P2rpER5RxagnsKy9W3b4FUeRRbkPPovzag//U=";
+  vendorHash = "sha256-s5WBCYOdNooygEL0AbhIqZLeWd4gnpAvWjJu38QTKYU=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -27,9 +27,9 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/srl-labs/containerlab/cmd/version.Version=${finalAttrs.version}"
-    "-X github.com/srl-labs/containerlab/cmd/version.commit=${finalAttrs.src.rev}"
-    "-X github.com/srl-labs/containerlab/cmd/version.date=1970-01-01T00:00:00Z"
+    "-X github.com/srl-labs/containerlab/cmd.Version=${finalAttrs.version}"
+    "-X github.com/srl-labs/containerlab/cmd.commit=${finalAttrs.src.rev}"
+    "-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z"
   ];
 
   preCheck = ''
@@ -37,9 +37,11 @@ buildGoModule (finalAttrs: {
     export USER="runner"
   '';
 
-  # TestVerifyLinks wants to use docker.sock, which is not available in the Nix build environment.
   checkFlags = [
-    "-skip=^TestVerifyLinks$"
+    # Not available in sandbox:
+    # - docker.sock needed for TestVerifyLinks
+    # - /proc/modules needed for KernelModulesLoaded
+    "-skip=^TestVerifyLinks$|^TestIsKernelModuleLoaded$"
   ];
 
   postInstall = ''
@@ -59,7 +61,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/srl-labs/containerlab/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     mainProgram = "containerlab";
   };
 })
diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix
index 0f7e90a87f78..036047bc1e61 100644
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "converseen";
-  version = "0.15.0.3";
+  version = "0.15.1.0";
 
   src = fetchFromGitHub {
     owner = "Faster3ck";
     repo = "Converseen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZC7D+0tonAIkbDaoqw+RarIVuNcDQe410JrfC2kG+B8=";
+    hash = "sha256-loWwwleiBgwV/6t33HgIqEHU9y/pqyocmwBn0Qg01RY=";
   };
 
   strictDeps = true;
diff --git a/pkgs/applications/science/misc/convertall/default.nix b/pkgs/by-name/co/convertall/package.nix
similarity index 100%
rename from pkgs/applications/science/misc/convertall/default.nix
rename to pkgs/by-name/co/convertall/package.nix
diff --git a/pkgs/applications/science/misc/convertall/pubspec.lock.json b/pkgs/by-name/co/convertall/pubspec.lock.json
similarity index 100%
rename from pkgs/applications/science/misc/convertall/pubspec.lock.json
rename to pkgs/by-name/co/convertall/pubspec.lock.json
diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix
index 80deaa80aad9..18b9242f45c9 100644
--- a/pkgs/by-name/co/cook-cli/package.nix
+++ b/pkgs/by-name/co/cook-cli/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cook-cli";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromGitHub {
     owner = "cooklang";
     repo = "cookcli";
     rev = "v${version}";
-    hash = "sha256-alrmQOt9PY155fIWXmp1m2dfhhkMOd4PkfkBWS2XXRg=";
+    hash = "sha256-uw1xwE7hIE00OADV9kOXR1/gKSzvleW1/5PwfhH4fvE=";
   };
 
-  cargoHash = "sha256-tYD49UrLzPPS8G2zy2GKFBK4SGYXQ7UEjFWKcHvUTSY=";
+  cargoHash = "sha256-Yxln5eKNXONGd4Hy9Ru9t92iqK9zcTSpzu2j75bc3fk=";
 
   # Build without the self-updating feature
   buildNoDefaultFeatures = true;
diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index c571cf644114..aca6ac5877c9 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.381.0";
+  version = "1.392.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-EnctWGV+20onOTuaBW9E7LXct0PUpCn7WwuAy2X2KL8=";
+    hash = "sha256-+stenLWQWykBKHole0wW8w8jRzhjOio/VEcMPmklI/0=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix
index 9b00d7c421a0..095c388cd20e 100644
--- a/pkgs/by-name/co/copybara/package.nix
+++ b/pkgs/by-name/co/copybara/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "copybara";
-  version = "20250929";
+  version = "20251027";
 
   src = fetchurl {
     url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
-    hash = "sha256-7fI7YeGFmOc/t4JPW8dszX0/MctIJdCfRuJVjEn+7vQ=";
+    hash = "sha256-IHW6y6WXJFjX9RYD+IwVAMwAbEo36fLqonIKR+FaqpQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/co/copyparty-full-buggy/package.nix b/pkgs/by-name/co/copyparty-full-buggy/package.nix
new file mode 100644
index 000000000000..d717d141a832
--- /dev/null
+++ b/pkgs/by-name/co/copyparty-full-buggy/package.nix
@@ -0,0 +1,17 @@
+{ copyparty }:
+copyparty.override {
+  withHashedPasswords = true;
+  withCertgen = true;
+  withThumbnails = true;
+  withFastThumbnails = true;
+  withMediaProcessing = true;
+  withBasicAudioMetadata = true;
+  withZeroMQ = true;
+  withFTP = true;
+  withFTPS = true;
+  withTFTP = true;
+  withMagic = true;
+  withSMB = true;
+  nameSuffix = "-full-buggy";
+  longDescription = "Full variant, all dependencies and features including those marked buggy";
+}
diff --git a/pkgs/by-name/co/copyparty-min/package.nix b/pkgs/by-name/co/copyparty-min/package.nix
new file mode 100644
index 000000000000..b2bd2b42ce53
--- /dev/null
+++ b/pkgs/by-name/co/copyparty-min/package.nix
@@ -0,0 +1,17 @@
+{ copyparty }:
+copyparty.override {
+  withHashedPasswords = false;
+  withCertgen = false;
+  withThumbnails = false;
+  withFastThumbnails = false;
+  withMediaProcessing = false;
+  withBasicAudioMetadata = false;
+  withZeroMQ = false;
+  withFTP = false;
+  withFTPS = false;
+  withTFTP = false;
+  withSMB = false;
+  withMagic = false;
+  nameSuffix = "-min";
+  longDescription = "Minimal variant, minimal dependencies and fewest features";
+}
diff --git a/pkgs/by-name/co/copyparty-most/package.nix b/pkgs/by-name/co/copyparty-most/package.nix
new file mode 100644
index 000000000000..6e8fa8e8b205
--- /dev/null
+++ b/pkgs/by-name/co/copyparty-most/package.nix
@@ -0,0 +1,17 @@
+{ copyparty }:
+copyparty.override {
+  withHashedPasswords = true;
+  withCertgen = true;
+  withThumbnails = true;
+  withFastThumbnails = true;
+  withMediaProcessing = true;
+  withBasicAudioMetadata = true;
+  withZeroMQ = true;
+  withFTP = true;
+  withFTPS = true;
+  withTFTP = true;
+  withSMB = false;
+  withMagic = true;
+  nameSuffix = "-most";
+  longDescription = "Almost-full variant, all dependencies and features except those marked buggy";
+}
diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix
new file mode 100644
index 000000000000..558b476480be
--- /dev/null
+++ b/pkgs/by-name/co/copyparty/package.nix
@@ -0,0 +1,174 @@
+# partially sourced from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/copyparty/default.nix
+{
+  lib,
+
+  fetchurl,
+
+  python3Packages,
+
+  # non-python deps
+  cfssl,
+  ffmpeg,
+  util-linux,
+
+  # options
+  # use argon2id-hashed passwords in config files (sha2 is always available)
+  withHashedPasswords ? true,
+
+  # generate TLS certificates on startup (pointless when reverse-proxied)
+  withCertgen ? true,
+
+  # create thumbnails with Pillow; faster than FFmpeg / MediaProcessing
+  withThumbnails ? true,
+
+  # create thumbnails with PyVIPS; even faster, uses more memory
+  # -- can be combined with Pillow to support more filetypes
+  withFastThumbnails ? false,
+
+  # enable FFmpeg; thumbnails for most filetypes (also video and audio), extract audio metadata, transcode audio to opus
+  # -- possibly dangerous if you allow anonymous uploads, since FFmpeg has a huge attack surface
+  # -- can be combined with Thumbnails and/or FastThumbnails, since FFmpeg is slower than both
+  withMediaProcessing ? true,
+
+  # if MediaProcessing is not enabled, you probably want this instead (less accurate, but much safer and faster)
+  withBasicAudioMetadata ? false,
+
+  # send ZeroMQ messages from event-hooks
+  withZeroMQ ? true,
+
+  # enable FTP server
+  withFTP ? true,
+
+  # enable FTPS support in the FTP server
+  withFTPS ? false,
+
+  # enable TFTP server
+  withTFTP ? false,
+
+  # samba/cifs server; dangerous and buggy, enable if you really need it
+  withSMB ? false,
+
+  # enables filetype detection for nameless uploads
+  withMagic ? false,
+
+  # extra packages to add to the PATH
+  extraPackages ? [ ],
+
+  # function that accepts a python packageset and returns a list of packages to
+  # be added to the python venv. useful for scripts and such that require
+  # additional dependencies
+  extraPythonPackages ? (_p: [ ]),
+
+  nameSuffix ? "",
+
+  # this goes directly into meta.longDescription
+  longDescription ? "Default build",
+}:
+
+let
+  runtimeDeps = ([ util-linux ] ++ extraPackages ++ lib.optional withMediaProcessing ffmpeg);
+in
+
+python3Packages.buildPythonApplication rec {
+  pname = "copyparty${nameSuffix}";
+  version = "1.19.20";
+
+  src = fetchurl {
+    url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz";
+    hash = "sha256-BQzMNFVOWSEKynpn2HoYbmmz9NvgE9XuLxGiLCWagqY=";
+  };
+
+  pyproject = true;
+
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies =
+    with python3Packages;
+    [
+      jinja2
+      fusepy
+    ]
+    ++ lib.optional withSMB impacket
+    ++ lib.optional withFTP pyftpdlib
+    ++ lib.optional withFTPS pyopenssl
+    ++ lib.optional withTFTP partftpy
+    ++ lib.optional withCertgen cfssl
+    ++ (lib.optionals withThumbnails [
+      pillow
+      pillow-jpls
+      pillow-heif
+      rawpy
+    ])
+    ++ lib.optional withFastThumbnails pyvips
+    ++ lib.optional withMediaProcessing ffmpeg
+    ++ lib.optional withBasicAudioMetadata mutagen
+    ++ lib.optional withHashedPasswords argon2-cffi
+    ++ lib.optional withZeroMQ pyzmq
+    ++ lib.optional withMagic magic
+    ++ (extraPythonPackages python3Packages);
+
+  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath runtimeDeps}" ];
+
+  meta = {
+    description = "turn almost any device into a file server over http(s), webdav, ftp(s), and tftp";
+    inherit longDescription;
+    homepage = "https://github.com/9001/copyparty";
+    license =
+      let
+        # list from https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile
+        includedLibraryLicenses = with lib.licenses; {
+          # https://github.com/openpgpjs/asmcrypto.js
+          asmcrypto = mit;
+          # https://github.com/markedjs/marked
+          marked = [
+            # https://github.com/markedjs/marked/blob/master/LICENSE.md
+            mit
+            bsd3
+          ];
+          # https://github.com/Ionaru/easy-markdown-editor
+          easy-markdown-editor = lib.licenses.mit;
+          # https://github.com/codemirror/codemirror5
+          codemirror = lib.licenses.mit;
+          # https://github.com/cure53/DOMPurify
+          dompurify = [
+            asl20 # or
+            mpl20
+          ];
+          # https://github.com/FortAwesome/Font-Awesome
+          font-awesome = [
+            cc-by-40
+            ofl
+            mit
+          ];
+          # https://github.com/PrismJS/prism/blob/v2/LICENSE
+          prism = mit;
+          # https://files.pythonhosted.org/packages/04/0b/4506cb2e831cea4b0214d3625430e921faaa05a7fb520458c75a2dbd2152/fusepy-3.0.1.tar.gz
+          # https://pypi.org/project/fusepy
+          # https://github.com/fusepy/fusepy
+          fusepy = isc;
+        };
+        copypartyLicense = lib.licenses.mit;
+        res = lib.pipe includedLibraryLicenses [
+          builtins.attrValues
+          (a: a ++ [ copypartyLicense ])
+          lib.flatten
+          lib.unique
+        ];
+      in
+      res;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      # the javascript deps come pre-built
+      # see https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile
+      binaryBytecode
+      binaryNativeCode
+    ];
+    maintainers = with lib.maintainers; [
+      shelvacu
+    ];
+    mainProgram = "copyparty";
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix
index 375fbe28733c..dc2618a6bc7f 100644
--- a/pkgs/by-name/co/coredns/package.nix
+++ b/pkgs/by-name/co/coredns/package.nix
@@ -6,7 +6,7 @@
   installShellFiles,
   nixosTests,
   externalPlugins ? [ ],
-  vendorHash ? "sha256-Es3xy8NVDo7Xgu32jJa4lhYWGa5hJnRyDKFYQqB3aBY=",
+  vendorHash ? "sha256-pU8INVCKjYfAFOeobM7N1XCMHod7Kz0N5NKwpMpA2lU=",
 }:
 
 let
@@ -14,13 +14,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "coredns";
-  version = "1.12.2";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "coredns";
     repo = "coredns";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-P4GhWrEACR1ZhNhGAoXWvNXYlpwnm2dz6Ggqv72zYog=";
+    hash = "sha256-rWa4xjHRREoMtvPqW6ZP6Ym9qNTa0l8Opd15FsmxraI=";
   };
 
   inherit vendorHash;
diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index 63e1cef48274..b3939329e100 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "coroot-node-agent";
-  version = "1.26.3";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
     rev = "v${version}";
-    hash = "sha256-IdDH+jFVRbquM+9VkPw/Sb2dc6eajLpNsLlYkUEUNAo=";
+    hash = "sha256-y8Uuz0lH49PTW9NjPzKjfxjquDar6uOc+GlI+KiqkOU=";
   };
 
-  vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";
+  vendorHash = "sha256-KK9VkcXwcSTzhdf/22Ft4DUUlvUERGAWE5zwdbOtrQo=";
 
   buildInputs = [ systemdLibs ];
 
diff --git a/pkgs/by-name/co/corto/package.nix b/pkgs/by-name/co/corto/package.nix
index acf0517e0c10..5efe16c864c4 100644
--- a/pkgs/by-name/co/corto/package.nix
+++ b/pkgs/by-name/co/corto/package.nix
@@ -2,26 +2,42 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corto";
-  version = "0-unstable-2024-04-05";
+  version = "2025.07";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "corto";
-    rev = "d880519c490c88a39d12c31a914b6a687a7019c3";
-    hash = "sha256-0OUijrf+0ZNv3oYko2r8Kp9zgtg8b9RPL7DXHf15Ryc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wfIZQdypBTfUZJgPE4DetSt1SUNSyZihmL1Uzapqh1o=";
   };
 
+  patches = [
+    # CMake: exports
+    # ref. https://github.com/cnr-isti-vclab/corto/pull/47
+    # merged upstream
+    (fetchpatch {
+      name = "cmake-exports.patch";
+      url = "https://github.com/cnr-isti-vclab/corto/commit/169356e97b29587b278822118aef34ed742b6b37.patch";
+      hash = "sha256-imJfQ8JEhCcSkkO35N7Z3NtGElCyVxENPMDMWfNqdW0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  updateScript = nix-update-script { };
+
+  meta = {
     description = "Mesh compression library, designed for rendering and speed";
     homepage = "https://github.com/cnr-isti-vclab/corto";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nim65s ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nim65s ];
+    mainProgram = "corto";
   };
-}
+})
diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix
index 2a628b6f43e7..6961fed1c765 100644
--- a/pkgs/by-name/co/cosign/package.nix
+++ b/pkgs/by-name/co/cosign/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "cosign";
-  version = "2.6.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = "cosign";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-JQxVO7wZFyRovst3qb0EErDyIIhPNsIpBq/iQVf6djY=";
+    hash = "sha256-5jCO2LW7nzbzo+de0fpxBcVASDmINB6yFerkQZlo2o8=";
   };
 
   buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite);
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
     installShellFiles
   ];
 
-  vendorHash = "sha256-7qVJMQI5htqMavrxFP2lQfQ/7b27bRWnNYg2cHmTZYE=";
+  vendorHash = "sha256-hedkslhyAsictu9Cbw7CgreoWa1StLpTt8oTPNLr5fc=";
 
   subPackages = [
     "cmd/cosign"
diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index 670fff08479b..42ce68adc96a 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-uUcEwa9rGHLzmlutmLl/e38ZqybfYMU0Dhe+FsT5V/E=";
+    hash = "sha256-GYn8qz1rpfKxC493Us6XMge+V9nUCEBKPkKNCHy8Bik=";
   };
 
-  cargoHash = "sha256-RnkyIlTJMxMGu+EsmZwvSIapSqdng+t8bqMVsDXprlU=";
+  cargoHash = "sha256-HLbcTDwS5IvolEMb0bZr4CPjtEjZI8G+AggXifIDiKM=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 2f60f0f352b0..c9c69719c081 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-LVNOUOVeX8QpTbUG3bOhMkdrjkF3M0sZg+agSQyWAfA=";
+    hash = "sha256-owvAwJR4spwQoHotgjMANWXsTRgPhwK7v8OgTuSaAHw=";
   };
 
-  cargoHash = "sha256-f5uMgscentTlcPXFSan1kKcKh1nk88/3kQPTSuc0wz4=";
+  cargoHash = "sha256-CX1/6fXL63P1J6yjvFKd91WqSf4+mf+GOtX1O9fHfgg=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 719f4650bde2..5f41f96275b4 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-bg";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-t5tY7Axiz39lCDhDC/lKSRCURfHspeaP49kNXJvCLC4=";
+    hash = "sha256-RPVPiMEwMh4DRixaC8A4oK9KzGIbi2CFlVAthICalt0=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index a18d018a1ba1..a609badc97a3 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   libcosmicAppHook,
   pkg-config,
-  libdisplay-info,
+  libdisplay-info_0_2,
   libgbm,
   libinput,
   pixman,
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-RHeQk1yBNnDN/efuDDWNLn9O7FQTYLBsbs+h+gxi+Xo=";
+    hash = "sha256-jy1xjdihkd+RvXQVOwaTVNoQfbH6mlthStHpEMjkuGs=";
   };
 
-  cargoHash = "sha256-Jaw2v+02lA5wWRAhRNW/lcLnTI7beJIZ43dqcJ60EP0=";
+  cargoHash = "sha256-Gk2vXmVMcDWg3VnI0176eKF65tAfPwVZ74oQtD0UBO8=";
 
   separateDebugInfo = true;
 
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
-    libdisplay-info
+    libdisplay-info_0_2
     libgbm
     libinput
     pixman
diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index c861f9a5ead8..cb99f4c34e3c 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Zd/vTNZt9tPXryOwo2U68FtIul7xiRcz5N4Heuyicoc=";
+    hash = "sha256-ARGZ4yRbh2FJHeVSwXcQm5WjnJL16PDC9bjLmlHW8ig=";
   };
 
-  cargoHash = "sha256-YfD06RAQPZRwapd0fhNsZ0tx+0JMNDXiPJIWwDhmG0M=";
+  cargoHash = "sha256-Ot69WdCvdT8xg3/LPMb8C5Rdq04Mvmr5VLS+adnvuvY=";
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
index 306b8fd12279..fdcb486eadc1 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-caffeine";
-  version = "0-unstable-2025-09-29";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "tropicbliss";
     repo = "cosmic-ext-applet-caffeine";
-    rev = "a43db670e03894ff402fa19eec3d60f7c7bf663c";
-    hash = "sha256-0hIc62FdjIGU028z8/WCx2q317e+PCA25CSibBVi/p0=";
+    rev = "5eeb6e505eba172fbfee6b9551df8f8a3702213e";
+    hash = "sha256-sTvP62oQknRzuc3qQqUAK70uS2MqXl8lAF27V0To8NM=";
   };
 
-  cargoHash = "sha256-nl/giMIQ5xNSOgjv67OMWkfuAVtdIcqZDbXC1mYwXBM=";
+  cargoHash = "sha256-89/0XEdQ7MCycAkHhTkA5FCj/eKVLgWDhljKB/Lo4+4=";
 
   nativeBuildInputs = [
     libcosmicAppHook
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Caffeine Applet for the COSMIC desktop";
     homepage = "https://github.com/tropicbliss/cosmic-ext-applet-caffeine";
-    license = lib.licenses.mit;
+    license = lib.licenses.gpl2Only;
     mainProgram = "cosmic-ext-applet-caffeine";
     maintainers = [ lib.maintainers.HeitorAugustoLN ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index f931d3df52e6..38fa2358ad07 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-pSjmsWsGGhjCekMTX8iiNVbF5X33zg5YVDWtemjIDWU=";
+    hash = "sha256-nb/2ax+W/cc7o5UfdAXgDdDvQIFBCqIfIDR3COcxC3A=";
   };
 
-  cargoHash = "sha256-7RANj+aXdmBVO66QDgcNrrU4qEGK4Py4+ZctYWU1OO8=";
+  cargoHash = "sha256-3rOWm9nwsTBNoE2rR2E2wiql+JQnd2Jv4apt6tPuIqs=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 77ef71a8dace..1033a24245dd 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,20 +19,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-rMZ+UbHarnvPaVAI5XeBfLduWEZHthguRSKLv3d/Eo0=";
+    hash = "sha256-E0oQ4oinx6tdZ13jCWOJ5vtebocRbnaQbBk61UcRfD8=";
   };
 
-  cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4=";
+  cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
 
-  env.VERGEN_GIT_COMMIT_DATE = "2025-09-16";
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
+  env = {
+    VERGEN_GIT_COMMIT_DATE = "2025-11-04";
+    VERGEN_GIT_SHA = finalAttrs.src.tag;
+  };
 
   cargoBuildFlags = [ "--all" ];
 
diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 5a40a5269324..9f4af0957ca0 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 9847ce7966f0..fd92cf7b5658 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch b/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch
deleted file mode 100644
index 1276c39cd0ce..000000000000
--- a/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/main.rs b/src/main.rs
-index a0e8f2e..07cf8b9 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -194,19 +194,19 @@ impl Application for App {
-                         }
-                     }
- 
--                    page::Message::Language(message) => {
--                        if let Some(page) =
--                            self.pages.get_mut(&TypeId::of::<page::language::Page>())
--                        {
--                            return page
--                                .as_any()
--                                .downcast_mut::<page::language::Page>()
--                                .unwrap()
--                                .update(message)
--                                .map(Message::PageMessage)
--                                .map(cosmic::Action::App);
--                        }
--                    }
-+                    // page::Message::Language(message) => {
-+                    //     if let Some(page) =
-+                    //         self.pages.get_mut(&TypeId::of::<page::language::Page>())
-+                    //     {
-+                    //         return page
-+                    //             .as_any()
-+                    //             .downcast_mut::<page::language::Page>()
-+                    //             .unwrap()
-+                    //             .update(message)
-+                    //             .map(Message::PageMessage)
-+                    //             .map(cosmic::Action::App);
-+                    //     }
-+                    // }
- 
-                     page::Message::Layout(message) => {
-                         if let Some(page) = self.pages.get_mut(&TypeId::of::<page::layout::Page>())
-diff --git a/src/page/mod.rs b/src/page/mod.rs
-index 389728c..937a1b3 100644
---- a/src/page/mod.rs
-+++ b/src/page/mod.rs
-@@ -4,7 +4,7 @@ use std::any::{Any, TypeId};
- 
- pub mod appearance;
- pub mod keyboard;
--pub mod language;
-+// pub mod language;
- pub mod launcher;
- pub mod layout;
- pub mod location;
-@@ -34,10 +34,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
-     if let AppMode::NewInstall { create_user } = mode {
-         pages.insert(TypeId::of::<wifi::Page>(), Box::new(wifi::Page::default()));
- 
--        pages.insert(
--            TypeId::of::<language::Page>(),
--            Box::new(language::Page::new()),
--        );
-+        // pages.insert(
-+        //     TypeId::of::<language::Page>(),
-+        //     Box::new(language::Page::new()),
-+        // );
- 
-         pages.insert(
-             TypeId::of::<keyboard::Page>(),
-@@ -95,7 +95,7 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
- pub enum Message {
-     Appearance(appearance::Message),
-     Keyboard(keyboard::Message),
--    Language(language::Message),
-+    // Language(language::Message),
-     Layout(layout::Message),
-     Location(location::Message),
-     SetTheme(cosmic::Theme),
diff --git a/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch b/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch
deleted file mode 100644
index 5af92f16d5bb..000000000000
--- a/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/src/main.rs b/src/main.rs
-index a0e8f2e..b6ff8dc 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -221,7 +221,7 @@ impl Application for App {
-                         }
-                     }
- 
--                    page::Message::Location(message) => {
-+                    /* page::Message::Location(message) => {
-                         if let Some(page) =
-                             self.pages.get_mut(&TypeId::of::<page::location::Page>())
-                         {
-@@ -233,7 +233,7 @@ impl Application for App {
-                                 .map(Message::PageMessage)
-                                 .map(cosmic::Action::App);
-                         }
--                    }
-+                    } */
- 
-                     page::Message::User(message) => {
-                         if let Some(page) = self.pages.get_mut(&TypeId::of::<page::user::Page>()) {
-diff --git a/src/page/mod.rs b/src/page/mod.rs
-index 389728c..38ced5e 100644
---- a/src/page/mod.rs
-+++ b/src/page/mod.rs
-@@ -7,7 +7,7 @@ pub mod keyboard;
- pub mod language;
- pub mod launcher;
- pub mod layout;
--pub mod location;
-+// pub mod location;
- pub mod new_apps;
- pub mod new_shortcuts;
- pub mod user;
-@@ -48,10 +48,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
-             pages.insert(TypeId::of::<user::Page>(), Box::new(user::Page::default()));
-         }
- 
--        pages.insert(
-+        /* pages.insert(
-             TypeId::of::<location::Page>(),
-             Box::new(location::Page::new()),
--        );
-+        ); */
-     }
- 
-     pages.insert(
-@@ -97,7 +97,7 @@ pub enum Message {
-     Keyboard(keyboard::Message),
-     Language(language::Message),
-     Layout(layout::Message),
--    Location(location::Message),
-+    // Location(location::Message),
-     SetTheme(cosmic::Theme),
-     User(user::Message),
-     Welcome(welcome::Message),
-@@ -150,4 +150,4 @@ pub trait Page {
-     fn view(&self) -> Element<'_, Message> {
-         widget::text::body("TODO").into()
-     }
--}
-+}
-\ No newline at end of file
diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 63558e905a57..9eb2a90ba0fb 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  fetchpatch2,
   just,
+  killall,
   libcosmicAppHook,
   libinput,
   openssl,
@@ -14,16 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
+  # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-kjJqGNcIlnzEsfA4eQ9D23ZGgRcmWQyWheAlwpjfALA=";
+    hash = "sha256-SDLdVTY7Fj8ZLHpZLaTlGy7sAqs/4eAVSjwBugownFM=";
   };
 
-  cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM=";
+  cargoHash = "sha256-jOPJiKPE3UUD/QHmb+6s6l2RVhtUFls3QRGQ6DmEFSE=";
 
   buildFeatures = [ "nixos" ];
 
@@ -41,23 +42,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
+    killall
     libinput
     openssl
     udev
   ];
 
-  # These are not needed for NixOS
-  patches = [
-    ./disable-language-page.patch
-    ./disable-timezone-page.patch
-    # TODO: Remove in next update
-    (fetchpatch2 {
-      name = "fix-layout-and-themes-page.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/pop-os/cosmic-initial-setup/pull/53.diff?full_index=1";
-      hash = "sha256-081qyQnPhh+FRPU/JKJVCK+l3SKjHAIV5b6/7WN6lb8=";
-    })
-  ];
-
   postPatch = ''
     # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart
     substituteInPlace justfile \
@@ -66,6 +56,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"
   '';
 
+  preFixup = ''
+    libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]})
+  '';
+
   dontUseJustBuild = true;
   dontUseJustCheck = true;
 
diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index f2617f151cc7..728aa16fd143 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vAuWH9qmstPcfPvcKoM/2VjGxAfdtO9hhOPaZ5Ft4Y0=";
+    hash = "sha256-WLvntcBgzG1iTDN5zPAa9gYaUb1yxyQPbqXZPDaycfo=";
   };
 
-  cargoHash = "sha256-57rkCufJPWm844/iMIfULfaGR9770q8VgZgnqCM57Zg=";
+  cargoHash = "sha256-2kkKPU4iEsInLwJyEyJ15/T1pVfDsKD69DISGilNWws=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 9ff3f7ac8299..f798679d0a3e 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-wgOjaiKJ1KYdYsynQV5+KKGhdneELiLTHYqjMEWaxt0=";
+    hash = "sha256-OK+6qSQuu44t1uMt9ESg2L9h47wQmiCh1iZfXkO1vE0=";
   };
 
-  cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ=";
+  cargoHash = "sha256-kLvfZBHJbVSceqKuB9XFshTH4Sl54hKfm8H90RUszKk=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 0dcc4b8dc4b5..a135749164f4 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-tsP4dlHmzuf5QgByDWbuigMrpgnJAjuNsYwWDSutCoI=";
+    hash = "sha256-JClwgNfTiGrXVMheRmHuiDBwvUQJqgF4GCe4IWUk87E=";
   };
 
-  cargoHash = "sha256-YcNvvK+Zf8nSS5YjS5iaoipogstiyBdNY7LhWPsz9xQ=";
+  cargoHash = "sha256-v6/lWqGG3uFSFgw77M0kGM+cK9wSiuaGaciPqz/wFIQ=";
 
   nativeBuildInputs = [
     libcosmicAppHook
diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index ff40a8512385..cee1d116df00 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-panel";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gSTvF6Zcixh5/uYZuUiCIdBlXJj31+lISBwLujTuOfo=";
+    hash = "sha256-a23VexqsWz2e6/gTw6pbrTwRgU2c+y740zhn5g0u4nk=";
   };
 
   cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk=";
diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index a213b228531a..e6cb1c93dea2 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-oTTVVQkSkON5NTgO5+eUD2wVpiW5MvW3MZyeyqqc3qk=";
+    hash = "sha256-311CPeMEU/7yEXgdnW3woEaz0+35hP+lhy/Giek3ZBE=";
   };
 
-  cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo=";
+  cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 95f1be48c2fc..945e3df455f2 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-reader/package.nix b/pkgs/by-name/co/cosmic-reader/package.nix
index 02f84e4ea9a1..f865177284e3 100644
--- a/pkgs/by-name/co/cosmic-reader/package.nix
+++ b/pkgs/by-name/co/cosmic-reader/package.nix
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-reader";
-  version = "0-unstable-2025-10-09";
+  version = "0-unstable-2025-10-12";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-reader";
-    rev = "8d02b136b0b558de09a2de0c99511a8bf0bb99cd";
-    hash = "sha256-ldmrn2R6gZ+heXARqsMShWCDazH8MGA9Rm2M65T1aqI=";
+    rev = "35bf8c556bbff415e1149d7cbf267d2b6ff6f300";
+    hash = "sha256-721Y1VbBPWMXcH8rt5AyO2GFV1Q70kHnG4TAPmeX414=";
   };
 
   cargoHash = "sha256-4ofAtZN3FpYwNahinldALbdEJA5lDwa+CUsVIISnSTc=";
diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index 19e6b35a9007..f2ba977290ab 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-screenshot";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-TKR8EDXZwKKC1WSZhlcf5U6tiM4cWCdb24U74vVKTaU=";
+    hash = "sha256-LaKopOd7HuDvXfE9zudoudCxGYfMkpru/PISzIrEARo=";
   };
 
   cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index b097d249adbc..f58f710397b1 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -6,20 +6,19 @@
   just,
   dbus,
   stdenv,
-  xdg-desktop-portal-cosmic,
   nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-P3xXYd80P+DR1vVE0zZC+v4ARsGhRrG9N9LdP2BEfDA=";
+    hash = "sha256-ZmZxah5mRY14LeUTGBTljlUP7MaGxwguiwTzL1rhMHY=";
   };
 
   cargoHash = "sha256-bo46A7hS1U0cOsa/T4oMTKUTjxVCaGuFdN2qCjVHxhg=";
@@ -49,10 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  env = {
-    XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic";
-    ORCA = "orca"; # get orca from $PATH
-  };
+  env.ORCA = "orca"; # get orca from $PATH
 
   passthru = {
     providedSessions = [ "cosmic" ];
diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 8e3e29e75f6c..5f3bfed3ea63 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-tHG/VoaP1tcns6AyedkkVUpWFlcOclWijsHYQ3vOIjs=";
+    hash = "sha256-WLZJx8FwseCD7hHU60+HekNBxUE6B/6HRhP8oqokTNI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 31c4217cca33..5d6644c21bfe 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Yn5CSp/vsLMbkcQ7mCDw/ErgkSCyEvkwNvWqupVUkZ4=";
+    hash = "sha256-iCwuURekZe9iPQVfHf4fPE31dGDEe25di2oFRhLLu6g=";
   };
 
-  cargoHash = "sha256-dHyUTV5txSLWEDE7Blplz8CBvyuUmYNNr1kbifujHKk=";
+  cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 234b522ceb37..9a3962a50d1a 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-KlXFFoUEa0YTQDEJHMrbWOIEsSnXvJNzzaEFYR83t9s=";
+    hash = "sha256-6qGfBgbmQVhX0nXH+HhA67MeFpTXQ9zlcdlZh0suF50=";
   };
 
-  cargoHash = "sha256-xdNYQB/zmndnMAkstwJ6Z2uk0fXli3gIYHchUq/3u6k=";
+  cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index cbd95303c28d..9aecf681cb2f 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-1kQuPMaLXq+V1fTplXKoXAVOtyuD4Sh8diljHgTDbdI=";
+    hash = "sha256-qlU/XSfzAj4Y20wEzsJnzko4lMh/mw4qMKeBe5autZA=";
   };
 
-  cargoHash = "sha256-mpuVSHb9YcDZB+eyyD+5ZNzUeEgx8T25IFjsD/Q/quU=";
+  cargoHash = "sha256-tuZHCYfHp/jN/zn8SBLhBRBWJkuIGhndFLskFqQ+CJs=";
 
   nativeBuildInputs = [
     just
diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 888b41c96a9b..2473a9823ea3 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index c2831c0b3a93..63840bde8bc5 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-workspaces-epoch";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gcS8Q9SR7Dj1FH2Dtdd6jUMX8u5kHJBMvlgqJGw+rjA=";
+    hash = "sha256-WHMOA7fNPIAwaQmzqyo+XlBYl+13cz0LrRpT0GUa8Vs=";
   };
 
   cargoHash = "sha256-BE6s2dmbgXlFXrtd8b9k2LltLnegLzWbIUlaEQvv+5o=";
diff --git a/pkgs/by-name/co/cotton/package.nix b/pkgs/by-name/co/cotton/package.nix
deleted file mode 100644
index 1d0de589da87..000000000000
--- a/pkgs/by-name/co/cotton/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "cotton";
-  version = "0-unstable-2023-09-13";
-
-  src = fetchFromGitHub {
-    owner = "danielhuang";
-    repo = "cotton";
-    rev = "df9d79a4b0bc4b140e87ddd7795924a93775a864";
-    sha256 = "sha256-ZMQaVMH8cuOb4PQ19g0pAFAMwP8bR60+eWFhiXk1bYE=";
-  };
-
-  cargoHash = "sha256-y162tjxPGZQiYBJxFk4QN9ZqSH8jrqa5Y961Sx2zrRs=";
-
-  meta = with lib; {
-    description = "Package manager for JavaScript projects";
-    mainProgram = "cotton";
-    homepage = "https://github.com/danielhuang/cotton";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      dit7ya
-      figsoda
-    ];
-  };
-}
diff --git a/pkgs/by-name/cp/cpp-hocon/package.nix b/pkgs/by-name/cp/cpp-hocon/package.nix
index 7d6a65aa61c9..dcaab234db10 100644
--- a/pkgs/by-name/cp/cpp-hocon/package.nix
+++ b/pkgs/by-name/cp/cpp-hocon/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt
+
+    # CMake 3.2.2 is deprecated and no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2.2)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
index 322f911d3026..736481da41b9 100644
--- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
+++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
@@ -43,5 +43,7 @@ stdenv.mkDerivation {
       "x86_64-linux"
       "x86_64-darwin"
     ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/cp/cpp-netlib/package.nix b/pkgs/by-name/cp/cpp-netlib/package.nix
index faab71f0e3f3..f7c126fcc1b9 100644
--- a/pkgs/by-name/cp/cpp-netlib/package.nix
+++ b/pkgs/by-name/cp/cpp-netlib/package.nix
@@ -28,6 +28,14 @@ stdenvForCppNetlib.mkDerivation rec {
     ./0001-Compatibility-with-boost-1.83.patch
   ];
 
+  # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     # io_service.hpp has been removed in boost 1.87+
diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix
index 0d99b8069179..88b099eb0f0e 100644
--- a/pkgs/by-name/cp/cpp-redis/package.nix
+++ b/pkgs/by-name/cp/cpp-redis/package.nix
@@ -27,6 +27,14 @@ stdenv.mkDerivation rec {
     ./01-fix-sleep_for.patch
   ];
 
+  # CMake 2.8.7 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt tacopie/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.7)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform";
     homepage = "https://github.com/cpp-redis/cpp_redis";
diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix
index 92aaba102610..99fe58138ad9 100644
--- a/pkgs/by-name/cp/cpp-utilities/package.nix
+++ b/pkgs/by-name/cp/cpp-utilities/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpp-utilities";
-  version = "5.31.0";
+  version = "5.31.1";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "cpp-utilities";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-UjF1b1LCPwrUzqVZNbtX+5eFAzc6NgLyBzTcNHNlkvs=";
+    sha256 = "sha256-HpzcGHDudVFmkVfkn5YpAATKfZ3FpIKXfqhpjpehK1M=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/cp/cppcodec/package.nix b/pkgs/by-name/cp/cppcodec/package.nix
index 0f08e3ee636d..e8f9910398c5 100644
--- a/pkgs/by-name/cp/cppcodec/package.nix
+++ b/pkgs/by-name/cp/cppcodec/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,6 +17,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw=";
   };
 
+  patches = [
+    # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    # Luckily, this has been fixed on master.
+    (fetchpatch {
+      name = "modernize-cmake.patch";
+      url = "https://github.com/tplgy/cppcodec/commit/8019b8b580f8573c33c50372baec7039dfe5a8ce.patch";
+      hash = "sha256-0MCx3nTsey4Qonx+lyexbcxut0qIHOJZbkJ9u23Zuv8=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/cp/cppe/cmake-minimum-required.patch b/pkgs/by-name/cp/cppe/cmake-minimum-required.patch
new file mode 100644
index 000000000000..caf44cfd2d6c
--- /dev/null
+++ b/pkgs/by-name/cp/cppe/cmake-minimum-required.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d5d359..ba8992c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-cmake_minimum_required(VERSION 3.0.0)
+-cmake_policy(VERSION 3.0.0)
++cmake_minimum_required(VERSION 3.10)
++cmake_policy(VERSION 3.10)
+ 
+ project(cppe LANGUAGES CXX)
+ 
+diff --git a/cppe/CMakeLists.txt b/cppe/CMakeLists.txt
+index 6780f18..17ac4b9 100644
+--- a/cppe/CMakeLists.txt
++++ b/cppe/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0.0)
++cmake_minimum_required(VERSION 3.10)
+ project(cppe-core VERSION 0.3.1 LANGUAGES CXX)
+ 
+ include(GNUInstallDirs)
diff --git a/pkgs/by-name/cp/cppe/package.nix b/pkgs/by-name/cp/cppe/package.nix
index ff4757daab1a..7848b889b615 100644
--- a/pkgs/by-name/cp/cppe/package.nix
+++ b/pkgs/by-name/cp/cppe/package.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw=";
   };
 
+  patches = [
+    ./cmake-minimum-required.patch
+  ];
+
   nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix
index e3c7c5df79a4..d6afdd378943 100644
--- a/pkgs/by-name/cp/cpufetch/package.nix
+++ b/pkgs/by-name/cp/cpufetch/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpufetch";
-  version = "1.06";
+  version = "1.07";
 
   src = fetchFromGitHub {
     owner = "Dr-Noob";
     repo = "cpufetch";
     rev = "v${version}";
-    sha256 = "sha256-sE3i2rw8W362BExFEImjw/t17qX8D4/0Ty8jG63bjbk=";
+    sha256 = "sha256-qmT7WBWKtSWGIK/dEd3/bF1bBjqSjfkP99htfnlFLCw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index 2859ea5557ec..65424033c77d 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2025-07-24";
+  version = "0-unstable-2025-09-05";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "33ed0be77d7767d0e2010e2c3cf972ef36c7c307";
-    hash = "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU=";
+    rev = "877328f188a3c7d1fa855871a278eb48d530c4c0";
+    hash = "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix
index dd7fe1b8c09a..de5433a94109 100644
--- a/pkgs/by-name/cr/crabz/package.nix
+++ b/pkgs/by-name/cr/crabz/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       unlicense # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "crabz";
   };
 }
diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix
index 77158519c689..8119c0d7f7fd 100644
--- a/pkgs/by-name/cr/cratedb/package.nix
+++ b/pkgs/by-name/cr/cratedb/package.nix
@@ -4,13 +4,13 @@
   maven,
   fetchFromGitHub,
   replaceVars,
-  openjdk23,
+  openjdk25,
   libarchive,
   makeWrapper,
 }:
 let
   # Wants at least Java 22
-  jdk = openjdk23;
+  jdk = openjdk25;
   version = "5.9.6";
 in
 maven.buildMavenPackage {
diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix
index c920b271c568..c297cebaf644 100644
--- a/pkgs/by-name/cr/crates-lsp/package.nix
+++ b/pkgs/by-name/cr/crates-lsp/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "crates-lsp";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "MathiasPius";
     repo = "crates-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-s42nWQC2tD7vhQNPdTQNRokwXqeBhELidVYTlos+No0=";
+    hash = "sha256-HzoOsizeV2LOXXc8BKA7u5mwBJbWNaBZvPepAaVeTCQ=";
   };
 
-  cargoHash = "sha256-XqUWcbaOZXRWzIvL9Kbo6Unl0rmeGxHO4+674uHukAs=";
+  cargoHash = "sha256-tQBNCTqvVNYqT5ArQE7ji0MeDWxi7Bcd9AxPP3sHvX4=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/games/crawl/default.nix b/pkgs/by-name/cr/crawl/package.nix
similarity index 100%
rename from pkgs/games/crawl/default.nix
rename to pkgs/by-name/cr/crawl/package.nix
diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix
index b1df12bffedc..2e34363cd4f7 100644
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "crawley";
-  version = "1.7.13";
+  version = "1.7.15";
 
   src = fetchFromGitHub {
     owner = "s0rg";
     repo = "crawley";
     rev = "v${version}";
-    hash = "sha256-36pdesO1jfCMue4Equ+qFpkjN2tXbOpQ32P9a/c+7aA=";
+    hash = "sha256-fVS7/W2M97IeVpoayqYImkgiQC5A96qklt53GDsIxfc=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-IyrySlg2zj+vqrFR821zdysVguh4UZG1bxnC+GVoLr4=";
+  vendorHash = "sha256-SaemEPcXc73G1wwxQ9/LbQV5fRd55pfd504F4PpAWVM=";
 
   ldflags = [
     "-w"
diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix
index a96c64cbe6a3..ce550d03c3f9 100644
--- a/pkgs/by-name/cr/crc/package.nix
+++ b/pkgs/by-name/cr/crc/package.nix
@@ -8,16 +8,16 @@
 }:
 
 let
-  openShiftVersion = "4.19.8";
+  openShiftVersion = "4.19.13";
   okdVersion = "4.19.0-okd-scos.15";
   microshiftVersion = "4.19.7";
   writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
-  gitCommit = "5d2dd491c18f39e1edd91b9bc6d5f12a1f0d9ba5";
-  gitHash = "sha256-7kgZUU582Zu2kpYSRdbAEfFud0gxlj/DWfmtN4sps2w=";
+  gitCommit = "6252bcd46a133d830ea8e3d76ab0b5a3abfe104d";
+  gitHash = "sha256-bVQKKIO+aFNwcZ84Ui1SuexsilAa/Ee/zuoHqOsK6+Y=";
 in
 buildGoModule (finalAttrs: {
   pname = "crc";
-  version = "2.54.0";
+  version = "2.55.1";
 
   src = fetchFromGitHub {
     owner = "crc-org";
diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
index f14c9851b715..ef663572db1d 100644
--- a/pkgs/by-name/cr/crd2pulumi/package.nix
+++ b/pkgs/by-name/cr/crd2pulumi/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "crd2pulumi";
-  version = "1.5.4";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "crd2pulumi";
     rev = "v${version}";
-    sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s=";
+    sha256 = "sha256-f18E0mUE3bT5od0JBzyAEXOHymoPtpRHeZhZnQR4Ezw=";
   };
 
-  vendorHash = "sha256-4L1KfpZ+KICPko74x3STRQFtkcNVU/5KFGhKEJ64+Jk=";
+  vendorHash = "sha256-cLp0EWF6h/xCWbqadpbgLRFmH8RKWoY6xPb/tzZoKzM=";
 
   ldflags = [
     "-s"
@@ -30,6 +30,6 @@ buildGoModule rec {
     mainProgram = "crd2pulumi";
     homepage = "https://github.com/pulumi/crd2pulumi";
     license = licenses.asl20;
-    maintainers = with maintainers; [ flokli ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix
index f81fb02fbb2b..77374ef25273 100644
--- a/pkgs/by-name/cr/createrepo_c/package.nix
+++ b/pkgs/by-name/cr/createrepo_c/package.nix
@@ -5,6 +5,7 @@
   cmake,
   pkg-config,
   bzip2,
+  doxygen,
   glib,
   curl,
   libxml2,
@@ -36,10 +37,14 @@ stdenv.mkDerivation rec {
       --replace-fail 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' "SET(BASHCOMP_DIR \"$out/share/bash-completion/completions\")"
     substituteInPlace src/python/CMakeLists.txt \
       --replace-fail "EXECUTE_PROCESS(COMMAND \''${PYTHON_EXECUTABLE} -c \"from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))\" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)" "SET(PYTHON_INSTALL_DIR \"$out/${python3.sitePackages}\")"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
     cmake
+    doxygen
     pkg-config
     rpm
     bash-completion
diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix
index 9914f4b7669c..602b2deca179 100644
--- a/pkgs/by-name/cr/credhub-cli/package.nix
+++ b/pkgs/by-name/cr/credhub-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "credhub-cli";
-  version = "2.9.50";
+  version = "2.9.51";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry-incubator";
     repo = "credhub-cli";
     rev = version;
-    sha256 = "sha256-+Y+PmnCQCCpGvThzbW6byquwFx3Pz96Je0+yWWMh3BQ=";
+    sha256 = "sha256-BFlPKkk8t6WWbDB4Z0Bsizumd0flO1GqedVSWHKlwgE=";
   };
 
   # these tests require network access that we're not going to give them
diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix
index a45dab6a1837..30b33e709a4a 100644
--- a/pkgs/by-name/cr/critcmp/package.nix
+++ b/pkgs/by-name/cr/critcmp/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit
       unlicense
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix
index b2cfb2090241..6e0741fcb36d 100644
--- a/pkgs/by-name/cr/croc/package.nix
+++ b/pkgs/by-name/cr/croc/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "croc";
-  version = "10.2.5";
+  version = "10.2.7";
 
   src = fetchFromGitHub {
     owner = "schollz";
     repo = "croc";
     rev = "v${version}";
-    hash = "sha256-6zeJfRZFpfHsNSD1dICPoOt9HQBaw2eKSX4LH7fLyEk=";
+    hash = "sha256-eIWLTWFnF7lMU2b43Txoi8yxAEmPIKl5xmK2Q5wgXeg=";
   };
 
-  vendorHash = "sha256-zMN4SxgnHwLBZ8Lqk6wj/Ne3Hx41VVhf/01DgHT8/Tk=";
+  vendorHash = "sha256-kuJrh9cK+ezxbScks0slj7f/nGHQTQpxg5I5bJ16ORk=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/cr/crocoddyl/package.nix b/pkgs/by-name/cr/crocoddyl/package.nix
index 4962baa7287b..87aa4b589409 100644
--- a/pkgs/by-name/cr/crocoddyl/package.nix
+++ b/pkgs/by-name/cr/crocoddyl/package.nix
@@ -4,27 +4,35 @@
   doxygen,
   example-robot-data,
   fetchFromGitHub,
+  fetchpatch,
   ipopt,
   lapack,
   lib,
   pinocchio,
   pkg-config,
-  pythonSupport ? false,
-  python3Packages,
   stdenv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "crocoddyl";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "loco-3d";
     repo = "crocoddyl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eUH9fMhuIUp5kuDKNo4B8iJ3JlMIqv7wX6meOpyPTJk=";
+    hash = "sha256-m7UiCa8ydjsAIhsFiShTi3/JaKgq2TCQ1XYAMyTNg1U=";
   };
 
+  patches = [
+    # ref. https://github.com/loco-3d/crocoddyl/pull/1440 merged upstream
+    (fetchpatch {
+      name = "add-missing-include.patch";
+      url = "https://github.com/loco-3d/crocoddyl/commit/6994bea7bb3ae6027f5b611ef1635768538150fd.patch";
+      hash = "sha256-XbQKRWpWm5Rk4figoA2swId4Pz2xKDpU4NFP46p8WO0=";
+    })
+  ];
+
   outputs = [
     "out"
     "doc"
@@ -36,31 +44,20 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     pkg-config
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.python
-    python3Packages.pythonImportsCheckHook
   ];
 
   propagatedBuildInputs = [
     blas
     ipopt
     lapack
-  ]
-  ++ lib.optionals (!pythonSupport) [
     example-robot-data
     pinocchio
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.example-robot-data
-    python3Packages.pinocchio
-    python3Packages.scipy
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
-    (lib.cmakeBool "BUILD_EXAMPLES" pythonSupport)
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_EXAMPLES" false)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
   ];
 
   prePatch = ''
@@ -71,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   doCheck = true;
-  pythonImportsCheck = [ "crocoddyl" ];
-  checkInputs = lib.optionals pythonSupport [ python3Packages.scipy ];
 
   meta = with lib; {
     description = "Crocoddyl optimal control library";
diff --git a/pkgs/by-name/cr/cronie/package.nix b/pkgs/by-name/cr/cronie/package.nix
index 1b58dee72120..6c727dda3ca1 100644
--- a/pkgs/by-name/cr/cronie/package.nix
+++ b/pkgs/by-name/cr/cronie/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-WrzdpE9t7vWpc8QFoFs+S/HgHwsidRNmfcHp7ltSWQw=";
   };
 
+  configureFlags = [
+    "--localstatedir=/var"
+    "--sysconfdir=/etc"
+  ];
+
   nativeBuildInputs = [ autoreconfHook ];
 
   outputs = [
@@ -36,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     mainProgram = "crond";
     maintainers = [ ];
-    platforms = lib.platforms.all;
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 4bdfd762a9ea..e4efa7ff3062 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,18 +21,18 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-11-05";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "85695a5b4fe5bea29925cbb905ff7557242a14c3";
-    hash = "sha256-zaUjpqDKvvRDY0TOc892g5ehc1o5itv1O9E+YSrve0U=";
+    rev = "cc4086ef67b347624ae2dbe3e435824e1ecedffb";
+    hash = "sha256-wo0opn5oZT0jPno1lLxBkEOullERh0GB95tQSvCBSrs=";
     fetchSubmodules = true;
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-l1uyCGyLhrP5JNABQ+3uvPRYNOl9YB3ndOcxNTDaSv0=";
+  cargoHash = "sha256-P6vFWs9lVn4EkXUVOi+3s/tptAV/J7tH5GBCQv/dwUA=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index 94a6c7cfd0fc..b0aed58f0c93 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "crowdsec";
-  version = "1.7.0";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "crowdsecurity";
     repo = "crowdsec";
     tag = "v${version}";
-    hash = "sha256-ILGvHSDONyq6O1V/xm4lanSTmkdkMAwvvhoUtM2b7Gc=";
+    hash = "sha256-f0SxOXxXqKft3Nnf9y7itpPXJOjBrEpImbPANFNx4BM=";
   };
 
-  vendorHash = "sha256-B9VZlNks7/ozay5+di++sbLwIKN98P7U+o6knVaKlqo=";
+  vendorHash = "sha256-v1UECFfgx1zFCzSyazxFRWMP/0fayVnrC+pJHio5z+Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 10165ff07454..61bf85bc841f 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -1,32 +1,24 @@
 {
   lib,
-  buildGo125Module,
+  buildGoModule,
   fetchFromGitHub,
   nix-update-script,
   writableTmpDirAsHomeHook,
   versionCheckHook,
 }:
 
-buildGo125Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "crush";
-  version = "0.9.2";
+  version = "0.13.5";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VFAGjNtXKNjkv8Ryi28oFN/uLomXXdw6NFtyjT3pMEY=";
+    hash = "sha256-MKX26HptDwlwWvmP+9FDlFJzly5xKA0mNVsbeHi1zhg=";
   };
 
-  vendorHash = "sha256-ktF3kIr143uPwiEbgafladZRqIsmG6jI2BeumGSu82U=";
-
-  # rename TestMain to prevent it from running, as it panics in the sandbox.
-  postPatch = ''
-    substituteInPlace internal/llm/provider/openai_test.go \
-      --replace-fail \
-        "func TestMain" \
-        "func DisabledTestMain"
-  '';
+  vendorHash = "sha256-OiNmZKg+NN7Aoeao8L72Dvgz0moeaZGQ7KVJdvuWagY=";
 
   ldflags = [
     "-s"
@@ -37,6 +29,7 @@ buildGo125Module (finalAttrs: {
     let
       # these tests fail in the sandbox
       skippedTests = [
+        "TestCoderAgent"
         "TestOpenAIClientStreamChoices"
         "TestGrepWithIgnoreFiles"
         "TestSearchImplementations"
diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index 51d690c54019..616ed7a5208a 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   fuse3,
   glib,
-  jdk23,
+  jdk25,
   lib,
   libayatana-appindicator,
   makeShellWrapper,
@@ -13,7 +13,7 @@
 }:
 
 let
-  jdk = jdk23.override { enableJavaFX = true; };
+  jdk = jdk25.override { enableJavaFX = true; };
 in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
diff --git a/pkgs/by-name/cr/cryptoverif/package.nix b/pkgs/by-name/cr/cryptoverif/package.nix
index e23707651298..7d86585df43d 100644
--- a/pkgs/by-name/cr/cryptoverif/package.nix
+++ b/pkgs/by-name/cr/cryptoverif/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cryptoverif";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchurl {
     url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${finalAttrs.version}.tar.gz";
-    hash = "sha256-duc7t0Qpr1Z2FZEoufdQ7kcBlLbXHO+r9ivEgUxqK9s=";
+    hash = "sha256-d3MIYb57+95bB493hdtHiGnTOronYaQo1Qqq1TcJh1c=";
   };
 
   /*
diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix
index c755886c5425..a43bc1fcf2bc 100644
--- a/pkgs/by-name/cr/crystal-dock/package.nix
+++ b/pkgs/by-name/cr/crystal-dock/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "crystal-dock";
-  version = "2.14";
+  version = "2.15";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "crystal-dock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE=";
+    hash = "sha256-XFq4T39El5MjaWRSnaimonjdj+HGOAydNmEOehgGWX4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index a5c5d6a7ea5d..12c8453819b5 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   fftwFloat,
   libsamplerate,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,6 +23,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # function is not defined in any headers but used in libcsdr.c
     echo "int errhead();" >> src/predefined.h
+
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -42,6 +47,10 @@ stdenv.mkDerivation rec {
       --replace '=''${exec_prefix}//' '=/'
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
   meta = with lib; {
     homepage = "https://github.com/jketterl/csdr";
     description = "Simple DSP library and command-line tool for Software Defined Radio";
diff --git a/pkgs/applications/audio/csound/csound-qt/default.nix b/pkgs/by-name/cs/csound-qt/package.nix
similarity index 81%
rename from pkgs/applications/audio/csound/csound-qt/default.nix
rename to pkgs/by-name/cs/csound-qt/package.nix
index 9ff6bb2de902..1ef8907eaf19 100644
--- a/pkgs/applications/audio/csound/csound-qt/default.nix
+++ b/pkgs/by-name/cs/csound-qt/package.nix
@@ -6,21 +6,18 @@
   fetchFromGitHub,
   python3,
   python-qt,
-  qmake,
-  qtwebengine,
-  qtxmlpatterns,
   rtmidi,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "csound-qt";
   version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "CsoundQt";
     repo = "CsoundQt";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ZdQwWRAr6AKLmZ/L0lSxIlvWRLoZIKinn7BAQiR+luk=";
   };
 
@@ -28,7 +25,7 @@ stdenv.mkDerivation rec {
     ./rtmidipath.patch
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     qtwebengine
     qtxmlpatterns
@@ -59,11 +56,11 @@ stdenv.mkDerivation rec {
     "PYTHON_VERSION=3.${python3.sourceVersion.minor}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CsoundQt is a frontend for Csound with editor, integrated help, widgets and other features";
     homepage = "https://csoundqt.github.io/";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ hlolli ];
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ hlolli ];
   };
-}
+})
diff --git a/pkgs/applications/audio/csound/csound-qt/rtmidipath.patch b/pkgs/by-name/cs/csound-qt/rtmidipath.patch
similarity index 100%
rename from pkgs/applications/audio/csound/csound-qt/rtmidipath.patch
rename to pkgs/by-name/cs/csound-qt/rtmidipath.patch
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/by-name/cs/csound/package.nix
similarity index 93%
rename from pkgs/applications/audio/csound/default.nix
rename to pkgs/by-name/cs/csound/package.nix
index 965ff2310bad..155fddc1ca92 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/by-name/cs/csound/package.nix
@@ -79,12 +79,12 @@ stdenv.mkDerivation {
     ln -s $out/lib/CsoundLib64.framework $out/Library/Frameworks
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Sound design, audio synthesis, and signal processing system, providing facilities for music composition and performance on all major operating systems and platforms";
     homepage = "https://csound.com/";
-    license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.marcweber ];
-    platforms = platforms.unix;
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix
index d197451b68fc..b9ebd28e30d1 100644
--- a/pkgs/by-name/cs/csv2svg/package.nix
+++ b/pkgs/by-name/cs/csv2svg/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Take a csv as input and outputs svg";
     homepage = "https://github.com/Canop/csv2svg";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "csv2svg";
   };
 }
diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix
index f937579fe02f..b6fb4eb83570 100644
--- a/pkgs/by-name/cs/csview/package.nix
+++ b/pkgs/by-name/cs/csview/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cs/csvquote/package.nix b/pkgs/by-name/cs/csvquote/package.nix
index 0342ee16641c..c2573b6e92a2 100644
--- a/pkgs/by-name/cs/csvquote/package.nix
+++ b/pkgs/by-name/cs/csvquote/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "Enables common unix utilities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines";
     homepage = "https://github.com/dbro/csvquote";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/cs/csxcad/package.nix b/pkgs/by-name/cs/csxcad/package.nix
index 5482166b4d76..7ee94a9253da 100644
--- a/pkgs/by-name/cs/csxcad/package.nix
+++ b/pkgs/by-name/cs/csxcad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   fparser,
   tinyxml,
@@ -13,18 +14,26 @@
   mpfr,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "csxcad";
   version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "CSXCAD";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-SSV5ulx3rCJg99I/oOQbqe+gOSs+BfcCo6UkWHVhnSs=";
   };
 
-  patches = [ ./searchPath.patch ];
+  patches = [
+    ./searchPath.patch
+    # ref. https://github.com/thliebig/CSXCAD/pull/62 merged upstream
+    (fetchpatch {
+      name = "update-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/CSXCAD/commit/b8ea64e11320910109a49b6da5352e1a1a18a736.patch";
+      hash = "sha256-mpQmpvrEDjOKgEAZ5laIIepG+PWqSr637tOY7FQst2s=";
+    })
+  ];
 
   buildInputs = [
     cgal
@@ -39,11 +48,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "C++ library to describe geometrical objects";
     homepage = "https://github.com/thliebig/CSXCAD";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix
index aaa3cbb13e27..f97a6e1e4658 100644
--- a/pkgs/by-name/ct/ctranslate2/package.nix
+++ b/pkgs/by-name/ct/ctranslate2/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "ctranslate2";
-  version = "4.6.0";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-EM2kunqtxo0BTIzrEomfaRsdav7sx6QEOhjDtjjSoYY=";
+    hash = "sha256-nnbBK1dIHwhq8n1mJe2wOLcDkIuScFbQwZvJ8x+knCk=";
   };
 
   # Fix CMake 4 compatibility
diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index 7f7a9f0d67e5..53f769ac092d 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -55,6 +55,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR
   '';
diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix
index ded451de75f0..ee2c8a058abf 100644
--- a/pkgs/by-name/cu/cue/package.nix
+++ b/pkgs/by-name/cu/cue/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cue";
-  version = "0.14.2";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "cue-lang";
     repo = "cue";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RK06DHCR2ugz6WhythvVfb1WUn7QyHPK8vaUNWVAd+Q=";
+    hash = "sha256-yyvIjaOElEHR75o+DgVOG1EklXaWGdjvv15iMvfbkeA=";
   };
 
-  vendorHash = "sha256-wVeNMw6AZS1wT+KnaZBGOfBxrKzmfQSXeZWcYiLKMQ4=";
+  vendorHash = "sha256-ivFw62+pg503EEpRsdGSQrFNah87RTUrRXUSPZMFLG4=";
 
   subPackages = [ "cmd/*" ];
 
diff --git a/pkgs/by-name/cu/cups-filters/package.nix b/pkgs/by-name/cu/cups-filters/package.nix
index a5468f00fecc..0abca6114c34 100644
--- a/pkgs/by-name/cu/cups-filters/package.nix
+++ b/pkgs/by-name/cu/cups-filters/package.nix
@@ -6,6 +6,7 @@
   dbus,
   dejavu_fonts,
   fetchFromGitHub,
+  fetchpatch,
   fontconfig,
   gawk,
   ghostscript,
@@ -62,6 +63,16 @@
         hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY=";
       };
 
+      patches = [
+        # Fix build with gcc15
+        # https://github.com/OpenPrinting/cups-filters/pull/618
+        (fetchpatch {
+          name = "cups-filters-fix-build-with-gcc15-c23.patch";
+          url = "https://github.com/OpenPrinting/cups-filters/commit/9871a50b5c1f9c2caa2754aac1f5db70c886021b.patch";
+          hash = "sha256-Hu3nCHzX6K4tD7T5XIt0dh6GPQxmgfuHqbBXWfdXxoA=";
+        })
+      ];
+
       strictDeps = true;
 
       nativeBuildInputs = [
diff --git a/pkgs/by-name/cu/cura-appimage/package.nix b/pkgs/by-name/cu/cura-appimage/package.nix
index 8034c1065e79..4ac69a88a9b3 100644
--- a/pkgs/by-name/cu/cura-appimage/package.nix
+++ b/pkgs/by-name/cu/cura-appimage/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cura-appimage";
-  version = "5.10.2";
+  version = "5.11.0";
 
   # Give some good names so the intermediate packages are easy
   # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-930jrjNdUE0vxuMslQNbkdm2eLAFBSsVFxlTi56a8Xg=";
+    hash = "sha256-us375gxVrGqGem2Et2VNRm6T389JxzPm1TScerlia9k=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
index 2eb2ae9dc09e..06807d44aba7 100644
--- a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
+++ b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
@@ -175,9 +175,7 @@ stdenv.mkDerivation rec {
 
     # Find the correct boringssl source file
     boringssl-source = builtins.head (
-      lib.mapAttrsToList (_: file: file) (
-        lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps
-      )
+      lib.attrValues (lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps)
     );
     boringssl-go-modules =
       (buildGoModule {
diff --git a/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch b/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch
new file mode 100644
index 000000000000..50e202684b8c
--- /dev/null
+++ b/pkgs/by-name/cu/curlMinimal/fix-h2-paused-transfers.patch
@@ -0,0 +1,27 @@
+From 7e91f24c73256af59ac9061c41b73a184c4690aa Mon Sep 17 00:00:00 2001
+From: Stefan Eissing <stefan@eissing.org>
+Date: Mon, 3 Nov 2025 15:07:57 +0100
+Subject: [PATCH] cw-out: fix EAGAIN handling on pause
+
+The interim CURLE_AGAIN result was not always converted to a
+CURLE_OK and then caused write callers to report a failure.
+
+Fixes #19334
+Reported-by: pennae on github
+Closes #19338
+---
+ lib/cw-out.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/cw-out.c b/lib/cw-out.c
+index 1f4031649267..9c0a36e7e5e2 100644
+--- a/lib/cw-out.c
++++ b/lib/cw-out.c
+@@ -302,6 +302,7 @@ static CURLcode cw_out_buf_flush(struct cw_out_ctx *ctx,
+                               &consumed);
+     if(result && (result != CURLE_AGAIN))
+       return result;
++    result = CURLE_OK;
+ 
+     if(consumed) {
+       if(consumed == curlx_dyn_len(&cwbuf->b)) {
diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix
index 2ce9522d6f4d..244454016e47 100644
--- a/pkgs/by-name/cu/curlMinimal/package.nix
+++ b/pkgs/by-name/cu/curlMinimal/package.nix
@@ -98,6 +98,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-QMjN28tsxiUcA96kI6Ryps6kA3vmVLpc9d7G6y0i/x0=";
   };
 
+  patches = [
+    # Bug introduced in curl@fa915b (8.16.0) https://github.com/curl/curl/issues/19334 Paused
+    # HTTP/2 transfers will return the wrong errors and trash the whole
+    # transfer. Remove this patch once curl is updated to 8.17.0 which will be
+    # released on the 5th November 2025.
+    ./fix-h2-paused-transfers.patch
+  ];
+
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
   # necessary for FreeBSD code path in configure
   postPatch = ''
diff --git a/pkgs/by-name/cu/curlpp/package.nix b/pkgs/by-name/cu/curlpp/package.nix
index eb2c8f8f95e6..27dd36fc091b 100644
--- a/pkgs/by-name/cu/curlpp/package.nix
+++ b/pkgs/by-name/cu/curlpp/package.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     description = "C++ wrapper around libcURL";
     mainProgram = "curlpp-config";
     license = licenses.mit;
-    maintainers = with maintainers; [ CrazedProgrammer ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 9ce40695c797..bdb8015ce19e 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-tqppTOkeChlyw3IjSkhGpNvMX9U5s2hiu13/RWakENg=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-mZ0T7rrKzwvaNUbrHBy3XO04vZSO6RQ4RmJmrdfaoJA=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-Gf/2wLS2+xQ6Mu4u96n4hI1I4L2iIG16R668BQCNZaw=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-bchHYPQ0O/0YWiPdj3wnq43p/fKFoP4KXpeSVWpLYpE=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-/qznJxLpyUBH4L6zJSDB5mVFVk2Y7UJCt2Uw5g7U6AQ=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-PWx5QAs84gWNOHYZL20uFnW+m4rApRT6g4LtabjL+lw=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-drbaPM4ho5/1vmQWMgBelmqR7Np45w/XR0ZsfR53vZI=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-VW76Lx2VKspiGkphp74ib4+F5FCdu8793f+xvD67OpM=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2025-10-02";
+  version = "0-unstable-2025-10-28";
 
   src = sources.${hostPlatform.system};
 
diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 2859522af3d2..2fd270b06787 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -70,6 +70,11 @@ stdenv.mkDerivation {
     runHook postInstallCheck
   '';
 
+  postPatch = ''
+    substituteInPlace extern/googletest/googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = with lib; {
diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/by-name/cu/cutecom/package.nix
similarity index 68%
rename from pkgs/tools/misc/cutecom/default.nix
rename to pkgs/by-name/cu/cutecom/package.nix
index 2ef00647be52..969ab97b2451 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/by-name/cu/cutecom/package.nix
@@ -2,20 +2,19 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  qtserialport,
+  qt6,
   cmake,
-  wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cutecom";
-  version = "0.51.0+patch";
+  version = "0.60.0-RC1";
 
   src = fetchFromGitLab {
     owner = "cutecom";
     repo = "cutecom";
-    rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca";
-    sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-Co0bUW7klSPf1VfBt7oT2DlQmf6CLELS0oapIyjpx8w=";
   };
 
   postPatch = ''
@@ -23,10 +22,11 @@ stdenv.mkDerivation {
       --replace "/Applications" "$out/Applications"
   '';
 
-  buildInputs = [ qtserialport ];
+  buildInputs = [ qt6.qtserialport ];
+
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   postInstall =
@@ -43,12 +43,12 @@ stdenv.mkDerivation {
         cp cutecom.1 "$out/share/man/man1"
       '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical serial terminal";
     homepage = "https://gitlab.com/cutecom/cutecom/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ bennofs ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ bennofs ];
+    platforms = lib.platforms.unix;
     mainProgram = "cutecom";
   };
-}
+})
diff --git a/pkgs/by-name/cv/cvc5/package.nix b/pkgs/by-name/cv/cvc5/package.nix
index 295c7891407d..d6450d7086c6 100644
--- a/pkgs/by-name/cv/cvc5/package.nix
+++ b/pkgs/by-name/cv/cvc5/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cvc5";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "cvc5";
     repo = "cvc5";
-    rev = "cvc5-${version}";
-    hash = "sha256-w8rIGPG9BTEPV9HG2U40A4DYYnC6HaWbzqDKCRhaT00=";
+    tag = "cvc5-${version}";
+    hash = "sha256-nxJjrpWZfYPuuKN4CWxOHEuou4r+MdK0AjdEPZHZbHI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix
index df62af94dcd7..847d3484f7cf 100644
--- a/pkgs/by-name/cw/cwltool/package.nix
+++ b/pkgs/by-name/cw/cwltool/package.nix
@@ -1,62 +1,39 @@
 {
   lib,
   fetchFromGitHub,
-  git,
   nodejs,
-  python3,
+  python3Packages,
 }:
 
-let
-  py = python3.override {
-    packageOverrides = final: prev: {
-      # Requires "pydot >= 1.4.1, <3",
-      pydot = prev.pydot.overridePythonAttrs (old: rec {
-        version = "2.0.0";
-        src = old.src.override {
-          inherit version;
-          hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU=";
-        };
-        doCheck = false;
-      });
-    };
-  };
-in
-with py.pkgs;
-
-py.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cwltool";
-  version = "3.1.20250110105449";
+  version = "3.1.20250925164626";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwltool";
     tag = version;
-    hash = "sha256-V0CQiNkIw81s6e9224qcfbsOqBvMo34q+lRURpRetKs=";
+    hash = "sha256-esY/p7wm0HvLiX+jZENBye4NblYveYAXevYRQxk+u44=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-fail "prov == 1.5.1" "prov" \
-      --replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \
       --replace-fail "PYTEST_RUNNER + " ""
     substituteInPlace pyproject.toml \
-      --replace-fail "mypy==1.14.1" "mypy"
+      --replace-fail "mypy==1.18.2" "mypy"
   '';
 
-  build-system = with py.pkgs; [
+  build-system = with python3Packages; [
     setuptools
     setuptools-scm
   ];
 
-  nativeBuildInputs = [ git ];
-
-  dependencies = with py.pkgs; [
+  dependencies = with python3Packages; [
     argcomplete
     bagit
     coloredlogs
     cwl-utils
-    mypy
     mypy-extensions
     prov
     psutil
@@ -74,7 +51,7 @@ py.pkgs.buildPythonApplication rec {
     typing-extensions
   ];
 
-  nativeCheckInputs = with py.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     mock
     nodejs
     pytest-mock
@@ -83,6 +60,8 @@ py.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  pythonRelaxDeps = [ "prov" ];
+
   disabledTests = [
     "test_content_types"
     "test_env_filtering"
diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix
index 56ec33b81e40..b4adced87422 100644
--- a/pkgs/by-name/cw/cwtch-ui/package.nix
+++ b/pkgs/by-name/cw/cwtch-ui/package.nix
@@ -12,12 +12,12 @@ let
 in
 flutter329.buildFlutterApplication rec {
   pname = "cwtch-ui";
-  version = "1.16.0";
+  version = "1.16.1";
   # This Gitea instance has archive downloads disabled, so: fetchgit
   src = fetchgit {
     url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui";
     rev = "v${version}";
-    hash = "sha256-887BiDqu35kocQmren9/rRhLdMNEXPmzsQFAixUvTxo=";
+    hash = "sha256-VKR02cRcjEapiIo+bQqeJOenmv0Rmzg6qfkI1LtWF10=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.json;
diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix
index 327994945850..7e3714a12476 100644
--- a/pkgs/by-name/cy/cyan/package.nix
+++ b/pkgs/by-name/cy/cyan/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   qt5,
   cmake,
   pkg-config,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94=";
   };
 
+  patches = [
+    # cmake-4 build fix:
+    #   https://github.com/rodlie/cyan/pull/123
+    (fetchpatch2 {
+      name = "cmake-4.patch";
+      url = "https://github.com/rodlie/cyan/commit/885e81310de8df7f32a5e1d2c722f89bcd969cd1.patch?full_index=1";
+      hash = "sha256-5VhXKamDNGeEvi86l+R3Lvzb4G5JFBq2dqqd6TdyxZ4=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix
index d8d714846df9..0c7041c6f0b0 100644
--- a/pkgs/by-name/cy/cyclonedx-python/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-python/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "cyclonedx-python";
-  version = "7.1.0";
+  version = "7.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python";
     tag = "v${version}";
-    hash = "sha256-RHw+FYj1oYM5Yf8YcU8tOsxG+3qu0ti/AYzcGxYAp/8=";
+    hash = "sha256-JhPrVNzuoUTOmFBaPiq+UuUBRCHG2mqz8z1/24OcZAI=";
   };
 
   build-system = with python3Packages; [ poetry-core ];
diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix
index e97ab969eec9..ed6d28d92875 100644
--- a/pkgs/by-name/cy/cyme/package.nix
+++ b/pkgs/by-name/cy/cyme/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cyme";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchFromGitHub {
     owner = "tuna-f1sh";
     repo = "cyme";
     rev = "v${version}";
-    hash = "sha256-OXwph3dV6gUAanlwzEL0CRjSOfqEvYDXdhs60MkMfcE=";
+    hash = "sha256-StvkMo9HZzAx3T+dnRQBUZJOC3EOj+ItqO13vW+F/SU=";
   };
 
-  cargoHash = "sha256-THNcrBD5GBorVsuFZ/XN91c1Zlc5NAbTnjWf7/td74o=";
+  cargoHash = "sha256-roLuOVkBSDZ+2bHEcA53CcdtE82EO4/anCvlVHeTC0s=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/cy/cytoscape/package.nix b/pkgs/by-name/cy/cytoscape/package.nix
index 42b13f74000f..b255b3b03dbe 100644
--- a/pkgs/by-name/cy/cytoscape/package.nix
+++ b/pkgs/by-name/cy/cytoscape/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cytoscape";
-  version = "3.10.3";
+  version = "3.10.4";
 
   src = fetchurl {
     url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
-    sha256 = "sha256-62i3F6uGNoC8z55iUIYQDAimWcQocsZ52USdpruZRLQ=";
+    sha256 = "sha256-gHCU97AfBzo4r+F+Fc5lHd+kQtj/NsoCNipAhv5O7sE=";
   };
 
   patches = [
diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix
index d70e0a7b9de2..46d7cf14ef24 100644
--- a/pkgs/by-name/d-/d-seams/package.nix
+++ b/pkgs/by-name/d-/d-seams/package.nix
@@ -35,6 +35,10 @@ clangStdenv.mkDerivation rec {
       hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw=";
     })
   ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
   nativeBuildInputs = [
     cmake
     lua
diff --git a/pkgs/by-name/d-/d-spy/package.nix b/pkgs/by-name/d-/d-spy/package.nix
index 36ecd9d1a4d4..449742760ca2 100644
--- a/pkgs/by-name/d-/d-spy/package.nix
+++ b/pkgs/by-name/d-/d-spy/package.nix
@@ -7,6 +7,7 @@
   gettext,
   gtk4,
   libadwaita,
+  libdex,
   meson,
   ninja,
   pkg-config,
@@ -16,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "d-spy";
-  version = "48.0";
+  version = "49.1";
 
   outputs = [
     "out"
@@ -25,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/d-spy/${lib.versions.major finalAttrs.version}/d-spy-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D3oJAZBGGU2X/Dw0KzhOocOA4Qqc/IAlv83lfVlcODA=";
+    hash = "sha256-4m4YEg5k1FG2HyAs+qORNienAxwqlUrs85HIPYPQnYo=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk4
     libadwaita
+    libdex
   ];
 
   passthru = {
diff --git a/pkgs/by-name/da/dabtools/package.nix b/pkgs/by-name/da/dabtools/package.nix
index 176909ca5431..ce554e4b7300 100644
--- a/pkgs/by-name/da/dabtools/package.nix
+++ b/pkgs/by-name/da/dabtools/package.nix
@@ -30,6 +30,13 @@ stdenv.mkDerivation {
     libusb1
   ];
 
+  #  CMake 4 is no longer retro compatible with versions < 3.5
+  postPatch = ''
+    substituteInPlace CMakeLists.txt src/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.5)"
+  '';
+
   meta = with lib; {
     description = "Commandline tools for DAB and DAB+ digital radio broadcasts";
     homepage = "https://github.com/Opendigitalradio/dabtools";
diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix
index f5d69221eba4..7616a26a52da 100644
--- a/pkgs/by-name/da/dapr-cli/package.nix
+++ b/pkgs/by-name/da/dapr-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "dapr-cli";
-  version = "1.16.1";
+  version = "1.16.3";
 
   src = fetchFromGitHub {
     owner = "dapr";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-Z8Fuisx2hK6QAJ5NDh0f11t/hoHhbD2+/mZMsUFxPaQ=";
+    hash = "sha256-lDrVhY5dlaQe23WncUFpqsP7UuDgRPmMWrOlJezma/Y=";
   };
 
-  vendorHash = "sha256-qEbuu4+pQ6g3m1FtisYc26lG/4zY/boQM8d6qA5c1eo=";
+  vendorHash = "sha256-UzZJ9mgMvewahYjhTOBC/HgIaxk312a7iqbS4D5O2VU=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix
index b82f8e266ab2..bf9e1f77ef5f 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.23";
+  version = "0.5.24";
 
   src = fetchFromGitHub {
     owner = "Bali10050";
     repo = "Darkly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BENROvRjnKLjCc1qwGgScfk6WIdHGwz4vZhsmfa///Q=";
+    hash = "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index c925ed3be313..5f1408dd8477 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.93.2";
+  version = "1.93.3";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-YE4s0um3WR6N0KsXgLjvoiqjr8dQg8WOyZRbfoZlbqE=";
+    hash = "sha256-I51wpm2HmeuXk0F9O1uTvFA5Hk8sAs+JsumW+N3EPXA=";
   };
 
   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 30e98a706e5a..c880ab758599 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "85.0.0"
+      "version": "91.0.0"
     },
     "analyzer": {
       "dependency": "direct dev",
       "description": {
         "name": "analyzer",
-        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
+        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.1"
+      "version": "8.4.1"
     },
     "archive": {
       "dependency": "direct dev",
@@ -154,11 +154,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.0.7"
     },
     "csslib": {
       "dependency": "transitive",
@@ -184,21 +184,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "dartdoc": {
       "dependency": "direct dev",
       "description": {
         "name": "dartdoc",
-        "sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be",
+        "sha256": "73335ae67d2766ff753dc78b0f33ceb399ba5b94a5cfe8ce8d4128fb631717ee",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.4"
+      "version": "9.0.0"
     },
     "ffi": {
       "dependency": "transitive",
@@ -434,11 +434,11 @@
       "dependency": "transitive",
       "description": {
         "name": "oauth2",
-        "sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4",
+        "sha256": "890a032ba1b44fa8dcfeba500e613df0ecbe16aeace13bb0fe1d25eb42cda5b8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.5"
     },
     "package_config": {
       "dependency": "direct main",
@@ -484,21 +484,21 @@
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e",
+        "sha256": "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "5.1.0"
     },
     "protoc_plugin": {
       "dependency": "direct dev",
       "description": {
         "name": "protoc_plugin",
-        "sha256": "5bf4289e0fa9eec4b0ee4e77111fa47fa2e6b54b2a7b9c2e83ec87a971542f01",
+        "sha256": "c3893590d5b81345dfd4daa25c1890092667983fd4374bb6671b2a9a481d8359",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "22.5.0"
+      "version": "23.0.0"
     },
     "pub_api_client": {
       "dependency": "direct dev",
@@ -744,11 +744,11 @@
       "dependency": "direct main",
       "description": {
         "name": "watcher",
-        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
@@ -812,6 +812,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0"
+    "dart": ">=3.9.0 <4.0.0"
   }
 }
diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix
index 6c21d4edeff1..c922ed45d97f 100644
--- a/pkgs/by-name/da/dash/package.nix
+++ b/pkgs/by-name/da/dash/package.nix
@@ -7,15 +7,19 @@
   libedit,
   runCommand,
   dash,
+
+  # Reverse dependency smoke tests
+  tests,
+  patchRcPathPosix,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dash";
-  version = "0.5.12";
+  version = "0.5.13.1";
 
   src = fetchurl {
     url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz";
-    hash = "sha256-akdKxG6LCzKRbExg32lMggWNMpfYs4W3RQgDDKSo8oo=";
+    hash = "sha256-2ScbzgnBJ9mGbiXAEVgt3HWrmIlYoEvE2FU6O48w43A=";
   };
 
   strictDeps = true;
@@ -43,6 +47,19 @@ stdenv.mkDerivation (finalAttrs: {
         [ -s $out/success ]
         grep -q "Hello World" $out/success
       '';
+
+      /**
+        Reverse dependency smoke tests. Build success of `dash.tests` informs
+        whether an update makes it into staging.
+      */
+      reverseDependencies = lib.recurseIntoAttrs {
+        writers = lib.recurseIntoAttrs {
+          simple = tests.writers.simple.dash;
+          bin = tests.writers.bin.dash;
+        };
+        # Not sure if effective smoke test, but cheap
+        patch-rc-path-posix = patchRcPathPosix.tests.test-posix;
+      };
     };
   };
 
diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index 44dd61e2a17e..12b14072c299 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "datafusion-cli";
-  version = "50.1.0";
+  version = "50.3.0";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     tag = finalAttrs.version;
-    hash = "sha256-SYvdz/rGs8bZHKuM5ws2c+pSdYx7mVfQ69dliCDp8ec=";
+    hash = "sha256-Zv3XW1BbqOHrhnPa47YoS67v/INJBgXyitvU6/wQVSM=";
   };
 
-  cargoHash = "sha256-WHmNbmP8rqP0W+5PvV9Qi5szdWIwLsZuNqDVnV6JL9o=";
+  cargoHash = "sha256-VjDcqoI5KKIGqXMhvxkWan6jP1/0H/fkbl78C2WPhQI=";
 
   buildAndTestSubdir = "datafusion-cli";
 
diff --git a/pkgs/by-name/da/dav1d/package.nix b/pkgs/by-name/da/dav1d/package.nix
index 23d72c245d00..443ad79790c5 100644
--- a/pkgs/by-name/da/dav1d/package.nix
+++ b/pkgs/by-name/da/dav1d/package.nix
@@ -27,13 +27,13 @@ assert useVulkan -> withExamples;
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "videolan";
     repo = "dav1d";
     rev = version;
-    hash = "sha256-qcs9QoZ/uWEQ8l1ChZ8nYctZnnWJ0VvCw1q2rEktC9g=";
+    hash = "sha256-rxRO5EWjrOUsCYXd2rDDhfcEZbfSuMfjujRAHTqUYhI=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix
index fd90be690af0..2742fbc51974 100644
--- a/pkgs/by-name/da/davinci-resolve/package.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -5,13 +5,12 @@
   curl,
   runCommandLocal,
   unzip,
-  appimage-run,
+  appimageTools,
   addDriverRunpath,
   dbus,
   libGLU,
   xorg,
   buildFHSEnv,
-  buildFHSEnvChroot,
   bash,
   writeText,
   ocl-icd,
@@ -35,10 +34,10 @@ let
   davinci = (
     stdenv.mkDerivation rec {
       pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "20.2.1";
+      version = "20.2.2";
 
       nativeBuildInputs = [
-        (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
+        appimageTools.appimage-exec
         addDriverRunpath
         copyDesktopItems
         unzip
@@ -57,9 +56,9 @@ let
             outputHashAlgo = "sha256";
             outputHash =
               if studioVariant then
-                "sha256-emAVfA9mclwJSiT9oVvLVhCy2GXGQVsvg4pj3vodxk8="
+                "sha256-4TpB0kFQpWLkfLFo5txe4km/TjxJ+ajYnJ28UdQvncA="
               else
-                "sha256-/OQhi4y07TOyeIdD18URBr4qAfuPhd2mr0giqgTEfk0=";
+                "sha256-A70WknvKE35AI+U0drSTFpM5T7gJVf2EYtWdxaxbbA0=";
 
             impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 
@@ -148,7 +147,7 @@ let
 
           mkdir -p $out
           test -e ${lib.escapeShellArg appimageName}
-          appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out
+          appimage-exec.sh -x $out ${lib.escapeShellArg appimageName}
 
           mkdir -p $out/{"Apple Immersive/Calibration",configs,DolbyVision,easyDCP,Extras,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT}
           runHook postInstall
diff --git a/pkgs/by-name/da/davix/package.nix b/pkgs/by-name/da/davix/package.nix
index 5bdecbd6dff3..628c1d5b4cb6 100644
--- a/pkgs/by-name/da/davix/package.nix
+++ b/pkgs/by-name/da/davix/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchpatch,
+  fetchFromGitHub,
   cmake,
   pkg-config,
   openssl,
   libxml2,
-  boost,
   python3,
   libuuid,
   curl,
@@ -27,7 +27,7 @@ let
   boolToUpper = b: lib.toUpper (lib.boolToString b);
 in
 stdenv.mkDerivation rec {
-  version = "0.8.7";
+  version = "0.8.10";
   pname = "davix" + lib.optionalString enableThirdPartyCopy "-copy";
   nativeBuildInputs = [
     cmake
@@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
     python3
   ];
   buildInputs = [
-    boost
     curl
     libxml2
     openssl
@@ -44,14 +43,11 @@ stdenv.mkDerivation rec {
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) libuuid
   ++ lib.optional enableThirdPartyCopy gsoap;
 
-  # using the url below since the github release page states
-  # "please ignore the GitHub-generated tarballs, as they are incomplete"
-  # https://github.com/cern-fts/davix/releases/tag/R_0_8_0
-  src = fetchurl {
-    url = "https://github.com/cern-fts/davix/releases/download/R_${
-      lib.replaceStrings [ "." ] [ "_" ] version
-    }/davix-${version}.tar.gz";
-    sha256 = "sha256-eMJOFO3X5OVgOS1nFH7IZYwqoNNkBBW99rxROvz2leY=";
+  src = fetchFromGitHub {
+    owner = "cern-fts";
+    repo = "davix";
+    rev = "refs/tags/R_${lib.replaceStrings [ "." ] [ "_" ] version}";
+    hash = "sha256-n4NeHBgQwGwgHAFQzPc3oEP9k3F/sqrTmkI/zHW+Miw=";
   };
 
   preConfigure = ''
@@ -61,6 +57,7 @@ stdenv.mkDerivation rec {
   '';
 
   cmakeFlags = [
+    "-DDAVIX_TESTS=OFF"
     "-DENABLE_TOOLS=${boolToUpper enableTools}"
     "-DEMBEDDED_LIBCURL=OFF"
     "-DLIBCURL_BACKEND_BY_DEFAULT=${boolToUpper defaultToLibcurl}"
@@ -69,6 +66,14 @@ stdenv.mkDerivation rec {
     "-DENABLE_THIRD_PARTY_COPY=${boolToUpper enableThirdPartyCopy}"
   ];
 
+  patches = [
+    # Update CMake minimum requirement and supported versions, backport from unreleased davix 0.8.11
+    (fetchpatch {
+      url = "https://github.com/cern-fts/davix/commit/687d424c9f87888c94d96f3ea010de11ef70cd23.patch";
+      hash = "sha256-FNXOQrY0gsMK+D4jwbJmYyEqD3lFui0giXUd+Rr0jLk=";
+    })
+  ];
+
   meta = with lib; {
     description = "Toolkit for Http-based file management";
 
diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 112917d6a74f..7d4a5137d335 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -18,7 +18,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.2.2";
+  version = "25.2.4";
 
   src =
     let
@@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-e0xIFoDmhX1+VetCEJoDZqu6+wrFwTwgIzU8hQ/mXnI=";
-        aarch64-linux = "sha256-80HW2GGBAuCYo+fxz+XZG3sZm0/QW5krHLS4jSGgGvU=";
-        x86_64-darwin = "sha256-w1b22Uce2PmX3f6UMrrkVxSxT/E5rFhiSgb3PjYaYvY=";
-        aarch64-darwin = "sha256-oQ10VB4puNBxFcFRdOtFFF+FcN9I7CUbWMc56V1Z90E=";
+        x86_64-linux = "sha256-5mBk3HO5BqcydxDhancQ8YzfNjZ0bMAuNM9lf8fm4ks=";
+        aarch64-linux = "sha256-i9hQJ01G+Jy18bkYD9e6wAhufH87r/9qwxzzVd0K8LU=";
+        x86_64-darwin = "sha256-zSLLNOP+miG71/LCjNHanDbeRr986wwdb7x5q3gDUZs=";
+        aarch64-darwin = "sha256-njKjBXxv5tpaStiLHfL3Cs4FwtKBsLOCA4ASPggVhnY=";
       };
     in
     fetchurl {
diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index 2c25cecd5073..dafa593efec1 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -8,25 +8,25 @@
 
 let
   pname = "dbgate";
-  version = "6.6.4";
+  version = "6.6.9";
   src =
     fetchurl
       {
         aarch64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
-          hash = "sha256-pwG+muAEVmyIK9eiCrydZ0glxPK5FGl7b3ps/8xeFgE=";
+          hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM=";
         };
         x86_64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
-          hash = "sha256-4xsxYbVbbfxJ70CaB3z/reRoPgBom/XX6/YfT30uDpY=";
+          hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE=";
         };
         x86_64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
-          hash = "sha256-plG9n/JtPmyUcJoP4kcAttKpzpT7ytt2M82CT0zZ4tA=";
+          hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90=";
         };
         aarch64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
-          hash = "sha256-cId3K8m+XRlYHD4NyjSEyFR6c4Yvk6UzGAkdHt0bQUs=";
+          hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU=";
         };
       }
       .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");
diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix
index 3ad40692ed3e..2adaac5b209d 100644
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-asn-lite";
-  version = "2025-10";
+  version = "2025-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-jn3ogitAoSYSa4tQQFewQ7+wj1Z8/j/XJ9lvF4D+LSs=";
+    hash = "sha256-1Je/L9NFN83Suzl+qvbJE5gzUitx6Iin5O0VqqjgecI=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix
index 74955e0b5afb..5185ee6f7c34 100644
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-city-lite";
-  version = "2025-10";
+  version = "2025-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-3DTgkx2UJ46Si6r30kNAbkQtgf9tT8ViDiW9b6u1YLU=";
+    hash = "sha256-CG29ARDYz1PU5JoIvybLUWuckufMk16/vzPj5H0h7V0=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index e5a52d2b1d60..1c484c2f8224 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2025-10";
+  version = "2025-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-pGhn+UAyzhLWG5k1O3MyJ6EEDeGt4v38bt73e6HoPz0=";
+    hash = "sha256-oOLvy3Le+ybHa3z2AGcmXdjUrfOxhguq8bRkyQh7MnI=";
   };
 
   dontUnpack = true;
@@ -29,7 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Free IP to Country Lite database by DB-IP";
     homepage = "https://db-ip.com/db/download/ip-to-country-lite";
     license = lib.licenses.cc-by-40;
-    maintainers = with lib.maintainers; [ nickcao ];
+    maintainers = with lib.maintainers; [
+      nickcao
+      Guanran928
+    ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index b41a2cfaaaf5..fecee5b4328b 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "dblab";
-  version = "0.33.0";
+  version = "0.34.2";
 
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
     rev = "v${version}";
-    hash = "sha256-PFS/9/UdoClktsTnkcILUdjLC9yjvMf60Tgb70lQ5pE=";
+    hash = "sha256-e3p2+QBoxyJu15fTb/7gH32zE4h8V2iDxbxoNMVqElM=";
   };
 
-  vendorHash = "sha256-WxIlGdd3Si3Lyf9FZOCAepDlRo2F3EDRy00EawkZATY=";
+  vendorHash = "sha256-NhBT0dBS3jKgWHxCMVV6NUMcvqCbKS+tlm3y1YI/sAE=";
 
   ldflags = [ "-s -w -X main.version=${version}" ];
 
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index a9094cd870a5..0c43d7b3bbe1 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -60,7 +60,7 @@ let
     in
     [
       (lib.cmakeFeature "CUDA${version}_INCLUDE_DIR" "${headers}")
-      (lib.cmakeFeature "CUDA${version}_LIBS" "${cudaPackages.cuda_cudart.stubs}/lib/stubs/libcuda.so")
+      (lib.cmakeFeature "CUDA${version}_LIBS" "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs/libcuda.so")
       (lib.cmakeFeature "CUDA${version}_STATIC_LIBS" "${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so")
       (lib.cmakeFeature "CUDA${version}_STATIC_CUBLAS_LIBS" (
         lib.concatStringsSep ";" [
diff --git a/pkgs/by-name/dc/dcm2niix/package.nix b/pkgs/by-name/dc/dcm2niix/package.nix
index f25ae85bd22a..d6174316fd2f 100644
--- a/pkgs/by-name/dc/dcm2niix/package.nix
+++ b/pkgs/by-name/dc/dcm2niix/package.nix
@@ -19,21 +19,21 @@ let
   cloudflareZlib = fetchFromGitHub {
     owner = "ningfei";
     repo = "zlib";
-    # HEAD revision of the gcc.amd64 branch on 2025-01-05. Reminder to update
+    # HEAD revision of the gcc.amd64 branch on 2025-10-15. Reminder to update
     # whenever bumping package version.
-    rev = "1cb075520d254005cde193982f1856b877fd39d8";
-    hash = "sha256-1+V7XwYOYqSzcFK86V+gDILGwAqKGQ+HSlXphWtqSvk=";
+    rev = "7d9d0b20249fd459c69e4b98bc569b7157f3018c";
+    hash = "sha256-WnD9pOnM6J3nCLBKYb28+JaIy0z/9csbn+AsyWZQnLs=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.0.20241211";
+  version = "1.0.20250506";
   pname = "dcm2niix";
 
   src = fetchFromGitHub {
     owner = "rordenlab";
     repo = "dcm2niix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NpvtMCcyVfYlnvXjyvTDsa71IxUhi8FepX82qRSG7TA=";
+    hash = "sha256-KtUWrm3Nq3khDxpaQ4W57y+h/gPeEMwfzBv4XYkAhoA=";
   };
 
   patches = lib.optionals withCloudflareZlib [
diff --git a/pkgs/by-name/dc/dconf-editor/package.nix b/pkgs/by-name/dc/dconf-editor/package.nix
index 49eb2b4f121c..f44dd682222f 100644
--- a/pkgs/by-name/dc/dconf-editor/package.nix
+++ b/pkgs/by-name/dc/dconf-editor/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   desktop-file-utils,
   meson,
   ninja,
@@ -23,20 +22,14 @@
 
 stdenv.mkDerivation rec {
   pname = "dconf-editor";
-  version = "45.0.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/dconf-editor/${lib.versions.major version}/dconf-editor-${version}.tar.xz";
-    hash = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
+    hash = "sha256-kKjM+t9R3/MeACgyT7mjWLLSbFroYaccfb+fTdm905k=";
   };
 
   patches = [
-    # Fix crash with GSETTINGS_SCHEMA_DIR env var.
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch";
-      hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ=";
-    })
-
     # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
     # environment variable, to match what we patched GLib to do.
     ./schema-override-variable.patch
diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
index 91dc06bbec1b..b2fae63dc569 100644
--- a/pkgs/by-name/dd/ddccontrol-db/package.nix
+++ b/pkgs/by-name/dd/ddccontrol-db/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddccontrol-db";
-  version = "20250814";
+  version = "20251102";
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol-db";
     rev = version;
-    sha256 = "sha256-DYDO7JZzriLdVKeqOaaEonHcdRaOD3SsvJPhScvSkVE=";
+    sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index 9b9df7745c68..2c659c4cfe88 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ddns-go";
-  version = "6.12.5";
+  version = "6.13.2";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${version}";
-    hash = "sha256-8k3WxNSt+DvfdmWH/V3rAlOSHeyf+g5mmXQZghCf7K4=";
+    hash = "sha256-Jko5cVcCMrBsfcOOSh6ETlk1jdTCbSj1zOgTwhXnxzQ=";
   };
 
-  vendorHash = "sha256-f94Ox/8MQgy3yyLRTK0WFHebntSUAGlbr4/IY+wrz4w=";
+  vendorHash = "sha256-URPCqItQ/xg8p0EdkMS6z8vuSJ1YaCicsvyb+Jvj2CU=";
 
   ldflags = [
     "-X main.version=${version}"
diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/by-name/de/deadbeef/package.nix
similarity index 95%
rename from pkgs/applications/audio/deadbeef/default.nix
rename to pkgs/by-name/de/deadbeef/package.nix
index afcd574395f4..6179b42afcad 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -62,18 +62,16 @@
 
 let
   inherit (lib) optionals;
-
-  version = "1.10.0";
 in
-clangStdenv.mkDerivation {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "deadbeef";
-  inherit version;
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
@@ -155,16 +153,16 @@ clangStdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Ultimate Music Player for GNU/Linux";
     mainProgram = "deadbeef";
     homepage = "http://deadbeef.sourceforge.net/";
     downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = [
       "x86_64-linux"
       "i686-linux"
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index f0c27ba249f0..502cbdcf0967 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.19";
+  version = "2.25.25";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xRWWdM2l1F1Z7U+ThxWvH5wL2ZY+sR8+Jx6h/7mo9dQ=";
+    hash = "sha256-3ZPRn0SwefYoSNNy0V51+nBFTEnE+xSfe3JOz9KOw94=";
   };
 
   patches = [
diff --git a/pkgs/by-name/de/decibels/package.nix b/pkgs/by-name/de/decibels/package.nix
index dbfb975e1530..2f629f9d17ff 100644
--- a/pkgs/by-name/de/decibels/package.nix
+++ b/pkgs/by-name/de/decibels/package.nix
@@ -17,11 +17,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "decibels";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/decibels/${lib.versions.major finalAttrs.version}/decibels-${finalAttrs.version}.tar.xz";
-    hash = "sha256-IpsRqSYxR7y4w+If8NSvZZ+yYmL4rs5Uetz4xl4DH3Q=";
+    hash = "sha256-KbebouKWfmkUHjnwrSxnfjj+P/ufug+lx1MflNP2c8o=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index c9049708c5f7..86b41e94836c 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "deck";
-  version = "1.52.0";
+  version = "1.52.1";
 
   src = fetchFromGitHub {
     owner = "Kong";
     repo = "deck";
     tag = "v${version}";
-    hash = "sha256-fKcI40DqQwVw4YzPXVOXdij4LAwRkCp2U+TpjYmIO8I=";
+    hash = "sha256-nxb7iuAf1hGHdjomgxFZuYwZSUuRrd5J3iVtFgEINY4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule rec {
   ];
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-h7wtQDw8kixqGK5RE9YQ6a/I3yRO1k/6qcHX/K4M6fc=";
+  vendorHash = "sha256-K6BOZ0LAy107UMQ0ZjkSnI4Q0lSqfHqvIG+EhCaal9A=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd deck \
diff --git a/pkgs/by-name/de/deer/package.nix b/pkgs/by-name/de/deer/package.nix
index 9cee98d1ff4c..d7db1050cba1 100644
--- a/pkgs/by-name/de/deer/package.nix
+++ b/pkgs/by-name/de/deer/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Ranger-like file navigation for zsh";
     homepage = "https://github.com/Vifon/deer";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.vyp ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/de/deezer-enhanced/package.nix b/pkgs/by-name/de/deezer-enhanced/package.nix
index d5d581facd37..b8a2c484a56e 100644
--- a/pkgs/by-name/de/deezer-enhanced/package.nix
+++ b/pkgs/by-name/de/deezer-enhanced/package.nix
@@ -28,11 +28,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "deezer-enhanced";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchurl {
     url = "https://github.com/duzda/deezer-enhanced/releases/download/v${version}/deezer-enhanced_${version}_amd64.deb";
-    hash = "sha256-zHgrLzPByAPww0aSEDETsddX71O/GU80AZH729YjQQ0=";
+    hash = "sha256-/FEp9J+5YrwPIu6/zPqUYjYRSU1iHdoIRs7WJLQIu+8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index 2b0e3c223725..728d4b29f6fa 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -65,7 +65,6 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       zowoq
       SuperSandro2000
-      figsoda
     ];
     mainProgram = "delta";
   };
diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix
index d0421fc51324..40d3e14f1e59 100644
--- a/pkgs/by-name/de/deltachat-desktop/package.nix
+++ b/pkgs/by-name/de/deltachat-desktop/package.nix
@@ -19,17 +19,17 @@
 
 let
   deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec {
-    version = "2.15.0";
+    version = "2.22.0";
     src = fetchFromGitHub {
       owner = "chatmail";
       repo = "core";
       tag = "v${version}";
-      hash = "sha256-sFAE90ptPBzT/w4wlGgQe1ERMD2ZAvf4pZ8YW8NEkLU=";
+      hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
     };
     cargoDeps = rustPlatform.fetchCargoVendor {
       pname = "chatmail-core";
       inherit version src;
-      hash = "sha256-MmSjIn4x3b2gpagJnl2r4Z5DXSufZMoohvAf0v5VUbE=";
+      hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
     };
   };
   electron = electron_37;
@@ -37,19 +37,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltachat-desktop";
-  version = "2.15.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "deltachat";
     repo = "deltachat-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7AERqu2M/WeTDw62SF921vXROttZyvC1LmRZG3+aDPI=";
+    hash = "sha256-IEYfdA1rGg452pZVWW/XuIsNffyhAlI9qyGwcnksgAs=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-wdexath7r2roBVw1SSpJcMp8LSs/X5QNiLNHxQF60Lg=";
+    hash = "sha256-fEzp+nrfLakmtUsPef0HG6tZGn5/q+271YwVyBkFKJw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix
index d2dfbb4ce306..273011a02a71 100644
--- a/pkgs/by-name/de/deltatouch/package.nix
+++ b/pkgs/by-name/de/deltatouch/package.nix
@@ -2,26 +2,56 @@
   lib,
   stdenv,
   fetchFromGitea,
+  fetchFromGitHub,
+  fetchpatch,
   cmake,
   intltool,
   libdeltachat,
   lomiri,
   qt5,
   quirc,
+  rustPlatform,
 }:
 
+let
+  libdeltachat' = libdeltachat.overrideAttrs rec {
+    version = "2.22.0";
+    src = fetchFromGitHub {
+      owner = "chatmail";
+      repo = "core";
+      tag = "v${version}";
+      hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
+    };
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      pname = "chatmail-core";
+      inherit version src;
+      hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
+    };
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltatouch";
-  version = "1.14.3";
+  version = "2.22.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "lk108";
     repo = "deltatouch";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-vumMAMm9+dKlmi5a6ehIDePpQKkco/smYSM1K/QiXu4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-e8kS6kAjOZ2V33XJuJbvDZ9mfRknDh9un0dn5HtD3UY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://codeberg.org/lk108/deltatouch/commit/b19c088ce95e8ca6ff1102c36d91b1db937e3a3a.patch";
+      hash = "sha256-58WPUSFaAUqVVU3iq05tae5Gvvr405zDA145V9DbJ54=";
+    })
+    (fetchpatch {
+      url = "https://codeberg.org/lk108/deltatouch/commit/139f3a4abd772b17142a7f61ef9b442200728f4a.patch";
+      hash = "sha256-bEX4g88CCt7AFok8kTeItzCripXFoG2ED7R9lGYoCAw=";
+    })
+  ];
+
   nativeBuildInputs = [
     qt5.wrapQtAppsHook
     intltool
@@ -32,50 +62,25 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.qtbase
     qt5.qtwebengine
     qt5.qtquickcontrols2
+    libdeltachat'
     lomiri.lomiri-ui-toolkit
     lomiri.lomiri-ui-extras
     lomiri.lomiri-api
     lomiri.qqc2-suru-style
+    quirc
   ];
 
-  postPatch = ''
-    # Fix all sorts of install locations
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'set(DATA_DIR /)' 'set(DATA_DIR ''${CMAKE_INSTALL_DATAROOTDIR})' \
-      --replace-fail 'RUNTIME DESTINATION ''${CMAKE_INSTALL_PREFIX}' 'RUNTIME DESTINATION ''${CMAKE_INSTALL_BINDIR}' \
-      --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \
-      --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications"
-
-    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \
-      --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")'
-
-    # Fix import of library dependencies
-    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \
-      --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"'
-    substituteInPlace plugins/DeltaHandler/CMakeLists.txt \
-      --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"'
-
-    # Fix icon reference in desktop file
-    substituteInPlace deltatouch.desktop.in \
-      --replace-fail 'Icon=assets/logo.svg' 'Icon=deltatouch'
-  '';
-
-  postInstall = ''
-    # Remove clickable metadata & helpers from out
-    rm $out/{manifest.json,share/push*}
-  '';
-
-  meta = with lib; {
-    changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.rev}/CHANGELOG";
+  meta = {
+    changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.tag}/CHANGELOG";
     description = "Messaging app for Ubuntu Touch, powered by Delta Chat core";
     longDescription = ''
       DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core.
       Delta Chat works over email.
     '';
     homepage = "https://codeberg.org/lk108/deltatouch";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ link2xt ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ link2xt ];
     mainProgram = "deltatouch";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 34c4a78f9bfd..2554001f67c0 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.5.3";
+  version = "2.5.6";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-UqD9Va33XVX73bjwUdb6woZ3kP/Xz6iBVqV1ceRbXq0=";
+    hash = "sha256-Ppw2fyfFvSmGO+FcEvclkOU7LATOqkYH3wErBdKgWJY=";
   };
 
-  cargoHash = "sha256-OrKg3bOA5AyLQA+LIsHwWpk9DHodhcCVzdKW/S9+mNY=";
+  cargoHash = "sha256-EN87p8wX5QAzf3cWfX8I/+XzYRc9rA5EWj996iUpSPg=";
 
   patches = [
     # Patch out the remote upgrade (deno update) check.
@@ -53,10 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./patches/0002-tests-replace-hardcoded-paths.patch
     ./patches/0003-tests-linux-no-chown.patch
     ./patches/0004-tests-darwin-fixes.patch
-    # some new TS tests don't identify `deno` location from parent actively
-    # running `deno` instance
-    # https://github.com/denoland/deno/pull/30914
-    ./patches/0005-tests-fix-deno-path.patch
   ];
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
@@ -182,6 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=watcher"
     "--skip=node_unit_tests::_fs_watch_test"
     "--skip=js_unit_tests::fs_events_test"
+    "--skip=js_unit_tests::utime_test"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959
diff --git a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch b/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch
deleted file mode 100644
index aab217408237..000000000000
--- a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 798fc5e7e87c1b985a383b7b92a7e55c82e41efa Mon Sep 17 00:00:00 2001
-From: 06kellyjac <dev@j-k.io>
-Date: Fri, 3 Oct 2025 14:20:53 +0100
-Subject: [PATCH] test: leverage `Deno.execPath()` matching other tests
-
-Currently most TS tests use `Deno.execPath()` to identify where `deno` lives
-In the event deno is not on the `$PATH` these tests will fail.
-If deno is on the `$PATH` you can end up testing the wrong instance of `deno`.
----
- tests/unit/process_test.ts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unit/process_test.ts b/tests/unit/process_test.ts
-index 7b82fe5ba782f5..1c26a6f990d1b0 100644
---- a/tests/unit/process_test.ts
-+++ b/tests/unit/process_test.ts
-@@ -623,7 +623,7 @@ Deno.test(
- 
-     // @ts-ignore `Deno.run()` was soft-removed in Deno 2.
-     const p = Deno.run({
--      cmd: ["deno", "run", "--watch", tempFile],
-+      cmd: [Deno.execPath(), "run", "--watch", tempFile],
-       stdout: "piped",
-       stderr: "null",
-     });
-@@ -661,7 +661,7 @@ Deno.serve({ signal: ac.signal }, () => new Response("Hello World"));
- 
-     // @ts-ignore `Deno.run()` was soft-removed in Deno 2.
-     const p = Deno.run({
--      cmd: ["deno", "run", "--watch", tempFile],
-+      cmd: [Deno.execPath(), "run", "--watch", tempFile],
-       stdout: "piped",
-       stderr: "null",
-     });
diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 9e4f43601691..a2a2e53d88c4 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.76.0";
+  version = "1.78.1";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:42b2a171891f4667d9a443cbfdc5f10a58e5b5d7f1b9eae6c12ec9815bec72fd";
-  updateJobProxy.hash = "sha256-+GcGyip8cgVBZeji6Zn3oN8Mc3xZvASohbPVNUbHOgA=";
+  updateJobProxy.imageDigest = "sha256:53f33581efa03f1ed691b44896b231923888ba24b0e12cdc440aac2333d532c5";
+  updateJobProxy.hash = "sha256-M7vf5YS4ORG0TY+iHXL6nNAJhwgtO4PZbO4EEBBT6qo=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:d26d4ce071684b63d935c550552ae0d129f845254cb1e2f8635f15c62f43319e";
-  updaterGitHubActions.hash = "sha256-21E8q1+cwYlD8FL5njGhpsGRd/YkGQNS/y0howQFp6g=";
+  updaterGitHubActions.imageDigest = "sha256:a719a18ffb9aa87dba253be94e137ba7561fdf59f60d9a67c3ebc840ab2058a7";
+  updaterGitHubActions.hash = "sha256-nb8uX3pu+m7cu6Owi9EnWmUT4Epr4yXScSIFBR/Kb6Q=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-fSb2zzddwGJ1r9NhPEhE1WCndyoBK4VLOP3CmQUcjy0=";
+    hash = "sha256-Q6WZ7FrcEGfUfG/3Zx8Z4Jd+CB6pEcw1fDo3AF8ML4M=";
   };
 
-  vendorHash = "sha256-xdouoPEPPhHcXNWxMdcdxVQsgRlFXBXjyZQ7CcROA4U=";
+  vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/de/deployer/package.nix b/pkgs/by-name/de/deployer/package.nix
index c75b5e1d27a7..9423c04e1a55 100644
--- a/pkgs/by-name/de/deployer/package.nix
+++ b/pkgs/by-name/de/deployer/package.nix
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
     hash = "sha256-wtkixHexsJNKsLnnlHssh0IzxwWYMPKDcaf/D0zUNKk=";
   };
 
-  vendorHash = "sha256-0uBI30n31W0eDVA9/W366O0Qo2jWZBqEL+YbJx4J7P0=";
+  vendorHash = "sha256-/bf1rvoG1N6GNqisBwMqY05qhTsy7gMeWXarXgElU/M=";
 
   meta = {
     changelog = "https://github.com/deployphp/deployer/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix
index af2bb299196f..85b8e13fbb90 100644
--- a/pkgs/by-name/de/der-ascii/package.nix
+++ b/pkgs/by-name/de/der-ascii/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "der-ascii";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "der-ascii";
     rev = "v${version}";
-    sha256 = "sha256-xGzxq5AHvzLUOp9VUcI9JMwrCpVIrpDvenWUOEBP6pA=";
+    sha256 = "sha256-i4rNeNDE7bIsO04haMKsbJmyvQRhhEt3I7UxmfTtL78=";
   };
   vendorHash = null;
 
diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix
index 4e400c9a3e1e..a3eec5bbb07d 100644
--- a/pkgs/by-name/de/desktop-postflop/package.nix
+++ b/pkgs/by-name/de/desktop-postflop/package.nix
@@ -8,7 +8,6 @@
   pkg-config,
   gtk3,
   libsoup_2_4,
-  webkitgtk_4_0,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -54,7 +53,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     gtk3
     libsoup_2_4
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   postInstall = ''
@@ -74,6 +73,8 @@ rustPlatform.buildRustPackage rec {
   ];
 
   meta = {
+    # webkitgtk_4_0 was removed
+    broken = true;
     changelog = "https://github.com/b-inary/desktop-postflop/releases/tag/${src.rev}";
     description = "Free, open-source GTO solver for Texas hold'em poker";
     homepage = "https://github.com/b-inary/desktop-postflop";
diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix
new file mode 100644
index 000000000000..527ea94d2025
--- /dev/null
+++ b/pkgs/by-name/de/deterministic-zip/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "deterministic-zip";
+  version = "5.2.0";
+
+  src = fetchFromGitHub {
+    owner = "timo-reymann";
+    repo = "deterministic-zip";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc=";
+  };
+
+  vendorHash = "sha256-qLVeliB2+qRhF+iRE0zHyhBOTB7q31ZGCEH7kbSLSBA=";
+
+  ldflags = [
+    "-s"
+    "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.GitSha=${finalAttrs.src.rev}"
+    "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.Version=${finalAttrs.version}"
+  ];
+
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Simple (almost drop-in) replacement for zip that produces deterministic files";
+    mainProgram = "deterministic-zip";
+    homepage = "https://github.com/timo-reymann/deterministic-zip";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ rhysmdnz ];
+  };
+})
diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix
index a3f8d21ba257..a65c8c68011d 100644
--- a/pkgs/by-name/de/devilutionx/package.nix
+++ b/pkgs/by-name/de/devilutionx/package.nix
@@ -12,7 +12,9 @@
   SDL2_image,
   SDL_audiolib,
   simpleini,
+  flac,
   fmt,
+  libogg,
   libpng,
   libtiff,
   libwebp,
@@ -45,20 +47,20 @@ let
     owner = "diasurgical";
     repo = "libzt";
     fetchSubmodules = true;
-    rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8";
-    sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew=";
+    rev = "1a9d83b8c4c2bdcd7ea6d8ab1dd2771b16eb4e13";
+    sha256 = "sha256-/A77ZM4s+br1hYa0OBdjXcWXUXYG+GiEYcW8VB+UJHo=";
   };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "devilutionx";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
     tag = finalAttrs.version;
-    hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM=";
+    hash = "sha256-XfHpKERYZ+VCeWx95568FEEZ4UZg3Z4abA8mG4kHjy0=";
   };
 
   patches = [ ./add-nix-share-path-to-mpq-search.patch ];
@@ -74,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "@assets@" "$out/share/diasurgical/devilutionx/"
   '';
 
+  cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -83,7 +89,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     bzip2
+    flac
     fmt
+    libogg
     libpng
     libtiff
     libwebp
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/by-name/df/dfasma/package.nix
similarity index 85%
rename from pkgs/applications/audio/dfasma/default.nix
rename to pkgs/by-name/df/dfasma/package.nix
index dd3827ab8a19..96ad53f3bb7b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/by-name/df/dfasma/package.nix
@@ -1,12 +1,10 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   fftw,
   libsndfile,
-  qtbase,
-  qtmultimedia,
-  qmake,
+  libsForQt5,
 }:
 
 let
@@ -36,13 +34,13 @@ let
   };
 
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dfasma";
   version = "1.4.5";
 
   src = fetchFromGitHub {
     sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
@@ -50,11 +48,14 @@ mkDerivation rec {
   buildInputs = [
     fftw
     libsndfile
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   postPatch = ''
     cp -Rv "${reaperFork.src}"/* external/REAPER
@@ -62,7 +63,7 @@ mkDerivation rec {
     substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Analyse and compare audio files in time and frequency";
     mainProgram = "dfasma";
     longDescription = ''
@@ -75,9 +76,9 @@ mkDerivation rec {
     '';
     homepage = "https://gillesdegottex.gitlab.io/dfasma-website/";
     license = [
-      licenses.gpl3Plus
+      lib.licenses.gpl3Plus
       reaperFork.meta.license
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix
index 2f6671196bfe..296096a060c3 100644
--- a/pkgs/by-name/di/dia/package.nix
+++ b/pkgs/by-name/di/dia/package.nix
@@ -1,14 +1,16 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  appstream-glib,
+  appstream,
   dblatex,
   desktop-file-utils,
+  docbook-xsl-nons,
+  docbook_xml_dtd_45,
+  fetchFromGitLab,
+  gdk-pixbuf,
   graphene,
-  gtk3,
   gtk-mac-integration-gtk3,
-  intltool,
+  gtk3,
   libxml2,
   libxslt,
   meson,
@@ -17,62 +19,91 @@
   poppler,
   python3,
   wrapGAppsHook3,
-  # Building with docs are still failing in unstable-2023-09-28
-  withDocs ? false,
 }:
 
+let
+  xpm-pixbuf = stdenv.mkDerivation {
+    pname = "xpm-pixbuf";
+    version = "0-unstable-2024-05-24";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "ZanderBrown";
+      repo = "xpm-pixbuf";
+      rev = "d290a0c846687b22d2a8c5aaec83a6689f30e1c3";
+      hash = "sha256-LU6nKe7IIecF/3wwhlwR1hyABBvfwvujVW5zJJSzkqo=";
+    };
+
+    nativeBuildInputs = [
+      meson
+      ninja
+      pkg-config
+    ];
+
+    buildInputs = [ gdk-pixbuf ];
+
+    meta = {
+      license = lib.licenses.lgpl21;
+      homepage = "https://gitlab.gnome.org/ZanderBrown/xpm-pixbuf";
+    };
+  };
+in
 stdenv.mkDerivation {
   pname = "dia";
-  version = "unstable-2023-09-28";
+  version = "unstable-2025-10-26";
 
   src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "dia";
-    domain = "gitlab.gnome.org";
-    rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322";
-    hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q=";
+    rev = "efdf829e8afdbbeb371820932769e35415ebe886";
+    hash = "sha256-VFFU5iJnVJdZ2tkNszZ2ooBD+GiCL6MqanzpEWIJerk=";
   };
 
-  # Required for the PDF plugin
-  CXXFLAGS = "-std=c++20";
-
-  preConfigure = ''
-    patchShebangs .
+  postPatch = ''
+    # Fix build with poppler 25.10.0
+    substituteInPlace plug-ins/pdf/pdf-import.cpp \
+      --replace-fail 's->getLength();' 's->size();'
   '';
 
+  strictDeps = true;
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    appstream
+    dblatex
+    dblatex.tex
+    desktop-file-utils
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    libxml2 # xmllint
+    libxslt
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
+
   buildInputs = [
     graphene
     gtk3
-    (libxml2.override { zlibSupport = true; })
+    libxml2
+    libxslt
     python3
     poppler
-  ]
-  ++ lib.optionals withDocs [
-    libxslt
+    xpm-pixbuf
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     gtk-mac-integration-gtk3
   ];
 
-  nativeBuildInputs = [
-    appstream-glib
-    desktop-file-utils
-    intltool
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook3
-  ]
-  ++ lib.optionals withDocs [
-    dblatex
-  ];
-
   meta = with lib; {
     description = "Gnome Diagram drawing software";
     mainProgram = "dia";
-    homepage = "http://live.gnome.org/Dia";
+    homepage = "https://wiki.gnome.org/Apps/Dia";
     maintainers = with maintainers; [ raskin ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/di/diebahn/package.nix b/pkgs/by-name/di/diebahn/package.nix
index abea858d30e7..b77125dd7e2d 100644
--- a/pkgs/by-name/di/diebahn/package.nix
+++ b/pkgs/by-name/di/diebahn/package.nix
@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation rec {
   pname = "diebahn";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchFromGitLab {
     owner = "schmiddi-on-mobile";
     repo = "railway";
     tag = version;
-    hash = "sha256-pPjOl46R8hBpyKdwq/gwHv/qCtFkI0LVDsqxcQOgtkU=";
+    hash = "sha256-9ADJX2NFYv+l7umAmDLa1cO6wEnaNKu9SLzwJjfGrRM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-kxt6z2RaSnlso/Jz36B9VNwti2o3b8+Ggd4zDIjFf2c=";
+    hash = "sha256-OijGiVBGe4wmGN7e9xOnZRoF9HpiryGi+stqgBIrlzc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 164b69372ccc..909dd6d31e9c 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-JNDFXBNmwCWpk+Lub453wS+7lVMZcdiJBmPoVAedpug=";
+    hash = "sha256-AgPESgFLnL3jiYBP8DiWb0hLzsx5tJA+gcO/fdV5Cvo=";
   };
 
-  cargoHash = "sha256-qfXa6DuuhKbXCdOvhuPNx6xlDIouoDVJUMob9Fc5XgI=";
+  cargoHash = "sha256-yco4l/4UiYnqnZZLYm3EkHmYiQJhMC2xloFg0brDfsg=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix
index 9a6ed5917b05..c7678e5ae251 100644
--- a/pkgs/by-name/di/diffedit3/package.nix
+++ b/pkgs/by-name/di/diffedit3/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "diffedit3";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU=";
+    hash = "sha256-tlrP97XMAAnk5H5wTHPsP1DMSmDqV9wJp1n+22jUtnM=";
   };
 
-  cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA=";
+  cargoHash = "sha256-Hv3T0pxNUwp7No5tmFopMGjNdxfje4gRODj3B7sDVcg=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 0410978a4393..7df82ec5f70d 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -106,12 +106,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "304";
+  version = "307";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-lJdZRIyoVq1PsmiicsSxJ0Mgsy5IcAUar6l8QvJoxOw=";
+    hash = "sha256-ccMBoupgrDwbKaWAQa+Tqo6WfB5Qsva17uvpg2UX4jY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index 78d77621ff58..dea97b8f1ff7 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       ethancedwards8
-      figsoda
       matthiasbeyer
       defelo
     ];
diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix
index e373f97e082e..889b19698e2b 100644
--- a/pkgs/by-name/di/digiham/package.nix
+++ b/pkgs/by-name/di/digiham/package.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
     ./cpp-17.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix
index d322d8b807bf..122288e15f51 100644
--- a/pkgs/by-name/di/digikam/package.nix
+++ b/pkgs/by-name/di/digikam/package.nix
@@ -62,14 +62,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "digikam";
-  version = "8.7.0";
+  version = "8.8.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "graphics";
     repo = "digikam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9t6tXrege3A5x5caUEfho23Pin7dON+e6x94rXC8XYE=";
+    hash = "sha256-yUrB0FXUcm+6QtlB7HMqdPpdhrV2iAo1oRkjgsHJiCU=";
   };
 
   patches = [
diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix
index 93ecb7c364bc..15d04fb41e95 100644
--- a/pkgs/by-name/di/dinish/package.nix
+++ b/pkgs/by-name/di/dinish/package.nix
@@ -7,12 +7,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "dinish";
-  version = "4.006";
+  version = "4.007";
 
   src = fetchzip {
     url = "https://github.com/playbeing/dinish/releases/download/v${version}/dinish-ttf.zip";
     stripRoot = false;
-    hash = "sha256-IWguCiDSeQ+f/saNoyk2pUF/k0pEiFweXinoqOEVWEI=";
+    hash = "sha256-u/AYA9/8piZ6hz4XD3uSruOM0deeXQ5Gb0N/8rlDiP0=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix
index 93ef3172bc74..1409becbfc05 100644
--- a/pkgs/by-name/di/dinit/package.nix
+++ b/pkgs/by-name/di/dinit/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   m4,
   installShellFiles,
-  util-linux,
+  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/shutdown.cc \
-      --replace-fail '"/bin/umount"' '"${util-linux}/bin/umount"' \
-      --replace-fail '"/sbin/swapoff"' '"${util-linux}/bin/swapoff"'
+      --replace-fail '"/bin/umount"' '"${util-linuxMinimal}/bin/umount"' \
+      --replace-fail '"/sbin/swapoff"' '"${util-linuxMinimal}/bin/swapoff"'
   '';
 
   nativeBuildInputs = [
@@ -49,7 +49,10 @@ stdenv.mkDerivation rec {
     description = "Service manager / supervision system, which can (on Linux) also function as a system manager and init";
     homepage = "https://davmac.org/projects/dinit";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ aanderse ];
+    maintainers = with lib.maintainers; [
+      aanderse
+      lillecarl
+    ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/di/directx-headers/package.nix b/pkgs/by-name/di/directx-headers/package.nix
index 5889cfc534e7..319a9de8a50c 100644
--- a/pkgs/by-name/di/directx-headers/package.nix
+++ b/pkgs/by-name/di/directx-headers/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "directx-headers";
-  version = "1.618.1";
+  version = "1.618.2";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "DirectX-Headers";
     rev = "v${version}";
-    hash = "sha256-QicnDClO7bceU/aLHjrpUtCBU58PSAW6Ef3RG6qrZw0=";
+    hash = "sha256-zKlKUnPHUCDYRBIFU2gpOUvx1d5ZoMy1vYMdByaMIyA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix
index 7a9352f7ffb4..416314a1512c 100644
--- a/pkgs/by-name/di/direwolf-unstable/package.nix
+++ b/pkgs/by-name/di/direwolf-unstable/package.nix
@@ -12,15 +12,18 @@
   inherit hamlibSupport gpsdSupport extraScripts;
 }).overrideAttrs
   (oldAttrs: {
-    version = "1.7-unstable-2025-04-29";
+    version = "1.8-unstable-2025-11-07";
 
     src = fetchFromGitHub {
       owner = "wb2osz";
       repo = "direwolf";
-      rev = "486b3cf1f685502af7dc87b0f9c9cead6800d47b";
-      hash = "sha256-VFBkOWHGZP7GjekHL3GY3BGkVXQbtyD1YPmu0xaQ1ME=";
+      rev = "3658a878920803bbb69a4567579dcc4d6cb80a92";
+      hash = "sha256-EcQrNN0nRxEfhJc3AbYkxlRaBKpoHQRrZbExYBankMk=";
     };
 
+    # drop upstreamed cmake-4 patch
+    patches = [ ];
+
     postPatch =
       builtins.replaceStrings
         [
diff --git a/pkgs/by-name/di/discord-rich-presence-plex/package.nix b/pkgs/by-name/di/discord-rich-presence-plex/package.nix
new file mode 100644
index 000000000000..2c9f3a73e6df
--- /dev/null
+++ b/pkgs/by-name/di/discord-rich-presence-plex/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  python3Packages,
+  python3,
+  fetchFromGitHub,
+  makeWrapper,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "discord-rich-presence-plex";
+  version = "2.16.0";
+  format = "other";
+  src = fetchFromGitHub {
+    owner = "phin05";
+    repo = "discord-rich-presence-plex";
+    tag = "v${version}";
+    hash = "sha256-e1r0w72IOEY5XsjANkAHbfPYEf1B8n6KYVLMWFSLs0g=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+  dontBuild = true;
+  dontUseSetuptoolsBuild = true;
+  dontUseSetuptoolsCheck = true;
+
+  dependencies = with python3Packages; [
+    requests
+    pillow
+    plexapi
+    pyyaml
+    websocket-client
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/discord-rich-presence-plex
+    cp -r * $out/lib/discord-rich-presence-plex/
+
+    mkdir -p $out/bin
+    makeWrapper ${lib.getExe python3} \
+      $out/bin/discord-rich-presence-plex \
+      --add-flags "$out/lib/discord-rich-presence-plex/main.py" \
+      --prefix PYTHONPATH : "$out/lib/discord-rich-presence-plex:$PYTHONPATH" \
+      --set DRPP_NO_PIP_INSTALL "true"
+
+    runHook postInstall
+  '';
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/phin05/discord-rich-presence-plex";
+    changelog = "https://github.com/phin05/discord-rich-presence-plex/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    description = "Displays your Plex status on Discord using Rich Presence";
+    maintainers = with lib.maintainers; [ hogcycle ];
+    mainProgram = "discord-rich-presence-plex";
+  };
+}
diff --git a/pkgs/by-name/di/discord-sh/package.nix b/pkgs/by-name/di/discord-sh/package.nix
index d82db4afa9d3..cff70077b52f 100644
--- a/pkgs/by-name/di/discord-sh/package.nix
+++ b/pkgs/by-name/di/discord-sh/package.nix
@@ -11,13 +11,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "discord-sh";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "ChaoticWeg";
     repo = "discord.sh";
     rev = "v${version}";
-    sha256 = "sha256-ZOGhwR9xFzkm+q0Gm8mSXZ9toXG4xGPNwBQMCVanCbY=";
+    sha256 = "sha256-z57uMbH6PI68aTMAjA8UIPEefV8sQRR4cS0eK6Ypxuk=";
   };
 
   # ignore Makefile by disabling buildPhase. Upstream Makefile tries to download
diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix
index 1179596a29e5..8c0ff1bb75bc 100644
--- a/pkgs/by-name/di/discordo/package.nix
+++ b/pkgs/by-name/di/discordo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "discordo";
-  version = "0-unstable-2025-10-12";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = "discordo";
-    rev = "eeeeb75c66ceeb4dfc2eef69f006a2665e1d66d8";
-    hash = "sha256-pct+C77K7ZBc4grfvJfDBoGaFed3UIrJRXXLlv6wUis=";
+    rev = "55e31cfb477ffdb2cdba8fc81db84f45574fe218";
+    hash = "sha256-x8ZIcMEtnya32BuHN7HgG8WbLu+fPOiFrAAI49alpbM=";
   };
 
-  vendorHash = "sha256-+BBjVyyGR52ssp3pvODFOUmOcLa9PBXDhFlS9lsZF08=";
+  vendorHash = "sha256-UVjwirGN1A8SJRLr6L4bweFcwkXJolHrF6kRST2ShRA=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/di/diskscan/package.nix b/pkgs/by-name/di/diskscan/package.nix
index bbb737a7d498..ba2129763486 100644
--- a/pkgs/by-name/di/diskscan/package.nix
+++ b/pkgs/by-name/di/diskscan/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   ncurses,
   zlib,
@@ -18,6 +19,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c=";
   };
 
+  patches = [
+    # cmake-4 support:
+    #   https://github.com/baruch/diskscan/pull/77
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/baruch/diskscan/commit/6e342469dcab32be7a33109a4d394141d5c905b5.patch";
+      hash = "sha256-05ctYPmGWTJRUc4aN35fvb0ITwIZlQdIweH7tSQ0RjA=";
+    })
+  ];
+
   buildInputs = [
     ncurses
     zlib
diff --git a/pkgs/by-name/di/dislocker/package.nix b/pkgs/by-name/di/dislocker/package.nix
index 72984a914545..a0f844006471 100644
--- a/pkgs/by-name/di/dislocker/package.nix
+++ b/pkgs/by-name/di/dislocker/package.nix
@@ -2,53 +2,31 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
-  mbedtls_2,
-  fuse,
+  fuse3,
+  mbedtls,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dislocker";
-  version = "0.7.3";
+  version = "0.7.3-unstable-2025-09-07";
 
   src = fetchFromGitHub {
     owner = "Aorimn";
     repo = "dislocker";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-U8BD3kE1CH+Mjh/7SlXG9gKY6/LyF9+ER5C3soNGZqo=";
+    rev = "4ff070f0ea9e56948ab316fb76b91f54dd6727aa";
+    hash = "sha256-hrIt5D9YjBWs0Q9chWGQM2bo1SZ7qLCd898zFHWWcqA=";
   };
 
-  patches = [
-    # This patch
-    #   1. adds support for the latest FUSE on macOS
-    #   2. uses pkg-config to find libfuse instead of searching in predetermined
-    #      paths
-    #
-    # https://github.com/Aorimn/dislocker/pull/246
-    (fetchpatch {
-      name = "feat-support-the-latest-FUSE-on-macOS.patch";
-      url = "https://github.com/Aorimn/dislocker/commit/7744f87c75fcfeeb414d0957771042b10fb64e62.patch";
-      hash = "sha256-JX+4DJLcw9qP1nIs+sZDcduSFvU4YdGyblFLtxZj/i4=";
-    })
-    # fix compatibility with CMake (https://cmake.org/cmake/help/v4.0/command/cmake_minimum_required.html)
-    # https://github.com/Aorimn/dislocker/pull/346
-    (fetchpatch {
-      name = "cmake-raise-minimum-required-version-to-3.5.patch";
-      url = "https://github.com/Aorimn/dislocker/commit/337d05dc7447436539f2fb481eef0e528a000b66.patch";
-      hash = "sha256-6LTRjaZfyGS2BCdpcJy/qo0r8soXJSZqWjZRbaKvcQk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
 
   buildInputs = [
-    fuse
-    mbedtls_2
+    fuse3
+    mbedtls
   ];
 
   meta = {
@@ -56,7 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Aorimn/dislocker";
     changelog = "https://github.com/Aorimn/dislocker/raw/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ elitak ];
+    maintainers = with lib.maintainers; [
+      elitak
+      yuannan
+    ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix
index f0271b3555ad..366b6960f415 100644
--- a/pkgs/by-name/di/distrho-ports/package.nix
+++ b/pkgs/by-name/di/distrho-ports/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
 
-  postFixup = lib.optionalString (lib.any (x: x == "vitalium") plugins || plugins == [ ]) ''
+  postFixup = lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) ''
     for file in \
       $out/lib/lv2/vitalium.lv2/vitalium.so \
       $out/lib/vst/vitalium.so \
diff --git a/pkgs/by-name/di/distro-info-data/package.nix b/pkgs/by-name/di/distro-info-data/package.nix
new file mode 100644
index 000000000000..da2d34ae2b71
--- /dev/null
+++ b/pkgs/by-name/di/distro-info-data/package.nix
@@ -0,0 +1,29 @@
+{
+  fetchFromGitLab,
+  lib,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "distro-info-data";
+  version = "0.68";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = "distro-info-data";
+    tag = "debian/${finalAttrs.version}";
+    hash = "sha256-YmHC7DSRzQmuwG+R7+dsl8kdX1rbPFfG7DdNY02tyfY=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "Information about Debian and Ubuntu releases";
+    homepage = "https://salsa.debian.org/debian/distro-info-data";
+    changelog = "https://salsa.debian.org/debian/distro-info-data/-/blob/${finalAttrs.src.tag}/debian/changelog";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ andersk ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix
index c7970e436c50..8946a7355b9c 100644
--- a/pkgs/by-name/di/distrobox/package.nix
+++ b/pkgs/by-name/di/distrobox/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "distrobox";
-  version = "1.8.1.2";
+  version = "1.8.2.0";
 
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "distrobox";
     rev = finalAttrs.version;
-    hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk=";
+    hash = "sha256-uwJD7HsWoQ/LxYL0mSSxMni676qqEnMHndpL01M5ySE=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix
index c9e75e756a4d..24b00d5daacf 100644
--- a/pkgs/by-name/di/distroshelf/package.nix
+++ b/pkgs/by-name/di/distroshelf/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "distroshelf";
-  version = "1.0.13";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
     owner = "ranfdev";
     repo = "DistroShelf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2R5jDstnzCTG6UfynsO2aeX6eST4cZIEHNdP9OLDKrw=";
+    hash = "sha256-4rNdp0g/QaiLnKGC4baYAq29dxluyZ+9TgeBlqidRp0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix
index 5ad3cbb2f4ba..d9d9d076e4ed 100644
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dita-ot";
-  version = "4.3.4";
+  version = "4.3.5";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ openjdk17 ];
 
   src = fetchzip {
     url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-L3chSLr/S7d2sx0FjGbn1A1GRknBqVIUrklOW7LjakA=";
+    hash = "sha256-odL9i48SICfXLxSDqwqIXBXG57dENRjdkZkRjt3xhMg=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix
index 109d43977213..228db44bb066 100644
--- a/pkgs/by-name/dj/django-upgrade/package.nix
+++ b/pkgs/by-name/dj/django-upgrade/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "django-upgrade";
-  version = "1.29.0";
+  version = "1.29.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "django-upgrade";
     tag = version;
-    hash = "sha256-ALAwOm+j0Gpx3ZiO8nyTDrJNqR9WaFSxLxAgTarNQeM=";
+    hash = "sha256-NnVFMItWiTL82LMxDKeGofaestRBfZFVjTKFjbJFmmU=";
   };
 
   build-system = [ python3Packages.setuptools ];
diff --git a/pkgs/by-name/dj/djot-js/package.nix b/pkgs/by-name/dj/djot-js/package.nix
index 441475f816b5..dd93707fbf41 100644
--- a/pkgs/by-name/dj/djot-js/package.nix
+++ b/pkgs/by-name/dj/djot-js/package.nix
@@ -31,7 +31,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/jgm/djot.js";
     changelog = "https://github.com/jgm/djot.js/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "djot";
   };
 }
diff --git a/pkgs/by-name/dj/djv/package.nix b/pkgs/by-name/dj/djv/package.nix
index 0af65284066e..9cc1ae9d1317 100644
--- a/pkgs/by-name/dj/djv/package.nix
+++ b/pkgs/by-name/dj/djv/package.nix
@@ -1,187 +1,94 @@
 {
-  stdenv,
-  cmake,
-  fetchFromGitHub,
-  fetchpatch,
   lib,
-  alsa-lib,
-  libGL,
-  libX11,
-  libXinerama,
-  libXi,
-  zlib,
-  rtaudio,
-  rapidjson,
-  ilmbase,
-  glm,
-  glfw3,
-  libpng,
-  opencolorio_1,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  bzip2,
+  feather-tk,
+  ffmpeg,
   freetype,
+  glfw,
+  imath,
+  libGL,
+  libjpeg,
+  libtiff,
+  libpng,
+  lunasvg,
+  minizip-ng,
+  nativefiledialog-extended,
+  nlohmann_json,
+  opencolorio,
   openexr,
+  openssl,
+  opentimelineio,
+  plutovg,
+  SDL2,
+  tlrender,
+  xz,
+  zlib,
+  zstd,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
+  pname = "djv";
+  version = "3.1.1";
 
-  # The way third-party dependencies are packaged has changed
-  # significantly from the 2.0.8 release. This means any packaging
-  # effort for the 2.0.8 release would have to be redone for the next
-  # release. Hence we package the git version for now and can easily
-  # jump onto the next release once it's available.
-  djvVersion = "2.0.8-unstable-2021-07-31";
-
-  djvSrc = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "darbyjohnston";
     repo = "djv";
-    rev = "ae31712c4f2802a874217ac194bde26287993934";
-    sha256 = "1qgia6vqb6fhyfj8w925xl6k6zidrp2gj5f32bpi94lwwhi6p9pd";
+    tag = finalAttrs.version;
+    hash = "sha256-/SakJ23mi/dz8eUt2UtcgfLtFZiCHy1ME+jWdNS8+Fw=";
   };
 
-  # DJV's build system tries to automatically pull in FSeq, another
-  # library by the DJV author.
-  #
-  # When updating, check the following file in the DJV source:
-  # etc/SuperBuild/cmake/Modules/BuildFSeq.cmake
-  #
-  # If there is revision or tag specified, DJV wants to use the most
-  # recent master version
-  fseqSrc = fetchFromGitHub {
-    owner = "darbyjohnston";
-    repo = "fseq";
-    rev = "545fac6018100f7fca474b8ee4f1efa7cbf6bf45";
-    sha256 = "0qfhbrzji05hh5kwgd1wvq2lbf81ylbi7v7aqk28aws27f8d2hk0";
-  };
-
-  djv-deps = stdenv.mkDerivation rec {
-    pname = "djv-dependencies";
-    version = djvVersion;
-
-    src = djvSrc;
-
-    sourceRoot = "${src.name}/etc/SuperBuild";
-
-    nativeBuildInputs = [ cmake ];
-    buildInputs = [
-      libGL
-    ];
-
-    postPatch = ''
-      chmod -R +w .
-
-      sed -i 's,GIT_REPOSITORY https://github.com/darbyjohnston/FSeq.git,SOURCE_DIR ${fseqSrc},' \
-          cmake/Modules/BuildFSeq.cmake
-
-      # We pull these projects in as normal Nix dependencies. No need
-      # to build them again here.
-
-      sed -i CMakeLists.txt \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS RapidJSON)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS RtAudio)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS IlmBase)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS GLM)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS GLFW)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS ZLIB)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS PNG)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS FreeType)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS OCIO)/d'
-
-      # The "SuperBuild" wants to build DJV right here. This is
-      # inconvenient, because then the `make install` target is not generated
-      # by CMake. We build DJV in its own derivation below. This also makes
-      # the build a bit more modular.
-
-      sed -i '/include(BuildDJV)/d' \
-          CMakeLists.txt
-    '';
-
-    cmakeFlags = [
-      "-DDJV_THIRD_PARTY_OpenEXR:BOOL=False"
-      "-DDJV_THIRD_PARTY_JPEG:BOOL=False"
-      "-DDJV_THIRD_PARTY_TIFF:BOOL=False"
-    ];
-
-    dontInstall = true;
-    doCheck = true;
-  };
-
-in
-stdenv.mkDerivation {
-  pname = "djv";
-  version = djvVersion;
-
-  src = djvSrc;
-  patches = [
-    # Pull fix ending upstream inclusion for gcc-12+ support:
-    #   https://github.com/darbyjohnston/DJV/pull/477
-    (fetchpatch {
-      name = "gcc-13-cstdint-include.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch";
-      hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk=";
-    })
-    (fetchpatch {
-      name = "gcc-11-limits.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch";
-      hash = "sha256-x6ye0xMwTlKyNW4cVFb64RvAayvo71kuOooPj3ROn0g=";
-    })
-    (fetchpatch {
-      name = "gcc-11-IO.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/ce79f2d2cb35d03322648323858834bff942c792.patch";
-      hash = "sha256-oPbXOnN5Y5QL+bs/bL5eJALu45YHnyTBLQcC8XcJi0c=";
-    })
-    (fetchpatch {
-      name = "gcc-11-sleep_for.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/6989f43db27f66a7691f6048a2eb3299ef43a92e.patch";
-      hash = "sha256-1kiF3VrZiO+FSoR7NHCbduQ8tMq/Uuu6Z+sQII4xBAw=";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    alsa-lib
-    libGL
-    libX11
-    libXinerama
-    libXi
-    rapidjson
-    rtaudio
-    ilmbase
-    glm
-    glfw3
-    zlib
-    libpng
-    freetype
-    opencolorio_1
-    djv-deps
-    openexr
-  ];
-
   postPatch = ''
-    chmod -R +w .
-
-    # When linking opencolorio statically this results in failing to
-    # pull in opencolorio's dependencies (tixml and yaml libraries). Avoid
-    # this by linking it statically instead.
-
-    sed -i cmake/Modules/FindOCIO.cmake \
-        -e 's/PATH_SUFFIXES static//' \
-        -e '/OpenColorIO_STATIC/d'
-
-    # When searching for OpenEXR this looks for Iex.h, which exists in ilmbase,
-    # since it's a secondary inport, to find the correct OpenEXR lib, we search
-    # for something specifically in OpenEXR.
-
-    sed -i cmake/Modules/FindOpenEXR.cmake \
-        -e 's/find_path(OpenEXR_INCLUDE_DIR NAMES Iex.h PATH_SUFFIXES OpenEXR)/find_path(OpenEXR_INCLUDE_DIR NAMES ImfImage.h PATH_SUFFIXES OpenEXR)/'
+    substituteInPlace cmake/Modules/djvPackage.cmake \
+      --replace-fail \
+        ' ''${CMAKE_INSTALL_PREFIX}/etc/tlRender/LICENSE_' \
+        " ${tlrender}/etc/tlRender/LICENSE_"
   '';
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    bzip2
+    feather-tk
+    ffmpeg
+    freetype
+    glfw
+    imath
+    tlrender
+    libjpeg
+    libGL
+    libpng
+    libtiff
+    lunasvg
+    minizip-ng
+    nativefiledialog-extended
+    nlohmann_json
+    opencolorio
+    openexr
+    openssl
+    opentimelineio
+    plutovg
+    SDL2
+    xz
+    zlib
+    zstd
+  ];
+
   # GLFW requires a working X11 session.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Professional review software for VFX, animation, and film production";
     homepage = "https://darbyjohnston.github.io/DJV/";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.blitz ];
-    license = licenses.bsd3;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ blitz ];
+    license = lib.licenses.bsd3;
+    mainProgram = "djv";
   };
-}
+})
diff --git a/pkgs/by-name/dk/dkh/package.nix b/pkgs/by-name/dk/dkh/package.nix
index 038d51583f01..4d3a4bdc2c56 100644
--- a/pkgs/by-name/dk/dkh/package.nix
+++ b/pkgs/by-name/dk/dkh/package.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   cmake,
 }:
-
 stdenv.mkDerivation rec {
   pname = "dkh";
   version = "1.2";
@@ -17,6 +16,11 @@ stdenv.mkDerivation rec {
     sha256 = "1wb4qmb9f8rnrwnnw1gdhzx1fmhy628bxfrg56khxy3j5ljxkhck";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+    --replace-fail "cmake_minimum_required(VERSION 3.0)"  "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     gfortran
     cmake
diff --git a/pkgs/by-name/dl/dl-librescore/package.nix b/pkgs/by-name/dl/dl-librescore/package.nix
index 2a6ac9b87131..1e8eec2e44a2 100644
--- a/pkgs/by-name/dl/dl-librescore/package.nix
+++ b/pkgs/by-name/dl/dl-librescore/package.nix
@@ -3,29 +3,32 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
+  fetchpatch,
   python3,
   cctools,
 }:
 
 buildNpmPackage rec {
   pname = "dl-librescore";
-  version = "0.35.29";
+  version = "0.35.32";
 
   src = fetchFromGitHub {
     owner = "LibreScore";
     repo = "dl-librescore";
     rev = "v${version}";
-    hash = "sha256-DwDlGTFdqAAsEWrhnieuaeYQ0N8COB/7b49xPJackJQ=";
+    hash = "sha256-qFAJlcyvH0lShaZKIAJkXqrY0DRaUvr8V9Ipch1A3kw=";
   };
 
-  npmDepsHash = "sha256-5Uc83VdqMwQaTSmzwpBh7x4IKoVPd9MYDXkDvR1fz6Q=";
+  npmDepsHash = "sha256-JLB/+arhAzRj49m4kDCasDXEhVIBygSZ9kHI2npJf3s=";
 
-  # see https://github.com/LibreScore/dl-librescore/pull/32
-  # TODO can be removed with next update
-  postPatch = ''
-    substituteInPlace package-lock.json \
-      --replace 50c7a1508cd9358757c30794e14ba777e6faa8aa b4cb32eb1734a2f73ba2d92743647b1a91c0e2a8
-  '';
+  patches = [
+    # https://github.com/LibreScore/dl-librescore/pull/144
+    (fetchpatch {
+      name = "update-pdfkit.patch";
+      url = "https://github.com/LibreScore/dl-librescore/commit/3694697d2d3f3f59ca32ee962999b3dd22c81de7.patch";
+      hash = "sha256-ikEJNwKMDWpWBQnS3ur76vZqF+zRI6D5d0AyLDdreJY=";
+    })
+  ];
 
   makeCacheWritable = true;
 
diff --git a/pkgs/by-name/dm/dmsdos/package.nix b/pkgs/by-name/dm/dmsdos/package.nix
index 44b7bb9bdad5..0b6fa637d30e 100644
--- a/pkgs/by-name/dm/dmsdos/package.nix
+++ b/pkgs/by-name/dm/dmsdos/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
 }:
 
@@ -16,6 +17,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-oGVkDf1gFaSMRpvHq4GNLN8htBm/sYawZeVwiqQxjL8=";
   };
 
+  patches = [
+    # cmake-4 support:
+    #   https://github.com/sandsmark/dmsdos/pull/1
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/sandsmark/dmsdos/commit/94076ab27800e9cba41ab05e6bb2edbb421154d9.patch";
+      hash = "sha256-olpnzPg/kbveUl0muwHKwI+DMGqXzxLrruFomf/SXjE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix
index a52e8cfe8f8d..23140923c324 100644
--- a/pkgs/by-name/dn/dns-collector/package.nix
+++ b/pkgs/by-name/dn/dns-collector/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "dns-collector";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "dns-collector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk=";
+    hash = "sha256-LQJxK2MZtFeFm5keNoNSDHXmxS8z9/fsCV02BGsph74=";
   };
   subPackages = [ "." ];
 
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A=";
+  vendorHash = "sha256-nZheY/CbzDR/GB4Nu3xiWXsxrrvu/AKZE0gquBrfXXM=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index 68610fd6ae18..fc267944ff65 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.26.0";
+  version = "4.27.1";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = "dnscontrol";
     tag = "v${version}";
-    hash = "sha256-yDjxAQDqe9LIvzVy255rzKs7r7Xb4RAD1CFuKSrnQS8=";
+    hash = "sha256-OlXqX26aL08gft8sFPZrYBhf7U4DY46BYqli68xEPbg=";
   };
 
-  vendorHash = "sha256-Ee4RagjYDngsMbTLjyeVFYv9O5cJuc9J2XRUP0FAe+w=";
+  vendorHash = "sha256-3JlPT0nL/FzjxH6aWZBwYaNetSEzzEv00/F7bsj4h0Y=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix
index 8ae326177f87..ae1da2edbd49 100644
--- a/pkgs/by-name/dn/dnsdiag/package.nix
+++ b/pkgs/by-name/dn/dnsdiag/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dnsdiag";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "farrokhi";
     repo = "dnsdiag";
     tag = "v${version}";
-    hash = "sha256-6TDs+ncbVa7LWtGLlqEXJb9zzXZ+nAhbi4QGyCSu3ho=";
+    hash = "sha256-VTxIKqc7yFTLx7VLEjb4UwPKAmSD+4X+ZHrmriScVGA=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix
index 90dca5e23caf..3b7699cf87c0 100644
--- a/pkgs/by-name/dn/dnsmasq/package.nix
+++ b/pkgs/by-name/dn/dnsmasq/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     "PKG_CONFIG=${buildPackages.pkg-config}/bin/${buildPackages.pkg-config.targetPrefix}pkg-config"
   ];
 
-  hardeningEnable = [ "pie" ];
+  enableParallelBuilding = true;
 
   postBuild = lib.optionalString stdenv.hostPlatform.isLinux ''
     make -C contrib/lease-tools
diff --git a/pkgs/by-name/dn/dnspeep/package.nix b/pkgs/by-name/dn/dnspeep/package.nix
index 28ee48c4ab19..96c2fbde29f9 100644
--- a/pkgs/by-name/dn/dnspeep/package.nix
+++ b/pkgs/by-name/dn/dnspeep/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "dnspeep";
     homepage = "https://github.com/jvns/dnspeep";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix
index 422da13b90ba..cb2c9d252d91 100644
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnsproxy";
-  version = "0.76.1";
+  version = "0.77.0";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "dnsproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XbFa0KN5RYcdjXHKSnSs0ba+9YDFGZN/DafV4gOSow0=";
+    hash = "sha256-xq/lhwGyVvhKFQqwgtdomi/pZyrTShI60Sz/fEplEIw=";
   };
 
-  vendorHash = "sha256-87WXRBzV7ROsWAhtS8vcpvj4x1yIcFDaEje8inAqwoo=";
+  vendorHash = "sha256-Ti+dfz9f8xXpTmmVIUAuheBQzNnYUJ2QIb0IWotNzsA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix
index 1d55fd10c4f5..2a3a879ceda8 100644
--- a/pkgs/by-name/do/do-agent/package.nix
+++ b/pkgs/by-name/do/do-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "do-agent";
-  version = "3.18.4";
+  version = "3.18.5";
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
     rev = version;
-    sha256 = "sha256-Pn53zNp3D0NcEQqfiv4ZceLT2Pgvz7oZYZAhk2D1SCc=";
+    sha256 = "sha256-Wc0VqBiIAQGtORdm0paAm9vnbThc+5seHXmpnYcyNh8=";
   };
 
   ldflags = [
diff --git a/pkgs/by-name/do/docfx/package.nix b/pkgs/by-name/do/docfx/package.nix
index e1d14f4f4f61..c54ab12aabf3 100644
--- a/pkgs/by-name/do/docfx/package.nix
+++ b/pkgs/by-name/do/docfx/package.nix
@@ -6,12 +6,12 @@
 
 buildDotnetGlobalTool {
   pname = "docfx";
-  version = "2.78.3";
+  version = "2.78.4";
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
-  nugetHash = "sha256-hLb6OmxqXOOxFaq/N+aZ0sAzEYjU0giX3c1SWQtKDbs=";
+  nugetHash = "sha256-VvrKQjOnQ7RGp1hP+Bldi7CaM6qpfp4InB5rESISqEg=";
 
   meta = {
     description = "Build your technical documentation site with docfx, with landing pages, markdown, API reference docs for .NET, REST API and more";
diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix
index c08d016dfcc2..c0d8db509963 100644
--- a/pkgs/by-name/do/docker-language-server/package.nix
+++ b/pkgs/by-name/do/docker-language-server/package.nix
@@ -4,20 +4,21 @@
   buildGoModule,
   docker,
   gotestsum,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "docker-language-server";
-  version = "0.16.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-language-server";
-    tag = "v${version}";
-    hash = "sha256-P3DwlCjQllFtf05ssXYNraQFGEEzChSE5eJvcODdF6Q=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-OSAySCTK2temrVxmkRnrl5YWVbmkp8DRlXFVxTzEW3Q=";
   };
 
-  vendorHash = "sha256-xvRHxi7aem88mrmdAmSyRNtBUSZD4rjUut2VjPeoejg=";
+  vendorHash = "sha256-ztA+/4l180UKTKrsqTyysDcD4oQSDgnBYUaiKDF6LvI=";
 
   nativeCheckInputs = [
     docker
@@ -26,22 +27,39 @@ buildGoModule rec {
 
   checkPhase = ''
     runHook preCheck
-    gotestsum -- $(go list ./... | grep -vE "e2e-tests|/buildkit$|/scout$") -timeout 30s -skip "TestCollectDiagnostics"
-    go test $(go list ./... | grep e2e-tests) -timeout 120s -skip "TestPublishDiagnostics|TestHover"
+
+    # disable some tests because of sandbox
+    excludedPackages="e2e-tests|/buildkit$|/scout$"
+    packages=$(go list ./... | grep -vE "$excludedPackages")
+
+    gotestsum -- $packages \
+      -timeout 30s \
+      -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint"
+
+    go test ./e2e-tests/... \
+      -timeout 120s \
+      -skip "TestPublishDiagnostics|TestHover"
+
     runHook postCheck
   '';
 
   ldflags = [
     "-s"
-    "-w"
-    "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${version}'"
+    "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${finalAttrs.version}'"
   ];
 
-  meta = with lib; {
-    homepage = "https://github.com/docker/docker-language-server";
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  meta = {
     description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)";
+    homepage = "https://github.com/docker/docker-language-server";
+    changelog = "https://github.com/docker/docker-language-server/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "docker-language-server";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ baongoc124 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ baongoc124 ];
   };
-}
+})
diff --git a/pkgs/by-name/do/dockerfile-language-server/package.nix b/pkgs/by-name/do/dockerfile-language-server/package.nix
index 4508fd42739c..660d02da0028 100644
--- a/pkgs/by-name/do/dockerfile-language-server/package.nix
+++ b/pkgs/by-name/do/dockerfile-language-server/package.nix
@@ -6,20 +6,20 @@
 
 buildNpmPackage rec {
   pname = "dockerfile-language-server";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "rcjsuen";
     repo = "dockerfile-language-server";
     tag = "v${version}";
-    hash = "sha256-oPU9XVxD9GbXMWkeGKncriFi1oP3YlkWnjxzltaz/iU=";
+    hash = "sha256-olgOUbVHHj9vD7upswqVJYBRIRb+kg6uXC2y5shnM+g=";
   };
 
   preBuild = ''
     npm run prepublishOnly
   '';
 
-  npmDepsHash = "sha256-p5BBKoq+ANR8z4YWsjmKaNqkyQGETwG5OmdapasLk+c=";
+  npmDepsHash = "sha256-cJ11l2NF/sCzPw/eQNFon5oKRM+KPoy4lxLz0yivHTo=";
 
   meta = {
     changelog = "https://github.com/rcjsuen/dockerfile-language-server/blob/${src.tag}/CHANGELOG.md";
diff --git a/pkgs/by-name/do/dockerfmt/package.nix b/pkgs/by-name/do/dockerfmt/package.nix
index a07d22af7c8a..98bbbfa00381 100644
--- a/pkgs/by-name/do/dockerfmt/package.nix
+++ b/pkgs/by-name/do/dockerfmt/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dockerfmt";
-  version = "0.3.7";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "reteps";
     repo = "dockerfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cNxPe0LOZyUxyw43fmTQeoxvXcT9K+not/3SvChBSx4=";
+    hash = "sha256-eTsYL2UAVW2M1aQGc5X1gT5cXpXKgshLmN+U5Qro/Qw=";
   };
 
   vendorHash = "sha256-fLGgvAxSAiVSrsnF7r7EpPKCOOD9jzUsXxVQNWjYq80=";
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
index 9828b2ec5918..8e78e0fba4a2 100644
--- a/pkgs/by-name/do/doctave/package.nix
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/doctave/doctave";
     changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "doctave";
   };
 }
diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 590252b0fdad..d9d8769f102b 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [
+    # One of the examples tests shared library support
+    # and fails linking.
+    "-DDOCTEST_WITH_TESTS=OFF"
+  ];
+
   doCheck = true;
 
   # Fix the build with LLVM 21 / GCC 15.
diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index b7108cc4109f..869ce5f633a0 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.145.0";
+  version = "1.147.0";
 
   vendorHash = null;
 
@@ -42,7 +42,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     tag = "v${version}";
-    hash = "sha256-JeIpx+i1JDVfJqCKTZMTJ7rDMGO4yA/eR56C3qr08zg=";
+    hash = "sha256-Z7oI35JYM4kVYAu9rspOgj6Cec9R7toUoMxgogkkYzk=";
   };
 
   meta = {
diff --git a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
index d986566bde4f..00dcc3c02424 100644
--- a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
+++ b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
@@ -1,5 +1,5 @@
-{ runCommandNoCC, doctoc }:
-runCommandNoCC "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } ''
+{ runCommand, doctoc }:
+runCommand "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } ''
   cp ${./input.md} ./target.md && chmod +w ./target.md
   doctoc ./target.md
 
diff --git a/pkgs/by-name/do/documenso/package-lock.json.patch b/pkgs/by-name/do/documenso/package-lock.json.patch
new file mode 100644
index 000000000000..875cba7457ad
--- /dev/null
+++ b/pkgs/by-name/do/documenso/package-lock.json.patch
@@ -0,0 +1,789 @@
+diff --git a/package-lock.json b/package-lock.json
+index 1a647e8..d44033c 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -16,7 +16,6 @@
+         "@documenso/prisma": "^0.0.0",
+         "@lingui/conf": "^5.2.0",
+         "@lingui/core": "^5.2.0",
+-        "inngest-cli": "^0.29.1",
+         "luxon": "^3.5.0",
+         "mupdf": "^1.0.0",
+         "react": "^18",
+@@ -41,7 +40,7 @@
+         "prisma-extension-kysely": "^3.0.0",
+         "prisma-kysely": "^1.8.0",
+         "rimraf": "^5.0.1",
+-        "turbo": "^1.9.3",
++        "turbo": "^2.5.8",
+         "vite": "^6.3.5"
+       },
+       "engines": {
+@@ -13223,15 +13222,6 @@
+         "node": ">=0.4.0"
+       }
+     },
+-    "node_modules/adm-zip": {
+-      "version": "0.5.16",
+-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz",
+-      "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">=12.0"
+-      }
+-    },
+     "node_modules/agent-base": {
+       "version": "7.1.3",
+       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+@@ -14705,6 +14695,7 @@
+       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+       "license": "ISC",
++      "optional": true,
+       "engines": {
+         "node": ">=10"
+       }
+@@ -19315,6 +19306,7 @@
+       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "minipass": "^3.0.0"
+       },
+@@ -19327,6 +19319,7 @@
+       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "yallist": "^4.0.0"
+       },
+@@ -19338,7 +19331,8 @@
+       "version": "4.0.0",
+       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "license": "ISC"
++      "license": "ISC",
++      "optional": true
+     },
+     "node_modules/fs.realpath": {
+       "version": "1.0.0",
+@@ -21227,23 +21221,6 @@
+         }
+       }
+     },
+-    "node_modules/inngest-cli": {
+-      "version": "0.29.9",
+-      "resolved": "https://registry.npmjs.org/inngest-cli/-/inngest-cli-0.29.9.tgz",
+-      "integrity": "sha512-H02T7DGG53WV38RswpWmz7JsZXajx+uXDi1Zgq/ON5a+fNQi4hVRkxfoiZLngNeROVVXlokMTBwOShdsrnr7WA==",
+-      "hasInstallScript": true,
+-      "license": "SEE LICENSE IN LICENSE.md",
+-      "dependencies": {
+-        "adm-zip": "^0.5.10",
+-        "debug": "^4.3.4",
+-        "node-fetch": "2.6.7",
+-        "tar": "6.2.1"
+-      },
+-      "bin": {
+-        "inngest": "bin/inngest",
+-        "inngest-cli": "bin/inngest"
+-      }
+-    },
+     "node_modules/inngest/node_modules/@opentelemetry/api": {
+       "version": "1.9.0",
+       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
+@@ -25470,6 +25447,7 @@
+       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+         "minipass": "^3.0.0",
+         "yallist": "^4.0.0"
+@@ -25483,6 +25461,7 @@
+       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "yallist": "^4.0.0"
+       },
+@@ -25494,13 +25473,15 @@
+       "version": "4.0.0",
+       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "license": "ISC"
++      "license": "ISC",
++      "optional": true
+     },
+     "node_modules/mkdirp": {
+       "version": "1.0.4",
+       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+       "license": "MIT",
++      "optional": true,
+       "bin": {
+         "mkdirp": "bin/cmd.js"
+       },
+@@ -32780,6 +32761,7 @@
+       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+       "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "chownr": "^2.0.0",
+         "fs-minipass": "^2.0.0",
+@@ -32838,6 +32820,7 @@
+       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+       "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+       "license": "ISC",
++      "optional": true,
+       "engines": {
+         "node": ">=8"
+       }
+@@ -32846,7 +32829,8 @@
+       "version": "4.0.0",
+       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "license": "ISC"
++      "license": "ISC",
++      "optional": true
+     },
+     "node_modules/temp-dir": {
+       "version": "2.0.0",
+@@ -34050,102 +34034,102 @@
+       }
+     },
+     "node_modules/turbo": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.13.4.tgz",
+-      "integrity": "sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo/-/turbo-2.5.8.tgz",
++      "integrity": "sha512-5c9Fdsr9qfpT3hA0EyYSFRZj1dVVsb6KIWubA9JBYZ/9ZEAijgUEae0BBR/Xl/wekt4w65/lYLTFaP3JmwSO8w==",
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "bin": {
+         "turbo": "bin/turbo"
+       },
+       "optionalDependencies": {
+-        "turbo-darwin-64": "1.13.4",
+-        "turbo-darwin-arm64": "1.13.4",
+-        "turbo-linux-64": "1.13.4",
+-        "turbo-linux-arm64": "1.13.4",
+-        "turbo-windows-64": "1.13.4",
+-        "turbo-windows-arm64": "1.13.4"
++        "turbo-darwin-64": "2.5.8",
++        "turbo-darwin-arm64": "2.5.8",
++        "turbo-linux-64": "2.5.8",
++        "turbo-linux-arm64": "2.5.8",
++        "turbo-windows-64": "2.5.8",
++        "turbo-windows-arm64": "2.5.8"
+       }
+     },
+     "node_modules/turbo-darwin-64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.13.4.tgz",
+-      "integrity": "sha512-A0eKd73R7CGnRinTiS7txkMElg+R5rKFp9HV7baDiEL4xTG1FIg/56Vm7A5RVgg8UNgG2qNnrfatJtb+dRmNdw==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-2.5.8.tgz",
++      "integrity": "sha512-Dh5bCACiHO8rUXZLpKw+m3FiHtAp2CkanSyJre+SInEvEr5kIxjGvCK/8MFX8SFRjQuhjtvpIvYYZJB4AGCxNQ==",
+       "cpu": [
+         "x64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "darwin"
+       ]
+     },
+     "node_modules/turbo-darwin-arm64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.4.tgz",
+-      "integrity": "sha512-eG769Q0NF6/Vyjsr3mKCnkG/eW6dKMBZk6dxWOdrHfrg6QgfkBUk0WUUujzdtVPiUIvsh4l46vQrNVd9EOtbyA==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-2.5.8.tgz",
++      "integrity": "sha512-f1H/tQC9px7+hmXn6Kx/w8Jd/FneIUnvLlcI/7RGHunxfOkKJKvsoiNzySkoHQ8uq1pJnhJ0xNGTlYM48ZaJOQ==",
+       "cpu": [
+         "arm64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "darwin"
+       ]
+     },
+     "node_modules/turbo-linux-64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.13.4.tgz",
+-      "integrity": "sha512-Bq0JphDeNw3XEi+Xb/e4xoKhs1DHN7OoLVUbTIQz+gazYjigVZvtwCvgrZI7eW9Xo1eOXM2zw2u1DGLLUfmGkQ==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-2.5.8.tgz",
++      "integrity": "sha512-hMyvc7w7yadBlZBGl/bnR6O+dJTx3XkTeyTTH4zEjERO6ChEs0SrN8jTFj1lueNXKIHh1SnALmy6VctKMGnWfw==",
+       "cpu": [
+         "x64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "linux"
+       ]
+     },
+     "node_modules/turbo-linux-arm64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.13.4.tgz",
+-      "integrity": "sha512-BJcXw1DDiHO/okYbaNdcWN6szjXyHWx9d460v6fCHY65G8CyqGU3y2uUTPK89o8lq/b2C8NK0yZD+Vp0f9VoIg==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-2.5.8.tgz",
++      "integrity": "sha512-LQELGa7bAqV2f+3rTMRPnj5G/OHAe2U+0N9BwsZvfMvHSUbsQ3bBMWdSQaYNicok7wOZcHjz2TkESn1hYK6xIQ==",
+       "cpu": [
+         "arm64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "linux"
+       ]
+     },
+     "node_modules/turbo-windows-64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.13.4.tgz",
+-      "integrity": "sha512-OFFhXHOFLN7A78vD/dlVuuSSVEB3s9ZBj18Tm1hk3aW1HTWTuAw0ReN6ZNlVObZUHvGy8d57OAGGxf2bT3etQw==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-2.5.8.tgz",
++      "integrity": "sha512-3YdcaW34TrN1AWwqgYL9gUqmZsMT4T7g8Y5Azz+uwwEJW+4sgcJkIi9pYFyU4ZBSjBvkfuPZkGgfStir5BBDJQ==",
+       "cpu": [
+         "x64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "win32"
+       ]
+     },
+     "node_modules/turbo-windows-arm64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.13.4.tgz",
+-      "integrity": "sha512-u5A+VOKHswJJmJ8o8rcilBfU5U3Y1TTAfP9wX8bFh8teYF1ghP0EhtMRLjhtp6RPa+XCxHHVA2CiC3gbh5eg5g==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-2.5.8.tgz",
++      "integrity": "sha512-eFC5XzLmgXJfnAK3UMTmVECCwuBcORrWdewoiXBnUm934DY6QN8YowC/srhNnROMpaKaqNeRpoB5FxCww3eteQ==",
+       "cpu": [
+         "arm64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "win32"
+@@ -36114,7 +36098,9 @@
+       },
+       "engines": {
+         "node": ">=18"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz",
++      "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test": {
+       "version": "2.0.12",
+@@ -36136,25 +36122,33 @@
+       },
+       "engines": {
+         "node": ">=16"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.12.tgz",
++      "integrity": "sha512-U6QiS5qsz+DN5RfJJrkAXdooxMDnLZ+n5nR8kaX//ZH19SilF6b58Z3zM9zTfrNIkJepzauHo4RceSgvgUSX9w=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/bluebird": {
+       "version": "3.7.2",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
++      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/check-more-types": {
+       "version": "2.24.0",
+       "license": "MIT",
+       "engines": {
+         "node": ">= 0.8.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
++      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/lazy-ass": {
+       "version": "1.6.0",
+       "license": "MIT",
+       "engines": {
+         "node": "> 0.8"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
++      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree": {
+       "version": "1.2.0",
+@@ -36167,7 +36161,9 @@
+       },
+       "engines": {
+         "node": ">= 0.10"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
++      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream": {
+       "version": "3.3.4",
+@@ -36180,18 +36176,26 @@
+         "split": "0.3",
+         "stream-combiner": "~0.0.4",
+         "through": "~2.3.1"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
++      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/duplexer": {
+       "version": "0.1.2",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
++      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/from": {
+       "version": "0.1.7",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
++      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/map-stream": {
+-      "version": "0.1.0"
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
++      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/pause-stream": {
+       "version": "0.0.11",
+@@ -36201,7 +36205,9 @@
+       ],
+       "dependencies": {
+         "through": "~2.3"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
++      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/split": {
+       "version": "0.3.3",
+@@ -36211,14 +36217,18 @@
+       },
+       "engines": {
+         "node": "*"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
++      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/stream-combiner": {
+       "version": "0.0.4",
+       "license": "MIT",
+       "dependencies": {
+         "duplexer": "~0.1.1"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
++      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on": {
+       "version": "8.0.3",
+@@ -36235,7 +36245,9 @@
+       },
+       "engines": {
+         "node": ">=12.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.3.tgz",
++      "integrity": "sha512-nQFqAFzZDeRxsu7S3C7LbuxslHhk+gnJZHyethuGKAn2IVleIbTB9I3vJSQiSR+DifUqmdzfPMoMPJfLqMF2vw=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi": {
+       "version": "17.13.3",
+@@ -36246,40 +36258,54 @@
+         "@sideway/address": "^4.1.5",
+         "@sideway/formula": "^3.0.1",
+         "@sideway/pinpoint": "^2.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
++      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/hoek": {
+       "version": "9.3.0",
+-      "license": "BSD-3-Clause"
++      "license": "BSD-3-Clause",
++      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
++      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/topo": {
+       "version": "5.1.0",
+       "license": "BSD-3-Clause",
+       "dependencies": {
+         "@hapi/hoek": "^9.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
++      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/address": {
+       "version": "4.1.5",
+       "license": "BSD-3-Clause",
+       "dependencies": {
+         "@hapi/hoek": "^9.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
++      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/formula": {
+       "version": "3.0.1",
+-      "license": "BSD-3-Clause"
++      "license": "BSD-3-Clause",
++      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
++      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/pinpoint": {
+       "version": "2.0.0",
+-      "license": "BSD-3-Clause"
++      "license": "BSD-3-Clause",
++      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
++      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/rxjs": {
+       "version": "7.8.2",
+       "license": "Apache-2.0",
+       "dependencies": {
+         "tslib": "^2.1.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
++      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA=="
+     },
+     "packages/assets": {
+       "name": "@documenso/assets",
+@@ -36718,7 +36744,9 @@
+     },
+     "packages/signing/node_modules/ts-pattern": {
+       "version": "5.7.1",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.7.1.tgz",
++      "integrity": "sha512-EGs8PguQqAAUIcQfK4E9xdXxB6s2GK4sJfT/vcc9V1ELIvC4LH/zXu2t/5fajtv6oiRCxdv7BgtVK3vWgROxag=="
+     },
+     "packages/signing/node_modules/vitest": {
+       "version": "3.1.4",
+@@ -36787,7 +36815,9 @@
+         "jsdom": {
+           "optional": true
+         }
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
++      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/expect": {
+       "version": "3.1.4",
+@@ -36801,7 +36831,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
++      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/mocker": {
+       "version": "3.1.4",
+@@ -36826,7 +36858,9 @@
+         "vite": {
+           "optional": true
+         }
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
++      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/mocker/node_modules/estree-walker": {
+       "version": "3.0.3",
+@@ -36834,7 +36868,9 @@
+       "license": "MIT",
+       "dependencies": {
+         "@types/estree": "^1.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
++      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/pretty-format": {
+       "version": "3.1.4",
+@@ -36845,7 +36881,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
++      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/runner": {
+       "version": "3.1.4",
+@@ -36857,7 +36895,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
++      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/snapshot": {
+       "version": "3.1.4",
+@@ -36870,7 +36910,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
++      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/spy": {
+       "version": "3.1.4",
+@@ -36881,7 +36923,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
++      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/spy/node_modules/tinyspy": {
+       "version": "3.0.2",
+@@ -36889,7 +36933,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=14.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
++      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/utils": {
+       "version": "3.1.4",
+@@ -36902,12 +36948,16 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
++      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/utils/node_modules/loupe": {
+       "version": "3.1.3",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
++      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai": {
+       "version": "5.2.0",
+@@ -36922,7 +36972,9 @@
+       },
+       "engines": {
+         "node": ">=12"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
++      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/assertion-error": {
+       "version": "2.0.1",
+@@ -36930,7 +36982,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=12"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
++      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/check-error": {
+       "version": "2.1.1",
+@@ -36938,7 +36992,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">= 16"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
++      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/deep-eql": {
+       "version": "5.0.2",
+@@ -36946,12 +37002,16 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=6"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
++      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/loupe": {
+       "version": "3.1.3",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
++      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/pathval": {
+       "version": "2.0.0",
+@@ -36959,7 +37019,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">= 14.16"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
++      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/expect-type": {
+       "version": "1.2.1",
+@@ -36967,27 +37029,37 @@
+       "license": "Apache-2.0",
+       "engines": {
+         "node": ">=12.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz",
++      "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/pathe": {
+       "version": "2.0.3",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
++      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/std-env": {
+       "version": "3.9.0",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz",
++      "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinybench": {
+       "version": "2.9.0",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
++      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinyexec": {
+       "version": "0.3.2",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
++      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinypool": {
+       "version": "1.0.2",
+@@ -36995,7 +37067,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": "^18.0.0 || >=20.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
++      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinyrainbow": {
+       "version": "2.0.0",
+@@ -37003,7 +37077,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=14.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
++      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/vite-node": {
+       "version": "3.1.4",
+@@ -37024,7 +37100,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
++      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/why-is-node-running": {
+       "version": "2.3.0",
+@@ -37039,17 +37117,23 @@
+       },
+       "engines": {
+         "node": ">=8"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
++      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/siginfo": {
+       "version": "2.0.0",
+       "dev": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
++      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/stackback": {
+       "version": "0.0.2",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
++      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="
+     },
+     "packages/tailwind-config": {
+       "name": "@documenso/tailwind-config",
+@@ -37171,4 +37255,4 @@
+       "license": "MIT"
+     }
+   }
+-}
++}
+\ No newline at end of file
diff --git a/pkgs/by-name/do/documenso/package.json.patch b/pkgs/by-name/do/documenso/package.json.patch
new file mode 100644
index 000000000000..a8a72575e1ad
--- /dev/null
+++ b/pkgs/by-name/do/documenso/package.json.patch
@@ -0,0 +1,40 @@
+diff --git a/package.json b/package.json
+index 1ff8701..e337979 100644
+--- a/package.json
++++ b/package.json
+@@ -44,22 +44,22 @@
+     "@commitlint/cli": "^17.7.1",
+     "@commitlint/config-conventional": "^17.7.0",
+     "@lingui/cli": "^5.2.0",
++    "@prisma/client": "^6.8.2",
+     "dotenv": "^16.5.0",
+     "dotenv-cli": "^8.0.0",
+     "eslint": "^8.40.0",
+     "eslint-config-custom": "*",
+     "husky": "^9.0.11",
+     "lint-staged": "^15.2.2",
++    "nodemailer": "^6.10.1",
+     "playwright": "1.52.0",
+     "prettier": "^3.3.3",
+-    "rimraf": "^5.0.1",
+-    "turbo": "^1.9.3",
+-    "vite": "^6.3.5",
+-    "@prisma/client": "^6.8.2",
+     "prisma": "^6.8.2",
+     "prisma-extension-kysely": "^3.0.0",
+     "prisma-kysely": "^1.8.0",
+-    "nodemailer": "^6.10.1"
++    "rimraf": "^5.0.1",
++    "turbo": "^2.5.8",
++    "vite": "^6.3.5"
+   },
+   "name": "@documenso/root",
+   "workspaces": [
+@@ -71,7 +71,6 @@
+     "@documenso/prisma": "^0.0.0",
+     "@lingui/conf": "^5.2.0",
+     "@lingui/core": "^5.2.0",
+-    "inngest-cli": "^0.29.1",
+     "luxon": "^3.5.0",
+     "mupdf": "^1.0.0",
+     "react": "^18",
diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix
index 71b15e2b29b8..f00781bc2c94 100644
--- a/pkgs/by-name/do/documenso/package.nix
+++ b/pkgs/by-name/do/documenso/package.nix
@@ -1,50 +1,119 @@
 {
   lib,
+  nodejs,
+  node-gyp,
+  node-pre-gyp,
+  pixman,
   fetchFromGitHub,
   buildNpmPackage,
   prisma,
-  nix-update-script,
+  prisma-engines,
+  vips,
+  pkg-config,
+  cairo,
+  pango,
+  bash,
+  openssl,
 }:
 let
-  version = "0.9";
+  pname = "documenso";
+  version = "1.12.6";
 in
 buildNpmPackage {
-  pname = "documenso";
-  inherit version;
+
+  inherit version pname;
 
   src = fetchFromGitHub {
     owner = "documenso";
     repo = "documenso";
     rev = "v${version}";
-    hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo=";
+    hash = "sha256-1TKjsOKJkv3COFgsE4tPAymI0MdeT+T8HiNgnoWHlAY=";
   };
 
-  nativeBuildInputs = [ prisma ];
+  npmDepsHash = "sha256-ZddRSBDasa3mMAS2dqXgXRMOc1nvspdXsuTZ7c+einw=";
 
-  preBuild = ''
-    # somehow for linux, npm is not finding the prisma package with the
-    # packages installed with the lockfile.
-    # This generates a prisma version incompatibility warning and is a kludge
-    # until the upstream package-lock is modified.
-    prisma generate
+  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+
+  env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
+  env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines}/bin/query-engine";
+  env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines}/bin/schema-engine";
+  env.TURBO_NO_UPDATE_NOTIFIER = "true";
+  env.TURBO_FORCE = "true";
+  env.TURBO_REMOTE_CACHE_ENABLED = "false";
+
+  nativeBuildInputs = [
+    pkg-config
+    vips
+    node-gyp
+  ];
+
+  buildInputs = [
+    node-pre-gyp
+    node-gyp
+    pixman
+    cairo
+    pango
+    vips
+  ];
+
+  patches = [
+    ./package-lock.json.patch
+    ./package.json.patch
+    ./turbo.json.patch
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    patchShebangs apps/remix/.bin/build.sh
+    npm exec turbo -- telemetry disable
+    npm exec turbo -- build --filter=@documenso/remix
+
+    runHook postBuild
   '';
 
-  npmDepsHash = "sha256-+JbvFMi8xoyxkuL9k96K1Vq0neciCGkkyZUPd15ES2E=";
-
   installPhase = ''
-    runHook preInstall
+          runHook preInstall
 
-    mkdir $out
-    cp -r node_modules $out/
-    cp package-lock.json $out
-    cp apps/web/package.json $out
-    cp -r apps/web/public $out/
-    cp -r apps/web/.next $out/
+          mkdir -p $out/bin
+          cp -r . $out/
 
-    runHook postInstall
+          cat > $out/bin/${pname} <<EOF
+    #!${bash}/bin/bash
+    export PKG_CONFIG_PATH=${openssl.dev}/lib/pkgconfig;
+    export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines}/lib/libquery_engine.node
+    export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines}/bin/query-engine
+    export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines}
+    cd $out/apps/remix
+    ${prisma}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
+    ${nodejs}/bin/node build/server/main.js
+    EOF
+          chmod +x $out/bin/${pname}
+
+          runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
+  # cleanup dangling symlinks for workspaces
+  preFixup = ''
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/assets
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/lib
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/documentation
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/prettier-config
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/signing
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/ui
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/eslint-config
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/tailwind-config
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/email
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/prisma
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/remix
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/openpage-api
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/api
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/tsconfig
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/app-tests
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/trpc
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/ee
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/auth
+  '';
 
   meta = with lib; {
     description = "Open Source DocuSign Alternative";
@@ -52,5 +121,6 @@ buildNpmPackage {
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ happysalada ];
     platforms = platforms.unix;
+    mainProgram = pname;
   };
 }
diff --git a/pkgs/by-name/do/documenso/turbo.json.patch b/pkgs/by-name/do/documenso/turbo.json.patch
new file mode 100644
index 000000000000..ee30405f325d
--- /dev/null
+++ b/pkgs/by-name/do/documenso/turbo.json.patch
@@ -0,0 +1,104 @@
+diff --git a/turbo.json b/turbo.json
+index d767b46..b2d1ad3 100644
+--- a/turbo.json
++++ b/turbo.json
+@@ -1,41 +1,8 @@
+ {
+   "$schema": "https://turbo.build/schema.json",
+-  "pipeline": {
+-    "build": {
+-      "dependsOn": ["prebuild", "^build"],
+-      "outputs": [".next/**", "!.next/cache/**"]
+-    },
+-    "prebuild": {
+-      "cache": false,
+-      "dependsOn": ["^prebuild"]
+-    },
+-    "lint": {
+-      "cache": false
+-    },
+-    "lint:fix": {
+-      "cache": false
+-    },
+-    "clean": {
+-      "cache": false
+-    },
+-    "dev": {
+-      "cache": false,
+-      "persistent": true
+-    },
+-    "start": {
+-      "dependsOn": ["^build"],
+-      "cache": false,
+-      "persistent": true
+-    },
+-    "dev:test": {
+-      "cache": false
+-    },
+-    "test:e2e": {
+-      "dependsOn": ["^build"],
+-      "cache": false
+-    }
+-  },
+-  "globalDependencies": ["**/.env.*local"],
++  "globalDependencies": [
++    "**/.env.*local"
++  ],
+   "globalEnv": [
+     "APP_VERSION",
+     "NEXT_PRIVATE_ENCRYPTION_KEY",
+@@ -119,5 +86,53 @@
+     "E2E_TEST_AUTHENTICATE_USERNAME",
+     "E2E_TEST_AUTHENTICATE_USER_EMAIL",
+     "E2E_TEST_AUTHENTICATE_USER_PASSWORD"
+-  ]
++  ],
++  "tasks": {
++    "build": {
++      "dependsOn": [
++        "prebuild",
++        "^build"
++      ],
++      "outputs": [
++        ".next/**",
++        "!.next/cache/**"
++      ]
++    },
++    "prebuild": {
++      "cache": false,
++      "dependsOn": [
++        "^prebuild"
++      ]
++    },
++    "lint": {
++      "cache": false
++    },
++    "lint:fix": {
++      "cache": false
++    },
++    "clean": {
++      "cache": false
++    },
++    "dev": {
++      "cache": false,
++      "persistent": true
++    },
++    "start": {
++      "dependsOn": [
++        "^build"
++      ],
++      "cache": false,
++      "persistent": true
++    },
++    "dev:test": {
++      "cache": false
++    },
++    "test:e2e": {
++      "dependsOn": [
++        "^build"
++      ],
++      "cache": false
++    }
++  },
++  "envMode": "loose"
+ }
diff --git a/pkgs/by-name/do/documenso/update-from-upstream.sh b/pkgs/by-name/do/documenso/update-from-upstream.sh
new file mode 100755
index 000000000000..315d05507e12
--- /dev/null
+++ b/pkgs/by-name/do/documenso/update-from-upstream.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+CMDS=();DESC=();NARGS=$#;ARG1=$1;make_command(){ CMDS+=($1);DESC+=("$2");};usage(){ printf "\nUsage: %s [command]\n\nCommands:\n" $0;line="              ";for((i=0;i<=$(( ${#CMDS[*]} -1));i++));do printf "  %s %s ${DESC[$i]}\n" ${CMDS[$i]} "${line:${#CMDS[$i]}}";done;echo;};runme(){ if test $NARGS -eq 1;then eval "$ARG1"||usage;else usage;fi;}
+
+version="1.12.6";
+
+make_command "about" "About this update script."
+about(){
+  echo "Documenso upstream needs some fixing before it can be build in a pure sandbox"
+  echo "environment. This script does the following:"
+  echo "  - download documenso version ${version} from github in a temp dir"
+  echo "  - uninstall inngest-cli which runs a binary download script at build time."
+  echo "  - upgrade turborepo as the older upstream version 'phones home' at build time."
+  echo "  - update the turbo.json to make it work with preset environment vars"
+  echo "  - fix the lockfile by generating missing hash signatures"
+  echo "  - create patches from changed json files"
+}
+
+make_command "update" "Get upstream and prepatch."
+update(){
+
+  echo "updating documenso for nixpkgs packaging"
+  current_nixpkgs_dir=${PWD}
+  temptarfile=/tmp/documenso-v${version}.tar.gz
+  tempdir=/tmp/documenso-v${version}
+
+  if [ ! -f "$temptarfile" ]; then
+    echo "Tarball does not exist; downloading from github.";
+    wget https://github.com/documenso/documenso/archive/refs/tags/v${version}.tar.gz -O $temptarfile
+  fi
+
+  rm -Rf $tempdir
+  mkdir $tempdir
+  tar -xzvf /tmp/documenso-v${version}.tar.gz -C $tempdir --strip-components=1
+  cd $tempdir
+  git init
+  git add package-lock.json package.json turbo.json
+  git commit -m "commit4diff" package-lock.json package.json turbo.json
+
+  echo "rm inngest-cli from root"
+  npm uninstall inngest-cli
+
+  npx @turbo/codemod migrate . --force
+
+  jq '.envMode="loose"' turbo.json > turbo-patched.json
+  cp turbo-patched.json turbo.json
+
+  echo "fix package-lock.json hashes"
+  nix run nixpkgs#npm-lockfile-fix -- package-lock.json
+
+  git diff package-lock.json > $current_nixpkgs_dir/package-lock.json.patch
+  git diff package.json > $current_nixpkgs_dir/package.json.patch
+  git diff turbo.json > $current_nixpkgs_dir/turbo.json.patch
+}
+
+runme
diff --git a/pkgs/by-name/do/docuseal/Gemfile b/pkgs/by-name/do/docuseal/Gemfile
index 1cf7ca39e261..4ef1e77522b4 100644
--- a/pkgs/by-name/do/docuseal/Gemfile
+++ b/pkgs/by-name/do/docuseal/Gemfile
@@ -23,7 +23,9 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
+gem 'numo-narray'
 gem 'oj'
+gem 'onnxruntime'
 gem 'pagy'
 gem 'pg', require: false
 gem 'premailer-rails'
diff --git a/pkgs/by-name/do/docuseal/Gemfile.lock b/pkgs/by-name/do/docuseal/Gemfile.lock
index d62126380cc8..ac58cc1d1bb0 100644
--- a/pkgs/by-name/do/docuseal/Gemfile.lock
+++ b/pkgs/by-name/do/docuseal/Gemfile.lock
@@ -76,7 +76,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     annotaterb (4.14.0)
     arabic-letter-connector (0.1.1)
-    ast (2.4.2)
+    ast (2.4.3)
     aws-eventstream (1.3.0)
     aws-partitions (1.1027.0)
     aws-sdk-core (3.214.0)
@@ -289,10 +289,10 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.13.2)
+    json (2.15.0)
     jwt (2.9.3)
       base64
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -303,6 +303,7 @@ GEM
       letter_opener (~> 1.9)
       railties (>= 6.1)
       rexml
+    lint_roller (1.1.0)
     logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
@@ -350,17 +351,26 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
+    numo-narray (0.9.2.1)
     oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
+    onnxruntime (0.10.1)
+      ffi
+    onnxruntime (0.10.1-aarch64-linux)
+      ffi
+    onnxruntime (0.10.1-arm64-darwin)
+      ffi
+    onnxruntime (0.10.1-x86_64-linux)
+      ffi
     openssl (3.3.0)
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.3)
     package_json (0.1.0)
     pagy (9.3.3)
-    parallel (1.26.3)
-    parser (3.3.6.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
@@ -377,6 +387,7 @@ GEM
     pretender (0.5.0)
       actionpack (>= 6.1)
     prettyprint (0.2.0)
+    prism (1.5.1)
     pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -389,7 +400,7 @@ GEM
     puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.0)
+    rack (3.2.3)
     rack-proxy (0.7.7)
       rack
     rack-session (2.1.1)
@@ -442,7 +453,7 @@ GEM
       psych (>= 4.0.0)
     redis-client (0.23.0)
       connection_pool
-    regexp_parser (2.9.3)
+    regexp_parser (2.11.3)
     reline (0.6.2)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -479,18 +490,20 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.81.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -559,9 +572,9 @@ GEM
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (3.1.2)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uniform_notifier (1.16.0)
     uri (1.0.3)
     useragent (0.16.11)
@@ -624,7 +637,9 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
+  numo-narray
   oj
+  onnxruntime
   pagy
   pg
   premailer-rails
diff --git a/pkgs/by-name/do/docuseal/gemset.nix b/pkgs/by-name/do/docuseal/gemset.nix
index 79f90caa1cee..e53f3253f9a1 100644
--- a/pkgs/by-name/do/docuseal/gemset.nix
+++ b/pkgs/by-name/do/docuseal/gemset.nix
@@ -254,10 +254,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+      sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm";
       type = "gem";
     };
-    version = "2.4.2";
+    version = "2.4.3";
   };
   aws-eventstream = {
     groups = [ "default" ];
@@ -1427,10 +1427,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
+      sha256 = "0p5dafxjp6kqkf3yx737gz9lwpaljlkc1raynkvcn6yql68d895w";
       type = "gem";
     };
-    version = "2.13.2";
+    version = "2.15.0";
   };
   jwt = {
     dependencies = [ "base64" ];
@@ -1452,10 +1452,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.3";
+    version = "3.17.0.5";
   };
   launchy = {
     dependencies = [
@@ -1504,6 +1504,20 @@
     };
     version = "3.0.0";
   };
+  lint_roller = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
   logger = {
     groups = [
       "default"
@@ -1808,6 +1822,16 @@
     };
     version = "1.18.9";
   };
+  numo-narray = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1syw9bhkk0bnacadcpdbwvc66j1gi3qqgcvqv3zqh4myxr3npmzf";
+      type = "gem";
+    };
+    version = "0.9.2.1";
+  };
   oj = {
     dependencies = [
       "bigdecimal"
@@ -1822,6 +1846,17 @@
     };
     version = "3.16.11";
   };
+  onnxruntime = {
+    dependencies = [ "ffi" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0c8l82qff7vd6whh0ks1f72734gmghzm0h2hvy2gnnp7y8j7amhq";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
   openssl = {
     groups = [ "default" ];
     platforms = [ ];
@@ -1891,10 +1926,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
+    version = "1.27.0";
   };
   parser = {
     dependencies = [
@@ -1909,10 +1944,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fxw738al3qxa4s4ghqkxb908sav03i3h7xflawwmxzhqiyfdm15";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.6.0";
+    version = "3.3.9.0";
   };
   pg = {
     groups = [ "default" ];
@@ -1994,6 +2029,20 @@
     };
     version = "0.2.0";
   };
+  prism = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0d3i31npmlhmigcs1zlb9lksg7z7lv6nffams71wrz5rriv1n35l";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   pry = {
     dependencies = [
       "coderay"
@@ -2092,10 +2141,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04inzfa1psgl8mywgzaks31am1zh00lyc0mf3zb5jv399m8j3kbr";
+      sha256 = "0h9xr8ivrfr0i5f2n7czg74r3ri1pba8wb84bzr78iaqlqykg6i3";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.3";
   };
   rack-proxy = {
     dependencies = [ "rack" ];
@@ -2335,10 +2384,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0yb3iycaj3krvlnicijm99qxvfbrbi0pd81i2cpdhjc3xmbhcqjb";
+      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
       type = "gem";
     };
-    version = "2.9.3";
+    version = "2.11.3";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -2554,6 +2603,7 @@
     dependencies = [
       "json"
       "language_server-protocol"
+      "lint_roller"
       "parallel"
       "parser"
       "rainbow"
@@ -2569,13 +2619,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f2bj93f60757xyk7h3v0s7xz8d22lc9zlw88l2zd6rp1brv0bvn";
+      sha256 = "0d8n87wx2r8vkva5qi4m3hi4s9b6qhmzgw85qgv14hsa65prlaim";
       type = "gem";
     };
-    version = "1.69.2";
+    version = "1.81.1";
   };
   rubocop-ast = {
-    dependencies = [ "parser" ];
+    dependencies = [
+      "parser"
+      "prism"
+    ];
     groups = [
       "default"
       "development"
@@ -2584,10 +2637,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10604xc4bcji3ca43anlc89xwxb4wkzk69cia95x04zima4aq4wm";
+      sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr";
       type = "gem";
     };
-    version = "1.37.0";
+    version = "1.47.1";
   };
   rubocop-performance = {
     dependencies = [
@@ -2992,10 +3045,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lcmyip9rw4azsia1hb5srj2mgbdhrinc4113cs1w84qz1ndpm7x";
+      sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "3.2.0";
   };
   unicode-emoji = {
     groups = [
@@ -3006,10 +3059,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
+      sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9";
       type = "gem";
     };
-    version = "4.0.4";
+    version = "4.1.0";
   };
   uniform_notifier = {
     groups = [
diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix
index e161f5ea0708..c6869b24ed80 100644
--- a/pkgs/by-name/do/docuseal/package.nix
+++ b/pkgs/by-name/do/docuseal/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "docuseal";
-  version = "2.1.7";
+  version = "2.2.0";
 
   bundler = bundler.override { ruby = ruby_3_4; };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "docusealco";
     repo = "docuseal";
     tag = finalAttrs.version;
-    hash = "sha256-zNfxQPJjobYrx/YPGRn5QKwUd1VXetFqtBeII0wlmk4=";
+    hash = "sha256-QKGIcLdyIeYcHXA3TRv7PS9V2mok3Y8UOuqCdnCpNfM=";
     # https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333
     postFetch = "rm $out/db/schema.rb";
   };
diff --git a/pkgs/by-name/do/docuseal/update.sh b/pkgs/by-name/do/docuseal/update.sh
index fbb4561bf0a0..fe351f5d55a3 100755
--- a/pkgs/by-name/do/docuseal/update.sh
+++ b/pkgs/by-name/do/docuseal/update.sh
@@ -2,6 +2,7 @@
 #!nix-shell -i bash -p curl jq bundix ruby_3_4 prefetch-yarn-deps nix-update nixfmt
 
 set -eu -o pipefail
+set -x
 dir="$(dirname "$(readlink -f "$0")")"
 
 current=$(nix --extra-experimental-features nix-command eval --raw -f . docuseal.src.tag)
diff --git a/pkgs/by-name/do/docuum/package.nix b/pkgs/by-name/do/docuum/package.nix
index 3adc0260d43a..74bcfca4f13b 100644
--- a/pkgs/by-name/do/docuum/package.nix
+++ b/pkgs/by-name/do/docuum/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "docuum";
-  version = "0.25.0";
+  version = "0.25.1";
 
   src = fetchFromGitHub {
     owner = "stepchowfun";
     repo = "docuum";
     rev = "v${version}";
-    hash = "sha256-nWd6h39jU1eZWPFMxhxActsmrs9k0TDMlealuzTa+o0=";
+    hash = "sha256-fc+qEDYQGRxOSfFng3/K3xYWb8mKTuuKWanQS+/UIMo=";
   };
 
-  cargoHash = "sha256-ce8mthEWvZ+U2+lU3gGrq1YBzbkiqUGJV5JUsZ+HhBg=";
+  cargoHash = "sha256-IryniHpSJDxjW6FRqTILKzp6XrTHxJ19BiYqRYIHnGo=";
 
   checkFlags = [
     # fails, no idea why
diff --git a/pkgs/by-name/do/dogdns/package.nix b/pkgs/by-name/do/dogdns/package.nix
index 1bffaed1b881..0b56d02ad79e 100644
--- a/pkgs/by-name/do/dogdns/package.nix
+++ b/pkgs/by-name/do/dogdns/package.nix
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
     description = "Command-line DNS client";
     homepage = "https://dns.lookup.dog";
     license = licenses.eupl12;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "dog";
   };
 }
diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix
index 9524664729a1..a9619332d1c4 100644
--- a/pkgs/by-name/do/dokieli/package.nix
+++ b/pkgs/by-name/do/dokieli/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dokieli";
-  version = "0-unstable-2025-09-10";
+  version = "0-unstable-2025-10-31";
 
   src = fetchFromGitHub {
     owner = "dokieli";
     repo = "dokieli";
-    rev = "7c9f3d9f02d8725822594009ffa1742db44fc857";
-    hash = "sha256-ah7Qct0MHRsH5bktyat/Q5mxJKACJl/ci2IVOl5mzvE=";
+    rev = "491ba0313e7890443ea9efefe83529821ca5689f";
+    hash = "sha256-7ZY2s/dC6+ITxnoaOWP8VnB1hYwaVfxMTWh6OlqOuc4=";
   };
 
   missingHashes = ./missing-hashes.json;
diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix
index 383b7132bb81..16a5b11a8364 100644
--- a/pkgs/by-name/do/dolfinx/package.nix
+++ b/pkgs/by-name/do/dolfinx/package.nix
@@ -12,6 +12,7 @@
   kahip,
   adios2,
   python3Packages,
+  darwinMinVersionHook,
   catch2_3,
   withParmetis ? false,
 }:
@@ -25,14 +26,14 @@ let
   );
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.9.0.post1";
+  version = "0.10.0.post1";
   pname = "dolfinx";
 
   src = fetchFromGitHub {
     owner = "fenics";
     repo = "dolfinx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4IIx7vUZeDwOGVdyC2PBvfhVjrmGZeVQKAwgDYScbY0=";
+    hash = "sha256-ZsaEcJdvsf3dxJ739/CU20+drjbAvuc/HkIGCfh9U5A=";
   };
 
   preConfigure = ''
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     dolfinxPackages.kahip
     dolfinxPackages.scotch
   ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3")
   ++ lib.optional withParmetis dolfinxPackages.parmetis;
 
   propagatedBuildInputs = [
diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index 92da789dbf6b..2d5a906d5d68 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
 
   # nativeBuildInputs
   cmake,
@@ -31,7 +32,7 @@
   minizip-ng,
   openal,
   pugixml,
-  SDL2,
+  sdl3,
   sfml,
   xxHash,
   xz,
@@ -71,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/dolphin-emu/dolphin/commit/8edef722ce1aae65d5a39faf58753044de48b6e0.patch?full_index=1";
+      hash = "sha256-QEG0p+AzrExWrOxL0qRPa+60GlL0DlLyVBrbG6pGuog=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -105,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: {
     pugixml
     qt6.qtbase
     qt6.qtsvg
-    SDL2
+    sdl3
     sfml
     xxHash
     xz
@@ -153,16 +161,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
     "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
-    # https://bugs.dolphin-emu.org/issues/11807
-    # The .desktop file should already set this, but Dolphin may be launched in other ways
-    "--set QT_QPA_PLATFORM xcb"
   ];
 
   doInstallCheck = true;
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
+      install -Dm644 $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # Only gets installed automatically if the standalone executable is used
diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix
index cd8b4fa4c9ac..1b7f0fb26c23 100644
--- a/pkgs/by-name/do/done/package.nix
+++ b/pkgs/by-name/do/done/package.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md";
     license = licenses.mpl20;
     mainProgram = "done";
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix
index 13855843769a..b2638fff650f 100644
--- a/pkgs/by-name/do/dool/package.nix
+++ b/pkgs/by-name/do/dool/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/scottchiefbaker/dool";
     changelog = "https://github.com/scottchiefbaker/dool/blob/${src.rev}/ChangeLog";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "dool";
   };
diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix
index c2b4a281da2a..51f8808963c1 100644
--- a/pkgs/by-name/do/doomretro/package.nix
+++ b/pkgs/by-name/do/doomretro/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doomretro";
-  version = "5.7.2";
+  version = "5.8";
 
   src = fetchFromGitHub {
     owner = "bradharding";
     repo = "doomretro";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ShzZMmUwPB8IHhaA/7U4CEE7qcEjxfQDXVZkAVuEgtw=";
+    hash = "sha256-UCLIQEeKNJ0qTZQdzybdBxt/6catf8y3lnWKsjg2Mf8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/games/doom-ports/doomseeker/add_gitinfo.patch b/pkgs/by-name/do/doomseeker/add_gitinfo.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/add_gitinfo.patch
rename to pkgs/by-name/do/doomseeker/add_gitinfo.patch
diff --git a/pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch b/pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch
rename to pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch
diff --git a/pkgs/games/doom-ports/doomseeker/fix_paths.patch b/pkgs/by-name/do/doomseeker/fix_paths.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/fix_paths.patch
rename to pkgs/by-name/do/doomseeker/fix_paths.patch
diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/by-name/do/doomseeker/package.nix
similarity index 79%
rename from pkgs/games/doom-ports/doomseeker/default.nix
rename to pkgs/by-name/do/doomseeker/package.nix
index eb1b4dedce92..ff1a248d5a5c 100644
--- a/pkgs/games/doom-ports/doomseeker/default.nix
+++ b/pkgs/by-name/do/doomseeker/package.nix
@@ -3,14 +3,11 @@
   stdenv,
   cmake,
   fetchFromBitbucket,
-  wrapQtAppsHook,
   pkg-config,
-  qtbase,
-  qttools,
-  qtmultimedia,
   zlib,
   bzip2,
   xxd,
+  qt5,
 }:
 
 stdenv.mkDerivation {
@@ -31,15 +28,15 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
     cmake
-    qttools
+    qt5.qttools
     pkg-config
     xxd
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    qt5.qtbase
+    qt5.qtmultimedia
     zlib
     bzip2
   ];
@@ -52,12 +49,14 @@ stdenv.mkDerivation {
     ln -s $out/lib/doomseeker/doomseeker $out/bin/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://doomseeker.drdteam.org/";
     description = "Multiplayer server browser for many Doom source ports";
     mainProgram = "doomseeker";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix
index 181df75dfbb4..50a0011e28d2 100644
--- a/pkgs/by-name/do/dopamine/package.nix
+++ b/pkgs/by-name/do/dopamine/package.nix
@@ -6,11 +6,11 @@
 }:
 appimageTools.wrapType2 rec {
   pname = "dopamine";
-  version = "3.0.0-preview.40";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
-    hash = "sha256-Cd0qUNkUXup9l3/tzagswY/MUgx4cCnXcML7c5ZSo4k=";
+    hash = "sha256-kvXan5J+rxJ/ugcEz9xytq3eQG0saWrYZjF7O1d6rTA=";
   };
 
   extraInstallCommands =
diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/by-name/do/dosbox/package.nix
similarity index 98%
rename from pkgs/applications/emulators/dosbox/default.nix
rename to pkgs/by-name/do/dosbox/package.nix
index 7057f08a8e9d..b6a7cce40efd 100644
--- a/pkgs/applications/emulators/dosbox/default.nix
+++ b/pkgs/by-name/do/dosbox/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
     copyDesktopItems
     graphicsmagick
-    SDL # for sdl-config during build time
+    SDL
   ];
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/do/dosis/package.nix b/pkgs/by-name/do/dosis/package.nix
index 8ccf74ba93c1..7c5da5416392 100644
--- a/pkgs/by-name/do/dosis/package.nix
+++ b/pkgs/by-name/do/dosis/package.nix
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "http://www.impallari.com/dosis";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index 169c9ea0b3fe..0d732fb54b3e 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "dotenv-cli";
-  version = "10.0.0";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
     rev = "v${version}";
-    hash = "sha256-prSGIEHf6wRqOFVsn3Ws25yG7Ga2YEbiU/IMP3QeLXU=";
+    hash = "sha256-oPgi2l6YNt7WyaOzr7EkjgXOitpw9PY7tmN86bUM88Q=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-rbG1oM1mEZSB/eYp87YMi6v9ves5YR7u7rkQRlziz7I=";
+    hash = "sha256-I/DzRBETcusE4YS3nC47I1igsVzophNXoVtcD+upZPc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/do/dotenv-linter/package.nix b/pkgs/by-name/do/dotenv-linter/package.nix
index f45187e59121..49a261a6fcee 100644
--- a/pkgs/by-name/do/dotenv-linter/package.nix
+++ b/pkgs/by-name/do/dotenv-linter/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dotenv-linter";
-  version = "3.3.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "dotenv-linter";
     repo = "dotenv-linter";
     rev = "v${version}";
-    sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
+    sha256 = "sha256-H4a/JM2CFrELmP4w4vrFxbvmvdTQk8k7g3QjQKm++Uk=";
   };
 
-  cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY=";
+  cargoHash = "sha256-11u3a4W3vrGJQXjSMcDAS5D9mqG+XJ0L5FYmqqH/McM=";
 
   meta = with lib; {
     description = "Lightning-fast linter for .env files. Written in Rust";
diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index f6f0c720a8ff..5e77de59c0b9 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.51.0";
+  version = "1.51.1";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-vRvcsh4b/QlU+f7646t8O5F8VT/K6zBxbUpos+hh0fw=";
+    hash = "sha256-oXq3OfMPmfbBr5wfumiql8uX+tkCtJJ5W0CT6M3cBp8=";
   };
 
-  npmDepsHash = "sha256-AT9ZE7ip63t6vK/GBVM9JCmir68jrxMN54RoREmjSIk=";
+  npmDepsHash = "sha256-scRpNiBwZBtaYTpepNw+OsMS6Dy1uUq/hkH++cr2qRQ=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index a377165483f0..30e445519ee1 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -4,17 +4,19 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  enableStatic ? stdenv.hostPlatform.isStatic,
+  ninja,
+  ctestCheckHook,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "double-conversion";
   version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
   };
 
@@ -30,22 +32,46 @@ stdenv.mkDerivation rec {
       url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch";
       hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis=";
     })
+    (fetchpatch {
+      name = "double-conversion-add-pkg-config.patch";
+      url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch";
+      hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4=";
+    })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
-  cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON";
+  nativeBuildInputs = [
+    cmake
+    ninja
+    ctestCheckHook
+  ];
+
+  doCheck = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTING" true)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+  ];
 
   # Case sensitivity issue
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     rm BUILD
   '';
 
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
   meta = with lib; {
+    pkgConfigModules = [ "double-conversion" ];
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
     homepage = "https://github.com/google/double-conversion";
     license = licenses.bsd3;
     platforms = platforms.unix ++ platforms.windows;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ fzakaria ];
   };
-}
+})
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index 1dce4874455d..5dd75ba1b615 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -155,9 +155,9 @@ stdenv.mkDerivation rec {
     "--with-textcat"
   ]
   ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
-    "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
-    "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
+    "i_cv_epoll_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
+    "i_cv_posix_fallocate_works=${lib.boolToYesNo stdenv.hostPlatform.isDarwin}"
+    "i_cv_inotify_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
     "i_cv_signed_size_t=no"
     "i_cv_signed_time_t=yes"
     "i_cv_c99_vsnprintf=yes"
diff --git a/pkgs/by-name/do/dovi-tool/package.nix b/pkgs/by-name/do/dovi-tool/package.nix
index c39a26409531..b3b8244785a8 100644
--- a/pkgs/by-name/do/dovi-tool/package.nix
+++ b/pkgs/by-name/do/dovi-tool/package.nix
@@ -1,37 +1,51 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
   fontconfig,
+  makeFontsConf,
   versionCheckHook,
   nix-update-script,
 }:
 
+let
+  fontsConf = makeFontsConf {
+    fontDirectories = [ ];
+  };
+in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dovi-tool";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "quietvoid";
     repo = "dovi_tool";
     tag = finalAttrs.version;
-    hash = "sha256-z783L6gBr9o44moKYZGwymWEMp5ZW7yOhZcpvbznXK4=";
+    hash = "sha256-4C9d8Rt1meV6Pcdnf2SaiWGA97sRj2WmvKsf1rC01Bs=";
   };
 
-  cargoHash = "sha256-pwB6QBLeHALbYZHzTBm/ODLPHhxM3B5n+B/0iXYNuVc=";
+  cargoHash = "sha256-Dg6IDcYm3qTSyE5kVgZ8Yka8538KDFyBN+weUyAfQT8=";
 
-  nativeBuildInputs = [
+  nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     pkg-config
   ];
 
-  buildInputs = [
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     fontconfig
   ];
 
-  checkFlags = [
-    # fails because nix-store is read only
-    "--skip=rpu::plot::plot_p7"
+  preCheck = lib.optionals (!stdenv.hostPlatform.isDarwin) ''
+    # Fontconfig error: Cannot load default config file: No such file: (null)
+    export FONTCONFIG_FILE="${fontsConf}"
+    # Fontconfig error: No writable cache directories
+    export XDG_CACHE_HOME="$(mktemp -d)"
+  '';
+
+  # Needed for rpu::plot::plot_p7 to pass in the sandbox.
+  __impureHostDeps = lib.optionals stdenv.hostPlatform.isDarwin [
+    "/System/Library/Fonts/Supplemental/Arial.ttf"
   ];
 
   nativeInstallCheckInputs = [
diff --git a/pkgs/by-name/do/doxygen-awesome-css/package.nix b/pkgs/by-name/do/doxygen-awesome-css/package.nix
index 00132ec7fafd..6fdd58249a20 100644
--- a/pkgs/by-name/do/doxygen-awesome-css/package.nix
+++ b/pkgs/by-name/do/doxygen-awesome-css/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "doxygen-awesome-css";
-  version = "2.4.0";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "jothepro";
     repo = "doxygen-awesome-css";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-nUp9uYW3p5laen+pRjwRnDvUA+PsGWtniTZ4ZE5Lg0w=";
+    hash = "sha256-Q+1+Y8AsR3fZxYwewaBBKHIu0uwuYFZmUByHg17KZ9o=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix
index 502a87814de9..74c2b4a34cd1 100644
--- a/pkgs/by-name/dp/dpdk/package.nix
+++ b/pkgs/by-name/dp/dpdk/package.nix
@@ -11,6 +11,7 @@
   libbpf,
   zlib,
   elfutils,
+  intel-ipsec-mb,
   jansson,
   openssl,
   libpcap,
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
     jansson
     libbpf
     elfutils
+    intel-ipsec-mb
     libpcap
     numactl
     openssl.dev
diff --git a/pkgs/by-name/dp/dplusplus/dub-lock.json b/pkgs/by-name/dp/dplusplus/dub-lock.json
new file mode 100644
index 000000000000..0af3b0d52760
--- /dev/null
+++ b/pkgs/by-name/dp/dplusplus/dub-lock.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "libclang": {
+      "version": "0.3.3",
+      "sha256": "0abmwx294zrnmpzdqbwnw74i07wmvsvycsbh5j0yy1kcz411n6r8"
+    },
+    "sumtype": {
+      "version": "1.2.8",
+      "sha256": "0zvl0nncmrqvj2x96qjry2ws67fi3mykz1zr11pnpvwp9xdkw9zx"
+    },
+    "unit-threaded": {
+      "version": "2.1.9",
+      "sha256": "0x3d8jv65v4sh4nk4fkah202vbqnkhbzdc7k40yjqbjlgx76h1hy"
+    }
+  }
+}
diff --git a/pkgs/by-name/dp/dplusplus/package.nix b/pkgs/by-name/dp/dplusplus/package.nix
new file mode 100644
index 000000000000..4be1545f57f3
--- /dev/null
+++ b/pkgs/by-name/dp/dplusplus/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  dtools,
+  libclang,
+  buildDubPackage,
+  fetchFromGitHub,
+}:
+
+buildDubPackage (finalAttrs: {
+  pname = "dpp";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "atilaneves";
+    repo = "dpp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8zcjZ8EV5jdZrRCHkzxu9NeehY2/5AfOSdzreFC9z3c=";
+  };
+
+  nativeBuildInputs = [ dtools ];
+  buildInputs = [ libclang ];
+
+  dubLock = ./dub-lock.json;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/d++ -t $out/d++
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Directly include C headers in D source code";
+    changelog = "https://github.com/atilaneves/dpp/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/atilaneves/dpp";
+    mainProgram = "d++";
+    maintainers = with lib.maintainers; [ ipsavitsky ];
+    license = lib.licenses.boost;
+  };
+})
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
index 2707f2da497b..f7d97d9acbfa 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Biome (JS/TS) wrapper plugin";
-  hash = "sha256-czgTZXlW+LdTKGtX7JJtG7qAbnWlQpunMY92WiC+X8A=";
+  hash = "sha256-kelyuSZpbah1l+qVZMIK9VhWLr7DWjZIm9HwD64bCTw=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "biome";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-biome";
   updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
-  url = "https://plugins.dprint.dev/biome-0.10.4.wasm";
-  version = "0.10.4";
+  url = "https://plugins.dprint.dev/biome-0.11.1.wasm";
+  version = "0.11.1";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
index 5a14b10c58a9..1b6b85835d3e 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Dockerfile code formatter";
-  hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk=";
+  hash = "sha256-GaK1sYdZPwQWJmz2ULcsGpWDiKjgPhqNRoGgQfGOkqc=";
   initConfig = {
     configExcludes = [ ];
     configKey = "dockerfile";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-dockerfile";
   updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json";
-  url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm";
-  version = "0.3.2";
+  url = "https://plugins.dprint.dev/dockerfile-0.3.3.wasm";
+  version = "0.3.3";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
index 90b82ea0a94f..5550c8faa1bc 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-json.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "JSON/JSONC code formatter";
-  hash = "sha256-uFcFLi9aYsBrAqkhFmg9GI+LKiV19LxdNjxQ85EH9To=";
+  hash = "sha256-GIoIkW7szyQU4GyLUdj0TTaV8FWg1jzvOerOChHiR7w=";
   initConfig = {
     configExcludes = [ "**/*-lock.json" ];
     configKey = "json";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-json";
   updateUrl = "https://plugins.dprint.dev/dprint/json/latest.json";
-  url = "https://plugins.dprint.dev/json-0.20.0.wasm";
-  version = "0.20.0";
+  url = "https://plugins.dprint.dev/json-0.21.0.wasm";
+  version = "0.21.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
index 976090712989..6cacf56dd4bf 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-markdown.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Markdown code formatter";
-  hash = "sha256-2lpgVMExOjMVRTvX6hGRWuufwh2AIkiXaOzkN8LhZgw=";
+  hash = "sha256-XrTiMkgjHOD8a2N5Ips79+D2SbM36s9Hdk7o/iwGIlc=";
   initConfig = {
     configExcludes = [ ];
     configKey = "markdown";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-markdown";
   updateUrl = "https://plugins.dprint.dev/dprint/markdown/latest.json";
-  url = "https://plugins.dprint.dev/markdown-0.19.0.wasm";
-  version = "0.19.0";
+  url = "https://plugins.dprint.dev/markdown-0.20.0.wasm";
+  version = "0.20.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
index aeb931ecd58e..d83c0588a4ff 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Ruff (Python) wrapper plugin";
-  hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8=";
+  hash = "sha256-qT+6zPbX3KrONXshwzLoGTWRXM93VKO0lN9ycJujEDM=";
   initConfig = {
     configExcludes = [ ];
     configKey = "ruff";
@@ -12,6 +12,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-ruff";
   updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json";
-  url = "https://plugins.dprint.dev/ruff-0.3.9.wasm";
-  version = "0.3.9";
+  url = "https://plugins.dprint.dev/ruff-0.6.1.wasm";
+  version = "0.6.1";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
index 734b48ba4b81..2d4f4de53829 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "TypeScript/JavaScript code formatter";
-  hash = "sha256-azXAPEwle+VeKFWeWooNn7dPv0DD6zaKer0mdr1K9II=";
+  hash = "sha256-gBYx23MC6Biz8FIIZLBW3d7SOxtpmCml4N6554Wh0Pc=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "typescript";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-typescript";
   updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
-  url = "https://plugins.dprint.dev/typescript-0.95.11.wasm";
-  version = "0.95.11";
+  url = "https://plugins.dprint.dev/typescript-0.95.12.wasm";
+  version = "0.95.12";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
index 1abaa2a54ea1..89a3b44c0e48 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "CSS, SCSS, Sass and Less formatter";
-  hash = "sha256-mFlhfqtglKtKNls96PO/2AWLL1fNC5msQCd9EgdKauE=";
+  hash = "sha256-IAIix6c9/GNDZsRk95T/rpvMh7HqFgBoq5KDVYHHOjU=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "malva";
@@ -14,6 +14,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-malva";
   updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/malva-v0.11.2.wasm";
-  version = "0.11.2";
+  url = "https://plugins.dprint.dev/g-plane/malva-v0.14.3.wasm";
+  version = "0.14.3";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
index 6c9ea245898e..633820b9ce32 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter";
-  hash = "sha256-fCvurr8f79io/jIjwCfwr/WGjvcKZtptRrx9GFfytSI=";
+  hash = "sha256-TQxHIw5IXZwFA/WzIJ33ZckJNkHwW67lnh0cCGkgmrs=";
   initConfig = {
     configExcludes = [ ];
     configKey = "markup";
@@ -19,6 +19,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-markup_fmt";
   updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm";
-  version = "0.19.0";
+  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.24.0.wasm";
+  version = "0.24.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
index 6cdea7f70ae7..084bdadbb763 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "GraphQL formatter";
-  hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec=";
+  hash = "sha256-xEEBnmxxiIPNOePBDS2HG6lfAhR4l53w+QDF2mXdyzg=";
   initConfig = {
     configExcludes = [ ];
     configKey = "graphql";
@@ -12,6 +12,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-pretty_graphql";
   updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm";
-  version = "0.2.1";
+  url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.3.wasm";
+  version = "0.2.3";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
index ca0b4883918b..7667e46621f3 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "YAML formatter";
-  hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo=";
+  hash = "sha256-iSh5SRrjQB1hJoKkkup7R+Durcu+cxePa7GDVjwnexU=";
   initConfig = {
     configExcludes = [ ];
     configKey = "yaml";
@@ -12,6 +12,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-pretty_yaml";
   updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm";
-  version = "0.5.0";
+  url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm";
+  version = "0.5.1";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
index 54eab2a67355..9c1e5c91883c 100755
--- a/pkgs/by-name/dp/dprint/plugins/update-plugins.py
+++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python -p nix 'python3.withPackages (pp: [ pp.requests ])'
+#!nix-shell -i python3 -p nix 'python3.withPackages (ps: [ ps.requests ])'
 
 import json
 import os
@@ -138,7 +138,7 @@ def update_plugins():
             "updateUrl": update_url,
             "pname": pname,
             "version": e["version"],
-            "description": e["description"],
+            "description": e["description"].rstrip("."),
             "initConfig": {
                 "configKey": e["configKey"],
                 "configExcludes": e["configExcludes"],
diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix
index e3b1f84af9b0..363b6ba695c2 100644
--- a/pkgs/by-name/dp/dpt-rp1-py/package.nix
+++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "dpt-rp1-py";
-  version = "0.1.16";
+  version = "0.1.18";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "janten";
     repo = "dpt-rp1-py";
     rev = "v${version}";
-    sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj";
+    sha256 = "sha256-5Ny62Kp1GHH9vmPSZ6smNqyEt9PZYPHAiungHZQMB/A=";
   };
 
   doCheck = false;
diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix
index c73978a3f496..60ea99b969a3 100644
--- a/pkgs/by-name/dp/dput-ng/package.nix
+++ b/pkgs/by-name/dp/dput-ng/package.nix
@@ -20,6 +20,10 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-zrH4h4C4y3oTiOXsidFv/rIJNzCdV2lqzNEg0SOkX4w=";
   };
 
+  postPatch = ''
+    substituteInPlace dput/core.py --replace-fail /usr/share/dput-ng "$out/share/dput-ng"
+  '';
+
   build-system = with python3.pkgs; [
     setuptools
   ];
@@ -31,10 +35,13 @@ python3.pkgs.buildPythonApplication {
     coverage
     xdg
     python-debian
+    distro-info
   ];
 
   postInstall = ''
     cp -r bin $out/
+    mkdir -p "$out/share/dput-ng"
+    cp -r skel/* "$out/share/dput-ng/"
   '';
 
   pythonImportsCheck = [ "dput" ];
diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix
index 833e9c38a234..19040fc4048f 100644
--- a/pkgs/by-name/dr/dracula-theme/package.nix
+++ b/pkgs/by-name/dr/dracula-theme/package.nix
@@ -8,7 +8,7 @@
 
 let
   themeName = "Dracula";
-  version = "4.0.0-unstable-2025-10-06";
+  version = "4.0.0-unstable-2025-11-02";
 in
 stdenvNoCC.mkDerivation {
   pname = "dracula-theme";
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "dracula";
     repo = "gtk";
-    rev = "7fda0087e2f0781e6aa340b15851830fddcb708d";
-    hash = "sha256-1/gSV5hdWouW3yMgbtR2tDRA/bdPiYibMFtFhNyz8KQ=";
+    rev = "79095df59b255996611fdc84d75bf06253f152ce";
+    hash = "sha256-NMcm5fn4P5K5OueS3sdBXX6QMMqzVAOdPHNDMb+lqh8=";
   };
 
   propagatedUserEnvPkgs = [
diff --git a/pkgs/by-name/dr/drat/package.nix b/pkgs/by-name/dr/drat/package.nix
new file mode 100644
index 000000000000..41911e8ef407
--- /dev/null
+++ b/pkgs/by-name/dr/drat/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "drat";
+  version = "0.1.3-unstable-2024-01-07";
+
+  src = fetchFromGitHub {
+    owner = "jivanpal";
+    repo = "drat";
+    rev = "af573b9e067e8b6cbcc4825946e7e636b30c748f";
+    hash = "sha256-1NmqG73sP25Uqf7DiSPgt7drONOg9ZkrtCS0tYVjSU0=";
+  };
+
+  # Don't blow up on warnings; it makes upgrading the compiler difficult.
+  postPatch = ''
+    substituteInPlace Makefile --replace-fail "-Werror" ""
+  '';
+
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "LD=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install drat $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Utility for performing data recovery and analysis of APFS partitions/containers";
+    homepage = "https://github.com/jivanpal/drat";
+    changelog = "https://github.com/jivanpal/drat/blob/main/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ philiptaron ];
+    mainProgram = "drat";
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index 966c14f84fa1..33fee0206f5a 100644
--- a/pkgs/by-name/dr/draupnir/hashes.json
+++ b/pkgs/by-name/dr/draupnir/hashes.json
@@ -1,3 +1,3 @@
 {
-  "yarn_offline_cache_hash": "sha256-jzBjZAqvEVGlk+5ii5s8aWvoYJKVBsh+RGcp63oim5Y="
+  "yarn_offline_cache_hash": "sha256-EZ8dVRfzAFr8wepLuS90YHvAi9BA+4etVz+Vji+bQVA="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index e7d6335d04ce..6df29ee41a44 100644
--- a/pkgs/by-name/dr/draupnir/package.json
+++ b/pkgs/by-name/dr/draupnir/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draupnir",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -54,7 +54,7 @@
     "@sinclair/typebox": "0.34.13",
     "@the-draupnir-project/interface-manager": "4.2.5",
     "@the-draupnir-project/matrix-basic-types": "1.4.1",
-    "@the-draupnir-project/mps-interface-adaptor": "0.5.1",
+    "@the-draupnir-project/mps-interface-adaptor": "0.5.2",
     "better-sqlite3": "^9.4.3",
     "body-parser": "^1.20.2",
     "config": "^3.3.9",
@@ -65,7 +65,7 @@
     "matrix-appservice-bridge": "^10.3.1",
     "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
     "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@4.1.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.0",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.2",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 740e75eb9732..5d0a5b02e3de 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -22,13 +22,13 @@ let
 in
 mkYarnPackage rec {
   pname = "draupnir";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-ZzwZg7sevX0qKnlZ4snCcwSejWqA6JHCx3e6vWucO8U=";
+    hash = "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix
index 86e6b711add7..c42420618191 100644
--- a/pkgs/by-name/dr/drawing/package.nix
+++ b/pkgs/by-name/dr/drawing/package.nix
@@ -60,6 +60,13 @@ python3.pkgs.buildPythonApplication rec {
     patchShebangs build-aux/meson/postinstall.py
   '';
 
+  # Prevent double wrapping because of wrapGAppsHook3
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   strictDeps = false;
 
   meta = {
diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index ea7893024b3c..0e58264092d7 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -5,7 +5,6 @@
   unstableGitUpdater,
   installShellFiles,
   makeWrapper,
-  apple-sdk_13,
   xorg,
   pkg-config,
   wayland-scanner,
@@ -23,13 +22,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2025-09-11";
+  version = "0-unstable-2025-10-11";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "7523180ec9e5210e28eb0191268066188cdf91ab";
-    hash = "sha256-IOZCpNXJcTpqCRsNp8aaP2vORvusLktLtyoQ7gykJB8=";
+    rev = "48d53278a8273bb39ca295e8f163563ab04b3530";
+    hash = "sha256-SReZ6A5xEpi0vL2bchVszRl3Dvm4Rw8e/5TQa+8TPto=";
   };
 
   enableParallelBuilding = true;
@@ -54,8 +53,7 @@ stdenv.mkDerivation {
     ++ lib.optionals withXorg [
       xorg.libX11
       xorg.libXt
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_13;
+    ];
 
   makeFlags =
     lib.optional withWayland "CONF=linux"
diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix
index 5d5d3c54c250..7c7fdb19d060 100644
--- a/pkgs/by-name/dr/driftnet/package.nix
+++ b/pkgs/by-name/dr/driftnet/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   giflib,
   glib,
-  gtk2-x11,
+  gtk3,
   libjpeg,
   libpcap,
   libpng,
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "driftnet";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "deiv";
     repo = "driftnet";
     tag = "v${version}";
-    hash = "sha256-lMn60vtOMPs1Tr+SnAOUZDrNIO7gEXdHpizjXiEkkoM=";
+    hash = "sha256-f7EPC/n3CyxVOXC6j43Nnwkgu/aDVst8lQpzfgegDsI=";
   };
 
   enableParallelBuilding = true;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     cairo
     giflib
     glib
-    gtk2-x11
+    gtk3
     libjpeg
     libpcap
     libpng
diff --git a/pkgs/by-name/dr/drip/package.nix b/pkgs/by-name/dr/drip/package.nix
index e0759d4ca862..04c96acf2cde 100644
--- a/pkgs/by-name/dr/drip/package.nix
+++ b/pkgs/by-name/dr/drip/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       rybern
-      awwpotato
+      da157
     ];
   };
 })
diff --git a/pkgs/applications/audio/drumkv1/default.nix b/pkgs/by-name/dr/drumkv1/package.nix
similarity index 77%
rename from pkgs/applications/audio/drumkv1/default.nix
rename to pkgs/by-name/dr/drumkv1/package.nix
index b26d02a76362..c7b30b6e4310 100644
--- a/pkgs/applications/audio/drumkv1/default.nix
+++ b/pkgs/by-name/dr/drumkv1/package.nix
@@ -13,12 +13,12 @@
   xorg,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "drumkv1";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/drumkv1/drumkv1-${version}.tar.gz";
+    url = "mirror://sourceforge/drumkv1/drumkv1-${finalAttrs.version}.tar.gz";
     hash = "sha256-Z9F9lbLSAJRlVh7tnSMNTlK7FiZhhlVfeHPlbbVuWXk=";
   };
 
@@ -47,12 +47,12 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_LIBDIR=lib"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Old-school drum-kit sampler synthesizer with stereo fx";
     mainProgram = "drumkv1_jack";
     homepage = "http://drumkv1.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.theredstonedev ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ theredstonedev ];
   };
-}
+})
diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix
index 316b728868d3..a37d81216eaf 100644
--- a/pkgs/by-name/ds/dsniff/package.nix
+++ b/pkgs/by-name/ds/dsniff/package.nix
@@ -34,11 +34,23 @@ let
   };
   pcap = symlinkJoin {
     inherit (libpcap) name;
-    paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ];
+    paths =
+      let
+        staticlibpcap = libpcap.overrideAttrs { dontDisableStatic = true; };
+      in
+      [
+        (lib.getInclude staticlibpcap)
+        (lib.getLib staticlibpcap)
+      ];
     postBuild = ''
       cp -rs $out/include/pcap $out/include/net
-      # prevent references to libpcap
-      rm $out/lib/*.so*
+      # check the presence of the files that ./configure expects
+      for i in $out/lib/libpcap.a $out/include/pcap.h $out/include/net/bpf.h; do
+        if ! test -f $i; then
+          echo $i is missing from output
+          exit 1
+        fi
+      done
     '';
   };
   net = symlinkJoin {
@@ -71,8 +83,8 @@ stdenv.mkDerivation rec {
     domain = "salsa.debian.org";
     owner = "pkg-security-team";
     repo = "dsniff";
-    rev = "debian/${version}+debian-34";
-    sha256 = "sha256-CY0+G09KZXtAwKuaYh5/qcmZjuNhdGis3zCG14hWtqw=";
+    tag = "debian/${version}+debian-35";
+    hash = "sha256-RVv9USAHTVYnGgKygIPgfXpfjCYigJvScuzc2+1Uzfw=";
     name = "dsniff.tar.gz";
   };
 
diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 4043d4267153..e9192fecaf46 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -6,15 +6,15 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dua";
-  version = "2.32.0";
+  version = "2.32.2";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
-    tag = "v${version}";
-    hash = "sha256-u8g7X/70ZsZF6vUiVnisItwSMiNXgiAdOXqGUT34EaY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-MB5uePy32jTvOtkQKcP9peFPqwR68E+NZ7UGMuLx8Eo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -22,19 +22,19 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoHash = "sha256-6WjaKGCnEoHCIDqMHtp/dpdHbrUe2XOxCtstQCuXPyc=";
+  cargoHash = "sha256-6H0x6I3nkCezu4/Hguv0XTdl+3QiyPL8Ue1rqTQU7VA=";
 
   checkFlags = [
     # Skip interactive tests
+    "--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked"
+    "--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked"
     "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only"
     "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion"
     "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels"
     "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top"
   ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
@@ -43,12 +43,12 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Tool to conveniently learn about the disk usage of directories";
     homepage = "https://github.com/Byron/dua-cli";
-    changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
-      figsoda
       killercup
+      defelo
     ];
     mainProgram = "dua";
   };
-}
+})
diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix
index 7da393dae979..be1dead197cc 100644
--- a/pkgs/by-name/du/duc/package.nix
+++ b/pkgs/by-name/du/duc/package.nix
@@ -15,13 +15,13 @@ assert enableCairo -> cairo != null && pango != null;
 
 stdenv.mkDerivation rec {
   pname = "duc";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
     rev = version;
-    sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk=";
+    sha256 = "sha256-hZ8bhPXS/trt6ZePjfuwx8PEfv0xCBqSJxRonLB7Ui0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix
index 3cfd451a4681..8a5b6700476d 100644
--- a/pkgs/by-name/du/duckdb/package.nix
+++ b/pkgs/by-name/du/duckdb/package.nix
@@ -13,7 +13,6 @@
 }:
 
 let
-  enableFeature = yes: if yes then "ON" else "OFF";
   versions = lib.importJSON ./versions.json;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -47,14 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withOdbc [ unixODBC ];
 
   cmakeFlags = [
-    "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake"
-    "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
-    "-DJDBC_DRIVER=${enableFeature withJdbc}"
-    "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"
-  ]
-  ++ lib.optionals finalAttrs.doInstallCheck [
+    (lib.cmakeFeature "DUCKDB_EXTENSION_CONFIGS" "${finalAttrs.src}/.github/config/in_tree_extensions.cmake")
+    (lib.cmakeBool "BUILD_ODBC_DRIVER" withOdbc)
+    (lib.cmakeBool "JDBC_DRIVER" withJdbc)
+    (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${finalAttrs.version}-0-g${finalAttrs.rev}")
     # development settings
-    "-DBUILD_UNITTESTS=ON"
+    (lib.cmakeBool "BUILD_UNITTESTS" finalAttrs.doInstallCheck)
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json
index a6127ebe6d3e..0bbd61cd8bbc 100644
--- a/pkgs/by-name/du/duckdb/versions.json
+++ b/pkgs/by-name/du/duckdb/versions.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.2",
-  "rev": "0b83e5d2f68bc02dfefde74b846bd039f078affa",
-  "hash": "sha256-6NMQ893g+nOiH8dnb63oa+fZMNXs8N6tJv+Er4x547U="
+  "version": "1.4.1",
+  "rev": "b390a7c3760bd95926fe8aefde20d04b349b472e",
+  "hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8="
 }
diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 05232359446d..e84c5306363f 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -8,7 +8,6 @@
   ninja,
   extra-cmake-modules,
   wayland-scanner,
-  makeBinaryWrapper,
   qt6,
   sdl3,
   zstd,
@@ -29,7 +28,7 @@
   spirv-cross,
   udev,
   libbacktrace,
-  ffmpeg-headless,
+  ffmpeg_8-headless,
   alsa-lib,
   libjack2,
   libpulseaudio,
@@ -47,17 +46,11 @@ let
   meta = {
     description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64/RV64";
     longDescription = ''
-      # DISCLAIMER
-      This is an **unofficial** package, do not report any issues to
-      duckstation developers. Instead, please report them to
+      DISCLAIMER: This is an **unofficial** package, do not report any
+      issues to duckstation developers. Instead, please report them to
       <https://github.com/NixOS/nixpkgs> or use the officially
       supported platform build at <https://duckstation.org> or other
-      upstream-approved distribution mechanism not listed here. We
-      (nixpkgs) do not endorse or condone any action taken on your own
-      accord in regards to this package.
-
-      The SDL audio backend must be used as cubeb support is currently
-      non-functional without patches.
+      upstream-approved distribution mechanism not listed here.
     '';
     homepage = "https://duckstation.org";
     license = lib.licenses.cc-by-nc-nd-40;
@@ -71,15 +64,22 @@ let
 
   linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: {
     pname = "duckstation";
-    version = pkgSources.duckstation.version;
+    version = "0.1-9787-unstable-2025-10-13";
 
     src = fetchFromGitHub {
       owner = "stenzek";
       repo = "duckstation";
-      tag = "v${finalAttrs.version}";
-      hash = pkgSources.duckstation.hash_linux;
+      rev = "8f0c9dd171210dfd7f06223a393e2565abbaabf3";
+      hash = "sha256-CzHWdY0RaGBB6CY3PzHHHbq3/Mbf6WtUm6Dizr0IW6I=";
     };
 
+    # TODO: Remove once this is fixed upstream.
+    postPatch = ''
+      substituteInPlace src/util/animated_image.cpp \
+        --replace-fail "png_write_frame_head(png_ptr, info_ptr," \
+                       "png_write_frame_head(png_ptr, info_ptr, 0,"
+    '';
+
     vendorDiscordRPC = llvmPackages.stdenv.mkDerivation {
       pname = "discord-rpc-duckstation";
       inherit (finalAttrs) version;
@@ -190,7 +190,8 @@ let
           - Improving performance.
           - Fixing game-breaking bugs.
           - Unlocking the frame rate (e.g. "60 FPS patches").
-          - Widescreen rendering where the built-in widescreen rendering rendering is insufficient.
+          - Widescreen rendering where the built-in widescreen
+            rendering rendering is insufficient.
         '';
         license = lib.licenses.mit;
         inherit (meta) maintainers;
@@ -209,7 +210,6 @@ let
       ninja
       extra-cmake-modules
       wayland-scanner
-      makeBinaryWrapper
       qt6.wrapQtAppsHook
       qt6.qttools
     ];
@@ -232,7 +232,7 @@ let
       qt6.qtbase
       udev
       libbacktrace
-      ffmpeg-headless
+      ffmpeg_8-headless
       alsa-lib
       libjack2
       pipewire
@@ -244,19 +244,14 @@ let
       finalAttrs.soundtouch
     ];
 
-    cmakeFlags = [
-      (lib.cmakeBool "ALLOW_INSTALL" true)
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib/duckstation")
-    ];
+    installPhase = ''
+      runHook preInstall
 
-    postInstall = ''
-      makeWrapper $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt
-
-      mkdir -p $out/share/applications
+      mkdir -p $out/{lib,bin,share/{applications,icons/hicolor/512x512/apps}}
+      cp -r bin $out/lib/duckstation
+      ln -s $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt
       ln -s $out/lib/duckstation/resources/org.duckstation.DuckStation.desktop \
             $out/share/applications
-
-      mkdir -p $out/share/icons/hicolor/512x512/apps
       ln -s $out/lib/duckstation/resources/org.duckstation.DuckStation.png \
             $out/share/icons/hicolor/512x512/apps
 
@@ -265,8 +260,19 @@ let
       install -Dm644 README.* -t $out/share/doc/duckstation
       install -Dm644 CONTRIBUTORS.md -t $out/share/doc/duckstation
       popd
+
+      runHook postInstall
     '';
 
+    qtWrapperArgs = [
+      "--prefix LD_LIBRARY_PATH : ${
+        (lib.makeLibraryPath [
+          ffmpeg_8-headless
+          finalAttrs.vendorShaderc
+        ])
+      }"
+    ];
+
     inherit passthru;
 
     meta = meta // {
diff --git a/pkgs/by-name/du/duckstation/sources.json b/pkgs/by-name/du/duckstation/sources.json
index dfca7c572752..a4db277a14d0 100644
--- a/pkgs/by-name/du/duckstation/sources.json
+++ b/pkgs/by-name/du/duckstation/sources.json
@@ -13,8 +13,8 @@
     "hash": "sha256-/o3LPYvMTlKhuvLQITnADmz8BTGXVaVR0aciOWVyFS8="
   },
   "chtdb": {
-    "date": "2025-10-05",
-    "rev": "eab12dde0ddfd03e1260d7111f2a0709144e047e",
-    "hash": "sha256-wRk9BijV52BCcvpeq4CzhLsaWYYrt+vFvdMwlAixBvU="
+    "date": "2025-10-16",
+    "rev": "aff6149c29beae9c52aa35ea5cb53986c8916546",
+    "hash": "sha256-gpJ6Wlo7PGMPraK8Bppb+3qDWZ6Oxd4kvLJEFtGF50U="
   }
 }
diff --git a/pkgs/by-name/du/duckx/package.nix b/pkgs/by-name/du/duckx/package.nix
index 70133b9813e3..e6aa2433c7bb 100644
--- a/pkgs/by-name/du/duckx/package.nix
+++ b/pkgs/by-name/du/duckx/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+    # CMake 3.0 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+  '';
+
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
   };
diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix
index 45ec5bf6f90e..2841a39c95da 100644
--- a/pkgs/by-name/du/duf/package.nix
+++ b/pkgs/by-name/du/duf/package.nix
@@ -35,7 +35,6 @@ buildGoModule (finalAttrs: {
     description = "Disk Usage/Free Utility";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       penguwin
       sigmasquadron
     ];
diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index 7933f526c152..7069b8cb8925 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       holymonson
     ];
   };
diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix
index 2f1eeb147914..75b8063f3412 100644
--- a/pkgs/by-name/du/dum/package.nix
+++ b/pkgs/by-name/du/dum/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/egoist/dum";
     changelog = "https://github.com/egoist/dum/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/du/dumphfdl/package.nix b/pkgs/by-name/du/dumphfdl/package.nix
index 74d605a9e3eb..8366f9b5d363 100644
--- a/pkgs/by-name/du/dumphfdl/package.nix
+++ b/pkgs/by-name/du/dumphfdl/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dumphfdl";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "szpajder";
     repo = "dumphfdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M4WjcGA15Kp+Hpp+I2Ndcx+oBqaGxEeQLTPcSlugLwQ=";
+    hash = "sha256-kbUCHddhkM3Cj39ac5GQM3hCihRERnzWdELtnHjaIgg=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/du/dumpvdl2/package.nix b/pkgs/by-name/du/dumpvdl2/package.nix
index fd9a276a845c..d2943e7e2407 100644
--- a/pkgs/by-name/du/dumpvdl2/package.nix
+++ b/pkgs/by-name/du/dumpvdl2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dumpvdl2";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "szpajder";
     repo = "dumpvdl2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kb8FLVuG9tSZta8nmaKRCRZinF1yy4+NNxD5s7X82Wk=";
+    hash = "sha256-g8WpKbkxG4EBBfKw4YY1XPCo4DQntVvqSCGeQREpTRk=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/du/duo-unix/package.nix b/pkgs/by-name/du/duo-unix/package.nix
index 4f3330d6d576..9cce892d6dd4 100644
--- a/pkgs/by-name/du/duo-unix/package.nix
+++ b/pkgs/by-name/du/duo-unix/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "duo-unix";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "sha256-o5myAUg2tf+Yu7tB93EU/gZkGAHYtrEh6zyCiVJ2pmY=";
+    sha256 = "sha256-43a+BYWzw9ETpYjxlSXjV83uJG1prrjoYMv0/dv5AMo=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 161efe0f35ee..42907aa7d1a4 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -80,16 +80,10 @@ let
       [
         b2sdk
         boto3
-        cffi
-        cryptography
-        ecdsa
         idna
         pygobject3
         fasteners
-        lockfile
         paramiko
-        pyasn1
-        pycrypto
         # Currently marked as broken.
         # pydrive2
       ]
diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix
index 77878d1d291a..925d3d01808f 100644
--- a/pkgs/by-name/du/dutree/package.nix
+++ b/pkgs/by-name/du/dutree/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     description = "Tool to analyze file system usage written in Rust";
     homepage = "https://github.com/nachoparker/dutree";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "dutree";
   };
 }
diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/by-name/dx/dxx-rebirth/assets.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/assets.nix
rename to pkgs/by-name/dx/dxx-rebirth/assets.nix
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/by-name/dx/dxx-rebirth/full.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/full.nix
rename to pkgs/by-name/dx/dxx-rebirth/full.nix
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/by-name/dx/dxx-rebirth/package.nix
similarity index 90%
rename from pkgs/games/dxx-rebirth/default.nix
rename to pkgs/by-name/dx/dxx-rebirth/package.nix
index a0186148e404..8d52835a5457 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/by-name/dx/dxx-rebirth/package.nix
@@ -64,11 +64,11 @@ stdenv.mkDerivation {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Source Port of the Descent 1 and 2 engines";
     homepage = "https://www.dxx-rebirth.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = with platforms; linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix
index b81d6b5e7908..f2631156f4b5 100644
--- a/pkgs/by-name/dy/dysk/package.nix
+++ b/pkgs/by-name/dy/dysk/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dysk";
-  version = "3.1.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "dysk";
     rev = "v${version}";
-    hash = "sha256-2YqKKgNOx5+DLzIEkJTYqTAuxmKMhpCb79w7qLabvOk=";
+    hash = "sha256-trqHMlBA2s5l0ay3/e6hzMZTtKndrHRTy1LhuLwrJb4=";
   };
 
-  cargoHash = "sha256-2raAjpHh49ifZQfG2/WK94gR0lQzF/5cgmUzd69Kh3o=";
+  cargoHash = "sha256-uloX/Mk4m7jEU5z5cb/gSuCLEGhG9qHTCQwjy+FCUsk=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/Canop/dysk/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       koral
     ];
     mainProgram = "dysk";
diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix
new file mode 100644
index 000000000000..3bebf70e99db
--- /dev/null
+++ b/pkgs/by-name/e-/e-search/package.nix
@@ -0,0 +1,180 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  fetchzip,
+  autoPatchelfHook,
+  gitMinimal,
+  gobject-introspection,
+  makeWrapper,
+  nodejs_20,
+  pnpm_10,
+  electron,
+  atk,
+  atkmm,
+  cairo,
+  cairomm,
+  gdk-pixbuf,
+  glib,
+  glibmm,
+  gtk3,
+  gtkmm3,
+  harfbuzz,
+  libsForQt5,
+  pango,
+  pangomm,
+  xorg,
+  zlib,
+  nix-update-script,
+  commandLineArgs ? "",
+}:
+
+let
+  eSearch-OCR-ch = fetchzip {
+    url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/4.0.0/ch.zip";
+    hash = "sha256-0NCXuy8k9/AdpK4ie49S8032u37gNhX6Jc6bOGufrV4=";
+    stripRoot = false;
+  };
+  eSearch-OCR-doc_cls = fetchurl {
+    url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/8.1.0/doc_cls.onnx";
+    hash = "sha256-9VFoIq+SYnEeGX/yJKip2IT4BGpjIbdi40+MvwgsRe8=";
+  };
+  eSearch-seg = fetchurl {
+    url = "https://github.com/xushengfeng/eSearch-seg/releases/download/1.0.0/seg.onnx";
+    hash = "sha256-IJSPX4Kg7wIPjdXVmpGbeSk2y98OS+tJrIth9W+J/Q8=";
+  };
+  eSearch-migan_pipeline_v2 = fetchurl {
+    url = "https://github.com/xushengfeng/eSearch/releases/download/13.1.6/migan_pipeline_v2.onnx";
+    hash = "sha256-bx81MKGiMksZdSAYznVgiLB5c82o19iQA0rOXIpIxAs=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "e-search";
+  version = "15.2.1";
+
+  src = fetchFromGitHub {
+    owner = "xushengfeng";
+    repo = "eSearch";
+    tag = finalAttrs.version;
+    hash = "sha256-K4GFLUeq/IbJC3FZBgvKnZq7JrXkqe6eVGsUxxlpWF0=";
+  };
+
+  pnpmDeps = pnpm_10.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 2;
+    prePnpmInstall = ''
+      export PATH=$PATH:${gitMinimal}/bin
+    '';
+    hash = "sha256-wPwsFY7wvbE1LW5PMwMZKejELtqmdsYO2RVrEuOzdcg=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    gobject-introspection
+    pnpm_10.configHook
+    makeWrapper
+    nodejs_20
+  ];
+
+  buildInputs = [
+    atk
+    atkmm
+    cairo
+    cairomm
+    gdk-pixbuf
+    glib
+    glibmm
+    gtk3
+    gtkmm3
+    harfbuzz
+    (lib.getLib stdenv.cc.cc)
+    libsForQt5.kauth
+    libsForQt5.kcodecs
+    libsForQt5.kcompletion
+    libsForQt5.kconfigwidgets
+    libsForQt5.kcoreaddons
+    libsForQt5.kitemviews
+    libsForQt5.kjobwidgets
+    libsForQt5.kservice
+    libsForQt5.kwidgetsaddons
+    libsForQt5.kio
+    libsForQt5.qt5.qtbase
+    libsForQt5.qt5.qtnetworkauth
+    libsForQt5.qt5.qttools
+    libsForQt5.qt5.qtxmlpatterns
+    pango
+    pangomm
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXt
+    xorg.libXtst
+    xorg.libxcb
+    zlib
+  ];
+
+  env = {
+    ELECTRON_OVERRIDE_DIST_PATH = "${electron}/libexec/electron";
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  };
+
+  preBuild = ''
+    mkdir -p assets/onnx/ppocr assets/onnx/seg assets/onnx/inpaint
+    cp --recursive --no-preserve=mode ${eSearch-OCR-ch}/* assets/onnx/ppocr
+    cp --no-preserve=mode ${eSearch-OCR-doc_cls} assets/onnx/ppocr/doc_cls.onnx
+    cp --no-preserve=mode ${eSearch-seg} assets/onnx/seg/seg.onnx
+    cp --no-preserve=mode ${eSearch-migan_pipeline_v2} assets/onnx/inpaint/migan_pipeline_v2.onnx
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build
+    npm exec electron-builder -- \
+      --linux \
+      --dir \
+      -p never \
+      --config electron-builder.config.js \
+      --config.electronDist=${electron.dist} \
+      --config.electronVersion=${electron.version}
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/eSearch
+    ${
+      if stdenv.hostPlatform.isAarch64 then
+        "cp -r build/linux-arm64-unpacked/{resources,LICENSE*} $out/share/eSearch"
+      else
+        "cp -r build/linux-unpacked/{resources,LICENSE*} $out/share/eSearch"
+    }
+    makeWrapper ${lib.getExe electron} $out/bin/e-search \
+      --inherit-argv0 \
+      --add-flags $out/share/eSearch/resources/app \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+    for icon_size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do
+      install -Dm0644 assets/logo/$icon_size.png $out/share/icons/hicolor/$icon_size/apps/e-search.png
+    done
+    install -Dm0644 assets/e-search.desktop $out/share/applications/e-search.desktop
+
+    runHook postInstall
+  '';
+
+  dontWrapQtApps = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Screenshot OCR search translate search for picture paste the picture on the screen screen recorder";
+    homepage = "https://github.com/xushengfeng/eSearch";
+    changelog = "https://github.com/xushengfeng/eSearch/releases/tag/${finalAttrs.version}";
+    mainProgram = "e-search";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ qzylinra ];
+  };
+})
diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index ede9a3c7840f..904276d85f7f 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "e1s";
-  version = "1.0.50";
+  version = "1.0.51";
 in
 buildGoModule {
   inherit pname version;
@@ -14,7 +14,7 @@ buildGoModule {
     owner = "keidarcy";
     repo = "e1s";
     tag = "v${version}";
-    hash = "sha256-ntuFMxuCrA0meE8tOnA9oPLLvYfXyhQgebBuKELeDgQ=";
+    hash = "sha256-9O6VRsO80d+ZvUbqt+AUqph9FXOWlwOdgJcqqiGBNC0=";
   };
 
   vendorHash = "sha256-1lise/u40Q8W9STsuyrWIbhf2HY+SFCytUL1PTSWvfY=";
diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix
index 2221fae577e6..42b49c8c0576 100644
--- a/pkgs/by-name/ea/eas-cli/package.nix
+++ b/pkgs/by-name/ea/eas-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "eas-cli";
-  version = "16.4.0";
+  version = "16.23.1";
 
   src = fetchFromGitHub {
     owner = "expo";
     repo = "eas-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cHayMBhqiLY//t/ljjwJm4qMuVn531z7x2cqJE4z6hQ=";
+    hash = "sha256-hMUDtl5lMAZzlvPdzO7J3JTw0B5/fjssuqQlg1MUO3w=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
-    hash = "sha256-qDUwAdShpKjIUyYvtA6/hgGdO1z1xLqdsJkL3oqkMSw=";
+    hash = "sha256-ybctj6TgW9JluDIsSaNm18wUXSBPuIT45te5HoQuz5s=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +31,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     jq
   ];
 
+  postPatch = ''
+    # Disable Nx integration in Lerna to avoid the native pseudo terminal panic in the sandbox.
+    tmpfile="$(mktemp)"
+    jq '.useNx = false' lerna.json > "$tmpfile"
+    mv "$tmpfile" lerna.json
+  '';
+
   # yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli.
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch b/pkgs/by-name/ea/easyaudiosync/0001-fix-project-name.patch
similarity index 100%
rename from pkgs/applications/audio/easyaudiosync/0001-fix-project-name.patch
rename to pkgs/by-name/ea/easyaudiosync/0001-fix-project-name.patch
diff --git a/pkgs/applications/audio/easyaudiosync/0003-fix-darwin-app.patch b/pkgs/by-name/ea/easyaudiosync/0003-fix-darwin-app.patch
similarity index 100%
rename from pkgs/applications/audio/easyaudiosync/0003-fix-darwin-app.patch
rename to pkgs/by-name/ea/easyaudiosync/0003-fix-darwin-app.patch
diff --git a/pkgs/applications/audio/easyaudiosync/0004-force-qt6.patch b/pkgs/by-name/ea/easyaudiosync/0004-force-qt6.patch
similarity index 100%
rename from pkgs/applications/audio/easyaudiosync/0004-force-qt6.patch
rename to pkgs/by-name/ea/easyaudiosync/0004-force-qt6.patch
diff --git a/pkgs/applications/audio/easyaudiosync/default.nix b/pkgs/by-name/ea/easyaudiosync/package.nix
similarity index 87%
rename from pkgs/applications/audio/easyaudiosync/default.nix
rename to pkgs/by-name/ea/easyaudiosync/package.nix
index a6f744db1b65..d57c432005e4 100644
--- a/pkgs/applications/audio/easyaudiosync/default.nix
+++ b/pkgs/by-name/ea/easyaudiosync/package.nix
@@ -4,24 +4,22 @@
   fetchFromGitHub,
   pkg-config,
   cmake,
-  qtbase,
-  qttools,
   spdlog,
   ffmpeg,
   taglib,
-  wrapQtAppsHook,
+  kdePackages,
   makeDesktopItem,
   copyDesktopItems,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "easyaudiosync";
   version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "complexlogic";
     repo = "EasyAudioSync";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-UCOL4DzynKjNDvS0HZ4/K+Wn5lOqHZ0bNop0zqJl5kc=";
   };
 
@@ -34,13 +32,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
 
   buildInputs = [
-    qtbase
-    qttools
+    kdePackages.qtbase
+    kdePackages.qttools
     ffmpeg
     spdlog
     taglib
@@ -82,7 +80,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Audio library syncing and conversion utility";
     longDescription = ''
       Easy Audio Sync is an audio library syncing and conversion utility.
@@ -94,8 +92,8 @@ stdenv.mkDerivation rec {
       GUI-based instead of CLI-based.
     '';
     homepage = "https://github.com/complexlogic/EasyAudioSync";
-    license = licenses.unlicense;
-    maintainers = with maintainers; [ matteopacini ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.unlicense;
+    maintainers = with lib.maintainers; [ matteopacini ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})
diff --git a/pkgs/by-name/ec/echidna/package.nix b/pkgs/by-name/ec/echidna/package.nix
index 1a6376cba4a5..ca4ca1d3c090 100644
--- a/pkgs/by-name/ec/echidna/package.nix
+++ b/pkgs/by-name/ec/echidna/package.nix
@@ -96,7 +96,7 @@ haskellPackages.mkDerivation rec {
     makeWrapper
   ];
 
-  preConfigure = ''
+  prePatch = ''
     hpack
   '';
 
diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index fcb115afdc95..57f8ecbe0cd6 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.99.1";
+  version = "1.100.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = "amazon-ecs-agent";
-    hash = "sha256-aGmXu+ho5H6vPTBWR5OvqDcmFQN87BOl99HGIek24CE=";
+    hash = "sha256-APkYhq4HGxgCNUWaaj5/xK6AwwUZAW4aom48ADd4R7g=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index 9c4ba0d8f086..c05d90e3f81b 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,20 +7,20 @@
 
 buildGoModule rec {
   pname = "ecspresso";
-  version = "2.6.1";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${version}";
-    hash = "sha256-kZKfhGOxtuZM6oytt/36AW8R2XVoKuLZdaj7NvoRWGA=";
+    hash = "sha256-ZruQx2Nm/1An9yGNhQ/2Kbah4eSFBD/pp3c6WZIBGXA=";
   };
 
   subPackages = [
     "cmd/ecspresso"
   ];
 
-  vendorHash = "sha256-tL/AjGU/Pi5ypcv9jqUukg6sGJqpPlHhwxzve7/KgDo=";
+  vendorHash = "sha256-oq2BOzSHwAq/gNBknwm1LXUKu+est/kjM1jlVBvQZbg=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
index 125341926c7d..05a174b9a69d 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -54,24 +54,24 @@
   "jakarta/platform#jakartaee-api-parent/9.1.0": {
    "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
   },
-  "net/jsign#jsign-core/7.2": {
-   "jar": "sha256-xzyar4S3WGndJhSk2eaIgajlImHtsKh6Uzgs8osLf00=",
-   "pom": "sha256-4DteLTjsvktBBuGdgKwCzPDQLIO6v4R9p4Jaa8HdK1Q="
+  "net/jsign#jsign-core/7.3": {
+   "jar": "sha256-bA9oYq6wsr2CyLAQI1/9kyg5InyW23aKyPsXhHkC9XA=",
+   "pom": "sha256-iBAcWvZMjJl+0DIQwLyFGLjInvcF0bKM5E49qse5F34="
   },
-  "net/jsign#jsign-crypto/7.2": {
-   "jar": "sha256-UJQnz8cturPc5ceYvV55rP+rID7v4E/D88/DAo3qNJc=",
-   "pom": "sha256-tDqAde1LDp0G++vg2fT9SbKaKtDCpLe0wHPEOTFC4dw="
+  "net/jsign#jsign-crypto/7.3": {
+   "jar": "sha256-slHwB5e/C8I1QbLxK8q3/relDaudPFAFHIPtIk2ZiRo=",
+   "pom": "sha256-ewX0NDiexnCXAihAy7CBudcRK9n4xlUYdS20NSEAN6s="
   },
-  "net/jsign#jsign-gradle-plugin/7.2": {
-   "jar": "sha256-+uyJfxc85kMoLWYEMxgLpN8W+SOl0y+xbuxL1JQtcpU=",
-   "module": "sha256-pdEQ33z7JGZdGHHECeUFeDhtsEPZpEZgWTuWvhjZ048=",
-   "pom": "sha256-j6lgWfT7m/xQJh0JJodpYUi8/9MnxA4dcnmfhebPtUs="
+  "net/jsign#jsign-gradle-plugin/7.3": {
+   "jar": "sha256-hIO6LPpch+KPHBOAvReuXeGTU4Ogz4gdZ3Lb9v+P0R4=",
+   "module": "sha256-HZbhMlaO0Uhz0JHItnQ+4kL3q+79Ky0BCEJ/zXOAeY8=",
+   "pom": "sha256-QnV3M85vh7bSorpuyXrb0NZrJzua/Dw7KN4+txkF9Ac="
   },
-  "net/jsign#jsign-parent/7.2": {
-   "pom": "sha256-BuIjfFMHFgcwGQh/4BcgrpDT/hRukfR3u1lqBH99vbc="
+  "net/jsign#jsign-parent/7.3": {
+   "pom": "sha256-nI9hwRHaJ0oG5ImYa76vDGTOpYY+6vYNvVO+ugov0yg="
   },
-  "net/jsign#net.jsign.gradle.plugin/7.2": {
-   "pom": "sha256-/fXnGXhngCBVFSar0Ns+U2jjaAwvpd8lzvoaw4i/06I="
+  "net/jsign#net.jsign.gradle.plugin/7.3": {
+   "pom": "sha256-1iba9d1D6mjxyJIpjy4Qpegv5jV/DLiQ2P3pb/p9a2c="
   },
   "net/rdrei/android/buildtimetracker#net.rdrei.android.buildtimetracker.gradle.plugin/0.11.0": {
    "pom": "sha256-SbQtvX9N5DU8ntUmpcpTtrTdDhla7rQR7L213fZ6kG8="
@@ -214,16 +214,16 @@
    "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=",
    "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o="
   },
-  "ch/qos/logback#logback-classic/1.5.18": {
-   "jar": "sha256-PhUz0DIfiBXu9GdQruARG0FVT5pGRMPE0tQEdEsJ9g8=",
-   "pom": "sha256-1VfNKrI95KR+zocGQhYqn5Rzn80LHDE+J4MlFO4gODM="
+  "ch/qos/logback#logback-classic/1.5.20": {
+   "jar": "sha256-EijbmeGvYC4ZGisUIlLYqvaBKeZDwZ5/khN85fcgmtM=",
+   "pom": "sha256-s+hotrfIsqgGswDIrsddcCeI/l5lM9P2ljYHmu1bU3c="
   },
-  "ch/qos/logback#logback-core/1.5.18": {
-   "jar": "sha256-hROee1e0ZPjl42Mm3YExdki+0ZnMxPmM1CWF+NdXECc=",
-   "pom": "sha256-x3JHKX1dm7ngTpLUyC51xujqviRUNokvkRQzW4t5DIM="
+  "ch/qos/logback#logback-core/1.5.20": {
+   "jar": "sha256-Kf4JW7e3+FCQeuw/3etAyNOZ2F5WgOjTUz49pdmq6Rc=",
+   "pom": "sha256-XFJJldocTKrot6y/aQFin468ltUkfZGw2afuCKsQ7Eo="
   },
-  "ch/qos/logback#logback-parent/1.5.18": {
-   "pom": "sha256-U8PiGxI7vTijAbQNDYFAlOrUehAj0h1hPMdI1w57nGk="
+  "ch/qos/logback#logback-parent/1.5.20": {
+   "pom": "sha256-Fwus2jsPfYA9jteOcPEg7Ncmu5qKk8F6MmfzP8HryiA="
   },
   "com/fasterxml#oss-parent/30": {
    "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA="
@@ -478,9 +478,9 @@
   "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
    "pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI="
   },
-  "io/github/classgraph#classgraph/4.8.181": {
-   "jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
-   "pom": "sha256-kj4br0msZAeQ30WHuMz0AfYG8L/HBZZh9xhVG2Jw8Ug="
+  "io/github/classgraph#classgraph/4.8.184": {
+   "jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=",
+   "pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA="
   },
   "io/github/pustike#commons-csv/1.7.0": {
    "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=",
@@ -505,10 +505,10 @@
    "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
    "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
   },
-  "io/sentry#sentry/8.22.0": {
-   "jar": "sha256-7QJzzosBRsvyeZkmkyqLWXiAlUkABQcC646p8eM6GOE=",
-   "module": "sha256-5ZOJtyrsJgmO9B7sNS7xLKh945o/o3sWdyKisjW5Zr8=",
-   "pom": "sha256-9wniVOh/5PhDESS1X9IEwhgiBqrl5PVCFINpVIr9HBE="
+  "io/sentry#sentry/8.23.0": {
+   "jar": "sha256-qbL8cx7DCXkJ/pOOb6f9F3spGNIwsbPXt1j115CNUFk=",
+   "module": "sha256-WLKcCwmvgkJJ3XEihti2Q4hrLql1wX4NPfcMcoFt2EI=",
+   "pom": "sha256-wWqaLKt1YvEdl9DEdmBJAWFmzPEvanTKmzp93YvPEY4="
   },
   "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
    "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
@@ -551,6 +551,10 @@
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
+  "me/xdrop#fuzzywuzzy/1.4.0": {
+   "jar": "sha256-I6LdH1S5EGdZRPTI1IRdfq8beA3Q6ol2NzP9C0OoJYo=",
+   "pom": "sha256-vbc6Si9VvNZAv42a4SlslYY2TK4Vxvw/MDsCdLCiJ3I="
+  },
   "net/bytebuddy#byte-buddy-agent/1.17.7": {
    "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
    "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
@@ -571,13 +575,13 @@
   "net/java#jvnet-parent/5": {
    "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
   },
-  "net/java/dev/jna#jna-platform/5.18.0": {
-   "jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=",
-   "pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58="
+  "net/java/dev/jna#jna-platform/5.18.1": {
+   "jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
+   "pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
   },
-  "net/java/dev/jna#jna/5.18.0": {
-   "jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=",
-   "pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs="
+  "net/java/dev/jna#jna/5.18.1": {
+   "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
+   "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
   },
   "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
    "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
@@ -840,55 +844,75 @@
    "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
    "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.13.4": {
-   "jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
-   "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
-   "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
+  "org/junit#junit-bom/5.14.0": {
+   "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=",
+   "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.13.4": {
-   "jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
-   "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
-   "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
+  "org/junit#junit-bom/6.0.0": {
+   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
+   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.13.4": {
-   "jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
-   "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
-   "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
+  "org/junit/jupiter#junit-jupiter-api/6.0.0": {
+   "jar": "sha256-iNaQ0tNzzWYXB3DDF5dxls6eRl8jiJMPS8lmXohzhfY=",
+   "module": "sha256-ulAS9rG1AydsxsokGUPC2bJuJFkCXowg3VjsMeumcXU=",
+   "pom": "sha256-rNeSzwaDpEvqadPP/uujfRm5kAwdnogijjKfJsRBNQM="
   },
-  "org/junit/jupiter#junit-jupiter/5.13.4": {
-   "jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
-   "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
-   "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
+  "org/junit/jupiter#junit-jupiter-engine/6.0.0": {
+   "jar": "sha256-j6HWw32ymm70cYO0mFHudnbwj9exwntozPOk5XzgL0g=",
+   "module": "sha256-/BOeA32ssQfRpQ6FVVg2h0+pwgKIwx17a86To9PoUEw=",
+   "pom": "sha256-qzyiIIkCJq8xuRVzeT+n8APHqBdSuskFZx3Krum5fXM="
   },
-  "org/junit/platform#junit-platform-commons/1.13.4": {
-   "jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
-   "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
-   "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
+  "org/junit/jupiter#junit-jupiter-params/6.0.0": {
+   "jar": "sha256-IIR+RcVT1R45JEbgM1UGnxOP4MUekdfvG9v/wNOvBFQ=",
+   "module": "sha256-VfWJwqiUZt40HEAL8AzdGihwp+bc1oUL2tcyLbONc7c=",
+   "pom": "sha256-91zeM8lEa0XsSlqaKC3LWyv7dj1KMKshv8+EgqZg5UI="
   },
-  "org/junit/platform#junit-platform-engine/1.13.4": {
-   "jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
-   "module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
-   "pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
+  "org/junit/jupiter#junit-jupiter/6.0.0": {
+   "jar": "sha256-jb8LIX4usBPWU9kW/BBgkklrfMrI8IQyiYHlXjZzrnE=",
+   "module": "sha256-YdlnTuitkcdk2IbQzTFjO1up967ad6okIPglNaJVXOE=",
+   "pom": "sha256-9j4gTo0IDEzis05lnzGVzHHYpKZrcyqAW5pv0rjyVrs="
   },
-  "org/junit/platform#junit-platform-launcher/1.13.4": {
-   "jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
-   "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
-   "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
+  "org/junit/platform#junit-platform-commons/1.14.0": {
+   "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=",
+   "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI="
   },
-  "org/junit/platform#junit-platform-runner/1.13.4": {
-   "jar": "sha256-ISaDWloIABNZhDxmhl2lgqo1pWsM+O3yzI0epCnL6ao=",
-   "module": "sha256-pozyPYUVEngVDtPLL+9m4mk1Oza26ZlfVnqwp7nIjyg=",
-   "pom": "sha256-C7mXJe+9m3MoLKcKCzpk2zbp4bHC/tOjPpLlIHXX3Lo="
+  "org/junit/platform#junit-platform-commons/6.0.0": {
+   "jar": "sha256-huj6+H8xUaPVRYUIUqDyzFXqiiQ07ungj4OIHFLVWZI=",
+   "module": "sha256-oNE82wfx2950q74HZmT/XcQEOtXRO/+UD3i55gTyElE=",
+   "pom": "sha256-lDFdk3FOzUB6kg2TOcj0S0DPCEBBMWMu1/m3dwzxCgU="
   },
-  "org/junit/platform#junit-platform-suite-api/1.13.4": {
-   "jar": "sha256-mgW/d+EoNx9bPiX/yJ969Gep9o3TZf387UaevPUzq8k=",
-   "module": "sha256-OfuRkgMHvFx6FjAHOpV2CiYURYJgiA0pO5F2wc0ImIQ=",
-   "pom": "sha256-hxhnBdIt+Wrdoe/aMqShB1f49lgAbxd350zvJ6XkLKg="
+  "org/junit/platform#junit-platform-engine/6.0.0": {
+   "jar": "sha256-b4GELpwT6ZfKxmtEYUUi82OUGeI4iuLQAMS8CmuS2T8=",
+   "module": "sha256-GcijGiINhY0hWr20mfYjuLxy/ig3jMBABI0ymTCliSE=",
+   "pom": "sha256-TD7A1PapQGLOgr3kLuvtHya5m7XLHWl24VmPzF+KSS0="
   },
-  "org/junit/platform#junit-platform-suite-commons/1.13.4": {
-   "jar": "sha256-59rPz6O8aSwKekE879X1GuQgQVoU05CRvfiK6/26cLY=",
-   "module": "sha256-WQtO531F+0Lf0GGccCGndnkgbQSJ9Cbn8Auazlmqvh0=",
-   "pom": "sha256-VOR+M8iA1vupejBP02oXJVdQLDRR2nQM2beBTp6Nh5k="
+  "org/junit/platform#junit-platform-launcher/1.14.0": {
+   "module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=",
+   "pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI="
+  },
+  "org/junit/platform#junit-platform-launcher/6.0.0": {
+   "jar": "sha256-Xwl7AMZxS7cez7XexitZu0wveJdj+v0ezpbE7w5sKA8=",
+   "module": "sha256-/OwWMsXFlyf/nn6jCKmTh9ci/6iC2FzKUFKv7Iw47ug=",
+   "pom": "sha256-RwG8mhY9lbI1zhatdt4Z8qyFTFyjT689LsThAYsIzHQ="
+  },
+  "org/junit/platform#junit-platform-runner/1.14.0": {
+   "jar": "sha256-PtsxSpMnsqcyMAAOmFCmf0CnVcj03CKLiKTGsFO0gRM=",
+   "module": "sha256-QBQISBtUFXXU/7SRBPdRbfexxp8Nj+pcAQwdJ92v9lU=",
+   "pom": "sha256-Nl+KzheLaRQi9D6bMXgpQ+6jo6sHVnDVnhP/6I0dvEk="
+  },
+  "org/junit/platform#junit-platform-suite-api/1.14.0": {
+   "module": "sha256-tx89J31twkIWiSbi7Bh/Krxruz+hW5aoR3ep3gxL068=",
+   "pom": "sha256-BDhG11banrl+29u1t5momv0fhNUBleBbVfKQMZlCmaY="
+  },
+  "org/junit/platform#junit-platform-suite-api/6.0.0": {
+   "jar": "sha256-JDr0KmCoOf21WE7wCKNClWOSq3UXOI/v4jx8Iqm7PsY=",
+   "module": "sha256-GglozfimQNCDuT9Tb78XOzVS2vcnp6RXSqrXXjLixJc=",
+   "pom": "sha256-r+n5I0po+iwNbxJLD8gAm0nAuWpl9nh4t+StAk505s8="
+  },
+  "org/junit/platform#junit-platform-suite-commons/1.14.0": {
+   "jar": "sha256-uGgjf4yy4ZN3Xj9xK5QFyz1P+qGAV5zIOn/h9tucXME=",
+   "module": "sha256-2b8/TF1wJ0gCDDgzNw47kevnlo80Eq9txTKGlrSfptE=",
+   "pom": "sha256-9Uvj4x1RgvEvW/xo8yuE5hfQtmuazPI9kukalCJojlA="
   },
   "org/leadpony/justify#justify-parent/3.1.0": {
    "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0="
@@ -1104,6 +1128,11 @@
     "release": "1.5"
    }
   },
+  "jixxed/ed/confidential#ed-confidential-api/1.3": {
+   "jar": "sha256-iPBjgHIFGjuquG+zga0ZdTxMMIEqAquzGt41IDriGKw=",
+   "module": "sha256-THaam0o2oBL75yHgsXW7+pPz3lbjf9ktcRL+N+WFs98=",
+   "pom": "sha256-0pk2PyeZ6u7PJSqzsCwdwv90wpXnOAoRHaHYpIBGLDc="
+  },
   "jixxed/lept4j#lept4j/1.16.6": {
    "jar": "sha256-39j+jS92/MW/A8WLaUZYKTkNPB+0IgNWkjcau9MMlx0=",
    "module": "sha256-fPk3r5TQdJrz0O5SgutXUWnI44UqKJxPBiiQC+wcSgA=",
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
index 38b9eade1aec..66882f5d6de2 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "3.0.7";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-TcRj+TZ4shY1UAE7TseRXZZJZtL8aaD79pBL9LeoMJA=";
+    hash = "sha256-2xUMl8AqZD/v+js/QyWBD4RfV8nfCAqVr0UgWaOtBrk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 2dbf5e9fbb2c..87ca034575fd 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -20,7 +20,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edencommon";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebookexperimental";
     repo = "edencommon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KyJAosCLGnpEG968GV9BOyOrsoHS7BbRatTfBqzTelU=";
+    hash = "sha256-yR0J1tfzdAFopApKsiv9yUXlU0W0Q6n6ZlmKlcVbi0E=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 4cb6662c086c..ff523a052d32 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -15,6 +15,7 @@
   miniz,
   yaml-cpp,
   udevCheckHook,
+  applyPatches,
   # List of targets to build simulators for
   targetsToBuild ? import ./targets.nix,
 }:
@@ -36,18 +37,24 @@ let
       libclang
     ]
   );
+
+  # paches are needed to fix build with CMake 4
+  yaml-cppSrc = applyPatches {
+    inherit (yaml-cpp) src;
+    patches = yaml-cpp.patches or [ ];
+  };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edgetx";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = "edgetx";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-F3T1lX0FSSUIQxSlqLQHj7JrfF+20Ndv63zDA0sRzFQ=";
+    hash = "sha256-vlJsfebTWhdh6HDpUEA1QJJSVGMlcL49XFwIx4A9zHs=";
   };
 
   nativeBuildInputs = [
@@ -93,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Unvendoring these libraries is infeasible. At least lets reuse the same sources.
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZ" "${miniz.src}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cppSrc}")
     # Custom library https://github.com/edgetx/maxLibQt.
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MAXLIBQT" "${maxlibqt}")
     (lib.cmakeFeature "DFU_UTIL_ROOT_DIR" "${lib.getBin dfu-util}/bin")
@@ -168,6 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
     homepage = "https://edgetx.org/";
+    changelog = "https://github.com/EdgeTX/edgetx/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2Only;
     platforms = [
       "i686-linux"
diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix
index 781d71ef3078..9adad1a48c13 100644
--- a/pkgs/by-name/ed/edk2/package.nix
+++ b/pkgs/by-name/ed/edk2/package.nix
@@ -33,14 +33,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edk2";
-  version = "202508";
+  version = "202508.01";
 
   srcWithVendoring = fetchFromGitHub {
     owner = "tianocore";
     repo = "edk2";
     tag = "edk2-stable${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk=";
+    hash = "sha256-BgNNKA+YFeaZDm1mLzBN3VA7RAwNT9MXV3JX5ZLrFOo=";
   };
 
   src = applyPatches {
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
       #!nix-shell -i bash -p common-updater-scripts coreutils gnused
       set -eu -o pipefail
       version="$(list-git-tags --url="${finalAttrs.srcWithVendoring.url}" |
-                 sed -E --quiet 's/^edk2-stable([0-9]{6})$/\1/p' |
+                 sed -E --quiet 's/^edk2-stable([0-9\\.]+)$/\1/p' |
                  sort --reverse --numeric-sort |
                  head -n 1)"
       if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then
diff --git a/pkgs/by-name/ed/edlib/package.nix b/pkgs/by-name/ed/edlib/package.nix
index 9358ca49435c..58db3cfc218d 100644
--- a/pkgs/by-name/ed/edlib/package.nix
+++ b/pkgs/by-name/ed/edlib/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
 }:
 
@@ -16,6 +17,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-XejxohLVdBBzpYZ//OpqC1ActmCaZ8tunJyhOYtZmKQ=";
   };
 
+  patches = [
+    # Bump minimum CMake version to 3.20
+    (fetchpatch {
+      name = "bump-cmake-version.patch";
+      url = "https://github.com/Martinsos/edlib/commit/47359e591f3861f12105fa8e72242de64d5597c4.patch?full_index=1";
+      hash = "sha256-Efbv8XYF1jOz6MypIyhfFJGQQt8gTYNZRd+R8ukIf3o=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   doCheck = true;
diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index 84fa68acfff0..5b449a5416a6 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -27,14 +27,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "eduke32";
-  version = "0-unstable-2025-09-13";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitLab {
     domain = "voidpoint.io";
     owner = "terminx";
     repo = "eduke32";
-    rev = "e5aad188685d005f8ad65478384693fc0dc0c83f";
-    hash = "sha256-0iICExzsw/l/QjGJDJ6X+08+dzwsA+6tjaOWKNrXsjs=";
+    rev = "227c11dee0abaa57bbc22b06f0002e064efa7191";
+    hash = "sha256-bWty/eOq5dWltNREo9ba68pWDpBxOIfjJK1EtZ27l1U=";
     deepClone = true;
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix
index 8be454f4b069..0b4707c79499 100644
--- a/pkgs/by-name/ee/ee/package.nix
+++ b/pkgs/by-name/ee/ee/package.nix
@@ -1,23 +1,23 @@
 {
   lib,
   stdenv,
-  nix-update-script,
-  fetchgit,
+  fetchFromGitHub,
   ncurses,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
   pname = "ee";
-  version = "1.5.2";
+  version = "1.5.2-unstable-2024-06-20";
 
-  src = fetchgit {
-    url = "https://git.freebsd.org/src.git";
-    tag = "release/14.3.0";
-    outputHash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0=";
+  src = fetchFromGitHub {
+    owner = "freebsd";
+    repo = "freebsd-src";
+    rev = "0667538b888c1171932c6cf28b62fc19d393e119";
+    hash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0=";
     rootDir = "contrib/ee";
   };
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;
 
   buildInputs = [ ncurses ];
 
@@ -48,5 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd2;
     platforms = lib.platforms.unix;
     mainProgram = "ee";
+    maintainers = with lib.maintainers; [ qweered ];
   };
-})
+}
diff --git a/pkgs/by-name/ee/ee/update.sh b/pkgs/by-name/ee/ee/update.sh
new file mode 100755
index 000000000000..29a5460e7daf
--- /dev/null
+++ b/pkgs/by-name/ee/ee/update.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq common-updater-scripts
+set -euo pipefail
+
+owner=freebsd
+repo=freebsd-src
+path=contrib/ee
+pkg_file=./pkgs/by-name/ee/ee/package.nix
+
+api_url_latest="https://api.github.com/repos/$owner/$repo/commits?path=$path&per_page=1"
+json_latest=$(curl -sSfL -H "Accept: application/vnd.github+json" ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$api_url_latest")
+latest_rev=$(printf '%s' "$json_latest" | jq -r '.[0].sha')
+latest_date=$(printf '%s' "$json_latest" | jq -r '.[0].commit.committer.date' | cut -dT -f1)
+
+if [[ -z "${latest_rev:-}" || "$latest_rev" == "null" ]]; then
+  echo "Failed to fetch latest commit for path $path" >&2
+  exit 1
+fi
+
+# Fetch EE_VERSION from that commit
+raw_url="https://raw.githubusercontent.com/$owner/$repo/$latest_rev/$path/ee_version.h"
+ee_version=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$raw_url" | sed -n 's/^#define[[:space:]]*EE_VERSION[[:space:]]*"\([^"]*\)".*/\1/p')
+if [[ -z "${ee_version:-}" ]]; then
+  echo "Failed to parse EE_VERSION from ee_version.h at $latest_rev" >&2
+  exit 1
+fi
+
+new_version="${ee_version}-unstable-${latest_date}"
+
+update-source-version ee "$new_version" --rev="$latest_rev" --file="$pkg_file" --ignore-same-version --print-changes
diff --git a/pkgs/by-name/eg/egctl/package.nix b/pkgs/by-name/eg/egctl/package.nix
index 9d027e492d69..631771a68d0c 100644
--- a/pkgs/by-name/eg/egctl/package.nix
+++ b/pkgs/by-name/eg/egctl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "egctl";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "envoyproxy";
     repo = "gateway";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j0X9v6jDvwf/roMkL/abbVKOEeCKtlpWEZ+U5TlBjxw=";
+    hash = "sha256-H+YjDWAm6ft1JewuUFpqYyCYxZMn7elPFRoDU+AzBUU=";
   };
 
   vendorHash = "sha256-SNXnEutsDQwoGKiJN3uXxVrCl4gFcd62ZuX8GPyGliI=";
diff --git a/pkgs/by-name/eg/eget/package.nix b/pkgs/by-name/eg/eget/package.nix
index 751e81a62008..c518330c8637 100644
--- a/pkgs/by-name/eg/eget/package.nix
+++ b/pkgs/by-name/eg/eget/package.nix
@@ -6,17 +6,16 @@
   installShellFiles,
   nix-update-script,
   testers,
-  eget,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "eget";
   version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "zyedidia";
     repo = "eget";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-jhVUYyp6t5LleVotQQme07IJVdVnIOVFFtKEmzt8e2k=";
   };
 
@@ -25,7 +24,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.Version=v${version}"
+    "-X main.Version=v${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [
@@ -34,6 +33,7 @@ buildGoModule rec {
   ];
 
   postInstall = ''
+    rm $out/bin/{test,tools}
     pandoc man/eget.md -s -t man -o eget.1
     installManPage eget.1
   '';
@@ -41,16 +41,16 @@ buildGoModule rec {
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
-      package = eget;
+      package = finalAttrs.finalPackage;
       command = "eget -v";
-      version = "v${version}";
+      version = "v${finalAttrs.version}";
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Easily install prebuilt binaries from GitHub";
     homepage = "https://github.com/zyedidia/eget";
-    license = licenses.mit;
-    maintainers = with maintainers; [ zendo ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zendo ];
   };
-}
+})
diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix
index bb7951be9514..f2d549b443d4 100644
--- a/pkgs/by-name/eg/egglog/package.nix
+++ b/pkgs/by-name/eg/egglog/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/egraphs-good/egglog";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       XBagon
     ];
   };
diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index c632cacdd15c..0dd756c2ece0 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoconf-archive,
   autoreconfHook,
-  makeWrapper,
+  makeBinaryWrapper,
   pkg-config,
   replaceVarsWith,
   curl,
@@ -20,38 +20,42 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eid-mw";
   # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
-  version = "5.1.23";
+  version = "5.1.25";
 
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
-    rev = "v${version}";
-    hash = "sha256-nZn3LSXn8g0mtorJZjE9nc8vf99buwvW1fdxHOAsIwU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LdOfwgRGyNK+a4SByClPgH9SrDeCdnhI9sLO7agsNsA=";
   };
 
   postPatch = ''
-    sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
-    substituteInPlace configure.ac --replace 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
+    sed 's@m4_esyscmd_s(.*,@[${finalAttrs.version}],@' -i configure.ac
+    substituteInPlace configure.ac \
+      --replace-fail 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
   '';
 
+  strictDeps = true;
+
   nativeBuildInputs = [
-    wrapGAppsHook3
-    autoreconfHook
     autoconf-archive
+    autoreconfHook
+    libassuan
+    makeBinaryWrapper
+    openssl
     pkg-config
-    makeWrapper
+    wrapGAppsHook3
   ];
+
   buildInputs = [
     curl
     gtk3
-    libassuan
     libbsd
     libproxy
     libxml2
-    openssl
     p11-kit
     pcsclite
   ];
@@ -62,9 +66,8 @@ stdenv.mkDerivation rec {
     ln -s ${openssl.bin}/bin openssl
     ln -s ${openssl.dev}/include openssl
     export SSL_PREFIX=$(realpath openssl)
-    substituteInPlace plugins_tools/eid-viewer/Makefile.in \
-      --replace "c_rehash" "openssl rehash"
   '';
+
   # pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.
   configureFlags = [ "--disable-pinentry" ];
 
@@ -81,20 +84,21 @@ stdenv.mkDerivation rec {
     ''
       install -D ${eid-nssdb-in} $out/bin/eid-nssdb
       substituteInPlace $out/bin/eid-nssdb \
-        --replace "modutil" "${nssTools}/bin/modutil"
+        --replace-fail "modutil" "${lib.getExe' nssTools "modutil"}"
 
       rm $out/bin/about-eid-mw
-      wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
+      wrapProgram $out/bin/eid-viewer \
+        --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
     '';
 
   enableParallelBuilding = true;
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = "https://eid.belgium.be/en";
-    license = licenses.lgpl3Only;
+    license = lib.licenses.lgpl3Only;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
       Also requires a running pcscd service and compatible card reader.
@@ -117,10 +121,10 @@ stdenv.mkDerivation rec {
 
           firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
     '';
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       bfortz
       chvp
     ];
   };
-}
+})
diff --git a/pkgs/by-name/ei/eigen/include-dir.patch b/pkgs/by-name/ei/eigen/include-dir.patch
deleted file mode 100644
index 9928bbdbed1b..000000000000
--- a/pkgs/by-name/ei/eigen/include-dir.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,5 @@
- # cmake_minimum_require must be the first command of the file
--cmake_minimum_required(VERSION 3.5.0)
-+cmake_minimum_required(VERSION 3.7.0)
- 
- project(Eigen3)
- 
-@@ -443,7 +443,7 @@ set(PKGCONFIG_INSTALL_DIR
-     CACHE PATH "The directory relative to CMAKE_INSTALL_PREFIX where eigen3.pc is installed"
-     )
- 
--foreach(var INCLUDE_INSTALL_DIR CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
-+foreach(var CMAKEPACKAGE_INSTALL_DIR PKGCONFIG_INSTALL_DIR)
-   # If an absolute path is specified, make it relative to "{CMAKE_INSTALL_PREFIX}".
-   if(IS_ABSOLUTE "${${var}}")
-     file(RELATIVE_PATH "${var}" "${CMAKE_INSTALL_PREFIX}" "${${var}}")
-@@ -466,13 +466,6 @@ install(FILES
-   DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel
-   )
- 
--if(EIGEN_BUILD_PKGCONFIG)
--    configure_file(eigen3.pc.in eigen3.pc @ONLY)
--    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
--        DESTINATION ${PKGCONFIG_INSTALL_DIR}
--        )
--endif()
--
- install(DIRECTORY Eigen DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
- 
- 
-@@ -593,8 +586,15 @@ set ( EIGEN_VERSION_MAJOR  ${EIGEN_WORLD_VERSION} )
- set ( EIGEN_VERSION_MINOR  ${EIGEN_MAJOR_VERSION} )
- set ( EIGEN_VERSION_PATCH  ${EIGEN_MINOR_VERSION} )
- set ( EIGEN_DEFINITIONS "")
--set ( EIGEN_INCLUDE_DIR "${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}" )
- set ( EIGEN_ROOT_DIR ${CMAKE_INSTALL_PREFIX} )
-+GNUInstallDirs_get_absolute_install_dir(EIGEN_INCLUDE_DIR INCLUDE_INSTALL_DIR)
-+
-+if(EIGEN_BUILD_PKGCONFIG)
-+    configure_file(eigen3.pc.in eigen3.pc @ONLY)
-+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc
-+        DESTINATION ${PKGCONFIG_INSTALL_DIR}
-+        )
-+endif()
- 
- include (CMakePackageConfigHelpers)
- 
---- a/eigen3.pc.in
-+++ b/eigen3.pc.in
-@@ -6,4 +6,4 @@ Description: A C++ template library for linear algebra: vectors, matrices, and r
- Requires:
- Version: @EIGEN_VERSION_NUMBER@
- Libs:
--Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@
-+Cflags: -I@EIGEN_INCLUDE_DIR@
diff --git a/pkgs/by-name/ei/eigen/package.nix b/pkgs/by-name/ei/eigen/package.nix
index 898f83d2d136..430b27f5be96 100644
--- a/pkgs/by-name/ei/eigen/package.nix
+++ b/pkgs/by-name/ei/eigen/package.nix
@@ -1,43 +1,60 @@
 {
   lib,
+
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
+
+  # nativeBuildInputs
   cmake,
+
+  # nativeCheckInputs
+  ctestCheckHook,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eigen";
-  version = "3.4.0-unstable-2022-05-19";
+  version = "3.4.1";
 
   src = fetchFromGitLab {
     owner = "libeigen";
     repo = "eigen";
-    rev = "e7248b26a1ed53fa030c5c459f7ea095dfd276ac";
-    hash = "sha256-uQ1YYV3ojbMVfHdqjXRyUymRPjJZV3WHT36PTxPRius=";
+    tag = finalAttrs.version;
+    hash = "sha256-NSq1tUfy2thz5gtsyASsKeYE4vMf71aSG4uXfrX86rk=";
   };
 
   patches = [
-    ./include-dir.patch
+    # fix bug1213 test
+    # ref https://gitlab.com/libeigen/eigen/-/merge_requests/2005 merged upstream
+    (fetchpatch {
+      url = "https://gitlab.com/libeigen/eigen/-/commit/3e1367a3b5efcdc8ce716db77a322cedeb5e01b4.patch";
+      hash = "sha256-oykUbzaZeVW1A8nBoiMtJvh68Zpu7PDFtAfAjtTQoC0=";
+    })
   ];
 
-  # ref. https://gitlab.com/libeigen/eigen/-/merge_requests/977
-  # This was merged upstream and can be removed on next release
-  postPatch = ''
-    substituteInPlace Eigen/src/SVD/BDCSVD.h --replace-fail \
-      "if (l == 0) {" \
-      "if (i >= k && l == 0) {"
-  '';
+  nativeBuildInputs = [
+    cmake
+  ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
 
-  meta = with lib; {
+  cmakeFlags = [
+    (lib.cmakeBool "EIGEN_LEAVE_TEST_IN_ALL_TARGET" true) # Build tests in parallel
+  ];
+
+  # too many flaky tests
+  doCheck = false;
+
+  meta = {
     homepage = "https://eigen.tuxfamily.org";
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [
       sander
       raskin
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/ei/eigen2/cmake-4-build.patch b/pkgs/by-name/ei/eigen2/cmake-4-build.patch
new file mode 100644
index 000000000000..2fa18bbfc9d3
--- /dev/null
+++ b/pkgs/by-name/ei/eigen2/cmake-4-build.patch
@@ -0,0 +1,47 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index bb12a7cf5..932187427 100644
+--- i/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(Eigen)
+-cmake_minimum_required(VERSION 2.6.2)
++cmake_minimum_required(VERSION 3.10)
+ 
+ set(INCLUDE_INSTALL_DIR
+     "${CMAKE_INSTALL_PREFIX}/include/eigen2"
+diff --git i/doc/examples/CMakeLists.txt w/doc/examples/CMakeLists.txt
+index 9db5b1f58..b535ae80e 100644
+--- i/doc/examples/CMakeLists.txt
++++ w/doc/examples/CMakeLists.txt
+@@ -8,12 +8,10 @@ ADD_EXECUTABLE(${example} ${example_src})
+ if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
+   target_link_libraries(${example} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
+ endif()
+-GET_TARGET_PROPERTY(example_executable
+-                    ${example} LOCATION)
+ ADD_CUSTOM_COMMAND(
+   TARGET ${example}
+   POST_BUILD
+-  COMMAND ${example_executable}
++  COMMAND ${example}
+   ARGS >${CMAKE_CURRENT_BINARY_DIR}/${example}.out
+ )
+ ADD_DEPENDENCIES(all_examples ${example})
+diff --git i/doc/snippets/CMakeLists.txt w/doc/snippets/CMakeLists.txt
+index 7458830b0..153dbfc68 100644
+--- i/doc/snippets/CMakeLists.txt
++++ w/doc/snippets/CMakeLists.txt
+@@ -14,12 +14,10 @@ ADD_EXECUTABLE(${compile_snippet_target}
+ if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
+   target_link_libraries(${compile_snippet_target} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
+ endif()
+-GET_TARGET_PROPERTY(compile_snippet_executable
+-                    ${compile_snippet_target} LOCATION)
+ ADD_CUSTOM_COMMAND(
+   TARGET ${compile_snippet_target}
+   POST_BUILD
+-  COMMAND ${compile_snippet_executable}
++  COMMAND ${compile_snippet_target}
+   ARGS >${CMAKE_CURRENT_BINARY_DIR}/${snippet}.out
+ )
+ ADD_DEPENDENCIES(all_snippets ${compile_snippet_target})
diff --git a/pkgs/by-name/ei/eigen2/package.nix b/pkgs/by-name/ei/eigen2/package.nix
index 2df45c985510..961879811827 100644
--- a/pkgs/by-name/ei/eigen2/package.nix
+++ b/pkgs/by-name/ei/eigen2/package.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  # CMake 2.6.2 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  patches = [ ./cmake-4-build.patch ];
+
   meta = with lib; {
     homepage = "https://eigen.tuxfamily.org";
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";
diff --git a/pkgs/by-name/ei/eigenrand/package.nix b/pkgs/by-name/ei/eigenrand/package.nix
index 954c1fa296c2..2b35100d103f 100644
--- a/pkgs/by-name/ei/eigenrand/package.nix
+++ b/pkgs/by-name/ei/eigenrand/package.nix
@@ -2,6 +2,7 @@
   cmake,
   eigen,
   fetchFromGitHub,
+  fetchpatch,
   gtest,
   lib,
   stdenv,
@@ -18,6 +19,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mrpkWIb6kfLvppmIfzhjF1/3m1zSd8XG1D07V6Zjlu0=";
   };
 
+  patches = [
+    # ref. https://github.com/bab2min/EigenRand/pull/61 merged upstream
+    (fetchpatch {
+      name = "support-eigen-341.patch";
+      url = "https://github.com/bab2min/EigenRand/commit/8114df93b4c8a84a4f853380f0875a2c9d683cd0.patch";
+      hash = "sha256-2KivLlyYGSRZurtxLghNfWwUNEUNWZdC6q+H65EPLnQ=";
+    })
+  ];
+
   # Avoid downloading googletest: we already have it.
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace-fail \
diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix
index 068c0cf73c70..3528b88e5cae 100644
--- a/pkgs/by-name/ei/eiquadprog/package.nix
+++ b/pkgs/by-name/ei/eiquadprog/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eiquadprog";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "eiquadprog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8CwyTREHzTtgXTnzAIcRAlKm3fBEUEeMxNwzzEMADqk=";
+    hash = "sha256-FV6A3cMaY7+eDip9YjuX0cYz0X6tdpDRV57eXOb9bKQ=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index d6c6534257cb..bd2108bac3cb 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -19,7 +19,6 @@
   gawk,
   fetchFromGitHub,
   fetchgit,
-  fetchpatch2,
   beamPackages,
   nixosTests,
   withMysql ? false,
@@ -141,7 +140,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "25.08";
+  version = "25.10";
 
   nativeBuildInputs = [
     makeWrapper
@@ -171,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-nipFr4ezo2prlpLfAW8iu8HAG8nhkIXXiAbsoM7QKTM=";
+    hash = "sha256-dTu3feSOakSHdk+hMDvYQwog64O3e/z5NOsGM3Rq7WY=";
   };
 
   passthru.tests = {
@@ -217,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Open-source XMPP application server written in Erlang";
     mainProgram = "ejabberdctl";
+    changelog = "https://github.com/processone/ejabberd/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     homepage = "https://www.ejabberd.im";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index 5f102ca8151a..cc082f0cc89d 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -44,21 +44,21 @@ let
     };
     yconf = builder {
       name = "yconf";
-      version = "1.0.21";
+      version = "1.0.22";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.21";
-        sha256 = "sha256-xSSl8f2Gh12FtGnMLjaMIE+XzKHDkYc24h9QAcAdCWw=";
+        version = "1.0.22";
+        sha256 = "sha256-rKg0V86r5wdWSEtch7p7GVX1EdSZFoaH6uqnwwDoV/E=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.11.1";
+      version = "1.11.2";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.11.1";
-        sha256 = "sha256-pckz35BKs87BVCXaM05BDOhOw657ge/gaeXbNop7NxY=";
+        version = "1.11.2";
+        sha256 = "sha256-u2gWROFePvwACKs6cXlE1nz2EaS340Q4KqY2dEe9UtI=";
       };
       beamDeps = [
         ezlib
@@ -124,11 +124,11 @@ let
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.35";
+      version = "1.1.36";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.35";
-        sha256 = "sha256-6ZWURGxBHGYGlnlbBiM29cS9gARR2PYgu01M4wTiVcI=";
+        version = "1.1.36";
+        sha256 = "sha256-gryouJXIT0YA641gmjLLX91yp/W9k437KReeCMZD/Qk=";
       };
       beamDeps = [ xmpp ];
     };
@@ -154,11 +154,11 @@ let
     };
     p1_acme = builder {
       name = "p1_acme";
-      version = "1.0.28";
+      version = "1.0.29";
       src = fetchHex {
         pkg = "p1_acme";
-        version = "1.0.28";
-        sha256 = "sha256-zmhpht4/nV/Sha/odSPLRTKaNJxsa+eswe2RZyXUZCM=";
+        version = "1.0.29";
+        sha256 = "sha256-CP049/vi3CiiN6obOLMGtzRVaVzIiBo93WoRt8Ufe8c=";
       };
       beamDeps = [
         base64url
diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix
index 9aec4ac36228..9226f72ae75e 100644
--- a/pkgs/by-name/ej/ejsonkms/package.nix
+++ b/pkgs/by-name/ej/ejsonkms/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ejsonkms";
-  version = "0.2.8";
+  version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "envato";
     repo = "ejsonkms";
     rev = "v${version}";
-    hash = "sha256-qsPn9opDyahyYSOXO9GB2RSHNZupXlAUIxPJRyVgqQo=";
+    hash = "sha256-IQZYpxY6t7W9a3PKc9o7+MbOOxsa0Hs1H8HneilrdBs=";
   };
 
-  vendorHash = "sha256-DovbNZBdJxLpdggaxbe90pqHjl4fp4D7IZT9Z/j3yLI=";
+  vendorHash = "sha256-xOp02g7F1rb3Zq8lbjvDrYrFrcT+msv/KUqQd2qVKdA=";
 
   ldflags = [
     "-X main.version=v${version}"
diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index cd9d92407cd8..42b6c34c761c 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.215.0";
+  version = "0.216.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "eksctl";
     rev = version;
-    hash = "sha256-4voPrM5HNEcM0Xa5rVt18pgTSFcgPii3MZo1+QZ9PwE=";
+    hash = "sha256-uHwBzX/85B2oKmB0N4+uNxYzeAJpKSJamgu9M7bB3fg=";
   };
 
-  vendorHash = "sha256-+fAmY932lvD/4Jiq7vd2N/rcKw5Q2pkPnQFD1P2mU8w=";
+  vendorHash = "sha256-pELsbEy+VUkGXywJQpPNGL2o00BoO9OPnrS148gMRFA=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/el/elasticmq-server-bin/package.nix b/pkgs/by-name/el/elasticmq-server-bin/package.nix
index 6b1d2860f4bc..5490d46aced7 100644
--- a/pkgs/by-name/el/elasticmq-server-bin/package.nix
+++ b/pkgs/by-name/el/elasticmq-server-bin/package.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "elasticmq-server";
-  version = "1.6.14";
+  version = "1.6.15";
 
   src = fetchurl {
     url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar";
-    sha256 = "sha256-HVllLHz6zutonaLFwgyQKYSZxfp5QMslxf/PlzGWyG4=";
+    sha256 = "sha256-alxRZFx+Ulk4KYnlIVOClajk2MmfnfUooku2dMJd7c4=";
   };
 
   # don't do anything?
diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index b113722a0d9a..a5034a0f1ae1 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.12.1";
+  "version" = "1.12.3";
   "hashes" = {
-    "desktopSrcHash" = "sha256-4C4WJ3HjiXh24umt80lWujeiDvRaS1mf2IjCj6+n87U=";
-    "desktopYarnHash" = "sha256-CyP0zy/nJoGolmB/p81jL0qAoD7d5xe5kvlmKW7Yaw8=";
+    "desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8=";
+    "desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix
index 5a1274349537..159a1db2aaea 100644
--- a/pkgs/by-name/el/element-desktop/yarn.nix
+++ b/pkgs/by-name/el/element-desktop/yarn.nix
@@ -1,5 +1,6 @@
 {
   stdenvNoCC,
+  nodejs,
   yarn,
   cacert,
   git,
@@ -13,6 +14,7 @@ stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     cacert
+    nodejs
     yarn
     git
   ];
@@ -26,6 +28,10 @@ stdenvNoCC.mkDerivation {
     export YARN_ENABLE_TELEMETRY=0
 
     yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive
+    # Apply upstream patch
+    # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
+    # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
+    node ./node_modules/patch-package/index.js
 
     mkdir -p $out/node_modules
     cp -r node_modules/* $out/node_modules/
diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 1b8cdd761417..f3f416350178 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.12.1";
+  "version" = "1.12.3";
   "hashes" = {
-    "webSrcHash" = "sha256-c9VoR+F33xDvLn4PkPGBXW5+Yl9vX7FzedN6HfjfHEI=";
-    "webYarnHash" = "sha256-Bu0rrzPNRdY5G/nhSlhXpBMq6tcjuc16s0UQR64gUc8=";
+    "webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A=";
+    "webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k=";
   };
 }
diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix
index 9b69efdc42de..db1c0b053bd0 100644
--- a/pkgs/by-name/el/elfutils/package.nix
+++ b/pkgs/by-name/el/elfutils/package.nix
@@ -28,11 +28,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
   pname = "elfutils";
-  version = "0.193";
+  version = "0.194";
 
   src = fetchurl {
     url = "https://sourceware.org/elfutils/ftp/${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-eFf0S2JPTY1CHfhRqq57FALP5rzdLYBJ8V/AfT3edjU=";
+    hash = "sha256-CeL/Az05uqiziKLX+8U5C/3pmuO3xnx9qvdDP7zw8B4=";
   };
 
   patches = [
@@ -110,18 +110,6 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "strictflexarrays3" ];
 
-  # build elfutils out-of-source-tree to avoid ./stack inclusion
-  # as a c++ header on libc++: https://sourceware.org/PR33103
-  preConfigure =
-    if (stdenv.targetPlatform.useLLVM or false) then
-      ''
-        mkdir build-tree
-        cd build-tree
-      ''
-    else
-      null;
-  configureScript = if (stdenv.targetPlatform.useLLVM or false) then "../configure" else null;
-
   configureFlags = [
     "--program-prefix=eu-" # prevent collisions with binutils
     "--enable-deterministic-archives"
@@ -146,14 +134,6 @@ stdenv.mkDerivation rec {
     && (stdenv.hostPlatform == stdenv.buildPlatform);
   doInstallCheck = !stdenv.hostPlatform.isMusl && (stdenv.hostPlatform == stdenv.buildPlatform);
 
-  preCheck = ''
-    # Workaround lack of rpath linking:
-    #   ./dwarf_srclang_check: error while loading shared libraries:
-    #     libelf.so.1: cannot open shared object file: No such file or directory
-    # Remove once https://sourceware.org/PR32929 is fixed.
-    export LD_LIBRARY_PATH="$PWD/libelf:$LD_LIBRARY_PATH"
-  '';
-
   passthru.updateScript = gitUpdater {
     url = "https://sourceware.org/git/elfutils.git";
     rev-prefix = "elfutils-";
diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix
index 167f39b29877..064d181d76fe 100644
--- a/pkgs/by-name/el/eliza/package.nix
+++ b/pkgs/by-name/el/eliza/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eliza";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-28";
   src = fetchFromGitHub {
     owner = "anthay";
     repo = "ELIZA";
-    rev = "448707201101635eb4a56911d2d45f5b36e4a3cd";
-    hash = "sha256-tCNuF+WbukSL9Sp8mCdjJUMRV4hlbCDsrMdpe8Xi84U=";
+    rev = "e4c47439232c162ca0d515c5f8e1a714a80fefc0";
+    hash = "sha256-xHJLn/nxs8nWwXJE8p8fVhHzeIo1H3gxW5g4/jGCSx8=";
   };
 
   doCheck = true;
diff --git a/pkgs/by-name/el/elkhound/package.nix b/pkgs/by-name/el/elkhound/package.nix
index 8f8daf2823ad..dc170614dccf 100644
--- a/pkgs/by-name/el/elkhound/package.nix
+++ b/pkgs/by-name/el/elkhound/package.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs scripts
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   sourceRoot = "${src.name}/src";
diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 57ced639540a..85795193b0d9 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.79";
+  version = "0.80";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    hash = "sha256-5NqzuUDimairQJjHsSy0sbpqiDfNDvrt3BEV9e1bF1E=";
+    hash = "sha256-B7Dz5H49d8kQaHfPQt7Y3f9D6EdqLOBMK+378g4E46U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/el/eloquent/package.nix b/pkgs/by-name/el/eloquent/package.nix
index cca2f7d875ba..ec5117a6736b 100644
--- a/pkgs/by-name/el/eloquent/package.nix
+++ b/pkgs/by-name/el/eloquent/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eloquent";
-  version = "1.2";
+  version = "1.3";
 
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "Eloquent";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-I4AQZl1zoZPhOwDR1uYNJTMRq5vQHPvyimC8OUAe+vY=";
+    hash = "sha256-+XAiRB5dRq2A2XP9ZdmIfxLjhCXb72TXRxnLnOprNT4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix
index 386180572979..de58a4f98b41 100644
--- a/pkgs/by-name/em/emblem/package.nix
+++ b/pkgs/by-name/em/emblem/package.nix
@@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      figsoda
       foo-dogsquared
     ];
     teams = [ lib.teams.gnome-circle ];
diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix
index fd0d2cac3192..128aab262e39 100644
--- a/pkgs/by-name/em/emboss/package.nix
+++ b/pkgs/by-name/em/emboss/package.nix
@@ -50,5 +50,7 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl2;
     homepage = "https://emboss.sourceforge.net/";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/em/emcee/package.nix b/pkgs/by-name/em/emcee/package.nix
index 4103455faf72..a487d0784bbe 100644
--- a/pkgs/by-name/em/emcee/package.nix
+++ b/pkgs/by-name/em/emcee/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "emcee";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "loopwork-ai";
     repo = "emcee";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-k8W3kCVF1WuX5nYX75HvfMlxpEcVbuX2lZKlLOf1qGI=";
+    hash = "sha256-czOUhaPBxzuqZ72Y3TuzZ8r0Ab3OqGbDPZipkcak3Cw=";
   };
 
   vendorHash = "sha256-e8LPcKue7rhAh03uCRG0VTcwwyj3kDOBoeo3t7Hwvi0=";
diff --git a/pkgs/by-name/em/emmet-ls/package.nix b/pkgs/by-name/em/emmet-ls/package.nix
index 8bda81c23310..85ba65d23fba 100644
--- a/pkgs/by-name/em/emmet-ls/package.nix
+++ b/pkgs/by-name/em/emmet-ls/package.nix
@@ -32,7 +32,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/aca/emmet-ls";
     changelog = "https://github.com/aca/emmet-ls/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "emmet-ls";
   };
 }
diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix
index 1074990e120d..a973b97fa508 100644
--- a/pkgs/by-name/em/emmylua-check/package.nix
+++ b/pkgs/by-name/em/emmylua-check/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_check";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE=";
+    hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg=";
   };
 
   buildAndTestSubdir = "crates/emmylua_check";
 
-  cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas=";
+  cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix
index 1d1ab9a96763..b0c4642ead5e 100644
--- a/pkgs/by-name/em/emmylua-doc-cli/package.nix
+++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix
@@ -6,18 +6,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_doc_cli";
-  version = "0.15.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE=";
+    hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg=";
   };
 
   buildAndTestSubdir = "crates/emmylua_doc_cli";
 
-  cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas=";
+  cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/em/emmylua-ls/package.nix b/pkgs/by-name/em/emmylua-ls/package.nix
index 4c5c5fc7fe44..71fe171f0465 100644
--- a/pkgs/by-name/em/emmylua-ls/package.nix
+++ b/pkgs/by-name/em/emmylua-ls/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_ls";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-UfsSsS+yXpWY1L2Wcgcj+JxS/LNr3BYhHq2JzUdxwqE=";
+    hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
   };
 
   buildAndTestSubdir = "crates/emmylua_ls";
 
-  cargoHash = "sha256-rVTxAOQOngeJaP2SDfgeqOuoc2T8dEvlpe9gKfu5tas=";
+  cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/em/emojione/package.nix b/pkgs/by-name/em/emojione/package.nix
deleted file mode 100644
index 124561583440..000000000000
--- a/pkgs/by-name/em/emojione/package.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  inkscape,
-  imagemagick,
-  potrace,
-  svgo,
-  scfbuild,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "emojione";
-  version = "1.4";
-
-  src = fetchFromGitHub {
-    owner = "eosrei";
-    repo = "emojione-color-font";
-    rev = "v${version}";
-    sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3";
-  };
-
-  patches = [
-    # Fix build with Inkscape 1.0
-    # https://github.com/eosrei/twemoji-color-font/pull/82
-    (fetchpatch {
-      url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch";
-      sha256 = "7tDWIkpcdir1V6skgXSM3r0FwHy0F6PyJ07OPRsSStA=";
-      postFetch = ''
-        substituteInPlace $out \
-          --replace "inkscape --without-gui" "inkscape --export-png" \
-          --replace TWEMOJI EMOJIONE \
-          --replace "the assets" "the emojione assets" \
-          --replace twemoji emojione
-      '';
-    })
-  ];
-
-  preBuild = ''
-    sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile
-    # Shut up inkscape's warnings
-    export HOME="$NIX_BUILD_ROOT"
-  '';
-
-  nativeBuildInputs = [
-    inkscape
-    imagemagick
-    potrace
-    svgo
-    scfbuild
-  ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf
-  '';
-
-  meta = with lib; {
-    description = "Open source emoji set";
-    homepage = "http://emojione.com/";
-    license = licenses.cc-by-40;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/by-name/em/empire-compiler/package.nix b/pkgs/by-name/em/empire-compiler/package.nix
index 87f19ff2fef0..bc1274d991d5 100644
--- a/pkgs/by-name/em/empire-compiler/package.nix
+++ b/pkgs/by-name/em/empire-compiler/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "empire-compiler";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "bc-security";
     repo = "empire-compiler";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DzX78ks+fWjv170c7IGZHWnWhhBnrI8ueTL7hxIhJb0=";
+    hash = "sha256-BuNg5RetGEV/YAZnZP7rkMHif9NczOx2e4OAVDjafuI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch b/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch
deleted file mode 100644
index 5c9b3d194392..000000000000
--- a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/resources/systems/linux/es_find_rules.xml	2024-09-13 16:19:36.000000000 +0300
-+++ b/resources/systems/linux/es_find_rules.xml	2024-11-26 23:08:49.204498848 +0200
-@@ -41,6 +41,9 @@
-             <entry>/usr/lib64/libretro</entry>
-             <!-- Manjaro repository -->
-             <entry>/usr/lib/libretro</entry>
-+            <!-- NixOS and Nixpkgs repository -->
-+            <entry>/run/current-system/sw/lib/retroarch/cores</entry>
-+            <entry>~/.nix-profile/lib/retroarch/cores</entry>
-         </rule>
-     </core>
-     <emulator name="3DSEN-WINDOWS">
diff --git a/pkgs/by-name/em/emulationstation-de/package.nix b/pkgs/by-name/em/emulationstation-de/package.nix
deleted file mode 100644
index 7646b0754512..000000000000
--- a/pkgs/by-name/em/emulationstation-de/package.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  cmake,
-  pkg-config,
-  alsa-lib,
-  bluez,
-  curl,
-  ffmpeg,
-  freeimage,
-  freetype,
-  gettext,
-  harfbuzz,
-  icu,
-  libgit2,
-  poppler,
-  pugixml,
-  SDL2,
-  libGL,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "emulationstation-de";
-  version = "3.2.0";
-
-  src = fetchzip {
-    url = "https://gitlab.com/es-de/emulationstation-de/-/archive/v${finalAttrs.version}/emulationstation-de-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-tW8+7ImcJ3mBhoIHVE8h4cba+4SQLP55kiFYE7N8jyI=";
-  };
-
-  patches = [
-    ./001-add-nixpkgs-retroarch-cores.patch
-  ];
-
-  postPatch = ''
-    # ldd-based detection fails for cross builds
-    substituteInPlace CMake/Packages/FindPoppler.cmake \
-      --replace-fail 'GET_PREREQUISITES("''${POPPLER_LIBRARY}" POPPLER_PREREQS 1 0 "" "")' ""
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    gettext # msgfmt
-    pkg-config
-  ];
-
-  buildInputs = [
-    alsa-lib
-    bluez
-    curl
-    ffmpeg
-    freeimage
-    freetype
-    harfbuzz
-    icu
-    libgit2
-    poppler
-    pugixml
-    SDL2
-    libGL
-  ];
-
-  cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ];
-
-  meta = {
-    description = "ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection";
-    homepage = "https://es-de.org";
-    maintainers = with lib.maintainers; [ ivarmedi ];
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-    mainProgram = "es-de";
-  };
-})
diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix
deleted file mode 100644
index eb8c048d4ea1..000000000000
--- a/pkgs/by-name/em/emulationstation/package.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  lib,
-  SDL2,
-  alsa-lib,
-  boost,
-  callPackage,
-  cmake,
-  curl,
-  freeimage,
-  freetype,
-  libGL,
-  libGLU,
-  libvlc,
-  pkg-config,
-  rapidjson,
-  stdenv,
-}:
-
-let
-  sources = callPackage ./sources.nix { };
-in
-stdenv.mkDerivation {
-  inherit (sources.emulationstation) pname version src;
-
-  postUnpack = ''
-    pushd $sourceRoot/external/pugixml
-    cp --verbose --archive ${sources.pugixml.src}/* .
-    chmod --recursive 744 .
-    popd
-  '';
-
-  nativeBuildInputs = [
-    SDL2
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    SDL2
-    alsa-lib
-    boost
-    curl
-    freeimage
-    freetype
-    libGL
-    libGLU
-    libvlc
-    rapidjson
-  ];
-
-  cmakeFlags = [ (lib.cmakeBool "GL" true) ];
-
-  strictDeps = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 ../emulationstation $out/bin/emulationstation
-    mkdir -p $out/share/emulationstation/
-    cp -r ../resources $out/share/emulationstation/
-
-    runHook postInstall
-  '';
-
-  # es-core/src/resources/ResourceManager.cpp: resources are searched at the
-  # same place of binaries.
-  postFixup = ''
-    pushd $out
-    ln -s $out/share/emulationstation/resources $out/bin/
-    popd
-  '';
-
-  passthru = {
-    inherit sources;
-  };
-
-  meta = {
-    homepage = "https://github.com/RetroPie/EmulationStation";
-    description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)";
-    license = with lib.licenses; [ mit ];
-    mainProgram = "emulationstation";
-    maintainers = with lib.maintainers; [
-      edwtjo
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/em/emulationstation/sources.nix b/pkgs/by-name/em/emulationstation/sources.nix
deleted file mode 100644
index 88273e845fee..000000000000
--- a/pkgs/by-name/em/emulationstation/sources.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ fetchFromGitHub }:
-
-{
-  emulationstation =
-    let
-      self = {
-        pname = "emulationstation";
-        version = "2.11.2";
-
-        src = fetchFromGitHub {
-          owner = "RetroPie";
-          repo = "EmulationStation";
-          rev = "v${self.version}";
-          hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE=";
-        };
-      };
-    in
-    self;
-
-  pugixml =
-    let
-      self = {
-        pname = "pugixml";
-        version = "1.8.1";
-
-        src = fetchFromGitHub {
-          owner = "zeux";
-          repo = "pugixml";
-          rev = "v${self.version}";
-          hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4=";
-        };
-      };
-    in
-    self;
-}
diff --git a/pkgs/by-name/en/en-croissant/package.nix b/pkgs/by-name/en/en-croissant/package.nix
index 543c56115ac3..86772e48dd58 100644
--- a/pkgs/by-name/en/en-croissant/package.nix
+++ b/pkgs/by-name/en/en-croissant/package.nix
@@ -13,7 +13,7 @@
 
   openssl,
   libsoup_2_4,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   gst_all_1,
 }:
 
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     openssl
     libsoup_2_4
-    webkitgtk_4_0
+    # webkitgtk_4_0
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-bad
@@ -66,6 +66,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Ultimate Chess Toolkit";
     homepage = "https://github.com/franciscoBSalgueiro/en-croissant/";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/by-name/en/encode-sans/package.nix b/pkgs/by-name/en/encode-sans/package.nix
index f81d9c386e68..5010ba6e8760 100644
--- a/pkgs/by-name/en/encode-sans/package.nix
+++ b/pkgs/by-name/en/encode-sans/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://github.com/impallari/Encode-Sans";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/en/encpipe/package.nix b/pkgs/by-name/en/encpipe/package.nix
index a36ae92e953f..de81afa34b26 100644
--- a/pkgs/by-name/en/encpipe/package.nix
+++ b/pkgs/by-name/en/encpipe/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Encryption tool";
     homepage = "https://github.com/jedisct1/encpipe";
     license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "encpipe";
   };
 }
diff --git a/pkgs/by-name/en/endeavour/package.nix b/pkgs/by-name/en/endeavour/package.nix
index c2a09da36805..5de5fa50c8ba 100644
--- a/pkgs/by-name/en/endeavour/package.nix
+++ b/pkgs/by-name/en/endeavour/package.nix
@@ -57,6 +57,14 @@ stdenv.mkDerivation rec {
     libical
   ];
 
+  postPatch = ''
+    # Switch to girepository-2.0
+    # libpeas1 will be dropped in https://gitlab.gnome.org/World/Endeavour/-/merge_requests/153
+    substituteInPlace src/gui/gtd-application.c \
+      --replace-fail "#include <girepository.h>" "#include <girepository/girepository.h>" \
+      --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
+  '';
+
   passthru = {
     updateScript = gitUpdater { };
   };
diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index dcca64a2730c..ea0ad87f3fef 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -3,9 +3,12 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libavif,
   libpng,
   libjpeg,
+  libogg,
   libX11,
+  flac,
   glew,
   openal,
   cmake,
@@ -17,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "endless-sky";
-  version = "0.10.14";
+  version = "0.10.16";
 
   src = fetchFromGitHub {
     owner = "endless-sky";
     repo = "endless-sky";
     tag = "v${version}";
-    hash = "sha256-/jW9TXmK2xgHUQe6H+WSCHPQthxvoNepdkdnOD3sXXo=";
+    hash = "sha256-QO7Yv8H7hvavyOG/G9+HZh+a7XlCAf7fyPlszvOF91M=";
   };
 
   patches = [
@@ -47,9 +50,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     SDL2
+    libavif
     libpng
     libjpeg
+    libogg
     libX11
+    flac
     glew
     openal
     libmad
diff --git a/pkgs/by-name/en/engelsystem/package.nix b/pkgs/by-name/en/engelsystem/package.nix
index 27a089230b82..7da12fd84620 100644
--- a/pkgs/by-name/en/engelsystem/package.nix
+++ b/pkgs/by-name/en/engelsystem/package.nix
@@ -23,7 +23,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   inherit php;
 
-  vendorHash = "sha256-0Mv48mB/pTQtYd2do6wTdhD/c2zwbU1gTYsdU7rELPY=";
+  vendorHash = "sha256-ODJgsvECw+q3sAA6pWNw4X2Png7f4G2Jty9AQSj/SgE=";
   composoerNoDev = true;
   composerStrictValidation = false;
 
diff --git a/pkgs/by-name/en/ensemble-chorus/package.nix b/pkgs/by-name/en/ensemble-chorus/package.nix
index 0bc9963b7bfd..ba5f43d8b69a 100644
--- a/pkgs/by-name/en/ensemble-chorus/package.nix
+++ b/pkgs/by-name/en/ensemble-chorus/package.nix
@@ -47,6 +47,18 @@ stdenv.mkDerivation {
     libjack2
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION "3.3")' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace thirdparty/gsl-lite/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required( VERSION 3.0 FATAL_ERROR )' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace thirdparty/jsl/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.3)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/jpcima/ensemble-chorus";
     description = "Digital model of electronic string ensemble chorus";
diff --git a/pkgs/by-name/en/entangle/girepository-2.0.patch b/pkgs/by-name/en/entangle/girepository-2.0.patch
new file mode 100644
index 000000000000..7454480bc3fa
--- /dev/null
+++ b/pkgs/by-name/en/entangle/girepository-2.0.patch
@@ -0,0 +1,39 @@
+diff --git a/src/entangle-main.c b/src/entangle-main.c
+index 970bfee..8bc16eb 100644
+--- a/src/entangle-main.c
++++ b/src/entangle-main.c
+@@ -21,7 +21,7 @@
+ #include <locale.h>
+ #include <stdio.h>
+ 
+-#include <girepository.h>
++#include <girepository/girepository.h>
+ #include <glib/gi18n.h>
+ #include <gst/gst.h>
+ #include <gtk/gtk.h>
+@@ -80,7 +80,11 @@ main(int argc, char **argv)
+     gst_init(NULL, NULL);
+ 
+     if (ins) {
+-        g_irepository_dump(ins, NULL);
++        char **ins_args;
++        ins_args = g_strsplit(ins, ",", 2);
++        if (g_strv_length(ins_args) == 2)
++            gi_repository_dump(ins_args[0], ins_args[1], NULL);
++        g_strfreev(ins_args);
+         return 0;
+     }
+ 
+diff --git a/src/frontend/entangle-application.c b/src/frontend/entangle-application.c
+index 3e3e1af..f7c03d5 100644
+--- a/src/frontend/entangle-application.c
++++ b/src/frontend/entangle-application.c
+@@ -470,7 +470,7 @@ entangle_application_init(EntangleApplication *app)
+     app->activeCameras = entangle_camera_list_new_active();
+     app->supportedCameras = entangle_camera_list_new_supported();
+ 
+-    g_irepository_require(g_irepository_get_default(), "Peas", "1.0", 0, NULL);
++    gi_repository_require(gi_repository_dup_default(), "Peas", "1.0", 0, NULL);
+ 
+     userdir =
+         g_build_filename(g_get_user_config_dir(), "entangle/plugins", NULL);
diff --git a/pkgs/by-name/en/entangle/package.nix b/pkgs/by-name/en/entangle/package.nix
index bfd5c8dbae19..9ab3e2973b29 100644
--- a/pkgs/by-name/en/entangle/package.nix
+++ b/pkgs/by-name/en/entangle/package.nix
@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   patches = [
+    # Switch to girepository-2.0
+    # https://src.fedoraproject.org/rpms/libpeas1/pull-request/3
+    ./girepository-2.0.patch
+
     # Fix build with meson 0.61, can be removed on next update
     # https://gitlab.com/entangle/entangle/-/issues/67
     (fetchpatch {
diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
index 80a5e5b11c43..9b594708a9d6 100644
--- a/pkgs/by-name/en/ente-auth/git-hashes.json
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -1,12 +1,7 @@
 {
   "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
-  "flutter_inappwebview": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_android": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_ios": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_macos": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_platform_interface": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_web": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_windows": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "fk_user_agent": "sha256-GmuQPohnTi4SVta1FyEErOb7n0Jp6UdLcX/Cf+koJNA=",
   "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
-  "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
+  "move_to_background": "sha256-cLH3vUrPmEtYKlfn2hi6Wl4JQG4dt9aEyTmVCj7zBe0=",
+  "qr_code_scanner": "sha256-g8CUwQVOgEhJO5BZAdsM5bBS485nu7POO8eu8mknga8="
 }
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 8612bc2b6d3b..952e0458bb9e 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -1,14 +1,14 @@
 {
   lib,
-  flutter324,
+  flutter332,
   fetchFromGitHub,
-  webkitgtk_4_1,
   sqlite,
   libayatana-appindicator,
   makeDesktopItem,
   copyDesktopItems,
   makeWrapper,
   jdk17_headless,
+  yq-go,
 }:
 let
   # fetch simple-icons directly to avoid cloning with submodules,
@@ -16,16 +16,16 @@ let
   simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json);
   desktopId = "io.ente.auth";
 in
-flutter324.buildFlutterApplication rec {
+flutter332.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.4.4";
+  version = "4.4.8-beta";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
-    sparseCheckout = [ "mobile/apps/auth" ];
+    sparseCheckout = [ "mobile" ];
     tag = "auth-v${version}";
-    hash = "sha256-VpxF6BMofCgMWcxsscbYC3uYse0QZyTBf84zN03leC4=";
+    hash = "sha256-3it1tf/Gj8RBF+Htei4LHrXTJACHR4O2kmPPg3SqNfo=";
   };
 
   sourceRoot = "${src.name}/mobile/apps/auth";
@@ -41,6 +41,7 @@ flutter324.buildFlutterApplication rec {
   postPatch = ''
     rmdir assets/simple-icons
     ln -s ${simple-icons} assets/simple-icons
+    ${lib.getExe yq-go} -i 'del(.dependencies.sqlite3_flutter_libs)' pubspec.yaml
   '';
 
   nativeBuildInputs = [
@@ -49,7 +50,6 @@ flutter324.buildFlutterApplication rec {
   ];
 
   buildInputs = [
-    webkitgtk_4_1
     sqlite
     libayatana-appindicator
     # The networking client used by ente-auth (native_dio_adapter)
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 5007165e59e8..108dfd733cc8 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,37 +4,31 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.2"
+      "version": "85.0.0"
     },
     "adaptive_theme": {
       "dependency": "direct main",
       "description": {
         "name": "adaptive_theme",
-        "sha256": "f4ee609b464e5efc68131d9d15ba9aa1de4e3b5ede64be17781c6e19a52d637d",
+        "sha256": "caa49b4c73b681bf12a641dff77aa1383262a00cf38b9d1a25b180e275ba5ab9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.7.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "de617bfdc64f3d8b00835ec2957441ceca0a29cdf7881f7ab231bc14f71159c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "7.5.6"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -50,11 +44,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950",
+        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.4.0"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -90,31 +84,31 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -150,81 +144,81 @@
       "dependency": "direct main",
       "description": {
         "name": "bloc",
-        "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e",
+        "sha256": "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.4"
+      "version": "9.0.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "build": {
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.5.4"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.0.4"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.5.4"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
+      "version": "2.5.4"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
+        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.2"
+      "version": "9.1.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -240,21 +234,21 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.2"
+      "version": "8.10.1"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -270,11 +264,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
     },
     "clipboard": {
       "dependency": "direct main",
@@ -290,31 +284,31 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.10.1"
     },
     "collection": {
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.1"
     },
     "confetti": {
       "dependency": "direct main",
@@ -330,11 +324,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0",
+        "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.5"
+      "version": "6.1.4"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -350,21 +344,21 @@
       "dependency": "direct main",
       "description": {
         "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "cronet_http": {
       "dependency": "transitive",
       "description": {
         "name": "cronet_http",
-        "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415",
+        "sha256": "5ed075c59b2d4bd43af4e73d906b8082e98ecd2af9c625327370ef28361bf635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.4"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -380,51 +374,51 @@
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.6"
     },
     "csslib": {
       "dependency": "transitive",
       "description": {
         "name": "csslib",
-        "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.2"
     },
     "cupertino_http": {
       "dependency": "transitive",
       "description": {
         "name": "cupertino_http",
-        "sha256": "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c",
+        "sha256": "8fb9e2c36d0732d9d96abd76683406b57e78a2514e27c962e0c603dbe6f2e3f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "2.2.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
+        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "3.1.0"
     },
     "dbus": {
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "device_info_plus": {
       "dependency": "direct main",
@@ -440,11 +434,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.3"
     },
     "dio": {
       "dependency": "direct main",
@@ -460,21 +454,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.1"
     },
     "dotted_border": {
       "dependency": "direct main",
       "description": {
         "name": "dotted_border",
-        "sha256": "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04",
+        "sha256": "99b091ec6891ba0c5331fdc2b502993c7c108f898995739a73c6845d71dad70c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "3.1.0"
     },
     "dropdown_button2": {
       "dependency": "direct main",
@@ -496,6 +490,33 @@
       "source": "hosted",
       "version": "3.0.0"
     },
+    "ente_accounts": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/accounts",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_base": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/base",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_configuration": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/configuration",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
     "ente_crypto_dart": {
       "dependency": "direct main",
       "description": {
@@ -507,6 +528,78 @@
       "source": "git",
       "version": "1.0.0"
     },
+    "ente_events": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/events",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_lock_screen": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/lock_screen",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_logging": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/logging",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_network": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/network",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_qr": {
+      "dependency": "direct main",
+      "description": {
+        "path": "plugins/qr",
+        "relative": true
+      },
+      "source": "path",
+      "version": "0.0.1"
+    },
+    "ente_strings": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/strings",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_ui": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/ui",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_utils": {
+      "dependency": "direct overridden",
+      "description": {
+        "path": "../../packages/utils",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
     "event_bus": {
       "dependency": "direct main",
       "description": {
@@ -541,80 +634,81 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "direct main",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "figma_squircle": {
       "dependency": "direct main",
       "description": {
         "name": "figma_squircle",
-        "sha256": "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0",
+        "sha256": "7de45eb9ec66f1c3fea65587d94d66c31e97a9d9068b38bd23d3461aaab5119a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3"
+      "version": "0.6.3"
     },
     "file": {
       "dependency": "transitive",
       "description": {
         "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
     },
     "file_picker": {
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204",
+        "sha256": "e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.7"
+      "version": "10.3.2"
     },
     "file_saver": {
       "dependency": "direct main",
       "description": {
         "name": "file_saver",
-        "sha256": "017a127de686af2d2fbbd64afea97052d95f2a0f87d19d25b87e097407bf9c1e",
+        "sha256": "9d93db09bd4da9e43238f9dd485360fc51a5c138eea5ef5f407ec56e58079ac0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.14"
+      "version": "0.3.1"
     },
     "fixnum": {
       "dependency": "direct main",
       "description": {
         "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "fk_user_agent": {
       "dependency": "direct main",
       "description": {
-        "name": "fk_user_agent",
-        "sha256": "fd6c94e120786985a292d12f61422a581f4e851148d5940af38b819357b8ad0d",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "458046cd9a88924e5074d96ba45397219d53b230",
+        "resolved-ref": "458046cd9a88924e5074d96ba45397219d53b230",
+        "url": "https://github.com/flutter-fast-kit/fk_user_agent"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "2.1.0"
     },
     "flutter": {
@@ -627,31 +721,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_animate",
-        "sha256": "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5",
+        "sha256": "7befe2d3252728afb77aecaaea1dec88a89d35b9b1d2eea6d04479e8af9117b5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.5.2"
     },
     "flutter_bloc": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_bloc",
-        "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a",
+        "sha256": "cf51747952201a455a1c840f8171d273be009b932c75093020f9af64f2123e38",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.6"
+      "version": "9.1.1"
     },
     "flutter_context_menu": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_context_menu",
-        "sha256": "4bc1dc30ae5aa705ed99ebbeb875898c6341a6d092397a566fecd5184b392380",
+        "sha256": "5e9c62a5937aba135e3787711b04c73b78729a9751c6c71c2bece4ed9a480d76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.4"
     },
     "flutter_displaymode": {
       "dependency": "direct main",
@@ -667,33 +761,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_email_sender",
-        "sha256": "fb515d4e073d238d0daf1d765e5318487b6396d46b96e0ae9745dbc9a133f97a",
+        "sha256": "d39eb5e91358fc19ec4050da69accec21f9d5b2b6bcf188aa246327b6ca2352c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "7.0.0"
     },
     "flutter_inappwebview": {
       "dependency": "direct main",
       "description": {
-        "path": "flutter_inappwebview",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview",
+        "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "6.2.0-beta.3"
+      "source": "hosted",
+      "version": "6.1.5"
     },
     "flutter_inappwebview_android": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_android",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_android",
+        "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.3"
     },
     "flutter_inappwebview_internal_annotations": {
       "dependency": "transitive",
@@ -708,67 +800,62 @@
     "flutter_inappwebview_ios": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_ios",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_ios",
+        "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.2"
     },
     "flutter_inappwebview_macos": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_macos",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_macos",
+        "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.2"
     },
     "flutter_inappwebview_platform_interface": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_platform_interface",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_platform_interface",
+        "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.4.0-beta.3"
+      "source": "hosted",
+      "version": "1.3.0+1"
     },
     "flutter_inappwebview_web": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_web",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_web",
+        "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.2"
     },
     "flutter_inappwebview_windows": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_windows",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_windows",
+        "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "0.7.0-beta.3"
+      "source": "hosted",
+      "version": "0.6.0"
     },
     "flutter_launcher_icons": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.14.1"
+      "version": "0.14.4"
     },
     "flutter_local_authentication": {
       "dependency": "direct main",
@@ -785,31 +872,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_local_notifications",
-        "sha256": "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71",
+        "sha256": "ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.2.3"
+      "version": "18.0.1"
     },
     "flutter_local_notifications_linux": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_local_notifications_linux",
-        "sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af",
+        "sha256": "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "5.0.0"
     },
     "flutter_local_notifications_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_local_notifications_platform_interface",
-        "sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66",
+        "sha256": "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.0"
+      "version": "8.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -821,31 +908,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
+        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.6"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.22"
+      "version": "2.0.28"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_secure_storage",
-        "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0",
+        "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.2"
+      "version": "9.2.4"
     },
     "flutter_secure_storage_linux": {
       "dependency": "transitive",
@@ -861,11 +948,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_macos",
-        "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81",
+        "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "flutter_secure_storage_platform_interface": {
       "dependency": "transitive",
@@ -931,11 +1018,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123",
+        "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.16"
+      "version": "2.2.0"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -953,11 +1040,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fluttertoast",
-        "sha256": "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc",
+        "sha256": "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.8"
+      "version": "8.2.12"
     },
     "freezed_annotation": {
       "dependency": "transitive",
@@ -983,21 +1070,21 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "google_nav_bar": {
       "dependency": "direct main",
       "description": {
         "name": "google_nav_bar",
-        "sha256": "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0",
+        "sha256": "bb12dd21514ee1b041ab3127673e2fd85e693337df308f7f2b75cd1e8e92eaf4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.6"
+      "version": "5.0.7"
     },
     "gradient_borders": {
       "dependency": "direct main",
@@ -1033,11 +1120,11 @@
       "dependency": "transitive",
       "description": {
         "name": "hashlib",
-        "sha256": "f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1",
+        "sha256": "a7b34c92005e9ccf462b71bcab40b5d5cff53669c7e87e6c7277f18bb075bf05",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.21.0"
+      "version": "1.21.3"
     },
     "hashlib_codecs": {
       "dependency": "transitive",
@@ -1063,41 +1150,41 @@
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.4"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
       "description": {
         "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "http_profile": {
       "dependency": "transitive",
@@ -1110,44 +1197,44 @@
       "version": "0.1.0"
     },
     "image": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.5.4"
     },
     "intl": {
       "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": "direct main",
       "description": {
         "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "jni": {
       "dependency": "transitive",
       "description": {
         "name": "jni",
-        "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b",
+        "sha256": "459727a9daf91bdfb39b014cf3c186cf77f0136124a274ac83c186e12262ac4e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.10.1"
+      "version": "0.12.2"
     },
     "js": {
       "dependency": "transitive",
@@ -1173,31 +1260,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
+        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.8.0"
+      "version": "6.9.5"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.5"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1213,11 +1300,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "lints",
-        "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
+        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.1.1"
     },
     "local_auth": {
       "dependency": "direct main",
@@ -1233,21 +1320,21 @@
       "dependency": "direct main",
       "description": {
         "name": "local_auth_android",
-        "sha256": "5351c7eea8823de28e37d8b7b3e386d944b80f2a77edb91a5707fb97a41fc1b1",
+        "sha256": "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.45"
+      "version": "1.0.49"
     },
     "local_auth_darwin": {
       "dependency": "direct main",
       "description": {
         "name": "local_auth_darwin",
-        "sha256": "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c",
+        "sha256": "25163ce60a5a6c468cf7a0e3dc8a165f824cabc2aa9e39a5e9fc5c2311b7686f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.5.0"
     },
     "local_auth_platform_interface": {
       "dependency": "transitive",
@@ -1279,25 +1366,15 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2-main.4"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1323,21 +1400,21 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.6"
+      "version": "2.0.0"
     },
     "mocktail": {
       "dependency": "direct dev",
@@ -1362,11 +1439,12 @@
     "move_to_background": {
       "dependency": "direct main",
       "description": {
-        "name": "move_to_background",
-        "sha256": "00caad17a6ce149910777131503f43f8ed80025681f94684e3a6a87d979b914c",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "v2-only",
+        "resolved-ref": "0cdfeed654d79636eff0c57110f3f6ad5801ba2f",
+        "url": "https://github.com/ente-io/move_to_background.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.0.2"
     },
     "native_dio_adapter": {
@@ -1403,11 +1481,11 @@
       "dependency": "transitive",
       "description": {
         "name": "objective_c",
-        "sha256": "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584",
+        "sha256": "9f034ba1eeca53ddb339bc8f4813cb07336a849cd735559b60cdc068ecce2dc7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "7.1.0"
     },
     "otp": {
       "dependency": "direct main",
@@ -1423,31 +1501,31 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.2"
+      "version": "8.3.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.2.0"
     },
     "password_strength": {
       "dependency": "direct main",
@@ -1463,61 +1541,51 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
-    },
-    "path_drawing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_drawing",
-        "sha256": "bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.9.1"
     },
     "path_parsing": {
       "dependency": "transitive",
       "description": {
         "name": "path_parsing",
-        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
+        "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.1.0"
     },
     "path_provider": {
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.10"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1553,31 +1621,31 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "pinput": {
       "dependency": "direct main",
       "description": {
         "name": "pinput",
-        "sha256": "7bf9aa7d0eeb3da9f7d49d2087c7bc7d36cd277d2e94cc31c6da52e1ebb048d0",
+        "sha256": "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.0.1"
     },
     "platform": {
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.6"
     },
     "plugin_platform_interface": {
       "dependency": "transitive",
@@ -1609,55 +1677,65 @@
       "source": "hosted",
       "version": "1.5.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
+    },
     "privacy_screen": {
       "dependency": "direct main",
       "description": {
         "name": "privacy_screen",
-        "sha256": "b80297d2726d96e8a8341149e81a415302755f02d3af7c05c820d9e191bbfbee",
+        "sha256": "2856e3a3ed082061a5cd2a1518f1ce6367c55916fb75e5db72e5983033a1ca54",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.6"
+      "version": "0.0.8"
     },
     "protobuf": {
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
+        "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "4.1.0"
     },
     "provider": {
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.5"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.5.0"
     },
     "qr": {
       "dependency": "transitive",
@@ -1672,12 +1750,13 @@
     "qr_code_scanner": {
       "dependency": "direct main",
       "description": {
-        "name": "qr_code_scanner",
-        "sha256": "f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "a2d31633d4744f72ada87cfa85d221358ab082af",
+        "resolved-ref": "a2d31633d4744f72ada87cfa85d221358ab082af",
+        "url": "https://github.com/juliuscanute/qr_code_scanner"
       },
-      "source": "hosted",
-      "version": "1.0.1"
+      "source": "git",
+      "version": "1.0.0"
     },
     "qr_flutter": {
       "dependency": "direct main",
@@ -1693,11 +1772,51 @@
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever",
-        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.9"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
     },
     "sentry": {
       "dependency": "direct main",
@@ -1723,51 +1842,51 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52",
+        "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.2"
+      "version": "11.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5",
+        "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
+        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -1793,11 +1912,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -1813,21 +1932,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.2"
     },
     "shelf_web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.0.0"
     },
     "shortid": {
       "dependency": "transitive",
@@ -1843,7 +1962,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1869,31 +1988,31 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "2.0.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
+        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.4"
+      "version": "1.3.6"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1908,53 +2027,82 @@
     "sqflite": {
       "dependency": "direct main",
       "description": {
-        "path": "sqflite",
-        "ref": "HEAD",
-        "resolved-ref": "699aaafa282d823b89ca568aac7a68d2c29ddab6",
-        "url": "https://github.com/tekartik/sqflite"
+        "name": "sqflite",
+        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "2.3.3+2"
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "sqflite_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_android",
+        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4+4"
+      "version": "2.5.5"
     },
     "sqflite_common_ffi": {
       "dependency": "direct main",
       "description": {
         "name": "sqflite_common_ffi",
-        "sha256": "a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04",
+        "sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3+1"
+      "version": "2.3.6"
+    },
+    "sqflite_darwin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_darwin",
+        "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "sqflite_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_platform_interface",
+        "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
     },
     "sqlite3": {
       "dependency": "direct main",
       "description": {
         "name": "sqlite3",
-        "sha256": "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb",
+        "sha256": "c0503c69b44d5714e6abbf4c1f51a3c3cc42b75ce785f44404765e4635481d38",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.7.6"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.1"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1980,31 +2128,31 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
       "description": {
         "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.1"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -2020,31 +2168,31 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.4"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2060,21 +2208,21 @@
       "dependency": "transitive",
       "description": {
         "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "tray_manager": {
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
+        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.4"
+      "version": "0.5.0"
     },
     "tuple": {
       "dependency": "direct main",
@@ -2090,11 +2238,21 @@
       "dependency": "transitive",
       "description": {
         "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
+    },
+    "ua_client_hints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ua_client_hints",
+        "sha256": "1b8759a46bfeab355252881df27f2604c01bded86aa2b578869fb1b638b23118",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
     },
     "universal_io": {
       "dependency": "transitive",
@@ -2120,51 +2278,51 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "a4e5f34f2fadf1fa7b4e69db89189056e313c9c98e8ad420e6b53677b6abc334",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.11"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -2180,21 +2338,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "direct main",
@@ -2210,31 +2368,31 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.15"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_codec",
-        "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
+        "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.11+1"
+      "version": "1.1.13"
     },
     "vector_graphics_compiler": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
+        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.16"
+      "version": "1.1.17"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2250,61 +2408,61 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.2.5"
+      "version": "15.0.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.5"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2320,11 +2478,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792",
+        "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.2"
+      "version": "0.5.0"
     },
     "xdg_directories": {
       "dependency": "direct main",
@@ -2360,15 +2518,15 @@
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.7.2 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }
diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh
index fe46cf3e4d72..caec2206d422 100755
--- a/pkgs/by-name/en/ente-auth/update.sh
+++ b/pkgs/by-name/en/ente-auth/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gojq nix-prefetch-github common-updater-scripts
+#!nix-shell -i bash -p curl gojq nix-prefetch-github nix-prefetch-git common-updater-scripts
 
 set -eou pipefail
 pkg_dir="$(dirname "$0")"
diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index 9b971204ff7a..679e230e52cf 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchYarnDeps,
   nodejs,
-  electron_37,
+  electron_38,
   yarnConfigHook,
   copyDesktopItems,
   vips,
@@ -15,12 +15,12 @@
   imagemagick,
 }:
 let
-  electron = electron_37;
+  electron = electron_38;
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-desktop";
-  version = "1.7.14";
+  version = "1.7.15";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
       "web"
     ];
     tag = "photosd-v${finalAttrs.version}";
-    hash = "sha256-UtKXg3SZxHo18VKuVP7W40SfZfa9ni+QJ7+GvGWptSA=";
+    hash = "sha256-QnJp+oHkRsb/uMobA33Hgo2VOzfDFDtJ6vchCAzyb+c=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/desktop";
@@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
   offlineCache = fetchYarnDeps {
     name = "ente-desktop-${finalAttrs.version}-offline-cache";
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-6o5TaqlgEQWZjde5cthiSVLVy5JiCHXApn7uXBWmTo0=";
+    hash = "sha256-dnjTH68lNqSD/RIiaYdip0U8a2RXCNanqF05WnhzjEA=";
   };
   webOfflineCache = fetchYarnDeps {
     name = "ente-desktop-${finalAttrs.version}-web-offline-cache";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/web";
-    hash = "sha256-gwOeznAp4nGu4spilkFl8Dbmdye3Wg8VnBLroSdUjUo=";
+    hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
   };
 
   nativeBuildInputs = [
@@ -145,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
       iedame
     ];
     platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 07a97615b0b5..64b3d99025fe 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web-${enteApp}";
-  version = "1.2.11";
+  version = "1.2.15";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     sparseCheckout = [ "web" ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-h+Bkz41rOAQhRqDdzUx+CWNq2QYvGFw+TE0ryps63bI=";
+    hash = "sha256-27Jmv7dbXwR31KBvWcMZ4p972BxUivN2tbZq7ISplSg=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/web/yarn.lock";
-    hash = "sha256-g6g4VCn6pQWIqhaUctMISHvbQv+o+B+MFSWKT+S7YVU=";
+    hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/en/envoy-bin/package.nix b/pkgs/by-name/en/envoy-bin/package.nix
index f447be7d017d..f927672f4213 100644
--- a/pkgs/by-name/en/envoy-bin/package.nix
+++ b/pkgs/by-name/en/envoy-bin/package.nix
@@ -8,7 +8,7 @@
   versionCheckHook,
 }:
 let
-  version = "1.35.4";
+  version = "1.36.2";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "envoy-bin is not available for ${system}.";
 
@@ -21,8 +21,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-iTZilcY0Tc6xjMCSOEdwyzyJeRhd+5A4WIhq89817bc=";
-      x86_64-linux = "sha256-hBy2DmJlTADt9E3V81CKlFXkM17q52gN5Eq/l4F+qcw=";
+      aarch64-linux = "sha256-r3NrtmU8zpxSsvOwkqNgKsIaYKxnVpjQYNxNgoN8Bco=";
+      x86_64-linux = "sha256-r9Z7z+pUhSXudqk1CgpM/rKsJMe1MnlM4zLYQK2M2uc=";
     }
     .${system} or throwSystem;
 in
diff --git a/pkgs/games/doom-ports/enyo-launcher/default.nix b/pkgs/by-name/en/enyo-launcher/package.nix
similarity index 67%
rename from pkgs/games/doom-ports/enyo-launcher/default.nix
rename to pkgs/by-name/en/enyo-launcher/package.nix
index b8e38af270aa..7db29bca5f6a 100644
--- a/pkgs/games/doom-ports/enyo-launcher/default.nix
+++ b/pkgs/by-name/en/enyo-launcher/package.nix
@@ -1,25 +1,26 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitLab,
   cmake,
-  qtbase,
+  qt6,
 }:
-
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "enyo-launcher";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitLab {
     owner = "sdcofer70";
     repo = "enyo-launcher";
     rev = version;
-    hash = "sha256-k6Stc1tQOcdS//j+bFUNfnOUlwuhIPKxf9DHU+ng164=";
+    hash = "sha256-Ig1b+JylRlxhl5k5ys9SOGMYw3eUxXyoVXt3YNeWNqI=";
   };
 
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+  buildInputs = [ qt6.qtbase ];
 
   meta = {
     homepage = "https://gitlab.com/sdcofer70/enyo-launcher";
diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 9a980e79477b..64bbf9b095c0 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.203";
+  version = "0.0.208";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-PfV50pGDGWx4Ih8x8V0ib+Oti71oH90ODepiDN+q4tU=";
+    hash = "sha256-/WNiGeKoEvKYlXIK4cU6z5gFGujQbAE13qyvnhMniXc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index 09ce3ade221a..6aa92c5c3492 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   meson,
   ninja,
   gettext,
@@ -51,6 +52,12 @@ stdenv.mkDerivation rec {
     # We patch gobject-introspection to hardcode absolute paths but
     # our Meson patch will only pass the info when install_dir is absolute as well.
     ./fix-gir-lib-path.patch
+
+    # Switch to girepository-2.0
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/eog/raw/939eee56e5b72b02a8c0f4f867431cf6426adb9e/f/libpeas1_pygobject352.patch";
+      hash = "sha256-5QIkxxUvGKzb0cMCIcfuu7FX9XuY+RrKNunSvRDEDRc=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -95,7 +102,7 @@ stdenv.mkDerivation rec {
           libjxl
           librsvg
           webp-pixbuf-loader
-          libheif.out
+          libheif.lib
         ];
       }
     }"
diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix
index 6f02069ab731..0fb3be941948 100644
--- a/pkgs/by-name/ep/epeg/package.nix
+++ b/pkgs/by-name/ep/epeg/package.nix
@@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mattes/epeg";
     description = "Insanely fast JPEG/ JPG thumbnail scaling";
     platforms = platforms.linux ++ platforms.darwin;
-    license = {
-      url = "https://github.com/mattes/epeg#license";
-    };
+    license = lib.licenses.mit-enna;
     maintainers = with maintainers; [ nh2 ];
     mainProgram = "epeg";
   };
diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix
index 2d85f9a8b7ae..abc25b068154 100644
--- a/pkgs/by-name/ep/epick/package.nix
+++ b/pkgs/by-name/ep/epick/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/vv9k/epick";
     changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "epick";
   };
 }
diff --git a/pkgs/by-name/ep/epiphany/package.nix b/pkgs/by-name/ep/epiphany/package.nix
index 2f5cbe602e99..30eedb952f62 100644
--- a/pkgs/by-name/ep/epiphany/package.nix
+++ b/pkgs/by-name/ep/epiphany/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  blueprint-compiler,
   meson,
   ninja,
   gettext,
@@ -25,6 +26,7 @@
   gcr_4,
   isocodes,
   desktop-file-utils,
+  docutils,
   nettle,
   gdk-pixbuf,
   gst_all_1,
@@ -37,15 +39,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "epiphany";
-  version = "48.5";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/epiphany/${lib.versions.major finalAttrs.version}/epiphany-${finalAttrs.version}.tar.xz";
-    hash = "sha256-D2ZVKtZZPHlSo93uW/UVZWyMQ0hxB22fGpGnr5NGsbQ=";
+    hash = "sha256-Jx7HNbmDa5dEnjJ5PTVKivtrn40tPXWCGIXV4VVweSk=";
   };
 
   nativeBuildInputs = [
+    blueprint-compiler
     desktop-file-utils
+    docutils # for rst2man
     gettext
     itstool
     meson
diff --git a/pkgs/by-name/ep/epkowa/package.nix b/pkgs/by-name/ep/epkowa/package.nix
index e0f1c2e5a65c..1f179ab71018 100644
--- a/pkgs/by-name/ep/epkowa/package.nix
+++ b/pkgs/by-name/ep/epkowa/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  callPackages,
   fetchurl,
   fetchpatch,
   makeWrapper,
@@ -12,11 +13,9 @@
   libxslt,
   libusb-compat-0_1,
   sane-backends,
-  rpm,
-  cpio,
   getopt,
-  autoPatchelfHook,
-  gcc,
+  epkowa,
+  plugins ? epkowa.plugins,
 }:
 let
   common_meta = {
@@ -25,492 +24,12 @@ let
     license = with lib.licenses; epson;
     platforms = with lib.platforms; linux;
   };
-in
-############################
-#
-#  PLUGINS
-#
-############################
-
-# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test...
-let
-  plugins = {
-    v330 = stdenv.mkDerivation rec {
-      name = "iscan-v330-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        # To find new versions, visit
-        # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
-        # some printer like for instance "WF-7210" to get to the most recent
-        # version.
-        # NOTE: Don't forget to update the webarchive link too!
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        ${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out{,/share,/lib}
-        cp -r ./usr/share/{iscan-data,esci}/ $out/share/
-        cp -r ./usr/lib64/esci $out/lib
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
-        '';
-        hw = "Perfection V330 Photo";
-      };
-      meta = common_meta // {
-        description = "Plugin to support " + passthru.hw + " scanner in sane";
-      };
-    };
-    v370 = stdenv.mkDerivation rec {
-      name = "iscan-v370-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-
-
-        mkdir -p $out/share $out/lib
-        cp -r usr/share/{iscan-data,iscan}/ $out/share
-        cp -r usr/lib64/iscan $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin"
-        '';
-        hw = "Perfection V37/V370";
-      };
-      meta = common_meta // {
-        description = "Plugin to support " + passthru.hw + " scanner in sane";
-      };
-    };
-    v550 = stdenv.mkDerivation rec {
-      pname = "iscan-perfection-v550-bundle";
-      version = "2.30.4";
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9";
-      };
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin"
-        '';
-        hw = "Perfection V550 Photo";
-      };
-      meta = common_meta // {
-        description = "Plugin to support " + passthru.hw + " scanner in sane";
-      };
-    };
-    v600 = stdenv.mkDerivation rec {
-      pname = "iscan-gt-x820-bundle";
-      version = "2.30.4";
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33";
-      };
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin"
-        '';
-        hw = "Perfection V600 Photo";
-      };
-      meta = common_meta // {
-        description = "iscan esci x820 plugin for " + passthru.hw;
-      };
-    };
-    x770 = stdenv.mkDerivation rec {
-      pname = "iscan-gt-x770-bundle";
-      version = "2.30.4";
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03";
-      };
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
-        '';
-        hw = "Perfection V500 Photo";
-      };
-      meta = common_meta // {
-        description = "iscan esci x770 plugin for " + passthru.hw;
-      };
-    };
-    f720 = stdenv.mkDerivation rec {
-      pname = "iscan-gt-f720-bundle";
-      version = "2.30.4";
-
-      nativeBuildInputs = [ autoPatchelfHook ];
-      buildInputs = [ gcc.cc.lib ];
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20";
-      };
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
-        '';
-        hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo";
-      };
-
-      meta = common_meta // {
-        description = "iscan esci f720 plugin for " + passthru.hw;
-      };
-    };
-    s80 = stdenv.mkDerivation rec {
-      pname = "iscan-gt-s80-bundle";
-      version = "2.30.4";
-
-      nativeBuildInputs = [ autoPatchelfHook ];
-      buildInputs = [
-        gcc.cc.lib
-        libtool
-      ];
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58";
-      };
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        ${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mkdir $out/share/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
-          $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
-          $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
-          $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
-        '';
-        hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85";
-      };
-
-      meta = common_meta // {
-        description = "iscan esci s80 plugin for " + passthru.hw;
-      };
-    };
-    s600 = stdenv.mkDerivation rec {
-      name = "iscan-gt-s600-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin"
-        '';
-        hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo";
-      };
-      meta = common_meta // {
-        description = "iscan gt-s600 plugin for " + passthru.hw;
-      };
-    };
-    s650 = stdenv.mkDerivation rec {
-      name = "iscan-gt-s650-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
-          $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
-        '';
-        hw = "GT-S650, Perfection V19, Perfection V39";
-      };
-      meta = common_meta // {
-        description = "iscan GT-S650 for " + passthru.hw;
-      };
-    };
-    x750 = stdenv.mkDerivation rec {
-      name = "iscan-gt-x750-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0=";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin"
-        '';
-        hw = "GT-X750, Perfection 4490";
-      };
-      meta = common_meta // {
-        description = "iscan GT-X750 for " + passthru.hw;
-      };
-    };
-    gt1500 = stdenv.mkDerivation rec {
-      name = "iscan-gt-1500-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8=";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/share/iscan $out/share/esci
-        mv $out/lib/iscan $out/lib/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin"
-        '';
-        hw = "GT-1500";
-      };
-      meta = common_meta // {
-        description = "iscan GT-1500 for " + passthru.hw;
-      };
-    };
-    ds30 = stdenv.mkDerivation rec {
-      name = "iscan-ds-30-bundle";
-      version = "2.30.4";
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153";
-      };
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        rpm
-      ];
-
-      installPhase = ''
-        ${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mv $out/lib/iscan $out/lib/esci
-        mkdir $out/share/esci
-      '';
-
-      passthru = {
-        registrationCommand = ''
-          $registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so"
-        '';
-        hw = "DS-30";
-      };
-      meta = common_meta // {
-        description = "Plugin to support " + passthru.hw + " scanner in sane";
-      };
-    };
-    network = stdenv.mkDerivation rec {
-      pname = "iscan-nt-bundle";
-      # for the version, look for the driver of XP-750 in the search page
-      version = "2.30.4";
-
-      buildInputs = [ (lib.getLib stdenv.cc.cc) ];
-      nativeBuildInputs = [ autoPatchelfHook ];
-
-      src = fetchurl {
-        urls = [
-          "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
-          "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
-        ];
-        sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k";
-      };
-      installPhase = ''
-        cd plugins
-        ${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
-
-        mkdir $out
-        cp -r usr/share $out
-        cp -r usr/lib64 $out/lib
-        mkdir $out/share/esci
-      '';
-      passthru = {
-        registrationCommand = "";
-        hw = "network";
-      };
-
-      meta = common_meta // {
-        description = "iscan network plugin";
-      };
-    };
-  };
+  plugins' = lib.attrsets.filterAttrs (_: lib.isDerivation) plugins;
 in
 let
   fwdir = symlinkJoin {
     name = "esci-firmware-dir";
-    paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins;
+    paths = lib.mapAttrsToList (name: value: value + "/share/esci") plugins';
   };
 in
 let
@@ -588,7 +107,9 @@ stdenv.mkDerivation rec {
     echo "epkowa" > $out/etc/sane.d/dll.conf
     ln -s ${iscan-data}/share/iscan-data $out/share/iscan-data
     mkdir -p $out/lib/iscan
-    ln -s ${plugins.network}/lib/iscan/network $out/lib/iscan/network
+  ''
+  + lib.optionalString (plugins' ? network) ''
+    ln -s ${plugins'.network}/lib/iscan/network $out/lib/iscan/network
   '';
   postFixup = ''
     # iscan-registry is a shell script requiring getopt
@@ -599,15 +120,26 @@ stdenv.mkDerivation rec {
     lib.mapAttrsToList (name: value: ''
       plugin=${value};
       ${value.passthru.registrationCommand}
-    '') plugins
+    '') plugins'
   );
+
+  passthru.plugins = callPackages ./plugins.nix { inherit common_meta; };
+
   meta = common_meta // {
     description = "sane-epkowa backend for some epson scanners";
     longDescription = ''
       Includes gui-less iscan (aka. Image Scan! for Linux).
       Supported hardware: at least :
     ''
-    + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins);
+    + lib.concatStringsSep ", " (lib.mapAttrsToList (name: value: value.passthru.hw) plugins')
+    + ''
+      It is possible to only use a subset of the plugins by overriding the `plugins` input:
+      epkowa' = pkgs.epkowa.override {
+        plugins = {
+          inherit (pkgs.epkowa.plugins) x770; # Select correct plugins for your scanner here
+        };
+      };
+    '';
     maintainers = with lib.maintainers; [
       symphorien
       dominikh
diff --git a/pkgs/by-name/ep/epkowa/plugins.nix b/pkgs/by-name/ep/epkowa/plugins.nix
new file mode 100644
index 000000000000..0e854304a081
--- /dev/null
+++ b/pkgs/by-name/ep/epkowa/plugins.nix
@@ -0,0 +1,485 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  rpm,
+  cpio,
+  gcc,
+  libtool,
+  common_meta,
+}:
+
+# adding a plugin for another printer shouldn't be too difficult, but you need the firmware to test...
+{
+  v330 = stdenv.mkDerivation rec {
+    name = "iscan-v330-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      # To find new versions, visit
+      # http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX and search for
+      # some printer like for instance "WF-7210" to get to the most recent
+      # version.
+      # NOTE: Don't forget to update the webarchive link too!
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v330/rpm/x64/iscan-perfection-v330-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "056c04pfsf98nnknphg28l489isqb6y4l2c8g7wqhclwgj7m338i";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      ${rpm}/bin/rpm2cpio plugins/esci-interpreter-perfection-v330-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out{,/share,/lib}
+      cp -r ./usr/share/{iscan-data,esci}/ $out/share/
+      cp -r ./usr/lib64/esci $out/lib
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0142 "$plugin/lib/esci/libesci-interpreter-perfection-v330 $plugin/share/esci/esfwad.bin"
+      '';
+      hw = "Perfection V330 Photo";
+    };
+    meta = common_meta // {
+      description = "Plugin to support " + passthru.hw + " scanner in sane";
+    };
+  };
+  v370 = stdenv.mkDerivation rec {
+    name = "iscan-v370-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v370/rpm/x64/iscan-perfection-v370-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "1ff7adp9mha1i2ibllz540xkagpy8r757h4s3h60bgxbyzv2yggr";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v370-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+
+
+      mkdir -p $out/share $out/lib
+      cp -r usr/share/{iscan-data,iscan}/ $out/share
+      cp -r usr/lib64/iscan $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x014a "$plugin/lib/esci/libiscan-plugin-perfection-v370 $plugin/share/esci/esfwdd.bin"
+      '';
+      hw = "Perfection V37/V370";
+    };
+    meta = common_meta // {
+      description = "Plugin to support " + passthru.hw + " scanner in sane";
+    };
+  };
+  v550 = stdenv.mkDerivation rec {
+    pname = "iscan-perfection-v550-bundle";
+    version = "2.30.4";
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/perfection-v550/rpm/x64/iscan-perfection-v550-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "f8b3abf21354fc5b9bc87753cef950b6c0f07bf322a94aaff2c163bafcf50cd9";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-perfection-v550-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x013b "$plugin/lib/esci/libiscan-plugin-perfection-v550 $plugin/share/esci/esfweb.bin"
+      '';
+      hw = "Perfection V550 Photo";
+    };
+    meta = common_meta // {
+      description = "Plugin to support " + passthru.hw + " scanner in sane";
+    };
+  };
+  v600 = stdenv.mkDerivation rec {
+    pname = "iscan-gt-x820-bundle";
+    version = "2.30.4";
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x820/rpm/x64/iscan-gt-x820-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "1vlba7dsgpk35nn3n7is8nwds3yzlk38q43mppjzwsz2d2n7sr33";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-x820-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x013a "$plugin/lib/esci/libesintA1 $plugin/share/esci/esfwA1.bin"
+      '';
+      hw = "Perfection V600 Photo";
+    };
+    meta = common_meta // {
+      description = "iscan esci x820 plugin for " + passthru.hw;
+    };
+  };
+  x770 = stdenv.mkDerivation rec {
+    pname = "iscan-gt-x770-bundle";
+    version = "2.30.4";
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x770/rpm/x64/iscan-gt-x770-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "1chxdm6smv2d14pn2jl9xyd0vr42diy7vpskd3b9a61gf5h3gj03";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-x770-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0130 "$plugin/lib/esci/libesint7C $plugin/share/esci/esfw7C.bin"
+      '';
+      hw = "Perfection V500 Photo";
+    };
+    meta = common_meta // {
+      description = "iscan esci x770 plugin for " + passthru.hw;
+    };
+  };
+  f720 = stdenv.mkDerivation rec {
+    pname = "iscan-gt-f720-bundle";
+    version = "2.30.4";
+
+    nativeBuildInputs = [ autoPatchelfHook ];
+    buildInputs = [ gcc.cc.lib ];
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-f720/rpm/x64/iscan-gt-f720-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "1xnbmb2rn610kqpg1x6k1cc13zlmx2f3l2xnj6809rnhg96qqn20";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio esci-interpreter-gt-f720-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0131 "$plugin/lib/esci/libesci-interpreter-gt-f720 $plugin/share/esci/esfw8b.bin"
+      '';
+      hw = "GT-F720, GT-S620, Perfection V30, Perfection V300 Photo";
+    };
+
+    meta = common_meta // {
+      description = "iscan esci f720 plugin for " + passthru.hw;
+    };
+  };
+  s80 = stdenv.mkDerivation rec {
+    pname = "iscan-gt-s80-bundle";
+    version = "2.30.4";
+
+    nativeBuildInputs = [ autoPatchelfHook ];
+    buildInputs = [
+      gcc.cc.lib
+      libtool
+    ];
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s80/rpm/x64/iscan-gt-s80-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "00qfdgs03k7bbs67zjrk8hbxvlyinsmk890amp9cmpfjfzdxgg58";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio esci-interpreter-gt-s80-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      ${rpm}/bin/rpm2cpio iscan-plugin-esdip-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mkdir $out/share/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0136 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
+        $registry --add interpreter usb 0x04b8 0x0137 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
+        $registry --add interpreter usb 0x04b8 0x0143 "$plugin/lib/esci/libesci-interpreter-gt-s50.so"
+        $registry --add interpreter usb 0x04b8 0x0144 "$plugin/lib/esci/libesci-interpreter-gt-s80.so"
+      '';
+      hw = "ES-D200, ED-D350, ES-D400, GT-S50, GT-S55, GT-S80, GT-S85";
+    };
+
+    meta = common_meta // {
+      description = "iscan esci s80 plugin for " + passthru.hw;
+    };
+  };
+  s600 = stdenv.mkDerivation rec {
+    name = "iscan-gt-s600-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/20240614120113/https://download2.ebz.epson.net/iscan/plugin/gt-s600/rpm/x64/iscan-gt-s600-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "fe1356b1d5c40bc5ac985a5693166efb9e5049a78b412f49c385eb503eadf2c6";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-s600-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x012d "$plugin/lib/esci/libesint66 $plugin/share/esci/esfw66.bin"
+      '';
+      hw = "GT-F650, GT-S600, Perfection V10, Perfection V100 Photo";
+    };
+    meta = common_meta // {
+      description = "iscan gt-s600 plugin for " + passthru.hw;
+    };
+  };
+  s650 = stdenv.mkDerivation rec {
+    name = "iscan-gt-s650-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-s650/rpm/x64/iscan-gt-s650-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "0fn4lz4g0a8l301v6yv7fwl37wgwhz5y90nf681f655xxc91hqh7";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-s650-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x013c "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
+        $registry --add interpreter usb 0x04b8 0x013d "$plugin/lib/esci/libiscan-plugin-gt-s650 $plugin/share/esci/esfw010c.bin"
+      '';
+      hw = "GT-S650, Perfection V19, Perfection V39";
+    };
+    meta = common_meta // {
+      description = "iscan GT-S650 for " + passthru.hw;
+    };
+  };
+  x750 = stdenv.mkDerivation rec {
+    name = "iscan-gt-x750-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-x750/rpm/x64/iscan-gt-x750-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "sha256-9EeBHmh1nwSxnTnevPP8RZ4WBdyY+itR3VXo2I7f5N0=";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-x750-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0119 "$plugin/lib/esci/libesint54 $plugin/share/esci/esfw54.bin"
+      '';
+      hw = "GT-X750, Perfection 4490";
+    };
+    meta = common_meta // {
+      description = "iscan GT-X750 for " + passthru.hw;
+    };
+  };
+  gt1500 = stdenv.mkDerivation rec {
+    name = "iscan-gt-1500-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/gt-1500/rpm/x64/iscan-gt-1500-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "sha256-1rVsbBsb+QtCOT1FsyhgvCbZIN6IeQH7rZXNmsD7cl8=";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-plugin-gt-1500-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/share/iscan $out/share/esci
+      mv $out/lib/iscan $out/lib/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0133 "$plugin/lib/esci/libesint86 $plugin/share/esci/esfw86.bin"
+      '';
+      hw = "GT-1500";
+    };
+    meta = common_meta // {
+      description = "iscan GT-1500 for " + passthru.hw;
+    };
+  };
+  ds30 = stdenv.mkDerivation rec {
+    name = "iscan-ds-30-bundle";
+    version = "2.30.4";
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/plugin/ds-30/rpm/x64/iscan-ds-30-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "0d5ef9b83999c56c14bd17ca63537f63ad4f0d70056870dc00888af1b36f4153";
+    };
+
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rpm
+    ];
+
+    installPhase = ''
+      ${rpm}/bin/rpm2cpio plugins/iscan-plugin-ds-30-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mv $out/lib/iscan $out/lib/esci
+      mkdir $out/share/esci
+    '';
+
+    passthru = {
+      registrationCommand = ''
+        $registry --add interpreter usb 0x04b8 0x0147 "$plugin/lib/esci/libiscan-plugin-ds-30.so"
+      '';
+      hw = "DS-30";
+    };
+    meta = common_meta // {
+      description = "Plugin to support " + passthru.hw + " scanner in sane";
+    };
+  };
+  network = stdenv.mkDerivation rec {
+    pname = "iscan-nt-bundle";
+    # for the version, look for the driver of XP-750 in the search page
+    version = "2.30.4";
+
+    buildInputs = [ (lib.getLib stdenv.cc.cc) ];
+    nativeBuildInputs = [ autoPatchelfHook ];
+
+    src = fetchurl {
+      urls = [
+        "https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
+        "https://web.archive.org/web/https://download2.ebz.epson.net/iscan/general/rpm/x64/iscan-bundle-${version}.x64.rpm.tar.gz"
+      ];
+      sha256 = "0jssigsgkxb9i7qa7db291a1gbvwl795i4ahvb7bnqp33czkj85k";
+    };
+    installPhase = ''
+      cd plugins
+      ${rpm}/bin/rpm2cpio iscan-network-nt-*.x86_64.rpm | ${cpio}/bin/cpio -idmv
+
+      mkdir $out
+      cp -r usr/share $out
+      cp -r usr/lib64 $out/lib
+      mkdir $out/share/esci
+    '';
+    passthru = {
+      registrationCommand = "";
+      hw = "network";
+    };
+
+    meta = common_meta // {
+      description = "iscan network plugin";
+    };
+  };
+}
diff --git a/pkgs/by-name/eq/eq10q/package.nix b/pkgs/by-name/eq/eq10q/package.nix
index 5a6de756f6f9..3e758c0c94ca 100644
--- a/pkgs/by-name/eq/eq10q/package.nix
+++ b/pkgs/by-name/eq/eq10q/package.nix
@@ -45,13 +45,17 @@ stdenv.mkDerivation rec {
     # Fix build with lv2 1.18: https://sourceforge.net/p/eq10q/bugs/23/
     find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \
       -exec sed -i {} -e 's/const _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \;
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   installFlags = [ "DESTDIR=$(out)" ];
 
   fixupPhase = ''
-    cp -r $out/var/empty/local/lib $out
-    rm -R $out/var
+    mkdir -p $out/lib
+    mv $out/usr/local/lib/* $out/lib/
+    rm -R $out/usr
   '';
 
   meta = {
diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 810c6e30404b..fae5e5d0a724 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
   # the Equicord repository. Dates as tags (and automatic releases) were the compromise
   # we came to with upstream. Please do not change the version schema (e.g., to semver)
   # unless upstream changes the tag schema from dates.
-  version = "2025-10-12";
+  version = "2025-11-02";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = "${finalAttrs.version}";
-    hash = "sha256-SH8zRLBmglsSFAg0kNmab2BV+Hx2ZCl/wd3KptUWezY=";
+    hash = "sha256-SThWYUi4h3OpsP28ouHW1f8+m1dr+wMAYhA/90LBYPg=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Other cutest Discord client mod";
     homepage = "https://github.com/Equicord/Equicord";
     license = lib.licenses.gpl3Only;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = [
       lib.maintainers.NotAShelf
     ];
diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix
index 925081801ade..0f26a43f0e0b 100644
--- a/pkgs/by-name/er/erdtree/package.nix
+++ b/pkgs/by-name/er/erdtree/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/solidiquis/erdtree/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       zendo
     ];
     mainProgram = "erd";
diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix
index 8308a2a47496..e479c13d79a0 100644
--- a/pkgs/by-name/er/erg/package.nix
+++ b/pkgs/by-name/er/erg/package.nix
@@ -65,6 +65,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/er/ericw-tools/package.nix b/pkgs/by-name/er/ericw-tools/package.nix
index dba4b02f9de7..011c4cb47b2a 100644
--- a/pkgs/by-name/er/ericw-tools/package.nix
+++ b/pkgs/by-name/er/ericw-tools/package.nix
@@ -61,6 +61,23 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace bspinfo/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace bsputil/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace light/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace qbsp/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace vis/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace man/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://ericwa.github.io/ericw-tools/";
     description = "Map compile tools for Quake and Hexen 2";
diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix
index bccddd4939aa..57d376f13b75 100644
--- a/pkgs/by-name/es/esbuild-config/package.nix
+++ b/pkgs/by-name/es/esbuild-config/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Config files for esbuild";
     homepage = "https://github.com/bpierre/esbuild-config";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "esbuild-config";
   };
 }
diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index 09e252140c63..6a8d52f44bf6 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "esp-generate";
-  version = "0.6.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${version}";
-    hash = "sha256-4yvJgYMaASCHHz86Fh73yd2vSo/0cIjVkwZMh55ZWKc=";
+    hash = "sha256-OQUBX0hZNEgMpBttWZDXI/eoOlxVfY57oZqn3YKNZ0o=";
   };
 
-  cargoHash = "sha256-OS2ZAXdOh+oL/ImIuEuo+gBsK9wk4X1vgoJbnHTJ2f4=";
+  cargoHash = "sha256-Sf37qp1TBCabgKIExs9biqvdN+KtIBPGeokLMovjM68=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";
diff --git a/pkgs/applications/audio/espeak-ng/mbrola.patch b/pkgs/by-name/es/espeak-ng/mbrola.patch
similarity index 100%
rename from pkgs/applications/audio/espeak-ng/mbrola.patch
rename to pkgs/by-name/es/espeak-ng/mbrola.patch
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/by-name/es/espeak-ng/package.nix
similarity index 100%
rename from pkgs/applications/audio/espeak-ng/default.nix
rename to pkgs/by-name/es/espeak-ng/package.nix
diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix
index 301bb8ae675b..56fe472dba8d 100644
--- a/pkgs/by-name/es/esphome/dashboard.nix
+++ b/pkgs/by-name/es/esphome/dashboard.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "esphome-dashboard";
-  version = "20250814.0";
+  version = "20251013.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "dashboard";
     rev = "refs/tags/${version}";
-    hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI=";
+    hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8=";
+    hash = "sha256-wWDM4ODlZAjjDonzS4czdBPBaRS0Px2KUlE4AfsqNIQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 5cc5a34e8202..1036009f77e5 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.9.3";
+  version = "2025.10.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-9x4uf0gHCGYLq0gr0MoAp0sk9p82zdH41PaELph0fv0=";
+    hash = "sha256-+j3x/9wmPk9HEHkQEfdgYnpUojGc89dU4pvRNaT5czk=";
   };
 
   patches = [
@@ -171,6 +171,11 @@ python.pkgs.buildPythonApplication rec {
     # tries to import platformio, which is wrapped in an fhsenv
     "test_clean_build"
     "test_clean_build_empty_cache_dir"
+    "test_clean_all"
+    "test_clean_all_partial_exists"
+    # tries to use esptool, which is wrapped in an fhsenv
+    "test_upload_using_esptool_path_conversion"
+    "test_upload_using_esptool_with_file_path"
     # AssertionError: Expected 'run_external_command' to have been called once. Called 0 times.
     "test_run_platformio_cli_sets_environment_variables"
   ];
diff --git a/pkgs/servers/etcd/README.md b/pkgs/by-name/et/etcd/README.md
similarity index 100%
rename from pkgs/servers/etcd/README.md
rename to pkgs/by-name/et/etcd/README.md
diff --git a/pkgs/by-name/et/etcd/package.nix b/pkgs/by-name/et/etcd/package.nix
new file mode 100644
index 000000000000..1d70cbf0fd3b
--- /dev/null
+++ b/pkgs/by-name/et/etcd/package.nix
@@ -0,0 +1,3 @@
+{ etcd_3_5 }:
+
+etcd_3_5
diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix
index 19e6a6c62411..ac404468b339 100644
--- a/pkgs/by-name/et/etcd_3_4/package.nix
+++ b/pkgs/by-name/et/etcd_3_4/package.nix
@@ -1,22 +1,23 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
+  nixosTests,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "etcd";
-  version = "3.4.37";
+  version = "3.4.38";
 
   src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
     rev = "v${version}";
-    hash = "sha256-PZ+8hlxSwayR1yvjHmStMDur9e1uc2s+YB8qdz+42mA=";
+    hash = "sha256-+fRmz52ZqQTL8JJmSsufoVJP/FGHez9LliEwGsoCE7s=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-VeB0A+freNwgETQMIokiOPWovGq1FANUexnzxVg2aRA=";
+  vendorHash = "sha256-CqeSRyWDw1nCKlAI46iJXT5XjI3elxufx87QIlHwp1w=";
 
   preBuild = ''
     go mod tidy
@@ -36,6 +37,8 @@ buildGoModule rec {
     install -Dm755 bin/* bin/functional/cmd/* -t $out/bin
   '';
 
+  passthru.tests = nixosTests.etcd."3_4";
+
   meta = {
     description = "Distributed reliable key-value store for the most critical data of a distributed system";
     downloadPage = "https://github.com/etcd-io/etcd/";
diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/by-name/et/etcd_3_5/package.nix
similarity index 62%
rename from pkgs/servers/etcd/3_5/default.nix
rename to pkgs/by-name/et/etcd_3_5/package.nix
index c7a96d2af453..b5b67dc32c4b 100644
--- a/pkgs/servers/etcd/3_5/default.nix
+++ b/pkgs/by-name/et/etcd_3_5/package.nix
@@ -1,8 +1,6 @@
 {
-  applyPatches,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
-  fetchpatch,
   k3s,
   lib,
   nixosTests,
@@ -10,27 +8,19 @@
 }:
 
 let
-  version = "3.5.22";
-  etcdSrcHash = "sha256-tS1IFMxfb8Vk9HJTAK+BGPZiVE3ls4Q2DQSerALOQCc=";
-  etcdServerVendorHash = "sha256-ul3R0c6RoCqLvlD2dfso1KwfHjsHfzQiUVJZJmz28ks=";
-  etcdUtlVendorHash = "sha256-S2pje2fTDaZwf6jnyE2YXWcs/fgqF51nxCVfEwg0Gsw=";
-  etcdCtlVendorHash = "sha256-lZ6o0oWUsc3WiCa87ynm7UAG6VxTf81a301QMSPOvW0=";
+  version = "3.5.24";
+  etcdSrcHash = "sha256-8qzgMiA/ATSFR5XTzWQhK1SmykHkT/FqBNG0RO93H9w=";
+  etcdServerVendorHash = "sha256-yCazbIcCOuabYDu7Tl0UTx47UiF/Rhg5O6r2kb+w4SY=";
+  etcdUtlVendorHash = "sha256-v8JQmyvHhvz7l8i8kwXVX9sAylElVSUnxKD5oUwQDUw=";
+  etcdCtlVendorHash = "sha256-UNdomi/3Q92CEsUYkt49vFF1Dp1QIFGK7wF/08U3dio=";
 
-  src = applyPatches {
-    src = fetchFromGitHub {
-      owner = "etcd-io";
-      repo = "etcd";
-      tag = "v${version}";
-      hash = etcdSrcHash;
-    };
-
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";
-        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";
-      })
-    ];
+  src = fetchFromGitHub {
+    owner = "etcd-io";
+    repo = "etcd";
+    tag = "v${version}";
+    hash = etcdSrcHash;
   };
+
   env = {
     CGO_ENABLED = 0;
   };
@@ -45,7 +35,7 @@ let
     platforms = platforms.darwin ++ platforms.linux;
   };
 
-  etcdserver = buildGoModule {
+  etcdserver = buildGo124Module {
     pname = "etcdserver";
 
     inherit
@@ -72,7 +62,7 @@ let
     ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
   };
 
-  etcdutl = buildGoModule {
+  etcdutl = buildGo124Module {
     pname = "etcdutl";
 
     inherit
@@ -87,7 +77,7 @@ let
     modRoot = "./etcdutl";
   };
 
-  etcdctl = buildGoModule {
+  etcdctl = buildGo124Module {
     pname = "etcdctl";
 
     inherit
@@ -111,11 +101,7 @@ symlinkJoin {
     deps = {
       inherit etcdserver etcdutl etcdctl;
     };
-
-    tests = {
-      inherit (nixosTests) etcd etcd-cluster;
-      k3s = k3s.passthru.tests.etcd;
-    };
+    tests = nixosTests.etcd."3_5";
     updateScript = ./update.sh;
   };
 
diff --git a/pkgs/servers/etcd/3_5/update.sh b/pkgs/by-name/et/etcd_3_5/update.sh
similarity index 95%
rename from pkgs/servers/etcd/3_5/update.sh
rename to pkgs/by-name/et/etcd_3_5/update.sh
index dc428420cbc9..7cc2632205fb 100755
--- a/pkgs/servers/etcd/3_5/update.sh
+++ b/pkgs/by-name/et/etcd_3_5/update.sh
@@ -30,7 +30,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     ETCD_SRC_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $ETCD_SRC_HASH)
 
     setKV () {
-        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/package.nix"
     }
 
     setKV version $LATEST_VERSION
@@ -63,7 +63,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     # `git` flag here is to be used by local maintainers to speed up the bump process
     if [ $# -eq 1 ] && [ "$1" = "git" ]; then
         git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
-        git add "$ETCD_PATH"/default.nix
+        git add "$ETCD_PATH"/package.nix
         git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
 
 Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
index c7f75ac9d091..49a2ad7f92c1 100644
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -1,8 +1,7 @@
 {
   applyPatches,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
-  fetchpatch,
   installShellFiles,
   k3s,
   lib,
@@ -12,11 +11,11 @@
 }:
 
 let
-  version = "3.6.4";
-  etcdSrcHash = "sha256-otz+06cOD2MVnMZWKId1GN+MeZfnDbdudiYfVCKdzuo=";
-  etcdCtlVendorHash = "sha256-kTH+s/SY+xwo6kt6iPJ7XDhin0jPk0FBr0eOe/717bE=";
-  etcdUtlVendorHash = "sha256-P0yx9YMMD9vT7N6LOlo26EAOi+Dj33p3ZjAYEoaL19A=";
-  etcdServerVendorHash = "sha256-kgbCT1JxI98W89veCItB7ZfW4d9D3/Ip3tOuFKEX9v4=";
+  version = "3.6.5";
+  etcdSrcHash = "sha256-d0Ujg9ynnnSW0PYYYrNEmPtLnYW2HcCl+zcVo8ACiS0=";
+  etcdCtlVendorHash = "sha256-5r3Q+AfWp23tzbYQoD1hXEzRttJrUUKQSpcEV3GIlOE=";
+  etcdUtlVendorHash = "sha256-funO7EEJs28w4sk4sHVA/KR1TiHumVKNs0Gn/xFl4ig=";
+  etcdServerVendorHash = "sha256-OtWpX5A+kyQej2bueTqmNf62oKmXGQzjexzXlK/XJms=";
 
   src = applyPatches {
     src = fetchFromGitHub {
@@ -25,12 +24,6 @@ let
       tag = "v${version}";
       hash = etcdSrcHash;
     };
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";
-        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";
-      })
-    ];
   };
 
   env = {
@@ -46,7 +39,7 @@ let
     platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 
-  etcdserver = buildGoModule {
+  etcdserver = buildGo124Module {
     pname = "etcdserver";
 
     inherit
@@ -73,7 +66,7 @@ let
     ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
   };
 
-  etcdutl = buildGoModule {
+  etcdutl = buildGo124Module {
     pname = "etcdutl";
 
     inherit
@@ -99,7 +92,7 @@ let
     '';
   };
 
-  etcdctl = buildGoModule {
+  etcdctl = buildGo124Module {
     pname = "etcdctl";
 
     inherit
@@ -132,11 +125,7 @@ symlinkJoin {
     deps = {
       inherit etcdserver etcdutl etcdctl;
     };
-    # Fix-Me: Tests for etcd 3.6 needs work.
-    # tests = {
-    #   inherit (nixosTests) etcd etcd-cluster;
-    #   k3s = k3s.passthru.tests.etcd;
-    # };
+    tests = nixosTests.etcd."3_6";
     updateScript = ./update.sh;
   };
 
diff --git a/pkgs/by-name/et/etcd_3_6/update.sh b/pkgs/by-name/et/etcd_3_6/update.sh
index 1330f88d9085..8bcc05d986ca 100755
--- a/pkgs/by-name/et/etcd_3_6/update.sh
+++ b/pkgs/by-name/et/etcd_3_6/update.sh
@@ -30,7 +30,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     ETCD_SRC_HASH=$(nix hash to-sri --type sha256 $ETCD_SRC_HASH)
 
     setKV () {
-        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/package.nix"
     }
 
     setKV version $LATEST_VERSION
@@ -63,7 +63,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     # `git` flag here is to be used by local maintainers to speed up the bump process
     if [ $# -eq 1 ] && [ "$1" = "git" ]; then
         git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
-        git add "$ETCD_PATH"/default.nix
+        git add "$ETCD_PATH"/package.nix
         git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
 
 Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix
index ffc5a6f0ac49..e920c46785e4 100644
--- a/pkgs/by-name/et/etherpad-lite/package.nix
+++ b/pkgs/by-name/et/etherpad-lite/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "etherpad-lite";
-  version = "2.5.0";
+  version = "2.5.1";
 
   src = fetchFromGitHub {
     owner = "ether";
     repo = "etherpad-lite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-11fNDAR6zmHv1O5nL0GhGJj6eHwDc8zT0Tvrba7qBpw=";
+    hash = "sha256-0Qrmpz9ehblS2Jdw137CJVKYmhkXt8c9B6kDG8OxZPo=";
   };
 
   patches = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-PZD55V/3dvNLx39tD4I00IzURhuyqMX4uObnQfnSBtk=";
+    hash = "sha256-gajm1yXQPZZ/oB27HwgTEoKLzwMKsHDoo2w+mIOnJrc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix
deleted file mode 100644
index d33aac2b7f3a..000000000000
--- a/pkgs/by-name/et/ethersync/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  rustPlatform,
-  versionCheckHook,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "ethersync";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "ethersync";
-    repo = "ethersync";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E=";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/daemon";
-
-  cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA=";
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
-  doInstallCheck = true;
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Real-time co-editing of local text files";
-    homepage = "https://ethersync.github.io/ethersync/";
-    downloadPage = "https://github.com/ethersync/ethersync";
-    changelog = "https://github.com/ethersync/ethersync/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = lib.licenses.agpl3Plus;
-    teams = [ lib.teams.ngi ];
-    maintainers = with lib.maintainers; [
-      prince213
-      ethancedwards8
-    ];
-  };
-})
diff --git a/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch b/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch
new file mode 100644
index 000000000000..33b94e5a6977
--- /dev/null
+++ b/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch
@@ -0,0 +1,61 @@
+From 778cb2ed0d56614fd06d2129398799e46ff51720 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Mon, 3 Nov 2025 22:25:10 +0100
+Subject: [PATCH] Add aarch64-linux support
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ src/Etterna/Models/Misc/StageStats.cpp | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/Etterna/Models/Misc/StageStats.cpp b/src/Etterna/Models/Misc/StageStats.cpp
+index 0c70cf25ae..671717505d 100644
+--- a/src/Etterna/Models/Misc/StageStats.cpp
++++ b/src/Etterna/Models/Misc/StageStats.cpp
+@@ -19,8 +19,9 @@
+ #include "Etterna/Singletons/GameManager.h"
+ #include "Etterna/Models/NoteData/NoteDataUtil.h"
+ 
+-#if !( defined(_WIN32) || defined(__APPLE__))
+-	#include <cpuid.h> //We only use cpuid.h on Linux :)
++#if !( defined(_WIN32) || defined(__APPLE__)) \
++    && (defined(__x86_64__) || defined(__i386__))
++	#include <cpuid.h> //We only use cpuid.h on x86 Linux :)
+ #endif
+ 
+ #ifdef _WIN32
+@@ -236,6 +237,8 @@ getCpuHash()
+ 
+ #else  // !DARWIN
+ 
++#if defined(__x86_64__) || defined(__i386__)
++
+ uint16_t
+ getCpuHash()
+ {
+@@ -248,6 +251,22 @@ getCpuHash()
+ 
+ 	return hash;
+ }
++
++#else // !x86
++
++uint16_t
++getCpuHash()
++{
++	// https://www.kernel.org/doc/html/v6.17/arch/arm64/cpu-feature-registers.html
++	uint64_t midr = 0;
++	asm("mrs %0, MIDR_EL1" : "=r"(midr));
++
++	// Only leave implementer, variant, and architecture bits.
++	// See https://developer.arm.com/documentation/ddi0601/2025-09/AArch64-Registers/MIDR-EL1--Main-ID-Register?lang=en
++	return midr >> 16;
++}
++
++#endif // !x86
+ #endif // !DARWIN
+ 
+ std::string
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix
index dff72cd5b51a..593b66bd10a1 100644
--- a/pkgs/by-name/et/etterna/package.nix
+++ b/pkgs/by-name/et/etterna/package.nix
@@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZCQt99Qcov/7jGfrSmX9WftaP2U2B1d1APK1mxrUDBs=";
   };
 
-  patches = [ ./fix-download-manager.patch ];
+  patches = [
+    ./fix-download-manager.patch
+
+    # https://github.com/etternagame/etterna/pull/1396
+    ./0001-Add-aarch64-linux-support.patch
+  ];
 
   nativeBuildInputs = [
     cmake
@@ -105,5 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ alikindsys ];
     mainProgram = "etterna";
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   };
 })
diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix
index cabe43ba49f4..4f52ec1aab42 100644
--- a/pkgs/by-name/eu/eureka-ideas/package.nix
+++ b/pkgs/by-name/eu/eureka-ideas/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
@@ -34,7 +35,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/simeg/eureka";
     changelog = "https://github.com/simeg/eureka/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "eureka";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix
index 0a83892b1cb7..0c5901dbe859 100644
--- a/pkgs/by-name/ev/eva/package.nix
+++ b/pkgs/by-name/ev/eva/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       ma27
-      figsoda
     ];
     mainProgram = "eva";
   };
diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 22db71d9922e..c0d45f536689 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.209.2";
+  version = "0.209.7";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-iaBP1/SszGSVMvS+kEzjbl2saaDbD7wbLdmhkQuKdwg=";
+    hash = "sha256-sBngxb4NoKXkVyBRlK3ZaF2ZDIIv0hG9+jkyQGZR6Ts=";
   };
 
-  vendorHash = "sha256-Is6hv2nkTQhugSj+CqcTiwAPvIBtNNAvWZLLWm0jU/8=";
+  vendorHash = "sha256-UriOVwZerNTtrqHNS9rW3PIEHbCkIrkiKLnA4lGuIN0=";
 
   commonMeta = with lib; {
     license = licenses.mit;
@@ -52,7 +52,7 @@ buildGo125Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-TGT3lUhUpHJ4Aw43a4C6MBH8jbXKPdM5WZwBVTfJxws=";
+    hash = "sha256-MiIRAceqdBAtrpityS9oPTbztffDpGcO0QclpFNYJLs=";
   };
 
   nativeBuildInputs = [
@@ -83,7 +83,6 @@ buildGo125Module rec {
 
   ldflags = [
     "-X github.com/evcc-io/evcc/util.Version=${version}"
-    "-X github.com/evcc-io/evcc/util.Commit=${src.tag}"
     "-s"
     "-w"
   ];
diff --git a/pkgs/by-name/ce/celestegame/everest-bin/default.nix b/pkgs/by-name/ev/everest-bin/package.nix
similarity index 81%
rename from pkgs/by-name/ce/celestegame/everest-bin/default.nix
rename to pkgs/by-name/ev/everest-bin/package.nix
index 19909557f3f2..048f564c3507 100644
--- a/pkgs/by-name/ce/celestegame/everest-bin/default.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "5806";
+  version = "5961";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5806.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5961.0/main.zip";
     extension = "zip";
-    hash = "sha256-Hw/BNvWfhdO7bvYrY/Px12BRG1SYcCBeAXBH4QnKyeY=";
+    hash = "sha256-zFGBzRbFJOnJ4d8396SoLEgnicDwEqvSbOZKqWSyR+w=";
   };
   buildInputs = [
     icu
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation {
     autoPatchelf ${phome}/MiniInstaller-linux
   '';
   meta = {
-    description = "Celeste mod loader";
+    description = "Celeste mod loader (don't install; use celestegame instead)";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
diff --git a/pkgs/by-name/ce/celestegame/everest/deps.json b/pkgs/by-name/ev/everest/deps.json
similarity index 82%
rename from pkgs/by-name/ce/celestegame/everest/deps.json
rename to pkgs/by-name/ev/everest/deps.json
index b969cfd4b5a4..6a228fef7f00 100644
--- a/pkgs/by-name/ce/celestegame/everest/deps.json
+++ b/pkgs/by-name/ev/everest/deps.json
@@ -1,4 +1,14 @@
 [
+  {
+    "pname": "DotNet.ReproducibleBuilds",
+    "version": "1.2.25",
+    "hash": "sha256-Vl9RPq9vCO4bjulPZiOr3gDVKlr9vnuKIIX3KWlRxvw="
+  },
+  {
+    "pname": "DotNet.ReproducibleBuilds.Isolated",
+    "version": "1.2.25",
+    "hash": "sha256-NpGbG9rnKKN6ejz1xqUa2AYx8mGSv+ZHbducFGhhrwA="
+  },
   {
     "pname": "DotNetZip",
     "version": "1.16.0",
@@ -24,16 +34,6 @@
     "version": "3.0.2",
     "hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA="
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "3.0.1",
-    "hash": "sha256-y4VQ8teCZOnCJyg0rh3s1SbbqfoEclB5T6lCfMrxWUw="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "3.1.10",
-    "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY="
-  },
   {
     "pname": "Microsoft.AspNetCore.App.Ref",
     "version": "5.0.0",
@@ -49,21 +49,6 @@
     "version": "7.0.20",
     "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "8.0.19",
-    "hash": "sha256-QySX2bih1UvwmLcn9cy1j+RuvZZwbcFKggL5Y/WcTnw="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "3.0.3",
-    "hash": "sha256-CbtnZSF+lvyeIfEUC8a0Jf4EMvYAxa9mvWF9lyLymMk="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "3.1.32",
-    "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s="
-  },
   {
     "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
     "version": "5.0.17",
@@ -79,11 +64,6 @@
     "version": "7.0.20",
     "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "8.0.19",
-    "hash": "sha256-u50rdLuoADSDCthx2Fg+AnT192TalHhFrzFCfMgmTn4="
-  },
   {
     "pname": "Microsoft.Build.Tasks.Git",
     "version": "1.1.0",
@@ -129,26 +109,6 @@
     "version": "3.1.16",
     "hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww="
   },
-  {
-    "pname": "Microsoft.NET.Sdk.IL",
-    "version": "8.0.0",
-    "hash": "sha256-guQcVwSaVwJ0uJvUYZqk1bZ9ATLBk3zWHZmTW7EV1KM="
-  },
-  {
-    "pname": "Microsoft.NETCore.App",
-    "version": "2.1.0",
-    "hash": "sha256-RJksv5W7LhWJYGmkwYHfiU0s9XLCvT05KxSMz6U1/OE="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "3.0.3",
-    "hash": "sha256-hIdA8ncOXoDM6/ryKCTVz/vZrqFLffxAgpN/qfl2L6Y="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "3.1.32",
-    "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM="
-  },
   {
     "pname": "Microsoft.NETCore.App.Host.linux-x64",
     "version": "5.0.17",
@@ -164,21 +124,6 @@
     "version": "7.0.20",
     "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "8.0.19",
-    "hash": "sha256-a9t/bX+WIKOu9q2R52b/hPGwOpkAgpYuP42SW2QXTak="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "3.0.0",
-    "hash": "sha256-PHovvd+mPN9HoCF0rFEnS015p7Yj76+e9cfSU4JAI+I="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "3.1.0",
-    "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM="
-  },
   {
     "pname": "Microsoft.NETCore.App.Ref",
     "version": "5.0.0",
@@ -194,21 +139,6 @@
     "version": "7.0.20",
     "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "8.0.19",
-    "hash": "sha256-4ymel0R1c0HrX0plAWubJPzev52y0Fsx1esyQ1R7bXc="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "3.0.3",
-    "hash": "sha256-mxA9JF2WyEDV8yahdwhe4qfCTbIFroUfmMzPBa91b/o="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "3.1.32",
-    "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY="
-  },
   {
     "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
     "version": "5.0.17",
@@ -224,36 +154,11 @@
     "version": "7.0.20",
     "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "8.0.19",
-    "hash": "sha256-Ou51zUFTPESAAzP/z0+sLDAAXC54+oDlESBBT12M2lM="
-  },
-  {
-    "pname": "Microsoft.NETCore.DotNetAppHost",
-    "version": "2.1.0",
-    "hash": "sha256-LV8pnNFsKGFONyCTGsd8qB5A+EUIiyvbYWAr0eOEFoI="
-  },
-  {
-    "pname": "Microsoft.NETCore.DotNetHostPolicy",
-    "version": "2.1.0",
-    "hash": "sha256-FqQm4BLznzRmF1nhk3nEwrdeAdCY35eBmHk6/4+MCPY="
-  },
-  {
-    "pname": "Microsoft.NETCore.DotNetHostResolver",
-    "version": "2.1.0",
-    "hash": "sha256-5nQTmMhaEvbuT+1f7u0t0tEK3SCVUeXhsExq8tiYBI0="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
     "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.1.0",
-    "hash": "sha256-v09ltBAKTX8iAKuU2nCl+Op/ilVJQ0POZUh2z+u0rVo="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "3.1.0",
@@ -269,11 +174,6 @@
     "version": "1.1.0",
     "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "2.1.0",
-    "hash": "sha256-+KdWdA9I392SRqMb9KaiiRZatfvJ9RcdbtyGUkpHW7U="
-  },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies",
     "version": "1.0.3",
@@ -331,33 +231,28 @@
   },
   {
     "pname": "Mono.Cecil",
-    "version": "0.11.5",
-    "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA="
+    "version": "0.11.6",
+    "hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU="
   },
   {
     "pname": "MonoMod.Backports",
-    "version": "1.1.0",
-    "hash": "sha256-ruRX10/u+lRfMKr0UMbCVYS/nUK5fzV4+8ujJXBnles="
+    "version": "1.1.2",
+    "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38="
   },
   {
     "pname": "MonoMod.Core",
-    "version": "1.0.0",
-    "hash": "sha256-Y55fgMd0d35qztqqC0drzn3NdSMYLiWie8IL9LbmFnc="
+    "version": "1.3.0",
+    "hash": "sha256-B/pb8hor4npd3YSkvEF8FEO7xbbcHIfLapTUcrd5qRY="
   },
   {
     "pname": "MonoMod.ILHelpers",
-    "version": "1.0.0",
-    "hash": "sha256-N6ybnOMkEtxXy/PdJAEkqHggHYSLETbCMF+mgNGXAvo="
-  },
-  {
-    "pname": "MonoMod.Patcher",
-    "version": "25.0.0-prerelease.1",
-    "hash": "sha256-+5kddzc3FheDIRNoTPWQREc1ufVFjfPFiiKrXTPCTWQ="
+    "version": "1.1.0",
+    "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw="
   },
   {
     "pname": "MonoMod.RuntimeDetour",
-    "version": "25.0.0",
-    "hash": "sha256-yyP3kTN+OcOoO8xmHZfebKB/EtWNi7V6aJnXUTjVU/8="
+    "version": "25.3.0",
+    "hash": "sha256-ZDS2MYHwL+cGuGycqivqfS/i+Uglx203SGtFx3vCSOA="
   },
   {
     "pname": "MonoMod.RuntimeDetour.HookGen",
@@ -366,8 +261,8 @@
   },
   {
     "pname": "MonoMod.Utils",
-    "version": "25.0.0",
-    "hash": "sha256-PL7/F0zXnLRb5icD5zl/QCeMyTEsJZKOvSBvM1t8BEY="
+    "version": "25.0.8",
+    "hash": "sha256-k2Nh8btGmOhKCEmCnO7t5pQszrzH0Lok5mgwWBRXviE="
   },
   {
     "pname": "NETStandard.Library",
@@ -499,36 +394,6 @@
     "version": "4.3.0",
     "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.App",
-    "version": "2.1.0",
-    "hash": "sha256-qFtPLe3t/V9DZTaYhAO6MbVsyzH4hcQQUvyIJ6ywbEw="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost",
-    "version": "2.1.0",
-    "hash": "sha256-NMuEFKc68Vn4bVoX6kdGSQeyDpktUYliUg6Lbj4E8FU="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
-    "version": "2.1.0",
-    "hash": "sha256-U/WlbUpImqPjZf075WgBOb1o1i1H3VOL4QbzHfQ9Itk="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
-    "version": "2.1.0",
-    "hash": "sha256-vcB6FY1GDP+kTsmp9OXpPg50sXKqOSJzWUSuNlN1+rs="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "version": "6.0.0",
-    "hash": "sha256-i/UcSf9HhYBtscSZKsaPReL/ntN8EQhmEpFIkEfoGhQ="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "version": "6.0.0",
-    "hash": "sha256-flN7eEFoqIUmbuGHgVu/R1F7trwjOXwxmBVw/+Jv2Hg="
-  },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
@@ -659,11 +524,6 @@
     "version": "4.3.0",
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "6.0.0",
-    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
-  },
   {
     "pname": "System.Collections.Immutable",
     "version": "8.0.0",
@@ -774,11 +634,6 @@
     "version": "4.3.0",
     "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
-  },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
@@ -864,11 +719,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.3",
-    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
@@ -1029,6 +879,11 @@
     "version": "4.3.0",
     "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
   },
+  {
+    "pname": "Vezel.Zig.Toolsets.linux-x64",
+    "version": "0.14.1.1",
+    "hash": "sha256-H32XG4157eWqa6qcVtd4t6Ef35MzYnXqr62FcwMAxSo="
+  },
   {
     "pname": "YamlDotNet",
     "version": "16.1.3",
diff --git a/pkgs/by-name/ce/celestegame/everest/default.nix b/pkgs/by-name/ev/everest/package.nix
similarity index 70%
rename from pkgs/by-name/ce/celestegame/everest/default.nix
rename to pkgs/by-name/ev/everest/package.nix
index 5ef0ee79b589..18e42f537766 100644
--- a/pkgs/by-name/ce/celestegame/everest/default.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -6,13 +6,12 @@
   dotnetCorePackages,
   autoPatchelfHook,
   mono,
-  git,
   icu,
 }:
 
 let
   pname = "everest";
-  version = "5806";
+  version = "5961";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -21,16 +20,14 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "EverestAPI";
     repo = "Everest";
-    rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040";
+    rev = "7972286159c1f4d1f219c1101273067d45cd1161";
     fetchSubmodules = true;
-    leaveDotGit = true; # MonoMod.SourceGen.Internal needs .git
-    hash = "sha256-uxb9LwCDGJIc+JN2EqNqHdLLwULnG7Bd/Az3H1zKf3E=";
+    # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
+    # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
+    hash = "sha256-GkWeOfatzw9uLWkzNzjSEM8p+HWuJPbycv/0YNxTdqk=";
   };
 
-  nativeBuildInputs = [
-    git
-    autoPatchelfHook
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = [
     icu # For autoPatchelf
@@ -39,7 +36,7 @@ buildDotnetModule {
 
   postPatch = ''
     # MonoMod.ILHelpers.Patcher complains at build phase: You must install .NET to run this application.
-    sed -i 's|<Exec Command="&quot;|<Exec Command="DOTNET_ROOT=${dotnetCorePackages.runtime_8_0}/share/dotnet \&quot;|' external/MonoMod/tools/Common.IL.targets
+    sed -i 's|<Exec Command="&quot;|<Exec Command="DOTNET_ROOT=${dotnetCorePackages.runtime_9_0}/share/dotnet \&quot;|' external/MonoMod/tools/Common.IL.targets
 
     # Moving files after publishing somehow doesn't work. Will do this manually in postInstall.
     sed -i 's|<Move.*/>||' Celeste.Mod.mm/Celeste.Mod.mm.csproj
@@ -47,17 +44,25 @@ buildDotnetModule {
     autoPatchelf lib-ext/piton/piton-linux_x64
   '';
 
-  dotnet-sdk = dotnetCorePackages.sdk_9_0;
-
-  preConfigure = ''
-    # Microsoft.SourceLink.GitHub complains: Unable to determine repository url, the source code won't be available via source link.
-    cd external/MonoMod
-    git -c safe.directory='*' remote add origin https://github.com/MonoMod/MonoMod.git
-    cd ../..
-  '';
-
+  dotnet-sdk =
+    with dotnetCorePackages;
+    sdk_9_0
+    // {
+      inherit
+        (combinePackages [
+          sdk_9_0
+          sdk_8_0
+        ])
+        packages
+        targetPackages
+        ;
+    };
   nugetDeps = ./deps.json;
 
+  # Workaround from https://github.com/NixOS/nixpkgs/issues/454432
+  # Necessitated by https://github.com/MonoMod/MonoMod/pull/246
+  dotnetRestoreFlags = [ "--force-evaluate" ];
+
   # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814
   linkNugetPackages = true;
 
@@ -93,8 +98,10 @@ buildDotnetModule {
   dontPatchShebangs = true;
   dontAutoPatchelf = true;
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
-    description = "Celeste mod loader";
+    description = "Celeste mod loader (don't install; use celestegame instead)";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [ ulysseszhan ];
     homepage = "https://everestapi.github.io";
diff --git a/pkgs/by-name/ce/celestegame/update.sh b/pkgs/by-name/ev/everest/update.sh
similarity index 75%
rename from pkgs/by-name/ce/celestegame/update.sh
rename to pkgs/by-name/ev/everest/update.sh
index 2a1aefdc7675..29f9c13e3ae0 100755
--- a/pkgs/by-name/ce/celestegame/update.sh
+++ b/pkgs/by-name/ev/everest/update.sh
@@ -18,6 +18,6 @@ commit=$(echo "$latest" | jq -r .commit)
 version=$(echo "$latest" | jq -r .version)
 url=$(echo "$latest" | jq -r .mainDownload)
 
-update-source-version celestegame.passthru.everest $version --rev=$commit
-"$(nix-build --attr celestegame.passthru.everest.fetch-deps --no-out-link)"
-update-source-version celestegame.passthru.everest-bin $version "" $url
+update-source-version everest $version --rev=$commit
+"$(nix-build --attr everest.fetch-deps --no-out-link)"
+update-source-version everest-bin $version "" $url
diff --git a/pkgs/by-name/ev/everforest-cursors/package.nix b/pkgs/by-name/ev/everforest-cursors/package.nix
new file mode 100644
index 000000000000..a147ee14d3b3
--- /dev/null
+++ b/pkgs/by-name/ev/everforest-cursors/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "everforest-cursors";
+  version = "3212590527";
+
+  src = fetchurl {
+    url = "https://github.com/talwat/everforest-cursors/releases/download/${finalAttrs.version}/everforest-cursors-variants.tar.bz2";
+    hash = "sha256-xXgtN9wbjbrGLUGYymMEGug9xEs9y44mq18yZVdbiuU=";
+  };
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/share/icons
+    cp -r ./everforest-cursors* $out/share/icons
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Everforest cursor theme, based on phinger-cursors";
+    homepage = "https://github.com/talwat/everforest-cursors";
+    license = lib.licenses.cc-by-sa-40;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.stelcodes ];
+  };
+})
diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
index 62eae627efd7..e875418bc9cb 100644
--- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
+++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch
@@ -1,8 +1,8 @@
 diff --git a/src/addressbook/libebook/e-book-client.c b/src/addressbook/libebook/e-book-client.c
-index 5e65ec8..2cae29d 100644
+index c31f3ef..9ebb5f2 100644
 --- a/src/addressbook/libebook/e-book-client.c
 +++ b/src/addressbook/libebook/e-book-client.c
-@@ -1924,7 +1924,18 @@ e_book_client_get_self (ESourceRegistry *registry,
+@@ -1926,7 +1926,18 @@ e_book_client_get_self (ESourceRegistry *registry,
  
  	*out_client = book_client;
  
@@ -22,7 +22,7 @@ index 5e65ec8..2cae29d 100644
  	uid = g_settings_get_string (settings, SELF_UID_KEY);
  	g_object_unref (settings);
  
-@@ -1992,7 +2003,18 @@ e_book_client_set_self (EBookClient *client,
+@@ -1994,7 +2005,18 @@ e_book_client_set_self (EBookClient *client,
  	g_return_val_if_fail (
  		e_contact_get_const (contact, E_CONTACT_UID) != NULL, FALSE);
  
@@ -42,7 +42,7 @@ index 5e65ec8..2cae29d 100644
  	g_settings_set_string (
  		settings, SELF_UID_KEY,
  		e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2028,8 +2050,20 @@ e_book_client_is_self (EContact *contact)
+@@ -2030,8 +2052,20 @@ e_book_client_is_self (EContact *contact)
  	 * unfortunately the API doesn't allow that.
  	 */
  	g_mutex_lock (&mutex);
@@ -66,10 +66,10 @@ index 5e65ec8..2cae29d 100644
  	g_mutex_unlock (&mutex);
  
 diff --git a/src/addressbook/libebook/e-book.c b/src/addressbook/libebook/e-book.c
-index a9b68e3..6a13b1b 100644
+index 9d986d2..d63902a 100644
 --- a/src/addressbook/libebook/e-book.c
 +++ b/src/addressbook/libebook/e-book.c
-@@ -2586,7 +2586,18 @@ e_book_get_self (ESourceRegistry *registry,
+@@ -2593,7 +2593,18 @@ e_book_get_self (ESourceRegistry *registry,
  		return FALSE;
  	}
  
@@ -89,7 +89,7 @@ index a9b68e3..6a13b1b 100644
  	uid = g_settings_get_string (settings, SELF_UID_KEY);
  	g_object_unref (settings);
  
-@@ -2641,7 +2652,18 @@ e_book_set_self (EBook *book,
+@@ -2648,7 +2659,18 @@ e_book_set_self (EBook *book,
  	g_return_val_if_fail (E_IS_BOOK (book), FALSE);
  	g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
  
@@ -109,7 +109,7 @@ index a9b68e3..6a13b1b 100644
  	g_settings_set_string (
  		settings, SELF_UID_KEY,
  		e_contact_get_const (contact, E_CONTACT_UID));
-@@ -2669,7 +2691,18 @@ e_book_is_self (EContact *contact)
+@@ -2676,7 +2698,18 @@ e_book_is_self (EContact *contact)
  
  	g_return_val_if_fail (E_IS_CONTACT (contact), FALSE);
  
@@ -130,10 +130,10 @@ index a9b68e3..6a13b1b 100644
  	g_object_unref (settings);
  
 diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c
-index 752f83f..eaa3dad 100644
+index 2a95a75..950f430 100644
 --- a/src/addressbook/libedata-book/e-book-meta-backend.c
 +++ b/src/addressbook/libedata-book/e-book-meta-backend.c
-@@ -145,7 +145,18 @@ ebmb_is_power_saver_enabled (void)
+@@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void)
  	GSettings *settings;
  	gboolean enabled = FALSE;
  
@@ -178,10 +178,10 @@ index 9f8646a..079aba9 100644
  	cbc->priv->update_alarms_id = 0;
  	cbc->priv->alarm_enabled = FALSE;
 diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
-index 2525856..7ecc1a8 100644
+index 6318854..6b7a88c 100644
 --- a/src/calendar/backends/file/e-cal-backend-file.c
 +++ b/src/calendar/backends/file/e-cal-backend-file.c
-@@ -3682,7 +3682,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
+@@ -3701,7 +3701,20 @@ e_cal_backend_file_receive_objects (ECalBackendSync *backend,
  			if (is_declined) {
  				GSettings *settings;
  
@@ -204,10 +204,10 @@ index 2525856..7ecc1a8 100644
  				g_clear_object (&settings);
  			}
 diff --git a/src/calendar/libecal/e-reminder-watcher.c b/src/calendar/libecal/e-reminder-watcher.c
-index 026ae80..e3003c2 100644
+index 92d68e2..d1e1fa4 100644
 --- a/src/calendar/libecal/e-reminder-watcher.c
 +++ b/src/calendar/libecal/e-reminder-watcher.c
-@@ -2844,8 +2844,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
+@@ -2882,8 +2882,33 @@ e_reminder_watcher_init (EReminderWatcher *watcher)
  
  	watcher->priv = e_reminder_watcher_get_instance_private (watcher);
  	watcher->priv->cancellable = g_cancellable_new ();
@@ -244,10 +244,10 @@ index 026ae80..e3003c2 100644
  		g_signal_connect_object (
  			watcher->priv->desktop_settings,
 diff --git a/src/calendar/libedata-cal/e-cal-meta-backend.c b/src/calendar/libedata-cal/e-cal-meta-backend.c
-index 84ccbb0..9010429 100644
+index df89788..4a1ebd0 100644
 --- a/src/calendar/libedata-cal/e-cal-meta-backend.c
 +++ b/src/calendar/libedata-cal/e-cal-meta-backend.c
-@@ -157,7 +157,18 @@ ecmb_is_power_saver_enabled (void)
+@@ -160,7 +160,18 @@ ecmb_is_power_saver_enabled (void)
  	GSettings *settings;
  	gboolean enabled = FALSE;
  
@@ -267,7 +267,7 @@ index 84ccbb0..9010429 100644
  
  	if (g_settings_get_boolean (settings, "limit-operations-in-power-saver-mode")) {
  		GPowerProfileMonitor *power_monitor;
-@@ -2628,7 +2639,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
+@@ -2654,7 +2665,20 @@ ecmb_receive_object_sync (ECalMetaBackend *meta_backend,
  			if (is_declined) {
  				GSettings *settings;
  
@@ -290,10 +290,10 @@ index 84ccbb0..9010429 100644
  				g_clear_object (&settings);
  			}
 diff --git a/src/camel/camel-cipher-context.c b/src/camel/camel-cipher-context.c
-index d00fbd5..0f67653 100644
+index 03b5129..3f4256a 100644
 --- a/src/camel/camel-cipher-context.c
 +++ b/src/camel/camel-cipher-context.c
-@@ -1630,7 +1630,18 @@ camel_cipher_can_load_photos (void)
+@@ -1637,7 +1637,18 @@ camel_cipher_can_load_photos (void)
  	GSettings *settings;
  	gboolean load_photos;
  
@@ -314,10 +314,10 @@ index d00fbd5..0f67653 100644
  	g_clear_object (&settings);
  
 diff --git a/src/camel/camel-gpg-context.c b/src/camel/camel-gpg-context.c
-index 4594ab1..e71ce05 100644
+index c5ac40f..fb8ae19 100644
 --- a/src/camel/camel-gpg-context.c
 +++ b/src/camel/camel-gpg-context.c
-@@ -745,7 +745,18 @@ gpg_ctx_get_executable_name (void)
+@@ -748,7 +748,18 @@ gpg_ctx_get_executable_name (void)
  		GSettings *settings;
  		gchar *path;
  
@@ -338,10 +338,10 @@ index 4594ab1..e71ce05 100644
  		g_clear_object (&settings);
  
 diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c
-index 0c1c7dd..4188934 100644
+index 2c0b6ef..b354332 100644
 --- a/src/camel/camel-utils.c
 +++ b/src/camel/camel-utils.c
-@@ -361,7 +361,19 @@ void
+@@ -363,7 +363,19 @@ void
  _camel_utils_initialize (void)
  {
  	G_LOCK (mi_user_headers);
@@ -363,10 +363,10 @@ index 0c1c7dd..4188934 100644
  		G_CALLBACK (mi_user_headers_settings_changed_cb), NULL);
  	G_UNLOCK (mi_user_headers);
 diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c
-index 8cf56f0..f4355d5 100644
+index c3c2d7d..e1370db 100644
 --- a/src/camel/providers/imapx/camel-imapx-server.c
 +++ b/src/camel/providers/imapx/camel-imapx-server.c
-@@ -5681,7 +5681,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
+@@ -5671,7 +5671,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder)
  	if (do_old_flags_update) {
  		GSettings *eds_settings;
  
@@ -411,10 +411,10 @@ index f7c5d3c..67732c3 100644
  	g_clear_object (&settings);
  
 diff --git a/src/libedataserver/e-network-monitor.c b/src/libedataserver/e-network-monitor.c
-index 188f276..939f89b 100644
+index e9cb145..8fc30d5 100644
 --- a/src/libedataserver/e-network-monitor.c
 +++ b/src/libedataserver/e-network-monitor.c
-@@ -256,7 +256,18 @@ e_network_monitor_constructed (GObject *object)
+@@ -260,7 +260,18 @@ e_network_monitor_constructed (GObject *object)
  	/* Chain up to parent's method. */
  	G_OBJECT_CLASS (e_network_monitor_parent_class)->constructed (object);
  
@@ -531,10 +531,10 @@ index db775f9..fb524db 100644
  	g_object_unref (settings);
  
 diff --git a/src/libedataserver/e-source-registry.c b/src/libedataserver/e-source-registry.c
-index 1539f8b..77cf123 100644
+index bd9822d..3e021dd 100644
 --- a/src/libedataserver/e-source-registry.c
 +++ b/src/libedataserver/e-source-registry.c
-@@ -1754,7 +1754,19 @@ e_source_registry_init (ESourceRegistry *registry)
+@@ -1781,7 +1781,19 @@ e_source_registry_init (ESourceRegistry *registry)
  
  	g_mutex_init (&registry->priv->sources_lock);
  
@@ -556,10 +556,10 @@ index 1539f8b..77cf123 100644
  	g_signal_connect (
  		registry->priv->settings, "changed",
 diff --git a/src/libedataserverui/e-reminders-widget.c b/src/libedataserverui/e-reminders-widget.c
-index b47a374..e812fbe 100644
+index 02dcd6e..5dfa7ac 100644
 --- a/src/libedataserverui/e-reminders-widget.c
 +++ b/src/libedataserverui/e-reminders-widget.c
-@@ -1985,7 +1985,19 @@ static void
+@@ -2132,7 +2132,19 @@ static void
  e_reminders_widget_init (ERemindersWidget *reminders)
  {
  	reminders->priv = e_reminders_widget_get_instance_private (reminders);
diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix
index 3a29f92c0c2a..eed95cc14c07 100644
--- a/pkgs/by-name/ev/evolution-data-server/package.nix
+++ b/pkgs/by-name/ev/evolution-data-server/package.nix
@@ -48,9 +48,9 @@
   makeHardcodeGsettingsPatch,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "evolution-data-server";
-  version = "3.56.2";
+  version = "3.58.0";
 
   outputs = [
     "out"
@@ -58,8 +58,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor version}/evolution-data-server-${version}.tar.xz";
-    hash = "sha256-307CmVDymnbqxvvg+BTEjSzvfT/bkFACpKiD3XYc6Tw=";
+    url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz";
+    hash = "sha256-orWguNsRtyjtwdbxwincJxGWK3qHwDhCIdrI2WAAzvc=";
   };
 
   patches = [
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
 
   prePatch = ''
     substitute ${./hardcode-gsettings.patch} hardcode-gsettings.patch \
-      --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${version}"} \
+      --subst-var-by EDS ${glib.makeSchemaPath "$out" "evolution-data-server-${finalAttrs.version}"} \
       --subst-var-by GDS ${glib.getSchemaPath gsettings-desktop-schemas}
     patches="$patches $PWD/hardcode-gsettings.patch"
   '';
@@ -179,7 +179,7 @@ stdenv.mkDerivation rec {
         "org.gnome.evolution-data-server" = "EDS";
         "org.gnome.desktop.interface" = "GDS";
       };
-      inherit src patches;
+      inherit (finalAttrs) src patches;
     };
     updateScript =
       let
@@ -198,9 +198,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Unified backend for programs that work with contacts, tasks, and calendar information";
     homepage = "https://gitlab.gnome.org/GNOME/evolution-data-server";
-    changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${version}/NEWS?ref_type=tags";
+    changelog = "https://gitlab.gnome.org/GNOME/evolution-data-server/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     license = lib.licenses.lgpl2Plus;
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux; # requires libuuid
   };
-}
+})
diff --git a/pkgs/by-name/ev/evolve-core/package.nix b/pkgs/by-name/ev/evolve-core/package.nix
index 4c94f52eaf3f..aa1600caf939 100644
--- a/pkgs/by-name/ev/evolve-core/package.nix
+++ b/pkgs/by-name/ev/evolve-core/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   makeDesktopItem,
   copyDesktopItems,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "evolve-core";
   version = "1.7";
 
diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 1e666b42f698..0f8f047b1913 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       coffeeispower
-      figsoda
       lom
       w-lfchen
     ];
diff --git a/pkgs/by-name/ex/exaile/package.nix b/pkgs/by-name/ex/exaile/package.nix
index e99fa3d0a5b9..e8b14a428189 100644
--- a/pkgs/by-name/ex/exaile/package.nix
+++ b/pkgs/by-name/ex/exaile/package.nix
@@ -36,13 +36,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exaile";
-  version = "4.1.4";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "exaile";
     repo = "exaile";
     rev = version;
-    sha256 = "sha256-iyK2txutlWe67CyfKuyesBrYQypkS5FOf1ZWUkRCq24=";
+    sha256 = "sha256-33lUlJ7H7lmty46GLzGkIUpgbWIv2EqEcPIzKt87dis=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ex/example-robot-data/package.nix b/pkgs/by-name/ex/example-robot-data/package.nix
index 20a2b2366b8f..321503b0cafe 100644
--- a/pkgs/by-name/ex/example-robot-data/package.nix
+++ b/pkgs/by-name/ex/example-robot-data/package.nix
@@ -5,20 +5,18 @@
   lib,
   jrl-cmakemodules,
   pkg-config,
-  pythonSupport ? false,
-  python3Packages,
   stdenv,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "example-robot-data";
-  version = "4.3.0";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "Gepetto";
     repo = "example-robot-data";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-i5YU5lcbB3gm8/YrRRiE2NDcLEq7+eF7GtIrJ1DF1cU=";
+    hash = "sha256-HnI1EaTSqk7mbihwFTgnMxgPZxMSYnAwaCLEXS3LUbE=";
   };
 
   outputs = [
@@ -32,25 +30,15 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     pkg-config
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.python
-    python3Packages.pythonImportsCheckHook
   ];
 
   propagatedBuildInputs = [
     jrl-cmakemodules
-  ]
-  ++ lib.optionals pythonSupport [ python3Packages.pinocchio ];
+  ];
 
-  cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport) ];
+  cmakeFlags = [ (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false) ];
 
   doCheck = true;
-  # The package expect to find an `example-robot-data/robots` folder somewhere
-  # either in install prefix or in the sources
-  # where it can find the meshes for unit tests
-  preCheck = "ln -s source ../../example-robot-data";
-  pythonImportsCheck = [ "example_robot_data" ];
 
   meta = with lib; {
     description = "Set of robot URDFs for benchmarking and developed examples";
diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index beb459c582b5..2ee910bcb939 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "exim";
-  version = "4.98.2";
+  version = "4.99";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
-    hash = "sha256-iLjopnwdtswLHRSBYao25mL0yi/vJdW282lNSQ5C3K4=";
+    hash = "sha256-XfOLBC/6mpyNMbILyEgVWAcONhsG9ldghiKmKjJ63Lo=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
index 791e962fd122..e35bb87c7d8a 100644
--- a/pkgs/by-name/ex/exoscale-cli/package.nix
+++ b/pkgs/by-name/ex/exoscale-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "exoscale-cli";
-  version = "1.85.4";
+  version = "1.86.0";
 
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-rulleAbiwnUABnHLpfHFjGXK3/DxFJLmse3NIClSpMQ=";
+    sha256 = "sha256-AlpCTeopNfaN4IeumaEFTZNrBfIJH2RbfVoZaFRCy2Y=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix
index ba5a46d034f8..d650a64b19fc 100644
--- a/pkgs/by-name/ex/expat/package.nix
+++ b/pkgs/by-name/ex/expat/package.nix
@@ -18,7 +18,7 @@
 # files.
 
 let
-  version = "2.7.2";
+  version = "2.7.3";
   tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
-    hash = "sha256-Ibd4s07IN8KsKFrvNA+ftfoGOoEbIepNJBKpcCyImVw=";
+    hash = "sha256-cd+PQHBqe7CoClNnB56nXZHaT4xlxY7Fm837997Nq58=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 36496b0a25e0..5865d889ab06 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "exploitdb";
-  version = "2025-09-18";
+  version = "2025-11-01";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     tag = finalAttrs.version;
-    hash = "sha256-+5zXe+64tZD7zjZKXrAuv5ggBRb1ecKzKZSY2Knzklg=";
+    hash = "sha256-MXWP7YOv4JAIKerAGuSeiAiQ98sRU6mZ1ZQSJBPCZQs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix
index 0d0786290192..9d3e2ad6987b 100644
--- a/pkgs/by-name/ex/expr/package.nix
+++ b/pkgs/by-name/ex/expr/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
     homepage = "https://github.com/expr-lang/expr";
     changelog = "https://github.com/expr-lang/expr/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "expr";
   };
 }
diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix
index 3c8dff907b22..d23cc5524be8 100644
--- a/pkgs/by-name/ez/ezno/package.nix
+++ b/pkgs/by-name/ez/ezno/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kaleidawave/ezno";
     changelog = "https://github.com/kaleidawave/ezno/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index f79b09b643c7..2c5f0895bd9b 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "f3d";
-  version = "3.2.0";
+  version = "3.3.0";
 
   outputs = [ "out" ] ++ lib.optionals withManual [ "man" ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "f3d-app";
     repo = "f3d";
     tag = "v${version}";
-    hash = "sha256-p1Cqam3sYDXJCU1A2sC/fV1ohxS3FGiVrxeGooNXVBQ=";
+    hash = "sha256-nZXz5FiGAcDqTi5hlSH7rq2QazhqYg1IoNDog35dygA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 846599272c74..9fe423d3fa58 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.319";
+  version = "1.4.320";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-PTxBDJS2Fm3hqvQO9LGLZ+8vWeUQjw4UXk2J8j06ZTQ=";
+    hash = "sha256-/K70Gm96TYD8djNZkeFAB1hS3BXWuW/Nqtu583d055o=";
   };
 
   vendorHash = "sha256-V24r/xl/E37OYW59apD/ccXtDIpP3MeUEq9HvHdTSgM=";
diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 5f8e931e9abc..1702d1eb7f2a 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,38 +3,38 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.69.tar.xz"
+          "factorio_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.69.tar.xz",
+        "name": "factorio_alpha_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
+        "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.69.tar.xz"
+          "factorio_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.69.tar.xz",
+        "name": "factorio_alpha_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
+        "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
+        "version": "2.0.72"
       }
     },
     "demo": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-demo_linux_2.0.69.tar.xz"
+          "factorio-demo_linux_2.0.70.tar.xz"
         ],
-        "name": "factorio_demo_x64-2.0.69.tar.xz",
+        "name": "factorio_demo_x64-2.0.70.tar.xz",
         "needsAuth": false,
-        "sha256": "a670a4cd2fa59cb8dc6db10d969867266080f171e47ebed78880ccd5ed42356c",
+        "sha256": "3be56bbfde644a3a97ab925a1fc2a32f9620e595fa14700bdcfbb127bc528bc8",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/demo/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.70/demo/linux64",
+        "version": "2.0.70"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -51,51 +51,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.69.tar.xz"
+          "factorio-space-age_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.69.tar.xz",
+        "name": "factorio_expansion_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
+        "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.69.tar.xz"
+          "factorio-space-age_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.69.tar.xz",
+        "name": "factorio_expansion_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
+        "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
+        "version": "2.0.72"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.69.tar.xz",
-          "factorio_headless_x64_2.0.69.tar.xz"
+          "factorio-headless_linux_2.0.72.tar.xz",
+          "factorio_headless_x64_2.0.72.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.69.tar.xz",
+        "name": "factorio_headless_x64-2.0.72.tar.xz",
         "needsAuth": false,
-        "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
+        "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.69.tar.xz",
-          "factorio_headless_x64_2.0.69.tar.xz"
+          "factorio-headless_linux_2.0.72.tar.xz",
+          "factorio_headless_x64_2.0.72.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.69.tar.xz",
+        "name": "factorio_headless_x64-2.0.72.tar.xz",
         "needsAuth": false,
-        "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
+        "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
+        "version": "2.0.72"
       }
     }
   }
diff --git a/pkgs/by-name/fa/fakehttp/package.nix b/pkgs/by-name/fa/fakehttp/package.nix
new file mode 100644
index 000000000000..33629b69fe78
--- /dev/null
+++ b/pkgs/by-name/fa/fakehttp/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libnetfilter_queue,
+  libnfnetlink,
+  libmnl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fakehttp";
+  version = "0.9.18";
+
+  src = fetchFromGitHub {
+    owner = "MikeWang000000";
+    repo = "FakeHTTP";
+    tag = finalAttrs.version;
+    hash = "sha256-XjWveBsRJq5iNpk3e9lmVKMoB3q5tr4OiNY+kYEqtEE=";
+  };
+
+  buildInputs = [
+    libnetfilter_queue
+    libnfnetlink
+    libmnl
+  ];
+
+  makeFlags = [
+    "CROSS_PREFIX=${stdenv.cc.targetPrefix}"
+    "VERSION=${finalAttrs.version}"
+  ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Obfuscate all your TCP connections into HTTP protocol";
+    homepage = "https://github.com/MikeWang000000/FakeHTTP";
+    changelog = "https://github.com/MikeWang000000/FakeHTTP/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "fakehttp";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/fa/fakesip/package.nix b/pkgs/by-name/fa/fakesip/package.nix
new file mode 100644
index 000000000000..a0ce111a7d5f
--- /dev/null
+++ b/pkgs/by-name/fa/fakesip/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libnetfilter_queue,
+  libnfnetlink,
+  libmnl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fakesip";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "MikeWang000000";
+    repo = "FakeSIP";
+    tag = finalAttrs.version;
+    hash = "sha256-iY9EAvy4E6aM59B1sn9d0xoUMdOsX75LslVzB/Cf5XM=";
+  };
+
+  buildInputs = [
+    libnetfilter_queue
+    libnfnetlink
+    libmnl
+  ];
+
+  makeFlags = [
+    "CROSS_PREFIX=${stdenv.cc.targetPrefix}"
+    "VERSION=${finalAttrs.version}"
+  ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Disguise your UDP traffic as SIP protocol to evade DPI detection";
+    homepage = "https://github.com/MikeWang000000/FakeSIP";
+    changelog = "https://github.com/MikeWang000000/FakeSIP/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "fakesip";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix
index efde2cdb8efc..90bc0e38d8c3 100644
--- a/pkgs/by-name/fa/faketty/package.nix
+++ b/pkgs/by-name/fa/faketty/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "faketty";
   };
 }
diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index 277747f7f846..d9b31f7d4fb6 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -29,13 +29,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "famistudio";
-  version = "4.4.2";
+  version = "4.4.3";
 
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
     tag = finalAttrs.version;
-    hash = "sha256-A4tC1khtCLTfacdEq5z8ulRzhoItNgBe438TAaPdyLA=";
+    hash = "sha256-DUXIQIZa0Ppr4EtvDKN5T3XZoc8rBILn+mVnjFGxlxA=";
   };
 
   postPatch =
diff --git a/pkgs/by-name/fa/fancontrol-gui/package.nix b/pkgs/by-name/fa/fancontrol-gui/package.nix
index 300a29826289..cdf776561946 100644
--- a/pkgs/by-name/fa/fancontrol-gui/package.nix
+++ b/pkgs/by-name/fa/fancontrol-gui/package.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation rec {
     ./version.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru = {
     tests.version = testers.testVersion {
       package = fancontrol-gui;
diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix
index 92759ffad673..6f9c182dd0cd 100644
--- a/pkgs/by-name/fa/fanficfare/package.nix
+++ b/pkgs/by-name/fa/fanficfare/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "fanficfare";
-  version = "4.49.0";
+  version = "4.50.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b+PGsm5szBAd8R7P+TT4EyXd2ULgr3+AV5F15S3pn3o=";
+    hash = "sha256-+4hasWmQx//HzKwOmtlGqutw95rKFvWL97Ec1xLE1Js=";
   };
 
   nativeBuildInputs = with python3Packages; [
diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 22c4ee27f6fa..ffb13b202ca0 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   makeWrapper,
   cmake,
@@ -52,6 +53,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-a/k36O19z/lHnETOGIbTJ7BNAI5zOQxVUSp+nIM08i4=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/elfmz/far2l/commit/97ac0a3a0f29110a330d8f8634775e024561e817.patch?full_index=1";
+      hash = "sha256-LlCKgFPxoRrb2nD+PARsJCpUXqMO0rLyNbuvLh949fU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja
diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix
index d5055ba2f0e1..fca49e3b30a8 100644
--- a/pkgs/by-name/fa/fastcdr/package.nix
+++ b/pkgs/by-name/fa/fastcdr/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcdr";
-  version = "2.3.2";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-CDR";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FAovCJa5iNiF73FBPJvPar2dwfIkDIqfk7DaFSe5Zq0=";
+    hash = "sha256-KXQRQieyDPuSmLltf7iOVO4QdsHgaek+x1vneZyEg0E=";
   };
 
   patches = [
diff --git a/pkgs/by-name/fa/fastd-exporter/package.nix b/pkgs/by-name/fa/fastd-exporter/package.nix
new file mode 100644
index 000000000000..df9a6ccfb567
--- /dev/null
+++ b/pkgs/by-name/fa/fastd-exporter/package.nix
@@ -0,0 +1,35 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildGoModule {
+  pname = "fastd-exporter";
+  version = "0-unstable-2024-04-09";
+
+  src = fetchFromGitHub {
+    owner = "freifunk-darmstadt";
+    repo = "fastd-exporter";
+    rev = "374e4334af6661f4c91a3e83bf7ce071a2a72eca";
+    hash = "sha256-0oU4+9G19XP5qtGdcfMz08T04hjcoXX/O+FkaUPxzXE=";
+  };
+
+  vendorHash = "sha256-r0W64dct6XWa9sIrzy0UdyoMw+kAq73Qc/QchmsYZkY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Prometheus exporter for fastd";
+    homepage = "https://github.com/freifunk-darmstadt/fastd-exporter";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "fastd-exporter";
+    maintainers = with lib.maintainers; [
+      felixsinger
+    ];
+  };
+}
diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix
index 293b9a702dc3..164d25db9891 100644
--- a/pkgs/by-name/fa/fastfetch/package.nix
+++ b/pkgs/by-name/fa/fastfetch/package.nix
@@ -59,13 +59,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastfetch";
-  version = "2.53.0";
+  version = "2.54.0";
 
   src = fetchFromGitHub {
     owner = "fastfetch-cli";
     repo = "fastfetch";
     tag = finalAttrs.version;
-    hash = "sha256-Cq6Nq7UpeW7MFi6VjsWmU2M3FjzDiAyhwnl4yTQFRnA=";
+    hash = "sha256-HU+OqaLuepx89lSBwOTJYS5nq8d19AhzAaUXwlpEhUc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/fa/fastmail-desktop/darwin.nix b/pkgs/by-name/fa/fastmail-desktop/darwin.nix
new file mode 100644
index 000000000000..6e815849081c
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/darwin.nix
@@ -0,0 +1,27 @@
+{
+  pname,
+  version,
+  src,
+  passthru,
+  meta,
+  stdenvNoCC,
+}:
+stdenvNoCC.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    passthru
+    meta
+    ;
+
+  installPhase = ''
+    mkdir -p $out/Applications
+    cp -R Fastmail.app $out/Applications/
+  '';
+
+  dontBuild = true;
+
+  # Fastmail is notarized
+  dontFixup = true;
+}
diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix
new file mode 100644
index 000000000000..63d8fbeb2ef9
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix
@@ -0,0 +1,84 @@
+{
+  pname,
+  version,
+  src,
+  passthru,
+  meta,
+  lib,
+  stdenvNoCC,
+  appimageTools,
+  asar,
+  autoPatchelfHook,
+  makeWrapper,
+  electron,
+  libXScrnSaver,
+  libXtst,
+  libappindicator,
+  libgcc,
+  musl,
+  vips,
+}:
+let
+  appimageContents = appimageTools.extract { inherit pname version src; };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  inherit pname version passthru;
+
+  dontUnpack = true;
+  dontBuild = true;
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    asar
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libgcc
+    musl
+    vips
+  ];
+
+  libPath = lib.makeLibraryPath [
+    libXScrnSaver
+    libXtst
+    libappindicator
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/opt"
+    cp -r --no-preserve=mode "${appimageContents}/resources" "$out/opt/fastmail"
+    asar extract "$out/opt/fastmail/app.asar" "$out/opt/fastmail/app.asar.unpacked"
+    rm "$out/opt/fastmail/app.asar"
+
+    install -D "${appimageContents}/production.desktop" "$out/share/applications/fastmail.desktop"
+    substituteInPlace "$out/share/applications/fastmail.desktop" \
+      --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=fastmail" \
+      --replace-fail "Icon=production" "Icon=fastmail" \
+
+    for res in 16 24 32 48 64 128 256 512 1024; do
+      resdir="''${res}x''${res}"
+      mkdir -p "$out/share/icons/hicolor/$resdir/apps"
+      cp -r --no-preserve=mode \
+        "${appimageContents}/usr/share/icons/hicolor/$resdir/apps/production.png" \
+        "$out/share/icons/hicolor/$resdir/apps/fastmail.png"
+    done
+
+    makeWrapper "${electron}/bin/electron" "$out/bin/fastmail" \
+      --add-flags "$out/opt/fastmail/app.asar.unpacked" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/fastmail \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+
+  meta = meta // {
+    mainProgram = "fastmail";
+  };
+})
diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix
new file mode 100644
index 000000000000..531fdce45e84
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  callPackage,
+  stdenvNoCC,
+  fetchurl,
+  fetchzip,
+}:
+let
+  inherit (stdenvNoCC.hostPlatform) isDarwin system;
+
+  sources = import ./sources.nix { inherit fetchurl fetchzip; };
+in
+callPackage (if isDarwin then ./darwin.nix else ./linux.nix) {
+  pname = "fastmail-desktop";
+  inherit (sources.${system} or (throw "Unsupported system: ${system}")) version src;
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Dedicated desktop app for Fastmail";
+    homepage = "https://www.fastmail.com/blog/desktop-app/";
+    license = lib.licenses.unfree;
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = [
+      lib.maintainers.Enzime
+      lib.maintainers.nekowinston
+    ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-linux"
+    ];
+  };
+}
diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
new file mode 100644
index 000000000000..da373f653e94
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -0,0 +1,20 @@
+# Generated by ./update.sh - do not update manually!
+# Last updated: 2025-10-30
+{ fetchurl, fetchzip }:
+{
+  aarch64-darwin = {
+    version = "1.0.3";
+    src = fetchzip {
+      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.3-arm64-mac.zip";
+      hash = "sha512-lqJj0tTwOJx1jzzXtlKOOduUEtSgVHpQCM5WkbXjmOh2OejLRcdJ1Y9CxvZJGSPBGWrErKzytMOB8QmJ1BkIdw==";
+      stripRoot = false;
+    };
+  };
+  x86_64-linux = {
+    version = "1.0.3";
+    src = fetchurl {
+      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.3.AppImage";
+      hash = "sha512-L+h0GHAAlZndB4Q5Z7GiHuZqv1kTF5yCAJYYb9tPXnHfdcrwHvfBRnixEnVPPia46rp2IJ56z4ZS8RSut3ATFQ==";
+    };
+  };
+}
diff --git a/pkgs/by-name/fa/fastmail-desktop/update.sh b/pkgs/by-name/fa/fastmail-desktop/update.sh
new file mode 100755
index 000000000000..52c07e300a96
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash --pure -p cacert curl yq nix
+
+set -euo pipefail
+
+cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
+
+x86_64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/x64/latest-linux.yml")
+aarch64_darwin_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/mac/arm64/latest-mac.yml")
+
+x86_64_linux_version=$(yq -r '.version' <<<"$x86_64_linux_info")
+aarch64_darwin_version=$(yq -r '.version' <<<"$aarch64_darwin_info")
+
+x86_64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/x64/$(yq -r '.path' <<<"$x86_64_linux_info")"
+aarch64_darwin_url="https://dl.fastmailcdn.com/desktop/production/mac/arm64/$(yq -r '.path' <<<"$aarch64_darwin_info")"
+
+x86_64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$x86_64_linux_info")")
+aarch64_darwin_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_darwin_info")")
+
+cat >sources.nix <<EOF
+# Generated by ./update.sh - do not update manually!
+# Last updated: $(date +%F)
+{ fetchurl, fetchzip }:
+{
+  aarch64-darwin = {
+    version = "$aarch64_darwin_version";
+    src = fetchzip {
+      url = "$aarch64_darwin_url";
+      hash = "$aarch64_darwin_hash";
+      stripRoot = false;
+    };
+  };
+  x86_64-linux = {
+    version = "$x86_64_linux_version";
+    src = fetchurl {
+      url = "$x86_64_linux_url";
+      hash = "$x86_64_linux_hash";
+    };
+  };
+}
+EOF
diff --git a/pkgs/by-name/fa/fatcat/package.nix b/pkgs/by-name/fa/fatcat/package.nix
index aa75ed92f1c5..fe46fc24b740 100644
--- a/pkgs/by-name/fa/fatcat/package.nix
+++ b/pkgs/by-name/fa/fatcat/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
+  fetchpatch,
   stdenv,
   fetchFromGitHub,
   cmake,
   gitUpdater,
 }:
-
 stdenv.mkDerivation rec {
   pname = "fatcat";
   version = "1.1.1";
@@ -17,6 +17,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-/iGNVP7Bz/UZAR+dFxAKMKM9jm07h0x0F3VGpdxlHdk=";
   };
 
+  patches = [
+    # cmake: Set minimum required version to 3.5 for CMake 4+
+    (fetchpatch {
+      url = "https://github.com/Gregwar/fatcat/commit/2e3476a84cbe32598d36b5506c21025b3f94eb03.patch";
+      hash = "sha256-e5qGcpdHhbp2mZ7O3vBAJnSW5K2aXEfNVUfK/brx9a8=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix
index 90c77d359724..60a97b2d1c24 100644
--- a/pkgs/by-name/fa/faugus-launcher/package.nix
+++ b/pkgs/by-name/fa/faugus-launcher/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "faugus-launcher";
-  version = "1.9.6";
+  version = "1.9.9";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Faugus";
     repo = "faugus-launcher";
     tag = version;
-    hash = "sha256-7brHeRwrH6MbRcGCb5qufU1PHLgg5fCfgLhvdCQr+ak=";
+    hash = "sha256-4ySI6j74DmeHAKtIYuAp+dnmyz9/gc6cQomcfP6V5IM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fa/faustPhysicalModeling/package.nix b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
index a2e928592842..cd88e6668e45 100644
--- a/pkgs/by-name/fa/faustPhysicalModeling/package.nix
+++ b/pkgs/by-name/fa/faustPhysicalModeling/package.nix
@@ -26,10 +26,6 @@ stdenv.mkDerivation rec {
     bash
   ];
 
-  # ld: /nix/store/*-gcc-14-20241116/lib/gcc/x86_64-unknown-linux-gnu/14.2.1/crtbegin.o:
-  #  relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a PIE object
-  hardeningDisable = [ "pie" ];
-
   dontWrapQtApps = true;
 
   buildPhase = ''
diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix
index e20ea15fb424..9dc0fcad61b4 100644
--- a/pkgs/by-name/fa/fava/package.nix
+++ b/pkgs/by-name/fa/fava/package.nix
@@ -8,17 +8,17 @@
 let
   src = buildNpmPackage (finalAttrs: {
     pname = "fava-frontend";
-    version = "1.30.6";
+    version = "1.30.7";
 
     src = fetchFromGitHub {
       owner = "beancount";
       repo = "fava";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-AMbKGIfR/URu7RpyBKSR3lzfIliRWjnUNNjLvu9KmfM=";
+      hash = "sha256-gO6eJIFp/yWAXFWhUcqkkfk2pA8/vyTxgPRPBmv4a6Q=";
     };
     sourceRoot = "${finalAttrs.src.name}/frontend";
 
-    npmDepsHash = "sha256-geou0+Ges0jjrlXG9m3u1GMdf0Qt2pTd8vRGh9gAWJ4=";
+    npmDepsHash = "sha256-cXIhEzYFpLOxUEY7lhTWW7R3/ptkx7hB9K92Fd2m1Ng=";
     makeCacheWritable = true;
 
     preBuild = ''
@@ -34,7 +34,7 @@ let
 in
 python3Packages.buildPythonApplication {
   pname = "fava";
-  version = "1.30.6";
+  inherit (src) version;
   pyproject = true;
 
   inherit src;
@@ -78,10 +78,6 @@ python3Packages.buildPythonApplication {
     SNAPSHOT_IGNORE = lib.versions.major python3Packages.beancount.version == "2";
   };
 
-  preCheck = ''
-    export HOME=$TEMPDIR
-  '';
-
   meta = {
     description = "Web interface for beancount";
     mainProgram = "fava";
diff --git a/pkgs/by-name/fb/fb303/package.nix b/pkgs/by-name/fb/fb303/package.nix
index 6c5017bde61b..8e607283bd85 100644
--- a/pkgs/by-name/fb/fb303/package.nix
+++ b/pkgs/by-name/fb/fb303/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fb303";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebook";
     repo = "fb303";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6suO1SE8+WASQiHLtiieu3nrjEYqSPnKxw7nHkQ4br0=";
+    hash = "sha256-IF3fQY8QfDBo8DoLFIFuZD8OgrrJfXLXDgFcsD1CmaY=";
   };
 
   patches = [
@@ -75,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
       kylesferrazza
       emily
       techknowlogick
+      lf-
     ];
   };
 })
diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index a7ed02781531..90893c9e6987 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "fblog";
     homepage = "https://github.com/brocode/fblog";
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix
index 71e759c7def1..7eeb083253f4 100644
--- a/pkgs/by-name/fb/fbthrift/package.nix
+++ b/pkgs/by-name/fb/fbthrift/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fbthrift";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   outputs = [
     # Trying to split this up further into `bin`, `out`, and `dev`
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebook";
     repo = "fbthrift";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4u3SbbmSgtvnW3/VH3CfQrEddAlkQuUl9dmnGGKL4mE=";
+    hash = "sha256-6Vlmb7PfPl9hyJkpH0vsF4mjNTOxd4lu8CWPE0rRvVo=";
   };
 
   patches = [
@@ -135,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
       kylesferrazza
       emily
       techknowlogick
+      lf-
     ];
   };
 })
diff --git a/pkgs/by-name/fc/fcitx5-inflex-themes/package.nix b/pkgs/by-name/fc/fcitx5-inflex-themes/package.nix
new file mode 100644
index 000000000000..160fd36f2294
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-inflex-themes/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  jdupes,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "fcitx5-inflex-themes";
+  version = "0-unstable-2024-11-11";
+
+  src = fetchFromGitHub {
+    owner = "sanweiya";
+    repo = "fcitx5-inflex-themes";
+    rev = "86d0a36eae2145de38d9c8bcfcb59f3b5ab6cb37";
+    hash = "sha256-YyToQdVieRepGeW1CRBFH9VO7CtO8r7xCO9/79V+vlA=";
+  };
+
+  nativeBuildInputs = [ jdupes ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fcitx5/themes
+    cp -r *inflex* $out/share/fcitx5/themes
+    jdupes --quiet --link-soft --recurse $out/share
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Aesthetic, modern fcitx5 theme featuring sharp-edged rectangle design";
+    homepage = "https://github.com/sanweiya/fcitx5-inflex-themes";
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ Guanran928 ];
+  };
+}
diff --git a/pkgs/by-name/fc/fclones-gui/package.nix b/pkgs/by-name/fc/fclones-gui/package.nix
index 999eb2bcf2ca..b1fe713d7aa0 100644
--- a/pkgs/by-name/fc/fclones-gui/package.nix
+++ b/pkgs/by-name/fc/fclones-gui/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/pkolaczk/fclones-gui";
     changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = builtins.attrValues { inherit (lib.maintainers) figsoda; };
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/fc/fclones/package.nix b/pkgs/by-name/fc/fclones/package.nix
index fcd1492822c4..0aa927c647c1 100644
--- a/pkgs/by-name/fc/fclones/package.nix
+++ b/pkgs/by-name/fc/fclones/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       cyounkins
-      figsoda
     ];
     mainProgram = "fclones";
   };
diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix
index 27f11e12aa16..5cfc14a9b027 100644
--- a/pkgs/by-name/fc/fcp/package.nix
+++ b/pkgs/by-name/fc/fcp/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fcp";
   };
 }
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index bfc27802175a..edd5776f60c9 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -64,7 +64,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       dywedir
-      figsoda
       globin
       ma27
       zowoq
diff --git a/pkgs/by-name/fd/fdupes/package.nix b/pkgs/by-name/fd/fdupes/package.nix
index 83e336b07d8f..cb11612c4dab 100644
--- a/pkgs/by-name/fd/fdupes/package.nix
+++ b/pkgs/by-name/fd/fdupes/package.nix
@@ -40,7 +40,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/adrianlopezroche/fdupes";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = [ maintainers.maggesi ];
     mainProgram = "fdupes";
   };
 }
diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix
index 22454b56bf90..8f1890ed47cf 100644
--- a/pkgs/by-name/fe/feather-tk/package.nix
+++ b/pkgs/by-name/fe/feather-tk/package.nix
@@ -11,16 +11,17 @@
   libGL,
   libpng,
   lunasvg,
+  nativefiledialog-extended,
   nlohmann_json,
   plutovg,
   xorg,
   zlib,
-  nativeFileDialog ? null,
   python3Packages ? null,
-  enableNFD ? false,
+  enableNFD ? true,
   enablePython ? false,
   enableTests ? false,
   enableExamples ? false,
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "darbyjohnston";
     repo = "feather-tk";
     tag = finalAttrs.version;
-    fetchSubmodules = true;
     hash = "sha256-hcV99y14o3YFUtKDLEKaR7MxBB3pBdd3sferrYvtvYw=";
   };
 
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     libGL
   ]
-  ++ lib.optionals (enableNFD && nativeFileDialog != null) [
-    nativeFileDialog
+  ++ lib.optionals enableNFD [
+    nativefiledialog-extended
   ]
   ++ lib.optionals (enableNFD && stdenv.isLinux) [
     gtk3
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
     (lib.cmakeBool "feather_tk_UI_LIB" true)
     (lib.cmakeFeature "feather_tk_API" "GL_4_1")
     (lib.cmakeBool "feather_tk_nfd" enableNFD)
@@ -93,5 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ liberodark ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    badPlatforms = [
+      # Broken on darwin with latest SDK, see https://github.com/darbyjohnston/feather-tk/issues/1
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 })
diff --git a/pkgs/by-name/fe/feed2imap-go/package.nix b/pkgs/by-name/fe/feed2imap-go/package.nix
index 1a889265cbfb..c8df95e713ac 100644
--- a/pkgs/by-name/fe/feed2imap-go/package.nix
+++ b/pkgs/by-name/fe/feed2imap-go/package.nix
@@ -34,6 +34,9 @@ buildGoModule rec {
     mainProgram = "feed2imap-go";
     homepage = "https://github.com/Necoro/feed2imap-go";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ nomeata ];
+    maintainers = with maintainers; [
+      nomeata
+      Necoro
+    ];
   };
 }
diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index b831f522d769..681819df852d 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -4,31 +4,43 @@
   buildNpmPackage,
   fetchFromGitHub,
   electron_36,
+  dart-sass,
+  pnpm_10,
   darwin,
   copyDesktopItems,
   makeDesktopItem,
 }:
 let
   pname = "feishin";
-  version = "0.12.6";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
-    rev = "v${version}";
-    hash = "sha256-cnlPks/sJdcxHdIppHn8Q8d2tkwVlPMofQxjdAlBreg=";
+    tag = "v${version}";
+    hash = "sha256-F5m0hsN1BLfiUcl2Go54bpFnN8ktn6Rqa/df1xxoCA4=";
   };
 
   electron = electron_36;
+  pnpm = pnpm_10;
 in
 buildNpmPackage {
   inherit pname version;
 
   inherit src;
-  npmDepsHash = "sha256-lThh29prT/cHRrp2mEtUW4eeVfCtkk+54EPNUyGHyq8=";
 
-  npmFlags = [ "--legacy-peer-deps" ];
-  makeCacheWritable = true;
+  npmConfigHook = pnpm.configHook;
+
+  npmDeps = null;
+  pnpmDeps = pnpm.fetchDeps {
+    inherit
+      pname
+      version
+      src
+      ;
+    fetcherVersion = 2;
+    hash = "sha256-5jEXdQMZ6a0JuhjPS1eZOIGsIGQHd6nKPI02eeR35pg=";
+  };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
@@ -39,40 +51,26 @@ buildNpmPackage {
   postPatch = ''
     # release/app dependencies are installed on preConfigure
     substituteInPlace package.json \
-      --replace-fail "electron-builder install-app-deps &&" ""
+      --replace-fail '"postinstall": "electron-builder install-app-deps",' ""
 
     # Don't check for updates.
-    substituteInPlace src/main/main.ts \
+    substituteInPlace src/main/index.ts \
       --replace-fail "autoUpdater.checkForUpdatesAndNotify();" ""
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     # https://github.com/electron/electron/issues/31121
-    substituteInPlace src/main/main.ts \
+    substituteInPlace src/main/index.ts \
       --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'"
   '';
 
-  preConfigure =
-    let
-      releaseAppDeps = buildNpmPackage {
-        pname = "${pname}-release-app";
-        inherit version;
+  preBuild = ''
+    rm -r node_modules/.pnpm/sass-embedded-*
 
-        src = "${src}/release/app";
-        npmDepsHash = "sha256-kEe5HH/oslH8vtAcJuWTOLc0ZQPxlDVMS4U0RpD8enE=";
-
-        npmFlags = [ "--ignore-scripts" ];
-        dontNpmBuild = true;
-
-        env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-      };
-      releaseNodeModules = "${releaseAppDeps}/lib/node_modules/feishin/node_modules";
-    in
-    ''
-      for release_module_path in "${releaseNodeModules}"/*; do
-        rm -rf node_modules/"$(basename "$release_module_path")"
-        ln -s "$release_module_path" node_modules/
-      done
-    '';
+    test -d node_modules/.pnpm/sass-embedded@*
+    dir="$(echo node_modules/.pnpm/sass-embedded@*)/node_modules/sass-embedded/dist/lib/src/vendor/dart-sass"
+    mkdir -p "$dir"
+    ln -s ${dart-sass}/bin/dart-sass "$dir"/sass
+  '';
 
   postBuild =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -98,12 +96,13 @@ buildNpmPackage {
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin}
-    cp -r release/build/**/Feishin.app $out/Applications/
+    cp -r dist/**/Feishin.app $out/Applications/
     makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     mkdir -p $out/share/feishin
-    pushd release/build/*/
+
+    pushd dist/*-unpacked/
     cp -r locales resources{,.pak} $out/share/feishin
     popd
 
diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index acc5593e92a1..a4a945fa3b67 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/1d078929/Feishu-linux_x64-7.50.13.deb";
-      sha256 = "sha256-wP3Uyz3KiWLADzUhZnPJori2gqdzEm5azUcGv8w1BXM=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/e91d15e2/Feishu-linux_x64-7.50.14.deb";
+      sha256 = "sha256-Ywlf3qi4q5nT3gC9r4ymtFYIrg8xmxapIfO2oQoBdC8=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/05ade0ea/Feishu-linux_arm64-7.50.13.deb";
-      sha256 = "sha256-9YTk3Jx1Ap5ym2N/GiN8YcB6XfyVElSWZV3/O6gJWNE=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f247fca9/Feishu-linux_arm64-7.50.14.deb";
+      sha256 = "sha256-ecpaw0n6jRq1hdDY3rTzRiN8Ck3BTLt+K1DcxrPI4TE=";
     };
   };
 
@@ -133,7 +133,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.50.13";
+  version = "7.50.14";
   pname = "feishu";
 
   src =
diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix
index 7311aae5ea21..45d9db1e00a6 100644
--- a/pkgs/by-name/fe/felix-fm/package.nix
+++ b/pkgs/by-name/fe/felix-fm/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kyoheiu/felix";
     changelog = "https://github.com/kyoheiu/felix/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fx";
   };
 }
diff --git a/pkgs/by-name/fe/fennel-ls/package.nix b/pkgs/by-name/fe/fennel-ls/package.nix
index c2aae5dc7604..f9dfa9e18a17 100644
--- a/pkgs/by-name/fe/fennel-ls/package.nix
+++ b/pkgs/by-name/fe/fennel-ls/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fennel-ls";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromSourcehut {
     owner = "~xerool";
     repo = "fennel-ls";
     rev = finalAttrs.version;
-    hash = "sha256-6ZbGRTBBRktudGVBZ+UMn8l0+wKa8f5dg7UOwLhOT7E=";
+    hash = "sha256-N1530u8Kq7ljdEdTFk0CJJyMLMVX5huQWXjyoMBJN5E=";
   };
   buildInputs = [
     lua
diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 8ea754ff8ee3..0ec9ac574e72 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -19,27 +19,24 @@ let
     }
     .${system} or (throw "Unsupported system: ${system}");
 
-  # TODO: It'd be nice to write an update script that would update all of these
-  # hashes together.
-  packageHash =
-    {
-      x86_64-linux = "sha256-r/F3Tj3WeeL2R27ussX+ebFWpW+8z2e7tdBK4MHFMpk=";
-      aarch64-linux = "sha256-BSFxDJeY7fOOxDqAV+6FJf0hup1Y5IJ/czqwc4W7qSA=";
-      x86_64-darwin = "sha256-T6J9IjfXdt9DnZksndAmZRkYyH/5H60J7V6xU0ltD2A=";
-      aarch64-darwin = "sha256-6x+0PB5/2oqYDVNiNhc0xcs/ESCLvvSsWtm2KlTIeBo=";
-    }
-    .${system} or (throw "Unsupported system: ${system}");
+  packageHashes = {
+    x86_64-linux = "sha256-TWWT60H8KtZlJTRY+RnS2pP7r0eKBDzGVm890uGdtHU=";
+    aarch64-linux = "sha256-MBZ/AgUz5dg8tFj4q+alnwlHu3d6/rfYZk9B1jYnGbw=";
+    x86_64-darwin = "sha256-F2wgyyf0L2Ci5MV0VQD5CnjckudbgvQEpNbZUIkw9Gc=";
+    aarch64-darwin = "sha256-9Onvzsc2UInjgX9AeWMFNvpUv2Y4i5wUR6z3Igyrzy0=";
+  };
 
+  packageHash = packageHashes.${system} or (throw "Unsupported system: ${system}");
 in
 stdenv.mkDerivation rec {
   pname = "fermyon-spin";
-  version = "3.0.0";
+  version = "3.5.0";
 
   # Use fetchurl rather than fetchzip as these tarballs are built by the project
   # and not by GitHub (and thus are stable) - this simplifies the update script
   # by allowing it to use the output of `nix store prefetch-file`.
   src = fetchurl {
-    url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz";
+    url = "https://github.com/spinframework/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz";
     hash = packageHash;
   };
 
@@ -63,13 +60,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru = {
+    inherit packageHashes; # needed by updateScript
+    updateScript = ./update.py;
+  };
+
+  meta = {
     description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly";
-    homepage = "https://github.com/fermyon/spin";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = with licenses; [ asl20 ];
+    homepage = "https://github.com/spinframework/spin";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = with lib.licenses; [ asl20 ];
     mainProgram = "spin";
     maintainers = [ ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = builtins.attrNames packageHashes;
   };
 }
diff --git a/pkgs/by-name/fe/fermyon-spin/update.py b/pkgs/by-name/fe/fermyon-spin/update.py
new file mode 100755
index 000000000000..2a2129a5926e
--- /dev/null
+++ b/pkgs/by-name/fe/fermyon-spin/update.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3 bash nix-update jq
+import subprocess
+from os.path import join, dirname
+
+# Outer keys are as in Nix, the inner dict's values are as in upstream.
+# We set oldHash and newHash fields in the inner dict later.
+systems = {
+  "x86_64-linux": {"os": "linux", "arch": "amd64"},
+  "x86_64-darwin": {"os": "macos", "arch": "amd64"},
+  "aarch64-linux": {"os": "linux", "arch": "aarch64"},
+  "aarch64-darwin": {"os": "macos", "arch": "aarch64"},
+}
+
+# This will set the version correctly,
+# and will also set the hash for one of the systems.
+subprocess.run([
+  "nix-update",
+  "fermyon-spin",
+  "--version-regex",
+  r"^v([\d\.]*)",
+  "--url",
+  "https://github.com/spinframework/spin"
+])
+
+newVer = subprocess.run(
+  ["nix-instantiate", "--eval", "--raw", "-A", "fermyon-spin.version"], capture_output=True, encoding="locale"
+).stdout
+
+for nixTuple in systems:
+  url = (
+    "https://github.com/spinframework/spin/releases/download/v"
+    f"{newVer}/spin-v{newVer}-{systems[nixTuple]['os']}-{systems[nixTuple]['arch']}.tar.gz"
+  )
+
+  systems[nixTuple]["oldHash"] = subprocess.run(
+    ["nix-instantiate", "--eval", "--raw", "-A", f"fermyon-spin.passthru.packageHashes.{nixTuple}"],
+    capture_output=True,
+    encoding="locale",
+  ).stdout
+
+  systems[nixTuple]["newHash"] = subprocess.run(
+    ["bash", "-c", f"nix store prefetch-file {url} --json | jq -r '.hash'"],
+    capture_output=True,
+    encoding="locale",
+  ).stdout.strip()  # Has a newline
+
+with open(join(dirname(__file__), "package.nix"), "r") as f:
+  file = f.read()
+
+for nixTuple in systems:
+  file = file.replace(systems[nixTuple]["oldHash"], systems[nixTuple]["newHash"])
+
+with open(join(dirname(__file__), "package.nix"), "w") as f:
+  f.write(file)
diff --git a/pkgs/by-name/fe/fermyon-spin/update.sh b/pkgs/by-name/fe/fermyon-spin/update.sh
deleted file mode 100755
index 9d00621f1c37..000000000000
--- a/pkgs/by-name/fe/fermyon-spin/update.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq
-#shellcheck shell=bash
-
-CURRENT_HASH=""
-
-print_hash() {
-    OS="$1"
-    ARCH="$2"
-    VERSION="$3"
-
-    URL="https://github.com/fermyon/spin/releases/download/v${VERSION}/spin-v${VERSION}-${OS}-${ARCH}.tar.gz"
-    echo
-    CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash')
-
-    echo "${ARCH}-${OS}: $CURRENT_HASH"
-}
-
-if [[ -z "$VER" && -n "$1" ]]; then
-    VER="$1"
-fi
-
-if [[ -z "$VER" ]]; then
-    echo "No 'VER' environment variable provided, skipping"
-else
-    print_hash "linux"  "amd64"   "$VER"
-    print_hash "linux"  "aarch64" "$VER"
-    print_hash "macos" "amd64"   "$VER"
-    print_hash "macos" "aarch64" "$VER"
-fi
-
diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/by-name/fe/fetchmail/package.nix
similarity index 92%
rename from pkgs/applications/misc/fetchmail/default.nix
rename to pkgs/by-name/fe/fetchmail/package.nix
index a7ff3c629923..ab61a26c5a32 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/by-name/fe/fetchmail/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fetchmail";
-  version = "6.5.6";
+  version = "6.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    hash = "sha256-7BDg4OqkFzE1WTee3nbHRhR2bYOLOUcLZkdIY6ppDas=";
+    hash = "sha256-e5wZ5mg+gn1VZ1GqXbXUS5Yeh76LMIdTW0kJuhtZMhw=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/by-name/fe/fetchmail_7/package.nix
similarity index 100%
rename from pkgs/applications/misc/fetchmail/v7.nix
rename to pkgs/by-name/fe/fetchmail_7/package.nix
diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 235b4260282c..62da7dd5f4b8 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -95,13 +95,13 @@ let
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2509.1";
+  version = "2511";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
-    hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48=";
+    hash = "sha256-CulENHssPkCXI+oyVKwf3GN5bjxUok2+AHsoOQ+Mchc=";
 
     leaveDotGit = true;
     postFetch = ''
diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index ed7f14341d02..8217a17819ff 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "fflogs";
-  version = "8.17.71";
+  version = "8.17.85";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-ey2hfndsLxViy7dYtIwfUgsk9kQycgBpsHGoBwO9LUs=";
+    hash = "sha256-vI2WI9CeupQf96GxW89D8Z8R/h1hB5Rfib2A+4Yd6zc=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in
@@ -32,7 +32,10 @@ appimageTools.wrapType2 {
     license = licenses.unfree; # no license listed
     mainProgram = "fflogs";
     platforms = platforms.linux;
-    maintainers = with maintainers; [ keysmashes ];
+    maintainers = with maintainers; [
+      keysmashes
+      iedame
+    ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };
 }
diff --git a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
index a19a0f5dafd5..ccd6ee4a6abb 100644
--- a/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
+++ b/pkgs/by-name/ff/ffmpegthumbnailer/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   ffmpeg-headless,
@@ -9,17 +10,25 @@
   libjpeg,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ffmpegthumbnailer";
-  version = "unstable-2024-01-04";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "dirkvdb";
     repo = "ffmpegthumbnailer";
-    rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c";
-    hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0=";
+    tag = finalAttrs.version;
+    hash = "sha256-1hVPtCPwfovCtA6aagViUJkYTCFuiFkOqGEqMHIoZe8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ffmpeg-8-fix.patch";
+      url = "https://github.com/dirkvdb/ffmpegthumbnailer/commit/df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch";
+      hash = "sha256-PArrcKuaWWA6/H59MbdC36B57GSvvp5sHz24QLTBZYw=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -60,4 +69,4 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     mainProgram = "ffmpegthumbnailer";
   };
-}
+})
diff --git a/pkgs/by-name/ff/ffts/cmake4.patch b/pkgs/by-name/ff/ffts/cmake4.patch
new file mode 100644
index 000000000000..9c4f91685aef
--- /dev/null
+++ b/pkgs/by-name/ff/ffts/cmake4.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 748f412..d8821ee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project(ffts C ASM)
+ 
diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix
index 25b371610fe5..5e92443d3730 100644
--- a/pkgs/by-name/ff/ffts/package.nix
+++ b/pkgs/by-name/ff/ffts/package.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DENABLE_SHARED=ON" ];
 
+  patches = [
+    ./cmake4.patch
+  ];
+
   meta = {
     description = "Fastest Fourier Transform in the South";
     homepage = "https://github.com/linkotec/ffts";
diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index 754e226bd150..0d8a399053e8 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fh";
-  version = "0.1.25";
+  version = "0.1.26";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
     rev = "v${version}";
-    hash = "sha256-YVtFzJMdHpshtRqBDVw3Kr88psAPfcdOI0XVDGnFkq0=";
+    hash = "sha256-cHXpTe5tAXrAwVu5+ZTb3pzHIqAk353GnNFPvComIfQ=";
   };
 
-  cargoHash = "sha256-D/8YYv9V1ny9AWFkVPgcE9doq+OxN+yiCCt074FKgn0=";
+  cargoHash = "sha256-HwFehxL01pwT93jjVvCU9BXhaHhCDbox50ecXpod3Mo=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/DeterminateSystems/fh";
     changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fh";
   };
 }
diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix
index 2c37749a4a56..3b1e95ac72ce 100644
--- a/pkgs/by-name/fh/fheroes2/package.nix
+++ b/pkgs/by-name/fh/fheroes2/package.nix
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   makeFlags = [
-    "FHEROES2_STRICT_COMPILATION=1"
     "FHEROES2_DATA=\"${placeholder "out"}/share/fheroes2\""
   ];
 
diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix
index bdfac5e09e92..93baba61ba20 100644
--- a/pkgs/by-name/fi/fiddler-everywhere/package.nix
+++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "fiddler-everywhere";
-  version = "7.3.0";
+  version = "7.4.0";
 
   src = fetchurl {
     url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-M1SMWtIdgYpC+cwrN8Z6T+7tj4y07hho3akuy9j/l98=";
+    hash = "sha256-9YkYy+vzW88rpcYTrCsfQXXJL8W8W4D84Cf8e9zEcJg=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 000e13f985f3..6d427f5ceca7 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.19.4";
+  version = "8.19.6";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-qY6itgYoAL93HoVDvADayjfRtsZcxTQbOVJZsFeU1Zk=";
+    hash = "sha256-bqgO+dj0EXjEPZKmC31MiPtcgwnitkb0GKuDlqJJw+I=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-kDlYPnAXohmPHbeRlhrjcDwDkd0AB5VYKhpe99o/XIA=";
+  vendorHash = "sha256-RcpOENxElWbbwt1aXQWDRvQ9cQj4aSewzfzkM+bLSoo=";
 
   subPackages = [ "filebeat" ];
 
diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 0836c8308748..d49639074912 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -8,7 +8,7 @@
   nixosTests,
 }:
 let
-  version = "2.44.0";
+  version = "2.44.1";
 
   pnpm = pnpm_9;
 
@@ -16,7 +16,7 @@ let
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-j7V1POuF6cFpnq6UgBseHe6GxypOoj2rYrN6k2nIF8w=";
+    hash = "sha256-ln7Dst+sN99c3snPU7DrIGpwKBz/e4Lz+uOknmm6sxg=";
   };
 
   frontend = buildNpmPackage rec {
diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 765f6860e3b7..9f8f148a0878 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.111";
+  version = "2.15.131";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-M6SVLloMn/6AmIpfZ0Ib0yUQ33hC9MFjbFTxOlN7kqs=";
+    hash = "sha256-G2GnYYcY2CQLwlbcnykC50ajrSQlKoGYUoRY6hHD8Bo=";
   };
 
-  vendorHash = "sha256-fxh9YOO0xnYo04HwJyctspipSXgWcDoUu40UwhDf8Uk=";
+  vendorHash = "sha256-c5bRlz4i8/7esBCmfbQxbGd8d+yvl5Y9BSZL8nV0Sfw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/fi/filesender/package.nix b/pkgs/by-name/fi/filesender/package.nix
deleted file mode 100644
index 5d8736839bcb..000000000000
--- a/pkgs/by-name/fi/filesender/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  lib,
-  nixosTests,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "filesender";
-  version = "2.57";
-
-  src = fetchFromGitHub {
-    owner = "filesender";
-    repo = "filesender";
-    tag = "filesender-${finalAttrs.version}";
-    hash = "sha256-I/9Y64jWm7QdQ1yhjCHkLfkKrzV6y0Rp+wkZbDP86fw=";
-  };
-
-  patches = [
-    # /nix/store is read-only, but filesender searches config and logs inside of installation directory.
-    # This patch changes search directories to FILESENDER_CONFIG_DIR and FILESENDER_LOG_DIR environment variables.
-    ./separate_mutable_paths.patch
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/
-    cp -R . $out/
-
-    runHook postInstall
-  '';
-
-  passthru.tests = {
-    inherit (nixosTests) filesender;
-  };
-
-  meta = {
-    description = "Web application for sending large files to other users";
-    homepage = "https://filesender.org/";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ nhnn ];
-  };
-})
diff --git a/pkgs/by-name/fi/filesender/separate_mutable_paths.patch b/pkgs/by-name/fi/filesender/separate_mutable_paths.patch
deleted file mode 100644
index c320e5872168..000000000000
--- a/pkgs/by-name/fi/filesender/separate_mutable_paths.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-diff --git a/classes/utils/Config.class.php b/classes/utils/Config.class.php
-index a4d819bc..318defdf 100644
---- a/classes/utils/Config.class.php
-+++ b/classes/utils/Config.class.php
-@@ -30,7 +30,7 @@
-  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- 
--if (!defined('FILESENDER_BASE')) {        // Require environment (fatal)
-+if (!defined('FILESENDER_BASE') || !defined("FILESENDER_CONFIG_DIR")) {        // Require environment (fatal)
-     die('Missing environment');
- }
- 
-@@ -116,7 +116,7 @@ class Config
-         }
-         
-         // Check if main config exists
--        $main_config_file = FILESENDER_BASE.'/config/config.php';
-+        $main_config_file = FILESENDER_CONFIG_DIR.'/config.php';
-         if (!file_exists($main_config_file)) {
-             throw new ConfigFileMissingException($main_config_file);
-         }
-@@ -136,7 +136,7 @@ class Config
- 
- 
-         // load password file if it is there
--        $pass_config_file = FILESENDER_BASE.'/config/config-passwords.php';
-+        $pass_config_file = FILESENDER_CONFIG_DIR.'/config-passwords.php';
-         if (file_exists($pass_config_file)) {
-             $config = array();
-             include_once($pass_config_file);
-@@ -153,7 +153,7 @@ class Config
-                 throw new ConfigBadParameterException('virtualhost');
-             }
-             
--            $config_file = FILESENDER_BASE.'/config/'.$virtualhost.'/config.php';
-+            $config_file = FILESENDER_CONFIG_DIR.$virtualhost.'/config.php';
-             if (!file_exists($config_file)) {
-                 throw new ConfigFileMissingException($config_file);
-             } // Should exist even if empty
-@@ -175,7 +175,7 @@ class Config
-                         }
-                         foreach ($regex_and_configs as $regex => $extra_config_name) {
-                                 if (preg_match('`'.$regex.'`', $auth_attrs[$attr])) {
--                                        $extra_config_file = FILESENDER_BASE.'/config/config-' . $extra_config_name . '.php';
-+                                        $extra_config_file = FILESENDER_CONFIG_DIR.'/config-' . $extra_config_name . '.php';
-                                         if (file_exists($extra_config_file)) {
-                                                 $config = array();
-                                                 include_once($extra_config_file);
-@@ -204,7 +204,7 @@ class Config
-         // Load config overrides if any
-         $overrides_cfg = self::get('config_overrides');
-         if ($overrides_cfg) {
--            $overrides_file = FILESENDER_BASE.'/config/'.($virtualhost ? $virtualhost.'/' : '').'config_overrides.json';
-+            $overrides_file = FILESENDER_CONFIG_DIR.($virtualhost ? $virtualhost.'/' : '').'config_overrides.json';
-             
-             $overrides = file_exists($overrides_file) ? json_decode(trim(file_get_contents($overrides_file))) : new StdClass();
-             
-@@ -431,7 +431,7 @@ class Config
-     public static function getVirtualhosts()
-     {
-         $virtualhosts = array();
--        foreach (scandir(FILESENDER_BASE.'/config') as $item) {
-+        foreach (scandir(FILESENDER_CONFIG_DIR) as $item) {
-             if (!preg_match('`^(.+)\.conf\.php$`', $item, $match)) {
-                 continue;
-             }
-diff --git a/config/csrf-protector-config.php b/config/csrf-protector-config.php
-index 83759ca4..ea4a3173 100755
---- a/config/csrf-protector-config.php
-+++ b/config/csrf-protector-config.php
-@@ -40,7 +40,7 @@ return array(
- 	 // The following should be set correctly from your config.php
- 	 // information
- 	"jsUrl" => $config['site_url'] . "/js/csrfprotector.js",
--	"logDirectory" => FILESENDER_BASE.'/log/',
-+	"logDirectory" => FILESENDER_LOG_DIR,
- 
-         // I found that leaving this with the _ as default
-         // caused the implicit token to be stripped
-diff --git a/includes/ConfigDefaults.php b/includes/ConfigDefaults.php
-index 733550e7..8d99b5f0 100644
---- a/includes/ConfigDefaults.php
-+++ b/includes/ConfigDefaults.php
-@@ -224,7 +224,7 @@ $default = array(
-     'log_facilities' => array(
-         array(
-             'type' => 'file',
--            'path' => FILESENDER_BASE.'/log/',
-+            'path' => FILESENDER_LOG_DIR,
-             'rotate' => 'hourly'
-         )
-     ),
-diff --git a/includes/ConfigValidation.php b/includes/ConfigValidation.php
-index 5c1e7f61..b1fb57e4 100644
---- a/includes/ConfigValidation.php
-+++ b/includes/ConfigValidation.php
-@@ -31,9 +31,9 @@
-  */
- 
- // Require environment (fatal)
--if(!defined('FILESENDER_BASE')) die('Missing environment');
-+if(!defined('FILESENDER_BASE') || !defined("FILESENDER_CONFIG_DIR")) die('Missing environment');
- 
--if(!file_exists(FILESENDER_BASE.'/config/config.php'))
-+if(!file_exists(FILESENDER_CONFIG_DIR.'/config.php'))
-     die('Configuration file not found');
- 
- ConfigValidator::addCheck('site_url', 'string');
-diff --git a/includes/init.php b/includes/init.php
-index ba7fa82f..31812c54 100644
---- a/includes/init.php
-+++ b/includes/init.php
-@@ -35,6 +35,8 @@ if(PHP_INT_SIZE !== 8) {
- }
- 
- define('FILESENDER_BASE', dirname( __DIR__ ));
-+define('FILESENDER_CONFIG_DIR', getenv('FILESENDER_CONFIG_DIR', true) ?: (FILESENDER_BASE.'/config'));
-+define('FILESENDER_LOG_DIR', getenv('FILESENDER_LOG_DIR', true) ?: (FILESENDER_BASE.'/log'));
- 
- // Include classes autoloader
- require_once(FILESENDER_BASE.'/classes/autoload.php');
diff --git a/pkgs/by-name/fi/filezilla/package.nix b/pkgs/by-name/fi/filezilla/package.nix
index 82906428ea9a..6f481421e95d 100644
--- a/pkgs/by-name/fi/filezilla/package.nix
+++ b/pkgs/by-name/fi/filezilla/package.nix
@@ -22,12 +22,12 @@
 
 stdenv.mkDerivation {
   pname = "filezilla";
-  version = "3.68.1";
+  version = "3.69.3";
 
   src = fetchsvn {
     url = "https://svn.filezilla-project.org/svn/FileZilla3/trunk";
-    rev = "11205";
-    hash = "sha256-izaNfagJYUcPRPihZ1yXwLUTHunzVXuiMITW69KPSFE=";
+    rev = "11309";
+    hash = "sha256-+wvdQnsYUsLS4pHoa3JVzkgTVxbeck/c7IaDt0VqU+8=";
   };
 
   configureFlags = [
@@ -70,6 +70,9 @@ stdenv.mkDerivation {
     '';
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [
+      pSub
+      iedame
+    ];
   };
 }
diff --git a/pkgs/by-name/fi/finalfrontier/package.nix b/pkgs/by-name/fi/finalfrontier/package.nix
index a35b50c2eb31..cd092e77cc99 100644
--- a/pkgs/by-name/fi/finalfrontier/package.nix
+++ b/pkgs/by-name/fi/finalfrontier/package.nix
@@ -50,5 +50,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/finalfusion/finalfrontier/";
     license = licenses.asl20;
     maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 059501278184..1c99ea9ed046 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  flutter332,
+  flutter335,
   mpv-unwrapped,
   patchelf,
   fetchFromGitHub,
@@ -9,16 +9,16 @@
   makeDesktopItem,
 }:
 let
-  version = "0.9.19-beta";
+  version = "0.9.20-beta";
 in
-flutter332.buildFlutterApplication {
+flutter335.buildFlutterApplication {
   inherit version;
   pname = "finamp";
   src = fetchFromGitHub {
     owner = "jmshrv";
     repo = "finamp";
     rev = version;
-    hash = "sha256-gvVKiaQ6qqMcE90B8T2FJKoViRxmIGsABmcXq+fO5hs=";
+    hash = "sha256-YuqYuUse6xugvc2hckZBc9kx+ryBmRQhoZzjwkpoNfo=";
   };
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
@@ -36,6 +36,7 @@ flutter332.buildFlutterApplication {
     palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=";
     split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=";
     flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=";
+    smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=";
   };
 
   postFixup = ''
diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json
index e5bf7270afc9..41652ff39fa4 100644
--- a/pkgs/by-name/fi/finamp/pubspec.lock.json
+++ b/pkgs/by-name/fi/finamp/pubspec.lock.json
@@ -34,11 +34,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
+        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.0"
+      "version": "6.4.1"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -174,18 +174,18 @@
       "dependency": "direct main",
       "description": {
         "name": "background_downloader",
-        "sha256": "c59bff0b66a6704bed8bfb09c67571df88167906e0f5543a722373b3d180a743",
+        "sha256": "a22acfa37aa06ba5cfe6eb7b1aa700c78af64770ff450c73dd3d279d7c37d4ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.3"
+      "version": "9.2.6"
     },
     "balanced_text": {
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4",
-        "resolved-ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4",
+        "ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323",
+        "resolved-ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323",
         "url": "https://github.com/Komodo5197/flutter-balanced-text.git"
       },
       "source": "git",
@@ -195,11 +195,11 @@
       "dependency": "direct main",
       "description": {
         "name": "battery_plus",
-        "sha256": "fb794c34cee2e4ea31005fb17ff15e1d904951ec7f15eedead741021870ee834",
+        "sha256": "ad16fcb55b7384be6b4bbc763d5e2031ac7ea62b2d9b6b661490c7b9741155bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.2"
+      "version": "7.0.0"
     },
     "battery_plus_platform_interface": {
       "dependency": "transitive",
@@ -235,11 +235,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build_cli_annotations",
-        "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172",
+        "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "build_config": {
       "dependency": "transitive",
@@ -305,11 +305,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.11.0"
+      "version": "8.12.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -335,11 +335,11 @@
       "dependency": "direct main",
       "description": {
         "name": "chopper",
-        "sha256": "f366529b450d0fd91931b08339c7c1d09c746d0d20e5ffb8c8641a79b6114dc2",
+        "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.0"
+      "version": "8.4.0"
     },
     "chopper_generator": {
       "dependency": "direct dev",
@@ -375,11 +375,11 @@
       "dependency": "direct main",
       "description": {
         "name": "clipboard",
-        "sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9",
+        "sha256": "1920c0337f8808be4166c5f1b236301ff381ef69633b0757c502d97f1f740102",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3"
+      "version": "2.0.2"
     },
     "clock": {
       "dependency": "transitive",
@@ -395,11 +395,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -425,11 +425,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
+        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "7.0.0"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -555,11 +555,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.1.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -612,7 +612,7 @@
       "version": "2.1.4"
     },
     "file": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "file",
         "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
@@ -625,11 +625,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.2.0"
+      "version": "10.3.3"
     },
     "file_sizes": {
       "dependency": "direct main",
@@ -651,6 +651,26 @@
       "source": "hosted",
       "version": "1.1.1"
     },
+    "flex_color_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flex_color_picker",
+        "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.7.1"
+    },
+    "flex_seed_scheme": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flex_seed_scheme",
+        "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.5.1"
+    },
     "flutter": {
       "dependency": "direct main",
       "description": "flutter",
@@ -681,31 +701,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_discord_rpc",
-        "sha256": "9363a803863d56fd89c0a21639c70b126245fcbafaeb0a3d091e7ac06951d03f",
+        "sha256": "7ee12a3ff928e85e5e0a60c7c23417a2f1f4e604e4983fc0789ff6562fb15f2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.0"
     },
     "flutter_gen_core": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_gen_core",
-        "sha256": "eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb",
+        "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.11.0"
+      "version": "5.12.0"
     },
     "flutter_gen_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_gen_runner",
-        "sha256": "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521",
+        "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.11.0"
+      "version": "5.12.0"
     },
     "flutter_launcher_icons": {
       "dependency": "direct dev",
@@ -721,11 +741,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -737,11 +757,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.28"
+      "version": "2.0.30"
     },
     "flutter_riverpod": {
       "dependency": "direct main",
@@ -757,11 +777,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_rust_bridge",
-        "sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287",
+        "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.11.1"
     },
     "flutter_staggered_grid_view": {
       "dependency": "transitive",
@@ -787,11 +807,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "2.2.1"
     },
     "flutter_tabler_icons": {
       "dependency": "direct main",
@@ -813,11 +833,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_to_airplay",
-        "sha256": "702408986b652dfaef5ad68c6f3c3008941ae8d8ef5db526792239c8d490a16d",
+        "sha256": "e71e7cbdf363c3f9686625f68b14e57497b507ef72d54016c14ccdffd3e4305d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.5"
+      "version": "2.1.0"
     },
     "flutter_user_certificates_android": {
       "dependency": "direct main",
@@ -880,11 +900,11 @@
       "dependency": "direct main",
       "description": {
         "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
+        "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.2.0"
     },
     "glob": {
       "dependency": "transitive",
@@ -930,21 +950,21 @@
       "dependency": "direct main",
       "description": {
         "name": "hive_ce",
-        "sha256": "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658",
+        "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.3"
+      "version": "2.13.2"
     },
     "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "hive_ce_flutter",
-        "sha256": "a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909",
+        "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "hive_ce_generator": {
       "dependency": "direct dev",
@@ -970,11 +990,11 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -1010,11 +1030,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_size_getter",
-        "sha256": "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653",
+        "sha256": "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "infinite_scroll_pagination": {
       "dependency": "direct main",
@@ -1142,11 +1162,11 @@
       "dependency": "transitive",
       "description": {
         "name": "just_audio_platform_interface",
-        "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
+        "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.6.0"
     },
     "just_audio_web": {
       "dependency": "transitive",
@@ -1162,41 +1182,41 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "locale_names": {
       "dependency": "direct main",
@@ -1272,8 +1292,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_audio",
-        "ref": "475a08cc97b94702f774bc906e1472b5bddc932b",
-        "resolved-ref": "475a08cc97b94702f774bc906e1472b5bddc932b",
+        "ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811",
+        "resolved-ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811",
         "url": "https://github.com/Komodo5197/media-kit.git"
       },
       "source": "git",
@@ -1303,11 +1323,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f",
+        "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.9"
+      "version": "3.16.12"
     },
     "nested": {
       "dependency": "transitive",
@@ -1353,21 +1373,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.0"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "palette_generator": {
       "dependency": "direct main",
@@ -1414,21 +1434,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.17"
+      "version": "2.2.18"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1524,11 +1544,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -1554,11 +1574,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "posix": {
       "dependency": "transitive",
@@ -1584,11 +1604,11 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1614,21 +1634,11 @@
       "dependency": "transitive",
       "description": {
         "name": "qs_dart",
-        "sha256": "42a7ca80f965786d8d0730633b7cf05c132ebcb9558e04dbc8752f2865caa705",
+        "sha256": "23e435223d985630e3880fd667128f520237059ca3af0cc2dc029d5365ce9ec1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.9"
-    },
-    "recursive_regex": {
-      "dependency": "transitive",
-      "description": {
-        "name": "recursive_regex",
-        "sha256": "f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.5.6"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -1764,21 +1774,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.4"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.1.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
@@ -1794,11 +1804,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.13"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1899,12 +1909,13 @@
     "smtc_windows": {
       "dependency": "direct main",
       "description": {
-        "name": "smtc_windows",
-        "sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154",
-        "url": "https://pub.dev"
+        "path": "packages/smtc_windows",
+        "ref": "7ece49cc16a459aaa0718ed23458802533daef37",
+        "resolved-ref": "7ece49cc16a459aaa0718ed23458802533daef37",
+        "url": "https://github.com/Komodo5197/frb_plugins.git"
       },
-      "source": "hosted",
-      "version": "1.0.0"
+      "source": "git",
+      "version": "1.1.0"
     },
     "source_gen": {
       "dependency": "direct main",
@@ -1920,11 +1931,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
+        "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.6"
+      "version": "1.3.7"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1971,21 +1982,21 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2+2"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
+        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.5"
+      "version": "2.5.6"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -2081,11 +2092,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
     "time": {
       "dependency": "transitive",
@@ -2171,21 +2182,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.22"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.4"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2201,11 +2212,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -2281,21 +2292,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.17"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "visibility_detector": {
       "dependency": "direct main",
@@ -2311,41 +2322,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.2"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
+        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     "weak_map": {
       "dependency": "transitive",
@@ -2411,11 +2422,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -2431,11 +2442,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "xxh3": {
       "dependency": "transitive",
@@ -2469,7 +2480,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.32.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }
diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix
index 20e7f61d8690..1c50809aad03 100644
--- a/pkgs/by-name/fi/findomain/package.nix
+++ b/pkgs/by-name/fi/findomain/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
     ];
     mainProgram = "findomain";
   };
diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index c5d17a81a6ff..67ea01bc1c43 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   fetchFromGitHub,
   runCommand,
-  unstableGitUpdater,
+  gitUpdater,
   catch2_3,
   cmake,
   fontconfig,
@@ -78,14 +78,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fire";
-  version = "1.5.0b-unstable-2025-09-20";
+  # 1.5.0b is considered a beta release of 1.5.0, but gitUpdater identifies 1.5.0b as the newer version
+  # Sanity checked manually. Drop this once running the updateScript doesn't produce a downgrade.
+  # nixpkgs-update: no auto update
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "jerryuhoo";
     repo = "Fire";
-    rev = "34a424a4fc50984213b6e98e3aaae3dcb8e960c4";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ZTsZ/J5aeyjg4pxhjjIkgoTB5sSg2jpeKAp/uc4V+aQ=";
+    hash = "sha256-i8viPGErCuLSuRWstDtLwQ3XBz9gfiHin7Zvvq8l3kA=";
   };
 
   postPatch =
@@ -162,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
     patchelf --add-rpath ${lib.makeLibraryPath x11Libs} $out/bin/Fire
   '';
 
-  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = {
     description = "Multi-band distortion plugin by Wings";
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index c0ca27b3ac6c..36e6d61f4941 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,19 +10,20 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.18.0";
+  version = "14.20.0";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-1yTcMzyznr0b/ObVEECdJuBUi03aiTAwgcTdJ1QFcWY=";
+    hash = "sha256-CX/2luy78Du6gsGG3ex0Q5amu93MqebTUF9of7D6H4M=";
   };
 
-  npmDepsHash = "sha256-VJquJ7mDBHeclgd/jsAPyRLEFOQp27tUXGAQJX3bXyQ=";
+  npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc=";
 
+  # No more package-lock.json in upstream src
   postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
+    cp ./npm-shrinkwrap.json ./package-lock.json
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 766e6d422f4d..8ad2f83af519 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.8.4";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xo1CgsPdqSw7VFlPx5aidB7h7fwot95XYlPxyW7S8yw=";
+    hash = "sha256-AjpzJfer1v7+FLIGEcBJrMxUlda5MwV2ThJuV5MNIxQ=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-6sTCXSMAgMQH7tQjl3UvPgqRShdEUV1Xi4R/M/j2Xxc=";
+  vendorHash = "sha256-7nhoRnKcOnnBt0YxaMEXYHPqDjaCltDnSiCnMDCEq5M=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-gYCjxZP7pytYYgJEvW78SmzX9jZAjkAMlRv9doc+JqE=";
+    hash = "sha256-as11uXE3qBGz7HIkTEeFLznwevcS+yChETo4ElyRVl8=";
   };
 
   composerRepository = php84.mkComposerRepository {
diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index cc0d673ec4a6..878ba077a170 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.4.2";
+  version = "6.4.4";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nGXFFGVw0TCXSBwMExk6wn0Es0HwCnY4P+nbJki+R6A=";
+    hash = "sha256-RRjTl3lZv/hoM6Jy3lB9/IFRq+w9ZKikOMqRRyV7MBw=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-siLLtF/B2eNsRaazq5zOXnFeFPlEeoSAIXYKEsrHv28=";
+    vendorHash = "sha256-lR900I79H5y+nDEXTvCUbHP4VpPsmNCIixUK1NtEiOQ=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-WV1MsCbYxEHUEw0yYqD8b9jracyLVbpndWuHY0ZbaEM=";
+    hash = "sha256-d3x8Yw8ruIneaKCLsb1M9lwW2mtNmSkzVe8/4ia5GW0=";
   };
 
   preInstall = ''
diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 5309ebd379e2..48bac722dc86 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-gateway";
-  version = "1.4.16";
+  version = "1.4.17";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gateway-${version}";
-    hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY=";
+    hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w=";
   };
 
-  cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY=";
+  cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gateway";
   RUSTFLAGS = "--cfg system_certs";
diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix
index 04005009e9c8..b141c4e925c4 100644
--- a/pkgs/by-name/fi/firezone-headless-client/package.nix
+++ b/pkgs/by-name/fi/firezone-headless-client/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-headless-client";
-  version = "1.5.3";
+  version = "1.5.4";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "headless-client-${version}";
-    hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY=";
+    hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w=";
   };
 
-  cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY=";
+  cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "headless-client";
   RUSTFLAGS = "--cfg system_certs";
diff --git a/pkgs/by-name/fi/fish-irssi/package.nix b/pkgs/by-name/fi/fish-irssi/package.nix
index bac04b17db67..d22321d75aaa 100644
--- a/pkgs/by-name/fi/fish-irssi/package.nix
+++ b/pkgs/by-name/fi/fish-irssi/package.nix
@@ -8,16 +8,15 @@
   openssl,
   irssi,
 }:
-
 stdenv.mkDerivation {
   pname = "fish-irssi";
-  version = "unstable-2021-04-16";
+  version = "unstable-2023-08-05";
 
   src = fetchFromGitHub {
     owner = "falsovsky";
     repo = "FiSH-irssi";
-    rev = "fcc484f09ce6941ba2e499605270593ddd13b81a";
-    hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc=";
+    rev = "75f754fbcc3c68a078d23ae3e2baab71acc8ed9b";
+    hash = "sha256-fFu0E9uLQXPYrbBjEneXSEKm2uipwRE4A3D54XYLczE=";
   };
 
   patches = [ ./irssi-include-dir.patch ];
diff --git a/pkgs/by-name/fi/fizz/package.nix b/pkgs/by-name/fi/fizz/package.nix
index b56562148195..47871e1eb4bf 100644
--- a/pkgs/by-name/fi/fizz/package.nix
+++ b/pkgs/by-name/fi/fizz/package.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fizz";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   outputs = [
     "bin"
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebookincubator";
     repo = "fizz";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8j8Nt8XCbMGui7bELhvP+o8E2bqYobkXLhvZVkzCMzU=";
+    hash = "sha256-MNkPf289QGZ1x6Yr2E8vnlCFan94Opjiw6RItodWGaw=";
   };
 
   patches = [
@@ -116,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
       kylesferrazza
       emily
       techknowlogick
+      lf-
     ];
   };
 })
diff --git a/pkgs/applications/audio/flacon/default.nix b/pkgs/by-name/fl/flacon/package.nix
similarity index 71%
rename from pkgs/applications/audio/flacon/default.nix
rename to pkgs/by-name/fl/flacon/package.nix
index 988b81e2ffb8..c592c8432c9d 100644
--- a/pkgs/applications/audio/flacon/default.nix
+++ b/pkgs/by-name/fl/flacon/package.nix
@@ -17,30 +17,28 @@
   monkeysAudio,
   sox,
   gtk3,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "flacon";
   version = "12.0.0";
 
   src = fetchFromGitHub {
     owner = "flacon";
     repo = "flacon";
-    rev = "v${version}";
-    sha256 = "sha256-r9SdQg6JTMoGxO2xUtkkBe5F5cajnsndZEq20BjJGuU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-r9SdQg6JTMoGxO2xUtkkBe5F5cajnsndZEq20BjJGuU=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libuchardet
     taglib
   ];
@@ -64,12 +62,12 @@ stdenv.mkDerivation rec {
       --prefix PATH : "$bin_path";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Extracts audio tracks from an audio CD image to separate tracks";
     mainProgram = "flacon";
     homepage = "https://flacon.github.io/";
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ snglth ];
+    license = lib.licenses.lgpl21;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ snglth ];
   };
-}
+})
diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix
index a49ed58d3859..22eab7204620 100644
--- a/pkgs/by-name/fl/flamerobin/package.nix
+++ b/pkgs/by-name/fl/flamerobin/package.nix
@@ -2,32 +2,23 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   wxGTK32,
   boost,
   firebird,
 }:
 
-stdenv.mkDerivation rec {
-  version = "0.9.3.12";
+stdenv.mkDerivation (finalAttrs: {
+  version = "0.9.14";
   pname = "flamerobin";
 
   src = fetchFromGitHub {
     owner = "mariuz";
     repo = "flamerobin";
-    rev = version;
-    sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s=";
   };
 
-  patches = [
-    # rely on compiler command line for __int128 and std::decimal::decimal128
-    (fetchpatch {
-      url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch";
-      sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM=";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake ];
@@ -38,12 +29,12 @@ stdenv.mkDerivation rec {
     firebird
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Database administration tool for Firebird RDBMS";
     homepage = "https://github.com/mariuz/flamerobin";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ uralbash ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ uralbash ];
+    platforms = lib.platforms.unix;
     mainProgram = "flamerobin";
   };
-}
+})
diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index 021707044ad7..fddb51d8133e 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -18,13 +18,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flameshot";
-  version = "13.1.0";
+  version = "13.3.0";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck=";
+    hash = "sha256-RyoLniRmJRinLUwgmaA4RprYAVHnoPxCP9LyhHfUPe0=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index a36029891702..92932650eb27 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -28,29 +28,29 @@ let
     owner = "whisperfish";
     repo = "presage";
     # match with commit from Cargo.toml
-    rev = "31a418d0a35ad746590165520b652d6adb7a0384";
-    hash = "sha256-Mf8RvwfrVpbsUj+mA9L7IjnbMKoZDjZKYor2iqFWSx4=";
+    rev = "ed011688fc8d9c0ee07c3d44743c138c1fa4dfda";
+    hash = "sha256-NTSxSOAmA9HOH52GPwl6pL0MQly+NTfJDk7k7TUP9II=";
   };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
   # NOTE: also update presage commit
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-3SYsVF3aUJYSr3pM/BGXYExQwbwckExYwEcF3cZ/94g=";
+    hash = "sha256-Nezg+fNC29blGhyetJqs9l6/IL08b7tHn+D3pzKj26I=";
   };
 
   cargoDeps =
     let
       cargoDeps = rustPlatform.fetchCargoVendor {
         inherit (finalAttrs) pname version src;
-        hash = "sha256-cxhnfdYcsyXxvTpGGXm2rK3cKVsNk66FYif7/c16NhU=";
+        hash = "sha256-Y6jY588axEcqv0WN6Fcm8Kd5yd2JXvKwMd8h1L6J9TE=";
       };
     in
     # Replace with simpler solution:
diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
index 24e92261e0c9..3b580e41b82e 100644
--- a/pkgs/by-name/fl/flaresolverr/package.nix
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flaresolverr";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     owner = "FlareSolverr";
     repo = "FlareSolverr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZQMrt4KJpTRdug3dqtDsX5sQveAdiGSsq9V+71iUKR8=";
+    hash = "sha256-5insO3XfIN9vGuPIeVBcLhsYPCO29mR41MFtIy8jeXE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix
index 9d83dacbca08..0043123e347b 100644
--- a/pkgs/by-name/fl/flarum/package.nix
+++ b/pkgs/by-name/fl/flarum/package.nix
@@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: {
 
   composerLock = ./composer.lock;
   composerStrictValidation = false;
-  vendorHash = "sha256-pup+ZfPEnqoA3wEXQNn4pWTYXri6d4XzMfuc8k1SeQk=";
+  vendorHash = "sha256-4wB8MRnqnruo9VXupMmAqiRSZx8F2i+8zcOphTeDp1g=";
 
   meta = with lib; {
     changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md";
diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix
index 6f76b375d314..37bf3f49f16e 100644
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flashmq";
-  version = "1.23.1";
+  version = "1.23.2";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-to+BCn7/fa1YcjCudrOY0otzEkIx9ocSwkUnFGnjuxU=";
+    hash = "sha256-v/gc9YVIBTQP8/wnYKucBQci/8oz+Xo9BTorAV6Jxqs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/by-name/fl/flashprint/package.nix
similarity index 94%
rename from pkgs/applications/misc/flashprint/default.nix
rename to pkgs/by-name/fl/flashprint/package.nix
index d5ff2caf27ef..36b52fc81653 100644
--- a/pkgs/applications/misc/flashprint/default.nix
+++ b/pkgs/by-name/fl/flashprint/package.nix
@@ -2,11 +2,10 @@
   lib,
   stdenv,
   libGLU,
-  qtbase,
   fetchurl,
   dpkg,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     dpkg
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libGLU
   ];
 
diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix
index a6eb2759aecc..0c2ed9709236 100644
--- a/pkgs/by-name/fl/flat-remix-gnome/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix
@@ -8,18 +8,18 @@
 let
   # make install will use dconf to find desktop background file uri.
   # consider adding an args to allow specify pictures manually.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L38
   fake-dconf = writeScriptBin "dconf" "echo -n";
 in
 stdenv.mkDerivation rec {
   pname = "flat-remix-gnome";
-  version = "20250413";
+  version = "20250926";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix-gnome";
     rev = version;
-    hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc=";
+    hash = "sha256-6K/BQqVOeDeJuUi0+NgCFeerX5sSy+nKapYxIQfbKFQ=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   # make install will back up this file, it will fail if the file doesn't exist.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L56
   preInstall = ''
     mkdir -p $out/share/gnome-shell/
     touch $out/share/gnome-shell/gnome-shell-theme.gresource
diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix
index 6412d8166338..69f71b3a40ff 100644
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@@ -151,6 +151,31 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace doc/meson.build \
       --replace-fail '$MESON_INSTALL_DESTDIR_PREFIX/@1@/@2@' '@1@/@2@'
+
+    substituteInPlace triggers/gtk-icon-cache.trigger \
+      --replace-fail '/usr/share/icons/hicolor/index.theme' '/run/current-system/sw/share/icons/hicolor/index.theme'
+  '';
+
+  # Fixup PATHs in trigger scripts
+  postInstall = ''
+    wrapProgram $out/share/flatpak/triggers/desktop-database.trigger --prefix PATH : ${
+      lib.makeBinPath [
+        desktop-file-utils
+      ]
+    }
+
+    wrapProgram $out/share/flatpak/triggers/gtk-icon-cache.trigger --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gtk3
+      ]
+    }
+
+    wrapProgram $out/share/flatpak/triggers/mime-database.trigger --prefix PATH : ${
+      lib.makeBinPath [
+        shared-mime-info
+      ]
+    }
   '';
 
   strictDeps = true;
@@ -228,6 +253,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "system_dbus_proxy" (lib.getExe xdg-dbus-proxy))
     (lib.mesonOption "system_fusermount" "/run/wrappers/bin/fusermount3")
     (lib.mesonOption "system_install_dir" "/var/lib/flatpak")
+    (lib.mesonOption "sysconfdir" "/etc")
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 807b3dba5f57..dfe911fd2de5 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter332,
+  flutter335,
   keybinder3,
   libayatana-appindicator,
   buildGoModule,
@@ -12,14 +12,14 @@
 
 let
   pname = "flclash";
-  version = "0.8.87";
+  version = "0.8.90";
 
   src =
     (fetchFromGitHub {
       owner = "chen08209";
       repo = "FlClash";
       tag = "v${version}";
-      hash = "sha256-vGRq9Kc6XU6r3huIGAKoh5x46fFS8jmXgus9WgpvG3A=";
+      hash = "sha256-wEgWjzdP7HeWgDacaP9fYNczG9BrTN790AQ5aj9scwM=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -28,20 +28,20 @@ let
         GIT_CONFIG_VALUE_0 = "git@github.com:";
       });
 
-  metaCommon = {
-    description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
+  meta = {
+    description = "Proxy client based on ClashMeta, simple and easy to use";
     homepage = "https://github.com/chen08209/FlClash";
     license = with lib.licenses; [ gpl3Plus ];
     maintainers = [ ];
   };
 
-  libclash = buildGoModule {
-    inherit version src;
-    pname = "libclash";
+  core = buildGoModule {
+    pname = "core";
+    inherit version src meta;
 
     modRoot = "core";
 
-    vendorHash = "sha256-Uc+RvpW3vndPFnM7yhqrNTEexAPaolCk8YK8u/+55RQ=";
+    vendorHash = "sha256-5oYJMcyKh8CpMLOLch5/svwa148hY4rnSR5inTRNK4M=";
 
     env.CGO_ENABLED = 0;
 
@@ -53,11 +53,9 @@ let
 
       runHook postBuild
     '';
-
-    meta = metaCommon;
   };
 in
-flutter332.buildFlutterApplication {
+flutter335.buildFlutterApplication {
   inherit pname version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
@@ -98,19 +96,19 @@ flutter332.buildFlutterApplication {
 
   preBuild = ''
     mkdir -p libclash/linux
-    cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore
+    cp ${core}/bin/FlClashCore libclash/linux/FlClashCore
   '';
 
   postInstall = ''
-    install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png
+    install -D --mode=0644 assets/images/icon.png $out/share/pixmaps/flclash.png
   '';
 
   passthru = {
-    inherit libclash;
+    inherit core;
     updateScript = ./update.sh;
   };
 
-  meta = metaCommon // {
+  meta = meta // {
     mainProgram = "FlClash";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
index bb49e16c8c88..dfa865af4231 100644
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -4,31 +4,41 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "80.0.0"
+      "version": "85.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e",
+        "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.6.0"
+    },
+    "analyzer_buffer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer_buffer",
+        "sha256": "f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.10"
     },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916",
+        "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.0"
+      "version": "0.13.4"
     },
     "animations": {
       "dependency": "direct main",
@@ -44,11 +54,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
+        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.0"
+      "version": "6.4.1"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -84,11 +94,11 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "direct dev",
@@ -124,21 +134,21 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
+        "sha256": "ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "3.1.0"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "build_daemon": {
       "dependency": "transitive",
@@ -154,31 +164,31 @@
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0",
+        "sha256": "d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.0.3"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99",
+        "sha256": "b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.15"
+      "version": "2.7.1"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
+        "sha256": "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.0"
+      "version": "9.3.1"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -194,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.5"
+      "version": "8.12.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -214,11 +224,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"
     },
     "ci": {
       "dependency": "transitive",
@@ -230,6 +240,16 @@
       "source": "hosted",
       "version": "0.1.0"
     },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "cli_util": {
       "dependency": "transitive",
       "description": {
@@ -254,11 +274,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -274,11 +294,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
+        "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "6.1.5"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -300,6 +320,16 @@
       "source": "hosted",
       "version": "3.1.2"
     },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
@@ -321,54 +351,54 @@
       "version": "3.0.6"
     },
     "custom_lint": {
-      "dependency": "direct dev",
+      "dependency": "transitive",
       "description": {
         "name": "custom_lint",
-        "sha256": "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e",
+        "sha256": "78085fbe842de7c5bef92de811ca81536968dbcbbcdac5c316711add2d15e796",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.8.0"
     },
     "custom_lint_builder": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_builder",
-        "sha256": "e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d",
+        "sha256": "cc5532d5733d4eccfccaaec6070a1926e9f21e613d93ad0927fad020b95c9e52",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.8.0"
     },
     "custom_lint_core": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_core",
-        "sha256": "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e",
+        "sha256": "cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.1"
+      "version": "0.8.0"
     },
     "custom_lint_visitor": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_visitor",
-        "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8",
+        "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0+7.3.0"
+      "version": "1.0.0+7.7.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.1.1"
     },
     "dbus": {
       "dependency": "transitive",
@@ -394,31 +424,31 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53",
+        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.4.0"
+      "version": "11.5.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.2"
+      "version": "7.0.3"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
+        "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.8.0+1"
+      "version": "5.9.0"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
@@ -434,11 +464,11 @@
       "dependency": "direct main",
       "description": {
         "name": "dynamic_color",
-        "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
+        "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.7.0"
+      "version": "1.8.1"
     },
     "emoji_regex": {
       "dependency": "direct main",
@@ -480,16 +510,6 @@
       "source": "hosted",
       "version": "2.1.4"
     },
-    "ffigen": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "ffigen",
-        "sha256": "72d732c33557fc0ca9b46379d3deff2dadbdc539696dc0b270189e2989be20ef",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "18.1.0"
-    },
     "file": {
       "dependency": "transitive",
       "description": {
@@ -504,11 +524,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.7"
+      "version": "10.3.3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -524,11 +544,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+4"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -566,16 +586,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_acrylic": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_acrylic",
-        "sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.4"
-    },
     "flutter_cache_manager": {
       "dependency": "direct main",
       "description": {
@@ -617,31 +627,31 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.28"
+      "version": "2.0.30"
     },
     "flutter_riverpod": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_riverpod",
-        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "sha256": "ca2480512a8e840291325249f4857e363ffa5d1b77b132e189c9313a9d9fb9e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.0"
     },
     "flutter_svg": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.1"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -659,21 +669,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c",
+        "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.8"
+      "version": "3.2.3"
     },
     "freezed_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+        "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.1.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -779,11 +789,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -809,81 +819,81 @@
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
+        "sha256": "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+23"
+      "version": "0.8.13+3"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
+        "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+2"
+      "version": "0.8.13"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
+        "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
+        "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.1"
+      "version": "2.11.0"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "intl": {
       "dependency": "direct main",
@@ -949,11 +959,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
+        "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.5"
+      "version": "6.11.1"
     },
     "launch_at_startup": {
       "dependency": "direct main",
@@ -969,31 +979,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -1015,26 +1025,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "lpinyin": {
-      "dependency": "direct main",
-      "description": {
-        "name": "lpinyin",
-        "sha256": "0bb843363f1f65170efd09fbdfc760c7ec34fc6354f9fcb2f89e74866a0d814a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "macos_window_utils": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macos_window_utils",
-        "sha256": "4e683da162825018580c7341d9e926a6fa39a869a3504c2e5471618553bd55cd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.8.2"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -1089,11 +1079,21 @@
       "dependency": "direct main",
       "description": {
         "name": "mobile_scanner",
-        "sha256": "72f06a071aa8b14acea3ab43ea7949eefe4a2469731ae210e006ba330a033a8c",
+        "sha256": "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
+    },
+    "mockito": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mockito",
+        "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.5.0"
     },
     "nm": {
       "dependency": "transitive",
@@ -1105,6 +1105,16 @@
       "source": "hosted",
       "version": "0.5.0"
     },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
     "package_config": {
       "dependency": "transitive",
       "description": {
@@ -1119,21 +1129,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
+        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.0"
+      "version": "8.3.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "path": {
       "dependency": "direct main",
@@ -1169,21 +1179,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.17"
+      "version": "2.2.18"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1219,11 +1229,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -1249,11 +1259,21 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
     },
     "proxy": {
       "dependency": "direct main",
@@ -1284,16 +1304,6 @@
       "source": "hosted",
       "version": "1.5.0"
     },
-    "quiver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "quiver",
-        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.2"
-    },
     "re_editor": {
       "dependency": "direct main",
       "description": {
@@ -1319,51 +1329,51 @@
       "dependency": "direct main",
       "description": {
         "name": "riverpod",
-        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
+        "sha256": "135723ec44dfba141bc4696224048a408336e794228a0117439e7ad0a8be6d05",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.0"
     },
     "riverpod_analyzer_utils": {
       "dependency": "transitive",
       "description": {
         "name": "riverpod_analyzer_utils",
-        "sha256": "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3",
+        "sha256": "c971e50f678d55c87d9e3b5015df7fcaadb2302a84ea101247cf99387b4554fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.9"
+      "version": "1.0.0-dev.6"
     },
     "riverpod_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "riverpod_annotation",
-        "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8",
+        "sha256": "1f9c1bc10b13f68ebc83ab391e77a865ff796880461d2a60c5ce301e1fb65f51",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.0"
     },
     "riverpod_generator": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_generator",
-        "sha256": "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f",
+        "sha256": "178d6bfa6de66d7db97db2466e5fad2da91a678ab376a7309235eec731755046",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.4"
+      "version": "3.0.0"
     },
     "riverpod_lint": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_lint",
-        "sha256": "b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693",
+        "sha256": "89bce8d40bed52aa89b43ef45cfe473a9c7736629d61fc659c95e4e9f4d571a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.4"
+      "version": "3.0.0"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -1439,11 +1449,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.12"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1505,6 +1515,26 @@
       "source": "hosted",
       "version": "1.4.2"
     },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
     "shelf_web_socket": {
       "dependency": "transitive",
       "description": {
@@ -1535,21 +1565,41 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
+        "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.1.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.5"
+      "version": "1.3.8"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1585,21 +1635,21 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2+2"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
+        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.5"
+      "version": "2.5.6"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -1685,11 +1735,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
+        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.1"
+      "version": "3.4.0"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1701,15 +1751,35 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "test": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test",
+        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.26.2"
+    },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
+    },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.11"
     },
     "timing": {
       "dependency": "transitive",
@@ -1725,11 +1795,11 @@
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
+        "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0"
+      "version": "0.5.1"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1755,31 +1825,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.22"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.4"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1795,11 +1865,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1845,11 +1915,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -1865,41 +1935,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.17"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.2"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.3"
     },
     "web": {
       "dependency": "transitive",
@@ -1941,15 +2011,25 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.13.0"
+      "version": "5.14.0"
     },
     "win32_registry": {
       "dependency": "direct main",
@@ -1974,11 +2054,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -1994,11 +2074,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -2009,20 +2089,10 @@
       },
       "source": "hosted",
       "version": "3.1.3"
-    },
-    "yaml_edit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml_edit",
-        "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.2"
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.29.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }
diff --git a/pkgs/by-name/fl/flclash/update.sh b/pkgs/by-name/fl/flclash/update.sh
index b2fea37f8187..37627d5043b6 100755
--- a/pkgs/by-name/fl/flclash/update.sh
+++ b/pkgs/by-name/fl/flclash/update.sh
@@ -1,20 +1,20 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update
 
 set -eou pipefail
 
-ROOT="$(dirname "$(readlink -f "$0")")"
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
 
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
+latestTag=$(curl --fail --location --silent ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
 latestVersion=$(echo "$latestTag" | sed 's/^v//')
 
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"')
+currentVersion=$(nix eval --file . --raw flclash.version)
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then
     echo "package is up-to-date: $currentVersion"
     exit 0
 fi
 
-nix-update --subpackage libclash flclash
+nix-update --subpackage core --use-github-releases flclash
 
-curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+curl --fail --location --silent https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix
index 2ef8fca196cb..3c9428f7c219 100644
--- a/pkgs/by-name/fl/fleet/package.nix
+++ b/pkgs/by-name/fl/fleet/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.73.5";
+  version = "4.75.1";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-66ABReCDIxL+uwwK3IWnKR+UPJd5DBSE+bNUk+2LbQA=";
+    hash = "sha256-0vnGdcCq3sHTS7CxlnYMYxr0KZr9exrrU+4lIeGkv+0=";
   };
-  vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4=";
+  vendorHash = "sha256-SMQskb2Sth1Wi02e/EwT/z+dUsxGBN7gd/H3f33Oq1M=";
 
   subPackages = [
     "cmd/fleet"
diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix
index cf2bbab86e8a..470a9185cad6 100644
--- a/pkgs/by-name/fl/flet-client-flutter/package.nix
+++ b/pkgs/by-name/fl/flet-client-flutter/package.nix
@@ -60,6 +60,10 @@ flutter329.buildFlutterApplication rec {
   ++ mpv-unwrapped.buildInputs
   ++ libplacebo.buildInputs;
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=nontrivial-memcall"
+  ];
+
   passthru = {
     updateScript = _experimental-update-script-combinators.sequence [
       (gitUpdater { rev-prefix = "v"; })
diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
similarity index 100%
rename from pkgs/games/flightgear/openscenegraph-flightgear.nix
rename to pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/by-name/fl/flightgear/package.nix
similarity index 86%
rename from pkgs/games/flightgear/default.nix
rename to pkgs/by-name/fl/flightgear/package.nix
index 42c793c335b6..056b3269774a 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  wrapQtAppsHook,
   callPackage,
   libglut,
   freealut,
@@ -28,9 +27,7 @@
   udev,
   fltk13,
   apr,
-  qtbase,
-  qtquickcontrols2,
-  qtdeclarative,
+  qt5,
   glew,
   curl,
 }:
@@ -71,7 +68,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     libglut
@@ -98,21 +95,24 @@ stdenv.mkDerivation rec {
     udev
     fltk13
     apr
-    qtbase
-    qtquickcontrols2
+    qt5.qtbase
+    qt5.qtquickcontrols2
     glew
-    qtdeclarative
+    qt5.qtdeclarative
     curl
   ];
 
   qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];
 
-  meta = with lib; {
+  meta = {
     description = "Flight simulator";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
+    platforms = lib.platforms.linux;
     hydraPlatforms = [ ]; # disabled from hydra because it's so big
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "fgfs";
   };
 }
diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix
index c3799a709f13..05d2854bf437 100644
--- a/pkgs/by-name/fl/flip-link/package.nix
+++ b/pkgs/by-name/fl/flip-link/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flip-link";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "knurling-rs";
     repo = "flip-link";
     rev = "v${version}";
-    hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
+    hash = "sha256-scAENBaZMWR6HgEnXDQPCVsZPo0m9khd3C+05hJhje8=";
   };
 
-  cargoHash = "sha256-LYIgMKXaXN5gh+MvHf03za7qPJ8N8Ww7ykWB5TYOqkw=";
+  cargoHash = "sha256-nyOLRBlC9tgEr4p8XEF4G4T3xhjQVgIx+D5Uwn/GENY=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
diff --git a/pkgs/by-name/fl/flitter/package.nix b/pkgs/by-name/fl/flitter/package.nix
index d50c58d9d26f..853e5a4832e0 100644
--- a/pkgs/by-name/fl/flitter/package.nix
+++ b/pkgs/by-name/fl/flitter/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flitter";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "alexozer";
     repo = "flitter";
     tag = version;
-    hash = "sha256-2oK70WusLzLh2Pnb80S2rbpd7IFdApvIVvdYuhvkfBs=";
+    hash = "sha256-aXTQeUKhwa2uVipKIs8n0XBiWa5o7U6UMlAUlnzXyzE=";
   };
 
-  cargoHash = "sha256-UiHy4k4yLgwLZrnR07It93gM3dShou9OD055yygWN24=";
+  cargoHash = "sha256-SOmq1txYMJGUVkkrE3kWmioaJzBX9raZ+ExFlPYGDM8=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index aac33e941f31..39f7f2c3a108 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -9,13 +9,13 @@
 
 buildNpmPackage rec {
   pname = "flood";
-  version = "4.10.0";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "flood";
     rev = "v${version}";
-    hash = "sha256-+mVfaCxSHGy4r3ULO2bnV5X2xG7LJT27Bce0y55i6DA=";
+    hash = "sha256-RBWDEFhLEZdC7luGFGx3qY0Hk7nM44RZgRyCWXFPh1k=";
   };
 
   npmConfigHook = pnpm_9.configHook;
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
index ae953ee261b9..e8fad96e96e2 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "12.2.1",
+  "version": "12.4.0",
   "sources": {
     "aarch64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-linux-aarch64.tar.xz",
-      "sha256": "bacc6f31dbda6a2bbb5e9b3541511750d835feb1b161092bd801b8c5feaae249"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-linux-aarch64.tar.xz",
+      "sha256": "a9ac6e381a828715f9595430c1eaab40d1e6b73c11a6ab2f3a6e75829e2ac7c6"
     },
     "x86_64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-linux-amd64.tar.xz",
-      "sha256": "cac00263e6cea2a4490d597a6287a7902a72907ad0ed6676a959873104b049d2"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-linux-x86_64.tar.xz",
+      "sha256": "454098dbda9a4b22dd77f189f6b6f7833bdc6247363a8b487e5f0f3c9741dbc0"
     },
     "aarch64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-macOS-universal.dmg",
-      "sha256": "7b086811976c394767f9fcf4880d5a114b6d2e8d4f12703c1529fc61eb89eacd"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-macOS-universal.dmg",
+      "sha256": "80fc3499394aea7a44175f2359866e5471213ca03d21e69cde81ebf4ff0d5ae7"
     },
     "x86_64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-macOS-universal.dmg",
-      "sha256": "7b086811976c394767f9fcf4880d5a114b6d2e8d4f12703c1529fc61eb89eacd"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-macOS-universal.dmg",
+      "sha256": "80fc3499394aea7a44175f2359866e5471213ca03d21e69cde81ebf4ff0d5ae7"
     }
   }
 }
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
index 5be8138e7af5..3d0b87d688f2 100755
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
@@ -31,7 +31,7 @@ jq '
       | map(
           if .url | contains("linux-aarch64") then
             {key: "aarch64-linux", value: .}
-          elif .url | contains("linux-amd64") then
+          elif .url | contains("linux-x86_64") then
             {key: "x86_64-linux", value: .}
           elif .url | contains("macOS-universal") then
             [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}]
diff --git a/pkgs/by-name/fl/flopoco/package.nix b/pkgs/by-name/fl/flopoco/package.nix
index b2e81c17764c..6d32636b1098 100644
--- a/pkgs/by-name/fl/flopoco/package.nix
+++ b/pkgs/by-name/fl/flopoco/package.nix
@@ -74,6 +74,10 @@ stdenv.mkDerivation {
     ./flopoco BuildAutocomplete
   '';
 
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
+  ];
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/fl/flrig/package.nix b/pkgs/by-name/fl/flrig/package.nix
index 84db6d5f18ac..de57d3647394 100644
--- a/pkgs/by-name/fl/flrig/package.nix
+++ b/pkgs/by-name/fl/flrig/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.08";
+  version = "2.0.09";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "sha256-+erxQBZKHzMOQPM/VAk+Iw9ItPZnW9Ndiu0HQ08Szm8=";
+    sha256 = "sha256-dvUh7PEGKvJ21aw4BFBLKDosE4RVtZPWb9XVHJRk9Z0=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 8a2a154b4d3c..61d88c37e69d 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "4.0.10";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fYgZULGGlvuxgI5qOQ83AxcpEQQlw3ZpYLpu3hDJiSc=";
+    hash = "sha256-mu6WPp4jUAnLpZzFwy8HoKosCiYPxejsKEEnBRKodr4=";
   };
 
   # The source build documentation covers some dependencies and CMake options.
diff --git a/pkgs/by-name/fl/fluent-gtk-theme/package.nix b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
index a2dc6a21bf3a..5bbc44052e29 100644
--- a/pkgs/by-name/fl/fluent-gtk-theme/package.nix
+++ b/pkgs/by-name/fl/fluent-gtk-theme/package.nix
@@ -3,7 +3,6 @@
   stdenvNoCC,
   fetchFromGitHub,
   gitUpdater,
-  gnome-themes-extra,
   gtk-engine-murrine,
   jdupes,
   sassc,
@@ -74,8 +73,6 @@ lib.checkListOfEnum "${pname}: theme variants"
       sassc
     ];
 
-    buildInputs = [ gnome-themes-extra ];
-
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
     postPatch = ''
diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix
index 2091bfea6abf..a3eabb01055d 100644
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@@ -7,6 +7,7 @@
   libgbm,
   libdrm,
   flutter332,
+  flutter335,
   pulseaudio,
   copyDesktopItems,
   makeDesktopItem,
@@ -28,23 +29,22 @@ let
     sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA=";
   };
 in
-flutter332.buildFlutterApplication (
+flutter335.buildFlutterApplication (
   rec {
     pname = "fluffychat-${targetFlutterPlatform}";
-    version = "2.1.1";
+    version = "2.2.0";
 
     src = fetchFromGitHub {
       owner = "krille-chan";
       repo = "fluffychat";
       tag = "v${version}";
-      hash = "sha256-Gk3PtIb90rmrEIq52aL+vBHhRG6LoyfG2jrAGH5Iyqo=";
+      hash = "sha256-+puhKlg+ZJVjmL0hoWUXm7JU5hpoKqPZ3T5rWy+rPsQ=";
     };
 
     inherit pubspecLock;
 
     gitHashes = {
       flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=";
-      flutter_typeahead = "sha256-ZGXbbEeSddrdZOHcXE47h3Yu3w6oV7q+ZnO6GyW7Zg8=";
       flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
     };
 
diff --git a/pkgs/by-name/fl/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
index 91db916d77fa..77863a7be372 100644
--- a/pkgs/by-name/fl/fluffychat/pubspec.lock.json
+++ b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
@@ -24,11 +24,11 @@
       "dependency": "direct main",
       "description": {
         "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+        "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.11"
+      "version": "2.1.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -224,11 +224,11 @@
       "dependency": "direct main",
       "description": {
         "name": "chewie",
-        "sha256": "19b93a1e60e4ba640a792208a6543f1c7d5b124d011ce0199e2f18802199d984",
+        "sha256": "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.1"
+      "version": "1.13.0"
     },
     "cli_config": {
       "dependency": "transitive",
@@ -374,11 +374,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_webrtc",
-        "sha256": "a2ae542cdadc21359022adedc26138fa3487cc3b3547c24ff4f556681869e28c",
+        "sha256": "51bcda4ba5d7dd9e65a309244ce3ac0b58025e6e1f6d7442cee4cd02134ef65f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.3+hotfix.4"
+      "version": "1.6.0"
     },
     "dbus": {
       "dependency": "transitive",
@@ -394,11 +394,11 @@
       "dependency": "direct main",
       "description": {
         "name": "desktop_drop",
-        "sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b",
+        "sha256": "e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.1"
+      "version": "0.7.0"
     },
     "desktop_notifications": {
       "dependency": "direct main",
@@ -414,11 +414,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "dd0e8e02186b2196c7848c9d394a5fd6e5b57a43a546082c5820b1ec72317e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.2.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -460,16 +460,6 @@
       "source": "hosted",
       "version": "0.9.9"
     },
-    "enhanced_enum": {
-      "dependency": "transitive",
-      "description": {
-        "name": "enhanced_enum",
-        "sha256": "074c5a8b9664799ca91e1e8b68003b8694cb19998671cbafd9c7779c13fcdecf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.4"
-    },
     "fake_async": {
       "dependency": "transitive",
       "description": {
@@ -504,21 +494,21 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.1"
+      "version": "10.3.3"
     },
     "file_selector": {
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     "file_selector_android": {
       "dependency": "transitive",
@@ -632,66 +622,6 @@
       "source": "hosted",
       "version": "0.1.1"
     },
-    "flutter_keyboard_visibility": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility",
-        "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "flutter_keyboard_visibility_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_linux",
-        "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_macos",
-        "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_platform_interface",
-        "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_web",
-        "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_windows",
-        "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
     "flutter_linkify": {
       "dependency": "direct main",
       "description": {
@@ -716,11 +646,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_local_notifications",
-        "sha256": "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae",
+        "sha256": "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "19.4.0"
+      "version": "19.5.0"
     },
     "flutter_local_notifications_linux": {
       "dependency": "transitive",
@@ -746,11 +676,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_local_notifications_windows",
-        "sha256": "ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98",
+        "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -762,21 +692,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_map",
-        "sha256": "df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5",
+        "sha256": "391e7dc95cc3f5190748210a69d4cfeb5d8f84dcdfa9c3235d0a9d7742ccb3f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.1"
+      "version": "8.2.2"
     },
     "flutter_native_splash": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
+        "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.4.7"
     },
     "flutter_new_badger": {
       "dependency": "direct main",
@@ -788,16 +718,6 @@
       "source": "hosted",
       "version": "1.1.1"
     },
-    "flutter_openssl_crypto": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_openssl_crypto",
-        "sha256": "293b4fcda13ab0710645a16e82f3d5b7de19bfc0ab2d06bcdb87637222eda5e1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.0"
-    },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
@@ -812,11 +732,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_rust_bridge",
-        "sha256": "b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb",
+        "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.11.1"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
@@ -895,26 +815,15 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_typeahead": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "main",
-        "resolved-ref": "3e209e67aa6e780cba61ced06cf49d2babbbcaa4",
-        "url": "https://github.com/famedly/flutter_typeahead.git"
-      },
-      "source": "git",
-      "version": "5.2.0"
-    },
     "flutter_vodozemac": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_vodozemac",
-        "sha256": "2405ca121b84d1cd83200a14021022e1691b123a23bcefc36adc7740cefbc1f9",
+        "sha256": "54cd3790b6dfdc1afce928f8c46f7eeea9e4f8326f077400894935926f202057",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2"
+      "version": "0.3.0"
     },
     "flutter_web_auth_2": {
       "dependency": "direct main",
@@ -947,11 +856,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_webrtc",
-        "sha256": "69095ba39b83da3de48286dfc0769aa8e9f10491f70058dc8d8ecc960ef7a260",
+        "sha256": "16ca9e30d428bae3dd32933e875c9f67c5843d1fa726c37cf1fc479eb9294549",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.2.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -1073,11 +982,11 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48",
+        "sha256": "d8f590a69729f719177ea68eb1e598295e8dbc41bbc247fed78b2c8a25660d7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "16.1.0"
+      "version": "16.3.0"
     },
     "gsettings": {
       "dependency": "transitive",
@@ -1183,81 +1092,81 @@
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
+        "sha256": "e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+23"
+      "version": "0.8.13"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
+        "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+2"
+      "version": "0.8.13"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
+        "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
+        "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.1"
+      "version": "2.11.0"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "import_sorter": {
       "dependency": "direct dev",
@@ -1319,21 +1228,21 @@
       "dependency": "direct main",
       "description": {
         "name": "just_audio",
-        "sha256": "679637a3ec5b6e00f36472f5a3663667df00ee4822cbf5dafca0f568c710960a",
+        "sha256": "9694e4734f515f2a052493d1d7e0d6de219ee0427c7c29492e246ff32a219908",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.10.4"
+      "version": "0.10.5"
     },
     "just_audio_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "just_audio_platform_interface",
-        "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
+        "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.6.0"
     },
     "just_audio_web": {
       "dependency": "transitive",
@@ -1359,31 +1268,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.1"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "license_checker": {
       "dependency": "direct dev",
@@ -1479,11 +1388,11 @@
       "dependency": "direct main",
       "description": {
         "name": "matrix",
-        "sha256": "4e6c186115ee041c430aa5ed5210499d60e4323f907cea1f5e8a2f73a513a1bf",
+        "sha256": "84354dd61f47b297631a3fe5eeebb5c1e0725f872b8fae75851a49cd5689c4f1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "3.0.1"
     },
     "meta": {
       "dependency": "transitive",
@@ -1739,11 +1648,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -1765,46 +1674,6 @@
       "source": "hosted",
       "version": "2.1.8"
     },
-    "pointer_interceptor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor",
-        "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.1+2"
-    },
-    "pointer_interceptor_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_ios",
-        "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.1"
-    },
-    "pointer_interceptor_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_platform_interface",
-        "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.0+1"
-    },
-    "pointer_interceptor_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_web",
-        "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.2+1"
-    },
     "pool": {
       "dependency": "transitive",
       "description": {
@@ -1859,11 +1728,11 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1909,11 +1778,11 @@
       "dependency": "direct main",
       "description": {
         "name": "qr_code_scanner_plus",
-        "sha256": "39696b50d277097ee4d90d4292de36f38c66213a4f5216a06b2bdd2b63117859",
+        "sha256": "41f4a834a48d670d25e3917cb9f1dbb4742298a0b4ab60d82416b295b73931e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.10+1"
+      "version": "2.0.13"
     },
     "qr_image": {
       "dependency": "direct main",
@@ -1949,81 +1818,81 @@
       "dependency": "direct main",
       "description": {
         "name": "record",
-        "sha256": "daeb3f9b3fea9797094433fe6e49a879d8e4ca4207740bc6dc7e4a58764f0817",
+        "sha256": "6bad72fb3ea6708d724cf8b6c97c4e236cf9f43a52259b654efeb6fd9b737f1f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.2"
     },
     "record_android": {
       "dependency": "transitive",
       "description": {
         "name": "record_android",
-        "sha256": "97d7122455f30de89a01c6c244c839085be6b12abca251fc0e78f67fed73628b",
+        "sha256": "fb54ee4e28f6829b8c580252a9ef49d9c549cfd263b0660ad7eeac0908658e9f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.3"
+      "version": "1.4.4"
     },
     "record_ios": {
       "dependency": "transitive",
       "description": {
         "name": "record_ios",
-        "sha256": "73706ebbece6150654c9d6f57897cf9b622c581148304132ba85dba15df0fdfb",
+        "sha256": "765b42ac1be019b1674ddd809b811fc721fe5a93f7bb1da7803f0d16772fd6d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.4"
     },
     "record_linux": {
       "dependency": "transitive",
       "description": {
         "name": "record_linux",
-        "sha256": "fcb5964a84292813de70d52253663c1caca00a15f849fb5d0fdf9b929b28a7b9",
+        "sha256": "235b1f1fb84e810f8149cc0c2c731d7d697f8d1c333b32cb820c449bf7bb72d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.2.1"
     },
     "record_macos": {
       "dependency": "transitive",
       "description": {
         "name": "record_macos",
-        "sha256": "02240833fde16c33fcf2c589f3e08d4394b704761b4a3bb609d872ff3043fbbd",
+        "sha256": "842ea4b7e95f4dd237aacffc686d1b0ff4277e3e5357865f8d28cd28bc18ed95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.2"
     },
     "record_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "record_platform_interface",
-        "sha256": "8a575828733d4c3cb5983c914696f40db8667eab3538d4c41c50cbb79e722ef4",
+        "sha256": "b0065fdf1ec28f5a634d676724d388a77e43ce7646fb049949f58c69f3fcb4ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.0"
     },
     "record_web": {
       "dependency": "transitive",
       "description": {
         "name": "record_web",
-        "sha256": "654c08113961051dcb5427e63f56315ba47c0752781ba990dac9313d0ec23c70",
+        "sha256": "4f0adf20c9ccafcc02d71111fd91fba1ca7b17a7453902593e5a9b25b74a5c56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.6"
+      "version": "1.2.0"
     },
     "record_windows": {
       "dependency": "transitive",
       "description": {
         "name": "record_windows",
-        "sha256": "85a22fc97f6d73ecd67c8ba5f2f472b74ef1d906f795b7970f771a0914167e99",
+        "sha256": "223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.6"
+      "version": "1.0.7"
     },
     "retry": {
       "dependency": "transitive",
@@ -2055,6 +1924,56 @@
       "source": "hosted",
       "version": "1.1.2"
     },
+    "screen_retriever": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "scroll_to_index": {
       "dependency": "direct main",
       "description": {
@@ -2079,11 +1998,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.1"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -2395,31 +2314,31 @@
       "dependency": "transitive",
       "description": {
         "name": "test",
-        "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
+        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.25.15"
+      "version": "1.26.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.8"
+      "version": "0.6.11"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2485,41 +2404,61 @@
       "dependency": "direct main",
       "description": {
         "name": "unifiedpush",
-        "sha256": "1418375efb580af9640de4eaf4209cb6481f9a48792648ced3051f30e67d9568",
+        "sha256": "8ed9767f750a1dc6159a77e2171641d0cb825dc87682d1ce1b8618689b79f58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.2.0"
     },
     "unifiedpush_android": {
       "dependency": "transitive",
       "description": {
         "name": "unifiedpush_android",
-        "sha256": "2f25db8eb2fc3183bf2e43db89fff20b2587adc1c361e1d1e06b223a0d45b50a",
+        "sha256": "556796c81e8151ee8e4275baea2f7191119e8b1412ec35523cc2ac1c44c348bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.4.0"
+    },
+    "unifiedpush_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "unifiedpush_linux",
+        "sha256": "c062d5eedd1cec70bcd33270cc4e01ae0ff6501f33d471167c06b34a968adfeb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "unifiedpush_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "unifiedpush_platform_interface",
-        "sha256": "bb49d2748211520e35e0374ab816faa8a2c635267e71909d334ad868d532eba5",
+        "sha256": "83372bc8d794b8b12ef6993b518d7be907dcfc2191bdf6de0ece5c4445d89880",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "4.0.0"
+    },
+    "unifiedpush_storage_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "unifiedpush_storage_interface",
+        "sha256": "b8d423a4695efc616aa21d8ab48fb5ef99d6288c68b56282b8faac1579ceabd9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "unifiedpush_ui": {
       "dependency": "direct main",
       "description": {
         "name": "unifiedpush_ui",
-        "sha256": "cf86f0214f37debd41f25c0425c8489df85e27f9f8784fed571eb7a86d39ba11",
+        "sha256": "1b36b2aa0bc6b61577e2661c1183bd3442969ecf77b4c78174796d324f66dd1d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.0"
+      "version": "0.2.0"
     },
     "universal_html": {
       "dependency": "direct main",
@@ -2655,11 +2594,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "video_compress": {
       "dependency": "direct main",
@@ -2735,21 +2674,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vodozemac",
-        "sha256": "dba14017e042748fb22d270e8ab1d3e46965b89788dd3857dba938ec07571968",
+        "sha256": "95cac62ffab94db99e134c8f9aac198f8131a4eed0bed76a6cfc9c72add229b9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.3.0"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
@@ -2801,6 +2740,16 @@
       "source": "hosted",
       "version": "3.0.3"
     },
+    "webcrypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webcrypto",
+        "sha256": "e393b3d0b01694a8f81efecf278ed7392877130e6e7b29f578863e4f2d0b2ebd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.8"
+    },
     "webdriver": {
       "dependency": "transitive",
       "description": {
@@ -2821,15 +2770,25 @@
       "source": "hosted",
       "version": "1.2.1"
     },
+    "webpush_encryption": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webpush_encryption",
+        "sha256": "63046b7d6909f4a72ce3c153fa574726e257aaf21b1995ba063dc241a1b1520b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "webrtc_interface": {
       "dependency": "direct main",
       "description": {
         "name": "webrtc_interface",
-        "sha256": "86fe3afc81a08481dfb25cf14a5a94e27062ecef25544783f352c914e0bbc1ca",
+        "sha256": "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2+hotfix.2"
+      "version": "1.3.0"
     },
     "win32": {
       "dependency": "transitive",
@@ -2851,6 +2810,16 @@
       "source": "hosted",
       "version": "2.1.0"
     },
+    "window_manager": {
+      "dependency": "transitive",
+      "description": {
+        "name": "window_manager",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
     "window_to_front": {
       "dependency": "transitive",
       "description": {
@@ -2885,11 +2854,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -2904,6 +2873,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.29.0"
+    "flutter": ">=3.32.0"
   }
 }
diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix
index 28c8b9ef066f..88e013502421 100644
--- a/pkgs/by-name/fl/fluidsynth/package.nix
+++ b/pkgs/by-name/fl/fluidsynth/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   cmake,
   alsa-lib,
-  glib,
   libjack2,
   libsndfile,
   libpulseaudio,
@@ -14,13 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluidsynth";
-  version = "2.4.8";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "FluidSynth";
     repo = "fluidsynth";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rOPoRV0NWrlFZohqQ76gnXvt4/ryEI4nSlX+mNW+qf8=";
+    hash = "sha256-ouPCbXg9vgxSAHsReC7dmF1cstQZ1HaUoWcLChE35Hk=";
+    fetchSubmodules = true;
   };
 
   outputs = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    glib
+    stdenv.cc.cc.lib
     libsndfile
     libjack2
   ]
@@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-Denable-framework=off"
+    "-Dosal=cpp11"
+    "-Denable-libinstpatch=0"
   ];
 
   meta = {
diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index c30591f70b7a..868e15d61d4c 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -8,10 +8,10 @@
 }:
 
 let
-  version = "2.7.2";
-  srcHash = "sha256-a6qWGkhtslwvb4fW+K5Q0GP58wecOs2RRrMuJUX8wLs=";
-  vendorHash = "sha256-GRn+2VX7UsqlVyIrTwRFeJiBFcZpxBNkw4FW2efsCK4=";
-  manifestsHash = "sha256-cNJrx+4/dR48uYmA7HpLZlnpzF1pgWRerg2dpiXJA+U=";
+  version = "2.7.3";
+  srcHash = "sha256-nyMKlcJcDa532NqiT16eQJH0Z4dAO1MHkIzsrWlJS7Q=";
+  vendorHash = "sha256-0aQYOmH9CFv0gQ3PIEWr3OhC1jyQOIkNMp9lb7GQ40I=";
+  manifestsHash = "sha256-SQkMqcJY3FHLx6aAwWL0Nuz3fzPTevod4paz2H2srcI=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
diff --git a/pkgs/by-name/fl/flvstreamer/package.nix b/pkgs/by-name/fl/flvstreamer/package.nix
index d16f0ea23951..dfe18eebd698 100644
--- a/pkgs/by-name/fl/flvstreamer/package.nix
+++ b/pkgs/by-name/fl/flvstreamer/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://savannah.nongnu.org/projects/flvstreamer";
 
-    maintainers = [ lib.maintainers.thammers ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/fl/flying-carpet/package.nix b/pkgs/by-name/fl/flying-carpet/package.nix
new file mode 100644
index 000000000000..836746465348
--- /dev/null
+++ b/pkgs/by-name/fl/flying-carpet/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  fetchNpmDeps,
+  cargo-tauri,
+  glib-networking,
+  nodejs,
+  npmHooks,
+  openssl,
+  pkg-config,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+  copyDesktopItems,
+  makeDesktopItem,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "flying-carpet";
+  version = "9.0.6";
+
+  src = fetchFromGitHub {
+    owner = "spieglt";
+    repo = "FlyingCarpet";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-yqY1D7SwTtARqsK/opC0SieCtwosr8zDFlEgmoaTiME=";
+  };
+
+  cargoHash = "sha256-zoZS7rV5Pou9OmodLF8CqcEsAWFjSdtk/S5OXsnKKyg=";
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    pkg-config
+    wrapGAppsHook4
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    glib-networking
+    openssl
+    webkitgtk_4_1
+  ];
+
+  checkFlags = [
+    "--skip"
+    "network"
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "FlyingCarpet";
+      desktopName = "FlyingCarpet";
+      exec = "FlyingCarpet";
+      icon = "FlyingCarpet";
+      categories = [ "Development" ];
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 "Flying Carpet/src-tauri/icons/32x32.png" "$out/share/icons/hicolor/32x32/apps/FlyingCarpet.png"
+    install -Dm644 "Flying Carpet/src-tauri/icons/128x128.png" "$out/share/icons/hicolor/128x128/apps/FlyingCarpet.png"
+    install -Dm644 "Flying Carpet/src-tauri/icons/128x128@2x.png" "$out/share/icons/hicolor/256x256@2/apps/FlyingCarpet.png"
+  '';
+
+  preFixup = ''
+    # https://github.com/tauri-apps/tauri/issues/9304
+    gappsWrapperArgs+=(--set WEBKIT_DISABLE_DMABUF_RENDERER 1)
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Send and receive files between Android, iOS, Linux, macOS, and Windows over ad hoc WiFi";
+    homepage = "https://github.com/spieglt/FlyingCarpet";
+    changelog = "https://github.com/spieglt/FlyingCarpet/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.linux; # No darwin: https://github.com/spieglt/FlyingCarpet/issues/117
+    mainProgram = "FlyingCarpet";
+  };
+})
diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix
index 28cadddb8c98..09551a6b88fa 100644
--- a/pkgs/by-name/fl/flyway/package.nix
+++ b/pkgs/by-name/fl/flyway/package.nix
@@ -9,10 +9,10 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flyway";
-  version = "11.13.0";
+  version = "11.14.1";
   src = fetchurl {
     url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-yIptnNIt76qYer9AhLRZ0hhuUhx56PWXU3jjkLBz11M=";
+    sha256 = "sha256-NWxt7qOiANk847cHbs916jNaZlUZynRlrVP321MkqOs=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;
diff --git a/pkgs/games/doom-ports/zandronum/fmod.nix b/pkgs/by-name/fm/fmodex/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zandronum/fmod.nix
rename to pkgs/by-name/fm/fmodex/package.nix
diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 249954db1d93..ed0e0eb80b57 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fn";
-  version = "0.6.43";
+  version = "0.6.45";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = version;
-    hash = "sha256-8JvrCY56i6Nksg+LgfIIpUZozUF0IBfdG8rKMuYUrzI=";
+    hash = "sha256-iW59tennUgDfYhMGbzdLizo3u+bROWOGbeAl319lsHk=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index b2b5330515b6..ece22b880717 100644
--- a/pkgs/by-name/fn/fna3d/package.nix
+++ b/pkgs/by-name/fn/fna3d/package.nix
@@ -4,36 +4,33 @@
   fetchFromGitHub,
   cmake,
   SDL2,
+  sdl3,
+  useSDL3 ? false,
 }:
+
 stdenv.mkDerivation rec {
   pname = "fna3d";
-  version = "25.02";
+  version = "25.11";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FNA3D";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-0rRwIbOciPepo+ApvJiK5IyhMdq/4jsMlCSv0UeDETs=";
+    hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk=";
   };
 
-  buildInputs = [ SDL2 ];
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SDL3" useSDL3)
+  ];
+  buildInputs = if useSDL3 then [ sdl3 ] else [ SDL2 ];
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 libFNA3D.so $out/lib/libFNA3D.so
-    ln -s libFNA3D.so $out/lib/libFNA3D.so.0
-    ln -s libFNA3D.so $out/lib/libFNA3D.so.0.${version}
-    runHook postInstall
-  '';
-
   meta = {
     description = "Accuracy-focused XNA4 reimplementation for open platforms";
     homepage = "https://fna-xna.github.io/";
-    license = lib.licenses.mspl;
+    license = lib.licenses.zlib;
     platforms = lib.platforms.linux;
-    mainProgram = "fna3d";
     maintainers = with lib.maintainers; [ mrtnvgr ];
   };
 }
diff --git a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch b/pkgs/by-name/fo/folly/fix-stdexcept-include.patch
deleted file mode 100644
index c13632abf599..000000000000
--- a/pkgs/by-name/fo/folly/fix-stdexcept-include.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From dc06cc3162afb148c19cd0931d8fe489d639217a Mon Sep 17 00:00:00 2001
-From: Uilian Ries <uilianries@gmail.com>
-Date: Tue, 9 Sep 2025 16:48:26 +0200
-Subject: [PATCH] Add missing header for std::runtime_error
-
-Signed-off-by: Uilian Ries <uilianries@gmail.com>
----
- folly/hash/Checksum.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/folly/hash/Checksum.cpp b/folly/hash/Checksum.cpp
-index 1d42d6a6e5f..aeafdb20b1b 100644
---- a/folly/hash/Checksum.cpp
-+++ b/folly/hash/Checksum.cpp
-@@ -17,6 +17,7 @@
- #include <folly/hash/Checksum.h>
- 
- #include <algorithm>
-+#include <stdexcept>
- 
- #include <boost/crc.hpp>
- 
diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix
index cce2c4aee1c9..2e6584d32482 100644
--- a/pkgs/by-name/fo/folly/package.nix
+++ b/pkgs/by-name/fo/folly/package.nix
@@ -41,7 +41,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "folly";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   # split outputs to reduce downstream closure sizes
   outputs = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebook";
     repo = "folly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-//gx081nMFXAcUgkHQToiFHhECfLW22Fl0eXEsObxUs=";
+    hash = "sha256-k7PGxYF3HlNc5nPBV+MkELya/4yllkaMA37vcfES4NE=";
   };
 
   nativeBuildInputs = [
@@ -145,16 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-QGNpS5UNEm+0PW9+agwUVILzpK9t020KXDGyP03OAwE=";
     })
 
-    # Fix an upstream regression with libstdc++.
-    #
-    # See:
-    #
-    # * <https://github.com/facebook/folly/issues/2487>
-    # * <https://github.com/facebook/folly/commit/bdbb73e0069b4084c83b7dd9b02c3118d37e2a8d>
-    # * <https://github.com/facebook/folly/pull/2490>
-    # * <https://github.com/facebook/folly/pull/2497>
-    ./fix-stdexcept-include.patch
-
     # Fix a GCC‐incompatible use of a private trait.
     #
     # Per Folly’s own documentation:
@@ -237,6 +227,7 @@ stdenv.mkDerivation (finalAttrs: {
       pierreis
       emily
       techknowlogick
+      lf-
     ];
   };
 })
diff --git a/pkgs/by-name/fo/foma/package.nix b/pkgs/by-name/fo/foma/package.nix
index 54a756a21b5e..12b0823e703b 100644
--- a/pkgs/by-name/fo/foma/package.nix
+++ b/pkgs/by-name/fo/foma/package.nix
@@ -9,16 +9,15 @@
   readline,
   zlib,
 }:
-
 stdenv.mkDerivation rec {
   pname = "foma";
-  version = "0.10.0alpha-unstable-2024-03-13";
+  version = "0.10.0alpha-unstable-2025-09-10";
 
   src = fetchFromGitHub {
     owner = "mhulden";
     repo = "foma";
-    rev = "e0d8122bda4bbd56f18510bdfe840617f9736ae7";
-    hash = "sha256-UbwuHTilKWo4sVD3igcSlTqH78N6JQFvRD35QwfoX10=";
+    rev = "91f91866af843aec487313d028dbd1f76b5fb1a5";
+    hash = "sha256-CXRZNcEgsjD/9PowNynPyfLVbk8KDe3T52UetYMwC6w=";
   };
 
   sourceRoot = "${src.name}/foma";
diff --git a/pkgs/by-name/fo/font-bh-100dpi/package.nix b/pkgs/by-name/fo/font-bh-100dpi/package.nix
new file mode 100644
index 000000000000..7932de16aa13
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-100dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/Y9e/oSR+qvdJ0SAjT1Or9rlyD5hcBfH/d0nFtBJqx4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Luxi 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-100dpi";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-bh-75dpi/package.nix b/pkgs/by-name/fo/font-bh-75dpi/package.nix
new file mode 100644
index 000000000000..c970a3826f54
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-75dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YCbYwHNWPdPLtIeNAHbu2XDeur0hQjs7Yd2QRBuefNo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Luxi 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-75dpi";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
new file mode 100644
index 000000000000..7f80b188a61d
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-lucidatypewriter-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-duwJ7aQJSinUe5HPWcProinI99HKa64qu7P5JeM96PI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Lucida Sans Typewriter 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi";
+    # no license just a copyright notice
+    license = lib.licenses.unfree;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
new file mode 100644
index 000000000000..696a05e0e0e1
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-lucidatypewriter-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-hk4sOaxh8E9pP8LIqq7SSymMLNQCg87BLu5FnFY16PU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Lucida Sans Typewriter 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi";
+    # no license just a copyright notice
+    license = lib.licenses.unfree;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
new file mode 100644
index 000000000000..380c99a83401
--- /dev/null
+++ b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bitstream-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bitstream-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LRzGgu/k9+vfX72Ilh2MoysnKZaHKGM96iChYnaQwac=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Bitstream Charter and Terminal 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-100dpi";
+    license = with lib.licenses; [
+      hpnd
+      # TODO: change this license or remove this comment when
+      # https://github.com/spdx/license-list-XML/issues/2824
+      # gets resolved
+      xfig
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
new file mode 100644
index 000000000000..3dd6e249b0df
--- /dev/null
+++ b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bitstream-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bitstream-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qus02HQkqcKwzw6FkHBMkMtbQsajtqDvnkZ273c7+CY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Bitstream Charter and Terminal 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi";
+    license = with lib.licenses; [
+      hpnd
+      # TODO: change this license or remove this comment when
+      # https://github.com/spdx/license-list-XML/issues/2824
+      # gets resolved
+      xfig
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-bitstream-type1/package.nix b/pkgs/by-name/fo/font-bitstream-type1/package.nix
new file mode 100644
index 000000000000..0fe3b97a951a
--- /dev/null
+++ b/pkgs/by-name/fo/font-bitstream-type1/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  fontforge,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bitstream-type1";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bitstream-type1-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3i8ji0zXLbQiigumeCnXait8A54imT1mpyLuOFJIxig=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    mkfontscale
+    fontforge
+  ];
+
+  postBuild = ''
+    # convert Postscript (Type 1) font to otf
+    for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do
+        name=$(basename $i | cut -d. -f1)
+        fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")"
+    done
+  '';
+
+  postInstall = ''
+    # install the otf fonts
+    fontDir="$out/share/fonts/X11/otf"
+    install -Dm444 -t "$fontDir" *.otf
+    mkfontscale "$fontDir"
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Bitstream Charter PostScript Type 1 and OpenType fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-type1";
+    license = lib.licenses.bitstreamCharter;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix b/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
new file mode 100644
index 000000000000..ebc6e229669d
--- /dev/null
+++ b/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-cronyx-cyrillic";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-cronyx-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3AeBzg3L/9v2quGgAXOhNAP5Kw3pJbylqeEX5OLWt4k=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Cronyx pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic";
+    license = lib.licenses.cronyx;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-isas-misc/package.nix b/pkgs/by-name/fo/font-isas-misc/package.nix
new file mode 100644
index 000000000000..d58c4fed6b00
--- /dev/null
+++ b/pkgs/by-name/fo/font-isas-misc/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-isas-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-isas-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-R+WVu+baREufb8qiZTmrx7oZieI6+mzcSeIuSEzEOPw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Isas Fangsong ti & Song ti pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/isas-misc";
+    license = lib.licenses.hpnd;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-micro-misc/package.nix b/pkgs/by-name/fo/font-micro-misc/package.nix
new file mode 100644
index 000000000000..4a11aa3d5bdf
--- /dev/null
+++ b/pkgs/by-name/fo/font-micro-misc/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-micro-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-micro-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LuC51r166Emv8b2C76tEobazaPu14R0S/38BWj32+UM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Micro pcf font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/micro-misc";
+    license = lib.licenses.publicDomain;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-misc-cyrillic/package.nix b/pkgs/by-name/fo/font-misc-cyrillic/package.nix
new file mode 100644
index 000000000000..491326daf9c7
--- /dev/null
+++ b/pkgs/by-name/fo/font-misc-cyrillic/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-misc-cyrillic";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-misc-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-dgIaf1MGQAGRSlf9CO+uV/draPCiTcqKsbJFR07o6ZM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Misc Cyrillic pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/misc-cyrillic";
+    license = with lib.licenses; [
+      publicDomain
+      cronyx
+      # misc free
+      # "May be distributed and modified without restrictions."
+      free
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-misc-ethiopic/package.nix b/pkgs/by-name/fo/font-misc-ethiopic/package.nix
new file mode 100644
index 000000000000..863e1cc39045
--- /dev/null
+++ b/pkgs/by-name/fo/font-misc-ethiopic/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-misc-ethiopic";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-misc-ethiopic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-R0mn5uGh7vbJH8yaBOixwO0CfUDBWZ5abJMnDYRpthI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ mkfontscale ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Ge'ez Frontiers Foundation's Zemen OpenType and TrueType fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/misc-ethiopic";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-schumacher-misc/package.nix b/pkgs/by-name/fo/font-schumacher-misc/package.nix
new file mode 100644
index 000000000000..c83b593c16aa
--- /dev/null
+++ b/pkgs/by-name/fo/font-schumacher-misc/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-schumacher-misc";
+  version = "1.1.3";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-schumacher-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-i4SfDNseVaNMw92LD7N0Q/q7wiTVukQIVWlYEkSmgHA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Schumacher pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/schumacher-misc";
+    license = lib.licenses.hpnd;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-screen-cyrillic/package.nix b/pkgs/by-name/fo/font-screen-cyrillic/package.nix
new file mode 100644
index 000000000000..bea6992d9b24
--- /dev/null
+++ b/pkgs/by-name/fo/font-screen-cyrillic/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-screen-cyrillic";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-screen-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-j3WLuM1YDH5lVIfR0Ntp0xmsrlTZMrKV2W2dm4P95cA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Screen Cyrillic pcf font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/screen-cyrillic";
+    license = lib.licenses.cronyx;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-sony-misc/package.nix b/pkgs/by-name/fo/font-sony-misc/package.nix
new file mode 100644
index 000000000000..8562279b8678
--- /dev/null
+++ b/pkgs/by-name/fo/font-sony-misc/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-sony-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-sony-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5rCfgj/MsG4L0LIGIoO2UUFTMjvYp0hunC4/VauElGs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Sony pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/sony-misc";
+    license = lib.licenses.hpnd;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-sun-misc/package.nix b/pkgs/by-name/fo/font-sun-misc/package.nix
new file mode 100644
index 000000000000..bc8eb50a71c5
--- /dev/null
+++ b/pkgs/by-name/fo/font-sun-misc/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-sun-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-sun-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3YTdEW2Sev+k+g+ilyez7PwPBkI4gXwKHlUqCsOE258=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Open Look Glyph and Cursor pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/sun-misc/";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
new file mode 100644
index 000000000000..efbee8e3633e
--- /dev/null
+++ b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-winitzki-cyrillic";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-winitzki-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-O22CEi3BR3bjr82HeDOng04fkAxT/Bx7stZ8eBz6l6g=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Winitzki Proof Cyrillic pcf font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/winitzki-cyrillic";
+    license = lib.licenses.publicDomain;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/font-xfree86-type1/package.nix b/pkgs/by-name/fo/font-xfree86-type1/package.nix
new file mode 100644
index 000000000000..6d8e451f8594
--- /dev/null
+++ b/pkgs/by-name/fo/font-xfree86-type1/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-xfree86-type1";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-xfree86-type1-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qTwseIpeocACr3yGYs+dmCH7HfUbjSssXgAm39/qSDc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ mkfontscale ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "XFree86 Cusrsor Postscript Type 1 Font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/xfree86-type1";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix
index a95d333f9029..e71104b33a18 100644
--- a/pkgs/by-name/fo/fontfinder/package.nix
+++ b/pkgs/by-name/fo/fontfinder/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mmstick/fontfinder";
     changelog = "https://github.com/mmstick/fontfinder/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fontfinder-gtk";
   };
 }
diff --git a/pkgs/by-name/fo/fontforge/package.nix b/pkgs/by-name/fo/fontforge/package.nix
index c6c3199bb318..610d0cc8771b 100644
--- a/pkgs/by-name/fo/fontforge/package.nix
+++ b/pkgs/by-name/fo/fontforge/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   fetchFromGitHub,
   lib,
-  fetchpatch,
   replaceVars,
   cmake,
   pkg-config,
@@ -34,46 +33,18 @@ assert withGTK -> withGUI;
 let
   py = python3.withPackages (ps: with ps; [ setuptools ]);
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fontforge";
-  version = "20230101";
+  version = "20251009";
 
   src = fetchFromGitHub {
     owner = "fontforge";
     repo = "fontforge";
-    rev = version;
-    sha256 = "sha256-/RYhvL+Z4n4hJ8dmm+jbA1Ful23ni2DbCRZC5A3+pP0=";
+    tag = finalAttrs.version;
+    hash = "sha256-tlpdd+x1mA+HeLXpy5LotNC6sabxI6U7S+m/qOn1jwc=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "CVE-2024-25081.CVE-2024-25082.patch";
-      url = "https://github.com/fontforge/fontforge/commit/216eb14b558df344b206bf82e2bdaf03a1f2f429.patch";
-      hash = "sha256-aRnir09FSQMT50keoB7z6AyhWAVBxjSQsTRvBzeBuHU=";
-    })
-
-    # Replace distutils use in the build script
-    (fetchpatch {
-      name = "replace-distutils.patch";
-      url = "https://github.com/fontforge/fontforge/commit/8c75293e924602ed09a9481b0eeb67ba6c623a81.patch";
-      includes = [ "pyhook/CMakeLists.txt" ];
-      hash = "sha256-3CEwC8vygmCztKRmeD45aZIqyoj8yk5CLwxX2SGP7z4=";
-    })
-
-    # Fixes translation compatibility with gettext 0.22
-    (fetchpatch {
-      name = "update-translation-compatibility.patch";
-      url = "https://github.com/fontforge/fontforge/commit/642d8a3db6d4bc0e70b429622fdf01ecb09c4c10.patch";
-      hash = "sha256-uO9uEhB64hkVa6O2tJKE8BLFR96m27d8NEN9UikNcvg=";
-    })
-
-    # Updates to new Python initialization API
-    (fetchpatch {
-      name = "modern-python-initialization-api.patch";
-      url = "https://github.com/fontforge/fontforge/commit/2f2ba54c15c5565acbde04eb6608868cbc871e01.patch";
-      hash = "sha256-qF4DqFpiZDbULi9+POPM73HF6pEot8BAFSVaVCNQrMU=";
-    })
-
     # Provide a Nix-controlled location for the initial `sys.path` entry.
     (replaceVars ./set-python-sys-path.patch { python = "${py}/${py.sitePackages}"; })
   ];
@@ -128,7 +99,7 @@ stdenv.mkDerivation rec {
 
   preConfigure = ''
     # The way $version propagates to $version of .pe-scripts (https://github.com/dejavu-fonts/dejavu-fonts/blob/358190f/scripts/generate.pe#L19)
-    export SOURCE_DATE_EPOCH=$(date -d ${version} +%s)
+    export SOURCE_DATE_EPOCH=$(date -d ${finalAttrs.version} +%s)
   '';
 
   meta = {
@@ -141,4 +112,4 @@ stdenv.mkDerivation rec {
       ulysseszhan
     ];
   };
-}
+})
diff --git a/pkgs/by-name/fo/foot/package.nix b/pkgs/by-name/fo/foot/package.nix
index 0b2f1cdf6fc8..bafdde217258 100644
--- a/pkgs/by-name/fo/foot/package.nix
+++ b/pkgs/by-name/fo/foot/package.nix
@@ -27,7 +27,7 @@
 }:
 
 let
-  version = "1.24.0";
+  version = "1.25.0";
 
   # build stimuli file for PGO build and the script to generate it
   # independently of the foot's build, so we can cache the result
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
     owner = "dnkl";
     repo = "foot";
     tag = version;
-    hash = "sha256-uex2p28rKBwnqPjO1Pen1GA3a9mEnrcpIb1oIUJv/Lk=";
+    hash = "sha256-s7SwIdkWhBKcq9u4V0FLKW6CA36MBvDyB9ELB0V52O0=";
   };
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix
index 10484c3b568b..eb572dde9377 100644
--- a/pkgs/by-name/fo/forecast/package.nix
+++ b/pkgs/by-name/fo/forecast/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "forecast";
-  version = "0-unstable-2025-10-09";
+  version = "0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "forecast";
-    rev = "f4dca2317007bc3316b22456e36a76d50500ccc8";
-    hash = "sha256-zbL4a5haggMJEN7vbe+v026Qo4BFZvtoH8QaZPmpcBw=";
+    rev = "51814ecac320185911743986e8ab0211140fa456";
+    hash = "sha256-XOqV9Z4l4aTgm2Abec7IE2bk8oX3RsAA8UxZuo6S5l8=";
   };
 
   cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8=";
diff --git a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
index a1bec7e67c7c..8d4524d43522 100644
--- a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
+++ b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
@@ -1,7 +1,7 @@
 diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
 --- a/forge-gui-desktop/pom.xml
 +++ b/forge-gui-desktop/pom.xml
-@@ -71,62 +71,6 @@
+@@ -69,62 +69,6 @@
                  </executions>
              </plugin>
              <plugin>
diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index 30d32b82b259..c8f57b7ddcbb 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -3,10 +3,12 @@
   fetchFromGitHub,
   gnused,
   lib,
+  stdenv,
   maven,
   makeWrapper,
   openjdk,
   libGL,
+  alsa-lib,
   makeDesktopItem,
   copyDesktopItems,
   imagemagick,
@@ -14,13 +16,13 @@
 }:
 
 let
-  version = "2.0.05";
+  version = "2.0.06";
 
   src = fetchFromGitHub {
     owner = "Card-Forge";
     repo = "forge";
     rev = "forge-${version}";
-    hash = "sha256-71CZBI4FvN5X7peDjhv+0cdTYv8hWwzM8ePdvQSb6QI=";
+    hash = "sha256-/V8Ce1r68Svf4TQ/zgIqSWjqIFr1uJOmv+aRNLm1qE4=";
   };
 
   # launch4j downloads and runs a native binary during the package phase.
@@ -31,7 +33,7 @@ maven.buildMavenPackage {
   pname = "forge-mtg";
   inherit version src patches;
 
-  mvnHash = "sha256-krPOUaJTo5i3imkDvEkBJH3W01y1KypdvitqmZ5JMMA=";
+  mvnHash = "sha256-DeYmCmsDdNOVMlD+SwvSB2VdqvCDwKghXlyaDuamHiY=";
 
   doCheck = false; # Needs a running Xorg
 
@@ -106,7 +108,14 @@ maven.buildMavenPackage {
       chmod 555 $out/share/forge/$commandToInstall.sh
       PREFIX_CMD=""
       if [ "$commandToInstall" = "forge-adventure" ]; then
-        PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"
+        PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath (
+            [
+              libGL
+            ]
+            ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]
+          )
+        }"
       fi
 
       makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \
@@ -129,6 +138,9 @@ maven.buildMavenPackage {
     description = "Magic: the Gathering card game with rules enforcement";
     homepage = "https://card-forge.github.io/forge";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ eigengrau ];
+    maintainers = with maintainers; [
+      dyegoaurelio
+      eigengrau
+    ];
   };
 }
diff --git a/pkgs/by-name/fo/forge-mtg/update.sh b/pkgs/by-name/fo/forge-mtg/update.sh
index f46eb254df24..e7d00310c4b4 100755
--- a/pkgs/by-name/fo/forge-mtg/update.sh
+++ b/pkgs/by-name/fo/forge-mtg/update.sh
@@ -109,7 +109,7 @@ update_patch() {
                 fi
             fi
         fi
-    done < <(find "$source_dir" -name "pom.xml" -print0)
+    done < <(find "$source_dir" -name "pom.xml" -print0 | sort -z)
 
     if [[ "$plugin_found" == "true" && -n "$patch_content" ]]; then
         echo "Updating $patch_file..."
diff --git a/pkgs/by-name/fo/forge/no-download-glad.patch b/pkgs/by-name/fo/forge/no-download-glad.patch
deleted file mode 100644
index 0957be82a3b7..000000000000
--- a/pkgs/by-name/fo/forge/no-download-glad.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake
-index ee5c2fc..2f75181 100644
---- a/CMakeModules/ForgeConfigureDepsVars.cmake
-+++ b/CMakeModules/ForgeConfigureDepsVars.cmake
-@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix)
-         URL            ${fdcp_args_URI}
-         URL_HASH       ${fdcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix)
-         QUIET
-         URL            ${fdcp_args_URI}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix)
-         GIT_REPOSITORY ${fdcp_args_URI}
-         GIT_TAG        ${fdcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
diff --git a/pkgs/by-name/fo/forge/package.nix b/pkgs/by-name/fo/forge/package.nix
deleted file mode 100644
index 653f33eab53c..000000000000
--- a/pkgs/by-name/fo/forge/package.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  boost,
-  cmake,
-  expat,
-  fetchFromGitHub,
-  fontconfig,
-  freeimage,
-  freetype,
-  glfw3,
-  glm,
-  lib,
-  libGLU,
-  libGL,
-  libgbm,
-  opencl-clhpp,
-  pkg-config,
-  stdenv,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "forge";
-  version = "1.0.8";
-
-  src = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "forge";
-    rev = "v1.0.8";
-    sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU=";
-  };
-  glad = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "glad";
-    rev = "b94680aee5b8ce01ae1644c5f2661769366c765a";
-    hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U=";
-  };
-
-  # This patch ensures that Forge does not try to fetch glad from GitHub and
-  # uses our sources that we've checked out via Nix.
-  patches = [ ./no-download-glad.patch ];
-
-  postPatch = ''
-    mkdir -p ./extern
-    cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src
-    ln -s ${opencl-clhpp} ./extern/cl2hpp
-  '';
-
-  cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    boost.out
-    boost.dev
-    expat
-    fontconfig
-    freeimage
-    freetype
-    glfw3
-    glm
-    libGL
-    libGLU
-    opencl-clhpp
-    SDL2
-    libgbm
-  ];
-
-  meta = with lib; {
-    description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend";
-    longDescription = ''
-      An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.
-      The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL.
-      Forge uses OpenGL >=3.3 forward compatible contexts, so please make sure you have capable hardware before trying it out.
-    '';
-    license = licenses.bsd3;
-    homepage = "https://arrayfire.com/";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      chessai
-      twesterhout
-    ];
-  };
-}
diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix
index 6f3439873a69..6ee01cf036c0 100644
--- a/pkgs/by-name/fo/forgejo-cli/package.nix
+++ b/pkgs/by-name/fo/forgejo-cli/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       isabelroses
     ];
     mainProgram = "fj";
diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index e25f348ef2ce..121c3ece070d 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -33,6 +33,7 @@ let
     "TestCloneIfRequired"
     "TestActionCache"
     "TestRunContext_GetGitHubContext"
+    "TestSetJobResult_SkipsBannerInChildReusableWorkflow"
 
     # These tests rely on outbound IP address
     "TestHandler"
@@ -41,17 +42,17 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "11.1.2";
+  version = "11.3.1";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-/rkBrG8hRn52M1ybjbWtSDFYsJ4fHzw9qAoc5325g9A=";
+    hash = "sha256-jvHnTCkRvYaejeCiPpr18ldEmxcAkrEIaOLVVBY11eg=";
   };
 
-  vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U=";
+  vendorHash = "sha256-7Ybh5qzkqT3CvGtRXiPkc5ShTYGlyvckTxg4EFagM/c=";
 
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile
@@ -91,6 +92,8 @@ buildGoModule rec {
   };
 
   meta = with lib; {
+    # Cannot process container options: '--pid=host --device=/dev/sda': 'unknown server OS: darwin'
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Runner for Forgejo based on act";
     homepage = "https://code.forgejo.org/forgejo/runner";
     changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}";
diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 9893f9cb8bde..1db5124e8fd5 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -26,6 +26,7 @@
   stdenv,
   fetchFromGitea,
   buildNpmPackage,
+  writableTmpDirAsHomeHook,
 }:
 
 let
@@ -77,6 +78,7 @@ buildGoModule rec {
   nativeCheckInputs = [
     git
     openssh
+    writableTmpDirAsHomeHook
   ];
 
   patches = [
@@ -103,14 +105,12 @@ buildGoModule rec {
     export ldflags+=" -X main.ForgejoVersion=$(GITEA_VERSION=${version} make show-version-api)"
   '';
 
+  # expose and use the GO_TEST_PACKAGES var from the Makefile
+  # instead of manually copying over the entire list:
+  # https://codeberg.org/forgejo/forgejo/src/tag/v11.0.6/Makefile#L128
+  # https://codeberg.org/forgejo/forgejo/src/tag/v13.0.0/Makefile#L290
   preCheck = ''
-    # $HOME is required for ~/.ssh/authorized_keys and such
-    export HOME="$TMPDIR/home"
-
-    # expose and use the GO_TEST_PACKAGES var from the Makefile
-    # instead of manually copying over the entire list:
-    # https://codeberg.org/forgejo/forgejo/src/tag/v7.0.4/Makefile#L124
-    echo -e 'show-backend-tests:\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile
+    echo -e 'show-backend-tests:${lib.optionalString (lib.versionAtLeast version "13") " | compute-go-test-packages"}\n\t@echo ''${GO_TEST_PACKAGES}' >> Makefile
     getGoDirs() {
       make show-backend-tests
     }
diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index 86d29a924da5..74fd06a8370b 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "11.0.6";
-  hash = "sha256-7rX0B1db0HbZa/em3hX+yzAi4rqsDysJPx3dIInGxpY=";
+  version = "11.0.7";
+  hash = "sha256-svNysySAE50rgTXTyPiZDv0lQfYGgdgoc5+9GXxv3Bw=";
   npmDepsHash = "sha256-1lY08jBTx3DRhoaup02076EL9n85y57WCsS/cNcM4aw=";
   vendorHash = "sha256-Jh8u+iCBhYdKcLj4IzcKtJBnzvclvUeYbR/hjMN+cPs=";
   lts = true;
diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index 87ddff6892ee..5e22cdf065b2 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,8 +1,8 @@
 import ./generic.nix {
-  version = "12.0.4";
-  hash = "sha256-g6PNJYiGR7tUpurVL1gvGzJzDoMCLmkGiLLsSZfkbYQ=";
-  npmDepsHash = "sha256-V8FUoL9y36bagkg8Scttv/IzKg+MIIqp7witvT8bSWA=";
-  vendorHash = "sha256-GE3trnaWuAVSEfi11tZo5JXedWOYOMzcHQ3GFyISVTQ=";
+  version = "13.0.2";
+  hash = "sha256-5am/WiRo+ma2ArhnKxQ6cpFl2q7R4g4UwtdnSY/+RIM=";
+  npmDepsHash = "sha256-7WjcMsKPtKUWJfDrJc65ZXq2tjK8+8DnqwINj+0XyiQ=";
+  vendorHash = "sha256-PHItbU27d9ouykUlhr9owylMpF+3wz2vc8c0UTR1RVU=";
   lts = false;
   nixUpdateExtraArgs = [
     "--override-filename"
diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index c0fd7199c5cb..8db1a61165df 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "foundry";
-  version = "1.4.1";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "foundry-rs";
     repo = "foundry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aqJzroRXUT1zO+RyH5QE9ZedapfkIwRmZtAfn0GYEX4=";
+    hash = "sha256-u+JCurH1gx4onC5Poxxd9+gVrUyyebcd6xnXY4Le6Rs=";
   };
 
-  cargoHash = "sha256-wmHC6Jpd+6VUjb21cCQEg11kLW0J4EM+FTQn/boQxRI=";
+  cargoHash = "sha256-JLuCZckiNv0t+kPuDk6TWmPIXKOvqf3HR/oFrQ5fKKQ=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix
index 7417fb6ed407..f07940be3f6d 100644
--- a/pkgs/by-name/fo/foxglove-cli/package.nix
+++ b/pkgs/by-name/fo/foxglove-cli/package.nix
@@ -11,13 +11,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "foxglove-cli";
-  version = "1.0.27";
+  version = "1.0.28";
 
   src = fetchFromGitHub {
     owner = "foxglove";
     repo = "foxglove-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c1Kpy5lT1DCyCq4qcmv+crGgNJ3WSP8TO94NgixY2fQ=";
+    hash = "sha256-LfBcbScb+LxWr3+WJ5Y7Gbup+l3me9PHB/QdFu5tB60=";
   };
 
   vendorHash = "sha256-GjgDRFzW4zqVooHx9WEgWkcnZ+zQsr09OuZxtc9rZD4=";
diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix
index f3b8479644af..0e724c6b9361 100644
--- a/pkgs/by-name/fo/foxglove-studio/package.nix
+++ b/pkgs/by-name/fo/foxglove-studio/package.nix
@@ -20,11 +20,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "foxglove-studio";
-  version = "2.37.0";
+  version = "2.39.1";
 
   src = fetchurl {
     url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb";
-    hash = "sha256-XY+RclsP8uQS5aKe1FopdItAjbQ9uWQ8uVD9pb9n42U=";
+    hash = "sha256-7HVYzKphdpXuKL6e5zD540L5MPFKg0RNZSvW0FCD75k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix
index 3f297e76c125..1236aef59a3f 100644
--- a/pkgs/by-name/fo/foxotron/package.nix
+++ b/pkgs/by-name/fo/foxotron/package.nix
@@ -18,7 +18,6 @@
   alsa-lib,
   fontconfig,
 }:
-
 stdenv.mkDerivation rec {
   pname = "foxotron";
   version = "2024-09-23";
@@ -43,12 +42,17 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" ""
+      --replace-fail "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace externals/glm/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 3.2)" "cmake_policy(VERSION 3.10)"
 
     # Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this
     # Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this
     substituteInPlace externals/assimp/code/CMakeLists.txt \
-      --replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' ""
+      --replace-fail 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' ""
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fp/fparser/package.nix b/pkgs/by-name/fp/fparser/package.nix
index 69506dcb38dc..ba6b540bcbc2 100644
--- a/pkgs/by-name/fp/fparser/package.nix
+++ b/pkgs/by-name/fp/fparser/package.nix
@@ -7,22 +7,22 @@
 
 stdenv.mkDerivation {
   pname = "fparser";
-  version = "0-unstable-2015-09-25";
+  version = "0-unstable-2025-06-23";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "fparser";
-    rev = "a59e1f51e32096bfe2a0a2640d5dffc7ae6ba37b";
-    sha256 = "0wayml1mlyi922gp6am3fsidhzsilziksdn5kbnpcln01h8555ad";
+    rev = "ee15c675514e53b37304179b4a91319d44ba9a85";
+    hash = "sha256-YlkaJlZ60EAsaejdyaV7OK3zF7pnkhyr+PssuToFplA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "C++ Library for Evaluating Mathematical Functions";
     homepage = "https://github.com/thliebig/fparser";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix
index cd4432b931fa..57e2d580238e 100644
--- a/pkgs/by-name/fr/fractal/package.nix
+++ b/pkgs/by-name/fr/fractal/package.nix
@@ -22,6 +22,8 @@
   pipewire,
   libshumate,
   wrapGAppsHook4,
+  blueprint-compiler,
+  bubblewrap,
   sqlite,
   xdg-desktop-portal,
   libseccomp,
@@ -31,19 +33,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fractal";
-  version = "12.1";
+  version = "13";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "fractal";
     tag = finalAttrs.version;
-    hash = "sha256-xeB6N4ljXGzysy5RnDRK1wPiIRUSDcl+5BIdp6NO5ZA=";
+    hash = "sha256-zIB04OIhMSm6OWHalnLO9Ng87dsvsmYurrro3hKwoYU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-CHduzW++BYzasFv/x0Q1T7EaTlo1EqYY2gxQJv+ek0A=";
+    hash = "sha256-5wI74sKytewbRs0T/IQZFEaRTgJcF6HyDEK0mpjy0LU=";
   };
 
   patches = [
@@ -54,16 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     substituteInPlace src/meson.build --replace-fail \
-      "'src' / rust_target / meson.project_name()" \
-      "'src' / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
-  '';
-
-  # Dirty approach to add patches after cargoSetupPostUnpackHook
-  # We should eventually use a cargo vendor patch hook instead
-  preConfigure = ''
-    pushd ../$(stripHash $cargoDeps)/glycin-2.*
-      patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
-    popd
+      "target_dir / rust_target / meson.project_name()" \
+      "target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / meson.project_name()"
   '';
 
   nativeBuildInputs = [
@@ -80,6 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     desktop-file-utils
     appstream-glib
     wrapGAppsHook4
+    blueprint-compiler
   ];
 
   buildInputs = [
@@ -107,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
   preFixup = ''
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${glycin-loaders}/share"
+      --prefix PATH : "${lib.makeBinPath [ bubblewrap ]}"
     )
   '';
 
diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix
new file mode 100644
index 000000000000..df7402cb8877
--- /dev/null
+++ b/pkgs/by-name/fr/framework-tool-tui/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  udev,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "framework-tool-tui";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "grouzen";
+    repo = "framework-tool-tui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI=";
+  };
+
+  cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ udev ];
+
+  meta = {
+    description = "TUI for controlling and monitoring Framework Computers hardware";
+    longDescription = ''
+      A snappy TUI dashboard for controlling and monitoring your Framework Laptop hardware —
+      charging, privacy, lighting, USB PD ports, and more.
+    '';
+    homepage = "https://github.com/grouzen/framework-tool-tui";
+    changelog = "https://github.com/grouzen/framework-tool-tui/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [
+      griffi-gh
+      autra
+    ];
+    mainProgram = "framework-tool-tui";
+  };
+})
diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix
index 54fd2937e012..f5d9a4f51a08 100644
--- a/pkgs/by-name/fr/frawk/package.nix
+++ b/pkgs/by-name/fr/frawk/package.nix
@@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fr/freecad/README.md b/pkgs/by-name/fr/freecad/README.md
deleted file mode 100644
index f3fdae03e150..000000000000
--- a/pkgs/by-name/fr/freecad/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-This package supports the following parameters:
-
-- withWayland (default: true): when false, set QT_QPA_PLATFORM to xcb
-- spaceNavSupport (enabled by default on Linux): whether to enable
-  [spacenavd support](https://spacenav.sourceforge.net/)
-- ifcSupport (default: false): whether to enable ifc support through
-  ifcopenshell
diff --git a/pkgs/by-name/fr/freecad/freecad-utils.nix b/pkgs/by-name/fr/freecad/freecad-utils.nix
index 8d440540d7bf..61705c11ec8e 100644
--- a/pkgs/by-name/fr/freecad/freecad-utils.nix
+++ b/pkgs/by-name/fr/freecad/freecad-utils.nix
@@ -3,7 +3,7 @@
   buildEnv,
   makeWrapper,
   lib,
-  python311,
+  python,
   writeShellScript,
 }:
 let
@@ -36,7 +36,7 @@ let
     if builtins.isString pyt then
       pyt
     else if builtins.isFunction pyt then
-      "${(python311.withPackages pyt)}/lib/python3.11/site-packages"
+      "${(python.withPackages pyt)}/${python.sitePackages}"
     else
       throw "Expected string or function as python paths for freecad"
   );
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 23323780e849..c98d0a4cd32d 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -8,7 +8,6 @@
   fetchFromGitHub,
   fetchpatch,
   fmt,
-  gfortran,
   gts,
   hdf5,
   libGLU,
@@ -19,13 +18,11 @@
   ninja,
   ode,
   opencascade-occt,
+  microsoft-gsl,
   pkg-config,
   python3Packages,
-  spaceNavSupport ? stdenv.hostPlatform.isLinux,
   stdenv,
   swig,
-  vtk,
-  wrapGAppsHook3,
   xercesc,
   yaml-cpp,
   zlib,
@@ -50,9 +47,10 @@ let
     pyyaml # (at least for) PyrateWorkbench
     scipy
     shiboken6
+    vtk
   ];
 
-  freecad-utils = callPackage ./freecad-utils.nix { };
+  freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };
 in
 freecad-utils.makeCustomizable (
   stdenv.mkDerivation (finalAttrs: {
@@ -71,10 +69,8 @@ freecad-utils.makeCustomizable (
       cmake
       ninja
       pkg-config
-      gfortran
       swig
       doxygen
-      wrapGAppsHook3
       qt6.wrapQtAppsHook
     ];
 
@@ -86,21 +82,21 @@ freecad-utils.makeCustomizable (
       hdf5
       libGLU
       libXmu
+      libspnav
       medfile
       ode
-      vtk
       xercesc
       yaml-cpp
       zlib
       opencascade-occt
+      microsoft-gsl
       qt6.qtbase
       qt6.qtsvg
       qt6.qttools
       qt6.qtwayland
       qt6.qtwebengine
     ]
-    ++ pythonDeps
-    ++ lib.optionals spaceNavSupport [ libspnav ];
+    ++ pythonDeps;
 
     patches = [
       ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
@@ -133,24 +129,8 @@ freecad-utils.makeCustomizable (
       "-DFREECAD_USE_PYBIND11=ON"
       "-DBUILD_QT5=OFF"
       "-DBUILD_QT6=ON"
-      "-DSHIBOKEN_INCLUDE_DIR=${python3Packages.shiboken6}/include"
-      "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
-      (
-        "-DPYSIDE_INCLUDE_DIR=${python3Packages.pyside6}/include"
-        + ";${python3Packages.pyside6}/include/PySide6/QtCore"
-        + ";${python3Packages.pyside6}/include/PySide6/QtWidgets"
-        + ";${python3Packages.pyside6}/include/PySide6/QtGui"
-      )
-      "-DPYSIDE_LIBRARY=PySide6::pyside6"
     ];
 
-    # This should work on both x86_64, and i686 linux
-    preBuild = ''
-      export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS";
-    '';
-
-    dontWrapGApps = true;
-
     qtWrapperArgs =
       let
         binPath = lib.makeBinPath [
@@ -162,7 +142,6 @@ freecad-utils.makeCustomizable (
         "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
         "--prefix PATH : ${binPath}"
         "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
-        "\${gappsWrapperArgs[@]}"
       ];
 
     postFixup = ''
diff --git a/pkgs/by-name/fr/freeciv/package.nix b/pkgs/by-name/fr/freeciv/package.nix
index 8e25266351cb..3cca181c3b42 100644
--- a/pkgs/by-name/fr/freeciv/package.nix
+++ b/pkgs/by-name/fr/freeciv/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freeciv";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "freeciv";
     repo = "freeciv";
     tag = "R${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-IlJ51ryoQ7qzIY9n8dmPQdwH8aPjXvRXXO2COOxWRcc=";
+    hash = "sha256-Rl/B71pp5PA6mtRaKs8TbOya18cYxlNmMzVJ4ySVmhY=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/fr/freediameter/package.nix b/pkgs/by-name/fr/freediameter/package.nix
index b08fd258bfe3..2c6f7e16c770 100644
--- a/pkgs/by-name/fr/freediameter/package.nix
+++ b/pkgs/by-name/fr/freediameter/package.nix
@@ -14,13 +14,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "freediameter";
-  version = "1.5.0-unstable-2025-03-16";
+  version = "1.6.0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "freeDiameter";
     repo = "freeDiameter";
-    rev = "8e525acdfd439995f3e8e26d5a802fc4ad95d24c";
-    hash = "sha256-ai2R8scP++tdPh303RAl0qdIpehzFoyykAuAyl2w3MA=";
+    rev = "9d4bc47584bfeced9de708fe00f5629ac4689db5";
+    hash = "sha256-NHOsmRfdBXN59lGZAlDzwEqEkekZaux3shaGhP87Rdc=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index 59e81b9cc729..b558288d28d7 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -25,6 +25,18 @@
 }:
 
 let
+  ebur128Src = fetchFromGitHub {
+    owner = "jiixyj";
+    repo = "libebur128";
+    rev = "v1.2.6";
+    hash = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";
+  };
+  mimallocSrc = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "mimalloc";
+    tag = "v2.2.4";
+    hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
+  };
   radaeSrc = fetchFromGitHub {
     owner = "drowe67";
     repo = "radae";
@@ -34,13 +46,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freedv";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "freedv-gui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+hVh5GgSz8MWib10dVV6gx9EvocvLAJm2Eid/4y//2E=";
+    hash = "sha256-awWeq0ueKAK+4mAM0Nv3SsSv/mIFQ+/TqCPw9wjed1w=";
   };
 
   patches = [
@@ -48,11 +60,20 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
+    cp -R ${ebur128Src} ebur128
+    cp -R ${mimallocSrc} mimalloc
     cp -R ${radaeSrc} radae
-    chmod -R u+w radae
+    chmod -R u+w ebur128 mimalloc radae
     substituteInPlace radae/cmake/BuildOpus.cmake \
       --replace-fail "https://gitlab.xiph.org/xiph/opus/-/archive/main/opus-main.tar.gz" "${libopus.src}" \
       --replace-fail "./autogen.sh && " ""
+    substituteInPlace cmake/BuildEbur128.cmake \
+      --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \
+      --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \
+      --replace-fail "git apply" "patch -p1 <"
+    substituteInPlace cmake/BuildMimalloc.cmake \
+      --replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \
+      --replace-fail "GIT_TAG        v2.2.4" ""
     substituteInPlace cmake/BuildRADE.cmake \
       --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \
       --replace-fail "GIT_TAG main" ""
diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index e112d25a82fe..4397b47e08d5 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -29,6 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/freeglut/freeglut/commit/2294389397912c9a6505a88221abb7dca0a4fb79.patch";
       hash = "sha256-buNhlVUbDekklnar6KFWN/GUKE+jMEqTGrY3LY0LwVs=";
     })
+
+    # Fix build with gcc15
+    # https://github.com/freeglut/freeglut/pull/187
+    (fetchpatch {
+      name = "freeglut-fix-fgPlatformDestroyContext-prototype-for-C23.patch";
+      url = "https://github.com/freeglut/freeglut/commit/800772e993a3ceffa01ccf3fca449d3279cde338.patch";
+      hash = "sha256-agXw3JHq81tx5514kkorvuU5mX4E3AV930hy1OJl4L0=";
+    })
   ];
 
   outputs = [
diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch
deleted file mode 100644
index 059bb5a520c2..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp	2023-09-28 19:34:45.524031668 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp	2023-09-28 19:34:47.717009813 +0200
-@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han
- 	int width  = bmih.biWidth;
- 	int height = bmih.biHeight / 2; // height == xor + and mask
- 	unsigned bit_count = bmih.biBitCount;
-+	if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) {
-+	  return NULL;
-+	}
- 	unsigned line   = CalculateLine(width, bit_count);
- 	unsigned pitch  = CalculatePitch(line);
- 
diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch
deleted file mode 100644
index d457ae51fe07..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.287014100 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.832008666 +0200
-@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io,
- 		FreeImage_Unload(_dib);
- 	}
- 
-+	if (_WidthBytes != _Width * _BitPerPixel / 8) {
-+	  throw "Invalid PSD image";
-+	}
-+
- 	if(_Format == 1) {
- 		// kJpegRGB thumbnail image
- 		_dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle);
diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch
deleted file mode 100644
index 2f3bac236737..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.936007630 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.940007590 +0200
-@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI
- 	const unsigned dstBpp =  (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8;
- 	const unsigned dstLineSize = FreeImage_GetPitch(bitmap);
- 	BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped
-+	const unsigned dst_buffer_size = dstLineSize * nHeight;
- 
- 	BYTE* line_start = new BYTE[lineSize]; //< fileline cache
- 
-@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI
- 				const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes;
- 
- 				BYTE* dst_line_start = dst_first_line + channelOffset;
-+				if (channelOffset + lineSize > dst_buffer_size) {
-+					throw "Invalid PSD image";
-+				}
- 				for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped
- 					io->read_proc(line_start, lineSize, 1, handle);
- 					ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes);
diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch b/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch
deleted file mode 100644
index 655a8e7f70cc..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp	2023-09-28 19:34:45.003036859 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp	2023-09-28 19:34:47.505011926 +0200
-@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const
- 	//
- 
- 	const WORD entriesCount0th = ReadUint16(msb_order, ifd0th);
--	
--	DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th));
-+
-+	const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th);
-+	if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) {
-+		return TRUE; //< no thumbnail
-+	}
-+
-+	DWORD next_offset = ReadUint32(msb_order, de_addr);
- 	if((next_offset == 0) || (next_offset >= dwLength)) {
- 		return TRUE; //< no thumbnail
- 	}
diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch
deleted file mode 100644
index 11681c372be3..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:47.713009853 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:48.043006563 +0200
-@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle,
- 				uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif);
- 				uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif);
- 
-+				if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) {
-+				  free(tileBuffer);
-+				  throw "Corrupted tiled TIFF file";
-+				}
-+
- 
- 				// In the tiff file the lines are saved from up to down 
- 				// In a DIB the lines must be saved from down to up
diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch
deleted file mode 100644
index 8526f9814851..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:47.501011966 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:47.610010879 +0200
-@@ -372,6 +372,10 @@ static void
- ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) {
- 	RGBQUAD *pal = FreeImage_GetPalette(dib);
- 
-+	if (!pal) {
-+	  return;
-+	}
-+
- 	switch(photometric) {
- 		case PHOTOMETRIC_MINISBLACK:	// bitmap and greyscale image types
- 		case PHOTOMETRIC_MINISWHITE:
diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch
deleted file mode 100644
index ccd623b81fa1..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp	2024-03-10 14:22:17.818579271 +0100
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp	2024-03-10 14:22:18.776573816 +0100
-@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle,
- 
- 			jpeg_read_header(&cinfo, TRUE);
- 
-+			if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) {
-+				throw FI_MSG_ERROR_DIB_MEMORY;
-+			}
-+
- 			// step 4: set parameters for decompression
- 
- 			unsigned int scale_denom = 1;		// fraction by which to scale image
diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch
deleted file mode 100644
index 2969c738c509..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp	2024-03-10 14:22:18.669574426 +0100
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp	2024-03-10 14:22:18.673574403 +0100
-@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle,
- 				(int)bitspersample, (int)samplesperpixel, (int)photometric);
- 			throw (char*)NULL;
- 		}
-+		if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) {
-+			FreeImage_OutputMessageProc(s_format_id,
-+				"Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE"
-+			);
-+			throw (char*)NULL;
-+		}
- 
- 		// ---------------------------------------------------------------------------------
- 
diff --git a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff b/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff
deleted file mode 100644
index 13abd5dd7089..000000000000
--- a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with libtiff 4.4.0 by not using a private libtiff API.
-Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/
-
-diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
---- a/Source/Metadata/XTIFF.cpp
-+++ b/Source/Metadata/XTIFF.cpp
-@@ -749,7 +749,7 @@
- 				continue;
- 			}
- 			// type of storage may differ (e.g. rationnal array vs float array type)
--			if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
-+			if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) {
- 				// skip tag or _TIFFmemcpy will fail
- 				continue;
- 			}
diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix
deleted file mode 100644
index e541840df2b5..000000000000
--- a/pkgs/by-name/fr/freeimage/package.nix
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchsvn,
-  cctools,
-  libtiff,
-  libpng,
-  zlib,
-  libwebp,
-  libraw,
-  openexr,
-  openjpeg,
-  libjpeg,
-  jxrlib,
-  pkg-config,
-  fixDarwinDylibNames,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "freeimage";
-  version = "3.18.0-unstable-2024-04-18";
-
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/freeimage/svn/";
-    rev = "1911";
-    hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius=";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk";
-
-  # Ensure that the bundled libraries are not used at all
-  prePatch = ''
-    rm -rf Source/Lib* Source/OpenEXR Source/ZLib
-  '';
-
-  # Tell patch to work with trailing carriage returns
-  patchFlags = [
-    "-p1"
-    "--binary"
-  ];
-
-  patches = [
-    ./unbundle.diff
-    ./CVE-2020-24292.patch
-    ./CVE-2020-24293.patch
-    ./CVE-2020-24295.patch
-    ./CVE-2021-33367.patch
-    ./CVE-2021-40263.patch
-    ./CVE-2021-40266.patch
-    ./CVE-2023-47995.patch
-    ./CVE-2023-47997.patch
-  ];
-
-  postPatch = ''
-    # To support cross compilation, use the correct `pkg-config`.
-    substituteInPlace Makefile.fip \
-      --replace "pkg-config" "$PKG_CONFIG"
-    substituteInPlace Makefile.gnu \
-      --replace "pkg-config" "$PKG_CONFIG"
-  ''
-  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-    # Upstream Makefile hardcodes i386 and x86_64 architectures only
-    substituteInPlace Makefile.osx --replace "x86_64" "arm64"
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-    fixDarwinDylibNames
-  ];
-
-  buildInputs = [
-    libtiff
-    libtiff.dev_private
-    libpng
-    zlib
-    libwebp
-    libraw
-    openexr
-    openjpeg
-    libjpeg
-    libjpeg.dev_private
-    jxrlib
-  ];
-
-  postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    make -f Makefile.fip
-  '';
-
-  INCDIR = "${placeholder "out"}/include";
-  INSTALLDIR = "${placeholder "out"}/lib";
-
-  preInstall = ''
-    mkdir -p $INCDIR $INSTALLDIR
-  ''
-  # Workaround for Makefiles.osx not using ?=
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" )
-  '';
-
-  postInstall =
-    lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      make -f Makefile.fip install
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib
-    '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Open Source library for accessing popular graphics image file formats";
-    homepage = "http://freeimage.sourceforge.net/";
-    license = with lib.licenses; [
-      freeimage
-      gpl2Only
-      gpl3Only
-    ];
-    knownVulnerabilities = [
-      "CVE-2024-31570"
-      "CVE-2024-28584"
-      "CVE-2024-28583"
-      "CVE-2024-28582"
-      "CVE-2024-28581"
-      "CVE-2024-28580"
-      "CVE-2024-28579"
-      "CVE-2024-28578"
-      "CVE-2024-28577"
-      "CVE-2024-28576"
-      "CVE-2024-28575"
-      "CVE-2024-28574"
-      "CVE-2024-28573"
-      "CVE-2024-28572"
-      "CVE-2024-28571"
-      "CVE-2024-28570"
-      "CVE-2024-28569"
-      "CVE-2024-28568"
-      "CVE-2024-28567"
-      "CVE-2024-28566"
-      "CVE-2024-28565"
-      "CVE-2024-28564"
-      "CVE-2024-28563"
-      "CVE-2024-28562"
-      "CVE-2024-9029"
-      # "CVE-2023-47997"
-      "CVE-2023-47996"
-      # "CVE-2023-47995"
-      "CVE-2023-47994"
-      "CVE-2023-47993"
-      "CVE-2023-47992"
-      # "CVE-2021-40266"
-      "CVE-2021-40265"
-      "CVE-2021-40264"
-      # "CVE-2021-40263"
-      "CVE-2021-40262"
-      # "CVE-2021-33367"
-      # "CVE-2020-24295"
-      "CVE-2020-24294"
-      # "CVE-2020-24293"
-      # "CVE-2020-24292"
-      "CVE-2020-21426"
-      "CVE-2019-12214"
-      "CVE-2019-12212"
-    ];
-    maintainers = [ ];
-    platforms = with lib.platforms; unix;
-  };
-})
diff --git a/pkgs/by-name/fr/freeimage/unbundle.diff b/pkgs/by-name/fr/freeimage/unbundle.diff
deleted file mode 100644
index 66df1176bca9..000000000000
--- a/pkgs/by-name/fr/freeimage/unbundle.diff
+++ /dev/null
@@ -1,584 +0,0 @@
-diff --git a/Makefile.fip b/Makefile.fip
-index 660a0265..86b30401 100644
---- a/Makefile.fip
-+++ b/Makefile.fip
-@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
- 
-+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+
- # C flags
- CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden
--# OpenJPEG
--CFLAGS += -DOPJ_STATIC
--# LibRaw
--CFLAGS += -DNO_LCMS
--# LibJXR
--CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
- CFLAGS += $(INCLUDE)
- 
- # C++ flags
- CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
--# LibJXR
--CXXFLAGS += -D__ANSI__
- CXXFLAGS += $(INCLUDE)
- 
--ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
--	CFLAGS += -fPIC
--	CXXFLAGS += -fPIC
--endif
--
- TARGET  = freeimageplus
- STATICLIB = lib$(TARGET).a
- SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-@@ -76,10 +65,10 @@ $(SHAREDLIB): $(MODULES)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- 
-diff --git a/Makefile.gnu b/Makefile.gnu
-index a4f26013..be954761 100644
---- a/Makefile.gnu
-+++ b/Makefile.gnu
-@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
- 
-+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+
- # C flags
- CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden
--# OpenJPEG
--CFLAGS += -DOPJ_STATIC
--# LibRaw
--CFLAGS += -DNO_LCMS
--# LibJXR
--CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
- CFLAGS += $(INCLUDE)
- 
- # C++ flags
- CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
--# LibJXR
--CXXFLAGS += -D__ANSI__
- CXXFLAGS += $(INCLUDE)
- 
--ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
--	CFLAGS += -fPIC
--	CXXFLAGS += -fPIC
--endif
--
- TARGET  = freeimage
- STATICLIB = lib$(TARGET).a
- SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-@@ -75,12 +64,11 @@ $(SHAREDLIB): $(MODULES)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
--#	ldconfig
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
-diff --git a/Makefile.osx b/Makefile.osx
-index c39121db..3800e39d 100644
---- a/Makefile.osx
-+++ b/Makefile.osx
-@@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path)
- MACOSX_DEPLOYMENT_TARGET = 10.11
- 
- # General configuration variables:
--CC_I386 = $(shell xcrun -find clang)
--CC_X86_64 = $(shell xcrun -find clang)
--CPP_I386 = $(shell xcrun -find clang++)
--CPP_X86_64 = $(shell xcrun -find clang++)
-+CC_I386 = clang
-+CC_X86_64 = clang
-+CPP_I386 = clang++
-+CPP_X86_64 = clang++
- MACOSX_DEPLOY = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
- COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__
- COMPILERFLAGS_I386 = -arch i386
- COMPILERFLAGS_X86_64 = -arch x86_64
- COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing
--INCLUDE +=
--INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT)
--INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT)
-+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+INCLUDE_I386 =
-+INCLUDE_X86_64 =
- CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) $(MACOSX_DEPLOY)
- CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) $(MACOSX_DEPLOY)
- CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386)
- CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64)
--LIBRARIES_I386 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT)
--LIBRARIES_X86_64 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT)
-+LIBS = $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+LIBRARIES_I386 = $(LIBS) $(MACOSX_DEPLOY)
-+LIBRARIES_X86_64 = $(LIBS) $(MACOSX_DEPLOY)
- LIBTOOL = libtool
- LIPO = lipo
- 
-@@ -57,7 +58,7 @@ dist: FreeImage
- 	cp *.a Dist
- 	cp Source/FreeImage.h Dist
- 
--FreeImage: $(STATICLIB)
-+FreeImage: $(STATICLIB) $(SHAREDLIB)
- 
- $(STATICLIB): $(STATICLIB)-x86_64
- 	cp -p $(STATICLIB)-x86_64 $(STATICLIB)
-@@ -84,13 +85,10 @@ $(STATICLIB)-i386: $(MODULES_I386)
- $(STATICLIB)-x86_64: $(MODULES_X86_64)
- 	$(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64)
- 
--$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
--	$(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
--
- $(SHAREDLIB)-i386: $(MODULES_I386)
- 	$(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
- 
--$(SHAREDLIB)-x86_64: $(MODULES_X86_64)
-+$(SHAREDLIB): $(MODULES_X86_64)
- 	$(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64)
- 
- .c.o-i386:
-@@ -106,9 +104,8 @@ $(SHAREDLIB)-x86_64: $(MODULES_X86_64)
- 	$(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@
- 
- install:
--	install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g wheel $(HEADER) $(INCDIR)
--	install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR)
-+	install $(HEADER) $(INCDIR)
-+	install $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR)
- 	ranlib -sf $(INSTALLDIR)/$(STATICLIB)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
- 
-diff --git a/Makefile.srcs b/Makefile.srcs
-index 692c6e56..212195b2 100644
---- a/Makefile.srcs
-+++ b/Makefile.srcs
-@@ -1,6 +1,6 @@
- VER_MAJOR = 3
- VER_MINOR = 19.0
--SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c 
--INCLS = ./Dist/x64/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h
-+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp 
-+INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h
- 
--INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib
-+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit
-diff --git a/Source/FreeImage.h b/Source/FreeImage.h
-index 2dfb9ee2..d2d32322 100644
---- a/Source/FreeImage.h
-+++ b/Source/FreeImage.h
-@@ -155,8 +155,8 @@ typedef uint8_t BYTE;
- typedef uint16_t WORD;
- typedef uint32_t DWORD;
- typedef int32_t LONG;
--typedef int64_t INT64;
--typedef uint64_t UINT64;
-+#define INT64 int64_t
-+#define UINT64 uint64_t
- #else
- // MS is not C99 ISO compliant
- typedef long BOOL;
-diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
-index 062b49ee..0e79fbc5 100644
---- a/Source/FreeImage/J2KHelper.cpp
-+++ b/Source/FreeImage/J2KHelper.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // --------------------------------------------------------------------------
-diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
-index b2864303..9bf3ada9 100644
---- a/Source/FreeImage/PluginEXR.cpp
-+++ b/Source/FreeImage/PluginEXR.cpp
-@@ -28,16 +28,16 @@
- #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
- #endif 
- 
--#include "../OpenEXR/IlmImf/ImfIO.h"
--#include "../OpenEXR/Iex/Iex.h"
--#include "../OpenEXR/IlmImf/ImfOutputFile.h"
--#include "../OpenEXR/IlmImf/ImfInputFile.h"
--#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
--#include "../OpenEXR/IlmImf/ImfChannelList.h"
--#include "../OpenEXR/IlmImf/ImfRgba.h"
--#include "../OpenEXR/IlmImf/ImfArray.h"
--#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
--#include "../OpenEXR/Half/half.h"
-+#include <OpenEXR/ImfIO.h>
-+#include <OpenEXR/Iex.h>
-+#include <OpenEXR/ImfOutputFile.h>
-+#include <OpenEXR/ImfInputFile.h>
-+#include <OpenEXR/ImfRgbaFile.h>
-+#include <OpenEXR/ImfChannelList.h>
-+#include <OpenEXR/ImfRgba.h>
-+#include <OpenEXR/ImfArray.h>
-+#include <OpenEXR/ImfPreviewImage.h>
-+#include <OpenEXR/half.h>
- 
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp
-index 4680aa32..7d4b5ce6 100644
---- a/Source/FreeImage/PluginG3.cpp
-+++ b/Source/FreeImage/PluginG3.cpp
-@@ -20,7 +20,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffiop.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
-index b8bcfc8b..621a9037 100644
---- a/Source/FreeImage/PluginJ2K.cpp
-+++ b/Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
-index 742fe2c0..c57f6267 100644
---- a/Source/FreeImage/PluginJP2.cpp
-+++ b/Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
-index 8db177d2..a7de6378 100644
---- a/Source/FreeImage/PluginJPEG.cpp
-+++ b/Source/FreeImage/PluginJPEG.cpp
-@@ -35,9 +35,9 @@ extern "C" {
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
- 
- #include "FreeImage.h"
-@@ -484,116 +484,6 @@ marker_is_icc(jpeg_saved_marker_ptr marker) {
- 	return FALSE;
- }
- 
--/**
--  See if there was an ICC profile in the JPEG file being read;
--  if so, reassemble and return the profile data.
--
--  TRUE is returned if an ICC profile was found, FALSE if not.
--  If TRUE is returned, *icc_data_ptr is set to point to the
--  returned data, and *icc_data_len is set to its length.
--  
--  IMPORTANT: the data at **icc_data_ptr has been allocated with malloc()
--  and must be freed by the caller with free() when the caller no longer
--  needs it.  (Alternatively, we could write this routine to use the
--  IJG library's memory allocator, so that the data would be freed implicitly
--  at jpeg_finish_decompress() time.  But it seems likely that many apps
--  will prefer to have the data stick around after decompression finishes.)
--  
--  NOTE: if the file contains invalid ICC APP2 markers, we just silently
--  return FALSE.  You might want to issue an error message instead.
--*/
--static BOOL 
--jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
--	jpeg_saved_marker_ptr marker;
--	int num_markers = 0;
--	int seq_no;
--	JOCTET *icc_data;
--	unsigned total_length;
--
--	const int MAX_SEQ_NO = 255;			// sufficient since marker numbers are bytes
--	BYTE marker_present[MAX_SEQ_NO+1];	// 1 if marker found
--	unsigned data_length[MAX_SEQ_NO+1];	// size of profile data in marker
--	unsigned data_offset[MAX_SEQ_NO+1];	// offset for data in marker
--	
--	*icc_data_ptr = NULL;		// avoid confusion if FALSE return
--	*icc_data_len = 0;
--	
--	/**
--	this first pass over the saved markers discovers whether there are
--	any ICC markers and verifies the consistency of the marker numbering.
--	*/
--	
--	memset(marker_present, 0, (MAX_SEQ_NO + 1));
--	
--	for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
--		if (marker_is_icc(marker)) {
--			if (num_markers == 0) {
--				// number of markers
--				num_markers = GETJOCTET(marker->data[13]);
--			}
--			else if (num_markers != GETJOCTET(marker->data[13])) {
--				return FALSE;		// inconsistent num_markers fields 
--			}
--			// sequence number
--			seq_no = GETJOCTET(marker->data[12]);
--			if (seq_no <= 0 || seq_no > num_markers) {
--				return FALSE;		// bogus sequence number 
--			}
--			if (marker_present[seq_no]) {
--				return FALSE;		// duplicate sequence numbers 
--			}
--			marker_present[seq_no] = 1;
--			data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE;
--		}
--	}
--	
--	if (num_markers == 0)
--		return FALSE;
--		
--	/**
--	check for missing markers, count total space needed,
--	compute offset of each marker's part of the data.
--	*/
--	
--	total_length = 0;
--	for(seq_no = 1; seq_no <= num_markers; seq_no++) {
--		if (marker_present[seq_no] == 0) {
--			return FALSE;		// missing sequence number
--		}
--		data_offset[seq_no] = total_length;
--		total_length += data_length[seq_no];
--	}
--	
--	if (total_length <= 0)
--		return FALSE;		// found only empty markers ?
--	
--	// allocate space for assembled data 
--	icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET));
--	if (icc_data == NULL)
--		return FALSE;		// out of memory
--	
--	// and fill it in
--	for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
--		if (marker_is_icc(marker)) {
--			JOCTET FAR *src_ptr;
--			JOCTET *dst_ptr;
--			unsigned length;
--			seq_no = GETJOCTET(marker->data[12]);
--			dst_ptr = icc_data + data_offset[seq_no];
--			src_ptr = marker->data + ICC_HEADER_SIZE;
--			length = data_length[seq_no];
--			while (length--) {
--				*dst_ptr++ = *src_ptr++;
--			}
--		}
--	}
--	
--	*icc_data_ptr = icc_data;
--	*icc_data_len = total_length;
--	
--	return TRUE;
--}
--
- /**
- 	Read JPEG_APPD marker (IPTC or Adobe Photoshop profile)
- */
-diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp
-index 85c6ff3e..163a93bd 100644
---- a/Source/FreeImage/PluginJXR.cpp
-+++ b/Source/FreeImage/PluginJXR.cpp
-@@ -23,7 +23,7 @@
- #include "Utilities.h"
- #include "../Metadata/FreeImageTag.h"
- 
--#include "../LibJXR/jxrgluelib/JXRGlue.h"
-+#include <JXRGlue.h>
- 
- // ==========================================================
- // Plugin Interface
-diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
-index 661f1602..504fafe1 100644
---- a/Source/FreeImage/PluginPNG.cpp
-+++ b/Source/FreeImage/PluginPNG.cpp
-@@ -40,8 +40,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
-diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
-index 26134bcc..d7fa81e4 100644
---- a/Source/FreeImage/PluginRAW.cpp
-+++ b/Source/FreeImage/PluginRAW.cpp
-@@ -19,12 +19,16 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibRawLite/libraw/libraw.h"
-+#include <libraw.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
- #include "../Metadata/FreeImageTag.h"
- 
-+// What an ugly hack
-+#undef INT64
-+#undef UINT64
-+
- // ==========================================================
- // Plugin Interface
- // ==========================================================
-diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
-index 84554958..13a224dd 100644
---- a/Source/FreeImage/PluginTIFF.cpp
-+++ b/Source/FreeImage/PluginTIFF.cpp
-@@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffiop.h>
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include <OpenEXR/half.h>
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
-diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
-index 7c9f62fd..c4014473 100644
---- a/Source/FreeImage/PluginWebP.cpp
-+++ b/Source/FreeImage/PluginWebP.cpp
-@@ -24,9 +24,9 @@
- 
- #include "../Metadata/FreeImageTag.h"
- 
--#include "../LibWebP/src/webp/decode.h"
--#include "../LibWebP/src/webp/encode.h"
--#include "../LibWebP/src/webp/mux.h"
-+#include <webp/decode.h>
-+#include <webp/encode.h>
-+#include <webp/mux.h>
- 
- // ==========================================================
- // Plugin Interface
-diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
-index 3ab6d321..09734755 100644
---- a/Source/FreeImage/ZLibInterface.cpp
-+++ b/Source/FreeImage/ZLibInterface.cpp
-@@ -19,10 +19,9 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../ZLib/zlib.h"
-+#include <zlib.h>
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
- 
- /**
- Compresses a source buffer into a target buffer, using the ZLib library. 
-@@ -115,7 +114,8 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s
- 			return 0;
-         case Z_OK: {
-             // patch header, setup crc and length (stolen from mod_trace_output)
--            BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
-+            // OS_CODE is 0x03 on unix it seems, not sure how important this is
-+            BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code
-  	        crc = crc32(crc, source, source_size);
- 	        memcpy(target + 4 + dest_len, &crc, 4);
- 	        memcpy(target + 8 + dest_len, &source_size, 4);
-diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
-index 6f9ba8e1..836bc901 100644
---- a/Source/FreeImageToolkit/JPEGTransform.cpp
-+++ b/Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -26,10 +26,10 @@ extern "C" {
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
--#include "../LibJPEG/transupp.h"
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
-+#include <transupp.h>
- }
- 
- #include "FreeImage.h"
-diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
-index 6919a8e8..ce3d7c6b 100644
---- a/Source/Metadata/XTIFF.cpp
-+++ b/Source/Metadata/XTIFF.cpp
-@@ -29,7 +29,7 @@
- #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
- #endif
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffiop.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/fipMakefile.srcs b/fipMakefile.srcs
-index cc75e5e0..bedc9e3e 100644
---- a/fipMakefile.srcs
-+++ b/fipMakefile.srcs
-@@ -1,4 +1,4 @@
- VER_MAJOR = 3
- VER_MINOR = 19.0
--SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
--INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus
-+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
-+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus
diff --git a/pkgs/by-name/fr/freelens-bin/darwin.nix b/pkgs/by-name/fr/freelens-bin/darwin.nix
new file mode 100644
index 000000000000..4d1b95906af5
--- /dev/null
+++ b/pkgs/by-name/fr/freelens-bin/darwin.nix
@@ -0,0 +1,32 @@
+{
+  stdenvNoCC,
+  pname,
+  version,
+  src,
+  meta,
+  undmg,
+}:
+
+stdenvNoCC.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R "Lens.app" "$out/Applications/Lens.app"
+
+    runHook postInstall
+  '';
+
+  dontFixup = true;
+}
diff --git a/pkgs/by-name/fr/freelens-bin/linux.nix b/pkgs/by-name/fr/freelens-bin/linux.nix
new file mode 100644
index 000000000000..bb3731be8fb3
--- /dev/null
+++ b/pkgs/by-name/fr/freelens-bin/linux.nix
@@ -0,0 +1,30 @@
+{
+  pname,
+  version,
+  src,
+  meta,
+  appimageTools,
+  makeWrapper,
+}:
+let
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
+
+in
+appimageTools.wrapType2 {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  extraInstallCommands = ''
+    mv $out/bin/${pname} $out/bin/freelens
+    wrapProgram $out/bin/freelens --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+    install -m 444 -D ${appimageContents}/freelens.desktop $out/share/applications/freelens.desktop
+    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/freelens.png $out/share/icons/hicolor/512x512/apps/freelens.png
+    substituteInPlace $out/share/applications/freelens.desktop --replace-fail 'Exec=AppRun' 'Exec=freelens'
+  '';
+}
diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix
new file mode 100644
index 000000000000..2b59383dd753
--- /dev/null
+++ b/pkgs/by-name/fr/freelens-bin/package.nix
@@ -0,0 +1,74 @@
+{
+  stdenv,
+  stdenvNoCC,
+  fetchurl,
+  lib,
+  appimageTools,
+  makeWrapper,
+  undmg,
+}:
+
+let
+
+  pname = "freelens-bin";
+  version = "1.6.1";
+
+  sources = {
+    x86_64-linux = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-amd64.AppImage";
+      hash = "sha256-RiA9OWcs6goRPN8dGsLV3ViBe/ZWB3M7yzTmDHgB3mo=";
+    };
+    aarch64-linux = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage";
+      hash = "sha256-hYkI9N8fnEIcj7bPp0lXcB89OZ0kzcd2RrJs3htg6Qo=";
+    };
+    x86_64-darwin = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg";
+      hash = "sha256-JXqMaw5KlronrpNYNU0YcVwRddHRrK/Y5b5NE3y5BA8=";
+    };
+    aarch64-darwin = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg";
+      hash = "sha256-0Eg3xBE+yjNvNjloUAJJMpY9h7ifgV+4G3a+EvbXL+Q=";
+    };
+  };
+
+  src = fetchurl {
+    inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash;
+  };
+
+  meta = {
+    description = "Free IDE for Kubernetes";
+    longDescription = ''
+      Freelens is a free and open-source user interface designed for managing Kubernetes clusters. It provides a standalone application compatible with macOS, Windows, and Linux operating systems, making it accessible to a wide range of users. The application aims to simplify the complexities of Kubernetes management by offering an intuitive and user-friendly interface.
+    '';
+    homepage = "https://github.com/freelensapp/freelens/";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ skwig ];
+    platforms = builtins.attrNames sources;
+    mainProgram = "freelens";
+  };
+
+in
+if stdenv.hostPlatform.isDarwin then
+  import ./darwin.nix {
+    inherit
+      stdenvNoCC
+      pname
+      version
+      src
+      meta
+      undmg
+      ;
+  }
+else
+  import ./linux.nix {
+    inherit
+      pname
+      version
+      src
+      meta
+      appimageTools
+      makeWrapper
+      ;
+  }
diff --git a/pkgs/by-name/fr/freeorion/package.nix b/pkgs/by-name/fr/freeorion/package.nix
index 8e33e5d72d69..b825fa1cde31 100644
--- a/pkgs/by-name/fr/freeorion/package.nix
+++ b/pkgs/by-name/fr/freeorion/package.nix
@@ -89,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
       cc-by-sa-30
     ];
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
   };
 })
diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index cf914d822b30..07633d76f71b 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -63,13 +63,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.17.1";
+  version = "3.17.2";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     rev = finalAttrs.version;
-    hash = "sha256-KAlxpoGOqvHTqKkb/yMrquSckFfMXgbEfxr2IuLPZFQ=";
+    hash = "sha256-r9a+tQ3QIBfF4Vtyo4F4dwqLloxJTTFUQFV8J53ITZ4=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix
index 07803a8d1754..6bbb8df57cd2 100644
--- a/pkgs/by-name/fr/freetube/package.nix
+++ b/pkgs/by-name/fr/freetube/package.nix
@@ -20,13 +20,13 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "freetube";
-  version = "0.23.11";
+  version = "0.23.12";
 
   src = fetchFromGitHub {
     owner = "FreeTubeApp";
     repo = "FreeTube";
     tag = "v${finalAttrs.version}-beta";
-    hash = "sha256-AmT0zNqFJEG1qjMBgMTUKmEsZrJqocxRzPkTl25HiUs=";
+    hash = "sha256-DH5uT3dPDFZnFYoiMjxpNouNDRbWDctVqvDwHpUlnkY=";
   };
 
   # Darwin requires writable Electron dist
diff --git a/pkgs/by-name/fr/freifunk-meshviewer/package.nix b/pkgs/by-name/fr/freifunk-meshviewer/package.nix
new file mode 100644
index 000000000000..7f976504e88f
--- /dev/null
+++ b/pkgs/by-name/fr/freifunk-meshviewer/package.nix
@@ -0,0 +1,35 @@
+{
+  buildNpmPackage,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "freifunk-meshviewer";
+
+  version = "12.6.0";
+
+  src = fetchFromGitHub {
+    owner = "freifunk";
+    repo = "meshviewer";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-h+0f6RwJip3V7XJ8q8eEov2k09wNwdHOJgR2XUZqkgw=";
+  };
+
+  npmDepsHash = "sha256-QgUEoUF2qEtplx2YaMO81g9cY7a+oXCX5dF6V54waD8=";
+
+  installPhase = ''
+    mkdir -p $out/share/freifunk-meshviewer/
+    cp -r build/* $out/share/freifunk-meshviewer/
+  '';
+
+  meta = {
+    homepage = "https://github.com/freifunk/meshviewer";
+    changelog = "https://github.com/freifunk/meshviewer/releases/tag/v${finalAttrs.version}";
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      felixsinger
+    ];
+    license = lib.licenses.agpl3Only;
+  };
+})
diff --git a/pkgs/by-name/fr/freshfetch/package.nix b/pkgs/by-name/fr/freshfetch/package.nix
index bc6c33b25148..52ebca152e2e 100644
--- a/pkgs/by-name/fr/freshfetch/package.nix
+++ b/pkgs/by-name/fr/freshfetch/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "Fresh take on neofetch";
     homepage = "https://github.com/k4rakara/freshfetch";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "freshfetch";
   };
 }
diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix
index 2c40adfc6276..0d6bfc29aa1d 100644
--- a/pkgs/by-name/fr/frigate/package.nix
+++ b/pkgs/by-name/fr/frigate/package.nix
@@ -13,14 +13,14 @@
 }:
 
 let
-  version = "0.16.1";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     name = "frigate-${version}-source";
     owner = "blakeblackshear";
     repo = "frigate";
     tag = "v${version}";
-    hash = "sha256-Uhqs9n4igP9+BtIHiEiurjvKfo2prIXnnVXqyPDbzQ8=";
+    hash = "sha256-8Lm4iLRdMqgZvy24WS1SOkbj855c2t9yg8n91WMg5Fg=";
   };
 
   frigate-web = callPackage ./web.nix {
diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix
index 7c18ee1f1932..f45cf5b6e39a 100644
--- a/pkgs/by-name/fr/fritz-exporter/package.nix
+++ b/pkgs/by-name/fr/fritz-exporter/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fritz-exporter";
-  version = "2.5.2";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdreker";
     repo = "fritz_exporter";
     tag = "fritzexporter-v${version}";
-    hash = "sha256-xQLTI6b8X22aU6dj7Tmkzxn7vE4y8r/djUetG3Qg9Qw=";
+    hash = "sha256-m2jDQN6c3S4xDIrmRFdD+stwutBxcespLKZvxp1VC0I=";
   };
 
   postPatch = ''
@@ -43,6 +43,9 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  # Required for tests
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/pdreker/fritz_exporter/blob/${src.tag}/CHANGELOG.md";
     description = "Prometheus exporter for Fritz!Box home routers";
diff --git a/pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch b/pkgs/by-name/fr/fritzing/fix-stricter-types.patch
similarity index 100%
rename from pkgs/applications/science/electronics/fritzing/fix-stricter-types.patch
rename to pkgs/by-name/fr/fritzing/fix-stricter-types.patch
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/by-name/fr/fritzing/package.nix
similarity index 70%
rename from pkgs/applications/science/electronics/fritzing/default.nix
rename to pkgs/by-name/fr/fritzing/package.nix
index f6f535eb01aa..17bdcf72565f 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/by-name/fr/fritzing/package.nix
@@ -2,32 +2,25 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qmake,
+  kdePackages,
   pkg-config,
-  qtbase,
-  qtsvg,
-  qttools,
-  qtserialport,
-  qtwayland,
-  qt5compat,
+  qt6,
   boost,
   libngspice,
   libgit2,
-  quazip,
   clipper,
 }:
 
 let
-  # SHA256 of the fritzing-parts HEAD on the master branch,
+  # SHA256 of the fritzing-parts HEAD on the develop branch,
   # which contains the latest stable parts definitions
-  partsSha = "76235099ed556e52003de63522fdd74e61d53a36";
+  partsSha = "73bc0559bb8399b2f895d68f032e41d7efc720c0";
 
   parts = fetchFromGitHub {
     owner = "fritzing";
     repo = "fritzing-parts";
     rev = partsSha;
-    hash = "sha256-1QVcPbRBOSYnNFsp7B2OyPXYuPaINRv9yEqGZFd662Y=";
+    hash = "sha256-2aXvSXWjQliEChQGhcCicOVoAqeNdeq69wQVYQsd2ew=";
   };
 
   # Header-only library
@@ -41,13 +34,13 @@ in
 
 stdenv.mkDerivation {
   pname = "fritzing";
-  version = "1.0.4";
+  version = "1.0.6";
 
   src = fetchFromGitHub {
     owner = "fritzing";
     repo = "fritzing-app";
-    rev = "a8c6ef7cf66f7a42b9b233d6137f1b70a9573a25";
-    hash = "sha256-a/bWAUeDPj3g8BECOlXuqyCi4JgGLLs1605m380Drt0=";
+    rev = "04e5bb0241e8f1de24d0fce9be070041c6d5b68e";
+    hash = "sha256-JlqBdzWscJoD859KMYgT/af41WNWThP65K3zh2PC2jM=";
   };
 
   patches = [
@@ -56,25 +49,25 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    qmake
+    kdePackages.qmake
     pkg-config
-    qttools
-    wrapQtAppsHook
+    qt6.qttools
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qtserialport
-    qt5compat
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtserialport
+    kdePackages.qt5compat
     boost
     libgit2
-    quazip
+    kdePackages.quazip
     libngspice
     clipper
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ];
 
   postPatch = ''
@@ -89,7 +82,7 @@ stdenv.mkDerivation {
       --replace-fail 'PartsChecker::getSha(dir.absolutePath());' '"${partsSha}";'
 
     substituteInPlace phoenix.pro \
-      --replace-fail "6.5.10" "${qtbase.version}"
+      --replace-fail "6.5.10" "${qt6.qtbase.version}"
 
     substituteInPlace src/simulation/ngspice_simulator.cpp \
       --replace-fail 'path + "/" + libName' '"${libngspice}/lib/libngspice.so"'
@@ -99,12 +92,15 @@ stdenv.mkDerivation {
   '';
 
   env = {
-    NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
-      "-I${lib.getDev quazip}/include/QuaZip-Qt${lib.versions.major qtbase.version}-${quazip.version}"
-      "-I${svgpp}/include"
-      "-I${clipper}/include/polyclipping"
-    ];
-    NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qtbase.version}";
+    NIX_CFLAGS_COMPILE = lib.concatStringsSep " " (
+      [
+        "-I${lib.getDev kdePackages.quazip}/include/QuaZip-Qt${lib.versions.major qt6.qtbase.version}-${kdePackages.quazip.version}"
+        "-I${svgpp}/include"
+        "-I${clipper}/include/polyclipping"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-F${kdePackages.qt5compat}/lib" ]
+    );
+    NIX_LDFLAGS = "-lquazip1-qt${lib.versions.major qt6.qtbase.version}";
   };
 
   qmakeFlags = [
@@ -136,6 +132,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       robberer
       muscaln
+      iedame
     ];
     platforms = lib.platforms.unix;
     mainProgram = "Fritzing";
diff --git a/pkgs/by-name/fr/frogmouth/package.nix b/pkgs/by-name/fr/frogmouth/package.nix
index 29680ad507a5..a963a34b1691 100644
--- a/pkgs/by-name/fr/frogmouth/package.nix
+++ b/pkgs/by-name/fr/frogmouth/package.nix
@@ -40,6 +40,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/Textualize/frogmouth";
     changelog = "https://github.com/Textualize/frogmouth/blob/${src.rev}/ChangeLog.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fr/frozen-containers/package.nix b/pkgs/by-name/fr/frozen-containers/package.nix
new file mode 100644
index 000000000000..89ff0ad6c745
--- /dev/null
+++ b/pkgs/by-name/fr/frozen-containers/package.nix
@@ -0,0 +1,35 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+stdenv.mkDerivation {
+  pname = "frozen-containers";
+  version = "1.2.0-unstable-2025-07-29";
+
+  src = fetchFromGitHub {
+    owner = "serge-sans-paille";
+    repo = "frozen";
+    rev = "61dce5ae18ca59931e27675c468e64118aba8744";
+    hash = "sha256-zIczBSRDWjX9hcmYWYkbWY3NAAQwQtKhMTeHlYp4BKk=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Header-only library that provides 0 cost initialization for immutable containers, fixed-size containers, and various algorithms";
+    homepage = "https://github.com/serge-sans-paille/frozen";
+    maintainers = with lib.maintainers; [
+      marcin-serwin
+      szanko
+    ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/fr/frozen/meson.build b/pkgs/by-name/fr/frozen/meson.build
index 1db9546491ce..a551018bad0f 100644
--- a/pkgs/by-name/fr/frozen/meson.build
+++ b/pkgs/by-name/fr/frozen/meson.build
@@ -7,7 +7,7 @@ project(
         'werror=true'
     ],
     license: 'Apache-2.0',
-    version: '20210223'
+    version: '1.7'
 )
 
 library(
diff --git a/pkgs/by-name/fr/frozen/package.nix b/pkgs/by-name/fr/frozen/package.nix
index dfd96c7ce58a..6f3c8fbe729f 100644
--- a/pkgs/by-name/fr/frozen/package.nix
+++ b/pkgs/by-name/fr/frozen/package.nix
@@ -6,16 +6,15 @@
   ninja,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "frozen";
-  # pin to a newer release if frozen releases again, see cesanta/frozen#72
-  version = "unstable-2021-02-23";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "cesanta";
     repo = "frozen";
-    rev = "21f051e3abc2240d9a25b2add6629b38e963e102";
-    hash = "sha256-BpuYK9fbWSpeF8iPT8ImrV3CKKaA5RQ2W0ZQ03TciR0=";
+    tag = finalAttrs.version;
+    hash = "sha256-dOQb6wVufkqOSVZa2o8A1DLad0zvo2xQzmu09J2ZT7E=";
   };
 
   nativeBuildInputs = [
@@ -41,4 +40,4 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ thillux ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index 40055508f80e..8094336da5bb 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -43,9 +43,7 @@
   numMultipath ? 64,
   watchfrrSupport ? true,
   cumulusSupport ? false,
-  rtadvSupport ? true,
   irdpSupport ? true,
-  routeReplacementSupport ? true,
   mgmtdSupport ? true,
   # Experimental as of 10.1, reconsider if upstream changes defaults
   grpcSupport ? false,
@@ -151,24 +149,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--disable-silent-rules"
-    "--disable-exampledir"
     "--enable-configfile-mask=0640"
     "--enable-group=frr"
     "--enable-logfile-mask=0640"
     "--enable-multipath=${toString numMultipath}"
     "--enable-user=frr"
     "--enable-vty-group=frrvty"
-    "--localstatedir=/run/frr"
+    "--localstatedir=/var"
     "--sbindir=${placeholder "out"}/libexec/frr"
-    "--sysconfdir=/etc/frr"
+    "--sysconfdir=/etc"
     "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
     # general options
     (lib.strings.enableFeature snmpSupport "snmp")
     (lib.strings.enableFeature rpkiSupport "rpki")
     (lib.strings.enableFeature watchfrrSupport "watchfrr")
-    (lib.strings.enableFeature rtadvSupport "rtadv")
     (lib.strings.enableFeature irdpSupport "irdp")
-    (lib.strings.enableFeature routeReplacementSupport "rr-semantics")
     (lib.strings.enableFeature mgmtdSupport "mgmtd")
     (lib.strings.enableFeature grpcSupport "grpc")
 
diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index a2725fb90ca0..af2f65f1f53d 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -61,8 +61,8 @@
   },
   {
     "pname": "fantomas",
-    "version": "7.0.1",
-    "hash": "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI="
+    "version": "7.0.3",
+    "hash": "sha256-0XlfV7SxXPDnk/CjkUesJSaH0cxlNHJ+Jj86zNUhkNA="
   },
   {
     "pname": "Fantomas.Client",
@@ -76,8 +76,8 @@
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.32.1",
-    "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
+    "version": "0.33.0",
+    "hash": "sha256-inPKPeLTaImrj4uiEy/vpru1cestNr/s/qgyRsgvwPc="
   },
   {
     "pname": "FSharp.Analyzers.Build",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "FSharp.Analyzers.SDK",
-    "version": "0.32.1",
-    "hash": "sha256-JOqyzBUVMm1wx9g0YZmAZghj3/9f7nh9YenVt4mQI0M="
+    "version": "0.33.1",
+    "hash": "sha256-bx4DTUakeLlwbAUxZZpNK8E0sGa7B6UvN1rX6nFOZf0="
   },
   {
     "pname": "FSharp.Compiler.Service",
@@ -206,8 +206,8 @@
   },
   {
     "pname": "Ionide.Analyzers",
-    "version": "0.14.7",
-    "hash": "sha256-capdHUKfY3W8QYgg5Q6/dRggEF6w/yQ9rEKIh+VQLlc="
+    "version": "0.14.9",
+    "hash": "sha256-41vXbwlwWbM/iwbrqA+lhsxpMochokM9xsOsgKlKqXg="
   },
   {
     "pname": "Ionide.KeepAChangelog.Tasks",
@@ -221,18 +221,18 @@
   },
   {
     "pname": "Ionide.ProjInfo",
-    "version": "0.71.2",
-    "hash": "sha256-mQM7nVZL/rwFKlt+esfygistjilIDfySMnZmHS5IFv0="
+    "version": "0.72.0",
+    "hash": "sha256-zu9ssScreEgwFQb0YOgVfAFxTEoGLjsLiMbWIdf2zkg="
   },
   {
     "pname": "Ionide.ProjInfo.FCS",
-    "version": "0.71.2",
-    "hash": "sha256-TJCBJpv6OEsT/3enqjsW7JaSd0P+idlqJR5UR3jhaSI="
+    "version": "0.72.0",
+    "hash": "sha256-udtCva1gKPo6rJpsCCVI+DCY2ilUwSFQ9P9XCysNcto="
   },
   {
     "pname": "Ionide.ProjInfo.ProjectSystem",
-    "version": "0.71.2",
-    "hash": "sha256-Agja7VwF/MbOOieLVJWv42z+l6hWhVw1V0dNrVAJ0Ks="
+    "version": "0.72.0",
+    "hash": "sha256-ilUr29oAONpGm76Dc1ocSfu33p0Gyr9VhiNfMoxyKfI="
   },
   {
     "pname": "LinkDotNet.StringBuilder",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 0aad9b17f73c..faefd3877c28 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.79.2";
+  version = "0.80.1";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GJ2ld2RF7utrgHszgrG8RCWimPJ2Za+kZzQOOu/qUqA=";
+    hash = "sha256-ad589R2SXOvnXcNAEhwjOpITv5ptnIR7BUamFgTLF+k=";
   };
 
   nugetDeps = ./deps.json;
diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
index 1aa974b60e8f..7d3515ca146c 100644
--- a/pkgs/by-name/fs/fscrypt-experimental/package.nix
+++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fscrypt";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
     rev = "v${version}";
-    hash = "sha256-US1jw0XK1BcP037XPhttzBloDU62m4BVSIbsGs9LaJU=";
+    hash = "sha256-iz/lkLDHJkyAHqSlzr8vbcbZv9N/c1evNufeAFNdcag=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildGoModule rec {
       --replace "/usr/local" "$out"
   '';
 
-  vendorHash = "sha256-FuVWV3Rimhd+Pm9wrKGLWQWtbP1hWvoWa22pQT+m2go=";
+  vendorHash = "sha256-0bCpmwWWTLWsa3P5ERwOCJ1we1sofqqPXy5JlZsqJpk=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/fs/fscryptctl/package.nix b/pkgs/by-name/fs/fscryptctl/package.nix
index 7dc4aaf033bc..153f343f3094 100644
--- a/pkgs/by-name/fs/fscryptctl/package.nix
+++ b/pkgs/by-name/fs/fscryptctl/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fscryptctl";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
+    hash = "sha256-MScjiuKHmep2CrVnDXbSOZ7MQzcGrD0kP1xkF+Z5tK0=";
   };
 
   nativeBuildInputs = [ pandoc ];
diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index fc810157836f..55f3433789b4 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -17,15 +17,15 @@ let
 
   fstarZ3 = callPackage ./z3 { };
 in
-ocamlPackages.buildDunePackage rec {
+ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "fstar";
-  version = "2025.08.07";
+  version = "2025.10.06";
 
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
-    rev = "v${version}";
-    hash = "sha256-IfwMLMbyC1+iPIG48zm6bzhKCHKPOpVaHdlLhU5g3co=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-PH3ylEiUS+mfFtYV+KI7xrCewkEutM1c14A+ARsyOQY=";
   };
 
   nativeBuildInputs = [
@@ -114,7 +114,7 @@ ocamlPackages.buildDunePackage rec {
   meta = {
     description = "ML-like functional programming language aimed at program verification";
     homepage = "https://www.fstar-lang.org";
-    changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md";
+    changelog = "https://github.com/FStarLang/FStar/raw/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       numinit
@@ -122,4 +122,4 @@ ocamlPackages.buildDunePackage rec {
     mainProgram = "fstar.exe";
     platforms = with lib.platforms; darwin ++ linux;
   };
-}
+})
diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/by-name/fu/fulcrum/package.nix
similarity index 93%
rename from pkgs/applications/blockchains/fulcrum/default.nix
rename to pkgs/by-name/fu/fulcrum/package.nix
index 5118f7880721..1bfafa575639 100644
--- a/pkgs/applications/blockchains/fulcrum/default.nix
+++ b/pkgs/by-name/fu/fulcrum/package.nix
@@ -3,12 +3,11 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   python3,
-  qtbase,
   rocksdb_7_10,
   zeromq,
   nix-update-script,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
   ];
 
   buildInputs = [
     python3
-    qtbase
+    libsForQt5.qtbase
     rocksdb_7_10
     zeromq
   ];
diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix
index 5b706844b853..2cc010735e61 100644
--- a/pkgs/by-name/fu/fundoc/package.nix
+++ b/pkgs/by-name/fu/fundoc/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "fundoc";
     homepage = "https://github.com/daynin/fundoc";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix
index 01197637f30a..4ad552932f31 100644
--- a/pkgs/by-name/fu/funzzy/package.nix
+++ b/pkgs/by-name/fu/funzzy/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/cristianoliveira/funzzy";
     changelog = "https://github.com/cristianoliveira/funzzy/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix
index 77831eeda270..3fed21626ade 100644
--- a/pkgs/by-name/fv/fvm/package.nix
+++ b/pkgs/by-name/fv/fvm/package.nix
@@ -5,17 +5,17 @@
   runCommand,
   yq-go,
   _experimental-update-script-combinators,
-  gitUpdater,
+  nix-update-script,
 }:
 
 let
-  version = "4.0.0-beta.1";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "leoafarias";
     repo = "fvm";
     tag = version;
-    hash = "sha256-O2VU0cXgrm+Xf85e5l31kfnUOCUI9ZuVQCVRUppqCE4=";
+    hash = "sha256-gJZHQRFCIlHvyMVr/+FCnZcCO8ZTA1gGyBEaRywbvNQ=";
   };
 in
 buildDartApplication {
@@ -35,8 +35,13 @@ buildDartApplication {
           yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
         '';
     updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "fvm.pubspecSource" ./pubspec.lock.json)
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "fvm.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
     ];
   };
 
@@ -44,6 +49,7 @@ buildDartApplication {
     description = "Simple CLI to manage Flutter SDK versions";
     homepage = "https://github.com/leoafarias/fvm";
     license = lib.licenses.mit;
+    mainProgram = "fvm";
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix
index b75f1d149af1..4dfbb0f25089 100644
--- a/pkgs/by-name/fw/fw/package.nix
+++ b/pkgs/by-name/fw/fw/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     description = "Workspace productivity booster";
     homepage = "https://github.com/brocode/fw";
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fw";
   };
 }
diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index b36b7d208437..fce5491fa6ac 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -4,6 +4,8 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -30,12 +32,21 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/fx --comp zsh)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+
   meta = {
     changelog = "https://github.com/antonmedv/fx/releases/tag/${finalAttrs.src.tag}";
     description = "Terminal JSON viewer";
     homepage = "https://github.com/antonmedv/fx";
     license = lib.licenses.mit;
     mainProgram = "fx";
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
 })
diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix
index dc09b790b450..5f41b959473e 100644
--- a/pkgs/by-name/fy/fyne/package.nix
+++ b/pkgs/by-name/fy/fyne/package.nix
@@ -16,17 +16,17 @@
 buildGoModule rec {
   pname = "fyne";
   # This is the current latest version
-  # version "1.26.1" was a typo of "1.6.2" - maybe, don't "upgrade" to it
-  version = "1.6.2";
+  # version "1.26.1" was a typo of "1.7.0" - maybe, don't "upgrade" to it
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "fyne-io";
     repo = "tools";
     rev = "v${version}";
-    hash = "sha256-N5v1oytSwRHE631KQDHTulUAqs/Jlr8YJqE8wy+Ygdk=";
+    hash = "sha256-x2OfiFn5VHE3OrlfSMUQY1mckdnCcDpq1vqLmRi6yAg=";
   };
 
-  vendorHash = "sha256-LU3UkWHsf0Qt6w5tNIz11ubI+OIWkbtqqSlcoYJVFZU=";
+  vendorHash = "sha256-J5JxKN0i5nbLTBgwZ5HJPFiqHd7yvP+YkyvPteD2xF0=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix
index d09f9670debe..3395c14ed862 100644
--- a/pkgs/by-name/fz/fzf-git-sh/package.nix
+++ b/pkgs/by-name/fz/fzf-git-sh/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fzf-git-sh";
-  version = "0-unstable-2025-10-12";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf-git.sh";
-    rev = "279050e2eba5b9f4c5b057ca7dbc7e02e67315a1";
-    hash = "sha256-l7xVch0YYFSGuz9CFAr9lWqsbFeq+jcjyzN7XovRKFc=";
+    rev = "c823ffd521cb4a3a65a5cf87f1b1104ef651c3de";
+    hash = "sha256-G5b6s3p4Lrh2YQyBKE3Lzh78USR1tKlR/YqTMr3mXsI=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 8b55c7588ec2..d1f665c72cc8 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fzf-make";
-  version = "0.63.0";
+  version = "0.65.0";
 
   src = fetchFromGitHub {
     owner = "kyu08";
     repo = "fzf-make";
     rev = "v${version}";
-    hash = "sha256-waSi5zqUy9Rfb/knoKACPLJy7qEWdZa/AX6xGFUYhoU=";
+    hash = "sha256-KL2dRyfwwa365hEMeVixAP9DFx3QObJVeesj95tOUmo=";
   };
 
-  cargoHash = "sha256-KniWZ/ASfStUodUfNSDtPmScR/egOkGABVMcUuIdUM0=";
+  cargoHash = "sha256-QaR0Se8ecNKj7OcngwEOrK63VT200D+/Xm3RaIiLdec=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       sigmanificient
     ];
     mainProgram = "fzf-make";
diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 69a42f183d84..988bf8ff2c83 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.66.0";
+  version = "0.66.1";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${version}";
-    hash = "sha256-4cspznuGPhTFSUM9yYvPoytX27CKenp/oAMqWpT5JrE=";
+    hash = "sha256-0dq4m5SGu37AGVUoFLgP40vjBTu6cYoUgB+ZhyfKi+M=";
   };
 
   vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";
diff --git a/pkgs/by-name/g-/g-wrap/package.nix b/pkgs/by-name/g-/g-wrap/package.nix
index 4648d800fecb..9c173dde0960 100644
--- a/pkgs/by-name/g-/g-wrap/package.nix
+++ b/pkgs/by-name/g-/g-wrap/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://www.nongnu.org/g-wrap/";
     license = licenses.lgpl2Plus;
-    maintainers = with maintainers; [ vyp ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ga/galario/package.nix b/pkgs/by-name/ga/galario/package.nix
index 7dcfafe08f3e..6b6a54c61d6f 100644
--- a/pkgs/by-name/ga/galario/package.nix
+++ b/pkgs/by-name/ga/galario/package.nix
@@ -10,7 +10,6 @@
   pythonPackages ? null,
   llvmPackages,
 }:
-
 let
   # CMake recipes are needed to build galario
   # Build process would usually download them
@@ -50,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace python/utils.py \
       --replace-fail "trapz" "trapezoid" \
       --replace-fail "np.int" "int"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeCheckInputs = lib.optionals enablePython [
diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix
index a729c2e14d37..8204f924245a 100644
--- a/pkgs/by-name/ga/gallia/package.nix
+++ b/pkgs/by-name/ga/gallia/package.nix
@@ -8,17 +8,19 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gallia";
-  version = "2.0.0a4";
+  version = "2.0.0b2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Fraunhofer-AISEC";
     repo = "gallia";
     tag = "v${version}";
-    hash = "sha256-by2zlfVN/FUNU9d5nn4JZ8xzto3k60DITPYhYqwm3Ms=";
+    hash = "sha256-CZsVd9ob4FHC9KeepK7OHWatVTJUiJEjqtaylhD+yS0=";
   };
 
-  build-system = with python3.pkgs; [ hatchling ];
+  pythonRelaxDeps = [ "pydantic" ];
+
+  build-system = with python3.pkgs; [ uv-build ];
 
   dependencies = with python3.pkgs; [
     aiosqlite
@@ -49,8 +51,8 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Extendable Pentesting Framework for the Automotive Domain";
     homepage = "https://github.com/Fraunhofer-AISEC/gallia";
-    changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fab
       rumpelsepp
diff --git a/pkgs/by-name/ga/gambit-chess/package.nix b/pkgs/by-name/ga/gambit-chess/package.nix
index c39fe64d522e..87e0d5d8278c 100644
--- a/pkgs/by-name/ga/gambit-chess/package.nix
+++ b/pkgs/by-name/ga/gambit-chess/package.nix
@@ -52,6 +52,6 @@ buildGoModule rec {
     homepage = "https://github.com/maaslalani/gambit";
     changelog = "https://github.com/maaslalani/gambit/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ga/gamecube-tools/package.nix b/pkgs/by-name/ga/gamecube-tools/package.nix
deleted file mode 100644
index edf3e5b21684..000000000000
--- a/pkgs/by-name/ga/gamecube-tools/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  freeimage,
-  libGL,
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.0.6";
-  pname = "gamecube-tools";
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [
-    freeimage
-    libGL
-  ];
-
-  src = fetchFromGitHub {
-    owner = "devkitPro";
-    repo = "gamecube-tools";
-    rev = "v${version}";
-    sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU=";
-  };
-
-  meta = with lib; {
-    description = "Tools for gamecube/wii projects";
-    homepage = "https://github.com/devkitPro/gamecube-tools/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ tomsmeets ];
-  };
-}
diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix
index cb2ab9bdfcfa..af8f214cbc0c 100644
--- a/pkgs/by-name/ga/gamehub/package.nix
+++ b/pkgs/by-name/ga/gamehub/package.nix
@@ -14,7 +14,7 @@
   libsoup_2_4,
   json-glib,
   sqlite,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   libmanette,
   libXtst,
   wrapGAppsHook3,
@@ -50,10 +50,12 @@ stdenv.mkDerivation rec {
     libsoup_2_4
     libXtst
     sqlite
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     homepage = "https://tkashkin.github.io/projects/gamehub";
     description = "Unified library for all your games";
     longDescription = ''
diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix
index 314a94685be0..5f820b0c2469 100644
--- a/pkgs/by-name/ga/gammu/package.nix
+++ b/pkgs/by-name/ga/gammu/package.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     description = "Command line utility and library to control mobile phones";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = [ maintainers.coroa ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ga/gap/package.nix b/pkgs/by-name/ga/gap/package.nix
index 73df812a7cc2..4de64b7a4c7f 100644
--- a/pkgs/by-name/ga/gap/package.nix
+++ b/pkgs/by-name/ga/gap/package.nix
@@ -71,11 +71,11 @@ in
 stdenv.mkDerivation rec {
   pname = "gap";
   # https://www.gap-system.org/Releases/
-  version = "4.14.0";
+  version = "4.15.1";
 
   src = fetchurl {
     url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
-    sha256 = "sha256-hF9ScsJv6xuOue8pS/BUXyZMH+WhmwYBu8ZdedlQZIc=";
+    hash = "sha256-YEnVPpmxLiXC2EjbIaxKBjgKRv5MQVckPVVv4GkwBCw=";
   };
 
   # remove all non-essential packages (which take up a lot of space)
diff --git a/pkgs/by-name/ga/garage-webui/package.nix b/pkgs/by-name/ga/garage-webui/package.nix
new file mode 100644
index 000000000000..ab70c5406b93
--- /dev/null
+++ b/pkgs/by-name/ga/garage-webui/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+  nodejs,
+  pnpm_9,
+  nix-update-script,
+}:
+let
+  pnpm = pnpm_9;
+in
+buildGoModule (finalAttrs: {
+  pname = "garage-webui";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "khairul169";
+    repo = "garage-webui";
+    tag = finalAttrs.version;
+    hash = "sha256-bqUAhZBSQkWZ1QsgPslEUDwt8NOg25Os0NGlPoyjPL4=";
+  };
+
+  frontend = stdenv.mkDerivation (finalAttrs': {
+    pname = "${finalAttrs.pname}-frontend";
+    inherit (finalAttrs) version src;
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm.configHook
+    ];
+
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs') pname version src;
+      fetcherVersion = 2;
+      hash = "sha256-8eQhR/fuDFNL8W529Ev7piCaseVaFahgZJQk3AJA3ng=";
+    };
+
+    buildPhase = ''
+      runHook preBuild
+      pnpm run build
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      cp -r dist $out/
+      runHook postInstall
+    '';
+  });
+
+  preBuild = ''
+    cp -r ${finalAttrs.frontend} ./ui/dist
+  '';
+
+  modRoot = "./backend";
+  tags = [ "prod" ];
+  env.CGO_ENABLED = 0;
+  vendorHash = "sha256-7z6r6w/SbBlYYHMxm11xFl/QEYZc2KebnOJZRgYRUYk=";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Simple admin web UI for Garage";
+    homepage = "https://github.com/khairul169/garage-webui";
+    changelog = "https://github.com/khairul169/garage-webui/releases/tag/${finalAttrs.version}";
+    mainProgram = "garage-webui";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ griffi-gh ];
+  };
+})
diff --git a/pkgs/games/garden-of-coloured-lights/default.nix b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix
similarity index 68%
rename from pkgs/games/garden-of-coloured-lights/default.nix
rename to pkgs/by-name/ga/garden-of-coloured-lights/package.nix
index 77e252633532..a851110e7e12 100644
--- a/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/pkgs/by-name/ga/garden-of-coloured-lights/package.nix
@@ -4,10 +4,14 @@
   fetchurl,
   autoconf,
   automake,
-  allegro,
+  allegro4,
 }:
 
-stdenv.mkDerivation rec {
+let
+  allegro = allegro4;
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "garden-of-coloured-lights";
   version = "1.0.9";
 
@@ -24,8 +28,8 @@ stdenv.mkDerivation rec {
   '';
 
   src = fetchurl {
-    url = "mirror://sourceforge/garden/${version}/garden-${version}.tar.gz";
-    sha256 = "1qsj4d7r22m5f9f5f6cyvam1y5q5pbqvy5058r7w0k4s48n77y6s";
+    url = "mirror://sourceforge/garden/${finalAttrs.version}/garden-${finalAttrs.version}.tar.gz";
+    hash = "sha256-2vhzLCKaTMBPRgUUv/G6BRcfqtqeGVdccqUKkU8jUuM=";
   };
 
   # Workaround build failure on -fno-common toolchains:
@@ -33,12 +37,11 @@ stdenv.mkDerivation rec {
   #     `eclass'; eclass.o:src/eclass.c:21: first defined here
   env.NIX_CFLAGS_COMPILE = "-fcommon";
 
-  meta = with lib; {
+  meta = {
     description = "Old-school vertical shoot-em-up / bullet hell";
     mainProgram = "garden";
     homepage = "https://sourceforge.net/projects/garden/";
-    maintainers = [ ];
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers; [ iedame ];
+    license = lib.licenses.gpl3;
   };
-
-}
+})
diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix
index 3722c7a16240..63e8fdba53ea 100644
--- a/pkgs/by-name/ga/gargoyle/package.nix
+++ b/pkgs/by-name/ga/gargoyle/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchDebianPatch,
+  fetchpatch,
   cmake,
   pkg-config,
   fluidsynth,
@@ -36,6 +37,11 @@ stdenv.mkDerivation rec {
       patch = "ftbfs_gcc14.patch";
       hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI=";
     })
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/garglk/garglk/commit/8d976852e2db0215e9cf4f926e626f1aa766f751.patch?full_index=1";
+      hash = "sha256-lJAuiOErSp3oDmeoqrfCdnHH816VLYiVthIG4U8BJ5E=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ga/garmintools/package.nix b/pkgs/by-name/ga/garmintools/package.nix
index 34dddd4a60c3..ee0de59d75aa 100644
--- a/pkgs/by-name/ga/garmintools/package.nix
+++ b/pkgs/by-name/ga/garmintools/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.unix;
     # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ga/garnet/deps.json b/pkgs/by-name/ga/garnet/deps.json
index 59df5983acf4..5259e52e7d4c 100644
--- a/pkgs/by-name/ga/garnet/deps.json
+++ b/pkgs/by-name/ga/garnet/deps.json
@@ -6,18 +6,18 @@
   },
   {
     "pname": "Azure.Core",
-    "version": "1.47.1",
-    "hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
+    "version": "1.47.3",
+    "hash": "sha256-fWyfqF1lpnap4cF3l9J0fYtZbxIqm6UFsuJgN+/hwW4="
   },
   {
     "pname": "Azure.Identity",
-    "version": "1.15.0",
-    "hash": "sha256-eqR6Akmrtu4U4fPvkDwMbwk2dPGx+MaKPj+Y80e0/Ak="
+    "version": "1.16.0",
+    "hash": "sha256-vJa746fywiLlC2QoUu2SLf+mQPzGTGxbXzGoWqAUb0Q="
   },
   {
     "pname": "Azure.Storage.Blobs",
-    "version": "12.25.0",
-    "hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
+    "version": "12.25.1",
+    "hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY="
   },
   {
     "pname": "Azure.Storage.Common",
@@ -126,13 +126,13 @@
   },
   {
     "pname": "Microsoft.Identity.Client",
-    "version": "4.73.1",
-    "hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
+    "version": "4.76.0",
+    "hash": "sha256-v5/iulShs0yMHvNoRo/pbDVYu3tOl9Y7kovSKJbgQnc="
   },
   {
     "pname": "Microsoft.Identity.Client.Extensions.Msal",
-    "version": "4.73.1",
-    "hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
+    "version": "4.76.0",
+    "hash": "sha256-OCt+XN0tt1URnn0Wh7y19YCNo3ViG5th9HAa6GusFeE="
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
@@ -181,8 +181,8 @@
   },
   {
     "pname": "System.ClientModel",
-    "version": "1.5.1",
-    "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
+    "version": "1.6.1",
+    "hash": "sha256-OMnamkT9Nt5ZSR6xPKFmOQRUjdn0a4nP9jkD2eZxxc0="
   },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
@@ -224,6 +224,11 @@
     "version": "8.0.1",
     "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
   },
+  {
+    "pname": "System.Numerics.Tensors",
+    "version": "9.0.9",
+    "hash": "sha256-wc7lhmydATxle8Wv124yFPT+bkpKpcCQL2TAPGodIAc="
+  },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index c48da99dbe0b..48c8e93411c9 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.84";
+  version = "1.0.86";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     tag = "v${version}";
-    hash = "sha256-Bg+WQrGs9HyH3E9Ry4fPrnfDcKL8WuTH798pwHrLIuo=";
+    hash = "sha256-EmwDc6kbOL++g1Xq4LoV3JuxYWSifOmv8vvWKsU3CE4=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";
diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 0bb69f91f75d..3fcb498b34d3 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.53.0";
+  version = "0.58.0";
 in
 buildGoModule {
   inherit pname version;
@@ -15,16 +15,21 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-wrvq2opwT4bbplUljasWmT+JF3/lS8AyzBSfyUB3nUw=";
+    hash = "sha256-1E6Ge3c+LQpDlyy5Jtyw21VFuKqyF4XVpxF41qOjk+w=";
   };
 
-  vendorHash = "sha256-0NcfuCZHR4QHbMNqc+ilPouie+9k7FqOG/JdNX8uO8c=";
+  vendorHash = "sha256-2ZRfvjIGUznHjn7KA20uzEpVbI7EByNUYu6xALJEUfo=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  # this test requires network access, therefore it should not be run
+  preCheck = ''
+    rm ./pkg/edition/bedrock/geyser/managed/download_test.go
+  '';
+
   excludedPackages = [ ".web" ];
 
   meta = {
diff --git a/pkgs/by-name/ga/gatsby-cli/package.nix b/pkgs/by-name/ga/gatsby-cli/package.nix
new file mode 100644
index 000000000000..e9779794caa0
--- /dev/null
+++ b/pkgs/by-name/ga/gatsby-cli/package.nix
@@ -0,0 +1,86 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  findutils,
+  makeBinaryWrapper,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gatsby-cli";
+  version = "5.15.0";
+
+  src = fetchFromGitHub {
+    owner = "gatsbyjs";
+    repo = "gatsby";
+    tag = "gatsby-cli@${finalAttrs.version}";
+    hash = "sha256-sNNbOV9UuCTYHp4cSK9ngCukUXDNV4iOIc9PPQVYymM=";
+  };
+
+  yarnKeepDevDeps = true;
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = finalAttrs.src + "/yarn.lock";
+    hash = "sha256-wfg9Nj9Z8vyp2NdE+fOTuM+pXnfM/r46CbfuE5f3fGU=";
+  };
+
+  yarnBuildScript = "lerna";
+  yarnBuildFlags = [
+    "run"
+    "build"
+    "--scope"
+    "gatsby-cli"
+    "--include-dependencies"
+  ];
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    # Needed for executing package.json scripts
+    nodejs
+    findutils
+    makeBinaryWrapper
+  ];
+
+  preBuild = ''
+    patchShebangs packages/**/node_modules
+    yarn run lerna run prepare --scope gatsby-cli --include-dependencies
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/
+    mv packages/ $out/lib/packages/
+    mv node_modules/* $out/lib/node_modules/
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/gatsby \
+      --add-flags $out/lib/packages/gatsby-cli/cli.js \
+      --set NODE_PATH $out/lib/node_modules
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      # Fixes an error with having too many versions available
+      "--use-github-releases"
+      "--version-regex"
+      "gatsby@(.*)"
+    ];
+  };
+
+  meta = {
+    changelog = "https://github.com/gatsbyjs/gatsby/releases/tag/gatsby%2540${finalAttrs.version}";
+    description = "The Gatsby command line interface";
+    homepage = "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-cli#readme";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "gatsby";
+  };
+})
diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 958166cd8df8..17f51ca2fb2a 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.26.0";
+  version = "5.30.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-Aib8s1iHkUnp80MdDAgTleXLzOc2B3Z6rnhqffOIzg0=";
+    hash = "sha256-iQp/oIEuyD+lVf20BH3fMScUtRxvEVrbu1zoJE5YkVI=";
   };
 
-  vendorHash = "sha256-vm+M2U0EhRjBe7AgpPsukIynHTuvACA/NBL2cdUtKNw=";
+  vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix
index 71e89cf5b38f..d0f182ac7331 100644
--- a/pkgs/by-name/gb/gbdfed/package.nix
+++ b/pkgs/by-name/gb/gbdfed/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.linquize ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "gbdfed";
   };
diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py
index e24cdce9be96..b26ef247d2e4 100755
--- a/pkgs/by-name/gc/gclient2nix/gclient2nix.py
+++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py
@@ -166,7 +166,7 @@ class GitilesRepo(Repo):
         # (making it count the compressed instead of uncompressed size)
         # rather than complying with it.
         if url == "https://chromium.googlesource.com/chromium/src.git":
-            self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; "
+            self.args["postFetch"] = "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); "
             self.args["postFetch"] += "rm -r $out/content/test/data; "
             self.args["postFetch"] += "rm -rf $out/courgette/testdata; "
             self.args["postFetch"] += "rm -r $out/extensions/test/data; "
diff --git a/pkgs/by-name/gc/gcompris/package.nix b/pkgs/by-name/gc/gcompris/package.nix
index df8f4c6e90f1..438f28ca1425 100644
--- a/pkgs/by-name/gc/gcompris/package.nix
+++ b/pkgs/by-name/gc/gcompris/package.nix
@@ -18,11 +18,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Y23pFov1/WKPrwYYRfGI8sOF0tp/ksSwRJE5zmxtoSo=";
   };
 
-  # fix concatenation of absolute paths like
-  # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc
   postPatch = ''
+    # fix concatenation of absolute paths like
+    # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc
     substituteInPlace src/core/config.h.in  --replace-fail \
       "../@_data_dest_dir@" "../share/gcompris-qt"
+
+    # Fix private Qt6 targets search for Qt 6.10
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript)" \
+      "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript CorePrivate QuickControls2BasicPrivate WaylandClientPrivate)"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/by-name/gc/gcovr/package.nix b/pkgs/by-name/gc/gcovr/package.nix
index 22f796de7838..d7efae7c4556 100644
--- a/pkgs/by-name/gc/gcovr/package.nix
+++ b/pkgs/by-name/gc/gcovr/package.nix
@@ -1,27 +1,36 @@
 {
+  stdenv,
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
+  writableTmpDirAsHomeHook,
+  gitMinimal,
 }:
 
 python3Packages.buildPythonPackage rec {
   pname = "gcovr";
-  version = "8.3";
+  version = "8.4";
   pyproject = true;
 
   disabled = python3Packages.pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-+qNx+cSn94yYANplUQfU+Z8EtxjRwNn0jK/cvvAEkHk=";
+  src = fetchFromGitHub {
+    owner = "gcovr";
+    repo = "gcovr";
+    tag = version;
+    hash = "sha256-v3jNODYD9qa3mwttfuldhhIHrfR5LcsZ+WNWiOWb35E=";
   };
 
-  build-system = [ python3Packages.hatchling ];
+  build-system = with python3Packages; [
+    hatchling
+    hatch-fancy-pypi-readme
+    hatch-vcs
+  ];
 
   # pythonRelaxDeps do not work on pyproject.toml
   preBuild = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "hatchling==1.26.1" "hatchling"
+      --replace-fail "hatchling==1.26.3" "hatchling"
     substituteInPlace pyproject.toml \
       --replace-fail "hatch-fancy-pypi-readme==24.1.0" "hatch-fancy-pypi-readme>=24.1.0"
     substituteInPlace pyproject.toml \
@@ -36,23 +45,40 @@ python3Packages.buildPythonPackage rec {
         jinja2
         lxml
         pygments
-        hatch-fancy-pypi-readme
-        hatch-vcs
       ]
       ++ lib.optionals (pythonOlder "3.11") [ tomli ]
     );
 
-  # There are no unit tests in the pypi tarball. Most of the unit tests on the
-  # github repository currently only work with gcc5, so we just disable them.
-  # See also: https://github.com/gcovr/gcovr/issues/206
-  # Despite the CI passing many GCC version, ~300 tests are failing on nixos
-  doCheck = false;
-
   pythonImportsCheck = [
     "gcovr"
     "gcovr.configuration"
   ];
 
+  preCheck = ''
+    rm -rf src # this causes some pycache issues
+    rm -rf admin/bump_version.py
+    export CC_REFERENCE="gcc-${lib.versions.major stdenv.cc.version}"
+  '';
+
+  nativeCheckInputs = with python3Packages; [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+    pytest-timeout
+    yaxmldiff
+    nox
+    requests
+    gitMinimal
+  ];
+
+  disabledTests = [
+    # too fragile
+    "test_build"
+    "test_example"
+    # assert 40 == 30 on log levels
+    "test_multiple_output_formats_to_stdout"
+    "test_multiple_output_formats_to_stdout_1"
+  ];
+
   meta = {
     description = "Python script for summarizing gcov data";
     homepage = "https://www.gcovr.com/";
diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index b08444957347..3a8641224673 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -19,13 +19,13 @@
 
 buildGoModule rec {
   pname = "gcs";
-  version = "5.39.0";
+  version = "5.41.1";
 
   src = fetchFromGitHub {
     owner = "richardwilkes";
     repo = "gcs";
     tag = "v${version}";
-    hash = "sha256-R0IFIGDSpKxNmcDUMVdtKV+M3I8tglBhyHj5XXe2rjg=";
+    hash = "sha256-PPlz3DRwkKN0nZSFKJvl/axow6LxqyA3JPzZmfEkIsM=";
   };
 
   modPostBuild = ''
@@ -33,7 +33,7 @@ buildGoModule rec {
     sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go
   '';
 
-  vendorHash = "sha256-llbBYO1dNPm+k8WEfao6qyDtQZbcmueNwFBuIpaMvFQ=";
+  vendorHash = "sha256-LfRzNmjJe6hBhWuN5fUfFpB3nKmURZhM/wpdrcYr9jU=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 253b21b623b6..7d0494036f68 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "3.4.0";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-PdYHsHIlq77QnsjD1z3KliW3JHLZ0M26I4Z7v0SuvlU=";
+    hash = "sha256-UeYKgxBdxH7GQmPeO82CKR1RWzWCYCSUUc0nQX5VLjg=";
   };
 
-  vendorHash = "sha256-w5EOHPOJLfINILrP3ipZwYUAcAJIlGw1HlVAUAzW3x4=";
+  vendorHash = "sha256-BirzhmYwFSs2poA5tNOlK2bDO71mCkgSck7fE9la2wA=";
 
   subPackages = [
     "."
diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 6345581434ce..0ae4be009a2d 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   useMinimalFeatures ? false,
   useArmadillo ? (!useMinimalFeatures),
@@ -92,6 +93,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CFQF3vDhhXsAnIfUcn6oTQ4Xm+GH/36dqSGc0HvyEJ0=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-build-poppler-25.10.0.patch";
+      url = "https://github.com/OSGeo/gdal/commit/a716a6cd5ffd779b30950f046fce91878fc97b9d.patch";
+      hash = "sha256-dSotpnTiMjt3Bz63hpNjF5juZ3JsjIpD59/67cR9rNU=";
+    })
+  ];
+
   nativeBuildInputs = [
     bison
     cmake
diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix
index fa1663659417..f97425ccc806 100644
--- a/pkgs/by-name/gd/gdevelop/darwin.nix
+++ b/pkgs/by-name/gd/gdevelop/darwin.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
-    hash = "sha256-XSDzvh8zjrmKOP7YXjXG5+3qCzGQEJp1+RmwmRd4oOs=";
+    hash = "sha256-rrPRIOnVPC7Moh+ewRbsV81oO7WridpUUoaOnEqm43o=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix
index bf5bb8805f20..89b881330ab0 100644
--- a/pkgs/by-name/gd/gdevelop/linux.nix
+++ b/pkgs/by-name/gd/gdevelop/linux.nix
@@ -13,7 +13,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
-        hash = "sha256-TkJyq6WyHTXoCvGSiV6w/IYoLCxAvbrS1oFdsgbfl5s=";
+        hash = "sha256-IfgeeH+vNjIi0adrmXIjjX41qUxIWpoH2eX+Bd7h9AA=";
       }
     else
       throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix
index ebf2955d54e1..bf42256f33ff 100644
--- a/pkgs/by-name/gd/gdevelop/package.nix
+++ b/pkgs/by-name/gd/gdevelop/package.nix
@@ -4,7 +4,7 @@
   callPackage,
 }:
 let
-  version = "5.5.242";
+  version = "5.5.244";
   pname = "gdevelop";
   meta = {
     description = "Graphical Game Development Studio";
diff --git a/pkgs/by-name/gd/gdm/fix-paths.patch b/pkgs/by-name/gd/gdm/fix-paths.patch
index 93763ce5ff09..bd4e92e4aadb 100644
--- a/pkgs/by-name/gd/gdm/fix-paths.patch
+++ b/pkgs/by-name/gd/gdm/fix-paths.patch
@@ -1,7 +1,8 @@
 diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
+index 513b9733d..0c1c8007f 100644
 --- a/daemon/gdm-local-display-factory.c
 +++ b/daemon/gdm-local-display-factory.c
-@@ -245,9 +245,9 @@ struct GdmDisplayServerConfiguration {
+@@ -269,10 +269,10 @@ struct GdmDisplayServerConfiguration {
          const char *session_type;
  } display_server_configuration[] = {
  #ifdef ENABLE_WAYLAND_SUPPORT
@@ -15,10 +16,10 @@ diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-facto
          { NULL, NULL, NULL },
  };
 diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
-index fc5aef6ac..c61e0046b 100644
+index 9568e963f..b1bc8800a 100644
 --- a/daemon/gdm-manager.c
 +++ b/daemon/gdm-manager.c
-@@ -151,7 +151,7 @@ plymouth_is_running (void)
+@@ -154,7 +154,7 @@ plymouth_is_running (void)
          GError  *error;
  
          error = NULL;
@@ -27,7 +28,7 @@ index fc5aef6ac..c61e0046b 100644
                                           NULL, NULL, &status, &error);
          if (! res) {
                  g_debug ("Could not ping plymouth: %s", error->message);
-@@ -169,7 +169,7 @@ plymouth_prepare_for_transition (void)
+@@ -172,7 +172,7 @@ plymouth_prepare_for_transition (void)
          GError  *error;
  
          error = NULL;
@@ -36,7 +37,7 @@ index fc5aef6ac..c61e0046b 100644
                                           NULL, NULL, NULL, &error);
          if (! res) {
                  g_warning ("Could not deactivate plymouth: %s", error->message);
-@@ -184,7 +184,7 @@ plymouth_quit_with_transition (void)
+@@ -187,7 +187,7 @@ plymouth_quit_with_transition (void)
          GError  *error;
  
          error = NULL;
@@ -45,7 +46,7 @@ index fc5aef6ac..c61e0046b 100644
          if (! res) {
                  g_warning ("Could not quit plymouth: %s", error->message);
                  g_error_free (error);
-@@ -200,7 +200,7 @@ plymouth_quit_without_transition (void)
+@@ -203,7 +203,7 @@ plymouth_quit_without_transition (void)
          GError  *error;
  
          error = NULL;
@@ -54,30 +55,32 @@ index fc5aef6ac..c61e0046b 100644
          if (! res) {
                  g_warning ("Could not quit plymouth: %s", error->message);
                  g_error_free (error);
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index a4c4b2dcf..67416b204 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -3193,16 +3193,16 @@ gdm_session_start_session (GdmSession *self,
-                  */
-                 if (run_launcher) {
-                         if (is_x11) {
--                                program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"dbus-run-session -- %s\"",
-+                                program = g_strdup_printf (LIBEXECDIR "/gdm-x-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
-                                                            register_session ? "--register-session " : "",
-                                                            self->selected_program);
-                         } else {
--                                program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"dbus-run-session -- %s\"",
-+                                program = g_strdup_printf (LIBEXECDIR "/gdm-wayland-session %s\"@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s\"",
-                                                            register_session ? "--register-session " : "",
-                                                            self->selected_program);
-                         }
-                 } else {
--                        program = g_strdup_printf ("dbus-run-session -- %s",
-+                        program = g_strdup_printf ("@dbus@/bin/dbus-run-session --dbus-daemon=@dbus@/bin/dbus-daemon -- %s",
-                                                    self->selected_program);
-                 }
-         }
+diff --git a/daemon/gdm-wayland-session.c b/daemon/gdm-wayland-session.c
+index d0404d2c1..e916c2723 100644
+--- a/daemon/gdm-wayland-session.c
++++ b/daemon/gdm-wayland-session.c
+@@ -136,7 +136,7 @@ spawn_bus (State        *state,
+ 
+         bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO);
+ 
+-        g_ptr_array_add (arguments, "dbus-daemon");
++        g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon");
+ 
+         g_ptr_array_add (arguments, "--print-address");
+         g_ptr_array_add (arguments, bus_address_fd_string);
+diff --git a/daemon/gdm-x-session.c b/daemon/gdm-x-session.c
+index a998d1555..4fe50a2d0 100644
+--- a/daemon/gdm-x-session.c
++++ b/daemon/gdm-x-session.c
+@@ -463,7 +463,7 @@ spawn_bus (State        *state,
+ 
+         bus_address_fd_string = g_strdup_printf ("%d", BUS_ADDRESS_FILENO);
+ 
+-        g_ptr_array_add (arguments, "dbus-daemon");
++        g_ptr_array_add (arguments, "@dbus@/bin/dbus-daemon");
+ 
+         g_ptr_array_add (arguments, "--print-address");
+         g_ptr_array_add (arguments, bus_address_fd_string);
 diff --git a/data/gdm.service.in b/data/gdm.service.in
 index 17e8a8de8..afc709778 100644
 --- a/data/gdm.service.in
diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix
index 9145153e384a..128d00c7bec8 100644
--- a/pkgs/by-name/gd/gdm/package.nix
+++ b/pkgs/by-name/gd/gdm/package.nix
@@ -44,7 +44,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdm";
-  version = "48.0";
+  version = "49.0.1";
 
   outputs = [
     "out"
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz";
-    hash = "sha256-G8Btr/CT7HteN+y0+S5do0dKGxugdu25FR7pZ9HDCt8=";
+    hash = "sha256-GbpC+GkqC/OlK9WX4amrKMnGpRiWpQgjBOX6GlGE2Bo=";
   };
 
   mesonFlags = [
@@ -145,6 +145,10 @@ stdenv.mkDerivation (finalAttrs: {
     # installed (mostly just because .passthru.tests can make use of it).
     substituteInPlace meson.build \
       --replace-fail "dconf_prefix = dconf_dep.get_variable(pkgconfig: 'prefix')" "dconf_prefix = gdm_prefix"
+
+    # Disable userdb dynamic users for now
+    substituteInPlace meson.build \
+      --replace-fail 'have_userdb = libsystemd_dep' 'have_userdb = false #'
   '';
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix
index ce5c408e621c..d6f71b8ef83c 100644
--- a/pkgs/by-name/gd/gdrive3/package.nix
+++ b/pkgs/by-name/gd/gdrive3/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/glotlabs/gdrive";
     changelog = "https://github.com/glotlabs/gdrive/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "gdrive";
   };
 }
diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix
new file mode 100644
index 000000000000..b92bbdb93954
--- /dev/null
+++ b/pkgs/by-name/gd/gdscript-formatter/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gdscript-formatter";
+  version = "0.14.0";
+
+  src = fetchFromGitHub {
+    owner = "GDQuest";
+    repo = "GDScript-formatter";
+    tag = finalAttrs.version;
+    hash = "sha256-cY6Ow1f8o40M9/knneAod8ABj7ObQAkzs3yODMpkCxQ=";
+    # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files
+    deepClone = true;
+  };
+
+  cargoHash = "sha256-U3M1xuSybP9WVHNMYaY6QrBZ//cAGCIOIo2dY0jpJzc=";
+
+  cargoBuildFlags = [
+    "--bin=gdscript-formatter"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast code formatter for GDScript and Godot 4";
+    homepage = "https://github.com/GDQuest/GDScript-formatter";
+    changelog = "https://github.com/GDQuest/GDScript-formatter/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "gdscript-formatter";
+    maintainers = with lib.maintainers; [ squarepear ];
+  };
+})
diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix
index 39d4e677d915..22594fac7452 100644
--- a/pkgs/by-name/gd/gdu/package.nix
+++ b/pkgs/by-name/gd/gdu/package.nix
@@ -42,11 +42,14 @@ buildGoModule (finalAttrs: {
 
   doCheck = !stdenv.hostPlatform.isDarwin;
 
-  checkFlags = [
-    # https://github.com/dundee/gdu/issues/371
-    "-skip=TestStoredAnalyzer"
-    "-skip=TestAnalyzePathWithIgnoring"
-  ];
+  checkFlags =
+    let
+      skippedTests = [
+        "TestStoredAnalyzer" # https://github.com/dundee/gdu/issues/371
+        "TestAnalyzePathWithIgnoring"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix
index 4ca18b384bf7..48c3a2765706 100644
--- a/pkgs/by-name/ge/gearlever/package.nix
+++ b/pkgs/by-name/ge/gearlever/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gearlever";
-  version = "3.4.2";
+  version = "3.4.5";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "gearlever";
     tag = version;
-    hash = "sha256-IC3ueAplQc5McGoJkHjjCAGvnLCH9+DUrB3cuKfwMno=";
+    hash = "sha256-C/YNnpLlA+5xzgLRLWEWAhDGLZP42N/uCbCPg3owgBk=";
   };
 
   postPatch =
diff --git a/pkgs/by-name/ge/gelasio/package.nix b/pkgs/by-name/ge/gelasio/package.nix
index 1a0ef4b5bcd0..bc3a91058b61 100644
--- a/pkgs/by-name/ge/gelasio/package.nix
+++ b/pkgs/by-name/ge/gelasio/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "gelasio";
-  version = "0-unstable-2022-06-09";
+  version = "0-unstable-2025-06-30";
 
   src = fetchFromGitHub {
     owner = "SorkinType";
     repo = "Gelasio";
-    rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5";
-    hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI=";
+    rev = "4d7a1d2c662582095982a3851e50d7f1e034255b";
+    hash = "sha256-GfJjpiTBayNfGULf3vqFOvQw9rqXIe8JJmF3fI9Km+Y=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix
index bc741ab07287..7258c5a2cc05 100644
--- a/pkgs/by-name/ge/gemini-cli-bin/package.nix
+++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gemini-cli-bin";
-  version = "0.9.0";
+  version = "0.11.3";
 
   src = fetchurl {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
-    hash = "sha256-nUuO+03WqWjW8GGQNyVBdDSVEKNBDDsDta7MP6YzcX8=";
+    hash = "sha256-JReB8+4+Pnbo8XsLGmcZ0xKjuFHeRC3e5uuhGOM/06I=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index c180aa899bfb..23469817d376 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.8.2";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M9sR8c6d5JrFnZ50Q7PgOJ5b6NCKqAOW8tZWG1jpKLc=";
+    hash = "sha256-Y6RIFF65uzgeOKU03wibEeLtUub1iG52tljM+rHDZbg=";
   };
 
-  npmDepsHash = "sha256-S3vXyjQ3AkmItNXAEBJTHyEGUfdh+jxjHOcs7o7DUqc=";
+  npmDepsHash = "sha256-6YhbPj+gbSi/OvyH+dFxkTD4qVj+/7TiMQuP7f1aZYE=";
 
   nativeBuildInputs = [
     jq
diff --git a/pkgs/development/tools/gemstash/Gemfile b/pkgs/by-name/ge/gemstash/Gemfile
similarity index 100%
rename from pkgs/development/tools/gemstash/Gemfile
rename to pkgs/by-name/ge/gemstash/Gemfile
diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/by-name/ge/gemstash/Gemfile.lock
similarity index 100%
rename from pkgs/development/tools/gemstash/Gemfile.lock
rename to pkgs/by-name/ge/gemstash/Gemfile.lock
diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/by-name/ge/gemstash/gemset.nix
similarity index 100%
rename from pkgs/development/tools/gemstash/gemset.nix
rename to pkgs/by-name/ge/gemstash/gemset.nix
diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/by-name/ge/gemstash/package.nix
similarity index 60%
rename from pkgs/development/tools/gemstash/default.nix
rename to pkgs/by-name/ge/gemstash/package.nix
index 8256c82baa28..9d71a784750a 100644
--- a/pkgs/development/tools/gemstash/default.nix
+++ b/pkgs/by-name/ge/gemstash/package.nix
@@ -5,20 +5,22 @@
   nixosTests,
 }:
 
-bundlerApp rec {
+bundlerApp {
   pname = "gemstash";
   gemdir = ./.;
-  exes = [ pname ];
+  exes = [ "gemstash" ];
 
   passthru = {
-    updateScript = bundlerUpdateScript pname;
+    updateScript = bundlerUpdateScript "gemstash";
     tests = { inherit (nixosTests) gemstash; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cache for RubyGems.org and a private gem server";
     homepage = "https://github.com/rubygems/gemstash";
-    license = licenses.mit;
-    maintainers = [ maintainers.viraptor ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      viraptor
+    ];
   };
 }
diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix
index 7b867f193ceb..bd365a949579 100644
--- a/pkgs/by-name/ge/genact/package.nix
+++ b/pkgs/by-name/ge/genact/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/svenstaro/genact";
     changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "genact";
   };
 }
diff --git a/pkgs/by-name/ge/genmap/package.nix b/pkgs/by-name/ge/genmap/package.nix
index 10b4a96589b7..f3ab17dcbe89 100644
--- a/pkgs/by-name/ge/genmap/package.nix
+++ b/pkgs/by-name/ge/genmap/package.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
     echo > benchmarks/CMakeLists.txt
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Ultra-fast computation of genome mappability";
     mainProgram = "genmap";
@@ -41,5 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/cpockrandt/genmap";
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ge/geogebra/package.nix b/pkgs/by-name/ge/geogebra/package.nix
index af4dec8c0c3d..00e8f159e7f5 100644
--- a/pkgs/by-name/ge/geogebra/package.nix
+++ b/pkgs/by-name/ge/geogebra/package.nix
@@ -48,6 +48,7 @@ let
     maintainers = with maintainers; [
       sikmir
       soupglasses
+      iedame
     ];
     license = with licenses; [
       gpl3
diff --git a/pkgs/by-name/ge/geogebra6/package.nix b/pkgs/by-name/ge/geogebra6/package.nix
index 3f9b349401b1..ce76216cf6bc 100644
--- a/pkgs/by-name/ge/geogebra6/package.nix
+++ b/pkgs/by-name/ge/geogebra6/package.nix
@@ -25,6 +25,7 @@ let
     maintainers = with maintainers; [
       voidless
       sikmir
+      iedame
     ];
     license = licenses.geogebra;
     sourceProvenance = with sourceTypes; [
diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix
index c0095d4eb9f3..4d8ab6b869af 100644
--- a/pkgs/by-name/ge/geographiclib/package.nix
+++ b/pkgs/by-name/ge/geographiclib/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geographiclib";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "geographiclib";
     repo = "geographiclib";
     tag = "v${version}";
-    hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E=";
+    hash = "sha256-xqrt7KeYyYB90kuvn2qmK8VI3RVQuIhNN8qCzV//yko=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ge/geomcpp/package.nix b/pkgs/by-name/ge/geomcpp/package.nix
new file mode 100644
index 000000000000..8b6f70498e80
--- /dev/null
+++ b/pkgs/by-name/ge/geomcpp/package.nix
@@ -0,0 +1,47 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  glm,
+  gtest,
+  tinycmmc,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "geomcpp";
+  version = "0.0.0-unstable-2025-06-11";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "geomcpp";
+    rev = "282e3710fbe6dacee630391e4af8ffe03181f8a9";
+    sha256 = "sha256-M4a6P6J/PBDklpOiR81Nah0STlXFI48+mQkNqMBicKQ=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    gtest
+    tinycmmc
+  ];
+  propagatedBuildInputs = [ glm ];
+
+  cmakeFlags = [
+    "-DWARNINGS=ON"
+    "-DWERROR=ON"
+    "-DBUILD_TESTS=ON"
+  ];
+
+  doCheck = true;
+
+  postPatch = ''
+    echo $version > VERSION
+  '';
+
+  meta = {
+    description = "Collection of point, size and rect classes";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
+  };
+})
diff --git a/pkgs/by-name/ge/geos/package.nix b/pkgs/by-name/ge/geos/package.nix
index a11d8097b8e8..597fad1ec724 100644
--- a/pkgs/by-name/ge/geos/package.nix
+++ b/pkgs/by-name/ge/geos/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "geos";
-  version = "3.13.1";
+  version = "3.14.1";
 
   src = fetchFromGitHub {
     owner = "libgeos";
     repo = "geos";
     tag = finalAttrs.version;
-    hash = "sha256-zPVP01AMIBKMnKi6Sq++CIaVZb5JA1v8/QAdGzKdL8Y=";
+    hash = "sha256-lOf14Qva/bbbiywbSE7GbkDQftjY0RudTOaqjllnsj4=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index 5c5b98411091..97fa7273f163 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -24,16 +24,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.83";
+  version = "0.2.85";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-gEhr+goQYcjhgkoFGG1swbC0LHKwVlGAijFcwzBEF/Q=";
+    hash = "sha256-n9LeGXXL4HK4fy/lvOlyXhhu10JmxGILmhIYxhEJ1B8=";
   };
 
-  cargoHash = "sha256-k0VZFyVqGdfXFsmQ5cscTMZZeEk3PxaEDHzfqLGH3H4=";
+  cargoHash = "sha256-XCaf2sa4898xZFJLcFBRe9HTk2NCGpefQF6bfvrlca4=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \
diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index 58c52b04b66c..7aeadaa219a4 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gerrit";
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    hash = "sha256-jQydsKixNKY0PYXysPckcxrpFhDBLQmfN+x/tlfGdEk=";
+    hash = "sha256-egPuxGfRk8uB+7hzdrrEOT9wfBxlkaSjRpw2z9RYXAI=";
   };
 
   buildCommand = ''
diff --git a/pkgs/by-name/ge/getdp/package.nix b/pkgs/by-name/ge/getdp/package.nix
index e911a6570942..2fc9925b416a 100644
--- a/pkgs/by-name/ge/getdp/package.nix
+++ b/pkgs/by-name/ge/getdp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   cmake,
   gfortran,
   blas,
@@ -14,12 +14,16 @@
 let
   mpiSupport = petsc.passthru.mpiSupport;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "getdp";
-  version = "3.6.0";
-  src = fetchurl {
-    url = "http://getdp.info/src/getdp-${version}-source.tgz";
-    hash = "sha256-nzefwCV+Z9BHDofuTfhR+vhqm3cCSiUT+7cbtn601N8=";
+  version = "3.6.0-unstable-2025-10-25";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.onelab.info";
+    owner = "getdp";
+    repo = "getdp";
+    rev = "cac7f393ac34be1618b588083d2e391efd4976f7";
+    hash = "sha256-yiqi9Fb3UM81iJtpU+Mg71BB73injdkWCzbJGgor4ww=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +39,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional mpiSupport mpi;
   cmakeFlags = lib.optional mpiSupport "-DENABLE_MPI=1";
 
-  meta = with lib; {
+  meta = {
     description = "General Environment for the Treatment of Discrete Problems";
     mainProgram = "getdp";
     longDescription = ''
@@ -46,8 +50,8 @@ stdenv.mkDerivation rec {
       symbolic mathematical expressions of these problems.
     '';
     homepage = "http://getdp.info/";
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ iedame ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix
index 63ea071efaee..7c8e2fbd55bb 100644
--- a/pkgs/by-name/gf/gfal2/package.nix
+++ b/pkgs/by-name/gf/gfal2/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gfal2";
-  version = "2.23.2";
+  version = "2.23.5";
 
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gyEmz0sNHyxjvJA/3uSzLW42PQ3UVKx6nptNYl/3ExM=";
+    hash = "sha256-Dt6xA7U4aPKFZmO2iAiYM99w5ZIZNQJ+JXzuVItIlBM=";
   };
 
   passthru.enablePluginStatus = {
@@ -109,6 +109,36 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
+  preConfigure =
+    let
+      cmakeFiles = [
+        "CMakeLists.txt"
+        "src/CMakeLists.txt"
+        "src/core/CMakeLists.txt"
+        "src/core/transfer/CMakeLists.txt"
+        "src/plugins/CMakeLists.txt"
+        "src/plugins/dcap/CMakeLists.txt"
+        "src/plugins/file/CMakeLists.txt"
+        "src/plugins/gridftp/CMakeLists.txt"
+        "src/plugins/http/CMakeLists.txt"
+        "src/plugins/lfc/CMakeLists.txt"
+        "src/plugins/mock/CMakeLists.txt"
+        "src/plugins/rfio/CMakeLists.txt"
+        "src/plugins/sftp/CMakeLists.txt"
+        "src/plugins/srm/CMakeLists.txt"
+        "src/plugins/xrootd/CMakeLists.txt"
+        "src/utils/CMakeLists.txt"
+        "src/version/CMakeLists.txt"
+      ];
+    in
+    ''
+      for f in ${lib.escapeShellArgs cmakeFiles}; do
+        substituteInPlace "$f" \
+          --replace-fail 'cmake_minimum_required (VERSION 2.6)' \
+                         'cmake_minimum_required (VERSION 3.10)'
+      done
+    '';
+
   cmakeFlags =
     (map (
       pluginName:
diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix
index 331aa6087332..059bec830b76 100644
--- a/pkgs/by-name/gf/gflags/package.nix
+++ b/pkgs/by-name/gf/gflags/package.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://gflags.github.io/gflags/";
     license = licenses.bsd3;
-    maintainers = [ maintainers.linquize ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix
deleted file mode 100644
index ccddb1b12b05..000000000000
--- a/pkgs/by-name/gf/gfn-electron/package.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-  electron_35,
-  nix-update-script,
-  makeBinaryWrapper,
-  python3,
-}:
-let
-  electron = electron_35;
-  version = "2.2.0";
-in
-buildNpmPackage {
-  pname = "gfn-electron";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "hmlendea";
-    repo = "gfn-electron";
-    tag = "v${version}";
-    hash = "sha256-DwrNCgBp0CD+HYXRMDsu0aKEKzG7k/tk7oATJc30DlE=";
-  };
-
-  npmDepsHash = "sha256-2v5qTTGhdG1EEK8v50LLYz5jE/36lBm1PKQl6HfqhCU=";
-
-  nativeBuildInputs = [
-    makeBinaryWrapper
-    # node_modules/node-gyp/gyp/pylib/gyp/input.py
-    #   from distutils.version import StrictVersion
-    # ModuleNotFoundError: No module named 'distutils'
-    (python3.withPackages (ps: with ps; [ setuptools ]))
-  ];
-
-  env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
-
-  # FIXME: Git dependency node_modules/register-scheme contains install scripts,
-  # but has no lockfile, which is something that will probably break.
-  forceGitDeps = true;
-
-  makeCacheWritable = true;
-
-  buildPhase = ''
-    runHook preBuild
-
-    # NOTE: Upstream explicitly opts to not build an ASAR as it would cause all
-    # text to disappear in the app.
-    npm exec electron-builder -- \
-      --dir \
-      -c.electronDist=${electron.dist} \
-      -c.electronVersion=${electron.version}
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp -r dist/*-unpacked $out/dist
-
-    install -Dm644 com.github.hmlendea.geforcenow-electron.desktop -t $out/share/applications
-    install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/geforcenow-electron.png
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \
-      --add-flags "--no-sandbox --disable-gpu-sandbox" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-
-    substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \
-      --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \
-      --replace-fail "Icon=nvidia" "Icon=geforcenow-electron"
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Linux Desktop client for Nvidia's GeForce NOW game streaming service";
-    homepage = "https://github.com/hmlendea/gfn-electron";
-    license = with lib.licenses; [ gpl3Only ];
-    platforms = lib.intersectLists lib.platforms.linux electron.meta.platforms;
-    maintainers = with lib.maintainers; [ pluiedev ];
-    mainProgram = "geforcenow-electron";
-  };
-}
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index 81d57c1b3ff6..6259606c5cce 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -60,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.gnu.org/software/gforth";
     downloadPage = "https://github.com/forthy42/gforth";
     license = lib.licenses.gpl3Plus;
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault when running ./gforthmi
+    # segfault when running ./gforthmi on aarch64 darwin
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
     platforms = lib.platforms.all;
     mainProgram = "gforth";
   };
diff --git a/pkgs/by-name/gh/gh-copilot/package.nix b/pkgs/by-name/gh/gh-copilot/package.nix
index 1335469709e6..55b68840f5e4 100644
--- a/pkgs/by-name/gh/gh-copilot/package.nix
+++ b/pkgs/by-name/gh/gh-copilot/package.nix
@@ -10,26 +10,26 @@ let
   systemToPlatform = {
     "x86_64-linux" = {
       name = "linux-amd64";
-      hash = "sha256-bDAhFU18dliKlKY5WQVsVSMVyF4YeTaKO9pwheMcdcg=";
+      hash = "sha256-WVb32g9eqoeQgvPUGOQ7r3oD+PerKYQWEh/PoZwVqkI=";
     };
     "aarch64-linux" = {
       name = "linux-arm64";
-      hash = "sha256-uddWn2RxQyB9s7kx6FI/oH9L/7l/fMD/7HQXWDqvuyQ=";
+      hash = "sha256-nZg7u0BUIHOdu3dg28fydgm6ctr4jOOIZOA5ms3/E64=";
     };
     "x86_64-darwin" = {
       name = "darwin-amd64";
-      hash = "sha256-L+lCmI1ciYInCt5aTcSVRDW0IwecGZ2BZNKrpeEE4jo=";
+      hash = "sha256-A+FQ7AgjqS1/7LExhyKwXlCAwCveSgeyhbCNAjqQ770=";
     };
     "aarch64-darwin" = {
       name = "darwin-arm64";
-      hash = "sha256-9ldVRUhHM2OD+BaOCqVmaE+HFP5jj+hrfyB6wobjS+E=";
+      hash = "sha256-+Q1H9h1j1kusEu1HW3zHWQ8ReR50kwjj4kGC3g6Jzqc=";
     };
   };
   platform = systemToPlatform.${system} or throwSystem;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gh-copilot";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchurl {
     name = "gh-copilot";
diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index bb4d9bbf585e..109f15e2ea78 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.18.1";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-ZMFom0irZa63Nzx7wViinmN6yRfiHxQFprJdIx1Ak2Y=";
+    hash = "sha256-00+yHDvDTJux2XKhJ3u1W1SrYArFGJtYusT/adC2XDE=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;
diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix
index a6d83efa539a..7507a1343ee1 100644
--- a/pkgs/by-name/gh/gh-markdown-preview/package.nix
+++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "gh-markdown-preview";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "yusukebe";
     repo = "gh-markdown-preview";
     rev = "v${version}";
-    hash = "sha256-jvdNAxPAr3ieOhUWeALmopeN06mZZJ+zBDFVl7gsYoc=";
+    hash = "sha256-Q6rTkiklSU1lh4mEKYJYXOmGlRkNUYTC/jtMkVVFRu0=";
   };
 
   vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E=";
diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 66585581547b..f73389884727 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.82.0";
+  version = "2.83.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-0PheldNAlexi/tXHhhrPLd3YBGmcM1G+guicI2z9RYU=";
+    hash = "sha256-WcD2q7Lnqmz8frFjZKAgN55Khgc1uVMzEbVBGoQc3Mc=";
   };
 
-  vendorHash = "sha256-rVNKTr3b4zShPfkiEBx7LqVQY2eMrXo/s8iC5tyQZNo=";
+  vendorHash = "sha256-sLCqUqo/0qsLpHjH81tJ/M2LD0X/kr8hToDFgZ8/wP8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -60,6 +60,9 @@ buildGoModule rec {
     changelog = "https://github.com/cli/cli/releases/tag/v${version}";
     license = lib.licenses.mit;
     mainProgram = "gh";
-    maintainers = with lib.maintainers; [ zowoq ];
+    maintainers = with lib.maintainers; [
+      mdaniels5757
+      zowoq
+    ];
   };
 }
diff --git a/pkgs/by-name/gh/ghc_filesystem/package.nix b/pkgs/by-name/gh/ghc_filesystem/package.nix
index 3119d6af64cf..503de44f004c 100644
--- a/pkgs/by-name/gh/ghc_filesystem/package.nix
+++ b/pkgs/by-name/gh/ghc_filesystem/package.nix
@@ -19,6 +19,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
+  # https://github.com/NixOS/nixpkgs/issues/451580
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=character-conversion";
+
   passthru = {
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/gh/ghex/package.nix b/pkgs/by-name/gh/ghex/package.nix
index a92b7a771e5b..e1aeacd674dc 100644
--- a/pkgs/by-name/gh/ghex/package.nix
+++ b/pkgs/by-name/gh/ghex/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghex";
-  version = "48.0";
+  version = "48.1";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/ghex/${lib.versions.major finalAttrs.version}/ghex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qh0KtfdDBKqjGYehgtQh1j8ZzgJGXXxkJpbjFhI+MKg=";
+    hash = "sha256-T+q4r5Z+J2Pyi8d6Tdz1SjZ6odhUlv7wUBmGvYA9ifI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix
index 42ee79085f7f..79113ee6a440 100644
--- a/pkgs/by-name/gh/ghmap/package.nix
+++ b/pkgs/by-name/gh/ghmap/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ghmap";
-  version = "1.0.4";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "uhourri";
     repo = "ghmap";
     tag = "v${version}";
-    hash = "sha256-liwkJfNp2Ozph3ummrh2GEshIlmVsG8Y8Pmm4lw2Ya8=";
+    hash = "sha256-mNWBClKs5QnjwMMWS/OaxgD0g0D0bWRx8ecyG3+zy+s=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 52620e15ded7..29918109ef51 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.208.0";
+  version = "2.214.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-AZc9STEbM9QOa8vD3VzUkPINeP95B031yLxS8rQ1zvw=";
+    hash = "sha256-x8GUlC1/TxA40rDQu3Ae2P5v5LFtberOQWtx5GJ7rMw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-ayuPQ7uKN9XZe2svr+CBGS/r4RjCOiCvS342AQSe82s=";
+  npmDepsHash = "sha256-hHfT4gsf0D5XPY4RuQCKWNWp+iav9B75YMs70xayqtc=";
 
   nativeBuildInputs = [
     prisma
diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index 70512dcc9f65..38b90bc90cd6 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -247,7 +247,10 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.tobim ];
+    maintainers = with lib.maintainers; [
+      tobim
+      iedame
+    ];
     mainProgram = "gs";
   };
 }
diff --git a/pkgs/by-name/gh/ghostty-bin/package.nix b/pkgs/by-name/gh/ghostty-bin/package.nix
index d94768be6023..597e81d8cf4f 100644
--- a/pkgs/by-name/gh/ghostty-bin/package.nix
+++ b/pkgs/by-name/gh/ghostty-bin/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ghostty-bin";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";
-    hash = "sha256-gSuOOWZUzKKihCGmqEnieJJ8iP4xFeoSQIL536ka454=";
+    hash = "sha256-817pHxFuKAJ6ufje9FCYx1dbRLQH/4g6Lc0phcSDIGs=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 735e9fb09bef..3c7ad6786dde 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -38,7 +38,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghostty";
-  version = "1.2.2";
+  version = "1.2.3";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ghostty-org";
     repo = "ghostty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BTIH8G1GKrcoMasvlA3fje8f1vZvr4uuAUHfvZq6LVY=";
+    hash = "sha256-0tmLOJCrrEnVc/ZCp/e646DTddXjv249QcSwkaukL30=";
   };
 
   deps = callPackage ./deps.nix {
diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix
index ed4cc9f9c7a5..6b90c1acb688 100644
--- a/pkgs/by-name/gh/ghostunnel/package.nix
+++ b/pkgs/by-name/gh/ghostunnel/package.nix
@@ -5,8 +5,6 @@
   lib,
   nixosTests,
   ghostunnel,
-  apple-sdk_12,
-  darwinMinVersionHook,
   writeScript,
   runtimeShell,
 }:
@@ -26,11 +24,6 @@ buildGoModule rec {
 
   deleteVendor = true;
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_12
-    (darwinMinVersionHook "12.0")
-  ];
-
   # These tests don't exist for Linux, and on Darwin they attempt to use the macOS Keychain
   # which doesn't work from a nix build. Presumably other platform implementations of the
   # certstore would have similar issues, so it probably makes sense to skip them in
diff --git a/pkgs/by-name/gi/gi-docgen/package.nix b/pkgs/by-name/gi/gi-docgen/package.nix
index b1e6d687cd78..1ff554f2f4a5 100644
--- a/pkgs/by-name/gi/gi-docgen/package.nix
+++ b/pkgs/by-name/gi/gi-docgen/package.nix
@@ -9,13 +9,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gi-docgen";
-  version = "2025.3";
+  version = "2025.4";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gi-docgen/${lib.versions.major version}/gi-docgen-${version}.tar.xz";
-    hash = "sha256-iomli8D3ffw+iioONJf8OfVBOuNeVZfp7GFgq/juFNg=";
+    hash = "sha256-Zshl1Fn+vfteQHiojfBhg2IMPpH3JtHcYI2I7jYFUm4=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index 8a7490e12738..e680366bd2fc 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "giada";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = "giada";
     tag = finalAttrs.version;
-    hash = "sha256-f7Rtp/z7Z9P5TSI0UQbSuU4ukVrePKtSdihc1f3AAfo=";
+    hash = "sha256-MIGDaZLSwSIIZ2vXYuhGur0Ya1HX2yhrhafAawqU/+A=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix
index 807249396e4a..22e48a069f97 100644
--- a/pkgs/by-name/gi/gifski/package.nix
+++ b/pkgs/by-name/gi/gifski/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://gif.ski/";
     changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "gifski";
   };
 }
diff --git a/pkgs/by-name/gi/gildas/package.nix b/pkgs/by-name/gi/gildas/package.nix
index f3aab87e1997..a9fdea778ae3 100644
--- a/pkgs/by-name/gi/gildas/package.nix
+++ b/pkgs/by-name/gi/gildas/package.nix
@@ -24,8 +24,8 @@ let
 in
 
 stdenv.mkDerivation rec {
-  srcVersion = "oct25a";
-  version = "20251001_a";
+  srcVersion = "oct25c";
+  version = "20251001_c";
   pname = "gildas";
 
   src = fetchurl {
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       "http://www.iram.fr/~gildas/dist/gildas-src-${srcVersion}.tar.xz"
       "http://www.iram.fr/~gildas/dist/archive/gildas/gildas-src-${srcVersion}.tar.xz"
     ];
-    hash = "sha256-n1IQajRXIHWkaFpLOtctlm4P+2vrxTWdyQiD3caQd3A=";
+    hash = "sha256-uMDIsjvq7hiEw2VVosDBjJgUrS6/KUQ/KSOUNlTcJck=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index 063dc6ddab51..0d0506ac77dc 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.26.0";
+  version = "2.27.2";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-sf8rGRLSX3AsUSGqBXzb0KRwKqpmRiD+U9V/ldLqwps=";
+    sha256 = "sha256-+B/yl6Jl7BwtyGUWuyBPPK2bT+vulHtUbn8GygPlbh0=";
   };
-  vendorHash = "sha256-CUoVFKA/LQNVf4gnjqguYjPTF4ZdxA+QSJmw/UeUsrM=";
+  vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ=";
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation
diff --git a/pkgs/by-name/gi/git-buildpackage/package.nix b/pkgs/by-name/gi/git-buildpackage/package.nix
index 91d0e1488111..a91a9ca09cbf 100644
--- a/pkgs/by-name/gi/git-buildpackage/package.nix
+++ b/pkgs/by-name/gi/git-buildpackage/package.nix
@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-buildpackage";
-  version = "0.9.38";
+  version = "0.9.39";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "agx";
     repo = "git-buildpackage";
     tag = "debian/${version}";
-    hash = "sha256-dZ/uJLcDPkpwIz+Y6WInJ4XlSJ5zzDY65li/xghsJTQ=";
+    hash = "sha256-glj0WtlZb42wetD5sKHbWvgPOZ/lQofPYtChuk3rie0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix
index 0db36da8e687..7e134ceb6fbc 100644
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@@ -5,7 +5,7 @@
   python3Packages,
   gettext,
   git,
-  qt5,
+  qt6,
   versionCheckHook,
   copyDesktopItems,
   imagemagick,
@@ -14,33 +14,36 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-cola";
-  version = "4.15.0";
+  version = "4.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     tag = "v${version}";
-    hash = "sha256-h3W7CsdJK1hid8Nmp1bvFwiHVS4UV/gziwtyZuxSxHY=";
+    hash = "sha256-gBqMwqmpu0+gMeffiFdwy/kBdCUQRpJr+3vzUkBCRSk=";
   };
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ];
+  build-system = with python3Packages; [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  buildInputs = [
     git
+    qt6.qtbase
   ]
-  ++ (with python3Packages; [
-    setuptools
-    pyqt5
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
+
+  dependencies = with python3Packages; [
+    polib
+    pyqt6
     qtpy
     send2trash
-    polib
-  ]);
+  ];
 
   nativeBuildInputs = [
     gettext
-    qt5.wrapQtAppsHook
-    python3Packages.setuptools-scm
+    qt6.wrapQtAppsHook
     imagemagick
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];
diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix
index 1e39b8e81b25..9ceb21c69260 100644
--- a/pkgs/by-name/gi/git-dive/package.nix
+++ b/pkgs/by-name/gi/git-dive/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "git-dive";
   };
 }
diff --git a/pkgs/by-name/gi/git-fork/package.nix b/pkgs/by-name/gi/git-fork/package.nix
new file mode 100644
index 000000000000..c52162dc663e
--- /dev/null
+++ b/pkgs/by-name/gi/git-fork/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  undmg,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "git-fork";
+  version = "2.57.1";
+  src = fetchurl {
+    url = "https://cdn.fork.dev/mac/Fork-${finalAttrs.version}.dmg";
+    hash = "sha256-hIrR655lCKBDkZS6cF7BD+WMvX13T9180rpAfUYc8YA=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/"{bin,Applications}
+    mv Fork.app "$out/Applications/"
+    ln -s "$out/Applications/Fork.app/Contents/MacOS/Fork" "$out/bin/fork"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Git client";
+    homepage = "https://git-fork.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dudeofawesome ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    mainProgram = "fork";
+  };
+})
diff --git a/pkgs/by-name/gi/git-gone/package.nix b/pkgs/by-name/gi/git-gone/package.nix
index 7c79ea3a1d1e..e2ad77b74e84 100644
--- a/pkgs/by-name/gi/git-gone/package.nix
+++ b/pkgs/by-name/gi/git-gone/package.nix
@@ -2,41 +2,20 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
-  installShellFiles,
-  asciidoctor,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "git-gone";
-  version = "1.2.5";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "swsnr";
     repo = "git-gone";
     tag = "v${version}";
-    hash = "sha256-4BhFombZCmv/GNG2OcNlWNKTk2h65yKn1ku734gCBCQ=";
+    hash = "sha256-/8ujbZ7FQTZzTG4HnHg6v3rWhxt2PuSGwIJpBVTxhfM=";
   };
 
-  # remove if updating to rust 1.85
-  postPatch = ''
-    substituteInPlace Cargo.toml \
-      --replace-fail "[package]" ''$'cargo-features = ["edition2024"]\n[package]'
-  '';
-
-  cargoHash = "sha256-VjnnrVN+uST99paImI1uNj34CNozid7ZiPslJqvmKCs=";
-
-  # remove if updating to rust 1.85
-  env.RUSTC_BOOTSTRAP = 1;
-
-  nativeBuildInputs = [
-    installShellFiles
-    asciidoctor
-  ];
-
-  postInstall = ''
-    asciidoctor --backend=manpage git-gone.1.adoc -o git-gone.1
-    installManPage git-gone.1
-  '';
+  cargoHash = "sha256-93nZhZOtti28FetuOYtvh6LOtQJV+cEHbOkrJ+3m1m4=";
 
   meta = {
     description = "Cleanup stale Git branches of merge requests";
diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix
index d8648501f6ea..6a696219c143 100644
--- a/pkgs/by-name/gi/git-ignore/package.nix
+++ b/pkgs/by-name/gi/git-ignore/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sondr3/git-ignore";
     changelog = "https://github.com/sondr3/git-ignore/blob/${src.rev}/CHANGELOG.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "git-ignore";
   };
 }
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index 01df96b74045..d4785244e483 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/PurpleBooth/git-mit";
     changelog = "https://github.com/PurpleBooth/git-mit/releases/tag/v${version}";
     license = lib.licenses.cc0;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index e5884ee9b448..18c66b955409 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-spice";
-  version = "0.18.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9Gt4dS1Wu3w/iS0vtYO3XHyknKQEveob9slwNA/HAks=";
+    hash = "sha256-G4GnqasZkvwHviR+Bj81dRp/oOT4dxPDmIvJA9I5tCg=";
   };
 
-  vendorHash = "sha256-VCUNaWi14Pc39ncWzZZsdsZSd+IxYFhbm1cfTZ40dMw=";
+  vendorHash = "sha256-JtgXF4Qd4+zknl3DAQihe11dPFLiz8pQRa+apPSYb18=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index b1e7acd4a5c1..5270a47e3e06 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "22.0.0";
+  version = "22.1.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-yLDzMKyg9t5VNFXRS+FDD6W0Z80eNNywfZAMOhxNSZU=";
+    hash = "sha256-hM6aEH4xiMgRWvIzja9QQUZvwdufG1FYooeUO1qJpbU=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 87017cbbc429..f4860607a84e 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.4.2";
+  version = "18.5.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-jwImYofmGfpnj43FinFmo9SQP6vpM0C4K6fmUECifG0=";
+      hash = "sha256-719FC9+OBX9Li9gkIpusFoZrpMyeDwCsoWxt9pfhI1A=";
     };
 
-    vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
+    vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json b/pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json
new file mode 100644
index 000000000000..e7350c0cdf5a
--- /dev/null
+++ b/pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json
@@ -0,0 +1,99 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5",
+  "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1",
+  "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14",
+  "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f",
+  "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a",
+  "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82",
+  "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b",
+  "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6",
+  "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37",
+  "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d",
+  "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d",
+  "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad",
+  "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3",
+  "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e",
+  "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c",
+  "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806",
+  "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409",
+  "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e",
+  "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845",
+  "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d",
+  "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b",
+  "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17",
+  "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48",
+  "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd",
+  "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e",
+  "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671",
+  "@nx/nx-darwin-arm64@npm:20.8.2": "d0c0e1d7e23af4ada6726df21dfe42313afb9f27a986840792de5da5a78eb34905792788f2d4a06b3641c0666dc6d7e25c32a41d8339dd90cb21ed591c6ccbde",
+  "@nx/nx-darwin-arm64@npm:21.6.3": "fb6539317604a494c98690a6c35ccbb341c2b2def6263a5ba646c27fdb66f9da81e56fd1004e6297814c009145ba434eb4ce91db94ceb47ba7b9fa52aa5630fc",
+  "@nx/nx-darwin-x64@npm:20.8.2": "bec11ddfb64d4a00e723b04073b675f1e5626ec307d4c7c186209968795373e7ee62dfb559ab049fccd7952299147b9f3751f4ebdafb8a56b45e5669e8bfd205",
+  "@nx/nx-darwin-x64@npm:21.6.3": "1c3e62300a5e14dfb62f6b3a9d61ae143e78164f35abb8a68671312b1e5daa8c60e981a1bcad8a78b8636c848ff04a839ca431285d6ab2012d9226b655e90b29",
+  "@nx/nx-freebsd-x64@npm:20.8.2": "3c94cb3a20683acb899f931780ddb6688c5323f6d9762fe1755887ad02f86fde18c35990d49e5c8a3536f10575b2b4b9554f393e2b3714706348e5fad0cbbe66",
+  "@nx/nx-freebsd-x64@npm:21.6.3": "63b4fecbb853f21e9b07b64428209b31d12daed947f9206e4300d6c8ba5f854d49e7a386c4caa8286ef75631e4975e5eefe2787bb2b7d066b34e2a615851c30b",
+  "@nx/nx-linux-arm-gnueabihf@npm:20.8.2": "546d0924aed742de4e14df5c9b6f2b8f295e3578e48d92959190a0f16bec73afcdf5aa11f0042170cfc7e44fb1730a0f1e940a3ca047c9f04980d60d90a49062",
+  "@nx/nx-linux-arm-gnueabihf@npm:21.6.3": "c268372cda5f9fa58d8a83301f280abc06cdf62c3bccb7034bdddd0b8dadc095df53641acc0e92e212ba3b7534842439635a75f06316e9e0b793893120e04313",
+  "@nx/nx-linux-arm64-gnu@npm:20.8.2": "c8f3970c037c36b7db2a01e162b5004f9ae2dec1b13864e8318189d13a3843c89bc4ed0dce898b29b327d90b6ac098b5f19e40a72ec8ced5c7f7069d5df106ec",
+  "@nx/nx-linux-arm64-gnu@npm:21.6.3": "fcd2b8331ceadca45d95327e3ceb4eade73092c5f9a2465ada91aa7dcaf18c30d0ac84bfe5e830b15427763a3c9bca0461033b184b6dd7fffa941c055162508c",
+  "@nx/nx-linux-arm64-musl@npm:20.8.2": "ddfe4c1dfd6e1f7600e5347bd2252d7a1536aad7bb17be0cf635b7af8987bda638b35d585d526e40b43eaef388d1872064e3aec8d3ef80659542de79ac77365a",
+  "@nx/nx-linux-arm64-musl@npm:21.6.3": "83e8c70030599591484ef5ed0e63ec8b9cb8e0ddbbf1e6036334b02bc080a031b208a45f092c0a9e9a42acc6db562edd83d4628b020093a0ce5b6ddfc32dabfa",
+  "@nx/nx-linux-x64-gnu@npm:20.8.2": "9f8c55128e0797db659cb19b0279c7263bfbab4c365793897de854c25cdf9c4dc2b43c901e79ec0b00f1cf11c406ed16e3e1ae06909a23f0136537d13651f078",
+  "@nx/nx-linux-x64-gnu@npm:21.6.3": "0806dfec93a62e4e8f8b572f5d84503756ae43708067e054566563272404aa42498b72eb2857016079e5a62758ab316905598d2e3f9bae1261640e09a9fbc87d",
+  "@nx/nx-linux-x64-musl@npm:20.8.2": "bab0afad1a215e73f03c35dfc44ef972b0118fbf0d19acc5ed3193a6a56d1b740ab70f15bb508e98966bb3c5d7591013059bc23a874c2812e7dc18b9063d5c6f",
+  "@nx/nx-linux-x64-musl@npm:21.6.3": "09e7d967425779f2c0a1842b9510e63fbe17a7a0853e5514274df8c4e6159fd247283fd150997c15166300b1ff2b0bdbda5d40bb94bf96155441a4be912a5bc3",
+  "@nx/nx-win32-arm64-msvc@npm:20.8.2": "e364ff9645f37882243ba480ba6b1723283d33adf7a793fca952527cf45b85c4b6b92f4ea9ddeaf227e92eb87c0c93582633f59e8180e94a6795e9da19eb4509",
+  "@nx/nx-win32-arm64-msvc@npm:21.6.3": "2c9bd8f66526761119aa173fc3e29b03816967a25bfbad036b63518b9aa147c0e001d9703ae210e62af5d8749feaccbc38eb16a72b326188bca566e5e77d2637",
+  "@nx/nx-win32-x64-msvc@npm:20.8.2": "0bfdbb92c932a33784c06d4a9c2ca131390a294755b3b2a0efe08816f9d2a836680b425d68263bdfcf46f661dd1daa33634b8f0fb1cf6b7608e0a23353a82632",
+  "@nx/nx-win32-x64-msvc@npm:21.6.3": "392f47777f86b9ae1ce2ebf4f4fe9ab10466248b991e01b1b0fdefa76b0c2d811c0ff9196788f233104b273589ff03772b5c0b3aa016677cf1a2269c25fffce3",
+  "@rollup/rollup-android-arm-eabi@npm:4.52.4": "f05e8f49b55b9ef8ffbb825ec7521aedc307f30efe46c16479aa1afd572f238d4fa9d8546b80223cd87195df04c409ab947e2740528b4e7622a75834f038508c",
+  "@rollup/rollup-android-arm64@npm:4.52.4": "b71706dfe398a58aa2b0d0051c713f1c52e1b368a3e17efa2356cf0b32573aec9a846303803a9de45ff07e3d6e0473f8a3050f3aee820d58b8c34abee393c4e7",
+  "@rollup/rollup-darwin-arm64@npm:4.52.4": "5dbd1250d61fceabf48ea2ab10976a6f4c3268c5d479af38bf0544d1d9e8638bf60dfd82254b67005ee7a1912d6f589491d34ed6a7e676f2bd2cb1a946560c6a",
+  "@rollup/rollup-darwin-x64@npm:4.52.4": "8f380b5379bee854c9b00906ac6a65cc7623b52063ae221d23e767117ec46c505f11a7089c09946fa7d0773d9728c754c82aec74f75770591745d8eac0bf0167",
+  "@rollup/rollup-freebsd-arm64@npm:4.52.4": "e187e6e1e1db3367c72772224ed5f5de48bfc6e106140b4b20ee737928b97494dfa4a254deb12fc61982bc29b40a27cb813289fa2a4197a0fcfada0d763a72de",
+  "@rollup/rollup-freebsd-x64@npm:4.52.4": "6436f07da6faba1d70d82b7d9abc2c92a10a4db465d153da092bcf1440fe7fd07d8575db555d51a8cbc4d36b21cb48f9a321b5aa56febbdbf70137dbbe883e75",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.52.4": "432fa13b7925ca3327ed5ed6622f1025aa2515fea6f8b3ed60ad4fe4926ea65b9edac57fc602d96561e50a141a55fef1f21f7be1f8be31f0fd6ace3a81e861b3",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.52.4": "05dd27127ad1cfecb99a7dcbe75285ba0839d59499cc383fa1f83e2f7141f470c04997c9493dfe5233fde6a77dfb64d35ec142068958992db400fefc3f5b11db",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.52.4": "dfbb12c24e47f16a0fee518f83b3bdf076c939094b9fbc0cc53003c8e4f13427404e0c5d400929d689e50396c55cc138259ac245f22fefcf6a59511c3d82398f",
+  "@rollup/rollup-linux-arm64-musl@npm:4.52.4": "567e31b91ba937e1f4edbaacd4fcd3a6b3eaa04eac9a9c0a1b523b6b62854f6fb664cc03b858c96d3454445dd3b0d9f7fc812c92b6f2ff5af957d3dec102f6dd",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.52.4": "4a136776a875255cee922299a2b12f4695e3ae20ec06fd3b787f61f846a1b8726588ab5f378e1605b37b5f7d48c2ca062a23348194e3588ed961b10a170e0b0c",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.52.4": "e933600fb4cf9964cb18741aac508761d8c23209b4236cceb4d944c2dcf8df8f3d7b9041eb6a2c7c96112b601aeb41d51cc84ff96e79035b6a9361954cb0cc65",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.52.4": "282d676206f8d64728b170d55959a9c67ec43161d7545802052a40b01b1a75a13547307f4940e9b0ea31d2c4ce7893427d1157a7b970a599b56e59d2d2d58dc0",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.52.4": "ec926b01e338d632be3be5636c873f799491f428ee5bb890bec539ac1f25dcc82b3772882b9f4df4c7fe01112e840adbf2ac7bceb8f202828de9141d9f81697d",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.52.4": "4f7ab450a19d40f9830312324b5a154252dccdd23b84b36bdd6aad2f85c3080694eb6d1220e345dc95f8e598f0808c56ad90b71be593fe801b23b75c4317f86a",
+  "@rollup/rollup-linux-x64-gnu@npm:4.52.4": "4fe512b8683e6f24951121a5402beddf7918a6598e710a258775da78cc203e80c0dc266833c41fdb56654e5c8b9837a3ab5ed0851f090049c253c4c4c3a9a8e3",
+  "@rollup/rollup-linux-x64-musl@npm:4.52.4": "8725b1059c94451da32b40c226e1dcd344b2b05870fe6ff9cd248783f2aa47544312fe763a8469d1068c88146b483a36c7d8fa52482d060c4719ee8abae2396b",
+  "@rollup/rollup-openharmony-arm64@npm:4.52.4": "d1bdc31c89f66a5200623752c520fc2f1288580130a314d3b5e7f612ad339b510fa51bdd9e3915649681cc49f1904b792dd24fe3c719332741e7f74d559e6db3",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.52.4": "5e3c4087ef03f4d21beea081b422f939ef5aef91e9fd7312f76ca2a6a3867fb7499e3b648b20fd1a3e84afbe501a27adfa6cc6bce6795274b8d361833be87958",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.52.4": "5e049bc12b1ad44643f273069fb13e1f56fce6ce88b1185a26a96c7b6e6e298f45045e99fd1e8057b0542d940f36c9b176b6ab30a370a04df308e227611233db",
+  "@rollup/rollup-win32-x64-gnu@npm:4.52.4": "795de059e4cdcc94bfae05803df783035faae42c9350c9f040a53306615fbec41a5fb5e9db3572fad67c80c9f805059be6cee53e9f904f4ef24f241be0dace7a",
+  "@rollup/rollup-win32-x64-msvc@npm:4.52.4": "8bdaab594db83cd530c73c57e922e13ab6dad661c9f36e821d5b30f2c1ed5bbb394ee931400b969da3af20d1e99b45bc1a5c30953235ed93df37cf3a48dad47c",
+  "@swc/core-darwin-arm64@npm:1.13.20": "38629bad577a88e4516b675e4ff3b0e7724bcc0bbd3bec5a1f7e8e9f5982f9dc60354bc890a3caf0c35fb1249f448f1a9835d1e0411993738a741c4e0ad134d7",
+  "@swc/core-darwin-x64@npm:1.13.20": "ed4a07b3f86756d12bc575b25c67dc62a4a5ed669ab08de2d1c35f67550553809f9ed5185160c18e76d649c6fa8987701c853cc022a0e449ffd16af59702181e",
+  "@swc/core-linux-arm-gnueabihf@npm:1.13.20": "7be0c60fc922b55dde184858111e5c393bf29523ee5184c8d682cc889b64c55f9c48a3ed4dd5ffe54d445e06aa9d45052cb6c74f4091bac2f2d6021e1e6105f9",
+  "@swc/core-linux-arm64-gnu@npm:1.13.20": "8d630f8e77b9b5022a4597957dcb389cc6443b1b007fe61490881efe0e315c529aaa3bf679c61d759167b7f35733c7e8d3826191135dc2d7aafd0550ba27c098",
+  "@swc/core-linux-arm64-musl@npm:1.13.20": "42e1f77747e846bb8427a930b8a0e98a19e4a3dde848a235e2cf0158274ee05b4ad43ca37e1032784da0b89ceedfd797ca32d923e599f0674c5c376a663a7b1b",
+  "@swc/core-linux-x64-gnu@npm:1.13.20": "c327fcebec31e0a9b20689afb39e736d0b2a72954b262c1eb3475afa2c76a69821c688f6bb666781fbab4fd121354d296036bec593d2ae46e2afd4cc388a905b",
+  "@swc/core-linux-x64-musl@npm:1.13.20": "0967dfb0aaba0f7c680ed73c767649e6cfbec92558a9d9471bbf4f0145f49d23742769f3777d812b58b157b6b497b3bc8b5e35d84c568a0b7e6c7f63059b032a",
+  "@swc/core-win32-arm64-msvc@npm:1.13.20": "bbcea0a68547989857d39dd613c3d32e4938556e68f0adbb401a1d3cc9f9a92c8c14884664151220c092febe91778c61c6b796e11d6f1420811f740cb014f990",
+  "@swc/core-win32-ia32-msvc@npm:1.13.20": "7edd7772a9722e918a0454cbbd2167e3e784857addaed643452913473533c1f43010f3d2e72fedea38ba69be2faf9e24afd676f4eada0738dd80569788c7a7d3",
+  "@swc/core-win32-x64-msvc@npm:1.13.20": "619a64898fd2931b37720a1e59a90b883444dad9c684957246528f185f3efd3878bb21faaa648de0f08377c11826260ebd3bb773f8bae93ab0cdcf48c046ea96",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
+}
diff --git a/pkgs/by-name/gi/gitbeaker-cli/package.nix b/pkgs/by-name/gi/gitbeaker-cli/package.nix
new file mode 100644
index 000000000000..cfbb7ab038f3
--- /dev/null
+++ b/pkgs/by-name/gi/gitbeaker-cli/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nodejs,
+  gnutar,
+  makeBinaryWrapper,
+  yarn-berry_4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gitbeaker-cli";
+  version = "43.8.0";
+
+  src = fetchFromGitHub {
+    owner = "jdalrymple";
+    repo = "gitbeaker";
+    tag = finalAttrs.version;
+    hash = "sha256-EVxDUEuxCnMiqqsKFs9JpRVJ86d9hW22K4a4we8eoJA=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarnBerryConfigHook
+    yarn-berry_4
+    makeBinaryWrapper
+    gnutar
+  ];
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-WTxUoRPooea4CqpKnnrmvoWXoglCivVet+bUh0YG7gU=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn workspaces foreach -Rpt --from '@gitbeaker/*' run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mkdir -p $out/lib
+    cp -r packages $out/lib/packages
+    cp -r node_modules/ $out/lib/node_modules
+    # Remove dev dependencies
+    rm -rf $out/lib/node_modules/{.bin,tsup,typescript,@auto-it,@codecov,@swc,#types,@typescript-eslint,jest*,nx,prettier*,eslint*}
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    chmod +x $out/lib/node_modules/@gitbeaker/cli/dist/index.mjs
+    patchShebangs $out/lib/node_modules/@gitbeaker/cli/dist/index.mjs
+
+    makeWrapper $out/lib/node_modules/@gitbeaker/cli/dist/index.mjs $out/bin/gb \
+      --prefix PATH : ${lib.makeBinPath [ nodejs ]}
+
+    ln -s $out/bin/gb $out/bin/gitbeaker
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    changelog = "https://github.com/jdalrymple/gitbeaker/releases/tag/${finalAttrs.version}";
+    description = "CLI Wrapper for the @gitbeaker/rest SDK";
+    homepage = "https://github.com/jdalrymple/gitbeaker";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "gitbeaker";
+  };
+})
diff --git a/pkgs/by-name/gi/gitbeaker-cli/update.sh b/pkgs/by-name/gi/gitbeaker-cli/update.sh
new file mode 100755
index 000000000000..e48b1549ce03
--- /dev/null
+++ b/pkgs/by-name/gi/gitbeaker-cli/update.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/jdalrymple/gitbeaker/releases/latest | jq --raw-output .tag_name)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$latestTag" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$latestTag" || true
+
+HOME=$(mktemp -d)
+export HOME
+
+src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src")
+WORKDIR=$(mktemp -d)
+cp --recursive --no-preserve=mode "$src/*" "$WORKDIR"
+pushd "$WORKDIR"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch
new file mode 100644
index 000000000000..b686317c2c7a
--- /dev/null
+++ b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch
@@ -0,0 +1,4292 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 60b520f8d..8406c39d0 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -13,9 +13,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "adler2"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
++checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+ 
+ [[package]]
+ name = "aes"
+@@ -95,9 +95,9 @@ checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
+ 
+ [[package]]
+ name = "android_logger"
+-version = "0.15.0"
++version = "0.15.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f6f39be698127218cca460cb624878c9aa4e2b47dba3b277963d2bf00bad263b"
++checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3"
+ dependencies = [
+  "android_log-sys",
+  "env_filter",
+@@ -115,9 +115,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "anstream"
+-version = "0.6.18"
++version = "0.6.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
++checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+ dependencies = [
+  "anstyle",
+  "anstyle-parse",
+@@ -130,37 +130,37 @@ dependencies = [
+ 
+ [[package]]
+ name = "anstyle"
+-version = "1.0.10"
++version = "1.0.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
++checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+ 
+ [[package]]
+ name = "anstyle-parse"
+-version = "0.2.6"
++version = "0.2.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
++checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+ dependencies = [
+  "utf8parse",
+ ]
+ 
+ [[package]]
+ name = "anstyle-query"
+-version = "1.1.2"
++version = "1.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
++checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+ dependencies = [
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+ name = "anstyle-wincon"
+-version = "3.0.7"
++version = "3.0.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
++checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+ dependencies = [
+  "anstyle",
+- "once_cell",
+- "windows-sys 0.59.0",
++ "once_cell_polyfill",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -180,15 +180,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "arboard"
+-version = "3.5.0"
++version = "3.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70"
++checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227"
+ dependencies = [
+  "clipboard-win",
+  "image",
+  "log",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-core-graphics",
+  "objc2-foundation 0.3.1",
+@@ -213,14 +213,14 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+ 
+ [[package]]
+ name = "ashpd"
+-version = "0.9.2"
++version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
++checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
+ dependencies = [
+  "enumflags2",
+  "futures-channel",
+  "futures-util",
+- "rand 0.8.5",
++ "rand 0.9.2",
+  "raw-window-handle",
+  "serde",
+  "serde_repr",
+@@ -229,7 +229,7 @@ dependencies = [
+  "wayland-backend",
+  "wayland-client",
+  "wayland-protocols",
+- "zbus 4.4.0",
++ "zbus 5.9.0",
+ ]
+ 
+ [[package]]
+@@ -262,9 +262,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "async-channel"
+-version = "2.3.1"
++version = "2.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
++checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+ dependencies = [
+  "concurrent-queue",
+  "event-listener-strategy",
+@@ -288,9 +288,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "async-io"
+-version = "2.4.0"
++version = "2.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
++checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
+ dependencies = [
+  "async-lock",
+  "cfg-if",
+@@ -299,17 +299,16 @@ dependencies = [
+  "futures-lite",
+  "parking",
+  "polling",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "slab",
+- "tracing",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+ name = "async-lock"
+-version = "3.4.0"
++version = "3.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
++checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+ dependencies = [
+  "event-listener",
+  "event-listener-strategy",
+@@ -350,14 +349,14 @@ checksum = "0289cba6d5143bfe8251d57b4a8cac036adf158525a76533a7082ba65ec76398"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "async-process"
+-version = "2.3.0"
++version = "2.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
++checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00"
+ dependencies = [
+  "async-channel",
+  "async-io",
+@@ -368,8 +367,7 @@ dependencies = [
+  "cfg-if",
+  "event-listener",
+  "futures-lite",
+- "rustix 0.38.44",
+- "tracing",
++ "rustix 1.0.8",
+ ]
+ 
+ [[package]]
+@@ -380,14 +378,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "async-signal"
+-version = "0.2.10"
++version = "0.2.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
++checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
+ dependencies = [
+  "async-io",
+  "async-lock",
+@@ -395,10 +393,10 @@ dependencies = [
+  "cfg-if",
+  "futures-core",
+  "futures-io",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "signal-hook-registry",
+  "slab",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -420,7 +418,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -437,7 +435,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -471,9 +469,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+ 
+ [[package]]
+ name = "autocfg"
+-version = "1.4.0"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+ 
+ [[package]]
+ name = "axum"
+@@ -691,9 +689,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "blocking"
+-version = "1.6.1"
++version = "1.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
++checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+ dependencies = [
+  "async-channel",
+  "async-task",
+@@ -722,7 +720,7 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -759,9 +757,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "bumpalo"
+-version = "3.17.0"
++version = "3.19.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+ 
+ [[package]]
+ name = "but"
+@@ -941,7 +939,7 @@ dependencies = [
+  "insta",
+  "serde",
+  "serde_json",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "uuid",
+ ]
+@@ -986,7 +984,7 @@ dependencies = [
+  "petgraph 0.8.2",
+  "serde",
+  "termtree",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -1008,7 +1006,7 @@ dependencies = [
+  "serde",
+  "serde-error",
+  "serde_json",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "uuid",
+ ]
+@@ -1057,7 +1055,7 @@ dependencies = [
+  "insta",
+  "serde",
+  "tempfile",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -1275,9 +1273,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "bytemuck"
+-version = "1.23.0"
++version = "1.23.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
++checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+ 
+ [[package]]
+ name = "byteorder"
+@@ -1346,9 +1344,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "camino"
+-version = "1.1.9"
++version = "1.1.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
++checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0"
+ dependencies = [
+  "serde",
+ ]
+@@ -1378,12 +1376,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "cargo_toml"
+-version = "0.22.1"
++version = "0.22.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257"
++checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
+ dependencies = [
+  "serde",
+- "toml",
++ "toml 0.9.5",
+ ]
+ 
+ [[package]]
+@@ -1397,9 +1395,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cc"
+-version = "1.2.23"
++version = "1.2.31"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
++checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
+ dependencies = [
+  "jobserver",
+  "libc",
+@@ -1435,9 +1433,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cfg-if"
+-version = "1.0.0"
++version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+ 
+ [[package]]
+ name = "cfg_aliases"
+@@ -1472,9 +1470,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap"
+-version = "4.5.42"
++version = "4.5.43"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
++checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
+ dependencies = [
+  "clap_builder",
+  "clap_derive",
+@@ -1482,9 +1480,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap_builder"
+-version = "4.5.42"
++version = "4.5.43"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
++checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
+ dependencies = [
+  "anstream",
+  "anstyle",
+@@ -1501,20 +1499,20 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "clap_lex"
+-version = "0.7.4"
++version = "0.7.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
++checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+ 
+ [[package]]
+ name = "clipboard-win"
+-version = "5.4.0"
++version = "5.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
++checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+ dependencies = [
+  "error-code",
+ ]
+@@ -1527,14 +1525,14 @@ checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59"
+ 
+ [[package]]
+ name = "cocoa"
+-version = "0.26.0"
++version = "0.26.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
++checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c"
+ dependencies = [
+  "bitflags 2.9.1",
+  "block",
+  "cocoa-foundation",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics",
+  "foreign-types 0.5.0",
+  "libc",
+@@ -1543,23 +1541,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "cocoa-foundation"
+-version = "0.2.0"
++version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
++checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d"
+ dependencies = [
+  "bitflags 2.9.1",
+  "block",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics-types",
+- "libc",
+  "objc",
+ ]
+ 
+ [[package]]
+ name = "colorchoice"
+-version = "1.0.3"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
++checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+ 
+ [[package]]
+ name = "colored"
+@@ -1705,9 +1702,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "core-foundation"
+-version = "0.10.0"
++version = "0.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
++checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+ dependencies = [
+  "core-foundation-sys",
+  "libc",
+@@ -1726,7 +1723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics-types",
+  "foreign-types 0.5.0",
+  "libc",
+@@ -1739,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "libc",
+ ]
+ 
+@@ -1825,7 +1822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+ dependencies = [
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -1835,29 +1832,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+ dependencies = [
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "curl"
+-version = "0.4.47"
++version = "0.4.48"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
++checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b"
+ dependencies = [
+  "curl-sys",
+  "libc",
+  "openssl-probe",
+  "openssl-sys",
+  "schannel",
+- "socket2 0.5.9",
+- "windows-sys 0.52.0",
++ "socket2 0.5.10",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+ name = "curl-sys"
+-version = "0.4.80+curl-8.12.1"
++version = "0.4.82+curl-8.14.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734"
++checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -1865,7 +1862,7 @@ dependencies = [
+  "openssl-sys",
+  "pkg-config",
+  "vcpkg",
+- "windows-sys 0.52.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -1889,7 +1886,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "strsim",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -1900,7 +1897,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+ dependencies = [
+  "darling_core",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -1982,7 +1979,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2003,7 +2000,7 @@ dependencies = [
+  "darling",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2013,7 +2010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
+ dependencies = [
+  "derive_builder_core",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2026,7 +2023,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "rustc_version",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2052,15 +2049,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "diesel_derives"
+-version = "2.2.5"
++version = "2.2.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "68d4216021b3ea446fd2047f5c8f8fe6e98af34508a254a01e4d6bc1e844f84d"
++checksum = "1b96984c469425cb577bf6f17121ecb3e4fe1e81de5d8f780dd372802858d756"
+ dependencies = [
+  "diesel_table_macro_syntax",
+  "dsl_auto_type",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2080,7 +2077,7 @@ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
+ dependencies = [
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2162,7 +2159,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+ dependencies = [
+  "libc",
+  "option-ext",
+- "redox_users 0.5.0",
++ "redox_users 0.5.2",
+  "windows-sys 0.60.2",
+ ]
+ 
+@@ -2190,6 +2187,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+ dependencies = [
+  "bitflags 2.9.1",
++ "block2 0.6.1",
++ "libc",
+  "objc2 0.6.1",
+ ]
+ 
+@@ -2201,7 +2200,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2210,7 +2209,7 @@ version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+ dependencies = [
+- "libloading",
++ "libloading 0.8.8",
+ ]
+ 
+ [[package]]
+@@ -2227,13 +2226,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "dlopen2_derive"
+-version = "0.4.0"
++version = "0.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
++checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2277,7 +2276,7 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2303,9 +2302,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+ 
+ [[package]]
+ name = "dyn-clone"
+-version = "1.0.19"
++version = "1.0.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
++checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+ 
+ [[package]]
+ name = "either"
+@@ -2315,16 +2314,16 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+ 
+ [[package]]
+ name = "embed-resource"
+-version = "3.0.2"
++version = "3.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fbc6e0d8e0c03a655b53ca813f0463d2c956bc4db8138dbc89f120b066551e3"
++checksum = "4c6d81016d6c977deefb2ef8d8290da019e27cc26167e102185da528e6c0ab38"
+ dependencies = [
+  "cc",
+  "memchr",
+  "rustc_version",
+- "toml",
++ "toml 0.9.5",
+  "vswhom",
+- "winreg 0.52.0",
++ "winreg 0.55.0",
+ ]
+ 
+ [[package]]
+@@ -2356,9 +2355,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+ 
+ [[package]]
+ name = "enumflags2"
+-version = "0.7.11"
++version = "0.7.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
++checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+ dependencies = [
+  "enumflags2_derive",
+  "serde",
+@@ -2366,13 +2365,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "enumflags2_derive"
+-version = "0.7.11"
++version = "0.7.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
++checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2403,12 +2402,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "errno"
+-version = "0.3.12"
++version = "0.3.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
++checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+ dependencies = [
+  "libc",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -2419,9 +2418,9 @@ checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
+ 
+ [[package]]
+ name = "event-listener"
+-version = "5.4.0"
++version = "5.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
++checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+ dependencies = [
+  "concurrent-queue",
+  "parking",
+@@ -2495,11 +2494,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "file-id"
+-version = "0.2.2"
++version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
++checksum = "e1fc6a637b6dc58414714eddd9170ff187ecb0933d4c7024d1abbd23a3cc26e9"
+ dependencies = [
+- "windows-sys 0.52.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -2528,9 +2527,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+ 
+ [[package]]
+ name = "flate2"
+-version = "1.1.1"
++version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
++checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+ dependencies = [
+  "crc32fast",
+  "libz-rs-sys",
+@@ -2588,7 +2587,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2703,9 +2702,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+ 
+ [[package]]
+ name = "futures-lite"
+-version = "2.6.0"
++version = "2.6.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
++checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+ dependencies = [
+  "fastrand",
+  "futures-core",
+@@ -2722,7 +2721,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2919,7 +2918,7 @@ dependencies = [
+  "cfg-if",
+  "js-sys",
+  "libc",
+- "wasi 0.11.0+wasi-snapshot-preview1",
++ "wasi 0.11.1+wasi-snapshot-preview1",
+  "wasm-bindgen",
+ ]
+ 
+@@ -2997,7 +2996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "587d0dd757ea38f8a7b4761026162f6b9ab39e2cc7eba386852371841f5fe69b"
+ dependencies = [
+  "git2",
+- "gix-path 0.10.19",
++ "gix-path",
+  "log",
+  "shellexpand",
+  "thiserror 2.0.12",
+@@ -3066,7 +3065,7 @@ dependencies = [
+  "serde-error",
+  "tempfile",
+  "tokio",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "url",
+ ]
+@@ -3235,7 +3234,7 @@ dependencies = [
+  "bstr",
+  "gix",
+  "serde",
+- "toml",
++ "toml 0.8.23",
+  "walkdir",
+ ]
+ 
+@@ -3318,7 +3317,7 @@ dependencies = [
+  "gitbutler-testsupport",
+  "gix",
+  "serde",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -3346,7 +3345,7 @@ dependencies = [
+  "serde",
+  "strum",
+  "tempfile",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -3429,7 +3428,7 @@ dependencies = [
+  "serde_json",
+  "tempfile",
+  "thiserror 2.0.12",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "uuid",
+ ]
+@@ -3506,7 +3505,7 @@ dependencies = [
+  "itertools",
+  "serde",
+  "tempfile",
+- "toml",
++ "toml 0.8.23",
+ ]
+ 
+ [[package]]
+@@ -3729,15 +3728,16 @@ dependencies = [
+ [[package]]
+ name = "gix"
+ version = "0.73.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "514c29cc879bdc0286b0cbc205585a49b252809eb86c69df4ce4f855ee75f635"
+ dependencies = [
+- "gix-actor 0.35.3",
++ "gix-actor",
+  "gix-attributes 0.27.0",
+  "gix-command",
+  "gix-commitgraph 0.29.0",
+  "gix-config",
+  "gix-credentials",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-diff",
+  "gix-dir",
+  "gix-discover 0.41.0",
+@@ -3756,7 +3756,7 @@ dependencies = [
+  "gix-object 0.50.1",
+  "gix-odb",
+  "gix-pack",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-prompt",
+  "gix-protocol",
+@@ -3769,12 +3769,12 @@ dependencies = [
+  "gix-status",
+  "gix-submodule",
+  "gix-tempfile 18.0.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-transport",
+  "gix-traverse 0.47.0",
+  "gix-url",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
++ "gix-validate",
+  "gix-worktree 0.42.0",
+  "gix-worktree-state",
+  "once_cell",
+@@ -3783,28 +3783,15 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-actor"
+-version = "0.35.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "58ebbb8f41071c7cf318a0b1db667c34e1df49db7bf387d282a4e61a3b97882c"
+-dependencies = [
+- "bstr",
+- "gix-date 0.10.3",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itoa",
+- "thiserror 2.0.12",
+- "winnow 0.7.12",
+-]
+-
+ [[package]]
+ name = "gix-actor"
+ version = "0.35.3"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d1b1ec302f8dc059df125ed46dfdc7e9d33fe7724df19843aea53b5ffd32d5bb"
+ dependencies = [
+  "bstr",
+- "gix-date 0.10.4",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-date",
++ "gix-utils",
+  "itoa",
+  "serde",
+  "thiserror 2.0.12",
+@@ -3819,9 +3806,9 @@ checksum = "6f50d813d5c2ce9463ba0c29eea90060df08e38ad8f34b8a192259f8bce5c078"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.20.1",
+- "gix-path 0.10.19",
+- "gix-quote 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
+  "kstring",
+  "smallvec",
+  "thiserror 2.0.12",
+@@ -3831,13 +3818,14 @@ dependencies = [
+ [[package]]
+ name = "gix-attributes"
+ version = "0.27.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45442188216d08a5959af195f659cb1f244a50d7d2d0c3873633b1cd7135f638"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
+  "kstring",
+  "serde",
+  "smallvec",
+@@ -3854,14 +3842,6 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-bitmap"
+-version = "0.2.14"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-chunk"
+ version = "0.4.11"
+@@ -3871,23 +3851,16 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-chunk"
+-version = "0.4.11"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-command"
+ version = "0.6.2"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6b31b65ca48a352ae86312b27a514a0c661935f96b481ac8b4371f65815eb196"
+ dependencies = [
+  "bstr",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
+  "shell-words",
+ ]
+ 
+@@ -3898,7 +3871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e05050fd6caa6c731fe3bd7f9485b3b520be062d3d139cb2626e052d6c127951"
+ dependencies = [
+  "bstr",
+- "gix-chunk 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-chunk",
+  "gix-hash 0.18.0",
+  "memmap2",
+  "thiserror 2.0.12",
+@@ -3907,10 +3880,11 @@ dependencies = [
+ [[package]]
+ name = "gix-commitgraph"
+ version = "0.29.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6bb23121e952f43a5b07e3e80890336cb847297467a410475036242732980d06"
+ dependencies = [
+  "bstr",
+- "gix-chunk 0.4.11 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-chunk",
+  "gix-hash 0.19.0",
+  "memmap2",
+  "serde",
+@@ -3920,13 +3894,14 @@ dependencies = [
+ [[package]]
+ name = "gix-config"
+ version = "0.46.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5dfb898c5b695fd4acfc3c0ab638525a65545d47706064dcf7b5ead6cdb136c0"
+ dependencies = [
+  "bstr",
+  "gix-config-value",
+  "gix-features 0.43.1",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-ref 0.53.0",
+  "gix-sec 0.12.0",
+  "memchr",
+@@ -3940,11 +3915,12 @@ dependencies = [
+ [[package]]
+ name = "gix-config-value"
+ version = "0.15.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f012703eb67e263c6c1fc96649fec47694dd3e5d2a91abfc65e4a6a6dc85309"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+- "gix-path 0.10.20",
++ "gix-path",
+  "libc",
+  "thiserror 2.0.12",
+ ]
+@@ -3952,38 +3928,27 @@ dependencies = [
+ [[package]]
+ name = "gix-credentials"
+ version = "0.30.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0039dd3ac606dd80b16353a41b61fc237ca5cb8b612f67a9f880adfad4be4e05"
+ dependencies = [
+  "bstr",
+  "gix-command",
+  "gix-config-value",
+- "gix-date 0.10.4",
+- "gix-path 0.10.20",
++ "gix-date",
++ "gix-path",
+  "gix-prompt",
+  "gix-sec 0.12.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-url",
+  "serde",
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-date"
+-version = "0.10.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d7235bdf4d9d54a6901928e3a37f91c16f419e6957f520ed929c3d292b84226e"
+-dependencies = [
+- "bstr",
+- "itoa",
+- "jiff",
+- "smallvec",
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-date"
+ version = "0.10.4"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "467254054f8df1e85b5f73cb910602767b0122391d994302a091841ba43edfaa"
+ dependencies = [
+  "bstr",
+  "itoa",
+@@ -3996,7 +3961,8 @@ dependencies = [
+ [[package]]
+ name = "gix-diff"
+ version = "0.53.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de854852010d44a317f30c92d67a983e691c9478c8a3fb4117c1f48626bcdea8"
+ dependencies = [
+  "bstr",
+  "gix-attributes 0.27.0",
+@@ -4006,10 +3972,10 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-tempfile 18.0.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-traverse 0.47.0",
+  "gix-worktree 0.42.0",
+  "imara-diff",
+@@ -4019,7 +3985,8 @@ dependencies = [
+ [[package]]
+ name = "gix-dir"
+ version = "0.15.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dad34e4f373f94902df1ba1d2a1df3a1b29eacd15e316ac5972d842e31422dd7"
+ dependencies = [
+  "bstr",
+  "gix-discover 0.41.0",
+@@ -4027,10 +3994,10 @@ dependencies = [
+  "gix-ignore 0.16.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
++ "gix-utils",
+  "gix-worktree 0.42.0",
+  "thiserror 2.0.12",
+ ]
+@@ -4045,7 +4012,7 @@ dependencies = [
+  "dunce",
+  "gix-fs 0.15.0",
+  "gix-hash 0.18.0",
+- "gix-path 0.10.19",
++ "gix-path",
+  "gix-ref 0.52.1",
+  "gix-sec 0.11.0",
+  "thiserror 2.0.12",
+@@ -4054,13 +4021,14 @@ dependencies = [
+ [[package]]
+ name = "gix-discover"
+ version = "0.41.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ffb180c91ca1a2cf53e828bb63d8d8f8fa7526f49b83b33d7f46cbeb5d79d30a"
+ dependencies = [
+  "bstr",
+  "dunce",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-ref 0.53.0",
+  "gix-sec 0.12.0",
+  "thiserror 2.0.12",
+@@ -4072,9 +4040,9 @@ version = "0.42.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "56f4399af6ec4fd9db84dd4cf9656c5c785ab492ab40a7c27ea92b4241923fed"
+ dependencies = [
+- "gix-path 0.10.19",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-trace",
++ "gix-utils",
+  "libc",
+  "prodash 29.0.2",
+  "walkdir",
+@@ -4083,15 +4051,16 @@ dependencies = [
+ [[package]]
+ name = "gix-features"
+ version = "0.43.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd1543cd9b8abcbcebaa1a666a5c168ee2cda4dea50d3961ee0e6d1c42f81e5b"
+ dependencies = [
+  "bytes",
+  "crc32fast",
+  "crossbeam-channel",
+  "flate2",
+- "gix-path 0.10.20",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-trace",
++ "gix-utils",
+  "libc",
+  "once_cell",
+  "parking_lot",
+@@ -4103,7 +4072,8 @@ dependencies = [
+ [[package]]
+ name = "gix-filter"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa6571a3927e7ab10f64279a088e0dae08e8da05547771796d7389bbe28ad9ff"
+ dependencies = [
+  "bstr",
+  "encoding_rs",
+@@ -4112,10 +4082,10 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-object 0.50.1",
+  "gix-packetline-blocking",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
++ "gix-utils",
+  "smallvec",
+  "thiserror 2.0.12",
+ ]
+@@ -4129,21 +4099,22 @@ dependencies = [
+  "bstr",
+  "fastrand",
+  "gix-features 0.42.1",
+- "gix-path 0.10.19",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-fs"
+ version = "0.16.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d793f71e955d18f228d20ec433dcce6d0e8577efcdfd11d72d09d7cc2758dfd1"
+ dependencies = [
+  "bstr",
+  "fastrand",
+  "gix-features 0.43.1",
+- "gix-path 0.10.20",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+@@ -4156,18 +4127,19 @@ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-features 0.42.1",
+- "gix-path 0.10.19",
++ "gix-path",
+ ]
+ 
+ [[package]]
+ name = "gix-glob"
+ version = "0.21.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b947db8366823e7a750c254f6bb29e27e17f27e457bf336ba79b32423db62cd5"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-features 0.43.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "serde",
+ ]
+ 
+@@ -4186,7 +4158,8 @@ dependencies = [
+ [[package]]
+ name = "gix-hash"
+ version = "0.19.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "251fad79796a731a2a7664d9ea95ee29a9e99474de2769e152238d4fdb69d50e"
+ dependencies = [
+  "faster-hex",
+  "gix-features 0.43.1",
+@@ -4209,7 +4182,8 @@ dependencies = [
+ [[package]]
+ name = "gix-hashtable"
+ version = "0.9.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c35300b54896153e55d53f4180460931ccd69b7e8d2f6b9d6401122cdedc4f07"
+ dependencies = [
+  "gix-hash 0.19.0",
+  "hashbrown 0.15.4",
+@@ -4224,20 +4198,21 @@ checksum = "ae358c3c96660b10abc7da63c06788dfded603e717edbd19e38c6477911b71c8"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.20.1",
+- "gix-path 0.10.19",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-trace",
+  "unicode-bom",
+ ]
+ 
+ [[package]]
+ name = "gix-ignore"
+ version = "0.16.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "564d6fddf46e2c981f571b23d6ad40cb08bddcaf6fc7458b1d49727ad23c2870"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-trace",
+  "serde",
+  "unicode-bom",
+ ]
+@@ -4252,15 +4227,15 @@ dependencies = [
+  "bstr",
+  "filetime",
+  "fnv",
+- "gix-bitmap 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-bitmap",
+  "gix-features 0.42.1",
+  "gix-fs 0.15.0",
+  "gix-hash 0.18.0",
+  "gix-lock 17.1.0",
+  "gix-object 0.49.1",
+  "gix-traverse 0.46.2",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-utils",
++ "gix-validate",
+  "hashbrown 0.14.5",
+  "itoa",
+  "libc",
+@@ -4273,21 +4248,22 @@ dependencies = [
+ [[package]]
+ name = "gix-index"
+ version = "0.41.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2af39fde3ce4ce11371d9ce826f2936ec347318f2d1972fe98c2e7134e267e25"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "filetime",
+  "fnv",
+- "gix-bitmap 0.2.14 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-bitmap",
+  "gix-features 0.43.1",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+  "gix-lock 18.0.0",
+  "gix-object 0.50.1",
+  "gix-traverse 0.47.0",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
++ "gix-validate",
+  "hashbrown 0.15.4",
+  "itoa",
+  "libc",
+@@ -4305,28 +4281,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "570f8b034659f256366dc90f1a24924902f20acccd6a15be96d44d1269e7a796"
+ dependencies = [
+  "gix-tempfile 17.1.0",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-lock"
+ version = "18.0.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9fa71da90365668a621e184eb5b979904471af1b3b09b943a84bc50e8ad42ed"
+ dependencies = [
+  "gix-tempfile 18.0.0",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-mailmap"
+ version = "0.27.2"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a8982e1874a2034d7dd481bcdd6a05579ba444bcda748511eb0f8e50eb10487"
+ dependencies = [
+  "bstr",
+- "gix-actor 0.35.3",
+- "gix-date 0.10.4",
++ "gix-actor",
++ "gix-date",
+  "serde",
+  "thiserror 2.0.12",
+ ]
+@@ -4334,7 +4312,8 @@ dependencies = [
+ [[package]]
+ name = "gix-merge"
+ version = "0.6.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88c2580b4122a0c40de25f8f20a1817704b5f4e4798c78d29d4a89500af2da89"
+ dependencies = [
+  "bstr",
+  "gix-command",
+@@ -4344,12 +4323,12 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
+  "gix-revision",
+  "gix-revwalk 0.21.0",
+  "gix-tempfile 18.0.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-worktree 0.42.0",
+  "imara-diff",
+  "thiserror 2.0.12",
+@@ -4358,11 +4337,12 @@ dependencies = [
+ [[package]]
+ name = "gix-negotiate"
+ version = "0.21.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d58d4c9118885233be971e0d7a589f5cfb1a8bd6cb6e2ecfb0fc6b1b293c83b"
+ dependencies = [
+  "bitflags 2.9.1",
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-object 0.50.1",
+  "gix-revwalk 0.21.0",
+@@ -4377,14 +4357,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d957ca3640c555d48bb27f8278c67169fa1380ed94f6452c5590742524c40fbb"
+ dependencies = [
+  "bstr",
+- "gix-actor 0.35.2",
+- "gix-date 0.10.3",
++ "gix-actor",
++ "gix-date",
+  "gix-features 0.42.1",
+  "gix-hash 0.18.0",
+  "gix-hashtable 0.8.1",
+- "gix-path 0.10.19",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-utils",
++ "gix-validate",
+  "itoa",
+  "smallvec",
+  "thiserror 2.0.12",
+@@ -4394,17 +4374,18 @@ dependencies = [
+ [[package]]
+ name = "gix-object"
+ version = "0.50.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aff2047f96d57bcc721426e11ec0f9efeb432d5e6ef5f1aa84cfc55198971dca"
+ dependencies = [
+  "bstr",
+- "gix-actor 0.35.3",
+- "gix-date 0.10.4",
++ "gix-actor",
++ "gix-date",
+  "gix-features 0.43.1",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+- "gix-path 0.10.20",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-utils",
++ "gix-validate",
+  "itoa",
+  "serde",
+  "smallvec",
+@@ -4415,18 +4396,19 @@ dependencies = [
+ [[package]]
+ name = "gix-odb"
+ version = "0.70.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c9d7af10fda9df0bb4f7f9bd507963560b3c66cb15a5b825caf752e0eb109ac"
+ dependencies = [
+  "arc-swap",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-features 0.43.1",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+  "gix-pack",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
+  "parking_lot",
+  "serde",
+  "tempfile",
+@@ -4436,15 +4418,16 @@ dependencies = [
+ [[package]]
+ name = "gix-pack"
+ version = "0.60.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d8571df89bfca5abb49c3e3372393f7af7e6f8b8dbe2b96303593cef5b263019"
+ dependencies = [
+  "clru",
+- "gix-chunk 0.4.11 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-chunk",
+  "gix-features 0.43.1",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-tempfile 18.0.0",
+  "memmap2",
+  "parking_lot",
+@@ -4457,47 +4440,36 @@ dependencies = [
+ [[package]]
+ name = "gix-packetline"
+ version = "0.19.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2592fbd36249a2fea11056f7055cc376301ef38d903d157de41998335bbf1f93"
+ dependencies = [
+  "bstr",
+  "faster-hex",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-packetline-blocking"
+ version = "0.19.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "bstr",
+- "faster-hex",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "thiserror 2.0.12",
+-]
+-
+-[[package]]
+-name = "gix-path"
+-version = "0.10.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c6279d323d925ad4790602105ae27df4b915e7a7d81e4cdba2603121c03ad111"
++checksum = "fc4e706f328cd494cc8f932172e123a72b9a4711b0db5e411681432a89bd4c94"
+ dependencies = [
+  "bstr",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "home",
+- "once_cell",
++ "faster-hex",
++ "gix-trace",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-path"
+ version = "0.10.20"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06d37034a4c67bbdda76f7bcd037b2f7bc0fba0c09a6662b19697a5716e7b2fd"
+ dependencies = [
+  "bstr",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
++ "gix-validate",
+  "home",
+  "once_cell",
+  "thiserror 2.0.12",
+@@ -4506,21 +4478,23 @@ dependencies = [
+ [[package]]
+ name = "gix-pathspec"
+ version = "0.12.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "daedead611c9bd1f3640dc90a9012b45f790201788af4d659f28d94071da7fba"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-attributes 0.27.0",
+  "gix-config-value",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
++ "gix-path",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-prompt"
+ version = "0.11.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ffa1a7a34c81710aaa666a428c142b6c5d640492fcd41267db0740d923c7906"
+ dependencies = [
+  "gix-command",
+  "gix-config-value",
+@@ -4532,11 +4506,12 @@ dependencies = [
+ [[package]]
+ name = "gix-protocol"
+ version = "0.51.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12b4b807c47ffcf7c1e5b8119585368a56449f3493da93b931e1d4239364e922"
+ dependencies = [
+  "bstr",
+  "gix-credentials",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-features 0.43.1",
+  "gix-hash 0.19.0",
+  "gix-lock 18.0.0",
+@@ -4546,9 +4521,9 @@ dependencies = [
+  "gix-refspec",
+  "gix-revwalk 0.21.0",
+  "gix-shallow",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-transport",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
+  "maybe-async",
+  "serde",
+  "thiserror 2.0.12",
+@@ -4562,17 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4a375a75b4d663e8bafe3bf4940a18a23755644c13582fa326e99f8f987d83fd"
+ dependencies = [
+  "bstr",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "thiserror 2.0.12",
+-]
+-
+-[[package]]
+-name = "gix-quote"
+-version = "0.6.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "bstr",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+@@ -4582,16 +4547,16 @@ version = "0.52.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d1b7985657029684d759f656b09abc3e2c73085596d5cdb494428823970a7762"
+ dependencies = [
+- "gix-actor 0.35.2",
++ "gix-actor",
+  "gix-features 0.42.1",
+  "gix-fs 0.15.0",
+  "gix-hash 0.18.0",
+  "gix-lock 17.1.0",
+  "gix-object 0.49.1",
+- "gix-path 0.10.19",
++ "gix-path",
+  "gix-tempfile 17.1.0",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-utils",
++ "gix-validate",
+  "memmap2",
+  "thiserror 2.0.12",
+  "winnow 0.7.12",
+@@ -4600,18 +4565,19 @@ dependencies = [
+ [[package]]
+ name = "gix-ref"
+ version = "0.53.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b7a23209d4e4cbdc2086d294f5f3f8707ac6286768847024d952d8cd3278c5b"
+ dependencies = [
+- "gix-actor 0.35.3",
++ "gix-actor",
+  "gix-features 0.43.1",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+  "gix-lock 18.0.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-tempfile 18.0.0",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
++ "gix-validate",
+  "memmap2",
+  "serde",
+  "thiserror 2.0.12",
+@@ -4621,12 +4587,13 @@ dependencies = [
+ [[package]]
+ name = "gix-refspec"
+ version = "0.31.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d29cae1ae31108826e7156a5e60bffacab405f4413f5bc0375e19772cce0055"
+ dependencies = [
+  "bstr",
+  "gix-hash 0.19.0",
+  "gix-revision",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-validate",
+  "smallvec",
+  "thiserror 2.0.12",
+ ]
+@@ -4634,17 +4601,18 @@ dependencies = [
+ [[package]]
+ name = "gix-revision"
+ version = "0.35.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f651f2b1742f760bb8161d6743229206e962b73d9c33c41f4e4aefa6586cbd3d"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+  "gix-revwalk 0.21.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "serde",
+  "thiserror 2.0.12",
+ ]
+@@ -4656,7 +4624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1bc756b73225bf005ddeb871d1ca7b3c33e2417d0d53e56effa5a36765b52b28"
+ dependencies = [
+  "gix-commitgraph 0.28.0",
+- "gix-date 0.10.3",
++ "gix-date",
+  "gix-hash 0.18.0",
+  "gix-hashtable 0.8.1",
+  "gix-object 0.49.1",
+@@ -4667,10 +4635,11 @@ dependencies = [
+ [[package]]
+ name = "gix-revwalk"
+ version = "0.21.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06e74f91709729e099af6721bd0fa7d62f243f2005085152301ca5cdd86ec02c"
+ dependencies = [
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+@@ -4685,7 +4654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d0dabbc78c759ecc006b970339394951b2c8e1e38a37b072c105b80b84c308fd"
+ dependencies = [
+  "bitflags 2.9.1",
+- "gix-path 0.10.19",
++ "gix-path",
+  "libc",
+  "windows-sys 0.59.0",
+ ]
+@@ -4693,19 +4662,21 @@ dependencies = [
+ [[package]]
+ name = "gix-sec"
+ version = "0.12.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09f7053ed7c66633b56c57bc6ed3377be3166eaf3dc2df9f1c5ec446df6fdf2c"
+ dependencies = [
+  "bitflags 2.9.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "libc",
+  "serde",
+- "windows-sys 0.60.2",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+ name = "gix-shallow"
+ version = "0.5.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d936745103243ae4c510f19e0760ce73fb0f08096588fdbe0f0d7fb7ce8944b7"
+ dependencies = [
+  "bstr",
+  "gix-hash 0.19.0",
+@@ -4717,7 +4688,8 @@ dependencies = [
+ [[package]]
+ name = "gix-status"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a4afff9b34eeececa8bdc32b42fb318434b6b1391d9f8d45fe455af08dc2d35"
+ dependencies = [
+  "bstr",
+  "filetime",
+@@ -4729,7 +4701,7 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-worktree 0.42.0",
+  "portable-atomic",
+@@ -4739,11 +4711,12 @@ dependencies = [
+ [[package]]
+ name = "gix-submodule"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "657cc5dd43cbc7a14d9c5aaf02cfbe9c2a15d077cded3f304adb30ef78852d3e"
+ dependencies = [
+  "bstr",
+  "gix-config",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-refspec",
+  "gix-url",
+@@ -4768,7 +4741,8 @@ dependencies = [
+ [[package]]
+ name = "gix-tempfile"
+ version = "18.0.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "666c0041bcdedf5fa05e9bef663c897debab24b7dc1741605742412d1d47da57"
+ dependencies = [
+  "dashmap",
+  "gix-fs 0.16.0",
+@@ -4807,11 +4781,6 @@ name = "gix-trace"
+ version = "0.1.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e2ccaf54b0b1743a695b482ca0ab9d7603744d8d10b2e5d1a332fef337bee658"
+-
+-[[package]]
+-name = "gix-trace"
+-version = "0.1.13"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+ dependencies = [
+  "tracing-core",
+ ]
+@@ -4819,7 +4788,8 @@ dependencies = [
+ [[package]]
+ name = "gix-transport"
+ version = "0.48.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12f7cc0179fc89d53c54e1f9ce51229494864ab4bf136132d69db1b011741ca3"
+ dependencies = [
+  "base64 0.22.1",
+  "bstr",
+@@ -4828,7 +4798,7 @@ dependencies = [
+  "gix-credentials",
+  "gix-features 0.43.1",
+  "gix-packetline",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-quote",
+  "gix-sec 0.12.0",
+  "gix-url",
+  "serde",
+@@ -4843,7 +4813,7 @@ checksum = "b8648172f85aca3d6e919c06504b7ac26baef54e04c55eb0100fa588c102cc33"
+ dependencies = [
+  "bitflags 2.9.1",
+  "gix-commitgraph 0.28.0",
+- "gix-date 0.10.3",
++ "gix-date",
+  "gix-hash 0.18.0",
+  "gix-hashtable 0.8.1",
+  "gix-object 0.49.1",
+@@ -4855,11 +4825,12 @@ dependencies = [
+ [[package]]
+ name = "gix-traverse"
+ version = "0.47.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c7cdc82509d792ba0ad815f86f6b469c7afe10f94362e96c4494525a6601bdd5"
+ dependencies = [
+  "bitflags 2.9.1",
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+@@ -4871,11 +4842,12 @@ dependencies = [
+ [[package]]
+ name = "gix-url"
+ version = "0.32.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1b76a9d266254ad287ffd44467cd88e7868799b08f4d52e02d942b93e514d16f"
+ dependencies = [
+  "bstr",
+  "gix-features 0.43.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "percent-encoding",
+  "serde",
+  "thiserror 2.0.12",
+@@ -4887,15 +4859,6 @@ name = "gix-utils"
+ version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "5351af2b172caf41a3728eb4455326d84e0d70fe26fc4de74ab0bd37df4191c5"
+-dependencies = [
+- "fastrand",
+- "unicode-normalization",
+-]
+-
+-[[package]]
+-name = "gix-utils"
+-version = "0.3.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+ dependencies = [
+  "bstr",
+  "fastrand",
+@@ -4912,15 +4875,6 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-validate"
+-version = "0.10.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "bstr",
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-worktree"
+ version = "0.41.0"
+@@ -4936,14 +4890,15 @@ dependencies = [
+  "gix-ignore 0.15.0",
+  "gix-index 0.40.1",
+  "gix-object 0.49.1",
+- "gix-path 0.10.19",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-validate",
+ ]
+ 
+ [[package]]
+ name = "gix-worktree"
+ version = "0.42.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "55f625ac9126c19bef06dbc6d2703cdd7987e21e35b497bb265ac37d383877b1"
+ dependencies = [
+  "bstr",
+  "gix-attributes 0.27.0",
+@@ -4954,15 +4909,16 @@ dependencies = [
+  "gix-ignore 0.16.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-validate",
+  "serde",
+ ]
+ 
+ [[package]]
+ name = "gix-worktree-state"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06ba9b17cbacc02b25801197b20100f7f9bd621db1e7fce9d3c8ab3175207bf8"
+ dependencies = [
+  "bstr",
+  "gix-features 0.43.1",
+@@ -4972,7 +4928,7 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-worktree 0.42.0",
+  "io-close",
+  "thiserror 2.0.12",
+@@ -5012,7 +4968,7 @@ dependencies = [
+  "proc-macro-error",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -5091,14 +5047,14 @@ dependencies = [
+  "proc-macro-error",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "h2"
+-version = "0.3.26"
++version = "0.3.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
++checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -5106,7 +5062,7 @@ dependencies = [
+  "futures-sink",
+  "futures-util",
+  "http 0.2.12",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "slab",
+  "tokio",
+  "tokio-util",
+@@ -5115,9 +5071,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "h2"
+-version = "0.4.10"
++version = "0.4.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
++checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+ dependencies = [
+  "atomic-waker",
+  "bytes",
+@@ -5125,7 +5081,7 @@ dependencies = [
+  "futures-core",
+  "futures-sink",
+  "http 1.3.1",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "slab",
+  "tokio",
+  "tokio-util",
+@@ -5208,9 +5164,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+ 
+ [[package]]
+ name = "hermit-abi"
+-version = "0.4.0"
++version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
++checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+ 
+ [[package]]
+ name = "hex"
+@@ -5341,14 +5297,14 @@ dependencies = [
+  "futures-channel",
+  "futures-core",
+  "futures-util",
+- "h2 0.3.26",
++ "h2 0.3.27",
+  "http 0.2.12",
+  "http-body 0.4.6",
+  "httparse",
+  "httpdate",
+  "itoa",
+  "pin-project-lite",
+- "socket2 0.5.9",
++ "socket2 0.5.10",
+  "tokio",
+  "tower-service",
+  "tracing",
+@@ -5364,7 +5320,7 @@ dependencies = [
+  "bytes",
+  "futures-channel",
+  "futures-util",
+- "h2 0.4.10",
++ "h2 0.4.12",
+  "http 1.3.1",
+  "http-body 1.0.1",
+  "httparse",
+@@ -5392,21 +5348,20 @@ dependencies = [
+ 
+ [[package]]
+ name = "hyper-rustls"
+-version = "0.27.5"
++version = "0.27.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
++checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+ dependencies = [
+- "futures-util",
+  "http 1.3.1",
+  "hyper 1.6.0",
+  "hyper-util",
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "rustls-native-certs",
+  "rustls-pki-types",
+  "tokio",
+  "tokio-rustls 0.26.2",
+  "tower-service",
+- "webpki-roots 0.26.11",
++ "webpki-roots 1.0.2",
+ ]
+ 
+ [[package]]
+@@ -5440,9 +5395,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "hyper-util"
+-version = "0.1.13"
++version = "0.1.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
++checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+ dependencies = [
+  "base64 0.22.1",
+  "bytes",
+@@ -5456,7 +5411,7 @@ dependencies = [
+  "libc",
+  "percent-encoding",
+  "pin-project-lite",
+- "socket2 0.5.9",
++ "socket2 0.6.0",
+  "system-configuration 0.6.1",
+  "tokio",
+  "tower-service",
+@@ -5547,9 +5502,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+ 
+ [[package]]
+ name = "icu_properties"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
++checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+ dependencies = [
+  "displaydoc",
+  "icu_collections",
+@@ -5563,9 +5518,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "icu_properties_data"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
++checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+ 
+ [[package]]
+ name = "icu_provider"
+@@ -5646,9 +5601,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "indexmap"
+-version = "2.9.0"
++version = "2.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
++checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+ dependencies = [
+  "equivalent",
+  "hashbrown 0.15.4",
+@@ -5843,7 +5798,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -5895,9 +5850,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "jpeg-decoder"
+-version = "0.3.1"
++version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
++checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
+ 
+ [[package]]
+ name = "js-sys"
+@@ -5954,7 +5909,7 @@ dependencies = [
+  "log",
+  "secret-service",
+  "security-framework 2.11.1",
+- "security-framework 3.2.0",
++ "security-framework 3.3.0",
+  "windows-sys 0.60.2",
+  "zeroize",
+ ]
+@@ -5997,7 +5952,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
+ dependencies = [
+  "cssparser",
+  "html5ever",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "selectors",
+ ]
+ 
+@@ -6027,7 +5982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
+ dependencies = [
+  "gtk-sys",
+- "libloading",
++ "libloading 0.7.4",
+  "once_cell",
+ ]
+ 
+@@ -6048,9 +6003,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.18.1+1.9.0"
++version = "0.18.2+1.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
++checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -6070,11 +6025,21 @@ dependencies = [
+  "winapi",
+ ]
+ 
++[[package]]
++name = "libloading"
++version = "0.8.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
++dependencies = [
++ "cfg-if",
++ "windows-targets 0.53.3",
++]
++
+ [[package]]
+ name = "libredox"
+-version = "0.1.3"
++version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
++checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
+ dependencies = [
+  "bitflags 2.9.1",
+  "libc",
+@@ -6108,9 +6073,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "libz-rs-sys"
+-version = "0.5.0"
++version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
++checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
+ dependencies = [
+  "zlib-rs",
+ ]
+@@ -6157,9 +6122,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+ 
+ [[package]]
+ name = "litrs"
+-version = "0.4.1"
++version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
++checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
+ 
+ [[package]]
+ name = "lock_api"
+@@ -6244,7 +6209,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -6282,7 +6247,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -6293,9 +6258,9 @@ checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0"
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.7.4"
++version = "2.7.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+ 
+ [[package]]
+ name = "memmap2"
+@@ -6317,12 +6282,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "migrations_internals"
+-version = "2.2.0"
++version = "2.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff"
++checksum = "3bda1634d70d5bd53553cf15dca9842a396e8c799982a3ad22998dc44d961f24"
+ dependencies = [
+  "serde",
+- "toml",
++ "toml 0.9.5",
+ ]
+ 
+ [[package]]
+@@ -6360,15 +6325,15 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+ 
+ [[package]]
+ name = "minisign-verify"
+-version = "0.2.3"
++version = "0.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3"
++checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43"
+ 
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.8.8"
++version = "0.8.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
++checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+ dependencies = [
+  "adler2",
+  "simd-adler32",
+@@ -6376,14 +6341,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "mio"
+-version = "1.0.3"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
++checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+ dependencies = [
+  "libc",
+  "log",
+- "wasi 0.11.0+wasi-snapshot-preview1",
+- "windows-sys 0.52.0",
++ "wasi 0.11.1+wasi-snapshot-preview1",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -6394,23 +6359,23 @@ checksum = "4e1d4c44418358edcac6e1d9ce59cea7fb38052429c7704033f1196f0c179e6a"
+ 
+ [[package]]
+ name = "muda"
+-version = "0.17.0"
++version = "0.17.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "58b89bf91c19bf036347f1ab85a81c560f08c0667c8601bece664d860a600988"
++checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a"
+ dependencies = [
+  "crossbeam-channel",
+  "dpi",
+  "gtk",
+  "keyboard-types",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+  "once_cell",
+  "png",
+  "serde",
+  "thiserror 2.0.12",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -6661,23 +6626,24 @@ dependencies = [
+ 
+ [[package]]
+ name = "num_enum"
+-version = "0.7.3"
++version = "0.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
++checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
+ dependencies = [
+  "num_enum_derive",
++ "rustversion",
+ ]
+ 
+ [[package]]
+ name = "num_enum_derive"
+-version = "0.7.3"
++version = "0.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
++checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
+ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -6724,22 +6690,6 @@ dependencies = [
+  "objc2-exception-helper",
+ ]
+ 
+-[[package]]
+-name = "objc2-app-kit"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+-dependencies = [
+- "bitflags 2.9.1",
+- "block2 0.5.1",
+- "libc",
+- "objc2 0.5.2",
+- "objc2-core-data 0.2.2",
+- "objc2-core-image 0.2.2",
+- "objc2-foundation 0.2.2",
+- "objc2-quartz-core 0.2.2",
+-]
+-
+ [[package]]
+ name = "objc2-app-kit"
+ version = "0.3.1"
+@@ -6751,10 +6701,10 @@ dependencies = [
+  "libc",
+  "objc2 0.6.1",
+  "objc2-cloud-kit",
+- "objc2-core-data 0.3.1",
++ "objc2-core-data",
+  "objc2-core-foundation",
+  "objc2-core-graphics",
+- "objc2-core-image 0.3.1",
++ "objc2-core-image",
+  "objc2-foundation 0.3.1",
+  "objc2-quartz-core 0.3.1",
+ ]
+@@ -6770,18 +6720,6 @@ dependencies = [
+  "objc2-foundation 0.3.1",
+ ]
+ 
+-[[package]]
+-name = "objc2-core-data"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+-dependencies = [
+- "bitflags 2.9.1",
+- "block2 0.5.1",
+- "objc2 0.5.2",
+- "objc2-foundation 0.2.2",
+-]
+-
+ [[package]]
+ name = "objc2-core-data"
+ version = "0.3.1"
+@@ -6817,18 +6755,6 @@ dependencies = [
+  "objc2-io-surface",
+ ]
+ 
+-[[package]]
+-name = "objc2-core-image"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+-dependencies = [
+- "block2 0.5.1",
+- "objc2 0.5.2",
+- "objc2-foundation 0.2.2",
+- "objc2-metal",
+-]
+-
+ [[package]]
+ name = "objc2-core-image"
+ version = "0.3.1"
+@@ -6862,7 +6788,6 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+ dependencies = [
+  "bitflags 2.9.1",
+  "block2 0.5.1",
+- "dispatch",
+  "libc",
+  "objc2 0.5.2",
+ ]
+@@ -6921,7 +6846,7 @@ checksum = "26bb88504b5a050dbba515d2414607bf5e57dd56b107bc5f0351197a3e7bdc5d"
+ dependencies = [
+  "bitflags 2.9.1",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+ ]
+ 
+@@ -6970,7 +6895,7 @@ dependencies = [
+  "bitflags 2.9.1",
+  "block2 0.6.1",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+ ]
+@@ -6990,6 +6915,12 @@ version = "1.21.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+ 
++[[package]]
++name = "once_cell_polyfill"
++version = "1.70.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
++
+ [[package]]
+ name = "open"
+ version = "5.3.2"
+@@ -7004,9 +6935,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "openssl"
+-version = "0.10.72"
++version = "0.10.73"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
++checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+ dependencies = [
+  "bitflags 2.9.1",
+  "cfg-if",
+@@ -7025,7 +6956,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7036,18 +6967,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+ 
+ [[package]]
+ name = "openssl-src"
+-version = "300.5.0+3.5.0"
++version = "300.5.1+3.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
++checksum = "735230c832b28c000e3bc117119e6466a663ec73506bc0a9907ea4187508e42a"
+ dependencies = [
+  "cc",
+ ]
+ 
+ [[package]]
+ name = "openssl-sys"
+-version = "0.9.108"
++version = "0.9.109"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
++checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -7074,20 +7005,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "os_info"
+-version = "3.11.0"
++version = "3.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9"
++checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
+ dependencies = [
+  "log",
++ "plist",
+  "serde",
+  "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+ name = "os_pipe"
+-version = "1.2.1"
++version = "1.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
++checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
+ dependencies = [
+  "libc",
+  "windows-sys 0.59.0",
+@@ -7202,7 +7134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+ dependencies = [
+  "fixedbitset 0.4.2",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+ ]
+ 
+ [[package]]
+@@ -7213,7 +7145,7 @@ checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
+ dependencies = [
+  "fixedbitset 0.5.7",
+  "hashbrown 0.15.4",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "serde",
+ ]
+ 
+@@ -7321,7 +7253,7 @@ dependencies = [
+  "phf_shared 0.11.3",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7368,7 +7300,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7402,13 +7334,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+ 
+ [[package]]
+ name = "plist"
+-version = "1.7.1"
++version = "1.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d"
++checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1"
+ dependencies = [
+  "base64 0.22.1",
+- "indexmap 2.9.0",
+- "quick-xml 0.32.0",
++ "indexmap 2.10.0",
++ "quick-xml 0.38.1",
+  "serde",
+  "time",
+ ]
+@@ -7428,24 +7360,23 @@ dependencies = [
+ 
+ [[package]]
+ name = "polling"
+-version = "3.7.4"
++version = "3.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
++checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829"
+ dependencies = [
+  "cfg-if",
+  "concurrent-queue",
+  "hermit-abi",
+  "pin-project-lite",
+- "rustix 0.38.44",
+- "tracing",
+- "windows-sys 0.59.0",
++ "rustix 1.0.8",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+ name = "portable-atomic"
+-version = "1.11.0"
++version = "1.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+ 
+ [[package]]
+ name = "portable-atomic-util"
+@@ -7563,7 +7494,7 @@ version = "3.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+ dependencies = [
+- "toml_edit 0.22.26",
++ "toml_edit 0.22.27",
+ ]
+ 
+ [[package]]
+@@ -7644,7 +7575,7 @@ dependencies = [
+  "itertools",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7694,18 +7625,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "quick-xml"
+-version = "0.32.0"
++version = "0.37.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
++checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+ dependencies = [
+  "memchr",
+ ]
+ 
+ [[package]]
+ name = "quick-xml"
+-version = "0.37.5"
++version = "0.38.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
++checksum = "9845d9dccf565065824e69f9f235fafba1587031eda353c1f1561cd6a6be78f4"
+ dependencies = [
+  "memchr",
+ ]
+@@ -7722,8 +7653,8 @@ dependencies = [
+  "quinn-proto",
+  "quinn-udp",
+  "rustc-hash",
+- "rustls 0.23.27",
+- "socket2 0.5.9",
++ "rustls 0.23.31",
++ "socket2 0.5.10",
+  "thiserror 2.0.12",
+  "tokio",
+  "tracing",
+@@ -7742,7 +7673,7 @@ dependencies = [
+  "rand 0.9.2",
+  "ring",
+  "rustc-hash",
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "rustls-pki-types",
+  "slab",
+  "thiserror 2.0.12",
+@@ -7753,14 +7684,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "quinn-udp"
+-version = "0.5.12"
++version = "0.5.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
++checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+ dependencies = [
+  "cfg_aliases",
+  "libc",
+  "once_cell",
+- "socket2 0.5.9",
++ "socket2 0.5.10",
+  "tracing",
+  "windows-sys 0.59.0",
+ ]
+@@ -7776,9 +7707,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "r-efi"
+-version = "5.2.0"
++version = "5.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+ 
+ [[package]]
+ name = "radium"
+@@ -7904,9 +7835,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+ 
+ [[package]]
+ name = "redox_syscall"
+-version = "0.5.12"
++version = "0.5.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
++checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+ dependencies = [
+  "bitflags 2.9.1",
+ ]
+@@ -7924,9 +7855,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "redox_users"
+-version = "0.5.0"
++version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
++checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+ dependencies = [
+  "getrandom 0.2.16",
+  "libredox",
+@@ -7950,7 +7881,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8023,7 +7954,7 @@ dependencies = [
+  "encoding_rs",
+  "futures-core",
+  "futures-util",
+- "h2 0.3.26",
++ "h2 0.3.27",
+  "http 0.2.12",
+  "http-body 0.4.6",
+  "hyper 0.14.32",
+@@ -8066,12 +7997,12 @@ dependencies = [
+  "encoding_rs",
+  "futures-core",
+  "futures-util",
+- "h2 0.4.10",
++ "h2 0.4.12",
+  "http 1.3.1",
+  "http-body 1.0.1",
+  "http-body-util",
+  "hyper 1.6.0",
+- "hyper-rustls 0.27.5",
++ "hyper-rustls 0.27.7",
+  "hyper-tls",
+  "hyper-util",
+  "js-sys",
+@@ -8082,7 +8013,7 @@ dependencies = [
+  "percent-encoding",
+  "pin-project-lite",
+  "quinn",
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "rustls-native-certs",
+  "rustls-pki-types",
+  "serde",
+@@ -8101,7 +8032,7 @@ dependencies = [
+  "wasm-bindgen-futures",
+  "wasm-streams",
+  "web-sys",
+- "webpki-roots 1.0.0",
++ "webpki-roots 1.0.2",
+ ]
+ 
+ [[package]]
+@@ -8131,25 +8062,27 @@ dependencies = [
+ 
+ [[package]]
+ name = "rfd"
+-version = "0.15.0"
++version = "0.15.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e"
++checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
+ dependencies = [
+  "ashpd",
+- "block2 0.5.1",
++ "block2 0.6.1",
++ "dispatch2",
+  "glib-sys",
+  "gobject-sys",
+  "gtk-sys",
+  "js-sys",
+  "log",
+- "objc2 0.5.2",
+- "objc2-app-kit 0.2.2",
+- "objc2-foundation 0.2.2",
++ "objc2 0.6.1",
++ "objc2-app-kit",
++ "objc2-core-foundation",
++ "objc2-foundation 0.3.1",
+  "raw-window-handle",
+  "wasm-bindgen",
+  "wasm-bindgen-futures",
+  "web-sys",
+- "windows-sys 0.48.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -8224,7 +8157,7 @@ checksum = "a6e2b2fd7497540489fa2db285edd43b7ed14c49157157438664278da6e42a7a"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8253,15 +8186,15 @@ dependencies = [
+  "regex",
+  "relative-path",
+  "rustc_version",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "unicode-ident",
+ ]
+ 
+ [[package]]
+ name = "rust_decimal"
+-version = "1.37.1"
++version = "1.37.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
++checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d"
+ dependencies = [
+  "arrayvec",
+  "borsh",
+@@ -8275,9 +8208,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustc-demangle"
+-version = "0.1.24"
++version = "0.1.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
++checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+ 
+ [[package]]
+ name = "rustc-hash"
+@@ -8334,14 +8267,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.23.27"
++version = "0.23.31"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
++checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+ dependencies = [
+  "once_cell",
+  "ring",
+  "rustls-pki-types",
+- "rustls-webpki 0.103.3",
++ "rustls-webpki 0.103.4",
+  "subtle",
+  "zeroize",
+ ]
+@@ -8355,7 +8288,7 @@ dependencies = [
+  "openssl-probe",
+  "rustls-pki-types",
+  "schannel",
+- "security-framework 3.2.0",
++ "security-framework 3.3.0",
+ ]
+ 
+ [[package]]
+@@ -8389,9 +8322,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustls-webpki"
+-version = "0.103.3"
++version = "0.103.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
++checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+ dependencies = [
+  "ring",
+  "rustls-pki-types",
+@@ -8400,9 +8333,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustversion"
+-version = "1.0.20"
++version = "1.0.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+ 
+ [[package]]
+ name = "ryu"
+@@ -8465,6 +8398,18 @@ dependencies = [
+  "serde_json",
+ ]
+ 
++[[package]]
++name = "schemars"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
++dependencies = [
++ "dyn-clone",
++ "ref-cast",
++ "serde",
++ "serde_json",
++]
++
+ [[package]]
+ name = "schemars_derive"
+ version = "0.8.22"
+@@ -8474,7 +8419,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "serde_derive_internals",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8486,7 +8431,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "serde_derive_internals",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8513,9 +8458,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "sdd"
+-version = "3.0.8"
++version = "3.0.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21"
++checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
+ 
+ [[package]]
+ name = "seahash"
+@@ -8567,12 +8512,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "security-framework"
+-version = "3.2.0"
++version = "3.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
++checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-foundation-sys",
+  "libc",
+  "security-framework-sys",
+@@ -8652,7 +8597,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8663,7 +8608,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8718,14 +8663,23 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
++]
++
++[[package]]
++name = "serde_spanned"
++version = "0.6.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
++dependencies = [
++ "serde",
+ ]
+ 
+ [[package]]
+ name = "serde_spanned"
+-version = "0.6.8"
++version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
++checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+ dependencies = [
+  "serde",
+ ]
+@@ -8744,15 +8698,17 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_with"
+-version = "3.12.0"
++version = "3.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
++checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+ dependencies = [
+  "base64 0.22.1",
+  "chrono",
+  "hex",
+  "indexmap 1.9.3",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
++ "schemars 0.9.0",
++ "schemars 1.0.4",
+  "serde",
+  "serde_derive",
+  "serde_json",
+@@ -8762,14 +8718,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_with_macros"
+-version = "3.12.0"
++version = "3.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
++checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+ dependencies = [
+  "darling",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8794,7 +8750,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8872,12 +8828,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "shared_child"
+-version = "1.0.2"
++version = "1.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc"
++checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
+ dependencies = [
+  "libc",
+- "windows-sys 0.59.0",
++ "sigchld",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -8901,6 +8858,17 @@ version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+ 
++[[package]]
++name = "sigchld"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1"
++dependencies = [
++ "libc",
++ "os_pipe",
++ "signal-hook",
++]
++
+ [[package]]
+ name = "signal-hook"
+ version = "0.3.18"
+@@ -8913,9 +8881,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "signal-hook-registry"
+-version = "1.4.5"
++version = "1.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
++checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+ dependencies = [
+  "libc",
+ ]
+@@ -8952,12 +8920,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+ 
+ [[package]]
+ name = "slab"
+-version = "0.4.9"
++version = "0.4.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+-dependencies = [
+- "autocfg",
+-]
++checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+ 
+ [[package]]
+ name = "smallvec"
+@@ -8970,9 +8935,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.5.9"
++version = "0.5.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
++checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+ dependencies = [
+  "libc",
+  "windows-sys 0.52.0",
+@@ -9099,15 +9064,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "strum_macros"
+-version = "0.27.1"
++version = "0.27.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
++checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "rustversion",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9140,9 +9104,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.101"
++version = "2.0.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
++checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -9172,7 +9136,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9186,9 +9150,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "sysinfo"
+-version = "0.36.0"
++version = "0.36.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "aab138f5c1bb35231de19049060a87977ad23e04f2303e953bc5c2947ac7dec4"
++checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d"
+ dependencies = [
+  "libc",
+  "memchr",
+@@ -9249,7 +9213,7 @@ dependencies = [
+  "cfg-expr",
+  "heck 0.5.0",
+  "pkg-config",
+- "toml",
++ "toml 0.8.23",
+  "version-compare",
+ ]
+ 
+@@ -9260,7 +9224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics",
+  "crossbeam-channel",
+  "dispatch",
+@@ -9277,7 +9241,7 @@ dependencies = [
+  "ndk-context",
+  "ndk-sys",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+  "once_cell",
+  "parking_lot",
+@@ -9300,7 +9264,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9348,7 +9312,7 @@ dependencies = [
+  "mime",
+  "muda",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+  "objc2-ui-kit",
+  "percent-encoding",
+@@ -9394,7 +9358,7 @@ dependencies = [
+  "serde_json",
+  "tauri-utils",
+  "tauri-winres",
+- "toml",
++ "toml 0.8.23",
+  "walkdir",
+ ]
+ 
+@@ -9416,7 +9380,7 @@ dependencies = [
+  "serde",
+  "serde_json",
+  "sha2",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "tauri-utils",
+  "thiserror 2.0.12",
+  "time",
+@@ -9434,16 +9398,16 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "tauri-codegen",
+  "tauri-utils",
+ ]
+ 
+ [[package]]
+ name = "tauri-plugin"
+-version = "2.3.0"
++version = "2.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3"
++checksum = "5bd5c1e56990c70a906ef67a9851bbdba9136d26075ee9a2b19c8b46986b3e02"
+ dependencies = [
+  "anyhow",
+  "glob",
+@@ -9452,7 +9416,7 @@ dependencies = [
+  "serde",
+  "serde_json",
+  "tauri-utils",
+- "toml",
++ "toml 0.8.23",
+  "walkdir",
+ ]
+ 
+@@ -9473,9 +9437,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "tauri-plugin-dialog"
+-version = "2.3.0"
++version = "2.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1aefb14219b492afb30b12647b5b1247cadd2c0603467310c36e0f7ae1698c28"
++checksum = "37e5858cc7b455a73ab4ea2ebc08b5be33682c00ff1bf4cad5537d4fb62499d9"
+ dependencies = [
+  "log",
+  "raw-window-handle",
+@@ -9507,7 +9471,7 @@ dependencies = [
+  "tauri-plugin",
+  "tauri-utils",
+  "thiserror 2.0.12",
+- "toml",
++ "toml 0.8.23",
+  "url",
+ ]
+ 
+@@ -9677,7 +9641,7 @@ dependencies = [
+  "tokio",
+  "url",
+  "windows-sys 0.60.2",
+- "zip 4.2.0",
++ "zip 4.3.0",
+ ]
+ 
+ [[package]]
+@@ -9728,7 +9692,7 @@ dependencies = [
+  "jni",
+  "log",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+  "once_cell",
+  "percent-encoding",
+@@ -9775,7 +9739,7 @@ dependencies = [
+  "serde_with",
+  "swift-rs",
+  "thiserror 2.0.12",
+- "toml",
++ "toml 0.8.23",
+  "url",
+  "urlpattern",
+  "uuid",
+@@ -9784,13 +9748,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "tauri-winres"
+-version = "0.3.1"
++version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4"
++checksum = "7c6d9028d41d4de835e3c482c677a8cb88137ac435d6ff9a71f392d4421576c9"
+ dependencies = [
+  "embed-resource",
+- "indexmap 2.9.0",
+- "toml",
++ "indexmap 2.10.0",
++ "toml 0.9.5",
+ ]
+ 
+ [[package]]
+@@ -9849,7 +9813,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9860,17 +9824,16 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "thread_local"
+-version = "1.1.8"
++version = "1.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
++checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+ dependencies = [
+  "cfg-if",
+- "once_cell",
+ ]
+ 
+ [[package]]
+@@ -9971,7 +9934,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -10000,7 +9963,7 @@ version = "0.26.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+ dependencies = [
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "tokio",
+ ]
+ 
+@@ -10042,21 +10005,45 @@ dependencies = [
+ 
+ [[package]]
+ name = "toml"
+-version = "0.8.22"
++version = "0.8.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
++checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+ dependencies = [
+  "serde",
+- "serde_spanned",
+- "toml_datetime",
+- "toml_edit 0.22.26",
++ "serde_spanned 0.6.9",
++ "toml_datetime 0.6.11",
++ "toml_edit 0.22.27",
++]
++
++[[package]]
++name = "toml"
++version = "0.9.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
++dependencies = [
++ "indexmap 2.10.0",
++ "serde",
++ "serde_spanned 1.0.0",
++ "toml_datetime 0.7.0",
++ "toml_parser",
++ "toml_writer",
++ "winnow 0.7.12",
+ ]
+ 
+ [[package]]
+ name = "toml_datetime"
+-version = "0.6.9"
++version = "0.6.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "toml_datetime"
++version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
++checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+ dependencies = [
+  "serde",
+ ]
+@@ -10067,8 +10054,8 @@ version = "0.19.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+ dependencies = [
+- "indexmap 2.9.0",
+- "toml_datetime",
++ "indexmap 2.10.0",
++ "toml_datetime 0.6.11",
+  "winnow 0.5.40",
+ ]
+ 
+@@ -10078,30 +10065,45 @@ version = "0.20.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+ dependencies = [
+- "indexmap 2.9.0",
+- "toml_datetime",
++ "indexmap 2.10.0",
++ "toml_datetime 0.6.11",
+  "winnow 0.5.40",
+ ]
+ 
+ [[package]]
+ name = "toml_edit"
+-version = "0.22.26"
++version = "0.22.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
++checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+ dependencies = [
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "serde",
+- "serde_spanned",
+- "toml_datetime",
++ "serde_spanned 0.6.9",
++ "toml_datetime 0.6.11",
+  "toml_write",
+  "winnow 0.7.12",
+ ]
+ 
++[[package]]
++name = "toml_parser"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
++dependencies = [
++ "winnow 0.7.12",
++]
++
+ [[package]]
+ name = "toml_write"
+-version = "0.1.1"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
++
++[[package]]
++name = "toml_writer"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
++checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+ 
+ [[package]]
+ name = "tonic"
+@@ -10114,7 +10116,7 @@ dependencies = [
+  "axum 0.7.9",
+  "base64 0.22.1",
+  "bytes",
+- "h2 0.4.10",
++ "h2 0.4.12",
+  "http 1.3.1",
+  "http-body 1.0.1",
+  "http-body-util",
+@@ -10124,7 +10126,7 @@ dependencies = [
+  "percent-encoding",
+  "pin-project",
+  "prost",
+- "socket2 0.5.9",
++ "socket2 0.5.10",
+  "tokio",
+  "tokio-stream",
+  "tower 0.4.13",
+@@ -10225,13 +10227,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "tracing-attributes"
+-version = "0.1.28"
++version = "0.1.30"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
++checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -10287,16 +10289,16 @@ dependencies = [
+ 
+ [[package]]
+ name = "tray-icon"
+-version = "0.21.0"
++version = "0.21.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2da75ec677957aa21f6e0b361df0daab972f13a5bee3606de0638fd4ee1c666a"
++checksum = "a0d92153331e7d02ec09137538996a7786fe679c629c279e82a6be762b7e6fe2"
+ dependencies = [
+  "crossbeam-channel",
+  "dirs 6.0.0",
+  "libappindicator",
+  "muda",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-core-graphics",
+  "objc2-foundation 0.3.1",
+@@ -10602,9 +10604,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+ 
+ [[package]]
+ name = "wasi"
+-version = "0.11.0+wasi-snapshot-preview1"
++version = "0.11.1+wasi-snapshot-preview1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+ 
+ [[package]]
+ name = "wasi"
+@@ -10637,7 +10639,7 @@ dependencies = [
+  "log",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -10672,7 +10674,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+@@ -10701,13 +10703,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-backend"
+-version = "0.3.10"
++version = "0.3.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
++checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+ dependencies = [
+  "cc",
+  "downcast-rs",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "scoped-tls",
+  "smallvec",
+  "wayland-sys",
+@@ -10715,21 +10717,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-client"
+-version = "0.31.10"
++version = "0.31.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
++checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
+ dependencies = [
+  "bitflags 2.9.1",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "wayland-backend",
+  "wayland-scanner",
+ ]
+ 
+ [[package]]
+ name = "wayland-protocols"
+-version = "0.32.8"
++version = "0.32.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
++checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
+ dependencies = [
+  "bitflags 2.9.1",
+  "wayland-backend",
+@@ -10739,9 +10741,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-protocols-wlr"
+-version = "0.3.8"
++version = "0.3.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
++checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+ dependencies = [
+  "bitflags 2.9.1",
+  "wayland-backend",
+@@ -10752,9 +10754,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-scanner"
+-version = "0.31.6"
++version = "0.31.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
++checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
+ dependencies = [
+  "proc-macro2",
+  "quick-xml 0.37.5",
+@@ -10763,9 +10765,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-sys"
+-version = "0.31.6"
++version = "0.31.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
++checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+ dependencies = [
+  "dlib",
+  "log",
+@@ -10844,18 +10846,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+ 
+ [[package]]
+ name = "webpki-roots"
+-version = "0.26.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+-dependencies = [
+- "webpki-roots 1.0.0",
+-]
+-
+-[[package]]
+-name = "webpki-roots"
+-version = "1.0.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
++checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+ dependencies = [
+  "rustls-pki-types",
+ ]
+@@ -10882,7 +10875,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -10898,9 +10891,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "weezl"
+-version = "0.1.8"
++version = "0.1.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
++checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
+ 
+ [[package]]
+ name = "winapi"
+@@ -10940,7 +10933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
+ dependencies = [
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+  "raw-window-handle",
+@@ -10980,7 +10973,7 @@ dependencies = [
+  "windows-interface",
+  "windows-link",
+  "windows-result",
+- "windows-strings 0.4.2",
++ "windows-strings",
+ ]
+ 
+ [[package]]
+@@ -11002,7 +10995,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11013,7 +11006,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11034,13 +11027,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "windows-registry"
+-version = "0.4.0"
++version = "0.5.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
++checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+ dependencies = [
++ "windows-link",
+  "windows-result",
+- "windows-strings 0.3.1",
+- "windows-targets 0.53.2",
++ "windows-strings",
+ ]
+ 
+ [[package]]
+@@ -11052,15 +11045,6 @@ dependencies = [
+  "windows-link",
+ ]
+ 
+-[[package]]
+-name = "windows-strings"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+-dependencies = [
+- "windows-link",
+-]
+-
+ [[package]]
+ name = "windows-strings"
+ version = "0.4.2"
+@@ -11112,7 +11096,7 @@ version = "0.60.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+ dependencies = [
+- "windows-targets 0.53.2",
++ "windows-targets 0.53.3",
+ ]
+ 
+ [[package]]
+@@ -11163,10 +11147,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "windows-targets"
+-version = "0.53.2"
++version = "0.53.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
++checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+ dependencies = [
++ "windows-link",
+  "windows_aarch64_gnullvm 0.53.0",
+  "windows_aarch64_msvc 0.53.0",
+  "windows_i686_gnu 0.53.0",
+@@ -11405,12 +11390,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "winreg"
+-version = "0.52.0"
++version = "0.55.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
++checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+ dependencies = [
+  "cfg-if",
+- "windows-sys 0.48.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -11469,7 +11454,7 @@ dependencies = [
+  "libc",
+  "ndk",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+  "objc2-ui-kit",
+@@ -11540,9 +11525,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+ 
+ [[package]]
+ name = "xattr"
+-version = "1.5.0"
++version = "1.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
++checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+ dependencies = [
+  "libc",
+  "rustix 1.0.8",
+@@ -11593,7 +11578,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "synstructure",
+ ]
+ 
+@@ -11620,7 +11605,6 @@ dependencies = [
+  "serde_repr",
+  "sha1",
+  "static_assertions",
+- "tokio",
+  "tracing",
+  "uds_windows",
+  "windows-sys 0.52.0",
+@@ -11654,13 +11638,14 @@ dependencies = [
+  "ordered-stream",
+  "serde",
+  "serde_repr",
++ "tokio",
+  "tracing",
+  "uds_windows",
+  "windows-sys 0.59.0",
+  "winnow 0.7.12",
+  "zbus_macros 5.9.0",
+  "zbus_names 4.2.0",
+- "zvariant 5.5.3",
++ "zvariant 5.6.0",
+ ]
+ 
+ [[package]]
+@@ -11672,7 +11657,7 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zvariant_utils 2.1.0",
+ ]
+ 
+@@ -11685,9 +11670,9 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zbus_names 4.2.0",
+- "zvariant 5.5.3",
++ "zvariant 5.6.0",
+  "zvariant_utils 3.2.0",
+ ]
+ 
+@@ -11711,27 +11696,27 @@ dependencies = [
+  "serde",
+  "static_assertions",
+  "winnow 0.7.12",
+- "zvariant 5.5.3",
++ "zvariant 5.6.0",
+ ]
+ 
+ [[package]]
+ name = "zerocopy"
+-version = "0.8.25"
++version = "0.8.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
++checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+ dependencies = [
+  "zerocopy-derive",
+ ]
+ 
+ [[package]]
+ name = "zerocopy-derive"
+-version = "0.8.25"
++version = "0.8.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
++checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11751,7 +11736,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "synstructure",
+ ]
+ 
+@@ -11772,7 +11757,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11788,9 +11773,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "zerovec"
+-version = "0.11.2"
++version = "0.11.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
++checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+ dependencies = [
+  "yoke",
+  "zerofrom",
+@@ -11805,7 +11790,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11825,7 +11810,7 @@ dependencies = [
+  "flate2",
+  "getrandom 0.3.3",
+  "hmac",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "lzma-rs",
+  "memchr",
+  "pbkdf2",
+@@ -11840,21 +11825,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "zip"
+-version = "4.2.0"
++version = "4.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "95ab361742de920c5535880f89bbd611ee62002bf11341d16a5f057bb8ba6899"
++checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b"
+ dependencies = [
+  "arbitrary",
+  "crc32fast",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "memchr",
+ ]
+ 
+ [[package]]
+ name = "zlib-rs"
+-version = "0.5.0"
++version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
++checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
+ 
+ [[package]]
+ name = "zopfli"
+@@ -11906,21 +11891,21 @@ dependencies = [
+  "enumflags2",
+  "serde",
+  "static_assertions",
+- "url",
+  "zvariant_derive 4.2.0",
+ ]
+ 
+ [[package]]
+ name = "zvariant"
+-version = "5.5.3"
++version = "5.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
++checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f"
+ dependencies = [
+  "endi",
+  "enumflags2",
+  "serde",
++ "url",
+  "winnow 0.7.12",
+- "zvariant_derive 5.5.3",
++ "zvariant_derive 5.6.0",
+  "zvariant_utils 3.2.0",
+ ]
+ 
+@@ -11933,20 +11918,20 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zvariant_utils 2.1.0",
+ ]
+ 
+ [[package]]
+ name = "zvariant_derive"
+-version = "5.5.3"
++version = "5.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
++checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208"
+ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zvariant_utils 3.2.0",
+ ]
+ 
+@@ -11958,7 +11943,7 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11971,6 +11956,6 @@ dependencies = [
+  "quote",
+  "serde",
+  "static_assertions",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "winnow 0.7.12",
+ ]
+diff --git a/Cargo.toml b/Cargo.toml
+index c560a9b64..718574be8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -5,7 +5,7 @@ resolver = "2"
+ [workspace.dependencies]
+ bstr = "1.11.1"
+ # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
+-gix = { version = "0.73.0", git = "https://github.com/GitoxideLabs/gitoxide", branch = "main", default-features = false, features = [
++gix = { version = "0.73.0", default-features = false, features = [
+ ] }
+ gix-testtools = "0.16.1"
+ insta = "1.43.1"
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index c68297840174..707ab58cc0c3 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -17,7 +17,7 @@
   nodejs,
   openssl,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   rust,
   rustPlatform,
   turbo,
@@ -27,23 +27,27 @@
 }:
 
 let
+  pnpm = pnpm_10;
   excludeSpec = spec: [
     "--exclude"
     spec
   ];
 in
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitbutler";
-  version = "0.14.19";
+  version = "0.15.10";
 
   src = fetchFromGitHub {
     owner = "gitbutlerapp";
     repo = "gitbutler";
-    tag = "release/${version}";
-    hash = "sha256-NopuZbgF2jdwuf/p/JzubS0IM5xBnlkh9Tj234auBnE=";
+    tag = "release/${finalAttrs.version}";
+    hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI=";
   };
 
+  # Workaround for https://github.com/NixOS/nixpkgs/issues/359340
+  cargoPatches = [ ./gix-from-crates-io.patch ];
+
   # Let Tauri know what version we're building
   #
   # Remove references to non-existent workspaces in `gix` crates
@@ -51,7 +55,7 @@ rustPlatform.buildRustPackage rec {
   # Deactivate the built-in updater
   postPatch = ''
     tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json"
-    jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
+    jq '.version = "${finalAttrs.version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
 
     tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
 
@@ -59,12 +63,12 @@ rustPlatform.buildRustPackage rec {
       --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
   '';
 
-  cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM=";
+  cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8=";
 
-  pnpmDeps = pnpm_9.fetchDeps {
-    inherit pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
+  pnpmDeps = pnpm.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 2;
+    hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y=";
   };
 
   nativeBuildInputs = [
@@ -76,7 +80,7 @@ rustPlatform.buildRustPackage rec {
     moreutils
     nodejs
     pkg-config
-    pnpm_9.configHook
+    pnpm.configHook
     turbo
     wrapGAppsHook4
     yq # For `tomlq`
@@ -141,6 +145,11 @@ rustPlatform.buildRustPackage rec {
     LIBGIT2_NO_VENDOR = 1;
   };
 
+  preBuild = ''
+    turbo run --filter @gitbutler/svelte-comment-injector build
+    pnpm build:desktop -- --mode production
+  '';
+
   postInstall =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeBinaryWrapper $out/Applications/GitButler.app/Contents/MacOS/gitbutler-tauri $out/bin/gitbutler-tauri
@@ -165,7 +174,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Git client for simultaneous branches on top of your existing workflow";
     homepage = "https://gitbutler.com";
-    changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
+    changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${finalAttrs.version}";
     license = lib.licenses.fsl11Mit;
     maintainers = with lib.maintainers; [
       getchoo
@@ -174,4 +183,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "gitbutler-tauri";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})
diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix
index 5923dd4033d0..932a198dd014 100644
--- a/pkgs/by-name/gi/gitea-mcp-server/package.nix
+++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix
@@ -5,17 +5,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gitea-mcp-server";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "gitea-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MWH50NOZKp0OxuIELnbp34GKLWFaVOZCZOQnNLvYHro=";
+    hash = "sha256-Wrqy8RpDoK8GYldjGiTs8zwB3qzApKYJyK5Vhh0fMRg=";
   };
 
-  vendorHash = "sha256-LZIgADgUUNrMPBdCF0kz4koZUvGfHvzb8T+hwbiIYjs=";
+  vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 4d31249d7396..3634b94d7875 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -9,44 +9,54 @@
   compressDrvWeb,
   gitea,
   gzip,
+  nodejs,
   openssh,
+  pnpm,
+  stdenv,
   sqliteSupport ? true,
   nixosTests,
-  buildNpmPackage,
 }:
 
 let
-  frontend = buildNpmPackage {
+  frontend = stdenv.mkDerivation (finalAttrs: {
     pname = "gitea-frontend";
     inherit (gitea) src version;
 
-    npmDepsHash = "sha256-86SIiBamHdilEWbwBk6usVU/tzdYTT3Zvph3w/ZVjTs=";
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs) pname version src;
+      fetcherVersion = 2;
+      hash = "sha256-0p7P68BvO3hv0utUbnPpHSpGLlV7F9HHmOITvJAb/ww=";
+    };
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm.configHook
+    ];
 
-    # use webpack directly instead of 'make frontend' as the packages are already installed
     buildPhase = ''
-      BROWSERSLIST_IGNORE_OLD_DATA=true npx webpack
+      make frontend
     '';
 
     installPhase = ''
       mkdir -p $out
       cp -R public $out/
     '';
-  };
+  });
 in
 buildGoModule rec {
   pname = "gitea";
-  version = "1.24.6";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${gitea.version}";
-    hash = "sha256-djIL/sLmScBLLks76zKxxKgEFZ1nK2d1Fleupg7voSA=";
+    hash = "sha256-uBBL62Q/aigsCo0S0hwNooKljTn+OfcqoJxan6Ac0rM=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-t9KeK1S16xaPxfg+LYRp6/PuuxeEOgRF4GEvgKusDiI=";
+  vendorHash = "sha256-HHW7xgXJKnzj6HLKAUXKYIZgOKKbXVSK+YGSKCwBeLU=";
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/gi/gitea/static-root-path.patch b/pkgs/by-name/gi/gitea/static-root-path.patch
index 7f70329c6040..db2857cfe5ea 100644
--- a/pkgs/by-name/gi/gitea/static-root-path.patch
+++ b/pkgs/by-name/gi/gitea/static-root-path.patch
@@ -1,10 +1,10 @@
 diff --git a/modules/setting/server.go b/modules/setting/server.go
-index 183906268..fa02e8915 100644
+index 38e166e02a..bbe9af4718 100644
 --- a/modules/setting/server.go
 +++ b/modules/setting/server.go
-@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
- 	OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
- 	Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
+@@ -351,7 +351,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
+ 	RedirectorUseProxyProtocol = sec.Key("REDIRECTOR_USE_PROXY_PROTOCOL").MustBool(UseProxyProtocol)
+ 	OfflineMode = sec.Key("OFFLINE_MODE").MustBool(true)
  	if len(StaticRootPath) == 0 {
 -		StaticRootPath = AppWorkPath
 +		StaticRootPath = "@data@"
diff --git a/pkgs/by-name/gi/gitfetch/package.nix b/pkgs/by-name/gi/gitfetch/package.nix
new file mode 100644
index 000000000000..7f0be92e1c63
--- /dev/null
+++ b/pkgs/by-name/gi/gitfetch/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  gh,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "gitfetch";
+  version = "1.3.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Matars";
+    repo = "gitfetch";
+    tag = "v${version}";
+    hash = "sha256-HAZUdGCITr4in0K/LOSZaMHZpPjrHxcg7kAF1J0vl1I=";
+  };
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    requests
+    readchar
+  ];
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        gh
+      ]
+    }"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Neofetch-style CLI tool for git provider statistics";
+    homepage = "https://github.com/Matars/gitfetch";
+    mainProgram = "gitfetch";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ lonerOrz ];
+  };
+}
diff --git a/pkgs/by-name/gi/gitg/package.nix b/pkgs/by-name/gi/gitg/package.nix
index ebf6f2f21194..60db4a99330a 100644
--- a/pkgs/by-name/gi/gitg/package.nix
+++ b/pkgs/by-name/gi/gitg/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   vala,
   pkg-config,
   gtk3,
@@ -38,6 +39,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-NCoxaE2rlnHNNBvT485mWtzuBGDCoIHdxJPNvAMTJTA=";
   };
 
+  patches = [
+    # Switch to girepository-2.0
+    # https://gitlab.gnome.org/GNOME/gitg/-/merge_requests/278
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/gitg/raw/630cf1bdb50ad37fb20b81d76caa8622e7225c58/f/gitg-gir-2.0.patch";
+      hash = "sha256-9pC7wrxWcI1C/8yB5AcaED0RyaVbQzT0Ajuz0TM4hmo=";
+    })
+  ];
+
   nativeBuildInputs = [
     gobject-introspection
     meson
diff --git a/pkgs/by-name/gi/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json
deleted file mode 100644
index 2d53b9d57986..000000000000
--- a/pkgs/by-name/gi/github-copilot-cli/package-lock.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@github/copilot",
-  "version": "0.0.328",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@github/copilot",
-      "version": "0.0.328",
-      "dependencies": {
-        "keytar-forked-forked": "^7.10.2",
-        "node-pty": "npm:@devm33/node-pty@^1.0.8"
-      },
-      "bin": {
-        "copilot": "index.js"
-      },
-      "engines": {
-        "node": ">=22"
-      }
-    },
-    "node_modules/keytar-forked-forked": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/keytar-forked-forked/-/keytar-forked-forked-7.10.3.tgz",
-      "integrity": "sha512-ipErTUO1NPXmngYhnMrda0yOIOPSNbVJ2BRjk3kNozLx3UmGICnzCfEDemuLY6HgP+rV0c9F+Opt+89+Ydbw6w==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^8.3.0"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
-      "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
-      "license": "MIT",
-      "engines": {
-        "node": "^18 || ^20 || >= 21"
-      }
-    },
-    "node_modules/node-pty": {
-      "name": "@devm33/node-pty",
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@devm33/node-pty/-/node-pty-1.0.9.tgz",
-      "integrity": "sha512-5yzbTTywkaFk1iRwte2aWEpyDfcpDjCofVD1BiOUQI+fsCvp/+RdJnB4jgnULrdlWOEWuBf+bg4/NZKVApPhoQ==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^7.1.0"
-      }
-    },
-    "node_modules/node-pty/node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT"
-    }
-  }
-}
diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
index 2006f6db64d3..ec8334fcd9ce 100644
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -1,28 +1,41 @@
 {
   lib,
-  buildNpmPackage,
+  stdenv,
   fetchzip,
+  nodejs,
+  makeBinaryWrapper,
+  versionCheckHook,
   nix-update-script,
 }:
 
-buildNpmPackage (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "github-copilot-cli";
-  version = "0.0.328";
+  version = "0.0.353";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
-    hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0=";
+    hash = "sha256-OWlEz75vVEvbtDNobLJ/a1iUuepYewCTWoqTbDG+4wg=";
   };
 
-  npmDepsHash = "sha256-WK6t3IW4uF+MDu7Y5GRinbm8iDcYB8RhJ15GE9VBcjQ=";
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
-  postPatch = ''
-    cp ${./package-lock.json} package-lock.json
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/@github/copilot
+    cp -r . $out/lib/node_modules/@github/copilot
+
+    mkdir -p $out/bin
+    makeBinaryWrapper ${nodejs}/bin/node $out/bin/copilot \
+      --add-flags "$out/lib/node_modules/@github/copilot/index.js"
+
+    runHook postInstall
   '';
 
-  dontNpmBuild = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal";
diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 30f03e0d90ac..338b7e63b8f9 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.18.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tVKzJlj3zemoKOr18r+1ElfbqBdJa4La1x0fFVxPO1U=";
+    hash = "sha256-gB2MXeQQjVP/b+3hne6Mauork5szSOFz4uWIGzecN+U=";
   };
 
-  vendorHash = "sha256-esd4Ly8cbN3z9fxC1j4wQqotV2ULqK3PDf1bEovewUY=";
+  vendorHash = "sha256-DcRpKFsCdGV3sOVHeyZbo/djVVBkuxRgFh7Z5yyElRw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json
index 6146f1957680..be678bbdeb91 100644
--- a/pkgs/by-name/gi/github-runner/deps.json
+++ b/pkgs/by-name/gi/github-runner/deps.json
@@ -6,8 +6,8 @@
   },
   {
     "pname": "Azure.Storage.Blobs",
-    "version": "12.25.0",
-    "hash": "sha256-SjIwM1sIBd4I9ShAeaIAfPUzc3K7tbodW6y1vNAD+4U="
+    "version": "12.25.1",
+    "hash": "sha256-OJgmzE7+BJsrqGMErUwG4wmaguYL1zPbhtdQvvqFuHY="
   },
   {
     "pname": "Azure.Storage.Common",
diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix
index 5e331b17c88b..ca76c0781863 100644
--- a/pkgs/by-name/gi/github-runner/package.nix
+++ b/pkgs/by-name/gi/github-runner/package.nix
@@ -35,13 +35,13 @@ assert builtins.all (
 
 buildDotnetModule (finalAttrs: {
   pname = "github-runner";
-  version = "2.328.0";
+  version = "2.329.0";
 
   src = fetchFromGitHub {
     owner = "actions";
     repo = "runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3Q2bscLKdUBPx+5X0qxwtcy3CU6N/wE8yO1CcATSyBQ=";
+    hash = "sha256-Lf8l959y5tfvCsLwI8+tziFGm+LUJnhE2PQIz/zZneA=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git-revision
diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix
index 33b42d89cc49..d42d4d3f82eb 100644
--- a/pkgs/by-name/gi/gitify/package.nix
+++ b/pkgs/by-name/gi/gitify/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gitify";
-  version = "6.9.1";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "gitify-app";
     repo = "gitify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Bd2Yy2wpO0ksAv3O19QhKFSbX+QjFaYZ4iE1b7lc6VI=";
+    hash = "sha256-bTkKZc3KlclUO0XFUT1lRjPsL9AGg5u4w+8AfOXG7ao=";
   };
 
   nativeBuildInputs = [
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-/iNKeHjVQhkpm0lXZ6WBcm5Y0HOktsMQR1G4KEHYJCE=";
+    hash = "sha256-Ol8/SSVJ4RXLK1F9cztQODkq+zAxJtbKyPzMVBjluLY=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 7c3be78fd642..f5eaf100d71d 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -56,24 +56,24 @@
 
 let
   pname = "gitkraken";
-  version = "11.5.0";
+  version = "11.5.1";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
-      hash = "sha256-QNFNUVuslQ8ezDakqIPLMx6oSqS3K7VKu+Sm99d2d1E=";
+      hash = "sha256-ctwkU8AWCuOKFetgCIPp6npk1ZO8ozfELrRp4PR3Xjs=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-NEy7hssChI3F62XQwHq3ENbTUrhXdtovCYxQQp4NLEU=";
+      hash = "sha256-7wXpMwFGQeLgT7ObrZ5nUd84jzVArAIQ8vgp+fYDgsw=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-ANHz+C5XMNEWy4x1btdg4XnhTOvWBVVoS/XpE5beW0w=";
+      hash = "sha256-YkY6izRicIapNF9yMCL+YHJoxrWDdVwrcpj8N99tQCs=";
     };
   };
 
diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index ba682b859429..3c9aff0d47b6 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -12,16 +12,16 @@
 
 buildNpmPackage rec {
   pname = "gitlab-ci-local";
-  version = "4.62.0";
+  version = "4.63.0";
 
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
     rev = version;
-    hash = "sha256-JcCfrrb/xAvILfHgnKoRxjWG4fvi4kVg0W+s+y25A6Y=";
+    hash = "sha256-IqfCEU/ZX28CAAFW9Wx9QFQY4E5iYKC5Ac0m7AuubNk=";
   };
 
-  npmDepsHash = "sha256-J/my72RPPwg1r1t4vO3CgMnGDP7H/Cc3apToypaK1YI=";
+  npmDepsHash = "sha256-0XV9jT1Ps8TPhl4pKN92v6mbMT37EcXdcn+GUo2wprg=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 524e46299197..b21069e3614f 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@
 
 buildGo124Module rec {
   pname = "gitlab-container-registry";
-  version = "4.28.0";
+  version = "4.29.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo124Module rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-0v39mQ0wLq2VUYNeDU6E2M8Ny/e/A3VrE8+pmpwJgug=";
+    hash = "sha256-SUhlJi0LEDXl9pwnT2JATtEBIUnCA2yyEaMzDpL/QCM=";
   };
 
-  vendorHash = "sha256-tCOXSZjJOWHTIdWYxdBaH6STKAwqlHsuDfhGd2KPx1Q=";
+  vendorHash = "sha256-Ee9OmKkFrm00BN/V5kuLFbFV/6HkJ4hk7AAXMptTyxs=";
 
   checkFlags =
     let
@@ -42,5 +42,6 @@ buildGo124Module rec {
       cyberus
     ];
     platforms = platforms.unix;
+    mainProgram = "registry";
   };
 }
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
index 62188e2a805e..862e2bc81056 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitlab-code-parser";
-  version = "0.16.1";
+  version = "0.19.3";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "rust/gitlab-code-parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GskOPKv1Jp3eqd+a9nEwZPfHfOw6luyglPXzJZAPvBc=";
+    hash = "sha256-gwldgZsiHjNafebtgiy5mVAmNNAj0Mz+krz4sI18zj4=";
   };
 
-  cargoHash = "sha256-g6FV8kX3/9wk692FJLNyGNzv3ffE8RWmMYmvmUIqzVs=";
+  cargoHash = "sha256-h6JWOhdjN4Ikwzvuv7PIYmsk1KxJyGHbjibJKVWtExY=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index af33bad7e8b5..f0c06277b1dc 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -11,17 +11,17 @@ let
 in
 buildGoModule rec {
   pname = "gitlab-elasticsearch-indexer";
-  version = "5.9.1";
+  version = "5.9.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
     rev = "v${version}";
-    hash = "sha256-Xt22fyTM4rfqUpNE6Q3yfT9r4vqME3KmqxYCqUKmnLQ=";
+    hash = "sha256-Vj3QqskgrQIMF9mNY8WzvHL0KCU9Ebr3eDm4mUwQJL0=";
   };
 
-  vendorHash = "sha256-pY8hHFy0AxMwol00BN85jPR0ZnHVgno10Tp+Opz65tQ=";
+  vendorHash = "sha256-nmgRQwjf6F7IkED0S7Q03T6Wad5sEmYLbBHLyA33WjU=";
 
   buildInputs = [ icu ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index a4902b0c87f0..9f57f4318c51 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.4.2";
+  version = "18.5.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-21VCBUE6wGU7DT98YYPuEz7lw6EMqCfe14mofbai0lk=";
+    hash = "sha256-UrVH5Ky5aiqquQ2o6bSkqLD4ULl9/vUViOoACantT1Q=";
   };
 
-  vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
+  vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM=";
   subPackages = [ "." ];
 
   ldflags = [
diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 19db034432a6..0592229902ec 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.4.0";
+  version = "18.5.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kLUQTxj4t6H/by6lzsLmG8S3Ft1QFdUjTa4Y9aCT88o=";
+    hash = "sha256-xuRYnK5Ev2M/vrVWMHcTcK7LLwlQ30MVadMjA67fHpY=";
   };
 
-  vendorHash = "sha256-zXyyfJ3VBBcB3Qfsex2pDcDJIRg/HRgFAytWloHHUnM=";
+  vendorHash = "sha256-5Gh9jQ4GkvtN8inEUphehbsnmfyQldvxjbxBkXQ63wc=";
 
   # For patchShebangs
   buildInputs = [ bash ];
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index e93dcc6819c8..4fb8a47b40e2 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "gitlab-shell";
-  version = "14.45.2";
+  version = "14.45.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    hash = "sha256-FxtqTRCa1sYSeTR+V2UKEsb480llU6cHWVwNiNFtUmE=";
+    hash = "sha256-S8LtWQgzyDKr4Jnk7Qn/pfLzZYYnVfZNVqNBFyqr5cM=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index b7d743bae841..a9150fdb3e22 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,16 @@
 {
-  "version": "18.4.2",
-  "repo_hash": "053fw6g1rrqlmgr22phbsv57pg04iy20yv3yvgz1hm4jn2jm0zln",
-  "yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
+  "version": "18.5.1",
+  "repo_hash": "0h80pzsfn6lb8mz8igbpkmazzj3kkdwhrqxazjq6g9zrsqsvydx5",
+  "yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs",
+  "frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.4.2-ee",
+  "rev": "v18.5.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.4.2",
-    "GITLAB_PAGES_VERSION": "18.4.2",
-    "GITLAB_SHELL_VERSION": "14.45.2",
-    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
-    "GITLAB_WORKHORSE_VERSION": "18.4.2"
+    "GITALY_SERVER_VERSION": "18.5.1",
+    "GITLAB_PAGES_VERSION": "18.5.1",
+    "GITLAB_SHELL_VERSION": "14.45.3",
+    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4",
+    "GITLAB_WORKHORSE_VERSION": "18.5.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 777e5d397bb6..a91f24c0e36c 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.4.2";
+  version = "18.5.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-R9hI+y4n+6YM0dXIRvNZWwy1gAasdKHBWmFBXJaI1G0=";
+  vendorHash = "sha256-wO+QuWptrcpqy3K3tvYpQQFzlr7A2m2rhPM64Or3qaY=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix
index 525e3338416e..f95125a94964 100644
--- a/pkgs/by-name/gi/gitlab/package.nix
+++ b/pkgs/by-name/gi/gitlab/package.nix
@@ -83,7 +83,7 @@ let
               cp Cargo.lock $out
             '';
           };
-          hash = "sha256-NJLpfIgVgqbf1fHIzEKxzpHOKvtY9QHXVQPpRdvH0Uo=";
+          hash = "sha256-IPVpUj0ixYKQg8ZUKLGcS9RcR2zOWCrqkwJFUF1cmdI=";
         };
 
         dontBuild = false;
@@ -146,6 +146,10 @@ let
       yarnLock = src + "/yarn.lock";
       sha256 = data.yarn_hash;
     };
+    frontendIslandsYarnOfflineCache = fetchYarnDeps {
+      yarnLock = src + "/ee/frontend_islands/apps/duo_next/yarn.lock";
+      sha256 = data.frontend_islands_yarn_hash;
+    };
 
     nativeBuildInputs = [
       rubyEnv.wrappedRuby
@@ -171,6 +175,7 @@ let
     # of rake tasks fails.
     GITLAB_LOG_PATH = "log";
     FOSS_ONLY = !gitlabEnterprise;
+    SKIP_FRONTEND_ISLANDS_BUILD = lib.optionalString (!gitlabEnterprise) "true";
 
     SKIP_YARN_INSTALL = 1;
     NODE_OPTIONS = "--max-old-space-size=8192";
@@ -184,6 +189,26 @@ let
       mv config/gitlab.yml.example config/gitlab.yml
 
       patchShebangs scripts/frontend/
+      patchShebangs scripts/
+    ''
+    + lib.optionalString gitlabEnterprise ''
+      # Get node modules for frontend islands
+      export HOME=$(mktemp -d)
+      pushd ee/frontend_islands/apps/duo_next
+      yarn config --offline set yarn-offline-mirror "$frontendIslandsYarnOfflineCache"
+      fixup-yarn-lock yarn.lock
+      yarn install \
+          --frozen-lockfile \
+          --force \
+          --production=false \
+          --ignore-engines \
+          --ignore-platform \
+          --ignore-scripts \
+          --no-progress \
+          --non-interactive \
+          --offline
+      patchShebangs node_modules
+      popd
     '';
 
     buildPhase = ''
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 2452d9f209ce..868611f74092 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -161,6 +161,7 @@ gem 'grape-entity', '~> 1.0.1', feature_category: :api
 gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api
 gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api
 gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
+gem 'gitlab-grape-openapi', path: 'gems/gitlab-grape-openapi', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
 
 # GraphQL API
@@ -175,7 +176,7 @@ gem 'gitlab-topology-service-client', '~> 0.1',
   feature_category: :cell
 
 # Duo Workflow
-gem 'gitlab-duo-workflow-service-client', '~> 0.3',
+gem 'gitlab-duo-workflow-service-client', '~> 0.4',
   path: 'vendor/gems/gitlab-duo-workflow-service-client',
   feature_category: :agent_foundations
 
@@ -223,9 +224,9 @@ gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared
 gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared
 gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared
 gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared
-gem 'google-apis-container_v1beta1', '~> 0.90.0', feature_category: :shared
+gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared
 gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared
-gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared
+gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared
 gem 'google-apis-iam_v1', '~> 0.73.0', feature_category: :shared
 gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared
 gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
@@ -267,10 +268,10 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown
 gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown
 gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown
 gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown
-gem 'rouge', '~> 4.6.0', feature_category: :shared
+gem 'rouge', '~> 4.6.1', feature_category: :shared
 gem 'truncato', '~> 0.7.13', feature_category: :team_planning
 gem 'nokogiri', '~> 1.18', feature_category: :shared
-gem 'gitlab-glfm-markdown', '~> 0.0.33', feature_category: :markdown
+gem 'gitlab-glfm-markdown', '~> 0.0.36', feature_category: :markdown
 gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
 
@@ -330,7 +331,8 @@ gem 'js_regex', '~> 3.8', feature_category: :shared
 gem 'device_detector', feature_category: :shared
 
 # Redis
-gem 'redis', '~> 5.4.0', feature_category: :redis
+# Do NOT upgrade until Rails is upgraded with a version that contains https://github.com/rails/rails/pull/55359.
+gem 'redis', '= 5.4.0', feature_category: :redis
 gem 'redis-client', '~> 0.25', feature_category: :redis
 gem 'redis-cluster-client', '~> 0.13', feature_category: :redis
 gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
@@ -380,7 +382,7 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
 gem 'cssbundling-rails', '1.4.3', feature_category: :shared
 gem 'terser', '1.0.2', feature_category: :shared
 
-gem 'click_house-client', '0.5.1', feature_category: :database
+gem 'click_house-client', '0.8.0', feature_category: :database
 gem 'addressable', '~> 2.8', feature_category: :shared
 gem 'gon', '~> 6.5.0', feature_category: :shared
 gem 'request_store', '~> 1.7.0', feature_category: :shared
@@ -403,7 +405,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c
 gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
-gem 'gitlab-labkit', '~> 0.40.0', feature_category: :shared
+gem 'gitlab-labkit', '~> 0.42.0', feature_category: :shared
 gem 'thrift', '~> 0.22.0', feature_category: :shared
 
 # I18n
@@ -430,7 +432,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
 
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.28.0', require: false, feature_category: :shared
+gem 'async', '~> 2.32.0', require: false, feature_category: :shared
 gem 'io-event', '~> 1.12', require: false, feature_category: :shared
 
 # Security report schemas used to validate CI job artifacts of security jobs
@@ -473,7 +475,7 @@ end
 gem 'warning', '~> 1.5.0', feature_category: :shared
 
 group :development do
-  gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
+  gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling
   gem 'rubocop', feature_category: :tooling, require: false
   gem 'debug', '~> 1.11.0', feature_category: :shared
 
@@ -490,11 +492,11 @@ group :development do
 
   gem 'listen', '~> 3.7', feature_category: :shared
 
-  gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling
+  gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling
 
-  gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
+  gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling
 
-  gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
+  gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling
 
   gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
 
@@ -512,7 +514,7 @@ group :development, :test do
   gem 'pry-rails', '~> 0.3.9', feature_category: :shared
   gem 'pry-shell', '~> 0.6.4', feature_category: :shared
 
-  gem 'awesome_print', require: false, feature_category: :shared
+  gem 'amazing_print', require: false, feature_category: :shared
 
   gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
   gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
@@ -634,7 +636,7 @@ gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared
 gem 'net-ntp', feature_category: :shared
 
 # SSH keys support
-gem 'ssh_data', '~> 1.3', feature_category: :shared
+gem 'ssh_data', '~> 2.0', feature_category: :shared
 
 # Spamcheck GRPC protocol definitions
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
@@ -643,9 +645,9 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
 
-gem 'grpc', '~> 1.74.0', feature_category: :shared
+gem 'grpc', '~> 1.75.0', feature_category: :shared
 
 gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 
@@ -656,7 +658,7 @@ gem 'flipper', '~> 0.28.0', feature_category: :shared
 gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared
 gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared
 gem 'unleash', '~> 3.2.2', feature_category: :shared
-gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
+gem 'gitlab-experiment', '~> 1.0.0', feature_category: :shared
 
 # Structured logging
 gem 'lograge', '~> 0.5', feature_category: :shared
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index fe11d3cd5bce..5bbab0aec3a3 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -49,7 +49,7 @@ PATH
       google-cloud-storage_transfer (~> 1.2.0)
       google-protobuf (~> 3.25, >= 3.25.3)
       googleauth (~> 1.14)
-      grpc (~> 1.74.0)
+      grpc (~> 1.75)
       json (~> 2.7)
       jwt (~> 2.5)
       logger (~> 1.5)
@@ -62,12 +62,19 @@ PATH
       rexml (~> 3.4.0)
       thor (~> 1.3)
 
+PATH
+  remote: gems/gitlab-grape-openapi
+  specs:
+    gitlab-grape-openapi (0.1.0)
+      grape (~> 2.0.0)
+      grape-entity (~> 1.0.1)
+
 PATH
   remote: gems/gitlab-housekeeper
   specs:
     gitlab-housekeeper (0.1.0)
       activesupport
-      awesome_print
+      amazing_print
       httparty
       rubocop
 
@@ -149,7 +156,7 @@ PATH
 PATH
   remote: vendor/gems/gitlab-duo-workflow-service-client
   specs:
-    gitlab-duo-workflow-service-client (0.3)
+    gitlab-duo-workflow-service-client (0.5)
       grpc
 
 PATH
@@ -203,7 +210,7 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.25)
+    acme-client (2.0.26)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
@@ -294,6 +301,7 @@ GEM
     amatch (0.4.1)
       mize
       tins (~> 1.0)
+    amazing_print (1.8.1)
     android_key_attestation (0.3.0)
     apollo_upload_server (2.1.6)
       actionpack (>= 6.1.6)
@@ -311,7 +319,7 @@ GEM
     asciidoctor-plantuml (0.0.16)
       asciidoctor (>= 2.0.17, < 3.0.0)
     ast (2.4.2)
-    async (2.28.0)
+    async (2.32.0)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.11)
@@ -364,7 +372,7 @@ GEM
     base64 (0.2.0)
     batch-loader (2.0.5)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
     benchmark-ips (2.14.0)
     benchmark-malloc (0.2.0)
     benchmark-memory (0.2.0)
@@ -375,14 +383,14 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.2.3)
     bindata (2.4.11)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.18.6)
       msgpack (~> 1.2)
     browser (5.3.1)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -424,7 +432,7 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    click_house-client (0.5.1)
+    click_house-client (0.8.0)
       activerecord (>= 7.0, < 9.0)
       activesupport (>= 7.0, < 9.0)
       addressable (~> 2.8)
@@ -433,7 +441,7 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colored2 (3.1.2)
-    commonmarker (0.23.11)
+    commonmarker (0.23.12)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
     console (1.29.2)
@@ -477,9 +485,9 @@ GEM
     danger-gitlab (8.0.0)
       danger
       gitlab (~> 4.2, >= 4.2.0)
-    database_cleaner-active_record (2.2.1)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     deb_version (1.0.2)
@@ -545,15 +553,18 @@ GEM
     dotenv (2.7.6)
     drb (2.2.3)
     dry-cli (1.0.0)
-    dry-core (1.0.1)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
-    dry-logic (1.5.0)
+    dry-inflector (1.2.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.8.3)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -630,7 +641,7 @@ GEM
     fast_gettext (4.1.0)
       prime
       racc
-    ffaker (2.24.0)
+    ffaker (2.25.0)
     ffi (1.17.2)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -719,14 +730,14 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (18.4.0.pre.rc1)
+    gitaly (18.4.1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.32.0)
+    gitlab-cloud-connector (1.33.0)
       activesupport (~> 7.0)
       jwt (~> 2.9)
     gitlab-crystalball (1.1.1)
@@ -736,7 +747,7 @@ GEM
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)
-    gitlab-experiment (0.9.1)
+    gitlab-experiment (1.0.0)
       activesupport (>= 3.0)
       request_store (>= 1.0)
     gitlab-fog-azure-rm (2.4.0)
@@ -748,11 +759,11 @@ GEM
       mime-types
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    gitlab-glfm-markdown (0.0.33)
+    gitlab-glfm-markdown (0.0.36)
       rb_sys (~> 0.9.109)
-    gitlab-kas-grpc (18.3.2)
+    gitlab-kas-grpc (18.5.0.pre.rc4)
       grpc (~> 1.0)
-    gitlab-labkit (0.40.0)
+    gitlab-labkit (0.42.0)
       actionpack (>= 5.0.0, < 8.1.0)
       activesupport (>= 5.0.0, < 8.1.0)
       google-protobuf (~> 3)
@@ -777,7 +788,7 @@ GEM
       activesupport (>= 5.2.0)
       rake (~> 13.0)
       snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.33.3)
+    gitlab-secret_detection (0.35.1)
       grpc (>= 1.63.0, < 2)
       grpc_reflection (~> 0.1)
       parallel (~> 1)
@@ -805,7 +816,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (2.20.0)
+    gitlab_quality-test_tooling (2.20.3)
       activesupport (>= 7.0, < 7.3)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)
@@ -831,13 +842,13 @@ GEM
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-cloudbilling_v1 (0.22.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-cloudresourcemanager_v1 (0.31.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-cloudresourcemanager_v1 (0.44.0)
+      google-apis-core (>= 0.15.0, < 2.a)
     google-apis-compute_v1 (0.129.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-container_v1 (0.100.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-container_v1beta1 (0.90.0)
+    google-apis-container_v1beta1 (0.91.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -964,7 +975,7 @@ GEM
       logger (~> 1.6)
       ostruct (~> 0.6)
       sass-embedded (~> 1.58)
-    grpc (1.74.1)
+    grpc (1.75.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.5.0)
@@ -992,7 +1003,7 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.64.0)
+    haml_lint (0.66.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -1003,7 +1014,7 @@ GEM
       thor
       tilt
     hana (1.3.7)
-    hashdiff (1.2.0)
+    hashdiff (1.2.1)
     hashie (5.0.0)
     health_check (3.1.0)
       railties (>= 5.0)
@@ -1030,7 +1041,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n_data (0.13.1)
     icalendar (2.10.3)
@@ -1112,10 +1123,10 @@ GEM
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.12.3)
+    lefthook (1.13.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -1188,7 +1199,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.13.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.11.3)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
@@ -1203,7 +1214,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     murmurhash3 (0.1.7)
-    mustermann (3.0.0)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
@@ -1232,7 +1243,7 @@ GEM
     nio4r (2.7.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -1270,8 +1281,9 @@ GEM
       ostruct (>= 0.2)
     oj-introspect (0.8.0)
       oj (>= 3.16.10)
-    omniauth (2.1.3)
+    omniauth (2.1.4)
       hashie (>= 3.4.6)
+      logger
       rack (>= 2.2.3)
       rack-protection
     omniauth-alicloud (3.0.0)
@@ -1323,7 +1335,7 @@ GEM
     opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
-    openssl (3.3.0)
+    openssl (3.3.1)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     opentelemetry-api (1.2.5)
@@ -1496,7 +1508,7 @@ GEM
     prime (0.1.3)
       forwardable
       singleton
-    prism (1.2.0)
+    prism (1.4.0)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -1527,7 +1539,7 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.17)
+    rack (2.2.18)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.7.0)
@@ -1597,7 +1609,7 @@ GEM
       ffi (~> 1.0)
     rb_sys (0.9.110)
       rake-compiler-dock (= 1.9.1)
-    rbs (3.6.1)
+    rbs (3.9.5)
       logger
     rbtrace (0.5.2)
       ffi (>= 1.0.6)
@@ -1606,24 +1618,24 @@ GEM
     rchardet (1.8.0)
     rdoc (6.13.0)
       psych (>= 4.0.0)
-    re2 (2.19.0)
-      mini_portile2 (~> 2.8.7)
+    re2 (2.20.0)
+      mini_portile2 (~> 2.8.9)
     recaptcha (5.12.3)
       json
     recursive-open-struct (1.1.3)
     redcarpet (3.6.0)
-    redis (5.4.1)
+    redis (5.4.0)
       redis-client (>= 0.22.0)
     redis-actionpack (5.5.0)
       actionpack (>= 5)
       redis-rack (>= 2.1.0, < 4)
       redis-store (>= 1.1.0, < 2)
-    redis-client (0.25.3)
+    redis-client (0.26.1)
       connection_pool
     redis-cluster-client (0.13.5)
       redis-client (~> 0.24)
-    redis-clustering (5.4.1)
-      redis (= 5.4.1)
+    redis-clustering (5.4.0)
+      redis (= 5.4.0)
       redis-cluster-client (>= 0.10.0)
     redis-namespace (1.11.0)
       redis (>= 4)
@@ -1653,10 +1665,10 @@ GEM
     retriable (3.1.2)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.2)
+    rexml (3.4.4)
     rinku (2.0.0)
     rotp (6.3.0)
-    rouge (4.6.0)
+    rouge (4.6.1)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -1737,15 +1749,14 @@ GEM
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
-    ruby-lsp (0.23.20)
+    ruby-lsp (0.26.1)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 4)
-      sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.31)
-      ruby-lsp (>= 0.23.0, < 0.24.0)
-    ruby-lsp-rspec (0.1.24)
-      ruby-lsp (~> 0.23.19)
+      rbs (>= 3, < 5)
+    ruby-lsp-rails (0.4.8)
+      ruby-lsp (>= 0.26.0, < 0.27.0)
+    ruby-lsp-rspec (0.1.27)
+      ruby-lsp (~> 0.26.0)
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
     ruby-progressbar (1.11.0)
@@ -1853,9 +1864,8 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
       yard-solargraph (~> 0.1)
-    solargraph-rspec (0.5.2)
-      solargraph (~> 0.52, >= 0.52.0)
-    sorbet-runtime (0.5.11647)
+    solargraph-rspec (0.5.4)
+      solargraph (>= 0.52.0)
     spamcheck (1.3.3)
       grpc (~> 1.63)
     spring (4.3.0)
@@ -1870,7 +1880,8 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    ssh_data (1.3.0)
+    ssh_data (2.0.0)
+      base64 (~> 0.1)
     ssrf_filter (1.0.8)
     stackprof (0.2.27)
     state_machines (0.5.0)
@@ -2060,7 +2071,7 @@ GEM
     yard (0.9.37)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
-    zeitwerk (2.6.7)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -2072,6 +2083,7 @@ DEPENDENCIES
   activerecord-gitlab!
   addressable (~> 2.8)
   akismet (~> 3.0)
+  amazing_print
   apollo_upload_server (~> 2.1.6)
   app_store_connect
   arr-pm (~> 0.0.12)
@@ -2079,10 +2091,9 @@ DEPENDENCIES
   asciidoctor-include-ext (~> 0.4.0)
   asciidoctor-kroki (~> 0.10.0)
   asciidoctor-plantuml (~> 0.0.16)
-  async (~> 2.28.0)
+  async (~> 2.32.0)
   atlassian-jwt (~> 0.2.1)
   attr_encrypted (~> 4.2)
-  awesome_print
   aws-sdk-cloudformation (~> 1)
   aws-sdk-core (~> 3.226.0)
   aws-sdk-s3 (~> 1.193.0)
@@ -2104,7 +2115,7 @@ DEPENDENCIES
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.9)
   circuitbox (= 2.0.0)
-  click_house-client (= 0.5.1)
+  click_house-client (= 0.8.0)
   commonmarker (~> 0.23.10)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.5.3)
@@ -2168,14 +2179,15 @@ DEPENDENCIES
   gitlab-cloud-connector (~> 1.26)
   gitlab-crystalball (~> 1.1.0)
   gitlab-dangerfiles (~> 4.10.0)
-  gitlab-duo-workflow-service-client (~> 0.3)!
-  gitlab-experiment (~> 0.9.1)
+  gitlab-duo-workflow-service-client (~> 0.4)!
+  gitlab-experiment (~> 1.0.0)
   gitlab-fog-azure-rm (~> 2.4.0)
-  gitlab-glfm-markdown (~> 0.0.33)
+  gitlab-glfm-markdown (~> 0.0.36)
+  gitlab-grape-openapi!
   gitlab-housekeeper!
   gitlab-http!
-  gitlab-kas-grpc (~> 18.3.0)
-  gitlab-labkit (~> 0.40.0)
+  gitlab-kas-grpc (~> 18.5.0.pre.rc4)
+  gitlab-labkit (~> 0.42.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.0.24)
   gitlab-markup (~> 2.0.0)
@@ -2197,10 +2209,10 @@ DEPENDENCIES
   gon (~> 6.5.0)
   google-apis-androidpublisher_v3 (~> 0.86.0)
   google-apis-cloudbilling_v1 (~> 0.22.0)
-  google-apis-cloudresourcemanager_v1 (~> 0.31.0)
+  google-apis-cloudresourcemanager_v1 (~> 0.44.0)
   google-apis-compute_v1 (~> 0.129.0)
   google-apis-container_v1 (~> 0.100.0)
-  google-apis-container_v1beta1 (~> 0.90.0)
+  google-apis-container_v1beta1 (~> 0.91.0)
   google-apis-core (~> 0.18.0, >= 0.18.0)
   google-apis-iam_v1 (~> 0.73.0)
   google-apis-serviceusage_v1 (~> 0.28.0)
@@ -2222,7 +2234,7 @@ DEPENDENCIES
   graphlyte (~> 1.0.0)
   graphql (= 2.5.11)
   graphql-docs (~> 5.2.0)
-  grpc (~> 1.74.0)
+  grpc (~> 1.75.0)
   gssapi (~> 1.3.1)
   guard-rspec
   haml_lint (~> 0.58)
@@ -2249,7 +2261,7 @@ DEPENDENCIES
   knapsack (~> 4.0.0)
   kramdown (~> 2.5.0)
   kubeclient (~> 4.12.0)
-  lefthook (~> 1.12.0)
+  lefthook (~> 1.13.0)
   letter_opener_web (~> 3.0.0)
   license_finder (~> 7.0)
   licensee (~> 9.16)
@@ -2352,7 +2364,7 @@ DEPENDENCIES
   rbtrace (~> 0.4)
   re2 (~> 2.15)
   recaptcha (~> 5.12)
-  redis (~> 5.4.0)
+  redis (= 5.4.0)
   redis-actionpack (~> 5.5.0)
   redis-client (~> 0.25)
   redis-cluster-client (~> 0.13)
@@ -2361,7 +2373,7 @@ DEPENDENCIES
   responders (~> 3.0)
   retriable (~> 3.1.2)
   rexml (~> 3.4.0)
-  rouge (~> 4.6.0)
+  rouge (~> 4.6.1)
   rqrcode (~> 2.2)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized (~> 1.0, >= 1.0.2)
@@ -2370,9 +2382,9 @@ DEPENDENCIES
   rspec_junit_formatter
   rspec_profiling (~> 0.0.9)
   rubocop
-  ruby-lsp (~> 0.23.0)
-  ruby-lsp-rails (~> 0.3.6)
-  ruby-lsp-rspec (~> 0.1.10)
+  ruby-lsp (~> 0.26.0)
+  ruby-lsp-rails (~> 0.4.8)
+  ruby-lsp-rspec (~> 0.1.27)
   ruby-magic (~> 0.6)
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.18)
@@ -2404,7 +2416,7 @@ DEPENDENCIES
   sprite-factory (~> 1.7)
   sprockets (~> 3.7.0)
   sprockets-rails (~> 3.5.1)
-  ssh_data (~> 1.3)
+  ssh_data (~> 2.0)
   stackprof (~> 0.2.26)
   state_machines-activerecord (~> 0.8.0)
   state_machines-rspec (~> 0.6)
@@ -2440,4 +2452,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.7.1
+   2.7.2
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 7d093a838c87..a109fcdc6d3f 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -9,10 +9,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c8gxs7vhsl0hi7wnyd9wi3aqmqkm0y77y1k17z9zzc5yywsgfz0";
+      sha256 = "1g93cpxhk3n0lp42accb7b76km2di300lw9zpsrb2rigvnjmw3h6";
       type = "gem";
     };
-    version = "2.0.25";
+    version = "2.0.26";
   };
   actioncable = {
     dependencies = [
@@ -336,6 +336,19 @@ src: {
     };
     version = "0.4.1";
   };
+  amazing_print = {
+    groups = [
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0s3d1nf5afapjrk8746c8qfydl17l33l0a12rdircgzmh4c4wfzm";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
   android_key_attestation = {
     groups = [ "default" ];
     platforms = [ ];
@@ -454,10 +467,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vhmmn7n92ilvkvbdbav85hyg8w047zm20vbfzk502g0j495sv4n";
+      sha256 = "11s733zhjvriqbzca85ry29j33p3y7n24xjwwvjyga4rba5brzvr";
       type = "gem";
     };
-    version = "2.28.0";
+    version = "2.32.0";
   };
   atlassian-jwt = {
     dependencies = [ "jwt" ];
@@ -734,10 +747,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   benchmark-ips = {
     groups = [
@@ -821,14 +834,20 @@ src: {
     version = "2.10.1";
   };
   bigdecimal = {
-    groups = [ "default" ];
+    groups = [
+      "coverage"
+      "default"
+      "development"
+      "monorepo"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
+      sha256 = "06sfv80bmxfczkqi3pb3yc9zicqhf94adh5f8hpkn3bsqqd1vlgz";
       type = "gem";
     };
-    version = "3.1.7";
+    version = "3.2.3";
   };
   bindata = {
     groups = [ "default" ];
@@ -879,15 +898,16 @@ src: {
     groups = [
       "default"
       "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+      sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
       type = "gem";
     };
-    version = "3.2.4";
+    version = "3.3.0";
   };
   bullet = {
     dependencies = [
@@ -1128,10 +1148,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s9dgq9k6caappqr6y6vbzx3d8pmcb58cbp37am9slmfyvq2l0hh";
+      sha256 = "166j9r2pn6hbqqhgjx37c245yhd60dz00jphp18snrsfcxx841ds";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.8.0";
   };
   coderay = {
     groups = [
@@ -1190,10 +1210,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx";
+      sha256 = "1k9wa8fnfz08lyn86vpqhdv4jffznlxcx6p6qr11rdf7qy4jybfs";
       type = "gem";
     };
-    version = "0.23.11";
+    version = "0.23.12";
   };
   concurrent-ruby = {
     groups = [
@@ -1451,10 +1471,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy";
+      sha256 = "1203q6zdw14vwmnr2hw0d6b1rdz4d07w3kjg1my1zhw862gnnac8";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   database_cleaner-core = {
     groups = [
@@ -1821,6 +1841,7 @@ src: {
   dry-core = {
     dependencies = [
       "concurrent-ruby"
+      "logger"
       "zeitwerk"
     ];
     groups = [
@@ -1831,10 +1852,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk";
+      sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   dry-inflector = {
     groups = [
@@ -1845,13 +1866,14 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka";
+      sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.2.0";
   };
   dry-logic = {
     dependencies = [
+      "bigdecimal"
       "concurrent-ruby"
       "dry-core"
       "zeitwerk"
@@ -1864,13 +1886,14 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr";
+      sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.6.0";
   };
   dry-types = {
     dependencies = [
+      "bigdecimal"
       "concurrent-ruby"
       "dry-core"
       "dry-inflector"
@@ -1885,10 +1908,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj";
+      sha256 = "1g61cnmmwzff05sf8bh95qjd3hikasgvrmf3q0qk29zdw12pmndm";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.8.3";
   };
   dumb_delegator = {
     groups = [
@@ -2346,10 +2369,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ljxb9kqssp70waz0an1ppm33821r0dbvs4b75qbqbv05p0ziqs3";
+      sha256 = "0h7crcdqddlds3kx0q3vsx3cm6s62psvfx98crasqnhrz2nwb1g4";
       type = "gem";
     };
-    version = "2.24.0";
+    version = "2.25.0";
   };
   ffi = {
     groups = [
@@ -2762,10 +2785,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0677zbflbjvmxbf6riczscjl6g3pqdh5xb1f783d4lfhdi43rbg4";
+      sha256 = "1qg3kc103v767hjw77wcx5mwx5dg2b6vlhxk3bb4hpbsjqgm4mf3";
       type = "gem";
     };
-    version = "18.4.0.pre.rc1";
+    version = "18.4.1";
   };
   gitlab = {
     dependencies = [
@@ -2859,10 +2882,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h9kfc8ni6lc0jy5r8hvs1768130adq75pnn4vy7jfl7fk7683yp";
+      sha256 = "0bvjvc2yvc2sjn4f6lgww46gw39pb1ripsl5a6rq6wldfahvp7mw";
       type = "gem";
     };
-    version = "1.32.0";
+    version = "1.33.0";
   };
   gitlab-crystalball = {
     dependencies = [
@@ -2908,7 +2931,7 @@ src: {
       path = "${src}/vendor/gems/gitlab-duo-workflow-service-client";
       type = "path";
     };
-    version = "0.3";
+    version = "0.5";
   };
   gitlab-experiment = {
     dependencies = [
@@ -2919,10 +2942,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0j0zs29izmhqc1jvgfsvikqdyg6r8kf3j9azbmsmm02l45sfwc7j";
+      sha256 = "1fgar7p0rpi0ycqdccrzxz8lvxzm78zi95xy642jy09hbpjnzxwz";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "1.0.0";
   };
   gitlab-fog-azure-rm = {
     dependencies = [
@@ -2950,15 +2973,28 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pr1lqa5s4xrl5lxqw2sq5c3kdqlrlpxl9x9ybvf1lmpygkbcnmc";
+      sha256 = "12r3g7fb7wbhykmjn1n6b0jiyb26bma0x89wcm8ac4phz8aqhm6j";
       type = "gem";
     };
-    version = "0.0.33";
+    version = "0.0.36";
+  };
+  gitlab-grape-openapi = {
+    dependencies = [
+      "grape"
+      "grape-entity"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      path = "${src}/gems/gitlab-grape-openapi";
+      type = "path";
+    };
+    version = "0.1.0";
   };
   gitlab-housekeeper = {
     dependencies = [
       "activesupport"
-      "awesome_print"
+      "amazing_print"
       "httparty"
       "rubocop"
     ];
@@ -2996,10 +3032,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k0jbpfycg23pm8gddwzxj8b1wpvqisxc6dd33xxr2f7canr8bx8";
+      sha256 = "1imwvsfzd040pjkwid8xb5s5bdjy51mq68hcx4pasaspaz4qpzlf";
       type = "gem";
     };
-    version = "18.3.2";
+    version = "18.5.0.pre.rc4";
   };
   gitlab-labkit = {
     dependencies = [
@@ -3018,10 +3054,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0awcb5bb9y1y61yzzvj5gkm03w232njym7cdw0s2gpgwh37q6pyg";
+      sha256 = "07xbjd5vap486vspzz164hf2j5x0v9g4q6j0whzlh3ak1svqb22j";
       type = "gem";
     };
-    version = "0.40.0";
+    version = "0.42.0";
   };
   gitlab-license = {
     groups = [ "default" ];
@@ -3161,10 +3197,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h7wf8p369zqw51ikychqsii2kh9f920jwhr4b352p1sd1a59qf8";
+      sha256 = "0s9akkxm69i9mlcl5n3ikv9dy678cqqa3jl3cq785653gcx8p8ww";
       type = "gem";
     };
-    version = "0.33.3";
+    version = "0.35.1";
   };
   gitlab-security_report_schemas = {
     dependencies = [
@@ -3291,10 +3327,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xxi1grl13663cwmpqvyq75carn05nd8ns26aq34xjqmk0gc8j9c";
+      sha256 = "0b3db3p68b8h2089rhi5z3m927xkv4vcxa998v17lmspj2496wra";
       type = "gem";
     };
-    version = "2.20.0";
+    version = "2.20.3";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -3369,10 +3405,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzv5svbj62qcdw5ljva0sh8wifjx9wwx00kfj9bbff052i7597h";
+      sha256 = "1y05cy0h486lrdbl5vv3vpv2nh6pkizqa937v1yl0r46y8zp55my";
       type = "gem";
     };
-    version = "0.31.0";
+    version = "0.44.0";
   };
   google-apis-compute_v1 = {
     dependencies = [ "google-apis-core" ];
@@ -3405,10 +3441,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jbb5zqv7krxy60iylrnwb9qz0brbgj2m66w5kdhq040ww0760lx";
+      sha256 = "16f2ylvlyby4vzxn03ajqd4bnd6gcz5gxqs4gdi5jq47yi5ncfcn";
       type = "gem";
     };
-    version = "0.90.0";
+    version = "0.91.0";
   };
   google-apis-core = {
     dependencies = [
@@ -3946,10 +3982,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12qy6yga90hs2pdzkxwm80d38dbmjdxmf2szqwb40ky1jr4klfp7";
+      sha256 = "1na1h7nkc9s9s33g1pliml1nm3dq56ffwp9ajs95kpazbplbcd79";
       type = "gem";
     };
-    version = "1.74.1";
+    version = "1.75.0";
   };
   grpc-google-iam-v1 = {
     dependencies = [
@@ -4072,10 +4108,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb";
+      sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab";
       type = "gem";
     };
-    version = "0.64.0";
+    version = "0.66.0";
   };
   hamlit = {
     dependencies = [
@@ -4110,10 +4146,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169";
+      sha256 = "1lbw8lqzjv17vnwb9vy5ki4jiyihybcc5h2rmcrqiz1xa6y9s1ww";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.2.1";
   };
   hashie = {
     groups = [ "default" ];
@@ -4293,10 +4329,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
       type = "gem";
     };
-    version = "1.14.4";
+    version = "1.14.7";
   };
   i18n_data = {
     groups = [ "default" ];
@@ -4746,10 +4782,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.3";
+    version = "3.17.0.5";
   };
   launchy = {
     dependencies = [ "addressable" ];
@@ -4771,10 +4807,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pqam7p5f72ic1x16jmgvydjxgqd0lddq4pnkxjmwn174yk2k778";
+      sha256 = "0wl9bskb500gw0l2f1bm8rnv3xa2564lw6294pw6qnldz5zm2mx2";
       type = "gem";
     };
-    version = "1.12.3";
+    version = "1.13.0";
   };
   letter_opener = {
     dependencies = [ "launchy" ];
@@ -5209,10 +5245,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.9";
   };
   minitest = {
     groups = [
@@ -5352,10 +5388,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
+      sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.4";
   };
   mustermann-grape = {
     dependencies = [ "mustermann" ];
@@ -5603,10 +5639,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
+      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
       type = "gem";
     };
-    version = "1.18.9";
+    version = "1.18.10";
   };
   notiffany = {
     dependencies = [
@@ -5748,6 +5784,7 @@ src: {
   omniauth = {
     dependencies = [
       "hashie"
+      "logger"
       "rack"
       "rack-protection"
     ];
@@ -5755,10 +5792,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
+      sha256 = "0g3n12k5npmmgai2cs3snimy6r7h0bvalhjxv0fjxlphjq25p822";
       type = "gem";
     };
-    version = "2.1.3";
+    version = "2.1.4";
   };
   omniauth-alicloud = {
     dependencies = [ "omniauth-oauth2" ];
@@ -6003,10 +6040,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz";
+      sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.3.1";
   };
   openssl-signature_algorithm = {
     dependencies = [ "openssl" ];
@@ -6846,10 +6883,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4";
+      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.4.0";
   };
   proc_to_ast = {
     dependencies = [
@@ -7043,10 +7080,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
+      sha256 = "0kvz20sxih8f976ry45b6c8srkh4km0cw4ilc5ynlmyk2nkywkya";
       type = "gem";
     };
-    version = "2.2.17";
+    version = "2.2.18";
   };
   rack-accept = {
     dependencies = [ "rack" ];
@@ -7382,10 +7419,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd";
+      sha256 = "1c0r26dhdr4jiklc0g7wjmr5q56dp7hwcfa8z75khkp8mrhazfpa";
       type = "gem";
     };
-    version = "3.6.1";
+    version = "3.9.5";
   };
   rbtrace = {
     dependencies = [
@@ -7436,10 +7473,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rvf0yyff2anyfnmx6csx7fai8dk727b843hzz1bm2nqcmm9asv7";
+      sha256 = "1hpkh647ffsqhnj4ps85n2v4d116fg3250m9y7pcnc55lxl6nda5";
       type = "gem";
     };
-    version = "2.19.0";
+    version = "2.20.0";
   };
   recaptcha = {
     dependencies = [ "json" ];
@@ -7491,10 +7528,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm";
+      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
       type = "gem";
     };
-    version = "5.4.1";
+    version = "5.4.0";
   };
   redis-actionpack = {
     dependencies = [
@@ -7517,10 +7554,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l2fsgfzzrspgrg6x3s38hws5clgbn1aaxcmiyz5jz6xd3dpkxdz";
+      sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y";
       type = "gem";
     };
-    version = "0.25.3";
+    version = "0.26.1";
   };
   redis-cluster-client = {
     dependencies = [ "redis-client" ];
@@ -7542,10 +7579,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sj4b3j7i3rb5a276g7yyd95kji4j9sl6wmqfgpz39gx06qlni47";
+      sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw";
       type = "gem";
     };
-    version = "5.4.1";
+    version = "5.4.0";
   };
   redis-namespace = {
     dependencies = [ "redis" ];
@@ -7714,10 +7751,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05y4lwzci16c2xgckmpxkzq4czgkyaiiqhvrabdgaym3aj2jd10k";
+      sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
       type = "gem";
     };
-    version = "3.4.2";
+    version = "3.4.4";
   };
   rinku = {
     groups = [ "default" ];
@@ -7748,10 +7785,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h";
+      sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
       type = "gem";
     };
-    version = "4.6.0";
+    version = "4.6.1";
   };
   rqrcode = {
     dependencies = [
@@ -8151,16 +8188,15 @@ src: {
       "language_server-protocol"
       "prism"
       "rbs"
-      "sorbet-runtime"
     ];
     groups = [ "development" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s97zck9v2c1awk4lbj5ccsnn6p0jp018mrq12fvh5hp00sn3586";
+      sha256 = "050qg73g4qs3xza441nafy7610daa3k4ra0pbi3sdlawy9fwfh6i";
       type = "gem";
     };
-    version = "0.23.20";
+    version = "0.26.1";
   };
   ruby-lsp-rails = {
     dependencies = [ "ruby-lsp" ];
@@ -8168,10 +8204,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xlcpxsz2sk57l0kwla2gj8l9cfqj7dxxf0794p67daldr3fs2k7";
+      sha256 = "1bj4bj35l9jas2yf6w93j5ngw3f24lck2j9h5zmxwqs0dn91z7gh";
       type = "gem";
     };
-    version = "0.3.31";
+    version = "0.4.8";
   };
   ruby-lsp-rspec = {
     dependencies = [ "ruby-lsp" ];
@@ -8179,10 +8215,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08m2fw4f784lkbyz5rbzdhj57p0x2pfygk66ls0qsn5avnv7izs1";
+      sha256 = "09wqhrrkfhbjy8yxkp1bn9rmrdcjp85j3lisvwp1qp7jz18yk0bm";
       type = "gem";
     };
-    version = "0.1.24";
+    version = "0.1.27";
   };
   ruby-magic = {
     dependencies = [ "mini_portile2" ];
@@ -8776,23 +8812,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wxzz7580h6k2sghj9p1ss33i6nlmpmwqawi6ilr87si233rwgxc";
+      sha256 = "073ymwmn028lgzs62yfghdlgarndr3a972j8733dqkk9k2pcapr9";
       type = "gem";
     };
-    version = "0.5.2";
-  };
-  sorbet-runtime = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4";
-      type = "gem";
-    };
-    version = "0.5.11647";
+    version = "0.5.4";
   };
   spamcheck = {
     dependencies = [ "grpc" ];
@@ -8873,14 +8896,15 @@ src: {
     version = "3.5.2";
   };
   ssh_data = {
+    dependencies = [ "base64" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c";
+      sha256 = "1nsv1411dp5c13sbfzncf9kn3shf302gqqg8g7vmvvpzj5x35s1a";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.0.0";
   };
   ssrf_filter = {
     groups = [ "default" ];
@@ -10073,9 +10097,9 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
+      sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
       type = "gem";
     };
-    version = "2.6.7";
+    version = "2.7.3";
   };
 }
diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py
index 6c171c981682..4904884510e4 100755
--- a/pkgs/by-name/gi/gitlab/update.py
+++ b/pkgs/by-name/gi/gitlab/update.py
@@ -62,10 +62,10 @@ class GitLabRepo:
             .strip()
         )
 
-    def get_yarn_hash(self, rev: str):
+    def get_yarn_hash(self, rev: str, yarn_lock_path="yarn.lock"):
         with tempfile.TemporaryDirectory() as tmp_dir:
             with open(tmp_dir + "/yarn.lock", "w") as f:
-                f.write(self.get_file("yarn.lock", rev))
+                f.write(self.get_file(yarn_lock_path, rev))
             return (
                 subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
                 .decode("utf-8")
@@ -112,6 +112,7 @@ class GitLabRepo:
             version=self.rev2version(rev),
             repo_hash=self.get_git_hash(rev),
             yarn_hash=self.get_yarn_hash(rev),
+            frontend_islands_yarn_hash=self.get_yarn_hash(rev, "/ee/frontend_islands/apps/duo_next/yarn.lock"),
             owner=self.owner,
             repo=self.repo,
             rev=rev,
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index cedc2cfc9a68..e88e472bc8f2 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "gitnr";
diff --git a/pkgs/applications/version-management/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch b/pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
similarity index 100%
rename from pkgs/applications/version-management/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
rename to pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/by-name/gi/gittyup/package.nix
similarity index 95%
rename from pkgs/applications/version-management/gittyup/default.nix
rename to pkgs/by-name/gi/gittyup/package.nix
index 25e65657ce8d..0f125293276b 100644
--- a/pkgs/applications/version-management/gittyup/default.nix
+++ b/pkgs/by-name/gi/gittyup/package.nix
@@ -11,9 +11,7 @@
   ninja,
   openssl,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
     cmark
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -66,8 +64,8 @@ stdenv.mkDerivation rec {
     libssh2
     lua5_4
     openssl
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/gj/gjs/disable-introspection-test.patch b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
index 1c438dd6b401..d597f99b02d8 100644
--- a/pkgs/by-name/gj/gjs/disable-introspection-test.patch
+++ b/pkgs/by-name/gj/gjs/disable-introspection-test.patch
@@ -2,7 +2,7 @@ diff --git a/installed-tests/js/meson.build b/installed-tests/js/meson.build
 index 07759690..43c87c59 100644
 --- a/installed-tests/js/meson.build
 +++ b/installed-tests/js/meson.build
-@@ -123,7 +123,6 @@ jasmine_tests = [
+@@ -34,7 +34,6 @@ jasmine_tests = [
      'GTypeClass',
      'Importer',
      'Importer2',
diff --git a/pkgs/by-name/gj/gjs/fix-paths.patch b/pkgs/by-name/gj/gjs/fix-paths.patch
index 5ca5372ea947..99e82c9be3dc 100644
--- a/pkgs/by-name/gj/gjs/fix-paths.patch
+++ b/pkgs/by-name/gj/gjs/fix-paths.patch
@@ -2,7 +2,7 @@ diff --git a/installed-tests/debugger-test.sh b/installed-tests/debugger-test.sh
 index 0d118490..54c5507e 100755
 --- a/installed-tests/debugger-test.sh
 +++ b/installed-tests/debugger-test.sh
-@@ -3,7 +3,7 @@
+@@ -6,7 +6,7 @@
  if test "$GJS_USE_UNINSTALLED_FILES" = "1"; then
      gjs="$TOP_BUILDDIR/gjs-console"
  else
diff --git a/pkgs/by-name/gj/gjs/installed-tests-path.patch b/pkgs/by-name/gj/gjs/installed-tests-path.patch
index aa1510f5807b..403a9c372d4e 100644
--- a/pkgs/by-name/gj/gjs/installed-tests-path.patch
+++ b/pkgs/by-name/gj/gjs/installed-tests-path.patch
@@ -11,7 +11,7 @@ index 98475f7d..942d9eca 100644
      ],
      include_directories: top_include,
      install: get_option('installed_tests'), install_dir: installed_tests_execdir)
-@@ -82,7 +82,7 @@ foreach test : jasmine_tests
+@@ -90,7 +90,7 @@ foreach test : jasmine_tests
  
      test_description_subst = {
          'name': 'test@0@.js'.format(test),
@@ -20,16 +20,16 @@ index 98475f7d..942d9eca 100644
      }
      configure_file(configuration: test_description_subst,
          input: '../minijasmine.test.in',
-@@ -125,7 +125,7 @@ foreach test : dbus_tests
+@@ -122,7 +122,7 @@ foreach test : dbus_tests
  
-     dbus_test_description_subst = {
-         'name': 'test@0@.js'.format(test),
--        'installed_tests_execdir': prefix / installed_tests_execdir,
-+        'installed_tests_execdir': installed_tests_execdir,
-     }
-     configure_file(
-         configuration: dbus_test_description_subst,
-@@ -163,7 +163,7 @@ foreach test : modules_tests
+ dbus_test_description_subst = {
+     'name': 'testGDBus.js',
+-    'installed_tests_execdir': prefix / installed_tests_execdir,
++    'installed_tests_execdir': installed_tests_execdir,
+ }
+ configure_file(
+     configuration: dbus_test_description_subst,
+@@ -159,7 +159,7 @@ foreach test : modules_tests
  
      esm_test_description_subst = {
          'name': 'test@0@.js'.format(test),
@@ -42,7 +42,7 @@ diff --git a/installed-tests/meson.build b/installed-tests/meson.build
 index 7a7c48ab..52508c2c 100644
 --- a/installed-tests/meson.build
 +++ b/installed-tests/meson.build
-@@ -30,7 +30,7 @@ foreach test : simple_tests
+@@ -34,7 +34,7 @@ foreach test : simple_tests
  
      test_description_subst = {
          'name': 'test@0@.sh'.format(test),
@@ -51,7 +51,7 @@ index 7a7c48ab..52508c2c 100644
      }
      configure_file(configuration: test_description_subst,
          input: 'script.test.in', output: 'test@0@.sh.test'.format(test),
-@@ -85,7 +85,7 @@ foreach test : debugger_tests
+@@ -123,7 +123,7 @@ foreach test : debugger_tests
  
      test_description_subst = {
          'name': '@0@.debugger'.format(test),
diff --git a/pkgs/by-name/gj/gjs/package.nix b/pkgs/by-name/gj/gjs/package.nix
index f9b1f3c1ffa3..0f17692a1d58 100644
--- a/pkgs/by-name/gj/gjs/package.nix
+++ b/pkgs/by-name/gj/gjs/package.nix
@@ -11,7 +11,7 @@
   gtk4,
   atk,
   gobject-introspection,
-  spidermonkey_128,
+  spidermonkey_140,
   pango,
   cairo,
   readline,
@@ -41,7 +41,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gjs";
-  version = "1.84.2";
+  version = "1.86.0";
 
   outputs = [
     "out"
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gjs/${lib.versions.majorMinor finalAttrs.version}/gjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NRQu3zRXBWNjACkew6fVg/FJaf8/rg/zD0qVseZ0AWY=";
+    hash = "sha256-Y0SPeleATUwqjQx/XpDiJNBNTrLVYBQsB2xlqO2gB5k=";
   };
 
   patches = [
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     readline
     libsysprof-capture
-    spidermonkey_128
+    spidermonkey_140
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/by-name/gl/gl-gsync-demo/package.nix
similarity index 78%
rename from pkgs/games/gl-gsync-demo/default.nix
rename to pkgs/by-name/gl/gl-gsync-demo/package.nix
index fcfb9fb53144..b8ce7e582627 100644
--- a/pkgs/games/gl-gsync-demo/default.nix
+++ b/pkgs/by-name/gl/gl-gsync-demo/package.nix
@@ -4,11 +4,15 @@
   libX11,
   libglut,
   glew,
-  libXNVCtrl,
   libXext,
+  linuxPackages,
   lib,
 }:
 
+let
+  inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
+in
+
 stdenv.mkDerivation {
   pname = "gl-gsync-demo";
   version = "unstable-2020-12-27";
@@ -17,7 +21,7 @@ stdenv.mkDerivation {
     owner = "dahenry";
     repo = "gl-gsync-demo";
     rev = "4fd963a8ad880dc2d846394c8c80b2091a119591";
-    sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d";
+    hash = "sha256-DdUVZT1q5dh6lUSZfppEgmYZhYTZhA0QjMmmpm/V1sY=";
   };
 
   buildInputs = [
@@ -36,10 +40,10 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
-    license = with licenses; mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ atemu ];
+  meta = {
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ atemu ];
     description = "Very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux";
     mainProgram = "gl-gsync-demo";
     longDescription = ''
diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix
index 0671c642a9f5..6eb10676c64d 100644
--- a/pkgs/by-name/gl/glab/package.nix
+++ b/pkgs/by-name/gl/glab/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "glab";
-  version = "1.73.0";
+  version = "1.74.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2beWB7QD2oeGZIjDWxKyqZLGzNJKWlRuqA1h7GRu1G4=";
+    hash = "sha256-4nQg7wb3+nc9Pxdf9ys8aMzSgF6boNzri+MmtDLS5jE=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -28,7 +28,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-pQK3cRNxvGm+NH4zBlw8jm+fPgSg65FIe7zxZ99jl5Q=";
+  vendorHash = "sha256-htb/LAX3SOZEDHTYcu9WRcAkuY+fUMolODYfGE3qihY=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index 845080180656..5f07e0f79d90 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -2,53 +2,56 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  oath-toolkit,
-  openldap,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "glauth";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "glauth";
     repo = "glauth";
-    rev = "v${version}";
-    hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UUTL+ZnHRSYuD/TUYpsuo+Nu90kpA8ZL4XaGz6in3ME=";
   };
 
-  vendorHash = "sha256-MfauZRufl3kxr1fqatxTmiIvLJ+5JhbpSnbTHiujME8=";
+  vendorHash = "sha256-Lijy0LFy0PgWogdzYRNPFOkLym6Gf9qG4R+Bm91eYJg=";
 
-  nativeCheckInputs = [
-    oath-toolkit
-    openldap
-  ];
+  postPatch = ''
+    substituteInPlace v2/internal/version/const.go \
+      --replace-fail '"v2.3.1"' '"v${finalAttrs.version}"'
+  '';
 
-  modRoot = "v2";
+  # Builds without go workspace fail with mysterious errors
+  overrideModAttrs = _: {
+    buildPhase = ''
+      go work vendor -e -v
+    '';
+  };
 
-  # Disable go workspaces to fix build.
-  env.GOWORK = "off";
-
-  # Based on ldflags in <glauth>/Makefile.
   ldflags = [
     "-s"
     "-w"
-    "-X main.GitClean=1"
-    "-X main.LastGitTag=v${version}"
-    "-X main.GitTagIsCommit=1"
   ];
 
   # Tests fail in the sandbox.
   doCheck = false;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
   meta = with lib; {
     description = "Lightweight LDAP server for development, home use, or CI";
     homepage = "https://github.com/glauth/glauth";
+    changelog = "https://github.com/glauth/glauth/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     maintainers = with maintainers; [
       bjornfor
       christoph-heiss
+      xddxdd
     ];
     mainProgram = "glauth";
   };
-}
+})
diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix
index 6248ad5aad49..caf902307d35 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${final.version}";
-    hash = "sha256-4bEBnPLp7v6Jrd8h6q5LJc93om2VP3ZqB4JNSpKzPao=";
+    hash = "sha256-eBgcIhmezfYYaqBrKh6elbTMIQCUXd3W9TAuS/RDXcA=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index 48980b3fc182..92c711dac5e3 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   git,
   pkg-config,
   openssl,
-  erlang_27,
+  erlang,
   nodejs,
   bun,
   deno,
@@ -15,20 +16,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gleam";
-  version = "1.12.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "gleam-lang";
     repo = "gleam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qjl+I09tnBbGc771SVJVb6fzAZ2tVOnBNhGfrIUh824=";
+    hash = "sha256-06ap5z1vtv2Rsd98LcLRpvxff1NfkuHNdI844DZuEhQ=";
   };
 
-  cargoHash = "sha256-Ya0glVECB3cb9kgguuH4nY0ClK5NPH1mKAX9INDLzx4=";
+  cargoHash = "sha256-TzHjXW9sSbOJv7PrUaQzZ0jOPocVci1DjcmLzv7aaBY=";
 
   nativeBuildInputs = [
     pkg-config
-    erlang_27
+    erlang
   ];
 
   buildInputs = [ openssl ];
@@ -46,6 +47,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = [
     # Makes a network request
     "--skip=tests::echo::echo_dict"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Snapshot tests fail because a warning is shown on stdout
+    # warn: CPU lacks AVX support, strange crashes may occur. Reinstall Bun or use *-baseline build:
+    #   https://github.com/oven-sh/bun/releases/download/bun-v1.3.1/bun-darwin-x64-baseline.zip
+    "--skip=tests::echo::echo_bitarray"
+    "--skip=tests::echo::echo_bool"
+    "--skip=tests::echo::echo_charlist"
+    "--skip=tests::echo::echo_circular_reference"
+    "--skip=tests::echo::echo_custom_type"
+    "--skip=tests::echo::echo_float"
+    "--skip=tests::echo::echo_function"
+    "--skip=tests::echo::echo_importing_module_named_inspect"
+    "--skip=tests::echo::echo_int"
+    "--skip=tests::echo::echo_list"
+    "--skip=tests::echo::echo_nil"
+    "--skip=tests::echo::echo_singleton"
+    "--skip=tests::echo::echo_string"
+    "--skip=tests::echo::echo_tuple"
+    "--skip=tests::echo::echo_with_message"
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch b/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
deleted file mode 100644
index 70cec99815e9..000000000000
--- a/pkgs/by-name/gl/glfw3/0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 9997ae55a47de469ea26f8437c30b51483abda5f Mon Sep 17 00:00:00 2001
-From: Dan Klishch <danilklishch@gmail.com>
-Date: Sat, 30 Sep 2023 23:38:05 -0400
-Subject: Defer setting cursor position until the cursor is locked
-
----
- src/wl_platform.h |  3 +++
- src/wl_window.c   | 14 ++++++++++++--
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/src/wl_platform.h b/src/wl_platform.h
-index ca34f66e..cd1f227f 100644
---- a/src/wl_platform.h
-+++ b/src/wl_platform.h
-@@ -403,6 +403,9 @@ typedef struct _GLFWwindowWayland
-     int                         scaleSize;
-     int                         compositorPreferredScale;
- 
-+    double                      askedCursorPosX, askedCursorPosY;
-+    GLFWbool                    didAskForSetCursorPos;
-+
-     struct zwp_relative_pointer_v1* relativePointer;
-     struct zwp_locked_pointer_v1*   lockedPointer;
-     struct zwp_confined_pointer_v1* confinedPointer;
-diff --git a/src/wl_window.c b/src/wl_window.c
-index 1de26558..0df16747 100644
---- a/src/wl_window.c
-+++ b/src/wl_window.c
-@@ -2586,8 +2586,9 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos)
- 
- void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y)
- {
--    _glfwInputError(GLFW_FEATURE_UNAVAILABLE,
--                    "Wayland: The platform does not support setting the cursor position");
-+    window->wl.didAskForSetCursorPos = true;
-+    window->wl.askedCursorPosX = x;
-+    window->wl.askedCursorPosY = y;
- }
- 
- void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode)
-@@ -2819,6 +2820,15 @@ static const struct zwp_relative_pointer_v1_listener relativePointerListener =
- static void lockedPointerHandleLocked(void* userData,
-                                       struct zwp_locked_pointer_v1* lockedPointer)
- {
-+    _GLFWwindow* window = userData;
-+
-+    if (window->wl.didAskForSetCursorPos)
-+    {
-+        window->wl.didAskForSetCursorPos = false;
-+        zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer,
-+                                                       wl_fixed_from_double(window->wl.askedCursorPosX),
-+                                                       wl_fixed_from_double(window->wl.askedCursorPosY));
-+    }
- }
- 
- static void lockedPointerHandleUnlocked(void* userData,
--- 
-2.42.0
-
diff --git a/pkgs/by-name/gl/glfw3/package.nix b/pkgs/by-name/gl/glfw3/package.nix
index d5511c2ad8d3..193095773f7d 100644
--- a/pkgs/by-name/gl/glfw3/package.nix
+++ b/pkgs/by-name/gl/glfw3/package.nix
@@ -23,6 +23,12 @@
 }:
 let
   version = "3.4";
+  minecraftPatches = fetchFromGitHub {
+    owner = "BoyOrigin";
+    repo = "glfw-wayland";
+    rev = "f62b4ae8f93149fd754cadecd51d8b1a07d20522";
+    hash = "sha256-kvWP34rOD4HSTvnKb33nvVquTGZoqP8/l+8XQ0h3b7Y=";
+  };
 in
 stdenv.mkDerivation {
   pname = "glfw${lib.optionalString withMinecraftPatch "-minecraft"}";
@@ -36,12 +42,10 @@ stdenv.mkDerivation {
   };
 
   # Fix linkage issues on X11 (https://github.com/NixOS/nixpkgs/issues/142583)
-  patches = [
-    ./x11.patch
-  ]
-  ++ lib.optionals withMinecraftPatch [
-    ./0009-Defer-setting-cursor-position-until-the-cursor-is-lo.patch
-  ];
+  patches = [ ./x11.patch ];
+  prePatch = lib.optionalString withMinecraftPatch ''
+    patches+=(${minecraftPatches}/patches/*.patch)
+  '';
 
   propagatedBuildInputs = lib.optionals (!stdenv.hostPlatform.isWindows) [ libGL ];
 
diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix
index 99e289918ecd..b217b4a0dbf4 100644
--- a/pkgs/by-name/gl/glib/package.nix
+++ b/pkgs/by-name/gl/glib/package.nix
@@ -74,7 +74,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.84.4";
+  version = "2.86.1";
 
   outputs = [
     "bin"
@@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ip6hCUPDb8EX4lP4DJHkd7ZzUlrkV2KUKFiu9XYxu5A=";
+    hash = "sha256-EZ0XCMoCJVbW0pie6QrRuCvZwNFmfgZpRKbQAg4tXlc=";
   };
 
   patches =
diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix
index 56374a9d1cc7..fea22fd02b22 100644
--- a/pkgs/by-name/gl/glicol-cli/package.nix
+++ b/pkgs/by-name/gl/glicol-cli/package.nix
@@ -34,7 +34,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/glicol/glicol-cli";
     changelog = "https://github.com/glicol/glicol-cli/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "glicol-cli";
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index df93a780f517..c890a42e0ca3 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -5,14 +5,14 @@
   gitMinimal,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "glitter";
   version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "milo123459";
     repo = "glitter";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
   };
 
@@ -36,9 +36,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Git wrapper that allows you to compress multiple commands into one";
     homepage = "https://github.com/milo123459/glitter";
-    changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}";
+    changelog = "https://github.com/Milo123459/glitter/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "glitter";
   };
-}
+})
diff --git a/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch b/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch
new file mode 100644
index 000000000000..d4dafa87be08
--- /dev/null
+++ b/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch
@@ -0,0 +1,181 @@
+From 06ce42e72324b32b1f4c37c646e99950c2bd5f6b Mon Sep 17 00:00:00 2001
+From: Max Rees <maxcrees@me.com>
+Date: Sun, 15 Mar 2020 15:13:27 -0400
+Subject: [PATCH] Fix test suite on big endian platforms
+
+---
+ glm/gtc/packing.inl      | 55 ++++++++++++++++++++++++++++++++++++++++
+ test/gtc/gtc_packing.cpp |  3 ++-
+ 2 files changed, 57 insertions(+), 1 deletion(-)
+
+diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl
+index 8c906e16c1..b1c99a5076 100644
+--- a/glm/gtc/packing.inl
++++ b/glm/gtc/packing.inl
+@@ -9,6 +9,9 @@
+ #include "../detail/type_half.hpp"
+ #include <cstring>
+ #include <limits>
++extern "C" {
++#include <endian.h>
++}
+ 
+ namespace glm{
+ namespace detail
+@@ -183,9 +186,15 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 3;
+ 			uint y : 3;
+ 			uint z : 2;
++#else
++			uint z : 2;
++			uint y : 3;
++			uint x : 3;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -194,8 +203,13 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
++#else
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -204,10 +218,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
+ 			uint z : 4;
+ 			uint w : 4;
++#else
++			uint w : 4;
++			uint z : 4;
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -216,9 +237,15 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 6;
+ 			uint z : 5;
++#else
++			uint z : 5;
++			uint y : 6;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -227,10 +254,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 5;
+ 			uint z : 5;
+ 			uint w : 1;
++#else
++			uint w : 1;
++			uint z : 5;
++			uint y : 5;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -239,10 +273,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 10;
+ 			uint y : 10;
+ 			uint z : 10;
+ 			uint w : 2;
++#else
++			uint w : 2;
++			uint z : 10;
++			uint y : 10;
++			uint x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -251,10 +292,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			int x : 10;
+ 			int y : 10;
+ 			int z : 10;
+ 			int w : 2;
++#else
++			int w : 2;
++			int z : 10;
++			int y : 10;
++			int x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -263,10 +311,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 9;
+ 			uint y : 9;
+ 			uint z : 9;
+ 			uint w : 5;
++#else
++			uint w : 5;
++			uint z : 9;
++			uint y : 9;
++			uint x : 9;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp
+index df5b3bb1a9..fbaaa5bccd 100644
+--- a/test/gtc/gtc_packing.cpp
++++ b/test/gtc/gtc_packing.cpp
+@@ -4,6 +4,7 @@
+ #include <glm/ext/vector_relational.hpp>
+ #include <cstdio>
+ #include <vector>
++#include <arpa/inet.h>
+ 
+ void print_bits(float const& s)
+ {
+@@ -156,7 +157,7 @@ int test_U3x10_1x2()
+ 
+ 	glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33);
+ 	glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]);
+-	glm::uint32 const r0 = 0x330077ff;
++	glm::uint32 const r0 = htonl(0xff770033);
+ 
+ 	Error += p0 == r0 ? 0 : 1;
+ 
diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index 1cda3e6bf26b..f5dd16d62101 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.2";
   pname = "glm";
 
   src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
     rev = version;
-    sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
+    sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0=";
   };
 
   outputs = [
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
     "doc"
   ];
 
+  patches = lib.optionals stdenv.hostPlatform.isLinux [
+    # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release.
+    # Relies on <endian.h>, Linux-specific
+    ./1001-glm-Fix-packing-on-BE.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   env.NIX_CFLAGS_COMPILE =
@@ -62,6 +68,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/g-truc/glm";
     license = licenses.mit;
     platforms = platforms.unix;
+    # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE.
+    # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header.
+    broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux;
     maintainers = with maintainers; [ smancill ];
   };
 }
diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index d8d220d8306d..b4ae966e8c29 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "globalping-cli";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "jsdelivr";
     repo = "globalping-cli";
     rev = "v${version}";
-    hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
+    hash = "sha256-muWhiKqPdNVhy7c7MSRHACGzOn5pIVRdqSdfdCJw2CA=";
   };
 
   vendorHash = "sha256-dJAuN5srL5EvMaRg8rHaTsurjYrdH45p965DeubpB0E=";
diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index e47a690b006c..acd687d5574b 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.20.1";
+  version = "1.20.3";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-jSF2B9dbyJ9S4PHt6CKANC40MgXIuVF3uh4Ze0F0jZU=";
+    hash = "sha256-i2+CEPHK2C34ulY4nRTVw0sNBsHzD1WlKiZRjwHJOVc=";
   };
 
   vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";
diff --git a/pkgs/by-name/gl/gloox/package.nix b/pkgs/by-name/gl/gloox/package.nix
index 71fe57dbeafe..b4d490c2176a 100644
--- a/pkgs/by-name/gl/gloox/package.nix
+++ b/pkgs/by-name/gl/gloox/package.nix
@@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ ];
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
index f0fae52ced72..0b53a622d192 100644
--- a/pkgs/by-name/gl/glsl_analyzer/package.nix
+++ b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -9,13 +9,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "glsl_analyzer";
-  version = "1.6.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "nolanderc";
     repo = "glsl_analyzer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UDAbSRGaismUHQy4s+gygDzrrHu1G5PObRBWnua6bDA=";
+    hash = "sha256-429S4iTkXQ64Fd153Xr7Z7eKbqKe0gI9yAvMPNV2/dE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index a4e3e5a6987d..51a7e8699a67 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "15.4.0";
+  version = "16.0.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-sPc+G7/ua7LQ7scuSvqWs7Q7Q+gFvXQ5wGQsEXbWH6w=";
+    hash = "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix
index a3588b6628a9..3c6ff4114f26 100644
--- a/pkgs/by-name/gl/glycin-loaders/package.nix
+++ b/pkgs/by-name/gl/glycin-loaders/package.nix
@@ -2,8 +2,6 @@
   stdenv,
   lib,
   fetchurl,
-  replaceVars,
-  bubblewrap,
   cairo,
   cargo,
   gettext,
@@ -21,26 +19,25 @@
   pkg-config,
   rustc,
   rustPlatform,
+  common-updater-scripts,
+  _experimental-update-script-combinators,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glycin-loaders";
-  version = "1.2.3";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glycin/${lib.versions.majorMinor finalAttrs.version}/glycin-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OAqv4r+07KDEW0JmDr/0SWANAKQ7YJ1bHIP3lfXI+zw=";
+    hash = "sha256-ZYAOhWs37byNXDM1rVNBUFgc4/LwhFTdAwKiZHC9nRM=";
   };
 
-  patches = [
-    # Fix paths in glycin library.
-    # Not actually needed for this package since we are only building loaders
-    # and this patch is relevant just to apps that use the loaders
-    # but apply it here to ensure the patch continues to apply.
-    finalAttrs.passthru.glycinPathsPatch
-  ];
-
-  cargoVendorDir = "vendor";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    name = "glycin-loaders-deps-${finalAttrs.version}";
+    hash = "sha256-9cpvRNqymxkOi6L5oZDGyvB68rzEt97qB8uqzhUYsao=";
+    dontConfigure = true;
+  };
 
   nativeBuildInputs = [
     cargo
@@ -66,28 +63,49 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     "-Dglycin-loaders=true"
+    "-Dglycin-thumbnailer=false"
     "-Dlibglycin=false"
+    "-Dlibglycin-gtk4=false"
     "-Dvapi=false"
   ];
 
   strictDeps = true;
 
   postPatch = ''
-    substituteInPlace loaders/meson.build \
+    substituteInPlace glycin-loaders/meson.build \
       --replace-fail "cargo_target_dir / rust_target / loader," "cargo_target_dir / '${stdenv.hostPlatform.rust.cargoShortTarget}' / rust_target / loader,"
   '';
 
   env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec;
 
   passthru = {
-    updateScript = gnome.updateScript {
-      attrPath = "glycin-loaders";
-      packageName = "glycin";
-    };
-
-    glycinPathsPatch = replaceVars ./fix-glycin-paths.patch {
-      bwrap = "${bubblewrap}/bin/bwrap";
-    };
+    updateScript =
+      let
+        updateSource = gnome.updateScript {
+          attrPath = "glycin-loaders";
+          packageName = "glycin";
+        };
+        updateLockfile = {
+          command = [
+            "sh"
+            "-c"
+            ''
+              PATH=${
+                lib.makeBinPath [
+                  common-updater-scripts
+                ]
+              }
+              update-source-version glycin-loaders --ignore-same-version --source-key=cargoDeps.vendorStaging > /dev/null
+            ''
+          ];
+          # Experimental feature: do not copy!
+          supportedFeatures = [ "silent" ];
+        };
+      in
+      _experimental-update-script-combinators.sequence [
+        updateSource
+        updateLockfile
+      ];
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/gm/gmsh/package.nix b/pkgs/by-name/gm/gmsh/package.nix
index c2b341e5f15e..c27b128b153d 100644
--- a/pkgs/by-name/gm/gmsh/package.nix
+++ b/pkgs/by-name/gm/gmsh/package.nix
@@ -25,11 +25,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gmsh";
-  version = "4.14.0";
+  version = "4.15.0";
 
   src = fetchurl {
     url = "https://gmsh.info/src/gmsh-${finalAttrs.version}-source.tgz";
-    hash = "sha256-2019ogYumkNWqCCDITirmfl69jiL/rIVmaLq37C3aig=";
+    hash = "sha256-q7JjJxW9fQEw3tcUT9YmNjXNfeqIO432G6TaWM5qHf4=";
   };
 
   nativeBuildInputs = [
@@ -113,5 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://gmsh.info/";
     changelog = "https://gitlab.onelab.info/gmsh/gmsh/-/releases/gmsh_${lib.concatStringsSep "_" (lib.versions.splitVersion finalAttrs.version)}#changelog";
     license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ iedame ];
   };
 })
diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix
index 17f0b7daea27..286cb5d53af6 100644
--- a/pkgs/by-name/gn/gn/package.nix
+++ b/pkgs/by-name/gn/gn/package.nix
@@ -11,11 +11,11 @@
   version ?
     # This is a workaround for update-source-version to be able to update this
     let
-      _version = "0-unstable-2025-07-29";
+      _version = "0-unstable-2025-08-29";
     in
     _version,
-  rev ? "3a4f5cea73eca32e9586e8145f97b04cbd4a1aee",
-  hash ? "sha256-Z7bTto8BHnJzjvmKmcVAZ0/BrXimcAETV6YGKNTorQw=",
+  rev ? "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
+  hash ? "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg=",
 }:
 
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/gn/gnome-applets/package.nix b/pkgs/by-name/gn/gnome-applets/package.nix
index e5f866eac2ce..5d8b8178a4b4 100644
--- a/pkgs/by-name/gn/gnome-applets/package.nix
+++ b/pkgs/by-name/gn/gnome-applets/package.nix
@@ -25,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-applets";
-  version = "3.56.0";
+  version = "3.58.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-applets/${lib.versions.majorMinor finalAttrs.version}/gnome-applets-${finalAttrs.version}.tar.xz";
-    hash = "sha256-+heu3JVa3ZgaouQ7TAcTU/aGu9HuwdcXqJCnNTIK0XE=";
+    hash = "sha256-5h7bcTRNzV2qbnF137snSnWL6LWEUnc1abs1ZFuFojg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-backgrounds/package.nix b/pkgs/by-name/gn/gnome-backgrounds/package.nix
index 849131c3ee53..08dd14cf8c41 100644
--- a/pkgs/by-name/gn/gnome-backgrounds/package.nix
+++ b/pkgs/by-name/gn/gnome-backgrounds/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-backgrounds";
-  version = "48.2.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-backgrounds/${lib.versions.major version}/gnome-backgrounds-${version}.tar.xz";
-    hash = "sha256-ahxbey4Nj1zpd5JtVfnC1l3RgIIs3qXlkVDc+1q9Htk=";
+    hash = "sha256-Af4mDeWLoA5Eq6WJqZjjPovHrsxwHfC+5kz0z7pE9LU=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-boxes/package.nix b/pkgs/by-name/gn/gnome-boxes/package.nix
index a5bc86e04ea0..a2a4547ba5ef 100644
--- a/pkgs/by-name/gn/gnome-boxes/package.nix
+++ b/pkgs/by-name/gn/gnome-boxes/package.nix
@@ -50,11 +50,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-boxes";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-boxes/${lib.versions.major version}/gnome-boxes-${version}.tar.xz";
-    hash = "sha256-0F9fQlaPr79tiHcRYbBu1fc51DEhJ41BjK6VxW5RPq0=";
+    hash = "sha256-+kcmbab173qQTFuHadTYcbzNTmtjmjY8MjVDjXsOdXo=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-builder/package.nix b/pkgs/by-name/gn/gnome-builder/package.nix
index d8b3287f780a..fa090a43883e 100644
--- a/pkgs/by-name/gn/gnome-builder/package.nix
+++ b/pkgs/by-name/gn/gnome-builder/package.nix
@@ -24,6 +24,7 @@
   libspelling,
   libsysprof-capture,
   libxml2,
+  libyaml,
   meson,
   ninja,
   ostree,
@@ -42,7 +43,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-builder";
-  version = "48.2";
+  version = "49.0";
 
   outputs = [
     "out"
@@ -51,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-builder/${lib.versions.major finalAttrs.version}/gnome-builder-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7BKA1H6BSjE7dMuSfVoFk4BUSqD1bodVKXg5fWx0zGM=";
+    hash = "sha256-1FmQ22gfle4id75PqfKWSYJwfb3zATCgvecCNLN59WI=";
   };
 
   patches = [
@@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     libspelling
     libsysprof-capture
     libxml2
+    libyaml
     ostree
     pcre2
     python3
diff --git a/pkgs/by-name/gn/gnome-calculator/package.nix b/pkgs/by-name/gn/gnome-calculator/package.nix
index f0e5454cd4dc..a46838c3c8f8 100644
--- a/pkgs/by-name/gn/gnome-calculator/package.nix
+++ b/pkgs/by-name/gn/gnome-calculator/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   appstream,
+  blueprint-compiler,
   meson,
   ninja,
   vala,
@@ -26,15 +27,16 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calculator";
-  version = "48.1";
+  version = "49.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calculator/${lib.versions.major version}/gnome-calculator-${version}.tar.xz";
-    hash = "sha256-vEvUGpuhkPRcvuDYxnUs3F0osM7xxr0MAeLa4fPBkWI=";
+    hash = "sha256-7L4g5jBXX7i8I3kNNfOGrBd5ADxA3FyHfTzS2g/HRT8=";
   };
 
   nativeBuildInputs = [
     appstream
+    blueprint-compiler
     meson
     ninja
     pkg-config
diff --git a/pkgs/by-name/gn/gnome-calendar/package.nix b/pkgs/by-name/gn/gnome-calendar/package.nix
index b457a6c1b67d..37bc7f32d6a8 100644
--- a/pkgs/by-name/gn/gnome-calendar/package.nix
+++ b/pkgs/by-name/gn/gnome-calendar/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  blueprint-compiler,
   meson,
   ninja,
   pkg-config,
@@ -22,14 +23,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-calendar";
-  version = "48.1";
+  version = "49.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-calendar/${lib.versions.major version}/gnome-calendar-${version}.tar.xz";
-    hash = "sha256-Bs6t1cAL6ONYGB1CHs8mgs4K6i/LEtkDsw0pyjMonwI=";
+    hash = "sha256-4L/k6hCUItraB0Xdj4wOAjCriCB3ENHAfiRTIs+RP/I=";
   };
 
   nativeBuildInputs = [
+    blueprint-compiler
     meson
     ninja
     pkg-config
diff --git a/pkgs/by-name/gn/gnome-characters/package.nix b/pkgs/by-name/gn/gnome-characters/package.nix
index 73d26f0c44cc..a619b7aa49eb 100644
--- a/pkgs/by-name/gn/gnome-characters/package.nix
+++ b/pkgs/by-name/gn/gnome-characters/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-characters";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-characters/${lib.versions.major version}/gnome-characters-${version}.tar.xz";
-    hash = "sha256-osMspU2RHbJARCA1DTRC5pGi3Oiw9dAImfZs/4w8jXE=";
+    hash = "sha256-G25UioLiaqTsmv5AnWmiVwk2LAN/pcUzGG1qHbKa9uM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-chess/package.nix b/pkgs/by-name/gn/gnome-chess/package.nix
index 9c0fb5f950bd..f1001c6026aa 100644
--- a/pkgs/by-name/gn/gnome-chess/package.nix
+++ b/pkgs/by-name/gn/gnome-chess/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-chess";
-  version = "48.0";
+  version = "49.2";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-chess/${lib.versions.major version}/gnome-chess-${version}.tar.xz";
-    hash = "sha256-eDTEdvCLvyd5BrApNjLtMugDdMuUQyayGeqQVqapXz8=";
+    hash = "sha256-xAoABKRz/nSawvpPrZjbZBGNGPn9msAu7Po2TwPb6bA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-clocks/package.nix b/pkgs/by-name/gn/gnome-clocks/package.nix
index 15c66b54168f..ed0b223c66dd 100644
--- a/pkgs/by-name/gn/gnome-clocks/package.nix
+++ b/pkgs/by-name/gn/gnome-clocks/package.nix
@@ -26,11 +26,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-clocks";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-clocks/${lib.versions.major finalAttrs.version}/gnome-clocks-${finalAttrs.version}.tar.xz";
-    hash = "sha256-YW7h+3UwCx8muXZiGelUdRNgyg+g9JExG8+DvzgIfGI=";
+    hash = "sha256-v3aRXypJLooFkv5As1NGWTqjnk5ogdYXbg79h3HU5vo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-connections/package.nix b/pkgs/by-name/gn/gnome-connections/package.nix
index 7213e140b894..4694bc8cab2e 100644
--- a/pkgs/by-name/gn/gnome-connections/package.nix
+++ b/pkgs/by-name/gn/gnome-connections/package.nix
@@ -17,16 +17,18 @@
   libxml2,
   gtk-vnc,
   gtk-frdp,
+  spice-gtk,
+  spice-protocol,
   gnome,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-connections";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-connections/${lib.versions.major finalAttrs.version}/gnome-connections-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Nw75QFBrVybG8rfLl5ayI9HW1Chfg8/DOFvWdMMon9A=";
+    hash = "sha256-Oh+UZrpUkUdHI1+uIexuoybJf2+NAJDLmc+worJMc54=";
   };
 
   nativeBuildInputs = [
@@ -49,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
     libxml2
     gtk-frdp
+    spice-gtk
+    spice-protocol
   ];
 
   passthru = {
diff --git a/pkgs/by-name/gn/gnome-console/package.nix b/pkgs/by-name/gn/gnome-console/package.nix
index ead44457a72e..e6c37c1433de 100644
--- a/pkgs/by-name/gn/gnome-console/package.nix
+++ b/pkgs/by-name/gn/gnome-console/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  appstream,
   gettext,
   gnome,
   libgtop,
@@ -20,14 +21,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-console";
-  version = "48.0.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-console/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-AY6Qjk2uvPyxUNTxuyjZgnKqnRTWgV6vjaRfiJ2wXEk=";
+    hash = "sha256-no6WRvRz0B9LSnvOLEetImtK6D+r8ky7tKyU9qxdXMI=";
   };
 
   nativeBuildInputs = [
+    appstream
     desktop-file-utils
     gettext
     meson
diff --git a/pkgs/by-name/gn/gnome-contacts/package.nix b/pkgs/by-name/gn/gnome-contacts/package.nix
index 6addc8e84af3..57f1fcf4655b 100644
--- a/pkgs/by-name/gn/gnome-contacts/package.nix
+++ b/pkgs/by-name/gn/gnome-contacts/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   gettext,
   fetchurl,
+  blueprint-compiler,
   evolution-data-server-gtk4,
   pkg-config,
   libxslt,
@@ -29,14 +30,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-contacts";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-contacts/${lib.versions.major version}/gnome-contacts-${version}.tar.xz";
-    hash = "sha256-onYplbWUJ+w/GF8otVlONwd7cqcM18GSF+1jRjfswbU=";
+    hash = "sha256-JfIcZ7wp133vLZzT4i0oRg0StH/ySKIBdzG1TbSF5K8=";
   };
 
   nativeBuildInputs = [
+    blueprint-compiler
     meson
     ninja
     pkg-config
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 2d5710716277..ff6efb76a0d6 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -5,6 +5,7 @@
   replaceVars,
   accountsservice,
   adwaita-icon-theme,
+  blueprint-compiler,
   colord,
   colord-gtk4,
   cups,
@@ -27,6 +28,7 @@
   gsettings-desktop-schemas,
   gsound,
   gst_all_1,
+  gtk3,
   gtk4,
   ibus,
   json-glib,
@@ -42,7 +44,6 @@
   libsecret,
   libsoup_3,
   libwacom,
-  libXi,
   libxml2,
   libxslt,
   meson,
@@ -63,7 +64,7 @@
   tinysparql,
   localsearch,
   tzdata,
-  udisks2,
+  udisks,
   upower,
   wayland-scanner,
   libepoxy,
@@ -75,11 +76,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-control-center";
-  version = "48.4";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KiDu5uBcjTrdru+lJNzh7p+Ip32Djj/R7e88DC5GetI=";
+    hash = "sha256-pdjc4qAooAR+hnQ8J3J33os1oGPUSDNgSuo+ieqFn5c=";
   };
 
   patches = [
@@ -91,6 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
+    blueprint-compiler
     docbook-xsl-nons
     gettext
     libxslt
@@ -123,6 +125,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-user-share # optional, sharing panel
     gsettings-desktop-schemas
     gsound
+    gtk3 # org.gtk.Settings.FileChooser schema (datetime panel sets clock-format)
     gtk4
     ibus
     json-glib
@@ -138,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
     libsecret
     libsoup_3
     libwacom
-    libXi
     libxml2
     modemmanager
     mutter # schemas for the keybindings
@@ -147,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: {
     samba
     tinysparql
     localsearch # for search locations dialog
-    udisks2
+    udisks
     upower
     # For animations in Mouse panel.
     gst_all_1.gst-plugins-base
diff --git a/pkgs/by-name/gn/gnome-control-center/paths.patch b/pkgs/by-name/gn/gnome-control-center/paths.patch
index 41dd5979aa4b..87d8f737ba43 100644
--- a/pkgs/by-name/gn/gnome-control-center/paths.patch
+++ b/pkgs/by-name/gn/gnome-control-center/paths.patch
@@ -1,17 +1,8 @@
 diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c
-index f6c84e3d2..cd897f8f5 100644
+index dac0e51..71af3e2 100644
 --- a/panels/color/cc-color-panel.c
 +++ b/panels/color/cc-color-panel.c
-@@ -614,7 +614,7 @@ gcm_prefs_calibrate_cb (CcColorPanel *self)
- 
-   /* run with modal set */
-   argv = g_ptr_array_new_with_free_func (g_free);
--  g_ptr_array_add (argv, g_strdup ("gcm-calibrate"));
-+  g_ptr_array_add (argv, g_build_filename ("@gcm@", "bin", "gcm-calibrate", NULL));
-   g_ptr_array_add (argv, g_strdup ("--device"));
-   g_ptr_array_add (argv, g_strdup (cd_device_get_id (self->current_device)));
-   g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -989,7 +989,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile)
+@@ -973,7 +973,7 @@ gcm_prefs_profile_view (CcColorPanel *self, CdProfile *profile)
  
    /* open up gcm-viewer as a info pane */
    argv = g_ptr_array_new_with_free_func (g_free);
@@ -20,7 +11,7 @@ index f6c84e3d2..cd897f8f5 100644
    g_ptr_array_add (argv, g_strdup ("--profile"));
    g_ptr_array_add (argv, g_strdup (cd_profile_get_id (profile)));
    g_ptr_array_add (argv, g_strdup ("--parent-window"));
-@@ -1221,15 +1221,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device)
+@@ -1141,15 +1141,12 @@ gcm_prefs_device_clicked (CcColorPanel *self, CdDevice *device)
  static void
  gcm_prefs_profile_clicked (CcColorPanel *self, CdProfile *profile, CdDevice *device)
  {
@@ -38,7 +29,7 @@ index f6c84e3d2..cd897f8f5 100644
    else
      gtk_widget_set_sensitive (self->toolbutton_profile_view, FALSE);
 diff --git a/panels/system/datetime/tz.h b/panels/system/datetime/tz.h
-index feef16580..4b88ef7b1 100644
+index feef165..4b88ef7 100644
 --- a/panels/system/datetime/tz.h
 +++ b/panels/system/datetime/tz.h
 @@ -27,11 +27,7 @@
@@ -55,10 +46,10 @@ index feef16580..4b88ef7b1 100644
  typedef struct _TzDB TzDB;
  typedef struct _TzLocation TzLocation;
 diff --git a/panels/network/connection-editor/net-connection-editor.c b/panels/network/connection-editor/net-connection-editor.c
-index ec5a905a5..689fdbebe 100644
+index f1cae8d..faee22a 100644
 --- a/panels/network/connection-editor/net-connection-editor.c
 +++ b/panels/network/connection-editor/net-connection-editor.c
-@@ -377,7 +377,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
+@@ -384,7 +384,7 @@ net_connection_editor_do_fallback (NetConnectionEditor *self, const gchar *type)
          GPid child_pid;
  
          builder = g_strv_builder_new ();
@@ -68,7 +59,7 @@ index ec5a905a5..689fdbebe 100644
          if (self->is_new_connection) {
                  g_autofree gchar *type_str = NULL;
 diff --git a/panels/network/net-device-mobile.c b/panels/network/net-device-mobile.c
-index 166670224..36f720d36 100644
+index d0b0206..8276af0 100644
 --- a/panels/network/net-device-mobile.c
 +++ b/panels/network/net-device-mobile.c
 @@ -521,7 +521,7 @@ options_button_clicked_cb (NetDeviceMobile *self)
@@ -90,7 +81,7 @@ index 166670224..36f720d36 100644
  }
  
 diff --git a/panels/printers/pp-host.c b/panels/printers/pp-host.c
-index a31a606e3..ed5133d29 100644
+index a31a606..ed5133d 100644
 --- a/panels/printers/pp-host.c
 +++ b/panels/printers/pp-host.c
 @@ -256,7 +256,7 @@ _pp_host_get_snmp_devices_thread (GTask        *task,
@@ -103,7 +94,7 @@ index a31a606e3..ed5133d29 100644
  
    /* Use SNMP to get printer's informations */
 diff --git a/panels/system/users/run-passwd.c b/panels/system/users/run-passwd.c
-index edbc99830..1e1d90141 100644
+index fb9efc6..452486a 100644
 --- a/panels/system/users/run-passwd.c
 +++ b/panels/system/users/run-passwd.c
 @@ -152,7 +152,7 @@ spawn_passwd (PasswdHandler *passwd_handler, GError **error)
@@ -116,10 +107,10 @@ index edbc99830..1e1d90141 100644
  
          envp = g_get_environ ();
 diff --git a/panels/system/users/user-utils.c b/panels/system/users/user-utils.c
-index 5b7bc1f02..13ffe6ca8 100644
+index 16dc79e..f543e7b 100644
 --- a/panels/system/users/user-utils.c
 +++ b/panels/system/users/user-utils.c
-@@ -215,7 +215,7 @@ is_valid_username_async (const gchar *username,
+@@ -217,7 +217,7 @@ is_valid_username_async (const gchar *username,
           * future, so it would be nice to have some official way for this
           * instead of relying on the current "--login" implementation.
           */
@@ -129,7 +120,7 @@ index 5b7bc1f02..13ffe6ca8 100644
          argv[2] = data->username;
          argv[3] = "--";
 diff --git a/tests/datetime/test-endianess.c b/tests/datetime/test-endianess.c
-index 9cb92007a..84d2f0fa3 100644
+index 9cb9200..84d2f0f 100644
 --- a/tests/datetime/test-endianess.c
 +++ b/tests/datetime/test-endianess.c
 @@ -26,7 +26,7 @@ test_endianess (void)
diff --git a/pkgs/by-name/gn/gnome-desktop/package.nix b/pkgs/by-name/gn/gnome-desktop/package.nix
index 567f272183f1..722d0e70886f 100644
--- a/pkgs/by-name/gn/gnome-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-desktop/package.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-desktop";
-  version = "44.3";
+  version = "44.4";
 
   outputs = [
     "out"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-desktop/${lib.versions.major finalAttrs.version}/gnome-desktop-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-QO+pqo1Q7/7ZIno9cGceMuncNeIPMxyrO1YpdZePT40=";
+    sha256 = "sha256-HYy5xqMo62ibDBJpz1ODTMhNhR1+cZcM2ruoJwa0SYQ=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [
diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index 5231521e2431..5d0e571627ae 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -24,7 +24,7 @@
   ninja,
   pkg-config,
   systemd,
-  udisks2,
+  udisks,
   wrapGAppsHook3,
   xz,
 }:
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libpwquality
     libsecret
     systemd
-    udisks2
+    udisks
     xz
   ];
 
diff --git a/pkgs/by-name/gn/gnome-feeds/package.nix b/pkgs/by-name/gn/gnome-feeds/package.nix
index e502a17bdbed..7e4765a50dea 100644
--- a/pkgs/by-name/gn/gnome-feeds/package.nix
+++ b/pkgs/by-name/gn/gnome-feeds/package.nix
@@ -87,7 +87,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://gitlab.gnome.org/World/gfeeds";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      pbogdan
       aleksana
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/gn/gnome-firmware/package.nix b/pkgs/by-name/gn/gnome-firmware/package.nix
index 2821adcbff51..5684b2c931fa 100644
--- a/pkgs/by-name/gn/gnome-firmware/package.nix
+++ b/pkgs/by-name/gn/gnome-firmware/package.nix
@@ -21,14 +21,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-firmware";
-  version = "47.0";
+  version = "49.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "gnome-firmware";
     rev = finalAttrs.version;
-    sha256 = "sha256-dI9tE/I+14IhYZ+IDLErPunlT4L29AudbZXh0at4jKQ=";
+    sha256 = "sha256-3uU0N40O1eoK5JHWMwacSrBzOTq/c+qYwoH9kBOsqrM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-flashback/package.nix b/pkgs/by-name/gn/gnome-flashback/package.nix
index 6d64cd8f16cb..d8b98b99b117 100644
--- a/pkgs/by-name/gn/gnome-flashback/package.nix
+++ b/pkgs/by-name/gn/gnome-flashback/package.nix
@@ -17,6 +17,7 @@
   libpulseaudio,
   libxkbfile,
   libxml2,
+  metacity,
   pkg-config,
   polkit,
   gdm,
@@ -34,43 +35,13 @@
   buildEnv,
 }:
 
-let
-  # From data/sessions/Makefile.am
-  requiredComponentsCommon =
-    enableGnomePanel: [ "gnome-flashback" ] ++ lib.optional enableGnomePanel "gnome-panel";
-  requiredComponentsGsd = [
-    "org.gnome.SettingsDaemon.A11ySettings"
-    "org.gnome.SettingsDaemon.Color"
-    "org.gnome.SettingsDaemon.Datetime"
-    "org.gnome.SettingsDaemon.Housekeeping"
-    "org.gnome.SettingsDaemon.Keyboard"
-    "org.gnome.SettingsDaemon.MediaKeys"
-    "org.gnome.SettingsDaemon.Power"
-    "org.gnome.SettingsDaemon.PrintNotifications"
-    "org.gnome.SettingsDaemon.Rfkill"
-    "org.gnome.SettingsDaemon.ScreensaverProxy"
-    "org.gnome.SettingsDaemon.Sharing"
-    "org.gnome.SettingsDaemon.Smartcard"
-    "org.gnome.SettingsDaemon.Sound"
-    "org.gnome.SettingsDaemon.UsbProtection"
-    "org.gnome.SettingsDaemon.Wacom"
-    "org.gnome.SettingsDaemon.XSettings"
-  ];
-  requiredComponents =
-    wmName: enableGnomePanel:
-    "RequiredComponents=${
-      lib.concatStringsSep ";" (
-        [ wmName ] ++ requiredComponentsCommon enableGnomePanel ++ requiredComponentsGsd
-      )
-    };";
-in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-flashback";
-  version = "3.56.0";
+  version = "3.58.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-flashback/${lib.versions.majorMinor finalAttrs.version}/gnome-flashback-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LQ+iLzc9sIDq7w5Wk7lijN6ETyVjPVqQMTsEndlSkmA=";
+    hash = "sha256-qqI+cEJHfnQfJCebRoudIK9OwZXuQ7PTEs2q+E2YwyE=";
   };
 
   patches = [
@@ -90,10 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postInstall = ''
-    # Check that our expected RequiredComponents match the stock session files, but then don't install them.
-    # They can be installed using mkSessionForWm.
-    grep '${requiredComponents "metacity" true}' $out/share/gnome-session/sessions/gnome-flashback-metacity.session || (echo "RequiredComponents have changed, please update gnome-flashback/default.nix."; false)
-
     rm -r $out/share/gnome-session
     rm -r $out/share/xsessions
     rm $out/libexec/gnome-flashback-metacity
@@ -167,7 +134,6 @@ stdenv.mkDerivation (finalAttrs: {
       {
         wmName,
         wmLabel,
-        enableGnomePanel,
       }:
       writeTextFile {
         name = "gnome-flashback-${wmName}-gnome-session";
@@ -175,7 +141,6 @@ stdenv.mkDerivation (finalAttrs: {
         text = ''
           [GNOME Session]
           Name=GNOME Flashback (${wmLabel})
-          ${requiredComponents wmName enableGnomePanel}
         '';
       };
 
@@ -209,11 +174,33 @@ stdenv.mkDerivation (finalAttrs: {
         wmCommand,
         enableGnomePanel,
       }:
-      runCommand "gnome-flashback-${wmName}.target" { } ''
-        mkdir -p $out/lib/systemd/user
-        cp -r "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d" \
-          "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d"
-      '';
+      runCommand "gnome-flashback-${wmName}.target" { } (
+        ''
+          if [ "${wmName}" = "metacity" ]; then
+            echo "Use `services.xserver.windowManager.metacity.enable` instead."
+            exit 1
+          fi
+
+          mkdir -p $out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d
+          cp "${finalAttrs.finalPackage}/lib/systemd/user/gnome-session@gnome-flashback-metacity.target.d/session.conf" \
+            "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf"
+
+          substitute ${finalAttrs.finalPackage}/lib/systemd/user/gnome-session-x11@gnome-flashback-metacity.target \
+            "$out/lib/systemd/user/gnome-session-x11@gnome-flashback-${wmName}.target" \
+            --replace-fail "(Metacity)" "(${wmLabel})"
+
+          echo -e "[Unit]\nWants=${wmName}.service" >> "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/${wmName}.conf"
+
+          substitute ${metacity}/lib/systemd/user/metacity.service \
+            "$out/lib/systemd/user/${wmName}.service" \
+            --replace-fail "Description=Metacity" "Description=${wmLabel}" \
+            --replace-fail "ExecStart=${metacity}/bin/metacity" "ExecStart=${wmCommand}"
+        ''
+        + lib.optionalString (!enableGnomePanel) ''
+          substituteInPlace "$out/lib/systemd/user/gnome-session@gnome-flashback-${wmName}.target.d/session.conf" \
+            --replace-fail "Wants=gnome-panel.service" ""
+        ''
+      );
 
     tests = {
       inherit (nixosTests) gnome-flashback;
diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix
index 067bc0f82fdf..95c425477b6e 100644
--- a/pkgs/by-name/gn/gnome-font-viewer/package.nix
+++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-font-viewer";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-font-viewer/${lib.versions.major version}/gnome-font-viewer-${version}.tar.xz";
-    hash = "sha256-cyYkIxtiT/XHrAOoznG+Ejk9qlNVHRFVCyDXsKOocqc=";
+    hash = "sha256-fAGJJcKFdxtV19Gm8VcRwMGT10UO2YceINRPJUhWJAQ=";
   };
 
   doCheck = true;
diff --git a/pkgs/by-name/gn/gnome-inform7/package.nix b/pkgs/by-name/gn/gnome-inform7/package.nix
index 0c2aacc1a5bb..5346e9443f71 100644
--- a/pkgs/by-name/gn/gnome-inform7/package.nix
+++ b/pkgs/by-name/gn/gnome-inform7/package.nix
@@ -20,7 +20,7 @@
   gobject-introspection,
   vala,
   gtk-doc,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   gtksourceview3,
   gspell,
   libxml2,
@@ -124,7 +124,7 @@ stdenv.mkDerivation {
     gtk3
     gtksourceview3
     gspell
-    webkitgtk_4_0
+    # webkitgtk_4_0
     libxml2
     goocanvas2
     libplist
@@ -137,6 +137,8 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Inform 7 for the Gnome platform";
     longDescription = ''
       This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter.
diff --git a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
index f3cd9f6f0427..f429b4830144 100644
--- a/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
+++ b/pkgs/by-name/gn/gnome-initial-setup/0001-fix-paths.patch
@@ -25,15 +25,6 @@ index 196abf6..613d0e5 100644
  	g_spawn_command_line_async (commandline, NULL);
  	g_free (commandline);
  
-@@ -831,7 +831,7 @@ cc_input_chooser_class_init (CcInputChooserClass *klass)
-                 g_param_spec_string ("showing-extra", "", "", "",
-                                      G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
- 
--	signals[CHANGED] = 
-+	signals[CHANGED] =
- 		g_signal_new ("changed",
- 			      G_TYPE_FROM_CLASS (object_class),
- 			      G_SIGNAL_RUN_FIRST,
 diff --git a/gnome-initial-setup/pages/timezone/tz.h b/gnome-initial-setup/pages/timezone/tz.h
 index a2376f8..5cb7bc9 100644
 --- a/gnome-initial-setup/pages/timezone/tz.h
diff --git a/pkgs/by-name/gn/gnome-initial-setup/package.nix b/pkgs/by-name/gn/gnome-initial-setup/package.nix
index bc0f06ce9ef8..7ac614841bc4 100644
--- a/pkgs/by-name/gn/gnome-initial-setup/package.nix
+++ b/pkgs/by-name/gn/gnome-initial-setup/package.nix
@@ -37,11 +37,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-initial-setup";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-initial-setup/${lib.versions.major finalAttrs.version}/gnome-initial-setup-${finalAttrs.version}.tar.xz";
-    hash = "sha256-s9q/fnm2Zf8SJB+9umFUiVE9iGIkdZmGr49IZXWSMV4=";
+    hash = "sha256-KiixpAugiYaRiTBY9hggfemykj17pXpUeQ5aztztzPg=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix
index 0e17038371b9..871de9db73c0 100644
--- a/pkgs/by-name/gn/gnome-keysign/package.nix
+++ b/pkgs/by-name/gn/gnome-keysign/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitLab,
+  fetchpatch,
   python3,
   wrapGAppsHook3,
   gobject-introspection,
@@ -22,6 +23,14 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-k77z8Yligzs4rHpPckRGcC5qnCHynHQRjdDkzxwt1Ss=";
   };
 
+  patches = [
+    # Remove broken future dependency
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/gnome-keysign/-/commit/ea197254baf70a499a371678369eda85aff7a4c5.patch";
+      hash = "sha256-Msd0NzNAkoAAxZ/WNiM3xV382lnx+xT6gyQiNGDEMM8=";
+    })
+  ];
+
   nativeBuildInputs = [
     wrapGAppsHook3
     gobject-introspection
@@ -43,7 +52,6 @@ python3.pkgs.buildPythonApplication rec {
 
   propagatedBuildInputs = with python3.pkgs; [
     dbus-python
-    future
     gpgme
     magic-wormhole
     pygobject3
diff --git a/pkgs/by-name/gn/gnome-logs/package.nix b/pkgs/by-name/gn/gnome-logs/package.nix
index 61f978fcfcd7..bd83e74d52a4 100644
--- a/pkgs/by-name/gn/gnome-logs/package.nix
+++ b/pkgs/by-name/gn/gnome-logs/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  appstream,
   meson,
   ninja,
   pkg-config,
@@ -23,14 +24,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-logs";
-  version = "45.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-logs/${lib.versions.major version}/gnome-logs-${version}.tar.xz";
-    hash = "sha256-sooG6lyYvRfyhztQfwhbDKDemBATZhH08u6wmGFOzlI=";
+    hash = "sha256-+PV56wu22ajWrl7hQj+UR6+RIAeFF4tQu63UrC0lXUU=";
   };
 
   nativeBuildInputs = [
+    appstream
     meson
     ninja
     pkg-config
diff --git a/pkgs/by-name/gn/gnome-mahjongg/package.nix b/pkgs/by-name/gn/gnome-mahjongg/package.nix
index ddc8b0315e7f..87afee2674f3 100644
--- a/pkgs/by-name/gn/gnome-mahjongg/package.nix
+++ b/pkgs/by-name/gn/gnome-mahjongg/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-mahjongg";
-  version = "48.1";
+  version = "49.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mahjongg/${lib.versions.major finalAttrs.version}/gnome-mahjongg-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3Ujg+BrKNL6tpGxdIhsyWRuO2B6dNhw6JY359rIiLIQ=";
+    hash = "sha256-RbOkjcse1hiaY7a/VVCOizjrWpVmV6f+KlIlzC+LwTI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix
index a4cf70cbdf19..df2278c38256 100644
--- a/pkgs/by-name/gn/gnome-maps/package.nix
+++ b/pkgs/by-name/gn/gnome-maps/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-maps";
-  version = "48.6";
+  version = "49.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OtqaMVUXWlGdQV8Ll9D+129PS+uLYCEqAXaXoyy+gaY=";
+    hash = "sha256-QG+qUc5zo/iWpKFTBX+gLqp4y4LUjxHbRECDCUl1a+w=";
   };
 
   doCheck = !stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/by-name/gn/gnome-mines/package.nix b/pkgs/by-name/gn/gnome-mines/package.nix
index 4ffe50195382..d33b2108f958 100644
--- a/pkgs/by-name/gn/gnome-mines/package.nix
+++ b/pkgs/by-name/gn/gnome-mines/package.nix
@@ -14,18 +14,17 @@
   gettext,
   itstool,
   libxml2,
-  libgnome-games-support_2_0,
   libgee,
   desktop-file-utils,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-mines";
-  version = "48.1";
+  version = "49.0.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-mines/${lib.versions.major finalAttrs.version}/gnome-mines-${finalAttrs.version}.tar.xz";
-    hash = "sha256-70stLd477GFBV+3eTZGJzGr+aSlSot1VsocOLmLtgQQ=";
+    hash = "sha256-iwygXAM7PCWZyZL4jr2UyysMjjiOoMAq5x2yb0P1bIQ=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gtk4
     libadwaita
-    libgnome-games-support_2_0
     librsvg
     libgee
   ];
diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix
index 50cb9d4058a7..6ccdb0a3ebce 100644
--- a/pkgs/by-name/gn/gnome-music/package.nix
+++ b/pkgs/by-name/gn/gnome-music/package.nix
@@ -31,13 +31,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gnome-music";
-  version = "48.1";
+  version = "49.0.2";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-music/${lib.versions.major version}/gnome-music-${version}.tar.xz";
-    hash = "sha256-QL9XMC2l2zNraIVS7dAU2/vitEUEGWYAcpTGwrDAeN4=";
+    hash = "sha256-m5dJQgC7qoew7YhJJVQw1WwVjVG03qe+aIn3dWGpVKc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix
index b82651f75462..63fa0ce5c04b 100644
--- a/pkgs/by-name/gn/gnome-nibbles/package.nix
+++ b/pkgs/by-name/gn/gnome-nibbles/package.nix
@@ -14,7 +14,6 @@
   libxml2,
   libadwaita,
   libgee,
-  libgnome-games-support_2_0,
   meson,
   ninja,
   desktop-file-utils,
@@ -22,11 +21,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-nibbles";
-  version = "4.2.2";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Pkofm68cV7joNd7fCGnjJy5lNKHdacTib64QxCAKrwA=";
+    hash = "sha256-uIK4n2v9bRX96yr5edkYui8cHMjto5yviCe1Z9N/r5U=";
   };
 
   nativeBuildInputs = [
@@ -47,16 +46,8 @@ stdenv.mkDerivation (finalAttrs: {
     librsvg
     libadwaita
     libgee
-    libgnome-games-support_2_0
   ];
 
-  # The "we can link with libadwaita?" valac.links() check fails otherwise.
-  # Command line: `valac testfile.vala --pkg=libadwaita-1 --Xcc=-w --Xcc=-DVALA_STRICT_C` -> 1
-  # testfile.vala.c:50:46: error: passing argument 2 of 'adw_about_dialog_set_developers'
-  # from incompatible pointer type [-Wincompatible-pointer-types]
-  # 50 |         adw_about_dialog_set_developers (ad, s);
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-
   passthru = {
     updateScript = gnome.updateScript { packageName = "gnome-nibbles"; };
   };
diff --git a/pkgs/by-name/gn/gnome-online-accounts/package.nix b/pkgs/by-name/gn/gnome-online-accounts/package.nix
index 8b4093837284..ced147c71e03 100644
--- a/pkgs/by-name/gn/gnome-online-accounts/package.nix
+++ b/pkgs/by-name/gn/gnome-online-accounts/package.nix
@@ -32,7 +32,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-online-accounts";
-  version = "3.54.5";
+  version = "3.56.0";
 
   outputs = [
     "out"
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-online-accounts/${lib.versions.majorMinor finalAttrs.version}/gnome-online-accounts-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6PEntTIpWimRLRwAc0kx35r/pOv8RK0N5cKWw9J9LJU=";
+    hash = "sha256-MdagF9Fxsn/5NkeP2weSogDIFC6vwYslUHPOnftBdXI=";
   };
 
   mesonFlags = [
diff --git a/pkgs/by-name/gn/gnome-panel/package.nix b/pkgs/by-name/gn/gnome-panel/package.nix
index 4ab8da344c09..2eb9c202360f 100644
--- a/pkgs/by-name/gn/gnome-panel/package.nix
+++ b/pkgs/by-name/gn/gnome-panel/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-panel";
-  version = "3.56.0";
+  version = "3.58.1";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-panel/${lib.versions.majorMinor finalAttrs.version}/gnome-panel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-UoptZ92E7a5sgKXuZW+E+9lC87Nx1g+XottgZc9P0XA=";
+    hash = "sha256-fovKQ6gaE0xmazp4uvKv+wxdMO+xvKZTiH/EGzHdXmQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-panel/wrapper.nix b/pkgs/by-name/gn/gnome-panel/wrapper.nix
index 30f9c1823857..0d7fb34e4772 100644
--- a/pkgs/by-name/gn/gnome-panel/wrapper.nix
+++ b/pkgs/by-name/gn/gnome-panel/wrapper.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation {
   dontUnpack = true;
   dontConfigure = true;
   dontBuild = true;
+  # $output/lib/systemd/user is already a symlink
+  dontMoveSystemdUserUnits = true;
 
   preferLocalBuild = true;
   allowSubstitutes = false;
@@ -52,10 +54,10 @@ stdenv.mkDerivation {
     rm -r $out/lib/gnome-panel/modules
     ${xorg.lndir}/bin/lndir -silent ${panelModulesEnv} $out
 
-    rm $out/share/applications/gnome-panel.desktop
-
-    ln -s ${gnome-panel}/share/applications/gnome-panel.desktop \
-      $out/share/applications/gnome-panel.desktop
+    rm $out/share/systemd/user/gnome-panel.service
+    substitute ${gnome-panel}/share/systemd/user/gnome-panel.service \
+      $out/share/systemd/user/gnome-panel.service \
+      --replace-fail "ExecStart=${gnome-panel}/bin/gnome-panel" "ExecStart=$out/bin/gnome-panel"
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/gn/gnome-recipes/package.nix b/pkgs/by-name/gn/gnome-recipes/package.nix
deleted file mode 100644
index b2e7461a3b6d..000000000000
--- a/pkgs/by-name/gn/gnome-recipes/package.nix
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitLab,
-  fetchpatch,
-  meson,
-  ninja,
-  pkg-config,
-  desktop-file-utils,
-  gettext,
-  itstool,
-  python3,
-  wrapGAppsHook3,
-  gtk3,
-  glib,
-  libsoup_2_4,
-  gnome-online-accounts,
-  librest,
-  json-glib,
-  gnome-autoar,
-  gspell,
-  libcanberra,
-  nix-update-script,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-recipes";
-  version = "2.0.4";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "recipes";
-    rev = version;
-    fetchSubmodules = true;
-    sha256 = "GyFOwEYmipQdFLtTXn7+NvhDTzxBlOAghr3cZT4QpQw=";
-  };
-
-  patches = [
-    # gcc-14 build failure fix
-    (fetchpatch {
-      name = "gcc-14.patch";
-      url = "https://gitlab.gnome.org/GNOME/recipes/-/commit/c0304675f63a33737b24fdf37e06c6b154a91a31.patch";
-      hash = "sha256-YTf4NDwUiU/q96RAXKTO499pW9sPrgh8IvdPBPEnV6Q=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    desktop-file-utils
-    gettext
-    itstool
-    python3
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gtk3
-    glib
-    libsoup_2_4
-    gnome-online-accounts
-    librest
-    json-glib
-    gnome-autoar
-    gspell
-    libcanberra
-  ];
-
-  postPatch = ''
-    chmod +x src/list_to_c.py
-    patchShebangs src/list_to_c.py
-    patchShebangs meson_post_install.py
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Recipe management application for GNOME";
-    mainProgram = "gnome-recipes";
-    homepage = "https://gitlab.gnome.org/GNOME/recipes";
-    teams = [ teams.gnome ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/gn/gnome-remote-desktop/package.nix b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
index 7c2c8b80db4f..c8d154bf25af 100644
--- a/pkgs/by-name/gn/gnome-remote-desktop/package.nix
+++ b/pkgs/by-name/gn/gnome-remote-desktop/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-remote-desktop";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-remote-desktop/${lib.versions.major version}/gnome-remote-desktop-${version}.tar.xz";
-    hash = "sha256-vPN3D8oPrtovrjsaP/by6QoCd492pC6P0QPK4YYo9PI=";
+    hash = "sha256-1HrdnZcPIkrMd+/lohZIbUBFHivCG4W/7FOX1CD9oYo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-session/ctl.nix b/pkgs/by-name/gn/gnome-session/ctl.nix
index 5aecef4ce161..47282b471728 100644
--- a/pkgs/by-name/gn/gnome-session/ctl.nix
+++ b/pkgs/by-name/gn/gnome-session/ctl.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-session-ctl";
-  version = "47.0.1";
+  version = "49.0";
 
   src = fetchFromGitHub {
     owner = "nix-community";
     repo = "gnome-session-ctl";
     rev = version;
-    hash = "sha256-RY0+iIwwjd7268m3EYrZ1yUBLHXmaWddtSxqgUUH6qQ=";
+    hash = "sha256-rudb7ioTE5iaou0tzU5i2gWFW06NyWF5W5tjx2b5/0Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-session/fix-paths.patch b/pkgs/by-name/gn/gnome-session/fix-paths.patch
deleted file mode 100644
index 22f06ddfd2e8..000000000000
--- a/pkgs/by-name/gn/gnome-session/fix-paths.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/gnome-session/gnome-session.in b/gnome-session/gnome-session.in
-index b4b1f8fa..99d52cba 100755
---- a/gnome-session/gnome-session.in
-+++ b/gnome-session/gnome-session.in
-@@ -4,13 +4,15 @@ if [ "x$XDG_SESSION_TYPE" = "xwayland" ] &&
-    [ "x$XDG_SESSION_CLASS" != "xgreeter" ] &&
-    [  -n "$SHELL" ]; then
-   if [ "$1" != '-l' ]; then
--    exec bash -c "exec -l '$SHELL' -c 'exec $0 -l $*'"
-+    # Make sure the shell actually sets up the environment.
-+    unset __NIXOS_SET_ENVIRONMENT_DONE
-+    exec @bash@ -c "exec -l '$SHELL' -c 'exec $0 -l $*'"
-   else
-     shift
-   fi
- fi
- 
--SETTING=$(G_MESSAGES_DEBUG='' gsettings get org.gnome.system.locale region)
-+SETTING=$(G_MESSAGES_DEBUG='' @gsettings@ get org.gnome.system.locale region)
- REGION=${SETTING#\'}
- REGION=${REGION%\'}
- 
-diff --git a/gnome-session/main.c b/gnome-session/main.c
-index a460a849..9d07898f 100644
---- a/gnome-session/main.c
-+++ b/gnome-session/main.c
-@@ -215,7 +215,7 @@ require_dbus_session (int      argc,
-         }
-         new_argv[i + 2] = NULL;
-         
--        if (!execvp ("dbus-launch", new_argv)) {
-+        if (!execvp ("@dbusLaunch@", new_argv)) {
-                 g_set_error (error, 
-                              G_SPAWN_ERROR,
-                              G_SPAWN_ERROR_FAILED,
diff --git a/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch
new file mode 100644
index 000000000000..50101ca681c1
--- /dev/null
+++ b/pkgs/by-name/gn/gnome-session/nixos_set_environment_done.patch
@@ -0,0 +1,14 @@
+diff --git a/gnome-session/leader-main.c b/gnome-session/leader-main.c
+index 511166d6..8bac2912 100644
+--- a/gnome-session/leader-main.c
++++ b/gnome-session/leader-main.c
+@@ -92,6 +92,9 @@ maybe_reexec_with_login_shell (GStrv argv)
+ 
+         g_debug ("Relaunching with login shell %s (%s)", login_shell, shell);
+ 
++        /* Make sure the shell actually sets up the environment */
++        g_unsetenv ("__NIXOS_SET_ENVIRONMENT_DONE");
++
+         /* First, we construct the command executed by the login shell */
+         builder = g_strv_builder_new ();
+         g_strv_builder_add (builder, "exec");
diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix
index d60b3ca2d110..7bc805c8bc09 100644
--- a/pkgs/by-name/gn/gnome-session/package.nix
+++ b/pkgs/by-name/gn/gnome-session/package.nix
@@ -7,9 +7,10 @@
   ninja,
   pkg-config,
   gnome,
+  gobject-introspection,
   adwaita-icon-theme,
   glib,
-  gtk3,
+  gtk4,
   gsettings-desktop-schemas,
   gnome-desktop,
   gnome-settings-daemon,
@@ -19,22 +20,21 @@
   libICE,
   xmlto,
   docbook_xsl,
-  docbook_xml_dtd_412,
+  docbook_xml_dtd_45,
   python3,
   libxslt,
   gettext,
-  makeWrapper,
   systemd,
   xorg,
   libepoxy,
-  bash,
   gnome-session-ctl,
+  wrapGAppsHook4,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-session";
   # Also bump ./ctl.nix when bumping major version.
-  version = "48.0";
+  version = "49.0";
 
   outputs = [
     "out"
@@ -43,34 +43,32 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz";
-    hash = "sha256-3ZCfvFsizb2y/E3xpH140bWUPMxeYeaiChhGJGNHxBc=";
+    hash = "sha256-WnViLmPRt1FFyevmfoKDZ6dfWs5LYjf2TlRmHmpUXvM=";
   };
 
   patches = [
-    (replaceVars ./fix-paths.patch {
-      gsettings = "${glib.bin}/bin/gsettings";
-      dbusLaunch = "${dbus.lib}/bin/dbus-launch";
-      bash = "${bash}/bin/bash";
-    })
+    # https://github.com/NixOS/nixpkgs/pull/48517
+    ./nixos_set_environment_done.patch
   ];
 
   nativeBuildInputs = [
+    gobject-introspection.setupHook
     meson
     ninja
     pkg-config
     gettext
-    makeWrapper
     xmlto
     libxslt
     docbook_xsl
-    docbook_xml_dtd_412
+    docbook_xml_dtd_45
     python3
     dbus # for DTD
+    wrapGAppsHook4
   ];
 
   buildInputs = [
     glib
-    gtk3
+    gtk4
     libICE
     gnome-desktop
     json-glib
@@ -107,15 +105,11 @@ stdenv.mkDerivation (finalAttrs: {
     rm -rf $out/libexec/gnome-session-ctl
   '';
 
-  # `bin/gnome-session` will reset the environment when run in wayland, we
-  # therefor wrap `libexec/gnome-session-binary` instead which is the actual
-  # binary needing wrapping
   preFixup = ''
-    wrapProgram "$out/libexec/gnome-session-binary" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-      --suffix XDG_DATA_DIRS : "${gnome-shell}/share" \
+    gappsWrapperArgs+=(
+      --suffix XDG_DATA_DIRS : "${gnome-shell}/share"
       --suffix XDG_CONFIG_DIRS : "${gnome-settings-daemon}/etc/xdg"
+    )
   '';
 
   separateDebugInfo = true;
@@ -126,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: {
     };
     providedSessions = [
       "gnome"
-      "gnome-xorg"
     ];
   };
 
diff --git a/pkgs/by-name/gn/gnome-settings-daemon/package.nix b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
index 11d273c81492..0a00160237ac 100644
--- a/pkgs/by-name/gn/gnome-settings-daemon/package.nix
+++ b/pkgs/by-name/gn/gnome-settings-daemon/package.nix
@@ -10,13 +10,12 @@
   gnome,
   perl,
   gettext,
-  gtk3,
   glib,
   libnotify,
   libgnomekbd,
   libpulseaudio,
   alsa-lib,
-  libcanberra-gtk3,
+  libcanberra,
   upower,
   colord,
   libgweather,
@@ -25,15 +24,14 @@
   geoclue2,
   systemd,
   libgudev,
-  libwacom,
   libxslt,
   libxml2,
   modemmanager,
   networkmanager,
   gnome-desktop,
   geocode-glib_2,
-  docbook_xsl,
-  wrapGAppsHook3,
+  docbook-xsl-nons,
+  wrapGAppsNoGuiHook,
   python3,
   tzdata,
   gcr_4,
@@ -44,11 +42,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-settings-daemon";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-settings-daemon/${lib.versions.major finalAttrs.version}/gnome-settings-daemon-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OGCi6iFNy8tmAK56HjNYpTiSFQh7w+SkfO4/h7ruBi4=";
+    hash = "sha256-IBvUrAxHFHkYLvN15ZneYApRo8CwSehXFaIkRx5bMiY=";
   };
 
   patches = [
@@ -74,14 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     libxml2
     libxslt
-    docbook_xsl
-    wrapGAppsHook3
+    docbook-xsl-nons
+    wrapGAppsNoGuiHook
     python3
     udevCheckHook
   ];
 
   buildInputs = [
-    gtk3
     glib
     gsettings-desktop-schemas
     modemmanager
@@ -91,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     gnome-desktop
     libpulseaudio
     alsa-lib
-    libcanberra-gtk3
+    libcanberra
     upower
     colord
     libgweather
@@ -99,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: {
     geocode-glib_2
     geoclue2
     libgudev
-    libwacom
     gcr_4
   ]
   ++ lib.optionals withSystemd [
diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
index d190a459755f..0bc2e8667c20 100644
--- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix
+++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell-extensions";
-  version = "48.3";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz";
-    hash = "sha256-rd40wI9AtjQRvm8dF+I1VQoAkElIceZIHDEpidf0otQ=";
+    hash = "sha256-FXDgZHhstDiXWeBIPzob29W5s48GJG600dUJKSqcamI=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix
index caba99c11260..bccf4720c97a 100644
--- a/pkgs/by-name/gn/gnome-shell/package.nix
+++ b/pkgs/by-name/gn/gnome-shell/package.nix
@@ -51,16 +51,20 @@
   pipewire,
   gst_all_1,
   adwaita-icon-theme,
+  glycin-loaders,
   gnome-bluetooth,
   gnome-clocks,
   gnome-settings-daemon,
   gnome-autoar,
   gnome-tecla,
   bash-completion,
+  lcms2,
   libgbm,
   libGL,
   libXi,
   libX11,
+  libxkbcommon,
+  libsoup_3,
   libxml2,
 }:
 
@@ -69,7 +73,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-shell";
-  version = "48.4";
+  version = "49.0";
 
   outputs = [
     "out"
@@ -78,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz";
-    hash = "sha256-QOLtdLRTZ/DKOPv6oKtHCGjSNZHQPcQNCr1v930jtwc=";
+    hash = "sha256-/whrnDIYCZQw2RhSQ7Z3ajaiy3vLcFqYxhLyz0dCcIo=";
   };
 
   patches = [
@@ -152,10 +156,13 @@ stdenv.mkDerivation (finalAttrs: {
     ibus
     gnome-desktop
     gnome-settings-daemon
+    lcms2 # required by mutter-clutter
     libgbm
     libGL # for egl, required by mutter-clutter
     libXi # required by libmutter
     libX11
+    libxkbcommon
+    libsoup_3
     libxml2
 
     # recording
@@ -185,7 +192,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs \
       src/data-to-c.py \
-      meson/generate-app-list.py
+      build-aux/generate-app-list.py
 
     # We can generate it ourselves.
     rm -f man/gnome-shell.1
@@ -215,9 +222,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      # Until glib’s xdgmime is patched
-      # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
-      --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
+      --prefix XDG_DATA_DIRS : ${
+        lib.makeSearchPath "share" [
+          # Until glib’s xdgmime is patched
+          # Fixes “Failed to load resource:///org/gnome/shell/theme/noise-texture.png: Unrecognized image file format”
+          shared-mime-info
+          # For background images https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4554
+          glycin-loaders
+        ]
+      }
     )
   '';
 
diff --git a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
index 6d888725b5d2..b3a55bcc291e 100644
--- a/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
+++ b/pkgs/by-name/gn/gnome-shell/shew-gir-path.patch
@@ -1,5 +1,5 @@
---- a/subprojects/shew/src/meson.build
-+++ b/subprojects/shew/src/meson.build
+--- a/subprojects/libshew/src/meson.build
++++ b/subprojects/libshew/src/meson.build
 @@ -13,7 +13,7 @@ shew_sources = [
  libshew = library(full_name,
    sources: shew_sources,
diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix
index a82d9f541d8e..780f34638a5b 100644
--- a/pkgs/by-name/gn/gnome-software/package.nix
+++ b/pkgs/by-name/gn/gnome-software/package.nix
@@ -48,11 +48,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-software";
-  version = "48.4";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nNEwvGLNCLY6Ii6yZmG8xxfnXVjuGzwYgMTRt2zNJjs=";
+    hash = "sha256-NpzXVD8KS+mjNzPeCvFWNIJmw7XKyqTkc3lZ59FOBB8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix
index d2fa96c74b52..8ad06d26f85a 100644
--- a/pkgs/by-name/gn/gnome-sudoku/package.nix
+++ b/pkgs/by-name/gn/gnome-sudoku/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-sudoku";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major version}/gnome-sudoku-${version}.tar.xz";
-    hash = "sha256-eXE62CpZkEzWlv8CJV627ZNk6I8+eDNDsfnQygnyx+M=";
+    hash = "sha256-CzfN4geSLJpKiiIV4s3+nzL0AWHSi2An+aaRMCW1CrU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-system-monitor/package.nix b/pkgs/by-name/gn/gnome-system-monitor/package.nix
index fa8aae787c36..4bb82e4f716b 100644
--- a/pkgs/by-name/gn/gnome-system-monitor/package.nix
+++ b/pkgs/by-name/gn/gnome-system-monitor/package.nix
@@ -5,7 +5,6 @@
   fetchurl,
   pkg-config,
   gtkmm4,
-  libxml2,
   bash,
   catch2_3,
   gtk4,
@@ -26,11 +25,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-system-monitor";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-system-monitor/${lib.versions.major finalAttrs.version}/gnome-system-monitor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Ezw6bihjZuZZ/S2AWCQJp71e2uRW5jxPacz2btb8Zjg=";
+    hash = "sha256-3MhE3XDkoHfwZlJNvRT5z+BLCYMdcLfWmlGBZyPNSqA=";
   };
 
   patches = [
@@ -54,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     gtk4
     libadwaita
     glib
-    libxml2
     gtkmm4
     libgtop
     gdk-pixbuf
@@ -64,6 +62,11 @@ stdenv.mkDerivation (finalAttrs: {
     systemd
   ];
 
+  mesonFlags = [
+    # <artificial>:(.text.startup+0x56): undefined reference to `GsmApplication::get()'
+    "-Db_lto=false"
+  ];
+
   doCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/gn/gnome-tecla/package.nix b/pkgs/by-name/gn/gnome-tecla/package.nix
index e08ec43dd48f..ebc0df1577c6 100644
--- a/pkgs/by-name/gn/gnome-tecla/package.nix
+++ b/pkgs/by-name/gn/gnome-tecla/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tecla";
-  version = "48.0.2";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/tecla/${lib.versions.major finalAttrs.version}/tecla-${finalAttrs.version}.tar.xz";
-    hash = "sha256-eD00ZNKiz36xUHZJ29n/Cc4khSwqbJoNNl24QGPT1AE=";
+    hash = "sha256-LKQk5AK69gzWsTd3cDtwHrsfr489Dy+XEUTYI/ZRJJ8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-terminal/package.nix b/pkgs/by-name/gn/gnome-terminal/package.nix
index 2bae985a569d..3569ddfa5543 100644
--- a/pkgs/by-name/gn/gnome-terminal/package.nix
+++ b/pkgs/by-name/gn/gnome-terminal/package.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-terminal";
-  version = "3.56.2";
+  version = "3.58.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-terminal/${lib.versions.majorMinor finalAttrs.version}/gnome-terminal-${finalAttrs.version}.tar.xz";
-    hash = "sha256-I1vAnfo0zF8elRIum/YCA6hNr4Yc+s9+RJbF9UgjmXg=";
+    hash = "sha256-B+vHrxNRa+Wzd3f1INJkCzMSBiDpm7sF3upfgoD9ac4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-tetravex/package.nix b/pkgs/by-name/gn/gnome-tetravex/package.nix
index 95282a3fa14f..9a88b11305a5 100644
--- a/pkgs/by-name/gn/gnome-tetravex/package.nix
+++ b/pkgs/by-name/gn/gnome-tetravex/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchurl,
-  fetchpatch,
   pkg-config,
   gnome,
   adwaita-icon-theme,
@@ -20,24 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-tetravex";
-  version = "3.38.2";
+  version = "3.38.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tetravex/${lib.versions.majorMinor version}/gnome-tetravex-${version}.tar.xz";
-    hash = "sha256-H83xCXm5o1JgCdeDociKOJkY82DaTttE+6JccfGGkRs=";
+    hash = "sha256-g4SawGTUVuHdRrbiAcaGFSYkw9HsS5mTWYWkmqeRcss=";
   };
 
-  patches = [
-    # Fix build with meson 0.61
-    # data/meson.build:37:0: ERROR: Function does not take positional arguments.
-    # data/meson.build:59:0: ERROR: Function does not take positional arguments.
-    # Taken from https://gitlab.gnome.org/GNOME/gnome-tetravex/-/merge_requests/20
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/gnome-tetravex/-/commit/80912d06f5e588f6aca966fa516103275e58d94e.patch";
-      hash = "sha256-2+nFw5sJzbInibKaq3J10Ufbl3CnZWlgnUtzRTZ5G0I=";
-    })
-  ];
-
   nativeBuildInputs = [
     wrapGAppsHook3
     itstool
@@ -68,7 +56,7 @@ stdenv.mkDerivation rec {
     description = "Complete the puzzle by matching numbered tiles";
     mainProgram = "gnome-tetravex";
     teams = [ teams.gnome ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix
index 753f4b247b07..4953f1aca8f3 100644
--- a/pkgs/by-name/gn/gnome-text-editor/package.nix
+++ b/pkgs/by-name/gn/gnome-text-editor/package.nix
@@ -12,7 +12,6 @@
   wrapGAppsHook4,
   ninja,
   gnome,
-  cairo,
   icu,
   itstool,
   libadwaita,
@@ -24,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-text-editor";
-  version = "48.3";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-P56XIjlO200hRcBtaSELPT/KXNK5DWMmQ751CEPVVro=";
+    hash = "sha256-jkOwz6gVLNPHYw3lZd4taTDoh88ti4RID7+FOivCyKY=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    cairo
     icu
     glib
     gsettings-desktop-schemas
diff --git a/pkgs/by-name/gn/gnome-tour/package.nix b/pkgs/by-name/gn/gnome-tour/package.nix
index 17bf79a473bb..a6a415130fd1 100644
--- a/pkgs/by-name/gn/gnome-tour/package.nix
+++ b/pkgs/by-name/gn/gnome-tour/package.nix
@@ -22,11 +22,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-tour";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-tour/${lib.versions.major finalAttrs.version}/gnome-tour-${finalAttrs.version}.tar.xz";
-    hash = "sha256-uKA7JXTrlWq+mvFBQWHMsX+DDVNgC5wEmc7zu29BJ8U=";
+    hash = "sha256-LX2KKgzRF4BjpBTaWAk9JsD7GndgjYrX+9eRGl1iZNM=";
   };
 
   cargoVendorDir = "vendor";
diff --git a/pkgs/by-name/gn/gnome-tweaks/package.nix b/pkgs/by-name/gn/gnome-tweaks/package.nix
index 7bdf8bcf9f2a..c01b3e3e4ffb 100644
--- a/pkgs/by-name/gn/gnome-tweaks/package.nix
+++ b/pkgs/by-name/gn/gnome-tweaks/package.nix
@@ -28,12 +28,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gnome-tweaks";
-  version = "46.1";
+  version = "49.0";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-LxkqcIX71oQ+z4JXFtnaIeyScgKRSeo18+FZ4Kwwm4A=";
+    hash = "sha256-s5Cb3LSQW2hCfWq1geAfQ23/jlwKOJseCxRQDxiAbrs=";
   };
 
   nativeBuildInputs = [
@@ -84,7 +84,7 @@ python3Packages.buildPythonApplication rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "gnome-tweaks";
     };
   };
 
diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix
index 92f83a105f28..bbaac9a44a11 100644
--- a/pkgs/by-name/gn/gnome-user-docs/package.nix
+++ b/pkgs/by-name/gn/gnome-user-docs/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-user-docs";
-  version = "48.2";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-Z4Kfdkumctf5n/cu9lE7QMyTH7QBv3vX21+AXnv6Pbk=";
+    hash = "sha256-7BGNRNoYZuQXONoZz128PZpCklovO/SO5sN+bj5G3fM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gn/gnome-weather/package.nix b/pkgs/by-name/gn/gnome-weather/package.nix
index aecb98b3d246..4b4ec42b2d25 100644
--- a/pkgs/by-name/gn/gnome-weather/package.nix
+++ b/pkgs/by-name/gn/gnome-weather/package.nix
@@ -17,15 +17,16 @@
   geoclue2,
   python3,
   gsettings-desktop-schemas,
+  typescript,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-weather";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${lib.versions.major version}/gnome-weather-${version}.tar.xz";
-    hash = "sha256-TAVps9gVri+UFtRxNMvTBWNAZA/xhtMalMhlgTtL27U=";
+    url = "mirror://gnome/sources/gnome-weather/${lib.versions.major finalAttrs.version}/gnome-weather-${finalAttrs.version}.tar.xz";
+    hash = "sha256-7h92uF66nbDI1cAgQanYXs3SKrtexrs/8yIlkpwPzl8=";
   };
 
   nativeBuildInputs = [
@@ -37,6 +38,7 @@ stdenv.mkDerivation rec {
     python3
     gobject-introspection
     gjs
+    typescript
   ];
 
   buildInputs = [
@@ -62,7 +64,9 @@ stdenv.mkDerivation rec {
   '';
 
   passthru = {
-    updateScript = gnome.updateScript { packageName = "gnome-weather"; };
+    updateScript = gnome.updateScript {
+      packageName = "gnome-weather";
+    };
   };
 
   meta = with lib; {
@@ -73,4 +77,4 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix
index fe7eae9a508d..20b5fd96f3d1 100644
--- a/pkgs/by-name/gn/gnote/package.nix
+++ b/pkgs/by-name/gn/gnote/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnote";
-  version = "48.2";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-PIFooZ3mWJ+56O4RmkRUISOUHB6XSK79NooCjmclx4E=";
+    hash = "sha256-GXUaLyN3Kb+fSElVQKNeNG5FwbobAW25y3VNReztCl0=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/gn/gnunet/package.nix b/pkgs/by-name/gn/gnunet/package.nix
index 2c5d643a1c5b..b9e3204ca23a 100644
--- a/pkgs/by-name/gn/gnunet/package.nix
+++ b/pkgs/by-name/gn/gnunet/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ITNsFs1X+R+dX9U1lILZFRp83w1jlvi2GCjBfMxmj1w=";
+    hash = "sha256-6rdvw105OrFfrbY0T4Q1JcFlYZQAc1qm3eCWb2omwuY=";
   };
 
   enableParallelBuilding = true;
@@ -94,12 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     # builds.
     find . \( -iname \*test\*.c -or -name \*.conf \) | \
       xargs sed -i -e "s|/tmp|$TMPDIR|g"
-
-    # fix error: conflicting types for `GNUNET_TESTING_cmd_{exec,finish}`
-    for name in exec finish; do
-      substituteInPlace src/lib/testing/testing_api_cmd_$name.c \
-        --replace-fail 'const struct GNUNET_TESTING_Command' 'struct GNUNET_TESTING_Command'
-    done
   '';
 
   # unfortunately, there's still a few failures with impure tests
diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix
index b9ca2a2dcec6..55b31be7e04b 100644
--- a/pkgs/by-name/go/go-away/package.nix
+++ b/pkgs/by-name/go/go-away/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitea,
+  nix-update-script,
 
   # asset compression
   brotli,
@@ -57,6 +58,15 @@ buildGoModule (finalAttrs: {
     cp -rv examples/snippets $out/lib/go-away/
   '';
 
+  passthru.updateScript = nix-update-script {
+    # the main repository does not have the releases feed enabled, so use the
+    # codeberg mirror
+    extraArgs = [
+      "--url"
+      "https://codeberg.org/gone/go-away"
+    ];
+  };
+
   meta = {
     changelog = "https://git.gammaspectra.live/git/go-away/releases/tag/${finalAttrs.src.tag}";
     description = "Self-hosted abuse detection and rule enforcement against low-effort mass AI scraping and bots";
@@ -72,5 +82,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://git.gammaspectra.live/git/go-away";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hexa ];
+    mainProgram = "go-away";
   };
 })
diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix
index 5534cd613f22..bb3b0737c665 100644
--- a/pkgs/by-name/go/go-camo/package.nix
+++ b/pkgs/by-name/go/go-camo/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module rec {
   pname = "go-camo";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "cactus";
     repo = "go-camo";
     tag = "v${version}";
-    hash = "sha256-CuEnJcbLcehmAj+TCx3VbRLWhYhbzYaXfV6qweuoooA=";
+    hash = "sha256-gAlbSUYa3yxEfPzJQHDzM0XJ/ap93qgMnSTg3irtHMw=";
   };
 
-  vendorHash = "sha256-3Yl0x02KcYG5+FVuON54NlO+ehvgvywep4Hu9sQ6nN4=";
+  vendorHash = "sha256-Qv5DFa4XDJw4e6sLbTUN59bRxMUCMXrPZJmCF7OhumY=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix
index 051978678183..5387413709c1 100644
--- a/pkgs/by-name/go/go-critic/package.nix
+++ b/pkgs/by-name/go/go-critic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-critic";
-  version = "0.13.0";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "go-critic";
     repo = "go-critic";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0AOhq7OhSHub4I6XXL018hg6i2ERkIbZCrO9osNjvHw=";
+    hash = "sha256-+PYIZBjq3kHaTXoZInfqT0EJDeil2+kyTxgKY2sKTs0=";
   };
 
-  vendorHash = "sha256-yTm5Hhqbk1aJ4ZAR+ie2NnDOAGpjijUKQxZW3Tp9bs8=";
+  vendorHash = "sha256-2tzBJI2d9/EY1lPgJDrOGfgh8dz2bYwP5kWifJ46a8I=";
 
   subPackages = [
     "cmd/gocritic"
diff --git a/pkgs/by-name/go/go-csp-collector/package.nix b/pkgs/by-name/go/go-csp-collector/package.nix
new file mode 100644
index 000000000000..c8437b2b122b
--- /dev/null
+++ b/pkgs/by-name/go/go-csp-collector/package.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  nixosTests,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "go-csp-collector";
+  version = "0.0.16-unstable-2025-10-10";
+
+  src = fetchFromGitHub {
+    owner = "jacobbednarz";
+    repo = "go-csp-collector";
+    rev = "a0cf22ac6d1f5c8972bf53671ba174767d2adcd5";
+    hash = "sha256-xFvO8ZuJQ5luCDOTPHtVeb1+3VvIKSwjt2TqkxBIY58=";
+  };
+
+  vendorHash = "sha256-SrQahSHO5ZIkcLR3BR5CR5BTStW1pH1Ij1Eql0b3tuU=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Rev=${finalAttrs.version}"
+  ];
+
+  postInstall = ''
+    install -Dm644 init/go-csp-collector.service $out/lib/systemd/system/go-csp-collector.service
+
+    substituteInPlace $out/lib/systemd/system/go-csp-collector.service \
+      --replace-fail "/usr/local/bin/go-csp-collector" "$out/bin/go-csp-collector"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.service = nixosTests.go-csp-collector;
+  };
+
+  meta = {
+    description = "A content security policy violation collector written in Golang";
+    homepage = "https://github.com/jacobbednarz/go-csp-collector";
+    changelog = "https://github.com/jacobbednarz/go-csp-collector/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "go-csp-collector";
+    maintainers = with lib.maintainers; [ stepbrobd ];
+  };
+})
diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix
index 01cbb6323dbf..0b9687ad6a77 100644
--- a/pkgs/by-name/go/go-dnscollector/package.nix
+++ b/pkgs/by-name/go/go-dnscollector/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-dnscollector";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "go-dnscollector";
     rev = "v${version}";
-    sha256 = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk=";
+    sha256 = "sha256-LQJxK2MZtFeFm5keNoNSDHXmxS8z9/fsCV02BGsph74=";
   };
 
-  vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A=";
+  vendorHash = "sha256-nZheY/CbzDR/GB4Nu3xiWXsxrrvu/AKZE0gquBrfXXM=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/go/go-ecoflow-exporter/package.nix b/pkgs/by-name/go/go-ecoflow-exporter/package.nix
index 6ba9adfd6de1..06928a31c3be 100644
--- a/pkgs/by-name/go/go-ecoflow-exporter/package.nix
+++ b/pkgs/by-name/go/go-ecoflow-exporter/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-ecoflow-exporter";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "tess1o";
     repo = "go-ecoflow-exporter";
     tag = finalAttrs.version;
-    hash = "sha256-VCzMItYgnuDXDYdrk/ojzqUE2Fjr7KWGNnLhoQ+ZPYs=";
+    hash = "sha256-oh/i4LToGnI2TuforL36tIYrhq4VUNNYVtYgaU2sf8w=";
   };
 
   vendorHash = "sha256-UbV6V06zxXMTd0v+rDPGoMFn9X5mMCiX41g49IGnoT8=";
diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index fd3f655978c7..9c6c53173b12 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -15,17 +15,17 @@ let
 in
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.16.3";
+  version = "1.16.5";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    hash = "sha256-9g+RlOnV3DMLkak+RbSm8RgFB14Yuap8CT1w6kuZRv0=";
+    hash = "sha256-f9MBHO3oh1Nh+YI1E8cPPaNRj4T12063YLqTDrdZWWA=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-GEPSkuEdrYvPGXEGhAT3U765rjY6w6kwOVYOMCgOaCo=";
+  vendorHash = "sha256-6tGSyx4OXMXUjhIvLJo+vyRkNzHmwiikzrLL0cQPBLo=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
index 9a77b98f4619..3ae14e615cb7 100644
--- a/pkgs/by-name/go/go-httpbin/package.nix
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-httpbin";
-  version = "2.18.3";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "mccutchen";
     repo = "go-httpbin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ixEbmppQ+4Udc5ytV4YPOpOT/iEbhjQIYGoOGL0dIw8=";
+    hash = "sha256-agElHziDwv2MGwTUKPsyDMVlTNNkuSZp4OAR2/zbW1U=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix
index e4e3e054ab96..f934e7b8e2ca 100644
--- a/pkgs/by-name/go/go-jet/package.nix
+++ b/pkgs/by-name/go/go-jet/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-jet";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "jet";
     rev = "v${version}";
-    sha256 = "sha256-abk/mcukxIgAD9Oxh3H4+xrSoY30aW7EXZxEXXlriHA=";
+    sha256 = "sha256-6cFkLnZGSAlwvsewxXaKeNoeDaILqLo02vkzqjruhxU=";
   };
 
-  vendorHash = "sha256-KheXtpbmW8GoD7nHE7vg8qOsg5sRXfrFuBJbDEXOTBs=";
+  vendorHash = "sha256-fgYZULAz3orhK637cJNYK7bw9hsQ9PuLH1nMDLVwoGM=";
 
   subPackages = [ "cmd/jet" ];
 
diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 24877f211833..c106594e9c76 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-judge";
-  version = "1.9.8";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     owner = "criyle";
     repo = "go-judge";
     rev = "v${version}";
-    hash = "sha256-hBOH5FDqzUGiCXucbTPBPXdEnHPq7fL0SYlY5b3OMHY=";
+    hash = "sha256-orYfnqtNvTIJLAfjrrRU6WT3wKzQCzYmCNEHC8OBlQo=";
   };
 
-  vendorHash = "sha256-dUJpNGJvvmIJuA6GSWhL4weQEwn5iM9k+y8clHdxhvY=";
+  vendorHash = "sha256-2mCd8ymY9l4A2wAe7+MVCsCqT92qIVHHHfkNJvEMg5k=";
 
   tags = [
     "nomsgpack"
diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix
index e2cc18dad348..90aeea6276e4 100644
--- a/pkgs/by-name/go/go-sendxmpp/package.nix
+++ b/pkgs/by-name/go/go-sendxmpp/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-sendxmpp";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "mdosch";
     repo = "go-sendxmpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S4KoCMlW+uUJcQTYkEtlRT4IAALfRFSj2UDZk4A5e5g=";
+    hash = "sha256-dXSja3k7Gb9fzP3TrQqB9KRVO90i967eVaLldwhBnvQ=";
   };
 
-  vendorHash = "sha256-Qe95u+M9X45cVO9MNLPxoyMyoWOAYYQ2n/GorD/PMIA=";
+  vendorHash = "sha256-fnaOgc8RPDQnxTWOLQx1kw0+qj1iaff+UkjnoJYdEG4=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix
index f92e86b05839..5762f0be11cf 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.32.3";
+  version = "0.33.1";
 
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = "go-swagger";
     tag = "v${version}";
-    hash = "sha256-L6EfHNwykqGtA1CZd/Py6QqeCz10VGjX/lEVHs6VB6g=";
+    hash = "sha256-CVfGKkqneNgSJZOptQrywCioSZwJP0XGspVM3S45Q/k=";
   };
 
-  vendorHash = "sha256-UQbPVrLehl2jwGXdJPrRo6JsAd/2A+NKEQwkRr3reOY=";
+  vendorHash = "sha256-x3fTIXmI5NnOKph1D84MHzf1Kod+WLYn1JtnWLr4x+U=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix
index 2ba89c7d06f4..39dbedf1bb94 100644
--- a/pkgs/by-name/go/go2rtc/package.nix
+++ b/pkgs/by-name/go/go2rtc/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go2rtc";
-  version = "1.9.10";
+  version = "1.9.11";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "go2rtc";
     tag = "v${version}";
-    hash = "sha256-SWFVcfOfSCKuNJlahsZRY21n17vL1VjtDRiSZ5o3VGc=";
+    hash = "sha256-MJb88RwASZnURnqb8nmCKvf8G3VW+Vd1JlNtbh7i/Ps=";
   };
 
-  vendorHash = "sha256-k01+xngNA4SMCJa9Vhg+MxDgf973sUcrVXppwAz4MBs=";
+  vendorHash = "sha256-iOMIbeNh2+tNSMc5BR2h29a7uAru9ER/tPBI59PeeDY=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix
index 4bb4e08820c8..3cb81e2aa6cf 100644
--- a/pkgs/by-name/go/goa/package.nix
+++ b/pkgs/by-name/go/goa/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.21.5";
+  version = "3.22.6";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    hash = "sha256-3MRxiZK6rLc0Drn3Ha7YOZO3IGNkQNEpzppZwYcZLwg=";
+    hash = "sha256-gDcdk5xRb/CeX5PlfgxTOLru1GHcU3fbFzISPhqe/u4=";
   };
-  vendorHash = "sha256-5XKAfUA3dh1Vgh72h1GeiheoL7E7jij3nAlncV5FjF8=";
+  vendorHash = "sha256-k1tKdU7QWgei8X+mhAYAZwRDkwInPFNyvKZcISjUGIg=";
 
   subPackages = [ "cmd/goa" ];
 
diff --git a/pkgs/applications/audio/goattracker/default.nix b/pkgs/by-name/go/goattracker/package.nix
similarity index 100%
rename from pkgs/applications/audio/goattracker/default.nix
rename to pkgs/by-name/go/goattracker/package.nix
diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix
index 36f1382ce6db..3def6aaf3fde 100644
--- a/pkgs/by-name/go/goawk/package.nix
+++ b/pkgs/by-name/go/goawk/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "goawk";
-  version = "1.29.1";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "goawk";
     rev = "v${version}";
-    hash = "sha256-PQtayS2403ldNiE/xMQ/Oy+BsZB1ixDALuZcjhRyxLY=";
+    hash = "sha256-wy7rMZ0JyOKWr5u0CTaIaUDuu/SlUR8oVNf4gXWsMWY=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix
index 13f38313fd36..050575366276 100644
--- a/pkgs/by-name/go/gobang/package.nix
+++ b/pkgs/by-name/go/gobang/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage {
     description = "Cross-platform TUI database management tool written in Rust";
     homepage = "https://github.com/tako8ki/gobang";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/go/gocheat/package.nix b/pkgs/by-name/go/gocheat/package.nix
new file mode 100644
index 000000000000..2812b11318c7
--- /dev/null
+++ b/pkgs/by-name/go/gocheat/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "gocheat";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "Achno";
+    repo = "gocheat";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9Xw1GVfqk0Se8pLx3vzqR+f9GgX4LDo/H3iq1fzoTRs=";
+  };
+
+  vendorHash = "sha256-CByVf4+WWUlFGJcqt7aq5bHXiLMjdHTKvv6PQYEbLqc=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "TUI Cheatsheet for keybindings, hotkeys and more";
+    homepage = "https://github.com/Achno/gocheat";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      adamperkowski
+      sebaguardian
+    ];
+    mainProgram = "gocheat";
+  };
+})
diff --git a/pkgs/by-name/go/gocover-cobertura/package.nix b/pkgs/by-name/go/gocover-cobertura/package.nix
index 42510a5ee28b..69fec2106052 100644
--- a/pkgs/by-name/go/gocover-cobertura/package.nix
+++ b/pkgs/by-name/go/gocover-cobertura/package.nix
@@ -4,33 +4,33 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "gocover-cobertura";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "boumenot";
     repo = "gocover-cobertura";
-    rev = "v${version}";
-    sha256 = "sha256-Cxv1iuCYHSI0BFR1OLbeDIQfVLlMDxlTgU7ljpXWHjU=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-9KYNK6YV+iYB5Mmporzzw0aYTPCanvX7JALoP72dMtU=";
   };
 
   deleteVendor = true;
-  vendorHash = "sha256-b1fUikmBnc+q0KsRhK9p4VJjVnt6XFjmX9AE48TAxXg=";
+  vendorHash = "sha256-tPCiU7UVltYaHM1JVRje6EeG6Thn+3qm5I3MjKvD1/o=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
-  meta = with lib; {
-    homepage = "https://github.com/boumenot/gocover-cobertura";
+  meta = {
     description = "Simple helper tool for generating XML output in Cobertura format for CIs like Jenkins and others from go tool cover output";
+    homepage = "https://github.com/boumenot/gocover-cobertura";
+    license = lib.licenses.mit;
     mainProgram = "gocover-cobertura";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       gabyx
       hmajid2301
     ];
   };
-}
+})
diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix
index e17cab3def16..3568eb7bae23 100644
--- a/pkgs/by-name/go/gofumpt/package.nix
+++ b/pkgs/by-name/go/gofumpt/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gofumpt";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "gofumpt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2JahPQQfiYfctMi7AqNB9Y1dS1Pg8usLtzM2wSlC5E0=";
+    hash = "sha256-ngqg8YJHqW08hvZp+E+RLLjGArOZJov7/xKCMAWFI1E=";
   };
 
-  vendorHash = "sha256-ziqhBWkfWQ0T+gLFqv352PtNcpyCTRFHBfV6iilVGLs=";
+  vendorHash = "sha256-qCXpFxTZIhDDvvwytvftBnMwOHopO6/FkBWcLZhBDp8=";
 
   env.CGO_ENABLED = "0";
 
diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix
index 5c47e22875c8..91f18fb8f08d 100644
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gogup";
-  version = "0.27.9";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "nao1215";
     repo = "gup";
     rev = "v${version}";
-    hash = "sha256-8pBJcTv3f5ovbtuXuGVmF8m/6CQd19zpoJDs7PtsGcs=";
+    hash = "sha256-VhkmBTU+Zov7w6t/StgQFM9iB36e114pR3Zo4QO3v7k=";
   };
 
-  vendorHash = "sha256-sLf0Yhc495rOi0/Ww2/1BD5WXGTFyf6SzfTV9TtGzZk=";
+  vendorHash = "sha256-jFeP/0cwAWECuuqLwvMas4Nr7gjyB3BPPfD825yglwE=";
   doCheck = false;
 
   ldflags = [
diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix
index b71f97318f8d..bd838f576e0d 100644
--- a/pkgs/by-name/go/gol/package.nix
+++ b/pkgs/by-name/go/gol/package.nix
@@ -8,16 +8,16 @@
 
 maven.buildMavenPackage rec {
   pname = "gol";
-  version = "1.0.2";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "clarisma";
     repo = "gol-tool";
     tag = version;
-    hash = "sha256-roFtoSpNByNVGkl7ESt5O6b4voVzX8Nbow1dI6Sqgss";
+    hash = "sha256-AnPm5Mooww9kAMWLnM36z8DVRGfIIEiqUE65tgNuKm8=";
   };
 
-  mvnHash = "sha256-lKmoftSkyyb/pIthrsJaZ3p9l5V5K3FdK6sOBoZyhe8";
+  mvnHash = "sha256-YD28YX0RKuxOEWuK12ToOnFFrUPqA9xZ+EmsCt1fDPI=";
   mvnParameters = "compile assembly:single -Dmaven.test.skip=true";
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 6d7f1fb87be2..e94de8dafb24 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -14,16 +14,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "golangci-lint";
-  version = "2.5.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7dHr7cd+yYofIb+yR2kKfj0k0onLH2W/YuxNor7zPeo=";
+    hash = "sha256-LpYg7zkbLlvOe9u0TyDXkd9VIPyTNGhoZIrRhdmndH4=";
   };
 
-  vendorHash = "sha256-QEYbFz7SJxLMblkNqaRLDn/PO+mtSPvNYiEUmZh0sLQ=";
+  vendorHash = "sha256-8nwTMjn5OhFDK1Izv/yIIf14X5SijOYiXcXltIKNPJI=";
 
   subPackages = [ "cmd/golangci-lint" ];
 
diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index 1388a41d10b8..5c291cdaf216 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -13,10 +13,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "golly";
-  version = "4.3";
+  version = "5.0";
 
   src = fetchurl {
-    hash = "sha256-UdJHgGPn7FDN4rYTgfPBAoYE5FGC43TP8OFBmYIqCB0=";
+    hash = "sha256-WDXN5CgVP5uEC6lKQ1nlyybrMC56wBoJfNf1pcgwNhE=";
     url = "mirror://sourceforge/project/golly/golly/golly-${finalAttrs.version}/golly-${finalAttrs.version}-src.tar.gz";
   };
 
diff --git a/pkgs/by-name/go/gom/package.nix b/pkgs/by-name/go/gom/package.nix
index 465f8aa0933e..68bd96cde8cf 100644
--- a/pkgs/by-name/go/gom/package.nix
+++ b/pkgs/by-name/go/gom/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gom";
-  version = "0.5.3";
+  version = "0.5.4";
 
   outputs = [
     "out"
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gom/${lib.versions.majorMinor version}/gom-${version}.tar.xz";
-    sha256 = "Bp0JCfvca00n7feoeTZhlOOrUIsDVIv1uJ/2NUbSAXc=";
+    sha256 = "V7qAb+CAqTfVZkF40hutdlOyxWHqEoGHp7ELwXYrf2U=";
   };
 
   patches = [
diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix
index 02944b66b646..cc7e123d8bec 100644
--- a/pkgs/by-name/go/goodvibes/package.nix
+++ b/pkgs/by-name/go/goodvibes/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "goodvibes";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitLab {
     owner = "goodvibes";
     repo = "goodvibes";
     rev = "v${version}";
-    hash = "sha256-AHw8KlU1lmgH837GOpxGBgngwRIs5XV3+TvH4MuCx54=";
+    hash = "sha256-Lh4FPH0Bdxg2J4IxsZPs8Zjc7Tcobb4bTpvJzVNIy0Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
index 51f97ea70509..0ce2fbc74f62 100644
--- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
+++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-alloydb-auth-proxy";
-  version = "1.13.6";
+  version = "1.13.7";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "alloydb-auth-proxy";
     tag = "v${version}";
-    hash = "sha256-d3YMyvUoNfU32pcStsriBCCiyMPHRZrJzHgrnBRmUL4=";
+    hash = "sha256-I0AyOY9aM6XoKQ4D+KYR3AytUfPpK4TRQNRy+T8ZmN4=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-DobqGejaRrCy8RJyydepnTVp9IdeM9X6A+3uUgH15iM=";
+  vendorHash = "sha256-IhGAvn30Hd1vu4w19jKkjtbhh7gbATsLep0rli4ibK8=";
 
   checkFlags = [
     "-short"
diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index fbf2b103a7ec..7a2c9857463e 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "141.0.7390.107";
+    version = "142.0.7444.134";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-dNc4pUaqghgMxibOpHn3p2H/85ByqpPDRYpUWXX7ZzU=";
+      hash = "sha256-exTjuvwv/W2nemvBHyliD74At7i6ZcKypT9xaVPzcAE=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -272,11 +272,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "141.0.7390.108";
+    version = "142.0.7444.135";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/mevrk534jr6le7rbu7gatnuxym_141.0.7390.108/GoogleChrome-141.0.7390.108.dmg";
-      hash = "sha256-gMWPUPyHV0HvNkMuk10Kii7IrNMaA0etTPhcddDSDGE=";
+      url = "http://dl.google.com/release2/chrome/e7ds3jjlib5cryamafm2t5wjce_142.0.7444.135/GoogleChrome-142.0.7444.135.dmg";
+      hash = "sha256-kU6DBUW/O/RzbQUNQiKfuu3+h4ys22mg5nF0oKBPNy8=";
     };
 
     dontPatch = true;
diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix
index 1d37ebf1c416..e7014c1a0037 100644
--- a/pkgs/by-name/go/google-cloud-sdk/package.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/package.nix
@@ -87,6 +87,9 @@ stdenv.mkDerivation rec {
     ./gsutil-disable-updates.patch
   ];
 
+  # Prevent Python from writing bytecode to ensure build determinism
+  PYTHONDONTWRITEBYTECODE = "1";
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
index 986ee2ba4884..9d5a341105dc 100644
--- a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
@@ -78,6 +78,9 @@ symlinkJoin {
   ]
   ++ comps;
 
+  # Prevent Python from writing bytecode to ensure build determinism
+  PYTHONDONTWRITEBYTECODE = "1";
+
   postBuild = ''
     sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
     sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud"
diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index 43ffc3eda1fa..5b4c3daf73c2 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-cloud-sql-proxy";
-  version = "2.18.2";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
     rev = "v${version}";
-    hash = "sha256-c37/364fAm4FR3TQ55zKRUVWr2rr7SZUMRlTJKEIc8c=";
+    hash = "sha256-LF9ALCBgO2cIVLRTH0KxdmsIhfnnCO4akmoGS3kIWm0=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-nrrf7+6uaKHvrJg8mrqjbyJxDjZhO4KKPd9+nIX+8A0=";
+  vendorHash = "sha256-RtWTVb1JWNgVM3NZf28CMKIgPjGIgZztYYULqTM7nQg=";
 
   checkFlags = [
     "-short"
diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix
index 084d1674e3f1..2d56ace21659 100644
--- a/pkgs/by-name/go/google-java-format/package.nix
+++ b/pkgs/by-name/go/google-java-format/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "google-java-format";
-  version = "1.30.0";
+  version = "1.32.0";
 
   src = fetchurl {
     url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
-    sha256 = "sha256-8iOaiiNKJApU/f94CdSz5mcCwh9ZDHegts97IMgp6Vo=";
+    sha256 = "sha256-uO/EpRIkI5Kq7Y+21bqlNz5wUBkPY90FxnuOwlXAF/8=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix
index cee070520bed..b8869a459448 100644
--- a/pkgs/by-name/go/goose-cli/package.nix
+++ b/pkgs/by-name/go/goose-cli/package.nix
@@ -27,16 +27,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "goose-cli";
-  version = "1.6.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "block";
     repo = "goose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZfS0U7PpGWWuqGKd7IjRaavqZSySx93F9S1d7r2wMkE=";
+    hash = "sha256-0pDJp/sWFn16HlWU+OYk0K9kIbNohC8NckZywinBRH8=";
   };
 
-  cargoHash = "sha256-uYgYzP75QkN1VksYL3KeNMNy7wb0TgCP8HPN1QrfZoo=";
+  cargoHash = "sha256-bspPOgMEnSjICJWIicrD7B+APuUvlVZFarpwzzdLwPc=";
 
   nativeBuildInputs = [
     pkg-config
@@ -81,9 +81,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=transport::streamable_http::tests::test_handle_outgoing_message_session_id_handling"
     "--skip=transport::streamable_http::tests::test_handle_outgoing_message_session_not_found"
     "--skip=transport::streamable_http::tests::test_handle_outgoing_message_successful_request"
+    "--skip=routes::audio::tests::test_transcribe_endpoint_requires_auth"
+    "--skip=routes::config_management::tests::test_get_provider_models_openai_configured"
+    # integration tests that need network access
+    "--skip=test_replayed_session::vec_uvx_mcp_server_fetch_vec_calltoolrequestparam_name_fetch_into_arguments_some_object_url_https_example_com_vec_expects"
+    "--skip=test_replayed_session::vec_github_mcp_server_stdio_vec_calltoolrequestparam_name_get_file_contents_into_arguments_some_object_owner_block_repo_goose_path_readme_md_sha_ab62b863c1666232a67048b6c4e10007a2a5b83c_vec_github_personal_access_token_expects"
+    "--skip=test_replayed_session::vec_cargo_run_quiet_p_goose_server_bin_goosed_mcp_developer_vec_calltoolrequestparam_name_text_editor_into_arguments_some_object_command_view_path_goose_crates_goose_tests_tmp_goose_txt_calltoolrequestparam_name_text_editor_into_arguments_some_object_command_str_replace_path_goose_crates_goose_tests_tmp_goose_txt_old_str_goose_new_str_goose_modified_by_test_calltoolrequestparam_name_shell_into_arguments_some_object_command_cat_goose_crates_goose_tests_tmp_goose_txt_calltoolrequestparam_name_text_editor_into_arguments_some_object_command_str_replace_path_goose_crates_goose_tests_tmp_goose_txt_old_str_goose_modified_by_test_new_str_goose_calltoolrequestparam_name_list_windows_into_arguments_some_object_vec_expects"
+    "--skip=test_replayed_session::vec_npx_y_modelcontextprotocol_server_everything_vec_calltoolrequestparam_name_echo_into_arguments_some_object_message_hello_world_calltoolrequestparam_name_add_into_arguments_some_object_a_1_b_2_calltoolrequestparam_name_longrunningoperation_into_arguments_some_object_duration_1_steps_5_calltoolrequestparam_name_structuredcontent_into_arguments_some_object_location_11238_vec_expects"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     "--skip=context_mgmt::auto_compact::tests::test_auto_compact_respects_config"
+    "--skip=scheduler::tests::test_scheduled_session_has_schedule_id"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "--skip=logging::tests::test_log_file_name_no_session"
diff --git a/pkgs/by-name/go/gopass-jsonapi/package.nix b/pkgs/by-name/go/gopass-jsonapi/package.nix
index 91a8baccd8a1..b3f594155695 100644
--- a/pkgs/by-name/go/gopass-jsonapi/package.nix
+++ b/pkgs/by-name/go/gopass-jsonapi/package.nix
@@ -8,7 +8,6 @@
   jq,
   gnupg,
   gopass,
-  apple-sdk_14,
 }:
 
 let
@@ -45,11 +44,6 @@ buildGoModule rec {
     makeWrapper
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365
-    apple-sdk_14
-  ];
-
   ldflags = [
     "-s"
     "-w"
diff --git a/pkgs/by-name/go/gopatch/package.nix b/pkgs/by-name/go/gopatch/package.nix
index ad7a50f3d82e..2f3573ee5a64 100644
--- a/pkgs/by-name/go/gopatch/package.nix
+++ b/pkgs/by-name/go/gopatch/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/uber-go/gopatch";
     changelog = "https://github.com/uber-go/gopatch/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/go/gopeed/gitHashes.json b/pkgs/by-name/go/gopeed/gitHashes.json
new file mode 100644
index 000000000000..1e971195c634
--- /dev/null
+++ b/pkgs/by-name/go/gopeed/gitHashes.json
@@ -0,0 +1,5 @@
+{
+  "install_plugin": "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk=",
+  "permission_handler_windows": "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=",
+  "tray_manager": "sha256-rsvykRadbCRNwJUEAcoFTywwqvx4qvzdUmz7TQFDYP4="
+}
diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index c37850098e6e..248d5a200767 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter332,
   autoPatchelfHook,
   buildGoModule,
   libayatana-appindicator,
 }:
 
 let
-  version = "1.8.0";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "GopeedLab";
     repo = "gopeed";
     tag = "v${version}";
-    hash = "sha256-GUCc6GK1yhVbk3Ss1XnT23wtz22uTgdSSDfEdr4mMpA=";
+    hash = "sha256-KezASQIqyu4GsKaGAhge7gEYMe57GMgzjXlAbmyDI3Y=";
   };
 
   metaCommon = {
-    description = "Modern download manager that supports all platforms";
+    description = "Modern download manager";
     homepage = "https://github.com/GopeedLab/gopeed";
     license = with lib.licenses; [ gpl3Plus ];
     maintainers = [ ];
@@ -29,7 +29,7 @@ let
     inherit version src;
     pname = "libgopeed";
 
-    vendorHash = "sha256-7SPTMeaHvqTZJQYPoGUGRudNRTcsEl/8AKgI6W/XCJQ=";
+    vendorHash = "sha256-x9M9zwS5FhsIyGGBi0szWHMfLXCFVgqv8bfSxhHZT2Y=";
 
     buildPhase = ''
       runHook preBuild
@@ -44,7 +44,7 @@ let
     meta = metaCommon;
   };
 in
-flutter327.buildFlutterApplication {
+flutter332.buildFlutterApplication {
   inherit version src;
   pname = "gopeed";
 
@@ -52,10 +52,7 @@ flutter327.buildFlutterApplication {
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  gitHashes = {
-    install_plugin = "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk=";
-    permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=";
-  };
+  gitHashes = lib.importJSON ./gitHashes.json;
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json
index fdb2017b279b..c737f6ecfe51 100644
--- a/pkgs/by-name/go/gopeed/pubspec.lock.json
+++ b/pkgs/by-name/go/gopeed/pubspec.lock.json
@@ -356,6 +356,16 @@
       "source": "hosted",
       "version": "1.0.8"
     },
+    "dart_ipc": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dart_ipc",
+        "sha256": "6cad558cda5304017c1f581df4c96fd4f8e4ee212aae7bfa4357716236faa9ba",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
     "dart_style": {
       "dependency": "transitive",
       "description": {
@@ -1561,12 +1571,13 @@
     "tray_manager": {
       "dependency": "direct main",
       "description": {
-        "name": "tray_manager",
-        "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
-        "url": "https://pub.dev"
+        "path": "packages/tray_manager",
+        "ref": "main",
+        "resolved-ref": "91cdbdc12517d0d832aca715542b9d0329739d5d",
+        "url": "https://github.com/monkeyWie/tray_manager.git"
       },
-      "source": "hosted",
-      "version": "0.2.4"
+      "source": "git",
+      "version": "0.5.1"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1762,11 +1773,11 @@
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "win32": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/go/gopeed/update-gitHashes.py b/pkgs/by-name/go/gopeed/update-gitHashes.py
new file mode 100755
index 000000000000..ffa6feb66653
--- /dev/null
+++ b/pkgs/by-name/go/gopeed/update-gitHashes.py
@@ -0,0 +1,51 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3 nix-prefetch-git
+
+import json
+import subprocess
+import sys
+from pathlib import Path
+
+THIS_FOLDER = Path(__file__).parent.resolve()
+PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
+GIT_HASHES = THIS_FOLDER / "gitHashes.json"
+
+
+def fetch_git_hash(url: str, rev: str) -> str:
+    result = subprocess.run(
+        ["nix-prefetch-git", "--url", url, "--rev", rev],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return json.loads(result.stdout)["hash"]
+
+
+def main() -> None:
+    if not PUBSPEC_LOCK.exists():
+        sys.exit(1)
+    try:
+        data = json.loads(PUBSPEC_LOCK.read_text())
+    except json.JSONDecodeError:
+        sys.exit(1)
+    output: dict[str, str] = {}
+    for name, info in data.get("packages", {}).items():
+        if info.get("source") != "git":
+            continue
+        desc = info.get("description")
+        if not isinstance(desc, dict):
+            continue
+        url = desc.get("url")
+        rev = desc.get("resolved-ref")
+        if not (isinstance(url, str) and isinstance(rev, str)):
+            continue
+        try:
+            package_hash = fetch_git_hash(url, rev)
+        except subprocess.CalledProcessError:
+            continue
+        output[name] = package_hash
+    GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/by-name/go/gopeed/update.sh b/pkgs/by-name/go/gopeed/update.sh
index 1bdf16913950..3f6a47799a47 100755
--- a/pkgs/by-name/go/gopeed/update.sh
+++ b/pkgs/by-name/go/gopeed/update.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update
 
 set -eou pipefail
 
-ROOT="$(dirname "$(readlink -f "$0")")"
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
 
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/GopeedLab/gopeed/releases/latest | jq --raw-output .tag_name)
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/GopeedLab/gopeed/releases/latest | jq --raw-output .tag_name)
 latestVersion=$(echo "$latestTag" | sed 's/^v//')
 
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; gopeed.version or (lib.getVersion gopeed)" | tr -d '"')
+currentVersion=$(nix eval --raw --file . gopeed.version)
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then
     echo "package is up-to-date: $currentVersion"
@@ -17,4 +17,6 @@ fi
 
 nix-update gopeed.libgopeed
 
-curl https://raw.githubusercontent.com/GopeedLab/gopeed/${latestTag}/ui/flutter/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+curl --fail --silent https://raw.githubusercontent.com/GopeedLab/gopeed/${latestTag}/ui/flutter/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
+
+$PACKAGE_DIR/update-gitHashes.py
diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix
index 0975a213b853..2a38e8e13525 100644
--- a/pkgs/by-name/go/gops/package.nix
+++ b/pkgs/by-name/go/gops/package.nix
@@ -1,8 +1,10 @@
 {
   lib,
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   writableTmpDirAsHomeHook,
+  installShellFiles,
 }:
 
 buildGoModule (finalAttrs: {
@@ -20,6 +22,16 @@ buildGoModule (finalAttrs: {
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion \
+      --cmd gops \
+      --bash <($out/bin/gops completion bash) \
+      --fish <($out/bin/gops completion fish) \
+      --zsh <($out/bin/gops completion zsh)
+  '';
+
   meta = with lib; {
     description = "Tool to list and diagnose Go processes currently running on your system";
     mainProgram = "gops";
diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index d30a09c70ea8..4ff91d2b9224 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGo125Module rec {
   pname = "goreleaser";
-  version = "2.12.5";
+  version = "2.12.7";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-EHJ1ARzk6BD5D121u+1UTe90oLOovKKD+LQWLIj81Jk=";
+    hash = "sha256-McLE7o5eUTluIOlsArIo5Dh7fizxxCMVAdXXnSBKhQU=";
   };
 
-  vendorHash = "sha256-J/OwvPxC8wz/91sWWUBNkW5E71m8EPjTq3h/MOxT/3k=";
+  vendorHash = "sha256-M8+KJV7LemD6AHjJS8nZ70AZ30kZIgyYQv/yWB3lmsw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/go/gost/package.nix b/pkgs/by-name/go/gost/package.nix
index 1ab69ee74b86..839c95dca90c 100644
--- a/pkgs/by-name/go/gost/package.nix
+++ b/pkgs/by-name/go/gost/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gost";
-  version = "3.2.4";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "go-gost";
     repo = "gost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zFGoM+fYO/o70LJ2fbzhMv4qbjLozJGmGbudqHjCFRU=";
+    hash = "sha256-voVk4zzNm2UZWQ3c/n0YOwuaE9JcIlEmJ881nTXXyrY=";
   };
 
-  vendorHash = "sha256-W3CHttD9iGpl2wG/Pa21YY6ACf5M894p25nLfMX0+F4=";
+  vendorHash = "sha256-73gjw0oW8i7Vp6ZxxqkO42/atdde4J+lu/pCHK/xY+8=";
 
   # Based on ldflags in upstream's .goreleaser.yaml
   ldflags = [
diff --git a/pkgs/by-name/go/gotlsaflare/package.nix b/pkgs/by-name/go/gotlsaflare/package.nix
index 789593ea0d84..4061de8a3808 100644
--- a/pkgs/by-name/go/gotlsaflare/package.nix
+++ b/pkgs/by-name/go/gotlsaflare/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gotlsaflare";
-  version = "2.7.4";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "Stenstromen";
     repo = "gotlsaflare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yf3Z+qO3nF1XgDC0ocbNpUJUvwfhw60F5Y5yG55LsJs=";
+    hash = "sha256-1CvPQdaJJbh+Dsibgwan9T7yLiH+fTfAYtv1Rkuo8E4=";
   };
 
   vendorHash = "sha256-d+79m6K1+fy3vyXLKvwNx6mFiO3UO9lHJ07364jVJYM=";
diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix
index 54306db43a7f..fe50a35985f7 100644
--- a/pkgs/by-name/go/gotosocial/package.nix
+++ b/pkgs/by-name/go/gotosocial/package.nix
@@ -10,11 +10,11 @@ let
   owner = "superseriousbusiness";
   repo = "gotosocial";
 
-  version = "0.20.0";
+  version = "0.20.1";
 
   web-assets = fetchurl {
     url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
-    hash = "sha256-poG+j5WfbTN7853cOdngv+uIblcL19ySgtguXW5TX+w=";
+    hash = "sha256-0WvaPUVTMYd1tz7Rtmlp37vx/co4efhDdSWBc4gUzAU=";
   };
 in
 buildGo124Module rec {
@@ -24,7 +24,7 @@ buildGo124Module rec {
   src = fetchFromGitea {
     inherit domain owner repo;
     tag = "v${version}";
-    hash = "sha256-RN2U/hYJcmuTGMnTCQCLX74qdxANF8nkIx98uWT/Aww=";
+    hash = "sha256-8z2tBiEVcof0/G41gpc0S8Dye5nynwHSJpTzo/ZseFs=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/go/goxlr-utility/package.nix b/pkgs/by-name/go/goxlr-utility/package.nix
index 8fc658de3647..22232d0648bb 100644
--- a/pkgs/by-name/go/goxlr-utility/package.nix
+++ b/pkgs/by-name/go/goxlr-utility/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "goxlr-utility";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "GoXLR-on-Linux";
     repo = "goxlr-utility";
     rev = "v${version}";
-    hash = "sha256-Z/VqQKmfzqd1htMlXU8sDkOSw2xczb3tG53LVC0MZhM=";
+    hash = "sha256-+hwNevUT9AwMXHUxmjYVrJ3AKaxICrOJZ642GPRq17Q=";
   };
 
-  cargoHash = "sha256-tSlFMMZWsyZBXBeEW64s0eBt/qrAREfOpfxAgcTK4XQ=";
+  cargoHash = "sha256-NzqyBe/qeWtTcAWu2bE3fyhegtxKpQokEEvNxdu/zUo=";
 
   buildInputs = [
     libpulseaudio
diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 44da242fca32..5603ae754edf 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -2,38 +2,131 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  gitUpdater,
+  unstableGitUpdater,
   cctools,
   pkg-config,
   zlib,
+  ffmpeg-headless,
+  freetype,
+  libjpeg_turbo,
+  libpng,
+  libmad,
+  faad2,
+  libogg,
+  libvorbis,
+  libtheora,
+  a52dec,
+  nghttp2,
+  openjpeg,
+  libcaca,
+  mesa,
+  mesa_glu,
+  xvidcore,
+  openssl,
+  jack2,
+  alsa-lib,
+  pulseaudio,
+  SDL2,
+  curl,
+  xorg,
+
+  withFullDeps ? false,
+  withFfmpeg ? withFullDeps,
+  releaseChannel ? "stable",
 }:
 
-stdenv.mkDerivation rec {
-  pname = "gpac";
-  version = "2.4.0";
-
-  src = fetchFromGitHub {
-    owner = "gpac";
-    repo = "gpac";
-    rev = "v${version}";
-    hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
+let
+  stable = rec {
+    version = "2.4.0"; # See below TODO.
+    src = fetchFromGitHub {
+      owner = "gpac";
+      repo = "gpac";
+      rev = "v${version}";
+      hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
+    };
+    updateScript = gitUpdater {
+      odd-unstable = true;
+      rev-prefix = "v";
+      ignoredVersions = "^(abi|test)";
+    };
+  }
+  // {
+    # ffmpeg 7.0.2 works, but 7.1.1 (which is packaged in nixpkgs) doesn't
+    # because v2.4.0 of this package relies on internal private ffmpeg fields.
+    # TODO: remove this, and switch to simply using ffmpeg-headless,
+    #       when updating stable to 2.6
+    ffmpeg-headless = ffmpeg-headless.override {
+      version = "7.0.2";
+      hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
+    };
   };
+  unstable = {
+    version = "2.4-unstable-2025-10-26";
+    src = fetchFromGitHub {
+      owner = "gpac";
+      repo = "gpac";
+      rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3";
+      hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4=";
+    };
+    updateScript = unstableGitUpdater {
+      tagFormat = "v*";
+      tagPrefix = "v";
+    };
+    inherit ffmpeg-headless;
+  };
+  channelToUse = if releaseChannel == "unstable" then unstable else stable;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gpac";
+  inherit (channelToUse) version src;
 
-  # this is the bare minimum configuration, as I'm only interested in MP4Box
-  # For most other functionality, this should probably be extended
   nativeBuildInputs = [
     pkg-config
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     cctools
+  ]
+  ++ lib.optionals withFfmpeg [
+    channelToUse.ffmpeg-headless
   ];
 
+  # ref: https://wiki.gpac.io/Build/build/GPAC-Build-Guide-for-Linux/#gpac-easy-build-recommended-for-most-users
   buildInputs = [
     zlib
+  ]
+  ++ lib.optionals withFullDeps [
+    freetype
+    libjpeg_turbo
+    libpng
+    libmad
+    faad2
+    libogg
+    libvorbis
+    libtheora
+    a52dec
+    nghttp2
+    openjpeg
+    libcaca
+    xorg.libX11
+    xorg.libXv
+    xorg.xorgproto
+    mesa
+    mesa_glu
+    xvidcore
+    openssl
+    jack2
+    alsa-lib
+    pulseaudio
+    SDL2
+    curl
   ];
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  passthru.updateScript = channelToUse.updateScript;
+
+  meta = {
     description = "Open Source multimedia framework for research and academic purposes";
     longDescription = ''
       GPAC is an Open Source multimedia framework for research and academic purposes.
@@ -48,10 +141,11 @@ stdenv.mkDerivation rec {
       And some server tools included in MP4Box and MP42TS applications.
     '';
     homepage = "https://gpac.wp.imt.fr";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
       mgdelacroix
+      thesn
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index ccefe5e53e4c..2b31edcb2836 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -6,22 +6,23 @@
   pkg-config,
   perl,
   webkitgtk_4_1,
+  stdenv,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "gpauth";
-  version = "2.4.1";
+  version = "2.4.6";
 
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
     rev = "v${version}";
-    hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
+    hash = "sha256-AxerhMQBgEgeecKAhedokMdpra1C9iqhutPrdAQng6Q=";
   };
 
   buildAndTestSubdir = "apps/gpauth";
 
-  cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U=";
+  cargoHash = "sha256-oPnBpwE8bdYgve1Dh64WNjWXClSRoHL5PVwrB1ovU6Y=";
 
   nativeBuildInputs = [
     perl
@@ -29,10 +30,12 @@ rustPlatform.buildRustPackage rec {
   ];
   buildInputs = [
     openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
     webkitgtk_4_1
   ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/${src.owner}/${src.repo}/blob/${src.rev}/changelog.md";
     description = "CLI for GlobalProtect VPN, based on OpenConnect, supports the SSO authentication method";
     longDescription = ''
@@ -43,14 +46,11 @@ rustPlatform.buildRustPackage rec {
       the same features as the GUI version.
     '';
     homepage = "https://github.com/${src.owner}/${src.repo}";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       binary-eater
       m1dugh
     ];
-    platforms = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix
index f319fd0e1345..0412494e614b 100644
--- a/pkgs/by-name/gp/gpclient/package.nix
+++ b/pkgs/by-name/gp/gpclient/package.nix
@@ -8,26 +8,25 @@
   perl,
   pkg-config,
   vpnc-scripts,
-  fetchFromGitHub,
+  glib,
+  pango,
+  cairo,
+  atk,
+  gtk3,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage {
   pname = "gpclient";
-  version = "2.4.1";
 
-  src = fetchFromGitHub {
-    owner = "yuezk";
-    repo = "GlobalProtect-openconnect";
-    rev = "v${version}";
-    hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
-  };
-
-  inherit (gpauth) meta;
+  inherit (gpauth)
+    src
+    version
+    cargoHash
+    meta
+    ;
 
   buildAndTestSubdir = "apps/gpclient";
 
-  cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U=";
-
   nativeBuildInputs = [
     perl
     makeWrapper
@@ -38,6 +37,11 @@ rustPlatform.buildRustPackage rec {
     openconnect
     openssl
     glib-networking
+    glib
+    pango
+    cairo
+    atk
+    gtk3
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/gp/gphotos-sync/package.nix b/pkgs/by-name/gp/gphotos-sync/package.nix
deleted file mode 100644
index 9b89e9c53b5e..000000000000
--- a/pkgs/by-name/gp/gphotos-sync/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  ffmpeg,
-}:
-python3.pkgs.buildPythonApplication rec {
-  pname = "gphotos-sync";
-  version = "3.2.1";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "gilesknap";
-    repo = "gphotos-sync";
-    rev = version;
-    hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw=";
-  };
-
-  patches = [
-    ./skip-network-tests.patch
-  ];
-
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    appdirs
-    attrs
-    exif
-    google-auth-oauthlib
-    psutil
-    pyyaml
-    psutil
-    requests-oauthlib
-    types-pyyaml
-    types-requests
-  ];
-
-  buildInputs = [
-    ffmpeg
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    mock
-    pytestCheckHook
-  ];
-
-  preCheck = ''
-    export PY_IGNORE_IMPORTMISMATCH=1
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
-    description = "Google Photos and Albums backup with Google Photos Library API";
-    mainProgram = "gphotos-sync";
-    homepage = "https://github.com/gilesknap/gphotos-sync";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dnr ];
-  };
-}
diff --git a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch b/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
deleted file mode 100644
index 6f78ed7db3f2..000000000000
--- a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/test_setup.py b/tests/test_setup.py
-index 085b110..ea4a7d2 100644
---- a/tests/test_setup.py
-+++ b/tests/test_setup.py
-@@ -45,7 +45,8 @@ class SetupDbAndCredentials:
-         return self
- 
-     def __exit__(self, exc_type=None, exc_value=None, traceback=None):
--        self.gp.google_photos_down.close()
-+        if hasattr(self.gp, 'google_photos_down'):
-+            self.gp.google_photos_down.close()
- 
-     def test_setup(self, test_name, args=None, trash_db=False, trash_files=False):
-         self.root = Path("/tmp/gpTests/{}".format(test_name))
-@@ -76,3 +77,6 @@ class SetupDbAndCredentials:
- 
-     def test_done(self):
-         self.gp.data_store.store()
-+
-+import pytest, requests
-+requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access")
diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.nix b/pkgs/by-name/gp/gpsbabel/debian-patches.nix
similarity index 100%
rename from pkgs/applications/misc/gpsbabel/debian-patches.nix
rename to pkgs/by-name/gp/gpsbabel/debian-patches.nix
diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.txt b/pkgs/by-name/gp/gpsbabel/debian-patches.txt
similarity index 100%
rename from pkgs/applications/misc/gpsbabel/debian-patches.txt
rename to pkgs/by-name/gp/gpsbabel/debian-patches.txt
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/by-name/gp/gpsbabel/package.nix
similarity index 95%
rename from pkgs/applications/misc/gpsbabel/default.nix
rename to pkgs/by-name/gp/gpsbabel/package.nix
index b295a61ac05e..9943ed44cafc 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/by-name/gp/gpsbabel/package.nix
@@ -5,16 +5,11 @@
   fetchurl,
   pkg-config,
   which,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
   libusb1,
   shapelib,
   zlib,
   withGUI ? false,
-  qtserialport,
   withMapPreview ? (!stdenv.hostPlatform.isDarwin),
-  qtwebengine,
   withDoc ? false,
   docbook_xml_dtd_45,
   docbook_xsl,
@@ -23,6 +18,7 @@
   libxml2,
   libxslt,
   perl,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,11 +52,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
   ]
   ++ lib.optionals withGUI [
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optionals withDoc [
     docbook_xml_dtd_45
@@ -77,8 +73,8 @@ stdenv.mkDerivation rec {
     shapelib
     zlib
   ]
-  ++ lib.optional withGUI qtserialport
-  ++ lib.optional (withGUI && withMapPreview) qtwebengine;
+  ++ lib.optional withGUI libsForQt5.qtserialport
+  ++ lib.optional (withGUI && withMapPreview) libsForQt5.qtwebengine;
 
   nativeCheckInputs = [
     libxml2
diff --git a/pkgs/by-name/gp/gpt-box/gitHashes.json b/pkgs/by-name/gp/gpt-box/gitHashes.json
new file mode 100644
index 000000000000..4057674c0541
--- /dev/null
+++ b/pkgs/by-name/gp/gpt-box/gitHashes.json
@@ -0,0 +1,7 @@
+{
+  "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=",
+  "fl_build": "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=",
+  "fl_lib": "sha256-GFgDSkAI5alBxngm8y8A5oXfWgyuleNjnM4bsgYUlSs=",
+  "flutter_highlight": "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw=",
+  "openai_dart": "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw="
+}
diff --git a/pkgs/by-name/gp/gpt-box/package.nix b/pkgs/by-name/gp/gpt-box/package.nix
index da5a0cf3dae0..1ff42ea9d5b5 100644
--- a/pkgs/by-name/gp/gpt-box/package.nix
+++ b/pkgs/by-name/gp/gpt-box/package.nix
@@ -6,33 +6,28 @@
   copyDesktopItems,
   makeDesktopItem,
   runCommand,
-  yq,
-  gpt-box,
+  yq-go,
   _experimental-update-script-combinators,
-  gitUpdater,
+  nix-update-script,
 }:
 
-flutter329.buildFlutterApplication rec {
-  pname = "gpt-box";
-  version = "1.0.385";
+let
+  version = "1.0.395";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_gpt_box";
     tag = "v${version}";
-    hash = "sha256-gl8kANxZLNXSuZxcK9WqfXxVWsCpZCbV+qmSt2ZnI6E=";
+    hash = "sha256-YtrsN8CdbCvbzfex8bCUUfqfTfyhhZfmweydaRSn1J4=";
   };
+in
+flutter329.buildFlutterApplication {
+  pname = "gpt-box";
+  inherit version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  gitHashes = {
-    computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=";
-    fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=";
-    fl_lib = "sha256-gAZqxPOBMXfy0mHEd7Jud0QJwyRbqC4nIRDIA81TZxM=";
-    flutter_highlight = "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw=";
-    openai_dart = "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw=";
-    webdav_client = "sha256-aTkMcrXksHLEG4UpeE1MBmCKpX5l11+y/p4tICrOTGk=";
-  };
+  gitHashes = lib.importJSON ./gitHashes.json;
 
   nativeBuildInputs = [
     copyDesktopItems
@@ -57,22 +52,31 @@ flutter329.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png
+    install -D --mode=0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png
   '';
 
   passthru = {
     pubspecSource =
       runCommand "pubspec.lock.json"
         {
-          nativeBuildInputs = [ yq ];
-          inherit (gpt-box) src;
+          inherit src;
+          nativeBuildInputs = [ yq-go ];
         }
         ''
-          cat $src/pubspec.lock | yq > $out
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
         '';
     updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json)
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
+      {
+        command = [ ./update-gitHashes.py ];
+        supportedFeatures = [ ];
+      }
     ];
   };
 
diff --git a/pkgs/by-name/gp/gpt-box/pubspec.lock.json b/pkgs/by-name/gp/gpt-box/pubspec.lock.json
index a8439eea8bfd..a81fb020dc8a 100644
--- a/pkgs/by-name/gp/gpt-box/pubspec.lock.json
+++ b/pkgs/by-name/gp/gpt-box/pubspec.lock.json
@@ -1,15 +1,5 @@
 {
   "packages": {
-    "_discoveryapis_commons": {
-      "dependency": "transitive",
-      "description": {
-        "name": "_discoveryapis_commons",
-        "sha256": "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.7"
-    },
     "_fe_analyzer_shared": {
       "dependency": "transitive",
       "description": {
@@ -90,31 +80,31 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "asn1lib": {
       "dependency": "transitive",
       "description": {
         "name": "asn1lib",
-        "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c",
+        "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.9"
+      "version": "1.6.4"
     },
     "async": {
       "dependency": "transitive",
@@ -210,11 +200,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2",
+        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.3"
+      "version": "8.9.5"
     },
     "camera": {
       "dependency": "transitive",
@@ -230,31 +220,31 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_android_camerax",
-        "sha256": "7cc6adf1868bdcf4e63a56b24b41692dfbad2bec1cdceea451c77798f6a605c3",
+        "sha256": "f0dcbce91623f75030840609de9b64d0d73f86df279c6e9588c1501245a05eb2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.13"
+      "version": "0.6.15+2"
     },
     "camera_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "camera_avfoundation",
-        "sha256": "1eeb9ce7c9a397e312343fd7db337d95f35c3e65ad5a62ff637c8abce5102b98",
+        "sha256": "a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.18+8"
+      "version": "0.9.18+14"
     },
     "camera_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "camera_platform_interface",
-        "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31",
+        "sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.9.0"
+      "version": "2.10.0"
     },
     "camera_web": {
       "dependency": "transitive",
@@ -306,16 +296,6 @@
       "source": "hosted",
       "version": "2.3.2"
     },
-    "cli_util": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_util",
-        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.2"
-    },
     "clock": {
       "dependency": "transitive",
       "description": {
@@ -330,11 +310,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cloudflare_turnstile",
-        "sha256": "c7f37c7327d3f03b528a2334a5131c352ce62a545254e557693227a207801dc7",
+        "sha256": "d13cbec55a1c4916bca1d4dbd84fbe7b655ae35a264513750fdb8250486269e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.3.1"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -367,16 +347,6 @@
       "source": "git",
       "version": "3.2.1"
     },
-    "console": {
-      "dependency": "transitive",
-      "description": {
-        "name": "console",
-        "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.0"
-    },
     "convert": {
       "dependency": "transitive",
       "description": {
@@ -441,11 +411,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "encrypt": {
       "dependency": "transitive",
@@ -471,21 +441,21 @@
       "dependency": "direct main",
       "description": {
         "name": "extended_image",
-        "sha256": "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae",
+        "sha256": "f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.0"
+      "version": "10.0.1"
     },
     "extended_image_library": {
       "dependency": "transitive",
       "description": {
         "name": "extended_image_library",
-        "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1",
+        "sha256": "ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "5.0.0"
     },
     "fake_async": {
       "dependency": "transitive",
@@ -497,26 +467,6 @@
       "source": "hosted",
       "version": "1.3.2"
     },
-    "fetch_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fetch_api",
-        "sha256": "97f46c25b480aad74f7cc2ad7ccba2c5c6f08d008e68f95c1077286ce243d0e6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "fetch_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fetch_client",
-        "sha256": "9666ee14536778474072245ed5cba07db81ae8eb5de3b7bf4a2d1e2c49696092",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.2"
-    },
     "ffi": {
       "dependency": "transitive",
       "description": {
@@ -541,11 +491,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
+        "sha256": "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.7"
+      "version": "9.2.3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -612,8 +562,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.244",
-        "resolved-ref": "5104bf4a32003ef76877555f58a2986c0646ead3",
+        "ref": "v1.0.268",
+        "resolved-ref": "88908c4e838b15e1bde5b2685ccd016b7578e8a4",
         "url": "https://github.com/lppcg/fl_lib"
       },
       "source": "git",
@@ -625,46 +575,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_app_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_app_builder",
-        "sha256": "74018c0e2da3ae33073e7417b5c8e900fdc7b5ebc3bdacd2dd05244d9b5e54cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
-    "flutter_app_packager": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_app_packager",
-        "sha256": "3925c4e2ac53f4a5ce3bae1a5f54966620504d6c28725b112074cfbdf227a36b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
-    "flutter_app_publisher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_app_publisher",
-        "sha256": "bbb1953ef723fc98a7f974ae9499194999f570194c6d856182518e6e73b51ff2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
-    "flutter_distributor": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_distributor",
-        "sha256": "45d27526a5de93370e322da5314b0a1c07c024b79031a8ad44435046915fa0e8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
     "flutter_highlight": {
       "dependency": "direct main",
       "description": {
@@ -776,11 +686,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_markdown",
-        "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5",
+        "sha256": "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6+2"
+      "version": "0.7.7"
     },
     "flutter_markdown_latex": {
       "dependency": "transitive",
@@ -806,31 +716,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7",
+        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "2.4.6"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.24"
+      "version": "2.0.28"
+    },
+    "flutter_riverpod": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_riverpod",
+        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
     },
     "flutter_svg": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_svg",
-        "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b",
+        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.17"
+      "version": "2.1.0"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -844,8 +764,18 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "freezed": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "freezed",
+        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.7"
+    },
     "freezed_annotation": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
         "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
@@ -864,16 +794,6 @@
       "source": "hosted",
       "version": "4.0.0"
     },
-    "get_it": {
-      "dependency": "transitive",
-      "description": {
-        "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.7.0"
-    },
     "glob": {
       "dependency": "transitive",
       "description": {
@@ -894,36 +814,6 @@
       "source": "hosted",
       "version": "6.2.1"
     },
-    "google_identity_services_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "google_identity_services_web",
-        "sha256": "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.3"
-    },
-    "googleapis": {
-      "dependency": "transitive",
-      "description": {
-        "name": "googleapis",
-        "sha256": "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "13.2.0"
-    },
-    "googleapis_auth": {
-      "dependency": "transitive",
-      "description": {
-        "name": "googleapis_auth",
-        "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.6.0"
-    },
     "graphs": {
       "dependency": "transitive",
       "description": {
@@ -988,11 +878,11 @@
       "dependency": "direct main",
       "description": {
         "name": "html",
-        "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.5"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "transitive",
@@ -1058,11 +948,11 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -1078,11 +968,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
+        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+21"
+      "version": "0.8.12+23"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
@@ -1108,11 +998,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
@@ -1234,16 +1124,6 @@
       "source": "hosted",
       "version": "5.1.1"
     },
-    "liquid_engine": {
-      "dependency": "transitive",
-      "description": {
-        "name": "liquid_engine",
-        "sha256": "41ae12d5a72451c3efb8d4e7b901cdf0537917597bc7e7376e9b0a237f92df29",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.2"
-    },
     "local_auth": {
       "dependency": "transitive",
       "description": {
@@ -1258,11 +1138,11 @@
       "dependency": "transitive",
       "description": {
         "name": "local_auth_android",
-        "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92",
+        "sha256": "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.46"
+      "version": "1.0.49"
     },
     "local_auth_darwin": {
       "dependency": "transitive",
@@ -1374,26 +1254,6 @@
       "source": "hosted",
       "version": "2.0.0"
     },
-    "msix": {
-      "dependency": "transitive",
-      "description": {
-        "name": "msix",
-        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.16.8"
-    },
-    "mustache_template": {
-      "dependency": "transitive",
-      "description": {
-        "name": "mustache_template",
-        "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
     "nested": {
       "dependency": "transitive",
       "description": {
@@ -1407,32 +1267,23 @@
     "openai_dart": {
       "dependency": "direct main",
       "description": {
-        "name": "openai_dart",
-        "sha256": "1cc5ed0915fa7572b943de01cfa7a3e5cfe1e6a7f4d0d9a9374d046518e84575",
-        "url": "https://pub.dev"
+        "path": "packages/openai_dart",
+        "ref": "v1.0.744",
+        "resolved-ref": "ceb38486df0a49fddb4cb5a3283e566d4462f8ac",
+        "url": "https://github.com/lollipopkit/langchain_dart"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "0.4.5"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
-    },
-    "parse_app_package": {
-      "dependency": "transitive",
-      "description": {
-        "name": "parse_app_package",
-        "sha256": "69f313fbadf457576015333a8da2e99018763dce88df248febcfb8883da8aedb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
+      "version": "2.2.0"
     },
     "path": {
       "dependency": "transitive",
@@ -1468,11 +1319,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1534,16 +1385,6 @@
       "source": "hosted",
       "version": "3.1.6"
     },
-    "plist_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plist_parser",
-        "sha256": "e2a6f9abfa0c45c0253656b7360abb0dfb84af9937bace74605b93d2aad2bf0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.0.11"
-    },
     "plugin_platform_interface": {
       "dependency": "transitive",
       "description": {
@@ -1574,35 +1415,45 @@
       "source": "hosted",
       "version": "1.5.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.2"
+    },
     "pretty_qr_code": {
       "dependency": "transitive",
       "description": {
         "name": "pretty_qr_code",
-        "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5",
+        "sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0"
+      "version": "3.4.0"
     },
     "provider": {
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.4"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
@@ -1614,16 +1465,6 @@
       "source": "hosted",
       "version": "1.5.0"
     },
-    "qiniu_sdk_base": {
-      "dependency": "transitive",
-      "description": {
-        "name": "qiniu_sdk_base",
-        "sha256": "2506c6372512f81cfbddf162ea6da1ad7b1c6521dee1d10e9da6847c92e13349",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.2"
-    },
     "qr": {
       "dependency": "transitive",
       "description": {
@@ -1644,15 +1485,25 @@
       "source": "hosted",
       "version": "0.9.11"
     },
-    "recase": {
+    "riverpod": {
       "dependency": "transitive",
       "description": {
-        "name": "recase",
-        "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213",
+        "name": "riverpod",
+        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "2.6.1"
+    },
+    "riverpod_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "riverpod_annotation",
+        "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1738,21 +1589,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences",
-        "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.2"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1824,26 +1675,6 @@
       "source": "hosted",
       "version": "3.0.0"
     },
-    "shell_executor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shell_executor",
-        "sha256": "9c024546fc96470a6b96be9902f0bc05347a017a7638ed8d93c77e8d77eb3c3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.6"
-    },
-    "shell_uikit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shell_uikit",
-        "sha256": "03703090807091514ace2f9c8dc5d9b2d18c42a248c767220167825fbc3d2747",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
-    },
     "shortid": {
       "dependency": "direct main",
       "description": {
@@ -1890,6 +1721,16 @@
       "source": "hosted",
       "version": "1.10.1"
     },
+    "sprintf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sprintf",
+        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.0"
+    },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
@@ -1900,6 +1741,16 @@
       "source": "hosted",
       "version": "1.12.1"
     },
+    "state_notifier": {
+      "dependency": "transitive",
+      "description": {
+        "name": "state_notifier",
+        "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
@@ -2004,21 +1855,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2054,11 +1905,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2074,11 +1925,11 @@
       "dependency": "transitive",
       "description": {
         "name": "uuid",
-        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
+        "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.7"
+      "version": "4.5.1"
     },
     "vector_graphics": {
       "dependency": "transitive",
@@ -2144,52 +1995,51 @@
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.0"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
-    "webdav_client": {
+    "webdav_client_plus": {
       "dependency": "direct main",
       "description": {
-        "path": ".",
-        "ref": "v1.0.66",
-        "resolved-ref": "1908cd0f4909730d9ae4d4fc4c05fb2576b3f674",
-        "url": "https://github.com/lollipopkit/webdav_client"
+        "name": "webdav_client_plus",
+        "sha256": "0f992fe05a46674a800d9fd8fdc5c54952ff739da155c558776a62ca0c2bed3a",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.2"
+      "source": "hosted",
+      "version": "1.0.2"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef",
+        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.11.0"
+      "version": "5.12.0"
     },
     "window_manager": {
       "dependency": "transitive",
@@ -2244,6 +2094,6 @@
   },
   "sdks": {
     "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "flutter": ">=3.29.0"
   }
 }
diff --git a/pkgs/by-name/gp/gpt-box/update-gitHashes.py b/pkgs/by-name/gp/gpt-box/update-gitHashes.py
new file mode 100755
index 000000000000..ffa6feb66653
--- /dev/null
+++ b/pkgs/by-name/gp/gpt-box/update-gitHashes.py
@@ -0,0 +1,51 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3 nix-prefetch-git
+
+import json
+import subprocess
+import sys
+from pathlib import Path
+
+THIS_FOLDER = Path(__file__).parent.resolve()
+PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
+GIT_HASHES = THIS_FOLDER / "gitHashes.json"
+
+
+def fetch_git_hash(url: str, rev: str) -> str:
+    result = subprocess.run(
+        ["nix-prefetch-git", "--url", url, "--rev", rev],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return json.loads(result.stdout)["hash"]
+
+
+def main() -> None:
+    if not PUBSPEC_LOCK.exists():
+        sys.exit(1)
+    try:
+        data = json.loads(PUBSPEC_LOCK.read_text())
+    except json.JSONDecodeError:
+        sys.exit(1)
+    output: dict[str, str] = {}
+    for name, info in data.get("packages", {}).items():
+        if info.get("source") != "git":
+            continue
+        desc = info.get("description")
+        if not isinstance(desc, dict):
+            continue
+        url = desc.get("url")
+        rev = desc.get("resolved-ref")
+        if not (isinstance(url, str) and isinstance(rev, str)):
+            continue
+        try:
+            package_hash = fetch_git_hash(url, rev)
+        except subprocess.CalledProcessError:
+            continue
+        output[name] = package_hash
+    GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix
index 02ef35d1ab9f..ac4b748d7b49 100644
--- a/pkgs/by-name/gp/gpu-burn/package.nix
+++ b/pkgs/by-name/gp/gpu-burn/package.nix
@@ -6,7 +6,6 @@
   lib,
 }:
 let
-  inherit (lib.attrsets) getBin;
   inherit (lib.lists) last map optionals;
   inherit (lib.trivial) boolToString;
   inherit (config) cudaSupport;
@@ -36,7 +35,11 @@ backendStdenv.mkDerivation {
     substituteInPlace gpu_burn-drv.cpp \
       --replace-fail \
         '#define COMPARE_KERNEL "compare.ptx"' \
-        "#define COMPARE_KERNEL \"$out/share/compare.ptx\""
+        '#define COMPARE_KERNEL "${placeholder "out"}/share/compare.ptx"'
+    substituteInPlace Makefile \
+      --replace-fail \
+        '${''''${CUDAPATH}/bin/nvcc''}' \
+        '${lib.getExe cuda_nvcc}'
   '';
 
   nativeBuildInputs = [
@@ -52,7 +55,8 @@ backendStdenv.mkDerivation {
   ];
 
   makeFlags = [
-    "CUDAPATH=${getBin cuda_nvcc}"
+    # NOTE: CUDAPATH assumes cuda_cudart is a single output containing all of lib, dev, and stubs.
+    "CUDAPATH=${cuda_cudart}"
     "COMPUTE=${last (map dropDots cudaCapabilities)}"
     "IS_JETSON=${boolToString isJetsonBuild}"
   ];
diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index eb80840fe718..b329ec7ef61d 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -28,12 +28,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/${pname}";
     tag = version;
-    hash = "sha256-H9aJ0JglYckd/+6E7dfRzoAUpsTBX8XmI2TR1907sPI=";
+    hash = "sha256-VAb7YAPZVe23qqoGgY8wPR+PwPHuWUmlcixoLOW/H5A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index 0de781b67b92..d75593ba9f25 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "14.1";
+  version = "15.1";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-wXlmly2KtjyY5hdBAroP3H93+1tg5rtFPpDKFn3jnhA=";
+    hash = "sha256-KH3FZAvcDMRfUwx8I8GOx4tSpIv8kzgYo0NV5Tq5qYo=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/gp/gpython/package.nix b/pkgs/by-name/gp/gpython/package.nix
index 2891dd308d86..1358e3f9f2d1 100644
--- a/pkgs/by-name/gp/gpython/package.nix
+++ b/pkgs/by-name/gp/gpython/package.nix
@@ -44,6 +44,6 @@ buildGoModule rec {
     homepage = "https://github.com/go-python/gpython";
     changelog = "https://github.com/go-python/gpython/releases/tag/${src.rev}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix
index 708fcf107ded..d84408587a9f 100644
--- a/pkgs/by-name/gq/gql/package.nix
+++ b/pkgs/by-name/gq/gql/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/AmrDeveloper/GQL";
     changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "gitql";
   };
 }
diff --git a/pkgs/by-name/gr/gradescope-submit/package.nix b/pkgs/by-name/gr/gradescope-submit/package.nix
index 8cd424e93907..b17350bedc48 100644
--- a/pkgs/by-name/gr/gradescope-submit/package.nix
+++ b/pkgs/by-name/gr/gradescope-submit/package.nix
@@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage rec {
     description = "Small script to submit to Gradescope via GitHub";
     homepage = "https://github.com/nmittu/gradescope-submit";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "submit";
   };
 }
diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix
index 1a67b9c278df..67c9555f9bb7 100644
--- a/pkgs/by-name/gr/gradle-completion/package.nix
+++ b/pkgs/by-name/gr/gradle-completion/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gradle-completion";
-  version = "1.4.1";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "gradle";
     repo = "gradle-completion";
-    rev = "v${finalAttrs.version}";
-    sha256 = "15b0692i3h8h7b95465b2aw9qf5qjmjag5n62347l8yl7zbhv3l2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HY/woUOzkRVb6ekIaQrY1+5pKxd5+cpG74+xqzpkazs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index c39c9f33df0d..86423689c708 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-HWnldpmt5M2+2zuEcA4doySgRyCBl4OnCCuXqtcYGkA=";
+    hash = "sha256-yO1r7GLXlD7f5Fpooit7SwkB7EB1hDO42o3BLvWY8Qo=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 7fb8cc669cdb..c7bfe7fbae66 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.5.6";
+  version = "3.5.8";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-Nm3DQ8LvKTFmK2Wi3rvDM+kJBq++Rm4zrajlp01SdIg=";
+    hash = "sha256-BTAjlA8jk75tkgUpSJrEe4m9aVUav3eeTk7IjT2AYlY=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
index 28ee2c72b09b..81f057479a2e 100644
--- a/pkgs/by-name/gr/grafanactl/package.nix
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafanactl";
-  version = "0.1.5";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafanactl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XHcNyPSN01CGkuj9p54yAAWFlwoWLF6cm5Q2f8iZtVM=";
+    hash = "sha256-6fyjawZsqP2+F3ZhIVf9KVus37/Ezi4GcE9Ywi5yzhk=";
   };
 
-  vendorHash = "sha256-fHlktADqw3p377g3vXr2LZdBfWfNZOHxnp9H8/C31Gg=";
+  vendorHash = "sha256-wIp05nwc4MICkNFoEAjOd4kjs1RE7RpINcdYzIdq4YY=";
 
   ldflags = [
     "-X main.version=v${finalAttrs.version}"
diff --git a/pkgs/by-name/gr/graphhopper/version.toml b/pkgs/by-name/gr/graphhopper/version.toml
index 3bd74b1906c9..64b95b5ab207 100644
--- a/pkgs/by-name/gr/graphhopper/version.toml
+++ b/pkgs/by-name/gr/graphhopper/version.toml
@@ -1,8 +1,8 @@
-major = "10.0"
-patch = "10.2"
-mapsBundle = "0.0.0-4718098d1db1798841a4d12f1727e8e8f7eab202"
+major = "11.0"
+patch = "11.0"
+mapsBundle = "0.0.0-f171bcf55e447bf494348dd274cd377b73c951f6"
 
 [hash]
-src = "sha256-E6G9JR1lrXhNJ4YgMM0n0RsQcMZQM2QldGc74f5FALo="
-mapsBundle = "sha256-jZTNJfmMWJQHpJ8um3yTBx/KtIfdr0EwKJ9kSFalWJQ="
-mvnDeps = "sha256-KidbIBnW//IiKPFy3plFWOED8gP/ZCg4buwMgzttaY8="
+src = "sha256-tK8zEX2szcU77ydHW+ak/GTjKKC6C5xlG0Uum7a/76I="
+mapsBundle = "sha256-ehwWBIuYBwXu7W7uHYYuGl0lS4s6Tm5c4BfKPkY+w0A="
+mvnDeps = "sha256-0B38C37QbkOhxd5e4SHfMg9SqcUZkuIf1g1S9SnCu7U="
diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
index d9695307c659..e69d407354b0 100644
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@withgraphite/graphite-cli",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@withgraphite/graphite-cli",
-      "version": "1.7.1",
+      "version": "1.7.2",
       "hasInstallScript": true,
       "license": "None",
       "dependencies": {
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index 526dc0518f76..6ca571867814 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -9,14 +9,14 @@
 
 buildNpmPackage rec {
   pname = "graphite-cli";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-kRXL88ZtOhO2pW9VuMfKPvW9pPJ5RsBKDxPDBzbd8zo=";
+    hash = "sha256-FoQvtywam4AXAavRtwfoTMaaMijW67hp317VLupCaCI=";
   };
 
-  npmDepsHash = "sha256-3nr5Q7OyKAVwoG8znf4YT8U0U0nkrvE6M/peKuNtMcw=";
+  npmDepsHash = "sha256-POWRxgrny27+7ymrhP5iFPBYzCmjCDWB8jGmOSieq0k=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
index e91f3485181b..7c87ce9a3d71 100644
--- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
@@ -3,7 +3,6 @@
   stdenvNoCC,
   fetchFromGitHub,
   gitUpdater,
-  gnome-themes-extra,
   gtk-engine-murrine,
   jdupes,
   sassc,
@@ -76,10 +75,6 @@ lib.checkListOfEnum "${pname}: theme variants"
       sassc
     ];
 
-    buildInputs = [
-      gnome-themes-extra
-    ];
-
     propagatedUserEnvPkgs = [
       gtk-engine-murrine
     ];
diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix
index e578318e7296..e115a0b5c5ce 100644
--- a/pkgs/by-name/gr/grass-sass/package.nix
+++ b/pkgs/by-name/gr/grass-sass/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
       replaceStrings [ "." ] [ "" ] version
     }";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "grass";
   };
 }
diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix
index 0f2fa5f4c49b..97bba7bfb987 100644
--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.7.49.5";
+  version = "1.7.50.3";
 in
 stdenvNoCC.mkDerivation {
   pname = "grav";
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-zhjsYWma0qze8zdzX01EauzMONeEC6TRkhdQJUoJEUQ=";
+    hash = "sha256-W4JuW5NEko38AbLrLOGWYsRvehPV7+tX2Hq1tTZ22EY=";
   };
 
   patches = [
diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/by-name/gr/greg/package.nix
similarity index 53%
rename from pkgs/applications/audio/greg/default.nix
rename to pkgs/by-name/gr/greg/package.nix
index 44bd16adf092..da9eca5d24ff 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/by-name/gr/greg/package.nix
@@ -1,34 +1,33 @@
 {
   lib,
   fetchFromGitHub,
-  pythonPackages,
+  python3Packages,
 }:
 
-with pythonPackages;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "greg";
   version = "0.4.8";
   format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = !python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "manolomartinez";
     repo = "greg";
     tag = "v${version}";
-    sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
+    hash = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
   };
 
   propagatedBuildInputs = [
-    setuptools
-    feedparser
+    python3Packages.setuptools
+    python3Packages.feedparser
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/manolomartinez/greg";
     description = "Command-line podcast aggregator";
     mainProgram = "greg";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ edwtjo ];
   };
 }
diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix
index 05a4a801f451..11800e875185 100644
--- a/pkgs/by-name/gr/gridlock/package.nix
+++ b/pkgs/by-name/gr/gridlock/package.nix
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage {
     description = "Nix compatible lockfile manager, without Nix";
     homepage = "https://github.com/lf-/gridlock";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix
index 9d2f313b4388..c90d80c73485 100644
--- a/pkgs/by-name/gr/grip-search/package.nix
+++ b/pkgs/by-name/gr/grip-search/package.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
index a0b24a86b2fa..007f8d564c82 100644
--- a/pkgs/by-name/gr/grml-zsh-config/package.nix
+++ b/pkgs/by-name/gr/grml-zsh-config/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "grml-zsh-config";
-  version = "0.19.24";
+  version = "0.19.25";
 
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
     rev = "v${version}";
-    sha256 = "sha256-DUkj/5LD85h3J+PIVAfsGY0fkktAgWn93Y3hnRrn/wk=";
+    sha256 = "sha256-jUdgigqK6j7Tn/Gl737iNSitUyp7uWrXfRyCBxUSD/0=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix
index ee2b76bd91a4..94fc34a56679 100644
--- a/pkgs/by-name/gr/grocy/package.nix
+++ b/pkgs/by-name/gr/grocy/package.nix
@@ -19,7 +19,7 @@ php.buildComposerProject2 (finalAttrs: {
     hash = "sha256-MnN6TIkNZWT+pAQf0+z5l3hj/7K/d3BfI7VAaUEKG8s=";
   };
 
-  vendorHash = "sha256-n+6yNXqarWRZt6VEuHrFe3nrTiGeHnkURmO2UuB/BVc=";
+  vendorHash = "sha256-6vWV8+4tETUFBLeEoG7d8lHKILXvM7ezWbDiG11GA/s=";
 
   offlineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix
index 3a630129a926..513623136cd1 100644
--- a/pkgs/by-name/gr/groonga/package.nix
+++ b/pkgs/by-name/gr/groonga/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "groonga";
-  version = "15.1.5";
+  version = "15.1.7";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz";
-    hash = "sha256-dRO9QBQCIVJlFhNZjVZwoiEIesIBrkZWNSOwzgkOnkY=";
+    hash = "sha256-iZpBSgY291aNGhGEX+PddbcB9yEGp6JvMLyVCvWHZhY=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gr/groovy/package.nix b/pkgs/by-name/gr/groovy/package.nix
index f42e3044250e..d61f411f2fb9 100644
--- a/pkgs/by-name/gr/groovy/package.nix
+++ b/pkgs/by-name/gr/groovy/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "groovy";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchurl {
     url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip";
-    sha256 = "sha256-vmahfzT2n0c7I5WOvuB3Doiq9zXXm6liRUN1w40oVKU=";
+    sha256 = "sha256-cPgvEbG3ZOIH3PVWiILHjcdyk/MHgWJCOUo/enTyDoE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix
index 6c6ea6a78097..b3bcce67aa8a 100644
--- a/pkgs/by-name/gr/grpc-gateway/package.nix
+++ b/pkgs/by-name/gr/grpc-gateway/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "grpc-gateway";
-  version = "2.27.2";
+  version = "2.27.3";
 
   src = fetchFromGitHub {
     owner = "grpc-ecosystem";
     repo = "grpc-gateway";
     tag = "v${version}";
-    sha256 = "sha256-NWMpCPtZZVa53SR8NqSaDpo6fauB3hHb1PeqNs0OO+M=";
+    sha256 = "sha256-NXcfr/+VZnYlK5A/RuTboB33WadoutG7GnACfrWBvwg=";
   };
 
-  vendorHash = "sha256-NYiHnarNAndE3QIKPI51plWNNB9kP2DlpYgW43Uw/gw=";
+  vendorHash = "sha256-EgFB5ADytn9h8P2CrM9mr5siX5G4+8HGyWt/upp3yHg=";
 
   ldflags = [
     "-X=main.version=${version}"
diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index f52a2cdfb1a5..2763b6a619f6 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -25,7 +25,7 @@
 # nixpkgs-update: no auto update
 stdenv.mkDerivation rec {
   pname = "grpc";
-  version = "1.75.0"; # N.B: if you change this, please update:
+  version = "1.76.0"; # N.B: if you change this, please update:
   # pythonPackages.grpcio
   # pythonPackages.grpcio-channelz
   # pythonPackages.grpcio-health-checking
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "grpc";
     repo = "grpc";
     tag = "v${version}";
-    hash = "sha256-2SeL/O6FaAnrPXMHAPKCSzx3hlcKLuC5y+ljJ1gewkE=";
+    hash = "sha256-f25ccZC0pJw00ETgxBtXU6+0OnlJsV7zXjK/ayiCIJY=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
index 512b1623cc88..61a638bc6447 100644
--- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-09-09";
+    version = "0-unstable-2025-10-23";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Gruvbox-GTK-Theme";
-      rev = "4a8a67574ef227efa9c129ce57d510c2634d53e5";
-      hash = "sha256-cass0sAc6/FzNF/R8HjjGU6mFigD6hjZR/R1Nj+tk38=";
+      rev = "578cd220b5ff6e86b078a6111d26bb20ec8c733f";
+      hash = "sha256-RXoPj/aj9OCTIi8xWatG0QpDAUh102nFOipdSIiqt7o=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index 5cbf85382a4a..48dff5c9d590 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -6,17 +6,18 @@
   git,
   installShellFiles,
   openssl,
+  net-tools,
 }:
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.100.0";
+  version = "0.103.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-POGGhZ2uTqWjUsl1zR4eirb+Daji+igTtUNwTte7gPA=";
+    hash = "sha256-AXhpdEJ0T0GF9DamboT+V4ivadzR3+7HpLQs8O1QTAQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -31,13 +32,14 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-QGGY88CELV9e5UxtfDXKmShnKiP8i+0f8iA9pOTirzc=";
+  vendorHash = "sha256-aoqjzF4CSzBZxvAz0vMR4ztUvpLewYi7sSCeSlSiLd0=";
 
   nativeBuildInputs = [ installShellFiles ];
 
   nativeCheckInputs = [
     git
     openssl
+    net-tools
   ];
 
   subPackages = [ "cmd/grype" ];
diff --git a/pkgs/by-name/gs/gscan2pdf/package.nix b/pkgs/by-name/gs/gscan2pdf/package.nix
index c0ac37768c9d..3091f396e1b0 100644
--- a/pkgs/by-name/gs/gscan2pdf/package.nix
+++ b/pkgs/by-name/gs/gscan2pdf/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchurl,
+  fetchpatch,
   perlPackages,
   wrapGAppsHook3,
   # libs
@@ -17,18 +18,17 @@
   pdftk,
   # test dependencies
   xvfb-run,
-  liberation_ttf,
   file,
-  tesseract3,
+  tesseract,
 }:
 
 perlPackages.buildPerlPackage rec {
   pname = "gscan2pdf";
-  version = "2.13.4";
+  version = "2.13.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/gscan2pdf/gscan2pdf-${version}.tar.xz";
-    hash = "sha256-4HcTkVJBscBb8AxeN6orMQFVR0w4hFfkGhxQOzP3mWk=";
+    hash = "sha256-DUME9nI9B2+Gj+sBPj176SXfuxDc3CMXfby/Zga31fo=";
   };
 
   patches = [
@@ -74,18 +74,11 @@ perlPackages.buildPerlPackage rec {
     SubOverride
   ]);
 
-  postPatch =
-    let
-      fontSubstitute = "${liberation_ttf}/share/fonts/truetype/LiberationSans-Regular.ttf";
-    in
-    ''
-      # Required for the program to properly load its SVG assets
-      substituteInPlace bin/gscan2pdf \
-        --replace "/usr/share" "$out/share"
-
-      # Substitute the non-free Helvetica font in the tests
-      sed -i 's|-pointsize|-font ${fontSubstitute} -pointsize|g' t/*.t
-    '';
+  # Required for the program to properly load its SVG assets
+  postPatch = ''
+    substituteInPlace bin/gscan2pdf \
+      --replace-fail "/usr/share" "$out/share"
+  '';
 
   postInstall = ''
     # Remove impurity
@@ -123,33 +116,13 @@ perlPackages.buildPerlPackage rec {
 
     xvfb-run
     file
-    tesseract3 # tests are expecting tesseract 3.x precisely
+    tesseract
   ]
   ++ (with perlPackages; [
     TestPod
   ]);
 
   checkPhase = ''
-    # Temporarily disable a dubiously failing test:
-    # t/169_import_scan.t ........................... 1/1
-    # #   Failed test 'variable-height scan imported with expected size'
-    # #   at t/169_import_scan.t line 50.
-    # #          got: '179'
-    # #     expected: '296'
-    # # Looks like you failed 1 test of 1.
-    # t/169_import_scan.t ........................... Dubious, test returned 1 (wstat 256, 0x100)
-    rm t/169_import_scan.t
-
-    # Disable a test failing because of a warning interfering with the pinned output
-    # t/3722_user_defined.t ......................... 1/2
-    #   Failed test 'user_defined caught error injected in queue'
-    #   at t/3722_user_defined.t line 41.
-    #          got: 'error
-    # WARNING: The convert command is deprecated in IMv7, use "magick" instead of "convert" or "magick convert"'
-    #     expected: 'error'
-    # Looks like you failed 1 test of 2.
-    rm t/3722_user_defined.t
-
     export XDG_CACHE_HOME="$(mktemp -d)"
     xvfb-run -s '-screen 0 800x600x24' \
       make test
diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix
index d7f5b0cc7899..f8a873468d72 100644
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gscreenshot";
-  version = "3.10.0";
+  version = "3.11.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "thenaterhood";
     repo = "gscreenshot";
     tag = "v${version}";
-    sha256 = "sha256-y5G2eJ5G6FpH01n1/YTcjPh6u58N0nJO6gcC9yEr+84=";
+    sha256 = "sha256-ZdywZhH59L5fk1EB+o6fSj9zCOljS7T/HWpUd2tTl0o=";
   };
 
   # needed for wrapGAppsHook3 to function
diff --git a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
index cb40b950a43e..cbeece5a07aa 100644
--- a/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
+++ b/pkgs/by-name/gs/gsettings-desktop-schemas/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gsettings-desktop-schemas";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-5o8VWBO/GPhlqLLI6dRzWItsytyvu2Zqt4iFfGwtG9M=";
+    hash = "sha256-kSkFzEU4KIikdwLtEQHGsI69ASKjKmfZQKuBFqlsUg0=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/gs/gss/package.nix b/pkgs/by-name/gs/gss/package.nix
index 8c45bf33b43b..cbe7445f7e2b 100644
--- a/pkgs/by-name/gs/gss/package.nix
+++ b/pkgs/by-name/gs/gss/package.nix
@@ -1,9 +1,17 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  autoreconfHook,
+  fetchzip,
+  autoconf,
+  automake,
+  gengetopt,
+  gettext,
+  gnulib,
   gtk-doc,
+  help2man,
+  libtool,
+  perl,
+  texinfo,
   withShishi ? !stdenv.hostPlatform.isDarwin,
   shishi,
 }:
@@ -12,9 +20,24 @@ stdenv.mkDerivation rec {
   pname = "gss";
   version = "1.0.4";
 
-  src = fetchurl {
-    url = "mirror://gnu/gss/gss-${version}.tar.gz";
-    hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM=";
+  # The dist tarballs do not contain everything necessary to
+  # autoreconf.  Trying to use autoreconfHook with a dist tarball
+  # produces a broken result that fails to build for some platforms.
+  # If we want to autoreconf, we need to build from a git snapshot.
+  #
+  # See this explanation from the maintainer, about an existing
+  # package that exhibits the same problem (that we were able to
+  # produce when building for Darwin an musl.)
+  #
+  # https://lists.gnu.org/archive/html/help-libidn/2021-07/msg00009.html
+  src = fetchzip {
+    url = "https://gitweb.git.savannah.gnu.org/gitweb/?p=gss.git;a=snapshot;h=v${version};sf=tgz";
+    extension = "tar.gz";
+    hash = "sha256-yT19kwAhGzbIoMjRbrrsn6CyvkMH5v1nxxWpnGYmZUw=";
+  };
+
+  env = {
+    GNULIB_SRCDIR = gnulib.src;
   };
 
   # krb5context test uses certificates that expired on 2024-07-11.
@@ -24,15 +47,22 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    autoreconfHook
+    autoconf
+    automake
+    gengetopt
+    gettext
     gtk-doc
+    help2man
+    libtool
+    perl
+    texinfo
   ];
 
   buildInputs = lib.optional withShishi shishi;
 
-  # ./stdint.h:89:5: error: expected value in expression
-  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    export GNULIBHEADERS_OVERRIDE_WINT_T=0
+  preConfigure = ''
+    patchShebangs doc/gdoc
+    ./autogen.sh
   '';
 
   configureFlags = [
diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix
index 946782f8e0ff..9e2069a3a996 100644
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   meson,
   ninja,
-  adwaita-icon-theme,
   exiv2,
   libheif,
   libjpeg,
@@ -22,8 +21,10 @@
   libX11,
   lcms2,
   bison,
+  brasero,
   flex,
   clutter-gtk,
+  colord,
   wrapGAppsHook3,
   shared-mime-info,
   python3,
@@ -33,13 +34,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gthumb";
-  version = "3.12.7";
+  version = "3.12.8.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-7hLSTPIxAQJB91jWyVudU6c4Enj6dralGLPQmzce+uw=";
+    sha256 = "sha256-JzYvwRylxYHzFoIjDJUCDlofzd9M/+vnVVeCjGF021s=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     bison
     desktop-file-utils
@@ -53,10 +56,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    brasero
     clutter-gtk
+    colord
     exiv2
     glib
-    adwaita-icon-theme
     gsettings-desktop-schemas
     gst_all_1.gst-plugins-base
     (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
@@ -75,14 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
   ];
 
-  mesonFlags = [
-    "-Dlibjxl=true"
-    # Depends on libsoup2.
-    # https://gitlab.gnome.org/GNOME/gthumb/-/issues/244
-    "-Dlibchamplain=false"
-    "-Dwebservices=false"
-  ];
-
   postPatch = ''
     chmod +x gthumb/make-gthumb-h.py
 
diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix
index 716b2fa57947..50f5cdacbfc6 100644
--- a/pkgs/by-name/gt/gtk-doc/package.nix
+++ b/pkgs/by-name/gt/gtk-doc/package.nix
@@ -16,7 +16,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gtk-doc";
-  version = "1.34.0";
+  version = "1.35.1";
 
   outputDevdoc = "out";
 
@@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "GNOME";
     repo = "gtk-doc";
     rev = version;
-    hash = "sha256-Jt6d5wbhAoSQ2sWyYWW68Y81duc3+QOJK/5JR/lCmnQ=";
+    hash = "sha256-EqU7lnBnOn3gR3hT95yjdTUb3cqX2XJK5UAKsFw2Q10=";
   };
 
   patches = [
diff --git a/pkgs/by-name/gt/gtk-frdp/package.nix b/pkgs/by-name/gt/gtk-frdp/package.nix
index 9196214e4616..1a4c228b398d 100644
--- a/pkgs/by-name/gt/gtk-frdp/package.nix
+++ b/pkgs/by-name/gt/gtk-frdp/package.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation {
   pname = "gtk-frdp";
-  version = "0-unstable-2025-03-14";
+  version = "0-unstable-2025-08-15";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "gtk-frdp";
-    rev = "a0187fa02e1ff249e9583e8c09a2c2f5915ce2a3";
-    hash = "sha256-oi4Iwi9/elfUDKK0IhoNgtS8ORIzVUBagqBVdNRxGjI=";
+    rev = "b59dc88624511311576dca607d3cb9317569de34";
+    hash = "sha256-6zCaegBshOLQWeHtUYOaofbUVK797vyn5bdpwHD0Z/s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gt/gtkgnutella/package.nix b/pkgs/by-name/gt/gtkgnutella/package.nix
index c27d79e5be10..eaaf9a136916 100644
--- a/pkgs/by-name/gt/gtkgnutella/package.nix
+++ b/pkgs/by-name/gt/gtkgnutella/package.nix
@@ -67,5 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ maintainers.doronbehar ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index e8c30a0a0c39..ccb8c8764aef 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gtree";
-  version = "1.11.8";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
     rev = "v${version}";
-    hash = "sha256-IBsfE0Y/LzXIaQdbXv1ZOslwj2U5fAhYIo67BixwDMY=";
+    hash = "sha256-wb7VzjAxcxFDOquYd1P9jcqR0ivBIuEUZ1R/812w7Ew=";
   };
 
-  vendorHash = "sha256-jGFEKwe0eglsj3U2jdlfMKYsMvwSu/z0EX+heCKQP0c=";
+  vendorHash = "sha256-3r3nriiOtKX6pzSpAI4ro1VqcQRTArocEuleqhYKOj0=";
 
   subPackages = [
     "cmd/gtree"
@@ -42,6 +42,6 @@ buildGoModule rec {
     homepage = "https://github.com/ddddddO/gtree";
     changelog = "https://github.com/ddddddO/gtree/releases/tag/${src.rev}";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gu/gucharmap/package.nix b/pkgs/by-name/gu/gucharmap/package.nix
index 9eec9079f8e2..e84aea3306d3 100644
--- a/pkgs/by-name/gu/gucharmap/package.nix
+++ b/pkgs/by-name/gu/gucharmap/package.nix
@@ -47,7 +47,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gucharmap";
-  version = "16.0.2";
+  version = "17.0.0";
 
   outputs = [
     "out"
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "gucharmap";
     rev = finalAttrs.version;
-    hash = "sha256-UaXgQIhAoI27iYWgZuZeO7Lv6J9pj06HPp0SZs/5abM=";
+    hash = "sha256-BYplW+gVTgWdXYW+h2g4xwxmFSl+WoygZfw8dug4qkw=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index af8eab5f403b..9e0b4fcf0533 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -16,13 +16,13 @@
 
 let
   pname = "gui-for-singbox";
-  version = "1.9.9";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "GUI-for-Cores";
     repo = "GUI.for.SingBox";
     tag = "v${version}";
-    hash = "sha256-6Y0eEJmPBp+J1r6LCxYEM6i3fdCYSo4LrimpqwOCVT8=";
+    hash = "sha256-oReDI6w+N82f+DSv1mPvr0hPG7CJ7CbIFljhSNQ86cI=";
   };
 
   metaCommon = {
@@ -50,7 +50,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 2;
-      hash = "sha256-kSIPkXD0Wxe8TaKDd4DUAL7pkQeU8xyLY9K3lFSAODI=";
+      hash = "sha256-gSgryNui5uXuJEKoojz+knZ8rlJpjaR2+XF3xTwV5YI=";
     };
 
     buildPhase = ''
@@ -87,7 +87,7 @@ buildGoModule {
       --subst-var out
   '';
 
-  vendorHash = "sha256-UArCB5U2bF5HXFDU1oCfm+SaURe6e9gyCx+UjtWI/ug=";
+  vendorHash = "sha256-3kQWCjxCom/Sb4RzRF55NsDfSA9F9mOLy9sYVFUaevY=";
 
   nativeBuildInputs = [
     autoPatchelfHook
diff --git a/pkgs/by-name/gu/guile-cairo/package.nix b/pkgs/by-name/gu/guile-cairo/package.nix
index de1c3da398d4..427c6f990611 100644
--- a/pkgs/by-name/gu/guile-cairo/package.nix
+++ b/pkgs/by-name/gu/guile-cairo/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
       management, exceptions, macros, and a dynamic programming environment.
     '';
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ vyp ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-fibers/package.nix b/pkgs/by-name/gu/guile-fibers/package.nix
index a2a6468941dd..2ce6fb26509b 100644
--- a/pkgs/by-name/gu/guile-fibers/package.nix
+++ b/pkgs/by-name/gu/guile-fibers/package.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/wingo/fibers";
     description = "Concurrent ML-like concurrency for Guile";
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ vyp ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix
index 395582e38218..9851d8a192b2 100644
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guile-hoot";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "spritely";
     repo = "hoot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3UWKSjJQnYh+06p+Oi0Fa0ul2T8QWemgNm9A0su5WQ=";
+    hash = "sha256-mthEqyVsBrFhwz29VwatbFp4QgGmZ9sDoyTpRIEsOmI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/gu/guile-lib/package.nix b/pkgs/by-name/gu/guile-lib/package.nix
index 2e327df9a259..90ecc8d5cab0 100644
--- a/pkgs/by-name/gu/guile-lib/package.nix
+++ b/pkgs/by-name/gu/guile-lib/package.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation rec {
     '';
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
-      vyp
       foo-dogsquared
     ];
     platforms = guile.meta.platforms;
diff --git a/pkgs/by-name/gu/guile-ncurses/package.nix b/pkgs/by-name/gu/guile-ncurses/package.nix
index 16272d275805..1c0504966ec9 100644
--- a/pkgs/by-name/gu/guile-ncurses/package.nix
+++ b/pkgs/by-name/gu/guile-ncurses/package.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
       panel, and menu.
     '';
     license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ vyp ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/guile-opengl/package.nix b/pkgs/by-name/gu/guile-opengl/package.nix
index f0ffc6586346..96be47683df7 100644
--- a/pkgs/by-name/gu/guile-opengl/package.nix
+++ b/pkgs/by-name/gu/guile-opengl/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.gnu.org/software/guile-opengl/";
     description = "Guile bindings for the OpenGL graphics API";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ vyp ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/by-name/gu/guile-sdl2/package.nix b/pkgs/by-name/gu/guile-sdl2/package.nix
index cc39d0fe299e..5e30eea7d9c0 100644
--- a/pkgs/by-name/gu/guile-sdl2/package.nix
+++ b/pkgs/by-name/gu/guile-sdl2/package.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [
       seppeljordan
-      vyp
     ];
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/gu/guile-xcb/package.nix b/pkgs/by-name/gu/guile-xcb/package.nix
index 44a59593d38c..3d375144d90c 100644
--- a/pkgs/by-name/gu/guile-xcb/package.nix
+++ b/pkgs/by-name/gu/guile-xcb/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation {
     homepage = "https://github.com/mwitmer/guile-xcb";
     description = "XCB bindings for Guile";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ vyp ];
+    maintainers = [ ];
     platforms = guile.meta.platforms;
   };
 }
diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index afbcd246a4af..20858d53c588 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -48,7 +48,10 @@ buildGoModule rec {
     homepage = "https://github.com/charmbracelet/gum";
     changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ maaslalani ];
+    maintainers = with lib.maintainers; [
+      maaslalani
+      savtrip
+    ];
     mainProgram = "gum";
   };
 }
diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix
index 7c64ef08745f..ef1dbf8a7f47 100644
--- a/pkgs/by-name/gu/gumbo/package.nix
+++ b/pkgs/by-name/gu/gumbo/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gumbo";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "gumbo-parser";
     repo = "gumbo-parser";
     rev = version;
-    hash = "sha256-QNzllJI0ZHRl8o3ktJq+rI8v4SUUJ3MJ6uIubqf1heI=";
+    hash = "sha256-8mri7mLZkuIZgzE6p0yc41bNNyzGTV9V90OiA/9TkkU=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];
diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix
index e1d23355789c..2e8ee141c156 100644
--- a/pkgs/by-name/gv/gvfs/package.nix
+++ b/pkgs/by-name/gv/gvfs/package.nix
@@ -11,7 +11,7 @@
   glib,
   udevSupport ? stdenv.hostPlatform.isLinux,
   libgudev,
-  udisks2,
+  udisks,
   libgcrypt,
   libcap,
   polkit,
@@ -49,11 +49,11 @@
 assert googleSupport -> gnomeSupport;
 stdenv.mkDerivation (finalAttrs: {
   pname = "gvfs";
-  version = "1.57.2";
+  version = "1.58.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-8Wvvjsof1sEX6F2wEdIekVZpeQ1VhnNJxfGykSmelYU=";
+    hash = "sha256-3ZvjaHPQ/LMJ64mo0nR3DOV2KHYoos8RG9OH4cNPGC8=";
   };
 
   patches = [
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals udevSupport [
     libgudev
-    udisks2
+    udisks
     fuse3
     libcdio
     samba
diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
index 5a037d1a4ef0..340f1b9a895c 100644
--- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
+++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  gcc13Stdenv,
   fetchFromGitHub,
   xorg,
   xorgproto,
@@ -8,16 +9,20 @@
   lv2,
   pkg-config,
 }:
-
-stdenv.mkDerivation rec {
+let
+  # see: https://github.com/brummer10/GxMatchEQ.lv2/issues/8
+  # Use gcc13 on Linux, but default stdenv (clang) elsewhere
+  buildStdenv = if stdenv.hostPlatform.isLinux then gcc13Stdenv else stdenv;
+in
+buildStdenv.mkDerivation (finalAttrs: {
   pname = "GxMatchEQ.lv2";
   version = "0.1";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "GxMatchEQ.lv2";
-    rev = "V${version}";
-    sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72";
+    rev = "V${finalAttrs.version}";
+    hash = "sha256-4jg6DYkNRuNuQpOnsZfwJAZljBmBRzS6NcJKjv+r7Ss=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -33,10 +38,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/brummer10/GxMatchEQ.lv2";
     description = "Matching Equalizer to apply EQ curve from one source to another source";
-    maintainers = [ maintainers.magnetophon ];
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    license = lib.licenses.gpl3;
   };
-}
+})
diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix
index 8eec731135f6..a73f5a770eef 100644
--- a/pkgs/by-name/h2/h2o/package.nix
+++ b/pkgs/by-name/h2/h2o/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "h2o";
-  version = "2.3.0-rolling-2025-09-24";
+  version = "2.3.0-rolling-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "h2o";
     repo = "h2o";
-    rev = "74012bb501f14e61e5ecc1e9860bd66ba6789e0d";
-    hash = "sha256-zEibiI3BdhaTty5vZ3PPXTbHIRLsE2iUiwI6hRZfy8A=";
+    rev = "562d7bd089173da03e71bc4c0824468751c5b411";
+    hash = "sha256-/P4S8ng1kQPPHNSNuqgLasu2c2Y9BD2Y9v0hlMiPCIM=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
index 64ea8cae77a6..719168c0f3e0 100644
--- a/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
+++ b/pkgs/by-name/ha/ha-mqtt-discoverable-cli/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ha-mqtt-discoverable-cli";
-  version = "0.21.1";
+  version = "0.22.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable-cli";
     tag = "v${version}";
-    hash = "sha256-nJS8JbitiMj9G2rfYeJpY1TOsDLspIWg2PvaEBPOW3Q=";
+    hash = "sha256-AUY7tIGYVH0wDywzkndRxFLQQfle816DGwMXkcvC/cs=";
   };
 
   pythonRelaxDeps = [ "ha-mqtt-discoverable" ];
diff --git a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
index 081e0b6db4e4..3e9f177e52db 100644
--- a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
+++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
@@ -5,7 +5,7 @@
   cmake,
   fetchFromGitHub,
   graphviz,
-  igraph,
+  igraph_0, # https://github.com/emsec/hal/issues/623
   llvmPackages,
   ninja,
   nlohmann_json,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     libsForQt5.qtsvg
     boost
     rapidjson
-    igraph
+    igraph_0
     nlohmann_json
     spdlog
     graphviz
diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 984c448e203f..ffa767e5e3ef 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "halloy";
-  version = "2025.9";
+  version = "2025.11";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = version;
-    hash = "sha256-yjia9tNNaXCTQFe8xfUeBYVHhW214AaOeCLFjAG703E=";
+    hash = "sha256-5cYTHb3KK5EiPv5P8GZOoQwSSIe0FO+qBnpvLZtuByI=";
   };
 
-  cargoHash = "sha256-GmcRm6/dvY3stjV2ON8NVlVWZ5m0LXa9Kv0gqycbRoY=";
+  cargoHash = "sha256-gGVclMEcvgdl3ZTiEdhW48xhC9/eONeHp0KX1lHKKxU=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index ee60138ce9f9..d2cba968efcb 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation rec {
   pname = "halo";
-  version = "2.21.9";
+  version = "2.21.10";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
-    hash = "sha256-VSpLdYA0wGcgV9a8w/aRohRCGdBjXmvvRVTIszHUnIE=";
+    hash = "sha256-AvQbD+1mlAV73WJ3uM/vIwwv/aiEkovUkxatH54chNA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix
index c339cdaffd9f..72e963e1a984 100644
--- a/pkgs/by-name/ha/halp/package.nix
+++ b/pkgs/by-name/ha/halp/package.nix
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "halp";
   };
 })
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 4c06d473ee3e..1ba5c143e19f 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  withAdjustor ? false,
 
   # dependencies
   systemd,
@@ -13,6 +14,7 @@
   lsof,
   btrfs-progs,
   util-linux,
+  adjustor,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "handheld-daemon";
@@ -79,14 +81,19 @@ python3Packages.buildPythonApplication rec {
     setuptools
   ];
 
-  dependencies = with python3Packages; [
-    evdev
-    pyserial
-    pyyaml
-    rich
-    setuptools
-    xlib
-  ];
+  dependencies =
+    with python3Packages;
+    [
+      evdev
+      pyserial
+      pyyaml
+      rich
+      setuptools
+      xlib
+    ]
+    ++ lib.optionals withAdjustor [
+      adjustor
+    ];
 
   # This package doesn't have upstream tests.
   doCheck = false;
diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index c352baf14319..cc5c4be08fc1 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -43,11 +43,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.2.6";
+  version = "3.2.8";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU=";
+    hash = "sha256-RnA/uUcg+SzOKwgEmkDZF2liA3umdohcVaVr2dYl58I=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/ha/har-to-k6/package.nix b/pkgs/by-name/ha/har-to-k6/package.nix
index a09cfb21d2b8..e7e1ff22ac46 100644
--- a/pkgs/by-name/ha/har-to-k6/package.nix
+++ b/pkgs/by-name/ha/har-to-k6/package.nix
@@ -8,13 +8,13 @@
 
 buildNpmPackage rec {
   pname = "har-to-k6";
-  version = "0.14.10";
+  version = "0.14.11";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "har-to-k6";
     tag = "v${version}";
-    hash = "sha256-eBy5rBZt9v8XFOSGQPhJWAGy2XuhyuG013A6ex2AxE4=";
+    hash = "sha256-ACt9MNxcEyfg7lkeFBK/KnssbI4jkER0Ua/llQWLpxU=";
   };
 
   dontNpmBuild = true;
diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index a2b4efeaa48a..f9a8e1403259 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.12";
+  version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wdUXLgmdxkWzvLCuIJSkos1z7nyETZv3mNzGtBBJVUM=";
+    hash = "sha256-86qRXxCLcmVpO/fdmVGxiqVFrAQYIFlNHLxnoBgY9+k=";
   };
 
-  vendorHash = "sha256-OJTyX+HXyC6avsgUCzEfU0ej493J8p77r59j+X/Vqwk=";
+  vendorHash = "sha256-Pj573V6S2LaytQMK0jGVyLMX/GBZ1GOmYV/LPO1ScS4=";
 
   excludedPackages = [
     "dagger"
diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
index 45245d730e5b..3e313da6a219 100644
--- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix
+++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
@@ -2,7 +2,7 @@
   lib,
   file,
   hare,
-  runCommandNoCC,
+  runCommand,
   writeText,
 }:
 let
@@ -13,7 +13,7 @@ let
     export fn main() void = void;
   '';
 in
-runCommandNoCC "${hare.pname}-cross-compilation-test"
+runCommand "${hare.pname}-cross-compilation-test"
   {
     nativeBuildInputs = [
       hare
diff --git a/pkgs/by-name/ha/hare/mime-module-test.nix b/pkgs/by-name/ha/hare/mime-module-test.nix
index 073ae09e3557..ef53bee8c3bc 100644
--- a/pkgs/by-name/ha/hare/mime-module-test.nix
+++ b/pkgs/by-name/ha/hare/mime-module-test.nix
@@ -1,6 +1,6 @@
 {
   hare,
-  runCommandNoCC,
+  runCommand,
   writeText,
 }:
 let
@@ -18,7 +18,7 @@ let
       };
   '';
 in
-runCommandNoCC "mime-module-test" { nativeBuildInputs = [ hare ]; } ''
+runCommand "mime-module-test" { nativeBuildInputs = [ hare ]; } ''
   HARECACHE="$(mktemp -d)"
   export HARECACHE
   readonly binout="test-bin"
diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
index 4db503b574b4..406e7b72065c 100644
--- a/pkgs/by-name/ha/hare/package.nix
+++ b/pkgs/by-name/ha/hare/package.nix
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://harelang.org/";
     description = "Systems programming language designed to be simple, stable, and robust";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ onemoresuza ];
+    maintainers = [ ];
     mainProgram = "hare";
     inherit (harec.meta) platforms badPlatforms;
   };
diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix
index 73257d0296ad..046bef8274a5 100644
--- a/pkgs/by-name/ha/harec/package.nix
+++ b/pkgs/by-name/ha/harec/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://harelang.org/";
     description = "Bootstrapping Hare compiler written in C for POSIX systems";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ onemoresuza ];
+    maintainers = [ ];
     mainProgram = "harec";
     # The upstream developers do not like proprietary operating systems; see
     # https://harelang.org/platforms/
diff --git a/pkgs/by-name/ha/haredoc/package.nix b/pkgs/by-name/ha/haredoc/package.nix
index 773b226316ae..591983f1e093 100644
--- a/pkgs/by-name/ha/haredoc/package.nix
+++ b/pkgs/by-name/ha/haredoc/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     homepage = "https://harelang.org/";
     description = "Hare's documentation tool";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ onemoresuza ];
+    maintainers = [ ];
     mainProgram = "haredoc";
     inherit (hareHook.meta) platforms badPlatforms;
   };
diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index 080dac7b48ed..82fb59100c38 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "11.2.1";
+  version = "12.1.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-CTcUyFSKKFCUaF8L3JmeIC1ma1nus98v+SGraLgzakk=";
+    hash = "sha256-5cgbf24LEC37AAz6QkU4uOiWq3ii9Lil7IyuYqtDNp4=";
   };
 
   postPatch = ''
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # ApplicationServices.framework headers have cast-align warnings.
     substituteInPlace src/hb.hh \
-      --replace '#pragma GCC diagnostic error   "-Wcast-align"' ""
+      --replace-fail '#pragma GCC diagnostic error   "-Wcast-align"' ""
   '';
 
   outputs = [
@@ -130,7 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "OpenType text shaping engine";
     homepage = "https://harfbuzz.github.io/";
     changelog = "https://github.com/harfbuzz/harfbuzz/raw/${finalAttrs.version}/NEWS";
-    maintainers = [ ];
+    maintainers = [ maintainers.cobalt ];
     license = licenses.mit;
     platforms = platforms.unix ++ platforms.windows;
     pkgConfigModules = [
diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 8ac65c4b9b5c..4c85ce0e4a52 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -12,25 +12,28 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "harlequin";
-  version = "2.1.2";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "harlequin";
     tag = "v${version}";
-    hash = "sha256-uHzhAI8ppp6aoveMPcLCQX2slhbor5Qy+IoTui+RP7M=";
+    hash = "sha256-W/Za/k/XusZmPLiX4ER9XaQWG4jdkrIh7JualHeeqZM=";
   };
 
   pythonRelaxDeps = [
+    "click"
     "numpy"
     "pyarrow"
+    "questionary"
+    "rich-click"
     "textual"
     "tree-sitter"
     "tree-sitter-sql"
   ];
 
-  build-system = with python3Packages; [ poetry-core ];
+  build-system = with python3Packages; [ hatchling ];
 
   nativeBuildInputs = [ glibcLocales ];
 
@@ -78,6 +81,10 @@ python3Packages.buildPythonApplication rec {
     # Tests require network access
     "test_connect_extensions"
     "test_connect_prql"
+
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # AssertionError
+    "test_bad_adapter_opt"
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
     # Test incorrectly tries to load a dylib/so compiled for x86_64
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index fea0e094595c..1df595fa96ba 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.65.0";
+  version = "0.70.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-y2oYEJTZWZ7Rc7ZLjYUh3Cy9dtznGLhIXzJ6D0JUIGw=";
+    hash = "sha256-ksSr2styk0uDEOGrxAVRqW549oaGdzahejaJ5paYNf0=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-o6RFBCvPn3AH3mMI3guHziqOcYN99o8yk5b6VXWoepI=";
+  cargoHash = "sha256-w4nwOzKV3yshvLzMeJyv32ihFv5yE+r7gNOF01zTYrU=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ha/harsh/package.nix b/pkgs/by-name/ha/harsh/package.nix
index 036baf828565..0222ed4879af 100644
--- a/pkgs/by-name/ha/harsh/package.nix
+++ b/pkgs/by-name/ha/harsh/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harsh";
-  version = "0.10.22";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "wakatara";
     repo = "harsh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TGhhiqFf6POR7x/Nc8m5/mBlj23EnjZlL5AL9IwXghk=";
+    hash = "sha256-mQhBQFDint6ZlS5yQ9oGLJVxmol9p+st9X7wRCBuc/g=";
   };
 
-  vendorHash = "sha256-m+5MSgzuRUZuP1GhEUCttLRLL63kphMi8N9tDUaTaOQ=";
+  vendorHash = "sha256-+yHIpUttvrdiTt0IuMTT4iCN34hNOb3JjZTmi5qb8yI=";
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
diff --git a/pkgs/by-name/ha/haruna/package.nix b/pkgs/by-name/ha/haruna/package.nix
index 467a6427dbeb..9da98a615246 100644
--- a/pkgs/by-name/ha/haruna/package.nix
+++ b/pkgs/by-name/ha/haruna/package.nix
@@ -4,21 +4,23 @@
   fetchFromGitLab,
   cmake,
   ffmpeg-headless,
+  kdsingleapplication,
+  libass,
   kdePackages,
   pkg-config,
   qt6,
   yt-dlp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "haruna";
-  version = "1.4.0";
+  version = "1.6.0";
 
   src = fetchFromGitLab {
     owner = "multimedia";
     repo = "haruna";
-    rev = "v${version}";
-    hash = "sha256-7983qZ7c3i8Ilyvu36t02zeIcVO96PXGNLH3wq6JsvI=";
+    rev = "v${finalAttrs.finalPackage.version}";
+    hash = "sha256-pAFO6zclJNmHD91ady0vlnBg6ebSWMzJq7TZN/uBGnM=";
     domain = "invent.kde.org";
   };
 
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
     yt-dlp
 
     ffmpeg-headless
+    kdsingleapplication
+    libass
     kdePackages.kconfig
     kdePackages.kcoreaddons
     kdePackages.kdeclarative
@@ -55,6 +59,8 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
+  env.LANG = "C.UTF-8";
+
   meta = {
     homepage = "https://invent.kde.org/multimedia/haruna";
     description = "Open source video player built with Qt/QML and libmpv";
@@ -73,4 +79,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "haruna";
   };
-}
+})
diff --git a/pkgs/by-name/ha/hasura-cli/package.nix b/pkgs/by-name/ha/hasura-cli/package.nix
index 0410c9b6b207..32ab0574f716 100644
--- a/pkgs/by-name/ha/hasura-cli/package.nix
+++ b/pkgs/by-name/ha/hasura-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "hasura";
-  version = "2.48.5";
+  version = "2.48.6";
 
   src = fetchFromGitHub {
     owner = "hasura";
     repo = "graphql-engine";
     rev = "v${version}";
-    sha256 = "sha256-3mKwhRDmsI2fo5hd6DM3/+Nmf4eOswE2RUcOieOeSCE=";
+    sha256 = "sha256-99HxAjqZQ4GtUR4F7EbVNKT7BI9AHm0uj54XgZZC2Lc=";
   };
   modRoot = "./cli";
 
diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix
index 2f3662f41baa..caba2f932eb2 100644
--- a/pkgs/by-name/ha/hath-rust/package.nix
+++ b/pkgs/by-name/ha/hath-rust/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hath-rust";
-  version = "1.12.1";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "james58899";
     repo = "hath-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4dbloi88oR84JnD1nepLTJNSgxgB337F3nxr7i4nZV8=";
+    hash = "sha256-shixrhIl4bbZQrJea2Dx4bbeGXOaPvMKUHgHq+JfAWs=";
   };
 
-  cargoHash = "sha256-P975lZ6LgL+dT52td8uA8QVnuJd6QKWkpBCfoLpLW9E=";
+  cargoHash = "sha256-eoki+QXqBC26PC7qNlOLlgkXxc6Fsx7T4o9GIbAaO8Y=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 527f274affa1..8c80544781ff 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hayagriva";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg=";
+    hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY=";
   };
 
-  cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw=";
+  cargoHash = "sha256-Ectd93B2yn/fn+N86LxGbUvtENsgjXTSCg06lHM8Xi0=";
 
   buildFeatures = [ "cli" ];
 
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "hayagriva";
   };
 }
diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix
index a38a5684794a..35e424c05d43 100644
--- a/pkgs/by-name/hc/hck/package.nix
+++ b/pkgs/by-name/hc/hck/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
       unlicense
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       gepbird
     ];
     mainProgram = "hck";
diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix
index 9cd1c77baebf..674b4c2fdbbb 100644
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.54.0";
+  version = "1.56.0";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-PpCEdhEjfd7d8DdU2ABAjL8O98cLR20xWwhcESJK4uI=";
+    hash = "sha256-mK4CF3Is+gfu7euU5drU3jZitAe7501lvpy6N6NXLCI=";
   };
 
-  vendorHash = "sha256-tJwd/qLs0QvnjKi0B2NBTosGt7qCzJCHxZ5LYJB4vjA=";
+  vendorHash = "sha256-geFjIYvVhbKpwGsEuSm3NbYt8kkBsLtJqCmnY4zhJL8=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
index 0ea029465a22..b00524358deb 100644
--- a/pkgs/by-name/hd/hddfancontrol/package.nix
+++ b/pkgs/by-name/hd/hddfancontrol/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hddfancontrol";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "hddfancontrol";
     tag = finalAttrs.version;
-    hash = "sha256-kKzjg2D/7Thzu6JzmLyu2eJAr+N6Bi95WEBKrqB/vXo=";
+    hash = "sha256-VnHXRheqh+NwbFBWsX9XUbRuto7weyX7aHZ+BDi2Vns=";
   };
 
-  cargoHash = "sha256-0TRNiRmxwV/p7nLOrU9GHjTzIaan4JV8C6e443nd2zY=";
+  cargoHash = "sha256-lm4ARffPOYCewNyREb1PQ8M5icqh8c+z6ZNXZKpBlRE=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index d0eb807a72a3..323a57698210 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=ON"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.10)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     mkdir -p $out/lib/pkgconfig
     substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc
diff --git a/pkgs/by-name/hd/hdrmerge/package.nix b/pkgs/by-name/hd/hdrmerge/package.nix
index c743ba7196b8..9e2bd1865945 100644
--- a/pkgs/by-name/hd/hdrmerge/package.nix
+++ b/pkgs/by-name/hd/hdrmerge/package.nix
@@ -15,14 +15,20 @@
 
 stdenv.mkDerivation rec {
   pname = "hdrmerge";
-  version = "0.5.0-unstable-2024-08-02";
+  version = "0.5.0-unstable-2025-04-26";
   src = fetchFromGitHub {
     owner = "jcelaya";
     repo = "hdrmerge";
-    rev = "e2a46f97498b321b232cc7f145461212677200f1";
-    hash = "sha256-471gJtF9M36pAId9POG8ZIpNk9H/157EdHqXSAPlhN0=";
+    rev = "3bbe43771ba15b899151721bc14aa57e86b60f2f";
+    hash = "sha256-4FIGchwROXe8qLRBaYih2k9zDll2YoYGDj06SrIqK9Q=";
   };
 
+  # Disable find_package(ALGLIB REQUIRED) in the CMake file by providing a empty
+  # FindALGLIB.cmake, and provide ALGLIB_INCLUDES and ALGLIB_LIBRARIES ourselves
+  preConfigure = ''
+    touch cmake/FindALGLIB.cmake
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -39,12 +45,8 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DALGLIB_DIR:PATH=${alglib}"
-  ];
-
-  CXXFLAGS = [
-    # GCC 13: error: 'uint32_t' does not name a type
-    "-include cstdint"
+    (lib.cmakeFeature "ALGLIB_INCLUDES" "${alglib}/include/alglib")
+    (lib.cmakeFeature "ALGLIB_LIBRARIES" "alglib3")
   ];
 
   desktopItems = [
diff --git a/pkgs/by-name/he/headscale/package.nix b/pkgs/by-name/he/headscale/package.nix
index a4da9dbc82ac..30ed1bda6506 100644
--- a/pkgs/by-name/he/headscale/package.nix
+++ b/pkgs/by-name/he/headscale/package.nix
@@ -11,16 +11,16 @@
 }:
 buildGoModule rec {
   pname = "headscale";
-  version = "0.26.1";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "juanfont";
     repo = "headscale";
     tag = "v${version}";
-    hash = "sha256-LnS6K3U4RgRRV4i92zcRZtLJF1QdbORQP9ZIis9u6rk=";
+    hash = "sha256-bWY12OW2gc5m6xdEJYh6xBixUMKYRuSBH4lCkcToL04=";
   };
 
-  vendorHash = "sha256-dR8xmUIDMIy08lhm7r95GNNMAbXv4qSH3v9HR40HlNk=";
+  vendorHash = "sha256-GUIzlPRsyEq1uSTzRNds9p1uVu4pTeH5PAxrJ5Njhis=";
 
   subPackages = [ "cmd/headscale" ];
 
diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index f8ef29960c67..53d16ea56497 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.16.7";
+  version = "0.17.2";
 in
 buildGoModule {
   pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "dadrus";
     repo = "heimdall";
     tag = "v${version}";
-    hash = "sha256-YFqaCXx/x2LfdqaJZFTGkK/k7qIRWKXA1t/KZeWLDGw=";
+    hash = "sha256-mSjxcf7Sbj6IVtO3ShVe/nrZgE+cJlx6JvOZ23WM7zQ=";
   };
 
-  vendorHash = "sha256-E/tdRS96rPWZHwtG22TFB1p7CUaFsya7nI8cAEuYvJo=";
+  vendorHash = "sha256-3DOuDZh1rLuBaNnEJTDw/DXtEv8jhPk4kq2dvX4Scp0=";
 
   tags = [ "sqlite" ];
 
diff --git a/pkgs/by-name/he/helix-db/disable-updates.patch b/pkgs/by-name/he/helix-db/disable-updates.patch
new file mode 100644
index 000000000000..e4b26c3265d8
--- /dev/null
+++ b/pkgs/by-name/he/helix-db/disable-updates.patch
@@ -0,0 +1,36 @@
+diff --git a/helix-cli/src/main.rs b/helix-cli/src/main.rs
+index 18e279fd..a3ec271c 100644
+--- a/helix-cli/src/main.rs
++++ b/helix-cli/src/main.rs
+@@ -121,13 +121,6 @@ enum Commands {
+         action: MetricsAction,
+     },
+ 
+-    /// Update to the latest version
+-    Update {
+-        /// Force update even if already on latest version
+-        #[clap(long)]
+-        force: bool,
+-    },
+-
+     /// Migrate v1 project to v2 format
+     Migrate {
+         /// Project directory to migrate (defaults to current directory)
+@@ -253,9 +246,6 @@ async fn main() -> Result<()> {
+     // Send CLI install event (only first time)
+     metrics_sender.send_cli_install_event_if_first_time();
+ 
+-    // Check for updates before processing commands
+-    update::check_for_updates().await?;
+-
+     let cli = Cli::parse();
+ 
+     let result = match cli.command {
+@@ -280,7 +270,6 @@ async fn main() -> Result<()> {
+         Commands::Prune { instance, all } => commands::prune::run(instance, all).await,
+         Commands::Delete { instance } => commands::delete::run(instance).await,
+         Commands::Metrics { action } => commands::metrics::run(action).await,
+-        Commands::Update { force } => commands::update::run(force).await,
+         Commands::Migrate {
+             path,
+             queries_dir,
diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix
new file mode 100644
index 000000000000..6175bd201978
--- /dev/null
+++ b/pkgs/by-name/he/helix-db/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "helix-db";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    repo = "helix-db";
+    owner = "HelixDB";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ucDo8jvVBM0KmCTSEbduBYHJSHAJljJQg1+HEQvJ7pU=";
+  };
+
+  cargoHash = "sha256-LimHFXr7hacpBaULSbMz+q/j3R943HDz2fQir1FA2E0=";
+
+  patches = [
+    #There are no feature yet
+    ./disable-updates.patch
+  ];
+
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  cargoBuildFlags = [
+    "-p"
+    "helix-cli"
+  ];
+
+  #There are no tests
+  doCheck = false;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open-source graph-vector database built from scratch in Rust";
+    homepage = "https://github.com/HelixDB/helix-db";
+    changelog = "https://github.com/HelixDB/helix-db/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "helix";
+  };
+})
diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix
index 0892be8d042c..74e6df4729b8 100644
--- a/pkgs/by-name/he/helmfile/package.nix
+++ b/pkgs/by-name/he/helmfile/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "1.1.7";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${version}";
-    hash = "sha256-DOLlibBuwzP31ZMakcuaeG/fdMDOXqgd8PKts4/gFVo=";
+    hash = "sha256-WatJSiNi/rUaoBGgIdRjczpMiXAwRQ21ck/ATVKyZe0=";
   };
 
-  vendorHash = "sha256-l7KQ67Rx2lsaUkpTHBJM6PRqqTdbwkkaeOhsUxj1MMI=";
+  vendorHash = "sha256-HTs176YgrQX8s+IrOqV4BQVZfhhFkNp+T3HbmmBFdTg=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 
diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix
index ffb5fd387766..3215af4c1e9b 100644
--- a/pkgs/by-name/he/heptabase/package.nix
+++ b/pkgs/by-name/he/heptabase/package.nix
@@ -5,10 +5,10 @@
 }:
 let
   pname = "heptabase";
-  version = "1.75.3";
+  version = "1.75.7";
   src = fetchurl {
     url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage";
-    hash = "sha256-PtRc5Rkytt53FnEfu48sRgamze4a4zNyeFfh6UB5qqs=";
+    hash = "sha256-XGbkfjmceb+IFl3sERpd8zqdTQQAkpiyTxZDoIyoFmY=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 1fe420cb2abe..fbe73c99450a 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "hermit";
-  version = "0.46.1";
+  version = "0.46.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "cashapp";
     repo = "hermit";
-    hash = "sha256-snwqR9gtdUYmSNWcs+dur/6enuBG0HZ94cL6YoQFG1w=";
+    hash = "sha256-4SOwOO9ee7fKrby9sokWW/GPujT9/O+9emcaLIe+0C0=";
   };
 
   vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM=";
diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 68cf15bb57b6..40ddf2d279fa 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -9,7 +9,7 @@
   python3,
   makeWrapper,
   # Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL.
-  electron_36,
+  electron_37,
   vulkan-helper,
   gogdl,
   nile,
@@ -21,7 +21,7 @@ let
   legendary = callPackage ./legendary.nix { };
   epic-integration = callPackage ./epic-integration.nix { };
   comet-gog = comet-gog_heroic;
-  electron = electron_36;
+  electron = electron_37;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
@@ -119,12 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
     inherit epic-integration legendary;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac";
     homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
     changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iedame ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ iedame ];
     # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
     # It may also work on other Linux targets, but all the game stores only
     # support x86 Linux, so it would require extra hacking to run games via QEMU
diff --git a/pkgs/by-name/he/heroku/package.nix b/pkgs/by-name/he/heroku/package.nix
index 15210e20587f..d9e80ea96bcd 100644
--- a/pkgs/by-name/he/heroku/package.nix
+++ b/pkgs/by-name/he/heroku/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation {
   pname = "heroku";
-  version = "10.13.1";
+  version = "10.13.2";
 
   src = fetchzip {
-    url = "https://cli-assets.heroku.com/versions/10.13.1/cf943a6/heroku-v10.13.1-cf943a6-linux-x64.tar.xz";
-    hash = "sha256-2nxM1XE+gvIUoA/AQLXt73V+ZM+WP245qAkGilnCqMk=";
+    url = "https://cli-assets.heroku.com/versions/10.13.2/82c0564/heroku-v10.13.2-82c0564-linux-x64.tar.xz";
+    hash = "sha256-JfaOnVaN60MG4dDJ8IdmRucfCIb9EtWdJy+90fG6zuw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix
index 34f83d34ae67..c01266c629c7 100644
--- a/pkgs/by-name/he/hexyl/package.nix
+++ b/pkgs/by-name/he/hexyl/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       dywedir
-      figsoda
       SuperSandro2000
     ];
     mainProgram = "hexyl";
diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix
index 7c3333def150..4f2ce9b7a6f8 100644
--- a/pkgs/by-name/he/heynote/package.nix
+++ b/pkgs/by-name/he/heynote/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "heynote";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
-    sha256 = "sha256-NA7oKutjxj1Chv7EJ0V7L0uF1oMSZqh97Ly6UYbzhuQ=";
+    sha256 = "sha256-nA1FRjh9lKdTZXUfuECl5BlW5phYaoh7HOOCKDQuOGQ=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/hg/hgrep/package.nix b/pkgs/by-name/hg/hgrep/package.nix
index c110c9814d37..2fb66a2f19b5 100644
--- a/pkgs/by-name/hg/hgrep/package.nix
+++ b/pkgs/by-name/hg/hgrep/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 rustPlatform.buildRustPackage {
   pname = "hgrep";
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "rhysd";
     repo = "hgrep";
     tag = "v${version}";
-    hash = "sha256-GcV6tZLhAtBE0/husOqZ3Gib9nXXg7kcxrNp9IK0eTo=";
+    hash = "sha256-xBLpEs0PvYb7sIca9yb3vhi2Bsr1BFqB0jlD+bZT2EI=";
   };
 
-  cargoHash = "sha256-NxfWY9OoMNASlWE48njuAdTI11JAV+rzjD0OU2cHLsc=";
+  cargoHash = "sha256-TP+PClv7FX3kRBwJ0RAKbKoTKpi7hTZgw/Z/ktFKbwQ=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index 4969188fd3b5..075df1040c83 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -2,8 +2,8 @@
   lib,
   appimageTools,
   fetchurl,
-  version ? "0.9.12.1",
-  hash ? "sha256-6Lun0HyfAi7anivgGsGdUPPX9kZrWwh8fq+qvVL/CdU=",
+  version ? "0.9.12.2",
+  hash ? "sha256-nhBLtsc9zz1tCFn7BWIqTVD/iTLHFUjXPmnslewoUCw=",
 }:
 
 let
diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix
index b19baef569a7..ac3b3d85f244 100644
--- a/pkgs/by-name/hi/high-tide/package.nix
+++ b/pkgs/by-name/hi/high-tide/package.nix
@@ -49,6 +49,7 @@ python313Packages.buildPythonApplication rec {
     gstreamer
     gst-plugins-base
     gst-plugins-good
+    gst-plugins-bad
     libsecret
   ]);
 
diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix
index 56df0193ec72..3c9e5ac064c0 100644
--- a/pkgs/by-name/hi/highlight-assertions/package.nix
+++ b/pkgs/by-name/hi/highlight-assertions/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "highlight-assertions";
     homepage = "https://github.com/thehamsta/highlight-assertions";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix
index 60bdf77d2e81..de05d314776b 100644
--- a/pkgs/by-name/hi/highs/package.nix
+++ b/pkgs/by-name/hi/highs/package.nix
@@ -8,23 +8,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highs";
-  version = "1.10.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "ERGO-Code";
     repo = "HiGHS";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
+    hash = "sha256-FRiYtbl1kWEkHHEIIOpefC9UdusmJKl6UmP3dKRkAXA=";
   };
 
-  # CMake Error in CMakeLists.txt:
-  #   Imported target "highs::highs" includes non-existent path
-  #     "/include"
-  #   in its INTERFACE_INCLUDE_DIRECTORIES.
-  postPatch = ''
-    sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
-  '';
-
   strictDeps = true;
 
   outputs = [ "out" ];
@@ -48,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.mit;
     platforms = platforms.all;
     mainProgram = "highs";
-    maintainers = with maintainers; [ silky ];
+    maintainers = with maintainers; [
+      galabovaa
+      silky
+    ];
   };
 })
diff --git a/pkgs/by-name/hl/hledger-fmt/package.nix b/pkgs/by-name/hl/hledger-fmt/package.nix
index bb5d8fe1b2d9..2b7c4b31d4b1 100644
--- a/pkgs/by-name/hl/hledger-fmt/package.nix
+++ b/pkgs/by-name/hl/hledger-fmt/package.nix
@@ -9,20 +9,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hledger-fmt";
-  version = "0.3.1";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "mondeja";
     repo = "hledger-fmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5dPKSUJLxQ5WXZefuwr3wLhr3MNzy+dzpJkgKFU0/SE=";
+    hash = "sha256-xjBU8LgVIPjb758I57gDfz5q3sot8sV93gMAPXY2jOw=";
   };
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  cargoHash = "sha256-yErH9AyfBZF0PByqViVhXHB/FAc0awz4bOyAHtcHe0s=";
+  cargoHash = "sha256-LQxJWllRCD7moImQdDc8Xa0mrkCbbvYITg3pb204qVs=";
 
   # Tests try to invoke the binary from "target/debug/hledger-fmt"
   # https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5
diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix
index 4ea87fb7cab8..ad620d1500de 100644
--- a/pkgs/by-name/hm/hmm/package.nix
+++ b/pkgs/by-name/hm/hmm/package.nix
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/samwho/hmm";
     changelog = "https://github.com/samwho/hmm/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix
index 6bd991daeae1..693378367f2b 100644
--- a/pkgs/by-name/ho/hoard/package.nix
+++ b/pkgs/by-name/ho/hoard/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       builditluc
-      figsoda
     ];
     mainProgram = "hoard";
   };
diff --git a/pkgs/by-name/ho/holochain-launcher/package.nix b/pkgs/by-name/ho/holochain-launcher/package.nix
index 8e3b718f0692..a4c713a278f8 100644
--- a/pkgs/by-name/ho/holochain-launcher/package.nix
+++ b/pkgs/by-name/ho/holochain-launcher/package.nix
@@ -5,7 +5,7 @@
   autoPatchelfHook,
   dpkg,
   openssl,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   libappindicator,
   wrapGAppsHook3,
   shared-mime-info,
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     openssl
-    webkitgtk_4_0
+    # webkitgtk_4_0
     libappindicator
 
     glib-networking
@@ -52,6 +52,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Cross-platform executable that launches a local Holochain conductor, and installs and opens apps";
     homepage = "https://github.com/holochain/launcher";
     maintainers = [ maintainers.steveej ];
diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index cd9fa500ef1b..d3ba7e38295e 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-10-12";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "e121f3773fa596ecaba5b22e518936a632d72a90";
-    hash = "sha256-U9SkK45314urw9P7MmjhEgiQwwD/BTj+T3HTuz1JU1Q=";
+    rev = "aa6936bb637e46a49cf1292486200ba41dd4bcf7";
+    hash = "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
index a00f0829a058..641245ea7fb6 100644
--- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
+++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
@@ -7,27 +7,28 @@
   npmHooks,
   python3,
   cacert,
+  versionCheckHook,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "homebridge-config-ui-x";
-  version = "5.6.0";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "homebridge";
     repo = "homebridge-config-ui-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RsUrJ6WR78yN+thKbrN53S32XNZ8N4pSDAzzhGso01A=";
+    hash = "sha256-pbE3s1MzZM8r29oJsZjHTCahRNuWExsvGfERue4RQv4=";
   };
 
   # Deps hash for the root package
-  npmDepsHash = "sha256-YFWbzhjUVMa9Do5TEVQPvXwwY9ap4j8kdbGVM2wCt4c=";
+  npmDepsHash = "sha256-L7sC/4iHSGE9H562pbtESkFpty6eGdmkU60dpUWPQaQ=";
 
   # Deps src and hash for ui subdirectory
   npmDeps_ui = fetchNpmDeps {
     name = "npm-deps-ui";
     src = "${finalAttrs.src}/ui";
-    hash = "sha256-Y4rB1GzsFX9Uw+UeiYJPcD5+u2kpmZw0tWhsmzaWo04=";
+    hash = "sha256-Yhk7cplZlmcChKPmwoI192MJujuq+v8+JXT08rwfL3Q=";
   };
 
   # Need to also run npm ci in the ui subdirectory
@@ -53,11 +54,17 @@ buildNpmPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ cacert ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Configure Homebridge, monitor and backup from a browser";
     homepage = "https://github.com/homebridge/homebridge-config-ui-x";
     license = lib.licenses.mit;
-    mainProgram = "homebridge-config-ui-x";
+    mainProgram = "hb-service";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ fmoda3 ];
     # Works on darwin when not in sandbox because it downloads a prebuilt binary
diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index a8aee6571366..495f99d32624 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
       --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \
       --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \
       --add-flags "$out/share/homepage/server.js" \
-      --set PATH "${lib.makeBinPath [ unixtools.ping ]}"
+      --prefix PATH : "${lib.makeBinPath [ unixtools.ping ]}"
 
     ${if enableLocalIcons then installLocalIcons else ""}
 
diff --git a/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
index 301f549138e1..a8abf61ab301 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
+++ b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
@@ -1,37 +1,37 @@
-From 301de689a1f7fae8ee6d0d5bbbe155a351b1b927 Mon Sep 17 00:00:00 2001
-From: Jade Lovelace <jadel@mercury.com>
-Date: Wed, 9 Nov 2022 11:02:02 -0800
-Subject: [PATCH] add NO_REDIS_TEST env-var that disables Redis-requiring tests
+From ce22aed5afa89c9b591d865bdfcc84a739929a01 Mon Sep 17 00:00:00 2001
+From: jkachmar <j@mercury.com>
+Date: Fri, 24 Oct 2025 17:56:22 -0400
+Subject: [PATCH] disable tests that require redis
 
 ---
- internal/peer/peers_test.go | 7 +++++++
- 1 file changed, 7 insertions(+)
+ internal/peer/peers_test.go | 4 ++++
+ pubsub/pubsub_test.go       | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/internal/peer/peers_test.go b/internal/peer/peers_test.go
-index 5ec7f81..c64b1b4 100644
+index dae54067d8..b33ebc4979 100644
 --- a/internal/peer/peers_test.go
 +++ b/internal/peer/peers_test.go
-@@ -2,6 +2,7 @@ package peer
+@@ -86,6 +86,10 @@
+ }
  
- import (
- 	"context"
-+	"os"
- 	"testing"
- 	"time"
- 
-@@ -26,6 +27,12 @@ func TestNewPeers(t *testing.T) {
- 		t.Errorf("received %T expected %T", i, &filePeers{})
- 	}
- 
-+	// Allow skipping test requiring redis, since Nix builds without redis
-+	// available
+ func TestPeerShutdown(t *testing.T) {
++	// Skip tests requiring Redis so that nixpkgs can build & test refinery.
 +	if os.Getenv("NO_REDIS_TEST") != "" {
-+		t.Skip("Skipping redis-requiring test");
++		t.Skip("Skipping Redis-requiring test");
 +	}
-+
- 	c = &config.MockConfig{
+ 	c := &config.MockConfig{
  		GetPeerListenAddrVal: "0.0.0.0:8081",
  		PeerManagementType:   "redis",
--- 
-2.37.1
-
+diff --git a/pubsub/pubsub_test.go b/pubsub/pubsub_test.go
+index 4ad630ff96..dff6981926 100644
+--- a/pubsub/pubsub_test.go
++++ b/pubsub/pubsub_test.go
+@@ -17,7 +17,6 @@
+ )
+ 
+ var types = []string{
+-	"goredis",
+ 	"local",
+ }
+ 
diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index 690636870e80..38bad5f83538 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -2,17 +2,19 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "honeycomb-refinery";
-  version = "1.19.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "honeycombio";
     repo = "refinery";
-    rev = "v${version}";
-    hash = "sha256-SU9JbyUuBMqPw4XcoF5s8CgBn7+V/rHBAwpXJk373jg=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-jt8aEqglGXzBL5UDOz8e7qRDmE3RnMb2y+eLFI9jJSE=";
   };
 
   NO_REDIS_TEST = true;
@@ -24,23 +26,33 @@ buildGoModule rec {
     ./0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
   ];
 
-  excludedPackages = [ "cmd/test_redimem" ];
+  excludedPackages = [
+    "LICENSES"
+    "cmd/test_redimem"
+  ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X main.BuildID=${version}"
+    "-X main.BuildID=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-0M05JGLdmKivRTN8ZdhAm+JtXTlYAC31wFS82g3NenI=";
+  vendorHash = "sha256-/1IT3GxKANBltetRKxP/jUG05GGbg9mc7aWEcbrwUT0=";
 
   doCheck = true;
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     homepage = "https://github.com/honeycombio/refinery";
     description = "Tail-sampling proxy for OpenTelemetry";
-    license = licenses.asl20;
-    maintainers = [ ];
     mainProgram = "refinery";
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.mercury ];
   };
-}
+})
diff --git a/pkgs/by-name/ho/hors/package.nix b/pkgs/by-name/ho/hors/package.nix
index d5468d6cbf82..e1ceeb7ad6d3 100644
--- a/pkgs/by-name/ho/hors/package.nix
+++ b/pkgs/by-name/ho/hors/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/windsoilder/hors";
     changelog = "https://github.com/WindSoilder/hors/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/by-name/hq/hqplayer-desktop/package.nix
similarity index 87%
rename from pkgs/applications/audio/hqplayer-desktop/default.nix
rename to pkgs/by-name/hq/hqplayer-desktop/package.nix
index 36fc6235dad5..2b8acc8aa1ab 100644
--- a/pkgs/applications/audio/hqplayer-desktop/default.nix
+++ b/pkgs/by-name/hq/hqplayer-desktop/package.nix
@@ -12,13 +12,8 @@
   libusb-compat-0_1,
   llvmPackages,
   mpfr,
-  qtcharts,
-  qtdeclarative,
-  qtwayland,
-  qtwebengine,
-  qtwebview,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 let
@@ -44,7 +39,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     dpkg
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -56,11 +51,11 @@ stdenv.mkDerivation {
     libusb-compat-0_1
     llvmPackages.openmp
     mpfr
-    qtcharts
-    qtdeclarative
-    qtwayland
-    qtwebengine
-    qtwebview
+    kdePackages.qtcharts
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
+    kdePackages.qtwebview
     wavpack
   ];
 
@@ -111,12 +106,12 @@ stdenv.mkDerivation {
     patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer5*-wrapped
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.signalyst.com";
     description = "High-end upsampling multichannel software HD-audio player";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ lovesegfault ];
+    maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }
diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 855773eb8328..191c7d3db444 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.48.6";
+  version = "0.49.9";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = "httm";
     rev = version;
-    hash = "sha256-A/4nf5DKGf8IjQvvNSJMONoRmEBul8/RS+e4OLU1VYQ=";
+    hash = "sha256-Y0WYgi/VdGjE70XZcJD7G+ONCSq2YXpX9/RyijPW3kc=";
   };
 
-  cargoHash = "sha256-/iAeR0HmIaoSX03bvTypyvKWgjhfhAzc/ikpiCuXEcs=";
+  cargoHash = "sha256-CSwfwW5ChnvrtN+zl2DdAPHDJCL3RSQHlBT2xWt+KCc=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ht/http-getter/package.nix b/pkgs/by-name/ht/http-getter/package.nix
index 956b5ff22bca..28e95f29aa76 100644
--- a/pkgs/by-name/ht/http-getter/package.nix
+++ b/pkgs/by-name/ht/http-getter/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   curl,
   pkg-config,
@@ -18,6 +19,14 @@ stdenv.mkDerivation {
     sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/tohojo/http-getter/commit/a3646c4cd5f4558f942c2323bbeb83d82a6ce8c1.patch?full_index=1";
+      hash = "sha256-/fQP0AlEKm/hDj9POGjdAPoW4Z+UExaNnk9PbvW22uE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/ht/httplib/package.nix b/pkgs/by-name/ht/httplib/package.nix
index 655bcd363afe..60cab3dd28ac 100644
--- a/pkgs/by-name/ht/httplib/package.nix
+++ b/pkgs/by-name/ht/httplib/package.nix
@@ -4,8 +4,9 @@
   fetchFromGitHub,
   openssl,
   stdenv,
+  copyPkgconfigItems,
+  makePkgconfigItem,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "httplib";
   version = "0.19.0";
@@ -17,18 +18,36 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OLwD7mpwqG7BUugUca+CJpPMaabJzUMC0zYzJK9PBCg=";
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    copyPkgconfigItems
+  ];
 
   buildInputs = [ openssl ];
 
   strictDeps = true;
 
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "httplib";
+      inherit (finalAttrs) version;
+      cflags = [ "-I${variables.includedir}" ];
+      variables = rec {
+        prefix = placeholder "out";
+        includedir = "${prefix}/include";
+      };
+      inherit (finalAttrs.meta) description;
+    })
+  ];
+
   meta = {
     homepage = "https://github.com/yhirose/cpp-httplib";
     description = "C++ header-only HTTP/HTTPS server and client library";
     changelog = "https://github.com/yhirose/cpp-httplib/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      fzakaria
+    ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix
index 623acd17a275..ec9a253369c4 100644
--- a/pkgs/by-name/ht/httplz/package.nix
+++ b/pkgs/by-name/ht/httplz/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/thecoshman/http";
     changelog = "https://github.com/thecoshman/http/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ht/httpref/package.nix b/pkgs/by-name/ht/httpref/package.nix
index fb04d45c3d51..dd749206242b 100644
--- a/pkgs/by-name/ht/httpref/package.nix
+++ b/pkgs/by-name/ht/httpref/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/dnnrly/httpref";
     changelog = "https://github.com/dnnrly/httpref/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ht/httprobe/package.nix b/pkgs/by-name/ht/httprobe/package.nix
index a1c2b4da34dc..8ffeee37e30a 100644
--- a/pkgs/by-name/ht/httprobe/package.nix
+++ b/pkgs/by-name/ht/httprobe/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Take a list of domains and probe for working HTTP and HTTPS servers";
     homepage = "https://github.com/tomnomnom/httprobe";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "httprobe";
   };
 }
diff --git a/pkgs/by-name/hu/hubble/package.nix b/pkgs/by-name/hu/hubble/package.nix
index 6bf3874fd9ff..acdaa3c222dd 100644
--- a/pkgs/by-name/hu/hubble/package.nix
+++ b/pkgs/by-name/hu/hubble/package.nix
@@ -9,13 +9,13 @@
 
 buildGo124Module rec {
   pname = "hubble";
-  version = "1.17.2";
+  version = "1.18.3";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "hubble";
     tag = "v${version}";
-    hash = "sha256-ZkowUftSEGo+UjYM+kk3tQJc8QJgoJATeIKPwu2ikQ4=";
+    hash = "sha256-9TY7at4k3IrxJJ4HmAW9oeQX3Wg0V/LGVDNGYfBOvSA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 86765c23c59c..751af66bee41 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.151.0";
+  version = "0.152.2";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gDbKYL1jCqV6yjCklTucTxK0oQYvy1kfEqE+4k3viXw=";
+    hash = "sha256-nSWeCRhbaEgr54VDstBKnouUeWR1JjLXEqtYUcEMdyQ=";
   };
 
-  vendorHash = "sha256-swxlm9APcwLQzFFoz9PDT7vdxWFayKAfQx3IADhwnEs=";
+  vendorHash = "sha256-3cIz3SWV/3vYhCgFEGAa+mOaUCzsJurkI2rPtVANE38=";
 
   checkFlags =
     let
@@ -83,6 +83,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       Br1ght0ne
       Frostman
+      savtrip
     ];
   };
 })
diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix
index 92f2b2395069..98443496e4b4 100644
--- a/pkgs/by-name/hu/huniq/package.nix
+++ b/pkgs/by-name/hu/huniq/package.nix
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "huniq";
     homepage = "https://github.com/koraa/huniq";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 63c24cabe9bb..a621a93e3daa 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -821,6 +821,33 @@ rec {
     };
   };
 
+  # UZBEK
+  uz_UZ = uz-uz;
+  uz-uz = mkDict rec {
+    pname = "hunspell-dict-uz-uz";
+    version = "0.1.0";
+
+    src = fetchFromGitHub {
+      owner = "uzbek-net";
+      repo = "uz-hunspell";
+      tag = version;
+      hash = "sha256-l3Ll+mKjAndEcBX6jxTVEyHkMzuQpPDj+2kY5qtwzh8=";
+    };
+
+    shortName = "uz-uz";
+    dictFileName = "uz_UZ";
+    readmeFile = "README.md";
+
+    meta = {
+      description = "Hunspell dictionary for Uzbek";
+      homepage = "https://github.com/uzbek-net/uz-hunspell";
+      license = with lib.licenses; [
+        gpl3Plus
+      ];
+      teams = [ lib.teams.uzinfocom ];
+    };
+  };
+
   # RUSSIAN
 
   ru_RU = ru-ru;
diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 0d59ebefa8a9..cd2a3c0c6de4 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -8,16 +8,17 @@
   openssl,
   curl,
   versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hurl";
   version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "hurl";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-dmPXI2RHEi/wcdVVwBRtBgNXyBXFnm44236pqYjxgBs=";
   };
 
@@ -52,15 +53,17 @@ rustPlatform.buildRustPackage rec {
       --zsh completions/_hurlfmt
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command line tool that performs HTTP requests defined in a simple plain text format";
     homepage = "https://hurl.dev/";
-    changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/Orange-OpenSource/hurl/blob/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       eonpatapon
-      figsoda
+      defelo
     ];
     license = lib.licenses.asl20;
     mainProgram = "hurl";
   };
-}
+})
diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix
index 30be3418d8e8..7727bab93a04 100644
--- a/pkgs/by-name/hv/hvm/package.nix
+++ b/pkgs/by-name/hv/hvm/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "hvm";
     homepage = "https://github.com/higherorderco/hvm";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index b0a26d17b091..b8b15bd8ca18 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwdata";
-  version = "0.399";
+  version = "0.401";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7IhOMl0o5dyevklvOSZrTbNMkMy/Sp/MtxaPdeqpHJg=";
+    hash = "sha256-2NZwylrUfnzA0aE+xlVZ7QCpCzfW9DwGzRVHirt0TRU=";
   };
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)
diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix
index 2a72312211fe..cbce9883b497 100644
--- a/pkgs/by-name/hw/hwinfo/package.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwinfo";
-  version = "23.5";
+  version = "25.0";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = finalAttrs.version;
-    hash = "sha256-OweEFxNxQpD7blHywhmHTA66vsYG+Qvsufm3huyUhi0=";
+    hash = "sha256-8C+FM4UAn219ZQzPxk2IfK6ZKmTZNweo4oCoSYeZJ6A=";
   };
 
   nativeBuildInputs = [
@@ -49,8 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Replace /usr paths with Nix store paths
     substituteInPlace Makefile \
-      --replace-fail "/sbin" "/bin" \
-      --replace-fail "/usr/" "/"
+      --replace-fail "/sbin" "/bin"
     substituteInPlace src/isdn/cdb/Makefile \
       --replace-fail "lex isdn_cdb.lex" "flex isdn_cdb.lex"
     substituteInPlace hwinfo.pc.in \
@@ -99,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
     "CC=${stdenv.cc.targetPrefix}cc"
     "ARCH=${stdenv.hostPlatform.uname.processor}"
   ];
-  installFlags = [ "DESTDIR=$(out)" ];
+  installFlags = [
+    "INSTALL_PREFIX="
+    "DESTDIR=$(out)"
+  ];
 
   enableParallelBuilding = false; # broken parallel dependencies
 
diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix
index 0b837078abef..5153c04bd11f 100644
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "3.6.8";
+  version = "3.7.3";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-wZszjO+4n1BaiWX9Dw+chZvL89hPmugHju5JlRfPYl4=";
+    hash = "sha256-prX/6cmWEz81nj/W28QbclyaJyNmGOug/ANXee3e0Cs=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };
diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix
index 3abc5107eef3..e7ba489e65e3 100644
--- a/pkgs/by-name/hy/hydrus/package.nix
+++ b/pkgs/by-name/hy/hydrus/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "hydrus";
-  version = "631";
+  version = "646";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     tag = "v${version}";
-    hash = "sha256-YZnlQIiq0dUGEnQgVCTvNS+kuSpXlaAN5UvZAQ3xeZM=";
+    hash = "sha256-0vnX39OcONN2j7Xyae/Hb1QhH4o5WlJ6serYIPrjBUk=";
   };
 
   nativeBuildInputs = [
@@ -165,6 +165,7 @@ python3Packages.buildPythonApplication rec {
     maintainers = with lib.maintainers; [
       dandellion
       evanjs
+      KunyaKud
     ];
   };
 }
diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 098d367be445..a258372f80fe 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyfetch";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
     tag = finalAttrs.version;
-    hash = "sha256-Y9v2vrpTPlsgFRoo33NDVoyQSgUD/stKQLJXzUxFesA=";
+    hash = "sha256-nqbdkVEKuzuDDK4NivzJ6hfm3KqkFqorETiEaTqgKNY=";
   };
 
-  cargoHash = "sha256-auOeH/1KtxS7a1APOtCMwNTdEQ976BL/jEKj2ADaakQ=";
+  cargoHash = "sha256-Lem/6q0+P+1Hy+ZCJvP+O7kws49ytKEhzytT2+B4aRE=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index d0ef09a8ab75..e6e9d487dc0c 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
       --zsh $releaseDir/build/hyperfine-*/out/_hyperfine
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command-line benchmarking tool";
     homepage = "https://github.com/sharkdp/hyperfine";
@@ -37,7 +40,7 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
+      mdaniels5757
       thoughtpolice
     ];
     mainProgram = "hyperfine";
diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix
index c613d8b8f22f..7992aa8dddfa 100644
--- a/pkgs/by-name/hy/hyperrogue/package.nix
+++ b/pkgs/by-name/hy/hyperrogue/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyperrogue";
-  version = "13.1e";
+  version = "13.1f";
 
   src = fetchFromGitHub {
     owner = "zenorogue";
     repo = "hyperrogue";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-teoSI6JrqDAkyNhVaIVZcfM93LxjQah0+eJFKfI5iP4=";
+    sha256 = "sha256-HJer4CUtpJDI0aRbays9vhNTnmOYHl3eODDaLdxwjyE=";
   };
 
   env = {
diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index faf7de95740b..730cd4c4c459 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "hyperscan";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk=";
-    rev = "v${finalAttrs.version}";
   };
 
   outputs = [
@@ -28,30 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  buildInputs = [ boost ];
-  nativeBuildInputs = [
-    cmake
-    ragel
-    python3
-    util-linux
-    pkg-config
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_AVX512=ON"
-  ]
-  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON"
-  ++ lib.optional withStatic "-DBUILD_STATIC_AND_SHARED=ON"
-  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
-
-  # hyperscan CMake is completely broken for chimera builds when pcre is compiled
-  # the only option to make it build - building from source
-  # In case pcre is built from source, chimera build is turned on by default
-  preConfigure = lib.optional withStatic ''
-    mkdir -p pcre
-    tar xvf ${pcre.src} --strip-components 1 -C pcre
-  '';
-
   postPatch = ''
     sed -i '/examples/d' CMakeLists.txt
     substituteInPlace libhs.pc.in \
@@ -63,8 +39,67 @@ stdenv.mkDerivation (finalAttrs: {
         #error Incorrect pcre version
         #endif
         main() {}" CORRECT_PCRE_VERSION)' 'set(CORRECT_PCRE_VERSION TRUE)'
+  ''
+  # CMake 4 dropped support of versions lower than 3.5,
+  # versions lower than 3.10 are deprecated.
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  + ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        "cmake_minimum_required (VERSION 2.8.11)" \
+        "cmake_minimum_required (VERSION 3.10)" \
   '';
 
+  buildInputs = [ boost ];
+  nativeBuildInputs = [
+    cmake
+    ragel
+    python3
+    util-linux
+    pkg-config
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_AVX512" true)
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    (lib.cmakeBool "FAT_RUNTIME" true)
+  ]
+  ++ lib.optionals withStatic [
+    (lib.cmakeBool "BUILD_STATIC_AND_SHARED" true)
+  ]
+  ++ lib.optionals (!withStatic) [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ];
+
+  # hyperscan CMake is completely broken for chimera builds when pcre is compiled
+  # the only option to make it build - building from source
+  # In case pcre is built from source, chimera build is turned on by default
+  preConfigure = lib.optionalString withStatic (
+    ''
+      mkdir -p pcre
+      tar xvf ${pcre.src} --strip-components 1 -C pcre
+    ''
+    # - CMake 4 dropped support of versions lower than 3.5, versions lower than 3.10 are deprecated.
+    #   https://github.com/NixOS/nixpkgs/issues/445447
+    # - CMake Error at pcre/CMakeLists.txt:843 (GET_TARGET_PROPERTY):
+    #   The LOCATION property may not be read from target "pcretest".  Use the
+    #   target name directly with add_custom_command, or use the generator
+    #   expression $<TARGET_FILE>, as appropriate.
+    + ''
+      substituteInPlace pcre/CMakeLists.txt \
+        --replace-fail \
+          "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)" \
+          "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" \
+        --replace-fail \
+          "CMAKE_POLICY(SET CMP0026 OLD)" \
+          "CMAKE_POLICY(SET CMP0026 NEW)" \
+        --replace-fail \
+          "GET_TARGET_PROPERTY(PCRETEST_EXE pcretest DEBUG_LOCATION)" \
+          "set(PCRETEST_EXE $<TARGET_FILE:pcretest>)"
+    ''
+  );
+
   doCheck = true;
   checkPhase = ''
     runHook preCheck
@@ -75,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "High-performance multiple regex matching library";
     longDescription = ''
       Hyperscan is a high-performance multiple regex matching library.
@@ -91,11 +126,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     homepage = "https://www.hyperscan.io/";
-    maintainers = with maintainers; [ avnik ];
+    maintainers = with lib.maintainers; [ avnik ];
     platforms = [
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 })
diff --git a/pkgs/by-name/hy/hyprfreeze/package.nix b/pkgs/by-name/hy/hyprfreeze/package.nix
new file mode 100644
index 000000000000..4a5b6638098a
--- /dev/null
+++ b/pkgs/by-name/hy/hyprfreeze/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  jq,
+  procps,
+  psmisc,
+  libnotify,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "hyprfreeze";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "Zerodya";
+    repo = "hyprfreeze";
+    tag = "v${version}";
+    hash = "sha256-omwAWBEnb14ZBux7bvXSJyi7FI1LZ5GaZFn46/bWJA4=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 hyprfreeze $out/bin/hyprfreeze
+
+    # Install shell completions
+    install -Dm444 completions/bash/hyprfreeze $out/share/bash-completion/completions/hyprfreeze
+    install -Dm444 completions/zsh/_hyprfreeze $out/share/zsh/site-functions/_hyprfreeze
+    install -Dm444 completions/fish/hyprfreeze.fish $out/share/fish/completions/hyprfreeze.fish
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/hyprfreeze \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          jq
+          procps
+          psmisc
+          libnotify
+        ]
+      }
+  '';
+
+  meta = {
+    description = "Utility to suspend a game process (and other programs) in Hyprland";
+    homepage = "https://github.com/Zerodya/hyprfreeze";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ zerodya ];
+    platforms = lib.platforms.linux;
+    mainProgram = "hyprfreeze";
+  };
+}
diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix
index 45d2518f7270..d6f1b1ea5bd0 100644
--- a/pkgs/by-name/hy/hyprgraphics/package.nix
+++ b/pkgs/by-name/hy/hyprgraphics/package.nix
@@ -10,6 +10,7 @@
   hyprutils,
   libjpeg,
   libjxl,
+  librsvg,
   libspng,
   libwebp,
   pango,
@@ -18,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprgraphics";
-  version = "0.1.6";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprgraphics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CR6RnqEJSTiFgA6KQY4TTLUWbZ8RBnb+hxQqesuQNzQ=";
+    hash = "sha256-T6iWzDOXp8Wv0KQOCTHpBcmAOdHJ6zc/l9xaztW6Ivc=";
   };
 
   nativeBuildInputs = [
@@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     hyprutils
     libjpeg
     libjxl
+    librsvg
     libspng
     libwebp
     pango
diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix
index b045af63c591..12cac7364ae0 100644
--- a/pkgs/by-name/hy/hyprland-qtutils/package.nix
+++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   hyprutils,
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=";
   };
 
+  patches = [
+    # this should be removed in the next release
+    (fetchpatch {
+      name = "Fix build with Qt 6.10";
+      url = "https://github.com/hyprwm/hyprland-qtutils/commit/5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c.patch";
+      hash = "sha256-5nVj4AFJpmazX9o9tQD6mzBW9KtRYov4yRbGpUwFcgc=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json
index c4fefeb7a047..4b6bf834beda 100644
--- a/pkgs/by-name/hy/hyprland/info.json
+++ b/pkgs/by-name/hy/hyprland/info.json
@@ -1,7 +1,7 @@
 {
-  "branch": "v0.51.1-b",
-  "commit_hash": "71a1216abcc7031776630a6d88f105605c4dc1c9",
-  "commit_message": "[gha] Nix: update inputs",
-  "date": "2025-09-22",
-  "tag": "v0.51.1"
+  "branch": "main",
+  "commit_hash": "f56ec180d3a03a5aa978391249ff8f40f949fb73",
+  "commit_message": "version: bump to 0.52.0",
+  "date": "2025-11-07",
+  "tag": "v0.52.0"
 }
diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 2797a95b9e4e..f9193601996b 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   stdenvAdapters,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   makeWrapper,
   cmake,
@@ -91,16 +92,24 @@ assert assertMsg (
 
 customStdenv.mkDerivation (finalAttrs: {
   pname = "hyprland" + optionalString debug "-debug";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprland";
     fetchSubmodules = true;
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TPlZf0urtvDH4Cb4By06szJmzR4sBlgQATuGQy8bH6U=";
+    hash = "sha256-5jYD01l95U/HTfZMAccAvhSnrWgHIRWEjLi9R4wPIVI=";
   };
 
+  patches = [
+    # NOTE: this is required to make plugins compile. should be removed with the next release.
+    (fetchpatch {
+      url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch";
+      hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s=";
+    })
+  ];
+
   postPatch = ''
     # Fix hardcoded paths to /usr installation
     sed -i "s#/usr#$out#" src/render/OpenGL.cpp
diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix
index e5b54b5e5bcd..f25ffc8a2165 100644
--- a/pkgs/by-name/hy/hyprsysteminfo/package.nix
+++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qt6,
   pkg-config,
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-KDxT9B+1SATWiZdUBAQvZu17vk3xmyXcw2Zy56bdWbY=";
   };
 
+  patches = [
+    # Fix Qt6::WaylandClientPrivate not found
+    # https://github.com/hyprwm/hyprsysteminfo/pull/21
+    (fetchpatch {
+      url = "https://github.com/hyprwm/hyprsysteminfo/commit/fe81610278676d26ff47f62770ac238220285d3a.patch";
+      hash = "sha256-rfKyV0gkfXEhTcPHlAB+yxZ+92umBV22YOK9aLMMBhM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix
index d019d9d5a5b0..b949294ee968 100644
--- a/pkgs/by-name/hy/hyprutils/package.nix
+++ b/pkgs/by-name/hy/hyprutils/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprutils";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprutils";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FWB9Xe9iIMlUskfLzKlYH3scvnHpSC5rMyN1EDHUQmE=";
+    hash = "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=";
   };
 
   nativeBuildInputs = [
@@ -43,5 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux ++ lib.platforms.freebsd;
     teams = [ lib.teams.hyprland ];
+    maintainers = with lib.maintainers; [ logger ];
   };
 })
diff --git a/pkgs/by-name/hy/hyprviz/package.nix b/pkgs/by-name/hy/hyprviz/package.nix
index 0029ac0a80be..34f1e8375be3 100644
--- a/pkgs/by-name/hy/hyprviz/package.nix
+++ b/pkgs/by-name/hy/hyprviz/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyprviz";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "timasoft";
     repo = "hyprviz";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-voOfiiNJi6igBqkvG1zy5dakDSGHteStd2bqh6VLgU4=";
+    hash = "sha256-ar1O/Em9AcPPfbuT4xnyOwBX1IClJlFYfdPQbU/5vTk=";
   };
 
-  cargoHash = "sha256-CZcBiTyIeWS7DFWXruXM7Lvzr4qEDALvfNCnprbyKOg=";
+  cargoHash = "sha256-BICF6nZcn/7t5X4Dj18fPD2RpEz7U1Zytt9sfHe7Xnw=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix
index 337513b34072..bc4a23dd1e7b 100644
--- a/pkgs/by-name/hy/hysteria/package.nix
+++ b/pkgs/by-name/hy/hysteria/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "hysteria";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = "hysteria";
     rev = "app/v${version}";
-    hash = "sha256-j6MvVq/+buv/Md/84xUFyRh2zp8qms/1IdEREZ5trXM=";
+    hash = "sha256-EiucZQ8poLmWVGd7MElZ4FWhDdDuM0/8CiomN+TKolw=";
   };
 
-  vendorHash = "sha256-lCq+/RPbqstMR47ILJ+BdtBowFVWBDczFEg0KuF8DAQ=";
+  vendorHash = "sha256-ho5AC9kehhvPVS3CoB2Yucbk5vCVqWAe1MZGInusKk8=";
   proxyVendor = true;
 
   ldflags =
diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix
index 598ffdc52936..83b9fa9aa0cb 100644
--- a/pkgs/by-name/i2/i2pd/package.nix
+++ b/pkgs/by-name/i2/i2pd/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "USE_UPNP=${if upnpSupport then "yes" else "no"}"
+    "USE_UPNP=${lib.boolToYesNo upnpSupport}"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/i3/i3a/package.nix b/pkgs/by-name/i3/i3a/package.nix
index 525b990f0e8f..77383d86e3d9 100644
--- a/pkgs/by-name/i3/i3a/package.nix
+++ b/pkgs/by-name/i3/i3a/package.nix
@@ -6,17 +6,18 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "i3a";
-  version = "2.1.1";
+  version = "2.4.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b1bB7Gto4aL1rbQXIelBVhutjIvZY+K+Y66BGN7OcCs=";
+    hash = "sha256-BcGAFFq3UEj4o7nNQ9aStueKmeDNIqSIqkYWhs2Tnqg=";
   };
 
   build-system = [
     python3Packages.setuptools
     python3Packages.setuptools-scm
+    python3Packages.hatchling
   ];
 
   dependencies = [ python3Packages.i3ipc ];
@@ -25,11 +26,15 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "i3a" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://git.goral.net.pl/i3a.git/log/";
     description = "Set of scripts used for automation of i3 and sway window manager layouts";
     homepage = "https://git.goral.net.pl/i3a.git/about";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ moni ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      moni
+      teohz
+    ];
+    broken = python3Packages.python.version < "3.11";
   };
 }
diff --git a/pkgs/by-name/i3/i3pystatus/package.nix b/pkgs/by-name/i3/i3pystatus/package.nix
index 84b5809f9420..46c1d229cee5 100644
--- a/pkgs/by-name/i3/i3pystatus/package.nix
+++ b/pkgs/by-name/i3/i3pystatus/package.nix
@@ -7,13 +7,14 @@
   python3Packages,
   unstableGitUpdater,
   fetchpatch2,
+  writableTmpDirAsHomeHook,
   extraLibs ? [ ],
 }:
 
 python3Packages.buildPythonApplication rec {
   # i3pystatus moved to rolling release:
   # https://github.com/enkore/i3pystatus/issues/584
-  version = "3.35-unstable-2024-06-13";
+  version = "3.35-unstable-2025-06-24";
   pname = "i3pystatus";
   pyproject = true;
   build-system = [ python3Packages.setuptools ];
@@ -21,8 +22,8 @@ python3Packages.buildPythonApplication rec {
   src = fetchFromGitHub {
     owner = "enkore";
     repo = "i3pystatus";
-    rev = "f3c539ad78ad1c54fc36e8439bf3905a784ccb34";
-    hash = "sha256-3AGREY+elHQk8kaoFp8AHEzk2jNC/ICGYPh2hXo2G/w=";
+    rev = "e8e03934d95658c85fa9f594987dac0481ca26c9";
+    hash = "sha256-uAt6jxNAUR9txyPtHS4BRtu8Z5QaP6uqFg0sROf356c=";
   };
 
   patches = [
@@ -41,7 +42,10 @@ python3Packages.buildPythonApplication rec {
     libnotify
   ];
 
-  nativeCheckInputs = [ python3Packages.pytestCheckHook ];
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
 
   checkInputs = [ python3Packages.requests ];
 
diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/by-name/ia/iaito/package.nix
similarity index 50%
rename from pkgs/tools/security/iaito/default.nix
rename to pkgs/by-name/ia/iaito/package.nix
index c4fbb6987fc4..8eb467c7aca3 100644
--- a/pkgs/tools/security/iaito/default.nix
+++ b/pkgs/by-name/ia/iaito/package.nix
@@ -1,53 +1,43 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   meson,
   ninja,
   pkg-config,
   python3,
-  qtbase,
-  qttools,
+  qt6Packages,
   radare2,
-  wrapQtAppsHook,
+  stdenv,
 }:
-
-let
-  pname = "iaito";
-  version = "6.0.0";
-
-  main_src = fetchFromGitHub rec {
-    owner = "radareorg";
-    repo = pname;
-    tag = version;
-    hash = "sha256-bwGKHc2jlf1C/25CEoDUCLr6zOhAJES7+PvcGVyO8To=";
-    name = repo;
-  };
-
-  translations_src = fetchFromGitHub rec {
-    owner = "radareorg";
-    repo = "iaito-translations";
-    rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
-    hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
-    name = repo;
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
-  inherit pname version;
+  pname = "iaito";
+  version = "6.0.4";
 
   srcs = [
-    main_src
-    translations_src
+    (fetchFromGitHub {
+      owner = "radareorg";
+      repo = "iaito";
+      tag = finalAttrs.version;
+      hash = "sha256-99SuUTwHcpyJ5V9Cnanm6ylH3NVgyk3TmDoaFVwFE4E=";
+      name = "main";
+    })
+    (fetchFromGitHub {
+      owner = "radareorg";
+      repo = "iaito-translations";
+      rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
+      hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
+      name = "translations";
+    })
   ];
-  sourceRoot = "${main_src.name}/src";
+  sourceRoot = "main/src";
 
   postUnpack = ''
-    chmod -R u+w ${translations_src.name}
+    chmod -R u+w translations
   '';
 
   postPatch = ''
     substituteInPlace common/ResourcePaths.cpp \
-      --replace "/app/share/iaito/translations" "$out/share/iaito/translations"
+      --replace-fail "/app/share/iaito/translations" "$out/share/iaito/translations"
   '';
 
   nativeBuildInputs = [
@@ -55,18 +45,22 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     python3
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6Packages.qtbase
     radare2
   ];
 
+  mesonFlags = [
+    "-Dwith_qt6=true"
+  ];
+
   postBuild = ''
-    pushd ../../../${translations_src.name}
-    make build -j$NIX_BUILD_CORES PREFIX=$out
+    pushd ../../../translations
+    make build -j $NIX_BUILD_CORES PREFIX=$out
     popd
   '';
 
@@ -78,24 +72,24 @@ stdenv.mkDerivation (finalAttrs: {
     install -m644 -Dt $out/share/applications ../org.radare.iaito.desktop
     install -m644 -Dt $out/share/pixmaps ../img/org.radare.iaito.svg
 
-    pushd ../../../${translations_src.name}
+    pushd ../../../translations
     make install -j$NIX_BUILD_CORES PREFIX=$out
     popd
 
     runHook postInstall
   '';
 
-  meta = with lib; {
-    description = "Official Qt frontend of radare2";
+  meta = {
+    description = "Official radare2 GUI";
     longDescription = ''
       iaito is the official graphical interface for radare2, a libre reverse
       engineering framework.
     '';
     homepage = "https://radare.org/n/iaito.html";
     changelog = "https://github.com/radareorg/iaito/releases/tag/${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.azahi ];
+    platforms = lib.platforms.linux;
     mainProgram = "iaito";
-    platforms = platforms.linux;
   };
 })
diff --git a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
index d94101db77ae..0207c0285e11 100644
--- a/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
+++ b/pkgs/by-name/ia/iam-policy-json-to-terraform/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "iam-policy-json-to-terraform";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "flosell";
     repo = "iam-policy-json-to-terraform";
     rev = version;
-    sha256 = "sha256-xIhe+Mnvog+xRu1qMA7yxS1pCs91cr5EcaJroO+0zJ8=";
+    sha256 = "sha256-YCkM6ddTue1nYqQj56iUADl9v72Um51TLhwwGK3USEw=";
   };
 
-  vendorHash = "sha256-6EtOMs+Vba39hOQ029dHpHCJ9ke35PZ/em9Xye3dmvg=";
+  vendorHash = "sha256-HOeMkyH7voQAXCRCdfpv/Cy9oLJDY+DXwh4h2yFf7Nk=";
 
   meta = {
     description = "Small tool to convert an IAM Policy in JSON format into a Terraform aws_iam_policy_document";
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/by-name/ia/iannix/package.nix
similarity index 67%
rename from pkgs/applications/audio/iannix/default.nix
rename to pkgs/by-name/ia/iannix/package.nix
index a6b3cd769205..1ba5fd2405cd 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/by-name/ia/iannix/package.nix
@@ -1,15 +1,13 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   alsa-lib,
   pkg-config,
-  qtbase,
-  qtscript,
-  qmake,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "iannix";
   version = "unstable-2020-12-09";
 
@@ -22,24 +20,25 @@ mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
   ];
 
   qmakeFlags = [ "PREFIX=/" ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Graphical open-source sequencer";
     mainProgram = "iannix";
     homepage = "https://www.iannix.org/";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }
diff --git a/pkgs/by-name/ic/icebreaker/package.nix b/pkgs/by-name/ic/icebreaker/package.nix
index 546fe4174e77..6c4c08816b6d 100644
--- a/pkgs/by-name/ic/icebreaker/package.nix
+++ b/pkgs/by-name/ic/icebreaker/package.nix
@@ -41,7 +41,7 @@ buildGoModule {
     description = "Web app that allows students to ask real-time, anonymous questions during class";
     homepage = "https://github.com/jonhoo/icebreaker";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "icebreaker";
   };
 }
diff --git a/pkgs/by-name/ic/icecast/package.nix b/pkgs/by-name/ic/icecast/package.nix
index 5affabed1b52..7200b2e25c90 100644
--- a/pkgs/by-name/ic/icecast/package.nix
+++ b/pkgs/by-name/ic/icecast/package.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
     libopus
   ];
 
-  hardeningEnable = [ "pie" ];
-
   meta = {
     description = "Server software for streaming multimedia";
     mainProgram = "icecast";
diff --git a/pkgs/by-name/id/idevicerestore/package.nix b/pkgs/by-name/id/idevicerestore/package.nix
index 4dba23da49d1..0326144ebabc 100644
--- a/pkgs/by-name/id/idevicerestore/package.nix
+++ b/pkgs/by-name/id/idevicerestore/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "idevicerestore";
-  version = "1.0.0+date=2023-05-23";
+  version = "1.0.0-unstable-2025-10-02";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "idevicerestore";
-    rev = "609f7f058487596597e8e742088119fdd46729df";
-    hash = "sha256-VXtXAitPC1+pxZlkGBg+u6yYhyM/jVpSgDO/6dXh5V4=";
+    rev = "f4d0f7e83105cc362527566315abee07b0840848";
+    hash = "sha256-fqTVAHTxamk2lIllr7ZNHOJ1YTJHM4JpVQylMV33CJI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/id/idris2/base.nix b/pkgs/by-name/id/idris2/base.nix
new file mode 100644
index 000000000000..2d0b1aa5ebe9
--- /dev/null
+++ b/pkgs/by-name/id/idris2/base.nix
@@ -0,0 +1,5 @@
+{ mkPrelude, prelude }:
+mkPrelude {
+  name = "base";
+  dependencies = [ prelude ];
+}
diff --git a/pkgs/by-name/id/idris2/contrib.nix b/pkgs/by-name/id/idris2/contrib.nix
new file mode 100644
index 000000000000..4d15fe54961e
--- /dev/null
+++ b/pkgs/by-name/id/idris2/contrib.nix
@@ -0,0 +1,12 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+}:
+mkPrelude {
+  name = "contrib";
+  dependencies = [
+    prelude
+    base
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/libidris2_support.nix b/pkgs/by-name/id/idris2/libidris2_support.nix
new file mode 100644
index 000000000000..538da01e26d7
--- /dev/null
+++ b/pkgs/by-name/id/idris2/libidris2_support.nix
@@ -0,0 +1,33 @@
+{
+  stdenv,
+  lib,
+  gmp,
+  idris2-src,
+  idris2-version,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libidris2_support";
+  version = idris2-version;
+  src = idris2-src;
+
+  strictDeps = true;
+  buildInputs = [ gmp ];
+
+  enableParallelBuilding = true;
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optional stdenv.isDarwin "OS=";
+
+  buildFlags = [ "support" ];
+
+  installTargets = "install-support";
+
+  postInstall = ''
+    mv "$out/idris2-${finalAttrs.version}/lib" "$out/lib"
+    mv "$out/idris2-${finalAttrs.version}/support" "$out/share"
+    rm -rf $out/idris2-${finalAttrs.version}
+  '';
+
+  meta.description = "Runtime library for Idris2";
+})
diff --git a/pkgs/by-name/id/idris2/linear.nix b/pkgs/by-name/id/idris2/linear.nix
new file mode 100644
index 000000000000..162618d272ac
--- /dev/null
+++ b/pkgs/by-name/id/idris2/linear.nix
@@ -0,0 +1,12 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+}:
+mkPrelude {
+  name = "linear";
+  dependencies = [
+    prelude
+    base
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/mkPrelude.nix b/pkgs/by-name/id/idris2/mkPrelude.nix
new file mode 100644
index 000000000000..90659c8c4fe6
--- /dev/null
+++ b/pkgs/by-name/id/idris2/mkPrelude.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  idris2-src,
+  idris2-version,
+  idris2-unwrapped,
+}:
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+
+  excludeDrvArgNames = [
+    "dependencies"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      name,
+      dependencies ? [ ],
+    }:
+    {
+      pname = name;
+      version = idris2-version;
+      src = idris2-src;
+      strictDeps = true;
+
+      makeFlags = "IDRIS2=${lib.getExe idris2-unwrapped}";
+
+      enableParallelBuilding = true;
+      preBuild = ''
+        cd libs/${name}
+      '';
+
+      env = {
+        IDRIS2_PREFIX = placeholder "out";
+        IDRIS2_PACKAGE_PATH = lib.makeSearchPath "idris2-${idris2-version}" dependencies;
+      };
+    };
+}
diff --git a/pkgs/by-name/id/idris2/network.nix b/pkgs/by-name/id/idris2/network.nix
new file mode 100644
index 000000000000..c5c6deee1813
--- /dev/null
+++ b/pkgs/by-name/id/idris2/network.nix
@@ -0,0 +1,14 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+  linear,
+}:
+mkPrelude {
+  name = "network";
+  dependencies = [
+    prelude
+    base
+    linear
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
new file mode 100644
index 000000000000..f119eb143e4c
--- /dev/null
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  newScope,
+  fetchFromGitHub,
+}:
+let
+  idris2CompilerPackages = lib.makeScope newScope (
+    self:
+    let
+      inherit (self) callPackage;
+    in
+    {
+      # Compiler version & repo
+      idris2-version = "0.8.0";
+      idris2-src = fetchFromGitHub {
+        owner = "idris-lang";
+        repo = "Idris2";
+        rev = "v${self.idris2-version}";
+        hash = "sha256-MvFNSPpgONSTjACH3HGWEiNgz9aAeBPmyQwFe21+fe0=";
+      };
+      # Prelude libraries
+      mkPrelude = callPackage ./mkPrelude.nix { }; # Build helper
+      prelude = callPackage ./prelude.nix { };
+      base = callPackage ./base.nix { };
+      linear = callPackage ./linear.nix { };
+      network = callPackage ./network.nix { };
+      contrib = callPackage ./contrib.nix { };
+      test = callPackage ./test.nix { };
+
+      libidris2_support = callPackage ./libidris2_support.nix { };
+      idris2-unwrapped = callPackage ./unwrapped.nix { };
+    }
+  );
+in
+idris2CompilerPackages.idris2-unwrapped.withPackages (_: [ ])
diff --git a/pkgs/by-name/id/idris2/prelude.nix b/pkgs/by-name/id/idris2/prelude.nix
new file mode 100644
index 000000000000..7dd74db76f0d
--- /dev/null
+++ b/pkgs/by-name/id/idris2/prelude.nix
@@ -0,0 +1,6 @@
+{
+  mkPrelude,
+}:
+mkPrelude {
+  name = "prelude";
+}
diff --git a/pkgs/by-name/id/idris2/test.nix b/pkgs/by-name/id/idris2/test.nix
new file mode 100644
index 000000000000..6cbe06e0e487
--- /dev/null
+++ b/pkgs/by-name/id/idris2/test.nix
@@ -0,0 +1,14 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+  contrib,
+}:
+mkPrelude {
+  name = "test";
+  dependencies = [
+    prelude
+    base
+    contrib
+  ];
+}
diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix
similarity index 92%
rename from pkgs/development/compilers/idris2/tests.nix
rename to pkgs/by-name/id/idris2/tests.nix
index b26227d7c4ed..079ac6edc614 100644
--- a/pkgs/development/compilers/idris2/tests.nix
+++ b/pkgs/by-name/id/idris2/tests.nix
@@ -2,9 +2,9 @@
   stdenv,
   runCommand,
   lib,
-  pname,
   idris2,
   idris2Packages,
+  chez,
   zsh,
   tree,
 }:
@@ -18,6 +18,7 @@ let
       packages ? [ ],
     }:
     let
+      inherit (idris2) pname;
       packageString = builtins.concatStringsSep " " (map (p: "--package " + p) packages);
     in
     runCommand "${pname}-${testName}"
@@ -28,7 +29,8 @@ let
         # is not the case with pure nix environments. Thus, we need to include zsh
         # when we build for darwin in tests. While this is impure, this is also what
         # we find in real darwin hosts.
-        nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+        strictDeps = true;
+        nativeBuildInputs = [ chez ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
       }
       ''
         set -eo pipefail
@@ -39,6 +41,7 @@ let
 
         ${idris2}/bin/idris2 ${packageString} -o packageTest packageTest.idr
 
+        patchShebangs --build ./build/exec/packageTest
         GOT=$(./build/exec/packageTest)
 
         if [ "$GOT" = "${want}" ]; then
@@ -61,12 +64,14 @@ let
       expectedTree,
     }:
     let
+      inherit (idris2) pname;
       idrisPkg = transformBuildIdrisOutput (idris2Packages.buildIdris buildIdrisArgs);
     in
     runCommand "${pname}-${testName}"
       {
         meta.timeout = 60;
 
+        strictDeps = true;
         nativeBuildInputs = [ tree ];
       }
       ''
@@ -144,9 +149,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library { withSource = false; };
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   `-- pkg.ipkg
@@ -181,9 +186,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library { withSource = true; };
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   |-- Main.idr
@@ -219,9 +224,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library'.withSource;
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   |-- Main.idr
diff --git a/pkgs/by-name/id/idris2/unwrapped.nix b/pkgs/by-name/id/idris2/unwrapped.nix
new file mode 100644
index 000000000000..d932f720ba31
--- /dev/null
+++ b/pkgs/by-name/id/idris2/unwrapped.nix
@@ -0,0 +1,173 @@
+{
+  lib,
+  stdenv,
+  chez,
+  chez-racket,
+  clang,
+  gmp,
+  installShellFiles,
+  gambit,
+  nodejs,
+  zsh,
+  callPackage,
+  idris2Packages,
+  testers,
+  libidris2_support,
+  idris2-version,
+  idris2-src,
+}:
+let
+  inherit (stdenv.hostPlatform) extensions;
+
+  # Runtime library
+  libsupportLib = lib.makeLibraryPath [ libidris2_support ];
+  libsupportShare = lib.makeSearchPath "share" [ libidris2_support ];
+
+  platformChez =
+    if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then
+      chez
+    else
+      chez-racket;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "idris2";
+  version = idris2-version;
+  src = idris2-src;
+
+  postPatch = ''
+    shopt -s globstar
+
+    # Patch all occurences of the support lib with an absolute path so it
+    # works without wrapping.
+    substituteInPlace **/*.idr \
+      --replace-quiet "libidris2_support" "${libidris2_support}/lib/libidris2_support${extensions.sharedLibrary}"
+
+    # The remove changes libidris2_support.a to /nix/store/..../libidris2_support.so.a
+    # Fix that up so the reference-counted C backend works
+    substituteInPlace src/Compiler/RefC/CC.idr \
+      --replace-fail "libidris2_support${extensions.sharedLibrary}.a" "libidris2_support.a"
+
+    substituteInPlace bootstrap-stage2.sh \
+      --replace-fail "MAKE all" "MAKE idris2-exec"
+
+    patchShebangs --build tests
+  '';
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    clang
+    platformChez
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+  buildInputs = [
+    platformChez
+    gmp
+    libidris2_support
+  ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "IDRIS2_SUPPORT_DIR=${libsupportLib}"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
+
+  # The name of the main executable of pkgs.chez is `scheme`
+  buildFlags = [
+    "bootstrap"
+    "SCHEME=scheme"
+    "IDRIS2_LIBS=${libsupportLib}"
+    "IDRIS2_DATA=${libsupportShare}"
+  ];
+
+  doCheck = false;
+  checkTarget = "test";
+  nativeCheckInputs = [
+    gambit
+    nodejs
+  ];
+  checkFlags = [
+    "INTERACTIVE="
+    "IDRIS2_DATA=${libsupportShare}"
+    "IDRIS2_LIBS=${libsupportLib}"
+    "TEST_IDRIS2_DATA=${libsupportShare}"
+    "TEST_IDRIS2_LIBS=${libsupportLib}"
+    "TEST_IDRIS2_SUPPORT_DIR=${libsupportLib}"
+  ];
+
+  installTargets = "install-idris2";
+
+  postInstall = ''
+    # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
+    rm $out/bin/idris2
+
+    # The only thing we need from idris2_app is the actual binary, which is a Chez
+    # scheme object and for some reason *.so on darwin too
+    mv $out/bin/idris2_app/idris2.so $out/bin/idris2
+
+    rm -rf $out/bin/idris2_app
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd idris2 \
+      --bash <($out/bin/idris2 --bash-completion-script idris2)
+  '';
+
+  # Run package tests
+  passthru = {
+    inherit libidris2_support;
+    tests = {
+      wrapped = testers.testVersion {
+        package = finalAttrs.finalPackage.withPackages (p: [ p.idris2Api ]);
+      };
+
+      prelude = testers.runCommand {
+        name = "idris2-prelude-wrapped";
+        script = ''
+          local packages=$(idris2 --list-packages)
+
+          if ! [[ $packages =~ "contrib" ]]; then
+            exit 1
+          fi
+
+          touch "$out"
+        '';
+
+        nativeBuildInputs = [
+          (finalAttrs.finalPackage.withPackages (_: [ ]))
+        ];
+      };
+    }
+    // (callPackage ./tests.nix {
+      idris2 = finalAttrs.finalPackage.withPackages (_: [ ]);
+      idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
+    });
+
+    chez = platformChez;
+
+    withPackages =
+      f:
+      callPackage ./wrapped.nix {
+        idris2-unwrapped = finalAttrs.finalPackage;
+        extraPackages = f idris2Packages;
+      };
+
+    updateScript = ./update.nu;
+  };
+
+  meta = {
+    description = "Purely functional programming language with first class types";
+    mainProgram = "idris2";
+    homepage = "https://github.com/idris-lang/Idris2";
+    changelog = "https://github.com/idris-lang/Idris2/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      fabianhjr
+      wchresta
+      mattpolzin
+      RossSmyth
+    ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/id/idris2/update.nu b/pkgs/by-name/id/idris2/update.nu
new file mode 100755
index 000000000000..c687b4646d6e
--- /dev/null
+++ b/pkgs/by-name/id/idris2/update.nu
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -I ./.
+#! nix-shell -i nu
+#! nix-shell -p nushell nix
+
+const PACKAGE = './pkgs/by-name/id/idris2/package.nix'
+
+def main [] {
+  let tag = http get "https://api.github.com/repos/idris-lang/Idris2/releases"
+    | sort-by -r created_at
+    | first
+    | get tag_name
+
+  print $"Newest version: ($tag)"
+
+  let hash = run-external "nix" "flake" "prefetch" "--json" $"github:idris-lang/Idris2/($tag)"
+    | from json
+    | get hash
+
+  let current_hash = nix eval -f ./. idris2.unwrapped.src.outputHash --json | from json
+  let current_version = nix eval -f ./. idris2.version --json | from json
+
+  $PACKAGE
+    | open
+    | str replace $current_version ($tag | str trim -c 'v')
+    | str replace $current_hash $hash
+    | save -f $PACKAGE
+}
diff --git a/pkgs/by-name/id/idris2/wrapped.nix b/pkgs/by-name/id/idris2/wrapped.nix
new file mode 100644
index 000000000000..c1170dc2d854
--- /dev/null
+++ b/pkgs/by-name/id/idris2/wrapped.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  makeBinaryWrapper,
+  symlinkJoin,
+  idris2-unwrapped,
+  prelude,
+  linear,
+  base,
+  network,
+  contrib,
+  test,
+  extraPackages ? [ ],
+}:
+let
+  preludeLibs = [
+    prelude
+    linear
+    base
+    network
+    contrib
+    test
+  ];
+  supportLibrariesPath = lib.makeLibraryPath [ idris2-unwrapped.libidris2_support ];
+  supportSharePath = lib.makeSearchPath "share" [ idris2-unwrapped.libidris2_support ];
+  packagePath = lib.makeSearchPath "idris2-${idris2-unwrapped.version}" (
+    preludeLibs ++ extraPackages
+  );
+in
+symlinkJoin {
+  inherit (idris2-unwrapped) version;
+  pname = "idris2-wrapped";
+
+  paths = [ idris2-unwrapped ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = ''
+    wrapProgram "$out/bin/idris2" \
+      --set CHEZ "${lib.getExe idris2-unwrapped.chez}" \
+      --suffix IDRIS2_LIBS ':' "${supportLibrariesPath}" \
+      --suffix IDRIS2_DATA ':' "${supportSharePath}" \
+      --suffix IDRIS2_PACKAGE_PATH ':' ${packagePath} \
+      --suffix LD_LIBRARY_PATH ':' "${supportLibrariesPath}" \
+      --suffix DYLD_LIBRARY_PATH ':' "${supportLibrariesPath}"
+  '';
+
+  passthru = {
+    prelude = preludeLibs;
+    unwrapped = idris2-unwrapped;
+    src = idris2-unwrapped.src;
+  }
+  // idris2-unwrapped.passthru;
+
+  meta = {
+    # Manually inherit so that pos works
+    inherit (idris2-unwrapped.meta)
+      description
+      mainProgram
+      homepage
+      changelog
+      license
+      maintainers
+      platforms
+      ;
+  };
+}
diff --git a/pkgs/by-name/ie/ieda/fix-cmake-require.patch b/pkgs/by-name/ie/ieda/fix-cmake-require.patch
new file mode 100644
index 000000000000..0810e40f6c08
--- /dev/null
+++ b/pkgs/by-name/ie/ieda/fix-cmake-require.patch
@@ -0,0 +1,96 @@
+diff --git a/src/operation/iPNP/CMakeLists.txt b/src/operation/iPNP/CMakeLists.txt
+index b8f308a6e..4749d5024 100644
+--- a/src/operation/iPNP/CMakeLists.txt
++++ b/src/operation/iPNP/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ set (CMAKE_CXX_STANDARD 20)
+ 
+ add_subdirectory(api)
+diff --git a/src/third_party/pybind11/CMakeLists.txt b/src/third_party/pybind11/CMakeLists.txt
+index 0d9320388..5b5967713 100644
+--- a/src/third_party/pybind11/CMakeLists.txt
++++ b/src/third_party/pybind11/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # All rights reserved. Use of this source code is governed by a
+ # BSD-style license that can be found in the LICENSE file.
+ 
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.22)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/CMakeLists.txt b/src/third_party/pybind11/tests/CMakeLists.txt
+index 9beb268ed..417cd04d0 100644
+--- a/src/third_party/pybind11/tests/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # All rights reserved. Use of this source code is governed by a
+ # BSD-style license that can be found in the LICENSE file.
+ 
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
+index f7d693998..2847142a4 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
+index d7ca4db55..74322f598 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ project(test_installed_module CXX)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
+index bc5e101f1..2d21a21de 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+index 58cdd7cfd..f9835f31e 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+index 01557c439..6d96cc3b3 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+index ba82fdee2..6f8e04429 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index 9efef4c1c61e..b33a3cefa371 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -21,38 +21,38 @@
   gmp,
   python3,
   onnxruntime,
+  pkg-config,
+  curl,
+  onetbb,
 }:
 let
   rootSrc = stdenv.mkDerivation {
     pname = "iEDA-src";
-    version = "2025-06-30";
+    version = "2025-09-10";
     src = fetchgit {
       url = "https://gitee.com/oscc-project/iEDA";
-      rev = "689f172c726c3934d49577f09adb5b09804f11e5";
-      sha256 = "sha256-JJePIn+NUScb+3o67vT31BoKHcfBuE9osV4SrcicFds=";
+      rev = "614a91b4d18ba7dc561315f2d5fdae4a5451f486";
+      sha256 = "sha256-xn1hpnSyO+jauYYhlsKjBkkD3RJ1GqbHtnWRe/My1R0=";
     };
 
     patches = [
       # This patch is to fix the build error caused by the missing of the header file,
       # and remove some libs or path that they hard-coded in the source code.
-      # Should be removed after we upstream these changes.
+      # Due to the way they organized the source code, it's hard to upstream this patch.
+      # So we have to maintain this patch locally.
       (fetchpatch {
-        url = "https://github.com/Emin017/iEDA/commit/c17e42a3673afd9c7ace9374f85290a85354bb78.patch";
-        hash = "sha256-xa1oSy3OZ5r0TigGywzpVPvpPnA7L6RIcNktfFen4AA=";
+        url = "https://github.com/Emin017/iEDA/commit/c6b642f3db6c156eaf4f1203612592c86e49e1b5.patch";
+        hash = "sha256-L0bmW7kadmLLng9rZOT1NpvniBpuD8SUqCfeH2cCrdg=";
       })
-      # This patch is to fix the compile error on the newer version of gcc/g++
-      # We remove some forward declarations which are not allowed in newer versions of gcc/g++
-      # Should be removed after we upstream these changes.
-      (fetchpatch {
-        url = "https://github.com/Emin017/iEDA/commit/f5464cc40a2c671c5d405f16b509e2fa8d54f7f1.patch";
-        hash = "sha256-uVMV/CjkX9oLexHJbQvnEDOET/ZqsEPreI6EQb3Z79s=";
-      })
-    ];
-
-    postPatch = ''
       # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux
-      sed -i '17,28s/^/# /' src/operation/iCTS/test/CMakeLists.txt
-    '';
+      (fetchpatch {
+        url = "https://github.com/Emin017/iEDA/commit/87c5dded74bc452249e8e69f4a77dd1bed7445c2.patch";
+        hash = "sha256-1Hd0DYnB5lVAoAcB1la5tDlox4cuQqApWDiiWtqWN0Q=";
+      })
+      # Fix CMake version requirement to support newer CMake versions,
+      # Should be removed once upstream fixed it.
+      ./fix-cmake-require.patch
+    ];
 
     dontBuild = true;
     dontFixup = true;
@@ -66,7 +66,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "iEDA";
-  version = "0-unstable-2025-06-30";
+  version = "0.1.0-unstable-2025-09-10";
 
   src = rootSrc;
 
@@ -77,6 +77,7 @@ stdenv.mkDerivation {
     bison
     python3
     tcl
+    pkg-config
   ];
 
   cmakeFlags = [
@@ -108,6 +109,8 @@ stdenv.mkDerivation {
     gmp
     tcl
     zlib
+    curl
+    onetbb
   ];
 
   postInstall = ''
@@ -128,7 +131,7 @@ stdenv.mkDerivation {
     runHook postInstallCheck
   '';
 
-  doInstallCheck = true;
+  doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038
 
   enableParallelBuild = true;
 
diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix
index 89400f253c05..0d9c5f99c6ba 100644
--- a/pkgs/by-name/ig/igraph/package.nix
+++ b/pkgs/by-name/ig/igraph/package.nix
@@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "igraph";
-  version = "0.10.17";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "igraph";
     repo = "igraph";
-    rev = finalAttrs.version;
-    hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
+    tag = finalAttrs.version;
+    hash = "sha256-SwcihzISSmeVhpMrysOhWrUzVVuB4ZBVEjC0vHJwrdw=";
   };
 
   postPatch = ''
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "C library for complex network analysis and graph theory";
     homepage = "https://igraph.org/";
-    changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [
diff --git a/pkgs/by-name/ig/igraph_0/package.nix b/pkgs/by-name/ig/igraph_0/package.nix
new file mode 100644
index 000000000000..8ad73481f351
--- /dev/null
+++ b/pkgs/by-name/ig/igraph_0/package.nix
@@ -0,0 +1,112 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  arpack,
+  bison,
+  blas,
+  cmake,
+  flex,
+  fop,
+  glpk,
+  gmp,
+  hal-hardware-analyzer,
+  lapack,
+  libxml2,
+  libxslt,
+  llvmPackages,
+  pkg-config,
+  plfit,
+  python3,
+  sourceHighlight,
+  xmlto,
+}:
+
+assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64);
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "igraph";
+  version = "0.10.17";
+
+  src = fetchFromGitHub {
+    owner = "igraph";
+    repo = "igraph";
+    tag = finalAttrs.version;
+    hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
+  };
+
+  postPatch = ''
+    echo "${finalAttrs.version}" > IGRAPH_VERSION
+  '';
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    fop
+    libxml2
+    libxslt
+    pkg-config
+    python3
+    sourceHighlight
+    xmlto
+  ];
+
+  buildInputs = [
+    arpack
+    blas
+    glpk
+    gmp
+    lapack
+    libxml2
+    plfit
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
+
+  cmakeFlags = [
+    "-DIGRAPH_USE_INTERNAL_BLAS=OFF"
+    "-DIGRAPH_USE_INTERNAL_LAPACK=OFF"
+    "-DIGRAPH_USE_INTERNAL_ARPACK=OFF"
+    "-DIGRAPH_USE_INTERNAL_GLPK=OFF"
+    "-DIGRAPH_USE_INTERNAL_GMP=OFF"
+    "-DIGRAPH_USE_INTERNAL_PLFIT=OFF"
+    "-DIGRAPH_GLPK_SUPPORT=ON"
+    "-DIGRAPH_GRAPHML_SUPPORT=ON"
+    "-DIGRAPH_OPENMP_SUPPORT=ON"
+    "-DIGRAPH_ENABLE_LTO=AUTO"
+    "-DIGRAPH_ENABLE_TLS=ON"
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
+  doCheck = true;
+
+  postInstall = ''
+    mkdir -p "$out/share"
+    cp -r doc "$out/share"
+  '';
+
+  postFixup = ''
+    substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \
+      --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib
+  '';
+
+  meta = with lib; {
+    description = "C library for complex network analysis and graph theory";
+    homepage = "https://igraph.org/";
+    changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    inherit (hal-hardware-analyzer.meta) maintainers;
+  };
+})
diff --git a/pkgs/by-name/ig/igv/package.nix b/pkgs/by-name/ig/igv/package.nix
index f15fb382ce18..6806f71193ef 100644
--- a/pkgs/by-name/ig/igv/package.nix
+++ b/pkgs/by-name/ig/igv/package.nix
@@ -10,10 +10,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.19.6";
+  version = "2.19.7";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
-    sha256 = "sha256-hemTOCNBfigpvlFStBbxGGLpORYPfh6vn1pyE8hKWHw=";
+    sha256 = "sha256-IkzaQAM+s1boEKo/3ShtbUhihrhxLQCTz8/0lzAyYJA=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix
index 137dff309b13..95f364565ceb 100644
--- a/pkgs/by-name/ii/iio-hyprland/package.nix
+++ b/pkgs/by-name/ii/iio-hyprland/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "iio-hyprland";
-  version = "0-unstable-2025-08-21";
+  version = "0-unstable-2025-10-06";
 
   src = fetchFromGitHub {
     owner = "JeanSchoeller";
     repo = "iio-hyprland";
-    rev = "282f38c700ebf0b69df5aae40134d56e4cd67775";
-    hash = "sha256-mzp2KV9SAsZL/exXSZHFPArcTV8uh3LXufADKX4ppEU=";
+    rev = "801c4722ea678ddf103fc0ff4c3c0211d13ad046";
+    hash = "sha256-asLtzpUbwr+Wq2uQvITORBnrxh/mIZneYyfhdsElTeI=";
   };
 
   buildInputs = [ dbus ];
diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix
new file mode 100644
index 000000000000..e203e26149a8
--- /dev/null
+++ b/pkgs/by-name/ii/iio-niri/package.nix
@@ -0,0 +1,37 @@
+{
+  rustPlatform,
+  lib,
+  fetchFromGitHub,
+  dbus,
+  pkg-config,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "iio-niri";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "Zhaith-Izaliel";
+    repo = "iio-niri";
+    tag = "v${version}";
+    hash = "sha256-IOMJ1xtjUkUoUgFZ9pxBf5XKdaUHu3WbUH5TlEiNRc4=";
+  };
+
+  cargoHash = "sha256-b05Jy+EKFAUcHR9+SdjHZUcIZG0Ta+ar/qc0GdRlJik=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    dbus
+  ];
+
+  meta = {
+    description = "Listen to iio-sensor-proxy and updates Niri output orientation depending on the accelerometer orientation";
+    homepage = "https://github.com/Zhaith-Izaliel/iio-niri";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zhaithizaliel ];
+    mainProgram = "iio-niri";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/im/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix
index 520a20799503..e5b3772d51b6 100644
--- a/pkgs/by-name/im/image-roll/package.nix
+++ b/pkgs/by-name/im/image-roll/package.nix
@@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "image-roll";
     homepage = "https://github.com/weclaw1/image-roll";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index efdc4991ad94..1e0c8bed3483 100644
--- a/pkgs/by-name/im/imagelol/package.nix
+++ b/pkgs/by-name/im/imagelol/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  libpng,
+  stb,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,10 +27,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/MCredstoner2004/ImageLOL/commit/013fb1f901d88f5fd21a896bfab47c7fff0737d7.patch";
       hash = "sha256-RVaG2xbUqE4CxqI2lhvug2qihT6A8vN+pIfK58CXLDw=";
       includes = [ "imagelol/ImageLOL.inl" ];
-      # change lib/ for imagelol
       stripLen = 2;
       extraPrefix = "imagelol/";
     })
+    # use system libraries instead of bundled versions
+    ./use-system-libs.patch
   ];
 
   # fix for case-sensitive filesystems
@@ -36,22 +39,28 @@ stdenv.mkDerivation rec {
   postPatch = ''
     mv imagelol src
     substituteInPlace CMakeLists.txt \
-      --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
+      --replace-fail 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
+
+    # use system stb headers
+    substituteInPlace External/stb_image-cmake/CMakeLists.txt \
+      --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/../stb"' '"${stb}/include/stb"'
+
+    # remove bundled libraries
+    rm -r External/zlib External/zlib-no-examples External/libpng External/stb
   '';
 
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ./ImageLOL $out/bin
-  '';
+  buildInputs = [
+    libpng
+    stb
+  ];
 
-  cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90")
-  ]
-  ++ lib.optional (
-    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
-  ) "-DPNG_ARM_NEON=off";
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 ImageLOL -t $out/bin
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/MCredstoner2004/ImageLOL";
diff --git a/pkgs/by-name/im/imagelol/use-system-libs.patch b/pkgs/by-name/im/imagelol/use-system-libs.patch
new file mode 100644
index 000000000000..05e89a41d16b
--- /dev/null
+++ b/pkgs/by-name/im/imagelol/use-system-libs.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,26 +3,12 @@
+ project(ImageLOL VERSION 0.0)
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED True)
+-include_directories("External/zlib" "External/libpng")
+ add_subdirectory("External/stb_image-cmake")
+
+-set(SKIP_INSTALL_ALL ON CACHE BOOL "")
+-add_subdirectory("External/zlib-no-examples")
+-
+-set(PNG_BUILD_ZLIB ON CACHE BOOL "")
+-link_libraries(zlibstatic)
+-get_target_property(ZLIB_INCLUDE_DIRECTORIES zlibstatic INCLUDE_DIRECTORIES)
+-include_directories(${ZLIB_INCLUDE_DIRECTORIES})
+-set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRECTORIES} CACHE PATH "")
+-set(PNG_SHARED OFF CACHE BOOL "")
+-set(PNG_EXECUTABLES OFF CACHE BOOL "")
+-add_subdirectory("External/libpng")
+-add_dependencies(png_static zlibstatic zlib)
+-add_dependencies(genfiles zlibstatic)
+-unset(SKIP_INSTALL_ALL CACHE)
+-get_target_property(LIBPNG_INCLUDE_DIRECTORIES png_static INCLUDE_DIRECTORIES)
++find_package(PNG REQUIRED)
++set(LIBPNG_INCLUDE_DIRECTORIES ${PNG_INCLUDE_DIRS})
+
+ add_subdirectory("imagelol")
+ add_executable(ImageLOL main.cpp)
+ target_include_directories(ImageLOL PRIVATE ${LIBPNG_INCLUDE_DIRECTORIES})
+-target_link_libraries(ImageLOL PRIVATE stb_image png_static zlibstatic libimagelol)
++target_link_libraries(ImageLOL PRIVATE stb_image PNG::PNG libimagelol)
diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index d327a778ea77..8d65760c9002 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "immich-cli";
-  version = "2.2.97";
+  version = "2.2.101";
   inherit (immich) src pnpmDeps;
 
   postPatch = ''
diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix
index fdfb91acc17c..3bf6a481767a 100644
--- a/pkgs/by-name/im/immich-go/package.nix
+++ b/pkgs/by-name/im/immich-go/package.nix
@@ -55,7 +55,7 @@ buildGoModule rec {
   ];
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
     tests.versionTest = testers.testVersion {
       package = immich-go;
       command = "immich-go --version";
diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index ce78b6c6c49a..92bf2b833aab 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -22,6 +22,10 @@ python.pkgs.buildPythonApplication rec {
     "pydantic-settings"
   ];
 
+  pythonRemoveDeps = [
+    "setuptools"
+  ];
+
   build-system = with python.pkgs; [
     hatchling
     cython
@@ -45,6 +49,7 @@ python.pkgs.buildPythonApplication rec {
       gunicorn
       huggingface-hub
       tokenizers
+      rapidocr
     ]
     ++ uvicorn.optional-dependencies.standard;
 
diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index b8efe38c1b14..96e86ec076dc 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.13.2";
+  version = "1.14.1";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-AoRqlTEwcS+RhN59/opqlYAftihmN20mW6Vn6RbLzSw=";
+    hash = "sha256-M1BFFiToG29TQGOx61J7QOYrv1N2oUAPtN2bYJk1Bmk=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-ZH1D0Q5SCoOwr8CLe2HLMy4xJoO3VLha4MfE9fBmhec=";
+  npmDepsHash = "sha256-RAerbmCN3znIDqcFrGmfcSFzpj3gb5PbNLTKXLZvH0Y=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 9ebb052dbb2f..aa698cf0a012 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -34,7 +34,7 @@
 }:
 let
   pnpm = pnpm_10;
-  version = "2.1.0";
+  version = "2.2.3";
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -108,14 +108,14 @@ let
     owner = "immich-app";
     repo = "immich";
     tag = "v${version}";
-    hash = "sha256-xbOzTJKutuR5/oRBUyXjZ4FWAmDnWO+nS7dQcNNRHlE=";
+    hash = "sha256-OoToTRDPXWOa7d1j1xvkZt+vKWBX4eHDiIsFs3bIlvw=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     pname = "immich";
     inherit version src;
     fetcherVersion = 2;
-    hash = "sha256-JqI7te2M88CVfvqEOIggGn64Ue0rkrMlC6HvSRW1CU0=";
+    hash = "sha256-igkO0ID0/9uPtFAXL2v5bcFbCpZK2lcYEctWBKtFKdU=";
   };
 
   web = stdenv.mkDerivation {
@@ -251,7 +251,7 @@ stdenv.mkDerivation {
 
   passthru = {
     tests = {
-      inherit (nixosTests) immich immich-vectorchord-migration;
+      inherit (nixosTests) immich immich-vectorchord-migration immich-vectorchord-reindex;
     };
 
     machine-learning = immich-machine-learning;
diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix
index 6ff3b34bef70..cd63013a75cd 100644
--- a/pkgs/by-name/im/immudb/package.nix
+++ b/pkgs/by-name/im/immudb/package.nix
@@ -15,13 +15,13 @@ let
 in
 buildGoModule rec {
   pname = "immudb";
-  version = "1.9.7";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "codenotary";
     repo = "immudb";
     rev = "v${version}";
-    sha256 = "sha256-tYQYQyYhHMn0+PQWDEb4zY9EbDt1pVzZIcP0Gnsplrk=";
+    sha256 = "sha256-RsDM+5/a3huBJ6HfaALpw+KpcIfg198gZfC4c4DsDlU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index c8af217646fd..d64655d707d2 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "impala";
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "impala";
     rev = "v${version}";
-    hash = "sha256-E3Vb2ZgpU0Qj5IoyB1zCyhUD1Cz07TVV0B2M6IFZ6KQ=";
+    hash = "sha256-CRnGycN2juXXNI1LhAH5HQbmXYatBZ0GxYKYgb5SBSE=";
   };
 
-  cargoHash = "sha256-vRhv3hu6GsyOJZdP+zMFHnlNa3ETksSp6p18nVUUMQc=";
+  cargoHash = "sha256-fBeSbJdFwT/ZwK2FTJQtZakKqMiAICMY2rkbNnYOGzU=";
 
   meta = {
     description = "TUI for managing wifi";
diff --git a/pkgs/by-name/im/impression/package.nix b/pkgs/by-name/im/impression/package.nix
index 99144834ec56..e7a57617c2d4 100644
--- a/pkgs/by-name/im/impression/package.nix
+++ b/pkgs/by-name/im/impression/package.nix
@@ -24,18 +24,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "impression";
-  version = "3.5.1";
+  version = "3.5.3";
 
   src = fetchFromGitLab {
     owner = "adhami3310";
     repo = "Impression";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xSgH1k/K52sh3qcIHWyv/WgRX9sVWZAXm+OabWbbNJo=";
+    hash = "sha256-kS2uWYwYNdgHF5NBPqvFlkFvnv7VTTqWG5Y2g282d24=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-cBaScjnhWW9nLFdeCuW7jzlJ8qZecc0FxjpJTRZJ6Lo=";
+    hash = "sha256-j1fSzEGgKVp5iPvU+yoXFHrG7E6HsaNWk0Ofpr0SHzQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix
index 47e257e65e2e..656590150e2b 100644
--- a/pkgs/by-name/im/imv/package.nix
+++ b/pkgs/by-name/im/imv/package.nix
@@ -27,7 +27,6 @@
     "libheif"
     "libnsgif"
   ],
-  freeimage,
   libtiff,
   libjpeg_turbo,
   libjxl,
@@ -50,7 +49,6 @@ let
 
   backends = {
     inherit
-      freeimage
       libtiff
       libpng
       librsvg
@@ -59,6 +57,7 @@ let
       libnsgif
       ;
     libjpeg = libjpeg_turbo;
+    freeimage = throw "freeimage backend not supported";
   };
 
   backendFlags = map (
diff --git a/pkgs/applications/audio/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch b/pkgs/by-name/in/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
similarity index 100%
rename from pkgs/applications/audio/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
rename to pkgs/by-name/in/in-formant/0001-Avoid-using-vendored-dependencies-we-have-in-nixpkgs.patch
diff --git a/pkgs/applications/audio/in-formant/default.nix b/pkgs/by-name/in/in-formant/package.nix
similarity index 90%
rename from pkgs/applications/audio/in-formant/default.nix
rename to pkgs/by-name/in/in-formant/package.nix
index e6eabd58225a..df102858fa98 100644
--- a/pkgs/applications/audio/in-formant/default.nix
+++ b/pkgs/by-name/in/in-formant/package.nix
@@ -3,20 +3,18 @@
   cmake,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
   fftw,
   libtorch-bin,
   portaudio,
   eigen,
-  xorg,
   pkg-config,
   autoPatchelfHook,
   soxr,
   libsamplerate,
   armadillo,
   tomlplusplus,
+  libxcb,
+  kdePackages,
 }:
 
 stdenv.mkDerivation {
@@ -40,18 +38,18 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     autoPatchelfHook
   ];
 
   buildInputs = [
-    qtbase
-    qtcharts
+    kdePackages.qtbase
+    kdePackages.qtcharts
     fftw
     libtorch-bin
     portaudio
     eigen
-    xorg.libxcb
+    libxcb
     soxr
     libsamplerate
     armadillo
@@ -65,11 +63,11 @@ stdenv.mkDerivation {
     install -Dm444 $src/dist-res/in-formant.png -t $out/share/icons/hicolor/512x512/apps
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Real-time pitch and formant tracking software";
     mainProgram = "in-formant";
     homepage = "https://github.com/in-formant/in-formant";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     # currently broken on i686-linux and aarch64-linux due to other nixpkgs dependencies
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
diff --git a/pkgs/by-name/in/inadyn/package.nix b/pkgs/by-name/in/inadyn/package.nix
index 09963d89646e..5604347c85a4 100644
--- a/pkgs/by-name/in/inadyn/package.nix
+++ b/pkgs/by-name/in/inadyn/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inadyn";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
     rev = "v${version}";
-    sha256 = "sha256-aQHJtnMDaHF1XY9lwQVR6f78Zk2UI7OC3Oxt1r1KMak=";
+    sha256 = "sha256-R+DlhRZOwL/hBZAu4L7w7DAoHy1/1m8wsidSxByO74E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix
index 2a3af34055bc..3f172a72a8d8 100644
--- a/pkgs/by-name/in/incus-ui-canonical/package.nix
+++ b/pkgs/by-name/in/incus-ui-canonical/package.nix
@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "incus-ui-canonical";
-  version = "0.18.2";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus-ui-canonical";
     # only use tags prefixed by incus- they are the tested fork versions
     tag = "incus-${version}";
-    hash = "sha256-MVhyKV3NGeChsLnoKw7mC9bAQRQ9Rpg8cIWkelNFXeg=";
+    hash = "sha256-0wKGPH+ffJ/S8FA46ve5SzyNZJ9C2fv8Psiqu8p6D0s=";
   };
 
   offlineCache = fetchYarnDeps {
diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix
index 8082c909b00f..364d4a7017a1 100644
--- a/pkgs/by-name/in/incus/generic.nix
+++ b/pkgs/by-name/in/incus/generic.nix
@@ -158,7 +158,16 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/incus completion zsh)
 
     mkdir -p $agent_loader/bin $agent_loader/etc/systemd/system $agent_loader/lib/udev/rules.d
+  ''
+  + lib.optionalString (lib.versionOlder finalAttrs.version "6.18") ''
     cp internal/server/instance/drivers/agent-loader/incus-agent{,-setup} $agent_loader/bin/
+  ''
+  + lib.optionalString (lib.versionAtLeast finalAttrs.version "6.18") ''
+    # the agent_loader output is used by virtualisation.incus.agent
+    cp internal/server/instance/drivers/agent-loader/incus-agent-linux $agent_loader/bin/incus-agent
+    cp internal/server/instance/drivers/agent-loader/incus-agent-setup-linux $agent_loader/bin/incus-agent-setup
+  ''
+  + ''
     chmod +x $agent_loader/bin/incus-agent{,-setup}
     patchShebangs $agent_loader/bin/incus-agent{,-setup}
     cp internal/server/instance/drivers/agent-loader/systemd/incus-agent.service $agent_loader/etc/systemd/system/
diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix
index 91998acb2f21..b170d0f2b26f 100644
--- a/pkgs/by-name/in/incus/package.nix
+++ b/pkgs/by-name/in/incus/package.nix
@@ -1,7 +1,7 @@
 import ./generic.nix {
-  hash = "sha256-QtsdKXgf995FzMxSHYz8LupECeRA2nriz9Bb3S0epKY=";
-  version = "6.17.0";
-  vendorHash = "sha256-5BQFoiutNuvFu+oA3ZpD8w8qtrf7l/B5b3eHwSEfzBU=";
+  hash = "sha256-XJp0Loaj3FFygyiIkSaMl4T0KmkNt7xtyU4nz++6yHs=";
+  version = "6.18.0";
+  vendorHash = "sha256-ySNeO06x8FzCH29EHbO3/ASVNSXTviyeULFrVoQwxcw=";
   patches = [ ];
   nixUpdateExtraArgs = [
     "--override-filename=pkgs/by-name/in/incus/package.nix"
diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix
index 655d43a187d3..ffc901683e0d 100644
--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -27,9 +27,7 @@ stdenv.mkDerivation rec {
   patches = [
     # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
     ./inetutils-1_9-PATH_PROCNET_DEV.patch
-  ]
-  # FIXME: apply unconditionally
-  ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [
+
     ./tests-libls.sh.patch
   ];
 
@@ -73,16 +71,18 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir $apparmor
     cat >$apparmor/bin.ping <<EOF
-    $out/bin/ping {
+    abi <abi/4.0>,
+    include <tunables/global>
+    profile $out/bin/ping {
       include <abstractions/base>
       include <abstractions/consoles>
       include <abstractions/nameservice>
       include "${apparmorRulesFromClosure { name = "ping"; } [ stdenv.cc.libc ]}"
-      include <local/bin.ping>
       capability net_raw,
       network inet raw,
       network inet6 raw,
       mr $out/bin/ping,
+      include if exists <local/bin.ping>
     }
     EOF
   '';
diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index 29df008ab9da..96d78ddcaccc 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -42,6 +42,17 @@ stdenv.mkDerivation rec {
     zita-resampler
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    find src -name "CMakeLists.txt" -type f | while read -r file; do
+      substituteInPlace "$file" --replace-fail \
+        'cmake_minimum_required(VERSION 2.8)' \
+        'cmake_minimum_required(VERSION 4.0)'
+    done
+  '';
+
   meta = with lib; {
     homepage = "https://ssj71.github.io/infamousPlugins";
     description = "Collection of open-source LV2 plugins";
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 0365f5a7a60f..8dec3cfe2da2 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jonhoo/inferno";
     changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.cddl;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 53ad47608461..13783b7e214f 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "infrastructure-agent";
-  version = "1.69.0";
+  version = "1.71.0";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = version;
-    hash = "sha256-6yoHx1fVDaJZsQKFSfOCau/BrB6zcT52yrLbPp8ZiKQ=";
+    hash = "sha256-MUutpXutrSKmKj2D1ENu00YbEkDkfrTbATQzXvaeiTo=";
   };
 
   vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";
diff --git a/pkgs/by-name/in/inih/package.nix b/pkgs/by-name/in/inih/package.nix
index 14336b289ac7..4bfe3df86292 100644
--- a/pkgs/by-name/in/inih/package.nix
+++ b/pkgs/by-name/in/inih/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inih";
-  version = "61";
+  version = "62";
 
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "inih";
     rev = "r${version}";
-    hash = "sha256-tSmdd9uAXaRQtnqj0hKuT0wofcZcYjqgPbhtaR+cr84=";
+    hash = "sha256-jnMGOncnH+ffgtyNzA8tZPtxPCR/yq9jmPsJZE4BhXo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/inja/package.nix b/pkgs/by-name/in/inja/package.nix
index 01310b2aac14..db06c68ef254 100644
--- a/pkgs/by-name/in/inja/package.nix
+++ b/pkgs/by-name/in/inja/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "inja";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "pantor";
     repo = "inja";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-B1EaR+qN32nLm3rdnlZvXQ/dlSd5XSc+5+gzBTPzUZU=";
+    hash = "sha256-P4XKz2FcMfP0HRMoEC2+RKE/ljZSpusUTDmF9Ao5txo=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix
index 4510cbe1ee42..e4613461d4fa 100644
--- a/pkgs/by-name/in/inkcut/package.nix
+++ b/pkgs/by-name/in/inkcut/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "inkcut";
-  version = "2.1.6";
+  version = "2.1.7";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "inkcut";
     repo = "inkcut";
     tag = "v${version}";
-    hash = "sha256-qfgzJTFr4VTV/x4PVnUKJzIndfjXB8z2jTWLXvadBuY=";
+    hash = "sha256-inB3yR4ykepN5rYzyPlXW/J/HuSxGs6EDhshpa7n7o8=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix
index ac90d2101b61..9b2478234ffd 100644
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Inlyne-Project/inlyne";
     changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "inlyne";
   };
 }
diff --git a/pkgs/by-name/in/inotify-tools/package.nix b/pkgs/by-name/in/inotify-tools/package.nix
index 10c48bffe7c0..4746fdf6b615 100644
--- a/pkgs/by-name/in/inotify-tools/package.nix
+++ b/pkgs/by-name/in/inotify-tools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "inotify-tools";
-  version = "4.23.9.0";
+  version = "4.25.9.0";
 
   src = fetchFromGitHub {
     repo = "inotify-tools";
     owner = "inotify-tools";
     rev = finalAttrs.version;
-    hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU=";
+    hash = "sha256-u7bnFmSEXNGVZTJ71kOTscQLymbjJblJCIY9Uj7/3mM=";
   };
 
   configureFlags = [
diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 2047a8e88332..9e9d10f008f4 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.66.0";
+  version = "0.67.0";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${version}";
-    hash = "sha256-9aCCRjXJZcjfRrZJldaVKbk6FYTYv73XEvUeCeCPmfk=";
+    hash = "sha256-eLnloQfitA1d6HbpSk3BUl4X2E1m1qochLakndUKdIs=";
   };
 
-  cargoHash = "sha256-JBfAsLN9GhvzVi/lQumqdWwujLI4rXLowiUOoApnWUg=";
+  cargoHash = "sha256-Jwx0VzrYdfYGwnKDABYwMIV6qZ7T+an5MYwrQRcRVio=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index 2e6a8cb81eea..0920670493dd 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -21,11 +21,17 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     sha256 = "sha256-yY2W2hQpj8TIxiQBSbQHq0J16n74OfIwMDxFt3mLZYc=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
     qt5.wrapQtAppsHook
     pkg-config
   ];
+
   buildInputs = [
     fftwFloat
     liquid-dsp
diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 6245b34a2a7d..1980e8707107 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -24,7 +24,7 @@ let
   # libcs in nixpkgs (musl and glibc).
   compatible =
     lib: drv:
-    lib.any (lic: lic == (drv.meta.license or { })) [
+    lib.elem (drv.meta.license or { }) [
       lib.licenses.mit # musl
       lib.licenses.lgpl2Plus # glibc
     ];
diff --git a/pkgs/games/instawow/default.nix b/pkgs/by-name/in/instawow/package.nix
similarity index 84%
rename from pkgs/games/instawow/default.nix
rename to pkgs/by-name/in/instawow/package.nix
index 36d8e6b3cdc4..8a947eff0e16 100644
--- a/pkgs/games/instawow/default.nix
+++ b/pkgs/by-name/in/instawow/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "layday";
     repo = "instawow";
     tag = "v${version}";
-    sha256 = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
+    hash = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
   };
 
   extras = [ ]; # Disable GUI, most dependencies are not packaged.
@@ -44,11 +44,11 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ plugins;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/layday/instawow";
     description = "World of Warcraft add-on manager CLI and GUI";
     mainProgram = "instawow";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ seirl ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ seirl ];
   };
 }
diff --git a/pkgs/by-name/in/insulator2/package.nix b/pkgs/by-name/in/insulator2/package.nix
index b74147d0e620..99b218789fad 100644
--- a/pkgs/by-name/in/insulator2/package.nix
+++ b/pkgs/by-name/in/insulator2/package.nix
@@ -20,7 +20,6 @@
   freetype,
   libsoup_2_4,
   openssl,
-  webkitgtk_4_0,
 }:
 
 stdenv.mkDerivation rec {
@@ -82,12 +81,14 @@ stdenv.mkDerivation rec {
     freetype
     libsoup_2_4
     openssl
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   env.OPENSSL_NO_VENDOR = 1;
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Client UI to inspect Kafka topics, consume, produce and much more";
     homepage = "https://github.com/andrewinci/insulator2";
     license = licenses.gpl3Only;
diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix
index 83257185c2ed..b0c3d68fe774 100644
--- a/pkgs/by-name/in/integrity-scrub/package.nix
+++ b/pkgs/by-name/in/integrity-scrub/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "integrity-scrub";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "illdefined";
     repo = "integrity-scrub";
     tag = version;
-    hash = "sha256-oWS6HxdZ8tGeIRGpfHHkNhNdepBjhhdgTjKmxElNPbk=";
+    hash = "sha256-OLO64R9AYpHSkIwk2arka5EEzCWusZPWsBhy5HEDIQI=";
   };
 
-  cargoHash = "sha256-3LC3eZNmHG6OFIvQzmvs4BCSX0CVpwaYhZM2H2YoY4M=";
+  cargoHash = "sha256-sS4z5NImUdk0EnQ+BGPofFZtXZsomfUXXbHNDmVqAos=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 
@@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ mvs ];
     platforms = lib.platforms.linux;
+    mainProgram = "integrity-scrub";
   };
 }
diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 7d00ee756764..658f8986dac9 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "25.35.35096.9";
+  version = "25.40.35563.4";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     tag = version;
-    hash = "sha256-GAFbpf5ZUpq+jpVECa5buauCYdpPBOBrREkgrGyhxPA=";
+    hash = "sha256-V2zmS3CFLxhyFYvGOdkix9g3E6JkeVa/pDLPC5NYivo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 53055dc12416..4e7f83da01f1 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -43,14 +43,14 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gpu-tools";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "drm";
     repo = "igt-gpu-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-O//tL7AuYmrpTlZ61YzpSKOxbtM6u6zlcANzXWTTbhw=";
+    hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
index 518accce964e..1227b9c0a2f9 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
+++ b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
@@ -8,25 +8,11 @@ are no uses of COMPILE_DEFINITIONS_<CONFIG>.
 
 Signed-off-by: Chris Mayo <aklhfex@gmail.com>
 ---
- IGC/MDAutogen/CMakeLists.txt                    | 2 +-
  external/SPIRV-Tools/CMakeLists.txt             | 2 +-
  visa/CMakeLists.txt                             | 7 +------
  visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 6 +-----
  4 files changed, 4 insertions(+), 13 deletions(-)
 
-diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt
-index c9522feea29d..0a79b3c8e32b 100644
---- a/igc/IGC/MDAutogen/CMakeLists.txt
-+++ b/igc/IGC/MDAutogen/CMakeLists.txt
-@@ -6,7 +6,7 @@
- #
- #============================ end_copyright_notice =============================
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.5)
- 
- set(_autogenScript "${IGC_SOURCE_DIR}/common/autogen.py")
- set(_autogenSource "${IGC_SOURCE_DIR}/common/MDFrameWork.h")
 diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
 index d2e3f63fb0d3..75f013409990 100644
 --- a/igc/external/SPIRV-Tools/CMakeLists.txt
diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index 2c3e65dcf9fe..a2e01d067c74 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   ninja,
   git,
@@ -15,9 +14,12 @@
   spirv-headers,
 }:
 
+let
+  llvmVersion = "16.0.6";
+in
 stdenv.mkDerivation rec {
   pname = "intel-graphics-compiler";
-  version = "2.18.5";
+  version = "2.20.3";
 
   # See the repository for expected versions:
   # <https://github.com/intel/intel-graphics-compiler/blob/v2.16.0/documentation/build_ubuntu.md#revision-table>
@@ -27,35 +29,35 @@ stdenv.mkDerivation rec {
       owner = "intel";
       repo = "intel-graphics-compiler";
       tag = "v${version}";
-      hash = "sha256-AvEeK3rySEu89br4JgeZlXVQ6IXEzStVZYvehzdWq7g=";
+      hash = "sha256-OCou4yhx9rY1JznrzGMLhsjj/3CvqQXfXWFAPDxA8Ds=";
     })
     (fetchFromGitHub {
       name = "llvm-project";
       owner = "llvm";
       repo = "llvm-project";
-      tag = "llvmorg-15.0.7";
-      hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
+      tag = "llvmorg-${llvmVersion}";
+      hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
     })
     (fetchFromGitHub {
       name = "vc-intrinsics";
       owner = "intel";
       repo = "vc-intrinsics";
-      tag = "v0.23.1";
-      hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc=";
+      tag = "v0.23.4";
+      hash = "sha256-zorhOhBTcymnAlShJxJecXD+HIfScGouhSea/A3tBXE=";
     })
     (fetchFromGitHub {
       name = "opencl-clang";
       owner = "intel";
       repo = "opencl-clang";
-      tag = "v15.0.3";
-      hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw==";
+      tag = "v16.0.5";
+      hash = "sha256-JfynEsCXltVdVY/LqWvZwzWfzEFUz6nI9Zub+bze1zE=";
     })
     (fetchFromGitHub {
       name = "llvm-spirv";
       owner = "KhronosGroup";
       repo = "SPIRV-LLVM-Translator";
-      tag = "v15.0.15";
-      hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
+      tag = "v16.0.17";
+      hash = "sha256-ta5QbVady9/cwBbAwF1r4ft/ESMnLgcmGMrFhv1PCH0=";
     })
   ];
 
@@ -90,6 +92,10 @@ stdenv.mkDerivation rec {
     substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \
       --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \
                      'COMMAND patch -p1 --ignore-whitespace -i '
+
+    # match default LLVM version with our provided version to apply correct patches
+    substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \
+      --replace-fail "15.0.7" "${llvmVersion}"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/in/intel-ipsec-mb/package.nix b/pkgs/by-name/in/intel-ipsec-mb/package.nix
new file mode 100644
index 000000000000..b7a503daca89
--- /dev/null
+++ b/pkgs/by-name/in/intel-ipsec-mb/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nasm,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "intel-ipsec-mb";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "intel-ipsec-mb";
+    rev = "v${version}";
+    hash = "sha256-k/NoPMKbiWZ25tdomsPpv2gfhQuBHxzX6KRT1UY88Ko=";
+  };
+
+  sourceRoot = "source/lib";
+
+  nativeBuildInputs = [ nasm ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NOLDCONFIG=y"
+  ];
+
+  meta = with lib; {
+    description = "Intel Multi-Buffer Crypto for IPsec Library";
+    longDescription = ''
+      Intel Multi-Buffer Crypto for IPsec Library provides software crypto
+      acceleration primarily targeting packet processing applications.
+      It supports a variety of use cases including IPsec, TLS, wireless (RAN), cable,
+      and MPEG DRM.
+    '';
+    homepage = "https://github.com/intel/intel-ipsec-mb";
+    license = licenses.bsd3;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix
index f105fe38466a..90ecba021f18 100644
--- a/pkgs/by-name/in/intelli-shell/package.nix
+++ b/pkgs/by-name/in/intelli-shell/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "intelli-shell";
-  version = "3.2.3";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "lasantosr";
     repo = "intelli-shell";
     rev = "v${version}";
-    hash = "sha256-kwwZzuo/eH+bssSFjBWC3YwP6X/CoRPo8OCa/0wGrp8=";
+    hash = "sha256-Y1wFmere1Ft7AB1voHpI7KThoGjSpRXmAab35uoM6Ms=";
   };
 
-  cargoHash = "sha256-0wS751jE0VK/FaoL7WNc2OezJeDmYJNO+IKezB7Ma1Q=";
+  cargoHash = "sha256-Op96deiAVliE9FuNMh1GExoO0jcmCFEuYGCXMccHAvo=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index db6d48735876..d01f5bf3406a 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   callPackage,
-  crystal,
+  crystal_1_16,
   fetchFromGitHub,
   librsvg,
   pkg-config,
@@ -27,6 +27,7 @@
 let
   # normally video.js is downloaded at build time
   videojs = callPackage ./videojs.nix { inherit versions; };
+  crystal = crystal_1_16;
 in
 crystal.buildCrystalPackage rec {
   pname = "invidious";
diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix
index ee8a6c453c49..b7954a8ddaa4 100644
--- a/pkgs/by-name/io/io/package.nix
+++ b/pkgs/by-name/io/io/package.nix
@@ -115,7 +115,6 @@ stdenv.mkDerivation {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       raskin
-      maggesi
     ];
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix
index 542549447ebe..3101df017cd3 100644
--- a/pkgs/by-name/io/ioc-scan/package.nix
+++ b/pkgs/by-name/io/ioc-scan/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ioc-scan";
-  version = "3.0.0";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cisagov";
     repo = "ioc-scanner";
     tag = "v${version}";
-    hash = "sha256-p1cx6MwAPmPIsOHNWSU9AyYcQaddFugBkm6a+kUjzvg=";
+    hash = "sha256-Mo3J744WwWPoTdWeAKFLVD3rh/ZKOHbnfinMeC2Qqfo=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/io/iocaine/package.nix b/pkgs/by-name/io/iocaine/package.nix
new file mode 100644
index 000000000000..94d2822207dd
--- /dev/null
+++ b/pkgs/by-name/io/iocaine/package.nix
@@ -0,0 +1,32 @@
+{
+  stdenv,
+  lib,
+  rustPlatform,
+  fetchFromGitea,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "iocaine";
+  version = "2.5.1";
+
+  src = fetchFromGitea {
+    domain = "git.madhouse-project.org";
+    owner = "iocaine";
+    repo = "iocaine";
+    tag = "iocaine-${version}";
+    hash = "sha256-213QLpGBKSsT9r8O27PyMom5+OGPz0VtRBevxswISZA=";
+  };
+
+  cargoHash = "sha256-EgPGDlJX/m+v3f/tGIO+saGHoYrtiWLZuMlXEvsgnxE=";
+
+  meta = {
+    description = "Deadliest poison known to AI";
+    homepage = "https://iocaine.madhouse-project.org/";
+    changelog = "https://git.madhouse-project.org/iocaine/iocaine/src/tag/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sugar700 ];
+    mainProgram = "iocaine";
+    # Lacking OS access to fix, and upstream doesn't support macOS.
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/by-name/io/ionic-cli/package-lock.json b/pkgs/by-name/io/ionic-cli/package-lock.json
new file mode 100644
index 000000000000..e2571af5412a
--- /dev/null
+++ b/pkgs/by-name/io/ionic-cli/package-lock.json
@@ -0,0 +1,8268 @@
+{
+  "name": "@ionic/cli",
+  "version": "7.2.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@ionic/cli",
+      "version": "7.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/cli-framework": "6.0.1",
+        "@ionic/cli-framework-output": "2.2.8",
+        "@ionic/cli-framework-prompts": "2.1.13",
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-network": "2.1.7",
+        "@ionic/utils-process": "2.1.12",
+        "@ionic/utils-stream": "3.1.7",
+        "@ionic/utils-subprocess": "3.0.1",
+        "@ionic/utils-terminal": "2.3.5",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "diff": "^4.0.1",
+        "elementtree": "^0.1.7",
+        "leek": "0.0.24",
+        "lodash": "^4.17.5",
+        "open": "^7.0.4",
+        "os-name": "^4.0.0",
+        "proxy-agent": "^6.3.0",
+        "semver": "^7.1.1",
+        "split2": "^3.0.0",
+        "ssh-config": "^1.1.1",
+        "stream-combiner2": "^1.1.1",
+        "superagent": "^9.0.2",
+        "tar": "^6.0.1",
+        "tslib": "^2.0.1"
+      },
+      "bin": {
+        "ionic": "bin/ionic"
+      },
+      "devDependencies": {
+        "@types/debug": "^4.1.1",
+        "@types/diff": "^4.0.0",
+        "@types/elementtree": "^0.1.0",
+        "@types/jest": "^26.0.10",
+        "@types/lodash": "^4.14.104",
+        "@types/node": "~16.0.0",
+        "@types/semver": "^7.1.0",
+        "@types/split2": "^2.1.6",
+        "@types/superagent": "4.1.3",
+        "@types/tar": "^6.1.2",
+        "jest": "^26.4.2",
+        "jest-cli": "^26.0.1",
+        "lint-staged": "^10.0.2",
+        "rimraf": "^3.0.0",
+        "source-map": "^0.7.0",
+        "ts-jest": "~26.3.0",
+        "typescript": "~4.8.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz",
+      "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
+      "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.28.3",
+        "@babel/helpers": "^7.28.4",
+        "@babel/parser": "^7.28.4",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.4",
+        "@babel/types": "^7.28.4",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+      "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.3",
+        "@babel/types": "^7.28.2",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "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.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "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.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.28.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "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": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
+      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.4"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@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.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
+      "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.3",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.4",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
+      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/@ionic/cli-framework": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-6.0.1.tgz",
+      "integrity": "sha512-Fyix4eQt2HKTV+GoeoiziQGZyqIA8RfoMqjGyAS5XgNXLOYW0P27Ph348hQZh9Mphjf+m0lOYa6dWQTEPzUHiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/cli-framework-output": "2.2.8",
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-object": "2.1.6",
+        "@ionic/utils-process": "2.1.12",
+        "@ionic/utils-stream": "3.1.7",
+        "@ionic/utils-subprocess": "3.0.1",
+        "@ionic/utils-terminal": "2.3.5",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "lodash": "^4.17.5",
+        "minimist": "^1.2.0",
+        "rimraf": "^3.0.0",
+        "tslib": "^2.0.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-output": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.8.tgz",
+      "integrity": "sha512-TshtaFQsovB4NWRBydbNFawql6yul7d5bMiW1WYYf17hd99V6xdDdk3vtF51bw6sLkxON3bDQpWsnUc9/hVo3g==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.13.tgz",
+      "integrity": "sha512-Yj1fz6p7OehreQ8C70bd9+M6tYP/rvzLw5JVj8pT/N9s0kQSjqEFRbs96LKr3lfd3TADZaS8OlZrQIqenFIUpg==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "inquirer": "^7.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-array": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.6.tgz",
+      "integrity": "sha512-0JZ1Zkp3wURnv8oq6Qt7fMPo5MpjbLoUoa9Bu2Q4PJuSDWM8H8gwF3dQO7VTeUj3/0o1IB1wGkFWZZYgUXZMUg==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-fs": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.7.tgz",
+      "integrity": "sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/fs-extra": "^8.0.0",
+        "debug": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-network": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.7.tgz",
+      "integrity": "sha512-5Q3NdZtSLiLs7ufuX9X293BvAwo8CxaD93Hkp3ODPgctLYErv3nFibhq3j+eguEqUh2um9WNXEUOuQ8x+Sd1fw==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-object": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.6.tgz",
+      "integrity": "sha512-vCl7sl6JjBHFw99CuAqHljYJpcE88YaH2ZW4ELiC/Zwxl5tiwn4kbdP/gxi2OT3MQb1vOtgAmSNRtusvgxI8ww==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-process": {
+      "version": "2.1.12",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.12.tgz",
+      "integrity": "sha512-Jqkgyq7zBs/v/J3YvKtQQiIcxfJyplPgECMWgdO0E1fKrrH8EF0QGHNJ9mJCn6PYe2UtHNS8JJf5G21e09DfYg==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-object": "2.1.6",
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.7.tgz",
+      "integrity": "sha512-eSELBE7NWNFIHTbTC2jiMvh1ABKGIpGdUIvARsNPMNQhxJB3wpwdiVnoBoTYp+5a6UUIww4Kpg7v6S7iTctH1w==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-3.0.1.tgz",
+      "integrity": "sha512-cT4te3AQQPeIM9WCwIg8ohroJ8TjsYaMb2G4ZEgv9YzeDqHZ4JpeIKqG2SoaA3GmVQ3sOfhPM6Ox9sxphV/d1A==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-process": "2.1.12",
+        "@ionic/utils-stream": "3.1.7",
+        "@ionic/utils-terminal": "2.3.5",
+        "cross-spawn": "^7.0.3",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-terminal": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.5.tgz",
+      "integrity": "sha512-3cKScz9Jx2/Pr9ijj1OzGlBDfcmx7OMVBt4+P1uRR0SSW4cm1/y3Mo4OY3lfkuaYifMNBW8Wz6lQHbs1bihr7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/slice-ansi": "^4.0.0",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "node-notifier": "^8.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.6.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@paralleldrive/cuid2": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
+      "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "^1.1.5"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.2"
+      }
+    },
+    "node_modules/@types/cookiejar": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz",
+      "integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-mIenTfsIe586/yzsyfql69KRnA75S8SVXQbTLpDejRrjH0QSJcpu3AUOi/Vjnt9IOsXKxPhJfGpQUNMueIU1fQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/elementtree": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/elementtree/-/elementtree-0.1.5.tgz",
+      "integrity": "sha512-sDPG9iHzbN7Cvf0FLVzmaRiNMCYPQXh+xt0QI/I9P/sPdPX0veG/gvxA4eMuOq6tReg4cpXVH3356y2Qzdl+5g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "26.0.24",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
+      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-diff": "^26.0.0",
+        "pretty-format": "^26.0.0"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.3.tgz",
+      "integrity": "sha512-QhhSbE1wJMbh+lDsb9G6UFmyojhEgoO7dFVDBkli80sp3sPFojGh6TJXsht9Qbe2VWi91pbj08+1Kvue61RwsQ==",
+      "license": "MIT"
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==",
+      "license": "MIT"
+    },
+    "node_modules/@types/split2": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@types/split2/-/split2-2.1.6.tgz",
+      "integrity": "sha512-ddaFSOMuy2Rp97l6q/LEteQygvTQJuEZ+SRhxFKR0uXGsdbFDqX/QF2xoGcOqLQ8XV91v01SnAv2vpgihNgW/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/superagent": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.3.tgz",
+      "integrity": "sha512-vy2licJQwOXrTAe+yz9SCyUVXAkMgCeDq9VHzS5CWJyDU1g6CI4xKb4d5sCEmyucjw5sG0y4k2/afS0iv/1D0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/cookiejar": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/tar": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.13.tgz",
+      "integrity": "sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "minipass": "^4.0.0"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/acorn": {
+      "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": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/anymatch": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "license": "MIT"
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
+    "node_modules/at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz",
+      "integrity": "sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "node_modules/braces": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/browserslist": {
+      "version": "4.26.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
+      "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.8.3",
+        "caniuse-lite": "^1.0.30001741",
+        "electron-to-chromium": "^1.5.218",
+        "node-releases": "^2.0.21",
+        "update-browserslist-db": "^1.1.3"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/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": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001743",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz",
+      "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "rsvp": "^4.8.4"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/capture-exit/node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "license": "MIT"
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
+    },
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "license": "MIT"
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookiejar": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+      "license": "MIT"
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "license": "ISC",
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexer2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.222",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.222.tgz",
+      "integrity": "sha512-gA7psSwSwQRE60CEoLz6JBCQPIxNeuzB2nL8vE03GK/OHxlvykbLyeiumQy1iH5C2f3YbRAZpGCMT12a/9ih9w==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "sax": "1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/emittery": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "license": "MIT"
+    },
+    "node_modules/end-of-stream": {
+      "version": "1.4.5",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
+      "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
+      "license": "MIT",
+      "dependencies": {
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "license": "MIT",
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "license": "MIT"
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.35"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/formidable": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz",
+      "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==",
+      "license": "MIT",
+      "dependencies": {
+        "@paralleldrive/cuid2": "^2.2.2",
+        "dezalgo": "^1.0.4",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "license": "MIT",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
+    },
+    "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": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-uri": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",
+      "integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",
+      "license": "MIT",
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "license": "ISC"
+    },
+    "node_modules/growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "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==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/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": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "license": "ISC"
+    },
+    "node_modules/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+      "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "license": "MIT"
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
+      }
+    },
+    "node_modules/jest-jasmine2": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-serializer": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "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"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leek": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
+      "integrity": "sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^2.1.0",
+        "lodash.assign": "^3.2.0",
+        "rsvp": "^3.0.21"
+      }
+    },
+    "node_modules/leek/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/leek/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lint-staged": {
+      "version": "10.5.4",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz",
+      "integrity": "sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "cli-truncate": "^2.1.0",
+        "commander": "^6.2.0",
+        "cosmiconfig": "^7.0.0",
+        "debug": "^4.2.0",
+        "dedent": "^0.7.0",
+        "enquirer": "^2.3.6",
+        "execa": "^4.1.0",
+        "listr2": "^3.2.2",
+        "log-symbols": "^4.0.0",
+        "micromatch": "^4.0.2",
+        "normalize-path": "^3.0.0",
+        "please-upgrade-node": "^3.2.0",
+        "string-argv": "0.3.1",
+        "stringify-object": "^3.3.0"
+      },
+      "bin": {
+        "lint-staged": "bin/lint-staged.js"
+      },
+      "funding": {
+        "url": "https://opencollective.com/lint-staged"
+      }
+    },
+    "node_modules/listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/listr2/node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "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": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.assign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "license": "MIT"
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/macos-release": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz",
+      "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "license": "MIT"
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "license": "ISC"
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-notifier": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.21",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz",
+      "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.22",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.22.tgz",
+      "integrity": "sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "license": "ISC",
+      "dependencies": {
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-name": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
+      "license": "MIT",
+      "dependencies": {
+        "macos-release": "^2.5.0",
+        "windows-release": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "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": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
+      "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "license": "MIT",
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "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": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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": {
+        "node": ">=8"
+      }
+    },
+    "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"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "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": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/please-upgrade-node": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver-compare": "^1.0.0"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/http-proxy-agent": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+      "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.0",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/https-proxy-agent": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+      "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    },
+    "node_modules/psl": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "license": "MIT",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "license": "MIT",
+      "engines": {
+        "node": "0.12.* || 4.* || 6.* || >= 7.*"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
+    },
+    "node_modules/safe-buffer": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
+      "license": "MIT"
+    },
+    "node_modules/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "bin": {
+        "sane": "src/cli.js"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/sane/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/sane/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/sane/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+      "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==",
+      "license": "ISC"
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/shebang-command": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shebang-regex": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/snapdragon/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^10.0.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/node_modules/agent-base": {
+      "version": "7.1.4",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+      "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/source-map": {
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true,
+      "license": "CC-BY-3.0"
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.22",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+      "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "license": "ISC",
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ssh-config": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
+      "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
+      "license": "MIT"
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
+      "license": "MIT",
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/stream-combiner2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
+    "node_modules/string-argv": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6.19"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/superagent": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
+      "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
+      "deprecated": "Please upgrade to superagent v10.2.2+, see release notes at https://github.com/forwardemail/superagent/releases/tag/v10.2.2 - maintenance is supported by Forward Email @ https://forwardemail.net",
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "^1.3.0",
+        "cookiejar": "^2.1.4",
+        "debug": "^4.3.4",
+        "fast-safe-stringify": "^2.1.1",
+        "form-data": "^4.0.0",
+        "formidable": "^3.5.1",
+        "methods": "^1.1.2",
+        "mime": "2.6.0",
+        "qs": "^6.11.0"
+      },
+      "engines": {
+        "node": ">=14.18.0"
+      }
+    },
+    "node_modules/superagent/node_modules/form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "license": "ISC",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "license": "MIT"
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex-range": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "license": "MIT",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-jest": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.3.0.tgz",
+      "integrity": "sha512-Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/jest": "26.x",
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "26.x",
+        "json5": "2.x",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "18.x"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "jest": ">=26 <27",
+        "typescript": ">=3.8 <5.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "license": "MIT",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/untildify": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/update-browserslist-db": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/which": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "node-which": "bin/node-which"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/windows-release": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/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": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/pkgs/by-name/io/ionic-cli/package.nix b/pkgs/by-name/io/ionic-cli/package.nix
new file mode 100644
index 000000000000..585af96cbcdd
--- /dev/null
+++ b/pkgs/by-name/io/ionic-cli/package.nix
@@ -0,0 +1,32 @@
+{
+  buildNpmPackage,
+  fetchzip,
+  lib,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "ionic-cli";
+  version = "7.2.1";
+
+  src = fetchzip {
+    url = "https://registry.npmjs.org/@ionic/cli/-/cli-${finalAttrs.version}.tgz";
+    hash = "sha256-nrZMMyzoiO7ZJbNrPSRA1sOEy3OpgEXdyNS0JzAaTjY=";
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  npmDepsHash = "sha256-Nu4AWwFaGBakGAxUNllx4etUm4H5ygxAeMs1RWhzRQQ=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "Your go-to tool for developing Ionic apps";
+    homepage = "https://ionicframework.com/";
+    license = lib.licenses.mit;
+    mainProgram = "ionic";
+    maintainers = with lib.maintainers; [
+      albertlarsan68
+    ];
+  };
+})
diff --git a/pkgs/games/iortcw/default.nix b/pkgs/by-name/io/iortcw/package.nix
similarity index 100%
rename from pkgs/games/iortcw/default.nix
rename to pkgs/by-name/io/iortcw/package.nix
diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/by-name/io/iortcw/sp.nix
similarity index 100%
rename from pkgs/games/iortcw/sp.nix
rename to pkgs/by-name/io/iortcw/sp.nix
diff --git a/pkgs/by-name/io/iosevka-bin/package.nix b/pkgs/by-name/io/iosevka-bin/package.nix
index 3ef3cbd5f879..9dd02abede27 100644
--- a/pkgs/by-name/io/iosevka-bin/package.nix
+++ b/pkgs/by-name/io/iosevka-bin/package.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "33.3.1";
+  version = "33.3.3";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/pkgs/by-name/io/iosevka-bin/variants.nix b/pkgs/by-name/io/iosevka-bin/variants.nix
index a8d4c8cdd651..79050813b83e 100644
--- a/pkgs/by-name/io/iosevka-bin/variants.nix
+++ b/pkgs/by-name/io/iosevka-bin/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "0p8f9z9ribn9zvbr0klg9q37w7z4v6r6gwz9kqc3cml6q0x4lv2n";
-  IosevkaAile = "1f18pnbp8vnsjzax43gijc95z1nx54l0vc2lqiqm9xvddhpam7ww";
-  IosevkaCurly = "01gzyqlg6n0fzi5kvwrz1slcr8pkdlg6yd61i059kzmw9sw8g7m5";
-  IosevkaCurlySlab = "0vxc3mb7ncvm4x7flrvlfkw1lw2pcv50344ias97j96gzaafr0mr";
-  IosevkaEtoile = "1qalf37fm3lxbg3y8ias92vyz19rhf20rjyn7zq9prmrx412sglv";
-  IosevkaSlab = "1kggrmkga333jknycbr27bziwaa6maw83wrkh60w7a78mp32a2fc";
-  IosevkaSS01 = "0yaly4pkilrrd7knqvv43976rnjvp2s2wd4c8zczc4fhmjw2b7j6";
-  IosevkaSS02 = "0h1hdynqfqmw6v49qnvspqw6y2ihqysrkcivjc9fvx4w876clr86";
-  IosevkaSS03 = "1mvn6ix5944kxmr1byx200ydzm9ny9qafv14nmssfqx7rhn71r29";
-  IosevkaSS04 = "0x0sfbd4g6rb5vndddxvqvjjhr43dnbywybb8n67sh40x22jcf5b";
-  IosevkaSS05 = "0fsscv5z9dn7934547cgq5082v25n94kcx8zdk5n99n7mnbc7gfy";
-  IosevkaSS06 = "1yyhvnxqbdmry6knd8jakz0jqhnphfip2a4rgb5l07vq1nrcb566";
-  IosevkaSS07 = "1w50ma10fzw4gy6im009i20dgvxlj3m4iasmj074k5mxfmazjcyv";
-  IosevkaSS08 = "1mh7h8dlk02rijlxbml5zpha2hvkhvir7j8hk6fd0pihzj3ybn0i";
-  IosevkaSS09 = "08mxsa67gpdzygj9vr0m6a6pz397ffbg77rfik5c46gqknd2y7mf";
-  IosevkaSS10 = "1k6xks2q7szmz3zsy9dd6bn7j6g60hf1whvp3c6j65m5rhi87z6v";
-  IosevkaSS11 = "1r8fk9m32kakclxxxingy6k1dwgvfizr0c68miqp2g6189mkz1lw";
-  IosevkaSS12 = "0amgwwq0yik9xhh7d12fmn7inimqzpmsmcjwnw1dsghrvf0mwdsa";
-  IosevkaSS13 = "1agaihxccj0k5wg7bd1lm5ix0mwdhj387i2wypc76q6az116a4ln";
-  IosevkaSS14 = "106fw5d3kqc389cnvcv00zfcfbzvavfym8mjhqrn0h23fpfy5na2";
-  IosevkaSS15 = "15rjgg8bi2ichisg5ri9hqr5rikfcvwdx2smw93vazn3shzzkn45";
-  IosevkaSS16 = "0ipdh5avia6gj1pb78ihhfydg9dn334kv0pir9h136f0bwxibjp0";
-  IosevkaSS17 = "08grkzyd4ssjzkkyljzc2mlnhrchxbw7y9425sgz8cq026f5cvd5";
-  IosevkaSS18 = "1052s4ijqhvb4h81nvx6m9sdlk3d51n7zqr0cr78ydl13g1qvdh9";
-  SGr-Iosevka = "0p7nd7x4zq4bfhdrvjhn0j5y6w217w8nlai9nc0flrwjh4qf14ih";
-  SGr-IosevkaCurly = "1qjv7zrr7113v2qq0fnkrxcslv2wy0x5nv8mjal5b710q9gppxfr";
-  SGr-IosevkaCurlySlab = "0bavl9z4j9n7hxch8acw89j8f070vwir1f15af1xb76q09ihi5r2";
-  SGr-IosevkaFixed = "0kgyn4da6a58fa6k9aqm1ndzlzjpbwip13pyb60jasrqf7wqm66z";
-  SGr-IosevkaFixedCurly = "1mzszgwp3xbkjvhqlsmwrr6mhv3czmsiz4vgxr615sfhyl24cjb7";
-  SGr-IosevkaFixedCurlySlab = "1dzww7084clp8ivsd74r638rh41zw6b5la0fif4xz01kvsz67wc6";
-  SGr-IosevkaFixedSlab = "11cc5gm7a69693b9j0lckbvwn0pnfhklrdvqa719m43d39wqhgas";
-  SGr-IosevkaFixedSS01 = "0bh62hlxc05wd33mf0ql3f8dxc6xriv4jzr8qcz6a64qiy12j6c0";
-  SGr-IosevkaFixedSS02 = "1z3yy7zv1iml3d2dj418aias4wgh4sk07gk6fsk068mxg2mlcpys";
-  SGr-IosevkaFixedSS03 = "1fdp7897m039r6qj40jq17gn602cfx5l9jkgfh29ghk7l6kh0za5";
-  SGr-IosevkaFixedSS04 = "0gamh519mrw4qvzs28r4gpsyfqwibbvwckfcsmm4i7g9idnwmmwn";
-  SGr-IosevkaFixedSS05 = "09bp6nxcc54s2g0s4icd1zlcjar87hqdyp2chys5agk69l1j9p2a";
-  SGr-IosevkaFixedSS06 = "160di7qxp8blyzjnakdqvkxy2dpiy7fxc5518hnk0jswg2d90ydp";
-  SGr-IosevkaFixedSS07 = "004hk72g086xhkb0rrpmk5kxf032j24is2r2lbp9hizrmw9x3dl0";
-  SGr-IosevkaFixedSS08 = "0i7k3bissz76idgwf5cpbk3s0ynhlgza07v3lwyvyxhgvyj9hp56";
-  SGr-IosevkaFixedSS09 = "1lih2kq9gnigchidibpdd2ym12hjpjlb42fbfzdc1s9fs7700d8i";
-  SGr-IosevkaFixedSS10 = "04paymx35g3dii4cgnsljdxi8778vn60jkqjx28bx5lvd9hkzc9k";
-  SGr-IosevkaFixedSS11 = "023mkvqvajpm59q5807snwyc9mqqvsmrzxa33mrgr0v2qs6zxsnm";
-  SGr-IosevkaFixedSS12 = "01d55hi9y5y1szd39ij7hiswkyzazb9k97wsh09sdx0442d1aydc";
-  SGr-IosevkaFixedSS13 = "1dxyj0pqxs4795ksmaw56dndj8s6s9isv6kmj8520cl6wmrgm5k7";
-  SGr-IosevkaFixedSS14 = "0hl6lmndcf13jm16n0hxn3w0qf4abddrmhq7im9l2zsplm241dz0";
-  SGr-IosevkaFixedSS15 = "1sz33rnxx288hasd0g3y2cid6v8vck8yrwallhpbs81sraj50nn9";
-  SGr-IosevkaFixedSS16 = "0fx6fwzmcx48ndfly0a7kks2ml6v0hfkvqm5qijwaxysz5cbzk4z";
-  SGr-IosevkaFixedSS17 = "03vyl438fx8zqdslhxsy2q86rkgl0dccvvy2hk7jniaswnxj5p69";
-  SGr-IosevkaFixedSS18 = "02z2m7qn9qkrkk9c9nk14d56j4kl8advpkgajmxn5nzlp35a4pc8";
-  SGr-IosevkaSlab = "1m06ylahl5ql2918cn44nr541lfaipyry4ihm059xx0skmm2qk6p";
-  SGr-IosevkaSS01 = "1z3ba34q3m8p6yp1qvsrh1hqvk263gg2dd0vz39nz6slm2h6qb9r";
-  SGr-IosevkaSS02 = "1wxflbh1b03q4dqqf0snr7w39vmnm26bpnpmx99ms7lj5p3390c1";
-  SGr-IosevkaSS03 = "128lj2kbc0kskq8ylr8713bh49rd3ms63vpgbgp82dnhfza5ql76";
-  SGr-IosevkaSS04 = "1gr8y0p1sqg87v2g6wk6ysbj88m3jmqbx2bczl1piwbl32mccci0";
-  SGr-IosevkaSS05 = "1g36pzz30jd1zihrwvkpm77cql34xk2bv4xangf19imnibp753dl";
-  SGr-IosevkaSS06 = "1aacbijz06rgphbxlv68ds3i8qkw32y9sa4a4fg2fni0naq0c05w";
-  SGr-IosevkaSS07 = "0kyg9cp95rw7c4wlpssf0y71c9nbg9nm5y3bzjh48mn5hgpzp762";
-  SGr-IosevkaSS08 = "0k6siq14r5gka50x99cily3v39slj9by2cxlsjd8nnvax3ar59ys";
-  SGr-IosevkaSS09 = "1gsxbi28jw21915aqn6qfydxh8f0xkxgnh6fmwk8qxb73bqwh9nf";
-  SGr-IosevkaSS10 = "0jm5mr0mf30qkfwqff7lgzfa25scafgfkg7w697qb6qz3bvka09n";
-  SGr-IosevkaSS11 = "0n7xmxgg4sg7japz8ajxdprqwx6shrh0y2vmp205aqw5lm6lc4g3";
-  SGr-IosevkaSS12 = "0mwcxg2ls8d8463ykc4byvk938ygaca0wc65gllr5jkccwfk5lxs";
-  SGr-IosevkaSS13 = "12gjkrvy1850dxmbhibgp49rdxj7bb8b8vliydxk4a0k48zn6bqc";
-  SGr-IosevkaSS14 = "090i5rhhqcc65k6b9sgbj2w5vs9jrd6qnmm99lp18akpsspm2w3r";
-  SGr-IosevkaSS15 = "1c96pckim333bmfqpj0v9jcklsi8az81m6jhzvy3b153p2di29r9";
-  SGr-IosevkaSS16 = "0xvv55zmjyly00ykaycndac3lyn2w7y2gvr908kql17lpnw3x0ya";
-  SGr-IosevkaSS17 = "1kilxf5f51fzxwpy4xjrb5jcrmdb70h3z04j9f1cpaccc8h654wk";
-  SGr-IosevkaSS18 = "0vyqa0b935js0i0fhaj071yjlgkxkdr2pybn8z2g4pv3ixyk6msh";
-  SGr-IosevkaTerm = "0pxa3zcnhfl1gpynx5mn3h21r6cr45lmax09vk8x6z23adxcgkrd";
-  SGr-IosevkaTermCurly = "1nv1xqsf9zf2j9xrrqlcjzy764mnfhmjp4xwsq391fl8vy7pwdbl";
-  SGr-IosevkaTermCurlySlab = "0nblg2ql79wi7vnn3akz7pm26mwjvqg3wgh6kwqbr1rvs4n7krwp";
-  SGr-IosevkaTermSlab = "12cav088hsml2x81ihpbnr0pcwargkh1kn7ijacqv3mgirdhfp52";
-  SGr-IosevkaTermSS01 = "056bs4r7ry7k2h7iwrldfkrani79bxkb2y38ibn15hdvmbw5k7xg";
-  SGr-IosevkaTermSS02 = "1f2ywnqz97i6pjg4na5344k4p4d0mvc9s30ylc6a2nwq64wl48wf";
-  SGr-IosevkaTermSS03 = "08l939ar4z1yw1pwsdfjkfymi476ms7738yvkgz7ycf5nifpp1w1";
-  SGr-IosevkaTermSS04 = "0jgkbdv9kjg7028f3lk4h4ph6i5icv80dmhkxi7r430khfdgq0h9";
-  SGr-IosevkaTermSS05 = "0n6zf2s8can1sknc5gnr2fhs86dnswrhjx6fk2n06grkf97srmzx";
-  SGr-IosevkaTermSS06 = "0krq3kp3ydxv2y5yi15gy517w8kwarxw3lkw0vwjlf5qplpl4s7b";
-  SGr-IosevkaTermSS07 = "1pm5ckgyr18mj13ih548n1awipbsaiqcvzgjgyg8jhydpvv25f1d";
-  SGr-IosevkaTermSS08 = "1qq19fz9ybk6wwj80vb2pcpaklr0nk3a9brc5iqzli4v42bvqqar";
-  SGr-IosevkaTermSS09 = "13ki9125qz5fszcg4mdmkcgz2w9p6w06n6d6aa96m4cvxf9b38g7";
-  SGr-IosevkaTermSS10 = "161cxv8my2g0yg5amawy0mp8hsdf3zwcvf4pb2w9wdm19k7pdgsy";
-  SGr-IosevkaTermSS11 = "0c2rrcnbp4wh2xwqzrvj2fxzz7ph2hz0j89p72a46lp939wjqllm";
-  SGr-IosevkaTermSS12 = "1wyih90ilpvms0w6s1hyqwvclhli1gwxbhc61qgnvkz4lf57j1aw";
-  SGr-IosevkaTermSS13 = "1jk7z6cbfkm4ljslvxysq1w95xv9573lgcb1lznzkd41p3vss9hy";
-  SGr-IosevkaTermSS14 = "1nv18klmp3npl70q5ffc1p59hqa2d60w677jqjvjl51q8cksms8y";
-  SGr-IosevkaTermSS15 = "1gjydq5zvcbjp55kgc19shjy5v8427m7kdv5wxf808kdm0cyl9cf";
-  SGr-IosevkaTermSS16 = "1v4cyci25bdpid1cag84yif38mkqz1d6bssdvw62y9p9xb4x1g4b";
-  SGr-IosevkaTermSS17 = "0nr9hrjgy3dhlacbdr8j5gxh6qbiy9l1m1c25dl9dqym7h9i2a2z";
-  SGr-IosevkaTermSS18 = "1k66xsw3c5izc334v24wf8xvpbxh3dikawghrgfqbkdd7ilp6y7a";
+  Iosevka = "1ml8abhvb6jishi3a2q3ysd5zj0153697wypzjkj5hzxwmx6r7nv";
+  IosevkaAile = "13m46frkmczcn94dx27gamf4jwnqlngqrk5bxmfxzn56pzyavpyh";
+  IosevkaCurly = "0i97zbfidqvzgxi6pr7qc50y5g740d4hgbg2fyjdiiyacp1a4bpq";
+  IosevkaCurlySlab = "1rp3z7083adc9l5cxwygc4ln58z6iy79hxbbf1lqmfi9p6vjgq97";
+  IosevkaEtoile = "1cc3kwq4skd5gg420l1599hzaxhs3fh33jwsrh4fclrqbhhsgdb9";
+  IosevkaSlab = "1q0bgz7a3jn59sjdaql13ij9sa3qbxcjnhnfvc9fb3v6vaxlhqmi";
+  IosevkaSS01 = "0fsbiisllg673359xfxn1izhcnhkdsfp2h6n7y58la692i967vjm";
+  IosevkaSS02 = "1wc1hcsmf6yl99rjk3ncmn7dbnylids68l21i21dfj4k13x6mvyi";
+  IosevkaSS03 = "125m32asdvdfks08dangmv86phkf0if4in6050klf45a7q9818ad";
+  IosevkaSS04 = "0m10d5l88dnsaxcb959g6g17kzrxh91hk083ip5mxq1wjrx1bcfq";
+  IosevkaSS05 = "0q34293px1gj9jgh810mhgidcf7lj2vdvdn48ljq9hg4ni7yvzn8";
+  IosevkaSS06 = "067pz09b9iminj2960qdqipaxgaawxnbxzndi1gw33kpl5lgrjak";
+  IosevkaSS07 = "1f078l8vxcyb6lbf1ywf3s4s0bdrni4my6n70m77vi7vgawvfwz0";
+  IosevkaSS08 = "0mk0il1c4h06xvgxgaqh2z79m7k286smjs4swl09skqjab3nmssx";
+  IosevkaSS09 = "1pcwbi6ajy4i0likmdfgs9c4nwa852fsz9cmcjw12dmf0zirv7cn";
+  IosevkaSS10 = "1lv58ypcz1d4azz9m9xnbw2n6l5fs67kyx5zrh5mqd51qcigr1bx";
+  IosevkaSS11 = "1w37535g96js8iy5r3s6xaz0mjjivv06rdazaxdx0j4frh743lng";
+  IosevkaSS12 = "1p9lwdbngpsm4a7viz04137ckbpimknznibln39sscykc6j93lqx";
+  IosevkaSS13 = "0p1ffg507xcclwp117ikjzbkixlh95a21l7mmpd9cnckdvj1xz45";
+  IosevkaSS14 = "1dcikdxbbr82amzhwn310qkzx95h4dprxw5rwlgn8wcvx9pk96sc";
+  IosevkaSS15 = "0lsgkc1qz4f1rqhasvadjl90qwyf2hxz2d0svwmig7q91jaii4nz";
+  IosevkaSS16 = "1a6k40i1p1l94fwr4mi2m82rspjc9l93vxilgla1kpqm40bsspng";
+  IosevkaSS17 = "0v9zvi8d0ll0kdryjjglf6m1a53hjnsj73bcdaxyprni5f88qpvy";
+  IosevkaSS18 = "0g8b6drc98l08zdp4by7c4zr6c5rkaxsplbm1csyhcrpaxc43r71";
+  SGr-Iosevka = "0g5lklzmyhpych8hkx4ssa3iir7dscc8q1jbzpfsla36r5sf91jl";
+  SGr-IosevkaCurly = "1h3vgshs6l92l8r87kji7ln6ncq36iwrf439vzzramb34izy8ixr";
+  SGr-IosevkaCurlySlab = "0rsl1f9bc1hhy3wzbq5ls6vkc0y0qaw5yb67i7rda5xv50m8bqxi";
+  SGr-IosevkaFixed = "0s6d7kprgrkmdwklzhv0hz85y9w5lgrwc5mams21akmnchjqrgzf";
+  SGr-IosevkaFixedCurly = "0q5n1axnpl5p51lg4zrarsjn5aglb5s0axn9qp7ddh5gxv2n0knq";
+  SGr-IosevkaFixedCurlySlab = "04pn89y4jpgdllk0xziigjf2p8836a6zmwvzkix2kqsmbvpjj4kn";
+  SGr-IosevkaFixedSlab = "1zm06h0z43j31qzd6ndgamr3r5b9av5qcp39sr16fxr8hhnjrqhn";
+  SGr-IosevkaFixedSS01 = "0jkv4f529y934il9qzdaav8acqqgnrgf4anf6zcgx52zrzgrkg0x";
+  SGr-IosevkaFixedSS02 = "1zkibhlsfyhxbi84dwc6w90n2p8w6zwkszk1z5a3db6lyz824z88";
+  SGr-IosevkaFixedSS03 = "15r5q0bg2109z52nwygr85vx3svg6q3j26q0y0syxnrxq4iksdg7";
+  SGr-IosevkaFixedSS04 = "0bhgd1mmsdlcwp3nz7wf992g75zwkp625xc7fbqwsrpd81111566";
+  SGr-IosevkaFixedSS05 = "1nmhs4ya6bm2j4bq5jz3m5r7gbwd4i16m3zsblvif1lb6flb89dj";
+  SGr-IosevkaFixedSS06 = "0a1wxqlm8fchbg68vzwac7p8nvx8hiy565qcqjjs73m33bpp00zj";
+  SGr-IosevkaFixedSS07 = "0s1jh060hkbb7idqzgvc3f6czfhdkiw8ylmyjfa3vh851lpnxym2";
+  SGr-IosevkaFixedSS08 = "0ncdhg8cha9imy6bb72p39bvadzmdrncr2p0di80yfiimdbcfbp4";
+  SGr-IosevkaFixedSS09 = "1wl0bf1phhjzw988r7v3fprb4ljwikpkn7yvs8hskmgi3fkvji9q";
+  SGr-IosevkaFixedSS10 = "08cr4zkfjrnj3105kj70dswaf8zjdhzbjwyav0x054s32j4yrs54";
+  SGr-IosevkaFixedSS11 = "0vgx6zycbqcnrar537ym7ra949q0f8zvrmb1d823rfavy0zkpv9q";
+  SGr-IosevkaFixedSS12 = "0jw73v1bci7w2z5354cfwqgxd3r56fa03i7mr19y6y8pi9i5l9yn";
+  SGr-IosevkaFixedSS13 = "1dy29fhjncsxgsqfyz091qssps4a6xbr27157bawvjn4nlm12cab";
+  SGr-IosevkaFixedSS14 = "047ql1fqsv98mp7ihg1r71y90qjk0sgkygjs79b20smzvzapcs7g";
+  SGr-IosevkaFixedSS15 = "14njl7x94yicb7nzjsv0j8h8f4ikawn01899pccr617mf3xxyap4";
+  SGr-IosevkaFixedSS16 = "14p00n6gw7fwqxdwrz2lxrjkicw1mk1qk8z5mazr45s5pq9sz7wf";
+  SGr-IosevkaFixedSS17 = "0gca50g55csx86wksa1ch1ay2chzj4p11dmhsf4pf4jyq3ziihw8";
+  SGr-IosevkaFixedSS18 = "18q8sjnz9dfv7whjjm4a6cqm8ffwz46bkwna8giqsplhyca1c9sd";
+  SGr-IosevkaSlab = "176pr90h53hf1cbgwaqbdd11pd5d3p14d5lll057dlmws63lhk71";
+  SGr-IosevkaSS01 = "05fwnmziyas7l53sywi6g39pdi6jpnalw35gjl3dvyp93jk5f9sn";
+  SGr-IosevkaSS02 = "00cyqsng2izf1cjkmz1pf2h1h17ph69f0nz38n9jlynsffp2rkv8";
+  SGr-IosevkaSS03 = "0xg4kss5kvl7ihzvdq9gcv869x8nr8ds8hw5lrvqx2010pfvzksc";
+  SGr-IosevkaSS04 = "0mpzyj404081in6ymgajcyy2ips6d12k9ng00cw92v7shjpz6cqh";
+  SGr-IosevkaSS05 = "1kzw92nb7wxrjfhp0cf29xny86ga6libsfy2pzdc7hs499f0fsss";
+  SGr-IosevkaSS06 = "12qw1grnwq8lgdgz25vx0pcdyd5zgwln99w8cafrl6y3ckrasnrx";
+  SGr-IosevkaSS07 = "0fjdnf0lr0kfbfddc1ar4wj2if9xsyqlp4cl2gmczy5b3zkmmhrn";
+  SGr-IosevkaSS08 = "1v7crn5i2v12dh8b34hbm418zxyc8xhh3bnbfgif3v36885rxd8g";
+  SGr-IosevkaSS09 = "0jipz18pgncwfb75c1bb6bh5ar33q8kk579l6zyvqm39w2ik98f6";
+  SGr-IosevkaSS10 = "0c1w2kgy4gk3a3979x47d5hjg19bbam3s4hzd0wyal1wn9m98xl6";
+  SGr-IosevkaSS11 = "1sqagzb28xbkpn30s24ydf2da8n2dvsqzfvkbc3p1469jihzfviq";
+  SGr-IosevkaSS12 = "1n1d85drb3m0f8cnrcqxh1la7y75z3a2k9af8q6z48843ddx4qmg";
+  SGr-IosevkaSS13 = "1ynr47avzywrpf5zdjwmpybs6kf71pmjbrvlssx60z6b4hc0w42i";
+  SGr-IosevkaSS14 = "0r87wlvrd7xgcsibymmdkwd0pqbf5wn2c7mcssqwi3zwxpi12s83";
+  SGr-IosevkaSS15 = "03av6w7x4w00hxyhmz1qp00aj5b47qkma666y3c7ylsfql2b5ybh";
+  SGr-IosevkaSS16 = "01m5sz7lid4v68v8vagyj6zd61hs969lc4igf48a4jz0ip9367sl";
+  SGr-IosevkaSS17 = "0rl4g8iv8hz25ns52zb2n2ymcf2l26dhza1glp79l9swk3xgvpx2";
+  SGr-IosevkaSS18 = "0zyjl2x8i8d5m4ymm6sa5nm3916nwykh718k02aii2gl2p33faqs";
+  SGr-IosevkaTerm = "0rkvwizyr3bhkm518kq57n7n3rygvbgjahi9r5nm6jhyvjjf85d6";
+  SGr-IosevkaTermCurly = "041xhkw4b379zkwbcbmsg7d0w434dy48ppmgpy5gxaa4fzxvfihl";
+  SGr-IosevkaTermCurlySlab = "0kc62bllcrzmlj2ynzk3n1z3znhlsbsy0pwnfjx80zbirnj19dwh";
+  SGr-IosevkaTermSlab = "00l8hzhsrqrsp8izh4mzg2gvzzpd54psn15v3fgc1bs1c84wgxw5";
+  SGr-IosevkaTermSS01 = "0mifbc9vm8yassfp5r5bv8a7jxq14dpnbby09dbfdg3273yx1dv9";
+  SGr-IosevkaTermSS02 = "0ami4zdg0cpgszp8c5xary6crfhx3vx3bdcbvnsmzr5zbaf189fi";
+  SGr-IosevkaTermSS03 = "1yfd99sb3y469qzszrgfdd3m6m6rg49kv5l2swf4yijr1zmb5wfa";
+  SGr-IosevkaTermSS04 = "14ccwjilzrrzikhaj5rnarvw9y78m4d8w7817akg4wg2gh5jsxvr";
+  SGr-IosevkaTermSS05 = "1byaypapwq1zai701sq8qyxp9sb4b62jjin9vgzqcchdy32gnr38";
+  SGr-IosevkaTermSS06 = "0qcwpw10qn34awv0w43xg3l81w3cn949hcsci8802layrwq7lfas";
+  SGr-IosevkaTermSS07 = "0nyrg2fqc6828mq72lhkjn8hdv5s5r5931y38wdriy81yl5lqm9j";
+  SGr-IosevkaTermSS08 = "02mjjz04pqyvaiwm5wsr7h3r2la3wfsi8nnq1njgbaglp25hx6f1";
+  SGr-IosevkaTermSS09 = "07w12z244iaic5cpqkxl20ya03pnirjh9n5yy30r6wx79d1p7q57";
+  SGr-IosevkaTermSS10 = "19w59qs3p5ww7bg5a0k9f6065311ngj583mx9xb8aawc2v9hrhjr";
+  SGr-IosevkaTermSS11 = "10l4sk924w94pah96xipwhqi6x43j62k75ng4lsy0rw3lbs9lyvk";
+  SGr-IosevkaTermSS12 = "018m8wwxip1l5argplcim513zvwrihdl7xbz5i8hsmjjvia225v6";
+  SGr-IosevkaTermSS13 = "1b7nca31yj0vc2j4h804wlllpzjjphnh1bfgv6zcgvd4qmpk4qna";
+  SGr-IosevkaTermSS14 = "1pqrsvnnqb86300hkil4x093r9ybrkpdxvhcp56ph4pshijypb08";
+  SGr-IosevkaTermSS15 = "0inrfcrajmlqxzm87l4l4myrz4bw4wz7y79ibwcjqa0f395jlms3";
+  SGr-IosevkaTermSS16 = "13w9j3sp1lg9wrsj9n5bf3cm38rkkjifk5kqbrkpg9p98k4lfsx5";
+  SGr-IosevkaTermSS17 = "0gcf73bs21phvrjg083l61s37glqvwzckm03gndbqyw7a64k9fdc";
+  SGr-IosevkaTermSS18 = "1aa8hy10wa4zgyrzsnmx4rkbrjjqv56nd4prijdn50qbc5qfw18a";
 }
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 6bbd714f5f05..23ae4b93842b 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -47,25 +47,27 @@
   #   sequence = "+>"
   # '';
   extraParameters ? null,
-  # Custom font set name. Required if any custom settings above.
-  set ? null,
+  # Custom font set name. Required if `extraParameters` is used and/or
+  # if `privateBuildPlan` is a TOML string.
+  set ? privateBuildPlan.family or null,
 }:
 
+assert (builtins.isAttrs privateBuildPlan) -> builtins.hasAttr "family" privateBuildPlan;
 assert (privateBuildPlan != null) -> set != null;
 assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.3.1";
+  version = "33.3.3";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-qbC1FVhnkVlsT+lOSeM6wDbKV2c5iTHgBxZENGEBnUI=";
+    hash = "sha256-/e65hFA8GabDrHjQ+9MthSTxUku9af0LT4W1ENI+LYc=";
   };
 
-  npmDepsHash = "sha256-/HxMh5v3CfCpPCF8cf8Z2NXDBovJFvMaQfYFZvuyNX0=";
+  npmDepsHash = "sha256-QJ3h8NdhCG+lkZ5392akKk+pVHiqmnt+DsC3imixNnw=";
 
   nativeBuildInputs = [
     remarshal
@@ -148,7 +150,6 @@ buildNpmPackage rec {
     platforms = platforms.all;
     maintainers = with maintainers; [
       ttuegel
-      rileyinman
       lunik1
     ];
   };
diff --git a/pkgs/by-name/ip/ipamjfont/package.nix b/pkgs/by-name/ip/ipamjfont/package.nix
new file mode 100644
index 000000000000..1f11aa4f7df0
--- /dev/null
+++ b/pkgs/by-name/ip/ipamjfont/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+  writeShellApplication,
+  curl,
+  gnugrep,
+  common-updater-scripts,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "ipamjfont";
+  version = "006.01";
+
+  src =
+    let
+      suffix = lib.strings.replaceString "." "" finalAttrs.version;
+    in
+    fetchzip {
+      url = "https://dforest.watch.impress.co.jp/library/i/ipamjfont/10750/ipamjm${suffix}.zip";
+      hash = "sha256-Rft8hmxm3D4hOaLaSYDfD14oarDIHUQkMZX+/ZDD4m0=";
+      stripRoot = false;
+    };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm444 *.ttf -t "$out/share/fonts/truetype/"
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = lib.getExe (writeShellApplication {
+      name = "${finalAttrs.pname}-updater";
+
+      runtimeInputs = [
+        curl
+        gnugrep
+        common-updater-scripts
+      ];
+
+      text = ''
+        suffix="$(
+          curl --fail --silent 'https://forest.watch.impress.co.jp/library/software/ipamjfont/download_10750.html' | \
+            grep --perl-regexp --only-matching 'meta.+?ipamjm\K[0-9]+'
+        )"
+        version="''${suffix:0:3}.''${suffix:3:2}"
+        update-source-version '${finalAttrs.pname}' "$version" --ignore-same-version --print-changes
+      '';
+    });
+  };
+
+  meta = {
+    description = "Japanese Mincho font implementing IVS compliant with Hanyo-Denshi collection";
+    downloadPage = "https://forest.watch.impress.co.jp/library/software/ipamjfont/";
+    homepage = "https://moji.or.jp/mojikiban/font/";
+    license = lib.licenses.ipa;
+    maintainers = with lib.maintainers; [
+      kachick
+    ];
+  };
+})
diff --git a/pkgs/by-name/ip/ipget/package.nix b/pkgs/by-name/ip/ipget/package.nix
index 3d0b3f66dee9..408c5e4c5a97 100644
--- a/pkgs/by-name/ip/ipget/package.nix
+++ b/pkgs/by-name/ip/ipget/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ipget";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
     rev = "v${version}";
-    hash = "sha256-7/wXrjnd7YD2qhVvP0yBMJDkDZjxJC1vZcQuqVd44rU=";
+    hash = "sha256-a+dVqIo+cmEnYrc1A98/APJq0m2pSKC5HKIN04rfziY=";
   };
 
-  vendorHash = "sha256-b6Lulzi7zgO0VdWboxi5Vibx8cjuZ6r6O1PJvYubZu4=";
+  vendorHash = "sha256-tYBM0NGHhLNTRfsv+UgBmtpxItjPIr7Klo708vaXItw=";
 
   postPatch = ''
     # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies
diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 3470e43be4f4..80953aa13174 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -6,16 +6,13 @@
   blas,
   lapack,
   gfortran,
-  enableAMPL ? true,
-  libamplsolver,
-  enableMUMPS ? true,
   mumps,
-  mpi,
-  enableSPRAL ? true,
   spral,
+  libamplsolver,
 }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
+assert !mumps.mpiSupport;
 
 stdenv.mkDerivation rec {
   pname = "ipopt";
@@ -28,47 +25,39 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
   };
 
-  CXXDEFS = [
-    "-DHAVE_RAND"
-    "-DHAVE_CSTRING"
-    "-DHAVE_CSTDIO"
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+    "doc"
   ];
 
-  configureFlags =
-    lib.optionals enableAMPL [
-      "--with-asl-cflags=-I${libamplsolver}/include"
-      "--with-asl-lflags=-lamplsolver"
-    ]
-    ++ lib.optionals enableMUMPS [
-      "--with-mumps-cflags=-I${mumps}/include"
-      "--with-mumps-lflags=-ldmumps"
-    ]
-    ++ lib.optionals enableSPRAL [
-      "--with-spral-cflags=-I${spral}/include"
-      "--with-spral-lflags=-lspral"
-    ];
-
   nativeBuildInputs = [
     pkg-config
     gfortran
   ];
+
   buildInputs = [
     blas
     lapack
-  ]
-  ++ lib.optionals enableAMPL [ libamplsolver ]
-  ++ lib.optionals enableMUMPS [
     mumps
-    mpi
-  ]
-  ++ lib.optionals enableSPRAL [ spral ];
+    spral
+    libamplsolver
+  ];
+
+  configureFlags = [
+    "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
+    "--with-mumps-lflags=-ldmumps"
+    "--with-spral-lflags=-lspral"
+    "--with-asl-lflags=-lamplsolver"
+  ];
 
   enableParallelBuilding = true;
 
   meta = {
     description = "Software package for large-scale nonlinear optimization";
     homepage = "https://projects.coin-or.org/Ipopt";
-    license = lib.licenses.epl10;
+    license = lib.licenses.epl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       nim65s
diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index ab399a44c343..fd2e5d893031 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   buildPackages,
   bison,
   flex,
@@ -19,33 +18,18 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.16.0";
+  version = "6.17.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-WQDMwV+aw797fq6B3rWTcSPfNemTR6fxGiKBhILwqNA=";
+    hash = "sha256-l4HllBCrfeqOn3m7EP8UiOY9EPy7cFA7lEJronqOLew=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "color-assume-background-is-dark-if-unknown.patch";
-      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=cc0f1109d2864686180ba2ce6fba5fcb3bf437bf";
-      hash = "sha256-BGD70cXKnDvk7IEU5RQA+pn1dErWjgr74GeSkYtFXoI=";
-    })
-    (fetchpatch {
-      name = "color-do-not-use-dark-blue-in-dark-background-palette.patch";
-      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=46a4659313c2610427a088d8f03b731819f2b87a";
-      hash = "sha256-TXrmGZNsYWdYLsLoBXZEr3cd8HT4EhRg+jACRrC0gKE=";
-    })
     (fetchurl {
-      name = "musl-endian.patch";
-      url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw";
-      hash = "sha256-MX+P+PSEh6XlhoWgzZEBlOV9aXhJNd20Gi0fJCcSZ5E=";
-    })
-    (fetchurl {
-      name = "musl-basename.patch";
-      url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw";
-      hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM=";
+      name = "musl-redefinition.patch";
+      url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw";
+      hash = "sha256-8gSpZb/B5sMd2OilUQqg0FqM9y3GZd5Ch5AXV5wrCZQ=";
     })
   ];
 
@@ -57,6 +41,7 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
+    "scripts"
   ];
 
   configureFlags = [
@@ -87,6 +72,10 @@ stdenv.mkDerivation rec {
     "CONFDIR=$(out)/etc/iproute2"
   ];
 
+  postInstall = ''
+    moveToOutput sbin/routel "$scripts"
+  '';
+
   depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
   nativeBuildInputs = [
     bison
diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 647090889eb1..49632d398755 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-10-09";
+  version = "1.21.1-unstable-2025-11-05";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "1cc1f1cd4f06e297552b3cf15d43ee23f5fa1ce2";
-    hash = "sha256-h316o/6hg6x9RWt760UXa39hArkjc0AyKS/he6OKhoA=";
+    rev = "b41bda4413bf286d7b7a449bc05e1531da1eec2e";
+    hash = "sha256-uJzvmTzGg1gzquo09IyufwK77Kq6iQt+bhJecaTy6ts=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.
diff --git a/pkgs/by-name/ir/irods-icommands/package.nix b/pkgs/by-name/ir/irods-icommands/package.nix
index fd92911ec6a0..624986e5d3e4 100644
--- a/pkgs/by-name/ir/irods-icommands/package.nix
+++ b/pkgs/by-name/ir/irods-icommands/package.nix
@@ -16,7 +16,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     owner = "irods";
     repo = "irods_client_icommands";
     tag = finalAttrs.version;
-    hash = "sha256-lo1eCI/CSzl7BJWdPo7KKVHfznkPN6GwsiQThUGuQdw=";
+    hash = "sha256-jR7AhWeXYuJKzZRmYQUjiKSwK6PaB4dLQO8GVZwJQXk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ir/irods/package.nix b/pkgs/by-name/ir/irods/package.nix
index 98b823f54f77..8c2055ec406e 100644
--- a/pkgs/by-name/ir/irods/package.nix
+++ b/pkgs/by-name/ir/irods/package.nix
@@ -16,19 +16,19 @@
   boost183,
   nlohmann_json,
   nanodbc,
-  fmt_9,
+  fmt,
   spdlog,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "irods";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "irods";
     repo = "irods";
     tag = finalAttrs.version;
-    hash = "sha256-/mcuqukgDoMc89FL/TfOhHWglsfdLmQbAnQYT8vTFsY=";
+    hash = "sha256-gYwuXWRf5MZv3CTUq/RDlU9Ekbw4jZJmSgWRBKqdKJo=";
   };
 
   nativeBuildInputs = [
@@ -54,12 +54,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     boost183
     nlohmann_json
     nanodbc
-    # Tracking issue for `fmt_11`:
-    # <https://github.com/irods/irods/issues/8454>
-    fmt_9
-    (spdlog.override {
-      fmt = fmt_9;
-    })
+    fmt
+    spdlog
   ];
 
   cmakeFlags = finalAttrs.passthru.commonCmakeFlags ++ [
diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index cbeab7c8d75a..b732787210f1 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2025-1.6";
+  version = "2025-1.7";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-U2HweRi6acrmMT+9B1263mhGIn/84Z6JeqKP6XvTeXE=";
+      hash = "sha256-VLB/Ni+sZ0Xugh3v7vb4rqTlAZz3eHU33lbljCX3Yic=";
     };
 
   passthru.updateScript = writeScript "update-irpf" ''
diff --git a/pkgs/by-name/is/is-fast/package.nix b/pkgs/by-name/is/is-fast/package.nix
index 5e079a59b829..9eaeb5284714 100644
--- a/pkgs/by-name/is/is-fast/package.nix
+++ b/pkgs/by-name/is/is-fast/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "is-fast";
-  version = "0.17.2";
+  version = "0.17.7";
 
   src = fetchFromGitHub {
     owner = "Magic-JD";
     repo = "is-fast";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wy5twHlCAlf/W12Y9a/IVFbsLuc8hkhH+5pBoL6Av0Y=";
+    hash = "sha256-9uq/MEa3t44pKBv8GaHDA8cZk8pI4ruFebVUWrPUxgc=";
   };
 
-  cargoHash = "sha256-EsB/Z8HwhYBQ8HDia0IJU3U0k9ZnR558Yrv1sYLUAZ0=";
+  cargoHash = "sha256-RMGrBLgFvJ8YBblWsPC41Eva7wPRM400jAM137waWUI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/is/isc-cron/package.nix b/pkgs/by-name/is/isc-cron/package.nix
index 137273c9f393..fb9b58c586f7 100644
--- a/pkgs/by-name/is/isc-cron/package.nix
+++ b/pkgs/by-name/is/isc-cron/package.nix
@@ -35,8 +35,6 @@ stdenv.mkDerivation (finalAttrs: {
     "DESTROOT=$(out)"
   ];
 
-  hardeningEnable = [ "pie" ];
-
   unpackCmd = ''
     mkdir cron
     pushd cron
diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index 480b71fbbe65..390eb09089a1 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -29,13 +29,13 @@
 stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   name = "isle-portable";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "isledecomp";
     repo = "isle-portable";
-    rev = "6ea82ae144b91874bd41fe32e9ffb82507a87ef0";
-    hash = "sha256-5BWMGjvAxyaI2KepbHgy9lYKorb5tWbqlZw2YkbQ7L0=";
+    rev = "d6aaa6b9daf3dd2a858ec127bbb14099bb3886b4";
+    hash = "sha256-azNB3oVQl4yxr4LG0NUY8XomWphlizpf6bqmfcrMqsw=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/is/ispike/package.nix b/pkgs/by-name/is/ispike/package.nix
index fb1754934fe4..3688511138ac 100644
--- a/pkgs/by-name/is/ispike/package.nix
+++ b/pkgs/by-name/is/ispike/package.nix
@@ -3,9 +3,13 @@
   stdenv,
   fetchurl,
   cmake,
-  boost,
+  boost186,
 }:
 
+let
+  boost = boost186;
+in
+
 stdenv.mkDerivation rec {
   pname = "ispike";
   version = "2.1.1";
@@ -17,6 +21,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i "1i #include <map>" include/iSpike/YarpConnection.hpp
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix
index 1342fece96dd..ab97dd15c243 100644
--- a/pkgs/by-name/is/isponsorblocktv/package.nix
+++ b/pkgs/by-name/is/isponsorblocktv/package.nix
@@ -7,27 +7,21 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "isponsorblocktv";
-  version = "2.5.3";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dmunozv04";
     repo = "iSponsorBlockTV";
     tag = "v${version}";
-    hash = "sha256-vxTEec5SMq5zcX70PiRD61aDPJUySuBG0TBQH5Qw8ow=";
+    hash = "sha256-AGjLehhGYz8FyojSFmSYKLCkHAExtpQiukQnTNt1YoY=";
   };
 
   patches = [
     # Port iSponsorBlockTV to pyytlounge v3
     (fetchpatch {
-      url = "https://github.com/lukegb/iSponsorBlockTV/commit/3b50819fffbea23ef02f24726982a1b3313fa952.patch";
-      hash = "sha256-2adgGE3rBnp+/z+2iblWCxO+6qV9RHx0dqTxv/kjDJU=";
-    })
-
-    # Update setup_wizard for Textual v3
-    (fetchpatch {
-      url = "https://github.com/lukegb/iSponsorBlockTV/commit/4a3874b781f796ad32e40fc871fee7c080716171.patch";
-      hash = "sha256-kdfAaIuvQovst55sOmKv+zH/7JxN1JHI9aTF0c9fYAY=";
+      url = "https://github.com/ameertaweel/iSponsorBlockTV/commit/1809ca5a0d561bc9326a51e82118f290423ed3e6.patch";
+      hash = "sha256-v5YXfKUPTzpZPIkVSQF2VUe9EvclAH+kJyiiyUEe/HM=";
     })
   ];
 
diff --git a/pkgs/by-name/is/issue2md/package.nix b/pkgs/by-name/is/issue2md/package.nix
index 8ccd32577397..947f354f96e4 100644
--- a/pkgs/by-name/is/issue2md/package.nix
+++ b/pkgs/by-name/is/issue2md/package.nix
@@ -17,6 +17,10 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
+  ldflags = [
+    "-s"
+  ];
+
   meta = {
     description = "CLI tool to convert GitHub issue into Markdown file";
     homepage = "https://github.com/bigwhite/issue2md";
diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 7b9533563912..5ee989bdabda 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.27.2";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    hash = "sha256-o+rKTm1Yc2J+/uDp1DCkCpmOrODpfQ7bQ/FB62UyKfk=";
+    hash = "sha256-NLARp5Gw04UosyLw3TkEmtvSLKa+tYp4s60UKvcJOgw=";
   };
-  vendorHash = "sha256-AJzEAFZZe4QtuYRcIJ8GwosbBi5gWn+DAOpVS8JnAdQ=";
+  vendorHash = "sha256-ge9aR3ZYOJaYp0D1UWzzg40nXlwM/Sl1Ep+u1CmdSV8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix
index 5c212cf10109..b60ea425eb6b 100644
--- a/pkgs/by-name/it/itsycal/package.nix
+++ b/pkgs/by-name/it/itsycal/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "itsycal";
-  version = "0.15.6";
+  version = "0.15.7";
 
   src = fetchzip {
     url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
-    hash = "sha256-e1h81Lsi9mC/3HfUbCk9JkLztGZSVRG6NeQb9voPDk0=";
+    hash = "sha256-0JQ7fZ0cZM8DnAODZQKzUQEHQGhkNvV+0NY10Ef7MEw=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix
index 537d4af0c72a..62e513b1f264 100644
--- a/pkgs/by-name/iw/iwgtk/package.nix
+++ b/pkgs/by-name/iw/iwgtk/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/j-lentz/iwgtk";
     changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "iwgtk";
   };
diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix
index e94423ed57d1..e35decacd0e8 100644
--- a/pkgs/by-name/ja/jabref/package.nix
+++ b/pkgs/by-name/ja/jabref/package.nix
@@ -9,14 +9,14 @@
   xdg-utils,
   gtk3,
   jdk21,
-  openjfx23,
+  openjfx25,
   gradle_8,
   python3,
 }:
 let
   jdk = jdk21.override {
     enableJavaFX = true;
-    openjfx_jdk = openjfx23;
+    openjfx_jdk = openjfx25;
   };
   # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
   gradle = gradle_8;
diff --git a/pkgs/applications/audio/jack-autoconnect/default.nix b/pkgs/by-name/ja/jack-autoconnect/package.nix
similarity index 67%
rename from pkgs/applications/audio/jack-autoconnect/default.nix
rename to pkgs/by-name/ja/jack-autoconnect/package.nix
index 9d84c9ff669e..f46a4882b66b 100644
--- a/pkgs/applications/audio/jack-autoconnect/default.nix
+++ b/pkgs/by-name/ja/jack-autoconnect/package.nix
@@ -1,13 +1,12 @@
 {
+  stdenv,
   lib,
-  mkDerivation,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qtbase,
   libjack2,
+  libsForQt5,
 }:
-mkDerivation {
+stdenv.mkDerivation {
   pname = "jack_autoconnect";
 
   # It does not have any versions (yet?)
@@ -17,16 +16,18 @@ mkDerivation {
     owner = "kripton";
     repo = "jack_autoconnect";
     rev = "fe0c8f69149e30979e067646f80b9d326341c02b";
-    sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
+    hash = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
   };
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libjack2
   ];
+
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   installPhase = ''
@@ -34,12 +35,12 @@ mkDerivation {
     cp -- jack_autoconnect "$out/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kripton/jack_autoconnect";
     description = "Tiny application that reacts on port registrations by clients and connects them";
     mainProgram = "jack_autoconnect";
-    maintainers = with maintainers; [ unclechu ];
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ unclechu ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ja/jack-link/package.nix b/pkgs/by-name/ja/jack-link/package.nix
new file mode 100644
index 000000000000..2b1d32a5fbbb
--- /dev/null
+++ b/pkgs/by-name/ja/jack-link/package.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  pkg-config,
+  libjack2,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jack-link";
+  version = "0.2.5";
+
+  src = fetchFromGitHub {
+    owner = "rncbc";
+    repo = "jack_link";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UYyVGc9/NOLzFD/31zB9lhUJW8G/PGt7VkSBjntpymw=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libjack2
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = "https://github.com/rncbc/jack_link";
+    description = "jack_link bridges JACK transport with Ableton Link";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "jack_link";
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/by-name/ja/jackmix/no_error.patch
similarity index 100%
rename from pkgs/applications/audio/jackmix/no_error.patch
rename to pkgs/by-name/ja/jackmix/no_error.patch
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/by-name/ja/jackmix/package.nix
similarity index 88%
rename from pkgs/applications/audio/jackmix/default.nix
rename to pkgs/by-name/ja/jackmix/package.nix
index d4a0bf6064a4..7b57e6571bcb 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/by-name/ja/jackmix/package.nix
@@ -1,25 +1,25 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   pkg-config,
   scons,
-  qtbase,
   lash,
   libjack2,
   jack ? libjack2,
   alsa-lib,
+  libsForQt5,
   fetchpatch,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jackmix";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kampfschlaefer";
     repo = "jackmix";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
@@ -35,9 +35,10 @@ mkDerivation rec {
   nativeBuildInputs = [
     scons
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     lash
     jack
     alsa-lib
@@ -55,4 +56,4 @@ mkDerivation rec {
     maintainers = with maintainers; [ kampfschlaefer ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/ja/jacoco/package.nix b/pkgs/by-name/ja/jacoco/package.nix
index 7702dc03137f..4779d1b3da21 100644
--- a/pkgs/by-name/ja/jacoco/package.nix
+++ b/pkgs/by-name/ja/jacoco/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     changelog = "https://www.jacoco.org/jacoco/trunk/doc/changes.html";
     license = licenses.epl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix
index 5e9acfed111c..1627c24b753c 100644
--- a/pkgs/by-name/ja/jai/package.nix
+++ b/pkgs/by-name/ja/jai/package.nix
@@ -9,7 +9,7 @@
 let
   pname = "jai";
   minor = "2";
-  patch = "017";
+  patch = "018";
   version = "0.${minor}.${patch}";
   zipName = "jai-beta-${minor}-${patch}.zip";
   jai = stdenv.mkDerivation {
@@ -20,7 +20,7 @@ let
           nix-store --add-fixed sha256 ${zipName}
       '';
       name = zipName;
-      sha256 = "sha256-qVBF71qpFXfBkke9vCs7Wq/+P7ZQIgg4l1iLw8NmQhA=";
+      sha256 = "sha256-vs9YSQzeqp34OSSl8JghDVyyqegsQj3bhUDGNwecHRI=";
     };
     nativeBuildInputs = [ unzip ];
     buildCommand = "unzip $src -d $out";
diff --git a/pkgs/by-name/ja/jailer/package.nix b/pkgs/by-name/ja/jailer/package.nix
index 7b66822da10e..573a8701e610 100644
--- a/pkgs/by-name/ja/jailer/package.nix
+++ b/pkgs/by-name/ja/jailer/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jailer";
-  version = "16.9.2";
+  version = "16.9.3";
 
   src = fetchFromGitHub {
     owner = "Wisser";
     repo = "Jailer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zdJOJ8eIEH+zRCHTIHdhCr5hjE+x2iN5fRd4SVUcOCg=";
+    hash = "sha256-4uXJZZ528Bc4vL8NUQDjoWGPBu/Bd9jhOMxC3e+s9hc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index a1a1c983726b..88300186770b 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -15,10 +15,6 @@
 }:
 
 let
-  _version = "2.10.5";
-  _build = "488";
-  version = "${_version}-${_build}";
-
   swtSystem =
     if stdenv.hostPlatform.system == "i686-linux" then
       "linux"
@@ -45,13 +41,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jameica";
-  inherit version;
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "willuhn";
     repo = "jameica";
-    rev = "V_${builtins.replaceStrings [ "." ] [ "_" ] _version}_BUILD_${_build}";
-    hash = "sha256-xzSyq5Cse/TCzyb/eQNZyQS/I3mcPsvzWk3VjZg95gE=";
+    tag = version;
+    hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i";
   };
 
   nativeBuildInputs = [
@@ -88,7 +84,7 @@ stdenv.mkDerivation rec {
     # copy platform-specific SWT
     cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/
 
-    install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/
+    install -Dm644 releases/${version}/jameica/jameica.jar $out/share/java/
     install -Dm644 plugin.xml $out/share/java/
     install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
     cp ${desktopItem}/share/applications/* $out/share/applications/
@@ -97,8 +93,8 @@ stdenv.mkDerivation rec {
 
     # Create .app bundle for macOS
     mkdir -p $out/Applications
-    chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh
-    cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app
+    chmod +x releases/${version}/tmp/jameica.app/jameica*.sh
+    cp -r releases/${version}/tmp/jameica.app $out/Applications/Jameica.app
   ''
   + ''
 
diff --git a/pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff b/pkgs/by-name/ja/jamesdsp/fix-build-on-qt6_9.diff
similarity index 100%
rename from pkgs/applications/audio/jamesdsp/fix-build-on-qt6_9.diff
rename to pkgs/by-name/ja/jamesdsp/fix-build-on-qt6_9.diff
diff --git a/pkgs/applications/audio/jamesdsp/default.nix b/pkgs/by-name/ja/jamesdsp/package.nix
similarity index 93%
rename from pkgs/applications/audio/jamesdsp/default.nix
rename to pkgs/by-name/ja/jamesdsp/package.nix
index a3917e48f509..6d7408c76ead 100644
--- a/pkgs/applications/audio/jamesdsp/default.nix
+++ b/pkgs/by-name/ja/jamesdsp/package.nix
@@ -10,14 +10,10 @@
   pipewire,
   pkg-config,
   pulseaudio,
-  qmake,
-  qtbase,
-  qtsvg,
-  qtwayland,
   stdenv,
   usePipewire ? true,
   usePulseaudio ? false,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 assert lib.asserts.assertMsg (
@@ -32,15 +28,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "Audio4Linux";
     repo = "JDSP4Linux";
     fetchSubmodules = true;
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-eVndqIqJ3DRceuFMT++g2riXq0CL5r+TWbvzvaYIfZ8=";
   };
 
   nativeBuildInputs = [
-    qmake
+    kdePackages.qmake
     pkg-config
     copyDesktopItems
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   patches = [
@@ -55,9 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glibmm
     libarchive
-    qtbase
-    qtsvg
-    qtwayland
+    kdePackages.qtbase
+    kdePackages.qtsvg
+    kdePackages.qtwayland
   ]
   ++ lib.optionals usePipewire [
     pipewire
diff --git a/pkgs/by-name/ja/jami/package.nix b/pkgs/by-name/ja/jami/package.nix
index e520810a67bc..2debaf3a2ac5 100644
--- a/pkgs/by-name/ja/jami/package.nix
+++ b/pkgs/by-name/ja/jami/package.nix
@@ -3,8 +3,10 @@
   lib,
   pkg-config,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   ffmpeg_6,
+  ninja,
 
   # for daemon
   autoreconfHook,
@@ -12,7 +14,7 @@
   alsa-lib,
   asio,
   dbus,
-  sdbus-cpp,
+  sdbus-cpp_2,
   fmt,
   gmp,
   gnutls,
@@ -62,25 +64,32 @@
 
 stdenv.mkDerivation rec {
   pname = "jami";
-  version = "20250718.0";
+  version = "20251003.0";
 
   src = fetchFromGitLab {
     domain = "git.jami.net";
     owner = "savoirfairelinux";
     repo = "jami-client-qt";
     rev = "stable/${version}";
-    hash = "sha256-EEiuymfu28bJ6pfBKwlsCGDq7XlKGZYK+2WjPJ+tcxw=";
+    hash = "sha256-CYKrIWGTmGvHIhNdyEhDKE1Rm84O7X3yPVLkF6qakwU=";
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jami-qt/-/raw/0ecbaf3b101bbdd0d4a06b06f3ce1ff654abf0b5/fix-link.patch";
+      hash = "sha256-VsQbOPHyNFcRhpae+9UCaUJdHH8bMGf3ZIAW3RKiu6k=";
+    })
+  ];
+
   pjsip-jami = pjsip.overrideAttrs (old: {
-    version = "sfl-2.15-unstable-2025-02-24";
+    version = "sfl-2.15-unstable-2025-09-18";
 
     src = fetchFromGitHub {
       owner = "savoirfairelinux";
       repo = "pjproject";
-      rev = "37130c943d59f25a71935803ea2d84515074a237";
-      hash = "sha256-7gAiriuooqqF38oajAuD/Lj5trn/9VMkCGOumcV45NA=";
+      rev = "93dc96918bb6ba74e1e1d00c40c80402e856f2ac";
+      hash = "sha256-wsbKa3TXqj+nQMtAaEAD0Zh248QdNMhKnIOnq08MPI0=";
     };
 
     configureFlags = [
@@ -118,14 +127,14 @@ stdenv.mkDerivation rec {
 
   dhtnet = stdenv.mkDerivation {
     pname = "dhtnet";
-    version = "unstable-2025-05-26";
+    version = "unstable-2025-09-15";
 
     src = fetchFromGitLab {
       domain = "git.jami.net";
       owner = "savoirfairelinux";
       repo = "dhtnet";
-      rev = "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2";
-      hash = "sha256-uweYSEysVMUC7DhI9BhS1TDZ6ZY7WQ9JS3ZF9lKA4Fo=";
+      rev = "7861b4620b4cec5fa34c5d1bb2b304912730f638";
+      hash = "sha256-nhGB4u12Ubmc7lLVOAwycRsP+cWzn4A9bYH0+sSBQTg=";
     };
 
     postPatch = ''
@@ -177,12 +186,6 @@ stdenv.mkDerivation rec {
     inherit src version meta;
     sourceRoot = "${src.name}/daemon";
 
-    # Fix for libgit2 breaking changes
-    postPatch = ''
-      substituteInPlace src/jamidht/conversationrepository.cpp \
-        --replace-fail "git_commit* const" "const git_commit*"
-    '';
-
     nativeBuildInputs = [
       autoreconfHook
       pkg-config
@@ -194,7 +197,7 @@ stdenv.mkDerivation rec {
       asio
       dbus
       dhtnet
-      sdbus-cpp
+      sdbus-cpp_2
       fmt
       ffmpeg_6
       gmp
@@ -226,17 +229,17 @@ stdenv.mkDerivation rec {
   qwindowkit-src = fetchFromGitHub {
     owner = "stdware";
     repo = "qwindowkit";
-    rev = "758b00cb6c2d924be3a1ea137ec366dc33a5132d";
-    hash = "sha256-qpVsF4gUX2noG9nKgjNP7FCEe59okZtDA8R/aZOef7Q=";
+    rev = "0131d673092ab18afd69fac84f4a17ad2ba615f2";
+    hash = "sha256-jajgLOj0h/byt3+fSbCpV3VPUoHxijUsKw/0BOwbXTw=";
     fetchSubmodules = true;
   };
 
   postPatch = ''
     sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
-    sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt
     cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
     substituteInPlace CMakeLists.txt \
       --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
+    sed -i -e '/pkg_check_modules/i FIND_PACKAGE(PkgConfig REQUIRED)' src/libclient/CMakeLists.txt
   '';
 
   preConfigure = ''
@@ -257,6 +260,7 @@ stdenv.mkDerivation rec {
     git
     python3
     qt6Packages.qttools # for translations
+    ninja
   ];
 
   buildInputs = [
@@ -284,7 +288,11 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withWebengine [ qtwebengine ]
   );
 
-  cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
+  cmakeFlags = [
+    (lib.cmakeBool "JAMICORE_AS_SUBDIR" false)
+    (lib.cmakeBool "DWITH_WEBENGINE" withWebengine)
+    "-DLIBJAMI_INCLUDE_DIRS=${daemon}/include/jami"
+  ];
 
   qtWrapperArgs = [
     # With wayland the titlebar is not themed and the wmclass is wrong.
@@ -295,7 +303,10 @@ stdenv.mkDerivation rec {
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "stable/"; };
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "stable/"; };
+    inherit daemon pjsip dhtnet;
+  };
 
   meta = with lib; {
     homepage = "https://jami.net/";
diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 7b4e5bbc271b..5a67ffa753d5 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mit;
     teams = [ lib.teams.ngi ];
     maintainers = with lib.maintainers; [
-      figsoda
       siraben
     ];
     mainProgram = "jaq";
diff --git a/pkgs/by-name/ja/jart-jsoncpp/package.nix b/pkgs/by-name/ja/jart-jsoncpp/package.nix
new file mode 100644
index 000000000000..2af52e608153
--- /dev/null
+++ b/pkgs/by-name/ja/jart-jsoncpp/package.nix
@@ -0,0 +1,82 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  copyPkgconfigItems,
+  makePkgconfigItem,
+  lib,
+  testers,
+  ctestCheckHook,
+  ninja,
+  double-conversion,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "json.cpp";
+  version = "0-unstable-2025-10-25";
+
+  src = fetchFromGitHub {
+    owner = "jart";
+    repo = "json.cpp";
+    rev = "6ec4e44a5bbaadbe677473378c3d2133644c58a1";
+    hash = "sha256-kUFtyFPoHGCFWTGRD8SoBsqHYCplGPw/AcpMR9T0Ffk=";
+  };
+
+  doCheck = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "JSON_CPP_BUILD_TESTS" true)
+    (lib.cmakeBool "DOUBLE_CONVERSION_VENDORED" false)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    copyPkgconfigItems
+    ctestCheckHook
+    ninja
+  ];
+
+  buildInputs = [
+    double-conversion
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  # https://github.com/jart/json.cpp/issues/17
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "json.cpp";
+      inherit (finalAttrs) version;
+      cflags = [ "-I${variables.includedir}" ];
+      libs = [
+        "-L${variables.libdir}"
+        "-ljson"
+      ];
+      libsPrivate = [
+        # nixpkgs double-conversion does not support pkg-config
+        # as of yet.
+        "-ldouble-conversion"
+      ];
+      variables = {
+        includedir = "${placeholder "dev"}/include";
+        libdir = "${placeholder "out"}/lib";
+      };
+      inherit (finalAttrs.meta) description;
+    })
+  ];
+
+  meta = {
+    pkgConfigModules = [ "json.cpp" ];
+    description = "JSON for Classic C++";
+    homepage = "https://github.com/jart/json.cpp";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fzakaria ];
+  };
+})
diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index 040b3a258947..8b743c851d2b 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -176,6 +176,7 @@ let
     {
       pname,
       version,
+      rev ? "refs/tags/${version}",
       hash,
       deps,
     }:
@@ -185,8 +186,7 @@ let
         name = "${pname}-${version}-source";
         owner = "jasp-stats";
         repo = pname;
-        tag = "v${version}";
-        inherit hash;
+        inherit rev hash;
       };
       propagatedBuildInputs = deps;
       # some packages have a .Rprofile that tries to activate renv
@@ -713,8 +713,9 @@ in
     };
     jaspRegression = buildJaspModule {
       pname = "jaspRegression";
-      version = "0.95.0";
-      hash = "sha256-9Q5Ei9vjFaDte//1seCj9++ftbDctkHzP8ZpGVETXH0=";
+      version = "0.95.0-unstable-2025-08-27";
+      rev = "b0ecad26bb248964e778ee6d4486d671b83930b2";
+      hash = "sha256-wm/Fz/wA7B96bzj8UylZjFgrrZgwOTdGnCsmfaCPGp0=";
       deps = [
         BAS
         boot
@@ -723,7 +724,6 @@ in
         emmeans
         ggplot2
         ggrepel
-        hmeasure
         jaspAnova
         jaspBase
         jaspDescriptives
diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
index dfe3bdd3e2be..b8b1f4ab1759 100644
--- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
+++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "jawiki-all-titles-in-ns0";
-  version = "0-unstable-2025-10-01";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "musjj";
     repo = "jawiki-archive";
-    rev = "81e6379ffeb292a5ff6db4302347d80ba053fb1e";
-    hash = "sha256-jbfJ+Vf7jkCjjePbwHP0BTFA/J1NcIQkhFK1jqD4bPE=";
+    rev = "417baa847977539d641dfb83c9960c2b6b10c1d7";
+    hash = "sha256-uBregjxM/LDkAyYMLiXLVGSa83DStFxz352pFORqVdY=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix
index e9dccd39497f..06d7246a7a37 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.131.0";
+  version = "0.132.1";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-Vp7iCO77JWQzPHcF0i5st5TBv1bqjbwnhGHk3+sIr2A=";
+    sha256 = "sha256-+JqToH2DHfExu0HtGK1M/YobgjTApWxyp9Hp6VjdRvI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix
index c7987d0602b3..21a0d9d7f2da 100644
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@@ -7,15 +7,15 @@
 }:
 
 let
-  timestamp = "202510022025";
+  timestamp = "202510301627";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdt-language-server";
-  version = "1.51.0";
+  version = "1.52.0";
 
   src = fetchurl {
     url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
-    hash = "sha256-ilk3IReIG/W9wCIPIlRHKEa4gTfAWPNEsAp9QUJ3RaE=";
+    hash = "sha256-V+a0U2ZTVLQqiYgn0quTij7GtBwScsEJmDw7emDsR4U=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix
index a49d0c6c84c8..226e316306ad 100644
--- a/pkgs/by-name/jd/jdupes/package.nix
+++ b/pkgs/by-name/jd/jdupes/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdupes";
-  version = "1.29.0";
+  version = "1.31.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jbruchon";
     repo = "jdupes";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ddl1GCA96j5H6C9KTtJudQ4wSUeOGA6p4P8JPbsVr9o=";
+    hash = "sha256-I1DtJokp43K9nZt73od4esK705nosIWEHLw4lydufbE=";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
     "PREFIX=${placeholder "out"}"
     # don't link with ../libjodycode
     "IGNORE_NEARBY_JC=1"
-    # link with system libjodycode (this case is erroneously missing in v1.29.0)
-    "LDFLAGS_EXTRA=-ljodycode"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     "ENABLE_DEDUPE=1"
diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 326745272fd5..180f8504ab23 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -13,7 +13,7 @@
 }:
 buildNpmPackage rec {
   pname = "jellyfin-web";
-  version = "10.10.7";
+  version = "10.11.2";
 
   src =
     assert version == jellyfin.version;
@@ -21,7 +21,7 @@ buildNpmPackage rec {
       owner = "jellyfin";
       repo = "jellyfin-web";
       rev = "v${version}";
-      hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY=";
+      hash = "sha256-xgZ2fh2dMpcvXXUWcZSvcARm4Qy8qgi8T5nFyk+sOgs=";
     };
 
   nodejs = nodejs_20; # does not build with 22
@@ -31,7 +31,7 @@ buildNpmPackage rec {
       --replace-fail "git describe --always --dirty" "echo ${src.rev}" \
   '';
 
-  npmDepsHash = "sha256-nfvqVByD3Kweq+nFJQY4R2uRX3mx/qJvGFiKiOyMUdw=";
+  npmDepsHash = "sha256-Uikude8cNBA79KNPf6D0McwR/AoaaWJVMw2Q08AiK3U=";
 
   preBuild = ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart
diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json
index 36a1b036aea9..03a118c5a9e3 100644
--- a/pkgs/by-name/je/jellyfin/nuget-deps.json
+++ b/pkgs/by-name/je/jellyfin/nuget-deps.json
@@ -1,23 +1,28 @@
 [
   {
     "pname": "AsyncKeyedLock",
-    "version": "7.0.2",
-    "hash": "sha256-UFPta8yWtuFhpfy7OpBkUDQnyO8TODXEE0zA6ubz1QM="
+    "version": "7.1.7",
+    "hash": "sha256-gXITMqewgmts75I2SHzZ/AyihFihQ0Vo/JSletxz+r4="
   },
   {
     "pname": "BDInfo",
     "version": "0.8.0",
     "hash": "sha256-r6Q+rRTbHyFqiWeaUDfw0eS8D/U1FZckNzAaU4ibLhQ="
   },
+  {
+    "pname": "BitFaster.Caching",
+    "version": "2.5.4",
+    "hash": "sha256-PWuVT1kKjL8ulMtv9hWmg0nMChFh8skr34xUl3mQ0Y8="
+  },
   {
     "pname": "BlurHashSharp",
-    "version": "1.3.4",
-    "hash": "sha256-xBTjBMTrN8M4gsPJSW3YIuu6Zi44xBkDHJF4FudOIts="
+    "version": "1.4.0-pre.1",
+    "hash": "sha256-QNx5Ix+a5DWNrJegpH3Qj56aaoAct0W2pBWMPda7zyI="
   },
   {
     "pname": "BlurHashSharp.SkiaSharp",
-    "version": "1.3.4",
-    "hash": "sha256-P0ObHZ6/lSwLjG7+uTgzmTcwCfDGisz8GFzlnDjctgY="
+    "version": "1.4.0-pre.1",
+    "hash": "sha256-NmulKfYfa/dupnOweGUoLxf8Jba/ThW615vi4IDNc90="
   },
   {
     "pname": "CommandLineParser",
@@ -26,8 +31,8 @@
   },
   {
     "pname": "Diacritics",
-    "version": "3.3.29",
-    "hash": "sha256-sIbdJ3yMthnmJHly3WheUdYjtwPakcczTJx9ycxtgrY="
+    "version": "4.0.17",
+    "hash": "sha256-O1pOeOV7c+dfD/EjwiOmqYhP5RDZyosVOk0OjVuK5Eg="
   },
   {
     "pname": "DiscUtils.Core",
@@ -51,8 +56,8 @@
   },
   {
     "pname": "dotnet-ef",
-    "version": "8.0.11",
-    "hash": "sha256-LxLA79aQCxhNPU3fTw6w2aFCo5S2vqmkCeaGdMY3c9Y="
+    "version": "9.0.10",
+    "hash": "sha256-ySEiSCUsZnosL/aHA4zCWW0YEdUjHhluMzwDmYNDsj4="
   },
   {
     "pname": "DotNet.Glob",
@@ -61,28 +66,28 @@
   },
   {
     "pname": "ExCSS",
-    "version": "4.2.3",
-    "hash": "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="
+    "version": "4.3.1",
+    "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "7.3.0.3",
-    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+    "version": "8.3.0.1",
+    "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.3",
-    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.3",
-    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+    "version": "8.3.0.1",
+    "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.3",
-    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+    "version": "8.3.0.1",
+    "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY="
   },
   {
     "pname": "Humanizer.Core",
@@ -104,6 +109,11 @@
     "version": "4.0.8",
     "hash": "sha256-OikeX+tNhbMoYDUYZl5YeSWaODgLLzR0S1xcwjpmmOg="
   },
+  {
+    "pname": "Ignore",
+    "version": "0.2.1",
+    "hash": "sha256-VHlsd3Va9IN5EbAHFiEHDvJXWhbyUXxZnGrMmh/1kPU="
+  },
   {
     "pname": "J2N",
     "version": "2.0.0",
@@ -116,13 +126,13 @@
   },
   {
     "pname": "libse",
-    "version": "4.0.8",
-    "hash": "sha256-A17k5GpMtY3RSqZADeP4Ri9LKXkVa9jHo4+Tipn7Bs8="
+    "version": "4.0.12",
+    "hash": "sha256-l7ai5a+1BD4LMU5X7f4ZcLZA2QUjpTCCP8XCrRQ0fhk="
   },
   {
     "pname": "LrcParser",
-    "version": "2025.228.1",
-    "hash": "sha256-1p471WX25rYpb0P/q3sEj35vLLa8QvokAbLO47D7wTM="
+    "version": "2025.623.0",
+    "hash": "sha256-f3+6qpPxQOdwAX1OuNiHoobk38lY+9Udyvubhg989MQ="
   },
   {
     "pname": "MetaBrainz.Common",
@@ -141,98 +151,133 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Authorization",
-    "version": "8.0.11",
-    "hash": "sha256-LHkaXHgK1aHl6sk+6fZralNRsY0GEoALkyRspJP0nyE="
+    "version": "9.0.10",
+    "hash": "sha256-jhjTkNSo7vFuPMit1jun/QJ1+Yb6o5XdYCaUelX1g/M="
   },
   {
     "pname": "Microsoft.AspNetCore.Metadata",
-    "version": "8.0.11",
-    "hash": "sha256-P7U4DkTNjG8m2s/tVqWLJ6hm9LJhThBRi1hsp4JPecc="
+    "version": "9.0.10",
+    "hash": "sha256-lrCmI+moPjThyWVX6xtQvRZZ+b5pCLUSpQmm8Q47pM0="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "6.0.0",
-    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+    "version": "7.0.0",
+    "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "16.10.0",
+    "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.8.3",
+    "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34="
+  },
+  {
+    "pname": "Microsoft.Build.Locator",
+    "version": "1.7.8",
+    "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.3",
-    "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "3.3.4",
-    "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+    "version": "4.14.0",
+    "hash": "sha256-f7svtnkq4xLTjGVj6kNZ1ZGFCV/RESsM+GJZmEpezh4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.5.0",
-    "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.8.0",
+    "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.5.0",
-    "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.8.0",
+    "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "4.5.0",
-    "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="
+    "version": "4.8.0",
+    "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "4.5.0",
-    "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="
+    "version": "4.8.0",
+    "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild",
+    "version": "4.8.0",
+    "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU="
   },
   {
     "pname": "Microsoft.Data.Sqlite",
-    "version": "8.0.11",
-    "hash": "sha256-55TQhpJDkL7I4GH1cWYNEr1gNJ7pqHhmXzPGoseWsFg="
+    "version": "9.0.10",
+    "hash": "sha256-53z+zRrlVxzwELr9C+VSHcqGK/cjKvuilaD/2BJA28Y="
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "8.0.11",
-    "hash": "sha256-bYyxOTss74EVz+3ybmgl11fzX0Co3CVZbCDxv24y0/E="
+    "version": "9.0.10",
+    "hash": "sha256-prsCR2WzQAhbhdZ30xk+/wvLt6rDj0M3k1tvyoD6uYM="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "8.0.11",
-    "hash": "sha256-uvcAmj7ob2X/JKLleNwanpNs0X3PkJl3je6ZsHeWooE="
+    "version": "9.0.10",
+    "hash": "sha256-Zm4oMVeloK2WmPskzg4l3SXjJuC+sRg3O5aiTK5rHvw="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "8.0.11",
-    "hash": "sha256-qKe+WBIlyZ1CS2H9JGWsYiWxkUzGjwIHtx/q3FPCDr8="
+    "version": "9.0.10",
+    "hash": "sha256-FB+8WtFYKn1PH9R3pgKw7dNJiJDCcS78UkeRkxdOuCk="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "8.0.11",
-    "hash": "sha256-eKhcGqCN34F2i7/FeKSq1gyMjNq3ikq+UpE/1SbXecY="
+    "version": "9.0.10",
+    "hash": "sha256-q6w0uQ4qMAe2EuA65a3rk18rhGXuGVYMrdrIzD5Z+tw="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "8.0.11",
-    "hash": "sha256-in7Ppl/tEEM/2r+l+uuSjWLXk7fHbJRVmLzskYfAhMQ="
+    "version": "9.0.10",
+    "hash": "sha256-Zb5u2PySq+VuISn4bSTTDp6sN05ml94eK5O3dZAGO9g="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "8.0.11",
-    "hash": "sha256-st6V0S7j+FyK7r9X6uObpuhSoac/z5QOF1DUPnhffgE="
+    "version": "9.0.10",
+    "hash": "sha256-2XHQOKvs4mAXwl8vEZpdi6ZtDFhK2hPusRMFemu3Shw="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "8.0.11",
-    "hash": "sha256-DFAJxCxJeJghYL1Zl4d78i7/o8RFhLeCS+QFXvZulV4="
+    "version": "9.0.10",
+    "hash": "sha256-LunzXQSLdZZL1aTlg8E8Jj58oKXniJwYx9zQasPbM2I="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "8.0.11",
-    "hash": "sha256-GUWuE0ZycKiOha8wq7qklol9KfiSB4WSCF3/OwiSiAQ="
+    "version": "9.0.10",
+    "hash": "sha256-3uBgFul0W3+7MaxwRjZoowQ9iSw58jYPUChyWG/3UF4="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Tools",
-    "version": "8.0.11",
-    "hash": "sha256-i5BbbWFUTQmPRGhof/4DbwzKGFHmZaNAJhGZf6+2PpI="
+    "version": "9.0.10",
+    "hash": "sha256-qZhy83X+adNfhJwJcDoxn1R9pfU4Iq8PP+JB9anqArA="
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
@@ -246,8 +291,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="
+    "version": "9.0.10",
+    "hash": "sha256-W/9WhAG5t/hWPZxIL5+ILMsPKO/DjprHRymZUmU5YOA="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
@@ -256,73 +301,58 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "8.0.1",
-    "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
+    "version": "9.0.10",
+    "hash": "sha256-HIXNiUnBJaYN+QGzpTlHzkvkBwYmcU0QUlIgQDhVG5g="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "3.1.0",
-    "hash": "sha256-KI1WXvnF/Xe9cKTdDjzm0vd5h9bmM+3KinuWlsF/X+c="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+    "version": "9.0.10",
+    "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "3.1.0",
-    "hash": "sha256-GMxvf0iAiWUWo0awlDczzcxNo8+MITBLp0/SqqYo8Lg="
+    "version": "9.0.0",
+    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+    "version": "9.0.10",
+    "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "3.1.0",
-    "hash": "sha256-/B7WjPZPvRM+CPgfaCQunSi2mpclH4orrFxHGLs8Uo4="
+    "version": "9.0.0",
+    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "8.0.0",
-    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "8.0.2",
-    "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
+    "version": "9.0.10",
+    "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "8.0.0",
-    "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
+    "version": "9.0.10",
+    "hash": "sha256-D4Myt5rp8jxOvuQ4zwo/1bfNfLDZHrBYx7+UDOnhWgA="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "8.0.1",
-    "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
+    "version": "9.0.10",
+    "hash": "sha256-I8ywPAfg7GPQgOuA5TPXuseurWKk7BmXsnaowF80XEQ="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "8.0.1",
-    "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
+    "version": "9.0.10",
+    "hash": "sha256-ykcnGdvnx19q3dpwZ9A09k+6iIGNurVebe4nUaOBtng="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "3.1.0",
-    "hash": "sha256-S72hzDAYWzrfCH5JLJBRtwPEM/Xjh17HwcKuA3wLhvU="
+    "version": "3.0.0",
+    "hash": "sha256-RyT+m4OsHb1csXt5OYtjdx8LIsRlOKEWzSbAm4jfCzM="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.0",
-    "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.1",
-    "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
+    "version": "9.0.10",
+    "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -336,73 +366,73 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+    "version": "9.0.0",
+    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+    "version": "9.0.10",
+    "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "8.0.2",
-    "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q="
+    "version": "9.0.0",
+    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "9.0.10",
+    "hash": "sha256-isJHVIKcWkwi+CqwNBVlz2ISKzZj+TilVpmVNOonNWo="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "8.0.1",
-    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+    "version": "9.0.10",
+    "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="
-  },
-  {
-    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
+    "version": "9.0.10",
+    "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.HealthChecks",
-    "version": "8.0.11",
-    "hash": "sha256-wS+5kN0lREre+gv7//VuVb9oVkEzWHxKGiZJukj4Z30="
+    "version": "9.0.10",
+    "hash": "sha256-mp8r8G8V/Fu+SoZ2a1/cyFTfIF0x+HXeg7++5m3aRE4="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
-    "version": "8.0.11",
-    "hash": "sha256-JjWYaK5c+w8GUkNudYQKf2m3NwOQLYEeSFwL8kgTWC0="
+    "version": "9.0.10",
+    "hash": "sha256-7EHvrP6i4Wm0xPkp4S8O2dSHgnYEvU086irf6EzK8Xw="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore",
-    "version": "8.0.11",
-    "hash": "sha256-4fON6hI6uBeb/AWROYLgbbfxce1wazIt9WQbTUqwfi0="
+    "version": "9.0.10",
+    "hash": "sha256-E2+7dq0TvGcGuiJChyB4EsDEe8yySIvdB4XAH0q1zFQ="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+    "version": "9.0.10",
+    "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "8.0.0",
-    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
+    "version": "9.0.10",
+    "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "8.0.0",
-    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
+    "version": "9.0.10",
+    "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="
+    "version": "9.0.0",
+    "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
+    "version": "9.0.10",
+    "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ="
   },
   {
     "pname": "Microsoft.Extensions.Http",
@@ -411,8 +441,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Http",
-    "version": "8.0.1",
-    "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o="
+    "version": "9.0.10",
+    "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -421,28 +451,23 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+    "version": "9.0.0",
+    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.1",
-    "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
+    "version": "9.0.10",
+    "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "3.1.0",
-    "hash": "sha256-D3GHIGN0r6zLHHP2/5jt6hB0oMvRyl5ysvVrPVmmyv8="
+    "version": "9.0.0",
+    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+    "version": "9.0.10",
+    "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
@@ -461,18 +486,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.0",
-    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.2",
-    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
+    "version": "9.0.10",
+    "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "8.0.0",
-    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+    "version": "9.0.10",
+    "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -481,13 +501,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "3.1.0",
-    "hash": "sha256-K/cDq+LMfK4cBCvKWkmWAC+IB6pEWolR1J5zL60QPvA="
-  },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "9.0.10",
+    "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -526,39 +541,59 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "8.0.0",
-    "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="
+    "version": "9.0.2",
+    "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI="
   },
   {
     "pname": "MimeTypes",
-    "version": "2.4.0",
-    "hash": "sha256-M35eTCoLiWv7PlBgsTltTvW7TOROf2AYB9nSl2NAsQA="
-  },
-  {
-    "pname": "Mono.Nat",
-    "version": "3.0.4",
-    "hash": "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M="
+    "version": "2.5.2",
+    "hash": "sha256-S3aYTBXc/7Qi75CO9+2iBrI5tRFkdM5Q3VB5q6MthQo="
   },
   {
     "pname": "Mono.TextTemplating",
-    "version": "2.2.1",
-    "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="
+    "version": "3.0.0",
+    "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0="
+  },
+  {
+    "pname": "Morestachio",
+    "version": "5.0.1.631",
+    "hash": "sha256-L7ZA1l+61nZEj49DOTSp0bHsfCOBTYNmPJMv1mTIIvM="
   },
   {
     "pname": "NEbml",
-    "version": "0.12.0",
-    "hash": "sha256-Ij6p0bfCagTCxcKBppCQAqZMmxARJMCGsktyPSDGoFc="
+    "version": "1.1.0.5",
+    "hash": "sha256-MrQLekP6z5y6rfqnCbLefkYv4Fm8di4HqZ/AiYTzBQ4="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
   },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.3",
     "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
   },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
+  },
   {
     "pname": "PlaylistsNET",
     "version": "1.4.1",
     "hash": "sha256-Hei2R5S4p0jWhmUNtjL8qbTR1X120GlBeEQBj3tRHH4="
   },
+  {
+    "pname": "Polly",
+    "version": "8.6.4",
+    "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I="
+  },
+  {
+    "pname": "Polly.Core",
+    "version": "8.6.4",
+    "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I="
+  },
   {
     "pname": "prometheus-net",
     "version": "3.1.2",
@@ -679,6 +714,11 @@
     "version": "4.3.0",
     "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
   },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
   {
     "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.2",
@@ -754,11 +794,6 @@
     "version": "4.3.0",
     "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
   },
-  {
-    "pname": "Serilog",
-    "version": "3.1.1",
-    "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
-  },
   {
     "pname": "Serilog",
     "version": "4.0.0",
@@ -769,35 +804,45 @@
     "version": "4.1.0",
     "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
   },
+  {
+    "pname": "Serilog",
+    "version": "4.2.0",
+    "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
+  },
   {
     "pname": "Serilog.AspNetCore",
-    "version": "8.0.3",
-    "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I="
+    "version": "9.0.0",
+    "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ="
   },
   {
     "pname": "Serilog.Enrichers.Thread",
     "version": "4.0.0",
     "hash": "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="
   },
+  {
+    "pname": "Serilog.Expressions",
+    "version": "5.0.0",
+    "hash": "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E="
+  },
   {
     "pname": "Serilog.Extensions.Hosting",
-    "version": "8.0.0",
-    "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="
+    "version": "9.0.0",
+    "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw="
   },
   {
     "pname": "Serilog.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+    "version": "9.0.0",
+    "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw="
   },
   {
     "pname": "Serilog.Formatting.Compact",
-    "version": "2.0.0",
-    "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="
+    "version": "3.0.0",
+    "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY="
   },
   {
     "pname": "Serilog.Settings.Configuration",
-    "version": "8.0.4",
-    "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ="
+    "version": "9.0.0",
+    "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
   },
   {
     "pname": "Serilog.Sinks.Async",
@@ -811,13 +856,13 @@
   },
   {
     "pname": "Serilog.Sinks.Debug",
-    "version": "2.0.0",
-    "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="
+    "version": "3.0.0",
+    "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE="
   },
   {
     "pname": "Serilog.Sinks.File",
-    "version": "6.0.0",
-    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+    "version": "7.0.0",
+    "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
   },
   {
     "pname": "Serilog.Sinks.Graylog",
@@ -831,33 +876,38 @@
   },
   {
     "pname": "ShimSkiaSharp",
-    "version": "2.0.0.1",
-    "hash": "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA="
+    "version": "3.2.1",
+    "hash": "sha256-tWuNa23TYcJBttT2ajQiLowD3toEiIKw0uTqvAQvP58="
   },
   {
     "pname": "SkiaSharp",
     "version": "2.88.9",
     "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.116.1",
+    "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
+  },
   {
     "pname": "SkiaSharp.HarfBuzz",
-    "version": "2.88.9",
-    "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8="
+    "version": "3.116.1",
+    "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.9",
-    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+    "version": "3.116.1",
+    "hash": "sha256-7u4tHVbYG4QhxatQf2g1Rkw0hmA+Ajy/7/6O4TRuUpo="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.9",
-    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+    "version": "3.116.1",
+    "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.9",
-    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+    "version": "3.116.1",
+    "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
   },
   {
     "pname": "SmartAnalyzers.MultithreadingAnalyzer",
@@ -866,23 +916,23 @@
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="
+    "version": "2.1.10",
+    "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ="
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.6",
-    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
+    "version": "2.1.10",
+    "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="
   },
   {
     "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="
+    "version": "2.1.10",
+    "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc="
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
+    "version": "2.1.10",
+    "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg="
   },
   {
     "pname": "StyleCop.Analyzers",
@@ -896,18 +946,18 @@
   },
   {
     "pname": "Svg.Custom",
-    "version": "2.0.0.1",
-    "hash": "sha256-ljkiz8xEaIMatjiGe49/LKBaPWR5D2/EY8CCNHZO4j4="
+    "version": "3.2.1",
+    "hash": "sha256-wp0BA9O/TBYbyEktdx//4Qs9J/EdzA4re/xyqBeVJKc="
   },
   {
     "pname": "Svg.Model",
-    "version": "2.0.0.1",
-    "hash": "sha256-ICYIWmoBMM+nuUPQQSbwM2xggPDL+VZUG2UsnotU8Qw="
+    "version": "3.2.1",
+    "hash": "sha256-eUK486QLBAv6x+oaoZmwdhwXI+9bEgmWSXMyJczN4Bw="
   },
   {
     "pname": "Svg.Skia",
-    "version": "2.0.0.1",
-    "hash": "sha256-3kGK9hc9BjaQu6u5mQ9heGKCDLpBDblgQ4VxRFLMa0Q="
+    "version": "3.2.1",
+    "hash": "sha256-XuMuYto6eVGu8kPybY4EbPmRS7xbA+6j5W6pyZFKMxc="
   },
   {
     "pname": "Swashbuckle.AspNetCore",
@@ -939,10 +989,15 @@
     "version": "4.3.0",
     "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
   },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
   {
     "pname": "System.CodeDom",
-    "version": "4.4.0",
-    "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="
+    "version": "6.0.0",
+    "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="
   },
   {
     "pname": "System.Collections",
@@ -956,38 +1011,43 @@
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "6.0.0",
-    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
   },
   {
     "pname": "System.Composition",
-    "version": "6.0.0",
-    "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="
+    "version": "7.0.0",
+    "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "6.0.0",
-    "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="
+    "version": "7.0.0",
+    "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "6.0.0",
-    "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="
+    "version": "7.0.0",
+    "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "6.0.0",
-    "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="
+    "version": "7.0.0",
+    "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "6.0.0",
-    "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="
+    "version": "7.0.0",
+    "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "6.0.0",
-    "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="
+    "version": "7.0.0",
+    "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="
   },
   {
     "pname": "System.Diagnostics.Debug",
@@ -999,11 +1059,6 @@
     "version": "4.3.0",
     "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.0",
-    "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
-  },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.3.0",
@@ -1011,8 +1066,8 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "8.0.8",
-    "hash": "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE="
+    "version": "9.0.2",
+    "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54="
   },
   {
     "pname": "System.Globalization",
@@ -1046,8 +1101,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "6.0.3",
-    "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="
+    "version": "7.0.0",
+    "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="
   },
   {
     "pname": "System.Linq",
@@ -1056,14 +1111,19 @@
   },
   {
     "pname": "System.Linq.Async",
-    "version": "6.0.1",
-    "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
+    "version": "6.0.3",
+    "hash": "sha256-i+2XnsOJnD7R/vCFtadp+lwrkDNAscANes2Ur0MSTl8="
   },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
     "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
   {
     "pname": "System.Net.Http",
     "version": "4.3.4",
@@ -1074,6 +1134,16 @@
     "version": "4.3.0",
     "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
   },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.5.0",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
+  },
   {
     "pname": "System.Private.Uri",
     "version": "4.3.0",
@@ -1086,8 +1156,13 @@
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "6.0.1",
-    "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="
+    "version": "7.0.0",
+    "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
   },
   {
     "pname": "System.Reflection.Primitives",
@@ -1109,6 +1184,11 @@
     "version": "4.4.0",
     "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
   },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
@@ -1186,14 +1266,19 @@
   },
   {
     "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
+    "version": "7.0.0",
+    "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
   },
   {
     "pname": "System.Text.Encoding.CodePages",
     "version": "8.0.0",
     "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
   },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "9.0.10",
+    "hash": "sha256-Y0flSC4lgyKW9VulNCal1VBzt80LFuPEK3DRWKgPsjA="
+  },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
@@ -1201,8 +1286,13 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+    "version": "7.0.3",
+    "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.10",
+    "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w="
   },
   {
     "pname": "System.Threading",
@@ -1211,8 +1301,8 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "6.0.0",
-    "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="
+    "version": "7.0.0",
+    "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
   },
   {
     "pname": "System.Threading.Tasks",
@@ -1221,8 +1311,13 @@
   },
   {
     "pname": "System.Threading.Tasks.Dataflow",
-    "version": "8.0.1",
-    "hash": "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo="
+    "version": "9.0.10",
+    "hash": "sha256-V3UjIEGn9Yrl/DQoKeEVg9pDpp4iNz8r9+WmQ09R1bg="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
   },
   {
     "pname": "TagLibSharp",
@@ -1231,8 +1326,8 @@
   },
   {
     "pname": "TMDbLib",
-    "version": "2.2.0",
-    "hash": "sha256-r4yV7t/biDORVYP0Go6KSSmNIVRn6IuFQ+Okt8GPvbY="
+    "version": "2.3.0",
+    "hash": "sha256-PVlZ+6dSLxrE4+QOTfXofK6gaU22eAVuh0lC3I96cKE="
   },
   {
     "pname": "Ude.NetStandard",
@@ -1244,10 +1339,15 @@
     "version": "2.5.1",
     "hash": "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="
   },
+  {
+    "pname": "UTF.Unknown",
+    "version": "2.6.0",
+    "hash": "sha256-cm3anHxu/tL+xMJ55vDoISmCTJUwIiP+jMFTbl0pR5s="
+  },
   {
     "pname": "z440.atl.core",
-    "version": "6.20.0",
-    "hash": "sha256-8LdLU2wgdR21bEXTBw7+RdbLYBM0vHRZhKv2ZpiVL44="
+    "version": "7.6.0",
+    "hash": "sha256-J5wLcYuVNETDwrokDGWM5qcKGO4xyJFjJRe2F/v7OxA="
   },
   {
     "pname": "zlib.net-mutliplatform",
diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index 8c241d5f237a..b5e51ed0eef0 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.10.7"; # ensure that jellyfin-web has matching version
+  version = "10.11.2"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI=";
+    hash = "sha256-cq45OP7xNfQ09ZfrKxnmHo68Y7SkfSVArH6PlhewPaM=";
   };
 
   propagatedBuildInputs = [ sqlite ];
@@ -32,8 +32,8 @@ buildDotnetModule rec {
     fontconfig
     freetype
   ];
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
   dotnetBuildFlags = [ "--no-self-contained" ];
 
   makeWrapperArgs = [
diff --git a/pkgs/by-name/je/jellyflix/package.nix b/pkgs/by-name/je/jellyflix/package.nix
index 15a20de0fa00..d68c7cb0503c 100644
--- a/pkgs/by-name/je/jellyflix/package.nix
+++ b/pkgs/by-name/je/jellyflix/package.nix
@@ -25,6 +25,9 @@ flutter332.buildFlutterApplication rec {
       --replace-fail "} on DioException catch (_) {
           return _.response!.statusCode ?? 400;" "} on DioException catch (e) {
           return e.response!.statusCode ?? 400;"
+
+    substituteInPlace linux/CMakeLists.txt \
+      --replace-fail "-Werror" ""
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix
index da38e57939ed..dbcfb71f6c39 100644
--- a/pkgs/by-name/je/jen/package.nix
+++ b/pkgs/by-name/je/jen/package.nix
@@ -2,33 +2,36 @@
   lib,
   rustPlatform,
   fetchCrate,
-  fetchpatch,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jen";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchCrate {
-    inherit pname version;
-    hash = "sha256-nouAHEo5JJtZ0pV8ig/iJ3eB8uPz3yMVIYP6RrNVlSA=";
+    inherit (finalAttrs) pname version;
+    hash = "sha256-dRUIyy4aQRwofZ/zWOHThclfxxrpXGWHruqg2Pp2BtQ=";
   };
 
-  cargoPatches = [
-    (fetchpatch {
-      name = "fix-rust-1.80-build.patch";
-      url = "https://github.com/whitfin/jen/commit/a6b5239593cecfd803a111ff317afa88c94c3640.patch";
-      hash = "sha256-ikfmEj6Xm0nT9dxpx6xdm/mQbw0b3gh2PT6Zo69Zg0E=";
-    })
+  cargoHash = "sha256-2c4XHA8fl2BA/Qtz+Hp29SjiWqPEJEj4WQiIFG/O4fE=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
 
-  cargoHash = "sha256-qYEnKFC1Y24TEY0dXa9N7QNvxhHULq+vd4Wej/RK8HQ=";
+  passthru = {
+    updateScript = nix-update-script { };
+  };
 
-  meta = with lib; {
+  meta = {
     description = "Simple CLI generation tool for creating large datasets";
     mainProgram = "jen";
     homepage = "https://github.com/whitfin/jen";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ liberodark ];
   };
-}
+})
diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index 1f26162ba92a..c0e4d591da6c 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jenkins";
-  version = "2.516.3";
+  version = "2.528.1";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-gbOrzA8kzqSOdO/+FS9p3F8NiA7cDCc3xhRGs8WZLAA=";
+    hash = "sha256-1jDcomX3Wo1YHxJ6kjTxZ51LCACo83DQOtShVM63KVs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 73e75055e476..0f084db6560f 100644
--- a/pkgs/by-name/je/jetbrains-toolbox/package.nix
+++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "jetbrains-toolbox";
-  version = "2.9.1.58121";
+  version = "3.0.1.59888";
 
   updateScript = ./update.sh;
 
@@ -55,10 +55,10 @@ let
         aarch64 = "-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-RrE5NACYPS+ekZYFl/6MOTHOmn0u4zn7pi1q/prmr+s=";
-        aarch64-linux = "sha256-z5Bm761XjmkX1vq0ygx3bQpsdK7HN5KcJl6mojt9hXg=";
-        x86_64-darwin = "sha256-GbdLpUSn0nlGIwsuKq5AIaizbd4fIpM8QKsQEbhFwXc=";
-        aarch64-darwin = "sha256-tSqUvIfNt8iyLof8UU0A40mI9EpFABxDE+1B1adSQ/o=";
+        x86_64-linux = "sha256-+rSjKr/MF6WbRkXeCvxzepThiDleYdtqQmX8rfJinNs=";
+        aarch64-linux = "sha256-Zt3OqnQhiK8nWrKYWFuQ10oc5SZJbhrLpGY5P0QcbBw=";
+        x86_64-darwin = "sha256-Lbq+buoulHmLBNOm23yDBoodPPOOOfF/FfkdGEOh/N4=";
+        aarch64-darwin = "sha256-jaLddShsw/lDIICAa8RZFhOoWJ7hx9gfRFwxy1t6sVc=";
       };
     in
     selectKernel {
diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix
index 46ddcad2cf1c..65d264787b83 100644
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeBinaryWrapper,
   gradle,
-  jdk23,
+  jdk25,
   llvmPackages,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   gradleFlags = [
     "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
-    "-Pjdk_home=${jdk23}"
+    "-Pjdk_home=${jdk25}"
   ];
 
   patches = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     description = "Tool which mechanically generates Java bindings from a native library headers";
     mainProgram = "jextract";
     homepage = "https://github.com/openjdk/jextract";
-    platforms = jdk23.meta.platforms;
+    platforms = jdk25.meta.platforms;
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
       jlesquembre
diff --git a/pkgs/by-name/jf/jfbview/package.nix b/pkgs/by-name/jf/jfbview/package.nix
index 989736d29b38..8d099de18acc 100644
--- a/pkgs/by-name/jf/jfbview/package.nix
+++ b/pkgs/by-name/jf/jfbview/package.nix
@@ -53,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix
index 2b1392b4ecde..2b9529444413 100644
--- a/pkgs/by-name/ji/jinja2-cli/package.nix
+++ b/pkgs/by-name/ji/jinja2-cli/package.nix
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "CLI for Jinja2";
     homepage = "https://github.com/mattrobenolt/jinja2-cli";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "jinja2";
   };
 }
diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix
index 75055f7d62fc..1bf1c409b62d 100644
--- a/pkgs/by-name/jj/jj-pre-push/package.nix
+++ b/pkgs/by-name/jj/jj-pre-push/package.nix
@@ -2,18 +2,19 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  fetchpatch2,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "jj-pre-push";
-  version = "0.2.2";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "acarapetis";
     repo = "jj-pre-push";
     tag = "v${version}";
-    hash = "sha256-SdGnhHk8MelX6hqKQmZnQYXBJ5VpjPBe+PWUxaGsxC4=";
+    hash = "sha256-nWkMXXlzJeXz0kHBuN4g8YWW6JmwrfE/y9oFfEOqeQk=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix
index ac0fc93b6be4..dfde5fb3cb14 100644
--- a/pkgs/by-name/jj/jjui/package.nix
+++ b/pkgs/by-name/jj/jjui/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "jjui";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "idursun";
     repo = "jjui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gKJ03+H/UTmGCGV5mpthrcHw+oX4vubuiVKbvmYNk1I=";
+    hash = "sha256-QaAjxpn7VHUdL8PFQcDUsa7xA/7bMtGaGl1aTpKOs2M=";
   };
 
   vendorHash = "sha256-YBRHpHBb3uzgXhwxVu3493CtPyG9Vzm8IPc1VW6/CKU=";
diff --git a/pkgs/by-name/jl/jless/package.nix b/pkgs/by-name/jl/jless/package.nix
index fbae8fff4aac..10412d048943 100644
--- a/pkgs/by-name/jl/jless/package.nix
+++ b/pkgs/by-name/jl/jless/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/PaulJuliusMartinez/jless/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       jfchevrette
     ];
   };
diff --git a/pkgs/by-name/jo/joplin-cli/missing-hashes.json b/pkgs/by-name/jo/joplin-cli/missing-hashes.json
new file mode 100644
index 000000000000..25a41d7e9f74
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-cli/missing-hashes.json
@@ -0,0 +1,133 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.5": "098d4c3ebe965823ee43fa708457c768caea59a5fab521e1129fbf1bc47dadf8319d7170e25a91a6af779a3b91cf4ce0b01a053410fe796b2235c262f7008e30",
+  "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129",
+  "@esbuild/android-arm64@npm:0.25.5": "0a3b0db67072835d003519a7b297f2618b8c65cf168be7421656a3eaa7240499e3f89708e5aec507007bf8637f486dd4a2aeb48183702a5a8d0ee29432c22c8d",
+  "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49",
+  "@esbuild/android-arm@npm:0.25.5": "3f85e15beb85467d5ac0bd19774fca6db353f4927a792c2281302e0f29f66931eb4ceac61216e19d9b21a5fc90c556b58bf54b4ed9d3205e81ecba16cff842d9",
+  "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1",
+  "@esbuild/android-x64@npm:0.25.5": "2033f7eb50910b4b9f8064926a8d2baf62597230dc07fd931c8def2022bc8d8e15c3ed7aa892041b6605b24d31e80afeb03e59cf7b0dc2f88a6959b821defd58",
+  "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec",
+  "@esbuild/darwin-arm64@npm:0.25.5": "08d7238c6ea25cbf7de55ab2378b8bf3bf3d36de9bb3ca9fca15c41e5cec6cfcc619b2cbefd0d71722bd780ef5d1bcff5246b1676b62d131673532aa14e6ae5f",
+  "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001",
+  "@esbuild/darwin-x64@npm:0.25.5": "274767e53270755c1d1814eddd25a20e6ebd68cdf8432303d9e73b45a782579a4a898ffd68920f4052c4a5ba6ca85e59ba1a87e0005b94cac98e479e3f623a22",
+  "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a",
+  "@esbuild/freebsd-arm64@npm:0.25.5": "b9ef91ca56536e988a72009c04e95f4ce18a6439151029d736c6df2af97a753f5b55f73d14da76c2c22693592a9468d57435af72bf535b2731b8fdda2aadb930",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f",
+  "@esbuild/freebsd-x64@npm:0.25.5": "8b6f53b0c0ffc7770ab078d694b705ca0169e08e0a88849fb0a54280e55f7339abc26aee969799ba6ee725b494653fc7188dc184d2f318be78506132b5e8f955",
+  "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7",
+  "@esbuild/linux-arm64@npm:0.25.5": "c0e1925988f0b07aa8c4712f04f3cc858b52d7180ba1600c311206eeef023dbd6f0a00cb2d50fbd81064c15e69502ab95aabb433318638a5af0d9a4bd02f7294",
+  "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c",
+  "@esbuild/linux-arm@npm:0.25.5": "b14daff5e6b0e9d6a613e6f11a6c0c4c1a275effe762383e6b3461c6318ec371f69d8c512bda475d634154ded6e0269345fb58281ca64c406d9dd0acfdfcf042",
+  "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4",
+  "@esbuild/linux-ia32@npm:0.25.5": "f962303d6dd5062bf8cfa31801c43c4ecf2c33cf42e8e4abbcbbea2d54619ba8bd0700a342e94e13deff856e6985e50f31bf97af283b26ff36b185da40a0f7a3",
+  "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a",
+  "@esbuild/linux-loong64@npm:0.25.5": "884863922180e39e9ae05c93f0d5e4e52627416237d892dca80f39bd1ce94c24920868cdeb8a8378b384332343c2b76bd7eba0ab56defaa4fa942bc361941a46",
+  "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8",
+  "@esbuild/linux-mips64el@npm:0.25.5": "90da507ace130201e4653e08187b6ec95d4acb9acf37fbd14f7c0aa60ac299cb9a8a2cc1c8541e376ac14206e10abc52e99bd2c1614dce53f6f66d00165671df",
+  "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d",
+  "@esbuild/linux-ppc64@npm:0.25.5": "1a82c32464c6e446bba510c5cafff685c113cadc3f65966465a54bed455cfc737ea3c11628785cd4ad8b169be03ef3b3c3e46b4ecd3e1a64a501d6ae3aa500d0",
+  "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1",
+  "@esbuild/linux-riscv64@npm:0.25.5": "d9f49b01639ec4ceebf5455151e2632191a2bc0d96ba27ba661f4b97e314c1496a99ed5ea2d3c0bddbcf9da09bf1c06ba8f94bcab283a2f181a1c2c514848631",
+  "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1",
+  "@esbuild/linux-s390x@npm:0.25.5": "14ce910d0ed879bf6549c4892a020e2a652fe5cbf8897a7a967ba20801e89582e70a3567659b96049a789a6b3fa5b34b330f4002de51f87bc734a2c83d8089a8",
+  "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055",
+  "@esbuild/linux-x64@npm:0.25.5": "31edf2a53f0dede747f57405d2d9e277b1ae25e40eef7a7567b8d9c11c0d23c7aa6d4f94493f5295f95dc0f75a77f8cf3a52144501a6db7bf914cff8a5370258",
+  "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99",
+  "@esbuild/netbsd-arm64@npm:0.25.5": "d35b97cf24a5f7e32e880b40a451c7409959acb26c9adaba1c4d5d469853982ce7e5f5e6ff33f32bde78d400c869923d2933d1620779d127e95a693422b4cc07",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682",
+  "@esbuild/netbsd-x64@npm:0.25.5": "7a8ecc712deda1af96de426998f39934ed5fad0cdb12b13ff31170c9dfe44f679d179c16dca7db2d686044a941a7addb9378a01f15b25efe424453ac61a0031f",
+  "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7",
+  "@esbuild/openbsd-arm64@npm:0.25.5": "9e1ccd8e6cc87b7f8c83b8fb7091b98078ac96e18d58c7a45c22c981e58be1f86d8328d48906a1869226edf1a21e62eba64e43dd2aed9046a57795ed31b8d617",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f",
+  "@esbuild/openbsd-x64@npm:0.25.5": "a13696c3b5ea9971df702c3c6cf8ddd17490d4becd3c2596a33230e53523c2d8d11d43857973d06292ad6670163e42ca6203dbad5a4f708f250d2d5fc23dc4d0",
+  "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d",
+  "@esbuild/sunos-x64@npm:0.25.5": "87789cae50b1aacd24d3f25b903d8016f370c6bc9c2618c243283921eea00119728e824c052fb41056ab7a5c8295442b32f598343788117499fb4145f52b6795",
+  "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62",
+  "@esbuild/win32-arm64@npm:0.25.5": "4a02984bb78737aec94eac24347be38aa17e504dc7702b3de9cb59179d5df14a812ecab387ce7654e4e23e58ea7989079bdf90e515bbf774a66243387ad55c52",
+  "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936",
+  "@esbuild/win32-ia32@npm:0.25.5": "e214bba446a70d3072c124f45b948af6dba335115c2f17b2bd64f64c1ef875db815cc7f6b5a57e2b9bec0bb76d7b4ebcd3afcb857b9b7e76a7c9d1a80ba0963e",
+  "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e",
+  "@esbuild/win32-x64@npm:0.25.5": "4c6381c6dd3ab7c8aa9fdcda4faf0f08c0982c497348844c764d5b0f7b3d1ccb3fc5bf341057a79ce4fdbb8dcddc115a7b9d5af3ea247b3434d3d451a88c7072",
+  "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855",
+  "@img/sharp-darwin-arm64@npm:0.34.2": "891e401a14429d293c1cdd1a9dd47b81f3fafd1b14a57f884307727662af1541dcd802a31488c394113a4ab25ebcbab1246c5ab3c90beba42f7e8afaf56f073e",
+  "@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f",
+  "@img/sharp-darwin-x64@npm:0.34.2": "8d5e11f3430fa61966cb600cd23e2217f1666d481bbf754bdd731e60d4a6c34c78ff0169f7ec3463252d6542b0a3bafc0686473650b0e6b8a45fddbc49a8b52a",
+  "@img/sharp-darwin-x64@npm:0.34.3": "57ccfecf25b6e21b3df16694a959200ee6d00ac150bf4c5e3787bedfa8f944cbc95c7130fb6d66b207a0bd987e30f302b67de35a7481909b9bc175581da1be6f",
+  "@img/sharp-libvips-darwin-arm64@npm:1.1.0": "f6bcbe44fa9bc0c4c87af8c655c7ecdc704b684da1169841921ff7c61692167ee3ab6a4a3a8131f206f0aa7245987be1c07a483111eadd3a684b1547ca2acf02",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "77a6a47fe9cbc1e6d1c66fd3f617bc64a8b710ed7cb44eee64409d49456dba054495e5ef8de3442e655ad11263ed19df554e9c33c2976e3226c121d826188587",
+  "@img/sharp-libvips-darwin-x64@npm:1.1.0": "af6cd4ca1ccc96dcd5cb20ac45941180117baad387331a699a05e588fa843b85d327651356940d9e3e2c1fe17f0ce183043bebf882086d3cb0785bb4bc8bca05",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "334c823aa129365e7f71b3467fb3c37e7a0065d7cf192b08b2bf85d400a568da42cb236dd238ff35670f296ec5b81f08415e11c257e1c8b8df680923c3acd72a",
+  "@img/sharp-libvips-linux-arm64@npm:1.1.0": "1d62f454f599580d64ecf72da24a08cb9347f1319e31678594f432e71762053c60c7bca5d70be720285b0754d8ed842efb160bef02abe36f5f57d735db0c012b",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "c8e7d5641ed6d1a406d08b45536fa6a9e221024bad1b3b6e7e16942500c5ca3f5ae444ac141a61ed9b43f6f7e73ee66bf973e24a90fd94dfcf83d4617492c085",
+  "@img/sharp-libvips-linux-arm@npm:1.1.0": "5028a1ad8e247dc1624baaa084e981f2f152c7ee5f567ee253720b4553d06a969bd6285f1795b374532f99e63b44b4d39494cc3d5dd8f438dab67d4c018f3520",
+  "@img/sharp-libvips-linux-arm@npm:1.2.0": "9a854fff624303ed4bfdc7e936af47b3c6b07e486d0b366c8881306d49766b8e972c5a26fa53288b00f4b92a019b374bb66106c9d34f6fb23489cde5b861d2e3",
+  "@img/sharp-libvips-linux-ppc64@npm:1.1.0": "d7c39d636083be25c71966e992803d652f5260c8fa0ece49348705c739042851c83057ec1f2d1cad8419afd3132311a6a0fcade343e69c9fbe8cbd8a12a54056",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "bd4e956d5f01efc158e992047460be6b8cddb9f89cdd02f4e377a178da1703ed12125f161ec2eeb99de9d11232333bf501bf5e70b85e0e6f94f1cddf7d5fc954",
+  "@img/sharp-libvips-linux-s390x@npm:1.1.0": "612a7a967192a2bb31d757305a0abac4bdd17f4e41fed4fccee673961fd3743d1f435e9869efe324fa726d39286bcb4bfc9d5b7ceaebb2700483a3d6e2be0eb5",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "6ed6d891c2ddae07fff09290b24c1ee3531264dcdb0d0d461279fa2168c196490874f84d5b5fa045a3063e76957fee0bfa765860db486779e3acb68ab743400d",
+  "@img/sharp-libvips-linux-x64@npm:1.1.0": "73cea31f06110740998a44cb27387d59ab5878fdb4080213a46bf312fee1e8a3b69b8d97a78611fe951fc113d7aa732d0a7d8acadf6bc77322e73b6d5228f5f2",
+  "@img/sharp-libvips-linux-x64@npm:1.2.0": "2a80a045237e56c5f4ec2b5c4febe9d95066beadff06bd936439f34bdd615205346dbbf996b5b4d1e43af6a128cdfd4b1a76d6fb36d9eb62f61a7248fb242728",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.1.0": "21d8124bccdc98817fc69022826a18a2630fbc1a3b16bfaf1d7f7c3df95d834cd75ef79e54c2edd0be44481d26e0f98ebcadc7b5e30bd73bf9afa66224cc4f8c",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "4225b0af93ec3a600f81930bb0ac70671cb76917a033f5ac6033252a79dd04c54b1d1bf602f79877efd07d9382106d8b2058b7c9a2bfcb7beabb6861eab0879a",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.1.0": "6671bcdb165a7958b0478c64a5acd7eb279ebea446b91e938888a1d6e2e7c58699c55bf4a856047847e6cc56a6cdc60c9a13e2a002f081c923331585a0db2c73",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "d2a47388c6d1ff90bd85fa0a93f8bf9c5855c2834736bdd78d47d12689e3bcd41c695788c6bef9a8e1c5156951a675e22dc51a0ddf35a7d56c96cae3e9f55688",
+  "@img/sharp-linux-arm64@npm:0.34.2": "4e314f4ea4182c6b67d03eaa8600afd78fa298f17e6f71e7d78fc3e2b91d65c3eca0474979cc9ab48eea7573d1150609326955a2b4ed168cbcfb881ca8632bb3",
+  "@img/sharp-linux-arm64@npm:0.34.3": "a4ec64134484037e6a1583b11e39a16afb95eff963bf9c52deb17557b0a35dbc509325368040b04939e859f3b9531d64e6405fe54d13b3633628a4f77bfd8672",
+  "@img/sharp-linux-arm@npm:0.34.2": "3ec11f1c8312d4313623f20a09f60e53c07770c64dac50264f9da2e60688d992abb8a55ba4c665c88204db611cecf6e16d6397e57aac92390bddc2d7ee6a9ac2",
+  "@img/sharp-linux-arm@npm:0.34.3": "fe4106211c93c566d3712302c081391435caaeb6ecd41e88e94e3e9780d0f27934a02a871d6280625944f625350c4f81871d92210ff6ae5511318248a4ba3ebe",
+  "@img/sharp-linux-ppc64@npm:0.34.3": "0671ccb3a25e53a665d50b2b52cd779b57a07f642686bbb7311c288c44b2d861cd1eacf6bd6883421c73cc5efc8fa8536280dd48fde9a6de8d287e4a99c9ab69",
+  "@img/sharp-linux-s390x@npm:0.34.2": "1fc3ae6eeb2af800567d26582ae97465ce5bf3aee4b4125f3b11899c8aec9b6b9e538bfc1176c257788c20e67d6f57cb1e67e9fe6c96c900d2b43127ef6a3f45",
+  "@img/sharp-linux-s390x@npm:0.34.3": "a5e2c3c14faa997616caf0a9296302c58b9565bb24f156dae7ad1770f5f984919fb34a0d1f59f0112205db060e8bc665842fd27621147786893619c51b81af45",
+  "@img/sharp-linux-x64@npm:0.34.2": "8bad1ee5e9a23520da830090e29e2c8fc62c6dcf9255e490cfb664483423126b6a5417b1beb0e5433f678bd91996ebbc925c6a5f2cf477966ca4a5ebeee3fdf5",
+  "@img/sharp-linux-x64@npm:0.34.3": "83a82d1a97b975b64be0ed6fd35fe87609ffcbfb7a068a7ea0e67dba7ecd71f32382b86a024bcfda8aceb4ed1628f4ee4a567c4e157e9cd3c9fafa0b225fe6c2",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.2": "f4189234d072002934a77ea9131514fa4922c3d6acdec9768e9ca88cb088d67f1001a07fe19a920abcdbd7888b0a408128ec5561849829f8c99c4814dc04315a",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "53f9f3f673441b21ea0a8d6d95b7ba8f051d4c2d2d4c4cb0fd83bb7593a56f854b255a1b706ddd376f8003adc6431b602afbb8a1ffe0850896147b24912a9504",
+  "@img/sharp-linuxmusl-x64@npm:0.34.2": "884532e80b772891d9452a1e6ad070e4668cd4aceb91935b7352d96f0813f1a6a3fafa3550e63f6f93dbcfdaafe8e8dcee7d6df6e12ebe3b66ca69d947ef0572",
+  "@img/sharp-linuxmusl-x64@npm:0.34.3": "ebd702f0f88121b31e87db93a87839085605a02826aba5207e9ad4fed89471daf0e32276ef3e13dc289e53042baaa8244bd43c0768c0733e3a4fce02fdf30dab",
+  "@img/sharp-wasm32@npm:0.34.2": "ca383f6c9a8d7afc00c446b175cbc8b7827d5e02c602aeb6e889f641e3eac4b3969bbed62be8c5e595f4774b378f39d67b8f3558b1ce4ff361298e8fe3efd5ec",
+  "@img/sharp-wasm32@npm:0.34.3": "3a64ba7dec1883eaae60925d77b04322a81d9c2d39359fa021677252df7da3be72f469a298cf2470f7350553eb30ee84e874d7032b06fa91ce27a81e1ec5f6c7",
+  "@img/sharp-win32-arm64@npm:0.34.2": "b7ce72e2861be11dd9ba8a0f00da57d97d4c93e88abf5f276dee516bde07527931908913cc576acc77c1f3cc61567e557cb927afcc88c5abee5d255f70f124a3",
+  "@img/sharp-win32-arm64@npm:0.34.3": "9328ef81ef6df02a8f83123f59c0addea7dd12681af3068e677ac274ed238321dd5522f2e4157b1a53ee0bc27ea22733263dddf5d4b65d2c5a2533ffb724f81e",
+  "@img/sharp-win32-ia32@npm:0.34.2": "edf6719745e473a4cd13745cd3543c885dc076bee38b8f8b7ee42967670e6403d54d060c22288c3118c3872acdbfa27042df6b941e62d61e81294ed309828c77",
+  "@img/sharp-win32-ia32@npm:0.34.3": "cf08bf95ff895c831bd74c7c4567d6c4ac20100e0d1badd0a9f7100486f3f416022222e29fcbae79b379defd1f0bc13adccc16c119fd4705d00c11c35ca9988a",
+  "@img/sharp-win32-x64@npm:0.34.2": "bb153458a2b1b4d794e1267b53626d7ec9080fddf38df2321b8e9d71da0eeea4669df7d88365e22c51f445595e5f281d7986dd5678cf8c331ad724f0dc29d06c",
+  "@img/sharp-win32-x64@npm:0.34.3": "07078e460f2749ad6422135193bacdfea1f223fab9f8442b5c0cbecb6d3e92070dd0a968219ff386a03930ec4104162627ffcad5b362ec8dc0247848deb52bbc",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.2.0": "3d7a9f1608daa7f3c092512b7b8ecf3b86788b66f5e60f5190c8e08b2cecd684f884dfda54dfaf94fd3d6e59bab548675ae3b1732fbd62ab5875aeb4c4ce9147",
+  "@rollup/rollup-android-arm64@npm:4.2.0": "d918632813eea005fc502c39dba795eb318544821e69a0fe4e0b37cb7a8ae71d55b1dcf3a6a342a0d8fedc309c2b3d2ca5868db0af211ae4bc7e15620aac89e2",
+  "@rollup/rollup-darwin-arm64@npm:4.2.0": "8e8c94c0b852f4fcbf7aaa673d3a5822619654080629137baedad02423b882b11b4b1aa96b22c1a3eb9cff45dc0db0c316378dcaf79104a2ed7273174617cd2e",
+  "@rollup/rollup-darwin-x64@npm:4.2.0": "dac71cc39b9629814466ce81c346a0ba2b9f05d0944be625acde9c22e23bc4634f80cdb95030641d39e8ebf2e9194d50070d077c4a7b3cd5b5726f1a7f5e78e5",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.2.0": "05be8070bc2f45865e8471206d922150116aae10b0aa24d226d09af3cb571722194df83cb1380576d2583a0f5334edbe05bb0f8f5dbc6c07172982b7c83ad465",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.2.0": "d16bc317c7adb1b9faebc700dafc6d5d11a1e969dcd149053529635946a9c39b88f910cf62bcbcfcaedce216b2938d23b6983257527d1b1595a7e9a78336e37c",
+  "@rollup/rollup-linux-arm64-musl@npm:4.2.0": "81f30ba83d9568e8f19c52121702f90423d5cabbfd4267a977a86c67fc38381bcb284f05ccc1d4e27769322b0575ce3263385b32d262cb918930087c35dcdb44",
+  "@rollup/rollup-linux-x64-gnu@npm:4.2.0": "e3be010ac1fa035591e49657681b265be5c4bd0ee588cbc6d894a4e0d283e1f9914d42817d7bf573b61bd8bd35030eed409cd8337f5e9e2be5d7573bf9d47396",
+  "@rollup/rollup-linux-x64-musl@npm:4.2.0": "d9b156b8beecb52fce7afb8185cfaabbac4d8ae3fe33acd123606dfe4d209cfc504a9885b49325609fcdcb844bf2427f6a934900b440c93e5b3e31636a1d99f4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.2.0": "ff71a301051b237a32e14cb2b18117c72c5ab4524120184500e098fea028385806567fa55e4879c19f80d747774e3b8d913e0b4560abc8fe4881b392fda6ed79",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.2.0": "dd65d454384b6020b87f5f943121dd9d02e5bfbae2ec124a23f0a2034df02549c0ae4fb27558efda6668bab94b121c5463c4845431f2c1c9416a719176e1dd82",
+  "@rollup/rollup-win32-x64-msvc@npm:4.2.0": "13cba2a14f7864986f3331c327a137ad95cf366411c0b6d3f66593bb6ea04d0058e12bd0a09fde72bbfb8660a554f0b66d90754e21add3c99d899e2bd7dfe1d1",
+  "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
+  "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0",
+  "lightningcss-darwin-arm64@npm:1.27.0": "c27ba2fc3014cf2a5133ff6dd822ec80545223fd8878fc61a8b20b523c5b608fb2efab7ee2c2af4503a0c597691a0f162355e3fc017417779f7d7a878161f679",
+  "lightningcss-darwin-x64@npm:1.27.0": "8bbf7233a9cb347dde7a68d4322dfebafaa9d410f749cd55d2306988a095b915d6e272cc5a0bc5bb97c9680d6b7e31e6c8fa188449e34fce85889e0a245a4bfa",
+  "lightningcss-freebsd-x64@npm:1.27.0": "eec3c171d92838720707ccd894af1f503f3be7fae679b735f4a54070f8c8b5bc4cea4c119b578994a9c9a70ce138445a807d0af8ad37e54959bb4998753dbd17",
+  "lightningcss-linux-arm-gnueabihf@npm:1.27.0": "ade725375521f2689f8b372c1d9cae71581eb66f35df6edcf39ed0869f6662c77fe2a91b5392c0a516f00fd60725ce03ad0f9d47574db8d74a841f0906b8090f",
+  "lightningcss-linux-arm64-gnu@npm:1.27.0": "96eadcb0863534f5951e37916b64364fda21592a32d93252503ac8839f0d00eeea7d7bdd8bd4b686b8108550c23e32a8a1bb3738e63c1a7b01406c349da0676c",
+  "lightningcss-linux-arm64-musl@npm:1.27.0": "f0426dffc5c1943781673177f3340e85a7de2a193244cb877d33e7ec262c019bb7b862b33ffeb14b10494306f7c48885ee93068e88b9260fff2668e98a97a4ab",
+  "lightningcss-linux-x64-gnu@npm:1.27.0": "bb1b5713ddc9d8d711b527bcce47ce3e7fd91f2058c317ad5df09cded4142a85362ee71c353dd3b332497fc32a431a22f7762ce01464ff008b2a7cf2607d3dd3",
+  "lightningcss-linux-x64-musl@npm:1.27.0": "ec9b11bb0d70b929335f735486f8dd8fa6fc22eb95b71545b735b480b9e2b5287a24976735c2c5f4c9c50af07fb5cfdc02b65eceb6ec10256e7c9c637dedee9a",
+  "lightningcss-win32-arm64-msvc@npm:1.27.0": "1814c0d0464c21e808a2909ebbee7e12c42fd81ecd480e7c4e31769c555f238c720087af4383fff14862764f52bf4250cd566c6c45c3d6633bee126ef3355bc3",
+  "lightningcss-win32-x64-msvc@npm:1.27.0": "be733309737e4c4ed3dff33ec9e80bbc2d269d07bfa3742dd30d9055adfdc2e22be4d484475a7ea7cb7940c17f001cdf64856e157ef9b7c1d2c9342041e9eae4"
+}
diff --git a/pkgs/by-name/jo/joplin-cli/package.nix b/pkgs/by-name/jo/joplin-cli/package.nix
new file mode 100644
index 000000000000..9a97608786fd
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-cli/package.nix
@@ -0,0 +1,120 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  fetchFromGitHub,
+  yarn-berry_4,
+  python3,
+  pkg-config,
+  libsecret,
+  rsync,
+  xcbuild,
+  buildPackages,
+  clang_20,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "joplin-cli";
+  version = "3.5.1";
+
+  src = fetchFromGitHub {
+    owner = "laurent22";
+    repo = "joplin";
+    tag = "v${finalAttrs.version}";
+    postFetch = ''
+      # there's a file with a weird name that causes a hash mismatch on darwin
+      rm $out/packages/app-cli/tests/support/photo*
+    '';
+    hash = "sha256-NNtdY6ajMfcMWj/AIo+b2nhylBCqyOIwCepYx/ZNCBY=";
+  };
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes postPatch;
+    hash = "sha256-EGP/nnz4u6I0efTQu41lgmk0tuHpiavVKHRdiSYdEUs=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarn-berry-offline
+    yarn-berry_4.yarnBerryConfigHook
+    (python3.withPackages (ps: with ps; [ distutils ]))
+    pkg-config
+    libsecret
+    rsync
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    buildPackages.cctools
+    clang_20 # clang_21 breaks keytar, sqlite
+  ];
+
+  buildInputs = [
+    nodejs
+  ];
+
+  env = {
+    # Disable scripts so that yarn doesn't immediately run them
+    # We want to patch them first
+    YARN_ENABLE_SCRIPTS = 0;
+  };
+
+  postPatch = ''
+    # Don't immediately build everything
+    sed -i '/postinstall/d' package.json
+    # Don't install onenote-converter subpackage deps
+    sed -i '/onenote-converter/d' packages/{lib,app-cli}/package.json
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    unset YARN_ENABLE_SCRIPTS
+
+    yarn config set enableInlineBuilds true
+
+    for node_modules in packages/*/node_modules; do
+      patchShebangs $node_modules
+    done
+
+    yarn workspaces focus root joplin
+    yarn workspaces foreach -Rptvi --from joplin run tsc
+    yarn workspaces foreach -Rtvi --from joplin run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Remove dev dependencies
+    yarn workspaces focus --production root joplin
+
+    mkdir -p $out/lib/packages
+    mkdir $out/bin
+    mv packages/{app-cli,renderer,tools,utils,lib,htmlpack,turndown{,-plugin-gfm},fork-*} $out/lib/packages/
+    rm -rf $out/lib/packages/lib/node_modules/canvas
+
+    # Remove extra files
+    rm -rf $out/lib/packages/app-cli/{app/*.test.ts,*.md,.*ignore,tests/,tools/,*.js,*.json,*.sh}
+
+    # Link final binary
+    chmod +x $out/lib/packages/app-cli/app/main.js
+    ln -s $out/lib/packages/app-cli/app/main.js $out/bin/joplin
+    patchShebangs $out/bin/joplin
+
+    runHook postInstall
+  '';
+
+  updateScript = ./update.sh;
+
+  meta = {
+    changelog = "https://github.com/laurent22/joplin/releases/v${finalAttrs.version}";
+    description = "CLI client for Joplin";
+    homepage = "https://joplinapp.org/";
+    license = lib.licenses.agpl3Plus;
+    mainProgram = "joplin";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/jo/joplin-cli/update.sh b/pkgs/by-name/jo/joplin-cli/update.sh
new file mode 100755
index 000000000000..7bc1de59d2aa
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-cli/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodejs curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+NEW_VERSION=$(npm view 'joplin' version)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$NEW_VERSION" || true
+
+WORKDIR=$(mktemp -d)
+
+git clone "https://github.com/laurent22/joplin" -b "v$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+rm -rf "$WORKDIR"
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/by-name/jo/jose/package.nix b/pkgs/by-name/jo/jose/package.nix
index 921334d07910..000bcba502b1 100644
--- a/pkgs/by-name/jo/jose/package.nix
+++ b/pkgs/by-name/jo/jose/package.nix
@@ -48,5 +48,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix
index 66bdcdfbb88a..a0a80ae9a4cb 100644
--- a/pkgs/by-name/jo/joshuto/package.nix
+++ b/pkgs/by-name/jo/joshuto/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/kamiyaa/joshuto/releases/tag/${src.rev}";
     license = licenses.lgpl3Only;
     maintainers = with maintainers; [
-      figsoda
       totoroot
       xrelkd
     ];
diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 8bfde8ead76c..bc7ebce7302b 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jotdown";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
     rev = version;
-    hash = "sha256-9gvTMcoKGdc6xYhGz1SQzTELUWeIK2VFbEwIVn/IjGs=";
+    hash = "sha256-4ZSRwQuZUtk2kY62lruj+uwP6H1sK9J7V6HFQL+t9tw=";
   };
 
-  cargoHash = "sha256-x61oImdXsLD/lU4hNcrQ2rjH5hAvTMEDJn4H3cVG6X4=";
+  cargoHash = "sha256-xPi/C9N3/9AsinmbHI/M9EGy4gvS7ZWXEl3xBf3f4LQ=";
 
   meta = with lib; {
     description = "Minimal Djot CLI";
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/hellux/jotdown";
     changelog = "https://github.com/hellux/jotdown/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix
index 9264d19e733a..bddd524cf6e0 100644
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@@ -2,33 +2,44 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jql";
   version = "8.0.9";
 
   src = fetchFromGitHub {
     owner = "yamafaktory";
     repo = "jql";
-    rev = "jql-v${version}";
+    tag = "jql-v${finalAttrs.version}";
     hash = "sha256-1gkKOOR2mIUKrbVb1BlFxVuskL6y7s6mrI99xTfjjTI=";
   };
 
   cargoHash = "sha256-7pSvHZqvPW9SXwU0AtQHIjgHQCSKPzrBhNxLY5ZAcMw=";
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "JSON Query Language CLI tool built with Rust";
     homepage = "https://github.com/yamafaktory/jql";
-    changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}";
-    license = with licenses; [
+    changelog = "https://github.com/yamafaktory/jql/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       akshgpt7
-      figsoda
     ];
     mainProgram = "jql";
   };
-}
+})
diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix
index 10e4d907a51c..5479cd5ca1fb 100644
--- a/pkgs/by-name/jr/jreleaser-cli/package.nix
+++ b/pkgs/by-name/jr/jreleaser-cli/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "jreleaser-cli";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
-    hash = "sha256-47MpBFUEHx2yVk05Gd9CyVrHYHRK7NtcGosBJJbdhD0=";
+    hash = "sha256-X3lepk3T/Bc55Xkj0rLRo5ALohxqh0NCuUYvac/uijY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix
index caf1828b090c..b3ba427511e6 100644
--- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix
+++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix
@@ -2,27 +2,41 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
+  nix-update-script,
   cmake,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jrl-cmakemodules";
-  version = "0-unstable-2025-05-04";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "jrl-umi3218";
     repo = "jrl-cmakemodules";
-    rev = "2dd858f5a71d8224f178fb3dc0bcd95256ba10e7";
-    hash = "sha256-Iq9IuhEJBmDd14FhQ3wb94AoJDUjJ1h1D3qCdQYCnUc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WQiAAexshQ4zgaBNo/CD91XV+PAeoPZatmehSA14aPM=";
   };
 
+  patches = [
+    # ref. https://github.com/jrl-umi3218/jrl-cmakemodules/pull/783
+    (fetchpatch {
+      name = "fix-permissions.patch";
+      url = "https://github.com/jrl-umi3218/jrl-cmakemodules/commit/defed70c8a7c5e4bd5b26006bef26e3fb22c3b26.patch";
+      hash = "sha256-muO6DwQhNPCv6DPmnHnEHjsh/FSj0ljgNCb+ZowLRaY=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "CMake utility toolbox";
     homepage = "https://github.com/jrl-umi3218/jrl-cmakemodules";
+    changelog = "https://github.com/jrl-umi3218/jrl-cmakemodules/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.nim65s ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index 6ce5831391aa..7cb2b868a913 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/CertainLach/jrsonnet";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       lach
     ];
   };
diff --git a/pkgs/by-name/js/js-beautify/package.nix b/pkgs/by-name/js/js-beautify/package.nix
new file mode 100644
index 000000000000..fd8dca953546
--- /dev/null
+++ b/pkgs/by-name/js/js-beautify/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "js-beautify";
+  version = "1.15.4";
+
+  src = fetchFromGitHub {
+    owner = "beautifier";
+    repo = "js-beautify";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7heFAt8ArwBox0R2UFAYyzqyARPLnVtlWmPr0txuxOM=";
+  };
+
+  dontNpmBuild = true;
+
+  preBuild = ''
+    patchShebangs ./*
+
+    substituteInPlace Makefile \
+      --replace-fail "/bin/bash" "bash" \
+      --replace-fail "\$(SCRIPT_DIR)/node" "${nodejs}/bin/node" \
+      --replace-fail "\$(SCRIPT_DIR)/npm" "${nodejs}/bin/npm"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make js
+    runHook postBuild
+  '';
+
+  npmDepsHash = "sha256-Tr8kYawvPBt+jC7SW8dnKJVWynQyOpKbRD8yd+qbvIs=";
+
+  meta = {
+    changelog = "https://github.com/beautifier/js-beautify/blob/v${finalAttrs.version}/CHANGELOG.md";
+    description = "Beautifier for javascript";
+    homepage = "https://beautifier.io/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "js-beautify";
+  };
+})
diff --git a/pkgs/by-name/js/jshint/package.nix b/pkgs/by-name/js/jshint/package.nix
new file mode 100644
index 000000000000..3d9dbeb5ed8f
--- /dev/null
+++ b/pkgs/by-name/js/jshint/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "jshint";
+  version = "2.13.6";
+
+  src = fetchFromGitHub {
+    owner = "jshint";
+    repo = "jshint";
+    tag = finalAttrs.version;
+    hash = "sha256-RANA+kL7gL5bGa5KywEH/G+mAsPEoNkfxlp/pHeW8iE=";
+  };
+
+  npmDepsHash = "sha256-4P1rQmNIENbJPFqpbgnrq4V2tZe4MWySIphwUtnNcuc=";
+
+  env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1";
+
+  postBuild = ''
+    npm run test-node
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool that helps to detect errors and potential problems in your JavaScript code";
+    homepage = "https://jshint.com";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "jshint";
+  };
+})
diff --git a/pkgs/by-name/js/jsign/package.nix b/pkgs/by-name/js/jsign/package.nix
index 82e5ca98ede3..2106244bd447 100644
--- a/pkgs/by-name/js/jsign/package.nix
+++ b/pkgs/by-name/js/jsign/package.nix
@@ -18,13 +18,13 @@ maven.buildMavenPackage rec {
   pname = "jsign";
   # For build from non-release, increment version by one and add -SNAPSHOT
   # e.g. 7.3-SNAPSHOT
-  version = "7.2";
+  version = "7.3";
 
   src = fetchFromGitHub {
     owner = "ebourg";
     repo = "jsign";
     tag = version;
-    hash = "sha256-ngAwtd4C3KeLq9sM15B8tWS34AH81azYEjXg3+Gy5NA=";
+    hash = "sha256-FlVTKM1swdNP3kht8MELgUAHPv+FBpwt23WNl/moGjI=";
   };
 
   mvnHash = "sha256-N91gwM3vsDZQM/BptF5RgRQ/A8g56NOJ6bc2SkxLnBs=";
diff --git a/pkgs/by-name/js/json-repair/package.nix b/pkgs/by-name/js/json-repair/package.nix
new file mode 100644
index 000000000000..ee22b3f3bb26
--- /dev/null
+++ b/pkgs/by-name/js/json-repair/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication json-repair
diff --git a/pkgs/by-name/js/json-server/package.nix b/pkgs/by-name/js/json-server/package.nix
new file mode 100644
index 000000000000..01e8ed63c6e4
--- /dev/null
+++ b/pkgs/by-name/js/json-server/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "json-server";
+  version = "1.0.0-beta.3";
+
+  src = fetchFromGitHub {
+    owner = "typicode";
+    repo = "json-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NDSmlW5SiA81Tf6kfkaaKUh05aGZEBajqkLZoxBv0Wc=";
+  };
+
+  npmDepsHash = "sha256-HZmCxMKgxJ+ZiRDXh/iVmytNMbPoYzSuI0F8YmkcfZI=";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };
+
+  meta = {
+    description = "Get a full fake REST API with zero coding in less than 30 seconds";
+    homepage = "https://github.com/typicode/json-server";
+    license = lib.licenses.fairsource09;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/js/jsonfmt/package.nix b/pkgs/by-name/js/jsonfmt/package.nix
index 0c4e5e716d0e..d9c5f1f9c752 100644
--- a/pkgs/by-name/js/jsonfmt/package.nix
+++ b/pkgs/by-name/js/jsonfmt/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     homepage = "https://github.com/caarlos0/jsonfmt";
     changelog = "https://github.com/caarlos0/jsonfmt/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "jsonfmt";
   };
 }
diff --git a/pkgs/by-name/js/jsonplaceholder/package.nix b/pkgs/by-name/js/jsonplaceholder/package.nix
new file mode 100644
index 000000000000..63b034436f34
--- /dev/null
+++ b/pkgs/by-name/js/jsonplaceholder/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  nodejs,
+  nix-update-script,
+}:
+
+buildNpmPackage {
+  pname = "jsonplaceholder";
+  version = "0.3.3-unstable-2021-06-14";
+
+  src = fetchFromGitHub {
+    owner = "typicode";
+    repo = "jsonplaceholder";
+    rev = "7ae4432ac3f60e7226a899c25e04826207d07098";
+    hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ=";
+  };
+
+  npmDepsHash = "sha256-x+EN33CQE4ga9T0V4oJRPkELT8x4WbNIsQmvyW+hHi8=";
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postInstall = ''
+    rm -rf $out/lib/node_modules/jsonplaceholder/node_modules/.bin
+
+    makeWrapper ${nodejs}/bin/node $out/bin/jsonplaceholder \
+      --add-flags $out/lib/node_modules/jsonplaceholder/index.js \
+      --set NODE_PATH "$out/lib/node_modules"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Simple online fake REST API server";
+    homepage = "https://jsonplaceholder.typicode.com/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix
index a391cac9205b..38b3c9eabfe0 100644
--- a/pkgs/by-name/ju/jugglinglab/package.nix
+++ b/pkgs/by-name/ju/jugglinglab/package.nix
@@ -34,6 +34,13 @@ maven.buildMavenPackage rec {
     ./fix-default-maven-plugin-versions.patch
   ];
 
+  # use non-absolute paths for Exec and Icon fields in the desktop item
+  postPatch = ''
+    substituteInPlace "bin/packaging/debian/Juggling Lab.desktop" \
+      --replace-fail "/opt/juggling-lab/bin/Juggling\ Lab" "jugglinglab" \
+      --replace-fail "/opt/juggling-lab/lib/Juggling_Lab.png" "jugglinglab"
+  '';
+
   mvnHash = "sha256-1Uzo9nRw+YR/sd7CC9MTPe/lttkRX6BtmcsHaagP1Do=";
 
   # fix jar timestamps for reproducibility
@@ -54,6 +61,14 @@ maven.buildMavenPackage rec {
       install -Dm755 bin/ortools-lib/ortools-${platformName}/* -t $out/lib/ortools-lib
     ''}
 
+    install -Dm644 \
+      "bin/packaging/debian/Juggling Lab.png" \
+      "$out/share/icons/hicolor/256x256/apps/jugglinglab.png"
+
+    install -Dm644 \
+      "bin/packaging/debian/Juggling Lab.desktop" \
+      "$out/share/applications/jugglinglab.desktop"
+
     runHook postInstall
   '';
 
diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 255326722325..5992cf64e4b7 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.10";
+  version = "3.6.11";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-J3AFH6kg+M6/8posiUaVP4biQpKPQ07Qp5BU3prAG/A=";
+    hash = "sha256-jeRA2HwXJt1FLQrUsE/OrpeRib5VRbNk84FTHCBeHiM=";
   };
 
-  vendorHash = "sha256-zTavqjEH4maEMj+AuYMcjT289peVNIc0rysBnnMxFNU=";
+  vendorHash = "sha256-pa6NOoC4OakJdKB2cWtQVoEt2UX/xv8mDOHmlDSk8Z8=";
 
   subPackages = [
     "cmd/juju"
diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index ac1bdb377641..62c50c0bb234 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OW8kSDBBSZr0G3U27AAkZ3cH3TJmSARbg9Pc4qZ6tA0=";
+    hash = "sha256-YUrjP2tzABdy4eAV1hPmgYWU8ChcJ5B4IlmQUGm95ro=";
   };
 
-  cargoHash = "sha256-/zC2z0evYs8VKta0uClTtl4l3tbDRcsVedGF2jtfQGA=";
+  cargoHash = "sha256-9VCAmtY029+CFNFcYLdA/VyT5CIvJnuA3iwPOKZpYV0=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ju/julec/hook.nix b/pkgs/by-name/ju/julec/hook.nix
new file mode 100644
index 000000000000..427812bfb87f
--- /dev/null
+++ b/pkgs/by-name/ju/julec/hook.nix
@@ -0,0 +1,14 @@
+{
+  julec,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "julec-hook";
+
+  propagatedBuildInputs = [ julec ];
+
+  meta = {
+    inherit (julec.meta) maintainers;
+  };
+} ./hook.sh
diff --git a/pkgs/by-name/ju/julec/hook.sh b/pkgs/by-name/ju/julec/hook.sh
new file mode 100644
index 000000000000..35d314a54922
--- /dev/null
+++ b/pkgs/by-name/ju/julec/hook.sh
@@ -0,0 +1,80 @@
+# shellcheck shell=bash disable=SC2154,SC2034
+
+julecSetEnv() {
+  if [ -z "$JULE_SRC_DIR" ]; then
+    export JULE_SRC_DIR='./src'
+  fi
+  if [ -z "$JULE_OUT_DIR" ]; then
+    export JULE_OUT_DIR='./bin'
+  fi
+  if [ -z "$JULE_OUT_NAME" ]; then
+    export JULE_OUT_NAME='output'
+  fi
+  if [ -z "$JULE_TEST_DIR" ]; then
+    export JULE_TEST_DIR="$JULE_SRC_DIR"
+  fi
+  if [ -z "$JULE_TEST_OUT_DIR" ]; then
+    export JULE_TEST_OUT_DIR="$JULE_OUT_DIR"
+  fi
+  if [ -z "$JULE_TEST_OUT_NAME" ]; then
+    export JULE_TEST_OUT_NAME="$JULE_OUT_NAME-test"
+  fi
+}
+
+julecBuildHook() {
+  echo "Executing julecBuildHook"
+
+  runHook preBuild
+
+  julecSetEnv
+  mkdir -p "$JULE_OUT_DIR"
+  julec build --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR"
+
+  runHook postBuild
+
+  echo "Finished julecBuildHook"
+}
+
+julecCheckHook() {
+  echo "Executing julecCheckHook"
+
+  runHook preCheck
+
+  echo "Building tests..."
+
+  julecSetEnv
+  mkdir -p "$JULE_TEST_OUT_DIR"
+  julec test -o "$JULE_TEST_OUT_DIR/$JULE_TEST_OUT_NAME" "$JULE_TEST_DIR"
+
+  echo "Running tests..."
+
+  "$JULE_TEST_OUT_DIR/$JULE_TEST_OUT_NAME"
+
+  runHook postCheck
+
+  echo "Finished julecCheckHook"
+}
+
+julecInstallHook() {
+  echo "Executing julecInstallHook"
+
+  runHook preInstall
+
+  julecSetEnv
+  mkdir -p "$out/bin"
+  cp -r "$JULE_OUT_DIR/$JULE_OUT_NAME" "$out/bin/"
+
+  runHook postInstall
+
+  echo "Finished julecInstallHook"
+}
+
+if [ -z "${dontUseJulecBuild-}" ] && [ -z "${buildPhase-}" ]; then
+  buildPhase=julecBuildHook
+fi
+if [ -z "${dontUseJulecCheck-}" ] && [ -z "${checkPhase-}" ]; then
+  checkPhase=julecCheckHook
+fi
+if [ -z "${dontUseJulecInstall-}" ] && [ -z "${installPhase-}" ]; then
+  installPhase=julecInstallHook
+fi
diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix
index 27a007a791ee..c1f76526eed5 100644
--- a/pkgs/by-name/ju/julec/package.nix
+++ b/pkgs/by-name/ju/julec/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   clangStdenv,
+  callPackage,
   fetchFromGitHub,
 }:
 
@@ -21,23 +22,23 @@ let
 in
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "julec";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "julelang";
     repo = "jule";
     tag = "jule${finalAttrs.version}";
     name = "jule-${finalAttrs.version}";
-    hash = "sha256-y4v8FdQkB5Si3SYkchFG9fAU4ZhabAMcPkDcLEWW+6k=";
+    hash = "sha256-7py8QrNMX8LwpI7LCp5XgRFUzgltFP1rTbuzqw/1D8o=";
   };
 
   irSrc = fetchFromGitHub {
     owner = "julelang";
     repo = "julec-ir";
     # revision determined by the upstream commit hash in julec-ir/README.md
-    rev = "aebbd12c0f89f6a04f856f3e23d5ea39741c3e0f";
+    rev = "81ddbed06a715428a90d3645f7242fa4e522ea16";
     name = "jule-ir-${finalAttrs.version}";
-    hash = "sha256-7eDOYMmCEfW+0zZpESY1+ql3hWZZ/Q75lKT0nBQPktE=";
+    hash = "sha256-Az9RDrwRY2kuMgL/Lf/x6YctfySr96/imWZeOa+J/rM=";
   };
 
   dontConfigure = true;
@@ -75,7 +76,11 @@ clangStdenv.mkDerivation (finalAttrs: {
       -o "bin/${finalAttrs.meta.mainProgram}-bootstrap"
 
     echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..."
-    bin/${finalAttrs.meta.mainProgram}-bootstrap --opt L2 -p -o "bin/${finalAttrs.meta.mainProgram}" "src/${finalAttrs.meta.mainProgram}"
+    bin/${finalAttrs.meta.mainProgram}-bootstrap build \
+      -p \
+      --opt L2 \
+      -o "bin/${finalAttrs.meta.mainProgram}" \
+      "src/${finalAttrs.meta.mainProgram}"
 
     runHook postBuild
   '';
@@ -93,6 +98,12 @@ clangStdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    # see doc/hooks/julec.section.md
+    hook = callPackage ./hook.nix { julec = finalAttrs.finalPackage; };
+    tests.hello-jule = callPackage ./test { julec = finalAttrs.finalPackage; };
+  };
+
   meta = {
     description = "Jule Programming Language Compiler";
     longDescription = ''
diff --git a/pkgs/by-name/ju/julec/test/default.nix b/pkgs/by-name/ju/julec/test/default.nix
new file mode 100644
index 000000000000..6717600389c9
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/default.nix
@@ -0,0 +1,19 @@
+{
+  julec,
+  clangStdenv,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "hello-jule";
+  inherit (julec) version;
+
+  src = ./hello-jule;
+
+  nativeBuildInputs = [ julec.hook ];
+
+  doCheck = true;
+
+  meta = {
+    inherit (julec.meta) platforms;
+  };
+})
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod
new file mode 100644
index 000000000000..08babbd90c37
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod
@@ -0,0 +1 @@
+module helloJule
\ No newline at end of file
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule b/pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule
new file mode 100644
index 000000000000..53b23c3cf884
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule
@@ -0,0 +1,8 @@
+use "std/testing"
+
+#test
+fn testPi(t: &testing::T) {
+		if getPi() != 3.14 {
+				t.Errorf("PI not precise enough")
+		}
+}
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/src/main.jule b/pkgs/by-name/ju/julec/test/hello-jule/src/main.jule
new file mode 100644
index 000000000000..322bd3111649
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/hello-jule/src/main.jule
@@ -0,0 +1,7 @@
+fn main() {
+		println("Hello, Jule!");
+}
+
+fn getPi(): f64 {
+		ret 3.14;
+}
diff --git a/pkgs/by-name/ju/juledoc/package.nix b/pkgs/by-name/ju/juledoc/package.nix
new file mode 100644
index 000000000000..7b31a47ab73e
--- /dev/null
+++ b/pkgs/by-name/ju/juledoc/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  julec,
+  clangStdenv,
+  fetchFromGitHub,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "juledoc";
+  version = "0.0.0-unstable-2025-09-09";
+
+  src = fetchFromGitHub {
+    owner = "julelang";
+    repo = "juledoc";
+    rev = "3461147f4630104999bb895bdd8e60f40ca23aaf";
+    hash = "sha256-0HuMWdoDoq2SgQhOnn6UnWXe2Js7/466cP2XpjvO5dw=";
+  };
+
+  nativeBuildInputs = [ julec.hook ];
+
+  JULE_OUT_NAME = "juledoc";
+
+  meta = {
+    description = "Official documentation generator for the Jule programming language";
+    homepage = "https://manual.jule.dev/tools/juledoc";
+    license = lib.licenses.bsd3;
+    mainProgram = "juledoc";
+    inherit (julec.meta) platforms maintainers;
+  };
+})
diff --git a/pkgs/by-name/ju/julefmt/package.nix b/pkgs/by-name/ju/julefmt/package.nix
new file mode 100644
index 000000000000..c8902c3e3f73
--- /dev/null
+++ b/pkgs/by-name/ju/julefmt/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  julec,
+  clangStdenv,
+  fetchFromGitHub,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "julefmt";
+  version = "0.0.0-unstable-2025-09-08";
+
+  src = fetchFromGitHub {
+    owner = "julelang";
+    repo = "julefmt";
+    rev = "cc30781206d3d7b88599cc51b3f9d7d7936de527";
+    hash = "sha256-g3vN2Hz4BA5c0KqIbNKHg0W77xKGZQFHUIKWjg5/UTM=";
+  };
+
+  nativeBuildInputs = [ julec.hook ];
+
+  JULE_OUT_NAME = "julefmt";
+
+  meta = {
+    description = "Official formatter tool for the Jule programming language";
+    homepage = "https://manual.jule.dev/tools/julefmt";
+    license = lib.licenses.bsd3;
+    mainProgram = "julefmt";
+    inherit (julec.meta) platforms maintainers;
+  };
+})
diff --git a/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch b/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch
deleted file mode 100644
index d41bada82def..000000000000
--- a/pkgs/by-name/ju/jumanpp/0001-Exclude-all-tests-from-the-build.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From c52a5046e19718a43d48c9b3cfdc121d964e8c3b Mon Sep 17 00:00:00 2001
-From: Maximilian Bosch <maximilian@mbosch.me>
-Date: Fri, 28 Jan 2022 17:43:35 +0100
-Subject: [PATCH] Exclude all tests from the build
-
-For some reason it isn't sufficient to set `-DJPP_ENABLE_TESTS=OFF`.
-Doing that because the tests on 2.0.0-rc3 don't seem to be working and
-the vendored catch2 doesn't build with glibc 2.34.
----
- src/CMakeLists.txt               |  3 +--
- src/core/CMakeLists.txt          | 11 +----------
- src/core/analysis/CMakeLists.txt |  2 --
- src/core/codegen/CMakeLists.txt  |  3 ---
- src/core/spec/CMakeLists.txt     |  2 --
- src/core/training/CMakeLists.txt |  2 --
- src/jumandic/CMakeLists.txt      |  8 +-------
- src/rnn/CMakeLists.txt           |  5 +----
- src/util/CMakeLists.txt          |  2 --
- 9 files changed, 4 insertions(+), 34 deletions(-)
-
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 169dff5..64b6a07 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -67,7 +67,6 @@ function(jpp_feature_codegen)
- endfunction(jpp_feature_codegen)
- 
- add_subdirectory(util)
--add_subdirectory(testing)
- add_subdirectory(core)
- add_subdirectory(jumandic)
--add_subdirectory(rnn)
-\ No newline at end of file
-+add_subdirectory(rnn)
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index c63d134..01c825e 100644
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -55,20 +55,11 @@ set(core_hdrs
-   ${core_hdrs}
-   )
- 
--set(core_test_srcs
--  ${core_test_srcs}
--  ${core_tsrcs}
--  test/test_analyzer_env.h
--  ../testing/test_analyzer.h
--  )
--
- add_library(jpp_core ${core_srcs} ${core_hdrs} ${libs3p_pegtl_headers})
--jpp_test_executable(jpp_core_tests ${core_test_srcs})
- 
- target_include_directories(jpp_core PUBLIC ${jpp_core_cfg_dir})
- 
- target_link_libraries(jpp_core PUBLIC jpp_util jpp_rnn PRIVATE pathie)
--target_link_libraries(jpp_core_tests jpp_core jpp_core_train)
- 
- if (${JPP_USE_PROTOBUF})
-   target_include_directories(jpp_core PUBLIC ${Protobuf_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-@@ -78,4 +69,4 @@ endif()
- add_subdirectory(benchmarks)
- if (${JPP_ENABLE_DEV_TOOLS})
-   add_subdirectory(devtools)
--endif ()
-\ No newline at end of file
-+endif ()
-diff --git a/src/core/analysis/CMakeLists.txt b/src/core/analysis/CMakeLists.txt
-index 526263e..1b32f8d 100644
---- a/src/core/analysis/CMakeLists.txt
-+++ b/src/core/analysis/CMakeLists.txt
-@@ -79,5 +79,3 @@ jpp_core_files(core_hdrs
-   )
- 
- 
--jpp_test_executable(jpp_core_analysis_tests ${core_analysis_tsrc})
--target_link_libraries(jpp_core_analysis_tests jpp_core)
-diff --git a/src/core/codegen/CMakeLists.txt b/src/core/codegen/CMakeLists.txt
-index a905cee..fa759c7 100644
---- a/src/core/codegen/CMakeLists.txt
-+++ b/src/core/codegen/CMakeLists.txt
-@@ -30,7 +30,4 @@ set(jpp_codegen_tsrcs
- 
- add_library(jpp_core_codegen ${jpp_codegen_srcs} ${jpp_codegen_hdrs})
- 
--jpp_test_executable(jpp_codegen_tests ${jpp_codegen_tsrcs})
--target_include_directories(jpp_codegen_tests PRIVATE ${cgtest02_INCLUDE})
- target_link_libraries(jpp_core_codegen jpp_core)
--target_link_libraries(jpp_codegen_tests jpp_core_codegen)
-\ No newline at end of file
-diff --git a/src/core/spec/CMakeLists.txt b/src/core/spec/CMakeLists.txt
-index f495d67..da827b9 100644
---- a/src/core/spec/CMakeLists.txt
-+++ b/src/core/spec/CMakeLists.txt
-@@ -33,5 +33,3 @@ jpp_core_files(core_hdrs
- 
-   )
- 
--jpp_test_executable(jpp_core_spec_tests ${core_spec_tsrc} ${libs3p_pegtl_headers})
--target_link_libraries(jpp_core_spec_tests jpp_core)
-\ No newline at end of file
-diff --git a/src/core/training/CMakeLists.txt b/src/core/training/CMakeLists.txt
-index 960437e..4ede9e1 100644
---- a/src/core/training/CMakeLists.txt
-+++ b/src/core/training/CMakeLists.txt
-@@ -39,7 +39,5 @@ set(core_train_hdrs
- 
- 
- add_library(jpp_core_train ${core_train_src} ${core_train_hdrs})
--jpp_test_executable(jpp_core_train_tests ${core_train_tsrc})
- 
- target_link_libraries(jpp_core_train jpp_core)
--target_link_libraries(jpp_core_train_tests jpp_core_train)
-\ No newline at end of file
-diff --git a/src/jumandic/CMakeLists.txt b/src/jumandic/CMakeLists.txt
-index bef3149..85a8b5d 100644
---- a/src/jumandic/CMakeLists.txt
-+++ b/src/jumandic/CMakeLists.txt
-@@ -53,10 +53,6 @@ if (${JPP_USE_PROTOBUF})
- endif ()
- 
- 
--jpp_test_executable(jpp_jumandic_tests ${jumandic_tests})
--jpp_test_executable(jpp_bug_tests ${bug_test_sources})
--target_include_directories(jpp_jumandic_tests PRIVATE ${jpp_jumandic_cg_INCLUDE})
--
- add_executable(jpp_jumandic_bootstrap main/bootstrap.cc)
- add_executable(jumanpp_v2 main/jumanpp.cc)
- add_executable(jumanpp_v2_train main/jumanpp_train.cc main/jumanpp_train.h)
-@@ -64,11 +60,9 @@ add_executable(jpp_jumandic_pathdiff main/path_diff.cc)
- target_include_directories(jpp_jumandic_pathdiff PRIVATE ${jpp_jumandic_cg_INCLUDE})
- 
- target_link_libraries(jpp_jumandic jpp_jumandic_spec)
--target_link_libraries(jpp_jumandic_tests jpp_jumandic jpp_core_train)
--target_link_libraries(jpp_bug_tests jpp_jumandic jpp_core_train)
- target_link_libraries(jpp_jumandic_bootstrap jpp_jumandic)
- target_link_libraries(jumanpp_v2 jpp_jumandic)
- target_link_libraries(jumanpp_v2_train jpp_jumandic jpp_core_train)
- target_link_libraries(jpp_jumandic_pathdiff jpp_jumandic)
- 
--install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin)
-\ No newline at end of file
-+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/jumanpp_v2 RENAME jumanpp DESTINATION bin)
-diff --git a/src/rnn/CMakeLists.txt b/src/rnn/CMakeLists.txt
-index 448ba51..ca09a00 100644
---- a/src/rnn/CMakeLists.txt
-+++ b/src/rnn/CMakeLists.txt
-@@ -1,12 +1,9 @@
- set(jpp_rnn_sources mikolov_rnn.cc)
- set(jpp_rnn_includes mikolov_rnn.h simple_rnn_impl.h mikolov_rnn_impl.h rnn_arg_parse.h)
--set(jpp_rnn_tests mikolov_rnn_test.cc)
- 
- add_library(jpp_rnn ${jpp_rnn_sources} ${jpp_rnn_includes} )
- add_library(jumanpp_rnn_legacy legacy/rnnlmlib.h legacy/rnnlmlib_static.h legacy/rnnlmlib_static.cpp)
- 
--jpp_test_executable(jpp_rnn_tests ${jpp_rnn_tests})
- target_link_libraries(jpp_rnn jpp_util)
--target_link_libraries(jpp_rnn_tests jpp_rnn jumanpp_rnn_legacy)
- 
--target_link_libraries(jumanpp_rnn_legacy jpp_util)
-\ No newline at end of file
-+target_link_libraries(jumanpp_rnn_legacy jpp_util)
-diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
-index 53b6c57..c4599d5 100644
---- a/src/util/CMakeLists.txt
-+++ b/src/util/CMakeLists.txt
-@@ -25,8 +25,6 @@ endif()
- 
- 
- add_library(jpp_util ${jpp_util_sources} ${jpp_util_headers} ${BACKWARD_headers})
--jpp_test_executable(jpp_util_test ${jpp_util_test_srcs} ${jpp_util_headers})
--target_link_libraries(jpp_util_test jpp_util)
- target_link_libraries(jpp_util ${CMAKE_THREAD_LIBS_INIT})
- target_include_directories(jpp_util PUBLIC ${JPP_LIBS_DIR} ${JPP_SRC_DIR})
- target_compile_features(jpp_util PUBLIC
--- 
-2.33.1
-
diff --git a/pkgs/by-name/ju/jumanpp/package.nix b/pkgs/by-name/ju/jumanpp/package.nix
index 6f0ca2599757..a3b8678b5ead 100644
--- a/pkgs/by-name/ju/jumanpp/package.nix
+++ b/pkgs/by-name/ju/jumanpp/package.nix
@@ -2,46 +2,31 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   cmake,
   protobuf,
   libiconv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jumanpp";
-  version = "2.0.0-rc3";
+  version = "2.0.0-rc4";
 
   src = fetchurl {
-    url = "https://github.com/ku-nlp/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-ASdr6qbkSe71M7QmuuwidCa4xQhDVoXBJ2XqvSY53pQ=";
+    url = "https://github.com/ku-nlp/jumanpp/releases/download/v${finalAttrs.version}/jumanpp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qyy0mTBrH3y8OBIVXuTHIDV+AbQIvCIA7rzhbI2b8y8=";
   };
 
-  patches = [
-    ./0001-Exclude-all-tests-from-the-build.patch
-    # https://github.com/ku-nlp/jumanpp/pull/132
-    (fetchpatch {
-      name = "fix-unused-warning.patch";
-      url = "https://github.com/ku-nlp/jumanpp/commit/cc0d555287c8b214e9d6f0279c449a4e035deee4.patch";
-      sha256 = "sha256-yRKwuUJ2UPXJcjxBGhSOmcQI/EOijiJDMmmmSRdNpX8=";
-    })
-    (fetchpatch {
-      name = "update-libs.patch";
-      url = "https://github.com/ku-nlp/jumanpp/commit/5e9068f56ae310ed7c1df185b14d49654ffe1ab6.patch";
-      sha256 = "sha256-X49/ZoLT0OGePLZYlgacNxA1dHM4WYdQ8I4LW3sW16E=";
-    })
-    (fetchpatch {
-      name = "fix-mmap-on-apple-m1.patch";
-      url = "https://github.com/ku-nlp/jumanpp/commit/0c22249f12928d0c962f03f229026661bf0c7921.patch";
-      sha256 = "sha256-g6CuruqyoMJxU/hlNoALx1QnFM8BlTsTd0pwlVrco3I=";
-    })
-  ];
-  cmakeFlags = [ "-DJPP_ENABLE_TESTS=OFF" ];
+  doCheck = true;
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ protobuf ] ++ lib.optional stdenv.hostPlatform.isDarwin libiconv;
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace libs/pathie-cpp/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Japanese morphological analyser using a recurrent neural network language model (RNNLM)";
     mainProgram = "jumanpp";
     longDescription = ''
@@ -50,8 +35,8 @@ stdenv.mkDerivation rec {
       language model (RNNLM).
     '';
     homepage = "https://nlp.ist.i.kyoto-u.ac.jp/index.php?JUMAN++";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mt-caret ];
-    platforms = platforms.all;
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mt-caret ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index a05ccb27e649..528bc3e1de29 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -92,6 +92,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       # Assets
       cc-by-nc-40
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index d307f2c846e3..6935da97ddc5 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "jwtinfo";
-  version = "0.4.4";
+  version = "0.6.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "lmammino";
     repo = "jwtinfo";
     rev = "v${version}";
-    hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA=";
+    hash = "sha256-o2SbPTnYSqsjpTl1Z8uSZZLeHx4lxunwDdig4UuVFKg=";
   };
 
-  cargoHash = "sha256-pRlnZAFsEBGz0yYfcZ0SCiH2om8URQ4J3+c01pBT7ag=";
+  cargoHash = "sha256-v5kJ+XznzewkmC3qo1e2xMLc1fS8gYYNd/9+IDFkbvw=";
 
   meta = {
     description = "Command-line tool to get information about JWTs";
diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index a8e329064aac..1916fb6a4e54 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "jwx";
-  version = "3.0.11";
+  version = "3.0.12";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = "jwx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TGB6dMybvMH/mXlNwnj63kOrj56mbEFTQSVfphnQJfY=";
+    hash = "sha256-8TUme6YezwVkRYenSNaVZjC4TNq7kUV7wbIhWFQ/AR0=";
   };
 
   vendorHash = "sha256-7lMvSwLi588UBI31YDi/VqyAqwUjWUwjOZbxE3fZQWU=";
diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index 03d8a1e4825c..c60e7927c2da 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.16.24";
+  version = "3.16.26";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-0BV8wV5kL7WP6cy881D0Rpw0RPIDcI4/LQckrwk/RiQ=";
+    sha256 = "sha256-KydLlc2FaOVdnz3ZP6obR7KbdWK0I5WXTziKAH3/UtY=";
   };
 
   vendorHash = "sha256-YUFpTL4BXm1iZJAQcbJSXEUKT99IulxT6qz4mrbBDN0=";
diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix
index 89a56eaa52e5..abd4e8659bcf 100644
--- a/pkgs/by-name/k0/k0sctl/package.nix
+++ b/pkgs/by-name/k0/k0sctl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "k0sctl";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = "k0sctl";
     tag = "v${version}";
-    hash = "sha256-N6fXTjZaI+T3rRKDf9yK8KioGjeOaPvyTJi7BFUKi6Q=";
+    hash = "sha256-4Oo5WYDlnZmrjYq5sA3IhkxXZV1eNOAbydMeZpL2Pa4=";
   };
 
   vendorHash = "sha256-Tzs7PYOulszUFK4PLHPzxxmkpHVo2+h/hG83aHG8Bm0=";
diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 97f2b9fc7948..ea3b978a5f11 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "k9s";
-  version = "0.50.15";
+  version = "0.50.16";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rTG2UtrVLlF+dFFJiNErYG6GL4ZQdwPlj1kdaLxh6TI=";
+    hash = "sha256-PYaVzUAQuy5LBkyJ3otWX1iRYWSkt4sD3HIvpGTOiQY=";
   };
 
   ldflags = [
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Djz23/Ef7T7giE/KDsnbWnihwW37o40jevwVt8CbiQE=";
+  vendorHash = "sha256-KuF0CCabhEqF4yEtj3ARRM2DkYdXWWwCm4P0nruHjso=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);
diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index 5238cc8bf1fc..5a2d043e056c 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kafkactl";
-  version = "5.13.0";
+  version = "5.14.0";
 
   src = fetchFromGitHub {
     owner = "deviceinsight";
     repo = "kafkactl";
     tag = "v${version}";
-    hash = "sha256-YJpRXCTI0Mwi4Zxeex8oxgzElk7l8Qus75lR42/wSww=";
+    hash = "sha256-WBycrpte3LSwAAjeD+gHXLEz9Y7075Ryip58fIGdJ8Q=";
   };
 
   vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I=";
diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
index 57842dfa679a..f9593f948010 100644
--- a/pkgs/by-name/ka/kagen/package.nix
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kagen";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "KarlsruheGraphGeneration";
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     tag = "v${finalAttrs.version}";
     # use vendor libmorton and xxHash
     fetchSubmodules = true;
-    hash = "sha256-2jXHHS9Siu6hXrYPIrZSOWe6D2PgsvrbMw/7Ykpc3wk=";
+    hash = "sha256-VLQxeI9EzeJEp1krlLPRSct3SQmAF8cj34u3fkmppQg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix b/pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix
new file mode 100644
index 000000000000..07e1fb8a7eee
--- /dev/null
+++ b/pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix
@@ -0,0 +1,73 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  zlib,
+  copyPkgconfigItems,
+  makePkgconfigItem,
+  lib,
+  testers,
+  ctestCheckHook,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kaitai-struct-cpp-stl-runtime";
+  version = "0.11";
+
+  src = fetchFromGitHub {
+    owner = "kaitai-io";
+    repo = "kaitai_struct_cpp_stl_runtime";
+    tag = finalAttrs.version;
+    sha256 = "sha256-2glGPf08bkzvnkLpQIaG2qiy/yO+bZ14hjIaCKou2vU=";
+  };
+
+  doCheck = true;
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    copyPkgconfigItems
+    ctestCheckHook
+  ];
+
+  buildInputs = [
+    zlib
+    gtest
+  ];
+
+  strictDeps = true;
+
+  # https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/issues/82
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "kaitai-struct-cpp-stl-runtime";
+      inherit (finalAttrs) version;
+      cflags = [ "-I${variables.includedir}" ];
+      libs = [
+        "-L${variables.libdir}"
+        "-lkaitai_struct_cpp_stl_runtime"
+      ];
+      variables = {
+        includedir = "${placeholder "dev"}/include";
+        libdir = "${placeholder "out"}/lib";
+      };
+      inherit (finalAttrs.meta) description;
+    })
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    pkgConfigModules = [ "kaitai-struct-cpp-stl-runtime" ];
+    description = "Kaitai Struct C++ STL Runtime Library";
+    homepage = "https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fzakaria ];
+  };
+})
diff --git a/pkgs/by-name/ka/kaldi/package.nix b/pkgs/by-name/ka/kaldi/package.nix
index 0ca19505bd0a..aa3508733945 100644
--- a/pkgs/by-name/ka/kaldi/package.nix
+++ b/pkgs/by-name/ka/kaldi/package.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DBLAS_LIBRARIES=-lblas"
     "-DLAPACK_LIBRARIES=-llapack"
     "-DFETCHCONTENT_SOURCE_DIR_OPENFST:PATH=${finalAttrs.passthru.sources.openfst}"
+    # Fix the build with CMake 4 (openfst does not contain cmake_minimum_required)
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
   ];
 
   buildInputs = [
diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix
index 24c1b5ae0402..a5905a19a329 100644
--- a/pkgs/by-name/ka/kalker/package.nix
+++ b/pkgs/by-name/ka/kalker/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage rec {
     '';
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       lovesegfault
     ];
     mainProgram = "kalker";
diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix
index 6b5fd10ceb63..6ffb65922076 100644
--- a/pkgs/by-name/ka/kanata/package.nix
+++ b/pkgs/by-name/ka/kanata/package.nix
@@ -2,8 +2,6 @@
   stdenv,
   lib,
   gnused,
-  apple-sdk_13,
-  darwinMinVersionHook,
   rustPlatform,
   karabiner-dk,
   fetchFromGitHub,
@@ -29,14 +27,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-LfjuQHR3vVUr2e0efVymnfCnyYkFRx7ZiNdSIjBZc5s=";
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_13
-    (darwinMinVersionHook "13.0")
-  ];
-
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     (writeShellScriptBin "sw_vers" ''
-      echo 'ProductVersion: 13.0'
+      echo 'ProductVersion: ${stdenv.hostPlatform.darwinMinVersion}'
     '')
   ];
 
diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix
index 5eb89e73d5fc..5c0ba4b216e4 100644
--- a/pkgs/by-name/ka/kanboard/package.nix
+++ b/pkgs/by-name/ka/kanboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "kanboard";
-  version = "1.2.47";
+  version = "1.2.48";
 
   src = fetchFromGitHub {
     owner = "kanboard";
     repo = "kanboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LedK1Ct4xz88r4gvN2jxOE/7Yg6rnrnjCHdhmn3tun4=";
+    hash = "sha256-qaVQ0urVdy5ADlLY7v9FJB8TSEuuopuX/XUYRzwbgY0=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/ka/kaniko/package.nix b/pkgs/by-name/ka/kaniko/package.nix
index bd54ad7e5cc5..58a28848c36e 100644
--- a/pkgs/by-name/ka/kaniko/package.nix
+++ b/pkgs/by-name/ka/kaniko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kaniko";
-  version = "1.25.2";
+  version = "1.25.3";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "kaniko";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4P/NKwC32/hW4goUelnx28zY9bBD5Hbbz/y+S00rt7k=";
+    hash = "sha256-5KKRBAzyzmRbP/A5kOV6amUljLNCAmOMwp4jGg73fY8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ka/kapitano/package.nix b/pkgs/by-name/ka/kapitano/package.nix
deleted file mode 100644
index 6dbcfe1e8643..000000000000
--- a/pkgs/by-name/ka/kapitano/package.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  lib,
-  fetchFromGitea,
-  meson,
-  ninja,
-  pkg-config,
-  glib,
-  gtk4,
-  libadwaita,
-  python3Packages,
-  clamav,
-  appstream-glib,
-  desktop-file-utils,
-  libxml2,
-  gobject-introspection,
-  wrapGAppsHook4,
-  librsvg,
-}:
-python3Packages.buildPythonApplication rec {
-  pname = "kapitano";
-  version = "1.1.5";
-  pyproject = false;
-
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "zynequ";
-    repo = "Kapitano";
-    tag = version;
-    hash = "sha256-eX35ZR2O56NwoFnqGNZi2lNUpoBvaYZqFh69dQ+Eng0=";
-    fetchLFS = true;
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    desktop-file-utils
-    libxml2
-    pkg-config
-    appstream-glib
-    wrapGAppsHook4
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-    gtk4
-    libadwaita
-    librsvg
-  ];
-
-  dependencies = with python3Packages; [ pygobject3 ];
-
-  postPatch = ''
-    substituteInPlace src/config/paths_config.py \
-      --replace-fail 'USER_DATA_DIR = GLib.get_user_data_dir()' 'USER_DATA_DIR = os.path.join(GLib.get_user_data_dir(), "kapitano"); os.makedirs(USER_DATA_DIR, exist_ok=True)'
-  '';
-
-  dontWrapGApps = true;
-
-  preFixup = ''
-    makeWrapperArgs+=(
-      ''${gappsWrapperArgs[@]}
-      --prefix PATH : "${lib.makeBinPath [ clamav ]}"
-    )
-  '';
-
-  meta = {
-    description = "Modern ClamAV front-end that uses gtk4/libadwaita";
-    homepage = "https://codeberg.org/zynequ/Kapitano";
-    mainProgram = "kapitano";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ lonerOrz ];
-  };
-}
diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
index a7586ec00d2d..5fe18fb1265a 100644
--- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
+++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
@@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
     zita-resampler
   ];
 
+  # Fix linking issues with C++ code generated by Faust
+  env.NIX_LDFLAGS = "-lstdc++ -lm";
+
   meta = with lib; {
     description = "Set of LADSPA and LV2 plugins for guitar sound processing";
     homepage = "https://github.com/olegkapitonov/Kapitonov-Plugins-Pack";
diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/by-name/ka/kapow/package.nix
similarity index 82%
rename from pkgs/applications/misc/kapow/default.nix
rename to pkgs/by-name/ka/kapow/package.nix
index 3943eb96f721..789c9ef19cd9 100644
--- a/pkgs/applications/misc/kapow/default.nix
+++ b/pkgs/by-name/ka/kapow/package.nix
@@ -1,11 +1,8 @@
 {
   lib,
   stdenv,
-  qmake,
   fetchFromGitHub,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "Punch clock to track time spent on projects";
diff --git a/pkgs/by-name/ka/karabiner-dk/package.nix b/pkgs/by-name/ka/karabiner-dk/package.nix
index 1b8d61238d32..972cc1edf583 100644
--- a/pkgs/by-name/ka/karabiner-dk/package.nix
+++ b/pkgs/by-name/ka/karabiner-dk/package.nix
@@ -12,14 +12,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "karabiner-dk";
-  sourceVersion = "6.4.0";
+  sourceVersion = "6.5.0";
   version = lib.defaultTo finalAttrs.sourceVersion driver-version;
 
   src = fetchFromGitHub {
     owner = "pqrs-org";
     repo = "Karabiner-DriverKit-VirtualHIDDevice";
     tag = "v${finalAttrs.sourceVersion}";
-    hash = "sha256-NlzIb9srGVdYUOAOL8W9UJZVrf5IQOm6TVjm73epemM=";
+    hash = "sha256-/77FaQUiJXqS7szOb92n/czuBup+f29GwLjQ9OXPvC4=";
   };
 
   nativeBuildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = writeShellScript "karabiner-dk" ''
     NEW_VERSION=$(${lib.getExe curl} --silent https://api.github.com/repos/pqrs-org/Karabiner-DriverKit-VirtualHIDDevice/releases/latest $${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} | ${lib.getExe jq} '.tag_name | ltrimstr("v")' --raw-output)
-    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --ignore-same-version --version-key="sourceVersion";
+    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --system=aarch64-darwin --ignore-same-version --version-key="sourceVersion";
   '';
 
   meta = {
diff --git a/pkgs/by-name/ka/karere/package.nix b/pkgs/by-name/ka/karere/package.nix
new file mode 100644
index 000000000000..1a28df71813d
--- /dev/null
+++ b/pkgs/by-name/ka/karere/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  vala,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  blueprint-compiler,
+  desktop-file-utils,
+  appstream,
+  gtk4,
+  libadwaita,
+  webkitgtk_6_0,
+  json-glib,
+  libgee,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "karere";
+  version = "0.9.4";
+
+  src = fetchFromGitHub {
+    owner = "tobagin";
+    repo = "karere";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-qfBAA9PFXqU+hS9evsX8898ysE58IcZz3df4kVsnaa8=";
+  };
+
+  nativeBuildInputs = [
+    vala
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    blueprint-compiler
+    desktop-file-utils
+    appstream
+  ];
+
+  buildInputs = [
+    gtk4
+    libadwaita
+    webkitgtk_6_0
+    json-glib
+    libgee
+  ];
+
+  meta = {
+    description = "Gtk4 Whatsapp client";
+    homepage = "https://github.com/tobagin/karere";
+    changelog = "https://github.com/tobagin/karere/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ marcel ];
+    mainProgram = "karere";
+  };
+})
diff --git a/pkgs/by-name/ka/karing/package.nix b/pkgs/by-name/ka/karing/package.nix
new file mode 100644
index 000000000000..442bb3f6dbd7
--- /dev/null
+++ b/pkgs/by-name/ka/karing/package.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  atk,
+  cairo,
+  curlMinimal,
+  fontconfig,
+  gdk-pixbuf,
+  glib,
+  gobject-introspection,
+  gtk3,
+  harfbuzz,
+  keybinder3,
+  libayatana-appindicator,
+  libepoxy,
+  libsecret,
+  pango,
+  zlib,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "karing";
+  version = "1.2.5.881";
+
+  src = fetchurl {
+    url = "https://github.com/KaringX/karing/releases/download/v${finalAttrs.version}/karing_${finalAttrs.version}_linux_amd64.deb";
+    hash = "sha256-gkuKdOq07C7xd8xNoXWlcqaZ7xe9VmjU8e43Hg1yN7w=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    atk
+    cairo
+    curlMinimal
+    fontconfig
+    gdk-pixbuf
+    glib
+    gobject-introspection
+    gtk3
+    harfbuzz
+    keybinder3
+    (lib.getLib stdenv.cc.cc)
+    libayatana-appindicator
+    libepoxy
+    libsecret
+    pango
+    zlib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp --recursive usr $out
+    mkdir $out/bin
+    ln --symbolic $out/share/karing/karing $out/bin/karing
+    ln --symbolic $out/share/karing/karingService $out/bin/karingService
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/KaringX/karing/releases/tag/v${finalAttrs.version}";
+    description = "Simple & Powerful proxy utility, Support routing rules for clash/sing-box";
+    homepage = "https://github.com/KaringX/karing";
+    license = with lib.licenses; [
+      gpl3Plus
+      unfree
+    ];
+    mainProgram = "karing";
+    maintainers = with lib.maintainers; [ qzylinra ];
+    platforms = [ "x86_64-linux" ];
+  };
+})
diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix
index 870028924c99..13c8b6c8a5e2 100644
--- a/pkgs/by-name/ka/kas/package.nix
+++ b/pkgs/by-name/ka/kas/package.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "kas";
-  version = "4.8.2";
+  version = "5.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "siemens";
     repo = "kas";
     tag = version;
-    hash = "sha256-mDfGiWZKipbaXxlyx8JWeFvSyE44FcumYD9Pr/38UBQ=";
+    hash = "sha256-KSmLQBOYyuO9o3YZYPJPDPeGudtNYIC2yghAu98sf3Q=";
   };
 
   patches = [ ./pass-terminfo-env.patch ];
diff --git a/pkgs/by-name/ka/kazumi/gitHashes.json b/pkgs/by-name/ka/kazumi/gitHashes.json
index 8bd6c1ed1720..88ecda4e668b 100644
--- a/pkgs/by-name/ka/kazumi/gitHashes.json
+++ b/pkgs/by-name/ka/kazumi/gitHashes.json
@@ -1,12 +1,12 @@
 {
   "desktop_webview_window": "sha256-l5n57iKLgsH4TaBYRaTDEPznzljI0jfOGcvxyYcIW6M=",
-  "media_kit": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_android_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_ios_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_linux": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_macos_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_windows_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "webview_windows": "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="
+  "media_kit": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_android_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_ios_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_linux": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_macos_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_windows_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index eac537c20731..633649f389cc 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "1.7.8";
+  version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-EHrTI+jy8ryvGwLUJNVbYlinKsBxh12zboHqpiGuRk0=";
+    hash = "sha256-pt5mM6dCI0v+WExs7oExSGhDKj8yJ9Dpjk5NfCvr20I=";
   };
 in
 flutter335.buildFlutterApplication {
@@ -65,10 +65,11 @@ flutter335.buildFlutterApplication {
         inherit (src) passthru;
 
         postPatch = ''
-          sed -i '/set(LIBMPV_ZIP_URL/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{//!d; /set(LIBMPV_ZIP_URL/d}' media_kit_video/linux/CMakeLists.txt
-          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt
-          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_PATH "${mpv-unwrapped}/lib")' media_kit_video/linux/CMakeLists.txt
-          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_UNZIP_DIR "${mpv-unwrapped}/lib")' media_kit_video/linux/CMakeLists.txt
+          sed -i '/if(ARCH_NAME STREQUAL "x86_64")/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{ /if(MEDIA_KIT_LIBS_AVAILABLE)/!d; /set(LIBMPV_ZIP_URL/d }' media_kit_video/linux/CMakeLists.txt
+          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i \
+            set(LIBMPV_UNZIP_DIR "${mpv-unwrapped}/lib")\n\
+            set(LIBMPV_PATH "${mpv-unwrapped}/lib")\n\
+            set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt
         '';
 
         installPhase = ''
@@ -127,7 +128,7 @@ flutter335.buildFlutterApplication {
     homepage = "https://github.com/Predidit/Kazumi";
     mainProgram = "kazumi";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ lonerOrz ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index adde10461b70..8ef0d9c140e2 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -394,7 +394,7 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "main",
+        "ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44",
         "resolved-ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44",
         "url": "https://github.com/Predidit/linux_webview_window.git"
       },
@@ -969,8 +969,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -980,8 +980,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -991,8 +991,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1002,8 +1002,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1013,8 +1013,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1024,8 +1024,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1035,8 +1035,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1046,8 +1046,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1417,11 +1417,11 @@
       "dependency": "transitive",
       "description": {
         "name": "screen_brightness_android",
-        "sha256": "fb5fa43cb89d0c9b8534556c427db1e97e46594ac5d66ebdcf16063b773d54ed",
+        "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "screen_brightness_ios": {
       "dependency": "transitive",
@@ -2013,21 +2013,21 @@
       "dependency": "transitive",
       "description": {
         "name": "volume_controller",
-        "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e",
+        "sha256": "d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.8"
+      "version": "3.4.0"
     },
     "wakelock_plus": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
@@ -2133,8 +2133,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "main",
-        "resolved-ref": "a32d483f4416628f1f6630592c0633f1f7c1d625",
+        "ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
+        "resolved-ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2164,11 +2164,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -2223,6 +2223,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.35.3"
+    "flutter": ">=3.35.7"
   }
 }
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 5e89ce36d19b..4b0d29ed563e 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -20,11 +20,12 @@
   zstd,
   gitUpdater,
   pkgsCross,
-  withVlock ? true,
+  withVlock ? false,
+  kbdVlock,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "kbd";
+  pname = "kbd" + lib.optionalString withVlock "-vlock";
   version = "2.9.0";
 
   __structuredAttrs = true;
@@ -35,16 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-uUECxFdm/UhoHKLHLFe6/ygCQ+4mrQOZExKl+ReaTNw=";
   };
 
-  # vlock is moved into its own output, since it depends on pam. This
-  # reduces closure size for most use cases.
   outputs = [
     "out"
     "dev"
     "scripts"
     "man"
-  ]
-  ++ lib.optionals withVlock [
-    "vlock"
   ];
 
   patches = [
@@ -112,10 +108,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     moveToOutput bin/unicode_start $scripts
     moveToOutput bin/unicode_stop $scripts
-  ''
-  + lib.optionalString withVlock ''
-    moveToOutput bin/vlock $vlock
-    moveToOutput etc/pam.d/vlock $vlock
   '';
 
   outputChecks.out.disallowedRequisites = [
@@ -137,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
         pkgsCross.${systemString}.kbd;
       inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
     };
+    # For backwards compatibility. Remove after 26.05.
+    vlock = kbdVlock;
   };
 
   meta = {
diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix
index 6157af531561..dfc0380b9e10 100644
--- a/pkgs/by-name/kb/kbt/package.nix
+++ b/pkgs/by-name/kb/kbt/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Keyboard tester in terminal";
     homepage = "https://github.com/bloznelis/kbt";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "kbt";
   };
 }
diff --git a/pkgs/by-name/kc/kcc/package.nix b/pkgs/by-name/kc/kcc/package.nix
index 1c86d62b41ef..9e0fbd1c89bb 100644
--- a/pkgs/by-name/kc/kcc/package.nix
+++ b/pkgs/by-name/kc/kcc/package.nix
@@ -15,14 +15,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "kcc";
-  version = "9.1.0";
+  version = "9.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ciromattia";
     repo = "kcc";
     tag = "v${version}";
-    hash = "sha256-FGRd2JVcz45KVjQCTEKIjKlkLJS/AsSsopeW9tXHWwk=";
+    hash = "sha256-zzPgBAmICeDpCHvBek2DsM4aEYvC8VHPDY4Ek6nJW9w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index 74b1a8b63094..8b55085e7bf9 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "kcl";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-LJ+Mclw/dMyOeUHg6TAckSbvDGFYCf6mMGzDmiIQVZc=";
+    hash = "sha256-fFT8sUxx1E6WdyiJ8DyTagGkVEQ7YZ2CCGL5tVxkAEI=";
   };
 
-  vendorHash = "sha256-jNQ0g7BGXUoYKV5RkU/f9GrSC3ygeZv83SekAmyKLxc=";
+  vendorHash = "sha256-ohfNy3vOyJJuniQKEVFiDftffdHlEJejQ72TJEwNhIM=";
 
   subPackages = [ "cmd/kcl" ];
 
diff --git a/pkgs/by-name/kc/kcp/package.nix b/pkgs/by-name/kc/kcp/package.nix
index b939e335718e..e2733a5c925b 100644
--- a/pkgs/by-name/kc/kcp/package.nix
+++ b/pkgs/by-name/kc/kcp/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Fast and Reliable ARQ Protocol";
     homepage = "https://github.com/skywind3000/kcp";
diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix
index 43ca2558e173..c2017262a9e5 100644
--- a/pkgs/by-name/ke/kea/package.nix
+++ b/pkgs/by-name/ke/kea/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kea";
-  version = "3.0.1"; # only even minor versions are stable
+  version = "3.0.2"; # only even minor versions are stable
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/kea/${finalAttrs.version}/kea-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7IT+xLt/a50VqC51Wlcek0jrTW+8Yrs/bxKWzXokxWY=";
+    hash = "sha256-KfTkT6SPYv4VFY0XQR4ANJYgMlDbezRZwsecCfN5pUE=";
   };
 
   patches = [
@@ -119,6 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    # error: in-class initializer for static data member is not a constant expression
+    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-${finalAttrs.version}";
     homepage = "https://kea.isc.org/";
     description = "High-performance, extensible DHCP server by ISC";
diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix
index 8c0c9d8bf0f8..ed04394e21a1 100644
--- a/pkgs/by-name/ke/kent/package.nix
+++ b/pkgs/by-name/ke/kent/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "kent";
-  version = "486";
+  version = "488";
 
   src = fetchFromGitHub {
     owner = "ucscGenomeBrowser";
     repo = "kent";
     tag = "v${finalAttrs.version}_base";
-    hash = "sha256-NffQ04+5rMtG/VI7YFK4Ff39DDhdh9Wlc0i1iVbg8Js=";
+    hash = "sha256-7iapTrQBq0VvbSe+lEdf9lISRJ/uPGdnfjJiSA0NLN8=";
   };
 
   nativeBuildInputs = [ writableTmpDirAsHomeHook ];
diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 8dc3fe52ff43..418e999bcbc6 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.5.3";
+  version = "3.6.4";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7bO9IvSTJJKiNYQzcTSI2Ugjhw1ibbyE5/fe6EDYqvI=";
+    hash = "sha256-PhNBAy+XS1wpU91GNoRc4jume9razD03xmmUER0p8I0=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ke/kexec-tools/package.nix b/pkgs/by-name/ke/kexec-tools/package.nix
index d4afe126caa4..c11eff6bc3fa 100644
--- a/pkgs/by-name/ke/kexec-tools/package.nix
+++ b/pkgs/by-name/ke/kexec-tools/package.nix
@@ -12,22 +12,17 @@
 
 stdenv.mkDerivation rec {
   pname = "kexec-tools";
-  version = "2.0.31";
+  version = "2.0.32";
 
   src = fetchurl {
     urls = [
       "mirror://kernel/linux/utils/kernel/kexec/${pname}-${version}.tar.xz"
       "http://horms.net/projects/kexec/kexec-tools/${pname}-${version}.tar.xz"
     ];
-    sha256 = "sha256-io81Ddxm4ckFo6tSWn6bqWyB4E5w72k5ewFVtnuSLDE=";
+    sha256 = "sha256-j4FCKl/SNiz2ywAbUR5TVWXtDzLC9EUfteto/tZxCl0=";
   };
 
   patches = [
-    # Fix for static builds, will likely be removable on the next release
-    (fetchpatch {
-      url = "https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/patch/?id=daa29443819d3045338792b5ba950ed90e79d7a5";
-      hash = "sha256-Nq5HIcLY6KSvvrs2sbfE/vovMbleJYElHW9AVRU5rSA=";
-    })
   ]
   ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isAbiElfv2) [
     # Use ELFv2 ABI on ppc64be
@@ -42,7 +37,6 @@ stdenv.mkDerivation rec {
     "format"
     "pic"
     "relro"
-    "pie"
   ];
 
   # Prevent kexec-tools from using uname to detect target, which is wrong in
diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix
index 59a718a4f37f..35523f15ab94 100644
--- a/pkgs/by-name/ke/keychain/package.nix
+++ b/pkgs/by-name/ke/keychain/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "keychain";
-  version = "2.9.6";
+  version = "2.9.7";
 
   src = fetchFromGitHub {
     owner = "funtoo";
     repo = "keychain";
     rev = version;
-    sha256 = "sha256-R70W8/tE4suGgiSqkJ1RJ0fJ3C+exdoVesXtvxPORVo=";
+    sha256 = "sha256-/8OY/URIhVl8bTlJPRGidExHzkwzckm/v3QUq7Fxe04=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ke/keychron-udev-rules/package.nix b/pkgs/by-name/ke/keychron-udev-rules/package.nix
new file mode 100644
index 000000000000..374ef9ff2a57
--- /dev/null
+++ b/pkgs/by-name/ke/keychron-udev-rules/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  udevCheckHook,
+  writeTextFile,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "keychron-udev-rules";
+  version = "23-10-2025";
+
+  nativeBuildInputs = [ udevCheckHook ];
+
+  src = writeTextFile {
+    name = "69-keychron.rules";
+    text = ''
+      KERNEL=="event*", SUBSYSTEM=="input", ENV{ID_VENDOR_ID}=="3434", ENV{ID_INPUT_JOYSTICK}=="*?", ENV{ID_INPUT_JOYSTICK}=""
+    '';
+  };
+
+  dontConfigure = true;
+  dontUnpack = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 $src $out/lib/udev/rules.d/69-keychron.rules
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kruziikrel13 ];
+  };
+})
diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index 0983e5015dc1..7858dcd3afef 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
-  version = "26.4.0";
+  version = "26.4.4";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-mWgTkvop5oRA3DzxxI3Q8kgftLZZteGeJ3Zxgh5SIww=";
+    hash = "sha256-nzwkrwMHKBZWzyB5Csl6htnVAcIgtpDC6YDl3MNg+eM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ke/keydb/package.nix b/pkgs/by-name/ke/keydb/package.nix
index c0fc9248be38..6d7bae68fc48 100644
--- a/pkgs/by-name/ke/keydb/package.nix
+++ b/pkgs/by-name/ke/keydb/package.nix
@@ -57,8 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
   # darwin currently lacks a pure `pgrep` which is extensively used here
   doCheck = !stdenv.hostPlatform.isDarwin;
   nativeCheckInputs = [
diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json
index 7640def133e9..f415b42ae892 100644
--- a/pkgs/by-name/ke/keyguard/deps.json
+++ b/pkgs/by-name/ke/keyguard/deps.json
@@ -2984,6 +2984,9 @@
   "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.10.0-alpha01": {
    "pom": "sha256-z/keLG8RTFwJQ18qs4xUqSRxNNn5W66oJs/bw//iIeM="
   },
+  "org/jetbrains/compose/desktop#desktop-jvm-linux-arm64/1.10.0-alpha01": {
+   "pom": "sha256-LYKUvZ6EGJuIId5UNmy+JMQen0t2sXwl6I+daQJ6uUE="
+  },
   "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.8.2": {
    "pom": "sha256-S290UtIXCU0UQhfHocanMKEPZ2oLfu/nhdcmMuotNMQ="
   },
@@ -3709,6 +3712,10 @@
    "jar": "sha256-ZkuW2kLSLxpjppvDLkPG0eX+nGL5VES7Xx9TWlwRqAI=",
    "pom": "sha256-k4MjXDsckFvkgEtVEzOCITOQh1nZT+XVzGsBX45c6Po="
   },
+  "org/jetbrains/skiko#skiko-awt-runtime-linux-arm64/0.9.24": {
+   "jar": "sha256-hlWrRjir6GTuM0NqJWWN5b1mA4VlHHmB6vlxohDEVLg=",
+   "pom": "sha256-ab52bpJggnFqrd+F4hKWCcbM3DQEV38//yvdc6TCjoQ="
+  },
   "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.9.4.2": {
    "jar": "sha256-bi6GlwC5lL5fRjFIDmdTNXmXETE0iyrlUjbddNJyIWE=",
    "pom": "sha256-k6Jnui8eKqWK/PvEZXpogmQnbXPYBOI1pzhcO1lEVMk="
diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 23451e2f7db3..1eb8649a530a 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyguard";
-  version = "1.15.0";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "AChep";
     repo = "keyguard-app";
-    tag = "r20250915";
-    hash = "sha256-WAD8cZkaZbv3tyzKYEBH25g7x7xmdIWAnvMxnNKYpME=";
+    tag = "r20251015";
+    hash = "sha256-1e3AZ07CfRFj6b3hiJFcypsHFwhedRdQ3+StEHXSacU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index bda1cd85fd01..f3c5dfbfabda 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keymapper";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "keymapper";
     tag = finalAttrs.version;
-    hash = "sha256-3cUfgOuZ3GKSKbUI2k/MwvSmHtqvqiUvqUem3Nh/YuQ=";
+    hash = "sha256-y1EVF3IwGzDy32ywo9LSzkQNki/HuKC40DySIme8nTc=";
   };
 
   # all the following must be in nativeBuildInputs
diff --git a/pkgs/by-name/ke/keyoxide-cli/package.nix b/pkgs/by-name/ke/keyoxide-cli/package.nix
new file mode 100644
index 000000000000..6e91da843c38
--- /dev/null
+++ b/pkgs/by-name/ke/keyoxide-cli/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "keyoxide-cli";
+  version = "0.4.4";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "keyoxide";
+    repo = "keyoxide-cli";
+    tag = finalAttrs.version;
+    hash = "sha256-lQEvtqFq3OBlXdYdrhMsAns4kimR2RfRx3VFNy4nEu8=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-UxP5NkmA3MsrXhoa+JviDdW19HKE6Xpj1dkN7h0ggck=";
+  };
+
+  yarnBuildScript = "prettier";
+  yarnBuildFlags = "src/commands.js";
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    # Needed for executing package.json scripts
+    nodejs
+  ];
+
+  meta = {
+    changelog = "https://codeberg.org/keyoxide/keyoxide-cli/releases/tag/${finalAttrs.version}";
+    description = "Command-line interface to locally verify decentralized identities";
+    homepage = "https://codeberg.org/keyoxide/keyoxide-cli";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.pyrox0 ];
+    mainProgram = "keyoxide";
+  };
+})
diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix
index 043832efd7ea..1a13b5ef337a 100644
--- a/pkgs/by-name/ke/keyscope/package.nix
+++ b/pkgs/by-name/ke/keyscope/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/spectralops/keyscope";
     changelog = "https://github.com/spectralops/keyscope/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "keyscope";
   };
 }
diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix
index 9e29ba873586..ea6950ce7983 100644
--- a/pkgs/by-name/kg/kgeotag/package.nix
+++ b/pkgs/by-name/kg/kgeotag/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation {
   pname = "kgeotag";
-  version = "1.8.0-unstable-2025-07-25";
+  version = "1.8.0-unstable-2025-11-01";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     repo = "kgeotag";
     owner = "graphics";
-    rev = "b2b140e8f72ab37bad3729bea527203324d12131";
-    hash = "sha256-jUcKm4IPQt2JiZUmIjMJ9EG0kDjzoPGjzBPMHZ6j9lM=";
+    rev = "879418eb57e96beb5be3e3a69d0bab2b666b7c7f";
+    hash = "sha256-RFC8UMrURn2vsTRjPFyLNlsep/PWRadkRkS7aFtTlKE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch
new file mode 100644
index 000000000000..19ca4a46ec88
--- /dev/null
+++ b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03dfe43..33553f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.10)
+ cmake_policy(SET CMP0048 NEW)
+ project(kgraphviewer VERSION "2.4.3")
+ set(KGRAPHVIEWERLIB_SOVERION 3)
diff --git a/pkgs/by-name/kg/kgraphviewer/package.nix b/pkgs/by-name/kg/kgraphviewer/package.nix
index 27320c563890..797ed6c7fb30 100644
--- a/pkgs/by-name/kg/kgraphviewer/package.nix
+++ b/pkgs/by-name/kg/kgraphviewer/package.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l";
   };
 
+  patches = [ ./cmake-minimum-required.patch ];
+
   buildInputs = [
     libsForQt5.qtbase
     libsForQt5.qtsvg
diff --git a/pkgs/by-name/kh/khoj/package.nix b/pkgs/by-name/kh/khoj/package.nix
deleted file mode 100644
index ec9e03b13835..000000000000
--- a/pkgs/by-name/kh/khoj/package.nix
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  postgresql,
-  postgresqlTestHook,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "khoj";
-  version = "1.0.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "debanjum";
-    repo = "khoj";
-    tag = version;
-    hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec=";
-  };
-
-  env = {
-    DJANGO_SETTINGS_MODULE = "khoj.app.settings";
-    postgresqlEnableTCP = 1;
-  };
-
-  nativeBuildInputs = with python3.pkgs; [
-    hatch-vcs
-    hatchling
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    aiohttp
-    anyio
-    authlib
-    beautifulsoup4
-    dateparser
-    defusedxml
-    django
-    fastapi
-    google-auth
-    # gpt4all
-    gunicorn
-    httpx
-    itsdangerous
-    jinja2
-    langchain
-    lxml
-    openai
-    openai-whisper
-    pgvector
-    pillow
-    psycopg2
-    pydantic
-    pymupdf
-    python-multipart
-    pyyaml
-    # rapidocr-onnxruntime
-    requests
-    rich
-    schedule
-    sentence-transformers
-    stripe
-    tenacity
-    tiktoken
-    torch
-    transformers
-    tzdata
-    uvicorn
-  ];
-
-  nativeCheckInputs =
-    with python3.pkgs;
-    [
-      freezegun
-      factory-boy
-      pytest-xdist
-      trio
-      psutil
-      pytest-django
-      pytestCheckHook
-    ]
-    ++ [
-      (postgresql.withPackages (p: with p; [ pgvector ]))
-      postgresqlTestHook
-    ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  pythonImportsCheck = [
-    "khoj"
-  ];
-
-  disabledTests = [
-    # Tests require network access
-    "test_different_user_data_not_accessed"
-    "test_get_api_config_types"
-    "test_get_configured_types_via_api"
-    "test_image_metadata"
-    "test_image_search"
-    "test_image_search_by_filepath"
-    "test_image_search_query_truncated"
-    "test_index_update"
-    "test_index_update_with_no_auth_key"
-    "test_notes_search"
-    "test_notes_search_with_exclude_filter"
-    "test_notes_search_with_include_filter"
-    "test_parse_html_plaintext_file"
-    "test_regenerate_index_with_new_entry"
-    "test_regenerate_with_github_fails_without_pat"
-    "test_regenerate_with_invalid_content_type"
-    "test_regenerate_with_valid_content_type"
-    "test_search_for_user2_returns_empty"
-    "test_search_with_invalid_auth_key"
-    "test_search_with_invalid_content_type"
-    "test_search_with_no_auth_key"
-    "test_search_with_valid_content_type"
-    "test_text_index_same_if_content_unchanged"
-    "test_text_indexer_deletes_embedding_before_regenerate"
-    "test_text_search"
-    "test_text_search_setup_batch_processes"
-    "test_update_with_invalid_content_type"
-    "test_user_no_data_returns_empty"
-
-    # Tests require rapidocr-onnxruntime
-    "test_multi_page_pdf_to_jsonl"
-    "test_single_page_pdf_to_jsonl"
-    "test_ocr_page_pdf_to_jsonl"
-  ];
-
-  disabledTestPaths = [
-    # Tests require network access
-    "tests/test_conversation_utils.py"
-  ];
-
-  meta = {
-    description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos";
-    homepage = "https://github.com/debanjum/khoj";
-    changelog = "https://github.com/debanjum/khoj/releases/tag/${version}";
-    license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ dit7ya ];
-    broken = true; # last successful build 2024-01-10
-  };
-}
diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index cb2512e7e0cf..8daf15c17682 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -5,31 +5,36 @@
   makeWrapper,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kibi";
-  version = "0.2.2";
+  version = "0.3.1";
 
-  cargoHash = "sha256-7SOkREsGiolT5LxLAbjZe3aAYBT/AlhlOXDlDmoei9w=";
+  cargoHash = "sha256-IF7pcatGJDcwTmBziB8hVWJkleoV+pXXRQnbYfQtBJE=";
 
   src = fetchFromGitHub {
     owner = "ilai-deutel";
     repo = "kibi";
-    rev = "v${version}";
-    sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-EXobpuVob4RD37LK0RlpCGXACfemm+e+JczYYPNDhrc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     install -Dm644 syntax.d/* -t $out/share/kibi/syntax.d
+    install -Dm644 kibi.desktop -t $out/share/applications
+    install -Dm0644 assets/logo.svg $out/share/icons/hicolor/scalable/apps/kibi.svg
     wrapProgram $out/bin/kibi --prefix XDG_DATA_DIRS : "$out/share"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Text editor in ≤1024 lines of code, written in Rust";
     homepage = "https://github.com/ilai-deutel/kibi";
-    license = licenses.mit;
-    maintainers = with maintainers; [ robertodr ];
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ robertodr ];
     mainProgram = "kibi";
   };
-}
+})
diff --git a/pkgs/by-name/ki/kics/package.nix b/pkgs/by-name/ki/kics/package.nix
index 2a664e684694..4e44c1e698d5 100644
--- a/pkgs/by-name/ki/kics/package.nix
+++ b/pkgs/by-name/ki/kics/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kics";
-  version = "2.1.13";
+  version = "2.1.14";
 
   src = fetchFromGitHub {
     owner = "Checkmarx";
     repo = "kics";
     tag = "v${version}";
-    hash = "sha256-7ulu5PVCD6VoIj7RVpBGzsb9uWctOkVfYVb8qB5YMB0=";
+    hash = "sha256-VcVF0vqlMNpVR/KmeZV75j16NxWg5iuhEy54NeNK4pY=";
   };
 
-  vendorHash = "sha256-kKK3kSWjork6KZdPzKySsiHR0bOLKlzltP/u6ZQioqM=";
+  vendorHash = "sha256-tcJ1df9hetzDSxoTP3lvY8ixh6VWsliGJqzXHshmc9A=";
 
   subPackages = [ "cmd/console" ];
 
diff --git a/pkgs/by-name/ki/kide/package.nix b/pkgs/by-name/ki/kide/package.nix
new file mode 100644
index 000000000000..ae5cdbde45d9
--- /dev/null
+++ b/pkgs/by-name/ki/kide/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  cargo-tauri,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  wrapGAppsHook4,
+  openssl,
+  webkitgtk_4_1,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "kide";
+  version = "1.0.40";
+
+  src = fetchFromGitHub {
+    owner = "openobserve";
+    repo = "kide";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lRkFPS+hkACj3CxWde4B7phHUMh+2643Jgd0Wt3nUSo=";
+  };
+
+  cargoHash = "sha256-/PdUaSW7YMFDgMFqA+7ePNPraPhMSNqFaONIEFubtNc=";
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-1BY2oEnpldl+m8hUg9bszAyR67M8ErbcNaNE676c9hU=";
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    npmHooks.npmConfigHook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
+
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    webkitgtk_4_1
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast and lightweight Kubernetes IDE";
+    homepage = "https://github.com/openobserve/kide";
+    changelog = "https://github.com/openobserve/kide/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    inherit (cargo-tauri.hook.meta) platforms;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "kide";
+  };
+})
diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix
index 51a03e71f0b3..3efd7d527be2 100644
--- a/pkgs/by-name/ki/killerbee/package.nix
+++ b/pkgs/by-name/ki/killerbee/package.nix
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
   buildInputs = [ libgcrypt ];
 
   dependencies = with python3.pkgs; [
+    pycrypto
     pyserial
     pyusb
     rangeparser
diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix
index 1de95f77d260..f5106139344a 100644
--- a/pkgs/by-name/ki/kind2/package.nix
+++ b/pkgs/by-name/ki/kind2/package.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "kind2";
     homepage = "https://github.com/higherorderco/kind";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 4921d202bb15..d186b24ecdd4 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -15,7 +15,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
-  version = "0.3.9";
+  version = "0.4.0";
   pname = "kiro";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index 152efbf82274..b58ceb2c1e24 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -1,14 +1,14 @@
 {
   "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510022241--distro-linux-x64-tar-gz/202510022241-distro-linux-x64.tar.gz",
-    "hash": "sha256-1XdGN4Pp8EwDqQNQxfPT6mpV8uZLDqtCS/m3EUtGkeI="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329--distro-linux-x64-tar-gz/202510142329-distro-linux-x64.tar.gz",
+    "hash": "sha256-Pi96jAd2qZNCk/LSv9f5n08VzOS3WwaW+eI+8PIwM9I="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510022241-Kiro-dmg-darwin-x64.dmg",
-    "hash": "sha256-VsXbpChRMyJBb1JTJivY5Tr+bi2Aita97f3RduaU8xE="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-x64.dmg",
+    "hash": "sha256-wjUyT9KF3Tg5M6Ad01sxhZlin1WySF0Tci1dAPlvh04="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510022241-Kiro-dmg-darwin-arm64.dmg",
-    "hash": "sha256-nUXtIb3WxJrr1Q4XpGXbP9k9r4vBboZq5YWBUNFgIIk="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-arm64.dmg",
+    "hash": "sha256-Bsul3QLJ9qbDPBnhUu7Stk4wz1yJkYk9eMrtUyQ4rbU="
   }
 }
diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix
index deba8d723e87..43677310ba31 100644
--- a/pkgs/by-name/ki/kismet/package.nix
+++ b/pkgs/by-name/ki/kismet/package.nix
@@ -6,6 +6,7 @@
   elfutils,
   fetchFromGitHub,
   glib,
+  libbtbb,
   libcap,
   libmicrohttpd,
   libnl,
@@ -13,6 +14,7 @@
   libusb1,
   libwebsockets,
   lm_sensors,
+  mosquitto,
   networkmanager,
   nix-update-script,
   nixosTests,
@@ -22,6 +24,7 @@
   protobuf,
   protobufc,
   python3,
+  rtl-sdr-librtlsdr,
   sqlite,
   withNetworkManager ? false,
   withPython ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
@@ -31,13 +34,13 @@
 
 stdenv.mkDerivation (finalPackage: {
   pname = "kismet";
-  version = "2023-07-R2";
+  version = "2025-09-R1";
 
   src = fetchFromGitHub {
     owner = "kismetwireless";
     repo = "kismet";
     tag = "kismet-${finalPackage.version}";
-    hash = "sha256-QwTjjZHnrlATFvHK9PLDTt76UjfZdzCmV6uXVgIMIYg=";
+    hash = "sha256-bwgeBIa5P1he0azWBu1YTXS9EGlHdJK8hS6A5Rj9XU4=";
   };
 
   postPatch = ''
@@ -76,6 +79,7 @@ stdenv.mkDerivation (finalPackage: {
   buildInputs = [
     binutils
     elfutils
+    libbtbb
     libcap
     libmicrohttpd
     libnl
@@ -83,9 +87,11 @@ stdenv.mkDerivation (finalPackage: {
     openssl
     libusb1
     libwebsockets
+    mosquitto
     pcre2
     protobuf
     protobufc
+    rtl-sdr-librtlsdr
     sqlite
     zlib
   ]
diff --git a/pkgs/by-name/ki/kissat/package.nix b/pkgs/by-name/ki/kissat/package.nix
index 29d4520c31db..7940d96d0038 100644
--- a/pkgs/by-name/ki/kissat/package.nix
+++ b/pkgs/by-name/ki/kissat/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "kissat";
-  version = "4.0.3";
+  version = "4.0.4";
 
   src = fetchFromGitHub {
     owner = "arminbiere";
     repo = "kissat";
     rev = "rel-${version}";
-    sha256 = "sha256-IlMHtsEYafpbCNZfbeJo1JS5S5qcZQt1aDWjv+xxoqM=";
+    sha256 = "sha256-hgB1U2Pmh1hEyNA3ej3fXxxf0YjCRgtOuSddRl6s0eo=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ki/kitex/package.nix b/pkgs/by-name/ki/kitex/package.nix
index 6bedec61cc93..be6a542796d8 100644
--- a/pkgs/by-name/ki/kitex/package.nix
+++ b/pkgs/by-name/ki/kitex/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kitex";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchFromGitHub {
     owner = "cloudwego";
     repo = "kitex";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-otTaFW+wYrHdgzuC2ua4sUCTfn6BMmoA4YaWPoYQjK4=";
+    hash = "sha256-1nEyjEnG58+5Xnxcd4XCyTTa17nJfeHr2KJCaPcazhE=";
   };
 
   vendorHash = "sha256-9o+9HVC6WRhKhAKnN6suumNBKS2y392A6vQCQYtRsfM=";
diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 3e8338697784..95dcc43a47c9 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -45,27 +45,26 @@
   makeBinaryWrapper,
   autoSignDarwinBinariesHook,
   cairo,
-  fetchpatch,
 }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.43.1";
+  version = "0.44.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-Wd61Q1sG55oDxPuHJpmvSWuptwJIuzgn2sB/dzNRc1c=";
+    hash = "sha256-5MBYj1d/KhTFcijLMLXpmHPeuSAXuOjzjganUpWnVF4=";
   };
 
   goModules =
     (buildGo124Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-bjtzvEQmpsrwD0BArw9N6/HqMB3T5xeqxpx89FV7p2A=";
+      vendorHash = "sha256-Afk/I/+4KHcFJ4r3/RSs+G5V6aTa+muwERoMD0wi6Io=";
     }).goModules;
 
   buildInputs = [
@@ -219,9 +218,13 @@ buildPythonApplication rec {
 
     substituteInPlace kitty_tests/ssh.py \
       --replace test_ssh_connection_data no_test_ssh_connection_data \
+      --replace test_ssh_shell_integration no_test_ssh_shell_integration \
+      --replace test_ssh_copy no_test_ssh_copy \
+      --replace test_ssh_env_vars no_test_ssh_env_vars
 
     substituteInPlace kitty_tests/shell_integration.py \
-      --replace test_fish_integration no_test_fish_integration
+      --replace test_fish_integration no_test_fish_integration \
+      --replace test_zsh_integration no_test_zsh_integration
 
     substituteInPlace kitty_tests/fonts.py \
       --replace test_fallback_font_not_last_resort no_test_fallback_font_not_last_resort
@@ -237,7 +240,6 @@ buildPythonApplication rec {
 
     # Fontconfig error: Cannot load default config file: No such file: (null)
     export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
-
     # Required for `test_ssh_shell_integration` to pass.
     export TERM=kitty
 
diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix
index 663b36427b3d..f09cd82309dc 100644
--- a/pkgs/by-name/km/kmon/package.nix
+++ b/pkgs/by-name/km/kmon/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "kmon";
diff --git a/pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch b/pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch
new file mode 100644
index 000000000000..0f61cf406897
--- /dev/null
+++ b/pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32e2840..f21e7ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,7 +183,7 @@ if (PkgConfig_FOUND)
+ endif()
+ 
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets Svg Xml Test PrintSupport)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql SqlPrivate Concurrent QuickWidgets)
+ 
+ find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Archive CoreAddons Config ConfigWidgets Crash I18n Completion KCMUtils ItemModels ItemViews Service XmlGui TextWidgets Notifications KIO)
+ 
+diff --git a/kmymoney/plugins/sqlcipher/CMakeLists.txt b/kmymoney/plugins/sqlcipher/CMakeLists.txt
+index ee6f2e7..aa3fc19 100644
+--- a/kmymoney/plugins/sqlcipher/CMakeLists.txt
++++ b/kmymoney/plugins/sqlcipher/CMakeLists.txt
+@@ -32,10 +32,8 @@ target_link_libraries(qsqlcipher
+   PRIVATE
+     PkgConfig::SQLCIPHER
+ )
+-if (TARGET Qt::SqlPrivate)
+-  target_link_libraries(qsqlcipher PRIVATE Qt::SqlPrivate)
+-endif()
+-target_link_libraries(qsqlcipher PRIVATE Qt::Sql)
++
++target_link_libraries(qsqlcipher PRIVATE Qt::Sql Qt::SqlPrivate)
+ 
+ if(BUILD_TESTING)
+  add_subdirectory(tests)
diff --git a/pkgs/by-name/km/kmymoney/package.nix b/pkgs/by-name/km/kmymoney/package.nix
index d0d9b8a752f5..a50826562ac2 100644
--- a/pkgs/by-name/km/kmymoney/package.nix
+++ b/pkgs/by-name/km/kmymoney/package.nix
@@ -77,6 +77,11 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.woob
   ];
 
+  patches = [
+    # from https://src.fedoraproject.org/rpms/kmymoney/c/8f7f40d7fec6db96610e60a6a99717479594c8bd
+    ./kmymoney-fix-build-against-qt-6-10.patch
+  ];
+
   postPatch = ''
     buildPythonPath "${python3.pkgs.woob}"
     patchPythonScript "kmymoney/plugins/woob/interface/kmymoneywoob.py"
diff --git a/pkgs/by-name/kn/knightos-genkfs/package.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix
index b91d29537a6f..663770b483c2 100644
--- a/pkgs/by-name/kn/knightos-genkfs/package.nix
+++ b/pkgs/by-name/kn/knightos-genkfs/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Utility to write a KFS filesystem into a ROM file";
diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix
index e43d2cd29a33..6b22a5a1ea4e 100644
--- a/pkgs/by-name/kn/knightos-kcc/package.nix
+++ b/pkgs/by-name/kn/knightos-kcc/package.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/KnightOS/kcc";
     description = "KnightOS C compiler";
diff --git a/pkgs/by-name/kn/knightos-kimg/package.nix b/pkgs/by-name/kn/knightos-kimg/package.nix
index 732fc6f8e2b4..acfcf4cd1d8e 100644
--- a/pkgs/by-name/kn/knightos-kimg/package.nix
+++ b/pkgs/by-name/kn/knightos-kimg/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Converts image formats supported by stb_image to the KnightOS image format";
diff --git a/pkgs/by-name/kn/knightos-kpack/package.nix b/pkgs/by-name/kn/knightos-kpack/package.nix
index 3d4cc0595fea..141bdb8b1a4e 100644
--- a/pkgs/by-name/kn/knightos-kpack/package.nix
+++ b/pkgs/by-name/kn/knightos-kpack/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "fortify" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Tool to create or extract KnightOS packages";
diff --git a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
index 850a35df20d2..0a688a809e88 100644
--- a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
+++ b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Makes TI calculator upgrade files from ROM dumps";
diff --git a/pkgs/by-name/kn/knightos-patchrom/package.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix
index 097fffc85698..9f7163e2f0a5 100644
--- a/pkgs/by-name/kn/knightos-patchrom/package.nix
+++ b/pkgs/by-name/kn/knightos-patchrom/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Patches jumptables into TI calculator ROM files and generates an include file";
diff --git a/pkgs/by-name/kn/knightos-scas/package.nix b/pkgs/by-name/kn/knightos-scas/package.nix
index a04b03e6d10f..f3dc7525d961 100644
--- a/pkgs/by-name/kn/knightos-scas/package.nix
+++ b/pkgs/by-name/kn/knightos-scas/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables"
+      --replace-fail "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables" \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
   '';
   strictDeps = true;
 
diff --git a/pkgs/by-name/kn/knightos-z80e/package.nix b/pkgs/by-name/kn/knightos-z80e/package.nix
index 0b39ebfa0999..6b15c23bed03 100644
--- a/pkgs/by-name/kn/knightos-z80e/package.nix
+++ b/pkgs/by-name/kn/knightos-z80e/package.nix
@@ -29,6 +29,15 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-Denable-sdl=YES" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libz80e/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace frontends/libz80e/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Z80 calculator emulator and debugger";
diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix
index 495bb909704e..1b291d8c51ea 100644
--- a/pkgs/by-name/kn/knot-dns/package.nix
+++ b/pkgs/by-name/kn/knot-dns/package.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "d52538bf7364c280999dec58c2a02a405dd922ef5794da1473ca7c3cf7f01277";
+    sha256 = "a614d5226ceed4b4cdd4a3badbb0297ea0f987f65948e4eb828119a3b5ac0a4b";
   };
 
   outputs = [
diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index d82dfba76b08..f0cac58901ec 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -7,8 +7,6 @@
   tk,
   addDriverRunpath,
 
-  apple-sdk_12,
-
   koboldLiteSupport ? true,
 
   config,
@@ -41,13 +39,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.99.4";
+  version = "1.101";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ilBrTMtY6bhns2GcwDckGq4+RqzgzBCg0HJJ4QUx8Co=";
+    hash = "sha256-WwTl+u7FJ4E+x+jjwh0wmPM7fjsPxu7+TrEwKQQfyLA=";
   };
 
   enableParallelBuilding = true;
@@ -57,13 +55,20 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     python3Packages.wrapPython
   ];
 
+  postPatch = ''
+    nixLog "patching $PWD/Makefile to remove explicit linking against CUDA driver"
+    substituteInPlace "$PWD/Makefile" \
+      --replace-fail \
+        'CUBLASLD_FLAGS = -lcuda ' \
+        'CUBLASLD_FLAGS = '
+  '';
+
   pythonInputs = builtins.attrValues { inherit (python3Packages) tkinter customtkinter packaging; };
 
   buildInputs = [
     tk
   ]
   ++ finalAttrs.pythonInputs
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
   ++ lib.optionals cublasSupport [
     cudaPackages.libcublas
     cudaPackages.cuda_nvcc
@@ -96,7 +101,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
     install -Dm755 koboldcpp.py "$out/bin/koboldcpp.unwrapped"
     cp *.so "$out/bin"
-    cp *.embd "$out/bin"
+    cp embd_res/*.embd "$out/bin"
 
     ${lib.optionalString metalSupport ''
       cp *.metal "$out/bin"
diff --git a/pkgs/games/koboredux/default.nix b/pkgs/by-name/ko/koboredux/package.nix
similarity index 98%
rename from pkgs/games/koboredux/default.nix
rename to pkgs/by-name/ko/koboredux/package.nix
index d694266934cf..e51cf8a042e9 100644
--- a/pkgs/games/koboredux/default.nix
+++ b/pkgs/by-name/ko/koboredux/package.nix
@@ -14,7 +14,6 @@
 
 let
   inherit (lib)
-    and
     licenses
     maintainers
     optional
@@ -27,8 +26,8 @@ let
 
   main_src = fetchFromGitHub {
     owner = "olofson";
-    repo = pname;
-    rev = "v${version}";
+    repo = "koboredux";
+    tag = "v${version}";
     sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
   };
 
diff --git a/pkgs/by-name/ko/kokkos/package.nix b/pkgs/by-name/ko/kokkos/package.nix
index 51ec26644676..541c5294e0b3 100644
--- a/pkgs/by-name/ko/kokkos/package.nix
+++ b/pkgs/by-name/ko/kokkos/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kokkos";
-  version = "4.7.00";
+  version = "4.7.01";
 
   src = fetchFromGitHub {
     owner = "kokkos";
     repo = "kokkos";
     rev = finalAttrs.version;
-    hash = "sha256-KCGUv6SnTfKiWw0zzvKgiggANPCxSQY8bmqQT4xTMb8=";
+    hash = "sha256-l5vSYaUtavQLjBSbKHGK2/JtgKzO2KD5+mcPPnWKNkI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 3cde789aeab0..3572acb97885 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  jdk23_headless,
+  jdk25_headless,
   libwebp, # Fixes https://github.com/gotson/komga/issues/1294
   nixosTests,
 }:
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   buildCommand = ''
-    makeWrapper ${jdk23_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \
+    makeWrapper ${jdk25_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libwebp ]}
   '';
 
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Free and open source comics/mangas server";
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
-    platforms = jdk23_headless.meta.platforms;
+    platforms = jdk25_headless.meta.platforms;
     maintainers = with lib.maintainers; [
       tebriel
       govanify
diff --git a/pkgs/by-name/ko/komorebi/package.nix b/pkgs/by-name/ko/komorebi/package.nix
index 8500661395e1..5983473634c7 100644
--- a/pkgs/by-name/ko/komorebi/package.nix
+++ b/pkgs/by-name/ko/komorebi/package.nix
@@ -8,7 +8,7 @@
   glib,
   gtk3,
   libgee,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   clutter-gtk,
   clutter-gst,
   ninja,
@@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib
     gtk3
     libgee
-    webkitgtk_4_0
+    # webkitgtk_4_0
     clutter-gtk
     clutter-gst
   ];
@@ -47,6 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Beautiful and customizable wallpaper manager for Linux";
     homepage = "https://github.com/Komorebi-Fork/komorebi";
     license = licenses.gpl3Only;
diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix
index 5527f9ffb065..d55de0b4339c 100644
--- a/pkgs/by-name/ko/kool/package.nix
+++ b/pkgs/by-name/ko/kool/package.nix
@@ -37,6 +37,6 @@ buildGoModule rec {
     homepage = "https://kool.dev";
     changelog = "https://github.com/kool-dev/kool/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ko/kor/package.nix b/pkgs/by-name/ko/kor/package.nix
index e6327b1a04fb..dc018b111c46 100644
--- a/pkgs/by-name/ko/kor/package.nix
+++ b/pkgs/by-name/ko/kor/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "kor";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchFromGitHub {
     owner = "yonahd";
     repo = "kor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hGiak28gwxwYOogYyZjTgQ+aGSumxzeZiQKlbVvvrIU=";
+    hash = "sha256-lHNRd3FmcVJduq0XA1r+FqRj0OVmNr22B4Hq/GrnHFs=";
   };
 
-  vendorHash = "sha256-a7B0cJi71mqGDPbXaWYKZ2AeuuQyNDxwWNgahTN5AW8=";
+  vendorHash = "sha256-bdnO4Rt0w0rV6/t5u0e0iwkYfbrtRfh6mIzyshT9wlQ=";
 
   nativeCheckInputs = [ writableTmpDirAsHomeHook ];
 
diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix
index 41792f04b475..72020cfba7b5 100644
--- a/pkgs/by-name/kp/kphotoalbum/package.nix
+++ b/pkgs/by-name/kp/kphotoalbum/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kphotoalbum";
-  version = "6.0.1";
+  version = "6.1.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/kphotoalbum/${finalAttrs.version}/kphotoalbum-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LLsQ66wKDg77nZUIxjcfzvC3AwLOtojuuDgkJm2dsww=";
+    hash = "sha256-fznB/B2VriB+Wt6ZxrPrNoJP45AuK1vV4ONpAHYwUlY=";
   };
 
   env.LANG = "C.UTF-8";
diff --git a/pkgs/by-name/kr/krane/Gemfile.lock b/pkgs/by-name/kr/krane/Gemfile.lock
index 575ec68cb184..3b24fe405760 100644
--- a/pkgs/by-name/kr/krane/Gemfile.lock
+++ b/pkgs/by-name/kr/krane/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.0)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -17,15 +17,14 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.3.1)
     colorize (0.8.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     domain_name (0.6.20240107)
     drb (2.2.3)
     ejson (1.5.3)
-    faraday (2.13.2)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -39,11 +38,11 @@ GEM
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
     google-logging-utils (0.2.0)
-    googleauth (1.14.0)
+    googleauth (1.15.1)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 3.0)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -53,17 +52,17 @@ GEM
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.5.0)
     http-accept (1.7.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
+    json (2.15.1)
     jsonpath (1.1.5)
       multi_json
-    jwt (2.10.2)
+    jwt (3.1.2)
       base64
-    krane (3.7.4)
+    krane (3.8.1)
       activesupport (>= 5.0)
       colorize (~> 0.8)
       concurrent-ruby (~> 1.1)
@@ -74,7 +73,7 @@ GEM
       multi_json
       statsd-instrument (>= 2.8, < 3.9)
       thor (>= 1.0, < 2.0)
-    kubeclient (4.12.0)
+    kubeclient (4.13.0)
       http (>= 3.0, < 6.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
@@ -86,14 +85,14 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0708)
-    minitest (5.25.5)
-    multi_json (1.16.0)
+    mime-types-data (3.2025.0924)
+    minitest (5.26.0)
+    multi_json (1.17.0)
     net-http (0.6.0)
       uri
     netrc (0.11.0)
     os (1.1.4)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     public_suffix (6.0.2)
     rake (13.3.0)
     recursive-open-struct (1.3.1)
@@ -104,16 +103,16 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     securerandom (0.4.1)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     statsd-instrument (3.8.0)
-    thor (1.3.2)
+    thor (1.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.0.4)
 
 PLATFORMS
   ruby
@@ -122,4 +121,4 @@ DEPENDENCIES
   krane
 
 BUNDLED WITH
-   2.6.9
+   2.7.1
diff --git a/pkgs/by-name/kr/krane/gemset.nix b/pkgs/by-name/kr/krane/gemset.nix
index ca64d83b87ad..05c292060499 100644
--- a/pkgs/by-name/kr/krane/gemset.nix
+++ b/pkgs/by-name/kr/krane/gemset.nix
@@ -2,12 +2,12 @@
   activesupport = {
     dependencies = [
       "base64"
-      "benchmark"
       "bigdecimal"
       "concurrent-ruby"
       "connection_pool"
       "drb"
       "i18n"
+      "json"
       "logger"
       "minitest"
       "securerandom"
@@ -18,10 +18,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
+      sha256 = "02h73s0cimsfx81vgkaw1jx4cnhp3gs6qslk2qmbqyxy4l3z9bfl";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "8.1.0";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -44,25 +44,15 @@
     };
     version = "0.3.0";
   };
-  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";
+      sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.3.1";
   };
   colorize = {
     groups = [ "default" ];
@@ -89,10 +79,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "2.5.4";
   };
   domain_name = {
     groups = [ "default" ];
@@ -134,10 +124,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06ia9z1wxydn0nmddinnjr93qdv856gi3i87h0fycy5y7cp7c6aw";
+      sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
       type = "gem";
     };
-    version = "2.13.2";
+    version = "2.14.0";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -212,10 +202,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jai8xv2rmhz8nb6vxg4whq6aldmkbyjsn3hvk9w740qg48xxrv2";
+      sha256 = "096bsg1z4yyqxrdmnxdbb45g94dr2fb8hf2av40kcmqd7n4n06fn";
       type = "gem";
     };
-    version = "1.14.0";
+    version = "1.15.1";
   };
   http = {
     dependencies = [
@@ -249,10 +239,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
+      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.1.0";
   };
   http-form_data = {
     groups = [ "default" ];
@@ -280,10 +270,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
+      sha256 = "128bp3mihh175l9wm7hgg9sdisp6hd3kf36fw01iksqnq7kv5hdi";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.15.1";
   };
   jsonpath = {
     dependencies = [ "multi_json" ];
@@ -302,10 +292,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
+      sha256 = "0dfm4bhl4fzn076igh0bmh2v1vphcrxdv6ldc46hdd3bkbqr2sdg";
       type = "gem";
     };
-    version = "2.10.2";
+    version = "3.1.2";
   };
   krane = {
     dependencies = [
@@ -324,10 +314,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pf71cvx3c57znasj2mr5fvia47iz6zhviy1yjz1wiqnd39bv85j";
+      sha256 = "0mgim57lx8dqdygzzy4qlmq2rmrh0hf8cz1ihx1zqm5477ywg4wj";
       type = "gem";
     };
-    version = "3.7.4";
+    version = "3.8.1";
   };
   kubeclient = {
     dependencies = [
@@ -340,10 +330,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g89qd1hhf111zy9djlzblzz06pnv59zmamh6fk06wvnih7vj446";
+      sha256 = "14q6vsfrlmz1ja3p4qh58a5m2ljd24hmn33750rr7qb18jqndxji";
       type = "gem";
     };
-    version = "4.12.0";
+    version = "4.13.0";
   };
   llhttp-ffi = {
     dependencies = [
@@ -388,30 +378,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nxrxm1g02a049zcjv859pzjbkwy22ljlz97r6jd5n42scvb92ch";
+      sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
       type = "gem";
     };
-    version = "3.2025.0708";
+    version = "3.2025.0924";
   };
   minitest = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm";
       type = "gem";
     };
-    version = "5.25.5";
+    version = "5.26.0";
   };
   multi_json = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dknzbz2awgwp09gkvbw0423r53bc8ziwchrg2g852crnqh327qi";
+      sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
       type = "gem";
     };
-    version = "1.16.0";
+    version = "1.17.0";
   };
   net-http = {
     dependencies = [ "uri" ];
@@ -449,10 +439,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h6gazp5837xbz1aqvq9x0a5ffpw32nhvknn931a4074k6i04wvd";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.3";
   };
   public_suffix = {
     groups = [ "default" ];
@@ -522,10 +512,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw";
+      sha256 = "0nydm087m5c3j85gvzvz30w1qb9pl2lzpznw746jha29ybxyj5yn";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "0.21.0";
   };
   statsd-instrument = {
     groups = [ "default" ];
@@ -542,10 +532,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
@@ -563,9 +553,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      sha256 = "0jrl2vkdvc5aq8q3qvjmmrgjxfm784w8h7fal19qg7q7gh9msj1l";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.0.4";
   };
 }
diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix
index 7bd2dd09ab6e..f319154c4ec7 100644
--- a/pkgs/by-name/kr/kronosnet/package.nix
+++ b/pkgs/by-name/kr/kronosnet/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kronosnet";
-  version = "1.31";
+  version = "1.32";
 
   src = fetchFromGitHub {
     owner = "kronosnet";
     repo = "kronosnet";
     rev = "v${version}";
-    sha256 = "sha256-PZWaKrCy0S8d/x3GMh7X2wEiHwgiuEFpfCwKpbLvhsc=";
+    sha256 = "sha256-g2AgVAFEmRlMaqH7uRabSNJP0ehUQ6Iws4LT2iB8kTA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix
new file mode 100644
index 000000000000..230317284893
--- /dev/null
+++ b/pkgs/by-name/kr/krunkit/package.nix
@@ -0,0 +1,58 @@
+{
+  cargo,
+  darwin,
+  pkg-config,
+  rustc,
+  stdenv,
+  fetchFromGitHub,
+  libepoxy,
+  libkrun-efi,
+  rustPlatform,
+  lib,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "krunkit";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = "krunkit";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dsEZZiLgHyd6xeXZCdDd4zsxzwQeIhAK+lewY2ZfvpY=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-i0cC3aOEqcvOcwTPbM6AazMzd8Q+QLwuhnvPGv3ntsc=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    darwin.sigtool
+    pkg-config
+    rustc
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs = [
+    libepoxy
+    libkrun-efi
+  ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  # This is necessary in order for the binary to keep its entitlements
+  dontStrip = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Launch configurable virtual machines with libkrun";
+    homepage = "https://github.com/containers/krunkit";
+    license = lib.licenses.asl20;
+    platforms = [ "aarch64-darwin" ];
+    maintainers = with lib.maintainers; [ quinneden ];
+  };
+})
diff --git a/pkgs/by-name/ks/ksh/package.nix b/pkgs/by-name/ks/ksh/package.nix
index 86f06ae20266..b0780eebc8c1 100644
--- a/pkgs/by-name/ks/ksh/package.nix
+++ b/pkgs/by-name/ks/ksh/package.nix
@@ -50,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/att/ast";
     license = lib.licenses.cpl10;
     maintainers = with lib.maintainers; [ sigmanificient ];
+    mainProgram = "ksh";
     platforms = lib.platforms.all;
   };
 
diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix
index 92560f8ec3a3..c0cf5700f06c 100644
--- a/pkgs/by-name/ks/kstars/package.nix
+++ b/pkgs/by-name/ks/kstars/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   cfitsio,
   cmake,
   curl,
@@ -22,19 +23,29 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kstars";
-  version = "3.7.8";
+  version = "3.7.9";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VbOu8p7Bq6UJBr05PVZein4LWzpdLo4838G1jXGNLAw=";
+    hash = "sha256-aE2gtAGzLBcUk+Heg+ZOMLd1wX6VEbrSpxkWETmlEZc=";
   };
 
+  # Qt 6.10 build patch from master
+  # can be removed with next release
+  patches = [
+    (fetchpatch2 {
+      url = "https://invent.kde.org/education/kstars/-/commit/ce53888e6dbaeb1b9239fca55288b5ead969b5a7.diff";
+      hash = "sha256-awZeOLlG1vlCWC+QfypqHIIYexpywRmNT1ACdkqqLt4=";
+    })
+  ];
+
   nativeBuildInputs = with kdePackages; [
     extra-cmake-modules
     kdoctools
     wrapQtAppsHook
     cmake
   ];
+
   buildInputs = with kdePackages; [
     breeze-icons
     cfitsio
@@ -70,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = with lib.strings; [
-    (cmakeBool "BUILD_QT5" false)
+    (cmakeBool "BUILD_WITH_QT6" true)
     (cmakeFeature "INDI_PREFIX" "${indi-full}")
     (cmakeFeature "XPLANET_PREFIX" "${xplanet}")
     (cmakeFeature "DATA_INSTALL_DIR" (placeholder "out") + "/share/kstars/")
diff --git a/pkgs/by-name/kt/ktailctl/package.nix b/pkgs/by-name/kt/ktailctl/package.nix
index 26207bd9d4de..3f684aed23cf 100644
--- a/pkgs/by-name/kt/ktailctl/package.nix
+++ b/pkgs/by-name/kt/ktailctl/package.nix
@@ -1,9 +1,9 @@
 {
-  buildGo124Module,
+  buildGoModule,
   cmake,
   fetchFromGitHub,
   git,
-  go_1_24,
+  go,
   lib,
   nlohmann_json,
   stdenv,
@@ -11,21 +11,21 @@
 }:
 
 let
-  version = "0.21.2";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
     rev = "v${version}";
-    hash = "sha256-CP5ivqhYVCotsL6e9eV9L1OGr2W+vNHJOq8hMYj7g/o=";
+    hash = "sha256-BKVq6d8CDmAOGULKoxXtlGbtgNu7wfsQnsyYV7PiFfc=";
   };
 
   goDeps =
-    (buildGo124Module {
+    (buildGoModule {
       pname = "ktailctl-go-wrapper";
       inherit src version;
       modRoot = "src/wrapper";
-      vendorHash = "sha256-uZydTufEpGKbX3T3Zm4WTU2ZZNhC6oHSb/sHPM4ekmQ=";
+      vendorHash = "sha256-RhVZ1yXm+gJHM993Iw1XM/w/O1YiG6Mt4YMK+0JqRpg=";
     }).goModules;
 in
 stdenv.mkDerivation {
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     cmake
     extra-cmake-modules
     git
-    go_1_24
+    go
     wrapQtAppsHook
   ];
 
diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix
index acdc19dca812..671c53a75f8d 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.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "ktls-utils";
     rev = "ktls-utils-${version}";
-    hash = "sha256-aCn9qBD1bh7VFSSrC1uR/XPfFI+YC/gylCr7tSs56VQ=";
+    hash = "sha256-xBh9iSmTf8YCfahWnJvDx/nvz91NFZ3AiJ2JYs+pMfY=";
   };
 
   nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/oracle/ktls-utils/blob/${src.rev}/NEWS";
     license = licenses.gpl2Only;
     maintainers = [ ];
-    mainProgram = "ktls-utils";
+    mainProgram = "tlshd";
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ku/kubazip/package.nix b/pkgs/by-name/ku/kubazip/package.nix
new file mode 100644
index 000000000000..1b3d786290a9
--- /dev/null
+++ b/pkgs/by-name/ku/kubazip/package.nix
@@ -0,0 +1,44 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kubazip";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "kuba--";
+    repo = "zip";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wNkIYuwwXo7v3vNaOnRZt1tcd0RGjDvCUqDGdvJzVdo=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Portable, simple zip library written in C";
+    homepage = "https://github.com/kuba--/zip";
+    changelog = "https://github.com/kuba--/zip/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+  };
+})
diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix
index 6b3bd12cbb70..d9d1aeff0645 100644
--- a/pkgs/by-name/ku/kube-bench/package.nix
+++ b/pkgs/by-name/ku/kube-bench/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "kube-bench";
-  version = "0.13.0";
+  version = "0.14.0";
 
   __darwinAllowLocalNetworking = true; # required for tests
 
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
     owner = "aquasecurity";
     repo = "kube-bench";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5P8kF8k25E7dezhQ7oKKlu/6y9Ofq3nAeenAI7IOBwE=";
+    hash = "sha256-zu1ckblQnn3Df71myPIYebIQHjMi7S3LoSbsY8RAiVQ=";
   };
 
-  vendorHash = "sha256-vueIQbsF34lkmIFpH8DiOSjxEBevxxiJLd0L/sQwJBE=";
+  vendorHash = "sha256-qRtEkYL+OgcfdYS+u2vRynr+6w6ZEEURxOXE/vCt2fM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix
index 607b6154d6b2..ac9cdc86b609 100644
--- a/pkgs/by-name/ku/kube-router/package.nix
+++ b/pkgs/by-name/ku/kube-router/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "kube-router";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "cloudnativelabs";
     repo = "kube-router";
     rev = "v${version}";
-    hash = "sha256-lNCp/84T9al7gfZb1PkqZxtsu3XY16b7f6IUVrFSrNQ=";
+    hash = "sha256-VGbjXjBhfsgIW0uIP8I8KRb4J/+4SRJBpN5ebRP40EY=";
   };
 
   vendorHash = "sha256-fXZ6jRlFdjYPV5wqSdWAMlHj1dkkEpbCtcKMuuoje1U=";
diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 84a32bce1016..df1cd3d29cfd 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-cnpg";
-  version = "1.27.0";
+  version = "1.27.1";
 
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
     rev = "v${version}";
-    hash = "sha256-GDPVrGWawzuOjTCtXIDFH2XUQ6Ot3i+w4x61QK3TyIE=";
+    hash = "sha256-iEia3g3nxnVm4q5lpV9SFOSKgHJsZ7jdqE73vA2bPpI=";
   };
 
-  vendorHash = "sha256-CekPp3Tmte08DdFulVTNxlh4OuWz+ObqQ9jDd5b+Qn8=";
+  vendorHash = "sha256-nbUaSTmhAViwkguMsgIp3lh2JVe7ZTwBTM7oE1aIulk=";
 
   subPackages = [ "cmd/kubectl-cnpg" ];
 
diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 0602263f0c12..fbf0d59eba9c 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-gadget";
-  version = "0.44.1";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     rev = "v${version}";
-    hash = "sha256-S3LF07KY8AwEU8xqgkl4XNNNdygmy0ILfQKVScponlk=";
+    hash = "sha256-y5eqkTt9CnEPOyFERWhBPqrgnMGaVuWN2FoDV0pDjdI=";
   };
 
-  vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg=";
+  vendorHash = "sha256-TBaMbIwR/7MzPn8rYgjqeMLma3arwr5W9HiTztd8z9E=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix
index 43a4a543ed98..f4ad59ffdf8a 100644
--- a/pkgs/by-name/ku/kubedb-cli/package.nix
+++ b/pkgs/by-name/ku/kubedb-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubedb-cli";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "kubedb";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-DfvYWA2D+TuIz5nQnzFHatR9yl8nos7byMz7uK+q7w0=";
+    hash = "sha256-gM61Om1qNbzeHWAzLbgUlHsZPzBNzyFN8r9PoS3Pf1c=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix
index 086c991d9c42..f1ed50cc65a4 100644
--- a/pkgs/by-name/ku/kubedock/package.nix
+++ b/pkgs/by-name/ku/kubedock/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubedock";
-  version = "0.18.2";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "joyrex2001";
     repo = "kubedock";
     rev = version;
-    hash = "sha256-95C14Vo3QbHR/PEIPoLECCq9hhLg0Q7iThvdfaV6/lY=";
+    hash = "sha256-HGaXiYuOVI1lMomT+WnyPUEpShBv8qVbJIOt0j2FK58=";
   };
 
-  vendorHash = "sha256-iTXpODO45oUgpSvKmjLBQWAVDHLrOYN6iBL/58dd1Mg=";
+  vendorHash = "sha256-D3jsBWbeZzIFomUoUNR762OwnmPF9Wg9bxdt1KsP6s8=";
 
   # config.Build not defined as it would break r-ryantm
   ldflags = [
diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix
index 5eacae3c838c..06a0ffa2cbbf 100644
--- a/pkgs/by-name/ku/kubefirst/package.nix
+++ b/pkgs/by-name/ku/kubefirst/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubefirst";
-  version = "2.10.2";
+  version = "2.10.3";
 
   src = fetchFromGitHub {
     owner = "konstructio";
     repo = "kubefirst";
     tag = "v${version}";
-    hash = "sha256-AjVShJEsZczDc0iD4RWF0Q+xlhN/bkl4ESh+ESoxejM=";
+    hash = "sha256-fYoW32WukwyMtXC6LZ9nyBAvvPbk3z5TkdYXhb+Mz9k=";
   };
 
   vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w=";
diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index b2ffae8d0c14..d8c4cd110a3b 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubelogin";
-  version = "1.34.1";
+  version = "1.34.2";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zAIiNpzYr4aVR4O93y9S9aiGUgeg9xlj7wFn4vh43zY=";
+    hash = "sha256-Uk8zsOrX1mrOofl6pUCTPUye463fyCKDcK09IA6uwtw=";
   };
 
   subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
     "-X main.version=v${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-LF6Esggl7ygC/t9lCZGzZIZtukCbMFCAo2RFLbvEnoU=";
+  vendorHash = "sha256-WZ7tJufvgclC6xKQNXmVcf0HAmqBH9bKSu3TFzWSYdI=";
 
   # test all packages
   preCheck = ''
diff --git a/pkgs/by-name/ku/kubelogin/package.nix b/pkgs/by-name/ku/kubelogin/package.nix
index ff9b96885f97..917ef3c47e1e 100644
--- a/pkgs/by-name/ku/kubelogin/package.nix
+++ b/pkgs/by-name/ku/kubelogin/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "kubelogin";
-  version = "0.2.11";
+  version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "kubelogin";
     rev = "v${version}";
-    sha256 = "sha256-MbWplD4u5qrLKLF1stQK4SHNAxQYnFNKJmdq25zsZwU=";
+    sha256 = "sha256-n9YkfK8QhGG4aGlU/SBtv59d05in1B8/mrsK4bDbjWo=";
   };
 
   vendorHash = "sha256-0tZ96t2Yeghe8xvEL9vjBS/gEUUIhyy61olqOlLD6q8=";
diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
index d6cb4f3a5554..8ac6c5fdc82d 100644
--- a/pkgs/by-name/ku/kubernetes-polaris/package.nix
+++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubernetes-polaris";
-  version = "10.1.1";
+  version = "10.1.2";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "polaris";
     rev = version;
-    sha256 = "sha256-1viEKPU+V+VqFDnrtjSTvNLtgE3TB1ijKv1YOz6AAUo=";
+    sha256 = "sha256-wu/Ouozi89y1abFgDk16uqBHoYDQDIzoqPgwA0BofLo=";
   };
 
-  vendorHash = "sha256-4eznwhNf3anhs+GlZGrHJWAproej0dO2NbzfhJeReNY=";
+  vendorHash = "sha256-ihA9RJDFHePox1G47Jr4Q1NSVJ9k5KDXgm8KTe2wYBQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
index 2c9098ab25fa..7b55b7f76acf 100644
--- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
+++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
@@ -14,13 +14,13 @@
 }:
 buildPythonPackage rec {
   pname = "kubernetes-validate";
-  version = "1.33.1";
+  version = "1.34.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "kubernetes_validate";
     inherit version;
-    hash = "sha256-U2Nb9mpeBJASCa5/av8OjBnvoUXMmpCHI0TJKjE1Opk=";
+    hash = "sha256-uC2kR6QG/EdauD4PZ4tkQixZX8EHcN0nMyDCRMm0AxU=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix
index 8e817bff3632..02287b57bd73 100644
--- a/pkgs/by-name/ku/kubernetes/package.nix
+++ b/pkgs/by-name/ku/kubernetes/package.nix
@@ -12,6 +12,7 @@
   nix-update-script,
 
   components ? [
+    "cmd/kubeadm"
     "cmd/kubelet"
     "cmd/kube-apiserver"
     "cmd/kube-controller-manager"
@@ -50,12 +51,7 @@ buildGoModule (finalAttrs: {
 
   patches = [ ./fixup-addonmanager-lib-path.patch ];
 
-  WHAT = lib.concatStringsSep " " (
-    [
-      "cmd/kubeadm"
-    ]
-    ++ components
-  );
+  WHAT = lib.concatStringsSep " " components;
 
   buildPhase = ''
     runHook preBuild
diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix
index 1e073db8e7c9..ee62226bdd88 100644
--- a/pkgs/by-name/ku/kubescape/package.nix
+++ b/pkgs/by-name/ku/kubescape/package.nix
@@ -10,18 +10,18 @@
 
 buildGoModule rec {
   pname = "kubescape";
-  version = "3.0.42";
+  version = "3.0.43";
 
   src = fetchFromGitHub {
     owner = "kubescape";
     repo = "kubescape";
     tag = "v${version}";
-    hash = "sha256-/+n0R7Lj2TReP+OUdhZh+te0XZT2Nd+8nKEFinEtlz0=";
+    hash = "sha256-pIw4joigLCJwHXFZR1qRYVouzvPNv7zHVCaMe8MUd3Q=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-nRS6Ytb/zMsqRWehiPX3E9dX3Rv1gANs3hCEEbu5leY=";
+  vendorHash = "sha256-SOkwLt9BaSnWBuljGBDXMhxw/8kqIrA3peWRLlT53vc=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index 85dad428b3d4..c5a74505bec6 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubetui";
-  version = "1.9.1";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "sarub0b0";
     repo = "kubetui";
     tag = "v${version}";
-    hash = "sha256-2bcFame21oj8kYJaGiBHcZspplLIDuag64AbLGwOvQs=";
+    hash = "sha256-Fa/1A37uP8dYYP5S7qzxKJv7GXVWsRvdzVTmRfQ2n/c=";
   };
 
   checkFlags = [
     "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
   ];
 
-  cargoHash = "sha256-PzGlTTx5cVnMoUx0VQi+s8VHNV/PJDu6bm1TZuHbaoE=";
+  cargoHash = "sha256-CzkXA+e0bcTU8u8Nj1OBj8Ovgzr8aDiW92AVzaYwqpA=";
 
   meta = {
     homepage = "https://github.com/sarub0b0/kubetui";
diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index f7bd3d678bfb..b5354c6261ea 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubevpn";
-  version = "2.9.9";
+  version = "2.9.10";
 
   src = fetchFromGitHub {
     owner = "KubeNetworks";
     repo = "kubevpn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iGharffqrN5Vh9GhoajRjh+2R6hevhvrjtH4WIUq8nw=";
+    hash = "sha256-5yuJfGWNEQ/1ufV1rVze2JrL/67/UlYdG2YH9i+gI3w=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix
index caa5061347e7..934b843ec25c 100644
--- a/pkgs/by-name/ku/kubexporter/package.nix
+++ b/pkgs/by-name/ku/kubexporter/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubexporter";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "bakito";
     repo = "kubexporter";
     tag = "v${version}";
-    hash = "sha256-QdMA/wehzESEkzBEzM1hIlIOzi2G/5QdMG+KlzGtiiU=";
+    hash = "sha256-cSYUR6EfRMLyPNaKDBbwWzpSy7/Gxe9UtnCz+cWHwrw=";
   };
 
-  vendorHash = "sha256-pWmcLjZxGoUkOTrvxxmKBU/GjhMj3LVPJ9menAqFICk=";
+  vendorHash = "sha256-gPjfjOOh2HZaAaZt2FIb/Zy3xYKUNxC9+30TudfnDFQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
index 7496c1ed274c..463a79a43405 100644
--- a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
+++ b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
@@ -258,7 +258,8 @@ symlinkJoin {
     longDescription = ''
       This package contains all the individual migrations in the bin directory.
       This is used by fs-repo-migrations and could also be used by Kubo itself
-      when starting it like this: ipfs daemon --migrate
+      when starting it like this: `ipfs daemon --migrate`
+      or when calling `ipfs repo migrate --to=16`.
     '';
   };
 }
diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix
index fc6930a8dfe7..70636ced3a48 100644
--- a/pkgs/by-name/ku/kubo/package.nix
+++ b/pkgs/by-name/ku/kubo/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "kubo";
-  version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.38.2"; # When updating, also check if the repo version changed and adjust repoVersion below
   rev = "v${version}";
 
-  passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version
+  passthru.repoVersion = "18";
 
   # Kubo makes changes to its source tarball that don't match the git source.
   src = fetchurl {
     url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
-    hash = "sha256-JbWt6d1cX3F2lmivjszcxcyE+wKYk+Sy03xhb4E3oHw=";
+    hash = "sha256-A02edHUZoU2oQk4OyCmc/wMfk3k+EWkdO2RxPGlUrXg=";
   };
 
   # tarball contains multiple files/directories
diff --git a/pkgs/by-name/ku/kurve/package.nix b/pkgs/by-name/ku/kurve/package.nix
index 5bb27e5c5dd0..48e0f9028383 100644
--- a/pkgs/by-name/ku/kurve/package.nix
+++ b/pkgs/by-name/ku/kurve/package.nix
@@ -13,14 +13,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kurve";
-  version = "2.0.0";
+  version = "2.2.0";
   dontWrapQtApps = true;
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "kurve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qw/6V3TWGZFL8dgyDUxzBr4U6/jaX9uwpyg3Bd3pKdg=";
+    hash = "sha256-TWNgQUgjrlzQs+cjzfoD13dHG3M93Akxyg5VNB9Rp9E=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/l8/l8w8jwt/package.nix b/pkgs/by-name/l8/l8w8jwt/package.nix
index 8449da40c884..1f6765e9cc0e 100644
--- a/pkgs/by-name/l8/l8w8jwt/package.nix
+++ b/pkgs/by-name/l8/l8w8jwt/package.nix
@@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace lib/chillbuff/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Minimal, OpenSSL-less and super lightweight JWT library written in C";
     homepage = "https://codeberg.org/GlitchedPolygons/l8w8jwt";
@@ -54,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jherland ];
     platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 })
diff --git a/pkgs/by-name/la/LAStools/cmake.diff b/pkgs/by-name/la/LAStools/cmake.diff
deleted file mode 100644
index a28719d01b80..000000000000
--- a/pkgs/by-name/la/LAStools/cmake.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 6a0ea6e..70de632 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
- set(CMAKE_SUPPRESS_REGENERATION true)
- set(CMAKE_CXX_STANDARD 17)
- project("LAStools" CXX C)
-diff --git i/LASlib/CMakeLists.txt w/LASlib/CMakeLists.txt
-index 5efb193..907b381 100644
---- i/LASlib/CMakeLists.txt
-+++ w/LASlib/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
- set(CMAKE_SUPPRESS_REGENERATION true)
- project("LASlib")
- 
-diff --git i/LASlib/src/CMakeLists.txt w/LASlib/src/CMakeLists.txt
-index 51dca48..28242e6 100644
---- i/LASlib/src/CMakeLists.txt
-+++ w/LASlib/src/CMakeLists.txt
-@@ -70,7 +70,7 @@ file(GLOB_RECURSE LAS_INCLUDES
- 
- add_library(LASlib ${LAS_SRC} ${LAZ_SRC_FULL})
- set_property(TARGET LASlib PROPERTY POSITION_INDEPENDENT_CODE ON)
--set_property(TARGET LASlib PROPERTY CXX_STANDARD 11)
-+set_property(TARGET LASlib PROPERTY CXX_STANDARD 14)
- 
- if (BUILD_SHARED_LIBS)
- 	target_compile_definitions(LASlib PRIVATE "COMPILE_AS_DLL")
-diff --git i/src/CMakeLists.txt w/src/CMakeLists.txt
-index ebdf98a..3b66b82 100644
---- i/src/CMakeLists.txt
-+++ w/src/CMakeLists.txt
-@@ -5,6 +5,7 @@ add_definitions(-DNDEBUG )
- 
- include_directories(../LASzip/src)
- include_directories(../LASlib/inc)
-+include_directories(.)
- 
- set(GEOPROJECTION_TARGETS
- 	laszip
-diff --git i/src/geoprojectionconverter.cpp w/src/geoprojectionconverter.cpp
-index 1e3298d..5306c32 100644
---- i/src/geoprojectionconverter.cpp
-+++ w/src/geoprojectionconverter.cpp
-@@ -33,6 +33,7 @@
- */
- #include "geoprojectionconverter.hpp"
- 
-+#include <algorithm>
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/pkgs/by-name/la/LAStools/drop-64-suffix.patch b/pkgs/by-name/la/LAStools/drop-64-suffix.patch
index 2090baeb3b2b..ef065fc61be2 100644
--- a/pkgs/by-name/la/LAStools/drop-64-suffix.patch
+++ b/pkgs/by-name/la/LAStools/drop-64-suffix.patch
@@ -1,13 +1,10 @@
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -32,6 +32,6 @@ endforeach(TARGET)
- foreach(TARGET ${ALL_TARGETS})
- 	target_link_libraries(${TARGET} LASlib)
- 	set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
--	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
-+	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
- 	install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
+@@ -40,6 +41,6 @@
+   set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 17)
+   target_link_libraries(${TARGET} LASlib ${CMAKE_DL_LIBS})
+   set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
+-  set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
++  set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
+   install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
  endforeach(TARGET)
--- 
-2.28.0
-
diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix
index 6c8ffce71017..35da3703adb5 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/LAStools/package.nix
@@ -5,21 +5,19 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "LAStools";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
-    rev = "v${version}";
-    sha256 = "sha256-IyZjM8YvIVB0VPNuEhmHHw7EuKw5RanB2qhCnBD1fRY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ow7zcvkenJ2j+tj2TxuEtK0dQEwzUtJ9f0wzt5/qimM=";
   };
 
   patches = [
     ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables
-    # https://github.com/lastools/LAStools/pull/234
-    ./cmake.diff
   ];
 
   hardeningDisable = [
@@ -32,12 +30,12 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Software for rapid LiDAR processing";
     homepage = "http://lastools.org/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ stephenwithph ];
-    teams = [ teams.geospatial ];
-    platforms = platforms.unix;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ stephenwithph ];
+    teams = [ lib.teams.geospatial ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix
index 1397a9dd6bf4..181f5ef31551 100644
--- a/pkgs/by-name/la/labwc/package.nix
+++ b/pkgs/by-name/la/labwc/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "labwc";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "labwc";
     repo = "labwc";
     tag = finalAttrs.version;
-    hash = "sha256-8SKSITFwbagJhuTXVHpPmQoaooktIXc1CeO9ZOUuh1w=";
+    hash = "sha256-aKjebrUqksLoDhHa/maI871jq/2u6YbTaNd6+hJz8uE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix
index 6c6134dbd57a..04de4423d6d8 100644
--- a/pkgs/by-name/la/labymod-launcher/package.nix
+++ b/pkgs/by-name/la/labymod-launcher/package.nix
@@ -6,12 +6,12 @@
 
 let
   pname = "labymod-launcher";
-  version = "2.1.12";
+  version = "2.1.13";
 
   src = fetchurl {
     name = "labymod-launcher";
     url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
-    hash = "sha256-n0ipNxtmVSG/Do5UcFpWhGH+4SO3ZljsUXPW4hYzkZU=";
+    hash = "sha256-MntANnDKN4JZwQdixqxR7SbXd5pxQzC5R+RzJYel2oM=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };
diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index f54ef55f417b..60057054f287 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -23,16 +23,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lact";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bgMQTiNeJR6zPTy/YpQ0oI1oGBzCf+VtBUn6pgADZAY=";
+    hash = "sha256-ZfUzsSdMLv6IaSbLkz9LBvdB4cS4oBE+R5toi9T7vR0=";
   };
 
-  cargoHash = "sha256-VxyYnX6AW+AS4NOB1XZXi2Dyrf4rtJzKHXMYwgLY6pQ=";
+  cargoHash = "sha256-K1/D5vi88Wjcvu/KZOkVr4q2MdMHTkhtyV8k8bvcGwg=";
 
   nativeBuildInputs = [
     pkg-config
@@ -128,7 +128,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/ilya-zlobintsev/LACT";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       atemu
       cything
       johnrtitor
diff --git a/pkgs/by-name/la/lacy/package.nix b/pkgs/by-name/la/lacy/package.nix
index 1ddc3fb64f23..95cecaec55b5 100644
--- a/pkgs/by-name/la/lacy/package.nix
+++ b/pkgs/by-name/la/lacy/package.nix
@@ -6,18 +6,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lacy";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "timothebot";
     repo = "lacy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-blQPIw8Ct+TGRuy+ybYr9rdlfOZdvAbhsB8sfwugS/w=";
+    hash = "sha256-NjLCN9RDWusfw1BwSzRQLCx4UhHyMpQZ5+igRG1rX9Q=";
   };
 
   passthru.updateScript = nix-update-script { };
 
-  cargoHash = "sha256-rNTRcQJptVi/ruCd56oHHN9n+Z3NhUNyrvXf27Sovtw=";
+  cargoHash = "sha256-eE/kyb09AwcYTsyXQ9Yn43QF2veCRAgGkNgykJHCsFE=";
 
   meta = {
     description = "Fast magical cd alternative for lacy terminal navigators";
diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/by-name/la/ladspa-sdk/package.nix
similarity index 82%
rename from pkgs/applications/audio/ladspa-sdk/default.nix
rename to pkgs/by-name/la/ladspa-sdk/package.nix
index 0103db6a7422..6f154ea224d8 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/by-name/la/ladspa-sdk/package.nix
@@ -4,22 +4,22 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa-sdk";
   version = "1.15";
   src = fetchurl {
-    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
     sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
   };
 
-  sourceRoot = "ladspa_sdk_${version}/src";
+  sourceRoot = "ladspa_sdk_${finalAttrs.version}/src";
 
   strictDeps = true;
 
   patchPhase = ''
     sed -i 's@/usr/@$(out)/@g'  Makefile
     substituteInPlace Makefile \
-      --replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav
+      --replace /tmp/test.wav $NIX_BUILD_TOP/${finalAttrs.sourceRoot}/test.wav
   '';
 
   makeFlags = [
@@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/by-name/la/ladspaH/package.nix
similarity index 84%
rename from pkgs/applications/audio/ladspa-sdk/ladspah.nix
rename to pkgs/by-name/la/ladspaH/package.nix
index fae714eb19ae..7c2515002b1c 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/by-name/la/ladspaH/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchurl,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa.h";
   version = "1.15";
   src = fetchurl {
-    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
     sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
   };
 
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 5c558f5eea40..fcc04fcb579f 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -9,7 +9,7 @@
   cmake,
   ninja,
   pkg-config,
-  curl,
+  curlFull, # Websocket support
   libavif,
   angle, # libEGL
   libjxl,
@@ -27,20 +27,19 @@
   skia,
   nixosTests,
   unstableGitUpdater,
-  apple-sdk_14,
   libtommath,
   sdl3,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-09-19";
+  version = "0-unstable-2025-10-31";
 
   src = fetchFromGitHub {
     owner = "LadybirdBrowser";
     repo = "ladybird";
-    rev = "5bd867f1dcb1f1b1c1397c4615ce7f091c8370aa";
-    hash = "sha256-/SPWjgHiWgrLThgAxBt9gZVELH+rrJWkfhxnuKEIxd8=";
+    rev = "35c6d52d7df251555ed006091b680a2299f6390e";
+    hash = "sha256-2bjjM0tQebmUIM6sjtUpRyJbSjDP3E/7WOq7qR2E+k8=";
   };
 
   postPatch = ''
@@ -80,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    curl
+    curlFull
     fast-float
     ffmpeg
     fontconfig
@@ -107,9 +106,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional stdenv.hostPlatform.isLinux [
     libpulseaudio.dev
     qt6Packages.qtwayland
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix
index 1ac2e6a8bcb2..79c0ebddfd0f 100644
--- a/pkgs/by-name/la/lammps-mpi/package.nix
+++ b/pkgs/by-name/la/lammps-mpi/package.nix
@@ -1,10 +1,10 @@
 {
+  lib,
   lammps,
   mpi,
-  lowPrio,
 }:
 
-lowPrio (
+lib.lowPrio (
   lammps.override {
     extraBuildInputs = [
       mpi
diff --git a/pkgs/by-name/la/languagetool-rust/package.nix b/pkgs/by-name/la/languagetool-rust/package.nix
index c90d9800baf7..55764d9e6739 100644
--- a/pkgs/by-name/la/languagetool-rust/package.nix
+++ b/pkgs/by-name/la/languagetool-rust/package.nix
@@ -6,20 +6,21 @@
   installShellFiles,
   pkg-config,
   openssl,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "languagetool-rust";
-  version = "2.1.5";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "jeertmans";
     repo = "languagetool-rust";
     rev = "v${version}";
-    hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ=";
+    hash = "sha256-LHlM+PJbBqsgOwK9Mw8oVVP+dq4IBFhxjRaXLIGxZPg=";
   };
 
-  cargoHash = "sha256-MIGoGEd/N2qlcawYRLMuac4SexHEMJnOS+FbPFJIsso=";
+  cargoHash = "sha256-VfvdIjNIHpvN370/3y2XXxaIyEL9+tG0OcnONhs9Z2I=";
 
   buildFeatures = [ "full" ];
 
@@ -31,6 +32,9 @@ rustPlatform.buildRustPackage rec {
 
   checkFlags = [
     # requires network access
+    "--skip=api::server::tests::test_server_annotate"
+    "--skip=api::server::tests::test_server_check_multiple_and_join"
+    "--skip=api::server::tests::test_server_check_multiple_and_join_without_context"
     "--skip=server::tests::test_server_check_data"
     "--skip=server::tests::test_server_check_text"
     "--skip=server::tests::test_server_languages"
@@ -39,12 +43,15 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_match_positions_2"
     "--skip=test_match_positions_3"
     "--skip=test_match_positions_4"
-    "--skip=src/lib/lib.rs"
+    "--skip=src/lib.rs"
     "--skip=test_basic_check_data"
     "--skip=test_basic_check_file"
     "--skip=test_basic_check_files"
+    "--skip=test_basic_check_no_errors"
+    "--skip=test_basic_check_ping"
     "--skip=test_basic_check_piped"
     "--skip=test_basic_check_text"
+    "--skip=test_basic_check_stdin_verbose"
     "--skip=test_check_with_dict"
     "--skip=test_check_with_dicts"
     "--skip=test_check_with_disabled_categories"
@@ -78,11 +85,13 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/ltrs completions zsh)
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "LanguageTool API in Rust";
     homepage = "https://github.com/jeertmans/languagetool-rust";
-    license = licenses.mit;
-    maintainers = with maintainers; [ name-snrl ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ name-snrl ];
     mainProgram = "ltrs";
   };
 }
diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock
index 6d49c1f64771..d6fbbde2d9db 100644
--- a/pkgs/by-name/la/laravel/composer.lock
+++ b/pkgs/by-name/la/laravel/composer.lock
@@ -167,16 +167,16 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v12.33.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "d47aaf15c55dd1c252688fdc7adbee129bd2ff0b"
+                "reference": "419a151ce65ce38037ba80d9875d4bed8ea7eaf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/d47aaf15c55dd1c252688fdc7adbee129bd2ff0b",
-                "reference": "d47aaf15c55dd1c252688fdc7adbee129bd2ff0b",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/419a151ce65ce38037ba80d9875d4bed8ea7eaf5",
+                "reference": "419a151ce65ce38037ba80d9875d4bed8ea7eaf5",
                 "shasum": ""
             },
             "require": {
@@ -222,11 +222,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-09-28T12:52:25+00:00"
+            "time": "2025-10-28T19:20:34+00:00"
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v12.33.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -272,16 +272,16 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v12.33.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
-                "reference": "0bdbf0cdb5dd5739b2c8e6caf881a4114399ab15"
+                "reference": "5ab717c8f0dd4e84be703796bbb415ccff8de57a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/contracts/zipball/0bdbf0cdb5dd5739b2c8e6caf881a4114399ab15",
-                "reference": "0bdbf0cdb5dd5739b2c8e6caf881a4114399ab15",
+                "url": "https://api.github.com/repos/illuminate/contracts/zipball/5ab717c8f0dd4e84be703796bbb415ccff8de57a",
+                "reference": "5ab717c8f0dd4e84be703796bbb415ccff8de57a",
                 "shasum": ""
             },
             "require": {
@@ -316,20 +316,20 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-09-12T14:35:11+00:00"
+            "time": "2025-10-07T19:59:08+00:00"
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v12.33.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "c7c3bbcd05c0836af89f1b49bf70c3170c011c13"
+                "reference": "46a3cdb0c572c0956d06ac70a819b32199d9717a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/c7c3bbcd05c0836af89f1b49bf70c3170c011c13",
-                "reference": "c7c3bbcd05c0836af89f1b49bf70c3170c011c13",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/46a3cdb0c572c0956d06ac70a819b32199d9717a",
+                "reference": "46a3cdb0c572c0956d06ac70a819b32199d9717a",
                 "shasum": ""
             },
             "require": {
@@ -383,11 +383,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-09-30T17:35:38+00:00"
+            "time": "2025-10-26T17:15:12+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v12.33.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -433,16 +433,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v12.33.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "21016aede3dbeed1fccd4478dfbd9f10114456ce"
+                "reference": "100294d4ea7fa7761e8ac05b54fb861748bc1e89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/21016aede3dbeed1fccd4478dfbd9f10114456ce",
-                "reference": "21016aede3dbeed1fccd4478dfbd9f10114456ce",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/100294d4ea7fa7761e8ac05b54fb861748bc1e89",
+                "reference": "100294d4ea7fa7761e8ac05b54fb861748bc1e89",
                 "shasum": ""
             },
             "require": {
@@ -508,7 +508,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-10-06T14:47:22+00:00"
+            "time": "2025-10-28T14:38:53+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -902,16 +902,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.4",
+            "version": "v7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db"
+                "reference": "cdb80fa5869653c83cfe1a9084a673b6daf57ea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cdb80fa5869653c83cfe1a9084a673b6daf57ea7",
+                "reference": "cdb80fa5869653c83cfe1a9084a673b6daf57ea7",
                 "shasum": ""
             },
             "require": {
@@ -976,7 +976,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.4"
+                "source": "https://github.com/symfony/console/tree/v7.3.5"
             },
             "funding": [
                 {
@@ -996,7 +996,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-22T15:31:00+00:00"
+            "time": "2025-10-14T15:46:26+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1067,16 +1067,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.2",
+            "version": "v7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
+                "reference": "9f696d2f1e340484b4683f7853b273abff94421f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9f696d2f1e340484b4683f7853b273abff94421f",
+                "reference": "9f696d2f1e340484b4683f7853b273abff94421f",
                 "shasum": ""
             },
             "require": {
@@ -1111,7 +1111,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.2"
+                "source": "https://github.com/symfony/finder/tree/v7.3.5"
             },
             "funding": [
                 {
@@ -1131,7 +1131,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T13:41:35+00:00"
+            "time": "2025-10-15T18:45:57+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
@@ -2262,16 +2262,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.1",
+            "version": "v5.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
                 "shasum": ""
             },
             "require": {
@@ -2314,9 +2314,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
             },
-            "time": "2025-08-13T20:13:15+00:00"
+            "time": "2025-10-21T19:32:17+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -2438,11 +2438,11 @@
         },
         {
             "name": "phpstan/phpstan",
-            "version": "2.1.30",
+            "version": "2.1.31",
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
-                "reference": "a4a7f159927983dd4f7c8020ed227d80b7f39d7d",
+                "url": "https://api.github.com/repos/phpstan/phpstan/zipball/ead89849d879fe203ce9292c6ef5e7e76f867b96",
+                "reference": "ead89849d879fe203ce9292c6ef5e7e76f867b96",
                 "shasum": ""
             },
             "require": {
@@ -2487,7 +2487,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2025-10-02T16:07:52+00:00"
+            "time": "2025-10-10T14:14:11+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",
diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix
index 7826ca746a0e..b05b8c7a94de 100644
--- a/pkgs/by-name/la/laravel/package.nix
+++ b/pkgs/by-name/la/laravel/package.nix
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "laravel";
-  version = "5.20.0";
+  version = "5.23.0";
 
   src = fetchFromGitHub {
     owner = "laravel";
     repo = "installer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gqGCyiamqRkEGMQW695euPPUo+P4PTVpeKR9EgyebTM=";
+    hash = "sha256-yTwpoIJMFFYTNHZmB7xhKj6MFlMfLbvi4fWoo4EHTgg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-8T6SYineoP8+9/j1xk/5FMnoKpAoPyh3YnVV5PJzFHc=";
+  vendorHash = "sha256-lKyMzBamoUTqQ43RwpOokeA0BZzUqabYqaFY7JpzRoA=";
 
   # Adding npm (nodejs) and php composer to path
   postInstall = ''
diff --git a/pkgs/by-name/la/lastpass-cli/716-bump-cmake-minimum-version.patch b/pkgs/by-name/la/lastpass-cli/716-bump-cmake-minimum-version.patch
new file mode 100644
index 000000000000..0b29209cc63d
--- /dev/null
+++ b/pkgs/by-name/la/lastpass-cli/716-bump-cmake-minimum-version.patch
@@ -0,0 +1,27 @@
+From 31a4ad5f735933ff8e96403103d5b4f61faee945 Mon Sep 17 00:00:00 2001
+From: Yaksh Bariya <yakshbari4@gmail.com>
+Date: Wed, 11 Jun 2025 06:37:27 +0530
+Subject: [PATCH] fix builds with cmake 4.x
+
+---
+ CMakeLists.txt | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index efc6ba0..cd693f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,8 +1,10 @@
+-if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_LESS 3.1)
++if(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER_EQUAL 4.0)
++  cmake_minimum_required(VERSION 4.0)
++elseif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} VERSION_GREATER_EQUAL 3.1)
++  cmake_minimum_required(VERSION 3.1)
++else()
+   set(CMAKE_LEGACY_CYGWIN_WIN32 0) # Remove when CMake > 2.8.4 is required
+   cmake_minimum_required(VERSION 2.8)
+-else()
+-  cmake_minimum_required(VERSION 3.1)
+ endif()
+ 
+ project(lpass)
diff --git a/pkgs/by-name/la/lastpass-cli/package.nix b/pkgs/by-name/la/lastpass-cli/package.nix
index 6fb4c732c92a..5aff38e0831f 100644
--- a/pkgs/by-name/la/lastpass-cli/package.nix
+++ b/pkgs/by-name/la/lastpass-cli/package.nix
@@ -11,6 +11,7 @@
   curl,
   libxml2,
   libxslt,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -44,6 +45,14 @@ stdenv.mkDerivation rec {
     "install-doc"
   ];
 
+  patches = [
+    # CMake 3.1 is deprecated and no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    # The patch comes from https://github.com/lastpass/lastpass-cli/pull/716 while
+    # it is not merged and integrated in a new release.
+    ./716-bump-cmake-minimum-version.patch
+  ];
+
   postInstall = ''
     install -Dm644 -T ../contrib/lpass_zsh_completion $out/share/zsh/site-functions/_lpass
     install -Dm644 -T ../contrib/completions-lpass.fish $out/share/fish/vendor_completions.d/lpass.fish
diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
index 26692e8ae380..4ef971de43d3 100644
--- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "0.1.40";
+  version = "0.1.41";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
+    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-RtzLa0SPd76/8ml8R55Hx1MMwFcfDIt6wtcjKAGMDuI=";
+    hash = "sha256-UJMyOCtjr7e6YaRdIrlL+p3alw4k/MzgqqFreLesAaE=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index 8ea69995ee86..98812a18cb67 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.40";
+  version = "0.1.41";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
+    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
   };
 
   sourceRoot = "source/src/backend";
diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix
index 8fe39e3d140e..3c0ee41a5cfb 100644
--- a/pkgs/by-name/la/lazycli/package.nix
+++ b/pkgs/by-name/la/lazycli/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     description = "Tool to static turn CLI commands into TUIs";
     homepage = "https://github.com/jesseduffield/lazycli";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lazycli";
   };
 }
diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 538e8a3ba683..8074bf20281d 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.55.1";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${version}";
-    hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+    hash = "sha256-oTj+9zDmbXD4rlFZ++hcd1WSfskSNI7ojI9gN8UcpT8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index e70efd6f60d5..a494089d4e02 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-6tPSr28Ja7LuwWrcqSYLxxQj8e9XCgTWxzudjXOriBg=";
+    hash = "sha256-mab6YZPOq6DerBrHK3UQrccrM8Jtp9nu2bzUus2zLYs=";
   };
 
   vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";
diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index 29c6acb14aae..b957997e4563 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcevcdec";
-  version = "4.0.1";
+  version = "4.0.3";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "v-novaltd";
     repo = "LCEVCdec";
     tag = finalAttrs.version;
-    hash = "sha256-azY4xle2wwopT9qEHa4+nXPkGzscWz9tYof1qN7Nw8c=";
+    hash = "sha256-UGOKl4fr+zOlzRm75BcL1+jIU5+A0d6GHXE1cOHsPP8=";
   };
 
   postPatch = ''
@@ -34,8 +34,6 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "args.git_version" '"${finalAttrs.version}"' \
       --replace-fail "args.git_hash" '"${finalAttrs.src.rev}"' \
       --replace-fail "args.git_date" '"1970-01-01"'
-    substituteInPlace cmake/templates/lcevc_dec.pc.in \
-      --replace-fail "@GIT_SHORT_VERSION@" "${finalAttrs.version}"
   '';
 
   env = {
diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix
index dd2c4df711f6..a0904490e776 100644
--- a/pkgs/by-name/lc/lcm/package.nix
+++ b/pkgs/by-name/lc/lcm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lcm";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "lcm-proj";
     repo = "lcm";
     rev = "v${version}";
-    hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs=";
+    hash = "sha256-72fytJY+uXEHGdZ7N+0g+JK7ALb2e2ZtJuvhiGIMHiA=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/lc/lcrq/package.nix b/pkgs/by-name/lc/lcrq/package.nix
index 5ea054541afd..8ce9de456942 100644
--- a/pkgs/by-name/lc/lcrq/package.nix
+++ b/pkgs/by-name/lc/lcrq/package.nix
@@ -5,14 +5,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcrq";
-  version = "0.2.4";
+  version = "0.3.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "librecast";
     repo = "lcrq";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Vij0aV4BIVrpRSzVneyP7MjlsdJSz1mbMCShEOOYVbQ=";
+    hash = "sha256-hNH5SdvKhNPUJWs7vpPECcBsRyNdHQF+Ot3LmyX2V3c=";
   };
 
   installFlags = [ "PREFIX=$(out)" ];
diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix
index c6e5c7cff969..f6a1dfc2cdf8 100644
--- a/pkgs/by-name/ld/ld64/package.nix
+++ b/pkgs/by-name/ld/ld64/package.nix
@@ -119,6 +119,9 @@ stdenv.mkDerivation (finalAttrs: {
     xar
   ];
 
+  # ld built with this fails to link glib's gio on x86_64 darwin
+  hardeningDisable = [ "libcxxhardeningfast" ];
+
   dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM.
 
   # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations,
diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 565042ebc3d1..fab3716094e5 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
-  version = "4.23.0";
+  version = "4.24.0";
 
   # Using a vendored version rather than nixpkgs' version to match the exact version required by
   # Lean.  Apparently, even a slight version change can impact greatly the final performance.
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "leanprover";
     repo = "lean4";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wcB3HxSNukIOttjrfvDQB5IkmhYG9w/UMeOfCQ1+lvo=";
+    hash = "sha256-m0DjKjFia5F5rCVMgn2xxPbbU/5uy7g84FUXSBPgy3w=";
   };
 
   postPatch =
diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json
index e1f0bbcb42c7..992abb31eaef 100644
--- a/pkgs/by-name/le/learn6502/missing-hashes.json
+++ b/pkgs/by-name/le/learn6502/missing-hashes.json
@@ -1,55 +1,55 @@
 {
   "@esbuild/aix-ppc64@npm:0.25.0": "468ba76b20f43118a11fd589ef162ff12c3c9f988a861045cc421b3100f9ade27103a0743fa9e9882c54dfe2ec647ca9b209cfc17ef61b5c9bc48be95e5856c1",
-  "@esbuild/aix-ppc64@npm:0.25.9": "b5c49f119424bb3f7be30b652ef87bf881824ace02cc2327ba6f7e0f86d04d2afe2087086985f4220dfdbb816acb67e6dfcf00da9eb8b028babfac43df3adac8",
+  "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5",
   "@esbuild/android-arm64@npm:0.25.0": "599fcb6b815a9bc8f83687663653c15ceb1c0f9ea0587da03976972281cd040c23b551a9f772d459809c22f7e218e04f1b159f8da1298b9c79b822f5636eff59",
-  "@esbuild/android-arm64@npm:0.25.9": "afe76da072b16e355f546d1d9023b814ead0487d9fa5e393eeb4bb3f6f76e5542e14b82396ca37c38e868ed64deef6b25f1c47e2564141fe5ecfe0eb7543f3f8",
+  "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1",
   "@esbuild/android-arm@npm:0.25.0": "ff6124350b732afe0f59087d5a50afb0c05d0d3951b4fc0f7c52c19ccacef504d7998217d8d7594dcfd4872748350a49ba611e8f2de3fe9e47a3df4393cb67eb",
-  "@esbuild/android-arm@npm:0.25.9": "0d4c724b84043db6597736865a4fe86640c88f21dc0ebe93a2298b4a0e0f0a5d1530a821dd1c18a2b39a6ca9abe8ff714b8ed5de496045a67150ea47c86a39d7",
+  "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14",
   "@esbuild/android-x64@npm:0.25.0": "7015f561e36c4fe142a4047184776344def5f25369c0bce8abd1de3d623d84cf7ddc09e5f7bac8294a8aea457ec23414e169648579382e6fd1aa39590ffe6e01",
-  "@esbuild/android-x64@npm:0.25.9": "9da8b1ede5670c2c9e644e0fedf1dd0747081272b296d3f80b53b44b637744d836efee00dc767b81940eb285524a5e3149d8045787f6281ee2bd53f61a9c8717",
+  "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f",
   "@esbuild/darwin-arm64@npm:0.25.0": "ba18b48c2c652a930a436a872b40cb0999fc0c4788dcda908f467d47555b080043e9ba1f9a7f080eb8d91ea8a3a399216aeea95539829a58885c412131025597",
-  "@esbuild/darwin-arm64@npm:0.25.9": "84a88a8f72fcc66381518d5821e4ed276aeea17c76559bee4fcb472b19456da630ad84d8d74b3e4c297ef7b1ec5bd5037d55ac6ef5c515a77fb94a1bd891dece",
+  "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a",
   "@esbuild/darwin-x64@npm:0.25.0": "83470576dc815364e8f2a6f2ed9c62496fa8112ee4905ccc3b142e36d28c9c90310ad179055d87e2e880e1bf9a3be0e9eb2129d6a88fdacf38181bfab6cf75c0",
-  "@esbuild/darwin-x64@npm:0.25.9": "c500bcd0c1a8f66d19cf575299a7da7f29dbdb56beac95bb6ddc570291e3e9da4e7d31db6453fc19ea5ac7f85662f40c9a3965c3e1f49657efeb292a6f601a26",
+  "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82",
   "@esbuild/freebsd-arm64@npm:0.25.0": "646f3abba09e87c4555359200af913bbda9fac43629f6ade6adefdbd0d915707a375314e1d25ed0d951e6024d7d19fe0ecdd10caf4ff6177f3f6450e7132a6a9",
-  "@esbuild/freebsd-arm64@npm:0.25.9": "fb4951968ad62e5316ffd08c037bb2396e8119a0c2289e968421bb277bdbffe23d89c92dcd2d7eb680f31be2b05e36406211b141b9b89378b424e4b5193c3d7f",
+  "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b",
   "@esbuild/freebsd-x64@npm:0.25.0": "4b769e23981e5ec010f9c4670b1194e26e8bf98cc0bb70962fe8c160da508b40561c0b97911072c5de82954a4164af9d885e45e597e39ae379b5cad2d0a8c69e",
-  "@esbuild/freebsd-x64@npm:0.25.9": "0c71856891d5cea255f9bcb4482c70347a39198da2769a273afbd16bc9db7176bc1d28c41dd569b8b8f98cfd14b10a728c79f54311037d702bb7dffd95f27740",
+  "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6",
   "@esbuild/linux-arm64@npm:0.25.0": "508ca15315c4d7b7db28fc8e17247ebe5c816c270496d1354f0d97baafdf774ec055c2d9ac51e06fb02fed93ce4f94d109b92fe80a62e42bf51a2c5046fc76c8",
-  "@esbuild/linux-arm64@npm:0.25.9": "6c64bf50dfb709d4000b022558293764a20ff8ba0b6638e8abb3bd0806cab25ac971f1910eaf2a4d73f92080afdb296d57175b2199647de019c2f419365f839d",
+  "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37",
   "@esbuild/linux-arm@npm:0.25.0": "3756d3974f5b5a6453f2ece2fa012f530b32b6af78cc0b6466bf0582b3da718803dae41bdb5cc4cdc360882bd791b63bb79e5f4a6f8c44ee053fc93b8dd6ea7f",
-  "@esbuild/linux-arm@npm:0.25.9": "b9a473988dadbe98f1c6ade2597e5967371d929ac83bb9f888d726d4f0e5cc4b8fe5020332adb26d61748619bf3e62c831d9c80b3bf815a6dd90dab76283d533",
+  "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d",
   "@esbuild/linux-ia32@npm:0.25.0": "d220829704167772688a93568738d0887fc45d88cce7a4f2e4de992f161e9aa679294bfdf2dd3d70fa6549b548a023d98a90f19270cd8ebd5b365efe04b7027c",
-  "@esbuild/linux-ia32@npm:0.25.9": "51f458a7038e2ee014b994f7f216821194b00716ae5abe78fe828d9cefd47575dc0ff703f95c18017e59b7bcb63c13ac6d551e8ab64522cce8af89bc33a689d6",
+  "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d",
   "@esbuild/linux-loong64@npm:0.25.0": "e7f1a54ea77c9307f54d7172a03b1e77ec18b3f6622077fe3dcb4d53435ea47fc60e82b9da7b8efe375c0e46f4c07169686262af2eaea6557cf033c973f6fbcd",
-  "@esbuild/linux-loong64@npm:0.25.9": "81478bff0f6d54e06fa96ec120c2dc92e47c3a1392397a121cf50a83496156f9abebd46f93e35a496f4f305c8af7cd430e4fe723474a2420cc21d39257852210",
+  "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad",
   "@esbuild/linux-mips64el@npm:0.25.0": "d51dc06bc3da38fb046986019c6b1a8aa1b43a835089f1f8d8ce4242c9417e1d3d25fa593708cd61f66f8665be27829316b37ecf9e08dc48718aacc00608aac1",
-  "@esbuild/linux-mips64el@npm:0.25.9": "78709795d663461c54168719517c4c38b2a51861af0f97a91003ea6fe2c2b67dca77f57c2a2c4eb2c6481a8660b5fe477c72e46e90154cb72f1f235e683b2d0f",
+  "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3",
   "@esbuild/linux-ppc64@npm:0.25.0": "a19514e5b21c5f70e6b5b6ccdacb09922e9c397e80e3b1ac8e55ed283f9f3a5325a9e4dcf284d033954f3c51a88411fa95473c83b2b69990e02e351fa971b63f",
-  "@esbuild/linux-ppc64@npm:0.25.9": "4a43e167f7f9659a5ca34678cb6fee53fbdba8b14a9a45f323abf33d9e141fd268984b0a18445db84cbada5ed2ac211ef318d5c44af0fbc0c7eea31c0c82321f",
+  "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e",
   "@esbuild/linux-riscv64@npm:0.25.0": "4b275bb4d2442a68b62a93926a4da04bde06795fc7f5719555c7a9d2cf0e8a2cd6a50c0e574f1285e55e126f0be29cf6017d829c571c2fb31728fb1961c45f70",
-  "@esbuild/linux-riscv64@npm:0.25.9": "e71027660a884b5bbcb6e9e84ed439b3ef19466cd9f6d16c1bdfe2db6dbe9a40e8fc19ad429749102d1c15f015372f7f9f8ab7f82d506efffbd143fe8ab28aa9",
+  "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c",
   "@esbuild/linux-s390x@npm:0.25.0": "7bd0fefc75c72d6d657aa9fec2322f1b8744936fc77da7e32027f0f1aff4b5fdaa8ae19a060fa4d465a79f14e13a4e10f3eeaf1ca64dc4c3cf08494b3e26100b",
-  "@esbuild/linux-s390x@npm:0.25.9": "7004c5852a3cbd1bd1d727e13b2f2be0747861ceab840ab8492ddff80b3d34dd41398681016cda3748c697e1b384bf4d4c1ad588538df38eba599ba935ecbd09",
+  "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806",
   "@esbuild/linux-x64@npm:0.25.0": "f9562d7e1d25b9a69faa40aaa7dd607b820836f88733b26b27a48b14b8a526cc5ec033c1869386419bd609c96442974c339ccbb03b4a23ea205927b2243d3b6c",
-  "@esbuild/linux-x64@npm:0.25.9": "3bab69aa63d5ef65e9eaa229963ee3a3c868a06badf019277af06d4f7c52ea3a30abafad361e5bcce71032abd8b6fb666607977a627fa2def8db6756cf99b2ee",
+  "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409",
   "@esbuild/netbsd-arm64@npm:0.25.0": "4f2502bbcf5967cf2a07c712f9fd87a0ec1e60356ea115dc8b69ea7364e88edae5758bb7cba4049065bb8e78d69d0f6bce09f42f146a50b2dcc6069e14ba66d5",
-  "@esbuild/netbsd-arm64@npm:0.25.9": "02b82c6773ad09082e3b18f01dbf4b9f72519a9e93995b479e4bd4bb28c8a4088972fd0e9304881d09775429dc388a3625249096426349dc3adc2208ee408a4a",
+  "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e",
   "@esbuild/netbsd-x64@npm:0.25.0": "82e3e256ac495620890867e85b63f4327e3f5cd5876c868dd4690094c7e4c233bc2359835e512443b8a44f44fc15d98ef3e63914efae8128d3a348d0ebaa66ec",
-  "@esbuild/netbsd-x64@npm:0.25.9": "51a576cb8ad7f43e43f76b25273735646eefa0d2a5bdaa3bd6387ab89512940bee49e91f7051b3d08d143d5cd6b4501f72a9462f30e242f0dff931c4ebe40363",
+  "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845",
   "@esbuild/openbsd-arm64@npm:0.25.0": "6c8de60d94a53fa4c37f7cbfca04baf06a14bb4b4360ab711b2235ec33b624e268cd39aad84382648eabae4db5727495806221211d663c36f1710579f504f967",
-  "@esbuild/openbsd-arm64@npm:0.25.9": "9bf0e7a535304f0d3c700d6e4ef536fe94b17e05bf5f9a4cc308ffc8c3d3cd642ee7debcf7f649a845610b1c706675af903f785ef14f320ee918faa61bf79bb5",
+  "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d",
   "@esbuild/openbsd-x64@npm:0.25.0": "ed2beae58658aa2146a9cae2152a38f52f34e2dd929e79a298f8ce4b3c2c6fcf8e2ac98b458fb0fe5baf87c08df12b162c74b52b4c95f5f54f5a073da1668ebe",
-  "@esbuild/openbsd-x64@npm:0.25.9": "bb9bb4c5f095575f267d30c9e65f8e64c3f425d24904f6e22112c305ee5f1503aea750f510252e4b862f366e5efac678b71cc848cda72c587be8af4119d28f80",
-  "@esbuild/openharmony-arm64@npm:0.25.9": "130f08d72a018aceef14b8534b9910bd2c0852fc074467ad0adf54d339584277326c7ffc8cd8126be08a530184c51d8de11d06971d1cc44545162bfb8428bcc3",
+  "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b",
+  "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17",
   "@esbuild/sunos-x64@npm:0.25.0": "9a0d0569ea65171983b0daadbf8ec6dd31341db7bee50fc4c2b85521eb09ff7597279d9dda4b4f25c3bfd6f4f77d558b6a6f36dcfb6794e7fc2177df9770a17e",
-  "@esbuild/sunos-x64@npm:0.25.9": "a86fca2baaaffcaed419bdc6569cf4a88b4ae830034f8deb4d83ba781b989e25b03696cfe05a482e24710191abc53479b70491f3f157eff37ed2b486d88c897b",
+  "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48",
   "@esbuild/win32-arm64@npm:0.25.0": "5484d8ad74479f8cc8c7b5d14d5f8ced3e50d6ef7fc12a45406ae6c6e5199784267bfccbe0173b598c1b512ea20ecd5de20579cf04d3e07848df3db7ccffd8e6",
-  "@esbuild/win32-arm64@npm:0.25.9": "cd32c8fe88511e413f6161480ea3b6fc2ed7cb4bd2febb455e7bc45842880c752ba71772f289908ded50d8cfd3207e6730c8fdec2e811af1f65e97d1ee53b4ef",
+  "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd",
   "@esbuild/win32-ia32@npm:0.25.0": "206eb14fd607c5a5116a49eaf4ed3ca7c34c0372729d7d34aa07bbc2a5792afabfd62873212213b17607165bd4ecbe4366066de0ddedd50a46a27a3c5cb830e5",
-  "@esbuild/win32-ia32@npm:0.25.9": "c374576d857dfa3c8dc5bdeef598ffc0e3adfcb8b7986a2b78ce61d2aa3c3d1f1cd15cb685f52b88411403d974f657c3fd44cf9b4fadb94e8ed69d75e9e3e0ef",
+  "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e",
   "@esbuild/win32-x64@npm:0.25.0": "a129e6ad07bbcc791fda365e71634aa45cf3989ded1f05ed1ecb99efa625b09081ef410d236fdd279037d001f2e5e5049c98bfbe6a2242c818463222df85cc54",
-  "@esbuild/win32-x64@npm:0.25.9": "41f2ba9101f4a9a28e3287026a32a05e8fdffcb4a4e41cfaf9f94b41093c6882f46ef80f12854b67b7ad78e47d1df492f3e8a71d41813a61500ace4a574af851",
+  "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671",
   "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8",
   "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be",
   "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019",
@@ -70,14 +70,15 @@
   "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c",
   "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7",
   "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49",
-  "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
-  "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb",
-  "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1",
-  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf",
-  "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320",
-  "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d",
-  "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4",
-  "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859",
-  "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17",
-  "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9"
+  "lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90",
+  "lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93",
+  "lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa",
+  "lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec",
+  "lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26",
+  "lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8",
+  "lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453",
+  "lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed",
+  "lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4",
+  "lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc",
+  "lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960"
 }
diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index a70e22fbef3c..f254908cdd61 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -14,7 +14,8 @@
   writableTmpDirAsHomeHook,
   gjs,
   libadwaita,
-  nix-update-script,
+  writeShellScript,
+  nix-update,
 }:
 
 let
@@ -23,20 +24,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "learn6502";
-  version = "0.3.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "JumpLink";
     repo = "Learn6502";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Aoj4Z9uraBEH3BW0hrhuV3Hu7cnRxvjbpzm4pUziWS4=";
+    hash = "sha256-YWbq0r6OEZpg4l633Y/1+r1Ik42ldoBH1ZjszRKNjRY=";
   };
 
   missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-0r+SRVx8b238SVm+XM4+uw7Ge3rFtsNwD/+uNfBA7eM=";
+    hash = "sha256-5wwpB4iDw/J7nUnb/qdSP+M0LLmHVU4/Zr+Ohl6Q4vk=";
   };
 
   nativeBuildInputs = [
@@ -70,7 +71,18 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = writeShellScript "update-learn6502" ''
+    ${lib.getExe nix-update} learn6502 || true
+    export HOME=$(mktemp -d)
+    src=$(nix build --no-link --print-out-paths .#learn6502.src)
+    WORKDIR=$(mktemp -d)
+    cp --recursive --no-preserve=mode $src/* $WORKDIR
+    missingHashes=$(nix eval --file . learn6502.missingHashes)
+    pushd $WORKDIR
+    ${lib.getExe yarn-berry.yarn-berry-fetcher} missing-hashes yarn.lock >$missingHashes
+    popd
+    ${lib.getExe nix-update} learn6502 --version skip
+  '';
 
   meta = {
     description = "Modern 6502 Assembly Learning Environment for GNOME";
diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix
index b73192f0b788..f4171ddfa62a 100644
--- a/pkgs/by-name/le/leatherman/package.nix
+++ b/pkgs/by-name/le/leatherman/package.nix
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ];
 
+  # CMake4 3.2.2 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2.2)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix
index 68840bed9e5f..4d4ac302d230 100644
--- a/pkgs/by-name/le/ledfx/package.nix
+++ b/pkgs/by-name/le/ledfx/package.nix
@@ -1,19 +1,28 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ledfx";
-  version = "2.0.111";
+  version = "2.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-b6WHulQa1er0DpMfeJLqqb4z8glUt1dHvvNigXgrf7Y=";
+  src = fetchFromGitHub {
+    owner = "LedFx";
+    repo = "LedFx";
+    tag = "v${version}";
+    hash = "sha256-N9EHK0GVohFCjEKsm3g4h+4XWfzZO1tzdd2z5IN1YjI=";
   };
 
+  postPatch = ''
+    substituteInPlace tests/conftest.py \
+      --replace-fail '"uv",' "" \
+      --replace-fail '"run",' "" \
+      --replace-fail '"ledfx",' "\"$out/bin/ledfx\","
+  '';
+
   pythonRelaxDeps = true;
 
   pythonRemoveDeps = [
@@ -27,43 +36,49 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python3.pkgs; [
+    # sorted like in pyproject.toml in upstream
+    numpy
+    cffi
     aiohttp
     aiohttp-cors
     aubio
     certifi
-    flux-led
-    python-dotenv
-    icmplib
-    mss
     multidict
-    netifaces2
-    numpy
     openrgb-python
     paho-mqtt
-    pillow
     psutil
-    pybase64
     pyserial
     pystray
-    python-mbedtls
-    python-osc
     python-rtmidi
-    # rpi-ws281x # not packaged
     requests
     sacn
-    samplerate
     sentry-sdk
-    setuptools
     sounddevice
-    stupidartnet
-    uvloop
-    vnoise
+    samplerate
+    icmplib
     voluptuous
     zeroconf
+    pillow
+    flux-led
+    python-osc
+    pybase64
+    mss
+    uvloop
+    stupidartnet
+    python-dotenv
+    vnoise
+    netifaces2
+    packaging
   ];
 
-  # Project has no tests
-  doCheck = false;
+  optional-dependencies = {
+    hue = with pyproject.pkgs; [ python-mbedtls ];
+  };
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-asyncio
+  ];
 
   meta = {
     description = "Network based LED effect controller with support for advanced real-time audio effects";
diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 58ba050a9d0f..c191781aa357 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.130.1";
+  version = "2.132.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-7o75rSuVir1b/y3gX5Otbgbs4Xcnra2Ku1Q99a/fMJk=";
+    hash = "sha256-wxOzx8Eo/AAbPor/nA3gjVC8vAfRTNjVmvxON5Ta5d0=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index 94cd731c36ea..e3a4acd82250 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   boost,
   gmp,
@@ -21,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ledger";
-  version = "3.3.2";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "ledger";
     repo = "ledger";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Uym4s8EyzXHlISZqThcb6P1H5bdgD9vmdIOLkk5ikG0=";
+    hash = "sha256-yk6/4ImUzgZY8O7MmQMwFkuJ/pMXo6W5TAA0GGIxYgg=";
   };
 
   # by default, it will query the python interpreter for it's sitepackages location
@@ -37,29 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"'
   '';
 
-  patches = [
-    (fetchpatch2 {
-      name = "ledger-boost-1.85-compat.patch";
-      url = "https://github.com/ledger/ledger/commit/46207852174feb5c76c7ab894bc13b4f388bf501.patch";
-      hash = "sha256-X0NSN60sEFLvcfMmtVoxC7fidcr5tJUlFVQ/E8qfLss=";
-    })
-    (fetchpatch2 {
-      name = "ledger-boost-1.86-compat-1.patch";
-      url = "https://github.com/ledger/ledger/commit/f6750ed89b46926d1f0859f3b25d18ed62ac219e.patch";
-      hash = "sha256-pktwotuMbZcR2DpZccMqV13524avKvazDX/+Ki6h69g=";
-    })
-    (fetchpatch2 {
-      name = "ledger-boost-1.86-compat-2.patch";
-      url = "https://github.com/ledger/ledger/commit/62f626fa73bd6832028f43c204c43cf15bd5f409.patch";
-      hash = "sha256-cazhSxadNpiA6ofZxS8JALOPy88cNPM/jKHaUYk8pBw=";
-    })
-    (fetchpatch2 {
-      name = "ledger-boost-1.86-compat-3.patch";
-      url = "https://github.com/ledger/ledger/commit/124398c35be573324cf2384c08b99b4476f29e2b.patch";
-      hash = "sha256-N3dUrqNsOiVgedoYmyfYllK+4lvKdMxc8iq0+DgEbxc=";
-    })
-  ];
-
   outputs = [
     "out"
     "dev"
@@ -99,10 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_DOCS" true)
     (lib.cmakeBool "USE_PYTHON" usePython)
     (lib.cmakeBool "USE_GPGME" gpgmeSupport)
-
-    # CMake 4 dropped support of versions lower than 3.5, and versions
-    # lower than 3.10 are deprecated.
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
   ];
 
   installTargets = [
@@ -135,6 +107,9 @@ stdenv.mkDerivation (finalAttrs: {
       their data, there really is no alternative.
     '';
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ jwiegley ];
+    maintainers = with lib.maintainers; [
+      jwiegley
+      afh
+    ];
   };
 })
diff --git a/pkgs/games/leela-zero/default.nix b/pkgs/by-name/le/leela-zero/package.nix
similarity index 69%
rename from pkgs/games/leela-zero/default.nix
rename to pkgs/by-name/le/leela-zero/package.nix
index da7c815fa056..7b5440562920 100644
--- a/pkgs/games/leela-zero/default.nix
+++ b/pkgs/by-name/le/leela-zero/package.nix
@@ -2,23 +2,23 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
   boost,
-  opencl-headers,
+  cmake,
+  libsForQt5,
   ocl-icd,
-  qtbase,
+  opencl-headers,
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "leela-zero";
-  version = "0.17";
+  version = "0.17-unstable-2023-02-07";
 
   src = fetchFromGitHub {
     owner = "gcp";
     repo = "leela-zero";
-    rev = "v${version}";
-    hash = "sha256-AQRp2rkL9KCZdsJN6uz2Y+3kV4lyRLYjWn0p7UOjBMw=";
+    rev = "3ee6d20d0b36ae26120331c610926359cc5837de";
+    hash = "sha256-JF25y471miw/0b7XXBURzK+4WBwZI5ZUP+36/cZUORo=";
     fetchSubmodules = true;
   };
 
@@ -26,12 +26,16 @@ stdenv.mkDerivation rec {
     boost
     opencl-headers
     ocl-icd
-    qtbase
+    libsForQt5.qtbase
     zlib
   ];
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
+  ];
+
   dontWrapQtApps = true;
 
   meta = with lib; {
diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index acea00b9b3c0..38d2ec6c1814 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "lefthook";
-  version = "1.13.4";
+  version = "1.13.6";
 in
 buildGoModule {
   inherit pname version;
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-/ZZ+eFHKQoqOzUNpTZ1Ef2A0EQbgT+CWau/q9hhuTHU=";
+    hash = "sha256-R9Cj2mXgAZFZMvEFF7ky1bAhy6L6Z4fcYPHY0CGVBr0=";
   };
 
-  vendorHash = "sha256-HQ6xpHYAOkT48UvOIf0g49jp5dt/4zuwmy8r/9KAZUk=";
+  vendorHash = "sha256-Md2VTvcbSMQ8ce96wyoS4Uw90MERGEeHSZc9iL0pRNs=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/by-name/le/legendary-gl/package.nix
similarity index 58%
rename from pkgs/games/legendary-gl/default.nix
rename to pkgs/by-name/le/legendary-gl/package.nix
index 30b58df3f040..cf0c0dc8bb79 100644
--- a/pkgs/games/legendary-gl/default.nix
+++ b/pkgs/by-name/le/legendary-gl/package.nix
@@ -2,43 +2,44 @@
   lib,
   gitUpdater,
   fetchFromGitHub,
-  buildPythonApplication,
-  pythonOlder,
-  requests,
-  filelock,
+  python3Packages,
 }:
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "legendary-gl"; # Name in pypi
   version = "0.20.34";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "derrod";
     repo = "legendary";
     rev = "56d439ed2d3d9f34e2b08fa23e627c23a487b8d6";
-    sha256 = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ=";
+    hash = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     requests
     filelock
   ];
 
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
   # no tests
   doCheck = false;
 
   pythonImportsCheck = [ "legendary" ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
     description = "Free and open-source Epic Games Launcher alternative";
     homepage = "https://github.com/derrod/legendary";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ equirosa ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ equirosa ];
     mainProgram = "legendary";
   };
-
-  passthru.updateScript = gitUpdater { };
 }
diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix
index 0fbd11cb3700..3f2c198ad6d3 100644
--- a/pkgs/by-name/le/legends-of-equestria/package.nix
+++ b/pkgs/by-name/le/legends-of-equestria/package.nix
@@ -33,21 +33,21 @@
 
 let
   pname = "legends-of-equestria";
-  version = "2025.04.001";
+  version = "2025.05.001";
   description = "Free-to-play MMORPG";
 
   srcOptions = {
     x86_64-linux = {
-      url = "https://mega.nz/file/w7BQTCAD#zW1atRLzSd1-V8GV7s7yj_HVZwB4v8zuX3aWIjA0ztc";
-      outputHash = "YYPxS/qNl/DvNmiGZorRGoONbtAI3nJslqCRzctwoz8=";
+      url = "https://mega.nz/file/cjhDAZ5S#dsCHHfZ3rhmGBynu4FxooK5kf2w7oHYwgzf4E7vzerM";
+      outputHash = "WbJL/+T/BNrk4GllCM4C4K2OymHmjzf5BuFR4V1N5Ds=";
     };
     x86_64-darwin = {
-      url = "https://mega.nz/file/IqgBEJTD#aUd6LgigncoQ8o3owSkadYRp7GkfIOWl4B1Hwzti1qk";
-      outputHash = "XdcHM6zCDNFU5VJo3/QISuhtYnBKm1f6IEDfy6Fjnp8=";
+      url = "https://mega.nz/file/dqQyjaSC#Aazc0tyu3v5WZcGet8ouHWlBB4to6Eu1SADYa3iSmAw";
+      outputHash = "V8qGABS1uNnj/0CVLsFNXLjzBAjq/UXAT11gczVP298=";
     };
     aarch64-darwin = {
-      url = "https://mega.nz/file/QyZnkYYB#EtAZrVdHgqX10ag09M9nhJVEboG0J_5f_nVKxCHskYg";
-      outputHash = "GA0Zin+vlgYfBFC1ZbkkgX1eSn/NVBYuxuv8fayXMLU=";
+      url = "https://mega.nz/file/I6QCSZqL#by23SjXBl0EMtgxex9Fhv5FO4qkhFX4uWSr3l5N4f-M";
+      outputHash = "ISmtCw35kA4p6nWcDWIk4UucVT7fIGS9XC73rzwSigo=";
     };
   };
 
diff --git a/pkgs/by-name/le/legendsbrowser2/package.nix b/pkgs/by-name/le/legendsbrowser2/package.nix
new file mode 100644
index 000000000000..0b07da2b302f
--- /dev/null
+++ b/pkgs/by-name/le/legendsbrowser2/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "legendsbrowser2";
+  version = "2.0.10";
+
+  sourceRoot = "source/backend";
+  src = fetchFromGitHub {
+    owner = "robertjanetzko";
+    repo = "LegendsBrowser2";
+    tag = finalAttrs.version;
+    hash = "sha256-wttBw3AKHkPCgoxnaxI8IZSPuw2xLoCK/9joAYFWPM8=";
+  };
+  vendorHash = "sha256-W7hc+U+rJZgXzcYoUHTG29j2xvJ/xTbBgDaiO7CVGnk=";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install -m 0755 $GOPATH/bin/backend $out/bin/legendsbrowser2
+
+    runHook postInstall
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Multi-platform, open source, legends viewer for dwarf fortress 0.47 written in go";
+    homepage = "https://github.com/robertjanetzko/LegendsBrowser2";
+    changelog = "https://github.com/robertjanetzko/LegendsBrowser2/releases/tag/${finalAttrs.version}";
+    mainProgram = "legendsbrowser2";
+    maintainers = [ lib.maintainers.andrewzah ];
+    license = lib.licenses.mit;
+  };
+})
diff --git a/pkgs/by-name/le/lego/package.nix b/pkgs/by-name/le/lego/package.nix
index bf4b2409359d..cef96732f65f 100644
--- a/pkgs/by-name/le/lego/package.nix
+++ b/pkgs/by-name/le/lego/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "4.26.0";
+  version = "4.27.0";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = "lego";
     tag = "v${version}";
-    hash = "sha256-wSTymGprdoXxBRlGDapF5H8SMbBRTI24PMgakGetABI=";
+    hash = "sha256-mc/aWjYvgF5PSl6Ng9oLNWAlGDjnhzEouo9LXh/PFsE=";
   };
 
-  vendorHash = "sha256-BdOS4BNWtonLoZO4YA85VdB6MRbMqoO8MGb4XNEwfCk=";
+  vendorHash = "sha256-648FrZqSatEYONzj03x8z8pV0WIvfYnIOcxERxYxSPw=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix
index d2ff68114222..79ab202b0b95 100644
--- a/pkgs/by-name/le/lemmeknow/package.nix
+++ b/pkgs/by-name/le/lemmeknow/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       Br1ght0ne
     ];
     mainProgram = "lemmeknow";
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 661d5a2403b9..1fe3ac92e848 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/numToStr/lemmy-help";
     changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${version}";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lemmy-help";
   };
 }
diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix
index 5f32b2f0bc2f..3854ac3ef3b8 100644
--- a/pkgs/by-name/le/lenmus/package.nix
+++ b/pkgs/by-name/le/lenmus/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "bump-cmake-minimum-required-version.patch";
+      url = "https://github.com/lenmus/lenmus/commit/cc250ca4ce9a90d8dddb0fc359c5a80609cdafcb.patch";
+      hash = "sha256-aP+ooaSi6vHk+g1XftfjZ39zAgYts1vOCqZWWZhJ+G8=";
+    })
+  ];
+
   env = {
     NIX_CFLAGS_COMPILE = "-fpermissive";
   };
diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index b6931829597b..2ee8e4ab9253 100644
--- a/pkgs/by-name/le/leptosfmt/package.nix
+++ b/pkgs/by-name/le/leptosfmt/package.nix
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix
index e83eaa0811cf..89092dd68145 100644
--- a/pkgs/by-name/le/letterpress/package.nix
+++ b/pkgs/by-name/le/letterpress/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitLab,
-  fetchpatch,
   wrapGAppsHook4,
   appstream,
   blueprint-compiler,
@@ -18,25 +17,16 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "letterpress";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "letterpress";
     rev = version;
-    hash = "sha256-9U8iH3V4WMljdtWLmb0RlexLeAN5StJ0c9RlEB2E7Xs=";
+    hash = "sha256-cqLodI6UjdLCKLGGcSIbXu1+LOcq2DE00V+lVS7OBMg=";
   };
 
-  patches = [
-    # Fix application segmentation fault on file chooser dialog opening
-    # https://gitlab.gnome.org/World/Letterpress/-/merge_requests/16
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/World/Letterpress/-/commit/15059eacca14204d1092a6e32ef30c6ce4df6d36.patch";
-      hash = "sha256-pjg/O9advtkZ0l73GQtL/GYcTWeOs5l3VGOdnsZCWI0=";
-    })
-  ];
-
   runtimeDeps = [
     jp2a
   ];
@@ -81,6 +71,7 @@ python3Packages.buildPythonApplication rec {
       High-res output can still be viewed comfortably by lowering the zoom factor.
     '';
     homepage = "https://apps.gnome.org/Letterpress/";
+    changelog = "https://gitlab.gnome.org/World/Letterpress/-/releases/${version}";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.dawidd6 ];
     teams = [ teams.gnome-circle ];
diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 1637b1bd1d68..c4b278362ff8 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.24.2";
+  version = "1.25.2";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     tag = "v${version}";
-    hash = "sha256-5QkXWuMFNsYNsW8lgo9FQIZ5NuLiRZCFKGWedpddi8Y=";
+    hash = "sha256-qB88S5k+HLBSOxNo6JBSGihJnY1jUdIpJTdLwgAP6bA=";
   };
 
   nativeBuildInputs = [
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     addDriverRunpath $out/lib/libze_loader.so
   '';
 
+  setupHook = ./setup-hook.sh;
+
   passthru = {
     tests = {
       inherit intel-compute-runtime openvino;
diff --git a/pkgs/by-name/le/level-zero/setup-hook.sh b/pkgs/by-name/le/level-zero/setup-hook.sh
new file mode 100644
index 000000000000..be0a59a05376
--- /dev/null
+++ b/pkgs/by-name/le/level-zero/setup-hook.sh
@@ -0,0 +1,7 @@
+if [ -d /run/opengl-driver/lib ]; then
+  export LD_LIBRARY_PATH="/run/opengl-driver/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
+fi
+
+if [ -d /run/opengl-driver-32/lib ]; then
+  export LD_LIBRARY_PATH="/run/opengl-driver-32/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
+fi
diff --git a/pkgs/by-name/le/levmar/package.nix b/pkgs/by-name/le/levmar/package.nix
index ac7879f74087..a52760b37368 100644
--- a/pkgs/by-name/le/levmar/package.nix
+++ b/pkgs/by-name/le/levmar/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     mkdir -p $out/include $out/lib
-    cp lm.h $out/include
+    cp levmar.h lm.h $out/include
     cp liblevmar.a $out/lib
   '';
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.nim65s ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index fadb4f0bff61..ee4303e2a6a0 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lgogdownloader";
-  version = "3.17";
+  version = "3.18";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rERcwPVuioZT4lqw4SUaM0TQIks6ggA5x8fuI+1GAsk=";
+    hash = "sha256-dVEV2smZxB6+Utm9FApiFydAS3hLm4y9YZja1B/PiEk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 813138971444..8038e0f5b0db 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf"
+    "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include/lib3mf"
     "-DUSE_INCLUDED_ZLIB=OFF"
     "-DUSE_INCLUDED_LIBZIP=OFF"
     "-DUSE_INCLUDED_GTEST=OFF"
@@ -95,9 +95,19 @@ stdenv.mkDerivation (finalAttrs: {
 
     # functions are no longer in openssl, remove them from test cleanup function
     substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \
-      --replace-warn "RAND_cleanup();" "" \
-      --replace-warn "EVP_cleanup();" "" \
-      --replace-warn "CRYPTO_cleanup_all_ex_data();" ""
+      --replace-fail "RAND_cleanup();" "" \
+      --replace-fail "EVP_cleanup();" "" \
+      --replace-fail "CRYPTO_cleanup_all_ex_data();" ""
+
+    # Fix CMake export
+    # ref https://github.com/3MFConsortium/lib3mf/pull/434
+    substituteInPlace cmake/lib3mfConfig.cmake \
+      --replace-fail "$""{LIB3MF_ROOT_DIR}/include" "$""{LIB3MF_ROOT_DIR}/include/lib3mf" \
+      --replace-fail "$""{LIB3MF_ROOT_DIR}/lib" "$out/lib"
+
+    # Use absolute CMAKE_INSTALL_INCLUDEDIR
+    substituteInPlace lib3mf.pc.in \
+      --replace-fail "includedir=$""{prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
   doCheck = true;
@@ -109,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
     license = licenses.bsd2;
-    maintainers = [ ];
+    maintainers = with maintainers; [ nim65s ];
     platforms = platforms.all;
   };
 })
diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix
index 8a39f3d5d5e0..3887f73d2329 100644
--- a/pkgs/by-name/li/lib60870/package.nix
+++ b/pkgs/by-name/li/lib60870/package.nix
@@ -20,8 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/lib60870-C";
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/CMakeLists.txt --replace-warn "-lrt" ""
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-warn "-lrt" "" \
   '';
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/li/libacars/package.nix b/pkgs/by-name/li/libacars/package.nix
index 0d2cd6b4bd03..adb346920174 100644
--- a/pkgs/by-name/li/libacars/package.nix
+++ b/pkgs/by-name/li/libacars/package.nix
@@ -15,9 +15,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-2n1tuKti8Zn5UzQHmRdvW5Q+x4CXS9QuPHFQ+DFriiE=";
   };
 
-  nativeBuildInputs = [
-    cmake
-  ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required (VERSION 3.10)"
+  '';
+
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix
index 91c1f3cb8b1d..dd4ea744d0c1 100644
--- a/pkgs/by-name/li/libadwaita/package.nix
+++ b/pkgs/by-name/li/libadwaita/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libadwaita";
-  version = "1.7.6";
+  version = "1.8.0";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "GNOME";
     repo = "libadwaita";
     tag = finalAttrs.version;
-    hash = "sha256-HpjP6VSkEAFeXIFXLbndQzEWJwVvHe6B3aSwCz6KiIM=";
+    hash = "sha256-neF7nt7x3QhSsWuWGouqniFlDHw1Soco7Dpzhy15gWE=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/li/libamqpcpp/package.nix b/pkgs/by-name/li/libamqpcpp/package.nix
index dfabbdb40c3a..6c6ceb5f4d54 100644
--- a/pkgs/by-name/li/libamqpcpp/package.nix
+++ b/pkgs/by-name/li/libamqpcpp/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-iaOXdDIJOBXHyjE07CvU4ApTh71lmtMCyU46AV+MGXQ=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10 FATAL_ERROR)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ openssl ];
@@ -24,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./libamqpcpp-darwin.patch ];
 
   enableParallelBuilding = true;
-  doCheck = true;
 
   meta = {
     description = "Library for communicating with a RabbitMQ server";
diff --git a/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix b/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix
index a12b8f0459be..3de57c122ce6 100644
--- a/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix
+++ b/pkgs/by-name/li/libapparmor/apparmorRulesFromClosure.nix
@@ -9,18 +9,18 @@
   # TODO: factorize here some other common paths
   # that may emerge from use cases.
   baseRules ? [
-    "r $path"
-    "r $path/etc/**"
-    "mr $path/share/**"
+    "$path r"
+    "$path/etc/** r"
+    "$path/share/** mr"
     # Note that not all libraries are prefixed with "lib",
     # eg. glibc-2.30/lib/ld-2.30.so
-    "mr $path/lib/**.so*"
-    "mr $path/lib64/**.so*"
+    "$path/lib/**.so* mr"
+    "$path/lib64/**.so* mr"
     # eg. glibc-2.30/lib/gconv/gconv-modules
-    "r $path/lib/**"
-    "r $path/lib64/**"
+    "$path/lib/** r"
+    "$path/lib64/** r"
     # Internal executables
-    "ixr $path/libexec/**"
+    "$path/libexec/** ixr"
   ],
   name ? "",
 }:
diff --git a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch b/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch
deleted file mode 100644
index 3e88c15dbdf2..000000000000
--- a/pkgs/by-name/li/libarchive/fix-darwin-tmpdir-handling.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 87bbe8ec8d343c70ae42ccb9606ec80ad73ceffb Mon Sep 17 00:00:00 2001
-From: Emily <hello@emily.moe>
-Date: Tue, 29 Jul 2025 16:53:15 +0100
-Subject: [PATCH] Fix setup_mac_metadata when TMPDIR does not end with a slash
-
----
- libarchive/archive_read_disk_entry_from_file.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libarchive/archive_read_disk_entry_from_file.c b/libarchive/archive_read_disk_entry_from_file.c
-index 19d049770b..87389642db 100644
---- a/libarchive/archive_read_disk_entry_from_file.c
-+++ b/libarchive/archive_read_disk_entry_from_file.c
-@@ -364,7 +364,7 @@ setup_mac_metadata(struct archive_read_disk *a,
- 		tempdir = _PATH_TMP;
- 	archive_string_init(&tempfile);
- 	archive_strcpy(&tempfile, tempdir);
--	archive_strcat(&tempfile, "tar.md.XXXXXX");
-+	archive_strcat(&tempfile, "/tar.md.XXXXXX");
- 	tempfd = mkstemp(tempfile.s);
- 	if (tempfd < 0) {
- 		archive_set_error(&a->archive, errno,
diff --git a/pkgs/by-name/li/libarchive/package.nix b/pkgs/by-name/li/libarchive/package.nix
index a6034a421eaa..f0bfd5355b44 100644
--- a/pkgs/by-name/li/libarchive/package.nix
+++ b/pkgs/by-name/li/libarchive/package.nix
@@ -6,7 +6,6 @@
   attr,
   autoreconfHook,
   bzip2,
-  fetchpatch,
   glibcLocalesUtf8,
   lzo,
   openssl,
@@ -32,29 +31,15 @@
 assert xarSupport -> libxml2 != null;
 stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive";
-  version = "3.8.1";
+  version = "3.8.2";
 
   src = fetchFromGitHub {
     owner = "libarchive";
     repo = "libarchive";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-KN5SvQ+/g/OOa+hntMX3D8p5IEWO0smke5WK+DwrOH0=";
+    hash = "sha256-s7duwuNFyYq8obTS3qc6JewJ9f8LJhItlEx8wxnMgwk=";
   };
 
-  patches = [
-    # https://github.com/libarchive/libarchive/pull/2689
-    # Remove after next release.
-    (fetchpatch {
-      url = "https://github.com/libarchive/libarchive/commit/489d0b8e2f1fafd3b7ebf98f389ca67462c34651.patch?full_index=1";
-      hash = "sha256-r+tSJ+WA0VKCjg+8MfS5/RqcB+aAMZ2dK0YUh+U1q78=";
-    })
-    # Fix the tests on Darwin when `$TMPDIR` does not end with a slash
-    # and its parent directory is not writable by the build user, as on
-    # Nix ≥ 2.30.0 and Lix ≥ 2.91.2, ≥ 2.92.2, ≥ 2.93.1.
-    # <https://github.com/libarchive/libarchive/pull/2708>
-    ./fix-darwin-tmpdir-handling.patch
-  ];
-
   outputs = [
     "out"
     "lib"
diff --git a/pkgs/by-name/li/libbgcode/package.nix b/pkgs/by-name/li/libbgcode/package.nix
index 5ad44220d625..d6348bc29edd 100644
--- a/pkgs/by-name/li/libbgcode/package.nix
+++ b/pkgs/by-name/li/libbgcode/package.nix
@@ -9,7 +9,7 @@
   boost,
   catch2_3,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libbgcode";
   version = "0-unstable-2025-02-19";
 
@@ -29,9 +29,18 @@ stdenv.mkDerivation {
     heatshrink
     zlib
     boost
+  ];
+
+  checkInputs = [
     catch2_3
   ];
 
+  doCheck = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "LibBGCode_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/prusa3d/libbgcode";
     description = "Prusa Block & Binary G-code reader / writer / converter";
@@ -40,4 +49,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ lach ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/li/libbtbb/package.nix b/pkgs/by-name/li/libbtbb/package.nix
index 2e9fbc46a460..00643a1cfda7 100644
--- a/pkgs/by-name/li/libbtbb/package.nix
+++ b/pkgs/by-name/li/libbtbb/package.nix
@@ -18,8 +18,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  # https://github.com/greatscottgadgets/libbtbb/issues/63
   postPatch = ''
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    # https://github.com/greatscottgadgets/libbtbb/issues/63
     substituteInPlace lib/libbtbb.pc.in \
       --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
       --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@
diff --git a/pkgs/by-name/li/libcangjie/package.nix b/pkgs/by-name/li/libcangjie/package.nix
index b9e40ee59d65..c2f09fa46fe3 100644
--- a/pkgs/by-name/li/libcangjie/package.nix
+++ b/pkgs/by-name/li/libcangjie/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "C library implementing the Cangjie input method";
     homepage = "https://gitlab.freedesktop.org/cangjie/libcangjie";
     license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.linquize ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     mainProgram = "libcangjie-cli";
   };
diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix
index 7abcdb8d24b8..76e0ee1d0fe6 100644
--- a/pkgs/by-name/li/libcap/package.nix
+++ b/pkgs/by-name/li/libcap/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "lib=lib"
-    "PAM_CAP=${if usePam then "yes" else "no"}"
+    "PAM_CAP=${lib.boolToYesNo usePam}"
     "BUILD_CC=$(CC_FOR_BUILD)"
     "CC:=$(CC)"
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
diff --git a/pkgs/by-name/li/libcaption/package.nix b/pkgs/by-name/li/libcaption/package.nix
index adcf4f7f22c2..27d788b00937 100644
--- a/pkgs/by-name/li/libcaption/package.nix
+++ b/pkgs/by-name/li/libcaption/package.nix
@@ -8,16 +8,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcaption";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "szatmary";
     repo = "libcaption";
-    tag = finalAttrs.version;
-    hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9tszEKR30GHoGQ3DE9ejU3yOdtDiZwSZHiIJUPLgOdU=";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ re2c ];
 
diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index cd0516a98fe4..0067bd5e99df 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.4";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [
diff --git a/pkgs/by-name/li/libchamplain/package.nix b/pkgs/by-name/li/libchamplain/package.nix
index a37ccdd95264..433c828b5182 100644
--- a/pkgs/by-name/li/libchamplain/package.nix
+++ b/pkgs/by-name/li/libchamplain/package.nix
@@ -69,7 +69,8 @@ stdenv.mkDerivation rec {
 
   passthru = {
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libchamplain";
+      attrPath = "libchamplain_libsoup3";
       versionPolicy = "odd-unstable";
     };
   };
@@ -88,7 +89,7 @@ stdenv.mkDerivation rec {
        OpenCycleMap, OpenAerialMap, and Maps for free.
     '';
 
-    teams = [
+    teams = lib.optionals withLibsoup3 [
       teams.gnome
       teams.pantheon
     ];
diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix
index 122cbb651ab9..d2cad0072f8b 100644
--- a/pkgs/by-name/li/libclipboard/package.nix
+++ b/pkgs/by-name/li/libclipboard/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-553hNG8QUlt/Aff9EKYr6w279ELr+2MX7nh1SKIklhA=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   buildInputs = [
     libxcb
     libXau
diff --git a/pkgs/by-name/li/libcmatrix/package.nix b/pkgs/by-name/li/libcmatrix/package.nix
index 2356e3936073..b12a53b70f3b 100644
--- a/pkgs/by-name/li/libcmatrix/package.nix
+++ b/pkgs/by-name/li/libcmatrix/package.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcmatrix";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "libcmatrix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Usaqkb6zClVtYCL1VUv4iNeKs2GZECO9sOdPk3N8iLM=";
+    hash = "sha256-MyjgxOJmaDylPA2AENZPR+dfh2UN1H93ZOLMlycEmTw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix
index ffcf1683533b..d8261ba99721 100644
--- a/pkgs/by-name/li/libcork/package.nix
+++ b/pkgs/by-name/li/libcork/package.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
       --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
       --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \
       --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR}
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix
index f4bc7bd4f34f..f3042e13ac8e 100644
--- a/pkgs/by-name/li/libcosmicAppHook/package.nix
+++ b/pkgs/by-name/li/libcosmicAppHook/package.nix
@@ -7,6 +7,7 @@
   lib,
   stdenv,
   makeSetupHook,
+  runCommand,
   makeBinaryWrapper,
   pkg-config,
   targetPackages,
@@ -44,8 +45,16 @@ makeSetupHook {
     ];
 
   substitutions = {
-    fallbackXdgDirs = "${lib.optionalString includeSettings "${targetPackages.cosmic-settings}/share:"}${targetPackages.cosmic-icons}/share";
-
+    fallbackXdgDirs =
+      let
+        fallbackThemes = runCommand "cosmic-fallback-themes" { } ''
+          mkdir -p $out/share
+          ln -s ${targetPackages.cosmic-settings}/share/cosmic $out/share/cosmic
+        '';
+      in
+      lib.makeSearchPath "share" (
+        lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons ]
+      );
     cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;
     # force linking for all libraries that may be dlopen'd by libcosmic/iced apps
     cargoLinkLibs = lib.escapeShellArgs (
diff --git a/pkgs/by-name/li/libcpucycles/package.nix b/pkgs/by-name/li/libcpucycles/package.nix
index 728795aa7f6d..fc1a46d76d8d 100644
--- a/pkgs/by-name/li/libcpucycles/package.nix
+++ b/pkgs/by-name/li/libcpucycles/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcpucycles";
-  version = "20240318";
+  version = "20250925";
 
   src = fetchzip {
     url = "https://cpucycles.cr.yp.to/libcpucycles-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Fb73EOHGgEehZJwTCtCG12xwyiqtDXFs9eFDsHBQiDo=";
+    hash = "sha256-hYHNTuohYztLJJonm9wAkx/wlINWfgX8eL2m31xBuwM=";
   };
 
   patches = [ ./environment-variable-tools.patch ];
diff --git a/pkgs/by-name/li/libdaemon/package.nix b/pkgs/by-name/li/libdaemon/package.nix
index 7be36bcece73..5a2013bfe03c 100644
--- a/pkgs/by-name/li/libdaemon/package.nix
+++ b/pkgs/by-name/li/libdaemon/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Can't run this test while cross-compiling
-    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+    "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ];
 
   meta = {
diff --git a/pkgs/by-name/li/libdatovka/package.nix b/pkgs/by-name/li/libdatovka/package.nix
index ab55e106dd7f..ea2f021bc412 100644
--- a/pkgs/by-name/li/libdatovka/package.nix
+++ b/pkgs/by-name/li/libdatovka/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdatovka";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";
-    sha256 = "sha256-qVbSxPLYe+PjGwRH2U/V2Ku2X1fRPbDOUjFamCsYVgY=";
+    sha256 = "sha256-pct+COy7ibyNtwB8l/vDnEHBUEihlo5OaoXWXVRJBrQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/libdecor/package.nix b/pkgs/by-name/li/libdecor/package.nix
index 1c1d8931ea8d..4e1c2e3e8819 100644
--- a/pkgs/by-name/li/libdecor/package.nix
+++ b/pkgs/by-name/li/libdecor/package.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libdecor";
-  version = "0.2.3";
+  version = "0.2.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "libdecor";
     repo = "libdecor";
     rev = version;
-    hash = "sha256-7h/Xfw8chzRmmWKcOyIB7KSL+ZzNGDpElfE22ReoJqY=";
+    hash = "sha256-l0MmNpC+449BaluynbzG5d0/v57F5rltOIBzBagkYbc=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 9b5035bba17d..faa0400b20d8 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "2.20.0";
+  version = "2.25.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-QPKy88c/GLeazGCjNYHj5kOxwiuvjJ/+pM4SQ4TZ1sw=";
+    hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit version src;
-    hash = "sha256-2Js4VQsXf1ApRq9Vf1xwX/1BXiFUQgykvofb2ykOdcc=";
+    hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libdex/package.nix b/pkgs/by-name/li/libdex/package.nix
index 34078fc48c3c..f9901e8b3ae3 100644
--- a/pkgs/by-name/li/libdex/package.nix
+++ b/pkgs/by-name/li/libdex/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libdex";
-  version = "0.10.1";
+  version = "1.0.0";
 
   outputs = [
     "out"
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libdex/${lib.versions.majorMinor finalAttrs.version}/libdex-${finalAttrs.version}.tar.xz";
-    hash = "sha256-dHLogJDbKyKDB1Be3rpEg+hyaBNAywQErmSsPaW+0KY=";
+    hash = "sha256-e49cXbN5bhThLhBCLiNWdmuoMLkoFf7nC7yGe1sgf10=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libdisplay-info/package.nix b/pkgs/by-name/li/libdisplay-info/package.nix
index 97406754be65..020c587cb7c6 100644
--- a/pkgs/by-name/li/libdisplay-info/package.nix
+++ b/pkgs/by-name/li/libdisplay-info/package.nix
@@ -10,16 +10,16 @@
   v4l-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libdisplay-info";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "emersion";
     repo = "libdisplay-info";
-    rev = version;
-    sha256 = "sha256-6xmWBrPHghjok43eIDGeshpUEQTuwWLXNHg7CnBUt3Q=";
+    rev = finalAttrs.version;
+    sha256 = "sha256-nXf2KGovNKvcchlHlzKBkAOeySMJXgxMpbi5z9gLrdc=";
   };
 
   depsBuildBuild = [ pkg-config ];
@@ -44,4 +44,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ pedrohlc ];
   };
-}
+})
diff --git a/pkgs/by-name/li/libdisplay-info_0_2/package.nix b/pkgs/by-name/li/libdisplay-info_0_2/package.nix
new file mode 100644
index 000000000000..802dc582ebd2
--- /dev/null
+++ b/pkgs/by-name/li/libdisplay-info_0_2/package.nix
@@ -0,0 +1,18 @@
+{
+  libdisplay-info,
+  fetchFromGitLab,
+}:
+
+libdisplay-info.overrideAttrs (
+  finalAttrs: oldAttrs: {
+    version = "0.2.0";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "emersion";
+      repo = "libdisplay-info";
+      rev = finalAttrs.version;
+      sha256 = "sha256-6xmWBrPHghjok43eIDGeshpUEQTuwWLXNHg7CnBUt3Q=";
+    };
+  }
+)
diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix
index 8a19697e882a..ab7827cfa43f 100644
--- a/pkgs/by-name/li/libdnf/package.nix
+++ b/pkgs/by-name/li/libdnf/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libdnf";
-  version = "0.74.0";
+  version = "0.75.0";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "rpm-software-management";
     repo = "libdnf";
     tag = version;
-    hash = "sha256-NAnE8VPz2j7h/gB1A4FDwG/x7ki7QEmBjcfvOb6/+VY=";
+    hash = "sha256-ujkJVeI6wgapTW1DBIhj4F/rXJFBb+KdREpc5jfU124=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index ab6b129b9b1c..9c38c381502e 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.125";
+  version = "2.4.127";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-1LrpJ5elD4GpNSR2LgQQpJzYTPoPmXeVvAFyrI+x2Wo=";
+    hash = "sha256-BRrrPlQqV2IQGP/EQ/sIjdabeO7wzkgItgTOD+rJ9H8=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix
index 14bb1f1c532c..6f3caa1f45da 100644
--- a/pkgs/by-name/li/libedit/package.nix
+++ b/pkgs/by-name/li/libedit/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libedit";
-  version = "20250104-3.1";
+  version = "20251016-3.1";
 
   src = fetchurl {
     url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-I3knAWlFUKU3IGMM0c1hZxAbV3Ot3ctBBPc0W3OlaKw=";
+    hash = "sha256-ITYrAGU7v8HHH3GnV42ma1tSA1WdQxNNLddxnjE84EE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index c408b12bac40..c73090a25a29 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   mesonFlags = [
-    "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}"
-    "-Dglx=${if x11Support then "yes" else "no"}"
+    "-Degl=${lib.boolToYesNo (x11Support && !stdenv.hostPlatform.isDarwin)}"
+    "-Dglx=${lib.boolToYesNo x11Support}"
     "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
     "-Dx11=${lib.boolToString x11Support}"
   ];
diff --git a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
deleted file mode 100644
index 2635d6ab829e..000000000000
--- a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001
-From: Jappie Klooster <jappieklooster@hotmail.com>
-Date: Fri, 2 Apr 2021 16:01:05 -0400
-Subject: [PATCH] Add cmake install directives
-
-To make nix builds work, it expect a make install command to
-be available.
-Adding these directives seems to fix the build.
-
-If it's no trouble to you, please add them.
----
- CMakeLists.txt | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9db618..425d391 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,10 +4,17 @@ project(libevdevPlus)
- set(SOURCE_FILES
-         evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp)
- 
-+include(GNUInstallDirs)
-+
- add_library(evdevPlus ${SOURCE_FILES})
- target_include_directories(evdevPlus PUBLIC .)
- 
- add_executable(evdevPlus_test test.cpp)
- target_link_libraries(evdevPlus_test evdevPlus)
- 
--configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
-\ No newline at end of file
-+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
-+
-+install(TARGETS evdevPlus
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp
-+        DESTINATION include/)
--- 
-2.29.2
-
diff --git a/pkgs/by-name/li/libevdevplus/package.nix b/pkgs/by-name/li/libevdevplus/package.nix
deleted file mode 100644
index c89d7faa7865..000000000000
--- a/pkgs/by-name/li/libevdevplus/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libevdevplus";
-  version = "unstable-2021-04-02";
-
-  # adds missing cmake install directives
-  # https://github.com/YukiWorkshop/libevdevPlus/pull/10
-  patches = [ ./0001-Add-cmake-install-directives.patch ];
-
-  src = fetchFromGitHub {
-    owner = "YukiWorkshop";
-    repo = "libevdevPlus";
-    rev = "b4d4b3143056424a3da9f0516ca02a47209ef757";
-    sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Easy-to-use event device library in C++";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix
index 11b83ef7a87c..47ce9db99b9b 100644
--- a/pkgs/by-name/li/libfabric/package.nix
+++ b/pkgs/by-name/li/libfabric/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libfabric";
-  version = "2.3.0";
+  version = "2.3.1";
 
   enableParallelBuilding = true;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "ofiwg";
     repo = "libfabric";
     rev = "v${version}";
-    sha256 = "sha256-pxSv6mg51It4+P1nAgXdWizTGpI31rn5+n3f4vD6ooY=";
+    sha256 = "sha256-Zaf7iGr2/HWiMcH7zERz5Y9YzJ0QpHCCs+bU+qmoQTI=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libfann/package.nix b/pkgs/by-name/li/libfann/package.nix
index 2cccdac05c1d..7e5623c858ac 100644
--- a/pkgs/by-name/li/libfann/package.nix
+++ b/pkgs/by-name/li/libfann/package.nix
@@ -5,15 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "libfann";
-  version = "2.2.0";
+  version = "2.2.0-unstable-2025-10-13";
 
   src = fetchFromGitHub {
     owner = "libfann";
     repo = "fann";
-    rev = version;
-    sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y";
+    rev = "3907e1b37f94ed606b627c55dd2238956046a19b";
+    sha256 = "sha256-UdEpUD7ASrqygwFgW4CdCDGIJtUTKeJbHZDnnQI5jSI=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libfilezilla/package.nix b/pkgs/by-name/li/libfilezilla/package.nix
index 0f2b1fc9619b..f9bb201a5a44 100644
--- a/pkgs/by-name/li/libfilezilla/package.nix
+++ b/pkgs/by-name/li/libfilezilla/package.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation {
   pname = "libfilezilla";
-  version = "0.49.0";
+  version = "0.51.1";
 
   src = fetchsvn {
     url = "https://svn.filezilla-project.org/svn/libfilezilla/trunk";
-    rev = "11192";
-    hash = "sha256-fm1cenGwYcPz0TtMzbPXrZA7nAzwo8toBNA9cW2Gnh0=";
+    rev = "11305";
+    hash = "sha256-s+KeMlKJMz88lQ6d3dpcgZhCkcPW0cHNHALteMWLhpk=";
   };
 
   nativeBuildInputs = [
@@ -42,7 +42,10 @@ stdenv.mkDerivation {
     homepage = "https://lib.filezilla-project.org/";
     description = "Modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ pSub ];
+    maintainers = with maintainers; [
+      pSub
+      iedame
+    ];
     platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
deleted file mode 100644
index f112bc9e5b90..000000000000
--- a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  rpm,
-  cpio,
-  glib,
-  gusb,
-  pixman,
-  libgudev,
-  nss,
-  libfprint,
-  cairo,
-  pkg-config,
-  autoPatchelfHook,
-  makePkgconfigItem,
-  copyPkgconfigItems,
-}:
-
-# https://discourse.nixos.org/t/request-for-libfprint-port-for-2808-a658/55474
-let
-  # The provided `.so`'s name in the binary package we fetch and unpack
-  libso = "libfprint-2.so.2.0.0";
-in
-stdenv.mkDerivation rec {
-  pname = "libfprint-focaltech-2808-a658";
-  version = "1.94.4";
-  # https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/413#note_2476573
-  src = fetchurl {
-    url = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658/raw/b040ccd953c27e26c1285c456b4264e70b36bc3f/libfprint-2-2-${version}+tod1-FT9366_20240627.x86_64.rpm";
-    hash = "sha256-MRWHwBievAfTfQqjs1WGKBnht9cIDj9aYiT3YJ0/CUM=";
-  };
-
-  nativeBuildInputs = [
-    rpm
-    cpio
-    pkg-config
-    autoPatchelfHook
-    copyPkgconfigItems
-  ];
-
-  buildInputs = [
-    stdenv.cc.cc
-    glib
-    gusb
-    pixman
-    nss
-    libgudev
-    libfprint
-    cairo
-  ];
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    rpm2cpio $src | cpio -idmv
-
-    runHook postUnpack
-  '';
-
-  # custom pkg-config based on libfprint's pkg-config
-  pkgconfigItems = [
-    (makePkgconfigItem rec {
-      name = "libfprint-2";
-      inherit version;
-      inherit (meta) description;
-      cflags = [ "-I${variables.includedir}/libfprint-2" ];
-      libs = [
-        "-L${variables.libdir}"
-        "-lfprint-2"
-      ];
-      variables = rec {
-        prefix = "${placeholder "out"}";
-        includedir = "${prefix}/include";
-        libdir = "${prefix}/lib";
-      };
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm444 usr/lib64/${libso} -t $out/lib
-
-    # create this symlink as it was there in libfprint
-    ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so
-    ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so.2
-
-    # get files from libfprint required to build the package
-    cp -r ${libfprint}/lib/girepository-1.0 $out/lib
-    cp -r ${libfprint}/include $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Focaltech Fingerprint driver for focaltech 0x2808:0xa658";
-    homepage = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658";
-    license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.imsick ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-    broken = true; # needs older version of fprintd (v1.94.4)
-  };
-}
diff --git a/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch b/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch
new file mode 100644
index 000000000000..8c8550a1ce2b
--- /dev/null
+++ b/pkgs/by-name/li/libgit2/fix-ssh-custom-heap-buffer-overflow.patch
@@ -0,0 +1,31 @@
+commit 4277cc75bc147d0af6ffddc7db96f48492977968
+Author: bakersdozen123 <taunts_bakers_3r@icloud.com>
+Date:   Sat Oct 11 09:56:48 2025 -0700
+
+    ssh: fix custom ssh heap buffer overflow
+    
+    The `ssh_custom_free()` function calls `strlen()` on the `publickey`
+    field, which stores binary data, not a null-terminated string. This
+    causes a heap buffer overflow when the public key data is not
+    null-terminated or contains embedded null bytes.
+    
+    The `publickey` field stores binary data, as required by the underlying
+    `libssh2_userauth_publickey()` function, which accepts a public key
+    parameter of the type `const unsigned char*`.
+    
+    Use the stored `publickey_len` instead of `strlen()` to determine the
+    correct buffer size.
+
+diff --git a/src/libgit2/transports/credential.c b/src/libgit2/transports/credential.c
+index b47bd63a1..7d0eacecf 100644
+--- a/src/libgit2/transports/credential.c
++++ b/src/libgit2/transports/credential.c
+@@ -161,7 +161,7 @@ static void ssh_custom_free(struct git_credential *cred)
+ 
+ 	if (c->publickey) {
+ 		/* Zero the memory which previously held the publickey */
+-		size_t key_len = strlen(c->publickey);
++		size_t key_len = c->publickey_len;
+ 		git__memzero(c->publickey, key_len);
+ 		git__free(c->publickey);
+ 	}
diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix
index a46c13c4bcca..a244a72cfa3d 100644
--- a/pkgs/by-name/li/libgit2/package.nix
+++ b/pkgs/by-name/li/libgit2/package.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=";
   };
 
+  patches = [
+    # https://github.com/libgit2/libgit2/pull/7146
+    ./fix-ssh-custom-heap-buffer-overflow.patch
+  ];
+
   cmakeFlags = [
     "-DREGEX_BACKEND=pcre2"
     "-DUSE_HTTP_PARSER=llhttp"
diff --git a/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch
new file mode 100644
index 000000000000..35b22f06fa36
--- /dev/null
+++ b/pkgs/by-name/li/libglycin/fix-glycin-3-paths.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/glycin/src/sandbox.rs b/vendor/glycin/src/sandbox.rs
+index 90cd5f6..17a6469 100644
+--- a/vendor/glycin/src/sandbox.rs
++++ b/vendor/glycin/src/sandbox.rs
+@@ -251,7 +251,7 @@ impl Sandbox {
+     }
+ 
+     async fn bwrap_command(&self, seccomp_memfd: &Memfd) -> Result<Command, Error> {
+-        let mut command = Command::new("bwrap");
++        let mut command = Command::new("@bwrap@");
+ 
+         command.args([
+             "--unshare-all",
diff --git a/pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch b/pkgs/by-name/li/libglycin/fix-glycin-paths.patch
similarity index 100%
rename from pkgs/by-name/gl/glycin-loaders/fix-glycin-paths.patch
rename to pkgs/by-name/li/libglycin/fix-glycin-paths.patch
diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix
index 220d59e878a1..0d99435f4056 100644
--- a/pkgs/by-name/li/libglycin/package.nix
+++ b/pkgs/by-name/li/libglycin/package.nix
@@ -7,14 +7,17 @@
   pkg-config,
   rustc,
   cargo,
+  python3,
   rustPlatform,
   vala,
   gi-docgen,
+  gobject-introspection,
   libseccomp,
   lcms2,
   gtk4,
-  gobject-introspection,
   gnome,
+  replaceVars,
+  bubblewrap,
   common-updater-scripts,
   _experimental-update-script-combinators,
   buildPackages,
@@ -24,14 +27,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libglycin";
-  version = "1.2.3";
+  version = "2.0.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "glycin";
     tag = finalAttrs.version;
-    hash = "sha256-O7Z7kzC0BU7FAF1UZC6LbXVIXPDertsAUNYwHAjkzPI=";
+    hash = "sha256-HLvdDQ1rXm2JTUwot07qOIzNaK/sK6zLswips8oIp9c=";
   };
 
   nativeBuildInputs = [
@@ -40,24 +43,25 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     rustc
     cargo
+    python3
     rustPlatform.cargoSetupHook
   ]
   ++ lib.optionals withIntrospection [
     vala
     gi-docgen
+    gobject-introspection
   ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-g2tsQ6q+sUxn3itu3IgZ5EGtDorPzhaO5B1hlEW5xzs=";
+    hash = "sha256-IaiQ1OdmlBcIYyruG6p/rrOxq7x8csF/W3ONerh2lAA=";
   };
 
   buildInputs = [
     libseccomp
     lcms2
     gtk4
-  ]
-  ++ lib.optionals withIntrospection [ gobject-introspection ];
+  ];
 
   propagatedBuildInputs = [
     libseccomp
@@ -66,12 +70,20 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     (lib.mesonBool "glycin-loaders" false)
+    (lib.mesonBool "glycin-thumbnailer" false)
     (lib.mesonBool "libglycin" true)
     (lib.mesonBool "introspection" withIntrospection)
     (lib.mesonBool "vapi" withIntrospection)
     (lib.mesonBool "capi_docs" withIntrospection)
   ];
 
+  postPatch = ''
+    patch -p2 < ${finalAttrs.passthru.glycin3PathsPatch}
+
+    patchShebangs \
+      build-aux/crates-version.py
+  '';
+
   passthru = {
     updateScript =
       let
@@ -100,6 +112,14 @@ stdenv.mkDerivation (finalAttrs: {
         updateSource
         updateLockfile
       ];
+
+    glycinPathsPatch = replaceVars ./fix-glycin-paths.patch {
+      bwrap = "${bubblewrap}/bin/bwrap";
+    };
+
+    glycin3PathsPatch = replaceVars ./fix-glycin-3-paths.patch {
+      bwrap = "${bubblewrap}/bin/bwrap";
+    };
   };
 
   meta = {
@@ -111,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl21Plus
     ];
     maintainers = with lib.maintainers; [ normalcea ];
+    teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
     pkgConfigModules = [
       "glycin-1"
diff --git a/pkgs/by-name/li/libgpiod/package.nix b/pkgs/by-name/li/libgpiod/package.nix
index b40cb39b86ff..ed6b3ca2fa1c 100644
--- a/pkgs/by-name/li/libgpiod/package.nix
+++ b/pkgs/by-name/li/libgpiod/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--enable-tools=${if enable-tools then "yes" else "no"}"
+    "--enable-tools=${lib.boolToYesNo enable-tools}"
     "--enable-bindings-cxx"
   ];
 
diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix
index f1c4908a2683..39aa5b933d01 100644
--- a/pkgs/by-name/li/libgpiod_1/package.nix
+++ b/pkgs/by-name/li/libgpiod_1/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--enable-tools=${if enable-tools then "yes" else "no"}"
+    "--enable-tools=${lib.boolToYesNo enable-tools}"
     "--enable-bindings-cxx"
     "--prefix=${placeholder "out"}"
   ]
diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index 2ac0eb645df0..c69af0dda7cd 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "man"
+    "lib"
   ];
 
   src = fetchFromGitHub {
@@ -57,7 +58,13 @@ stdenv.mkDerivation rec {
   ];
 
   # Fix installation path for gdk-pixbuf module
-  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";
+  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "lib"}/${gdk-pixbuf.moduleDir}";
+
+  postInstall = ''
+    substituteInPlace $out/share/thumbnailers/heif.thumbnailer \
+      --replace-fail "TryExec=heif-thumbnailer" "TryExec=$bin/bin/heif-thumbnailer" \
+      --replace-fail "Exec=heif-thumbnailer" "Exec=$bin/bin/heif-thumbnailer"
+  '';
 
   # Wrong include path in .cmake.  It's a bit difficult to patch because of special characters.
   postFixup = ''
diff --git a/pkgs/by-name/li/libhomfly/package.nix b/pkgs/by-name/li/libhomfly/package.nix
index d215d398b659..0a31d077ca76 100644
--- a/pkgs/by-name/li/libhomfly/package.nix
+++ b/pkgs/by-name/li/libhomfly/package.nix
@@ -3,18 +3,19 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  pkg-config,
   boehmgc,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.02r6";
+  version = "1.03";
   pname = "libhomfly";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
     repo = "libhomfly";
     rev = version;
-    sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s=";
+    hash = "sha256-lav/c5i4TXiQSp4r376sy7s+xLO85GutTb/UZJ70gh8=";
   };
 
   buildInputs = [
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    pkg-config
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/li/libhv/package.nix b/pkgs/by-name/li/libhv/package.nix
index c7fabd5eb5c6..54e168cb80ee 100644
--- a/pkgs/by-name/li/libhv/package.nix
+++ b/pkgs/by-name/li/libhv/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libhv";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "ithewei";
     repo = "libhv";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-YIWXdAZsWeSdtPtBaf/t9t68dFKw2nY0bvgMrzCEE5U=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -26,19 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DENABLE_UDS=ON"
-    "-DWITH_MQTT=ON"
-    "-DWITH_CURL=ON"
-    "-DWITH_NGHTTP2=ON"
-    "-DWITH_OPENSSL=ON"
-    "-DWITH_KCP=ON"
+    (lib.cmakeBool "ENABLE_UDS" true)
+    (lib.cmakeBool "WITH_MQTT" true)
+    (lib.cmakeBool "WITH_CURL" true)
+    (lib.cmakeBool "WITH_NGHTTP2" true)
+    (lib.cmakeBool "WITH_OPENSSL" true)
+    (lib.cmakeBool "WITH_KCP" true)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "C/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server";
     homepage = "https://github.com/ithewei/libhv";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/libigl/package.nix b/pkgs/by-name/li/libigl/package.nix
index 1fc21b8f63d4..1ef1a6d73324 100644
--- a/pkgs/by-name/li/libigl/package.nix
+++ b/pkgs/by-name/li/libigl/package.nix
@@ -20,6 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -p $out/include
     cp -r include/igl $out/include
+    rm -rf $out/include/igl/opengl
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/libiio/package.nix b/pkgs/by-name/li/libiio/package.nix
index 1c0690012b57..0add09932f8c 100644
--- a/pkgs/by-name/li/libiio/package.nix
+++ b/pkgs/by-name/li/libiio/package.nix
@@ -83,6 +83,11 @@ stdenv.mkDerivation rec {
   + lib.optionalString pythonSupport ''
     # Hardcode path to the shared library into the bindings.
     sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
+  ''
+  + lib.optionalString (pythonSupport && stdenv.hostPlatform.isDarwin) ''
+    # Because we’re not building the framework, always use the dylib.
+    substituteInPlace bindings/python/setup.py.cmakein \
+      --replace-fail '"iio" if "Darwin" in _system() else' ""
   '';
 
   postInstall = lib.optionalString pythonSupport ''
diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix
index 83c0aa518c91..e343ffe2b0fa 100644
--- a/pkgs/by-name/li/libime/package.nix
+++ b/pkgs/by-name/li/libime/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libime";
-  version = "1.1.11";
+  version = "1.1.12";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "libime";
     tag = version;
-    hash = "sha256-C9l7VBSUdSpnt+8ghdmLljZXHFswTyi/ItqeeYTjF4Y=";
+    hash = "sha256-LqbwXpmqUCbaKHaaE9pOrHb1Qdp20/S3QEf9F4/3oiE=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/li/libimobiledevice/package.nix b/pkgs/by-name/li/libimobiledevice/package.nix
index 9a630dedf1fb..5c1909b5eb95 100644
--- a/pkgs/by-name/li/libimobiledevice/package.nix
+++ b/pkgs/by-name/li/libimobiledevice/package.nix
@@ -9,6 +9,7 @@
   libgcrypt,
   libplist,
   libtasn1,
+  libtatsu,
   libusbmuxd,
   libimobiledevice-glue,
   unstableGitUpdater,
@@ -16,25 +17,15 @@
 
 stdenv.mkDerivation rec {
   pname = "libimobiledevice";
-  version = "1.3.0-unstable-2024-05-20";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "libimobiledevice";
-    rev = "9ccc52222c287b35e41625cc282fb882544676c6";
-    hash = "sha256-pNvtDGUlifp10V59Kah4q87TvLrcptrCJURHo+Y+hs4=";
+    tag = version;
+    hash = "sha256-SWWsa7asCXpcz80VNhxoePWr74QY8SP0byGSCp+nGG0=";
   };
 
-  patches = [
-    # Fix gcc-14 and clang-16 build:
-    #   https://github.com/libimobiledevice/libimobiledevice/pull/1569
-    (fetchpatch {
-      name = "fime.h.patch";
-      url = "https://github.com/libimobiledevice/libimobiledevice/commit/92256c2ae2422dac45d8648a63517598bdd89883.patch";
-      hash = "sha256-sB+wEFuXFoQnuf7ntWfvYuCgWfYbmlPL7EjW0L0F74o=";
-    })
-  ];
-
   preAutoreconf = ''
     export RELEASE_VERSION=${version}
   '';
@@ -51,6 +42,7 @@ stdenv.mkDerivation rec {
     libgcrypt
     libplist
     libtasn1
+    libtatsu
     libusbmuxd
     libimobiledevice-glue
   ];
diff --git a/pkgs/by-name/li/libinfinity/package.nix b/pkgs/by-name/li/libinfinity/package.nix
index f2fe5897e98f..a61ff397ba9d 100644
--- a/pkgs/by-name/li/libinfinity/package.nix
+++ b/pkgs/by-name/li/libinfinity/package.nix
@@ -83,6 +83,8 @@ let
       license = lib.licenses.lgpl2Plus;
       maintainers = [ ];
       platforms = with lib.platforms; linux ++ darwin;
+      # The last successful Darwin Hydra build was in 2024
+      broken = stdenv.hostPlatform.isDarwin;
     };
   };
 in
diff --git a/pkgs/by-name/li/libirecovery/package.nix b/pkgs/by-name/li/libirecovery/package.nix
index 72bb2d167b7b..ebece12070f9 100644
--- a/pkgs/by-name/li/libirecovery/package.nix
+++ b/pkgs/by-name/li/libirecovery/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libirecovery";
-  version = "1.2.1";
+  version = "1.3.1";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     owner = "libimobiledevice";
     repo = "libirecovery";
     rev = version;
-    hash = "sha256-R+oBC7F4op0qoIk3d/WqS4MwzZY3WMAMIqlJfJb188Q=";
+    hash = "sha256-CSDG8mOLvKAIpxmZnNLMKY1HvQIqk66/rkjmzq7F8vY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libitl/package.nix b/pkgs/by-name/li/libitl/package.nix
index ce6c87b115ee..0a478041dfef 100644
--- a/pkgs/by-name/li/libitl/package.nix
+++ b/pkgs/by-name/li/libitl/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bhejnA7FfuopR27heliaE/vNd1Rqvnjj3n/vkjmimAw=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Islamic Tools and Libraries (ITL)";
     longDescription = ''
diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix
index 1313041f2f1b..4d936184afb0 100644
--- a/pkgs/by-name/li/libjodycode/package.nix
+++ b/pkgs/by-name/li/libjodycode/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjodycode";
-  version = "4.0.1";
+  version = "4.1.1";
 
   outputs = [
     "out"
@@ -21,13 +21,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9YdDw7xIuAArQtPYhDeT4AhSwi5fhVJeBl3R+J7PaCw=";
+    hash = "sha256-vuFANaQLJjyRTw+0ggye4TpFiqVa50GaRVKboagsJ7Q=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   env.PREFIX = placeholder "out";
 
+  enableParallelBuilding = true;
+
   passthru.tests = {
     inherit jdupes;
   };
diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
index b2e3417c0920..39b88c637d67 100644
--- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix
+++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
     done
 
     sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0042 OLD)" ""
   '';
 
   preConfigure = ''
diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix
index af5041e2ca5b..d5615b27d1a0 100644
--- a/pkgs/by-name/li/libjxl/package.nix
+++ b/pkgs/by-name/li/libjxl/package.nix
@@ -5,6 +5,7 @@
   fetchpatch,
   brotli,
   cmake,
+  ctestCheckHook,
   giflib,
   gperftools,
   gtest,
@@ -97,6 +98,10 @@ stdenv.mkDerivation rec {
     libhwy
   ];
 
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
+
   cmakeFlags = [
     # For C dependencies like brotli, which are dynamically linked,
     # we want to use the system libraries, so that we don't have to care about
@@ -176,6 +181,30 @@ stdenv.mkDerivation rec {
   # https://github.com/NixOS/nixpkgs/pull/204030#issuecomment-1352768690
   doCheck = with stdenv; !(hostPlatform.isi686 || isDarwin && isx86_64);
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isBigEndian [
+    # https://github.com/libjxl/libjxl/issues/3629
+    "DecodeTest.ProgressionTestLosslessAlpha"
+    "DecodeTest.FlushTestLosslessProgressiveAlpha"
+    "EncodeTest.FrameSettingsTest"
+    "JxlTest.RoundtripAlphaResampling"
+    "JxlTest.RoundtripAlphaResamplingOnlyAlpha"
+    "JxlTest.RoundtripAlpha16"
+    "JxlTest.RoundtripProgressive"
+    "JxlTest.RoundtripProgressiveLevel2Slow"
+    "ModularTest.RoundtripLossyDeltaPalette"
+    "ModularTest.RoundtripLossy"
+    "ModularTest.RoundtripLossy16"
+    "PassesTest.ProgressiveDownsample2DegradesCorrectlyGrayscale"
+    "PassesTest.ProgressiveDownsample2DegradesCorrectly"
+  ];
+
+  ctestFlags = lib.optionals stdenv.hostPlatform.isBigEndian [
+    # https://github.com/libjxl/libjxl/issues/3629
+    # These didn't seem to be accepted via disabledTests
+    "--exclude-regex"
+    ".*bitSqueeze.*"
+  ];
+
   meta = with lib; {
     homepage = "https://github.com/libjxl/libjxl";
     description = "JPEG XL image format reference implementation";
diff --git a/pkgs/by-name/li/libkkc-data/package.nix b/pkgs/by-name/li/libkkc-data/package.nix
deleted file mode 100644
index 85e9f3e7d256..000000000000
--- a/pkgs/by-name/li/libkkc-data/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  python3,
-  libkkc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libkkc-data";
-  version = "0.2.7";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz";
-    sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "build-python3.patch";
-      url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
-      relative = "data/templates/libkkc-data";
-      hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU=";
-    })
-  ];
-
-  nativeBuildInputs = [ python3.pkgs.marisa ];
-
-  strictDeps = true;
-
-  meta = with lib; {
-    description = "Language model data package for libkkc";
-    homepage = "https://github.com/ueno/libkkc";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/li/libkkc/package.nix b/pkgs/by-name/li/libkkc/package.nix
deleted file mode 100644
index 0788ab0cc610..000000000000
--- a/pkgs/by-name/li/libkkc/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  vala,
-  gobject-introspection,
-  intltool,
-  python3,
-  glib,
-  pkg-config,
-  libgee,
-  json-glib,
-  marisa,
-  libkkc-data,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libkkc";
-  version = "0.3.5";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "build-python3.patch";
-      url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
-      hash = "sha256-4IVpcJJFrxmxJGNiRHteleAa6trOwbvMHRTE/qyjOPY=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    vala
-    gobject-introspection
-    python3
-    python3.pkgs.marisa
-    intltool
-    glib
-    pkg-config
-  ];
-
-  buildInputs = [
-    marisa
-    libkkc-data
-  ];
-  enableParallelBuilding = true;
-
-  propagatedBuildInputs = [
-    libgee
-    json-glib
-  ];
-
-  postInstall = ''
-    ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models
-  '';
-
-  meta = with lib; {
-    broken = true;
-    description = "Japanese Kana Kanji conversion input method library";
-    homepage = "https://github.com/ueno/libkkc";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/li/libkrun-efi/package.nix b/pkgs/by-name/li/libkrun-efi/package.nix
new file mode 100644
index 000000000000..e140e811a2ee
--- /dev/null
+++ b/pkgs/by-name/li/libkrun-efi/package.nix
@@ -0,0 +1,117 @@
+{
+  cargo,
+  fetchFromGitHub,
+  fetchurl,
+  fixDarwinDylibNames,
+  lib,
+  libepoxy,
+  libkrun-efi,
+  moltenvk,
+  pkg-config,
+  rustc,
+  rustPlatform,
+  rutabaga_gfx,
+  nix-update-script,
+  stdenv,
+  buildPackages,
+  meson,
+  ninja,
+  vulkan-headers,
+  withGpu ? true,
+}:
+let
+  virglrenderer = stdenv.mkDerivation (finalAttrs: {
+    pname = "virglrenderer";
+    version = "0.10.4d-krunkit";
+
+    src = fetchurl {
+      url = "https://gitlab.freedesktop.org/slp/virglrenderer/-/archive/${finalAttrs.version}/virglrenderer-${finalAttrs.version}.tar.bz2";
+      hash = "sha256-M/buj97QUeY6CYeW0VICD5F6FBPi9ATPGHpNA48xL3o=";
+    };
+
+    separateDebugInfo = true;
+
+    buildInputs = [
+      libepoxy
+      moltenvk
+      vulkan-headers
+    ];
+
+    nativeBuildInputs = [
+      meson
+      ninja
+      pkg-config
+      (buildPackages.python3.withPackages (ps: [ ps.pyyaml ]))
+    ];
+
+    mesonFlags = [
+      (lib.mesonBool "render-server" false)
+      (lib.mesonBool "venus" true)
+      (lib.mesonEnable "drm" false)
+    ];
+
+    meta = {
+      description = "Virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
+      mainProgram = "virgl_test_server";
+      homepage = "https://gitlab.freedesktop.org/slp/virglrenderer";
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = [ lib.maintainers.quinneden ];
+    };
+  });
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libkrun-efi";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = "libkrun";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VhlFyYJ/TH12I3dUq0JTus60rQEJq5H4Pm1puCnJV5A=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-dK3V7HCCvTqmQhB5Op2zmBPa9FO3h9gednU9tpQk+1U=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    fixDarwinDylibNames
+    pkg-config
+    rustc
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs = [
+    libepoxy
+    rutabaga_gfx
+    virglrenderer
+  ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "EFI=1"
+  ]
+  ++ lib.optional withGpu "GPU=1";
+
+  passthru = {
+    tests.withoutGpu = libkrun-efi.override { withGpu = false; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "EFI variant of Libkrun, a dynamic library providing Virtualization-based process isolation capabilities";
+    homepage = "https://github.com/containers/libkrun";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ quinneden ];
+    platforms = [ "aarch64-darwin" ];
+  };
+})
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index ec0937c50037..4b6943d650d5 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  ctestCheckHook,
   pkg-config,
   libuuid,
   openssl,
@@ -14,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libks";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
-    rev = "v${version}";
-    sha256 = "sha256-fiBemt71UJgN0RryGmGiK7sob1xbdmSOArEGt5Pg5YM=";
+    tag = "v${version}";
+    hash = "sha256-cBNNCOm+NcIvozN4Z4XnZWBBqq0LVELVqXubQB4JMTU=";
   };
 
   patches = [
@@ -43,16 +44,35 @@ stdenv.mkDerivation rec {
   ++ lib.optional stdenv.hostPlatform.isLinux libuuid
   ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid;
 
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  disabledTests = [
+    # Runs into certificate error on aarch64
+    # [ERROR] [...] testhttp.c:95    init_ssl [...] SSL ERR: CERT CHAIN FILE ERROR
+    "testhttp"
+
+    # Runs into what seems like an overflow / memory corruption in the testing framework on the community runner.
+    # Doesn't happen on local ARM hardware, maybe due to unexpectedly high core count?
+    "testthreadmutex"
+  ];
+
+  # Something seems to go wrong with testwebsock2 when using parallelism
+  enableParallelChecking = false;
+
   passthru = {
     tests.freeswitch = freeswitch;
     updateScript = nix-update-script { };
   };
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Foundational support for signalwire C products";
     homepage = "https://github.com/signalwire/libks";
     maintainers = with lib.maintainers; [ misuzu ];
+    teams = [ lib.teams.ngi ];
     platforms = platforms.unix;
     license = licenses.mit;
   };
diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix
index 905cc1cb9a16..86fb56ebb3ce 100644
--- a/pkgs/by-name/li/liblaxjson/package.nix
+++ b/pkgs/by-name/li/liblaxjson/package.nix
@@ -18,11 +18,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Library for parsing JSON config files";
     homepage = "https://github.com/andrewrk/liblaxjson";
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = [ maintainers.andrewrk ];
   };
 }
diff --git a/pkgs/by-name/li/libleidenalg/package.nix b/pkgs/by-name/li/libleidenalg/package.nix
index 748cc5982264..7c0dfd5e5c2a 100644
--- a/pkgs/by-name/li/libleidenalg/package.nix
+++ b/pkgs/by-name/li/libleidenalg/package.nix
@@ -6,15 +6,15 @@
   igraph,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libleidenalg";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "libleidenalg";
-    tag = version;
-    hash = "sha256-hEES/OHvgN0yRDp5ZBZTCQfWr1j7s8NqE+Sp9WMHEEY=";
+    tag = finalAttrs.version;
+    hash = "sha256-ptfX31/1cUHLluc+Y+g28s4BEoGC0LqC9HH0cpkJRJQ=";
   };
 
   nativeBuildInputs = [
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    changelog = "https://github.com/vtraag/libleidenalg/blob/${version}/CHANGELOG";
+    changelog = "https://github.com/vtraag/libleidenalg/blob/${finalAttrs.src.tag}/CHANGELOG";
     description = "C++ library of Leiden algorithm";
     homepage = "https://github.com/vtraag/libleidenalg";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/li/liblognorm/package.nix b/pkgs/by-name/li/liblognorm/package.nix
index 0075d0fe5a85..08fef652993f 100644
--- a/pkgs/by-name/li/liblognorm/package.nix
+++ b/pkgs/by-name/li/liblognorm/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liblognorm";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "http://www.liblognorm.com/files/download/liblognorm-${finalAttrs.version}.tar.gz";
-    hash = "sha256-z/BX6FwiA4mS+e0S641OY8Ra31OlpR+qoyefYFgJ9vI=";
+    hash = "sha256-vp2OekIHAu2NPFvK1zBsLZxs9UtZx3FcYbCIoGDgiUM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index 55645cd648db..416e18fb5d63 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     tag = finalAttrs.version;
-    hash = "sha256-344CRyIIrIFrDFbdxdGH7iOidoDhfovd3EySXlOF+4M=";
+    hash = "sha256-a1lumBYNEvKVu92JmnhvUvZFsRXy+n1bu6jKOg4pDM0=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/mamba-org/mamba/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Library for the fast Cross-Platform Package Manager";
     homepage = "https://github.com/mamba-org/mamba";
     license = lib.licenses.bsd3;
diff --git a/pkgs/by-name/li/libmanette/package.nix b/pkgs/by-name/li/libmanette/package.nix
index 4baaa27c7178..de3ac59a1065 100644
--- a/pkgs/by-name/li/libmanette/package.nix
+++ b/pkgs/by-name/li/libmanette/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmanette";
-  version = "0.2.12";
+  version = "0.2.13";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libmanette/${lib.versions.majorMinor finalAttrs.version}/libmanette-${finalAttrs.version}.tar.xz";
-    hash = "sha256-SLNJJnGA8dw01AWp4ekLoW8FShnOkHkw5nlJPZEeodg=";
+    hash = "sha256-KHzC/eDeCSkZNmr3V9heezoCSOsbOVNEcm6XlVp32K4=";
   };
 
   depsBuildBuild = lib.optionals withIntrospection [
diff --git a/pkgs/by-name/li/libminc/package.nix b/pkgs/by-name/li/libminc/package.nix
index c30eab86fe5b..207f215e5653 100644
--- a/pkgs/by-name/li/libminc/package.nix
+++ b/pkgs/by-name/li/libminc/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libminc";
-  version = "2.4.06";
+  version = "2.4.07";
 
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "libminc";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-HTt3y0AFM9pkEkWPb9cDmvUz4iBQWfpX7wLF9Vlg8hc=";
+    hash = "sha256-F5c0S4fybkrdpDJQ0nz6MvTdjq1qM1nJVxXuxXbCeSI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix
index 0b57f55611a6..01d422b17e32 100644
--- a/pkgs/by-name/li/libmsquic/package.nix
+++ b/pkgs/by-name/li/libmsquic/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmsquic";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msquic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-si9g67j/A6sbsCWWxs2YhZpXhx34GpxWNOFnWtaqnEQ=";
+    hash = "sha256-V1QAY1E6prAtEDkUVOuBExHaDw91+fW3OKYZr2bQavQ=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/audio/munt/libmt32emu.nix b/pkgs/by-name/li/libmt32emu/package.nix
similarity index 63%
rename from pkgs/applications/audio/munt/libmt32emu.nix
rename to pkgs/by-name/li/libmt32emu/package.nix
index 6d42712f4c8c..e01401581474 100644
--- a/pkgs/applications/audio/munt/libmt32emu.nix
+++ b/pkgs/by-name/li/libmt32emu/package.nix
@@ -5,15 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmt32emu";
   version = "2.7.2";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds=";
+    tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-wXIvdGoup/AOQggkeXvtbi3pXhyKUKWmyt/ZbGzufds=";
   };
 
   outputs = [
@@ -36,11 +36,11 @@ stdenv.mkDerivation rec {
       --replace "$dev/$dev/" "$dev/"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices";
-    license = with licenses; [ lgpl21Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.unix; # Not tested on ReactOS yet :)
+    license = with lib.licenses; [ lgpl21Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.unix; # Not tested on ReactOS yet :)
   };
-}
+})
diff --git a/pkgs/by-name/li/libnats-c/package.nix b/pkgs/by-name/li/libnats-c/package.nix
index 9dce5480e0f3..830d74fa7e2d 100644
--- a/pkgs/by-name/li/libnats-c/package.nix
+++ b/pkgs/by-name/li/libnats-c/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libnats";
-  version = "3.10.1";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.c";
     rev = "v${version}";
-    sha256 = "sha256-hPudV1d+6QkHJzs7Mk47v8LVBfR3UTES/UyhdtMkNJA=";
+    sha256 = "sha256-W1WxaQ33K+N3AHCK3sQWTQo4sN57qW2ZuAGrj6JpgCU=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix
index 55fca95e0493..b0a9b3fd78d1 100644
--- a/pkgs/by-name/li/libnbd/package.nix
+++ b/pkgs/by-name/li/libnbd/package.nix
@@ -16,83 +16,80 @@
   autoreconfHook,
 }:
 
-lib.throwIf (buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05")
-  "OCaml binding are not available for OCaml < 4.05"
+stdenv.mkDerivation rec {
+  pname = "libnbd";
+  version = "1.22.1";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "libnbd";
-    version = "1.22.1";
+  src = fetchurl {
+    url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
+    hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI=";
+  };
 
-    src = fetchurl {
-      url = "https://download.libguestfs.org/libnbd/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
-      hash = "sha256-9oVJrU2YcXGnKaDf8SoHKGtG7vpH5355/DKIiYrchHI=";
-    };
-
-    nativeBuildInputs = [
-      bash-completion
-      pkg-config
-      perl
-      autoreconfHook
+  nativeBuildInputs = [
+    bash-completion
+    pkg-config
+    perl
+    autoreconfHook
+  ]
+  ++ lib.optionals buildPythonBindings [ python3 ]
+  ++ lib.optionals buildOcamlBindings (
+    with ocamlPackages;
+    [
+      findlib
+      ocaml
     ]
-    ++ lib.optionals buildPythonBindings [ python3 ]
-    ++ lib.optionals buildOcamlBindings (
-      with ocamlPackages;
-      [
-        findlib
-        ocaml
-      ]
-    );
+  );
 
-    buildInputs = [
-      fuse
-      fuse3
-      gnutls
-      libxml2
-    ];
+  buildInputs = [
+    fuse
+    fuse3
+    gnutls
+    libxml2
+  ];
 
-    postPatch = lib.optionalString buildOcamlBindings ''
-      substituteInPlace ocaml/Makefile.am \
-          --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib'
+  postPatch = lib.optionalString buildOcamlBindings ''
+    substituteInPlace ocaml/Makefile.am \
+        --replace-fail '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib'
+  '';
+
+  configureFlags = lib.optionals buildPythonBindings [
+    "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
+  ];
+
+  installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ];
+
+  postInstall = lib.optionalString buildPythonBindings ''
+    LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA'
+    install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA
+    substituteAllInPlace $LIBNBD_PYTHON_METADATA
+  '';
+
+  meta = with lib; {
+    homepage = "https://gitlab.com/nbdkit/libnbd";
+    description = "Network Block Device client library in userspace";
+    longDescription = ''
+      NBD — Network Block Device — is a protocol for accessing Block Devices
+      (hard disks and disk-like things) over a Network.  This is the NBD client
+      library in userspace, a simple library for writing NBD clients.
+
+      The key features are:
+      - Synchronous API for ease of use.
+      - Asynchronous API for writing non-blocking, multithreaded clients. You
+        can mix both APIs freely.
+      - High performance.
+      - Minimal dependencies for the basic library.
+      - Well-documented, stable API.
+      - Bindings in several programming languages.
+      - Shell (nbdsh) for command line and scripting.
     '';
-
-    configureFlags = lib.optionals buildPythonBindings [
-      "--with-python-installdir=${placeholder "out"}/${python3.sitePackages}"
+    license = with licenses; lgpl21Plus;
+    maintainers = with maintainers; [
+      humancalico
     ];
-
-    installFlags = [ "bashcompdir=$(out)/share/bash-completion/completions" ];
-
-    postInstall = lib.optionalString buildPythonBindings ''
-      LIBNBD_PYTHON_METADATA='${placeholder "out"}/${python3.sitePackages}/nbd-${version}.dist-info/METADATA'
-      install -Dm644 -T ${./libnbd-metadata} $LIBNBD_PYTHON_METADATA
-      substituteAllInPlace $LIBNBD_PYTHON_METADATA
-    '';
-
-    meta = with lib; {
-      homepage = "https://gitlab.com/nbdkit/libnbd";
-      description = "Network Block Device client library in userspace";
-      longDescription = ''
-        NBD — Network Block Device — is a protocol for accessing Block Devices
-        (hard disks and disk-like things) over a Network.  This is the NBD client
-        library in userspace, a simple library for writing NBD clients.
-
-        The key features are:
-        - Synchronous API for ease of use.
-        - Asynchronous API for writing non-blocking, multithreaded clients. You
-          can mix both APIs freely.
-        - High performance.
-        - Minimal dependencies for the basic library.
-        - Well-documented, stable API.
-        - Bindings in several programming languages.
-        - Shell (nbdsh) for command line and scripting.
-      '';
-      license = with licenses; lgpl21Plus;
-      maintainers = with maintainers; [
-        humancalico
-      ];
-      platforms = with platforms; linux;
-    };
-  }
+    platforms = with platforms; linux;
+    broken = buildOcamlBindings && !lib.versionAtLeast ocamlPackages.ocaml.version "4.05";
+  };
+}
 # TODO: package the 1.6-stable version too
 # TODO: git version needs ocaml
 # TODO: bindings for go
diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix
index 4fe8889e16b2..490566fde01f 100644
--- a/pkgs/by-name/li/libnghttp2_asio/package.nix
+++ b/pkgs/by-name/li/libnghttp2_asio/package.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation {
     openssl
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "High level HTTP/2 C++ library";
     longDescription = ''
diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix
index f0fefcc64767..d814fbab6ce7 100644
--- a/pkgs/by-name/li/libnl-tiny/package.nix
+++ b/pkgs/by-name/li/libnl-tiny/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation {
   pname = "libnl-tiny";
-  version = "0-unstable-2025-03-19";
+  version = "0-unstable-2025-10-20";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libnl-tiny.git";
-    rev = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e";
-    hash = "sha256-j5oIEbWqVWd7rNpCMm9+WZwud43uTGeHG81lmzQOoeY=";
+    rev = "c69fb5ef80b9780fe9add345052aef9ccb5d51f4";
+    hash = "sha256-QH4w++kekejvvgTye6djs0jYzcNsxfrE3XCBed+Oizo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix
index 8345b27ae222..5403b0d07218 100644
--- a/pkgs/by-name/li/libnotify/package.nix
+++ b/pkgs/by-name/li/libnotify/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -19,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libnotify";
-  version = "0.8.6";
+  version = "0.8.7";
 
   outputs = [
     "out"
@@ -29,11 +30,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-xVQKrvtg4dY7HFh8BfIoTr5y7OfQwOXkp3jP1YRLa1g=";
+    hash = "sha256-S+FSAuxBhPzhrBWZfs5VMNK+Mv6Vc4da6xDjtXOFh0g=";
   };
 
+  patches = [
+    # build: Do not use GDesktopAppInfo if not available
+    # https://gitlab.gnome.org/GNOME/libnotify/-/issues/62
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/13de65ad2a76255ffde5d6da91d246cd7226583b.patch";
+      hash = "sha256-a1wiUQnrncPqL2OTY1sUWyvVcoI54bXPvkIkZAcC6kI=";
+    })
+  ];
+
   mesonFlags = [
-    # disable tests as we don't need to depend on GTK (2/3)
+    # disable tests as we don't need to depend on GTK 4
     "-Dtests=false"
     "-Ddocbook_docs=disabled"
     "-Dgtk_doc=false"
diff --git a/pkgs/by-name/li/libosmo-sigtran/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix
index dee2431912a7..0e661a183f4e 100644
--- a/pkgs/by-name/li/libosmo-sigtran/package.nix
+++ b/pkgs/by-name/li/libosmo-sigtran/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libosmo-sigtran";
-  version = "2.1.0";
+  version = "2.1.2";
 
   # fetchFromGitea hangs
   src = fetchgit {
     url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
     rev = version;
-    hash = "sha256-/MUFTo5Uo60CZV0ZTDVLVgEXrNw9kX5gafq7rJb82Do=";
+    hash = "sha256-/TxD7lc/htm1c24rKfnlYxGsVpxawi3nh7m34mRRhUA=";
   };
 
   configureFlags = [ "--with-systemdsystemunitdir=$out" ];
diff --git a/pkgs/by-name/li/libosmoabis/package.nix b/pkgs/by-name/li/libosmoabis/package.nix
index ad13ba6ad468..376ea6a18a69 100644
--- a/pkgs/by-name/li/libosmoabis/package.nix
+++ b/pkgs/by-name/li/libosmoabis/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libosmoabis";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmo-abis";
     rev = version;
-    hash = "sha256-TxK+r+GhqPjvFYA3AX3JXjRwhEyjoLcPTR1lpkgSlUo=";
+    hash = "sha256-OdmegQXdbpwNBepY+7MeUjaEguVo2q9b8lSkRmlXHEc=";
   };
 
   configureFlags = [ "enable_dahdi=false" ];
diff --git a/pkgs/by-name/li/libosmocore/package.nix b/pkgs/by-name/li/libosmocore/package.nix
index 4b21695d7546..334e153a7826 100644
--- a/pkgs/by-name/li/libosmocore/package.nix
+++ b/pkgs/by-name/li/libosmocore/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libosmocore";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "libosmocore";
     rev = version;
-    hash = "sha256-JR1L2ffVqvhylrYWPnWKQ/iihx6in7B3iP6Mo0MHbpw=";
+    hash = "sha256-cEMPz5xmvaBnm+U7G1PttfhR6TXsT2PN2hk2FXHbXpg=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/li/libpanel/package.nix b/pkgs/by-name/li/libpanel/package.nix
index b577910323a3..933bdd7a3a1f 100644
--- a/pkgs/by-name/li/libpanel/package.nix
+++ b/pkgs/by-name/li/libpanel/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpanel";
-  version = "1.10.0";
+  version = "1.10.2";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libpanel/${lib.versions.majorMinor finalAttrs.version}/libpanel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-V4zlEieP8rte7rtVCZOSxSU3pavZvQYpVn8QJTKziyU=";
+    hash = "sha256-zBLo4Q8eSXe9Eq0/+u3NUqwXY0i0r2/l2mhrljJb/gE=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index 6fed03109a4f..1d891e5fd5ae 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.15";
+  version = "9.0.17";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JpQ9I6Bm6HbRYDGZYkif/IWK6PXhGeTl2yY+K3ydLqI=";
+    hash = "sha256-xw159QIBNloMks/888shAEPdfd4WKmIGDRpmJ4h2JsE=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index 86f9068dc88d..2ac26a43b3b8 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   meson,
   ninja,
   pkg-config,
@@ -68,6 +69,15 @@ stdenv.mkDerivation rec {
     qt6Packages.qtbase
   ];
 
+  patches = [
+    # See https://github.com/flatpak/libportal/pull/200
+    (fetchpatch2 {
+      name = "libportal-fix-qt6.9-private-api-usage.patch";
+      url = "https://github.com/flatpak/libportal/commit/796053d2eebe4532aad6bd3fd80cdf3b197806ec.patch?full_index=1";
+      hash = "sha256-TPIKKnZCcp/bmmsaNlDxAsKLTBe6BKPCTOutLjXPCHQ=";
+    })
+  ];
+
   mesonFlags = [
     (lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
     (lib.mesonEnable "backend-gtk4" (variant == "gtk4"))
diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix
index b67e2d525519..259dfb1dbcc2 100644
--- a/pkgs/by-name/li/libprojectm/package.nix
+++ b/pkgs/by-name/li/libprojectm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libprojectm";
-  version = "4.1.4";
+  version = "4.1.5";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gf1k9iSDARp6/M2/Po1wdOEY6y/QG2nq5uhSFU6bxAM=";
+    hash = "sha256-QkA0PprGWaHgN+BfOjEtfCeeQAdzZczjdzzIdSD4CKI=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 886ad3b2f7bb..0e134bdf8afc 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8rw+SPRGWTdlJkrqSk7FXKMgOWSfErlC8FXqQM49o8A=";
+    hash = "sha256-SxBO3isyxiJBwo12mVH6A/pmHxTgjfMhG6KVb7bk5B4=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libre-baskerville/package.nix b/pkgs/by-name/li/libre-baskerville/package.nix
index 848c2c009f05..0cefcbc1c56b 100644
--- a/pkgs/by-name/li/libre-baskerville/package.nix
+++ b/pkgs/by-name/li/libre-baskerville/package.nix
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "http://www.impallari.com/projects/overview/libre-baskerville";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libre-bodoni/package.nix b/pkgs/by-name/li/libre-bodoni/package.nix
index 46d8510ff56d..4b58f7383ff1 100644
--- a/pkgs/by-name/li/libre-bodoni/package.nix
+++ b/pkgs/by-name/li/libre-bodoni/package.nix
@@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec {
     '';
     homepage = "https://github.com/impallari/Libre-Bodoni";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libre-caslon/package.nix b/pkgs/by-name/li/libre-caslon/package.nix
index 6f766f2df98a..9637cdd0be37 100644
--- a/pkgs/by-name/li/libre-caslon/package.nix
+++ b/pkgs/by-name/li/libre-caslon/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     description = "Caslon fonts based on hand-lettered American Caslons of 1960s";
     homepage = "http://www.impallari.com/librecaslon";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libre-franklin/package.nix b/pkgs/by-name/li/libre-franklin/package.nix
index 2af58d8c92f1..662231984d97 100644
--- a/pkgs/by-name/li/libre-franklin/package.nix
+++ b/pkgs/by-name/li/libre-franklin/package.nix
@@ -28,7 +28,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Reinterpretation and expansion based on the 1912 Morris Fuller Benton’s classic";
     homepage = "https://github.com/impallari/Libre-Franklin";
     license = licenses.ofl;
-    maintainers = with maintainers; [ cmfwyp ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix
index 5ace0617d47d..4958285b8bb5 100644
--- a/pkgs/by-name/li/libre/package.nix
+++ b/pkgs/by-name/li/libre/package.nix
@@ -8,13 +8,13 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "3.24.0";
+  version = "4.2.0";
   pname = "libre";
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "re";
     rev = "v${version}";
-    sha256 = "sha256-wcntgFKpVxDlRMF8a7s9UxeXihguiGxTL/PGv9ImB80=";
+    sha256 = "sha256-BMaDkEpOnL1w8+SsPtX3SJPOmdLTURZPX/f1KMz1jhI=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/li/libremines/package.nix b/pkgs/by-name/li/libremines/package.nix
index 96b030dbc339..29747c8becd3 100644
--- a/pkgs/by-name/li/libremines/package.nix
+++ b/pkgs/by-name/li/libremines/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libremines";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "Bollos00";
     repo = "libremines";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JLA+QpPhhEiv75jpzKncBHsC5WGK0dht5jVJx56pz88=";
+    hash = "sha256-DscpRqXho+bZnXDLyii/cZjuL4MRTAQOuX6PUfwXCx8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index 0f30b3f4eccd..c0f33c267998 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "25.8.0";
+  version = "25.10.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    sha256 = "sha256-OJd5wlne5F2fa5pK4i1hRAIzcZlzgOwJjw2UhqkEYfY=";
+    hash = "sha256-SzDSeWTnsXy274H2mkGIHOsW26EoL7aony7Xcb+e+h4=";
   };
 
-  vendorHash = "sha256-kFyOoE+WJ/3hhPg5tC3w/PrDkLgOtJGeOwZEHsTOdG8=";
+  vendorHash = "sha256-OYQsgwbxsXsOM+sn0mJcABtyXVQAKBa6/ghfbZR1jX4=";
 
   php = phpPackage;
 
@@ -103,7 +103,7 @@ phpPackage.buildComposerProject2 rec {
     substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
     substituteInPlace $out/snmp-scan.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
 
-    substituteInPlace $out/lnms --replace-fail '\App\Checks::runningUser();' '//\App\Checks::runningUser(); //removed as nix forces ownership to root'
+    substituteInPlace $out/app/Listeners/CommandStartingListener.php --replace-fail '\App\Checks::runningUser();' '//\App\Checks::runningUser(); //removed as nix forces ownership to root'
 
     wrapProgram $out/daily.sh --prefix PATH : ${phpPackage}/bin
 
diff --git a/pkgs/by-name/li/librespeed-rust/Cargo.lock b/pkgs/by-name/li/librespeed-rust/Cargo.lock
new file mode 100644
index 000000000000..9228eb463366
--- /dev/null
+++ b/pkgs/by-name/li/librespeed-rust/Cargo.lock
@@ -0,0 +1,3369 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "ab_glyph"
+version = "0.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01c0457472c38ea5bd1c3b5ada5e368271cb550be7a4ca4a0b4634e9913f6cc2"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
+[[package]]
+name = "ab_glyph_rasterizer"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "366ffbaa4442f4684d91e2cd7c5ea7c4ed8add41959a31447066e279e432b618"
+
+[[package]]
+name = "addr2line"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5d307320b3181d6d7954e663bd7c774a838b8220fe0593c86d9fb09f498b4b"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aligned-vec"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc890384c8602f339876ded803c97ad529f3842aba97f6392b3dba0dd171769b"
+dependencies = [
+ "equator",
+]
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.6.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+dependencies = [
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+dependencies = [
+ "anstyle",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
+[[package]]
+name = "approx"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+
+[[package]]
+name = "arg_enum_proc_macro"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "av1-grain"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3efb2ca85bc610acfa917b5aaa36f3fcbebed5b3182d7f877b02531c4b80c8"
+dependencies = [
+ "anyhow",
+ "arrayvec",
+ "log",
+ "nom",
+ "num-rational",
+ "v_frame",
+]
+
+[[package]]
+name = "avif-serialize"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47c8fbc0f831f4519fe8b810b6a7a91410ec83031b8233f730a0480029f6a23f"
+dependencies = [
+ "arrayvec",
+]
+
+[[package]]
+name = "backtrace"
+version = "0.3.76"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb531853791a215d7c62a30daf0dde835f381ab5de4589cfe7c649d2cbe92bd6"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-link",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bit_field"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e4b40c7323adcfc0a41c4b88143ed58346ff65a288fc144329c5c45e05d70c6"
+
+[[package]]
+name = "bitflags"
+version = "2.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+
+[[package]]
+name = "bitstream-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6099cdc01846bc367c4e7dd630dc5966dccf36b652fae7a74e17b640411a91b2"
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "btoi"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd6407f73a9b8b6162d8a2ef999fe6afd7cc15902ebf42c5cd296addf17e0ad"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "bufstream"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40e38929add23cdf8a366df9b0e088953150724bcbe5fc330b0d8eb3b328eec8"
+
+[[package]]
+name = "built"
+version = "0.7.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ed6191a7e78c36abdb16ab65341eefd73d64d303fffccdbb00d51e4205967b"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytemuck"
+version = "1.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fbdf580320f38b612e485521afda1ee26d10cc9884efaaa750d383e13e3c5f4"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "case_insensitive_hashmap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ca1ed8675a76594ea5a5ad5cc318d72238cd4975d88f73768508fa577986b8"
+dependencies = [
+ "unicase",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "chrono"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2134bb3ea021b78629caa971416385309e0131b351b25e01dc16fb54e1b5fae"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.48"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ba64afa3c0a6df7fa517765e31314e983f51dda798ffba27b988194fb65dc9"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "clap_lex",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+
+[[package]]
+name = "color_quant"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+
+[[package]]
+name = "console"
+version = "0.15.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8"
+dependencies = [
+ "encode_unicode",
+ "libc",
+ "once_cell",
+ "unicode-width",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core",
+ "darling_macro",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim",
+ "syn",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947"
+dependencies = [
+ "derive_builder_macro",
+]
+
+[[package]]
+name = "derive_builder_core"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8"
+dependencies = [
+ "darling",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "derive_builder_macro"
+version = "0.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
+dependencies = [
+ "derive_builder_core",
+ "syn",
+]
+
+[[package]]
+name = "derive_utils"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccfae181bab5ab6c5478b2ccb69e4c68a02f8c3ec72f6616bfec9dbc599d2ee0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "encode_unicode"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.11.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
+ "jiff",
+ "log",
+]
+
+[[package]]
+name = "equator"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4711b213838dfee0117e3be6ac926007d7f433d7bbe33595975d4190cb07e6fc"
+dependencies = [
+ "equator-macro",
+]
+
+[[package]]
+name = "equator-macro"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44f23cf4b44bfce11a86ace86f8a73ffdec849c9fd00a386a53d278bd9e81fb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "exr"
+version = "1.73.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83197f59927b46c04a183a619b7c29df34e63e63c7869320862268c0ef687e0"
+dependencies = [
+ "bit_field",
+ "half",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
+[[package]]
+name = "fallible-iterator"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
+[[package]]
+name = "fax"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f05de7d48f37cd6730705cbca900770cab77a89f413d23e100ad7fad7795a0ab"
+dependencies = [
+ "fax_derive",
+]
+
+[[package]]
+name = "fax_derive"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0aca10fb742cb43f9e7bb8467c91aa9bcb8e3ffbc6a6f7389bb93ffc920577d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "fdeflate"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e6853b52649d4ac5c0bd02320cddc5ba956bdb407c4b75a2c6b75bf51500f8c"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
+
+[[package]]
+name = "flate2"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04bcaeafafdd3cd1cb5d986ff32096ad1136630207c49b9091e3ae541090d938"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foldhash"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+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.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.7+wasi-0.2.4",
+]
+
+[[package]]
+name = "gif"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae047235e33e2829703574b54fdec96bfbad892062d97fed2f76022287de61b"
+dependencies = [
+ "color_quant",
+ "weezl",
+]
+
+[[package]]
+name = "gimli"
+version = "0.32.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7"
+
+[[package]]
+name = "half"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "459196ed295495a68f7d7fe1d84f6c4b7ff0e21fe3017b2f283c6fac3ad803c9"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+]
+
+[[package]]
+name = "handlebars"
+version = "6.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759e2d5aea3287cb1190c8ec394f42866cb5bf74fcbf213f354e3c856ea26098"
+dependencies = [
+ "derive_builder",
+ "log",
+ "num-order",
+ "pest",
+ "pest_derive",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.17",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+dependencies = [
+ "foldhash",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "hashlink"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
+dependencies = [
+ "hashbrown 0.15.5",
+]
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "image"
+version = "0.25.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "529feb3e6769d234375c4cf1ee2ce713682b8e76538cb13f9fc23e1400a591e7"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "color_quant",
+ "exr",
+ "gif",
+ "image-webp",
+ "moxcms",
+ "num-traits",
+ "png",
+ "qoi",
+ "ravif",
+ "rayon",
+ "rgb",
+ "tiff",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "525e9ff3e1a4be2fbea1fdf0e98686a6d98b4d8f937e1bf7402245af1909e8c3"
+dependencies = [
+ "byteorder-lite",
+ "quick-error",
+]
+
+[[package]]
+name = "imageproc"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2393fb7808960751a52e8a154f67e7dd3f8a2ef9bd80d1553078a7b4e8ed3f0d"
+dependencies = [
+ "ab_glyph",
+ "approx",
+ "getrandom 0.2.16",
+ "image",
+ "itertools",
+ "nalgebra",
+ "num",
+ "rand 0.8.5",
+ "rand_distr",
+ "rayon",
+]
+
+[[package]]
+name = "imgref"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c5cedc30da3a610cac6b4ba17597bdf7152cf974e8aab3afb3d54455e371c8"
+
+[[package]]
+name = "include_dir"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
+dependencies = [
+ "include_dir_macros",
+]
+
+[[package]]
+name = "include_dir_macros"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.0",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235"
+dependencies = [
+ "console",
+ "number_prefix",
+ "portable-atomic",
+ "unicode-width",
+ "web-time",
+]
+
+[[package]]
+name = "interpolate_name"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "io-enum"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d197db2f7ebf90507296df3aebaf65d69f5dce8559d8dbd82776a6cadab61bbf"
+dependencies = [
+ "derive_utils",
+]
+
+[[package]]
+name = "io-uring"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "libc",
+]
+
+[[package]]
+name = "ipnetwork"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf370abdafd54d13e54a620e8c3e1145f28e46cc9d704bc6d94414559df41763"
+
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "jiff"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
+dependencies = [
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.3",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "lebe"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a79a3332a6609480d7d0c9eab957bca6b455b91bb84e66d19f5ff66294b85b8"
+
+[[package]]
+name = "libc"
+version = "0.2.176"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
+dependencies = [
+ "arbitrary",
+ "cc",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags",
+ "libc",
+ "redox_syscall",
+]
+
+[[package]]
+name = "librespeed-rs"
+version = "1.3.8"
+dependencies = [
+ "ab_glyph",
+ "case_insensitive_hashmap",
+ "chrono",
+ "clap",
+ "env_logger",
+ "futures",
+ "handlebars",
+ "imageproc",
+ "include_dir",
+ "indicatif",
+ "listenfd",
+ "log",
+ "maxminddb",
+ "mysql",
+ "postgres",
+ "rusqlite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "sha2",
+ "socket2 0.5.10",
+ "tokio",
+ "tokio-rustls",
+ "toml",
+ "uuid",
+ "webpki-roots",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91632f3b4fb6bd1d72aa3d78f41ffecfcf2b1a6648d8c241dbe7dbfaf4875e15"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "listenfd"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b87bc54a4629b4294d0b3ef041b64c40c611097a677d9dc07b2c67739fe39dba"
+dependencies = [
+ "libc",
+ "uuid",
+ "winapi",
+]
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
+
+[[package]]
+name = "lru"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+
+[[package]]
+name = "matrixmultiply"
+version = "0.3.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a06de3016e9fae57a36fd14dba131fccf49f74b40b7fbdb472f96e361ec71a08"
+dependencies = [
+ "autocfg",
+ "rawpointer",
+]
+
+[[package]]
+name = "maxminddb"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a197e44322788858682406c74b0b59bf8d9b4954fe1f224d9a25147f1880bba"
+dependencies = [
+ "ipnetwork",
+ "log",
+ "memchr",
+ "serde",
+ "thiserror 2.0.17",
+]
+
+[[package]]
+name = "maybe-rayon"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+dependencies = [
+ "cfg-if",
+ "rayon",
+]
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "moxcms"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cc7d85f3d741164e8972ad355e26ac6e51b20fcae5f911c7da8f2d8bbbb3f33"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
+[[package]]
+name = "mysql"
+version = "26.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce2510a735f601bab18202b07ea0a197bd1d130d3a5ce2edf4577d225f0c3ee4"
+dependencies = [
+ "bufstream",
+ "bytes",
+ "crossbeam-queue",
+ "crossbeam-utils",
+ "flate2",
+ "io-enum",
+ "libc",
+ "lru",
+ "mysql_common",
+ "named_pipe",
+ "pem",
+ "percent-encoding",
+ "socket2 0.5.10",
+ "twox-hash",
+ "url",
+]
+
+[[package]]
+name = "mysql_common"
+version = "0.35.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbb9f371618ce723f095c61fbcdc36e8936956d2b62832f9c7648689b338e052"
+dependencies = [
+ "base64",
+ "bitflags",
+ "btoi",
+ "byteorder",
+ "bytes",
+ "crc32fast",
+ "flate2",
+ "getrandom 0.3.3",
+ "num-bigint",
+ "num-traits",
+ "regex",
+ "saturating",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "thiserror 2.0.17",
+ "uuid",
+]
+
+[[package]]
+name = "nalgebra"
+version = "0.32.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4"
+dependencies = [
+ "approx",
+ "matrixmultiply",
+ "num-complex",
+ "num-rational",
+ "num-traits",
+ "simba",
+ "typenum",
+]
+
+[[package]]
+name = "named_pipe"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad9c443cce91fc3e12f017290db75dde490d685cdaaf508d7159d7cf41f0eb2b"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "new_debug_unreachable"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "noop_proc_macro"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-modular"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17bb261bf36fa7d83f4c294f834e91256769097b3cb505d44831e0a179ac647f"
+
+[[package]]
+name = "num-order"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "537b596b97c40fcf8056d153049eb22f481c17ebce72a513ec9286e4986d1bb6"
+dependencies = [
+ "num-modular",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "object"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
+
+[[package]]
+name = "owned_ttf_parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36820e9051aca1014ddc75770aab4d68bc1e9e632f0f5627c4086bc216fb583b"
+dependencies = [
+ "ttf-parser",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
+
+[[package]]
+name = "pem"
+version = "3.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38af38e8470ac9dee3ce1bae1af9c1671fffc44ddfd8bd1d0a3445bf349a8ef3"
+dependencies = [
+ "base64",
+ "serde",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "pest"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4"
+dependencies = [
+ "memchr",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "187da9a3030dbafabbbfb20cb323b976dc7b7ce91fcd84f2f74d6e31d378e2de"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49b401d98f5757ebe97a26085998d6c0eecec4995cad6ab7fc30ffdf4b052843"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72f27a2cfee9f9039c4d86faa5af122a0ac3851441a34865b8a043b46be0065a"
+dependencies = [
+ "pest",
+ "sha2",
+]
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_shared",
+ "serde",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[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.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "png"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97baced388464909d42d89643fe4361939af9b7ce7a31ee32a168f832a70f2a0"
+dependencies = [
+ "bitflags",
+ "crc32fast",
+ "fdeflate",
+ "flate2",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
+[[package]]
+name = "postgres"
+version = "0.19.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8bc19a61586a93e0663e8663dcc37c361f11e44ab0309d23eba1aa5a1965116d"
+dependencies = [
+ "bytes",
+ "fallible-iterator 0.2.0",
+ "futures-util",
+ "log",
+ "tokio",
+ "tokio-postgres",
+]
+
+[[package]]
+name = "postgres-protocol"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4"
+dependencies = [
+ "base64",
+ "byteorder",
+ "bytes",
+ "fallible-iterator 0.2.0",
+ "hmac",
+ "md-5",
+ "memchr",
+ "rand 0.9.2",
+ "sha2",
+ "stringprep",
+]
+
+[[package]]
+name = "postgres-types"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a120daaabfcb0e324d5bf6e411e9222994cb3795c79943a0ef28ed27ea76e4"
+dependencies = [
+ "bytes",
+ "fallible-iterator 0.2.0",
+ "postgres-protocol",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84df19adbe5b5a0782edcab45899906947ab039ccf4573713735ee7de1e6b08a"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "profiling"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3eb8486b569e12e2c32ad3e204dbaba5e4b5b216e9367044f25f1dba42341773"
+dependencies = [
+ "profiling-procmacros",
+]
+
+[[package]]
+name = "profiling-procmacros"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52717f9a02b6965224f95ca2a81e2e0c5c43baacd28ca057577988930b6c3d5b"
+dependencies = [
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pxfm"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83f9b339b02259ada5c0f4a389b7fb472f933aa17ce176fd2ad98f28bb401fde"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "rand"
+version = "0.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.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
+[[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.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.3",
+]
+
+[[package]]
+name = "rand_distr"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
+dependencies = [
+ "num-traits",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "rav1e"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9"
+dependencies = [
+ "arbitrary",
+ "arg_enum_proc_macro",
+ "arrayvec",
+ "av1-grain",
+ "bitstream-io",
+ "built",
+ "cfg-if",
+ "interpolate_name",
+ "itertools",
+ "libc",
+ "libfuzzer-sys",
+ "log",
+ "maybe-rayon",
+ "new_debug_unreachable",
+ "noop_proc_macro",
+ "num-derive",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "profiling",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "simd_helpers",
+ "system-deps",
+ "thiserror 1.0.69",
+ "v_frame",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ravif"
+version = "0.11.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5825c26fddd16ab9f515930d49028a630efec172e903483c94796cfe31893e6b"
+dependencies = [
+ "avif-serialize",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rayon",
+ "rgb",
+]
+
+[[package]]
+name = "rawpointer"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3"
+
+[[package]]
+name = "rayon"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+
+[[package]]
+name = "rgb"
+version = "0.8.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c6a884d2998352bb4daf0183589aec883f16a6da1f4dde84d8e2e9a5409a1ce"
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rusqlite"
+version = "0.36.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3de23c3319433716cf134eed225fe9986bc24f63bed9be9f20c329029e672dc7"
+dependencies = [
+ "bitflags",
+ "fallible-iterator 0.3.0",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+
+[[package]]
+name = "rustls"
+version = "0.23.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd3c25631629d034ce7cd9940adc9d45762d46de2b0f57193c4443b92c6d4d40"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "safe_arch"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96b02de82ddbe1b636e6170c21be622223aea188ef2e139be0a5b219ec215323"
+dependencies = [
+ "bytemuck",
+]
+
+[[package]]
+name = "saturating"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_spanned"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "simba"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "061507c94fc6ab4ba1c9a0305018408e312e17c041eb63bef8aa726fa33aceae"
+dependencies = [
+ "approx",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "wide",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simd_helpers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95890f873bec569a0362c235787f3aca6e1e887302ba4840839bcc6459c42da6"
+dependencies = [
+ "quote",
+]
+
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr",
+ "heck",
+ "pkg-config",
+ "toml",
+ "version-compare",
+]
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl 2.0.17",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tiff"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af9605de7fee8d9551863fd692cce7637f548dbd9db9180fcc07ccc6d26c336f"
+dependencies = [
+ "fax",
+ "flate2",
+ "half",
+ "quick-error",
+ "weezl",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.47.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "io-uring",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "slab",
+ "socket2 0.6.0",
+ "tokio-macros",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "tokio-postgres"
+version = "0.7.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156efe7fff213168257853e1dfde202eed5f487522cbbbf7d219941d753d853"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "fallible-iterator 0.2.0",
+ "futures-channel",
+ "futures-util",
+ "log",
+ "parking_lot",
+ "percent-encoding",
+ "phf",
+ "pin-project-lite",
+ "postgres-protocol",
+ "postgres-types",
+ "rand 0.9.2",
+ "socket2 0.6.0",
+ "tokio",
+ "tokio-util",
+ "whoami",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml"
+version = "0.8.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+dependencies = [
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_write",
+ "winnow",
+]
+
+[[package]]
+name = "toml_write"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
+
+[[package]]
+name = "ttf-parser"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2df906b07856748fa3f6e0ad0cbaa047052d4a7dd609e231c4f72cee8c36f31"
+
+[[package]]
+name = "twox-hash"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c"
+
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
+
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
+
+[[package]]
+name = "unicode-width"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a1a07cc7db3810833284e8d372ccdc6da29741639ecc70c9ec107df0fa6154c"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom 0.3.3",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "v_frame"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "666b7727c8875d6ab5db9533418d7c764233ac9c0cff1d469aec8fa127597be2"
+dependencies = [
+ "aligned-vec",
+ "num-traits",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.7+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "weezl"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
+
+[[package]]
+name = "whoami"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
+dependencies = [
+ "libredox",
+ "wasite",
+ "web-sys",
+]
+
+[[package]]
+name = "wide"
+version = "0.7.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce5da8ecb62bcd8ec8b7ea19f69a51275e91299be594ea5cc6ef7819e16cd03"
+dependencies = [
+ "bytemuck",
+ "safe_arch",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows-core"
+version = "0.62.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6844ee5416b285084d3d3fffd743b925a6c9385455f64f6d4fa3031c4c2749a9"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edb307e42a74fb6de9bf3a02d9712678b22399c87e6fa869d6dfcd8c1b7754e0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0abd1ddbc6964ac14db11c7213d6532ef34bd9aa042c2e5935f59d7908b46a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
+[[package]]
+name = "windows-result"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7084dcc306f89883455a206237404d3eaf961e5bd7e0f312f7c91f57eb44167f"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7218c655a553b0bed4426cf54b20d7ba363ef543b52d515b3e48d7fd55318dda"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.4",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d42b7b7f66d2a06854650af09cfdf8713e427a439c97ad65a6375318033ac4b"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
+
+[[package]]
+name = "zune-inflate"
+version = "0.2.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29ce2c8a9384ad323cf564b67da86e21d3cfdff87908bc1223ed5c99bc792713"
+dependencies = [
+ "zune-core",
+]
diff --git a/pkgs/by-name/li/librespeed-rust/package.nix b/pkgs/by-name/li/librespeed-rust/package.nix
new file mode 100644
index 000000000000..345526b093d2
--- /dev/null
+++ b/pkgs/by-name/li/librespeed-rust/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "librespeed-rust";
+  version = "1.3.8";
+
+  src = fetchFromGitHub {
+    owner = "librespeed";
+    repo = "speedtest-rust";
+    tag = "v${version}";
+    hash = "sha256-TINIKZefT4ngnEtlMjxO56PrQxW5gyb1+higiSnkE3Q=";
+  };
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  # Remove vendored lockfile once <https://github.com/librespeed/speedtest-rust/pull/29> lands.
+  cargoLock.lockFile = ./Cargo.lock;
+
+  postInstall = ''
+    cp -r assets $out/
+  '';
+
+  meta = {
+    description = "Very lightweight speed test implementation in Rust";
+    homepage = "https://github.com/librespeed/speedtest-rust";
+    license = lib.licenses.lgpl3Plus;
+    teams = with lib.teams; [ c3d2 ];
+    mainProgram = "librespeed-rs";
+  };
+}
diff --git a/pkgs/by-name/li/libresplit/package.nix b/pkgs/by-name/li/libresplit/package.nix
index c2bbfefda222..5edd5ba5ac07 100644
--- a/pkgs/by-name/li/libresplit/package.nix
+++ b/pkgs/by-name/li/libresplit/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "libresplit";
-  version = "0-unstable-2025-10-02";
+  version = "0-unstable-2025-10-15";
 
   src = fetchFromGitHub {
     owner = "wins1ey";
     repo = "LibreSplit";
-    rev = "0cb1b5d3eff0245fda17f734388eee609b9a4416";
-    hash = "sha256-3DK+6pK0jSxy5s80u4lweMyiywknJPEG4rovhOPG4go=";
+    rev = "7628922ba2c6b6a9e6d6d144b55d20479d7ceeb3";
+    hash = "sha256-3UXDHmcW6lxXGno5ijG6OlQ58F1z/J2O8S1y2O+7+p4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/librespot-ma/package.nix b/pkgs/by-name/li/librespot-ma/package.nix
index f5e86091c206..dd1f8160d429 100644
--- a/pkgs/by-name/li/librespot-ma/package.nix
+++ b/pkgs/by-name/li/librespot-ma/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "librespot-ma";
-  version = "0.6.0-unstable-2025-08-10";
+  version = "0.7.1-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "librespot";
-    rev = "accecb60a16334013c0c99a5ded553794ee871b7";
-    hash = "sha256-vPiI8llXB6+ahX+iad/Ut81D3iZcTSVmYGDXXwApk/w=";
+    rev = "2af61256649d6c1ed149791a53a20a595b617704";
+    hash = "sha256-sarxS6YArK5luX4TRXJUKhreMqhZbsS/3fCVWHxPNpY=";
   };
 
-  cargoHash = "sha256-Lujz2revTAok9B0hzdl8NVQ5XMRY9ACJzoQHIkIgKMg=";
+  cargoHash = "sha256-CI2BFmQNK1+J2qaKg6u6WM83jwBuWjeh9dROnrF3Kv0=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/by-name/li/libressl/default.nix
similarity index 68%
rename from pkgs/development/libraries/libressl/default.nix
rename to pkgs/by-name/li/libressl/default.nix
index fe8731c0a38f..2667f2c1bf97 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/by-name/li/libressl/default.nix
@@ -37,9 +37,6 @@ let
         # .note.GNU-stack section, and if that section is missing from any object,
         # the linker will make the stack executable.
         "-DCMAKE_C_FLAGS=-DHAVE_GNU_STACK"
-        # libressl will append this to the regular prefix for libdir
-        "-DCMAKE_INSTALL_LIBDIR=lib"
-
         "-DTLS_DEFAULT_CA_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt"
       ]
       ++ lib.optional buildShared "-DBUILD_SHARED_LIBS=ON";
@@ -50,9 +47,6 @@ let
       # removing ./configure pre-config.
       preConfigure = ''
         rm configure
-        substituteInPlace CMakeLists.txt \
-          --replace-fail 'exec_prefix \''${prefix}' "exec_prefix ${placeholder "bin"}" \
-          --replace-fail 'libdir      \''${exec_prefix}' 'libdir \''${prefix}'
       '';
 
       inherit patches;
@@ -86,10 +80,10 @@ let
         moveToOutput "share/man/man1/nc.1.gz" "$nc"
       '';
 
-      meta = with lib; {
+      meta = {
         description = "Free TLS/SSL implementation";
         homepage = "https://www.libressl.org";
-        license = with licenses; [
+        license = with lib.licenses; [
           publicDomain
           bsdOriginal
           bsd0
@@ -98,8 +92,8 @@ let
           isc
           openssl
         ];
-        platforms = platforms.all;
-        maintainers = with maintainers; [
+        platforms = lib.platforms.all;
+        maintainers = with lib.maintainers; [
           thoughtpolice
           fpletz
         ];
@@ -116,45 +110,16 @@ let
         ];
       };
     };
+  # https://github.com/libressl/portable/pull/1206
+  common-cmake-install-full-dirs-patch = fetchpatch {
+    url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch";
+    hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM=";
+  };
 in
 {
-  libressl_3_9 = generic {
-    version = "3.9.2";
-    hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c=";
-
-    patches = [
-      # Fixes build on ppc64
-      # https://github.com/libressl/portable/pull/1073
-      (fetchpatch {
-        url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch";
-        hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw=";
-      })
-    ];
-  };
-
-  libressl_4_0 = generic {
-    version = "4.0.0";
-    hash = "sha256-TYQZVfCsw9/HHQ49018oOvRhIiNQ4mhD/qlzHAJGoeQ=";
-    # Fixes build on loongarch64
-    # https://github.com/libressl/portable/pull/1146
-    patches = [
-      (fetchpatch {
-        name = "0100-ALT-basic-loongarch64-support.patch";
-        url = "https://git.altlinux.org/gears/L/LibreSSL.git?p=LibreSSL.git;a=blob_plain;f=patches/0100-ALT-basic-loongarch64-support.patch;hb=70ddea860b8b62531bd3968bf4d7a5c4b7086776";
-        stripLen = 2;
-        extraPrefix = "";
-        postFetch = ''
-          substituteInPlace "$out" \
-            --replace-fail "a//dev/null" "/dev/null"
-        '';
-        hash = "sha256-dEdtmHHiR7twAqgebXv1Owle/KYCak71NhDCp0PdseU=";
-      })
-    ];
-  };
-
   libressl_4_1 = generic {
-    version = "4.1.0";
-    hash = "sha256-D3HBa9NL2qzNy5al2UpJIb+2EuxuDrp6gNiFTu/Yu2E=";
+    version = "4.1.2";
+    hash = "sha256-+6Ti+ip/UjBt96OJlwoQ6YuX6w7bKZqf252/SZmcYeE=";
     # Fixes build on loongarch64
     # https://github.com/libressl/portable/pull/1184
     postPatch = ''
@@ -166,5 +131,16 @@ in
         }
       } include/arch/loongarch64/opensslconf.h
     '';
+    patches = [
+      common-cmake-install-full-dirs-patch
+    ];
+  };
+
+  libressl_4_2 = generic {
+    version = "4.2.1";
+    hash = "sha256-bVwvWFg1iOp5H0yGRQBAcdAN+lVKW/eIoAbKHrWr1ws=";
+    patches = [
+      common-cmake-install-full-dirs-patch
+    ];
   };
 }
diff --git a/pkgs/by-name/li/libressl/package.nix b/pkgs/by-name/li/libressl/package.nix
new file mode 100644
index 000000000000..f9b05eb9555b
--- /dev/null
+++ b/pkgs/by-name/li/libressl/package.nix
@@ -0,0 +1,5 @@
+{
+  libressl_4_2,
+}:
+
+libressl_4_2
diff --git a/pkgs/by-name/li/libretrack/package.nix b/pkgs/by-name/li/libretrack/package.nix
index ceda0fb98977..22e4c7198518 100644
--- a/pkgs/by-name/li/libretrack/package.nix
+++ b/pkgs/by-name/li/libretrack/package.nix
@@ -31,6 +31,9 @@ flutter329.buildFlutterApplication rec {
     libappindicator
   ];
 
+  # https://github.com/juliansteenbakker/flutter_secure_storage/issues/965
+  CXXFLAGS = [ "-Wno-deprecated-literal-operator" ];
+
   postInstall = ''
     substituteInPlace snap/gui/org.proninyaroslav.libretrack.desktop \
       --replace-fail 'Icon=''${SNAP}/meta/gui/libretrack.png' 'Icon=libretrack' \
diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 101a852e8bde..239c3845eddb 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "b6501536eb7c9de3a41693143254cb021c89e77a";
-    hash = "sha256-gjG/IFthh5cQotc90SgJ8Ei7R/NhoBvjI43K+JhV9v4=";
+    rev = "edfb56fe7b0951348b7253846dc7a5bd56a765a7";
+    hash = "sha256-xmSAz6iZJe7SAgfc290b326URdYdogDNm62YTiypqPg=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix
index fde58ccc80a4..978cc3cad3b7 100644
--- a/pkgs/by-name/li/librsvg/package.nix
+++ b/pkgs/by-name/li/librsvg/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   pkg-config,
   meson,
   ninja,
@@ -49,7 +50,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librsvg";
-  version = "2.61.1";
+  version = "2.61.2";
 
   outputs = [
     "out"
@@ -61,13 +62,23 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vBu81BkSCwmNsovqVTNdneJHDU5qn27pcge0EPwVhn0=";
+    hash = "sha256-RkTYNiPdYcxEecKzw3Lh2isoFVLryQA1yNGsUC6x3AA=";
   };
 
+  patches = [
+    (fetchpatch {
+      # https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/1149
+      # libxml 2.15+ requires adjustments to error handling
+      # remove next librsvg release
+      url = "https://gitlab.gnome.org/GNOME/librsvg/-/commit/6663df8e9aec323f0c124e97a7c7447a90c67c4a.patch";
+      hash = "sha256-+iyRvxVMxSCW0IIizXXheBFytwhBtU4cyJNTBebCOSg=";
+    })
+  ];
+
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "librsvg-deps-${finalAttrs.version}";
-    hash = "sha256-3DAFyY7uNB5cP8ry28v12QsFdxHtpr1nyLtzhojBq7c=";
+    hash = "sha256-OZspQg9ryDNILUZMiB77vIF0uGCMyVe7blX5BJk102k=";
     dontConfigure = true;
   };
 
diff --git a/pkgs/by-name/li/libsciter/package.nix b/pkgs/by-name/li/libsciter/package.nix
index c920db6c1a45..a5a31a65b4c8 100644
--- a/pkgs/by-name/li/libsciter/package.nix
+++ b/pkgs/by-name/li/libsciter/package.nix
@@ -10,13 +10,28 @@
   autoPatchelfHook,
 }:
 
+let
+  inherit (stdenv.targetPlatform) system;
+
+  src.x86_64-linux = {
+    urlPath = "x64";
+    sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
+  };
+
+  src.aarch64-linux = {
+    urlPath = "arm64";
+    sha256 = "sha256-bqGPbvtOM8/A6acDbFJGGf4kzKo/4S/bWcH/XvxVySU=";
+  };
+
+in
+
 stdenv.mkDerivation {
   pname = "libsciter";
   version = "4.4.8.23-bis"; # Version specified in GitHub commit title
 
   src = fetchurl {
-    url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so";
-    sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
+    url = "https://github.com/c-smile/sciter-sdk/raw/524a90ef7eab16575df9496f7e4c374bbd5fb1fe/bin.lnx/${src.${system}.urlPath}/libsciter-gtk.so";
+    inherit (src.${system}) sha256;
   };
 
   nativeBuildInputs = [
@@ -44,7 +59,10 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "https://sciter.com";
     description = "Embeddable HTML/CSS/JavaScript engine for modern UI development";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with maintainers; [ leixb ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
diff --git a/pkgs/by-name/li/libserdes/package.nix b/pkgs/by-name/li/libserdes/package.nix
index ca7cb36d34c5..13dbbe147d6d 100644
--- a/pkgs/by-name/li/libserdes/package.nix
+++ b/pkgs/by-name/li/libserdes/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libserdes";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "confluentinc";
diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix
index 6e9cbb678d06..995772bcd923 100644
--- a/pkgs/by-name/li/libshumate/package.nix
+++ b/pkgs/by-name/li/libshumate/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libshumate";
-  version = "1.4.0";
+  version = "1.5.0.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OYQ2jgJZhis4ENHdyG0trdbTcqKzI3bM9K/3wuSMbTA=";
+    hash = "sha256-qW/nqWN86BnaEh6D4m61M83HjBRvpRqWC73K1VdAnlg=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 233d65da68de..e4d6d581d0b6 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.15.1";
+  version = "2.15.2";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-wnbQy0PHHpkgNm3SC7GZyxSAUYd5eexVY9Dg1oiCjRo=";
+    hash = "sha256-/GXRqLt2wPCUiOKlaEq52APOOYWgbaejzJcppZgMgfA=";
   };
 
   outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];
diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix
index 6cca28c26479..1e51573339fd 100644
--- a/pkgs/by-name/li/libsignal-ffi/package.nix
+++ b/pkgs/by-name/li/libsignal-ffi/package.nix
@@ -21,14 +21,14 @@ rustPlatform.buildRustPackage rec {
   pname = "libsignal-ffi";
   # must match the version used in mautrix-signal
   # see https://github.com/mautrix/signal/issues/401
-  version = "0.80.3";
+  version = "0.84.0";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${version}";
-    hash = "sha256-8iJQ7MpsR0aaNHGUTFGIlLzKP+njsQK/XY/FyDpWu7c=";
+    hash = "sha256-fTXiNgto1m6PlGQQuBUPaWkS5fHTVunCn3eGKjmQlHM=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
   env.BORING_BSSL_PATH = "${boringssl-wrapper}";
   env.NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++";
 
-  cargoHash = "sha256-iKYkZ2iG825hTsB5vH110+uNRTsSocRXyXAVy3eTRJE=";
+  cargoHash = "sha256-qnj9bVnnS76Sk9DfMprJn2xrc2G30yVXz3fTjjY3gnA=";
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix
index 52871ae2f69b..319efa5e155b 100644
--- a/pkgs/by-name/li/libsnark/package.nix
+++ b/pkgs/by-name/li/libsnark/package.nix
@@ -41,6 +41,13 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    substituteInPlace {,depends/{libff,libfqfft}/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace depends/gtest/{,googlemock/,googletest/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it.
     description = "C++ library for zkSNARKs";
diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix
index 3e894e8e40f4..4884e3480e49 100644
--- a/pkgs/by-name/li/libsndfile/package.nix
+++ b/pkgs/by-name/li/libsndfile/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   autogen,
   pkg-config,
@@ -35,6 +36,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/libsndfile/libsndfile/pull/1055
+    (fetchpatch {
+      url = "https://github.com/libsndfile/libsndfile/commit/2251737b3b175925684ec0d37029ff4cb521d302.patch";
+      hash = "sha256-LaeptEicnjpVBExlK4dNMlN8+AAJhW8dIvemF6S4W2M=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     autogen
diff --git a/pkgs/by-name/li/libtatsu/package.nix b/pkgs/by-name/li/libtatsu/package.nix
new file mode 100644
index 000000000000..afaf472b87cf
--- /dev/null
+++ b/pkgs/by-name/li/libtatsu/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  autoreconfHook,
+  pkg-config,
+  libplist,
+  libimobiledevice-glue,
+  curl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtatsu";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "libimobiledevice";
+    repo = "libtatsu";
+    tag = finalAttrs.version;
+    hash = "sha256-vf4xBTTGDJCTj4TMLOhojjAfzSbkx+ogGBnf+UeumG0=";
+  };
+
+  preAutoreconf = ''
+    echo ${finalAttrs.version} > .tarball-version
+    export PACKAGE_VERSION=${finalAttrs.version}
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    libplist
+    libimobiledevice-glue
+    curl
+  ];
+
+  meta = {
+    description = "Library handling the communication with Apple's Tatsu Signing Server (TSS)";
+    homepage = "https://github.com/libimobiledevice/libtatsu";
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ nxm ];
+  };
+})
diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index f372aada393a..e23fb1c0cdc5 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isAarch32 ''
     patchShebangs lib/arm/arm2gnu.pl
   '';
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     validatePkgConfig
   ]
-  ++ lib.optionals stdenv.hostPlatform.isArmv7 [
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
     # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
     perl
   ];
diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index 7bbb16328344..a7930a49d2af 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -32,7 +32,6 @@
   graphicsmagick,
   gdal,
   openimageio,
-  freeimage,
   testers,
 }:
 
@@ -113,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
         graphicsmagick
         gdal
         openimageio
-        freeimage
         ;
 
       inherit (python3Packages) pillow imread;
diff --git a/pkgs/by-name/li/libucontext/package.nix b/pkgs/by-name/li/libucontext/package.nix
index b7b56b4ff3f4..e4bfd406a04c 100644
--- a/pkgs/by-name/li/libucontext/package.nix
+++ b/pkgs/by-name/li/libucontext/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libucontext";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "kaniini";
     repo = "libucontext";
     rev = "libucontext-${version}";
-    hash = "sha256-aBmGt8O/HTWM9UJMKWz37uDLDkq1JEYTUb1SeGu9j9M=";
+    hash = "sha256-MQCRRyA64MEtPoUtf1tFVbhiMDc4DlepSjMEFcb/Kh4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/libui-ng/darwin-no-universal.patch b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch
new file mode 100644
index 000000000000..587490d0ab85
--- /dev/null
+++ b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch
@@ -0,0 +1,13 @@
+--- a/meson.build
++++ b/meson.build
+@@ -72,10 +72,6 @@
+ 	libui_macosx_version_min = '-mmacosx-version-min=10.8'
+ 	add_global_arguments(libui_macosx_version_min, language: libui_darwin_langs)
+ 	add_global_link_arguments(libui_macosx_version_min, language: libui_darwin_langs)
+-
+-	libui_arch = ['-arch', 'x86_64', '-arch', 'arm64']
+-	add_global_arguments(libui_arch, language: libui_darwin_langs)
+-	add_global_link_arguments(libui_arch, language: libui_darwin_langs)
+ endif
+ 
+ if libui_MSVC
diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix
index 54312f6918fd..d58d382a9a5a 100644
--- a/pkgs/by-name/li/libui-ng/package.nix
+++ b/pkgs/by-name/li/libui-ng/package.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation {
     hash = "sha256-pnfrSPDIvG0tFYQoeMBONATkNRNjY/tJGp9n2I4cN/U=";
   };
 
-  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-    substituteInPlace meson.build --replace "'-arch', 'arm64'" ""
-  '';
+  patches = [
+    ./darwin-no-universal.patch
+  ];
 
   nativeBuildInputs = [
     cmocka
diff --git a/pkgs/by-name/li/libui/darwin_versions.patch b/pkgs/by-name/li/libui/darwin_versions.patch
new file mode 100644
index 000000000000..29f646402919
--- /dev/null
+++ b/pkgs/by-name/li/libui/darwin_versions.patch
@@ -0,0 +1,11 @@
+--- a/meson.build
++++ b/meson.build
+@@ -163,7 +163,7 @@
+ 	objc_args: ['-Dlibui_EXPORTS'],
+ 	link_args: libui_libui_link_args,
+ 	soversion: libui_soversion,
+-	darwin_versions: [])		# TODO
++	darwin_versions: '0.0.0')		# TODO
+ install_headers('ui.h')
+ 
+ # TODO when the API is stable enough to be versioned, create a pkg-config file (https://mesonbuild.com/Pkgconfig-module.html) and a declare_dependency() section too
diff --git a/pkgs/by-name/li/libui/libui.pc b/pkgs/by-name/li/libui/libui.pc
deleted file mode 100644
index 42ee86fb550f..000000000000
--- a/pkgs/by-name/li/libui/libui.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@out@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${exec_prefix}/include
-
-Name: libui
-Description: Simple and portable (but not inflexible) GUI library
-Version: @version@
-
-Libs: -L${libdir} -lui
-Cflags: -I${includedir}
diff --git a/pkgs/by-name/li/libui/package.nix b/pkgs/by-name/li/libui/package.nix
index 5f5430a72fca..d7304ee37133 100644
--- a/pkgs/by-name/li/libui/package.nix
+++ b/pkgs/by-name/li/libui/package.nix
@@ -2,69 +2,48 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
+  meson,
+  ninja,
   pkg-config,
   gtk3,
 }:
 
-let
-  backend = if stdenv.hostPlatform.isDarwin then "darwin" else "unix";
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libui";
-  version = "4.1a";
+  version = "4.1a-unstable-2021-01-02";
+
   src = fetchFromGitHub {
     owner = "andlabs";
     repo = "libui";
-    rev = "alpha4.1";
-    sha256 = "0bm6xvqk4drg2kw6d304x6mlfal7gh8mbl5a9f0509smmdzgdkwm";
+    rev = "fea45b2d5b75839be0af9acc842a147c5cba9295";
+    hash = "sha256-BGbL15hBHY4aZE2ANAEd677vzZMQzMCICBafRtoQIvA=";
   };
 
   nativeBuildInputs = [
-    cmake
+    meson
+    ninja
     pkg-config
   ];
   propagatedBuildInputs = lib.optional stdenv.hostPlatform.isLinux gtk3;
 
+  patches = [
+    ./darwin_versions.patch
+    ./pkg-config.patch
+  ];
+
   postPatch = ''
+    substituteInPlace meson.build \
+      --subst-var-by version "${finalAttrs.version}"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace darwin/text.m unix/text.c \
       --replace-fail "strcasecmp" "g_strcasecmp"
   '';
 
-  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    sed -i 's/set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8")//' ./CMakeLists.txt
-  '';
-
-  installPhase = ''
-    mkdir -p $out/{include,lib}
-    mkdir -p $out/lib/pkgconfig
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    mv ./out/libui.so.0 $out/lib/
-    ln -s $out/lib/libui.so.0 $out/lib/libui.so
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mv ./out/libui.A.dylib $out/lib/
-    ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib
-  ''
-  + ''
-    cp $src/ui.h $out/include
-    cp $src/ui_${backend}.h $out/include
-
-    cp ${./libui.pc} $out/lib/pkgconfig/libui.pc
-    substituteInPlace $out/lib/pkgconfig/libui.pc \
-      --subst-var-by out $out \
-      --subst-var-by version "${version}"
-  '';
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    install_name_tool -id $out/lib/libui.A.dylib $out/lib/libui.A.dylib
-  '';
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/andlabs/libui";
     description = "Simple and portable (but not inflexible) GUI library in C that uses the native GUI technologies of each platform it supports";
-    license = licenses.mit;
-    platforms = platforms.unix;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/li/libui/pkg-config.patch b/pkgs/by-name/li/libui/pkg-config.patch
new file mode 100644
index 000000000000..45569a388608
--- /dev/null
+++ b/pkgs/by-name/li/libui/pkg-config.patch
@@ -0,0 +1,15 @@
+--- a/meson.build
++++ b/meson.build
+@@ -167,6 +167,12 @@
+ install_headers('ui.h')
+ 
+ # TODO when the API is stable enough to be versioned, create a pkg-config file (https://mesonbuild.com/Pkgconfig-module.html) and a declare_dependency() section too
++pkg = import('pkgconfig')
++pkg.generate(libui_libui,
++	description: 'Simple and portable (but not inflexible) GUI library',
++	filebase: 'libui',
++	name: 'libui',
++	version: '@version@')
+ 
+ libui_binary_deps = []
+ if libui_mode == 'static'
diff --git a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
deleted file mode 100644
index cd6f43d37705..000000000000
--- a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001
-From: Jappie Klooster <jappieklooster@hotmail.com>
-Date: Fri, 2 Apr 2021 16:33:18 -0400
-Subject: [PATCH] Add cmake install directives
-
-To make nix builds work, it expect a make install command to
-be available.
-Adding these directives seems to fix the build.
-
-If it's no trouble to you, please consider adding them.
----
- CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cbfc9c1..948c432 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,8 @@ set(SOURCE_FILES
-         uInput.cpp uInputSetup.cpp uInputResource.cpp
-         uInput.hpp CommonIncludes.hpp uInputSetup.hpp)
- 
-+include(GNUInstallDirs)
-+
- add_library(uInputPlus ${SOURCE_FILES})
- target_include_directories(uInputPlus PUBLIC .)
- 
-@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus)
- 
- configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY)
- 
-+
-+install(TARGETS uInputPlus
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp
-+        DESTINATION include/)
-+
--- 
-2.29.2
-
diff --git a/pkgs/by-name/li/libuinputplus/package.nix b/pkgs/by-name/li/libuinputplus/package.nix
deleted file mode 100644
index 0371a66131d0..000000000000
--- a/pkgs/by-name/li/libuinputplus/package.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-}:
-stdenv.mkDerivation rec {
-  pname = "libuinputplus";
-  version = "2021-04-02";
-
-  # adds missing cmake install directives
-  # https://github.com/YukiWorkshop/libuInputPlus/pull/7
-  patches = [ ./0001-Add-cmake-install-directives.patch ];
-
-  src = fetchFromGitHub {
-    owner = "YukiWorkshop";
-    repo = "libuInputPlus";
-    rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957";
-    sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Easy-to-use uinput library in C++";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/by-name/li/libultrahdr/gtest.patch b/pkgs/by-name/li/libultrahdr/gtest.patch
new file mode 100644
index 000000000000..50f70c38a5b5
--- /dev/null
+++ b/pkgs/by-name/li/libultrahdr/gtest.patch
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5128335..bacf495 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -536,16 +536,6 @@ if(UHDR_BUILD_TESTS)
+     set(GTEST_LIB_PREFIX ${GTEST_BINARY_DIR}/lib/)
+   endif()
+   set(GTEST_BOTH_LIBRARIES ${GTEST_LIB_PREFIX}${GTEST_LIB} ${GTEST_LIB_PREFIX}${GTEST_LIB_MAIN})
+-  ExternalProject_Add(${GTEST_TARGET_NAME}
+-      GIT_REPOSITORY https://github.com/google/googletest
+-      GIT_TAG v1.14.0
+-      PREFIX ${GTEST_PREFIX_DIR}
+-      SOURCE_DIR ${GTEST_SOURCE_DIR}
+-      BINARY_DIR ${GTEST_BINARY_DIR}
+-      CMAKE_ARGS ${UHDR_CMAKE_ARGS}
+-      BUILD_BYPRODUCTS ${GTEST_BOTH_LIBRARIES}
+-      INSTALL_COMMAND ""
+-  )
+ endif()
+ 
+ if(UHDR_BUILD_BENCHMARK)
+@@ -675,16 +665,15 @@ endif()
+ 
+ if(UHDR_BUILD_TESTS)
+   add_executable(ultrahdr_unit_test ${UHDR_TEST_SRCS_LIST})
+-  add_dependencies(ultrahdr_unit_test ${GTEST_TARGET_NAME} ${UHDR_CORE_LIB_NAME})
+   target_compile_options(ultrahdr_unit_test PRIVATE ${UHDR_WERROR_FLAGS})
+   target_include_directories(ultrahdr_unit_test PRIVATE
+     ${PRIVATE_INCLUDE_DIR}
+-    ${GTEST_INCLUDE_DIRS}
++    @GTEST_INCLUDE_DIRS@
+   )
+   if(UHDR_BUILD_FUZZERS)
+     target_link_options(ultrahdr_unit_test PRIVATE -fsanitize=fuzzer-no-link)
+   endif()
+-  target_link_libraries(ultrahdr_unit_test ${UHDR_CORE_LIB_NAME} ${GTEST_BOTH_LIBRARIES})
++  target_link_libraries(ultrahdr_unit_test ${UHDR_CORE_LIB_NAME} -lgtest -lgtest_main)
+   add_test(NAME UHDRUnitTests, COMMAND ultrahdr_unit_test)
+ endif()
diff --git a/pkgs/by-name/li/libultrahdr/package.nix b/pkgs/by-name/li/libultrahdr/package.nix
new file mode 100644
index 000000000000..4bf5fa1563a9
--- /dev/null
+++ b/pkgs/by-name/li/libultrahdr/package.nix
@@ -0,0 +1,97 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  replaceVars,
+  cmake,
+  ninja,
+  pkg-config,
+  libjpeg,
+  gtest,
+  ctestCheckHook,
+  versionCheckHook,
+  testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.4.0";
+  pname = "libultrahdr";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "libultrahdr";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-SLhHiwuyHzVx/Kv+eBy8LzHTnShKXlJoszxZNPATbhs=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  patches = [
+    (replaceVars ./gtest.patch {
+      GTEST_INCLUDE_DIRS = "${lib.getDev gtest}/include";
+    })
+  ];
+
+  # CMake incorrect absolute include/lib paths: https://github.com/NixOS/nixpkgs/issues/144170
+  postPatch = ''
+    substituteInPlace cmake/libuhdr.pc.in \
+      --replace-fail \
+        'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' \
+        'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' \
+      --replace-fail \
+        'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' \
+        'includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@'
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "UHDR_BUILD_TESTS" true)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    libjpeg
+    gtest
+  ];
+
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
+
+  doCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Reference codec for the Ultra HDR format";
+    longDescription = ''
+      Ultra HDR is a true HDR image format, and is backcompatible. libultrahdr
+      is the reference codec for the Ultra HDR format. The codecs that support
+      the format can render the HDR intent of the image on HDR displays; other
+      codecs can still decode and display the SDR intent of the image.
+    '';
+    homepage = "https://developer.android.com/media/platform/hdr-image-format";
+    changelog = "https://github.com/google/libultrahdr/releases/tag/v${finalAttrs.version}";
+    pkgConfigModules = [ "libuhdr" ];
+    maintainers = with lib.maintainers; [
+      yzx9
+    ];
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [
+      asl20
+    ];
+    mainProgram = "ultrahdr_app";
+  };
+})
diff --git a/pkgs/by-name/li/libunibreak/package.nix b/pkgs/by-name/li/libunibreak/package.nix
index 978406d4bffa..a3814f545203 100644
--- a/pkgs/by-name/li/libunibreak/package.nix
+++ b/pkgs/by-name/li/libunibreak/package.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard";
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = [ maintainers.coroa ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/liburcu/package.nix b/pkgs/by-name/li/liburcu/package.nix
index 3ba541fd11ca..7a1538aa9def 100644
--- a/pkgs/by-name/li/liburcu/package.nix
+++ b/pkgs/by-name/li/liburcu/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.15.3";
+  version = "0.15.4";
   pname = "liburcu";
 
   src = fetchurl {
     url = "https://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2";
-    hash = "sha256-Jmh+yE4+EUdZRUyISgir6ved7AmwQYld30xF7BUKy20=";
+    hash = "sha256-EaFKdmCsm6nAu9Oy2BcYUj0n3GyKnfq9XkAbQGZz7jo=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index 6c39efabcb72..d500f0d9a8e5 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -106,9 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "More modular rewrite of most components from VGMPlay";
     homepage = "https://github.com/ValleyBell/libvgm";
     license =
-      if
-        (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators)))
-      then
+      if (enableEmulation && (withAllEmulators || (lib.lists.elem "WSWAN_ALL" emulators))) then
         lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43
       else
         lib.licenses.gpl2Only;
diff --git a/pkgs/by-name/li/libvirt-dbus/package.nix b/pkgs/by-name/li/libvirt-dbus/package.nix
new file mode 100644
index 000000000000..a898b51bf923
--- /dev/null
+++ b/pkgs/by-name/li/libvirt-dbus/package.nix
@@ -0,0 +1,75 @@
+{
+  stdenv,
+  fetchFromGitLab,
+  meson,
+  pkg-config,
+  docutils,
+  ninja,
+  glib,
+  libvirt,
+  libvirt-glib,
+  systemd,
+  gitUpdater,
+  lib,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libvirt-dbus";
+  version = "1.4.1";
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  src = fetchFromGitLab {
+    owner = "libvirt";
+    repo = "libvirt-dbus";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-S4QktQmcnTte4XsIcgc5dkA8LjMJaOD2lljS01WT0dk=";
+  };
+
+  postPatch = ''
+    substituteInPlace "data/system/meson.build" \
+      --replace-fail ": systemd_system_unit_dir" ": '$out/lib/systemd/system'"
+
+    substituteInPlace "data/session/meson.build" \
+      --replace-fail ": systemd_user_unit_dir" ": '$out/lib/systemd/user'"
+  '';
+
+  nativeBuildInputs = [
+    meson
+    pkg-config
+    docutils
+    ninja
+  ];
+
+  buildInputs = [
+    glib
+    libvirt
+    libvirt-glib
+    systemd
+  ];
+
+  mesonFlags = [
+    (lib.mesonOption "init_script" "systemd")
+    (lib.mesonOption "unix_socket_group" "qemu-libvirtd")
+    # TODO: uncomment below on next release
+    # (lib.mesonOption "sysusersdir" "${placeholder "out"}/lib/sysusers.d")
+  ];
+
+  doCheck = false; # needs running D-Bus and libvirt
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
+  meta = {
+    description = "libvirt D-Bus API binding";
+    homepage = "https://libvirt.org/dbus.html";
+    changelog = "https://gitlab.com/libvirt/libvirt-dbus/-/blob/v${finalAttrs.version}/NEWS.rst";
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ andre4ik3 ];
+  };
+})
diff --git a/pkgs/by-name/li/libwebcam/package.nix b/pkgs/by-name/li/libwebcam/package.nix
index aebf4eb6411b..70d08400a1b9 100644
--- a/pkgs/by-name/li/libwebcam/package.nix
+++ b/pkgs/by-name/li/libwebcam/package.nix
@@ -30,14 +30,20 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace ./uvcdynctrl/CMakeLists.txt \
-      --replace "/lib/udev" "$out/lib/udev"
+      --replace-fail "/lib/udev" "$out/lib/udev" \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
 
     substituteInPlace ./uvcdynctrl/udev/scripts/uvcdynctrl \
-      --replace 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \
-      --replace 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl"
+      --replace-fail 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \
+      --replace-fail 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl"
 
     substituteInPlace ./uvcdynctrl/udev/rules/80-uvcdynctrl.rules \
-      --replace "/lib/udev" "$out/lib/udev"
+      --replace-fail "/lib/udev" "$out/lib/udev"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libwebcam/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   preConfigure = ''
diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix
index b814308b8ae0..d20b25693a88 100644
--- a/pkgs/by-name/li/libwebp/package.nix
+++ b/pkgs/by-name/li/libwebp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   threadingSupport ? true, # multi-threading
   openglSupport ? false,
@@ -44,6 +45,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-7i4fGBTsTjAkBzCjVqXqX4n22j6dLgF/0mz4ajNA45U=";
   };
 
+  patches = [
+    # Fixes endianness-related behaviour in build result when targeting big-endian via CMake
+    # https://groups.google.com/a/webmproject.org/g/webp-discuss/c/wvBsO8n8BKA/m/eKpxLuagAQAJ
+    (fetchpatch {
+      name = "0001-libwebp-Fix-endianness-with-CMake.patch";
+      url = "https://github.com/webmproject/libwebp/commit/0e5f4ee3deaba5c4381877764005d981f652791f.patch";
+      hash = "sha256-VNiLv1y3cjSDCNen9KxqbdrldI6EhshTSnsq8g9x8HA=";
+    })
+  ];
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
     (lib.cmakeBool "WEBP_USE_THREAD" threadingSupport)
diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 5e5b1d3dda89..3c6a144f0b40 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   openssl,
   zlib,
@@ -21,6 +22,19 @@ stdenv.mkDerivation rec {
     hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2025-11677.patch";
+      url = "https://libwebsockets.org/git/libwebsockets/patch?id=2f082ec31261f556969160143ba94875d783971a";
+      hash = "sha256-FeiZAbr1kpt+YNjhi2gfG2A6nXKiSssMFRmlALaneu4=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-11678.patch";
+      url = "https://libwebsockets.org/git/libwebsockets/patch?id=2bb9598562b37c942ba5b04bcde3f7fdf66a9d3a";
+      hash = "sha256-1uQUkoMbK+3E/QYMIBLlBZypwHBIrWBtm+KIW07WRj8=";
+    })
+  ];
+
   # Updating to 4.4.1 would bring some errors, and the patch doesn't apply cleanly
   # https://github.com/warmcat/libwebsockets/commit/47efb8c1c2371fa309f85a32984e99b2cc1d614a
   postPatch = ''
diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix
index f21551ca0242..84774a19f4f4 100644
--- a/pkgs/by-name/li/libwhereami/package.nix
+++ b/pkgs/by-name/li/libwhereami/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
     owner = "puppetlabs";
   };
 
+  # CMake 2.2.2 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2.2)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/li/libwindowswm/package.nix b/pkgs/by-name/li/libwindowswm/package.nix
new file mode 100644
index 000000000000..f195e4bbd76b
--- /dev/null
+++ b/pkgs/by-name/li/libwindowswm/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libwindowswm";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libWindowsWM-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-JfB8+EfL6R02wg80i0uUlMRQT+ApZujN9lz1YxanDtw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libWindowsWM \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "library for Cygwin/X rootless window management extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libwindowswm";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [ "windowswm" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix
index 8f8a61d6e5d7..0afb6ae53ea3 100644
--- a/pkgs/by-name/li/libxcb-cursor/package.nix
+++ b/pkgs/by-name/li/libxcb-cursor/package.nix
@@ -13,7 +13,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxcb-cursor";
-  version = "0.1.5";
+  version = "0.1.6";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/xcb-util-cursor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DK+ZsNYJcPgc5Bx7ppTl6q+DMie7LLzbL23JZmpmPFc=";
+    hash = "sha256-/euL0SeHNRm+XMcNzQ07XTO2Z4dyAPmSWln9ytj3qTM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libxcb/package.nix b/pkgs/by-name/li/libxcb/package.nix
index 349ddf5b786e..b56bec0672e1 100644
--- a/pkgs/by-name/li/libxcb/package.nix
+++ b/pkgs/by-name/li/libxcb/package.nix
@@ -57,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isMinGW {
+    NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ];
+  };
+
   meta = {
     description = "C interface to the X Window System protocol";
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb";
diff --git a/pkgs/by-name/li/libxcomposite/package.nix b/pkgs/by-name/li/libxcomposite/package.nix
new file mode 100644
index 000000000000..b141e7eece76
--- /dev/null
+++ b/pkgs/by-name/li/libxcomposite/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxfixes,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcomposite";
+  version = "0.4.6";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXcomposite-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/kC88K4aCQcOuiQIil65gQ7+V0U3eeweIKVQgMbcLIc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxfixes
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header file dependencies
+    libxfixes
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXcomposite \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Client library for the Composite extension to the X11 protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcomposite";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xcomposite" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxdamage/package.nix b/pkgs/by-name/li/libxdamage/package.nix
new file mode 100644
index 000000000000..39c34e3530fa
--- /dev/null
+++ b/pkgs/by-name/li/libxdamage/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxfixes,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxdamage";
+  version = "1.1.6";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXdamage-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UnM8H1Ji/KNfZOfVBgxvzYGogLqOHmXJYhzwcnr7XRE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxfixes
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXdamage \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Damage Extension library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxdamage";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xdamage" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxfixes/package.nix b/pkgs/by-name/li/libxfixes/package.nix
index cf51e21d9d1e..026a2d4259ec 100644
--- a/pkgs/by-name/li/libxfixes/package.nix
+++ b/pkgs/by-name/li/libxfixes/package.nix
@@ -10,7 +10,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxfixes";
-  version = "6.0.1";
+  version = "6.0.2";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/libXfixes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tpX5PNJJlCGrAtInREWOZQzMiMHUyBMNYCACE6vALVg=";
+    hash = "sha256-OfEV1y2cX4ER5GhBZNPWjMH9Ifmyf/JAGwj938D0Cbo=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libxfont_1/package.nix b/pkgs/by-name/li/libxfont_1/package.nix
new file mode 100644
index 000000000000..421f34dd9afe
--- /dev/null
+++ b/pkgs/by-name/li/libxfont_1/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libfontenc,
+  xorgproto,
+  freetype,
+  xtrans,
+  zlib,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxfont_1";
+  version = "1.5.4";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXfont-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-Gn90kHdMh/IFLRRtHg5kUY0y5oSBhKGGVOjQu1eIMkI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libfontenc
+    xorgproto
+    freetype
+    xtrans
+    zlib
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  # prevents "misaligned_stack_error_entering_dyld_stub_binder"
+  configureFlags = lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-O0";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXfont \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X font handling library for server & utilities";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxfont";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      hpnd
+      hpndSellVariant
+      # this was originally BSD-3-Clause-UC, however the University of California rescinded
+      # clause 3, the advertising clause, in 1999 effectively reverting it to a BSD-3-Clause
+      bsd3
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xfont" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxfont_2/package.nix b/pkgs/by-name/li/libxfont_2/package.nix
new file mode 100644
index 000000000000..9f1dbea7359e
--- /dev/null
+++ b/pkgs/by-name/li/libxfont_2/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libfontenc,
+  xorgproto,
+  freetype,
+  xtrans,
+  zlib,
+  writeScript,
+  testers,
+  # for inheriting the meta attributes
+  libxfont_1,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxfont_2";
+  version = "2.0.7";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXfont2-${finalAttrs.version}.tar.xz";
+    hash = "sha256-i3uC/eukh2m2lDPo4/u5hKX2vzaLDV9Hq+7EnePljvs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libfontenc
+    xorgproto
+    freetype
+    xtrans
+    zlib
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXfont2 \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    inherit (libxfont_1.meta) description homepage license;
+    maintainers = [ ];
+    pkgConfigModules = [ "xfont2" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxft/package.nix b/pkgs/by-name/li/libxft/package.nix
new file mode 100644
index 000000000000..3f5955be00ac
--- /dev/null
+++ b/pkgs/by-name/li/libxft/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  fontconfig,
+  freetype,
+  libx11,
+  libxrender,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxft";
+  version = "2.3.9";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXft-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YKJbeJRe1pMmNbO7GJmlF9Md90VuaYZ/+6J/if85dvU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+    libx11
+    libxrender
+    xorgproto
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header file dependencies
+    freetype
+    fontconfig
+    libxrender
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXft \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X FreeType library";
+    longDescription = ''
+      libXft is the client side font rendering library, using libfreetype, libX11, and the
+      X Render extension to display anti-aliased text.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxft";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xft" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxi/package.nix b/pkgs/by-name/li/libxi/package.nix
new file mode 100644
index 000000000000..3cbac22c36f3
--- /dev/null
+++ b/pkgs/by-name/li/libxi/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxfixes,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxi";
+  version = "1.8.2";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-0OBVXlPW4hFOq/pEImuhYtJwhQGiXhjZnPs1wJTGwQQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxfixes
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header file dependencies
+    libx11
+    libxext
+    libxfixes
+  ];
+
+  configureFlags =
+    lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "xorg_cv_malloc0_returns_null=no"
+    ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXi \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "library for the X Input Extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxi";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpnd
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xi" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxinerama/package.nix b/pkgs/by-name/li/libxinerama/package.nix
new file mode 100644
index 000000000000..8708e49b3dec
--- /dev/null
+++ b/pkgs/by-name/li/libxinerama/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxinerama";
+  version = "1.1.5";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXinerama-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UJTR8PzBgoyxaW0NOdnoZq4yUgxU0B9hjxo8HjDCCFw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXinerama \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Library for Xinerama extension to X11 Protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxinerama";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      # TODO: change this to a new license depending on if this
+      # https://github.com/spdx/license-list-XML/issues/2831
+      # actually creates a new license or just new markup for X11
+      x11
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xinerama" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxkbfile/package.nix b/pkgs/by-name/li/libxkbfile/package.nix
new file mode 100644
index 000000000000..93cd9028b379
--- /dev/null
+++ b/pkgs/by-name/li/libxkbfile/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxkbfile";
+  version = "1.1.3";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libxkbfile-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qbY+6pl6u57mqLT7tRWDHIQfRxr4RaCd5EOygAOHS+w=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XKB file handling routines";
+    longDescription = ''
+      libxkbfile is used by the X servers and utilities to parse the XKB configuration data files.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxkbfile";
+    license = with lib.licenses; [
+      hpnd
+      mitOpenGroup
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xkbfile" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index ab020551d986..2b05808ea436 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -6,17 +6,32 @@
   autoconf-archive,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxls";
   version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "libxls";
     repo = "libxls";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
+  # workaround required to build against gettext >= 0.25
+  # https://savannah.gnu.org/support/index.php?111272
+  preAutoreconf = ''
+    autopoint --force
+  '';
+
+  # workaround required to build against gettext >= 0.25
+  # https://savannah.gnu.org/support/index.php?111273
+  autoreconfFlags = [
+    "--include=m4"
+    "--install"
+    "--force"
+    "--verbose"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     autoconf-archive
@@ -24,12 +39,15 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  doCheck = true;
+
+  meta = {
     description = "Extract Cell Data From Excel xls files";
+    changelog = "https://github.com/libxls/libxls/releases/tag/v${finalAttrs.version}";
     homepage = "https://github.com/libxls/libxls";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     mainProgram = "xls2csv";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/li/libxp/package.nix b/pkgs/by-name/li/libxp/package.nix
new file mode 100644
index 000000000000..076b7ddb5510
--- /dev/null
+++ b/pkgs/by-name/li/libxp/package.nix
@@ -0,0 +1,69 @@
+# TODO: remove this deprecated package
+# X.Org removed support for the Xprt server from the xorg-server releases in the 1.6.0 release in
+# 2009, and the standalone git repo it was moved to has been unmaintained since 2009, making it
+# difficult to actually use this library.
+# Some packages in nixpkgs still somehow depend on it tho.
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxau,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxp";
+  version = "1.0.4";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-HxnjuOgqNKj9mImn2a8KvoWIywP7V8N8VpY0zzud8aQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxau
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXp \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Print Client Library";
+    longDescription = ''
+      This library provides support for X11 clients to print via the X Print Extension, as
+      previously implemented in the Xprt server.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxp";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xp" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxpresent/package.nix b/pkgs/by-name/li/libxpresent/package.nix
new file mode 100644
index 000000000000..10145497ef1d
--- /dev/null
+++ b/pkgs/by-name/li/libxpresent/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxfixes,
+  libxrandr,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxpresent";
+  version = "1.0.2";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXpresent-${finalAttrs.version}.tar.xz";
+    hash = "sha256-TlshtIEiBqSyIwE2Bq4xFwUCwQQwOHd6Hvj3DAnTdgI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxfixes
+    libxrandr
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header includes dependencies
+    libxfixes
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXpresent \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "library for the X Present Extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxpresent";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xpresent" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxres/package.nix b/pkgs/by-name/li/libxres/package.nix
new file mode 100644
index 000000000000..1dbf4c937f6c
--- /dev/null
+++ b/pkgs/by-name/li/libxres/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxres";
+  version = "1.2.3";
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXres-${finalAttrs.version}.tar.xz";
+    hash = "sha256-0t6PVAHWyGqJknkWVFR+uN71hd/cDAjMFuJO9q7radw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXres \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X-Resource extension client library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxres";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xres" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxscrnsaver/package.nix b/pkgs/by-name/li/libxscrnsaver/package.nix
new file mode 100644
index 000000000000..e6a716365638
--- /dev/null
+++ b/pkgs/by-name/li/libxscrnsaver/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxscrnsaver";
+  version = "1.2.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXScrnSaver-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UFc2X4RyU+DidYcUQeEP94RsgyKl2I4eGH0ybeHNjQA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXScrnSaver \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X11 Screen Saver extension client library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xscrnsaver" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxshmfence/package.nix b/pkgs/by-name/li/libxshmfence/package.nix
new file mode 100644
index 000000000000..1d771b05060b
--- /dev/null
+++ b/pkgs/by-name/li/libxshmfence/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxshmfence";
+  version = "1.3.3";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libxshmfence-${finalAttrs.version}.tar.xz";
+    hash = "sha256-1KTfCWq6lv6gLAKe46ROEaR+t/chPBpym+g+hew/3hA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Shared memory 'SyncFence' synchronization primitive library";
+    longDescription = ''
+      This library offers a CPU-based synchronization primitive compatible with the X SyncFence
+      objects that can be shared between processes using file descriptor passing.
+      There are two underlying implementations:
+      - On Linux, the library uses futexes
+      - On other systems, the library uses posix mutexes and condition variables.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxshmfence";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xshmfence" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxslt/package.nix b/pkgs/by-name/li/libxslt/package.nix
index 8427fe49597d..d31337777f26 100644
--- a/pkgs/by-name/li/libxslt/package.nix
+++ b/pkgs/by-name/li/libxslt/package.nix
@@ -39,16 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     # https://gitlab.gnome.org/GNOME/libxslt/-/issues/144
     # Source: https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/77
     ./77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
-
-    # Fix type confusion in xmlNode.psvi between stylesheet and source nodes
-    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
-    # Fix heap-use-after-free in xmlFreeID caused by `atype` corruption
-    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
-    #
-    # Depends on unmerged libxml2 patch that breaks ABI.
-    #
-    # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxslt/chromium/new-unified-atype-extra.patch
-    ./new-unified-atype-extra.patch
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/li/libxtst/package.nix b/pkgs/by-name/li/libxtst/package.nix
new file mode 100644
index 000000000000..6cd9ababca26
--- /dev/null
+++ b/pkgs/by-name/li/libxtst/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxi,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxtst";
+  version = "1.2.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXtst-${finalAttrs.version}.tar.xz";
+    hash = "sha256-tQ1MJblwCadEcGwQOcWY9NjmSRDJ/eOBmU4criNdkkI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxi
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXtst \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Library for the XTEST and RECORD X11 extensions";
+    longDescription = ''
+      The XTEST extension is a minimal set of client and server extensions required to completely
+      test the X11 server with no user intervention. This extension is not intended to support
+      general journaling and playback of user actions.
+      The RECORD extension supports the recording and reporting of all core X protocol and arbitrary
+      X extension protocol.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxtst";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpndSellVariant
+      hpndDoc
+      x11
+      hpndDocSell
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xtst" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 5d474a6f919b..e71823151a31 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyang";
-  version = "3.13.5";
+  version = "3.13.6";
 
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
     rev = "v${version}";
-    hash = "sha256-yO2gk8l+NY++PHsUBawItCtDXgBBd561xnyJcjtjd/g=";
+    hash = "sha256-rc/WdBCVZDwensqnVMrQXCPevLg0INidzN9Qwhqw2Mk=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/li/libzra/package.nix b/pkgs/by-name/li/libzra/package.nix
index 17669909a5ca..6f4dd78693e2 100644
--- a/pkgs/by-name/li/libzra/package.nix
+++ b/pkgs/by-name/li/libzra/package.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation {
   # in submodule dev as of 1.4.7
   postPatch = ''
     (cd submodule/zstd && patch -Np1 < ${./fix-pkg-config.patch})
+
+    substituteInPlace submodule/zstd/build/cmake/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/li/lidarr/package.nix b/pkgs/by-name/li/lidarr/package.nix
index 3bb13bab8f18..dd88ded5e6d8 100644
--- a/pkgs/by-name/li/lidarr/package.nix
+++ b/pkgs/by-name/li/lidarr/package.nix
@@ -25,16 +25,16 @@ let
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
     {
-      x64-linux_hash = "sha256-LeJBed6Zo2+r6ZdgBTkcg+3ORoohvDpx37gOOorg9wY=";
-      arm64-linux_hash = "sha256-eS4MccKhISJBc68lhrYwbESV0FcqtAI/b4ojfQO/9m8=";
-      x64-osx_hash = "sha256-l3hi+X91DQNmGZKNJ4Y/DkB7ohu0/HTTnhSInIBiPlo=";
-      arm64-osx_hash = "sha256-ehZJZKxEiupLyBZCgz2subtD7BICXjAqIdnOnh+OMe4=";
+      x64-linux_hash = "sha256-Cji5hYEDvatOU0ExpggDWJEWSEXZTSpMGKm7Z5d44kc=";
+      arm64-linux_hash = "sha256-RWVlTnOENQ+/H6Mmkcim+Lu5tJvMBB26v/to4q61P40=";
+      x64-osx_hash = "sha256-rXUqzv6L0WJAoiQVm9UcG1OwCU8B2HmkiTOerZL19W4=";
+      arm64-osx_hash = "sha256-S23cPgEiqkeNW/J1kvI1QXZeYfrzb1GrD6YVFBKwm6M=";
     }
     ."${arch}-${os}_hash";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lidarr";
-  version = "2.14.5.4836";
+  version = "3.0.1.4866";
 
   src = fetchurl {
     inherit hash;
diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index df3ad835f178..8db5d3ba5dfd 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -1,36 +1,48 @@
 {
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
   lib,
 }:
 
 buildGoModule rec {
   pname = "lightning-loop";
-  version = "0.31.2-beta";
+  version = "0.31.5-beta";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "loop";
     rev = "v${version}";
-    hash = "sha256-xhvGsAvcJqjSyf32Zo9jJUoHCN/5mWliLqcyN3GEjD0=";
+    hash = "sha256-pmZturc7b3wd+qgSQPNzeY0LoMTF82dqUgOe8NfPeZw=";
   };
 
-  vendorHash = "sha256-Rb0P2mPrvOII5Ck4rtB4/gpymVmwuM1rH8sxLt0zDhs=";
+  vendorHash = "sha256-X/+yi04FkN8hauqeFytagIdfigb6EGTvv8tVrlm7MGw=";
 
   subPackages = [
     "cmd/loop"
     "cmd/loopd"
   ];
 
+  env.CGO_ENABLED = 0;
+
+  nativeBuildInputs = [ installShellFiles ];
+
   ldflags = [
     "-s"
     "-w"
   ];
 
+  postInstall = ''
+    installManPage docs/loop.1
+  '';
+
   meta = with lib; {
     description = "Lightning Loop Client";
     homepage = "https://github.com/lightninglabs/loop";
     license = licenses.mit;
-    maintainers = with maintainers; [ proofofkeags ];
+    maintainers = with maintainers; [
+      proofofkeags
+      starius
+    ];
   };
 }
diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
index 0bf4c6a92840..82c22ee4df25 100644
--- a/pkgs/by-name/li/lightway/package.nix
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-RFlac10XFJXT3Giayy31kZ3Nn1Q+YsPt/zCdkSV0Atk=";
 
-  cargoBuildFlags = lib.cli.toGNUCommandLine { } {
+  cargoBuildFlags = lib.cli.toCommandLineGNU { } {
     package = [
       "lightway-client"
       "lightway-server"
diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix
index 85f863763255..d7571b1435ce 100644
--- a/pkgs/by-name/li/ligolo-ng/package.nix
+++ b/pkgs/by-name/li/ligolo-ng/package.nix
@@ -2,38 +2,67 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
+  pkgsCross ? { },
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "ligolo-ng";
   version = "0.8.2";
 
   src = fetchFromGitHub {
-    owner = "tnpitsecurity";
+    owner = "nicocha30";
     repo = "ligolo-ng";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ND0SFB0xj4WK6okNzChZWfK5bhNc4PTWuZoq/PodTW0=";
   };
 
   vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk=";
 
-  postConfigure = ''
-    export CGO_ENABLED=0
-  '';
+  env.CGO_ENABLED = 0;
+
+  subPackages = [
+    "cmd/agent"
+    "cmd/proxy"
+  ];
 
   ldflags = [
     "-s"
     "-w"
     "-extldflags '-static'"
+    "-X main.version=${finalAttrs.version}"
   ];
 
+  # This will prefix all the binaries with ligolo-
+  postInstall = ''
+    for f in $out/bin/*; do
+      mv "$f" "$(dirname "$f")/ligolo-$(basename "$f")"
+    done
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/ligolo-agent";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    tests = {
+      win = pkgsCross.mingwW64.ligolo-ng or null;
+      linux64 = pkgsCross.gnu64.ligolo-ng or null;
+    };
+    updateScript = nix-update-script { };
+  };
+
   # Tests require network access
   doCheck = false;
 
   meta = {
-    description = "Tunneling/pivoting tool that uses a TUN interface";
-    homepage = "https://github.com/tnpitsecurity/ligolo-ng";
-    changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/v${version}";
+    description = "Advanced TUN-based tunneling/pivoting tool";
+    homepage = "https://github.com/nicocha30/ligolo-ng";
+    changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ letgamer ];
+    platforms = lib.platforms.linux ++ lib.platforms.windows;
   };
-}
+})
diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix
index d9b264882e65..bbf5393d5908 100644
--- a/pkgs/by-name/li/lilex/package.nix
+++ b/pkgs/by-name/li/lilex/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "lilex";
-  version = "2.610";
+  version = "2.620";
 
   src = fetchurl {
     url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
-    hash = "sha256-iU0NLIy0wAFFBDSYmjo7tjKQ+I1GJ1hZTkcByxePYGM=";
+    hash = "sha256-h2Xt1HIOlh4wwHK3bg5hxyWxi/W8GWMiRkaWF7fhngU=";
   };
 
   nativeBuildInputs = [ unzip ];
diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix
index aa1134c22f91..133ad36dd22d 100644
--- a/pkgs/by-name/li/lima/source.nix
+++ b/pkgs/by-name/li/lima/source.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.2.1";
+  version = "1.2.2";
 in
 {
   inherit version;
@@ -12,7 +12,7 @@ in
     owner = "lima-vm";
     repo = "lima";
     tag = "v${version}";
-    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
+    hash = "sha256-bIYF/bsOMuWTkjD6fe6by220/WQGL+VWEBXmUzyXU98=";
   };
 
   vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";
diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/li/limbo/package.nix
deleted file mode 100644
index 306962ff40dc..000000000000
--- a/pkgs/by-name/li/limbo/package.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  versionCheckHook,
-  nix-update-script,
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "limbo";
-  version = "0.0.14";
-
-  src = fetchFromGitHub {
-    owner = "tursodatabase";
-    repo = "limbo";
-    tag = "v${version}";
-    hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4=";
-  };
-
-  cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k=";
-
-  cargoBuildFlags = [
-    "-p"
-    "limbo"
-  ];
-  cargoTestFlags = cargoBuildFlags;
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  doInstallCheck = true;
-  versionCheckProgramArg = "--version";
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Interactive SQL shell for Limbo";
-    homepage = "https://github.com/tursodatabase/limbo";
-    changelog = "https://github.com/tursodatabase/limbo/blob/v${version}/CHANGELOG.md";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ nartsiss ];
-    mainProgram = "limbo";
-  };
-}
diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 5407319facd5..6e71ee80c310 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -22,6 +22,13 @@ let
     || (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets))
     || enableAll;
 
+  missingZerocallusedregs =
+    (
+      if targets == [ ] then stdenv.hostPlatform.isLoongArch64 else (builtins.elem "loongarch64" targets)
+    )
+    || (if targets == [ ] then stdenv.hostPlatform.isRiscV64 else (builtins.elem "riscv64" targets))
+    || enableAll;
+
   biosSupport' = biosSupport && hasX86;
   pxeSupport' = pxeSupport && hasX86;
 
@@ -40,18 +47,22 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "10.1.1";
+  version = "10.2.1";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-pDhA8N7a5cTorIW8OgCimOxxfZ2slUhp3K+cb8KIAzc=";
+    hash = "sha256-t9uNKbJKU9qvx9LJRCyDAeLeImDMBxl6m13VQt8E6BY=";
   };
 
   enableParallelBuilding = true;
 
+  hardeningDisable = lib.optionals missingZerocallusedregs [
+    "zerocallusedregs"
+  ];
+
   nativeBuildInputs = [
     llvmPackages.libllvm
     llvmPackages.lld
@@ -107,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
       prince213
       programmerlexi
       surfaceflinger
+      ryand56
     ];
   };
 })
diff --git a/pkgs/by-name/li/lincity-ng/package.nix b/pkgs/by-name/li/lincity-ng/package.nix
index d00a778bb8d2..734b8868105c 100644
--- a/pkgs/by-name/li/lincity-ng/package.nix
+++ b/pkgs/by-name/li/lincity-ng/package.nix
@@ -1,22 +1,19 @@
 {
   stdenv,
   SDL2,
-  SDL2_gfx,
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
   cmake,
   fetchFromGitHub,
+  fmt,
   lib,
-  libGL,
-  libGLU,
   libwebp,
   libtiff,
   libX11,
   libxml2,
   libxmlxx5,
   libxslt,
-  physfs_2,
   pkg-config,
   xorgproto,
   zlib,
@@ -24,47 +21,42 @@
   include-what-you-use,
 }:
 
-let
-  # https://github.com/lincity-ng/lincity-ng/issues/25
-  physfs = physfs_2;
-in
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "lincity-ng";
-  version = "2.13.1";
+  version = "2.14.2";
 
   src = fetchFromGitHub {
     owner = "lincity-ng";
     repo = "lincity-ng";
     tag = "lincity-ng-${finalAttrs.version}";
-    hash = "sha256-ACJVhMq2IEJNrbAdmkgHxQV0uKSXpwR8a/5jcrQS+oI=";
+    hash = "sha256-HW+bB9xnrok8tWKIJJUt3Qgo5e9HmI6NZORG4PazmEM=";
   };
 
   hardeningDisable = [ "format" ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
     gettext
     include-what-you-use
     libxml2
+    libxslt
   ];
 
   buildInputs = [
+    fmt
     SDL2
-    SDL2_gfx
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-    libGL
-    libGLU
     libX11
     libwebp
     libtiff
     libxmlxx5
     libxml2
     libxslt
-    physfs
     xorgproto
     zlib
   ];
@@ -81,10 +73,14 @@ stdenv.mkDerivation (finalAttrs: {
   ";
 
   meta = {
+    homepage = "https://github.com/lincity-ng/lincity-ng";
     description = "City building game";
     mainProgram = "lincity-ng";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/li/lincity/package.nix b/pkgs/by-name/li/lincity/package.nix
index d24b615013c9..571a59053726 100644
--- a/pkgs/by-name/li/lincity/package.nix
+++ b/pkgs/by-name/li/lincity/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchpatch,
+  gettext,
   libX11,
   libXext,
   xorgproto,
@@ -21,6 +22,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-e0y9Ef/Uy+15oKrbJfKxw04lqCARgvuyWc4vRQ/lAV0=";
   };
 
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ gettext ];
+
   buildInputs = [
     libICE
     libpng12
@@ -66,6 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -e 's@\[MPS_INFO_CHARS\]@[MPS_INFO_CHARS+8]@' -i mps.c -i mps.h
+
+    ${lib.optionalString stdenv.hostPlatform.isDarwin ''
+      sed -i '/\#include \"malloc.h\"/d' readpng.c
+    ''}
   '';
 
   meta = {
@@ -74,7 +81,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl2Plus;
     homepage = "https://sourceforge.net/projects/lincity";
     maintainers = with lib.maintainers; [ iedame ];
-    # ../lcintl.h:14:10: fatal error: 'libintl.h' file not found
-    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/li/lineselect/package.nix b/pkgs/by-name/li/lineselect/package.nix
index 5386172232ea..140ce971410e 100644
--- a/pkgs/by-name/li/lineselect/package.nix
+++ b/pkgs/by-name/li/lineselect/package.nix
@@ -33,7 +33,7 @@ buildNpmPackage rec {
     description = "Shell utility to interactively select lines from stdin";
     homepage = "https://github.com/chfritz/lineselect";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lineselect";
   };
 }
diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index a7dd006a657f..7fd417a9886c 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "16.2.4";
+  version = "16.2.6";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-r4BJVY4PoBItIpCOQO5eTVyOGnIqV1fJ/cbrNyjvhAs=";
+    hash = "sha256-d4DB1kVUwO9+VF90BZjSAAH3/KyjmbJ4yfXOMOX23Wc=";
   };
 
-  npmDepsHash = "sha256-0lVx2s58XFa9xj2fiP6P5jCfVeUZ8pFkmdy/J6yDK9A=";
+  npmDepsHash = "sha256-L0X3v5Ekd8qt8A9TTtgGsnv1WV1HKcRwAiHpf5zP3oo=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/games/linthesia/default.nix b/pkgs/by-name/li/linthesia/package.nix
similarity index 78%
rename from pkgs/games/linthesia/default.nix
rename to pkgs/by-name/li/linthesia/package.nix
index a214c80b7792..013366e8ff40 100644
--- a/pkgs/games/linthesia/default.nix
+++ b/pkgs/by-name/li/linthesia/package.nix
@@ -18,7 +18,7 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linthesia";
   version = "unstable-2023-05-23";
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     owner = "linthesia";
     repo = "linthesia";
     rev = "1f2701241f8865c2f5c14a97b81ae64884cf0396";
-    sha256 = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao=";
+    hash = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao=";
   };
 
   postPatch = ''
@@ -52,12 +52,12 @@ stdenv.mkDerivation rec {
     gtk3.out # icon cache
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Game of playing music using a MIDI keyboard following a MIDI file";
     mainProgram = "linthesia";
-    inherit (src.meta) homepage;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    inherit (finalAttrs.src.meta) homepage;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index f699c09dc708..3edb810dab7d 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -8,16 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lintspec";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "lintspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FCcAyOPym6e9L1yMNqdpw4m8JEeXJZhN2yJi86j/WC0=";
+    hash = "sha256-CxtzAtbjk7rS00EAvu6pMXN7VsF75tO79p7au5+4jGI=";
   };
 
-  cargoHash = "sha256-RVKoy400ZPBC18gq87DntQw73AkIqSwpMqR0dtKA0wY=";
+  cargoHash = "sha256-kmv62yq4JdNv2komTjnsH5kjbaxI30iph3pKa2+qqck=";
+  cargoBuildFlags = [
+    "--package"
+    "lintspec"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index f31439d6f313..b20668e4a8f7 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20251011";
+  version = "20251021";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-LFVrrVCqJORiHVnhIY0l7B4pRHI2MS0o/GbgOUDqO8s=";
+    hash = "sha256-hG5PGLmeVqe/kyr9Q113mlLZvP32GTi20vxHRhxKalw=";
   };
 
   postUnpack = ''
diff --git a/pkgs/by-name/li/linux-wallpaperengine/package.nix b/pkgs/by-name/li/linux-wallpaperengine/package.nix
index 8de9dab140fc..7c4c2e924119 100644
--- a/pkgs/by-name/li/linux-wallpaperengine/package.nix
+++ b/pkgs/by-name/li/linux-wallpaperengine/package.nix
@@ -16,6 +16,7 @@
   glew,
   glfw,
   glm,
+  gmp,
   kissfftFloat,
   libXau,
   libXdmcp,
@@ -33,11 +34,12 @@
   wayland-protocols,
   wayland-scanner,
   zlib,
+  nix-update-script,
 }:
 
 let
   cef = cef-binary.overrideAttrs (oldAttrs: {
-    version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/be0fc25e72203310f268221a132c5d765874b02c/CMakeLists.txt#L47
+    version = "135.0.17"; # follow upstream. https://github.com/Almamu/linux-wallpaperengine/blob/b39f12757908eda9f4c1039613b914606568bb84/CMakeLists.txt#L47
     __intentionallyOverridingVersion = true; # `cef-binary` uses the overridden `srcHash` values in its source FOD
     gitRevision = "cbc1c5b";
     chromiumVersion = "135.0.7049.52";
@@ -52,14 +54,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "linux-wallpaperengine";
-  version = "0-unstable-2025-05-17";
+  version = "0-unstable-2025-09-19";
 
   src = fetchFromGitHub {
     owner = "Almamu";
     repo = "linux-wallpaperengine";
-    rev = "be0fc25e72203310f268221a132c5d765874b02c";
+    rev = "b39f12757908eda9f4c1039613b914606568bb84";
     fetchSubmodules = true;
-    hash = "sha256-Wkxt6c5aSMJnQPx/n8MeNKLQ8YmdFilzhJ1wQooKprI=";
+    hash = "sha256-Lm4BixK+PBCN/I+ecoYfoD96zS9UysEDOfponFy3SDU=";
   };
 
   nativeBuildInputs = [
@@ -79,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     glew
     glfw
     glm
+    gmp
     kissfftFloat
     libXau
     libXdmcp
@@ -117,10 +120,12 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
   meta = {
     description = "Wallpaper Engine backgrounds for Linux";
     homepage = "https://github.com/Almamu/linux-wallpaperengine";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     mainProgram = "linux-wallpaperengine";
     maintainers = [ ];
     platforms = [
diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix
index 2fef04972a75..51bb162bfd14 100644
--- a/pkgs/by-name/li/linuxwave/package.nix
+++ b/pkgs/by-name/li/linuxwave/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Generate music from the entropy of Linux";
     changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     inherit (zig.meta) platforms;
     mainProgram = "linuxwave";
   };
diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/by-name/li/linvstmanager/package.nix
similarity index 53%
rename from pkgs/applications/audio/linvstmanager/default.nix
rename to pkgs/by-name/li/linvstmanager/package.nix
index 1da68ebb45d1..5358d1d975d7 100644
--- a/pkgs/applications/audio/linvstmanager/default.nix
+++ b/pkgs/by-name/li/linvstmanager/package.nix
@@ -3,36 +3,40 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linvstmanager";
   version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "Goli4thus";
     repo = "linvstmanager";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
   ];
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Graphical companion application for various bridges like LinVst, etc";
     mainProgram = "linvstmanager";
     homepage = "https://github.com/Goli4thus/linvstmanager";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.GabrielDougherty ];
+    license = with lib.licenses; [ gpl3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ GabrielDougherty ];
   };
-}
+})
diff --git a/pkgs/by-name/li/linyaps-box/package.nix b/pkgs/by-name/li/linyaps-box/package.nix
index b57881eec8bb..00bb109c0759 100644
--- a/pkgs/by-name/li/linyaps-box/package.nix
+++ b/pkgs/by-name/li/linyaps-box/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "linyaps-box";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "OpenAtom-Linyaps";
     repo = "linyaps-box";
     rev = finalAttrs.version;
-    hash = "sha256-h7tbjIcVgwTw3SLGzJzG17WpDdsCqHD4AXvAFEiwesw=";
+    hash = "sha256-i4wSddstCosDpBEcunoVsV464PTHmuvDDEFrsPQKnxU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix
index 0feed2bdd45e..252c6725db7a 100644
--- a/pkgs/by-name/li/linyaps/package.nix
+++ b/pkgs/by-name/li/linyaps/package.nix
@@ -39,13 +39,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "linyaps";
-  version = "1.9.13";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "OpenAtom-Linyaps";
     repo = finalAttrs.pname;
     tag = finalAttrs.version;
-    hash = "sha256-sAxHDvhRz7okElk8vdISJt/yrNnCdu95hW3ImHOjiyw=";
+    hash = "sha256-C5rP6r3V+hxTjM+kmXjS4MnuL6P5wxSVP9nNmlQbcB8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/li/lipl/package.nix b/pkgs/by-name/li/lipl/package.nix
index 23871ddd4417..72d2c0734460 100644
--- a/pkgs/by-name/li/lipl/package.nix
+++ b/pkgs/by-name/li/lipl/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
     description = "Command line tool to analyse the output over time of custom shell commands";
     homepage = "https://github.com/yxdunc/lipl";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lipl";
   };
 }
diff --git a/pkgs/by-name/li/liquibase/package.nix b/pkgs/by-name/li/liquibase/package.nix
index aa01bb695842..b78ae4d23e72 100644
--- a/pkgs/by-name/li/liquibase/package.nix
+++ b/pkgs/by-name/li/liquibase/package.nix
@@ -26,11 +26,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liquibase";
-  version = "4.33.0";
+  version = "5.0.1";
 
   src = fetchurl {
     url = "https://github.com/liquibase/liquibase/releases/download/v${finalAttrs.version}/liquibase-${finalAttrs.version}.tar.gz";
-    hash = "sha256-aJrPzcl7rQ1MFQ0e+rnIUeJRs5jLPWMm916Kr+QO1Xg=";
+    hash = "sha256-OuEczc1MCA5CHl/QQ729Yk1W/PybKU1dnYmMuLB05Ek=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/li/literata/package.nix b/pkgs/by-name/li/literata/package.nix
new file mode 100644
index 000000000000..260bef3f40eb
--- /dev/null
+++ b/pkgs/by-name/li/literata/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "literata";
+  version = "3.103";
+
+  src = fetchzip {
+    url = "https://github.com/googlefonts/literata/releases/download/${finalAttrs.version}/${finalAttrs.version}.zip";
+    hash = "sha256-XwwvyzwO2uhi1Bay9HtB75j1QfAJR4TMETgy/zyvwZ0=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    find . -name "*.ttf" -exec cp {} "$out/share/fonts/truetype/" \;
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Serif typeface designed for ebooks and optimized for reading";
+    homepage = "https://github.com/googlefonts/literata";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ xavwe ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index 34ffa1757d9f..f7ff430fe433 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "litmusctl";
-  version = "1.18.0";
+  version = "1.19.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -23,7 +23,7 @@ buildGoModule rec {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${version}";
-    hash = "sha256-lfR4Nk9n6mpfQVrVoI2iaCYkJelgGi5QLdZN9n0qPVQ=";
+    hash = "sha256-0fHkUKU1MwvPuM+20dH7W/GFdhzY+avgCufpKEDnPZQ=";
   };
 
   vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";
diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 260272bf87ae..6a31cf80f004 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "live-server";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FKX1rbRKWkWsxzJZDicVAUqrHBwEe2o7EXIouK74UMA=";
   };
 
-  cargoHash = "sha256-MMeeUoj3vYd1lv15N3+qjHbn991IVMhIUCMd0isCNhk=";
+  cargoHash = "sha256-gaBYnhljcMqSEPViaOPMtuHjoDP8iY64UizlfK+fcQA=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -30,10 +30,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Local network server with live reload feature for static pages";
     downloadPage = "https://github.com/lomirus/live-server/releases";
     homepage = "https://github.com/lomirus/live-server";
-    changelog = "https://github.com/lomirus/live-server/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/lomirus/live-server/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     mainProgram = "live-server";
-    maintainers = [ lib.maintainers.philiptaron ];
+    maintainers = with lib.maintainers; [
+      philiptaron
+      doronbehar
+    ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix
index fe5235d5b492..89fbc8ec6f11 100644
--- a/pkgs/by-name/li/livekit-libwebrtc/package.nix
+++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix
@@ -9,7 +9,6 @@
   xcbuild,
   python3,
   ninja,
-  apple-sdk_14,
   darwinMinVersionHook,
   git,
   cpio,
@@ -191,11 +190,7 @@ stdenv.mkDerivation {
     glib
     alsa-lib
     pulseaudio
-  ])
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
-    (darwinMinVersionHook "12.3")
-  ];
+  ]);
 
   preConfigure = ''
     echo "generate_location_tags = true" >> build/config/gclient_args.gni
@@ -234,7 +229,7 @@ stdenv.mkDerivation {
     "is_clang=false"
   ])
   ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-    ''mac_deployment_target="12.3"''
+    ''mac_deployment_target="${stdenv.hostPlatform.darwinMinVersion}"''
     "rtc_enable_symbol_export=true"
     "rtc_enable_objc_symbol_export=true"
     "rtc_include_dav1d_in_internal_decoder_factory=true"
diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index c9b1672d534c..85a103157e1a 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "livekit";
-  version = "1.9.1";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${version}";
-    hash = "sha256-seh7LXxHGsdXZFy1I/XukvOS9XTO+OxGycPNxJmaIm0=";
+    hash = "sha256-saqxH7SyDpdfwC+69oBXQGSXowqpSnbQXsPgPGeVvHI=";
   };
 
-  vendorHash = "sha256-EbxiiCpl/txIrnKpqP8EI4UZGZMyUt9bcTIAiUl64sk=";
+  vendorHash = "sha256-U+epe3zEq28UNJkcABlOg9URfxl1hlRWrcqwYnn78uE=";
 
   subPackages = [ "cmd/server" ];
 
diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix
index 5b6f2c779e16..f64ce89481af 100644
--- a/pkgs/by-name/li/livepeer/package.nix
+++ b/pkgs/by-name/li/livepeer/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "livepeer";
-  version = "0.8.6";
+  version = "0.8.8";
 
   proxyVendor = true;
-  vendorHash = "sha256-gPaMatH/C1Tbxi4fBeD+722UtYBeq+p7hJn+kIeEC+Y=";
+  vendorHash = "sha256-cEpRLnLR0ia5vvoJ8Fwk/0qgvsnYw7vSpyS9BJQ8UfY=";
 
   src = fetchFromGitHub {
     owner = "livepeer";
     repo = "go-livepeer";
     tag = "v${version}";
-    hash = "sha256-KVxUyMX4Q3kWcjObaTTuZf3pqMHbUeNzjdxQIWJZaYk=";
+    hash = "sha256-DVgB/pE3nq6oHzLi+g/WUMQqrmXvJhPub7bmeLgyEDQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/li/lizardfs/package.nix b/pkgs/by-name/li/lizardfs/package.nix
deleted file mode 100644
index a7aead761da0..000000000000
--- a/pkgs/by-name/li/lizardfs/package.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  makeWrapper,
-  python3,
-  db,
-  fuse,
-  asciidoc,
-  libxml2,
-  libxslt,
-  docbook_xml_dtd_412,
-  docbook_xsl,
-  boost,
-  pkg-config,
-  judy,
-  pam,
-  spdlog,
-  systemdMinimal,
-  zlib, # optional
-}:
-
-stdenv.mkDerivation rec {
-  pname = "lizardfs";
-  version = "3.13.0-rc3";
-
-  src = fetchFromGitHub {
-    owner = "lizardfs";
-    repo = "lizardfs";
-    rev = version;
-    sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    makeWrapper
-  ];
-
-  buildInputs = [
-    db
-    fuse
-    asciidoc
-    libxml2
-    libxslt
-    docbook_xml_dtd_412
-    docbook_xsl
-    zlib
-    boost
-    judy
-    pam
-    spdlog
-    python3
-    systemdMinimal
-  ];
-
-  meta = with lib; {
-    homepage = "https://lizardfs.com";
-    description = "Highly reliable, scalable and efficient distributed file system";
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
-      rushmorem
-      shamilton
-    ];
-    # 'fprintf' was not declared in this scope
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index 5176cb4f8354..52eebe83fa9f 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.4.2";
+  version = "0.5.0";
 in
 rustPlatform.buildRustPackage {
   pname = "lla";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     owner = "chaqchase";
     repo = "lla";
     tag = "v${version}";
-    hash = "sha256-7/VfEcqvYGC1Pw9wJh5FF3c7BXgcg9LVDvcr4zCrros=";
+    hash = "sha256-xbXTiOr3c9PX0SRfjO+3Kib5S0fruFhjHO2Mf00BVBg=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
     installShellFiles
   ];
 
-  cargoHash = "sha256-LYRNXNhPgpNZWP5XKqfgM6t9Ts2k/e09iXWMcuEp9LA=";
+  cargoHash = "sha256-qKeNSaZMpyQpI7oGqn416pfBINMsIE+0sjzg38roxc8=";
 
   cargoBuildFlags = [ "--workspace" ];
 
diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 9df32043c859..25c280427307 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -30,7 +30,6 @@
   metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport,
   vulkanSupport ? false,
   rpcSupport ? false,
-  apple-sdk_14,
   curl,
   llama-cpp,
   shaderc,
@@ -75,13 +74,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6729";
+  version = "6908";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-CkPLgzSsiCkSIAp4XetUJszt0+WjPRt+9V9SvRogbVU=";
+    hash = "sha256-7zgeVK1dQLFy9rm6VsaVK9/vIadMst+RNry5Vf7yk+A=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT
@@ -106,7 +105,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     ++ optionals rocmSupport rocmBuildInputs
     ++ optionals blasSupport [ blas ]
     ++ optionals vulkanSupport vulkanBuildInputs
-    ++ optionals metalSupport [ apple-sdk_14 ]
     ++ [ curl ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 3f6eddb71be0..3b5bd0383065 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.28-2";
-  hash_aarch64-darwin = "sha256-7sxhKZwZKzA2VUPHsChgysxXMB7SKEd9zK4kIPbWYjo=";
-  version_x86_64-linux = "0.3.28-2";
-  hash_x86_64-linux = "sha256-ewVjJ0Sy5Zwf9tvlfngQKnAfAv3BvPIAO+p1tJ3mO8M=";
+  version_aarch64-darwin = "0.3.30-2";
+  hash_aarch64-darwin = "sha256-49wubBIteg+gs9RQEozRiiFgWnVlHm1aOf7EqK1uvt4=";
+  version_x86_64-linux = "0.3.30-2";
+  hash_x86_64-linux = "sha256-v2m5/BoyGXRi09To9rHp79+t2QnT5U0XuL5WNpfWWRU=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh
index 415c2006e172..c884550ecae0 100755
--- a/pkgs/by-name/lm/lmstudio/update.sh
+++ b/pkgs/by-name/lm/lmstudio/update.sh
@@ -3,13 +3,14 @@
 
 set -euo pipefail
 
-packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)"
 for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do
   # shellcheck disable=SC2086
   set -- ${system} # split string into variables $1 and $2
 
   arch="${1}"
-  url=$(echo "${packages}" | grep "${2}")
+  platform="${2}"
+
+  url=$(curl -ILs -o /dev/null -w %{url_effective} "https://lmstudio.ai/download/latest/${platform}")
   version="$(echo "${url}" | cut -d/ -f6)"
   hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")")
 
diff --git a/pkgs/by-name/ln/lnav/package.nix b/pkgs/by-name/ln/lnav/package.nix
index ea028c7516de..d69ed07aaa3e 100644
--- a/pkgs/by-name/ln/lnav/package.nix
+++ b/pkgs/by-name/ln/lnav/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lnav";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitHub {
     owner = "tstack";
     repo = "lnav";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Pi1S8tRY7Lv0R7sdLOFppuCbTb/6omyAsNW13dmWBqA=";
+    hash = "sha256-IYBcYnai7Se3/GNITzhpSV/XYvCUvcpiZDTF4Y58Zt0=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix
index 8ab45486ae5e..b8a2826bf3d3 100644
--- a/pkgs/by-name/lo/lobster/package.nix
+++ b/pkgs/by-name/lo/lobster/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   callPackage,
 
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-YGtjoRBGOqkcHaiZNPVFOoeLitJTG/M0I08EPZVCfj0=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake-fix.patch";
+      url = "https://github.com/aardappel/lobster/commit/a5f46ed65cad43ea70c8a6af5ea2fd5a018c8941.patch?full_index=1";
+      hash = "sha256-91pmoTPLD2Fo2SuCKngdRxXFUty5lOyA4oX8zaJ0ON0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libGL
diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix
index 2a46d8501291..94aac1acb208 100644
--- a/pkgs/by-name/lo/localproxy/package.nix
+++ b/pkgs/by-name/lo/localproxy/package.nix
@@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt
+    substituteInPlace ./CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" \
+      "cmake_minimum_required(VERSION 4.0)"
   '';
 
   # causes redefinition of _FORTIFY_SOURCE
diff --git a/pkgs/by-name/lo/localsearch/package.nix b/pkgs/by-name/lo/localsearch/package.nix
index 361545417bf8..4366c8073d33 100644
--- a/pkgs/by-name/lo/localsearch/package.nix
+++ b/pkgs/by-name/lo/localsearch/package.nix
@@ -38,6 +38,7 @@
   libseccomp,
   libtiff,
   libuuid,
+  libwebp,
   libxml2,
   poppler,
   systemd,
@@ -49,11 +50,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "localsearch";
-  version = "3.9.0";
+  version = "3.10.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/localsearch/${lib.versions.majorMinor finalAttrs.version}/localsearch-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1C9AjcP7KP5U9amrv18d7PWBjbnC6exRwJRkvf0MFLk=";
+    hash = "sha256-WNZupEruFknI2YH5NDc7g+GrSkoahLoDBPWvOR5+AIA=";
   };
 
   patches = [
@@ -102,6 +103,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libtiff
     libuuid
+    libwebp
     libxml2
     poppler
     taglib
diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index f07e589d9f37..6648bb188a06 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   makeDesktopItem,
   copyDesktopItems,
   nixosTests,
@@ -16,7 +16,7 @@ let
   pname = "localsend";
   version = "1.17.0";
 
-  linux = flutter327.buildFlutterApplication rec {
+  linux = flutter329.buildFlutterApplication rec {
     inherit pname version;
 
     src = fetchFromGitHub {
diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index 11be38a157de..94fad26e2c00 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
-  version = "4.9.1";
+  version = "4.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index e4c969a6b776..efba345158d5 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t472uLuuT5QPmfxkRP6wPalblMU68iD2wyKOxSrJfeU=";
+    hash = "sha256-W51V5Nz4TSN6F0/XOvn9givUIfAnI0SefooUQyj1AqM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index 1e1cff27153f..5140f291ad1c 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "25.10.13";
+  version = "25.10.23";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-TxNJpHQc18VVEnETNGpDSOn5yh+vHRyha8wXfipyyII=";
+    hash = "sha256-WZ6XbsIqoLfVRtxnqBPaspQQPYdn4gOrsz5WPrKFiH4=";
   };
 
-  cargoHash = "sha256-UBzngkgfTObhoh9MSq80gZqpJtmB6hFDtW2dYuGgQB4=";
+  cargoHash = "sha256-t7/UK/PwnUyw61mw9BlSQuT0qSeBKvFaKkS2ocmAViE=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index b7a28602a8dc..67d995610d14 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -4,19 +4,24 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  nfs-utils ? null, # macOS doesn't need this
+  makeBinaryWrapper,
 }:
+let
+  inherit (stdenv.hostPlatform) isLinux;
+in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook";
-  version = "25.10.13";
+  version = "25.10.23";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-TxNJpHQc18VVEnETNGpDSOn5yh+vHRyha8wXfipyyII=";
+    hash = "sha256-WZ6XbsIqoLfVRtxnqBPaspQQPYdn4gOrsz5WPrKFiH4=";
   };
 
-  cargoHash = "sha256-UBzngkgfTObhoh9MSq80gZqpJtmB6hFDtW2dYuGgQB4=";
+  cargoHash = "sha256-t7/UK/PwnUyw61mw9BlSQuT0qSeBKvFaKkS2ocmAViE=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [
@@ -24,7 +29,16 @@ rustPlatform.buildRustPackage rec {
     "lockbook"
   ];
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+  ]
+  ++ lib.optionals isLinux [ makeBinaryWrapper ];
+
+  postFixup = lib.optionalString isLinux ''
+    wrapProgram $out/bin/lockbook \
+      --prefix PATH : "${lib.makeBinPath [ nfs-utils ]}"
+  '';
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --bash --name lockbook.bash <($out/bin/lockbook completions bash)
     installShellCompletion --zsh --name _lockbook <($out/bin/lockbook completions zsh)
diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix
index 88dc7865dfbb..672730e845c0 100644
--- a/pkgs/by-name/lo/loco/package.nix
+++ b/pkgs/by-name/lo/loco/package.nix
@@ -6,14 +6,14 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "loco";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-yctOGUfKd1zaIArtHESYEr1q79ZrJqL7H6bvpAFrE+8=";
+    hash = "sha256-DdrLABMiTutIhUHvUw29DYZIT+YHLNJjoTT5kWMeAkU=";
   };
 
-  cargoHash = "sha256-IdYicJ7ZIoVOQU91S8yIPYGeY+DaeAMztGOmriTGW38=";
+  cargoHash = "sha256-01IQxfeOzxOHqRovmNV3q/ZSdESWi7Gb6F7o51Rbkw4=";
 
   #Skip trycmd integration tests
   checkFlags = [ "--skip=cli_tests" ];
diff --git a/pkgs/by-name/lo/logisim-evolution/package.nix b/pkgs/by-name/lo/logisim-evolution/package.nix
index 07a6dde8c7fa..864539c8750e 100644
--- a/pkgs/by-name/lo/logisim-evolution/package.nix
+++ b/pkgs/by-name/lo/logisim-evolution/package.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "logisim-evolution";
-  version = "3.9.0";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${finalAttrs.version}/logisim-evolution-${finalAttrs.version}-all.jar";
-    hash = "sha256-QxU1h6LKzWy25wtXgEufPT0KsIsLhrKnq9CRcS4Mlzc=";
+    hash = "sha256-aZ+VekHVLAtPy8KJmhWpGC6RwZBui31lNCCABDhxYfQ=";
   };
   dontUnpack = true;
 
diff --git a/pkgs/by-name/lo/logkeys/package.nix b/pkgs/by-name/lo/logkeys/package.nix
index 16bb1c6ba666..812028117977 100644
--- a/pkgs/by-name/lo/logkeys/package.nix
+++ b/pkgs/by-name/lo/logkeys/package.nix
@@ -7,6 +7,7 @@
   which,
   procps,
   kbd,
+  nixosTests,
 }:
 
 stdenv.mkDerivation {
@@ -38,6 +39,8 @@ stdenv.mkDerivation {
 
   preConfigure = "./autogen.sh";
 
+  passthru.tests.nixos = nixosTests.logkeys;
+
   meta = with lib; {
     description = "GNU/Linux keylogger that works";
     license = licenses.gpl3;
diff --git a/pkgs/by-name/lo/logmich/package.nix b/pkgs/by-name/lo/logmich/package.nix
new file mode 100644
index 000000000000..b334e503b549
--- /dev/null
+++ b/pkgs/by-name/lo/logmich/package.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  tinycmmc,
+  fmt,
+}:
+
+stdenv.mkDerivation {
+  pname = "logmich";
+  version = "0.1.0-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "logmich";
+    repo = "logmich";
+    rev = "c73c7b7d6cd050d1bcc42d522ce80a2eb86da5c8";
+    sha256 = "sha256-e8k/ZzPAfLgNF30wmXHDX5ovK/msTH6sgzxWKzZhtOY=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ tinycmmc ];
+  propagatedBuildInputs = [ fmt ];
+
+  meta = {
+    description = "A trivial logging library";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.zlib;
+  };
+}
diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index fb7785ede426..49f7a2b467a3 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  clang_20,
 
   fetchFromGitHub,
   fetchYarnDeps,
@@ -26,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "logseq";
-  version = "0.10.12";
+  version = "0.10.14";
 
   src = fetchFromGitHub {
     owner = "logseq";
     repo = "logseq";
     tag = finalAttrs.version;
-    hash = "sha256-SUzt4hYHE6XJOEMxFp2a0om2oVUk1MHQUteGFiM9Lkc=";
+    hash = "sha256-jIkAiSCYIO5w/jM/Bv/odTuluRi3W/w4tTaUTmaYvEA=";
   };
 
   patches = [
@@ -98,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: {
   yarnOfflineCacheRoot = fetchYarnDeps {
     name = "logseq-${finalAttrs.version}-yarn-deps-root";
     inherit (finalAttrs) src;
-    hash = "sha256-sbC6WQLjEHIKTuejSQXplQOWZwUmBJdGXuAkilQGjYs=";
+    hash = "sha256-eSMtHA4Ob7EVb5qEzAj+WjGyyFjA0ZEvTsaoMx0bgjc=";
   };
 
   # ./static and ./resources are combined into ./static by the build process
@@ -153,6 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
       cctools
       darwin.autoSignDarwinBinariesHook
       xcbuild
+      clang_20 # newer clang breaks node-addon-api on darwin
     ];
 
   # we'll run the hook manually multiple times
diff --git a/pkgs/by-name/lo/logstalgia/package.nix b/pkgs/by-name/lo/logstalgia/package.nix
index d23dff56d9fa..52ffb5aca6aa 100644
--- a/pkgs/by-name/lo/logstalgia/package.nix
+++ b/pkgs/by-name/lo/logstalgia/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
       a Miscellaneous section.
     '';
 
-    platforms = platforms.gnu ++ platforms.linux;
+    platforms = platforms.gnu ++ platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ pSub ];
     mainProgram = "logstalgia";
   };
diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 39690af2f820..baa307d9ca99 100644
--- a/pkgs/by-name/lo/loksh/package.nix
+++ b/pkgs/by-name/lo/loksh/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "loksh";
-  version = "7.7";
+  version = "7.8";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "loksh";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-BxQ7SZwRP9PlD2MV7DqG7tQ2lqzlkTwmaKwbgC7NYrc=";
+    hash = "sha256-daodwoq2NoJ343CWjtT6qqBirEIuHBWLQO9MkAN4s/Q=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/lo/lolcode/package.nix b/pkgs/by-name/lo/lolcode/package.nix
index ff96112289c1..0a61347d282c 100644
--- a/pkgs/by-name/lo/lolcode/package.nix
+++ b/pkgs/by-name/lo/lolcode/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   doxygen,
   cmake,
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-VMBW3/sw+1kI6iuOckSPU1TIeY6QORcSfFLFkRYw3Gs=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/justinmeza/lci/commit/42ac17a22ddce737664b39a50442e6623a7e51a2.patch?full_index=1";
+      hash = "sha256-UwsR13lAkSz4gFHS28MyS9Nd7oyfQR+0BCp2lFs5UP4=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake
diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix
index 83222c9ae75d..d8666f5b6a28 100644
--- a/pkgs/by-name/lo/lora/package.nix
+++ b/pkgs/by-name/lo/lora/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "lora";
-  version = "3.006";
+  version = "3.021";
 
   src = fetchFromGitHub {
     owner = "cyrealtype";
     repo = "lora";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nNl2IC/KqYO6uS6ah0qWgesqm2cG8cIix/MhxbkOeAM=";
+    hash = "sha256-v9wE9caI9HTCfO01Yf+s6KajF7WpnL12nu+IuOV7T+w=";
   };
 
   dontConfigure = true;
@@ -24,8 +24,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/fonts/truetype
-    cp -R $src/fonts/ttf/*.ttf $out/share/fonts/truetype
+    install -Dm444 -t $out/share/fonts/truetype $src/fonts/ttf/*.ttf
+    install -Dm444 -t $out/share/fonts/opentype $src/fonts/otf/*.otf
+    install -Dm444 -t $out/share/fonts/variable $src/fonts/variable/*.ttf
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix
index 653440a5f11b..730dcd266526 100644
--- a/pkgs/by-name/lo/loudgain/package.nix
+++ b/pkgs/by-name/lo/loudgain/package.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"
   '';
diff --git a/pkgs/by-name/lo/loupe/package.nix b/pkgs/by-name/lo/loupe/package.nix
index cf5a039ba465..852bef596c32 100644
--- a/pkgs/by-name/lo/loupe/package.nix
+++ b/pkgs/by-name/lo/loupe/package.nix
@@ -15,6 +15,7 @@
   libadwaita,
   libgweather,
   libseccomp,
+  libglycin,
   glycin-loaders,
   gnome,
   common-updater-scripts,
@@ -24,17 +25,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "loupe";
-  version = "48.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/loupe/${lib.versions.major finalAttrs.version}/loupe-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EHE9PpZ4nQd659M4lFKl9sOX3fQ6UMBxy/4tEnJZcN4=";
+    hash = "sha256-os5VTo5eHRa4NuRvFlJ2fbK7O9T33KqH8laa8QuGOTg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "loupe-deps-${finalAttrs.version}";
-    hash = "sha256-PKkyZDd4FLWGZ/kDKWkaSV8p8NDniSQGcR9Htce6uCg=";
+    hash = "sha256-56yU5h+ZMSX6PH2jkboBwV0IMlcJI9i1sJZx4nNYJe4=";
   };
 
   postPatch = ''
@@ -66,8 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
   preConfigure = ''
     # Dirty approach to add patches after cargoSetupPostUnpackHook
     # We should eventually use a cargo vendor patch hook instead
-    pushd ../$(stripHash $cargoDeps)/glycin-2.*
-      patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
+    pushd ../$(stripHash $cargoDeps)/glycin-3.*
+      patch -p3 < ${libglycin.passthru.glycin3PathsPatch}
     popd
   '';
 
diff --git a/pkgs/by-name/lo/louvain-community/package.nix b/pkgs/by-name/lo/louvain-community/package.nix
index 97d0c3e7acd4..139da16aa76f 100644
--- a/pkgs/by-name/lo/louvain-community/package.nix
+++ b/pkgs/by-name/lo/louvain-community/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = unstableGitUpdater { };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Louvain Community Detection Library";
     homepage = "https://github.com/meelgroup/louvain-community";
diff --git a/pkgs/by-name/lo/lovely-injector/package.nix b/pkgs/by-name/lo/lovely-injector/package.nix
index 795b6fd48eeb..65c6d515bea4 100644
--- a/pkgs/by-name/lo/lovely-injector/package.nix
+++ b/pkgs/by-name/lo/lovely-injector/package.nix
@@ -4,10 +4,10 @@
   lib,
   versionCheckHook,
   writeShellScript,
-  lua,
+  cmake,
 }:
 let
-  version = "0.7.1";
+  version = "0.8.0";
 in
 rustPlatform.buildRustPackage {
   pname = "lovely-injector";
@@ -16,26 +16,22 @@ rustPlatform.buildRustPackage {
     owner = "ethangreen-dev";
     repo = "lovely-injector";
     tag = "v${version}";
-    hash = "sha256-j03/DOnLFfFYTwGGh+7BalS779jyg+p0UqtcTTyHgv4=";
+    hash = "sha256-leTe7j4RTqc6BkiS7W5e0viK8FEwJpPLNoyf4GLOI3E=";
+    fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-hHq26kSKcqEldxUb6bn1laTpKGFplP9/2uogsal8T5A=";
+  cargoHash = "sha256-MnXB2ho48VPYtFSnGHGkuSv1eprOhmj4wMG2YmFSGec=";
+  cargoBuildFlags = [
+    "--package"
+    "lovely-unix"
+  ];
   # no tests
   doCheck = false;
   # lovely-injector depends on nightly rust features
   env.RUSTC_BOOTSTRAP = 1;
   nativeBuildInputs = [
-    lua
+    cmake
   ];
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  doInstallCheck = true;
-  versionCheckProgramArg = [ "${placeholder "out"}" ];
-  versionCheckProgram = writeShellScript "lovely-version-check" ''
-    export LD_PRELOAD="$1/lib/liblovely.so"
-    exec ${lua}/bin/lua < /dev/null
-  '';
 
   meta = {
     description = "Runtime lua injector for games built with LÖVE";
diff --git a/pkgs/applications/audio/lpd8editor/default.nix b/pkgs/by-name/lp/lpd8editor/package.nix
similarity index 71%
rename from pkgs/applications/audio/lpd8editor/default.nix
rename to pkgs/by-name/lp/lpd8editor/package.nix
index b5071a2c5a41..34a8c5a0b7f1 100644
--- a/pkgs/applications/audio/lpd8editor/default.nix
+++ b/pkgs/by-name/lp/lpd8editor/package.nix
@@ -6,22 +6,21 @@
   fetchFromGitHub,
   cmake,
   alsa-lib,
-  qttools,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lpd8editor";
   version = "0.0.16";
 
   src = fetchFromGitHub {
     owner = "charlesfleche";
     repo = "lpd8editor";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-lRp2RhNiIf1VrryfKqYFSbKG3pktw3M7B49fXVoj+C8=";
   };
 
   buildInputs = [
-    qttools
+    qt5.qttools
     alsa-lib
   ];
 
@@ -31,12 +30,12 @@ stdenv.mkDerivation rec {
     qt5.wrapQtAppsHook
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Linux editor for the Akai LPD8";
     homepage = "https://github.com/charlesfleche/lpd8editor";
-    license = licenses.mit;
-    maintainers = with maintainers; [ pinpox ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pinpox ];
     mainProgram = "lpd8editor";
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/lr/lrcsnc/package.nix b/pkgs/by-name/lr/lrcsnc/package.nix
index d2759ad8b7cb..198bb78c6a09 100644
--- a/pkgs/by-name/lr/lrcsnc/package.nix
+++ b/pkgs/by-name/lr/lrcsnc/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "lrcsnc";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "Endg4meZer0";
     repo = "lrcsnc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gKb0cTpCPlyvJFthV1csn8HaVcUvXq+KC+nTT5sGhww=";
+    hash = "sha256-fXsXRv6h7HfEUhszxSIxv2mnkrm7DLm4Zpw7/beNn2I=";
   };
 
   vendorHash = "sha256-ww+SXy29woGlb120sj1oGb4MIQJzpBCKGpUKYsYxTMk=";
diff --git a/pkgs/by-name/ls/lscolors/package.nix b/pkgs/by-name/ls/lscolors/package.nix
index 3d146e01c3a0..f9f5f933f379 100644
--- a/pkgs/by-name/ls/lscolors/package.nix
+++ b/pkgs/by-name/ls/lscolors/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lscolors";
-  version = "0.20.0";
+  version = "0.21.0";
 
   src = fetchCrate {
     inherit version pname;
-    hash = "sha256-EUUPVSpHc9tN1Hi7917hJ2psTZq5nnGw6PBeApvlVtw=";
+    hash = "sha256-75RE72Vy4HRRjwa7qOybnUAzxxhBUKSlKfrLrm6Ish8=";
   };
 
-  cargoHash = "sha256-WsbzlL+RbR8Hnrsbgr7gFpBlo3RBKcNYPbOsZWygyrI=";
+  cargoHash = "sha256-a8G9snl6TrH90HvlfhDY/U8BuSoD7Fqn7BJSsRvEQ18=";
 
   buildFeatures = [ "nu-ansi-term" ];
 
diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index caaadf616045..93d435ecd272 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule rec {
   pname = "lsh";
-  version = "1.4.7";
+  version = "1.5.0";
   src = fetchFromGitHub {
     owner = "latitudesh";
     repo = "lsh";
     rev = "v${version}";
-    sha256 = "sha256-vPxxMQuui5kCoJ2+6UsyoUjzWbUioUXGN3ixhYdJyPY=";
+    sha256 = "sha256-VsOahtc2KFTBjkbE1Raq1ho/fMifALBHVhoJyY85MJ8=";
   };
-  vendorHash = "sha256-ePq891qK4rmGSXQHDcvr4K8tEfoP+LBC8UfO/EP5DZk=";
+  vendorHash = "sha256-kOGHLrnpVQe8gy827CeP+1f2fy4WpUfWDfaNq/JmXpU=";
   subPackages = [ "." ];
   meta = {
     changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}";
diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index e3ef3b6d7fed..071c3b9b0534 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -11,17 +11,17 @@
   libXrandr,
   libsndfile,
   lv2,
-  php82,
+  php84,
   pkg-config,
 }:
 
 let
-  php = php82;
+  php = php84;
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lsp-plugins";
-  version = "1.2.23";
+  version = "1.2.25";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz";
-    hash = "sha256-GxjSnDsEPiXbaJ9khSvgQZeVONxWf4WJilurHpSf14w=";
+    hash = "sha256-qCm3DfRF7LR6wk5TtC/r1GIA2ZI7YrrZTKNHjLDjJnM=";
   };
 
   # By default, GStreamer plugins are installed right alongside GStreamer itself
@@ -88,54 +88,76 @@ stdenv.mkDerivation (finalAttrs: {
       - LADSPA - set of plugins for Linux Audio Developer's Simple Plugin API
       - LV2 - set of plugins and UIs for Linux Audio Developer's Simple Plugin API (LADSPA) version 2
       - LinuxVST - set of plugins and UIs for Steinberg's VST 2.4 format ported on GNU/Linux Platform
+      - VST3 - set of plugins and UIs for Steinberg's VST 3 format
       - JACK - Standalone versions for JACK Audio connection Kit with UI
 
       Contains the following plugins (https://lsp-plug.in/?page=plugins)
 
       Equalizers:
-      - Fliter
+      - Filter
       - Graphic Equalizer
       - Parametric Equalizer
+
       Dynamic Processing:
+      - Beat Breather
+      - Clipper
       - Compressor
-      - Dynamic Processor
+      - Dynamics Processor
       - Expander
       - Gate
       - Limiter
+
       Multiband Dynamic Processing:
       - GOTT Compressor
+      - Multiband Clipper
       - Multiband Compressor
       - Multiband Dynamics Processor
       - Multiband Expander
       - Multiband Gate
       - Multiband Limiter
-      Convolution / Reverb processing:
+
+      Convolution / Reverb Processing:
       - Impulse Responses
       - Impulse Reverb
       - Room Builder
+
       Delay Effects:
       - Artistic Delay
       - Compensation Delay
       - Slap-back Delay
+
+      Modulation Effects:
+      - Chorus
+      - Flanger
+      - Phaser
+
       Analyzers:
       - Oscilloscope
       - Phase Detector
       - Spectrum Analyzer
+
       Multiband Processing:
       - Crossover
+
       Samplers:
       - Multisampler
       - Sampler
+
       Generators / Oscillators:
       - Noise Generator
       - Oscillator
-      Utilitary Plugins:
+
+      Utility Plugins:
       - A/B Test Plugin
-      - Flanger
+      - Automatic Gain Control
       - Latency Meter
       - Loudness Compensator
       - Mixer
       - Profiler
+      - Referencer
+      - Return
+      - Ring Modulated Sidechain
+      - Send
       - Surge Filter
       - Trigger
     '';
diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix
index a1053ade1595..39ee4352f089 100644
--- a/pkgs/by-name/lt/ltex-ls-plus/package.nix
+++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "ltex-ls-plus";
-  version = "18.6.0";
+  version = "18.6.1";
 
   src = fetchurl {
     url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz";
-    sha256 = "sha256-T5ZUQHOjP3V0Xebi6elcjYEuiDtFg5fd+kwrubjWFoU=";
+    sha256 = "sha256-YhuT1ZKpecysA4DuMrgko77L0t0Ve9VanXWHbX8p3qo=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];
diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index ca5af2e800dd..f9916365136c 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -133,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       gepbird
       sei40kr
     ];
diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix
index 06bded91452f..4f897ed991f3 100644
--- a/pkgs/by-name/lu/luaformatter/package.nix
+++ b/pkgs/by-name/lu/luaformatter/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Koihik/LuaFormatter";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lua-format";
   };
 }
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
index cf41d472435e..d597834c7bc0 100644
--- a/pkgs/by-name/lu/luarocks-packages-updater/package.nix
+++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
@@ -5,7 +5,6 @@
   lib,
   nix-prefetch-scripts,
   luarocks-nix,
-  pluginupdate,
   lua5_1,
   lua5_2,
   lua5_3,
@@ -41,18 +40,15 @@ python3Packages.buildPythonApplication {
   ];
 
   dependencies = [
-    python3Packages.gitpython
+    python3Packages.nixpkgs-plugin-update
   ];
 
   postFixup = ''
-    echo "pluginupdate folder ${pluginupdate}"
     wrapProgram $out/bin/luarocks-packages-updater \
-     --prefix PYTHONPATH : "${pluginupdate}" \
      --prefix PATH : "${path}"
   '';
 
   shellHook = ''
-    export PYTHONPATH="maintainers/scripts/pluginupdate-py:$PYTHONPATH"
     export PATH="${path}:$PATH"
   '';
 
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index 4aa7ea6b9db0..555cde43ec55 100755
--- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -18,8 +18,8 @@ from dataclasses import dataclass
 from multiprocessing.dummy import Pool
 from pathlib import Path
 
-import pluginupdate
-from pluginupdate import FetchConfig, update_plugins
+import nixpkgs_plugin_update
+from nixpkgs_plugin_update import FetchConfig, update_plugins
 
 
 class ColoredFormatter(logging.Formatter):
@@ -88,7 +88,7 @@ class LuaPlugin:
 
 
 # rename Editor to LangUpdate/ EcosystemUpdater
-class LuaEditor(pluginupdate.Editor):
+class LuaEditor(nixpkgs_plugin_update.Editor):
     def create_parser(self):
         parser = super().create_parser()
         parser.set_defaults(proc=1)
diff --git a/pkgs/by-name/lu/luastatus/package.nix b/pkgs/by-name/lu/luastatus/package.nix
index 4f28dbad3945..40fb644ff715 100644
--- a/pkgs/by-name/lu/luastatus/package.nix
+++ b/pkgs/by-name/lu/luastatus/package.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     docutils
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     wrapProgram $out/bin/luastatus-stdout-wrapper \
       --prefix LUASTATUS : $out/bin/luastatus
diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 1b7cb2d98a08..176a8c7532a2 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau-lsp";
-  version = "1.54.0";
+  version = "1.56.1";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-18r/NScWfSwAvFT46zdJsNYXoEW8FF34XyZajAaGb28=";
+    hash = "sha256-IRBVLLWycc4zkjR82jAEcTlmDgXSLbaAA7ejSIYm41U=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 64cfe16c4a20..987c86616ac5 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.695";
+  version = "0.698";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-7ByLeKSUvaKVGJUwDb1tkxfScw8B9K6abTNk0gD2CqI=";
+    hash = "sha256-OfOBbO1FHLEvqeCo8cojVpMPZl6pjWF5z+BL2uffwIU=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix
index 5763e99039f1..4190ef3a071e 100644
--- a/pkgs/by-name/lu/lucky-commit/package.nix
+++ b/pkgs/by-name/lu/lucky-commit/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     description = "Change the start of your git commit hashes to whatever you want";
     homepage = "https://github.com/not-an-aardvark/lucky-commit";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lucky_commit";
   };
 }
diff --git a/pkgs/by-name/lu/lugaru/package.nix b/pkgs/by-name/lu/lugaru/package.nix
index e6301e2ca907..3481c6380883 100644
--- a/pkgs/by-name/lu/lugaru/package.nix
+++ b/pkgs/by-name/lu/lugaru/package.nix
@@ -52,11 +52,21 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DSYSTEM_INSTALL=ON" ];
 
+  # CMake 3.0 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.0)" \
+      "cmake_minimum_required(VERSION 3.10)" \
+    --replace-fail \
+      "cmake_policy(SET CMP0004 OLD)" ""
+  '';
+
   meta = {
     description = "Third person ninja rabbit fighting game";
     mainProgram = "lugaru";
     homepage = "https://osslugaru.gitlab.io";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
   };
diff --git a/pkgs/by-name/lu/luit/package.nix b/pkgs/by-name/lu/luit/package.nix
index 8be9df590ad7..86cc09527242 100644
--- a/pkgs/by-name/lu/luit/package.nix
+++ b/pkgs/by-name/lu/luit/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "luit";
-  version = "20240910";
+  version = "20250912";
 
   src = fetchurl {
     url = "https://invisible-mirror.net/archives/luit/luit-${finalAttrs.version}.tgz";
-    hash = "sha256-oV1/y/wlrhRT1hrsI/9roEFF1ue3s7AHHrXP2jo6SdU=";
+    hash = "sha256-RpWAYOZvNby4pRuiLaHBPXJtKKhsHPUgURvPeRS+854=";
   };
   hardeningDisable = [
     "bindnow"
diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 6f1e5d6aab04..729a4690d4e0 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-AGubOjYDv7+Lep6XJl+ybsKClrwY6TyTuYyoqWtYgmfY7QZtyV+1ATQOx6/fVpA3YTW8oCj65tuI6ZcZXUayDQ==";
+    hash = "sha512-rJl0EZ48bXmC24KGZIAuXUw9VLTzAwgLpOU1Ck5OYX3ZgDu5NQd26WAFoGwQqu8HpksPjv3Ylqhl9MEpWGXyLw==";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index af5ac7909264..c48b157b5f9d 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.12";
+  version = "2.1.13";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-2wYUvAersPFNJILtNV5m7den1o6OOB2jxa0ZwqwQlx0=";
+    hash = "sha256-OxkhXBaoXaq7NvlZerQV9AwX85nMS/HBgH6KpugJeMU=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix
index 4d4331414386..11f01928975b 100644
--- a/pkgs/by-name/lu/lunatic/package.nix
+++ b/pkgs/by-name/lu/lunatic/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index df7bf3ce6753..d053e32bc244 100644
--- a/pkgs/by-name/lu/lune/package.nix
+++ b/pkgs/by-name/lu/lune/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lune";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "filiptibell";
     repo = "lune";
     tag = "v${version}";
-    hash = "sha256-pWOGaVugfnwaA4alFP85ha+/iaN8x6KOVnx38vfFk78=";
+    hash = "sha256-AbviyCy2nn6WHC575JKl/t3bM/4Myb+Wx5/buTvB4MY=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-cq7Sgq9f2XpVTgEOMfR/G7sTqcWLwuJBgG9U+h4IMWQ=";
+  cargoHash = "sha256-QSQ+SsvLa7f9EVGi6i/SlpL8yWXVP47zkw4beDy5UIQ=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''
diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix
index 1fe34e63f662..f6ff6aee0e48 100644
--- a/pkgs/by-name/lu/lurk/package.nix
+++ b/pkgs/by-name/lu/lurk/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lurk";
   version = "0.3.10";
 
   src = fetchFromGitHub {
     owner = "jakwai01";
     repo = "lurk";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5riwosaT7QjRFnIFRAcyLul7i1g8OpHyUuuJNOROTF0=";
   };
 
@@ -23,13 +23,13 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
-    changelog = "https://github.com/jakwai01/lurk/releases/tag/v${version}";
+    changelog = "https://github.com/jakwai01/lurk/releases/tag/v${finalAttrs.version}";
     description = "Simple and pretty alternative to strace";
     homepage = "https://github.com/jakwai01/lurk";
     license = lib.licenses.agpl3Only;
     mainProgram = "lurk";
     maintainers = with lib.maintainers; [
-      figsoda
+      gepbird
     ];
     platforms = [
       "i686-linux"
@@ -37,4 +37,4 @@ rustPlatform.buildRustPackage rec {
       "aarch64-linux"
     ];
   };
-}
+})
diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix
index 545910442f5a..0a075faf559e 100644
--- a/pkgs/by-name/lu/luwen/package.nix
+++ b/pkgs/by-name/lu/luwen/package.nix
@@ -6,13 +6,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "luwen";
-  version = "0.7.13";
+  version = "0.7.14";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "luwen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2l+rcWP9Ms0bvvSvZIA4DjH6bIloQGxzRTE1ShP6hEE=";
+    hash = "sha256-KhkABISkR37MjEwgroVtywYNCxgfwXyM5LG2CIJhu3M=";
   };
 
   postUnpack = ''
diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index 580eb7693df2..6923cd52e476 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.18.2";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Lqw6U14fhkz4ZgSH0OBICvuj2ZJWo7p0dwhpn7szu2A=";
+    hash = "sha256-cQ7kgg4pv7j47cvhhHV9885M1hlknZJI2FRWxX5SmCc=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-Dx6nmB8kmCKNzXVTROI+NIxvvCboACSOLUU1BCLnTUw=";
+  cargoHash = "sha256-x4cLC+UeoSI4yYdEJb26vnj9JvZ5t31J0mcnQJjZabk=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/applications/audio/lv2lint/default.nix b/pkgs/by-name/lv/lv2lint/package.nix
similarity index 83%
rename from pkgs/applications/audio/lv2lint/default.nix
rename to pkgs/by-name/lv/lv2lint/package.nix
index c35e27767537..96204f473a26 100644
--- a/pkgs/applications/audio/lv2lint/default.nix
+++ b/pkgs/by-name/lv/lv2lint/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "open-music-kontrollers.ch";
     owner = "~hp";
     repo = "lv2lint";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-NkzbKteLZ+P+Py+CMOYYipvu6psDslWnM1MAV1XB0TM=";
   };
 
@@ -44,12 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "x11-tests" true)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Check whether a given LV2 plugin is up to the specification";
     homepage = "https://git.open-music-kontrollers.ch/~hp/lv2lint";
-    license = licenses.artistic2;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
+    license = lib.licenses.artistic2;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
     mainProgram = "lv2lint";
   };
 })
diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix
index 2034caffd516..7f6a9e0b54a0 100644
--- a/pkgs/by-name/lw/lwan/package.nix
+++ b/pkgs/by-name/lw/lwan/package.nix
@@ -12,22 +12,15 @@
 
 stdenv.mkDerivation rec {
   pname = "lwan";
-  version = "0.5";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "lpereira";
     repo = "lwan";
     rev = "v${version}";
-    sha256 = "sha256-otiPH+e+auMCyeOTq4LJYaBNv+I91kOCww7DCepQTAQ=";
+    sha256 = "sha256-kH4pZXLcVqGtiGF9IXsybWc+iG8bGASmxcaCKTAB40g=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/lpereira/lwan/commit/9b94ff5eecec1e925103b25a43dacc226a634878.patch";
-      hash = "sha256-g1ZwmEodtF1fkbIBaLT4YvH8EG8DGafHydPSYJra+c0=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -38,8 +31,6 @@ stdenv.mkDerivation rec {
   # Note: tcmalloc and mimalloc are also supported (and normal malloc)
   cmakeFlags = lib.optional enableJemalloc "-DUSE_ALTERNATIVE_MALLOC=jemalloc";
 
-  hardeningDisable = lib.optional stdenv.hostPlatform.isMusl "pie";
-
   meta = with lib; {
     description = "Lightweight high-performance multi-threaded web server";
     mainProgram = "lwan";
diff --git a/pkgs/by-name/lw/lwc/package.nix b/pkgs/by-name/lw/lwc/package.nix
index d9006a5570f6..454060ef61f1 100644
--- a/pkgs/by-name/lw/lwc/package.nix
+++ b/pkgs/by-name/lw/lwc/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "lwc";
   version = "unstable-2022-07-26";
 
@@ -19,15 +19,14 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${src.rev}"
+    "-X=main.version=${finalAttrs.src.rev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Live-updating version of the UNIX wc command";
     homepage = "https://github.com/timdp/lwc";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    license = lib.licenses.mit;
     mainProgram = "lwc";
   };
-}
+})
diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index c428bb8f8757..8a261b6c1ab5 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.224";
+  version = "1.227";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-Wib8zZsdw9K5dmVYPymzv4hkAhrOWyEjflzEX8tv0zc=";
+    hash = "sha256-7EJlMgY++YrUQ9BKZLOft1isc8EHuOLVoORMLMPngTI=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 26b490a0551b..a8237fbd249b 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "LycheeSlicer";
-  version = "7.4.4";
+  version = "7.4.5";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-ZbKMCbTKqdjcTefEfrhovRQSRydKf3QBsXHi/XwXuUc=";
+    hash = "sha256-UY8bS3nPhUqyBeMD7Ou6OJZ2LKFi3QbNGeTSmtC1Sbg=";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/by-name/ly/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix
index 67982e9667a4..52c642a9f80e 100644
--- a/pkgs/by-name/ly/ly/deps.nix
+++ b/pkgs/by-name/ly/ly/deps.nix
@@ -89,27 +89,36 @@ let
 in
 linkFarm name [
   {
-    name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0";
+    name = "clap-0.11.0-oBajB-HnAQDPCKYzwF7rO3qDFwRcD39Q0DALlTSz5H7e";
     path = fetchZigArtifact {
       name = "clap";
-      url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz";
-      hash = "sha256-cbPGmVlIXwIuRPIfQoFXzwLulT4XEv8rQWcJUl1ueyo=";
+      url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.11.0.tar.gz";
+      hash = "sha256-fDWd7EQYZuAlBlrpynBuznK89OiiX74xcZsekv84lkg=";
     };
   }
   {
-    name = "zigini-0.3.1-BSkB7XJGAAB2E-sKyzhTaQCBlYBL8yqzE4E_jmSY99sC";
+    name = "zigini-0.3.2-BSkB7WJJAADybd5DGd9MLCp6ikGGUq9wicxsjv0HF1Qc";
     path = fetchZigArtifact {
       name = "zigini";
-      url = "https://github.com/Kawaii-Ash/zigini/archive/2ed3d417f17fab5b0ee8cad8a63c6d62d7ac1042.tar.gz";
-      hash = "sha256-Zj9uU6EEHkNZ1cPIDgDj1E2CEpbmPmpJYjSSFnxxdf0=";
+      url = "https://github.com/AnErrupTion/zigini/archive/96ca1d9f1a7ec741f07ceb104dae2b3a7bdfd48a.tar.gz";
+      hash = "sha256-Hhc/+a8ToHI9RAJTIQ6Z3KZKQFvoPvd5ODz7HRbytdw=";
     };
   }
   {
-    name = "N-V-__8AAB9qAACwl56piR-krrhXSPxCvEskA52cmaTWXYk_";
+    name = "ini-0.1.0-YCQ9YkUnAAA7SjpLwvomwrngMn3TConSAlNgo7Q8ibMZ";
     path = fetchZigArtifact {
       name = "ini";
-      url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz";
-      hash = "sha256-RQ6OPJBqqH7PCL+xiI58JT7vnIo6zbwpLWn+byZO5iM=";
+      url = "https://github.com/AnErrupTion/ini/archive/ac6e656157b2ac6c98392283a139b47c44a85d54.tar.gz";
+      hash = "sha256-rOXuHsd4WiLDODruQioADMWQ7UkNtx5LUdTcK2dve40=";
+    };
+  }
+  {
+    name = "N-V-__8AAGcUBQAa5vov1Yi_9AXEffFQ1e2KsXaK4dgygRKq";
+    path = fetchZigArtifact {
+      name = "termbox2";
+      url = "git+https://github.com/AnErrupTion/termbox2?ref=master#290ac6b8225aacfd16851224682b851b65fcb918";
+      hash = "sha256-of95/wJeCTWI3p7NxvnUlb618qffUZv2YxgBgzp+crs=";
+      rev = "290ac6b8225aacfd16851224682b851b65fcb918";
     };
   }
 ]
diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix
index da8a7908cf37..f6461a3fb1d1 100644
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@@ -5,7 +5,7 @@
   linux-pam,
   libxcb,
   makeBinaryWrapper,
-  zig_0_14,
+  zig_0_15,
   callPackage,
   nixosTests,
   x11Support ? true,
@@ -13,19 +13,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ly";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
-    owner = "AnErrupTion";
+    owner = "fairyglade";
     repo = "ly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70=";
+    hash = "sha256-2JOpC70uBvGk17edXDNeNhNqn2hHZBpOoQaUxN0IlLk=";
   };
 
   nativeBuildInputs = [
     makeBinaryWrapper
-    zig_0_14.hook
+    zig_0_15.hook
   ];
   buildInputs = [
     linux-pam
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     ln -s ${
       callPackage ./deps.nix {
-        zig = zig_0_14;
+        zig = zig_0_15;
       }
     } $ZIG_GLOBAL_CACHE_DIR/p
   '';
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "TUI display manager";
     license = lib.licenses.wtfpl;
-    homepage = "https://codeberg.org/AnErrupTion/ly";
+    homepage = "https://codeberg.org/fairyglade/ly";
     maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "ly";
diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix
index d2139a8f023c..64f22e642e7e 100644
--- a/pkgs/by-name/ly/lychee/package.nix
+++ b/pkgs/by-name/ly/lychee/package.nix
@@ -1,30 +1,54 @@
 {
   callPackage,
   lib,
-  rustPlatform,
+  stdenv,
+  buildPackages,
   fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
   pkg-config,
   openssl,
   testers,
 }:
 
+let
+  canRun = stdenv.hostPlatform.emulatorAvailable buildPackages;
+  lychee = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/lychee${stdenv.hostPlatform.extensions.executable}";
+in
 rustPlatform.buildRustPackage rec {
   pname = "lychee";
-  version = "0.20.1";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "lycheeverse";
     repo = "lychee";
-    rev = "lychee-v${version}";
-    hash = "sha256-yHIj45RfQch4y+V4Ht7cDMcg5MECejxsbjuE345I/to=";
+    tag = "lychee-v${version}";
+    leaveDotGit = true;
+    postFetch = ''
+      GIT_DATE=$(git -C $out/.git show -s --format=%cs)
+      substituteInPlace $out/lychee-bin/build.rs \
+        --replace-fail \
+          '("cargo:rustc-env=GIT_DATE={}", git_date())' \
+          '("cargo:rustc-env=GIT_DATE={}", "'$GIT_DATE'")'
+      rm -rf $out/.git
+    '';
+    hash = "sha256-Nt7LsnQkWQS0f2/lS8WNYkI+XbKUSHQ6bNf9FNjfk7A=";
   };
 
-  cargoHash = "sha256-d3umjtXPBJbPRtNCuktYhJUPgKFmB8UEeewWMekDZRE=";
+  cargoHash = "sha256-1sqFjNil6KktpqrsXXgt3xtOz7eFQc2skkFHqmTMDg4=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    installShellFiles
+  ];
 
   buildInputs = [ openssl ];
 
+  postFixup = lib.optionalString canRun ''
+    ${lychee} --generate man > lychee.1
+    installManPage lychee.1
+  '';
+
   cargoTestFlags = [
     # don't run doctests since they tend to use the network
     "--lib"
@@ -32,6 +56,8 @@ rustPlatform.buildRustPackage rec {
     "--tests"
   ];
 
+  checkType = "debug"; # compilation fails otherwise
+
   checkFlags = [
     #  Network errors for all of these tests
     # "error reading DNS system conf: No such file or directory (os error 2)" } }
@@ -44,6 +70,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=cli::test_local_file"
     "--skip=client::tests"
     "--skip=collector::tests"
+    "--skip=commands::generate::tests::test_examples_work"
     "--skip=src/lib.rs"
     # Color error for those tests as we are not in a tty
     "--skip=formatters::response::color::tests::test_format_response_with_error_status"
diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix
index 47eefd68371e..f19d7cdde6ab 100644
--- a/pkgs/by-name/ly/lynis/package.nix
+++ b/pkgs/by-name/ly/lynis/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "3.1.5";
+  version = "3.1.6";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "lynis";
     rev = version;
-    sha256 = "sha256-XMgC6KjkLgjSOBHBx7WM7C2Vm3Z/lto7CFs10kIxwZc=";
+    sha256 = "sha256-f1iV9OBkycrwP3ydjaGMX45JIBtzZKHEJqnEoVuZPu4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix
index c5e48d45e42f..9aedcccb6e81 100644
--- a/pkgs/by-name/ly/lynx/package.nix
+++ b/pkgs/by-name/ly/lynx/package.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  hardeningEnable = [ "pie" ];
-
   configureFlags = [
     "--enable-default-colors"
     "--enable-widec"
diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix
index a9af016a7097..70403dc903d2 100644
--- a/pkgs/by-name/lz/lzbench/package.nix
+++ b/pkgs/by-name/lz/lzbench/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lzbench";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "inikep";
     repo = "lzbench";
     rev = "v${version}";
-    sha256 = "sha256-JyK5Hah3X4zwmli44HEO62BYfNg7BBd0+DLlljeHmRc=";
+    sha256 = "sha256-CmT+mjFKf8/HE00re1QzU2pwdUYR8Js1kN4y6c2ZiNY=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/lz/lzham/package.nix b/pkgs/by-name/lz/lzham/package.nix
index 025ac6ab6144..3daa1a6307ec 100644
--- a/pkgs/by-name/lz/lzham/package.nix
+++ b/pkgs/by-name/lz/lzham/package.nix
@@ -5,29 +5,38 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "lzham";
-  version = "1.0";
+  version = "1.0-unstable-2023-05-14";
 
   src = fetchFromGitHub {
     owner = "richgel999";
-    repo = "lzham_codec";
-    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}_release";
-    sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v";
+    repo = "lzham_codec_devel";
+    rev = "d09fc6676a0313c3814457fbc76351a68f653092";
+    hash = "sha256-zKzz4gEB2dkIIAuDhKGWeV1hn8tCMVILsiQ/gu6aAEE=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ../bin_linux/lzhamtest $out/bin
+  cmakeFlags = [
+    "-DCMAKE_SKIP_RPATH=ON"
+  ];
+
+  postPatch = ''
+    substituteInPlace {./,lzhamcomp/,lzhamdecomp/,lzhamdll/,lzhamtest/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
-  meta = with lib; {
+  postInstall = ''
+    mkdir -p $out/bin
+    cp lzhamtest/lzhamtest $out/bin/
+  '';
+
+  meta = {
     description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed";
     mainProgram = "lzhamtest";
     homepage = "https://github.com/richgel999/lzham_codec";
-    license = with licenses; [ mit ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/m-/m-cli/package.nix b/pkgs/by-name/m-/m-cli/package.nix
index 6d207a8606b6..340df4bf12e1 100644
--- a/pkgs/by-name/m-/m-cli/package.nix
+++ b/pkgs/by-name/m-/m-cli/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "m-cli";
-  version = "0.3.0";
+  version = "2.0.5";
 
   src = fetchFromGitHub {
     owner = "rgcr";
     repo = "m-cli";
     rev = "v${version}";
-    sha256 = "sha256-KzlE1DdVMLnGmcOS1a2HK4pASofD1EHpdqbzVVIxeb4=";
+    sha256 = "sha256-41o7RoRlHwAmzSREDhQpq2Lchkz8QPxJRqN42ShUJb8=";
   };
 
   dontBuild = true;
@@ -24,16 +24,17 @@ stdenv.mkDerivation rec {
       gsub(/^\[ -L.*|^\s+\|\| pushd.*|^popd.*/, "");
       gsub(/MPATH=.*/, "MPATH='$MPATH'");
       gsub(/(update|uninstall)_mcli \&\&.*/, "echo NOOP \\&\\& exit 0");
+      gsub(/get_version \&\&.*/, "echo m-cli version: ${version} \\&\\& exit 0");
       print
     }' m
 
-    install -Dt "$MPATH/plugins" -m755 plugins/*
+    install -Dt "$out/bin/plugins" -m755 plugins/*
 
     install -Dm755 m $out/bin/m
 
-    install -Dt "$out/share/bash-completion/completions/" -m444 completion/bash/m
-    install -Dt "$out/share/fish/vendor_completions.d/" -m444 completion/fish/m.fish
-    install -Dt "$out/share/zsh/site-functions/" -m444 completion/zsh/_m
+    install -Dt "$out/share/bash-completion/completions/" -m444 completions/bash/m
+    install -Dt "$out/share/fish/vendor_completions.d/" -m444 completions/fish/m.fish
+    install -Dt "$out/share/zsh/site-functions/" -m444 completions/zsh/_m
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index 868003eaaa35..052c7e694266 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -7,19 +7,44 @@
   python3Packages,
   nix-update-script,
   nixos-icons,
+  buildPackages,
   customLogo ? "${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png",
+  withChainloading ? false,
 }:
+
+let
+  stdenvOpts = {
+    targetPlatform.system = "aarch64-none-elf";
+    targetPlatform.rust.rustcTarget = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat";
+    targetPlatform.rust.rustcTargetSpec = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat";
+  };
+  rust = buildPackages.rust.override {
+    stdenv = lib.recursiveUpdate buildPackages.stdenv stdenvOpts;
+  };
+  rustPackages = rust.packages.stable.overrideScope (
+    f: p: {
+      rustc-unwrapped = p.rustc-unwrapped.override {
+        stdenv = lib.recursiveUpdate p.rustc-unwrapped.stdenv stdenvOpts;
+      };
+    }
+  );
+  rustPlatform = buildPackages.makeRustPlatform rustPackages;
+
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "m1n1";
-  version = "1.5.0";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "AsahiLinux";
     repo = "m1n1";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J1PZVaEdI6gx/qzsoVW1ehRQ/ZDKzdC1NgIGgBqxQ+0=";
+    hash = "sha256-rxop5r+EVXnp1OVkGT6MUwcl6yNTJxJSJuruZiaou7g=";
+    fetchSubmodules = true;
   };
 
+  cargoVendorDir = ".";
+
   postPatch = lib.optionalString (customLogo != null) ''
     magick ${customLogo} -resize 128x128 data/custom_128.png
     magick ${customLogo} -resize 256x256 data/custom_256.png
@@ -27,6 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     imagemagick
+  ]
+  ++ lib.optionals withChainloading [
+    rustPackages.rustc
+    rustPackages.cargo
+    rustPlatform.cargoSetupHook
   ];
 
   postConfigure = ''
@@ -40,8 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     "ARCH=${stdenv.cc.targetPrefix}"
     "RELEASE=1"
-    (lib.optionalString (customLogo != null) "LOGO=custom")
-  ];
+  ]
+  ++ lib.optional (customLogo != null) "LOGO=custom"
+  ++ lib.optional withChainloading "CHAINLOADING=1";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index 25feb19aa605..c8c231f2afe1 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
       _414owen
-      figsoda
     ];
     mainProgram = "macchina";
   };
diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 252841b90a58..07db1071d379 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -1,19 +1,20 @@
 {
-  lib,
-  python3Packages,
   fetchFromGitHub,
+  lib,
   procps,
+  python3Packages,
+  stdenv,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "mackup";
-  version = "0.8.41";
+  version = "0.9.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lra";
     repo = "mackup";
     rev = "${version}";
-    hash = "sha256-eWSBl8BTg2FLI21DQcnepBFPF08bfm0V8lYB4mMbAiw=";
+    hash = "sha256-10Q0lb2wiDjD4v2yFBvG3tvy9r+/T/ni4QhHUPyxFO0=";
   };
 
   postPatch = ''
@@ -21,9 +22,9 @@ python3Packages.buildPythonApplication rec {
       --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \
   '';
 
-  build-system = with python3Packages; [ poetry-core ];
+  build-system = with python3Packages; [ hatchling ];
 
-  dependencies = with python3Packages; [ docopt ];
+  dependencies = with python3Packages; [ docopt-ng ];
 
   pythonImportsCheck = [ "mackup" ];
 
@@ -32,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   enabledTestPaths = [ "tests/*.py" ];
 
   # Disabling tests failing on darwin due to a missing pgrep binary on procps
-  disabledTests = [ "test_is_process_running" ];
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_is_process_running" ];
 
   meta = {
     description = "Tool to keep your application settings in sync (OS X/Linux)";
diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 75df27fe80be..169dedbf9eb8 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "2.0.3";
+  version = "2.0.9";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-J15cSuxSVOyPLEPPVAbL35/JTbBRlb8+1bA9QE3eNeQ=";
+    hash = "sha256-b1p50qqNvwqku3pv3dylkRgsZnZwExwx95RQ6zV5pQM=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index ab6c05ec0095..5735194590b4 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "magic-vlsi";
-  version = "8.3.555";
+  version = "8.3.573";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "magic";
     tag = "${version}";
-    sha256 = "sha256-O/W2gWdL4z7JSAv+ZvTkQ6ApKLhrg4UwGde68qSwq3c=";
+    sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch b/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch
index ac85496018ad..7f224c73954b 100644
--- a/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch
+++ b/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch
@@ -31,7 +31,7 @@ index 930861d8a..3b67844d2 100644
  }
  
  set POP3D_ETC_DIR "$MU_DATA_DIR/etc"
-+set MU_PASSWD_HASH [exec mkpasswd --method=yescrypt guessme]
++set MU_PASSWD_HASH [exec mkpasswd -m yescrypt guessme]
  mu_makespool "$MU_RC_DIR" "$POP3D_ETC_DIR"
  mu_create_config pop3d
  
diff --git a/pkgs/by-name/ma/makeself/package.nix b/pkgs/by-name/ma/makeself/package.nix
index 3c329f6fc0cd..de6d35c66c14 100644
--- a/pkgs/by-name/ma/makeself/package.nix
+++ b/pkgs/by-name/ma/makeself/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "makeself";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "megastep";
     repo = "makeself";
     tag = "release-${version}";
     fetchSubmodules = true;
-    hash = "sha256-QPisihCGnzG9gaZyb/bUroWdPAoC2GdQiz1tSkoScjs=";
+    hash = "sha256-F5lx8B2C8CsEUXQPQTK1q8PAMf5yzIEAqq3zbYnseTs=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ma/malt/package.nix b/pkgs/by-name/ma/malt/package.nix
index f7919e15673a..c5046ead52c0 100644
--- a/pkgs/by-name/ma/malt/package.nix
+++ b/pkgs/by-name/ma/malt/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "malt";
-  version = "1.2.6";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "memtt";
     repo = "malt";
     rev = "v${version}";
-    sha256 = "sha256-Hq6XDxcjH5ronprnV1CwumGqBg9RXYpJ+WANqoBA2/c=";
+    sha256 = "sha256-4lCAEk/b8APuOo+x/kGSTg7vFSBZf/VBuSMDM7o5sts=";
   };
 
   postPatch = ''
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
       src/integration/malt-{webview,passwd}.sh.in
   '';
 
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_JEMALLOC" false)
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libelf
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "Memory tool to find where you allocate your memory";
     homepage = "https://github.com/memtt/malt";
     license = licenses.cecill-c;
-    maintainers = [ ];
+    maintainers = with maintainers; [ skohtv ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ma/maltego/package.nix b/pkgs/by-name/ma/maltego/package.nix
index 95b288b79cd1..9521b66b4487 100644
--- a/pkgs/by-name/ma/maltego/package.nix
+++ b/pkgs/by-name/ma/maltego/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maltego";
-  version = "4.10.1";
+  version = "4.11.0";
 
   src = fetchzip {
     url = "https://downloads.maltego.com/maltego-v4/linux/Maltego.v${finalAttrs.version}.linux.zip";
-    hash = "sha256-ujI5rEuLjShbPdS6JDW2SxoeCfLDuuK2d/4Uq1ne1EA=";
+    hash = "sha256-+kbQsXIp9BAr6NxleMiGbmvIFWTDJzYQC6vtzYlK39Y=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix
index 6670f8ee7897..df1bca2e0fdc 100644
--- a/pkgs/by-name/ma/man-pages/package.nix
+++ b/pkgs/by-name/ma/man-pages/package.nix
@@ -3,19 +3,25 @@
   stdenv,
   fetchurl,
   directoryListingUpdater,
+  gawk,
   man,
+  pcre2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "man-pages";
-  version = "6.15";
+  version = "6.16";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz";
-    hash = "sha256-A9jr9hi9XfV8tL81Xvo/TNOgC3ce/WI9T9BCtdzrRGU=";
+    hash = "sha256-jiR6vXXNgICc/ghpbIG4xwaQWDsEV0lISyQvtDYx16M=";
   };
 
-  nativeInstallCheckInputs = [ man ];
+  nativeInstallCheckInputs = [
+    gawk
+    man
+    pcre2
+  ];
 
   dontBuild = true;
   enableParallelInstalling = true;
diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix
index 55b57a63e5a4..5b9208d83e25 100644
--- a/pkgs/by-name/ma/mandown/package.nix
+++ b/pkgs/by-name/ma/mandown/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "mandown";
   };
 })
diff --git a/pkgs/by-name/ma/mani/package.nix b/pkgs/by-name/ma/mani/package.nix
index d86c18087c2f..273d01bf1f8e 100644
--- a/pkgs/by-name/ma/mani/package.nix
+++ b/pkgs/by-name/ma/mani/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mani";
-  version = "0.31.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "alajmo";
     repo = "mani";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-sV3yxtLlOTtCCj0kNstJ07cvI+B+rL4QNPQKGo98V6A=";
+    sha256 = "sha256-GB9BlicNiExDUi9s4PdvsqFHqwvekme/Usqp6I/k5kc=";
   };
 
   vendorHash = "sha256-PnQocOtnIBl0+5mDG7irEqGjAnzJ9Wk/fA4NW/nU+zw=";
diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix
index a9ef6eb830b9..71190b146eba 100644
--- a/pkgs/by-name/ma/manifest-tool/package.nix
+++ b/pkgs/by-name/ma/manifest-tool/package.nix
@@ -10,14 +10,14 @@
 
 buildGoModule rec {
   pname = "manifest-tool";
-  version = "2.2.0";
+  version = "2.2.1";
   modRoot = "v2";
 
   src = fetchFromGitHub {
     owner = "estesp";
     repo = "manifest-tool";
     tag = "v${version}";
-    hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30=";
+    hash = "sha256-3Vzeq81zLfJLV1XcnQLixL9+acjIegjspquvMsgtuXg=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse HEAD > $out/.git-revision
diff --git a/pkgs/by-name/ma/mapcidr/package.nix b/pkgs/by-name/ma/mapcidr/package.nix
index a810abc5d60a..02a1ce4d90fa 100644
--- a/pkgs/by-name/ma/mapcidr/package.nix
+++ b/pkgs/by-name/ma/mapcidr/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mapcidr";
-  version = "1.1.96";
+  version = "1.1.97";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "mapcidr";
     tag = "v${version}";
-    hash = "sha256-wEx1HDMl2y3di3k5Mb4lnX5adYYd7wPyaF2bw+5ivSY=";
+    hash = "sha256-a+yVSh+Cgq73mQHaumVgNqEg/gXa2r2qld4bTi3Du/Y=";
   };
 
-  vendorHash = "sha256-W647ne516UVhQ3ctrr+LsAEwzxeVHBjshW1pG1Wb/gU=";
+  vendorHash = "sha256-4gzxKmnl8MOPcdzkwhReZ/cfbjfICY9kxousveoHYR0=";
 
   modRoot = ".";
   subPackages = [
diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix
index 1c96078be752..b6604b9a6c77 100644
--- a/pkgs/by-name/ma/mapnik/package.nix
+++ b/pkgs/by-name/ma/mapnik/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapnik";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jbtVJHTAeKGpb6PtcK9Tt4qA6dsECwLSQG9JGsHJjvY=";
+    hash = "sha256-WwxQNMTDaImlDqBYo4p1aNvIzAc3egza6LkXH7gEqOA=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ma/maptool/package.nix b/pkgs/by-name/ma/maptool/package.nix
index e1f71c3abf51..4a596f8a7874 100644
--- a/pkgs/by-name/ma/maptool/package.nix
+++ b/pkgs/by-name/ma/maptool/package.nix
@@ -13,11 +13,11 @@
 }:
 let
   pname = "maptool";
-  version = "1.18.5";
+  version = "1.18.6";
   repoBase = "https://github.com/RPTools/maptool";
   src = fetchurl {
     url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
-    hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
+    hash = "sha256-QSJjXgzjoKIwTvIx6iWCHjleJTAAI7qnbcxZb8sygxY=";
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ma/markscribe/package.nix b/pkgs/by-name/ma/markscribe/package.nix
index 9dac443919f3..7124b951a9de 100644
--- a/pkgs/by-name/ma/markscribe/package.nix
+++ b/pkgs/by-name/ma/markscribe/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/muesli/markscribe";
     changelog = "https://github.com/muesli/markscribe/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ma/marl/package.nix b/pkgs/by-name/ma/marl/package.nix
index ae5e576bc9c7..b2e338d11bca 100644
--- a/pkgs/by-name/ma/marl/package.nix
+++ b/pkgs/by-name/ma/marl/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation {
   # Turn on the flag to install after building the library.
   cmakeFlags = [ "-DMARL_INSTALL=ON" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/google/marl";
     description = "Hybrid thread / fiber task scheduler written in C++ 11";
diff --git a/pkgs/by-name/ma/marst/package.nix b/pkgs/by-name/ma/marst/package.nix
index 70f3f3f8cfdb..a68dead275c1 100644
--- a/pkgs/by-name/ma/marst/package.nix
+++ b/pkgs/by-name/ma/marst/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "marst";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA=";
+    hash = "sha256-139HA7C0S1C+V5CPnVVu5sO+3ZfWOMQpSdauyE+AcLo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix
index 7236aeadebea..b82b4f42df79 100644
--- a/pkgs/by-name/ma/mask/package.nix
+++ b/pkgs/by-name/ma/mask/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/jacobdeichert/mask/blob/mask/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
   };
diff --git a/pkgs/by-name/ma/mastotool/package.nix b/pkgs/by-name/ma/mastotool/package.nix
index c14432ab819f..a9b91c88b401 100644
--- a/pkgs/by-name/ma/mastotool/package.nix
+++ b/pkgs/by-name/ma/mastotool/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/muesli/mastotool";
     changelog = "https://github.com/muesli/mastotool/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "mastotool";
   };
 }
diff --git a/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
index 601e0815cb6e..50847feaf2de 100644
--- a/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
+++ b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
@@ -6,5 +6,5 @@
  return [
 -    'path.geoip2' => Piwik\DI::string('{path.root}/misc/'),
 +    'path.geoip2' => PIWIK_USER_PATH . '/misc/',
-     'geopip2.ispEnabled' => true
+     'geopip2.ispEnabled' => true,
  ];
diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix
index 53c7fcc46ff4..8887491f8e78 100644
--- a/pkgs/by-name/ma/matomo/package.nix
+++ b/pkgs/by-name/ma/matomo/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "matomo";
-  version = "5.4.0";
+  version = "5.5.1";
 
   src = fetchurl {
     url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PRZYqJBebDsjeT9WBArRX3GKFbW5TtejV2FOo8jjaMU=";
+    hash = "sha256-aL2mz7qyDT43Ez2BFzrdPyQX9/m3FUfz7copwa7u/zs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index 5e76d0a1d5b0..e3d29b7ee553 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2025.9.24";
+  version = "2025.11.5";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-6k/pbAWkjvzxVpL7zX/B2ojZOTvSl9HKhLrI5OgsX5Y=";
+    hash = "sha256-vSnsPtUzoxpuV9/pZFhXwlRP6lGZPBzkdTbR1ASkdQA=";
   };
 
-  vendorHash = "sha256-8b9F4gVqHWznfPFbf7jRNENgBJg2SiMFle8cz5WVuw8=";
+  vendorHash = "sha256-EcHocZhrYgh+cIg5Y+9rHf30aVkTK4BVk0NI3PzL3X4=";
 
   env.CGO_ENABLED = "0";
 
diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
index ff937c86c511..69a6be233806 100644
--- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
@@ -14,19 +14,19 @@
 
 let
   pname = "matrix-appservice-irc";
-  version = "3.0.5";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-appservice-irc";
     tag = version;
-    hash = "sha256-R/Up4SNWl2AAaeyPJe6OOKFrwIOIvDw/guJxgBuZNC4=";
+    hash = "sha256-bM1CUuFRBOg/4y50gI7ZLwnrbBU6pZlqyitTI2WeVsA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     name = "${pname}-${version}-offline-cache";
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-EJJyGVM4WMVQFWcTjgKHvRFWn40sXNi/vg/bypJ1hMU=";
+    hash = "sha256-JHSHhkfDGAra6Lq2QB5ngkLo1jR+vrWeux+LYORciZ8=";
   };
 
 in
diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 8f7ecc652b86..a6e08d9b2f6c 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -18,21 +18,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "1.3.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iwQ+ItcpjShEyRi3RI0IuXXmlfzamGFHrdZpp7wBBis=";
+    hash = "sha256-MlOilH01OpiYHxhCceSXVw1zhyNQXYomTvSMkM9sUrk=";
   };
 
-  cargoHash = "sha256-FgV2YfU2iqlYwoq3WCaM52fDmgKIQg2gx5q68P3Mhf0=";
+  cargoHash = "sha256-hvEr+cMjPJ4DLigAL9SQLUJqOVSOktsP8v4xTtOKvSg=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-PGT8UCjsgyARHw2/lbCAMSNQr/5FqbDz0Auf90jjHLk=";
+    hash = "sha256-0YWguliIJjYh1IUUIX4/CHDYwvUk/M2Hz15tL558tws=";
   };
 
   npmRoot = "frontend";
diff --git a/pkgs/by-name/ma/matrix-gtk-theme/package.nix b/pkgs/by-name/ma/matrix-gtk-theme/package.nix
index 10f102b3f254..10667e95ac77 100644
--- a/pkgs/by-name/ma/matrix-gtk-theme/package.nix
+++ b/pkgs/by-name/ma/matrix-gtk-theme/package.nix
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-07-28";
+    version = "0-unstable-2025-10-15";
 
     src = fetchFromGitHub {
       owner = "D3vil0p3r";
       repo = "Matrix-GTK-Theme";
-      rev = "fe8152fff81630efca6dedefe4b7f766fb2700f9";
-      hash = "sha256-maGRPw9qeKTy5JzDvrQIYe2zi4plhDu4NgjevizTAEE=";
+      rev = "d76d8c69cb1fca0f050009ee5893c65954f3ddfe";
+      hash = "sha256-RJKHSBj33QR9ahkMd2HwG7FCUB8gtfTzIp0174TPHPE=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 3335cb72067c..4ba829f3b248 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.140.0";
+  version = "1.141.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-nk1nOfJQOBgnlIAju+Q8+0Q0wTGaymhSQSdwecTJLUY=";
+    hash = "sha256-trn5+OOtubOOjlOjJ7WCgeMz2IAsxurHvPQYg/RkEX4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix
index b7fe6422f9c8..e1f6f403077f 100644
--- a/pkgs/by-name/ma/matrix-tuwunel/package.nix
+++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
+  libredirect,
   bzip2,
   zstd,
   stdenv,
@@ -17,6 +18,7 @@
   enableLiburing ? stdenv.hostPlatform.isLinux,
   liburing,
   nixosTests,
+  writeTextFile,
 }:
 let
   rust-jemalloc-sys' = rust-jemalloc-sys.override {
@@ -85,16 +87,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-tuwunel";
-  version = "1.4.2";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "matrix-construct";
     repo = "tuwunel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h7a8nbKZ6cK6SoAGwORc6+D+jJxQOut7y5KzHfBbqDE=";
+    hash = "sha256-tZKq8ypDU1MkWORHFQhieDSUOqOzBcfqIQ40amyc1ls=";
   };
 
-  cargoHash = "sha256-RjoO5eiAXYhC8Tg5UNqCpBsFVN1I+0UhchslAmhm0Qo=";
+  cargoHash = "sha256-x+LhpwDytwH/NzKWqAuRRbX77OZ2JGaYSaQxqinf81Q=";
 
   nativeBuildInputs = [
     pkg-config
@@ -137,6 +139,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optional enableLiburing "io_uring";
 
+  nativeCheckInputs = [
+    libredirect.hook
+  ];
+
+  preCheck =
+    let
+      fakeResolvConf = writeTextFile {
+        name = "resolv.conf";
+        text = ''
+          nameserver 0.0.0.0
+        '';
+      };
+    in
+    ''
+      export NIX_REDIRECTS="/etc/resolv.conf=${fakeResolvConf}"
+      export TUWUNEL_DATABASE_PATH="$(mktemp -d)/smoketest.db"
+    '';
+  doCheck = true;
+
   passthru = {
     rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 2447cb920604..57c35fb360fb 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -18,11 +18,11 @@
     # the version regex here as well.
     #
     # Ensure you also check ../mattermostLatest/package.nix.
-    regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.11";
-    srcHash = "sha256-2XX6SNWlu+2Kh0rJodp0Ipzu8/gdjygCxeD2BVYDcTc=";
-    vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
-    npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
+    regex = "^v(10\\.11\\.[0-9]+)$";
+    version = "10.11.6";
+    srcHash = "sha256-JBZAFyjZOteDaCVktxXtdbimNrvCpUpgK45OuFCI5xQ=";
+    vendorHash = "sha256-Lsw/cvl98JdVmzWr85lAv/JMcTmZZZ4ALLunFLNcrro=";
+    npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';
diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index 85d3003fa8c8..53ccc82ab558 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   mattermost,
   gotestsum,
   which,
@@ -12,16 +11,10 @@
   runtimeShell,
 }:
 
-let
-  inherit (lib.lists) optionals;
-  inherit (lib.strings) versionAtLeast;
-  is10 = version: versionAtLeast version "10.0";
-in
 mattermost.overrideAttrs (
   final: prev: {
     doCheck = true;
     checkTargets = [
-      "test-server"
       "test-mmctl"
     ];
     nativeCheckInputs = [
@@ -52,113 +45,17 @@ mattermost.overrideAttrs (
     # X  TestFoo
     # X  TestFoo/TestBar
     # -> TestFoo/TestBar/baz_test
-    disabledTests = [
+    disabledTests = lib.lists.uniqueStrings [
       # All these plugin tests for mmctl reach out to the marketplace, which is impossible in the sandbox
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/SystemAdminClient"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/LocalClient"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_a_Plugin_without_permissions"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/SystemAdminClient"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/LocalClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/LocalClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/LocalClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/LocalClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/LocalClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/LocalClient"
-
-      # Seems to just be broken.
-      "TestMmctlE2ESuite/TestPreferenceUpdateCmd"
-
-      # Has a hardcoded "google.com" test which also verifies that the address isn't loopback,
-      # so we also can't just substituteInPlace to one that will resolve
-      "TestDialContextFilter"
-
-      # No interfaces but loopback in the sandbox, so returns empty
-      "TestGetServerIPAddress"
-
-      # S3 bucket tests (needs Minio)
-      "TestInsecureMakeBucket"
-      "TestMakeBucket"
-      "TestListDirectory"
-      "TestTimeout"
-      "TestStartServerNoS3Bucket"
-      "TestS3TestConnection"
-      "TestS3FileBackendTestSuite"
-      "TestS3FileBackendTestSuiteWithEncryption"
-      "TestWriteFileVideoMimeTypes"
-
-      # Mail tests (needs a SMTP server)
-      "TestSendMailUsingConfig"
-      "TestSendMailUsingConfigAdvanced"
-      "TestSendMailWithEmbeddedFilesUsingConfig"
-      "TestSendCloudWelcomeEmail"
-      "TestMailConnectionAdvanced"
-      "TestMailConnectionFromConfig"
-      "TestEmailTest"
-      "TestBasicAPIPlugins/test_send_mail_plugin"
-
-      # Seems to be unreliable
-      "TestPluginAPIUpdateUserPreferences"
-      "TestPluginAPIGetUserPreferences"
-
-      # These invite tests try to send a welcome email and we don't have a SMTP server up.
-      "TestInviteUsersToTeam"
-      "TestInviteGuestsToTeam"
-      "TestSendInviteEmails"
-      "TestDeliver"
-
-      # https://github.com/mattermost/mattermost/issues/29184
-      "TestUpAndDownMigrations/Should_be_reversible_for_mysql"
-    ]
-    ++ optionals (is10 final.version) [
-      ## mattermostLatest test ignores
-
-      # These bot related tests appear to be broken.
-      "TestCreateBot"
-      "TestPatchBot"
-      "TestGetBot"
-      "TestEnableBot"
-      "TestDisableBot"
-      "TestAssignBot"
-      "TestConvertBotToUser"
-
-      # Need Elasticsearch or Opensearch
-      "TestBlevePurgeIndexes"
-      "TestOpensearchAggregation"
-      "TestOpensearchInterfaceTestSuite"
-      "TestOpenSearchIndexerJobIsEnabled"
-      "TestOpenSearchIndexerPending"
-      "TestBulkProcessor"
-      "TestElasticsearchAggregation"
-      "TestElasticsearchInterfaceTestSuite"
-      "TestElasticSearchIndexerJobIsEnabled"
-      "TestElasticSearchIndexerPending"
-
-      # Broken in the sandbox.
-      "TestVersion"
-      "TestRunServerNoSystemd"
-
-      # Appear to be broken.
-      "TestSessionStore/MySQL"
-      "TestAccessControlPolicyStore/MySQL"
-      "TestAttributesStore/MySQL"
-      "TestBasicAPIPlugins"
-
-      "TestRunExportJobE2EByType"
-      "TestUpdateTeam"
-      "TestSyncSyncableRoles"
-    ]
-    ++ optionals (!stdenv.hostPlatform.isx86_64) [
-      # aarch64: invalid operating system or processor architecture
-      "TestCanIUpgradeToE0"
-
-      # aarch64: thumbnail previews are nondeterministic
-      "TestUploadFiles/multipart_Happy_image_thumbnail"
-      "TestUploadFiles/simple_Happy_image_thumbnail"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd"
+      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd"
+      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd"
+      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd"
     ];
 
     preCheck = ''
@@ -378,7 +275,7 @@ mattermost.overrideAttrs (
 
       # Ensure we parallelize the tests, and skip the correct ones.
       # Spaces are important here due to how the Makefile works.
-      export GOFLAGS=" -parallel=$NIX_BUILD_CORES -skip='$(echo "$disabledTests" | tr ' ' '|')' "
+      export GOFLAGS=" -p=$NIX_BUILD_CORES -parallel=$NIX_BUILD_CORES -skip='$(echo "$disabledTests" | tr ' ' '|')' "
 
       # ce n'est pas un conteneur
       MMCTL_TESTFLAGS="$GOFLAGS" MM_NO_DOCKER=true make $checkTargets
diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 72f9a283389f..028180f792b4 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -10,11 +10,11 @@ mattermost.override {
     # See https://docs.mattermost.com/about/mattermost-server-releases.html
     # and make sure the version regex is up to date here.
     # Ensure you also check ../mattermost/package.nix for ESR releases.
-    regex = "^v(10\\.[0-9]+\\.[0-9]+)$";
-    version = "10.12.0";
-    srcHash = "sha256-oVZlXprw0NddHrtx1g2WRoGm1ATq/pqncD0mewN12nw=";
-    vendorHash = "sha256-Lqa463LLy41aaRbrtJFclfOj55vLjK4pWFAFLzX3TJE=";
-    npmDepsHash = "sha256-O9iX6hnwkEHK0kkHqWD6RYXqoSEW6zs+utiYHnt54JY=";
+    regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
+    version = "11.0.4";
+    srcHash = "sha256-odBY/TVvED7h7+u+5nSRng4rRnjt1eee7fUWjxqnAJ4=";
+    vendorHash = "sha256-QlBq8YlphD2YuOrdnhW8g5XXeMkESVDRvKg6i5MGA0k=";
+    npmDepsHash = "sha256-YU6FDsMX0QIGFatUDRos/AkgwljIBeI5w/TJt/lglw0=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';
diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 7defb66efee7..51d013195197 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.9.4";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-dZIcUaHPdXNgzUhSUld2TAKJVfktRahc7OtOwYRlKSQ=";
+    hash = "sha256-hMMX59nq9Wusb0XZb8i5/EmQiPL4WopuZX7maycj0J4=";
   };
 
-  cargoHash = "sha256-tmImZOGERNvAI4I8H4nuJAdrMrMyOYza43+SVdyjFNc=";
+  cargoHash = "sha256-hNFbRtt/sVlEffu7RgXxC1NHzakP8miMyHIV/cf4sfM=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv
diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix
index 80c211f82e5d..c9075fdefe4c 100644
--- a/pkgs/by-name/ma/mautrix-signal/package.nix
+++ b/pkgs/by-name/ma/mautrix-signal/package.nix
@@ -5,6 +5,7 @@
   fetchFromGitHub,
   olm,
   libsignal-ffi,
+  zlib,
   versionCheckHook,
   # This option enables the use of an experimental pure-Go implementation of
   # the Olm protocol instead of libolm for end-to-end encryption. Using goolm
@@ -19,13 +20,14 @@ let
 in
 buildGoModule rec {
   pname = "mautrix-signal";
-  version = "0.8.7";
+  version = "25.10";
+  tag = "v0.2510.0";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "signal";
-    tag = "v${version}";
-    hash = "sha256-dzE6CncAja/6GoeYFuCcxRfd60ybNnCL9HzdMXyfh0k=";
+    tag = tag;
+    hash = "sha256-Bz4jBI/lLhCxZW7JmaX6dlVwbB3dLXn5v/8gMKcFKSE=";
   };
 
   buildInputs =
@@ -35,13 +37,19 @@ buildGoModule rec {
       # must match the version used in https://github.com/mautrix/signal/tree/main/pkg/libsignalgo
       # see https://github.com/mautrix/signal/issues/401
       libsignal-ffi
+      zlib
     ];
 
   tags = lib.optional withGoolm "goolm";
 
   CGO_LDFLAGS = lib.optional withGoolm [ cppStdLib ];
 
-  vendorHash = "sha256-BYTAXhm7hjNa2DN/dcd77zOiDUGb7FC6y3I8FxwQvMI=";
+  vendorHash = "sha256-Sur29i5ih7xK85maVAaq9cwWJVGtwS7hPOxQI4YduNI=";
+
+  ldflags = [
+    "-X"
+    "main.Tag=${tag}"
+  ];
 
   doCheck = true;
   preCheck = ''
diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix
index bd8db90ec545..aa30a179f011 100644
--- a/pkgs/by-name/ma/mautrix-slack/package.nix
+++ b/pkgs/by-name/ma/mautrix-slack/package.nix
@@ -12,21 +12,19 @@
   # any issues they run into.
   withGoolm ? false,
 }:
-let
-  version = "0.2.3";
-in
-buildGoModule {
+buildGoModule rec {
   pname = "mautrix-slack";
-  inherit version;
+  version = "25.10";
+  tag = "v0.2510.0";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "slack";
-    tag = "v${version}";
-    hash = "sha256-gR5D2uCNS+LiP0KXup/iIiOThWohzeBe4CD/oWak1BM=";
+    tag = tag;
+    hash = "sha256-PeSE7WKFSSxZyyG9TJmYeCzHY3bPvkHZ5l+mLzr8tS8=";
   };
 
-  vendorHash = "sha256-aukL6RThtWcznz/x25btTTvloYkRZ/vhAQj1hOdI1U4=";
+  vendorHash = "sha256-9MsHRU2EqMTWEMVraJ/6/084X5yx3zzSdxP8zSYFJ1E=";
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";
@@ -35,6 +33,13 @@ buildGoModule {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "main.Tag=${tag}"
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
index 380dff790da5..6a8a649f619f 100644
--- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix
+++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix
@@ -14,27 +14,35 @@
 
 buildGoModule rec {
   pname = "mautrix-whatsapp";
-  version = "0.12.5";
+  version = "25.10";
+  tag = "v0.2510.0";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "whatsapp";
-    rev = "v${version}";
-    hash = "sha256-FywU4nT/EjEqiC+67FWi3Ni63NI8nqJka6bPdfq1c30=";
+    tag = tag;
+    hash = "sha256-jJIVlK4vTJpwjugKNtWZhO31t7YX+q3W+ZmU1w/itvM=";
   };
 
   buildInputs = lib.optional (!withGoolm) olm;
   tags = lib.optional withGoolm "goolm";
 
-  vendorHash = "sha256-LjlI5zqM1GS+7Sx1mqiwZHM4mPifX7MyLbqEckb90Jo=";
+  vendorHash = "sha256-LvGapdyGYXNUsC0qniwdoA3pUrOivfFq+nEilw5xFNM=";
 
   doCheck = false;
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "main.Tag=${tag}"
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
-    homepage = "https://github.com/tulir/mautrix-whatsapp";
-    description = "Matrix <-> Whatsapp hybrid puppeting/relaybot bridge";
+    homepage = "https://github.com/mautrix/whatsapp";
+    description = "Matrix-WhatsApp puppeting bridge";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [
       vskilet
diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 2e167b02a9df..b829cb71199b 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -63,7 +63,7 @@ let
         # handle cacert by populating a trust store on the fly
         if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then
           echo "using ''${NIX_SSL_CERT_FILE-} as trust store"
-          ${jre-generate-cacerts} ${jdk}/lib/openjdk/bin/keytool $NIX_SSL_CERT_FILE
+          ${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE
 
           MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit"
         fi
diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix
index 740cdcb24de0..a9e69f8e4146 100644
--- a/pkgs/by-name/mb/mbake/package.nix
+++ b/pkgs/by-name/mb/mbake/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mbake";
-  version = "1.4.1.pre";
+  version = "1.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EbodShojaei";
     repo = "bake";
     tag = "v${version}";
-    hash = "sha256-HbBibwrd73GA0Z3xiYJAu1te7BADqsSkk0d99bMrwPw=";
+    hash = "sha256-afVXgS3OTYygfMYsz4zO+THau/8CUU/AWVT2bPDq9sg=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/mb/mbpoll/package.nix b/pkgs/by-name/mb/mbpoll/package.nix
index eeaca80fcbc3..206b2d29b3c8 100644
--- a/pkgs/by-name/mb/mbpoll/package.nix
+++ b/pkgs/by-name/mb/mbpoll/package.nix
@@ -4,6 +4,7 @@
   cmake,
   pkg-config,
   fetchFromGitHub,
+  fetchpatch,
   libmodbus,
 }:
 
@@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rO3j/p7MABlxcwRAZm26u7wgODGFTtetSDhPWPzTuEA=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/epsilonrt/mbpoll/commit/baad0efca89f0d8fe370591283d87a6e8e7dee4c.patch?full_index=1";
+      hash = "sha256-QwrfNeGbirYSrXvGI1lItwNBDN2d6VDF8yjvgcGELxE=";
+    })
+  ];
+
   buildInputs = [ libmodbus ];
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/by-name/mb/mbrola-voices/package.nix
similarity index 100%
rename from pkgs/applications/audio/mbrola/voices.nix
rename to pkgs/by-name/mb/mbrola-voices/package.nix
diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/by-name/mb/mbrola/package.nix
similarity index 100%
rename from pkgs/applications/audio/mbrola/default.nix
rename to pkgs/by-name/mb/mbrola/package.nix
diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix
index baba9df86a83..a80cf02fd297 100644
--- a/pkgs/by-name/mb/mbusd/package.nix
+++ b/pkgs/by-name/mb/mbusd/package.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Modbus TCP to Modbus RTU (RS-232/485) gateway";
     homepage = "https://github.com/3cky/mbusd";
diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix
index ce2bf85ac5b2..f59859e0989b 100644
--- a/pkgs/by-name/mc/mcap-cli/package.nix
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.0.55";
+  version = "0.0.56";
 in
 buildGoModule {
 
@@ -20,7 +20,7 @@ buildGoModule {
     repo = "mcap";
     owner = "foxglove";
     rev = "releases/mcap-cli/v${version}";
-    hash = "sha256-3HV7FNlS91J089FgtKOQEXCzQEoDR39w0kBB8H88rSw=";
+    hash = "sha256-PPllUAkcuv/FXIjsuJFJ9KbzA6qHCaOBQz77N7D2JtA=";
   };
 
   vendorHash = "sha256-twuXJXiGhjTqlEZ3xD8G9CruSLxFC33PMs2GZadl1Ow=";
diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index 28e84b0bc758..fa0d1aee195a 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.7.3";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rRrBrSQ0/bOrRkcH5/SBIHVY9u/Ddm4GmxTJUTZM77o=";
+    hash = "sha256-NFEFPvcq6BMfwnaybAMKZEtP5kCicPr36nLOqaqsm9A=";
   };
 
-  vendorHash = "sha256-FDwVtI+RQuwNQE8pty+vJXW13ZSG4P9GZkm967LJct8=";
+  vendorHash = "sha256-XgbTwyiRZgq6sg3AML+RlUhnx7YTOe5VlBZq665/T6g=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix
index fd990bd36647..4e93f0109204 100644
--- a/pkgs/by-name/mc/mcp-nixos/package.nix
+++ b/pkgs/by-name/mc/mcp-nixos/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mcp-nixos";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "utensils";
     repo = "mcp-nixos";
     tag = "v${version}";
-    hash = "sha256-SbmfP5Qo7liu39tTpIm6IC2qfwChooTYaPZiJqgwTzY=";
+    hash = "sha256-UCsJ8eDuHL14u2GFIYEY/drtZ6jht5zN/G/6QNlEy2g=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix
index 598fe0b50c14..386a94f1721a 100644
--- a/pkgs/by-name/mc/mcpelauncher-client/package.nix
+++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix
@@ -98,7 +98,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_OWN_CURL" false)
     (lib.cmakeBool "ENABLE_DEV_PATHS" false)
     (lib.cmakeFeature "GAMEWINDOW_SYSTEM" "GLFW")
-    (lib.cmakeBool "USE_SDL3_AUDIO" false)
+    (lib.cmakeBool "SDL3_VENDORED" false)
     (lib.cmakeBool "BUILD_WEBVIEW" withQtWebview)
     (lib.cmakeBool "XAL_WEBVIEW_USE_CLI" (!withQtWebview))
     (lib.cmakeBool "XAL_WEBVIEW_USE_QT" withQtWebview)
diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix
index 0cca8016a24e..1c0d61ed2436 100644
--- a/pkgs/by-name/mc/mcphost/package.nix
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -6,16 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcphost";
-  version = "0.19.2";
+  version = "0.31.3";
 
   src = fetchFromGitHub {
     owner = "mark3labs";
     repo = "mcphost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BDG4df7YG5cKjL8zsbvK4xFJMwyjSPx4jnDKwPVm+zw=";
+    hash = "sha256-1pPwW4Q84OWTcMVz4rEWEt1ZwWmxHmQTsCiqXKpOkvs=";
   };
 
-  vendorHash = "sha256-U/XtO4OhcioaSU2iGTNmvEilp9+Yu3TVafzNEaFcWEg=";
+  vendorHash = "sha256-xZ7JbX1sAt2ZtgSMm86MQEJWwjL17O9LMsjOmkhzWt0=";
+
+  doCheck = false;
 
   meta = {
     description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)";
diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix
index 7806e313f583..f2d69266ac17 100644
--- a/pkgs/by-name/md/mdadm4/package.nix
+++ b/pkgs/by-name/md/mdadm4/package.nix
@@ -8,15 +8,17 @@
   system-sendmail,
   udev,
   udevCheckHook,
+  gitUpdater,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "mdadm";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz";
-    sha256 = "sha256-QWcnrh8QgOpuMJDOo23QdoJvw2kVHjarc2VXupIZb58=";
+    sha256 = "sha256-m0iPNe0VPfmZJLX+Qe7TgOhRLejxihGGKMrN1oGx1XM=";
   };
 
   patches = [
@@ -32,10 +34,6 @@ stdenv.mkDerivation rec {
       url = "https://lore.kernel.org/linux-raid/20240220165158.3521874-1-raj.khem@gmail.com/raw";
       hash = "sha256-JOZ8n7zi+nq236NPpB4e2gUy8I3l3DbcoLhpeL73f98=";
     })
-    (fetchurl {
-      url = "https://github.com/md-raid-utilities/mdadm/commit/9dbd11e091f84eb0bf9d717283774816c4c4453d.patch";
-      hash = "sha256-8GdjP1ceVwejTOFXcHXG8wkIF9/D6hOUGD6btvuqs24=";
-    })
   ];
 
   makeFlags = [
@@ -80,6 +78,17 @@ stdenv.mkDerivation rec {
     grep -r $out $out/bin && false || true
   '';
 
+  passthru = {
+    tests = {
+      inherit (nixosTests) systemd-initrd-swraid;
+      installer-swraid = nixosTests.installer.swraid;
+    };
+    updateScript = gitUpdater {
+      url = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";
+      rev-prefix = "mdadm-";
+    };
+  };
+
   meta = with lib; {
     description = "Programs for managing RAID arrays under Linux";
     homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";
diff --git a/pkgs/by-name/md/mdbook-mermaid/package.nix b/pkgs/by-name/md/mdbook-mermaid/package.nix
index c9ed04e07dd7..82f8b291c839 100644
--- a/pkgs/by-name/md/mdbook-mermaid/package.nix
+++ b/pkgs/by-name/md/mdbook-mermaid/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mdbook-mermaid";
-  version = "0.16.0";
+  version = "0.16.2";
 
   src = fetchFromGitHub {
     owner = "badboy";
     repo = "mdbook-mermaid";
     tag = "v${version}";
-    hash = "sha256-Zn8jMlohSGlQFyKCUscS/jMiOU8kVzLva0GpHCMeOXc=";
+    hash = "sha256-RbicO3TN7cnfm71OdsVbehgA5LJ1EHE26nXg0Gh1U6o=";
   };
 
-  cargoHash = "sha256-AgFSsEDtOE4HKhJbqC0y0R5G79jHksEnhKd5/humaK0=";
+  cargoHash = "sha256-WMPk/UPNfNXjJKUcczbQPOy9bwy2ZSR5DPmvwtcJ5ys=";
 
   meta = {
     description = "Preprocessor for mdbook to add mermaid.js support";
diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix
new file mode 100644
index 000000000000..4ab03088820b
--- /dev/null
+++ b/pkgs/by-name/md/mdbook-plugins/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  curl,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdbook-plugins";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "RustForWeb";
+    repo = "mdbook-plugins";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-IyIUJH5pbuvDarQf7yvrStMIb5HdimudYF+Tq/+OtvY=";
+  };
+
+  cargoHash = "sha256-/UM85Lhq52MFTjczPRuXENPJOQkjiHLWGPPW/VD9kBQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    curl
+    openssl
+  ];
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  cargoBuildFlags = [
+    "--bin=mdbook-tabs"
+    "--bin=mdbook-trunk"
+  ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Plugins for mdBook";
+    homepage = "https://mdbook-plugins.rustforweb.org/";
+    changelog = "https://github.com/RustForWeb/mdbook-plugins/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ redianthus ];
+    mainProgram = "mdbook-tabs";
+  };
+})
diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix
index 6c6074353bd8..66c1293488b9 100644
--- a/pkgs/by-name/md/mdbook/package.nix
+++ b/pkgs/by-name/md/mdbook/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   nix,
   rustPlatform,
   installShellFiles,
@@ -22,6 +23,14 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-wvTixSVHXglJM+nBMulZNZKF8pZfNd2G8Z+1PlAWmpk=";
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-rust-1.91-tests.patch";
+      url = "https://github.com/rust-lang/mdBook/commit/841c68d05e763b031524a2b4d679f033cd15e64c.patch?full_index=1";
+      hash = "sha256-KDQhmFX2TWamtdyssFL69MP3vg9LABb+bF8/7vaFsew=";
+    })
+  ];
+
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix
index 25e62257ecc7..33c4019dabdf 100644
--- a/pkgs/by-name/md/mdfried/package.nix
+++ b/pkgs/by-name/md/mdfried/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdfried";
-  version = "0.12.9";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "benjajaja";
     repo = "mdfried";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0vAPUmG11Qvds3g2iaH7umZpo4b2/Dtvcm6I8WfM8jw=";
+    hash = "sha256-BMBV01VF0oubtFP6WHBiZqUAkxkhsxggPZ0255pONoA=";
   };
 
-  cargoHash = "sha256-3jx4sIXETEsgTBcTTbedEv0BXoSejLe4oEaudhQIN6s=";
+  cargoHash = "sha256-FJFdGhoV7Y9sy24DmqLiuwgOryodLjacobeT9jamEfk=";
 
   doCheck = true;
 
diff --git a/pkgs/by-name/md/mdio-tools/package.nix b/pkgs/by-name/md/mdio-tools/package.nix
new file mode 100644
index 000000000000..4f797a0fdbc0
--- /dev/null
+++ b/pkgs/by-name/md/mdio-tools/package.nix
@@ -0,0 +1,41 @@
+{
+  autoreconfHook,
+  fetchFromGitHub,
+  lib,
+  libmnl,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mdio-tools";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "wkz";
+    repo = "mdio-tools";
+    tag = finalAttrs.version;
+    hash = "sha256-NomChJrYwMDPXNw5r2p11kGfYUvJBHCdLXy1SA8kOaM=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+  buildInputs = [ libmnl ];
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail "git describe --always --dirty --tags" "echo ${finalAttrs.version}"
+  '';
+
+  meta = {
+    description = "Low-level debug tools for MDIO devices";
+    homepage = "https://github.com/wkz/mdio-tools";
+    changelog = "https://github.com/wkz/mdio-tools/blob/${finalAttrs.src.rev}/ChangeLog.md";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.jmbaur ];
+    mainProgram = "mdio";
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix
index e5977fc5cda4..2530a5a7f7ca 100644
--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mdk-sdk";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchurl {
     url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux.tar.xz";
-    hash = "sha256-qt17xZKuZIWmD8ck1IrHXa5i5tKElTYmbGQvqJTtTsY=";
+    hash = "sha256-PKECwms/JGJYsYIvUWU0UBSLwlsYikYw3IGleWXlbtg=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];
diff --git a/pkgs/by-name/md/mdk/package.nix b/pkgs/by-name/md/mdk/package.nix
index 9f2acbcdf266..533d250b21d3 100644
--- a/pkgs/by-name/md/mdk/package.nix
+++ b/pkgs/by-name/md/mdk/package.nix
@@ -9,10 +9,10 @@
 
 stdenv.mkDerivation rec {
   pname = "gnu-mdk";
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchurl {
     url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz";
-    sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
+    sha256 = "sha256-67ljk4xojBUP9qrtwp8w0JAgoeMdVbMMIQHwh3NRbRk=";
   };
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index 7b8af54e3148..14a0477cf157 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0MHt/kSR6JvfCk08WIDPz6R9YYzDJ9RRTM6MU6sEwHk=";
+    hash = "sha256-twEzu9GpyhmFFA1vo7fufROku0ZJE+K8g5lHOJn7/VA=";
   };
 
-  cargoHash = "sha256-oJSsuU1vkisDISnp+/jFs1cWEVxr586l8yHbG6fkPjQ=";
+  cargoHash = "sha256-bqAhhdy4ekgYc5PCrfQtr3PirMxY44BnIP/JVsNW1S0=";
 
   meta = {
     homepage = "https://github.com/CramBL/mdns-scanner";
diff --git a/pkgs/by-name/md/mdr/package.nix b/pkgs/by-name/md/mdr/package.nix
index 79aa9c543817..591c807b0c18 100644
--- a/pkgs/by-name/md/mdr/package.nix
+++ b/pkgs/by-name/md/mdr/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
     description = "MarkDown Renderer for the terminal";
     homepage = "https://github.com/MichaelMure/mdr";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "mdr";
   };
 }
diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix
index 227218955b9c..3e6ddf1b91c1 100644
--- a/pkgs/by-name/md/mdserve/package.nix
+++ b/pkgs/by-name/md/mdserve/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdserve";
-  version = "0.4.1";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "jfernandez";
     repo = "mdserve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C9D6tr88EROo2rzu7t9HAeyKAxFOCZyN+sl7QpFgmI8=";
+    hash = "sha256-tycFsE/jGh5OYD5ewv12vvOhhlbYtlvANk6BhDW38hw=";
   };
 
-  cargoHash = "sha256-RFCGb7wjO8/RsOlsABem5dy+ZfheZNihktqUCX3oDZo=";
+  cargoHash = "sha256-otEa6+IdKHJAT+lPptXgnP5yggTkB3uYfbGhSKTXodo=";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix
index 6287cb4e821d..cfe185d988f4 100644
--- a/pkgs/by-name/md/mdsf/package.nix
+++ b/pkgs/by-name/md/mdsf/package.nix
@@ -1,9 +1,11 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  installShellFiles,
 }:
 let
   pname = "mdsf";
@@ -24,6 +26,17 @@ rustPlatform.buildRustPackage {
   # many tests fail for various reasons of which most depend on the build sandbox
   doCheck = false;
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd mdsf \
+      --bash <($out/bin/mdsf completions bash) \
+      --zsh <($out/bin/mdsf completions zsh) \
+      --fish <($out/bin/mdsf completions fish) \
+      --nushell <($out/bin/mdsf completions nushell)
+  '';
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix
index e6781ce540fa..ab0071c564cb 100644
--- a/pkgs/by-name/me/mealie/mealie-frontend.nix
+++ b/pkgs/by-name/me/mealie/mealie-frontend.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/frontend/yarn.lock";
-    hash = "sha256-e+3LCoOzfjSG4CjzOLXTcXGkmzNwFTLCrN0l5odOBMs=";
+    hash = "sha256-vw7OtXRrASOac4J5j6X/U2kxZa9I9thecUUl6XOYz5w=";
   };
 
   nativeBuildInputs = [
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
     nodejs
     (yarn.override { inherit nodejs; })
     writableTmpDirAsHomeHook
+    dart-sass
   ];
 
   configurePhase = ''
@@ -37,11 +38,11 @@ stdenv.mkDerivation {
 
     yarn config --offline set yarn-offline-mirror "$yarnOfflineCache"
     fixup-yarn-lock yarn.lock
-    yarn install --frozen-lockfile --offline --no-progress --non-interactive
-    patchShebangs node_modules/
+    yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts
+    patchShebangs node_modules
 
-    mkdir -p node_modules/sass-embedded/dist/lib/src/vendor/dart-sass
-    ln -s ${dart-sass}/bin/dart-sass node_modules/sass-embedded/dist/lib/src/vendor/dart-sass/sass
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
 
     runHook postConfigure
   '';
@@ -50,9 +51,7 @@ stdenv.mkDerivation {
     runHook preBuild
 
     export NUXT_TELEMETRY_DISABLED=1
-    yarn --offline build
-    yarn --offline generate
-
+    yarn --offline generate --env production
     runHook postBuild
   '';
 
diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index 7a141243ed9c..821f833b530b 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -11,12 +11,12 @@
 }:
 
 let
-  version = "3.2.1";
+  version = "3.3.2";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     tag = "v${version}";
-    hash = "sha256-LIWubw+iO17giSvGCl5LzI429725sisp5u4Z4usJOGA=";
+    hash = "sha256-iaddAIsrUH6g4KXuSTIulNVWOfy/IWg0Czs9JgDxXUk=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };
diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index c103101da65e..1da648e268f8 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,16 +15,16 @@ in
 buildGoModule (finalAttrs: {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.15.2";
+  version = "1.15.3";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = "mediamtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sqrcfH0A2wvMAhnW/f8Ev3b+neIFv+6//0BFxASyvcM=";
+    hash = "sha256-alZn6o8S6HWlYdsziptsqqSZKdfYHGB1VhPGhTJNbqQ=";
   };
 
-  vendorHash = "sha256-HGh6mbaDANSk8n40Y4RY7L9XFaLe+fSB2afAIVg7M8A=";
+  vendorHash = "sha256-/k0fIxL6x1X1kDNuMVWb40nkXbl+IakSYUgugd8vlLk=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js
diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index 90827c58682f..fdcf965a896c 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -6,19 +6,19 @@
   cmake,
   fetchFromGitHub,
   qt6,
-  udisks2,
+  udisks,
   xz,
 }:
 
 stdenv.mkDerivation rec {
   pname = "mediawriter";
-  version = "5.2.8";
+  version = "5.2.9";
 
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "MediaWriter";
     tag = version;
-    hash = "sha256-8nTWwBf8I4IENh0wColzPg3xjsXg3bubg6ZqNpfLE3c=";
+    hash = "sha256-tZ0GzaEzhklD/FJocnRmet+dvBwZoNYVhJfF1NY6puE=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qtsvg
-    udisks2
+    udisks
     xz
   ];
 
diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index b8e02743871f..cbbdb84569f5 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -7,7 +7,6 @@
   curl,
   fetchFromGitHub,
   ffmpeg,
-  freeimage,
   gcc-unwrapped,
   icu,
   libmediainfo,
@@ -19,7 +18,6 @@
   pkg-config,
   readline,
   sqlite,
-  withFreeImage ? false, # default to false because freeimage is insecure
 }:
 
 let
@@ -71,8 +69,7 @@ stdenv.mkDerivation {
       pcre-cpp
       readline
       sqlite
-    ]
-    ++ lib.optionals withFreeImage [ freeimage ];
+    ];
 
   configureFlags = [
     "--disable-examples"
@@ -88,8 +85,8 @@ stdenv.mkDerivation {
     "--with-readline"
     "--with-sodium"
     "--with-termcap"
-  ]
-  ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
+    "--without-freeimage"
+  ];
 
   # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
   postConfigure = ''
diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index 18b3923132cd..59ff8c9a7306 100644
--- a/pkgs/by-name/me/megaglest/package.nix
+++ b/pkgs/by-name/me/megaglest/package.nix
@@ -144,6 +144,11 @@ stdenv.mkDerivation {
     "-DBUILD_MEGAGLEST_MODEL_VIEWER=On"
   ];
 
+  postPatch = ''
+    substituteInPlace {data/glest_game,.}/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 )" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     for i in $out/bin/*; do
       wrapProgram $i \
diff --git a/pkgs/by-name/me/megahit/package.nix b/pkgs/by-name/me/megahit/package.nix
index 84b8953a0556..ea0266471781 100644
--- a/pkgs/by-name/me/megahit/package.nix
+++ b/pkgs/by-name/me/megahit/package.nix
@@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [
     "-DSTATIC_BUILD=ON"
   ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";
     license = licenses.gpl3;
diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix
index 34238f95e2aa..6142a59e7c35 100644
--- a/pkgs/by-name/me/megasync/package.nix
+++ b/pkgs/by-name/me/megasync/package.nix
@@ -34,13 +34,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "megasync";
-  version = "5.15.0.1";
+  version = "5.16.0.2";
 
   src = fetchFromGitHub rec {
     owner = "meganz";
     repo = "MEGAsync";
     tag = "v${finalAttrs.version}_Linux";
-    hash = "sha256-CqeR1UmwrwUjr8QM2LCkZ4RaEU2bU1fq+QLCN7yfIJk=";
+    hash = "sha256-Bkye2Is3GbdnYYaS//AkNfrt8ppWP9zE58obcmUm0wE=";
     fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync
     leaveDotGit = true;
     postFetch = ''
@@ -67,6 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://aur.archlinux.org/cgit/aur.git/plain/030-megasync-app-fix-cmake-dependencies-detection.patch?h=megasync&id=ff59780039697591e7e3a966db058b23bee0451c";
       hash = "sha256-11XWctv1veUEguc9Xvz2hMYw26CaCwu6M4hyA+5r81U=";
     })
+    (fetchpatch {
+      url = "https://aur.archlinux.org/cgit/aur.git/plain/040-megasync-app-add-missing-link-to-zlib.patch?h=megasync&id=c1f647871f5aad7e421971165b07e51b3e7900e9";
+      hash = "sha256-HMsS5TlzkQZbfANSIrvH8Cp6mTxLJ04idcWUWeD2A0U=";
+    })
     ./megasync-fix-cmake-install-bindir.patch
     ./dont-fetch-clang-format.patch
   ];
diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index d03ae3293cb9..bb47934075ed 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "melange";
-  version = "0.31.6";
+  version = "0.31.8";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "melange";
     rev = "v${version}";
-    hash = "sha256-C7aYI30ExREoIDzCMqGQtfjAf74wyA+6zcanmUoOAuI=";
+    hash = "sha256-oj9yXUX5eByCif6JUvixAKZaxH8ExsyXjJ+hYEOXIKc=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-52wU1icjR70EASU5DIu7Dpu8jEQv0vu69Qoibp6uB1o=";
+  vendorHash = "sha256-6LG+By5grybkyvySQf2PUvRSKY/c/wUrJEiBUU4JCgY=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/by-name/me/mellowplayer/package.nix
similarity index 77%
rename from pkgs/applications/audio/mellowplayer/default.nix
rename to pkgs/by-name/me/mellowplayer/package.nix
index 418e80e15c20..89429be73733 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/by-name/me/mellowplayer/package.nix
@@ -1,43 +1,38 @@
 {
+  stdenv,
   cmake,
   fetchFromGitLab,
   lib,
   libnotify,
-  mkDerivation,
   pkg-config,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-  qtwebengine,
-  stdenv,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "MellowPlayer";
   version = "3.6.8";
 
   src = fetchFromGitLab {
     owner = "ColinDuquesnoy";
     repo = "MellowPlayer";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libnotify
-    qtbase
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    qttools
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.qtdeclarative
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qttools
+    libsForQt5.qtwebengine
   ];
 
   doCheck = true;
@@ -63,18 +58,18 @@ mkDerivation rec {
         (lib.optionalString (pkg ? qtQmlPrefix) ''
           export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
         '')
-      ]) buildInputs
+      ]) finalAttrs.buildInputs
     )
   ));
 
-  meta = with lib; {
-    inherit (qtbase.meta) platforms;
+  meta = {
+    inherit (libsForQt5.qtbase.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore
 
     description = "Cloud music integration for your desktop";
     mainProgram = "MellowPlayer";
     homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ kalbasit ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ kalbasit ];
   };
-}
+})
diff --git a/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch
new file mode 100644
index 000000000000..a7138372240e
--- /dev/null
+++ b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch
@@ -0,0 +1,15 @@
+diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
+index 1afa856f..dcd36f84 100644
+--- a/src/frontend/qt_sdl/CMakeLists.txt
++++ b/src/frontend/qt_sdl/CMakeLists.txt
+@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON)
+ if (USE_QT6)
+     find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED)
+     set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)
++    if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10")
++        find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
++        list(APPEND QT_LINK_LIBS Qt6::GuiPrivate)
++    endif()
+ else()
+     find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED)
+     set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia)
diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index dd612f49c779..794f0ba0bab4 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -5,6 +5,7 @@
   enet,
   extra-cmake-modules,
   fetchFromGitHub,
+  faad2,
   libGL,
   libarchive,
   libpcap,
@@ -28,15 +29,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0-unstable-2025-08-10";
+  version = "1.0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "f9e46fdc29f8e55aca6bc121c424890faee2e51d";
-    hash = "sha256-g5TVvnCoWQej9v2aii5klx7gRzUrokiwy0By0G3LkiI=";
+    rev = "220b238ec06692ee144bb1f50867a2edb8795de1";
+    hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw=";
   };
 
+  patches = [ ./fix-build-qt-6.10.patch ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
@@ -47,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     enet
+    faad2
     libarchive
     libslirp
     libGL
diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch
index 434683968acd..a00de578ce6d 100644
--- a/pkgs/by-name/me/melos/add-generic-main.patch
+++ b/pkgs/by-name/me/melos/add-generic-main.patch
@@ -1,7 +1,7 @@
 diff --git a/bin/melos.dart b/bin/melos.dart
 index 0db7013..218276f 100644
---- a/bin/melos.dart
-+++ b/bin/melos.dart
+--- a/packages/melos/bin/melos.dart
++++ b/packages/melos/bin/melos.dart
 @@ -1,11 +1,37 @@
 +import 'dart:io';
  import 'package:cli_launcher/cli_launcher.dart';
diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix
index 9226e1b2eed5..791b674f1cda 100644
--- a/pkgs/by-name/me/melos/package.nix
+++ b/pkgs/by-name/me/melos/package.nix
@@ -16,8 +16,6 @@ buildDartApplication {
   pname = "melos";
   inherit version src;
 
-  sourceRoot = "${src.name}/packages/melos";
-
   patches = [
     # This patch (created a melos 6.1.0) modify the method melos use to find path to the root of the projects.
     # It is needed because when melos is in the nixstore, it break it and fail to find the projects root with melos.yaml
@@ -28,12 +26,12 @@ buildDartApplication {
 
   # hard code the path to the melos templates
   preBuild = ''
-    substituteInPlace lib/src/common/utils.dart \
+    substituteInPlace packages/melos/lib/src/common/utils.dart \
       --replace-fail "final melosPackageFileUri = await Isolate.resolvePackageUri(melosPackageUri);" "return \"$out\";"
-    substituteInPlace lib/src/common/utils.dart \
+    substituteInPlace packages/melos/lib/src/common/utils.dart \
       --replace-fail "return p.normalize('\''${melosPackageFileUri!.toFilePath()}/../..');" " "
     mkdir --parents $out
-    cp --recursive templates $out/
+    cp --recursive packages/melos/templates $out/
   '';
 
   meta = {
diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json
index e1905f3789ca..35aba4873f96 100644
--- a/pkgs/by-name/me/melos/pubspec.lock.json
+++ b/pkgs/by-name/me/melos/pubspec.lock.json
@@ -709,15 +709,6 @@
       },
       "source": "hosted",
       "version": "2.2.2"
-    },
-    "conventional_commit": {
-      "dependency": "direct main",
-      "description": {
-        "path": "../conventional_commit",
-        "relative": true
-      },
-      "source": "path",
-      "version": "0.6.1"
     }
   },
   "sdks": {
diff --git a/pkgs/by-name/me/memcached/package.nix b/pkgs/by-name/me/memcached/package.nix
index dcce7f82a05e..ce401cc550f3 100644
--- a/pkgs/by-name/me/memcached/package.nix
+++ b/pkgs/by-name/me/memcached/package.nix
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
     libevent
   ];
 
-  hardeningEnable = [ "pie" ];
-
   env.NIX_CFLAGS_COMPILE = toString (
     [ "-Wno-error=deprecated-declarations" ] ++ lib.optional stdenv.hostPlatform.isDarwin "-Wno-error"
   );
diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index dfd9ea5bce99..e7bf782eb759 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -14,17 +14,17 @@
   protoc-gen-validate,
 }:
 let
-  version = "0.25.1";
+  version = "0.25.2";
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
     rev = "v${version}";
-    hash = "sha256-5CeeOpdXs+6Vus4er8JVhJM0a7BKtGsF4SPdOoX5xQk=";
+    hash = "sha256-Yag+OxhlWEhWumnB620QREm4G99osKzQNlGN+1YBMTQ=";
   };
 
   memos-protobuf-gen = stdenvNoCC.mkDerivation {
-    name = "memos-protobuf-gen";
-    inherit src;
+    pname = "memos-protobuf-gen";
+    inherit version src;
 
     nativeBuildInputs = [
       buf
@@ -52,7 +52,7 @@ let
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-BOBnNcBp/vjTaS7N1z5kRWZoKokJXEMNs5rS32ZBtKU=";
+    outputHash = "sha256-j9jBxhDi1COowOh5sDjOuVJdHf2/RSwZ0cQUD/j2jt0=";
   };
 
   memos-web = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -62,7 +62,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
       fetcherVersion = 1;
-      hash = "sha256-qY3jPbdEy+lWoBV/xKNTGQ58xvcoBoG0vPwN5f9+wj4=";
+      hash = "sha256-qvxOY7ASAlYbT5Ju/8b3qiE9KgXkDIj1MZuVH0hmCOA=";
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
@@ -93,7 +93,7 @@ buildGoModule {
     memos-protobuf-gen
     ;
 
-  vendorHash = "sha256-+v2OElo2ZC0OEhNsNe23J0PR0y1opm/HckW+vUmJ8e4=";
+  vendorHash = "sha256-Eihp7Kcu8AiPL2VEypxx8+8JwjHI8htoOv69xGrp560=";
 
   preBuild = ''
     rm -rf server/router/frontend/dist
diff --git a/pkgs/by-name/me/memray/package.nix b/pkgs/by-name/me/memray/package.nix
index 28bcc83c412d..f8b11cd05f9e 100644
--- a/pkgs/by-name/me/memray/package.nix
+++ b/pkgs/by-name/me/memray/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "memray";
-  version = "1.19.0";
+  version = "1.19.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bloomberg";
     repo = "memray";
     tag = "v${version}";
-    hash = "sha256-yOiN4KES+zCHp/n0pN73Yv6ibEtUGy1pqiH/3WECqkA=";
+    hash = "sha256-RdOtgNSkFIVl8Uve2iaJ7G0X1IHJ/Yo4h8hWP3pTV8g=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix
index 036fa64fec11..e590c11abcc6 100644
--- a/pkgs/by-name/me/menyoki/package.nix
+++ b/pkgs/by-name/me/menyoki/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://menyoki.cli.rs/";
     changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "menyoki";
   };
 }
diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix
index 7df8e2b3955e..c6137a31a783 100644
--- a/pkgs/by-name/me/mercurial/package.nix
+++ b/pkgs/by-name/me/mercurial/package.nix
@@ -30,7 +30,7 @@ let
   inherit (python3Packages)
     docutils
     python
-    fb-re2
+    google-re2
     pygit2
     pygments
     setuptools
@@ -64,7 +64,7 @@ let
     cargoRoot = if rustSupport then "rust" else null;
 
     propagatedBuildInputs =
-      lib.optional re2Support fb-re2
+      lib.optional re2Support google-re2
       ++ lib.optional gitSupport pygit2
       ++ lib.optional highlightSupport pygments;
     nativeBuildInputs = [
diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix
index 00f4667861ae..b1f24fc59e28 100644
--- a/pkgs/by-name/me/mermaid-cli/package.nix
+++ b/pkgs/by-name/me/mermaid-cli/package.nix
@@ -7,24 +7,24 @@
   nix-update-script,
 }:
 let
-  version = "11.6.0";
+  version = "11.12.0";
 in
 buildNpmPackage {
   pname = "mermaid-cli";
-  version = version;
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "mermaid-js";
     repo = "mermaid-cli";
     rev = version;
-    hash = "sha256-9Ozi5mAeFVdwGMjvlLG4hMWnCGi552SsT5RuvRiF9ww=";
+    hash = "sha256-OpYq0nOYCGTorzDxybsEjJmhL646wMBbQw3eHVxTuqU=";
   };
 
   patches = [
     ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830
   ];
 
-  npmDepsHash = "sha256-SHGYv/IwrCB02M8w5HsEsB7BwWVRFYNDYJFRDgG3a14=";
+  npmDepsHash = "sha256-Ex+tEm13feR/Vru0CHlvM3xS5wgGlYyqANeIquvRHwM=";
 
   env = {
     PUPPETEER_SKIP_DOWNLOAD = true;
diff --git a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch
index 30f751fc7b4c..7c58948b97f6 100644
--- a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch
+++ b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch
@@ -9,7 +9,7 @@ diff --git a/package.json b/package.json
 @@ -45,7 +45,6 @@
      "@tsconfig/node18": "^18.2.4",
      "@types/node": "~18.19.31",
-     "jest": "^29.0.1",
+     "jest": "^30.0.5",
 -    "puppeteer": "^23.1.1",
      "standard": "^17.0.0",
      "typescript": "^5.0.1-rc",
diff --git a/pkgs/by-name/me/meshlab-unstable/meshlab.desktop b/pkgs/by-name/me/meshlab-unstable/meshlab.desktop
deleted file mode 100644
index aa8de186440d..000000000000
--- a/pkgs/by-name/me/meshlab-unstable/meshlab.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=MeshLab
-Version=@version@
-Name[en_GB]=MeshLab
-GenericName=Mesh processing
-GenericName[en_GB]=Mesh processing
-Comment=View and process meshes
-Type=Application
-Exec=@out@/bin/meshlab %U
-TryExec=@out@/bin/meshlab
-Icon=@out@/share/icons/hicolor/meshlab.png
-Terminal=false
-MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf;
-Categories=Graphics;3DGraphics;Viewer;Qt;
diff --git a/pkgs/by-name/me/meshlab-unstable/package.nix b/pkgs/by-name/me/meshlab-unstable/package.nix
deleted file mode 100644
index 00468e6a0801..000000000000
--- a/pkgs/by-name/me/meshlab-unstable/package.nix
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  llvmPackages,
-  libsForQt5,
-  libGLU,
-  lib3ds,
-  bzip2,
-  muparser,
-  eigen,
-  glew,
-  gmp,
-  levmar,
-  qhull,
-  cmake,
-  cgal,
-  boost,
-  mpfr,
-  xercesc,
-  onetbb,
-  embree,
-  libigl,
-  corto,
-  openctm,
-  structuresynth,
-}:
-
-let
-  tinygltf-src = fetchFromGitHub {
-    owner = "syoyo";
-    repo = "tinygltf";
-    tag = "v2.6.3";
-    hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
-  };
-
-  # requires submodules to build
-  lib3mf-src = fetchFromGitHub {
-    owner = "3MFConsortium";
-    repo = "lib3mf";
-    tag = "v2.3.2";
-    fetchSubmodules = true;
-    hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58=";
-  };
-in
-stdenv.mkDerivation {
-  pname = "meshlab-unstable";
-  version = "2023.12-unstable-2025-02-21";
-
-  src = fetchFromGitHub {
-    owner = "cnr-isti-vclab";
-    repo = "meshlab";
-    # note that this is in branch devel
-    rev = "72142583980b6dbfc5b85c6cca226a72f48497a9";
-    hash = "sha256-ev6b8sgJsjvD8KMBbC6kbrVvTxTxpqsXu/sK1Ih6+OA=";
-    # needed for an updated version of vcg in their submodule
-    fetchSubmodules = true;
-  };
-
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/meshlab/CMakeLists.txt \
-      --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
-      --replace-fail "	TARGET meshlab" "#	TARGET meshlab" \
-      --replace-fail "	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
-                     "#	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
-  '';
-
-  buildInputs = [
-    libGLU
-    libsForQt5.qtbase
-    libsForQt5.qtscript
-    libsForQt5.qtxmlpatterns
-    lib3ds
-    bzip2
-    muparser
-    eigen
-    glew
-    gmp
-    levmar
-    qhull
-    cgal
-    boost
-    mpfr
-    xercesc
-    onetbb
-    embree
-    libigl
-    corto
-    openctm
-    structuresynth
-  ]
-  ++ lib.optionals stdenv.cc.isClang [
-    llvmPackages.openmp
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  preConfigure = ''
-    mkdir src/external/downloads
-    cp -r --no-preserve=mode,ownership ${lib3mf-src} src/external/downloads/lib3mf-2.3.2
-
-    substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
-    substituteInPlace src/external/tinygltf.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
-    substituteInPlace src/external/libigl.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-'$'{LIBIGL_VER} ${libigl}
-    substituteInPlace src/external/nexus.cmake \
-      --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
-    substituteInPlace src/external/levmar.cmake \
-      --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
-      --replace-warn "MD5 ''${LEVMAR_MD5}" ""
-    substituteInPlace src/external/ssynth.cmake \
-      --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
-      --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-    substituteInPlace src/common_gui/CMakeLists.txt \
-      --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
-  '';
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/{Applications,bin,lib}
-    mv $out/meshlab.app $out/Applications/
-    ln $out/Applications/meshlab.app/Contents/Frameworks/* $out/lib/
-    makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
-  '';
-
-  postFixup =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
-      patchelf --add-needed $out/lib/meshlab/lib3mf.so $out/lib/meshlab/plugins/libio_3mf.so
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
-      install_name_tool -change libopenctm.dylib "${lib.getOutput "out" openctm}/lib/libopenctm.dylib" \
-        "$out/Applications/meshlab.app/Contents/PlugIns/libio_ctm.so"
-    '';
-
-  # The hook will wrap all the plugin binaries, make they are not a
-  # valid plugin. So we have to wrap the main app manually.
-  # See: https://github.com/NixOS/nixpkgs/pull/396295#issuecomment-3137779781
-  dontWrapQtApps = stdenv.hostPlatform.isDarwin;
-
-  # display a black screen on wayland, so force XWayland for now.
-  # Might be fixed when upstream will be ready for Qt6.
-  qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
-    "--set QT_QPA_PLATFORM xcb"
-  ];
-
-  meta = {
-    description = "System for processing and editing 3D triangular meshes (unstable)";
-    mainProgram = "meshlab";
-    homepage = "https://www.meshlab.net/";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ pca006132 ];
-    platforms = with lib.platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch b/pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch
new file mode 100644
index 000000000000..83e6a21ea509
--- /dev/null
+++ b/pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch
@@ -0,0 +1,279 @@
+From 1a617220a286c23ecac1ad7bd6aca0d2c68bd1f3 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 19 Sep 2025 08:43:18 +0200
+Subject: [PATCH 1/6] CMake: allow system vcglib
+
+---
+ src/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0398e8566..839a515be 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -75,7 +75,12 @@ endif()
+ ### Enter subdirectories
+ 
+ # VCGLib -- required
+-if (VCGDIR) # VCGDIR exists - using custom user vcglib path
++find_package(vcglib CONFIG)
++if(TARGET vcglib::vcglib)
++	message(STATUS "- VCGLib - using system provided library")
++	add_library(vcglib ALIAS vcglib::vcglib)
++	get_target_property(VCGDIR vcglib::vcglib INTERFACE_INCLUDE_DIRECTORIES)
++elseif (VCGDIR) # VCGDIR exists - using custom user vcglib path
+ 	if(EXISTS ${VCGDIR})
+ 		add_subdirectory(${VCGDIR} {CMAKE_CURRENT_BINARY_DIR}/vcglib)
+ 		message(STATUS "- VCGLib - using custom VCGDIR path library")
+
+From 73debae9b9ca14554c25fa58480969bc7c3f61d1 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 16 Sep 2025 12:44:12 +0200
+Subject: [PATCH 2/6] CMake: MESHLAB_ALLOW_SYSTEM_LEVMAR
+
+---
+ src/external/levmar.cmake | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/levmar.cmake b/src/external/levmar.cmake
+index cc639f09e..882b631db 100644
+--- a/src/external/levmar.cmake
++++ b/src/external/levmar.cmake
+@@ -3,8 +3,25 @@
+ # SPDX-License-Identifier: BSL-1.0
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR "Allow download and use of levmar source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LEVMAR "Allow use of system-provided levmar" ON)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
++find_path(levmar_INCLUDE_DIR NAMES levmar.h PATHS ${levmar_PREFIX})
++find_library(levmar_LIBRARY NAMES levmar PATHS ${levmar_PREFIX})
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(
++	levmar
++	DEFAULT_MSG
++	levmar_LIBRARY
++	levmar_INCLUDE_DIR
++)
++mark_as_advanced(levmar_INCLUDE_DIR levmar_LIBRARY)
++
++if(MESHLAB_ALLOW_SYSTEM_LEVMAR AND levmar_FOUND)
++	message(STATUS "- levmar - using system-provided library")
++	add_library(external-levmar INTERFACE)
++	target_link_libraries(external-levmar INTERFACE ${levmar_LIBRARY})
++	target_include_directories(external-levmar INTERFACE ${levmar_INCLUDE_DIR})
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
+ 	set(LEVMAR_VERSION "2.6.1")
+ 
+ 	set(LEVMAR_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/levmar-${LEVMAR_VERSION}")
+
+From 161d5dabad4cfdc3ec08d9e5dd2ee6c94b057c5c Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 16 Sep 2025 15:15:11 +0200
+Subject: [PATCH 3/6] CMake: MESHLAB_ALLOW_SYSTEM_LIB3MF
+
+---
+ src/external/lib3mf.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/lib3mf.cmake b/src/external/lib3mf.cmake
+index 1cd1b5dfa..f64a63aa5 100644
+--- a/src/external/lib3mf.cmake
++++ b/src/external/lib3mf.cmake
+@@ -22,8 +22,15 @@
+ #############################################################################
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF "Allow download and use of lib3MF source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LIB3MF "Allow use of system-provided lib3MF" ON)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF)
++find_package(lib3mf)
++
++if(MESHLAB_ALLOW_SYSTEM_LIB3MF AND TARGET lib3mf::lib3mf)
++  message(STATUS "- Lib3MF - using system-provided library")
++  add_library(external-lib3mf INTERFACE)
++  target_link_libraries(external-lib3mf INTERFACE lib3mf::lib3mf)
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF)
+   set(LIB3MF_VERSION "2.4.1")
+ 
+   set(LIB3MF_DIR ${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/lib3mf-${LIB3MF_VERSION})
+
+From c6662d486c1f8e5c9c89389abd630d8218b0fcb9 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 16 Sep 2025 15:42:59 +0200
+Subject: [PATCH 4/6] CMake: MESHLAB_ALLOW_SYSTEM_LIBIGL
+
+---
+ src/external/libigl.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/libigl.cmake b/src/external/libigl.cmake
+index 3666f375d..8f84fea4f 100644
+--- a/src/external/libigl.cmake
++++ b/src/external/libigl.cmake
+@@ -3,10 +3,17 @@
+ # SPDX-License-Identifier: BSL-1.0
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL "Allow download and use of LibIGL source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LIBIGL "Allow use of system-provided LibIGL" ON)
+ 
+ set(LIBIGL_VER 2.4.0)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL)
++find_path(libigl_INCLUDE_DIR NAMES igl_inline.h PATH_SUFFIXES igl PATHS ${libigl_PREFIX})
++
++if(MESHLAB_ALLOW_SYSTEM_LIBIGL AND libigl_INCLUDE_DIR)
++	message(STATUS "- LibIGL - using system-provided library")
++	add_library(external-libigl INTERFACE)
++	target_include_directories(external-libigl INTERFACE ${libigl_INCLUDE_DIR})
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL)
+ 	set(LIBIGL_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-${LIBIGL_VER}")
+ 	set(LIBIGL_CHECK "${LIBIGL_DIR}/include/igl/igl_inline.h")
+ 
+
+From a26427e32af672d2554d662376f3f258c64941ca Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 19 Sep 2025 08:58:16 +0200
+Subject: [PATCH 5/6] CMake: MESHLAB_ALLOW_SYSTEM_NEXUS
+
+---
+ src/external/nexus.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/nexus.cmake b/src/external/nexus.cmake
+index 9fc92f714..1139d11e7 100644
+--- a/src/external/nexus.cmake
++++ b/src/external/nexus.cmake
+@@ -3,11 +3,18 @@
+ # SPDX-License-Identifier: BSL-1.0
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS "Allow download and use of nexus source" ON)
++option(MESHLAB_ALLOW_SYSTEM_NEXUS "Allow use of system-provided nexus and corto" ON)
+ 
+ set(CORTO_VER 2025.07)
+ set(NEXUS_VER 2025.05)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS)
++find_package(nexus CONFIG)
++
++if(MESHLAB_ALLOW_SYSTEM_NEXUS AND TARGET nexus::nexus)
++	message(STATUS "- nexus - using system-provided library")
++	add_library(external-nexus INTERFACE)
++	target_link_libraries(external-nexus INTERFACE nexus::nexus)
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS)
+ 	set(NEXUS_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/nexus-${NEXUS_VER}")
+ 	set(NEXUS_CHECK "${NEXUS_DIR}/CMakeLists.txt")
+ 	set(CORTO_DIR "${NEXUS_DIR}/src/corto")
+
+From 32be737316181bd84d8beac7cb6b74379965d2fe Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 19 Sep 2025 11:26:36 +0200
+Subject: [PATCH 6/6] CMake: install exports
+
+---
+ src/CMakeLists.txt                        | 21 +++++++++++++++++++++
+ src/Config.cmake.in                       |  9 +++++++++
+ src/common/CMakeLists.txt                 | 18 ++++++++++++++----
+ src/meshlabplugins/io_base/CMakeLists.txt |  2 +-
+ 4 files changed, 45 insertions(+), 5 deletions(-)
+ create mode 100644 src/Config.cmake.in
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 839a515be..c490ea960 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -229,6 +229,27 @@ endforeach()
+ set(COPIED_FILES)
+ 
+ if (NOT MESHLAB_BUILD_ONLY_LIBRARIES)
++	# headers
++	install(DIRECTORY common DESTINATION include FILES_MATCHING PATTERN "*.h")
++	# CMake exports
++	install(EXPORT meshlabTargets
++		DESTINATION lib/cmake/meshlab
++		NAMESPACE meshlab::
++		FILE meshlabTargets.cmake
++	)
++	include(CMakePackageConfigHelpers)
++	# generate the config file that includes the exports
++	configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
++		"${CMAKE_CURRENT_BINARY_DIR}/meshlabConfig.cmake"
++		INSTALL_DESTINATION lib/cmake/vcglib
++		NO_SET_AND_CHECK_MACRO
++		NO_CHECK_REQUIRED_COMPONENTS_MACRO
++	)
++	install(FILES
++		"${CMAKE_CURRENT_BINARY_DIR}/meshlabConfig.cmake"
++		DESTINATION lib/cmake/meshlab
++	)
++
+ 	# shaders
+ 	set(SHADER_BASE_DIR "${MESHLAB_RESOURCES_DIR}/shaders")
+ 	file(
+diff --git a/src/Config.cmake.in b/src/Config.cmake.in
+new file mode 100644
+index 000000000..63ba0ce97
+--- /dev/null
++++ b/src/Config.cmake.in
+@@ -0,0 +1,9 @@
++@PACKAGE_INIT@
++
++include(CMakeFindDependencyMacro)
++find_dependency(GLEW)
++find_dependency(OpenGL)
++find_dependency(Qt5 COMPONENTS OpenGL Xml Network)
++find_dependency(vcglib)
++
++include ( "${CMAKE_CURRENT_LIST_DIR}/meshlabTargets.cmake" )
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 0e640fdd4..c74bd579b 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -198,7 +198,8 @@ endif()
+ 
+ target_include_directories(meshlab-common
+ 	PUBLIC
+-		${CMAKE_CURRENT_SOURCE_DIR}/..)
++		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
++		$<INSTALL_INTERFACE:include>)
+ 
+ target_link_libraries(
+ 	meshlab-common
+@@ -208,10 +209,19 @@ target_link_libraries(
+ 		Qt5::Widgets
+ 		Qt5::Xml
+ 		Qt5::Network
+-		vcglib
+-		external-glew
++	PRIVATE
+ 		external-easyexif
+ )
++if(TARGET vcglib::vcglib)
++	target_link_libraries(meshlab-common PUBLIC vcglib::vcglib)
++else()
++	target_link_libraries(meshlab-common PUBLIC vcglib)
++endif()
++if(TARGET GLEW::GLEW)
++	target_link_libraries(meshlab-common PUBLIC GLEW::GLEW)
++else()
++	target_link_libraries(meshlab-common PUBLIC external-glew)
++endif()
+ 
+ set_property(TARGET meshlab-common PROPERTY FOLDER Core)
+ 
+@@ -234,4 +244,4 @@ endif()
+ set_target_properties(meshlab-common PROPERTIES
+ 	INSTALL_RPATH "$ORIGIN")
+ 
+-install(TARGETS meshlab-common DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
++install(TARGETS meshlab-common EXPORT meshlabTargets DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
+diff --git a/src/meshlabplugins/io_base/CMakeLists.txt b/src/meshlabplugins/io_base/CMakeLists.txt
+index 7a3137e63..64504d56d 100644
+--- a/src/meshlabplugins/io_base/CMakeLists.txt
++++ b/src/meshlabplugins/io_base/CMakeLists.txt
+@@ -27,4 +27,4 @@ set(SOURCES
+ 
+ add_meshlab_plugin(io_base ${SOURCES} ${HEADERS})
+ 
+-target_link_libraries(io_base PRIVATE OpenGL::GLU)
++target_link_libraries(io_base PRIVATE OpenGL::GLU external-easyexif)
diff --git a/pkgs/by-name/me/meshlab/no-plist.patch b/pkgs/by-name/me/meshlab/no-plist.patch
new file mode 100644
index 000000000000..7c8d753190a8
--- /dev/null
+++ b/pkgs/by-name/me/meshlab/no-plist.patch
@@ -0,0 +1,12 @@
+--- src/meshlab/CMakeLists.txt.orig	2025-10-05 23:04:12.786192073 +0200
++++ src/meshlab/CMakeLists.txt	2025-10-05 23:04:16.379256637 +0200
+@@ -92,9 +92,6 @@
+ 		MACOSX_BUNDLE_COPYRIGHT "Copyright VCG-ISTI-CNR © 2005-2021. All rights reserved."
+ 		)
+ 	
+-	set_additional_settings_info_plist(
+-		TARGET meshlab
+-		FILE ${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)
+ endif()
+ 
+ install(
diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix
index dedae59c8c34..9e431b24d75d 100644
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -6,6 +6,7 @@
   libsForQt5,
   libGLU,
   lib3ds,
+  lib3mf,
   bzip2,
   muparser,
   eigen,
@@ -25,16 +26,10 @@
   corto,
   openctm,
   structuresynth,
+  vclab-nexus,
 }:
 
 let
-  tinygltf-src = fetchFromGitHub {
-    owner = "syoyo";
-    repo = "tinygltf";
-    tag = "v2.6.3";
-    hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
-  };
-
   downloads = [
     "DLL_EMBREE"
     "SOURCE_BOOST"
@@ -57,19 +52,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "meshlab";
-  version = "2023.12";
+  version = "2025.07";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "meshlab";
     tag = "MeshLab-${finalAttrs.version}";
-    hash = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y=";
+    hash = "sha256-6BozYzPCbBZ+btL4FCdzKlwKqTsvFWDfOXizzJSYo9s=";
   };
 
   nativeBuildInputs = [
     cmake
     libsForQt5.wrapQtAppsHook
-    vcg # templated library
   ];
 
   buildInputs = [
@@ -78,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtscript
     libsForQt5.qtxmlpatterns
     lib3ds
+    lib3mf
     bzip2
     muparser
     eigen
@@ -91,52 +86,41 @@ stdenv.mkDerivation (finalAttrs: {
     xercesc
     onetbb
     embree
+    vcg
     libigl
     corto
     openctm
     structuresynth
+    vclab-nexus
   ]
   ++ lib.optionals stdenv.cc.isClang [
     llvmPackages.openmp
   ];
 
-  postPatch = ''
-    substituteInPlace src/external/tinygltf.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
-    substituteInPlace src/external/libigl.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
-    substituteInPlace src/external/nexus.cmake \
-      --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
-    substituteInPlace src/external/levmar.cmake \
-      --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
-      --replace-warn "MD5 ''${LEVMAR_MD5}" ""
-    substituteInPlace src/external/ssynth.cmake \
-      --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
-      --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-    substituteInPlace src/common_gui/CMakeLists.txt \
-      --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
+  patches = [
+    # CMake: use system dependencies, install exports
+    # ref. https://github.com/cnr-isti-vclab/meshlab/pull/1617
+    # merged upstream
+    ./1617_cmake-use-system-dependencies-install-exports.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./no-plist.patch
+  ];
+
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/meshlab/CMakeLists.txt \
-      --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
-      --replace-fail "	TARGET meshlab" "#	TARGET meshlab" \
-      --replace-fail "	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
-                     "#	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
   '';
 
-  cmakeFlags = [
-    "-DVCGDIR=${vcg.src}"
-  ]
-  ++ cmakeFlagsDisallowDownload;
+  cmakeFlags = cmakeFlagsDisallowDownload;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin,lib}
     mv $out/meshlab.app $out/Applications/
-    ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common.dylib $out/lib/
+    ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common{,-gui}.dylib $out/lib/
     makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
+    substituteInPlace $out/lib/cmake/meshlab/meshlabTargets-release.cmake --replace-fail \
+      "{_IMPORT_PREFIX}/meshlab.app" \
+      "{_IMPORT_PREFIX}/Applications/meshlab.app"
   '';
 
   # The hook will wrap all the plugin binaries, make they are not a
@@ -150,7 +134,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup =
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
+      patchelf \
+        --add-needed $out/lib/meshlab/libmeshlab-common.so \
+        --add-needed $out/lib/meshlab/libmeshlab-common-gui.so \
+        $out/bin/.meshlab-wrapped
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
@@ -163,7 +150,10 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "meshlab";
     homepage = "https://www.meshlab.net/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ yzx9 ];
+    maintainers = with lib.maintainers; [
+      nim65s
+      yzx9
+    ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 })
diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 1505f7c2a6b8..98ee0b167f6a 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -16,14 +16,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.9.0";
+  version = "1.9.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     tag = version;
-    hash = "sha256-VMLcGtyJIH3jsTkHrIUhCpjwm6ljsRSyRECYhaafjD8=";
+    hash = "sha256-t4a/Zp8rC+DMjskdwVvYIfYDAT57zGVfVu7IApwRNGA=";
   };
 
   patches = [
diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index f1102925c3bc..96805b04df27 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
-  version = "0.56.6";
+  version = "0.56.10";
 
   src = fetchurl {
     url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
-    hash = "sha256-OQ9B1KpuYrtTL46cKJtKyuiHEwGSkF+PlAjb8FOv4zo=";
+    hash = "sha256-otpNh9TJnUoHjAVVCkrsJO93nIeEfaNC8amZdTvreIE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/me/metacity/package.nix b/pkgs/by-name/me/metacity/package.nix
index f1406de7b9cc..74bc821b8073 100644
--- a/pkgs/by-name/me/metacity/package.nix
+++ b/pkgs/by-name/me/metacity/package.nix
@@ -13,26 +13,18 @@
   libstartup_notification,
   libxml2,
   pkg-config,
-  replaceVars,
   wrapGAppsHook3,
-  zenity,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "metacity";
-  version = "3.56.0";
+  version = "3.58.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor version}/metacity-${version}.tar.xz";
-    hash = "sha256-dVSZcQSyb/DnmgKzeiuhib3058zVQibw+vSxpZAGyQE=";
+    url = "mirror://gnome/sources/metacity/${lib.versions.majorMinor finalAttrs.version}/metacity-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5DDIqSQJ7y+RpNq9UKcePTu8xHSj3sHK7DgTs4HX0bA=";
   };
 
-  patches = [
-    (replaceVars ./fix-paths.patch {
-      inherit zenity;
-    })
-  ];
-
   nativeBuildInputs = [
     gettext
     libxml2
@@ -44,13 +36,13 @@ stdenv.mkDerivation rec {
     xorg.libXres
     xorg.libXpresent
     xorg.libXdamage
+    xorg.libX11
     glib
     gsettings-desktop-schemas
     gtk3
     libcanberra-gtk3
     libgtop
     libstartup_notification
-    zenity
   ];
 
   enableParallelBuilding = true;
@@ -67,9 +59,9 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Window manager used in Gnome Flashback";
     homepage = "https://gitlab.gnome.org/GNOME/metacity";
-    changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${version}/NEWS?ref_type=tags";
+    changelog = "https://gitlab.gnome.org/GNOME/metacity/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     license = lib.licenses.gpl2;
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix
index a8912e8127dd..511e53de4577 100644
--- a/pkgs/by-name/me/metals/package.nix
+++ b/pkgs/by-name/me/metals/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "metals";
-  version = "1.6.2";
+  version = "1.6.3";
 
   deps = stdenv.mkDerivation {
     name = "metals-deps-${finalAttrs.version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-WcPgX0GZSqpVVAzQ1zCxuRCkwcuR/8bwGjSCpHneeio=";
+    outputHash = "sha256-H5rIpz547pXID86OUPMtKGNcC5d5kxMMEUvaqDck2yo";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix
index afd9253ea84b..0f345e620ad5 100644
--- a/pkgs/by-name/mi/microbin/package.nix
+++ b/pkgs/by-name/mi/microbin/package.nix
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
     ];
     mainProgram = "microbin";
   };
diff --git a/pkgs/by-name/mi/microhs/package.nix b/pkgs/by-name/mi/microhs/package.nix
new file mode 100644
index 000000000000..509ca3cc99d5
--- /dev/null
+++ b/pkgs/by-name/mi/microhs/package.nix
@@ -0,0 +1,43 @@
+{
+  callPackage,
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  writableTmpDirAsHomeHook,
+  writeTextDir,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "microhs";
+  version = "0.14.21.0";
+
+  src = fetchFromGitHub {
+    owner = "augustss";
+    repo = "MicroHs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Tq8fjI3LCP4NWrmbMP0xyhY2fjRmsMCEvgfDQ/SB5Bo=";
+  };
+
+  # mcabal doesn't seem to respect the make flag and fails with /homeless-shelter
+  # This works around the issue
+  nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+
+  makeFlags = [ "MCABAL=$(out)" ];
+  buildFlags = [ "bootstrap" ];
+
+  # MicroCabal is a separate repository, which should be packaged separately
+  # The MicroCabal that is installed by `make install` is pregenerated, does not respect MCABAL above, and so is not useable
+  postInstall = "rm $out/bin/mcabal";
+
+  passthru.tests = {
+    hello-world = callPackage ./test-hello-world.nix { microhs = finalAttrs.finalPackage; };
+  };
+
+  meta = {
+    description = "Haskell implemented with combinators";
+    homepage = "https://github.com/augustss/MicroHs";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.steeleduncan ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/mi/microhs/test-hello-world.nix b/pkgs/by-name/mi/microhs/test-hello-world.nix
new file mode 100644
index 000000000000..8b1f1603cb79
--- /dev/null
+++ b/pkgs/by-name/mi/microhs/test-hello-world.nix
@@ -0,0 +1,34 @@
+{
+  stdenv,
+  microhs,
+  writeTextDir,
+}:
+
+stdenv.mkDerivation {
+  name = "microhs-hello-world";
+  buildInputs = [ microhs ];
+
+  src = writeTextDir "helloworld.hs" ''
+    main :: IO ()
+    main = putStrLn "Hello World"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    mhs helloworld.hs -oExe
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ./Exe | grep "Hello World"
+    runHook postCheck
+  '';
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+    touch $out
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/by-name/mi/micromdm/package.nix b/pkgs/by-name/mi/micromdm/package.nix
index 05cb4e691b6e..176f7c7ae946 100644
--- a/pkgs/by-name/mi/micromdm/package.nix
+++ b/pkgs/by-name/mi/micromdm/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "micromdm";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "micromdm";
     repo = "micromdm";
     rev = "v${version}";
-    hash = "sha256-o/HK1bjaUwsSQG7QbYe0gFnD/OKV00cHXLXpftNa3iY=";
+    hash = "sha256-b0ST2krDY4avvcdcpUInTH1On0cGKTsdwPpL9HbSPig=";
   };
 
-  vendorHash = "sha256-aKm8a/PS+1ozImh1aL2EliALyUqjPMMBh4NTbL0H/ng=";
+  vendorHash = "sha256-NxjxHKEB1+d2BsVImL405anuMcKF+DlpnRPvKkGNMAQ=";
 
   meta = {
     description = "Mobile Device Management server for Apple Devices, focused on giving you all the power through an API";
diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix
index 812b6b323be5..d6922b079c8d 100644
--- a/pkgs/by-name/mi/micronaut/package.nix
+++ b/pkgs/by-name/mi/micronaut/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.9.4";
+  version = "4.10.0";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-zsC8hMXHRi8xJro/IhihGzw8Nx8loaMh4Y8xlmtTyMQ=";
+    sha256 = "sha256-FYky14Lnl5B+zLgulFJdRdaDIQi+FhoUjce+LKYaMKE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mi/microplane/package.nix b/pkgs/by-name/mi/microplane/package.nix
index fcae4cf42b71..59b6b67f2621 100644
--- a/pkgs/by-name/mi/microplane/package.nix
+++ b/pkgs/by-name/mi/microplane/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "microplane";
-  version = "0.0.35";
+  version = "0.0.37";
 
   src = fetchFromGitHub {
     owner = "Clever";
     repo = "microplane";
     rev = "v${version}";
-    sha256 = "sha256-3QPxH4ZR02bkL2uKoJpLW9e7q1LjSlWw5jo0jxegeiM=";
+    sha256 = "sha256-TwNwXMQGsD9Kx5uH+kAOGlwCF1t1oAefVCbKmRtZ4Vc=";
   };
 
-  vendorHash = "sha256-DizwNph3hmSRoozvJgs3Qw/c9iMTRR1gMGC60pBCFSk=";
+  vendorHash = "sha256-fF1tHhOtw1ms6447lna40NrZT3ItpiQu31Y0psXt1/Y=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index bf696874e437..bd98470847ec 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -6,7 +6,7 @@
   patchelf,
   bintools,
   dpkg,
-  # Linked dynamic libraries.
+  # Linked dynamic libraries
   alsa-lib,
   at-spi2-atk,
   at-spi2-core,
@@ -55,7 +55,7 @@
   # Loaded at runtime.
   libexif,
   pciutils,
-  # Additional dependencies according to other distros.
+  # Additional dependencies according to other distros
   ## Ubuntu
   curl,
   liberation_ttf,
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "141.0.3537.71";
+  version = "142.0.3595.53";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-+R7c6xMBpmpVxUkr9Q9ewIGbGY8z5ZRe422sxouPzfI=";
+    hash = "sha256-cSSKWxIkQe8jrv7gL5lX2Cs9roU8eD2MIHuLGQMnycM=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly
diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix
index d9ff9bf1ec6c..601f52e080de 100644
--- a/pkgs/by-name/mi/midivisualizer/package.nix
+++ b/pkgs/by-name/mi/midivisualizer/package.nix
@@ -5,6 +5,7 @@
   cmake,
   pkg-config,
   libX11,
+  libnotify,
   glfw,
   makeWrapper,
   libXrandr,
@@ -16,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "midivisualizer";
-  version = "7.0";
+  version = "7.2";
 
   src = fetchFromGitHub {
     owner = "kosua20";
     repo = "MIDIVisualizer";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE=";
+    sha256 = "sha256-Ilsqc14PBTqreLhrEpvMOZAp37xOY/OwuhHTjeOjqm8=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glfw
     ffmpeg-full
+    libnotify
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libX11
@@ -65,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/kosua20/MIDIVisualizer";
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = [ maintainers.ericdallo ];
   };
 })
diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 6f4445aee9ab..e4ec674222c4 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.20.1";
+  version = "3.21.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-r4QMETKt8EMSX9BsSizlvlMdlJ+SjlLScNfOxSm84Ec=";
+    hash = "sha256-9e2V+WwcBp16DsMf31IzANdMlc/r3KFDYjSCKvKKGwM=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";
diff --git a/pkgs/by-name/mi/migra/package.nix b/pkgs/by-name/mi/migra/package.nix
deleted file mode 100644
index 0829c79e0493..000000000000
--- a/pkgs/by-name/mi/migra/package.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-  postgresql,
-  postgresqlTestHook,
-}:
-python3.pkgs.buildPythonApplication rec {
-  pname = "migra";
-  version = "3.0.1647431138";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "djrobstep";
-    repo = "migra";
-    rev = version;
-    hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po=";
-  };
-
-  nativeBuildInputs = [
-    python3.pkgs.poetry-core
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    schemainspect
-    six
-    sqlbag
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-    postgresql
-    postgresqlTestHook
-  ];
-  preCheck = ''
-    export PGUSER="nixbld";
-  '';
-  disabledTests = [
-    # These all fail with "List argument must consist only of tuples or dictionaries":
-    # See this issue: https://github.com/djrobstep/migra/issues/232
-    "test_excludeschema"
-    "test_fixtures"
-    "test_rls"
-    "test_singleschema"
-  ];
-
-  pytestFlags = [
-    "-x"
-    "-svv"
-  ];
-
-  enabledTestPaths = [
-    "tests"
-  ];
-
-  meta = with lib; {
-    description = "Like diff but for PostgreSQL schemas";
-    homepage = "https://github.com/djrobstep/migra";
-    license = with licenses; [ unlicense ];
-    maintainers = with maintainers; [ bpeetz ];
-  };
-}
diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index d6e4bb1fc27a..1dc0dc2e4ef3 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "1.0.4";
+  version = "1.0.6";
 
   src =
     let
@@ -47,9 +47,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://com-lihaoyi.github.io/mill/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     description = "Build tool for Scala, Java and more";
     mainProgram = "mill";
     longDescription = ''
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       SBT, but can also be extended to support any other language or platform via
       modules (written in Java or Scala) or through an external subprocesses.
     '';
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       scalavision
       zenithal
     ];
@@ -69,6 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "aarch64-darwin"
       "x86_64-darwin"
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })
diff --git a/pkgs/by-name/mi/mill/sources.json b/pkgs/by-name/mi/mill/sources.json
index d90987bf3973..36d38ea9f45f 100644
--- a/pkgs/by-name/mi/mill/sources.json
+++ b/pkgs/by-name/mi/mill/sources.json
@@ -1,18 +1,18 @@
 {
   "aarch64-darwin": {
     "artifact-suffix": "native-mac-aarch64",
-    "hash": "sha256-A9dShPyfkfTuRJ1/DkLwb/5NTRTxc7OY7Rd1h0Tzjos="
+    "hash": "sha256-KMlBQfSytFddA1eNJAx0yiuusgkVe1xkRoHw+03Q9rg="
   },
   "x86_64-darwin": {
     "artifact-suffix": "native-mac-amd64",
-    "hash": "sha256-zctTOVxFghF9z9PUQt3OO20Ul/qY8H/j6MPpFNpw+Ow="
+    "hash": "sha256-8CkXOfhJv/71vTgJqoEQ0TMW+r8kvdH1ff7l/Pbz0ZU="
   },
   "aarch64-linux": {
     "artifact-suffix": "native-linux-aarch64",
-    "hash": "sha256-E+IMTkRP1a1TigpRyVHPu0assgHEbzbF8lv7Rsm2FOM="
+    "hash": "sha256-d/dSBStPdz4D/Jwe8UuqQRt6FZILwHrKXsSVyO6Ky4c="
   },
   "x86_64-linux": {
     "artifact-suffix": "native-linux-amd64",
-    "hash": "sha256-rgAqlTCZc8nedUU2D+Klo3KY0z9sI0KJczdaugM3//8="
+    "hash": "sha256-iP7KHx+RA+2EQC5tRoBybe7MHXkEbxg00mDqE7IiCoY="
   }
 }
diff --git a/pkgs/by-name/mi/mim-solvers/fix-croco-310.patch b/pkgs/by-name/mi/mim-solvers/fix-croco-310.patch
new file mode 100644
index 000000000000..d6e39d068b7d
--- /dev/null
+++ b/pkgs/by-name/mi/mim-solvers/fix-croco-310.patch
@@ -0,0 +1,52 @@
+From 1cb7fe38e3ec43117c646cae521eb8347145965a Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 14 Oct 2025 19:37:16 +0200
+Subject: [PATCH] fix for crocoddyl v3.1.0 explicit template instanciation
+
+ref. https://github.com/loco-3d/crocoddyl/pull/1367
+
+Yes, that was a breaking change
+---
+ tests/factory/point-mass.hpp | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/tests/factory/point-mass.hpp b/tests/factory/point-mass.hpp
+index e82c977..c2e93af 100644
+--- a/tests/factory/point-mass.hpp
++++ b/tests/factory/point-mass.hpp
+@@ -60,6 +60,17 @@ class DAMPointMass1D : public crocoddyl::DifferentialActionModelAbstract {
+   // Destructor
+   virtual ~DAMPointMass1D();
+ 
++  // Explicit template instanciation
++  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsDouble()
++      const override {
++    return std::make_shared<DAMPointMass1D>(*this);
++  }
++
++  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsFloat()
++      const override {
++    return std::make_shared<DAMPointMass1D>(*this);
++  }
++
+   // Cost & dynamics
+   void calc(const std::shared_ptr<DifferentialActionDataAbstract>& data,
+             const Eigen::Ref<const VectorXd>& x,
+@@ -135,6 +146,17 @@ class DAMPointMass2D : public crocoddyl::DifferentialActionModelAbstract {
+   // Destructor
+   virtual ~DAMPointMass2D();
+ 
++  // Explicit template instanciation
++  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsDouble()
++      const override {
++    return std::make_shared<DAMPointMass2D>(*this);
++  }
++
++  std::shared_ptr<crocoddyl::DifferentialActionModelBase> cloneAsFloat()
++      const override {
++    return std::make_shared<DAMPointMass2D>(*this);
++  }
++
+   // Cost & dynamics
+   void calc(const std::shared_ptr<DifferentialActionDataAbstract>& data,
+             const Eigen::Ref<const VectorXd>& x,
diff --git a/pkgs/by-name/mi/mim-solvers/package.nix b/pkgs/by-name/mi/mim-solvers/package.nix
index 2705a5e8f7fd..44483056d44a 100644
--- a/pkgs/by-name/mi/mim-solvers/package.nix
+++ b/pkgs/by-name/mi/mim-solvers/package.nix
@@ -3,12 +3,11 @@
   crocoddyl,
   ctestCheckHook,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   llvmPackages,
   pkg-config,
   proxsuite,
-  python3Packages,
-  pythonSupport ? false,
   stdenv,
   nix-update-script,
 }:
@@ -24,49 +23,44 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1Mqu9Hfy65HUIOVG/gJBpSMlOwDWVcH+LrR8CaWz0BE=";
   };
 
-  # eigenpy is not used without python support
-  postPatch = lib.optionalString (!pythonSupport) ''
-    substituteInPlace CMakeLists.txt --replace-fail \
-      "add_project_dependency(eigenpy 2.7.10 REQUIRED)" \
-      ""
-  '';
+  patches = [
+    # ref. https://github.com/machines-in-motion/mim_solvers/pull/71 merged upstream
+    (fetchpatch {
+      name = "build-standalone-python-interface.patch";
+      url = "https://github.com/machines-in-motion/mim_solvers/commit/796eecf05dd9165dd0795aa562ead17de4f19633.patch";
+      hash = "sha256-/OiMzyDVEbpC/Dr/HcguwAdhmbQNxnIRsHAVkX68xqA=";
+    })
+    # Fix for crocoddyl 3.1.0
+    # ref. https://github.com/machines-in-motion/mim_solvers/pull/72
+    ./fix-croco-310.patch
+  ];
 
   nativeBuildInputs = [
     cmake
     pkg-config
-  ]
-  ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
+  ];
+
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin llvmPackages.openmp;
-  propagatedBuildInputs =
-    lib.optionals pythonSupport [
-      python3Packages.crocoddyl
-      python3Packages.osqp
-      python3Packages.proxsuite
-      python3Packages.scipy
-    ]
-    ++ lib.optionals (!pythonSupport) [
-      crocoddyl
-      proxsuite
-    ];
+
+  propagatedBuildInputs = [
+    crocoddyl
+    proxsuite
+  ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
     (lib.cmakeBool "BUILD_WITH_PROXSUITE" true)
-  ]
-  ++ lib.optional (stdenv.hostPlatform.isDarwin) (
-    lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'py-test-clqr-osqp'"
-  )
-  ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) (
-    lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;'test_solvers'"
-  );
+  ];
 
   nativeCheckInputs = [
     ctestCheckHook
   ];
   disabledTests = [
     # Fails with osqp>=1.0.0
-    # See https://github.com/machines-in-motion/mim_solvers/pull/66
+    # See https://github.com/machines-in-motion/mim_solvers/pull/67
     "py-test-clqr-osqp"
+    # need removed ActuationModelMultiCopterBase in crocoddyl 3.1.0
+    "py-test-sqp-no-reg"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # Several errors such as:
@@ -78,8 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   doCheck = true;
 
-  pythonImportsCheck = [ "mim_solvers" ];
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 1cd1f76ddc59..abc11fd89570 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -5,15 +5,15 @@
   nixosTests,
   nix-update-script,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "mimir";
-  version = "2.17.1";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
-    rev = "mimir-${version}";
+    rev = "mimir-${finalAttrs.version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-Ob0l+C5LnFL1yl76/cdSX83bHEcamPlb9Sau8rMO2sM=";
+    hash = "sha256-eLdlfGz5OQ3bPWhO2niBynaIPtxXg3x2qD89VK7uuA0=";
   };
 
   vendorHash = null;
@@ -54,7 +54,7 @@ buildGoModule rec {
     [
       "-s"
       "-w"
-      "-X ${t}.Version=${version}"
+      "-X ${t}.Version=${finalAttrs.version}"
       "-X ${t}.Revision=unknown"
       "-X ${t}.Branch=unknown"
     ];
@@ -62,6 +62,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Grafana Mimir provides horizontally scalable, highly available, multi-tenant, long-term storage for Prometheus. ";
     homepage = "https://github.com/grafana/mimir";
+    changelog = "https://github.com/grafana/mimir/releases/tag/mimir-${finalAttrs.version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [
       happysalada
@@ -69,4 +70,4 @@ buildGoModule rec {
       adamcstephens
     ];
   };
-}
+})
diff --git a/pkgs/by-name/mi/minc_widgets/package.nix b/pkgs/by-name/mi/minc_widgets/package.nix
index 535433ea41d1..7cfeb7437535 100644
--- a/pkgs/by-name/mi/minc_widgets/package.nix
+++ b/pkgs/by-name/mi/minc_widgets/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   makeWrapper,
   perlPackages,
@@ -22,6 +23,14 @@ stdenv.mkDerivation {
     sha256 = "1b9g6lf37wpp211ikaji4rf74rl9xcmrlyqcw1zq3z12ji9y33bm";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix.patch";
+      url = "https://github.com/BIC-MNI/minc-widgets/commit/9f5bc1996d2f9b4702efdb010834e2c7f1e3fbf1.patch";
+      hash = "sha256-qqMKbxQS+HTRQaOP2DH/m8Z3DqoCMGLFp1AEKaQ6l5s=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     makeWrapper
@@ -50,11 +59,11 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/BIC-MNI/minc-widgets";
     description = "Collection of Perl and shell scripts for processing MINC files";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.free;
   };
 }
diff --git a/pkgs/by-name/mi/minhtml/Cargo.lock b/pkgs/by-name/mi/minhtml/Cargo.lock
deleted file mode 100644
index cef443b0778b..000000000000
--- a/pkgs/by-name/mi/minhtml/Cargo.lock
+++ /dev/null
@@ -1,2063 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.16",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if 1.0.1",
- "getrandom 0.3.3",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "ascii"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if 1.0.1",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base64-simd"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5"
-dependencies = [
- "simd-abstraction",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "bitflags 2.9.1",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
-
-[[package]]
-name = "bytecheck"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-
-[[package]]
-name = "c14n"
-version = "0.0.1"
-dependencies = [
- "minify-html",
-]
-
-[[package]]
-name = "cc"
-version = "1.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
-[[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.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-
-[[package]]
-name = "charlines"
-version = "0.0.1"
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.8",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "combine"
-version = "3.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680"
-dependencies = [
- "ascii",
- "byteorder",
- "either",
- "memchr",
- "unreachable",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if 1.0.1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "const-str"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3"
-dependencies = [
- "const-str-proc-macro",
-]
-
-[[package]]
-name = "const-str-proc-macro"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "cssparser"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "phf",
- "smallvec",
-]
-
-[[package]]
-name = "cssparser-color"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f"
-dependencies = [
- "cssparser",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
-dependencies = [
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if 1.0.1",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
-
-[[package]]
-name = "data-url"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "dtoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "backtrace",
- "version_check",
-]
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "getrandom"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-dependencies = [
- "cfg-if 1.0.1",
- "js-sys",
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
-dependencies = [
- "cfg-if 1.0.1",
- "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
-]
-
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
-[[package]]
-name = "glob"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.12",
- "bumpalo",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "index"
-version = "0.16.4"
-dependencies = [
- "console_error_panic_hook",
- "getrandom 0.2.16",
- "js-sys",
- "minify-html",
- "wasm-bindgen",
- "wasm-bindgen-test",
- "wee_alloc",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.4",
- "serde",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-
-[[package]]
-name = "jni"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1981310da491a4f0f815238097d0d43d8072732b5ae5f8bd0d8eadf5bf245402"
-dependencies = [
- "cesu8",
- "combine",
- "error-chain",
- "jni-sys",
- "log",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.174"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-
-[[package]]
-name = "libloading"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
-dependencies = [
- "cfg-if 1.0.1",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
-dependencies = [
- "cfg-if 1.0.1",
- "windows-targets 0.53.2",
-]
-
-[[package]]
-name = "lightningcss"
-version = "1.0.0-alpha.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a73ffa17de66534e4b527232f44aa0a89fad22c4f4e0735f9be35494f058e54"
-dependencies = [
- "ahash 0.8.12",
- "bitflags 2.9.1",
- "const-str",
- "cssparser",
- "cssparser-color",
- "dashmap",
- "data-encoding",
- "getrandom 0.2.16",
- "indexmap",
- "itertools 0.10.5",
- "lazy_static",
- "lightningcss-derive",
- "parcel_selectors",
- "parcel_sourcemap",
- "paste",
- "pathdiff",
- "rayon",
- "serde",
- "smallvec",
-]
-
-[[package]]
-name = "lightningcss-derive"
-version = "1.0.0-alpha.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12744d1279367caed41739ef094c325d53fb0ffcd4f9b84a368796f870252"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
-[[package]]
-name = "magnus"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479"
-dependencies = [
- "magnus-macros",
- "rb-sys",
- "rb-sys-env",
- "seq-macro",
-]
-
-[[package]]
-name = "magnus-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
-[[package]]
-name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
-[[package]]
-name = "minhtml"
-version = "0.16.4"
-dependencies = [
- "minify-html",
- "rayon",
- "structopt",
-]
-
-[[package]]
-name = "minicov"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
-dependencies = [
- "cc",
- "walkdir",
-]
-
-[[package]]
-name = "minify-html"
-version = "0.16.4"
-dependencies = [
- "ahash 0.8.12",
- "aho-corasick 0.7.20",
- "lightningcss",
- "memchr",
- "minify-html-common",
- "minify-js",
- "once_cell",
-]
-
-[[package]]
-name = "minify-html-bench"
-version = "0.0.1"
-dependencies = [
- "minify-html",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minify-html-common"
-version = "0.0.2"
-dependencies = [
- "ahash 0.8.12",
- "aho-corasick 0.7.20",
- "itertools 0.12.1",
- "memchr",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minify-html-java"
-version = "0.16.4"
-dependencies = [
- "jni",
- "minify-html",
-]
-
-[[package]]
-name = "minify-html-nodejs"
-version = "0.16.4"
-dependencies = [
- "minify-html",
- "neon",
-]
-
-[[package]]
-name = "minify-html-onepass"
-version = "0.16.4"
-dependencies = [
- "ahash 0.8.12",
- "aho-corasick 0.7.20",
- "lightningcss",
- "memchr",
- "minify-html-common",
- "minify-js",
- "once_cell",
-]
-
-[[package]]
-name = "minify-html-onepass-bench"
-version = "0.0.1"
-dependencies = [
- "minify-html-onepass",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minify-html-onepass-python"
-version = "0.16.4"
-dependencies = [
- "minify-html-onepass",
- "pyo3",
-]
-
-[[package]]
-name = "minify-html-python"
-version = "0.16.4"
-dependencies = [
- "minify-html",
- "pyo3",
-]
-
-[[package]]
-name = "minify-html-ruby"
-version = "0.16.4"
-dependencies = [
- "magnus",
- "minify-html",
-]
-
-[[package]]
-name = "minify-js"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e"
-dependencies = [
- "aho-corasick 0.7.20",
- "lazy_static",
- "parse-js",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "neon"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373"
-dependencies = [
- "neon-build",
- "neon-macros",
- "neon-runtime",
- "semver",
- "smallvec",
-]
-
-[[package]]
-name = "neon-build"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811"
-
-[[package]]
-name = "neon-macros"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf"
-dependencies = [
- "quote",
- "syn 1.0.109",
- "syn-mid",
-]
-
-[[package]]
-name = "neon-runtime"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca"
-dependencies = [
- "cfg-if 1.0.1",
- "libloading 0.6.7",
- "smallvec",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
-[[package]]
-name = "outref"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4"
-
-[[package]]
-name = "parcel_selectors"
-version = "0.28.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196"
-dependencies = [
- "bitflags 2.9.1",
- "cssparser",
- "log",
- "phf",
- "phf_codegen",
- "precomputed-hash",
- "rustc-hash 2.1.1",
- "smallvec",
-]
-
-[[package]]
-name = "parcel_sourcemap"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb"
-dependencies = [
- "base64-simd",
- "data-url",
- "rkyv",
- "serde",
- "serde_json",
- "vlq",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
-dependencies = [
- "cfg-if 1.0.1",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "parse-js"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e"
-dependencies = [
- "aho-corasick 0.7.20",
- "bumpalo",
- "hashbrown 0.13.2",
- "lazy_static",
- "memchr",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "ptr_meta"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pyo3"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
-dependencies = [
- "cfg-if 1.0.1",
- "indoc",
- "libc",
- "memoffset",
- "once_cell",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
-dependencies = [
- "once_cell",
- "python3-dll-a",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "python3-dll-a"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "rb-sys"
-version = "0.9.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad"
-dependencies = [
- "rb-sys-build",
-]
-
-[[package]]
-name = "rb-sys-build"
-version = "0.9.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0"
-dependencies = [
- "bindgen",
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex",
- "shell-words",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "rb-sys-env"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick 1.1.3",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick 1.1.3",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "rend"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
-dependencies = [
- "bytecheck",
-]
-
-[[package]]
-name = "rkyv"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-dependencies = [
- "bitvec",
- "bytecheck",
- "bytes",
- "hashbrown 0.12.3",
- "ptr_meta",
- "rend",
- "rkyv_derive",
- "seahash",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-
-[[package]]
-name = "rustversion"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-
-[[package]]
-name = "ryu"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[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 = "seq-macro"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
-
-[[package]]
-name = "serde"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.140"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "simd-abstraction"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987"
-dependencies = [
- "outref",
-]
-
-[[package]]
-name = "simdutf8"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn-mid"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "target-lexicon"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
-[[package]]
-name = "unreachable"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-dependencies = [
- "void",
-]
-
-[[package]]
-name = "uuid"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[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.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "vlq"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff"
-
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-dependencies = [
- "wit-bindgen-rt",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if 1.0.1",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
-dependencies = [
- "cfg-if 1.0.1",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
-dependencies = [
- "js-sys",
- "minicov",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys",
-]
-
-[[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.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
diff --git a/pkgs/by-name/mi/minhtml/package.nix b/pkgs/by-name/mi/minhtml/package.nix
index 02448af08a0c..3b2145b93548 100644
--- a/pkgs/by-name/mi/minhtml/package.nix
+++ b/pkgs/by-name/mi/minhtml/package.nix
@@ -1,36 +1,21 @@
 {
   lib,
-  fetchFromGitHub,
   rustPlatform,
+  fetchCrate,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "minhtml";
-  version = "0.16.4";
+  version = "0.18.1";
 
-  src = fetchFromGitHub {
-    owner = "wilsonzlin";
-    repo = "minify-html";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-SoCSHhgTLfztSfvzxxpZn/nQpXbKlkE4iiP0YZ0MVjY=";
+  # Upstream does not include a lock file.
+  # See https://github.com/wilsonzlin/minify-html/issues/255
+  src = fetchCrate {
+    pname = "minhtml";
+    inherit (finalAttrs) version;
+    hash = "sha256-yrZueueww9rQXaHCeBO6d2pO58SZ8yz2a9Ia5dp7lBY=";
   };
 
-  # Upstream does not include a lock file so one has to be patched in.
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  # Ensures that only the correct package gets built, as upstream contains multiple.
-  cargoBuildFlags = [
-    "-p"
-    "minhtml"
-  ];
-  cargoTestFlags = [
-    "-p"
-    "minhtml"
-  ];
+  cargoHash = "sha256-TFlDbVL8JARwV/xSQ+Cbwguqnr11nw24/L0MbHJazas=";
 
   meta = {
     description = "Minifier for HTML, JavaScript, and CSS";
diff --git a/pkgs/by-name/mi/minia/package.nix b/pkgs/by-name/mi/minia/package.nix
index 1397cc2cb286..33dfd798cad7 100644
--- a/pkgs/by-name/mi/minia/package.nix
+++ b/pkgs/by-name/mi/minia/package.nix
@@ -33,6 +33,13 @@ stdenv.mkDerivation rec {
     rm -rf thirdparty/gatb-core/gatb-core/thirdparty/{hdf5,boost}
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace thirdparty/gatb-core/gatb-core/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Short read genome assembler";
     mainProgram = "minia";
diff --git a/pkgs/applications/audio/miniaudicle/default.nix b/pkgs/by-name/mi/miniaudicle/package.nix
similarity index 82%
rename from pkgs/applications/audio/miniaudicle/default.nix
rename to pkgs/by-name/mi/miniaudicle/package.nix
index b7bdd19a4fcb..66a9035daee5 100644
--- a/pkgs/applications/audio/miniaudicle/default.nix
+++ b/pkgs/by-name/mi/miniaudicle/package.nix
@@ -2,9 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qmake,
-  wrapQtAppsHook,
-  qt6Packages,
   bison,
   flex,
   which,
@@ -12,6 +9,7 @@
   libsndfile,
   libpulseaudio,
   libjack2,
+  kdePackages,
   audioBackend ? "pulse", # "pulse", "alsa", or "jack"
 }:
 
@@ -22,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ccrma";
     repo = "miniAudicle";
-    rev = "chuck-${finalAttrs.version}";
+    tag = "chuck-${finalAttrs.version}";
     hash = "sha256-LYr9Fc4Siqk0BFKHVXfIV2XskJYAN+/0P+nb6FJLsLE=";
     fetchSubmodules = true;
   };
@@ -39,28 +37,28 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     which
-    qmake
-    wrapQtAppsHook
+    kdePackages.qmake
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     libsndfile
-    qt6Packages.qscintilla
+    kdePackages.qscintilla
   ]
   ++ lib.optional (audioBackend == "pulse") libpulseaudio
   ++ lib.optional (audioBackend == "jack") libjack2;
 
   buildFlags = [ "linux-${audioBackend}" ];
 
-  meta = with lib; {
+  meta = {
     description = "Light-weight integrated development environment for the ChucK digital audio programming language";
     mainProgram = "miniAudicle";
     homepage = "https://audicle.cs.princeton.edu/mini/";
     downloadPage = "https://audicle.cs.princeton.edu/mini/linux/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ fgaz ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ fgaz ];
+    platforms = lib.platforms.all;
     broken = stdenv.hostPlatform.isDarwin; # not attempted
   };
 })
diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index 190b50d5847c..1b44b1b6e6b5 100644
--- a/pkgs/by-name/mi/miniflux/package.nix
+++ b/pkgs/by-name/mi/miniflux/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "miniflux";
-  version = "2.2.13";
+  version = "2.2.14";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = finalAttrs.version;
-    hash = "sha256-u3YnABf+ik7q29JtOSlK+UlInLRq5mMlH7vIDpxOOvk=";
+    hash = "sha256-x6I5PMlQtsjvFtEyoaKKE6if3I0IBIyps4kPQL4c8aw=";
   };
 
-  vendorHash = "sha256-JBT3BUFbPrSpkeZUoGiJJaeiSyXu8y+xcHWPNpxo3cU=";
+  vendorHash = "sha256-X/6YvAhIHSOS3qaoR6/pa2b7EziZzx8B+CbYrJ9/mcM=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index 695615cac367..4aef64b4ca4c 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "minify";
-  version = "2.23.1";
+  version = "2.24.5";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = "minify";
     rev = "v${version}";
-    hash = "sha256-v0KLQlf2WhI18uanVtvWfX6/7s9ZtfPM5AGyEIHZf54=";
+    hash = "sha256-0OmL/HG4pt2iDha6NcQoUKWz2u9vsLH6QzYhHb+mTL0=";
   };
 
-  vendorHash = "sha256-Btc5d/wwDmjhyDZwAIHDSbXuh8xqq/nIjTAkPsdeHU4=";
+  vendorHash = "sha256-QS0vffGJaaDhXvc7ylJmFJ1s83kaIqFWsBXNWVozt1k=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/mi/minio-warp/package.nix b/pkgs/by-name/mi/minio-warp/package.nix
index 6545906b6852..1ac108ceb8af 100644
--- a/pkgs/by-name/mi/minio-warp/package.nix
+++ b/pkgs/by-name/mi/minio-warp/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "minio-warp";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "warp";
     rev = "v${version}";
-    hash = "sha256-HBoep3GSjtjucqOEe0JbVLjmAA/1/l5IXEIv+xoyOew=";
+    hash = "sha256-bXThbMwT3T59nFCMEz8TnMMDYq26rDwKTOBamVGRsyM=";
   };
 
   vendorHash = "sha256-fo4LLRqqylx4oZOkLOgFzT436+vjap9dW+IpQ0IFa8Y=";
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 25fdbfab5209..bc621976bb1d 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -69,7 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
     mainProgram = "miniserve";
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index ea85e75a5329..fb7c0d38b886 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Minisign reimplemented in Zig";
     homepage = "https://github.com/jedisct1/zig-minisign";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "minizign";
     inherit (zig.meta) platforms;
   };
diff --git a/pkgs/by-name/mi/mio/package.nix b/pkgs/by-name/mi/mio/package.nix
new file mode 100644
index 000000000000..845408564c58
--- /dev/null
+++ b/pkgs/by-name/mi/mio/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mio";
+  version = "unstable-2023-03-03";
+
+  src = fetchFromGitHub {
+    owner = "vimpunk";
+    repo = "mio";
+    rev = "8b6b7d878c89e81614d05edca7936de41ccdd2da";
+    hash = "sha256-j/wbjyI2v/BsFz2RKi8ZxMKuT+7o5uI4I4yIkUran7I=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Cross-platform C++11 header-only library for memory mapped file IO";
+    homepage = "https://github.com/vimpunk/mio";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.szanko ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix
index 88e592debefb..efa6921acce2 100644
--- a/pkgs/by-name/mi/miriway/package.nix
+++ b/pkgs/by-name/mi/miriway/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miriway";
-  version = "25.11";
+  version = "25.12";
 
   src = fetchFromGitHub {
     owner = "Miriway";
     repo = "Miriway";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tXxRKGP/MMXOD1QtOYj5E9IurLoUUu1JBg8+l5z0KCQ=";
+    hash = "sha256-I+W3tYhjnT3SI6U1K7Xz/5rBHYM3ZAeqj3vRgOXz+lU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix
new file mode 100644
index 000000000000..2b54d70c09a3
--- /dev/null
+++ b/pkgs/by-name/mi/miro/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  fontconfig,
+  wayland,
+  libxkbcommon,
+  libglvnd,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "miro";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "vincent-uden";
+    repo = "miro";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tkZSyxdcHeumBMlinwA3DT2Y/FgLzbeuVbsFbTfvINg=";
+  };
+
+  cargoHash = "sha256-4NE9nMmOTQpWvMsGexW6GpBGao4yQoofrzGaaM4+rWE=";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    wayland
+    fontconfig
+    libxkbcommon
+    libglvnd
+  ];
+
+  RUSTFLAGS = map (a: "-C link-arg=${a}") [
+    "-Wl,--push-state,--no-as-needed"
+    "-lEGL"
+    "-lwayland-client"
+    "-lxkbcommon"
+    "-Wl,--pop-state"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Native PDF viewer (Wayland/X11) with configurable keybindings";
+    homepage = "https://github.com/vincent-uden/miro";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "miro-pdf";
+  };
+})
diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index c2ff36881b70..ce4129d59089 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.165.0",
+  "version": "3.171.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_x86_64",
-      "hash": "sha256-XLmI42PHs15KFwsKzVRohdVcQiwRncuoI375OlnhrRM="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_linux_x86_64",
+      "hash": "sha256-Xzy8Qvsw/nVTa6PRRdsBbOZHfPGKzRimbOVDa6qqVXc="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_aarch64",
-      "hash": "sha256-IWEE2Vi/OIbL5hgOAkXhz/lJix7qjKD9yQrT2lNW4uY="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_linux_aarch64",
+      "hash": "sha256-7h7eRqypiqv0Ri9Bc61+AkYVm12GPwsPQKYYtMoyLho="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal",
-      "hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_mac_universal",
+      "hash": "sha256-rvlU8erkgb/Sdythejl02w76gaZXB8CmfiW0FMadcA4="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal",
-      "hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_mac_universal",
+      "hash": "sha256-rvlU8erkgb/Sdythejl02w76gaZXB8CmfiW0FMadcA4="
     }
   }
 }
diff --git a/pkgs/by-name/mi/mirtk/package.nix b/pkgs/by-name/mi/mirtk/package.nix
index 04710e107ec5..ddbcbb0db5a3 100644
--- a/pkgs/by-name/mi/mirtk/package.nix
+++ b/pkgs/by-name/mi/mirtk/package.nix
@@ -46,6 +46,15 @@ stdenv.mkDerivation {
     rm CMake/Modules/FindTBB.cmake
     substituteInPlace CMake/Modules/CMakeLists.txt \
       --replace-fail '"FindTBB.cmake"' ""
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace CMake/Basis/{BasisSettings.cmake,ProjectTools.cmake,configure_script.cmake.in} \
+      --replace-fail "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace {ThirdParty/LBFGS,Packages/Deformable,Packages/Mapping,Packages/Scripting,Packages/Viewer}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index b1f6d2d8e615..04b15ca9bdb6 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.14.9";
+  version = "1.14.14";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     tag = "v${version}";
-    hash = "sha256-4d7/RxL8+ZJXnoU2zOl6W6f5/KsuqrS95IYttC81zVA=";
+    hash = "sha256-5tugmwr1TyBa89a/yrch+cshyoiJ3uj4EoweltN5d/0=";
   };
 
-  vendorHash = "sha256-2DlhNr1P6NEeV5IIum19LWufFlOcXxfLH93k3jkwnDA=";
+  vendorHash = "sha256-pLhc3Lc8Mp5ZRmNvac3qdQcw1rPQs7bbn4K0UHp04Qs=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index fcede9565f78..1844ae159c18 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "4.11.0";
+  version = "4.12.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-2MBcTuz46DDIHzH6Geuw+jdARHm/mxDFTPcqVEeSwWA=";
+    hash = "sha256-cVGOgMK8lQOMB9a7zwl2043uJzw3a+QBDMlnFduSR1U=";
   };
 
-  cargoHash = "sha256-ujZsrqfZ8wpWlBCJK3+vWKe1J3QnvlyBjtU78bIqcKo=";
+  cargoHash = "sha256-IdC5T73t3FHCXP6AWeQDcDnmZzhRvN2eyuYrko5F4+8=";
 
   # require running database
   doCheck = false;
diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/by-name/mi/mixxx/package.nix
similarity index 93%
rename from pkgs/applications/audio/mixxx/default.nix
rename to pkgs/by-name/mi/mixxx/package.nix
index 82bd51e8ad17..ee9cbed563a7 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/by-name/mi/mixxx/package.nix
@@ -36,11 +36,6 @@
   portaudio,
   portmidi,
   protobuf,
-  qt5compat,
-  qtbase,
-  qtdeclarative,
-  qtkeychain,
-  qtsvg,
   rubberband,
   serd,
   sord,
@@ -51,7 +46,7 @@
   upower,
   vamp-plugin-sdk,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -74,7 +69,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -110,11 +105,11 @@ stdenv.mkDerivation rec {
     portaudio
     portmidi
     protobuf
-    qt5compat
-    qtbase
-    qtdeclarative
-    qtkeychain
-    qtsvg
+    kdePackages.qt5compat
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    kdePackages.qtkeychain
+    kdePackages.qtsvg
     rubberband
     serd
     sord
diff --git a/pkgs/by-name/mj/mjpg-streamer/package.nix b/pkgs/by-name/mj/mjpg-streamer/package.nix
index 27addc586a7f..d94775bf61dc 100644
--- a/pkgs/by-name/mj/mjpg-streamer/package.nix
+++ b/pkgs/by-name/mj/mjpg-streamer/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
 
   prePatch = ''
     cd mjpg-streamer-experimental
+    substituteInPlace ./CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 2.8.3)" "cmake_minimum_required(VERSION 2.8.3...3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix
index 381951185f1f..2a5dc3e86229 100644
--- a/pkgs/by-name/mk/mkbrr/package.nix
+++ b/pkgs/by-name/mk/mkbrr/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mkbrr";
-  version = "1.16.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "mkbrr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9BII74aH480UWjrPgoBn+ioXV3TRhtVmxyO+T+fljK4=";
+    hash = "sha256-WeBqMqxxb49tmlWVfL4EUBerNBgUspHZ0Ava1AVqmsY=";
   };
 
-  vendorHash = "sha256-MEDzZd67iXPY/MioMd1FcTLY+8CdJN7+oC7qus63yJ8=";
+  vendorHash = "sha256-mbcbACOKMohBw0SH5gH06CTkHtJk3WmbAqpcO0qMFOs=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix
index c0ba8cd527f1..75c728dc95ae 100644
--- a/pkgs/by-name/mk/mkcal/package.nix
+++ b/pkgs/by-name/mk/mkcal/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mkcal";
-  version = "0.7.28";
+  version = "0.7.29";
 
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "mkcal";
     tag = finalAttrs.version;
-    hash = "sha256-tL42f8egP/anB4jOaAjmIh7C2pQyR3fgTDJ1E9t8EWk=";
+    hash = "sha256-H7TWu6tTh1vBmFx7kRpyijLCg0xs+dYIEJAERBEGh8g=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/mk/mkclean/package.nix b/pkgs/by-name/mk/mkclean/package.nix
index 13e6da9a0945..cfda95fc3c90 100644
--- a/pkgs/by-name/mk/mkclean/package.nix
+++ b/pkgs/by-name/mk/mkclean/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     install -Dm0755 mkclean/mkclean $out/bin/mkclean
   '';
diff --git a/pkgs/by-name/mm/mmg/package.nix b/pkgs/by-name/mm/mmg/package.nix
index f9587f9670f5..5ee5814cfd14 100644
--- a/pkgs/by-name/mm/mmg/package.nix
+++ b/pkgs/by-name/mm/mmg/package.nix
@@ -1,43 +1,66 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
-  unstableGitUpdater,
   cmake,
   perl,
+  scotch,
+  vtk,
+  withVtk ? false,
+  testers,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mmg";
-  version = "5.7.3-unstable-2024-05-31";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "MmgTools";
     repo = "mmg";
-    rev = "5a73683f84fe422031921bef4ced8905d8b9eb7e";
-    hash = "sha256-8m4iDsJdjlzuXatfIIZCY8RgrEp4BQihhmQfytu8aaU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jiOScvzyO+bN2wYwcQmWhLkLSkTWVplMrXKRFttGisw=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  postPatch = ''
+    patchShebangs --build scripts
+  '';
 
   nativeBuildInputs = [
     cmake
-    perl
+    perl # required for generating fortran headers
   ];
 
-  preConfigure = ''
-    patchShebangs ./
-  '';
+  propagatedBuildInputs = [
+    scotch
+  ]
+  ++ lib.optional withVtk vtk;
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS:BOOL=TRUE"
-    "-DMMG_INSTALL_PRIVATE_HEADERS=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "MMG_INSTALL_PRIVATE_HEADERS" true) # required by downstream parmmg
+    (lib.cmakeBool "USE_ELAS" false)
+    (lib.cmakeBool "USE_SCOTCH" true)
+    (lib.cmakeBool "USE_VTK" withVtk)
+    (lib.cmakeBool "PMMG_CALL" vtk.mpiSupport)
   ];
 
-  meta = with lib; {
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "mmg" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
     description = "Open source software for bidimensional and tridimensional remeshing";
     homepage = "http://www.mmgtools.org/";
-    platforms = platforms.unix;
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ mkez ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ mkez ];
   };
-}
+})
diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix
index 474afc3b4798..51680a5818d5 100644
--- a/pkgs/by-name/mm/mmseqs2/package.nix
+++ b/pkgs/by-name/mm/mmseqs2/package.nix
@@ -16,12 +16,12 @@
   llvmPackages,
   zlib,
   bzip2,
-  pkgsStatic,
+  zstd,
   runCommand,
-}:
+}@args:
 let
   # require static library, libzstd.a
-  inherit (pkgsStatic) zstd;
+  zstd = args.zstd.override { enableStatic = true; };
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     xxd
     perl
     installShellFiles
-    zstd
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
@@ -58,17 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
   ];
 
-  buildInputs =
-    lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-      zlib
-      bzip2
-    ]
-    ++ lib.optional enableMpi mpi
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_cccl
-    ];
+  buildInputs = [
+    zstd
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+    zlib
+    bzip2
+  ]
+  ++ lib.optional enableMpi mpi
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_cccl
+  ];
 
   postInstall = ''
     installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh
diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix
index 4d0e8b20715b..c349ea017dfd 100644
--- a/pkgs/by-name/mm/mmtc/package.nix
+++ b/pkgs/by-name/mm/mmtc/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/figsoda/mmtc";
     changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "mmtc";
   };
 }
diff --git a/pkgs/by-name/mn/mni_autoreg/package.nix b/pkgs/by-name/mn/mni_autoreg/package.nix
index e7698513891e..fe1b40ba90b1 100644
--- a/pkgs/by-name/mn/mni_autoreg/package.nix
+++ b/pkgs/by-name/mn/mni_autoreg/package.nix
@@ -48,6 +48,12 @@ stdenv.mkDerivation {
     done
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "CMAKE_POLICY(SET CMP0026 OLD)" "CMAKE_POLICY(SET CMP0026 NEW)"
+  '';
+
   meta = {
     homepage = "https://github.com/BIC-MNI/mni_autoreg";
     description = "Tools for automated registration using the MINC image format";
diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moar/package.nix
deleted file mode 100644
index b231f30b2c5b..000000000000
--- a/pkgs/by-name/mo/moar/package.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildGoModule,
-  fetchFromGitHub,
-  installShellFiles,
-}:
-
-buildGoModule rec {
-  pname = "moar";
-  version = "1.33.0";
-
-  src = fetchFromGitHub {
-    owner = "walles";
-    repo = "moar";
-    rev = "v${version}";
-    hash = "sha256-+06cup9iG+iMyluQPzUQ7vrnFHoeU4KNHGra3AsRRw0=";
-  };
-
-  vendorHash = "sha256-ComKeqnw1PvDaCRVXfInRjSzhyZWGkD/hp5piwhwxds=";
-
-  nativeBuildInputs = [ installShellFiles ];
-
-  postInstall = ''
-    installManPage ./moar.1
-  '';
-
-  ldflags = [
-    "-s"
-    "-w"
-    "-X"
-    "main.versionString=v${version}"
-  ];
-
-  meta = with lib; {
-    description = "Nice-to-use pager for humans";
-    homepage = "https://github.com/walles/moar";
-    license = licenses.bsd2WithViews;
-    mainProgram = "moar";
-    maintainers = with maintainers; [ foo-dogsquared ];
-  };
-}
diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix
index ee093e43eb4c..676b435661ba 100644
--- a/pkgs/by-name/mo/moc/package.nix
+++ b/pkgs/by-name/mo/moc/package.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation {
     # Misc
     (lib.withFeature curlSupport "curl")
     (lib.withFeature samplerateSupport "samplerate")
-    ("--enable-debug=" + (if withDebug then "yes" else "no"))
+    "--enable-debug=${lib.boolToYesNo withDebug}"
     "--disable-cache"
     "--without-rcc"
   ];
diff --git a/pkgs/by-name/mo/mocha/package.nix b/pkgs/by-name/mo/mocha/package.nix
new file mode 100644
index 000000000000..8b358c766a57
--- /dev/null
+++ b/pkgs/by-name/mo/mocha/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "mocha";
+  version = "11.7.4";
+
+  src = fetchFromGitHub {
+    owner = "mochajs";
+    repo = "mocha";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mRXdAPKDNnQzr8oz6NrTeUFgT7aBbsTl4TxFvjcVqCs=";
+  };
+
+  npmDepsHash = "sha256-NTJ27KucQcrnpPVtEX3zr6qQZjaLzNHPhgJefntE8hg=";
+
+  postInstall = ''
+    # Installed only for backwards compat, but should just be removed.
+    rm $out/bin/_mocha
+  '';
+
+  meta = {
+    changelog = "https://github.com/mochajs/mocha/blob/v${finalAttrs.version}/CHANGELOG.md";
+    description = "Simple, flexible, fun Javascript test framework for Node.js & the browser";
+    homepage = "https://mochajs.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "mocha";
+  };
+})
diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 001aff6bbac9..ad448911bb9c 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-11-06";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "8d397086d8971c91b27919b8a3945f5ac21bc61f";
-    hash = "sha256-r0k6b9vaAeKZl1mknQc1wyRiJcPB3/OWlqspOgqw/Us=";
+    rev = "db75a6d97efdd7a3f73cc2c0ebc3f362ebce608c";
+    hash = "sha256-pl6Ra7QPmM15ndl/skxE+XTqWP9oD2olcs+EQFW0U/0=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -38,8 +38,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
        export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
 
        bun install \
+         --filter=./packages/web \
          --force \
          --frozen-lockfile \
+         --ignore-scripts \
          --no-progress \
          --production
 
@@ -49,53 +51,40 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/node_modules
-      cp -R ./node_modules $out
+      # Copy node_modules directories
+      while IFS= read -r dir; do
+        rel="''${dir#./}"
+        dest="$out/$rel"
+        mkdir -p "$(dirname "$dest")"
+        cp -R "$dir" "$dest"
+      done < <(find . -type d -name node_modules -prune)
 
       runHook postInstall
     '';
 
-    # Required else we get errors that our fixed-output derivation references store paths
+    # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash =
-      {
-        x86_64-linux = "sha256-Uajwvce9EO1UwmpkGrViOrxlm2R/VnnMK8WAiOiQOhY=";
-        aarch64-linux = "sha256-brjdEEYBJ1R5pIkIHyOOmVieTJ0yUJEgxs7MtbzcKXo=";
-        x86_64-darwin = "sha256-aGUWZwySmo0ojOBF/PioZ2wp4NRwYyoaJuytzeGYjck=";
-        aarch64-darwin = "sha256-IM88XPfttZouN2DEtnWJmbdRxBs8wN7AZ1T28INJlBY=";
-      }
-      .${stdenvNoCC.hostPlatform.system};
+    outputHash = "sha256-otke/XlxVafkgtM3wDMU+/GBBgrbD32+3E+Wyue8+U8=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
 
   nativeBuildInputs = [ bun ];
 
-  patches = [
-    # In bun 1.2.13 (release-25.05) HTML entrypoints get content hashes
-    # appended → index.html becomes index-pq8vj7za.html in ./dist. So, we
-    # rename the index file back to index.html
-    ./post-build-rename-index-file.patch
-  ];
-
   configurePhase = ''
     runHook preConfigure
 
-    cp -R ${finalAttrs.node_modules}/node_modules .
+    cp -R ${finalAttrs.node_modules}/. .
 
     runHook postConfigure
   '';
 
-  preBuild = ''
-    patchShebangs packages/web/script/build.ts
-  '';
-
   buildPhase = ''
     runHook preBuild
 
     cd packages/web
-    bun run build
+    bun run ./script/build.ts
 
     runHook postBuild
   '';
diff --git a/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch b/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch
deleted file mode 100644
index 2af79dbc92f9..000000000000
--- a/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git i/packages/web/script/build.ts w/packages/web/script/build.ts
-index 9bdcdb3..e9ce1c9 100755
---- i/packages/web/script/build.ts
-+++ w/packages/web/script/build.ts
-@@ -14,6 +14,13 @@ for await (const file of new Bun.Glob("./public/*").scan()) {
-   await Bun.write(file.replace("./public/", "./dist/"), Bun.file(file));
- }
- 
-+const distFiles = await fs.readdir("./dist");
-+const htmlFile = distFiles.find(file => file.startsWith("index-") && file.endsWith(".html"));
-+
-+if (htmlFile) {
-+  await fs.rename(`./dist/${htmlFile}`, "./dist/index.html");
-+}
-+
- let html = await Bun.file("./dist/index.html").text();
- html = html.replace("<!--static-->", Rendered);
- await Bun.write("./dist/index.html", html);
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
new file mode 100644
index 000000000000..098bd55d03f2
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
@@ -0,0 +1,72 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+  },
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+  },
+  "org/gradle/toolchains#foojay-resolver/0.10.0": {
+   "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=",
+   "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=",
+   "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": {
+   "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8="
+  }
+ },
+ "https://repo.maven.apache.org/maven2/org": {
+  "apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "junit#junit-bom/5.12.1": {
+   "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=",
+   "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A="
+  },
+  "junit/jupiter#junit-jupiter-api/5.12.1": {
+   "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=",
+   "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=",
+   "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w="
+  },
+  "junit/jupiter#junit-jupiter-engine/5.12.1": {
+   "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=",
+   "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=",
+   "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao="
+  },
+  "junit/jupiter#junit-jupiter-params/5.12.1": {
+   "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=",
+   "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=",
+   "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M="
+  },
+  "junit/jupiter#junit-jupiter/5.12.1": {
+   "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=",
+   "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=",
+   "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ="
+  },
+  "junit/platform#junit-platform-commons/1.12.1": {
+   "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=",
+   "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=",
+   "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM="
+  },
+  "junit/platform#junit-platform-engine/1.12.1": {
+   "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=",
+   "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=",
+   "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w="
+  },
+  "junit/platform#junit-platform-launcher/1.12.1": {
+   "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=",
+   "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=",
+   "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk="
+  },
+  "opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  }
+ }
+}
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch
new file mode 100644
index 000000000000..ef97f6e66e6e
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch
@@ -0,0 +1,36 @@
+diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs
+index 251c4e84..eeacd02a 100644
+--- a/packages/app-lib/build.rs
++++ b/packages/app-lib/build.rs
+@@ -1,7 +1,7 @@
+ use std::ffi::OsString;
+ use std::path::PathBuf;
+ use std::process::{Command, exit};
+-use std::{env, fs};
++use std::env;
+ 
+ fn main() {
+     println!("cargo::rerun-if-changed=java/gradle");
+@@ -19,21 +19,11 @@ fn main() {
+         out_dir.join("java/libs").display()
+     );
+ 
+-    let gradle_path = fs::canonicalize(
+-        #[cfg(target_os = "windows")]
+-        "java\\gradlew.bat",
+-        #[cfg(not(target_os = "windows"))]
+-        "java/gradlew",
+-    )
+-    .unwrap();
+-
+     let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir=");
+     build_dir_str.push(out_dir.join("java"));
+-    let exit_status = Command::new(gradle_path)
++    let exit_status = Command::new("@gradle@")
+         .arg(build_dir_str)
+         .arg("build")
+-        .arg("--no-daemon")
+-        .arg("--console=rich")
+         .current_dir(dunce::canonicalize("java").unwrap())
+         .status()
+         .expect("Failed to wait on Gradle build");
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index c744a2168ff0..8014d0a4d1b4 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -5,44 +5,84 @@
   cargo-tauri,
   desktop-file-utils,
   fetchFromGitHub,
+  gradle_8,
+  jdk11,
   makeBinaryWrapper,
+  makeShellWrapper,
   nix-update-script,
   nodejs,
   openssl,
   pkg-config,
   pnpm_9,
+  replaceVars,
+  runCommand,
   rustPlatform,
   turbo,
   webkitgtk_4_1,
 }:
 
 let
+  gradle = gradle_8.override { java = jdk; };
+  jdk = jdk11;
   pnpm = pnpm_9;
 in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.9.5";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0=";
+    hash = "sha256-XfJbjbVcP9N3exAhXQoMGpoHORpKAlb0dPhQq195roY=";
   };
 
-  cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I=";
+  patches = [
+    # `packages/app-lib/build.rs` requires a Gradle executable, but our flags
+    # are injected through a bash function sourced by the stdenv :(
+    #
+    # So, re-implement said wrapper to have the same behavior when Gradle is ran in `build.rs`
+    (replaceVars ./gradle-from-path.patch {
+      # Yes, it has to be a shell wrapper
+      # https://github.com/NixOS/nixpkgs/issues/172583
+      gradle =
+        runCommand "gradle-exe-wrapper-${gradle.version}" { nativeBuildInputs = [ makeShellWrapper ]; }
+          ''
+            makeShellWrapper ${lib.getExe gradle} $out \
+              --add-flags "\''${NIX_GRADLEFLAGS_COMPILE:-}"
+          '';
+    })
+
+    # `gradle.fetchDeps` doesn't seem to pick up a few integrations here
+    # Thankfully that's fine, since it's only for development
+    ./remove-spotless.patch
+  ];
+
+  # Let the app know about our actual version number
+  postPatch = ''
+    substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \
+      --replace-fail '1.0.0-local' '${finalAttrs.version}'
+  '';
+
+  cargoHash = "sha256-jWMHii65hTnTmiBFHxZ4xO5V+Qt/MPCy75eJvnlyE4c=";
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
+    hash = "sha256-7iqXuIQPbP2p26vrWDjMoyZBPpbVQpigYAylhIg8+ZY=";
   };
 
   nativeBuildInputs = [
     cacert # Required for turbo
     cargo-tauri.hook
     desktop-file-utils
+    gradle
     nodejs
     pkg-config
     pnpm.configHook
@@ -51,16 +91,38 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
+  gradleFlags = [
+    "-Dfile.encoding=utf-8"
+    "--no-configuration-cache"
+  ];
+
+  dontUseGradleBuild = true;
+  dontUseGradleCheck = true;
+
   # Tests fail on other, unrelated packages in the monorepo
   cargoTestFlags = [
     "--package"
     "theseus_gui"
   ];
 
+  # Required for mitmCache
+  __darwinAllowLocalNetworking = true;
+
   env = {
     TURBO_BINARY_PATH = lib.getExe turbo;
   };
 
+  preGradleUpdate = ''
+    cd packages/app-lib/java
+  '';
+
+  # Required for the exe wrapper above
+  preBuild = ''
+    local nixGradleFlags=()
+    concatTo nixGradleFlags gradleFlags gradleFlagsArray
+    export NIX_GRADLEFLAGS_COMPILE="''${nixGradleFlags[@]}"
+  '';
+
   postInstall =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeBinaryWrapper "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/ModrinthApp
@@ -97,5 +159,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Darwin is the only exception
     # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678
     broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
   };
 })
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch
new file mode 100644
index 000000000000..61c11124aada
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch
@@ -0,0 +1,25 @@
+diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts
+index b7f9ede0..8a336897 100644
+--- a/packages/app-lib/java/build.gradle.kts
++++ b/packages/app-lib/java/build.gradle.kts
+@@ -1,6 +1,5 @@
+ plugins {
+     java
+-    id("com.diffplug.spotless") version "7.0.4"
+ }
+ 
+ repositories {
+@@ -23,13 +22,6 @@ tasks.withType<JavaCompile>().configureEach {
+     options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror"))
+ }
+ 
+-spotless {
+-    java {
+-        palantirJavaFormat()
+-        removeUnusedImports()
+-    }
+-}
+-
+ tasks.jar {
+     archiveFileName = "theseus.jar"
+ }
diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix
index 65ea5598cb1a..be0442eabfbb 100644
--- a/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/pkgs/by-name/mo/modrinth-app/package.nix
@@ -4,7 +4,9 @@
   addDriverRunpath,
   alsa-lib,
   flite,
+  glib,
   glib-networking,
+  gsettings-desktop-schemas,
   jdk17,
   jdk21,
   jdk8,
@@ -30,9 +32,17 @@ symlinkJoin {
 
   paths = [ modrinth-app-unwrapped ];
 
-  nativeBuildInputs = [ wrapGAppsHook4 ];
+  strictDeps = true;
 
-  buildInputs = [ glib-networking ];
+  nativeBuildInputs = [
+    glib
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib-networking
+    gsettings-desktop-schemas
+  ];
 
   runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
     lib.makeLibraryPath [
@@ -72,6 +82,8 @@ symlinkJoin {
       ''}
     )
 
+    glibPostInstallHook
+    gappsWrapperArgsHook
     wrapGAppsHook
   '';
 
diff --git a/pkgs/by-name/mo/moltenvk/package.nix b/pkgs/by-name/mo/moltenvk/package.nix
index 576cab57fa59..635d6ceab848 100644
--- a/pkgs/by-name/mo/moltenvk/package.nix
+++ b/pkgs/by-name/mo/moltenvk/package.nix
@@ -21,7 +21,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "MoltenVK";
-  version = "1.3.0";
+  version = "1.4.0";
 
   strictDeps = true;
 
@@ -47,10 +47,17 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "KhronosGroup";
     repo = "MoltenVK";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-V69P1t48XP/pAPgpVsnFeCBidhHk60XGHRkHF6AEke0=";
+    hash = "sha256-ydXyah6/J6/1Lzuv+7JnMurkqnvQPs+6Vec0uUrxGq0=";
   };
 
   postPatch = ''
+    # Update the deployment target for the minimum target used by nixpkgs.
+    while IFS= read -d "" proj; do
+      echo "Updating deployment target to ${stdenv.hostPlatform.darwinMinVersion}: $proj"
+      substituteInPlace "$proj" \
+        --replace-fail 'MACOSX_DEPLOYMENT_TARGET = 10.15' "MACOSX_DEPLOYMENT_TARGET = $MACOSX_DEPLOYMENT_TARGET"
+    done < <(grep -Z -rl --include=project.pbxproj MACOSX_DEPLOYMENT_TARGET)
+
     # Move `mvkGitRevDerived.h` to a stable location
     substituteInPlace Scripts/gen_moltenvk_rev_hdr.sh \
       --replace-fail '$'''{BUILT_PRODUCTS_DIR}' "$NIX_BUILD_TOP/$sourceRoot/build/include" \
@@ -91,7 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (
-    lib.optional (stdenv.cc.libcxx != null) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+    # MoltenVK does its own checks for availability by probing the version at runtime and checking the MSL version.
+    [ "-Wno-error=unguarded-availability" ]
+    ++ lib.optional (
+      stdenv.cc.libcxx != null
+    ) "-isystem ${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
     ++ [
       "-I${lib.getDev spirv-cross}/include/spirv_cross"
       "-I${lib.getDev spirv-headers}/include/spirv/unified1"
diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix
index b020ace87177..396dc7d007a4 100644
--- a/pkgs/by-name/mo/moneydance/package.nix
+++ b/pkgs/by-name/mo/moneydance/package.nix
@@ -4,12 +4,12 @@
   buildPackages,
   fetchzip,
   makeWrapper,
-  openjdk23,
+  openjdk25,
   wrapGAppsHook3,
   jvmFlags ? [ ],
 }:
 let
-  jdk = openjdk23.override {
+  jdk = openjdk25.override {
     enableJavaFX = true;
   };
 in
diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 8cbb211b2bae..954f55e351b8 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "mongodb-atlas-cli";
-  version = "1.49.0";
+  version = "1.50.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     tag = "atlascli/v${version}";
-    hash = "sha256-thip1zWOQJOKrShf8O1erIUdYuqLg6VaMqMRV/a7/dg=";
+    hash = "sha256-vo2vfnGKp71S9mVGK5SVi8YqNLjedzfjJhh5uK/pb4E=";
   };
 
-  vendorHash = "sha256-HtdZ+wfibcqKoTf5BT5nNX4+m7bP/f2gvkvA+PnYb2s=";
+  vendorHash = "sha256-qcB8Hgp/4kVsEo32E6I4GMSBbRByPTyk3Oas2CpS4Xc=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index 2cf0fd98afa8..aaa611dffaf6 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mongodb-ce";
-  version = "8.0.14";
+  version = "8.0.15";
 
   src =
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -54,19 +54,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz";
-        hash = "sha256-nmqDMu8O3bUveGnUNjISs8o3mVX9cNgIQNG3+m9ctUs=";
+        hash = "sha256-hHlTsXbzDBhesK6hrGV27zXBBd7uEFlt/5QDJFn5aFA=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
-        hash = "sha256-Os4aK+r5SBzgtkRz81FcRywTgs5gKzGTOZfb/Z8H2ns=";
+        hash = "sha256-th67W8GA62AcKlASxafYBZLM2j+kZGuk4N706nXQKQ0=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
-        hash = "sha256-x4pFuAFgp+7n/knezCwjasXh4c338kXdjA7L259bRKw=";
+        hash = "sha256-MBNmctpSZjHZyYkUyt6q/uGmSGRdRD+7GHrh/Aj+bmA=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
-        hash = "sha256-apcmzl8HIWaP8I3OjTX2Vzcwx5ruztqPFDzoLf8Fn14=";
+        hash = "sha256-3yXoOMD6S90XErUWCctCMV5aulljrvXsVGEUBvHmk5w=";
       };
     };
     updateScript =
diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 2497a1809e75..bc99ca9b235b 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -40,7 +40,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.47.1";
+  version = "1.48.1";
 
   selectSystem =
     attrs:
@@ -55,9 +55,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-L+IhvRqUllrFkntYeuE+3Ox59U60fu0P2VP6Zb/1ORA=";
-      x86_64-darwin = "sha256-NYgXtCdrny6pKACYmWDHvrlCOJupyP4GqobDr+13WqU=";
-      aarch64-darwin = "sha256-mZ6bLY6hnOhPb2pxPKpiVQpF3ffZlC265QvkIIjpM9A=";
+      x86_64-linux = "sha256-C+0IezU2kAQzju3Ev2xl82ybQeB8B8ViXDHoRXPHIus=";
+      x86_64-darwin = "sha256-LtiXq1chSRUj/hgVRvHwS1KvJKiQW838K8EVSdmNSQk=";
+      aarch64-darwin = "sha256-P0VfIRmBgF65BcxoRNIh6e6ccqztO/BG7qtYP528YDI=";
     };
   };
 
diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix
index 98cd5ead45e2..7fb9820a7f1c 100644
--- a/pkgs/by-name/mo/mongosh/package.nix
+++ b/pkgs/by-name/mo/mongosh/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "mongosh";
-  version = "2.5.8";
+  version = "2.5.9";
 
   src = fetchFromGitHub {
     owner = "mongodb-js";
     repo = "mongosh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VQJkhaPXy2Mg9uoV6qKFzACtJ6TMDWZj52wUvP/7SLg=";
+    hash = "sha256-lZ2JnFIZvfxRyYXMUbjnazgggRm4ZBdEStn91bPSzkY=";
   };
 
-  npmDepsHash = "sha256-BnuzrIS/RtKReTPrSY/yQ5LRmA3PIGkv80rS+6IJZxQ=";
+  npmDepsHash = "sha256-tLgfhg940PJYPQ9myT+mi7+nubcGHU1C1/Az8gF6spQ=";
 
   patches = [
     ./disable-telemetry.patch
diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
index 5aee7560a85a..a9874a5aab18 100644
--- a/pkgs/by-name/mo/monkeysAudio/package.nix
+++ b/pkgs/by-name/mo/monkeysAudio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "11.61";
+  version = "11.80";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-xjFAsnocqar53mBnbi34Q7tRr0OyJoK2S9e1t7O7r9U=";
+    hash = "sha256-Y1Zeuelx4fAWYm9dCETM47t80b4w2biTBrLujkgH1oA=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index d18fa37612ce..9552d4625bfb 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -3,37 +3,36 @@
   fetchFromGitLab,
   python3Packages,
   wrapGAppsHook4,
-  gst_all_1,
   gobject-introspection,
   yt-dlp,
+  gst_all_1,
   libadwaita,
   glib-networking,
   nix-update-script,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "monophony";
-  version = "3.4.2";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
-    rev = "v${version}";
-    hash = "sha256-D/3yJ1KIXF1rv8iH4+HvfD6N94LzkZGRippZj8nk1nQ=";
+    tag = "v${version}";
+    hash = "sha256-0/yzOoO9WeArTm9qlL3++rn0EUCJAjmUX2zxClu3LRE=";
   };
 
   sourceRoot = "${src.name}/source";
 
   dependencies = with python3Packages; [
-    mpris-server
-    pygobject3
+    mprisify
+    requests
     ytmusicapi
   ];
 
   build-system = with python3Packages; [
-    pip
     setuptools
-    wheel
+    pip
   ];
 
   nativeBuildInputs = [
@@ -52,14 +51,7 @@ python3Packages.buildPythonApplication rec {
     gstreamer
   ]);
 
-  pythonRelaxDeps = [
-    "mpris_server"
-    "ytmusicapi"
-  ];
-
-  postInstall = ''
-    make install prefix=$out
-  '';
+  postInstall = "make install prefix=$out";
 
   dontWrapGApps = true;
 
@@ -74,9 +66,9 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Linux app for streaming music from YouTube";
-    longDescription = "Monophony is a free and open source Linux app for streaming music from YouTube. It has no ads and does not require an account.";
+    longDescription = "Monophony allows you to stream and download music from YouTube Music without ads, as well as create and import playlists without signing in.";
     homepage = "https://gitlab.com/zehkira/monophony";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.bsd0;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ quadradical ];
     mainProgram = "monophony";
diff --git a/pkgs/by-name/mo/monosat/package.nix b/pkgs/by-name/mo/monosat/package.nix
index c5fbc9824ebe..02a828ceb247 100644
--- a/pkgs/by-name/mo/monosat/package.nix
+++ b/pkgs/by-name/mo/monosat/package.nix
@@ -47,7 +47,10 @@ let
   core = stdenv.mkDerivation {
     name = "${pname}-${version}";
     inherit src patches;
-    postPatch = commonPostPatch;
+    postPatch = commonPostPatch + ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.02)" "cmake_minimum_required(VERSION 3.10)"
+    '';
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       zlib
diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix
index 233997bfef18..af391fcfae2d 100644
--- a/pkgs/by-name/mo/moon/package.nix
+++ b/pkgs/by-name/mo/moon/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "moon";
-  version = "1.41.2";
+  version = "1.41.5";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = "moon";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pBuCKwBLIDv+UANyKGKbPC9am8YYgTKLF0fY2WLpOVg=";
+    hash = "sha256-BcDKjw2k102TQmLeq6+59Z6b4IpnGDRbQ4/nAXXIPBo=";
   };
 
-  cargoHash = "sha256-2Kv12YpYLNPHp2sK4NV3N+w3yQUL+WoYPrmkrYyyp+8=";
+  cargoHash = "sha256-mc3A573QaovLwhcZshe9Z60ebHmcCyW/izbxlb2FNpk=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";
diff --git a/pkgs/by-name/mo/moonfire-nvr/package.nix b/pkgs/by-name/mo/moonfire-nvr/package.nix
index 6ea4fd50c06d..ee6f608a6493 100644
--- a/pkgs/by-name/mo/moonfire-nvr/package.nix
+++ b/pkgs/by-name/mo/moonfire-nvr/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage {
   ];
 
   postInstall = ''
-    mkdir -p $out/lib/ui
+    mkdir -p $out/lib
     ln -s ${ui} $out/lib/ui
   '';
 
@@ -72,9 +72,9 @@ rustPlatform.buildRustPackage {
   passthru = {
     inherit ui;
     tests.version = testers.testVersion {
-      inherit version;
       package = moonfire-nvr;
       command = "moonfire-nvr --version";
+      version = "Version: v${version}";
     };
   };
 
diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 8bbb329261fc..2a79d8e68aa3 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.32";
+  version = "1.3.33";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aXap/wUjjJTCy2eq7p7BL6ZYOVZEBVY4/YkrDtbIj2Q=";
+    hash = "sha256-lQpl6ecQfQ7KzEIytH3k4hLtvq+KkTL+3IR2ZukdZWM=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 2;
-    hash = "sha256-gv+PHGbo0IiPgcxi0RAvsNmGLHWZar3SB4eW7NbJRJY=";
+    hash = "sha256-PRlgwyePFpFdQRcojGDEC4ESZEGTJf1Ad9EFgm8hmKY=";
   };
 
   env = {
diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix
index c04ddd2e4af1..f34241bebd57 100644
--- a/pkgs/by-name/mo/moonraker/package.nix
+++ b/pkgs/by-name/mo/moonraker/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "moonraker";
-  version = "0.9.3-unstable-2025-09-22";
+  version = "0.9.3-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "Arksine";
     repo = "moonraker";
-    rev = "72ca7dbe057c00c3a34013d0c56fda0ab9bbfffe";
-    sha256 = "sha256-yQmJ78Gj2ilxKQ21tx0fimo9cYFlSyTmcVgC6OwxmkQ=";
+    rev = "8426f4107c7afb9adf876fce53b2cd725370523a";
+    sha256 = "sha256-gNmgUwp+OHW18Ylzzve1Ey63L5kobOoldAkr0VdfG3w=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
new file mode 100644
index 000000000000..b366352cd223
--- /dev/null
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  nix-update-script,
+  pkgsCross,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "moor";
+  version = "2.8.1";
+
+  src = fetchFromGitHub {
+    owner = "walles";
+    repo = "moor";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VipHPRxSre6U3VXNtP+NrlaVfgUkzIDLvg4UsZucAdY=";
+  };
+
+  vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X"
+    "main.versionString=v${finalAttrs.version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  postInstall = ''
+    installManPage ./moor.1
+  '';
+
+  passthru = {
+    tests.cross-aarch64 = pkgsCross.aarch64-multiplatform.moor;
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Nice-to-use pager for humans";
+    homepage = "https://github.com/walles/moor";
+    changelog = "https://github.com/walles/moor/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.bsd2WithViews;
+    mainProgram = "moor";
+    maintainers = with lib.maintainers; [
+      foo-dogsquared
+      getchoo
+    ];
+  };
+})
diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 8c39d5368a32..5a684078c050 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "moosefs";
-  version = "4.58.1";
+  version = "4.58.2";
 
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
     rev = "v${version}";
-    sha256 = "sha256-l3tF3y41nRy5AB/+9p/XJK5NKmPlod9td2n0RSRnYAQ=";
+    sha256 = "sha256-eywJ7MmCrwxqlbTDYEEPs6ego9Ivn+ziXCBNhcDfcmY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix
index 180a4a692986..e2191b1330f4 100644
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "mopac";
-  version = "23.2";
+  version = "23.2.2";
 
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = "mopac";
     rev = "v${version}";
-    hash = "sha256-P2BEXzclHJHSoaIIgCKVC3j63Af+J6rO0acwjv9ybbA=";
+    hash = "sha256-VBbW0N67ZbTymYfLrT625rkWeeYbFrEdTxPOCanFT0c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix
index d9529c76e3bb..dda652605dfa 100644
--- a/pkgs/by-name/mo/morgen/package.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "3.6.18";
+  version = "3.6.19";
 
   src = fetchurl {
     name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-OvV+GNKQBzUpHEOfaBV6SGRxA/gvRWFkP5D7CihY7pU=";
+    hash = "sha256-9zIs5Z6o9cH7dcVGGCKfCBr/9rR9wvQbs6BZJC3KFiQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index c06b6c1e062c..92bd4eafae1b 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
 
   # provide correct configure answers for cross builds
   configureFlags = [
-    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+    "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
diff --git a/pkgs/by-name/mo/mountain-duck/package.nix b/pkgs/by-name/mo/mountain-duck/package.nix
index 903147d09706..b2c928db3105 100644
--- a/pkgs/by-name/mo/mountain-duck/package.nix
+++ b/pkgs/by-name/mo/mountain-duck/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mountain-duck";
-  version = "5.0.2.28022";
+  version = "5.0.4.28064";
 
   src = fetchurl {
     url = "https://dist.mountainduck.io/Mountain%20Duck-${finalAttrs.version}.zip";
-    sha256 = "sha256-QismxRiDN6AfzaR8/WZq4O9Wj7knMXhGtIWjkhg/rAQ=";
+    sha256 = "sha256-f69DBNj15dxkNxmFtoxA3d/bSpagpOX7l84fE4a/VWw=";
   };
   dontUnpack = true;
 
diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix
index 485b4faecafa..ed2e60f79afb 100644
--- a/pkgs/by-name/mo/mouse-actions-gui/package.nix
+++ b/pkgs/by-name/mo/mouse-actions-gui/package.nix
@@ -16,7 +16,6 @@
   udevCheckHook,
   gtk3,
   libsoup_2_4,
-  webkitgtk_4_0,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -49,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     # Tauri deps
     gtk3
     libsoup_2_4
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   npmDeps = fetchNpmDeps {
@@ -69,6 +68,8 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
+    # webkitgtk_4_0 was removed
+    broken = true;
     changelog = "https://github.com/jersou/mouse-actions/blob/${src.rev}/CHANGELOG.md";
     description = "Mouse event based command executor, a mix between Easystroke and Comiz edge commands";
     homepage = "https://github.com/jersou/mouse-actions";
diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix
index 0cb5ed73e7f4..06d7be4dd40b 100644
--- a/pkgs/by-name/mo/movim/package.nix
+++ b/pkgs/by-name/mo/movim/package.nix
@@ -88,7 +88,7 @@ php.buildComposerProject2 (finalAttrs: {
     ++ lib.optional minify.style.enable lightningcss
     ++ lib.optional minify.svg.enable scour;
 
-  vendorHash = "sha256-xkFyjs3jW7j+8WosRaxBEYQU2dwQlDr4/nrdtW03xvA=";
+  vendorHash = "sha256-Ke+bh/mvKUk5qxjlBZo4jJhLneyFRq0HYXTwK/KZMBs=";
 
   postPatch = ''
     # Our modules are already wrapped, removes missing *.so warnings;
diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index a854164749f2..924bd54e79bc 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -4,6 +4,7 @@
   cargo,
   cmake,
   fetchFromGitHub,
+  fetchpatch,
   go,
   lib,
   libcap,
@@ -22,15 +23,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.31.1";
+  version = "2.32.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-+Aexwj/iNIhriiUrMhtj2c9S3e5jGN7OvREXUzi/03s=";
+    hash = "sha256-STp/BCh3gELF0UgkMF2uUV9U5JgTNsqoh+Cog8fQy2c=";
   };
-  patches = [ ];
+  patches = [
+    # VPN-7309: Qt 6.10 QML loading fixes (#10832)
+    (fetchpatch {
+      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5e7a26efd5acc3cdeeda8d1954459bff1a7e373e.patch";
+      hash = "sha256-CdvEuASPNYzQwyCMKXWZObOHH55WRFsxGYlEP8b20Mc=";
+    })
+  ];
 
   netfilter = buildGoModule {
     pname = "${finalAttrs.pname}-netfilter";
diff --git a/pkgs/by-name/mp/mpd/package.nix b/pkgs/by-name/mp/mpd/package.nix
index 7a152517ff9b..661f95ed122b 100644
--- a/pkgs/by-name/mp/mpd/package.nix
+++ b/pkgs/by-name/mp/mpd/package.nix
@@ -197,13 +197,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpd";
-  version = "0.24.5";
+  version = "0.24.6";
 
   src = fetchFromGitHub {
     owner = "MusicPlayerDaemon";
     repo = "MPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM=";
+    sha256 = "sha256-KAyTDfe3bEFWwImNaTOgq0jAs49kH8H+8ZJPQipN4QA=";
   };
 
   buildInputs = [
@@ -234,7 +234,13 @@ stdenv.mkDerivation (finalAttrs: {
         substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
           --replace kAudioObjectPropertyElement{Main,Master} \
           --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
-      '';
+      ''
+    +
+      lib.optionalString
+        (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "13.3")
+        ''
+          sed -i "/subdir('time')/d" test/meson.build
+        '';
 
   # Otherwise, the meson log says:
   #
diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix
index 6011e6d26d3b..ddb67dd5d5d0 100644
--- a/pkgs/by-name/mp/mpifileutils/package.nix
+++ b/pkgs/by-name/mp/mpifileutils/package.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ mpi ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Suite of MPI-based tools to manage large datasets";
     homepage = "https://hpc.github.io/mpifileutils";
diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix
index 26bd3d5687f8..3cab390e3e83 100644
--- a/pkgs/by-name/mp/mpls/package.nix
+++ b/pkgs/by-name/mp/mpls/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "mpls";
-  version = "0.15.4";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "mhersson";
     repo = "mpls";
     tag = "v${version}";
-    hash = "sha256-ChEZigLKzU/SILcJoyjKZI1qqrAi9qA6ugUeg5AL2Mw=";
+    hash = "sha256-xNgbtVyjhimvhZ1ua8NoTS3bV7ZSbX5j9VnFSYXuGpI=";
   };
 
-  vendorHash = "sha256-n3DG3sR7HOQPQJW1t1qC94EKkDBgXpdmjUWtLzAE7kY=";
+  vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/mp/mpris-timer/package.nix b/pkgs/by-name/mp/mpris-timer/package.nix
index 245452ea1b72..fca703fbdf95 100644
--- a/pkgs/by-name/mp/mpris-timer/package.nix
+++ b/pkgs/by-name/mp/mpris-timer/package.nix
@@ -12,20 +12,18 @@
   wrapGAppsHook4,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "mpris-timer";
-  version = "2.1.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "efogdev";
     repo = "mpris-timer";
-    tag = version;
-    hash = "sha256-uFQJSKQ9k0fiOhzydJ7frs2kns9pSdZGILPGCW3QA1w=";
+    tag = finalAttrs.version;
+    hash = "sha256-JuOBLm7+/zOSNhH+sBqvUQV0+AhTAmr+UxhPFtt0NU8=";
   };
 
-  vendorHash = "sha256-vCzQiQsljNyI7nBYvq+C/dv0T186Lsj7rOq5xHMs3c0=";
-
-  strictDeps = true;
+  vendorHash = "sha256-Htni2cMc1vYewVL8oOXL2gPS4h+S3d5y4i5yAZdqFJo=";
 
   nativeBuildInputs = [
     pkg-config
@@ -45,13 +43,10 @@ buildGoModule rec {
     "-w"
   ];
 
-  tags = [
-    "wayland"
-  ];
+  tags = [ "wayland" ];
 
   postInstall = ''
-    mv $out/bin/cmd $out/bin/mpris-timer
-
+    mv $out/bin/{cmd,mpris-timer}
     install -Dm644 internal/ui/res/icon.svg $out/share/icons/hicolor/scalable/apps/io.github.efogdev.mpris-timer.svg
     install -Dm644 misc/io.github.efogdev.mpris-timer.desktop -t $out/share/applications
     install -Dm644 misc/io.github.efogdev.mpris-timer.metainfo.xml -t $out/share/metainfo
@@ -59,9 +54,7 @@ buildGoModule rec {
     glib-compile-schemas $out/share/glib-2.0/schemas
   '';
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Timer app with seamless GNOME integration";
@@ -72,7 +65,6 @@ buildGoModule rec {
       getchoo
     ];
     mainProgram = "mpris-timer";
-    # Always uses ALSA
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux; # Always uses ALSA
   };
-}
+})
diff --git a/pkgs/applications/science/math/mpsolve/default.nix b/pkgs/by-name/mp/mpsolve/package.nix
similarity index 92%
rename from pkgs/applications/science/math/mpsolve/default.nix
rename to pkgs/by-name/mp/mpsolve/package.nix
index 7d314c6842a9..26df426393cc 100644
--- a/pkgs/applications/science/math/mpsolve/default.nix
+++ b/pkgs/by-name/mp/mpsolve/package.nix
@@ -9,8 +9,7 @@
   gmp,
   gtk3,
   pkg-config,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     gmp
     gtk3
-    qtbase
+    libsForQt5.qtbase
   ];
 
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/by-name/mp/mpv-handler/package.nix b/pkgs/by-name/mp/mpv-handler/package.nix
index e0dd5c913cca..14637dcab48d 100644
--- a/pkgs/by-name/mp/mpv-handler/package.nix
+++ b/pkgs/by-name/mp/mpv-handler/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "mpv-handler";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "akiirui";
     repo = "mpv-handler";
     tag = "v${version}";
-    hash = "sha256-uWV9pjZp5s8H1UDS/T0JK//eJNnsaaby88l/tDqlQHY=";
+    hash = "sha256-QoctjneJA7CdXqGm0ylAh9w6611vv2PD1fzS0exag5A=";
   };
 
-  cargoHash = "sha256-Cps+cPOv8uV8x0MiBdSqsdJ/8n259K6Y5aVl2aWJ/tE=";
+  cargoHash = "sha256-gKDkDLTLzC53obDd7pORsqP6DhORTbx6tvQ4jq61znQ=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/mp/mpw/package.nix b/pkgs/by-name/mp/mpw/package.nix
deleted file mode 100644
index 495b1384b873..000000000000
--- a/pkgs/by-name/mp/mpw/package.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  fetchFromGitLab,
-  json_c,
-  libsodium,
-  libxml2,
-  ncurses,
-}:
-
-let
-  rev = "22796663dcad81684ab24308d9db570f6781ba2c";
-
-in
-stdenv.mkDerivation rec {
-  name = "mpw-${version}-${builtins.substring 0 8 rev}";
-  version = "2.6";
-
-  src = fetchFromGitLab {
-    owner = "MasterPassword";
-    repo = "MasterPassword";
-    sha256 = "1f2vqacgbyam1mazawrfim8zwp38gnwf5v3xkkficsfnv789g6fw";
-    inherit rev;
-  };
-
-  sourceRoot = "${src.name}/platform-independent/c/cli";
-
-  postPatch = ''
-    rm build
-    substituteInPlace mpw-cli-tests \
-      --replace '/usr/bin/env bash' ${stdenv.shell} \
-      --replace ./mpw ./build/mpw
-  '';
-
-  cmakeFlags = [
-    "-Dmpw_version=${version}"
-    "-DBUILD_MPW_TESTS=ON"
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    json_c
-    libxml2
-    libsodium
-    ncurses
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 mpw                    $out/bin/mpw
-    install -Dm644 ../mpw.completion.bash $out/share/bash-completion/completions/_mpw
-    install -Dm644 ../../../../README.md  $out/share/doc/mpw/README.md
-
-    runHook postInstall
-  '';
-
-  # Some tests are expected to fail on ARM64
-  # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well)
-  doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-
-  checkPhase = ''
-    runHook preCheck
-
-    ../mpw-cli-tests
-
-    runHook postCheck
-  '';
-
-  meta = with lib; {
-    description = "Stateless password management solution";
-    mainProgram = "mpw";
-    homepage = "https://masterpasswordapp.com/";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/mr/mrtrix/package.nix b/pkgs/by-name/mr/mrtrix/package.nix
index 9a9e864ed011..1f24bc209c59 100644
--- a/pkgs/by-name/mr/mrtrix/package.nix
+++ b/pkgs/by-name/mr/mrtrix/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mrtrix";
-  version = "3.0.7";
+  version = "3.0.8";
 
   src = fetchFromGitHub {
     owner = "MRtrix3";
     repo = "mrtrix3";
     rev = finalAttrs.version;
-    hash = "sha256-cPI6Ac1Yp5yb07zv9r5O7ZbsHpjrv5BkzbAW1qgj3gQ=";
+    hash = "sha256-X/slZuDyVzfsfq3F2uZ0tqOUmK+qEqSwGy8eAJ1bVbg=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix
index 5adf22f31f94..3c20016fcb0e 100644
--- a/pkgs/by-name/ms/msedit/package.nix
+++ b/pkgs/by-name/ms/msedit/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "msedit";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "edit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-G5U5ervW1NAQY/fnwOWv1FNuKcP+HYcAW5w87XHqgA8=";
+    hash = "sha256-Sb73awgdajBKKW0QIpmKF6g9mIIS/1f0a6D/jQulnUM=";
   };
 
-  cargoHash = "sha256-ceAaaR+N03Dq2MHYel4sHDbbYUOr/ZrtwqJwhaUbC2o=";
+  cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY=";
   # Requires nightly features
   env.RUSTC_BOOTSTRAP = 1;
 
diff --git a/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch b/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch
new file mode 100644
index 000000000000..7b2efd41bcb5
--- /dev/null
+++ b/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt	2025-10-23 07:12:12.766221736 +0100
++++ b/CMakeLists.txt	2025-10-23 07:14:58.069499300 +0100
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ 
+ include(GNUInstallDirs)
+ include(CheckCCompilerFlag)
diff --git a/pkgs/by-name/ms/msgpack-tools/package.nix b/pkgs/by-name/ms/msgpack-tools/package.nix
index e62af58ae1c1..610b356ebd88 100644
--- a/pkgs/by-name/ms/msgpack-tools/package.nix
+++ b/pkgs/by-name/ms/msgpack-tools/package.nix
@@ -1,51 +1,62 @@
 {
   lib,
   stdenv,
-  fetchurl,
   fetchFromGitHub,
+  fetchurl,
   cmake,
+  rapidjson,
+  replaceVars,
+  libb64,
+  versionCheckHook,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "msgpack-tools";
   version = "0.6";
 
   src = fetchFromGitHub {
     owner = "ludocode";
     repo = "msgpack-tools";
-    rev = "v${version}";
-    sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
-  };
-
-  libb64 = fetchurl {
-    url = "mirror://sourceforge/libb64/libb64-1.2.1.zip";
-    sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410";
-  };
-
-  rapidjson = fetchurl {
-    url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz";
-    sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-RT85vw6QeVkuNC2mtoT/BJyU0rdQVfz6ZBJf+ouY8vk=";
   };
 
   mpack = fetchurl {
     url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz";
-    sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg";
+    hash = "sha256-hyiXygbAHnNgF4TIg+DemBvtdBnSgJ7fAhknVuL+T/c=";
   };
 
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    rapidjson
+    libb64
+  ];
+
+  patches = [
+    ./cmake-v4.patch
+    (replaceVars ./use-nix-deps.patch {
+      rapidjson = "${rapidjson}";
+      libb64 = "${libb64}";
+    })
+  ];
+
   postUnpack = ''
     mkdir $sourceRoot/contrib
-    cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz
-    cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip
-    cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
+    cp ${finalAttrs.mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
   '';
 
-  nativeBuildInputs = [ cmake ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/json2msgpack";
+  versionCheckProgramArg = "-v";
+  doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tools for converting between MessagePack and JSON";
     homepage = "https://github.com/ludocode/msgpack-tools";
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ deejayem ];
   };
-}
+})
diff --git a/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch b/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch
new file mode 100644
index 000000000000..e9ea671cddd6
--- /dev/null
+++ b/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch
@@ -0,0 +1,67 @@
+--- a/CMakeLists.txt	2017-01-22 19:51:41.000000000 +0000
++++ b/CMakeLists.txt	2025-10-04 14:08:24.934041902 +0100
+@@ -83,57 +83,21 @@
+ 
+ # rapidjson
+ 
+-set(RAPIDJSON_FILE "rapidjson-${RAPIDJSON_COMMIT}.tar.gz")
+-set(RAPIDJSON_DIR "${CONTRIB_DIR}/rapidjson-${RAPIDJSON_COMMIT}")
+-set(RAPIDJSON_URL "https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz")
+-
+-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
+-    message(STATUS "Found package: ${RAPIDJSON_FILE}")
+-else()
+-    message(STATUS "Downloading: ${RAPIDJSON_FILE}")
+-    file(DOWNLOAD ${RAPIDJSON_URL} "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
+-    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
+-        message(FATAL_ERROR "\nFailed to download source file: ${RAPIDJSON_FILE}\nFrom: ${RAPIDJSON_URL}")
+-    endif()
+-endif()
+-
+-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE} WORKING_DIRECTORY ${CONTRIB_DIR})
+-
+-include_directories(SYSTEM ${RAPIDJSON_DIR}/include)
++include_directories(SYSTEM @rapidjson@/include)
+ 
+ 
+ # libb64
+ 
+-set(LIBB64_FILE "libb64-${LIBB64_VERSION}.zip")
+-set(LIBB64_DIR "${CONTRIB_DIR}/libb64-${LIBB64_VERSION}")
+-set(LIBB64_URL "http://downloads.sourceforge.net/project/libb64/libb64/libb64/${LIBB64_FILE}?use_mirror=autoselect")
+-
+-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
+-    message(STATUS "Found package: ${LIBB64_FILE}")
+-else()
+-    message(STATUS "Downloading: ${LIBB64_FILE}")
+-    file(DOWNLOAD ${LIBB64_URL} "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
+-    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
+-        message(FATAL_ERROR "\nFailed to download source file: ${LIBB64_FILE}\nFrom: ${LIBB64_URL}")
+-    endif()
+-endif()
+-
+-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}" WORKING_DIRECTORY "${CONTRIB_DIR}")
+-
+-# Remove libb64's newlines
+-set(LIBB64_CENCODE_FILE ${LIBB64_DIR}/src/cencode.c)
+-file(READ ${LIBB64_CENCODE_FILE} LIBB64_CENCODE)
+-string(REPLACE "*codechar++ = '\\n';" "/* *codechar++ = '\\n'; */" LIBB64_CENCODE "${LIBB64_CENCODE}")
+-file(WRITE ${LIBB64_CENCODE_FILE} "${LIBB64_CENCODE}")
+-
+-file(GLOB_RECURSE LIBB64_SRCS ${LIBB64_DIR}/src/*.c)
+-include_directories(SYSTEM ${LIBB64_DIR}/include)
++include_directories(SYSTEM @libb64@/include)
+ 
+ 
+ # executable targets
+ 
+-add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
+-add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
++add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS})
++add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS})
++
++target_link_libraries(msgpack2json b64)
++target_link_libraries(json2msgpack b64)
+ 
+ install(TARGETS msgpack2json json2msgpack DESTINATION bin)
+ 
diff --git a/pkgs/by-name/ms/msgpuck/package.nix b/pkgs/by-name/ms/msgpuck/package.nix
index 41fdca7052de..85cdb0859429 100644
--- a/pkgs/by-name/ms/msgpuck/package.nix
+++ b/pkgs/by-name/ms/msgpuck/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace test/CMakeLists.txt \
+      --replace-fail "cmake_policy(SET CMP0037 OLD)" "cmake_policy(SET CMP0037 NEW)"
+  '';
+
   meta = with lib; {
     description = "Simple and efficient MsgPack binary serialization library in a self-contained header file";
     homepage = "https://github.com/rtsisyk/msgpuck";
diff --git a/pkgs/by-name/ms/msmtp/package.nix b/pkgs/by-name/ms/msmtp/package.nix
index 006826e15b94..1e487ba0d3e9 100644
--- a/pkgs/by-name/ms/msmtp/package.nix
+++ b/pkgs/by-name/ms/msmtp/package.nix
@@ -31,13 +31,13 @@
 let
   inherit (lib) getBin getExe optionals;
 
-  version = "1.8.31";
+  version = "1.8.32";
 
   src = fetchFromGitHub {
     owner = "marlam";
     repo = "msmtp";
     rev = "msmtp-${version}";
-    hash = "sha256-5PWwHyNEpF+eDMmvqJIHGdje70fCH5pLXGi5Jkjg2OA=";
+    hash = "sha256-ofyDtP7KgTKX/O1O4g3OcDwgihDveAiJ5s5GQtSqf28=";
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/ms/msnake/package.nix b/pkgs/by-name/ms/msnake/package.nix
index 430fb2553639..fac1933ab265 100644
--- a/pkgs/by-name/ms/msnake/package.nix
+++ b/pkgs/by-name/ms/msnake/package.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5q3yT7amPF+SSvO6/eUU7IiK0k6f3nme9YYBUobSuuo=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.4)" \
+      "cmake_minimum_required(VERSION 4.0)"
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix
similarity index 68%
rename from pkgs/applications/audio/munt/mt32emu-qt.nix
rename to pkgs/by-name/mt/mt32emu-qt/package.nix
index ca2d22cc8071..a7eb6f529ca3 100644
--- a/pkgs/applications/audio/munt/mt32emu-qt.nix
+++ b/pkgs/by-name/mt/mt32emu-qt/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   alsa-lib,
   cmake,
@@ -9,24 +8,20 @@
   libmt32emu,
   pkg-config,
   portaudio,
-  qtbase,
-  qtmultimedia,
   withJack ? stdenv.hostPlatform.isUnix,
   libjack2,
+  libsForQt5,
 }:
 
-let
-  char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
-in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mt32emu-qt";
   version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${char2underscore "-" pname}_${char2underscore "." version}";
-    sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
+    tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}";
+    hash = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
   };
 
   postPatch = ''
@@ -36,13 +31,14 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libmt32emu
     portaudio
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
@@ -58,11 +54,11 @@ mkDerivation rec {
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
-    mv $out/bin/${pname}.app $out/Applications/
-    ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname}
+    mv $out/bin/mt32emu-qt.app $out/Applications/
+    ln -s $out/{Applications/mt32emu-qt.app/Contents/MacOS,bin}/mt32emu-qt
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Synthesizer application built on Qt and libmt32emu";
     mainProgram = "mt32emu-qt";
@@ -71,8 +67,8 @@ mkDerivation rec {
       synthesis and conversion of pre-recorded SMF files to WAVE making use of
       the mt32emu library and the Qt framework.
     '';
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
similarity index 53%
rename from pkgs/applications/audio/munt/mt32emu-smf2wav.nix
rename to pkgs/by-name/mt/mt32emu-smf2wav/package.nix
index a32c76f77ba2..63ec93ce6da5 100644
--- a/pkgs/applications/audio/munt/mt32emu-smf2wav.nix
+++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
@@ -8,22 +8,24 @@
   pkg-config,
 }:
 
-let
-  char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mt32emu-smf2wav";
   version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${char2underscore "-" pname}_${char2underscore "." version}";
+    rev = "mt32emu_smf2wav_${lib.replaceString "." "_" finalAttrs.version}";
     sha256 = "sha256-XGds9lDfSiY0D8RhYG4TGyjYEVvVYuAfNSv9+VxiJEs=";
   };
 
   postPatch = ''
     sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt
+    # This directly resolves the 'The dependency target "mt32emu" ... does not exist' error.
+    sed -i -e '/add_dependencies(mt32emu-smf2wav mt32emu)/d' CMakeLists.txt
+
+    substituteInPlace {./,mt32emu_smf2wav/,mt32emu_smf2wav/libsmf/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -41,12 +43,12 @@ stdenv.mkDerivation rec {
     "-Dmunt_WITH_MT32EMU_SMF2WAV=ON"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Produces a WAVE file from a Standard MIDI file (SMF)";
     mainProgram = "mt32emu-smf2wav";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 2a4ff4daa26b..478271d5be33 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.2.19";
+  version = "3.2.23";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-rAN5k3XjDTSmdp2E5pa5W+nK4J8l5+sPqSFQRdjebmA=";
+    hash = "sha256-UxEqPCQDtdVQXPgAOhzUMwXC8NWTSsHDrVLIUzfz5OA=";
   };
 
-  vendorHash = "sha256-SMdEowzg53uori/Ge+GE4542wswBU2kgdyAXxeKQiiU=";
+  vendorHash = "sha256-uT0waytDtFavvf6v4lmMAjiX8Dd7GRx54k8L/pOjWNc=";
 
   nativeBuildInputs = [
     gotools # goyacc
diff --git a/pkgs/by-name/mt/mtkclient/package.nix b/pkgs/by-name/mt/mtkclient/package.nix
new file mode 100644
index 000000000000..8424253da942
--- /dev/null
+++ b/pkgs/by-name/mt/mtkclient/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "mtkclient";
+  version = "2.0.1-unstable-2025-09-26";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bkerler";
+    repo = "mtkclient";
+    rev = "399b3a1c25e73ddf4951f12efd20f7254ee04a39";
+    hash = "sha256-XNPYeVhp5P+zQdumS9IzlUd5+WebL56qcgs10WS2/LY=";
+  };
+
+  build-system = [ python3Packages.hatchling ];
+
+  dependencies = with python3Packages; [
+    colorama
+    fusepy
+    pycryptodome
+    pycryptodomex
+    pyserial
+    pyside6
+    pyusb
+    shiboken6
+  ];
+
+  pythonImportsCheck = [ "mtkclient" ];
+
+  # Note: No need to install mtkclient udev rules, 50-android.rules is covered by
+  #       systemd 258 or newer and 51-edl.rules only applies to Qualcomm (i.e. not MTK).
+
+  meta = {
+    description = "MTK reverse engineering and flash tool";
+    homepage = "https://github.com/bkerler/mtkclient";
+    mainProgram = "mtk";
+    license = lib.licenses.gpl3;
+    sourceProvenance = with lib.sourceTypes; [
+      # loaders, preloaders and exploit payloads
+      binaryFirmware
+      # everything else
+      fromSource
+    ];
+    maintainers = [ lib.maintainers.timschumi ];
+  };
+}
diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix
index 39de8758a54a..8bddf23e71db 100644
--- a/pkgs/by-name/mt/mtpaint/package.nix
+++ b/pkgs/by-name/mt/mtpaint/package.nix
@@ -12,20 +12,28 @@
   libtiff,
   openjpeg,
   gifsicle,
+  gettext,
 }:
 
 stdenv.mkDerivation {
   pname = "mtPaint";
-  version = "3.50.01";
+  version = "3.50.12";
 
   src = fetchFromGitHub {
     owner = "wjaguar";
     repo = "mtPaint";
-    rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";
-    sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";
+    rev = "7cae5d663ed835a365d89a535536c39e18862a83";
+    hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  strictDeps = true;
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+  ];
+
   buildInputs = [
     freetype
     giflib
@@ -58,7 +66,7 @@ stdenv.mkDerivation {
     homepage = "https://mtpaint.sourceforge.net/";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.vklquevs ];
+    maintainers = with lib.maintainers; [ iedame ];
     mainProgram = "mtpaint";
   };
 }
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/by-name/mu/mudlet/package.nix
similarity index 80%
rename from pkgs/games/mudlet/default.nix
rename to pkgs/by-name/mu/mudlet/package.nix
index 70beede3d01f..90cc8791a155 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/by-name/mu/mudlet/package.nix
@@ -6,20 +6,16 @@
   cmake,
   git,
   pkg-config,
-  qttools,
   which,
-  wrapQtAppsHook,
   boost,
   hunspell,
   libGLU,
   libsForQt5,
   libsecret,
   libzip,
-  lua,
+  lua5_1,
   pcre,
   pugixml,
-  qtbase,
-  qtmultimedia,
   discord-rpc,
   yajl,
   withDiscordRpc ? false,
@@ -43,7 +39,7 @@ let
         });
       };
     in
-    lua.override { inherit packageOverrides; };
+    lua5_1.override { inherit packageOverrides; };
 
   luaEnv = overrideLua.withPackages (
     ps: with ps; [
@@ -56,23 +52,23 @@ let
     ]
   );
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mudlet";
-  version = "4.17.2";
+  version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "Mudlet";
     repo = "Mudlet";
-    rev = "Mudlet-${version}";
+    rev = "Mudlet-${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-K75frptePKfHeGQNXaX4lKsLwO6Rs6AAka6hvP8MA+k=";
+    hash = "sha256-I4RRIfHw9kZwxMlc9pvdtwPpq9EvNJU69WpGgZ+0uiw=";
   };
 
   patches = [
     (fetchpatch {
-      name = "darwin-AppKit.patch";
-      url = "https://github.com/Mudlet/Mudlet/commit/68cdd404f81a6d16c80068c45fe0f10802f08d9e.patch";
-      hash = "sha256-74FtcjOR/lu9ohtcoup0+gUfCQRznO48zMmb97INhdY=";
+      name = "cmake4-fix.patch";
+      url = "https://github.com/Mudlet/Mudlet/commit/933f2551fe3084f0fad6d8b971c6176fe154d8d7.patch?full_index=1";
+      hash = "sha256-MElSRhTaT1a5r/Pz3e7MTrzq0krjdspgW0woAB2C8jc=";
     })
   ];
 
@@ -81,9 +77,9 @@ stdenv.mkDerivation rec {
     git
     luaEnv
     pkg-config
-    qttools
+    libsForQt5.qttools
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -96,8 +92,8 @@ stdenv.mkDerivation rec {
     luaEnv
     pcre
     pugixml
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
     yajl
   ]
   ++ lib.optional withDiscordRpc discord-rpc;
@@ -129,7 +125,7 @@ stdenv.mkDerivation rec {
     cp -r src/mudlet.app/ $out/Applications/mudlet.app
     mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped
     makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \
-      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \
       --prefix LUA_PATH : "$NIX_LUA_PATH" \
       --prefix DYLD_LIBRARY_PATH : "${
         lib.makeLibraryPath (
@@ -146,7 +142,7 @@ stdenv.mkDerivation rec {
     mkdir -pv $out/bin
     cp src/mudlet $out/bin/mudlet-unwrapped
     makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \
-      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \
       --prefix LUA_PATH : "$NIX_LUA_PATH" \
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath (
@@ -166,17 +162,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Crossplatform mud client";
     homepage = "https://www.mudlet.org/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       wyvie
       pstn
       cpu
       felixalbrigtsen
     ];
-    platforms = platforms.linux ++ platforms.darwin;
-    license = licenses.gpl2Plus;
+    platforms = with lib.platforms; linux ++ darwin;
+    broken = stdenv.hostPlatform.isDarwin;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "mudlet";
   };
-}
+})
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index f490fba48285..9a11c26799d3 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/raviqqe/muffet";
     changelog = "https://github.com/raviqqe/muffet/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "muffet";
   };
 })
diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index f6646986ea2d..1496b01ddbe4 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.5.7";
+  version = "15.0";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-/PR0CDQByiUWlU5lP8QlJ7IQUWiXGTwrZbn9Cbe5xEg=";
+      hash = "sha256-BD5pnPeE3PZHJKNoJE46Gm6i+ksc7wdl9Eq7pWqB84g=";
     };
   };
 
@@ -296,12 +296,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
     mainProgram = "mullvad-browser";
     homepage = "https://mullvad.net/en/browser";
-    platforms = attrNames sources;
-    maintainers = with maintainers; [
+    platforms = lib.attrNames sources;
+    maintainers = with lib.maintainers; [
       felschr
       panicgh
       sigmasquadron
@@ -309,12 +309,12 @@ stdenv.mkDerivation rec {
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
     # the compound is "libre" in a strict sense (some components place certain
     # restrictions on redistribution), it's free enough for our purposes.
-    license = with licenses; [
+    license = with lib.licenses; [
       mpl20
       lgpl21Plus
       lgpl3Plus
       free
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }
diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index ce1289e9a50c..fea28eb14143 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -7,6 +7,7 @@
   libX11,
   makeWrapper,
   sox,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,6 +21,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/EliasOenal/multimon-ng/commit/1c111e83053e9e78ba568463cc015edadf77ed5f.diff";
+      hash = "sha256-gW9ihUn3rZcyurbu7+IhkWSotqWlJsHdeFHu12oVld4=";
+    })
+  ];
+
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     libX11
diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix
index 39d5fc289a3d..ae52507b8464 100644
--- a/pkgs/by-name/mu/multipath-tools/package.nix
+++ b/pkgs/by-name/mu/multipath-tools/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "multipath-tools";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "opensvc";
     repo = "multipath-tools";
     tag = finalAttrs.version;
-    hash = "sha256-Jeiy1bM7vuy2+r/0W1nAhgsncyV6QHdlV55aepAxHAg=";
+    hash = "sha256-FlmcZNi19ajAVTwHSNgS5jEsHUk8vHyzuFfxgN+WSxQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/mu/munge/package.nix b/pkgs/by-name/mu/munge/package.nix
index f21a9e17add3..ecfd36396afd 100644
--- a/pkgs/by-name/mu/munge/package.nix
+++ b/pkgs/by-name/mu/munge/package.nix
@@ -6,6 +6,7 @@
   libgcrypt,
   zlib,
   bzip2,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     rmdir "$out"/{var{/{lib,log}{/munge,},},etc/munge}
   '';
 
+  passthru.tests.nixos = nixosTests.munge;
+
   meta = with lib; {
     description = ''
       An authentication service for creating and validating credentials
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 1d3b8cea5f99..cd1bea612afa 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -38,17 +38,13 @@
   xcbuild,
   gitUpdater,
   enableBarcode ? false,
-
   # for passthru.tests
   cups-filters,
   zathura,
   mupdf,
 }:
-
 assert enablePython -> enableCxx;
-
 let
-
   freeglut-mupdf = freeglut.overrideAttrs (old: rec {
     pname = "freeglut-mupdf";
     version = "3.0.0-r${src.rev}";
@@ -67,16 +63,14 @@ let
         --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8 FATAL_ERROR)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)"
     '';
   });
-
 in
-
 stdenv.mkDerivation rec {
-  version = "1.26.8";
+  version = "1.26.10";
   pname = "mupdf";
 
   src = fetchurl {
     url = "https://mupdf.com/downloads/archive/${pname}-${version}-source.tar.gz";
-    hash = "sha256-6NJIpmbSOG9KIBTWgLbojeXOn9jIR7DidMvswSTzPMc=";
+    hash = "sha256-FlPzW9j72XDwVSPv3H+G5B6XKOJWSjKVKW4Dz1mlFDc=";
   };
 
   patches = [
@@ -282,7 +276,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  env.USE_SONAME = if (stdenv.hostPlatform.isDarwin) then "no" else "yes";
+  env.USE_SONAME = lib.boolToYesNo (!stdenv.hostPlatform.isDarwin);
 
   passthru = {
     tests = {
diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/by-name/mu/muse/package.nix
similarity index 93%
rename from pkgs/applications/audio/muse/default.nix
rename to pkgs/by-name/mu/muse/package.nix
index 5bf3612596b2..411bc19c4c0f 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/by-name/mu/muse/package.nix
@@ -5,8 +5,6 @@
   cmake,
   extra-cmake-modules,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
   alsa-lib,
   dssi,
   fluidsynth,
@@ -20,11 +18,11 @@
   lilv,
   lrdf,
   lv2,
-  qtsvg,
   rtaudio,
   rubberband,
   sord,
   serd,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "muse-sequencer";
     repo = "muse";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
   };
 
@@ -44,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     extra-cmake-modules
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -62,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     lilv
     lrdf
     lv2
-    qtsvg
+    libsForQt5.qtsvg
     rtaudio
     rubberband
     sord
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/by-name/mu/musescore/package.nix
similarity index 80%
rename from pkgs/applications/audio/musescore/default.nix
rename to pkgs/by-name/mu/musescore/package.nix
index 3d57250f978d..49d15577716c 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -5,7 +5,6 @@
   fetchpatch,
   cmake,
   wrapGAppsHook3,
-  wrapQtAppsHook,
   pkg-config,
   ninja,
   alsa-lib,
@@ -19,32 +18,38 @@
   libvorbis,
   portaudio,
   portmidi,
-  qtbase,
-  qtdeclarative,
   flac,
   libopusenc,
   libopus,
   tinyxml-2,
-  qt5compat,
-  qtwayland,
-  qtsvg,
-  qtscxml,
-  qtnetworkauth,
-  qttools,
+  kdePackages,
   nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
-    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-3VpptHR9dt8lJeFhFygnPiP0XRf4R29SASC8AicLU5E=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WLzt/Ox6GrfWD0/l8/Ksc2ptg5LZSOXXnlsSnenfZtI=";
   };
 
+  patches = [
+    # https://github.com/musescore/MuseScore/pull/30422
+    (fetchpatch {
+      url = "https://github.com/musescore/MuseScore/commit/bda5eac091bca1db15fbe9546b2d71b7e8a126c8.patch";
+      hash = "sha256-MTSFxmwBWaOXipeUqIFKP4Oek087oqW2MQvltV9vAgA=";
+    })
+    # https://github.com/musescore/MuseScore/pull/30691
+    (fetchpatch {
+      url = "https://github.com/musescore/MuseScore/commit/840f8b7ded19cdc5d2dc78d32e396494aaf8c4c0.patch";
+      hash = "sha256-MfHLFQbgvgNTd5G3mxCMlS7bF8LrNWMLZUQ+A21l/RM=";
+    })
+  ];
+
   cmakeFlags = [
     "-DMUSE_APP_BUILD_MODE=release"
     # Disable the build and usage of the `/bin/crashpad_handler` utility - it's
@@ -87,9 +92,9 @@ stdenv.mkDerivation (finalAttrs: {
   dontWrapGApps = true;
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     cmake
-    qttools
+    kdePackages.qttools
     pkg-config
     ninja
   ]
@@ -113,16 +118,16 @@ stdenv.mkDerivation (finalAttrs: {
     libopusenc
     libopus
     tinyxml-2
-    qtbase
-    qtdeclarative
-    qt5compat
-    qtsvg
-    qtscxml
-    qtnetworkauth
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    kdePackages.qt5compat
+    kdePackages.qtsvg
+    kdePackages.qtscxml
+    kdePackages.qtnetworkauth
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
-    qtwayland
+    kdePackages.qtwayland
   ];
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -160,16 +165,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests = nixosTests.musescore;
 
-  meta = with lib; {
+  meta = {
     description = "Music notation and composition software";
     homepage = "https://musescore.org/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       vandenoever
       doronbehar
       orivej
     ];
     mainProgram = "mscore";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 7fab7e2d0482..2a6d2cb31a2b 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.2.8";
+  version = "1.2.15";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-CHdDtIEohEWKULkEZMs2+fsQR0HL++ejdCL2KA9SXt0=";
+    hash = "sha256-NP9ow5CUr2JNzajj2IOiWmcXs1hTbuHTufa64pbj+l4=";
   };
 
-  vendorHash = "sha256-iltf6TVTzMhNpQxLtp/wqOCVXeJCmPvmlfWARbNgc4g=";
+  vendorHash = "sha256-napF55nA/9P8l5lddnEHQMjLXWSyTzgblIQCbSZ20MA=";
 
   sourceRoot = "${finalAttrs.src.name}/server";
 
diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix
index f1d0308166cb..2732e5d4bdac 100644
--- a/pkgs/by-name/mu/music-assistant/frontend.nix
+++ b/pkgs/by-name/mu/music-assistant/frontend.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "music-assistant-frontend";
-  version = "2.15.1";
+  version = "2.15.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "music_assistant_frontend";
     inherit version;
-    hash = "sha256-l6SKBMqP2FrjVUmywDXf0I4Te0qbzufUVR7frWAzrks=";
+    hash = "sha256-atwFGd6KplVPw4e6rHrNlXmMCsozL56lCVYVWCg9RPs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/mu/music-assistant/librespot.patch b/pkgs/by-name/mu/music-assistant/librespot.patch
index 5e130993be65..eabb310dd5f6 100644
--- a/pkgs/by-name/mu/music-assistant/librespot.patch
+++ b/pkgs/by-name/mu/music-assistant/librespot.patch
@@ -1,25 +1,26 @@
 diff --git a/music_assistant/providers/spotify/helpers.py b/music_assistant/providers/spotify/helpers.py
-index 8b6c4e78f5f3f64c9dc6206028177c99ed0542ed..25ed6e468b393d2da74167e3c2ac4bdcd2e2699e 100644
+index 6f87b44f46b64805ef6799a54d596fd1684017f1..23de7fc2145619dd4f02551e81cb383f2b79fa15 100644
 --- a/music_assistant/providers/spotify/helpers.py
 +++ b/music_assistant/providers/spotify/helpers.py
 @@ -4,6 +4,7 @@ from __future__ import annotations
-
+ 
  import os
  import platform
 +from shutil import which
-
+ 
  from music_assistant.helpers.process import check_output
-
+ 
 @@ -20,12 +21,8 @@ async def get_librespot_binary() -> str:
          except OSError:
              return None
-
+ 
 -    base_path = os.path.join(os.path.dirname(__file__), "bin")
 -    system = platform.system().lower().replace("darwin", "macos")
 -    architecture = platform.machine().lower()
 -
-     if bridge_binary := await check_librespot(
+     if librespot_binary := await check_librespot(
 -        os.path.join(base_path, f"librespot-{system}-{architecture}")
 +        which("librespot")
      ):
-         return bridge_binary
+         return librespot_binary
+ 
diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index 4faee79f70f4..d85831328d30 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -15,13 +15,13 @@ let
       music-assistant-frontend = self.callPackage ./frontend.nix { };
 
       music-assistant-models = super.music-assistant-models.overridePythonAttrs (oldAttrs: rec {
-        version = "1.1.45";
+        version = "1.1.47";
 
         src = fetchFromGitHub {
           owner = "music-assistant";
           repo = "models";
           tag = version;
-          hash = "sha256-R1KkMe9dVl5J1DjDsFhSYVebpiqBkXZSqkLrd7T8gFg=";
+          hash = "sha256-NNKF61CRBe+N9kY+JUa77ClHSJ9RhpsiheMg7Ytyq2M=";
         };
 
         postPatch = ''
@@ -47,14 +47,14 @@ assert
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.5.8";
+  version = "2.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     tag = version;
-    hash = "sha256-7Q+BYw7wnT7QdqrDjagaxupzD0iKTc26z4TfxNtugdA=";
+    hash = "sha256-mNSTXMQDG5LiP3Bv9GGy2AO1bQfpFLH8tSCOB/wAzOU=";
   };
 
   patches = [
@@ -193,7 +193,10 @@ python.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/music-assistant/server";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [
+      hexa
+      emilylange
+    ];
     mainProgram = "mass";
   };
 }
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index ef0d35c06fde..97344f585851 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,10 +1,14 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.5.8";
+  version = "2.6.2";
   providers = {
     airplay = ps: [
     ];
+    alexa =
+      ps: with ps; [
+        alexapy
+      ];
     apple_music = ps: [
     ]; # missing pywidevine
     audible =
@@ -68,8 +72,17 @@
       ];
     listenbrainz_scrobble = ps: [
     ]; # missing liblistenbrainz
+    lrclib = ps: [
+    ];
     musicbrainz = ps: [
     ];
+    musiccast =
+      ps: with ps; [
+        aiomusiccast
+        setuptools
+      ];
+    nugs = ps: [
+    ];
     opensubsonic =
       ps: with ps; [
         py-opensonic
@@ -117,6 +130,8 @@
       ps: with ps; [
         aioslimproto
       ];
+    subsonic_scrobble = ps: [
+    ];
     template_player_provider = ps: [
     ];
     test = ps: [
diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix
index 840ed7f1d55e..af9e46e70de3 100644
--- a/pkgs/by-name/mu/mutter/package.nix
+++ b/pkgs/by-name/mu/mutter/package.nix
@@ -19,7 +19,6 @@
   libadwaita,
   libxcvt,
   libGL,
-  libICE,
   libX11,
   libXcomposite,
   libXcursor,
@@ -27,8 +26,6 @@
   libXext,
   libXfixes,
   libXi,
-  libXtst,
-  libxkbfile,
   xkeyboard_config,
   libxkbcommon,
   libxcb,
@@ -39,9 +36,11 @@
   libdrm,
   libgbm,
   libei,
+  libepoxy,
   libdisplay-info,
   gsettings-desktop-schemas,
   glib,
+  libglycin,
   atk,
   gtk4,
   fribidi,
@@ -72,7 +71,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mutter";
-  version = "48.4";
+  version = "49.0";
 
   outputs = [
     "out"
@@ -83,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz";
-    hash = "sha256-EYnPfmPMh8/dHzqG6PFNl8M9ap2iVPI+gWVVSbbFDZM=";
+    hash = "sha256-8Q727SA2ZzcwRhQz4R4L46vHRg0yOz6HCTtsOXLBYzU=";
   };
 
   mesonFlags = [
@@ -131,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     egl-wayland
     glib
+    libglycin
     gnome-desktop
     gnome-settings-daemon
     gsettings-desktop-schemas
@@ -139,8 +139,10 @@ stdenv.mkDerivation (finalAttrs: {
     harfbuzz
     libcanberra
     libdrm
+    libadwaita
     libgbm
     libei
+    libepoxy
     libdisplay-info
     libGL
     libgudev
@@ -159,7 +161,6 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-protocols
     # X11 client
     gtk4
-    libICE
     libX11
     libXcomposite
     libXcursor
@@ -167,8 +168,6 @@ stdenv.mkDerivation (finalAttrs: {
     libXext
     libXfixes
     libXi
-    libXtst
-    libxkbfile
     xkeyboard_config
     libxkbcommon
     libxcb
@@ -176,8 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
     libXinerama
     libXau
 
-    # for gdctl shebang
+    # for gdctl and gnome-service-client shebangs
     (python3.withPackages (pp: [
+      pp.dbus-python
       pp.pygobject3
       pp.argcomplete
     ]))
@@ -206,7 +206,7 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
 
   passthru = {
-    libmutter_api_version = "16"; # bumped each dev cycle
+    libmutter_api_version = "17"; # bumped each dev cycle
     libdir = "${finalAttrs.finalPackage}/lib/mutter-${finalAttrs.passthru.libmutter_api_version}";
 
     tests = {
diff --git a/pkgs/by-name/mv/mvfst/package.nix b/pkgs/by-name/mv/mvfst/package.nix
index 01a9af81b1c8..65952f295588 100644
--- a/pkgs/by-name/mv/mvfst/package.nix
+++ b/pkgs/by-name/mv/mvfst/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mvfst";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   outputs = [
     "bin"
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebook";
     repo = "mvfst";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZgzqkR72xtO5VVd2cyMM3vSsUWdW6HEvu9T1sM+cPi8=";
+    hash = "sha256-bsg+Zqv+aEDH6r6lZazCG25Wj2zG/VSgpmEOKrb44/k=";
   };
 
   patches = [
@@ -126,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
       ris
       emily
       techknowlogick
+      lf-
     ];
   };
 })
diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index b283d864ecbc..f9edcc2c83a8 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -20,7 +20,6 @@
   versionCheckHook,
   mydumper,
 }:
-
 stdenv.mkDerivation rec {
   pname = "mydumper";
   version = "0.20.1-2";
@@ -82,7 +81,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # as of mydumper v0.14.5-1, mydumper tries to install its config to /etc
     substituteInPlace CMakeLists.txt\
-      --replace-fail "/etc" "$out/etc"
+      --replace-fail "/etc" "$out/etc" \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   # copy man files & docs over
diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index bbd822c31a56..69db57b6e89b 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.11.4";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-1tJPYLo14LPwd7mtNTvr6YMGz0s+K6aN9Hung/N9lrM=";
+    hash = "sha256-nVm5AmfKfoBDBIFt2g4PXc5Ff2kbrBGTThqdpslpYow=";
   };
 
-  vendorHash = "sha256-k/EeQdThF8pgeY9RI012kjlEZkVVcnanL6L8UBrQTUI=";
+  vendorHash = "sha256-jprXaNd/S2fJcejSG5nH7rvg/yNmRRRgCOkJrUkiwmY=";
 
   subPackages = ".";
 
diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix
new file mode 100644
index 000000000000..9d7907a58b51
--- /dev/null
+++ b/pkgs/by-name/my/mymake/package.nix
@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mymake";
+  version = "2.4.1";
+
+  src = fetchFromGitHub {
+    owner = "fstromback";
+    repo = "mymake";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FVY6Ep6619W3fMDRYdU/FdnltNUahkY33aVhz8kXEGU=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    ./compile.sh mm
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 mm $out/bin/mm
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for compiling and running programs with minimal configuration";
+    homepage = "https://github.com/fstromback/mymake";
+    maintainers = [ lib.maintainers.nobbele ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "mm";
+  };
+})
diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix
index e6157a23c26f..819ad8a5e463 100644
--- a/pkgs/by-name/my/mympd/package.nix
+++ b/pkgs/by-name/my/mympd/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mympd";
-  version = "22.1.1";
+  version = "22.1.2";
 
   src = fetchFromGitHub {
     owner = "jcorporation";
     repo = "myMPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-EMKr4haye49P4M8/tAAA/IfWP4LqDB6Bp9QQHzYQ3pc=";
+    sha256 = "sha256-jgRzfVwVf6QOBGAsKNm9f8YqWBWd0KMJj0FTFcnu4NM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/my/mypaint/package.nix b/pkgs/by-name/my/mypaint/package.nix
index 1bd95b060598..a5473c7adf8d 100644
--- a/pkgs/by-name/my/mypaint/package.nix
+++ b/pkgs/by-name/my/mypaint/package.nix
@@ -76,6 +76,25 @@ buildPythonApplication rec {
       url = "https://github.com/mypaint/mypaint/commit/5496b1cd1113fcd46230d87760b7e6b51cc747bc.patch";
       hash = "sha256-h+sE1LW04xDU2rofH5KqXsY1M0jacfBNBC+Zb0i6y1w=";
     })
+    # Format source so the later patches apply
+    (fetchpatch {
+      url = "https://github.com/mypaint/mypaint/commit/69d1d553034a31c0a466050a4acb323787dd04e6.patch";
+      hash = "sha256-nziaPgfZRzPUvQEyQUM4FQbasHLFFT88H8qucbYI0pA=";
+      includes = [
+        "lib/strokemap.py"
+        "lib/stroke.py"
+      ];
+    })
+    # Fix numpy deprecation
+    (fetchpatch {
+      url = "https://github.com/mypaint/mypaint/commit/2a92b6baf452aba2cff3cc0a7782b301da3933d7.patch";
+      hash = "sha256-IkzdrA3pmeiihDOMzqIfc3uDd/wO3cI6dT+cVVhaQcI=";
+    })
+    # Fix numpy deprecation
+    (fetchpatch {
+      url = "https://github.com/mypaint/mypaint/commit/ab017e073e83a4930a0fb09608682bf4b7ab1874.patch";
+      hash = "sha256-7OFqH75/gJYRJ1vROUDIkUqoBowAolBYQ5anWtp228o=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index c7ed5567b802..22a1752e0df7 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.4.6";
+  version = "8.4.7";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c=";
+    hash = "sha256-wL8zqUzbkI8UmuoHl6/7GxOSYszw4Ll4ehckYgdULmk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index d4cd1ba5bd23..bdeed4d7195c 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -17,19 +17,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.114.4";
+  version = "1.117.3";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-GIY8Gokbp03LJT0kBx3KR8U/4bi10WrXAzO2zuctlFY=";
+    hash = "sha256-zCwQ+f0BklDBKQrdxZqE7mlG3gzZ78rQeHUKpDrd8EU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-Kw3t+B0+zoxhpCr5INvWrJwSBqHwFzlTCcZknFNbOg0=";
+    hash = "sha256-GJ8lKqfsVoA/znPU7r4AsDZdnP+VqmzJpFVLV8RvBps=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix
index 6f7a1aed64ad..1321c2f02bbb 100644
--- a/pkgs/by-name/na/nagios/package.nix
+++ b/pkgs/by-name/na/nagios/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nagios";
-  version = "4.5.9";
+  version = "4.5.10";
 
   src = fetchFromGitHub {
     owner = "NagiosEnterprises";
     repo = "nagioscore";
     tag = "nagios-${finalAttrs.version}";
-    hash = "sha256-aOHdMZJCrGeJ3XA3+ed3JUb7X1FdfdGiT2ytzBDAT4c=";
+    hash = "sha256-NnGnatzu/iFKFaofg0O2gqDqkQwg/jrBLgSmrWqef5Q=";
   };
 
   patches = [ ./nagios.patch ];
diff --git a/pkgs/by-name/na/naja/package.nix b/pkgs/by-name/na/naja/package.nix
index b804f38bec7f..07e8146bd060 100644
--- a/pkgs/by-name/na/naja/package.nix
+++ b/pkgs/by-name/na/naja/package.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "naja";
-  version = "0.2.2";
+  version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "najaeda";
     repo = "naja";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cm9MwN60R/K2bL4FWpvusFmb2ENYEYg8NcMVgmeTj0c=";
+    hash = "sha256-NqxgFAD/JHh1rgtuv/NTda5oEx79NgdafL3fDLJO2kU=";
     fetchSubmodules = true;
   };
 
@@ -39,11 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/CMakeLists.txt \
       --replace-fail 'DESTINATION cmake' 'DESTINATION ''${CMAKE_INSTALL_LIBDIR}/cmake'
 
-    # Fix install location for bne library & headers
-    # Remove when https://github.com/najaeda/naja/pull/278 merged & in release
-    substituteInPlace src/bne/CMakeLists.txt \
-      --replace-fail 'LIBRARY DESTINATION lib' 'LIBRARY DESTINATION ''${CMAKE_INSTALL_LIBDIR}' \
-      --replace-fail 'PUBLIC_HEADER DESTINATION include' 'PUBLIC_HEADER DESTINATION ''${CMAKE_INSTALL_INCLUDEDIR}'
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.21)" \
+      "cmake_minimum_required(VERSION 4.0)"
   ''
   # disable building tests for cross build
   + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
@@ -57,6 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs --build test/test_utils/diff_files.py
   '';
 
+  env.NIX_CFLAGS_COMPILE = toString (
+    lib.optionals stdenv.cc.isClang [
+      "-Wno-character-conversion"
+    ]
+  );
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix
index 993d10579855..684d11a43604 100644
--- a/pkgs/by-name/na/nakama/package.nix
+++ b/pkgs/by-name/na/nakama/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nakama";
-  version = "3.32.0";
+  version = "3.33.1";
 
   src = fetchFromGitHub {
     owner = "heroiclabs";
     repo = "nakama";
     tag = "v${version}";
-    hash = "sha256-Ly8NYqaJIC/ySPrCiEwwWR3+Zyk6dEW0r7SeyOS1CwE=";
+    hash = "sha256-e+Z8BmEbBJazSorIYuVIbrwKHATN9SWTBOh60ol/c8g=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix
index ee2e337c3eb3..6810ab0fef2b 100644
--- a/pkgs/by-name/na/namaka/package.nix
+++ b/pkgs/by-name/na/namaka/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/namaka";
     changelog = "https://github.com/nix-community/namaka/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 3bde8bdd197d..4cc28e2f5bae 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.441";
+  version = "0.0.447";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-qnKt6tXHHPt1uB9JY70atnOLwXgal0YO9n2w60S8lJk=";
+    hash = "sha256-edof/vP/v1IpqMHT6iw75KLucti6vMbE6VH6HI0KJFE=";
   };
 
-  vendorHash = "sha256-p3ciuSL3lJHLbWVsfKiaKZ+gjxCZCOBhXcucxBUVIEs=";
+  vendorHash = "sha256-bUKtHQcD8wq1VH5plbP8KXt+HXb/FoFKeqw6Ud15ZNw=";
 
   subPackages = [
     "cmd/nsc"
diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix
index dcad1610d292..8c50f2bfd68f 100644
--- a/pkgs/by-name/na/nanodbc/package.nix
+++ b/pkgs/by-name/na/nanodbc/package.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];
@@ -38,5 +41,6 @@ stdenv.mkDerivation rec {
     description = "Small C++ wrapper for the native C ODBC API";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.bzizou ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix
index a365ce02aae1..ef1f0e3db184 100644
--- a/pkgs/by-name/na/nanomq/package.nix
+++ b/pkgs/by-name/na/nanomq/package.nix
@@ -49,13 +49,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nanomq";
-  version = "0.23.6";
+  version = "0.24.5";
 
   src = fetchFromGitHub {
     owner = "emqx";
     repo = "nanomq";
     tag = finalAttrs.version;
-    hash = "sha256-Fy/9ASpQ/PHGItYhad69DdHWqCr/Wa+Xdm53Q573Pfc=";
+    hash = "sha256-tyhAEYdYCO0Tur7HDXXbBSQ8tzTHCbW9B8aBu0sMEEI=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/na/nanotts/package.nix b/pkgs/by-name/na/nanotts/package.nix
index c1a246a67262..bb6422750d1d 100644
--- a/pkgs/by-name/na/nanotts/package.nix
+++ b/pkgs/by-name/na/nanotts/package.nix
@@ -35,6 +35,10 @@ stdenv.mkDerivation {
   ];
 
   patchPhase = ''
+    # fix 64-bit compilation error in picoapi.c: picoos_uint32 vs picoos_objsize_t
+    substituteInPlace svoxpico/picoapi.c \
+      --replace-fail 'picoos_uint32 rest_mem_size;' 'picoos_objsize_t rest_mem_size;'
+
     substituteInPlace "src/main.cpp" --replace "/usr/share/pico/lang" "$out/share/lang"
     echo "" > update_build_version.sh
   '';
@@ -46,6 +50,11 @@ stdenv.mkDerivation {
       --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Speech synthesizer commandline utility that improves pico2wave, included with SVOX PicoTTS";
     homepage = "https://github.com/gmn/nanotts";
diff --git a/pkgs/by-name/na/nativefiledialog-extended/package.nix b/pkgs/by-name/na/nativefiledialog-extended/package.nix
new file mode 100644
index 000000000000..d9ff1ca3b206
--- /dev/null
+++ b/pkgs/by-name/na/nativefiledialog-extended/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  SDL2,
+  SDL2_ttf,
+  gtk3,
+  testers,
+  enableShared ? !stdenv.hostPlatform.isStatic,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nativefiledialog-extended";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "btzy";
+    repo = "nativefiledialog-extended";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    SDL2_ttf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gtk3
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "nfd_ROOT_PROJECT" true)
+    (lib.cmakeBool "NFD_BUILD_TESTS" true)
+    (lib.cmakeBool "NFD_BUILD_SDL2_TESTS" true)
+    (lib.cmakeBool "NFD_INSTALL" true)
+  ];
+
+  # NOTE: Although the tests have been compiled, they still require GUI
+  # interactions. Let's disable running them for now.
+  doCheck = false;
+
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      package = finalAttrs.finalPackage;
+      moduleNames = [ "nfd" ];
+    };
+  };
+
+  meta = {
+    homepage = "https://github.com/btzy/nativefiledialog-extended";
+    description = "Cross platform native file dialog library with C and C++ bindings";
+    longDescription = ''
+      A small C library with that portably invokes native file open, folder
+      select and file save dialogs. Write dialog code once and have it pop up
+      native dialogs on all supported platforms. Avoid linking large
+      dependencies like wxWidgets and Qt.
+    '';
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ yzx9 ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+})
diff --git a/pkgs/by-name/na/nats-streaming-server/package.nix b/pkgs/by-name/na/nats-streaming-server/package.nix
deleted file mode 100644
index 9f6da2be4195..000000000000
--- a/pkgs/by-name/na/nats-streaming-server/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  buildGoModule,
-  fetchFromGitHub,
-  lib,
-}:
-
-buildGoModule rec {
-  pname = "nats-streaming-server";
-  version = "0.25.6";
-
-  src = fetchFromGitHub {
-    rev = "v${version}";
-    owner = "nats-io";
-    repo = "nats-streaming-server";
-    sha256 = "sha256-i5fNxeJQXiyy+9NOGT1X68u9Pztxvnnba64rxIgjbZc=";
-  };
-
-  vendorHash = "sha256-r6RDHGAt83sKyMHvG3927rZroWdnTQFb8zTrmlc0W5U=";
-
-  # tests fail and ask to `go install`
-  doCheck = false;
-
-  meta = with lib; {
-    description = "NATS Streaming System Server";
-    license = licenses.asl20;
-    maintainers = [ maintainers.swdunlop ];
-    homepage = "https://nats.io/";
-    mainProgram = "nats-streaming-server";
-  };
-}
diff --git a/pkgs/by-name/na/natscli/package.nix b/pkgs/by-name/na/natscli/package.nix
index 4288ac816353..14f3fee1db43 100644
--- a/pkgs/by-name/na/natscli/package.nix
+++ b/pkgs/by-name/na/natscli/package.nix
@@ -36,14 +36,17 @@ buildGoModule rec {
   '';
 
   doInstallCheck = true;
-  versionCheckProgram = "${placeholder "out"}/bin/nats";
+  versionCheckProgramArg = "--version";
 
   meta = {
     description = "NATS Command Line Interface";
     homepage = "https://github.com/nats-io/natscli";
     changelog = "https://github.com/nats-io/natscli/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ fab ];
+    maintainers = with lib.maintainers; [
+      bengsparks
+      fab
+    ];
     mainProgram = "nats";
   };
 }
diff --git a/pkgs/by-name/na/nautilus-python/package.nix b/pkgs/by-name/na/nautilus-python/package.nix
index decd2c848b6e..e9a76b856ad9 100644
--- a/pkgs/by-name/na/nautilus-python/package.nix
+++ b/pkgs/by-name/na/nautilus-python/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nautilus-python";
-  version = "4.0.1";
+  version = "4.1.0";
 
   outputs = [
     "out"
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus-python/${lib.versions.majorMinor finalAttrs.version}/nautilus-python-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/EnBBPsyoK0ZWmawE2eEzRnRDYs+jVnV7n9z6PlOko8=";
+    hash = "sha256-/EpEi8yxoJtohlQJueKu0XHSii1ayA975E9fzKhO4ME=";
   };
 
   patches = [
diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix
index 0fad8a9d816d..e969fca3aaf2 100644
--- a/pkgs/by-name/na/nautilus/package.nix
+++ b/pkgs/by-name/na/nautilus/package.nix
@@ -18,6 +18,7 @@
   adwaita-icon-theme,
   gnome-autoar,
   glib-networking,
+  icu,
   shared-mime-info,
   libnotify,
   libexif,
@@ -40,7 +41,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nautilus";
-  version = "48.3";
+  version = "49.0";
 
   outputs = [
     "out"
@@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz";
-    hash = "sha256-IaKuoAUWDbCDx6HU0sCYm4RcxyLATvnrtgElp+xbOT0=";
+    hash = "sha256-sxKScENPx8Uz+X7X+MRCcE8AoC0nopCALY0Wq0Kha/g=";
   };
 
   patches = [
@@ -74,6 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     gexiv2
     glib-networking
+    icu
     gnome-desktop
     adwaita-icon-theme
     gsettings-desktop-schemas
diff --git a/pkgs/by-name/na/nav/package.nix b/pkgs/by-name/na/nav/package.nix
index 0a1d021f5bb0..72f350e4ef03 100644
--- a/pkgs/by-name/na/nav/package.nix
+++ b/pkgs/by-name/na/nav/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "nav";
-  version = "1.4.5";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "https://github.com/Jojo4GH/nav/releases/download/v${version}/nav-${stdenv.hostPlatform.parsed.cpu.name}-unknown-linux-gnu.tar.gz";
     sha256 =
       {
-        x86_64-linux = "sha256-N0C2rLKMNIgheNTjTStWOYliNuMKPPoxqtLAQSVV14Y=";
-        aarch64-linux = "sha256-kl+CtXXmgF9gU5auFIDCV2BOZFWh05XfE8OtbDBnrs0=";
+        x86_64-linux = "sha256-LQdw8/V1KFNM6TY1rFt/RiZuiRQXM+8HNGkJXDrE/mw=";
+        aarch64-linux = "sha256-SMcdnUxKbJ5GXB358WglIMiPHWsn1uVnjN9UiL3V6dk=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index cc42ed4057d7..22a419a60da1 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -3,35 +3,130 @@
   stdenv,
   fetchurl,
   appimageTools,
+  autoPatchelfHook,
+  qt6,
+  cjson,
+  curl,
+  e2fsprogs,
+  expat,
+  fontconfig,
+  freetype,
+  glib,
+  glibc,
+  harfbuzz,
+  libGL,
+  libX11,
+  libgpg-error,
+  libselinux,
+  libxcb,
+  libxcrypt,
+  libxcrypt-legacy,
+  libxkbcommon,
+  p11-kit,
+  pango,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "navicat-premium";
-  version = "17.3.1";
+  version = "17.3.3";
 
-  src =
-    {
-      x86_64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250904095427/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
-        hash = "sha256-5vGctpbAg3mVhalr+Yg3iFZNCyY+0+a98sldhUcHkm0=";
-      };
-      aarch64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250904095643/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
-        hash = "sha256-r31u/b/3HO9PEQtIr9AZ/5NVrRcgJ+GACHPWCICZYec=";
-      };
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
+  src = appimageTools.extractType2 {
+    inherit (finalAttrs) pname version;
+    src =
+      {
+        x86_64-linux = fetchurl {
+          url = "https://web.archive.org/web/20251008050849/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
+          hash = "sha256-gXXj2FXOw2OHUTaX5XYtd0/nL/E/hNmcmvc0TDaOCUQ=";
+        };
+        aarch64-linux = fetchurl {
+          url = "https://web.archive.org/web/20251008051000/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
+          hash = "sha256-18JbUJV8jAXRiVVerfYZLsjy+5K2DjwqAY+Hqjtlnfg=";
+        };
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
 
-  extraInstallCommands = ''
-    cp -r ${appimageContents}/usr/share $out/share
-    substituteInPlace $out/share/applications/navicat.desktop \
-      --replace-fail "Exec=navicat" "Exec=navicat-premium"
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    cjson
+    curl
+    e2fsprogs
+    expat
+    fontconfig
+    freetype
+    glib
+    glibc
+    harfbuzz
+    libGL
+    libX11
+    libgpg-error
+    libselinux
+    libxcb
+    libxcrypt
+    libxcrypt-legacy
+    libxkbcommon
+    p11-kit
+    pango
+    qt6.qtbase
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r --no-preserve=mode usr $out
+    chmod +x $out/bin/navicat
+    mkdir -p $out/usr
+    ln -s $out/lib $out/usr/lib
+
+    runHook postInstall
+  '';
+
+  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "libgs_ktool.so"
+    "libkmc.so"
+  ];
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    rm $out/lib/libselinux.so.1
+    ln -s ${libselinux.out}/lib/libselinux.so.1 $out/lib/libselinux.so.1
+    rm $out/lib/glib/libglib-2.0.so.0
+    ln -s ${glib.out}/lib/libglib-2.0.so.0 $out/lib/glib/libglib-2.0.so.0
+    patchelf --replace-needed libcrypt.so.1 \
+      ${libxcrypt}/lib/libcrypt.so.2 $out/lib/pq-g/libpq.so.5.5
+    patchelf --replace-needed libcrypt.so.1 \
+      ${libxcrypt}/lib/libcrypt.so.2 $out/lib/pq-g/libpq_ce.so.5.5
+    patchelf --replace-needed libselinux.so.1 \
+      ${libselinux.out}/lib/libselinux.so.1 $out/lib/pq-g/libpq.so.5.5
+    wrapQtApp $out/bin/navicat \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          e2fsprogs
+          expat
+          fontconfig
+          freetype
+          glib
+          glibc
+          harfbuzz
+          libGL
+          libX11
+          libgpg-error
+          libselinux
+          libxcb
+          libxkbcommon
+          p11-kit
+          pango
+        ]
+      }:$out/lib \
+      --set QT_PLUGIN_PATH $out/plugins \
+      --set QT_QPA_PLATFORM xcb \
+      --set QT_STYLE_OVERRIDE Fusion \
+      --chdir $out
   '';
 
   meta = {
@@ -47,4 +142,4 @@ appimageTools.wrapType2 {
     ];
     mainProgram = "navicat-premium";
   };
-}
+})
diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix
index 74d724b86842..b141d364fc70 100644
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@@ -8,17 +8,18 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nb-cli";
-  version = "1.4.2";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "nb_cli";
     inherit version;
-    hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8=";
+    hash = "sha256-vZxBjavim4xNp24s7hNsoZK7xoeRJST7NvSRbRTYSz8=";
   };
 
   pythonRelaxDeps = [
     "watchfiles"
+    "noneprompt"
   ];
 
   build-system = [
@@ -35,8 +36,10 @@ python3.pkgs.buildPythonApplication rec {
     importlib-metadata
     jinja2
     noneprompt
+    nonestorage
     pydantic
     pyfiglet
+    textual
     tomlkit
     typing-extensions
     virtualenv
diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index b8ad06aba369..cf69d9776b35 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nb";
-  version = "7.22.1";
+  version = "7.23.0";
 
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
     rev = version;
-    hash = "sha256-WYOU4ybcuZa45P68r6NlhMYii1YUvCTmYicpVuGg7BM=";
+    hash = "sha256-n94ZEQtkTXItZ3T6T3W181IH3wU8xWznGqsizTdu4a8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 850f03521303..8e9003322412 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34=";
+    hash = "sha256-6RE1KBy2ZWnyykwLrCdyRpkeflJSTAyoy6PeXI6Bzsk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix
index 8ee45785f8cd..8f544f0d79a5 100644
--- a/pkgs/by-name/nc/nchat/package.nix
+++ b/pkgs/by-name/nc/nchat/package.nix
@@ -13,7 +13,6 @@
   gperf,
   nix-update-script,
   withWhatsApp ? true,
-  apple-sdk_12,
 }:
 
 let
@@ -88,10 +87,6 @@ stdenv.mkDerivation rec {
     readline
     sqlite
     zlib
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # For SecTrustCopyCertificateChain, see https://github.com/NixOS/nixpkgs/pull/445063#pullrequestreview-3261846621
-    apple-sdk_12
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/nd/ndcurves/package.nix b/pkgs/by-name/nd/ndcurves/package.nix
index 1e796003d29c..ba6732ab08e6 100644
--- a/pkgs/by-name/nd/ndcurves/package.nix
+++ b/pkgs/by-name/nd/ndcurves/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ndcurves";
-  version = "2.0.0";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "loco-3d";
     repo = "ndcurves";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dDH2XpnlBlhG5Q8N9Aljxvf/K9jFuiAx0lyBIcXNOZE=";
+    hash = "sha256-VHxGm6fzoS51PtTj/qeZumz58ZHtxy28ihbzbnoHvHg=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/nd/ndi-6/version.json b/pkgs/by-name/nd/ndi-6/version.json
index edbc456e9e4a..3e21f17ec6bd 100644
--- a/pkgs/by-name/nd/ndi-6/version.json
+++ b/pkgs/by-name/nd/ndi-6/version.json
@@ -1 +1 @@
-{"hash": "sha256-C99mJkUn+L43+iLt3SuFFLmGilik2D+AoH2+tHnuFNQ=", "version": "6.2.0"}
+{"hash": "sha256:0bdf66264527f8be37fa22eddd2b8514b9868a58a4d83f80a07dbeb479ee14d4", "version": "6.2.1.0"}
diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index 8bf13bf0495e..754c14f64de4 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.33.1-19314669";
+  version = "1.0.2-20664049";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-K9FA4I8dooq1dC+Wnn24AACx49Jh/32sPp3f+IefYzM=";
+    hash = "sha256-VgTAFxdI4YnTG1oOwrQpqIfKO6cf7o3NmGjcp7QZFK4=";
   };
 
   # removing packaged jre since we use our own
diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix
index d31162a9ef91..962726cc8abd 100644
--- a/pkgs/by-name/ne/nelm/package.nix
+++ b/pkgs/by-name/ne/nelm/package.nix
@@ -9,24 +9,23 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.13.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g/JnFD1TPVKllY1yrODJ9P0bJe2357B11XAn9tQPLE8=";
+    hash = "sha256-PDWx/J6OmF5/daZr5c66CD3uMjS8GL3U1dRwMlXjS5Y=";
   };
 
-  vendorHash = "sha256-yd9qSQi7ktbI9b5eaTc98TjhxDsBVvh9qrf3+F2Twu4=";
+  vendorHash = "sha256-+57gKrXOzlKH5VRdZyKxOyg90aSKowPO9JPHVN92/GA=";
 
   subPackages = [ "cmd/nelm" ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/werf/nelm/internal/common.Brand=Nelm"
-    "-X github.com/werf/nelm/internal/common.Version=${finalAttrs.version}"
+    "-X github.com/werf/nelm/pkg/common.Version=${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/ne/nemorosa/package.nix b/pkgs/by-name/ne/nemorosa/package.nix
new file mode 100644
index 000000000000..113ec322d796
--- /dev/null
+++ b/pkgs/by-name/ne/nemorosa/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "nemorosa";
+  version = "0.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KyokoMiki";
+    repo = "nemorosa";
+    tag = version;
+    hash = "sha256-qirdikSJ5APEmPnRwGCEuc8E+J3AOd4uHO68VtmkDRA=";
+  };
+
+  # Upstream uses overly strict, fresh version specifiers
+  pythonRelaxDeps = true;
+
+  # `build-system` requirements are seemingly not covered by pythonRelaxDeps
+  postPatch = ''
+    sed -i 's/requires = \["uv_build.*"\]/requires = ["uv_build"]/' pyproject.toml
+  '';
+
+  build-system = with python3Packages; [ uv-build ];
+
+  dependencies =
+    with python3Packages;
+    [
+      aiolimiter
+      apscheduler
+      beautifulsoup4
+      defusedxml
+      deluge-client
+      fastapi
+      httpx
+      humanfriendly
+      msgspec
+      platformdirs
+      qbittorrent-api
+      reflink-copy
+      sqlalchemy
+      torf
+      transmission-rpc
+      uvicorn
+      uvloop
+    ]
+    ++ beautifulsoup4.optional-dependencies.lxml
+    ++ msgspec.optional-dependencies.yaml
+    ++ sqlalchemy.optional-dependencies.aiosqlite
+    ++ uvicorn.optional-dependencies.standard;
+
+  pythonImportsCheck = [ "nemorosa" ];
+
+  meta = {
+    description = "Specialized cross-seeding tool designed for music torrents";
+    homepage = "https://github.com/KyokoMiki/nemorosa";
+    changelog = "https://github.com/KyokoMiki/nemorosa/releases";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ambroisie ];
+    mainProgram = "nemorosa";
+  };
+}
diff --git a/pkgs/by-name/ne/nemu/package.nix b/pkgs/by-name/ne/nemu/package.nix
index 0ec873b2faac..329754fe2c1b 100644
--- a/pkgs/by-name/ne/nemu/package.nix
+++ b/pkgs/by-name/ne/nemu/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nemu";
-  version = "3.3.1";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "nemuTUI";
     repo = "nemu";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6WzqBkspKKs1e8kg1i71ntZHa78s5pJ1u02mXvzpiEc=";
+    hash = "sha256-QvyCBHZmahZPIghPX53HcL5HsOVvhsVwdMZosVQ9A5U=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
index 23329c6dfa89..2639474d60a3 100644
--- a/pkgs/by-name/ne/neocmakelsp/package.nix
+++ b/pkgs/by-name/ne/neocmakelsp/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "neocmakelsp";
-  version = "0.8.25";
+  version = "0.8.26";
 
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "neocmakelsp";
     rev = "v${version}";
-    hash = "sha256-6VGF2sbd/yhm+bxYDikfmXtg2iyKaVaidra2eo0ZP40=";
+    hash = "sha256-fJmkCi2xG0cJUxolhuT4Kuf0kK5tFLHcM9eFE1BDeFQ=";
   };
 
-  cargoHash = "sha256-khxTrAPeI7aaNHUE9jHuHoUpnkpcvfSlUyU/ShZpv0Q=";
+  cargoHash = "sha256-DEIQbnNDd1JQpeVLwvpQccZlIRb/e1JTQtYdi4UsJq8=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 23ab00db9754..15efa3d48212 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "neovim-unwrapped";
-    version = "0.11.4";
+    version = "0.11.5";
 
     __structuredAttrs = true;
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (
       owner = "neovim";
       repo = "neovim";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-IpMHxIDpldg4FXiXPEY2E51DfO/Z5XieKdtesLna9Xw=";
+      hash = "sha256-OsvLB9kynCbQ8PDQ2VQ+L56iy7pZ0ZP69J2cEG8Ad8A=";
     };
 
     patches = [
diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix
index 2ea8471f8813..47e5d66fa912 100644
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ne/netassert/package.nix b/pkgs/by-name/ne/netassert/package.nix
index adb140612983..c03b11e851c3 100644
--- a/pkgs/by-name/ne/netassert/package.nix
+++ b/pkgs/by-name/ne/netassert/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "netassert";
-  version = "2.0.4";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "controlplaneio";
     repo = "netassert";
     rev = "v${version}";
-    hash = "sha256-72LwWzn9sQNbtPj8X0WsR0j0Cs0s00ogcYfQqULTffw=";
+    hash = "sha256-9uzidE/b+7UWNMAknxTdeWYKLEjWbV0V9hab18w+E10=";
   };
   vendorHash = "sha256-JuyE1pYlTIeG3IGOsvYgQN1lTAb7NWytkp/Ibh91QgA=";
 
diff --git a/pkgs/by-name/ne/netbeans/package.nix b/pkgs/by-name/ne/netbeans/package.nix
index 364ee5feebd8..3d53a6f2a506 100644
--- a/pkgs/by-name/ne/netbeans/package.nix
+++ b/pkgs/by-name/ne/netbeans/package.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "24";
+  version = "27";
   desktopItem = makeDesktopItem {
     name = "netbeans";
     exec = "netbeans";
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   inherit version;
   src = fetchurl {
     url = "mirror://apache/netbeans/netbeans/${version}/netbeans-${version}-bin.zip";
-    hash = "sha256-mzmviZuyS68SZhOAzwWOdZLveOTS5UOgY1oW+oAv9Gs=";
+    hash = "sha256-/B8qE/Dwv1L6gZ8oTPsfq+zLb3cEyQ2YDdw6UFNim8c=";
   };
 
   buildCommand = ''
diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index f9e0aa17698e..f07f06a96b5b 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.19.2";
+  version = "2.20.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-3rHNk/rc0j5mWF2jbrMOtFrDkosph1YWnFoh1lLHTPs=";
+    hash = "sha256-RvnoQRVJlZNqfmOa2c1s/ZuA0Ej7pZ7WcXM+31t22eY=";
   };
 
-  npmDepsHash = "sha256-pC4Vvkb+NAGyhd090LAeGZTLVGufnC9LylJGQt8aEZg=";
+  npmDepsHash = "sha256-93w0ZWtrLfYRBa5Ps4duSRoiI4hu9AoK7GZRRH4zmL0=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''
diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 4938520f0f1e..cc9f217885c5 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -68,16 +68,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.59.5";
+  version = "0.59.10";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-raJXFBApLb17jiDdia60gchqayDVDbgC+hztXjz0Ofs=";
+    hash = "sha256-TsDeDHLbgnKKCROn+nih9Ne0/cRQ2noLCXiyysC9uG4=";
   };
 
-  vendorHash = "sha256-hg9vzosB6yVS0e0McekIuchWaByYS02kbbtilKjCo7s=";
+  vendorHash = "sha256-t4uXuT6soKXxpv3Li9YhXHFMHPzbl1vPx5jcc7TR2pY=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 
diff --git a/pkgs/by-name/ne/netbox_4_3/package.nix b/pkgs/by-name/ne/netbox_4_3/package.nix
index 81af0510f3ae..dc5807639598 100644
--- a/pkgs/by-name/ne/netbox_4_3/package.nix
+++ b/pkgs/by-name/ne/netbox_4_3/package.nix
@@ -121,6 +121,9 @@ py.pkgs.buildPythonApplication rec {
     description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
     mainProgram = "netbox";
     license = lib.licenses.asl20;
+    knownVulnerabilities = [
+      "Netbox Version ${version} is EOL; please upgrade by following the current release notes instructions"
+    ];
     maintainers = with lib.maintainers; [
       minijackson
       raitobezarius
diff --git a/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch b/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch
new file mode 100644
index 000000000000..c9219fa2b871
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_4/custom-static-root.patch
@@ -0,0 +1,13 @@
+diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
+index 2de06dd10..00406af48 100644
+--- a/netbox/netbox/settings.py
++++ b/netbox/netbox/settings.py
+@@ -410,7 +412,7 @@ USE_X_FORWARDED_HOST = True
+ X_FRAME_OPTIONS = 'SAMEORIGIN'
+ 
+ # Static files (CSS, JavaScript, Images)
+-STATIC_ROOT = BASE_DIR + '/static'
++STATIC_ROOT = getattr(configuration, 'STATIC_ROOT', os.path.join(BASE_DIR, 'static')).rstrip('/')
+ STATIC_URL = f'/{BASE_PATH}static/'
+ STATICFILES_DIRS = (
+     os.path.join(BASE_DIR, 'project-static', 'dist'),
diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix
new file mode 100644
index 000000000000..cd59bfeae268
--- /dev/null
+++ b/pkgs/by-name/ne/netbox_4_4/package.nix
@@ -0,0 +1,132 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3,
+  plugins ? _ps: [ ],
+  nixosTests,
+  nix-update-script,
+}:
+let
+  py = python3.override {
+    self = py;
+    packageOverrides = _final: prev: { django = prev.django_5_2; };
+  };
+
+  extraBuildInputs = plugins py.pkgs;
+in
+py.pkgs.buildPythonApplication rec {
+  pname = "netbox";
+  version = "4.4.2";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "netbox-community";
+    repo = "netbox";
+    tag = "v${version}";
+    hash = "sha256-1POwxp7BTCZo7JlGrLVGNzBGCplmhZ0Y6wujunIVGsA=";
+  };
+
+  patches = [
+    ./custom-static-root.patch
+  ];
+
+  dependencies =
+    (
+      with py.pkgs;
+      [
+        colorama
+        django
+        django-cors-headers
+        django-debug-toolbar
+        django-filter
+        django-graphiql-debug-toolbar
+        django-htmx
+        django-mptt
+        django-pglocks
+        django-prometheus
+        django-redis
+        django-rq
+        django-storages
+        django-tables2
+        django-taggit
+        django-timezone-field
+        djangorestframework
+        drf-spectacular
+        drf-spectacular-sidecar
+        feedparser
+        jinja2
+        markdown
+        netaddr
+        nh3
+        pillow
+        psycopg
+        pyyaml
+        requests
+        social-auth-core
+        social-auth-app-django
+        sorl-thumbnail
+        strawberry-graphql
+        strawberry-django
+        svgwrite
+        tablib
+
+        # Optional dependencies, kept here for backward compatibility
+
+        # for the S3 data source backend
+        boto3
+        # for Git data source backend
+        dulwich
+        # for error reporting
+        sentry-sdk
+      ]
+      ++ psycopg.optional-dependencies.c
+      ++ psycopg.optional-dependencies.pool
+      ++ social-auth-core.optional-dependencies.openidconnect
+    )
+    ++ extraBuildInputs;
+
+  nativeBuildInputs = with py.pkgs; [
+    mkdocs-material
+    mkdocs-material-extensions
+    mkdocstrings
+    mkdocstrings-python
+  ];
+
+  postBuild = ''
+    PYTHONPATH=$PYTHONPATH:netbox/
+    ${py.interpreter} -m mkdocs build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/opt/netbox
+    cp -r . $out/opt/netbox
+    chmod +x $out/opt/netbox/netbox/manage.py
+    makeWrapper $out/opt/netbox/netbox/manage.py $out/bin/netbox \
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  passthru = {
+    python = py;
+    # PYTHONPATH of all dependencies used by the package
+    pythonPath = py.pkgs.makePythonPath dependencies;
+    inherit (py.pkgs) gunicorn;
+    tests = {
+      netbox = nixosTests.netbox_4_3;
+      inherit (nixosTests) netbox-upgrade;
+    };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    homepage = "https://github.com/netbox-community/netbox";
+    changelog = "https://github.com/netbox-community/netbox/blob/${src.tag}/docs/release-notes/version-${lib.versions.majorMinor version}.md";
+    description = "IP address management (IPAM) and data center infrastructure management (DCIM) tool";
+    mainProgram = "netbox";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      minijackson
+      raitobezarius
+      transcaffeine
+    ];
+  };
+}
diff --git a/pkgs/by-name/ne/netcdfcxx4/package.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix
index b96c8f89f6ed..8f0a1c3b502f 100644
--- a/pkgs/by-name/ne/netcdfcxx4/package.nix
+++ b/pkgs/by-name/ne/netcdfcxx4/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   netcdf,
   hdf5,
   curl,
@@ -23,6 +24,11 @@ stdenv.mkDerivation rec {
     # This fix is included upstream, remove with next upgrade
     ./cmake-h5free.patch
     ./netcdf.patch
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/Unidata/netcdf-cxx4/commit/8455a69867a420cffa226978174bc0f99029bc8b.patch?full_index=1";
+      hash = "sha256-AS2nQIXEW1iSR2LAzvTB04M+kyureJAn63+mPNoCq+0=";
+    })
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix
index aa368abda7c2..645aba44e5d1 100644
--- a/pkgs/by-name/ne/netclient/package.nix
+++ b/pkgs/by-name/ne/netclient/package.nix
@@ -21,8 +21,6 @@ buildGoModule rec {
 
   buildInputs = lib.optional stdenv.hostPlatform.isLinux libX11;
 
-  hardeningEnabled = [ "pie" ];
-
   meta = {
     description = "Automated WireGuard® Management Client";
     mainProgram = "netclient";
diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix
index cda6763fd87b..db5b8c7b01c5 100644
--- a/pkgs/by-name/ne/nethack/package.nix
+++ b/pkgs/by-name/ne/nethack/package.nix
@@ -238,5 +238,6 @@ stdenvUsed.mkDerivation (finalAttrs: {
     platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix;
     maintainers = with lib.maintainers; [ iedame ];
     mainProgram = "nethack";
+    broken = if qtMode then stdenv.hostPlatform.isDarwin else false;
   };
 })
diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix
index e913e4bb00a7..cdb3a637e605 100644
--- a/pkgs/by-name/ne/netlify-cli/package.nix
+++ b/pkgs/by-name/ne/netlify-cli/package.nix
@@ -11,16 +11,23 @@
 
 buildNpmPackage rec {
   pname = "netlify-cli";
-  version = "19.0.2";
+  version = "23.9.2";
 
   src = fetchFromGitHub {
     owner = "netlify";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-+P+hS/g/xRFNvzESZ5LyxyQSSRZ7BzCg9ZX/ndNLeDg=";
+    hash = "sha256-rjxm/TrKsvYCKwoHkZRZXFpFTfLd0s0D/H6p5Bull0E=";
   };
 
-  npmDepsHash = "sha256-3C+tTqLJCm48pAbQMiIq2SsHmb4bcCaf3IU/cTeR5BA=";
+  # Prevent postinstall script from running before package is built
+  # See https://github.com/netlify/cli/blob/v23.9.2/scripts/postinstall.js#L70
+  # This currently breaks completions: https://github.com/NixOS/nixpkgs/issues/455005
+  postPatch = ''
+    touch .git
+  '';
+
+  npmDepsHash = "sha256-itzEmCOBXxspGiwxt8t6di7/EuCo2Qkl5JVSkMfUemI=";
 
   inherit nodejs;
 
diff --git a/pkgs/by-name/ne/netlify-cli/test.nix b/pkgs/by-name/ne/netlify-cli/test.nix
index 2d311105a094..cb36c91fb253 100644
--- a/pkgs/by-name/ne/netlify-cli/test.nix
+++ b/pkgs/by-name/ne/netlify-cli/test.nix
@@ -27,10 +27,15 @@ runCommand "netlify-cli-test"
     echo '/with-redirect /' >_redirects
 
     # Start a local server and wait for it to respond
-    netlify dev --offline --port 8888 2>&1 | tee log &
+    # Edge functions require specific version of Deno and internet access for other Netlify stuff
+    netlify dev --offline --internal-disable-edge-functions --port 8888 --debug 2>&1 | tee log &
     sleep 0.1 || true
     for (( i=0; i<300; i++ )); do
-      if grep --ignore-case 'Server now ready' <log; then
+      if ! jobs %% > /dev/null; then
+        echo "Server died before starting" >&2
+        exit 1
+      fi
+      if grep --ignore-case 'Local dev server ready' <log; then
         break
       else
         sleep 1
diff --git a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
index c03e224044a2..578632ad42b3 100644
--- a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--localstatedir=/var"
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix
index 423a68a9392b..cc26a788586a 100644
--- a/pkgs/by-name/ne/networkmanager-iodine/package.nix
+++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation {
   pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
-  version = "1.2.0-unstable-2025-09-06";
+  version = "1.2.0-unstable-2025-10-11";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "network-manager-iodine";
-    rev = "2a630d5c492521378160882864eb88277f6315cb";
-    sha256 = "vSvvJVWtV+BHM3rDtgUWYlIOfhP80J3uDHPMwd0vvbM=";
+    rev = "ad266003aa74ddba1d22259b213a7f9c996e1cd4";
+    sha256 = "OoJRkU4POW9RajwW05xYPlkodXqytq89GTbJuoLxebY=";
   };
 
   patches = [
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index ddb1a9ea489d..3b2a3830d5de 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--localstatedir=/var"
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
index 2fa483df360e..d9bf1c519342 100644
--- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--enable-absolute-paths"
   ];
 
diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
index fc777d2e7a77..8ea6dd63f8db 100644
--- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix
index fb44c80c5e31..b881ddf0c756 100644
--- a/pkgs/by-name/ne/networkmanager-sstp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--with-pppd-plugin-dir=$(out)/lib/pppd/2.5.0"
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
index e5eab9609e70..06c49313d36e 100644
--- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix
+++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--enable-absolute-paths"
   ];
 
diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix
index dd1d931001a2..d950c7393cc3 100644
--- a/pkgs/by-name/ne/networkmanager/package.nix
+++ b/pkgs/by-name/ne/networkmanager/package.nix
@@ -44,6 +44,7 @@
   meson,
   mesonEmulatorHook,
   ninja,
+  libnvme,
   libpsl,
   mobile-broadband-provider-info,
   runtimeShell,
@@ -53,6 +54,9 @@
   udev,
   udevCheckHook,
   withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  # NBFT (NVMe Boot Firmware Table) support, opt-in due to closure size
+  # https://github.com/NixOS/nixpkgs/pull/446121#discussion_r2380598419
+  withNbft ? false,
 }:
 
 let
@@ -60,11 +64,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "networkmanager";
-  version = "1.52.1";
+  version = "1.54.1";
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/releases/${finalAttrs.version}/downloads/NetworkManager-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ixIsc0k6cvK65SfBJc69h3EWcbkDUtvisXiKupV1rG8=";
+    hash = "sha256-APPwvhKsTUhY6/FSQwuS3vFXSAP/YQf378dkoFbUxMc=";
   };
 
   outputs = [
@@ -107,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-Dnmtui=true"
     "-Ddnsmasq=${dnsmasq}/bin/dnsmasq"
     "-Dqt=false"
+    (lib.mesonBool "nbft" withNbft)
 
     # Handlers
     "-Dresolvconf=${openresolv}/bin/resolvconf"
@@ -158,6 +163,9 @@ stdenv.mkDerivation (finalAttrs: {
     newt
     jansson
     dbus # used to get directory paths with pkg-config during configuration
+  ]
+  ++ lib.optionals withNbft [
+    libnvme
   ];
 
   propagatedBuildInputs = [
@@ -233,7 +241,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://networkmanager.dev";
     description = "Network configuration and management tool";
     license = licenses.gpl2Plus;
-    changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS";
+    changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${finalAttrs.version}/NEWS";
     maintainers = with maintainers; [
       obadz
     ];
diff --git a/pkgs/by-name/ne/networkmanagerapplet/package.nix b/pkgs/by-name/ne/networkmanagerapplet/package.nix
index 252a54c71b3e..98de9077f661 100644
--- a/pkgs/by-name/ne/networkmanagerapplet/package.nix
+++ b/pkgs/by-name/ne/networkmanagerapplet/package.nix
@@ -73,6 +73,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     chmod +x meson_post_install.py # patchShebangs requires executable file
     patchShebangs meson_post_install.py
+
+    # Prevent applet from autostarting in COSMIC, which has its own built-in network applet
+    substituteInPlace nm-applet.desktop.in \
+      --replace-fail "NotShowIn=KDE;GNOME;" "NotShowIn=KDE;GNOME;COSMIC;"
   '';
 
   passthru = {
diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index e98d0b26141c..477fdd0d8a7f 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -3,6 +3,9 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
+  cargo,
+  rustc,
   stfl,
   sqlite,
   curl,
@@ -17,7 +20,7 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "newsboat";
   version = "2.41";
 
@@ -28,19 +31,35 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-LhEhbK66OYwAD/pel81N7Hgh/xEvnFR8GlZzgqZIe5M=";
   };
 
-  cargoHash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
+  };
 
-  # TODO: Check if that's still needed
+  # fix macOS build
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/newsboat/newsboat/commit/4139a0ba1ec87e442ef1408823b07fc739742f9d.patch";
+      hash = "sha256-zdtdpUQGATq/9w+hAY/Va9Ob95c8VT2D9aKFmAF+O0c=";
+    })
+    (fetchpatch {
+      url = "https://github.com/newsboat/newsboat/commit/4eb748b6b6b63acddb3582e012442e519e8704ea.patch";
+      hash = "sha256-A/0WbuMIapTsLoziUPr95ZctIr2hW7JOJSdMVaWayYI=";
+    })
+  ];
+
+  # allow other ncurses versions on Darwin
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Allow other ncurses versions on Darwin
-    substituteInPlace config.sh \
-      --replace "ncurses5.4" "ncurses"
+    substituteInPlace config.sh --replace-fail "ncurses5.4" "ncurses"
   '';
 
   nativeBuildInputs = [
     pkg-config
     asciidoctor
     gettext
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     makeWrapper
@@ -60,12 +79,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     gettext
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ];
-
-  postBuild = ''
-    make -j $NIX_BUILD_CORES prefix="$out"
-  '';
-
   # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
   # these for all platforms, since upstream's gettext crate behavior might
   # change in the future.
@@ -73,16 +86,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
   GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin";
 
+  makeFlags = [ "prefix=$(out)" ];
+  enableParallelBuilding = true;
+
   doCheck = true;
+  checkTarget = "test";
 
-  preCheck = ''
-    make -j $NIX_BUILD_CORES test
-  '';
-
-  postInstall = ''
-    make -j $NIX_BUILD_CORES prefix="$out" install
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for prog in $out/bin/*; do
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
     done
@@ -92,13 +102,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 newsboat $out/bin/newsboat
-    install -Dm755 podboat $out/bin/podboat
-    runHook postInstall
-  '';
-
   meta = {
     homepage = "https://newsboat.org/";
     changelog = "https://github.com/newsboat/newsboat/blob/${finalAttrs.src.tag}/CHANGELOG.md";
diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 44dcf47ce335..bae7b6f8ec51 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.17.2";
+  version = "4.0.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-jBlQh5tHP+2LyFCnP0m/ud3nU40i5cWtUwSeM5auQX8=";
+    hash = "sha256-5E4VB+wZQfB8zkFtNrzpCv47iCpk6XS4rCkDKoU0JhM=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 2bd7d150ba78..c17cbca9ef66 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-talk-desktop";
-  version = "2.0.2";
+  version = "2.0.3";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-    hash = "sha256-r/1YTGBv6fqd95TIRqLLssk30KeWkHlMY51cp7YQp9o=";
+    hash = "sha256-QKbg5vHLuxLpngrHom/odWw9RK43jhZsEg7Df5c7db0=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
index a94f01778c3d..ae2a1842615a 100644
--- a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
+++ b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
@@ -8,16 +8,16 @@
 }:
 buildNpmPackage rec {
   pname = "nextcloud-whiteboard-server";
-  version = "1.1.3";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "whiteboard";
     tag = "v${version}";
-    hash = "sha256-4qk6mAFz7bYWtrlqiVPiyWF4ub4Ks9RhS5oODlOYRvA=";
+    hash = "sha256-fk+BiQ6jM/SvBioz56WHIhWGErgroCvagQq6/vMWCyk=";
   };
 
-  npmDepsHash = "sha256-WHSMK7s6vohphHoNh96yejdwXHBxdkQSpMMNiFS15E4=";
+  npmDepsHash = "sha256-x6ccAOq0yZ8DfZLIp2ZNpT8HMAjBr+e4gsEOUOskABs=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/ne/nextpnr/package.nix b/pkgs/by-name/ne/nextpnr/package.nix
index f293b4e6351b..56a680a6284c 100644
--- a/pkgs/by-name/ne/nextpnr/package.nix
+++ b/pkgs/by-name/ne/nextpnr/package.nix
@@ -80,6 +80,9 @@ stdenv.mkDerivation rec {
 
       "-DHIMBAECHEL_GOWIN_DEVICES=all"
       "-DHIMBAECHEL_PRJBEYOND_DB=${prjbeyond_src}"
+      # https://github.com/YosysHQ/nextpnr/issues/1578
+      # `Compatibility with CMake < 3.5 has been removed from CMake.`
+      "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
     ]
     ++ (lib.optional enableGui "-DBUILD_GUI=ON");
 
diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index 8a7000283848..07856e2cbb8f 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -1926,23 +1926,23 @@
   },
   {
     "pname": "NexusMods.HyperDuck",
-    "version": "0.28.0",
-    "hash": "sha256-vJW/9DbnSIzxH6CR1CzMru0w/BA7HwxuJ0TiKt6NgcQ="
+    "version": "0.28.2",
+    "hash": "sha256-VErxX62rvY5MA9LGyBcKi1BCgtgzOo4rgWTRczFNrVY="
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.28.0",
-    "hash": "sha256-AzSzn2mdp4sx1ntOfm03kWlfo/mxxURcEMmChxSyEAI="
+    "version": "0.28.2",
+    "hash": "sha256-l6b1r0swnRfqAIk7WvdQv0VaekFRXENhZqEL9ut4AT0="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.28.0",
-    "hash": "sha256-c6hEojlKk8B//lpEyxrYBy/QlpixzDE4LJq+sk4XZDY="
+    "version": "0.28.2",
+    "hash": "sha256-HJsnz1nQeUG4iln+WDkR3SMEalYM47Z8vdYZf8V+RIU="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.28.0",
-    "hash": "sha256-o888EyOAzDypNzhZTtW8BZp0Ew/fOUsho6IeBbGlmNM="
+    "version": "0.28.2",
+    "hash": "sha256-vmOO/qImh5RrWC3U11D5A4Gd2SvOJvuoDID+b5fI+cA="
   },
   {
     "pname": "NexusMods.Paths",
@@ -1969,51 +1969,6 @@
     "version": "0.20.0",
     "hash": "sha256-k+1dgCZEuEO8xVfdwGKec+FgE//FX1xqIyiyPGYypF0="
   },
-  {
-    "pname": "Nito.AsyncEx",
-    "version": "5.1.2",
-    "hash": "sha256-9o4YLWAHSeApF4E/qNFyaZPh/V9N5JSeF32uquukb5I="
-  },
-  {
-    "pname": "Nito.AsyncEx.Context",
-    "version": "5.1.2",
-    "hash": "sha256-7BCVYJgZyU2/Z4r8CKajorlzajr6GBUBAbY3AcswPC0="
-  },
-  {
-    "pname": "Nito.AsyncEx.Coordination",
-    "version": "5.1.2",
-    "hash": "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="
-  },
-  {
-    "pname": "Nito.AsyncEx.Interop.WaitHandles",
-    "version": "5.1.2",
-    "hash": "sha256-1DgBWnkYggWQk0w2g7Y24Ogl7TJ7bQkc/0NIUFJzN00="
-  },
-  {
-    "pname": "Nito.AsyncEx.Oop",
-    "version": "5.1.2",
-    "hash": "sha256-1hnCagbt6SLbn+RpasWdBH3pLvqm8kC2Ut2iG75OUMM="
-  },
-  {
-    "pname": "Nito.AsyncEx.Tasks",
-    "version": "5.1.2",
-    "hash": "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="
-  },
-  {
-    "pname": "Nito.Cancellation",
-    "version": "1.1.2",
-    "hash": "sha256-oZKZUymYJiM2AfMpX4pX0FIlut0lEWdy250iVX0w+is="
-  },
-  {
-    "pname": "Nito.Collections.Deque",
-    "version": "1.1.1",
-    "hash": "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="
-  },
-  {
-    "pname": "Nito.Disposables",
-    "version": "2.2.1",
-    "hash": "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="
-  },
   {
     "pname": "NLog",
     "version": "6.0.3",
@@ -2689,11 +2644,6 @@
     "version": "4.3.0",
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "1.7.1",
-    "hash": "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="
-  },
   {
     "pname": "System.Collections.Immutable",
     "version": "5.0.0",
@@ -3069,6 +3019,11 @@
     "version": "5.0.0",
     "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
   },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
   {
     "pname": "System.Reactive",
     "version": "6.0.1",
@@ -3194,11 +3149,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.4.0",
-    "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.5.3",
@@ -3564,6 +3514,11 @@
     "version": "2.5.0",
     "hash": "sha256-i9TpQJ2+JhSQ7RXkdmC6pkND32V4cLyEaPLGrD/EpYk="
   },
+  {
+    "pname": "Verify.TUnit",
+    "version": "30.11.0",
+    "hash": "sha256-xuP2oetSNIBhCzt7go3S2Icy8wy3pBseq4XcEMMrDV8="
+  },
   {
     "pname": "Verify.Xunit",
     "version": "30.11.0",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 5bcea550ddf8..5041b96063fa 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -22,13 +22,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.18.2";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "Nexus-Mods";
     repo = "NexusMods.App";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+ayYRNclxbBedH6gIWTh5wI/AIvMzSq4x5fQXzxOT5c=";
+    hash = "sha256-hpsrHHh0Bk+9Z4Qp5aTqH5i8KnqCLQdseYGrbr4sh1k=";
     fetchSubmodules = true;
   };
 
@@ -57,9 +57,6 @@ buildDotnetModule (finalAttrs: {
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
   postPatch = ''
-    # for some reason these tests fail (intermittently?) with a zero timestamp
-    touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
-
     # Specify a fixed date to improve build reproducibility
     echo "1970-01-01T00:00:00Z" >buildDate.txt
     substituteInPlace src/NexusMods.Sdk/NexusMods.Sdk.csproj \
@@ -72,6 +69,11 @@ buildDotnetModule (finalAttrs: {
     # Use a vendored version of the nexus API's games.json data
     substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \
       --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json}
+
+    ${lib.optionalString finalAttrs.doCheck ''
+      # For some reason these tests fail (intermittently?) with a zero timestamp
+      touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
+    ''}
   '';
 
   makeWrapperArgs = [
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
index 1ee7cae625b9..00e9d035c0dd 100644
--- a/pkgs/by-name/ne/nexusmods-app/vendored/games.json
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
@@ -6,12 +6,12 @@
     "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
     "nexusmods_url": "https://www.nexusmods.com/stardewvalley",
     "genre": "Simulation",
-    "file_count": 141993,
-    "downloads": 619854329,
+    "file_count": 144372,
+    "downloads": 635510946,
     "domain_name": "stardewvalley",
     "approved_date": 1457432329,
-    "mods": 25658,
-    "collections": 2049
+    "mods": 26187,
+    "collections": 1990
   },
   {
     "id": 1704,
@@ -20,12 +20,12 @@
     "forum_url": "https://forums.nexusmods.com/games/6-skyrim/",
     "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition",
     "genre": "RPG",
-    "file_count": 656636,
-    "downloads": 9072303822,
+    "file_count": 667120,
+    "downloads": 9346275237,
     "domain_name": "skyrimspecialedition",
     "approved_date": 1477480498,
-    "mods": 117768,
-    "collections": 4872
+    "mods": 119859,
+    "collections": 4876
   },
   {
     "id": 3174,
@@ -34,12 +34,12 @@
     "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
     "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
     "genre": "Strategy",
-    "file_count": 50300,
-    "downloads": 115343239,
+    "file_count": 50960,
+    "downloads": 117558949,
     "domain_name": "mountandblade2bannerlord",
     "approved_date": 1582898627,
-    "mods": 6294,
-    "collections": 293
+    "mods": 6397,
+    "collections": 294
   },
   {
     "id": 3333,
@@ -48,12 +48,12 @@
     "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
     "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
     "genre": "Action",
-    "file_count": 123906,
-    "downloads": 908587568,
+    "file_count": 126752,
+    "downloads": 958960285,
     "domain_name": "cyberpunk2077",
     "approved_date": 1607433331,
-    "mods": 17809,
-    "collections": 1602
+    "mods": 18283,
+    "collections": 1597
   },
   {
     "id": 3474,
@@ -62,11 +62,11 @@
     "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
     "nexusmods_url": "https://www.nexusmods.com/baldursgate3",
     "genre": "RPG",
-    "file_count": 104549,
-    "downloads": 345662936,
+    "file_count": 106755,
+    "downloads": 359737700,
     "domain_name": "baldursgate3",
     "approved_date": 1602863114,
-    "mods": 14843,
-    "collections": 1805
+    "mods": 15196,
+    "collections": 1740
   }
 ]
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 3a638401dc4f..77114d34f3ab 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -8,69 +8,73 @@
             "name": "admin-frontend",
             "version": "0.0.0",
             "dependencies": {
-                "@hookform/resolvers": "^3.10.0",
-                "@radix-ui/react-alert-dialog": "^1.1.5",
-                "@radix-ui/react-avatar": "^1.1.2",
-                "@radix-ui/react-checkbox": "^1.1.3",
-                "@radix-ui/react-dialog": "^1.1.5",
-                "@radix-ui/react-dropdown-menu": "^2.1.5",
-                "@radix-ui/react-label": "^2.1.1",
-                "@radix-ui/react-navigation-menu": "^1.2.4",
-                "@radix-ui/react-popover": "^1.1.5",
-                "@radix-ui/react-scroll-area": "^1.2.2",
-                "@radix-ui/react-select": "^2.1.5",
-                "@radix-ui/react-separator": "^1.1.1",
-                "@radix-ui/react-slot": "^1.1.1",
-                "@radix-ui/react-tabs": "^1.1.2",
-                "@tanstack/react-table": "^8.20.6",
+                "@hookform/resolvers": "^5.2.2",
+                "@radix-ui/react-alert-dialog": "^1.1.15",
+                "@radix-ui/react-avatar": "^1.1.10",
+                "@radix-ui/react-checkbox": "^1.3.3",
+                "@radix-ui/react-dialog": "^1.1.15",
+                "@radix-ui/react-dropdown-menu": "^2.1.16",
+                "@radix-ui/react-label": "^2.1.7",
+                "@radix-ui/react-navigation-menu": "^1.2.14",
+                "@radix-ui/react-popover": "^1.1.15",
+                "@radix-ui/react-scroll-area": "^1.2.10",
+                "@radix-ui/react-select": "^2.2.6",
+                "@radix-ui/react-separator": "^1.1.7",
+                "@radix-ui/react-slot": "^1.2.3",
+                "@radix-ui/react-switch": "^1.2.6",
+                "@radix-ui/react-tabs": "^1.1.13",
+                "@tailwindcss/postcss": "^4.1.14",
+                "@tanstack/react-table": "^8.21.3",
                 "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-                "@types/luxon": "^3.4.2",
+                "@types/luxon": "^3.7.1",
                 "@xterm/addon-attach": "^0.11.0",
                 "@xterm/addon-fit": "^0.10.0",
                 "@xterm/xterm": "^5.5.0",
                 "class-variance-authority": "^0.7.1",
                 "clsx": "^2.1.1",
-                "cmdk": "^1.0.4",
+                "cmdk": "^1.1.1",
                 "copy-to-clipboard": "^3.3.3",
-                "framer-motion": "^11.18.2",
-                "i18next": "^24.2.2",
-                "i18next-browser-languagedetector": "^8.0.2",
+                "date-fns": "^4.1.0",
+                "framer-motion": "^12.23.22",
+                "i18next": "^25.5.3",
+                "i18next-browser-languagedetector": "^8.2.0",
                 "jotai-zustand": "^0.6.0",
-                "lucide-react": "^0.454.0",
-                "luxon": "^3.5.0",
+                "lucide-react": "^0.545.0",
+                "luxon": "^3.7.2",
                 "next-themes": "^0.4.6",
-                "prettier-plugin-tailwindcss": "^0.6.11",
-                "react": "^19.0.0",
-                "react-dom": "^19.0.0",
-                "react-hook-form": "^7.54.2",
-                "react-i18next": "^15.4.0",
-                "react-router-dom": "^7.1.5",
-                "react-virtuoso": "^4.12.3",
-                "sonner": "^1.7.4",
-                "swr": "^2.3.0",
-                "tailwind-merge": "^2.6.0",
+                "prettier-plugin-tailwindcss": "^0.6.14",
+                "react": "^19.2.0",
+                "react-day-picker": "^9.11.1",
+                "react-dom": "^19.2.0",
+                "react-hook-form": "^7.64.0",
+                "react-i18next": "^16.0.0",
+                "react-router-dom": "^7.9.4",
+                "react-virtuoso": "^4.14.1",
+                "sonner": "^2.0.7",
+                "swr": "^2.3.6",
+                "tailwind-merge": "^3.3.1",
                 "tailwindcss-animate": "^1.0.7",
                 "vaul": "^1.1.2",
-                "zod": "^3.24.1",
-                "zustand": "^5.0.3"
+                "zod": "^4.1.12",
+                "zustand": "^5.0.8"
             },
             "devDependencies": {
-                "@eslint/js": "^9.19.0",
-                "@types/node": "^22.13.0",
-                "@types/react": "^18.3.18",
-                "@types/react-dom": "^18.3.5",
-                "@vitejs/plugin-react": "^4.3.4",
-                "autoprefixer": "^10.4.20",
-                "eslint": "^9.19.0",
-                "eslint-plugin-react-hooks": "^5.1.0",
-                "eslint-plugin-react-refresh": "^0.4.18",
-                "globals": "^15.14.0",
-                "postcss": "^8.5.1",
-                "swagger-typescript-api": "^13.0.23",
-                "tailwindcss": "^3.4.17",
-                "typescript": "~5.6.3",
-                "typescript-eslint": "^8.22.0",
-                "vite": "^6.0.11"
+                "@eslint/js": "^9.37.0",
+                "@types/node": "^24.7.0",
+                "@types/react": "^19.2.2",
+                "@types/react-dom": "^19.2.1",
+                "@vitejs/plugin-react": "^5.0.4",
+                "autoprefixer": "^10.4.21",
+                "eslint": "^9.37.0",
+                "eslint-plugin-react-hooks": "^7.0.0",
+                "eslint-plugin-react-refresh": "^0.4.23",
+                "globals": "^16.4.0",
+                "postcss": "^8.5.6",
+                "swagger-typescript-api": "^13.2.15",
+                "tailwindcss": "^4.1.14",
+                "typescript": "~5.9.3",
+                "typescript-eslint": "^8.46.0",
+                "vite": "^7.1.9"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -85,20 +89,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/@ampproject/remapping": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-            "devOptional": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@babel/code-frame": {
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -114,9 +104,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
-            "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
+            "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
             "devOptional": true,
             "license": "MIT",
             "engines": {
@@ -124,22 +114,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
-            "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
+            "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.28.0",
+                "@babel/generator": "^7.28.5",
                 "@babel/helper-compilation-targets": "^7.27.2",
-                "@babel/helper-module-transforms": "^7.27.3",
-                "@babel/helpers": "^7.27.6",
-                "@babel/parser": "^7.28.0",
+                "@babel/helper-module-transforms": "^7.28.3",
+                "@babel/helpers": "^7.28.4",
+                "@babel/parser": "^7.28.5",
                 "@babel/template": "^7.27.2",
-                "@babel/traverse": "^7.28.0",
-                "@babel/types": "^7.28.0",
+                "@babel/traverse": "^7.28.5",
+                "@babel/types": "^7.28.5",
+                "@jridgewell/remapping": "^2.3.5",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -155,13 +145,13 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-            "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+            "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.28.0",
-                "@babel/types": "^7.28.0",
+                "@babel/parser": "^7.28.5",
+                "@babel/types": "^7.28.5",
                 "@jridgewell/gen-mapping": "^0.3.12",
                 "@jridgewell/trace-mapping": "^0.3.28",
                 "jsesc": "^3.0.2"
@@ -211,15 +201,15 @@
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "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==",
+            "version": "7.28.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+            "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-module-imports": "^7.27.1",
                 "@babel/helper-validator-identifier": "^7.27.1",
-                "@babel/traverse": "^7.27.3"
+                "@babel/traverse": "^7.28.3"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -248,9 +238,9 @@
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "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==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -267,26 +257,26 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz",
-            "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+            "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.2"
+                "@babel/types": "^7.28.4"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-            "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+            "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.28.0"
+                "@babel/types": "^7.28.5"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -328,9 +318,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
-            "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+            "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -351,17 +341,17 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
-            "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+            "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.28.0",
+                "@babel/generator": "^7.28.5",
                 "@babel/helper-globals": "^7.28.0",
-                "@babel/parser": "^7.28.0",
+                "@babel/parser": "^7.28.5",
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.0",
+                "@babel/types": "^7.28.5",
                 "debug": "^4.3.1"
             },
             "engines": {
@@ -369,28 +359,28 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-            "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+            "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.27.1",
-                "@babel/helper-validator-identifier": "^7.27.1"
+                "@babel/helper-validator-identifier": "^7.28.5"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@biomejs/js-api": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-2.0.3.tgz",
-            "integrity": "sha512-fg4hGhg1LtohDqLdG9uggROlVsydcuFwZhPoUOTi9+bkvGMULDKL9dEP5iN6++CIA/AN0T20U82rLYuaxc+VDQ==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-3.0.0.tgz",
+            "integrity": "sha512-5QcGJFj9IO+yXl76ICjvkdE38uxRcTDsBzcCZHEZ+ma+Te/nbvJg4A3KtAds9HCrEF0JKLWiyjMhAbqazuJvYA==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peerDependencies": {
-                "@biomejs/wasm-bundler": "^2.1.1",
-                "@biomejs/wasm-nodejs": "^2.1.1",
-                "@biomejs/wasm-web": "^2.1.1"
+                "@biomejs/wasm-bundler": "^2.2.0",
+                "@biomejs/wasm-nodejs": "^2.2.0",
+                "@biomejs/wasm-web": "^2.2.0"
             },
             "peerDependenciesMeta": {
                 "@biomejs/wasm-bundler": {
@@ -405,16 +395,22 @@
             }
         },
         "node_modules/@biomejs/wasm-nodejs": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.1.4.tgz",
-            "integrity": "sha512-BuvuOiXtTJg9w5+ApMXeJDD5H+XkIJSazIjPJeIxfkCqzVtCByLjCqPC6gbECbylRl9IhrZMWVIskTD6aJ9MzA==",
+            "version": "2.2.6",
+            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.2.6.tgz",
+            "integrity": "sha512-lUEcvW+2eyMTgCofknBT04AvY7KkQSqKe3Nv40+ZxWVlStsPB0v2RWLu7xks69Yxcb3TfNGsfq21OWkdrmO2NQ==",
             "dev": true,
             "license": "MIT OR Apache-2.0"
         },
+        "node_modules/@date-fns/tz": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz",
+            "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==",
+            "license": "MIT"
+        },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
-            "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.11.tgz",
+            "integrity": "sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==",
             "cpu": [
                 "ppc64"
             ],
@@ -429,9 +425,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
-            "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.11.tgz",
+            "integrity": "sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==",
             "cpu": [
                 "arm"
             ],
@@ -446,9 +442,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
-            "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.11.tgz",
+            "integrity": "sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==",
             "cpu": [
                 "arm64"
             ],
@@ -463,9 +459,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
-            "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.11.tgz",
+            "integrity": "sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==",
             "cpu": [
                 "x64"
             ],
@@ -480,9 +476,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
-            "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.11.tgz",
+            "integrity": "sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==",
             "cpu": [
                 "arm64"
             ],
@@ -497,9 +493,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
-            "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.11.tgz",
+            "integrity": "sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==",
             "cpu": [
                 "x64"
             ],
@@ -514,9 +510,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.11.tgz",
+            "integrity": "sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==",
             "cpu": [
                 "arm64"
             ],
@@ -531,9 +527,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
-            "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.11.tgz",
+            "integrity": "sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==",
             "cpu": [
                 "x64"
             ],
@@ -548,9 +544,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
-            "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.11.tgz",
+            "integrity": "sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==",
             "cpu": [
                 "arm"
             ],
@@ -565,9 +561,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
-            "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.11.tgz",
+            "integrity": "sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==",
             "cpu": [
                 "arm64"
             ],
@@ -582,9 +578,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
-            "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.11.tgz",
+            "integrity": "sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==",
             "cpu": [
                 "ia32"
             ],
@@ -599,9 +595,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
-            "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.11.tgz",
+            "integrity": "sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==",
             "cpu": [
                 "loong64"
             ],
@@ -616,9 +612,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
-            "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.11.tgz",
+            "integrity": "sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==",
             "cpu": [
                 "mips64el"
             ],
@@ -633,9 +629,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
-            "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.11.tgz",
+            "integrity": "sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==",
             "cpu": [
                 "ppc64"
             ],
@@ -650,9 +646,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
-            "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.11.tgz",
+            "integrity": "sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==",
             "cpu": [
                 "riscv64"
             ],
@@ -667,9 +663,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
-            "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.11.tgz",
+            "integrity": "sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==",
             "cpu": [
                 "s390x"
             ],
@@ -684,9 +680,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
-            "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.11.tgz",
+            "integrity": "sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==",
             "cpu": [
                 "x64"
             ],
@@ -701,9 +697,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.11.tgz",
+            "integrity": "sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==",
             "cpu": [
                 "arm64"
             ],
@@ -718,9 +714,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
-            "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.11.tgz",
+            "integrity": "sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==",
             "cpu": [
                 "x64"
             ],
@@ -735,9 +731,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.11.tgz",
+            "integrity": "sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==",
             "cpu": [
                 "arm64"
             ],
@@ -752,9 +748,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
-            "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.11.tgz",
+            "integrity": "sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==",
             "cpu": [
                 "x64"
             ],
@@ -769,9 +765,9 @@
             }
         },
         "node_modules/@esbuild/openharmony-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
-            "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.11.tgz",
+            "integrity": "sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==",
             "cpu": [
                 "arm64"
             ],
@@ -786,9 +782,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
-            "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.11.tgz",
+            "integrity": "sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==",
             "cpu": [
                 "x64"
             ],
@@ -803,9 +799,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
-            "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.11.tgz",
+            "integrity": "sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==",
             "cpu": [
                 "arm64"
             ],
@@ -820,9 +816,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
-            "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.11.tgz",
+            "integrity": "sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==",
             "cpu": [
                 "ia32"
             ],
@@ -837,9 +833,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
-            "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.11.tgz",
+            "integrity": "sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==",
             "cpu": [
                 "x64"
             ],
@@ -854,9 +850,9 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-            "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+            "version": "4.9.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+            "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -886,9 +882,9 @@
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+            "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -896,13 +892,13 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.21.0",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-            "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+            "version": "0.21.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+            "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/object-schema": "^2.1.6",
+                "@eslint/object-schema": "^2.1.7",
                 "debug": "^4.3.1",
                 "minimatch": "^3.1.2"
             },
@@ -911,19 +907,35 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
-            "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+            "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
             "dev": true,
             "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.17.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/config-helpers/node_modules/@eslint/core": {
+            "version": "0.17.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+            "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+            "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/@eslint/core": {
-            "version": "0.15.2",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-            "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+            "version": "0.16.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
+            "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -971,9 +983,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.33.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
-            "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
+            "version": "9.38.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
+            "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -984,9 +996,9 @@
             }
         },
         "node_modules/@eslint/object-schema": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+            "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -994,19 +1006,32 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-            "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+            "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/core": "^0.15.2",
+                "@eslint/core": "^0.17.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.17.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+            "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+            "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",
@@ -1024,9 +1049,9 @@
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.3.tgz",
-            "integrity": "sha512-uZA413QEpNuhtb3/iIKoYMSK07keHPYeXF02Zhd6e213j+d1NamLix/mCLxBUDW/Gx52sPH2m+chlUsyaBs/Ag==",
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
+            "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/core": "^1.7.3",
@@ -1034,12 +1059,12 @@
             }
         },
         "node_modules/@floating-ui/react-dom": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.5.tgz",
-            "integrity": "sha512-HDO/1/1oH9fjj4eLgegrlH3dklZpHtUYYFiVwMUwfGvk9jWDRWqkklA2/NFScknrcNSspbV868WjXORvreDX+Q==",
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
+            "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/dom": "^1.7.3"
+                "@floating-ui/dom": "^1.7.4"
             },
             "peerDependencies": {
                 "react": ">=16.8.0",
@@ -1053,12 +1078,15 @@
             "license": "MIT"
         },
         "node_modules/@hookform/resolvers": {
-            "version": "3.10.0",
-            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.10.0.tgz",
-            "integrity": "sha512-79Dv+3mDF7i+2ajj7SkypSKHhl1cbln1OGavqrsF7p6mbUv11xpqpacPsGDCTRvCSjEEIez2ef1NveSVL3b0Ag==",
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.2.2.tgz",
+            "integrity": "sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==",
             "license": "MIT",
+            "dependencies": {
+                "@standard-schema/utils": "^0.3.0"
+            },
             "peerDependencies": {
-                "react-hook-form": "^7.0.0"
+                "react-hook-form": "^7.55.0"
             }
         },
         "node_modules/@humanfs/core": {
@@ -1072,33 +1100,19 @@
             }
         },
         "node_modules/@humanfs/node": {
-            "version": "0.16.6",
-            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+            "version": "0.16.7",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+            "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@humanfs/core": "^0.19.1",
-                "@humanwhocodes/retry": "^0.3.0"
+                "@humanwhocodes/retry": "^0.4.0"
             },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
-        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=18.18"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
-            }
-        },
         "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1127,33 +1141,26 @@
                 "url": "https://github.com/sponsors/nzakas"
             }
         },
-        "node_modules/@isaacs/cliui": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
-            "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
-            "license": "ISC",
-            "dependencies": {
-                "string-width": "^5.1.2",
-                "string-width-cjs": "npm:string-width@^4.2.0",
-                "strip-ansi": "^7.0.1",
-                "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
-                "wrap-ansi": "^8.1.0",
-                "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
-            },
-            "engines": {
-                "node": ">=12"
-            }
-        },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.12",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
-            "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+            "version": "0.3.13",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.5.0",
                 "@jridgewell/trace-mapping": "^0.3.24"
             }
         },
+        "node_modules/@jridgewell/remapping": {
+            "version": "2.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+            "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
         "node_modules/@jridgewell/resolve-uri": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -1164,15 +1171,15 @@
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-            "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.29",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-            "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+            "version": "0.3.31",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+            "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -1183,6 +1190,7 @@
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
             "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "2.0.5",
@@ -1196,6 +1204,7 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
             "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 8"
@@ -1205,6 +1214,7 @@
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
             "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.scandir": "2.1.5",
@@ -1214,16 +1224,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/@pkgjs/parseargs": {
-            "version": "0.11.0",
-            "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
-            "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
-            "license": "MIT",
-            "optional": true,
-            "engines": {
-                "node": ">=14"
-            }
-        },
         "node_modules/@radix-ui/number": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz",
@@ -1231,21 +1231,21 @@
             "license": "MIT"
         },
         "node_modules/@radix-ui/primitive": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz",
-            "integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
+            "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
             "license": "MIT"
         },
         "node_modules/@radix-ui/react-alert-dialog": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.14.tgz",
-            "integrity": "sha512-IOZfZ3nPvN6lXpJTBCunFQPRSvK8MDgSc1FB85xnIpUKOw9en0dJj8JmCAxV7BiZdtYlUpmrQjoTFkVYtdoWzQ==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.15.tgz",
+            "integrity": "sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dialog": "1.1.14",
+                "@radix-ui/react-dialog": "1.1.15",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3"
             },
@@ -1315,15 +1315,15 @@
             }
         },
         "node_modules/@radix-ui/react-checkbox": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.2.tgz",
-            "integrity": "sha512-yd+dI56KZqawxKZrJ31eENUwqc1QSqg4OZ15rybGjF2ZNwMO+wCyHzAVLRp9qoYJf7kYy0YpZ2b0JCzJ42HZpA==",
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz",
+            "integrity": "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "@radix-ui/react-use-previous": "1.1.1",
@@ -1401,20 +1401,20 @@
             }
         },
         "node_modules/@radix-ui/react-dialog": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.14.tgz",
-            "integrity": "sha512-+CpweKjqpzTmwRwcYECQcNYbI8V9VSQt0SNFKeEBLgfucbsLssU6Ppq7wUdNXEGb573bMjFhVjKVll8rmV6zMw==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz",
+            "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
                 "@radix-ui/react-portal": "1.1.9",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
@@ -1452,12 +1452,12 @@
             }
         },
         "node_modules/@radix-ui/react-dismissable-layer": {
-            "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==",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz",
+            "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
@@ -1479,16 +1479,16 @@
             }
         },
         "node_modules/@radix-ui/react-dropdown-menu": {
-            "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==",
+            "version": "2.1.16",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz",
+            "integrity": "sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@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.15",
+                "@radix-ui/react-menu": "2.1.16",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
@@ -1508,9 +1508,9 @@
             }
         },
         "node_modules/@radix-ui/react-focus-guards": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz",
-            "integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz",
+            "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1589,25 +1589,25 @@
             }
         },
         "node_modules/@radix-ui/react-menu": {
-            "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==",
+            "version": "2.1.16",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz",
+            "integrity": "sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@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.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-popper": "1.2.8",
                 "@radix-ui/react-portal": "1.1.9",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
-                "@radix-ui/react-roving-focus": "1.1.10",
+                "@radix-ui/react-roving-focus": "1.1.11",
                 "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "aria-hidden": "^1.2.4",
@@ -1629,19 +1629,19 @@
             }
         },
         "node_modules/@radix-ui/react-navigation-menu": {
-            "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==",
+            "version": "1.2.14",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.14.tgz",
+            "integrity": "sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@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.10",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@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",
@@ -1665,21 +1665,21 @@
             }
         },
         "node_modules/@radix-ui/react-popover": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.14.tgz",
-            "integrity": "sha512-ODz16+1iIbGUfFEfKx2HTPKizg2MN39uIOV8MXeHnmdd3i/N9Wt7vU46wbHsqA0xoaQyXVcs0KIlBdOA2Y95bw==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz",
+            "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-popper": "1.2.8",
                 "@radix-ui/react-portal": "1.1.9",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
@@ -1702,9 +1702,9 @@
             }
         },
         "node_modules/@radix-ui/react-popper": {
-            "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==",
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz",
+            "integrity": "sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/react-dom": "^2.0.0",
@@ -1758,9 +1758,9 @@
             }
         },
         "node_modules/@radix-ui/react-presence": {
-            "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==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz",
+            "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-compose-refs": "1.1.2",
@@ -1805,12 +1805,12 @@
             }
         },
         "node_modules/@radix-ui/react-roving-focus": {
-            "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==",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz",
+            "integrity": "sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
@@ -1836,17 +1836,17 @@
             }
         },
         "node_modules/@radix-ui/react-scroll-area": {
-            "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==",
+            "version": "1.2.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz",
+            "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.1",
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@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.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@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"
@@ -1867,22 +1867,22 @@
             }
         },
         "node_modules/@radix-ui/react-select": {
-            "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==",
+            "version": "2.2.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz",
+            "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.1",
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@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.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-popper": "1.2.8",
                 "@radix-ui/react-portal": "1.1.9",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3",
@@ -1950,19 +1950,48 @@
                 }
             }
         },
-        "node_modules/@radix-ui/react-tabs": {
-            "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==",
+        "node_modules/@radix-ui/react-switch": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.2.6.tgz",
+            "integrity": "sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@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"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-tabs": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz",
+            "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.3",
                 "@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.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
-                "@radix-ui/react-roving-focus": "1.1.10",
+                "@radix-ui/react-roving-focus": "1.1.11",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
@@ -2164,16 +2193,16 @@
             "license": "MIT"
         },
         "node_modules/@rolldown/pluginutils": {
-            "version": "1.0.0-beta.27",
-            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
-            "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
+            "version": "1.0.0-beta.43",
+            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.43.tgz",
+            "integrity": "sha512-5Uxg7fQUCmfhax7FJke2+8B6cqgeUJUD9o2uXIKXhD+mG0mL6NObmVoi9wXEU1tY89mZKgAYA6fTbftx3q2ZPQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",
-            "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz",
+            "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==",
             "cpu": [
                 "arm"
             ],
@@ -2185,9 +2214,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz",
-            "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz",
+            "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==",
             "cpu": [
                 "arm64"
             ],
@@ -2199,9 +2228,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz",
-            "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz",
+            "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==",
             "cpu": [
                 "arm64"
             ],
@@ -2213,9 +2242,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz",
-            "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz",
+            "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==",
             "cpu": [
                 "x64"
             ],
@@ -2227,9 +2256,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz",
-            "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz",
+            "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==",
             "cpu": [
                 "arm64"
             ],
@@ -2241,9 +2270,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz",
-            "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz",
+            "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==",
             "cpu": [
                 "x64"
             ],
@@ -2255,9 +2284,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz",
-            "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz",
+            "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==",
             "cpu": [
                 "arm"
             ],
@@ -2269,9 +2298,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz",
-            "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz",
+            "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==",
             "cpu": [
                 "arm"
             ],
@@ -2283,9 +2312,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz",
-            "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz",
+            "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==",
             "cpu": [
                 "arm64"
             ],
@@ -2297,9 +2326,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz",
-            "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz",
+            "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2310,10 +2339,10 @@
                 "linux"
             ]
         },
-        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz",
-            "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==",
+        "node_modules/@rollup/rollup-linux-loong64-gnu": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
+            "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
             "cpu": [
                 "loong64"
             ],
@@ -2325,9 +2354,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz",
-            "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
+            "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
             "cpu": [
                 "ppc64"
             ],
@@ -2339,9 +2368,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz",
-            "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz",
+            "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==",
             "cpu": [
                 "riscv64"
             ],
@@ -2353,9 +2382,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz",
-            "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
+            "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
             "cpu": [
                 "riscv64"
             ],
@@ -2367,9 +2396,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz",
-            "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz",
+            "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==",
             "cpu": [
                 "s390x"
             ],
@@ -2381,9 +2410,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz",
-            "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz",
+            "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==",
             "cpu": [
                 "x64"
             ],
@@ -2395,9 +2424,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz",
-            "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz",
+            "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==",
             "cpu": [
                 "x64"
             ],
@@ -2408,10 +2437,24 @@
                 "linux"
             ]
         },
+        "node_modules/@rollup/rollup-openharmony-arm64": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
+            "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ]
+        },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz",
-            "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz",
+            "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==",
             "cpu": [
                 "arm64"
             ],
@@ -2423,9 +2466,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz",
-            "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz",
+            "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==",
             "cpu": [
                 "ia32"
             ],
@@ -2436,10 +2479,10 @@
                 "win32"
             ]
         },
-        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz",
-            "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==",
+        "node_modules/@rollup/rollup-win32-x64-gnu": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
+            "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
             "cpu": [
                 "x64"
             ],
@@ -2450,6 +2493,336 @@
                 "win32"
             ]
         },
+        "node_modules/@rollup/rollup-win32-x64-msvc": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz",
+            "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@standard-schema/utils": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+            "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
+            "license": "MIT"
+        },
+        "node_modules/@tailwindcss/node": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.16.tgz",
+            "integrity": "sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/remapping": "^2.3.4",
+                "enhanced-resolve": "^5.18.3",
+                "jiti": "^2.6.1",
+                "lightningcss": "1.30.2",
+                "magic-string": "^0.30.19",
+                "source-map-js": "^1.2.1",
+                "tailwindcss": "4.1.16"
+            }
+        },
+        "node_modules/@tailwindcss/oxide": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.16.tgz",
+            "integrity": "sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            },
+            "optionalDependencies": {
+                "@tailwindcss/oxide-android-arm64": "4.1.16",
+                "@tailwindcss/oxide-darwin-arm64": "4.1.16",
+                "@tailwindcss/oxide-darwin-x64": "4.1.16",
+                "@tailwindcss/oxide-freebsd-x64": "4.1.16",
+                "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.16",
+                "@tailwindcss/oxide-linux-arm64-gnu": "4.1.16",
+                "@tailwindcss/oxide-linux-arm64-musl": "4.1.16",
+                "@tailwindcss/oxide-linux-x64-gnu": "4.1.16",
+                "@tailwindcss/oxide-linux-x64-musl": "4.1.16",
+                "@tailwindcss/oxide-wasm32-wasi": "4.1.16",
+                "@tailwindcss/oxide-win32-arm64-msvc": "4.1.16",
+                "@tailwindcss/oxide-win32-x64-msvc": "4.1.16"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-android-arm64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.16.tgz",
+            "integrity": "sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-darwin-arm64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.16.tgz",
+            "integrity": "sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-darwin-x64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.16.tgz",
+            "integrity": "sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-freebsd-x64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.16.tgz",
+            "integrity": "sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.16.tgz",
+            "integrity": "sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.16.tgz",
+            "integrity": "sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.16.tgz",
+            "integrity": "sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.16.tgz",
+            "integrity": "sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-x64-musl": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.16.tgz",
+            "integrity": "sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.16.tgz",
+            "integrity": "sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q==",
+            "bundleDependencies": [
+                "@napi-rs/wasm-runtime",
+                "@emnapi/core",
+                "@emnapi/runtime",
+                "@tybys/wasm-util",
+                "@emnapi/wasi-threads",
+                "tslib"
+            ],
+            "cpu": [
+                "wasm32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.5.0",
+                "@emnapi/runtime": "^1.5.0",
+                "@emnapi/wasi-threads": "^1.1.0",
+                "@napi-rs/wasm-runtime": "^1.0.7",
+                "@tybys/wasm-util": "^0.10.1",
+                "tslib": "^2.4.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+            "version": "1.5.0",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.1.0",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+            "version": "1.5.0",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+            "version": "1.1.0",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+            "version": "1.0.7",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.5.0",
+                "@emnapi/runtime": "^1.5.0",
+                "@tybys/wasm-util": "^0.10.1"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+            "version": "0.10.1",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+            "version": "2.8.1",
+            "inBundle": true,
+            "license": "0BSD",
+            "optional": true
+        },
+        "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.16.tgz",
+            "integrity": "sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.16.tgz",
+            "integrity": "sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/postcss": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.16.tgz",
+            "integrity": "sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A==",
+            "license": "MIT",
+            "dependencies": {
+                "@alloc/quick-lru": "^5.2.0",
+                "@tailwindcss/node": "4.1.16",
+                "@tailwindcss/oxide": "4.1.16",
+                "postcss": "^8.4.41",
+                "tailwindcss": "4.1.16"
+            }
+        },
         "node_modules/@tanstack/react-table": {
             "version": "8.21.3",
             "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
@@ -2576,6 +2949,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/lodash": {
+            "version": "4.17.20",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+            "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/luxon": {
             "version": "3.7.1",
             "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
@@ -2583,41 +2963,33 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.17.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.1.tgz",
-            "integrity": "sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==",
+            "version": "24.9.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz",
+            "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.21.0"
+                "undici-types": "~7.16.0"
             }
         },
-        "node_modules/@types/prop-types": {
-            "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.23",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz",
-            "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==",
+            "version": "19.2.2",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
+            "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "@types/prop-types": "*",
                 "csstype": "^3.0.2"
             }
         },
         "node_modules/@types/react-dom": {
-            "version": "18.3.7",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
-            "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+            "version": "19.2.2",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.2.tgz",
+            "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==",
             "devOptional": true,
             "license": "MIT",
             "peerDependencies": {
-                "@types/react": "^18.0.0"
+                "@types/react": "^19.2.0"
             }
         },
         "node_modules/@types/swagger-schema-official": {
@@ -2628,17 +3000,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz",
-            "integrity": "sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.2.tgz",
+            "integrity": "sha512-ZGBMToy857/NIPaaCucIUQgqueOiq7HeAKkhlvqVV4lm089zUFW6ikRySx2v+cAhKeUCPuWVHeimyk6Dw1iY3w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.39.0",
-                "@typescript-eslint/type-utils": "8.39.0",
-                "@typescript-eslint/utils": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0",
+                "@typescript-eslint/scope-manager": "8.46.2",
+                "@typescript-eslint/type-utils": "8.46.2",
+                "@typescript-eslint/utils": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2",
                 "graphemer": "^1.4.0",
                 "ignore": "^7.0.0",
                 "natural-compare": "^1.4.0",
@@ -2652,7 +3024,7 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.39.0",
+                "@typescript-eslint/parser": "^8.46.2",
                 "eslint": "^8.57.0 || ^9.0.0",
                 "typescript": ">=4.8.4 <6.0.0"
             }
@@ -2668,16 +3040,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.0.tgz",
-            "integrity": "sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.2.tgz",
+            "integrity": "sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.39.0",
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0",
+                "@typescript-eslint/scope-manager": "8.46.2",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2693,14 +3065,14 @@
             }
         },
         "node_modules/@typescript-eslint/project-service": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.0.tgz",
-            "integrity": "sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.2.tgz",
+            "integrity": "sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/tsconfig-utils": "^8.39.0",
-                "@typescript-eslint/types": "^8.39.0",
+                "@typescript-eslint/tsconfig-utils": "^8.46.2",
+                "@typescript-eslint/types": "^8.46.2",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2715,14 +3087,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz",
-            "integrity": "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.2.tgz",
+            "integrity": "sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0"
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2733,9 +3105,9 @@
             }
         },
         "node_modules/@typescript-eslint/tsconfig-utils": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz",
-            "integrity": "sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.2.tgz",
+            "integrity": "sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2750,15 +3122,15 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz",
-            "integrity": "sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.2.tgz",
+            "integrity": "sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0",
-                "@typescript-eslint/utils": "8.39.0",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2",
+                "@typescript-eslint/utils": "8.46.2",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^2.1.0"
             },
@@ -2775,9 +3147,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.0.tgz",
-            "integrity": "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+            "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2789,16 +3161,16 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz",
-            "integrity": "sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.2.tgz",
+            "integrity": "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/project-service": "8.39.0",
-                "@typescript-eslint/tsconfig-utils": "8.39.0",
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0",
+                "@typescript-eslint/project-service": "8.46.2",
+                "@typescript-eslint/tsconfig-utils": "8.46.2",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2844,9 +3216,9 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-            "version": "7.7.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-            "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+            "version": "7.7.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+            "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -2857,16 +3229,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.0.tgz",
-            "integrity": "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.2.tgz",
+            "integrity": "sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.7.0",
-                "@typescript-eslint/scope-manager": "8.39.0",
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0"
+                "@typescript-eslint/scope-manager": "8.46.2",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2881,13 +3253,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz",
-            "integrity": "sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz",
+            "integrity": "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/types": "8.46.2",
                 "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
@@ -2899,21 +3271,21 @@
             }
         },
         "node_modules/@vitejs/plugin-react": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
-            "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.0.tgz",
+            "integrity": "sha512-4LuWrg7EKWgQaMJfnN+wcmbAW+VSsCmqGohftWjuct47bv8uE4n/nPpq4XjJPsxgq00GGG5J8dvBczp8uxScew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.28.0",
+                "@babel/core": "^7.28.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.27",
+                "@rolldown/pluginutils": "1.0.0-beta.43",
                 "@types/babel__core": "^7.20.5",
-                "react-refresh": "^0.17.0"
+                "react-refresh": "^0.18.0"
             },
             "engines": {
-                "node": "^14.18.0 || >=16.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "peerDependencies": {
                 "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
@@ -2984,21 +3356,20 @@
             }
         },
         "node_modules/ansi-regex": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-            "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+                "node": ">=8"
             }
         },
         "node_modules/ansi-styles": {
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
@@ -3010,31 +3381,6 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/any-promise": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-            "license": "MIT"
-        },
-        "node_modules/anymatch": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
-            "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
-            "license": "ISC",
-            "dependencies": {
-                "normalize-path": "^3.0.0",
-                "picomatch": "^2.0.4"
-            },
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/arg": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-            "license": "MIT"
-        },
         "node_modules/argparse": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -3096,18 +3442,17 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
             "license": "MIT"
         },
-        "node_modules/binary-extensions": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
-            "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+        "node_modules/baseline-browser-mapping": {
+            "version": "2.8.21",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.21.tgz",
+            "integrity": "sha512-JU0h5APyQNsHOlAM7HnQnPToSDQoEBZqzu/YBlqDnEeymPnZDREeXJA3KBMQee+dKteAxZ2AtvQEvVYdZf241Q==",
+            "devOptional": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "baseline-browser-mapping": "dist/cli.js"
             }
         },
         "node_modules/brace-expansion": {
@@ -3125,6 +3470,7 @@
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
             "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "fill-range": "^7.1.1"
@@ -3134,9 +3480,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.25.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
-            "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
+            "version": "4.27.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz",
+            "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==",
             "devOptional": true,
             "funding": [
                 {
@@ -3154,10 +3500,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001733",
-                "electron-to-chromium": "^1.5.199",
-                "node-releases": "^2.0.19",
-                "update-browserslist-db": "^1.1.3"
+                "baseline-browser-mapping": "^2.8.19",
+                "caniuse-lite": "^1.0.30001751",
+                "electron-to-chromium": "^1.5.238",
+                "node-releases": "^2.0.26",
+                "update-browserslist-db": "^1.1.4"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -3167,23 +3514,23 @@
             }
         },
         "node_modules/c12": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/c12/-/c12-3.2.0.tgz",
-            "integrity": "sha512-ixkEtbYafL56E6HiFuonMm1ZjoKtIo7TH68/uiEq4DAwv9NcUX2nJ95F8TrbMeNjqIkZpruo3ojXQJ+MGG5gcQ==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.1.tgz",
+            "integrity": "sha512-LcWQ01LT9tkoUINHgpIOv3mMs+Abv7oVCrtpMRi1PaapVEpWoMga5WuT7/DqFTu7URP9ftbOmimNw1KNIGh9DQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "chokidar": "^4.0.3",
                 "confbox": "^0.2.2",
                 "defu": "^6.1.4",
-                "dotenv": "^17.2.1",
+                "dotenv": "^17.2.3",
                 "exsolve": "^1.0.7",
                 "giget": "^2.0.0",
-                "jiti": "^2.5.1",
+                "jiti": "^2.6.1",
                 "ohash": "^2.0.11",
                 "pathe": "^2.0.3",
-                "perfect-debounce": "^1.0.0",
-                "pkg-types": "^2.2.0",
+                "perfect-debounce": "^2.0.0",
+                "pkg-types": "^2.3.0",
                 "rc9": "^2.1.2"
             },
             "peerDependencies": {
@@ -3212,19 +3559,10 @@
                 "node": ">=6"
             }
         },
-        "node_modules/camelcase-css": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001733",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001733.tgz",
-            "integrity": "sha512-e4QKw/O2Kavj2VQTKZWrwzkt3IxOmIlU6ajRb6LP64LHpBo1J67k2Hi4Vu/TgJWsNtynurfS0uK3MaUTCPfu5Q==",
+            "version": "1.0.30001751",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz",
+            "integrity": "sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==",
             "devOptional": true,
             "funding": [
                 {
@@ -3312,69 +3650,6 @@
                 "node": ">=12"
             }
         },
-        "node_modules/cliui/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cliui/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/cliui/node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cliui/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cliui/node_modules/wrap-ansi": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-            "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^4.0.0",
-                "string-width": "^4.1.0",
-                "strip-ansi": "^6.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
         "node_modules/clsx": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -3404,6 +3679,7 @@
             "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": {
                 "color-name": "~1.1.4"
@@ -3416,17 +3692,9 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
             "license": "MIT"
         },
-        "node_modules/commander": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3480,6 +3748,7 @@
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
@@ -3490,18 +3759,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "license": "MIT",
-            "bin": {
-                "cssesc": "bin/cssesc"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/csstype": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -3509,10 +3766,26 @@
             "devOptional": true,
             "license": "MIT"
         },
+        "node_modules/date-fns": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/kossnocorp"
+            }
+        },
+        "node_modules/date-fns-jalali": {
+            "version": "4.1.0-0",
+            "resolved": "https://registry.npmjs.org/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz",
+            "integrity": "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==",
+            "license": "MIT"
+        },
         "node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -3556,28 +3829,25 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/detect-libc": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+            "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/detect-node-es": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
             "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
             "license": "MIT"
         },
-        "node_modules/didyoumean": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-            "license": "Apache-2.0"
-        },
-        "node_modules/dlv": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-            "license": "MIT"
-        },
         "node_modules/dotenv": {
-            "version": "17.2.1",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
-            "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==",
+            "version": "17.2.3",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+            "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
             "dev": true,
             "license": "BSD-2-Clause",
             "engines": {
@@ -3587,25 +3857,33 @@
                 "url": "https://dotenvx.com"
             }
         },
-        "node_modules/eastasianwidth": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-            "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
-            "license": "MIT"
-        },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.199",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz",
-            "integrity": "sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==",
+            "version": "1.5.243",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.243.tgz",
+            "integrity": "sha512-ZCphxFW3Q1TVhcgS9blfut1PX8lusVi2SvXQgmEEnK4TCmE1JhH2JkjJN+DNt0pJJwfBri5AROBnz2b/C+YU9g==",
             "devOptional": true,
             "license": "ISC"
         },
         "node_modules/emoji-regex": {
-            "version": "9.2.2",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-            "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
             "license": "MIT"
         },
+        "node_modules/enhanced-resolve": {
+            "version": "5.18.3",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+            "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
         "node_modules/es6-promise": {
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
@@ -3614,9 +3892,9 @@
             "license": "MIT"
         },
         "node_modules/esbuild": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
-            "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.11.tgz",
+            "integrity": "sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -3627,32 +3905,32 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.8",
-                "@esbuild/android-arm": "0.25.8",
-                "@esbuild/android-arm64": "0.25.8",
-                "@esbuild/android-x64": "0.25.8",
-                "@esbuild/darwin-arm64": "0.25.8",
-                "@esbuild/darwin-x64": "0.25.8",
-                "@esbuild/freebsd-arm64": "0.25.8",
-                "@esbuild/freebsd-x64": "0.25.8",
-                "@esbuild/linux-arm": "0.25.8",
-                "@esbuild/linux-arm64": "0.25.8",
-                "@esbuild/linux-ia32": "0.25.8",
-                "@esbuild/linux-loong64": "0.25.8",
-                "@esbuild/linux-mips64el": "0.25.8",
-                "@esbuild/linux-ppc64": "0.25.8",
-                "@esbuild/linux-riscv64": "0.25.8",
-                "@esbuild/linux-s390x": "0.25.8",
-                "@esbuild/linux-x64": "0.25.8",
-                "@esbuild/netbsd-arm64": "0.25.8",
-                "@esbuild/netbsd-x64": "0.25.8",
-                "@esbuild/openbsd-arm64": "0.25.8",
-                "@esbuild/openbsd-x64": "0.25.8",
-                "@esbuild/openharmony-arm64": "0.25.8",
-                "@esbuild/sunos-x64": "0.25.8",
-                "@esbuild/win32-arm64": "0.25.8",
-                "@esbuild/win32-ia32": "0.25.8",
-                "@esbuild/win32-x64": "0.25.8"
+                "@esbuild/aix-ppc64": "0.25.11",
+                "@esbuild/android-arm": "0.25.11",
+                "@esbuild/android-arm64": "0.25.11",
+                "@esbuild/android-x64": "0.25.11",
+                "@esbuild/darwin-arm64": "0.25.11",
+                "@esbuild/darwin-x64": "0.25.11",
+                "@esbuild/freebsd-arm64": "0.25.11",
+                "@esbuild/freebsd-x64": "0.25.11",
+                "@esbuild/linux-arm": "0.25.11",
+                "@esbuild/linux-arm64": "0.25.11",
+                "@esbuild/linux-ia32": "0.25.11",
+                "@esbuild/linux-loong64": "0.25.11",
+                "@esbuild/linux-mips64el": "0.25.11",
+                "@esbuild/linux-ppc64": "0.25.11",
+                "@esbuild/linux-riscv64": "0.25.11",
+                "@esbuild/linux-s390x": "0.25.11",
+                "@esbuild/linux-x64": "0.25.11",
+                "@esbuild/netbsd-arm64": "0.25.11",
+                "@esbuild/netbsd-x64": "0.25.11",
+                "@esbuild/openbsd-arm64": "0.25.11",
+                "@esbuild/openbsd-x64": "0.25.11",
+                "@esbuild/openharmony-arm64": "0.25.11",
+                "@esbuild/sunos-x64": "0.25.11",
+                "@esbuild/win32-arm64": "0.25.11",
+                "@esbuild/win32-ia32": "0.25.11",
+                "@esbuild/win32-x64": "0.25.11"
             }
         },
         "node_modules/escalade": {
@@ -3679,25 +3957,24 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.33.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
-            "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
+            "version": "9.38.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
+            "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.21.0",
-                "@eslint/config-helpers": "^0.3.1",
-                "@eslint/core": "^0.15.2",
+                "@eslint/config-array": "^0.21.1",
+                "@eslint/config-helpers": "^0.4.1",
+                "@eslint/core": "^0.16.0",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.33.0",
-                "@eslint/plugin-kit": "^0.3.5",
+                "@eslint/js": "9.38.0",
+                "@eslint/plugin-kit": "^0.4.0",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
                 "@types/estree": "^1.0.6",
-                "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.6",
@@ -3740,22 +4017,29 @@
             }
         },
         "node_modules/eslint-plugin-react-hooks": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz",
-            "integrity": "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
+            "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
             "dev": true,
             "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.24.4",
+                "@babel/parser": "^7.24.4",
+                "hermes-parser": "^0.25.1",
+                "zod": "^3.25.0 || ^4.0.0",
+                "zod-validation-error": "^3.5.0 || ^4.0.0"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             },
             "peerDependencies": {
                 "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
             }
         },
         "node_modules/eslint-plugin-react-refresh": {
-            "version": "0.4.20",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.20.tgz",
-            "integrity": "sha512-XpbHQ2q5gUF8BGOX4dHe+71qoirYMhApEPZ7sfhF/dNnOF1UXnCMGZf79SFTBO7Bz5YEIT4TMieSlJBWhP9WBA==",
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.24.tgz",
+            "integrity": "sha512-nLHIW7TEq3aLrEYWpVaJ1dRgFR+wLDPN8e8FpYAql/bMV2oBEfC37K0gLEGgv9fy66juNShSMV8OkTqzltcG/w==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -3857,9 +4141,9 @@
             }
         },
         "node_modules/eta": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/eta/-/eta-2.2.0.tgz",
-            "integrity": "sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==",
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz",
+            "integrity": "sha512-e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3887,6 +4171,7 @@
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
             "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
@@ -3903,6 +4188,7 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
             "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.1"
@@ -3936,6 +4222,7 @@
             "version": "1.19.1",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
             "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "reusify": "^1.0.4"
@@ -3958,6 +4245,7 @@
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
             "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
@@ -4004,22 +4292,6 @@
             "dev": true,
             "license": "ISC"
         },
-        "node_modules/foreground-child": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
-            "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
-            "license": "ISC",
-            "dependencies": {
-                "cross-spawn": "^7.0.6",
-                "signal-exit": "^4.0.1"
-            },
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/fraction.js": {
             "version": "4.3.7",
             "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
@@ -4035,13 +4307,13 @@
             }
         },
         "node_modules/framer-motion": {
-            "version": "11.18.2",
-            "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.2.tgz",
-            "integrity": "sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==",
+            "version": "12.23.24",
+            "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.23.24.tgz",
+            "integrity": "sha512-HMi5HRoRCTou+3fb3h9oTLyJGBxHfW+HnNE25tAXOvVx/IvwMHK0cx7IR4a2ZU6sh3IX1Z+4ts32PcYBOqka8w==",
             "license": "MIT",
             "dependencies": {
-                "motion-dom": "^11.18.1",
-                "motion-utils": "^11.18.1",
+                "motion-dom": "^12.23.23",
+                "motion-utils": "^12.23.6",
                 "tslib": "^2.4.0"
             },
             "peerDependencies": {
@@ -4065,6 +4337,7 @@
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
             "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
             "optional": true,
@@ -4075,15 +4348,6 @@
                 "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
             }
         },
-        "node_modules/function-bind": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -4131,30 +4395,11 @@
                 "giget": "dist/cli.mjs"
             }
         },
-        "node_modules/glob": {
-            "version": "10.4.5",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-            "license": "ISC",
-            "dependencies": {
-                "foreground-child": "^3.1.0",
-                "jackspeak": "^3.1.2",
-                "minimatch": "^9.0.4",
-                "minipass": "^7.1.2",
-                "package-json-from-dist": "^1.0.0",
-                "path-scurry": "^1.11.1"
-            },
-            "bin": {
-                "glob": "dist/esm/bin.mjs"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/glob-parent": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
             "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.3"
@@ -4163,34 +4408,10 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/glob/node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/glob/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/globals": {
-            "version": "15.15.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
-            "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
+            "version": "16.4.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-16.4.0.tgz",
+            "integrity": "sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -4200,6 +4421,12 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/graceful-fs": {
+            "version": "4.2.11",
+            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+            "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+            "license": "ISC"
+        },
         "node_modules/graphemer": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -4217,16 +4444,21 @@
                 "node": ">=8"
             }
         },
-        "node_modules/hasown": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+        "node_modules/hermes-estree": {
+            "version": "0.25.1",
+            "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+            "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/hermes-parser": {
+            "version": "0.25.1",
+            "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+            "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
+                "hermes-estree": "0.25.1"
             }
         },
         "node_modules/html-parse-stringify": {
@@ -4246,9 +4478,9 @@
             "license": "MIT"
         },
         "node_modules/i18next": {
-            "version": "24.2.3",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
-            "integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==",
+            "version": "25.6.0",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.6.0.tgz",
+            "integrity": "sha512-tTn8fLrwBYtnclpL5aPXK/tAYBLWVvoHM1zdfXoRNLcI+RvtMsoZRV98ePlaW3khHYKuNh/Q65W/+NVFUeIwVw==",
             "funding": [
                 {
                     "type": "individual",
@@ -4265,7 +4497,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.26.10"
+                "@babel/runtime": "^7.27.6"
             },
             "peerDependencies": {
                 "typescript": "^5"
@@ -4322,37 +4554,11 @@
                 "node": ">=0.8.19"
             }
         },
-        "node_modules/is-binary-path": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-            "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-            "license": "MIT",
-            "dependencies": {
-                "binary-extensions": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/is-core-module": {
-            "version": "2.16.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-            "license": "MIT",
-            "dependencies": {
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
             "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
@@ -4362,6 +4568,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -4371,6 +4578,7 @@
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-extglob": "^2.1.1"
@@ -4383,6 +4591,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
@@ -4392,23 +4601,9 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
             "license": "ISC"
         },
-        "node_modules/jackspeak": {
-            "version": "3.4.3",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-            "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-            "license": "BlueOak-1.0.0",
-            "dependencies": {
-                "@isaacs/cliui": "^8.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            },
-            "optionalDependencies": {
-                "@pkgjs/parseargs": "^0.11.0"
-            }
-        },
         "node_modules/javascript-natural-sort": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
@@ -4416,19 +4611,18 @@
             "license": "MIT"
         },
         "node_modules/jiti": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz",
-            "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
-            "dev": true,
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+            "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
             "license": "MIT",
             "bin": {
                 "jiti": "lib/jiti-cli.mjs"
             }
         },
         "node_modules/jotai": {
-            "version": "2.13.0",
-            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.13.0.tgz",
-            "integrity": "sha512-H43zXdanNTdpfOEJ4NVbm4hgmrctpXLZagjJNcqAywhUv+sTE7esvFjwm5oBg/ywT9Qw63lIkM6fjrhFuW8UDg==",
+            "version": "2.15.0",
+            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.15.0.tgz",
+            "integrity": "sha512-nbp/6jN2Ftxgw0VwoVnOg0m5qYM1rVcfvij+MZx99Z5IK13eGve9FJoCwGv+17JvVthTjhSmNtT5e1coJnr6aw==",
             "license": "MIT",
             "peer": true,
             "engines": {
@@ -4553,23 +4747,254 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/lilconfig": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-            "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-            "license": "MIT",
+        "node_modules/lightningcss": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz",
+            "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==",
+            "license": "MPL-2.0",
+            "dependencies": {
+                "detect-libc": "^2.0.3"
+            },
             "engines": {
-                "node": ">=14"
+                "node": ">= 12.0.0"
             },
             "funding": {
-                "url": "https://github.com/sponsors/antonk52"
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            },
+            "optionalDependencies": {
+                "lightningcss-android-arm64": "1.30.2",
+                "lightningcss-darwin-arm64": "1.30.2",
+                "lightningcss-darwin-x64": "1.30.2",
+                "lightningcss-freebsd-x64": "1.30.2",
+                "lightningcss-linux-arm-gnueabihf": "1.30.2",
+                "lightningcss-linux-arm64-gnu": "1.30.2",
+                "lightningcss-linux-arm64-musl": "1.30.2",
+                "lightningcss-linux-x64-gnu": "1.30.2",
+                "lightningcss-linux-x64-musl": "1.30.2",
+                "lightningcss-win32-arm64-msvc": "1.30.2",
+                "lightningcss-win32-x64-msvc": "1.30.2"
             }
         },
-        "node_modules/lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "license": "MIT"
+        "node_modules/lightningcss-android-arm64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz",
+            "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-arm64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz",
+            "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-x64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz",
+            "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-freebsd-x64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz",
+            "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm-gnueabihf": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz",
+            "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-gnu": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz",
+            "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-musl": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz",
+            "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-x64-gnu": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz",
+            "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-x64-musl": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz",
+            "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-arm64-msvc": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz",
+            "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-x64-msvc": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz",
+            "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
         },
         "node_modules/locate-path": {
             "version": "6.0.0",
@@ -4611,27 +5036,37 @@
             }
         },
         "node_modules/lucide-react": {
-            "version": "0.454.0",
-            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.454.0.tgz",
-            "integrity": "sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ==",
+            "version": "0.545.0",
+            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.545.0.tgz",
+            "integrity": "sha512-7r1/yUuflQDSt4f1bpn5ZAocyIxcTyVyBBChSVtBKn5M+392cPmI5YJMWOJKk/HUWGm5wg83chlAZtCcGbEZtw==",
             "license": "ISC",
             "peerDependencies": {
-                "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
+                "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
         "node_modules/luxon": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
-            "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
+            "version": "3.7.2",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
+            "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
             "license": "MIT",
             "engines": {
                 "node": ">=12"
             }
         },
+        "node_modules/magic-string": {
+            "version": "0.30.21",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.5"
+            }
+        },
         "node_modules/merge2": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
             "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 8"
@@ -4641,6 +5076,7 @@
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
             "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
@@ -4663,28 +5099,19 @@
                 "node": "*"
             }
         },
-        "node_modules/minipass": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
         "node_modules/motion-dom": {
-            "version": "11.18.1",
-            "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.18.1.tgz",
-            "integrity": "sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==",
+            "version": "12.23.23",
+            "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.23.23.tgz",
+            "integrity": "sha512-n5yolOs0TQQBRUFImrRfs/+6X4p3Q4n1dUEqt/H58Vx7OW6RF+foWEgmTVDhIWJIMXOuNNL0apKH2S16en9eiA==",
             "license": "MIT",
             "dependencies": {
-                "motion-utils": "^11.18.1"
+                "motion-utils": "^12.23.6"
             }
         },
         "node_modules/motion-utils": {
-            "version": "11.18.1",
-            "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.18.1.tgz",
-            "integrity": "sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA==",
+            "version": "12.23.6",
+            "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.23.6.tgz",
+            "integrity": "sha512-eAWoPgr4eFEOFfg2WjIsMoqJTW6Z8MTUCgn/GZ3VRpClWBdnbjryiA3ZSNLyxCTmCQx4RmYX6jX1iWHbenUPNQ==",
             "license": "MIT"
         },
         "node_modules/ms": {
@@ -4693,17 +5120,6 @@
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
             "license": "MIT"
         },
-        "node_modules/mz": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-            "license": "MIT",
-            "dependencies": {
-                "any-promise": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "thenify-all": "^1.0.0"
-            }
-        },
         "node_modules/nanoid": {
             "version": "3.3.11",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -4791,21 +5207,12 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+            "version": "2.0.27",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+            "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
             "devOptional": true,
             "license": "MIT"
         },
-        "node_modules/normalize-path": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-            "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/normalize-range": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
@@ -4817,16 +5224,16 @@
             }
         },
         "node_modules/nypm": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.1.tgz",
-            "integrity": "sha512-hlacBiRiv1k9hZFiphPUkfSQ/ZfQzZDzC+8z0wL3lvDAOUu/2NnChkKuMoMjNur/9OpKuz2QsIeiPVN0xM5Q0w==",
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.2.tgz",
+            "integrity": "sha512-7eM+hpOtrKrBDCh7Ypu2lJ9Z7PNZBdi/8AT3AX8xoCj43BBVHD0hPSTEvMtkMpfs8FCqBGhxB+uToIQimA111g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "citty": "^0.1.6",
                 "consola": "^3.4.2",
                 "pathe": "^2.0.3",
-                "pkg-types": "^2.2.0",
+                "pkg-types": "^2.3.0",
                 "tinyexec": "^1.0.1"
             },
             "bin": {
@@ -4941,24 +5348,6 @@
                 "node": ">= 6"
             }
         },
-        "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"
-            }
-        },
-        "node_modules/object-hash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/ohash": {
             "version": "2.0.11",
             "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
@@ -4966,6 +5355,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/openapi-types": {
+            "version": "12.1.3",
+            "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
+            "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/optionator": {
             "version": "0.9.4",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -5016,12 +5412,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/package-json-from-dist": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-            "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
-            "license": "BlueOak-1.0.0"
-        },
         "node_modules/parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -5049,39 +5439,12 @@
             "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": {
                 "node": ">=8"
             }
         },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "license": "MIT"
-        },
-        "node_modules/path-scurry": {
-            "version": "1.11.1",
-            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-            "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
-            "license": "BlueOak-1.0.0",
-            "dependencies": {
-                "lru-cache": "^10.2.0",
-                "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.18"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/path-scurry/node_modules/lru-cache": {
-            "version": "10.4.3",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-            "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
-            "license": "ISC"
-        },
         "node_modules/pathe": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -5090,9 +5453,9 @@
             "license": "MIT"
         },
         "node_modules/perfect-debounce": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.0.0.tgz",
+            "integrity": "sha512-fkEH/OBiKrqqI/yIgjR92lMfs2K8105zt/VT6+7eTjNwisrsh47CeIED9z58zI7DfKdH3uHAn25ziRZn3kgAow==",
             "dev": true,
             "license": "MIT"
         },
@@ -5106,6 +5469,7 @@
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
             "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8.6"
@@ -5114,28 +5478,10 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "node_modules/pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/pirates": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-            "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/pkg-types": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
-            "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
+            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5172,119 +5518,11 @@
                 "node": "^10 || ^12 || >=14"
             }
         },
-        "node_modules/postcss-import": {
-            "version": "15.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-            "license": "MIT",
-            "dependencies": {
-                "postcss-value-parser": "^4.0.0",
-                "read-cache": "^1.0.0",
-                "resolve": "^1.1.7"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.0.0"
-            }
-        },
-        "node_modules/postcss-js": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-            "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
-            "license": "MIT",
-            "dependencies": {
-                "camelcase-css": "^2.0.1"
-            },
-            "engines": {
-                "node": "^12 || ^14 || >= 16"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            },
-            "peerDependencies": {
-                "postcss": "^8.4.21"
-            }
-        },
-        "node_modules/postcss-load-config": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-            "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "lilconfig": "^3.0.0",
-                "yaml": "^2.3.4"
-            },
-            "engines": {
-                "node": ">= 14"
-            },
-            "peerDependencies": {
-                "postcss": ">=8.0.9",
-                "ts-node": ">=9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "postcss": {
-                    "optional": true
-                },
-                "ts-node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/postcss-nested": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-            "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "postcss-selector-parser": "^6.1.1"
-            },
-            "engines": {
-                "node": ">=12.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.2.14"
-            }
-        },
-        "node_modules/postcss-selector-parser": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
-            "license": "MIT",
-            "dependencies": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/postcss-value-parser": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/prelude-ls": {
@@ -5413,6 +5651,7 @@
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
             "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -5441,30 +5680,51 @@
             }
         },
         "node_modules/react": {
-            "version": "19.1.1",
-            "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
-            "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
+            "version": "19.2.0",
+            "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
+            "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/react-dom": {
-            "version": "19.1.1",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
-            "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
+        "node_modules/react-day-picker": {
+            "version": "9.11.1",
+            "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.11.1.tgz",
+            "integrity": "sha512-l3ub6o8NlchqIjPKrRFUCkTUEq6KwemQlfv3XZzzwpUeGwmDJ+0u0Upmt38hJyd7D/vn2dQoOoLV/qAp0o3uUw==",
             "license": "MIT",
             "dependencies": {
-                "scheduler": "^0.26.0"
+                "@date-fns/tz": "^1.4.1",
+                "date-fns": "^4.1.0",
+                "date-fns-jalali": "^4.1.0-0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://github.com/sponsors/gpbl"
             },
             "peerDependencies": {
-                "react": "^19.1.1"
+                "react": ">=16.8.0"
+            }
+        },
+        "node_modules/react-dom": {
+            "version": "19.2.0",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
+            "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
+            "license": "MIT",
+            "dependencies": {
+                "scheduler": "^0.27.0"
+            },
+            "peerDependencies": {
+                "react": "^19.2.0"
             }
         },
         "node_modules/react-hook-form": {
-            "version": "7.62.0",
-            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.62.0.tgz",
-            "integrity": "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA==",
+            "version": "7.65.0",
+            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.65.0.tgz",
+            "integrity": "sha512-xtOzDz063WcXvGWaHgLNrNzlsdFgtUWcb32E6WFaGTd7kPZG3EeDusjdZfUsPwKCKVXy1ZlntifaHZ4l8pAsmw==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.0.0"
@@ -5478,16 +5738,17 @@
             }
         },
         "node_modules/react-i18next": {
-            "version": "15.6.1",
-            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.6.1.tgz",
-            "integrity": "sha512-uGrzSsOUUe2sDBG/+FJq2J1MM+Y4368/QW8OLEKSFvnDflHBbZhSd1u3UkW0Z06rMhZmnB/AQrhCpYfE5/5XNg==",
+            "version": "16.2.2",
+            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-16.2.2.tgz",
+            "integrity": "sha512-iKgJMloKpkLUCy6w/0BEJSVQ5jG2WbnFiO2w/9wwa8nc+obsEZjQErRCw27O7BHlpscKfpWSu5vTnC+3fBMQfQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.27.6",
-                "html-parse-stringify": "^3.0.1"
+                "html-parse-stringify": "^3.0.1",
+                "use-sync-external-store": "^1.6.0"
             },
             "peerDependencies": {
-                "i18next": ">= 23.2.3",
+                "i18next": ">= 25.5.2",
                 "react": ">= 16.8.0",
                 "typescript": "^5"
             },
@@ -5504,9 +5765,9 @@
             }
         },
         "node_modules/react-refresh": {
-            "version": "0.17.0",
-            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
-            "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
+            "integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -5561,9 +5822,9 @@
             }
         },
         "node_modules/react-router": {
-            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.8.0.tgz",
-            "integrity": "sha512-r15M3+LHKgM4SOapNmsH3smAizWds1vJ0Z9C4mWaKnT9/wD7+d/0jYcj6LmOvonkrO4Rgdyp4KQ/29gWN2i1eg==",
+            "version": "7.9.5",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.5.tgz",
+            "integrity": "sha512-JmxqrnBZ6E9hWmf02jzNn9Jm3UqyeimyiwzD69NjxGySG6lIz/1LVPsoTCwN7NBX2XjCEa1LIX5EMz1j2b6u6A==",
             "license": "MIT",
             "dependencies": {
                 "cookie": "^1.0.1",
@@ -5583,12 +5844,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.8.0.tgz",
-            "integrity": "sha512-ntInsnDVnVRdtSu6ODmTQ41cbluak/ENeTif7GBce0L6eztFg6/e1hXAysFQI8X25C8ipKmT9cClbJwxx3Kaqw==",
+            "version": "7.9.5",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.9.5.tgz",
+            "integrity": "sha512-mkEmq/K8tKN63Ae2M7Xgz3c9l9YNbY+NHH6NNeUmLA3kDkhKXRsNb/ZpxaEunvGo2/3YXdk5EJU3Hxp3ocaBPw==",
             "license": "MIT",
             "dependencies": {
-                "react-router": "7.8.0"
+                "react-router": "7.9.5"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -5621,24 +5882,15 @@
             }
         },
         "node_modules/react-virtuoso": {
-            "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==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.14.1.tgz",
+            "integrity": "sha512-NRUF1ak8lY+Tvc6WN9cce59gU+lilzVtOozP+pm9J7iHshLGGjsiAB4rB2qlBPHjFbcXOQpT+7womNHGDUql8w==",
             "license": "MIT",
             "peerDependencies": {
                 "react": ">=16 || >=17 || >= 18 || >= 19",
                 "react-dom": ">=16 || >=17 || >= 18 || >=19"
             }
         },
-        "node_modules/read-cache": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-            "license": "MIT",
-            "dependencies": {
-                "pify": "^2.3.0"
-            }
-        },
         "node_modules/readdirp": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
@@ -5673,26 +5925,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/resolve": {
-            "version": "1.22.10",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-            "license": "MIT",
-            "dependencies": {
-                "is-core-module": "^2.16.0",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -5707,6 +5939,7 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
             "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "iojs": ">=1.0.0",
@@ -5714,9 +5947,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
-            "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz",
+            "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5730,26 +5963,28 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.46.2",
-                "@rollup/rollup-android-arm64": "4.46.2",
-                "@rollup/rollup-darwin-arm64": "4.46.2",
-                "@rollup/rollup-darwin-x64": "4.46.2",
-                "@rollup/rollup-freebsd-arm64": "4.46.2",
-                "@rollup/rollup-freebsd-x64": "4.46.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.46.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.46.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.46.2",
-                "@rollup/rollup-linux-arm64-musl": "4.46.2",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.46.2",
-                "@rollup/rollup-linux-ppc64-gnu": "4.46.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.46.2",
-                "@rollup/rollup-linux-riscv64-musl": "4.46.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.46.2",
-                "@rollup/rollup-linux-x64-gnu": "4.46.2",
-                "@rollup/rollup-linux-x64-musl": "4.46.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.46.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.46.2",
-                "@rollup/rollup-win32-x64-msvc": "4.46.2",
+                "@rollup/rollup-android-arm-eabi": "4.52.5",
+                "@rollup/rollup-android-arm64": "4.52.5",
+                "@rollup/rollup-darwin-arm64": "4.52.5",
+                "@rollup/rollup-darwin-x64": "4.52.5",
+                "@rollup/rollup-freebsd-arm64": "4.52.5",
+                "@rollup/rollup-freebsd-x64": "4.52.5",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.52.5",
+                "@rollup/rollup-linux-arm-musleabihf": "4.52.5",
+                "@rollup/rollup-linux-arm64-gnu": "4.52.5",
+                "@rollup/rollup-linux-arm64-musl": "4.52.5",
+                "@rollup/rollup-linux-loong64-gnu": "4.52.5",
+                "@rollup/rollup-linux-ppc64-gnu": "4.52.5",
+                "@rollup/rollup-linux-riscv64-gnu": "4.52.5",
+                "@rollup/rollup-linux-riscv64-musl": "4.52.5",
+                "@rollup/rollup-linux-s390x-gnu": "4.52.5",
+                "@rollup/rollup-linux-x64-gnu": "4.52.5",
+                "@rollup/rollup-linux-x64-musl": "4.52.5",
+                "@rollup/rollup-openharmony-arm64": "4.52.5",
+                "@rollup/rollup-win32-arm64-msvc": "4.52.5",
+                "@rollup/rollup-win32-ia32-msvc": "4.52.5",
+                "@rollup/rollup-win32-x64-gnu": "4.52.5",
+                "@rollup/rollup-win32-x64-msvc": "4.52.5",
                 "fsevents": "~2.3.2"
             }
         },
@@ -5757,6 +5992,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
             "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -5777,9 +6013,9 @@
             }
         },
         "node_modules/scheduler": {
-            "version": "0.26.0",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
-            "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+            "version": "0.27.0",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+            "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
             "license": "MIT"
         },
         "node_modules/semver": {
@@ -5793,15 +6029,16 @@
             }
         },
         "node_modules/set-cookie-parser": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-            "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+            "version": "2.7.2",
+            "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+            "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
             "license": "MIT"
         },
         "node_modules/shebang-command": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^3.0.0"
@@ -5814,6 +6051,7 @@
             "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": {
                 "node": ">=8"
@@ -5879,22 +6117,10 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/signal-exit": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
-            "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=14"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/sonner": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
-            "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/sonner/-/sonner-2.0.7.tgz",
+            "integrity": "sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==",
             "license": "MIT",
             "peerDependencies": {
                 "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
@@ -5911,27 +6137,10 @@
             }
         },
         "node_modules/string-width": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
-            "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
-            "license": "MIT",
-            "dependencies": {
-                "eastasianwidth": "^0.2.0",
-                "emoji-regex": "^9.2.2",
-                "strip-ansi": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/string-width-cjs": {
-            "name": "string-width",
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
@@ -5942,53 +6151,11 @@
                 "node": ">=8"
             }
         },
-        "node_modules/string-width-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/string-width-cjs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "license": "MIT"
-        },
-        "node_modules/string-width-cjs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/strip-ansi": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-            }
-        },
-        "node_modules/strip-ansi-cjs": {
-            "name": "strip-ansi",
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
@@ -5997,15 +6164,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/strip-json-comments": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -6019,28 +6177,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/sucrase": {
-            "version": "3.35.0",
-            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
-            "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.2",
-                "commander": "^4.0.0",
-                "glob": "^10.3.10",
-                "lines-and-columns": "^1.1.6",
-                "mz": "^2.7.0",
-                "pirates": "^4.0.1",
-                "ts-interface-checker": "^0.1.9"
-            },
-            "bin": {
-                "sucrase": "bin/sucrase",
-                "sucrase-node": "bin/sucrase-node"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
         "node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -6054,18 +6190,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/swagger-schema-official": {
             "version": "2.0.0-bab6bed",
             "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz",
@@ -6074,25 +6198,27 @@
             "license": "ISC"
         },
         "node_modules/swagger-typescript-api": {
-            "version": "13.2.8",
-            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.8.tgz",
-            "integrity": "sha512-TgC8cB2GwrQctiUrLW9cVcPkiH5/zGbUCD3Y5zjeeFAtcCBGxLlBp9Df/UK+ux/oQ2J8x3C5a4TOz+tAZ8jOkQ==",
+            "version": "13.2.16",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.16.tgz",
+            "integrity": "sha512-PbjfCbNMx1mxqLamUpMA96fl2HJQh9Q5qRWyVRXmZslRJFHBkMfAj7OnEv6IOtSnmD+TXp073yBhKWiUxqeLhQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@biomejs/js-api": "2.0.3",
-                "@biomejs/wasm-nodejs": "2.1.4",
+                "@biomejs/js-api": "3.0.0",
+                "@biomejs/wasm-nodejs": "2.2.6",
+                "@types/lodash": "^4.17.20",
                 "@types/swagger-schema-official": "^2.0.25",
-                "c12": "^3.0.4",
+                "c12": "^3.3.0",
                 "citty": "^0.1.6",
                 "consola": "^3.4.2",
-                "eta": "^2.2.0",
-                "js-yaml": "^4.1.0",
+                "eta": "^3.5.0",
                 "lodash": "^4.17.21",
-                "nanoid": "^5.1.5",
+                "nanoid": "^5.1.6",
+                "openapi-types": "^12.1.3",
                 "swagger-schema-official": "2.0.0-bab6bed",
                 "swagger2openapi": "^7.0.8",
-                "typescript": "~5.9.2"
+                "typescript": "~5.9.3",
+                "yaml": "^2.8.1"
             },
             "bin": {
                 "sta": "dist/cli.js",
@@ -6103,9 +6229,9 @@
             }
         },
         "node_modules/swagger-typescript-api/node_modules/nanoid": {
-            "version": "5.1.5",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
-            "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
+            "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
             "dev": true,
             "funding": [
                 {
@@ -6121,20 +6247,6 @@
                 "node": "^18 || >=20"
             }
         },
-        "node_modules/swagger-typescript-api/node_modules/typescript": {
-            "version": "5.9.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-            "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
         "node_modules/swagger2openapi": {
             "version": "7.0.8",
             "resolved": "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
@@ -6174,9 +6286,9 @@
             }
         },
         "node_modules/swr": {
-            "version": "2.3.5",
-            "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.5.tgz",
-            "integrity": "sha512-4e7pjTVulZTIL+b/S0RYFsgDcTcXPLUOvBPqyh9YdD+PkHeEMoaPwDmF9Kv6I1nnPg1OFKhiiEYpsYaaE2W2jA==",
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.6.tgz",
+            "integrity": "sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==",
             "license": "MIT",
             "dependencies": {
                 "dequal": "^2.0.3",
@@ -6187,9 +6299,9 @@
             }
         },
         "node_modules/tailwind-merge": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-            "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz",
+            "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -6197,41 +6309,10 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.17",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
-            "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
-            "license": "MIT",
-            "dependencies": {
-                "@alloc/quick-lru": "^5.2.0",
-                "arg": "^5.0.2",
-                "chokidar": "^3.6.0",
-                "didyoumean": "^1.2.2",
-                "dlv": "^1.1.3",
-                "fast-glob": "^3.3.2",
-                "glob-parent": "^6.0.2",
-                "is-glob": "^4.0.3",
-                "jiti": "^1.21.6",
-                "lilconfig": "^3.1.3",
-                "micromatch": "^4.0.8",
-                "normalize-path": "^3.0.0",
-                "object-hash": "^3.0.0",
-                "picocolors": "^1.1.1",
-                "postcss": "^8.4.47",
-                "postcss-import": "^15.1.0",
-                "postcss-js": "^4.0.1",
-                "postcss-load-config": "^4.0.2",
-                "postcss-nested": "^6.2.0",
-                "postcss-selector-parser": "^6.1.2",
-                "resolve": "^1.22.8",
-                "sucrase": "^3.35.0"
-            },
-            "bin": {
-                "tailwind": "lib/cli.js",
-                "tailwindcss": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            }
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.16.tgz",
+            "integrity": "sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA==",
+            "license": "MIT"
         },
         "node_modules/tailwindcss-animate": {
             "version": "1.0.7",
@@ -6242,82 +6323,17 @@
                 "tailwindcss": ">=3.0.0 || insiders"
             }
         },
-        "node_modules/tailwindcss/node_modules/chokidar": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+        "node_modules/tapable": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+            "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
             "license": "MIT",
-            "dependencies": {
-                "anymatch": "~3.1.2",
-                "braces": "~3.0.2",
-                "glob-parent": "~5.1.2",
-                "is-binary-path": "~2.1.0",
-                "is-glob": "~4.0.1",
-                "normalize-path": "~3.0.0",
-                "readdirp": "~3.6.0"
-            },
             "engines": {
-                "node": ">= 8.10.0"
+                "node": ">=6"
             },
             "funding": {
-                "url": "https://paulmillr.com/funding/"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": {
-            "version": "5.1.2",
-            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-            "license": "ISC",
-            "dependencies": {
-                "is-glob": "^4.0.1"
-            },
-            "engines": {
-                "node": ">= 6"
-            }
-        },
-        "node_modules/tailwindcss/node_modules/jiti": {
-            "version": "1.21.7",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-            "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-            "license": "MIT",
-            "bin": {
-                "jiti": "bin/jiti.js"
-            }
-        },
-        "node_modules/tailwindcss/node_modules/readdirp": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-            "license": "MIT",
-            "dependencies": {
-                "picomatch": "^2.2.1"
-            },
-            "engines": {
-                "node": ">=8.10.0"
-            }
-        },
-        "node_modules/thenify": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-            "license": "MIT",
-            "dependencies": {
-                "any-promise": "^1.0.0"
-            }
-        },
-        "node_modules/thenify-all": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-            "license": "MIT",
-            "dependencies": {
-                "thenify": ">= 3.1.0 < 4"
-            },
-            "engines": {
-                "node": ">=0.8"
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
             }
         },
         "node_modules/tinyexec": {
@@ -6328,14 +6344,14 @@
             "license": "MIT"
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.14",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-            "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+            "version": "0.2.15",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "fdir": "^6.4.4",
-                "picomatch": "^4.0.2"
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3"
             },
             "engines": {
                 "node": ">=12.0.0"
@@ -6345,11 +6361,14 @@
             }
         },
         "node_modules/tinyglobby/node_modules/fdir": {
-            "version": "6.4.6",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-            "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
             "dev": true,
             "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
             "peerDependencies": {
                 "picomatch": "^3 || ^4"
             },
@@ -6376,6 +6395,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
             "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
@@ -6410,12 +6430,6 @@
                 "typescript": ">=4.8.4"
             }
         },
-        "node_modules/ts-interface-checker": {
-            "version": "0.1.13",
-            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-            "license": "Apache-2.0"
-        },
         "node_modules/tslib": {
             "version": "2.8.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -6436,9 +6450,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.6.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-            "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+            "version": "5.9.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+            "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "devOptional": true,
             "license": "Apache-2.0",
             "bin": {
@@ -6450,16 +6464,16 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.39.0.tgz",
-            "integrity": "sha512-lH8FvtdtzcHJCkMOKnN73LIn6SLTpoojgJqDAxPm1jCR14eWSGPX8ul/gggBdPMk/d5+u9V854vTYQ8T5jF/1Q==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.2.tgz",
+            "integrity": "sha512-vbw8bOmiuYNdzzV3lsiWv6sRwjyuKJMQqWulBOU7M0RrxedXledX8G8kBbQeiOYDnTfiXz0Y4081E1QMNB6iQg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.39.0",
-                "@typescript-eslint/parser": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0",
-                "@typescript-eslint/utils": "8.39.0"
+                "@typescript-eslint/eslint-plugin": "8.46.2",
+                "@typescript-eslint/parser": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2",
+                "@typescript-eslint/utils": "8.46.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6474,16 +6488,16 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+            "version": "7.16.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+            "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-            "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
+            "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
             "devOptional": true,
             "funding": [
                 {
@@ -6565,20 +6579,14 @@
             }
         },
         "node_modules/use-sync-external-store": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
-            "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+            "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
             "license": "MIT",
             "peerDependencies": {
                 "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
-        "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/vaul": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vaul/-/vaul-1.1.2.tgz",
@@ -6593,24 +6601,24 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.3.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
-            "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+            "version": "7.1.12",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
+            "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.25.0",
-                "fdir": "^6.4.4",
-                "picomatch": "^4.0.2",
-                "postcss": "^8.5.3",
-                "rollup": "^4.34.9",
-                "tinyglobby": "^0.2.13"
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3",
+                "postcss": "^8.5.6",
+                "rollup": "^4.43.0",
+                "tinyglobby": "^0.2.15"
             },
             "bin": {
                 "vite": "bin/vite.js"
             },
             "engines": {
-                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "funding": {
                 "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -6619,14 +6627,14 @@
                 "fsevents": "~2.3.3"
             },
             "peerDependencies": {
-                "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+                "@types/node": "^20.19.0 || >=22.12.0",
                 "jiti": ">=1.21.0",
-                "less": "*",
+                "less": "^4.0.0",
                 "lightningcss": "^1.21.0",
-                "sass": "*",
-                "sass-embedded": "*",
-                "stylus": "*",
-                "sugarss": "*",
+                "sass": "^1.70.0",
+                "sass-embedded": "^1.70.0",
+                "stylus": ">=0.54.8",
+                "sugarss": "^5.0.0",
                 "terser": "^5.16.0",
                 "tsx": "^4.8.1",
                 "yaml": "^2.4.2"
@@ -6668,11 +6676,14 @@
             }
         },
         "node_modules/vite/node_modules/fdir": {
-            "version": "6.4.6",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-            "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
             "dev": true,
             "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
             "peerDependencies": {
                 "picomatch": "^3 || ^4"
             },
@@ -6726,6 +6737,7 @@
             "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": {
                 "isexe": "^2.0.0"
@@ -6748,27 +6760,10 @@
             }
         },
         "node_modules/wrap-ansi": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
-            "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-styles": "^6.1.0",
-                "string-width": "^5.0.1",
-                "strip-ansi": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-            }
-        },
-        "node_modules/wrap-ansi-cjs": {
-            "name": "wrap-ansi",
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.0.0",
@@ -6782,59 +6777,6 @@
                 "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "license": "MIT"
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/ansi-styles": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
         "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -6856,6 +6798,7 @@
             "version": "2.8.1",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
             "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+            "dev": true,
             "license": "ISC",
             "bin": {
                 "yaml": "bin.mjs"
@@ -6893,51 +6836,6 @@
                 "node": ">=12"
             }
         },
-        "node_modules/yargs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/yargs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/yargs/node_modules/string-width": {
-            "version": "4.2.3",
-            "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-            "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "emoji-regex": "^8.0.0",
-                "is-fullwidth-code-point": "^3.0.0",
-                "strip-ansi": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/yargs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/yocto-queue": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -6952,18 +6850,31 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.25.76",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+            "version": "4.1.12",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz",
+            "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
         },
+        "node_modules/zod-validation-error": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-4.0.2.tgz",
+            "integrity": "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "zod": "^3.25.0 || ^4.0.0"
+            }
+        },
         "node_modules/zustand": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.7.tgz",
-            "integrity": "sha512-Ot6uqHDW/O2VdYsKLLU8GQu8sCOM1LcoE8RwvLv9uuRT9s6SOHCKs0ZEOhxg+I1Ld+A1Q5lwx+UlKXXUoCZITg==",
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.8.tgz",
+            "integrity": "sha512-gyPKpIaxY9XcO2vSMrLbiER7QMAMGOQZVRdJ6Zi782jkbzZygq5GI9nG8g+sMgitRtndwaBSl7uiqC49o1SSiw==",
             "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 a0672d82fc53..2779e3669ed1 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.13.1";
+  version = "1.14.4";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-VHj6eUIBdIUJ1eUoa2Yog3maee89aMF5yEO9NbDXflQ=";
+    hash = "sha256-bQJGAw6q7yJoPDKOEqx35iTpyD/jGtATIjDi8C9D8dA=";
   };
 
   # 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-th0rnTrS/gZ5gMuZda0/fllVc8g9iPc8/gEos+3E3kU=";
+  npmDepsHash = "sha256-ZXEBSrQsZ6e18LK/LFttEmZY4nK9+vrQ3ryw5xw/5YE=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 
diff --git a/pkgs/by-name/ne/nezha-theme-user/package-lock.json b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
index 54143f7bae33..39c7a1d66af0 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
@@ -1,67 +1,71 @@
 {
-  "name": "nazha-dashboard-vite",
-  "version": "1.0.1",
+  "name": "nazha-dash-v1",
+  "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "nazha-dashboard-vite",
-      "version": "1.0.1",
+      "name": "nazha-dash-v1",
+      "version": "1.0.0",
       "dependencies": {
-        "@fontsource/inter": "^5.1.1",
-        "@heroicons/react": "^2.2.0",
-        "@radix-ui/react-accordion": "^1.2.2",
-        "@radix-ui/react-checkbox": "^1.1.3",
-        "@radix-ui/react-dialog": "^1.1.4",
-        "@radix-ui/react-dropdown-menu": "^2.1.4",
-        "@radix-ui/react-label": "^2.1.1",
-        "@radix-ui/react-popover": "^1.1.4",
-        "@radix-ui/react-progress": "^1.1.1",
-        "@radix-ui/react-separator": "^1.1.1",
-        "@radix-ui/react-slot": "^1.1.1",
-        "@radix-ui/react-switch": "^1.1.2",
-        "@tanstack/react-query": "^5.63.0",
-        "@tanstack/react-query-devtools": "^5.63.0",
-        "@tanstack/react-table": "^8.20.6",
-        "@trivago/prettier-plugin-sort-imports": "^5.2.1",
-        "@types/d3-geo": "^3.1.0",
-        "@types/luxon": "^3.4.2",
-        "class-variance-authority": "^0.7.1",
-        "clsx": "^2.1.1",
-        "country-flag-icons": "^1.5.13",
-        "d3-geo": "^3.1.1",
-        "dayjs": "^1.11.13",
-        "framer-motion": "^12.0.0-alpha.2",
-        "i18n-iso-countries": "^7.13.0",
-        "i18next": "^24.2.1",
-        "lucide-react": "^0.460.0",
-        "luxon": "^3.5.0",
-        "prettier-plugin-tailwindcss": "^0.6.9",
-        "react": "^19.0.0",
-        "react-dom": "^19.0.0",
-        "react-i18next": "^15.4.0",
-        "react-router-dom": "^7.1.1",
-        "recharts": "^2.15.0",
-        "sonner": "^1.7.1",
-        "tailwind-merge": "^2.6.0",
-        "tailwindcss-animate": "^1.0.7"
+        "@fontsource/inter": "5.1.1",
+        "@heroicons/react": "2.2.0",
+        "@number-flow/react": "0.5.5",
+        "@radix-ui/react-accordion": "1.2.3",
+        "@radix-ui/react-checkbox": "1.1.4",
+        "@radix-ui/react-dialog": "1.1.6",
+        "@radix-ui/react-dropdown-menu": "2.1.6",
+        "@radix-ui/react-label": "2.1.2",
+        "@radix-ui/react-popover": "1.1.6",
+        "@radix-ui/react-progress": "1.1.2",
+        "@radix-ui/react-select": "2.1.6",
+        "@radix-ui/react-separator": "1.1.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-switch": "1.1.3",
+        "@radix-ui/react-tooltip": "1.1.8",
+        "@tanstack/react-query": "5.66.7",
+        "@tanstack/react-query-devtools": "5.66.7",
+        "@tanstack/react-table": "8.21.2",
+        "@trivago/prettier-plugin-sort-imports": "5.2.2",
+        "@types/d3-geo": "3.1.0",
+        "@types/luxon": "3.4.2",
+        "class-variance-authority": "0.7.1",
+        "clsx": "2.1.1",
+        "cmdk": "1.1.1",
+        "country-flag-icons": "1.5.18",
+        "d3-geo": "3.1.1",
+        "dayjs": "1.11.13",
+        "framer-motion": "12.4.5",
+        "i18n-iso-countries": "7.14.0",
+        "i18next": "24.2.2",
+        "lucide-react": "0.460.0",
+        "luxon": "3.5.0",
+        "prettier-plugin-tailwindcss": "0.6.11",
+        "react": "19.0.0",
+        "react-dom": "19.0.0",
+        "react-i18next": "15.4.1",
+        "react-router-dom": "7.2.0",
+        "recharts": "2.15.1",
+        "sonner": "1.7.4",
+        "tailwind-merge": "2.6.0",
+        "tailwindcss-animate": "1.0.7"
       },
       "devDependencies": {
-        "@eslint/js": "^9.17.0",
-        "@types/node": "^22.10.5",
-        "@types/react": "^19.0.4",
-        "@types/react-dom": "^19.0.2",
-        "@vitejs/plugin-react-swc": "^3.7.2",
-        "autoprefixer": "^10.4.20",
-        "eslint": "^9.17.0",
-        "eslint-plugin-react-hooks": "^5.1.0",
-        "eslint-plugin-react-refresh": "^0.4.16",
-        "globals": "^15.14.0",
-        "postcss": "^8.4.49",
-        "tailwindcss": "^3.4.17",
+        "@eslint/js": "9.20.0",
+        "@types/node": "22.13.4",
+        "@types/react": "19.0.10",
+        "@types/react-dom": "19.0.4",
+        "@vitejs/plugin-react-swc": "3.8.0",
+        "autoprefixer": "10.4.20",
+        "eslint": "9.20.1",
+        "eslint-plugin-react-hooks": "5.1.0",
+        "eslint-plugin-react-refresh": "0.4.19",
+        "globals": "15.15.0",
+        "postcss": "8.5.3",
+        "tailwindcss": "3.4.17",
         "typescript": "~5.6.3",
-        "typescript-eslint": "^8.19.1",
-        "vite": "^6.0.7"
+        "typescript-eslint": "8.24.1",
+        "vite": "6.1.1"
       }
     },
     "node_modules/@alloc/quick-lru": {
@@ -77,60 +81,69 @@
       }
     },
     "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/generator": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
-      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.5",
-        "@babel/types": "^7.26.5",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "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.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
       "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
-      "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.5"
+        "@babel/types": "^7.28.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -140,66 +153,54 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
-      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
       "license": "MIT",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
-      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+      "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.25.9",
-        "@babel/parser": "^7.25.9",
-        "@babel/types": "^7.25.9"
+        "@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.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
-      "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.5",
-        "@babel/parser": "^7.26.5",
-        "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.5",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.5",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
-      "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
       "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.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -631,9 +632,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -663,9 +664,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -673,13 +674,13 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
-      "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.5",
+        "@eslint/object-schema": "^2.1.6",
         "debug": "^4.3.1",
         "minimatch": "^3.1.2"
       },
@@ -688,9 +689,9 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
-      "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
+      "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -701,9 +702,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
-      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -738,9 +739,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz",
-      "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==",
+      "version": "9.20.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
+      "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -748,9 +749,9 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
-      "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+      "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -758,45 +759,58 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
-      "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
+      "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.10.0",
+        "@eslint/core": "^0.13.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.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
+      "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/@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.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
+      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "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.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
+      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/core": "^1.7.3",
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "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.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
+      "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
       "license": "MIT",
       "dependencies": {
-        "@floating-ui/dom": "^1.0.0"
+        "@floating-ui/dom": "^1.7.4"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -804,9 +818,9 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
-      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
+      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
       "license": "MIT"
     },
     "node_modules/@fontsource/inter": {
@@ -835,33 +849,19 @@
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.3.0"
+        "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
-    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -877,9 +877,9 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
-      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "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": {
@@ -908,17 +908,13 @@
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
@@ -930,25 +926,16 @@
         "node": ">=6.0.0"
       }
     },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -990,6 +977,20 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@number-flow/react": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@number-flow/react/-/react-0.5.5.tgz",
+      "integrity": "sha512-Zdju5n0osxrb+7jbcpUJ9L2VJ2+9ptwjz5+A+2wq9Q32hs3PW/noPJjHtLTrtGINM9mEw76DcDg0ac/dx6j1aA==",
+      "license": "MIT",
+      "dependencies": {
+        "esm-env": "^1.1.4",
+        "number-flow": "0.5.3"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19",
+        "react-dom": "^18 || ^19"
+      }
+    },
     "node_modules/@pkgjs/parseargs": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
@@ -1000,6 +1001,12 @@
         "node": ">=14"
       }
     },
+    "node_modules/@radix-ui/number": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz",
+      "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==",
+      "license": "MIT"
+    },
     "node_modules/@radix-ui/primitive": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz",
@@ -1007,19 +1014,19 @@
       "license": "MIT"
     },
     "node_modules/@radix-ui/react-accordion": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.2.tgz",
-      "integrity": "sha512-b1oh54x4DMCdGsB4/7ahiSrViXxaBwRPotiZNnYXjLha9vfuURSAZErki6qjDoSIV0eXx5v57XnTGVtGwnfp2g==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz",
+      "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-collapsible": "1.1.2",
-        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-collapsible": "1.1.3",
+        "@radix-ui/react-collection": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-direction": "1.1.0",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0"
       },
       "peerDependencies": {
@@ -1038,12 +1045,12 @@
       }
     },
     "node_modules/@radix-ui/react-arrow": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz",
-      "integrity": "sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz",
+      "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1061,16 +1068,16 @@
       }
     },
     "node_modules/@radix-ui/react-checkbox": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.3.tgz",
-      "integrity": "sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz",
+      "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
         "@radix-ui/react-use-previous": "1.1.0",
         "@radix-ui/react-use-size": "1.1.0"
@@ -1091,9 +1098,9 @@
       }
     },
     "node_modules/@radix-ui/react-collapsible": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.2.tgz",
-      "integrity": "sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.3.tgz",
+      "integrity": "sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
@@ -1101,7 +1108,7 @@
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-id": "1.1.0",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
@@ -1121,15 +1128,15 @@
       }
     },
     "node_modules/@radix-ui/react-collection": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.1.tgz",
-      "integrity": "sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz",
+      "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1"
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1177,25 +1184,25 @@
       }
     },
     "node_modules/@radix-ui/react-dialog": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.4.tgz",
-      "integrity": "sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
+      "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
         "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-portal": "1.1.4",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
-        "aria-hidden": "^1.1.1",
-        "react-remove-scroll": "^2.6.1"
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1228,14 +1235,14 @@
       }
     },
     "node_modules/@radix-ui/react-dismissable-layer": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.3.tgz",
-      "integrity": "sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
+      "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
         "@radix-ui/react-use-escape-keydown": "1.1.0"
       },
@@ -1255,17 +1262,17 @@
       }
     },
     "node_modules/@radix-ui/react-dropdown-menu": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.4.tgz",
-      "integrity": "sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz",
+      "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-menu": "2.1.4",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-menu": "2.1.6",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0"
       },
       "peerDependencies": {
@@ -1299,13 +1306,13 @@
       }
     },
     "node_modules/@radix-ui/react-focus-scope": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.1.tgz",
-      "integrity": "sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
+      "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0"
       },
       "peerDependencies": {
@@ -1342,12 +1349,12 @@
       }
     },
     "node_modules/@radix-ui/react-label": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.1.tgz",
-      "integrity": "sha512-UUw5E4e/2+4kFMH7+YxORXGWggtY6sM8WIwh5RZchhLuUg2H1hc98Py+pr8HMz6rdaYrK2t296ZEjYLOCO5uUw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz",
+      "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1365,29 +1372,29 @@
       }
     },
     "node_modules/@radix-ui/react-menu": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.4.tgz",
-      "integrity": "sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz",
+      "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-collection": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-direction": "1.1.0",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
         "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-popper": "1.2.1",
-        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-roving-focus": "1.1.1",
-        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-roving-focus": "1.1.2",
+        "@radix-ui/react-slot": "1.1.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
-        "aria-hidden": "^1.1.1",
-        "react-remove-scroll": "^2.6.1"
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1405,26 +1412,26 @@
       }
     },
     "node_modules/@radix-ui/react-popover": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.4.tgz",
-      "integrity": "sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz",
+      "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
         "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-popper": "1.2.1",
-        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
-        "aria-hidden": "^1.1.1",
-        "react-remove-scroll": "^2.6.1"
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1442,16 +1449,16 @@
       }
     },
     "node_modules/@radix-ui/react-popper": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.1.tgz",
-      "integrity": "sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz",
+      "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==",
       "license": "MIT",
       "dependencies": {
         "@floating-ui/react-dom": "^2.0.0",
-        "@radix-ui/react-arrow": "1.1.1",
+        "@radix-ui/react-arrow": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
         "@radix-ui/react-use-layout-effect": "1.1.0",
         "@radix-ui/react-use-rect": "1.1.0",
@@ -1474,12 +1481,12 @@
       }
     },
     "node_modules/@radix-ui/react-portal": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.3.tgz",
-      "integrity": "sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
+      "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
       "peerDependencies": {
@@ -1522,12 +1529,12 @@
       }
     },
     "node_modules/@radix-ui/react-primitive": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz",
-      "integrity": "sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
+      "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-slot": "1.1.1"
+        "@radix-ui/react-slot": "1.1.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1545,13 +1552,13 @@
       }
     },
     "node_modules/@radix-ui/react-progress": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.1.tgz",
-      "integrity": "sha512-6diOawA84f/eMxFHcWut0aE1C2kyE9dOyCTQOMRR2C/qPiXz/X0SaiA/RLbapQaXUCmy0/hLMf9meSccD1N0pA==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.2.tgz",
+      "integrity": "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1569,18 +1576,18 @@
       }
     },
     "node_modules/@radix-ui/react-roving-focus": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.1.tgz",
-      "integrity": "sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz",
+      "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-collection": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-direction": "1.1.0",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
         "@radix-ui/react-use-controllable-state": "1.1.0"
       },
@@ -1599,13 +1606,56 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-separator": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.1.tgz",
-      "integrity": "sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==",
+    "node_modules/@radix-ui/react-select": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz",
+      "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==",
       "license": "MIT",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/number": "1.1.0",
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-collection": "1.1.2",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-direction": "1.1.0",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
+        "@radix-ui/react-focus-guards": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.0",
+        "@radix-ui/react-use-previous": "1.1.0",
+        "@radix-ui/react-visually-hidden": "1.1.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-separator": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz",
+      "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1623,9 +1673,9 @@
       }
     },
     "node_modules/@radix-ui/react-slot": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz",
-      "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
+      "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1"
@@ -1641,15 +1691,15 @@
       }
     },
     "node_modules/@radix-ui/react-switch": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.2.tgz",
-      "integrity": "sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g==",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.3.tgz",
+      "integrity": "sha512-1nc+vjEOQkJVsJtWPSiISGT6OKm4SiOdjMo+/icLxo2G4vxz1GntC5MzfL4v8ey9OEfw787QCD1y3mUv0NiFEQ==",
       "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
         "@radix-ui/react-use-previous": "1.1.0",
         "@radix-ui/react-use-size": "1.1.0"
@@ -1669,6 +1719,40 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-tooltip": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.8.tgz",
+      "integrity": "sha512-YAA2cu48EkJZdAMHC0dqo9kialOcRStbtiY4nJPaht7Ptrhcvpo+eDChaM6BIs8kL6a8Z5l5poiqLnXcNduOkA==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-visually-hidden": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-use-callback-ref": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
@@ -1786,6 +1870,29 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-visually-hidden": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
+      "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/rect": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
@@ -1793,9 +1900,9 @@
       "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
-      "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz",
+      "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==",
       "cpu": [
         "arm"
       ],
@@ -1807,9 +1914,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
-      "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz",
+      "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==",
       "cpu": [
         "arm64"
       ],
@@ -1821,9 +1928,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
-      "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz",
+      "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==",
       "cpu": [
         "arm64"
       ],
@@ -1835,9 +1942,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
-      "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz",
+      "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==",
       "cpu": [
         "x64"
       ],
@@ -1849,9 +1956,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
-      "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz",
+      "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==",
       "cpu": [
         "arm64"
       ],
@@ -1863,9 +1970,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
-      "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz",
+      "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==",
       "cpu": [
         "x64"
       ],
@@ -1877,9 +1984,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
-      "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz",
+      "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==",
       "cpu": [
         "arm"
       ],
@@ -1891,9 +1998,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
-      "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz",
+      "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==",
       "cpu": [
         "arm"
       ],
@@ -1905,9 +2012,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
-      "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz",
+      "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==",
       "cpu": [
         "arm64"
       ],
@@ -1919,9 +2026,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
-      "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz",
+      "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==",
       "cpu": [
         "arm64"
       ],
@@ -1932,10 +2039,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
-      "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
+      "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
       "cpu": [
         "loong64"
       ],
@@ -1946,10 +2053,10 @@
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
-      "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
+      "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
       "cpu": [
         "ppc64"
       ],
@@ -1961,9 +2068,23 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
-      "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz",
+      "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
+      "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
       "cpu": [
         "riscv64"
       ],
@@ -1975,9 +2096,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
-      "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz",
+      "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==",
       "cpu": [
         "s390x"
       ],
@@ -1989,9 +2110,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
-      "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz",
+      "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==",
       "cpu": [
         "x64"
       ],
@@ -2003,9 +2124,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
-      "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz",
+      "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==",
       "cpu": [
         "x64"
       ],
@@ -2016,10 +2137,24 @@
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
+      "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
-      "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz",
+      "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==",
       "cpu": [
         "arm64"
       ],
@@ -2031,9 +2166,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
-      "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz",
+      "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==",
       "cpu": [
         "ia32"
       ],
@@ -2044,10 +2179,24 @@
         "win32"
       ]
     },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
+      "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
-      "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz",
+      "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==",
       "cpu": [
         "x64"
       ],
@@ -2059,15 +2208,15 @@
       ]
     },
     "node_modules/@swc/core": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.9.tgz",
-      "integrity": "sha512-MQ97YSXu2oibzm7wi4GNa7hhndjLuVt/lmO2sq53+P37oZmyg/JQ/IYYtSiC6UGK3+cHoiVAykrK+glxLjJbag==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.0.tgz",
+      "integrity": "sha512-8SnJV+JV0rYbfSiEiUvYOmf62E7QwsEG+aZueqSlKoxFt0pw333+bgZSQXGUV6etXU88nxur0afVMaINujBMSw==",
       "dev": true,
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.17"
+        "@swc/types": "^0.1.25"
       },
       "engines": {
         "node": ">=10"
@@ -2077,19 +2226,19 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.10.9",
-        "@swc/core-darwin-x64": "1.10.9",
-        "@swc/core-linux-arm-gnueabihf": "1.10.9",
-        "@swc/core-linux-arm64-gnu": "1.10.9",
-        "@swc/core-linux-arm64-musl": "1.10.9",
-        "@swc/core-linux-x64-gnu": "1.10.9",
-        "@swc/core-linux-x64-musl": "1.10.9",
-        "@swc/core-win32-arm64-msvc": "1.10.9",
-        "@swc/core-win32-ia32-msvc": "1.10.9",
-        "@swc/core-win32-x64-msvc": "1.10.9"
+        "@swc/core-darwin-arm64": "1.15.0",
+        "@swc/core-darwin-x64": "1.15.0",
+        "@swc/core-linux-arm-gnueabihf": "1.15.0",
+        "@swc/core-linux-arm64-gnu": "1.15.0",
+        "@swc/core-linux-arm64-musl": "1.15.0",
+        "@swc/core-linux-x64-gnu": "1.15.0",
+        "@swc/core-linux-x64-musl": "1.15.0",
+        "@swc/core-win32-arm64-msvc": "1.15.0",
+        "@swc/core-win32-ia32-msvc": "1.15.0",
+        "@swc/core-win32-x64-msvc": "1.15.0"
       },
       "peerDependencies": {
-        "@swc/helpers": "*"
+        "@swc/helpers": ">=0.5.17"
       },
       "peerDependenciesMeta": {
         "@swc/helpers": {
@@ -2098,9 +2247,9 @@
       }
     },
     "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.9.tgz",
-      "integrity": "sha512-XTHLtijFervv2B+i1ngM993umhSj9K1IeMomvU/Db84Asjur2XmD4KXt9QPnGDRFgv2kLSjZ+DDL25Qk0f4r+w==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.0.tgz",
+      "integrity": "sha512-TBKWkbnShnEjlIbO4/gfsrIgAqHBVqgPWLbWmPdZ80bF393yJcLgkrb7bZEnJs6FCbSSuGwZv2rx1jDR2zo6YA==",
       "cpu": [
         "arm64"
       ],
@@ -2115,9 +2264,9 @@
       }
     },
     "node_modules/@swc/core-darwin-x64": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.9.tgz",
-      "integrity": "sha512-bi3el9/FV/la8HIsolSjeDar+tM7m9AmSF1w7X6ZByW2qgc4Z1tmq0A4M4H9aH3TfHesZbfq8hgaNtc2/VtzzQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.0.tgz",
+      "integrity": "sha512-f5JKL1v1H56CIZc1pVn4RGPOfnWqPwmuHdpf4wesvXunF1Bx85YgcspW5YxwqG5J9g3nPU610UFuExJXVUzOiQ==",
       "cpu": [
         "x64"
       ],
@@ -2132,9 +2281,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.9.tgz",
-      "integrity": "sha512-xsLHV02S+RTDuI+UJBkA2muNk/s0ETRpoc1K/gNt0i8BqTurPYkrvGDDALN9+leiUPydHvZi9P1qdExbgUJnXw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.0.tgz",
+      "integrity": "sha512-duK6nG+WyuunnfsfiTUQdzC9Fk8cyDLqT9zyXvY2i2YgDu5+BH5W6wM5O4mDNCU5MocyB/SuF5YDF7XySnowiQ==",
       "cpu": [
         "arm"
       ],
@@ -2149,9 +2298,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.9.tgz",
-      "integrity": "sha512-41hJgPoGhIa12U6Tud+yLF/m64YA3mGut3TmBEkj2R7rdJdE0mljdtR0tf4J2RoQaWZPPi0DBSqGdROiAEx9dg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.0.tgz",
+      "integrity": "sha512-ITe9iDtTRXM98B91rvyPP6qDVbhUBnmA/j4UxrHlMQ0RlwpqTjfZYZkD0uclOxSZ6qIrOj/X5CaoJlDUuQ0+Cw==",
       "cpu": [
         "arm64"
       ],
@@ -2166,9 +2315,9 @@
       }
     },
     "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.9.tgz",
-      "integrity": "sha512-DUMRhl49b9r7bLg9oNzCdW4lLcDJKrRBn87Iq5APPvixsm1auGnsVQycGkQcDDKvVllxIFSbmCYzjagx3l8Hnw==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.0.tgz",
+      "integrity": "sha512-Q5ldc2bzriuzYEoAuqJ9Vr3FyZhakk5hiwDbniZ8tlEXpbjBhbOleGf9/gkhLaouDnkNUEazFW9mtqwUTRdh7Q==",
       "cpu": [
         "arm64"
       ],
@@ -2183,9 +2332,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.9.tgz",
-      "integrity": "sha512-xW0y88vQvmzYo3Gn7yFnY03TfHMwuca4aFH3ZmhwDNOYHmTOi6fmhAkg/13F/NrwjMYO+GnF5uJTjdjb3B6tdQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.0.tgz",
+      "integrity": "sha512-pY4is+jEpOxlYCSnI+7N8Oxbap9TmTz5YT84tUvRTlOlTBwFAUlWFCX0FRwWJlsfP0TxbqhIe8dNNzlsEmJbXQ==",
       "cpu": [
         "x64"
       ],
@@ -2200,9 +2349,9 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.9.tgz",
-      "integrity": "sha512-jYs32BEx+CPVuxN6NdsWEpdehjnmAag25jyJzwjQx+NCGYwHEV3bT5y8TX4eFhaVB1rafmqJOlYQPs4+MSyGCg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.0.tgz",
+      "integrity": "sha512-zYEt5eT8y8RUpoe7t5pjpoOdGu+/gSTExj8PV86efhj6ugB3bPlj3Y85ogdW3WMVXr4NvwqvzdaYGCZfXzSyVg==",
       "cpu": [
         "x64"
       ],
@@ -2217,9 +2366,9 @@
       }
     },
     "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.9.tgz",
-      "integrity": "sha512-Uhh5T3Fq3Nyom96Bm3ACBNASH3iqNc76in7ewZz8PooUqeTIO8aZpsghnncjctRNE9T819/8btpiFIhHo3sKtg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.0.tgz",
+      "integrity": "sha512-zC1rmOgFH5v2BCbByOazEqs0aRNpTdLRchDExfcCfgKgeaD+IdpUOqp7i3VG1YzkcnbuZjMlXfM0ugpt+CddoA==",
       "cpu": [
         "arm64"
       ],
@@ -2234,9 +2383,9 @@
       }
     },
     "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.9.tgz",
-      "integrity": "sha512-bD5BpbojEsDfrAvT+1qjQPf5RCKLg4UL+3Uwm019+ZR02hd8qO538BlOnQdOqRqccu+75DF6aRglQ7AJ24Cs0Q==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.0.tgz",
+      "integrity": "sha512-7t9U9KwMwQblkdJIH+zX1V4q1o3o41i0HNO+VlnAHT5o+5qHJ963PHKJ/pX3P2UlZnBCY465orJuflAN4rAP9A==",
       "cpu": [
         "ia32"
       ],
@@ -2251,9 +2400,9 @@
       }
     },
     "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.9.tgz",
-      "integrity": "sha512-NwkuUNeBBQnAaXVvcGw8Zr6RR8kylyjFUnlYZZ3G0QkQZ4rYLXYTafAmiRjrfzgVb0LcMF/sBzJvGOk7SwtIDg==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.0.tgz",
+      "integrity": "sha512-VE0Zod5vcs8iMLT64m5QS1DlTMXJFI/qSgtMDRx8rtZrnjt6/9NW8XUaiPJuRu8GluEO1hmHoyf1qlbY19gGSQ==",
       "cpu": [
         "x64"
       ],
@@ -2275,9 +2424,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/@swc/types": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz",
-      "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==",
+      "version": "0.1.25",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz",
+      "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -2285,9 +2434,9 @@
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.64.2.tgz",
-      "integrity": "sha512-hdO8SZpWXoADNTWXV9We8CwTkXU88OVWRBcsiFrk7xJQnhm6WRlweDzMD+uH+GnuieTBVSML6xFa17C2cNV8+g==",
+      "version": "5.66.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.66.4.tgz",
+      "integrity": "sha512-skM/gzNX4shPkqmdTCSoHtJAPMTtmIJNS0hE+xwTTUVYwezArCT34NMermABmBVUg5Ls5aiUXEDXfqwR1oVkcA==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -2295,9 +2444,9 @@
       }
     },
     "node_modules/@tanstack/query-devtools": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.64.2.tgz",
-      "integrity": "sha512-3DautR5UpVZdk/qNIhioZVF7g8fdQZ1U98sBEEk4Tzz3tihSBNMPgwlP40nzgbPEDBIrn/j/oyyvNBVSo083Vw==",
+      "version": "5.65.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.65.0.tgz",
+      "integrity": "sha512-g5y7zc07U9D3esMdqUfTEVu9kMHoIaVBsD0+M3LPdAdD710RpTcLiNvJY1JkYXqkq9+NV+CQoemVNpQPBXVsJg==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -2305,12 +2454,12 @@
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.64.2.tgz",
-      "integrity": "sha512-3pakNscZNm8KJkxmovvtZ4RaXLyiYYobwleTMvpIGUoKRa8j8VlrQKNl5W8VUEfVfZKkikvXVddLuWMbcSCA1Q==",
+      "version": "5.66.7",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz",
+      "integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-core": "5.64.2"
+        "@tanstack/query-core": "5.66.4"
       },
       "funding": {
         "type": "github",
@@ -2321,29 +2470,29 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.64.2.tgz",
-      "integrity": "sha512-+ZjJVnPzc8BUV/Eklu2k9T/IAyAyvwoCHqOaOrk2sbU33LFhM52BpX4eyENXn0bx5LwV3DJZgEQlIzucoemfGQ==",
+      "version": "5.66.7",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz",
+      "integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/query-devtools": "5.64.2"
+        "@tanstack/query-devtools": "5.65.0"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.64.2",
+        "@tanstack/react-query": "^5.66.7",
         "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-table": {
-      "version": "8.20.6",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.6.tgz",
-      "integrity": "sha512-w0jluT718MrOKthRcr2xsjqzx+oEM7B7s/XXyfs19ll++hlId3fjTm+B2zrR3ijpANpkzBAr15j1XGVOMxpggQ==",
+      "version": "8.21.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz",
+      "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==",
       "license": "MIT",
       "dependencies": {
-        "@tanstack/table-core": "8.20.5"
+        "@tanstack/table-core": "8.21.2"
       },
       "engines": {
         "node": ">=12"
@@ -2358,9 +2507,9 @@
       }
     },
     "node_modules/@tanstack/table-core": {
-      "version": "8.20.5",
-      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz",
-      "integrity": "sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==",
+      "version": "8.21.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz",
+      "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2371,15 +2520,15 @@
       }
     },
     "node_modules/@trivago/prettier-plugin-sort-imports": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.1.tgz",
-      "integrity": "sha512-NDZndt0fmVThIx/8cExuJHLZagUVzfGCoVrwH9x6aZvwfBdkrDFTYujecek6X2WpG4uUFsVaPg5+aNQPSyjcmw==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz",
+      "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==",
       "license": "Apache-2.0",
       "dependencies": {
-        "@babel/generator": "^7.26.2",
-        "@babel/parser": "^7.26.2",
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.26.0",
+        "@babel/generator": "^7.26.5",
+        "@babel/parser": "^7.26.7",
+        "@babel/traverse": "^7.26.7",
+        "@babel/types": "^7.26.7",
         "javascript-natural-sort": "^0.7.1",
         "lodash": "^4.17.21"
       },
@@ -2411,9 +2560,9 @@
       "license": "MIT"
     },
     "node_modules/@types/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
       "license": "MIT"
     },
     "node_modules/@types/d3-color": {
@@ -2447,15 +2596,15 @@
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
       "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
-      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
       "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
@@ -2483,16 +2632,16 @@
       "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
+      "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"
     },
     "node_modules/@types/geojson": {
-      "version": "7946.0.15",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz",
-      "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==",
+      "version": "7946.0.16",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
       "license": "MIT"
     },
     "node_modules/@types/json-schema": {
@@ -2509,9 +2658,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "22.10.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
-      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "version": "22.13.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
+      "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2519,9 +2668,9 @@
       }
     },
     "node_modules/@types/react": {
-      "version": "19.0.7",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.7.tgz",
-      "integrity": "sha512-MoFsEJKkAtZCrC1r6CM8U22GzhG7u2Wir8ons/aCKH6MBdD1ibV24zOSSkdZVUKqN5i396zG5VKLYZ3yaUZdLA==",
+      "version": "19.0.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz",
+      "integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==",
       "devOptional": true,
       "license": "MIT",
       "dependencies": {
@@ -2529,9 +2678,9 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.3.tgz",
-      "integrity": "sha512-0Knk+HJiMP/qOZgMyNFamlIjw9OFCsyC2ZbigmEEyXXixgre6IQpm/4V+r3qH4GC1JPvRJKInw+on2rV6YZLeA==",
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.4.tgz",
+      "integrity": "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==",
       "devOptional": true,
       "license": "MIT",
       "peerDependencies": {
@@ -2539,21 +2688,21 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz",
-      "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
+      "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/type-utils": "8.21.0",
-        "@typescript-eslint/utils": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/type-utils": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.0.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2569,16 +2718,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz",
-      "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
+      "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/typescript-estree": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/typescript-estree": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2594,14 +2743,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz",
-      "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
+      "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0"
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2612,16 +2761,16 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz",
-      "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
+      "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.21.0",
-        "@typescript-eslint/utils": "8.21.0",
+        "@typescript-eslint/typescript-estree": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2636,9 +2785,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz",
-      "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
+      "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2650,20 +2799,20 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz",
-      "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
+      "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.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.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2677,9 +2826,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": {
@@ -2703,16 +2852,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz",
-      "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
+      "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/typescript-estree": "8.21.0"
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/typescript-estree": "8.24.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2727,13 +2876,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
-      "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
+      "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/types": "8.24.1",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -2745,22 +2894,22 @@
       }
     },
     "node_modules/@vitejs/plugin-react-swc": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.7.2.tgz",
-      "integrity": "sha512-y0byko2b2tSVVf5Gpng1eEhX1OvPC7x8yns1Fx8jDzlJp4LS6CMkCPfLw47cjyoMrshQDoQw4qcgjsU9VvlCew==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.8.0.tgz",
+      "integrity": "sha512-T4sHPvS+DIqDP51ifPqa9XIRAz/kIvIi8oXcnOZZgHmMotgmmdxe/DD5tMFlt5nuIRzT0/QuiwmKlH0503Aapw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@swc/core": "^1.7.26"
+        "@swc/core": "^1.10.15"
       },
       "peerDependencies": {
         "vite": "^4 || ^5 || ^6"
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "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": {
@@ -2798,9 +2947,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -2857,9 +3006,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"
@@ -2912,6 +3061,16 @@
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
       "license": "MIT"
     },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.8.25",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.25.tgz",
+      "integrity": "sha512-2NovHVesVF5TXefsGX1yzx1xgr7+m9JQenvz6FQY3qd+YXkKkYiv+vTCc7OriP9mcDZpTC5mAOYN4ocd29+erA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -2925,9 +3084,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": {
@@ -2948,9 +3107,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.27.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz",
+      "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==",
       "dev": true,
       "funding": [
         {
@@ -2968,10 +3127,11 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "baseline-browser-mapping": "^2.8.19",
+        "caniuse-lite": "^1.0.30001751",
+        "electron-to-chromium": "^1.5.238",
+        "node-releases": "^2.0.26",
+        "update-browserslist-db": "^1.1.4"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3000,9 +3160,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001695",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz",
-      "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==",
+      "version": "1.0.30001753",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001753.tgz",
+      "integrity": "sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw==",
       "dev": true,
       "funding": [
         {
@@ -3094,6 +3254,22 @@
         "node": ">=6"
       }
     },
+    "node_modules/cmdk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz",
+      "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==",
+      "license": "MIT",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "^1.1.1",
+        "@radix-ui/react-dialog": "^1.1.6",
+        "@radix-ui/react-id": "^1.1.0",
+        "@radix-ui/react-primitive": "^2.0.2"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19 || ^19.0.0-rc",
+        "react-dom": "^18 || ^19 || ^19.0.0-rc"
+      }
+    },
     "node_modules/color-convert": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -3138,9 +3314,9 @@
       }
     },
     "node_modules/country-flag-icons": {
-      "version": "1.5.14",
-      "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.14.tgz",
-      "integrity": "sha512-GAFsVzHDu3bdAhbQ1LwBRqk/Ad8+ZzS5zU49P+lRla0KGy/V1V8ywNa1SxBOAmI/lyEOT9dfH3Q++q1lqJlvBA==",
+      "version": "1.5.18",
+      "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.18.tgz",
+      "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ==",
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
@@ -3315,9 +3491,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.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -3385,9 +3561,9 @@
       "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.84",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz",
-      "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==",
+      "version": "1.5.245",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.245.tgz",
+      "integrity": "sha512-rdmGfW47ZhL/oWEJAY4qxRtdly2B98ooTJ0pdEI4jhVLZ6tNf8fPtov2wS1IRKwFJT92le3x4Knxiwzl7cPPpQ==",
       "dev": true,
       "license": "ISC"
     },
@@ -3462,18 +3638,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz",
-      "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==",
+      "version": "9.20.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
+      "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.19.0",
-        "@eslint/core": "^0.10.0",
+        "@eslint/core": "^0.11.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.18.0",
+        "@eslint/js": "9.20.0",
         "@eslint/plugin-kit": "^0.2.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -3535,9 +3711,9 @@
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.18.tgz",
-      "integrity": "sha512-IRGEoFn3OKalm3hjfolEWGqoF/jPqeEYFp+C8B0WMzwGwBMvlRDQd06kghDhF0C61uJ6WfSDhEZE/sAQjduKgw==",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz",
+      "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -3545,9 +3721,9 @@
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "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": {
@@ -3562,9 +3738,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": {
@@ -3574,16 +3750,22 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/esm-env": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
+      "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",
+      "license": "MIT"
+    },
     "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"
@@ -3652,9 +3834,9 @@
       "license": "MIT"
     },
     "node_modules/fast-equals": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.2.2.tgz",
-      "integrity": "sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.2.tgz",
+      "integrity": "sha512-6rxyATwPCkaFIL3JLqw8qXqMpIZ942pTX/tbQFkRsDGblS8tNGtlUauA/+mt6RUfqn/4MoEr+WDkYoIQbibWuQ==",
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
@@ -3703,9 +3885,9 @@
       "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
-      "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
       "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
@@ -3768,19 +3950,19 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
-      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
       "dev": true,
       "license": "ISC"
     },
     "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
+      "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
       "license": "ISC",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -3805,12 +3987,12 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.0.1.tgz",
-      "integrity": "sha512-u6p0Qc4cY/AEQAtrC7qiYlXla39qnWoI4JXY7OCNBDXwJ5yRBD8HU+RhaOqqziw2m/b0BDh32f44W94+wXonMQ==",
+      "version": "12.4.5",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.4.5.tgz",
+      "integrity": "sha512-9+8wglyIJFeUpVg4U8Ohvoo5x7zmvRqawWXhEUThcYdwL/5A1/OkLvQo68Zz5taUE11HKG/Ex+LPaN2+fMkRdA==",
       "license": "MIT",
       "dependencies": {
-        "motion-dom": "^12.0.0",
+        "motion-dom": "^12.4.5",
         "motion-utils": "^12.0.0",
         "tslib": "^2.4.0"
       },
@@ -3896,9 +4078,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"
@@ -3920,9 +4102,9 @@
       }
     },
     "node_modules/globals": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz",
-      "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==",
+      "version": "15.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3971,9 +4153,9 @@
       }
     },
     "node_modules/i18n-iso-countries": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.13.0.tgz",
-      "integrity": "sha512-pVh4CjdgAHZswI98hzG+1BItQlsQfR+yGDsjDISoWIV/jHDAvCmSyZ5vj2YWwAjfVZ8/BhBDqWcFvuGOyHe4vg==",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.14.0.tgz",
+      "integrity": "sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==",
       "license": "MIT",
       "dependencies": {
         "diacritics": "1.3.0"
@@ -3983,9 +4165,9 @@
       }
     },
     "node_modules/i18next": {
-      "version": "24.2.1",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.1.tgz",
-      "integrity": "sha512-Q2wC1TjWcSikn1VAJg13UGIjc+okpFxQTxjVAymOnSA3RpttBQNMPf2ovcgoFVsV4QNxTfNZMAxorXZXsk4fBA==",
+      "version": "24.2.2",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz",
+      "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==",
       "funding": [
         {
           "type": "individual",
@@ -4024,9 +4206,9 @@
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4365,18 +4547,18 @@
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.0.0.tgz",
-      "integrity": "sha512-CvYd15OeIR6kHgMdonCc1ihsaUG4MYh/wrkz8gZ3hBX/uamyZCXN9S9qJoYF03GqfTt7thTV/dxnHYX4+55vDg==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.5.0.tgz",
+      "integrity": "sha512-uH2PETDh7m+Hjd1UQQ56yHqwn83SAwNjimNPE/kC+Kds0t4Yh7+29rfo5wezVFpPOv57U4IuWved5d1x0kNhbQ==",
       "license": "MIT",
       "dependencies": {
-        "motion-utils": "^12.0.0"
+        "motion-utils": "^12.5.0"
       }
     },
     "node_modules/motion-utils": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.0.0.tgz",
-      "integrity": "sha512-MNFiBKbbqnmvOjkPyOKgHUp3Q6oiokLkI1bEwm5QA28cxMZrv0CbbBGDNmhF6DIXsi1pCQBSs0dX8xjeER1tmA==",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.5.0.tgz",
+      "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA==",
       "license": "MIT"
     },
     "node_modules/ms": {
@@ -4397,9 +4579,9 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "funding": [
         {
           "type": "github",
@@ -4422,9 +4604,9 @@
       "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
       "dev": true,
       "license": "MIT"
     },
@@ -4447,6 +4629,15 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/number-flow": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/number-flow/-/number-flow-0.5.3.tgz",
+      "integrity": "sha512-iLKyssImNWQmJ41rza9K7P5lHRZTyishi/9FarWPLQHYY2Ydtl6eiXINEjZ1fa8dHeY0O7+YOD+Py3ZsJddYkg==",
+      "license": "MIT",
+      "dependencies": {
+        "esm-env": "^1.1.4"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -4603,18 +4794,18 @@
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
       "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -4657,9 +4848,19 @@
       }
     },
     "node_modules/postcss-js": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
+      "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "license": "MIT",
       "dependencies": {
         "camelcase-css": "^2.0.1"
@@ -4667,10 +4868,6 @@
       "engines": {
         "node": "^12 || ^14 || >= 16"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
       "peerDependencies": {
         "postcss": "^8.4.21"
       }
@@ -4765,9 +4962,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
       "license": "MIT",
       "peer": true,
       "bin": {
@@ -4781,9 +4978,9 @@
       }
     },
     "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.6.10",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.10.tgz",
-      "integrity": "sha512-ndj2WLDaMzACnr1gAYZiZZLs5ZdOeBYgOsbBmHj3nvW/6q8h8PymsXiEnKvj/9qgCCAoHyvLOisoQdIcsDvIgw==",
+      "version": "0.6.11",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz",
+      "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==",
       "license": "MIT",
       "engines": {
         "node": ">=14.21.3"
@@ -4927,9 +5124,9 @@
       }
     },
     "node_modules/react-i18next": {
-      "version": "15.4.0",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.0.tgz",
-      "integrity": "sha512-Py6UkX3zV08RTvL6ZANRoBh9sL/ne6rQq79XlkHEdd82cZr2H9usbWpUNVadJntIZP2pu3M2rL1CN+5rQYfYFw==",
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz",
+      "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.25.0",
@@ -4955,16 +5152,16 @@
       "license": "MIT"
     },
     "node_modules/react-remove-scroll": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz",
-      "integrity": "sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==",
+      "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",
-        "react-style-singleton": "^2.2.1",
+        "react-style-singleton": "^2.2.3",
         "tslib": "^2.1.0",
         "use-callback-ref": "^1.3.3",
-        "use-sidecar": "^1.1.2"
+        "use-sidecar": "^1.1.3"
       },
       "engines": {
         "node": ">=10"
@@ -5002,9 +5199,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.3.tgz",
-      "integrity": "sha512-EezYymLY6Guk/zLQ2vRA8WvdUhWFEj5fcE3RfWihhxXBW7+cd1LsIiA3lmx+KCmneAGQuyBv820o44L2+TtkSA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.2.0.tgz",
+      "integrity": "sha512-fXyqzPgCPZbqhrk7k3hPcCpYIlQ2ugIXDboHUzhJISFVy2DEPsmHgN588MyGmkIOv3jDgNfUE3kJi83L28s/LQ==",
       "license": "MIT",
       "dependencies": {
         "@types/cookie": "^0.6.0",
@@ -5026,12 +5223,12 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.3.tgz",
-      "integrity": "sha512-qQGTE+77hleBzv9SIUIkGRvuFBQGagW+TQKy53UTZAO/3+YFNBYvRsNIZ1GT17yHbc63FylMOdS+m3oUriF1GA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.2.0.tgz",
+      "integrity": "sha512-cU7lTxETGtQRQbafJubvZKHEn5izNABxZhBY0Jlzdv0gqQhCPQt2J8aN5ZPjS6mQOXn5NnirWNh+FpE8TTYN0Q==",
       "license": "MIT",
       "dependencies": {
-        "react-router": "7.1.3"
+        "react-router": "7.2.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -5116,16 +5313,16 @@
       }
     },
     "node_modules/recharts": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.0.tgz",
-      "integrity": "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz",
+      "integrity": "sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==",
       "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.21",
         "react-is": "^18.3.1",
-        "react-smooth": "^4.0.0",
+        "react-smooth": "^4.0.4",
         "recharts-scale": "^0.4.4",
         "tiny-invariant": "^1.3.1",
         "victory-vendor": "^36.6.8"
@@ -5147,19 +5344,13 @@
         "decimal.js-light": "^2.4.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/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
       "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
@@ -5184,9 +5375,9 @@
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
       "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
@@ -5194,13 +5385,13 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
-      "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz",
+      "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -5210,25 +5401,28 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.31.0",
-        "@rollup/rollup-android-arm64": "4.31.0",
-        "@rollup/rollup-darwin-arm64": "4.31.0",
-        "@rollup/rollup-darwin-x64": "4.31.0",
-        "@rollup/rollup-freebsd-arm64": "4.31.0",
-        "@rollup/rollup-freebsd-x64": "4.31.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.31.0",
-        "@rollup/rollup-linux-arm64-musl": "4.31.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.31.0",
-        "@rollup/rollup-linux-x64-gnu": "4.31.0",
-        "@rollup/rollup-linux-x64-musl": "4.31.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.31.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.31.0",
-        "@rollup/rollup-win32-x64-msvc": "4.31.0",
+        "@rollup/rollup-android-arm-eabi": "4.52.5",
+        "@rollup/rollup-android-arm64": "4.52.5",
+        "@rollup/rollup-darwin-arm64": "4.52.5",
+        "@rollup/rollup-darwin-x64": "4.52.5",
+        "@rollup/rollup-freebsd-arm64": "4.52.5",
+        "@rollup/rollup-freebsd-x64": "4.52.5",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.52.5",
+        "@rollup/rollup-linux-arm-musleabihf": "4.52.5",
+        "@rollup/rollup-linux-arm64-gnu": "4.52.5",
+        "@rollup/rollup-linux-arm64-musl": "4.52.5",
+        "@rollup/rollup-linux-loong64-gnu": "4.52.5",
+        "@rollup/rollup-linux-ppc64-gnu": "4.52.5",
+        "@rollup/rollup-linux-riscv64-gnu": "4.52.5",
+        "@rollup/rollup-linux-riscv64-musl": "4.52.5",
+        "@rollup/rollup-linux-s390x-gnu": "4.52.5",
+        "@rollup/rollup-linux-x64-gnu": "4.52.5",
+        "@rollup/rollup-linux-x64-musl": "4.52.5",
+        "@rollup/rollup-openharmony-arm64": "4.52.5",
+        "@rollup/rollup-win32-arm64-msvc": "4.52.5",
+        "@rollup/rollup-win32-ia32-msvc": "4.52.5",
+        "@rollup/rollup-win32-x64-gnu": "4.52.5",
+        "@rollup/rollup-win32-x64-msvc": "4.52.5",
         "fsevents": "~2.3.2"
       }
     },
@@ -5262,9 +5456,9 @@
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -5275,9 +5469,9 @@
       }
     },
     "node_modules/set-cookie-parser": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
       "license": "MIT"
     },
     "node_modules/shebang-command": {
@@ -5314,9 +5508,9 @@
       }
     },
     "node_modules/sonner": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.2.tgz",
-      "integrity": "sha512-zMbseqjrOzQD1a93lxahm+qMGxWovdMxBlkTbbnZdNqVLt4j+amF9PQxUCL32WfztOFt9t9ADYkejAL3jF9iNA==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
+      "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
       "license": "MIT",
       "peerDependencies": {
         "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
@@ -5392,9 +5586,9 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -5584,9 +5778,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
-      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -5642,15 +5836,15 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.21.0.tgz",
-      "integrity": "sha512-txEKYY4XMKwPXxNkN8+AxAdX6iIJAPiJbHE/FpQccs/sxw8Lf26kqwC3cn0xkHlW8kEbLhkhCsjWuMveaY9Rxw==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz",
+      "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.21.0",
-        "@typescript-eslint/parser": "8.21.0",
-        "@typescript-eslint/utils": "8.21.0"
+        "@typescript-eslint/eslint-plugin": "8.24.1",
+        "@typescript-eslint/parser": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5672,9 +5866,9 @@
       "license": "MIT"
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
-      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
+      "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
       "dev": true,
       "funding": [
         {
@@ -5784,15 +5978,15 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
-      "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
+      "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.24.2",
-        "postcss": "^8.4.49",
-        "rollup": "^4.23.0"
+        "postcss": "^8.5.2",
+        "rollup": "^4.30.1"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -5966,9 +6160,9 @@
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -5978,15 +6172,15 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
-      "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14.6"
       }
     },
     "node_modules/yocto-queue": {
diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix
index 2f74a81208d0..5204944764dd 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-user/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-user";
-  version = "1.13.3";
+  version = "1.32.0";
 
   src = fetchFromGitHub {
     owner = "hamster1963";
     repo = "nezha-dash-v1";
     tag = "v${version}";
-    hash = "sha256-dg46wJtaY+b0gfL0+HchVNGFAx41Cz/moqL/8InNYp4=";
+    hash = "sha256-W3UnDDvzj5AWT8EQyNL7TtDxQlgQpfYeLZsvSCF/dGw=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -27,7 +27,7 @@ buildNpmPackage rec {
       --replace-fail '/commit/' '/tree/'
   '';
 
-  npmDepsHash = "sha256-n7ejpEkakvWO89GhHyy/QbxNvDaXXIDGERc8neeIyoU=";
+  npmDepsHash = "sha256-nILKXXFOp+Ix6gYpCgcKpAPiLAV9sgMqZ+oTfWZhSIs=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 
diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index 6d328b2213ce..2e6d7b9e6c03 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo124Module,
+  buildGoModule,
   fetchFromGitHub,
   go-swag,
   versionCheckHook,
@@ -14,7 +14,7 @@
 
 let
   pname = "nezha";
-  version = "1.14.3";
+  version = "1.14.9";
 
   frontendName = lib.removePrefix "nezha-theme-";
 
@@ -51,14 +51,14 @@ let
       ++ map mkTemplate withThemes
     );
 in
-buildGo124Module {
+buildGoModule {
   inherit pname version;
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${version}";
-    hash = "sha256-ORPu7mCNqHfuXq/nB3TuNoevbw5ZMvZFetR6NPX/b3U=";
+    hash = "sha256-q4LxqoelZ0Haz8rArINOPvopQQKGnkqIMZ2INo/2C3c=";
   };
 
   proxyVendor = true;
@@ -96,7 +96,7 @@ buildGo124Module {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
   '';
 
-  vendorHash = "sha256-e4FlXKE9A7WpZpafSv0Ais97cyta56ElD9pL4eIvnUk=";
+  vendorHash = "sha256-Q+ur9hIG0xVJHdi79K5e4sV8xuR45qp195ptEDbHAvc=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix
index 3b9b0098765a..cff35f454d3a 100644
--- a/pkgs/by-name/ng/nghttp3/package.nix
+++ b/pkgs/by-name/ng/nghttp3/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nghttp3";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-AAKlyoVtsFmqbcac9zL7sA2aHnPteISPXUjyYh8gyoo=";
+    hash = "sha256-KFl4NTevIT1npc5Cd923nIlBrUXtv6XM3VLZz0/6Qi0=";
   };
 
   outputs = [
@@ -23,16 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags =
-    if stdenv.hostPlatform.isStatic then
-      [
-        (lib.cmakeBool "ENABLE_SHARED_LIB" false)
-        (lib.cmakeBool "ENABLE_STATIC_LIB" true)
-      ]
-    else
-      [
-        (lib.cmakeBool "ENABLE_STATIC_LIB" false)
-      ];
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json
index cfdea158e908..a481d4be6d99 100644
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@@ -1,38 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/9q4HZ8StRme/ngrok-v3-3.25.0-linux-386",
-    "sha256": "69a76dacb52e568977d105d0d8945c70d1702f9516d42959a4236daaab53559e",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/nNTqdX4Ydi/ngrok-v3-3.31.0-linux-386",
+    "sha256": "df57220616e209b18fad5db27ebab459b79d79431845a9f35e39f5f7b482646d",
+    "version": "3.31.0"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/9smpcEP9X6q/ngrok-v3-3.25.0-linux-amd64",
-    "sha256": "13ec4a15ab815f29cd6d9eafc4bde3b6bb3a7c6ed5d96c3dd093884fb41c7b27",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/mWtsD5CQpnc/ngrok-v3-3.31.0-linux-amd64",
+    "sha256": "1dab42535428db2a55f44abb0d14f6d9fec7f930f9346c9bd69f0cf5b6529dca",
+    "version": "3.31.0"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/jyXJJfSXXDP/ngrok-v3-3.25.0-linux-arm",
-    "sha256": "60901e0ce54f2730b27f76797c2b96f40b9af859403da6c4be81d9d6330bca9f",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/dDdHR6qWaFy/ngrok-v3-3.31.0-linux-arm",
+    "sha256": "e713bfc77f2fe0a1225215ce5651a3beefb27773b01f1cce442a271512ee60bd",
+    "version": "3.31.0"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/7TpsSBE1k4y/ngrok-v3-3.25.0-linux-arm64",
-    "sha256": "dd49f434b64c1b4646a2e287f939d77f4dfc8d0a314e39c69a89e8cf5275f55b",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/2SEt27vYGV3/ngrok-v3-3.31.0-linux-arm64",
+    "sha256": "4bd600d663bcdec42a7d1a6f0c5a042042fecd529b9867b532bd794e62fdb9b4",
+    "version": "3.31.0"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/9pCLo8uquic/ngrok-v3-3.25.0-darwin-amd64",
-    "sha256": "1199c6c6f6f4d5fc7c91ed5dbbbda2cf212568d7397e0785d92b1d1c4bd87a25",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/8YrgUfMJ8FH/ngrok-v3-3.31.0-darwin-amd64",
+    "sha256": "b4855f6d9b170ffe9a77393e43d1e40a4a5ce66a6906fa2cfcddaf5e05938b98",
+    "version": "3.31.0"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/2PceGNze17x/ngrok-v3-3.25.0-darwin-arm64",
-    "sha256": "a3799883672ed868036ec71353e9feec8389568b75e5d704a32a52a409f37133",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/9XVR1UCtCce/ngrok-v3-3.31.0-darwin-arm64",
+    "sha256": "407f7e88a57f93536d0981544d4132cdf100aa2799a5b56640ec13726febc970",
+    "version": "3.31.0"
   }
 }
diff --git a/pkgs/by-name/ng/ngt/package.nix b/pkgs/by-name/ng/ngt/package.nix
index 44f3bb1d69e9..76427d914f1c 100644
--- a/pkgs/by-name/ng/ngt/package.nix
+++ b/pkgs/by-name/ng/ngt/package.nix
@@ -4,22 +4,26 @@
   fetchFromGitHub,
   cmake,
   llvmPackages,
+  openblas,
   enableAVX ? stdenv.hostPlatform.avxSupport,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "NGT";
-  version = "1.12.3-alpha";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "yahoojapan";
     repo = "NGT";
-    rev = "29c88ff6cd5824d3196986d1f50b834565b6c9dd";
-    sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-2cCuVeg7y3butTIAQaYIgx+DPqIFEA2qqVe3exAoAY8=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ llvmPackages.openmp ];
+  buildInputs = [
+    llvmPackages.openmp
+    openblas
+  ];
 
   NIX_ENFORCE_NO_NATIVE = !enableAVX;
   __AVX2__ = if enableAVX then 1 else 0;
@@ -31,4 +35,4 @@ stdenv.mkDerivation {
     license = licenses.asl20;
     maintainers = with maintainers; [ tomberek ];
   };
-}
+})
diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index c48c23697788..cd012dbd780b 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-y8aiS6h5CSJYBdsAH4jYhAyrFug7aH2H8L6rBfULnQQ=";
     })
     ./fix-darwin-build.patch
+    # Fix for Qt 6.10
+    (fetchpatch {
+      url = "https://github.com/Nheko-Reborn/nheko/commit/af2ca72030deb14a920a888e807dc732d93e3714.patch";
+      hash = "sha256-tlYrfEoUkdJoVzvfF34IhXdn1AxLO0MOlp9rzuFivws=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index 476baccd55c9..106d7f35d54c 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ni";
-  version = "26.1.0";
+  version = "27.0.1";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "ni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vde0NUOWVfdrJUgYBLP4C3I+lFv3YJVtcqUgB7Nx2b0=";
+    hash = "sha256-rl0pzzhQCuX3Vvq7Iu88L4ph3nA8HRD8HU11YGXT1wQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-aNRWBnlZ72OmU619L99aVqL317w4gSaJNtoO25u+s40=";
+    hash = "sha256-M0SbUWoIHWftfpHPYmX/sUmvR8pGmONv4HUVos6x72I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/niftyreg/package.nix b/pkgs/by-name/ni/niftyreg/package.nix
index f71fa0132586..3f981df10c2d 100644
--- a/pkgs/by-name/ni/niftyreg/package.nix
+++ b/pkgs/by-name/ni/niftyreg/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg";
     description = "Medical image registration software";
diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index 1c7d59328a45..4be9dd5fe895 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -24,12 +24,21 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 2.8)" "cmake_policy(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg";
     description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
     license = licenses.bsd3;
+    # last successful hydra build on darwin was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 
 }
diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
index fe2d231e1e75..19cb96f8b529 100644
--- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
+++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-09-09";
+    version = "0-unstable-2025-10-23";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Nightfox-GTK-Theme";
-      rev = "7672385bb28e39c65d1509f15efbe1a7c1bde631";
-      hash = "sha256-Rd8GkXeyrX3fYoYOO+1GN8MLg2+vW3BsXcbBraAL+Is=";
+      rev = "f0212f2aa0d3d6cc0b313020d2d0122f313eafc9";
+      hash = "sha256-KZR5vuMQnLa7AK77YB11BqgqwQHVVFfIe/rXzcocbwk=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/ni/nihstro/package.nix b/pkgs/by-name/ni/nihstro/package.nix
index d6e962f799e8..c398f0179089 100644
--- a/pkgs/by-name/ni/nihstro/package.nix
+++ b/pkgs/by-name/ni/nihstro/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZHgWyZFW7t2VTibH7WeuU8+I12bb95I9NcHI5s4U3VU=";
   };
 
+  postPatch = ''
+    # CMake 2.6 is deprecated and is no longer supported by CMake > 4
+    # inline of https://github.com/neobrain/nihstro/pull/71
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" \
+        "cmake_minimum_required(VERSION 3.5)"
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/niimath/package.nix b/pkgs/by-name/ni/niimath/package.nix
index d30a2680f2ca..5a85e292c038 100644
--- a/pkgs/by-name/ni/niimath/package.nix
+++ b/pkgs/by-name/ni/niimath/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "niimath";
-  version = "1.0.20240905";
+  version = "1.0.20250804";
 
   src = fetchFromGitHub {
     owner = "rordenlab";
     repo = "niimath";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3XgB4q0HXLo9rEQBzC+2dxN81r9n8kkj2OC5d+WFmEs=";
+    hash = "sha256-lCs3yagFHQ9livH1ffwNhh7XCn4nEY48or6512yAl0k=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix
index a91ee9517ebb..6f9c316de6ae 100644
--- a/pkgs/by-name/ni/nil/package.nix
+++ b/pkgs/by-name/ni/nil/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       oxalica
     ];
     mainProgram = "nil";
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 7a627311af25..14da6fdc6326 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -4,7 +4,7 @@
   eudev,
   fetchFromGitHub,
   installShellFiles,
-  libdisplay-info,
+  libdisplay-info_0_2,
   libglvnd,
   libinput,
   libxkbcommon,
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
-    libdisplay-info
+    libdisplay-info_0_2
     libglvnd # For libEGL
     libinput
     libxkbcommon
diff --git a/pkgs/by-name/ni/nirius/package.nix b/pkgs/by-name/ni/nirius/package.nix
index d33717ea6a73..cf5be31c1f10 100644
--- a/pkgs/by-name/ni/nirius/package.nix
+++ b/pkgs/by-name/ni/nirius/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nirius";
-  version = "0.5.4";
+  version = "0.6.1";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "nirius";
     rev = "nirius-${version}";
-    hash = "sha256-UZUat/BmMIvkAphLaU5jaiRCrtsXvUXXGOgPrjgpPaU=";
+    hash = "sha256-KAh45AcNB9Y4ahxamtI6/z3l1xg6yf17h4rnZl3w89I=";
   };
 
-  cargoHash = "sha256-eLQf3cC95y4UdPI/gJWN4Fdwa3DqXT+QvIV+2w34ul0=";
+  cargoHash = "sha256-p123QvlB/j0b5kFjICcTI/5ZKL8pzGfIvH80doAhqFA=";
 
   meta = {
     description = "Utility commands for the niri wayland compositor";
diff --git a/pkgs/by-name/ni/nix-bash-completions/0001-Fix-completion-with-Nix-2.4-on-non-NixOS.patch b/pkgs/by-name/ni/nix-bash-completions/0001-Fix-completion-with-Nix-2.4-on-non-NixOS.patch
new file mode 100644
index 000000000000..3e3aac1cebdd
--- /dev/null
+++ b/pkgs/by-name/ni/nix-bash-completions/0001-Fix-completion-with-Nix-2.4-on-non-NixOS.patch
@@ -0,0 +1,49 @@
+From 135798f6dff7cf5167906cecc0e9c86860c70f36 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
+Date: Mon, 4 Sep 2023 14:10:01 +0200
+Subject: [PATCH] Fix completion with Nix 2.4+ on non-NixOS
+
+Nix 2.4+ stopped setting NIX_PATH in the environment and instead uses a
+built-in default in the C++ code (not exposed to shell processes). That
+means this completion codes sees $override as empty and runs `NIX_PATH=
+nix-instantiate ...`. Setting NIX_PATH to an empty string means Nix
+won't use its default built-in value and completion breaks (assuming
+the completion depends on '<nixpkgs>' or similar search path entries).
+
+NixOS isn't affected because there NIX_PATH is still set (by the OS, not
+by code from the Nix repo).
+
+The fix is to not pass NIX_PATH unless we have a value for it. That
+works for both old and new Nix, on NixOS and non-NixOS.
+
+(I initially tried with a single `$maybe_nix_path nix-instantiate ...`,
+but apparently bash treats the value in $maybe_nix_path as a command
+instead of setting environment variables for the process.)
+---
+ _nix | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/_nix b/_nix
+index 6b9c281..61052f1 100755
+--- a/_nix
++++ b/_nix
+@@ -101,7 +101,15 @@ function _nix_eval_stdin () {
+     # Shortcut: since the output of this function is only used in the -W argument of compgen,
+     # which expects a shell-quoted list of words, we leave the double quotes from the Nix
+     # output intact to approximate shell quoting.
+-    NIX_PATH=$override nix-instantiate --eval - 2> /dev/null | tr '[]' ' '
++    if [[ -n "$override" ]]; then
++        NIX_PATH=$override nix-instantiate --eval - 2> /dev/null | tr '[]' ' '
++    else
++        # Don't set NIX_PATH to empty string, as that'll overwrite/clear Nix'
++        # built-in default (since version 2.4+). Nix 2.3 and older sets
++        # NIX_PATH in shell initialization files, which means for those
++        # versions we already have it in $override (code path above).
++        nix-instantiate --eval - 2> /dev/null | tr '[]' ' '
++    fi
+ }
+ 
+ # Resolve any urls ourselves, as nix will start downloading and block
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/ni/nix-bash-completions/package.nix b/pkgs/by-name/ni/nix-bash-completions/package.nix
index 71ea4e111dfc..0aff7d889d87 100644
--- a/pkgs/by-name/ni/nix-bash-completions/package.nix
+++ b/pkgs/by-name/ni/nix-bash-completions/package.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation rec {
       url = "https://github.com/hedning/nix-bash-completions/pull/28/commits/ef2055aa28754fa9e009bbfebc1491972e4f4e67.patch";
       hash = "sha256-TRkHrk7bX7DX0COzzYR+1pgTqLy7J55BcejNjRwthII=";
     })
+    # Fix completion with Nix 2.4+ on non-NixOS: https://github.com/hedning/nix-bash-completions/pull/26
+    # Rebased locally due to conflict with the above patch (https://github.com/hedning/nix-bash-completions/pull/28).
+    ./0001-Fix-completion-with-Nix-2.4-on-non-NixOS.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
index daa817849c9d..4e1db4155390 100644
--- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix
+++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
@@ -9,13 +9,13 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "nix-heuristic-gc";
-  version = "0.6.2";
+  version = "0.7.0";
   format = "setuptools";
   src = fetchFromGitHub {
     owner = "risicle";
     repo = "nix-heuristic-gc";
     tag = "v${version}";
-    hash = "sha256-FHA1/zlBUr81wSWL0Cd5DVsxUDuUpD3UuLde8UgxOzQ=";
+    hash = "sha256-xyenFPMwlDbkWohw+BX84gdLLR3A1/T7E9aH4MwBwXQ=";
   };
 
   # NIX_SYSTEM suggested at
diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 36aba06ad9e3..97ce3cea62d2 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [
       bennofs
-      figsoda
       ncfavier
     ];
   };
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 7194d5d8d7ab..5504e02a8ddc 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -96,6 +96,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/nix-community/nix-init";
     changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ lib.maintainers.eclairevoyant ];
   };
 })
diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix
index 48f25deee1f1..5fcd038ae8f5 100644
--- a/pkgs/by-name/ni/nix-melt/package.nix
+++ b/pkgs/by-name/ni/nix-melt/package.nix
@@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/nix-melt";
     changelog = "https://github.com/nix-community/nix-melt/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix
index 9a1215c4185f..eb9fb26dafb1 100644
--- a/pkgs/by-name/ni/nix-plugins/package.nix
+++ b/pkgs/by-name/ni/nix-plugins/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-plugins";
-  version = "16.0.0";
+  version = "16.0.1";
 
   src = fetchFromGitHub {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    hash = "sha256-yofHs1IyAkyMqrWlLkmnX+CmH+qsvlhKN1YZM4nRf1M=";
+    hash = "sha256-1P5oVXSx/hGK5MB2grxWtmqsKGtTEmT1XD5+NSsLFUw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 729ede08f014..bff81aff6347 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -3,17 +3,18 @@
   rustPlatform,
   fetchFromGitHub,
   systemd,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-store-veritysetup-generator";
-  version = "0.1.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "nix-store-veritysetup-generator";
     rev = version;
-    hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I=";
+    hash = "sha256-RTGdcLn4zuZAcC1Td4gJcywIerCYyaD0JYz8g5ybmho=";
   };
 
   sourceRoot = "${src.name}/rust";
@@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec {
 
   stripAllList = [ "bin" ];
 
+  passthru.tests = {
+    inherit (nixosTests) nix-store-veritysetup;
+  };
+
   meta = with lib; {
     description = "Systemd unit generator for a verity protected Nix Store";
     homepage = "https://github.com/nikstur/nix-store-veritysetup-generator";
diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 3d67a9329e63..d005fd639f5c 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
+      mdaniels5757
       mic92
     ];
     mainProgram = "nix-update";
diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix
new file mode 100644
index 000000000000..5c507514b6d7
--- /dev/null
+++ b/pkgs/by-name/ni/nixbit/package.nix
@@ -0,0 +1,63 @@
+{
+  cmake,
+  fetchFromGitHub,
+  installShellFiles,
+  kdePackages,
+  lib,
+  libgit2,
+  ninja,
+  pkg-config,
+  qt6,
+  stdenv,
+  xvfb-run,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nixbit";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "pbek";
+    repo = "nixbit";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DpjLPvmn61rEn6ui8cFfqeZEPYGyCUVVP/V7mQw1l5Y=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+    kdePackages.extra-cmake-modules
+    ninja
+    pkg-config
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ];
+
+  buildInputs = [
+    kdePackages.kconfig
+    kdePackages.kcoreaddons
+    kdePackages.ki18n
+    kdePackages.kirigami
+    libgit2
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtwayland
+  ];
+
+  # Install shell completion on Linux (with xvfb-run)
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd nixbit \
+      --bash <(xvfb-run $out/bin/nixbit --completion-bash) \
+      --fish <(xvfb-run $out/bin/nixbit --completion-fish)
+  '';
+
+  meta = with lib; {
+    description = "KDE Plasma application to update your NixOS system from a git repository";
+    homepage = "https://github.com/pbek/nixbit";
+    changelog = "https://github.com/pbek/nixbit/releases/tag/v${finalAttrs.version}";
+    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pbek ];
+    platforms = platforms.linux;
+    mainProgram = "nixbit";
+  };
+})
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 6b75db216fc4..bf5e2b4ecca6 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -17,23 +17,23 @@ let
     src = fetchFromGitHub {
       owner = "numtide";
       repo = "hwinfo";
-      rev = "c2259845d10694c099fb306a8cfc5a403e71c708";
-      hash = "sha256-RGIoJkYiNMRHwUclzdRMELxCgBU9Pfvaghvt3op0zM0=";
+      rev = "bfeab0b4e38b200c7a62a44d4d01601a86fe1091";
+      hash = "sha256-GL3fNCSaU45fNihEksgtPtbuLkc+tVGXtPH05wbrHwI=";
     };
   };
 in
 buildGoModule rec {
   pname = "nixos-facter";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
     tag = "v${version}";
-    hash = "sha256-4kER7CyFvMKVpKxCYHuf9fkkYVzVK9AWpF55cBNzPc0=";
+    hash = "sha256-oMOiZhppyUwyhLMtTofmeQINi8rHwsuQ1cD8Kr1/KwM=";
   };
 
-  vendorHash = "sha256-A7ZuY8Gc/a0Y8O6UG2WHWxptHstJOxi4n9F8TY6zqiw=";
+  vendorHash = "sha256-5duwAxAgbPZIbbgzZE2m574TF/0+jF/TvTKI4YBH6jM=";
 
   env.CGO_ENABLED = 1;
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 1e2c8363ad6c..33f52e0e1c68 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -26,7 +26,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "nixos-rebuild-ng";
-  version = "0.0.0";
+  version = lib.trivial.release;
   src = ./src;
   pyproject = true;
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index b145f735c283..2d46c417580d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -16,7 +16,6 @@ NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
 NIXOS_REBUILD_REEXEC_ENV: Final = "_NIXOS_REBUILD_REEXEC"
 
 logger: Final = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def reexec(
@@ -372,4 +371,10 @@ def write_version_suffix(build_flags: Args) -> None:
     nixpkgs_path = nix.find_file("nixpkgs", build_flags)
     rev = nix.get_nixpkgs_rev(nixpkgs_path)
     if nixpkgs_path and rev:
-        (nixpkgs_path / ".version-suffix").write_text(rev)
+        try:
+            (nixpkgs_path / ".version-suffix").write_text(rev)
+        except OSError as error:
+            logger.debug(
+                "ignoring error while writing '.version-suffix' to nixpkgs: %s",
+                error,
+            )
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
index 6cdfaba456c6..90c12261025d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
@@ -90,11 +90,11 @@ def tabulate(
     def format_row(row: Mapping[str, Any]) -> str:
         s = (2 * " ").join(
             f"{str(row[header]).ljust(width)}"
-            for header, width in zip(data_headers, column_widths)
+            for header, width in zip(data_headers, column_widths, strict=True)
         )
         return s.strip()
 
-    result = [format_row(dict(zip(data_headers, data_headers)))]
+    result = [format_row(dict(zip(data_headers, data_headers, strict=True)))]
     for row in data:
         result.append(format_row(row))
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py
index c7a2a29ee3dc..f27e491a632d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py
@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from types import ModuleType
-from typing import Any, Callable
+from typing import Any
 
 
 def get_qualified_name(
diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index 92624a32469e..3178423bddd4 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixpacks";
-  version = "1.40.0";
+  version = "1.41.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "nixpacks";
     rev = "v${version}";
-    hash = "sha256-vF0vkUuvQR5z3v7LJmzpuvyLjuDjUL3HFIUzRKPojCs=";
+    hash = "sha256-y2zrXS56fSsPaVmJcUxTMYhOroYjcNKepuI9tmdORsY=";
   };
 
-  cargoHash = "sha256-lVdGIQxRREG7EYtQAzXzBx3Mg5bRopIe5rlGkNY3kTI=";
+  cargoHash = "sha256-Oom7CC8WBHd3hEQ62hQU91YbC4ydtdQuhAH6LFRN+P8=";
 
   # skip test due FHS dependency
   doCheck = false;
diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
index 97364eeb7f90..efd990d4e0ca 100644
--- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
@@ -41,6 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/jtojnar/nixpkgs-hammering";
     license = lib.licenses.mit;
     mainProgram = "nixpkgs-hammer";
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
index ab32bfbbc4ca..334bfb88786e 100644
--- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       artturin
-      figsoda
     ];
   };
 }
diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index eb0120fb843d..4759c8248966 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -86,7 +86,7 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.mit;
     mainProgram = "nixpkgs-review";
     maintainers = with lib.maintainers; [
-      figsoda
+      mdaniels5757
       mic92
     ];
   };
diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
deleted file mode 100644
index 6d518ff985f4..000000000000
--- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  libarchive,
-  openssl,
-  rust-jemalloc-sys,
-  sqlite,
-  pkg-config,
-  nixosTests,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "nixseparatedebuginfod";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "symphorien";
-    repo = "nixseparatedebuginfod";
-    rev = "v${version}";
-    hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k=";
-  };
-
-  cargoHash = "sha256-vaCmRr1hXF0BSg/dl3LYyd7c1MdPKIv6KgDgGEzqqJQ=";
-
-  # tests need a working nix install with access to the internet
-  doCheck = false;
-
-  buildInputs = [
-    libarchive
-    openssl
-    rust-jemalloc-sys
-    sqlite
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  passthru = {
-    tests = {
-      inherit (nixosTests) nixseparatedebuginfod;
-    };
-  };
-
-  meta = with lib; {
-    description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed";
-    homepage = "https://github.com/symphorien/nixseparatedebuginfod";
-    license = licenses.gpl3Only;
-    maintainers = [ maintainers.symphorien ];
-    platforms = platforms.linux;
-    mainProgram = "nixseparatedebuginfod";
-  };
-}
diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
index 2cffac191eef..42f9613df285 100644
--- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixseparatedebuginfod2";
-  version = "0.1.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nixseparatedebuginfod2";
     tag = "v${version}";
-    hash = "sha256-bk+l/oWAPuWV6mnh9Pr/mru3BZjos08IfzEGUEFSW1E=";
+    hash = "sha256-INY9mLJ+7i3BoShqFZMELm9aXiDbZkuLyokgm42kEbo=";
   };
 
-  cargoHash = "sha256-HmtFso6uF2GsjIA0FPVL4S3S+lwQUrg7N576UaekXpU=";
+  cargoHash = "sha256-6JyC0CLGnkbQWp8l27DXZ04Gt0nsNNSBFfcvAQtllE4=";
 
   buildInputs = [
     libarchive
@@ -41,6 +41,9 @@ rustPlatform.buildRustPackage rec {
 
   passthru.tests = { inherit (nixosTests) nixseparatedebuginfod2; };
 
+  # flaky tests
+  checkFlags = [ "--skip substituter::http" ];
+
   meta = {
     description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed";
     homepage = "https://github.com/symphorien/nixseparatedebuginfod2";
diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
index e11fa98c8373..d32c7366011b 100644
--- a/pkgs/by-name/nl/nlohmann_json/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json/package.nix
@@ -24,7 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isMusl [
+  patches = [
+    # Fix missing char8_t support
+    # https://github.com/nlohmann/json/pull/4736
+    (fetchpatch {
+      name = "fix-char8_t.patch";
+      url = "https://github.com/nlohmann/json/commit/756ca22ec5b0d89b5d107b4c30891d1293650c87.patch?full_index=1";
+      hash = "sha256-OK8FIXClj5paZNiEvPwJWr5PxyVYtJ3zkRlcZoe8d20=";
+    })
     # Musl does not support LC_NUMERIC, causing a test failure.
     # Turn the error into a warning to make the test succeed.
     # https://github.com/nlohmann/json/pull/4770
diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
index 7a5cc79679f9..bbd6254f474d 100644
--- a/pkgs/by-name/nm/nmap-formatter/package.nix
+++ b/pkgs/by-name/nm/nmap-formatter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nmap-formatter";
-  version = "3.0.5";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "vdjagilev";
     repo = "nmap-formatter";
     rev = "v${version}";
-    hash = "sha256-jpgAcnDDVVboZEMkLIE9ei0oT91Y9yp8KUJkH6LQSY4=";
+    hash = "sha256-qai8HbVJJLFH5cNiG24fBjq5++6mvlhpT+4hlvx+gGI=";
   };
 
-  vendorHash = "sha256-xOS59co6FE2lJae2VtsBKcGjvmMRiGlmZKbqH++mEYk=";
+  vendorHash = "sha256-q94ET4oMYvF3eCJ358EznwL++vwdCeEAu5UquGChCc0=";
 
   meta = {
     description = "Tool that allows you to convert nmap output";
diff --git a/pkgs/by-name/nn/nncp/package.nix b/pkgs/by-name/nn/nncp/package.nix
index 28a7609bc8da..4efa9bf5778f 100644
--- a/pkgs/by-name/nn/nncp/package.nix
+++ b/pkgs/by-name/nn/nncp/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nncp";
-  version = "8.12.1";
+  version = "8.13.0";
   outputs = [
     "out"
     "doc"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-yTwndQ43aBCned7iKPZm70zCC3zMapf2GXtornjiZos=";
+    hash = "sha256-jONoDpgAUZjYl14DF2CzqbM75tLWGETHmfd4yiM9BfQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 1e55fce8e8e1..b38f98afec73 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.51";
+  version = "0.58";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OjD7UiwVF/Be8Mqf2CT06ScqDIikiL4jLVxGj5ejiqc=";
+    hash = "sha256-+6qIGs8O7EoziP03qJJ+tztxoubnnBwDijD84UZ0C4c=";
   };
 
-  cargoHash = "sha256-rxq/5DqEpXzX/dXy1NKZSQw3Dy8NrvtOPNSskxEjEBM=";
+  cargoHash = "sha256-pLGLMz7q63uEr9lGeq25q8fKWY+D75PRmS7bDO4ZyKM=";
 
   meta = {
     description = "Debugger for Linux";
diff --git a/pkgs/by-name/nn/nnpdf/package.nix b/pkgs/by-name/nn/nnpdf/package.nix
index 80caef6f3ae1..b1e55a6d998b 100644
--- a/pkgs/by-name/nn/nnpdf/package.nix
+++ b/pkgs/by-name/nn/nnpdf/package.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
       substituteInPlace $file \
         --replace "-march=nocona -mtune=haswell" ""
     done
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/no/node-gyp/package-lock.json b/pkgs/by-name/no/node-gyp/package-lock.json
index c5612067dc0d..8ec0df643c44 100644
--- a/pkgs/by-name/no/node-gyp/package-lock.json
+++ b/pkgs/by-name/no/node-gyp/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "node-gyp",
-  "version": "11.4.2",
+  "version": "11.5.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "node-gyp",
-      "version": "11.4.2",
+      "version": "11.5.0",
       "license": "MIT",
       "dependencies": {
         "env-paths": "^2.2.0",
@@ -37,9 +37,9 @@
       }
     },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-      "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -79,13 +79,13 @@
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-      "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+      "version": "0.21.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+      "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.6",
+        "@eslint/object-schema": "^2.1.7",
         "debug": "^4.3.1",
         "minimatch": "^3.1.2"
       },
@@ -94,19 +94,22 @@
       }
     },
     "node_modules/@eslint/config-helpers": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
-      "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.1.tgz",
+      "integrity": "sha512-csZAzkNhsgwb0I/UAV6/RGFTbiakPCf0ZrGmrIxQpYvGZ00PhTkSnyKNolphgIvmnJeGw6rcGVEXfTzUnFuEvw==",
       "dev": true,
       "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^0.16.0"
+      },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.15.2",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-      "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+      "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
+      "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -141,9 +144,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.34.0.tgz",
-      "integrity": "sha512-EoyvqQnBNsV1CWaEJ559rxXL4c8V92gxirbawSmVUOWXlsRxxQXl6LmCpdUblgxgSkDIqKnhzba2SjRTI/A5Rw==",
+      "version": "9.38.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
+      "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -154,9 +157,9 @@
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+      "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
       "dev": true,
       "license": "Apache-2.0",
       "engines": {
@@ -164,13 +167,13 @@
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-      "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz",
+      "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.15.2",
+        "@eslint/core": "^0.16.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -188,33 +191,19 @@
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
         "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.3.0"
+        "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
-    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-      "dev": true,
-      "license": "Apache-2.0",
-      "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
     "node_modules/@humanwhocodes/gitignore-to-minimatch": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/gitignore-to-minimatch/-/gitignore-to-minimatch-1.0.2.tgz",
@@ -394,17 +383,17 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.41.0.tgz",
-      "integrity": "sha512-8fz6oa6wEKZrhXWro/S3n2eRJqlRcIa6SlDh59FXJ5Wp5XRZ8B9ixpJDcjadHq47hMx0u+HW6SNa6LjJQ6NLtw==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.1.tgz",
+      "integrity": "sha512-rUsLh8PXmBjdiPY+Emjz9NX2yHvhS11v0SR6xNJkm5GM1MO9ea/1GoDKlHHZGrOJclL/cZ2i/vRUYVtjRhrHVQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/type-utils": "8.41.0",
-        "@typescript-eslint/utils": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
+        "@typescript-eslint/scope-manager": "8.46.1",
+        "@typescript-eslint/type-utils": "8.46.1",
+        "@typescript-eslint/utils": "8.46.1",
+        "@typescript-eslint/visitor-keys": "8.46.1",
         "graphemer": "^1.4.0",
         "ignore": "^7.0.0",
         "natural-compare": "^1.4.0",
@@ -418,7 +407,7 @@
         "url": "https://opencollective.com/typescript-eslint"
       },
       "peerDependencies": {
-        "@typescript-eslint/parser": "^8.41.0",
+        "@typescript-eslint/parser": "^8.46.1",
         "eslint": "^8.57.0 || ^9.0.0",
         "typescript": ">=4.8.4 <6.0.0"
       }
@@ -434,16 +423,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.41.0.tgz",
-      "integrity": "sha512-gTtSdWX9xiMPA/7MV9STjJOOYtWwIJIYxkQxnSV1U3xcE+mnJSH3f6zI0RYP+ew66WSlZ5ed+h0VCxsvdC1jJg==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.1.tgz",
+      "integrity": "sha512-6JSSaBZmsKvEkbRUkf7Zj7dru/8ZCrJxAqArcLaVMee5907JdtEbKGsZ7zNiIm/UAkpGUkaSMZEXShnN2D1HZA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
+        "@typescript-eslint/scope-manager": "8.46.1",
+        "@typescript-eslint/types": "8.46.1",
+        "@typescript-eslint/typescript-estree": "8.46.1",
+        "@typescript-eslint/visitor-keys": "8.46.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -459,14 +448,14 @@
       }
     },
     "node_modules/@typescript-eslint/project-service": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.41.0.tgz",
-      "integrity": "sha512-b8V9SdGBQzQdjJ/IO3eDifGpDBJfvrNTp2QD9P2BeqWTGrRibgfgIlBSw6z3b6R7dPzg752tOs4u/7yCLxksSQ==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.1.tgz",
+      "integrity": "sha512-FOIaFVMHzRskXr5J4Jp8lFVV0gz5ngv3RHmn+E4HYxSJ3DgDzU7fVI1/M7Ijh1zf6S7HIoaIOtln1H5y8V+9Zg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/tsconfig-utils": "^8.41.0",
-        "@typescript-eslint/types": "^8.41.0",
+        "@typescript-eslint/tsconfig-utils": "^8.46.1",
+        "@typescript-eslint/types": "^8.46.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -481,14 +470,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.41.0.tgz",
-      "integrity": "sha512-n6m05bXn/Cd6DZDGyrpXrELCPVaTnLdPToyhBoFkLIMznRUQUEQdSp96s/pcWSQdqOhrgR1mzJ+yItK7T+WPMQ==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.1.tgz",
+      "integrity": "sha512-weL9Gg3/5F0pVQKiF8eOXFZp8emqWzZsOJuWRUNtHT+UNV2xSJegmpCNQHy37aEQIbToTq7RHKhWvOsmbM680A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0"
+        "@typescript-eslint/types": "8.46.1",
+        "@typescript-eslint/visitor-keys": "8.46.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -499,9 +488,9 @@
       }
     },
     "node_modules/@typescript-eslint/tsconfig-utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.41.0.tgz",
-      "integrity": "sha512-TDhxYFPUYRFxFhuU5hTIJk+auzM/wKvWgoNYOPcOf6i4ReYlOoYN8q1dV5kOTjNQNJgzWN3TUUQMtlLOcUgdUw==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.1.tgz",
+      "integrity": "sha512-X88+J/CwFvlJB+mK09VFqx5FE4H5cXD+H/Bdza2aEWkSb8hnWIQorNcscRl4IEo1Cz9VI/+/r/jnGWkbWPx54g==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -516,15 +505,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.41.0.tgz",
-      "integrity": "sha512-63qt1h91vg3KsjVVonFJWjgSK7pZHSQFKH6uwqxAH9bBrsyRhO6ONoKyXxyVBzG1lJnFAJcKAcxLS54N1ee1OQ==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.1.tgz",
+      "integrity": "sha512-+BlmiHIiqufBxkVnOtFwjah/vrkF4MtKKvpXrKSPLCkCtAp8H01/VV43sfqA98Od7nJpDcFnkwgyfQbOG0AMvw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/utils": "8.41.0",
+        "@typescript-eslint/types": "8.46.1",
+        "@typescript-eslint/typescript-estree": "8.46.1",
+        "@typescript-eslint/utils": "8.46.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^2.1.0"
       },
@@ -541,9 +530,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.41.0.tgz",
-      "integrity": "sha512-9EwxsWdVqh42afLbHP90n2VdHaWU/oWgbH2P0CfcNfdKL7CuKpwMQGjwev56vWu9cSKU7FWSu6r9zck6CVfnag==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.1.tgz",
+      "integrity": "sha512-C+soprGBHwWBdkDpbaRC4paGBrkIXxVlNohadL5o0kfhsXqOC6GYH2S/Obmig+I0HTDl8wMaRySwrfrXVP8/pQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -555,16 +544,16 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.41.0.tgz",
-      "integrity": "sha512-D43UwUYJmGhuwHfY7MtNKRZMmfd8+p/eNSfFe6tH5mbVDto+VQCayeAt35rOx3Cs6wxD16DQtIKw/YXxt5E0UQ==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.1.tgz",
+      "integrity": "sha512-uIifjT4s8cQKFQ8ZBXXyoUODtRoAd7F7+G8MKmtzj17+1UbdzFl52AzRyZRyKqPHhgzvXunnSckVu36flGy8cg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/project-service": "8.41.0",
-        "@typescript-eslint/tsconfig-utils": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/visitor-keys": "8.41.0",
+        "@typescript-eslint/project-service": "8.46.1",
+        "@typescript-eslint/tsconfig-utils": "8.46.1",
+        "@typescript-eslint/types": "8.46.1",
+        "@typescript-eslint/visitor-keys": "8.46.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -610,16 +599,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.41.0.tgz",
-      "integrity": "sha512-udbCVstxZ5jiPIXrdH+BZWnPatjlYwJuJkDA4Tbo3WyYLh8NvB+h/bKeSZHDOFKfphsZYJQqaFtLeXEqurQn1A==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.1.tgz",
+      "integrity": "sha512-vkYUy6LdZS7q1v/Gxb2Zs7zziuXN0wxqsetJdeZdRe/f5dwJFglmuvZBfTUivCtjH725C1jWCDfpadadD95EDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.7.0",
-        "@typescript-eslint/scope-manager": "8.41.0",
-        "@typescript-eslint/types": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0"
+        "@typescript-eslint/scope-manager": "8.46.1",
+        "@typescript-eslint/types": "8.46.1",
+        "@typescript-eslint/typescript-estree": "8.46.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -634,13 +623,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.41.0.tgz",
-      "integrity": "sha512-+GeGMebMCy0elMNg67LRNoVnUFPIm37iu5CmHESVx56/9Jsfdpsvbv605DQ81Pi/x11IdKUsS5nzgTYbCQU9fg==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.1.tgz",
+      "integrity": "sha512-ptkmIf2iDkNUjdeu2bQqhFPV1m6qTnFFjg7PPDjxKWaMaP0Z6I9l30Jr3g5QqbZGdw8YdYvLp+XnqnWWZOg/NA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.41.0",
+        "@typescript-eslint/types": "8.46.1",
         "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
@@ -710,9 +699,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz",
-      "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -1311,9 +1300,9 @@
       }
     },
     "node_modules/debug": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-      "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+      "version": "4.4.3",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+      "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
       "license": "MIT",
       "dependencies": {
         "ms": "^2.1.3"
@@ -1673,25 +1662,24 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.34.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.34.0.tgz",
-      "integrity": "sha512-RNCHRX5EwdrESy3Jc9o8ie8Bog+PeYvvSR8sDGoZxNFTvZ4dlxUB3WzQ3bQMztFrSRODGrLLj8g6OFuGY/aiQg==",
+      "version": "9.38.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
+      "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.21.0",
-        "@eslint/config-helpers": "^0.3.1",
-        "@eslint/core": "^0.15.2",
+        "@eslint/config-array": "^0.21.1",
+        "@eslint/config-helpers": "^0.4.1",
+        "@eslint/core": "^0.16.0",
         "@eslint/eslintrc": "^3.3.1",
-        "@eslint/js": "9.34.0",
-        "@eslint/plugin-kit": "^0.3.5",
+        "@eslint/js": "9.38.0",
+        "@eslint/plugin-kit": "^0.4.0",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@humanwhocodes/retry": "^0.4.2",
         "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.6",
@@ -1772,9 +1760,9 @@
       }
     },
     "node_modules/eslint-plugin-n": {
-      "version": "17.21.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.21.3.tgz",
-      "integrity": "sha512-MtxYjDZhMQgsWRm/4xYLL0i2EhusWT7itDxlJ80l1NND2AL2Vi5Mvneqv/ikG9+zpran0VsVRXTEHrpLmUZRNw==",
+      "version": "17.23.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.23.1.tgz",
+      "integrity": "sha512-68PealUpYoHOBh332JLLD9Sj7OQUDkFpmcfqt8R9sySfFSeuGJjMTJQvCRRB96zO3A/PELRLkPrzsHmzEFQQ5A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -1968,9 +1956,9 @@
       }
     },
     "node_modules/exponential-backoff": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz",
+      "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==",
       "license": "Apache-2.0"
     },
     "node_modules/fast-deep-equal": {
@@ -2217,6 +2205,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/generator-function": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz",
+      "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
@@ -2285,9 +2283,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.10.1",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz",
-      "integrity": "sha512-auHyJ4AgMz7vgS8Hp3N6HXSmlMdUyhSUrfBF16w153rxtLIEOE+HGqaBppczZvnHLqQJfiHotCYpNhl0lUROFQ==",
+      "version": "4.12.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.12.0.tgz",
+      "integrity": "sha512-LScr2aNr2FbjAjZh2C6X6BxRx1/x+aTDExct/xyq2XKbYOiG5c0aK7pMsSuyc0brz3ibr/lbQiHD9jzt4lccJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2797,14 +2795,15 @@
       }
     },
     "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz",
+      "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
+        "call-bound": "^1.0.4",
+        "generator-function": "^2.0.0",
+        "get-proto": "^1.0.1",
         "has-tostringtag": "^1.0.2",
         "safe-regex-test": "^1.1.0"
       },
@@ -2881,6 +2880,16 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/is-plain-obj": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
@@ -3449,9 +3458,9 @@
       "license": "ISC"
     },
     "node_modules/minizlib": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+      "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
       "license": "MIT",
       "dependencies": {
         "minipass": "^7.1.2"
@@ -3460,25 +3469,10 @@
         "node": ">= 18"
       }
     },
-    "node_modules/mkdirp": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
-      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
-      "license": "MIT",
-      "bin": {
-        "mkdirp": "dist/cjs/src/bin.js"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
     "node_modules/mocha": {
-      "version": "11.7.1",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz",
-      "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==",
+      "version": "11.7.4",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz",
+      "integrity": "sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3490,6 +3484,7 @@
         "find-up": "^5.0.0",
         "glob": "^10.4.5",
         "he": "^1.2.0",
+        "is-path-inside": "^3.0.3",
         "js-yaml": "^4.1.0",
         "log-symbols": "^4.1.0",
         "minimatch": "^9.0.5",
@@ -4261,9 +4256,9 @@
       "optional": true
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -4662,9 +4657,9 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -4738,9 +4733,9 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.3.tgz",
-      "integrity": "sha512-ZL6DDuAlRlLGghwcfmSn9sK3Hr6ArtyudlSAiCqQ6IfE+b+HHbydbYDIG15IfS5do+7XQQBdBiubF/cV2dnDzg==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+      "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4752,16 +4747,15 @@
       }
     },
     "node_modules/tar": {
-      "version": "7.4.3",
-      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
-      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.1.tgz",
+      "integrity": "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g==",
       "license": "ISC",
       "dependencies": {
         "@isaacs/fs-minipass": "^4.0.0",
         "chownr": "^3.0.0",
         "minipass": "^7.1.2",
-        "minizlib": "^3.0.1",
-        "mkdirp": "^3.0.1",
+        "minizlib": "^3.1.0",
         "yallist": "^5.0.0"
       },
       "engines": {
@@ -4769,13 +4763,13 @@
       }
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.14",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
       "license": "MIT",
       "dependencies": {
-        "fdir": "^6.4.4",
-        "picomatch": "^4.0.2"
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
       },
       "engines": {
         "node": ">=12.0.0"
@@ -4925,9 +4919,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "dev": true,
       "license": "Apache-2.0",
       "peer": true,
@@ -4940,16 +4934,16 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.41.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.41.0.tgz",
-      "integrity": "sha512-n66rzs5OBXW3SFSnZHr2T685q1i4ODm2nulFJhMZBotaTavsS8TrI3d7bDlRSs9yWo7HmyWrN9qDu14Qv7Y0Dw==",
+      "version": "8.46.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.1.tgz",
+      "integrity": "sha512-VHgijW803JafdSsDO8I761r3SHrgk4T00IdyQ+/UsthtgPRsBWQLqoSxOolxTpxRKi1kGXK0bSz4CoAc9ObqJA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.41.0",
-        "@typescript-eslint/parser": "8.41.0",
-        "@typescript-eslint/typescript-estree": "8.41.0",
-        "@typescript-eslint/utils": "8.41.0"
+        "@typescript-eslint/eslint-plugin": "8.46.1",
+        "@typescript-eslint/parser": "8.46.1",
+        "@typescript-eslint/typescript-estree": "8.46.1",
+        "@typescript-eslint/utils": "8.46.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5131,9 +5125,9 @@
       }
     },
     "node_modules/workerpool": {
-      "version": "9.3.3",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.3.tgz",
-      "integrity": "sha512-slxCaKbYjEdFT/o2rH9xS1hf4uRDch1w7Uo+apxhZ+sf/1d9e0ZVkn42kPNGP2dgjIx6YFvSevj0zHvbWe2jdw==",
+      "version": "9.3.4",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-9.3.4.tgz",
+      "integrity": "sha512-TmPRQYYSAnnDiEB0P/Ytip7bFGvqnSU6I2BcuSw7Hx+JSg/DsUi5ebYfc8GYaSdpuvOcEs6dXxPurOYpe9QFwg==",
       "dev": true,
       "license": "Apache-2.0"
     },
@@ -5214,9 +5208,9 @@
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "license": "MIT",
       "engines": {
         "node": ">=12"
diff --git a/pkgs/by-name/no/node-gyp/package.nix b/pkgs/by-name/no/node-gyp/package.nix
index ec2aa63bdf36..216f1e2b2646 100644
--- a/pkgs/by-name/no/node-gyp/package.nix
+++ b/pkgs/by-name/no/node-gyp/package.nix
@@ -8,16 +8,16 @@
 
 (buildNpmPackage.override { inherit nodejs; }) rec {
   pname = "node-gyp";
-  version = "11.4.2";
+  version = "11.5.0";
 
   src = fetchFromGitHub {
     owner = "nodejs";
     repo = "node-gyp";
     tag = "v${version}";
-    hash = "sha256-IoW71RdjQRfIEr6Nh+xqDsgf28WhQ7vHTS1BB++3mdU=";
+    hash = "sha256-IymzSi9bQhtBX8AjtYAjHs0dN+5scywJuATz5IclSJs=";
   };
 
-  npmDepsHash = "sha256-ixAelIVTKlTmXiXLA2iI9vJ/gp79wpd+wRvspUqEci4=";
+  npmDepsHash = "sha256-C8/pQ26gHToC0yq/6V385Uo1cM8SknoQ2h7u7i3Gy/Q=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
index cae72f0452f7..75776db35417 100644
--- a/pkgs/by-name/no/node-problem-detector/package.nix
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "node-problem-detector";
-  version = "0.8.21";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "node-problem-detector";
     rev = "v${version}";
-    sha256 = "sha256-byxj6EXKAmesFOBtBt0URcT0h1pYdrW8ewtITuEPFcs=";
+    sha256 = "sha256-titH2HHXxm8SpfisAWckwPSA11rsqssMCVmDbdPHDI8=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/no/node-red/package-lock.json b/pkgs/by-name/no/node-red/package-lock.json
index 8e3fb688bb4d..496820c51276 100644
--- a/pkgs/by-name/no/node-red/package-lock.json
+++ b/pkgs/by-name/no/node-red/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "node-red",
-    "version": "4.1.0",
+    "version": "4.1.1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "node-red",
-            "version": "4.1.0",
+            "version": "4.1.1",
             "license": "Apache-2.0",
             "dependencies": {
                 "acorn": "8.15.0",
@@ -48,7 +48,7 @@
                 "mqtt": "5.11.0",
                 "multer": "2.0.2",
                 "mustache": "4.2.0",
-                "node-red-admin": "^4.1.1",
+                "node-red-admin": "^4.1.2",
                 "node-watch": "0.7.4",
                 "nopt": "5.0.0",
                 "oauth2orize": "1.12.0",
@@ -150,14 +150,14 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-            "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+            "version": "7.28.3",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+            "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.28.0",
-                "@babel/types": "^7.28.0",
+                "@babel/parser": "^7.28.3",
+                "@babel/types": "^7.28.2",
                 "@jridgewell/gen-mapping": "^0.3.12",
                 "@jridgewell/trace-mapping": "^0.3.28",
                 "jsesc": "^3.0.2"
@@ -197,13 +197,13 @@
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-            "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
+            "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.28.0"
+                "@babel/types": "^7.28.4"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -213,9 +213,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
-            "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+            "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -237,18 +237,18 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
-            "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
+            "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.28.0",
+                "@babel/generator": "^7.28.3",
                 "@babel/helper-globals": "^7.28.0",
-                "@babel/parser": "^7.28.0",
+                "@babel/parser": "^7.28.4",
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.0",
+                "@babel/types": "^7.28.4",
                 "debug": "^4.3.1"
             },
             "engines": {
@@ -256,9 +256,9 @@
             }
         },
         "node_modules/@babel/traverse/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -281,9 +281,9 @@
             "license": "MIT"
         },
         "node_modules/@babel/types": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-            "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
+            "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -346,20 +346,20 @@
             "license": "Apache-2.0"
         },
         "node_modules/@emnapi/core": {
-            "version": "1.4.5",
-            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.5.tgz",
-            "integrity": "sha512-XsLw1dEOpkSX/WucdqUhPWP7hDxSvZiY+fsUC14h+FtQ2Ifni4znbBt8punRX+Uj2JG/uDb8nEHVKvrVlvdZ5Q==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.5.0.tgz",
+            "integrity": "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg==",
             "license": "MIT",
             "optional": true,
             "dependencies": {
-                "@emnapi/wasi-threads": "1.0.4",
+                "@emnapi/wasi-threads": "1.1.0",
                 "tslib": "^2.4.0"
             }
         },
         "node_modules/@emnapi/runtime": {
-            "version": "1.4.5",
-            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.5.tgz",
-            "integrity": "sha512-++LApOtY0pEEz1zrd9vy1/zXVaVJJ/EbAF3u0fXIzPJEDtnITsBGbbK0EkM72amhl/R5b+5xx0Y/QhcVOpuulg==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.5.0.tgz",
+            "integrity": "sha512-97/BJ3iXHww3djw6hYIfErCZFee7qCtrneuLa20UXFCOTCfBM2cvQHjWJ2EG0s0MtdNwInarqCTz35i4wWXHsQ==",
             "license": "MIT",
             "optional": true,
             "dependencies": {
@@ -367,9 +367,9 @@
             }
         },
         "node_modules/@emnapi/wasi-threads": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.4.tgz",
-            "integrity": "sha512-PJR+bOmMOPH8AtcTGAyYNiuJ3/Fcoj2XN/gBEWzDIKh254XO+mM9XoXHk5GNEhodxeMznbg7BlRojVbKN+gC6g==",
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz",
+            "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==",
             "license": "MIT",
             "optional": true,
             "dependencies": {
@@ -401,9 +401,9 @@
             }
         },
         "node_modules/@iconify/utils/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -438,9 +438,9 @@
             }
         },
         "node_modules/@jridgewell/gen-mapping": {
-            "version": "0.3.12",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
-            "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+            "version": "0.3.13",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -459,16 +459,16 @@
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-            "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.29",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-            "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+            "version": "0.3.31",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+            "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -490,9 +490,9 @@
             }
         },
         "node_modules/@mermaid-js/parser": {
-            "version": "0.6.2",
-            "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.6.2.tgz",
-            "integrity": "sha512-+PO02uGF6L6Cs0Bw8RpGhikVvMWEysfAyl27qTlroUB8jSWr1lL0Sf6zi78ZxlSnmgSY2AMMKVgghnN9jTtwkQ==",
+            "version": "0.6.3",
+            "resolved": "https://registry.npmjs.org/@mermaid-js/parser/-/parser-0.6.3.tgz",
+            "integrity": "sha512-lnjOhe7zyHjc+If7yT4zoedx2vo4sHaTmtkl1+or8BRTnCtDmcTpAjpzDSfCZrshM5bCoz0GyidzadJAH1xobA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -910,9 +910,9 @@
             }
         },
         "node_modules/@tybys/wasm-util": {
-            "version": "0.10.0",
-            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.0.tgz",
-            "integrity": "sha512-VyyPYFlOMNylG45GoAe0xDoLwWuowvf92F9kySqzYh8vmYm7D2u4iUJKa1tOUpS70Ku13ASrOkS4ScXFsTaCNQ==",
+            "version": "0.10.1",
+            "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz",
+            "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==",
             "license": "MIT",
             "optional": true,
             "dependencies": {
@@ -959,9 +959,9 @@
             }
         },
         "node_modules/@types/d3-array": {
-            "version": "3.2.1",
-            "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-            "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
+            "version": "3.2.2",
+            "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+            "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
             "dev": true,
             "license": "MIT"
         },
@@ -1242,12 +1242,12 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "24.1.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.1.0.tgz",
-            "integrity": "sha512-ut5FthK5moxFKH2T1CUOC6ctR67rQRvvHdFLCD2Ql6KXmMuCrjsSsRI9UsLCm9M18BMwClv4pn327UvB7eeO1w==",
+            "version": "24.8.1",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.8.1.tgz",
+            "integrity": "sha512-alv65KGRadQVfVcG69MuB4IzdYVpRwMG/mq8KWOaoOdyY617P5ivaDiMCGOFDWD2sAn5Q0mR3mRtUOgm99hL9Q==",
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~7.8.0"
+                "undici-types": "~7.14.0"
             }
         },
         "node_modules/@types/readable-stream": {
@@ -1361,9 +1361,9 @@
             }
         },
         "node_modules/agent-base/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -1753,9 +1753,9 @@
             "license": "MIT"
         },
         "node_modules/axios": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-1.11.0.tgz",
-            "integrity": "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA==",
+            "version": "1.12.2",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
+            "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
             "license": "MIT",
             "dependencies": {
                 "follow-redirects": "^1.15.6",
@@ -1831,9 +1831,9 @@
             }
         },
         "node_modules/bl": {
-            "version": "6.1.1",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.1.tgz",
-            "integrity": "sha512-yYc8UIHrd1ZTLgNBIE7JjMzUPZH+dec3q7nWkrSHEbtvkQ3h6WKC63W9K5jthcL5EXFyMuWYq+2pq5WMSIgFHw==",
+            "version": "6.1.4",
+            "resolved": "https://registry.npmjs.org/bl/-/bl-6.1.4.tgz",
+            "integrity": "sha512-ZV/9asSuknOExbM/zPPA8z00lc1ihPKWaStHkkQrxHNeYx+yY+TmF+v80dpv2G0mv3HVXBu7ryoAsxbFFhf4eg==",
             "license": "MIT",
             "dependencies": {
                 "@types/readable-stream": "^4.0.0",
@@ -2874,9 +2874,9 @@
             }
         },
         "node_modules/cytoscape": {
-            "version": "3.33.0",
-            "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.0.tgz",
-            "integrity": "sha512-2d2EwwhaxLWC8ahkH1PpQwCyu6EY3xDRdcEJXrLTb4fOUtVc+YWQalHU67rFS1a6ngj1fgv9dQLtJxP/KAFZEw==",
+            "version": "3.33.1",
+            "resolved": "https://registry.npmjs.org/cytoscape/-/cytoscape-3.33.1.tgz",
+            "integrity": "sha512-iJc4TwyANnOGR1OmWhsS9ayRS3s+XQ185FmuHObThD+5AeJCakAAbWv8KimMTt08xCCLNgneQwFp+JRJOr9qGQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3431,9 +3431,9 @@
             }
         },
         "node_modules/dayjs": {
-            "version": "1.11.13",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-            "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+            "version": "1.11.18",
+            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.18.tgz",
+            "integrity": "sha512-zFBQ7WFRvVRhKcWoUh+ZA1g2HVgUbsZm9sbddh8EC5iv93sui8DVVz1Npvz+r6meo9VKfa8NyLWBsQK1VvIKPA==",
             "dev": true,
             "license": "MIT"
         },
@@ -3819,9 +3819,9 @@
             }
         },
         "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==",
+            "version": "1.3.4",
+            "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+            "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4154,9 +4154,9 @@
             }
         },
         "node_modules/fast-uri": {
-            "version": "3.0.6",
-            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-            "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz",
+            "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==",
             "funding": [
                 {
                     "type": "github",
@@ -5638,9 +5638,9 @@
             }
         },
         "node_modules/https-proxy-agent/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -5827,14 +5827,10 @@
             "license": "MIT"
         },
         "node_modules/ip-address": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-9.0.5.tgz",
-            "integrity": "sha512-zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==",
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+            "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
             "license": "MIT",
-            "dependencies": {
-                "jsbn": "1.1.0",
-                "sprintf-js": "^1.1.3"
-            },
             "engines": {
                 "node": ">= 12"
             }
@@ -6161,9 +6157,9 @@
             }
         },
         "node_modules/istanbul-lib-source-maps/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -6254,12 +6250,6 @@
                 "xmlcreate": "^2.0.4"
             }
         },
-        "node_modules/jsbn": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
-            "integrity": "sha512-4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==",
-            "license": "MIT"
-        },
         "node_modules/jsdoc": {
             "version": "3.6.11",
             "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-3.6.11.tgz",
@@ -6336,9 +6326,9 @@
             }
         },
         "node_modules/jsdoc-api/node_modules/jsdoc": {
-            "version": "4.0.4",
-            "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.4.tgz",
-            "integrity": "sha512-zeFezwyXeG4syyYHbvh1A967IAqq/67yXtXvuL5wnqCkFZe8I0vKfm+EO+YEvLguo6w9CDUbrAXVtJSHh2E8rw==",
+            "version": "4.0.5",
+            "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.5.tgz",
+            "integrity": "sha512-P4C6MWP9yIlMiK8nwoZvxN84vb6MsnXcHuy7XzVOvQoCizWX5JFCBsWIIWKXBltpoRZXddUOVQmCTOZt9yDj9g==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -6413,15 +6403,14 @@
             "dev": true
         },
         "node_modules/jsdoc-parse": {
-            "version": "6.2.4",
-            "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.4.tgz",
-            "integrity": "sha512-MQA+lCe3ioZd0uGbyB3nDCDZcKgKC7m/Ivt0LgKZdUoOlMJxUWJQ3WI6GeyHp9ouznKaCjlp7CU9sw5k46yZTw==",
+            "version": "6.2.5",
+            "resolved": "https://registry.npmjs.org/jsdoc-parse/-/jsdoc-parse-6.2.5.tgz",
+            "integrity": "sha512-8JaSNjPLr2IuEY4Das1KM6Z4oLHZYUnjRrr27hKSa78Cj0i5Lur3DzNnCkz+DfrKBDoljGMoWOiBVQbtUZJBPw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "array-back": "^6.2.2",
                 "find-replace": "^5.0.1",
-                "lodash.omit": "^4.5.0",
                 "sort-array": "^5.0.0"
             },
             "engines": {
@@ -6663,9 +6652,9 @@
             }
         },
         "node_modules/jsonfile": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-            "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+            "version": "6.2.0",
+            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+            "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
             "license": "MIT",
             "dependencies": {
                 "universalify": "^2.0.0"
@@ -6682,9 +6671,9 @@
             "license": "MIT"
         },
         "node_modules/katex": {
-            "version": "0.16.22",
-            "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.22.tgz",
-            "integrity": "sha512-XCHRdUw4lf3SKBaJe4EvgqIuWwkPSo9XoeO8GjQW94Bp7TWv9hNhzZjZ+OH9yf1UmLygb7DIT5GSFQiyt16zYg==",
+            "version": "0.16.25",
+            "resolved": "https://registry.npmjs.org/katex/-/katex-0.16.25.tgz",
+            "integrity": "sha512-woHRUZ/iF23GBP1dkDQMh1QBad9dmr8/PAwNA54VrSOVYgI12MAcE14TqnDdQOdzyEonGzMepYnqBMYdsoAr8Q==",
             "dev": true,
             "funding": [
                 "https://opencollective.com/katex",
@@ -6931,15 +6920,15 @@
             }
         },
         "node_modules/local-pkg": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.1.tgz",
-            "integrity": "sha512-WunYko2W1NcdfAFpuLUoucsgULmgDBRkdxHxWQ7mK0cQqwPiy8E1enjuRBrhLtZkB5iScJ1XIPdhVEFK8aOLSg==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.1.2.tgz",
+            "integrity": "sha512-arhlxbFRmoQHl33a0Zkle/YWlmNwoyt6QNZEIJcqNbdrsix5Lvc4HyyI3EnwxTYlZYc32EbYrQ8SzEZ7dqgg9A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "mlly": "^1.7.4",
-                "pkg-types": "^2.0.1",
-                "quansync": "^0.2.8"
+                "pkg-types": "^2.3.0",
+                "quansync": "^0.2.11"
             },
             "engines": {
                 "node": ">=14"
@@ -7034,14 +7023,6 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/lodash.omit": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz",
-            "integrity": "sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==",
-            "deprecated": "This package is deprecated. Use destructuring assignment syntax instead.",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/lodash.padend": {
             "version": "4.6.1",
             "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz",
@@ -7251,9 +7232,9 @@
             }
         },
         "node_modules/memorystore/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -7342,9 +7323,9 @@
             }
         },
         "node_modules/mermaid/node_modules/marked": {
-            "version": "16.1.1",
-            "resolved": "https://registry.npmjs.org/marked/-/marked-16.1.1.tgz",
-            "integrity": "sha512-ij/2lXfCRT71L6u0M29tJPhP0bM5shLL3u5BePhFwPELj2blMJ6GDtD7PfJhRLhJ/c2UwrK17ySVcDzy2YHjHQ==",
+            "version": "16.4.1",
+            "resolved": "https://registry.npmjs.org/marked/-/marked-16.4.1.tgz",
+            "integrity": "sha512-ntROs7RaN3EvWfy3EZi14H4YxmT6A5YvywfhO+0pm+cH/dnSQRmdAmoFIc3B9aiwTehyk7pESH4ofyBY+V5hZg==",
             "dev": true,
             "license": "MIT",
             "bin": {
@@ -7474,9 +7455,9 @@
             }
         },
         "node_modules/minizlib": {
-            "version": "3.0.2",
-            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
-            "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz",
+            "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==",
             "license": "MIT",
             "dependencies": {
                 "minipass": "^7.1.2"
@@ -7506,16 +7487,16 @@
             "license": "MIT"
         },
         "node_modules/mlly": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz",
-            "integrity": "sha512-qmdSIPC4bDJXgZTCR7XosJiNKySV7O215tsPtDN9iEO/7q/76b/ijtgRu/+epFXSJhijtTCCGp3DWS549P3xKw==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz",
+            "integrity": "sha512-l8D9ODSRWLe2KHJSifWGwBqpTZXIXTeo8mlKjY+E2HAakaTeNpqAyBZ8GSqLzHgw4XmHmC8whvpjJNMbFZN7/g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "acorn": "^8.14.0",
-                "pathe": "^2.0.1",
-                "pkg-types": "^1.3.0",
-                "ufo": "^1.5.4"
+                "acorn": "^8.15.0",
+                "pathe": "^2.0.3",
+                "pkg-types": "^1.3.1",
+                "ufo": "^1.6.1"
             }
         },
         "node_modules/mlly/node_modules/confbox": {
@@ -7766,9 +7747,9 @@
             }
         },
         "node_modules/mqtt-packet/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -7789,9 +7770,9 @@
             "license": "MIT"
         },
         "node_modules/mqtt/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -8017,13 +7998,13 @@
             }
         },
         "node_modules/node-red-admin": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.1.1.tgz",
-            "integrity": "sha512-49VOt0z1YwLwUtauxyoSY5hR3gzXWisdAa1b0JqIwXb2ZJnQh5k/cM4oSVg7yPKi07HcmntwmLVWfZGJdjIR8A==",
+            "version": "4.1.2",
+            "resolved": "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.1.2.tgz",
+            "integrity": "sha512-Yqe3dREfZZmc/BqT3Ntg0DEXivbP3HBNYCbjDkUaakkIIrapNR8TK1vj3RgkSW6FMtpfcVXBcLGI4cA0I1zbOw==",
             "license": "Apache-2.0",
             "dependencies": {
                 "ansi-colors": "^4.1.3",
-                "axios": "1.11.0",
+                "axios": "1.12.2",
                 "bcryptjs": "3.0.2",
                 "cli-table": "^0.3.11",
                 "enquirer": "^2.3.6",
@@ -8071,9 +8052,9 @@
             }
         },
         "node_modules/node-red-node-test-helper/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8200,9 +8181,9 @@
             }
         },
         "node_modules/nodemon/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8309,9 +8290,9 @@
             }
         },
         "node_modules/normalize-url": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.0.2.tgz",
-            "integrity": "sha512-Ee/R3SyN4BuynXcnTaekmaVdbDAEiNrHqjQIA37mHU8G9pf7aaAD4ZX3XjBLo6rsdcxA/gtkcNYZLt30ACgynw==",
+            "version": "8.1.0",
+            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-8.1.0.tgz",
+            "integrity": "sha512-X06Mfd/5aKsRHc0O0J5CUedwnPmnDtLF2+nq+KN9KSDlJHkPuh0JUviWjEWMe0SW/9TDdSLVPuk7L5gGTIA1/w==",
             "license": "MIT",
             "engines": {
                 "node": ">=14.16"
@@ -8343,9 +8324,9 @@
             }
         },
         "node_modules/number-allocator/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -8915,9 +8896,9 @@
             }
         },
         "node_modules/package-manager-detector": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.3.0.tgz",
-            "integrity": "sha512-ZsEbbZORsyHuO00lY1kV3/t72yp6Ysay6Pd17ZAlNGuGwmWDLCJxFpRs0IzfXfj1o4icJOkUEioexFHzyPurSQ==",
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/package-manager-detector/-/package-manager-detector-1.5.0.tgz",
+            "integrity": "sha512-uBj69dVlYe/+wxj8JOpr97XfsxH/eumMt6HqjNTmJDf/6NO9s+0uxeOneIz3AsPt2m6y9PqzDzd3ATcU17MNfw==",
             "dev": true,
             "license": "MIT"
         },
@@ -9293,9 +9274,9 @@
             }
         },
         "node_modules/pkg-types": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
-            "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
+            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9385,9 +9366,9 @@
             "license": "MIT"
         },
         "node_modules/proxy/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -9471,9 +9452,9 @@
             }
         },
         "node_modules/quansync": {
-            "version": "0.2.10",
-            "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.10.tgz",
-            "integrity": "sha512-t41VRkMYbkHyCYmOvx/6URnN80H7k4X0lLdBMGsz+maAwrJQYB1djpV6vHrQIBE0WBSGqhtEHrK9U3DWWH8v7A==",
+            "version": "0.2.11",
+            "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
+            "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
             "dev": true,
             "funding": [
                 {
@@ -10471,12 +10452,12 @@
             }
         },
         "node_modules/socks": {
-            "version": "2.8.6",
-            "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.6.tgz",
-            "integrity": "sha512-pe4Y2yzru68lXCb38aAqRf5gvN8YdjP1lok5o0J7BOHljkyCGKVz7H3vpVIXKD27rj2giOJ7DwVyk/GWrPHDWA==",
+            "version": "2.8.7",
+            "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+            "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
             "license": "MIT",
             "dependencies": {
-                "ip-address": "^9.0.5",
+                "ip-address": "^10.0.1",
                 "smart-buffer": "^4.2.0"
             },
             "engines": {
@@ -10607,9 +10588,9 @@
             }
         },
         "node_modules/spdx-license-ids": {
-            "version": "3.0.21",
-            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.21.tgz",
-            "integrity": "sha512-Bvg/8F5XephndSK3JffaRqdT+gyhfqIPwDHpX80tJrF8QQRYMo8sNMeaZ2Dp5+jhwKnUmIOyFFQfHRkjJm5nXg==",
+            "version": "3.0.22",
+            "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+            "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
             "dev": true,
             "license": "CC0-1.0"
         },
@@ -10626,6 +10607,7 @@
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
             "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==",
+            "dev": true,
             "license": "BSD-3-Clause"
         },
         "node_modules/statuses": {
@@ -10826,9 +10808,9 @@
             }
         },
         "node_modules/superagent/node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "version": "4.4.3",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz",
+            "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -11373,9 +11355,9 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.8.0.tgz",
-            "integrity": "sha512-9UJ2xGDvQ43tYyVMpuHlsgApydB8ZKfVYTsLDhXkFL/6gfkp+U8xTGdh8pMJv1SpZna0zxG1DwsKZsreLbXBxw==",
+            "version": "7.14.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.14.0.tgz",
+            "integrity": "sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==",
             "license": "MIT"
         },
         "node_modules/universalify": {
diff --git a/pkgs/by-name/no/node-red/package.nix b/pkgs/by-name/no/node-red/package.nix
index 741322f96a1d..ccad687797ed 100644
--- a/pkgs/by-name/no/node-red/package.nix
+++ b/pkgs/by-name/no/node-red/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "node-red";
-  version = "4.1.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "node-red";
     repo = "node-red";
     tag = version;
-    hash = "sha256-MBuWVrN5KNUSNRMZTrDwkQjf3E7BPpnYZL0LKSd6dvU=";
+    hash = "sha256-guyWY5Bk9mP5WBjPAKGq/Hp4BYF1rDYDG0m1rOLnpio=";
   };
 
-  npmDepsHash = "sha256-FV+41HMggMMadRQG/jVnTkp4ycAthp+a4QPrTRhuris=";
+  npmDepsHash = "sha256-GMbUAdAHrDJZIrUzXtDxW8kP0KZK2GTxsHWxoZTaqAQ=";
 
   postPatch =
     let
diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 42d2bcb886b1..ae63b28381c8 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "2.18.0";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     tag = "v${version}";
-    hash = "sha256-xIe7CgGzNNYzhkazjrejvZGfuLL4RqFCfXOUtFEgLCA=";
+    hash = "sha256-3jkHwHEuwq+KmPyDqdRsHtU4HJiBSogifufUiFpsYkI=";
   };
 
   vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";
diff --git a/pkgs/by-name/no/nominatim/nominatim-api.nix b/pkgs/by-name/no/nominatim/nominatim-api.nix
index 6cda6ae63662..57fad6142d1b 100644
--- a/pkgs/by-name/no/nominatim/nominatim-api.nix
+++ b/pkgs/by-name/no/nominatim/nominatim-api.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
 
   hatchling,
+  async-timeout,
   psycopg,
   pyicu,
   python-dotenv,
@@ -13,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "nominatim";
-  version = "5.1.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${version}";
-    hash = "sha256-eMCXXPrUZvM4ju0mi1+f+LXhThCCCEH+HDz6lurw+Jo=";
+    hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA=";
   };
 
   postPatch = ''
@@ -38,6 +39,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    async-timeout
     psycopg
     pyicu
     python-dotenv
diff --git a/pkgs/by-name/no/nominatim/package.nix b/pkgs/by-name/no/nominatim/package.nix
index d6c272e0f2a9..2e7149995db8 100644
--- a/pkgs/by-name/no/nominatim/package.nix
+++ b/pkgs/by-name/no/nominatim/package.nix
@@ -21,14 +21,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "nominatim";
-  version = "5.1.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${version}";
-    hash = "sha256-eMCXXPrUZvM4ju0mi1+f+LXhThCCCEH+HDz6lurw+Jo=";
+    hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index 6986d6f60b9d..8108d270d350 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "nomino";
   };
 }
diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/by-name/no/nootka/package.nix
similarity index 54%
rename from pkgs/applications/audio/nootka/default.nix
rename to pkgs/by-name/no/nootka/package.nix
index 88a5ed0c4301..2df4170944e4 100644
--- a/pkgs/applications/audio/nootka/default.nix
+++ b/pkgs/by-name/no/nootka/package.nix
@@ -9,26 +9,21 @@
   libpulseaudio,
   libvorbis,
   soundtouch,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nootka";
   version = "2.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
-    sha256 = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
+    url = "mirror://sourceforge/nootka/nootka-${finalAttrs.version}-source.tar.bz2";
+    hash = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
@@ -37,11 +32,11 @@ stdenv.mkDerivation rec {
     libpulseaudio
     libvorbis
     soundtouch
-    qtbase
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    qttools
+    qt5.qtbase
+    qt5.qtdeclarative
+    qt5.qtgraphicaleffects
+    qt5.qtquickcontrols2
+    qt5.qttools
   ];
 
   cmakeFlags = [
@@ -50,15 +45,20 @@ stdenv.mkDerivation rec {
     "-DENABLE_PULSEAUDIO=ON"
   ];
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Application for practicing playing musical scores and ear training";
     mainProgram = "nootka";
     homepage = "https://nootka.sourceforge.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       mmlb
       orivej
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix
index 66e5671f83c5..bcfddfda396f 100644
--- a/pkgs/by-name/no/normaliz/package.nix
+++ b/pkgs/by-name/no/normaliz/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "normaliz";
-  version = "3.10.5";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "normaliz";
     repo = "normaliz";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ku5OTtRxrs9qaSE0mle17eJSE2yKZUUsflEZk4k91jM=";
+    hash = "sha256-O8zUhuR+e9yNxj9jC2xK7UZ2aUHoEWjwxn3XxTyP8hQ=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/audio/noson/default.nix b/pkgs/by-name/no/noson/package.nix
similarity index 70%
rename from pkgs/applications/audio/noson/default.nix
rename to pkgs/by-name/no/noson/package.nix
index 5524638023c3..40f0228dfd96 100644
--- a/pkgs/applications/audio/noson/default.nix
+++ b/pkgs/by-name/no/noson/package.nix
@@ -5,11 +5,7 @@
   cmake,
   flac,
   libpulseaudio,
-  qtbase,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qtwayland,
-  wrapQtAppsHook,
+  libsForQt5,
   makeWrapper,
 }:
 
@@ -20,25 +16,25 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "janbar";
     repo = "noson-app";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-XJBkPhyDPeyVrcY5Q5W9LtESuVxcbcQ8JoyOzKg+0NU=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
     makeWrapper
   ];
 
   buildInputs = [
     flac
     libpulseaudio
-    qtbase
-    qtgraphicaleffects
-    qtquickcontrols2
+    libsForQt5.qtbase
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtquickcontrols2
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    libsForQt5.qtwayland
   ];
 
   # wrapQtAppsHook doesn't automatically find noson-gui
@@ -49,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtApp "$out/lib/noson/noson-gui"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "SONOS controller for Linux (and macOS)";
     homepage = "https://janbar.github.io/noson-app/";
     mainProgram = "noson-app";
-    platforms = platforms.linux ++ platforms.darwin;
-    license = [ licenses.gpl3Only ];
-    maintainers = with maintainers; [ callahad ];
+    platforms = with lib.platforms; linux ++ darwin;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ callahad ];
   };
 })
diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix
index e9a430aa226b..f7ab7e942dd7 100644
--- a/pkgs/by-name/no/notcurses/package.nix
+++ b/pkgs/by-name/no/notcurses/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "notcurses";
-  version = "3.0.16";
+  version = "3.0.17";
 
   src = fetchFromGitHub {
     owner = "dankamongmen";
     repo = "notcurses";
     rev = "v${version}";
-    sha256 = "sha256-qAc9jKFpYgI0SdzKHhzmrPkWg4uSXDetD/oNEmHob2o=";
+    sha256 = "sha256-HbyQmuxwfEWlSe/y6w0ZRui0NCFYb0SJh7YA6PC3jdY=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix
index f12ac0631b4b..d81d379e95f9 100644
--- a/pkgs/by-name/no/notes/package.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Based on https://github.com/nuttyartist/notes/pull/758 which doesn't apply cleanly
+    ./qt610-fix.patch
+  ];
+
   cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/no/notes/qt610-fix.patch b/pkgs/by-name/no/notes/qt610-fix.patch
new file mode 100644
index 000000000000..be466fbc41ee
--- /dev/null
+++ b/pkgs/by-name/no/notes/qt610-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4380d39..1051cc5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,11 @@ if(USE_QT_VERSION STREQUAL "")
+     endif()
+   endif()
+ 
++  # https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes
++  if(QT_VERSION VERSION_GREATER_EQUAL 6.10)
++    list(APPEND QT_COMPONENTS CorePrivate GuiPrivate WidgetsPrivate)
++  endif()
++
+   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_COMPONENTS})
+ else()
+   if(NOT USE_QT_VERSION STREQUAL "5" AND NOT USE_QT_VERSION STREQUAL "6")
diff --git a/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix b/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
index ffd2bd18c00e..336d76859782 100644
--- a/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
+++ b/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
@@ -30,7 +30,6 @@ stdenvNoCC.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
-      rileyinman
       jk
     ];
   };
diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix
index bfa4d6b2ab67..5757eef4320c 100644
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@@ -20,13 +20,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "noto-fonts${suffix}";
-  version = "2025.10.01";
+  version = "2025.11.01";
 
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "notofonts.github.io";
     rev = "noto-monthly-release-${version}";
-    hash = "sha256-SIF6G84sUvFSVatmZdF1zQve3pOYtlawJIXYFSW2srI=";
+    hash = "sha256-T7F8SUCbEEuJfgUYWk+/lDGuXn/df2DaGc+3hCuYhS0=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix
index ccc56a7a1cc2..20ceb28d574c 100644
--- a/pkgs/by-name/no/nova/package.nix
+++ b/pkgs/by-name/no/nova/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nova";
-  version = "3.11.8";
+  version = "3.11.9";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "nova";
     rev = "v${version}";
-    hash = "sha256-2iFDTCjBnMf0FglHTZq9v+yyzCqvrT1vhDkpAL6yG6Y=";
+    hash = "sha256-5ZZbuWHvPgdpJstYXbDWo3KQkbzMd+a7ttzCg2bJ67o=";
   };
 
-  vendorHash = "sha256-+cw2NclPLT9S1iakK2S5uc+nFE84MIl6QOH/L0kgoHE=";
+  vendorHash = "sha256-Q8mYIX5lIFtEOQPaUL0zCEzKAHoCiyt1bRaSb2o+vpI=";
 
   ldflags = [
     "-X main.version=${version}"
diff --git a/pkgs/games/npush/default.nix b/pkgs/by-name/np/npush/package.nix
similarity index 79%
rename from pkgs/games/npush/default.nix
rename to pkgs/by-name/np/npush/package.nix
index 137f8d041165..b8ef0bbe4ad9 100644
--- a/pkgs/games/npush/default.nix
+++ b/pkgs/by-name/np/npush/package.nix
@@ -5,12 +5,12 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "npush";
   version = "0.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/npush/${pname}/${version}/${pname}-${version}.tgz";
+    url = "mirror://sourceforge/project/npush/npush/${finalAttrs.version}/npush-${finalAttrs.version}.tgz";
     hash = "sha256-8hbSsyeehzd4T3fUhDyebyI/oTHOHr3a8ArYAquivNk=";
   };
 
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://npush.sourceforge.net/";
     description = "Sokoban-like game";
     mainProgram = "npush";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = with platforms; unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/games/npush/run.nix b/pkgs/by-name/np/npush/run.nix
similarity index 100%
rename from pkgs/games/npush/run.nix
rename to pkgs/by-name/np/npush/run.nix
diff --git a/pkgs/by-name/nr/nrfutil/package.nix b/pkgs/by-name/nr/nrfutil/package.nix
index 926dcd030251..0001d94b374c 100644
--- a/pkgs/by-name/nr/nrfutil/package.nix
+++ b/pkgs/by-name/nr/nrfutil/package.nix
@@ -2,69 +2,148 @@
   lib,
   stdenvNoCC,
   fetchurl,
+
+  xz,
   zlib,
   libusb1,
   segger-jlink-headless,
   gcc,
+
   autoPatchelfHook,
   versionCheckHook,
+  makeWrapper,
+  installShellFiles,
+
+  symlinkJoin,
+  extensions ? [ ],
+  nrfutil,
 }:
 
 let
-  source = import ./source.nix;
-  supported = removeAttrs source [ "version" ];
+  sources = import ./source.nix;
+  platformSources =
+    sources.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}");
 
-  platform = supported.${stdenvNoCC.system} or (throw "unsupported platform ${stdenvNoCC.system}");
-
-in
-stdenvNoCC.mkDerivation (finalAttrs: {
-  pname = "nrfutil";
-  inherit (source) version;
-
-  src = fetchurl {
-    url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/nrfutil/nrfutil-${platform.name}-${finalAttrs.version}.tar.gz";
-    inherit (platform) hash;
-  };
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-  ];
-
-  buildInputs = [
-    zlib
-    libusb1
-    gcc.cc.lib
-    segger-jlink-headless
-  ];
-
-  dontConfigure = true;
-  dontBuild = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    mv data/* $out/
-
-    runHook postInstall
-  '';
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  passthru.updateScript = ./update.sh;
-
-  meta = with lib; {
+  sharedMeta = with lib; {
     description = "CLI tool for managing Nordic Semiconductor devices";
     homepage = "https://www.nordicsemi.com/Products/Development-tools/nRF-Util";
     changelog = "https://docs.nordicsemi.com/bundle/nrfutil/page/guides/revision_history.html";
     license = licenses.unfree;
-    platforms = lib.attrNames supported;
+    platforms = lib.attrNames sources;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with maintainers; [
       h7x4
       ezrizhu
     ];
+  };
+
+  packages =
+    map
+      (
+        name:
+        let
+          package = platformSources.packages.${name};
+        in
+        stdenvNoCC.mkDerivation (finalAttrs: {
+          pname = name;
+          inherit (package) version;
+
+          src = fetchurl {
+            url = "https://files.nordicsemi.com/artifactory/swtools/external/nrfutil/packages/${name}/${name}-${platformSources.triplet}-${package.version}.tar.gz";
+            inherit (package) hash;
+          };
+
+          nativeBuildInputs = [
+            autoPatchelfHook
+          ];
+
+          buildInputs = [
+            xz
+            zlib
+            libusb1
+            gcc.cc.lib
+            segger-jlink-headless
+          ];
+
+          dontConfigure = true;
+          dontBuild = true;
+
+          installPhase = ''
+            runHook preInstall
+
+            mkdir -p $out
+            mv data/* $out/
+
+            runHook postInstall
+          '';
+
+          doInstallCheck = true;
+          nativeInstallCheckInputs = [
+            versionCheckHook
+          ];
+          versionCheckProgramArg = "--version";
+
+          meta = sharedMeta // {
+            mainProgram = name;
+          };
+        })
+      )
+      (
+        [
+          "nrfutil"
+          "nrfutil-completion"
+        ]
+        ++ extensions
+      );
+
+in
+symlinkJoin {
+  pname = "nrfutil";
+  inherit (platformSources.packages.nrfutil) version;
+
+  paths = packages;
+
+  nativeBuildInputs = [
+    makeWrapper
+    installShellFiles
+  ];
+
+  postBuild =
+    let
+      wrapProgramArgs = lib.concatStringsSep " " (
+        [
+          ''--prefix PATH : "$out/bin"''
+          ''--prefix PATH : "$out"/lib/nrfutil-npm''
+          ''--prefix PATH : "$out"/lib/nrfutil-nrf5sdk-tools''
+          ''--set NRF_JLINK_DLL_PATH '${segger-jlink-headless}'/lib/libjlinkarm.so''
+          ''--set NRFUTIL_BLE_SNIFFER_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-shim''
+          ''--set NRFUTIL_BLE_SNIFFER_HCI_SHIM_BIN_ENV "$out"/lib/nrfutil-ble-sniffer/wireshark-hci-shim''
+        ]
+        ++ (
+          let
+            # These are the extensions with the probe-plugin-worker executable vendored.
+            relevantExtensions = lib.intersectLists [ "nrfutil-device" "nrfutil-trace" ] extensions;
+          in
+          lib.optionals (relevantExtensions != [ ]) [
+            ''--set NRF_PROBE_PATH "$out"/lib/${lib.head relevantExtensions}''
+          ]
+        )
+      );
+    in
+    ''
+      wrapProgram "$out"/bin/nrfutil ${wrapProgramArgs}
+
+      installShellCompletion --cmd nrfutil \
+        --bash $(realpath "$out"/share/nrfutil-completion/scripts/bash/setup.bash) \
+        --zsh $(realpath "$out"/share/nrfutil-completion/scripts/zsh/_nrfutil)
+    '';
+
+  passthru = {
+    updateScript = ./update.sh;
+    withExtensions = extensions: nrfutil.override { inherit extensions; };
+  };
+
+  meta = sharedMeta // {
     mainProgram = "nrfutil";
   };
-})
+}
diff --git a/pkgs/by-name/nr/nrfutil/source.nix b/pkgs/by-name/nr/nrfutil/source.nix
index ba5df8b720a5..e5663ff78268 100644
--- a/pkgs/by-name/nr/nrfutil/source.nix
+++ b/pkgs/by-name/nr/nrfutil/source.nix
@@ -1,7 +1,84 @@
 {
-  version = "7.13.0";
+  aarch64-linux = {
+    triplet = "aarch64-unknown-linux-gnu";
+    packages = {
+      nrfutil = {
+        version = "8.1.1";
+        hash = "sha256-y7ywCr9Ze3Uz1JQh0hNg2BOPKW2yEftYDaD8WzHWSxY=";
+      };
+      nrfutil-ble-sniffer = {
+        version = "0.16.2";
+        hash = "sha256-vCpSs9oUcqKPDKVoEtrqqY9Jy0AtbMwK8s398xvQ7Us=";
+      };
+      nrfutil-device = {
+        version = "2.15.1";
+        hash = "sha256-u8JlM7bxkR5x0fhTQRIkElpxot6jpKyL2SljFfoKj54=";
+      };
+      nrfutil-mcu-manager = {
+        version = "0.8.0";
+        hash = "sha256-jLsLN/Ny5zL4MSaKS3cb2L4WBCKZHVLiR2RkPAL8JnY=";
+      };
+      nrfutil-sdk-manager = {
+        version = "1.8.0";
+        hash = "sha256-DsGuOQ6rzwit5oeG4ZLObCOaxMt8WB+YYnuXRYtqq4U=";
+      };
+      nrfutil-trace = {
+        version = "4.0.1";
+        hash = "sha256-IR4P1tK/0P3d96Wnwciq7b3TJurENF2pYKaHu2yZIPk=";
+      };
+    };
+  };
   x86_64-linux = {
-    name = "x86_64-unknown-linux-gnu";
-    hash = "sha256-R3OF/340xEab+0zamfwvejY16fjy/3TrzMvQaBlVxHw=";
+    triplet = "x86_64-unknown-linux-gnu";
+    packages = {
+      nrfutil = {
+        version = "8.1.1";
+        hash = "sha256-asX1UbAE6X03lLC3l9e/9G2WgVRezfmRD6dyXJKb18Y=";
+      };
+      nrfutil-91 = {
+        version = "0.5.0";
+        hash = "sha256-ACQ+csYVIoANKV+CyAAD+drXQSb7CVUdvDYe76LELqs=";
+      };
+      nrfutil-ble-sniffer = {
+        version = "0.16.2";
+        hash = "sha256-4TGbn0HdlER5k76Hc5rCSVvyx89VdLQ56fMiGgWUvrU=";
+      };
+      nrfutil-completion = {
+        version = "1.5.0";
+        hash = "sha256-KA5h9/hJA66nkAAW1Tui+m60E/Iv9wzVPdeQqIQWpxc=";
+      };
+      nrfutil-device = {
+        version = "2.15.1";
+        hash = "sha256-zH/QtM1vM6BIiZHPLM23TRt2LCRUdJvmYN9oveotsH0=";
+      };
+      nrfutil-mcu-manager = {
+        version = "0.8.0";
+        hash = "sha256-ItU3kys1HMd06srLTzPtRoAW1YxwOt39LqjIQPMvmaI=";
+      };
+      nrfutil-npm = {
+        version = "0.3.1";
+        hash = "sha256-kQ63fVWR8RdGTQLA27Sg7jegYhtlkvXvLJsucifH4I0=";
+      };
+      nrfutil-nrf5sdk-tools = {
+        version = "1.1.0";
+        hash = "sha256-hLQhTEa5F2lrFxppKmVrD5PnIA3JPcP/M/r9bYizHk8=";
+      };
+      nrfutil-sdk-manager = {
+        version = "1.8.0";
+        hash = "sha256-+Z1xfEdTAcvYj+hjsW0z/dHRoIzVGWXjD6lSqoQvOPg=";
+      };
+      nrfutil-suit = {
+        version = "0.9.0";
+        hash = "sha256-uwbUgjpJNC27bSINyhfzTrOXIUi7GjFnPebg38apRKc=";
+      };
+      nrfutil-toolchain-manager = {
+        version = "0.15.0";
+        hash = "sha256-/bQx4yu1ybCO2TBd7MctxCANiYO5c1qCDYSjXm7hLcE=";
+      };
+      nrfutil-trace = {
+        version = "4.0.1";
+        hash = "sha256-YmsMQOD1vylaRwMWOhOA9xXePJR779P8im4Lcs7EcWk=";
+      };
+    };
   };
 }
diff --git a/pkgs/by-name/nr/nrfutil/update.sh b/pkgs/by-name/nr/nrfutil/update.sh
index 199983e4aabb..72bb4763a361 100755
--- a/pkgs/by-name/nr/nrfutil/update.sh
+++ b/pkgs/by-name/nr/nrfutil/update.sh
@@ -12,23 +12,60 @@ set -euo pipefail
 declare -A architectures
 declare -A versions
 declare -A hashes
+declare -a packages
 
 architectures["x86_64-linux"]="x86_64-unknown-linux-gnu"
+architectures["aarch64-linux"]="aarch64-unknown-linux-gnu"
+# NOTE: segger-jlink is not yet packaged for darwin
+# architectures["x86_64-darwin"]="x86_64-apple-darwin"
+# architectures["aarch64-darwin"]="aarch64-apple-darwin"
+
+packages=(
+    "nrfutil"
+    "nrfutil-91"
+    "nrfutil-ble-sniffer"
+    "nrfutil-completion"
+    "nrfutil-device"
+    "nrfutil-mcu-manager"
+    "nrfutil-npm"
+    "nrfutil-nrf5sdk-tools"
+    "nrfutil-sdk-manager"
+    "nrfutil-suit"
+    "nrfutil-toolchain-manager"
+    "nrfutil-trace"
+)
+
 
 BASE_URL="https://files.nordicsemi.com/artifactory/swtools/external/nrfutil"
 
-for a in ${!architectures[@]}; do
-    versions["$a"]=$(curl "$BASE_URL/index/${architectures[${a}]}/index.json" | jq -r '.packages.nrfutil.latest_version')
-    hashes["$a"]=$(narhash "$BASE_URL/packages/nrfutil/nrfutil-${architectures[${a}]}-${versions[${a}]}.tar.gz")
+for a in "${!architectures[@]}"; do
+    ARCH="${architectures["${a}"]}"
+    INDEX=$(curl "$BASE_URL/index/${ARCH}/index.json")
+    for p in "${!packages[@]}"; do
+        PKG="${packages["${p}"]}"
+
+        jq -e -r ".packages.\"${PKG}\"" <<< "$INDEX" 1>/dev/null && {
+            versions["$a-$p"]=$(jq -r ".packages.\"${PKG}\".latest_version" <<< "$INDEX")
+            hashes["$a-$p"]=$(narhash "$BASE_URL/packages/${PKG}/${PKG}-${ARCH}-${versions["$a-$p"]}.tar.gz")
+        }
+    done
 done
 
 {
     printf "{\n"
-    printf "  version = \"${versions["x86_64-linux"]}\";\n"
-    for a in ${!architectures[@]}; do
-        printf "  ${a} = {\n"
-        printf "    name = \"${architectures[${a}]}\";\n"
-        printf "    hash = \"${hashes[${a}]}\";\n"
+    for a in "${!architectures[@]}"; do
+        printf "  %s = {\n" "$a"
+        printf "    triplet = \"%s\";\n" "${architectures["${a}"]}"
+        printf "    packages = {\n"
+        for p in "${!packages[@]}"; do
+            test ${versions["$a-$p"]+_} && {
+                printf "      %s = {\n" "${packages["${p}"]}"
+                printf "        version = \"%s\";\n" "${versions["$a-$p"]}"
+                printf "        hash = \"%s\";\n" "${hashes["$a-$p"]}"
+                printf "      };\n"
+            }
+        done
+        printf "    };\n"
         printf "  };\n"
     done
     printf "}\n"
diff --git a/pkgs/by-name/ns/nsplist/package.nix b/pkgs/by-name/ns/nsplist/package.nix
index 64cba193ce31..5b3007d3383c 100644
--- a/pkgs/by-name/ns/nsplist/package.nix
+++ b/pkgs/by-name/ns/nsplist/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation {
     flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l)
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "Parses .plist files";
diff --git a/pkgs/by-name/ns/nspr/package.nix b/pkgs/by-name/ns/nspr/package.nix
index 7e24a62ccf39..94327e147522 100644
--- a/pkgs/by-name/ns/nspr/package.nix
+++ b/pkgs/by-name/ns/nspr/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "nspr";
-  version = "4.37";
+  version = "4.38";
 
   src = fetchurl {
     url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz";
-    hash = "sha256-X5NE7Q4xhVvTj4izPJ2auU9wzlR+8yE+SI0VIPYYQPo=";
+    hash = "sha256-cu5z/8xu9ecGll+FXs9HDsOYbD4YjhKoqABudvazGm8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ns/nsync/package.nix b/pkgs/by-name/ns/nsync/package.nix
index 316775124b44..601376952bd6 100644
--- a/pkgs/by-name/ns/nsync/package.nix
+++ b/pkgs/by-name/ns/nsync/package.nix
@@ -16,6 +16,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-RAwrS8Vz5fZwZRvF4OQfn8Ls11S8OIV2TmJpNrBE4MI=";
   };
 
+  postPatch = ''
+    # CMake 3.0 is deprecated and is no longer supported by CMake > 4
+    # inline of https://github.com/google/nsync/pull/27
+    substituteInPlace CMakeLists.txt \
+     --replace-fail "cmake_minimum_required (VERSION 2.8.12)" \
+       "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   # Needed for case-insensitive filesystems like on macOS
diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index 5d2d50e9ae06..d21624f41393 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -1,9 +1,9 @@
 {
   lib,
   stdenv,
-  python3,
+  python3Packages,
   fetchFromGitHub,
-  fetchpatch,
+  writableTmpDirAsHomeHook,
   withXmpp ? false, # sleekxmpp doesn't support python 3.10, see https://github.com/dschep/ntfy/issues/266
   withMatrix ? true,
   withSlack ? true,
@@ -12,74 +12,29 @@
   withDbus ? stdenv.hostPlatform.isLinux,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      ntfy-webpush = self.callPackage ./webpush.nix { };
-
-      # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0
-      sqlalchemy = super.sqlalchemy_1_4;
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "ntfy";
-  version = "2.7.0";
+  version = "2.7.1";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy";
-    rev = "v${version}";
-    sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
+    tag = "v${version}";
+    hash = "sha256-EIhoZ2tFJQOc5PyRCazwRhldFxQb65y6h+vYPwV7ReE=";
   };
 
-  patches = [
-    # Fix Slack integration no longer working.
-    # From https://github.com/dschep/ntfy/pull/229 - "Swap Slacker for Slack SDK"
-    (fetchpatch {
-      name = "ntfy-Swap-Slacker-for-Slack-SDK.patch";
-      url = "https://github.com/dschep/ntfy/commit/2346e7cfdca84c8f1afc7462a92145c1789deb3e.patch";
-      sha256 = "13k7jbsdx0jx7l5s8whirric76hml5bznkfcxab5xdp88q52kpk7";
-    })
-    # Add compatibility with emoji 2.0
-    # https://github.com/dschep/ntfy/pull/250
-    (fetchpatch {
-      name = "ntfy-Add-compatibility-with-emoji-2.0.patch";
-      url = "https://github.com/dschep/ntfy/commit/4128942bb7a706117e7154a50a73b88f531631fe.patch";
-      sha256 = "sha256-V8dIy/K957CPFQQS1trSI3gZOjOcVNQLgdWY7g17bRw=";
-    })
-    # Change getargspec to getfullargspec for python 3.11 compatibility
-    (fetchpatch {
-      url = "https://github.com/dschep/ntfy/commit/71be9766ea041d2df6ebbce2781f980eea002852.patch";
-      hash = "sha256-6OChaTj4g3gxVDScc/JksBISHuq+5fbNQregchSXYaQ=";
-    })
-    # Fix compatibility with Python 3.11
-    # https://github.com/dschep/ntfy/pull/271
-    (fetchpatch {
-      url = "https://github.com/dschep/ntfy/pull/271/commits/444b60bec7de474d029cac184e82885011dd1474.patch";
-      hash = "sha256-PKTu8cOpws1z6f1T4uIi2iCJAoAwu+X0Pe7XnHYtHuI=";
-    })
-    # Fix compatibility with Python 3.12
-    # https://github.com/dschep/ntfy/pull/271
-    (fetchpatch {
-      url = "https://github.com/dschep/ntfy/pull/271/commits/d49ab9f9dba4966a44b5f0c6911741edabd35f6b.patch";
-      hash = "sha256-qTUWMS8EXWYCK/ZL0Us7iJp62UIKwYT1BqDy59832ig=";
-    })
-  ];
-
   postPatch = ''
     # We disable the Darwin specific things because it relies on pyobjc, which we don't have.
     substituteInPlace setup.py \
       --replace-fail "':sys_platform == \"darwin\"'" "'darwin'"
   '';
 
-  build-system = with python.pkgs; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
   dependencies =
-    with python.pkgs;
+    with python3Packages;
     (
       [
         requests
@@ -108,30 +63,32 @@ python.pkgs.buildPythonApplication rec {
       ]
     );
 
-  nativeCheckInputs = with python.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     mock
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [
+    # AssertionError: {'backends': ['default']} != {}
+    "test_default_config"
+  ]
+  ++ lib.optionals (!withXmpp) [
     "test_xmpp"
   ];
 
-  disabledTestPaths = [
+  disabledTestPaths = lib.optionals (!withXmpp) [
     "tests/test_xmpp.py"
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   pythonImportsCheck = [ "ntfy" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/dschep/ntfy/releases/tag/${src.tag}";
     description = "Utility for sending notifications, on demand and when commands finish";
     homepage = "https://ntfy.readthedocs.io/en/latest/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ kamilchm ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ kamilchm ];
     mainProgram = "ntfy";
   };
 }
diff --git a/pkgs/by-name/nt/ntp/package.nix b/pkgs/by-name/nt/ntp/package.nix
index 3f1fb3134c68..fcf00bce2845 100644
--- a/pkgs/by-name/nt/ntp/package.nix
+++ b/pkgs/by-name/nt/ntp/package.nix
@@ -45,8 +45,6 @@ stdenv.mkDerivation rec {
     libcap
   ];
 
-  hardeningEnable = [ "pie" ];
-
   postInstall = ''
     rm -rf $out/share/doc
   '';
diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index 9d06c8e20d7d..41a510f961a1 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "0fae4807a6216549a5a7973085b3bd4530e86dbc";
-    hash = "sha256-7gQocXY0B7dJjo4R6fPrdPIYU051hrtNp1Y4s1tPUt8=";
+    rev = "449dd3d06598714c2ba0ee3fa3556e24d034c624";
+    hash = "sha256-4ibgz7y1fsBn2aDuptqpdLd4Wdfx2sKGs7wVRJxCWW0=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 2421f3b7a5d9..b5d84c866380 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.3.0";
+  version = "10.3.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${version}";
-    hash = "sha256-WzPH3uyRAseN51gpmezfD0Mcbjh2K2mSkRbo3LFShG4=";
+    hash = "sha256-ZiqTusOcWv3XRQaxOlu8MojQHBbCue7IIyPI078YP04=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/nu/nucleus/package.nix b/pkgs/by-name/nu/nucleus/package.nix
index 96fd47a7c1fe..1de65f7de02d 100644
--- a/pkgs/by-name/nu/nucleus/package.nix
+++ b/pkgs/by-name/nu/nucleus/package.nix
@@ -60,6 +60,6 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Plus;
     mainProgram = "nucleus";
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/nu/nuked-md/package.nix b/pkgs/by-name/nu/nuked-md/package.nix
index 41db685d2755..71af5135a9bd 100644
--- a/pkgs/by-name/nu/nuked-md/package.nix
+++ b/pkgs/by-name/nu/nuked-md/package.nix
@@ -41,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: {
   #   FOUND.
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace 'SDL2 REQUIRED' 'SDL2'
+      --replace 'SDL2 REQUIRED' 'SDL2' \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+    # CMake 3.0 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
   '';
 
   strictDeps = true;
diff --git a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
index 0ad1667395f3..867ee19ee279 100644
--- a/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-circle/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-circle";
-  version = "25.01.31";
+  version = "25.10.14";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-circle";
     rev = version;
-    sha256 = "sha256-+gb4nyVNF6bjYCEiRq/L3wO4ZoUG4lt5l0vxye8inrQ=";
+    sha256 = "sha256-JIFzNNrlEWoQcZbaXPw3JMLVGnNj0oPKPW6COQJdC5A=";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/by-name/nu/numix-icon-theme-square/package.nix b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
index 5b04cac61faf..6d76e49e7541 100644
--- a/pkgs/by-name/nu/numix-icon-theme-square/package.nix
+++ b/pkgs/by-name/nu/numix-icon-theme-square/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme-square";
-  version = "25.01.31";
+  version = "25.10.14";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme-square";
     rev = version;
-    sha256 = "sha256-ivYuY9qcJsMqIpYSVPeu067fYWE6iFGYamU9riQBF4A=";
+    sha256 = "sha256-z43vDGXnAHuoz2TTLJWCC8iy29/8Npm7MOKgw0OzJfM=";
   };
 
   nativeBuildInputs = [ gtk3 ];
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 5ce4c166d4fe..5d60f79812f3 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/nurl";
     changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "nurl";
   };
 }
diff --git a/pkgs/by-name/nv/nvc/package.nix b/pkgs/by-name/nv/nvc/package.nix
index 4a13cbbd4434..ed8e4044598e 100644
--- a/pkgs/by-name/nv/nvc/package.nix
+++ b/pkgs/by-name/nv/nvc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   autoreconfHook,
   check,
   flex,
@@ -17,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.18.0";
+  version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     tag = "r${version}";
-    hash = "sha256-PpSoqDCjvROkfXSuOlGxqa9ChdBItu/PQztdsXvVC60=";
+    hash = "sha256-mf6CMUdpIk8O+soKXpbI94h8RUf1MrbOVDwBIJyKitA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/nv/nvd/package.nix b/pkgs/by-name/nv/nvd/package.nix
index 2cc7afa9f97e..d42e74f36d33 100644
--- a/pkgs/by-name/nv/nvd/package.nix
+++ b/pkgs/by-name/nv/nvd/package.nix
@@ -37,7 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://khumba.net/projects/nvd";
     license = lib.licenses.asl20;
     mainProgram = "nvd";
-    maintainers = with lib.maintainers; [ khumba ];
+    maintainers = with lib.maintainers; [
+      khumba
+      iedame
+    ];
     platforms = lib.platforms.all;
   };
 })
diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index 11bd87d34ed8..72e377fd7f42 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -13,13 +13,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "nvidia-container-toolkit";
-  version = "1.17.8";
+  version = "1.17.9";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-container-toolkit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
+    hash = "sha256-kcE4yDoj+CFbMy0N5v8ImxjZMJ/o5/LaAVVV1M7qGiw=";
 
   };
 
diff --git a/pkgs/by-name/nv/nvidia-mig-parted/package.nix b/pkgs/by-name/nv/nvidia-mig-parted/package.nix
index 0701e1fa2206..d135c3fb44b8 100644
--- a/pkgs/by-name/nv/nvidia-mig-parted/package.nix
+++ b/pkgs/by-name/nv/nvidia-mig-parted/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nvidia-mig-parted";
-  version = "0.12.3";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "mig-parted";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B4vSNG3+qbUqCvEmBz+VUgrnvhNvCR74uvo4uo+bD/Q=";
+    hash = "sha256-oSoPgap/LFjJ1tW3KLlcQ/zdym9A9h5zownktVxdQfY=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
index 914de43f062b..f36d41334af3 100644
--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -7,7 +7,7 @@
 
 let
   bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
-  version = "0.103.1";
+  version = "0.104.1";
 in
 stdenv.mkDerivation {
   pname = "nwjs-ffmpeg-prebuilt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src =
     let
       hashes = {
-        "x64" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
-        "ia32" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
+        "x64" = "sha256-01hdumuWRAi1KdvwBDQJqUSk+NV5gYnn6QWQYj2FDUE=";
+        "ia32" = "sha256-01hdumuWRAi1KdvwBDQJqUSk+NV5gYnn6QWQYj2FDUE=";
       };
     in
     fetchurl {
diff --git a/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
index 2f1886881d44..129d1aba36fa 100644
--- a/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
+++ b/pkgs/by-name/nx/nxpmicro-mfgtools/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   bzip2,
@@ -23,6 +24,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-t5usUGbcdLQlqPpZkNDeGncka9VfkpO7U933Kw/Sm7U=";
   };
 
+  patches = [
+    # build: support cmake 4.0
+    (fetchpatch {
+      url = "https://github.com/nxp-imx/mfgtools/commit/311ee9b3cca0275fbb5eb5228c56edbb518afd67.patch?full_index=1";
+      hash = "sha256-o4cPfXsPxk88zy5lARX8rcmQncsAkZegOxlAIyoFUpQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix
index fc14d4964e83..04bc4baddadc 100644
--- a/pkgs/by-name/nz/nzbget/package.nix
+++ b/pkgs/by-name/nz/nzbget/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nzbget";
-  version = "25.3";
+  version = "25.4";
 
   src = fetchFromGitHub {
     owner = "nzbgetcom";
     repo = "nzbget";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ecTz+axqPOlRe0wi7IRiESn2JjLbalI+sQVKqrvrAoU=";
+    hash = "sha256-BP2kNgEDLVpW4TvUW2dToa3rnvGANZw2alBO75Jd2hs=";
   };
 
   patches = [
diff --git a/pkgs/by-name/oa/oatpp/package.nix b/pkgs/by-name/oa/oatpp/package.nix
index 92c52aa4a992..a0daeafbd9d0 100644
--- a/pkgs/by-name/oa/oatpp/package.nix
+++ b/pkgs/by-name/oa/oatpp/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
   # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://oatpp.io/";
     description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications";
diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 563f9e457e56..ce3535b5a0ed 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.68.0";
+  version = "3.69.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-gkMTfF77yfjx4CxhJ+mpNA1HsDjXMBMwDaI67dJF/8I=";
+    hash = "sha256-mGwe3I8LobdoIQQrWLUDz0ARD8/WVIoNt80TatdtDKo=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix
index 3b2636a2bec1..7aaeaffffb2a 100644
--- a/pkgs/by-name/oc/octoscan/package.nix
+++ b/pkgs/by-name/oc/octoscan/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "octoscan";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "synacktiv";
     repo = "octoscan";
     tag = "v${version}";
-    hash = "sha256-SG6QHpDG9kPfb9jvHwz58U7+HZpFwYzwsDERNRW5R10=";
+    hash = "sha256-BFq4PXW5V8L4NP6wn2t2hG5xBKwxlgS+YC75VDTKKjs=";
   };
 
-  vendorHash = "sha256-Jx4OEVqCTiW/BSygeLtwwqijiACEuPk0BT26JQoL3Ds=";
+  vendorHash = "sha256-+TQDZXqWNBFAPES0qsrpBdl/jQZAfHXBcav2HcS0d7o=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 3341277459ad..72976e469153 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -91,7 +91,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "oculante";
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
     ];
   };
 }
diff --git a/pkgs/by-name/od/odhcp6c/package.nix b/pkgs/by-name/od/odhcp6c/package.nix
index 96326237c4e6..fa6b0f113122 100644
--- a/pkgs/by-name/od/odhcp6c/package.nix
+++ b/pkgs/by-name/od/odhcp6c/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation {
   pname = "odhcp6c";
-  version = "0-unstable-2025-10-03";
+  version = "0-unstable-2025-10-21";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/odhcp6c.git";
-    rev = "96d9e0b6e81330c61c954c6bc73a2302276fcda1";
-    hash = "sha256-EhkzSKf1t4MrGCN5oC1h0QJiY9w8VhMsa/jor4lEvD4=";
+    rev = "77e1ae21e67f81840024ffe5bb7cf69a8fb0d2f0";
+    hash = "sha256-aOW0rOGd4YwnfXjsUj6HHy8zf0FJYFjsKMWJ5yhUl5g=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix
index e31e52fe3db8..d467070f7ec6 100644
--- a/pkgs/by-name/og/ogen/package.nix
+++ b/pkgs/by-name/og/ogen/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ogen";
-  version = "1.14.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "ogen-go";
     repo = "ogen";
     tag = "v${version}";
-    hash = "sha256-w3h65MNXBgsH8PCHfoPqY+XNI6TMbLUAMI4Y3WWLEJM=";
+    hash = "sha256-rZO6jdOzdayXnEEWxNE9gKkt0coi8pNfq+LT8JC8LiQ=";
   };
 
-  vendorHash = "sha256-PQ2ZrigS9jZY1oL3Dsuc2RZwedZLzLKUqhMYfWiZ854=";
+  vendorHash = "sha256-mL3xw0huTyLz33ja59/mJ+R2+KRIFOfKRUPrk5txJtA=";
 
   patches = [ ./modify-version-handling.patch ];
 
diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index 0a867bf501f3..59a81074bce0 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2025-09-27";
+  version = "2025-11-03";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "242e2faa51675494cbfa78a81f3ff47d81039863";
-    sha256 = "sha256-xYwo5/ONf5nRgfVSnEadPUkPDaOsJhk7doqRs4zp39E=";
+    rev = "90a22b61e66dbd83928be7b9739de554a5f1c09d";
+    sha256 = "sha256-ODtuQ/jqo0caw4l/8tUe/1TizAaAA/bSqZhIEjSuVi8=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index a9392b3602a0..41f9058414fc 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oha";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "hatoo";
     repo = "oha";
     tag = "v${version}";
-    hash = "sha256-xzzlW0oYjlvOItSTmMM5wBlPd7JcmLvpJ+Bf0cCh4ao=";
+    hash = "sha256-N52j8WYEVlmHQdr0HZJZZo92OhIz4V0R1SdaWlOD684=";
   };
 
-  cargoHash = "sha256-k3NlPGtWyj8mTvH+FIasiwrf7JjyY2yKJVTHFjPnIEI=";
+  cargoHash = "sha256-M6wJy5X9JRM9tOOGT8b6YIUT0OakXQxjw17iuqaRT5s=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     pkg-config
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/hatoo/oha";
     changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "oha";
   };
 }
diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix
index 03f574bf83c0..10d643676f05 100644
--- a/pkgs/by-name/ok/oklch-color-picker/package.nix
+++ b/pkgs/by-name/ok/oklch-color-picker/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oklch-color-picker";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "eero-lehtinen";
     repo = "oklch-color-picker";
     tag = "${finalAttrs.version}";
-    hash = "sha256-tPYxcZghGR1YZl1bwoDDIBmbTVGuksCpfgLYwG+k4Ws=";
+    hash = "sha256-dbsE1mYt/GhpkWIBS6MejiKKKz1B+h/3wqGKHCp0p2Q=";
   };
 
-  cargoHash = "sha256-tdIkvBYKfcbCYXhDbIwXNNbNb4X32uBwDh3mAyqt/IM=";
+  cargoHash = "sha256-R1nQAm1rw2hkhxeyzgXCTLF+gXdH1tr6DCv/L8b9D+s=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
diff --git a/pkgs/by-name/ok/okms-cli/package.nix b/pkgs/by-name/ok/okms-cli/package.nix
index 9e06126fd3e2..1fe0694acd66 100644
--- a/pkgs/by-name/ok/okms-cli/package.nix
+++ b/pkgs/by-name/ok/okms-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okms-cli";
-  version = "0.3.5";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "okms-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zYhK2ulFVw7XlhoKrN9JoZg8lUFisfKS/Iez+Ll0eME=";
+    hash = "sha256-Wbb4M4tSLjpsm7K/Y0QDPxofeymw0zSRMcwvN+E3bLU=";
   };
 
-  vendorHash = "sha256-LFZ4dsWnODHLFc6k7p+Rd3zR0befCSOZLanwUFIWRl0=";
+  vendorHash = "sha256-6S+8pNYZUp0REQ91gzktYQMziDb3w+/474pPbuxuASc=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ok/oksh/package.nix b/pkgs/by-name/ok/oksh/package.nix
index 780b83c1f43a..fb5eea3d5bcc 100644
--- a/pkgs/by-name/ok/oksh/package.nix
+++ b/pkgs/by-name/ok/oksh/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oksh";
-  version = "7.7";
+  version = "7.8";
 
   src = fetchFromGitHub {
     owner = "ibara";
     repo = "oksh";
     rev = "oksh-${version}";
-    hash = "sha256-Go73MvL9Mi/Rz1KzrKM7KP9UkI9GQFTduMPSUxEbl70=";
+    hash = "sha256-fgTwj1U/bySVkQReE799Z2gZ0/SEek08WSdpHUHCHhk=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 431db2635b18..b03b5ec37c7d 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okteto";
-  version = "3.12.0";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     tag = finalAttrs.version;
-    hash = "sha256-EL1xWrxI7W2iXb0syb/53BgW22kqOSJCHyzBHGdQOm4=";
+    hash = "sha256-B5znl9MV9XAhgesq9jLYn6mLF0/o2eY0RXoA2mjNNwQ=";
   };
 
-  vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8=";
+  vendorHash = "sha256-/gB/7NCzoZhaKUIkPaABGrKNoruHuAwTIcH75SBBAMg=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.
diff --git a/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
new file mode 100644
index 000000000000..3ab25e679764
--- /dev/null
+++ b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
@@ -0,0 +1,21 @@
+diff --git a/ext/KDDockWidgets/CMakeLists.txt b/ext/KDDockWidgets/CMakeLists.txt
+index 608a2491..d0edc399 100644
+--- a/ext/KDDockWidgets/CMakeLists.txt
++++ b/ext/KDDockWidgets/CMakeLists.txt
+@@ -160,8 +160,16 @@
+ include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
+ 
+ set(${PROJECT_NAME}_DEPS "widgets")
++if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
++    set(QT_NO_PRIVATE_MODULE_WARNING ON)
++    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate)
++endif()
+ if(${PROJECT_NAME}_QTQUICK)
+     find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2)
++    if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
++        set(QT_NO_PRIVATE_MODULE_WARNING ON)
++        find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate)
++    endif()
+     add_definitions(-DKDDOCKWIDGETS_QTQUICK)
+     set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
+ else()
diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix
index 1be1af06b3b9..09d1b26ac1df 100644
--- a/pkgs/by-name/ol/olive-editor/package.nix
+++ b/pkgs/by-name/ol/olive-editor/package.nix
@@ -14,12 +14,13 @@
   portaudio,
   imath,
   qt6,
+  fmt_10,
 }:
 
 let
   # https://github.com/olive-editor/olive/issues/2284
   # we patch support for 2.3+, but 2.5 fails
-  openimageio' = openimageio.overrideAttrs (old: rec {
+  openimageio' = (openimageio.override { fmt = fmt_10; }).overrideAttrs (old: rec {
     version = "2.4.15.0";
     src = (
       old.src.override {
@@ -35,7 +36,7 @@ in
 
 stdenv.mkDerivation {
   pname = "olive-editor";
-  version = "unstable-2023-06-12";
+  version = "0.1.2-unstable-2023-06-12";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;
@@ -56,6 +57,11 @@ stdenv.mkDerivation {
       url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch";
       hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag=";
     })
+
+    # Fix build of `kddockwidgets` with qt6-6.10, adapted from:
+    # https://github.com/KDAB/KDDockWidgets/pull/615
+    # https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032
+    ./olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
   ];
 
   # https://github.com/olive-editor/olive/issues/2200
diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 3d37a3f8e8ed..85bd6725b49d 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -86,13 +86,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.7.29";
+    version = "2025.11.06";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-QNwPc+qr26S2hl4deLVx58Xh9hkSfZyrxrdaO1NCTDc=";
+      hash = "sha256-81AcegFKG5TacKAv9kZgbSOKcAx+ZmK3rqrk3ia/res=";
     };
 
     modRoot = "service";
diff --git a/pkgs/by-name/ol/olivetin/update.sh b/pkgs/by-name/ol/olivetin/update.sh
index 88436b64bb58..72c12040457f 100755
--- a/pkgs/by-name/ol/olivetin/update.sh
+++ b/pkgs/by-name/ol/olivetin/update.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-nix-update olivetin --src-only
+nix-update olivetin --src-only --version-regex '^(2\d+\.\d+\.\d+)$'
 update-source-version olivetin --source-key=gen --ignore-same-version
 update-source-version olivetin --source-key=webui.npmDeps --ignore-same-version
 update-source-version olivetin --source-key=goModules --ignore-same-version
diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index 0fc029c214c1..da1c19d15004 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -3,8 +3,7 @@
   buildGoModule,
   fetchFromGitHub,
   buildEnv,
-  linkFarm,
-  makeWrapper,
+  makeBinaryWrapper,
   stdenv,
   addDriverRunpath,
   nix-update-script,
@@ -20,9 +19,11 @@
   autoAddDriverRunpath,
   apple-sdk_15,
 
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
+
   # passthru
   nixosTests,
-  testers,
   ollama,
   ollama-rocm,
   ollama-cuda,
@@ -117,13 +118,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.12.3";
+  version = "0.12.9";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ooDGwTklGJ/wzDlAY3uJiqpZUxT1cCsqVNJKU8BAPbQ=";
+    hash = "sha256-D61jCyOUYXyPgztgEAFHd2oL5IXsO5TnE2AGEHOnows=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";
@@ -148,7 +149,7 @@ goBuild (finalAttrs: {
   ]
   ++ lib.optionals enableCuda [ cudaPackages.cuda_nvcc ]
   ++ lib.optionals (enableRocm || enableCuda) [
-    makeWrapper
+    makeBinaryWrapper
     autoAddDriverRunpath
   ];
 
@@ -214,8 +215,6 @@ goBuild (finalAttrs: {
     '';
 
   ldflags = [
-    "-s"
-    "-w"
     "-X=github.com/ollama/ollama/version.Version=${finalAttrs.version}"
     "-X=github.com/ollama/ollama/server.mode=release"
   ];
@@ -237,13 +236,17 @@ goBuild (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+  versionCheckKeepEnvironment = "HOME";
+  versionCheckProgramArg = "--version";
+
   passthru = {
     tests = {
       inherit ollama;
-      version = testers.testVersion {
-        inherit (finalAttrs) version;
-        package = ollama;
-      };
     }
     // lib.optionalAttrs stdenv.hostPlatform.isLinux {
       inherit ollama-rocm ollama-cuda;
diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix
index b03ec644e4ba..a02f63160e35 100644
--- a/pkgs/by-name/ol/ols/package.nix
+++ b/pkgs/by-name/ol/ols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "ols";
-  version = "0-unstable-2025-09-19";
+  version = "0-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "DanielGavin";
     repo = "ols";
-    rev = "7ff84eb0b24912db1b3f3b0cff323e1728f47b0b";
-    hash = "sha256-aKyVZARXFMBa0kbI4yeqPZIFHmPCKUy1WPr33aIHbQI=";
+    rev = "7d293c322ef85e4b60c943c220f1a6dd45895672";
+    hash = "sha256-6EzXMGn4c4i8bGdc35ennU4uiB3G4EYzRobrJbyiA9Q=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index aba8ec9e5e94..b49bc930d789 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -31,9 +31,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "25.10.08.01";
-  buildId = "5216"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "25431d6ae3f3576790314d419d4f15a9b0752f48";
+  version = "25.11.02.03";
+  buildId = "5271"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "79673980d47003d9756b373001a9f57c267acbfb";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-dt8KBxWNTld7IEp1BSysj8N3Mn/w0M92LTMZzx/bsyI=";
+    hash = "sha256-KMGSAIYNlzWK9jvn7QTmxUQRNjn0VQU5kLVzTc9mzf8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/on/one_gadget/package.nix b/pkgs/by-name/on/one_gadget/package.nix
index d03d231e3744..3432638aa3b4 100644
--- a/pkgs/by-name/on/one_gadget/package.nix
+++ b/pkgs/by-name/on/one_gadget/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  binutils,
+  binutils-unwrapped,
   bundlerApp,
   bundlerUpdateScript,
   makeWrapper,
@@ -14,7 +14,9 @@ bundlerApp {
   nativeBuildInputs = [ makeWrapper ];
 
   postBuild = ''
-    wrapProgram $out/bin/one_gadget --prefix PATH : ${binutils}/bin
+    wrapProgram $out/bin/one_gadget --prefix PATH : ${
+      binutils-unwrapped.override { withAllTargets = true; }
+    }/bin
   '';
 
   passthru.updateScript = bundlerUpdateScript "one_gadget";
diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index 64a0077d23b1..829c58e104e8 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "onedrive";
-  version = "2.5.6";
+  version = "2.5.9";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
     repo = "onedrive";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-AFaz1RkrtsdTZfaWobdcADbzsAhbdCzJPkQX6Pa7hN8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Vrr7KR4yMH+IZ56IUTp9eAhxEtiXx+ppleUd7jSLzxc=";
   };
 
   outputs = [
@@ -68,10 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
       --fish contrib/completions/complete.fish \
       --zsh contrib/completions/complete.zsh
 
-    for s in $out/lib/systemd/user/onedrive.service $out/lib/systemd/system/onedrive@.service; do
-      substituteInPlace $s \
-        --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep"
-    done
+    substituteInPlace $out/lib/systemd/user/onedrive.service $out/lib/systemd/system/onedrive@.service \
+      --replace-fail "/bin/sh -c 'sleep 15'" "${coreutils}/bin/sleep 15"
   '';
 
   passthru = {
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index 550abbecd344..b661d83a551b 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
       kloenk
     ];
     mainProgram = "onefetch";
diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix
index 6cebaf75422c..f820dc7a80ac 100644
--- a/pkgs/by-name/on/onetbb/package.nix
+++ b/pkgs/by-name/on/onetbb/package.nix
@@ -4,13 +4,15 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  hwloc,
   ninja,
+  pkg-config,
   ctestCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "onetbb";
-  version = "2022.2.0";
+  version = "2022.3.0";
 
   outputs = [
     "out"
@@ -21,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "oneapi-src";
     repo = "oneTBB";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ASQPAGm5e4q7imvTVWlmj5ON4fGEao1L5m2C5wF7EhI=";
+    hash = "sha256-HIHF6KHlEI4rgQ9Epe0+DmNe1y95K9iYa4V/wFnJfEU=";
   };
 
   patches = [
@@ -37,24 +39,17 @@ stdenv.mkDerivation (finalAttrs: {
     #
     # <https://github.com/uxlfoundation/oneTBB/pull/1849>
     ./fix-libtbbmalloc-dlopen.patch
-
-    # Only enable fcf-protection on x86 based processors
-    # <https://github.com/uxlfoundation/oneTBB/pull/1768>
-    # <https://github.com/uxlfoundation/oneTBB/pull/1792>
-    (fetchpatch {
-      url = "https://github.com/uxlfoundation/oneTBB/commit/65d46656f56200a7e89168824c4dbe4943421ff9.patch?full_index=1";
-      hash = "sha256-hhHDuvUsWSqs7AJ5smDYUP1yYZmjV2VISBeKHcFAfG4=";
-    })
-    (fetchpatch {
-      url = "https://github.com/uxlfoundation/oneTBB/commit/e57411968661ab1205322ba1c84fc1cd90a306c6.patch";
-      hash = "sha256-PFixW4lYqA5oy4LSwewvxgJbjVKJceRHnp8mgW9zBF0=";
-    })
   ];
 
   nativeBuildInputs = [
     cmake
     ninja
     ctestCheckHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    hwloc
   ];
 
   doCheck = true;
@@ -74,6 +69,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
   '';
 
+  cmakeFlags = [
+    (lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false)
+  ];
+
   env = {
     # Fix build with modern gcc
     # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',
@@ -83,6 +82,11 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_LDFLAGS = lib.optionalString (
       stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
     ) "--undefined-version";
+
+    # Some test fail because hwloc tries to read /sys on non-x86, which doesn't
+    # work in the build sandbox, so provide fake data to satisfy it
+    # See: https://www-lb.open-mpi.org/projects/hwloc/doc/v2.12.2/synthetic.html
+    HWLOC_SYNTHETIC = "node:1 core:1 pu:1";
   };
 
   meta = {
diff --git a/pkgs/by-name/on/onionprobe/package.nix b/pkgs/by-name/on/onionprobe/package.nix
index 9481ac247586..11a71b62bd4f 100644
--- a/pkgs/by-name/on/onionprobe/package.nix
+++ b/pkgs/by-name/on/onionprobe/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "onionprobe";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rjExMm1mkoeRiv+aNuC6Ieo0/X5sbsjuSiAHcnQxjFo=";
+    sha256 = "sha256-RcEsiYKeNEQil0qp1WzGU9HiCi8iXnPuGK65lcpHor4=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index dcbea042fe7d..52610ed7ca2a 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -14,8 +14,10 @@
   howard-hinnant-date,
   libpng,
   nlohmann_json,
+  perl,
   pkg-config,
   python3Packages,
+  removeReferencesTo,
   re2,
   zlib,
   protobuf,
@@ -23,9 +25,11 @@
   darwinMinVersionHook,
   pythonSupport ? true,
   cudaSupport ? config.cudaSupport,
-  ncclSupport ? config.cudaSupport,
+  ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
+  rocmSupport ? config.rocmSupport,
   withFullProtobuf ? false,
   cudaPackages ? { },
+  rocmPackages,
 }@inputs:
 
 let
@@ -41,6 +45,7 @@ let
 
   stdenv = throw "Use effectiveStdenv instead";
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv;
+  inherit (cudaPackages) cuda_nvcc;
 
   cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString;
 
@@ -118,9 +123,13 @@ effectiveStdenv.mkDerivation rec {
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
     cudaPackages.cudnn-frontend
+    removeReferencesTo
   ]
   ++ lib.optionals isCudaJetson [
     cudaPackages.autoAddCudaCompatRunpath
+  ]
+  ++ lib.optionals rocmSupport [
+    perl # for tools/ci_build/hipify-perl
   ];
 
   buildInputs = [
@@ -154,13 +163,24 @@ effectiveStdenv.mkDerivation rec {
       cudnn # cudnn.h
       cuda_cudart
     ]
-    ++ lib.optionals (cudaSupport && ncclSupport) (
-      with cudaPackages;
-      [
-        nccl
-      ]
-    )
+    ++ lib.optionals ncclSupport [ nccl ]
   )
+  ++ lib.optionals rocmSupport [
+    rocmPackages.clr
+    rocmPackages.hipblas
+    rocmPackages.hipcub
+    rocmPackages.hipfft
+    rocmPackages.hiprand
+    rocmPackages.hipsparse
+    rocmPackages.rocblas
+    rocmPackages.rocprim
+    rocmPackages.rocrand
+    rocmPackages.rocthrust
+    rocmPackages.miopen
+    rocmPackages.rccl
+    rocmPackages.rocm-smi
+    rocmPackages.roctracer
+  ]
   ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
     (darwinMinVersionHook "13.3")
   ];
@@ -208,6 +228,7 @@ effectiveStdenv.mkDerivation rec {
     (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
     (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
     (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
+    (lib.cmakeBool "onnxruntime_USE_ROCM" rocmSupport)
     (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
   ]
   ++ lib.optionals pythonSupport [
@@ -218,15 +239,43 @@ effectiveStdenv.mkDerivation rec {
     (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}")
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
     (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1")
+  ]
+  ++ lib.optionals rocmSupport [
+    # Werror combines with rocprim header issues to cause errors (warp size const deprecation)
+    "--compile-no-warning-as-error"
+    (lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" (
+      builtins.concatStringsSep ";" rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets
+    ))
+    (lib.cmakeFeature "onnxruntime_ROCM_HOME" "${rocmPackages.clr}")
+    # Incompatible with packaged version, far too slow to build vendored version
+    (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL" false)
+    (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false)
   ];
 
-  env = lib.optionalAttrs effectiveStdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error";
-  };
+  env =
+    lib.optionalAttrs effectiveStdenv.cc.isClang {
+      NIX_CFLAGS_COMPILE = "-Wno-error";
+    }
+    // lib.optionalAttrs rocmSupport {
+      MIOPEN_PATH = rocmPackages.miopen;
+      # HIP steps fail to find ROCm libs when not in HIPFLAGS, causing
+      # fatal error: 'rocrand/rocrand.h' file not found
+      HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [
+        rocmPackages.hipblas
+        rocmPackages.hipcub
+        rocmPackages.hiprand
+        rocmPackages.hipsparse
+        rocmPackages.rocblas
+        rocmPackages.rocprim
+        rocmPackages.rocrand
+        rocmPackages.rocthrust
+      ];
+    };
 
   doCheck =
     !(
       cudaSupport
+      || rocmSupport
       || builtins.elem effectiveStdenv.buildPlatform.system [
         # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox
         "aarch64-linux"
@@ -236,7 +285,7 @@ effectiveStdenv.mkDerivation rec {
       ]
     );
 
-  requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ];
+  requiredSystemFeatures = lib.optionals (cudaSupport || rocmSupport) [ "big-parallel" ];
 
   hardeningEnable = lib.optionals (effectiveStdenv.hostPlatform.system == "loongarch64-linux") [
     "nostrictaliasing"
@@ -252,6 +301,9 @@ effectiveStdenv.mkDerivation rec {
       "GetRuntimePath() const { return PathString(); }" \
       "GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
   ''
+  + lib.optionalString rocmSupport ''
+    patchShebangs tools/ci_build/hipify-perl
+  ''
   + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
     # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
     rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc
@@ -269,8 +321,14 @@ effectiveStdenv.mkDerivation rec {
       ../include/onnxruntime/core/session/onnxruntime_*.h
   '';
 
+  # See comments in `cudaPackages.nccl`
+  postFixup = lib.optionalString cudaSupport ''
+    remove-references-to -t "${lib.getBin cuda_nvcc}" ''${!outputLib}/lib/libonnxruntime_providers_cuda.so
+  '';
+  disallowedRequisites = lib.optionals cudaSupport [ (lib.getBin cuda_nvcc) ];
+
   passthru = {
-    inherit cudaSupport cudaPackages; # for the python module
+    inherit cudaSupport cudaPackages ncclSupport; # for the python module
     inherit protobuf;
     tests = lib.optionalAttrs pythonSupport {
       python = python3Packages.onnxruntime;
diff --git a/pkgs/by-name/on/onscripter-en/package.nix b/pkgs/by-name/on/onscripter-en/package.nix
deleted file mode 100644
index 57c2703b691e..000000000000
--- a/pkgs/by-name/on/onscripter-en/package.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  SDL,
-  SDL_image,
-  SDL_mixer,
-  SDL_ttf,
-  fetchFromGitHub,
-  freetype,
-  libjpeg,
-  libogg,
-  libpng,
-  libvorbis,
-  pkg-config,
-  smpeg,
-  stdenv,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "onscripter-en";
-  version = "20110930";
-
-  # The website is not available now. Let's use a Museoa backup
-  src = fetchFromGitHub {
-    owner = "museoa";
-    repo = "onscripter-en";
-    rev = finalAttrs.version;
-    hash = "sha256-Lc5ZlH2C4ER02NmQ6icfiqpzVQdVUnOmdywGjjjSYSg=";
-  };
-
-  nativeBuildInputs = [
-    SDL
-    pkg-config
-    smpeg
-  ];
-
-  buildInputs = [
-    SDL
-    SDL_image
-    SDL_mixer
-    SDL_ttf
-    freetype
-    libjpeg
-    libogg
-    libpng
-    libvorbis
-    smpeg
-  ];
-
-  configureFlags = [ "--no-werror" ];
-
-  strictDeps = true;
-
-  preBuild = ''
-    sed -i 's/.dll//g' Makefile
-  '';
-
-  meta = {
-    homepage = "https://github.com/museoa/onscripter-en";
-    description = "Japanese visual novel scripting engine";
-    license = lib.licenses.gpl2Plus;
-    mainProgram = "onscripter-en";
-    maintainers = [ ];
-    platforms = lib.platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
-  };
-})
diff --git a/pkgs/by-name/on/onscripter/add-make-install.patch b/pkgs/by-name/on/onscripter/add-make-install.patch
new file mode 100644
index 000000000000..f383c924059e
--- /dev/null
+++ b/pkgs/by-name/on/onscripter/add-make-install.patch
@@ -0,0 +1,12 @@
+diff --git a/Makefile.onscripter b/Makefile.onscripter
+index 0522dd0..6eede0d 100644
+--- a/Makefile.onscripter
++++ b/Makefile.onscripter
+@@ -130,3 +130,7 @@ FontInfo$(OBJSUFFIX): FontInfo.h Encoding.h
+ DirtyRect$(OBJSUFFIX) : DirtyRect.h
+ AVIWrapper$(OBJSUFFIX): AVIWrapper.h
+ LUAHandler$(OBJSUFFIX): $(ONSCRIPTER_HEADER) LUAHandler.h
++
++.PHONY: install
++install:
++	install -Dm755 -t $(out)/bin $(TARGET)
diff --git a/pkgs/by-name/on/onscripter/fix-darwin-build.patch b/pkgs/by-name/on/onscripter/fix-darwin-build.patch
new file mode 100644
index 000000000000..56f4530463e1
--- /dev/null
+++ b/pkgs/by-name/on/onscripter/fix-darwin-build.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile.MacOSX b/Makefile.MacOSX
+index 878ebf9..03f83c3 100644
+--- a/Makefile.MacOSX
++++ b/Makefile.MacOSX
+@@ -6,12 +6,17 @@
+ 
+ INCS = `sdl-config --cflags` `smpeg-config --cflags`
+ 
+-LIBS = `sdl-config --libs` `smpeg-config --libs` `freetype-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -lm -ljpeg -framework QuickTime -framework CoreFoundation
++LIBS = `sdl-config --libs` `smpeg-config --libs` `freetype-config --libs` -lSDL_ttf -lSDL_image -lSDL_mixer -lbz2 -lm -ljpeg
+ DEFS = -DMACOSX -DUSE_CDROM -DUTF8_CAPTION -DUTF8_FILESYSTEM
+ 
+ EXESUFFIX =
+ OBJSUFFIX = .o
+ 
++# optional: lua
++DEFS += -DUSE_LUA
++LIBS += -llua
++EXT_OBJS += LUAHandler$(OBJSUFFIX)
++
+ .SUFFIXES:
+ .SUFFIXES: $(OBJSUFFIX) .cpp .h
+ 
diff --git a/pkgs/by-name/on/onscripter/fix-linux-build.patch b/pkgs/by-name/on/onscripter/fix-linux-build.patch
new file mode 100644
index 000000000000..5348881c57f7
--- /dev/null
+++ b/pkgs/by-name/on/onscripter/fix-linux-build.patch
@@ -0,0 +1,23 @@
+diff --git a/Makefile.Linux b/Makefile.Linux
+index 2b551bd..efb1f68 100644
+--- a/Makefile.Linux
++++ b/Makefile.Linux
+@@ -41,17 +41,9 @@ LIBS += -logg -lvorbis -lvorbisfile
+ # optional: support CD audio
+ DEFS += -DUSE_CDROM
+ 
+-# optional: avifile
+-DEFS += -DUSE_AVIFILE
+-INCS += `avifile-config --cflags`
+-LIBS += `avifile-config --libs`
+-TARGET += simple_aviplay$(EXESUFFIX)
+-EXT_OBJS += AVIWrapper$(OBJSUFFIX)
+-
+ # optional: lua
+ DEFS += -DUSE_LUA
+-INCS += -I/usr/include/lua5.1
+-LIBS += -llua5.1
++LIBS += -llua
+ EXT_OBJS += LUAHandler$(OBJSUFFIX)
+ 
+ # optional: force screen width for PDA
diff --git a/pkgs/by-name/on/onscripter/package.nix b/pkgs/by-name/on/onscripter/package.nix
new file mode 100644
index 000000000000..fdf5f537ed31
--- /dev/null
+++ b/pkgs/by-name/on/onscripter/package.nix
@@ -0,0 +1,97 @@
+{
+  lib,
+  SDL,
+  SDL_image,
+  SDL_mixer,
+  SDL_ttf,
+  bzip2,
+  fetchFromGitHub,
+  fontconfig,
+  freetype,
+  libjpeg,
+  libogg,
+  libpng,
+  libvorbis,
+  lua5_1,
+  runCommand,
+  smpeg,
+  stdenv,
+}:
+
+let
+  inherit (stdenv.hostPlatform) isDarwin;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "onscripter";
+  version = "20230825";
+
+  src = fetchFromGitHub {
+    owner = "ogapee";
+    repo = "onscripter";
+    rev = finalAttrs.version;
+    hash = "sha256-XaZTtOkV+2dHmcgZ4GbyiMxRBYdwT5eHxx+r05eAmBw=";
+  };
+
+  patches = [
+    # Add "install" target to Makefile
+    ./add-make-install.patch
+    # 1. Remove libavifile dependency, which is old and unmaintained
+    # 2. Replace -llua5.1 with -llua because the former didn't work even with Lua 5.1
+    ./fix-linux-build.patch
+    # 1. Remove direct linker flags for macOS SDKs.
+    # 2. Build with Lua
+    #
+    # ONScripter appears to depend on macOS SDKs only indirectly through SDL, so flags provided by
+    # the sdl-config command should suffice. The existing flags also referenced the deprecated
+    # QuickTime framework, resulting in a build failure.
+    ./fix-darwin-build.patch
+  ];
+
+  nativeBuildInputs = [
+    # Take cross compilation into account
+    (
+      let
+        commands = [
+          "${lib.getDev SDL}/bin/sdl-config"
+          "${lib.getDev smpeg}/bin/smpeg-config"
+        ]
+        ++ lib.optionals isDarwin [
+          "${lib.getDev freetype}/bin/freetype-config"
+        ];
+      in
+      runCommand "onscripter-host-deps" { } ''
+        mkdir -p $out/bin
+        ln -s ${lib.escapeShellArgs commands} $out/bin
+      ''
+    )
+  ];
+
+  buildInputs = [
+    SDL
+    SDL_image
+    SDL_mixer
+    SDL_ttf
+    bzip2
+    libjpeg
+    libogg
+    libpng
+    libvorbis
+    lua5_1
+    smpeg
+  ]
+  ++ (if isDarwin then [ freetype ] else [ fontconfig ]);
+
+  # The build script for BSDs also fall under Makefile.Linux
+  makefile = if isDarwin then "Makefile.MacOSX" else "Makefile.Linux";
+
+  strictDeps = true;
+
+  meta = {
+    homepage = "https://ogapee.github.io/www/onscripter_en.html";
+    description = "Japanese visual novel scripting engine";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "onscripter";
+    maintainers = with lib.maintainers; [ midchildan ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/oo/oonf-olsrd2/package.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix
index 8f64185dd51b..8b5d6815d66e 100644
--- a/pkgs/by-name/oo/oonf-olsrd2/package.nix
+++ b/pkgs/by-name/oo/oonf-olsrd2/package.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Adhoc wireless mesh routing daemon";
     license = licenses.bsd3;
diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 2710fd3f7482..b63bca544378 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -14,16 +14,16 @@ assert
 
 buildGoModule rec {
   pname = "opa-envoy-plugin";
-  version = "1.9.0-envoy";
+  version = "1.10.0-envoy";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa-envoy-plugin";
     tag = "v${version}";
-    hash = "sha256-Arc0aVDcGZqCrrUrAB9yVXSXzdtOlXEFGZ8pJ578oKk=";
+    hash = "sha256-qKLeSpVy/ImeJ2WPLa3uQSHA/6Y4Visb9lgC4PkURkI=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-l/0IaHz1wTNqX/Im8g0fjTqVOtMHSdqSpl0Oo1ByyxA=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/opae/package.nix b/pkgs/by-name/op/opae/package.nix
deleted file mode 100644
index 1606a77b60d8..000000000000
--- a/pkgs/by-name/op/opae/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libuuid,
-  json_c,
-  doxygen,
-  perl,
-  python3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "opae";
-  version = "1.0.0";
-
-  # the tag has a silly name for some reason. drop this in the future if
-  # possible
-  tver = "${version}-5";
-
-  src = fetchFromGitHub {
-    owner = "opae";
-    repo = "opae-sdk";
-    tag = tver;
-    sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8";
-  };
-
-  doCheck = false;
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=format-truncation"
-    "-Wno-error=address-of-packed-member"
-    "-Wno-array-bounds"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    perl
-    python3.pkgs.sphinx
-  ];
-  buildInputs = [
-    libuuid
-    json_c
-    python3
-  ];
-
-  # Set the Epoch to 1980; otherwise the Python wheel/zip code
-  # gets very angry
-  preConfigure = ''
-    find . -type f | while read file; do
-      touch -d @315532800 $file;
-    done
-  '';
-
-  cmakeFlags = [ "-DBUILD_ASE=1" ];
-
-  meta = with lib; {
-    description = "Open Programmable Acceleration Engine SDK";
-    homepage = "https://01.org/opae";
-    license = licenses.bsd3;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ thoughtpolice ];
-    # Needs a major update, not compatible with gcc-11.
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix
index 96d4165bba75..e8014588aa33 100644
--- a/pkgs/by-name/op/opam-publish/package.nix
+++ b/pkgs/by-name/op/opam-publish/package.nix
@@ -19,13 +19,13 @@ in
 
 buildDunePackage rec {
   pname = "opam-publish";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = "opam-publish";
     rev = version;
-    hash = "sha256-HEmeY3k1sHMNhIUD0GmVlUKKRxC+z/tMAqHGQNT48LA=";
+    hash = "sha256-Li7Js8mrxOrRNNuu8z4X+VXbuECfk7Gsgpy4d6R3RwU=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix
index c4a5fdc98f97..eb27d683be48 100644
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "opcr-policy";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "opcr-io";
     repo = "policy";
     rev = "v${version}";
-    sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E=";
+    sha256 = "sha256-T6awF6NXVsglYBBVzGfuIF42imXjqCwxUAI3RPZNmGo=";
   };
-  vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k=";
+  vendorHash = "sha256-0oZpogeKMQW4SS4e2n5qK6nStYwB/nsHleftvrdXWrw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/op/open-webui/package.nix b/pkgs/by-name/op/open-webui/package.nix
index 999a50f820cf..488a99f7d171 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.33";
+  version = "0.6.34";
 
   src = fetchFromGitHub {
     owner = "open-webui";
     repo = "open-webui";
     tag = "v${version}";
-    hash = "sha256-+dxE+rYqVzjuTgV/PYb9fOW0kE4o+uf+h1IB0b1SU1M=";
+    hash = "sha256-crjBVR0ZXUYck4pyLNb1IO9IoQ6MFBnCKEBsi0/JXCI=";
   };
 
   frontend = buildNpmPackage rec {
@@ -32,7 +32,7 @@ let
       url = "https://github.com/pyodide/pyodide/releases/download/${pyodideVersion}/pyodide-${pyodideVersion}.tar.bz2";
     };
 
-    npmDepsHash = "sha256-ztoLi386RTJXTxt8PjRQtrqY4y7clSOc7UbxdtoXFaI=";
+    npmDepsHash = "sha256-ofw/leDcfrc+Bp93s9BkB3WFs8qQgiWUag7gvdPJdlo=";
 
     # See https://github.com/open-webui/open-webui/issues/15880
     npmFlags = [
diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix
index 18303e4e5a0d..5107a1bf0ab6 100644
--- a/pkgs/by-name/op/open62541/package.nix
+++ b/pkgs/by-name/op/open62541/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open62541";
-  version = "1.4.13";
+  version = "1.4.14";
 
   src = fetchFromGitHub {
     owner = "open62541";
     repo = "open62541";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-y4yxdO55fMmkP+nCU6ToabvAPi6hgXHiDXpF3tNEHNw=";
+    hash = "sha256-+gE1wlxAyUVgHnDhkHEu9IwCCIKDuAHUzkThuDgdzdE=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix
index d0d5200d0b37..10f37d24530e 100644
--- a/pkgs/by-name/op/openapi-generator-cli/package.nix
+++ b/pkgs/by-name/op/openapi-generator-cli/package.nix
@@ -9,7 +9,7 @@
 
 let
   jre = jre_headless;
-  version = "7.15.0";
+  version = "7.16.0";
   mainProgram = "openapi-generator-cli";
   this = maven.buildMavenPackage {
     inherit version;
@@ -20,10 +20,10 @@ let
       owner = "OpenAPITools";
       repo = "openapi-generator";
       tag = "v${version}";
-      hash = "sha256-IgjlMOHMASijIt5nMqOZcUpxecbWljHh9rA1YUwUmwM=";
+      hash = "sha256-CoztWf2H2rXcx4d8Av8cBXzMqIZsrSCgx21i3+o2ufo=";
     };
 
-    mvnHash = "sha256-woHPf7vPja70cNj6Glqr0OGAR8CV8qWiRu0hkmCcCrA=";
+    mvnHash = "sha256-5Kzv9h3X5s/1D0Gd1XQRvNGVAyf44QcriJFvS07wdZo=";
     mvnParameters = "-Duser.home=$TMPDIR";
     doCheck = false;
 
diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index 9392b5ad3bf2..b7a23b4a0a88 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openapi-python-client";
-  version = "0.26.2";
+  version = "0.27.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${version}";
-    hash = "sha256-RSz8UCOJBcF4zRYURRqzJahfkX49hBq7/yiTWE3es3M=";
+    hash = "sha256-T8EC9wpkHVps7rNgwLx7VdIt1O7v021gUZHbVY6QT/Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 1c57ce5a4e69..7fafe1f938b9 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.4.1";
+  version = "2.4.3";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HfPkjeScegylpA/i8KlS3t468pmD5sRwp2Ct164fkTo=";
+    hash = "sha256-gutZATBAaMXOZM/fDwU+T1fajFI/OIuKX/Na217r5y4=";
   };
 
-  vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY=";
+  vendorHash = "sha256-YxpWdwaPCk5mX8ZYJVNIG9end6/HkhXeGvgEq14cErY=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix
index 208765ebc128..64bef0d25e2b 100644
--- a/pkgs/by-name/op/opencloud-desktop/package.nix
+++ b/pkgs/by-name/op/opencloud-desktop/package.nix
@@ -3,6 +3,7 @@
   cmake,
   kdePackages,
   fetchFromGitHub,
+  fetchFromGitLab,
   libre-graph-api-cpp-qt-client,
   kdsingleapplication,
   nix-update-script,
@@ -10,6 +11,25 @@
   versionCheckHook,
   stdenv,
 }:
+let
+  # See issue https://github.com/NixOS/nixpkgs/issues/455981
+  # It was spotted upstream that ecm 6.19.0 caused this issue
+  # Therefore we pin ecm 6.18.0 which makes opencloud function correctly
+  ecm618 = kdePackages.extra-cmake-modules.overrideAttrs (
+    finalAttrs: prevAttrs: {
+      version = "6.18.0";
+      src = fetchFromGitLab {
+        domain = "invent.kde.org";
+        owner = "frameworks";
+        repo = "extra-cmake-modules";
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-hpqczRaV32yyXXRWxR30tOBEUNWDkeSzVrv0SHMrz1Y=";
+      };
+      patches = [ ];
+    }
+  );
+
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencloud-desktop";
   version = "2.0.0";
@@ -21,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    kdePackages.extra-cmake-modules
+    ecm618
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qttools
diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index 95ed0bf4adb9..efb29b0847ec 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildGoModule rec {
   pname = "opencloud";
-  version = "3.5.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${version}";
-    hash = "sha256-NPBz9pevjDUqDrEg/S6Vtk+jAA9f2H95ehO8EgcB1eY=";
+    hash = "sha256-EseQbzQ/YRdv4b7cMl+563aQN5IcRMIZZtVqf9C4XCw=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix
index dd47943591d9..8626c6b1cd4c 100644
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@@ -9,19 +9,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencloud-web";
-  version = "4.0.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IMFbDPVn32offVIHHxQvHjauQLGYnFf/s1mAo6OF7Mk=";
+    hash = "sha256-0OrdRqA/8sSZOMISLpZn3VmdlqO/i3u9zPdkOKGsYDY=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-CHImAISDPhjfhB+Qj3fuo6jaOyi+wBVwuLm8ODzRU4M=";
+    hash = "sha256-S5Xxlm6jWpxyg069g0un47EpIDiRSIMeP2qHyxCMWTs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opencode/hashes.json b/pkgs/by-name/op/opencode/hashes.json
new file mode 100644
index 000000000000..77927f0f7894
--- /dev/null
+++ b/pkgs/by-name/op/opencode/hashes.json
@@ -0,0 +1,8 @@
+{
+  "node_modules": {
+    "aarch64-linux": "3yXOsptDRUoyL/FBQu8esD4ipudOA9jyLenNt1WChMU=",
+    "x86_64-linux": "sha256-ocgmxMx+V6uBMLZTrHfYAqO4l38WQVCrQ2AbUWagaoM=",
+    "aarch64-darwin": "sha256-xNU+ucIy84iqmyoWKwwLBIV34TTmH/OGmIbIiNOPM/w=",
+    "x86_64-darwin": "sha256-9kplc7tpWgYnB+4471EBkE2xYF3RkpgKqpg26M6bUPs="
+  }
+}
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 70d2be597ec3..b284368643ee 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -1,59 +1,25 @@
 {
   lib,
-  stdenv,
   stdenvNoCC,
-  buildGoModule,
   bun,
   fetchFromGitHub,
+  fzf,
   makeBinaryWrapper,
   models-dev,
   nix-update-script,
+  ripgrep,
   testers,
   writableTmpDirAsHomeHook,
 }:
 
-let
-  bun-target = {
-    "aarch64-darwin" = "bun-darwin-arm64";
-    "aarch64-linux" = "bun-linux-arm64";
-    "x86_64-darwin" = "bun-darwin-x64";
-    "x86_64-linux" = "bun-linux-x64";
-  };
-in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.15.2";
+  version = "1.0.45";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oH0WVQpq+OOMooV21p2gR/WLDtrf9wdKvOZ5fLtzqPk=";
-  };
-
-  tui = buildGoModule {
-    pname = "opencode-tui";
-    inherit (finalAttrs) version src;
-
-    modRoot = "packages/tui";
-
-    vendorHash = "sha256-g3+2q7yRaM6BgIs5oIXz/u7B84ZMMjnxXpvFpqDePU4=";
-
-    subPackages = [ "cmd/opencode" ];
-
-    env.CGO_ENABLED = 0;
-
-    ldflags = [
-      "-s"
-      "-X=main.Version=${finalAttrs.version}"
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      install -Dm755 $GOPATH/bin/opencode $out/bin/tui
-
-      runHook postInstall
-    '';
+    hash = "sha256-59nsauILNEvQ4Q8ATHKtgTViIWMaFnUyBf7CN6qrtdk=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -77,16 +43,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
       export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
 
-      # NOTE: Disabling post-install scripts with `--ignore-scripts` to avoid
-      # shebang issues
-      # NOTE: `--linker=hoisted` temporarily disables Bun's isolated installs,
-      # which became the default in Bun 1.3.0.
-      # See: https://bun.com/blog/bun-v1.3#isolated-installs-are-now-the-default-for-workspaces
-      # This workaround is required because the 'yargs' dependency is currently
-      # missing when building opencode. Remove this flag once upstream is
-      # compatible with Bun 1.3.0.
+      # NOTE: Without `--linker=hoisted` the necessary platform specific packages are not created, i.e. `@parcel/watcher-<os>-<arch>` and `@opentui/core-<os>-<arch>`
       bun install \
-        --filter=opencode \
+        --filter=./packages/opencode \
         --force \
         --frozen-lockfile \
         --ignore-scripts \
@@ -106,17 +65,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       runHook postInstall
     '';
 
-    # Required else we get errors that our fixed-output derivation references store paths
+    # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash =
-      {
-        x86_64-linux = "sha256-kXsLJ/Ck9epH9md6goCj3IYpWog/pOkfxJDYAxI14Fg=";
-        aarch64-linux = "sha256-DHzDyk7BWYgBNhYDlK3dLZglUN7bMiB3acdoU7djbxU=";
-        x86_64-darwin = "sha256-OTEK9SV9IxBHrJlf+F4lI7gF0Gtvik3c7d1mp+4a3Zk=";
-        aarch64-darwin = "sha256-qlLfus/cyrI0HtwVLTjPTdL7OeIYjmH9yoNKa6YNBkg=";
-      }
-      .${stdenv.hostPlatform.system};
+    outputHash = (lib.importJSON ./hashes.json).node_modules.${stdenvNoCC.hostPlatform.system};
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -128,31 +80,39 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Patch `packages/opencode/src/provider/models-macro.ts` to get contents of
+    # NOTE: Patch `packages/opencode/src/provider/models-macro.ts` to get contents of
     # `_api.json` from the file bundled with `bun build`.
     ./local-models-dev.patch
+    # NOTE: Skip npm pack commands in build.ts since packages are already in node_modules
+    ./skip-npm-pack.patch
   ];
 
   configurePhase = ''
     runHook preConfigure
 
-    cp -R ${finalAttrs.node_modules}/node_modules .
+    cd packages/opencode
+    cp -R ${finalAttrs.node_modules}/. .
+
+    chmod -R u+w ./node_modules
+    # Make symlinks absolute to avoid issues with bun build
+    rm ./node_modules/@opencode-ai/script
+    ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script
+    rm -f ./node_modules/@opencode-ai/sdk
+    ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk
+    rm -f ./node_modules/@opencode-ai/plugin
+    ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin
 
     runHook postConfigure
   '';
 
   env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
+  env.OPENCODE_VERSION = finalAttrs.version;
+  env.OPENCODE_CHANNEL = "stable";
 
   buildPhase = ''
     runHook preBuild
 
-    bun build \
-      --define OPENCODE_TUI_PATH="'${finalAttrs.tui}/bin/tui'" \
-      --define OPENCODE_VERSION="'${finalAttrs.version}'" \
-      --compile \
-      --target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
-      --outfile=opencode \
-      ./packages/opencode/src/index.ts \
+    bun run ./script/build.ts --single
 
     runHook postBuild
   '';
@@ -162,18 +122,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 opencode $out/bin/opencode
+    install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode
 
     runHook postInstall
   '';
 
-  # Execution of commands using bash-tool fail on linux with
-  # Error [ERR_DLOPEN_FAILED]: libstdc++.so.6: cannot open shared object file: No such
-  # file or directory
-  # Thus, we add libstdc++.so.6 manually to LD_LIBRARY_PATH
-  postFixup = ''
+  postInstall = ''
     wrapProgram $out/bin/opencode \
-      --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
+      --prefix PATH : ${
+        lib.makeBinPath [
+          fzf
+          ripgrep
+        ]
+      }
   '';
 
   passthru = {
@@ -184,8 +145,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     };
     updateScript = nix-update-script {
       extraArgs = [
-        "--subpackage"
-        "tui"
         "--subpackage"
         "node_modules"
       ];
@@ -202,10 +161,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     homepage = "https://github.com/sst/opencode";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [
-      zestsystem
-      delafthi
-    ];
     mainProgram = "opencode";
   };
 })
diff --git a/pkgs/by-name/op/opencode/skip-npm-pack.patch b/pkgs/by-name/op/opencode/skip-npm-pack.patch
new file mode 100644
index 000000000000..67825e14e99a
--- /dev/null
+++ b/pkgs/by-name/op/opencode/skip-npm-pack.patch
@@ -0,0 +1,22 @@
+diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts
+index 29706c09..584b00d4 100755
+--- i/packages/opencode/script/build.ts
++++ w/packages/opencode/script/build.ts
+@@ -39,15 +39,9 @@ for (const [os, arch] of targets) {
+   const name = `${pkg.name}-${os}-${arch}`
+   await $`mkdir -p dist/${name}/bin`
+ 
+-  const opentui = `@opentui/core-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}`
+-  await $`mkdir -p ../../node_modules/${opentui}`
+-  await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd(path.join(dir, "../../node_modules"))
+-  await $`tar -xf ../../node_modules/${opentui.replace("@opentui/", "opentui-")}-*.tgz -C ../../node_modules/${opentui} --strip-components=1`
++  // Skip npm pack - packages already installed in node_modules by Nix
+ 
+-  const watcher = `@parcel/watcher-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}${os === "linux" ? "-glibc" : ""}`
+-  await $`mkdir -p ../../node_modules/${watcher}`
+-  await $`npm pack ${watcher}`.cwd(path.join(dir, "../../node_modules")).quiet()
+-  await $`tar -xf ../../node_modules/${watcher.replace("@parcel/", "parcel-")}-*.tgz -C ../../node_modules/${watcher} --strip-components=1`
++  // Skip npm pack - packages already installed in node_modules by Nix
+ 
+   const parserWorker = fs.realpathSync(path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js"))
+   const workerPath = "./src/cli/cmd/tui/worker.ts"
diff --git a/pkgs/by-name/op/opendht/package.nix b/pkgs/by-name/op/opendht/package.nix
index dd9da4bf934f..8bb5f61fd630 100644
--- a/pkgs/by-name/op/opendht/package.nix
+++ b/pkgs/by-name/op/opendht/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opendht";
-  version = "3.4.0";
+  version = "3.5.4";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     tag = "v${version}";
-    hash = "sha256-WNN4aCZiJuz9CgEKIzFmy50HBj0ZL/d1uU7L518lPhk=";
+    hash = "sha256-mnnd6yATIk/TEuFG/M98d+pfeh42IKWBBYjkTP52xeM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openems/package.nix b/pkgs/by-name/op/openems/package.nix
index 22e92e81fa35..d336bf62f538 100644
--- a/pkgs/by-name/op/openems/package.nix
+++ b/pkgs/by-name/op/openems/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   csxcad,
   fparser,
   tinyxml,
@@ -19,17 +20,32 @@
   hyp2mat,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openems";
   version = "0.0.36";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "openEMS";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-wdH+Zw7G2ZigzBMX8p3GKdFVx/AhbTNL+P3w+YjI/dc=";
   };
 
+  patches = [
+    # ref. https://github.com/thliebig/openEMS/pull/183 merged upstream
+    (fetchpatch {
+      name = "update-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/openEMS/commit/0fa7ba3aebc8ee531077973cfa136ead8e887872.patch";
+      hash = "sha256-q/ax7MZHwqSKAjx22uyV13YO/TXZa4bwikoQyItMB7E=";
+    })
+    # ref. https://github.com/thliebig/openEMS/pull/184 merged upstream
+    (fetchpatch {
+      name = "update-nf2ff-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/openEMS/commit/e02e2a8414355482145240e4c2b2464d7a26dd9e.patch";
+      hash = "sha256-y3pvim/8XUKF5k7shj0D+8P6tdfSZ3E/gxTogbRtxdo=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];
@@ -60,11 +76,11 @@ stdenv.mkDerivation rec {
       -o $out/share/openEMS/matlab/h5readatt_octave.oct
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open Source Electromagnetic Field Solver";
     homepage = "https://wiki.openems.de/index.php/Main_Page.html";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index 5b527de47bde..ce1a8ef81be3 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga-cli";
-  version = "0.7.5";
+  version = "0.7.7";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-/6X42OoIAOXKBi3PSqpzNMfHCJy/HNfiU7lCmmiWi8k=";
+    hash = "sha256-066/cQBjs8+smMQDc/AaP0thjxb3p0nOzIaKE58cc6M=";
   };
 
-  vendorHash = "sha256-KZbtIjDHCuMo4mmTKq8nA0Yc/HIFu22CS8ei8afT33Y=";
+  vendorHash = "sha256-5G8bSliEQ302yWPOl245nFFEybOGowineFODcCm9Osw=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 7a986ab99229..2f1ab6fca927 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga";
-  version = "1.10.3";
+  version = "1.10.4";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "openfga";
     rev = "v${version}";
-    hash = "sha256-iP4VzQDScLAiRArVKh9n0AcPXZHPs+xRi4K9S0Z7n48=";
+    hash = "sha256-4Mi+fjOBwzL3iq57iz4SAESNRCm75gKnZCIsOwTQeAc=";
   };
 
-  vendorHash = "sha256-421jf8XSCBteKQ7cr7ln/oBJgWxFsIqY+ccwW2R4/ro=";
+  vendorHash = "sha256-KK/6CNq824PBgAHnPoGza0yvLQ/paa1hznfp5p2GKyY=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix
index a1e1c0759566..125fb493ba54 100644
--- a/pkgs/by-name/op/opengamepadui/package.nix
+++ b/pkgs/by-name/op/opengamepadui/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opengamepadui";
-  version = "0.42.0";
+  version = "0.42.1";
 
   buildType = if withDebug then "debug" else "release";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ShadowBlip";
     repo = "OpenGamepadUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8+ZPvu4Gen7P8uKLrPXNaSqkdrUxz9K/naZxy/WoCik=";
+    hash = "sha256-v+nLluz3Zxvcvx491NxMx+obwfdRJycGLyBAhviRktU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/op/opengv/package.nix b/pkgs/by-name/op/opengv/package.nix
index d1737c0d6579..9364ee8bf187 100644
--- a/pkgs/by-name/op/opengv/package.nix
+++ b/pkgs/by-name/op/opengv/package.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
     eigen
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Collection of computer vision methods for solving geometric vision problems";
     homepage = "https://github.com/laurentkneip/opengv";
diff --git a/pkgs/by-name/op/openhue-cli/package.nix b/pkgs/by-name/op/openhue-cli/package.nix
index 1c0ec32a1fe1..390524892449 100644
--- a/pkgs/by-name/op/openhue-cli/package.nix
+++ b/pkgs/by-name/op/openhue-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openhue-cli";
-  version = "0.20";
+  version = "0.21";
 
   src = fetchFromGitHub {
     owner = "openhue";
     repo = "openhue-cli";
     tag = finalAttrs.version;
-    hash = "sha256-vUmJjuBcOjIhhtWrzq+y0fDlh+wQhgBwxnfuod27CBA=";
+    hash = "sha256-u6ulk+qv1FlZ7PdUiO9UXtRqWWp2MMRAnc8F9vHnRBo=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-DhTe0fSWoAwzoGr8rZMsbSE92jJFr4T7aVx/ULMfVFo=";
+  vendorHash = "sha256-3930OjQ26n7J3XDWjCthfQjORP5wpJ3ZZK/m6/wi2X4=";
 
   env.CGO_ENABLED = 0;
 
diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index ce8842e2bcb1..b5f479de0aa1 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -11,6 +11,7 @@
   libwebp,
   libjxl,
   libheif,
+  libultrahdr,
   opencolorio,
   openexr,
   openjph,
@@ -23,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.1.6.2";
+  version = "3.1.7.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0AfkJXFn+dEPUJF4GJq6Gk5vBJDRPL2Z03dVa5+xKVA=";
+    hash = "sha256-7yZez5oXeAghwhi/AFaPjCuwwIsMrPJzc8k/oR4v19Y=";
   };
 
   outputs = [
@@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libtiff
     libwebp
+    libultrahdr
     opencolorio
     openexr
     openjph
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index 0b15ba7706c6..d5d157ad6a86 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -35,13 +35,11 @@
 
   jdk17_headless,
   jdk21_headless,
-  jdk23_headless,
   jdk25_headless,
   jdk-bootstrap ?
     {
       "17" = jdk17_headless;
       "21" = jdk21_headless;
-      "23" = jdk23_headless;
       "25" = jdk25_headless;
     }
     .${featureVersion},
@@ -57,7 +55,7 @@ let
   atLeast21 = lib.versionAtLeast featureVersion "21";
   atLeast23 = lib.versionAtLeast featureVersion "23";
 
-  gradle_openjfx = if atLeast23 then gradle_8 else gradle_7;
+  gradle_openjfx = if atLeast21 then gradle_8 else gradle_7;
 in
 
 assert lib.assertMsg (lib.pathExists sourceFile)
diff --git a/pkgs/by-name/op/openjpeg/package.nix b/pkgs/by-name/op/openjpeg/package.nix
index 4e6920fa3d40..8d4ca00ca6df 100644
--- a/pkgs/by-name/op/openjpeg/package.nix
+++ b/pkgs/by-name/op/openjpeg/package.nix
@@ -34,36 +34,21 @@ let
   test-data = fetchFromGitHub {
     owner = "uclouvain";
     repo = "openjpeg-data";
-    rev = "a428429db695fccfc6d698bd13b6937dffd9d005";
-    hash = "sha256-udUi7sPNQJ5uCIAM8SqMGee6vRj1QbF9pLjdpNTQE5k=";
+    rev = "39524bd3a601d90ed8e0177559400d23945f96a9";
+    hash = "sha256-ckZHCZV5UJicVUoi/mZDwvCJneXC3X+NA8Byp6GLE0w=";
   };
 in
 stdenv.mkDerivation rec {
   pname = "openjpeg";
-  version = "2.5.2";
+  version = "2.5.4";
 
   src = fetchFromGitHub {
     owner = "uclouvain";
     repo = "openjpeg";
     rev = "v${version}";
-    hash = "sha256-mQ9B3MJY2/bg0yY/7jUJrAXM6ozAHT5fmwES5Q1SGxw=";
+    hash = "sha256-HSXGdpHUbwlYy5a+zKpcLo2d+b507Qf5nsaMghVBlZ8=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/uclouvain/openjpeg/issues/1564
-      name = "CVE-2024-56826_ISSUE1564.patch";
-      url = "https://github.com/uclouvain/openjpeg/commit/e492644fbded4c820ca55b5e50e598d346e850e8.patch";
-      hash = "sha256-v+odu4/MXRA+RKOlPO+m/Xk66BMH6mOcEN4ScHn3VAo=";
-    })
-    (fetchpatch {
-      # https://github.com/uclouvain/openjpeg/issues/1563
-      name = "CVE-2024-56826_ISSUE1563.patch";
-      url = "https://github.com/uclouvain/openjpeg/commit/98592ee6d6904f1b48e8207238779b89a63befa2.patch";
-      hash = "sha256-1ScnEZAPuvclyRME5kbeo7dBMG31Njs5CaYC4sGyx08=";
-    })
-  ];
-
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index f1fa65c403de..c1436871f4b4 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -31,6 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
     sed 1i'#include <libxml/parser.h>' -i include/XMLutils.h
     substituteInPlace src/common/StringUtils.cpp \
         --replace-fail "xmlErrorPtr" "const xmlError*"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeOlxCommon.cmake \
+      --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 2.4)" "cmake_policy(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0005 OLD)" "" \
+      --replace-fail "cmake_policy(SET CMP0003 OLD)" "" \
+      --replace-fail "cmake_policy(SET CMP0011 OLD)" ""
   '';
 
   strictDeps = true;
@@ -73,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://openlierox.net";
     license = lib.licenses.lgpl2Plus;
     mainProgram = "openlierox";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      iedame
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
index d9c6358bdc1d..6f5935c5b491 100644
--- a/pkgs/by-name/op/openlinkhub/package.nix
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "openlinkhub";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "jurkovic-nikola";
     repo = "OpenLinkHub";
     tag = version;
-    hash = "sha256-ouSk+yi5DEeZEUNQsy2UpRi80lxlXnRFyjeP+vd/Yl0=";
+    hash = "sha256-WQKWuzf8iYD0DEivdFmiduwegOwLfYcKPPKxdMmn46E=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix
index a366940e7d5c..e2bb2ee73d16 100644
--- a/pkgs/by-name/op/openlist/frontend.nix
+++ b/pkgs/by-name/op/openlist/frontend.nix
@@ -10,18 +10,18 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openlist-frontend";
-  version = "4.1.4";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList-Frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-crQm74JxVhEDbFQKWJzE6T6qKVMaQbJilI9hoGIxUYU=";
+    hash = "sha256-XvlnsBq3LtOs7uOl505uXjADukgKOl7JYYtJHmbD1lY=";
   };
 
   i18n = fetchzip {
     url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
-    hash = "sha256-4v+hNQl7tSm331CPpqYGMIJXEeOSB0QyQNeQCL5zeFg=";
+    hash = "sha256-oSWkOouUpWWM7d8TilFKHur5rbC+6AM0OUHxG/LZJRg=";
     stripRoot = false;
   };
 
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-8wP57qIUGGccLX4oKkqQmibAoAHwnORhBFp80d+ltA4=";
+    hash = "sha256-1TCgJIBh3KEBTau5EG+oreCrFSZovmQgPpuZ3IcruCc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix
index 0c316517fc24..26b5b328a4a1 100644
--- a/pkgs/by-name/op/openlist/package.nix
+++ b/pkgs/by-name/op/openlist/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openlist";
-  version = "4.1.4";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CNnDPA/zByhR6GOmzxOZRc8F/QqGIxTGSIKXOCwlwwg=";
+    hash = "sha256-6GO8xcTw05OrKpfiRmVD75rbI2OtmXjpf3pWjGg3AdM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
   frontend = callPackage ./frontend.nix { };
 
   proxyVendor = true;
-  vendorHash = "sha256-MHqQ/2FrqxufSa9OG3MWkm401qeIszK9rpgDR0jdCo4=";
+  vendorHash = "sha256-7LbJlattHOMYUKeqwg+E+X3NQO8p4mwqmtpd2I98JAI=";
 
   buildInputs = [ fuse ];
 
diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index e76046dd84cb..f63175e4e7a8 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmm";
-  version = "8.3.1";
+  version = "8.4.0";
 
   src = fetchFromGitHub {
     owner = "openmm";
     repo = "openmm";
     rev = finalAttrs.version;
-    hash = "sha256-3e0+8f2V+UCrPJA1wQUZKPvjpmWU9FfOAt9Ako0Lnl0=";
+    hash = "sha256-vD0daqhEwiM+OMqW//mpc3p6ho/TI2muA6VopXyLYVE=";
   };
 
   # "This test is stochastic and may occasionally fail". It does.
diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 2984c4c035d9..df150d6eb66d 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmpi";
-  version = "5.0.8";
+  version = "5.0.9";
 
   src = fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-UxMeGlfnJw9kVwf4sLZbpWBI9bWsP2j6q+0+sNcQ5Ek=";
+    sha256 = "sha256-37cnYlMRcIR68+Sg8h1317I8829nznzpAzZZJzZ32As=";
   };
 
   postPatch = ''
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
           substituteInPlace configure \
             --replace-fail \
               ompi_cv_op_avx_check_${option}=yes \
-              ompi_cv_op_avx_check_${option}=${if val then "yes" else "no"}
+              ompi_cv_op_avx_check_${option}=${lib.boolToYesNo val}
         ''
       ))
       (lib.concatStringsSep "\n")
@@ -123,8 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
     # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build
     # https://github.com/openucx/ucx
     # https://www.open-mpi.org/faq/?category=buildcuda
-    (lib.withFeatureAs cudaSupport "cuda" (lib.getDev cudaPackages.cuda_cudart))
-    (lib.withFeatureAs cudaSupport "cuda-libdir" "${cudaPackages.cuda_cudart.stubs}/lib")
+    # NOTE: Open MPI requires the header files specifically, which are in the `include` output.
+    (lib.withFeatureAs cudaSupport "cuda" (lib.getOutput "include" cudaPackages.cuda_cudart))
+    (lib.withFeatureAs cudaSupport "cuda-libdir" "${lib.getLib cudaPackages.cuda_cudart}/lib")
     (lib.enableFeature cudaSupport "dlopen")
     (lib.withFeatureAs fabricSupport "psm2" (lib.getDev libpsm2))
     (lib.withFeatureAs fabricSupport "ofi" (lib.getDev libfabric))
diff --git a/pkgs/by-name/op/openmw/package.nix b/pkgs/by-name/op/openmw/package.nix
index 0720f976e1c7..f3f3a15aece9 100644
--- a/pkgs/by-name/op/openmw/package.nix
+++ b/pkgs/by-name/op/openmw/package.nix
@@ -35,7 +35,7 @@ assert lib.assertOneOf "GLPreference" GLPreference [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmw";
-  version = "0.49.0";
+  version = "0.50.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "OpenMW";
     repo = "openmw";
     tag = "openmw-${finalAttrs.version}";
-    hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80=";
+    hash = "sha256-mPwNyKKqPSZJtcIyx3IhLe3iHOpx6p4+l1wJZqyDMqg=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix
index 3b65726b5611..41eb24d79708 100644
--- a/pkgs/by-name/op/openobserve/package.nix
+++ b/pkgs/by-name/op/openobserve/package.nix
@@ -15,12 +15,12 @@
 }:
 
 let
-  version = "0.14.7";
+  version = "0.15.3";
   src = fetchFromGitHub {
     owner = "openobserve";
     repo = "openobserve";
     tag = "v${version}";
-    hash = "sha256-+YcVTn/jcEbaqTycMCYn6B0z2HsvgrCY1gHnkRajwSs=";
+    hash = "sha256-GHyfIVUSX7evP3LaHZClD1RjZ6somYcMNBFdkaZL7lg=";
   };
   web = buildNpmPackage {
     inherit src version;
@@ -28,7 +28,7 @@ let
 
     sourceRoot = "${src.name}/web";
 
-    npmDepsHash = "sha256-1MUmAWkeYUEL6WZGq1Jg5W2uKa2xj0oZbGlIbvZWT1E=";
+    npmDepsHash = "sha256-5bXEC48m3FbtmLwVYYvEdMV3qWA7KNEKVxkMZ94qEpA=";
 
     preBuild = ''
       # Patch vite config to not open the browser to visualize plugin composition
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage {
     cp -r ${web}/share/openobserve-ui web/dist
   '';
 
-  cargoHash = "sha256-vfc6B+Uc8RXQD8vGC1yV9w5YAefkYJMpCH2frqjrSWk=";
+  cargoHash = "sha256-j/bx4qoWcSh2/yJ9evnzSfyUd0tLAk4M310A89k4wy8=";
 
   nativeBuildInputs = [
     pkg-config
@@ -95,10 +95,13 @@ rustPlatform.buildRustPackage {
   checkFlags = [
     "--skip=handler::http::router::tests::test_get_proxy_routes"
     "--skip=tests::e2e_test"
-    # test_export_operator unit test panics when run on the 0.14.7 release
-    # see this issue for more details : https://github.com/NixOS/nixpkgs/issues/447106
-    "--skip=tests::test_export_operator"
-    "--skip=service::organization::tests::test_organization"
+    "--skip=tests::test_setup_logs"
+    "--skip=handler::http::router::middlewares::compress::Compress"
+    # Tests are not threadsafe. Most likely can only run one test at a time,
+    # due to altering shared database state.
+    # This option already in upstream code: https://github.com/openobserve/openobserve/pull/7084
+    # Also see: https://github.com/NixOS/nixpkgs/pull/457421
+    "--test-threads=1"
   ];
 
   passthru.updateScript = gitUpdater {
diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix
index 2b9489a08865..21a0d40c1832 100644
--- a/pkgs/by-name/op/openorienteering-mapper/package.nix
+++ b/pkgs/by-name/op/openorienteering-mapper/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/OpenOrienteering/mapper/commit/d1f214ee2abf140ae3615a2995f08c19ad81418a.patch";
       hash = "sha256-eJZpHdFPW7A69aazI+WRSK9N87d4A6x973hMYTHdw5I=";
     })
+    # https://github.com/OpenOrienteering/mapper/pull/2227
+    (fetchpatch {
+      url = "https://github.com/OpenOrienteering/mapper/commit/fa694d74f2840d7f18976d7f35debcb99bd173eb.patch";
+      hash = "sha256-GVlNeIFiCG7anPsJR2nDCbgXEeUEAUvTcSaJ53Q/eV4=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/op/openrct2/package.nix b/pkgs/by-name/op/openrct2/package.nix
index c25a9e238739..5285de166ca2 100644
--- a/pkgs/by-name/op/openrct2/package.nix
+++ b/pkgs/by-name/op/openrct2/package.nix
@@ -34,14 +34,14 @@
 }:
 
 let
-  openrct2-version = "0.4.26";
+  openrct2-version = "0.4.28";
 
   # Those versions MUST match the pinned versions within the CMakeLists.txt
   # file. The REPLAYS repository from the CMakeLists.txt is not necessary.
   objects-version = "1.7.3";
   openmsx-version = "1.6.1";
   opensfx-version = "1.0.6";
-  title-sequences-version = "0.4.14";
+  title-sequences-version = "0.4.26";
 
   objects = fetchurl {
     url = "https://github.com/OpenRCT2/objects/releases/download/v${objects-version}/objects.zip";
@@ -57,7 +57,7 @@ let
   };
   title-sequences = fetchurl {
     url = "https://github.com/OpenRCT2/title-sequences/releases/download/v${title-sequences-version}/title-sequences.zip";
-    hash = "sha256-FA33FOgG/tQRzEl2Pn8WsPzypIelcAHR5Q/Oj5FIqfM=";
+    hash = "sha256-2ruXh7FXY0L8pN2fZLP4z6BKfmzpwruWEPR7dikFyFg=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "OpenRCT2";
     repo = "OpenRCT2";
     tag = "v${openrct2-version}";
-    hash = "sha256-C6DK1gT/QSgI5ZDyg2FWf9H/BMskS9N2mVMaVb643PE=";
+    hash = "sha256-/sgvlfJ3aMqpv5hJNzmnpOq7Bx0BTtGzLOMKGA543O8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index b5d73abc4b0e..0184ab5753c6 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -44,26 +44,29 @@
   ctestCheckHook,
 }:
 # clang consume much less RAM than GCC
-clangStdenv.mkDerivation rec {
-  pname = "openscad-unstable";
-  version = "2025-06-04";
-  src = fetchFromGitHub {
-    owner = "openscad";
-    repo = "openscad";
-    rev = "65856c9330f8cc4ffcaccf03d91b4217f2eae28d";
-    hash = "sha256-jozcLFGVSfw8G12oSxHjqUyFtAfENgIByID+omk08mU=";
-    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
-  };
-
-  patches = [ ./test.diff ];
-
-  nativeBuildInputs = [
-    (python3.withPackages (
+let
+  python3withPackages = (
+    python3.withPackages (
       ps: with ps; [
         numpy
         pillow
       ]
-    ))
+    )
+  );
+in
+clangStdenv.mkDerivation rec {
+  pname = "openscad-unstable";
+  version = "2021.01-unstable-2025-10-27";
+  src = fetchFromGitHub {
+    owner = "openscad";
+    repo = "openscad";
+    rev = "aa785fe4ab3d52450a5e51eb73585ac9bbcc8798";
+    hash = "sha256-TngfItArYtm8243DdYkQlkfc/MBTZGYrf08hfloWRWk=";
+    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
+  };
+
+  nativeBuildInputs = [
+    python3withPackages
     bison
     cmake
     flex
@@ -127,6 +130,10 @@ clangStdenv.mkDerivation rec {
     # The sources enable this for only apple. We turn it off globally anyway to stay
     # consistent.
     "-DUSE_QT6=OFF"
+
+    # For tests
+    "-DVENV_DIR=${python3withPackages}"
+    "-DVENV_BIN_PATH=${python3withPackages}/bin"
   ];
 
   # tests rely on sysprof which is not available on darwin
@@ -140,6 +147,12 @@ clangStdenv.mkDerivation rec {
       done )
   '';
 
+  postPatch = ''
+    # Take Python3 executable as passed
+    sed -e '/set(VENV_DIR /d' -i tests/cmake/ImageCompare.cmake
+    sed -e '/find_path(VENV_BIN_PATH /d' -i tests/cmake/ImageCompare.cmake
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
     mv $out/bin/*.app $out/Applications
diff --git a/pkgs/by-name/op/openscad-unstable/test.diff b/pkgs/by-name/op/openscad-unstable/test.diff
deleted file mode 100644
index 23b3983daddd..000000000000
--- a/pkgs/by-name/op/openscad-unstable/test.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 5c1b40af4..917451dee 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -59,13 +59,14 @@ if(USE_IMAGE_COMPARE_PY)
- 
-   # Since msys2 on Windows prefers bin/ over Scripts, we need to look for the actual folder to determine
-   # how to utilize the venv
--  find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE)
--  if(WIN32)
--    set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe")
--  else()
--    set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python")
--  endif()
--  if(EXISTS "${IMAGE_COMPARE_EXE}")
-+  # find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE)
-+  # if(WIN32)
-+  #   set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe")
-+  # else()
-+  #   set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python")
-+  # endif()
-+  set(IMAGE_COMPARE_EXE "python3")
-+  # if(EXISTS "${IMAGE_COMPARE_EXE}")
-     message(STATUS "venv found, testing libraries")
-     execute_process(
-       COMMAND "${IMAGE_COMPARE_EXE}" "${CCSD}/image_compare.py" "--status"
-@@ -77,10 +78,10 @@ if(USE_IMAGE_COMPARE_PY)
-       message(STATUS "venv libraries complete")
-       set(BUILD_VENV FALSE)
-     endif()
--  else()
--    message(STATUS "venv not found")
--    set(BUILD_VENV TRUE)
--  endif()
-+  # else()
-+  #   message(STATUS "venv not found")
-+  #   set(BUILD_VENV TRUE)
-+  # endif()
-   if(BUILD_VENV)
-     message(STATUS "Setting up testing venv for image comparison")
-     execute_process(
-
diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index a4256d035061..e914d3043f83 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -84,6 +84,15 @@ stdenv.mkDerivation rec {
         sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\)  /\1\t/' "$out"
       '';
     })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ref. https://github.com/openscad/openscad/pull/4013 merged upstream
+    (fetchpatch {
+      name = "mem_fun-to-mem_fn.patch";
+      url = "https://github.com/openscad/openscad/commit/c9a1abbedfbf6dda9a23d3ad5844d11e5278a928.patch";
+      hash = "sha256-Man9ledRREb7U+2UOQ0VkpiwbYQjyVOY21YaRFObZc8=";
+    })
+
   ];
 
   postPatch = ''
@@ -92,6 +101,11 @@ stdenv.mkDerivation rec {
 
     substituteInPlace src/openscad.cc \
       --replace-fail 'boost::join' 'boost::algorithm::join'
+  ''
+  # ref. https://github.com/openscad/openscad/pull/4253 merged upstream but does not apply
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/FreetypeRenderer.h \
+      --replace-fail ": public std::unary_function<const GlyphData *, void>" ""
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/op/opensmt/package.nix b/pkgs/by-name/op/opensmt/package.nix
index ab9b532d06ac..bbe5d46f37c8 100644
--- a/pkgs/by-name/op/opensmt/package.nix
+++ b/pkgs/by-name/op/opensmt/package.nix
@@ -10,46 +10,49 @@
   enableReadline ? false,
   readline,
   gtest,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opensmt";
-  version = "2.7.0";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "usi-verification-and-security";
     repo = "opensmt";
-    rev = "v${version}";
-    sha256 = "sha256-zhNNnwc41B4sNq50kPub29EYhqV+FoDKRD/CLHnVyZw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xKpYABMn2bsXRg2PMjiMhsx6+FbAsxitLRnmqa1kmu0=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     bison
     flex
   ];
+
   buildInputs = [
     libedit
     gmpxx
+    gtest
   ]
   ++ lib.optional enableReadline readline;
 
   preConfigure = ''
-    substituteInPlace test/CMakeLists.txt \
-      --replace 'FetchContent_Populate' '#FetchContent_Populate'
+    substituteInPlace test/CMakeLists.txt --replace-fail \
+      'FetchContent_MakeAvailable' '#FetchContent_MakeAvailable'
   '';
-  cmakeFlags = [
-    "-Dgoogletest_SOURCE_DIR=${gtest.src}"
-    "-Dgoogletest_BINARY_DIR=./gtest-build"
-  ];
 
-  meta = with lib; {
-    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    broken = with stdenv.hostPlatform; (isLinux && isAarch64);
     description = "Satisfiability modulo theory (SMT) solver";
     mainProgram = "opensmt";
-    maintainers = [ maintainers.raskin ];
-    platforms = platforms.linux;
-    license = if enableReadline then licenses.gpl2Plus else licenses.mit;
+    maintainers = [ lib.maintainers.raskin ];
+    platforms = lib.platforms.linux;
+    license = if enableReadline then lib.licenses.gpl2Plus else lib.licenses.mit;
     homepage = "https://github.com/usi-verification-and-security/opensmt";
   };
-}
+})
diff --git a/pkgs/by-name/op/opensmtpd/package.nix b/pkgs/by-name/op/opensmtpd/package.nix
index 8f7930623b37..3304486a8919 100644
--- a/pkgs/by-name/op/opensmtpd/package.nix
+++ b/pkgs/by-name/op/opensmtpd/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "opensmtpd";
-  version = "7.7.0p0";
+  version = "7.8.0p0";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    hash = "sha256-sJU9oc4sv+S+E5zbGaqTX7+rQs8KmT1CWzejl9xIOWg=";
+    hash = "sha256-QDTeLpLGH6g+7a2x2Ni9/mXlfrUM6WeeAUCVDjTKSrc=";
   };
 
   patches = [
diff --git a/pkgs/by-name/op/opensoldat/package.nix b/pkgs/by-name/op/opensoldat/package.nix
index 76f713be4c9e..c31f93e4354f 100644
--- a/pkgs/by-name/op/opensoldat/package.nix
+++ b/pkgs/by-name/op/opensoldat/package.nix
@@ -2,8 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   fpc,
-  zip,
   makeWrapper,
   SDL2,
   freetype,
@@ -13,30 +13,31 @@
   xorg,
   autoPatchelfHook,
   cmake,
+  python3,
 }:
 
 let
   base = stdenv.mkDerivation rec {
     pname = "opensoldat-base";
-    version = "unstable-2021-09-05";
+    version = "unstable-2025-10-16";
 
     src = fetchFromGitHub {
       name = "base";
       owner = "opensoldat";
       repo = "base";
-      rev = "6c74d768d511663e026e015dde788006c74406b5";
-      sha256 = "175gmkdccy8rnkd95h2zqldqfydyji1hfby8b1qbnl8wz4dh08mz";
+      rev = "5b6e5bef23f5c0d58fb1d4d887b9b94ebcf799b4";
+      sha256 = "sha256-k3P4xSO7DgXn6EzDqlo+RHHTuMDPNvG5y+2iXqguh/M=";
     };
 
-    nativeBuildInputs = [ zip ];
+    nativeBuildInputs = [ python3 ];
 
     buildPhase = ''
-      sh create_smod.sh
+      python create_smod.py
     '';
 
     installPhase = ''
-      install -Dm644 soldat.smod -t $out/share/soldat
-      install -Dm644 client/play-regular.ttf -t $out/share/soldat
+      install -Dm644 soldat.smod -t $out/share/opensoldat
+      install -Dm644 play-regular.ttf -t $out/share/opensoldat
     '';
 
     meta = with lib; {
@@ -51,14 +52,14 @@ in
 
 stdenv.mkDerivation rec {
   pname = "opensoldat";
-  version = "unstable-2022-07-02";
+  version = "unstable-2025-10-21";
 
   src = fetchFromGitHub {
     name = "opensoldat";
     owner = "opensoldat";
     repo = "opensoldat";
-    rev = "9574f5791b7993067f03d2df03d625908bc3762f";
-    sha256 = "0kyxzikd4ngx3nshjw0411x61zqq1b7l01lxw41rlcy4nad3r0vi";
+    rev = "220468f558f6932ba1dc180a9ef84913d07ab324";
+    sha256 = "sha256-BnTLuc/wucFNKh0jnVggpHNvLj/1kqL7i7fF7ORiIZA=";
   };
 
   nativeBuildInputs = [
@@ -84,20 +85,24 @@ stdenv.mkDerivation rec {
   # TODO(@sternenseemann): set proper rpath via cmake, so we don't need autoPatchelfHook
   runtimeDependencies = [ xorg.libX11 ];
 
-  # make sure soldat{,server} find their game archive,
+  # make sure opensoldat{,server} find their game archive,
   # let them write their state and configuration files
   # to $XDG_CONFIG_HOME/soldat/soldat{,server} unless
   # the user specifies otherwise.
-  # TODO(@sternenseemann): rename config dir to opensoldat
+  # Add 'open' prefix to configuration directories
   postInstall = ''
-    for p in $out/bin/soldatserver $out/bin/soldat; do
-      configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$(basename "$p")"
+    for p in soldatserver soldat; do
+      configDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/opensoldat/open$p"
+      oldConfigDir="\''${XDG_CONFIG_HOME:-\$HOME/.config}/soldat/$p"
 
-      wrapProgram "$p" \
-        --run "mkdir -p \"$configDir\"" \
+      wrapProgram $out/bin/open$p \
+        --run "mkdir -p \"''${XDG_CONFIG_HOME:-\$HOME/.config}/opensoldat\"" \
+        --run "[ -d \"$oldConfigDir\" ] && [ -d \"$configDir\" ] && echo Please migrate \"$oldConfigDir\" to \"$configDir\" manually. && exit 1" \
+        --run "[ -d \"$oldConfigDir\" ] && [ ! -d \"$configDir\" ] && mv \"$oldConfigDir\" \"$configDir\"" \
+        --run "mkdir -p \"$configDir\"; rmdir \"$oldConfigDir\" 2>/dev/null || true" \
         --add-flags "-fs_portable 0" \
         --add-flags "-fs_userpath \"$configDir\"" \
-        --add-flags "-fs_basepath \"${base}/share/soldat\""
+        --add-flags "-fs_basepath \"${base}/share/opensoldat\""
     done
   '';
 
diff --git a/pkgs/by-name/op/openspades/package.nix b/pkgs/by-name/op/openspades/package.nix
index 13e55f7d5a91..0fe5f3581a45 100644
--- a/pkgs/by-name/op/openspades/package.nix
+++ b/pkgs/by-name/op/openspades/package.nix
@@ -81,6 +81,12 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh
     patchShebangs Resources
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0054 OLD)" ""
+    substituteInPlace Sources/AngelScript/projects/{cmake,cmake_addons}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   postInstall = ''
diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix
index e680073a1203..be2db56c5724 100644
--- a/pkgs/by-name/op/openstack-rs/package.nix
+++ b/pkgs/by-name/op/openstack-rs/package.nix
@@ -9,15 +9,15 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openstack-rs";
-  version = "0.13.1";
+  version = "0.13.2";
   src = fetchFromGitHub {
     owner = "gtema";
     repo = "openstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wK4CDG0W8cI+64wbK4PMvDy50b0WAktmJo+7Wf1ucjQ=";
+    hash = "sha256-90yuCPUS9yv2UbPOPj+aE8s3qMJXsda41uoMRAVYQ1g=";
   };
 
-  cargoHash = "sha256-q1Q4GBWmdjIpjyN2wH9baxtgwvF6gG0aaqqVDn1ji44=";
+  cargoHash = "sha256-qUCgRCfCuu6bSSlUsY18QQHIOtOwwPyYnA2sCpuf10I=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix
index f488d3dd7e4d..0088113e1d0c 100644
--- a/pkgs/by-name/op/opensurge/package.nix
+++ b/pkgs/by-name/op/opensurge/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     mainProgram = "opensurge";
     description = "Fun 2D retro platformer inspired by Sonic games and a game creation system";
@@ -59,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
   };
 })
diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index 5856d185d9b2..04a3730acb58 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -23,13 +23,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "OpenTabletDriver";
-  version = "0.6.6.0";
+  version = "0.6.6.2";
 
   src = fetchFromGitHub {
     owner = "OpenTabletDriver";
     repo = "OpenTabletDriver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NS/r4FU3dT7UT+R7NryRnU5RfLEN0E6pSqtNDpKMS7U=";
+    hash = "sha256-OeioFdevYPiLl9w7FXVmpbcp1cIMoMYnSLgoBisOOOU=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index e3703d050cca..49e73751bb98 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -96,8 +96,11 @@ stdenv.mkDerivation (finalAttrs: {
     description = "OpenTelemetry C++ Client Library";
     homepage = "https://github.com/open-telemetry/opentelemetry-cpp";
     license = [ lib.licenses.asl20 ];
-    maintainers = with lib.maintainers; [ jfroche ];
-    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
+      jfroche
+      panicgh
+    ];
+    platforms = lib.platforms.all;
     # https://github.com/protocolbuffers/protobuf/issues/14492
     broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
   };
diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 93007668e11d..f2f33b9301ff 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -15,16 +15,16 @@
 let
   package = buildGoModule rec {
     pname = "opentofu";
-    version = "1.10.6";
+    version = "1.10.7";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       tag = "v${version}";
-      hash = "sha256-IEdnESrhDT2rDha7TNgUnGnPioNPnKrUuOXSGRnUOBI=";
+      hash = "sha256-aCNXOEYA+6pKBrGLf/u6RkLw5YbKJHbVPltZko3aGgs=";
     };
 
-    vendorHash = "sha256-ZnQDRiLdg12Dx9RdK1xBWUrAm3QQLGhwH1vxh4ieVv0=";
+    vendorHash = "sha256-rOSl5WE1/WcgCVpcAOXVl8cBSxjrlG7fxzpRO/5i5GA=";
     ldflags = [
       "-s"
       "-w"
diff --git a/pkgs/by-name/op/opentoonz/package.nix b/pkgs/by-name/op/opentoonz/package.nix
deleted file mode 100644
index bf02ff0c8914..000000000000
--- a/pkgs/by-name/op/opentoonz/package.nix
+++ /dev/null
@@ -1,147 +0,0 @@
-{
-  boost,
-  cmake,
-  fetchFromGitHub,
-  libglut,
-  freetype,
-  glew,
-  libsForQt5,
-  libjpeg,
-  libmypaint,
-  libpng,
-  libusb1,
-  lz4,
-  xz,
-  lzo,
-  openblas,
-  opencv,
-  pkg-config,
-  lib,
-  stdenv,
-  superlu,
-  libtiff,
-  zlib,
-}:
-let
-  libtiff-ver = "4.0.3"; # The version in thirdparty/tiff-*
-  opentoonz-ver = "1.7.1";
-
-  src = fetchFromGitHub {
-    owner = "opentoonz";
-    repo = "opentoonz";
-    rev = "v${opentoonz-ver}";
-    hash = "sha256-5iXOvh4QTv+G0fjEHU62u7QCee+jbvKhK0+fQXbdJis=";
-  };
-
-  opentoonz-opencv = opencv.override {
-    inherit libtiff;
-  };
-
-  opentoonz-libtiff = stdenv.mkDerivation {
-    pname = "libtiff";
-    version = "${libtiff-ver}-opentoonz";
-
-    inherit src;
-    outputs = [
-      "bin"
-      "dev"
-      "out"
-      "man"
-      "doc"
-    ];
-
-    nativeBuildInputs = [ pkg-config ];
-    propagatedBuildInputs = [
-      zlib
-      libjpeg
-      xz
-    ];
-
-    postUnpack = ''
-      sourceRoot="$sourceRoot/thirdparty/tiff-${libtiff-ver}"
-    '';
-
-    # opentoonz uses internal libtiff headers
-    postInstall = ''
-      cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include
-    '';
-
-    meta = libtiff.meta // {
-      knownVulnerabilities = [
-        ''
-          Do not open untrusted files with Opentoonz:
-          Opentoonz uses an old custom fork of tibtiff from 2012 that is known to
-          be affected by at least these 50 vulnerabilities:
-            CVE-2012-4564 CVE-2013-4232 CVE-2013-4243 CVE-2013-4244 CVE-2014-8127
-            CVE-2014-8128 CVE-2014-8129 CVE-2014-8130 CVE-2014-9330 CVE-2015-1547
-            CVE-2015-8781 CVE-2015-8782 CVE-2015-8783 CVE-2015-8784 CVE-2015-8870
-            CVE-2016-3620 CVE-2016-3621 CVE-2016-3623 CVE-2016-3624 CVE-2016-3625
-            CVE-2016-3631 CVE-2016-3632 CVE-2016-3633 CVE-2016-3634 CVE-2016-3658
-            CVE-2016-3945 CVE-2016-3990 CVE-2016-3991 CVE-2016-5102 CVE-2016-5314
-            CVE-2016-5315 CVE-2016-5316 CVE-2016-5318 CVE-2016-5319 CVE-2016-5321
-            CVE-2016-5322 CVE-2016-5323 CVE-2016-6223 CVE-2016-9453 CVE-2016-9532
-            CVE-2017-9935 CVE-2017-9937 CVE-2018-10963 CVE-2018-5360
-            CVE-2019-14973 CVE-2019-17546 CVE-2020-35521 CVE-2020-35522
-            CVE-2020-35523 CVE-2020-35524
-          More info at https://github.com/opentoonz/opentoonz/issues/4193
-        ''
-      ];
-      maintainers = with lib.maintainers; [ chkno ];
-    };
-  };
-in
-stdenv.mkDerivation {
-  inherit src;
-
-  pname = "opentoonz";
-  version = opentoonz-ver;
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    boost
-    libglut
-    freetype
-    glew
-    libjpeg
-    libmypaint
-    libpng
-    opentoonz-libtiff
-    libusb1
-    lz4
-    xz
-    lzo
-    openblas
-    opentoonz-opencv
-    libsForQt5.qtbase
-    libsForQt5.qtmultimedia
-    libsForQt5.qtscript
-    libsForQt5.qtserialport
-    superlu
-  ];
-
-  postUnpack = "sourceRoot=$sourceRoot/toonz";
-
-  cmakeDir = "../sources";
-  cmakeFlags = [
-    "-DCMAKE_SKIP_BUILD_RPATH=ON"
-    "-DTIFF_INCLUDE_DIR=${opentoonz-libtiff.dev}/include"
-    "-DTIFF_LIBRARY=${opentoonz-libtiff.out}/lib/libtiff.so"
-    (lib.cmakeBool "CMAKE_SKIP_BUILD_RPATH" true)
-  ];
-
-  postInstall = ''
-    sed -i '/cp -r .*stuff/a\    chmod -R u+w $HOME/.config/OpenToonz/stuff' $out/bin/opentoonz
-  '';
-
-  meta = {
-    description = "Full-featured 2D animation creation software";
-    homepage = "https://opentoonz.github.io/";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ chkno ];
-  };
-}
diff --git a/pkgs/by-name/op/opentracing-cpp/package.nix b/pkgs/by-name/op/opentracing-cpp/package.nix
deleted file mode 100644
index 8f125e2bcbf4..000000000000
--- a/pkgs/by-name/op/opentracing-cpp/package.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-stdenv.mkDerivation rec {
-  pname = "opentracing-cpp";
-  version = "1.6.0";
-  src = fetchFromGitHub {
-    owner = "opentracing";
-    repo = "opentracing-cpp";
-    rev = "v${version}";
-    sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "C++ implementation of the OpenTracing API";
-    homepage = "https://opentracing.io";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ rob ];
-  };
-
-}
diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/by-name/op/opentrack/aruco.nix
similarity index 51%
rename from pkgs/applications/misc/opentrack/aruco.nix
rename to pkgs/by-name/op/opentrack/aruco.nix
index 291ff7ad24f9..7fabda370d71 100644
--- a/pkgs/applications/misc/opentrack/aruco.nix
+++ b/pkgs/by-name/op/opentrack/aruco.nix
@@ -4,38 +4,39 @@
   cmake,
   fetchFromGitHub,
   opencv4,
+  opentrack,
 }:
 
 stdenv.mkDerivation {
   pname = "opentrack-aruco";
-  version = "unstable-20190303";
+  version = "0-unstable-2022-03-10";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "aruco";
-    rev = "12dc60efd61149227bd05c805208d9bcce308f6d";
-    sha256 = "0gkrixgfbpg8pls4qqilphbz4935mg5z4p18a0vv6kclmfccw9ad";
+    rev = "e08d336bd2c70859efd19622582817fe8eabe714";
+    hash = "sha256-Wf5y//vxRWIZfOxwgZsPPTsUHliA3cbt2FOjouh4/rQ=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ cmake ];
-
   buildInputs = [ opencv4 ];
 
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
 
-  preInstall = ''
-    mkdir -p $out/include/aruco
+  installPhase = ''
+    runHook preInstall
+
+    install -Dt $out/include/aruco ./src/include/aruco/*
+    install -Dt $out/lib ./src/libaruco.a
+
+    runHook postInstall
   '';
 
-  # copy headers required by main package
-  postInstall = ''
-    cp $src/src/*.h $out/include/aruco
-  '';
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/opentrack/aruco";
     description = "C++ library for detection of AR markers based on OpenCV";
-    license = licenses.isc;
-    maintainers = with maintainers; [ zaninime ];
+    license = lib.licenses.isc;
+    maintainers = opentrack.meta.maintainers;
   };
 }
diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
new file mode 100644
index 000000000000..3390f0d6d9d3
--- /dev/null
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -0,0 +1,113 @@
+{
+  stdenv,
+  lib,
+  callPackage,
+  fetchzip,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  ninja,
+  copyDesktopItems,
+  qt6,
+  opencv4,
+  procps,
+  eigen,
+  libXdmcp,
+  libevdev,
+  makeDesktopItem,
+  wineWowPackages,
+  onnxruntime,
+  nix-update-script,
+  withWine ? stdenv.targetPlatform.isx86_64,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "opentrack";
+  version = "2024.1.1-unstable-2025-11-06";
+
+  src = fetchFromGitHub {
+    owner = "opentrack";
+    repo = "opentrack";
+    rev = "f7696e0b8515d53f0d0a7515cc27d3f80b3a5c28";
+    hash = "sha256-FhI6lem83STBWjFMlChy/hhletyBkVM3iUmJfAU91UE=";
+  };
+
+  aruco = callPackage ./aruco.nix { };
+
+  xplaneSdk = fetchzip {
+    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK411.zip";
+    hash = "sha256-zay5QrHJctllVFl+JhlyTDzH68h5UoxncEt+TpW3UgI=";
+    # see license.txt inside the zip file
+    meta.license = lib.licenses.free;
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    copyDesktopItems
+    ninja
+    pkg-config
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals withWine [ wineWowPackages.stable ];
+
+  buildInputs = [
+    finalAttrs.aruco
+    eigen
+    libXdmcp
+    libevdev
+    onnxruntime
+    opencv4
+    procps
+    qt6.qtbase
+    qt6.qttools
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "SDK_WINE" withWine)
+    (lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a")
+    (lib.cmakeFeature "SDK_XPLANE" finalAttrs.xplaneSdk.outPath)
+  ];
+
+  postInstall = ''
+    install -Dt $out/share/icons/hicolor/256x256 $src/gui/images/opentrack.png
+  '';
+
+  # manually wrap just the main binary
+  dontWrapQtApps = true;
+  preFixup = ''
+    wrapQtApp $out/bin/opentrack
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "opentrack";
+      exec = "opentrack";
+      icon = "opentrack";
+      desktopName = "opentrack";
+      genericName = "Head tracking software";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version=branch"
+      "--version-regex"
+      "^opentrack-(.+)"
+    ];
+  };
+
+  meta = {
+    homepage = "https://github.com/opentrack/opentrack";
+    description = "Head tracking software for MS Windows, Linux, and Apple OSX";
+    mainProgram = "opentrack";
+    changelog = "https://github.com/opentrack/opentrack/releases";
+    license = lib.licenses.isc;
+    maintainers = [
+      lib.maintainers.nekowinston
+      lib.maintainers.zaninime
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/op/openwebrx/package.nix b/pkgs/by-name/op/openwebrx/package.nix
index 000f783f70bc..4707d53e4e27 100644
--- a/pkgs/by-name/op/openwebrx/package.nix
+++ b/pkgs/by-name/op/openwebrx/package.nix
@@ -14,6 +14,7 @@
   sox,
   wsjtx,
   codecserver,
+  versionCheckHook,
 }:
 
 let
@@ -54,6 +55,12 @@ let
       hash = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc=";
     };
 
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        "cmake_minimum_required (VERSION 3.0)" \
+        "cmake_minimum_required (VERSION 3.10)"
+    '';
+
     nativeBuildInputs = [
       cmake
       pkg-config
@@ -67,6 +74,10 @@ let
       soapysdr-with-plugins
     ];
 
+    nativeInstallCheckInputs = [ versionCheckHook ];
+    versionCheckProgram = "${placeholder "out"}/bin/rtl_connector";
+    doInstallCheck = true;
+
     meta = {
       homepage = "https://github.com/jketterl/owrx_connector";
       description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware";
@@ -113,6 +124,9 @@ python3Packages.buildPythonApplication rec {
     "test"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
     inherit js8py owrx_connector;
   };
diff --git a/pkgs/games/openxcom/default.nix b/pkgs/by-name/op/openxcom/package.nix
similarity index 96%
rename from pkgs/games/openxcom/default.nix
rename to pkgs/by-name/op/openxcom/package.nix
index e17ea01a0e8d..275c1191ef8c 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/by-name/op/openxcom/package.nix
@@ -7,7 +7,7 @@
   libGL,
   openssl,
   pkg-config,
-  SDL,
+  SDL_compat,
   SDL_image,
   SDL_mixer,
   SDL_gfx,
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     boost
     libGL
     libGLU
-    SDL
+    SDL_compat
     SDL_gfx
     SDL_image
     SDL_mixer
diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix
index 9b8caf125e99..43709d15407d 100644
--- a/pkgs/by-name/or/oranda/package.nix
+++ b/pkgs/by-name/or/oranda/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "oranda";
   };
 }
diff --git a/pkgs/by-name/or/orbstack/package.nix b/pkgs/by-name/or/orbstack/package.nix
new file mode 100644
index 000000000000..64e916d49c3f
--- /dev/null
+++ b/pkgs/by-name/or/orbstack/package.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  _7zz,
+}:
+let
+  inherit (stdenvNoCC.hostPlatform) system;
+  version = "2.0.3-19876";
+  sourceData = {
+    aarch64-darwin = {
+      arch = "arm64";
+      hash = "sha256-3Ppc0zWEgR/nTS7R9uAkUYYgYu5q2TWmfd3evT+Z8g4=";
+    };
+    x86_64-darwin = {
+      arch = "amd64";
+      hash = "sha256-+JpyynFKmDjHLetvvEpQ0qw4crAVmx0ucWm+bvtZ2Fg=";
+    };
+  };
+  sources = lib.mapAttrs (
+    system:
+    { arch, hash }:
+    fetchurl {
+      url = "https://cdn-updates.orbstack.dev/${arch}/OrbStack_v${
+        lib.replaceString "-" "_" version
+      }_${arch}.dmg";
+      inherit hash;
+    }
+  ) sourceData;
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "orbstack";
+  inherit version;
+
+  src = finalAttrs.passthru.sources.${system} or (throw "unsupported system ${system}");
+
+  # -snld prevents "ERROR: Dangerous symbolic link path was ignored"
+  # -xr'!*:com.apple.*' prevents macOS extended attributes (e.g. macl or
+  # quarantine) being turned into real files when extracting an APFS .dmg
+  # (e.g. Info.plist:com.apple.macl or Info.plist:com.apple.quarantine).
+  # These bogus files corrupt the .app bundle and prevent it from launching.
+  unpackCmd = "7zz x -snld -xr'!*:com.apple.*' $curSrc";
+
+  nativeBuildInputs = [ _7zz ];
+
+  sourceRoot = ".";
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R OrbStack.app "$out/Applications"
+
+    mkdir -p "$out/bin"
+    for binary in "$out"/Applications/OrbStack.app/Contents/MacOS/{bin,xbin}/*; do
+      ln -s "$binary" "$out/bin/$(basename "$binary")"
+    done
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit sources;
+    updateScript = ./update.sh;
+  };
+
+  meta = {
+    changelog = "https://docs.orbstack.dev/release-notes#${
+      builtins.replaceStrings [ "." ] [ "-" ] version
+    }";
+    description = "Fast, light, and easy way to run Docker containers and Linux machines";
+    homepage = "https://orbstack.dev/";
+    license = lib.licenses.unfree;
+    mainProgram = "orb";
+    maintainers = with lib.maintainers; [ deejayem ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/or/orbstack/update.sh b/pkgs/by-name/or/orbstack/update.sh
new file mode 100755
index 000000000000..39c1c2ffe787
--- /dev/null
+++ b/pkgs/by-name/or/orbstack/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p coreutils curl gawk gnugrep gnused common-updater-scripts
+#shellcheck shell=bash
+
+set -eu -o pipefail
+
+update_arch() {
+  local arch="$1"
+  local system="$2"
+
+  local source_url
+  source_url="$(curl -L -I "https://orbstack.dev/download/stable/latest/$arch" | grep -i "location:" | awk '{print $2}' | tr -d '\r')"
+
+  local version
+  version="$(echo "$source_url" | grep -o '\([0-9]\+\.\)\{2\}[0-9]\+_[0-9]\+' | sed 's/_/-/')"
+
+  local hash
+  hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "$source_url")")
+
+  update-source-version orbstack "$version" "$hash" --system="$system" --source-key="sources.$system" --ignore-same-version
+}
+
+update_arch "arm64" "aarch64-darwin"
+update_arch "amd64" "x86_64-darwin"
diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 3af7a88fe49a..03e490f8e0b4 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -58,12 +58,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "orca-slicer";
-  version = "v2.3.1";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "SoftFever";
     repo = "OrcaSlicer";
-    tag = finalAttrs.version;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-RdMBx/onLq58oI1sL0cHmF2SGDfeI9KkPPCbjyMqECI=";
   };
 
diff --git a/pkgs/by-name/or/orca/fix-paths.patch b/pkgs/by-name/or/orca/fix-paths.patch
index 49b5cc34ac89..49142eed47d9 100644
--- a/pkgs/by-name/or/orca/fix-paths.patch
+++ b/pkgs/by-name/or/orca/fix-paths.patch
@@ -1,18 +1,18 @@
 diff --git a/src/orca/ax_utilities_application.py b/src/orca/ax_utilities_application.py
-index 60c172f78..e8dadf76d 100644
+index dbaca2e48..80f2640d4 100644
 --- a/src/orca/ax_utilities_application.py
 +++ b/src/orca/ax_utilities_application.py
-@@ -189,7 +189,7 @@ class AXUtilitiesApplication:
+@@ -188,7 +188,7 @@ class AXUtilitiesApplication:
  
          pid = AXUtilitiesApplication.get_process_id(app)
          try:
 -            state = subprocess.getoutput(f"cat /proc/{pid}/status | grep State")
 +            state = subprocess.getoutput(f"@cat@ /proc/{pid}/status | @grep@ State")
              state = state.split()[1]
-         except Exception as error:
+         except (GLib.GError, IndexError) as error:
              tokens = [f"AXUtilitiesApplication: Exception checking state of pid {pid}: {error}"]
 diff --git a/src/orca/debugging_tools_manager.py b/src/orca/debugging_tools_manager.py
-index 740f1a690..85f74d2dc 100644
+index b4abce719..cff5a78a6 100644
 --- a/src/orca/debugging_tools_manager.py
 +++ b/src/orca/debugging_tools_manager.py
 @@ -243,7 +243,7 @@ class DebuggingToolsManager:
@@ -21,22 +21,22 @@ index 740f1a690..85f74d2dc 100644
              try:
 -                cmdline = subprocess.getoutput(f"cat /proc/{pid}/cmdline")
 +                cmdline = subprocess.getoutput(f"@cat@ /proc/{pid}/cmdline")
-             except Exception as error:
+             except subprocess.SubprocessError as error:
                  cmdline = f"EXCEPTION: {error}"
              else:
 diff --git a/src/orca/orca_bin.py.in b/src/orca/orca_bin.py.in
-index 6cb4c7772..903b344f0 100755
+index 3fc845dc3..a82947911 100755
 --- a/src/orca/orca_bin.py.in
 +++ b/src/orca/orca_bin.py.in
-@@ -186,7 +186,7 @@ def inGraphicalDesktop():
- def otherOrcas():
+@@ -238,7 +238,7 @@ def in_graphical_desktop() -> bool:
+ def other_orcas() -> list[int]:
      """Returns the pid of any other instances of Orca owned by this user."""
  
--    openFile = subprocess.Popen('pgrep -u %s -x orca' % os.getuid(),
-+    openFile = subprocess.Popen('@pgrep@ -u %s -x orca' % os.getuid(),
-                                 shell=True,
-                                 stdout=subprocess.PIPE).stdout
-     pids = openFile.read()
+-    with subprocess.Popen(f"pgrep -u {os.getuid()} -x orca",
++    with subprocess.Popen(f"@pgrep@ -u {os.getuid()} -x orca",
+                           shell=True,
+                           stdout=subprocess.PIPE) as proc:
+         pids = proc.stdout.read() if proc.stdout else b""
 diff --git a/src/orca/orca_modifier_manager.py b/src/orca/orca_modifier_manager.py
 index 3407be009..452297a3f 100644
 --- a/src/orca/orca_modifier_manager.py
diff --git a/pkgs/by-name/or/orca/package.nix b/pkgs/by-name/or/orca/package.nix
index 34a51734082a..95c5142cb46b 100644
--- a/pkgs/by-name/or/orca/package.nix
+++ b/pkgs/by-name/or/orca/package.nix
@@ -29,13 +29,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "orca";
-  version = "48.6";
+  version = "49.1";
 
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/orca/${lib.versions.major version}/orca-${version}.tar.xz";
-    hash = "sha256-7cUDRODf1yR2tcFLOqclyiaHGOpt2JvE7ib0ULM51pY=";
+    hash = "sha256-ZTKWhs0V9iq05MDQDOuYTUmbKOwsURdQjDuCiQ1i5+M=";
   };
 
   patches = [
@@ -59,6 +59,7 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   pythonPath = with python3.pkgs; [
+    dasbus
     pygobject3
     dbus-python
     pyxdg
diff --git a/pkgs/by-name/or/orchard/package.nix b/pkgs/by-name/or/orchard/package.nix
index 21cce3878f2f..dfe2ae56de19 100644
--- a/pkgs/by-name/or/orchard/package.nix
+++ b/pkgs/by-name/or/orchard/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "orchard";
-  version = "0.38.1";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "orchard";
     rev = version;
-    hash = "sha256-pobhMJkCa8GiaBjpOq5y6FTaoBBq97NlByLcOfbdDLI=";
+    hash = "sha256-EeH37j6ecgRiIGV24wL+yX0BJQE+6rGVGr14zgHaOko=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -25,7 +25,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-cdOuMX1PRRCFWfIf6Z2tVSgJDsuj6aC99qnnCKJzPQQ=";
+  vendorHash = "sha256-VhDPPWj3gQdUJXqcUPg6U4ZBERstWGoKTJ7FIfe0hWs=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/or/org-stats/package.nix b/pkgs/by-name/or/org-stats/package.nix
index 297c76095bfa..fc734f4f6a43 100644
--- a/pkgs/by-name/or/org-stats/package.nix
+++ b/pkgs/by-name/or/org-stats/package.nix
@@ -60,7 +60,7 @@ buildGoModule rec {
     homepage = "https://github.com/caarlos0/org-stats";
     changelog = "https://github.com/caarlos0/org-stats/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "org-stats";
   };
 }
diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix
index e2ea39a3a8eb..0e3d40810d9e 100644
--- a/pkgs/by-name/or/orocos-kdl/package.nix
+++ b/pkgs/by-name/or/orocos-kdl/package.nix
@@ -8,15 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "orocos-kdl";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "orocos";
     repo = "orocos_kinematics_dynamics";
-    tag = "v${version}";
-    sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419";
-    # Needed to build Python bindings
-    fetchSubmodules = true;
+    tag = "${version}";
+    hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is=";
+    fetchSubmodules = true; # Needed to build Python bindings
   };
 
   sourceRoot = "${src.name}/orocos_kdl";
diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix
deleted file mode 100644
index 3d000c9c8909..000000000000
--- a/pkgs/by-name/or/orogene/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-  versionCheckHook,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "orogene";
-  version = "0.3.34";
-
-  src = fetchFromGitHub {
-    owner = "orogene";
-    repo = "orogene";
-    tag = "v${version}";
-    hash = "sha256-GMWrlvZZ2xlcvcRG3u8jS8KiewHpyX0brNe4pmCpHbM=";
-    fetchSubmodules = true;
-  };
-
-  cargoPatches = [
-    # Workaround to avoid "error[E0282]"
-    # ref: https://github.com/orogene/orogene/pull/315
-    ./update-outdated-lockfile.patch
-  ];
-
-  cargoHash = "sha256-I08mqyogEuadp+V10svMmCm0i0zOZWiocOpM9E3lgag=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-  ];
-
-  preCheck = ''
-    export CI=true
-    export HOME=$(mktemp -d)
-  '';
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgram = "${placeholder "out"}/bin/oro";
-  versionCheckProgramArg = "--version";
-
-  meta = with lib; {
-    description = "Package manager for tools that use node_modules";
-    homepage = "https://github.com/orogene/orogene";
-    changelog = "https://github.com/orogene/orogene/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
-      asl20
-      isc
-    ];
-    maintainers = with maintainers; [ figsoda ];
-    mainProgram = "oro";
-  };
-}
diff --git a/pkgs/by-name/or/orogene/update-outdated-lockfile.patch b/pkgs/by-name/or/orogene/update-outdated-lockfile.patch
deleted file mode 100644
index d56073fdb227..000000000000
--- a/pkgs/by-name/or/orogene/update-outdated-lockfile.patch
+++ /dev/null
@@ -1,3785 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 2655ed26..a26cbb5d 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4,9 +4,9 @@ version = 3
- 
- [[package]]
- name = "addr2line"
--version = "0.21.0"
-+version = "0.22.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
- dependencies = [
-  "gimli",
- ]
-@@ -19,20 +19,20 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
- 
- [[package]]
- name = "ahash"
--version = "0.7.6"
-+version = "0.7.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
- dependencies = [
-- "getrandom 0.2.10",
-+ "getrandom 0.2.15",
-  "once_cell",
-  "version_check",
- ]
- 
- [[package]]
- name = "aho-corasick"
--version = "1.1.1"
-+version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
-+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
- dependencies = [
-  "memchr",
- ]
-@@ -54,63 +54,64 @@ dependencies = [
- 
- [[package]]
- name = "anstream"
--version = "0.6.4"
-+version = "0.6.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
-+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
- dependencies = [
-  "anstyle",
-  "anstyle-parse",
-  "anstyle-query",
-  "anstyle-wincon",
-  "colorchoice",
-+ "is_terminal_polyfill",
-  "utf8parse",
- ]
- 
- [[package]]
- name = "anstyle"
--version = "1.0.4"
-+version = "1.0.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
-+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
- 
- [[package]]
- name = "anstyle-parse"
--version = "0.2.2"
-+version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
-+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
- dependencies = [
-  "utf8parse",
- ]
- 
- [[package]]
- name = "anstyle-query"
--version = "1.0.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
- dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
- name = "anstyle-wincon"
--version = "3.0.1"
-+version = "3.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
-+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
- dependencies = [
-  "anstyle",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
- name = "anyhow"
--version = "1.0.75"
-+version = "1.0.86"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
- 
- [[package]]
- name = "arrayref"
--version = "0.3.7"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
- 
- [[package]]
- name = "arrayvec"
-@@ -145,8 +146,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
- dependencies = [
-  "concurrent-queue",
-- "event-listener",
-+ "event-listener 2.5.3",
-+ "futures-core",
-+]
-+
-+[[package]]
-+name = "async-channel"
-+version = "2.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-+dependencies = [
-+ "concurrent-queue",
-+ "event-listener-strategy",
-  "futures-core",
-+ "pin-project-lite",
- ]
- 
- [[package]]
-@@ -164,9 +177,9 @@ dependencies = [
- 
- [[package]]
- name = "async-compression"
--version = "0.4.3"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c"
-+checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
- dependencies = [
-  "flate2",
-  "futures-core",
-@@ -177,30 +190,29 @@ dependencies = [
- 
- [[package]]
- name = "async-executor"
--version = "1.5.4"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499"
-+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
- dependencies = [
-- "async-lock",
-  "async-task",
-  "concurrent-queue",
-- "fastrand 2.0.1",
-- "futures-lite",
-+ "fastrand 2.1.0",
-+ "futures-lite 2.3.0",
-  "slab",
- ]
- 
- [[package]]
- name = "async-global-executor"
--version = "2.3.1"
-+version = "2.4.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
-+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
- dependencies = [
-- "async-channel",
-+ "async-channel 2.3.1",
-  "async-executor",
-- "async-io",
-- "async-lock",
-+ "async-io 2.3.3",
-+ "async-lock 3.4.0",
-  "blocking",
-- "futures-lite",
-+ "futures-lite 2.3.0",
-  "once_cell",
-  "tokio",
- ]
-@@ -211,47 +223,94 @@ version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
- dependencies = [
-- "async-lock",
-+ "async-lock 2.8.0",
-  "autocfg",
-  "cfg-if",
-  "concurrent-queue",
-- "futures-lite",
-+ "futures-lite 1.13.0",
-  "log",
-  "parking",
-- "polling",
-- "rustix 0.37.24",
-+ "polling 2.8.0",
-+ "rustix 0.37.27",
-  "slab",
-- "socket2 0.4.9",
-+ "socket2 0.4.10",
-  "waker-fn",
- ]
- 
-+[[package]]
-+name = "async-io"
-+version = "2.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
-+dependencies = [
-+ "async-lock 3.4.0",
-+ "cfg-if",
-+ "concurrent-queue",
-+ "futures-io",
-+ "futures-lite 2.3.0",
-+ "parking",
-+ "polling 3.7.2",
-+ "rustix 0.38.34",
-+ "slab",
-+ "tracing",
-+ "windows-sys 0.52.0",
-+]
-+
- [[package]]
- name = "async-lock"
- version = "2.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
- dependencies = [
-- "event-listener",
-+ "event-listener 2.5.3",
-+]
-+
-+[[package]]
-+name = "async-lock"
-+version = "3.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-+dependencies = [
-+ "event-listener 5.3.1",
-+ "event-listener-strategy",
-+ "pin-project-lite",
- ]
- 
- [[package]]
- name = "async-process"
--version = "1.7.0"
-+version = "1.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
-+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
- dependencies = [
-- "async-io",
-- "async-lock",
-- "autocfg",
-+ "async-io 1.13.0",
-+ "async-lock 2.8.0",
-+ "async-signal",
-  "blocking",
-  "cfg-if",
-- "event-listener",
-- "futures-lite",
-- "rustix 0.37.24",
-- "signal-hook",
-+ "event-listener 3.1.0",
-+ "futures-lite 1.13.0",
-+ "rustix 0.38.34",
-  "windows-sys 0.48.0",
- ]
- 
-+[[package]]
-+name = "async-signal"
-+version = "0.2.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
-+dependencies = [
-+ "async-io 2.3.3",
-+ "async-lock 3.4.0",
-+ "atomic-waker",
-+ "cfg-if",
-+ "futures-core",
-+ "futures-io",
-+ "rustix 0.38.34",
-+ "signal-hook-registry",
-+ "slab",
-+ "windows-sys 0.52.0",
-+]
-+
- [[package]]
- name = "async-std"
- version = "1.12.0"
-@@ -259,16 +318,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
- dependencies = [
-  "async-attributes",
-- "async-channel",
-+ "async-channel 1.9.0",
-  "async-global-executor",
-- "async-io",
-- "async-lock",
-+ "async-io 1.13.0",
-+ "async-lock 2.8.0",
-  "async-process",
-  "crossbeam-utils",
-  "futures-channel",
-  "futures-core",
-  "futures-io",
-- "futures-lite",
-+ "futures-lite 1.13.0",
-  "gloo-timers",
-  "kv-log-macro",
-  "log",
-@@ -296,19 +355,19 @@ dependencies = [
- 
- [[package]]
- name = "async-task"
--version = "4.4.1"
-+version = "4.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921"
-+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
- 
- [[package]]
- name = "async-trait"
--version = "0.1.73"
-+version = "0.1.81"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
-+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -319,17 +378,17 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
- 
- [[package]]
- name = "autocfg"
--version = "1.1.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
- 
- [[package]]
- name = "backon"
--version = "0.4.1"
-+version = "0.4.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9"
-+checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0"
- dependencies = [
-- "fastrand 1.9.0",
-+ "fastrand 2.1.0",
-  "futures-core",
-  "pin-project",
-  "tokio",
-@@ -337,9 +396,9 @@ dependencies = [
- 
- [[package]]
- name = "backtrace"
--version = "0.3.69"
-+version = "0.3.73"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
- dependencies = [
-  "addr2line",
-  "cc",
-@@ -367,9 +426,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
- 
- [[package]]
- name = "base64"
--version = "0.21.4"
-+version = "0.21.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
-+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-+
-+[[package]]
-+name = "base64"
-+version = "0.22.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
- 
- [[package]]
- name = "bincode"
-@@ -388,9 +453,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
- 
- [[package]]
- name = "bitflags"
--version = "2.4.0"
-+version = "2.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
- 
- [[package]]
- name = "bitvec"
-@@ -415,31 +480,28 @@ dependencies = [
- 
- [[package]]
- name = "blocking"
--version = "1.4.0"
-+version = "1.6.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1"
-+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
- dependencies = [
-- "async-channel",
-- "async-lock",
-+ "async-channel 2.3.1",
-  "async-task",
-- "fastrand 2.0.1",
-  "futures-io",
-- "futures-lite",
-+ "futures-lite 2.3.0",
-  "piper",
-- "tracing",
- ]
- 
- [[package]]
- name = "bumpalo"
--version = "3.14.0"
-+version = "3.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
- 
- [[package]]
- name = "bytecheck"
--version = "0.6.11"
-+version = "0.6.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
-+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
- dependencies = [
-  "bytecheck_derive",
-  "ptr_meta",
-@@ -448,9 +510,9 @@ dependencies = [
- 
- [[package]]
- name = "bytecheck_derive"
--version = "0.6.11"
-+version = "0.6.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
-+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -459,15 +521,15 @@ dependencies = [
- 
- [[package]]
- name = "bytecount"
--version = "0.6.4"
-+version = "0.6.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7"
-+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
- 
- [[package]]
- name = "bytemuck"
--version = "1.14.0"
-+version = "1.16.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
-+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
- 
- [[package]]
- name = "byteorder"
-@@ -487,9 +549,9 @@ dependencies = [
- 
- [[package]]
- name = "bytes"
--version = "1.5.0"
-+version = "1.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
- 
- [[package]]
- name = "cacache"
-@@ -500,7 +562,7 @@ dependencies = [
-  "async-std",
-  "digest",
-  "either",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "hex",
-  "libc",
-  "memmap2",
-@@ -526,7 +588,7 @@ dependencies = [
-  "async-std",
-  "digest",
-  "either",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "hex",
-  "libc",
-  "memmap2",
-@@ -545,12 +607,9 @@ dependencies = [
- 
- [[package]]
- name = "cc"
--version = "1.0.83"
-+version = "1.1.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
--dependencies = [
-- "libc",
--]
-+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
- 
- [[package]]
- name = "cfg-if"
-@@ -560,16 +619,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
- 
- [[package]]
- name = "chrono"
--version = "0.4.31"
-+version = "0.4.38"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
-+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
- dependencies = [
-  "android-tzdata",
-  "iana-time-zone",
-  "js-sys",
-  "num-traits",
-  "wasm-bindgen",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -583,9 +642,9 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "4.4.6"
-+version = "4.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
-+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
- dependencies = [
-  "clap_builder",
-  "clap_derive",
-@@ -593,33 +652,33 @@ dependencies = [
- 
- [[package]]
- name = "clap_builder"
--version = "4.4.6"
-+version = "4.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
-+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
- dependencies = [
-  "anstream",
-  "anstyle",
-  "clap_lex",
-- "strsim",
-+ "strsim 0.11.1",
- ]
- 
- [[package]]
- name = "clap_derive"
--version = "4.4.2"
-+version = "4.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
-+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
- dependencies = [
-  "heck",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "clap_lex"
--version = "0.5.1"
-+version = "0.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
-+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
- 
- [[package]]
- name = "color_quant"
-@@ -629,35 +688,34 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
- 
- [[package]]
- name = "colorchoice"
--version = "1.0.0"
-+version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
- 
- [[package]]
- name = "colored"
--version = "2.0.4"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
- dependencies = [
-- "is-terminal",
-  "lazy_static",
-  "windows-sys 0.48.0",
- ]
- 
- [[package]]
- name = "concurrent-queue"
--version = "2.3.0"
-+version = "2.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
-+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
- dependencies = [
-  "crossbeam-utils",
- ]
- 
- [[package]]
- name = "config"
--version = "0.13.3"
-+version = "0.13.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
-+checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
- dependencies = [
-  "async-trait",
-  "lazy_static",
-@@ -668,15 +726,15 @@ dependencies = [
- 
- [[package]]
- name = "console"
--version = "0.15.7"
-+version = "0.15.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
-+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
- dependencies = [
-  "encode_unicode",
-  "lazy_static",
-  "libc",
-  "unicode-width",
-- "windows-sys 0.45.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -691,9 +749,9 @@ dependencies = [
- 
- [[package]]
- name = "core-foundation"
--version = "0.9.3"
-+version = "0.9.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
- dependencies = [
-  "core-foundation-sys",
-  "libc",
-@@ -701,46 +759,42 @@ dependencies = [
- 
- [[package]]
- name = "core-foundation-sys"
--version = "0.8.4"
-+version = "0.8.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
- 
- [[package]]
- name = "cpufeatures"
--version = "0.2.9"
-+version = "0.2.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
- dependencies = [
-  "libc",
- ]
- 
- [[package]]
- name = "crc32fast"
--version = "1.3.2"
-+version = "1.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
- dependencies = [
-  "cfg-if",
- ]
- 
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.8"
-+version = "0.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
- dependencies = [
-- "cfg-if",
-  "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.16"
-+version = "0.8.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
--dependencies = [
-- "cfg-if",
--]
-+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
- 
- [[package]]
- name = "crypto-common"
-@@ -772,7 +826,7 @@ dependencies = [
-  "ident_case",
-  "proc-macro2",
-  "quote",
-- "strsim",
-+ "strsim 0.10.0",
-  "syn 1.0.109",
- ]
- 
-@@ -818,9 +872,9 @@ dependencies = [
- 
- [[package]]
- name = "deadpool-runtime"
--version = "0.1.3"
-+version = "0.1.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49"
-+checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
- 
- [[package]]
- name = "debugid"
-@@ -834,9 +888,12 @@ dependencies = [
- 
- [[package]]
- name = "deranged"
--version = "0.3.8"
-+version = "0.3.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
-+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-+dependencies = [
-+ "powerfmt",
-+]
- 
- [[package]]
- name = "derive_builder"
-@@ -924,9 +981,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
- 
- [[package]]
- name = "either"
--version = "1.9.0"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
- 
- [[package]]
- name = "embed-resource"
-@@ -949,9 +1006,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
- 
- [[package]]
- name = "encoding_rs"
--version = "0.8.33"
-+version = "0.8.34"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
- dependencies = [
-  "cfg-if",
- ]
-@@ -964,30 +1021,51 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
- 
- [[package]]
- name = "errno"
--version = "0.3.4"
-+version = "0.3.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
-+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
- dependencies = [
-- "errno-dragonfly",
-  "libc",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
--name = "errno-dragonfly"
--version = "0.1.2"
-+name = "event-listener"
-+version = "2.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-+
-+[[package]]
-+name = "event-listener"
-+version = "3.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
- dependencies = [
-- "cc",
-- "libc",
-+ "concurrent-queue",
-+ "parking",
-+ "pin-project-lite",
- ]
- 
- [[package]]
- name = "event-listener"
--version = "2.5.3"
-+version = "5.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-+dependencies = [
-+ "concurrent-queue",
-+ "parking",
-+ "pin-project-lite",
-+]
-+
-+[[package]]
-+name = "event-listener-strategy"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-+dependencies = [
-+ "event-listener 5.3.1",
-+ "pin-project-lite",
-+]
- 
- [[package]]
- name = "fastrand"
-@@ -1000,29 +1078,29 @@ dependencies = [
- 
- [[package]]
- name = "fastrand"
--version = "2.0.1"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
-+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
- 
- [[package]]
- name = "fdeflate"
--version = "0.3.0"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
-+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
- dependencies = [
-  "simd-adler32",
- ]
- 
- [[package]]
- name = "filetime"
--version = "0.2.22"
-+version = "0.2.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
-+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
- dependencies = [
-  "cfg-if",
-  "libc",
-- "redox_syscall 0.3.5",
-- "windows-sys 0.48.0",
-+ "redox_syscall 0.4.1",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1045,9 +1123,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
- 
- [[package]]
- name = "flate2"
--version = "1.0.27"
-+version = "1.0.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
-+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
- dependencies = [
-  "crc32fast",
-  "miniz_oxide",
-@@ -1067,11 +1145,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
- 
- [[package]]
- name = "fontconfig-parser"
--version = "0.5.3"
-+version = "0.5.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
-+checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
- dependencies = [
-- "roxmltree",
-+ "roxmltree 0.20.0",
- ]
- 
- [[package]]
-@@ -1103,9 +1181,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
- 
- [[package]]
- name = "form_urlencoded"
--version = "1.2.0"
-+version = "1.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
- dependencies = [
-  "percent-encoding",
- ]
-@@ -1124,9 +1202,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
- 
- [[package]]
- name = "futures"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
- dependencies = [
-  "futures-channel",
-  "futures-core",
-@@ -1139,9 +1217,9 @@ dependencies = [
- 
- [[package]]
- name = "futures-channel"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
- dependencies = [
-  "futures-core",
-  "futures-sink",
-@@ -1149,15 +1227,15 @@ dependencies = [
- 
- [[package]]
- name = "futures-core"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
- 
- [[package]]
- name = "futures-executor"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
- dependencies = [
-  "futures-core",
-  "futures-task",
-@@ -1166,9 +1244,9 @@ dependencies = [
- 
- [[package]]
- name = "futures-io"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
- 
- [[package]]
- name = "futures-lite"
-@@ -1185,40 +1263,53 @@ dependencies = [
-  "waker-fn",
- ]
- 
-+[[package]]
-+name = "futures-lite"
-+version = "2.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-+dependencies = [
-+ "fastrand 2.1.0",
-+ "futures-core",
-+ "futures-io",
-+ "parking",
-+ "pin-project-lite",
-+]
-+
- [[package]]
- name = "futures-macro"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "futures-sink"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
- 
- [[package]]
- name = "futures-task"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
- 
- [[package]]
- name = "futures-timer"
--version = "3.0.2"
-+version = "3.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
- 
- [[package]]
- name = "futures-util"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
- dependencies = [
-  "futures 0.1.31",
-  "futures-channel",
-@@ -1257,9 +1348,9 @@ dependencies = [
- 
- [[package]]
- name = "getrandom"
--version = "0.2.10"
-+version = "0.2.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
-+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -1280,9 +1371,9 @@ dependencies = [
- 
- [[package]]
- name = "gimli"
--version = "0.28.0"
-+version = "0.29.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
- 
- [[package]]
- name = "gloo-timers"
-@@ -1298,17 +1389,36 @@ dependencies = [
- 
- [[package]]
- name = "h2"
--version = "0.3.21"
-+version = "0.3.26"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
-+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "fnv",
-  "futures-core",
-  "futures-sink",
-  "futures-util",
-- "http",
-- "indexmap 1.9.3",
-+ "http 0.2.12",
-+ "indexmap 2.3.0",
-+ "slab",
-+ "tokio",
-+ "tokio-util",
-+ "tracing",
-+]
-+
-+[[package]]
-+name = "h2"
-+version = "0.4.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-+dependencies = [
-+ "atomic-waker",
-+ "bytes 1.7.1",
-+ "fnv",
-+ "futures-core",
-+ "futures-sink",
-+ "http 1.1.0",
-+ "indexmap 2.3.0",
-  "slab",
-  "tokio",
-  "tokio-util",
-@@ -1326,21 +1436,27 @@ dependencies = [
- 
- [[package]]
- name = "hashbrown"
--version = "0.14.1"
-+version = "0.14.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
-+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
- 
- [[package]]
- name = "heck"
--version = "0.4.1"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
- 
- [[package]]
- name = "hermit-abi"
--version = "0.3.3"
-+version = "0.3.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-+
-+[[package]]
-+name = "hermit-abi"
-+version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
-+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
- 
- [[package]]
- name = "hex"
-@@ -1350,11 +1466,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
- 
- [[package]]
- name = "home"
--version = "0.5.5"
-+version = "0.5.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
-+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
- dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1370,23 +1486,57 @@ dependencies = [
- 
- [[package]]
- name = "http"
--version = "0.2.9"
-+version = "0.2.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "fnv",
-+ "itoa",
-+]
-+
-+[[package]]
-+name = "http"
-+version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
-+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "fnv",
-  "itoa",
- ]
- 
- [[package]]
- name = "http-body"
--version = "0.4.5"
-+version = "0.4.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "http 0.2.12",
-+ "pin-project-lite",
-+]
-+
-+[[package]]
-+name = "http-body"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "http 1.1.0",
-+]
-+
-+[[package]]
-+name = "http-body-util"
-+version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
- dependencies = [
-- "bytes 1.5.0",
-- "http",
-+ "bytes 1.7.1",
-+ "futures-util",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-  "pin-project-lite",
- ]
- 
-@@ -1400,7 +1550,7 @@ dependencies = [
-  "async-trait",
-  "bincode",
-  "cacache 11.7.1",
-- "http",
-+ "http 0.2.12",
-  "http-cache-semantics",
-  "httpdate",
-  "miette",
-@@ -1417,7 +1567,7 @@ checksum = "166fed9ab4881ce1383fb854c41fbd947a067d87986955badb500a2c1c8fd1af"
- dependencies = [
-  "anyhow",
-  "async-trait",
-- "http",
-+ "http 0.2.12",
-  "http-cache",
-  "http-cache-semantics",
-  "reqwest",
-@@ -1429,11 +1579,11 @@ dependencies = [
- 
- [[package]]
- name = "http-cache-semantics"
--version = "1.0.1"
-+version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "14246388577086faaaa56fb59f0b94e288800fecfff75918a237813297cdda17"
-+checksum = "7aec9f678bca3f4a15194b980f20ed9bfe0dd38e8d298c65c559a93dfbd6380a"
- dependencies = [
-- "http",
-+ "http 0.2.12",
-  "http-serde",
-  "serde",
-  "time",
-@@ -1445,7 +1595,7 @@ version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee"
- dependencies = [
-- "http",
-+ "http 0.2.12",
-  "serde",
- ]
- 
-@@ -1456,10 +1606,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
- dependencies = [
-  "anyhow",
-- "async-channel",
-+ "async-channel 1.9.0",
-  "base64 0.13.1",
-- "futures-lite",
-- "http",
-+ "futures-lite 1.13.0",
-+ "http 0.2.12",
-  "infer",
-  "pin-project-lite",
-  "rand 0.7.3",
-@@ -1472,9 +1622,9 @@ dependencies = [
- 
- [[package]]
- name = "httparse"
--version = "1.8.0"
-+version = "1.9.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
- 
- [[package]]
- name = "httpdate"
-@@ -1490,41 +1640,76 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
- 
- [[package]]
- name = "hyper"
--version = "0.14.27"
-+version = "0.14.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
-+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "futures-channel",
-  "futures-core",
-  "futures-util",
-- "h2",
-- "http",
-- "http-body",
-+ "h2 0.3.26",
-+ "http 0.2.12",
-+ "http-body 0.4.6",
-  "httparse",
-  "httpdate",
-  "itoa",
-  "pin-project-lite",
-- "socket2 0.4.9",
-+ "socket2 0.5.7",
-  "tokio",
-  "tower-service",
-  "tracing",
-  "want",
- ]
- 
-+[[package]]
-+name = "hyper"
-+version = "1.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "futures-channel",
-+ "futures-util",
-+ "h2 0.4.5",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-+ "httparse",
-+ "httpdate",
-+ "itoa",
-+ "pin-project-lite",
-+ "smallvec",
-+ "tokio",
-+]
-+
- [[package]]
- name = "hyper-tls"
- version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
- dependencies = [
-- "bytes 1.5.0",
-- "hyper",
-+ "bytes 1.7.1",
-+ "hyper 0.14.30",
-  "native-tls",
-  "tokio",
-  "tokio-native-tls",
- ]
- 
-+[[package]]
-+name = "hyper-util"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "futures-util",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-+ "hyper 1.4.1",
-+ "pin-project-lite",
-+ "tokio",
-+]
-+
- [[package]]
- name = "hypermelon"
- version = "0.5.5"
-@@ -1533,16 +1718,16 @@ checksum = "a21d32b951725c7efe88bac17f191cf2bb0028cce32d1acb3cd087755a0719b2"
- 
- [[package]]
- name = "iana-time-zone"
--version = "0.1.57"
-+version = "0.1.60"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
-+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
- dependencies = [
-  "android_system_properties",
-  "core-foundation-sys",
-  "iana-time-zone-haiku",
-  "js-sys",
-  "wasm-bindgen",
-- "windows 0.48.0",
-+ "windows-core 0.52.0",
- ]
- 
- [[package]]
-@@ -1562,9 +1747,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
- 
- [[package]]
- name = "idna"
--version = "0.4.0"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
- dependencies = [
-  "unicode-bidi",
-  "unicode-normalization",
-@@ -1589,19 +1774,19 @@ dependencies = [
- 
- [[package]]
- name = "indexmap"
--version = "2.0.2"
-+version = "2.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
-+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
- dependencies = [
-  "equivalent",
-- "hashbrown 0.14.1",
-+ "hashbrown 0.14.5",
- ]
- 
- [[package]]
- name = "indicatif"
--version = "0.17.7"
-+version = "0.17.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
-+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
- dependencies = [
-  "console",
-  "instant",
-@@ -1619,23 +1804,22 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
- 
- [[package]]
- name = "insta"
--version = "1.33.0"
-+version = "1.39.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686"
-+checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
- dependencies = [
-  "console",
-  "lazy_static",
-  "linked-hash-map",
-  "serde",
-  "similar",
-- "yaml-rust",
- ]
- 
- [[package]]
- name = "instant"
--version = "0.1.12"
-+version = "0.1.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -1649,7 +1833,7 @@ version = "1.0.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
- dependencies = [
-- "hermit-abi",
-+ "hermit-abi 0.3.9",
-  "libc",
-  "windows-sys 0.48.0",
- ]
-@@ -1660,12 +1844,6 @@ version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304"
- 
--[[package]]
--name = "ioctl-sys"
--version = "0.8.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c"
--
- [[package]]
- name = "iovec"
- version = "0.1.4"
-@@ -1677,9 +1855,9 @@ dependencies = [
- 
- [[package]]
- name = "ipnet"
--version = "2.8.0"
-+version = "2.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
-+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
- 
- [[package]]
- name = "is-docker"
-@@ -1692,13 +1870,13 @@ dependencies = [
- 
- [[package]]
- name = "is-terminal"
--version = "0.4.9"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
- dependencies = [
-- "hermit-abi",
-- "rustix 0.38.17",
-- "windows-sys 0.48.0",
-+ "hermit-abi 0.3.9",
-+ "libc",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1713,39 +1891,45 @@ dependencies = [
- 
- [[package]]
- name = "is_ci"
--version = "1.1.1"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
-+
-+[[package]]
-+name = "is_terminal_polyfill"
-+version = "1.70.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
-+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
- 
- [[package]]
- name = "itoa"
--version = "1.0.9"
-+version = "1.0.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
- 
- [[package]]
- name = "jpeg-decoder"
--version = "0.3.0"
-+version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
- 
- [[package]]
- name = "js-sys"
--version = "0.3.64"
-+version = "0.3.69"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
- dependencies = [
-  "wasm-bindgen",
- ]
- 
- [[package]]
- name = "junction"
--version = "1.0.0"
-+version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb"
-+checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa"
- dependencies = [
-  "scopeguard",
-- "winapi",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1788,15 +1972,25 @@ dependencies = [
- 
- [[package]]
- name = "lazy_static"
--version = "1.4.0"
-+version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
- 
- [[package]]
- name = "libc"
--version = "0.2.149"
-+version = "0.2.155"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-+
-+[[package]]
-+name = "libredox"
-+version = "0.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-+dependencies = [
-+ "bitflags 2.6.0",
-+ "libc",
-+]
- 
- [[package]]
- name = "linked-hash-map"
-@@ -1812,15 +2006,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
- 
- [[package]]
- name = "linux-raw-sys"
--version = "0.4.8"
-+version = "0.4.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
-+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
- 
- [[package]]
- name = "lock_api"
--version = "0.4.10"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
- dependencies = [
-  "autocfg",
-  "scopeguard",
-@@ -1828,9 +2022,9 @@ dependencies = [
- 
- [[package]]
- name = "log"
--version = "0.4.20"
-+version = "0.4.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
- dependencies = [
-  "value-bag",
- ]
-@@ -1858,9 +2052,9 @@ dependencies = [
- 
- [[package]]
- name = "memchr"
--version = "2.6.4"
-+version = "2.7.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
- 
- [[package]]
- name = "memmap2"
-@@ -1900,7 +2094,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -1911,9 +2105,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
- 
- [[package]]
- name = "mime_guess"
--version = "2.0.4"
-+version = "2.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
- dependencies = [
-  "mime",
-  "unicase",
-@@ -1927,9 +2121,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
- 
- [[package]]
- name = "miniz_oxide"
--version = "0.7.1"
-+version = "0.7.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
- dependencies = [
-  "adler",
-  "simd-adler32",
-@@ -1937,25 +2131,31 @@ dependencies = [
- 
- [[package]]
- name = "mio"
--version = "0.8.8"
-+version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
-+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
- dependencies = [
-+ "hermit-abi 0.3.9",
-  "libc",
-  "wasi 0.11.0+wasi-snapshot-preview1",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
- name = "mockito"
--version = "1.2.0"
-+version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b"
-+checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d"
- dependencies = [
-  "assert-json-diff",
-+ "bytes 1.7.1",
-  "colored",
-- "futures 0.3.28",
-- "hyper",
-+ "futures-util",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-+ "http-body-util",
-+ "hyper 1.4.1",
-+ "hyper-util",
-  "log",
-  "rand 0.8.5",
-  "regex",
-@@ -1980,7 +2180,7 @@ dependencies = [
-  "console_error_panic_hook",
-  "dashmap",
-  "flate2",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "io_tee",
-  "js-sys",
-  "miette",
-@@ -2004,17 +2204,16 @@ dependencies = [
-  "url",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-- "wasm-streams",
-+ "wasm-streams 0.3.0",
-  "which",
- ]
- 
- [[package]]
- name = "native-tls"
--version = "0.2.11"
-+version = "0.2.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
- dependencies = [
-- "lazy_static",
-  "libc",
-  "log",
-  "openssl",
-@@ -2034,7 +2233,7 @@ dependencies = [
-  "colored",
-  "console_error_panic_hook",
-  "dashmap",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "indexmap 1.9.3",
-  "indicatif",
-  "insta",
-@@ -2102,11 +2301,17 @@ dependencies = [
-  "winapi",
- ]
- 
-+[[package]]
-+name = "num-conv"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-+
- [[package]]
- name = "num-traits"
--version = "0.2.16"
-+version = "0.2.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
-+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
- dependencies = [
-  "autocfg",
- ]
-@@ -2117,7 +2322,7 @@ version = "1.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
- dependencies = [
-- "hermit-abi",
-+ "hermit-abi 0.3.9",
-  "libc",
- ]
- 
-@@ -2129,24 +2334,24 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
- 
- [[package]]
- name = "object"
--version = "0.32.1"
-+version = "0.36.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
-+checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
- dependencies = [
-  "memchr",
- ]
- 
- [[package]]
- name = "once_cell"
--version = "1.18.0"
-+version = "1.19.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
- 
- [[package]]
- name = "open"
--version = "5.0.0"
-+version = "5.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8"
-+checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
- dependencies = [
-  "is-wsl",
-  "libc",
-@@ -2155,11 +2360,11 @@ dependencies = [
- 
- [[package]]
- name = "openssl"
--version = "0.10.57"
-+version = "0.10.66"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
-+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 2.6.0",
-  "cfg-if",
-  "foreign-types",
-  "libc",
-@@ -2176,7 +2381,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -2187,9 +2392,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
- 
- [[package]]
- name = "openssl-sys"
--version = "0.9.93"
-+version = "0.9.103"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
-+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
- dependencies = [
-  "cc",
-  "libc",
-@@ -2204,9 +2409,9 @@ dependencies = [
-  "anyhow",
-  "async-std",
-  "async-trait",
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "chrono",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "http-cache-reqwest",
-  "indexmap 1.9.3",
-  "maplit",
-@@ -2263,7 +2468,7 @@ name = "oro-npm-account"
- version = "0.3.34"
- dependencies = [
-  "async-std",
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "dialoguer",
-  "kdl",
-  "miette",
-@@ -2370,13 +2575,13 @@ dependencies = [
- 
- [[package]]
- name = "os_info"
--version = "3.7.0"
-+version = "3.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
-+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
- dependencies = [
-  "log",
-  "serde",
-- "winapi",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -2393,9 +2598,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
- 
- [[package]]
- name = "parking"
--version = "2.1.1"
-+version = "2.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
-+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
- 
- [[package]]
- name = "parking_lot"
-@@ -2410,12 +2615,12 @@ dependencies = [
- 
- [[package]]
- name = "parking_lot"
--version = "0.12.1"
-+version = "0.12.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
- dependencies = [
-  "lock_api",
-- "parking_lot_core 0.9.8",
-+ "parking_lot_core 0.9.10",
- ]
- 
- [[package]]
-@@ -2434,15 +2639,15 @@ dependencies = [
- 
- [[package]]
- name = "parking_lot_core"
--version = "0.9.8"
-+version = "0.9.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
-+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
- dependencies = [
-  "cfg-if",
-  "libc",
-- "redox_syscall 0.3.5",
-+ "redox_syscall 0.5.3",
-  "smallvec",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -2453,18 +2658,18 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
- 
- [[package]]
- name = "percent-encoding"
--version = "2.3.0"
-+version = "2.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
- 
- [[package]]
- name = "petgraph"
--version = "0.6.4"
-+version = "0.6.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
- dependencies = [
-  "fixedbitset",
-- "indexmap 2.0.2",
-+ "indexmap 2.3.0",
- ]
- 
- [[package]]
-@@ -2475,29 +2680,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
- 
- [[package]]
- name = "pin-project"
--version = "1.1.3"
-+version = "1.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
-+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
- dependencies = [
-  "pin-project-internal",
- ]
- 
- [[package]]
- name = "pin-project-internal"
--version = "1.1.3"
-+version = "1.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
-+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "pin-project-lite"
--version = "0.2.13"
-+version = "0.2.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
- 
- [[package]]
- name = "pin-utils"
-@@ -2507,26 +2712,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
- 
- [[package]]
- name = "piper"
--version = "0.2.1"
-+version = "0.2.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
-+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
- dependencies = [
-  "atomic-waker",
-- "fastrand 2.0.1",
-+ "fastrand 2.1.0",
-  "futures-io",
- ]
- 
- [[package]]
- name = "pkg-config"
--version = "0.3.27"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
- 
- [[package]]
- name = "png"
--version = "0.17.10"
-+version = "0.17.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
-+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
- dependencies = [
-  "bitflags 1.3.2",
-  "crc32fast",
-@@ -2551,6 +2756,21 @@ dependencies = [
-  "windows-sys 0.48.0",
- ]
- 
-+[[package]]
-+name = "polling"
-+version = "3.7.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
-+dependencies = [
-+ "cfg-if",
-+ "concurrent-queue",
-+ "hermit-abi 0.4.0",
-+ "pin-project-lite",
-+ "rustix 0.38.34",
-+ "tracing",
-+ "windows-sys 0.52.0",
-+]
-+
- [[package]]
- name = "poloto"
- version = "17.2.1"
-@@ -2563,15 +2783,24 @@ dependencies = [
- 
- [[package]]
- name = "portable-atomic"
--version = "1.4.3"
-+version = "1.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
-+
-+[[package]]
-+name = "powerfmt"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
-+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
- 
- [[package]]
- name = "ppv-lite86"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
-+dependencies = [
-+ "zerocopy",
-+]
- 
- [[package]]
- name = "pretty_assertions"
-@@ -2583,35 +2812,11 @@ dependencies = [
-  "yansi",
- ]
- 
--[[package]]
--name = "proc-macro-error"
--version = "1.0.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
--dependencies = [
-- "proc-macro-error-attr",
-- "proc-macro2",
-- "quote",
-- "syn 1.0.109",
-- "version_check",
--]
--
--[[package]]
--name = "proc-macro-error-attr"
--version = "1.0.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "version_check",
--]
--
- [[package]]
- name = "proc-macro2"
--version = "1.0.68"
-+version = "1.0.86"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c"
-+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
- dependencies = [
-  "unicode-ident",
- ]
-@@ -2638,9 +2843,9 @@ dependencies = [
- 
- [[package]]
- name = "quote"
--version = "1.0.33"
-+version = "1.0.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
- dependencies = [
-  "proc-macro2",
- ]
-@@ -2710,7 +2915,7 @@ version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
- dependencies = [
-- "getrandom 0.2.10",
-+ "getrandom 0.2.15",
- ]
- 
- [[package]]
-@@ -2739,45 +2944,54 @@ dependencies = [
- 
- [[package]]
- name = "redox_syscall"
--version = "0.3.5"
-+version = "0.4.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
- dependencies = [
-  "bitflags 1.3.2",
- ]
- 
-+[[package]]
-+name = "redox_syscall"
-+version = "0.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
-+dependencies = [
-+ "bitflags 2.6.0",
-+]
-+
- [[package]]
- name = "redox_users"
--version = "0.4.3"
-+version = "0.4.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
- dependencies = [
-- "getrandom 0.2.10",
-- "redox_syscall 0.2.16",
-+ "getrandom 0.2.15",
-+ "libredox",
-  "thiserror",
- ]
- 
- [[package]]
- name = "reflink-copy"
--version = "0.1.9"
-+version = "0.1.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d7e3e017e993f86feeddf8a7fb609ca49f89082309e328e27aefd4a25bb317a4"
-+checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6"
- dependencies = [
-  "cfg-if",
-- "ioctl-sys",
-- "windows 0.51.1",
-+ "rustix 0.38.34",
-+ "windows",
- ]
- 
- [[package]]
- name = "regex"
--version = "1.9.6"
-+version = "1.10.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
-+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-- "regex-automata 0.3.9",
-- "regex-syntax 0.7.5",
-+ "regex-automata 0.4.7",
-+ "regex-syntax 0.8.4",
- ]
- 
- [[package]]
-@@ -2791,13 +3005,13 @@ dependencies = [
- 
- [[package]]
- name = "regex-automata"
--version = "0.3.9"
-+version = "0.4.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
-+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-- "regex-syntax 0.7.5",
-+ "regex-syntax 0.8.4",
- ]
- 
- [[package]]
-@@ -2808,35 +3022,35 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
- 
- [[package]]
- name = "regex-syntax"
--version = "0.7.5"
-+version = "0.8.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
- 
- [[package]]
- name = "rend"
--version = "0.4.1"
-+version = "0.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
-+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
- dependencies = [
-  "bytecheck",
- ]
- 
- [[package]]
- name = "reqwest"
--version = "0.11.22"
-+version = "0.11.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
-+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
- dependencies = [
-- "async-compression 0.4.3",
-- "base64 0.21.4",
-- "bytes 1.5.0",
-+ "async-compression 0.4.12",
-+ "base64 0.21.7",
-+ "bytes 1.7.1",
-  "encoding_rs",
-  "futures-core",
-  "futures-util",
-- "h2",
-- "http",
-- "http-body",
-- "hyper",
-+ "h2 0.3.26",
-+ "http 0.2.12",
-+ "http-body 0.4.6",
-+ "hyper 0.14.30",
-  "hyper-tls",
-  "ipnet",
-  "js-sys",
-@@ -2847,9 +3061,11 @@ dependencies = [
-  "once_cell",
-  "percent-encoding",
-  "pin-project-lite",
-+ "rustls-pemfile",
-  "serde",
-  "serde_json",
-  "serde_urlencoded",
-+ "sync_wrapper",
-  "system-configuration",
-  "tokio",
-  "tokio-native-tls",
-@@ -2858,7 +3074,7 @@ dependencies = [
-  "url",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-- "wasm-streams",
-+ "wasm-streams 0.4.0",
-  "web-sys",
-  "winreg 0.50.0",
- ]
-@@ -2871,7 +3087,7 @@ checksum = "4531c89d50effe1fac90d095c8b133c20c5c714204feee0bfc3fd158e784209d"
- dependencies = [
-  "anyhow",
-  "async-trait",
-- "http",
-+ "http 0.2.12",
-  "reqwest",
-  "serde",
-  "task-local-extensions",
-@@ -2887,10 +3103,10 @@ dependencies = [
-  "anyhow",
-  "async-trait",
-  "chrono",
-- "futures 0.3.28",
-- "getrandom 0.2.10",
-- "http",
-- "hyper",
-+ "futures 0.3.30",
-+ "getrandom 0.2.15",
-+ "http 0.2.12",
-+ "hyper 0.14.30",
-  "parking_lot 0.11.2",
-  "reqwest",
-  "reqwest-middleware",
-@@ -2939,21 +3155,22 @@ dependencies = [
- 
- [[package]]
- name = "rgb"
--version = "0.8.36"
-+version = "0.8.45"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-+checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
- dependencies = [
-  "bytemuck",
- ]
- 
- [[package]]
- name = "rkyv"
--version = "0.7.42"
-+version = "0.7.44"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58"
-+checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
- dependencies = [
-  "bitvec",
-  "bytecheck",
-+ "bytes 1.7.1",
-  "hashbrown 0.12.3",
-  "ptr_meta",
-  "rend",
-@@ -2965,9 +3182,9 @@ dependencies = [
- 
- [[package]]
- name = "rkyv_derive"
--version = "0.7.42"
-+version = "0.7.44"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d"
-+checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -2981,7 +3198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
- dependencies = [
-  "log",
-- "roxmltree",
-+ "roxmltree 0.18.1",
-  "simplecss",
-  "siphasher",
-  "svgtypes 0.9.0",
-@@ -2996,11 +3213,17 @@ dependencies = [
-  "xmlparser",
- ]
- 
-+[[package]]
-+name = "roxmltree"
-+version = "0.20.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-+
- [[package]]
- name = "rustc-demangle"
--version = "0.1.23"
-+version = "0.1.24"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
- 
- [[package]]
- name = "rustc_version"
-@@ -3013,9 +3236,9 @@ dependencies = [
- 
- [[package]]
- name = "rustix"
--version = "0.37.24"
-+version = "0.37.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d"
-+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
- dependencies = [
-  "bitflags 1.3.2",
-  "errno",
-@@ -3027,15 +3250,24 @@ dependencies = [
- 
- [[package]]
- name = "rustix"
--version = "0.38.17"
-+version = "0.38.34"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
-+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 2.6.0",
-  "errno",
-  "libc",
-- "linux-raw-sys 0.4.8",
-- "windows-sys 0.48.0",
-+ "linux-raw-sys 0.4.14",
-+ "windows-sys 0.52.0",
-+]
-+
-+[[package]]
-+name = "rustls-pemfile"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-+dependencies = [
-+ "base64 0.21.7",
- ]
- 
- [[package]]
-@@ -3056,9 +3288,9 @@ dependencies = [
- 
- [[package]]
- name = "ryu"
--version = "1.0.15"
-+version = "1.0.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
- 
- [[package]]
- name = "same-file"
-@@ -3071,11 +3303,11 @@ dependencies = [
- 
- [[package]]
- name = "schannel"
--version = "0.1.22"
-+version = "0.1.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
-+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
- dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3092,11 +3324,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
- 
- [[package]]
- name = "security-framework"
--version = "2.9.2"
-+version = "2.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
-+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
- dependencies = [
-- "bitflags 1.3.2",
-+ "bitflags 2.6.0",
-  "core-foundation",
-  "core-foundation-sys",
-  "libc",
-@@ -3105,9 +3337,9 @@ dependencies = [
- 
- [[package]]
- name = "security-framework-sys"
--version = "2.9.1"
-+version = "2.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
-+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
- dependencies = [
-  "core-foundation-sys",
-  "libc",
-@@ -3115,15 +3347,15 @@ dependencies = [
- 
- [[package]]
- name = "semver"
--version = "1.0.19"
-+version = "1.0.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
-+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
- 
- [[package]]
- name = "sentry"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
-+checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
- dependencies = [
-  "httpdate",
-  "native-tls",
-@@ -3140,9 +3372,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-backtrace"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
-+checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
- dependencies = [
-  "backtrace",
-  "once_cell",
-@@ -3152,9 +3384,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-contexts"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
-+checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
- dependencies = [
-  "hostname",
-  "libc",
-@@ -3166,9 +3398,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-core"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
-+checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
- dependencies = [
-  "once_cell",
-  "rand 0.8.5",
-@@ -3179,9 +3411,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-debug-images"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd"
-+checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
- dependencies = [
-  "findshlibs",
-  "once_cell",
-@@ -3190,9 +3422,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-panic"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa"
-+checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
- dependencies = [
-  "sentry-backtrace",
-  "sentry-core",
-@@ -3200,9 +3432,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-tracing"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
-+checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
- dependencies = [
-  "sentry-backtrace",
-  "sentry-core",
-@@ -3212,9 +3444,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-types"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
-+checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
- dependencies = [
-  "debugid",
-  "hex",
-@@ -3229,9 +3461,9 @@ dependencies = [
- 
- [[package]]
- name = "serde"
--version = "1.0.188"
-+version = "1.0.204"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
-+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
- dependencies = [
-  "serde_derive",
- ]
-@@ -3260,13 +3492,13 @@ dependencies = [
- 
- [[package]]
- name = "serde_derive"
--version = "1.0.188"
-+version = "1.0.204"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
-+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -3277,17 +3509,18 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "serde_json"
--version = "1.0.107"
-+version = "1.0.122"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
-+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
- dependencies = [
-- "indexmap 2.0.2",
-+ "indexmap 2.3.0",
-  "itoa",
-+ "memchr",
-  "ryu",
-  "serde",
- ]
-@@ -3363,21 +3596,11 @@ version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
- 
--[[package]]
--name = "signal-hook"
--version = "0.3.17"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
--dependencies = [
-- "libc",
-- "signal-hook-registry",
--]
--
- [[package]]
- name = "signal-hook-registry"
--version = "1.4.1"
-+version = "1.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
- dependencies = [
-  "libc",
- ]
-@@ -3396,9 +3619,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
- 
- [[package]]
- name = "similar"
--version = "2.2.1"
-+version = "2.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
-+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
- 
- [[package]]
- name = "simplecss"
-@@ -3426,9 +3649,9 @@ dependencies = [
- 
- [[package]]
- name = "smallvec"
--version = "1.11.1"
-+version = "1.13.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
-+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
- 
- [[package]]
- name = "smawk"
-@@ -3438,9 +3661,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
- 
- [[package]]
- name = "socket2"
--version = "0.4.9"
-+version = "0.4.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
- dependencies = [
-  "libc",
-  "winapi",
-@@ -3448,12 +3671,12 @@ dependencies = [
- 
- [[package]]
- name = "socket2"
--version = "0.5.4"
-+version = "0.5.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
-+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
- dependencies = [
-  "libc",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3462,7 +3685,7 @@ version = "9.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
- dependencies = [
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "digest",
-  "hex",
-  "miette",
-@@ -3488,6 +3711,12 @@ version = "0.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
- 
-+[[package]]
-+name = "strsim"
-+version = "0.11.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-+
- [[package]]
- name = "supports-color"
- version = "2.1.0"
-@@ -3509,9 +3738,9 @@ dependencies = [
- 
- [[package]]
- name = "supports-unicode"
--version = "2.0.0"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7"
-+checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a"
- dependencies = [
-  "is-terminal",
- ]
-@@ -3559,15 +3788,21 @@ dependencies = [
- 
- [[package]]
- name = "syn"
--version = "2.0.38"
-+version = "2.0.72"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
-+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
- dependencies = [
-  "proc-macro2",
-  "quote",
-  "unicode-ident",
- ]
- 
-+[[package]]
-+name = "sync_wrapper"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-+
- [[package]]
- name = "system-configuration"
- version = "0.5.1"
-@@ -3597,13 +3832,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
- 
- [[package]]
- name = "tar"
--version = "0.4.40"
-+version = "0.4.41"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
- dependencies = [
-  "filetime",
-  "libc",
-- "xattr 1.0.1",
-+ "xattr 1.3.1",
- ]
- 
- [[package]]
-@@ -3617,15 +3852,14 @@ dependencies = [
- 
- [[package]]
- name = "tempfile"
--version = "3.8.0"
-+version = "3.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
-+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
- dependencies = [
-  "cfg-if",
-- "fastrand 2.0.1",
-- "redox_syscall 0.3.5",
-- "rustix 0.38.17",
-- "windows-sys 0.48.0",
-+ "fastrand 2.1.0",
-+ "rustix 0.38.34",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3659,36 +3893,34 @@ dependencies = [
- 
- [[package]]
- name = "test-case"
--version = "3.2.1"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425"
-+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
- dependencies = [
-  "test-case-macros",
- ]
- 
- [[package]]
- name = "test-case-core"
--version = "3.2.1"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462"
-+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
- dependencies = [
-  "cfg-if",
-- "proc-macro-error",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "test-case-macros"
--version = "3.2.1"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257"
-+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
- dependencies = [
-- "proc-macro-error",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
-  "test-case-core",
- ]
- 
-@@ -3705,29 +3937,29 @@ dependencies = [
- 
- [[package]]
- name = "thiserror"
--version = "1.0.49"
-+version = "1.0.63"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
-+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
- dependencies = [
-  "thiserror-impl",
- ]
- 
- [[package]]
- name = "thiserror-impl"
--version = "1.0.49"
-+version = "1.0.63"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
-+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "thread_local"
--version = "1.1.7"
-+version = "1.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
- dependencies = [
-  "cfg-if",
-  "once_cell",
-@@ -3735,12 +3967,14 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.29"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-+ "num-conv",
-+ "powerfmt",
-  "serde",
-  "time-core",
-  "time-macros",
-@@ -3754,10 +3988,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.15"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-+ "num-conv",
-  "time-core",
- ]
- 
-@@ -3788,9 +4023,9 @@ dependencies = [
- 
- [[package]]
- name = "tinyvec"
--version = "1.6.0"
-+version = "1.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
- dependencies = [
-  "tinyvec_macros",
- ]
-@@ -3803,21 +4038,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
- 
- [[package]]
- name = "tokio"
--version = "1.32.0"
-+version = "1.39.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
-+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
- dependencies = [
-  "backtrace",
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "libc",
-  "mio",
-- "num_cpus",
-- "parking_lot 0.12.1",
-+ "parking_lot 0.12.3",
-  "pin-project-lite",
-- "signal-hook-registry",
-- "socket2 0.5.4",
-- "tokio-macros",
-- "windows-sys 0.48.0",
-+ "socket2 0.5.7",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3831,17 +4063,6 @@ dependencies = [
-  "log",
- ]
- 
--[[package]]
--name = "tokio-macros"
--version = "2.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn 2.0.38",
--]
--
- [[package]]
- name = "tokio-native-tls"
- version = "0.3.1"
-@@ -3854,16 +4075,15 @@ dependencies = [
- 
- [[package]]
- name = "tokio-util"
--version = "0.7.9"
-+version = "0.7.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
-+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "futures-core",
-  "futures-sink",
-  "pin-project-lite",
-  "tokio",
-- "tracing",
- ]
- 
- [[package]]
-@@ -3883,11 +4103,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
- 
- [[package]]
- name = "tracing"
--version = "0.1.37"
-+version = "0.1.40"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
- dependencies = [
-- "cfg-if",
-  "pin-project-lite",
-  "tracing-attributes",
-  "tracing-core",
-@@ -3895,31 +4114,32 @@ dependencies = [
- 
- [[package]]
- name = "tracing-appender"
--version = "0.2.2"
-+version = "0.2.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
-+checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
- dependencies = [
-  "crossbeam-channel",
-+ "thiserror",
-  "time",
-  "tracing-subscriber",
- ]
- 
- [[package]]
- name = "tracing-attributes"
--version = "0.1.26"
-+version = "0.1.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "tracing-core"
--version = "0.1.31"
-+version = "0.1.32"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
- dependencies = [
-  "once_cell",
-  "valuable",
-@@ -3927,9 +4147,9 @@ dependencies = [
- 
- [[package]]
- name = "tracing-indicatif"
--version = "0.3.5"
-+version = "0.3.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8"
-+checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d"
- dependencies = [
-  "indicatif",
-  "tracing",
-@@ -3939,20 +4159,20 @@ dependencies = [
- 
- [[package]]
- name = "tracing-log"
--version = "0.1.3"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
- dependencies = [
-- "lazy_static",
-  "log",
-+ "once_cell",
-  "tracing-core",
- ]
- 
- [[package]]
- name = "tracing-subscriber"
--version = "0.3.17"
-+version = "0.3.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
- dependencies = [
-  "matchers",
-  "nu-ansi-term",
-@@ -3968,9 +4188,9 @@ dependencies = [
- 
- [[package]]
- name = "try-lock"
--version = "0.2.4"
-+version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
- 
- [[package]]
- name = "tsify"
-@@ -3993,7 +4213,7 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "serde_derive_internals",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -4028,9 +4248,9 @@ dependencies = [
- 
- [[package]]
- name = "unicode-bidi"
--version = "0.3.13"
-+version = "0.3.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
- 
- [[package]]
- name = "unicode-bidi-mirroring"
-@@ -4064,18 +4284,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
- 
- [[package]]
- name = "unicode-normalization"
--version = "0.1.22"
-+version = "0.1.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
- dependencies = [
-  "tinyvec",
- ]
- 
- [[package]]
- name = "unicode-script"
--version = "0.5.5"
-+version = "0.5.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
-+checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
- 
- [[package]]
- name = "unicode-vo"
-@@ -4085,17 +4305,17 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
- 
- [[package]]
- name = "unicode-width"
--version = "0.1.11"
-+version = "0.1.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
- 
- [[package]]
- name = "ureq"
--version = "2.8.0"
-+version = "2.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
-+checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
- dependencies = [
-- "base64 0.21.4",
-+ "base64 0.22.1",
-  "log",
-  "native-tls",
-  "once_cell",
-@@ -4104,9 +4324,9 @@ dependencies = [
- 
- [[package]]
- name = "url"
--version = "2.4.1"
-+version = "2.5.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
-+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
- dependencies = [
-  "form_urlencoded",
-  "idna",
-@@ -4120,7 +4340,7 @@ version = "0.29.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
- dependencies = [
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "data-url",
-  "flate2",
-  "imagesize",
-@@ -4149,15 +4369,15 @@ dependencies = [
- 
- [[package]]
- name = "utf8parse"
--version = "0.2.1"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
- 
- [[package]]
- name = "uuid"
--version = "1.4.1"
-+version = "1.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
-+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
- dependencies = [
-  "serde",
- ]
-@@ -4170,9 +4390,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
- 
- [[package]]
- name = "value-bag"
--version = "1.4.1"
-+version = "1.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
-+checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
- 
- [[package]]
- name = "vcpkg"
-@@ -4182,9 +4402,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
- 
- [[package]]
- name = "version_check"
--version = "0.9.4"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
- 
- [[package]]
- name = "vswhom"
-@@ -4231,9 +4451,9 @@ dependencies = [
- 
- [[package]]
- name = "vte_generate_state_changes"
--version = "0.1.1"
-+version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
-+checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -4241,15 +4461,15 @@ dependencies = [
- 
- [[package]]
- name = "waker-fn"
--version = "1.1.1"
-+version = "1.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
-+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
- 
- [[package]]
- name = "walkdir"
--version = "2.4.0"
-+version = "2.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
-+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
- dependencies = [
-  "same-file",
-  "winapi-util",
-@@ -4278,9 +4498,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
- 
- [[package]]
- name = "wasm-bindgen"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
- dependencies = [
-  "cfg-if",
-  "wasm-bindgen-macro",
-@@ -4288,24 +4508,24 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-backend"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
- dependencies = [
-  "bumpalo",
-  "log",
-  "once_cell",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
-  "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-futures"
--version = "0.4.37"
-+version = "0.4.42"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
-+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -4315,9 +4535,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
- dependencies = [
-  "quote",
-  "wasm-bindgen-macro-support",
-@@ -4325,22 +4545,22 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro-support"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
-  "wasm-bindgen-backend",
-  "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-shared"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
- 
- [[package]]
- name = "wasm-streams"
-@@ -4355,13 +4575,26 @@ dependencies = [
-  "web-sys",
- ]
- 
-+[[package]]
-+name = "wasm-streams"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-+dependencies = [
-+ "futures-util",
-+ "js-sys",
-+ "wasm-bindgen",
-+ "wasm-bindgen-futures",
-+ "web-sys",
-+]
-+
- [[package]]
- name = "wasm-timer"
- version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
- dependencies = [
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "js-sys",
-  "parking_lot 0.11.2",
-  "pin-utils",
-@@ -4372,9 +4605,9 @@ dependencies = [
- 
- [[package]]
- name = "web-sys"
--version = "0.3.64"
-+version = "0.3.69"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
- dependencies = [
-  "js-sys",
-  "wasm-bindgen",
-@@ -4382,9 +4615,9 @@ dependencies = [
- 
- [[package]]
- name = "weezl"
--version = "0.1.7"
-+version = "0.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
- 
- [[package]]
- name = "which"
-@@ -4395,7 +4628,7 @@ dependencies = [
-  "either",
-  "home",
-  "once_cell",
-- "rustix 0.38.17",
-+ "rustix 0.38.34",
- ]
- 
- [[package]]
-@@ -4416,11 +4649,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
- 
- [[package]]
- name = "winapi-util"
--version = "0.1.6"
-+version = "0.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
- dependencies = [
-- "winapi",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -4431,39 +4664,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
- 
- [[package]]
- name = "windows"
--version = "0.48.0"
-+version = "0.58.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
- dependencies = [
-- "windows-targets 0.48.5",
-+ "windows-core 0.58.0",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
--name = "windows"
--version = "0.51.1"
-+name = "windows-core"
-+version = "0.52.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
- dependencies = [
-- "windows-core",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
- name = "windows-core"
--version = "0.51.1"
-+version = "0.58.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
- dependencies = [
-- "windows-targets 0.48.5",
-+ "windows-implement",
-+ "windows-interface",
-+ "windows-result",
-+ "windows-strings",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
--name = "windows-sys"
--version = "0.45.0"
-+name = "windows-implement"
-+version = "0.58.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.72",
-+]
-+
-+[[package]]
-+name = "windows-interface"
-+version = "0.58.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.72",
-+]
-+
-+[[package]]
-+name = "windows-result"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
- dependencies = [
-- "windows-targets 0.42.2",
-+ "windows-targets 0.52.6",
-+]
-+
-+[[package]]
-+name = "windows-strings"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-+dependencies = [
-+ "windows-result",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -4476,18 +4745,12 @@ dependencies = [
- ]
- 
- [[package]]
--name = "windows-targets"
--version = "0.42.2"
-+name = "windows-sys"
-+version = "0.52.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
- dependencies = [
-- "windows_aarch64_gnullvm 0.42.2",
-- "windows_aarch64_msvc 0.42.2",
-- "windows_i686_gnu 0.42.2",
-- "windows_i686_msvc 0.42.2",
-- "windows_x86_64_gnu 0.42.2",
-- "windows_x86_64_gnullvm 0.42.2",
-- "windows_x86_64_msvc 0.42.2",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -4506,10 +4769,20 @@ dependencies = [
- ]
- 
- [[package]]
--name = "windows_aarch64_gnullvm"
--version = "0.42.2"
-+name = "windows-targets"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-+dependencies = [
-+ "windows_aarch64_gnullvm 0.52.6",
-+ "windows_aarch64_msvc 0.52.6",
-+ "windows_i686_gnu 0.52.6",
-+ "windows_i686_gnullvm",
-+ "windows_i686_msvc 0.52.6",
-+ "windows_x86_64_gnu 0.52.6",
-+ "windows_x86_64_gnullvm 0.52.6",
-+ "windows_x86_64_msvc 0.52.6",
-+]
- 
- [[package]]
- name = "windows_aarch64_gnullvm"
-@@ -4518,10 +4791,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
- 
- [[package]]
--name = "windows_aarch64_msvc"
--version = "0.42.2"
-+name = "windows_aarch64_gnullvm"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
- 
- [[package]]
- name = "windows_aarch64_msvc"
-@@ -4530,10 +4803,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
- 
- [[package]]
--name = "windows_i686_gnu"
--version = "0.42.2"
-+name = "windows_aarch64_msvc"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
- 
- [[package]]
- name = "windows_i686_gnu"
-@@ -4542,10 +4815,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
- 
- [[package]]
--name = "windows_i686_msvc"
--version = "0.42.2"
-+name = "windows_i686_gnu"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-+
-+[[package]]
-+name = "windows_i686_gnullvm"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
- 
- [[package]]
- name = "windows_i686_msvc"
-@@ -4554,10 +4833,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
- 
- [[package]]
--name = "windows_x86_64_gnu"
--version = "0.42.2"
-+name = "windows_i686_msvc"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
- 
- [[package]]
- name = "windows_x86_64_gnu"
-@@ -4566,10 +4845,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
- 
- [[package]]
--name = "windows_x86_64_gnullvm"
--version = "0.42.2"
-+name = "windows_x86_64_gnu"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
- 
- [[package]]
- name = "windows_x86_64_gnullvm"
-@@ -4578,10 +4857,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
- 
- [[package]]
--name = "windows_x86_64_msvc"
--version = "0.42.2"
-+name = "windows_x86_64_gnullvm"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
- 
- [[package]]
- name = "windows_x86_64_msvc"
-@@ -4589,6 +4868,12 @@ version = "0.48.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
- 
-+[[package]]
-+name = "windows_x86_64_msvc"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-+
- [[package]]
- name = "winreg"
- version = "0.10.1"
-@@ -4610,18 +4895,18 @@ dependencies = [
- 
- [[package]]
- name = "wiremock"
--version = "0.5.19"
-+version = "0.5.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d"
-+checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9"
- dependencies = [
-  "assert-json-diff",
-  "async-trait",
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "deadpool",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "futures-timer",
-  "http-types",
-- "hyper",
-+ "hyper 0.14.30",
-  "log",
-  "once_cell",
-  "regex",
-@@ -4650,11 +4935,13 @@ dependencies = [
- 
- [[package]]
- name = "xattr"
--version = "1.0.1"
-+version = "1.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
-+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
- dependencies = [
-  "libc",
-+ "linux-raw-sys 0.4.14",
-+ "rustix 0.38.34",
- ]
- 
- [[package]]
-@@ -4665,27 +4952,39 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
- 
- [[package]]
- name = "xxhash-rust"
--version = "0.8.7"
-+version = "0.8.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
-+checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
- 
- [[package]]
--name = "yaml-rust"
--version = "0.4.5"
-+name = "yansi"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-+
-+[[package]]
-+name = "zerocopy"
-+version = "0.6.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
- dependencies = [
-- "linked-hash-map",
-+ "byteorder",
-+ "zerocopy-derive",
- ]
- 
- [[package]]
--name = "yansi"
--version = "0.5.1"
-+name = "zerocopy-derive"
-+version = "0.6.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.72",
-+]
- 
- [[package]]
- name = "zeroize"
--version = "1.6.0"
-+version = "1.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
-+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
index 97f005210d66..5670e6bf3e12 100644
--- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
+++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
@@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz
     ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz
     ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   SourceRoot = "${finalAttrs.src.name}/Build";
diff --git a/pkgs/by-name/or/orz/package.nix b/pkgs/by-name/or/orz/package.nix
index 42832112ec1f..365ea3f22b91 100644
--- a/pkgs/by-name/or/orz/package.nix
+++ b/pkgs/by-name/or/orz/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage {
     description = "High performance, general purpose data compressor written in rust";
     homepage = "https://github.com/richox/orz";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "orz";
   };
 }
diff --git a/pkgs/by-name/os/osdlyrics/package.nix b/pkgs/by-name/os/osdlyrics/package.nix
index d470003be751..58a5dddd9127 100644
--- a/pkgs/by-name/os/osdlyrics/package.nix
+++ b/pkgs/by-name/os/osdlyrics/package.nix
@@ -4,8 +4,10 @@
   fetchFromGitHub,
 
   autoreconfHook,
-  pkg-config,
+  gobject-introspection,
   intltool,
+  pkg-config,
+  wrapGAppsNoGuiHook,
 
   glib,
   gtk2,
@@ -29,8 +31,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
-    pkg-config
+    gobject-introspection
     intltool
+    pkg-config
+    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [
@@ -50,6 +54,8 @@ stdenv.mkDerivation rec {
     ))
   ];
 
+  dontWrapGApps = true;
+
   postFixup = ''
     extractExecLine() {
       serviceFile=$1
@@ -75,6 +81,7 @@ stdenv.mkDerivation rec {
 
     for p in "$out/bin/osdlyrics-create-lyricsource" "$out/bin/osdlyrics-daemon" "$out/libexec/osdlyrics"/*; do
       wrapProgram "$p" \
+        ''${gappsWrapperArgs[@]} \
         --prefix PYTHONPATH : "$out/${python3.sitePackages}"
     done
   '';
diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix
index 57257882b810..8cd51e0149fe 100644
--- a/pkgs/by-name/os/osmid/package.nix
+++ b/pkgs/by-name/os/osmid/package.nix
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw";
   };
 
+  postPatch = ''
+    # replace deprecated cmake version that are no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required (VERSION 3.10)"
+    substituteInPlace external_libs/oscpack_1_1_0/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 5a25b604eda8..82f8a239f51f 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "osmo-bsc";
-  version = "1.13.2";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
     rev = version;
-    hash = "sha256-YSCbVqELh/id9sK4G5xF8riYXhwFtXU/lXMlH6XxvXY=";
+    hash = "sha256-2Go+93h1Z4FV9sESfjwCaee1m4jUq2eO8fxlZAwZVfM=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index ce24dceb1e04..0f697eaf9f97 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.912.0";
+  version = "2025.1029.1";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-wGThpn4Yb3t02MYrn1Sg8S48ak6n09T1vPSpF5zEx7E=";
+        hash = "sha256-Asqz0jiiHTtLcBzvibNzlaRe0jAop5YU4gmooZf/8gw=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-OWqCqAQx1e6TsVdvOezF3gvZ06tXFIEfNMb5LA4mf5s=";
+        hash = "sha256-2ZAZ3CnYz/6VJxqpDNvx6jGcNV/9oo8Eb5/GkSidiv0=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-73UY3RJp0pFfbxRWX8qSnLeoZB/BRGtucmQClJP7Qwg=";
+        hash = "sha256-lx+RN20sPiG++pLS0gW6ixIYw3+g1KGCMrAhgW+yZIw=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");
diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index dc23860559ae..712ff49146d1 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -571,23 +571,23 @@
   },
   {
     "pname": "OpenTabletDriver",
-    "version": "0.6.5.1",
-    "hash": "sha256-/awjEXQ2F8Zoj/2xZJnSg8pBP6hN0zet0lycALfjVoM="
+    "version": "0.6.6.2",
+    "hash": "sha256-y8qI1EPIxKky0M4wDwvo0EEnkXGKNa5bmclPlQGvCBY="
   },
   {
     "pname": "OpenTabletDriver.Configurations",
-    "version": "0.6.5.1",
-    "hash": "sha256-4NFcoDlDrNKnaV+Vz6nGKGhZzxPB6ykEAiauHrDRfGU="
+    "version": "0.6.6.2",
+    "hash": "sha256-tsVq8FRk472eqMhRjyxDZlu8R0M4x7IyLcBVFnDLpF8="
   },
   {
     "pname": "OpenTabletDriver.Native",
-    "version": "0.6.5.1",
-    "hash": "sha256-04Oh5wYEj1qRq6RIoSM9bDTzwFKJS3LKo9d25FAyseI="
+    "version": "0.6.6.2",
+    "hash": "sha256-okPhvAieIc+4ojQK9vd9kWQcAIXhcKZBl5D3eJ4gQxc="
   },
   {
     "pname": "OpenTabletDriver.Plugin",
-    "version": "0.6.5.1",
-    "hash": "sha256-9N8+hq2ZoAiZlU6pk214zu3e4l50s40bgYUK3Aw7w7k="
+    "version": "0.6.6.2",
+    "hash": "sha256-EcrM+3NeTrPnIhNGPqNm2LzUTxdDGRC1BwyaCYlrUYE="
   },
   {
     "pname": "PolySharp",
@@ -626,8 +626,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.908.0",
-    "hash": "sha256-ywGPEtZqgeqgG7LJ459FfRy+JtCw9zChuYUHHY4QIcU="
+    "version": "2025.1028.0",
+    "hash": "sha256-np5O4DOajO/UB2ihWUYYo81q+he4HWG1AAtn/P5rFgw="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -641,8 +641,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.911.0",
-    "hash": "sha256-N7CPME+A+tPpojOe7HN7Vz49VwtcmRKCJK4IIdY0kFs="
+    "version": "2025.1006.0",
+    "hash": "sha256-ZHwi8l8JVu+wTEtAkgoLSFmt8z8vVJIIsTR29gRbrCA="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -656,8 +656,8 @@
   },
   {
     "pname": "ppy.SDL3-CS",
-    "version": "2025.828.0",
-    "hash": "sha256-3+ShJIv4TJuzPAIF7uiwOXVyb+5EpCAuIz1Ff0dPdhA="
+    "version": "2025.920.0",
+    "hash": "sha256-gNy0f95tR3hXkagzLH/mngGSsDA7UqIMKYyTf00nsCI="
   },
   {
     "pname": "ppy.Veldrid",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 770591ef0b44..523924e1cd2a 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.912.0";
+  version = "2025.1029.1";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-OpFiqGldVK0GpIlNopRhbFzb6tOvKnLr/zQeQvWPgmA=";
+    hash = "sha256-zIeeZVyI//uTZDH3i7FyuKRDDRcVRaT/43/4F5/Lamw=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index 4f5c2f0635f8..c1d02e136d59 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     tag = "v${version}";
-    hash = "sha256-YdtTF1u5uyXERRZXidumBFoWq4yA5L7cwIaoYJ4ktSM=";
+    hash = "sha256-8ossrNtZgxvzbTLLeELd5ODk3VuIcrC+aIavPzEDQqs=";
   };
 
-  vendorHash = "sha256-/+VtmLnceOzcqWvpBnihtsAf9Q4x/56Zk6UjjejzWHQ=";
+  vendorHash = "sha256-SiWQL33DZcg3H3ECXI+7RJQ1IxrrAmSTRUWPL0m2hcc=";
 
   subPackages = [
     "cmd/osv-scanner"
diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix
index b2fb21c6f830..5febf925ebfc 100644
--- a/pkgs/by-name/ot/otb/package.nix
+++ b/pkgs/by-name/ot/otb/package.nix
@@ -59,7 +59,7 @@ let
     # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2454#note_112821
     "fftw"
   ];
-  itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove;
+  itkIsInDepsToRemove = dep: builtins.elem dep.name itkDepsToRemove;
 
   # remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451
   otbSwig = swig.overrideAttrs (oldArgs: {
@@ -95,6 +95,11 @@ let
       })
     ];
 
+    postPatch = ''
+      substituteInPlace Modules/ThirdParty/KWSys/src/KWSys/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)'
+    '';
+
     # fix the CMake config files for ITK which contains double slashes
     postInstall = (oldArgs.postInstall or "") + ''
       sed -i 's|''${ITK_INSTALL_PREFIX}//nix/store|/nix/store|g' $out/lib/cmake/ITK-${itkMajorMinorVersion}/ITKConfig.cmake
diff --git a/pkgs/by-name/ot/oterm/package.nix b/pkgs/by-name/ot/oterm/package.nix
index d7f2bc809bb5..395807daf684 100644
--- a/pkgs/by-name/ot/oterm/package.nix
+++ b/pkgs/by-name/ot/oterm/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "oterm";
-  version = "0.14.5";
+  version = "0.14.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ggozad";
     repo = "oterm";
     tag = version;
-    hash = "sha256-g1ko9xpZ5OUK8isp/FE/1Ye9IjO4QpAoTbLTGwnpenY=";
+    hash = "sha256-Awixn456RGMNfyhPN1rEzyptzUW6AEkxBKgIk5c8kIc=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/by-name/ot/otto-matic/package.nix b/pkgs/by-name/ot/otto-matic/package.nix
index 08595f76dce6..87714af175f8 100644
--- a/pkgs/by-name/ot/otto-matic/package.nix
+++ b/pkgs/by-name/ot/otto-matic/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "OttoMatic";
-  version = "4.0.1-unstable-2025-04-27";
+  version = "4.0.1-unstable-2025-09-28";
 
   src = fetchFromGitHub {
     owner = "jorio";
     repo = "OttoMatic";
-    rev = "69f0111d1768abe56498bf8121f0f9cbc85aedd3";
-    hash = "sha256-7RpEVL3tNhEhkZYVjgsI6S+CQfyiz/ukroldrtohA4k=";
+    rev = "636056a92c1f276a5af5c3dc7df5c3cb952fd47a";
+    hash = "sha256-nSLa/g1irZY9uU7lZkeT9C0iNPgBuD5wm1AxIrIzG54=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 432c67983a37..d897807c8fee 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ] ++ lib.optionals enableUnfree [ unfreeRedistributable ];
     maintainers = with lib.maintainers; [
-      figsoda
       psibi
       krovuxdev
     ];
diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index 6d5668124ee4..cd534d4a0dbc 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "ov";
-  version = "0.44.0";
+  version = "0.45.1";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "ov";
     tag = "v${version}";
-    hash = "sha256-GsOxN+Ya90PeGdICbghj/eFJK7gOLAG/Bk0/zoStxgQ=";
+    hash = "sha256-Ptzlz+9mBKSPmogT4PVnimHw/wsQMQpfPo8MX1AocdM=";
   };
 
-  vendorHash = "sha256-faJjRFtnl7KdCAe+nFE793+cejQggauhJtvKdt9IRvY=";
+  vendorHash = "sha256-iAwlD6G+80Ci9pGANqbcmVjoRto7FMBSSDKsI6lpv/k=";
 
   ldflags = [
     "-s"
@@ -75,7 +75,6 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       farcaller
-      figsoda
     ];
     mainProgram = "ov";
   };
diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index c569726798c4..34b55bae114d 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "overskride";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "kaii-lb";
     repo = "overskride";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eMT0wNTpW75V08rmwFtU6NkmZ4auiujzYgbcktewNcI=";
+    hash = "sha256-snyVSQG4eXAW8gIw9ryowTlLbrGo+2y+b4mEQ9ZEBzE=";
   };
 
-  cargoHash = "sha256-Axeywo7Ryig84rS/6MXl2v9Pe3yzdivq7/l/mfi5mOA=";
+  cargoHash = "sha256-AVdo6HPdCvitynqtWZEJMHF5UZpy9ZX6z4SqoqgyOTA=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 23c18565c499..fe4888375a97 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -33,13 +33,13 @@ let
       fileName,
       version,
       toolId ? ovftoolId,
-      artifactId ? 21342,
+      artifactId ? 29161,
       fileType ? "Download",
       source ? "",
       hash ? "",
     }:
     let
-      requestJson = builtins.toJSON {
+      requestJson = lib.strings.toJSON {
         inherit
           fileName
           artifactId
@@ -73,14 +73,14 @@ let
 
   ovftoolSystems = {
     "x86_64-linux" = rec {
-      version = "4.6.3-24031167";
+      version = "5.0.0-24781994";
       fileName = "VMware-ovftool-${version}-lin.x86_64.zip";
-      hash = "sha256-NEwwgmEh/mrZkMMhI+Kq+SYdd3MJ0+IBLdUhd1+kPow=";
+      hash = "sha256-I389VdRZQH9BJT/qxSyUPlRZC7MHv++TDc8rJ1jY788=";
     };
     "x86_64-darwin" = rec {
-      version = "4.6.3-24031167";
+      version = "5.0.0-24781994";
       fileName = "VMware-ovftool-${version}-mac.x64.zip";
-      hash = "sha256-vhACcc4tjaQhvKwZyWkgpaKaoC+coWGl1zfSIC6WebM=";
+      hash = "sha256-vfhagEOnTGxOsY8kFY555c8EhI12GwQ2JwgTjEz7UT0=";
     };
   };
 
@@ -158,9 +158,7 @@ stdenv.mkDerivation (final: {
     # libgoogleurl and libcurl.
     #
     # FIXME: Replace libgoogleurl? Possibly from Chromium?
-    # FIXME: Tell VMware to use a modern version of OpenSSL on macOS. As of ovftool
-    # v4.6.3 ovftool uses openssl-1.0.2zj which in seems to be the extended
-    # support LTS release: https://www.openssl.org/support/contracts.html
+    # FIXME: Tell VMware to use a modern version of OpenSSL on macOS.
 
     # Install all libs that are not patched in preFixup.
     # Darwin dylibs are under `lib` in the zip.
@@ -174,7 +172,7 @@ stdenv.mkDerivation (final: {
     libvmacore.so \
     libvmomi.so
   ''
-  # macOS still relies on OpenSSL 1.0.2 as of v4.6.3, but Linux is in the clear
+  # macOS still relies on OpenSSL 1.0.2 as of v4.6.3 and later, but Linux is in the clear
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     lib/libcrypto.1.0.2.dylib \
     lib/libgoogleurl.59.0.30.45.2.dylib \
@@ -326,24 +324,24 @@ stdenv.mkDerivation (final: {
       set +x
     '';
 
-  meta = with lib; {
+  meta = {
     description = "VMware tools for working with OVF, OVA, and VMX images";
     homepage = "https://developer.vmware.com/web/tool/ovf-tool/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       numinit
       thanegill
     ];
-    platforms = builtins.attrNames ovftoolSystems;
+    platforms = lib.attrNames ovftoolSystems;
     mainProgram = "ovftool";
-    knownVulnerabilities = lib.optionals (stdenv.hostPlatform.isDarwin) [
-      "The bundled version of openssl 1.0.2zj in ovftool for Darwin has open vulnerabilities."
+    knownVulnerabilities = lib.optionals stdenv.hostPlatform.isDarwin [
+      "The bundled version of openssl 1.0.2zk in ovftool for Darwin has open vulnerabilities (maximum severity: Moderate)"
       "https://openssl-library.org/news/vulnerabilities-1.0.2/"
-      "CVE-2024-0727"
-      "CVE-2024-5535"
+      "Please nag Broadcom to update to OpenSSL 3 for Darwin."
       "CVE-2024-9143"
       "CVE-2024-13176"
+      "CVE-2025-9230"
     ];
   };
 })
diff --git a/pkgs/by-name/ov/ovhcloud-cli/package.nix b/pkgs/by-name/ov/ovhcloud-cli/package.nix
index 664f04528818..75881b5cc8f7 100644
--- a/pkgs/by-name/ov/ovhcloud-cli/package.nix
+++ b/pkgs/by-name/ov/ovhcloud-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ovhcloud-cli";
-  version = "0.6.0";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "ovhcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZW/o9YpENWmiBYRy+gPQyLM00QM6f+Ym7IFSeArqZ64=";
+    hash = "sha256-Z5CMOZ1NJ0tcO/aKkFQetW/E0eURucv/CyT6KnoMCHQ=";
   };
 
   vendorHash = "sha256-WNONEceR/cDVloosQ/BMYjPTk9elQ1oTX89lgzENSAI=";
diff --git a/pkgs/by-name/ov/ovito/package.nix b/pkgs/by-name/ov/ovito/package.nix
index dd2378ce1b75..ab4eaaa8e06b 100644
--- a/pkgs/by-name/ov/ovito/package.nix
+++ b/pkgs/by-name/ov/ovito/package.nix
@@ -16,17 +16,18 @@
   python3,
   qt6Packages,
   copyDesktopItems,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ovito";
-  version = "3.12.2";
+  version = "3.14.1";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
-    rev = "v${version}";
-    hash = "sha256-qpKQAO2f1TfspqjbCLA/3ERWdMeknKe0a54yd9PZbsA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SKE07bk/8cZ2etQtLrGZyp2DrNiyVk6mrgxlvJmG+Xk=";
     fetchSubmodules = true;
   };
   patches = [ ./zstd.patch ];
@@ -81,18 +82,22 @@ stdenv.mkDerivation rec {
       install -Dm644 ${icon} $out/share/pixmaps/ovito.png
     '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Scientific visualization and analysis software for atomistic and particle simulation data";
     mainProgram = "ovito";
     homepage = "https://ovito.org";
-    license = with licenses; [
+    changelog = "https://docs.ovito.org/new_features.html";
+    license = with lib.licenses; [
       gpl3Only
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       twhitehead
       chn
+      chillcicada
     ];
     broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=...
   };
-}
+})
diff --git a/pkgs/by-name/ow/owl-compositor/package.nix b/pkgs/by-name/ow/owl-compositor/package.nix
index 2ece27bf3218..06937ead954f 100644
--- a/pkgs/by-name/ow/owl-compositor/package.nix
+++ b/pkgs/by-name/ow/owl-compositor/package.nix
@@ -68,6 +68,9 @@ stdenv.mkDerivation {
     !stdenv.hostPlatform.isDarwin
   ) "-fobjc-runtime=gnustep-2.0";
 
+  # ld: Seat/OwlPointer.o: undefined reference to symbol 'round@@GLIBC_2.2.5'
+  env.NIX_LDFLAGS = "-lm";
+
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/by-name/ow/owl/package.nix b/pkgs/by-name/ow/owl/package.nix
index 1b8ba893537b..90f13b54b42b 100644
--- a/pkgs/by-name/ow/owl/package.nix
+++ b/pkgs/by-name/ow/owl/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation {
     libpcap
   ];
 
+  postPatch = ''
+    substituteInPlace googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace googletest/{googlemock,googletest}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Open Apple Wireless Direct Link (AWDL) implementation written in C";
     homepage = "https://owlink.org/";
diff --git a/pkgs/by-name/ow/owntone/gettext-0.25.patch b/pkgs/by-name/ow/owntone/gettext-0.25.patch
new file mode 100644
index 000000000000..7df3cbdd2204
--- /dev/null
+++ b/pkgs/by-name/ow/owntone/gettext-0.25.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 66d92954..05e81c52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,6 +10,9 @@ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([foreign subdir-objects 1.11])
+ AM_SILENT_RULES([yes])
+
++AM_GNU_GETTEXT_VERSION([0.25])
++AM_GNU_GETTEXT([external])
++
+ dnl Requires autoconf 2.60
+ AC_USE_SYSTEM_EXTENSIONS
diff --git a/pkgs/by-name/ow/owntone/package.nix b/pkgs/by-name/ow/owntone/package.nix
index 7e755a54a027..49a4df588b4a 100644
--- a/pkgs/by-name/ow/owntone/package.nix
+++ b/pkgs/by-name/ow/owntone/package.nix
@@ -37,14 +37,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "28.12";
+  version = "29.0";
   pname = "owntone";
 
   src = fetchFromGitHub {
     owner = "owntone";
     repo = "owntone-server";
     tag = finalAttrs.version;
-    hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk=";
+    hash = "sha256-Z9u5clC6m5gDAKkvyvrQs9muNK/P0ipHgQUmTHLRumE=";
   };
 
   nativeBuildInputs = [
@@ -83,6 +83,10 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals chromecastSupport [ "--enable-chromecast" ]
     ++ lib.optionals pulseSupport [ "--with-pulseaudio" ];
 
+  patches = [
+    ./gettext-0.25.patch
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index 2c98ce80d8b7..4be1231203af 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxide-rs";
-  version = "0.13.0+20250730.0.0";
+  version = "0.14.0+20251008.0.0";
 
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "oxide.rs";
     rev = "v${version}";
-    hash = "sha256-baEXsDzM4y4HmUwjIqVBJm+8L+q+llq9g2o1kEZU3vI=";
+    hash = "sha256-/xFtANxapsPU99Lj8TN+ZFcLy0AOyq+lcqhqIt3ZWgs=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_cmd_auth_debug_logging"
   ];
 
-  cargoHash = "sha256-radMOVLnHaV+5bUYanw5mswGM9A+xqNN/a4boe1jWDM=";
+  cargoHash = "sha256-D08NacxKZKVsqR7qQEce2lz8E4GahtSo7jwwmSPRvUc=";
 
   cargoBuildFlags = [
     "--package=oxide-cli"
diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix
index fed65b4f3fc6..35e4fa2da880 100644
--- a/pkgs/by-name/ox/oxigraph/package.nix
+++ b/pkgs/by-name/ox/oxigraph/package.nix
@@ -13,17 +13,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxigraph";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "oxigraph";
     repo = "oxigraph";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-58PGRQlDziVENgm7OKPAzXXi4BkOJqytGCxxIXB2smc=";
+    hash = "sha256-ptTrJbLGS7GkLGO40mbpdPkrcspaUE33kRZ8g9Qtb0o=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-GQ+7dyQ1LyYK8RYImsqVMEQvIC5pRQUVYYgO4FOShaE=";
+  cargoHash = "sha256-AuUGra9ejPRKWWpXWLmcwGuZRKIuCYTdifpnwuuHnnQ=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 955a4cca750c..f604e36a4aec 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/oxc-project/oxc";
     changelog = "https://github.com/oxc-project/oxc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "oxlint";
   };
 })
diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index c00c752997c9..bbdf20b66a93 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p11-kit";
-  version = "0.25.5";
+  version = "0.25.10";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     tag = version;
-    hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc=";
+    hash = "sha256-srZyY14PqPoPMcEj/3WWEPrBuCcAGibvziKgZV1vxO8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix
index f6db91c7c2cb..a04a4b49a45c 100644
--- a/pkgs/by-name/p3/p3x-onenote/package.nix
+++ b/pkgs/by-name/p3/p3x-onenote/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "p3x-onenote";
-  version = "2025.10.101";
+  version = "2025.10.103";
 
   plat =
     {
@@ -20,9 +20,9 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-FB6+0Ze3d/6QETgtMtc6GztnPdSy5s7k67qsAtFdsyM=";
-      armv7l-linux = "sha256-Q45tfcGrNjd9wXt+VhXhaHrC4w68lRUIuB4cJSW5NDE=";
-      x86_64-linux = "sha256-h2U9EctjyM4FlVe/pPMWugCIe9tQ4Av4/HOcWWSUNEI=";
+      aarch64-linux = "sha256-6R+QzCeochojB1zo8SWiIVszrjbII+H2R/TReCsPip4=";
+      armv7l-linux = "sha256-jhrPixz/ZHJRIe+xtmBRtDJFL7LqZqcoK7rdGrsoySo=";
+      x86_64-linux = "sha256-sDzwEhoPEfa21zBwD0IYoRdz4VHeTSUL0biHbbWE+Dc=";
     }
     .${stdenv.hostPlatform.system};
 
diff --git a/pkgs/by-name/pa/packet-sd/package.nix b/pkgs/by-name/pa/packet-sd/package.nix
index 053aceffa748..c8b98687cf2b 100644
--- a/pkgs/by-name/pa/packet-sd/package.nix
+++ b/pkgs/by-name/pa/packet-sd/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   fetchpatch2,
@@ -45,5 +46,7 @@ buildGoModule rec {
     license = licenses.asl20;
     maintainers = [ ];
     mainProgram = "prometheus-packet-sd";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix
index e0b3c8c2a9ff..fbd54eb5eb89 100644
--- a/pkgs/by-name/pa/pactorio/package.nix
+++ b/pkgs/by-name/pa/pactorio/package.nix
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/figsoda/pactorio";
     changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/padthv1/default.nix b/pkgs/by-name/pa/padthv1/package.nix
similarity index 100%
rename from pkgs/applications/audio/padthv1/default.nix
rename to pkgs/by-name/pa/padthv1/package.nix
diff --git a/pkgs/applications/misc/pagefind/cargo-lock.patch b/pkgs/by-name/pa/pagefind/cargo-lock.patch
similarity index 75%
rename from pkgs/applications/misc/pagefind/cargo-lock.patch
rename to pkgs/by-name/pa/pagefind/cargo-lock.patch
index f0fbd420e61f..d547116b4ba7 100644
--- a/pkgs/applications/misc/pagefind/cargo-lock.patch
+++ b/pkgs/by-name/pa/pagefind/cargo-lock.patch
@@ -279,3 +279,89 @@
   "bytes",
   "futures-util",
   "http 1.3.1",
+
+--- a/pagefind_web/Cargo.lock
++++ b/pagefind_web/Cargo.lock
+@@ -89,6 +89,12 @@ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "rustversion"
++version = "1.0.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
++
+ [[package]]
+ name = "syn"
+ version = "2.0.55"
+@@ -108,23 +114,25 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+ 
+ [[package]]
+ name = "wasm-bindgen"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
++checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+ dependencies = [
+  "cfg-if",
++ "once_cell",
++ "rustversion",
+  "wasm-bindgen-macro",
++ "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-backend"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
++checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+ dependencies = [
+  "bumpalo",
+  "log",
+- "once_cell",
+  "proc-macro2",
+  "quote",
+  "syn",
+@@ -133,9 +141,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
++checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -143,9 +151,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
++checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -156,9 +164,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
++checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
++dependencies = [
++ "unicode-ident",
++]
+ 
+ [[package]]
+ name = "write-json" "http 1.3.1",
diff --git a/pkgs/applications/misc/pagefind/lindera-dictionary-support-file-paths.patch b/pkgs/by-name/pa/pagefind/lindera-dictionary-support-file-paths.patch
similarity index 100%
rename from pkgs/applications/misc/pagefind/lindera-dictionary-support-file-paths.patch
rename to pkgs/by-name/pa/pagefind/lindera-dictionary-support-file-paths.patch
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/by-name/pa/pagefind/package.nix
similarity index 97%
rename from pkgs/applications/misc/pagefind/default.nix
rename to pkgs/by-name/pa/pagefind/package.nix
index f54060700337..fc7109469d12 100644
--- a/pkgs/applications/misc/pagefind/default.nix
+++ b/pkgs/by-name/pa/pagefind/package.nix
@@ -12,7 +12,7 @@
   python3,
   rustc,
   versionCheckHook,
-  wasm-bindgen-cli_0_2_92,
+  wasm-bindgen-cli_0_2_104,
   wasm-pack,
 }:
 
@@ -72,8 +72,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env.cargoDeps_web = rustPlatform.fetchCargoVendor {
     name = "cargo-deps-web-${finalAttrs.version}";
     inherit (finalAttrs) src;
+    patches = [ ./web-cargo-lock.patch ];
     sourceRoot = "${finalAttrs.src.name}/pagefind_web";
-    hash = "sha256-DaipINtwePA03YdbSzh6EjH4Q13P3CB9lwcmTOR54dM=";
+    hash = "sha256-TdbNvDF4WQ2xgkKGVmmZ8R2Wga21OUaGmey/2HVWVcQ=";
   };
   env.npmDeps_web_js = fetchNpmDeps {
     name = "pagefind-npm-deps-web-js-${finalAttrs.version}";
@@ -165,7 +166,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nodejs
     rustc
     rustc.llvmPackages.lld
-    wasm-bindgen-cli_0_2_92
+    wasm-bindgen-cli_0_2_104
     wasm-pack
   ]
   ++ lib.optionals stdenv.buildPlatform.isDarwin [
diff --git a/pkgs/by-name/pa/pagefind/web-cargo-lock.patch b/pkgs/by-name/pa/pagefind/web-cargo-lock.patch
new file mode 100644
index 000000000000..ee94206800f9
--- /dev/null
+++ b/pkgs/by-name/pa/pagefind/web-cargo-lock.patch
@@ -0,0 +1,85 @@
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -89,6 +89,12 @@ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "rustversion"
++version = "1.0.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
++
+ [[package]]
+ name = "syn"
+ version = "2.0.55"
+@@ -108,23 +114,25 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+ 
+ [[package]]
+ name = "wasm-bindgen"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
++checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+ dependencies = [
+  "cfg-if",
++ "once_cell",
++ "rustversion",
+  "wasm-bindgen-macro",
++ "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-backend"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
++checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+ dependencies = [
+  "bumpalo",
+  "log",
+- "once_cell",
+  "proc-macro2",
+  "quote",
+  "syn",
+@@ -133,9 +141,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
++checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -143,9 +151,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
++checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -156,9 +164,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.92"
++version = "0.2.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
++checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
++dependencies = [
++ "unicode-ident",
++]
+ 
+ [[package]]
+ name = "write-json" "http 1.3.1",
diff --git a/pkgs/by-name/pa/pagsuite/package.nix b/pkgs/by-name/pa/pagsuite/package.nix
index 850732275cb3..273a728c2e8d 100644
--- a/pkgs/by-name/pa/pagsuite/package.nix
+++ b/pkgs/by-name/pa/pagsuite/package.nix
@@ -1,38 +1,26 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitLab,
   cmake,
-  unzip,
   gmp,
   scalp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pagsuite";
-  version = "1.80";
+  version = "1.80-unstable-2025-05-03";
 
-  src = fetchurl {
-    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${
-      lib.replaceStrings [ "." ] [ "_" ] version
-    }.zip";
-    hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ=";
+  src = fetchFromGitLab {
+    domain = "gitlab.com";
+    owner = "kumm";
+    repo = "pagsuite";
+    rev = "1cc657765658cb2eb622d4a9c656ab9854150e7d";
+    hash = "sha256-jyp3h5n6SkyTpLzqMezvu2nri6rDkX3ACcCO9r4/bBA=";
   };
 
-  patches = [
-    # Fix issue with latest ScaLP update
-    (fetchpatch {
-      url = "https://gitlab.com/kumm/pagsuite/-/commit/cae9f78bec93a7f197461358f2f796f6b5778781.patch";
-      hash = "sha256-12IisS6oGYLRicORTemHB7bw9EB9cuQjxG8f6X0WMrU=";
-    })
-  ];
-
-  sourceRoot = "pagsuite_${lib.replaceStrings [ "." ] [ "_" ] version}";
-
   nativeBuildInputs = [
     cmake
-    unzip
   ];
 
   buildInputs = [
@@ -40,6 +28,9 @@ stdenv.mkDerivation rec {
     scalp
   ];
 
+  # make[2]: ***  No rule to make target 'lib/libpag.dylib', needed by 'bin/osr'.  Stop.
+  enableParallelBuilding = false;
+
   meta = with lib; {
     description = "Optimization tools for the (P)MCM problem";
     homepage = "https://gitlab.com/kumm/pagsuite";
diff --git a/pkgs/by-name/pa/pairdrop/package.nix b/pkgs/by-name/pa/pairdrop/package.nix
index d4b2aa08b70c..1fa983f47b26 100644
--- a/pkgs/by-name/pa/pairdrop/package.nix
+++ b/pkgs/by-name/pa/pairdrop/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildNpmPackage,
   fetchFromGitHub,
+  nixosTests,
   nodejs,
 }:
 
@@ -36,6 +37,12 @@ buildNpmPackage rec {
     runHook postInstall
   '';
 
+  passthru = {
+    tests = {
+      inherit (nixosTests) pairdrop;
+    };
+  };
+
   meta = with lib; {
     description = "Local file sharing in your browser";
     mainProgram = "pairdrop";
diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix
index a2797f8228d7..aca01a279a31 100644
--- a/pkgs/by-name/pa/pakku/package.nix
+++ b/pkgs/by-name/pa/pakku/package.nix
@@ -6,20 +6,19 @@
   makeWrapper,
   fetchFromGitHub,
   versionCheckHook,
-  nix-update-script,
   installShellFiles,
   stripJavaArchivesHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pakku";
-  version = "1.2.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "juraj-hrivnak";
     repo = "Pakku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hWQq2awZV07wX4jK9K/QoXekrlZukuDv6CtY1O09ZkQ=";
+    hash = "sha256-PVET+A9LVWnqLCXz3R9EP7gk6GOViSzhRLrXTjNFPaA=";
   };
 
   gradleBuildTask = "jvmJar";
@@ -64,12 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--subpackage"
-      "mitmCache"
-    ];
-  };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Multiplatform modpack manager for Minecraft: Java Edition";
diff --git a/pkgs/by-name/pa/pakku/update.sh b/pkgs/by-name/pa/pakku/update.sh
new file mode 100755
index 000000000000..14e2b06f2479
--- /dev/null
+++ b/pkgs/by-name/pa/pakku/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update
+
+nix-update pakku
+$(nix-build -A pakku.mitmCache.updateScript)
diff --git a/pkgs/by-name/pa/pam-watchid/package.nix b/pkgs/by-name/pa/pam-watchid/package.nix
index 6cedf0552c63..cd2da4fbd546 100644
--- a/pkgs/by-name/pa/pam-watchid/package.nix
+++ b/pkgs/by-name/pa/pam-watchid/package.nix
@@ -11,7 +11,7 @@ swiftPackages.stdenv.mkDerivation {
   version = "2-unstable-2024-12-24";
 
   src = fetchFromGitHub {
-    owner = "Logicer16";
+    owner = "mostpinkest";
     repo = "pam-watchid";
     rev = "bb9c6ea62207dd9d41a08ca59c7a1f5d6fa07189";
     hash = "sha256-6SqSACoG7VkyYfz+xyU/L2J69RxHTTvzGexjGB2gDuY=";
@@ -30,7 +30,7 @@ swiftPackages.stdenv.mkDerivation {
 
   meta = {
     description = "PAM plugin module that allows the Apple Watch to be used for authentication";
-    homepage = "https://github.com/Logicer16/pam-watchid";
+    homepage = "https://github.com/mostpinkest/pam-watchid";
     license = lib.licenses.unlicense;
     maintainers = [ lib.maintainers.samasaur ];
     platforms = lib.platforms.darwin;
diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix
index 83fbae58203b..ef2929065f3f 100644
--- a/pkgs/by-name/pa/panamax/package.nix
+++ b/pkgs/by-name/pa/panamax/package.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix
index a24383b6d805..42227dd4fc38 100644
--- a/pkgs/by-name/pa/pango/package.nix
+++ b/pkgs/by-name/pa/pango/package.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pango";
-  version = "1.56.3";
+  version = "1.57.0";
 
   outputs = [
     "bin"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JgYlK8Jc2NJOG39+ksOicrN6zWc0NHtztHpIKDS6JJE=";
+    hash = "sha256-iQZAyEHa530649j+iVN4S5MPokGxdCPmEgx7/fi4kec=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/pa/panotools/cmake4.patch b/pkgs/by-name/pa/panotools/cmake4.patch
deleted file mode 100644
index 13d12cc103f8..000000000000
--- a/pkgs/by-name/pa/panotools/cmake4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: Vendor upstream patches (mercurial/sourceforge)
-Author: Andreas Metzler
-
-From:
-- https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/
-- https://sourceforge.net/p/panotools/libpano13/ci/6b0f2a5ef7a0490866fb224158d1dfbb8bf5896f/
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,8 +28,7 @@
- ## may need to edit the wxWidgets version number below.
- ##
- 
--# require at least cmake 3.0
--cmake_minimum_required(VERSION 3.0)
-+cmake_minimum_required(VERSION 3.12...4.0)
- if(POLICY CMP0074)
-   cmake_policy(SET CMP0074 NEW)
- endif()
-@@ -382,12 +382,12 @@
- endif()
- 
- # create TAGS file
--ADD_CUSTOM_COMMAND( OUTPUT ctags POST_BUILD
--                   COMMAND ctags-exuberant -e *.c *.h tools/*.c
-+ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/TAGS
-+                   COMMAND ctags -e *.c *.h tools/*.c
-                    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/
-                    COMMENT "Build TAGS file"
-                  )
--ADD_CUSTOM_TARGET( TAGS DEPENDS ctags)
-+ADD_CUSTOM_TARGET( TAGS DEPENDS ${PROJECT_SOURCE_DIR}/TAGS)
diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix
index fe5e41c95c12..a5db44159eb3 100644
--- a/pkgs/by-name/pa/panotools/package.nix
+++ b/pkgs/by-name/pa/panotools/package.nix
@@ -11,15 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpano13";
-  version = "2.9.22";
+  version = "2.9.23";
 
   src = fetchurl {
     url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz";
-    hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
+    hash = "sha256-58B203oUw5Q0liEV5H3b4YRSyj3lzkDiqu+nz1gV6ig=";
   };
 
-  patches = [ ./cmake4.patch ];
-
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix
index b18666199594..f2b8bdc485b8 100644
--- a/pkgs/by-name/pa/pantheon-tweaks/package.nix
+++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pantheon-tweaks";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "pantheon-tweaks";
     repo = "pantheon-tweaks";
     rev = version;
-    hash = "sha256-/fHhVErLIQMSRkri6vqc11yZr0YaLeQTUh986If8mVg=";
+    hash = "sha256-cCrHGOo7dZc28hbZD6Zv8Dw4Ks5JTDsm6A6nkmpUAxk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix
index 065a5354c571..c817c0f70e86 100644
--- a/pkgs/by-name/pa/paper-plane/package.nix
+++ b/pkgs/by-name/pa/paper-plane/package.nix
@@ -53,6 +53,12 @@ let
       rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09";
       hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU=";
     };
+    postPatch = ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+      substituteInPlace td/generate/tl-parser/CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+    '';
   });
   rlottie-paperplane = rlottie.overrideAttrs (prev: {
     pname = "rlottie-paperplane";
diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 0fad77fe6a12..30d6f1f9d595 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -28,13 +28,13 @@
   xorg,
 }:
 let
-  version = "2.18.4";
+  version = "2.19.3";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-sQ5laFO6DSg+4tF9jk2yuV0q2Vp7VC/+hu2XrVj8/bY=";
+    hash = "sha256-VhBo61jW4lZeJYJcRRuVuYbR4enpM2JD47DDDlFJuao=";
   };
 
   python = python3.override {
@@ -80,7 +80,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 2;
-      hash = "sha256-fs9a2uI/TnWalQ/qRb6m4d1CsU7O6VYCJMz2xWLdC0I=";
+      hash = "sha256-AJp796oO8qOltPKndOXlLx1luCOfzsRSFscCUCe6MZo=";
     };
 
     nativeBuildInputs = [
@@ -168,10 +168,9 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "django-allauth"
-    "django-guardian"
+    "django-cors-headers"
+    "drf-spectacular-sidecar"
     "filelock"
-    "ocrmypdf"
-    "rapidfuzz"
     "redis"
   ];
 
@@ -207,6 +206,7 @@ python.pkgs.buildPythonApplication rec {
       django-guardian
       django-multiselectfield
       django-soft-delete
+      django-treenode
       djangorestframework
       djangorestframework-guardian
       drf-spectacular
diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix
index 0aac8f0dade3..b1792c608182 100644
--- a/pkgs/by-name/pa/papilo/package.nix
+++ b/pkgs/by-name/pa/papilo/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papilo";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "papilo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8=";
+    hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A=";
   };
 
   # skip SEGFAULT tests
diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix
index b9ff9d0d9e85..028c0524267c 100644
--- a/pkgs/by-name/pa/parallel/package.nix
+++ b/pkgs/by-name/pa/parallel/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parallel";
-  version = "20250822";
+  version = "20251022";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno=";
+    hash = "sha256-R0Mm1ZaI0vwHjPiaewtKEcyWhCKbP6AVj+i8A/G2nuE=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index 5945245a6fb6..14e88c000fea 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q/F7BzkeoZQfGROHVYF9n3SGidy4EhCLSRz2xa8eSKY=";
+    hash = "sha256-xIe3s/7/raZuunR+Gx/icLHhT5VUNhcfBGbTqHybxu4=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-nKLHe0MGdV05oSdDaaGN9elsAAzG6mfoT/ZZt+LcbI4=";
+  vendorHash = "sha256-UQnIGTZQOgPWqJcc75pyaMFh8P8JKvtvlGneo5F3NEM=";
 
   buildInputs = [
     stdenv.cc.libc.static
diff --git a/pkgs/by-name/pa/parcellite/package.nix b/pkgs/by-name/pa/parcellite/package.nix
deleted file mode 100644
index a39b4d9f8ac8..000000000000
--- a/pkgs/by-name/pa/parcellite/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  gtk2,
-  hicolor-icon-theme,
-  intltool,
-  pkg-config,
-  which,
-  wrapGAppsHook3,
-  xdotool,
-  libappindicator-gtk2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "parcellite";
-  version = "1.2.1";
-
-  src = fetchFromGitHub {
-    owner = "rickyrockrat";
-    repo = "parcellite";
-    rev = version;
-    sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    intltool
-    pkg-config
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    gtk2
-    hicolor-icon-theme
-    libappindicator-gtk2
-  ];
-  NIX_LDFLAGS = "-lgio-2.0";
-
-  preFixup = ''
-    # Need which and xdotool on path to fix auto-pasting.
-    gappsWrapperArgs+=(--prefix PATH : "${which}/bin:${xdotool}/bin")
-  '';
-
-  meta = with lib; {
-    description = "Lightweight GTK clipboard manager";
-    homepage = "https://github.com/rickyrockrat/parcellite";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "parcellite";
-  };
-}
diff --git a/pkgs/by-name/pa/parmmg/package.nix b/pkgs/by-name/pa/parmmg/package.nix
index 529acf6828a9..0d1681c04f2c 100644
--- a/pkgs/by-name/pa/parmmg/package.nix
+++ b/pkgs/by-name/pa/parmmg/package.nix
@@ -1,59 +1,84 @@
 {
-  stdenv,
   lib,
+  stdenv,
+  fetchpatch2,
   fetchFromGitHub,
-  unstableGitUpdater,
   cmake,
   gfortran,
   perl,
   mpi,
   metis,
   mmg,
+  scotch,
+  vtk-full,
+  withVtk ? true,
+  testers,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "parmmg";
-  version = "1.4.0-unstable-2024-04-22";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "MmgTools";
     repo = "ParMmg";
-    rev = "f8a5338ea1bb2c778bfb4559c2c3974ba15b4730";
-    hash = "sha256-ieFHREAVeD7IwDUCtsMG5UKxahxM+wzNCAqCOHIHwu8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LDbfGuTRd2wzmNHxXd381qVuOlWqqDdP8+Y/v1H68uM=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/MmgTools/ParMmg/commit/a9551c502c58a1f8a109fb17d8f45cb9370f8fc6.patch?full_index=1";
+      hash = "sha256-i0KwzseffeI9UYIYuyNYmdF9eTZ+nQQfSI6ukSowIYs=";
+    })
+  ];
+
+  postPatch = ''
+    patchShebangs --build scripts
+  '';
 
   nativeBuildInputs = [
     cmake
     gfortran
-    mpi
     perl
   ];
 
   buildInputs = [
     mpi
     metis
-    mmg
-  ];
-
-  strictDeps = true;
-
-  preConfigure = ''
-    patchShebangs --build ./
-  '';
+    scotch
+    (mmg.override {
+      inherit withVtk;
+      vtk = vtk-full;
+    })
+  ]
+  ++ lib.optional withVtk vtk-full;
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS:BOOL=TRUE"
-    "-DDOWNLOAD_MMG=OFF"
-    "-DDOWNLOAD_METIS=OFF"
-    "-Wno-dev"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "DOWNLOAD_MMG" false)
+    (lib.cmakeBool "DOWNLOAD_METIS" false)
+    (lib.cmakeBool "USE_ELAS" false)
+    (lib.cmakeBool "USE_SCOTCH" true)
+    (lib.cmakeBool "USE_VTK" withVtk)
   ];
 
-  meta = with lib; {
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "ParMmg" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
     description = "Distributed parallelization of 3D volume mesh adaptation";
     homepage = "http://www.mmgtools.org/";
-    platforms = platforms.unix;
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ mkez ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ mkez ];
   };
-}
+})
diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index 014f70123f4b..f404340d332f 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "partclone";
-  version = "0.3.37";
+  version = "0.3.38";
 
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
     rev = version;
-    sha256 = "sha256-VqPCj2DjWux17vgLb13AJd0EAHkqRGdIL0aPxkT3JlY=";
+    sha256 = "sha256-lWnGi8giz7vzdBnuth55h0VMuNyCQaCclRqPJdm0I14=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix
index ce2d2164d7e6..5a1a482b7798 100644
--- a/pkgs/by-name/pa/particle-cli/package.nix
+++ b/pkgs/by-name/pa/particle-cli/package.nix
@@ -26,10 +26,6 @@ buildNpmPackage (finalAttrs: {
   dontNpmBuild = true;
   dontNpmPrune = true;
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   postInstall = ''
     install -D -t $out/etc/udev/rules.d \
       $out/lib/node_modules/particle-cli/assets/50-particle.rules
diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix
index 2f90a1393651..78da8766a4e7 100644
--- a/pkgs/by-name/pa/passt/package.nix
+++ b/pkgs/by-name/pa/passt/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "passt";
-  version = "2025_09_11.6cbcccc";
+  version = "2025_09_19.623dbf6";
 
   src = fetchurl {
     url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-9Byeb4gsP6Ai1lbET1DGcuUn/637ujrxYn70t2o59L4=";
+    hash = "sha256-3krWW/QKijgZsmHuelMjpcaL8OyRqmPKC/wUvag0ZHI=";
   };
 
   separateDebugInfo = true;
diff --git a/pkgs/applications/audio/patchance/default.nix b/pkgs/by-name/pa/patchance/package.nix
similarity index 72%
rename from pkgs/applications/audio/patchance/default.nix
rename to pkgs/by-name/pa/patchance/package.nix
index c527bc7037c2..dbe985fd808f 100644
--- a/pkgs/applications/audio/patchance/default.nix
+++ b/pkgs/by-name/pa/patchance/package.nix
@@ -1,27 +1,26 @@
 {
   lib,
   fetchurl,
-  buildPythonApplication,
+  python3Packages,
   libjack2,
-  pyqt5,
   qt5,
   which,
   bash,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "patchance";
   version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz";
-    sha256 = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w=";
+    hash = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w=";
   };
 
   format = "other";
 
   nativeBuildInputs = [
-    pyqt5 # pyuic5 and pyrcc5 to build resources.
+    python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources.
     qt5.qttools # lrelease to build translations.
     which # which to find lrelease.
     qt5.wrapQtAppsHook
@@ -30,7 +29,7 @@ buildPythonApplication rec {
     libjack2
     bash
   ];
-  propagatedBuildInputs = [ pyqt5 ];
+  propagatedBuildInputs = [ python3Packages.pyqt5 ];
 
   dontWrapQtApps = true; # The program is a python script.
 
@@ -54,12 +53,12 @@ buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Houston4444/Patchance";
     description = "JACK Patchbay GUI";
     mainProgram = "patchance";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix
index acb079b30df5..63a7bfec0a5f 100644
--- a/pkgs/by-name/pa/patsh/package.nix
+++ b/pkgs/by-name/pa/patsh/package.nix
@@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/patsh";
     changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pb/pbm/package.nix b/pkgs/by-name/pb/pbm/package.nix
index b772eea4f37a..fcc90639db78 100644
--- a/pkgs/by-name/pb/pbm/package.nix
+++ b/pkgs/by-name/pb/pbm/package.nix
@@ -2,9 +2,9 @@
 
 buildDotnetGlobalTool {
   pname = "pbm";
-  version = "1.4.5";
+  version = "1.4.6";
 
-  nugetHash = "sha256-iwacwYa1bB51Wp7PvrUclJ+Rdn0yzZa0EKcBwbpGSag=";
+  nugetHash = "sha256-Rx7L1Bl2VwsAZMGudsFA7K++WuhJpjqlRsHMuBebo6Y=";
 
   meta = with lib; {
     description = "CLI for managing Akka.NET applications and Akka.NET Clusters";
diff --git a/pkgs/by-name/pb/pbrt/package.nix b/pkgs/by-name/pb/pbrt/package.nix
index cb9b8d6f0519..5004e17e56b1 100644
--- a/pkgs/by-name/pb/pbrt/package.nix
+++ b/pkgs/by-name/pb/pbrt/package.nix
@@ -9,20 +9,19 @@
 }:
 
 stdenv.mkDerivation {
-  version = "2018-08-15";
+  version = "2023-09-03";
   pname = "pbrt-v3";
 
   src = fetchFromGitHub {
-    rev = "86b5821308088deea70b207bc8c22219d0103d65";
+    rev = "13d871faae88233b327d04cda24022b8bb0093ee";
     owner = "mmp";
     repo = "pbrt-v3";
-    sha256 = "0f7ivsczba6zfk5f0bba1js6dcwf6w6jrkiby147qp1sx5k35cv8";
+    hash = "sha256-xg99l1o4MychQiOYkfsvD9vO0ysfmgQyaNaf8oqoWzk=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # https://github.com/mmp/pbrt-v3/issues/196
-    ./openexr-cmake-3.12.patch
+  cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   ];
 
   nativeBuildInputs = [
@@ -32,12 +31,12 @@ stdenv.mkDerivation {
   ];
   buildInputs = [ zlib ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pbrt.org/";
     description = "Renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
-    platforms = platforms.linux;
-    license = licenses.bsd2;
-    maintainers = [ maintainers.juliendehos ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.juliendehos ];
     priority = 10;
   };
 }
diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix
index 3aa99cd6634a..b3a0d2b91357 100644
--- a/pkgs/by-name/pc/pciutils/package.nix
+++ b/pkgs/by-name/pc/pciutils/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   makeFlags = [
-    "SHARED=${if static then "no" else "yes"}"
+    "SHARED=${lib.boolToYesNo (!static)}"
     "PREFIX=\${out}"
     "STRIP="
     "HOST=${stdenv.hostPlatform.system}"
diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 8569087b9db8..69fb7076ceec 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -39,13 +39,13 @@
 
 let
   pname = "pcloud";
-  version = "1.14.16";
-  code = "XZbJvD5ZfXtwygX5xg7F9ywtRup5H5sBvfhy";
+  version = "1.14.18";
+  code = "XZ2gJM5Z8pdJVlCT0s5FI1aTKxxgt48aEr8k";
 
   # Archive link's codes: https://www.pcloud.com/release-notes/linux.html
   src = fetchzip {
     url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
-    hash = "sha256-6K7QPr3MtZvRZt84N8+i8QZBaKHHeTY1bXMdO+wUCr0=";
+    hash = "sha256-YDXmna1SZaDLK1EEdHvWm9+PgYKjYUsa2lvdzFGmyIU=";
   };
 
   appimageContents = appimageTools.extractType2 {
@@ -121,6 +121,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition";
     homepage = "https://www.pcloud.com/";
+    changelog = "https://www.pcloud.com/release-notes/linux.html";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     maintainers = with maintainers; [ patryk27 ];
diff --git a/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
new file mode 100644
index 000000000000..06341689c453
--- /dev/null
+++ b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
@@ -0,0 +1,25 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 504b7a3..100a024 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)
+ disable_compiler_warnings_for_target(speex)
+ 
+ # Find the Qt components that we need.
+-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
++find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)
+ 
+ if(WIN32)
+   add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
+diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
+index a62df95..4883c64 100644
+--- a/pcsx2-qt/CMakeLists.txt
++++ b/pcsx2-qt/CMakeLists.txt
+@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE
+ 	Qt6::Core
+ 	Qt6::Gui
+ 	Qt6::Widgets
++	Qt6::GuiPrivate
+ 	KDAB::kddockwidgets
+ )
+ 
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 16e9aeabf1f6..daddd2f377eb 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -63,6 +63,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     ./0000-define-rev.patch
 
     ./remove-cubeb-vendor.patch
+
+    # Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly
+    ./fix-qt-6.10.patch
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/pd/pdepend/package.nix b/pkgs/by-name/pd/pdepend/package.nix
index aa72fe80e91f..d8bd332f8fbe 100644
--- a/pkgs/by-name/pd/pdepend/package.nix
+++ b/pkgs/by-name/pd/pdepend/package.nix
@@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-szKVZhWcd8p4307irNqgSAK2+hl8AW+gCPyf0EEco8A=";
+  vendorHash = "sha256-uK+nJFXDVPYFbosAUxqu+mmNsD7AnZ18NnIN9FYAaPQ=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index f1d0b0b084df..e62672964b97 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = "pdfcpu";
     tag = "v${version}";
-    hash = "sha256-HTqaFl/ug/4sdchZBD4VQiXbD1L0/DVf2efZ3BV/vx4=";
+    hash = "sha256-0xsa7/WlqjRMP961FTonfty40+C1knI3szCmCDfZJ/0=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
     # in the output of `pdfcpu version` which we use as a sanity check in the
@@ -37,7 +37,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-5qB3zXiee4yMFpV8Ia8jICZaw+8Zpxd2Fs7DZ/DW/Jg=";
+  vendorHash = "sha256-wZYYIcPhyDlmIhuJs91EqPB8AjLIDHz39lXh35LHUwQ=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pd/pdfmixtool/package.nix b/pkgs/by-name/pd/pdfmixtool/package.nix
new file mode 100644
index 000000000000..59c43ddb578f
--- /dev/null
+++ b/pkgs/by-name/pd/pdfmixtool/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  cmake,
+  pkg-config,
+  qt6Packages,
+  qpdf,
+  podofo,
+  imagemagick,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "pdfmixtool";
+  version = "1.2.1";
+
+  src = fetchFromGitLab {
+    owner = "scarpetta";
+    repo = "pdfmixtool";
+    rev = "v${version}";
+    hash = "sha256-UuRTMLlUIyo2RF+XjI229kkE67ybmllIy98p97PjWCE=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6Packages.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    imagemagick
+    qt6Packages.poppler
+    qt6Packages.qtbase
+    qt6Packages.qttools
+    qpdf
+    podofo
+  ];
+
+  meta = with lib; {
+    description = "Application to split, merge, rotate and mix PDF files";
+    mainProgram = "pdfmixtool";
+    homepage = "https://gitlab.com/scarpetta/pdfmixtool";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ onny ];
+  };
+}
diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix
index 9af9f541b486..27ac7fb33c5d 100644
--- a/pkgs/by-name/pd/pdfslicer/package.nix
+++ b/pkgs/by-name/pd/pdfslicer/package.nix
@@ -29,6 +29,16 @@ stdenv.mkDerivation rec {
     # Don't build tests, vendored catch doesn't build with latest glibc.
     substituteInPlace CMakeLists.txt \
       --replace "add_subdirectory (tests)" ""
+
+    # Replace deprecated and now unsupported old cmake version
+    # https://github.com/NixOS/nixpkgs/issues/445447
+
+    substituteInPlace third-party/fmtlib/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0)" \
+        "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace third-party/GSL/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.3)" \
+        "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 2cbbbca78b31..c5270506f9e4 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -30,7 +30,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "pdm";
-  version = "2.26.0";
+  version = "2.26.1";
   pyproject = true;
 
   disabled = python.pkgs.pythonOlder "3.8";
@@ -39,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "pdm-project";
     repo = "pdm";
     tag = version;
-    hash = "sha256-Ici9XFUgtlk5yBYckZGE64KFUvA0UdX+9wo7CfaRrLI=";
+    hash = "sha256-ObBZoX5RwO7cf0zzOQ0aTWklq/Zzgh0DFLM9qxZHk8I=";
   };
 
   pythonRelaxDeps = [ "hishel" ];
diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index bf5c07b37059..30bdb7190cad 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.2.5";
+  version = "5.2.6";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-qKZXp6vW6dI3zdJnU/fc9czVuMSKyBILCNK41XodhWo=";
+    hash = "sha256-INt/KcULGvsensXF6LIZ0RKtrPK4rPPaQW/yR+JaxAc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/by-name/pe/peazip/package.nix b/pkgs/by-name/pe/peazip/package.nix
index 6604103f89e9..3c85c4259532 100644
--- a/pkgs/by-name/pe/peazip/package.nix
+++ b/pkgs/by-name/pe/peazip/package.nix
@@ -24,13 +24,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "peazip";
-  version = "10.6.1";
+  version = "10.7.0";
 
   src = fetchFromGitHub {
     owner = "peazip";
     repo = "peazip";
     rev = finalAttrs.version;
-    hash = "sha256-y+q4S3XHkN2dvHMaRxPQwK9l9LaA5rGvrzzZ+x76qUQ=";
+    hash = "sha256-JVSr4ztDHjJF+vzhaMSSAWt6PEtxNzfCRBQBlfLA4xs=";
   };
   sourceRoot = "${finalAttrs.src.name}/peazip-sources";
 
diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix
index 535b217910ec..1f7417801a7b 100644
--- a/pkgs/by-name/pe/peep/package.nix
+++ b/pkgs/by-name/pe/peep/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ryochack/peep";
     changelog = "https://github.com/ryochack/peep/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "peep";
   };
 }
diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index 9e86fb9349c8..49bbfd223761 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -41,12 +41,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peergos";
-  version = "1.11.0";
+  version = "1.13.0";
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
     rev = "v${version}";
-    hash = "sha256-JUeNNBWzIZlC1+sc1YV+3iPg4PMt+BevG5dDi4JybPk=";
+    hash = "sha256-gyhNb68W3UF9t0AvQULQp3aEIjRUzss9XgQbHrrrsk8=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/by-name/pe/pegasus-frontend/package.nix
similarity index 62%
rename from pkgs/games/pegasus-frontend/default.nix
rename to pkgs/by-name/pe/pegasus-frontend/package.nix
index 3f5244273c8b..942dc0b24d22 100644
--- a/pkgs/games/pegasus-frontend/default.nix
+++ b/pkgs/by-name/pe/pegasus-frontend/package.nix
@@ -3,15 +3,9 @@
   fetchFromGitHub,
   stdenv,
   cmake,
-  qtbase,
-  qtgraphicaleffects,
-  qtmultimedia,
-  qtsvg,
-  qttools,
-  qtx11extras,
   SDL2,
   sqlite,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -28,26 +22,29 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtgraphicaleffects
-    qtx11extras
-    sqlite
-    SDL2
-  ];
+  buildInputs =
+    (with libsForQt5; [
+      qtbase
+      qtmultimedia
+      qtsvg
+      qtgraphicaleffects
+      qtx11extras
+    ])
+    ++ [
+      sqlite
+      SDL2
+    ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform, customizable graphical frontend for launching emulators and managing your game collection";
     mainProgram = "pegasus-fe";
     homepage = "https://pegasus-frontend.org/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ tengkuizdihar ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ tengkuizdihar ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pe/perceptualdiff/package.nix b/pkgs/by-name/pe/perceptualdiff/package.nix
deleted file mode 100644
index 0f2154629c3d..000000000000
--- a/pkgs/by-name/pe/perceptualdiff/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  freeimage,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "perceptualdiff";
-  version = "2.1";
-
-  src = fetchFromGitHub {
-    owner = "myint";
-    repo = "perceptualdiff";
-    rev = "v${version}";
-    sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ freeimage ];
-
-  meta = with lib; {
-    description = "Program that compares two images using a perceptually based image metric";
-    homepage = "https://github.com/myint/perceptualdiff";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ uri-canva ];
-    platforms = platforms.unix;
-    mainProgram = "perceptualdiff";
-  };
-}
diff --git a/pkgs/by-name/pe/performous/package.nix b/pkgs/by-name/pe/performous/package.nix
index 48732279f298..aa7e045c64fd 100644
--- a/pkgs/by-name/pe/performous/package.nix
+++ b/pkgs/by-name/pe/performous/package.nix
@@ -55,12 +55,21 @@ stdenv.mkDerivation rec {
       url = "https://github.com/performous/performous/commit/eb9b97f46b7d064c32ed0f086d89a70427ce1d14.patch";
       hash = "sha256-98pcO/sFQJ+G67ErwlO/aAITNDPuRgPziQiF1cAlc0g=";
     })
+    # Fix build with CMake 4
+    (fetchpatch {
+      url = "https://github.com/performous/compact_enc_det/commit/28f46c18c60b851773b0ff61f3ce416fb09adcf3.patch?full_index=1";
+      stripLen = 1;
+      extraPrefix = "ced-src/";
+      hash = "sha256-23VD/4X4BOtcX5k+koSlRMowlbo2jAXbp3XKTXP7VrM=";
+    })
   ];
 
-  postPatch = ''
+  prePatch = ''
     mkdir ced-src
     cp -R ${cedSrc}/* ced-src
+  '';
 
+  postPatch = ''
     substituteInPlace data/CMakeLists.txt \
       --replace "/usr" "$out"
   '';
diff --git a/pkgs/by-name/pe/pest/package.nix b/pkgs/by-name/pe/pest/package.nix
index 6cc3bbb88e97..a5be5a24b227 100644
--- a/pkgs/by-name/pe/pest/package.nix
+++ b/pkgs/by-name/pe/pest/package.nix
@@ -16,7 +16,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-rOJ6PFp4Xfe89usoH455EAT30d2Tu3zd3+C/6K/kGBw=";
+  vendorHash = "sha256-4CpyerXmfXbwsNsK16V+GY3Rzo4BfavGpOVITD14p8w=";
 
   meta = {
     changelog = "https://github.com/pestphp/pest/releases/tag/v${finalAttrs.version}";
diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/by-name/pe/petrifoo/package.nix
similarity index 84%
rename from pkgs/applications/audio/petrifoo/default.nix
rename to pkgs/by-name/pe/petrifoo/package.nix
index 71eb8a766482..864c1668c47a 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/by-name/pe/petrifoo/package.nix
@@ -7,7 +7,7 @@
   cmake,
   gtk2,
   libjack2,
-  libgnomecanvas,
+  gnome2,
   libpthreadstubs,
   libsamplerate,
   libsndfile,
@@ -17,12 +17,12 @@
   openssl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "petri-foo";
   version = "0.1.87";
 
   src = fetchurl {
-    url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/petri-foo/petri-foo-${finalAttrs.version}.tar.bz2";
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     gtk2
     libjack2
-    libgnomecanvas
+    gnome2.libgnomecanvas
     libpthreadstubs
     libsamplerate
     libsndfile
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "MIDI controllable audio sampler";
     longDescription = "a fork of Specimen";
     homepage = "https://petri-foo.sourceforge.net";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "petri-foo";
   };
-}
+})
diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 4a0837cba019..43e53cd79758 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -110,11 +110,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5jqYTo5sfwLNByOlpry0zpI+q3u7ErwJJ97h7w5bvNQ=";
+    hash = "sha256-E/KPoTeeEfvsqfqjflpDTZFSI534YdtfVVWZ/Xa029I=";
   };
 
   patches = [
diff --git a/pkgs/by-name/pf/pffft/package.nix b/pkgs/by-name/pf/pffft/package.nix
index 6631385b9bf2..1679c076425d 100644
--- a/pkgs/by-name/pf/pffft/package.nix
+++ b/pkgs/by-name/pf/pffft/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation {
   pname = "pffft";
-  version = "0-unstable-2022-04-10";
+  version = "0-unstable-2025-06-09";
 
   src = fetchFromGitHub {
     owner = "marton78";
     repo = "pffft";
-    rev = "08f5ed2618ac06d7dcc83d209d7253dc215274d5";
-    sha256 = "sha256-9LfLQ17IRsbEwGQJZzhW2Av4en1KuJVicLrS2AyjUZY=";
+    rev = "9ae907aae7a39c08cea398778b9496ba7484423a";
+    sha256 = "sha256-+efWiBrJzC188tDSPHMARRDArzx/4E8GYPMfDHAND8k=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/pg/pgadmin4/missing-hashes.json b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
index ad60429537cd..bfe2a66960c2 100644
--- a/pkgs/by-name/pg/pgadmin4/missing-hashes.json
+++ b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
@@ -1,26 +1,26 @@
 {
-  "@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206",
-  "@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743",
-  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb",
-  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "e853f3b8a19d815af553b703e1d6d70abec525c61f3f19cc8a9d50d3749bc563b7f255307709b7c0836f76b110948489d3a9a3932d2fbc1775a083a56979bf56",
-  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "ec53e3e62c9351e28ea0e4c26a1d8ab257ac003e8184b1757b79c2a240baecec2452e0dbca08c8227fd01c498801c428230261fdb86198e873e07347d741c3c7",
-  "@img/sharp-libvips-linux-arm@npm:1.2.0": "a2f9822cb2ac5b315f2a02c59ebdb235f6c45251207795f83f1a92db696a9deced882dc752bdddd1eab98da5d7d1d1e9968ae142313ff09960b7ae30b760ba07",
-  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4",
-  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d",
-  "@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd",
-  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1",
-  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371",
-  "@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f",
-  "@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b",
-  "@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571",
-  "@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3",
-  "@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d",
-  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475",
-  "@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322",
-  "@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e",
-  "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
-  "@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
-  "@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
+  "@img/sharp-darwin-arm64@npm:0.34.4": "43ac812bf5fb459f119f1a723166e914b0f285cf5a90c4d67bbe649b8f3028d6488fd2e3d1c253ab2fac41fdc50844fd525588ba0fc4513eab27b8f8a6c44b0d",
+  "@img/sharp-darwin-x64@npm:0.34.4": "e305f46134463844415f66d51940436a0017dbaea7f41b975f858d84d8d760d44c7c7418332c53ef2a199cc30268d3480cd03ae146d77b69355814f77984f1a9",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.3": "7d12bfb6a5a7d9a08b429996f9bcbe26b916abf383660e9f4a563eb4043cfd7c81bc2e098d392ef849469db784fbd2ec0f5cb77196f6751f754cc5e9c9dfe26b",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.3": "72b155a5a84ea90c03f861ef0388038bd283c8884694a46620b284ca8daa91a2bf2170d352972bbd4238fa7ffe54f75f5305d960e74c2594a25040c73eaa8e3b",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.3": "ad294d5736174b4e654ab1c0e2f4259828cafd5355ce48a66bbffe551b2d28ec36501a1f8756403e8b224c732bf2bf1ddde4879f595c7a71d24041064584c763",
+  "@img/sharp-libvips-linux-arm@npm:1.2.3": "e7d1b2fa70b92d1bfa5fc96a1caf44fb9148ff968614ef7c2580e7afc6b934f1959baa73c8b1d1928cd44d0e0f6ce80da53876ceea305178819149068614fc96",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.3": "d19699afba86ab6cbb341a94de26f42ed7a4fa49a63c04cde1a0b5083c763f6d44d3c776ce44418e23d2baf54fb938ee1cb9c801d08af983d953e374416a25cf",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.3": "cac0cb0435dbe3a14f9a16e600ad578b6ec0eb31ea11e57bac1e2d04aa0cb48abe6784924fd93dd1f369d6b2066767666dfa16cc1d0f1b39f8cf3e04f8279391",
+  "@img/sharp-libvips-linux-x64@npm:1.2.3": "71b34ce6b907503350610be0a7bd6f6508af88e9c6580b9ade4e6e4e682d46777302f3dfa2dece87c1ebfb6dde35a90fa9cb8028f7beb4b74a6ece3a5e4bfeff",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.3": "8d11423632b7ce6237604258609aa2bfcf0b1c13f3680260b37c5633a417ed9160c22b34e285a8bf34073ccd3d3a12ff2c1f3523eee45be2a7ff9ea6c77ccf05",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.3": "a71df40da0f563450ba15c5e1b32fa6ac648243aecf435dd2dd063d9d9b886eda38e33446465d5a600b98fcc6bac130e322d88504c16d1f452746c20a2910dbd",
+  "@img/sharp-linux-arm64@npm:0.34.4": "a2480a94b8b55c55f000e5d21d0d0413f4db16c9b7fbed431936f996d13a6f38214a4f04f016a89171c07fd995650483bc3ba0caaa204abddcd644bbf47d850f",
+  "@img/sharp-linux-arm@npm:0.34.4": "232ac951134af96d3c3a862db40639f174afe26b4d589fe97374d03d215237b99defbbfc7210af7a711893c881fc152032c32fd841afca05c493f127d0e6f7ca",
+  "@img/sharp-linux-ppc64@npm:0.34.4": "b872204fe0f3684a27a2931d3aef306837012f2a52225e057a1e28828c0c0668e21306e2dd1e459d2e91146ddac44b34ec59a10d446e4212ed667b859a424a43",
+  "@img/sharp-linux-s390x@npm:0.34.4": "f621a97fa238d54ad6db42ab14beba8605ee3335da06e1a72125bd2697dc363a66167c6191d9c0f2621cfed170528e131349992689ffcf6dd7ee387e16513c4a",
+  "@img/sharp-linux-x64@npm:0.34.4": "64dc5c8ee5432036428ade596b9daaa17ac343303d8b40f7e53e1253f9b598a55a1928b89b1d77ac54fc4a1cb871c472264d3bd36bdbc6828cc51b079a4d7080",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.4": "8b555d30463f8312f44a15a528cbc9493a21925ee748519926cbf4157c752c5d4f23bed78d66fb4dbc3206e07fc0ce4a96d2aab709fd8fffe4568e89d3882706",
+  "@img/sharp-linuxmusl-x64@npm:0.34.4": "0bbcd14be148b629b483a38461d42276cf48b4f469bffa7319860abb636f12bb65a33d8e50590b659665293e1eff12bafd71256b36c137d78327422197b8dae9",
+  "@img/sharp-wasm32@npm:0.34.4": "e6b03a6339504592aaa645cc8a8471488e816672c255108c04ec0df802647a75b505fac229b72db3120beb6714ff763c49af6df26d2842d36a8a6a4731590024",
+  "@img/sharp-win32-arm64@npm:0.34.4": "e79bd3184c798d7623afb045ba49846e02355b8c589abf62f67c63cd341912e17cb799ba0f61bc59e3583f4c42e1f1ca860c97c6093d36d9be4be6a9dcaa8095",
+  "@img/sharp-win32-ia32@npm:0.34.4": "0d8cbd0419cf7671875491922ee0e3af11592ac234eb370688342e3f245cd98f54d029c323f9c48fee357f8b5de12c4155427805f28cebe2d87928006fb99b36",
+  "@img/sharp-win32-x64@npm:0.34.4": "6185e60fe69290d1a1c828f5540215e9b8f171f93623f3e7498c1dbb0c5d27a8bc989b57ade72a88eff1b7c48423fcc8a96b1680c2794b02fa3d157ffb49dcc8",
   "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
   "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
   "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix
index adf9b1543aea..f9894e25a9da 100644
--- a/pkgs/by-name/pg/pgadmin4/package.nix
+++ b/pkgs/by-name/pg/pgadmin4/package.nix
@@ -20,14 +20,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.8";
-  yarnHash = "sha256-NvQlrDXn9sa4MpytFYPsC4bKO8Thx/MuqG8M6VIa2ig=";
+  version = "9.9";
+  yarnHash = "sha256-QInOfpgQgx4i/gTyWG40Sl7Me5ynC/nOfjik82ltwLM=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-gnVrMuxWV7lAol1gyONbhtuUL4EEOfOPkRUM2esMgi0=";
+    hash = "sha256-XzjotJt02mZ0Se/bZMqAl8KL6egIVqqkbiEdcRuHcuE=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests
@@ -219,6 +219,8 @@ pythonPackages.buildPythonApplication rec {
   # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495
   doCheck = !postgresqlTestHook.meta.broken;
 
+  # for replication testing in regression tests for PostgreSql >= 17
+  env.postgresqlExtraSettings = "wal_level = logical";
   checkPhase = ''
     runHook preCheck
 
@@ -236,6 +238,18 @@ pythonPackages.buildPythonApplication rec {
     substituteInPlace regression/test_config.json --replace-fail "localhost" "$PGHOST"
     substituteInPlace regression/runtests.py --replace-fail "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"
 
+    # test cases hardcode ports and host in subscription replication tests
+    for files in pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/*
+    do
+      substituteInPlace $files --replace-quiet "5917" "5432"
+      substituteInPlace $files --replace-quiet "localhost" "$PGHOST"
+    done
+    for files in pgadmin/browser/server_groups/servers/databases/subscriptions/tests/18_plus/*
+    do
+      substituteInPlace $files --replace-quiet "5434" "5432"
+      substituteInPlace $files --replace-quiet "localhost" "$PGHOST"
+    done
+
     ## Browser test ##
     python regression/runtests.py --pkg browser --exclude ${skippedTests}
 
diff --git a/pkgs/by-name/pg/pgbackrest/package.nix b/pkgs/by-name/pg/pgbackrest/package.nix
index 122516cbefbd..4b5ebce7beb8 100644
--- a/pkgs/by-name/pg/pgbackrest/package.nix
+++ b/pkgs/by-name/pg/pgbackrest/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pgbackrest";
-  version = "2.56.0";
+  version = "2.57.0";
 
   src = fetchFromGitHub {
     owner = "pgbackrest";
     repo = "pgbackrest";
     tag = "release/${finalAttrs.version}";
-    hash = "sha256-GDHpeTz85cgKTbcuaTlwJ1SUNMedSylqKWdrgH8Zp8Q=";
+    hash = "sha256-TwyMWE9/aCWBIn+AKGaR0UC5qScWPEaDyOG723/2NHA=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/pg/pgf_graphics/package.nix b/pkgs/by-name/pg/pgf_graphics/package.nix
deleted file mode 100644
index f92be10a6307..000000000000
--- a/pkgs/by-name/pg/pgf_graphics/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  autoreconfHook,
-  dos2unix,
-  doxygen,
-  freeimage,
-  libpgf,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pgf";
-  version = "7.21.7";
-
-  src = fetchzip {
-    url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip";
-    hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0=";
-  };
-
-  postPatch = ''
-    find . -type f | xargs dos2unix
-    mv README.txt README
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-    dos2unix
-    doxygen
-  ];
-
-  buildInputs = [
-    freeimage
-    libpgf
-  ];
-
-  meta = {
-    homepage = "https://www.libpgf.org/";
-    description = "Progressive Graphics Format command line program";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/pg/pgmodeler/package.nix b/pkgs/by-name/pg/pgmodeler/package.nix
index d076d7493aaa..6d73a7096d14 100644
--- a/pkgs/by-name/pg/pgmodeler/package.nix
+++ b/pkgs/by-name/pg/pgmodeler/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmodeler";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "pgmodeler";
     repo = "pgmodeler";
     rev = "v${version}";
-    sha256 = "sha256-DIyqUewP8q9O6O/v82a2DNgyrBffWkBmyhBm3pA1qVY=";
+    sha256 = "sha256-gDhH6b+8zFIsosdecUUkwAQMP1HME4EbJZsFyTzvGcE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix
index cff0a849af48..6ee47544a65d 100644
--- a/pkgs/by-name/pg/pgrok/package.nix
+++ b/pkgs/by-name/pg/pgrok/package.nix
@@ -9,12 +9,12 @@
 
 let
   pname = "pgrok";
-  version = "1.4.5";
+  version = "1.4.6";
   src = fetchFromGitHub {
     owner = "pgrok";
     repo = "pgrok";
     tag = "v${version}";
-    hash = "sha256-eDtYnsHZpdIGcgRGHTptlfVf//bxup6ZDWvVkBJdBbE=";
+    hash = "sha256-Meavhgq0xHRAfCgzdazC1wu8aDw39qQCZrVtZUScwgs=";
   };
 in
 
@@ -37,7 +37,7 @@ buildGoModule {
     hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg=";
   };
 
-  vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90=";
+  vendorHash = "sha256-l/tUO7fevi+zUmUp6CQoVNrzMF7LIzbo2Qsa/ez6LiA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pg/pgroll/package.nix b/pkgs/by-name/pg/pgroll/package.nix
index 424762e6fb1b..6e0e7ecd963c 100644
--- a/pkgs/by-name/pg/pgroll/package.nix
+++ b/pkgs/by-name/pg/pgroll/package.nix
@@ -4,16 +4,17 @@
   lib,
   libpg_query,
   xxHash,
+  testers,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "pgroll";
   version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "xataio";
     repo = "pgroll";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OqBgFeXpvoImoPMKHBCvsPQGhHSBZuNNMLh2/3DPPYo=";
   };
 
@@ -21,16 +22,29 @@ buildGoModule rec {
 
   vendorHash = "sha256-rQPWL39AD/qCneuRyJHOQCANmDE7pqmwHx+AavJ/3cw=";
 
-  excludedPackages = [ "dev" ];
+  excludedPackages = [
+    "dev"
+    "tools"
+  ];
 
   buildInputs = [
     libpg_query
     xxHash
   ];
 
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/xataio/pgroll/cmd.Version=${finalAttrs.version}"
+  ];
+
   # Tests require a running docker daemon
   doCheck = false;
 
+  passthru.tests.version = testers.testVersion {
+    package = finalAttrs.finalPackage;
+  };
+
   meta = {
     description = "PostgreSQL zero-downtime migrations made easy";
     license = lib.licenses.asl20;
@@ -38,4 +52,4 @@ buildGoModule rec {
     homepage = "https://github.com/xataio/pgroll";
     maintainers = with lib.maintainers; [ ilyakooo0 ];
   };
-}
+})
diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix
new file mode 100644
index 000000000000..ab9d06f47d11
--- /dev/null
+++ b/pkgs/by-name/pg/pgsql-tools/package.nix
@@ -0,0 +1,89 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  autoPatchelfHook,
+  libxcrypt-legacy,
+  makeBinaryWrapper,
+  pgsql-tools,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pgsql-tools";
+  version = "2.1.0";
+
+  src = fetchurl (
+    let
+      sources = {
+        x86_64-linux = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-x64.tar.gz";
+          hash = "sha256-dN7+LJCUwb39ypuJV4p3jUHNGAPaObN4aZvsOHIpmkQ=";
+        };
+        aarch64-linux = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-arm64.tar.gz";
+          hash = "sha256-rD8jymGdM1RDGDbrKu6E7xoWtSMRNuc2ngCmR+sHgQI=";
+        };
+        x86_64-darwin = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-x86.tar.gz";
+          hash = "sha256-KLl7HPChurzB6QYV6AqAP3g1J3VKl61+we3opzJQwG0=";
+        };
+        aarch64-darwin = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-arm64.tar.gz";
+          hash = "sha256-tpabEKB1kqse7D58FsP/9jywk+vgAAvptL9MadwxWg8=";
+        };
+      };
+    in
+    sources.${stdenv.hostPlatform.system}
+  );
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.isLinux [
+    autoPatchelfHook
+  ];
+
+  buildInputs = lib.optionals stdenv.isLinux [
+    libxcrypt-legacy
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  dontBuild = true;
+  dontStrip = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/lib/pgsql-tools
+    install -Dm755 ossdbtoolsservice_main $out/lib/pgsql-tools/ossdbtoolsservice_main
+    cp -r _internal $out/lib/pgsql-tools/
+
+    makeBinaryWrapper $out/lib/pgsql-tools/ossdbtoolsservice_main $out/bin/ossdbtoolsservice_main \
+      ${lib.optionalString stdenv.isLinux ''--prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          libxcrypt-legacy
+          (lib.getLib stdenv.cc.cc)
+        ]
+      }"''} \
+      --chdir $out/lib/pgsql-tools
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = ./update.sh;
+  };
+
+  meta = {
+    homepage = "https://github.com/microsoft/pgsql-tools";
+    description = "Backend service for PostgreSQL server tools, offering features such as connection management, query execution with result set handling, and language service support via the VS Code protocol";
+    changelog = "https://github.com/microsoft/pgsql-tools/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ liberodark ];
+    mainProgram = "ossdbtoolsservice_main";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/pg/pgsql-tools/update.sh b/pkgs/by-name/pg/pgsql-tools/update.sh
new file mode 100644
index 000000000000..ddd35c318e8a
--- /dev/null
+++ b/pkgs/by-name/pg/pgsql-tools/update.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash curl jq nix nix-prefetch common-updater-scripts
+
+set -euo pipefail
+
+latestVersion=$(curl --fail --silent https://api.github.com/repos/microsoft/pgsql-tools/releases/latest | jq --raw-output '.tag_name | ltrimstr("v")')
+currentVersion=$(nix eval --raw -f . pgsql-tools.version 2>/dev/null || echo "unknown")
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+  echo "package is up-to-date"
+  exit 0
+fi
+
+update-source-version pgsql-tools "$latestVersion" --file=pkgs/by-name/pg/pgsql-tools/package.nix
+
+declare -A platforms=(
+  ["x86_64-linux"]="pgsqltoolsservice-linux-x64.tar.gz"
+  ["aarch64-linux"]="pgsqltoolsservice-linux-arm64.tar.gz"
+  ["x86_64-darwin"]="pgsqltoolsservice-osx-x86.tar.gz"
+  ["aarch64-darwin"]="pgsqltoolsservice-osx-arm64.tar.gz"
+)
+
+for system in "${!platforms[@]}"; do
+  filename="${platforms[$system]}"
+  url="https://github.com/microsoft/pgsql-tools/releases/download/v${latestVersion}/${filename}"
+
+  echo "Updating hash for $system..."
+  hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "$url"))
+  update-source-version pgsql-tools "$latestVersion" "$hash" --system="$system" --ignore-same-version --ignore-same-hash
+done
diff --git a/pkgs/by-name/ph/phart/package.nix b/pkgs/by-name/ph/phart/package.nix
new file mode 100644
index 000000000000..a2ff7cd98cef
--- /dev/null
+++ b/pkgs/by-name/ph/phart/package.nix
@@ -0,0 +1,3 @@
+{ python3Packages }:
+
+python3Packages.toPythonApplication python3Packages.phart
diff --git a/pkgs/by-name/ph/phira-free/package.nix b/pkgs/by-name/ph/phira-free/package.nix
new file mode 100644
index 000000000000..3cc205396a2e
--- /dev/null
+++ b/pkgs/by-name/ph/phira-free/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenvNoCC,
+  phira,
+  phira-unwrapped,
+  imagemagick,
+  ubuntu-classic,
+}:
+
+phira.override {
+  overrideAssets = stdenvNoCC.mkDerivation {
+    pname = "phira-assets";
+    version = phira.version;
+
+    nativeBuildInputs = [ imagemagick ];
+
+    dontUnpack = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -r ${phira-unwrapped.src}/assets $out
+      chmod -R +w $out/assets
+
+      magick -size 4000x2000 canvas:'rgb(128,162,206)' $out/assets/background.jpg
+      cp ${ubuntu-classic}/share/fonts/truetype/ubuntu/Ubuntu-R.ttf $out/assets/font.ttf
+
+      runHook postInstall
+    '';
+  };
+}
diff --git a/pkgs/by-name/ph/phira-unwrapped/assets.patch b/pkgs/by-name/ph/phira-unwrapped/assets.patch
new file mode 100644
index 000000000000..eeb26be0b563
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/assets.patch
@@ -0,0 +1,19 @@
+diff --git a/prpr/src/core.rs b/prpr/src/core.rs
+index 7f9d4db..33c44bb 100644
+--- a/prpr/src/core.rs
++++ b/prpr/src/core.rs
+@@ -68,6 +68,14 @@ thread_local! {
+ }
+ 
+ pub fn init_assets() {
++    if let Ok(root_path) = std::env::var("PHIRA_ROOT") {
++        let path = std::path::Path::new(&root_path);
++        if path.exists() {
++            std::env::set_current_dir(path).unwrap();
++            set_pc_assets_folder("assets");
++            return;
++        }
++    }
+     if let Ok(mut exe) = std::env::current_exe() {
+         while exe.pop() {
+             if exe.join("assets").exists() {
diff --git a/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
new file mode 100644
index 000000000000..70912ebdb111
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
@@ -0,0 +1,119 @@
+diff --git a/prpr-avc/Cargo.toml b/prpr-avc/Cargo.toml
+index 257c575..bf35b10 100644
+--- a/prpr-avc/Cargo.toml
++++ b/prpr-avc/Cargo.toml
+@@ -9,3 +9,6 @@ edition = "2021"
+ sasa = { git = "https://github.com/Mivik/sasa", default-features = false }
+ thiserror = "1.0.56"
+ tracing = "0.1.37"
++
++[build-dependencies]
++pkg-config = "0.3"
+diff --git a/prpr-avc/build.rs b/prpr-avc/build.rs
+index 961b032..6d0b714 100644
+--- a/prpr-avc/build.rs
++++ b/prpr-avc/build.rs
+@@ -1,10 +1,7 @@
+ use std::path::Path;
+ 
+ fn main() {
+-    let libs_dir = std::env::var("PRPR_AVC_LIBS").unwrap_or_else(|_| format!("{}/static-lib", std::env::var("CARGO_MANIFEST_DIR").unwrap()));
+-    let libs_path = Path::new(&libs_dir).join(std::env::var("TARGET").unwrap());
+-    let libs_path = libs_path.display();
+-    println!("cargo:rustc-link-search={libs_path}");
+-    println!("cargo:rustc-link-lib=z");
+-    println!("cargo:rerun-if-changed={libs_path}");
++    for lib in ["libavformat", "libavcodec", "libavutil", "libswscale", "libswresample"] {
++        let _ = pkg_config::Config::new().statik(false).probe(lib);
++    }
+ }
+diff --git a/prpr-avc/src/ffi.rs b/prpr-avc/src/ffi.rs
+index 8218ef3..a2c7f6a 100644
+--- a/prpr-avc/src/ffi.rs
++++ b/prpr-avc/src/ffi.rs
+@@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3;
+ 
+ pub const AV_ROUND_UP: AVRounding = 0;
+ 
+-#[link(name = "avformat", kind = "static")]
+ extern "C" {
+     pub fn avformat_alloc_context() -> *mut AVFormatContext;
+     pub fn avformat_free_context(s: *mut AVFormatContext);
+@@ -20,7 +19,6 @@ extern "C" {
+     pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int;
+ }
+ 
+-#[link(name = "avutil", kind = "static")]
+ extern "C" {
+     pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int;
+     pub fn av_frame_alloc() -> *mut AVFrame;
+@@ -29,7 +27,6 @@ extern "C" {
+     pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64;
+ }
+ 
+-#[link(name = "avcodec", kind = "static")]
+ extern "C" {
+     pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec;
+     pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext;
+@@ -43,7 +40,6 @@ extern "C" {
+     pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat;
+ }
+ 
+-#[link(name = "swscale", kind = "static")]
+ extern "C" {
+     pub fn sws_getContext(
+         srcW: ::std::os::raw::c_int,
+@@ -68,10 +64,9 @@ extern "C" {
+     ) -> ::std::os::raw::c_int;
+ }
+ 
+-#[link(name = "swresample", kind = "static")]
+ extern "C" {
+-    pub fn swr_alloc_set_opts(
+-        s: *mut SwrContext,
++    pub fn swr_alloc_set_opts2(
++        ps: *mut *mut SwrContext,
+         out_ch_layout: i64,
+         out_sample_fmt: AVSampleFormat,
+         out_sample_rate: ::std::os::raw::c_int,
+@@ -80,7 +75,7 @@ extern "C" {
+         in_sample_rate: ::std::os::raw::c_int,
+         log_offset: ::std::os::raw::c_int,
+         log_ctx: *mut ::std::os::raw::c_void,
+-    ) -> *mut SwrContext;
++    ) -> ::std::os::raw::c_int;
+     pub fn swr_init(s: *mut SwrContext) -> ::std::os::raw::c_int;
+     pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64;
+     pub fn swr_convert(
+diff --git a/prpr-avc/src/swr.rs b/prpr-avc/src/swr.rs
+index 7288a51..c00b874 100644
+--- a/prpr-avc/src/swr.rs
++++ b/prpr-avc/src/swr.rs
+@@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr<ffi::SwrContext>);
+ impl SwrContext {
+     pub fn new(in_format: &AudioStreamFormat, out_format: &AudioStreamFormat) -> Result<Self> {
+         unsafe {
+-            OwnedPtr::new(ffi::swr_alloc_set_opts(
+-                null_mut(),
++            let mut raw: *mut ffi::SwrContext = null_mut();
++            let ret = ffi::swr_alloc_set_opts2(
++                &mut raw,
+                 out_format.channel_layout as _,
+                 out_format.sample_fmt,
+                 out_format.sample_rate,
+@@ -15,9 +16,12 @@ impl SwrContext {
+                 in_format.sample_rate,
+                 0,
+                 null_mut(),
+-            ))
+-            .map(|ctx| Self(ctx))
+-            .ok_or(Error::AllocationFailed)
++            );
++            if ret < 0 || raw.is_null() {
++                Err(Error::AllocationFailed)
++            } else {
++                OwnedPtr::new(raw).map(|ctx| Self(ctx)).ok_or(Error::AllocationFailed)
++            }
+         }
+     }
+ 
diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix
new file mode 100644
index 000000000000..0aaeb78b1638
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  rustPlatform,
+  pkg-config,
+  perl,
+  ffmpeg,
+  alsa-lib,
+  gtk3,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "phira-unwrapped";
+  version = "0.6.7";
+
+  src = fetchFromGitHub {
+    owner = "TeamFlos";
+    repo = "phira";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4WIvLfKeh+quu7dHKMlUKt+NQnui2/txlFYZoU3voPA=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    perl
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook # for crate coreaudio-sys
+  ];
+
+  buildInputs = [
+    ffmpeg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib # for crate alsa-sys
+    gtk3 # for crate gtk-sys
+  ];
+
+  patches = [
+    # use dynamically linked ffmpeg instead of expecting static lib
+    ./ffmpeg.patch
+
+    # error[E0554]: `#![feature]` may not be used on the stable release channel
+    ./stable-features.patch
+
+    # missing macro from tracing crate
+    ./tracing.patch
+
+    # allow using env var to specify location of assets and data
+    ./assets.patch
+  ];
+
+  cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI=";
+
+  # The developer put assets necessary for this test in gitignore, so it cannot run.
+  checkFlags = [ "--skip test_parse_chart" ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "phira";
+      desktopName = "Phira";
+      exec = "phira-main";
+      icon = "phira";
+      comment = finalAttrs.meta.description;
+      categories = [ "Game" ];
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 assets/icon.png $out/share/icons/hicolor/128x128/apps/phira.png
+  '';
+
+  meta = {
+    description = "Rhythm game with custom charts and multiplayer";
+    homepage = "https://github.com/TeamFlos/phira";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    changelog = "https://github.com/TeamFlos/phira/releases/tag/v${finalAttrs.version}";
+    platforms = lib.platforms.unix;
+    mainProgram = "phira-main";
+  };
+
+})
diff --git a/pkgs/by-name/ph/phira-unwrapped/stable-features.patch b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch
new file mode 100644
index 000000000000..9aac943305b1
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch
@@ -0,0 +1,10 @@
+diff --git a/prpr/src/lib.rs b/prpr/src/lib.rs
+index 15a139f..6b4e469 100644
+--- a/prpr/src/lib.rs
++++ b/prpr/src/lib.rs
+@@ -1,5 +1,3 @@
+-#![feature(local_key_cell_methods)]
+-
+ pub mod bin;
+ pub mod config;
+ pub mod core;
diff --git a/pkgs/by-name/ph/phira-unwrapped/tracing.patch b/pkgs/by-name/ph/phira-unwrapped/tracing.patch
new file mode 100644
index 000000000000..d1366f439f73
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/tracing.patch
@@ -0,0 +1,24 @@
+diff --git a/phira-monitor/Cargo.toml b/phira-monitor/Cargo.toml
+index 722a022..899b7db 100644
+--- a/phira-monitor/Cargo.toml
++++ b/phira-monitor/Cargo.toml
+@@ -15,6 +15,7 @@ serde = { version = "*", features = ["derive"] }
+ serde_yaml = "*"
+ tokio = { workspace = true }
+ uuid = { version = "1.4.0", features = ["v4"] }
++tracing = "0.1"
+ 
+ phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
+ phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
+diff --git a/phira-monitor/src/main.rs b/phira-monitor/src/main.rs
+index 61bcfba..a4bf8af 100644
+--- a/phira-monitor/src/main.rs
++++ b/phira-monitor/src/main.rs
+@@ -14,6 +14,7 @@ use prpr::{
+ use scene::MainScene;
+ use serde::Deserialize;
+ use std::fs::File;
++use tracing::warn;
+ 
+ mod dir {
+     use anyhow::Result;
diff --git a/pkgs/by-name/ph/phira/package.nix b/pkgs/by-name/ph/phira/package.nix
new file mode 100644
index 000000000000..3fb1d9098adc
--- /dev/null
+++ b/pkgs/by-name/ph/phira/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  symlinkJoin,
+  fetchzip,
+  phira-unwrapped,
+  makeWrapper,
+  libGL,
+  # A derivation or a path that contains a dir `assets`.
+  overrideAssets ? fetchzip {
+    url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-v${phira-unwrapped.version}.zip";
+    hash = "sha256-kgmIIIzg+wxyspQTyW1GucW0RVPfBhIRlK5DEGXK1Qs=";
+    stripRoot = false;
+    meta.license = lib.licenses.unfree;
+  },
+}:
+
+symlinkJoin {
+  pname = "phira";
+  version = phira-unwrapped.version;
+
+  paths = [ phira-unwrapped ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    phira_root=$out/share/phira
+    mkdir -p $phira_root
+    cp -r ${overrideAssets}/assets $phira_root
+
+    wrapper_options=(
+      ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"}
+      --run '
+        export PHIRA_ROOT=''${PHIRA_ROOT-"''${XDG_DATA_HOME-"$HOME/.local/share"}/phira"}
+        if [[ ! -d "$PHIRA_ROOT/assets" ]]; then
+          mkdir -p "$PHIRA_ROOT"
+          cp -r "'$phira_root/assets'" "$PHIRA_ROOT"
+          chmod -R +w "$PHIRA_ROOT/assets"
+        fi
+      '
+    )
+
+    wrapProgram $out/bin/phira-main "''${wrapper_options[@]}"
+    wrapProgram $out/bin/phira-monitor "''${wrapper_options[@]}"
+  '';
+
+  passthru.assets = overrideAssets;
+
+  meta = phira-unwrapped.meta;
+
+}
diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix
index 985dd32f2099..95c7cbe2a198 100644
--- a/pkgs/by-name/ph/phoenixd/package.nix
+++ b/pkgs/by-name/ph/phoenixd/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoenixd";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src =
     let
@@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     fetchurl {
       url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
       hash = selectSystem {
-        aarch64-darwin = "sha256-6yZmvoVCCW3ulYB8khJ8khtk8o/AiN/0tbwGwpH8ekA=";
-        x86_64-darwin = "sha256-aZy984ttf1NaCo+5LU/03CTPmcpb2N2rfRd3H5Vc0hA=";
-        x86_64-linux = "sha256-2ir2mfjp+2ExdT6drrbrTJcJzauXD7wtE3oTJ+J0WpI=";
-        aarch64-linux = "sha256-zXJ4fihwM2a04Uv2LcctcmN2PiZLtjGQwpxUVP/Sn6Y=";
+        aarch64-darwin = "sha256-8j3fzT2KWlspp4+5vplbvO6nrd1G+Fox6B6+YB+NE1k=";
+        x86_64-darwin = "sha256-f7OwOr0PRkfX6rdddoW4GNvIv16wjAU0G7LiI+oS+xQ=";
+        x86_64-linux = "sha256-2oVnY/BjSC3HxfOMlqWyI/Yue3PT+vNWten4ty2DZVk=";
+        aarch64-linux = "sha256-oRUXFZwGShZzqNiY18gKm1ZNVJ/zfARhr9d7S4hN8XQ=";
       };
     };
 
diff --git a/pkgs/by-name/ph/phonemizer/package.nix b/pkgs/by-name/ph/phonemizer/package.nix
new file mode 100644
index 000000000000..1a49b263f00c
--- /dev/null
+++ b/pkgs/by-name/ph/phonemizer/package.nix
@@ -0,0 +1,13 @@
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      bibtexparser = self.bibtexparser_2;
+    }
+  );
+in
+with pythonPackages;
+toPythonApplication phonemizer
diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix
index 0946372fd42a..057e323ed057 100644
--- a/pkgs/by-name/ph/photoprism/backend.nix
+++ b/pkgs/by-name/ph/photoprism/backend.nix
@@ -45,7 +45,7 @@ buildGoModule {
     substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty"
   '';
 
-  vendorHash = "sha256-8uy0uLhGOyedqi3AvMsEdDQnFvGgeeZcL4tFgI6bzU8=";
+  vendorHash = "sha256-yLzIjoN1csyNpounvbQ6r1nudPypwjabAbdhyjna2+s=";
 
   subPackages = [ "cmd/photoprism" ];
 
diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix
index 8ac445889867..d0acfedb72b4 100644
--- a/pkgs/by-name/ph/photoprism/frontend.nix
+++ b/pkgs/by-name/ph/photoprism/frontend.nix
@@ -13,7 +13,11 @@ buildNpmPackage {
     cd frontend
   '';
 
-  npmDepsHash = "sha256-rfZ6VE3JRR8MrB61DqueXWNoOjDE+GJnyrNujGyc8wc=";
+  npmDepsHash = "sha256-IC92WESUAp+P0MbFasCTwpo0GcGoTfO8IkLbHfnrnNY=";
+
+  # Some dependencies are fetched from git repositories
+  forceGitDeps = true;
+  makeCacheWritable = true;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix
index 6d91f69bb35e..7104628e31c4 100644
--- a/pkgs/by-name/ph/photoprism/package.nix
+++ b/pkgs/by-name/ph/photoprism/package.nix
@@ -17,14 +17,14 @@
 }:
 
 let
-  version = "250426-27ec7a128";
+  version = "250707-d28b3101e";
   pname = "photoprism";
 
   src = fetchFromGitHub {
     owner = "photoprism";
     repo = "photoprism";
     rev = version;
-    hash = "sha256-wsSWCTFfKQ+8aE8GKvXpA49LbBLMTE1lsJMYFLvquBM=";
+    hash = "sha256-KT50tjgM3b3edRB3R8dR3tIF9sXFr+Cm0BMsFqBJG6s=";
   };
 
   backend = callPackage ./backend.nix { inherit src version; };
@@ -34,7 +34,7 @@ let
     { name, hash }:
     fetchzip {
       inherit hash;
-      url = "https://dl.photoprism.org/tensorflow/${name}.zip";
+      url = "https://dl.photoprism.app/tensorflow/${name}.zip";
       stripRoot = false;
     };
 
diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix
index 402970157526..6be056dd7b52 100644
--- a/pkgs/by-name/ph/phpactor/package.nix
+++ b/pkgs/by-name/ph/phpactor/package.nix
@@ -7,16 +7,16 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpactor";
-  version = "2025.07.25.0";
+  version = "2025.10.17.0";
 
   src = fetchFromGitHub {
     owner = "phpactor";
     repo = "phpactor";
     tag = finalAttrs.version;
-    hash = "sha256-9XWlWwq+xvqPgKIc7IGoMVTxajjYsrPo/ra/0JIE168=";
+    hash = "sha256-A/ajGQ75z/EdWFFJK0kLjcSFfa9z15TZCNZZpwq9k2E=";
   };
 
-  vendorHash = "sha256-3xkt0QjytW4BOCgZdevat7zkSuZTPPvwz3yptiq5zoo=";
+  vendorHash = "sha256-qLcwAmnkh3nxrvdDa/OI3RQOi/4qhxURhcXM1r5iE88=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ph/phpdocumentor/package.nix b/pkgs/by-name/ph/phpdocumentor/package.nix
index 92e583031735..6026aacb1073 100644
--- a/pkgs/by-name/ph/phpdocumentor/package.nix
+++ b/pkgs/by-name/ph/phpdocumentor/package.nix
@@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: {
     hash = "sha256-iQA19FrXvVLzg+LaY1BcNmG8amMfKPVFwYbZ7dr+H9Q=";
   };
 
-  vendorHash = "sha256-sFRy9Hy9CVNjjYqbPbKH0XhoUdu4HlkiuHDDovTGono=";
+  vendorHash = "sha256-iXkj0Pa4ln8GX/ARCpnijaWdFM4VYZuj42RP0GS2LW8=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index 14597363261f..c4a6e2838a85 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -10,16 +10,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "12.4.1";
+  version = "12.4.2";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-QDZ5vwmBv+rfXzecg7gvrT7BRnRgIzmKkRpwTwxDQ5w=";
+    hash = "sha256-UXPFCnsUQhq3RS/MD9jfW0YKheHjzwQoV9TqLRi05nQ=";
   };
 
-  vendorHash = "sha256-zG6Q7y7EBTyPYBvCWvehy0KaZ+utUyzveEAaqsedOgE=";
+  vendorHash = "sha256-Fsj+pu1MYuuIpGE0QC6lSPmPwYCpF1ID/HMoYLFxwFE=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index c996dae22afc..69d22ea9e841 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.47.0";
+  version = "2.50.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-/TQN8id0oo9xkrJWSkWkUcaMLILZx193qCSSJSbT7WM=";
+    sha256 = "sha256-FXoejKKbykNKcWN+4hf3PRdhyZaiZef6c2NsMQK/saQ=";
   };
 
-  vendorHash = "sha256-NxObJPzWcC+w8v1dlv2esqNX36uGbs2pYH7TqDLy7HE=";
+  vendorHash = "sha256-uJR5RjBjSZmoYJNsbbvAabYfRhd9APNHwR8SP+44fC0=";
 
   ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
 
diff --git a/pkgs/by-name/ph/phytool/package.nix b/pkgs/by-name/ph/phytool/package.nix
new file mode 100644
index 000000000000..9a19b0fa398c
--- /dev/null
+++ b/pkgs/by-name/ph/phytool/package.nix
@@ -0,0 +1,35 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+}:
+stdenv.mkDerivation {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  pname = "phytool";
+  version = "2-unstable-2024-07-14";
+
+  src = fetchFromGitHub {
+    owner = "wkz";
+    repo = "phytool";
+    rev = "bcf23b0261aa9f352ee4b944e30e3482158640a4";
+    hash = "sha256-8e2DVjG/2CtJ/+FLzMa1VKajJZfFqjD54XQAMY+0q3U=";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  preInstall = ''
+    mkdir -p "$out/bin"
+  '';
+
+  meta = {
+    description = "Linux MDIO register access";
+    homepage = "https://github.com/wkz/phytool";
+    changelog = "https://github.com/wkz/phytool/releases";
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.connorbaker ];
+  };
+}
diff --git a/pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch b/pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch
new file mode 100644
index 000000000000..5b02d1b8ac95
--- /dev/null
+++ b/pkgs/by-name/pi/pianobooster/bump-cmake-minimum-required-version.patch
@@ -0,0 +1,33 @@
+From aba8b1570051e17e9568cfcc2a2b0ed316e90075 Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Sat, 11 Oct 2025 15:39:08 +0300
+Subject: [PATCH] Bump cmake_minimum_required to support CMake 4
+
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8432a843..c4bbe56e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.4)
++cmake_minimum_required(VERSION 3.5)
+ if(COMMAND cmake_policy)
+     cmake_policy(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 02867c8f..23bc9eff 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -10,7 +10,7 @@ else()
+    option(USE_BUNDLED_RTMIDI "Build with bundled rtmidi" ON)
+ endif()
+ 
+-cmake_minimum_required(VERSION 2.4)
++cmake_minimum_required(VERSION 3.5)
+ if(COMMAND cmake_policy)
+     cmake_policy(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
diff --git a/pkgs/by-name/pi/pianobooster/package.nix b/pkgs/by-name/pi/pianobooster/package.nix
index 69336826e737..178c2d1466c6 100644
--- a/pkgs/by-name/pi/pianobooster/package.nix
+++ b/pkgs/by-name/pi/pianobooster/package.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1WOlAm/HXSL6QK0Kd1mnFEZxxpMseTG+6WzgMNWt+RA=";
   };
 
+  patches = [
+    # Bump cmake_minimum_required to support CMake 4
+    # https://github.com/pianobooster/PianoBooster/pull/349
+    ./bump-cmake-minimum-required-version.patch
+  ];
+
   postPatch = ''
     substituteInPlace src/Settings.cpp src/GuiMidiSetupDialog.cpp \
       --replace "/usr/share/soundfonts" "${soundfont-fluid}/share/soundfonts" \
diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix
index de91c084031c..adf44f0f5af6 100644
--- a/pkgs/by-name/pi/picom-pijulius/package.nix
+++ b/pkgs/by-name/pi/picom-pijulius/package.nix
@@ -8,13 +8,13 @@
 
 picom.overrideAttrs (previousAttrs: {
   pname = "picom-pijulius";
-  version = "8.2-unstable-2025-08-25";
+  version = "8.2-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "pijulius";
     repo = "picom";
-    rev = "8efe4707c7bc4e0baccd51166ea8e0d08d96bd85";
-    hash = "sha256-KCK6/gmcs2VFd64veL9w27LWjCWoA7WT221dv89dGZc=";
+    rev = "efaa7efdca20dda01f34c3a16bd2aadb1417c643";
+    hash = "sha256-YF1pCbrQAvC+mLbj6WeOZzcrdhpge2MDtXiNHcjTGvs=";
   };
 
   dontVersionCheck = true;
diff --git a/pkgs/by-name/pi/pied/package.nix b/pkgs/by-name/pi/pied/package.nix
index adb55f8e4562..b76499e7f527 100644
--- a/pkgs/by-name/pi/pied/package.nix
+++ b/pkgs/by-name/pi/pied/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   gst_all_1,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "pied";
   version = "0.3.1";
 
diff --git a/pkgs/by-name/pi/pifpaf/package.nix b/pkgs/by-name/pi/pifpaf/package.nix
index c72d6dfe763a..747559e09dd9 100644
--- a/pkgs/by-name/pi/pifpaf/package.nix
+++ b/pkgs/by-name/pi/pifpaf/package.nix
@@ -7,12 +7,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pifpaf";
-  version = "3.3.0";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xXkMj1sP1xXf6Ad/71BFbq8SHz/uHcaSqv6RQN0Ca1o=";
+    hash = "sha256-f9nPb483tuvNk82wDtuB6553z18qY/x0tgz1NbVGUWE=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/pi/pigment/package.nix b/pkgs/by-name/pi/pigment/package.nix
index 8a62ad321bed..89cfee0bd17e 100644
--- a/pkgs/by-name/pi/pigment/package.nix
+++ b/pkgs/by-name/pi/pigment/package.nix
@@ -64,6 +64,6 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Plus;
     mainProgram = "pigment";
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/pi/piknik/package.nix b/pkgs/by-name/pi/piknik/package.nix
index 16d25c09f0f9..e31f66f8711a 100644
--- a/pkgs/by-name/pi/piknik/package.nix
+++ b/pkgs/by-name/pi/piknik/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     homepage = "https://github.com/jedisct1/piknik";
     changelog = "https://github.com/jedisct1/piknik/blob/${src.rev}/ChangeLog";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "piknik";
   };
 }
diff --git a/pkgs/by-name/pi/piliplus/disable-auto-update.patch b/pkgs/by-name/pi/piliplus/disable-auto-update.patch
new file mode 100644
index 000000000000..6f745b7bed0a
--- /dev/null
+++ b/pkgs/by-name/pi/piliplus/disable-auto-update.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/utils/update.dart b/lib/utils/update.dart
+index cb35c3bd..52e01d53 100644
+--- a/lib/utils/update.dart
++++ b/lib/utils/update.dart
+@@ -19,7 +19,6 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+ abstract class Update {
+   // 检查更新
+   static Future<void> checkUpdate([bool isAuto = true]) async {
+-    if (kDebugMode) return;
+     SmartDialog.dismiss();
+     try {
+       final res = await Request().get(
diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json
index d4929bd9b9dc..6f154a0f9e57 100644
--- a/pkgs/by-name/pi/piliplus/git-hashes.json
+++ b/pkgs/by-name/pi/piliplus/git-hashes.json
@@ -1,12 +1,18 @@
 {
   "auto_orientation": "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=",
-  "canvas_danmaku": "sha256-3cBsQCvXuc5XvSRNY4QX33+t8aF2AfOQhRt+MCQWdOA=",
+  "canvas_danmaku": "sha256-V7o8NonNWo07PvWu8BI/ZugLZU6i3u45DuALg9UYtTE=",
   "chat_bottom_container": "sha256-um9KwZUDxWBhFsGHfv00TjPzxDHmp43TLRF0GwuV1xs=",
-  "extended_nested_scroll_view": "sha256-5X8ghUlEO/lvz/3PmYuipCjcs+QrIciaH5wgWp9i+24=",
+  "extended_nested_scroll_view": "sha256-Vjv5zp5c0Xob1H8/U0+lUueLqOKo7qwusOCchdt3Z7M=",
   "floating": "sha256-TJ2i3hTOQ4euHWr+lfQU44L3vVehmWVdZuAzNyVaEfA=",
   "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=",
   "material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=",
-  "media_kit_libs_android_video": "sha256-o5qsqJe4TjOhwtgnc20Ga1y4IyxdhC/VmeAsFMDoHuo=",
-  "media_kit_video": "sha256-TPYmT5Muv98wuZUO9evd40uIWp/XDk0+GIfEgd/m4mg=",
-  "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE="
+  "media_kit": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_libs_android_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_libs_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_libs_windows_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_native_event_loop": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=",
+  "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=",
+  "window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo="
 }
diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix
index 6b772cc1d0ea..be6706c00a97 100644
--- a/pkgs/by-name/pi/piliplus/package.nix
+++ b/pkgs/by-name/pi/piliplus/package.nix
@@ -2,103 +2,93 @@
   lib,
   fetchFromGitHub,
   flutter335,
-  makeShellWrapper,
   makeDesktopItem,
   copyDesktopItems,
   alsa-lib,
   mpv-unwrapped,
   libplacebo,
+  libappindicator,
 }:
 
 let
-  version = "1.1.4.4";
-  rev = "f0f52246777f2640025048f561e908cf1d3c3ead";
-
+  srcInfo = lib.importJSON ./src-info.json;
   description = "Third-party Bilibili client developed in Flutter";
 in
-flutter335.buildFlutterApplication.override
-  {
-    # makeBinaryWrapper does not support `--run`.
-    makeWrapper = makeShellWrapper;
-  }
-  {
-    pname = "piliplus";
-    inherit version;
+flutter335.buildFlutterApplication {
+  pname = "piliplus";
+  inherit (srcInfo) version;
 
-    src = fetchFromGitHub {
-      owner = "bggRGjQaUbCoE";
-      repo = "PiliPlus";
-      inherit rev;
-      hash = "sha256-5ISSlYMbP0SaSP0SLIHXC3VRXrVZ78kfl07ekgzFhNA=";
-    };
+  src = fetchFromGitHub {
+    owner = "bggRGjQaUbCoE";
+    repo = "PiliPlus";
+    inherit (srcInfo) rev hash;
+  };
 
-    # Disable update check.
-    postPatch = ''
-      substituteInPlace lib/utils/update.dart \
-        --replace-fail "if (kDebugMode) " ""
-    '';
+  patches = [ ./disable-auto-update.patch ];
 
-    pubspecLock = lib.importJSON ./pubspec.lock.json;
-    gitHashes = lib.importJSON ./git-hashes.json;
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+  gitHashes = lib.importJSON ./git-hashes.json;
 
-    nativeBuildInputs = [ copyDesktopItems ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
-    buildInputs = [
-      alsa-lib
-      mpv-unwrapped
-      libplacebo
-    ];
+  buildInputs = [
+    alsa-lib
+    mpv-unwrapped
+    libplacebo
+    libappindicator
+  ];
 
-    # See lib/scripts/build.sh.
-    preBuild = ''
-      cat <<EOL > lib/build_config.dart
-      class BuildConfig {
-        static const int buildTime = $SOURCE_DATE_EPOCH;
-        static const String commitHash = '${rev}';
-      }
-      EOL
-    '';
+  # See lib/scripts/build.sh.
+  preBuild = ''
+    cat <<EOL > lib/build_config.dart
+    class BuildConfig {
+      static const int versionCode = ${toString srcInfo.revCount};
+      static const String versionName = '${srcInfo.version}';
 
-    # The app attempts to get the total size of TMPDIR at startup.
-    extraWrapProgramArgs = ''
-      --run 'export TMPDIR="$(mktemp -d)"'
-    '';
+      static const int buildTime = ${toString srcInfo.commitDate};
+      static const String commitHash = '${srcInfo.rev}';
+    }
+    EOL
+  '';
 
-    postInstall = ''
-      declare -A sizes=(
-        [mdpi]=128
-        [hdpi]=192
-        [xhdpi]=256
-        [xxhdpi]=384
-        [xxxhdpi]=512
-      )
-      for var in "''${!sizes[@]}"; do
-        width=''${sizes[$var]}
-        install -Dm644 "android/app/src/main/res/drawable-$var/splash.png" \
-          "$out/share/icons/hicolor/$widthx$width/apps/piliplus.png"
-      done
-    '';
+  postInstall = ''
+    declare -A sizes=(
+      [mdpi]=128
+      [hdpi]=192
+      [xhdpi]=256
+      [xxhdpi]=384
+      [xxxhdpi]=512
+    )
+    for var in "''${!sizes[@]}"; do
+      width=''${sizes[$var]}
+      install -Dm644 "android/app/src/main/res/drawable-$var/splash.png" \
+        "$out/share/icons/hicolor/''${width}x$width/apps/piliplus.png"
+    done
+  '';
 
-    desktopItems = [
-      (makeDesktopItem {
-        name = "piliplus";
-        exec = "piliplus";
-        icon = "piliplus";
-        desktopName = "PiliPlus";
-        categories = [ "Video" ];
-        comment = description;
-      })
-    ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "piliplus";
+      exec = "piliplus";
+      icon = "piliplus";
+      desktopName = "PiliPlus";
+      categories = [
+        "Video"
+        "AudioVideo"
+      ];
+      comment = description;
+    })
+  ];
 
-    passthru.updateScript = ./update.rb;
+  passthru.updateScript = ./update.rb;
 
-    meta = {
-      inherit description;
-      homepage = "https://github.com/bggRGjQaUbCoE/PiliPlus";
-      changelog = "https://github.com/bggRGjQaUbCoE/PiliPlus/releases/tag/${version}";
-      license = lib.licenses.gpl3Plus;
-      maintainers = with lib.maintainers; [ ulysseszhan ];
-      platforms = lib.platforms.linux;
-      mainProgram = "piliplus";
-    };
-  }
+  meta = {
+    inherit description;
+    homepage = "https://github.com/bggRGjQaUbCoE/PiliPlus";
+    changelog = "https://github.com/bggRGjQaUbCoE/PiliPlus/releases/tag/${srcInfo.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.linux;
+    mainProgram = "piliplus";
+  };
+}
diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json
index 49c381ab8e1e..50e6eec4085d 100644
--- a/pkgs/by-name/pi/piliplus/pubspec.lock.json
+++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json
@@ -4,31 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+        "sha256": "0eb33edbbe99a02e73b8bbeb6f2b65972023d902117ee8d1bf0ea1a79f83aa7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "67.0.0"
+      "version": "90.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+        "sha256": "711e3a890bb529bf55f07d73b8706f4b7504ad77e90d2f205626b116c048583f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
-    },
-    "animations": {
-      "dependency": "direct main",
-      "description": {
-        "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.11"
+      "version": "8.3.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -195,21 +185,21 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "4.0.2"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "build_daemon": {
       "dependency": "transitive",
@@ -221,35 +211,15 @@
       "source": "hosted",
       "version": "4.0.4"
     },
-    "build_resolvers": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.3.2"
+      "version": "2.9.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -265,11 +235,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "1b3b173f3379c8f941446267868548b6fc67e9134d81f4842eb98bb729451359",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.11.2"
+      "version": "8.12.0"
     },
     "cached_network_image": {
       "dependency": "direct main",
@@ -301,22 +271,12 @@
       "source": "hosted",
       "version": "1.3.1"
     },
-    "cached_network_svg_image": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cached_network_svg_image",
-        "sha256": "fe9df0217c12e3903558dad14e1bb938c51296a1d96faa080415c6146bbd7a7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
     "canvas_danmaku": {
       "dependency": "direct main",
       "description": {
         "path": ".",
         "ref": "main",
-        "resolved-ref": "1c8cd0bb44f4883fe0a37d06aa11f9bfd1da6379",
+        "resolved-ref": "454790117e05e96782b05ee3d28d0283741b3cde",
         "url": "https://github.com/bggRGjQaUbCoE/canvas_danmaku.git"
       },
       "source": "git",
@@ -326,11 +286,11 @@
       "dependency": "direct main",
       "description": {
         "name": "catcher_2",
-        "sha256": "ffdad9d314a91d2baabd90b3332bccda00b5f2fabd9d6afa4f988479b9bc3eca",
+        "sha256": "45070a33cf072bed4b45f6141bb2be98a804a76d27e2d0fa9e4319af5fa12195",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.5"
     },
     "characters": {
       "dependency": "transitive",
@@ -387,11 +347,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -407,11 +367,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec",
+        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "7.0.0"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -497,11 +457,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.6"
+      "version": "3.1.2"
     },
     "dbus": {
       "dependency": "transitive",
@@ -517,11 +477,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.1.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -563,16 +523,6 @@
       "source": "hosted",
       "version": "2.1.1"
     },
-    "document_file_save_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "document_file_save_plus",
-        "sha256": "ff05c6a3b072377566e8e92666db38eb277786f90c0ac267ea47dc22725c1df3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
     "dynamic_color": {
       "dependency": "direct main",
       "description": {
@@ -638,7 +588,7 @@
       "description": {
         "path": ".",
         "ref": "mod",
-        "resolved-ref": "8289673adc2b0485ab2abda49bea42ef8b899bf0",
+        "resolved-ref": "4bb4e827628b3b7ccc88a4b98ef76a036a5a51ac",
         "url": "https://github.com/bggRGjQaUbCoE/extended_nested_scroll_view.git"
       },
       "source": "git",
@@ -674,6 +624,16 @@
       "source": "hosted",
       "version": "7.0.1"
     },
+    "file_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "file_picker",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.3.3"
+    },
     "file_selector_linux": {
       "dependency": "transitive",
       "description": {
@@ -728,11 +688,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fl_chart",
-        "sha256": "d3f82f4a38e33ba23d05a08ff304d7d8b22d2a59a5503f20bd802966e915db89",
+        "sha256": "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "flex_seed_scheme": {
       "dependency": "direct main",
@@ -775,11 +735,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_displaymode",
-        "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
+        "sha256": "ecd44b1e902b0073b42ff5b55bf283f38e088270724cdbb7f7065ccf54aa60a8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.0"
+      "version": "0.7.0"
     },
     "flutter_html": {
       "dependency": "direct main",
@@ -921,11 +881,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
+        "sha256": "c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.30"
+      "version": "2.0.31"
     },
     "flutter_smart_dialog": {
       "dependency": "direct main",
@@ -984,11 +944,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fluttertoast",
-        "sha256": "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1",
+        "sha256": "144ddd74d49c865eba47abe31cbc746c7b311c82d6c32e571fd73c4264b740e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.12"
+      "version": "9.0.0"
     },
     "font_awesome_flutter": {
       "dependency": "direct main",
@@ -1000,16 +960,6 @@
       "source": "hosted",
       "version": "10.9.0"
     },
-    "frontend_server_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "frontend_server_client",
-        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
     "get": {
       "dependency": "direct main",
       "description": {
@@ -1080,16 +1030,6 @@
       "source": "hosted",
       "version": "1.1.0"
     },
-    "hive_generator": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "hive_generator",
-        "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
     "html": {
       "dependency": "direct main",
       "description": {
@@ -1154,31 +1094,31 @@
       "dependency": "direct main",
       "description": {
         "name": "image_cropper",
-        "sha256": "4e9c96c029eb5a23798da1b6af39787f964da6ffc78fd8447c140542a9f7c6fc",
+        "sha256": "46c8f9aae51c8350b2a2982462f85a129e77b04675d35b09db5499437d7a996b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.0"
+      "version": "11.0.0"
     },
     "image_cropper_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_cropper_for_web",
-        "sha256": "fd81ebe36f636576094377aab32673c4e5d1609b32dec16fad98d2b71f1250a9",
+        "sha256": "e09749714bc24c4e3b31fbafa2e5b7229b0ff23e8b14d4ba44bd723b77611a0f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.0"
     },
     "image_cropper_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_cropper_platform_interface",
-        "sha256": "6ca6b81769abff9a4dcc3bbd3d75f5dfa9de6b870ae9613c8cd237333a4283af",
+        "sha256": "886a30ec199362cdcc2fbb053b8e53347fbfb9dbbdaa94f9ff85622609f5e7ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.1.0"
+      "version": "8.0.0"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -1194,11 +1134,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e",
+        "sha256": "dd7a61daaa5896cc34b7bc95f66c60225ae6bee0d167dde0e21a9d9016cac0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.13+1"
+      "version": "0.8.13+4"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
@@ -1284,11 +1224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.7"
+      "version": "0.7.2"
     },
     "json_annotation": {
       "dependency": "direct main",
@@ -1304,11 +1244,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1364,11 +1304,11 @@
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
+        "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "2.6.2"
     },
     "logging": {
       "dependency": "transitive",
@@ -1424,11 +1364,12 @@
     "media_kit": {
       "dependency": "direct main",
       "description": {
-        "name": "media_kit",
-        "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
-        "url": "https://pub.dev"
+        "path": "media_kit",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.1.11"
     },
     "media_kit_libs_android_video": {
@@ -1436,8 +1377,8 @@
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
         "ref": "version_1.2.5",
-        "resolved-ref": "f89452bc27af26324a83961c8286d4f41432a5f9",
-        "url": "https://github.com/My-Responsitories/media-kit.git"
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
       "source": "git",
       "version": "1.3.7"
@@ -1475,31 +1416,34 @@
     "media_kit_libs_video": {
       "dependency": "direct main",
       "description": {
-        "name": "media_kit_libs_video",
-        "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288",
-        "url": "https://pub.dev"
+        "path": "libs/universal/media_kit_libs_video",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.0.5"
     },
     "media_kit_libs_windows_video": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
-        "name": "media_kit_libs_windows_video",
-        "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab",
-        "url": "https://pub.dev"
+        "path": "libs/windows/media_kit_libs_windows_video",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
-      "version": "1.0.11"
+      "source": "git",
+      "version": "1.0.10"
     },
     "media_kit_native_event_loop": {
       "dependency": "direct overridden",
       "description": {
-        "name": "media_kit_native_event_loop",
-        "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40",
-        "url": "https://pub.dev"
+        "path": "media_kit_native_event_loop",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.0.9"
     },
     "media_kit_video": {
@@ -1507,12 +1451,22 @@
       "description": {
         "path": "media_kit_video",
         "ref": "version_1.2.5",
-        "resolved-ref": "c4655bfb4bf81b6bb450d252184da20e2fbba292",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
         "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
       "source": "git",
       "version": "1.2.5"
     },
+    "menu_base": {
+      "dependency": "transitive",
+      "description": {
+        "name": "menu_base",
+        "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.1"
+    },
     "meta": {
       "dependency": "transitive",
       "description": {
@@ -1567,11 +1521,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.1"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1617,11 +1571,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
+        "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.18"
+      "version": "2.2.19"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1663,18 +1617,8 @@
       "source": "hosted",
       "version": "2.3.0"
     },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "12.0.1"
-    },
     "permission_handler_android": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "permission_handler_android",
         "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6",
@@ -1684,7 +1628,7 @@
       "version": "13.0.1"
     },
     "permission_handler_apple": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "permission_handler_apple",
         "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
@@ -1693,18 +1637,8 @@
       "source": "hosted",
       "version": "9.4.7"
     },
-    "permission_handler_html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_html",
-        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3+5"
-    },
     "permission_handler_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "permission_handler_platform_interface",
         "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878",
@@ -1713,16 +1647,6 @@
       "source": "hosted",
       "version": "4.3.0"
     },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
     "petitparser": {
       "dependency": "transitive",
       "description": {
@@ -1767,11 +1691,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "posix": {
       "dependency": "transitive",
@@ -1797,11 +1721,11 @@
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e",
+        "sha256": "826d6a306be26f29e5cd9faeb0c97aad5897270341dab6dbd7b8acd675937006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "5.0.0"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1857,11 +1781,11 @@
       "dependency": "transitive",
       "description": {
         "name": "safe_local_storage",
-        "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440",
+        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "2.0.1"
     },
     "saver_gallery": {
       "dependency": "direct main",
@@ -1873,18 +1797,8 @@
       "source": "hosted",
       "version": "4.0.1"
     },
-    "screen_brightness": {
-      "dependency": "direct main",
-      "description": {
-        "name": "screen_brightness",
-        "sha256": "5f70754028f169f059fdc61112a19dcbee152f8b293c42c848317854d650cba3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.7"
-    },
     "screen_brightness_android": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "screen_brightness_android",
         "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
@@ -1894,7 +1808,7 @@
       "version": "2.1.3"
     },
     "screen_brightness_ios": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "screen_brightness_ios",
         "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5",
@@ -1903,28 +1817,8 @@
       "source": "hosted",
       "version": "2.1.2"
     },
-    "screen_brightness_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_brightness_macos",
-        "sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "screen_brightness_ohos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_brightness_ohos",
-        "sha256": "a93a263dcd39b5c56e589eb495bcd001ce65cdd96ff12ab1350683559d5c5bb7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
     "screen_brightness_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "screen_brightness_platform_interface",
         "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
@@ -1933,45 +1827,75 @@
       "source": "hosted",
       "version": "2.1.0"
     },
-    "screen_brightness_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_brightness_windows",
-        "sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "scrollable_positioned_list": {
+    "screen_retriever": {
       "dependency": "direct main",
       "description": {
-        "name": "scrollable_positioned_list",
-        "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287",
+        "name": "screen_retriever",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.8"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
     },
     "sentry": {
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337",
+        "sha256": "0a3a1e6b3b3873070d4dbefc6968f0d31e698ed55b4eb8ee185b230f35733b59",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "share_plus": {
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1997,11 +1921,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
+        "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.12"
+      "version": "2.4.15"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2067,11 +1991,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.0.0"
+    },
+    "shortid": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shortid",
+        "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -2079,26 +2013,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "source_gen": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.0"
-    },
-    "source_helper": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.5"
-    },
     "source_span": {
       "dependency": "transitive",
       "description": {
@@ -2209,6 +2123,17 @@
       "source": "hosted",
       "version": "1.4.1"
     },
+    "super_sliver_list": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "mod",
+        "resolved-ref": "71f34fa179e2d05818004e22e632dd59f2a223be",
+        "url": "https://github.com/bggRGjQaUbCoE/super_sliver_list.git"
+      },
+      "source": "git",
+      "version": "0.4.1"
+    },
     "synchronized": {
       "dependency": "direct main",
       "description": {
@@ -2239,15 +2164,15 @@
       "source": "hosted",
       "version": "0.7.6"
     },
-    "timing": {
-      "dependency": "transitive",
+    "tray_manager": {
+      "dependency": "direct main",
       "description": {
-        "name": "timing",
-        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
+        "name": "tray_manager",
+        "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "0.5.1"
     },
     "tuple": {
       "dependency": "transitive",
@@ -2279,25 +2204,15 @@
       "source": "hosted",
       "version": "2.2.2"
     },
-    "universal_platform": {
-      "dependency": "direct main",
-      "description": {
-        "name": "universal_platform",
-        "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
     "uri_parser": {
       "dependency": "transitive",
       "description": {
         "name": "uri_parser",
-        "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835",
+        "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "3.0.0"
     },
     "url_launcher": {
       "dependency": "direct main",
@@ -2313,11 +2228,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "69ee86740f2847b9a4ba6cffa74ed12ce500bbe2b07f3dc1e643439da60637b7",
+        "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.18"
+      "version": "6.3.24"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2453,31 +2368,31 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
+        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.4"
     },
     "waterfall_flow": {
       "dependency": "direct main",
@@ -2534,11 +2449,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.14.0"
+      "version": "5.15.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2550,6 +2465,17 @@
       "source": "hosted",
       "version": "2.1.0"
     },
+    "window_manager": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/window_manager",
+        "ref": "main",
+        "resolved-ref": "974ab0a71d37cfca9d9bd5b295d7bd1df80b790b",
+        "url": "https://github.com/bggRGjQaUbCoE/window_manager.git"
+      },
+      "source": "git",
+      "version": "0.5.1"
+    },
     "xdg_directories": {
       "dependency": "transitive",
       "description": {
@@ -2583,6 +2509,6 @@
   },
   "sdks": {
     "dart": ">=3.9.0 <4.0.0",
-    "flutter": ">=3.35.3"
+    "flutter": "3.35.5"
   }
 }
diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json
new file mode 100644
index 000000000000..320d88eef710
--- /dev/null
+++ b/pkgs/by-name/pi/piliplus/src-info.json
@@ -0,0 +1,7 @@
+{
+  "version": "1.1.4.10",
+  "rev": "4cf1c25b36d2d3bb7b1efa1b00b1d33c593ce4b0",
+  "revCount": 4215,
+  "commitDate": 1760358940,
+  "hash": "sha256-sToT5saB/cPSvyrOG4XfMianXXLfg3iQlvJvwtAf6b8="
+}
diff --git a/pkgs/by-name/pi/piliplus/update.rb b/pkgs/by-name/pi/piliplus/update.rb
index 0789a465f35d..638a4c5b9b71 100755
--- a/pkgs/by-name/pi/piliplus/update.rb
+++ b/pkgs/by-name/pi/piliplus/update.rb
@@ -17,7 +17,7 @@ def package_attr attr_path
   JSON.parse stdout rescue abort "Failed to parse JSON output from nix-instantiate when reading attr #{attr_path}"
 end
 
-def github_api path, token: ENV['GITHUB_TOKEN']
+def github_api path, token: ENV['GITHUB_TOKEN'], headers: []
   uri = URI.join 'https://api.github.com', path
   res = Net::HTTP.start uri.host, uri.port, use_ssl: true do |http|
     req = Net::HTTP::Get.new uri
@@ -25,7 +25,10 @@ def github_api path, token: ENV['GITHUB_TOKEN']
     http.request req
   end
   abort "Failed to fetch #{path}: #{res.code} #{res.message}" unless res.is_a? Net::HTTPSuccess
-  JSON.parse res.body rescue abort "Failed to parse JSON response from GitHub"
+  body = JSON.parse res.body rescue abort "Failed to parse JSON response from GitHub"
+  return body if headers.empty?
+  header_values = headers.map { res[_1] }
+  [body, *header_values]
 end
 
 def prefetch_git url, rev
@@ -34,14 +37,6 @@ def prefetch_git url, rev
   JSON.parse stdout rescue abort "Failed to parse JSON output from nix-prefetch-git"
 end
 
-def replace_in_file filename, searches, replacements
-  contents = File.read filename
-  searches.zip replacements do |search, replacement|
-    contents.sub! search, replacement or abort "Failed to replace #{search} -> #{replacement} in #{filename}"
-  end
-  File.write filename, contents
-end
-
 def json_write filename, object
   File.open(filename, 'w') { _1.puts JSON.pretty_generate object }
 end
@@ -57,13 +52,25 @@ log "Current version: #{old_version} #{old_rev} #{old_hash}"
 
 new_version = github_api("/repos/#{owner}/#{repo}/releases/latest")['tag_name'] or abort "No `tag_name` field in GitHub response"
 finish "Already up-to-date" if new_version == old_version
-new_rev, new_hash, src_path = prefetch_git(git_url, new_version).values_at 'rev', 'hash', 'path'
+new_rev, new_hash, src_path, date = prefetch_git(git_url, new_version).values_at 'rev', 'hash', 'path', 'date'
+date = Time.new(date).to_i
 log "New version: #{new_version} #{new_rev} #{new_hash}"
 
+_, commit_links = github_api "/repos/#{owner}/#{repo}/commits?sha=#{new_rev}&per_page=1", headers: ['link']
+git_count = commit_links[/[&?]page=(\d+)>; rel="last"/, 1]&.to_i
+abort "Cannot determine git commit count from GitHub response" unless git_count
+
 nix_filename = package_attr('meta.position')[/([^:]+):\d+/, 1] or abort "Failed to find the Nix file to be updated"
 nix_dir = File.dirname nix_filename
-replace_in_file nix_filename, [old_version, old_rev, old_hash], [new_version, new_rev, new_hash]
-log "Updated #{nix_filename}"
+src_info_path = File.join nix_dir, 'src-info.json'
+json_write src_info_path, {
+  version: new_version,
+  rev: new_rev,
+  revCount: git_count,
+  commitDate: date,
+  hash: new_hash
+}
+log "Updated #{src_info_path}"
 
 pubspec_lock_path = File.join nix_dir, 'pubspec.lock.json'
 old_pubspec_lock = JSON.load_file pubspec_lock_path rescue abort "Failed to read #{pubspec_lock_path}"
diff --git a/pkgs/by-name/pi/pimsync/package.nix b/pkgs/by-name/pi/pimsync/package.nix
index 4a89efa7e861..80e40c73ba77 100644
--- a/pkgs/by-name/pi/pimsync/package.nix
+++ b/pkgs/by-name/pi/pimsync/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pimsync";
-  version = "0.4.4";
+  version = "0.5.4";
 
   src = fetchFromSourcehut {
     owner = "~whynothugo";
     repo = "pimsync";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-M29kqvvNfs4zF1epurXGEas1phPdrEAFDnYKqyCzzfE=";
+    hash = "sha256-LHdm6CeaGrlTNzN4h9XzYCG5aRG2lk3ZqqZLd37q7is=";
   };
 
-  cargoHash = "sha256-HQObvolih9nOn0epu7tWkLa0ibkNarXy2pNNzllQtMg=";
+  cargoHash = "sha256-6n7kjmLWzG5rttYak65gmu5KM/W4bN4FS1MaEnCELV8=";
 
   PIMSYNC_VERSION = finalAttrs.version;
 
@@ -50,6 +50,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Synchronise calendars and contacts";
     homepage = "https://git.sr.ht/~whynothugo/pimsync";
+    changelog = "https://pimsync.whynothugo.nl/changelog.html#v${
+      lib.replaceString "." "-" finalAttrs.version
+    }";
     license = lib.licenses.eupl12;
     platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.qxrein ];
diff --git a/pkgs/by-name/pi/pingus/package.nix b/pkgs/by-name/pi/pingus/package.nix
index f47e64d08b7f..f1795ee2a9aa 100644
--- a/pkgs/by-name/pi/pingus/package.nix
+++ b/pkgs/by-name/pi/pingus/package.nix
@@ -1,55 +1,86 @@
 {
   lib,
   stdenv,
-  fetchgit,
+  fetchFromGitHub,
   cmake,
+  pkg-config,
+  makeWrapper,
+  libGL,
+  libGLU,
   SDL2,
   SDL2_image,
-  boost,
+  fmt,
+  gtest,
   libpng,
-  SDL2_mixer,
-  pkg-config,
-  libGLU,
-  libGL,
-  git,
-  jsoncpp,
+  libsigcxx,
+  argpp,
+  geomcpp,
+  logmich,
+  priocpp,
+  strutcpp,
+  tinycmmc,
+  tinygettext,
+  uitest,
+  wstsound,
+  xdgcpp,
 }:
+
 stdenv.mkDerivation {
   pname = "pingus";
-  version = "unstable-0.7.6.0.20191104";
+  version = "0.7.6-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "Pingus";
+    repo = "pingus";
+    rev = "b0ceeeeb95428c73b1b81208211535c61acfc5d0";
+    sha256 = "sha256-jQYZM7VLqbl9/+QXyswEXdGmwOq/nxRzWARvcDqNM9M=";
+  };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    git
+    makeWrapper
   ];
+
   buildInputs = [
+    libGL
+    libGLU
     SDL2
     SDL2_image
-    boost
+    fmt
+    gtest
     libpng
-    SDL2_mixer
-    libGLU
-    libGL
-    jsoncpp
+    libsigcxx
+    argpp
+    geomcpp
+    logmich
+    priocpp
+    strutcpp
+    tinycmmc
+    tinygettext
+    uitest
+    wstsound
+    xdgcpp
   ];
-  src = fetchgit {
-    url = "https://gitlab.com/pingus/pingus/";
-    rev = "709546d9b9c4d6d5f45fc9112b45ac10c7f9417d";
-    sha256 = "11mmzk0766riaw5qyd1r5i7s7vczbbzfccm92bvgrm99iy1sj022";
-    fetchSubmodules = true;
-  };
 
-  postPatch = ''
-    # Fix missing gcc-13 headers
-    sed -e '1i #include <cstdint>' -i src/util/pathname.hpp
-  '';
+  cmakeFlags = [
+    "-DWARNINGS=ON"
+    "-DWERROR=ON"
+    "-DBUILD_EXTRA=OFF"
+    "-DBUILD_TESTS=OFF"
+  ];
+
+  doCheck = true;
 
   meta = {
     description = "Puzzle game with mechanics similar to Lemmings";
+    homepage = "https://pingus.seul.org/";
     mainProgram = "pingus";
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      SchweGELBin
+    ];
     license = lib.licenses.gpl3;
   };
 }
diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix
index 94d73eefe70a..32e058ffc74e 100644
--- a/pkgs/by-name/pi/pinniped/package.nix
+++ b/pkgs/by-name/pi/pinniped/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "pinniped";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "pinniped";
     rev = "v${version}";
-    sha256 = "sha256-PCSRT3oYqfIsB5vWDIBV1tzRovDfrZOjLrINzos1RL0=";
+    sha256 = "sha256-1r5EjF4Npt1iwlILTCHKlViO5MPcv8undKYJWN8cmVA=";
   };
 
   subPackages = "cmd/pinniped";
 
-  vendorHash = "sha256-UYDmTwbT5odLMthGRqWuSr4G4oAU8zuWWRrMclIaY8g=";
+  vendorHash = "sha256-aDP5yf0uGYSzvYqqRUS4P2ozLCRcS0eDJseicXv/99o=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pi/pinnwand/package.nix b/pkgs/by-name/pi/pinnwand/package.nix
index 3e7431e3c67a..60574a57c7b9 100644
--- a/pkgs/by-name/pi/pinnwand/package.nix
+++ b/pkgs/by-name/pi/pinnwand/package.nix
@@ -46,6 +46,8 @@ buildPythonApplication rec {
   disabledTestPaths = [
     # out-of-date browser tests
     "test/e2e"
+    # click 8.2.0 exits with 2 instead of 0 when no args are passed
+    "test/integration/test_command.py::test_main"
   ];
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/by-name/pi/pinocchio/package.nix b/pkgs/by-name/pi/pinocchio/package.nix
index 3d58ce177cd8..54e35f5775be 100644
--- a/pkgs/by-name/pi/pinocchio/package.nix
+++ b/pkgs/by-name/pi/pinocchio/package.nix
@@ -5,29 +5,29 @@
   cmake,
   collisionSupport ? true,
   console-bridge,
+  ctestCheckHook,
   doxygen,
   eigen,
   example-robot-data,
   fetchFromGitHub,
+  fetchpatch,
   coal,
   jrl-cmakemodules,
   lib,
   pkg-config,
-  pythonSupport ? false,
-  python3Packages,
   stdenv,
   urdfdom,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pinocchio";
-  version = "3.7.0";
+  version = "3.8.0";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "pinocchio";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MykHbHSXY/eJ1+8v0hptiXeVmglU9/wImimiuByw0tE=";
+    hash = "sha256-2oMP653fJ7Msk+IB8whRk2L8xkAmRdDeMLPJyyD99OQ=";
   };
 
   outputs = [
@@ -35,18 +35,16 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277
-  prePatch = lib.optionalString (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) ''
-    substituteInPlace unittest/algorithm/utils/CMakeLists.txt \
-      --replace-fail "add_pinocchio_unit_test(force)" ""
-  '';
+  patches = [
+    # ref. https://github.com/stack-of-tasks/pinocchio/pull/2771
+    (fetchpatch {
+      name = "fix-viser-path.patch";
+      url = "https://github.com/stack-of-tasks/pinocchio/commit/36a04bddb6980a7bcd28ebcc55d4e442f7920d87.patch";
+      hash = "sha256-9oENiMmRqJLU4ZiyGojm7suqdwTDGfk56aS2kcZiGaI=";
+    })
+  ];
 
   postPatch = ''
-    # example-robot-data models are used in checks.
-    # Upstream provide them as git submodule, but we can use our own version instead.
-    test -d models/example-robot-data && rmdir models/example-robot-data
-    ln -s ${example-robot-data.src} models/example-robot-data
-
     # allow package:// uri use in examples
     export ROS_PACKAGE_PATH=${example-robot-data}/share
 
@@ -60,47 +58,46 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     doxygen
     pkg-config
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.python
-    python3Packages.pythonImportsCheckHook
   ];
 
   propagatedBuildInputs = [
+    boost
+    coal
     console-bridge
+    eigen
     jrl-cmakemodules
     urdfdom
   ]
-  ++ lib.optionals (!pythonSupport) [
-    boost
-    eigen
-  ]
-  ++ lib.optionals (!pythonSupport && collisionSupport) [ coal ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.boost
-    python3Packages.eigenpy
-  ]
-  ++ lib.optionals (pythonSupport && collisionSupport) [ python3Packages.coal ]
-  ++ lib.optionals (!pythonSupport && casadiSupport) [ casadi ]
-  ++ lib.optionals (pythonSupport && casadiSupport) [ python3Packages.casadi ];
+  ++ lib.optionals collisionSupport [ coal ]
+  ++ lib.optionals casadiSupport [ casadi ];
 
-  checkInputs = lib.optionals (pythonSupport && casadiSupport) [ python3Packages.matplotlib ];
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
+
+  checkInputs = [
+    example-robot-data
+  ];
+
+  disabledTests =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      # Disable test that fails on darwin
+      # https://github.com/stack-of-tasks/pinocchio/blob/42306ed023b301aafef91e2e76cb070c5e9c3f7d/flake.nix#L24C1-L27C17
+      "pinocchio-example-py-casadi-quadrotor-ocp"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # test failure, ref https://github.com/stack-of-tasks/pinocchio/issues/2277
+      "test-cpp-algorithm-utils-force"
+    ];
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-    (lib.cmakeBool "BUILD_WITH_LIBPYTHON" pythonSupport)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
     (lib.cmakeBool "BUILD_WITH_CASADI_SUPPORT" casadiSupport)
     (lib.cmakeBool "BUILD_WITH_COLLISION_SUPPORT" collisionSupport)
     (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
-    # Disable test that fails on darwin
-    # https://github.com/stack-of-tasks/pinocchio/blob/42306ed023b301aafef91e2e76cb070c5e9c3f7d/flake.nix#L24C1-L27C17
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--exclude-regex;pinocchio-example-py-casadi-quadrotor-ocp")
   ];
 
   doCheck = true;
-  pythonImportsCheck = [ "pinocchio" ];
 
   meta = {
     description = "Fast and flexible implementation of Rigid Body Dynamics algorithms and their analytical derivatives";
diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index ea86c3c0c0e3..a5df5859db70 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})'
+    substituteInPlace contrib/lz4/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.4)' 'cmake_minimum_required(VERSION 3.13)'
+    substituteInPlace contrib/nanosockets/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.13)'
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix
index 5a23b123eb4d..4aa71106a680 100644
--- a/pkgs/by-name/pi/pipe-rename/package.nix
+++ b/pkgs/by-name/pi/pipe-rename/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Rename your files using your favorite text editor";
     homepage = "https://github.com/marcusbuffett/pipe-rename";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "renamer";
   };
 }
diff --git a/pkgs/applications/audio/pipecontrol/default.nix b/pkgs/by-name/pi/pipecontrol/package.nix
similarity index 61%
rename from pkgs/applications/audio/pipecontrol/default.nix
rename to pkgs/by-name/pi/pipecontrol/package.nix
index 2c29dd4b2ccb..7dbdf94f9fd3 100644
--- a/pkgs/applications/audio/pipecontrol/default.nix
+++ b/pkgs/by-name/pi/pipecontrol/package.nix
@@ -5,47 +5,43 @@
   pipewire,
   cmake,
   extra-cmake-modules,
-  wrapQtAppsHook,
-  qtbase,
-  qttools,
-  kirigami2,
-  kcoreaddons,
-  ki18n,
-  qtquickcontrols2,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pipecontrol";
   version = "0.2.12";
 
   src = fetchFromGitHub {
     owner = "portaloffreedom";
     repo = "pipecontrol";
-    rev = "v${version}";
-    sha256 = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WvQFmoEaxnkI61wPldSnMAoPAxNtI399hdHb/9bkPqc=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
-    wrapQtAppsHook
-    qttools
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qttools
   ];
 
   buildInputs = [
     pipewire
+  ]
+  ++ (with libsForQt5; [
     qtbase
     kirigami2
     kcoreaddons
     ki18n
     qtquickcontrols2
-  ];
+  ]);
 
-  meta = with lib; {
+  meta = {
     description = "Pipewire control GUI program in Qt (Kirigami2)";
     mainProgram = "pipecontrol";
     homepage = "https://github.com/portaloffreedom/pipecontrol";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ tilcreator ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tilcreator ];
   };
-}
+})
diff --git a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix
index cac51b5f2f80..18635abe379b 100644
--- a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix
+++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix
@@ -24,6 +24,10 @@ python3Packages.buildPythonApplication rec {
     typer
   ];
 
+  # typer for Click >= 8.2 removed "mix_stderr", upstream pins to 8.1.8
+  # https://typer.tiangolo.com/release-notes/#0160
+  disabledTestPaths = [ "tests/test_cli.py" ];
+
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
   meta = {
diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix
index 227e0f47e3cd..032be5b9ccfe 100644
--- a/pkgs/by-name/pi/piping-server-rust/package.nix
+++ b/pkgs/by-name/pi/piping-server-rust/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nwtgck/piping-server-rust";
     changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "piping-server";
   };
 }
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/by-name/pi/pithos/package.nix
similarity index 85%
rename from pkgs/applications/audio/pithos/default.nix
rename to pkgs/by-name/pi/pithos/package.nix
index 1cf887ab07cd..e293b5b28ed0 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/by-name/pi/pithos/package.nix
@@ -8,7 +8,7 @@
   appstream-glib,
   glib,
   wrapGAppsHook3,
-  pythonPackages,
+  python3Packages,
   gtk3,
   adwaita-icon-theme,
   gobject-introspection,
@@ -17,7 +17,7 @@
   gst_all_1,
 }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pithos";
   version = "1.6.2";
 
@@ -61,17 +61,17 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = [
     adwaita-icon-theme
   ]
-  ++ (with pythonPackages; [
+  ++ (with python3Packages; [
     pygobject3
     pylast
   ]);
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Pandora Internet Radio player for GNOME";
     mainProgram = "pithos";
     homepage = "https://pithos.github.io/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ obadz ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ obadz ];
   };
 }
diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix
index 7c4e05444809..047b1e94e092 100644
--- a/pkgs/by-name/pi/pixelflasher/package.nix
+++ b/pkgs/by-name/pi/pixelflasher/package.nix
@@ -10,14 +10,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "pixelflasher";
-  version = "8.6.0.0";
+  version = "8.9.1.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "badabing2005";
     repo = "PixelFlasher";
     tag = "v${version}";
-    hash = "sha256-lCh4LmmFdX/CvJSYWso1c8cBklb+/qXsbUY3nrzKCYk=";
+    hash = "sha256-/B0AZesAwB94y4o+5+f0L0vnbgVaUaCP4gEcDCViH/c=";
   };
 
   desktopItems = [
diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix
index 18090d797625..591fafd8ba92 100644
--- a/pkgs/by-name/pi/pixi-pack/package.nix
+++ b/pkgs/by-name/pi/pixi-pack/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi-pack";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "Quantco";
     repo = "pixi-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IYY5moAxZ+pDF6G6KxfuB6DI+Y5V8AseFUyWGs77+bQ=";
+    hash = "sha256-R+JydhsYha4bQu7KBMEyV5IijnPtJZphbSib9JpchrI=";
   };
 
-  cargoHash = "sha256-EM1xCQGIXI2Q5OkfXcReGvPSLiVq98sleo0+rYa0bkw=";
+  cargoHash = "sha256-U2Ty8ZzNkhDc2O3I3ceFcZRk3fu0aSzwsdIuo6Edcx0=";
 
   buildInputs = [ openssl ];
 
diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index f6341f7f1bef..daea4b4409c6 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.56.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3YVIJLzFNJ5PlgT7NnxOtyA363A+qMpQPTr1N1E2daI=";
+    hash = "sha256-aDwuMRceMxRCh9w89Q2ktpNWwmStg3KzggwhZUAAauk=";
   };
 
-  cargoHash = "sha256-z9lsxQ08ZJ1xjhIXSP6adO+sMJk3adUKrXqKJy4MA0g=";
+  cargoHash = "sha256-BbPX+ZKMfLtKWBnrGBRfrl6d40rBQaWJLBg0Vv5UnZE=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/pi/pixieditor/deps.json b/pkgs/by-name/pi/pixieditor/deps.json
new file mode 100644
index 000000000000..70c2bca2941e
--- /dev/null
+++ b/pkgs/by-name/pi/pixieditor/deps.json
@@ -0,0 +1,937 @@
+[
+  {
+    "pname": "AsyncImageLoader.Avalonia",
+    "version": "3.3.0",
+    "hash": "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.0",
+    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.31",
+    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.3.0",
+    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.3.0",
+    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.3.0",
+    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.3.0",
+    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
+  },
+  {
+    "pname": "Avalonia.Headless",
+    "version": "11.3.0",
+    "hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao="
+  },
+  {
+    "pname": "Avalonia.Labs.Lottie",
+    "version": "11.3.1",
+    "hash": "sha256-+f1jIirOw9DZSb2Y7ppXYBOuAkZ72MzD/+7rP4xaLAc="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.3.0",
+    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.3.0",
+    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.3.0",
+    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.3.0",
+    "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.3.0",
+    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.3.0",
+    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.3.0",
+    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.0.5",
+    "hash": "sha256-wS0clXNKAG4uy539dUjbrRdzHrdHsloivpY5SEBCNtY="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.2.0",
+    "hash": "sha256-I9aELyXkzLGX6T4HUFbCQxn+eWqLLPK0xqEiF+6hi5k="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.2.0.14",
+    "hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.0.5",
+    "hash": "sha256-s/o0416K/nZkVWcNPuKbqmwLKhWsMeEds/dT85QOp4c="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.2.0",
+    "hash": "sha256-Wnt4xra+TPRiAJ5TIyefwkRxxA999THBstm8QuLXZlU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.2.0.14",
+    "hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.0.5",
+    "hash": "sha256-0HVVQTHD+D4q4IYjMJ6H90mMefBLr5pSKDy7JMq10cE="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.2.0",
+    "hash": "sha256-vLOTOHwy7RRrgrYFUetAIWSC+Pm6yxzb3Ko2BPtXGUo="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.2.0.14",
+    "hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.0.5",
+    "hash": "sha256-iwchyONRjTbSSNxaGROeM62RL964KCs0fWz6VIO4O/k="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.2.0",
+    "hash": "sha256-rAHnjsMnaZCf+dMWe3fZAsnwY2LKFJuTVzsyNzWnh2Q="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.2.0.14",
+    "hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.0.5",
+    "hash": "sha256-C8acIjqy8Akf1ZFVLBq+wKuGaP8YOlKEa+e2RaowKak="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.2.0",
+    "hash": "sha256-WI3JZm+IuKpdlhw1XpgPXJs+e9P97l0odSHPM8SSrqw="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.2.0.14",
+    "hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.0.5",
+    "hash": "sha256-NbG4wOT5d4z6OkGMLdB7pZrRcu0BOK5PBGZ098iE3IU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.2.0",
+    "hash": "sha256-z1DGsetBjrzTP1pLWSqP748bl6tDWWOUlvuPc7WHb1k="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.2.0.14",
+    "hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Reactive",
+    "version": "11.0.5",
+    "hash": "sha256-zrbr7MW+3LOyhIMi5VB8YRfr19vyWtcaxwqXjbkTDAA="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.0.5",
+    "hash": "sha256-TfcYEdLMxYffBcBzcyoKWESrQltozigJKx+CLNCMz08="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.2.0",
+    "hash": "sha256-V1YHBrPEKBgHYmEdhWmzz7NOSwExYMaz3J0N0s53Gl0="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.2.0.14",
+    "hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.0.5",
+    "hash": "sha256-nNoI2rxJBFuYs1lg3O3rXeigJWoGjzGWdU8jsWGz7+4="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.2.0",
+    "hash": "sha256-N3maAwWG//4uHAEvux0/BwanQLviMm7uo6jxIj4kB8s="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.2.0.14",
+    "hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y="
+  },
+  {
+    "pname": "BmpSharp",
+    "version": "0.2.0",
+    "hash": "sha256-uUNpbOmeiOOkX5TQauqEF3yTo4puGh7/vgTTb7Eyg9s="
+  },
+  {
+    "pname": "ByteSize",
+    "version": "2.1.2",
+    "hash": "sha256-qAxJsWRRedraGr0VzvDEpzAWCZfwkMvcsC4WBEh+q6g="
+  },
+  {
+    "pname": "CLSEncoderDecoder",
+    "version": "1.0.0",
+    "hash": "sha256-RSfmfqUn+abzArefdWNT5pIS4hvMEa2abnrhnrKGiPk="
+  },
+  {
+    "pname": "CommunityToolkit.HighPerformance",
+    "version": "8.3.2",
+    "hash": "sha256-8wB8IwDi1u8WLxPHd+6cyAbhGUr1oSi1juULE1crSQc="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.4.0",
+    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
+  },
+  {
+    "pname": "DeviceId",
+    "version": "6.9.0",
+    "hash": "sha256-TZjWLotGLchmhvESXa4A0eUqKCPT89aXmqY7smc952I="
+  },
+  {
+    "pname": "DeviceId.Linux",
+    "version": "6.9.0",
+    "hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc="
+  },
+  {
+    "pname": "DiscordRichPresence",
+    "version": "1.3.0.28",
+    "hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs="
+  },
+  {
+    "pname": "ExCSS",
+    "version": "4.3.0",
+    "hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M="
+  },
+  {
+    "pname": "ExCSS",
+    "version": "4.3.1",
+    "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
+  },
+  {
+    "pname": "FFMpegCore",
+    "version": "5.1.0",
+    "hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA="
+  },
+  {
+    "pname": "Hardware.Info",
+    "version": "101.0.1.1",
+    "hash": "sha256-Bjztcg1xtZFL+3BafHAS1PWelDLc1XTQjeyr69pO7dA="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.0.1",
+    "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "8.3.0.1",
+    "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.0.1",
+    "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY="
+  },
+  {
+    "pname": "Humanizer.Core",
+    "version": "2.14.1",
+    "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
+  },
+  {
+    "pname": "Instances",
+    "version": "3.0.0",
+    "hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y="
+  },
+  {
+    "pname": "MessagePack",
+    "version": "2.5.192",
+    "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU="
+  },
+  {
+    "pname": "MessagePack.Annotations",
+    "version": "2.5.192",
+    "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM="
+  },
+  {
+    "pname": "MessagePackAnalyzer",
+    "version": "2.5.192",
+    "hash": "sha256-4JU8K72WUCW26IcrustOCBotEGqjspnjgEZcJF3ZCl4="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "6.0.0",
+    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "8.0.0",
+    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
+  },
+  {
+    "pname": "Microsoft.Bcl.HashCode",
+    "version": "6.0.0",
+    "hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
+    "version": "3.3.0",
+    "hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.11.0",
+    "hash": "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.11.0",
+    "hash": "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp.Features",
+    "version": "4.11.0",
+    "hash": "sha256-/rQzc9HHR6h02Dm9rPsBlQyztgt4itmbTFOMV8rgWfc="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
+    "version": "4.11.0",
+    "hash": "sha256-A3hmUJzaqRcWndwGKCHXt3in9T5GeV6ypl/ka8dDQr0="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Elfie",
+    "version": "1.0.0",
+    "hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Features",
+    "version": "4.11.0",
+    "hash": "sha256-W/R3JVuWfTTcW/GZjJzdTyxZVZpk1dAgaJPz+UGcgyU="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Scripting.Common",
+    "version": "4.11.0",
+    "hash": "sha256-2JC9TipfoAQ1ug4i+PexZemJHFhjnFNv/FqjBIsV6J0="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
+    "version": "4.11.0",
+    "hash": "sha256-8+HxGPWrxOsvqFBnx4rrNQRDfeLbPU7DGcQYyNMq/pE="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.DiaSymReader",
+    "version": "2.0.0",
+    "hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="
+  },
+  {
+    "pname": "Microsoft.DotNet.PlatformAbstractions",
+    "version": "3.1.6",
+    "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.0",
+    "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "8.0.0",
+    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
+  },
+  {
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.6.3",
+    "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "2.0.0",
+    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "5.0.0",
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "4.5.0",
+    "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "5.0.0",
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "OneOf",
+    "version": "3.0.271",
+    "hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="
+  },
+  {
+    "pname": "protobuf-net",
+    "version": "3.2.52",
+    "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek="
+  },
+  {
+    "pname": "protobuf-net.Core",
+    "version": "3.2.52",
+    "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ="
+  },
+  {
+    "pname": "Qoi.NetStandard",
+    "version": "1.0.0",
+    "hash": "sha256-pjJUeRSKaU7NdFwi0gHfmRJUodzgUB4Amz8ERQso+nY="
+  },
+  {
+    "pname": "ShimSkiaSharp",
+    "version": "3.0.3",
+    "hash": "sha256-Nngzb1buTzSYvNBS5TUOiJcN71ySM8i6HrPskLEQttM="
+  },
+  {
+    "pname": "ShimSkiaSharp",
+    "version": "3.0.5",
+    "hash": "sha256-sjVmij064B96wC00JfTW9wsrK0/Uh1ewwvcw1qXxFMo="
+  },
+  {
+    "pname": "Silk.NET.Core",
+    "version": "2.22.0",
+    "hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc="
+  },
+  {
+    "pname": "Silk.NET.Maths",
+    "version": "2.22.0",
+    "hash": "sha256-wBydHf4R69A3dm8SnD82zjBd5QgwXbmipRqXtk+AjpE="
+  },
+  {
+    "pname": "Silk.NET.OpenGL",
+    "version": "2.22.0",
+    "hash": "sha256-1XWABfBzsSg1nJzbDJ/FH140WLzjpuNTxDHNZfV85xo="
+  },
+  {
+    "pname": "Silk.NET.Vulkan",
+    "version": "2.22.0",
+    "hash": "sha256-TxCjv6Q35PrJTs0SkiE1srJNZf1yh9k98Gfx8DWSWjY="
+  },
+  {
+    "pname": "Silk.NET.Vulkan.Extensions.EXT",
+    "version": "2.22.0",
+    "hash": "sha256-spbTFm5wHbVZqMNvAih6wexeZs61B8kbX4sKYSe5Syk="
+  },
+  {
+    "pname": "Silk.NET.Vulkan.Extensions.KHR",
+    "version": "2.22.0",
+    "hash": "sha256-aXgS8UxYlfBIrxmoAOuy6Z3NZuV+ruSibQPvLO1wL/U="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.116.1",
+    "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.118.0-preview.1.2",
+    "hash": "sha256-3vy6mQ11MqelRv6j1eGJKkNgLkr/geT99m75xiYrVbM="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.119.0",
+    "hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM="
+  },
+  {
+    "pname": "SkiaSharp.HarfBuzz",
+    "version": "3.116.1",
+    "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "3.119.0",
+    "hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.116.1",
+    "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.118.0-preview.1.2",
+    "hash": "sha256-Cgf2xL9Zmib61u+IBDSivMiTr0QjB6t6nZp9npNS5f8="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.119.0",
+    "hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "3.119.0",
+    "hash": "sha256-bEWnEJJZ9E0MD688vOvEusJJRJbgpMCiG9u5Tj/BIkQ="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.116.1",
+    "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.118.0-preview.1.2",
+    "hash": "sha256-UWMf4l1D0Q+RkTIQ0Aslf4zsL3XrsbZ15cy4ou42+34="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.119.0",
+    "hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo="
+  },
+  {
+    "pname": "SkiaSharp.Skottie",
+    "version": "2.88.8",
+    "hash": "sha256-+ldOojWMQi51wK88msauHBnzNqyRW6RRokF6+yn4nwo="
+  },
+  {
+    "pname": "Svg.Controls.Skia.Avalonia",
+    "version": "11.3.0.1",
+    "hash": "sha256-e+GW+mFWFvw/Dzhf7xVQnZMCCn1e9Po6XKtHCd11GfY="
+  },
+  {
+    "pname": "Svg.Controls.Skia.Avalonia",
+    "version": "11.3.0.3",
+    "hash": "sha256-X0Plwm75PMMjlSLV+qr25ye5g9jc93Dv1J7bcNW1m+g="
+  },
+  {
+    "pname": "Svg.Custom",
+    "version": "3.0.3",
+    "hash": "sha256-faH73+8y0A7p+koyd3Y4CcYI8U/cAbH1X566bMd3dI4="
+  },
+  {
+    "pname": "Svg.Custom",
+    "version": "3.0.5",
+    "hash": "sha256-OY5wMjwk++n41cRDJIBvsfSjLqLCqU5lwkCWNbqrm9w="
+  },
+  {
+    "pname": "Svg.Model",
+    "version": "3.0.3",
+    "hash": "sha256-ncQwRRi51A12bpZKjG2ZhaLUJ7MD9ny1lwKUYwr63LE="
+  },
+  {
+    "pname": "Svg.Model",
+    "version": "3.0.5",
+    "hash": "sha256-QLghW+2QFzAzCLE52oqt+NT/M3LxWFX7GVG6t84Ilw8="
+  },
+  {
+    "pname": "Svg.Skia",
+    "version": "3.0.3",
+    "hash": "sha256-tQ8a1Gt92IPAXhEY9osBZXUZk2sXM19CWf4zt71mwk8="
+  },
+  {
+    "pname": "Svg.Skia",
+    "version": "3.0.5",
+    "hash": "sha256-zfmwCIfDJKfFuXAR/fdmdK3xsficRFTIMoaeaBKF2hU="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.CodeDom",
+    "version": "8.0.0",
+    "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "6.0.0",
+    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
+  },
+  {
+    "pname": "System.Composition",
+    "version": "8.0.0",
+    "hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="
+  },
+  {
+    "pname": "System.Composition.AttributedModel",
+    "version": "8.0.0",
+    "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
+  },
+  {
+    "pname": "System.Composition.Convention",
+    "version": "8.0.0",
+    "hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="
+  },
+  {
+    "pname": "System.Composition.Hosting",
+    "version": "8.0.0",
+    "hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="
+  },
+  {
+    "pname": "System.Composition.Runtime",
+    "version": "8.0.0",
+    "hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="
+  },
+  {
+    "pname": "System.Composition.TypedParts",
+    "version": "8.0.0",
+    "hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "8.0.0",
+    "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="
+  },
+  {
+    "pname": "System.Data.DataSetExtensions",
+    "version": "4.5.0",
+    "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "8.0.0",
+    "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
+  },
+  {
+    "pname": "System.Diagnostics.PerformanceCounter",
+    "version": "8.0.0",
+    "hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "9.0.3",
+    "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
+  },
+  {
+    "pname": "System.Management",
+    "version": "8.0.0",
+    "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.5.0",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "5.0.0",
+    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.1",
+    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.7.0",
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.7.0",
+    "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.7.0",
+    "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "4.5.0",
+    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "5.0.0",
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "8.0.0",
+    "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.5.0",
+    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "5.0.0",
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "7.0.0",
+    "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "7.0.0",
+    "hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "9.0.3",
+    "hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "7.0.2",
+    "hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.3",
+    "hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "7.0.0",
+    "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+  },
+  {
+    "pname": "Wasmtime",
+    "version": "22.0.0",
+    "hash": "sha256-Q6NWraxWlVz5p/2rY6d9XZBv/VM6tRG2eCNRpMLAp6A="
+  }
+]
diff --git a/pkgs/by-name/pi/pixieditor/mimeinfo.xml b/pkgs/by-name/pi/pixieditor/mimeinfo.xml
new file mode 100644
index 000000000000..b1d0c9aece16
--- /dev/null
+++ b/pkgs/by-name/pi/pixieditor/mimeinfo.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-pixieditor">
+    <comment>PixiEditor project file</comment>
+    <glob pattern="*.pixi" />
+  </mime-type>
+</mime-info>
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
new file mode 100644
index 000000000000..a358771d1315
--- /dev/null
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -0,0 +1,182 @@
+{
+  lib,
+  stdenv,
+  writeText,
+
+  fetchFromGitHub,
+
+  dotnetCorePackages,
+  buildDotnetModule,
+
+  ffmpeg-headless,
+
+  vulkan-loader,
+  openssl,
+  libGL,
+  libX11,
+  libICE,
+  libSM,
+  libXi,
+  libXcursor,
+  libXext,
+  libXrandr,
+
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+let
+  inherit (dotnetCorePackages) fetchNupkg;
+
+  buildInfo = {
+    id = "NixOS";
+    name = "for NixOS";
+  };
+
+  appSettings = writeText "appsettings.json" (
+    lib.strings.toJSON {
+      PixiEditorApiUrl = "https://auth.pixieditor.net";
+      PixiEditorApiKey = "waIvElX0fPqaxnyD7Rh1SSEvdq8qfKUs";
+      AnalyticsUrl = "https://api.pixieditor.net/analytics/";
+    }
+  );
+in
+buildDotnetModule (finalAttrs: {
+  pname = "pixieditor";
+  version = "2.0.1.14";
+
+  src = fetchFromGitHub {
+    owner = "PixiEditor";
+    repo = "PixiEditor";
+    tag = finalAttrs.version;
+    hash = "sha256-wyqt5mpT4xmaTk7RidQOOZAgkgMfcKiz5/7Nle0/Tkg=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    substituteInPlace ./src/PixiEditor/Helpers/VersionHelpers.cs \
+      --replace-fail 'builder.Append(" Release Build");' 'builder.Append(" ${buildInfo.name}");' \
+      --replace-fail 'return "Release";' 'return "${buildInfo.id}";';
+
+    substituteInPlace ./src/PixiEditor/Models/ExceptionHandling/CrashReport.cs \
+      --replace-fail 'ShellExecute(fileName,' 'ShellExecute("${placeholder "out"}/bin/pixieditor",';
+
+    rm -rf ./src/PixiEditor.AnimationRenderer.FFmpeg/ThirdParty/{Linux,Macos,Windows}/*
+    substituteInPlace ./src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs \
+      --replace-fail 'new FFOptions() { BinaryFolder = binaryPath }' 'new FFOptions() { BinaryFolder = "${ffmpeg-headless}/bin" }' \
+      --replace-fail 'MakeExecutableIfNeeded(binaryPath);' ' ';
+  '';
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    (fetchNupkg {
+      pname = "protobuf-net.protogen";
+      version = "3.2.52";
+      hash = "sha256-sKVCXtd5qD86D2FOgjMXh37P6IrcmqmaoJregAhLFGY=";
+    })
+  ];
+
+  nugetDeps = ./deps.json;
+  linkNugetPackages = true;
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+  dotnetFlags =
+    lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ];
+
+  buildType = "ReleaseNoUpdate";
+  projectFile = [
+    "src/PixiEditor.Desktop/PixiEditor.Desktop.csproj"
+    "src/PixiEditor/PixiEditor.csproj"
+    "src/PixiEditor.Linux/PixiEditor.Linux.csproj"
+    "src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj"
+  ];
+  executables = [ "PixiEditor.Desktop" ];
+
+  runtimeDeps = [
+    vulkan-loader
+    openssl
+    libGL
+    libX11
+    libICE
+    libSM
+    libXi
+    libXcursor
+    libXext
+    libXrandr
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "pixieditor";
+      type = "Application";
+      desktopName = "PixiEditor";
+      genericName = "2D Editor";
+      comment = finalAttrs.meta.description;
+      icon = "pixieditor";
+      exec = "pixieditor %f";
+      tryExec = "pixieditor";
+      startupWMClass = "pixieditor";
+      terminal = false;
+      categories = [
+        "Graphics"
+        "2DGraphics"
+        "RasterGraphics"
+        "VectorGraphics"
+      ];
+      keywords = [
+        "editor"
+        "image"
+        "2d"
+        "graphics"
+        "design"
+        "vector"
+        "raster"
+      ];
+      mimeTypes = [
+        "application/x-pixieditor"
+      ];
+      extraConfig.SingleMainWindow = "true";
+    })
+  ];
+
+  postConfigure = ''
+    dotnet build -t:InstallProtogen \
+      src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj
+  '';
+
+  postInstall = ''
+    install -Dm644 ${appSettings} $out/lib/pixieditor/appsettings.json;
+
+    install -Dm644 ${./mimeinfo.xml} $out/share/mime/packages/pixieditor.xml;
+
+    install -Dm644 src/PixiEditor/Images/PixiEditorLogo.svg \
+      $out/share/icons/hicolor/scalable/apps/pixieditor.svg;
+  '';
+
+  postFixup = ''
+    mv $out/bin/PixiEditor.Desktop $out/bin/pixieditor
+  '';
+
+  meta = {
+    description = "Universal editor for all your 2D needs";
+    longDescription = ''
+      PixiEditor is a universal 2D platform that aims to provide you with tools and features for all your 2D needs.
+      Create beautiful sprites for your games, animations, edit images, create logos. All packed in an eye-friendly dark theme
+    '';
+    homepage = "https://pixieditor.com";
+    changelog = "https://github.com/PixiEditor/PixiEditor/releases/tag/${finalAttrs.version}";
+    mainProgram = "pixieditor";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [
+      griffi-gh
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+})
diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index fda6138a37b1..1722b3c0872c 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -6,24 +6,31 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pizauth";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
-    tag = "pizauth-${version}";
-    hash = "sha256-lvG50Ej0ius4gHEsyMKOXLD20700mc4iWJxHK5DvYJc=";
+    tag = "pizauth-${finalAttrs.version}";
+    hash = "sha256-KLHccRCJ19CrGKePhUgW4GhQzn+ULE861cW2ykGoaZk=";
   };
 
-  cargoHash = "sha256-WyQIk74AKfsv0noafCGMRS6o+Lq6CeP99AFSdYq+QHg=";
+  cargoHash = "sha256-m1kOV0b/HCSAGfbEh4GdtrlphoELe7ebG+kgKKNYihY=";
 
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
     installShellCompletion --cmd pizauth \
-      --bash share/bash/completion.bash
+      --bash share/bash/completion.bash \
+      --fish share/fish/pizauth.fish
+
+    installManPage pizauth.1 pizauth.conf.5
+
+    substituteInPlace lib/systemd/user/pizauth.service \
+      --replace-fail /usr/bin/pizauth "$out/bin/pizauth"
+    install -Dm444 lib/systemd/user/pizauth{,-*}.service -t $out/lib/systemd/user
   '';
 
   passthru.updateScript = nix-update-script { };
@@ -31,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command-line OAuth2 authentication daemon";
     homepage = "https://github.com/ltratt/pizauth";
-    changelog = "https://github.com/ltratt/pizauth/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/ltratt/pizauth/blob/${finalAttrs.src.rev}/CHANGES.md";
     license = with lib.licenses; [
       asl20
       mit
@@ -39,4 +46,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ moraxyc ];
     mainProgram = "pizauth";
   };
-}
+})
diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index 45b2256e15f2..1cf10145d3e8 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "pkarr";
-  version = "4.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "pubky";
     repo = "pkarr";
     rev = "v${version}";
-    hash = "sha256-9sTF5h2+vWcz5ohAoo95vldTJGQyz/ICkVpIgaxilwA=";
+    hash = "sha256-564JL7EG/RB2k2JdxAENpP5UZtKtaGlrZfeYOgsLBEY=";
   };
 
-  cargoHash = "sha256-26OlV/Xnl1+VFOaCWUjb8LxuJWrCsfY7QTlPZ7VMBCs=";
+  cargoHash = "sha256-HG4cmKQleiWdYBrOgv1Aj/erWjZX5PMwIZpQSQc+sFU=";
 
   meta = {
     description = "Public Key Addressable Resource Records (sovereign TLDs) ";
diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 2693cd48e234..a8264699fc7c 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-10-09";
+  version = "0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "31e4cbb15040258abb9a4e5eb0d5fcef6f8e0562";
-    hash = "sha256-JCcutMJNeeqN7ruTwrvAIe44Xpi7Ne9UXVPnQW5ujEk=";
+    rev = "0d7e29046a911358f7f5a5c4028a9db875187281";
+    hash = "sha256-2dHT/p0cImvaJGxf50SSebgq3eSkbX1A0kdi93rCJCE=";
   };
 
   vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c=";
diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix
index 09f4eff0fbb2..1f08905eb8f8 100644
--- a/pkgs/by-name/pk/pkgtop/package.nix
+++ b/pkgs/by-name/pk/pkgtop/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     homepage = "https://github.com/orhun/pkgtop";
     changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "pkgtop";
   };
 }
diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 336064592473..dab7c6e06394 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "plakar";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "PlakarKorp";
     repo = "plakar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gClQiXZEPui7g3Ps6yhB2tN36PnkqADo9iD4Gm6DpD4=";
+    hash = "sha256-cuPz0xg/cGKczHLpFqSBfFD7KlygCX6fnfrigv0K2Zs=";
   };
 
-  vendorHash = "sha256-JVk8wiuuicwWgEbqIjp7ryC4k3uc4DiXnJ5FxYbXV5M=";
+  vendorHash = "sha256-ySzDtj8EdGcWl6H1q44+QR5ebSC76leVygl+c8fa7sk=";
 
   buildInputs = [
     fuse
diff --git a/pkgs/by-name/pl/planarity/package.nix b/pkgs/by-name/pl/planarity/package.nix
index 9ecc15b994e5..a1d18bc8a476 100644
--- a/pkgs/by-name/pl/planarity/package.nix
+++ b/pkgs/by-name/pl/planarity/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planarity";
-  version = "4.0.0.0";
+  version = "4.0.1.0";
 
   src = fetchFromGitHub {
     owner = "graph-algorithms";
     repo = "edge-addition-planarity-suite";
     rev = "Version_${version}";
-    sha256 = "sha256-A7huHvMgUyvw2zM9qA7Ax/1Ai5VZ6A1PZIo3eiCpu44=";
+    sha256 = "sha256-uSCQSn3LRi3eQynh71fs1xhVIrPcOqVyGzdHAK9xj7E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index 55bc6548512a..5a89ecce1279 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.15.1";
+  version = "4.15.2";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     tag = "v${version}";
-    hash = "sha256-b0I6UXdE0EqRP9FrqRyf1CscYSlYjFPcmIgkMjCLWMc=";
+    hash = "sha256-i6yAObfSMZyHHK/1YUFppU9gcFJj7WL48Eqe6IQAh4M=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix
index e2fc1900f9c1..1036d73e1973 100644
--- a/pkgs/by-name/pl/plantuml-server/package.nix
+++ b/pkgs/by-name/pl/plantuml-server/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "plantuml-server";
-  version = "1.2025.8";
+  version = "1.2025.10";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
-    hash = "sha256-O0hH2cWf8V5RwcdUlzNO8HLSghhTbdC/1mAenxrXB6s=";
+    hash = "sha256-GbFbQRVTQsGstu61FKpAypvopP6peHHMzxFA8yGtRp4=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix
index cfab4bda23af..fad0e753dba9 100644
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plantuml";
-  version = "1.2025.8";
+  version = "1.2025.10";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
-    hash = "sha256-KYOy8hJ62IBrLx78S2JLAMR2wuL18Ww+afVgPeKgWgQ=";
+    hash = "sha256-fUFZrW8LD6M1WV6I2pYigr9rJaDlo0OLY8NZdB+w2yk=";
   };
 
   nativeBuildInputs = [
@@ -59,7 +59,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "plantuml";
     maintainers = with lib.maintainers; [
       bjornfor
-      Mogria
       anthonyroussel
     ];
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix
index 5e38b58ca998..4ce3eed4dd52 100644
--- a/pkgs/by-name/pl/planus/package.nix
+++ b/pkgs/by-name/pl/planus/package.nix
@@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
index f719ae5e3e41..7fbdf809b4f0 100644
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "5.0.1";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E6VX2naAS2xof5sdnuaSuKueIKecW0fi9SycgLVRQVU=";
+    hash = "sha256-QyW3F0PwTSE6wUNW3pwI/Xj9/7Rxl0GXJ6W02oZBeKU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
index 5c92df60d720..45799ab80eba 100644
--- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-spacer-extended";
-  version = "1.11.1";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-spacer-extended";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TQx9J10qfjCaolq/mpSjhV13uYxK/wBGIXH1sQFaLRA=";
+    hash = "sha256-FJbRKL/jALKxS97uVftyKwjSUhADtHv/hgOJA5VvGNQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index 4b71b298b1e2..c02c5a6da7b2 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasmusic-toolbar";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "ccatterina";
     repo = "plasmusic-toolbar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vs+aMTVaRaPuiFvLbW+BgOzdzPGYb3mEKdZqQyoSwC4=";
+    hash = "sha256-yCsNvco01dy72f8g1+BCYXo1yx/ERdfggLYchj/UXcw=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix
index f0afbb6b5642..9edb8ce9c8a3 100644
--- a/pkgs/by-name/pl/platformio-core/package.nix
+++ b/pkgs/by-name/pl/platformio-core/package.nix
@@ -79,6 +79,7 @@ buildPythonApplication rec {
     marshmallow
     pip
     pyelftools
+    pyparsing
     pyserial
     pyyaml
     requests
diff --git a/pkgs/by-name/pl/plistcpp/package.nix b/pkgs/by-name/pl/plistcpp/package.nix
index 4b1aea8d1218..73c4179960b3 100644
--- a/pkgs/by-name/pl/plistcpp/package.nix
+++ b/pkgs/by-name/pl/plistcpp/package.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation {
 
   postPatch = ''
     sed -i "1i #include <algorithm>" src/Plist.cpp
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pl/plotinus/package.nix b/pkgs/by-name/pl/plotinus/package.nix
index 4d66711a3220..1fdc8b31177f 100644
--- a/pkgs/by-name/pl/plotinus/package.nix
+++ b/pkgs/by-name/pl/plotinus/package.nix
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
     sha256 = "19k6f6ivg4ab57m62g6fkg85q9sv049snmzq1fyqnqijggwshxfz";
   };
 
+  postPatch = ''
+    # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" \
+        "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook3
diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 828f7724e857..5874718b28b7 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.22.5";
+  version = "5.22.6";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-MserKZcOkif56XeTLRzHDDk6HYeVhgKsnOjsfv0vPeQ=";
+    hash = "sha256-6Xi+EWQvFYtdiVywhSB4Lmzsc6Z1nE8UWO8vBteVOnE=";
   };
 
   vendorHash = "sha256-59mRVfQ2rduTvIJE1l/j3K+PY3OEMfNpjjYg3hqNUhs=";
diff --git a/pkgs/by-name/pm/pmenu/package.nix b/pkgs/by-name/pm/pmenu/package.nix
index 5905b02197bc..71319a7a532a 100644
--- a/pkgs/by-name/pm/pmenu/package.nix
+++ b/pkgs/by-name/pm/pmenu/package.nix
@@ -59,5 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "pmenu";
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch b/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch
new file mode 100644
index 000000000000..b390d492467c
--- /dev/null
+++ b/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch
@@ -0,0 +1,20 @@
+--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
++++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+@@ -696,7 +696,7 @@ func init() {
+ 	// Load protocols
+ 	data, err := ioutil.ReadFile("/etc/protocols")
+ 	if err != nil {
+-		if !os.IsNotExist(err) {
++		if !os.IsNotExist(err) && !os.IsPermission(err) {
+ 			panic(err)
+ 		}
+ 
+@@ -732,7 +732,7 @@ func init() {
+ 	// Load services
+ 	data, err = ioutil.ReadFile("/etc/services")
+ 	if err != nil {
+-		if !os.IsNotExist(err) {
++		if !os.IsNotExist(err) && !os.IsPermission(err) {
+ 			panic(err)
+ 		}
+ 
diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index cca23b28c474..554fea30290e 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -5,16 +5,23 @@
 }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.28.1";
+  version = "1.28.2";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     tag = "v${version}";
-    hash = "sha256-Ti6ljJeC6hqA5edzyUqOShBIbdmrsz4TDnQ44TMJQ8Q=";
+    hash = "sha256-JGsbgBB2T+4SWKQmiSmuMqQ8gw0qhM5c5eFDF/+sndA=";
   };
 
-  vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk=";
+  vendorHash = "sha256-6zsX7rU+D+RUHwXfFZzLQftQ6nSYJhvKIDdsO2vow4A=";
+
+  overrideModAttrs = old: {
+    # https://gitlab.com/cznic/libc/-/merge_requests/10
+    postBuild = ''
+      patch -p0 < ${./darwin-sandbox-fix.patch}
+    '';
+  };
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pn/pn/package.nix b/pkgs/by-name/pn/pn/package.nix
deleted file mode 100644
index 91adda540acf..000000000000
--- a/pkgs/by-name/pn/pn/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libphonenumber,
-  icu,
-  protobuf,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pn";
-  version = "0.9.0";
-
-  src = fetchFromGitHub {
-    owner = "Orange-OpenSource";
-    repo = "pn";
-    rev = "v${version}";
-    sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    libphonenumber
-    icu
-    protobuf
-  ];
-
-  meta = with lib; {
-    description = "Libphonenumber command-line wrapper";
-    mainProgram = "pn";
-    homepage = "https://github.com/Orange-OpenSource/pn";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.McSinyx ];
-  };
-}
diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix
index 4e1c109f8a35..a358441430f5 100644
--- a/pkgs/by-name/po/pocket-casts/package.nix
+++ b/pkgs/by-name/po/pocket-casts/package.nix
@@ -5,23 +5,23 @@
   makeDesktopItem,
   copyDesktopItems,
   makeWrapper,
-  electron_36,
+  electron_38,
 }:
 let
-  electron = electron_36;
+  electron = electron_38;
 in
 buildNpmPackage rec {
   pname = "pocket-casts";
-  version = "0.10.5";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
     rev = "v${version}";
-    hash = "sha256-LB0SOAcgCZuNKOWhL9m4cDF9q+voVd+2OYVeKTq7OB0=";
+    hash = "sha256-ZOOJAChKCLfwI8olQ2NSk8OaoEQ9wXNS6jwotc6fdnQ=";
   };
 
-  npmDepsHash = "sha256-i8IKH3sacYWLa2GtcJSoWCy5eV9vC79dP9WVN2Iy7DE=";
+  npmDepsHash = "sha256-hSSo2Wv5UXoowt+1JuUQPWO4vI/FiICtscIFttOgniA=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index f62f30e20992..f51345721410 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -11,18 +11,18 @@
 
 buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.13.1";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ayMPyc90bnkIhYfBQ8SgcKayjUQSyrcp5SOLGHTKQwE=";
+    hash = "sha256-mnmBwQ79sScTPM4Gh9g0x/QTmqm1TgxaOkww+bvs1b4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-+HF1zAWA6Ak7uJqWCcTXrttTy1sPA8bN+/No95eqFTU=";
+  vendorHash = "sha256-CmhPURPNwcpmD9shLrQPVKFGBirEMjq0Z4lmgMCpxS8=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -49,7 +49,7 @@ buildGo125Module (finalAttrs: {
     pnpmDeps = pnpm_10.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 1;
-      hash = "sha256-IVrp5qWYMgud9ryLidrUowWWBHZ2lMrJp0cfPPHpXls=";
+      hash = "sha256-/e1zBHdy3exqbMvlv0Jth7vpJd7DDnWXGfMV+Cdr56I=";
     };
 
     env.BUILD_OUTPUT_PATH = "dist";
diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index b3e0d7f46fcb..b9b3d2c0eab5 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.30.2";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${version}";
-    hash = "sha256-7XpusTwdocLsJBHWU71nHMmY0T05d4fKHe5XKvHSPR0=";
+    hash = "sha256-YCYihhPq24JdJKAU8zr4h4z131zj4BN3Qh/y5tHmyRs=";
   };
 
-  vendorHash = "sha256-ft+hs1VfCZrWceVDqO7ThRE1tiyozMFsYMclsKKdEBo=";
+  vendorHash = "sha256-wsPJIlsq4Q26cce69a0oqEalfDrNIMVFt8ufdj+WId4=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];
diff --git a/pkgs/by-name/po/podman-desktop/package.nix b/pkgs/by-name/po/podman-desktop/package.nix
index 1a57c1f94d72..d4ba1408f83d 100644
--- a/pkgs/by-name/po/podman-desktop/package.nix
+++ b/pkgs/by-name/po/podman-desktop/package.nix
@@ -24,7 +24,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "podman-desktop";
-  version = "1.22.0";
+  version = "1.22.1";
 
   passthru.updateScript = _experimental-update-script-combinators.sequence [
     (nix-update-script { })
@@ -57,13 +57,13 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "containers";
     repo = "podman-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gq4RMODR7AESMAGpg6ga5LS5SrpWD6pPe6dZ+Rx7a/g=";
+    hash = "sha256-+YM1fiY2bH5nY1L/xWjMbWe5lH1LfyKW47OzCROB3nE=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-tWWqnxPO27RcYeix5B+R3CyyyHYQL9PMPRhlse8FyVk=";
+    hash = "sha256-2Cja6CQxjOlxjhsjGQ5C9a/C/2RfzKdvtRCKO7VztwQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/po/podofo_0_9/package.nix b/pkgs/by-name/po/podofo_0_9/package.nix
index 1d7bf196678c..68ffb35cac44 100644
--- a/pkgs/by-name/po/podofo_0_9/package.nix
+++ b/pkgs/by-name/po/podofo_0_9/package.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation rec {
         -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches"
     sed -ni src/podofo/libpodofo.pc.in \
         -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches"
+
+    substituteInPlace {src/podofo/,./}CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = {
diff --git a/pkgs/by-name/po/pods/cve-2025-62516.patch b/pkgs/by-name/po/pods/cve-2025-62516.patch
new file mode 100644
index 000000000000..6163c8b82b18
--- /dev/null
+++ b/pkgs/by-name/po/pods/cve-2025-62516.patch
@@ -0,0 +1,200 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e799bfd1..efd6601a 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -86,6 +86,21 @@ dependencies = [
+  "zbus",
+ ]
+ 
++[[package]]
++name = "astral-tokio-tar"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5"
++dependencies = [
++ "filetime",
++ "futures-core",
++ "libc",
++ "portable-atomic",
++ "rustc-hash",
++ "tokio",
++ "tokio-stream",
++]
++
+ [[package]]
+ name = "async-broadcast"
+ version = "0.7.2"
+@@ -147,12 +162,6 @@ version = "0.13.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+ 
+-[[package]]
+-name = "bitflags"
+-version = "1.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+-
+ [[package]]
+ name = "bitflags"
+ version = "2.9.0"
+@@ -213,7 +222,7 @@ version = "0.20.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "cairo-sys-rs",
+  "glib",
+  "libc",
+@@ -833,7 +842,7 @@ version = "0.20.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "futures-channel",
+  "futures-core",
+  "futures-executor",
+@@ -1368,9 +1377,9 @@ version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "libc",
+- "redox_syscall 0.5.10",
++ "redox_syscall",
+ ]
+ 
+ [[package]]
+@@ -1488,7 +1497,7 @@ version = "0.29.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "cfg-if",
+  "cfg_aliases",
+  "libc",
+@@ -1842,6 +1851,7 @@ version = "2.2.0"
+ dependencies = [
+  "anyhow",
+  "ashpd",
++ "astral-tokio-tar",
+  "futures",
+  "gettext-rs",
+  "gtk4",
+@@ -1860,11 +1870,16 @@ dependencies = [
+  "syslog",
+  "tokio",
+  "tokio-stream",
+- "tokio-tar",
+  "vte",
+  "vte4",
+ ]
+ 
++[[package]]
++name = "portable-atomic"
++version = "1.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
++
+ [[package]]
+ name = "powerfmt"
+ version = "0.2.0"
+@@ -1973,22 +1988,13 @@ dependencies = [
+  "getrandom 0.3.2",
+ ]
+ 
+-[[package]]
+-name = "redox_syscall"
+-version = "0.3.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+-dependencies = [
+- "bitflags 1.3.2",
+-]
+-
+ [[package]]
+ name = "redox_syscall"
+ version = "0.5.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+ ]
+ 
+ [[package]]
+@@ -2026,6 +2032,12 @@ version = "0.1.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+ 
++[[package]]
++name = "rustc-hash"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
++
+ [[package]]
+ name = "rustc_version"
+ version = "0.4.1"
+@@ -2041,7 +2053,7 @@ version = "1.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "errno",
+  "libc",
+  "linux-raw-sys",
+@@ -2434,20 +2446,6 @@ dependencies = [
+  "tokio",
+ ]
+ 
+-[[package]]
+-name = "tokio-tar"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"
+-dependencies = [
+- "filetime",
+- "futures-core",
+- "libc",
+- "redox_syscall 0.3.5",
+- "tokio",
+- "tokio-stream",
+-]
+-
+ [[package]]
+ name = "toml"
+ version = "0.8.20"
+@@ -2862,7 +2860,7 @@ version = "0.39.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+ ]
+ 
+ [[package]]
+diff --git a/Cargo.toml b/Cargo.toml
+index 9a0b95d7..7d818fbf 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -8,6 +8,7 @@ edition = "2024"
+ adw = { version = "0.7", package = "libadwaita", features = ["v1_7"] }
+ anyhow = "1"
+ ashpd = { version = "0.11", default-features = false, features = ["gtk4", "tokio"] }
++astral-tokio-tar = { version = "0.5.6", default-features = false }
+ futures = { version = "0.3", default-features = false }
+ gettext-rs = { version = "=0.7.0", features = ["gettext-system"] }
+ gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
+@@ -25,7 +26,6 @@ sourceview5 = { version = "0.9" }
+ syslog = "7"
+ tokio = "1"
+ tokio-stream = { version = "0.1", default-features = false }
+-tokio-tar = { version = "0.3", default-features = false }
+ vte = { version = "0.15", default-features = false }
+ vte4 = "0.8"
+ 
diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 7661c420a333..be04adea7108 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  applyPatches,
+  fetchpatch2,
   cargo,
   desktop-file-utils,
   glib,
@@ -16,22 +18,32 @@
   libadwaita,
   libpanel,
   vte-gtk4,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "pods";
-  version = "2.1.2";
+  version = "2.2.0";
 
-  src = fetchFromGitHub {
-    owner = "marhkb";
-    repo = "pods";
-    tag = "v${version}";
-    hash = "sha256-S84Qb+hySjIxcznuA7Sh8n9XFvdZpf32Yznb1Sj+owY=";
+  src = applyPatches {
+    name = "pods-patched";
+    src = fetchFromGitHub {
+      owner = "marhkb";
+      repo = "pods";
+      tag = "v${version}";
+      hash = "sha256-m+0XjxY0nDAJbVX3r/Jfg+G+RU8Q51e0ZXxkdH69SiQ=";
+    };
+
+    # Based on upstream PR: https://github.com/marhkb/pods/pull/895
+    # which cannot be merged into 2.2.0 because dependencies were bumped since its release.
+    # Hopefully 2.2.1 will be released soon
+    patches = [ ./cve-2025-62516.patch ];
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-UBInZdoluWXq1jm2rhS5wBwXQ/zYFPSEeWhpSmkc2aY=";
+    hash = "sha256-GBWaGCNXYCiT/favrIYB30VGMMoQQk1iUh4GTNPerK8=";
   };
 
   nativeBuildInputs = [
@@ -55,12 +67,20 @@ stdenv.mkDerivation rec {
     vte-gtk4
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Podman desktop application";
     homepage = "https://github.com/marhkb/pods";
     changelog = "https://github.com/marhkb/pods/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "pods";
   };
diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix
index d1608d341a12..b862ed39de03 100644
--- a/pkgs/by-name/po/poethepoet/package.nix
+++ b/pkgs/by-name/po/poethepoet/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/nat-n/poethepoet";
     changelog = "https://github.com/nat-n/poethepoet/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "poe";
   };
 }
diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix
index 72fc5437cb9d..d7217b162fe0 100644
--- a/pkgs/by-name/po/pokeget-rs/package.nix
+++ b/pkgs/by-name/po/pokeget-rs/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pokeget-rs";
-  version = "1.6.5";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner = "talwat";
     repo = "pokeget-rs";
     tag = version;
-    hash = "sha256-EtEmaA0ukLoK0vaX+s3d8xodB3pUwSb1EyeyMBF0+rc=";
+    hash = "sha256-kvfGtdWVeEvaKxIDs5aCZk/HBXxB67PukXHz2VvLhdw=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-fK5OLgw5XWqfAZDxIZr26ft7X8KmInSPbYlaXOEyzN0=";
+  cargoHash = "sha256-EusvBjrtm7PAZ5exDUuCu2n300x1b1c9oks+T6cR2c8=";
 
   meta = with lib; {
     description = "Better rust version of pokeget";
diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index e451c93130a8..b52433049ac0 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-10-09";
+  version = "latest-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "08e5ab1593ec2658bcd87b8e915098c218112691";
-    hash = "sha256-cJDdPUNx7greggrNXuRJ+vq+cr8FlacaSNGIamJSdck=";
+    rev = "52211970b601db2e449ea6bc0a2e785d39c489c0";
+    hash = "sha256-jDhkBrLbk9B9xeEZ4A7jp6at/Hp4q2A/egoFgY2xK8I=";
   };
 
-  cargoHash = "sha256-ikjFczHc7iPUAksbo9URQN4YCz6DP61p5HhOEhZTqo0=";
+  cargoHash = "sha256-cH+cgYIUPQTHgGCZmP562VzCxz+i6LkymHtnHJXnd+A=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
diff --git a/pkgs/by-name/po/poliedros/package.nix b/pkgs/by-name/po/poliedros/package.nix
index 48bb166275a2..184f06e4cae0 100644
--- a/pkgs/by-name/po/poliedros/package.nix
+++ b/pkgs/by-name/po/poliedros/package.nix
@@ -14,7 +14,7 @@
   nix-update-script,
 }:
 let
-  version = "1.5.0";
+  version = "1.5.2";
 in
 python3Packages.buildPythonApplication {
   pname = "poliedros";
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication {
     owner = "kriptolix";
     repo = "Poliedros";
     tag = "v${version}";
-    hash = "sha256-1itBovF5xGB8zMedtKKcQ2FJeOd5gT1COrJtwEOgdbk=";
+    hash = "sha256-1xrXR0kY4zq2cafhVgPvWcJD7pEEiZX7tW1/T3Mfe+A=";
   };
 
   nativeBuildInputs = [
@@ -55,6 +55,6 @@ python3Packages.buildPythonApplication {
     changelog = "https://github.com/kriptolix/Poliedros/releases/tag/v${version}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "poliedros";
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix
index 1e50ded77ad6..33600ba484ab 100644
--- a/pkgs/by-name/po/polkadot/package.nix
+++ b/pkgs/by-name/po/polkadot/package.nix
@@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "polkadot";
-  version = "2506-1";
+  version = "2509-1";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "polkadot-sdk";
     rev = "polkadot-stable${version}";
-    hash = "sha256-gnPfhdlOakfm9Ieitl8CBLBht1ECkfXhguK9eNeI6k4=";
+    hash = "sha256-XisQA5WNmFaFfY7T4EMcwlOD8FUfAjmLDV7NSWsh3vA=";
 
     # the build process of polkadot requires a .git folder in order to determine
     # the git commit hash that is being built and add it to the version string.
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     rm .git_commit
   '';
 
-  cargoHash = "sha256-f6VI8pWZ+yRyFGO347ASD31k3WyBuRixqIUfzBqIr+s=";
+  cargoHash = "sha256-QqtLr6SvJGYrY0wGZw196amrGqLZg/Nea+QTYM1RzIs=";
 
   buildType = "production";
   buildAndTestSubdir = "polkadot";
diff --git a/pkgs/by-name/po/pololu-tic/package.nix b/pkgs/by-name/po/pololu-tic/package.nix
index 9ba193adc77c..1e4324362ff0 100644
--- a/pkgs/by-name/po/pololu-tic/package.nix
+++ b/pkgs/by-name/po/pololu-tic/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pololu-tic";
-  version = "1.8.1";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "pololu-tic-software";
     tag = finalAttrs.version;
-    hash = "sha256-C/v5oaC5zZwm+j9CbFaDW+ebzHxPVb8kZLg9c0HyPbc=";
+    hash = "sha256-NqYaWWBEcq0nw4pHKpZWwbkTwnlVLB1VsC/M9zjxkHg=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/po/polylith/package.nix b/pkgs/by-name/po/polylith/package.nix
index a91b3e4cecaa..7a33086ce54f 100644
--- a/pkgs/by-name/po/polylith/package.nix
+++ b/pkgs/by-name/po/polylith/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "polylith";
-  version = "0.2.22";
+  version = "0.3.30";
 
   src = fetchurl {
     url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
-    sha256 = "sha256-DKJ669TeDFK/USi7UxraAqgqnSCkG/nSIGphvpsmUv8=";
+    sha256 = "sha256-G64sbV671fY+k/tYy8Kq/cAGXLzbZY1g+HyzOw29D24=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/applications/audio/polyphone/default.nix b/pkgs/by-name/po/polyphone/package.nix
similarity index 73%
rename from pkgs/applications/audio/polyphone/default.nix
rename to pkgs/by-name/po/polyphone/package.nix
index 436a690ffd62..e416259aab08 100644
--- a/pkgs/applications/audio/polyphone/default.nix
+++ b/pkgs/by-name/po/polyphone/package.nix
@@ -3,35 +3,31 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
   alsa-lib,
   flac,
   libjack2,
   libogg,
   libvorbis,
-  qtsvg,
-  qtwayland,
   rtmidi,
+  kdePackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "2.4.1";
   pname = "polyphone";
 
   src = fetchFromGitHub {
     owner = "davy7125";
     repo = "polyphone";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-43EswCgNJv11Ov+4vmj2vS/yJ2atyzkRmk/SoCKYD/0=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    qttools
-    wrapQtAppsHook
+    kdePackages.qmake
+    kdePackages.qttools
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -40,8 +36,8 @@ stdenv.mkDerivation rec {
     libjack2
     libogg
     libvorbis
-    qtsvg
-    qtwayland
+    kdePackages.qtsvg
+    kdePackages.qtwayland
     rtmidi
   ];
 
@@ -52,23 +48,23 @@ stdenv.mkDerivation rec {
   postConfigure = ''
     # Work around https://github.com/NixOS/nixpkgs/issues/214765
     substituteInPlace Makefile \
-      --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin qttools}/bin/lrelease"
+      --replace-fail "$(dirname $QMAKE)/lrelease" "${lib.getBin kdePackages.qttools}/bin/lrelease"
   '';
 
   qmakeFlags = [
     "DEFINES+=USE_LOCAL_STK"
   ];
 
-  meta = with lib; {
+  meta = {
     broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
     description = "Soundfont editor for creating musical instruments";
     mainProgram = "polyphone";
     homepage = "https://www.polyphone-soundfonts.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
       maxdamantus
       orivej
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/po/pomodoro-gtk/package.nix b/pkgs/by-name/po/pomodoro-gtk/package.nix
index e31da5221375..9f0686ff4e6b 100644
--- a/pkgs/by-name/po/pomodoro-gtk/package.nix
+++ b/pkgs/by-name/po/pomodoro-gtk/package.nix
@@ -58,7 +58,10 @@ stdenv.mkDerivation {
     homepage = "https://gitlab.com/idevecore/pomodoro";
     license = lib.licenses.gpl3Plus;
     mainProgram = "pomodoro";
-    maintainers = with lib.maintainers; [ aleksana ];
+    maintainers = with lib.maintainers; [
+      aleksana
+      iedame
+    ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix
index 1692cf629566..c017fc9a9146 100644
--- a/pkgs/by-name/po/pomsky/package.nix
+++ b/pkgs/by-name/po/pomsky/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pomsky";
-  version = "0.11";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "pomsky-lang";
     repo = "pomsky";
     rev = "v${version}";
-    hash = "sha256-BoA59P0jzV08hlFO7NPB9E+fdpYB9G50dNggFkexc/c=";
+    hash = "sha256-0rLY0WZj8p9D834SqHogV77GLHLesyPPxMGszDmkB9U=";
   };
 
-  cargoHash = "sha256-/tJwJ/xF5a2NEP5A/3swq75wCk9qxgbp7ilH1PqcWJY=";
+  cargoHash = "sha256-zUK8v96/jHaprrfbym23X7e/ZRoDwfNyDt+GIcd7BmY=";
 
   nativeBuildInputs = [
     pkg-config
@@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index f8595316d4e3..1363bb316ed8 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
+  nix-update-script,
   stdenv,
   fetchFromGitHub,
-  apple-sdk_13,
+  apple-sdk,
   cmake,
   coreutils,
-  darwinMinVersionHook,
   libxml2,
   lto ? true,
   makeWrapper,
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ponyc";
-  version = "0.59.0";
+  version = "0.60.4";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     tag = version;
-    hash = "sha256-4gDv8UWTk0RWVNC4PU70YKSK9fIMbWBsQbHboVls2BA=";
+    hash = "sha256-L5qqAu0OozsN6zxC3iwdYTLdd1ux4Dl3bFx6XDD3ZbY=";
     fetchSubmodules = true;
   };
 
@@ -42,12 +42,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
   };
 
-  googletestRev = "1.15.2";
+  googletestRev = "1.17.0";
   googletest = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
     rev = "v${googletestRev}";
-    hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
+    hash = "sha256-HIHMxAUR4bjmFLoltJeIAVSulVQ6kVuIT2Ku+lwAx/4=";
   };
 
   nativeBuildInputs = [
@@ -58,9 +58,6 @@ stdenv.mkDerivation rec {
     git
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Keep in sync with `PONY_OSX_PLATFORM`.
-    apple-sdk_13
-    (darwinMinVersionHook "13.0")
     cctools.libtool
   ];
 
@@ -76,7 +73,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (replaceVars ./fix-darwin-build.patch {
-      apple-sdk = apple-sdk_13;
+      inherit apple-sdk;
     })
   ];
 
@@ -99,7 +96,7 @@ stdenv.mkDerivation rec {
     # Replace downloads with local copies.
     substituteInPlace lib/CMakeLists.txt \
         --replace-fail "https://github.com/google/benchmark/archive/v$benchmarkRev.tar.gz" "$NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar" \
-        --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
+        --replace-fail "https://github.com/google/googletest/releases/download/v$googletestRev/googletest-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
   '';
 
   preBuild = ''
@@ -115,6 +112,8 @@ stdenv.mkDerivation rec {
     make configure "''${extraFlags[@]}"
   '';
 
+  enableParallelBuilding = true;
+
   makeFlags = [
     "PONYC_VERSION=${version}"
     "prefix=${placeholder "out"}"
@@ -128,6 +127,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelChecking = true;
+
   nativeCheckInputs = [ procps ];
 
   installPhase = ''
@@ -156,7 +157,10 @@ stdenv.mkDerivation rec {
   # Stripping breaks linking for ponyc
   dontStrip = true;
 
-  passthru.tests.pony-corral = pony-corral;
+  passthru = {
+    tests.pony-corral = pony-corral;
+    updateScript = nix-update-script { };
+  };
 
   meta = with lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";
diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix
index 3edae8fb889b..107fade87c08 100644
--- a/pkgs/by-name/po/poop/package.nix
+++ b/pkgs/by-name/po/poop/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/andrewrk/poop";
     changelog = "https://github.com/andrewrk/poop/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "poop";
   };
diff --git a/pkgs/by-name/po/pop-hp-wallpapers/package.nix b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
index 92e10c5e06b1..535476b673cb 100644
--- a/pkgs/by-name/po/pop-hp-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
@@ -8,15 +8,15 @@
 
 stdenvNoCC.mkDerivation {
   pname = "pop-hp-wallpapers";
-  version = "0-unstable-2022-04-01";
+  version = "0-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "hp-wallpapers";
-    rev = "df86078846b0a2a4e3e64f584aaf2a21be47a7eb";
+    rev = "94f7df30f6bf1c3d71522018852d77c10b920ea3";
     forceFetchGit = true;
     fetchLFS = true;
-    hash = "sha256-NGSvPC9GadqqqgGH9uDNAYuSwfagosmCAE6QmDtmdMw=";
+    hash = "sha256-AthVQ9kQO+CvSH1xxz/U6WzAtpcXK1gvRwKyeo0vMSs=";
   };
 
   nativeBuildInputs = [ imagemagick ];
diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index 5792c9348792..c0267f44fd3d 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/pop-os/popsicle/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       _13r0ck
-      figsoda
     ];
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/po/portfolio_rs/package.nix b/pkgs/by-name/po/portfolio_rs/package.nix
new file mode 100644
index 000000000000..c322f0d49b21
--- /dev/null
+++ b/pkgs/by-name/po/portfolio_rs/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "portfolio_rs";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "MarkusZoppelt";
+    repo = "portfolio_rs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WCz41eJciYwvljiyg5MESiz4eUXBpot7+j81PPyG+fY=";
+  };
+
+  cargoHash = "sha256-s+/IaajmdKu49nQ49RdjudgKW9KdAix0Ryj+N+wnuZU=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  # Skip network-dependent tests during build
+  checkFlags = [
+    "--skip=test_get_quote_name"
+    "--skip=test_get_quote_price"
+    "--skip=test_get_historic_price"
+    "--skip=test_handle_position"
+    "--skip=test_get_historic_total_value"
+  ];
+
+  meta = {
+    description = "Command line tool for managing financial investment portfolios.";
+    homepage = "https://github.com/MarkusZoppelt/portfolio_rs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ MarkusZoppelt ];
+  };
+})
diff --git a/pkgs/by-name/po/portmidi/missing-header.diff b/pkgs/by-name/po/portmidi/missing-header.diff
deleted file mode 100644
index 1fa1f147014e..000000000000
--- a/pkgs/by-name/po/portmidi/missing-header.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c
-index 10c3554..712a974 100755
---- a/porttime/ptmacosx_mach.c
-+++ b/porttime/ptmacosx_mach.c
-@@ -12,6 +12,7 @@
- 
- #include "porttime.h"
- #include "sys/time.h"
-+#include "sys/qos.h"
- #include "pthread.h"
- 
- #ifndef NSEC_PER_MSEC
diff --git a/pkgs/by-name/po/portmidi/package.nix b/pkgs/by-name/po/portmidi/package.nix
index 67fdecd0f655..89806fc8ff0f 100644
--- a/pkgs/by-name/po/portmidi/package.nix
+++ b/pkgs/by-name/po/portmidi/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "portmidi";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "portmidi";
     repo = "portmidi";
     rev = "v${version}";
-    sha256 = "sha256-ou+zN4XnR+QaWC/hzgtThVbeZ/3UVLTpZ9O+eQSGVBs=";
+    sha256 = "sha256-kmyjOsjLG56Qqrf6DqgOTpt4A4aCMvCI3koiUoKzwrE=";
   };
 
   cmakeFlags = [
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
     "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release"
   ];
 
-  patches = [
-    # Add missing header include
-    ./missing-header.diff
-  ];
-
   postInstall =
     let
       ext = stdenv.hostPlatform.extensions.sharedLibrary;
diff --git a/pkgs/by-name/po/positron-bin/package.nix b/pkgs/by-name/po/positron-bin/package.nix
index 1061faf40eac..4e5996b9a2c3 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.10.0-199";
+  version = "2025.10.1-4";
 in
 stdenv.mkDerivation {
   inherit version pname;
@@ -31,17 +31,17 @@ stdenv.mkDerivation {
     if stdenv.hostPlatform.isDarwin then
       fetchurl {
         url = "https://cdn.posit.co/positron/releases/mac/universal/Positron-${version}-universal.dmg";
-        hash = "sha256-iYEkuMQZkn/71bjHCvltTK6EC5l45kNdBhcK6TUB1hM=";
+        hash = "sha256-E3OZBmuIbobVa1e8hcUCE5rUqGN4+ySk+3qSOgYP6DA=";
       }
     else if stdenv.hostPlatform.system == "aarch64-linux" then
       fetchurl {
         url = "https://cdn.posit.co/positron/releases/deb/arm64/Positron-${version}-arm64.deb";
-        hash = "sha256-JkgFuVebyDRqGh2ZcTZitVWzRSYdatKCtXWL1GMb0ZM=";
+        hash = "sha256-gcr8FoNmC+ojSNpoqsRCUVwjquITqS2HXGdW/8juZDY=";
       }
     else
       fetchurl {
         url = "https://cdn.posit.co/positron/releases/deb/x86_64/Positron-${version}-x64.deb";
-        hash = "sha256-ycheOOKirLhDiNIh2Bg/7KBTau7YPGGWHLkRmZJkrnk=";
+        hash = "sha256-xu4DINK9t+k6BkEwwh9H//pdkbXOh7C6FSWbAKOTYcU=";
       };
 
   buildInputs = [
diff --git a/pkgs/by-name/po/posterazor/package.nix b/pkgs/by-name/po/posterazor/package.nix
deleted file mode 100644
index 300f959bb0f2..000000000000
--- a/pkgs/by-name/po/posterazor/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  unzip,
-  pkg-config,
-  libXpm,
-  fltk13,
-  freeimage,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "posterazor";
-  version = "1.5.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip";
-    hash = "sha256-BbujA2ASyqQelb3iFAwgeJC0OhzXqufIa1UD+tFsF7c=";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    unzip
-  ];
-  buildInputs = [
-    libXpm
-    fltk13
-    freeimage
-  ];
-
-  unpackPhase = ''
-    unzip $src -d posterazor
-    cd posterazor/src
-  '';
-
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667328
-  patchPhase = ''
-    sed "s/\(#define CASESENSITIVESTRCMP strcasecmp\)/#include <unistd.h>\n\1/" -i FlPosteRazorDialog.cpp
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp PosteRazor $out/bin
-  '';
-
-  meta = with lib; {
-    homepage = "http://posterazor.sourceforge.net/";
-    description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.madjar ];
-    mainProgram = "PosteRazor";
-  };
-}
diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index e8cf6fae0bff..627a0309d56f 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "postfix-tlspol";
-  version = "1.8.18";
+  version = "1.8.20";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-ijFKFvdmA1ZHOc3r89yalVSO/tMy9Rzeu1VTgdZLlxI=";
+    hash = "sha256-/+FWTrb39PB1L6UDXAr3w0c0bMrpptX23g8WHI794GA=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index e615ebd3568e..ffabc89ef7a5 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -74,11 +74,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "postfix";
-  version = "3.10.4";
+  version = "3.10.5";
 
   src = fetchurl {
     url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz";
-    hash = "sha256-z7ZoYf6PlkeH3a6rFfPKPn7z3nMPlxca/EpeyjOMpEQ=";
+    hash = "sha256-apJr9wIXOGGwjkm8tR/KOi8mn5ozf3LvFZv0YFIIfjU=";
   };
 
   nativeBuildInputs = [
@@ -100,7 +100,6 @@ stdenv.mkDerivation rec {
   ++ lib.optional withTLSRPT libtlsrpt;
 
   hardeningDisable = [ "format" ];
-  hardeningEnable = [ "pie" ];
 
   patches = [
     ./postfix-script-shell.patch
diff --git a/pkgs/by-name/po/postfixadmin/composer.lock b/pkgs/by-name/po/postfixadmin/composer.lock
new file mode 100644
index 000000000000..c4ffd31dff9c
--- /dev/null
+++ b/pkgs/by-name/po/postfixadmin/composer.lock
@@ -0,0 +1,6063 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "eb92e08e356e7bf8277eacd8402a3097",
+    "packages": [
+        {
+            "name": "bacon/bacon-qr-code",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Bacon/BaconQrCode.git",
+                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "shasum": ""
+            },
+            "require": {
+                "dasprid/enum": "^1.0.3",
+                "ext-iconv": "*",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "phly/keep-a-changelog": "^2.12",
+                "phpunit/phpunit": "^10.5.11 || 11.0.4",
+                "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "squizlabs/php_codesniffer": "^3.9"
+            },
+            "suggest": {
+                "ext-imagick": "to generate QR code images"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "BaconQrCode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "https://dasprids.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "BaconQrCode is a QR code generator for PHP.",
+            "homepage": "https://github.com/Bacon/BaconQrCode",
+            "support": {
+                "issues": "https://github.com/Bacon/BaconQrCode/issues",
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.1"
+            },
+            "time": "2024-10-01T13:55:55+00:00"
+        },
+        {
+            "name": "beberlei/assert",
+            "version": "v3.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/beberlei/assert.git",
+                "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/beberlei/assert/zipball/b5fd8eacd8915a1b627b8bfc027803f1939734dd",
+                "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "*",
+                "phpstan/phpstan": "*",
+                "phpunit/phpunit": ">=6.0.0",
+                "yoast/phpunit-polyfills": "^0.1.0"
+            },
+            "suggest": {
+                "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/Assert/functions.php"
+                ],
+                "psr-4": {
+                    "Assert\\": "lib/Assert"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Richard Quadling",
+                    "email": "rquadling@gmail.com",
+                    "role": "Collaborator"
+                }
+            ],
+            "description": "Thin assertion library for input validation in business models.",
+            "keywords": [
+                "assert",
+                "assertion",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/beberlei/assert/issues",
+                "source": "https://github.com/beberlei/assert/tree/v3.3.3"
+            },
+            "time": "2024-07-15T13:18:35+00:00"
+        },
+        {
+            "name": "dasprid/enum",
+            "version": "1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DASPRiD/Enum.git",
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1 <9.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DASPRiD\\Enum\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "https://dasprids.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP 7.1 enum implementation",
+            "keywords": [
+                "enum",
+                "map"
+            ],
+            "support": {
+                "issues": "https://github.com/DASPRiD/Enum/issues",
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.7"
+            },
+            "time": "2025-09-16T12:23:56+00:00"
+        },
+        {
+            "name": "endroid/qr-code",
+            "version": "5.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/endroid/qr-code.git",
+                "reference": "393fec6c4cbdc1bd65570ac9d245704428010122"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/393fec6c4cbdc1bd65570ac9d245704428010122",
+                "reference": "393fec6c4cbdc1bd65570ac9d245704428010122",
+                "shasum": ""
+            },
+            "require": {
+                "bacon/bacon-qr-code": "^3.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "endroid/quality": "dev-main",
+                "ext-gd": "*",
+                "khanamiryan/qrcode-detector-decoder": "^2.0.2",
+                "setasign/fpdf": "^1.8.2"
+            },
+            "suggest": {
+                "ext-gd": "Enables you to write PNG images",
+                "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator",
+                "roave/security-advisories": "Makes sure package versions with known security issues are not installed",
+                "setasign/fpdf": "Enables you to use the PDF writer"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Endroid\\QrCode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jeroen van den Enden",
+                    "email": "info@endroid.nl"
+                }
+            ],
+            "description": "Endroid QR Code",
+            "homepage": "https://github.com/endroid/qr-code",
+            "keywords": [
+                "code",
+                "endroid",
+                "php",
+                "qr",
+                "qrcode"
+            ],
+            "support": {
+                "issues": "https://github.com/endroid/qr-code/issues",
+                "source": "https://github.com/endroid/qr-code/tree/5.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/endroid",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-09-08T08:52:55+00:00"
+        },
+        {
+            "name": "paragonie/constant_time_encoding",
+            "version": "v2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/constant_time_encoding.git",
+                "reference": "e30811f7bc69e4b5b6d5783e712c06c8eabf0226"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/e30811f7bc69e4b5b6d5783e712c06c8eabf0226",
+                "reference": "e30811f7bc69e4b5b6d5783e712c06c8eabf0226",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6|^7|^8|^9",
+                "vimeo/psalm": "^1|^2|^3|^4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ParagonIE\\ConstantTime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Steve 'Sc00bz' Thomas",
+                    "email": "steve@tobtu.com",
+                    "homepage": "https://www.tobtu.com",
+                    "role": "Original Developer"
+                }
+            ],
+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
+            "keywords": [
+                "base16",
+                "base32",
+                "base32_decode",
+                "base32_encode",
+                "base64",
+                "base64_decode",
+                "base64_encode",
+                "bin2hex",
+                "encoding",
+                "hex",
+                "hex2bin",
+                "rfc4648"
+            ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/constant_time_encoding/issues",
+                "source": "https://github.com/paragonie/constant_time_encoding"
+            },
+            "time": "2025-09-24T15:12:37+00:00"
+        },
+        {
+            "name": "postfixadmin/password-hashing",
+            "version": "0.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/postfixadmin/pacrypt.git",
+                "reference": "20d8714d3e587570bf2336259e53c4aae0813ad5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/postfixadmin/pacrypt/zipball/20d8714d3e587570bf2336259e53c4aae0813ad5",
+                "reference": "20d8714d3e587570bf2336259e53c4aae0813ad5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "*",
+                "phpunit/phpunit": "^8|^9",
+                "psalm/phar": "^5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PostfixAdmin\\PasswordHashing\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "David Goodwin",
+                    "email": "david@codepoets.co.uk"
+                }
+            ],
+            "description": "Routines to generate password hashes, useful for Dovecot or Courier Mail servers",
+            "support": {
+                "issues": "https://github.com/postfixadmin/pacrypt/issues",
+                "source": "https://github.com/postfixadmin/pacrypt/tree/0.0.2"
+            },
+            "time": "2025-02-21T13:35:53+00:00"
+        },
+        {
+            "name": "shardj/zf1-future",
+            "version": "1.24.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Shardj/zf1-future.git",
+                "reference": "3582cce4bcf2c820191be56cf17fdef0addf0771"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Shardj/zf1-future/zipball/3582cce4bcf2c820191be56cf17fdef0addf0771",
+                "reference": "3582cce4bcf2c820191be56cf17fdef0addf0771",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "symfony/polyfill-ctype": "^1.30",
+                "symfony/polyfill-mbstring": "^1.30",
+                "symfony/polyfill-php81": "^1.30",
+                "symfony/polyfill-php83": "^1.30"
+            },
+            "replace": {
+                "zendframework/zendframework1": ">=1.12.20"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/phpstan": "^1.4 || ^2.0",
+                "phpunit/phpunit": "^7|^8|^9",
+                "rector/rector": "0.12.19 || ^1.2 || ^2.0",
+                "yoast/phpunit-polyfills": "^2.0"
+            },
+            "suggest": {
+                "ext-mbstring": "Multibyte strings handling"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend_": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework 1. The aim is to keep ZF1 working with the latest PHP versions",
+            "homepage": "https://github.com/Shardj/zf1-future/",
+            "keywords": [
+                "ZF1",
+                "framework"
+            ],
+            "support": {
+                "issues": "https://github.com/Shardj/zf1-future/issues",
+                "source": "https://github.com/Shardj/zf1-future/tree/release-1.24.4"
+            },
+            "time": "2025-06-26T19:09:46+00:00"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v4.5.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "a8d77c86660ca0562ec2fb781fbbda737fb7a62b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/a8d77c86660ca0562ec2fb781fbbda737fb7a62b",
+                "reference": "a8d77c86660ca0562ec2fb781fbbda737fb7a62b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^7.5",
+                "smarty/smarty-lexer": "^3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "https://smarty-php.github.io/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "https://github.com/smarty-php/smarty/discussions",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v4.5.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/wisskid",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-26T08:37:46+00:00"
+        },
+        {
+            "name": "spomky-labs/otphp",
+            "version": "v10.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Spomky-Labs/otphp.git",
+                "reference": "9784d9f7c790eed26e102d6c78f12c754036c366"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/9784d9f7c790eed26e102d6c78f12c754036c366",
+                "reference": "9784d9f7c790eed26e102d6c78f12c754036c366",
+                "shasum": ""
+            },
+            "require": {
+                "beberlei/assert": "^3.0",
+                "ext-mbstring": "*",
+                "paragonie/constant_time_encoding": "^2.0",
+                "php": "^7.2|^8.0",
+                "thecodingmachine/safe": "^0.1.14|^1.0|^2.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.0",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-beberlei-assert": "^0.12",
+                "phpstan/phpstan-deprecation-rules": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^8.0",
+                "thecodingmachine/phpstan-safe-rule": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "v8.3": "8.3.x-dev",
+                    "v9.0": "9.0.x-dev",
+                    "v10.0": "10.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "OTPHP\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/Spomky-Labs/otphp/contributors"
+                }
+            ],
+            "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator",
+            "homepage": "https://github.com/Spomky-Labs/otphp",
+            "keywords": [
+                "FreeOTP",
+                "RFC 4226",
+                "RFC 6238",
+                "google authenticator",
+                "hotp",
+                "otp",
+                "totp"
+            ],
+            "support": {
+                "issues": "https://github.com/Spomky-Labs/otphp/issues",
+                "source": "https://github.com/Spomky-Labs/otphp/tree/v10.0.3"
+            },
+            "time": "2022-03-17T08:00:35+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-12-23T08:48:59+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php83",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php83\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-08T02:45:35+00:00"
+        },
+        {
+            "name": "thecodingmachine/safe",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thecodingmachine/safe.git",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "thecodingmachine/phpstan-strict-rules": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "deprecated/apc.php",
+                    "deprecated/array.php",
+                    "deprecated/datetime.php",
+                    "deprecated/libevent.php",
+                    "deprecated/misc.php",
+                    "deprecated/password.php",
+                    "deprecated/mssql.php",
+                    "deprecated/stats.php",
+                    "deprecated/strings.php",
+                    "lib/special_cases.php",
+                    "deprecated/mysqli.php",
+                    "generated/apache.php",
+                    "generated/apcu.php",
+                    "generated/array.php",
+                    "generated/bzip2.php",
+                    "generated/calendar.php",
+                    "generated/classobj.php",
+                    "generated/com.php",
+                    "generated/cubrid.php",
+                    "generated/curl.php",
+                    "generated/datetime.php",
+                    "generated/dir.php",
+                    "generated/eio.php",
+                    "generated/errorfunc.php",
+                    "generated/exec.php",
+                    "generated/fileinfo.php",
+                    "generated/filesystem.php",
+                    "generated/filter.php",
+                    "generated/fpm.php",
+                    "generated/ftp.php",
+                    "generated/funchand.php",
+                    "generated/gettext.php",
+                    "generated/gmp.php",
+                    "generated/gnupg.php",
+                    "generated/hash.php",
+                    "generated/ibase.php",
+                    "generated/ibmDb2.php",
+                    "generated/iconv.php",
+                    "generated/image.php",
+                    "generated/imap.php",
+                    "generated/info.php",
+                    "generated/inotify.php",
+                    "generated/json.php",
+                    "generated/ldap.php",
+                    "generated/libxml.php",
+                    "generated/lzf.php",
+                    "generated/mailparse.php",
+                    "generated/mbstring.php",
+                    "generated/misc.php",
+                    "generated/mysql.php",
+                    "generated/network.php",
+                    "generated/oci8.php",
+                    "generated/opcache.php",
+                    "generated/openssl.php",
+                    "generated/outcontrol.php",
+                    "generated/pcntl.php",
+                    "generated/pcre.php",
+                    "generated/pgsql.php",
+                    "generated/posix.php",
+                    "generated/ps.php",
+                    "generated/pspell.php",
+                    "generated/readline.php",
+                    "generated/rpminfo.php",
+                    "generated/rrd.php",
+                    "generated/sem.php",
+                    "generated/session.php",
+                    "generated/shmop.php",
+                    "generated/sockets.php",
+                    "generated/sodium.php",
+                    "generated/solr.php",
+                    "generated/spl.php",
+                    "generated/sqlsrv.php",
+                    "generated/ssdeep.php",
+                    "generated/ssh2.php",
+                    "generated/stream.php",
+                    "generated/strings.php",
+                    "generated/swoole.php",
+                    "generated/uodbc.php",
+                    "generated/uopz.php",
+                    "generated/url.php",
+                    "generated/var.php",
+                    "generated/xdiff.php",
+                    "generated/xml.php",
+                    "generated/xmlrpc.php",
+                    "generated/yaml.php",
+                    "generated/yaz.php",
+                    "generated/zip.php",
+                    "generated/zlib.php"
+                ],
+                "classmap": [
+                    "lib/DateTime.php",
+                    "lib/DateTimeImmutable.php",
+                    "lib/Exceptions/",
+                    "deprecated/Exceptions/",
+                    "generated/Exceptions/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
+            "support": {
+                "issues": "https://github.com/thecodingmachine/safe/issues",
+                "source": "https://github.com/thecodingmachine/safe/tree/v2.5.0"
+            },
+            "time": "2023-04-05T11:54:14+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "clue/ndjson-react",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/reactphp-ndjson.git",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+                "react/event-loop": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\React\\NDJson\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                }
+            ],
+            "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+            "homepage": "https://github.com/clue/reactphp-ndjson",
+            "keywords": [
+                "NDJSON",
+                "json",
+                "jsonlines",
+                "newline",
+                "reactphp",
+                "streaming"
+            ],
+            "support": {
+                "issues": "https://github.com/clue/reactphp-ndjson/issues",
+                "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-23T10:58:28+00:00"
+        },
+        {
+            "name": "composer/pcre",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
+            },
+            "type": "library",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-12T16:29:46+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "3.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "support": {
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.4.4"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-20T19:15:30+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "3.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "shasum": ""
+            },
+            "require": {
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
+                "psr/log": "^1 || ^2 || ^3"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without Xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "support": {
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-05-06T16:37:16+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^11",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "https://ocramius.github.io/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-30T00:23:10+00:00"
+        },
+        {
+            "name": "evenement/evenement",
+            "version": "v3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9 || ^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Evenement\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                }
+            ],
+            "description": "Événement is a very simple event dispatching library for PHP",
+            "keywords": [
+                "event-dispatcher",
+                "event-emitter"
+            ],
+            "support": {
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
+            },
+            "time": "2023-08-08T05:53:35+00:00"
+        },
+        {
+            "name": "fidry/cpu-core-counter",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-deprecation-rules": "^2.0.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+                "webmozarts/strict-phpunit": "^7.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\CpuCoreCounter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Tiny utility to get the number of CPU cores.",
+            "keywords": [
+                "CPU",
+                "core"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-14T07:29:31+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.88.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a8d15584bafb0f0d9d938827840060fd4a3ebc99",
+                "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99",
+                "shasum": ""
+            },
+            "require": {
+                "clue/ndjson-react": "^1.3",
+                "composer/semver": "^3.4",
+                "composer/xdebug-handler": "^3.0.5",
+                "ext-filter": "*",
+                "ext-hash": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "fidry/cpu-core-counter": "^1.3",
+                "php": "^7.4 || ^8.0",
+                "react/child-process": "^0.6.6",
+                "react/event-loop": "^1.5",
+                "react/promise": "^3.3",
+                "react/socket": "^1.16",
+                "react/stream": "^1.4",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.33",
+                "symfony/polyfill-php80": "^1.33",
+                "symfony/polyfill-php81": "^1.33",
+                "symfony/polyfill-php84": "^1.33",
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0"
+            },
+            "require-dev": {
+                "facile-it/paraunit": "^1.3.1 || ^2.7",
+                "infection/infection": "^0.31.0",
+                "justinrainbow/json-schema": "^6.5",
+                "keradus/cli-executor": "^2.2",
+                "mikey179/vfsstream": "^1.6.12",
+                "php-coveralls/php-coveralls": "^2.8",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
+                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2",
+                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "exclude-from-classmap": [
+                    "src/Fixer/Internal/*"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "keywords": [
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-09-27T00:24:15+00:00"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "7.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "ext-curl": "*",
+                "guzzle/client-integration-tests": "3.0.2",
+                "php-http/message-factory": "^1.1",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
+            },
+            "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "psr-18",
+                "psr-7",
+                "rest",
+                "web service"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-23T22:36:01+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-22T14:34:08+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "21dc724a0583619cd1652f673303492272778051"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
+                "reference": "21dc724a0583619cd1652f673303492272778051",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
+                "ralouphie/getallheaders": "^3.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+            },
+            "suggest": {
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-23T21:21:41+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.13.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-01T08:46:24+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v5.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+            },
+            "time": "2025-08-13T20:13:15+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-phar": "*",
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
+            "time": "2022-02-21T01:04:05+00:00"
+        },
+        {
+            "name": "php-coveralls/php-coveralls",
+            "version": "v2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-coveralls/php-coveralls.git",
+                "reference": "00b9fce4d785a98760ca02f305c197f5fcfb6004"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/00b9fce4d785a98760ca02f305c197f5fcfb6004",
+                "reference": "00b9fce4d785a98760ca02f305c197f5fcfb6004",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "guzzlehttp/guzzle": "^6.0 || ^7.0",
+                "php": "^7.0 || ^8.0",
+                "psr/log": "^1.0 || ^2.0",
+                "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "phpspec/prophecy-phpunit": "^1.1 || ^2.3",
+                "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || >=8.0 <8.5.29 || >=9.0 <9.5.23",
+                "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0"
+            },
+            "suggest": {
+                "symfony/http-kernel": "Allows Symfony integration"
+            },
+            "bin": [
+                "bin/php-coveralls"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpCoveralls\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kitamura Satoshi",
+                    "email": "with.no.parachute@gmail.com",
+                    "homepage": "https://www.facebook.com/satooshi.jp",
+                    "role": "Original creator"
+                },
+                {
+                    "name": "Takashi Matsuo",
+                    "email": "tmatsuo@google.com"
+                },
+                {
+                    "name": "Google Inc"
+                },
+                {
+                    "name": "Dariusz Ruminski",
+                    "email": "dariusz.ruminski@gmail.com",
+                    "homepage": "https://github.com/keradus"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/php-coveralls/php-coveralls/graphs/contributors"
+                }
+            ],
+            "description": "PHP client library for Coveralls API",
+            "homepage": "https://github.com/php-coveralls/php-coveralls",
+            "keywords": [
+                "ci",
+                "coverage",
+                "github",
+                "test"
+            ],
+            "support": {
+                "issues": "https://github.com/php-coveralls/php-coveralls/issues",
+                "source": "https://github.com/php-coveralls/php-coveralls/tree/v2.8.0"
+            },
+            "time": "2025-05-12T08:35:27+00:00"
+        },
+        {
+            "name": "php-parallel-lint/php-parallel-lint",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
+                "reference": "6db563514f27e19595a19f45a4bf757b6401194e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e",
+                "reference": "6db563514f27e19595a19f45a4bf757b6401194e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.3.0"
+            },
+            "replace": {
+                "grogy/php-parallel-lint": "*",
+                "jakub-onderka/php-parallel-lint": "*"
+            },
+            "require-dev": {
+                "nette/tester": "^1.3 || ^2.0",
+                "php-parallel-lint/php-console-highlighter": "0.* || ^1.0",
+                "squizlabs/php_codesniffer": "^3.6"
+            },
+            "suggest": {
+                "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet"
+            },
+            "bin": [
+                "parallel-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "ahoj@jakubonderka.cz"
+                }
+            ],
+            "description": "This tool checks the syntax of PHP files about 20x faster than serial check.",
+            "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint",
+            "keywords": [
+                "lint",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0"
+            },
+            "time": "2024-03-27T12:14:49+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "9.2.32",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6"
+            },
+            "suggest": {
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-08-22T04:23:01+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "3.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-02T12:48:52+00:00"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:16:10+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "9.6.29",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3",
+                "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.5.0 || ^2",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.13.4",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.32",
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.4",
+                "phpunit/php-timer": "^5.0.3",
+                "sebastian/cli-parser": "^1.0.2",
+                "sebastian/code-unit": "^1.0.8",
+                "sebastian/comparator": "^4.0.9",
+                "sebastian/diff": "^4.0.6",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/exporter": "^4.0.8",
+                "sebastian/global-state": "^5.0.8",
+                "sebastian/object-enumerator": "^4.0.4",
+                "sebastian/resource-operations": "^3.0.4",
+                "sebastian/type": "^3.2.1",
+                "sebastian/version": "^3.0.2"
+            },
+            "suggest": {
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.6-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-24T06:29:11+00:00"
+        },
+        {
+            "name": "psalm/phar",
+            "version": "4.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/psalm/phar.git",
+                "reference": "33723713902e1345904a5c9064ef7848bee0d490"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/psalm/phar/zipball/33723713902e1345904a5c9064ef7848bee0d490",
+                "reference": "33723713902e1345904a5c9064ef7848bee0d490",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "vimeo/psalm": "*"
+            },
+            "bin": [
+                "psalm.phar"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Composer-based Psalm Phar",
+            "support": {
+                "issues": "https://github.com/psalm/phar/issues",
+                "source": "https://github.com/psalm/phar/tree/4.30.0"
+            },
+            "time": "2022-11-06T20:41:58+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client"
+            },
+            "time": "2023-09-23T14:17:50+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory"
+            },
+            "time": "2024-04-15T12:06:14+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/2.0.0"
+            },
+            "time": "2021-07-14T16:41:46+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "react/cache",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2022-11-30T15:59:55+00:00"
+        },
+        {
+            "name": "react/child-process",
+            "version": "v0.6.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/child-process.git",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/event-loop": "^1.2",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
+                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\ChildProcess\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven library for executing child processes with ReactPHP.",
+            "keywords": [
+                "event-driven",
+                "process",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/child-process/issues",
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2025-01-01T16:37:48+00:00"
+        },
+        {
+            "name": "react/dns",
+            "version": "v1.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Dns\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async DNS resolver for ReactPHP",
+            "keywords": [
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-13T14:18:03+00:00"
+        },
+        {
+            "name": "react/event-loop",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "suggest": {
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\EventLoop\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
+            "keywords": [
+                "asynchronous",
+                "event-loop"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-11-13T13:48:05+00:00"
+        },
+        {
+            "name": "react/promise",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "1.12.28 || 1.4.10",
+                "phpunit/phpunit": "^9.6 || ^7.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "keywords": [
+                "promise",
+                "promises"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2025-08-19T18:57:03+00:00"
+        },
+        {
+            "name": "react/socket",
+            "version": "v1.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.13",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3.3 || ^2",
+                "react/promise-stream": "^1.4",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Socket\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
+            "keywords": [
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-07-26T10:38:09+00:00"
+        },
+        {
+            "name": "react/stream",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
+            },
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Stream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+            "keywords": [
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-11T12:45:25+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T06:27:43+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:30:19+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "4.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/67a2df3a62639eab2cc5906065e9805d4fd5dfc5",
+                "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.9"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-10T06:51:50+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-22T06:19:30+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T06:30:58+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "5.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:03:51+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "4.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c",
+                "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-24T06:03:27+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
+                "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-10T07:10:35+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-22T06:20:34+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:12:34+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "539c6691e0623af6dc6f9c20384c120f963465a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0",
+                "reference": "539c6691e0623af6dc6f9c20384c120f963465a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-10T06:57:39+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "3.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-14T16:00:52+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:13:03+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "8a09223170046d2cfda3d2e11af01df2c641e961"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8a09223170046d2cfda3d2e11af01df2c641e961",
+                "reference": "8a09223170046d2cfda3d2e11af01df2c641e961",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/filesystem": "^7.1",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/finder": "<6.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-22T12:46:16+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^7.2"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-22T15:31:00+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<6.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-13T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v7.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "edcbb768a186b5c3f25d0643159a787d3e63b7fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edcbb768a186b5c3f25d0643159a787d3e63b7fd",
+                "reference": "edcbb768a186b5c3f25d0643159a787d3e63b7fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v7.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-07T08:17:47+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v7.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v7.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-15T13:41:35+00:00"
+        },
+        {
+            "name": "symfony/options-resolver",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an improved replacement for the array_replace PHP function",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-05T10:16:07+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-27T09:58:17+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-01-02T08:10:11+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php84",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
+                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php84\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-24T13:30:11+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Executes commands in sub-processes",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-11T10:12:26+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-04-25T09:37:31+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v7.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a way to profile code",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-02-24T10:49:57+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "f96476035142921000338bad71e5247fbc138872"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872",
+                "reference": "f96476035142921000338bad71e5247fbc138872",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/emoji": "^7.1",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-11T14:36:48+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "d4f4a66866fe2451f61296924767280ab5732d9d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d4f4a66866fe2451f61296924767280ab5732d9d",
+                "reference": "d4f4a66866fe2451f61296924767280ab5732d9d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "symfony/console": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0"
+            },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Loads and dumps YAML files",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-27T11:34:33+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:36:25+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {},
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=7.4"
+    },
+    "platform-dev": {
+        "ext-mysqli": "*",
+        "ext-sqlite3": "*",
+        "ext-mbstring": "*"
+    },
+    "plugin-api-version": "2.6.0"
+}
diff --git a/pkgs/by-name/po/postfixadmin/package.nix b/pkgs/by-name/po/postfixadmin/package.nix
new file mode 100644
index 000000000000..e7b72492e147
--- /dev/null
+++ b/pkgs/by-name/po/postfixadmin/package.nix
@@ -0,0 +1,44 @@
+{
+  fetchFromGitHub,
+  lib,
+  php84,
+}:
+
+let
+  php = php84;
+in
+php.buildComposerProject2 (finalAttrs: {
+  pname = "postfixadmin";
+  version = "4.0.1";
+
+  src = fetchFromGitHub {
+    owner = "postfixadmin";
+    repo = "postfixadmin";
+    tag = "postfixadmin-${finalAttrs.version}";
+    hash = "sha256-mr5FBURTGP2J3JMlcexXjz4GFJNqPR4rZyqHVN7+6iM=";
+  };
+
+  vendorHash = "sha256-gv6QYuHGo2r2WgtLPLco/PmKxYSijDkpWoF/vIR5y5s=";
+
+  # Upstream does not ship a lock file, we have to maintain our own for now.
+  # https://github.com/postfixadmin/postfixadmin/issues/948
+  composerLock = ./composer.lock;
+
+  postInstall = ''
+    out_dir="$out"/share/php/postfixadmin/
+
+    ln -sf /etc/postfixadmin/config.local.php "$out_dir"
+    ln -sf /var/cache/postfixadmin/templates_c "$out_dir"
+  '';
+
+  passthru.phpPackage = php;
+
+  meta = {
+    changelog = "https://github.com/postfixadmin/postfixadmin/releases/tag/${finalAttrs.src.tag}";
+    description = "Web based virtual user administration interface for Postfix mail servers";
+    homepage = "https://postfixadmin.sourceforge.io/";
+    maintainers = with lib.maintainers; [ yayayayaka ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix
similarity index 63%
rename from pkgs/by-name/po/postgres-lsp/package.nix
rename to pkgs/by-name/po/postgres-language-server/package.nix
index 93ea5e8604b5..a096835cdfa5 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-language-server/package.nix
@@ -3,22 +3,29 @@
   rustPlatform,
   fetchgit,
   rust-jemalloc-sys,
+  tree-sitter,
+  nodejs,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "postgres-lsp";
-  version = "0.15.0";
+  pname = "postgres-language-server";
+  version = "0.17.2";
 
   src = fetchgit {
     url = "https://github.com/supabase-community/postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-ZintjrSeNsYR6A8tlEfSetse7d79jgLdCpdu+sMe3Zk=";
+    hash = "sha256-gUE6OlDFlqS+Y+gX1qYs2E8sJfNUSmS/ypMsh/q7VtE=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-x/Wbx3noH6YOQIis1sN8ylQApjhSy4/mrxX6jvZFs6A=";
+  cargoHash = "sha256-QP63SmAxjMdoz3yHLkvgM8xRleHXQmSRwTkyghbvJ+c=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
+
+    # Required to build the custom tree-sitter grammar
+    # https://github.com/supabase-community/postgres-language-server/blob/main/crates/pgls_treesitter_grammar/grammar.js
+    tree-sitter
+    nodejs
   ];
 
   buildInputs = [
@@ -30,10 +37,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     # As specified in the upstream: https://github.com/supabase-community/postgres-language-server/blob/main/.github/workflows/release.yml
     RUSTFLAGS = "-C strip=symbols -C codegen-units=1";
-    PGT_VERSION = finalAttrs.version;
+    PGLS_VERSION = finalAttrs.version;
   };
 
-  cargoBuildFlags = [ "-p=pgt_cli" ];
+  cargoBuildFlags = [ "-p=pgls_cli" ];
   cargoTestFlags = finalAttrs.cargoBuildFlags;
   checkFlags = [
     # Tries to write to the file system relatively to the current path
@@ -44,12 +51,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Tools and language server for Postgres";
-    homepage = "https://pgtools.dev";
+    homepage = "https://pg-language-server.com";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       myypo
     ];
-    mainProgram = "postgrestools";
+    mainProgram = "postgres-language-server";
   };
 })
diff --git a/pkgs/by-name/po/posting/package.nix b/pkgs/by-name/po/posting/package.nix
index 707e4c5bca3d..cf897cd5022a 100644
--- a/pkgs/by-name/po/posting/package.nix
+++ b/pkgs/by-name/po/posting/package.nix
@@ -6,14 +6,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "posting";
-  version = "2.9.1";
+  version = "2.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "darrenburns";
     repo = "posting";
     tag = version;
-    hash = "sha256-YaN7kuGRZ6UJTuf2vYDnIinyzMzsKDQEA4B5SmmggA4=";
+    hash = "sha256-BX1D9XgBqRIfavDxAQH7mPP/dnayQu3xSSAF6/JSM54=";
   };
 
   pythonRelaxDeps = true;
diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix
index 84fac59714c6..c8fd34f67d25 100644
--- a/pkgs/by-name/po/pounce/package.nix
+++ b/pkgs/by-name/po/pounce/package.nix
@@ -1,23 +1,25 @@
 {
   lib,
   stdenv,
-  libressl,
+  libretls,
+  openssl,
   fetchzip,
   pkg-config,
   libxcrypt,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pounce";
   version = "3.1";
 
   src = fetchzip {
-    url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";
+    url = "https://git.causal.agency/pounce/snapshot/pounce-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg=";
   };
 
   buildInputs = [
-    libressl
+    libretls
+    openssl
     libxcrypt
   ];
 
@@ -29,11 +31,11 @@ stdenv.mkDerivation rec {
     "PREFIX=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://code.causal.agency/june/pounce";
     description = "Simple multi-client TLS-only IRC bouncer";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ edef ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ edef ];
   };
-}
+})
diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index 4dc7fab221bf..67937b0fb035 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "7.5.3";
+  version = "7.5.4";
 
   src =
     passthru.sources.${stdenv.hostPlatform.system}
@@ -96,19 +96,19 @@ stdenv.mkDerivation rec {
     sources = {
       aarch64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
-        hash = "sha256-9PrFxy6MCbo7b7hmfyGx1zVWBHgZhX/OeIMmjQI2nN4=";
+        hash = "sha256-OqrdfKYvHk2+WRRbavJOkm1h+NqKR4K8U15QDBhBNfA=";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
-        hash = "sha256-SmtlbdDnUegsXfm5pCRb0ex9Id5TNK+72ALf0AlZVZk=";
+        hash = "sha256-SzLUy4akPfuD1WAtApQpW/Ivr7+eB4XRqu+Bk4zakvg=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
-        hash = "sha256-wxAB9bwKTSNkGarwVNjAMWAnozHTPi+0HPjSdko1fgU=";
+        hash = "sha256-zRagTBuZzay9wDN7D9DaUNvxqLToQ3vLTKkRjvcpIRo=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
-        hash = "sha256-XHTgu6/YvlnnImfwVwD9ZhU0TZz00wRg2bbRLNSoiow=";
+        hash = "sha256-H9eYP+VsqeYjPxJpJe2yS/a2sz41a2mZbZJcTblOL+8=";
       };
     };
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix
index 280fa0522e89..b49ba381d536 100644
--- a/pkgs/by-name/pp/ppp/package.nix
+++ b/pkgs/by-name/pp/ppp/package.nix
@@ -2,6 +2,7 @@
   autoreconfHook,
   bash,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   libpcap,
   libxcrypt,
@@ -25,6 +26,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-NV8U0F8IhHXn0YuVbfFr992ATQZaXA16bb5hBIwm9Gs=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/ppp-project/ppp/pull/548
+    (fetchpatch {
+      url = "https://github.com/ppp-project/ppp/commit/05361692ee7d6260ce5c04c9fa0e5a1aa7565323.patch";
+      hash = "sha256-ybuWyA1t9IJ1Sg06a0b0tin4qssr0qzmenfGoA1X0BE=";
+    })
+  ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"
diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/by-name/pr/pragha/package.nix
similarity index 83%
rename from pkgs/applications/audio/pragha/default.nix
rename to pkgs/by-name/pr/pragha/package.nix
index a96b037d8c5b..067359851eb7 100644
--- a/pkgs/applications/audio/pragha/default.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -1,14 +1,13 @@
 {
   lib,
+  stdenv,
   intltool,
-  mkDerivation,
   installShellFiles,
   pkg-config,
   fetchFromGitHub,
   dbus-glib,
   desktop-file-utils,
   hicolor-icon-theme,
-  qtbase,
   sqlite,
   taglib,
   zlib,
@@ -17,6 +16,7 @@
   libcddb,
   libcdio,
   gst_all_1,
+  libsForQt5,
   withGstPlugins ? true,
   glyr,
   withGlyr ? true,
@@ -45,15 +45,15 @@
 assert withGlyr -> withLastfm;
 assert withLastfm -> withCD;
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pragha";
   version = "1.3.99.1";
 
   src = fetchFromGitHub {
     owner = "pragha-music-player";
     repo = "pragha";
-    rev = "v${version}";
-    sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +62,7 @@ mkDerivation rec {
     xfce.xfce4-dev-tools
     desktop-file-utils
     installShellFiles
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -73,7 +74,7 @@ mkDerivation rec {
       gtk3
       hicolor-icon-theme
       libpeas
-      qtbase
+      libsForQt5.qtbase
       sqlite
       taglib
       zlib
@@ -108,17 +109,17 @@ mkDerivation rec {
   postInstall = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
 
-    install -m 444 data/${pname}.desktop $out/share/applications
+    install -m 444 data/pragha.desktop $out/share/applications
     install -d $out/share/pixmaps
-    installManPage data/${pname}.1
+    installManPage data/pragha.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight GTK+ music manager - fork of Consonance Music Manager";
     mainProgram = "pragha";
     homepage = "https://pragha-music-player.github.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mbaeten ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mbaeten ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index 7e5f493deb05..31ffa0a866c6 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -222,7 +222,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://pre-commit.com/";
     changelog = "https://github.com/pre-commit/pre-commit/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ borisbabic ];
+    maintainers = with lib.maintainers; [
+      borisbabic
+      savtrip
+    ];
     mainProgram = "pre-commit";
   };
 }
diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index ac12dbdd38e6..4d4cea292f5d 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -3,29 +3,32 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  pkg-config,
   boost,
   eigen,
   libxml2,
   mpi,
   python3Packages,
   petsc,
-  pkg-config,
+  ctestCheckHook,
+  mpiCheckPhaseHook,
 }:
 
-stdenv.mkDerivation {
+assert petsc.mpiSupport;
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "precice";
-  version = "3.2.0-unstable-2025-05-23";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "precice";
-    rev = "6ee3e347843d4d3c416a32917f6505d35b822445";
-    hash = "sha256-BxNAbpeLqJPzQ9dvvgC9jJQQFBdVMunSqIekz7SIHv4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1FbTNo2F+jH1EVV6gXc9o0T31UHY/wBK3vQeCV7wW5E=";
   };
 
   cmakeFlags = [
-    (lib.cmakeBool "PRECICE_PETScMapping" false)
-    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ];
 
   nativeBuildInputs = [
@@ -43,12 +46,26 @@ stdenv.mkDerivation {
     python3Packages.numpy
   ];
 
+  __darwinAllowLocalNetworking = true;
+
+  doCheck = true;
+
+  nativeCheckInputs = [
+    ctestCheckHook
+    mpiCheckPhaseHook
+  ];
+
+  disabledTests = [
+    # Because preciceDt becomes very small. Test is likely to fail on other platform.
+    "precice.Integration/Serial/Time/Explicit/ParallelCoupling/ReadWriteScalarDataWithSubcycling6400Steps"
+  ];
+
   meta = {
     description = "PreCICE stands for Precise Code Interaction Coupling Environment";
     homepage = "https://precice.org/";
-    license = with lib.licenses; [ gpl3 ];
+    license = with lib.licenses; [ lgpl3Only ];
     maintainers = with lib.maintainers; [ Scriptkiddi ];
-    mainProgram = "binprecice";
+    mainProgram = "precice-tools";
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/pr/precious/package.nix b/pkgs/by-name/pr/precious/package.nix
index b59055913bbe..b97cab9b3ce5 100644
--- a/pkgs/by-name/pr/precious/package.nix
+++ b/pkgs/by-name/pr/precious/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "precious";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "houseabsolute";
     repo = "precious";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bHrn78wzdkxV92Lp3MzNUpSvMTyc8l3tw+z5NBxJPoA=";
+    hash = "sha256-xM4NqcT1NGR3tkLOPt59lfFpjRnohU+tTTk9Ijkf97o=";
   };
 
-  cargoHash = "sha256-OA1C98C0BHEVl056UCL5alT292djuBDGFjZn2HAytEQ=";
+  cargoHash = "sha256-tp0kvG5G7mW0czfZ43AbT7Lcv1sMnO5Zc+t2d5w4aqA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix
index dde46659f0be..7c9776d635e6 100644
--- a/pkgs/by-name/pr/prefect/package.nix
+++ b/pkgs/by-name/pr/prefect/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "prefect";
-  version = "3.4.23";
+  version = "3.5.0";
   pyproject = true;
 
   # Trying to install from source is challenging
@@ -17,11 +17,12 @@ python3Packages.buildPythonApplication rec {
   # Source will be missing sdist, uv.lock, ui artefacts ...
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-XGgAc3vVd+3gcPo4UvYII1xxXnKol9Qf07kxf2f96MM=";
+    hash = "sha256-BazzO+gR/mLcx+tlysPMJzcqmctUU0LSYL0YMZMyVrg=";
   };
 
   pythonRelaxDeps = [
     "websockets"
+    "typer"
   ];
 
   build-system = with python3Packages; [
@@ -68,6 +69,7 @@ python3Packages.buildPythonApplication rec {
       packaging
       pathspec
       pendulum
+      pluggy
       prometheus-client
       pydantic
       pydantic-core
@@ -89,6 +91,7 @@ python3Packages.buildPythonApplication rec {
       websockets
       whenever
       uv
+      semver
     ]
     ++ sqlalchemy.optional-dependencies.asyncio
     ++ httpx.optional-dependencies.http2
@@ -196,7 +199,10 @@ python3Packages.buildPythonApplication rec {
     description = "Workflow orchestration framework for building resilient data pipelines in Python";
     homepage = "https://github.com/PrefectHQ/prefect";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ happysalada ];
+    maintainers = with lib.maintainers; [
+      happysalada
+      mrmebelman
+    ];
     mainProgram = "prefect";
   };
 }
diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index b4099c6c1285..3b04daf72b4a 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prek";
-  version = "0.2.4";
+  version = "0.2.11";
 
   src = fetchFromGitHub {
     owner = "j178";
     repo = "prek";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XvNvVWEmJpsY2AxTYLT0/4IiJ2QTI4mWwDleMmZ2LgA=";
+    hash = "sha256-wzbvofNOAtqbjO5//ECu1FeZrS0FyDvFZPKxC0fOJnE=";
   };
 
-  cargoHash = "sha256-PDYCO1ggKwtMR9tnokY7JqVM03FWsO4c2L4GV+7TKu4=";
+  cargoHash = "sha256-KVGdAPyUlPCgcx1DpZbfNRNmALdJvzOcsv3WQy3Q7OI=";
 
   preBuild = ''
     version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])')
@@ -38,6 +38,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     export TMP=$TEMP
     export TMPDIR=$TEMP
     export PREK_INTERNAL__TEST_DIR=$TEMP
+
+    export UV_PROJECT_ENVIRONMENT="$(mktemp -d)"
+    cleanup() {
+        rm -rf "$UV_PROJECT_ENVIRONMENT"
+        rm -rf "$TEMP"
+    }
+    trap cleanup EXIT
   '';
 
   __darwinAllowLocalNetworking = true;
@@ -58,6 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "node"
     "script"
     "check_useless_excludes_remote"
+    "run_worktree"
     # "meta_hooks"
     "reuse_env"
     "docker::docker"
@@ -99,8 +107,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "builtin_hooks_workspace_mode"
     "fix_byte_order_marker_hook"
     "fix_byte_order_marker"
+    "check_merge_conflict_hook"
+    "check_merge_conflict_without_assume_flag"
+    "check_symlinks_hook_unix"
+    "check_xml_hook"
+    "check_xml_with_features"
+    "detect_private_key_hook"
+    "no_commit_to_branch_hook"
+    "no_commit_to_branch_hook_with_custom_branches"
+    "no_commit_to_branch_hook_with_patterns"
     # does not properly use TMP
     "hook_impl"
+    # problems with environment
+    "try_repo_specific_hook"
+    "try_repo_specific_rev"
+    # lua path is hardcoded
+    "lua::additional_dependencies"
+    "lua::health_check"
+    "lua::hook_stderr"
+    "lua::lua_environment"
+    "lua::remote_hook"
+    # error message differs
+    "run_in_non_git_repo"
   ];
 
   meta = {
diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 3dba95437a1b..715167c9f029 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.8.0";
+  version = "2025.9.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-89BAQZpXyyTg6T9hxm4EV8QHZDcD3FcnGKxAulxziyg=";
+    hash = "sha256-d0RunBCUUvS4tosbXWkEp7mvUKEOa5KgvIZK4XydN7I=";
   };
 
   npmDeps = buildNpmPackage {
@@ -56,7 +56,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-E2K9SYqRbhpQi83va8D02cwPnf51haoKv4P/ppU2m08=";
+    npmDepsHash = "sha256-0FQldyGJXFhXFv7L7ozAoWEfpUTo+d2pibWyhnJ4F7A=";
 
     dontBuild = true;
 
diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index 1e5b148b0981..037a94a8fde5 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.4.1";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-YdBDYpxKqb0UOkSU6zEYoLAtlUbkfDHUTIA538ILbjk=";
+    hash = "sha256-lQ1y6w7zP0sy67jf5+K6584DP10LAZqo1hLsHF3H2UA=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
index a606f3480c8e..915c2f2028fb 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-zugferd";
-  version = "2.5.0";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
     rev = "v${version}";
-    hash = "sha256-Qy/yfinj5EGjzhJmiczOSIP/GsTZabFt8e6Ki4AaN6w=";
+    hash = "sha256-yBlbHhiA+Tk1IHnFqYxu0hrQHWQP8LrLHgzu9+OHyN4=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/pr/prettier/package.json b/pkgs/by-name/pr/prettier/package.json
deleted file mode 100644
index 2d29e8208a94..000000000000
--- a/pkgs/by-name/pr/prettier/package.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.6.2",
-  "description": "Prettier is an opinionated code formatter",
-  "bin": "./bin/prettier.cjs",
-  "repository": "prettier/prettier",
-  "funding": "https://github.com/prettier/prettier?sponsor=1",
-  "homepage": "https://prettier.io",
-  "author": "James Long",
-  "type": "module",
-  "license": "MIT",
-  "main": "./src/index.cjs",
-  "browser": "./standalone.js",
-  "unpkg": "./standalone.js",
-  "exports": {
-    ".": {
-      "types": "./src/index.d.ts",
-      "require": "./src/index.cjs",
-      "default": "./src/index.js"
-    },
-    "./standalone": "./src/standalone.js",
-    "./plugins/*": "./src/plugins/*.js",
-    "./*": "./*"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "index.js",
-    "standalone.js",
-    "src",
-    "bin"
-  ],
-  "dependencies": {
-    "@angular/compiler": "20.0.5",
-    "@babel/code-frame": "7.27.1",
-    "@babel/parser": "7.27.7",
-    "@babel/types": "7.27.7",
-    "@glimmer/syntax": "0.94.9",
-    "@prettier/cli": "0.9.0",
-    "@prettier/html-tags": "1.0.0",
-    "@prettier/parse-srcset": "3.1.0",
-    "@typescript-eslint/typescript-estree": "8.34.1",
-    "@typescript-eslint/visitor-keys": "8.34.1",
-    "acorn": "8.15.0",
-    "acorn-jsx": "5.3.2",
-    "angular-estree-parser": "12.1.0",
-    "angular-html-parser": "8.1.0",
-    "camelcase": "8.0.0",
-    "ci-info": "4.2.0",
-    "cjk-regex": "3.3.0",
-    "collapse-white-space": "1.0.6",
-    "css-units-list": "2.1.0",
-    "dashify": "2.0.0",
-    "deno-path-from-file-url": "0.0.3",
-    "diff": "8.0.2",
-    "editorconfig": "0.15.3",
-    "emoji-regex": "10.4.0",
-    "escape-string-regexp": "5.0.0",
-    "espree": "10.4.0",
-    "fast-glob": "3.3.3",
-    "fast-json-stable-stringify": "2.1.0",
-    "file-entry-cache": "10.1.1",
-    "find-cache-directory": "6.0.0",
-    "flow-parser": "0.274.1",
-    "get-east-asian-width": "1.3.0",
-    "get-stdin": "9.0.0",
-    "graphql": "16.11.0",
-    "hermes-parser": "0.29.0",
-    "html-element-attributes": "3.4.0",
-    "html-ua-styles": "0.0.8",
-    "ignore": "7.0.5",
-    "import-meta-resolve": "4.1.0",
-    "index-to-position": "1.1.0",
-    "is-es5-identifier-name": "1.0.0",
-    "jest-docblock": "30.0.1",
-    "json5": "2.2.3",
-    "leven": "4.0.0",
-    "linguist-languages": "8.0.0",
-    "meriyah": "6.1.3",
-    "micromatch": "4.0.8",
-    "minimist": "1.2.8",
-    "n-readlines": "1.0.1",
-    "outdent": "0.8.0",
-    "oxc-parser": "0.75.0",
-    "parse-json": "8.3.0",
-    "picocolors": "1.1.1",
-    "please-upgrade-node": "3.2.0",
-    "postcss": "8.5.6",
-    "postcss-less": "6.0.0",
-    "postcss-media-query-parser": "0.2.3",
-    "postcss-scss": "4.0.9",
-    "postcss-selector-parser": "2.2.3",
-    "postcss-values-parser": "2.0.1",
-    "regexp-util": "2.0.3",
-    "remark-footnotes": "2.0.0",
-    "remark-math": "3.0.1",
-    "remark-parse": "8.0.3",
-    "sdbm": "2.0.0",
-    "search-closest": "1.1.0",
-    "smol-toml": "1.3.4",
-    "strip-ansi": "7.1.0",
-    "to-fast-properties": "4.0.0",
-    "trim-newlines": "5.0.0",
-    "typescript": "5.8.3",
-    "unicode-regex": "4.1.2",
-    "unified": "9.2.2",
-    "url-or-path": "2.6.1",
-    "vnopts": "2.0.2",
-    "wcwidth.js": "2.0.0",
-    "yaml": "1.10.2",
-    "yaml-unist-parser": "2.0.5"
-  },
-  "devDependencies": {
-    "@babel/generator": "7.27.5",
-    "@eslint-react/eslint-plugin": "1.52.2",
-    "@eslint/js": "9.29.0",
-    "@stylistic/eslint-plugin": "5.0.0",
-    "@types/estree": "1.0.8",
-    "@typescript-eslint/eslint-plugin": "8.34.1",
-    "@typescript-eslint/parser": "8.34.1",
-    "browserslist": "4.25.1",
-    "browserslist-to-esbuild": "2.1.1",
-    "buffer": "6.0.3",
-    "c8": "10.1.3",
-    "cross-env": "7.0.3",
-    "cspell": "9.1.1",
-    "enquirer": "2.4.1",
-    "esbuild": "0.25.5",
-    "esbuild-plugins-node-modules-polyfill": "1.7.1",
-    "esbuild-visualizer": "0.7.0",
-    "eslint": "9.29.0",
-    "eslint-config-prettier": "10.1.5",
-    "eslint-formatter-friendly": "7.0.0",
-    "eslint-plugin-compat": "6.0.2",
-    "eslint-plugin-jest": "29.0.1",
-    "eslint-plugin-n": "17.20.0",
-    "eslint-plugin-regexp": "2.9.0",
-    "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-unicorn": "59.0.1",
-    "esm-utils": "4.4.2",
-    "globals": "16.2.0",
-    "jest": "30.0.3",
-    "jest-light-runner": "0.7.9",
-    "jest-snapshot-serializer-ansi": "2.2.1",
-    "jest-snapshot-serializer-raw": "2.0.0",
-    "jest-watch-typeahead": "3.0.1",
-    "knip": "5.61.2",
-    "magic-string": "0.30.17",
-    "nano-spawn": "1.0.2",
-    "node-style-text": "0.0.8",
-    "npm-run-all2": "8.0.4",
-    "prettier": "3.6.1",
-    "pretty-bytes": "7.0.0",
-    "pretty-ms": "9.2.0",
-    "rollup-plugin-license": "3.6.0",
-    "semver": "7.7.2",
-    "serialize-javascript": "6.0.2",
-    "snapshot-diff": "0.10.0",
-    "tempy": "3.1.0",
-    "tinybench": "4.0.1",
-    "ts-expect": "1.3.0"
-  },
-  "resolutions": {
-    "trim": "1.0.1"
-  },
-  "scripts": {
-    "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
-    "test": "jest",
-    "test:dev-package": "cross-env INSTALL_PACKAGE=1 yarn test",
-    "test:production": "cross-env NODE_ENV=production yarn test",
-    "test:production-standalone": "cross-env TEST_STANDALONE=1 yarn test:production",
-    "test:production-lint": "eslint dist/prettier --config=./scripts/bundle-eslint-config.js --quiet --format friendly",
-    "perf": "yarn && yarn build && cross-env NODE_ENV=production node ./dist/prettier/bin/prettier.cjs",
-    "perf:inspect": "yarn && yarn build && cross-env NODE_ENV=production node --inspect-brk ./dist/prettier/bin/prettier.cjs",
-    "perf:benchmark": "yarn perf --debug-benchmark",
-    "perf:compare": "./scripts/benchmark/compare.sh",
-    "lint": "run-p --continue-on-error \"lint:*\"",
-    "lint:typecheck": "tsc",
-    "lint:eslint": "cross-env EFF_NO_LINK_RULES=true eslint . --format friendly",
-    "lint:changelog": "node ./scripts/lint-changelog.js",
-    "lint:prettier": "prettier . --check --cache",
-    "lint:spellcheck": "cspell --no-progress --relative --dot --gitignore",
-    "lint:deps": "node ./scripts/check-deps.js",
-    "lint:knip": "knip",
-    "lint:format-test": "node ./scripts/format-test-lint.js",
-    "fix": "run-s --continue-on-error fix:eslint fix:prettier",
-    "fix:eslint": "yarn lint:eslint --fix",
-    "fix:prettier": "yarn lint:prettier --write",
-    "build": "node ./scripts/build/build.js",
-    "build:website": "node ./scripts/build-website.js",
-    "gen:changelog": "node ./scripts/generate-changelog.js",
-    "debug": "node bin/prettier.js --ignore-path=.prettierignore --plugin=./packages/plugin-oxc/index.js --plugin=./packages/plugin-hermes/index.js",
-    "debug:watch": "node --watch bin/prettier.js --ignore-path=.prettierignore --plugin=./packages/plugin-oxc/index.js --plugin=./packages/plugin-hermes/index.js",
-    "debug:inspect": "node --inspect-brk bin/prettier.js --ignore-path=.prettierignore --plugin=./packages/plugin-oxc/index.js --plugin=./packages/plugin-hermes/index.js"
-  },
-  "c8": {
-    "reporter": [
-      "lcov",
-      "text"
-    ],
-    "all": true,
-    "include": [
-      "src/**",
-      "bin/**"
-    ],
-    "exclude": [
-      "bin/prettier.js",
-      "src/standalone.js",
-      "src/index.cjs",
-      "src/document/debug.js",
-      "src/utils/unexpected-node-error.js",
-      "src/language-js/types/estree.d.ts",
-      "src/**/**/*.d.ts"
-    ]
-  },
-  "browserslist": [
-    ">0.5%",
-    "not dead",
-    "not op_mini all"
-  ],
-  "preferUnplugged": true,
-  "packageManager": "yarn@4.9.2"
-}
diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix
index 6ab2d90cfd06..c9886eb4fff8 100644
--- a/pkgs/by-name/pr/prettier/package.nix
+++ b/pkgs/by-name/pr/prettier/package.nix
@@ -98,12 +98,12 @@ let
     # Arguments
 
     plugin
-    : Attribute set with `.packageName` and `.outPath` defined
+    : Attribute set with `.pname` and `.outPath` defined
   */
   nodeEntryPointOf =
     plugin:
     let
-      pluginDir = "${plugin.outPath}/lib/node_modules/${plugin.packageName}";
+      pluginDir = "${plugin.outPath}/lib/node_modules/${plugin.pname}";
 
       packageJsonAttrs = builtins.fromJSON (builtins.readFile "${pluginDir}/package.json");
 
@@ -118,10 +118,10 @@ let
       pathAbsoluteFallback
     else
       lib.warn ''
-        ${plugin.packageName}: error context, tried finding entry point under;
+        ${plugin.pname}: error context, tried finding entry point under;
         pathAbsoluteNaive -> ${pathAbsoluteNaive}
         pathAbsoluteFallback -> ${pathAbsoluteFallback}
-      '' throw ''${plugin.packageName}: does not provide parse-able entry point'';
+      '' throw ''${plugin.pname}: does not provide parse-able entry point'';
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prettier";
@@ -153,10 +153,11 @@ stdenv.mkDerivation (finalAttrs: {
     yarn install --immutable
     yarn build --clean
 
-    cp --recursive dist/prettier "$out"
+    mkdir -p $out/lib/node_modules
+    cp --recursive dist/prettier "$out/lib/node_modules/prettier"
 
     makeBinaryWrapper "${lib.getExe nodejs}" "$out/bin/prettier" \
-      --add-flags "$out/bin/prettier.cjs"
+      --add-flags "$out/lib/node_modules/prettier/bin/prettier.cjs"
   ''
   + lib.optionalString (builtins.length plugins > 0) ''
     wrapProgram $out/bin/prettier --add-flags "${
diff --git a/pkgs/by-name/pr/prettier/update.sh b/pkgs/by-name/pr/prettier/update.sh
index 0a6ddfa94da1..623a5a8f0d63 100755
--- a/pkgs/by-name/pr/prettier/update.sh
+++ b/pkgs/by-name/pr/prettier/update.sh
@@ -45,3 +45,4 @@ update-source-version "${package}" "${latest_version}"
 echo "Update yarn offline cache hash…"
 nix-build --attr "${package}.src"
 yarn-berry-fetcher missing-hashes result/yarn.lock >"${package_dir}/missing-hashes.json"
+rm -f "${package_dir}/package.json"
diff --git a/pkgs/by-name/pr/pretty-php/package.nix b/pkgs/by-name/pr/pretty-php/package.nix
index 35a132174ecc..3e8a806249f8 100644
--- a/pkgs/by-name/pr/pretty-php/package.nix
+++ b/pkgs/by-name/pr/pretty-php/package.nix
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
     hash = "sha256-zBhxuEViLxeQ9m3u1L0wYqeL+YEWWwvJS7PtsFPO5QU=";
   };
 
-  vendorHash = "sha256-vnmp/HLzaOzHu22lzugRXIHL43YQ/hm223gcUbIiLT4=";
+  vendorHash = "sha256-Y1/wNFPXza2aO07ZFybpwI3XbTVBhEvFHs9ygHQbcSo=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix
index cf11c5a3b3aa..ce17ed00c8b3 100644
--- a/pkgs/by-name/pr/previewqt/package.nix
+++ b/pkgs/by-name/pr/previewqt/package.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   cmakeFlags = [
+    (lib.cmakeBool "WITH_DEVIL" false)
     (lib.cmakeBool "WITH_FREEIMAGE" false)
   ];
 
diff --git a/pkgs/by-name/pr/priocpp/package.nix b/pkgs/by-name/pr/priocpp/package.nix
new file mode 100644
index 000000000000..d2518f9bee89
--- /dev/null
+++ b/pkgs/by-name/pr/priocpp/package.nix
@@ -0,0 +1,54 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  fmt,
+  gtest,
+  logmich,
+  tinycmmc,
+  jsoncpp,
+  sexp-cpp,
+}:
+
+stdenv.mkDerivation {
+  pname = "priocpp";
+  version = "0.0.0-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "priocpp";
+    rev = "b2664449adcaed93f609e3ea1fb68f8295390ce9";
+    sha256 = "sha256-tn0UNK+rQQPpSgTexOKyROOvX6ynEHFUj+gk11dlh/8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+  propagatedBuildInputs = [
+    fmt
+    gtest
+    logmich
+    tinycmmc
+    jsoncpp
+    sexp-cpp
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_EXTRA=ON"
+    "-DBUILD_TESTS=ON"
+    "-DPRIO_USE_JSONCPP=ON"
+    "-DPRIO_USE_SEXPCPP=ON"
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Property I/O for C++";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
+  };
+}
diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index a379de4f31b0..94be72fc5897 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -13,16 +13,16 @@
 # function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "6.7.0";
+  version = "6.18.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    hash = "sha256-Ty8BqWjZluU6a5xhSAVb2VoTVY91UUj6zoVXMKeLO4o=";
+    hash = "sha256-p198o8ON5mGPCxK+gE0mW+JVyQlNsCsqwa8D4MNBkpA=";
   };
 
-  cargoHash = "sha256-HjDoWa/JE6izUd+hmWVI1Yy3cTBlMcvD9ANsvqAoHBI=";
+  cargoHash = "sha256-bNl04GoxLX+B8dPgqWL/VarreBVebjwNDwQjtQcJnsg=";
 
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;
diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix
index a7b5f6fc35d4..29094642be14 100644
--- a/pkgs/by-name/pr/prisma-language-server/package.nix
+++ b/pkgs/by-name/pr/prisma-language-server/package.nix
@@ -6,17 +6,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "prisma-language-server";
-  version = "6.17.1";
+  version = "6.19.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "language-tools";
     tag = "${finalAttrs.version}";
-    hash = "sha256-L2THhIjCeoNRUWTQ0aMkXeatjunRPhd0m4No5UE11lI=";
+    hash = "sha256-v+gCxUuwrLdl2rlvB2HGZvXZEdSxmdUrY1YE58iBKRQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/language-server";
-  npmDepsHash = "sha256-Fa6Eajzm3/NHHr4ngsgJ/CFfEcQ2J3DTEQEUcK7ZdeU=";
+  npmDepsHash = "sha256-4NQO48a2f4k6CSWmIc/7UavNPNkAVIg0OyYArt/+vxI=";
 
   meta = {
     description = "Language server for Prisma";
diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index abdf921664eb..f30a54c35336 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   stdenv,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   prisma-engines,
   jq,
   makeWrapper,
@@ -13,27 +13,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prisma";
-  version = "6.7.0";
+  version = "6.18.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
     rev = finalAttrs.version;
-    hash = "sha256-ts7HvQbbBFzLRr7uamo95rDnJuDHsAu2CE/pKkJwcX4=";
+    hash = "sha256-+WRWa59HlHN2CsYZfr/ptdW3iOuOPfDil8sLR5dWRA4=";
   };
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
     jq
     makeWrapper
     moreutils
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8=";
+    hash = "sha256-Et1UiZO2zyw9FHW0OuYK7AMfhIy5j7Q7GDQjaL6gjyg=";
   };
 
   patchPhase = ''
diff --git a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
index c08ca124feae..c7c579ad6f35 100644
--- a/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
+++ b/pkgs/by-name/pr/prismlauncher-unwrapped/package.nix
@@ -74,8 +74,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional gamemodeSupport gamemode;
 
-  hardeningEnable = lib.optionals stdenv.hostPlatform.isLinux [ "pie" ];
-
   cmakeFlags = [
     # downstream branding
     (lib.cmakeFeature "Launcher_BUILD_PLATFORM" "nixpkgs")
diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix
index 50f973613382..984d544045ca 100644
--- a/pkgs/by-name/pr/privatebin/package.nix
+++ b/pkgs/by-name/pr/privatebin/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "privatebin";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "PrivateBin";
     repo = "PrivateBin";
     tag = finalAttrs.version;
-    hash = "sha256-FspB10F/gz4d5T4TEYyifosgFLvnSMpVsr2t4NvFTqU=";
+    hash = "sha256-ErTB+qUz0CQf+YZZoFH2/ceAHFfgIbKXst6dTTM1pKQ=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/pr/pro-office-calculator/package.nix b/pkgs/by-name/pr/pro-office-calculator/package.nix
new file mode 100644
index 000000000000..d423abb0238b
--- /dev/null
+++ b/pkgs/by-name/pr/pro-office-calculator/package.nix
@@ -0,0 +1,42 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  tinyxml-2,
+  cmake,
+  qt5,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.0.13";
+  pname = "pro-office-calculator";
+
+  src = fetchFromGitHub {
+    owner = "RobJinman";
+    repo = "pro_office_calc";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7cYItmWOBDP/ajanwYnyBZobVny/9HumI7e+rLRn5ew=";
+  };
+
+  buildInputs = [
+    qt5.qtbase
+    qt5.qtmultimedia
+    tinyxml-2
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    qt5.wrapQtAppsHook
+  ];
+
+  meta = {
+    description = "Completely normal office calculator";
+    mainProgram = "procalc";
+    homepage = "https://proofficecalculator.com/";
+    maintainers = with lib.maintainers; [
+      pmiddend
+      iedame
+    ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
+  };
+})
diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
index 25a9ad55f84f..5f4f74aabfde 100644
--- a/pkgs/by-name/pr/probe-rs-tools/package.nix
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "probe-rs-tools";
-  version = "0.29.1";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "probe-rs";
     repo = "probe-rs";
     tag = "v${version}";
-    hash = "sha256-/gP9abygktYSzg/054o1PEcQywiPFTtKNdUdI3hCYyc=";
+    hash = "sha256-3tVCsMXrNTFhTQit4PNTXtHOXq8GSEWdLBJ9iqtgWyQ=";
   };
 
-  cargoHash = "sha256-txHl0+HDCVdmbZppGsFqPjsEbPBCJVEB3XZWZJBBoOk=";
+  cargoHash = "sha256-CL+aTPllQqa22ENU2FWhBMSe0Mf1MAfemytIiqf0bHk=";
 
   buildAndTestSubdir = pname;
 
diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 9e0cf2aeba9c..54d909645368 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "process-compose";
-  version = "1.75.2";
+  version = "1.76.1";
 
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = "process-compose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BKf8FrgpGhYzuukAFP+OCjvp5bMCQL6BmZ+Tk/E8RIY=";
+    hash = "sha256-WdTvOBp9UiuCMNdi80jEWwkAhS4zoli4tf8JERPN3Nk=";
 
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix
index 22d2b21503cd..ed2b78b81ed1 100644
--- a/pkgs/by-name/pr/process-viewer/package.nix
+++ b/pkgs/by-name/pr/process-viewer/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     description = "Process viewer GUI in rust";
     homepage = "https://github.com/guillaumegomez/process-viewer";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "process_viewer";
   };
 }
diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix
index 53f12202e087..16aa478eacdb 100644
--- a/pkgs/by-name/pr/procfd/package.nix
+++ b/pkgs/by-name/pr/procfd/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "procfd";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "deshaw";
     repo = "procfd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M2VFy7WqvoxgzEpS0qd7nGLRt2pKGZlfU9uUHlwDC7Y=";
+    hash = "sha256-KhnSHtPT9H9CWotwQIA9gFvwgm0PKsmDjQS817PxMw0=";
   };
 
-  cargoHash = "sha256-YmUzcJ8SM3iwjeDZXWBrDcT793ZyF6QdwxuYDh69xZw=";
+  cargoHash = "sha256-srFXs+h+ZMXeWRwGQUAqMACJG4ZUgztWr2ff6sRfkU8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix
index 5333c183337b..92ddd7cc55d9 100644
--- a/pkgs/by-name/pr/projectable/package.nix
+++ b/pkgs/by-name/pr/projectable/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/dzfrias/projectable";
     changelog = "https://github.com/dzfrias/projectable/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "prj";
   };
 }
diff --git a/pkgs/by-name/pr/projectlibre/package.nix b/pkgs/by-name/pr/projectlibre/package.nix
index b1fb70ed9e27..960bf5faab2c 100644
--- a/pkgs/by-name/pr/projectlibre/package.nix
+++ b/pkgs/by-name/pr/projectlibre/package.nix
@@ -71,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.cpal10;
     mainProgram = "projectlibre";
     maintainers = with lib.maintainers; [
-      Mogria
       tomasajt
     ];
     platforms = jre.meta.platforms;
diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
index d5b93b643ce7..f5b99b1af790 100644
--- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
+++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "projectm-sdl-cpp";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "frontend-sdl-cpp";
-    rev = "7131af0618e4d7f4b64c623ad92795fef5a2d87a";
-    hash = "sha256-pXQGMwjOh7LjDuUPbXp5l9O4aSWqnTxdZSMtDzZ8118=";
+    rev = "72e5632897c9d9bef452c679d3cbe8c7b4bb4157";
+    hash = "sha256-uO2+CX2DqVn6NdcZhBlKFIPuUQpz6N8LazG3ALJTSx0=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/applications/audio/projectm_3/default.nix b/pkgs/by-name/pr/projectm_3/package.nix
similarity index 88%
rename from pkgs/applications/audio/projectm_3/default.nix
rename to pkgs/by-name/pr/projectm_3/package.nix
index 09db5ad83393..fb283966c723 100644
--- a/pkgs/applications/audio/projectm_3/default.nix
+++ b/pkgs/by-name/pr/projectm_3/package.nix
@@ -1,37 +1,37 @@
 {
   stdenv,
-  mkDerivation,
   lib,
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   SDL2,
-  qtdeclarative,
   libpulseaudio,
   glm,
   which,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "projectm";
   version = "3.1.12";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectM";
-    rev = "v${version}";
-    sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
   };
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
     which
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     SDL2
-    qtdeclarative
+    libsForQt5.qtdeclarative
     libpulseaudio
     glm
   ];
@@ -65,4 +65,4 @@ mkDerivation rec {
       Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations.
     '';
   };
-}
+})
diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
index 69204357a12f..36aff18483fe 100644
--- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.8.1";
+  version = "1.9.0";
   src = fetchFromGitHub {
     owner = "tynany";
     repo = "frr_exporter";
     rev = "v${version}";
-    hash = "sha256-RURuJXAX1U1KPX0IJXs3OE1Rr7MV5xrhrew7mKfaeNM=";
+    hash = "sha256-oW+i1xSvBWXBMoml0/hk0rlaDEHazb8mcurgifpR5m4=";
   };
 in
 buildGoModule {
diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
index a26054c42efb..00fdc2b5c3b9 100644
--- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "node_exporter";
-  version = "1.9.1";
+  version = "1.10.2";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    hash = "sha256-il0wf00pUSHUrqz0Y1lr++yywlhr+Ww2pGKBeGAEnPc=";
+    hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE=";
   };
 
-  vendorHash = "sha256-ujW5dH3ItIaML+LlaTXT0BK/T1ZGZq/cKnLOqNPBhWc=";
+  vendorHash = "sha256-zQn3Hn40zZT3ZLiYQc/68i9t791eisBSiB6Re24/Ncg=";
 
   # FIXME: tests fail due to read-only nix store
   doCheck = false;
diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
index 4c6b453c5271..ddf5cab71bb8 100644
--- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "pushgateway";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "pushgateway";
     rev = "v${version}";
-    sha256 = "sha256-qcG7yTJN+HvzX1MB6ImF2umT/HLqohFeUwIc/86G/ec=";
+    sha256 = "sha256-Mc4yEd9CRfLZ4ZpcMnwQpoIXQpUerdxYD90FWRBzS20=";
   };
 
-  vendorHash = "sha256-CUL9jj4Xu3G5+MIVCCY9IW4SxBe3xqaZatxA+0Our2M=";
+  vendorHash = "sha256-O/Vgn3WC0ZzRy5L/m0qR970joGtqQWWlmethoHAypgY=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix b/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix
new file mode 100644
index 000000000000..f3ddde0e40e4
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "prometheus-qbittorrent-exporter";
+  version = "1.12.1";
+
+  src = fetchFromGitHub {
+    owner = "martabal";
+    repo = "qbittorrent-exporter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9J4nGG52M7SSeXigLBJK/dqXRvSpPqOGRJ8BQx7+1eU=";
+  };
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  vendorHash = "sha256-jJmhRnjioeTq9Uol0lYLChPi4O1D9JnGqN7q1XK36yE=";
+
+  ldflags = [
+    "-s"
+    "-X 'qbit-exp/app.version=v${finalAttrs.version}'"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Prometheus exporter for qBittorrent";
+    homepage = "https://github.com/martabal/qbittorrent-exporter";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
+      typedrat
+      undefined-landmark
+    ];
+    mainProgram = "qbit-exp";
+  };
+})
diff --git a/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix b/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
index 7963850902e5..b9ada6bf1d9c 100644
--- a/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
@@ -2,46 +2,27 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  fetchpatch2,
+  unstableGitUpdater,
 }:
 
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication rec {
   pname = "prometheus-rasdaemon-exporter";
-  version = "0-unstable-2023-03-15";
+  version = "0-unstable-2025-01-02";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sanecz";
     repo = "prometheus-rasdaemon-exporter";
-    rev = "e37084edeb4d397dd360298cb22f18f83a35ff46";
-    hash = "sha256-O0Zzog+5jDixFRGbqmjPYi6JDpHbxpU4hKfsqTnexS8=";
+    rev = "06cf02a4fa277fdc422275d9c4fe930786fc3f78";
+    hash = "sha256-QPbCwEpbG7gDPOSRcgu82QEqKkmW0uRhmSOWGgwVMDI=";
   };
 
-  patches = [
-    # Normalization of metric names
-    # https://github.com/sanecz/prometheus-rasdaemon-exporter/pull/1
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/46d379ba205c2340a0b266bf3cd48ec88ce025d0.patch";
-      hash = "sha256-kqo1Tjn51M1FzArS4K0ylQ2/rFDOAiZU3OUt/oBhGhM=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/c9ab08e8918497edb8f1ab0f933fa270cb7860a8.patch";
-      hash = "sha256-QtjzXuxPG7e+cgUDVbAVNY4VyBp3W5+vQDAvFJ9t92I=";
-    })
-    # Fix sqlite3.connect URI passing
-    # https://github.com/sanecz/prometheus-rasdaemon-exporter/pull/2
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/52f6c47b77f480cd7f83853a2baffffb45f77b37.patch";
-      hash = "sha256-XYeWMkAhWJIOUKLeTstIJr3P37Jwt8tzRURCvlrrxVs=";
-    })
-  ];
-
   build-system = with python3Packages; [
     setuptools
     setuptools-scm
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev9+ge37084e";
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev+g${lib.substring 0 7 src.rev}";
 
   dependencies = with python3Packages; [
     prometheus-client
@@ -53,6 +34,8 @@ python3Packages.buildPythonApplication {
 
   doCheck = false; # no tests
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     description = "Rasdaemon exporter for Prometheus";
     homepage = "https://github.com/sanecz/prometheus-rasdaemon-exporter";
diff --git a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
index 9a4dbd6d1a46..f27b93433e8c 100644
--- a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
@@ -4,26 +4,27 @@
   fetchFromGitHub,
 }:
 
-buildGoModule {
+buildGoModule rec {
   pname = "prometheus-storagebox-exporter";
-  version = "0-unstable-2025-07-28";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "fleaz";
     repo = "prometheus-storagebox-exporter";
-    hash = "sha256-HGUAvoLIVXwZT/CJ1yj9H6ClNRwiJ8rjjluAQ6GdBME=";
-    rev = "e03cfd5f60f7847b74de2f6f47690bc03b7c157a";
+    hash = "sha256-sufxNnHAdOaYEzKj9vriDrJF6Tq4Eim3Z45FEuuG97Q=";
+    tag = "v${version}";
   };
 
-  vendorHash = "sha256-w2S8LWQyDLnUba7+YnTk7GhRXR/agbF5GFIeOPk8w64=";
+  vendorHash = "sha256-hWM7JnL0x+vsUrQsJZGM3z2jB3F1wtjKWmX8j+WnjKY=";
 
   meta = {
     description = "Prometheus exporter for Hetzner storage boxes";
-    homepage = "https://github.com/fleaz/prometheus-storage-exporter";
+    homepage = "https://github.com/fleaz/prometheus-storagebox-exporter";
     license = lib.licenses.mit;
     mainProgram = "prometheus-storagebox-exporter";
     maintainers = with lib.maintainers; [
       erethon
+      fleaz
     ];
   };
 }
diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index 8af5940becd8..05781511931e 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -33,7 +33,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus";
-  version = "3.6.0";
+  version = "3.7.2";
 
   outputs = [
     "out"
@@ -45,14 +45,14 @@ buildGoModule (finalAttrs: {
     owner = "prometheus";
     repo = "prometheus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GowtA1iTx6lpRW+RBLYFc8s5H8ECPEmcbdVJvGHl5Cw=";
+    hash = "sha256-bitRDX1oymFfzvQVYL31BON6UBfQYnqjZefQKc+yXx0=";
   };
 
-  vendorHash = "sha256-xGMBd/MhwjCbrQrP5d5aSd99F8GN6wB3jaHpOh0M7OA=";
+  vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE=";
 
   webUiStatic = fetchurl {
     url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lw097NTDJUWm2RY0RUg/5djNdbj+W9hRdIaF2cQz4Bo=";
+    hash = "sha256-NFv6zNpMacd0RgVYBlWKbXKNCEh7WijpREg0bNojisM=";
   };
 
   excludedPackages = [
diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix
index 8c7ed3172a23..d8e0ef7e37fa 100644
--- a/pkgs/by-name/pr/promptfoo/package.nix
+++ b/pkgs/by-name/pr/promptfoo/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "promptfoo";
-  version = "0.118.11";
+  version = "0.118.14";
 
   src = fetchFromGitHub {
     owner = "promptfoo";
     repo = "promptfoo";
     tag = finalAttrs.version;
-    hash = "sha256-py85AvOnge5KAOwsCUVCgwVhbNMn6kqNpQ5w6KA60LM=";
+    hash = "sha256-MyK533JOVCuO613XWFc2tHLdc4v4IEF8H1xCpS/XxUE=";
   };
 
-  npmDepsHash = "sha256-J/wVq10sgLFZiPuiXie3oi2I9uCycyRP/19AQdGLmF4=";
+  npmDepsHash = "sha256-mpe00J5iRwaH7hJIDP3fDuJSUOKk01COpOOvF1YJMyg=";
 
   # don't fetch playwright binary
   env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
diff --git a/pkgs/by-name/pr/protobuf-language-server/package.nix b/pkgs/by-name/pr/protobuf-language-server/package.nix
new file mode 100644
index 000000000000..095e0c0fc021
--- /dev/null
+++ b/pkgs/by-name/pr/protobuf-language-server/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "protobuf-language-server";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "lasorda";
+    repo = "protobuf-language-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bDsvByXa2kH3DnvQpAq79XvwFg4gfhtOP2BpqA1LCI0=";
+  };
+
+  vendorHash = "sha256-dRria1zm5Jk7ScXh0HXeU686EmZcRrz5ZgnF0ca9aUQ=";
+
+  # TestMethodsGen overwrites go-lsp/lsp/methods_gen.go with missing imports.
+  # This causes other tests to break.
+  checkFlags = [ "-skip=TestMethodsGen" ];
+
+  meta = {
+    description = "Language server implementation for Google Protocol Buffers";
+    mainProgram = "protobuf-language-server";
+    homepage = "https://github.com/lasorda/protobuf-language-server";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bizmyth ];
+  };
+})
diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 168ac172cfc1..d3697ac75b90 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -4,15 +4,15 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "protoc-gen-connect-go";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
-    tag = "v${version}";
-    hash = "sha256-pxG2f54m01tC9YhpN9zQ8M5KiP4gyt019klqnBPHHrw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VW7FHZk7FAux2Jn03gGm9gdkjCzvofC/ukXOWaplWBo=";
   };
 
   vendorHash = "sha256-oAcAE9t4mz0HrkqO8lh5Ex2nakKj5FKy2lKTP8X/9Gg=";
@@ -26,15 +26,27 @@ buildGoModule rec {
     unset subPackages
   '';
 
+  checkFlags =
+    let
+      skippedTests = [
+        # other tests work, could be related to sandboxing or timings
+        # got:  unavailable
+        # want: deadline_exceeded
+        # client_ext_test.go:789: actual receive error from /connect.ping.v1.PingService/Sum: unavailable: io: read/write on closed pipe
+        "TestClientDeadlineHandling/read-write"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   meta = {
     description = "Simple, reliable, interoperable, better gRPC";
     mainProgram = "protoc-gen-connect-go";
     homepage = "https://github.com/connectrpc/connect-go";
-    changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}";
+    changelog = "https://github.com/connectrpc/connect-go/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       kilimnik
       jk
     ];
   };
-}
+})
diff --git a/pkgs/by-name/pr/protoc-gen-dart/package.nix b/pkgs/by-name/pr/protoc-gen-dart/package.nix
index 34538974106d..c2a017ca417f 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-dart/package.nix
@@ -2,24 +2,48 @@
   lib,
   buildDartApplication,
   fetchFromGitHub,
+  _experimental-update-script-combinators,
+  gitUpdater,
+  writeShellScript,
+  dart,
+  yq-go,
 }:
 
 buildDartApplication rec {
   pname = "protoc-gen-dart";
-  version = "22.5.0";
+  version = "24.0.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "protobuf.dart";
     tag = "protoc_plugin-v${version}";
-    hash = "sha256-8pSCYlbZLqHnpetM4luyfGo1qnWgKx93JPjRVWCOX0w=";
+    hash = "sha256-DEuvwBJhSo4o5ydnutxv2PCIRgS+2dE7u3RleidhAUM=";
   };
 
-  sourceRoot = "${src.name}/protoc_plugin";
-
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  passthru.updateScript = ./update.sh;
+  preBuild = ''
+    pushd protoc_plugin
+  '';
+
+  postInstall = ''
+    popd
+  '';
+
+  passthru.updateScript = _experimental-update-script-combinators.sequence [
+    (gitUpdater { rev-prefix = "protoc_plugin-v"; } // { supportedFeatures = [ ]; })
+    (writeShellScript "update-protoc-gen-dart" ''
+      src=$(nix build --print-out-paths --no-link .#protoc-gen-dart.src)
+      export HOME=$(mktemp -d)
+      WORKDIR=$(mktemp -d)
+      cp --recursive --no-preserve=mode $src/* $WORKDIR
+      PACKAGE_DIR=$(dirname $(EDITOR=echo nix edit --file . protoc-gen-dart))
+      pushd $WORKDIR
+      ${lib.getExe dart} pub update
+      ${lib.getExe yq-go} eval --output-format=json --prettyPrint pubspec.lock > $PACKAGE_DIR/pubspec.lock.json
+      popd
+    '')
+  ];
 
   meta = {
     description = "Protobuf plugin for generating Dart code";
diff --git a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
index bca2b17e67a0..faa7178b5dd4 100644
--- a/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
+++ b/pkgs/by-name/pr/protoc-gen-dart/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "85.0.0"
+      "version": "91.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b1ade5707ab7a90dfd519eaac78a7184341d19adb6096c68d499b59c7c6cf880",
+        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.4.1"
     },
     "args": {
       "dependency": "transitive",
@@ -40,6 +40,16 @@
       "source": "hosted",
       "version": "2.13.0"
     },
+    "benchmark_harness": {
+      "dependency": "transitive",
+      "description": {
+        "name": "benchmark_harness",
+        "sha256": "83f65107165883ba8623eb822daacb23dcf9f795c66841de758c9dd7c5a0cf28",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.3.1"
+    },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
@@ -61,7 +71,7 @@
       "version": "0.2.0"
     },
     "collection": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "collection",
         "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
@@ -94,21 +104,21 @@
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.0.7"
     },
     "dart_style": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.1.2"
     },
     "file": {
       "dependency": "transitive",
@@ -121,7 +131,7 @@
       "version": "7.0.1"
     },
     "fixnum": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "fixnum",
         "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
@@ -184,14 +194,14 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.6.7"
     },
     "lints": {
-      "dependency": "direct dev",
+      "dependency": "transitive",
       "description": {
         "name": "lints",
         "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
@@ -261,7 +271,7 @@
       "version": "2.2.0"
     },
     "path": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "path",
         "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
@@ -274,24 +284,14 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
-    },
-    "protobuf": {
-      "dependency": "direct main",
-      "description": {
-        "name": "protobuf",
-        "sha256": "6153efcc92a06910918f3db8231fd2cf828ac81e50ebd87adc8f8a8cb3caff0e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.1"
+      "version": "1.5.2"
     },
     "pub_semver": {
-      "dependency": "direct main",
+      "dependency": "transitive",
       "description": {
         "name": "pub_semver",
         "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
@@ -411,34 +411,34 @@
       "version": "1.2.2"
     },
     "test": {
-      "dependency": "direct dev",
+      "dependency": "transitive",
       "description": {
         "name": "test",
-        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
+        "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.26.2"
+      "version": "1.26.3"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6"
+      "version": "0.7.7"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
+        "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.11"
+      "version": "0.6.12"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -464,11 +464,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
@@ -522,6 +522,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0-0 <4.0.0"
+    "dart": ">=3.9.0 <4.0.0"
   }
 }
diff --git a/pkgs/by-name/pr/protoc-gen-dart/update.sh b/pkgs/by-name/pr/protoc-gen-dart/update.sh
deleted file mode 100755
index 81ca066de57c..000000000000
--- a/pkgs/by-name/pr/protoc-gen-dart/update.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p yq ripgrep common-updater-scripts dart
-
-set -xeu -o pipefail
-
-PACKAGE_DIR="$(realpath "$(dirname "$0")")"
-cd "$PACKAGE_DIR/.."
-while ! test -f flake.nix; do cd ..; done
-NIXPKGS_DIR="$PWD"
-
-version="$(
-  list-git-tags --url=https://github.com/google/protobuf.dart |
-    rg '^protoc_plugin-v(.*)' -r '$1' |
-    sort --version-sort |
-    tail -n1
-)"
-
-cd "$NIXPKGS_DIR"
-update-source-version protoc-gen-dart "$version"
-
-TMPDIR="$(mktemp -d)"
-cd "$TMPDIR"
-
-src="$(nix-build --no-link "$NIXPKGS_DIR" -A protoc-gen-dart.src)/protoc_plugin"
-cp $src/pubspec.* .
-
-if ! test -f pubspec.lock; then
-  sed -i '/resolution: workspace/d' pubspec.yaml
-  dart pub update
-fi
-
-yq . pubspec.lock >"$PACKAGE_DIR/pubspec.lock.json"
-
-rm -rf "$TMPDIR"
diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix
index c0635e0868c2..c725f9afe1ca 100644
--- a/pkgs/by-name/pr/protoc-gen-swift/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix
@@ -11,13 +11,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "protoc-gen-swift";
-  version = "1.29.0";
+  version = "1.33.3";
 
   src = fetchFromGitHub {
     owner = "apple";
     repo = "swift-protobuf";
     rev = "${finalAttrs.version}";
-    hash = "sha256-UPYwu8SiBUHofqHdUT6uxdeY2WUXYqbkLj+h4chSCa4=";
+    hash = "sha256-FFFHnxuynKfcmWCgJ38rKk3FS/o5buLYS7VcEivF0v0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 40d377d04e20..7c9edd97cee6 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-19";
+  version = "GE-Proton10-25";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-vV009ZlYFEAI1jkfMql46QnJXekRup5TqajVSc57f3U=";
+    hash = "sha256-RKko4QMxtnuC1SAHTSEQGBzVyl3ywnirFSYJ1WKSY0k=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index 2e3d7faf7bd6..fd6bf34a994d 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.32.6";
+  version = "1.32.10";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-xtptEi/H15fEABrlPE854uSWagr2kt2/h33SuegVab8=";
+    hash = "sha256-FeU7ubjT1WqtviCPA78SW8zZi1h6gnj7erFebg2mgg4=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
index d8d87b4909b2..483c09a3210e 100644
--- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
@@ -12,8 +12,12 @@
   gtest,
   sentry-native,
   protonmail-bridge,
+  fetchpatch2,
 }:
 
+let
+  guiSourcePath = "internal/frontend/bridge-gui";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonmail-bridge-gui";
 
@@ -22,6 +26,18 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Use `gtest` from Nixpkgs to allow an offline build
     ./use-nix-googletest.patch
+    # fix: qt6_generate_deploy_app_script deprecated keyword
+    (fetchpatch2 {
+      url = "https://github.com/daniel-fahey/proton-bridge/commit/9b282369523ce2aabcf95369a2ed3867efb5a4ac.patch?full_index=1";
+      relative = guiSourcePath;
+      hash = "sha256-CGBelsplAqLI+6GtDR+VELfVsLoHPN0324gfZ3obKpI=";
+    })
+    # fix: make libQt6WaylandEglClientHwIntegration conditional for Qt 6.10
+    (fetchpatch2 {
+      url = "https://github.com/daniel-fahey/proton-bridge/commit/7823fe4904186253798fc633724988d43dd642e0.patch?full_index=1";
+      relative = guiSourcePath;
+      hash = "sha256-2heMfZdXLL8/uyM0jZ860Jw76c+gHtc0G6pWmIRCONY=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -44,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     sentry-native
   ];
 
-  sourceRoot = "${finalAttrs.src.name}/internal/frontend/bridge-gui";
+  sourceRoot = "${finalAttrs.src.name}/${guiSourcePath}";
 
   postPatch = ''
     # Bypass `vcpkg` by deleting lines that `include` BridgeSetup.cmake
diff --git a/pkgs/by-name/pr/protonup-rs/package.nix b/pkgs/by-name/pr/protonup-rs/package.nix
index b9dbc1f46e42..b0699685a9b7 100644
--- a/pkgs/by-name/pr/protonup-rs/package.nix
+++ b/pkgs/by-name/pr/protonup-rs/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protonup-rs";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-zUsb+ZJmKUizBVwE4Uf/YnIukRn0AEQa7UeXdIIWYt8=";
+    hash = "sha256-mysYcBmXKkXz1vlhZv8okVnnD83h/QyGwT9ijluOgms=";
   };
 
-  cargoHash = "sha256-baa3VtGUnVFMwlPdKSa4jXecSlKogRHjKMfcGbqUFM0=";
+  cargoHash = "sha256-NiJwaD7lH2jnxfc/Hreo3bJ3LC+0UAOlsVMt1UYRcdY=";
 
   checkFlags = [
     # Requires internet access
diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix
index af885f370a2b..c1475ec9e9c2 100644
--- a/pkgs/by-name/pr/protox/package.nix
+++ b/pkgs/by-name/pr/protox/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/prowlarr/deps.json b/pkgs/by-name/pr/prowlarr/deps.json
index c8ca52167952..e22a3f1edb2e 100644
--- a/pkgs/by-name/pr/prowlarr/deps.json
+++ b/pkgs/by-name/pr/prowlarr/deps.json
@@ -11,18 +11,18 @@
   },
   {
     "pname": "Azure.Core",
-    "version": "1.38.0",
-    "hash": "sha256-gzWMtIZJgwtE51dTMzLCbN4KxmE4/bzdjb/NU86N1uY="
+    "version": "1.47.1",
+    "hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
   },
   {
     "pname": "Azure.Identity",
-    "version": "1.11.4",
-    "hash": "sha256-J3nI80CQwS7fwRLnqBxqZNemxqP05rcn3x44YpIf2no="
+    "version": "1.14.2",
+    "hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo="
   },
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.5.1",
-    "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
+    "version": "2.6.1",
+    "hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo="
   },
   {
     "pname": "Castle.Core",
@@ -31,15 +31,8 @@
   },
   {
     "pname": "coverlet.collector",
-    "version": "3.0.4-preview.27.ge7cb7c3b40",
-    "hash": "sha256-UiiFa/GfLf3gcKb1atAz5gwR0sIA7sA1GFKSbk6sIgM=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg"
-  },
-  {
-    "pname": "coverlet.core",
-    "version": "3.0.4-preview.27.ge7cb7c3b40",
-    "hash": "sha256-nIVBoe0qz5e5eDmrhlMslznVzXne6eXbd8T4m2c+Qb8=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg"
+    "version": "6.0.4",
+    "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0="
   },
   {
     "pname": "Dapper",
@@ -88,8 +81,13 @@
   },
   {
     "pname": "MailKit",
-    "version": "4.12.1",
-    "hash": "sha256-fwI0YTbwfzrvdkbATWGbv4D8ugOXgaPO/WFvGxQ9WS8="
+    "version": "4.14.0",
+    "hash": "sha256-vAFqKaKvLUUiFbpu1mJdL/W5CIlb6rh3U6ef883g+Bs="
+  },
+  {
+    "pname": "Microsoft.ApplicationInsights",
+    "version": "2.23.0",
+    "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.Internal",
@@ -108,8 +106,8 @@
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "1.1.1",
-    "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
+    "version": "8.0.0",
+    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
   },
   {
     "pname": "Microsoft.Bcl.Cryptography",
@@ -121,11 +119,6 @@
     "version": "17.10.0",
     "hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="
   },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.0.1",
-    "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
-  },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.7.0",
@@ -133,19 +126,14 @@
   },
   {
     "pname": "Microsoft.Data.SqlClient",
-    "version": "6.0.2",
-    "hash": "sha256-QkvGoucU8jo4PXCCgZ10v5I5hG0gyaVA36rOcu3IBLA="
+    "version": "6.1.1",
+    "hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0="
   },
   {
     "pname": "Microsoft.Data.SqlClient.SNI.runtime",
     "version": "6.0.2",
     "hash": "sha256-CQuJfjZYoRxfc07cSzUNCOOdzmUJu0p10J+WpcG2BJ0="
   },
-  {
-    "pname": "Microsoft.DotNet.PlatformAbstractions",
-    "version": "2.1.0",
-    "hash": "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM="
-  },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
     "version": "8.0.0",
@@ -206,11 +194,6 @@
     "version": "2.0.0",
     "hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "2.2.0",
-    "hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
     "version": "8.0.0",
@@ -226,11 +209,6 @@
     "version": "2.0.0",
     "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "7.0.0",
@@ -246,11 +224,6 @@
     "version": "8.0.2",
     "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "2.1.0",
-    "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="
-  },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
     "version": "8.0.1",
@@ -271,11 +244,6 @@
     "version": "8.0.0",
     "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
   },
-  {
-    "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "2.0.1",
-    "hash": "sha256-QBdcLyJAHf10+RUlquXWTs155FZmHDRKbL0uzXZZPVw="
-  },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
     "version": "8.0.0",
@@ -326,6 +294,11 @@
     "version": "8.0.2",
     "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.3",
+    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
     "version": "8.0.1",
@@ -383,13 +356,13 @@
   },
   {
     "pname": "Microsoft.Identity.Client",
-    "version": "4.61.3",
-    "hash": "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="
+    "version": "4.73.1",
+    "hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
   },
   {
     "pname": "Microsoft.Identity.Client.Extensions.Msal",
-    "version": "4.61.3",
-    "hash": "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="
+    "version": "4.73.1",
+    "hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
@@ -398,33 +371,33 @@
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "7.5.0",
-    "hash": "sha256-C849ySgag1us+IfgbSsloz6HTKeuEkN14HGFv4OML1o="
+    "version": "7.7.1",
+    "hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "7.5.0",
-    "hash": "sha256-TbU0dSLxUaTBxd9aLAlG4EeR2lrBE+6RJUlgefbqsQg="
+    "version": "7.7.1",
+    "hash": "sha256-vGUx0HYrhDGQiHuIZoe4YOXx3UV9hT+a0krlPGJPQzw="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "7.5.0",
-    "hash": "sha256-RdUbGTvnbB11pmWxEKRaP6uPI2ITEcB/PxqgxHl33uM="
+    "version": "7.7.1",
+    "hash": "sha256-JtQclRXgzsFBFnD+kgD59OILf7XkMD2czLupLZkc100="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols",
-    "version": "7.5.0",
-    "hash": "sha256-SX8JpQ4HzFzngmh9QHGVz2GH7TrUdX8WXBSkykQFFaU="
+    "version": "7.7.1",
+    "hash": "sha256-PVS46Ut/2814hy0tdNLahG266hBmepw/fzZ9pku1PNg="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
-    "version": "7.5.0",
-    "hash": "sha256-m4FYxiqNyU9FnqFJKcQnE7npc5HTulHdbk3bcooqWp8="
+    "version": "7.7.1",
+    "hash": "sha256-zXRZLfgOG/0l8aF6mZuAVGWB3wYz5uTkTJwlucYPafw="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "7.5.0",
-    "hash": "sha256-AI74ljCROXqXcktxc9T80NpBvwDZeVnRlJz+ofk1RVs="
+    "version": "7.7.1",
+    "hash": "sha256-WgbdkeG0R/f+4GJeXlj1WMpFyGv7+iW1JM9Pgt95UFk="
   },
   {
     "pname": "Microsoft.Net.Http.Headers",
@@ -438,13 +411,13 @@
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+    "version": "1.1.1",
+    "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -458,13 +431,13 @@
   },
   {
     "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+    "version": "1.1.3",
+    "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
   },
   {
     "pname": "Microsoft.OpenApi",
@@ -477,15 +450,45 @@
     "hash": "sha256-mx/iqHmBMwA8Ulot0n6YFVIKsU1Tx7q4Tru7MSjbEgQ="
   },
   {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "16.9.1",
-    "hash": "sha256-LZJLTWU2DOnuBiN/g+S+rwG2/BJtKrjydKnj3ujp98U="
+    "pname": "Microsoft.Testing.Extensions.Telemetry",
+    "version": "1.7.3",
+    "hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
+    "version": "1.7.3",
+    "hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.VSTestBridge",
+    "version": "1.7.3",
+    "hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform",
+    "version": "1.7.3",
+    "hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform.MSBuild",
+    "version": "1.7.3",
+    "hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.AdapterUtilities",
+    "version": "17.13.0",
+    "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
     "version": "17.10.0",
     "hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="
   },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.13.0",
+    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
+  },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
     "version": "17.10.0",
@@ -498,18 +501,13 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "4.7.0",
-    "hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="
+    "version": "8.0.0",
+    "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="
   },
   {
     "pname": "MimeKit",
-    "version": "4.12.0",
-    "hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA="
-  },
-  {
-    "pname": "Mono.Cecil",
-    "version": "0.11.1",
-    "hash": "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA="
+    "version": "4.14.0",
+    "hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM="
   },
   {
     "pname": "Mono.Nat",
@@ -554,13 +552,8 @@
   },
   {
     "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "9.0.1",
-    "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
   },
   {
     "pname": "NLog",
@@ -587,11 +580,6 @@
     "version": "9.0.3",
     "hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o="
   },
-  {
-    "pname": "NuGet.Frameworks",
-    "version": "5.0.0",
-    "hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="
-  },
   {
     "pname": "NUnit",
     "version": "3.14.0",
@@ -599,18 +587,18 @@
   },
   {
     "pname": "NUnit3TestAdapter",
-    "version": "4.2.1",
-    "hash": "sha256-g73i3yqr0KnC0etKcAw9CmB6ZFAFvpxZn88s1glsND4="
+    "version": "5.1.0",
+    "hash": "sha256-5z470sFjV67wGHaw8KfmSloIAYe81Dokp0f8I6zXsDc="
   },
   {
     "pname": "NunitXml.TestLogger",
-    "version": "3.0.131",
-    "hash": "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg="
+    "version": "3.1.20",
+    "hash": "sha256-T6/n9S5vnmznf2P7x5Vejciq8P2P+1OCrdKE2UmWQOw="
   },
   {
     "pname": "Polly",
-    "version": "8.6.0",
-    "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
+    "version": "8.6.4",
+    "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I="
   },
   {
     "pname": "Polly.Contrib.WaitAndRetry",
@@ -619,8 +607,8 @@
   },
   {
     "pname": "Polly.Core",
-    "version": "8.6.0",
-    "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
+    "version": "8.6.4",
+    "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I="
   },
   {
     "pname": "RestSharp",
@@ -737,11 +725,6 @@
     "version": "4.3.0",
     "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.0.0",
-    "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="
-  },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
@@ -814,8 +797,8 @@
   },
   {
     "pname": "runtime.unix.System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
+    "version": "4.3.1",
+    "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
   },
   {
     "pname": "runtime.unix.System.Diagnostics.Debug",
@@ -971,6 +954,11 @@
     "version": "1.4.2",
     "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
   },
+  {
+    "pname": "SourceGear.sqlite3",
+    "version": "3.50.4.2",
+    "hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
+  },
   {
     "pname": "Swashbuckle.AspNetCore.Swagger",
     "version": "8.1.4",
@@ -981,11 +969,6 @@
     "version": "8.1.4",
     "hash": "sha256-m0ixgc45HCX2xrvrnhy3WYU/r/basjat535n4rN+vOY="
   },
-  {
-    "pname": "System.AppContext",
-    "version": "4.1.0",
-    "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="
-  },
   {
     "pname": "System.AppContext",
     "version": "4.3.0",
@@ -998,13 +981,8 @@
   },
   {
     "pname": "System.ClientModel",
-    "version": "1.0.0",
-    "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.0.11",
-    "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
+    "version": "1.5.1",
+    "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
   },
   {
     "pname": "System.Collections",
@@ -1062,15 +1040,9 @@
     "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
   },
   {
-    "pname": "System.Data.SQLite.Core.Servarr",
-    "version": "1.0.115.5-18",
-    "hash": "sha256-H6QvKNKkW6PwHwDWAUVeXlqz9fJTEwIAS3YtcbOwpTc=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg"
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.0.11",
-    "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
+    "pname": "System.Data.SQLite",
+    "version": "2.0.2",
+    "hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck="
   },
   {
     "pname": "System.Diagnostics.Debug",
@@ -1082,6 +1054,11 @@
     "version": "4.3.0",
     "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "5.0.0",
+    "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
+  },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "6.0.1",
@@ -1092,11 +1069,6 @@
     "version": "8.0.1",
     "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
   },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.0.1",
-    "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
-  },
   {
     "pname": "System.Diagnostics.Tools",
     "version": "4.3.0",
@@ -1114,13 +1086,8 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "4.7.0",
-    "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.0.11",
-    "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
+    "version": "8.0.19",
+    "hash": "sha256-KDCdLN8aKxQmQCe8D5iCyZKo2+mhx00tg7CqTILE/v0="
   },
   {
     "pname": "System.Dynamic.Runtime",
@@ -1132,11 +1099,6 @@
     "version": "8.0.1",
     "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
   },
-  {
-    "pname": "System.Globalization",
-    "version": "4.0.11",
-    "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
-  },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
@@ -1154,13 +1116,8 @@
   },
   {
     "pname": "System.IdentityModel.Tokens.Jwt",
-    "version": "7.5.0",
-    "hash": "sha256-K3OUOGrTYKJdnRTHERdSZWTxb5QNL4wBKCahcswdKrc="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
+    "version": "7.7.1",
+    "hash": "sha256-6JfmtdChyt7zd/HKI+/T1HcyesEPx0NNMO/zFJ7lU2c="
   },
   {
     "pname": "System.IO",
@@ -1177,11 +1134,6 @@
     "version": "4.3.0",
     "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
-  },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
@@ -1192,11 +1144,6 @@
     "version": "5.0.0",
     "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="
   },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
-  },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
@@ -1207,21 +1154,11 @@
     "version": "8.0.0",
     "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
-  {
-    "pname": "System.Linq",
-    "version": "4.1.0",
-    "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
-  },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
     "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.1.0",
-    "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
-  },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.3.0",
@@ -1234,8 +1171,8 @@
   },
   {
     "pname": "System.Memory.Data",
-    "version": "1.0.2",
-    "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="
+    "version": "8.0.1",
+    "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
   },
   {
     "pname": "System.Net.Http",
@@ -1257,16 +1194,6 @@
     "version": "4.3.0",
     "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.5.0",
-    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.0.12",
-    "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
-  },
   {
     "pname": "System.ObjectModel",
     "version": "4.3.0",
@@ -1278,20 +1205,15 @@
     "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
   {
-    "pname": "System.Reflection",
-    "version": "4.1.0",
-    "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
+    "pname": "System.Private.Uri",
+    "version": "4.3.2",
+    "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="
   },
   {
     "pname": "System.Reflection",
     "version": "4.3.0",
     "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.0.1",
-    "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
-  },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.3.0",
@@ -1302,81 +1224,41 @@
     "version": "4.7.0",
     "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
   },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.0.1",
-    "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
-  },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.3.0",
     "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
   },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.0.1",
-    "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
-  },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.3.0",
     "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.0.1",
-    "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
-  },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
     "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
   },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "1.5.0",
-    "hash": "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8="
-  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
-  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
     "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
-  },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
     "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
   },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.0.1",
-    "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
-  },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
     "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
   },
-  {
-    "pname": "System.Runtime",
-    "version": "4.1.0",
-    "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
-  },
   {
     "pname": "System.Runtime",
     "version": "4.3.0",
@@ -1392,41 +1274,21 @@
     "version": "6.0.0",
     "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
   },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.1.0",
-    "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
-  },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
     "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
-  },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
     "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
-  },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
     "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
-  {
-    "pname": "System.Runtime.InteropServices.RuntimeInformation",
-    "version": "4.0.0",
-    "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="
-  },
   {
     "pname": "System.Runtime.InteropServices.RuntimeInformation",
     "version": "4.3.0",
@@ -1442,11 +1304,6 @@
     "version": "4.3.0",
     "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
-  {
-    "pname": "System.Runtime.Serialization.Primitives",
-    "version": "4.1.1",
-    "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
-  },
   {
     "pname": "System.Security.AccessControl",
     "version": "4.7.0",
@@ -1504,8 +1361,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "4.7.0",
-    "hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="
+    "version": "4.5.0",
+    "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
@@ -1552,11 +1409,6 @@
     "version": "8.0.1",
     "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8="
   },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
-  },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
@@ -1567,21 +1419,11 @@
     "version": "8.0.0",
     "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
   },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.0.11",
-    "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
-  },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
     "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
   },
-  {
-    "pname": "System.Text.Encodings.Web",
-    "version": "4.7.2",
-    "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
-  },
   {
     "pname": "System.Text.Json",
     "version": "5.0.2",
@@ -1589,44 +1431,24 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
-  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.1.0",
-    "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
+    "version": "8.0.6",
+    "hash": "sha256-qD3WF3jQO9+TLuBWwJhz3iKDArJqcRiy7EdrCQhrtes="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.3.0",
     "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
   },
-  {
-    "pname": "System.Threading",
-    "version": "4.0.11",
-    "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
-  },
   {
     "pname": "System.Threading",
     "version": "4.3.0",
     "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
   },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.0.11",
-    "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
-  },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
     "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.0.0",
-    "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
-  },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.3.0",
@@ -1662,21 +1484,11 @@
     "version": "4.7.0",
     "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
   },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.0.11",
-    "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
-  },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.0",
     "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
   },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.0.11",
-    "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
-  },
   {
     "pname": "System.Xml.XDocument",
     "version": "4.3.0",
diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix
index 69d6877a43e1..dc0dfdfb4343 100644
--- a/pkgs/by-name/pr/prowlarr/package.nix
+++ b/pkgs/by-name/pr/prowlarr/package.nix
@@ -19,7 +19,7 @@
   applyPatches,
 }:
 let
-  version = "2.0.5.5160";
+  version = "2.1.5.5216";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -27,7 +27,7 @@ let
       owner = "Prowlarr";
       repo = "Prowlarr";
       tag = "v${version}";
-      hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0=";
+      hash = "sha256-/7U1V1/fF8fobVwQa/IzCGWIUIKMrSxTyj9KZhmfJ/E=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config
diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix
index 74a003ee691c..f812a071bdd7 100644
--- a/pkgs/by-name/pr/proximity-sort/package.nix
+++ b/pkgs/by-name/pr/proximity-sort/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "proximity-sort";
   };
 }
diff --git a/pkgs/by-name/pr/proxsuite-nlp/package.nix b/pkgs/by-name/pr/proxsuite-nlp/package.nix
deleted file mode 100644
index 8ec4d08628f0..000000000000
--- a/pkgs/by-name/pr/proxsuite-nlp/package.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  cmake,
-  doxygen,
-  eigenrand,
-  example-robot-data,
-  fetchFromGitHub,
-  fmt,
-  fontconfig,
-  graphviz,
-  lib,
-  stdenv,
-  pinocchio,
-  pkg-config,
-  proxsuite,
-  python3Packages,
-  pythonSupport ? false,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "proxsuite-nlp";
-  version = "0.11.0";
-
-  src = fetchFromGitHub {
-    owner = "Simple-Robotics";
-    repo = "proxsuite-nlp";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-ae8o0R+79qetAsc/KmvtBSVfH9695Cg4bcDBAEzKr6A=";
-  };
-
-  outputs = [
-    "out"
-    "doc"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    graphviz
-    pkg-config
-  ]
-  ++ lib.optional pythonSupport python3Packages.pythonImportsCheckHook;
-  checkInputs = [ eigenrand ] ++ lib.optional pythonSupport python3Packages.pytest;
-  propagatedBuildInputs = [
-    example-robot-data
-    fmt
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.pinocchio
-    python3Packages.proxsuite
-  ]
-  ++ lib.optionals (!pythonSupport) [
-    pinocchio
-    proxsuite
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
-    (lib.cmakeBool "BUILD_WITH_PINOCCHIO_SUPPORT" true)
-    (lib.cmakeBool "BUILD_WITH_PROXSUITE_SUPPORT" true)
-  ];
-
-  # Fontconfig error: Cannot load default config file: No such file: (null)
-  env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
-
-  # Fontconfig error: No writable cache directories
-  preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
-
-  doCheck = true;
-  pythonImportsCheck = [ "proxsuite_nlp" ];
-
-  meta = {
-    description = "Primal-dual augmented Lagrangian solver for nonlinear programming on manifolds";
-    homepage = "https://github.com/Simple-Robotics/proxsuite-nlp";
-    changelog = "https://github.com/Simple-Robotics/proxsuite-nlp/blob/v${finalAttrs.version}/CHANGELOG.md";
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ nim65s ];
-    platforms = lib.platforms.unix;
-  };
-})
diff --git a/pkgs/by-name/pr/proxsuite/package.nix b/pkgs/by-name/pr/proxsuite/package.nix
index d1e5dca8dfce..fc56b8ef0e5d 100644
--- a/pkgs/by-name/pr/proxsuite/package.nix
+++ b/pkgs/by-name/pr/proxsuite/package.nix
@@ -36,6 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1+a5tFOlEwzhGZtll35EMFceD0iUOOQCbwJd9NcFDlk=";
   };
 
+  # ref. https://github.com/Simple-Robotics/proxsuite/pull/408 merged upstream
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.10)" \
+      "cmake_minimum_required(VERSION 3.22)"
+  '';
+
   outputs = [
     "doc"
     "out"
diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix
index 55299e114217..4a8143dd7f98 100644
--- a/pkgs/by-name/pr/proxyman/package.nix
+++ b/pkgs/by-name/pr/proxyman/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "proxyman";
-  version = "3.2.0";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
-    hash = "sha256-u6Lu5blU1z7UJyiBZFj/dqKeoCfMniXz6ul2TQwaOqI=";
+    hash = "sha256-fwkFQOeHb049qFChLfyU20L6mJCDnrcK2HM9PljUdUg=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch
index cf6328920254..17facc6744c1 100644
--- a/pkgs/by-name/pr/proxysql/makefiles.patch
+++ b/pkgs/by-name/pr/proxysql/makefiles.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index b9ad6f71..60e71a86 100644
+index 01aa5730..6c71b3a5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -81,10 +81,7 @@ endif
@@ -35,7 +35,7 @@ index b9ad6f71..60e71a86 100644
  	install -m 0755 etc/init.d/proxysql /etc/init.d
  ifeq ($(DISTRO),"CentOS Linux")
 diff --git a/deps/Makefile b/deps/Makefile
-index 7c8fcc85..4ae0aba1 100644
+index 87d2a20e..505e069a 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
 @@ -61,27 +61,22 @@ default: $(targets)
@@ -66,7 +66,7 @@ index 7c8fcc85..4ae0aba1 100644
  	cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
  	cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
  	cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch
-@@ -99,58 +94,49 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
+@@ -99,77 +94,66 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
  
  
  libev/libev/.libs/libev.a:
@@ -83,7 +83,8 @@ index 7c8fcc85..4ae0aba1 100644
  	cd coredumper && rm -rf coredumper-*/ || true
  	cd coredumper && tar -zxf coredumper-*.tar.gz
  	cd coredumper/coredumper && patch -p1 < ../includes.patch
- 	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
+-	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
++	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5
  	cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE}
  coredumper: coredumper/coredumper/src/libcoredumper.a
  
@@ -125,7 +126,18 @@ index 7c8fcc85..4ae0aba1 100644
  	cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
  
  lz4: lz4/lz4/lib/liblz4.a
-@@ -168,8 +154,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
+ 
+ 
+ clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
+ 	cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
+ 	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz
+ 	cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp
+ 	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
+-	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
++	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
+ 	cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
+ 
+ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a
  
  
  libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
@@ -134,6 +146,15 @@ index 7c8fcc85..4ae0aba1 100644
  	cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
  	cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
  	cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
+@@ -194,7 +178,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
+ 	cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true
+ 	cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
+ 	cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
+-	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
++	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
+ ifeq ($(PROXYDEBUG),1)
+ 	cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
+ else ifeq ($(USEVALGRIND),1)
 @@ -253,18 +237,13 @@ sqlite3/sqlite3/sqlite3.o:
  sqlite3: sqlite3/sqlite3/sqlite3.o
  
@@ -170,8 +191,8 @@ index 7c8fcc85..4ae0aba1 100644
 -	cd postgresql && tar -zxf postgresql-*.tar.gz
  	cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch
  	cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch
- 	#cd postgresql/postgresql && LD_LIBRARY_PATH="$(shell pwd)/libssl/openssl" ./configure --with-ssl=openssl --with-includes="$(shell pwd)/libssl/openssl/include/" --with-libraries="$(shell pwd)/libssl/openssl/" --without-readline --enable-debug  CFLAGS="-ggdb -O0 -fno-omit-frame-pointer" CPPFLAGS="-g -O0"
-@@ -360,4 +335,3 @@ cleanall:
+ 	cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch
+@@ -361,4 +336,3 @@ cleanall:
  	cd libusual && rm -rf libusual-*/ || true
  	cd libscram && rm -rf lib/* obj/* || true
  .PHONY: cleanall
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index 0d9012a2054a..6efeb676bec4 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proxysql";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "sysown";
     repo = "proxysql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yGxn46Vm8YdtIvvoTlOHQ1aAP2J/h/kFqr4ehruDsTw=";
+    hash = "sha256-kbfuUulEDPx/5tpp7uOkIXQuyaFYzos3crCvkWHSmHg=";
   };
 
   patches = [
diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix
index 042eadab05ee..56cf6a577891 100644
--- a/pkgs/by-name/pr/prs/package.nix
+++ b/pkgs/by-name/pr/prs/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "prs";
-  version = "0.5.2";
+  version = "0.5.4";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "prs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-W5wNmZWjSsM6Xe50fCpa/aGsJ8PDyh2INs1Oj86et04=";
+    hash = "sha256-RWquV2apUazgGiwzTc0cMzKNItJOBZDSRMp13k+mhS0=";
   };
 
-  cargoHash = "sha256-IRWOY+FudPH2AEUTplwUWKK431x+CRkVF3VXxVWFKeI=";
+  cargoHash = "sha256-v5jZJQHXxMENJ5EbZjoI4sZ0EpCfVZOkOX442S1TReU=";
 
   nativeBuildInputs = [
     gpgme
diff --git a/pkgs/by-name/ps/pscale/package.nix b/pkgs/by-name/ps/pscale/package.nix
index 30dc0787ca8f..0fef9a01c30b 100644
--- a/pkgs/by-name/ps/pscale/package.nix
+++ b/pkgs/by-name/ps/pscale/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "pscale";
-  version = "0.258.0";
+  version = "0.259.0";
 
   src = fetchFromGitHub {
     owner = "planetscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-FsDcZcha8jR+jTbZbL/34SDUS/GvyAtuWL2NK0Okofc=";
+    sha256 = "sha256-y5MPABNCP99I001tm9vOrUezjqt7TQ6U7JCowyVsWgI=";
   };
 
-  vendorHash = "sha256-bzJydUOC08NLVVwEzJ+ZSC65lI4EKS1gzjTMIN3rukM=";
+  vendorHash = "sha256-oN9IC/RpSZWxelIyebhd6jv0fJ0ZUUv0pOkDFnOhzDM=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ps/psitop/package.nix b/pkgs/by-name/ps/psitop/package.nix
index 573c6e970c9f..a4ecd0fb858d 100644
--- a/pkgs/by-name/ps/psitop/package.nix
+++ b/pkgs/by-name/ps/psitop/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Top for /proc/pressure";
     homepage = "https://github.com/jamespwilliams/psitop";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "psitop";
   };
 }
diff --git a/pkgs/by-name/ps/pslib/cmake4.patch b/pkgs/by-name/ps/pslib/cmake4.patch
new file mode 100644
index 000000000000..7fe5bc3d94e7
--- /dev/null
+++ b/pkgs/by-name/ps/pslib/cmake4.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 58a5b45..b41e6a3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 3.10)
++
+ PROJECT(pslib C)
+ option(ENABLE_BMP   "Build with BMP support" ON)
+
+@@ -73,7 +75,6 @@ INCLUDE(CheckFunctionExists)
+ INCLUDE(TestBigEndian)
+ test_big_endian(WORDS_BIGENDIAN)
+
+-SUBDIRS( src )
+ SET(SOURCES
+        src/pslib.c
+        src/ps_memory.c
\ No newline at end of file
diff --git a/pkgs/by-name/ps/pslib/package.nix b/pkgs/by-name/ps/pslib/package.nix
index e11d87fc2db3..81bf538df8d9 100644
--- a/pkgs/by-name/ps/pslib/package.nix
+++ b/pkgs/by-name/ps/pslib/package.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64=";
   };
 
+  patches = [
+    ./cmake4.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -33,10 +37,6 @@ stdenv.mkDerivation rec {
     libtiff
   ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
-
   doCheck = true;
 
   outputs = [
diff --git a/pkgs/by-name/ps/psysh/package.nix b/pkgs/by-name/ps/psysh/package.nix
index 709efc36a5f4..a286afa171f5 100644
--- a/pkgs/by-name/ps/psysh/package.nix
+++ b/pkgs/by-name/ps/psysh/package.nix
@@ -58,6 +58,7 @@ php.buildComposerProject2 (finalAttrs: {
     mainProgram = "psysh";
     license = lib.licenses.mit;
     homepage = "https://psysh.org/";
-    teams = [ lib.teams.php ];
+    # `composerVendor` doesn't build
+    broken = true;
   };
 })
diff --git a/pkgs/by-name/pu/publicsuffix-list/package.nix b/pkgs/by-name/pu/publicsuffix-list/package.nix
index 491b7adaa8ed..1edfa926dd47 100644
--- a/pkgs/by-name/pu/publicsuffix-list/package.nix
+++ b/pkgs/by-name/pu/publicsuffix-list/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "publicsuffix-list";
-  version = "0-unstable-2025-08-28";
+  version = "0-unstable-2025-10-08";
 
   src = fetchFromGitHub {
     owner = "publicsuffix";
     repo = "list";
-    rev = "4103956c4300902436b03d7da482536e757b3601";
-    hash = "sha256-QIjDAbPfbdV+V4RV6v8/85YTxiRbXLBlulObXpkPmxQ=";
+    rev = "ee7dec4a99602baaf51879dd8469b6642881a494";
+    hash = "sha256-IlR3dICad9EZeizI3V0A1YCQZiV/xg2GxtmTLG4EASU=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix
index 546632649cdc..9ac9e5231919 100644
--- a/pkgs/by-name/pu/publii/package.nix
+++ b/pkgs/by-name/pu/publii/package.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "publii";
-  version = "0.46.5";
+  version = "0.47.1";
 
   src = fetchurl {
     url = "https://getpublii.com/download/Publii-${version}.deb";
-    hash = "sha256-VymAHQNv3N7Mqe8wiUfYawi1BooczLFClxuwaW8NetA=";
+    hash = "sha256-X2rN/inGAxQWYg8OxTLtGzr4q4vUgCYCz3xuxCyCwkQ=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix
index e981ff31fedc..ee00476e5003 100644
--- a/pkgs/by-name/pu/pulumi/package.nix
+++ b/pkgs/by-name/pu/pulumi/package.nix
@@ -187,7 +187,6 @@ buildGoModule rec {
     license = lib.licenses.asl20;
     mainProgram = "pulumi";
     maintainers = with lib.maintainers; [
-      trundle
       veehaitch
       tie
     ];
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
index af57f166b702..38f8b999164f 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
@@ -33,7 +33,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
index 75356bff0221..9d8798999e50 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
@@ -38,7 +38,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
index 30910187208b..8e6c919b3e46 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
@@ -32,7 +32,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
index 63461ae13713..1180c64ee6b7 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
@@ -22,7 +22,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
index f74d82ec1268..11729d2e29f2 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
@@ -25,7 +25,6 @@ mkPulumiPackage rec {
     maintainers = with maintainers; [
       tie
       veehaitch
-      trundle
     ];
     mainProgram = cmdRes;
   };
diff --git a/pkgs/applications/audio/puredata/expose-error.patch b/pkgs/by-name/pu/puredata/expose-error.patch
similarity index 100%
rename from pkgs/applications/audio/puredata/expose-error.patch
rename to pkgs/by-name/pu/puredata/expose-error.patch
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/by-name/pu/puredata/package.nix
similarity index 100%
rename from pkgs/applications/audio/puredata/default.nix
rename to pkgs/by-name/pu/puredata/package.nix
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/by-name/pu/puredata/wrapper.nix
similarity index 100%
rename from pkgs/applications/audio/puredata/wrapper.nix
rename to pkgs/by-name/pu/puredata/wrapper.nix
diff --git a/pkgs/by-name/pv/pv/package.nix b/pkgs/by-name/pv/pv/package.nix
index 574e3a5db27b..b612e525a7e8 100644
--- a/pkgs/by-name/pv/pv/package.nix
+++ b/pkgs/by-name/pv/pv/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pv";
-  version = "1.9.42";
+  version = "1.9.44";
 
   src = fetchurl {
     url = "https://www.ivarch.com/programs/sources/pv-${finalAttrs.version}.tar.gz";
-    hash = "sha256-+9fRsE7+5iyCQSVaP+HF9SNvGm4e2F8CcwsMZEiBAXU=";
+    hash = "sha256-4TDJ4Ysebp4u+VvsYRfHLLm+J6G4/+l/ynh+TI4BRWI=";
   };
 
   meta = {
diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix
index 1470a3f1f22d..435ee7d03fb6 100644
--- a/pkgs/by-name/pw/pw-viz/package.nix
+++ b/pkgs/by-name/pw/pw-viz/package.nix
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple and elegant pipewire graph editor";
     homepage = "https://github.com/ax9d/pw-viz";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix
index f936de48254e..b9b252d7f602 100644
--- a/pkgs/by-name/pw/pw-volume/package.nix
+++ b/pkgs/by-name/pw/pw-volume/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       astro
-      figsoda
     ];
     platforms = lib.platforms.linux;
     mainProgram = "pw-volume";
diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
index 35dab5a2f0e9..f0807791f312 100644
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -43,18 +43,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pwvucontrol";
-  version = "0.4.9";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "pwvucontrol";
     tag = finalAttrs.version;
-    hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao=";
+    hash = "sha256-21TBVDzjrBzNIPkAURGs2ngI8Vj6o/RL3Ael4wwE2Lk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk=";
+    hash = "sha256-FrPpLbfqM/DtjYu20pwr1AMUHaAuTEt60I3JlFZO4RI=";
   };
 
   postPatch = ''
@@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/saivert/pwvucontrol";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      figsoda
       Guanran928
       johnrtitor
     ];
diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 028ee095e689..625cd52110dd 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.6.8";
+  version = "2.6.12";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     tag = "v${version}";
-    hash = "sha256-/rIuFjClGqpZUm91G2fCe05KamlTEHqPs7BUgC+Fgbk=";
+    hash = "sha256-oGhdODWjE1FFcFdKUMAznUQ7kdWZMJ2M/ssBOEd+Ce0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/py/pyglossary-gui/package.nix b/pkgs/by-name/py/pyglossary-gui/package.nix
new file mode 100644
index 000000000000..b9f68d286190
--- /dev/null
+++ b/pkgs/by-name/py/pyglossary-gui/package.nix
@@ -0,0 +1,9 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication (
+  python3.pkgs.pyglossary.override {
+    enableGui = true;
+  }
+)
diff --git a/pkgs/by-name/py/pyglossary/package.nix b/pkgs/by-name/py/pyglossary/package.nix
new file mode 100644
index 000000000000..8c96c385d8a2
--- /dev/null
+++ b/pkgs/by-name/py/pyglossary/package.nix
@@ -0,0 +1,5 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication python3.pkgs.pyglossary
diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix
index 38f39b35f89e..f294c5138555 100644
--- a/pkgs/by-name/py/pyradio/package.nix
+++ b/pkgs/by-name/py/pyradio/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
-  version = "0.9.3.11.19";
+  version = "0.9.3.11.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = "pyradio";
     tag = version;
-    hash = "sha256-fjTaURYY2pSb3mod4Vffbczmyxsn0/4SAXkb68mRhQA=";
+    hash = "sha256-dcs9kwuS1/pNtBPhj6Z1VAHFJw/ajwzc2aTWGU/h4W0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index fc2c6d6110a4..f4e731a685f0 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  rust-jemalloc-sys,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
@@ -19,6 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildAndTestSubdir = "pyrefly";
   cargoHash = "sha256-46kcoBG/PWwf8VdlvLNzEhfYRTmmKi/uTjwFkl7Wozg=";
 
+  buildInputs = [ rust-jemalloc-sys ];
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
diff --git a/pkgs/by-name/py/pyright/package-lock.json b/pkgs/by-name/py/pyright/package-lock.json
index 221d0e3ff742..4505415580bf 100644
--- a/pkgs/by-name/py/pyright/package-lock.json
+++ b/pkgs/by-name/py/pyright/package-lock.json
@@ -6,7 +6,7 @@
     "": {
       "name": "pyright-root",
       "devDependencies": {
-        "glob": "^7.2.3",
+        "glob": "^8.1.0",
         "jsonc-parser": "^3.3.1"
       }
     },
@@ -18,23 +18,15 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "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": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -43,9 +35,9 @@
       "license": "ISC"
     },
     "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "license": "ISC",
@@ -53,12 +45,11 @@
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -91,16 +82,16 @@
       "license": "MIT"
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
       }
     },
     "node_modules/once": {
@@ -113,16 +104,6 @@
         "wrappy": "1"
       }
     },
-    "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==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index 9e649914c0bd..99f9dbab6530 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "1.1.403";
+  version = "1.1.407";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "pyright";
     tag = version;
-    hash = "sha256-vqE/3wK0rtFT9f399djm4QElRccXdOXyODsQMQySa9k=";
+    hash = "sha256-TQrmA65CzXar++79DLRWINaMsjoqNFdvNlwDzAcqOjM=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -27,7 +27,7 @@ let
     pname = "pyright-root";
     inherit version src;
     sourceRoot = "${src.name}"; # required for update.sh script
-    npmDepsHash = "sha256-1OrUBARwNvT8pTH66W7GAKG8B5fX8/6jtOOYVU6IgSw=";
+    npmDepsHash = "sha256-4DVWWoLnNXoJ6eWeQuOzAVjcvo75Y2nM/HwQvAEN4ME=";
     dontNpmBuild = true;
     postPatch = ''
       cp ${patchedPackageJSON} ./package.json
@@ -44,7 +44,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-Tc7v6sDu0PR//ukvw9hULX0KGpRkA0hEaeuKlPnpYl4=";
+    npmDepsHash = "sha256-0czcnWOgIp/KtqBts908r4vGgMuwFLvIom89v+uCzpk=";
     dontNpmBuild = true;
     installPhase = ''
       runHook preInstall
@@ -58,7 +58,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-wzjdeZr6tbaBuOWDJXeTFkQRUHnxYryvI7sfGsSEpVQ=";
+  npmDepsHash = "sha256-NyZAvboojw9gTj52WrdNIL2Oyy2wtpVnb5JyxKLJqWM=";
 
   postPatch = ''
     chmod +w ../../
diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix
index d7396634b116..18f2bf17ecff 100644
--- a/pkgs/by-name/py/pyroscope/package.nix
+++ b/pkgs/by-name/py/pyroscope/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/grafana/pyroscope";
     changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = [ lib.teams.mercury ];
+    teams = [ lib.teams.mercury ];
     mainProgram = "pyroscope";
   };
 })
diff --git a/pkgs/by-name/py/pysentation/package.nix b/pkgs/by-name/py/pysentation/package.nix
index 508d0486562d..128160dcceac 100644
--- a/pkgs/by-name/py/pysentation/package.nix
+++ b/pkgs/by-name/py/pysentation/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/mimseyedi/pysentation";
     changelog = "https://github.com/mimseyedi/pysentation/releases/tag/${src.rev}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "pysentation";
   };
 }
diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix
index 7be8b88fdea3..a9a09fda0169 100644
--- a/pkgs/by-name/py/python-launcher/package.nix
+++ b/pkgs/by-name/py/python-launcher/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/brettcannon/python-launcher";
     changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "py";
   };
 }
diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
index 9cc8686cf22f..8af97702b335 100644
--- a/pkgs/by-name/py/pytrainer/package.nix
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3,
   fetchFromGitHub,
+  fetchpatch,
   gdk-pixbuf,
   adwaita-icon-theme,
   gpsbabel,
@@ -41,6 +42,20 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
   };
 
+  patches = [
+    # Fix startup crash with SQLAlchemy 2.0
+    (fetchpatch {
+      url = "https://github.com/pytrainer/pytrainer/commit/9847c76e61945466775bde038057bf5fd31ae089.patch";
+      hash = "sha256-cGNu4lK0eQWzcSFTKc8g/qHSSHfy0ow4T3eT+zl5lPM=";
+    })
+
+    # Port to webkigtk 4.1
+    (fetchpatch {
+      url = "https://github.com/pytrainer/pytrainer/commit/eda968a8b48074f03efbdfbd692b46edef3658cd.patch";
+      hash = "sha256-MdxsKO6DgncHhGlJWcEeyYiPKf3qdhMqXrYYC+jqros=";
+    })
+  ];
+
   build-system = with python3.pkgs; [ setuptools ];
 
   dependencies = with python.pkgs; [
@@ -89,10 +104,6 @@ python.pkgs.buildPythonApplication rec {
   postPatch = ''
     substituteInPlace pytrainer/platform.py \
         --replace-fail 'sys.prefix' "\"$out\""
-
-    # https://github.com/pytrainer/pytrainer/pull/281
-    substituteInPlace pytrainer/extensions/mapviewer.py \
-        --replace-fail "gi.require_version('WebKit2', '4.0')" "gi.require_version('WebKit2', '4.1')"
   '';
 
   checkPhase = ''
@@ -106,8 +117,6 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    # https://github.com/pytrainer/pytrainer/issues/280
-    broken = true;
     homepage = "https://github.com/pytrainer/pytrainer";
     description = "Application for logging and graphing sporting excursions";
     mainProgram = "pytrainer";
diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index 727a29407e14..34b5ce10dc67 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.8.10";
+  version = "3.8.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
     tag = version;
-    hash = "sha256-OSWv6Pxmd5U1xydL45dVT6m7gu4Rx6Yln3R4dTFZoVE=";
+    hash = "sha256-BZd8ditvcLLJDCWaWtSEUkOBgLM2LvtX5UbKOMz7eno=";
   };
 
   build-system = [ python3.pkgs.setuptools ];
diff --git a/pkgs/by-name/pz/pzip/package.nix b/pkgs/by-name/pz/pzip/package.nix
index 36a95dd991df..ccac8c059a98 100644
--- a/pkgs/by-name/pz/pzip/package.nix
+++ b/pkgs/by-name/pz/pzip/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     homepage = "https://github.com/ybirader/pzip";
     changelog = "https://github.com/ybirader/pzip/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "pzip";
   };
 }
diff --git a/pkgs/by-name/q/q/package.nix b/pkgs/by-name/q/q/package.nix
index cc1c1e92ace8..31748a51c2ee 100644
--- a/pkgs/by-name/q/q/package.nix
+++ b/pkgs/by-name/q/q/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "q";
-  version = "0.19.9";
+  version = "0.19.10";
 
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "q";
     tag = "v${version}";
-    hash = "sha256-QYSy2RaEWNkitehsmcfGYTCvpHtu1aVRuwBVNMjOHZ0=";
+    hash = "sha256-bP4aFoGv7VlzCXkMYzDHp3VzgA3MpqugmNE3Vyta4iM=";
   };
 
-  vendorHash = "sha256-g5ZrzkPqkvoz0Q0ERXYlNk7lDf+6V27yKa+5NLVZHCI=";
+  vendorHash = "sha256-4W0lS7qh3CCSbAtohc/1EbwdiO75tELTp1aBMyPeh/o=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix
index 7a1f1abb2037..0517d0a13cbd 100644
--- a/pkgs/by-name/qa/qadwaitadecorations/package.nix
+++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   qt5,
   qt6,
@@ -30,6 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Zg2G3vuRD/kK5C2fFq6Cft218uFyBvfXtO1DHKQECFQ=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/FedoraQt/QAdwaitaDecorations/pull/88
+      name = "Fix build with Qt 6.10";
+      url = "https://github.com/FedoraQt/QAdwaitaDecorations/commit/e6da80a440218b87e441c8a698014ef3962af98b.patch?full_index=1";
+      hash = "sha256-7ZmceoOzUDHvvCX+8SwuX+DIi65d6hYIYfpikMiN0wM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index ecc3701fc1cf..decf9ef9cde4 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cK710enmkSgp3r4MEfyWac/V7mMs+CPxq0LrdX2jZTQ=";
+    hash = "sha256-+vyFdenXp/lLYoD0LwVUf9v8bVw2+NH6q2HiP349Ajw=";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 05eaf177e2d7..96bedc89e8e4 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tVIKvpH43fmKZ7ezTwgeQ1T9yEx2sOne49oNo6Ti2lw=";
+    hash = "sha256-xrhN/xacQJ2WdrM330YadZjvnmB2T7uZvFSAWA5GO2w=";
   };
 
   nativeBuildInputs = with qt6; [
diff --git a/pkgs/by-name/qc/qcsxcad/package.nix b/pkgs/by-name/qc/qcsxcad/package.nix
index 8d8b0fc4dfcc..00035bb2c64a 100644
--- a/pkgs/by-name/qc/qcsxcad/package.nix
+++ b/pkgs/by-name/qc/qcsxcad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   csxcad,
   tinyxml,
@@ -20,6 +21,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bX6e3ugHJynU9tP70BV8TadnoGg1VO7SAYJueMkMAyo=";
   };
 
+  patches = [
+    # ref. https://github.com/thliebig/QCSXCAD/pull/18 merged upstream
+    (fetchpatch {
+      name = "fix-cmake-40-issues.patch";
+      url = "https://github.com/thliebig/QCSXCAD/commit/200c9c211ee1401d6dce2bcbf2543089cdc67208.patch";
+      hash = "sha256-OVihvjBRTQ87l0bBq2J8aWC7WdFCPqy5CtU4S5a11Xw=";
+    })
+    (fetchpatch {
+      name = "update-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/QCSXCAD/commit/64a4bdc13511690499756e6602076c1e70cf4ee7.patch";
+      hash = "sha256-rzVj9YdAJVxhTatTO5MxZJInb1RB0qqmPFAkI2nxpQ0=";
+    })
+  ];
+
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix
index 0875c3b3e14c..a307759560e1 100644
--- a/pkgs/by-name/qd/qdmr/package.nix
+++ b/pkgs/by-name/qd/qdmr/package.nix
@@ -6,8 +6,9 @@
   cmake,
   libxslt,
   docbook_xsl_ns,
-  libsForQt5,
+  kdePackages,
   libusb1,
+  librsvg,
   yaml-cpp,
 }:
 
@@ -17,28 +18,30 @@ in
 
 stdenv.mkDerivation rec {
   pname = "qdmr";
-  version = "0.12.3";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
     rev = "v${version}";
-    hash = "sha256-rb59zbYpIziqXWTjTApWXnkcpRiAUIqPiInEJdsYd48=";
+    hash = "sha256-Vz7di9VwrvtSCea3pipSCEw9pHfRv9lJn9jKzboyh6E=";
   };
 
   nativeBuildInputs = [
     cmake
-    libxslt
-    libsForQt5.wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     installShellFiles
   ];
 
   buildInputs = [
+    librsvg
     libusb1
-    libsForQt5.qtlocation
-    libsForQt5.qtserialport
-    libsForQt5.qttools
-    libsForQt5.qtbase
+    libxslt
+    kdePackages.qtlocation
+    kdePackages.qtserialport
+    kdePackages.qttools
+    kdePackages.qtbase
+    kdePackages.qtpositioning
     yaml-cpp
   ];
 
@@ -59,6 +62,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_MAN=ON"
     "-DCMAKE_INSTALL_FULL_MANDIR=share/man"
+    "-DDOCBOOK2MAN_XSLT=docbook_man.${if isLinux then "debian" else "macports"}.xsl"
     "-DINSTALL_UDEV_RULES=OFF"
   ];
 
@@ -73,7 +77,10 @@ stdenv.mkDerivation rec {
     description = "GUI application and command line tool for programming DMR radios";
     homepage = "https://dm3mat.darc.de/qdmr/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [
+      _0x4A6F
+      juliabru
+    ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/by-name/qg/qgo/fix-paths.patch
similarity index 100%
rename from pkgs/games/qgo/fix-paths.patch
rename to pkgs/by-name/qg/qgo/fix-paths.patch
diff --git a/pkgs/games/qgo/default.nix b/pkgs/by-name/qg/qgo/package.nix
similarity index 82%
rename from pkgs/games/qgo/default.nix
rename to pkgs/by-name/qg/qgo/package.nix
index 68b4a9325b38..6f3b6384f660 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/by-name/qg/qgo/package.nix
@@ -1,18 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
+  libsForQt5,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtmultimedia,
-  qttools,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "qgo";
   version = "unstable-2017-12-18";
 
-  meta = with lib; {
+  meta = {
     description = "Go client based on Qt5";
     mainProgram = "qgo";
     longDescription = ''
@@ -28,8 +25,8 @@ mkDerivation {
       Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean.
     '';
     homepage = "https://github.com/pzorin/qgo";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zalakain ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ zalakain ];
   };
 
   src = fetchFromGitHub {
@@ -44,11 +41,12 @@ mkDerivation {
     sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
   '';
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 }
diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/by-name/qj/qjackctl/package.nix
similarity index 65%
rename from pkgs/applications/audio/qjackctl/default.nix
rename to pkgs/by-name/qj/qjackctl/package.nix
index 49adf9fab6f9..fc2a1cdd8bf4 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/by-name/qj/qjackctl/package.nix
@@ -1,20 +1,18 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
   cmake,
   alsa-lib,
   libjack2,
   dbus,
-  qtbase,
-  qttools,
-  qtx11extras,
+  libsForQt5,
   # Enable jack session support
   jackSession ? false,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.9.91";
   pname = "qjackctl";
 
@@ -23,14 +21,14 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rncbc";
     repo = "qjackctl";
-    rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY=";
+    tag = "qjackctl_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY=";
   };
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
+    libsForQt5.qttools
     alsa-lib
     libjack2
     dbus
@@ -39,6 +37,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
@@ -46,12 +45,12 @@ mkDerivation rec {
     "-DCONFIG_JACK_SESSION=${toString jackSession}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt application to control the JACK sound server daemon";
     mainProgram = "qjackctl";
     homepage = "https://github.com/rncbc/qjackctl";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/by-name/qj/qjournalctl/package.nix
similarity index 90%
rename from pkgs/applications/system/qjournalctl/default.nix
rename to pkgs/by-name/qj/qjournalctl/package.nix
index 4e4bbafa37ad..85fd6af3fe6d 100644
--- a/pkgs/applications/system/qjournalctl/default.nix
+++ b/pkgs/by-name/qj/qjournalctl/package.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
   pkg-config,
   libssh,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,14 +23,14 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libssh
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix
index d8644c2aadbb..a045c8e329bb 100644
--- a/pkgs/by-name/qm/qmapshack/package.nix
+++ b/pkgs/by-name/qm/qmapshack/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qmapshack";
-  version = "1.18.0";
+  version = "1.18.2";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = "qmapshack";
     tag = "V_${finalAttrs.version}";
-    hash = "sha256-+M76EZeZOsBQ7RXtVplsrbrDgU0plRAht4/jz/GpIhM=";
+    hash = "sha256-vvpDjGFzkbsM/QUiU9EURuU0babWYL1gLzWTqJbHu0c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qm/qmidinet/package.nix b/pkgs/by-name/qm/qmidinet/package.nix
new file mode 100644
index 000000000000..31e537b371ed
--- /dev/null
+++ b/pkgs/by-name/qm/qmidinet/package.nix
@@ -0,0 +1,44 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  cmake,
+  pkg-config,
+  alsa-lib,
+  libjack2,
+  qt6,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.0.1";
+  pname = "qmidinet";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz";
+    hash = "sha256-9V1KXK6LAYxM+kei14pof93hZQUDs7/ywRaSz6pwyyk=";
+  };
+
+  hardeningDisable = [ "format" ];
+
+  buildInputs = [
+    qt6.qtbase
+    qt6.qttools
+    alsa-lib
+    libjack2
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    qt6.wrapQtAppsHook
+  ];
+
+  meta = {
+    description = "MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
+    mainProgram = "qmidinet";
+    homepage = "http://qmidinet.sourceforge.net/";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix
index 0006efa17170..e8484a125b40 100644
--- a/pkgs/by-name/qm/qmmp/package.nix
+++ b/pkgs/by-name/qm/qmmp/package.nix
@@ -52,13 +52,13 @@
 # Qmmp installs working .desktop file(s) all by itself, so we don't need to
 # handle that.
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qmmp";
-  version = "2.2.8";
+  version = "2.3.0";
 
   src = fetchurl {
-    url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-cwqXoGOkmOs32p4vgZjf5XBpPmpsfyshDVgb2H27k4o=";
+    url = "https://qmmp.ylsoftware.com/files/qmmp/2.3/qmmp-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-AcPjA2fIhReM0RVZTSD2lKR6NS/X5l/PVyLhKsgzMGM=";
   };
 
   nativeBuildInputs = [
@@ -107,12 +107,12 @@ stdenv.mkDerivation rec {
     libsamplerate
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt-based audio player that looks like Winamp";
     mainProgram = "qmmp";
     homepage = "https://qmmp.ylsoftware.com/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
-}
+})
diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 5ce404e93cbc..383cd0c4a0ff 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "qmplay2";
     maintainers = with lib.maintainers; [
       kashw2
+      ProxyVT
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 58ab4a6cb99d..e1b3dbbbd857 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -5,13 +5,13 @@
     let
       self = {
         pname = "qmplay2";
-        version = "25.06.27";
+        version = "25.09.11";
 
         src = fetchFromGitHub {
           owner = "zaps166";
           repo = "QMPlay2";
           tag = self.version;
-          hash = "sha256-+kDaRKwXOHnHje1RntC9y9xiTaMzs8SGMLVoJ+6IDNk=";
+          hash = "sha256-1F6VOTMJZ64PlIVSWoYzNz4LVmn5pEcUq+IfstYDwYo=";
         };
       };
     in
@@ -21,13 +21,13 @@
     let
       self = {
         pname = "vulkan-headers";
-        version = "1.3.300";
+        version = "1.4.317";
 
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "Vulkan-Headers";
           tag = "v${self.version}";
-          hash = "sha256-6J+6yvbEQXLY+Wkf1pWKtUAZGbe5Tc01uVh3Wqmk2+8=";
+          hash = "sha256-ezNthwKsnXehQfrQh0zTk6Zrz3JgdqjYu68abYUWIik=";
         };
       };
     in
@@ -35,13 +35,13 @@
 
   qmvk = {
     pname = "qmvk";
-    version = "0-unstable-2025-06-05";
+    version = "0-unstable-2025-09-02";
 
     src = fetchFromGitHub {
       owner = "zaps166";
       repo = "QmVk";
-      rev = "754e6ca4b65433cb500a797e86d48d899d5a41c2";
-      hash = "sha256-t4fGIfZhZE8ShQGa1zMJLpnvCEfCdCeAWOKwF4+nFSw=";
+      rev = "0225dc851afaf39be2b92f91d4316e866f4b6133";
+      hash = "sha256-W2102+X+gE/9ghdAwWBeWYmSkSdp6lLPx4IKaQpLANI=";
     };
   };
 }
diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/by-name/qn/qnotero/package.nix
similarity index 97%
rename from pkgs/applications/office/qnotero/default.nix
rename to pkgs/by-name/qn/qnotero/package.nix
index 2db93f97da52..65a00daf6cba 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/by-name/qn/qnotero/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonPackage rec {
@@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = [
     python3Packages.pyqt5
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   patchPhase = ''
diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index 5e8ae9bec2ef..ab8083942882 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -4,43 +4,56 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  qovery-cli,
-  testers,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "qovery-cli";
-  version = "1.2.6";
+  version = "1.53.0";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = "qovery-cli";
-    tag = "v${version}";
-    hash = "sha256-NxrhZmRbkQNj2K4b6Em4cAdssJRdwEKbdGy8EThN4JY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-kE45z/uObUcmjiYm7zO14Lhroe7PkD0pSYnRw4HbHcc=";
   };
 
-  vendorHash = "sha256-GKW89qzyuvwCUvN0i+LgU36Vtr5XuvgXIxwnMlGSTFg=";
+  vendorHash = "sha256-TDvlICfKLtrG/0KPpfrN61wpUZejaJGiRR4DUBNEllY=";
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [ "-X github.com/qovery/qovery-cli/utils.Version=v${finalAttrs.version}" ];
 
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd ${pname} \
-      --bash <($out/bin/${pname} completion bash) \
-      --fish <($out/bin/${pname} completion fish) \
-      --zsh <($out/bin/${pname} completion zsh)
+    installShellCompletion --cmd qovery-cli \
+      --bash <($out/bin/qovery-cli completion bash) \
+      --fish <($out/bin/qovery-cli completion fish) \
+      --zsh <($out/bin/qovery-cli completion zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = qovery-cli;
-    command = "HOME=$(mktemp -d); ${pname} version";
-  };
+  # need network
+  doCheck = false;
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  versionCheckKeepEnvironment = [ "HOME" ];
+
+  versionCheckProgramArg = "version";
 
   meta = {
     description = "Qovery Command Line Interface";
     homepage = "https://github.com/Qovery/qovery-cli";
-    changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${version}";
+    changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "qovery-cli";
   };
-}
+})
diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 0a0666dbd724..ca20001ba823 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.10.1";
+  version = "25.11.1";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fH8lLVp8u9cL8bWy2SJGZWdh9gbLMw5MZgw6M4rSr+4=";
+    hash = "sha256-6U+UYF45Nv6cX9ghSmOBQF13HxgcwTbBDnDMLr9jxXY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qp/qpdf/package.nix b/pkgs/by-name/qp/qpdf/package.nix
index 82c7ded43f25..e5f5ccc8df14 100644
--- a/pkgs/by-name/qp/qpdf/package.nix
+++ b/pkgs/by-name/qp/qpdf/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qpdf";
-  version = "11.10.1";
+  version = "12.2.0";
 
   src = fetchFromGitHub {
     owner = "qpdf";
     repo = "qpdf";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-MkJpbAIoPZmsYupOjQKOwZomh/rUF+r/kKTdHfT5Dc8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tzOZVQ/XO2mWNtz3mFTdrpdD2PvvCwje5nbEyiIkcZw=";
   };
 
   outputs = [
@@ -88,10 +88,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://qpdf.sourceforge.io/";
     description = "C++ library and set of programs that inspect and manipulate the structure of PDF files";
     license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.dotlambda ];
     mainProgram = "qpdf";
     platforms = lib.platforms.all;
-    changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog";
+    changelog = "https://qpdf.readthedocs.io/en/${lib.versions.majorMinor finalAttrs.version}/release-notes.html";
     pkgConfigModules = [ "libqpdf" ];
   };
 })
diff --git a/pkgs/by-name/qp/qpid-cpp/package.nix b/pkgs/by-name/qp/qpid-cpp/package.nix
index 61f415e6480b..53e52140f2ae 100644
--- a/pkgs/by-name/qp/qpid-cpp/package.nix
+++ b/pkgs/by-name/qp/qpid-cpp/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     sed -i '/managementgen/d' CMakeLists.txt
     sed -i '/ENV/d' src/CMakeLists.txt
     sed -i '/management/d' CMakeLists.txt
+
+    substituteInPlace {./,examples/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_policy(SET CMP0022 OLD)" ""
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (
diff --git a/pkgs/applications/audio/qpwgraph/default.nix b/pkgs/by-name/qp/qpwgraph/package.nix
similarity index 76%
rename from pkgs/applications/audio/qpwgraph/default.nix
rename to pkgs/by-name/qp/qpwgraph/package.nix
index 361db3c008ad..9bb5f30d00ff 100644
--- a/pkgs/applications/audio/qpwgraph/default.nix
+++ b/pkgs/by-name/qp/qpwgraph/package.nix
@@ -4,12 +4,9 @@
   fetchFromGitLab,
   cmake,
   pkg-config,
-  wrapQtAppsHook,
-  qtbase,
-  qtsvg,
-  qtwayland,
   alsa-lib,
   pipewire,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,27 +17,27 @@ stdenv.mkDerivation (finalAttrs: {
     domain = "gitlab.freedesktop.org";
     owner = "rncbc";
     repo = "qpwgraph";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-zhp6Mkb8iQF8tGXkYu+lgbMUNN/fk/gWBhzeDS4myJ0=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtsvg
-    qtwayland
+    kdePackages.qtbase
+    kdePackages.qtsvg
+    kdePackages.qtwayland
     alsa-lib
     pipewire
   ];
 
   cmakeFlags = [ "-DCONFIG_WAYLAND=ON" ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt graph manager for PipeWire, similar to QjackCtl";
     longDescription = ''
       qpwgraph is a graph manager dedicated for PipeWire,
@@ -48,9 +45,9 @@ stdenv.mkDerivation (finalAttrs: {
       the same of QjackCtl.
     '';
     homepage = "https://gitlab.freedesktop.org/rncbc/qpwgraph";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       kanashimia
       exi
       Scrumplex
diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index f5933b5ae267..b96313a53e87 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -37,6 +37,7 @@ let
   pname = "qq";
   inherit (source) version src;
   passthru = {
+    # nixpkgs-update: no auto update
     updateScript = ./update.sh;
   };
   meta = {
diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 4580d8932b2a..5197817bb9cc 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-10-11
+# Last updated: 2025-11-05
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.81-2025-09-29";
+    version = "6.9.83-2025-11-05";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.81_250929_01.dmg";
-      hash = "sha256-OfHkY+hf1ZOKWnq+YewuweFz0+Qiib4KB37SuA2p7yg=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.83_251105_01.dmg";
+      hash = "sha256-/tXuL9WszgWSIFpBSQnmAhRnhNNrK4qCf4uVgBC/DBk=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.19-2025-09-04";
+    version = "3.2.21-2025-11-05";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_arm64_01.deb";
-      hash = "sha256-OqBRxDfTz9w4cFeDSKeysPlqxaJtrp96PZieXnsjGhA=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_arm64_01.deb";
+      hash = "sha256-THK5bjq3fGJiGndvIwq+o7t0gKGtthd9JNXf0A0RwCs=";
     };
   };
   x86_64-linux = {
-    version = "3.2.19-2025-09-04";
+    version = "3.2.21-2025-11-05";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_amd64_01.deb";
-      hash = "sha256-5M3kykJCmFZZ0VTG/K+nYRt7SIUzvc3O6yPW8ebx45A=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_amd64_01.deb";
+      hash = "sha256-ERQB+fuf0HBR0TOOGauA+38Qz0QaeoH0EdyICeDe7eY=";
     };
   };
 }
diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 2856348749d0..deaef3d36bb4 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qrtool";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I/LyDHV3pbRj+utzJBLvkgstEOodLkvfQT6uMLnOEgM=";
+    hash = "sha256-ckdtmnUupnKAaspLm/l+nmPNdQ/sFAusQehzWikxq7A=";
   };
 
-  cargoHash = "sha256-c1sw0zyJZDvJe3Hcn1W4UPkqTKqRhywHpR6HLrqAN+A=";
+  cargoHash = "sha256-RGEHsMay7+sjmrKz4g6uFXt6fUFiu0xIjr4fQaARKIM=";
 
   nativeBuildInputs = [
     asciidoctor
diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/by-name/qs/qsampler/package.nix
similarity index 66%
rename from pkgs/applications/audio/qsampler/default.nix
rename to pkgs/by-name/qs/qsampler/package.nix
index 46e7a5c7fea3..1abc916de994 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/by-name/qs/qsampler/package.nix
@@ -1,23 +1,22 @@
 {
   lib,
+  stdenv,
   fetchurl,
   autoconf,
   automake,
   libtool,
   pkg-config,
-  qttools,
   liblscp,
   libgig,
-  qtbase,
-  mkDerivation,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qsampler";
   version = "0.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qsampler/qsampler-${finalAttrs.version}.tar.gz";
     sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j";
   };
 
@@ -26,24 +25,25 @@ mkDerivation rec {
     automake
     libtool
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     liblscp
     libgig
-    qtbase
+    libsForQt5.qtbase
   ];
 
   preConfigure = "make -f Makefile.svn";
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.linuxsampler.org";
     description = "Graphical frontend to LinuxSampler";
     mainProgram = "qsampler";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/qs/qscreenshot/package.nix b/pkgs/by-name/qs/qscreenshot/package.nix
index 9c8beae294a3..41d0c52cd6c5 100644
--- a/pkgs/by-name/qs/qscreenshot/package.nix
+++ b/pkgs/by-name/qs/qscreenshot/package.nix
@@ -27,6 +27,12 @@ stdenv.mkDerivation {
     libsForQt5.qtbase
     libsForQt5.qtx11extras
   ];
+
+  postPatch = ''
+    substituteInPlace qScreenshot/{CMakeLists.txt,cmake/modules/version.cmake} \
+      --replace-fail "cmake_minimum_required( VERSION 3.2.0 )" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Simple creation and editing of screenshots";
     mainProgram = "qScreenshot";
@@ -34,5 +40,7 @@ stdenv.mkDerivation {
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.bjornfor ];
+    # last successful hydra build on darwin was in 2019
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/qs/qstopmotion/package.nix b/pkgs/by-name/qs/qstopmotion/package.nix
index 83913cf2905a..52e0d17f564b 100644
--- a/pkgs/by-name/qs/qstopmotion/package.nix
+++ b/pkgs/by-name/qs/qstopmotion/package.nix
@@ -67,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail \
         "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
-        "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia"
+        "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" \
+      --replace-fail \
+        "cmake_minimum_required(VERSION 3.0.2)" \
+        "cmake_minimum_required(VERSION 3.5)"
     grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
   '';
 
diff --git a/pkgs/by-name/qs/qsv/package.nix b/pkgs/by-name/qs/qsv/package.nix
index 1e0f3a043df7..849f86fb4704 100644
--- a/pkgs/by-name/qs/qsv/package.nix
+++ b/pkgs/by-name/qs/qsv/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   fetchFromGitHub,
   file,
   lib,
@@ -7,6 +8,27 @@
   sqlite,
   zstd,
   cmake,
+  python3,
+  wayland,
+  withPolars ? true,
+  withPython ? stdenv.buildPlatform == stdenv.hostPlatform,
+  withUi ? true,
+  buildFeatures ?
+    # enable all features except self_update by default
+    # https://github.com/dathere/qsv/blob/7.1.0/Cargo.toml#L370
+    [
+      "apply"
+      "feature_capable"
+      "fetch"
+      "foreach"
+      "geocode"
+      "luau"
+      "to"
+    ]
+    ++ lib.optional withPolars "polars"
+    ++ lib.optional withPython "python"
+    ++ lib.optional withUi "ui",
+  mainProgram ? "qsv",
 }:
 
 let
@@ -14,7 +36,7 @@ let
   version = "7.1.0";
 in
 rustPlatform.buildRustPackage {
-  inherit pname version;
+  inherit pname version buildFeatures;
 
   src = fetchFromGitHub {
     owner = "dathere";
@@ -29,30 +51,15 @@ rustPlatform.buildRustPackage {
     file
     sqlite
     zstd
-  ];
+  ]
+  ++ lib.optional (lib.elem "ui" buildFeatures && stdenv.hostPlatform.isLinux) wayland;
 
   nativeBuildInputs = [
     pkg-config
     rustPlatform.bindgenHook
     cmake
-  ];
-
-  buildFeatures = [
-    "apply"
-    "feature_capable"
-    "fetch"
-    "foreach"
-    "geocode"
-    "to"
-  ];
-
-  checkFeatures = [
-    "apply"
-    "feature_capable"
-    "fetch"
-    "foreach"
-    "geocode"
-  ];
+  ]
+  ++ lib.optional (lib.elem "python" buildFeatures) python3;
 
   doCheck = false;
 
@@ -69,8 +76,10 @@ rustPlatform.buildRustPackage {
       # or
       unlicense
     ];
+    inherit mainProgram;
     maintainers = with lib.maintainers; [
       detroyejr
+      misuzu
     ];
   };
 }
diff --git a/pkgs/by-name/qs/qsvlite/package.nix b/pkgs/by-name/qs/qsvlite/package.nix
new file mode 100644
index 000000000000..9e82c69730f2
--- /dev/null
+++ b/pkgs/by-name/qs/qsvlite/package.nix
@@ -0,0 +1,5 @@
+{ qsv }:
+qsv.override {
+  buildFeatures = [ "lite" ];
+  mainProgram = "qsvlite";
+}
diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/by-name/qs/qsynth/package.nix
similarity index 61%
rename from pkgs/applications/audio/qsynth/default.nix
rename to pkgs/by-name/qs/qsynth/package.nix
index 2b73e80a1732..310ce39a4550 100644
--- a/pkgs/applications/audio/qsynth/default.nix
+++ b/pkgs/by-name/qs/qsynth/package.nix
@@ -7,42 +7,39 @@
   libjack2,
   cmake,
   pkg-config,
-  qtbase,
-  qttools,
-  qtx11extras,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qsynth";
   version = "1.0.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qsynth/qsynth-${finalAttrs.version}.tar.gz";
     hash = "sha256-z4l+Ku3oEQV3NunkogyxzaSKhFJuYhIxlExJsACcumY=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     fluidsynth
     libjack2
-    qtbase
-    qttools
-    qtx11extras
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtx11extras
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Fluidsynth GUI";
     mainProgram = "qsynth";
     homepage = "https://sourceforge.net/projects/qsynth";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/games/qtads/default.nix b/pkgs/by-name/qt/qtads/package.nix
similarity index 58%
rename from pkgs/games/qtads/default.nix
rename to pkgs/by-name/qt/qtads/package.nix
index 90f6652ac658..ae92c2f70003 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/by-name/qt/qtads/package.nix
@@ -1,31 +1,31 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   SDL2,
   fluidsynth,
   libsndfile,
   libvorbis,
   mpg123,
-  qtbase,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtads";
   version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "realnc";
     repo = "qtads";
-    rev = "v${version}";
-    sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -34,15 +34,15 @@ mkDerivation rec {
     libsndfile
     libvorbis
     mpg123
-    qtbase
+    qt5.qtbase
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://realnc.github.io/qtads/";
     description = "Multimedia interpreter for TADS games";
     mainProgram = "qtads";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})
diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
index e2d5d08587ee..d052eca2251d 100644
--- a/pkgs/by-name/qt/qtalarm/package.nix
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtalarm";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "CountMurphy";
     repo = "QTalarm";
     tag = finalAttrs.version;
-    hash = "sha256-lliVj9OaddkQgSzJ8F6A06V/seRnDqGJkxj4cKoDdyo=";
+    hash = "sha256-IN/XdR8J5uMIAjb1G2kzuLDtO972RLKSy3Ceh9CcHWw=";
   };
 
   buildInputs = [
diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/by-name/qt/qtrvsim/package.nix
similarity index 90%
rename from pkgs/applications/science/computer-architecture/qtrvsim/default.nix
rename to pkgs/by-name/qt/qtrvsim/package.nix
index 19e76f532765..52f3379e2057 100644
--- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix
+++ b/pkgs/by-name/qt/qtrvsim/package.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +19,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "RISC-V CPU simulator for education purposes";
diff --git a/pkgs/by-name/qu/QuadProgpp/package.nix b/pkgs/by-name/qu/QuadProgpp/package.nix
index d7306f01ba98..35bab2a1eec9 100644
--- a/pkgs/by-name/qu/QuadProgpp/package.nix
+++ b/pkgs/by-name/qu/QuadProgpp/package.nix
@@ -20,6 +20,13 @@ stdenv.mkDerivation {
     cmake
   ];
 
+  postPatch = ''
+    # Inline https://github.com/liuq/QuadProgpp/pull/32
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.0)' \
+      'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   meta = with lib; {
     description = "C++ library for Quadratic Programming";
     longDescription = ''
diff --git a/pkgs/by-name/qu/quadrapassel/package.nix b/pkgs/by-name/qu/quadrapassel/package.nix
index 0efef1f7a502..87259d17b568 100644
--- a/pkgs/by-name/qu/quadrapassel/package.nix
+++ b/pkgs/by-name/qu/quadrapassel/package.nix
@@ -3,71 +3,68 @@
   lib,
   fetchurl,
   pkg-config,
-  gtk3,
+  gtk4,
+  libadwaita,
+  libgee,
+  pango,
   gnome,
-  adwaita-icon-theme,
   gdk-pixbuf,
   librsvg,
   gsound,
   libmanette,
-  gettext,
   itstool,
-  libxml2,
-  clutter,
-  clutter-gtk,
-  wrapGAppsHook3,
+  blueprint-compiler,
+  wrapGAppsHook4,
   meson,
   ninja,
-  python3,
   vala,
   desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quadrapassel";
-  version = "40.2";
+  version = "49.0";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/quadrapassel/${lib.versions.major version}/quadrapassel-${version}.tar.xz";
-    hash = "sha256-C9giQUIHxzEj7WpJ9yPaWsjdTfXTXtwJn/6i4TmcwAo=";
+    url = "mirror://gnome/sources/quadrapassel/${lib.versions.major finalAttrs.version}/quadrapassel-${finalAttrs.version}.tar.xz";
+    hash = "sha256-VFMe3w+apmk2qjQHmvzCpcAAJfQBaMr7frsduPJC7uE=";
   };
 
   nativeBuildInputs = [
     meson
     ninja
-    python3
     vala
     desktop-file-utils
     pkg-config
-    adwaita-icon-theme
-    libxml2
     itstool
-    gettext
-    wrapGAppsHook3
+    blueprint-compiler
+    wrapGAppsHook4
   ];
 
   buildInputs = [
-    gtk3
+    gtk4
+    libadwaita
+    libgee
+    pango
     gdk-pixbuf
     librsvg
     libmanette
     gsound
-    clutter
-    libxml2
-    clutter-gtk
   ];
 
   passthru = {
-    updateScript = gnome.updateScript { packageName = "quadrapassel"; };
+    updateScript = gnome.updateScript {
+      packageName = "quadrapassel";
+    };
   };
 
   meta = {
     description = "Classic falling-block game, Tetris";
     mainProgram = "quadrapassel";
     homepage = "https://gitlab.gnome.org/GNOME/quadrapassel";
-    changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${version}/NEWS?ref_type=tags";
+    changelog = "https://gitlab.gnome.org/GNOME/quadrapassel/-/blob/${finalAttrs.version}/NEWS?ref_type=tags";
     license = lib.licenses.gpl2Plus;
     teams = [ lib.teams.gnome ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/by-name/qu/quakespasm/package.nix
similarity index 90%
rename from pkgs/games/quakespasm/default.nix
rename to pkgs/by-name/qu/quakespasm/package.nix
index 8b669b489773..d76476cce0e1 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/by-name/qu/quakespasm/package.nix
@@ -20,16 +20,16 @@
   useSDL2 ? stdenv.hostPlatform.isDarwin, # TODO: CoreAudio fails to initialize with SDL 1.x for some reason.
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quakespasm";
   version = "0.96.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
-    sha256 = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
+    url = "mirror://sourceforge/quakespasm/quakespasm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
   };
 
-  sourceRoot = "${pname}-${version}/Quake";
+  sourceRoot = "quakespasm-${finalAttrs.version}/Quake";
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
     # Makes Darwin Makefile use system libraries instead of ones from app bundle
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Engine for iD software's Quake";
     homepage = "https://quakespasm.sourceforge.net/";
     longDescription = ''
@@ -125,8 +125,8 @@ stdenv.mkDerivation rec {
       and smoother mouse input - though no CD support.
     '';
 
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mikroskeem ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ mikroskeem ];
     mainProgram = "quake";
   };
-}
+})
diff --git a/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch b/pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
similarity index 100%
rename from pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch
rename to pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix
index b30f8a02ec6b..dd896003c073 100644
--- a/pkgs/by-name/qu/quantframe/package.nix
+++ b/pkgs/by-name/qu/quantframe/package.nix
@@ -17,13 +17,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "quantframe";
-  version = "1.5.3";
+  version = "1.5.9";
 
   src = fetchFromGitHub {
     owner = "Kenya-DK";
     repo = "quantframe-react";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-afTiQzHat6k+BF8EhYhd0o0FzYjq7GpnOnjRhjXASG8=";
+    hash = "sha256-jrGDgK/Z9oLSvtFfC+uIs0vj4Nku4Sp/bdR1MX/SK2E=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix
index 978bd6a8ecd1..865eb860f44c 100644
--- a/pkgs/by-name/qu/quantlib/package.nix
+++ b/pkgs/by-name/qu/quantlib/package.nix
@@ -4,11 +4,12 @@
   fetchFromGitHub,
   cmake,
   boost,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quantlib";
-  version = "1.39";
+  version = "1.40";
 
   outputs = [
     "out"
@@ -19,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "lballabio";
     repo = "QuantLib";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-UrFamEIeFTR0finNGESlDYbvrmD8jtv73tDUJ17P7WA=";
+    hash = "sha256-cyri+kCwIFO/ccnqWhO8qOXNPIV0g6iiNvBYtN667pA=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -33,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp ./quantlib-config $out/bin/
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Free/open-source library for quantitative finance";
     homepage = "https://quantlib.org";
diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index b86793c4208e..7ca69a5dbdf0 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.28.3";
+  version = "3.28.5";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ulB6jy3J1vKe1rO17p8Vw0V8C/sDcXYcuu6b2e3L6Ps=";
+    hash = "sha256-uXDZIFqH+PgI0MSZb3SYFpQm2XMFdXBdPZrjb7DT1Bg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
index 2349d765b3cd..68121d1a14ce 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
@@ -35,9 +35,7 @@ let
       }) supportedDevices
     );
 
-  unsupportedDeviceIds = lib.filterAttrs (
-    name: value: !(lib.hasAttr name supportedDeviceIds)
-  ) deviceIds;
+  unsupportedDeviceIds = lib.removeAttrs deviceIds (lib.attrNames supportedDeviceIds);
 
   componentHashes = {
     "arria_lite" = "sha256-ASvi9YX15b4XXabGjkuR5wl9wDwCijl8s750XTR/4XU=";
diff --git a/pkgs/by-name/qu/quba/package.nix b/pkgs/by-name/qu/quba/package.nix
index 18e95f6bc801..0b3cf029a91b 100644
--- a/pkgs/by-name/qu/quba/package.nix
+++ b/pkgs/by-name/qu/quba/package.nix
@@ -4,11 +4,20 @@
   appimageTools,
   fetchurl,
   _7zz,
+  writeShellScript,
+  nix-update,
+  common-updater-scripts,
 }:
 
 let
   pname = "quba";
-  version = "1.4.2";
+  version = "1.5.0";
+
+  passthru.updateScript = writeShellScript "update-quiet" ''
+    ${lib.getExe nix-update} --system=x86_64-linux quba
+    hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . quba.src.url --system aarch64-darwin)))
+    ${lib.getExe' common-updater-scripts "update-source-version"} quba $(nix eval --raw --file . quba.version) $hash --system=aarch64-darwin --ignore-same-version
+  '';
 
   meta = {
     description = "Viewer for electronic invoices";
@@ -22,16 +31,17 @@ let
 
   src = fetchurl {
     url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}.AppImage";
-    hash = "sha256-3goMWN5GeQaLJimUKbjozJY/zJmqc9Mvy2+6bVSt1p0=";
+    hash = "sha256-xB1r8DNFOFQQx+MeGC1mWhf7PuMavM7DyYRBlEjAZ8k=";
   };
 
-  appimageContents = appimageTools.extractType1 { inherit pname version src; };
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 
-  linux = appimageTools.wrapType1 {
+  linux = appimageTools.wrapType2 {
     inherit
       pname
       version
       src
+      passthru
       meta
       ;
 
@@ -44,11 +54,16 @@ let
   };
 
   darwin = stdenvNoCC.mkDerivation {
-    inherit pname version meta;
+    inherit
+      pname
+      version
+      passthru
+      meta
+      ;
 
     src = fetchurl {
       url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}-universal.dmg";
-      hash = "sha256-q7va2D9AT0BoPhfkub/RFQxGyF12uFaCDpSYIxslqMc=";
+      hash = "sha256-niuU1zkxNRmCYxzto3g6i6Z3k5KCAgVIVQMgOLZJnSE=";
     };
 
     unpackCmd = "7zz x -bd -osource -xr'!*/Applications' -xr'!*com.apple.provenance' $curSrc";
diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
index 90d33fe895fb..897e32a43797 100644
--- a/pkgs/by-name/qu/questdb/package.nix
+++ b/pkgs/by-name/qu/questdb/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "questdb";
-  version = "9.0.3";
+  version = "9.1.0";
 
   src = fetchurl {
     url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
-    hash = "sha256-/EkqBK/mero219VUylNLVGD1ZzxBMAYpJ7NcU7BC+aw=";
+    hash = "sha256-bgeNZi0VonO+L9Vww5n6e0ZOLl9MTXnNe2kPLttbw1c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix
index 15c563d00844..a96fd2804048 100644
--- a/pkgs/by-name/qu/quickjs-ng/package.nix
+++ b/pkgs/by-name/qu/quickjs-ng/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs-ng";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "quickjs-ng";
     repo = "quickjs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WtjHyqxibP6bAO9HsXuqAW/Y1qgt/Tpj401CIk4bY7o=";
+    hash = "sha256-Mb0YyxTWU6a8HFTVBmlJ5yGEDmjKXHqTSszAvb8Y01U=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/qu/quickjs/package.nix b/pkgs/by-name/qu/quickjs/package.nix
index 339195f5db76..c687be6be8a2 100644
--- a/pkgs/by-name/qu/quickjs/package.nix
+++ b/pkgs/by-name/qu/quickjs/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs";
-  version = "2025-04-26";
+  version = "2025-09-13-2";
 
   src = fetchurl {
     url = "https://bellard.org/quickjs/quickjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LyAHTCUWbvb3gfOBxQ1XtQLLhdRw1jmrzOu+95VMg78=";
+    hash = "sha256-mWxrUBj8lVrU0GQm0OnLcTaFoAyCWqXAQYvVP334sLQ=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix
index 44e661d7c1c9..ecf3371104b7 100644
--- a/pkgs/by-name/qu/quiet/package.nix
+++ b/pkgs/by-name/qu/quiet/package.nix
@@ -5,11 +5,15 @@
   appimageTools,
   makeWrapper,
   _7zz,
+  writeShellScript,
+  curl,
+  jq,
+  common-updater-scripts,
 }:
 
 let
   pname = "quiet";
-  version = "6.0.0";
+  version = "6.3.0";
 
   meta = {
     description = "Private, p2p alternative to Slack and Discord built on Tor & IPFS";
@@ -19,25 +23,36 @@ let
     maintainers = with lib.maintainers; [ kashw2 ];
   };
 
+  passthru.updateScript = writeShellScript "update-quiet" ''
+    latestVersion=$(${lib.getExe curl} --fail --location --silent https://api.github.com/repos/TryQuiet/quiet/releases/latest | ${lib.getExe jq} '.tag_name | ltrimstr("@quiet/desktop@")' --raw-output)
+    currentVersion=$(nix eval --raw --file . quiet.version)
+    if [[ "$latestVersion" == "$currentVersion" ]]; then
+      exit 0
+    fi
+    ${lib.getExe' common-updater-scripts "update-source-version"} quiet $latestVersion --system=x86_64-linux --ignore-same-hash
+    hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . quiet.src.url --system aarch64-darwin)))
+    ${lib.getExe' common-updater-scripts "update-source-version"} quiet $latestVersion $hash --system=aarch64-darwin --ignore-same-version --ignore-same-hash
+  '';
+
   linux = appimageTools.wrapType2 {
-    inherit pname version;
+    inherit pname version passthru;
 
     src = fetchurl {
       url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage";
-      hash = "sha256-YIkbS3L6DIof9gsgHKaguHIwGggVLjQXPM8o7810Wgs=";
+      hash = "sha256-LRUm2QMYg2oD6USOUYRyNUDf1VHu2txsaCUhbi1Ar5o=";
     };
 
     meta = meta // {
-      platforms = lib.platforms.linux;
+      platforms = [ "x86_64-linux" ];
     };
   };
 
   darwin = stdenv.mkDerivation {
-    inherit pname version;
+    inherit pname version passthru;
 
     src = fetchurl {
       url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.dmg";
-      hash = "sha256-B1rT+6U0gjScr1FPuh3xGxkpfumT/8feTJbEbCgXPpo=";
+      hash = "sha256-T3EDgQ2DhYttbRjAklhw/C4paUzkdEx6i6Gi+Jx1N+w=";
     };
 
     nativeBuildInputs = [
diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix
index 16d72d333320..daca00bd5a21 100644
--- a/pkgs/by-name/qu/quill-log/package.nix
+++ b/pkgs/by-name/qu/quill-log/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quill-log";
-  version = "10.1.0";
+  version = "10.2.0";
 
   src = fetchFromGitHub {
     owner = "odygrd";
     repo = "quill";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nCU+7y2ssvV8VDxQ51fjG4d/vsmWRkHpWWoUaXNTQcQ=";
+    hash = "sha256-BgUKxUKAaDRGm8OazhMDAfzbJSGXyScpJ5YR8lz5u6c=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/qu/quisk/package.nix b/pkgs/by-name/qu/quisk/package.nix
index 79079cd67322..82bdbce848ca 100644
--- a/pkgs/by-name/qu/quisk/package.nix
+++ b/pkgs/by-name/qu/quisk/package.nix
@@ -9,12 +9,12 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "quisk";
-  version = "4.2.44";
+  version = "4.2.46";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OSGrLbCS255e/btagD7RCVpLpyIX1jveeJnzIwyegH4=";
+    hash = "sha256-Tp6ctOZLGYyRe3q5EU1dZjAZTCXTsHywFzE5jKF2Ssc=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/qu/quorum/package.nix b/pkgs/by-name/qu/quorum/package.nix
deleted file mode 100644
index bf90365276b1..000000000000
--- a/pkgs/by-name/qu/quorum/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  buildGoModule,
-  nixosTests,
-}:
-
-buildGoModule rec {
-  pname = "quorum";
-  version = "24.4.1";
-
-  src = fetchFromGitHub {
-    owner = "Consensys";
-    repo = "quorum";
-    rev = "v${version}";
-    hash = "sha256-pW8I4ivcKo6dsa8rQVKU6nUZuKxaki/7cMDKwEsSzNw=";
-  };
-
-  vendorHash = "sha256-YK2zpQz4pAFyA+aHOn6Nx0htl5SJ2HNC+TDV1RdLQJk=";
-
-  subPackages = [
-    "cmd/geth"
-    "cmd/bootnode"
-  ];
-
-  ldflags = [
-    "-s"
-    "-w"
-  ];
-
-  passthru.tests = { inherit (nixosTests) quorum; };
-
-  meta = with lib; {
-    description = "Permissioned implementation of Ethereum supporting data privacy";
-    homepage = "https://consensys.net/quorum/";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ mmahut ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index e8ee8dc2f6cc..9d364f64eba3 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -26,15 +26,15 @@ let
   isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
   pdfjs =
     let
-      version = "5.3.31";
+      version = "5.4.296";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-8QNFCIRSaF0y98P1mmx0u+Uf0/Zd7nYlFGXp9SkURTc=";
+      hash = "sha256-UQ7sYOh7s95mfzH2ZbfDyEvUZiXr7MI3u0WY8WNHWv4=";
       stripRoot = false;
     };
 
-  version = "3.5.1";
+  version = "3.6.1";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-gmu6MooINXJI1eWob6qwpzZVSXQ5rVTSaeISBVkms44=";
+    hash = "sha256-9b31UPJzmsGCXmCAIb+8XMEjKnvFIEO0MozWluHYbZA=";
   };
 
   # Needs tox
diff --git a/pkgs/by-name/qv/qview/package.nix b/pkgs/by-name/qv/qview/package.nix
index d3c1fcea9d0d..58b7f1c92e74 100644
--- a/pkgs/by-name/qv/qview/package.nix
+++ b/pkgs/by-name/qv/qview/package.nix
@@ -2,42 +2,51 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libsForQt5,
+  qt6,
+  nix-update-script,
+  kdePackages,
   x11Support ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qview";
   version = "7.1";
 
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-EcXhwJcgBLdXa/FQ5LuENlzwnLw4Gt2BGlBO1p5U8tI=";
   };
 
-  qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
-
   nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.wrapQtAppsHook
+    qt6.qmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qttools
-    libsForQt5.qtimageformats
-    libsForQt5.qtsvg
-  ]
-  ++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtimageformats
+    qt6.qtsvg
+    kdePackages.kimageformats
+  ];
 
-  meta = with lib; {
+  qmakeFlags = [
+    # See https://github.com/NixOS/nixpkgs/issues/214765
+    "QT_TOOL.lrelease.binary=${lib.getDev qt6.qttools}/bin/lrelease"
+  ]
+  ++ lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Practical and minimal image viewer";
     mainProgram = "qview";
+    changelog = "https://github.com/jurplel/qView/releases/tag/${finalAttrs.version}";
     homepage = "https://interversehq.com/qview/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ acowley ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ acowley ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch b/pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch
deleted file mode 100644
index 9dade6622787..000000000000
--- a/pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0735b59eba183574e080d2912347d58e6e3d158e Mon Sep 17 00:00:00 2001
-From: Sergey Volkov <taranarmo@gmail.com>
-Date: Fri, 12 Sep 2025 20:06:24 +0200
-Subject: [PATCH] Add missing resolved and integrity fields to several packages
-
----
- package-lock.json | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/package-lock.json b/package-lock.json
-index 146686dc..9ad9009f 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -12574,6 +12574,8 @@
-     },
-     "packages/cli/node_modules/@testing-library/dom": {
-       "version": "10.4.0",
-+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
-+      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
-       "dev": true,
-       "license": "MIT",
-       "peer": true,
-@@ -12609,6 +12611,8 @@
-     },
-     "packages/cli/node_modules/@testing-library/react": {
-       "version": "16.3.0",
-+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",
-+      "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -12660,6 +12664,8 @@
-     },
-     "packages/cli/node_modules/aria-query": {
-       "version": "5.3.0",
-+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-       "dev": true,
-       "license": "Apache-2.0",
-       "peer": true,
-@@ -12669,6 +12675,8 @@
-     },
-     "packages/cli/node_modules/emoji-regex": {
-       "version": "10.4.0",
-+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-       "license": "MIT"
-     },
-     "packages/cli/node_modules/react-is": {
-@@ -12681,6 +12689,8 @@
-     },
-     "packages/cli/node_modules/string-width": {
-       "version": "7.2.0",
-+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-       "license": "MIT",
-       "dependencies": {
-         "emoji-regex": "^10.3.0",
-@@ -12815,6 +12825,8 @@
-     },
-     "packages/core/node_modules/ignore": {
-       "version": "7.0.5",
-+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-       "license": "MIT",
-       "engines": {
-         "node": ">= 4"
--- 
-2.51.0
-
diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 3c087d4a58a7..9b8245cbf7c2 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -6,46 +6,40 @@
   jq,
   git,
   ripgrep,
+  pkg-config,
+  glib,
+  libsecret,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.0.14";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Rld6k0MPfOOncK240zOJbcvheV4UKU2yF7luBrTrnFs=";
+    hash = "sha256-go5fjs5aSG6wqxw3y2/OrhPSWGawUjpq+ZxAnVW7Xe8=";
   };
 
-  patches = [
-    # similar to upstream gemini-cli some node deps are missing resolved and integrity fields
-    # upstream the problem is solved in master and in v0.4+, eventually the fix should arrive to qwen
-    ./add-missing-resolved-integrity-fields.patch
-  ];
-
-  npmDepsHash = "sha256-43s13HncNKv4uOKVwNvqIF+Ih3rJBWrpVJnE3hCKD2w=";
+  npmDepsHash = "sha256-UP1pV1CAwGspzUzhHw8yWxIBb7D5jHFdCn7DH4KjdO4=";
 
   nativeBuildInputs = [
     jq
+    pkg-config
+    git
   ];
 
   buildInputs = [
-    git
     ripgrep
+    glib
+    libsecret
   ];
 
   postPatch = ''
-    # Remove @lvce-editor/ripgrep dependency (no network on buildPhase
-    substituteInPlace package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""
-    substituteInPlace packages/core/package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""
-    substituteInPlace packages/core/src/tools/ripGrep.ts \
-      --replace-fail "const { rgPath } = await import('@lvce-editor/ripgrep');" "const rgPath = 'rg';"
-
-    # patches below remove node-pty dependency which causes build fail on Darwin
+    # patches below remove node-pty and keytar dependencies which cause build fail on Darwin
     # should be conditional on platform but since package-lock.json is patched it changes its hash
-    # though seems like this dependency is not really required by the package
+    # though seems like these dependencies are not really required by the package
     ${jq}/bin/jq '
       del(.packages."node_modules/node-pty") |
       del(.packages."node_modules/@lydell/node-pty") |
@@ -55,11 +49,18 @@ buildNpmPackage (finalAttrs: {
       del(.packages."node_modules/@lydell/node-pty-linux-x64") |
       del(.packages."node_modules/@lydell/node-pty-win32-arm64") |
       del(.packages."node_modules/@lydell/node-pty-win32-x64") |
+      del(.packages."node_modules/keytar") |
       walk(
         if type == "object" and has("dependencies") then
-          .dependencies |= with_entries(select(.key | contains("node-pty") | not))
+          .dependencies |= with_entries(select(.key | (contains("node-pty") | not) and (contains("keytar") | not)))
         elif type == "object" and has("optionalDependencies") then
-          .optionalDependencies |= with_entries(select(.key | contains("node-pty") | not))
+          .optionalDependencies |= with_entries(select(.key | (contains("node-pty") | not) and (contains("keytar") | not)))
+        else .
+        end
+      ) |
+      walk(
+        if type == "object" and has("peerDependencies") then
+          .peerDependencies |= with_entries(select(.key | (contains("node-pty") | not) and (contains("keytar") | not)))
         else .
         end
       )
@@ -79,10 +80,14 @@ buildNpmPackage (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/bin $out/share/qwen-code
-    cp -r bundle/* $out/share/qwen-code/
-    cp node_modules/tiktoken/tiktoken_bg.wasm $out/share/qwen-code/
+    cp -r dist/* $out/share/qwen-code/
+    # Install production dependencies only
+    npm prune --production
+    cp -r node_modules $out/share/qwen-code/
+    # Remove broken symlinks that cause issues in Nix environment
+    find $out/share/qwen-code/node_modules -type l -delete || true
     patchShebangs $out/share/qwen-code
-    ln -s $out/share/qwen-code/gemini.js $out/bin/qwen
+    ln -s $out/share/qwen-code/cli.js $out/bin/qwen
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix
index a35ced9b5764..95845b49ffff 100644
--- a/pkgs/by-name/qx/qxmpp/package.nix
+++ b/pkgs/by-name/qx/qxmpp/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qxmpp";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "qxmpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OR/rBp84pXv286Vd0I6IRzeUdC/+nnlRCZMAMXKgyxo=";
+    hash = "sha256-93P4rKBSbs31uofl4AuVQQWVSRVOsKsykIG13p8zIkI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/r2/r2modman/package.nix b/pkgs/by-name/r2/r2modman/package.nix
index 92adebab430e..24eaa117f690 100644
--- a/pkgs/by-name/r2/r2modman/package.nix
+++ b/pkgs/by-name/r2/r2modman/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   yarn,
+  dart-sass,
   fetchYarnDeps,
   fixup-yarn-lock,
   nodejs,
@@ -15,18 +16,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "r2modman";
-  version = "3.2.3";
+  version = "3.2.9";
 
   src = fetchFromGitHub {
     owner = "ebkr";
     repo = "r2modmanPlus";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0LlZsyUSVuDakbNUzJ1ZUBe9KxWNd0ONKkPafwbCINY=";
+    hash = "sha256-rnW8itUsP2a09gQU3IXZI7kSVKIxxCgbt15NoH/g0a8=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-HLVHxjyymi0diurVamETrfwYM2mkUrIOHhbYCrqGkeg=";
+    hash = "sha256-V6N0RIjT3etoP6XdZhnQv4XViLRypp/JWxnb0sBc6Oo=";
   };
 
   patches = [
@@ -36,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     yarn
+    dart-sass
     fixup-yarn-lock
     nodejs
     makeWrapper
@@ -53,6 +55,8 @@ stdenv.mkDerivation (finalAttrs: {
     fixup-yarn-lock yarn.lock
     yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive
     patchShebangs node_modules/
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["${lib.getExe dart-sass}"];'
 
     runHook postConfigure
   '';
diff --git a/pkgs/by-name/ra/rabbitmq-server/package.nix b/pkgs/by-name/ra/rabbitmq-server/package.nix
index 660d517bfe62..4c242a6ed253 100644
--- a/pkgs/by-name/ra/rabbitmq-server/package.nix
+++ b/pkgs/by-name/ra/rabbitmq-server/package.nix
@@ -6,6 +6,7 @@
   python3,
   libxml2,
   libxslt,
+  git,
   xmlto,
   docbook_xml_dtd_45,
   docbook_xsl,
@@ -21,6 +22,7 @@
   glibcLocales,
   nixosTests,
   which,
+  p7zip,
 }:
 
 let
@@ -39,14 +41,14 @@ let
   );
 in
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rabbitmq-server";
-  version = "4.0.9";
+  version = "4.1.4";
 
   # when updating, consider bumping elixir version in all-packages.nix
   src = fetchurl {
-    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-imBxBn8RQS0jBGfT5KLLLt+fKvyybzLzPZu9DpFOos8=";
+    url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${finalAttrs.version}/${finalAttrs.pname}-${finalAttrs.version}.tar.xz";
+    hash = "sha256-dqNdrbXSysYUMN+6gMMb9GXKER/mOGXgW6j3iOLHNks=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +60,7 @@ stdenv.mkDerivation rec {
     rsync
     python3
     which
+    p7zip
   ];
 
   buildInputs = [
@@ -68,6 +71,15 @@ stdenv.mkDerivation rec {
     glibcLocales
   ];
 
+  prePatch = ''
+    # erlang.mk assumes that the elixir lib directory is at the same level as the bin of the elixir binary,
+    # this is not for the Nixpkgs packaging, so patch this
+    substituteInPlace erlang.mk \
+      --replace-fail \
+      "ELIXIR_LIBS ?= $(abspath $(dir $(ELIXIR_BIN))/../lib)" \
+      "ELIXIR_LIBS ?= ${beamPackages.elixir}/lib/elixir/lib"
+  '';
+
   outputs = [
     "out"
     "man"
@@ -129,9 +141,9 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://www.rabbitmq.com/";
     description = "Implementation of the AMQP messaging protocol";
-    changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${version}";
+    changelog = "https://github.com/rabbitmq/rabbitmq-server/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mpl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [ samueltardieu ];
   };
-}
+})
diff --git a/pkgs/by-name/ra/racket/package.nix b/pkgs/by-name/ra/racket/package.nix
index 82be2c38d614..03ed6377f94d 100644
--- a/pkgs/by-name/ra/racket/package.nix
+++ b/pkgs/by-name/ra/racket/package.nix
@@ -87,8 +87,19 @@ minimal.overrideAttrs (
         export XDG_CACHE_HOME=$(mktemp -d)
       '';
 
+    dontWrapGApps = true;
+
     preFixup = lib.optionalString (!isDarwin) ''
       gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
+
+      find $out/bin -type f -executable -print0 |
+          while IFS= read -r -d ''' f; do
+              if test "$(file --brief --mime-type "$f")" = application/x-executable; then
+                  wrapGApp "$f"
+              fi
+          done
+
+      wrapGApp $out/lib/racket/gracket
     '';
 
     passthru =
diff --git a/pkgs/by-name/ra/radian/package.nix b/pkgs/by-name/ra/radian/package.nix
index 07b1bc68d156..ede83464621c 100644
--- a/pkgs/by-name/ra/radian/package.nix
+++ b/pkgs/by-name/ra/radian/package.nix
@@ -2,28 +2,24 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   R,
   rPackages,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "radian";
-  version = "0.6.13";
+  version = "0.6.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = "radian";
     tag = "v${version}";
-    hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
+    hash = "sha256-9dpLQ3QRppvwOw4THASfF8kCkIVZmWLALLRwy1LRPiE=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pytest-runner"' ""
-  '';
-
   build-system = with python3Packages; [
     setuptools
     setuptools-scm
@@ -53,23 +49,25 @@ python3Packages.buildPythonApplication rec {
       ptyprocess
       jedi
     ])
-    ++ [ git ];
+    ++ [
+      gitMinimal
+      writableTmpDirAsHomeHook
+    ];
 
   makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];
 
   preCheck = ''
-    export HOME=$TMPDIR
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib
   '';
 
   pythonImportsCheck = [ "radian" ];
 
-  meta = with lib; {
+  meta = {
     description = "21 century R console";
     mainProgram = "radian";
     homepage = "https://github.com/randy3k/radian";
     changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ savyajha ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ savyajha ];
   };
 }
diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index b820ceef3743..f95d46d1f528 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.5.7";
+  version = "3.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     tag = "v${version}";
-    hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE=";
+    hash = "sha256-kgtNk+MXanYB0RyNncfM3K/HJZlScat7RDuoclu5/i0=";
   };
 
   build-system = with python3.pkgs; [
diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index 7e0200a3bd87..681a4295ec4e 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -2,7 +2,6 @@
   lib,
   rustPlatform,
   fetchFromRadicle,
-  fetchRadiclePatch,
   radicle-node,
   gitMinimal,
   versionCheckHook,
@@ -10,25 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-job";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromRadicle {
     seed = "iris.radicle.xyz";
     repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
     tag = "releases/v${finalAttrs.version}";
-    hash = "sha256-6UrkKyIdSM5lSYNF/A3xIf3FGiM2pB/5s7F49jtn0KE=";
+    hash = "sha256-EGNs0IOJSp5SMJ3tdGCxIAN6hvVFwWWUmXoB914jw3k=";
   };
 
-  patches = [
-    # https://app.radicle.xyz/nodes/rosa.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/patches/dac4fef89d07fe609dd5d3d75ea57f76f1cca3dc
-    (fetchRadiclePatch {
-      inherit (finalAttrs.src) seed repo;
-      revision = "dac4fef89d07fe609dd5d3d75ea57f76f1cca3dc";
-      hash = "sha256-oFUkiBIqAa/DWqlTZw0LzHbgK/uhWik8qbRcGcGpkDY=";
-    })
-  ];
-
-  cargoHash = "sha256-5GjLqs4ol7lUE96KwtE7W3lxL9H/A/0yDpiMDiLQDeY=";
+  cargoHash = "sha256-+DD2cGfxN0rmFhCazEuRiv3JfLXIC4FjaYHmugCmk+g=";
 
   nativeCheckInputs = [
     radicle-node
diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index 815440dd5145..edebe08a30fe 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -7,23 +7,25 @@
   additionalPrograms ? [ ],
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "raffi";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
-    rev = "v${version}";
-    hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-k0NJEv76f33yd+mtCJ7bxzaT3UAn0TOaLC/HlzEXUyo=";
   };
 
-  cargoHash = "sha256-1n0JQdeExszuGFbpkBRT44eMov/x3BrIeofObdPNNdU=";
+  cargoHash = "sha256-udXVIV6qDmpLR2QNF+/h69WNGbe7QRDD5YWQ3Sl5Ol0=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
   ];
 
+  checkFlags = [ "--skip=tests::test_read_config_from_reader" ];
+
   postFixup = ''
     wrapProgram $out/bin/raffi \
       --prefix PATH : ${lib.makeBinPath ([ fuzzel ] ++ additionalPrograms)}
@@ -32,10 +34,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Fuzzel launcher based on yaml configuration";
     homepage = "https://github.com/chmouel/raffi";
-    changelog = "https://github.com/chmouel/raffi/releases/tag/v${version}";
+    changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ aos ];
     mainProgram = "raffi";
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 371267663137..be7157a37b93 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "4.10.0";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-fvasxm9BjoHvSS5qqlYdCFN7j4E/MAsGhaKxt2y8Bhw=";
+    hash = "sha256-3MqMkef/oc6Fk2PHvdTMlH/lRU19Tru5uqs8yVThSdw=";
   };
 
-  cargoHash = "sha256-yQtsL4FHEuA2Ji5HW4LYoYoY1CDQf8LO0E1en04JpOA=";
+  cargoHash = "sha256-JYsnrZsUrESOZQzVOkHLFDDtjDCzGva6mrFLSOiEUzw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 1f2f2b32f230..ef4b1402fd24 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-VdfzNBPl32aUBQFHNFdjbZoTKhraOMlTw+tSlGSZ+yk=";
+    hash = "sha256-gfg73cvt0CJb80WOUlYZFWCuumFs4/nMZepmOPvYloY=";
   };
 
-  cargoHash = "sha256-4Hom/93JU0YL4F/XL3zwWqWjfW5sW6HBeI/IpVbRoVs=";
+  cargoHash = "sha256-P1HJTYNROuoU1E4hmmpROMuudgYlRlWsRuUmJAEdY94=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix
index 8b47d46fa573..8cf3a2ef07c9 100644
--- a/pkgs/by-name/ra/ramalama/package.nix
+++ b/pkgs/by-name/ra/ramalama/package.nix
@@ -1,12 +1,10 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   go-md2man,
 
-  # TODO: switch to llama-cpp-vulkan when moltenvk is upgraded to 1.3.0:
-  # https://github.com/NixOS/nixpkgs/pull/434130
-  llama-cpp,
+  llama-cpp-vulkan,
   podman,
   withPodman ? true,
 
@@ -14,32 +12,38 @@
   ramalama,
 }:
 
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "ramalama";
-  version = "0.12.3";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "ramalama";
     tag = "v${version}";
-    hash = "sha256-PnuAPQ9RF7IRnmHtUrwDRXIKEzZBDEU2mWfG5FyfY0c=";
+    hash = "sha256-4RoZX8CzMGNGsh8TawPYYMi2ZZXDIGfD/p94SS+326Y=";
   };
 
-  build-system = with python3.pkgs; [
+  build-system = with python3Packages; [
     setuptools
     wheel
   ];
 
-  dependencies = with python3.pkgs; [
+  dependencies = with python3Packages; [
     argcomplete
     pyyaml
+    jsonschema
+    jinja2
   ];
 
   nativeBuildInputs = [
     go-md2man
   ];
 
+  postPatch = ''
+    substituteInPlace ramalama/config.py --replace-fail "{sys.prefix}" "$out"
+  '';
+
   preBuild = ''
     make docs
   '';
@@ -49,11 +53,11 @@ python3.pkgs.buildPythonApplication rec {
       --prefix PATH : ${
         lib.makeBinPath (
           [
-            llama-cpp
+            llama-cpp-vulkan
             podman
           ]
           ++ (
-            with python3.pkgs;
+            with python3Packages;
             [
               huggingface-hub
             ]
@@ -68,13 +72,13 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeCheckInputs = [
-    python3.pkgs.pytestCheckHook
+    python3Packages.pytestCheckHook
+    podman
   ];
 
-  # Enable when https://github.com/containers/ramalama/pull/1891 is released
-  disabledTests = [
-    "test_ollama_model_pull"
-  ];
+  preCheck = ''
+    export PATH="$out/bin:$PATH"
+  '';
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index eacae104cd63..df7c7b9e62d5 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rancher";
-  version = "2.12.2";
+  version = "2.12.3";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-KVJfeCv+rMPGvKknov1LQX/ndI182p8p+ze2522xb7U=";
+    hash = "sha256-i+l+vs+uD6h0GruvxhkQtb7DYCJ3uysa/rZ8hGmmu7Y=";
   };
 
   env.CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ buildGoModule rec {
     "-static"
   ];
 
-  vendorHash = "sha256-guxr/co4IJoX+mSBPFqdjo8C/QnRIXcd/RztNdnfVQM=";
+  vendorHash = "sha256-mObfou6JXQ+ZWvxWMpdcC1ymngFJZ8k9I+rCYCFvDg4=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher
diff --git a/pkgs/by-name/ra/rang/package.nix b/pkgs/by-name/ra/rang/package.nix
index 37d67d44d103..91e4c573ed1a 100644
--- a/pkgs/by-name/ra/rang/package.nix
+++ b/pkgs/by-name/ra/rang/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-NK7jB5ijcu9OObmfLgiWxlJi4cVAhr7p6m9HKf+5TnQ=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   meta = {
diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix
index b05e99b77df0..5091f2e8bdd3 100644
--- a/pkgs/by-name/ra/ranger/package.nix
+++ b/pkgs/by-name/ra/ranger/package.nix
@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "ranger";
-  version = "1.9.3-unstable-2025-10-12";
+  version = "1.9.3-unstable-2025-11-01";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "ranger";
     repo = "ranger";
-    rev = "6d5e0d8dc4cc5ddf53211e19f48c5b5e9ee47b18";
-    hash = "sha256-gGJPa2k90BF28EB5cPnY0yn0YblJkhn105V2JQQv+xA=";
+    rev = "6b646df44604fac6b7843119833a696789d6f3f3";
+    hash = "sha256-6zypE/i+lANPP8z7ILgPWgwCFXXhxi2s+RLgctsId5Q=";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/by-name/ra/rapidapi/package.nix b/pkgs/by-name/ra/rapidapi/package.nix
index 108197375beb..48f041a3d4e2 100644
--- a/pkgs/by-name/ra/rapidapi/package.nix
+++ b/pkgs/by-name/ra/rapidapi/package.nix
@@ -16,11 +16,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rapidapi";
-  version = "4.2.8-4002008002";
+  version = "4.4.3-4004003001";
 
   src = fetchurl {
     url = "https://cdn-builds.paw.cloud/paw/RapidAPI-${finalAttrs.version}.zip";
-    hash = "sha256-ApBOYMOjpQJvUe+JsEAnyK7xpIZNt6qkX/2KUIT6S8g=";
+    hash = "sha256-eckLVX/NnyYa2Ad1+D6RUxR6nGrRcG5HFkudhFWhII0=";
   };
 
   dontPatch = true;
diff --git a/pkgs/by-name/ra/rapidcsv/package.nix b/pkgs/by-name/ra/rapidcsv/package.nix
index 5f2c81bc0fe6..9277d3e3b8f9 100644
--- a/pkgs/by-name/ra/rapidcsv/package.nix
+++ b/pkgs/by-name/ra/rapidcsv/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "rapidcsv";
-  version = "8.89";
+  version = "8.90";
 
   src = fetchFromGitHub {
     owner = "d99kris";
     repo = "rapidcsv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Xs9dNpOU6ZcbYX9AfkWkwMb/Bc7s2GTMUTDOBaO7VDM=";
+    hash = "sha256-0t2iURPBJpqt1Ndznuqg0qnnz574FtDAwyWTcYM1hBA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rapidraw/package.nix b/pkgs/by-name/ra/rapidraw/package.nix
index bafcc3aea287..2a1c187ee1a6 100644
--- a/pkgs/by-name/ra/rapidraw/package.nix
+++ b/pkgs/by-name/ra/rapidraw/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitHub,
   fetchNpmDeps,
   rustPlatform,
@@ -34,20 +35,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rapidraw";
-  version = "1.3.2";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "CyberTimon";
     repo = "RapidRAW";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j9Mpg3o90/PdKlSpJEePcnXZoO2BfnGtJEielM/5/uQ=";
+    hash = "sha256-aDOE2VXStPx4POQoSxoQbLwdBmt3LuMPxSZ8ZshE7Fc=";
+    fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-emwlK16NgeTYyQevWD4baHUxMP5xWJsKpQp/q5krAhQ=";
+  cargoHash = "sha256-+7CK2KxUMQ56CBVVb2esM+9ntJ7SzpVb2OmQ3mM5vNU=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-MULxH6gmHC58XdQe4ePvHcXP7/7fYNHgGHHltkODQ6w=";
+    hash = "sha256-QaPGXb26pDQLBJfYZoWt3jDeCdwameGkBvrTzhRMxYs=";
   };
 
   nativeBuildInputs = [
@@ -64,11 +66,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     nodejs_20
     glib-networking
     openssl
-    webkitgtk_4_1
     gtk3
     glib
     gdk-pixbuf
-    libappindicator
     cairo
     pango
     xorg.libX11
@@ -90,6 +90,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libheif
     onnxruntime
     wrapGAppsHook4
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    webkitgtk_4_1
+    libappindicator
   ];
 
   cargoRoot = "src-tauri";
@@ -101,7 +105,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     # Configure Tauri to use lowercase binary name
     substituteInPlace src-tauri/tauri.conf.json \
-      --replace '  "identifier": "com.rapidraw.app",' '  "identifier": "com.rapidraw.app", "mainBinaryName": "rapidraw",'
+      --replace-fail '  "identifier": "io.github.CyberTimon.RapidRAW",' '  "identifier": "io.github.CyberTimon.RapidRAW", "mainBinaryName": "rapidraw",'
+
+    # Disable downloading of ONNX runtime library this is correctly linked during postInstall
+    substituteInPlace src-tauri/build.rs \
+      --replace-fail 'if !is_valid' 'if false'
   '';
 
   dontWrapGApps = true;
@@ -109,7 +117,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # needs to be declared twice annoyingly
   ORT_STRATEGY = "system";
 
-  postInstall = ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     # Patch the .desktop file to set the Categories field
     sed -i '/^Categories=/c\Categories=Graphics;Photography' "$out/share/applications/RapidRAW.desktop"
 
@@ -123,7 +131,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -rf $out/lib/RapidRAW/resources/libonnxruntime.dylib
   '';
 
-  postFixup = ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     wrapGApp $out/bin/rapidraw \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} \
       --set ORT_STRATEGY "system" \
diff --git a/pkgs/by-name/ra/rapidyaml/package.nix b/pkgs/by-name/ra/rapidyaml/package.nix
index 842f956d5e76..da05c8034151 100644
--- a/pkgs/by-name/ra/rapidyaml/package.nix
+++ b/pkgs/by-name/ra/rapidyaml/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "rapidyaml";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "biojppm";
     repo = "rapidyaml";
     fetchSubmodules = true;
     tag = "v${version}";
-    hash = "sha256-+ENfflVjeesX14m0G71HdeSIECopZV4J2JL9+c+nbXE=";
+    hash = "sha256-r19PBS35mvAK2RoZGXaw6UU9EuEXVoUK6BV6cJnPyUs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index 45794631b5b9..c8ff6a36e996 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -4,35 +4,27 @@
   fetchurl,
   autoPatchelfHook,
   installShellFiles,
+  perl,
 }:
 
 let
-  version = "7.01";
+  version = "7.12";
   downloadVersion = lib.replaceStrings [ "." ] [ "" ] version;
   # Use `./update.sh` to generate the entries below
   srcs = {
-    i686-linux = {
-      url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz";
-      hash = "sha256-1CSbxM7arGpn4Yj5fHEFKcDURFPrC2+XptLoaDH8LDs=";
-    };
     x86_64-linux = {
       url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-34iWajylsSmIOuAT6kV7c2537qWFHc+gT+JT/trWrw8=";
+      hash = "sha256-Yw2andExNnJzZnvuB5rRA/Rp8bfNvJtCpPKDzCmTurI=";
     };
     aarch64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
-      hash = "sha256-BjEJFzKyRpN4XL6KYW7ykQcSxqF4tYr2dCFf50JHH38=";
+      hash = "sha256-lQeOD1n/0F6+ZlpVfp1NHAcxVqJ3fZFn9sQg7kSKg8U=";
     };
     x86_64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-1ExnVDre49wWwB/BKP/L9xdYOMx8qkeZfmObJ7xm4dY=";
+      hash = "sha256-Wzp5Izpc4usNldBEb3OZCeNyByTTJegoxbDD8HNnCPo=";
     };
   };
-  manSrc = fetchurl {
-    url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10";
-    name = "rar.1";
-    hash = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw=";
-  };
 in
 stdenv.mkDerivation {
   pname = "rar";
@@ -48,9 +40,17 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     installShellFiles
+    perl
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
+  postPatch = ''
+    perl -0777 -i -pe 's/ ([\w .-]+\n) ~+\n/=head1 \U$1/g' rar.txt
+    perl -0777 -i -pe 's/ (Copyrights)/=head1 \U$1/g;' rar.txt
+    mv rar.txt rar.1.pod
+    pod2man -c "RAR User's Manual" -n "RAR" -r "rar ${version}" -s 1 rar.1.pod > rar.1
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -58,14 +58,11 @@ stdenv.mkDerivation {
     install -Dm755 default.sfx -t "$out/lib"
     install -Dm644 {acknow.txt,license.txt} -t "$out/share/doc/rar"
     install -Dm644 rarfiles.lst -t "$out/etc"
+    installManPage rar.1
 
     runHook postInstall
   '';
 
-  postInstall = ''
-    installManPage ${manSrc}
-  '';
-
   passthru.updateScript = ./update.sh;
 
   meta = with lib; {
diff --git a/pkgs/by-name/ra/rar/update.sh b/pkgs/by-name/ra/rar/update.sh
index f81562727f29..2ac315343d48 100755
--- a/pkgs/by-name/ra/rar/update.sh
+++ b/pkgs/by-name/ra/rar/update.sh
@@ -42,12 +42,12 @@ updateHash() {
     hash=$(nix store prefetch-file --json "$url" | jq -r .hash)
     currentHash=$(cd "$DIRNAME" && nix "${NIX_FLAGS[@]}" eval --raw "$NIXPKGS_ROOT#legacyPackages.$nix_arch.rar.src.outputHash")
 
-    sed -i "s|$currentHash|$hash|g" "$DIRNAME/default.nix"
+    sed -i "s|$currentHash|$hash|g" "$DIRNAME/package.nix"
 }
 
 updateVersion() {
     local -r version="$1"
-    sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/default.nix"
+    sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/package.nix"
 }
 
 latestVersion="${1:-}"
@@ -70,7 +70,6 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then
     exit 0
 fi
 
-updateHash "$latestVersion" x32 linux i686-linux
 updateHash "$latestVersion" x64 linux x86_64-linux
 updateHash "$latestVersion" arm macos aarch64-darwin
 updateHash "$latestVersion" x64 macos x86_64-darwin
diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index c9b10eeec338..fa73b413b681 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -9,15 +9,15 @@
   rare-regex,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "rare";
-  version = "0.4.4";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "zix99";
     repo = "rare";
-    rev = version;
-    hash = "sha256-hdOG7UGEi4MnFg0wbyDN4gDpQLb9sG3yUrQ/J0fwKkA=";
+    tag = finalAttrs.version;
+    hash = "sha256-tzAbt9THSTYDvooU7yNQJhJaFM1bcKCabDNtiMpux3Q=";
   };
 
   vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M=";
@@ -28,9 +28,13 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
-    "-X=main.buildSha=${src.rev}"
+    "-X=main.version=${finalAttrs.version}"
+    "-X=main.buildSha=${finalAttrs.src.tag}"
+  ];
+
+  # Skip tests try /dev.
+  checkFlags = [
+    "-skip=TestNoMountTraverseWithSymlink"
   ];
 
   tags = lib.optionals withPcre2 [
@@ -43,11 +47,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Fast text scanner/regex extractor and realtime summarizer";
     homepage = "https://rare.zdyn.net";
-    changelog = "https://github.com/zix99/rare/releases/tag/${src.rev}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    changelog = "https://github.com/zix99/rare/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "rare";
   };
-}
+})
diff --git a/pkgs/by-name/ra/ratpoints/package.nix b/pkgs/by-name/ra/ratpoints/package.nix
index 8caba2276334..6f3da65ea1f2 100644
--- a/pkgs/by-name/ra/ratpoints/package.nix
+++ b/pkgs/by-name/ra/ratpoints/package.nix
@@ -2,33 +2,49 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
+  texliveSmall,
+  writableTmpDirAsHomeHook,
   gmp,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ratpoints";
-  version = "2.1.3.p4";
+  version = "2.2.2";
 
   src = fetchurl {
-    url = "http://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${version}.tar.gz";
-    sha256 = "0zhad84sfds7izyksbqjmwpfw4rvyqk63yzdjd3ysd32zss5bgf4";
+    url = "https://www.mathe2.uni-bayreuth.de/stoll/programs/ratpoints-${finalAttrs.version}.tar.gz";
+    hash = "sha256-2A4VIhkKHhIvey3i78Je+qyQf1XzdjXY2t3Q0Yqv/ZM=";
   };
 
   enableParallelBuilding = true;
 
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch";
-      sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl";
-    })
+  nativeBuildInputs = [
+    (texliveSmall.withPackages (
+      ps: with ps; [
+        charter
+        comment
+        cyrillic
+        preprint
+        titlesec
+        xypic
+      ]
+    ))
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [ gmp ];
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-  buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [
-    "CCFLAGS2=-lgmp -lc -lm"
-    "CCFLAGS=-UUSE_SSE"
+  buildFlags = [
+    "CCFLAGS1=${
+      if stdenv.hostPlatform.avx512Support then
+        "-DUSE_AVX512 -mavx512f"
+      else if stdenv.hostPlatform.avx2Support then
+        "-DUSE_AVX -mavx2"
+      else if stdenv.hostPlatform.avxSupport then
+        "-DUSE_AVX -mavx"
+      else
+        "-DUSE_SSE"
+    }"
   ];
   installFlags = [ "INSTALL_DIR=$(out)" ];
 
@@ -42,4 +58,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.unix;
     homepage = "http://www.mathe2.uni-bayreuth.de/stoll/programs/";
   };
-}
+})
diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix
index 8248e7be72c1..3a19616ec8cd 100644
--- a/pkgs/by-name/ra/ravedude/package.nix
+++ b/pkgs/by-name/ra/ravedude/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ravedude";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-LYHWUVREnGNR/vqtj+VklV3o74KUJu+Yi8ftulCJt9s=";
+    hash = "sha256-Ar2oQx7dKKfzkM3FMcJXiPHxNa0KcMRht38q+NgowfU=";
   };
 
-  cargoHash = "sha256-rD8rFs3zfWjQXm3mLvY2tpVS6X8wHJka2qs4D3/pa4E=";
+  cargoHash = "sha256-ME9egPOMTv/nEsmuxI+gJ6Tqa1Vqc/enlPttHXfTdBg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/by-name/ra/raysession/package.nix
similarity index 76%
rename from pkgs/applications/audio/raysession/default.nix
rename to pkgs/by-name/ra/raysession/package.nix
index ad6ae6e03dd9..27cfceef16e6 100644
--- a/pkgs/applications/audio/raysession/default.nix
+++ b/pkgs/by-name/ra/raysession/package.nix
@@ -1,22 +1,20 @@
 {
   lib,
   fetchurl,
-  buildPythonApplication,
+  python3Packages,
   libjack2,
-  pyliblo3,
-  pyqt5,
   which,
   bash,
   qt5,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "raysession";
   version = "0.14.4";
 
   src = fetchurl {
     url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz";
-    sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
+    hash = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
   };
 
   postPatch = ''
@@ -30,7 +28,7 @@ buildPythonApplication rec {
   format = "other";
 
   nativeBuildInputs = [
-    pyqt5 # pyuic5 and pyrcc5 to build resources.
+    python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources.
     qt5.qttools # lrelease to build translations.
     which # which to find lrelease.
     qt5.wrapQtAppsHook
@@ -40,8 +38,8 @@ buildPythonApplication rec {
     bash
   ];
   dependencies = [
-    pyliblo3
-    pyqt5
+    python3Packages.pyliblo3
+    python3Packages.pyqt5
   ];
 
   dontWrapQtApps = true; # The program is a python script.
@@ -62,11 +60,11 @@ buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Houston4444/RaySession";
     description = "Session manager for Linux musical programs";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index 800990798430..4a43845313aa 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -8,23 +8,18 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rbspy";
-  version = "0.34.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
-    tag = "v${version}";
-    hash = "sha256-yVcVuMCyvk9RbkbKomqjkLY+p5tUzW2zcAKZ8XfsjM0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xTaulxPgHc4UTHqgh8ASn75RGtAbhTWHVdV/JyDFNPc=";
   };
 
-  cargoHash = "sha256-WiIHFwB6BE9VYuC2dCHNnrEFjVsesp0c5i4bH01cXis=";
-
-  # error: linker `aarch64-linux-gnu-gcc` not found
-  postPatch = ''
-    rm .cargo/config
-  '';
+  cargoHash = "sha256-Y0mfd1ETISzzLErV2gXjW0CgVmJP5wcJUavrIJuG86k=";
 
   doCheck = true;
 
@@ -32,11 +27,11 @@ rustPlatform.buildRustPackage rec {
   # from nixpkgs during tests.
   preCheck = ''
     substituteInPlace src/core/process.rs \
-      --replace /usr/bin/which '${which}/bin/which'
+      --replace-fail "/usr/bin/which" "${lib.getExe which}"
     substituteInPlace src/sampler/mod.rs \
-      --replace /usr/bin/which '${which}/bin/which'
+      --replace-fail "/usr/bin/which" "${lib.getExe which}"
     substituteInPlace src/core/ruby_spy.rs \
-      --replace /usr/bin/ruby '${ruby}/bin/ruby'
+      --replace-fail "/usr/bin/ruby" "${lib.getExe ruby}"
   '';
 
   checkFlags = [
@@ -60,9 +55,9 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://rbspy.github.io/";
     description = "Sampling CPU Profiler for Ruby";
     mainProgram = "rbspy";
-    changelog = "https://github.com/rbspy/rbspy/releases/tag/v${version}";
+    changelog = "https://github.com/rbspy/rbspy/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ viraptor ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})
diff --git a/pkgs/by-name/rb/rbw/package.nix b/pkgs/by-name/rb/rbw/package.nix
index 68ae87c74759..4028ed210d5a 100644
--- a/pkgs/by-name/rb/rbw/package.nix
+++ b/pkgs/by-name/rb/rbw/package.nix
@@ -11,17 +11,14 @@
   withFzf ? false,
   fzf,
   perl,
-
   # rbw-rofi
   withRofi ? false,
   rofi,
   xclip,
-
   # pass-import
   withPass ? false,
   pass,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "rbw";
   version = "1.14.1";
@@ -52,6 +49,7 @@ rustPlatform.buildRustPackage rec {
     installShellCompletion --cmd rbw \
       --bash <($out/bin/rbw gen-completions bash) \
       --fish <($out/bin/rbw gen-completions fish) \
+      --nushell <($out/bin/rbw gen-completions nushell) \
       --zsh <($out/bin/rbw gen-completions zsh)
   ''
   + lib.optionalString withFzf ''
diff --git a/pkgs/applications/networking/sync/rclone/browser.nix b/pkgs/by-name/rc/rclone-browser/package.nix
similarity index 51%
rename from pkgs/applications/networking/sync/rclone/browser.nix
rename to pkgs/by-name/rc/rclone-browser/package.nix
index 3b6be7da5e6b..ddb7109bda79 100644
--- a/pkgs/applications/networking/sync/rclone/browser.nix
+++ b/pkgs/by-name/rc/rclone-browser/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
+  qt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,33 +14,34 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "kapitainsky";
     repo = "RcloneBrowser";
-    rev = version;
-    sha256 = "14ckkdypkfyiqpnz0y2b73wh1py554iyc3gnymj4smy0kg70ai33";
+    tag = version;
+    hash = "sha256-Y0QFzpvAV01k9fYN5iMpxd8A+ThLePDtxdG7eX2bk5E=";
   };
 
   patches = [
     # patch for Qt 5.15, https://github.com/kapitainsky/RcloneBrowser/pull/126
     (fetchpatch {
       url = "https://github.com/kapitainsky/RcloneBrowser/commit/ce9cf52e9c584a2cc85a5fa814b0fd7fa9cf0152.patch";
-      sha256 = "0nm42flmaq7mva9j4dpp18i1xcv8gr08zfyb9apz1zwn79h1w0c8";
+      hash = "sha256-iAEeYDqW//CvSsu7j0B+aLMeIgr3NiKT2vVgVakTpFo=";
     })
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
-  cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
+  cmakeFlags = [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.10" ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ qt5.qtbase ];
 
-  meta = with lib; {
-    inherit (src.meta) homepage;
+  meta = {
+    changelog = "https://github.com/kapitainsky/RcloneBrowser/blob/${src.tag}/CHANGELOG.md";
+    homepage = "https://github.com/kapitainsky/RcloneBrowser";
     description = "Graphical Frontend to Rclone written in Qt";
     mainProgram = "rclone-browser";
-    license = licenses.unlicense;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/applications/networking/sync/rclone/default.nix b/pkgs/by-name/rc/rclone/package.nix
similarity index 94%
rename from pkgs/applications/networking/sync/rclone/default.nix
rename to pkgs/by-name/rc/rclone/package.nix
index fa6fa70030d6..1f54edecca42 100644
--- a/pkgs/applications/networking/sync/rclone/default.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -17,7 +17,7 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.71.1";
+  version = "1.71.2";
 
   outputs = [
     "out"
@@ -28,10 +28,10 @@ buildGoModule rec {
     owner = "rclone";
     repo = "rclone";
     tag = "v${version}";
-    hash = "sha256-CvU07yzqBtQVjNtwnOLnSwULNkDMSmNTNyLFpDYy/w4=";
+    hash = "sha256-fmqIjwWhWj8ucw/OP6B9dCGKaF8eiVQdJEtK0a6G9E4=";
   };
 
-  vendorHash = "sha256-Hapwa+WYz6a22HauRjRUl7q0ZlwR/j/zwex0VebgC+g=";
+  vendorHash = "sha256-0RK2gc3InPZZnAEgv01fgG19cWeKCsBP6JN2OCVY8O4=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix
index 48fd4373a3f8..813c63b646e0 100644
--- a/pkgs/by-name/rc/rcon/package.nix
+++ b/pkgs/by-name/rc/rcon/package.nix
@@ -33,6 +33,13 @@ stdenv.mkDerivation rec {
     pcre
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/n0la/rcon";
     description = "Source RCON client for command line";
diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 1165087ab22a..08707fb7ba56 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -19,11 +19,12 @@
 }:
 
 let
+  # shiboken2 is broken on Python > 3.12
   python3Packages = python312Packages;
 in
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.29";
+  version = "4.0.30";
 
   format = "other";
 
@@ -31,7 +32,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-qbHjRKH9GOwBduyod8AOm2SYOjGUH1mYSpCTifOehVM=";
+        hash = "sha256-SJnDTW6oQUd+UjWgJz74Po+ibk3JfotFU7CIt4J/nDA=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in
diff --git a/pkgs/by-name/rd/rdma-core/package.nix b/pkgs/by-name/rd/rdma-core/package.nix
index c3fe8d64bdaa..6eeab6eed2ac 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 = "59.0";
+  version = "60.0";
 
   src = fetchFromGitHub {
     owner = "linux-rdma";
     repo = "rdma-core";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-GSARu2HNej4tI62RjLWkjS+5FKVbeNmX7jh0atlEpX0=";
+    hash = "sha256-2V8I/kcOr+/5JxyIAln/r7NnL6bET3vUPgg7PGNe1vc=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 091036fb9fd6..f6332b86eeeb 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-10-10";
+  version = "2.20220925.4.0a-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "re-Isearch";
     repo = "re-Isearch";
-    rev = "27dd5bc90a85cb168ebb96be173d0c3a98d714e7";
-    hash = "sha256-aNAAdFeGnZG0EhGLU94mhTFeDAOnWbvXVf9N5KRpbUs=";
+    rev = "47e9a874d1343f68b67be16e8dd15661171c9270";
+    hash = "sha256-cwH4W6+7JwohP2sx5PjvZtu63GDTfmt6nWd7cSqZkBQ=";
   };
 
   patches = [
diff --git a/pkgs/by-name/re/re2/package.nix b/pkgs/by-name/re/re2/package.nix
index 28e9bb9432b0..faa843290e1c 100644
--- a/pkgs/by-name/re/re2/package.nix
+++ b/pkgs/by-name/re/re2/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.tests = {
     inherit chromium grpc mercurial;
-    inherit (python3Packages) fb-re2 google-re2;
+    inherit (python3Packages) google-re2;
     haskell-re2 = haskellPackages.re2;
   };
 
diff --git a/pkgs/by-name/re/react-static/package.json b/pkgs/by-name/re/react-static/package.json
deleted file mode 100644
index 70b873277fd2..000000000000
--- a/pkgs/by-name/re/react-static/package.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "name": "react-static",
-  "description": "A progressive static site generator for React",
-  "version": "7.6.2",
-  "license": "MIT",
-  "repository": "https://github.com/react-static/react-static",
-  "main": "lib/index.js",
-  "types": "src/index.d.ts",
-  "engines": {
-    "node": ">=8.9.0"
-  },
-  "bin": {
-    "react-static": "./bin/react-static"
-  },
-  "scripts": {
-    "prebuild": "rimraf lib",
-    "build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\"  --source-maps inline",
-    "watch": "yarn build --watch",
-    "watch:link": "onchange './lib/**/*' -- yalc push --changed",
-    "start": "yarn watch",
-    "test": "yarn format && yarn lint && yarn unitTest",
-    "lint": "eslint src",
-    "format": "prettier README.md {src,templates/*/src}/**/*.js --write",
-    "unitTest": "cross-env NODE_ENV=test yarn jest ./src",
-    "unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch",
-    "preversion": "yarn build && yarn test",
-    "publishLink": "echo '{{event}} to {{changed}}' && yalc publish"
-  },
-  "peerDependencies": {
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.12.11"
-  },
-  "dependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-export-default-from": "^7.5.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-destructuring": "^7.5.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-    "@babel/plugin-transform-runtime": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-stage-0": "^7.0.0",
-    "@babel/register": "^7.5.5",
-    "@babel/runtime": "^7.5.5",
-    "@reach/router": "^1.3.1",
-    "autoprefixer": "^9.7.4",
-    "axios": "^0.21.1",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-macros": "^2.6.1",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "babel-plugin-universal-import": "^4.0.0",
-    "case-sensitive-paths-webpack-plugin": "^2.2.0",
-    "chalk": "^2.4.2",
-    "chokidar": "^3.0.2",
-    "circular-dependency-plugin": "^5.2.0",
-    "cors": "^2.8.5",
-    "css-loader": "^2.1.1",
-    "download-git-repo": "^2.0.0",
-    "extract-css-chunks-webpack-plugin": "^4.6.0",
-    "file-loader": "3.0.1",
-    "fs-extra": "^7.0.1",
-    "git-promise": "^1.0.0",
-    "glob": "^7.1.4",
-    "gunzip-maybe": "^1.4.1",
-    "html-webpack-plugin": "^3.2.0",
-    "inquirer": "^6.5.1",
-    "inquirer-autocomplete-prompt": "^1.0.1",
-    "intersection-observer": "^0.7.0",
-    "jsesc": "^2.5.2",
-    "match-sorter": "^3.1.1",
-    "minimist": "^1.2.0",
-    "mutation-observer": "^1.0.3",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "portfinder": "^1.0.21",
-    "postcss-flexbugs-fixes": "^4.1.0",
-    "postcss-loader": "^3.0.0",
-    "pretty-error": "^2.1.1",
-    "progress": "^2.0.3",
-    "prop-types": "^15.7.2",
-    "raf": "^3.4.1",
-    "raw-loader": "^3.1.0",
-    "react-helmet": "^6.1.0",
-    "react-universal-component": "^4.0.0",
-    "resolve-from": "^5.0.0",
-    "serve": "^11.1.0",
-    "shorthash": "^0.0.2",
-    "slash": "^2.0.0",
-    "socket.io": "^2.2.0",
-    "socket.io-client": "^2.2.0",
-    "style-loader": "0.23.1",
-    "swimmer": "^1.4.0",
-    "tar-fs": "^2.0.0",
-    "terser-webpack-plugin": "^1.4.1",
-    "upath": "^1.1.2",
-    "url-loader": "^2.1.0",
-    "webpack": "^4.39.2",
-    "webpack-bundle-analyzer": "^3.4.1",
-    "webpack-dev-server": "^3.8.0",
-    "webpack-flush-chunks": "^2.0.3",
-    "webpack-node-externals": "^1.7.2"
-  },
-  "devDependencies": {
-    "@types/react": "^16.9.1",
-    "@types/react-helmet": "^6.1.0",
-    "babel-jest": "^24.8.0",
-    "cors": "^2.8.5",
-    "cross-env": "^5.2.0",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
-    "enzyme-to-json": "^3.4.0",
-    "eslint": "^6.1.0",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-config-react-tools": "^1.1.7",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.14.3",
-    "express": "^4.17.1",
-    "husky": "^3.0.3",
-    "jest": "^24.8.0",
-    "lerna": "^3.16.4",
-    "onchange": "^6.0.0",
-    "prettier": "1.18.2",
-    "react": "^16.9.0",
-    "react-dev-utils": "^9.0.3",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.12.11",
-    "rimraf": "^2.7.0",
-    "webpack-hot-middleware": "^2.25.0"
-  },
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules",
-      "src"
-    ],
-    "testRegex": "(/__tests__/.*\\.(test))\\.jsx?$",
-    "moduleNameMapper": {
-      "static.config.js$": "<rootDir>/src/static/__mocks__/static.config.js.mock.js"
-    },
-    "setupFiles": [
-      "<rootDir>/setupTests.js"
-    ],
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
-    ]
-  },
-  "gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a"
-}
diff --git a/pkgs/by-name/re/react-static/package.nix b/pkgs/by-name/re/react-static/package.nix
deleted file mode 100644
index bf10eeb9494f..000000000000
--- a/pkgs/by-name/re/react-static/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  mkYarnPackage,
-  fetchFromGitHub,
-  fetchYarnDeps,
-}:
-
-mkYarnPackage rec {
-  pname = "react-static";
-  version = "7.6.2";
-
-  src = fetchFromGitHub {
-    owner = "react-static";
-    repo = "react-static";
-    rev = "v${version}";
-    hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs=";
-  };
-
-  packageJSON = ./package.json;
-
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8=";
-  };
-
-  buildPhase = ''
-    runHook preBuild
-
-    yarn --cwd deps/react-static/packages/react-static --offline build
-
-    runHook postBuild
-  '';
-
-  doDist = false;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/lib/node_modules"
-    mv deps/react-static/packages/react-static "$out/lib/node_modules"
-    mv node_modules "$out/lib/node_modules/react-static"
-
-    ln -s "$out/lib/node_modules/react-static/bin" "$out"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md";
-    description = "Progressive static site generator for React";
-    homepage = "https://github.com/react-static/react-static";
-    license = lib.licenses.mit;
-    mainProgram = "react-static";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 8d886dcc3cf8..38861008971e 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.86";
+  version = "0.9.91";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/H0ZYbVl4d/s4e7jkQUobZTZZPpIiC9H48wfmPqGUWk=";
+    hash = "sha256-Xz+s+yv0L2bj7T6GA6IkMGTAk2oGyFuYR5zzyeLbTuc=";
     fetchSubmodules = true;
   };
 
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-sRa1IO8JmMsA0/7dMuYF0as/MYHpclEwAknZIycNQ3Y=";
+    hash = "sha256-RsmI0avMnVWlLMzwGJJmPNSEJpNaq7IWimjpMJ+nR80=";
   };
 
   pnpmRoot = "../..";
 
-  cargoHash = "sha256-oNzgsxJb8N++AGCkXuJmK+51iF7XZ0xmShPlOpkAQEg=";
+  cargoHash = "sha256-nNMD2LnMDz91kI2QniD+zD/Ug9BSVjTIiuxWdz8UxL0=";
 
   cargoRoot = "../..";
 
diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index 7813baddc5c4..280eec71ba1d 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "readsb";
-  version = "3.16.3";
+  version = "3.16.5";
 
   src = fetchFromGitHub {
     owner = "wiedehopf";
     repo = "readsb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IjARj2qC1/kwoVvc5SXkJmoDN2m1fjPWj7jVgHG8cWI=";
+    hash = "sha256-MYtrCjWuTEM8sYiDWbCL+BJVtdWuItduqEb4LQGiovs=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/re/reaper-go/package.nix b/pkgs/by-name/re/reaper-go/package.nix
index acc4e9969f8f..77113341467b 100644
--- a/pkgs/by-name/re/reaper-go/package.nix
+++ b/pkgs/by-name/re/reaper-go/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "reaper-go";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "ghostsecurity";
     repo = "reaper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NXRqKO76RoxEvR7slMmUDdesRFMxDJpX/IGxoTDwJVU=";
+    hash = "sha256-3kTGlGvuTSB3KOeQvhF/pNaWVU153qGqqskJd+G6FF4=";
   };
 
-  vendorHash = "sha256-PxZ+fx5wkYuggMfpTfkc8quSssCzXdIcwjdR4qhDbqE=";
+  vendorHash = "sha256-T9qTfGRLhlYrezraRRztZC2Kw4L6Fap1YQgQdnlxKhE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/re/reaper-sws-extension/darwin.nix b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
index 1ad6b3688032..3011ad5e7ee6 100644
--- a/pkgs/by-name/re/reaper-sws-extension/darwin.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/darwin.nix
@@ -23,8 +23,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/reaper_sws-${arch}.dylib";
         hash =
           {
-            x86_64-darwin = "sha256-B185QWS9FaC/0XDhxUBbgr9zu2Ot8OIsfaPQ3sUHh4s=";
-            aarch64-darwin = "sha256-8gbyPlnIXdWtSD+Aj70xzacJhO34edTTG2IOryB67os=";
+            x86_64-darwin = "sha256-c0enRIXFN+dMDdxTQ3hFv0almTF0dfrSHILNigJp2Js=";
+            aarch64-darwin = "sha256-jmuob0qslYhxiE2ShfTwY4RJAKBLJSUb+VBEM0sQPbo=";
           }
           .${stdenvNoCC.hostPlatform.system};
       };
@@ -33,20 +33,22 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       plugin
       (fetchurl {
         url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python64.py";
-        hash = "sha256-Yujj60+jOEfdSZ74cRU1Wxoh7RL2fo/IhJIpa+BDYV0=";
+        hash = "sha256-GDlvfARg1g5oTH2itEug6Auxr9iFlPDdGueInGmHqSI=";
       })
       (fetchurl {
         url = "https://github.com/reaper-oss/sws/releases/download/v${finalAttrs.version}/sws_python32.py";
-        hash = "sha256-QktzdIDpTvNs9IrH7TOI6LTIBkfuQ3cqw06iqLxSSTI=";
+        hash = "sha256-np2r568csSdIS7VZHDASroZlXhpfxXwNn0gROTinWU4=";
       })
     ];
 
-  dontUnpack = true;
+  unpackCmd = ''
+    cp $curSrc $(stripHash $curSrc)
+  '';
 
   installPhase = ''
     runHook preInstall
-    install -D *.py -t $out/Scripts
-    install -D *.dylib -t $out/UserPlugins
+    install -D -t $out/Scripts *.py
+    install -D -t $out/UserPlugins *.dylib
     runHook postInstall
   '';
 })
diff --git a/pkgs/by-name/re/reaper-sws-extension/linux.nix b/pkgs/by-name/re/reaper-sws-extension/linux.nix
index c45de74689b8..892c40506ee6 100644
--- a/pkgs/by-name/re/reaper-sws-extension/linux.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/linux.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "reaper-oss";
     repo = "sws";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-37pBbNACQuuEk1HJTiUHdb0mDiR2+ZsEQUOhz7mrPPg=";
+    hash = "sha256-J2igVacDClHgKGZ2WATcd5XW2FkarKtALxVLgqa90Cs=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/re/reaper-sws-extension/package.nix b/pkgs/by-name/re/reaper-sws-extension/package.nix
index 4f8a4892cc17..f4f2a33aadee 100644
--- a/pkgs/by-name/re/reaper-sws-extension/package.nix
+++ b/pkgs/by-name/re/reaper-sws-extension/package.nix
@@ -9,7 +9,7 @@ in
 callPackage p {
 
   pname = "reaper-sws-extension";
-  version = "2.14.0.3";
+  version = "2.14.0.7";
   meta = {
     description = "Reaper Plugin Extension";
     longDescription = ''
diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix
index 092de4bafdf0..37b9b3a1b7ed 100644
--- a/pkgs/by-name/re/reason-shell/package.nix
+++ b/pkgs/by-name/re/reason-shell/package.nix
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jaywonchung/reason";
     changelog = "https://github.com/jaywonchung/reason/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/re/rebels-in-the-sky/package.nix b/pkgs/by-name/re/rebels-in-the-sky/package.nix
index 00a025c65c10..67574890a98b 100644
--- a/pkgs/by-name/re/rebels-in-the-sky/package.nix
+++ b/pkgs/by-name/re/rebels-in-the-sky/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rebels-in-the-sky";
-  version = "1.0.31";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "ricott1";
     repo = "rebels-in-the-sky";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0/Vsb6GMl0XH7uxyFSUO18kKoz49MXbOEQChhZZJL24=";
+    hash = "sha256-wkYzYKFoMn+cKZUaQn9GRxYXXe60ea6UFjamdrxjJFs=";
   };
 
-  cargoHash = "sha256-DI6BAfbIEGCq3GaBoQz/nn9AZYWUDWBD2osgm1K44+w=";
+  cargoHash = "sha256-6qLIrUa5wvh4TQhl/JQLV0QKtgSQZNT4l6Z+2121BmY=";
 
   patches = lib.optionals (!withRadio) [
     ./disable-radio.patch
diff --git a/pkgs/by-name/re/recaf-launcher/package.nix b/pkgs/by-name/re/recaf-launcher/package.nix
index 1c869bf20cba..c828c98e2dd2 100644
--- a/pkgs/by-name/re/recaf-launcher/package.nix
+++ b/pkgs/by-name/re/recaf-launcher/package.nix
@@ -19,7 +19,7 @@ buildFHSEnv {
     p: with p; [
       jar
 
-      openjdk23
+      openjdk25
       xorg.libX11
       at-spi2-atk
       cairo
diff --git a/pkgs/by-name/re/recordbox/package.nix b/pkgs/by-name/re/recordbox/package.nix
index cc5f6b7c69b3..0678773dacd5 100644
--- a/pkgs/by-name/re/recordbox/package.nix
+++ b/pkgs/by-name/re/recordbox/package.nix
@@ -8,6 +8,7 @@
   desktop-file-utils,
   fetchFromGitea,
   glib,
+  libglycin,
   glycin-loaders,
   gst_all_1,
   gtk4,
@@ -90,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Dirty approach to add patches after cargoSetupPostUnpackHook
     # We should eventually use a cargo vendor patch hook instead
     pushd ../$(stripHash $cargoDeps)/glycin-2.*
-      patch -p3 < ${glycin-loaders.passthru.glycinPathsPatch}
+      patch -p3 < ${libglycin.passthru.glycinPathsPatch}
     popd
   '';
   preFixup = ''
diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix
index bbb74cbb57fd..e82940b53a39 100644
--- a/pkgs/by-name/re/rectangle-pro/package.nix
+++ b/pkgs/by-name/re/rectangle-pro/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle-pro";
-  version = "3.0.37";
+  version = "3.63";
 
   src = fetchurl {
     url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
-    hash = "sha256-1/guAVppL6AwC9luqPZZscz38U4irN1vyGesN8q2leM=";
+    hash = "sha256-ysRIf19Woo6odCEgkNfoRDelF7gflDhaiNH+hjygz/Q=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index de29f20ec721..3a67dd7ee333 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.91";
+  version = "0.92";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
-    hash = "sha256-MOpg8N2mMNB81dmtgQc7KRax+g4d1Xedh9dkC/zYhLw=";
+    hash = "sha256-0Yv2DroNvk2U17U5vzrhfEcr9xAVpV0ivFVIDviI11s=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/re/redict/package.nix b/pkgs/by-name/re/redict/package.nix
deleted file mode 100644
index 544a7edd7952..000000000000
--- a/pkgs/by-name/re/redict/package.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitea,
-  fetchurl,
-  lua,
-  jemalloc,
-  pkg-config,
-  tcl,
-  which,
-  ps,
-  getconf,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-  systemd,
-  # dependency ordering is broken at the moment when building with openssl
-  tlsSupport ? !stdenv.hostPlatform.isStatic,
-  openssl,
-
-  # Using system jemalloc fixes cross-compilation and various setups.
-  # However the experimental 'active defragmentation' feature of redict requires
-  # their custom patched version of jemalloc.
-  useSystemJemalloc ? true,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "redict";
-  version = "7.3.6";
-
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "redict";
-    repo = "redict";
-    tag = finalAttrs.version;
-    hash = "sha256-ye2uO6EQzfyonRvM0/+pVPoNZe2f9WO/2yafy52G10M=";
-  };
-
-  patches = lib.optionals useSystemJemalloc [
-    # use system jemalloc
-    (fetchurl {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/redis/-/raw/102cc861713c796756abd541bf341a4512eb06e6/redis-5.0-use-system-jemalloc.patch";
-      hash = "sha256-VPRfoSnctkkkzLrXEWQX3Lh5HmZaCXoJafyOG007KzM=";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  buildInputs = [
-    lua
-  ]
-  ++ lib.optional useSystemJemalloc jemalloc
-  ++ lib.optional withSystemd systemd
-  ++ lib.optionals tlsSupport [ openssl ];
-
-  preBuild = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/Makefile --replace-fail "-flto" ""
-  '';
-
-  # More cross-compiling fixes.
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ]
-  ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "AR=${stdenv.cc.targetPrefix}ar"
-    "RANLIB=${stdenv.cc.targetPrefix}ranlib"
-  ]
-  ++ lib.optionals withSystemd [ "USE_SYSTEMD=yes" ]
-  ++ lib.optionals tlsSupport [ "BUILD_TLS=yes" ];
-
-  enableParallelBuilding = true;
-
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
-
-  # darwin currently lacks a pure `pgrep` which is extensively used here
-  doCheck = !stdenv.hostPlatform.isDarwin;
-
-  nativeCheckInputs = [
-    which
-    tcl
-    ps
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isStatic [ getconf ];
-
-  checkPhase = ''
-    runHook preCheck
-
-    # disable test "Connect multiple replicas at the same time": even
-    # upstream find this test too timing-sensitive
-    substituteInPlace tests/integration/replication.tcl \
-      --replace-fail "foreach mdl {no yes}" "foreach mdl {}"
-
-    substituteInPlace tests/support/server.tcl \
-      --replace-fail "exec /usr/bin/env" "exec env"
-
-    sed -i '/^proc wait_load_handlers_disconnected/{n ; s/wait_for_condition 50 100/wait_for_condition 50 500/; }' \
-      tests/support/util.tcl
-
-    ./runtest \
-      --no-latency \
-      --timeout 2000 \
-      --clients $NIX_BUILD_CORES \
-      --tags -leaks \
-      --skipunit integration/failover \
-      --skipunit integration/aof-multi-part
-
-    runHook postCheck
-  '';
-
-  meta = {
-    homepage = "https://redict.io";
-    description = "Distributed key/value store";
-    license = lib.licenses.lgpl3Only;
-    platforms = lib.platforms.all;
-    changelog = "https://codeberg.org/redict/redict/releases/tag/${finalAttrs.version}";
-    maintainers = with lib.maintainers; [ yuka ];
-    mainProgram = "redict-cli";
-  };
-})
diff --git a/pkgs/by-name/re/redis/package.nix b/pkgs/by-name/re/redis/package.nix
index 48eccfc821eb..bf25ebe52b1d 100644
--- a/pkgs/by-name/re/redis/package.nix
+++ b/pkgs/by-name/re/redis/package.nix
@@ -66,8 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
   env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isFreeBSD "-lexecinfo";
 
   # darwin currently lacks a pure `pgrep` which is extensively used here
diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index abb94bc45b1d..7b7b3c22f9c9 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "25.2.8";
+  version = "25.2.10";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-WSE5PIv58yMlMlzGJmCWOg6XHbY7NEvQVtm07IWmR4k=";
+    sha256 = "sha256-kw/nQjIwNZGEfFRmBqNdXQPVadK0BQY3ha6S4E0Bc8A=";
   };
 in
 buildGoModule rec {
diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix
index fc117ebaa136..6d27b9b7a05a 100644
--- a/pkgs/by-name/re/redu/package.nix
+++ b/pkgs/by-name/re/redu/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-ZUA9zmWzPvyFmqQFW3ShnQRqG3TODN7K8Ex1jrOZxd0=";
 
-  env.RUSTC_BOOTSTRAP = 1;
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index 5cb960dcac1c..69f421f491a7 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -2,18 +2,21 @@
   lib,
   rustPlatform,
   fetchCrate,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "regex-cli";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U=";
+    hash = "sha256-ytI1C2QRUfInIChwtSaHze7VJnP9UIcO93e2wjz2/I0=";
   };
 
-  cargoHash = "sha256-9KLvVgmUun8tuAfxYMvAa5qpeXiOKe9JndZ81PmPpjA=";
+  cargoHash = "sha256-7fPoH6I8Okz8Oby45MIDdKBkbPgUPsaXd6XS3r3cRO8=";
+
+  passthru.updateScript = nix-update-script { };
 
   meta = with lib; {
     description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions";
@@ -23,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
 }
diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index b9416eb4ddad..54b73c67821e 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.10.13.00";
+  version = "2025.11.03.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-jbxTHu8IoUsQMkH2u82T6XsRKto7Z3ehEOAL9v0WGxE=";
+    hash = "sha256-Kzxw0v/COISCoaZXu1Pi8/IB51YpZ5m3dZ/XTDfRQhg=";
   };
 
-  cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I=";
+  cargoHash = "sha256-KO8iAdE+9k5ka4Qcih6imxX/qSaY6giaF9BXtXumzV0=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/re/remind/package.nix b/pkgs/by-name/re/remind/package.nix
index e85db23b014b..8aa302b99f8a 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 = "06.01.04";
+  version = "06.01.05";
 
   src = fetchFromGitea {
     domain = "git.skoll.ca";
     owner = "Skollsoft-Public";
     repo = "Remind";
     rev = version;
-    hash = "sha256-DNqwG/HsBEfu1kkRJVkFEWjc+EKY7rdQPcaw3k1HuDk=";
+    hash = "sha256-5S6s3PylXNGxxzYII2bwT59TFg8sIEUjENkRUDFTuFM=";
   };
 
   propagatedBuildInputs = lib.optionals withGui [
diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index 7a490b8baf6b..aeeaaf4751df 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.21.8";
+  version = "1.21.24";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-KJHdLHmLGYYxv4eKCDoUsTn3bhWg3h8QOlwmtxNFC6Y=";
+    hash = "sha256-jJ7I5Xgq6RHZ4pT8VTMikX1f38C9FqLtJaSSgc2rWHA=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in
diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index bb5a04aaa472..5c32d6d8d4a1 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-10-31";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "5035830ab3cdf39445f130f1c2630a444b598c1a";
-    hash = "sha256-J3SVS91TM+EdXCTLIS8Obd4f0qgZXe8EouCJ7Xt01po=";
+    rev = "fc98e35232d4698f4947037c5b17a6bb9966a43c";
+    hash = "sha256-4Mbm+Oc3qkdUXPbqPmnKzuSBS0BtRk3Yw56lDTCZeik=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index 15a2e4dd452b..c9d79e5e2280 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 = "41.143.2";
+  version = "41.166.0";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-+oAK4hcYMicAjBazYnMIMpg0EnRdHlx9FNv/r9QlAYc=";
+    hash = "sha256-nwGV9Ut0WhrBw/n+BaKFrYMNCCu+HuWJ5Fj3W28/yf4=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-0Rvt36BX+O48+38/zmwKJryLAtpDLabfEiwRpJgG+fs=";
+    hash = "sha256-nsr3TEbOdCrI1czWYQhjLSl/S+9ZgcezNKWppjleRBk=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;
diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix
index 24f55cb9b4f0..9c21d0c4a40f 100644
--- a/pkgs/by-name/re/repgrep/package.nix
+++ b/pkgs/by-name/re/repgrep/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       unlicense
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rgr";
   };
 }
diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index 01c090029ea1..4146d536b211 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "1.6.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-177G2IhGZ1pQwxtJ2gozG0vEGEkcBmtOR6AbYxs4N+M=";
+    hash = "sha256-o7C6Y9GDeodKViuo6gd5GbYH1isgLDoiyqmMvyo8rUM=";
   };
 
-  npmDepsHash = "sha256-KzOjpWRpvQ9P2vajhHdAVlKdoYAvw0vncmVyh24v0g0=";
+  npmDepsHash = "sha256-S9s1SeqW9vcpz9XTLRjYH9ChNngg9h3HkWz8Nmxaygs=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 24d03ffe4464..f74f05fd1ba4 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  arrow-cpp,
   # nativeBuildInputs
   binaryen,
   lld,
@@ -34,13 +35,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.25.1";
+  version = "0.26.2";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-YppVNVfVqOATLCoUvpeYYrhivKBb6f4G1JCG1Bl+cjc=";
+    hash = "sha256-o+aV7YcsunaG3n2m8oTXug/kR3IU+ty9NYCkG/vEzyM=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -49,9 +55,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-jUn7b6t5hS7KjdymxTTP8mKLT671QgKrv7R9uiOkmJU=";
+  cargoHash = "sha256-EH/R+OgLeLNrZnkIGqutTo4K9XzhW+CGwG/uQKwWGXA=";
 
-  cargoBuildFlags = [ "--package rerun-cli" ];
+  cargoBuildFlags = [
+    "--package rerun-cli"
+    "--package rerun_c"
+  ];
   cargoTestFlags = [ "--package rerun-cli" ];
   buildNoDefaultFeatures = true;
   buildFeatures = [
@@ -128,6 +137,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
 
+  propagatedBuildInputs = [ arrow-cpp ];
+
   addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
     lib.optionals stdenv.hostPlatform.isLinux [
       libxkbcommon
@@ -155,6 +166,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
+  postInstall = ''
+    # Install C++ SDK components
+    mkdir -p $dev/include
+    cp -r $src/rerun_cpp/src/* $dev/include/
+
+    # Install rerun_c library (built from Rust)
+    if [ -f "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/librerun_c.a" ]; then
+      cp "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/librerun_c.a" $out/lib/
+    fi
+
+    # Install CMake config files
+    mkdir -p $dev/lib/cmake/rerun_sdk
+    cp $src/rerun_cpp/CMakeLists.txt $dev/lib/cmake/rerun_sdk/
+    cp $src/rerun_cpp/Config.cmake.in $dev/lib/cmake/rerun_sdk/
+    cp $src/rerun_cpp/download_and_build_arrow.cmake $dev/lib/cmake/rerun_sdk/
+  '';
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
@@ -169,7 +197,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate.  Built in Rust using egui";
+    description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate. Built in Rust using egui. Includes C++ SDK";
     homepage = "https://github.com/rerun-io/rerun";
     changelog = "https://github.com/rerun-io/rerun/blob/${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
index 1f147e49da4d..9d049aaac69c 100644
--- a/pkgs/by-name/re/restate/package.nix
+++ b/pkgs/by-name/re/restate/package.nix
@@ -25,16 +25,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "restate";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "restatedev";
     repo = "restate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NMT1/Oy0EmAtGqHMK3FL/MZczKz//hXkpKWhQ4S3tLw=";
+    hash = "sha256-5sGVVJ8Y90yJoikQnPeGbZhNlSR/d3EkMct9isSWies=";
   };
 
-  cargoHash = "sha256-M7p20eeaxijlGjYBAAwmK4y/58eo7NysoK+Gvs86SNo=";
+  cargoHash = "sha256-+Yc7u6q4U4MwT5eHnxHC2DCG66SmEyRfNMeMqSO+GeQ=";
 
   env = {
     PROTOC = lib.getExe protobuf;
diff --git a/pkgs/by-name/re/restic/package.nix b/pkgs/by-name/re/restic/package.nix
index a8fff4d80bde..51c086ea76c1 100644
--- a/pkgs/by-name/re/restic/package.nix
+++ b/pkgs/by-name/re/restic/package.nix
@@ -12,14 +12,14 @@
   python3,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "restic";
   version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-lLinqZUOsZCPPybvVDB1f8o9Hl5qKYi0eHwJAaydsD8=";
   };
 
@@ -72,15 +72,16 @@ buildGoModule rec {
 
   meta = {
     homepage = "https://restic.net";
-    changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/restic/restic/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Backup program that is fast, efficient and secure";
     platforms = with lib.platforms; linux ++ darwin;
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
       mbrgm
+      djds
       dotlambda
       ryan4yin
     ];
     mainProgram = "restic";
   };
-}
+})
diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix
index 04c5650d3dca..739df02ab46d 100644
--- a/pkgs/by-name/re/reth/package.nix
+++ b/pkgs/by-name/re/reth/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reth";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "paradigmxyz";
     repo = "reth";
     rev = "v${version}";
-    hash = "sha256-Z84zCt/v6e++Et6a2hBcHfrzQvtzBEn+Zx1bBRJfiqM=";
+    hash = "sha256-jyStSIVTQeBJGwNelxHItIjHPQyvg3luGRj0qziZ8u0=";
   };
 
-  cargoHash = "sha256-KxUiiOTlMNlPw4pHjEcqXsMF3RCA0KVO66WKpz1YoT0=";
+  cargoHash = "sha256-v7B2W9SSQvUlJQzP/AAffsJq+fP4Ghxr4C5+gB1LE9k=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix
index ff7747e7e112..590046496d13 100644
--- a/pkgs/by-name/re/retool/package.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -8,7 +8,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "retool";
-  version = "2.4.2";
+  version = "2.4.4";
 
   pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.10";
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "unexpectedpanda";
     repo = "retool";
     tag = "v${version}";
-    hash = "sha256-jb2HJjXBxfdOY9TI37D5xwtySlYoSJwckrLC+h7YqoM=";
+    hash = "sha256-hWCMxWcjjFF5xg7WrF4wjwGneoQCEUp+4oe+CieElcQ=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/re/rewaita/package.nix b/pkgs/by-name/re/rewaita/package.nix
index e90782854d23..6fcf29703dea 100644
--- a/pkgs/by-name/re/rewaita/package.nix
+++ b/pkgs/by-name/re/rewaita/package.nix
@@ -72,7 +72,7 @@ python3Packages.buildPythonApplication {
     mainProgram = "rewaita";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       getchoo
     ];
   };
diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix
index c68a403562e1..3b27f1ac6a5b 100644
--- a/pkgs/by-name/re/rewrk/package.nix
+++ b/pkgs/by-name/re/rewrk/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/lnx-search/rewrk";
     changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rewrk";
   };
 }
diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix
index 9237f9d9e2df..68d39d9b040a 100644
--- a/pkgs/by-name/rh/rhack/package.nix
+++ b/pkgs/by-name/rh/rhack/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "rhack";
     homepage = "https://github.com/nakabonne/rhack";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix
index cb3a9b09e507..c2dd992624e0 100644
--- a/pkgs/by-name/rh/rhai-doc/package.nix
+++ b/pkgs/by-name/rh/rhai-doc/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rhai-doc";
   };
 }
diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix
index 1bdd2929bb7a..0bf1975d4074 100644
--- a/pkgs/by-name/rh/rhythmbox/package.nix
+++ b/pkgs/by-name/rh/rhythmbox/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   pkg-config,
   meson,
   ninja,
@@ -39,13 +40,28 @@
 
 stdenv.mkDerivation rec {
   pname = "rhythmbox";
-  version = "3.4.8";
+  version = "3.4.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI=";
+    sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE=";
   };
 
+  patches = [
+    # Add support for girepository 2.0
+    # https://gitlab.gnome.org/GNOME/rhythmbox/-/issues/2113
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/rhythmbox/-/commit/0cc5960f8ae516967515554eaa89faa9796701c5.patch";
+      hash = "sha256-IAOaQBDCyRkzzrxwdYQKm8Si8sn5yeBFWqKbe5mUU6k=";
+    })
+  ];
+
+  postPatch = ''
+    # We backported girepository-2.0 support to libpeas 1.36
+    substituteInPlace meson.build \
+      --replace-fail "and libpeas.version() > '1.36'" ""
+  '';
+
   nativeBuildInputs = [
     pkg-config
     meson
diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix
index d59dfba9860a..4437a8d0e043 100644
--- a/pkgs/by-name/ri/riff/package.nix
+++ b/pkgs/by-name/ri/riff/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://riff.sh";
     changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 7d066f224410..c068a6b32b34 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.4.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     tag = version;
-    hash = "sha256-IpEgWbmWFW4X09EeAfWadncH4ptzSom2+7kvh8h3hcM=";
+    hash = "sha256-WpVj/sgvvdNweZ+exxoSc4rtDmuRvaIdkwKk+eu46Ok=";
   };
 
-  cargoHash = "sha256-I0hBh9FFoy+RhEUAHfgQa+UiSgOS0mYJy+2W/0/9kG4=";
+  cargoHash = "sha256-YJnqeuj4XvOnGJ9RcNBtfy1duYUu/u6ed47bAndLm30=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };
diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index da36f5d6d724..ed1f0ca85a1f 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "13.0.6";
+  version = "13.2.4";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-ThO4bXxp55cOivFo9eq9XEKpEvX9O5LiE6WsMGoq3gA=";
+    hash = "sha256-kr9Gr6GBWy/SJtjHqdATbcZAF4Gt3bbkI956NQCAwCc=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix
index 8cb144d870cc..a5d6ea698c7e 100644
--- a/pkgs/by-name/ri/ringracers/package.nix
+++ b/pkgs/by-name/ri/ringracers/package.nix
@@ -13,34 +13,39 @@
   libvpx,
   libyuv,
   zlib,
-  makeWrapper,
+  makeBinaryWrapper,
   makeDesktopItem,
   copyDesktopItems,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ringracers";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "KartKrewDev";
     repo = "RingRacers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-X2rSwZOEHtnSJBpu+Xf2vkxGUAZSNSXi6GCuGlM6jhY=";
+    hash = "sha256-iMbrbZCarMebP+ruu1JH4kwks6rR9A9CMquDUnMCUhU=";
   };
 
   assets = fetchzip {
     name = "${finalAttrs.pname}-${finalAttrs.version}-assets";
     url = "https://github.com/KartKrewDev/RingRacers/releases/download/v${finalAttrs.version}/Dr.Robotnik.s-Ring-Racers-v${finalAttrs.version}-Assets.zip";
-    hash = "sha256-sHeI1E6uNF0gBNd1e1AU/JT9wyZdkCQgYLiMPZqXAVc=";
+    hash = "sha256-vL3Ceu6/tIOl/+TJFjntCksDdjpgLc1aNHvSx6x8/90=";
     stripRoot = false;
   };
 
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [
     cmake
     nasm
-    makeWrapper
+    makeBinaryWrapper
     copyDesktopItems
+    pkg-config
   ];
 
   buildInputs = [
@@ -73,26 +78,45 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      runHook preInstall
 
-    install -Dm644 ../srb2.png $out/share/icons/hicolor/256x256/apps/ringracers.png
-    install -Dm755 bin/ringracers $out/bin/ringracers
+      install -Dm644 ../srb2.png $out/share/icons/hicolor/256x256/apps/ringracers.png
+      install -Dm755 bin/ringracers $out/bin/ringracers
 
-    wrapProgram $out/bin/ringracers \
-      --set RINGRACERSWADDIR "${finalAttrs.assets}"
+      wrapProgram $out/bin/ringracers \
+        --set RINGRACERSWADDIR "${finalAttrs.assets}"
 
-    runHook postInstall
-  '';
+      runHook postInstall
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      runHook preInstall
 
-  meta = with lib; {
+      mkdir -p $out/Applications
+      cp -r bin/ringracers.app $out/Applications/
+
+      wrapProgram $out/Applications/ringracers.app/Contents/MacOS/ringracers \
+        --set RINGRACERSWADDIR "${finalAttrs.assets}"
+
+      mkdir -p $out/bin
+      cat << EOF > "$out/bin/ringracers"
+      #!${stdenv.shell}
+      open -na "$out/Applications/ringracers.app" --args "\$@"
+      EOF
+      chmod +x $out/bin/ringracers
+
+      runHook postInstall
+    '';
+
+  meta = {
     description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy";
     homepage = "https://kartkrew.org";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       donovanglover
-      thehans255
+      iedame
     ];
     mainProgram = "ringracers";
   };
diff --git a/pkgs/by-name/ri/rio/package.nix b/pkgs/by-name/ri/rio/package.nix
index 113d35a18347..2e988f3c33e2 100644
--- a/pkgs/by-name/ri/rio/package.nix
+++ b/pkgs/by-name/ri/rio/package.nix
@@ -7,8 +7,10 @@
   nixosTests,
   nix-update-script,
   autoPatchelfHook,
+  installShellFiles,
   cmake,
   ncurses,
+  scdoc,
   pkg-config,
   gcc-unwrapped,
   fontconfig,
@@ -62,6 +64,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeBuildInputs = [
     rustPlatform.bindgenHook
     ncurses
+    scdoc
+    installShellFiles
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     cmake
@@ -99,6 +103,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
     tic -xe rio,rio-direct -o "$terminfo/share/terminfo" misc/rio.terminfo
     mkdir -p $out/nix-support
     echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+
+    scdoc < extra/man/rio.1.scd > rio.1
+    scdoc < extra/man/rio.5.scd > rio.5
+    scdoc < extra/man/rio-bindings.5.scd > rio-bindings.5
+    installManPage rio.1 rio.5 rio-bindings.5
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications/
diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index 73b50b3d8026..747a8b2274c0 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripdrag";
-  version = "0.4.10";
+  version = "0.4.11";
 
   src = fetchFromGitHub {
     owner = "nik012003";
     repo = "ripdrag";
     rev = "v${version}";
-    hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY=";
+    hash = "sha256-1IUS0PNzIoSrlBXQrUmw/lXUD8auVVKhu/irSoYoK6w=";
   };
 
-  cargoHash = "sha256-w6gy149pbzRmN3XnRqMZuxAsKGXUglQpn/7g9L8+rZU=";
+  cargoHash = "sha256-LtkSGu261rPFgofaD/t2rSilxUPL6eHBpd/Tz9gR8ZM=";
 
   nativeBuildInputs = [
     pkg-config
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nik012003/ripdrag";
     changelog = "https://github.com/nik012003/ripdrag/releases/tag/${src.rev}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ripdrag";
   };
 }
diff --git a/pkgs/by-name/ri/ripes/package.nix b/pkgs/by-name/ri/ripes/package.nix
index 8508f0280c85..b5a537e03fa0 100644
--- a/pkgs/by-name/ri/ripes/package.nix
+++ b/pkgs/by-name/ri/ripes/package.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     rm -r external/VSRTL/external/cereal
     substituteInPlace {src/serializers.h,src/io/iobase.h} \
       --replace-fail "VSRTL/external/cereal/include/cereal/cereal.hpp" "cereal/cereal.hpp"
+
+    substituteInPlace external/libelfin/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index a9569a8b77b4..26cca99406d2 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -17,16 +17,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep";
-  version = "14.1.1";
+  version = "15.1.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = version;
-    hash = "sha256-gyWnahj1A+iXUQlQ1O1H1u7K5euYQOld9qWm99Vjaeg=";
+    hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I=";
   };
 
-  cargoHash = "sha256-9atn5qyBDy4P6iUoHFhg+TV6Ur71fiah4oTJbBMeEy4=";
+  cargoHash = "sha256-ry3pLuYNwX776Dpj9IE2+uc7eEa5+sQvdNNeG1eJecs=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix
index f746c89f627d..b4388cfd3b68 100644
--- a/pkgs/by-name/ri/ripsecrets/package.nix
+++ b/pkgs/by-name/ri/ripsecrets/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sirwart/ripsecrets";
     changelog = "https://github.com/sirwart/ripsecrets/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ripsecrets";
   };
 }
diff --git a/pkgs/by-name/ri/risor/package.nix b/pkgs/by-name/ri/risor/package.nix
index f8e5db6e3eda..bd56015dc760 100644
--- a/pkgs/by-name/ri/risor/package.nix
+++ b/pkgs/by-name/ri/risor/package.nix
@@ -43,6 +43,6 @@ buildGoModule rec {
     homepage = "https://github.com/risor-io/risor";
     changelog = "https://github.com/risor-io/risor/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ri/rivet/package.nix b/pkgs/by-name/ri/rivet/package.nix
index 8cd54f03583d..30228474e46b 100644
--- a/pkgs/by-name/ri/rivet/package.nix
+++ b/pkgs/by-name/ri/rivet/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rivet";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-vR1RM1XD9y8PiKly853Z8RRM6uLLRyVC5dMGD+q08cw=";
+    hash = "sha256-YSR/vD1qSKNcoBovKvn2JsTOKhQBpQ30a2B4yyDs3kY=";
   };
 
   latex = texliveBasic.withPackages (
diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix
index 9b319231ad05..4b9047484665 100644
--- a/pkgs/by-name/rk/rkdeveloptool/package.nix
+++ b/pkgs/by-name/rk/rkdeveloptool/package.nix
@@ -26,7 +26,9 @@ stdenv.mkDerivation {
   buildInputs = [ libusb1 ];
 
   # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5
-  CPPFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ];
+  CPPFLAGS =
+    lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]
+    ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ];
 
   meta = with lib; {
     homepage = "https://github.com/rockchip-linux/rkdeveloptool";
diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix
index dee2796991c2..dfd6ee1ade98 100644
--- a/pkgs/by-name/rk/rke/package.nix
+++ b/pkgs/by-name/rk/rke/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rke";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "rke";
     rev = "v${version}";
-    hash = "sha256-qborClm+QF1cVKSPEY+JYEylQ2I+XHkmCd3ez8fdfmk=";
+    hash = "sha256-xa9f82jbSjJEd0XR1iaqu3qA3O5G5vfj4RRhpT9c32Y=";
   };
 
   vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4=";
diff --git a/pkgs/by-name/rk/rkik/package.nix b/pkgs/by-name/rk/rkik/package.nix
index 7f09ebf22ed4..b75972ae0be1 100644
--- a/pkgs/by-name/rk/rkik/package.nix
+++ b/pkgs/by-name/rk/rkik/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rkik";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "aguacero7";
     repo = "rkik";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zC06Wt8XNpSSru7GUC2VAiP6t6fuWdpinXoIuBSk7kw=";
+    hash = "sha256-bT1WTs/gei8CGundLynVgekNFlyY8p/mK73Utrw8N9I=";
   };
 
-  cargoHash = "sha256-XMO7imFg/f+1KzNTrGLzxZ3yRSvD2WxSKpHCIT99xEk=";
+  cargoHash = "sha256-iu9vADHhems0pzQ0Hs+Zp0dZ4K185M5L4fftBaAZdvE=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index adb25975d7cc..8035b400dbfd 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -13,21 +13,30 @@
   libsndfile,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rkrlv2";
   version = "beta_3";
 
   src = fetchFromGitHub {
     owner = "ssj71";
     repo = "rkrlv2";
-    rev = version;
-    sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
+    tag = finalAttrs.version;
+    hash = "sha256-WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
   };
 
+  postPatch = ''
+    substituteInPlace ./CMakeLists.txt lv2/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)" \
+      "cmake_minimum_required(VERSION 4.0)"
+  '';
+
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
+
   buildInputs = [
     libXft
     libXpm
@@ -38,12 +47,12 @@ stdenv.mkDerivation rec {
     libsndfile
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Rakarrak effects ported to LV2";
     homepage = "https://github.com/ssj71/rkrlv2";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.joelmo ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.joelmo ];
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse'
   };
-}
+})
diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix
index 43dd26e495f7..e16eaf314df3 100644
--- a/pkgs/by-name/rl/rlci/package.nix
+++ b/pkgs/by-name/rl/rlci/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orsinium-labs/rlci";
     changelog = "https://github.com/orsinium-labs/rlci/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index b825c908aff0..bc5a4b9dc389 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "rmfakecloud";
-  version = "0.0.25";
+  version = "0.0.26";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
     rev = "v${version}";
-    hash = "sha256-dembIFEoKQEZabsl7oK8rzvV2G7nhmebfw0AGUBanYs=";
+    hash = "sha256-QV8RFg6gATyjIESwO3r5M3Yd9qWFsA6X6bYLmNpLek0=";
   };
 
   vendorHash = "sha256-ColOCdKa/sKoLnF/3idBIEyFB2JWYM+1y5TdC/LZT4A=";
diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/by-name/rm/rmview/package.nix
similarity index 95%
rename from pkgs/applications/misc/remarkable/rmview/default.nix
rename to pkgs/by-name/rm/rmview/package.nix
index 4cac6042d1c0..028ecc47bcee 100644
--- a/pkgs/applications/misc/remarkable/rmview/default.nix
+++ b/pkgs/by-name/rm/rmview/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = with python3Packages; [
     pyqt5
     setuptools
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   propagatedBuildInputs = with python3Packages; [
     pyqt5
diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix
index 5ebbcd8e2fb3..9da124082bfa 100644
--- a/pkgs/by-name/rn/rnr/package.nix
+++ b/pkgs/by-name/rn/rnr/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ismaelgv/rnr";
     changelog = "https://github.com/ismaelgv/rnr/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix
index 3eee75e9c54f..52fa725b4df1 100644
--- a/pkgs/by-name/ro/roadrunner/package.nix
+++ b/pkgs/by-name/ro/roadrunner/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "roadrunner";
-  version = "2025.1.3";
+  version = "2025.1.4";
 
   src = fetchFromGitHub {
     repo = "roadrunner";
     owner = "roadrunner-server";
     tag = "v${version}";
-    hash = "sha256-+TA0ClPrmfksMchc4WgX2nMZetDuw8Q0xtbiHm2OMa4=";
+    hash = "sha256-OlwMlGe2EEXTWbp5fMhZkUX00l15vvtJ6fc3tSkmlVc=";
   };
 
   nativeBuildInputs = [
@@ -49,7 +49,7 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  vendorHash = "sha256-/u2so1/WXuQvLZhfRSYdG1QZasrA6xoZTE6lYXg9RWs=";
+  vendorHash = "sha256-7C5B8ChIxaqCJhywITV7v3o/49fFp8eaVeZ6ZJNxi20=";
 
   meta = {
     changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md";
diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 3200cfe2af7e..cf2f87d731a9 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.14.0";
+  version = "8.15.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     tag = finalAttrs.version;
-    hash = "sha256-4rhIaPdyyLiIhVYC4KNKbPAbVsHKnK6BOsebFjmmDeI=";
+    hash = "sha256-vhoV8AkkcL1pDmHkpPYs5lD6TUcvMC6BXkQF1T2esIE=";
   };
 
-  vendorHash = "sha256-k+zFpBHE+r0a67gqUry+luMIhJZ5wo1RpEaF4c7vAmI=";
+  vendorHash = "sha256-ADqWN0cF9hB+s9rfza0bQ3pB6NZ9NMzvDhN8sdL3Sg8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ro/robo/package.nix b/pkgs/by-name/ro/robo/package.nix
index c1e0ee1fc92c..480fe8ebeb24 100644
--- a/pkgs/by-name/ro/robo/package.nix
+++ b/pkgs/by-name/ro/robo/package.nix
@@ -16,7 +16,7 @@ php82.buildComposerProject2 (finalAttrs: {
     hash = "sha256-bAT4jHvqWeYcACeyGtBwVBA2Rz+AvkZcUGLDwSf+fLg=";
   };
 
-  vendorHash = "sha256-vketnTu5VEgt3HBbtnTppWl3+sSSIsCB2MpvL27bxv4=";
+  vendorHash = "sha256-Rg8WTZUnWA4bemNmE7hxFwfnlMtYyPkeltAQEWJ2VDU=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 2b7708c07d4a..408bfe92a9c6 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-10-05";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "cdc782ce0836f3d5566fafb93cb43cbae21b3f58";
-    hash = "sha256-uXa78bFhCYkMCOTdNnQJLu7Yz3do+hZBUG3TIZWv544=";
+    rev = "6aaa6e79183d489c84f9baad821354e72b322c46";
+    hash = "sha256-fDjajIA06USViGWNKvnqg2V6dc1Hzqt/9q8PbKWvKxA=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index f6369c1c77b0..be8e7838038c 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-calc";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "rofi-calc";
     rev = "v${version}";
-    sha256 = "sha256-E0C5hlrZGRGHT/yb4J2qFquf3AuB0T1zqbFPZdT1UxE=";
+    sha256 = "sha256-/UKOyJfCsV/+kZDndHZmrPdE2MjVlQWSiWQRIUPGz/I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-emoji/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch
rename to pkgs/by-name/ro/rofi-emoji/0001-Patch-plugindir-to-output.patch
diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix
new file mode 100644
index 000000000000..03ef3156716e
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-emoji/package.nix
@@ -0,0 +1,85 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  makeWrapper,
+
+  autoreconfHook,
+  pkg-config,
+
+  cairo,
+  glib,
+  libnotify,
+  rofi-unwrapped,
+
+  x11Support ? true,
+  xclip,
+  xdotool,
+
+  waylandSupport ? true,
+  wl-clipboard,
+  wtype,
+
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (final: {
+  pname = "rofi-emoji";
+  version = "4.1.0";
+
+  src = fetchFromGitHub {
+    owner = "Mange";
+    repo = "rofi-emoji";
+    rev = "v${final.version}";
+    hash = "sha256-Amaz+83mSPue+pjZq/pJiCxu5QczYvmJk6f96eraaK8=";
+  };
+
+  patches = [
+    # Look for plugin-related files in $out/lib/rofi
+    ./0001-Patch-plugindir-to-output.patch
+  ];
+
+  postFixup = ''
+    wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
+     --prefix PATH ":" ${
+       lib.makeBinPath (
+         [
+           libnotify
+         ]
+         ++ lib.optionals waylandSupport [
+           wl-clipboard
+           wtype
+         ]
+         ++ lib.optionals x11Support [
+           xclip
+           xdotool
+         ]
+       )
+     }
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    cairo
+    glib
+    rofi-unwrapped
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Emoji selector plugin for Rofi";
+    homepage = "https://github.com/Mange/rofi-emoji";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      cole-h
+      Mange
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/ro/rofi-rbw-wayland/package.nix b/pkgs/by-name/ro/rofi-rbw-wayland/package.nix
new file mode 100644
index 000000000000..df14e2c5f67c
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-rbw-wayland/package.nix
@@ -0,0 +1,4 @@
+{ rofi-rbw }:
+rofi-rbw.override {
+  waylandSupport = true;
+}
diff --git a/pkgs/by-name/ro/rofi-rbw-x11/package.nix b/pkgs/by-name/ro/rofi-rbw-x11/package.nix
new file mode 100644
index 000000000000..80ef776daa51
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-rbw-x11/package.nix
@@ -0,0 +1,4 @@
+{ rofi-rbw }:
+rofi-rbw.override {
+  x11Support = true;
+}
diff --git a/pkgs/by-name/ro/rofi-rbw/package.nix b/pkgs/by-name/ro/rofi-rbw/package.nix
new file mode 100644
index 000000000000..c6d82037d52b
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-rbw/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  rbw,
+
+  waylandSupport ? false,
+  wl-clipboard,
+  wtype,
+
+  x11Support ? false,
+  xclip,
+  xdotool,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "rofi-rbw";
+  version = "1.5.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fdw";
+    repo = "rofi-rbw";
+    tag = version;
+    hash = "sha256-Qdbz3UjWMCuJUzR6UMt/apt+OjMAr2U7uMtv9wxEZKE=";
+  };
+
+  build-system = [
+    python3Packages.hatchling
+  ];
+
+  dependencies = [
+    python3Packages.configargparse
+  ];
+
+  pythonImportsCheck = [ "rofi_rbw" ];
+
+  preFixup =
+    let
+      wrapperPaths = [
+        rbw
+      ]
+      ++ lib.optionals waylandSupport [
+        wl-clipboard
+        wtype
+      ]
+      ++ lib.optionals x11Support [
+        xclip
+        xdotool
+      ];
+
+      wrapperFlags =
+        lib.optionalString waylandSupport " --typer wtype --clipboarder wl-copy"
+        + lib.optionalString x11Support " --typer xdotool --clipboarder xclip";
+    in
+    ''
+      makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath wrapperPaths} --add-flags "${wrapperFlags}")
+    '';
+
+  meta = {
+    description = "Rofi frontend for Bitwarden";
+    homepage = "https://github.com/fdw/rofi-rbw";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      equirosa
+      dit7ya
+    ];
+    platforms = lib.platforms.linux;
+    mainProgram = "rofi-rbw";
+  };
+}
diff --git a/pkgs/by-name/ro/rofimoji/package.nix b/pkgs/by-name/ro/rofimoji/package.nix
index 6ccdfeee37cf..aa7cca6eb539 100644
--- a/pkgs/by-name/ro/rofimoji/package.nix
+++ b/pkgs/by-name/ro/rofimoji/package.nix
@@ -15,18 +15,18 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "rofimoji";
-  version = "6.5.0";
+  version = "6.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fdw";
     repo = "rofimoji";
     tag = version;
-    hash = "sha256-CY+ddF2Rth92R22QKqOb/Us+rZhvWTaU/jKy8fljWqQ=";
+    hash = "sha256-8Y28jlmlKFyqT/OGn/jKjvivMc2U7TQvYmaTX1vCvXQ=";
   };
 
   nativeBuildInputs = [
-    python3Packages.poetry-core
+    python3Packages.hatchling
     installShellFiles
   ];
 
@@ -54,13 +54,13 @@ python3Packages.buildPythonApplication rec {
     installManPage src/picker/docs/rofimoji.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Simple emoji and character picker for rofi";
     mainProgram = "rofimoji";
     homepage = "https://github.com/fdw/rofimoji";
     changelog = "https://github.com/fdw/rofimoji/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ justinlovinger ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ justinlovinger ];
   };
 }
diff --git a/pkgs/games/rogue/default.nix b/pkgs/by-name/ro/rogue/package.nix
similarity index 54%
rename from pkgs/games/rogue/default.nix
rename to pkgs/by-name/ro/rogue/package.nix
index dcb16306767a..67209409c59b 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/by-name/ro/rogue/package.nix
@@ -2,30 +2,30 @@
   lib,
   stdenv,
   fetchurl,
-  ncurses,
+  ncurses5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rogue";
   version = "5.4.4";
 
   src = fetchurl {
     urls = [
-      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${version}-src.tar.gz"
-      "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${version}-src.tar.gz"
-      "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor version}/rogue${version}-src.tar.gz"
+      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${finalAttrs.version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${finalAttrs.version}-src.tar.gz"
+      "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${finalAttrs.version}-src.tar.gz"
+      "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor finalAttrs.version}/rogue${finalAttrs.version}-src.tar.gz"
     ];
     sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses5 ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://rogue.rogueforge.net/rogue-5-4/";
     description = "Final version of the original Rogue game developed for the UNIX operating system";
     mainProgram = "rogue";
-    platforms = platforms.all;
-    license = licenses.bsd3;
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/ro/romdirfs/package.nix b/pkgs/by-name/ro/romdirfs/package.nix
index 00b6543cc1ac..11ef69a039e6 100644
--- a/pkgs/by-name/ro/romdirfs/package.nix
+++ b/pkgs/by-name/ro/romdirfs/package.nix
@@ -24,6 +24,11 @@ gccStdenv.mkDerivation rec {
   ];
   buildInputs = [ fuse ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps";
     homepage = "https://github.com/mlafeldt/romdirfs";
diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix
index 04f503d984fc..ccc528f98baf 100644
--- a/pkgs/by-name/ro/roogle/package.nix
+++ b/pkgs/by-name/ro/roogle/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix
index 7622cb01527b..efbbe77a34d8 100644
--- a/pkgs/by-name/ro/roon-server/package.nix
+++ b/pkgs/by-name/ro/roon-server/package.nix
@@ -16,7 +16,7 @@
   stdenv,
 }:
 let
-  version = "2.55.1559";
+  version = "2.56.1582";
   urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
 in
 stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
-    hash = "sha256-eeQ6Gci63GRdN5HOtT5+RFgWcnpTeCG6hBk1bNKXYoE=";
+    hash = "sha256-LKuno7SpOpxx3JpM36tYlOHjJWWRLRjPiA096Bv/QvQ=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch b/pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch
new file mode 100644
index 000000000000..668c8f69f842
--- /dev/null
+++ b/pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch
@@ -0,0 +1,108 @@
+From febb61a45a40a76bdbcd320f307dcd8f14cc532b Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Thu, 28 Aug 2025 14:07:01 +0200
+Subject: [PATCH] [CMake] Build `rootcint` and `genreflex` as separate targets
+
+This makes the CMake code more robust.
+
+Right now, we use some `install(CODE "execute_process(COMMAND ln -f ...`
+solution on unix to install `rootcint` and `genreflex`. This does not
+work in all cases, either because of the usage of `\$ENV{DESTDIR}` when
+`DESTDIR` is not set, or because hard links are not allowed.
+
+Always copying `rootcling` - already in the build tree - would avoid
+that problem, but by copying we risk sidestepping the CMake mechanisms
+to set the RPath correctly when installing the copies, which are not
+actual targets.
+
+To make makes things simpler and more robust, this commit suggests to
+build the `rootcing` and `genreflex` executables as separate targets
+from the same source. The cost is very little cost in memory
+(`rootcling` is only 31K, so copying two times only increases the size
+of ROOTs `bin` directory by 1.5 %) and little in compile time (the extra
+compile time is less than a second, not noticable in parallel builds).
+---
+ main/CMakeLists.txt | 69 +++++++++++++++------------------------------
+ 1 file changed, 23 insertions(+), 46 deletions(-)
+
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
+index 7dfcd98e345..857f0df48d8 100644
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -98,50 +98,27 @@ set_source_files_properties(src/rootcling.cxx PROPERTIES
+   VISIBILITY_INLINES_HIDDEN "ON"
+ )
+ 
+-ROOT_EXECUTABLE(rootcling src/rootcling.cxx LIBRARIES RIO Cling Core Rint)
+-
+-# rootcling includes the ROOT complex header which would build the complex
+-# dictionary with modules. To make sure that rootcling_stage1 builds this
+-# dict before we use it, we add a dependency here.
+-add_dependencies(rootcling complexDict)
+-
+-target_include_directories(rootcling PRIVATE
+-        ${CMAKE_SOURCE_DIR}/core/metacling/res
+-        ${CMAKE_SOURCE_DIR}/core/dictgen/res
+-        ${CMAKE_SOURCE_DIR}/io/rootpcm/res)
+-set_property(TARGET rootcling PROPERTY ENABLE_EXPORTS 1)
+-if(WIN32)
+-  set_target_properties(rootcling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
+-  set_property(TARGET rootcling APPEND_STRING PROPERTY LINK_FLAGS " -STACK:4000000")
+-endif()
+-
+-# Create aliases: rootcint, genreflex.
+-if(WIN32)
+-  add_custom_command(TARGET rootcling POST_BUILD
+-                     COMMAND copy /y rootcling.exe rootcint.exe
+-                     COMMAND copy /y rootcling.exe genreflex.exe
+-                     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+-else()
+-  add_custom_command(TARGET rootcling POST_BUILD
+-                     COMMAND ln -f rootcling rootcint
+-                     COMMAND ln -f rootcling genreflex
+-                     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+-endif()
+-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+-                         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex")
+-
+-if(CMAKE_HOST_UNIX)
+-  install(CODE "execute_process(COMMAND ln -f rootcling rootcint WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
+-  install(CODE "execute_process(COMMAND ln -f rootcling genreflex WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
+-else()
+-  if(MSVC)
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcling.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+-  else()
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint
+-                      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex
+-                      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rlibmap
+-                      DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
++set(rootcling_exe_names rootcling genreflex rootcint)
++
++foreach(exe_name IN LISTS rootcling_exe_names)
++  ROOT_EXECUTABLE(${exe_name} src/rootcling.cxx LIBRARIES RIO Cling Core Rint)
++
++  # rootcling includes the ROOT complex header which would build the complex
++  # dictionary with modules. To make sure that rootcling_stage1 builds this
++  # dict before we use it, we add a dependency here.
++  add_dependencies(${exe_name} complexDict)
++
++  target_include_directories(${exe_name} PRIVATE
++          ${CMAKE_SOURCE_DIR}/core/metacling/res
++          ${CMAKE_SOURCE_DIR}/core/dictgen/res
++          ${CMAKE_SOURCE_DIR}/io/rootpcm/res)
++  set_property(TARGET ${exe_name} PROPERTY ENABLE_EXPORTS 1)
++  if(WIN32)
++    set_target_properties(${exe_name} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
++    set_property(TARGET ${exe_name} APPEND_STRING PROPERTY LINK_FLAGS " -STACK:4000000")
+   endif()
+-endif()
++endforeach()
++
++# To inherit the dependencies from rootcling
++add_dependencies(genreflex rootcling)
++add_dependencies(rootcint rootcint)
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index c432784847e3..e322f88dfee3 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -50,7 +50,7 @@
   xrootd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "root";
   version = "6.36.04";
 
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
+    url = "https://root.cern.ch/download/root_v${finalAttrs.version}.source.tar.gz";
     hash = "sha256-zGNn2PVjxtSco0wJ0LU8sPQaUo22+GrxEf12dEzaRZY=";
   };
 
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     nlohmann_json # link interface of target "ROOT::ROOTEve"
   ];
   buildInputs = [
-    clang
+    finalAttrs.clang
     davix
     fftw
     ftgl
@@ -135,6 +135,8 @@ stdenv.mkDerivation rec {
       hash = "sha256-D7LZWJnGF9DtKcM8EF3KILU81cqTcZolW+HMe3fmXTw=";
       revert = true;
     })
+    # Will also be integrated to ROOT 6.38.00
+    ./Build-rootcint-and-genreflex-as-separate-targets.patch
   ];
 
   preConfigure = ''
@@ -161,8 +163,8 @@ stdenv.mkDerivation rec {
       '';
 
   cmakeFlags = [
-    "-DCLAD_SOURCE_DIR=${clad_src}"
-    "-DClang_DIR=${clang}/lib/cmake/clang"
+    "-DCLAD_SOURCE_DIR=${finalAttrs.clad_src}"
+    "-DClang_DIR=${finalAttrs.clang}/lib/cmake/clang"
     "-Dbuiltin_clang=OFF"
     "-Dbuiltin_llvm=OFF"
     "-Dfail-on-missing=ON"
@@ -258,4 +260,4 @@ stdenv.mkDerivation rec {
     ];
     license = licenses.lgpl21;
   };
-}
+})
diff --git a/pkgs/by-name/ro/roslyn/deps.json b/pkgs/by-name/ro/roslyn/deps.json
index bec9946ff8d1..cab81c626f18 100644
--- a/pkgs/by-name/ro/roslyn/deps.json
+++ b/pkgs/by-name/ro/roslyn/deps.json
@@ -157,15 +157,15 @@
   },
   {
     "pname": "Microsoft.WindowsDesktop.App.Ref",
-    "version": "8.0.20",
-    "hash": "sha256-EDrxjwHRVTirMADYU+po/ANd6LaoehL/9RSiuZEsIB0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/8.0.20/microsoft.windowsdesktop.app.ref.8.0.20.nupkg"
+    "version": "8.0.21",
+    "hash": "sha256-RufsU8Mr81jK6fIbULBgkv0BRVmobXL38L8rBwBjJyg=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/8.0.21/microsoft.windowsdesktop.app.ref.8.0.21.nupkg"
   },
   {
     "pname": "Microsoft.WindowsDesktop.App.Ref",
-    "version": "9.0.9",
-    "hash": "sha256-TfNgMEesiGD+81AdKtUHLJVMZjM1F94K7aOQgOksQm8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/9.0.9/microsoft.windowsdesktop.app.ref.9.0.9.nupkg"
+    "version": "9.0.10",
+    "hash": "sha256-xY6W4jzMoxlhKBmcd1507wluBpL+1aPmVJGXcSxM0FY=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.windowsdesktop.app.ref/9.0.10/microsoft.windowsdesktop.app.ref.9.0.10.nupkg"
   },
   {
     "pname": "NETStandard.Library",
diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix
index 6d18cef194b9..12f5ee3ba95e 100644
--- a/pkgs/by-name/ro/rotonda/package.nix
+++ b/pkgs/by-name/ro/rotonda/package.nix
@@ -10,18 +10,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rotonda";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "rotonda";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B2sdQr9PctWZBpDuatJkUApW5T98BQa4HiqL8+HHevY=";
+    hash = "sha256-7SVhxUpQq1CCDYNc0xza/2ixjKF8kHBSobt4S+azLQU=";
   };
 
-  cargoHash = "sha256-XbBlA7QYUtD4uBz4t5ZR70o9bMgVLeSzq6Lexe0jzME=";
+  cargoHash = "sha256-4wldyvg0VOFTlM0FN/BSsyDNp5HbRumw4Lv4VEJlPfI=";
 
-  checkFlags =
+  checkFlags = [
+    # Broken in sandbox:
+    "--skip=http_api_responses_multiple_gets"
+    "--skip=representation::genoutput_json"
+  ]
+  ++
     lib.optionals
       (stdenv.hostPlatform.system == "aarch64-darwin" || stdenv.hostPlatform.system == "x86_64-darwin")
       [
@@ -36,10 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
-      package = rotonda;
-      command = "rotonda --version";
-      # tag/release with this version string, please revert to `inherit (finalAttrs) version;` on next release
-      version = "0.4.3-dev";
+      package = finalAttrs.finalPackage;
     };
   };
 
diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index ed68bcb2ec19..109f71454fe2 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   nix-update-script,
   cmake,
@@ -148,6 +149,14 @@ stdenv.mkDerivation (finalAttrs: {
     qtwayland
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "fix-build-qt-6.10.patch";
+      url = "https://github.com/RPCS3/rpcs3/commit/038ee090b731bf63917371a3586c2f7d7cf4e585.patch";
+      hash = "sha256-jTIxsheG9b9zp0JEeWQ73BunAXmEIg5tj4SrWBfdHy8=";
+    })
+  ];
+
   doInstallCheck = true;
 
   preFixup = ''
diff --git a/pkgs/by-name/rp/rpiplay/package.nix b/pkgs/by-name/rp/rpiplay/package.nix
index d12cda394593..9080106042e9 100644
--- a/pkgs/by-name/rp/rpiplay/package.nix
+++ b/pkgs/by-name/rp/rpiplay/package.nix
@@ -52,6 +52,11 @@ stdenv.mkDerivation {
     gst_all_1.gst-plugins-ugly
   ];
 
+  postPatch = ''
+    substituteInPlace {lib/playfair/,lib/llhttp/,lib/,renderers/,./}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://github.com/FD-/RPiPlay";
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index 4299fd89c97f..7009a75d4d89 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       aristid
       Br1ght0ne
-      figsoda
     ];
   };
 })
diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index 957d68a1ed3e..7cdba738aec7 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rqlite";
-  version = "9.1.2";
+  version = "9.1.3";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = "rqlite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7QAJofhssL2N5szD4j9rcv830sEnMyrS2Mg4s4G33HI=";
+    hash = "sha256-BybfZio4SSlpTbNHWfiA/2lVcNXhKWaBNTEoCSDxMSE=";
   };
 
-  vendorHash = "sha256-zGAC7yDccfhZ+2WeiN9DAsOFTa3j4ymPxeFNwam7+Ts=";
+  vendorHash = "sha256-bkAlZT0bntSdVwioEaqBK7XObGwJuIG7tfF7XOr3lKQ=";
 
   subPackages = [
     "cmd/rqlite"
diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix
index a96bd5848e0a..b2b99af70126 100644
--- a/pkgs/by-name/rs/rsass/package.nix
+++ b/pkgs/by-name/rs/rsass/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix
index 8c7a54f32460..20c8ec331bf4 100644
--- a/pkgs/by-name/rs/rsign2/package.nix
+++ b/pkgs/by-name/rs/rsign2/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsign2";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-SmrTMMHnB5r0K6zL9B2qJwyywFxUTidQDejnFsOTT4E=";
+    hash = "sha256-cjucecEg5ERPsiaDuGESf2u9RTYHpQmHwWPnx1ask0I=";
   };
 
-  cargoHash = "sha256-eWPZROftFA0pTgFDl4AuUP5yO863ar+HAcjCRk5c+cA=";
+  cargoHash = "sha256-pVEv7FST/jm4YNoU8T48/an2MsqboHXc+PMPYf13pKQ=";
 
   meta = with lib; {
     description = "Command-line tool to sign files and verify signatures";
     homepage = "https://github.com/jedisct1/rsign2";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rsign";
   };
 }
diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix
index a2ae78e45362..166b46993283 100644
--- a/pkgs/by-name/rs/rslint/package.nix
+++ b/pkgs/by-name/rs/rslint/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     description = "Fast, customizable, and easy to use JavaScript and TypeScript linter";
     homepage = "https://rslint.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix
index a48b05c238cf..134b3c8715c0 100644
--- a/pkgs/by-name/rs/rsonpath/package.nix
+++ b/pkgs/by-name/rs/rsonpath/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/v0ldek/rsonpath";
     changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rq";
   };
 }
diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix
index 3159e749318e..86ebff4bccfd 100644
--- a/pkgs/by-name/rs/rspamd/package.nix
+++ b/pkgs/by-name/rs/rspamd/package.nix
@@ -56,8 +56,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  hardeningEnable = [ "pie" ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix
index 8eed1049eac5..700967b0557b 100644
--- a/pkgs/by-name/rs/rssguard/package.nix
+++ b/pkgs/by-name/rs/rssguard/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  qt6,
   kdePackages,
   wrapGAppsHook4,
 }:
@@ -19,20 +20,28 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    kdePackages.qtwebengine
-    kdePackages.qttools
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwebengine
+    qt6.qttools
+    qt6.qt5compat
     kdePackages.mpvqt
-    kdePackages.full
   ];
   nativeBuildInputs = [
     cmake
     wrapGAppsHook4
-    kdePackages.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   cmakeFlags = with lib; [
     (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
   ];
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   meta = {
     description = "Simple RSS/Atom feed reader with online synchronization";
     mainProgram = "rssguard";
diff --git a/pkgs/by-name/rs/rstudio/package.nix b/pkgs/by-name/rs/rstudio/package.nix
index 94ee478ea25f..510a1a39eebb 100644
--- a/pkgs/by-name/rs/rstudio/package.nix
+++ b/pkgs/by-name/rs/rstudio/package.nix
@@ -24,7 +24,6 @@
   yarnConfigHook,
   zip,
 
-  apple-sdk_11,
   boost187,
   electron_37,
   fontconfig,
@@ -160,9 +159,6 @@ stdenv.mkDerivation rec {
     soci
     sqlite.dev
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_11
-  ]
   ++ lib.optionals (!server) [
     fontconfig
   ]
diff --git a/pkgs/by-name/rs/rsyncy/package.nix b/pkgs/by-name/rs/rsyncy/package.nix
index 131d894de0f5..a4e7f6807591 100644
--- a/pkgs/by-name/rs/rsyncy/package.nix
+++ b/pkgs/by-name/rs/rsyncy/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rsyncy";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "laktak";
     repo = "rsyncy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sy0aMYT7xrBfXB3YxLGL49jKVnRpWo5k+3mjQNAOagU=";
+    hash = "sha256-ZWahPfAW6m86C0jdUB8Hfmx2A3i4NLsnAWI0HVoAbcE=";
   };
 
-  vendorHash = "sha256-vexWkbUQdkWrDJVvu2T4z4hbiCANuW0qLNFNSiTmYtY=";
+  vendorHash = "sha256-xEjLMp4hbRrSvHBsuFxYsyNB7s2P876dV1NyAXycGoo=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/rt/rtags/package.nix b/pkgs/by-name/rt/rtags/package.nix
index a5ebc016da6e..67bae281880e 100644
--- a/pkgs/by-name/rt/rtags/package.nix
+++ b/pkgs/by-name/rt/rtags/package.nix
@@ -2,17 +2,17 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   llvmPackages,
   openssl,
   emacs,
   pkg-config,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rtags";
-  version = "2.38";
+  version = "2.41-unstable-2025-09-23";
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
     llvmPackages.llvm
     llvmPackages.libclang
     openssl
-    emacs
+    (emacs.override { withNativeCompilation = false; })
   ]
   ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ];
 
   src = fetchFromGitHub {
     owner = "andersbakken";
     repo = "rtags";
-    tag = "v${version}";
-    hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
+    rev = "836e4f30ea51ef2074d3231d2118f43e8e32042f";
+    hash = "sha256-dPCXGDDK3sC0oYCTX3Ph3MYxAZqOSaRG7c4+LB/n+Rs=";
     fetchSubmodules = true;
     # unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation
@@ -39,25 +39,19 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  # This should be fixed with the next version bump
-  # https://github.com/Andersbakken/rtags/issues/1411
-  patches = [
-    (fetchpatch {
-      name = "define-obsolete-function-alias.patch";
-      url = "https://github.com/Andersbakken/rtags/commit/63f18acb21e664fd92fbc19465f0b5df085b5e93.patch";
-      sha256 = "sha256-dmEPtnk8Pylmf5479ovHKItRZ+tJuOWuYOQbWB/si/Y=";
-    })
-  ];
-
   preConfigure = ''
     export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
            LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = {
     description = "C/C++ client-server indexer based on clang";
     homepage = "https://github.com/andersbakken/rtags";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; x86_64 ++ aarch64;
   };
-}
+})
diff --git a/pkgs/by-name/rt/rtl_433/package.nix b/pkgs/by-name/rt/rtl_433/package.nix
index 6ef7599712ce..59238ee0b166 100644
--- a/pkgs/by-name/rt/rtl_433/package.nix
+++ b/pkgs/by-name/rt/rtl_433/package.nix
@@ -33,6 +33,12 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postPatch = ''
+    substituteInPlace ./CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)" \
+      "cmake_minimum_required(VERSION 2.6...3.10)"
+  '';
+
   meta = with lib; {
     description = "Decode traffic from devices that broadcast on 433.9 MHz, 868 MHz, 315 MHz, 345 MHz and 915 MHz";
     homepage = "https://github.com/merbanan/rtl_433";
diff --git a/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/pkgs/by-name/rt/rtl_fm_streamer/package.nix
index ff1857e6d2cf..435744ea7666 100644
--- a/pkgs/by-name/rt/rtl_fm_streamer/package.nix
+++ b/pkgs/by-name/rt/rtl_fm_streamer/package.nix
@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace rtl-sdr.rules \
       --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/rt/rttr/package.nix b/pkgs/by-name/rt/rttr/package.nix
index 9cf8dee8a877..da0822946ccc 100644
--- a/pkgs/by-name/rt/rttr/package.nix
+++ b/pkgs/by-name/rt/rttr/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_PACKAGE=OFF"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     description = "C++ Reflection Library";
diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix
index f8f1f6a8bf44..19267444a5e8 100644
--- a/pkgs/by-name/rt/rtz/package.nix
+++ b/pkgs/by-name/rt/rtz/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/twitchax/rtz";
     changelog = "https://github.com/twitchax/rtz/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rtz";
   };
 }
diff --git a/pkgs/by-name/ru/rubyfmt/0002-remove-dependency-on-git.patch b/pkgs/by-name/ru/rubyfmt/0002-remove-dependency-on-git.patch
index d7e3b90ab79f..23a355c60343 100644
--- a/pkgs/by-name/ru/rubyfmt/0002-remove-dependency-on-git.patch
+++ b/pkgs/by-name/ru/rubyfmt/0002-remove-dependency-on-git.patch
@@ -1,20 +1,9 @@
-From 3bbc396c4ddc8a5e26f7776155bb366c8d47c440 Mon Sep 17 00:00:00 2001
-From: Bob van der Linden <bobvanderlinden@gmail.com>
-Date: Thu, 9 Feb 2023 16:55:00 +0100
-Subject: [PATCH 2/2] remove dependency on git
-
----
- librubyfmt/build.rs | 35 +++--------------------------------
- 1 file changed, 3 insertions(+), 32 deletions(-)
-
-diff --git a/librubyfmt/build.rs b/librubyfmt/build.rs
-index ef94c09..4668785 100644
 --- a/librubyfmt/build.rs
 +++ b/librubyfmt/build.rs
-@@ -26,27 +26,9 @@ fn main() -> Output {
-     let path = std::env::current_dir()?;
+@@ -33,27 +33,9 @@
+     let path = env::current_dir()?;
      let ruby_checkout_path = path.join("ruby_checkout");
- 
+
 -    let old_checkout_sha = if ruby_checkout_path.join(ripper).exists() {
 -        Some(get_ruby_checkout_sha())
 -    } else {
@@ -22,7 +11,7 @@ index ef94c09..4668785 100644
 -    };
 -
 -    let _ = Command::new("git")
--        .args(&["submodule", "update", "--init"])
+-        .args(["submodule", "update", "--init"])
 -        .status();
 -
 -    let new_checkout_sha = get_ruby_checkout_sha();
@@ -39,17 +28,18 @@ index ef94c09..4668785 100644
 +    make_configure(&ruby_checkout_path)?;
 +    run_configure(&ruby_checkout_path)?;
 +    build_ruby(&ruby_checkout_path)?;
- 
-     cc::Build::new()
-         .file("src/rubyfmt.c")
-@@ -152,14 +134,3 @@ fn check_process_success(command: &str, code: ExitStatus) -> Output {
+
+     let arch = extract_ruby_arch(&ruby_checkout_path);
+
+@@ -225,15 +207,3 @@
+         Err(format!("Command {} failed with: {}", command, code).into())
      }
  }
- 
+-
 -fn get_ruby_checkout_sha() -> String {
 -    String::from_utf8(
 -        Command::new("git")
--            .args(&["rev-parse", "HEAD"])
+-            .args(["rev-parse", "HEAD"])
 -            .current_dir("./ruby_checkout")
 -            .output()
 -            .expect("git rev-parse shouldn't fail")
@@ -57,6 +47,3 @@ index ef94c09..4668785 100644
 -    )
 -    .expect("output should be valid utf8")
 -}
--- 
-2.39.1
-
diff --git a/pkgs/by-name/ru/rubyfmt/package.nix b/pkgs/by-name/ru/rubyfmt/package.nix
index c7df49763b0c..e9c7b90ab385 100644
--- a/pkgs/by-name/ru/rubyfmt/package.nix
+++ b/pkgs/by-name/ru/rubyfmt/package.nix
@@ -14,17 +14,18 @@
   libxcrypt,
   libyaml,
   rust-jemalloc-sys-unprefixed,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rubyfmt";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "fables-tales";
     repo = "rubyfmt";
-    tag = "v${version}";
-    hash = "sha256-IIHPU6iwFwQ5cOAtOULpMSjexFtTelSd/LGLuazdmUo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wGvfmBm2GNXASXc//K2JOrn/iUdlbA5dDReNJ+NqjDM=";
     fetchSubmodules = true;
   };
 
@@ -61,7 +62,7 @@ rustPlatform.buildRustPackage rec {
     ./0003-ignore-warnings.patch
   ];
 
-  cargoHash = "sha256-8LgAHznxU30bbK8ivNamVD3Yi2pljgpqJg2WC0nxftk=";
+  cargoHash = "sha256-jJa/6TKwTTN3xOBuUy+YdwKOJbtYVrmlHgMyqPCVqVs=";
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-fdeclspec";
 
@@ -69,6 +70,8 @@ rustPlatform.buildRustPackage rec {
     mv $out/bin/rubyfmt{-main,}
   '';
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
+
   meta = {
     description = "Ruby autoformatter";
     homepage = "https://github.com/fables-tales/rubyfmt";
@@ -77,4 +80,4 @@ rustPlatform.buildRustPackage rec {
     broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "rubyfmt";
   };
-}
+})
diff --git a/pkgs/by-name/ru/rucksack/package.nix b/pkgs/by-name/ru/rucksack/package.nix
deleted file mode 100644
index c6d84a6f2961..000000000000
--- a/pkgs/by-name/ru/rucksack/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  liblaxjson,
-  cmake,
-  freeimage,
-}:
-
-stdenv.mkDerivation rec {
-  version = "3.1.0";
-  pname = "rucksack";
-
-  src = fetchFromGitHub {
-    owner = "andrewrk";
-    repo = "rucksack";
-    rev = version;
-    sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    liblaxjson
-    freeimage
-  ];
-
-  meta = with lib; {
-    description = "Texture packer and resource bundler";
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ]; # fails on Darwin and AArch64
-    homepage = "https://github.com/andrewrk/rucksack";
-    license = licenses.mit;
-    maintainers = [ maintainers.andrewrk ];
-  };
-}
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 91f01c964b9b..c56b26a73cce 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.14.0";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-Vueccz5lkUTdgqqZl/+PB0kVYezvPKIVxee8EJYcz4g=";
+    hash = "sha256-iYXZyB0s3rlGV3HQLN1fuAohFUm/53VLAwA3Ahj6HzM=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-bnSTiQzlZrS2tqQiRHr6gNDq40Naqxrxcyc8zcVlt7A=";
+  cargoHash = "sha256-dYXFNe+nglKelgzi2Afo0AJyt53qfCAJ7reTMMfjWOI=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -95,7 +95,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "ruff";
     maintainers = with lib.maintainers; [
       bengsparks
-      figsoda
       GaetanLepage
     ];
   };
diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 88f21c5a448e..1acc5e8c6098 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -27,13 +27,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0.2.0-nightly-2025-10-12";
+  version = "0.2.0-nightly-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
-    hash = "sha256-QJ1Mz1CR/2NIKiNA7DfjYrurHAtQxvZephJQCLxbmwc=";
+    hash = "sha256-CthzW6yJLQPqzLotDD8jy46nvQKSUbK5I3z18y/CyyU=";
   };
 
   postPatch =
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
                        "OpenH264Version(${major}, ${minor}, ${patch})"
     '';
 
-  cargoHash = "sha256-zFmGusWYN0PJ+3Q89JMixehWYigYqmWZCG+lgyLkUhE=";
+  cargoHash = "sha256-i0qyi3hBEmc5LuKaBpKPFwk24BQNj2AT26Erz2P5ENk=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =
diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix
new file mode 100644
index 000000000000..b920521248a0
--- /dev/null
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "rumdl";
+  version = "0.0.166";
+
+  src = fetchFromGitHub {
+    owner = "rvben";
+    repo = "rumdl";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg=";
+  };
+
+  cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU=";
+
+  cargoBuildFlags = [
+    "--bin=rumdl"
+  ];
+
+  __darwinAllowLocalNetworking = true; # required for LSP tests
+
+  useNextest = true;
+
+  cargoTestFlags = [
+    "--profile ci"
+  ];
+
+  checkFlags = [
+    # Skip Windows tests
+    "--skip comprehensive_windows_tests"
+    "--skip windows_vscode_tests"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Markdown linter and formatter";
+    longDescription = ''
+      rumdl is a high-performance Markdown linter and formatter
+      that helps ensure consistency and best practices in your Markdown files.
+    '';
+    homepage = "https://github.com/rvben/rumdl";
+    changelog = "https://github.com/rvben/rumdl/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      kachick
+      hasnep
+    ];
+    mainProgram = "rumdl";
+    platforms = with lib.platforms; unix ++ windows;
+  };
+})
diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index a48dce995f98..ff338d4480df 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.16.0-20251006";
+  version = "5.17.0-20251103";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-ws84HDqowYz2ouvN7E3SlouGZdZUDVDK4LUmzKXOyec=";
+    hash = "sha256-Bw/aLsJ65BSr1NDmOWanOm6lsClaYpKdmeGpYiO0KNc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix
index 155c1fdebc46..3c15a36fe587 100644
--- a/pkgs/by-name/ru/rune-languageserver/package.nix
+++ b/pkgs/by-name/ru/rune-languageserver/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rune-languageserver";
   };
 }
diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index b754379731eb..56538861b345 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rune";
   };
 }
diff --git a/pkgs/by-name/ru/runiq/package.nix b/pkgs/by-name/ru/runiq/package.nix
index 85cd0995f1f5..c85b8ed4b46a 100644
--- a/pkgs/by-name/ru/runiq/package.nix
+++ b/pkgs/by-name/ru/runiq/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage {
     mainProgram = "runiq";
     homepage = "https://github.com/whitfin/runiq";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index 542f07cb3154..902c4d249c61 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -76,6 +76,6 @@ buildGoModule rec {
     homepage = "https://runme.dev";
     changelog = "https://github.com/runmedev/runme/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rure/Cargo.lock b/pkgs/by-name/ru/rure/Cargo.lock
index 112698c1c39c..e467ee4229ca 100644
--- a/pkgs/by-name/ru/rure/Cargo.lock
+++ b/pkgs/by-name/ru/rure/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "aho-corasick"
@@ -13,21 +13,21 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -37,9 +37,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -48,13 +48,13 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rure"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "libc",
  "regex",
diff --git a/pkgs/by-name/ru/rure/pin.json b/pkgs/by-name/ru/rure/pin.json
index 5078676c08ca..7fc7680099f9 100644
--- a/pkgs/by-name/ru/rure/pin.json
+++ b/pkgs/by-name/ru/rure/pin.json
@@ -1,5 +1,5 @@
 {
   "pname": "rure",
-  "version": "0.2.3",
-  "hash": "sha256:0d8r0fv93ganqi9iyrgljbkvrvys33n0zrkaf11zsb23b2hwcsxa"
+  "version": "0.2.4",
+  "hash": "sha256:02wgpjllvlqhcpj8w59qwfjhxch3qy5i2qg3a1v1555dhhzqnnwl"
 }
diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index f1772bc8062c..8c0705762c6a 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -12,15 +12,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2025-08-25";
+  version = "2025-10-28";
 
-  cargoHash = "sha256-G1R3IiKbQg1Dl6OFJSto0w4c18OUIrAPRiM/YStfkl0=";
+  cargoHash = "sha256-iw+Pgtv5VkCRSa07ap5fjhVZQgo+sfNjp5A4yaHdX1M=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-apbJj2tsJkL2l+7Or9tJm1Mt5QPB6w/zIyDkCx8pfvk=";
+    hash = "sha256-rNsxpCKWzVNJ5FR71mpZFSEPxuvZfAQzcVpgfwgajQU=";
   };
 
   cargoBuildFlags = [
diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix
index a08eb73b92e0..f9571cc03743 100644
--- a/pkgs/by-name/ru/rust-audit-info/package.nix
+++ b/pkgs/by-name/ru/rust-audit-info/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rust-cbindgen/package.nix b/pkgs/by-name/ru/rust-cbindgen/package.nix
index 57b3004ecc25..0190edf76fea 100644
--- a/pkgs/by-name/ru/rust-cbindgen/package.nix
+++ b/pkgs/by-name/ru/rust-cbindgen/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-cbindgen";
-  version = "0.29.0";
+  version = "0.29.2";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "cbindgen";
     rev = "v${version}";
-    hash = "sha256-wCl2GpHqF7wKIE8UFyZRY0M1hxonZek2FN6+5x/jGWI=";
+    hash = "sha256-P2A+XSLrcuYsI48gnZSNNs5qX+EatiuEJSEJbMvMSxg=";
   };
 
-  cargoHash = "sha256-BErgOnmatxpfF5Ip44WOqnEWOzOJaVP6vfhXPsF9wuc=";
+  cargoHash = "sha256-DbmlpjiOraLWPh5RgJqCIGIYzE1h82MH2S6gpLH+CIQ=";
 
   nativeCheckInputs = [
     cmake
diff --git a/pkgs/by-name/ru/rust-code-analysis/package.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix
index 03319c79b69b..f614b87f20a2 100644
--- a/pkgs/by-name/ru/rust-code-analysis/package.nix
+++ b/pkgs/by-name/ru/rust-code-analysis/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
       mit # grammars
       mpl20 # code
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rust-code-analysis-cli";
   };
 }
diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix
index 2a3ae32872a0..9f7f172fec33 100644
--- a/pkgs/by-name/ru/rust-motd/package.nix
+++ b/pkgs/by-name/ru/rust-motd/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/rust-motd/rust-motd";
     changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "rust-motd";
   };
 }
diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix
index 52bcf3fc4722..ec655a6ee1aa 100644
--- a/pkgs/by-name/ru/rust-petname/package.nix
+++ b/pkgs/by-name/ru/rust-petname/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     description = "Generate human readable random names";
     homepage = "https://github.com/allenap/rust-petname";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "petname";
   };
 }
diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix
index 29fe468af4fd..d08252c4e1fc 100644
--- a/pkgs/by-name/ru/rust-script/package.nix
+++ b/pkgs/by-name/ru/rust-script/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rust-stakeholder/package.nix b/pkgs/by-name/ru/rust-stakeholder/package.nix
index b0b8472d6723..209e31b56a87 100644
--- a/pkgs/by-name/ru/rust-stakeholder/package.nix
+++ b/pkgs/by-name/ru/rust-stakeholder/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
     description = "Generate impressive-looking terminal output to look busy when stakeholders walk by";
     homepage = "https://github.com/giacomo-b/rust-stakeholder";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "rust-stakeholder";
   };
 }
diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix
index aaa8fe5bed65..bcf9d76e7b35 100644
--- a/pkgs/by-name/ru/rust-traverse/package.nix
+++ b/pkgs/by-name/ru/rust-traverse/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/dmcg310/Rust-Traverse";
     changelog = "https://github.com/dmcg310/Rust-Traverse/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rt";
   };
 }
diff --git a/pkgs/by-name/ru/rustdesk-flutter/gitHashes.json b/pkgs/by-name/ru/rustdesk-flutter/gitHashes.json
new file mode 100644
index 000000000000..4fcdba63036a
--- /dev/null
+++ b/pkgs/by-name/ru/rustdesk-flutter/gitHashes.json
@@ -0,0 +1,10 @@
+{
+  "dash_chat_2": "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=",
+  "desktop_multi_window": "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=",
+  "dynamic_layouts": "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=",
+  "flutter_gpu_texture_renderer": "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=",
+  "texture_rgba_renderer": "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=",
+  "uni_links": "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=",
+  "window_manager": "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=",
+  "window_size": "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="
+}
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index dc861b228d97..05459b33fc5c 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -4,7 +4,7 @@
   cargo,
   copyDesktopItems,
   fetchFromGitHub,
-  flutter,
+  flutter329,
   ffmpeg,
   gst_all_1,
   fuse3,
@@ -56,22 +56,22 @@ let
   };
 
   ffigen = callPackage ./ffigen {
-    inherit flutter;
+    flutter = flutter329;
   };
 
   sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary;
 
 in
-flutter.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
+    hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ=";
   };
 
   strictDeps = true;
@@ -81,16 +81,7 @@ flutter.buildFlutterApplication rec {
   sourceRoot = "${src.name}/flutter";
   # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.4.1/flutter/pubspec.lock | yq > pubspec.lock.json
   pubspecLock = lib.importJSON ./pubspec.lock.json;
-  gitHashes = {
-    dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
-    desktop_multi_window = "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=";
-    dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
-    flutter_gpu_texture_renderer = "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=";
-    window_manager = "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=";
-    window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
-    texture_rgba_renderer = "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=";
-    uni_links = "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=";
-  };
+  gitHashes = lib.importJSON ./gitHashes.json;
 
   # Configure the Rust build
   cargoRoot = "..";
@@ -101,7 +92,7 @@ flutter.buildFlutterApplication rec {
       src
       patches
       ;
-    hash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
+    hash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw=";
   };
 
   dontCargoBuild = true;
diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
index 98d5e9d4d772..848db8174d75 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@@ -4,17 +4,11 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.2"
+      "version": "85.0.0"
     },
     "after_layout": {
       "dependency": "transitive",
@@ -30,31 +24,31 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "7.7.1"
     },
     "animations": {
       "dependency": "transitive",
       "description": {
         "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+        "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.11"
+      "version": "2.1.0"
     },
     "archive": {
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
@@ -130,11 +124,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.5.4"
     },
     "build_cli_annotations": {
       "dependency": "transitive",
@@ -150,51 +144,51 @@
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+        "sha256": "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.0"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.5.4"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
+      "version": "2.5.4"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
+        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.2"
+      "version": "9.1.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -210,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.10.1"
+      "version": "8.12.0"
     },
     "cached_network_image": {
       "dependency": "transitive",
@@ -250,11 +244,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "charcode": {
       "dependency": "transitive",
@@ -290,31 +284,31 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.1"
     },
     "contextmenu": {
       "dependency": "direct main",
@@ -370,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "3.1.1"
     },
     "dash_chat_2": {
       "dependency": "direct main",
@@ -442,11 +436,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.2"
+      "version": "7.0.3"
     },
     "draggable_float_widget": {
       "dependency": "direct main",
@@ -493,11 +487,11 @@
       "dependency": "direct main",
       "description": {
         "name": "extended_text",
-        "sha256": "38c1cac571d6eaf406f4b80040c1f88561e7617ad90795aac6a1be0a8d0bb676",
+        "sha256": "sha256-2PSm4mdlBbVNwNX16N6QIGZ7QC6cGzqLAwqD5WjJllQ=",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.0.0"
+      "version": "15.0.2"
     },
     "extended_text_library": {
       "dependency": "transitive",
@@ -523,11 +517,11 @@
       "dependency": "direct main",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "ffigen": {
       "dependency": "direct dev",
@@ -573,11 +567,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+4"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -613,21 +607,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
+        "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.7.1"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
+        "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.1"
+      "version": "3.5.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -796,11 +790,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.1"
     },
     "flutter_web_plugins": {
       "dependency": "transitive",
@@ -812,11 +806,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
+        "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.7"
+      "version": "2.5.8"
     },
     "freezed_annotation": {
       "dependency": "direct main",
@@ -862,11 +856,11 @@
       "dependency": "direct main",
       "description": {
         "name": "google_fonts",
-        "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
+        "sha256": "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.1"
+      "version": "6.3.2"
     },
     "graphs": {
       "dependency": "transitive",
@@ -892,11 +886,11 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -912,11 +906,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "icons_launcher": {
       "dependency": "direct dev",
@@ -932,91 +926,91 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
+        "sha256": "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+21"
+      "version": "0.8.13+1"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
+        "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+2"
+      "version": "0.8.13"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
+        "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
+        "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.1"
+      "version": "2.11.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "intl": {
       "dependency": "direct overridden",
@@ -1078,16 +1072,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2-main.4"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -1112,11 +1096,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1192,11 +1176,11 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_parsing": {
       "dependency": "transitive",
@@ -1222,21 +1206,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.19"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1292,11 +1276,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
@@ -1322,21 +1306,31 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
     },
     "provider": {
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1352,11 +1346,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "pull_down_button": {
       "dependency": "direct main",
@@ -1372,11 +1366,11 @@
       "dependency": "transitive",
       "description": {
         "name": "puppeteer",
-        "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
+        "sha256": "e072dc2e8de31934c24d3efa9d4ce3cbedf5d9a83a4e503c086ab3a6e2ed644f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.0"
+      "version": "3.19.0"
     },
     "qr": {
       "dependency": "transitive",
@@ -1462,11 +1456,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.2"
     },
     "shelf_static": {
       "dependency": "transitive",
@@ -1502,17 +1496,17 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "source_gen": {
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "2.0.0"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1538,11 +1532,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4+6"
+      "version": "2.5.5"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1588,11 +1582,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1608,11 +1602,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6"
+      "version": "0.7.7"
     },
     "texture_rgba_renderer": {
       "dependency": "direct main",
@@ -1720,31 +1714,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.20"
     },
     "url_launcher_ios": {
       "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.4"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1760,11 +1754,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1780,11 +1774,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -1810,11 +1804,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -1830,11 +1824,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.16"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -1850,51 +1844,51 @@
       "dependency": "transitive",
       "description": {
         "name": "video_player",
-        "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
+        "sha256": "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.9.5"
+      "version": "2.10.0"
     },
     "video_player_android": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_android",
-        "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898",
+        "sha256": "a8dc4324f67705de057678372bedb66cd08572fe7c495605ac68c5f503324a39",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.16"
+      "version": "2.8.15"
     },
     "video_player_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_avfoundation",
-        "sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f",
+        "sha256": "f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.1"
+      "version": "2.8.4"
     },
     "video_player_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_platform_interface",
-        "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844",
+        "sha256": "9e372520573311055cb353b9a0da1c9d72b094b7ba01b8ecc66f28473553793b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.0"
+      "version": "6.5.0"
     },
     "video_player_web": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_web",
-        "sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba",
+        "sha256": "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.5"
+      "version": "2.4.0"
     },
     "visibility_detector": {
       "dependency": "direct main",
@@ -1910,61 +1904,61 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4",
+        "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.1.4"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
+        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1"
+      "version": "1.1.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
+        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.5"
+      "version": "2.4.0"
     },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.10.1"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2070,7 +2064,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.7.0 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }
diff --git a/pkgs/by-name/ru/rustdesk/package.nix b/pkgs/by-name/ru/rustdesk/package.nix
index 779316390b76..ea815b7bf2e9 100644
--- a/pkgs/by-name/ru/rustdesk/package.nix
+++ b/pkgs/by-name/ru/rustdesk/package.nix
@@ -36,17 +36,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustdesk";
-  version = "1.4.2";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-ZUk/6r7HjlWAU7sUxbBxp9ZtxXUJftjcDy/V3LcMNPA=";
+    hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ=";
   };
 
-  cargoHash = "sha256-b0jsW0208zKFMyoqKti8TuTNZL7hQ8PX7Gwm0faW4po=";
+  cargoHash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw=";
 
   patches = [
     ./make-build-reproducible.patch
diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix
index 1d8e90342c25..edfa14e60af8 100644
--- a/pkgs/by-name/ru/rustical/package.nix
+++ b/pkgs/by-name/ru/rustical/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustical";
-  version = "0.9.11";
+  version = "0.9.14";
 
   src = fetchFromGitHub {
     owner = "lennart-k";
     repo = "rustical";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XDnhHgswje335c3OHR/cUO9qtOj1MQBYvAsoH5coiDY=";
+    hash = "sha256-Q5dtkeKX9aqKHKKMTDU1sZkroRfG+kSq66Zj7idwEJg=";
   };
 
-  cargoHash = "sha256-MevmHEdkczL4CcQpjdvv21rvnCmbnSr37Ny6G0kodag=";
+  cargoHash = "sha256-v4aUK1pbaZGuuQD36MPxAZYHJMnkhqvrKzlOdJTOV5g=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix
index e473867af745..2461399de9f3 100644
--- a/pkgs/by-name/ru/rustscan/package.nix
+++ b/pkgs/by-name/ru/rustscan/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/RustScan/RustScan";
     changelog = "https://github.com/RustScan/RustScan/releases/tag/${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rustscan";
   };
 }
diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index fff4408f3af2..1ff58f933b6d 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${finalAttrs.version}/item/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
   };
diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix
new file mode 100644
index 000000000000..10b0184b3670
--- /dev/null
+++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix
@@ -0,0 +1,125 @@
+{
+  lib,
+  rustPlatform,
+  fetchurl,
+  fetchFromGitHub,
+  copyDesktopItems,
+  makeDesktopItem,
+  makeWrapper,
+  pkg-config,
+  icoutils,
+  luajit,
+  zlib,
+  libxkbcommon,
+  vulkan-loader,
+  wayland,
+  xorg,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "rusty-path-of-building";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "meehl";
+    repo = "rusty-path-of-building";
+    rev = "v${version}";
+    hash = "sha256-J/tTifOcbY1mfcNbQFN4Vdyl78O7vTVbfew3fcnVyTA=";
+  };
+
+  cargoHash = "sha256-Oekl6SDIvgFIzPnve7nuib3fEjPGC46F/TNULmgOpew=";
+
+  nativeBuildInputs = [
+    pkg-config
+    icoutils
+    copyDesktopItems
+    makeWrapper
+  ];
+
+  buildInputs = [
+    luajit
+    luajit.pkgs.lua-curl
+    luajit.pkgs.luautf8
+    luajit.pkgs.luasocket
+
+    # this is weird and vendored and should probably stay that way
+    (luajit.pkgs.buildLuaPackage {
+      pname = "lzip";
+      inherit version;
+      src = "${src}/lua/libs/lzip";
+
+      nativeBuildInputs = [ pkg-config ];
+      buildInputs = [ zlib ];
+      installFlags = [ "LUA_CMOD=$(out)/lib/lua/${luajit.luaversion}" ];
+    })
+
+    wayland
+  ];
+
+  postInstall = ''
+    install -Dm444 assets/icon.png $out/share/icons/hicolor/256x256/apps/path-of-building.png
+  '';
+
+  postFixup = ''
+    patchelf $out/bin/rusty-path-of-building \
+      --add-rpath ${
+        lib.makeLibraryPath [
+          libxkbcommon
+          vulkan-loader
+          wayland
+          xorg.libX11
+          xorg.libXcursor
+          xorg.libXi
+        ]
+      }
+
+    wrapProgram $out/bin/rusty-path-of-building \
+      --set LUA_PATH "$LUA_PATH" \
+      --set LUA_CPATH "$LUA_CPATH"
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "rusty-path-of-building-1";
+      desktopName = "Path of Building";
+      comment = "Offline build planner for Path of Exile";
+      exec = "rusty-path-of-building poe1";
+      terminal = false;
+      type = "Application";
+      icon = "path-of-building";
+      categories = [ "Game" ];
+      keywords = [
+        "poe"
+        "pob"
+        "pobc"
+        "path"
+        "exile"
+      ];
+    })
+    (makeDesktopItem {
+      name = "rusty-path-of-building-2";
+      desktopName = "Path of Building 2";
+      comment = "Offline build planner for Path of Exile 2";
+      exec = "rusty-path-of-building poe2";
+      terminal = false;
+      type = "Application";
+      icon = "path-of-building";
+      categories = [ "Game" ];
+      keywords = [
+        "poe"
+        "pob"
+        "pobc"
+        "path"
+        "exile"
+      ];
+    })
+  ];
+
+  meta = {
+    description = "A cross-platform runtime for Path of Building and Path of Building 2.";
+    homepage = "https://github.com/meehl/rusty-path-of-building";
+    changelog = "https://github.com/meehl/rusty-path-of-building/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ k900 ];
+    mainProgram = "rusty-path-of-building";
+  };
+}
diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix
index 3a3304f5f956..4ce2c02cd5ce 100644
--- a/pkgs/by-name/ru/rusty-psn/package.nix
+++ b/pkgs/by-name/ru/rusty-psn/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rusty-psn";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchFromGitHub {
     owner = "RainbowCookie32";
     repo = "rusty-psn";
     tag = "v${version}";
-    hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I=";
+    hash = "sha256-3sy3PBiV7ioRnYwI2vF6lGVj3Q/Ls6GmENyGePCgQ3k=";
   };
 
-  cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw=";
+  cargoHash = "sha256-orsCExYx9ZGtda13mmFk7665WFwZ7E7rr5wEcDxc+vY=";
 
   # Tests require network access
   doCheck = false;
diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix
index b224c272a8af..c7568299a007 100644
--- a/pkgs/by-name/ru/rustycli/package.nix
+++ b/pkgs/by-name/ru/rustycli/package.nix
@@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/pwnwriter/rustycli";
     changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
index 0c98a85471a8..a62165a66d25 100644
--- a/pkgs/by-name/ru/rustypaste-cli/package.nix
+++ b/pkgs/by-name/ru/rustypaste-cli/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orhun/rustypaste-cli";
     changelog = "https://github.com/orhun/rustypaste-cli/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rpaste";
   };
 }
diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index 6043e05a0ae8..0d9bb517f5fb 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       seqizz
     ];
     mainProgram = "rustypaste";
diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index c788be55e039..ac04fdbffa0a 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/avencera/rustywind";
     changelog = "https://github.com/avencera/rustywind/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ry/rygel/package.nix b/pkgs/by-name/ry/rygel/package.nix
index ee3bb60d9310..d1b8b42e588e 100644
--- a/pkgs/by-name/ry/rygel/package.nix
+++ b/pkgs/by-name/ry/rygel/package.nix
@@ -11,7 +11,7 @@
   libxml2,
   libxslt,
   gobject-introspection,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
   wrapGAppsNoGuiHook,
   python3,
   gdk-pixbuf,
@@ -25,7 +25,7 @@
   libsoup_3,
   libX11,
   withGtk ? true,
-  gtk3,
+  gtk4,
   libmediaart,
   pipewire,
   sqlite,
@@ -38,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rygel";
-  version = "0.44.2";
+  version = "45.0";
 
   # TODO: split out lib
   outputs = [
@@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/rygel/${lib.versions.majorMinor finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
-    hash = "sha256-eW7uSUzfYNwr+CsAuPmaFLocfPQNKUSBf/DBqmBz1aA=";
+    url = "mirror://gnome/sources/rygel/${lib.versions.major finalAttrs.version}/rygel-${finalAttrs.version}.tar.xz";
+    hash = "sha256-gmZ7kC/AZy5kz5HrcnpwE3qP3+ej2aTBWLD0sfxwCII=";
   };
 
   patches = [
@@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxml2
     libxslt # for xsltproc
     gobject-introspection
-    (if withGtk then wrapGAppsHook3 else wrapGAppsNoGuiHook)
+    (if withGtk then wrapGAppsHook4 else wrapGAppsNoGuiHook)
     python3
   ];
 
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     tinysparql
     shared-mime-info
   ]
-  ++ lib.optionals withGtk [ gtk3 ]
+  ++ lib.optionals withGtk [ gtk4 ]
   ++ (with gst_all_1; [
     gstreamer
     gst-editing-services
diff --git a/pkgs/by-name/ry/rymcast/package.nix b/pkgs/by-name/ry/rymcast/package.nix
index 26d8d851fd24..8ba351fafe1a 100644
--- a/pkgs/by-name/ry/rymcast/package.nix
+++ b/pkgs/by-name/ry/rymcast/package.nix
@@ -7,7 +7,7 @@
   alsa-lib,
   curl,
   gtk3,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   zenity,
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     curl
     gtk3
     (lib.getLib stdenv.cc.cc)
-    webkitgtk_4_0
+    # webkitgtk_4_0
     zenity
   ];
 
@@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Player for Mega Drive/Genesis VGM files";
     homepage = "https://www.inphonik.com/products/rymcast-genesis-vgm-player/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/by-name/rz/rzls/deps.json b/pkgs/by-name/rz/rzls/deps.json
index 44f7c584b212..16d7d77ebc93 100644
--- a/pkgs/by-name/rz/rzls/deps.json
+++ b/pkgs/by-name/rz/rzls/deps.json
@@ -43,9 +43,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-BsNPX6p08WG5unEZOq/m8c9iKQ2tcX8LiUj2Icf9Mm8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25452.2/microsoft.codeanalysis.analyzers.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-ARzhiaKHCyl9IY39hWfzHiv5eDmmTBgnrhRaoYGSfTU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25461.22/microsoft.codeanalysis.analyzers.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -55,27 +55,27 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-C5ymxF29vgwu9Jwl7CwNEf4+zpb7fFLUdBGPVnf+Ixs=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25452.2/microsoft.codeanalysis.common.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-GltCV7wW9rNxN2k6pS26lILDVDZcoyAZD1td4lmzKn4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25461.22/microsoft.codeanalysis.common.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-foZzAkEdfdtvF3WJwUhdC51KeBHnTdBoH+JGV5XD5A0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-+mf1IuoaRl5RPU6RjXrHkrdes8jE3z/JAPw+0ab4Fzk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25461.22/microsoft.codeanalysis.csharp.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Features",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-3J+9YhYUePNRX8sWJQNbK3G/FjS+sh5ML1ix1zn5B5Q=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.features.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-tPGG+CWkok0B9ggro1wU0g9iLaJ//oUtE/Z4EEqLdjk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25461.22/microsoft.codeanalysis.csharp.features.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-Wnqq7HFdRvwde+tx1fLufiVOeAZul5jDasswEKFLhdk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-9FTv+MloLtCBFmLN1eZ+7dLrHrMlFPA7na8gB2LwO0U=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25461.22/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Elfie",
@@ -85,21 +85,21 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-cfOyGxroU5SZAUar6YROo2o6lsr2lVAkYMQopIsIRnc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25452.2/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-LdE0uEZqa0NYG9n2MdVVw4gkj/5WlRjbdu0tL9u3Ir4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25461.22/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Features",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-3flzK3w1P+YEm93XeKyWKKu0de7uaSJhRR6CjDi2uAo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25452.2/microsoft.codeanalysis.features.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-vx5X2WC2Oc8sMmfOK09JOXMDtIdKeAXQJzD28DAeX0Q=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25461.22/microsoft.codeanalysis.features.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-VbfgcAULLmLjGHfqYD1ohJPLZn65b8JFaOnP0kucqJg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25452.2/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-c75mxIhdNy5MmCxFQBTkyiyOgIDcTcBn2q+za3sR+gE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25461.22/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
@@ -109,27 +109,27 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Remote.Workspaces",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-jYHylTS3OO84UFz1vfB8ST/k5G/XI6Ks4lOE5DYlPcw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-kdk4Xb2DIK/ClG7sRFrP8KhmWjoi/t12zuEvt29D12I=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25461.22/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-dG632yqX95EwXqDfhnBwhbS1/fuex7fUjM/wUnPQaR0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25452.2/microsoft.codeanalysis.scripting.common.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-Y9D+zE9oiEceJ7eaD9jb0YWA/p7GG76m8TqL+bFex8U=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25461.22/microsoft.codeanalysis.scripting.common.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-JNadLPLKA2wuThQABqj3/PKPhMTrn72VjNumkGbkNm4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25452.2/microsoft.codeanalysis.workspaces.common.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-EmmjTePJXCdGjqYSFXHrZ6twXaJ9WWvLTFKrQGjVmhw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25461.22/microsoft.codeanalysis.workspaces.common.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CommonLanguageServerProtocol.Framework",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-b/kxQt5KyluSGkkmFzy9+EGlTOW5gBv3bkM/t5PbB+8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25452.2/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-1ek78xZapHDcYE6JEXhXjwuLDNZgr/jLckM7WEw8G0I=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25461.22/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -145,15 +145,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "9.0.0-beta.25428.3",
-    "hash": "sha256-imlZjZcVWjNXO0yZmSoXPOlxX/qaJ96LeN8Xb/ox+Vk=",
-    "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.25428.3/microsoft.dotnet.arcade.sdk.9.0.0-beta.25428.3.nupkg"
+    "version": "9.0.0-beta.25462.4",
+    "hash": "sha256-UsK0l85wtrwYf7tmEELr3RfCf+Y3IKInI8IOziPfEE4=",
+    "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.25462.4/microsoft.dotnet.arcade.sdk.9.0.0-beta.25462.4.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "9.0.0-beta.25428.3",
-    "hash": "sha256-4Jgieh85GiTg8rmQb3esR0UZTuj+L2cLzwyC0ziOBDc=",
-    "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.25428.3/microsoft.dotnet.xlifftasks.9.0.0-beta.25428.3.nupkg"
+    "version": "9.0.0-beta.25462.4",
+    "hash": "sha256-Pd3JOHzGDL+gwNy+2wlvsoUFU8S0q71af6vmdApbHPA=",
+    "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.25462.4/microsoft.dotnet.xlifftasks.9.0.0-beta.25462.4.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -181,9 +181,9 @@
   },
   {
     "pname": "Microsoft.Net.Compilers.Toolset",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-lrjvenHm6/z8Fy37UaUdKjM36zlwe43revlQjg+aqV4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25452.2/microsoft.net.compilers.toolset.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-MNgU0lJksVPs7o1yMRWcpativck4As+cG4mOFbFPYLw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25461.22/microsoft.net.compilers.toolset.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.NET.StringTools",
diff --git a/pkgs/by-name/rz/rzls/package.nix b/pkgs/by-name/rz/rzls/package.nix
index 3964d85dc55c..c17bf107bdf4 100644
--- a/pkgs/by-name/rz/rzls/package.nix
+++ b/pkgs/by-name/rz/rzls/package.nix
@@ -29,11 +29,11 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "razor";
-    rev = "bde4f70c9560811a7f25023b9d8ac42fd7d0e99f";
-    hash = "sha256-wS7JKHLpX9/JluID94HXUkepaX9eoceRzuIofBICiBk=";
+    rev = "73622b728a3015c601aeada75eb8425bde7ba439";
+    hash = "sha256-uy6e9J/mx05wlRILoetnSyRYXvaveGIVzdQKDHEfrVQ=";
   };
 
-  version = "10.0.0-preview.25464.2";
+  version = "10.0.0-preview.25517.9";
   projectFile = "src/Razor/src/rzls/rzls.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
diff --git a/pkgs/by-name/s2/s2n-tls/package.nix b/pkgs/by-name/s2/s2n-tls/package.nix
index f4d0276b9f25..3671fa7e321e 100644
--- a/pkgs/by-name/s2/s2n-tls/package.nix
+++ b/pkgs/by-name/s2/s2n-tls/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.5.26";
+  version = "1.5.27";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "s2n-tls";
     rev = "v${version}";
-    hash = "sha256-6Py1ygHinx3n7k/hQN+85C57YXh7ag0OGYR+NOnx1rE=";
+    hash = "sha256-aJRw1a/XJivNZS3NkZ4U6nC12+wY/aoNv33mbAzNl0k=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index b09f5e031e9e..88b0caf1c063 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-10-14";
+  version = "11.7-unstable-2025-11-05";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "e338a5d36920e006d45880d9a89a2fb85068b0aa";
-    hash = "sha256-UpjJf45xuyn7zIMK/vj8UMmRYUuDcYe7GpLaOuxctNM=";
+    rev = "fad53814de1ace0f9030e01f234ee4d139cfc514";
+    hash = "sha256-RLYZPy5mn1Uk1vCoUwAy7V0Lv8rUeb0iX50+A1TBw0U=";
   };
 
   buildInputs =
diff --git a/pkgs/by-name/sa/saber/gitHashes.json b/pkgs/by-name/sa/saber/gitHashes.json
index 3ee14f88f491..caa97b756568 100644
--- a/pkgs/by-name/sa/saber/gitHashes.json
+++ b/pkgs/by-name/sa/saber/gitHashes.json
@@ -1,4 +1,5 @@
 {
   "flutter_secure_storage_linux": "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=",
-  "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="
+  "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=",
+  "yaru": "sha256-1sx2jtU6TXtzdGQn14dGZUszxqRBAEJkuEM5mDG7cR4="
 }
diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 318c4f8d258c..ce23e0efe3b3 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -23,13 +23,13 @@ let
     ln -s ${zlib}/lib $out/lib
   '';
 
-  version = "0.26.7";
+  version = "0.26.10";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-XIDz2WcPZfiW4DE4/CZqmk/Lyu164GIS3moAJG9sbk0=";
+    hash = "sha256-PmkhIyRbRWp+ZujP8R1/h7NpKwYsaKx4JtYIikZjVzc=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index 6eea758d5fa6..68d4c3d117c2 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -364,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_pubspec_licenses",
-        "sha256": "23ddb78ff9204d08e3109ced67cd3c6c6a066f581b0edf5ee092fc3e1127f4ea",
+        "sha256": "fafb90d50c182dd3d4f441c6aea75baff1e5311aab2f6430d3f40f6e3a1f5885",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.4"
+      "version": "3.0.12"
     },
     "dart_quill_delta": {
       "dependency": "transitive",
@@ -534,11 +534,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.2"
+      "version": "10.3.3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -881,21 +881,21 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "eb059dfe59f08546e9787f895bd01652076f996bcbf485a8609ef990419ad227",
+        "sha256": "c752e2d08d088bf83742cb05bf83003f3e9d276ff1519b5c92f9d5e60e5ddd23",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "16.2.1"
+      "version": "16.2.4"
     },
     "golden_screenshot": {
       "dependency": "direct dev",
       "description": {
         "name": "golden_screenshot",
-        "sha256": "8178266a5827eb74caf7547a19d42051e7493a4bbcc206917f62f4830729b6c3",
+        "sha256": "3cc52015a1acd506d4618ab7e863248f238f1230eaee2897cbbe8d86c3bba54c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0"
+      "version": "5.0.0"
     },
     "gsettings": {
       "dependency": "transitive",
@@ -951,11 +951,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "icons_launcher",
-        "sha256": "e6d806458fac6d3b1126ad757b4208a314ba775b3c8119cd88877091379edc7a",
+        "sha256": "6317d56a73ee528f1dd570d7cd7be120ce58014e0fe635d141ada3d88782f58d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
     "image": {
       "dependency": "transitive",
@@ -1057,11 +1057,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1147,11 +1147,11 @@
       "dependency": "direct main",
       "description": {
         "name": "material_symbols_icons",
-        "sha256": "2cfd19bf1c3016b0de7298eb3d3444fcb6ef093d934deb870ceb946af89cfa58",
+        "sha256": "9a7de58ffc299c8e362b4e860e36e1d198fa0981a894376fe1b6bfe52773e15b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2872.0"
+      "version": "4.2874.0"
     },
     "matrix4_transform": {
       "dependency": "transitive",
@@ -1213,15 +1213,25 @@
       "source": "hosted",
       "version": "8.1.0"
     },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "64e35e1e2e79da4e83f2ace3bf4e5437cef523f46c7db2eba9a1419c49573790",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.0.0"
+    },
     "one_dollar_unistroke_recognizer": {
       "dependency": "direct main",
       "description": {
         "name": "one_dollar_unistroke_recognizer",
-        "sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4",
+        "sha256": "599a074c6cec9c1517e382368e5ea470abbd04a82fe3700472a7b042de882384",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.3"
+      "version": "1.3.4"
     },
     "onyxsdk_pen": {
       "dependency": "direct main",
@@ -1326,11 +1336,11 @@
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus",
-        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.1"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1476,21 +1486,21 @@
       "dependency": "direct main",
       "description": {
         "name": "pdfrx",
-        "sha256": "25d45f4b9ea1cc71e1368c569b744eae15caf61745926db2fade85a9d2a79628",
+        "sha256": "e9663e265928dea8ef6f35fde4f9bbfbdafcb894feede38d4bf2b67394051a09",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.12"
+      "version": "2.1.25"
     },
     "pdfrx_engine": {
       "dependency": "transitive",
       "description": {
         "name": "pdfrx_engine",
-        "sha256": "3843477877302b89d0a2cbecaf518f39f2aca35ea9f359c187547345790fe5f2",
+        "sha256": "7327361eb4e63660996a16773b6f57120a267796431cd29d7d3b1150d51934de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.15"
+      "version": "0.1.21"
     },
     "perfect_freehand": {
       "dependency": "direct main",
@@ -1682,6 +1692,16 @@
       "source": "hosted",
       "version": "6.1.5+1"
     },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
     "qr": {
       "dependency": "transitive",
       "description": {
@@ -1696,11 +1716,11 @@
       "dependency": "transitive",
       "description": {
         "name": "quill_native_bridge",
-        "sha256": "00752aca7d67cbd3254709a47558be78427750cb81aa42cfbed354d4a079bcfa",
+        "sha256": "76a16512e398e84216f3f659f7cb18a89ec1e141ea908e954652b4ce6cf15b18",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.1.0"
     },
     "quill_native_bridge_android": {
       "dependency": "transitive",
@@ -1723,7 +1743,7 @@
       "version": "0.0.1"
     },
     "quill_native_bridge_linux": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "quill_native_bridge_linux",
         "sha256": "388aaa62017dbd746742ce0bfae99f4ffe1dda2462e8a866df630c67b63c54fe",
@@ -1897,11 +1917,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337",
+        "sha256": "0a3a1e6b3b3873070d4dbefc6968f0d31e698ed55b4eb8ee185b230f35733b59",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "sentry_dart_plugin": {
       "dependency": "direct dev",
@@ -1917,31 +1937,31 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "37deb4ef8837d10b5c1f527ec18591f8d2d2da9c34f19b3d97ccbbe7f84077c0",
+        "sha256": "493b4adb378dfc93fb1595acca91834bbf56194a9038c400c9306588ad6a2f88",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "sentry_logging": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_logging",
-        "sha256": "040046d5fe79b94b1c73069031547c066ab37bcbd18c029dc3ceeb9b5d0c67c5",
+        "sha256": "d6a51795c5643a40928f77424dd2bd28a9a58f7c527d3f8d5e001c54ee98c51a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "share_plus": {
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1967,11 +1987,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
+        "sha256": "0b0f98d535319cb5cdd4f65783c2a54ee6d417a2f093dbb18be3e36e4c3d181f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.12"
+      "version": "2.4.14"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2043,21 +2063,21 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "b02c531f453c328a1343818c64d730357ac140860147c9a29030fdfc82039266",
+        "sha256": "47182d10ce284e232f25a02eb74a421a11e7eb6a6fab9ab84fd8182bb0761130",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.1"
+      "version": "4.9.0"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "7a5e55f2b1ec99e06354a5213b992d34017efacccba8ffc6066cfc5517cc0282",
+        "sha256": "5ecf841d6252c05ea335920ec299bb7edbb860eb793eebb4b40f68b9d148a571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.0"
+      "version": "4.9.0"
     },
     "source_span": {
       "dependency": "transitive",
@@ -2093,21 +2113,21 @@
       "dependency": "direct main",
       "description": {
         "name": "stow",
-        "sha256": "5a2664c0dce3ad09499031b6db7686ff788f71d86ddfebde98916aa1e8caa14b",
+        "sha256": "4b8dbb36bb4fdbd47e9c3d3ce434e32dd91c98dd1ed469c769d5ebeb90949948",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1"
+      "version": "0.5.1+1"
     },
     "stow_codecs": {
       "dependency": "direct main",
       "description": {
         "name": "stow_codecs",
-        "sha256": "edfaee5b03d6b23df277889ec80e587e66d48fbbf7f7ef925a9d1046d08a3ec0",
+        "sha256": "f35c83e853ca250261c42788141ef64e4c36d83b2613cd5927bd9f070843ad28",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0+1"
+      "version": "1.4.0"
     },
     "stow_plain": {
       "dependency": "direct main",
@@ -2193,11 +2213,11 @@
       "dependency": "transitive",
       "description": {
         "name": "system_info2",
-        "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9",
+        "sha256": "b937736ecfa63c45b10dde1ceb6bb30e5c0c340e14c441df024150679d65ac43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.0"
+      "version": "4.1.0"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -2273,11 +2293,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "69ee86740f2847b9a4ba6cffa74ed12ce500bbe2b07f3dc1e643439da60637b7",
+        "sha256": "c0fb544b9ac7efa10254efaf00a951615c362d1ea1877472f8f6c0fa00fcf15b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.18"
+      "version": "6.3.23"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2413,11 +2433,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
@@ -2443,11 +2463,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.14.0"
+      "version": "5.15.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2483,11 +2503,11 @@
       "dependency": "direct main",
       "description": {
         "name": "worker_manager",
-        "sha256": "af3db5e6c6c8a74ab8f72e25e9d305f8ff60984ca55551397e3c8828ebf30509",
+        "sha256": "1bce9f894a0c187856f5fc0e150e7fe1facce326f048ca6172947754dac3d4f3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.6"
+      "version": "7.2.7"
     },
     "workmanager": {
       "dependency": "direct main",
@@ -2572,11 +2592,12 @@
     "yaru": {
       "dependency": "direct main",
       "description": {
-        "name": "yaru",
-        "sha256": "67ac8c3dc52a5d69c049056d5fa40b909973e10b36df3cffeb666de867532d79",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "fix/keep-text-style",
+        "resolved-ref": "87779a4a78b793ad86a5d7177f223664e1ae0152",
+        "url": "https://github.com/adil192/yaru.dart.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "8.3.0"
     },
     "yaru_window": {
diff --git a/pkgs/by-name/sa/sabnzbd/package.nix b/pkgs/by-name/sa/sabnzbd/package.nix
index 8a1f9720cd3f..a2b0b35dd538 100644
--- a/pkgs/by-name/sa/sabnzbd/package.nix
+++ b/pkgs/by-name/sa/sabnzbd/package.nix
@@ -45,6 +45,7 @@ let
       pysocks
       python-dateutil
       pytz
+      rarfile
       rebulk
       # sabnzbd requires a specific version of sabctools
       (sabctools.overridePythonAttrs (old: {
@@ -72,14 +73,14 @@ let
   ];
 in
 stdenv.mkDerivation rec {
-  version = "4.5.3";
+  version = "4.5.5";
   pname = "sabnzbd";
 
   src = fetchFromGitHub {
     owner = "sabnzbd";
     repo = "sabnzbd";
     rev = version;
-    hash = "sha256-RFvWk+K/5gXMSO4jPOxkl7f+tnMvz+0u4NWPTUEv4dg=";
+    hash = "sha256-XEWMy+Ph47neyQubehegcOxucClB1Z9t1QDLN7FrxaY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix
index c03b53be8f01..74a29750c4ae 100644
--- a/pkgs/by-name/sa/safecloset/package.nix
+++ b/pkgs/by-name/sa/safecloset/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/safecloset";
     changelog = "https://github.com/Canop/safecloset/blob/${src.rev}/CHANGELOG.md";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "safecloset";
   };
 }
diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index f935cd93dc36..cc06ef86f91c 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -1,47 +1,56 @@
 {
-  stdenv,
   lib,
+  stdenv,
+  config,
   fetchurl,
-  # native
+
+  # nativeBuildInputs
   cmake,
-  desktopToDarwinBundle,
   dos2unix,
   pkg-config,
   wrapGAppsHook3,
-  # not native
-  gdal,
-  wxGTK32,
-  proj,
-  libsForQt5,
+  # cuda-specific
+  cudaPackages,
+  # darwin-specific
+  desktopToDarwinBundle,
+
+  # buildInputs
   curl,
-  libiodbc,
-  xz,
-  libharu,
-  opencv,
-  vigra,
-  pdal,
-  libpq,
-  unixODBC,
-  poppler,
-  hdf5,
-  netcdf,
-  sqlite,
-  qhull,
-  giflib,
-  libsvm,
   fftw,
+  gdal,
+  giflib,
+  hdf5,
+  libharu,
+  libiodbc,
+  libpq,
+  libsForQt5,
+  libsvm,
+  opencv,
+  pdal,
+  proj,
+  qhull,
+  vigra,
+  wxGTK32,
+  xz,
+  # darwin-specific
+  netcdf,
+  poppler,
+  sqlite,
+  unixODBC,
+
+  cudaSupport ? config.cudaSupport,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "saga";
-  version = "9.10.0";
+  version = "9.10.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
-    hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA=";
+    url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
+    hash = "sha256-6V7KSdaU3TkdsGr6ll7Q8oSH7/rItgSrgN7Fjn+f9dM=";
   };
 
-  sourceRoot = "saga-${version}/saga-gis";
+  sourceRoot = "saga-${finalAttrs.version}/saga-gis";
 
   postPatch = ''
     dos2unix src/saga_core/saga_gui/res/org.saga_gis.saga_gui.desktop
@@ -50,37 +59,45 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     dos2unix
-    wrapGAppsHook3
     pkg-config
+    wrapGAppsHook3
   ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   buildInputs = [
     curl
-    libsForQt5.dxflib
     fftw
-    libsvm
-    hdf5
     gdal
-    wxGTK32
+    giflib
+    hdf5
+    libharu
+    libiodbc
+    libpq
+    libsForQt5.dxflib
+    libsvm
+    opencv
     pdal
     proj
-    libharu
-    opencv
-    vigra
-    libpq
-    libiodbc
-    xz
     qhull
-    giflib
+    vigra
+    wxGTK32
+    xz
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
   ]
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    unixODBC
-    poppler
     netcdf
+    poppler
     sqlite
+    unixODBC
   ];
 
   cmakeFlags = [
@@ -90,7 +107,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "System for Automated Geoscientific Analyses";
     homepage = "https://saga-gis.sourceforge.io";
-    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${version}/";
+    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       michelk
@@ -99,4 +116,4 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.geospatial ];
     platforms = with lib.platforms; unix;
   };
-}
+})
diff --git a/pkgs/by-name/sa/sage/README.md b/pkgs/by-name/sa/sage/README.md
index 94a9b0b6bc29..80e09a0d8616 100644
--- a/pkgs/by-name/sa/sage/README.md
+++ b/pkgs/by-name/sa/sage/README.md
@@ -26,7 +26,7 @@ Then make the needed changes and generate a patch with `git diff`:
 
 ```
 [user@localhost ~]$ <make changes>
-[user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/applications/science/math/sage/patches/name-of-patch.patch
+[user@localhost ~]$ git diff -u > /path/to/nixpkgs/pkgs/by-name/sa/sage/patches/name-of-patch.patch
 ```
 
 Now just add the patch to `sage-src.nix` and test your changes. If they fix the problem, submit a PR upstream (refer to sages [Developer's Guide](http://doc.sagemath.org/html/en/developer/index.html) for further details).
diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 706e178e6300..89f8e4c25ab2 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -75,6 +75,13 @@ stdenv.mkDerivation rec {
   # should come from or be proposed to upstream. This list will probably never
   # be empty since dependencies update all the time.
   packageUpgradePatches = [
+    # https://github.com/sagemath/sage/pull/40919, landed in 10.8.beta8
+    (fetchpatch2 {
+      name = "gap-4.15.1-update.patch";
+      url = "https://github.com/sagemath/sage/commit/54d4ddb132cc71ef26b4db1f48afd6736d41cc63.patch?full_index=1";
+      hash = "sha256-PZyOXRsgcsPvgceGGZXet5URJgWiIlCfFx8tvwpLk5A=";
+      excludes = [ "src/doc/zh/constructions/rep_theory.rst" ];
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;
diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix
index 7964c4b8fa25..f9a30e5c3159 100644
--- a/pkgs/by-name/sa/sage/sagelib.nix
+++ b/pkgs/by-name/sa/sage/sagelib.nix
@@ -13,7 +13,6 @@
   gd,
   iml,
   libpng,
-  readline,
   blas,
   boost,
   brial,
@@ -23,7 +22,6 @@
   fflas-ffpack,
   flint,
   gap,
-  giac,
   givaro,
   glpk,
   gsl,
@@ -44,7 +42,6 @@
   planarity,
   ppl,
   rankwidth,
-  ratpoints,
   singular,
   sqlite,
   symmetrica,
@@ -60,7 +57,6 @@
   ipykernel,
   ipython,
   ipywidgets,
-  jinja2,
   jupyter-client,
   jupyter-core,
   lrcalc-python,
@@ -117,7 +113,6 @@ buildPythonPackage rec {
     gd
     iml
     libpng
-    readline
   ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
@@ -138,7 +133,6 @@ buildPythonPackage rec {
     fflas-ffpack
     flint
     gap
-    giac
     givaro
     glpk
     gsl
@@ -159,7 +153,6 @@ buildPythonPackage rec {
     planarity
     ppl
     rankwidth
-    ratpoints
     singular
     sqlite
     symmetrica
@@ -177,7 +170,6 @@ buildPythonPackage rec {
     ipykernel
     ipython
     ipywidgets
-    jinja2
     jupyter-client
     jupyter-core
     lrcalc-python
diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix
index 0fecc9529006..12735843e6b1 100644
--- a/pkgs/by-name/sa/sagoin/package.nix
+++ b/pkgs/by-name/sa/sagoin/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/figsoda/sagoin";
     changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "sagoin";
   };
 }
diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix
index 3cea47a1a90a..1d37f2594d2b 100644
--- a/pkgs/by-name/sa/saleae-logic-2/package.nix
+++ b/pkgs/by-name/sa/saleae-logic-2/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "saleae-logic-2";
-  version = "2.4.29";
+  version = "2.4.36";
   src = fetchurl {
     url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage";
-    hash = "sha256-eCG2Al6MmWTCiYtaO6qIoNji4QreMryoZRcfKjk5d1c=";
+    hash = "sha256-M6sjmFHonByjh3rHnAMuSpFKkvOsXqd4XevFDxuEOp4=";
   };
   desktopItem = makeDesktopItem {
     name = "saleae-logic-2";
diff --git a/pkgs/by-name/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix
index a242b5e6af42..680e0b6ecc61 100644
--- a/pkgs/by-name/sa/sameboy/package.nix
+++ b/pkgs/by-name/sa/sameboy/package.nix
@@ -11,15 +11,15 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sameboy";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "LIJI32";
     repo = "SameBoy";
-    rev = "v${version}";
-    sha256 = "sha256-rNP1jGnGqZG5jz8vQzqDNEKticg51uCcZQaUteawlPU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Sk5/Wojl9rFkTuBFSGN/W8oq8OJNrV5W3E8PdsaMll8=";
   };
 
   enableParallelBuilding = true;
@@ -45,14 +45,13 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace OpenDialog/gtk.c \
-      --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"'
+      --replace-fail '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"'
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sameboy.github.io";
     description = "Game Boy, Game Boy Color, and Super Game Boy emulator";
     mainProgram = "sameboy";
-
     longDescription = ''
       SameBoy is a user friendly Game Boy, Game Boy Color and Super
       Game Boy emulator for macOS, Windows and Unix-like platforms.
@@ -62,9 +61,8 @@ stdenv.mkDerivation rec {
       capabilities, SameBoy has all the features one would expect from
       an emulator – from save states to scaling filters.
     '';
-
-    license = licenses.mit;
-    maintainers = with maintainers; [ NieDzejkob ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ NieDzejkob ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff
index 91e09f5fa12e..d367c618b873 100644
--- a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff
+++ b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff
@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index 3377b3f..4492f96 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -788,15 +788,7 @@ install: $(BIN)/XdgThumbnailer/sameboy-thumbnailer sdl $(shell find FreeDesktop)
+@@ -796,15 +796,7 @@
  	install -m 755 $(BIN)/SDL/sameboy $(DESTDIR)$(PREFIX)/bin/sameboy
  	install -m 755 $(BIN)/XdgThumbnailer/sameboy-thumbnailer $(DESTDIR)$(PREFIX)/bin/sameboy-thumbnailer
  	install -m 644 XdgThumbnailer/sameboy.thumbnailer $(DESTDIR)$(PREFIX)/share/thumbnailers/sameboy.thumbnailer
@@ -16,14 +14,14 @@ index 3377b3f..4492f96 100644
 -	done
 -else
 +
- 	install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/sameboy.xml
+ 	install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/packages/sameboy.xml
  	install -m 644 FreeDesktop/sameboy.desktop $(DESTDIR)$(PREFIX)/share/applications/sameboy.desktop
  	for size in 16x16 32x32 64x64 128x128 256x256 512x512; do \
-@@ -807,7 +799,6 @@ else
+@@ -815,7 +807,6 @@
  		install -m 644 FreeDesktop/ColorCartridge/$$size.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/$$size/mimetypes/x-gameboy-color-rom.png; \
  	done
  endif
 -endif
- 
+
  ios: bootroms
  	@$(MAKE) _ios
diff --git a/pkgs/applications/audio/samplebrain/default.nix b/pkgs/by-name/sa/samplebrain/package.nix
similarity index 82%
rename from pkgs/applications/audio/samplebrain/default.nix
rename to pkgs/by-name/sa/samplebrain/package.nix
index 33c46aca0f85..33a1313bb545 100644
--- a/pkgs/applications/audio/samplebrain/default.nix
+++ b/pkgs/by-name/sa/samplebrain/package.nix
@@ -8,19 +8,17 @@
   libsndfile,
   makeDesktopItem,
   portaudio,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "samplebrain";
   version = "0.18.5";
 
   src = fetchFromGitLab {
     owner = "then-try-this";
     repo = "samplebrain";
-    rev = "v${version}_release";
+    tag = "v${finalAttrs.version}_release";
     hash = "sha256-/pMHmwly5Dar7w/ZawvR3cWQHw385GQv/Wsl1E2w5p4=";
   };
 
@@ -32,7 +30,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [
+  nativeBuildInputs = with libsForQt5; [
     qmake
     wrapQtAppsHook
   ];
@@ -42,16 +40,16 @@ stdenv.mkDerivation rec {
     liblo
     libsndfile
     portaudio
-    qtbase
+    libsForQt5.qtbase
   ];
 
   desktopItem = makeDesktopItem {
     type = "Application";
-    desktopName = pname;
-    name = pname;
+    desktopName = "samplebrain";
+    name = "samplebrain";
     comment = "A sample masher designed by Aphex Twin";
-    exec = pname;
-    icon = pname;
+    exec = "samplebrain";
+    icon = "samplebrain";
     categories = [ "Audio" ];
   };
 
@@ -65,9 +63,9 @@ stdenv.mkDerivation rec {
     description = "Custom sample mashing app";
     mainProgram = "samplebrain";
     homepage = "https://thentrythis.org/projects/samplebrain";
-    changelog = "https://gitlab.com/then-try-this/samplebrain/-/releases/v${version}_release";
+    changelog = "https://gitlab.com/then-try-this/samplebrain/-/releases/v${finalAttrs.version}_release";
     maintainers = with lib.maintainers; [ mitchmindtree ];
     license = lib.licenses.gpl2;
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/by-name/sa/samplv1/package.nix
similarity index 75%
rename from pkgs/applications/audio/samplv1/default.nix
rename to pkgs/by-name/sa/samplv1/package.nix
index c15e62c3612a..9991c26e50db 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/by-name/sa/samplv1/package.nix
@@ -8,27 +8,24 @@
   liblo,
   libsndfile,
   lv2,
-  qtbase,
-  qttools,
   rubberband,
-  wrapQtAppsHook,
   cmake,
-  qtsvg,
+  kdePackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "samplv1";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz";
+    url = "mirror://sourceforge/samplv1/samplv1-${finalAttrs.version}.tar.gz";
     hash = "sha256-YCxt9RAP02uAigddA6HjBt2ryM6MyOtI3L2eLg0AhFg=";
   };
 
   nativeBuildInputs = [
-    qttools
+    kdePackages.qttools
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     cmake
   ];
 
@@ -38,9 +35,9 @@ stdenv.mkDerivation rec {
     liblo
     libsndfile
     lv2
-    qtbase
+    kdePackages.qtbase
     rubberband
-    qtsvg
+    kdePackages.qtsvg
   ];
 
   meta = {
@@ -51,4 +48,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix
index f7edb8ec8ef1..01051d19a4dd 100644
--- a/pkgs/by-name/sa/samply/package.nix
+++ b/pkgs/by-name/sa/samply/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "samply";
   };
 }
diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix
new file mode 100644
index 000000000000..97c632438477
--- /dev/null
+++ b/pkgs/by-name/sa/sampo/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  pkg-config,
+  openssl,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sampo";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "bruits";
+    repo = "sampo";
+    tag = "sampo-v${finalAttrs.version}";
+    hash = "sha256-0E9dvyu6mGbuMH8Lf/rVTn3skVq9kaVjQG2eLH8a2IY=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  cargoHash = "sha256-gooShQWJY9UKYq99o7qhyz6ROK+VXYG2PpygdVWG0iM=";
+
+  cargoBuildFlags = [
+    "-p"
+    "sampo"
+  ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Automate changelogs, versioning, and publishing—even for monorepos across multiple package registries";
+    homepage = "https://github.com/bruits/sampo";
+    changelog = "https://github.com/bruits/sampo/blob/sampo-v${finalAttrs.version}/crates/sampo/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "sampo";
+  };
+})
diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix
index 34b345da0454..87bfbb9cf0a4 100644
--- a/pkgs/by-name/sa/samrewritten/package.nix
+++ b/pkgs/by-name/sa/samrewritten/package.nix
@@ -16,13 +16,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "samrewritten";
-  version = "20250802.1";
+  version = "20250919.1";
 
   src = fetchFromGitHub {
     owner = "PaulCombal";
     repo = "SamRewritten";
     tag = finalAttrs.version;
-    hash = "sha256-41fBafFmYW8uGICpIJtSnXDP+KV3uVInxm0op40V/tc=";
+    hash = "sha256-IbWURGWiCRjTJSD8qPc1TmJeOm/WdCAFuK57laIXfXY=";
   };
 
   cargoHash = "sha256-Px/TlR3BhiFCv73v06VNq0/W0bQM/ORRE/9ndv5hbpY=";
diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index a3c4d3c7bfb9..3ca9de3f53b6 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -17,16 +17,16 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-AKzTDBKqZuZfEgPJqv8I5IuCeDkD2+fBY44aAPFaYvI=";
+    hash = "sha256-4RVah6yo4cJyE6qUbDJbcmFpi7xsKNpHJFrzSs1yJcg=";
   };
 
-  cargoHash = "sha256-hvJOjWD5TRXlDr5KfpFlzAi44Xd6VuaFexXziXgDLCk=";
+  cargoHash = "sha256-RPj6ZVtDWPMt4jrmU750b7zLVHwqk+SWr2OskDAQFYI=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/by-name/sa/sayonara/package.nix
similarity index 83%
rename from pkgs/applications/audio/sayonara/default.nix
rename to pkgs/by-name/sa/sayonara/package.nix
index bd9331d6bc7e..ac4043f3b686 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/by-name/sa/sayonara/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   cmake,
   fetchFromGitLab,
   nix-update-script,
@@ -9,11 +9,10 @@
   ninja,
   pcre,
   pkg-config,
-  qtbase,
-  qttools,
   taglib,
   zlib,
   python3,
+  libsForQt5,
 }:
 
 let
@@ -23,14 +22,14 @@ let
     ]
   );
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sayonara";
   version = "1.10.0-stable1";
 
   src = fetchFromGitLab {
     owner = "luciocarreras";
     repo = "sayonara-player";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
   };
 
@@ -44,13 +43,14 @@ mkDerivation rec {
     cmake
     ninja
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libpulseaudio
     pcre
-    qtbase
+    libsForQt5.qtbase
     taglib
     zlib
     py
@@ -80,11 +80,11 @@ mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Sayonara music player";
     homepage = "https://sayonara-player.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ deepfire ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ deepfire ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/sb/sbctl/package.nix b/pkgs/by-name/sb/sbctl/package.nix
index 878aba99e4cd..bb18c7c79fb4 100644
--- a/pkgs/by-name/sb/sbctl/package.nix
+++ b/pkgs/by-name/sb/sbctl/package.nix
@@ -7,20 +7,22 @@
   asciidoc,
   databasePath ? "/etc/secureboot",
   nix-update-script,
+  pkg-config,
+  pcsclite,
 }:
 
 buildGoModule rec {
   pname = "sbctl";
-  version = "0.17";
+  version = "0.18";
 
   src = fetchFromGitHub {
     owner = "Foxboron";
     repo = "sbctl";
     tag = version;
-    hash = "sha256-7dCaWemkus2GHxILBEx5YvzdAmv89JfcPbqZZ6QwriI";
+    hash = "sha256-Q8uQ74XvteMRcnUPu1PjLAPWt3jeI7aF4m3QMjiZJis=";
   };
 
-  vendorHash = "sha256-gpHEJIbLnB0OiYB00rHK6OwrnHTHCj/tTVlUzuFjFKY=";
+  vendorHash = "sha256-PwLdWoC8tjdKoUAg2xvopggpgZ9WKaUslO3ZBtBah2k=";
 
   ldflags = [
     "-s"
@@ -32,8 +34,11 @@ buildGoModule rec {
   nativeBuildInputs = [
     installShellFiles
     asciidoc
+    pkg-config
   ];
 
+  buildInputs = [ pcsclite ];
+
   postBuild = ''
     make docs/sbctl.conf.5 docs/sbctl.8
   '';
diff --git a/pkgs/by-name/sb/sbomnix/package.nix b/pkgs/by-name/sb/sbomnix/package.nix
index 51ae36a7c9e8..1ff605248c1f 100644
--- a/pkgs/by-name/sb/sbomnix/package.nix
+++ b/pkgs/by-name/sb/sbomnix/package.nix
@@ -29,14 +29,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "sbomnix";
-  version = "1.7.3";
+  version = "1.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiiuae";
     repo = "sbomnix";
     tag = "v${version}";
-    hash = "sha256-eN0dn2TNVEPSfIiJM0NA+HT1l4DnFq1mrSOOUF0h9xY=";
+    hash = "sha256-s7mmtbELRcl/7ab5A3fU7f8m4rIm+mBLmXMeYHa7/n4=";
 
     # Remove documentation as it contains references to nix store
     postFetch = ''
diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 9cc4797657f7..462cdd581115 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -6,7 +6,6 @@
   python3,
   yosys,
   yices,
-  boolector,
   z3,
   aiger,
   btor2tools,
@@ -19,13 +18,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sby";
-  version = "0.57";
+  version = "0.58";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vhgLP2twPPGsey5lzmt/zUFme4GjIdWgRyWoCHxLxRU=";
+    hash = "sha256-msQ+aqdp8i5KMLUABYU6vA5VBkI6G3zF06RrQzfJucY=";
   };
 
   postPatch = ''
@@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix various executable references
     substituteInPlace sbysrc/sby_core.py \
       --replace-fail '"/usr/bin/env", "bash"' '"${lib.getExe bash}"' \
-      --replace-fail ', "btormc"'             ', "${lib.getExe' boolector "btormc"}"' \
       --replace-fail ', "aigbmc"'             ', "${lib.getExe' aiger "aigbmc"}"'
 
     substituteInPlace sbysrc/sby_core.py \
@@ -73,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     python3.pkgs.xmlschema
     yosys
-    boolector
     yices
     z3
     aiger
diff --git a/pkgs/by-name/sc/scalp/package.nix b/pkgs/by-name/sc/scalp/package.nix
index 44adf8c0dd87..643fe77fd49d 100644
--- a/pkgs/by-name/sc/scalp/package.nix
+++ b/pkgs/by-name/sc/scalp/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.3.2)" "cmake_minimum_required (VERSION 3.5)" \
       --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
       --replace-fail "-m64" ""
     substituteInPlace src/tests/CMakeLists.txt \
diff --git a/pkgs/by-name/sc/scap-security-guide/package.nix b/pkgs/by-name/sc/scap-security-guide/package.nix
index 3c7c1a1c8a33..28da1073caa4 100644
--- a/pkgs/by-name/sc/scap-security-guide/package.nix
+++ b/pkgs/by-name/sc/scap-security-guide/package.nix
@@ -15,15 +15,15 @@
   yamllint,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scap-security-guide";
-  version = "0.1.76";
+  version = "0.1.78";
 
   src = fetchFromGitHub {
     owner = "ComplianceAsCode";
     repo = "content";
-    tag = "v${version}";
-    hash = "sha256-M1o9UG2pKtkFByp37UP++am8lJFfnoDBkRh1fos+ED0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4A/nM2aJcmWMxvK8/3isyDn/wPS9V+1CHO6Pfy+0FTc=";
   };
 
   postPatch = ''
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
       myst-parser
       mypy
       openpyxl
-      pcre2-py
       pygithub
       pyyaml
       pandas
@@ -82,4 +81,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ tochiaha ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index 9dc1834f5b29..342987717c17 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -8,17 +8,17 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  version = "0.11.0";
+  version = "0.12.0";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-x+TeFJa15eLmdUAAL4GH+bz6LWJZ/8Z0C1NcJ04MWc8=";
+    sha256 = "sha256-QNLcA31SJf7XmxYvzDC5LCKVu5ZWiw7U249KjUAGIZw=";
   };
 
-  cargoHash = "sha256-FyzeSiewKZhw1iIT6831W/FAx9IrG+Kswi5QWkQ0zQk=";
+  cargoHash = "sha256-tJGGS6Zpsz9nye2VKdZRuFeeqJ71MsXn3C9ytqeEW5I=";
 
   buildFeatures = lib.optionals distributed [
     "dist-client"
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/mozilla/sccache/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       doronbehar
-      figsoda
     ];
     license = lib.licenses.asl20;
   };
diff --git a/pkgs/by-name/sc/scdl/package.nix b/pkgs/by-name/sc/scdl/package.nix
index 81109ab74801..38e2c25dc41c 100644
--- a/pkgs/by-name/sc/scdl/package.nix
+++ b/pkgs/by-name/sc/scdl/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchPypi,
+  ffmpeg-headless,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -27,6 +28,15 @@ python3Packages.buildPythonApplication rec {
     filelock
   ];
 
+  # Ensure ffmpeg is available in $PATH:
+  makeWrapperArgs =
+    let
+      packagesToBinPath = [ ffmpeg-headless ];
+    in
+    [
+      ''--prefix PATH : "${lib.makeBinPath packagesToBinPath}"''
+    ];
+
   # No tests in repository
   doCheck = false;
 
diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix
index 71b91caff5ec..20aebff2afff 100644
--- a/pkgs/by-name/sc/schismtracker/package.nix
+++ b/pkgs/by-name/sc/schismtracker/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "schismtracker";
-  version = "20250825";
+  version = "20251014";
 
   src = fetchFromGitHub {
     owner = "schismtracker";
     repo = "schismtracker";
     tag = version;
-    hash = "sha256-R1u0ZIWt4sG9cVhG9WhLdYVwAy7u62AT7E4ZwiTw1rY=";
+    hash = "sha256-N1wCOR7Su3PllzrffkwB6LfhZlol1/4dVegySzJlH28=";
   };
 
   # If we let it try to get the version from git, it will fail and fall back
diff --git a/pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch b/pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch
new file mode 100644
index 000000000000..5cb3afbc2fb0
--- /dev/null
+++ b/pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch
@@ -0,0 +1,148 @@
+From 3c42f5b7f2648020e1b6710ab8c169a1ca2a4af2 Mon Sep 17 00:00:00 2001
+From: Marten Gartner <martenwallewein@web.de>
+Date: Wed, 23 Apr 2025 11:41:41 +0200
+Subject: [PATCH] Update to Go 1.24
+
+---
+ go.mod | 29 +++++++++++++++++------------
+ go.sum | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+), 12 deletions(-)
+
+diff --git a/go.mod b/go.mod
+index d4a4809..e6b36ea 100644
+--- a/go.mod
++++ b/go.mod
+@@ -2,29 +2,34 @@ module github.com/netsec-ethz/bootstrapper
+ 
+ require (
+ 	github.com/grandcat/zeroconf v1.0.0
+-	github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac
+-	github.com/insomniacslk/dhcp v0.0.0-20200922210017-67c425063dca
+-	github.com/mdlayher/ndp v0.10.0
+-	github.com/miekg/dns v1.1.27
+-	github.com/pelletier/go-toml v1.8.1-0.20200708110244-34de94e6a887
++	github.com/inconshreveable/log15 v2.16.0+incompatible
++	github.com/insomniacslk/dhcp v0.0.0-20250417080101-5f8cf70e8c5f
++	github.com/mdlayher/ndp v1.1.0
++	github.com/miekg/dns v1.1.65
++	github.com/pelletier/go-toml v1.9.5
+ 	github.com/stretchr/testify v1.6.1
+-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+-	golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf
++	golang.org/x/net v0.39.0
++	golang.org/x/sys v0.32.0
+ )
+ 
+ require (
+ 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+ 	github.com/davecgh/go-spew v1.1.1 // indirect
+-	github.com/go-stack/stack v1.8.0 // indirect
+-	github.com/mattn/go-colorable v0.1.8 // indirect
+-	github.com/mattn/go-isatty v0.0.12 // indirect
++	github.com/go-stack/stack v1.8.1 // indirect
++	github.com/mattn/go-colorable v0.1.14 // indirect
++	github.com/mattn/go-isatty v0.0.20 // indirect
+ 	github.com/pmezard/go-difflib v1.0.0 // indirect
+ 	github.com/u-root/u-root v7.0.0+incompatible // indirect
+ 	gitlab.com/golang-commonmark/puny v0.0.0-20191124015043-9f83538fa04f // indirect
+-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
++	golang.org/x/crypto v0.37.0 // indirect
++	golang.org/x/mod v0.24.0 // indirect
++	golang.org/x/sync v0.13.0 // indirect
++	golang.org/x/term v0.31.0 // indirect
++	golang.org/x/text v0.24.0 // indirect
++	golang.org/x/tools v0.32.0 // indirect
+ 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+ )
+ 
+ replace github.com/insomniacslk/dhcp => github.com/stapelberg/dhcp v0.0.0-20190429172946-5244c0daddf0
+ 
+-go 1.22
++go 1.24
+diff --git a/go.sum b/go.sum
+index f01ae89..33c192f 100644
+--- a/go.sum
++++ b/go.sum
+@@ -5,22 +5,36 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
+ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
++github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
++github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
+ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+ github.com/grandcat/zeroconf v1.0.0 h1:uHhahLBKqwWBV6WZUDAT71044vwOTL+McW0mBJvo6kE=
+ github.com/grandcat/zeroconf v1.0.0/go.mod h1:lTKmG1zh86XyCoUeIHSA4FJMBwCJiQmGfcP2PdzytEs=
+ github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac h1:n1DqxAo4oWPMvH1+v+DLYlMCecgumhhgnxAPdqDIFHI=
+ github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
++github.com/inconshreveable/log15 v2.16.0+incompatible h1:6nvMKxtGcpgm7q0KiGs+Vc+xDvUXaBqsPKHWKsinccw=
++github.com/inconshreveable/log15 v2.16.0+incompatible/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
+ github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+ github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
++github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
++github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
++github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
++github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+ github.com/mdlayher/ndp v0.10.0 h1:Zdwol2bq1EHY8xSnejIYkq6LEj7dLjLymJX0o/2tjGw=
+ github.com/mdlayher/ndp v0.10.0/go.mod h1:Uv6IWvgvqirNUu2N3ZXJEB86xu6foyUsG0NrClSSfek=
++github.com/mdlayher/ndp v1.1.0 h1:QylGKGVtH60sKZUE88+IW5ila1Z/M9/OXhWdsVKuscs=
++github.com/mdlayher/ndp v1.1.0/go.mod h1:FmgESgemgjl38vuOIyAHWUUL6vQKA/pQNkvXdWsdQFM=
+ github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
+ github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
++github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc=
++github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
+ github.com/pelletier/go-toml v1.8.1-0.20200708110244-34de94e6a887 h1:0r6tAXtt8p5+IJtshL5f+5E/z0qH2aE89UmV4/tRF64=
+ github.com/pelletier/go-toml v1.8.1-0.20200708110244-34de94e6a887/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
++github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
++github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+@@ -39,16 +53,24 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
+ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
++golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
++golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
++golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
++golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
++golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
++golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
++golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -56,8 +78,17 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf h1:Fm4IcnUL803i92qDlmB0obyHmosDrxZWxJL3gIeNqOw=
+ golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
++golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
++golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
++golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
++golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+ golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
++golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/sc/scion-bootstrapper/package.nix b/pkgs/by-name/sc/scion-bootstrapper/package.nix
index 306368b7ec4e..ab96b3757f3d 100644
--- a/pkgs/by-name/sc/scion-bootstrapper/package.nix
+++ b/pkgs/by-name/sc/scion-bootstrapper/package.nix
@@ -2,40 +2,70 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
+
+  # tests
+  scion,
+  openssl,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "scion-bootstrapper";
-  version = "0.0.7";
+  version = "0.0.8-unstable-2024-11-28";
 
   src = fetchFromGitHub {
     owner = "netsec-ethz";
     repo = "bootstrapper";
-    rev = "v${version}";
-    hash = "sha256-X4lNgd6klIw0NW9NVG+d1JK+WNfOclbu43GYucelB7o=";
+    rev = "3fc6dad144843b3e7724e1b7e0af63235936168e";
+    hash = "sha256-rs8BVN+jqwpSIfdtUzi9X9zSRStHJZSWjr32m8vWQ8g=";
   };
 
-  vendorHash = "sha256-X4bOIvNlyQoAWOd3L6suE64KnlCV6kuE1ieVecVYWOw=";
+  vendorHash = "sha256-SITnZXQ76eVedNVYWVwtH1ezDoMBmE1Uh9FpHA5+T8c=";
 
-  doCheck = false;
+  patches = [
+    # https://github.com/netsec-ethz/bootstrapper/pull/31
+    ./0001-Update-to-Go-1.24.patch
+  ];
+
+  nativeCheckInputs = [
+    scion
+    openssl
+  ];
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  checkFlags =
+    let
+      skippedTests = [
+        # non-reproducible since it depends on the cert time
+        "TestVerify"
+        # requires internet access
+        "TestDNSLookupAkaNS"
+        "TestDNSLookupExternalIP"
+        "TestReverseLookupDomains"
+        "TestReverseLookupWHOIS"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   postInstall = ''
     mv $out/bin/bootstrapper $out/bin/scion-bootstrapper
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
     description = "Bootstrapper for SCION network configuration";
     homepage = "https://github.com/netsec-ethz/bootstrapper";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       matthewcroughan
       sarcasticadmin
     ];
+    teams = with lib.teams; [ ngi ];
     mainProgram = "scion-bootstrapper";
   };
-}
+})
diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index 1ddfc127de6d..e7f552274ce8 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -1,49 +1,60 @@
 {
   lib,
-  buildGoModule,
+  stdenv,
+  buildGo124Module,
   fetchFromGitHub,
-  testers,
-  scip,
+  libredirect,
+  iana-etc,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGo124Module (finalAttrs: {
   pname = "scip";
-  version = "0.5.1";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip";
-    rev = "v${version}";
-    hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-l68xhOMgwt+ySChk7BCyklcuC6r51GgobAg3lRLvOCU=";
   };
 
-  vendorHash = "sha256-6vx3Dt0ZNR0rY5bEUF5X1hHj/gv21920bhfd+JJ9bYk=";
+  vendorHash = "sha256-8HgeG/SXkM7ptOwKSi/PUH3VySxFqqoIpXI7bZtbO4A=";
 
   ldflags = [
     "-s"
-    "-w"
     "-X=main.Reproducible=true"
   ];
 
-  # update documentation to fix broken test
-  postPatch = ''
-    substituteInPlace docs/CLI.md \
-      --replace 0.3.0 0.3.1
+  nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];
+
+  checkFlags =
+    let
+      skippedTests = [
+        "TestParseCompat" # could not locate sample indexes directory starting from parents of working directory
+        "TestParseSymbol_ZeroAllocationsIfMemoryAvailable"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services
   '';
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = scip;
-      version = "v${version}";
-    };
-  };
+  doInstallCheck = stdenv.hostPlatform.isLinux;
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "SCIP Code Intelligence Protocol CLI";
     mainProgram = "scip";
     homepage = "https://github.com/sourcegraph/scip";
-    changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/sourcegraph/scip/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/sc/scipopt-gcg/package.nix b/pkgs/by-name/sc/scipopt-gcg/package.nix
index d15f8f302f55..2357476ded2c 100644
--- a/pkgs/by-name/sc/scipopt-gcg/package.nix
+++ b/pkgs/by-name/sc/scipopt-gcg/package.nix
@@ -13,16 +13,16 @@
 
 stdenv.mkDerivation rec {
   pname = "scipopt-gcg";
-  version = "372";
+  version = "372-unstable-2025-10-11";
 
   # To correlate scipVersion and version, check: https://scipopt.org/#news
-  scipVersion = "9.2.3";
+  scipVersion = "9.2.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "gcg";
-    tag = "v${version}";
-    hash = "sha256-Sx0ZSca7XBT4GqxWt3bzelaXlI7kZCJo+by22mtTFhA=";
+    rev = "83a2d210a03f920dd941d547da94867deb504882";
+    hash = "sha256-wbzknCmwDhJ38gItA3DppJxSJfNK7NeIkxZVRd2kmp0=";
   };
 
   nativeBuildInputs = [
@@ -53,6 +53,12 @@ stdenv.mkDerivation rec {
     )
   '';
   doCheck = true;
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     maintainers = with lib.maintainers; [ fettgoenner ];
     changelog = "https://scipopt.org/doc-${scipVersion}/html/RN${lib.versions.major scipVersion}.php";
diff --git a/pkgs/by-name/sc/scipopt-papilo/package.nix b/pkgs/by-name/sc/scipopt-papilo/package.nix
index ef557c5904e8..e6e692a1f743 100644
--- a/pkgs/by-name/sc/scipopt-papilo/package.nix
+++ b/pkgs/by-name/sc/scipopt-papilo/package.nix
@@ -12,16 +12,16 @@
 
 stdenv.mkDerivation rec {
   pname = "scipopt-papilo";
-  version = "2.4.3";
+  version = "2.4.4";
 
   # To correlate scipVersion and version, check: https://scipopt.org/#news
-  scipVersion = "9.2.3";
+  scipVersion = "9.2.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "papilo";
     tag = "v${version}";
-    hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8=";
+    hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch b/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch
deleted file mode 100644
index d6b1f5cd2e18..000000000000
--- a/pkgs/by-name/sc/scipopt-scip/0001-check-fix-invalid-ctest-invocation.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 7772c64ee2face1c1099c23ecbfd20ff663cffc3 Mon Sep 17 00:00:00 2001
-From: Florian Klink <flokli@flokli.de>
-Date: Tue, 7 Oct 2025 16:19:31 +0300
-Subject: [PATCH] check: fix invalid ctest invocation
-
-ctest doesn't like `-R "-default"`. CMake 4.0 fails with the following
-error message:
-
-> CMake Error: Invalid value used with -R
-
-`-R` normally specifies the regex that needs to match. If none is
-specified, all are selected:
-
-https://cmake.org/cmake/help/latest/manual/ctest.1.html#cmdoption-ctest-R
-
-This maybe never worked, but got silently ignored until
-https://cmake.org/cmake/help/latest/policy/CMP0175.html
-
-Removing that regex should only cause *more* tests to get selected, not
-less - and the build now succeeds with it.
----
- check/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/check/CMakeLists.txt b/check/CMakeLists.txt
-index 0d667d5..c26b978 100644
---- a/check/CMakeLists.txt
-+++ b/check/CMakeLists.txt
-@@ -4,7 +4,7 @@ include(CTest)
- # add a custom SCIP check target 'scip_check'
- #
- add_custom_target(scip_check
--                COMMAND ${CMAKE_CTEST_COMMAND} -R "-default" -E "applications" --output-on-failure
-+                COMMAND ${CMAKE_CTEST_COMMAND} -E "applications" --output-on-failure
-                 DEPENDS scip
-                 )
- 
--- 
-2.51.0
-
diff --git a/pkgs/by-name/sc/scipopt-scip/package.nix b/pkgs/by-name/sc/scipopt-scip/package.nix
index 901fcbb9a073..6b07a7fe84b3 100644
--- a/pkgs/by-name/sc/scipopt-scip/package.nix
+++ b/pkgs/by-name/sc/scipopt-scip/package.nix
@@ -19,20 +19,15 @@
 
 stdenv.mkDerivation rec {
   pname = "scipopt-scip";
-  version = "9.2.3";
+  version = "9.2.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "scip";
     tag = "v${lib.replaceStrings [ "." ] [ "" ] version}";
-    hash = "sha256-Zc1AXNpHQXXFO8jkMaJj6xYkmkQxAM8G+SiPiH9xCAw=";
+    hash = "sha256-nwFRtP63/HPfk9JhcyLKApicgqE9IF+7s5MGGrVJrpM=";
   };
 
-  patches = [
-    # https://github.com/scipopt/scip/pull/169
-    ./0001-check-fix-invalid-ctest-invocation.patch
-  ];
-
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
diff --git a/pkgs/by-name/sc/scipopt-soplex/package.nix b/pkgs/by-name/sc/scipopt-soplex/package.nix
index 73ae32e5931b..3e36f07c2f69 100644
--- a/pkgs/by-name/sc/scipopt-soplex/package.nix
+++ b/pkgs/by-name/sc/scipopt-soplex/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   version = "7.1.5";
 
   # To correlate scipVersion and version, check: https://scipopt.org/#news
-  scipVersion = "9.2.3";
+  scipVersion = "9.2.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
diff --git a/pkgs/by-name/sc/scipopt-ug/package.nix b/pkgs/by-name/sc/scipopt-ug/package.nix
index 1afb8f50b291..96b9ae0d34de 100644
--- a/pkgs/by-name/sc/scipopt-ug/package.nix
+++ b/pkgs/by-name/sc/scipopt-ug/package.nix
@@ -13,14 +13,14 @@ stdenv.mkDerivation rec {
   version = "1.0.0-beta6";
 
   # To correlate scipVersion and version, check: https://scipopt.org/#news
-  scipVersion = "9.2.3";
+  scipVersion = "9.2.4";
 
   # Take the SCIPOptSuite source since no other source exists publicly.
   src = fetchzip {
     url = "https://github.com/scipopt/scip/releases/download/v${
       lib.replaceStrings [ "." ] [ "" ] scipVersion
     }/scipoptsuite-${scipVersion}.tgz";
-    sha256 = "sha256-Hi6oDPtJZODTBIuRYE62sUMTJqfmF0flY3cGoWh2IZE=";
+    hash = "sha256-ZFgHaC4JL0eFt/do0ucGkarmfL1WdGEecrE1iPBpFh0=";
   };
 
   sourceRoot = "${src.name}/ug";
diff --git a/pkgs/by-name/sc/scipopt-zimpl/package.nix b/pkgs/by-name/sc/scipopt-zimpl/package.nix
index ef63e973e232..971dc1b5cf19 100644
--- a/pkgs/by-name/sc/scipopt-zimpl/package.nix
+++ b/pkgs/by-name/sc/scipopt-zimpl/package.nix
@@ -14,13 +14,13 @@ stdenv.mkDerivation rec {
   version = "362";
 
   # To correlate scipVersion and version, check: https://scipopt.org/#news
-  scipVersion = "9.2.3";
+  scipVersion = "9.2.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "zimpl";
     tag = "v${version}";
-    sha256 = "juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o=";
+    hash = "sha256-juqAwzqBArsFXmz7L7RQaE78EhQdP5P51wQFlCoo7/o=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index cdb4399de160..62ef79c329f4 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "scooter";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
     rev = "v${version}";
-    hash = "sha256-Fgq1FJIvgnbBGkFrFCzjIPjyTyCxxknRGtzBGUuZfIY=";
+    hash = "sha256-DgxyurJmhpTHdmLyRaZkfiPYdMYdqeQOC+ZncfW5GdQ=";
   };
 
-  cargoHash = "sha256-kPJvwZhpE8k4Kv+Jai/Fp+b/YI8F7cR8acM1sc2fkf4=";
+  cargoHash = "sha256-vq2d6UX4TbPO6Uya3m8uKff7+w1+VfV4Bec4Uyx/8pQ=";
 
   # Ensure that only the `scooter` package is built (excluding `xtask`)
   cargoBuildFlags = [
diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix
index 4e45ef1c812c..f2d07b372736 100644
--- a/pkgs/by-name/sc/scope-tui/package.nix
+++ b/pkgs/by-name/sc/scope-tui/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scope-tui";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "alemidev";
     repo = "scope-tui";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bVe+Yyv+DcbEC15H968OhQhcFkAm7T5J6aQlKod5ocM=";
+    hash = "sha256-MU9avQt+qFIQzF7GYNNoGiyfBD7eLOMQaBH6lFhLlOY=";
   };
 
-  cargoHash = "sha256-o5pplwNtIe2z88ZwtCHree32kv16U/ryv8PmPIqxtPQ=";
+  cargoHash = "sha256-yAy3kk62HYe1/1EXGUhOg++sZua65iN3ZEmPoERcu0I=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index e64f9557db16..57ab8162b3dd 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -88,6 +88,11 @@ stdenv.mkDerivation {
     "-DNGSCOPECLIENT_VERSION=${version}"
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    # error: variable 'empty_string' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
+    "-Wno-error=uninitialized"
+  ];
+
   patches = [
     ./remove-git-derived-version.patch
   ]
diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix
index 9ae60f31b7e9..23704a7d251f 100644
--- a/pkgs/by-name/sc/scraper/package.nix
+++ b/pkgs/by-name/sc/scraper/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/causal-agent/scraper";
     changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix
index cb0e61c09cde..468f5ad94dcf 100644
--- a/pkgs/by-name/sc/scrcpy/package.nix
+++ b/pkgs/by-name/sc/scrcpy/package.nix
@@ -7,7 +7,6 @@
   meson,
   ninja,
   pkg-config,
-  runtimeShell,
   installShellFiles,
 
   android-tools,
@@ -17,12 +16,12 @@
 }:
 
 let
-  version = "3.3.2";
+  version = "3.3.3";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-LuXKCGPvRA9bfHWFa7R1xSg9CoNZyzcLHBYTFP0p39k=";
+    hash = "sha256-fnAyO6fyWWSd1KzOl6xP77roECssbZHi575hP9U1S+A=";
   };
 in
 stdenv.mkDerivation rec {
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     tag = "v${version}";
-    hash = "sha256-rwEsJlYlOIdgQfniAXdE2sg0WdI1ZxWxZV6MTFQoueg=";
+    hash = "sha256-1kCAqb/12fkKlp9MOsgw9ukp0lwJqTxD0gWN0IqvQJQ=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.
@@ -69,10 +68,6 @@ stdenv.mkDerivation rec {
 
     # runtime dep on `adb` to push the server
     wrapProgram "$out/bin/scrcpy" --prefix PATH : "${android-tools}/bin"
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    substituteInPlace $out/share/applications/scrcpy-console.desktop \
-      --replace "/bin/bash" "${runtimeShell}"
   '';
 
   meta = {
diff --git a/pkgs/by-name/sc/screen-pipe/package.nix b/pkgs/by-name/sc/screen-pipe/package.nix
index a54576c598a1..c26a380f77f5 100644
--- a/pkgs/by-name/sc/screen-pipe/package.nix
+++ b/pkgs/by-name/sc/screen-pipe/package.nix
@@ -11,7 +11,6 @@
   stdenv,
   alsa-lib,
   xorg,
-  apple-sdk_12,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "screen-pipe";
@@ -48,9 +47,6 @@ rustPlatform.buildRustPackage rec {
     openssl
     sqlite
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_12
-  ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
     xorg.libxcb
diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix
index c29787e15efa..654a9c543dd6 100644
--- a/pkgs/by-name/sc/screenly-cli/package.nix
+++ b/pkgs/by-name/sc/screenly-cli/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "screenly-cli";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "screenly";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-6whyTCfmBx+PS40ML8VNR5WvIfnUCMxos7KCCbtHXAo=";
+    hash = "sha256-OSol+KVfxL/bz9qwT9u8MmjPQ11qqFYWnVQLXfcA6pQ=";
   };
 
-  cargoHash = "sha256-LG6/+/Ibw7mh854ue6L74DLK4WocmDWqK8FvsEascYw=";
+  cargoHash = "sha256-znob9SvnE1y9yX/tTJY7jjJx/TnLTmoRRokScj5H1Yg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix
index 66b884951460..27f35267d259 100644
--- a/pkgs/by-name/sc/scribus/package.nix
+++ b/pkgs/by-name/sc/scribus/package.nix
@@ -116,6 +116,21 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch";
       hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk=";
     })
+    (fetchpatch {
+      name = "fix-qt6.10-build.patch";
+      url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch";
+      hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.09.0.patch";
+      url = "https://github.com/scribusproject/scribus/commit/f0cfe30019a514bdaf38b78590451e2c5b9b5420.patch";
+      hash = "sha256-ONQ3BzGhouO+0zqYUObuJC3NUCFi1PWq6qoRvuSZJws=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.10.0.patch";
+      url = "https://github.com/scribusproject/scribus/commit/3c1fc34fae1aa26fceb65b6bdf631a7f00b03c3c.patch";
+      hash = "sha256-xTwzbT3h4+5hb6Y/sNmzkfDN2LJGOLP1v/WBVsmZXkk=";
+    })
   ];
 
   meta = {
diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix
index 98660ead97d8..3058e94cf36a 100644
--- a/pkgs/by-name/sc/scriptisto/package.nix
+++ b/pkgs/by-name/sc/scriptisto/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/igor-petruk/scriptisto";
     changelog = "https://github.com/igor-petruk/scriptisto/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/games/scummvm/games.nix b/pkgs/by-name/sc/scummvm/games.nix
similarity index 100%
rename from pkgs/games/scummvm/games.nix
rename to pkgs/by-name/sc/scummvm/games.nix
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/by-name/sc/scummvm/package.nix
similarity index 88%
rename from pkgs/games/scummvm/default.nix
rename to pkgs/by-name/sc/scummvm/package.nix
index 54e4c74bd414..15831abecef0 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -23,14 +23,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scummvm";
   version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
   };
 
@@ -82,12 +82,12 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
     mainProgram = "scummvm";
     homepage = "https://www.scummvm.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.peterhoeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index e61692af5306..737170945a9f 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_compat";
-  version = "1.2.68";
+  version = "1.2.70";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
     rev = "release-" + finalAttrs.version;
-    hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM=";
+    hash = "sha256-vmbkeBpuzgq1B/6rp9/Gy8+Y7aF5uz8lC/mK0uA9v7I=";
   };
 
   nativeBuildInputs = [
@@ -56,11 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals openglSupport [ libGLU ];
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'set(CMAKE_SKIP_RPATH TRUE)' 'set(CMAKE_SKIP_RPATH FALSE)'
-  '';
-
   dontPatchELF = true; # don't strip rpath
 
   cmakeFlags =
@@ -79,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = !stdenv.hostPlatform.isDarwin;
   checkPhase = ''
     runHook preCheck
-    ./testver
+    ./test/testver
     runHook postCheck
   '';
 
diff --git a/pkgs/by-name/sd/SDL_image/package.nix b/pkgs/by-name/sd/SDL_image/package.nix
index a2311c7bbf65..b1595498d106 100644
--- a/pkgs/by-name/sd/SDL_image/package.nix
+++ b/pkgs/by-name/sd/SDL_image/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_image";
-  version = "1.2.12-unstable-2025-06-15";
+  version = "1.2.12-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_image";
-    rev = "bb266d29e19493fa48bda9bbc56c26363099372f";
-    hash = "sha256-I8TqZX3249/bcZtfwrJd545E5h9d9HmRy8GGDH9S+kU=";
+    rev = "7c6ea40bb75262740cd07f7658bc543f13c65b3c";
+    hash = "sha256-V8d9En6fJArslFLIaeCdfVD5YoHPbKjOpR79Va8w8js=";
   };
 
   configureFlags = [
@@ -49,10 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     libwebp
   ];
 
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-  };
-
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/sd/SDL_mixer/package.nix b/pkgs/by-name/sd/SDL_mixer/package.nix
index e0fd4a8db33f..5e7d17b2a31a 100644
--- a/pkgs/by-name/sd/SDL_mixer/package.nix
+++ b/pkgs/by-name/sd/SDL_mixer/package.nix
@@ -11,7 +11,7 @@
   smpeg,
   stdenv,
   # passthru.tests
-  onscripter-en,
+  onscripter,
   # Boolean flags
   enableNativeMidi ? false,
   enableSdltest ? (!stdenv.hostPlatform.isDarwin),
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   passthru.tests = {
-    inherit onscripter-en;
+    inherit onscripter;
   };
 
   meta = {
diff --git a/pkgs/by-name/sd/sdcc/package.nix b/pkgs/by-name/sd/sdcc/package.nix
index 47921b2f3283..d96e7a988215 100644
--- a/pkgs/by-name/sd/sdcc/package.nix
+++ b/pkgs/by-name/sd/sdcc/package.nix
@@ -104,10 +104,6 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
-  # ${src}/support/cpp/gcc/Makefile.in states:
-  # We don't want to compile the compilers with -fPIE, it make PCH fail.
-  hardeningDisable = [ "pie" ];
-
   meta = {
     homepage = "https://sdcc.sourceforge.net/";
     description = "Small Device C Compiler";
diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
index 5292d012d0df..cd9afdb4cdb1 100644
--- a/pkgs/by-name/sd/sdl-jstest/package.nix
+++ b/pkgs/by-name/sd/sdl-jstest/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  SDL,
   SDL2,
   ncurses,
   docbook_xsl,
@@ -13,21 +12,21 @@
 
 stdenv.mkDerivation {
   pname = "sdl-jstest";
-  version = "2018-06-15";
+  version = "0.2.2-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "Grumbel";
     repo = "sdl-jstest";
-    rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b";
-    hash = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw=";
+    rev = "917d27b3b45a335137bd2c8597f8bcf2bac8a569";
+    hash = "sha256-lUHI72fcIEllbcieUrp9A/iKSjUHqmKOUXbzdXCV5jE=";
     fetchSubmodules = true;
   };
 
   buildInputs = [
-    SDL
     SDL2
     ncurses
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -35,11 +34,14 @@ stdenv.mkDerivation {
     git
   ];
 
-  meta = with lib; {
+  cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ];
+
+  meta = {
     homepage = "https://github.com/Grumbel/sdl-jstest";
     description = "Simple SDL joystick test application for the console";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
+    mainProgram = "sdl2-jstest";
   };
 }
diff --git a/pkgs/by-name/sd/sdl2-compat/package.nix b/pkgs/by-name/sd/sdl2-compat/package.nix
index e8890a344cfa..0aec5ddf963f 100644
--- a/pkgs/by-name/sd/sdl2-compat/package.nix
+++ b/pkgs/by-name/sd/sdl2-compat/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl2-compat";
-  version = "2.32.56";
+  version = "2.32.58";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl2-compat";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-Xg886KX54vwGANIhTAFslzPw/sZs2SvpXzXUXcOKgMs=";
+    hash = "sha256-Ngmr/KG5dQ1IDVafn2Jw/29hFCzPGKc9GOenT/4fsIM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index b03ebd819ddd..2199be9d6f96 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   config,
   alsa-lib,
-  apple-sdk_11,
   cmake,
   darwinMinVersionHook,
   dbus,
@@ -62,7 +61,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.22";
+  version = "3.2.26";
 
   outputs = [
     "lib"
@@ -75,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-4jGfw2hNZTGuae2DMLz8xJBtfNu5abIN5GlNIKDOUpw=";
+    hash = "sha256-edcub/zeho4mB3tItp+PSD5l+H6jUPm3seiBP6ppT0k=";
   };
 
   postPatch =
@@ -144,12 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ lib.optional (openglSupport && !stdenv.hostPlatform.isDarwin) libGL
     ++ lib.optional x11Support xorg.libX11
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # error: 'MTLPixelFormatASTC_4x4_LDR' is unavailable: not available on macOS
-      (darwinMinVersionHook "11.0")
-
-      apple-sdk_11
-    ]
     ++ lib.optionals ibusSupport [
       # sdl3 only uses some constants of the ibus headers
       # it never actually loads the library
diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
index a0510206f811..a23c318ca5b3 100644
--- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
+++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2025-09-13";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "38fc811c715365e963a6942092cae147eddddc90";
-    hash = "sha256-dyOzv9cloQuLOuq8CExXQxloNJ02VgoxWiBHeNrSZcA=";
+    rev = "958e252520ece96cd1b03d5ff0d835db2f048991";
+    hash = "sha256-xM/hdwLsNLisXKXLP2Np5enmL/q27xsV4OHSsM5vsuw=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/sd/sdrangel/package.nix b/pkgs/by-name/sd/sdrangel/package.nix
index 8f91a991b024..562220f0386a 100644
--- a/pkgs/by-name/sd/sdrangel/package.nix
+++ b/pkgs/by-name/sd/sdrangel/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   airspy,
   airspyhf,
-  apple-sdk_12,
   aptdec,
   boost,
   cm256cc,
@@ -102,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6Packages.qtwayland ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_12 ]
   ++ lib.optionals withSDRplay [ sdrplay ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sd/sdrpp/cmake4.patch b/pkgs/by-name/sd/sdrpp/cmake4.patch
new file mode 100644
index 000000000000..c40373d99f6b
--- /dev/null
+++ b/pkgs/by-name/sd/sdrpp/cmake4.patch
@@ -0,0 +1,27 @@
+diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
+index 7fce281d..b709255f 100644
+--- a/core/libcorrect/CMakeLists.txt
++++ b/core/libcorrect/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.13)
+ project(Correct C)
+ include(CheckLibraryExists)
+ include(CheckIncludeFiles)
+diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
+index 1dc1c913..e9924677 100644
+--- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
++++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.2.0)
++cmake_minimum_required (VERSION 3.13)
+ project (DiscordRPC)
+ 
+ include(GNUInstallDirs)
+@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
+ 
+ # add subdirs
+ 
+-add_subdirectory(src)
+\ No newline at end of file
++add_subdirectory(src)
diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix
index 847fea651aae..19bba205f0b5 100644
--- a/pkgs/by-name/sd/sdrpp/package.nix
+++ b/pkgs/by-name/sd/sdrpp/package.nix
@@ -69,18 +69,26 @@ stdenv.mkDerivation rec {
   # SDR++ uses a rolling release model.
   # Choose a git hash from head and use the date from that commit as
   # version qualifier
-  git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e";
-  git_date = "2024-01-22";
-  version = "1.1.0-unstable-" + git_date;
+  git_rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93";
+  git_hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU=";
+  git_date = "2025-10-09";
+  version_number = "1.2.1";
+
+  version = "${version_number}-unstable-" + git_date;
 
   src = fetchFromGitHub {
     owner = "AlexandreRouma";
     repo = "SDRPlusPlus";
-    rev = git_hash;
-    hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU=";
+    rev = git_rev;
+    hash = git_hash;
   };
 
-  patches = [ ./runtime-prefix.patch ];
+  patches = [
+    ./runtime-prefix.patch
+    # CMake 4 dropped support of versions lower than 3.5,
+    # versions lower than 3.10 are deprecated.
+    ./cmake4.patch
+  ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
@@ -90,7 +98,7 @@ stdenv.mkDerivation rec {
       --replace "codec2.h" "codec2/codec2.h"
     # Since the __TIME_ and __DATE__ is canonicalized in the build,
     # use our qualified version shown in the programs window title.
-    substituteInPlace core/src/version.h --replace "1.1.0" "$version"
+    substituteInPlace core/src/version.h --replace-fail "${version_number}" "$version"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
index 9a0226ea1e60..18d89bda4ff6 100644
--- a/pkgs/by-name/se/sea-orm-cli/package.nix
+++ b/pkgs/by-name/se/sea-orm-cli/package.nix
@@ -9,18 +9,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sea-orm-cli";
-  version = "1.1.16";
+  version = "1.1.17";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-L8x7+yz/d03yOoWKWCtV1U+37JkTb28sH9OMxzrIsE4=";
+    hash = "sha256-qf0SPFOfp180j6IHds6aQ2y0oYcwQWq7VrO8iyi7LXo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ];
 
-  cargoHash = "sha256-efgzVuv9Lm8T+05Z0WAaux/l7hRdJdVPfpknKt22d50=";
+  cargoHash = "sha256-AqrS+5y3bKuqAVvbmWDO3V0OBVSkW6212WQeY1hixsk=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/se/seabios/package.nix b/pkgs/by-name/se/seabios/package.nix
index a03cb8b0730c..b92735de1e73 100644
--- a/pkgs/by-name/se/seabios/package.nix
+++ b/pkgs/by-name/se/seabios/package.nix
@@ -65,7 +65,6 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [
     "fortify"
     "pic"
-    "pie" # ld: warning: creating DT_TEXTREL in a PIE (and more)
     "stackprotector"
   ];
 
diff --git a/pkgs/by-name/se/seagoat/failing_tests.nix b/pkgs/by-name/se/seagoat/failing_tests.nix
index 75ed4e5bbab4..b347b63fcad5 100644
--- a/pkgs/by-name/se/seagoat/failing_tests.nix
+++ b/pkgs/by-name/se/seagoat/failing_tests.nix
@@ -51,4 +51,14 @@
   "test_file_change_many_times_is_first_result"
   "test_newer_change_can_beat_frequent_change_in_past"
   "test_commit_messages_with_three_or_more_colons"
+
+  # Compatibility issue with click 8.2
+  # https://github.com/kantord/SeaGOAT/issues/1021
+  "test_seagoat_warns_on_incomplete_accuracy[99]"
+  "test_seagoat_warns_on_incomplete_accuracy[100]"
+  "test_server_error_handling[File Not Found on Server-500]"
+  "test_server_error_handling[Database Connection Failed-503]"
+  "test_server_does_not_exist_error"
+  "test_no_network_to_update"
+  "test_server_shows_error_when_folder_is_not_a_git_repo"
 ]
diff --git a/pkgs/by-name/se/seagoat/package.nix b/pkgs/by-name/se/seagoat/package.nix
index 44440b7881ec..2d0550823c09 100644
--- a/pkgs/by-name/se/seagoat/package.nix
+++ b/pkgs/by-name/se/seagoat/package.nix
@@ -30,6 +30,7 @@ python3Packages.buildPythonApplication rec {
     "chromadb"
     "psutil"
     "setuptools"
+    "ollama"
   ];
 
   dependencies = with python3Packages; [
@@ -46,6 +47,7 @@ python3Packages.buildPythonApplication rec {
     ollama
     psutil
     pygments
+    python-dotenv
     requests
     stop-words
     waitress
diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index eac3c1e27d5d..0dcd47dcb9e5 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,20 +13,29 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-10-13";
+    version = "0-unstable-2025-10-31";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "c34bb612847ce4584f65077b104164993bfa88c5";
-      hash = "sha256-vs64ue9bI86kCrOUdy8Kddd2GTIYmveyy1XunEqPAtw=";
+      rev = "b8e4ebdc0cd3b6dc5f58d8ff54deced2b14b13b1";
+      hash = "sha256-qx4y79utIVyLWQlF/RN1TzHKCM/EMDv7tR9WGEbaYoQ=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];
 
-    # upstream pins every dependency
-    pythonRelaxDeps = true;
+    pythonRelaxDeps = [
+      "certifi"
+      "flask"
+      "flask-babel"
+      "httpx-socks"
+      "lxml"
+      "setproctitle"
+      "typer-slim"
+      "typing-extensions"
+      "whitenoise"
+    ];
 
     preBuild =
       let
diff --git a/pkgs/applications/misc/selectdefaultapplication/default.nix b/pkgs/by-name/se/selectdefaultapplication/package.nix
similarity index 91%
rename from pkgs/applications/misc/selectdefaultapplication/default.nix
rename to pkgs/by-name/se/selectdefaultapplication/package.nix
index 46868edc6fe6..8670d4949d2c 100644
--- a/pkgs/applications/misc/selectdefaultapplication/default.nix
+++ b/pkgs/by-name/se/selectdefaultapplication/package.nix
@@ -2,9 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,10 +17,10 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index dd9c9680ad5d..681172b3f11f 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -7,15 +7,15 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "selene";
   version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "kampfkarren";
     repo = "selene";
-    rev = version;
-    sha256 = "sha256-/KMLOZtCdvv76BDGj1oM6Q93cX6yPE4E5ZM+Xy6yRxA=";
+    tag = finalAttrs.version;
+    hash = "sha256-/KMLOZtCdvv76BDGj1oM6Q93cX6yPE4E5ZM+Xy6yRxA=";
   };
 
   cargoHash = "sha256-RlD4CbLJpmOSQJCMaXFC7/83qlPpnzd2wBn3xNu1yQ0=";
@@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec {
     description = "Blazing-fast modern Lua linter written in Rust";
     mainProgram = "selene";
     homepage = "https://github.com/kampfkarren/selene";
-    changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/kampfkarren/selene/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
   };
-}
+})
diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index f3be478f2021..7287e7a67d55 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "semantic-release";
-  version = "24.2.9";
+  version = "25.0.1";
 
   src = fetchFromGitHub {
     owner = "semantic-release";
     repo = "semantic-release";
     rev = "v${version}";
-    hash = "sha256-6dR1wUkoUTRtyQliJFUYLC4eNW2ppIOqeUsL7rLCZiA=";
+    hash = "sha256-6OgqZh9OXITPwOtCD209H7KjPGf2MK/sCcrzZgpasyE=";
   };
 
-  npmDepsHash = "sha256-Frhb7bsY0z160EAKOWB5VCsrBMcrjKPE5OYtgX1Cmhs=";
+  npmDepsHash = "sha256-/Ba4udEUZAEfUmMcUHykkLGPvH9lr8Wxb+6FkJKYiWQ=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/by-name/se/semiphemeral/package.nix b/pkgs/by-name/se/semiphemeral/package.nix
deleted file mode 100644
index 90f419d35432..000000000000
--- a/pkgs/by-name/se/semiphemeral/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  python3,
-  fetchPypi,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "semiphemeral";
-  version = "0.7";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U=";
-  };
-
-  doCheck = false; # upstream has no tests
-
-  pythonImportsCheck = [ "semiphemeral" ];
-
-  build-system = with python3.pkgs; [ setuptools ];
-
-  dependencies = with python3.pkgs; [
-    click
-    sqlalchemy
-    flask
-    tweepy
-    colorama
-  ];
-
-  meta = with lib; {
-    description = "Automatically delete your old tweets, except for the ones you want to keep";
-    homepage = "https://github.com/micahflee/semiphemeral";
-    license = licenses.mit;
-    maintainers = with maintainers; [ amanjeev ];
-    mainProgram = "semiphemeral";
-  };
-}
diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index b8e29ffdf01e..1c4775c0363b 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -6,25 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.26.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
     rev = "v${version}";
-    hash = "sha256-21JNyncChl8rv3IDdvYRF/nvMpAGCBps4xsBP9b/1lA=";
+    hash = "sha256-zh0YYJoljcOQz0ltAk+UBScSGZhsoSqIa+F0Qm4/3iw=";
   };
 
-  cargoHash = "sha256-1VVpjeGU6/+apTHv7klo7FkAQ3AVjiziQRNI7yFbvh0=";
+  cargoHash = "sha256-G7b1BBlVMPtfEWfIXIMH4N+Avt9vtEcCG1ctrja5Ttc=";
 
-  __darwinAllowLocalNetworking = true;
-
-  # On Darwin, sendme invokes CoreFoundation APIs that read ICU data from the
-  # system. Ensure these paths are accessible in the sandbox to avoid segfaults
-  # during checkPhase.
-  sandboxProfile = ''
-    (allow file-read* (subpath "/usr/share/icu"))
-  '';
+  # The tests require contacting external servers.
+  doCheck = false;
 
   meta = with lib; {
     description = "Tool to send files and directories, based on iroh";
diff --git a/pkgs/by-name/se/senpai/package.nix b/pkgs/by-name/se/senpai/package.nix
index f204aa91bf51..ee217158ea89 100644
--- a/pkgs/by-name/se/senpai/package.nix
+++ b/pkgs/by-name/se/senpai/package.nix
@@ -33,6 +33,10 @@ buildGoModule rec {
     scdoc < doc/senpai.1.scd > doc/senpai.1
     scdoc < doc/senpai.5.scd > doc/senpai.5
     installManPage doc/senpai.*
+    install -D -m 444 -t $out/share/applications contrib/senpai.desktop
+    install -D -m 444 res/icon.48.png $out/share/icons/hicolor/48x48/apps/senpai.png
+    install -D -m 444 res/icon.128.png $out/share/icons/hicolor/128x128/apps/senpai.png
+    install -D -m 444 res/icon.svg $out/share/icons/hicolor/scalable/apps/senpai.svg
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
new file mode 100644
index 000000000000..04274f374a8f
--- /dev/null
+++ b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
@@ -0,0 +1,40 @@
+diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs
+index 2ab4c71b59..6bcf003c0a 100644
+--- a/apple-catalog-parsing/build.rs
++++ b/apple-catalog-parsing/build.rs
+@@ -30,7 +30,7 @@
+     // Add necessary libraries to the linker search path. Without this line, compiling fails
+     // on systems without Xcode installed (xcode-select is still required).
+     println!(
+-        "cargo:rustc-link-search=native=/Library/Developer/CommandLineTools/usr/lib/swift/macosx"
++        "cargo:rustc-link-search=native=/usr/lib/swift/macosx"
+     );
+ 
+     let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts");
+@@ -87,17 +87,14 @@
+     println!("cargo:rustc-link-search=framework=/System/Library/PrivateFrameworks");
+     println!("cargo:rustc-link-lib=framework=CoreUI");
+ 
+-    // Link to swift macOS support libraries for Swift runtime support on older macOS versions
+-    let developer_dir = Command::new("xcode-select")
+-        .args(["-p"])
+-        .output()
+-        .expect("Failed to get developer directory, please ensure Xcode is installed.");
+-    let developer_dir_path = String::from_utf8(developer_dir.stdout)
+-        .expect("Failed to convert developer directory to UTF-8")
+-        .trim()
+-        .to_owned();
+-
+-    println!(
+-        "cargo:rustc-link-search={developer_dir_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx"
++    // Link libobjc to avoid the following error: ld: can't find ordinal for imported symbol '___objc_personality_v0'
++    println!("cargo:rustc-link-lib=objc");
++
++    println!(
++        "cargo:rustc-link-search=/usr/lib/swift"
++    );
++
++    println!(
++        "cargo:rustc-link-search=@swiftLib@/lib/swift/macosx"
+     );
+ }
\ No newline at end of file
diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 4011acc62608..ac1c66aca115 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -6,29 +6,45 @@
   openssl,
   pkg-config,
   stdenv,
+  swift,
+  swiftpm,
+  replaceVars,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "2.56.1";
+  version = "2.58.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    hash = "sha256-2T4HEWEcT8ehy5wQqKlBPx2MyusLYg8eM/fWlZ83HAw=";
+    hash = "sha256-8fz8bSQxqylTQ7mD/QbQ6gc8qlEdx/SDCjaB3uqFnGA=";
   };
   doCheck = false;
 
   # Needed to get openssl-sys to use pkgconfig.
   OPENSSL_NO_VENDOR = 1;
 
+  patches = [
+    (replaceVars ./fix-swift-lib-path.patch {
+      swiftLib = lib.getLib swift;
+    })
+  ];
+
   buildInputs = [ openssl ];
   nativeBuildInputs = [
     installShellFiles
     pkg-config
-  ];
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+    swift
+    swiftpm
+  ]);
 
-  cargoHash = "sha256-6AM1oGX4q6kHePiS0fsoXPt0b89O9WItIBukPIwapJQ=";
+  # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`
+  dontUseSwiftpmBuild = true;
+
+  cargoHash = "sha256-3I0uKHpD4SpSeLSIAEjBxxAFfyS4WIvb76x7QAy53HM=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd sentry-cli \
diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index aa009698916a..bd1675b7e8cd 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.11.3";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = version;
-    hash = "sha256-I+vWQWxFpvLnfW7S3YufjM0CD8YgaLy/FL6xGndiXwE=";
+    hash = "sha256-zjg5WSa/zKIyFmkXsmtghHaPoexxqE7m9kAA5V9f5Nc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/se/seppo/package.nix b/pkgs/by-name/se/seppo/package.nix
index 3121d2274cc9..0c5488c639ff 100644
--- a/pkgs/by-name/se/seppo/package.nix
+++ b/pkgs/by-name/se/seppo/package.nix
@@ -12,14 +12,14 @@ in
 
 ocamlPackages.buildDunePackage {
   pname = "seppo";
-  version = "0-unstable-2025-06-03";
+  version = "0-unstable-2025-08-07";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "seppo";
     repo = "seppo";
-    rev = "33ae3e9f61d596fb91d3ab1a91fc26ae80981a93";
-    hash = "sha256-tOIIfYBLcZqQzoPxAVkE8RGX0sugUmDGpxIhIZ5Wy+w=";
+    rev = "d927311cae64883fe2b88f5a1c7e17c8cc525bad";
+    hash = "sha256-Lb2w0mRNNamCltAwdxOyAYh02wkN7yKJGBzqBIPKE8k=";
   };
 
   # Provide git sha to avoid git dependency
diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/by-name/se/seq66/package.nix
similarity index 73%
rename from pkgs/applications/audio/seq66/default.nix
rename to pkgs/by-name/se/seq66/package.nix
index 90ed92fa2039..0d0415ba25cb 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/by-name/se/seq66/package.nix
@@ -4,55 +4,53 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  qttools,
   which,
   alsa-lib,
   libjack2,
   liblo,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "seq66";
   version = "0.99.21";
 
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    qttools
+    qt5.qttools
     which
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     libjack2
     liblo
-    qtbase
+    qt5.qtbase
   ];
 
   postPatch = ''
     for d in libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/src; do
-      substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${version}'
+      substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${finalAttrs.version}'
     done
   '';
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ahlstromcj/seq66";
     description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ orivej ];
     mainProgram = "qseq66";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/se/seqtk/package.nix b/pkgs/by-name/se/seqtk/package.nix
index 5e223163500b..362507734e6a 100644
--- a/pkgs/by-name/se/seqtk/package.nix
+++ b/pkgs/by-name/se/seqtk/package.nix
@@ -7,15 +7,15 @@
   isa-l,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "seqtk";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "lh3";
     repo = "seqtk";
-    rev = "v${version}";
-    hash = "sha256-W6IUn7R9tlnWrKe/qOHJL+43AL4EZB7zj7M5u9l83WE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IQYBs3hUlV9fr8F2SL//houKKEq0nFViq9ulOppRMcM=";
   };
 
   buildInputs = [
@@ -29,16 +29,18 @@ stdenv.mkDerivation rec {
     "BINDIR=$(out)/bin"
   ];
 
+  hardeningDisable = [ "format" ];
+
   preInstall = ''
     mkdir -p "$out/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit for processing sequences in FASTA/Q formats";
     mainProgram = "seqtk";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/lh3/seqtk";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ bwlang ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ bwlang ];
   };
-}
+})
diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 70da4c34d9c5..ab0a72d1c9b0 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-b2Ys49561nBn+U8pDQHewrxd351PLGIQr0qK51eYuCk=";
+    hash = "sha256-HzAgPCAHOdxXPwPWPPU9VaNrVJL42TlbYMD/n7AeOH8=";
   };
 
-  cargoHash = "sha256-KhLDaEPC5CIApMbxoGkO58QJ3bGkDlEjGJzdFa8UZKw=";
+  cargoHash = "sha256-dRR3Zr2QM1yDDxiKqugwMtz5f5ted0oHSdR47XUTQUc=";
 
   nativeCheckInputs = [ gitMinimal ];
 
diff --git a/pkgs/by-name/se/server-box/gitHashes.json b/pkgs/by-name/se/server-box/gitHashes.json
index 8da0bdd3549c..a10caf0c8b05 100644
--- a/pkgs/by-name/se/server-box/gitHashes.json
+++ b/pkgs/by-name/se/server-box/gitHashes.json
@@ -1,11 +1,11 @@
 {
   "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=",
   "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=",
-  "dartssh2": "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=",
+  "dartssh2": "sha256-Bl5eLrYU2YnpRcleff3wVXiTS9wuo2A1neiLUClvbGU=",
   "fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=",
-  "fl_lib": "sha256-kg52OMCznepmqUl8PpikabeDyRoRwDbyo997PDcTxJA=",
+  "fl_lib": "sha256-0Dg21LBVIyTH5MLt/v+kGzfOK8PFVYfNiK6P/jcy2jI=",
   "gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=",
   "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=",
   "watch_connectivity": "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=",
-  "xterm": "sha256-VxAWV40R+rSvYyS9LZoD7GL1K1gwjMnpoKd7hfb48Wo="
+  "xterm": "sha256-ujR2aRB9TbaSoGB0vmx75X6683f/tu+Ptj+BFJ2WWVs="
 }
diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix
index 5d5a5b4e19e0..d1dda3c87e75 100644
--- a/pkgs/by-name/se/server-box/package.nix
+++ b/pkgs/by-name/se/server-box/package.nix
@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "1.0.1256";
+  version = "1.0.1270";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_server_box";
     tag = "v${version}";
-    hash = "sha256-V4Y4JoUsca2MmPJd1t+IWrNiIj5oslaj6736rPUT9hM=";
+    hash = "sha256-3erwb2e9iINe4MVuOQKzBuBdUJyBgW2zIImZwVyll6Q=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json
index 0d701f98082b..1cc8a74af475 100644
--- a/pkgs/by-name/se/server-box/pubspec.lock.json
+++ b/pkgs/by-name/se/server-box/pubspec.lock.json
@@ -20,6 +20,16 @@
       "source": "hosted",
       "version": "7.6.0"
     },
+    "analyzer_buffer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer_buffer",
+        "sha256": "f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.10"
+    },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
@@ -144,11 +154,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
+        "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "3.0.0"
     },
     "build_config": {
       "dependency": "transitive",
@@ -174,31 +184,31 @@
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
+        "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "3.0.0"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
+        "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.6.0"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
+        "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.2"
+      "version": "9.2.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -426,11 +436,11 @@
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_core",
-        "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be",
+        "sha256": "cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.5"
+      "version": "0.8.0"
     },
     "custom_lint_visitor": {
       "dependency": "transitive",
@@ -456,8 +466,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.285",
-        "resolved-ref": "18fb1ad15ee6d2c8c5ec67722bf8b90fe0f4746d",
+        "ref": "v1.0.293",
+        "resolved-ref": "3eedfd55916eede70aeb28605469a43623a9791b",
         "url": "https://github.com/lollipopkit/dartssh2"
       },
       "source": "git",
@@ -618,8 +628,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.346",
-        "resolved-ref": "f277b7a4259e45889320ef6d80ab320662558784",
+        "ref": "v1.0.358",
+        "resolved-ref": "c8e55d054875bb3ccdab9894a01fe82d173dc54e",
         "url": "https://github.com/lppcg/fl_lib"
       },
       "source": "git",
@@ -635,11 +645,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_displaymode",
-        "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
+        "sha256": "ecd44b1e902b0073b42ff5b55bf283f38e088270724cdbb7f7065ccf54aa60a8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.0"
+      "version": "0.7.0"
     },
     "flutter_gbk2utf8": {
       "dependency": "direct main",
@@ -731,11 +741,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_riverpod",
-        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "sha256": "71a420767ae786f9402e4efb74e1119fa95b53e6a3781ab8ab21c121ac1349c6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.1"
     },
     "flutter_secure_storage": {
       "dependency": "transitive",
@@ -797,6 +807,16 @@
       "source": "hosted",
       "version": "3.1.2"
     },
+    "flutter_staggered_grid_view": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_staggered_grid_view",
+        "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.7.0"
+    },
     "flutter_svg": {
       "dependency": "transitive",
       "description": {
@@ -823,11 +843,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "2d399f823b8849663744d2a9ddcce01c49268fb4170d0442a655bf6a2f47be22",
+        "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.2.3"
     },
     "freezed_annotation": {
       "dependency": "direct main",
@@ -924,11 +944,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "hive_ce_generator",
-        "sha256": "609678c10ebee7503505a0007050af40a0a4f498b1fb7def3220df341e573a89",
+        "sha256": "a169feeff2da9cc2c417ce5ae9bcebf7c8a95d7a700492b276909016ad70a786",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.2"
+      "version": "1.9.3"
     },
     "html": {
       "dependency": "transitive",
@@ -1084,11 +1104,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
+        "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.5"
+      "version": "6.11.1"
     },
     "leak_tracker": {
       "dependency": "transitive",
@@ -1250,6 +1270,16 @@
       "source": "hosted",
       "version": "2.0.0"
     },
+    "mockito": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mockito",
+        "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.5.0"
+    },
     "multi_split_view": {
       "dependency": "transitive",
       "description": {
@@ -1555,11 +1585,11 @@
       "dependency": "direct main",
       "description": {
         "name": "re_editor",
-        "sha256": "17e430f0591dd361992ec2dd6f69191c1853fa46e05432e095310a8f82ee820e",
+        "sha256": "dd4e6ca7350a8fa0cda4e425b82a0c3c010f0f6b3f618c74223e05b8129ab629",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.8.0"
     },
     "re_highlight": {
       "dependency": "transitive",
@@ -1585,41 +1615,41 @@
       "dependency": "transitive",
       "description": {
         "name": "riverpod",
-        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
+        "sha256": "b21446f04474040479b19004c5b729605cde221bbd14cf16ad0db8804dce4810",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.1"
     },
     "riverpod_analyzer_utils": {
       "dependency": "transitive",
       "description": {
         "name": "riverpod_analyzer_utils",
-        "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611",
+        "sha256": "a0f68adb078b790faa3c655110a017f9a7b7b079a57bbd40f540e80dce5fcd29",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.10"
+      "version": "1.0.0-dev.7"
     },
     "riverpod_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "riverpod_annotation",
-        "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8",
+        "sha256": "d8154e04008b98015ee3e0514a5d929e3d15605790d28bcd74e63e2d415632a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.1"
     },
     "riverpod_generator": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_generator",
-        "sha256": "44a0992d54473eb199ede00e2260bd3c262a86560e3c6f6374503d86d0580e36",
+        "sha256": "af92fa4051568071f7e12bd44b8b4f3adc7470e3676bd5ac953582a9cce4a1c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.5"
+      "version": "3.0.1"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1685,11 +1715,11 @@
       "dependency": "transitive",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1821,11 +1851,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
+        "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.1.0"
     },
     "source_helper": {
       "dependency": "transitive",
@@ -2292,8 +2322,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v4.0.4",
-        "resolved-ref": "5747837cdb7b113ef733ce0104e4f2bfa1eb4a36",
+        "ref": "v4.0.13",
+        "resolved-ref": "6343b0e5f744d2c11090d34690ad5049ebbc599b",
         "url": "https://github.com/lollipopkit/xterm.dart"
       },
       "source": "git",
diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index c6b69dc98503..e2f25f468787 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 
   # build deps
   cargo-deny,
@@ -21,10 +22,8 @@
   uv,
   which,
   yasm,
-  zlib,
 
   # runtime deps
-  apple-sdk_14,
   fontconfig,
   freetype,
   gst_all_1,
@@ -36,6 +35,7 @@
   vulkan-loader,
   wayland,
   xorg,
+  zlib,
 
   # tests
   nixosTests,
@@ -65,13 +65,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-07-30";
+  version = "0.0.1-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "0e180578632facc10f0e8fb29df9084369adc600";
-    hash = "sha256-4EQ15jOZNYjGmhIOJivHT8R6BeT6moGj+AI9DBq58v4=";
+    rev = "32c0c41d118e55fda1ab9aa778c2a59fa27710e9";
+    hash = "sha256-kQbwqKTsW5gkEeHE7Yp/fbGObjUJnvOG/0U6RSZc7oU=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -81,7 +81,7 @@ rustPlatform.buildRustPackage {
     '';
   };
 
-  cargoHash = "sha256-fqIlN+6SEY0LVrUk47U12TuVoRte0oCGJhO7DHovzBM=";
+  cargoHash = "sha256-wwS4fhYG8pvmNLCgSO26yf65No7wL1Xrqm+38sP2pxM=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
@@ -108,11 +108,21 @@ rustPlatform.buildRustPackage {
     uv
     which
     yasm
-    zlib
   ];
 
   env.UV_PYTHON = customPython.interpreter;
 
+  postPatch = ''
+    # mozjs-sys attempts to find the header path of the icu_capi crate through cargo-metadata at build time.
+    # Unfortunately, cargo-metadata also attempts to fetch optional, disabled crates in the process.
+    # As these are not part of servo's Cargo.lock, they are not included in our cache and cargo-metadata fails.
+    # We work around this by finding the header path ourselves and substituting the invocation in mozjs-sys' build.rs.
+    icu_capi_dir=$(find $cargoDepsCopy -maxdepth 2 -type d -name icu_capi-\*)
+    icu_c_include_path="$icu_capi_dir/bindings/c"
+    substituteInPlace $cargoDepsCopy/mozjs_sys-*/build.rs \
+      --replace-fail "let icu_c_include_path = get_icu_capi_include_path();" "let icu_c_include_path = \"$icu_c_include_path\".to_string();"
+  '';
+
   buildInputs = [
     fontconfig
     freetype
@@ -124,6 +134,7 @@ rustPlatform.buildRustPackage {
     harfbuzz
     libunwind
     libGL
+    zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
@@ -131,9 +142,6 @@ rustPlatform.buildRustPackage {
     xorg.libxcb
     udev
     vulkan-loader
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
   ];
 
   # Builds with additional features for aarch64, see https://github.com/servo/servo/issues/36819
@@ -141,7 +149,16 @@ rustPlatform.buildRustPackage {
     "servo_allocator/use-system-allocator"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      # mozjs-sys fails with:
+      #  cc1plus: error: '-Wformat-security' ignored without '-Wformat'
+      "-Wno-error=format-security"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+    ]
+  );
 
   # copy resources into `$out` to be used during runtime
   # link runtime libraries
@@ -154,12 +171,13 @@ rustPlatform.buildRustPackage {
   '';
 
   passthru = {
-    updateScript = ./update.sh;
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
     tests = { inherit (nixosTests) servo; };
   };
 
   meta = {
-    broken = true; # cargo fetcher leaves invalid Cargo.toml around, which breaks mozjs-sys build
+    # undefined libmozjs_sys symbols during linking
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine";
     homepage = "https://servo.org";
     license = lib.licenses.mpl20;
@@ -167,6 +185,7 @@ rustPlatform.buildRustPackage {
       hexa
       supinie
     ];
+    teams = with lib.teams; [ ngi ];
     mainProgram = "servo";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
diff --git a/pkgs/by-name/se/servo/update.sh b/pkgs/by-name/se/servo/update.sh
deleted file mode 100755
index ffb4265b6c70..000000000000
--- a/pkgs/by-name/se/servo/update.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils common-updater-scripts curl jq nix-update
-
-# This update script exists, because nix-update is unable to ignore various
-# bogus tags that exist on the upstream repo e.g.
-#  - selectors-v0.18.0/v0.20.0/v0.21.0/v0.22.0
-#  - homu-tmp
-#
-# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be
-# removed.
-
-set -exuo pipefail
-
-# Determine latest commit id and date
-TMP=$(mktemp)
-curl -o "$TMP" https://api.github.com/repos/servo/servo/commits/main
-COMMIT_ID=$(jq -r '.sha' "$TMP")
-COMMIT_TIMESTAMP=$(jq -r '.commit.author.date' "$TMP")
-COMMIT_DATE=$(date -d "$COMMIT_TIMESTAMP" +"%Y-%m-%d")
-rm $TMP
-
-cd "$(git rev-parse --show-toplevel)"
-
-# Update version, src
-update-source-version servo "0-unstable-${COMMIT_DATE}" --file=pkgs/by-name/se/servo/package.nix --rev="$COMMIT_ID"
-
-# Update cargoHash
-nix-update --version=skip servo
diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index a4de0fa084eb..5012c4a10705 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule rec {
   pname = "sesh";
-  version = "2.18.1";
+  version = "2.19.0";
 
   nativeBuildInputs = [
     go-mockery
@@ -16,13 +16,13 @@ buildGoModule rec {
     owner = "joshmedeski";
     repo = "sesh";
     rev = "v${version}";
-    hash = "sha256-f63C2QFU5G/xoy6mLUSzgQv7VOJ4lv06OnGoyZy54rg=";
+    hash = "sha256-mteypgCgFxgoPSh0H1kwNUm3p9F3wbRjhONdSm9Qeqs=";
   };
 
   preBuild = ''
     mockery
   '';
-  vendorHash = "sha256-TLl8HZnsVvtx6jqusTETP0l3zTmzYmuV4NJIM958VcQ=";
+  vendorHash = "sha256-GEWtbhZhgussFzfg1wNEU0Gr5zhXmwlsgH6d1cXOwvc=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/se/session-desktop/Info.plist b/pkgs/by-name/se/session-desktop/Info.plist
new file mode 100644
index 000000000000..1be6514e846b
--- /dev/null
+++ b/pkgs/by-name/se/session-desktop/Info.plist
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Session</string>
+    <key>CFBundleExecutable</key>
+    <string>Session</string>
+    <key>CFBundleIconFile</key>
+    <string>icon.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.loki-project.messenger-desktop</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Session</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@version@</string>
+    <key>CFBundleVersion</key>
+    <string>refs/heads/master</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.social-networking</string>
+    <key>LSEnvironment</key>
+    <dict>
+      <key>MallocNanoZone</key>
+      <string>0</string>
+    </dict>
+    <key>LSMinimumSystemVersion</key>
+    <string>11.0</string>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSAllowsArbitraryLoads</key>
+      <true/>
+      <key>NSAllowsLocalNetworking</key>
+      <true/>
+      <key>NSExceptionDomains</key>
+      <dict>
+        <key>127.0.0.1</key>
+        <dict>
+          <key>NSIncludesSubdomains</key>
+          <false/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+          <true/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPSLoads</key>
+          <false/>
+          <key>NSTemporaryExceptionMinimumTLSVersion</key>
+          <string>1.0</string>
+          <key>NSTemporaryExceptionRequiresForwardSecrecy</key>
+          <false/>
+        </dict>
+        <key>localhost</key>
+        <dict>
+          <key>NSIncludesSubdomains</key>
+          <false/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+          <true/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPSLoads</key>
+          <false/>
+          <key>NSTemporaryExceptionMinimumTLSVersion</key>
+          <string>1.0</string>
+          <key>NSTemporaryExceptionRequiresForwardSecrecy</key>
+          <false/>
+        </dict>
+      </dict>
+    </dict>
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>This app needs access to Bluetooth</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>This app needs access to Bluetooth</string>
+    <key>NSCameraUsageDescription</key>
+    <string>Session requires camera access to record video.</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2025 Session Foundation</string>
+    <key>NSMainNibFile</key>
+    <string>MainMenu</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Session requires microphone access to record audio.</string>
+    <key>NSPrefersDisplaySafeAreaCompatibilityMode</key>
+    <false/>
+    <key>NSPrincipalClass</key>
+    <string>AtomApplication</string>
+    <key>NSQuitAlwaysKeepsWindows</key>
+    <false/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <false/>
+    <key>NSSupportsAutomaticGraphicsSwitching</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/pkgs/by-name/se/session-desktop/fake-git.sh b/pkgs/by-name/se/session-desktop/fake-git.sh
new file mode 100644
index 000000000000..088c718c0f84
--- /dev/null
+++ b/pkgs/by-name/se/session-desktop/fake-git.sh
@@ -0,0 +1,74 @@
+if [ "$1" != "rev-parse" ]; then
+  echo "$@" >&2
+  exit 1
+fi
+shift
+
+short=0
+shortlen=7
+ref=
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --short)
+      short=1
+      if [ $# -gt 1 ] && [ "$2" -eq "$2" ] 2>/dev/null; then
+        shortlen=$2
+        shift
+      else
+        shortlen=7
+      fi
+      ;;
+    --short=*)
+      short=1
+      shortlen=''${1#--short=}
+      ;;
+    --is-inside-work-tree)
+      echo true
+      exit 0
+      ;;
+    HEAD|HEAD:*)
+      ref=$1
+      ;;
+    *)
+      echo "rev-parse $@" >&2
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+if [ -z "$ref" ]; then
+  echo "rev-parse" >&2
+  exit 1
+fi
+
+case "$ref" in
+  HEAD)
+    path=$(pwd)
+    hash=
+    while [ "$path" != "/" ]; do
+      if [ -f "$path/.gitrev" ]; then
+        hash=$(cat "$path/.gitrev")
+        break
+      fi
+      path=$(dirname "$path")
+    done
+    ;;
+  HEAD:*)
+    subpath=''${ref#HEAD:}
+    if [ -f "$PWD/$subpath/.gitrev" ]; then
+      hash=$(cat "$PWD/$subpath/.gitrev")
+    fi
+    ;;
+esac
+
+if [ -z "$hash" ]; then
+  echo "rev-parse $ref" >&2
+  exit 1
+fi
+
+if [ "$short" -eq 1 ]; then
+  printf '%s\n' "$(printf '%s' "$hash" | cut -c1-"$shortlen")"
+else
+  printf '%s\n' "$hash"
+fi
diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix
index b9183d1da7e7..4e98a2f9c25c 100644
--- a/pkgs/by-name/se/session-desktop/package.nix
+++ b/pkgs/by-name/se/session-desktop/package.nix
@@ -1,67 +1,336 @@
 {
   lib,
+  fetchFromGitHub,
   makeDesktopItem,
+  writeShellScriptBin,
   copyDesktopItems,
-  stdenvNoCC,
-  fetchurl,
-  appimageTools,
+  stdenv,
   makeWrapper,
+  fetchpatch,
+  replaceVars,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  rustPlatform,
+  nodejs,
+  electron,
+  jq,
+  python3,
+  git,
+  cmake,
+  openssl,
+  tcl,
+  xcodebuild,
+  cctools,
+  darwin,
 }:
 
 let
-  version = "1.15.2";
-  pname = "session-desktop";
+  fake-git = writeShellScriptBin "git" (lib.readFile ./fake-git.sh);
+
+  sqlcipher-src = stdenv.mkDerivation (finalAttrs: {
+    pname = "sqlcipher-src";
+    # when updating: look for the version in deps/download.js of @signalapp/better-sqlite3, whose version is in turn found in yarn.lock
+    version = "4.6.1";
+    src = fetchFromGitHub {
+      owner = "signalapp";
+      repo = "sqlcipher";
+      tag = "v${finalAttrs.version}-f_barrierfsync";
+      hash = "sha256-3fGRPZpJmLbY95DLJ34BK53ZTzJ1dWEzislXsOrTc8k=";
+    };
+
+    patches = [
+      # Needed to reproduce the build artifact from Signal's CI.
+      # TODO: find the actual CI workflow that produces
+      # https://build-artifacts.signal.org/desktop/sqlcipher-v2-4.6.1-signal-patch2--0.2.1-asm2-6253f886c40e49bf892d5cdc92b2eb200b12cd8d80c48ce5b05967cfd01ee8c7.tar.gz
+      # See also: https://github.com/signalapp/better-sqlite3/blob/v9.0.13/deps/defines.gypi#L33
+      # Building @signalapp/better-sqlite3 will require openssl without this patch.
+      (fetchpatch {
+        name = "sqlcipher-crypto-custom.patch";
+        url = "https://github.com/sqlcipher/sqlcipher/commit/702af1ff87528a78f5a9b2091806d3a5642e1d4a.patch";
+        hash = "sha256-OKh6qCGHBQWZyzXfyEveAs71wrNwlWLuG9jNqDeKNG4=";
+      })
+    ];
+
+    buildInputs = [
+      openssl
+      tcl
+    ];
+
+    # see https://github.com/signalapp/node-sqlcipher/blob/v2.4.4/deps/sqlcipher/update.sh
+    configureFlags = [ "--enable-update-limit" ];
+    makeFlags = [
+      "sqlite3.h"
+      "sqlite3.c"
+      "sqlite3ext.h"
+      "shell.c"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp sqlite3.h sqlite3.c sqlite3ext.h shell.c $out
+
+      runHook postInstall
+    '';
+
+    meta = {
+      homepage = "https://github.com/signalapp/sqlcipher";
+      license = lib.licenses.bsd3;
+    };
+  });
+
+  signal-sqlcipher-extension = rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "signal-sqlcipher-extension";
+    # when updating: look for the version in deps/download.js of @signalapp/better-sqlite3, whose version is in turn found in yarn.lock
+    version = "0.2.1";
+    src = fetchFromGitHub {
+      owner = "signalapp";
+      repo = "Signal-Sqlcipher-Extension";
+      rev = "v${finalAttrs.version}";
+      hash = "sha256-INSkm7ZuetPASuIqezzzG/bXoEHClUb9XpxWbxLVXRc=";
+    };
+
+    cargoHash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc=";
+
+    postInstall = ''
+      mkdir -p $out/include
+      cp target/*.h $out/include
+    '';
+
+    meta = {
+      homepage = "https://github.com/signalapp/Signal-Sqlcipher-Extension";
+      license = lib.licenses.agpl3Only;
+    };
+  });
+
+  libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: {
+    pname = "libsession-util-nodejs";
+    version = "0.5.5"; # find version in yarn.lock
+    src = fetchFromGitHub {
+      owner = "session-foundation";
+      repo = "libsession-util-nodejs";
+      tag = "v${finalAttrs.version}";
+      fetchSubmodules = true;
+      deepClone = true; # need git rev for all submodules
+      hash = "sha256-FmI9Xmml+sjXHJ+W6CfBC8QUrQR89H3HWEYlHE2Xsts=";
+      # fetchgit is not reproducible with deepClone + fetchSubmodules:
+      # https://github.com/NixOS/nixpkgs/issues/100498
+      postFetch = ''
+        find $out -name .git -type d -prune | while read -r gitdir; do
+          pushd "$(dirname "$gitdir")"
+          git rev-parse HEAD > .gitrev
+          popd
+        done
+        find $out -name .git -type d -prune -exec rm -rf {} +
+      '';
+    };
+
+    postPatch = ''
+      sed -i -E 's/--runtime-version=[^[:space:]]*/--runtime-version=${electron.version}/' package.json
+    '';
+
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      yarnInstallHook
+      nodejs
+      cmake
+      python3
+      fake-git # used in update_version.sh, libsession-util/external/oxen-libquic/cmake/check_submodule.cmake, etc.
+      jq
+    ];
+
+    dontUseCmakeConfigure = true;
+    yarnOfflineCache = fetchYarnDeps {
+      yarnLock = "${finalAttrs.src}/yarn.lock";
+      hash = "sha256-0pH88EOqxG/kg7edaWnaLEs3iqhIoRCJxDdBn4JxYeY=";
+    };
+
+    preBuild = ''
+      # prevent downloading; see https://github.com/cmake-js/cmake-js/blob/v7.3.1/lib/dist.js
+      mkdir -p "$HOME/.cmake-js/electron-${stdenv.hostPlatform.node.arch}"
+      ln -s ${electron.headers} "$HOME/.cmake-js/electron-${stdenv.hostPlatform.node.arch}/v${electron.version}"
+
+      # populate src/version.h
+      yarn update_version
+    '';
+
+    # The install script is the build script.
+    # `yarn install` may be better than `yarn run install`.
+    # However, the former seems to use /bin/bash while the latter uses stdenv.shell,
+    # and the former simply cannot find the cmake-js command, which is pretty weird,
+    # and using `yarn config set script-shell` does not help.
+    yarnBuildScript = "run";
+    yarnBuildFlags = "install";
+
+    postInstall = ''
+      # build is not installed by default because it is in .gitignore
+      cp -r build $out/lib/node_modules/libsession_util_nodejs
+    '';
+
+    meta = {
+      homepage = "https://github.com/session-foundation/libsession-util-nodejs";
+      # No license file, but gpl3Only makes sense because package.json says GPL-3.0,
+      # which is also consistent with session-desktop and libsession-util.
+      license = lib.licenses.gpl3Only;
+    };
+  });
 
-  src = fetchurl {
-    url = "https://github.com/session-foundation/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
-    hash = "sha256-xQ/Fjg04XgXUioCCU0+sOLaTWZV1z05EmzZCqEU++Ok=";
-  };
-  appimage = appimageTools.wrapType2 { inherit version pname src; };
-  appimage-contents = appimageTools.extractType2 { inherit version pname src; };
 in
-stdenvNoCC.mkDerivation {
-  inherit version pname;
-  src = appimage;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "session-desktop";
+  version = "1.16.10";
+  src = fetchFromGitHub {
+    owner = "session-foundation";
+    repo = "session-desktop";
+    tag = "v${finalAttrs.version}";
+    leaveDotGit = true;
+    hash = "sha256-9l5AgG9YNz61lS/1Q/b46UgdyidHH7sQK7ZWz19XWr0=";
+    postFetch = ''
+      pushd $out
+      git rev-parse HEAD > .gitrev
+      rm -rf .git
+      popd
+    '';
+  };
+
+  postPatch = ''
+    jq '
+      del(.engines) # too restrictive Node version requirement
+      # control what files are packed in the install phase
+      + {files: ["**/*.js", "**/*.html", "**/*.node", "_locales", "config", "fonts", "images", "mmdb", "mnemonic_languages", "protos", "sound", "stylesheets"]}
+    ' package.json > package.json.new
+    mv package.json.new package.json
+  '';
 
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    jq
+    python3
+    fake-git # see build/updateLocalConfig.js
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools # provides libtool needed for better-sqlite3
+    xcodebuild
+    darwin.autoSignDarwinBinariesHook
   ];
 
+  env = {
+    npm_config_nodedir = electron.headers;
+    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  };
+
+  dontUseCmakeConfigure = true;
+  yarnOfflineCache = fetchYarnDeps {
+    # Future maintainers: keep in mind that sometimes the upstream deduplicates dependencies
+    # (see the `dedup` script in package.json) before committing yarn.lock,
+    # which may unfortunately break the offline cache (and may not).
+    # If that happens, clone the repo and run `yarn install --ignore-scripts` yourself,
+    # copy the modified yarn.lock here, and use `./yarn.lock` instead of `"${finalAttrs.src}/yarn.lock"`,
+    # and also add `cp ${./yarn.lock} yarn.lock` to postPatch.
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-A2AbKOXWx8+PN467DVpKVTorZDs/UFaxjc7VS0Xdo6k=";
+  };
+
+  preBuild = ''
+    # prevent downloading
+    pushd node_modules/@signalapp/better-sqlite3/deps
+    tar -czf sqlcipher.tar.gz \
+      -C ${signal-sqlcipher-extension} lib include \
+      -C ${sqlcipher-src} . \
+      --transform="s,^lib,./signal-sqlcipher-extension/${stdenv.targetPlatform.rust.cargoShortTarget}," \
+      --transform="s,^include,./signal-sqlcipher-extension/include,"
+    hash=$(sha256sum sqlcipher.tar.gz | cut -d' ' -f1)
+    sed -i "s/^const HASH = '.*';/const HASH = '$hash';/" download.js
+    popd
+
+    export NODE_ENV=production
+
+    # rebuild native modules except libsession_util_nodejs
+    rm -rf node_modules/libsession_util_nodejs
+    npm rebuild --verbose --offline --no-progress --release # why doesn't yarn have `rebuild`?
+    cp -r ${libsession-util-nodejs}/lib/node_modules/libsession_util_nodejs node_modules
+    chmod -R +w node_modules/libsession_util_nodejs
+    rm -rf node_modules/libsession_util_nodejs/node_modules
+
+    # some important things that did not run because of --ignore-scripts
+    yarn run postinstall
+  '';
+
+  preInstall = ''
+    # Do not want yarn prune to remove native modules that we just built.
+    mv node_modules node_modules.dev
+  '';
+
+  postInstall = ''
+    find node_modules.dev -mindepth 2 -maxdepth 3 -type d -name build  | while read -r buildDir; do
+      packageDir=$(dirname ''${buildDir#node_modules.dev/})
+      installPackageDir="$out/lib/node_modules/session-desktop/node_modules/$packageDir"
+      if [ -d "$installPackageDir" ]; then
+        cp -r "$buildDir" "$installPackageDir"
+      fi
+    done
+
+    makeWrapper ${lib.getExe electron} $out/bin/session-desktop \
+      --add-flags $out/lib/node_modules/session-desktop \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --set NODE_ENV production \
+      --inherit-argv0
+
+    for f in build/icons/icon_*.png; do
+      base=$(basename $f .png)
+      size=''${base#icon_}
+      install -Dm644 $f $out/share/icons/hicolor/$size/apps/session-desktop.png
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications/Session.app/Contents/{MacOS,Resources}
+    ln -s $out/bin/session-desktop $out/Applications/Session.app/Contents/MacOS/Session
+    install -Dm644 build/icon-mac.icns $out/Applications/Session.app/Contents/Resources/icon.icns
+    install -Dm644 ${
+      # Adapted from the dmg package from upstream:
+      # https://github.com/session-foundation/session-desktop/releases/download/v1.16.10/session-desktop-mac-arm64-1.16.10.dmg
+      replaceVars ./Info.plist { inherit (finalAttrs) version; }
+    } $out/Applications/Session.app/Contents/Info.plist
+  '';
+
   desktopItems = [
     (makeDesktopItem {
       name = "Session";
       desktopName = "Session";
       comment = "Onion routing based messenger";
       exec = "session-desktop";
-      icon = "${appimage-contents}/session-desktop.png";
+      icon = "session-desktop";
       terminal = false;
       type = "Application";
       categories = [ "Network" ];
     })
   ];
 
-  installPhase = ''
-    runHook preInstall
+  passthru = {
+    inherit sqlcipher-src signal-sqlcipher-extension libsession-util-nodejs;
+    updateScript = ./update.sh;
+  };
 
-    mkdir -p $out/
-    cp -r bin $out/bin
-
-    wrapProgram $out/bin/session-desktop \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Onion routing based messenger";
     mainProgram = "session-desktop";
     homepage = "https://getsession.org/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    downloadPage = "https://getsession.org/download";
+    changelog = "https://github.com/session-foundation/session-desktop/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       alexnortung
+      ulysseszhan
     ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/se/session-desktop/update.sh b/pkgs/by-name/se/session-desktop/update.sh
new file mode 100755
index 000000000000..8f6cb10327a8
--- /dev/null
+++ b/pkgs/by-name/se/session-desktop/update.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+set -euo pipefail
+
+currentVersion="$(nix-instantiate --eval --raw -A session-desktop.version)"
+latestVersion="$(
+  curl -s https://api.github.com/repos/session-foundation/session-desktop/releases/latest \
+    ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
+  | jq -r .tag_name | sed 's/^v//'
+)"
+if [ "$currentVersion" = "$latestVersion" ]; then
+  echo "Already up-to-date"
+  exit 0
+fi
+
+yarnLock="$(curl -s https://raw.githubusercontent.com/session-foundation/session-desktop/v$latestVersion/yarn.lock)"
+depVersion() {
+  name="$(echo "$1" | sed 's/\//\\&/g')"
+  echo "$yarnLock" | awk '/^"?'"$name"'@/ {flag=1; next} flag && /^  version "[^"]+"/ {match($0, /^  version "([^"]+)"/, a); print a[1]; exit}' -
+}
+
+update-source-version session-desktop.passthru.libsession-util.nodejs "$(depVersion libsession_util_nodejs)"
+
+downloadJs="$(curl -s https://raw.githubusercontent.com/signalapp/better-sqlite3/v$(depVersion @signalapp/better-sqlite3)/deps/download.js)"
+sqlDepVersion() {
+  echo "$downloadJs" | awk "match(\$0, /^const ${1}_VERSION = '([0-9.]+)['-]/, a) {print a[1]}" -
+}
+
+update-source-version session-desktop.passthru.sqlcipher-src "$(sqlDepVersion SQLCIPHER)"
+update-source-version session-desktop.passthru.signal-sqlcipher-extension "$(sqlDepVersion EXTENSION)"
+
+update-source-version session-desktop "$latestVersion"
diff --git a/pkgs/by-name/se/setroot/package.nix b/pkgs/by-name/se/setroot/package.nix
index 2e6cc2d6f8cd..a4fd8f94f10f 100644
--- a/pkgs/by-name/se/setroot/package.nix
+++ b/pkgs/by-name/se/setroot/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     description = "Simple X background setter inspired by imlibsetroot and feh";
     homepage = "https://github.com/ttzhou/setroot";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.vyp ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "setroot";
   };
diff --git a/pkgs/by-name/se/setup-envtest/package.nix b/pkgs/by-name/se/setup-envtest/package.nix
index 32b38df934b5..93b289f261d3 100644
--- a/pkgs/by-name/se/setup-envtest/package.nix
+++ b/pkgs/by-name/se/setup-envtest/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "setup-envtest";
-  version = "0.19.0";
+  version = "0.22.3";
 
   src =
     fetchFromGitHub {
       owner = "kubernetes-sigs";
       repo = "controller-runtime";
       rev = "v${version}";
-      hash = "sha256-9AqZMiA+OIJD+inmeUc/lq57kV7L85jk1I4ywiSKirg=";
+      hash = "sha256-Al1MILraagj5b2AatweT3uGv/xpFYgLN/vEXCE/w630=";
     }
     + "/tools/setup-envtest";
 
-  vendorHash = "sha256-sn3HiKTpQzjrFTOVOGFJwoNpxU+XWgkWD2EOcPilePY=";
+  vendorHash = "sha256-1WxRIvzVUg+6XUWTAs6SVR12vGihUFkuwH1jH10Oa50=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/se/sexp-cpp/package.nix b/pkgs/by-name/se/sexp-cpp/package.nix
new file mode 100644
index 000000000000..52b915243d36
--- /dev/null
+++ b/pkgs/by-name/se/sexp-cpp/package.nix
@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  tinycmmc,
+}:
+
+stdenv.mkDerivation {
+  pname = "sexp-cpp";
+  version = "0.1.0-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "lispparser";
+    repo = "sexp-cpp";
+    rev = "677b6f3ecd54e92339d33062084b081ebb9f14a6";
+    sha256 = "sha256-/wH9Cgo+4eyYRyUcYRNkYR38rLRv/mJq87dpE9wCPlw=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    gtest
+    tinycmmc
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_TESTS=ON"
+    "-DUSE_CXX17=ON"
+  ];
+
+  doCheck = true;
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
+    description = "S-Expression parser for C++";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix
index d4922c96a5b9..ea96bc0f7ec1 100644
--- a/pkgs/by-name/sg/sgt-puzzles/package.nix
+++ b/pkgs/by-name/sg/sgt-puzzles/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sgt-puzzles";
-  version = "20251011.d928126";
+  version = "20251021.790f585";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/Iazd5voyNRocz68qILv5NoytZehKFX40a2vr+7YKqE=";
+    hash = "sha256-4EZgFswP0oqjS0OZbkyTHCs7dKm2PgUKpsJWssQAvQ4=";
   };
 
   sgt-puzzles-menu = fetchurl {
@@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       raskin
       tomfitzhenry
+      iedame
     ];
     platforms = lib.platforms.linux;
     homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/";
diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
index bbb193b325eb..136bb5bc3474 100644
--- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/microsoft/azure-dcap-client";
     maintainers = with lib.maintainers; [
       phlip9
-      trundle
       veehaitch
     ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/sg/sgx-ssl/package.nix b/pkgs/by-name/sg/sgx-ssl/package.nix
index 18bf86f99435..cac1c5e28a75 100644
--- a/pkgs/by-name/sg/sgx-ssl/package.nix
+++ b/pkgs/by-name/sg/sgx-ssl/package.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/intel/intel-sgx-ssl";
     maintainers = with lib.maintainers; [
       phlip9
-      trundle
       veehaitch
     ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/sh/sha1collisiondetection/package.nix b/pkgs/by-name/sh/sha1collisiondetection/package.nix
index 4f65e3034f16..eed1b14d274b 100644
--- a/pkgs/by-name/sh/sha1collisiondetection/package.nix
+++ b/pkgs/by-name/sh/sha1collisiondetection/package.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars ];
     license = licenses.mit;
+    mainProgram = "sha1dcsum";
   };
 }
diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 699824fb99cc..368c9ae48397 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.19";
+  version = "2025.21.1";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WG+yW76iFrrYFldCp85LcbwQ8cz61NkAvdlvIfaPgac=";
+    hash = "sha256-Z6nTgVQaXFKmFeTZTltrlv46IdptwaOssh0PQIBUv+U=";
     fetchSubmodules = true;
   };
 
@@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CONFIGURATION_TYPES" "RelWithDebInfo")
     # Handled by separateDebugInfo so we don't need special installation handling
     (lib.cmakeBool "SLANG_ENABLE_SPLIT_DEBUG_INFO" false)
+    (lib.cmakeFeature "SLANG_VERSION_NUMERIC" finalAttrs.version)
     (lib.cmakeFeature "SLANG_VERSION_FULL" "v${finalAttrs.version}-nixpkgs")
     (lib.cmakeBool "SLANG_USE_SYSTEM_MINIZ" true)
     (lib.cmakeBool "SLANG_USE_SYSTEM_LZ4" true)
diff --git a/pkgs/by-name/sh/shadered/install_path_fix.patch b/pkgs/by-name/sh/shadered/install_path_fix.patch
deleted file mode 100644
index 6b39ca696b90..000000000000
--- a/pkgs/by-name/sh/shadered/install_path_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55eb05c..18f7fc3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -234,7 +234,7 @@ endif()
- 
- set(BINARY_INST_DESTINATION "bin")
- set(RESOURCE_INST_DESTINATION "share/shadered")
--install(PROGRAMS bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered)
-+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered)
- install(DIRECTORY bin/data bin/templates bin/themes bin/plugins DESTINATION "${RESOURCE_INST_DESTINATION}")
- 
- if (UNIX AND NOT APPLE)
diff --git a/pkgs/by-name/sh/shadered/package.nix b/pkgs/by-name/sh/shadered/package.nix
deleted file mode 100644
index 032b363ddf7e..000000000000
--- a/pkgs/by-name/sh/shadered/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  sfml,
-  glm,
-  python3,
-  glew,
-  pkg-config,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "SHADERed";
-  version = "1.5.6";
-
-  src = fetchFromGitHub {
-    owner = "dfranx";
-    repo = "SHADERed";
-    tag = "v${version}";
-    fetchSubmodules = true;
-    sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    SDL2
-    glew
-    glm
-    python3
-    sfml
-  ];
-
-  patches = [
-    ./install_path_fix.patch
-  ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
-
-  meta = with lib; {
-    description = "Lightweight, cross-platform & full-featured shader IDE";
-    homepage = "https://github.com/dfranx/SHADERed";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ Scriptkiddi ];
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 719bfb4fb1ff..72681d81eae0 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   # `AC_FUNC_SETPGRP' is not cross-compilation capable.
   preConfigure = ''
-    export ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}
+    export ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}
     export shadow_cv_logdir=/var/log
   '';
 
diff --git a/pkgs/by-name/sh/shaq/package.nix b/pkgs/by-name/sh/shaq/package.nix
index ff7abe883a6b..bb6eba78b650 100644
--- a/pkgs/by-name/sh/shaq/package.nix
+++ b/pkgs/by-name/sh/shaq/package.nix
@@ -60,7 +60,6 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/woodruffw/shaq/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       mig4ng
     ];
     mainProgram = "shaq";
diff --git a/pkgs/by-name/sh/shark/package.nix b/pkgs/by-name/sh/shark/package.nix
index f5541bf01a8f..354cfb85b646 100644
--- a/pkgs/by-name/sh/shark/package.nix
+++ b/pkgs/by-name/sh/shark/package.nix
@@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: {
   # Remove explicitly setting C++11, because boost::math headers need C++14 since Boost187.
   postPatch = ''
     sed -i '/CXX_STANDARD/d' src/CMakeLists.txt
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required( VERSION 3.1 FATAL_ERROR)' 'cmake_minimum_required(VERSION 3.10)'
   '';
 
   # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/blob/develop/SuperBuild/CMake/External_shark.cmake?ref_type=heads
diff --git a/pkgs/by-name/sh/sharpsat-td/package.nix b/pkgs/by-name/sh/sharpsat-td/package.nix
index dfbc0053ce5f..6004c73a541a 100644
--- a/pkgs/by-name/sh/sharpsat-td/package.nix
+++ b/pkgs/by-name/sh/sharpsat-td/package.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation {
     # replace bundled version of mpreal/mpfrc++
     rm -r src/mpfr
     cp -r ${mpreal} src/mpfr
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
similarity index 69%
rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
index 76260aee3636..bd67d4f5150f 100644
--- a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
+++ b/pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
@@ -1,60 +1,97 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": {
-  "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": {
-   "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=",
-   "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4="
+ "https://central.sonatype.com/repository/maven-snapshots/com/badlogicgames": {
+  "gdx#gdx-backend-lwjgl3/1.13.6-20251003.170113-33/SNAPSHOT": {
+   "jar": "sha256-T2/VHXjfySwA+IjO2Bm0h29WvyoJsKyLmx2lkkBVJRw=",
+   "module": "sha256-JNBWxVhzTj4LFBGT/kZc36chXJ2uqwaUtcMUGQFLn2I=",
+   "pom": "sha256-P7DA/UDAWmA+/t4H3EJkktKK/e9+pX0gH4fpljqZXWQ="
   },
-  "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": {
-   "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=",
-   "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4="
+  "gdx#gdx-freetype-platform/1.13.6-20251003.170113-34/SNAPSHOT": {
+   "pom": "sha256-kTnggHqjEcoBlUTM+K15WHCqKodiKvGPrgnTHuTKU4o="
   },
-  "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": {
+  "gdx#gdx-freetype-platform/1.13.6-20251003.170113-34/SNAPSHOT/natives-desktop": {
+   "jar": "sha256-oHueMYiUcjnj/Ub6rxlyvLcqXRCVNlqGlV27aYHBqAs="
+  },
+  "gdx#gdx-freetype/1.13.6-20251003.170113-34/SNAPSHOT": {
+   "jar": "sha256-S6xHm1D4e5bWdtozqD1fwHe86HZAfnZ6KhzlIxXFf7s=",
+   "module": "sha256-gqUIFknNKRsg9HMnX0Gis0IEvIpJW8kphcjtwCAoLo4=",
+   "pom": "sha256-wi92v9kAtTv++AZjKT3wJYBeISF98NLNy26X9kEVFSk="
+  },
+  "gdx#gdx-platform/1.13.6-20251003.170113-33/SNAPSHOT": {
+   "pom": "sha256-UW0w1+UTHDD4HaYruY6QVmd/ur/0vHS4wYDZ5hDCEuQ="
+  },
+  "gdx#gdx-platform/1.13.6-20251003.170113-33/SNAPSHOT/natives-desktop": {
+   "jar": "sha256-yBteE7BAK+MEG1e43PjmQZy03S6LIcvJt4W41bGp34s="
+  },
+  "gdx#gdx/1.13.6-20251003.170113-33/SNAPSHOT": {
+   "jar": "sha256-GUbkm354hjSxjlPFsfQmTQi5FDcGEQUEry+avKWhsxI=",
+   "module": "sha256-t9BpvisJ2P37hHmwRUGxAKbCwhH6faZXL9AZ9V4T8Hw=",
+   "pom": "sha256-aDtJJZT/VHJyxd5RKFrQbc32IFT2wk9R7LeDvhBt8v4="
+  },
+  "gdx/gdx-backend-lwjgl3/1.13.6-SNAPSHOT/maven-metadata": {
    "xml": {
-    "groupId": "com.badlogicgames.gdx-controllers",
-    "lastUpdated": "20231021200112"
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191628"
    }
   },
-  "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": {
+  "gdx/gdx-freetype-platform/1.13.6-SNAPSHOT/maven-metadata": {
    "xml": {
-    "groupId": "com.badlogicgames.gdx-controllers",
-    "lastUpdated": "20231021200114"
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191640"
+   }
+  },
+  "gdx/gdx-freetype/1.13.6-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191639"
+   }
+  },
+  "gdx/gdx-platform/1.13.6-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251010022949"
+   }
+  },
+  "gdx/gdx/1.13.6-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191624"
    }
   }
  },
+ "https://plugins.gradle.org/m2/org": {
+  "beryx#badass-runtime-plugin/1.13.1": {
+   "jar": "sha256-IW3RL1SacHD31B2wTupXAaF5Z0mzVerAzkMVLs0DGBc=",
+   "module": "sha256-Jf4I7QwECTJuc38vDJ/7BhyFQihl53ATdMOVyjpy9PA=",
+   "pom": "sha256-qZgenE/Me3hqUL+/IW93EBgs27ECjqsGiavMYeS37XI="
+  },
+  "beryx/runtime#org.beryx.runtime.gradle.plugin/1.13.1": {
+   "pom": "sha256-7SsiPX22wuiujLyvq8E96b0kKfwfNMtEFVh0jJCBu+U="
+  },
+  "slf4j#slf4j-api/1.7.32": {
+   "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=",
+   "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U="
+  },
+  "slf4j#slf4j-parent/1.7.32": {
+   "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA="
+  }
+ },
  "https://repo.maven.apache.org/maven2": {
-  "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": {
-   "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=",
-   "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=",
-   "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo="
+  "com/badlogicgames/gdx#gdx-jnigen-loader/2.5.2": {
+   "jar": "sha256-34HyPP1nhcUtNeEI7qo5MPVZ1NJ3CmEC51ynv6b58no=",
+   "module": "sha256-jwtii5G9Ez24XxUuFZMprPf0tmeDvR32AcNZfcJRIiQ=",
+   "pom": "sha256-i0dgu2bbPz+ZuEBj7z6ZDWOhzZx81XSlatf07kvRdoc="
   },
-  "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": {
-   "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4="
+  "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.4": {
+   "jar": "sha256-BNpnYnsaNkbvjyFMkdKWdCp8BVl9vCFnqqsJy9zHdHA=",
+   "module": "sha256-dxOP5TsOdeRf4dOROsublicWFxCuVPJUR0sizmp6pIA=",
+   "pom": "sha256-k7HO3nAet8GNZfFei7eds5zzGk6u5pMceIl84NgOMlQ="
   },
-  "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": {
-   "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE="
-  },
-  "com/badlogicgames/gdx#gdx-freetype/1.12.1": {
-   "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=",
-   "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=",
-   "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8="
-  },
-  "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": {
-   "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=",
-   "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=",
-   "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng="
-  },
-  "com/badlogicgames/gdx#gdx-platform/1.12.1": {
-   "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc="
-  },
-  "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": {
-   "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0="
-  },
-  "com/badlogicgames/gdx#gdx/1.12.1": {
-   "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=",
-   "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=",
-   "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY="
+  "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.4": {
+   "jar": "sha256-jjkOWcYhHtI+Cm/UAYzvo3+LmGXe5pmVaZBTSWuAHWw=",
+   "module": "sha256-zhrDRlPnkWGq8Nycm+vdDb1zQW0pHSz8ljavonod9mU=",
+   "pom": "sha256-2pO01ZTa8EMd+Q7bPPEOHjpGnCgCDHZb5P+fYKD6bTY="
   },
   "com/badlogicgames/jamepad#jamepad/2.26.5.0": {
    "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=",
diff --git a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch b/pkgs/by-name/sh/shattered-pixel-dungeon/disable-beryx.patch
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/disable-beryx.patch
rename to pkgs/by-name/sh/shattered-pixel-dungeon/disable-beryx.patch
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/generic.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/generic.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/generic.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
similarity index 83%
rename from pkgs/games/shattered-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
index 4ebd508dac9e..c37d7606ae92 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
@@ -6,15 +6,17 @@
 
 callPackage ./generic.nix rec {
   pname = "shattered-pixel-dungeon";
-  version = "3.1.1";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "00-Evan";
     repo = "shattered-pixel-dungeon";
-    rev = "v${version}";
-    hash = "sha256-MUpQdH8RMzZtI6e2duSRWHK1gPJDhMRKsm5kIKDcFuk=";
+    tag = "v${version}";
+    hash = "sha256-ltCKM46nzZZVJqHzo3V0Igyd4q+uD95fuLMWCi18jbQ=";
   };
 
+  patches = [ ];
+
   depsPath = ./deps.json;
 
   passthru.tests = {
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
similarity index 85%
rename from pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
index c17d6d1507b9..936bfa00758d 100644
--- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
+++ b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
@@ -6,23 +6,24 @@
 
 callPackage ../generic.nix rec {
   pname = "tower-pixel-dungeon";
-  version = "0.5.4";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "FixAkaTheFix";
     repo = "Tower-Pixel-Dungeon";
     tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
-    hash = "sha256-6b7EC7rye7nSevMJhRwSKJU7zuzta6KUCgzizWPFk8I=";
+    hash = "sha256-8q1Wt+FXhw58+fK9WMiAcwNrwJfBa5oRBztFmfQz0Uk=";
   };
 
   sourceRoot = src.name + "/pixel-towers-master";
 
   desktopName = "Tower Pixel Dungeon";
 
+  patches = [ ];
+
   # Sprite sources (Paint.NET files) and other files interfere with the build process.
   postPatch = ''
     rm core/src/main/assets/{levelsplashes,sprites}/*.pdn
-    rm core/src/main/assets/environment/*.lnk
   '';
 
   meta = {
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
similarity index 86%
rename from pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
index 1448fe4b65f8..c4ba3f9b408d 100644
--- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
+++ b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
@@ -1,6 +1,45 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
+ "https://plugins.gradle.org/m2/org": {
+  "beryx#badass-runtime-plugin/1.12.7": {
+   "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=",
+   "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk="
+  },
+  "beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": {
+   "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M="
+  },
+  "ow2#ow2/1.5": {
+   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+  },
+  "ow2/asm#asm-analysis/9.1": {
+   "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=",
+   "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY="
+  },
+  "ow2/asm#asm-commons/9.1": {
+   "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=",
+   "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38="
+  },
+  "ow2/asm#asm-tree/9.1": {
+   "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=",
+   "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw="
+  },
+  "ow2/asm#asm-util/9.1": {
+   "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=",
+   "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88="
+  },
+  "ow2/asm#asm/9.1": {
+   "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=",
+   "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0="
+  },
+  "slf4j#slf4j-api/1.7.25": {
+   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
+   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
+  },
+  "slf4j#slf4j-parent/1.7.25": {
+   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
+  }
+ },
  "https://repo.maven.apache.org/maven2": {
   "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": {
    "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=",
diff --git a/pkgs/by-name/sh/shell2http/package.nix b/pkgs/by-name/sh/shell2http/package.nix
index 0a60684c2abb..da316d17d282 100644
--- a/pkgs/by-name/sh/shell2http/package.nix
+++ b/pkgs/by-name/sh/shell2http/package.nix
@@ -48,6 +48,6 @@ buildGoModule rec {
     homepage = "https://github.com/msoap/shell2http";
     changelog = "https://github.com/msoap/shell2http/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix
index 21d69093ec48..3367c42ec113 100644
--- a/pkgs/by-name/sh/sherpa/package.nix
+++ b/pkgs/by-name/sh/sherpa/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sherpa";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitLab {
     owner = "sherpa-team";
     repo = "sherpa";
     tag = "v${version}";
-    hash = "sha256-zrtu4LJIzNdUGmnQlvZytYgzESo8eYQIdfxBABgUbzs=";
+    hash = "sha256-VlC5MnbrXp2fdO2EtBjtw45Gx6PhF/hcLy0ajlKp10E=";
   };
 
   postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index b8940661b542..deedf68e8599 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shh";
-  version = "2025.9.22";
+  version = "2025.11.3";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Esb6IR49YtGWvLmGLtviAyMLjoWZLQka2igC6yKJ3A0=";
+    hash = "sha256-oXTrKUs6J3Us2m1hFbVa+G03q3oV3pqppQ+QfPXVrFA=";
   };
 
-  cargoHash = "sha256-CB0jhVDR40lZaYqNq43V/af1v3Ph+6Z9swSrrsNgA8k=";
+  cargoHash = "sha256-GGu/oy4bfsnJNbquDeu9bDJWY9HEWS3hwsOj3nhcUNQ=";
 
   patches = [
     ./fix_run_checks.patch
diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index c3fd3e73c0c8..37076cf1e197 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_13,
   stdenv,
   cmake,
   lsb-release,
@@ -30,25 +29,32 @@
   fixDarwinDylibNames,
   applyPatches,
   shipwright,
+  libopus,
+  opusfile,
+  libogg,
+  libvorbis,
+  bzip2,
+  libX11,
+  sdl_gamecontrollerdb,
 }:
 
 let
 
   # The following would normally get fetched at build time, or a specific version is required
 
-  gamecontrollerdb = fetchFromGitHub {
-    owner = "mdqinc";
-    repo = "SDL_GameControllerDB";
-    rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e";
-    hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0=";
+  dr_libs = fetchFromGitHub {
+    owner = "mackron";
+    repo = "dr_libs";
+    rev = "da35f9d6c7374a95353fd1df1d394d44ab66cf01";
+    hash = "sha256-ydFhQ8LTYDBnRTuETtfWwIHZpRciWfqGsZC6SuViEn0=";
   };
 
   imgui' = applyPatches {
     src = fetchFromGitHub {
       owner = "ocornut";
       repo = "imgui";
-      tag = "v1.91.6-docking";
-      hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A=";
+      tag = "v1.91.9b-docking";
+      hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
     };
     patches = [
       "${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
@@ -65,8 +71,8 @@ let
   prism = fetchFromGitHub {
     owner = "KiritoDv";
     repo = "prism-processor";
-    rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850";
-    hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM=";
+    rev = "bbcbc7e3f890a5806b579361e7aa0336acd547e7";
+    hash = "sha256-jRPwO1Vub0cH12YMlME6kd8zGzKmcfIrIJZYpQJeOks=";
   };
 
   stb_impl = writeTextFile {
@@ -111,12 +117,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
-  version = "9.0.5";
+  version = "9.1.1";
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-F5d4u3Nq/+yYiOgkH/bwWPhZDxgBpJ5ktee0Hc5UmEo=";
+    hash = "sha256-TEP2YNKUuAnvLg+aDOkMmYfPQIjUXWYOhprfqsr8EgQ=";
     fetchSubmodules = true;
     deepClone = true;
     postFetch = ''
@@ -161,25 +167,30 @@ stdenv.mkDerivation (finalAttrs: {
     nlohmann_json
     tinyxml-2
     spdlog
+    (lib.getDev libopus)
+    (lib.getDev opusfile)
+    libogg
+    libvorbis
+    bzip2
+    libX11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     zenity
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # Metal.hpp requires macOS 13.x min.
-    apple-sdk_13
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
     (lib.cmakeBool "NON_PORTABLE" true)
     (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DR_LIBS" "${dr_libs}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+    (lib.cmakeFeature "OPUS_INCLUDE_DIR" "${lib.getDev libopus}/include/opus")
+    (lib.cmakeFeature "OPUSFILE_INCLUDE_DIR" "${lib.getDev opusfile}/include/opus")
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
@@ -188,6 +199,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";
 
+  strictDeps = true;
+
   dontAddPrefix = true;
 
   # Linking fails without this
@@ -210,16 +223,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   postBuild = ''
     port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2)
-    cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt
-    mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom
+    cp ${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt gamecontrollerdb.txt
+    mv ../libultraship/src/fast/shaders ../soh/assets/custom
     pushd ../OTRExporter
-    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver
+    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.o2r --port-ver $port_ver
     popd
   '';
 
   preInstall = ''
     # Cmake likes it here for its install paths
-    cp ../OTRExporter/soh.otr soh/soh.otr
+    cp ../OTRExporter/soh.o2r soh/soh.o2r
   '';
 
   postInstall =
diff --git a/pkgs/by-name/sh/shira/package.nix b/pkgs/by-name/sh/shira/package.nix
new file mode 100644
index 000000000000..4fd7651f10de
--- /dev/null
+++ b/pkgs/by-name/sh/shira/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  ffmpeg,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "shira";
+  version = "1.7.1-unstable-2025-08-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KraXen72";
+    repo = "shira";
+    rev = "a7478efa434597324458441f328c1b2f84c04dbc";
+    hash = "sha256-k15GaOmS0rlQBQldnLo1SzIyCkNQux6P5b7ZG2BIa90=";
+  };
+
+  build-system = [
+    python3Packages.flit-core
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    mediafile
+    pillow
+    python-dateutil
+    requests-cache
+    yt-dlp
+    ytmusicapi
+  ];
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        ffmpeg
+      ]
+    }"
+  ];
+
+  meta = {
+    description = "Download music from YouTube, YouTube Music and Soundcloud";
+    homepage = "https://github.com/KraXen72/shira/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ thegu5 ];
+    mainProgram = "shiradl";
+  };
+}
diff --git a/pkgs/by-name/sh/shncpd/package.nix b/pkgs/by-name/sh/shncpd/package.nix
index 787371f12112..248421cc4454 100644
--- a/pkgs/by-name/sh/shncpd/package.nix
+++ b/pkgs/by-name/sh/shncpd/package.nix
@@ -15,8 +15,6 @@ stdenv.mkDerivation {
     sha256 = "1sj7a77isc2jmh7gw2naw9l9366kjx6jb909h7spj7daxdwvji8f";
   };
 
-  hardeningEnable = [ "pie" ];
-
   preConfigure = ''
     makeFlags=( "PREFIX=$out" )
   '';
diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index e90d2b63b645..71e9ce12297d 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "shogihome";
-  version = "1.25.0";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "sunfish-shogi";
     repo = "shogihome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qa8ykN514Moc/PpBhD/X+mzfclQPp3yiriwTJCtmMA8=";
+    hash = "sha256-CRPZmycYaKtqjjiISKVGLf2jUvM6Xk6cUryKZcFX3tc=";
   };
 
-  npmDepsHash = "sha256-rcrj3dG96oNbmp3cXw1qRJPi1SZdBcG9paAShSfb/0E=";
+  npmDepsHash = "sha256-8v6r3DAUzNeMQqLl99mp5rUytbUe7wFj3jkHb6lbwFI=";
 
   postPatch = ''
     substituteInPlace package.json \
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
index 526a983be650..bc1343d314c1 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
@@ -1,14 +1,14 @@
 {
   "name": "shopify",
-  "version": "3.84.2",
+  "version": "3.86.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shopify",
-      "version": "3.84.2",
+      "version": "3.86.1",
       "dependencies": {
-        "@shopify/cli": "3.84.2"
+        "@shopify/cli": "3.86.1"
       },
       "bin": {
         "shopify": "node_modules/@shopify/cli/bin/run.js"
@@ -179,9 +179,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
+      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
       "cpu": [
         "ppc64"
       ],
@@ -195,9 +195,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
+      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
       "cpu": [
         "arm"
       ],
@@ -211,9 +211,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
+      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
       "cpu": [
         "arm64"
       ],
@@ -227,9 +227,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "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==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
+      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
       "cpu": [
         "x64"
       ],
@@ -243,9 +243,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "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==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
+      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
       "cpu": [
         "arm64"
       ],
@@ -259,9 +259,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "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==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
+      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
       "cpu": [
         "x64"
       ],
@@ -275,9 +275,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
       "cpu": [
         "arm64"
       ],
@@ -291,9 +291,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
+      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
       "cpu": [
         "x64"
       ],
@@ -307,9 +307,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
+      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
       "cpu": [
         "arm"
       ],
@@ -323,9 +323,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
+      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
       "cpu": [
         "arm64"
       ],
@@ -339,9 +339,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
+      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
       "cpu": [
         "ia32"
       ],
@@ -355,9 +355,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
+      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
       "cpu": [
         "loong64"
       ],
@@ -371,9 +371,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
+      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
       "cpu": [
         "mips64el"
       ],
@@ -387,9 +387,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
+      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
       "cpu": [
         "ppc64"
       ],
@@ -403,9 +403,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "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==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
+      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
       "cpu": [
         "riscv64"
       ],
@@ -419,9 +419,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
+      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
       "cpu": [
         "s390x"
       ],
@@ -435,9 +435,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
+      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
       "cpu": [
         "x64"
       ],
@@ -451,9 +451,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
       "cpu": [
         "arm64"
       ],
@@ -467,9 +467,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
+      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
       "cpu": [
         "x64"
       ],
@@ -483,9 +483,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
       "cpu": [
         "arm64"
       ],
@@ -499,9 +499,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "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==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
+      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
       "cpu": [
         "x64"
       ],
@@ -514,10 +514,26 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
+      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "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==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
+      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
       "cpu": [
         "x64"
       ],
@@ -531,9 +547,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
+      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
       "cpu": [
         "arm64"
       ],
@@ -547,9 +563,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
+      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
       "cpu": [
         "ia32"
       ],
@@ -563,9 +579,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
+      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
       "cpu": [
         "x64"
       ],
@@ -579,9 +595,9 @@
       }
     },
     "node_modules/@shopify/cli": {
-      "version": "3.84.2",
-      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.84.2.tgz",
-      "integrity": "sha512-L6vqC7Y7u1QwMFIVm4QVbvGfemIyFPssMdXXbqLo7mvZVdohC7SYmUhgerI5TsE3EIScsSBBwrI6VXWUb8JyrQ==",
+      "version": "3.86.1",
+      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.86.1.tgz",
+      "integrity": "sha512-d49b7Tx7xkgih2bwbLC1BXhgiEs4HGVoOBn8bKihtKILqbZ/V/6VFQB82BV8s00JPWaWy8pEOvX+0sMg2UIFSw==",
       "license": "MIT",
       "os": [
         "darwin",
@@ -590,7 +606,7 @@
       ],
       "dependencies": {
         "@ast-grep/napi": "0.33.0",
-        "esbuild": "0.25.5",
+        "esbuild": "0.25.10",
         "global-agent": "3.0.0"
       },
       "bin": {
@@ -672,9 +688,9 @@
       "license": "MIT"
     },
     "node_modules/esbuild": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
+      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -684,31 +700,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@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"
+        "@esbuild/aix-ppc64": "0.25.10",
+        "@esbuild/android-arm": "0.25.10",
+        "@esbuild/android-arm64": "0.25.10",
+        "@esbuild/android-x64": "0.25.10",
+        "@esbuild/darwin-arm64": "0.25.10",
+        "@esbuild/darwin-x64": "0.25.10",
+        "@esbuild/freebsd-arm64": "0.25.10",
+        "@esbuild/freebsd-x64": "0.25.10",
+        "@esbuild/linux-arm": "0.25.10",
+        "@esbuild/linux-arm64": "0.25.10",
+        "@esbuild/linux-ia32": "0.25.10",
+        "@esbuild/linux-loong64": "0.25.10",
+        "@esbuild/linux-mips64el": "0.25.10",
+        "@esbuild/linux-ppc64": "0.25.10",
+        "@esbuild/linux-riscv64": "0.25.10",
+        "@esbuild/linux-s390x": "0.25.10",
+        "@esbuild/linux-x64": "0.25.10",
+        "@esbuild/netbsd-arm64": "0.25.10",
+        "@esbuild/netbsd-x64": "0.25.10",
+        "@esbuild/openbsd-arm64": "0.25.10",
+        "@esbuild/openbsd-x64": "0.25.10",
+        "@esbuild/openharmony-arm64": "0.25.10",
+        "@esbuild/sunos-x64": "0.25.10",
+        "@esbuild/win32-arm64": "0.25.10",
+        "@esbuild/win32-ia32": "0.25.10",
+        "@esbuild/win32-x64": "0.25.10"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -825,9 +842,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json
index d72e00f0f496..8093f53a20c1 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package.json
@@ -1,11 +1,11 @@
 {
   "name": "shopify",
-  "version": "3.84.2",
+  "version": "3.86.1",
   "private": true,
   "bin": {
     "shopify": "node_modules/@shopify/cli/bin/run.js"
   },
   "dependencies": {
-    "@shopify/cli": "3.84.2"
+    "@shopify/cli": "3.86.1"
   }
 }
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index 58c2dd43edcc..0e2385cf5264 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -5,7 +5,7 @@
   shopify-cli,
 }:
 let
-  version = "3.84.2";
+  version = "3.86.1";
 in
 buildNpmPackage {
   pname = "shopify";
@@ -13,7 +13,7 @@ buildNpmPackage {
 
   src = ./manifests;
 
-  npmDepsHash = "sha256-UW8kNTCDHJOhFuVwawXcZvmaFSDgdGWPJlK3Y/x4IMo=";
+  npmDepsHash = "sha256-GAE4zfSqk7oM2ecojPC4REFGRdRwvqCnA9L2L7LMIfQ=";
   dontNpmBuild = true;
 
   passthru = {
diff --git a/pkgs/by-name/sh/shopify-themekit/package.nix b/pkgs/by-name/sh/shopify-themekit/package.nix
index cbe076825c21..23dbdd89a1a3 100644
--- a/pkgs/by-name/sh/shopify-themekit/package.nix
+++ b/pkgs/by-name/sh/shopify-themekit/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "shopify-themekit";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "themekit";
     rev = "v${version}";
-    sha256 = "sha256-A/t6yQW2xRFZYuYRyNN/0v4zdivch3tiv65a7TdHm2c=";
+    sha256 = "sha256-m0TAgnYklj/WqZJIm9mHLE7SZgXP8YDQZndDgpiNqL0=";
   };
 
   vendorHash = "sha256-o928qjp7+/U1W03esYTwVEfQ4A3TmPnmgmh4oWpqJoo=";
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index 0adca68b9825..7a2d82e35e3f 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/neXromancers/shotgun";
     license = with licenses; [ mpl20 ];
     maintainers = with maintainers; [
-      figsoda
       lumi
     ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix
index 54484d5979e0..b865347be5ff 100644
--- a/pkgs/by-name/sh/shotwell/package.nix
+++ b/pkgs/by-name/sh/shotwell/package.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
     export GDK_PIXBUF_MODULE_FILE="${
       gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
         extraLoaders = [
-          libheif.out
+          libheif.lib
         ];
       }
     }"
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index a62d5b903fbe..f9dc473ef60a 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
@@ -41,7 +42,9 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "sic";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 }
diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 09e2b32ec66e..b35bd76e1cce 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.15.1";
+  version = "2.15.2";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IUyXkHs8QfWhuTVYrPbmMU/mhfGwGminypLmGYimcLg=";
+    hash = "sha256-XUf4lqWwNC0bYSb1AdX2zZ46+0Ki1001XAjFOh7EAJ0=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index f03e1139e6e0..636e00480ba6 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -12,12 +12,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "signal-cli";
-  version = "0.13.20";
+  version = "0.13.21";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-MFgR2c+XhzgxO6jv7e30rTf7bRVa5gxnzVOLnemXYY8=";
+    hash = "sha256-c5oRMzrQ3cZ6nl0Qlo6DrDT0D6lAyZbuI1G1P8C0558=";
   };
 
   buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [
diff --git a/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py b/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py
index 8acaebcb23d7..c873c0b0db4d 100644
--- a/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py
+++ b/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py
@@ -18,24 +18,6 @@ import sys
 from pathlib import Path
 
 
-def signal_name_to_emoji(signal_emoji_name: str) -> str:
-    r"""Return the emoji corresponding to a Signal emoji name.
-
-    Signal emoji names are concatenations of UTF‐16 code units,
-    represented in lowercase big‐endian hex padded to four digits.
-
-    >>> signal_name_to_emoji("d83dde36200dd83cdf2bfe0f")
-    '😶‍🌫️'
-    >>> b"\xd8\x3d\xde\x36\x20\x0d\xd8\x3c\xdf\x2b\xfe\x0f".decode("utf-16-be")
-    '😶‍🌫️'
-    """
-    hex_bytes = zip(signal_emoji_name[::2], signal_emoji_name[1::2])
-    emoji_utf_16_be = bytes(
-        int("".join(hex_pair), 16) for hex_pair in hex_bytes
-    )
-    return emoji_utf_16_be.decode("utf-16-be")
-
-
 def emoji_to_noto_name(emoji: str) -> str:
     r"""Return the Noto emoji name of an emoji.
 
@@ -68,16 +50,15 @@ def _main() -> None:
 
     for signal_emoji_names in jumbomoji_packs.values():
         for signal_emoji_name in signal_emoji_names:
-            emoji = signal_name_to_emoji(signal_emoji_name)
 
             try:
                 shutil.copy(
-                    noto_png_path / f"emoji_u{emoji_to_noto_name(emoji)}.png",
-                    out_path / emoji,
+                    noto_png_path / f"emoji_u{emoji_to_noto_name(signal_emoji_name)}.png",
+                    out_path / signal_emoji_name,
                 )
             except FileNotFoundError:
                 print(
-                    f"Missing Noto emoji: {emoji} {signal_emoji_name}",
+                    f"Missing Noto emoji: {signal_emoji_name}",
                     file=sys.stderr,
                 )
                 continue
diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix
index 4f5e80da95ac..98b6d389f467 100644
--- a/pkgs/by-name/si/signal-desktop-bin/generic.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix
@@ -92,12 +92,12 @@ let
   });
 
   noto-emoji-sheet-32 = fetchurl {
-    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_32.png";
-    hash = "sha256-S03NCTbvB5yeQl62WpLNjNGhjNErtgaOB6tAj/X8vPc=";
+    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v16.0.0/sheet_google_32.png";
+    hash = "sha256-tBfp9s1LvBBla7/V4TtumiVFtV5qTPcxLXW+H6qjSVI=";
   };
   noto-emoji-sheet-64 = fetchurl {
-    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_64.png";
-    hash = "sha256-kZYStR5xAuausSpOD6wJZRJZ1K6nPpweE3aYSgWntS4=";
+    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v16.0.0/sheet_google_64.png";
+    hash = "sha256-eVoMWY0WLJpKriPyGIxge4ybwZEst9hDgkWfjekaOuE=";
   };
 in
 stdenv.mkDerivation rec {
@@ -263,8 +263,7 @@ stdenv.mkDerivation rec {
 
     # Fix the desktop link
     substituteInPlace $out/share/applications/signal-desktop.desktop \
-      --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram} \
-      --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal"
+      --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram}
 
     mv $out/share/applications/signal{-desktop,}.desktop
 
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 0133dd2596e7..546c213d48b7 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.71.0";
+  version = "7.77.1";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09571107-signal-desktop/signal-desktop-7.71.0-1.fc42.aarch64.rpm";
-  hash = "sha256-sNGIkO2HAXl0ykFyZNNV75iVUQ+oRGv6NZW8tVUxfJA=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09751999-signal-desktop/signal-desktop-7.77.1-1.fc42.aarch64.rpm";
+  hash = "sha256-IkAJxq3JK3kKdtLy1lkVUfJNuEStMjn7iQEwsFurwOs=";
 }
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 7ae71cf68b65..495b872e41a6 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.71.0";
+  version = "7.77.1";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-G4wCIzKnWwBYSTuXhZ6681Z2+0Rn2bpvb3vhKMAXFc4=";
+    hash = "sha256-vnNR5KTdeTKUMlHnjfB+WkBtpcLP+KEmIPoTfk7Q1+w=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 197937c49e05..9a24b9586266 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.71.0";
+  version = "7.77.1";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-y7ONN6VBVFH8zyXJNM3+cY4JegSolXfhH3T85WiM2Dk=";
+  hash = "sha256-57sm6wmtp0eXWCv7LviCiBEi5/IysubiuBYSP7eVkkU=";
 }
diff --git a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
index 103ee8af45b6..ddbc406aa7cc 100644
--- a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
+++ b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
@@ -1,14 +1,14 @@
 diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py
-index c983fc3..2ab06dc 100755
---- a/node/build_node_bridge.py
-+++ b/node/build_node_bridge.py
-@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int:
-     cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin'
-     # Enable ARMv8 cryptography acceleration when available
+index a2da3c8b..cb5d475f 100755
+--- i/node/build_node_bridge.py
++++ w/node/build_node_bridge.py
+@@ -154,9 +154,6 @@ def main(args: Optional[List[str]] = None) -> int:
      cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8'
+     # Access tokio's unstable metrics
+     cargo_env['RUSTFLAGS'] += ' --cfg tokio_unstable'
 -    # Strip absolute paths
 -    for path in build_helpers.rust_paths_to_remap():
 -        cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}='
- 
+
      # If set (below), will post-process the build library using this instead of just `cp`-ing it.
      objcopy = None
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 326ea8906e86..599530664cb3 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.81.1";
+  version = "0.83.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uhxfVFsoB+c1R5MUOgpJFm8ZD3vgU8BIn35QSfbEp5w=";
+    hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q=";
   };
 
-  cargoHash = "sha256-Q3GSeaW3YveLxLeJPpPXUVwlJ0QLRkAmRGSJetxKl4Y=";
+  cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-6Mr3SJn4pO0p6PISXvEOhN9uPk1TIEU03ssclNUg2No=";
+    hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 27295d8335fb..2220f87cbd7f 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.73.0";
+  version = "7.77.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-5cwGV0WPOS7O/xnQZ38t/hiQppqFFtVQmGuniGsD6H8=";
+    hash = "sha256-IFMNUuGL3sQVlEJI4N2rXrYStcDEZW/YxmZyPM0hhVU=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -69,7 +69,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
       fetcherVersion = 1;
-      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
+      hash = "sha256-m/JxsKnVhcya7dUz1MBMQKwEdqoV3xQiGOoT4egh3K4=";
     };
 
     strictDeps = true;
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     # resource if the nixpkgs version is different. To fix this we hardcode
     # the electron version to the declared one here instead of interpolating
     # it at runtime.
-    substituteInPlace app/updateDefaultSession.ts \
+    substituteInPlace app/updateDefaultSession.main.ts \
       --replace-fail "\''${process.versions.electron}" "`jq -r '.devDependencies.electron' < package.json`"
   '';
 
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-9YvNs925xBUYEpF429rHfMXIGPapVYd8j1jZa/yBuhA="
+        "sha256-RquJqKUDdz8QRJXz7eWiAcdUF+WhYEqnyOkhrIw7tgQ="
       else
-        "sha256-lcr8EeL+wd6VihKcBgfXNRny8VskX8g7I7WTAkLuBss=";
+        "sha256-v1KbjFLo5pD1uoNtDrX2kUbhCgGeEqbuHLZRIJqshHw=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1759413120;
+    SOURCE_DATE_EPOCH = 1761859038;
   };
 
   preBuild = ''
@@ -218,12 +218,10 @@ stdenv.mkDerivation (finalAttrs: {
       install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png
     done
 
-    # TODO: Remove --ozone-platform=wayland after next electron update,
-    # see https://github.com/electron/electron/pull/48309
     makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \
       --add-flags "$out/share/signal-desktop/app.asar" \
       --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
index 5d235dc80041..71e6d448bfab 100644
--- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
+++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
@@ -1,8 +1,8 @@
 diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md
-index 2c963f1..96edd02 100644
+index 273a9e097..ffb5b6eb6 100644
 --- a/ACKNOWLEDGMENTS.md
 +++ b/ACKNOWLEDGMENTS.md
-@@ -1636,30 +1636,6 @@ Signal Desktop makes use of the following open source projects.
+@@ -3667,30 +3667,6 @@ Signal Desktop makes use of the following open source projects.
      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
      SOFTWARE.
  
@@ -33,11 +33,11 @@ index 2c963f1..96edd02 100644
  ## emoji-regex
  
      Copyright Mathias Bynens <https://mathiasbynens.be/>
-diff --git a/app/protocol_filter.ts b/app/protocol_filter.ts
-index 68dceea..4b35bb1 100644
---- a/app/protocol_filter.ts
-+++ b/app/protocol_filter.ts
-@@ -59,6 +59,7 @@ function _createFileHandler({
+diff --git a/app/protocol_filter.node.ts b/app/protocol_filter.node.ts
+index 483d1c4e4..66609d9e9 100644
+--- a/app/protocol_filter.node.ts
++++ b/app/protocol_filter.node.ts
+@@ -62,6 +62,7 @@ function _createFileHandler({
    const allowedRoots = [
      userDataPath,
      installPath,
@@ -46,59 +46,52 @@ index 68dceea..4b35bb1 100644
      getBadgesPath(userDataPath),
      getDraftPath(userDataPath),
 diff --git a/package.json b/package.json
-index 5755fec..86125ba 100644
+index 31399e645..05fc46b8b 100644
 --- a/package.json
 +++ b/package.json
-@@ -137,7 +137,6 @@
+@@ -156,7 +156,6 @@
      "dashdash": "2.0.0",
      "direction": "1.0.4",
-     "emoji-datasource": "15.1.2",
--    "emoji-datasource-apple": "15.1.2",
+     "emoji-datasource": "16.0.0",
+-    "emoji-datasource-apple": "16.0.0",
      "emoji-regex": "10.4.0",
      "encoding": "0.1.13",
      "fabric": "4.6.0",
-@@ -649,4 +648,4 @@
-       "sticker-creator/dist/**"
-     ]
-   }
--}
-+}
-\ No newline at end of file
 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index f04b2b1..070fa0f 100644
+index 223557f67..2250b619d 100644
 --- a/pnpm-lock.yaml
 +++ b/pnpm-lock.yaml
-@@ -184,9 +184,6 @@ importers:
+@@ -200,9 +200,6 @@ importers:
        emoji-datasource:
-         specifier: 15.1.2
-         version: 15.1.2
+         specifier: 16.0.0
+         version: 16.0.0
 -      emoji-datasource-apple:
--        specifier: 15.1.2
--        version: 15.1.2
+-        specifier: 16.0.0
+-        version: 16.0.0
        emoji-regex:
          specifier: 10.4.0
          version: 10.4.0
-@@ -4817,9 +4814,6 @@ packages:
+@@ -5835,9 +5832,6 @@ packages:
      resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
      engines: {node: '>=12'}
  
--  emoji-datasource-apple@15.1.2:
--    resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==}
+-  emoji-datasource-apple@16.0.0:
+-    resolution: {integrity: sha512-dVYjsK0FnCry9F+PBtnivhG2K0xdwlmqYaSgiUtztUdAGPYiHYhZcVKvNBqC791g2qyEcFNTBO6utg4eQ3uLTw==}
 -
-   emoji-datasource@15.1.2:
-     resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==}
+   emoji-datasource@16.0.0:
+     resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
  
-@@ -14990,8 +14984,6 @@ snapshots:
+@@ -17062,8 +17056,6 @@ snapshots:
  
    emittery@0.13.1: {}
  
--  emoji-datasource-apple@15.1.2: {}
+-  emoji-datasource-apple@16.0.0: {}
 -
-   emoji-datasource@15.1.2: {}
+   emoji-datasource@16.0.0: {}
  
    emoji-regex@10.4.0: {}
 diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
-index 78c7563..83d196c 100644
+index 1cc4bb43c..a6444101a 100644
 --- a/stylesheets/components/fun/FunEmoji.scss
 +++ b/stylesheets/components/fun/FunEmoji.scss
 @@ -5,19 +5,9 @@
@@ -124,15 +117,21 @@ index 78c7563..83d196c 100644
    background-repeat: no-repeat;
  }
  
-diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx
-index 08785e8..d25b868 100644
---- a/ts/components/fun/FunEmoji.tsx
-+++ b/ts/components/fun/FunEmoji.tsx
-@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji';
- export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji';
- 
- function getEmojiJumboUrl(emoji: EmojiVariantData): string {
--  return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;
+diff --git a/ts/components/fun/FunEmoji.dom.tsx b/ts/components/fun/FunEmoji.dom.tsx
+index ea031e9a8..3d760a43e 100644
+--- a/ts/components/fun/FunEmoji.dom.tsx
++++ b/ts/components/fun/FunEmoji.dom.tsx
+@@ -20,13 +20,14 @@ function getEmojiJumboBackground(
+   emoji: EmojiVariantData,
+   size: number | undefined
+ ): string | null {
+-  if (size != null && size < MIN_JUMBOMOJI_SIZE) {
+-    return null;
+-  }
+-  if (KNOWN_JUMBOMOJI.has(emoji.value)) {
+-    return `url(emoji://jumbo?emoji=${encodeURIComponent(emoji.value)})`;
+-  }
+-  return null;
 +  const emojiToNotoName = (emoji: string): string =>
 +    `emoji_u${
 +      [...emoji]
@@ -140,7 +139,7 @@ index 08785e8..d25b868 100644
 +        .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0"))
 +        .join("_")
 +    }.png`;
-+  return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`;
++  return `url(file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)})`;
  }
  
  export type FunStaticEmojiSize =
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index b1cf5cbe4644..f6837ba9747e 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,21 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.58.1";
+  version = "2.59.2";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HI+HVDv+nuJp2BPIAVY+PI6Pof1pnB8L6CIAgBT+tJA=";
+    hash = "sha256-PpfGjeBSYus4yo6eC1PjRaGRhOOKAg2EgDw3AMEwR1I=";
   };
 
-  cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q=";
+  cargoHash = "sha256-ex0/RA5wwSId6Pgi9y62KG42vBs3DxWcGso6Qk9iRlU=";
+
+  preConfigure = ''
+    # Check for matching webrtc version
+    grep 'webrtc.version=${webrtc.version}' config/version.properties
+  '';
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index d9b28f488ad7..80abcfd66ea1 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,33 +1,25 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-Qj0UFRWfZrBG9WUX4zkyiatIekNSYXsneP5aLvufNh4=",
+            "hash": "sha256-mNj4Sw7EROc2Cn4nPSm789h1je7EOjNAg2s6fQ19Dcc=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7204c"
+            "tag": "7339c"
         },
         "fetcher": "fetchFromGitHub"
     },
-    "src/base": {
-        "args": {
-            "hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=",
-            "rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390",
-            "url": "https://chromium.googlesource.com/chromium/src/base"
-        },
-        "fetcher": "fetchFromGitiles"
-    },
     "src/build": {
         "args": {
-            "hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=",
-            "rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb",
+            "hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=",
+            "rev": "66d076c7ab192991f67891b062b35404f3cb0739",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=",
-            "rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654",
+            "hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=",
+            "rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
@@ -43,40 +35,40 @@
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=",
-            "rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647",
+            "hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=",
+            "rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=",
-            "rev": "8a150db896356cd9b47f8c1a6d916347393f90f2",
+            "hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=",
+            "rev": "e30091e8987ee0bb0cd30bc467250a96a7614762",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=",
-            "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
+            "hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=",
+            "rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=",
-            "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
+            "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=",
+            "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=",
-            "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
+            "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=",
+            "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -107,8 +99,8 @@
     },
     "src/third_party/compiler-rt/src": {
         "args": {
-            "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=",
-            "rev": "57196dd146582915c955f6d388e31aea93220c51",
+            "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=",
+            "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -123,24 +115,24 @@
     },
     "src/third_party/dav1d/libdav1d": {
         "args": {
-            "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
-            "rev": "8d956180934f16244bdb58b39175824775125e55",
+            "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=",
+            "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
             "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=",
-            "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+            "hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=",
+            "rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=",
-            "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
+            "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=",
+            "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -155,24 +147,24 @@
     },
     "src/third_party/fontconfig/src": {
         "args": {
-            "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=",
-            "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
+            "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=",
+            "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
             "url": "https://chromium.googlesource.com/external/fontconfig.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=",
-            "rev": "e07e56c7f106b600262ab653d696b7b57f320127",
+            "hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=",
+            "rev": "08805be530d6820d2bf8a1b7685826de40f06812",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=",
-            "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
+            "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=",
+            "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -187,24 +179,24 @@
     },
     "src/third_party/googletest/src": {
         "args": {
-            "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=",
-            "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
+            "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=",
+            "rev": "373af2e3df71599b87a40ce0e37164523849166b",
             "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=",
-            "rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28",
+            "hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=",
+            "rev": "806e186735cc3bf4375f43d2d6a9483c607e4278",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/gtest-parallel": {
         "args": {
-            "hash": "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw=",
-            "rev": "96f4f904922f9bf66689e749c40f314845baaac8",
+            "hash": "sha256-uVq+oDrue4sf1JPoeymIIDe79Fv7rcJAVOjxUF42Xo0=",
+            "rev": "cd488bdedc1d2cffb98201a17afc1b298b0b90f1",
             "url": "https://chromium.googlesource.com/external/github.com/google/gtest-parallel"
         },
         "fetcher": "fetchFromGitiles"
@@ -219,8 +211,8 @@
     },
     "src/third_party/icu": {
         "args": {
-            "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=",
-            "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
+            "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=",
+            "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
             "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -243,32 +235,32 @@
     },
     "src/third_party/libFuzzer/src": {
         "args": {
-            "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
-            "rev": "e31b99917861f891308269c36a32363b120126bb",
+            "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=",
+            "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=",
-            "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
+            "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=",
+            "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++/src": {
         "args": {
-            "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=",
-            "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
+            "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=",
+            "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++abi/src": {
         "args": {
-            "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=",
-            "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
+            "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=",
+            "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -291,32 +283,32 @@
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=",
-            "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
+            "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=",
+            "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=",
-            "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
+            "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=",
+            "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=",
-            "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
+            "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=",
+            "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=",
-            "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
+            "hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=",
+            "rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -331,8 +323,8 @@
     },
     "src/third_party/nasm": {
         "args": {
-            "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=",
-            "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
+            "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=",
+            "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
             "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -347,8 +339,8 @@
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=",
-            "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
+            "hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=",
+            "rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed",
             "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -363,16 +355,16 @@
     },
     "src/third_party/re2/src": {
         "args": {
-            "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
-            "rev": "c84a140c93352cdabbfb547c531be34515b12228",
+            "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=",
+            "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
             "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/tools": {
         "args": {
-            "hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=",
-            "rev": "901b847deda65d44f1bba16a9f47e2ea68a805be",
+            "hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=",
+            "rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index 2e586d52cbf7..b0f3968145b0 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -34,7 +34,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-webrtc";
-  version = finalAttrs.gclientDeps."src".path.rev;
+  version = finalAttrs.gclientDeps."src".path.tag;
 
   gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json;
   sourceRoot = "src";
@@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     "is_clang=false"
     "treat_warnings_as_errors=false"
     "use_llvm_libatomic=false"
+    "use_custom_libcxx=false"
 
     # https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop
     "rtc_build_examples=false"
diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index fbee5740f382..5a24c0f73b9a 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20251015";
+  version = "20251102";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-/rqYM0KLBcvYt2lpkOZKipb/lpVtkUevGFNWVenPbOk=";
+    hash = "sha256-UlBFXn9l4eKLWCEIhLtQmYRuMK179e9PDfANDUMfVcs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix
new file mode 100644
index 000000000000..acf609234b0b
--- /dev/null
+++ b/pkgs/by-name/si/sigsum/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitLab,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sigsum";
+  version = "0.12.0";
+
+  src = fetchFromGitLab {
+    domain = "git.glasklar.is";
+    group = "sigsum";
+    owner = "core";
+    repo = "sigsum-go";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SFEKbPOAU2cpsc9oLiX3Lhv/AvYNPNiLjjjGteHOtpg=";
+  };
+
+  postPatch = ''
+    substituteInPlace internal/version/version.go \
+      --replace-fail "info.Main.Version" '"${finalAttrs.version}"'
+  '';
+
+  vendorHash = "sha256-2v9NShhmHr0O5FH49tDSPUK1lT2tmhJkrZaVTwrL3cY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  excludedPackages = [ "./test" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/sigsum-key";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "System for public and transparent logging of signed checksums";
+    homepage = "https://www.sigsum.org/";
+    downloadPage = "https://git.glasklar.is/sigsum/core/sigsum-go";
+    changelog = "https://git.glasklar.is/sigsum/core/sigsum-go/-/blob/v${finalAttrs.version}/NEWS";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ defelo ];
+  };
+})
diff --git a/pkgs/by-name/si/sillytavern/package.nix b/pkgs/by-name/si/sillytavern/package.nix
index 90a0168c361f..570e3d45fd8e 100644
--- a/pkgs/by-name/si/sillytavern/package.nix
+++ b/pkgs/by-name/si/sillytavern/package.nix
@@ -5,15 +5,15 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "sillytavern";
-  version = "1.13.4";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "SillyTavern";
     repo = "SillyTavern";
     tag = finalAttrs.version;
-    hash = "sha256-C1VWyowuk4w1F5u88Xcp9m3UgNmcDKEn/NSojuLGAd8=";
+    hash = "sha256-kYTma8+GIXCwFrKB0EnU4nLMPi+HOayBioz1z+xNa+0=";
   };
-  npmDepsHash = "sha256-lVG00oUzrMxIVoKqTRtkMYUmS45YEOkcepXJl4vth2w=";
+  npmDepsHash = "sha256-BBB+mKuG9cm9Rpa7kPneqK0gSA09hEvszWoWML78eSQ=";
 
   dontNpmBuild = true;
 
diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index d4ee91794e25..de01315c7b0b 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdjson";
-  version = "4.0.7";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8pmFtMpML7tTXbH1E3aIpSTQkNF8TFcIPOm2nwnKxkA=";
+    hash = "sha256-N3NPE9R8VipspCwH2dY339WUGt51aqkYpLTr/PPVRQ4=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/si/simdutf/package.nix b/pkgs/by-name/si/simdutf/package.nix
index f83736d4bca0..41c7062327f2 100644
--- a/pkgs/by-name/si/simdutf/package.nix
+++ b/pkgs/by-name/si/simdutf/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdutf";
-  version = "7.4.0";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "simdutf";
     repo = "simdutf";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eVlPY3aDIHnWPzbv9TASujxIW0xlvLvihQCpLUWwLEs=";
+    hash = "sha256-qeUZ0LTTdQJrL/3HPssG4Zor+GqG1++PpF+CuGKUPmw=";
   };
 
   # Fix build on darwin
diff --git a/pkgs/by-name/si/simple-binary-encoding/deps.json b/pkgs/by-name/si/simple-binary-encoding/deps.json
new file mode 100644
index 000000000000..490af168c51d
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/deps.json
@@ -0,0 +1,584 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/fasterxml#oss-parent/55": {
+   "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0="
+  },
+  "com/fasterxml#oss-parent/61": {
+   "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ="
+  },
+  "com/fasterxml#oss-parent/68": {
+   "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc="
+  },
+  "com/fasterxml/jackson#jackson-bom/2.19.1": {
+   "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4="
+  },
+  "com/fasterxml/jackson#jackson-parent/2.19.2": {
+   "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U="
+  },
+  "com/fasterxml/woodstox#woodstox-core/7.1.0": {
+   "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=",
+   "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU="
+  },
+  "com/github/ben-manes#gradle-versions-plugin/0.53.0": {
+   "jar": "sha256-fystvdI5f/PwQ9e2YuwNYbqr7TqqerImB6702Y7z+mI=",
+   "module": "sha256-KLvVxzKZ1dGYcjzX8klS4b9RQJXE6OrpsisVQaicEII=",
+   "pom": "sha256-aPVU+CLT1aKhQrA6XZ9Wa5FXdPtjnYwds7zfmTyeQI0="
+  },
+  "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.53.0": {
+   "pom": "sha256-yWBPdJaskfaW5HRY2KLWt91U0MqkNn88GspmphyDcvQ="
+  },
+  "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.2.2": {
+   "pom": "sha256-ZLCuyyPFfukfzPJXx4F8uyxpXQT565nM+9pth/TFlOk="
+  },
+  "com/gradleup/shadow#shadow-gradle-plugin/9.2.2": {
+   "jar": "sha256-rqYDnab2KTcMEKFxcOjz2o1nPhS++FgL0aZc3kSQc9A=",
+   "module": "sha256-4tXqtRULxjBI6WcI6t6/0XbmOfIsgFFoBVszcQdo3YI=",
+   "pom": "sha256-bO3IWZV0n5H/XNb8Z3H6PfZ4qlZSIl5uoFjNnXmVjGo="
+  },
+  "com/squareup/moshi#moshi-kotlin/1.12.0": {
+   "jar": "sha256-HENsB8FZzRrwMrt5NRpIqY5/eBrIB8/4tXEamZtWZt8=",
+   "module": "sha256-KnvKZtbM8WhVy1oKp8lRWPaIklomPv5MIEsjclSGH6E=",
+   "pom": "sha256-gwdSmAK8nLCHd24CabvdaSBG+kpz8ZDVgUpaj5JmJ24="
+  },
+  "com/squareup/moshi#moshi/1.12.0": {
+   "jar": "sha256-7pCR4dGlkm+ptN8mQsH7e7lq7Ahjm2IZwZ4LhyTUJHU=",
+   "module": "sha256-uGqTFURxITGVpEL4XKBG55oAHG1EbEHU0WiTbahW6+I=",
+   "pom": "sha256-YbyUJDqTc9mUini25xAAl161EPtvf0aoHq/N3TgeR3k="
+  },
+  "com/squareup/okhttp3#okhttp/4.12.0": {
+   "jar": "sha256-sQUAgbFLt6On5VpNPvAbXc+rxFO0VzpPwBl2cZHV9OA=",
+   "module": "sha256-YH4iD/ghW5Kdgpu/VPMyiU8UWbTXlZea6vy8wc6lTPM=",
+   "pom": "sha256-fHNwQKlBlSLnxQzAJ0FqcP58dinlKyGZNa3mtBGcfTg="
+  },
+  "com/squareup/okio#okio-jvm/3.6.0": {
+   "jar": "sha256-Z1Q/Bzb8QirpJ+0OUEuYvF4mn9oNNQBXkzfLcT2ihBI=",
+   "module": "sha256-scIZnhwMyWnvYcu+SvLsr5sGQRvd4By69vyRNN/gToo=",
+   "pom": "sha256-YbTXxRWgiU/62SX9cFJiDBQlqGQz/TURO1+rDeiQpX8="
+  },
+  "com/squareup/okio#okio/3.6.0": {
+   "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=",
+   "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU="
+  },
+  "commons-io#commons-io/2.20.0": {
+   "jar": "sha256-35C7oP48tYa38WTnj+j49No/LdXCf6ZF+IgQDMwl3XI=",
+   "pom": "sha256-vb34EHLBkO6aixgaXFj1vZF6dQ+xOiVt679T9dvTOio="
+  },
+  "jakarta/platform#jakarta.jakartaee-bom/9.1.0": {
+   "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ="
+  },
+  "jakarta/platform#jakartaee-api-parent/9.1.0": {
+   "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
+  },
+  "org/apache#apache/35": {
+   "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg="
+  },
+  "org/apache/ant#ant-launcher/1.10.15": {
+   "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=",
+   "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU="
+  },
+  "org/apache/ant#ant-parent/1.10.15": {
+   "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA="
+  },
+  "org/apache/ant#ant/1.10.15": {
+   "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=",
+   "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY="
+  },
+  "org/apache/commons#commons-parent/85": {
+   "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U="
+  },
+  "org/apache/groovy#groovy-bom/4.0.27": {
+   "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=",
+   "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs="
+  },
+  "org/apache/logging/log4j#log4j-api/2.25.2": {
+   "jar": "sha256-n9Zsn+C+oG+pZmwUeYmkbK+qkrSoh1NpfTlFzEMzjLs=",
+   "module": "sha256-WPeF66u6zDA/Ow5aSF91X9qzKQ9p5JsDT4lj0ngjZV4=",
+   "pom": "sha256-CVYJaiUCQIyVioMXTytqV9yy5bB7uRTISHMrRLirvcM="
+  },
+  "org/apache/logging/log4j#log4j-bom/2.25.2": {
+   "pom": "sha256-Tym32cLZcP0qZpcXa/fd3EFQifYNaW0ov98xsk6S8Rw="
+  },
+  "org/apache/logging/log4j#log4j-core/2.25.2": {
+   "jar": "sha256-5Q23cBQw/5B5gYUO9SekHVGlPdABf1Oghgr8urhXAnc=",
+   "module": "sha256-JRQSc3eFDwR83jJbc7efriEzKSK+tkmiUzr9CEIlihE=",
+   "pom": "sha256-L/9GPTmclAgtmCLCG/v0cOEFHbt9S0XyWw54G8Xg9BI="
+  },
+  "org/apache/logging/log4j#log4j/2.25.2": {
+   "pom": "sha256-HYBXBY0LBcj3clyhrbpoc5y+rHWJjsoGpIymEVRsA+w="
+  },
+  "org/apache/maven#maven-api-annotations/4.0.0-rc-3": {
+   "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=",
+   "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I="
+  },
+  "org/apache/maven#maven-api-xml/4.0.0-rc-3": {
+   "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=",
+   "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE="
+  },
+  "org/apache/maven#maven-xml/4.0.0-rc-3": {
+   "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=",
+   "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI="
+  },
+  "org/codehaus/plexus#plexus-utils/4.0.2": {
+   "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=",
+   "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8="
+  },
+  "org/codehaus/plexus#plexus-xml/4.1.0": {
+   "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=",
+   "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4="
+  },
+  "org/codehaus/plexus#plexus/20": {
+   "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q="
+  },
+  "org/codehaus/woodstox#stax2-api/4.2.2": {
+   "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=",
+   "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI="
+  },
+  "org/eclipse/ee4j#project/1.0.7": {
+   "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU="
+  },
+  "org/jdom#jdom2/2.0.6.1": {
+   "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=",
+   "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M="
+  },
+  "org/jetbrains#annotations/13.0": {
+   "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=",
+   "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c="
+  },
+  "org/jetbrains/kotlin#kotlin-bom/2.0.21": {
+   "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g="
+  },
+  "org/jetbrains/kotlin#kotlin-metadata-jvm/2.2.20": {
+   "jar": "sha256-hSTqyQ9+jg8TZog/LGyCDJO/ph3z12hXyNPoA89nMV0=",
+   "pom": "sha256-e2qAtqLSZ2oEIvaWg4EyMVQlUfYbMgxochz7nh9ZCdA="
+  },
+  "org/jetbrains/kotlin#kotlin-reflect/2.0.21": {
+   "jar": "sha256-OtL8rQwJ3cCSLeurRETWEhRLe0Zbdai7dYfiDd+v15k=",
+   "pom": "sha256-Aqt66rA8aPQBAwJuXpwnc2DLw2CBilsuNrmjqdjosEk="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.0.21": {
+   "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=",
+   "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-common/2.2.20": {
+   "module": "sha256-ND2ZRn/LRNPvsSorpwNmTKQ/Oj8m//k8jTGyJoOttX4=",
+   "pom": "sha256-/Xicsy4kEOzGg7hzn3t1AD0J2jMzDD+KZcJp22svbHU="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk7/2.0.21": {
+   "jar": "sha256-cS9IB2Dt7uSKhDaea+ifarUjdUCLsso74U72Y/cr7jE=",
+   "pom": "sha256-TXE+dTi5Kh15cX6nHPHQI1eoThFFDEbLkuMgee40224="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib-jdk8/2.0.21": {
+   "jar": "sha256-FcjArLMRSDwGjRaXUBllR0tw39gKx5WA7KOgPPUeSh0=",
+   "pom": "sha256-MQ1tXGVBPjEQuUAr2AdfyuP0vlGdH9kHMTahj+cnvFc="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.0.21": {
+   "module": "sha256-gf1tGBASSH7jJG7/TiustktYxG5bWqcpcaTd8b0VQe0=",
+   "pom": "sha256-/LraTNLp85ZYKTVw72E3UjMdtp/R2tHKuqYFSEA+F9o="
+  },
+  "org/jetbrains/kotlin#kotlin-stdlib/2.2.20": {
+   "jar": "sha256-iDbM/9NYX63amQEkSyDUKQHS881YEFjYQ04v+rzzo+c=",
+   "module": "sha256-yRj1IU0CGnLjdn8nVul9EDpSbgTxQj2jZj79+1hH25U=",
+   "pom": "sha256-SosIbmQxvPYjY39Ssv8ZLhrbkTg4dC5cDupwqN7kKcQ="
+  },
+  "org/junit#junit-bom/5.11.4": {
+   "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=",
+   "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU="
+  },
+  "org/junit#junit-bom/5.13.1": {
+   "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=",
+   "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM="
+  },
+  "org/junit#junit-bom/5.13.2": {
+   "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=",
+   "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k="
+  },
+  "org/mockito#mockito-bom/4.11.0": {
+   "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo="
+  },
+  "org/ow2#ow2/1.5.1": {
+   "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU="
+  },
+  "org/ow2/asm#asm-commons/9.8": {
+   "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=",
+   "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI="
+  },
+  "org/ow2/asm#asm-tree/9.8": {
+   "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=",
+   "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c="
+  },
+  "org/ow2/asm#asm/9.8": {
+   "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=",
+   "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o="
+  },
+  "org/springframework#spring-framework-bom/5.3.39": {
+   "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=",
+   "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs="
+  },
+  "org/vafer#jdependency/2.13": {
+   "jar": "sha256-FFxghksjansSllUNMaSap1rWEpWBOO4NRxufywu+3T4=",
+   "pom": "sha256-3Ip1HRudXz2imiihDmKF62+3Q/TW46MleRsZX9B4eXs="
+  }
+ },
+ "https://repo.maven.apache.org/maven2": {
+  "com/google/code/findbugs#jsr305/3.0.2": {
+   "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=",
+   "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4="
+  },
+  "com/google/errorprone#error_prone_annotations/2.41.0": {
+   "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=",
+   "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4="
+  },
+  "com/google/errorprone#error_prone_parent/2.41.0": {
+   "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI="
+  },
+  "com/google/guava#failureaccess/1.0.3": {
+   "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=",
+   "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s="
+  },
+  "com/google/guava#guava-parent/26.0-android": {
+   "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ="
+  },
+  "com/google/guava#guava-parent/33.4.0-android": {
+   "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM="
+  },
+  "com/google/guava#guava-parent/33.5.0-jre": {
+   "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU="
+  },
+  "com/google/guava#guava/33.5.0-jre": {
+   "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=",
+   "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=",
+   "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE="
+  },
+  "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": {
+   "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=",
+   "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s="
+  },
+  "com/google/j2objc#j2objc-annotations/3.1": {
+   "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
+   "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
+  },
+  "com/puppycrawl/tools#checkstyle/12.1.1": {
+   "jar": "sha256-bFeVVVOsrx+n0vuZZogE8b37aN6ROLM5nqN/NGlPEOw=",
+   "pom": "sha256-G7+5ywT3BF9vCW03d7IFICtYfbxgqF1UUKKooJWTXlY="
+  },
+  "commons-beanutils#commons-beanutils/1.11.0": {
+   "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=",
+   "pom": "sha256-z/nqsddRJkvXdbbj6+0WUHlMrJzYvhxBa0jjpcYTnZM="
+  },
+  "commons-codec#commons-codec/1.15": {
+   "jar": "sha256-s+n21jp5AQm/DQVmEfvtHPaQVYJt7+uYlKcTadJG7WM=",
+   "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g="
+  },
+  "commons-collections#commons-collections/3.2.2": {
+   "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=",
+   "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws="
+  },
+  "info/picocli#picocli/4.7.7": {
+   "jar": "sha256-+G4w//0Q0rE7jKqNSyN6fuYfL/zPWxlB3nGLdl0jW/g=",
+   "pom": "sha256-GxjTYxNN9mYx0rn3R1Bo1zQiW6OJzfkIKhvYvakNV9M="
+  },
+  "net/bytebuddy#byte-buddy-agent/1.17.7": {
+   "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
+   "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
+  },
+  "net/bytebuddy#byte-buddy-parent/1.17.7": {
+   "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw="
+  },
+  "net/bytebuddy#byte-buddy/1.17.7": {
+   "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=",
+   "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M="
+  },
+  "net/jqwik#jqwik-api/1.9.3": {
+   "jar": "sha256-S85+gL622dcJKnmfqKUJ12zDHbsgyTiplSllwV0d2bI=",
+   "module": "sha256-aZhEFuoun3/eQM+smD0vVA06N+l2b9OwoG+tqPm0z/I=",
+   "pom": "sha256-X8HYuNdzIklBnz1sHumwBpvAP2oQpoG4FUMIfDh+nFs="
+  },
+  "net/jqwik#jqwik-engine/1.9.3": {
+   "jar": "sha256-uFWS7njjAjnM/cp6E0+RjulOvsUa0poxP8mmdtl7Pt4=",
+   "module": "sha256-LGhHnr2p4zS8kDOr0u8ic1OAjyARTxl5R7XHuWRquOU=",
+   "pom": "sha256-LsR4IRbldQZi945AbP96dhNmAVzsHhwBF8ZX1qF6Q1I="
+  },
+  "net/jqwik#jqwik-time/1.9.3": {
+   "jar": "sha256-n9CQIdjwPUSZBFe/MJXPCq800nhdEQj/IlkChsIzs+U=",
+   "module": "sha256-wrBWV2yHZ7/Nfv3ZgokPvHHmCPtcnID8FFz+5q3uqiQ=",
+   "pom": "sha256-9d95Pt3FV4X1Us/XFsXrZ62I37UWKIuXs/4ZkxUEtNE="
+  },
+  "net/jqwik#jqwik-web/1.9.3": {
+   "jar": "sha256-au6dWDwf+e/jGbL6C8nXX8YW3m0fJA3b0q+eq9pIPb4=",
+   "module": "sha256-OMhhMMi4bBZXtPglbgZe4IVR98XOco0aW+j2MTOxRVQ=",
+   "pom": "sha256-w7/witvsCnsi/QOuNDawNvCPOO1tyE+NI07futcKmEA="
+  },
+  "net/jqwik#jqwik/1.9.3": {
+   "jar": "sha256-Vikx4WZzCBgAVqjOhXkfcauMN8qO/CAGoWO6XWUOX3M=",
+   "module": "sha256-aBMW+FbbTqPKyPzO2BESf8HXAWh15bUKpKVQJFE6k9c=",
+   "pom": "sha256-GQm+BQi5ZZaus0c8BAuptGKSYreS5FRhXHz4cf/hmsA="
+  },
+  "net/sf/jopt-simple#jopt-simple/5.0.4": {
+   "jar": "sha256-3ybMWPI19HfbB/dTulo6skPr5Xidn4ns9o3WLqmmbCg=",
+   "pom": "sha256-amd2O3avzZyAuV5cXiR4LRjMGw49m0VK0/h1THa3aBU="
+  },
+  "net/sf/saxon#Saxon-HE/12.9": {
+   "jar": "sha256-jzqSFqU3NnEyKT6su6nfBi6s6PixahhK9Z4uSDnUzUE=",
+   "pom": "sha256-+IDp0dQAyZwYkvWWTl/JIN0d7wViI1m5sFjzK1tCaXU="
+  },
+  "org/agrona#agrona/2.3.1": {
+   "jar": "sha256-1c6VoTOazhPd0tAxVUMsalMonoN4E/aTIVpsq/AeZvg=",
+   "module": "sha256-d72z4nnWH8K9nGf46cf0HB6+sAeQNZL7wZlizuQmDro=",
+   "pom": "sha256-4kiqvmvUW54FQjK8jRMrV94UTxGFw65oFv84HYzF7bk="
+  },
+  "org/antlr#antlr4-master/4.13.2": {
+   "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
+  },
+  "org/antlr#antlr4-runtime/4.13.2": {
+   "jar": "sha256-3T6KE6LWab+E+42DTeNc5IdfJxV2mNIGJB7ISIqtyvc=",
+   "pom": "sha256-A84HonlsURsMlNwU/YbM3W44KMV5Z60jg94wTg0Runk="
+  },
+  "org/apache#apache/16": {
+   "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4="
+  },
+  "org/apache#apache/19": {
+   "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8="
+  },
+  "org/apache#apache/21": {
+   "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A="
+  },
+  "org/apache#apache/23": {
+   "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw="
+  },
+  "org/apache#apache/34": {
+   "pom": "sha256-NnGunU0GKuO7mFcxx2CIuy9vfXJU4tME7p9pC5dlEyg="
+  },
+  "org/apache#apache/6": {
+   "pom": "sha256-Eu21CW4T9Aw2LQvUCQJYn6lYZQUSP6Jnmc5QsRb6W7M="
+  },
+  "org/apache/commons#commons-lang3/3.8.1": {
+   "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=",
+   "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU="
+  },
+  "org/apache/commons#commons-math3/3.6.1": {
+   "jar": "sha256-HlbXsFjSi2Wr0la4RY44hbZ0wdWI+kPNfRy7nH7yswg=",
+   "pom": "sha256-+tcjNup9fdBtoQMUTjdA21CPpLF9nFTXhHc37cJKfmA="
+  },
+  "org/apache/commons#commons-parent/39": {
+   "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac="
+  },
+  "org/apache/commons#commons-parent/45": {
+   "pom": "sha256-nIhiPs+pHwEsZz7kYiwO60Nn5eDSItlg92zSCLGk/aY="
+  },
+  "org/apache/commons#commons-parent/47": {
+   "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc="
+  },
+  "org/apache/commons#commons-parent/52": {
+   "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4="
+  },
+  "org/apache/commons#commons-parent/84": {
+   "pom": "sha256-kjn7lxAdsnBw5Jg9ENM6DpHPZ2ytkb9TgVQiw1Ye+bE="
+  },
+  "org/apache/commons#commons-text/1.3": {
+   "jar": "sha256-gYWzpTEQktg+0fGEwtCTsxBdcmu9doZ8MrNRFUK7mag=",
+   "pom": "sha256-3usrqXAeSV3DHTJjPrhrlLJLCpbg3Gf7h+cGLxUwJ6o="
+  },
+  "org/apache/geronimo/genesis#genesis-default-flava/2.0": {
+   "pom": "sha256-CObhRvTiRSZt/53YALEodd0jZ9P2ejSrZgoSbIESFfg="
+  },
+  "org/apache/geronimo/genesis#genesis-java5-flava/2.0": {
+   "pom": "sha256-58U1i7u8J9qlsyf2O8EmUKdd3J+axtS/oSeJvh8sKds="
+  },
+  "org/apache/geronimo/genesis#genesis/2.0": {
+   "pom": "sha256-ue0vndQ0YxFY13MI7lZIYiwinM7OFyLF43ekKWkj2uY="
+  },
+  "org/apache/httpcomponents#httpclient/4.5.13": {
+   "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=",
+   "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw="
+  },
+  "org/apache/httpcomponents#httpcomponents-client/4.5.13": {
+   "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk="
+  },
+  "org/apache/httpcomponents#httpcomponents-core/4.4.14": {
+   "pom": "sha256-IJ7ZMctXmYJS3+AnyqnAOtpiBhNkIylnkTEWX4scutE="
+  },
+  "org/apache/httpcomponents#httpcomponents-parent/11": {
+   "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o="
+  },
+  "org/apache/httpcomponents#httpcore/4.4.14": {
+   "jar": "sha256-+VYgnkUMsdDFF3bfvSPlPp3Y25oSmO1itwvwlEumOyg=",
+   "pom": "sha256-VXFjmKl48QID+eJciu/AWA2vfwkHxu0K6tgexftrf9g="
+  },
+  "org/apache/maven#maven-parent/34": {
+   "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38="
+  },
+  "org/apache/maven/doxia#doxia-core/1.12.0": {
+   "jar": "sha256-XknNgnvrvOpYKdOziD0XrRzhXr1jlK61CtUNff2Tn80=",
+   "pom": "sha256-sDiPdIoIheE+fCxFOSH4u53U+1sZBb50VoVHbPNFbqM="
+  },
+  "org/apache/maven/doxia#doxia-logging-api/1.12.0": {
+   "jar": "sha256-mFMGFiwKn0wwnUYQlEfzDwK/b8m8FqPgOdWeHavQGS8=",
+   "pom": "sha256-ndmbQ1AiOEZYUxBpTERjGLFpK6dG7XFzdtWWGaJxI7Q="
+  },
+  "org/apache/maven/doxia#doxia-module-xdoc/1.12.0": {
+   "jar": "sha256-6HMboApO3TSyDv+eSnKcIEXGLLeWw+SRaSYH3kR2qwE=",
+   "pom": "sha256-+2nZW+S1WvLzsKm2jj6OYgY+aVlMH86+cFpaTbCZbSU="
+  },
+  "org/apache/maven/doxia#doxia-modules/1.12.0": {
+   "pom": "sha256-q4/2u0eTz7pZsU+zg/81GjSbEJHQccZrH8vKco1QW9w="
+  },
+  "org/apache/maven/doxia#doxia-sink-api/1.12.0": {
+   "jar": "sha256-XcpqqqnnDYoHZuFD3c+dsJ3l/eD7zHjLY11052TfzKU=",
+   "pom": "sha256-JrUf3babXKbgRM2ii40cGje2+v0M+5v7FakZ3lfGcdU="
+  },
+  "org/apache/maven/doxia#doxia/1.12.0": {
+   "pom": "sha256-LQKgvWTzMbdnzudFWzGTxvuCEQFDoRmFiryWh5il/Ck="
+  },
+  "org/apache/xbean#xbean-reflect/3.7": {
+   "jar": "sha256-EE5em7WmafhnIvMigZYHAPfsjjIJ71GyPrm20j0WKcs=",
+   "pom": "sha256-l5XBUyLF0ZrzNu69nhZPp9WJfEsASn1m4hY1oXPnSKk="
+  },
+  "org/apache/xbean#xbean/3.7": {
+   "pom": "sha256-6nFxMt6EBLYvyQl6HzIVxwXVJdRXvppfEmU63GjDOrc="
+  },
+  "org/apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "org/checkerframework#checker-qual/3.51.1": {
+   "jar": "sha256-FTrv/lbKJPOpuLbG/4E+rOliDM81rfq5HUkWguVs1c4=",
+   "module": "sha256-sU5zwFoeM/ddSLfYBDH5QqpLIQ/Pc/YKQkXMP91p/yI=",
+   "pom": "sha256-dQgGzZygmZ5L8vel1lfSNqNrtzYm7mpI8p9VXiB0UVA="
+  },
+  "org/codehaus/plexus#plexus-classworlds/2.6.0": {
+   "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=",
+   "pom": "sha256-RppsWfku/6YsB5fOfVLSwDz47hA0uSPDYN14qfUFp7o="
+  },
+  "org/codehaus/plexus#plexus-component-annotations/2.1.0": {
+   "jar": "sha256-veNhfOm1vPlYQSYEYIAEOvaks7rqQKOxU/Aue7wyrKw=",
+   "pom": "sha256-BnC2BSVffcmkVNqux5EpGMzxtUdcv8o3Q2O1H8/U6gA="
+  },
+  "org/codehaus/plexus#plexus-container-default/2.1.0": {
+   "jar": "sha256-bc6xJGsYgVO9y2+WLVQ9Ud22csygfK2Up4+6vJ7fCjk=",
+   "pom": "sha256-i4wg5jC9zHlcyYUCTEwQRcFHvhFgUsLJdeMMYI9/O0U="
+  },
+  "org/codehaus/plexus#plexus-containers/2.1.0": {
+   "pom": "sha256-lNWu2zxGAjJlOWUnz4zn/JRLe9eeTrq5BzhkGOtaCNc="
+  },
+  "org/codehaus/plexus#plexus-utils/3.3.0": {
+   "jar": "sha256-dtF0eSVA4nda+U0D0Q+y08d24s0KwOv0J9PlcAcruc4=",
+   "pom": "sha256-ecl5IHP97jzb69YadrqMLdEWJKn4XRKLrla9oZ4gR1w="
+  },
+  "org/codehaus/plexus#plexus/5.1": {
+   "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k="
+  },
+  "org/hamcrest#hamcrest/3.0": {
+   "jar": "sha256-XWa2pKaAdVy27XyxBPp4Ne9kRmdYb/Bzet65d8Oezbw=",
+   "module": "sha256-mhBVNzjTWME+a69Zeb8sGlSQ7uScLcas8xcPzKCSDd4=",
+   "pom": "sha256-SgSmgTO/MkYfR7ilPI7p30zi9JoNrZeUvOhxe+5brDE="
+  },
+  "org/javassist#javassist/3.28.0-GA": {
+   "jar": "sha256-V9Cp6ShvgvTqqFESUYaZf4Eb784OIGD/ChWnf1qd2ac=",
+   "pom": "sha256-w2p8E9o6SFKqiBvfnbYLnk0a8UbsKvtTmPltWYP21d0="
+  },
+  "org/json#json/20250517": {
+   "jar": "sha256-PqYbKgbjHt8ckRNP6RBrDrsWYovhafPbdbx6Kwa0V5Y=",
+   "pom": "sha256-caH7hqKwVTejz8HIfbQtA279u/x+nDSbY10hrB+odqc="
+  },
+  "org/jspecify#jspecify/1.0.0": {
+   "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=",
+   "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=",
+   "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y="
+  },
+  "org/junit#junit-bom/5.12.2": {
+   "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
+   "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
+  },
+  "org/junit#junit-bom/6.0.0": {
+   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
+   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
+  },
+  "org/junit#junit-bom/6.0.1": {
+   "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=",
+   "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg="
+  },
+  "org/junit/jupiter#junit-jupiter-api/6.0.1": {
+   "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=",
+   "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=",
+   "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo="
+  },
+  "org/junit/jupiter#junit-jupiter-engine/6.0.1": {
+   "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=",
+   "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=",
+   "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY="
+  },
+  "org/junit/jupiter#junit-jupiter-params/6.0.1": {
+   "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=",
+   "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=",
+   "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM="
+  },
+  "org/junit/jupiter#junit-jupiter/6.0.1": {
+   "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=",
+   "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=",
+   "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM="
+  },
+  "org/junit/platform#junit-platform-commons/6.0.1": {
+   "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=",
+   "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=",
+   "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI="
+  },
+  "org/junit/platform#junit-platform-engine/6.0.1": {
+   "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=",
+   "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=",
+   "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo="
+  },
+  "org/junit/platform#junit-platform-launcher/6.0.1": {
+   "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=",
+   "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=",
+   "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho="
+  },
+  "org/mockito#mockito-core/5.20.0": {
+   "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
+   "pom": "sha256-mQPiB1XAxIh6q5xPEAYft/ERUdOp+t2WTp+6QnIm0TU="
+  },
+  "org/objenesis#objenesis-parent/3.3": {
+   "pom": "sha256-MFw4SqLx4cf+U6ltpBw+w1JDuX1CjSSo93mBjMEL5P8="
+  },
+  "org/objenesis#objenesis/3.3": {
+   "jar": "sha256-At/QsEOaVZHjW3CO0vVHTrCUj1Or90Y36Vm45O9pv+s=",
+   "pom": "sha256-ugxA2iZpoEi24k73BmpHHw+8v8xQnmo+hWyk3fphStM="
+  },
+  "org/openjdk/jmh#jmh-core/1.37": {
+   "jar": "sha256-3A6vK78ANqcLYHmMeF1uA6na8GtouO2w8bqes0IbrrM=",
+   "pom": "sha256-BEU74Abwb4bXxD88SS97TrM2JoDK5PHugLpl2yM3P1o="
+  },
+  "org/openjdk/jmh#jmh-generator-annprocess/1.37": {
+   "jar": "sha256-alYEtbgE4NrKEUXfEHdgkyFodzSotJOH5J8QVXwYbHc=",
+   "pom": "sha256-5CQCZbVCXDnxzyczr9o67DsTndGT55TVUTe+ySQP9HY="
+  },
+  "org/openjdk/jmh#jmh-parent/1.37": {
+   "pom": "sha256-DCTyFvNjfd52ORFPcCc6aX+FRvekxtWs1Mxtrum+9Mk="
+  },
+  "org/opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  },
+  "org/reflections#reflections/0.10.2": {
+   "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=",
+   "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc="
+  },
+  "org/sonatype/oss#oss-parent/7": {
+   "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ="
+  },
+  "org/sonatype/oss#oss-parent/9": {
+   "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno="
+  },
+  "org/xmlresolver#xmlresolver/5.3.3": {
+   "jar": "sha256-H+TVuS9wjc24LbzhKRngFx5rXKYsbcpiIEg2JQmP618=",
+   "module": "sha256-DeilBgQ5G2UDnI/6PxQRiSJ+x5rFMyPhPiunKIy3no4=",
+   "pom": "sha256-JhradtnmZ2AI3Kw3ek1FiXSRZrYGVZ9Z8uRepi2Ldew="
+  },
+  "org/xmlresolver#xmlresolver/5.3.3/data": {
+   "jar": "sha256-sMSHrS8+VYvo2CnJFtJFjRCspqW6+npNBSS3CEXkilw="
+  }
+ }
+}
diff --git a/pkgs/by-name/si/simple-binary-encoding/package.nix b/pkgs/by-name/si/simple-binary-encoding/package.nix
new file mode 100644
index 000000000000..07a577fd5191
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/package.nix
@@ -0,0 +1,132 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gradle,
+  jre,
+  runtimeShell,
+
+  # Generating the usage instructions for script
+  htmlq,
+  html2text,
+  txt2man,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "simple-binary-encoding";
+  version = "1.36.1";
+
+  src = fetchFromGitHub {
+    owner = "aeron-io";
+    repo = "simple-binary-encoding";
+    tag = finalAttrs.version;
+    hash = "sha256-BP4JsxW1kTmS7yoqe1FdBDKy5bEzr3VYdfoNy9jTDEA=";
+  };
+
+  nativeBuildInputs = [
+    gradle
+    htmlq
+    html2text
+    txt2man
+  ];
+
+  mitmCache = gradle.fetchDeps {
+    pname = "simple-binary-encoding";
+    pkg = finalAttrs.finalPackage;
+    data = ./deps.json;
+  };
+
+  gradleBuildTask = "build";
+
+  doCheck = true;
+  gradleCheckTask = "runJavaExamples";
+
+  outputs = [
+    "out"
+    "benchmarks"
+    "samples"
+    "tool"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    for output in $outputs; do
+      if [[ "$output" != "out" ]]; then
+        mkdir -p "''${!output}"/share/sbe
+        cp "sbe-$output"/build/libs/*.jar "''${!output}/share/sbe"
+        if [[ -d "sbe-$output"/build/docs/javadoc ]]; then
+          cp -r "sbe-$output"/build/docs/javadoc "''${!output}/share/javadoc"
+        fi
+      fi
+      if [[ "$output" == "tool" ]]; then
+        cp sbe-all/build/libs/*.jar "$tool/share/sbe"
+      fi
+    done
+
+    mkdir -p "$out/"{bin,share/doc,share/man}
+
+    # Generate the usage file from the javadoc
+    shopt -s globstar
+    cat "$tool/share/javadoc"/**/sbe/SbeTool.html \
+      | htmlq '.class-description .block' \
+      | html2text \
+      | sed -e 's/[$] java/$ sbetool/' -e 's/ -jar sbe.jar//' -e 's/System Properties:/Available Options:/' \
+      > "$out/share/doc/sbetool.txt"
+
+    echo >> "$out/share/doc/sbetool.txt"
+    echo "All other arguments will be interpreted by java(1)." >> "$out/share/doc/sbetool.txt"
+
+    # Generate a manpage
+    sed \
+      -e '1i\NAME\nsbetool - ' \
+      -e 's/Usage:/\nSYNOPSIS\n/' \
+      -e 's/Available Options:/\nOPTIONS\n/' \
+      < "$out/share/doc/sbetool.txt" \
+      | txt2man \
+        -P simple-binary-encoding \
+        -t "sbetool" -s1 \
+        -r "$pname $verison" \
+        -v "Simple Binary Encoding" \
+        > "$out/share/man/sbetool.1"
+
+    runtimeShell="${runtimeShell}" java="${lib.getExe jre}" \
+      substituteAll ${./sbetool.sh} "$out/bin/sbetool"
+
+    chmod +x "$out/bin/sbetool"
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    # Check that we have some usage documentation
+    "$out"/bin/sbetool --help 2>&1 | grep -q Usage
+
+    # Check that the script can pass arguments to the underlying jar
+    tmpdir="$(mktemp -d)"
+    "$out"/bin/sbetool \
+      sbe-tool/src/test/resources/example-schema.xml \
+      -Dsbe.target.language=golang \
+      -Dsbe.output.dir="$tmpdir"
+    find "$tmpdir/baseline" | grep -q '.*[.]go'
+
+    # Check that -- passes as files
+    tmpdir="$(mktemp -d)"
+    cp sbe-tool/src/test/resources/example-schema.xml -- -e.xml
+    "$out"/bin/sbetool \
+      -Dsbe.target.language=golang \
+      -Dsbe.output.dir="$tmpdir" \
+      -- \
+      -e.xml
+    find "$tmpdir/baseline" | grep -q '.*[.]go'
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    homepage = "https://github.com/aeron-io/simple-binary-encoding";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ balsoft ];
+    description = "OSI layer 6 presentation for encoding and decoding binary application messages for low-latency financial applications";
+  };
+})
diff --git a/pkgs/by-name/si/simple-binary-encoding/sbetool.sh b/pkgs/by-name/si/simple-binary-encoding/sbetool.sh
new file mode 100755
index 000000000000..d77b433d6e64
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/sbetool.sh
@@ -0,0 +1,51 @@
+#!@runtimeShell@
+
+set -euo pipefail
+
+usage() {
+  cat "@out@/share/doc/sbetool.txt" >&2
+}
+
+if [[ $# -lt 1 ]]; then
+  usage
+  exit 1
+fi
+
+files=()
+opts=()
+opt_regex='^-.+$'
+only_files=
+
+for arg in "$@"; do
+  if [[ -n $only_files ]] || ! [[ "$arg" =~ $opt_regex ]]; then
+    files+=("$arg")
+    continue
+  fi
+  if [[ "$arg" == "-h" ]] || [[ "$arg" == "--help" ]]; then
+    usage
+    exit 0
+  fi
+  if [[ "$arg" == "--" ]]; then
+    only_files=true
+    continue
+  fi
+  opts+=("$arg")
+done
+
+if [[ -z "${files[*]}" ]]; then
+  echo "Error: no files provided. If your file starts with -, pass it after -- like this:" >&2
+  echo "    sbetool -- -my-file.xml" >&2
+  echo >&2
+  usage 2>&1 | tail +2 1>&2
+  exit 1
+fi
+
+# NB: `--add-opens` flag is added because newer version of `agrona` (a utility
+# lib used in `sbetool`) depends on jdk.internal.misc.Unsafe
+#
+# The Unsafe API is deprecated and requires special opt-in to use.
+@java@ \
+  --add-opens java.base/jdk.internal.misc=ALL-UNNAMED \
+  "${opts[@]}" \
+  -jar "@tool@/share/sbe/sbe-all-@version@.jar" \
+  "${files[@]}"
diff --git a/pkgs/by-name/si/simple-binary-encoding/update.sh b/pkgs/by-name/si/simple-binary-encoding/update.sh
new file mode 100755
index 000000000000..af9a0050f021
--- /dev/null
+++ b/pkgs/by-name/si/simple-binary-encoding/update.sh
@@ -0,0 +1,24 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -I nixpkgs=./. -i bash -p bash nix curl coreutils jq common-updater-scripts
+
+set -eou pipefail
+
+latest=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/aeron-io/simple-binary-encoding/releases/latest)
+latestTag=$(echo "$latest" | jq -r ".tag_name")
+latestVersion="$latestTag"
+
+currentVersion=$(nix-instantiate --eval -E "with import ./. {}; simple-binary-encoding.version" | tr -d '"')
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+    echo "package is up-to-date"
+    exit 0
+fi
+
+hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url --unpack "https://github.com/aeron-io/simple-binary-encoding/archive/refs/tags/${latestTag}.tar.gz")")
+update-source-version simple-binary-encoding "$latestVersion" "$hash"
+
+"$(nix-build -A simple-binary-encoding.mitmCache.updateScript)"
+
diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix
index 40e0d8eb5b8c..055a62ff56cf 100644
--- a/pkgs/by-name/si/simple-http-server/package.nix
+++ b/pkgs/by-name/si/simple-http-server/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/TheWaWaR/simple-http-server/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       mephistophiles
     ];
     mainProgram = "simple-http-server";
diff --git a/pkgs/by-name/si/simple-scan/package.nix b/pkgs/by-name/si/simple-scan/package.nix
index da3d143821fd..9e54bf337c77 100644
--- a/pkgs/by-name/si/simple-scan/package.nix
+++ b/pkgs/by-name/si/simple-scan/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
+  fetchurl,
   meson,
   ninja,
   pkg-config,
@@ -20,20 +20,17 @@
   libxml2,
   sane-backends,
   vala,
-  gitUpdater,
+  gnome,
   gobject-introspection,
 }:
 
 stdenv.mkDerivation rec {
   pname = "simple-scan";
-  version = "48.1";
+  version = "49.0.1";
 
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "simple-scan";
-    tag = version;
-    hash = "sha256-Y+uVAW0jpXJgadP6CjG8zeLgikFY2Pm0z4TZoyYK4+g=";
+  src = fetchurl {
+    url = "mirror://gnome/sources/simple-scan/${lib.versions.major version}/simple-scan-${version}.tar.xz";
+    hash = "sha256-4ZdiQiZj70v1059udfTWGo3hgTcpqW5X4E6Bdk4B6uI=";
   };
 
   nativeBuildInputs = [
@@ -64,9 +61,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru = {
-    updateScript = gitUpdater {
-      # Ignore tags like 48.1-2, which actually does not introduce any changes.
-      ignoredVersions = "-";
+    updateScript = gnome.updateScript {
+      packageName = "simple-scan";
     };
   };
 
diff --git a/pkgs/by-name/si/simplesamlphp/package.nix b/pkgs/by-name/si/simplesamlphp/package.nix
deleted file mode 100644
index 4345d70ca6ff..000000000000
--- a/pkgs/by-name/si/simplesamlphp/package.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  php,
-  fetchFromGitHub,
-  lib,
-}:
-php.buildComposerProject2 (finalAttrs: {
-  pname = "simplesamlphp";
-  version = "1.19.7";
-
-  src = fetchFromGitHub {
-    owner = "simplesamlphp";
-    repo = "simplesamlphp";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-Qmy9fuZq8MBqvYV6/u3Dg92pHHicuUhdNeB22u4hwwA=";
-  };
-
-  vendorHash = "sha256-kFRvOxSfqlM+xzFFlEm9YrbQDOvC4AA0BtztFQ1xxDU=";
-
-  meta = {
-    description = "Application written in native PHP that deals with authentication (SQL, .htpasswd, YubiKey, LDAP, PAPI, Radius)";
-    homepage = "https://simplesamlphp.org";
-    license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [ nhnn ];
-  };
-})
diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index ff0951bf5e84..ebdb1c3d3088 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.4.6";
+  version = "6.4.7";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-Z36jWYiWP5PdiDHazXnZw9PbFC7sB2DV9c29YEjNDEc=";
+    hash = "sha256-zCkbQS99FNZS9Q6MgQuINcgWn+/JdfrLraEKWAGqguY=";
   };
 
   appimageContents = appimageTools.extract {
diff --git a/pkgs/by-name/si/simulide/package.nix b/pkgs/by-name/si/simulide/package.nix
index 3dfb24aafb63..b7b1d4c4a059 100644
--- a/pkgs/by-name/si/simulide/package.nix
+++ b/pkgs/by-name/si/simulide/package.nix
@@ -172,6 +172,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       carloscraveiro
       tomasajt
+      iedame
     ];
     platforms = [
       "x86_64-linux"
diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 285cadf26edb..8a29e6815716 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.12.9";
+  version = "1.12.12";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1sN1VE+3CMI/rDiADpPJFv9NsxOvulLjGTE38CQOJzo=";
+    hash = "sha256-4TQLaDjZYcm8FVBo06c4rKuXEO2xRGm6cIzpkPwtL/g=";
   };
 
-  vendorHash = "sha256-Cx9SD5FTiyISRpWxlUsxeGP1M39YJQrWpRPaK1o6H08=";
+  vendorHash = "sha256-R9dN2/MmuAeYB9UkNDbhc48SelBMR80nMnptNKD0y9c=";
 
   tags = [
     "with_quic"
diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index f0b404de0de6..ff4c82bd92a5 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -51,15 +51,15 @@ assert builtins.elem gpuBackend [
 ];
 assert enablePython -> pythonPackages != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SIRIUS";
-  version = "7.8.0-unstable-2025-07-23";
+  version = "7.9.0";
 
   src = fetchFromGitHub {
     owner = "electronic-structure";
     repo = "SIRIUS";
-    rev = "258c8c6543af0350ac002a52fbe18221ea275590";
-    hash = "sha256-HHt3iw3muIGz86NmI9p6yuv7jrXoiz/83qTTueU7Lpk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/bhY+LCxOikS1at0ONFAhmvfnWhAVHsRQ4GfXJOZbBA=";
   };
 
   outputs = [
@@ -182,4 +182,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = [ maintainers.sheepforce ];
   };
-}
+})
diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index e273ba9ce236..a6a5e9e21ac8 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -26,19 +26,15 @@ assert
   (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
 buildNpmPackage rec {
   pname = "sitespeed-io";
-  version = "38.3.0";
+  version = "38.4.1";
 
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
     tag = "v${version}";
-    hash = "sha256-45lvEM8vkoXdbZNJamUR94PD0EwtoNEhWSNyV68yzPo=";
+    hash = "sha256-7aqZ63q+17MmUjHwh5Z9yqvwRq/Av+UOswIlSA2V14E=";
   };
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   # Don't try to download the browser drivers
   CHROMEDRIVER_SKIP_DOWNLOAD = true;
   GECKODRIVER_SKIP_DOWNLOAD = true;
@@ -50,7 +46,7 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
   npmInstallFlags = [ "--omit=dev" ];
-  npmDepsHash = "sha256-rXGoIIbKNZCBhhuRM/0WcaciH/bLQamipmOIh1EXJlU=";
+  npmDepsHash = "sha256-2v/3Ygy6pAyfoQKcbJphIExcU46xc9c6+yXP2JbX11Y=";
 
   postInstall = ''
     mv $out/bin/sitespeed{.,-}io
diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index da9f0ed4387f..869dfbc265ed 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6CKY5rIPI+8uKh1vjw9nBI01J8o7U4vlxEPJS7xaAVg=";
+    hash = "sha256-LG6JVeP5OmC/8OcUq+a3Xj/BTNB5C4XXhp0VVE8BZ6k=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-kDWOkAY6GiSp/oLkyLya2VYWmLz4fPxZPRKGlb2B8M4=";
+    vendorHash = "sha256-ZUSfehCqHUZyWHHisulg4x9v+YtnoktqaLDR7SjeGQo=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       postPatch
       ;
     fetcherVersion = 1;
-    hash = "sha256-Q67JRE0XXjrIAyC30DDCtdh1Ja+9ME2mmIfh21Lx+mw=";
+    hash = "sha256-uAv/KTkLy/cvVctceBFA5xwlgGeSmbutgUP39zvZIhU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";
diff --git a/pkgs/by-name/sk/skate/package.nix b/pkgs/by-name/sk/skate/package.nix
index 77fe2116c9a3..d9b7dddfebef 100644
--- a/pkgs/by-name/sk/skate/package.nix
+++ b/pkgs/by-name/sk/skate/package.nix
@@ -30,7 +30,6 @@ buildGoModule rec {
     changelog = "https://github.com/charmbracelet/skate/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       penguwin
     ];
     mainProgram = "skate";
diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index 501e14e1d263..e8f8ce09677a 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
-  version = "2.22.1";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "FelixKratz";
     repo = "SketchyBar";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-272lrH0ee4z4hcY4Hqt/UxjGwH6RFPEP4n0jz6Ab/+c=";
+    hash = "sha256-PvKvevsSyRb6OfPWc2+1Bcfj2ngmgeP1URBoBiVeEdk=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix
index 6bd4487b1531..631cfa06e1af 100644
--- a/pkgs/by-name/sk/skrooge/package.nix
+++ b/pkgs/by-name/sk/skrooge/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "skrooge";
-  version = "25.4.0";
+  version = "25.10.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz";
-    hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8=";
+    hash = "sha256-kECWi5/q2reBOs9DrubOz5Vol3AkA7lXzOLtbgx2HlE=";
   };
 
   nativeBuildInputs = with kdePackages; [
diff --git a/pkgs/by-name/sk/skyemu/package.nix b/pkgs/by-name/sk/skyemu/package.nix
index 697daa6cb5c7..02c63ae1399d 100644
--- a/pkgs/by-name/sk/skyemu/package.nix
+++ b/pkgs/by-name/sk/skyemu/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "skyemu";
-  version = "3-unstable-2025-02-23";
+  version = "4";
 
   src = fetchFromGitHub {
     owner = "skylersaleh";
     repo = "SkyEmu";
-    rev = "f8573db83d15791b0cd94c29ceb46bf683963ff0";
-    hash = "sha256-LI4zBKjB48zYYYVZePzefRFrw/zvg17jzh5ZOPHAWok=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rfXHOff+PG5iA19iwEij4c5aFD9XrSF1GQhIBhWzKgg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sl/slacky/package.nix b/pkgs/by-name/sl/slacky/package.nix
index 8686481126f0..8d496e842464 100644
--- a/pkgs/by-name/sl/slacky/package.nix
+++ b/pkgs/by-name/sl/slacky/package.nix
@@ -70,7 +70,7 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/andirsun/Slacky";
     changelog = "https://github.com/andirsun/Slacky/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ awwpotato ];
+    maintainers = with lib.maintainers; [ da157 ];
     platforms = lib.platforms.linux;
     mainProgram = "slacky";
   };
diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index 3b40757dbddd..aae72ffaf2ff 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.7-unstable-2025-09-30";
+  version = "3.2.8-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "8ad6609784de6fef6b35f1508b6d5d8a3084aa17";
-    hash = "sha256-XYg0k5ZOZ/M/4X0+6pjJEMK0sIVqu/1LtmJaeq6iOvM=";
+    rev = "2a5e2b25e31eb35ba73805c74f03c1bc56a66de0";
+    hash = "sha256-lLZ0L07u8PQhe8e2eCYGKrSnRp1EIYfME39JK/KXaj4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sl/slade/package.nix b/pkgs/by-name/sl/slade/package.nix
index d01793cdd99c..db8fbf298497 100644
--- a/pkgs/by-name/sl/slade/package.nix
+++ b/pkgs/by-name/sl/slade/package.nix
@@ -11,23 +11,23 @@
   sfml_2,
   fluidsynth,
   curl,
-  freeimage,
   ftgl,
   glew,
   lua,
   mpg123,
   wrapGAppsHook3,
+  libwebp,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slade";
-  version = "3.2.7";
+  version = "3.2.8";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
     tag = finalAttrs.version;
-    hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns=";
+    hash = "sha256-skJpcxLSInAzBHGtxdTWAqocXQKKQY7vJfUx8ZAlMqc=";
   };
 
   nativeBuildInputs = [
@@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
     sfml_2
     fluidsynth
     curl
-    freeimage
     ftgl
     glew
     lua
     mpg123
+    libwebp
   ];
 
   cmakeFlags = [
diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix
index 186993f6fbd2..e7ae9353fbb4 100644
--- a/pkgs/by-name/sl/sleek-grub-theme/package.nix
+++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix
@@ -6,7 +6,7 @@
   withStyle ? "light", # use override to specify one of "dark" / "orange" / "bigSur"
 }:
 
-assert builtins.any (s: withStyle == s) [
+assert builtins.elem withStyle [
   "light"
   "dark"
   "orange"
diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index 02a989552844..4d236fc16121 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -3,25 +3,31 @@
   stdenv,
   fetchFromGitLab,
   python3Packages,
-  arpack-mpi,
+  arpack,
   petsc,
-  mpi,
   mpiCheckPhaseHook,
   pythonSupport ? false,
   withExamples ? false,
   withArpack ? stdenv.hostPlatform.isLinux,
 }:
-assert petsc.mpiSupport;
-assert pythonSupport -> petsc.pythonSupport;
+let
+  slepcPackages = petsc.petscPackages.overrideScope (
+    final: prev: {
+      inherit pythonSupport;
+      mpiSupport = true;
+      arpack = final.callPackage arpack.override { useMpi = true; };
+    }
+  );
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "slepc";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchFromGitLab {
     owner = "slepc";
     repo = "slepc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nvzX0p/H3EYR8+7jD+I4FdvU+WstxR/U4Upcn7yZULk=";
+    hash = "sha256-Eg0GLPM1AbgUl2/c2+F012LjZweuBNAWjY1WtlghjeY=";
   };
 
   postPatch = ''
@@ -50,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   buildInputs = [
-    mpi
+    slepcPackages.mpi
   ]
   ++ lib.optionals withArpack [
-    arpack-mpi
+    slepcPackages.arpack
   ];
 
   propagatedBuildInputs = [
@@ -86,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pythonImportsCheck = [ "slepc4py" ];
 
-  shellHook = ./setup-hook.sh;
+  setupHook = ./setup-hook.sh;
 
   meta = {
     description = "Scalable Library for Eigenvalue Problem Computations";
diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix
index 36b8921abfca..6be7d0ace34b 100644
--- a/pkgs/by-name/sl/slingshot/package.nix
+++ b/pkgs/by-name/sl/slingshot/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/caio-ishikawa/slingshot";
     changelog = "https://github.com/caio-ishikawa/slingshot/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "slingshot";
   };
 }
diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index 2edeb1b5674e..ff24feebaa9b 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -15,14 +15,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.13.1";
+  version = "1.14.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-XEs7zJWocRZgVPPDM/IxOOwE7ofh+b7A/TJrQw/mMOo=";
+    hash = "sha256-gVRoca4u1TVArDF226JWzLQJhUAIWA2JDyQ3Wo87AkA=";
   };
 
-  cargoHash = "sha256-DAoqfnis95oEPBgYeOdR3zUVdoKbay780iJ6zVkxdDU=";
+  cargoHash = "sha256-f3RLJnxoEUm7gsfqj86wXgfOj9woGmisONv0RZAQCGc=";
 
   rpathLibs = [
     fontconfig
diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix
index b932891fd2e3..0bbe1997e9ce 100644
--- a/pkgs/by-name/sl/slippy/package.nix
+++ b/pkgs/by-name/sl/slippy/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "slippy";
   };
 }
diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index ccd231a3a3c3..f412ef12f5e0 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -2,27 +2,37 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slumber";
-  version = "4.0.1";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "LucasPickering";
     repo = "slumber";
-    tag = "v${version}";
-    hash = "sha256-Xr4jAQ3G5El9FU6qOJJARjkZmTZly8pb//ElQizOHSg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wEQPyp0J7p2TuJwH/fQv5fhenUY3MNIq0oazFJAj9lM=";
   };
 
-  cargoHash = "sha256-Di3Kqwa63AWwZE1VOal+mqmYe/nzPFqis1MnawW9uZo=";
+  cargoHash = "sha256-Nz/Z2KJ8jJAsTASwnvleRpJ88UHGe7dktO0FkCOPdu4=";
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Terminal-based HTTP/REST client";
     homepage = "https://slumber.lucaspickering.me";
-    changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/LucasPickering/slumber/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "slumber";
     maintainers = with lib.maintainers; [ javaes ];
   };
-}
+})
diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 1ed22d4730d0..596916865a11 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -34,7 +34,7 @@
   # enable internal X11 support via libssh2
   enableX11 ? true,
   enableNVML ? config.cudaSupport,
-  nvml,
+  cudaPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -110,8 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableNVML [
     (runCommand "collect-nvml" { } ''
       mkdir $out
-      ln -s ${lib.getDev nvml}/include $out/include
-      ln -s ${lib.getLib nvml}/lib/stubs $out/lib
+      ln -s ${lib.getOutput "include" cudaPackages.cuda_nvml_dev}/include $out/include
+      ln -s ${lib.getOutput "stubs" cudaPackages.cuda_nvml_dev}/lib/stubs $out/lib
     '')
   ];
 
diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
index 0a8b7aaaa8bd..1942accedd6f 100644
--- a/pkgs/by-name/sl/sly/package.nix
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter335,
   runCommand,
   yq,
   sly,
@@ -9,7 +9,7 @@
   gitUpdater,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter335.buildFlutterApplication rec {
   pname = "sly";
   version = "1.0.0";
 
diff --git a/pkgs/by-name/sl/sly/pubspec.lock.json b/pkgs/by-name/sl/sly/pubspec.lock.json
index 75cf3d4ac115..42f179ac1731 100644
--- a/pkgs/by-name/sl/sly/pubspec.lock.json
+++ b/pkgs/by-name/sl/sly/pubspec.lock.json
@@ -4,51 +4,51 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "cli_util": {
       "dependency": "transitive",
@@ -64,21 +64,21 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "console": {
       "dependency": "transitive",
@@ -94,11 +94,11 @@
       "dependency": "direct main",
       "description": {
         "name": "crop_image",
-        "sha256": "2e629cd141a360cb9060b5a0837fd49b0260d3d931244717213bf164f6813c82",
+        "sha256": "4fdebd00d0c7d1a6e3abeb1e3843efbc202204b867f3e377fcebcf77aaf69a17",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.15"
+      "version": "1.0.16"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -134,21 +134,21 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
@@ -164,31 +164,31 @@
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     "file_selector_android": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc",
+        "sha256": "2db9a2d05f66b49a3b45c4a7c2f040dd5fcd457ca30f39df7cdcf80b8cd7f2d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+12"
+      "version": "0.5.2+1"
     },
     "file_selector_ios": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_ios",
-        "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
+        "sha256": "fc3c3fc567cd9bcae784dfeb98d37c46a8ded9e8757d37ea67e975c399bc14e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3+1"
+      "version": "0.5.3+3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -204,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "88707a3bec4b988aaed3b4df5d7441ee4e987f20b286cddca5d6a8270cab23f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+5"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -234,11 +234,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fl_chart": {
       "dependency": "direct main",
@@ -270,11 +270,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
+        "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.24"
+      "version": "2.0.32"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -292,21 +292,21 @@
       "dependency": "direct main",
       "description": {
         "name": "gal",
-        "sha256": "2771519c8b29f784d5e27f4efc2667667eef51c6c47cccaa0435a8fe8aa208e4",
+        "sha256": "969598f986789127fd407a750413249e1352116d4c2be66e81837ffeeaafdfee",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "get_it": {
       "dependency": "transitive",
       "description": {
         "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
+        "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.2.0"
     },
     "handy_window": {
       "dependency": "direct main",
@@ -322,111 +322,111 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.5.0"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e",
+        "sha256": "58a85e6f09fe9c4484d53d18a0bd6271b72c53fce1d05e6f745ae36d8c18efca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+18"
+      "version": "0.8.13+5"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b",
+        "sha256": "e675c22790bcc24e9abd455deead2b7a88de4b79f7327a281812f14de1a56f58",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+1"
+      "version": "0.8.13+1"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2+1"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.11.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "json_annotation": {
       "dependency": "transitive",
@@ -442,31 +442,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -482,11 +482,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -502,11 +502,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -522,31 +522,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
+        "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.8"
+      "version": "3.16.12"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "path": {
       "dependency": "transitive",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -582,11 +582,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -612,21 +612,21 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.1"
+      "version": "6.0.3"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -682,31 +682,31 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
+        "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.15"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "sha256": "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -732,11 +732,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -758,61 +758,61 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.6"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -828,31 +828,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.24"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.5"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -868,11 +868,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.4"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -888,51 +888,51 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "15.0.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -958,25 +958,25 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }
diff --git a/pkgs/by-name/sm/smartcrop/package.nix b/pkgs/by-name/sm/smartcrop/package.nix
index a65b19f45670..3473ed094a90 100644
--- a/pkgs/by-name/sm/smartcrop/package.nix
+++ b/pkgs/by-name/sm/smartcrop/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Find good image crops for arbitrary crop sizes";
     homepage = "https://github.com/muesli/smartcrop";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "smartcrop";
   };
 }
diff --git a/pkgs/by-name/sm/smartdns/package.nix b/pkgs/by-name/sm/smartdns/package.nix
index dcb20ec7015d..44f3fe7ad31c 100644
--- a/pkgs/by-name/sm/smartdns/package.nix
+++ b/pkgs/by-name/sm/smartdns/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "smartdns";
-  version = "46.1";
+  version = "47";
 
   src = fetchFromGitHub {
     owner = "pymumu";
     repo = "smartdns";
     rev = "Release${version}";
-    hash = "sha256-IvaED1V1pP0/Qk2oND3fVr7PMXSnT9jFeuikEkndX0o=";
+    hash = "sha256-8OK1OV3Jvj/5nUOxnWTTQAa1Qe3RGxNwJhYEZ7O1RIE=";
   };
 
   buildInputs = [ openssl ];
diff --git a/pkgs/by-name/sm/smatch/fix_include_path.patch b/pkgs/by-name/sm/smatch/fix_include_path.patch
new file mode 100644
index 000000000000..af6de589f9e9
--- /dev/null
+++ b/pkgs/by-name/sm/smatch/fix_include_path.patch
@@ -0,0 +1,58 @@
+diff --git a/pre-process.c b/pre-process.c
+index 457685c0..006209ad 100644
+--- a/pre-process.c
++++ b/pre-process.c
+@@ -2410,32 +2410,27 @@ static void do_preprocess(struct token **list)
+ 
+ void init_include_path(void)
+ {
+-	FILE *fp;
+-	char path[256];
+-	char arch[32];
+-	char os[32];
+-
+-	fp = popen("/bin/uname -m", "r");
+-	if (!fp)
+-		return;
+-	if (!fgets(arch, sizeof(arch) - 1, fp))
+-		return;
+-	pclose(fp);
+-	if (arch[strlen(arch) - 1] == '\n')
+-		arch[strlen(arch) - 1] = '\0';
+-
+-	fp = popen("/bin/uname -o", "r");
+-	if (!fp)
+-		return;
+-	fgets(os, sizeof(os) - 1, fp);
+-	pclose(fp);
+-
+-	if (strcmp(os, "GNU/Linux\n") != 0)
+-		return;
+-	strcpy(os, "linux-gnu");
+-
+-	snprintf(path, sizeof(path), "/usr/include/%s-%s/", arch, os);
+-	add_pre_buffer("#add_system \"%s/\"\n", path);
++	add_pre_buffer("#add_system \"%s/\"\n", "@clang@");
++	add_pre_buffer("#add_system \"%s/\"\n", "@libc@");
++
++    bool collect = false;
++    char *nix_cflags = getenv("NIX_CFLAGS_COMPILE");
++    if (nix_cflags == NULL)
++        return;
++
++    for (
++        char *token = strtok(nix_cflags, " ");
++        token != NULL;
++        token = strtok(NULL, " ")
++    ) {
++        if (collect && *token == '/') {
++	        add_pre_buffer("#add_system \"%s/\"\n", token);
++            collect = false;
++            continue;
++        }
++        if (!strcmp(token, "-isystem"))
++            collect = true;
++    }
+ }
+ 
+ struct token * preprocess(struct token *token)
diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index 159f8b285b42..7362d2a8669f 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -5,31 +5,44 @@
   pkg-config,
   sqlite,
   openssl,
-  buildllvmsparse ? false,
-  buildc2xml ? false,
   libllvm,
   libxml2,
+  replaceVars,
+  llvmPackages,
+  buildllvmsparse ? false,
+  buildc2xml ? false,
 }:
 let
   version = "1.73";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "smatch";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "error27";
     repo = "smatch";
-    rev = version;
-    sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME=";
+    tag = finalAttrs.version;
+    hash = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME=";
   };
 
-  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [
-    "-Wno-incompatible-function-pointer-types"
+  patches = [
+    ./remove_const.patch
+    (
+      let
+        clang-major = lib.versions.major (lib.getVersion llvmPackages.clang-unwrapped);
+        clang-lib = lib.getLib llvmPackages.clang-unwrapped;
+      in
+      replaceVars ./fix_include_path.patch {
+        clang = "${clang-lib}/lib/clang/${clang-major}/include";
+        libc = "${lib.getDev stdenv.cc.libc}/include";
+      }
+    )
   ];
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkg-config ];
-  patches = [ ./remove_const.patch ];
 
   buildInputs = [
     sqlite
@@ -50,4 +63,4 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix
index d5f5cd9df9df..629b14eac6e2 100644
--- a/pkgs/by-name/sm/smpmgr/package.nix
+++ b/pkgs/by-name/sm/smpmgr/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "smpmgr";
-  version = "0.14.0";
+  version = "0.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpmgr";
     tag = version;
-    hash = "sha256-u69gREyOjQEh5C9XncEXZHvt/wU+WKeGA9/kC0hw4Q0=";
+    hash = "sha256-PhsJa0Z1EnpFyoI6fEN5opG23xB+JTI1uB2sstuOcTw=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/sm/smpq/package.nix b/pkgs/by-name/sm/smpq/package.nix
index 817b2077d04b..0048797bfe04 100644
--- a/pkgs/by-name/sm/smpq/package.nix
+++ b/pkgs/by-name/sm/smpq/package.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_KDE" false)
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index e86c4b96de3f..e6f1f6ea362f 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "smug";
-  version = "0.3.8";
+  version = "0.3.11";
 
   subPackages = [ "." ];
 
@@ -15,10 +15,10 @@ buildGoModule rec {
     owner = "ivaaaan";
     repo = "smug";
     rev = "v${version}";
-    sha256 = "sha256-m6yK7WPfrItIR3ULJgnw+oysX+zlotiIZMyr4SkPPdM=";
+    sha256 = "sha256-NUnabx71q/yrkGsdYa9qruyTLjk/sJBvV7bzoKn+eLo=";
   };
 
-  vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU=";
+  vendorHash = "sha256-N6btfKjhJ0MkXAL4enyNfnJk8vUeUDCRus5Fb7hNtug=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/sm/smuview/package.nix b/pkgs/by-name/sm/smuview/package.nix
index 3338e873b5bd..6bfedfac5d09 100644
--- a/pkgs/by-name/sm/smuview/package.nix
+++ b/pkgs/by-name/sm/smuview/package.nix
@@ -53,6 +53,15 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
 
+  postPatch = ''
+    substituteInPlace external/pybind11_2.11_dev1/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace external/QtFindReplaceDialog/dialogs/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace manual/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Qt based source measure unit GUI for sigrok";
     mainProgram = "smuview";
diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 071223850fa7..1ebf78b15a10 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.83";
+  version = "2.84";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-5BpJKDXA3PO/ZCfFYMngWaAGns2+ANWCpLgiEi4CAXY=";
+    hash = "sha256-sKxuFG3lqpjGkC0WVPr+4v09LR7BR2FYBOsToNI6M78=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 8311043ad298..d91a307ba777 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.13.2";
+  version = "9.13.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-7XEs+BTy6xPQidbuafrzELvfNjpzU9RcatXpRwHZ+1A=";
+    hash = "sha256-hYITdHXV5qRmxXOTHnUgkR9xVXOyqP470a8zOhlCoLo=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/sn/snapshot/package.nix b/pkgs/by-name/sn/snapshot/package.nix
index edb440b1cab7..8c8a480bfeb1 100644
--- a/pkgs/by-name/sn/snapshot/package.nix
+++ b/pkgs/by-name/sn/snapshot/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  libglycin,
   glycin-loaders,
   cargo,
   desktop-file-utils,
@@ -18,6 +19,7 @@
   gtk4,
   libadwaita,
   libcamera,
+  lcms2,
   libseccomp,
   pipewire,
   gnome,
@@ -25,16 +27,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snapshot";
-  version = "48.0.1";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/snapshot/${lib.versions.major finalAttrs.version}/snapshot-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OTF2hZogt9I138MDAxuiDGhkQRBpiNyRHdkbe21m4f0=";
+    hash = "sha256-X5YZPSkZxzVXRdJqGwHyPDyzCpPHQtWD7EKSfEpFrhg=";
   };
 
   patches = [
     # Fix paths in glycin library
-    glycin-loaders.passthru.glycinPathsPatch
+    libglycin.passthru.glycin3PathsPatch
   ];
 
   cargoVendorDir = "vendor";
@@ -62,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     gtk4
     libadwaita
     libcamera # for the gstreamer plugin
+    lcms2
     libseccomp
     pipewire # for device provider
   ];
diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix
index 77bdd8b1980b..3778a54bb5a2 100644
--- a/pkgs/by-name/sn/snazy/package.nix
+++ b/pkgs/by-name/sn/snazy/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/chmouel/snazy/releases/tag/${src.rev}";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      figsoda
       jk
     ];
   };
diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix
index d40715a59c13..f4c30e3d0381 100644
--- a/pkgs/by-name/sn/snd/package.nix
+++ b/pkgs/by-name/sn/snd/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snd";
-  version = "25.7";
+  version = "25.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
-    hash = "sha256-tkPb5gkeyFAJ2kAflZXUiR7langzn9NEUyjgEGDH+9w=";
+    hash = "sha256-ha8f7vBRUNEHXc0/E0L714jPFDVhMSCluKPrrdQYOTM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sn/snes9x/package.nix b/pkgs/by-name/sn/snes9x/package.nix
index c5945095beb4..84951e4e3ac3 100644
--- a/pkgs/by-name/sn/snes9x/package.nix
+++ b/pkgs/by-name/sn/snes9x/package.nix
@@ -90,6 +90,11 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   postPatch = lib.optionalString withGtk ''
+    # Please remove after snes9x > 1.63.  Fixed by upstream:
+    # https://github.com/snes9xgit/snes9x/commit/a4b4b98fffbde417ad550480021db89f18f11a5d.patch
+    substituteInPlace external/SPIRV-Cross/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.0)' 'cmake_minimum_required(VERSION 3.5)'
+
     substituteInPlace external/glad/src/egl.c \
       --replace-fail libEGL.so.1 "${lib.getLib libGLX}/lib/libEGL.so.1"
     substituteInPlace external/glad/src/glx.c \
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index 8b4abb822aa9..6da62da38bc4 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -26,16 +26,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sniffnet";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "gyulyvgc";
     repo = "sniffnet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EgnFDF+K8qGjunWB20VA8bXLzNvyGzcIaim+smhW5fU=";
+    hash = "sha256-LqEEh+YqFJkseLdFRfCTIK7Q3Xs0M1u+vVcxpNJntCA=";
   };
 
-  cargoHash = "sha256-22P1EeZ2FqwIHjr23oJCKvg3ggT1Me93goELwZ/B9S4=";
+  cargoHash = "sha256-iSQZxZTuSCNIB/725TO9UcvzKyA49DARoYcZh87y1Xs=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -99,7 +99,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     teams = [ lib.teams.ngi ];
     mainProgram = "sniffnet";
   };
diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index fe875de0d6a9..33996474eea8 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -12,16 +12,16 @@ let
 in
 php.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "8.3.3";
+  version = "8.3.4";
 
   src = fetchFromGitHub {
     owner = "grokability";
     repo = "snipe-it";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ttvq5KXTLtl3ZCRQACtVj4jC2cVGfDd+hUdRO3CbQjU=";
+    hash = "sha256-Oi2UClik3l9tGTmzSmhK0B2ce6gNQtwPc1cSMPn207M=";
   };
 
-  vendorHash = "sha256-Y5Jf9x0YIFHkuRwMR9X2D0b5/ULr6sTjmPHnQRXbF/s=";
+  vendorHash = "sha256-gqLVjhixJVfZZA9ilsCNiIoJz2VbAeGHVCARCJ14Rs4=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"
diff --git a/pkgs/by-name/sn/snippetexpandergui/package.nix b/pkgs/by-name/sn/snippetexpandergui/package.nix
index 4f968e5a98ec..6a1f172e7617 100644
--- a/pkgs/by-name/sn/snippetexpandergui/package.nix
+++ b/pkgs/by-name/sn/snippetexpandergui/package.nix
@@ -7,7 +7,7 @@
   installShellFiles,
   xorg,
   gtk3,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
   snippetexpanderd,
   snippetexpanderx,
 }:
@@ -33,7 +33,7 @@ buildGoModule rec {
   buildInputs = [
     xorg.libX11
     gtk3
-    webkitgtk_4_0
+    # webkitgtk_4_0
     snippetexpanderd
     snippetexpanderx
   ];
@@ -68,6 +68,8 @@ buildGoModule rec {
   '';
 
   meta = {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Your little expandable text snippet helper GUI";
     homepage = "https://snippetexpander.org";
     license = lib.licenses.gpl2Plus;
diff --git a/pkgs/by-name/sn/snixembed/package.nix b/pkgs/by-name/sn/snixembed/package.nix
index 44b5b144ff6a..25910bc4fc40 100644
--- a/pkgs/by-name/sn/snixembed/package.nix
+++ b/pkgs/by-name/sn/snixembed/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}";
     license = lib.licenses.isc;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "snixembed";
   };
 }
diff --git a/pkgs/by-name/sn/snooze/package.nix b/pkgs/by-name/sn/snooze/package.nix
index d57f48e36a0e..05e2a9dc4f6c 100644
--- a/pkgs/by-name/sn/snooze/package.nix
+++ b/pkgs/by-name/sn/snooze/package.nix
@@ -5,12 +5,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "snooze";
-  version = "0.5";
+  version = "0.5.1";
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "snooze";
     rev = "v${version}";
-    sha256 = "sha256-K77axli/mapUr3yxpmUfFq4iWwgRmEVUlP6+/0Iezwo=";
+    sha256 = "sha256-ghWQ/bslWJCcsQ8OqS3MHZiiuGzbgzat6mkG2avSbEk=";
   };
   makeFlags = [
     "DESTDIR=$(out)"
diff --git a/pkgs/by-name/sn/snowemu/package.nix b/pkgs/by-name/sn/snowemu/package.nix
new file mode 100644
index 000000000000..1659bb517991
--- /dev/null
+++ b/pkgs/by-name/sn/snowemu/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  makeWrapper,
+  makeDesktopItem,
+  SDL2,
+  pkg-config,
+  xorg,
+  wayland,
+  libxkbcommon,
+  libGL,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "snowemu";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "twvd";
+    repo = "snow";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-m3CPKswOB2j2r/BTf9RzCvwPVq3gbKemtk11HKS1nHk=";
+    fetchSubmodules = true;
+  };
+  cargoHash = "sha256-+FS5785F8iWPt6Db+IKRbOFAYNEfHC+jvPVdwkLZ5YI=";
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    SDL2.dev
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXi
+  ];
+
+  postInstall = ''
+    mv $out/bin/snow_frontend_egui $out/bin/snowemu
+
+    install -Dm644 docs/images/snow_icon.png $out/share/icons/hicolor/apps/snowemu.png
+
+    wrapProgram $out/bin/snowemu \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          wayland
+          libxkbcommon
+          libGL
+        ]
+      }
+  '';
+
+  desktopItems = makeDesktopItem {
+    name = "snowemu";
+    exec = "snowemu";
+    icon = "snowemu";
+    desktopName = "Snow Emulator";
+    comment = finalAttrs.meta.description;
+    genericName = "Vintage Macintosh emulator";
+    categories = [
+      "Game"
+      "Emulator"
+    ];
+  };
+
+  meta = {
+    description = "Early Macintosh emulator";
+    longDescription = ''
+      Snow emulates classic (Motorola 680x0-based) Macintosh computers. It features a graphical user interface to operate the emulated machine and provides extensive debugging capabilities. The aim of this project is to emulate the Macintosh on a hardware-level as much as possible, as opposed to emulators that patch the ROM or intercept system calls.
+      It currently emulates the Macintosh 128K, Macintosh 512K, Macintosh Plus, Macintosh SE, Macintosh Classic and Macintosh II.
+    '';
+    homepage = "https://snowemu.com/";
+    changelog = "https://github.com/twvd/snow/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nulleric ];
+    platforms = lib.platforms.linux;
+    mainProgram = "snowemu";
+  };
+})
diff --git a/pkgs/by-name/sn/snx-rs/package.nix b/pkgs/by-name/sn/snx-rs/package.nix
index ce2bda3d148f..f1d4cc30f42e 100644
--- a/pkgs/by-name/sn/snx-rs/package.nix
+++ b/pkgs/by-name/sn/snx-rs/package.nix
@@ -14,13 +14,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "snx-rs";
-  version = "4.8.2";
+  version = "4.8.3";
 
   src = fetchFromGitHub {
     owner = "ancwrd1";
     repo = "snx-rs";
     tag = "v${version}";
-    hash = "sha256-wVc3iddqXTpsBZqEY+WWR1Taig4crhlQqw7jypm3ZMc=";
+    hash = "sha256-On/uyGPK9TbhTAJ1qNi36g4y7AOkR0YYs7rgWGcmzUs=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     versionCheckHook
   ];
 
-  cargoHash = "sha256-HRew3ldsgUbCh4eW1MSvoxLZobSJRjj7Eg0+XRbjFes=";
+  cargoHash = "sha256-mnUlZlvGs1i5kGvChfsvN4AFpVBPXO+EJ2HyAsW0f9Y=";
 
   doInstallCheck = true;
   versionCheckProgram = "${placeholder "out"}/bin/snx-rs";
diff --git a/pkgs/by-name/so/socat/package.nix b/pkgs/by-name/so/socat/package.nix
index e208234f2332..f3e1774f6c48 100644
--- a/pkgs/by-name/so/socat/package.nix
+++ b/pkgs/by-name/so/socat/package.nix
@@ -38,8 +38,6 @@ stdenv.mkDerivation rec {
     readline
   ];
 
-  hardeningEnable = [ "pie" ];
-
   enableParallelBuilding = true;
 
   nativeCheckInputs = [
diff --git a/pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch b/pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch
new file mode 100644
index 000000000000..169bcfea6949
--- /dev/null
+++ b/pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch
@@ -0,0 +1,109 @@
+diff --git a/libsofia-sip-ua-glib/su-glib/Makefile.am b/libsofia-sip-ua-glib/su-glib/Makefile.am
+index 6f54d34..c5bfd82 100644
+--- a/libsofia-sip-ua-glib/su-glib/Makefile.am
++++ b/libsofia-sip-ua-glib/su-glib/Makefile.am
+@@ -20,12 +20,12 @@ AM_CPPFLAGS =		-I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \
+ 
+ noinst_LTLIBRARIES = 	libsu-glib.la
+ 
+-check_PROGRAMS = 	su_source_test torture_su_glib_timer
++check_PROGRAMS =
+ 
+ # ----------------------------------------------------------------------
+ # Tests
+ 
+-TESTS = 		su_source_test torture_su_glib_timer
++TESTS =
+ 
+ # ----------------------------------------------------------------------
+ # Rules for building the targets
+diff --git a/libsofia-sip-ua/nta/Makefile.am b/libsofia-sip-ua/nta/Makefile.am
+index c450fd1..4f322c3 100644
+--- a/libsofia-sip-ua/nta/Makefile.am
++++ b/libsofia-sip-ua/nta/Makefile.am
+@@ -26,9 +26,9 @@ AM_CPPFLAGS = 		-I$(srcdir)/../ipt -I../ipt \
+ noinst_LTLIBRARIES = 	libnta.la
+ 
+ check_PROGRAMS = 	check_nta test_nta_api test_nta portbind
+-dist_noinst_SCRIPTS =	run_test_nta_api run_test_nta
++dist_noinst_SCRIPTS =	run_test_nta_api
+ 
+-TESTS =			run_check_nta run_test_nta_api run_test_nta
++TESTS =			run_test_nta_api
+ 
+ TESTS_ENVIRONMENT =	$(SHELL)
+ 
+diff --git a/libsofia-sip-ua/nua/Makefile.am b/libsofia-sip-ua/nua/Makefile.am
+index 6b6dfaa..73ffd70 100644
+--- a/libsofia-sip-ua/nua/Makefile.am
++++ b/libsofia-sip-ua/nua/Makefile.am
+@@ -17,8 +17,8 @@ check_PROGRAMS =
+ TESTS =
+ 
+ if HAVE_CHECK
+-check_PROGRAMS +=	check_nua
+-TESTS += 		check_nua
++check_PROGRAMS +=
++TESTS +=
+ endif
+ 
+ # ----------------------------------------------------------------------
+diff --git a/libsofia-sip-ua/su/Makefile.am b/libsofia-sip-ua/su/Makefile.am
+index db3a331..0a31c72 100644
+--- a/libsofia-sip-ua/su/Makefile.am
++++ b/libsofia-sip-ua/su/Makefile.am
+@@ -20,7 +20,7 @@ check_PROGRAMS = 	torture_su torture_su_port \
+ 			torture_su_alloc torture_su_time torture_su_tag \
+ 			test_htable test_htable2 torture_rbtree torture_heap \
+ 			test_memmem torture_su_bm \
+-			torture_su_root torture_su_timer \
++			torture_su_timer \
+ 			test_su su_proxy test_poll $(OSXPROGS)
+ 
+ # ----------------------------------------------------------------------
+@@ -30,8 +30,8 @@ TESTS = 		torture_su torture_su_port \
+ 			torture_su_alloc torture_su_time torture_su_tag \
+ 			test_htable test_htable2 torture_rbtree torture_heap \
+ 			test_memmem torture_su_bm \
+-			torture_su_root torture_su_timer \
+-			run_addrinfo run_localinfo run_test_su \
++			torture_su_timer \
++			run_localinfo run_test_su \
+ 			$(OSXTESTS)
+ 
+ # ----------------------------------------------------------------------
+@@ -98,7 +98,7 @@ LDADD = 		libsu.la
+ # Install and distribution rules
+ 
+ EXTRA_DIST += 		su.docs \
+-			run_addrinfo run_localinfo run_test_su
++			run_localinfo run_test_su
+ 
+ dist_pkgdata_SCRIPTS = 	tag_dll.awk
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index cabc2b5..0184017 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -5,8 +5,8 @@
+ # Contact: Pekka Pessi <pekka.pessi@nokia.com>
+ # Licensed under LGPL. See file COPYING.
+ 
+-TESTS = test_nua
+-check_PROGRAMS = test_nua
++TESTS =
++check_PROGRAMS =
+ 
+ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c
+ 
+@@ -33,8 +33,8 @@ libtestproxy_a_SOURCES = test_proxy.h test_proxy.c
+ libtestnat_a_SOURCES =	test_nat.h test_nat.c test_nat_tags.c
+ 
+ if HAVE_CHECK
+-TESTS += check_dlopen_sofia check_sofia
+-check_PROGRAMS += check_dlopen_sofia check_sofia
++TESTS += check_dlopen_sofia
++check_PROGRAMS += check_dlopen_sofia
+ endif
+ 
+ check_sofia_CFLAGS = @CHECK_CFLAGS@
diff --git a/pkgs/by-name/so/sofia_sip/package.nix b/pkgs/by-name/so/sofia_sip/package.nix
index 05c37421286b..98b4dc63220a 100644
--- a/pkgs/by-name/so/sofia_sip/package.nix
+++ b/pkgs/by-name/so/sofia_sip/package.nix
@@ -3,45 +3,109 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch2,
+  gitUpdater,
+  testers,
+  autoconf,
+  automake,
+  check,
   glib,
+  libtool,
   openssl,
   pkg-config,
-  autoreconfHook,
+  valgrind,
+  zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sofia-sip";
   version = "1.13.17";
 
   src = fetchFromGitHub {
     owner = "freeswitch";
     repo = "sofia-sip";
-    rev = "v${version}";
-    sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
   };
 
   patches = [
     # Fix build with gcc 14 from https://github.com/freeswitch/sofia-sip/pull/249
     (fetchpatch2 {
       name = "sofia-sip-fix-incompatible-pointer-type.patch";
-      url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.diff";
-      hash = "sha256-4uZVtKnXG+BPW8byjd7tu4uEZo9SYq9EzTEvMwG0Bak=";
+      url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.patch?full_index=1";
+      hash = "sha256-bZzjg7GBxR2wSlPH81krZRCK43OirGLWH/lrLRZ0L0k=";
     })
+
+    # Disable some failing tests
+    # https://github.com/freeswitch/sofia-sip/issues/234
+    # run_addrinfo: Fails due to limited networking during build
+    # torture_su_root: Aborts with: bit out of range 0 - FD_SETSIZE on fd_set
+    # run_check_nta: Times out in client_2_1_1 test, which seems to test some connection protocol fallback thing
+    # run_test_nta: "no valid IPv6 addresses available", likely due to no networking in sandbox
+    # check_nua, check_sofia, test_nua: Times out no matter how much time is given to it
+    ./2001-sofia-sip-Disable-some-tests.patch
+  ];
+
+  # This actually breaks these tests, leading to bash trying to execute itself
+  # https://github.com/freeswitch/sofia-sip/issues/234
+  postPatch = ''
+    substituteInPlace libsofia-sip-ua/nta/Makefile.am \
+      --replace-fail 'TESTS_ENVIRONMENT =' '#TESTS_ENVIRONMENT ='
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkg-config
   ];
 
   buildInputs = [
     glib
     openssl
   ];
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
+
+  nativeCheckInputs = [
+    valgrind
   ];
 
-  meta = with lib; {
+  checkInputs = [
+    check
+    zlib
+  ];
+
+  preConfigure = ''
+    ./bootstrap.sh
+  '';
+
+  configureFlags = [
+    (lib.strings.enableFeature true "expensive-checks")
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      versionCheck = true;
+    };
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
+  };
+
+  meta = {
     description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
     homepage = "https://github.com/freeswitch/sofia-sip";
-    platforms = platforms.unix;
-    license = licenses.lgpl2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl2Plus;
+    teams = [ lib.teams.ngi ];
+    pkgConfigModules = [
+      "sofia-sip-ua"
+      "sofia-sip-ua-glib"
+    ];
   };
-}
+})
diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix
index a51249a1e827..da94b27f8806 100644
--- a/pkgs/by-name/so/soft-serve/package.nix
+++ b/pkgs/by-name/so/soft-serve/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "soft-serve";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
     rev = "v${version}";
-    hash = "sha256-Lg7cESGMbVCNx0KQBIAP/UsfvO3IO+DO9bYiQbg9Fls=";
+    hash = "sha256-qwUPRIOUFCsTuwRxFXSbGd3vwIwb8mEPlCX0em8OBBU=";
   };
 
   vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc=";
diff --git a/pkgs/by-name/so/softhsm/package.nix b/pkgs/by-name/so/softhsm/package.nix
index 9a7d3746d7cf..77a2e6a56f07 100644
--- a/pkgs/by-name/so/softhsm/package.nix
+++ b/pkgs/by-name/so/softhsm/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  botan2,
+  openssl,
   sqlite,
   autoreconfHook,
 }:
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-crypto-backend=botan"
-    "--with-botan=${lib.getDev botan2}"
+    "--with-crypto-backend=openssl"
+    "--with-openssl=${lib.getDev openssl}"
     "--with-objectstore-backend-db"
     "--sysconfdir=$out/etc"
     "--localstatedir=$out/var"
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    botan2
+    openssl
     sqlite
   ];
 
diff --git a/pkgs/by-name/so/sogo/package.nix b/pkgs/by-name/so/sogo/package.nix
index b36e3fea31f8..955724f9d660 100644
--- a/pkgs/by-name/so/sogo/package.nix
+++ b/pkgs/by-name/so/sogo/package.nix
@@ -25,14 +25,14 @@
 
 clangStdenv.mkDerivation rec {
   pname = "sogo";
-  version = "5.12.3";
+  version = "5.12.4";
 
   # always update the sope package as well, when updating sogo
   src = fetchFromGitHub {
     owner = "Alinto";
     repo = "sogo";
     rev = "SOGo-${version}";
-    hash = "sha256-HTfe/ZiipqS6QdKQK0wf4Xl6xCTNw5fEdXfRFbBMWMY=";
+    hash = "sha256-L79ABIABaVrO5Y3a3a30ZPyrhI/Nx+Bb5WjOvL0PI7s=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/soi/cmake-4-build.patch b/pkgs/by-name/so/soi/cmake-4-build.patch
new file mode 100644
index 000000000000..e0d18c3a70cd
--- /dev/null
+++ b/pkgs/by-name/so/soi/cmake-4-build.patch
@@ -0,0 +1,60 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index 1298088..73a5c2d 100644
+--- i/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ #CMake script for Spheres of Influence
+ #Run 'cmake <source_directory>' to generate a makefile
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.10)
+ 
+ #definitions
+ set(PROJECT_NAME "Spheres\ of\ Influence")
+ set(APP_NAME soi)
+-set(PROJECT_VERSION 0 1 2)
++set(PROJECT_VERSION "0.1.2")
+ set(DESCRIPTION "A physics-based 3D puzzle game")
+ set(README README.txt)
+ set(LICENSE ${README})
+@@ -52,7 +52,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+     "${CMAKE_SOURCE_DIR}/${EXTRA_MODULES_IN}")
+ 
+ #declare the project
+-project(${PROJECT_NAME})
++project(${PROJECT_NAME} VERSION ${PROJECT_VERSION})
+ 
+ #grab source files
+ file(GLOB_RECURSE HEADERS ${CMAKE_SOURCE_DIR}/src/*.h)
+@@ -105,18 +105,13 @@ endif()
+ #declare the target program
+ add_executable(${APP_NAME} ${SOURCES} ${EXTRA_SOURCES} ${HEADERS})
+ 
+-#extract the proper versioning breakdown
+-list(GET PROJECT_VERSION 0 VERSION_MAJOR )
+-list(GET PROJECT_VERSION 1 VERSION_MINOR )
+-list(GET PROJECT_VERSION 2 VERSION_PATCH )
+-
+ #add some useful preprocessor defines
+ set_property(
+     TARGET ${APP_NAME} PROPERTY COMPILE_DEFINITIONS
+     ${COMPILEDEFS}
+ #     PROJECT_NAME="${PROJECT_NAME}"
+ #     AUTHOR_NAMES="${AUTHORS}"
+-#     PROJECT_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
++#     PROJECT_VERSION="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+ )
+ 
+ #pass on the flags
+@@ -168,9 +163,9 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME})
+ set(CPACK_PACKAGE_DESCRIPTION_FILE ${README})
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${DESCRIPTION})
+ set(CPACK_PACKAGE_DESCRIPTION ${DESCRIPTION})
+-set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+-set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+-set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
++set(CPACK_PACKAGE_PROJECT_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
++set(CPACK_PACKAGE_PROJECT_VERSION_MINOR ${PROJECT_VERSION_MINOR})
++set(CPACK_PACKAGE_PROJECT_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+ #set(CPACK_PACKAGE_EXECUTABLES "${APP_NAME}";${PROJECT_NAME})
+ set(CPACK_RESOURCE_FILE_README ${README})
+ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/${LICENSE})
diff --git a/pkgs/games/soi/default.nix b/pkgs/by-name/so/soi/package.nix
similarity index 60%
rename from pkgs/games/soi/default.nix
rename to pkgs/by-name/so/soi/package.nix
index c99a422fe27d..fdf1a2995284 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/by-name/so/soi/package.nix
@@ -5,27 +5,27 @@
   cmake,
   boost,
   eigen2,
-  lua,
+  lua5_1,
   luabind,
   libGLU,
   libGL,
   SDL,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soi";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
-    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${finalAttrs.version}-Source.tar.bz2";
+    name = "soi-${finalAttrs.version}.tar.bz2";
     sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     boost
-    lua
+    lua5_1
     luabind
     libGLU
     libGL
@@ -37,12 +37,16 @@ stdenv.mkDerivation rec {
     "-DLUABIND_LIBRARY=${luabind}/lib/libluabind09.a"
   ];
 
-  meta = with lib; {
+  # CMake 2.6 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  patches = [ ./cmake-4-build.patch ];
+
+  meta = {
     description = "Physics-based puzzle game";
     mainProgram = "soi";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
     downloadPage = "https://sourceforge.net/projects/soi/files/";
   };
-}
+})
diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix
index 123dd1f43b53..0d54cdda4cff 100644
--- a/pkgs/by-name/so/sointu/package.nix
+++ b/pkgs/by-name/so/sointu/package.nix
@@ -6,21 +6,22 @@
   nix-update-script,
   alsa-lib,
   libGL,
+  libxcb,
   libxkbcommon,
   vulkan-headers,
   wayland,
   xorg,
 }:
 
-buildGoModule {
+buildGoModule rec {
   pname = "sointu";
-  version = "0.4.1-unstable-2025-08-13";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "vsariola";
     repo = "sointu";
-    rev = "74fea4138fd788eddeb726440c872937de56fd1c";
-    hash = "sha256-kHK35Bt/+ucPCsFE3p72J3jSHzhOK9QKtJPG+3grBvs=";
+    tag = "v${version}";
+    hash = "sha256-xHKD+zArsdQVffwbbSOOdzC6o5sxpez8VLAwIzV5X4E=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +31,7 @@ buildGoModule {
   buildInputs = [
     alsa-lib
     libGL
+    libxcb
     libxkbcommon
     vulkan-headers
     wayland
@@ -47,9 +49,7 @@ buildGoModule {
     "cmd/sointu-play"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Fork of 4klang that can target 386, amd64 and WebAssembly";
diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix
index 1b5af7fb121d..5b605e01541b 100644
--- a/pkgs/by-name/so/soju/package.nix
+++ b/pkgs/by-name/so/soju/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "soju";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "emersion";
     repo = "soju";
     rev = "v${version}";
-    hash = "sha256-qbSTaE0qOeXVcEmOver8Tu+gwV4cP4gNzIxByLKApCU=";
+    hash = "sha256-1kdaLmgikRbk/B+HGTMKnhqbTho4KmvDTuizhEE3DAw=";
   };
 
-  vendorHash = "sha256-JhoAtBw4O6lOd27dIXBNvA9EfUH5AD3ZHuGcWgU/Xv0=";
+  vendorHash = "sha256-NP4njea0hcklxWFoxPQqrvyWExeRP/TOzUJcamRnx+s=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index cb97b39c03d8..3a56b9282291 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation {
   pname = "solanum";
-  version = "0-unstable-2025-10-13";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "solanum-ircd";
     repo = "solanum";
-    rev = "2d483c6e3f0d33aef9447c17b3b55d3e86098831";
-    hash = "sha256-/84WXUqJTOMldIUJokPBNR4quU9YZM0PhWWWLAKoJsw=";
+    rev = "4544f823127c59951c7695f0f260128ee0691a67";
+    hash = "sha256-x+i4LUImepwIz5H13W5eNYl9GzgFvNGS1OSLVtl9qmE=";
   };
 
   patches = [
diff --git a/pkgs/by-name/so/solfege/package.nix b/pkgs/by-name/so/solfege/package.nix
index d3c8d113f75c..6098a00ac197 100644
--- a/pkgs/by-name/so/solfege/package.nix
+++ b/pkgs/by-name/so/solfege/package.nix
@@ -4,16 +4,21 @@
   autoconf,
   automake,
   csound,
+  docbook-xsl-ns,
   fetchurl,
   gdk-pixbuf,
   gettext,
+  ghostscript,
+  gnome-doc-utils,
   gobject-introspection,
   gtk3,
   librsvg,
+  libxslt,
   lilypond,
   mpg123,
   pkg-config,
   python3Packages,
+  swig,
   texinfo,
   timidity,
   txt2man,
@@ -46,10 +51,16 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [
     autoconf
     automake
+    docbook-xsl-ns
     gdk-pixbuf
     gettext
+    ghostscript
+    gnome-doc-utils
     gobject-introspection
+    libxslt
+    lilypond
     pkg-config
+    swig
     texinfo
     txt2man
     wrapGAppsHook3
@@ -65,6 +76,10 @@ python3Packages.buildPythonApplication rec {
     pygobject3
   ];
 
+  configureFlags = [
+    "--enable-docbook-stylesheet=${docbook-xsl-ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"
+  ];
+
   preBuild = ''
     sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
            -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
@@ -75,6 +90,10 @@ python3Packages.buildPythonApplication rec {
            default.config
   '';
 
+  postBuild = ''
+    make help/C/index.html
+  '';
+
   dontWrapGApps = true;
 
   preFixup = ''
diff --git a/pkgs/by-name/so/solo5/package.nix b/pkgs/by-name/so/solo5/package.nix
index 7f92d9d08b15..dc8f60578612 100644
--- a/pkgs/by-name/so/solo5/package.nix
+++ b/pkgs/by-name/so/solo5/package.nix
@@ -40,8 +40,6 @@ stdenv.mkDerivation {
     hash = "sha256-KbeY667Y/ZPUuRIGYOZMMAuVEVJ7Kn9UDUSThX5zfII=";
   };
 
-  hardeningEnable = [ "pie" ];
-
   configurePhase = ''
     runHook preConfigure
     sh configure.sh --prefix=/
diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix
index 5ccf8a275d3e..92b397f8d071 100644
--- a/pkgs/by-name/so/solvespace/package.nix
+++ b/pkgs/by-name/so/solvespace/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   wrapGAppsHook3,
@@ -24,7 +23,6 @@
   libspnav,
   libthai,
   libxkbcommon,
-  mimalloc,
   pangomm,
   pcre,
   util-linuxMinimal, # provides libmount
@@ -44,13 +42,6 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch";
-      hash = "sha256-XEeh6vb4fYsTmAro1ZR/8NyFl+Y+S+m/Lx+tA7o2omM=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -76,7 +67,6 @@ stdenv.mkDerivation rec {
     libspnav
     libthai
     libxkbcommon
-    mimalloc
     pangomm
     pcre
     util-linuxMinimal
diff --git a/pkgs/by-name/so/somatic-sniper/package.nix b/pkgs/by-name/so/somatic-sniper/package.nix
deleted file mode 100644
index e979fcee2cb7..000000000000
--- a/pkgs/by-name/so/somatic-sniper/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  zlib,
-  ncurses,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "somatic-sniper";
-  version = "1.0.5.0";
-
-  src = fetchFromGitHub {
-    owner = "genome";
-    repo = "somatic-sniper";
-    rev = "v${version}";
-    sha256 = "0lk7p9sp6mp50f6w1nppqhr40fcwy1asw06ivw8w8jvvnwaqf987";
-  };
-
-  patches = [ ./somatic-sniper.patch ];
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    zlib
-    ncurses
-  ];
-
-  enableParallelBuilding = false;
-
-  meta = with lib; {
-    description = "Identify single nucleotide positions that are different between tumor and normal";
-    mainProgram = "bam-somaticsniper";
-    license = licenses.mit;
-    homepage = "https://github.com/genome/somatic-sniper";
-    maintainers = with maintainers; [ jbedo ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch b/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
deleted file mode 100644
index 9af04c0a0696..000000000000
--- a/pkgs/by-name/so/somatic-sniper/somatic-sniper.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6d5a180..7254292 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH
-     )
- 
- include(TestHelper)
--include(VersionHelper)
-+#include(VersionHelper)
- include(ProjectHelper)
- 
- # NOTE: for sniper we want the exe suffix to be like 0.7.4, not just 0.7
-diff --git a/vendor/samtools.patch b/vendor/samtools.patch
-index f173017..654f878 100644
---- a/vendor/samtools.patch
-+++ b/vendor/samtools.patch
-@@ -6,7 +6,7 @@ diff -Nuar a/Makefile b/Makefile
-  
-  samtools:lib $(AOBJS)
- -		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -lz -L. -lbam
--+		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -L. -lbam -lz
-++		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) -lncurses -L. -lbam -lz
-  
-  razip:razip.o razf.o
-  		$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix
index 5cee1579ced7..b12fd045d89b 100644
--- a/pkgs/by-name/so/somo/package.nix
+++ b/pkgs/by-name/so/somo/package.nix
@@ -5,21 +5,23 @@
   fetchFromGitHub,
   installShellFiles,
   versionCheckHook,
+  libredirect,
+  iana-etc,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "somo";
-  version = "1.1.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "theopfr";
     repo = "somo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HUTaBSy3FemAQH1aKZYTJnUWiq0bU/H6c5Gz3yamPiA=";
+    hash = "sha256-k7PDCylA6KR/S1dQDSMIoOELPYwJ25dz1u+PM6ITGKg=";
   };
 
-  cargoHash = "sha256-e3NrEfbWz6h9q4TJnn8jnRmMJbeaEc4Yo3hFlaRLzzQ=";
+  cargoHash = "sha256-i3GmdBqCWPeslpr2zzOR4r8PgMP7EkC1mNFI7jSWO34=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -29,6 +31,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
+  nativeCheckInputs = [
+    libredirect.hook
+  ];
+
+  preCheck = ''
+    export NIX_REDIRECTS=/etc/services=${iana-etc}/etc/services
+  '';
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd somo \
       --bash <("$out/bin/somo" generate-completions bash) \
diff --git a/pkgs/applications/audio/sonic-lineup/match-vamp.patch b/pkgs/by-name/so/sonic-lineup/match-vamp.patch
similarity index 100%
rename from pkgs/applications/audio/sonic-lineup/match-vamp.patch
rename to pkgs/by-name/so/sonic-lineup/match-vamp.patch
diff --git a/pkgs/applications/audio/sonic-lineup/default.nix b/pkgs/by-name/so/sonic-lineup/package.nix
similarity index 84%
rename from pkgs/applications/audio/sonic-lineup/default.nix
rename to pkgs/by-name/so/sonic-lineup/package.nix
index 6d41c1cb7abb..4a95a4a89b96 100644
--- a/pkgs/applications/audio/sonic-lineup/default.nix
+++ b/pkgs/by-name/so/sonic-lineup/package.nix
@@ -23,17 +23,17 @@
   serd,
   sord,
   capnproto,
-  wrapQtAppsHook,
   pkg-config,
   libjack2,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sonic-lineup";
   version = "1.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2765/${pname}-${version}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2765/sonic-lineup-${finalAttrs.version}.tar.gz";
     sha256 = "0k45k9fawcm4s5yy05x00pgww7j8m7k2cxcc7g0fn9vqy7vcbq9h";
   };
 
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     capnproto # capnp
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   strictDeps = true;
@@ -86,12 +86,12 @@ stdenv.mkDerivation rec {
     sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-lineup.pro
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Comparative visualisation of related audio recordings";
     mainProgram = "sonic-lineup";
     homepage = "https://www.sonicvisualiser.org/sonic-lineup/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.vandenoever ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ vandenoever ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/by-name/so/sonic-visualiser/package.nix
similarity index 74%
rename from pkgs/applications/audio/sonic-visualiser/default.nix
rename to pkgs/by-name/so/sonic-visualiser/package.nix
index 636b902520d1..d78e3f0b1703 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/by-name/so/sonic-visualiser/package.nix
@@ -16,8 +16,6 @@
   libsndfile,
   pkg-config,
   libpulseaudio,
-  qtbase,
-  qtsvg,
   redland,
   rubberband,
   serd,
@@ -29,19 +27,19 @@
   libfishsound,
   libid3tag,
   opusfile,
-  wrapQtAppsHook,
   meson,
   ninja,
   cmake,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sonic-visualiser";
   version = "4.5.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2841/${pname}-${version}.tar.gz";
-    sha256 = "1sgg4m3035a03ldipgysz7zqfa9pqaqa4j024gyvvcwh4ml8iasr";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2841/sonic-visualiser-${finalAttrs.version}.tar.gz";
+    hash = "sha256-WauIaCWQs739IwJIorDCNymH//navxsbHUCVAUYl7+k=";
   };
 
   nativeBuildInputs = [
@@ -49,12 +47,12 @@ stdenv.mkDerivation rec {
     ninja
     cmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     libsndfile
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     fftw
     fftwFloat
     bzip2
@@ -82,11 +80,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "View and analyse contents of music audio files";
     homepage = "https://www.sonicvisualiser.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.marcweber ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ marcweber ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index bdcc44d62730..ccff9bc0cb01 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -17,9 +17,10 @@
   libopus,
   curl,
   gtk3,
-  webkitgtk_4_0,
+  nix-update-script,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "sonobus";
   version = "1.7.2";
@@ -32,10 +33,26 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = "sonobus";
+      desktopName = "Sonobus";
+      comment = "High-quality network audio streaming";
+      icon = "sonobus";
+      exec = "sonobus";
+      categories = [
+        "Audio"
+        "AudioVideo"
+      ];
+    })
+  ];
+
   nativeBuildInputs = [
     autoPatchelfHook
     cmake
     pkg-config
+    copyDesktopItems
   ];
 
   buildInputs = [
@@ -45,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     libopus
     curl
     gtk3
-    webkitgtk_4_0
   ];
 
   runtimeDependencies = [
@@ -72,16 +88,23 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
     cd ../linux
     ./install.sh "$out"
+
+    install -Dm444 $src/images/sonobus_logo_96.png $out/share/pixmaps/sonobus.png
+
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "High-quality network audio streaming";
     homepage = "https://sonobus.net/";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ PowerUser64 ];
-    platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      PowerUser64
+      l1npengtul
+    ];
+    platforms = lib.platforms.unix;
     mainProgram = "sonobus";
   };
 })
diff --git a/pkgs/by-name/so/sony-headphones-client/package.nix b/pkgs/by-name/so/sony-headphones-client/package.nix
index c17507fb6faf..96f02252e08e 100644
--- a/pkgs/by-name/so/sony-headphones-client/package.nix
+++ b/pkgs/by-name/so/sony-headphones-client/package.nix
@@ -56,6 +56,9 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Constants.h \
       --replace "UNKNOWN = -1" "// UNKNOWN removed since it doesn't fit in char"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/so/sorcer/package.nix b/pkgs/by-name/so/sorcer/package.nix
index baf38880f80e..d9a31a060864 100644
--- a/pkgs/by-name/so/sorcer/package.nix
+++ b/pkgs/by-name/so/sorcer/package.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     # Fix build with lv2 1.18: https://github.com/brummer10/guitarix/commit/c0334c72
     find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \
       -exec sed -i {} -e 's/const struct _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \;
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix
index 8f7f4cfa72d0..36627734a3ec 100644
--- a/pkgs/by-name/so/soundsource/package.nix
+++ b/pkgs/by-name/so/soundsource/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "soundsource";
-  version = "5.8.7";
+  version = "5.8.9";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20250920134707/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
-    hash = "sha256-amcHFv8aKahruqSr5cmGzDQJ80bwyrymQRZ+uY0hTXY=";
+    url = "https://web.archive.org/web/20251025135445/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
+    hash = "sha256-qjX+po4wOS2VzHfxSsVTysrFiP+ngoliler4RSM4dk8=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index 7c0f42fd610e..157feee1c4ad 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "11.9.0";
+  version = "12.1.1";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-POZRyex9eaa3F9ZlmIrVBDMBfvDM98drJdAvk2nkYSs=";
+    hash = "sha256-LZxH+S0Vv6ZzQM5BU9f5eqwspPZXxQmweUF/EmHj2IU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix
index 8aa53afedefe..d0ad1266047d 100644
--- a/pkgs/by-name/so/sourcepawn-studio/package.nix
+++ b/pkgs/by-name/so/sourcepawn-studio/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sourcepawn-studio";
-  version = "8.1.7";
+  version = "8.1.8";
 
   src = fetchFromGitHub {
     owner = "Sarrus1";
     repo = "sourcepawn-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f7mBsBITBmgoGfiAzdQpZQnSY/9WYJ91uCJxCu755tU=";
+    hash = "sha256-piUgAvU5tbsYydEiF+70BAZVBK2t6SzG18MLf9cN+xM=";
   };
 
-  cargoHash = "sha256-NQHetE5z8pgTtPjbc9PK3X4FEw7fL7n+ZGyzmQ5JBPM=";
+  cargoHash = "sha256-Cy8YPcmRWEyG6b4kouuj7KVmq2wBL8akw9v9sB30eF4=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -36,6 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://sarrus1.github.io/sourcepawn-studio/";
     changelog = "https://github.com/Sarrus1/sourcepawn-studio/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 })
diff --git a/pkgs/by-name/so/soxt/package.nix b/pkgs/by-name/so/soxt/package.nix
index f94c07c912a1..31fa46242c2f 100644
--- a/pkgs/by-name/so/soxt/package.nix
+++ b/pkgs/by-name/so/soxt/package.nix
@@ -1,5 +1,5 @@
 {
-  fetchhg,
+  fetchFromGitHub,
   lib,
   stdenv,
   cmake,
@@ -11,15 +11,16 @@
   libGL,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soxt";
-  version = "unstable-2019-06-14";
+  version = "1.4.2";
 
-  src = fetchhg {
-    url = "https://bitbucket.org/Coin3D/soxt";
-    rev = "85e135bb266fbb17e47fc336b876a576a239c15c";
-    sha256 = "0vk5cgn53yqf7csqdnlnyyhi4mbgx4wlsq70613p5fgxlvxzhcym";
-    fetchSubrepos = true;
+  src = fetchFromGitHub {
+    owner = "coin3d";
+    repo = "soxt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ji3rukL8QOErsjx06A61d65O5wxhw4jkEEKIa4EDhUg=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
@@ -32,11 +33,14 @@ stdenv.mkDerivation {
     libXmu
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "GUI binding for using Open Inventor with Xt/Motif";
-    maintainers = with maintainers; [ tmplt ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      tmplt
+      skohtv
+    ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index 6998bdc71f35..5de6064251c7 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sozu";
-  version = "1.0.6";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "sozu-proxy";
     repo = "sozu";
     rev = version;
-    hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w=";
+    hash = "sha256-a/Pna2l1gRv4kxIyGUuUHlN+lIQemGjZXwM65Ccc24Y=";
   };
 
-  cargoHash = "sha256-AIj59MqK+TqyTTDjGzN1Oec3svPaXRBkHJTBtxTwZNg=";
+  cargoHash = "sha256-9ZmlUUdtVAvri9v+EJb6vRQ7Yc3FjRwU5I5Xe8je9/c=";
 
   nativeBuildInputs = [ protobuf ];
 
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index e7180c74a156..7a00979d9b47 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -16,7 +16,7 @@
   ifuseSupport ? false,
   ifuse ? null,
   lsof,
-  udisks2,
+  udisks,
 }:
 
 stdenv.mkDerivation rec {
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     ffmpegthumbnailer
     jmtpfs
     lsof
-    udisks2
+    udisks
   ]
   ++ (lib.optionals ifuseSupport [ ifuse ]);
   # Introduced because ifuse doesn't build due to CVEs in libplist
diff --git a/pkgs/by-name/sp/spacebar/package.nix b/pkgs/by-name/sp/spacebar/package.nix
index dec0ec5dc6ac..2fcb62b97851 100644
--- a/pkgs/by-name/sp/spacebar/package.nix
+++ b/pkgs/by-name/sp/spacebar/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  apple-sdk_12,
 }:
 
 stdenv.mkDerivation rec {
@@ -16,10 +15,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-4LiG43kPZtsm7SQ/28RaGMpYsDshCaGvc1mouPG3jFM=";
   };
 
-  buildInputs = [
-    apple-sdk_12
-  ];
-
   installPhase = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1/
diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index e80d27277d94..19ad551ca32d 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "spacectl";
-  version = "1.16.1";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${version}";
-    hash = "sha256-elr7SG8naxz5w15Advr2tcQxPJ1tBL4G7Do7LNT4kqY=";
+    hash = "sha256-j9c8RZfm5RWcXAy8LUtIZrztfVhXiAWmCJ/Rwq5IiKo=";
   };
 
   vendorHash = "sha256-g5Y6NuG8z2Pnh3Ng690FcwOrEU2EOhftZbM8oUFj4B4=";
diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix
index 0aff7424ff30..c860633900f4 100644
--- a/pkgs/by-name/sp/spacer/package.nix
+++ b/pkgs/by-name/sp/spacer/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/samwho/spacer";
     changelog = "https://github.com/samwho/spacer/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "spacer";
   };
 }
diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index aa6c7cde6224..f2e2e3b689fc 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "4.19.0";
+  version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
     rev = "v${version}";
-    sha256 = "sha256-g0hiUyGVaUA9Jg5UHFEyf1ioUnMb2cp7tOrtTFLMtvc=";
+    sha256 = "sha256-zMazuPTwvbmtd6BIjD7oDJ3V4TGlUnxJT25Pe1TI3UY=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sp/sparrow/package.nix b/pkgs/by-name/sp/sparrow/package.nix
index 10d0ad29f679..2533b628abe7 100644
--- a/pkgs/by-name/sp/sparrow/package.nix
+++ b/pkgs/by-name/sp/sparrow/package.nix
@@ -301,7 +301,6 @@ stdenvNoCC.mkDerivation rec {
     ];
     license = licenses.asl20;
     maintainers = with maintainers; [
-      emmanuelrosa
       msgilligan
       _1000101
     ];
diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix
index 83fc98dbe95d..20abc59efc7d 100644
--- a/pkgs/by-name/sp/spdk/package.nix
+++ b/pkgs/by-name/sp/spdk/package.nix
@@ -10,6 +10,10 @@
   libaio,
   libbsd,
   libuuid,
+  nasm,
+  autoconf,
+  automake,
+  libtool,
   numactl,
   openssl,
   pkg-config,
@@ -76,24 +80,46 @@ stdenv.mkDerivation rec {
     ncurses
     zlib
     zstd
+    nasm
+    autoconf
+    automake
+    libtool
   ];
 
   propagatedBuildInputs = [
     python3.pkgs.configshell-fb
   ];
 
+  patches = [
+    # Otherwise the DPDK version is not detected correctly
+    # Fix already upstream: https://github.com/spdk/spdk/commit/c3618c42ac3f6fdfcc9c04e29953fd6cf4f71c11
+    ./patches/configure.patch
+  ];
+
   postPatch = ''
     patchShebangs .
     # Override pip install command to use hatchling directly without downloading dependencies
     substituteInPlace python/Makefile \
       --replace-fail "setup_cmd = pip install --prefix=\$(CONFIG_PREFIX)" \
                      "setup_cmd = python3 -m pip install --no-deps --no-build-isolation --prefix=\$(CONFIG_PREFIX)"
+
+    # The nasm detection in the vendored version of isa-l_crypto is broken
+    # Upstream fix: https://github.com/intel/isa-l_crypto/commit/0850c01cc03e45f77d5883372dd6be983ba163ce
+    substituteInPlace isa-l-crypto/configure.ac \
+      --replace-fail "AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0, k1, zmm1;]])])" \
+                     "AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0 {k1}, zmm1;]])])"
   '';
 
   enableParallelBuilding = true;
 
+  # Required for the vendored isa-l version to find nasm
+  preConfigure = ''
+    export AS=nasm
+  '';
+
   configureFlags = [
     "--with-dpdk=${dpdk'}"
+    "--with-crypto"
   ]
   ++ lib.optional (!stdenv.hostPlatform.isStatic) "--with-shared";
 
@@ -106,6 +132,15 @@ stdenv.mkDerivation rec {
   postInstall = ''
     unset patchelf
 
+    # Clean up rpaths to remove /build references to the vendored isa-l and isa-l_crypto libs
+    for f in $(find $out/lib $out/bin -executable -type f 2>/dev/null); do
+      if patchelf --print-rpath "$f" 2>/dev/null | grep /build; then
+        echo "Stripping rpath of $f"
+        newrp=$(patchelf --print-rpath "$f" | sed -r "s|/build[^:]*:||g")
+        patchelf --set-rpath "$newrp" "$f"
+      fi
+    done
+
     # SPDK scripts assume that they can read the includes also relative to the scripts.
     # Therefore we are not copying them into $out/share.
     mkdir $out/scripts
diff --git a/pkgs/by-name/sp/spdk/patches/configure.patch b/pkgs/by-name/sp/spdk/patches/configure.patch
new file mode 100644
index 000000000000..93c221058adc
--- /dev/null
+++ b/pkgs/by-name/sp/spdk/patches/configure.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure
+index b0fdef9ec..413b7a968 100755
+--- a/configure
++++ b/configure
+@@ -959,6 +959,9 @@
+ 		dpdk_ver=$(< "$rootdir/dpdk/VERSION")
+ 	elif [[ -f "${CONFIG[DPDK_DIR]}"/../VERSION ]]; then
+ 		dpdk_ver=$(< "${CONFIG[DPDK_DIR]}"/../VERSION)
++       elif [[ "${CONFIG[DPDK_LIB_DIR]}" != "" && -e "${CONFIG[DPDK_LIB_DIR]}"/pkgconfig ]]; then
++               # Try pkg-config to figure out the module version
++               dpdk_ver=$(PKG_CONFIG_PATH="${CONFIG[DPDK_LIB_DIR]}"/pkgconfig pkg-config --modversion libdpdk)
+ 	fi
+ 	echo $dpdk_ver
+ }
diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix
index ffb3afd5d841..a7026c6dcac6 100644
--- a/pkgs/by-name/sp/specr-transpile/package.nix
+++ b/pkgs/by-name/sp/specr-transpile/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sp/speedscope/package.nix b/pkgs/by-name/sp/speedscope/package.nix
index 4c75e2e21633..cfa8807566e7 100644
--- a/pkgs/by-name/sp/speedscope/package.nix
+++ b/pkgs/by-name/sp/speedscope/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "speedscope";
-  version = "1.23.1";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "jlfwong";
     repo = "speedscope";
     tag = "v${version}";
-    hash = "sha256-PIyx4ceihTSLRDP5MW3n6edtYNFOnx8Uo7qUWW7LTs8=";
+    hash = "sha256-QL+Hm3ujfZeKHMoNgQdxYStgWOIbxjDmXMHKnWddTfs=";
 
     # scripts/prepack.sh wants to extract the git commit from .git
     # We don't want to keep .git for reproducibility reasons, so save the commit
@@ -25,7 +25,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-xpFrkKAaFbVE1zJ/haibQte4HjUWmeBR8BVjZuSoyjI=";
+  npmDepsHash = "sha256-MgCIiVeq9w5XRPIsZ/9AbZpVwRQdzZgK7VC5Gl7cn78=";
 
   patches = [
     ./fix-shebang.patch
diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix
index 0ebaefd3550f..5ff36e44fdbd 100644
--- a/pkgs/by-name/sp/spek/package.nix
+++ b/pkgs/by-name/sp/spek/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Analyse your audio files by showing their spectrogram";
-    homepage = "http://spek.cc/";
+    homepage = "https://www.spek.cc/";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ bjornfor ];
     platforms = lib.platforms.all;
diff --git a/pkgs/by-name/sp/sphinx-lint/package.nix b/pkgs/by-name/sp/sphinx-lint/package.nix
index ed3d8ca6cceb..3b2e3f999bad 100644
--- a/pkgs/by-name/sp/sphinx-lint/package.nix
+++ b/pkgs/by-name/sp/sphinx-lint/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sphinx-lint";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sphinx-contrib";
     repo = "sphinx-lint";
     tag = "v${version}";
-    hash = "sha256-VM8PyUZVQQFdXLR14eN7+hPT/iGOVHG6s1bcac4MPo4=";
+    hash = "sha256-9xqGb/RdaySTys3gjIU0GJSqGOWXQQ/NeSRS8dmx5lg=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix
index ca09384217c3..8668d971de5e 100644
--- a/pkgs/by-name/sp/spicedb/package.nix
+++ b/pkgs/by-name/sp/spicedb/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.46.0";
+  version = "1.46.2";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     tag = "v${version}";
-    hash = "sha256-laLUhJkD4XbwKo4wjngBN1PkDpt2fHgMmVv2JTzZl6Q=";
+    hash = "sha256-4/6u/yYlPB85Et+9Bkv6qsVwIvhHoyvkbYkEtbRdDVM=";
   };
 
-  vendorHash = "sha256-XqXbQYUAQiOZ0MjWwFSRe0suaQzXb6KQb+KoGAvvceM=";
+  vendorHash = "sha256-WICi1OPVLrawmo6zW4hOygf0UXsdtuuwl6Cp78yCC9c=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.tag}'"
diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index a93cd5a902ae..cd8e094daf05 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spider";
-  version = "2.37.159";
+  version = "2.37.165";
 
   src = fetchFromGitHub {
     owner = "spider-rs";
     repo = "spider";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5e6PK+PQnIEm7qpJGW8kmO6GugQMU3phWIsqFSGIj48=";
+    hash = "sha256-gwLm4bruiT7JXqS3bvYRVMHO5TLw1wvFWIfbewsnEGY=";
   };
 
-  cargoHash = "sha256-ffT8SQh6CjIqxMSGahGSiUha1e8wwUbbC3eTEUMx14s=";
+  cargoHash = "sha256-teZzDOsIDoUcGwCdY5P+/wdbI1hkfKkwNO+9VrIqdCA=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index 2275712444c6..ac6d592ff42b 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "spire";
-  version = "1.13.1";
+  version = "1.13.2";
 
   outputs = [
     "out"
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
     owner = "spiffe";
     repo = "spire";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-1i2zT2oTJXMmISzUc4ixlZQjtjCcqUEi6RzgF9Zwm9s=";
+    sha256 = "sha256-iZMeD5ZwWKjY9mfuXgEgh+QLotmv28T8xBgpKoQTgxw=";
   };
 
   vendorHash = "sha256-tho3Qm9uHiiSNFmBZGZFgxhAKD4HKWsIUmiqkWlToQk=";
@@ -99,6 +99,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       fkautz
       jk
+      mjm
     ];
   };
 })
diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix
index 4f721392245f..ecc7dd1219fe 100644
--- a/pkgs/by-name/sp/spirv-cross/package.nix
+++ b/pkgs/by-name/sp/spirv-cross/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-cross";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Cross";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-qmJK29PtjDE4+6uF8Mj6noAcRoeM3rHWRbUvcr6JzI0=";
+    hash = "sha256-Fq2Kw8KOlh35hRZy5EnPtWAjazun4vdTk/HyhY76GRM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix
index 8a4f92e9dfb2..400c8244a344 100644
--- a/pkgs/by-name/sp/spirv-headers/package.nix
+++ b/pkgs/by-name/sp/spirv-headers/package.nix
@@ -5,18 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-headers";
-  version = "1.4.321.0-unstable-2025-06-24";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    # The release for Vulkan SDK 1.4.321.0 is missing a PR required for
-    # LLVM 21 support in SPIRV-LLVM-Translator; return to the
-    # `vulkan-sdk-*` tags on the next stable release.
-    rev = "9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e";
-    hash = "sha256-N8NBAkkpOcbgap4loPJJW6E5bjG+TixCh/HN259RyjI=";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -27,4 +24,4 @@ stdenv.mkDerivation {
     license = licenses.mit;
     maintainers = [ maintainers.ralith ];
   };
-}
+})
diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix
index afd55c4dc742..03b10d0abcd9 100644
--- a/pkgs/by-name/sp/spirv-tools/package.nix
+++ b/pkgs/by-name/sp/spirv-tools/package.nix
@@ -7,18 +7,15 @@
   spirv-headers,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-tools";
-  version = "1.4.321.0-unstable-2025-06-25";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    # The SPIRV-Headers release for Vulkan SDK 1.4.321.0 is missing
-    # a PR required for LLVM 21 support in SPIRV-LLVM-Translator;
-    # return to the `vulkan-sdk-*` tags on the next stable release.
-    rev = "28a883ba4c67f58a9540fb0651c647bb02883622";
-    hash = "sha256-yRzpEBGyTr9oovsh3TUnJsR/luHNAPkotcJFWh7R1Fc=";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-NXxC5XLvEEIAlA0sym6l7vWj+g8pJ4trsJI3pmZwRxU=";
   };
 
   # The cmake options are sufficient for turning on static building, but not
@@ -60,4 +57,4 @@ stdenv.mkDerivation {
     platforms = with platforms; unix ++ windows;
     maintainers = [ maintainers.ralith ];
   };
-}
+})
diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix
index ae922f857449..428cee00d8b1 100644
--- a/pkgs/by-name/sp/splash/package.nix
+++ b/pkgs/by-name/sp/splash/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "splash";
-  version = "3.11.5";
+  version = "3.11.6";
 
   src = fetchFromGitHub {
     owner = "danieljprice";
     repo = "splash";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Zvg8QOpRBb9VmuJCKhwAxy0k04a4FOWDHfgFmIV9ruk=";
+    hash = "sha256-cnvsxHaTuz0xKOlGfWtjZDd/RDxNuurTNk03pTGYs78=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix
index 7ddd877842d3..d83526beb9bc 100644
--- a/pkgs/by-name/sp/splayer/package.nix
+++ b/pkgs/by-name/sp/splayer/package.nix
@@ -12,14 +12,14 @@
 }:
 stdenv.mkDerivation (final: {
   pname = "splayer";
-  version = "3.0.0-beta.2";
+  version = "3.0.0-beta.3";
 
   src = fetchFromGitHub {
     owner = "imsyy";
     repo = "SPlayer";
     tag = "v${final.version}";
     fetchSubmodules = false;
-    hash = "sha256-q4jMwIILuz9Uci/1m429Y5tHE2rkfxctu9QCA8jrJkk=";
+    hash = "sha256-bfxIIp8Ma52SEhlQirxnqKwG2ivpEOlCZGoQ2rQldYQ=";
   };
 
   pnpm = pnpm_10;
@@ -27,7 +27,7 @@ stdenv.mkDerivation (final: {
   pnpmDeps = final.pnpm.fetchDeps {
     inherit (final) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-lA08+i+SpMB95MAi/N5mxbcBed0FRchroT5e2nwnXuA=";
+    hash = "sha256-tHz4RtXnoFbSXqV84e6FxHLRHeDyR5sCmVPL0vRNIY8=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (final: {
 
     npm exec electron-builder -- \
         --dir \
-        --config electron-builder.yml \
+        --config electron-builder.config.ts \
         -c.electronDist=${electron.dist} \
         -c.electronVersion=${electron.version}
 
diff --git a/pkgs/by-name/sp/splitcode/package.nix b/pkgs/by-name/sp/splitcode/package.nix
index 7de43dca3747..47c43e745c40 100644
--- a/pkgs/by-name/sp/splitcode/package.nix
+++ b/pkgs/by-name/sp/splitcode/package.nix
@@ -7,18 +7,15 @@
   zlib,
   nix-update-script,
 }:
-let
-  version = "0.31.3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "splitcode";
-  inherit version;
+  version = "0.31.4";
 
   src = fetchFromGitHub {
     owner = "pachterlab";
     repo = "splitcode";
-    tag = "v${version}";
-    hash = "sha256-EEYjBo52jPCSnv5WSGsXhfZEjsBCHdGerVPOZfShXBU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jaZptrF5HSQSe2KQdBNPprhsVZ2FSudZFgWPn9zQq3A=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -28,6 +25,12 @@ stdenv.mkDerivation {
     zlib
   ];
 
+  postPatch = ''
+    # https://github.com/pachterlab/splitcode/pull/46
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 2.8.12 3.10
+  '';
+
   doCheck = true;
   checkPhase = ''
     mkdir func_tests
@@ -49,4 +52,4 @@ stdenv.mkDerivation {
       "aarch64-linux"
     ];
   };
-}
+})
diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix
index faff6ff7b5e8..e1b2e3984899 100644
--- a/pkgs/by-name/sp/spotdl/package.nix
+++ b/pkgs/by-name/sp/spotdl/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "spotdl";
-  version = "4.4.2";
+  version = "4.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     tag = "v${version}";
-    hash = "sha256-guQ8fIA20wtCkB5CkU7zg/INE+g8/fvQfIs5TNteQGo=";
+    hash = "sha256-opbbcYjsR+xuo2uQ7Ic/2+BfkiwdEe1xD/whRonDBWo=";
   };
 
   build-system = with python3Packages; [ hatchling ];
@@ -50,8 +50,8 @@ python3Packages.buildPythonApplication rec {
     pyfakefs
     pytest-mock
     pytest-subprocess
-    pytest-vcr
     pytestCheckHook
+    vcrpy
     writableTmpDirAsHomeHook
   ];
 
@@ -65,6 +65,8 @@ python3Packages.buildPythonApplication rec {
     "tests/utils/test_m3u.py"
     "tests/utils/test_metadata.py"
     "tests/utils/test_search.py"
+    # TypeError: 'LocalPath' object is not subscriptable
+    "tests/utils/test_config.py"
   ];
 
   disabledTests = [
diff --git a/pkgs/applications/audio/spotify-qt/default.nix b/pkgs/by-name/sp/spotify-qt/package.nix
similarity index 79%
rename from pkgs/applications/audio/spotify-qt/default.nix
rename to pkgs/by-name/sp/spotify-qt/package.nix
index 5d81c51ddbd7..95829d972ec2 100644
--- a/pkgs/applications/audio/spotify-qt/default.nix
+++ b/pkgs/by-name/sp/spotify-qt/package.nix
@@ -4,10 +4,8 @@
   lib,
   cmake,
   libxcb,
-  qtbase,
-  qtsvg,
-  wrapQtAppsHook,
   procps,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -17,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "kraxarn";
     repo = "spotify-qt";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-R6ucuQdntc1OxDCV8jDAlyjAo/393HN7fjRJH70OdNs=";
   };
 
@@ -28,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libxcb
-    qtbase
-    qtsvg
+    kdePackages.qtbase
+    kdePackages.qtsvg
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   cmakeFlags = [ (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "") ];
@@ -47,12 +45,12 @@ stdenv.mkDerivation (finalAttrs: {
     ln $out/Applications/spotify-qt.app/Contents/MacOS/spotify-qt $out/bin/spotify-qt
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight unofficial Spotify client using Qt";
     mainProgram = "spotify-qt";
     homepage = "https://github.com/kraxarn/spotify-qt";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iivusly ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ iivusly ];
+    platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix
index 3620e348bdbd..eb755a90b8bc 100644
--- a/pkgs/by-name/sp/spotify/darwin.nix
+++ b/pkgs/by-name/sp/spotify/darwin.nix
@@ -11,7 +11,7 @@
 stdenv.mkDerivation {
   inherit pname;
 
-  version = "1.2.74.477";
+  version = "1.2.75.510";
 
   src =
     # WARNING: This Wayback Machine URL redirects to the closest timestamp.
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
     # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg
     if stdenv.hostPlatform.isAarch64 then
       (fetchurl {
-        url = "https://web.archive.org/web/20251010104459/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-0gwoptqLBJBM0qJQ+dGAZdCD6WXzDJEs0BfOxz7f2nQ=";
+        url = "https://web.archive.org/web/20251029235406/https://download.scdn.co/SpotifyARM64.dmg";
+        hash = "sha256-gEZxRBT7Jo2m6pirf+CreJiMeE2mhIkpe9Mv5t0RI58=";
       })
     else
       (fetchurl {
-        url = "https://web.archive.org/web/20251010104433/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-8CrhLbnswbuAjRMaan2cTnnOMsr3vpW92IQ00KwPUHo=";
+        url = "https://web.archive.org/web/20251029235833/https://download.scdn.co/Spotify.dmg";
+        hash = "sha256-fhQYm7yMrlvY57gMuWGU31EbWidZ2l9bd44mhokZKTw=";
       });
 
   nativeBuildInputs = [ undmg ];
diff --git a/pkgs/by-name/sp/spotifyd/package.nix b/pkgs/by-name/sp/spotifyd/package.nix
index e76e0950d852..639c448b9a78 100644
--- a/pkgs/by-name/sp/spotifyd/package.nix
+++ b/pkgs/by-name/sp/spotifyd/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   config,
   alsa-lib,
-  apple-sdk_11,
   cmake,
   dbus,
   fetchFromGitHub,
@@ -42,8 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs =
-    lib.optionals stdenv.hostPlatform.isDarwin [ apple-sdk_11 ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
+    lib.optionals stdenv.hostPlatform.isLinux [ openssl ]
     # The `dbus_mpris` feature works on other platforms, but only requires `dbus` on Linux
     ++ lib.optional (withMpris && stdenv.hostPlatform.isLinux) dbus
     ++ lib.optional (withALSA || withJack) alsa-lib
diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix
index f9c639a4bfe9..7252b94f43ed 100644
--- a/pkgs/by-name/sq/sqlcl/package.nix
+++ b/pkgs/by-name/sq/sqlcl/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlcl";
-  version = "25.2.2.199.0918";
+  version = "25.3.0.274.1210";
 
   src = fetchurl {
     url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
-    hash = "sha256-YsIEJkQXeVIABsCXNBfT6WZbrXur1hoEZFj97JvGHV8=";
+    hash = "sha256-TOKTvBFoUFDqN7qjq6yYYBh0bfS66kks243q6+5+i6c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index ca712c439a02..6ef35827f569 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "3.1.15";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-WwoMneXE4ZTv/Gbzq6+XuOkJ67fSeIwweMkahB1jIdU=";
+    hash = "sha256-nzWOVB66gASKh3AWoyifjGJ2H17G4RRv51Lqo01p1pw=";
   };
 
   proxyVendor = true;
diff --git a/pkgs/by-name/sq/sqlfluff/package.nix b/pkgs/by-name/sq/sqlfluff/package.nix
index 40b6a82d5329..cf1d4b457919 100644
--- a/pkgs/by-name/sq/sqlfluff/package.nix
+++ b/pkgs/by-name/sq/sqlfluff/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "3.4.2";
+  version = "3.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlfluff";
     repo = "sqlfluff";
     tag = version;
-    hash = "sha256-Cf4nrINpe5Kr2JYwcTYx1oO+E6ydlBs0W7F4Mh7ITAs=";
+    hash = "sha256-fO4a1DCDM5RCeaPUHtPPGgTtZPRHOl9nuxbipDJZy7A=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/sq/sqlite-web/package.nix b/pkgs/by-name/sq/sqlite-web/package.nix
index b1128260999b..eaf4e3a0ea4d 100644
--- a/pkgs/by-name/sq/sqlite-web/package.nix
+++ b/pkgs/by-name/sq/sqlite-web/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sqlite-web";
-  version = "0.6.4";
+  version = "0.6.5";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5Bdd1C9M3HjvfDKdVvGSQ+/I0Iimvf1MZwPonRiqwqU=";
+    hash = "sha256-/Asqu2XEVCS5sFW2GB/W/int1gCZIIgZq8yrevoQ7Yo=";
   };
 
   build-system = with python3Packages; [ setuptools ];
diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
index a43e0ed50178..bef63a5b00e4 100644
--- a/pkgs/by-name/sq/sqlpage/package.nix
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -4,30 +4,35 @@
   fetchFromGitHub,
   pkg-config,
   sqlite,
+  unixODBC,
   zstd,
   fetchurl,
 }:
 
 let
   apexcharts = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/apexcharts@4.5.0/dist/apexcharts.min.js";
-    hash = "sha256-D19uY7rZtzJPVsZWYpvTOoY2hXmgfg+Mlaf+ALYHTgg=";
+    url = "https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js";
+    hash = "sha256-OtfH8igG4/XVMWV1155dCl8kGhruowISVUm7ZZF0VwU=";
   };
   tablerCss = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler.min.css";
-    hash = "sha256-aO+4ZoyNPZHCexbbprDYU9LCxshqszQA0SINFYfos3M=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css";
+    hash = "sha256-fvdQvRBUamldCxJ2etgEi9jz7F3n2u+xBn+dDao9HJo=";
+  };
+  tomSelectCss = fetchurl {
+    url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css";
+    hash = "sha256-vW5UjM/Ka9/jIY8I5s5KcudaTRWh/cCGE1ZUsrJvlI0=";
   };
   tablerVendorsCss = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler-vendors.min.css";
-    hash = "sha256-MyRhKcnB54KIswGkkyYXzEjx3YPVTKG7zVBf4wE20QY=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css";
+    hash = "sha256-/VPz9GtiH1Es1KGLY706UIayEEgG93B6aIBa3WzwKYc=";
   };
   tablerJs = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/js/tabler.min.js";
-    hash = "sha256-QoGNzPGpYrbyDynQUZxmnFFT8MEk/nkUCLyp71avhqw=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js";
+    hash = "sha256-tgx2Fg6XYkV027jPEKvmrummSTtgCW/fwV3R3SvZnrk=";
   };
   tablerIcons = fetchurl {
-    url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.30.0/dist/tabler-sprite.svg";
-    hash = "sha256-CD5BvpwW4Db6C7bxjaWUrA3kz17BDJKVU4bTwOPP1kE=";
+    url = "https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg";
+    hash = "sha256-pCPkhrx0GnPg5/EthJ7pLdMxb7wbYMJ0R7WchDcffpg=";
   };
   tomselect = fetchurl {
     url = "https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js";
@@ -35,55 +40,59 @@ let
   };
 in
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sqlpage";
-  version = "0.34.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "SQLpage";
-    tag = "v${version}";
-    hash = "sha256-cqMXdAXc46DbbONz1A6uf2Oo2Cu4sig6ntuLqYlihR4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-M9WtpDc067G/EfRTJBoDxBrdXRMqOwVTdGgyXSdHlhE=";
   };
 
   postPatch = ''
     substituteInPlace sqlpage/apexcharts.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@4.5.0/dist/apexcharts.min.js */' \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/apexcharts@5.3.0/dist/apexcharts.min.js */' \
       "$(cat ${apexcharts})"
     substituteInPlace sqlpage/sqlpage.css \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler.min.css */' \
-      "$(cat ${tablerCss})"
-    substituteInPlace sqlpage/sqlpage.css \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/css/tabler-vendors.min.css */' \
-      "$(cat ${tablerVendorsCss})"
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler.min.css */' \
+      "$(cat ${tablerCss})" \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/css/tabler-vendors.min.css */' \
+      "$(cat ${tablerVendorsCss})" \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.3/dist/css/tom-select.bootstrap5.css */' \
+      "$(cat ${tomSelectCss})"
     substituteInPlace sqlpage/sqlpage.js \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0/dist/js/tabler.min.js */' \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/core@1.4.0/dist/js/tabler.min.js */' \
       "$(cat ${tablerJs})"
     substituteInPlace sqlpage/tabler-icons.svg \
-      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.30.0/dist/tabler-sprite.svg */' \
+      --replace-fail '/* !include https://cdn.jsdelivr.net/npm/@tabler/icons-sprite@3.34.0/dist/tabler-sprite.svg */' \
       "$(cat ${tablerIcons})"
     substituteInPlace sqlpage/tomselect.js \
       --replace-fail '/* !include https://cdn.jsdelivr.net/npm/tom-select@2.4.1/dist/js/tom-select.popular.min.js */' \
       "$(cat ${tomselect})"
   '';
 
-  cargoHash = "sha256-NUbCSYUTXN8glw94Lr/+Jj54PukRXFlzTxq0d7znjwA=";
+  cargoHash = "sha256-lUQ1j2f/LXpqpb6VK4Bq2NI0L9KoyEdlPkENMOKkt0w=";
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
     sqlite
+    unixODBC
     zstd
   ];
 
   env.ZSTD_SYS_USE_PKG_CONFIG = true;
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "SQL-only webapp builder, empowering data analysts to build websites and applications quickly";
     homepage = "https://github.com/lovasoa/SQLpage";
-    changelog = "https://github.com/lovasoa/SQLpage/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/lovasoa/SQLpage/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dit7ya ];
     mainProgram = "sqlpage";
   };
-}
+})
diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index 7d33a4abff0d..ed953ff47fbf 100644
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "squid";
-  version = "7.1";
+  version = "7.3";
 
   src = fetchurl {
     url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
       builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }/squid-${finalAttrs.version}.tar.xz";
-    hash = "sha256-djtaeFYc7cTkdjT6QrjmuNRsh8lJoVG056wjltL5feo=";
+    hash = "sha256-2twqmjkmzhs7q+qnp9eyHLsIkCWHbao/XBnn62OR3c0=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/sq/squirreldisk/package.nix b/pkgs/by-name/sq/squirreldisk/package.nix
index bcc10d9b8dee..3624e7e84cb1 100644
--- a/pkgs/by-name/sq/squirreldisk/package.nix
+++ b/pkgs/by-name/sq/squirreldisk/package.nix
@@ -19,7 +19,6 @@
   libsoup_2_4,
   openssl,
   parallel-disk-usage,
-  webkitgtk_4_0,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -82,7 +81,7 @@ rustPlatform.buildRustPackage rec {
     gtk3
     libsoup_2_4
     openssl
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   # Disable checkPhase, since the project doesn't contain tests
@@ -102,6 +101,8 @@ rustPlatform.buildRustPackage rec {
     '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Cross-platform disk usage analysis tool";
     homepage = "https://www.squirreldisk.com/";
     license = licenses.agpl3Only;
diff --git a/pkgs/by-name/sr/srb2kart/package.nix b/pkgs/by-name/sr/srb2kart/package.nix
index adfb3aff654d..42e00c935189 100644
--- a/pkgs/by-name/sr/srb2kart/package.nix
+++ b/pkgs/by-name/sr/srb2kart/package.nix
@@ -27,24 +27,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5sIHdeenWZjczyYM2q+F8Y1SyLqL+y77yxYDUM3dVA0=";
   };
 
-  assets = stdenv.mkDerivation {
-    pname = "srb2kart-data";
-    version = finalAttrs.version;
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
 
-    src = fetchzip {
-      url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip";
-      hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4=";
-      stripRoot = false;
-    };
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/share/srb2kart
-      cp -r * $out/share/srb2kart
-
-      runHook postInstall
-    '';
+  assets = fetchzip {
+    name = "srb2kart-data";
+    url = "https://github.com/STJr/Kart-Public/releases/download/v${finalAttrs.version}/AssetsLinuxOnly.zip";
+    hash = "sha256-yaVdsQUnyobjSbmemeBEyu35GeZCX1ylTRcjcbDuIu4=";
+    stripRoot = false;
   };
 
   nativeBuildInputs = [
@@ -64,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}/share/srb2kart"
+    "-DSRB2_ASSET_DIRECTORY=${finalAttrs.assets}"
     "-DGME_INCLUDE_DIR=${game-music-emu}/include"
     "-DSDL2_MIXER_INCLUDE_DIR=${lib.getDev SDL2_mixer}/include/SDL2"
     "-DSDL2_INCLUDE_DIR=${lib.getDev SDL2}/include/SDL2"
@@ -91,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm755 bin/srb2kart $out/bin/srb2kart
 
     wrapProgram $out/bin/srb2kart \
-      --set SRB2WADDIR "${finalAttrs.assets}/share/srb2kart"
+      --set-default SRB2WADDIR ${finalAttrs.assets}
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 85bd208dd5fc..7c8a750e39b3 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -44,7 +44,6 @@ buildGoModule rec {
     changelog = "https://github.com/sourcegraph/src-cli/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      figsoda
       keegancsmith
     ];
     mainProgram = "src";
diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix
index b9c1f004d7df..5e31229127d7 100644
--- a/pkgs/by-name/ss/sscg/package.nix
+++ b/pkgs/by-name/ss/sscg/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sscg";
-  version = "3.0.8";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "sgallagher";
     repo = "sscg";
     tag = "sscg-${finalAttrs.version}";
-    hash = "sha256-vHZuBjFs7sGIMGFWyqaW0SzzDDsrszlLmLREJtjLH2g=";
+    hash = "sha256-Z/Cea9m2v+M+t69gx/Y6IGAUZ/p5ZsTA80+fvUvqvYc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ss/sse2neon/package.nix b/pkgs/by-name/ss/sse2neon/package.nix
index fc5ec88908dc..7b4420e62f82 100644
--- a/pkgs/by-name/ss/sse2neon/package.nix
+++ b/pkgs/by-name/ss/sse2neon/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  pkg-config,
   stdenv,
 }:
 
@@ -16,24 +15,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-vb9k+KjiGodVngza0R18LjfPTlsqFbzqXZqefm6KHj0=";
   };
 
-  postPatch = ''
-    # remove warning about gcc < 10
-    substituteInPlace sse2neon.h --replace-fail "#warning \"GCC versions" "// "
-  '';
+  doCheck = true;
 
-  nativeBuildInputs = [ pkg-config ];
+  installPhase = ''
+    runHook preInstall
 
-  dontInstall = true;
-  # use postBuild instead of installPhase, because the build
-  # in itself doesn't produce any ($out) output
-  postBuild = ''
-    mkdir -p $out/lib
-    install -m444 sse2neon.h $out/lib/
+    install -Dm644 sse2neon.h $out/include/sse2neon.h
+
+    runHook postInstall
   '';
 
   meta = {
-    description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
-    homepage = "https://www.mono-project.com/docs/gui/libgdiplus/";
+    description = "C/C++ header file that converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics";
+    homepage = "https://github.com/DLTcollab/sse2neon";
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.gador ];
diff --git a/pkgs/by-name/ss/sshesame/package.nix b/pkgs/by-name/ss/sshesame/package.nix
index 1b0b5daf257d..6814abb0ef8a 100644
--- a/pkgs/by-name/ss/sshesame/package.nix
+++ b/pkgs/by-name/ss/sshesame/package.nix
@@ -24,8 +24,6 @@ buildGoModule rec {
     "-w"
   ];
 
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/ss/sshwifty/package.nix b/pkgs/by-name/ss/sshwifty/package.nix
index 934fc1a2186e..f7a9298884bf 100644
--- a/pkgs/by-name/ss/sshwifty/package.nix
+++ b/pkgs/by-name/ss/sshwifty/package.nix
@@ -10,20 +10,20 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "sshwifty";
-  version = "0.4.0-beta-release";
+  version = "0.4.1-beta-release";
 
   src = fetchFromGitHub {
     owner = "nirui";
     repo = "sshwifty";
     tag = finalAttrs.version;
-    hash = "sha256-7ZfS46+aflKIQ8S9T18JjCb7bY8mB6cJl/lgJi5Hukg=";
+    hash = "sha256-Kg5aE4lkzSedo+VJgdsfO5XTKupsPU2DhZNdNhEQ/Q4=";
   };
 
   sshwifty-ui = buildNpmPackage {
     pname = "sshwifty-ui";
     inherit (finalAttrs) version src;
 
-    npmDepsHash = "sha256-I96VixL21cF2kp9AK6q0ipjphjdWuSETKakbsprGek0=";
+    npmDepsHash = "sha256-vX3CtjwjzcxxIPYG6QXsPybyBRow1YdS9pHr961P1HA=";
 
     npmBuildScript = "generate";
 
@@ -39,7 +39,7 @@ buildGo125Module (finalAttrs: {
     cp -r ${finalAttrs.sshwifty-ui}/lib/node_modules/sshwifty-ui/* .
   '';
 
-  vendorHash = "sha256-kLKydjvZtFEY7vjqxK1cCwZSTbdqYWPRmxYSN0LYqsg=";
+  vendorHash = "sha256-/SLUC0xM195QfKgX9te8UP1bbzRbKF+Npyugi19JijY=";
 
   ldflags = [
     "-s"
@@ -55,7 +55,14 @@ buildGo125Module (finalAttrs: {
 
   passthru = {
     tests = { inherit (nixosTests) sshwifty; };
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version=unstable"
+        "--version-regex=^([0-9.]+(?!.+-prebuild).+$)"
+        "--subpackage"
+        "sshwifty-ui"
+      ];
+    };
   };
 
   meta = {
diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 318c7ef77680..15284aa9905c 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.44.0";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-eIh65Xc4TnCX9iNi5tQkfLmnILKXLfmWl8JGASC0c4U=";
+    hash = "sha256-6cWFUPPRQD+uCVatj7usF0ndXvqI7hdhE1KjdYDflb4=";
   };
 
-  vendorHash = "sha256-2dhc4RpT5ceEBeS/VkuNR9ll7lZ9N/QlkvCCOtVO5XM=";
+  vendorHash = "sha256-9e643w+1oHp9w50PSHF8SOqlwoym7OjSIH4PWGEAvdQ=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index f1d9a2a723f7..89f81f4a97cf 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -16,23 +16,28 @@
   callPackage,
   withFoundationdb ? false,
   stalwartEnterprise ? false,
+  buildPackages,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
-  version = "0.13.4";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "stalwart";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1WKmSgDZ3c6+fFKH9+kgrxFYthKQqE1455bFHlVCGhU=";
+    hash = "sha256-Wsk4n6jLOAFhxYb5Hw8XvQem0xccGGoD729nRz3bRF0=";
   };
 
-  cargoHash = "sha256-i6AvyX4RObB9aa+TYvsOW8i9WTcYx8ddP/Jmyr8PWMY=";
+  cargoHash = "sha256-LFXpv8/rHQwzdKEyS4VplQSwFUnZrgv0qDIhZUOGfpo=";
+
+  depsBuildBuild = [
+    pkg-config
+    zstd
+  ];
 
   nativeBuildInputs = [
-    pkg-config
     protobuf
     rustPlatform.bindgenHook
   ];
@@ -45,6 +50,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
 
+  nativeCheckInputs = [
+    openssl
+  ];
+
   # Issue: https://github.com/stalwartlabs/stalwart/issues/1104
   buildNoDefaultFeatures = true;
   buildFeatures = [
@@ -169,7 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)
-    webadmin = callPackage ./webadmin.nix { };
+    webadmin = buildPackages.callPackage ./webadmin.nix { };
     spam-filter = callPackage ./spam-filter.nix { };
     updateScript = nix-update-script { };
     tests.stalwart-mail = nixosTests.stalwart-mail;
diff --git a/pkgs/by-name/st/stanc/package.nix b/pkgs/by-name/st/stanc/package.nix
index 8ac7add6d2ae..a456773dfbc0 100644
--- a/pkgs/by-name/st/stanc/package.nix
+++ b/pkgs/by-name/st/stanc/package.nix
@@ -6,7 +6,7 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "stanc";
-  version = "2.36.0";
+  version = "2.37.0";
 
   minimalOCamlVersion = "4.12";
   duneVersion = "3";
@@ -14,8 +14,8 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "stanc3";
-    rev = "v${version}";
-    hash = "sha256-IrpHV00Fn3Nxail4Xgv/8ezclKpyVuQa1F34kF07wwA=";
+    tag = "v${version}";
+    hash = "sha256-d+sInQfnlT1gLbtIRPD+LUZgIdl519OrfvgSNYdYeII=";
   };
 
   nativeBuildInputs = with ocamlPackages; [ menhir ];
@@ -26,6 +26,7 @@ ocamlPackages.buildDunePackage rec {
     ppx_deriving
     fmt
     yojson
+    cmdliner
   ];
 
   meta = with lib; {
diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index 533672aca660..733ad0ca3a8e 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "star-history";
   };
 }
diff --git a/pkgs/by-name/st/starcharts/package.nix b/pkgs/by-name/st/starcharts/package.nix
index 48e051049aad..8647ecd27e76 100644
--- a/pkgs/by-name/st/starcharts/package.nix
+++ b/pkgs/by-name/st/starcharts/package.nix
@@ -31,6 +31,6 @@ buildGoModule rec {
     homepage = "https://github.com/caarlos0/starcharts";
     changelog = "https://github.com/caarlos0/starcharts/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix
index 34eead9806a1..b5e9a5ae31d8 100644
--- a/pkgs/by-name/st/starlark-rust/package.nix
+++ b/pkgs/by-name/st/starlark-rust/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/facebook/starlark-rust";
     changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "starlark";
   };
 }
diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 6ce52ceafc6a..8ec3dafe8d38 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2025-09-06";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "bf296ed553ea1715656054a7f64ac6a6dd161360";
-    hash = "sha256-ijZvmR9oFsIvpindO1RSi01USr2bhBATvVEQtYlgP/A=";
+    rev = "7849196f18cf4dd77298ae77c1b42ad53225c348";
+    hash = "sha256-oDA81ow+KPy9d/iIhPxzYSl9wvcLvNM85X4CV5Jq5LQ=";
   };
 
   vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";
diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix
index 04792fc253dd..2fb47599e5f0 100644
--- a/pkgs/by-name/st/starry/package.nix
+++ b/pkgs/by-name/st/starry/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     description = "Current stars history tells only half the story";
     homepage = "https://github.com/Canop/starry";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "starry";
   };
 }
diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index 78872f201a2b..596a22c6d1e7 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "starship";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5Euhbuu1uiJ5HJNlPs9sUoGcc5QWqXqNmEH0jpfGLlc=";
+    hash = "sha256-kb7LHEhtVXzdoRPWMb4JA2REc/V5n21iX+ussWCaaPA=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ''
   );
 
-  cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA=";
+  cargoHash = "sha256-xd3rYRJzJspmaQAsTw0lQifHdzB++BtJAjE12GsrLdE=";
 
   nativeCheckInputs = [
     gitMinimal
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       danth
       Br1ght0ne
       Frostman
-      awwpotato
+      da157
       sigmasquadron
     ];
     mainProgram = "starship";
diff --git a/pkgs/by-name/st/stash/version.json b/pkgs/by-name/st/stash/version.json
index ddc3258c29e5..db05c8eee830 100644
--- a/pkgs/by-name/st/stash/version.json
+++ b/pkgs/by-name/st/stash/version.json
@@ -1,7 +1,7 @@
 {
-  "version": "0.28.1",
-  "gitHash": "cc6917f2",
-  "srcHash": "sha256-hUx4y7VzsZYbykt9eOdwho0f/Xueh2eh7QykCsgt62A=",
-  "yarnHash": "sha256-MEyhPPzqJH7lNB5CLMbehjJXU/HQUNsFtPrl670kTvA=",
-  "vendorHash": "sha256-bD2YpsrksvDWvrokvRBGdnAUNJ5XHD/jDrF5dSCESr0="
+  "version": "0.29.1",
+  "gitHash": "869cbd49",
+  "srcHash": "sha256-OM2tpa8m4QuUs/HABRt8t/WHNeHWtrbJPZvlKBHcj9Y=",
+  "yarnHash": "sha256-E5JJZa+P83CnNDyhfrMwjC0xoXIV2DfyslQTLard4uE=",
+  "vendorHash": "sha256-1YVtA+kE7QHW/ACr9GPh7P0yQHdmF2NdrQR06ke2idY="
 }
diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix
new file mode 100644
index 000000000000..e6a3029dc41c
--- /dev/null
+++ b/pkgs/by-name/st/stasis/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  wayland-scanner,
+  wayland,
+  wayland-protocols,
+  dbus,
+  pkg-config,
+  libinput,
+  udev,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "stasis";
+  version = "0.6.1";
+
+  src = fetchFromGitHub {
+    owner = "saltnpepper97";
+    repo = "stasis";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GES7mBWEEyute/ljl7JiwzbgFSk4+JR5YUia4+Wzs3I=";
+  };
+
+  cargoHash = "sha256-+SGeuT0oAt5T15eZABGegiVhyV4GcHDp4LMMRpCl/U0=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    wayland
+    wayland-protocols
+    dbus
+    libinput
+    udev
+  ];
+
+  #There are no tests
+  doCheck = false;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Modern idle manager for Wayland";
+    longDescription = ''
+      Stasis is a smart idle manager for Wayland that understands context.
+      It automatically prevents idle when watching videos, reading documents,
+      or playing music, while allowing idle when appropriate. Features include
+      media-aware idle handling, application-specific inhibitors, Wayland idle
+      inhibitor protocol support, and flexible configuration using the RUNE
+      configuration language.
+    '';
+    homepage = "https://github.com/saltnpepper97/stasis";
+    changelog = "https://github.com/saltnpepper97/stasis/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    platforms = lib.platforms.linux;
+    mainProgram = "stasis";
+  };
+})
diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix
index 57527d9e3c2c..70a14a5f77f7 100644
--- a/pkgs/by-name/st/static-server/package.nix
+++ b/pkgs/by-name/st/static-server/package.nix
@@ -53,7 +53,7 @@ buildGoModule rec {
     description = "Simple, zero-configuration HTTP server CLI for serving static files";
     homepage = "https://github.com/eliben/static-server";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "static-server";
   };
 }
diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index a63834f958fc..da749e0757ca 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.38.1";
+  version = "2.39.0";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = "static-web-server";
     rev = "v${version}";
-    hash = "sha256-fcD1jd9kwm/jCYdvNGEnanLO/wUKeYy5OqOeQE2lGP4=";
+    hash = "sha256-iprQlSHO+ac7v1odVoS/9IU+Zov8/xh1l9pm1PJE8fs=";
   };
 
-  cargoHash = "sha256-rfhRMQb7MX2722wcMk35qATav6WFFULy3Ix3WcC7r4M=";
+  cargoHash = "sha256-rNrGlgUvPezX7RnKhprRjl9DiJ/Crt4phmxnfY9tNXA=";
 
   # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
   preCheck = ''
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       misilelab
     ];
     mainProgram = "static-web-server";
diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix
index 47584707d2fa..14a142581fea 100644
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     mainProgram = "statix";
     maintainers = with maintainers; [
-      figsoda
       nerdypepper
     ];
   };
diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 22c49081a31a..ebaa395e8381 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.56";
+  version = "2.11.58";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-gSWxiPj0wHQFAkXIYEyYtsVTO5jU/k873YOtz7JUcJQ=";
+    hash = "sha256-2q9gPXrJ8elek+NuQq7RkdRnfnUc5Rw3Jopp6Q3R+UI=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/st/stderred/package.nix b/pkgs/by-name/st/stderred/package.nix
index 997a1cc1a623..f8447a2409f9 100644
--- a/pkgs/by-name/st/stderred/package.nix
+++ b/pkgs/by-name/st/stderred/package.nix
@@ -16,6 +16,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-k/EA327AsRHgUYu7QqSF5yzOyO6h5XcE9Uv4l1VcIPI=";
   };
 
+  postPatch = ''
+    # Inline https://github.com/ku1ik/stderred/pull/95
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.0)' \
+      'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
diff --git a/pkgs/by-name/st/steam-devices-udev-rules/package.nix b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
index a276442ea802..d0e429dac3b9 100644
--- a/pkgs/by-name/st/steam-devices-udev-rules/package.nix
+++ b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "steam-devices-udev-rules";
-  version = "1.0.0.61-unstable-2025-09-26";
+  version = "1.0.0.61-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "steam-devices";
-    rev = "d3f7cd6a955d2191800f01d6d2efb2ee196127c5";
-    hash = "sha256-IMrKU6zyR+oTc4Wqca8JBvxoslKUuz8peHMudfwewf0=";
+    rev = "4d7e6c1d8c54ec10fdb29daca679307ac5194825";
+    hash = "sha256-KzDzZ03g1xil4G6yw67KGEHnWIWg6VZIkMy8n/kSgMs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch b/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch
new file mode 100644
index 000000000000..be780aa3b149
--- /dev/null
+++ b/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch
@@ -0,0 +1,13 @@
+diff --git a/SteamPrefill/Settings/AppConfig.cs b/SteamPrefill/Settings/AppConfig.cs
+index 05215f9..394b13f 100644
+--- a/SteamPrefill/Settings/AppConfig.cs
++++ b/SteamPrefill/Settings/AppConfig.cs
+@@ -36,7 +36,7 @@ namespace SteamPrefill.Settings
+         /// <summary>
+         /// Contains user configuration.  Should not be deleted, doing so will reset the app back to defaults.
+         /// </summary>
+-        private static readonly string ConfigDir = Path.Combine(AppContext.BaseDirectory, "Config");
++        private static readonly string ConfigDir = Path.Combine(Directory.GetCurrentDirectory(), "Config");
+ 
+         #region Serialization file paths
+ 
diff --git a/pkgs/by-name/st/steam-lancache-prefill/deps.json b/pkgs/by-name/st/steam-lancache-prefill/deps.json
new file mode 100644
index 000000000000..03ae8464bfbc
--- /dev/null
+++ b/pkgs/by-name/st/steam-lancache-prefill/deps.json
@@ -0,0 +1,232 @@
+[
+  {
+    "pname": "AsyncFixer",
+    "version": "1.6.0",
+    "hash": "sha256-8MWfDkTyotnouLwZASK27lM32NoGCLPLr4sBBqPkJFI="
+  },
+  {
+    "pname": "AutoMapper",
+    "version": "11.0.1",
+    "hash": "sha256-47l2b8IWIyaOKl5KTpVAPeEL6ZMGlzoFCWby2QIrPfw="
+  },
+  {
+    "pname": "ByteSize",
+    "version": "2.1.1",
+    "hash": "sha256-ZPiO0zdDX3F9QkQLWLbkyeicRZZoOGnS5vo55RttS2w="
+  },
+  {
+    "pname": "Devlooped.SponsorLink",
+    "version": "0.10.5",
+    "hash": "sha256-m+eCuL8ifD/PJkyA70okbWYIDcp8ZV6mtDvnbthz6DQ="
+  },
+  {
+    "pname": "ErrorProne.NET.Structs",
+    "version": "0.1.2",
+    "hash": "sha256-B0kzqe24j0+X96JCtQWXZK3aWfFAYKIYvhrMePMfgPI="
+  },
+  {
+    "pname": "HexMate",
+    "version": "0.0.3",
+    "hash": "sha256-pA/wUH3+1CIXNmvpwedOOtfGA5uEMeis3XbSArol8r4="
+  },
+  {
+    "pname": "Intellenum",
+    "version": "1.0.0-beta.3",
+    "hash": "sha256-FdLXSwxvQNyZWjFjJnUvuk1LAxPvuch557w0qHvmdfw="
+  },
+  {
+    "pname": "JetBrains.Annotations",
+    "version": "2022.1.0",
+    "hash": "sha256-AgCfhDvBb/xOLxNvFoZPYuiSBWEhXihHTBvYqLS+WFM="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
+    "version": "3.3.4",
+    "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.5.0",
+    "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Abstractions",
+    "version": "6.34.0",
+    "hash": "sha256-Al1vWcfH//XZRKSg5JE2nEHMb8Z6kekMHccJEmYo9jU="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.JsonWebTokens",
+    "version": "6.34.0",
+    "hash": "sha256-+h0uNBMx6zh/f96+WiSR6c89G1alBOCuTx+VpDxuATA="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Logging",
+    "version": "6.34.0",
+    "hash": "sha256-a0IPOjmYsIT2/HFAdhaN/32X3c8GYCFZ5sRiCGO2pDo="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Tokens",
+    "version": "6.34.0",
+    "hash": "sha256-lO/gLOFYkwCEm98Zn+4X20dXMwYoD+y4Urpx8n3mcu4="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "5.0.0",
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "Microsoft.VisualStudio.Threading.Analyzers",
+    "version": "16.9.60",
+    "hash": "sha256-1ke2CCKndVws3lgfEuEhKgnm+h706XhfKcpBNyypcDU="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "5.0.0",
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
+  },
+  {
+    "pname": "NStack.Core",
+    "version": "0.17.1",
+    "hash": "sha256-sVuArQwL2dzytCei2fhCNg1Bcm4vntPb+PpXStk3rqM="
+  },
+  {
+    "pname": "protobuf-net",
+    "version": "3.2.30",
+    "hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="
+  },
+  {
+    "pname": "protobuf-net.Core",
+    "version": "3.2.30",
+    "hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="
+  },
+  {
+    "pname": "runtime.any.System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.unix.System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
+  },
+  {
+    "pname": "Spectre.Console",
+    "version": "0.49.2-preview.0.67",
+    "hash": "sha256-e1BrfX8ME8Ob7ZVKx8VYExKNvLzHHxNJ1R+Yv2lVE3A="
+  },
+  {
+    "pname": "Spectre.Console.Analyzer",
+    "version": "1.0.0",
+    "hash": "sha256-Om2PRAfm4LoPImty4zpGo/uoqha6ZnuCU6iNcAvKiUE="
+  },
+  {
+    "pname": "SteamKit2",
+    "version": "3.0.0-beta.5",
+    "hash": "sha256-6AXrY3OYtF00FzP3yNWOdyFJE5jTqLegrlMh7hvDHJ8="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
+  },
+  {
+    "pname": "System.IdentityModel.Tokens.Jwt",
+    "version": "6.34.0",
+    "hash": "sha256-nv+tAb/Gw2W026gBgoAT53Oj5LOonHYGG1UntQheHpQ="
+  },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "8.0.0",
+    "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
+  },
+  {
+    "pname": "System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "5.0.0",
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.5.0",
+    "hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "5.0.0",
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
+  },
+  {
+    "pname": "System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "4.7.2",
+    "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "4.7.2",
+    "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+  },
+  {
+    "pname": "Terminal.Gui",
+    "version": "1.7.2",
+    "hash": "sha256-qt42B0L8Na3kRCKkzmPru8IoLcjyn6nosEJL7nb67aA="
+  },
+  {
+    "pname": "ThisAssembly.AssemblyInfo",
+    "version": "1.2.14",
+    "hash": "sha256-Sx9lTx51Nt8XlzuB7FI/8MVRYNw4Mm2lfQECBf3TXJU="
+  },
+  {
+    "pname": "Wcwidth",
+    "version": "1.0.0",
+    "hash": "sha256-weNqGgpKcVMkTtaMV5npzbLRbCPyI0tgkN+qmzeqIwo="
+  }
+]
diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix
new file mode 100644
index 000000000000..d7e5162c8b43
--- /dev/null
+++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  curl,
+  jq,
+  unzip,
+}:
+
+buildDotnetModule (finalAttrs: {
+  pname = "steam-lancache-prefill";
+  version = "3.4.1";
+
+  src = fetchFromGitHub {
+    owner = "tpill90";
+    repo = "steam-lancache-prefill";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6XBe64hAe5mPakjcTAPdwnMKsVlvCeorItLVS5cf+cI=";
+    fetchSubmodules = true;
+  };
+
+  projectFile = "SteamPrefill/SteamPrefill.csproj";
+  nugetDeps = ./deps.json;
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+
+  executables = [ "SteamPrefill" ];
+
+  patches = [ ./current-dir-config.patch ];
+
+  nativeBuildInputs = [
+    curl
+    jq
+    unzip
+  ];
+
+  postInstall = ''
+    rm -rf $out/lib/steam-lancache-prefill/update.sh
+  '';
+
+  meta = {
+    description = "Automatically fills a Lancache with games from Steam";
+    homepage = "https://github.com/tpill90/steam-lancache-prefill";
+    changelog = "https://github.com/tpill90/steam-lancache-prefill/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ rhoriguchi ];
+    mainProgram = "SteamPrefill";
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix
index 45d9c558fd2d..3d67ca9ce95c 100644
--- a/pkgs/by-name/st/steampipe/package.nix
+++ b/pkgs/by-name/st/steampipe/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "2.2.0";
+  version = "2.3.1";
 
   env.CGO_ENABLED = 0;
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "turbot";
     repo = "steampipe";
     tag = "v${version}";
-    hash = "sha256-bYnwtGeFOtUfYzlx0o0jtfuyeItXU9LiO0fJy8UGv6k=";
+    hash = "sha256-be9Q3X/XZ7OdJChRxVFQzglhMfpLzbzaCfSn7hUR5AA=";
   };
 
-  vendorHash = "sha256-VHAbMgBISWWGhZBRl5JA0gytRSSdaFMCJUzMxmoNtPc=";
+  vendorHash = "sha256-1o7ANCyz19WSIkYYoA0DpYzkY2qBXHHSfAGrAG2+k88=";
   proxyVendor = true;
 
   postPatch = ''
diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index a8c8b564d97d..7f09db24af69 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0-unstable-2025-10-14";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "c83d48f657f28017912cc3c1b604c33ab5de0a41";
-    hash = "sha256-VVrMXpJwcaUTSR6AElkc7Xu8If0/bUzKklOyo87CdLI=";
+    rev = "ee5c58b83ff46738e3fb9990138b88abe5286b07";
+    hash = "sha256-eFa3R7G9GkanWMA6g7miu983tyXQVmt69tyhaftEJOU=";
   };
 
-  cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4=";
+  cargoHash = "sha256-RCFLN0+59FV2fs0zGi1uuHt7B6DZUROFxisqoEQsT7U=";
 
   nativeBuildInputs = [
     curl
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/by-name/st/stellarium/package.nix
similarity index 80%
rename from pkgs/applications/science/astronomy/stellarium/default.nix
rename to pkgs/by-name/st/stellarium/package.nix
index e883582bdcc8..28b977fc7117 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/by-name/st/stellarium/package.nix
@@ -2,22 +2,15 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   perl,
   wrapGAppsHook3,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
-  qtpositioning,
-  qtmultimedia,
-  qtserialport,
-  qtwayland,
-  qtwebengine,
+  qt6,
+  qt6Packages,
   calcmysky,
-  qxlsx,
   indilib,
   libnova,
-  qttools,
   exiv2,
   nlopt,
   testers,
@@ -37,31 +30,38 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9uQ6u1+dSszmKG8eY6kSXhqsCPRGw6tulCTCrLByIxc=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/stellarium/-/raw/ab559b6e9349569278f83c2dfc83990e971a8cb2/qt-6.10.patch";
+      hash = "sha256-a7zC9IQOj93VnPy8Bj/fLe4oJux7I4Edgj5OaKI4TZU=";
+    })
+  ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
                 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
     substituteInPlace src/CMakeLists.txt \
-      --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
+      --replace-fail "\''${_qt_bin_dir}/../" "${qt6.qtmultimedia}/lib/qt-6/"
   '';
 
   nativeBuildInputs = [
     cmake
     perl
     wrapGAppsHook3
-    wrapQtAppsHook
-    qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
   ];
 
   buildInputs = [
-    qtbase
-    qtcharts
-    qtpositioning
-    qtmultimedia
-    qtserialport
-    qtwebengine
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtpositioning
+    qt6.qtmultimedia
+    qt6.qtserialport
+    qt6.qtwebengine
     calcmysky
-    qxlsx
+    qt6Packages.qxlsx
     indilib
     libnova
     exiv2
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     nlopt
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ];
 
   preConfigure = ''
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # fatal error: 'QtSerialPort/QSerialPortInfo' file not found
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qt6.qtserialport}/lib";
 
   dontWrapGApps = true;
 
diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index 8683bafe7c72..fecf9a3fb954 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -42,13 +42,13 @@ buildGoModule rec {
     "-X github.com/smallstep/step-kms-plugin/cmd.Version=${version}"
   ];
 
+  CGO_CFLAGS = "-I${lib.getDev pcsclite}/include/PCSC/";
+
   meta = with lib; {
     description = "Step plugin to manage keys and certificates on cloud KMSs and HSMs";
     homepage = "https://smallstep.com/cli/";
     license = licenses.asl20;
     maintainers = with maintainers; [ qbit ];
     mainProgram = "step-kms-plugin";
-    # can't find pcsclite header files
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/st/stepmania/ffmpeg-7.patch b/pkgs/by-name/st/stepmania/ffmpeg-7.patch
new file mode 100644
index 000000000000..80b4b8b6a2b7
--- /dev/null
+++ b/pkgs/by-name/st/stepmania/ffmpeg-7.patch
@@ -0,0 +1,11 @@
+--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
++++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+@@ -273,7 +273,7 @@
+ 		bool bSkipThisFrame =
+ 			fTargetTime != -1 &&
+ 			GetTimestamp() + GetFrameDuration() < fTargetTime &&
+-			(m_pStreamCodec->frame_number % 2) == 0;
++			(m_pStreamCodec->frame_num % 2) == 0;
+ 
+ 		int iGotFrame;
+ 		int len;
diff --git a/pkgs/by-name/st/stepmania/package.nix b/pkgs/by-name/st/stepmania/package.nix
index 66cfca7cd573..a447ebb62b07 100644
--- a/pkgs/by-name/st/stepmania/package.nix
+++ b/pkgs/by-name/st/stepmania/package.nix
@@ -6,10 +6,10 @@
   cmake,
   nasm,
   alsa-lib,
-  ffmpeg_6,
+  ffmpeg_7,
   glew,
   glib,
-  gtk2,
+  gtk3,
   libmad,
   libogg,
   libpng,
@@ -32,12 +32,20 @@ stdenv.mkDerivation {
   };
 
   patches = [
-    # https://github.com/stepmania/stepmania/pull/2247
     (fetchpatch {
-      name = "fix-building-with-ffmpeg6.patch";
-      url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch";
+      # Fix building with newer FFmpeg
+      name = "fix-building-with-newer-ffmpeg.patch";
+      url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch?full_index=1";
       hash = "sha256-m+5sP+mIpcSjioRBdzChqja5zwNcwdSNAfvSJ2Lww+g=";
     })
+    (fetchpatch {
+      # Fix crash on loading animated previews while using newer FFmpeg
+      name = "fix-crash-newer-ffmpeg.patch";
+      url = "https://github.com/stepmania/stepmania/commit/e0d2a5182dcd855e181fffa086273460c553c7ff.patch?full_index=1";
+      hash = "sha256-XacaMn29FwG3WgFBfB890I8mzVrvuOL4wPWcHHNYfXM=";
+    })
+    # FFmpeg 7 frame_number compatibility fix
+    ./ffmpeg-7.patch
   ];
 
   postPatch = ''
@@ -54,10 +62,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     alsa-lib
-    ffmpeg_6
+    ffmpeg_7
     glew
     glib
-    gtk2
+    gtk3
     libmad
     libogg
     libpng
@@ -72,8 +80,6 @@ stdenv.mkDerivation {
     "-DWITH_SYSTEM_FFMPEG=1"
     "-DWITH_SYSTEM_PNG=on"
     "-DWITH_SYSTEM_ZLIB=on"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];
 
   postInstall = ''
@@ -86,12 +92,12 @@ stdenv.mkDerivation {
     install -Dm444 $src/stepmania.desktop -t $out/share/applications
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.stepmania.com/";
     description = "Free dance and rhythm game for Windows, Mac, and Linux";
-    platforms = platforms.linux;
-    license = licenses.mit; # expat version
-    maintainers = with maintainers; [ h7x4 ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit; # expat version
+    maintainers = with lib.maintainers; [ h7x4 ];
     mainProgram = "stepmania";
   };
 }
diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 9324735a798a..920059c2e686 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.24";
+  version = "3.16.29";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-LL91oKfSC1TV+bFwFFqnrDnbDnn+FukaFEQ8Ma4BJjo=";
+    hash = "sha256-y4JK99EDlDdRgOJj6NkiafVDab6umWJCjupKm9Leekk=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index b8c9af298ff2..1e79086142a7 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -14,13 +14,13 @@ let
   iconame = "STM32CubeMX";
   package = stdenvNoCC.mkDerivation rec {
     pname = "stm32cubemx";
-    version = "6.14.0";
+    version = "6.15.0";
 
     src = fetchzip {
       url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${
         builtins.replaceStrings [ "." ] [ "" ] version
       }-lin.zip";
-      hash = "sha256-GOvoPyfPdQV/gjveuFpZjueTZD/BYuEWSHgQKBm3o3A=";
+      hash = "sha256-50P+/uvNH3NN1UN+T3RxGgR8QYBIgBDA56mAEU4BipI=";
       stripRoot = false;
     };
 
@@ -61,16 +61,15 @@ let
       EOF
       chmod +x $out/bin/${pname}
 
-      icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico
       fdupes -dN . > /dev/null
       ls
       for size in 16 24 32 48 64 128 256; do
         mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
         if [ $size -eq 256 ]; then
-          mv ${iconame}_*_"$size"x"$size"x32.png \
+          cp $out/opt/STM32CubeMX/help/${iconame}.png \
             $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
         else
-          convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \
+          magick $out/opt/STM32CubeMX/help/${iconame}.png -resize "$size"x"$size" \
             $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
         fi
       done;
diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 96098914efdd..319a6d8fafca 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "storj-uplink";
-  version = "1.137.5";
+  version = "1.140.3";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QvmCtW8szGoo7sNHbChvtkTOUOxf1TQHQCoYeV1pN9o=";
+    hash = "sha256-B33czQ2ffOsTEFpexwhIuxWp8xZMLrjwX+pMbPh1R7U=";
   };
 
   subPackages = [ "cmd/uplink" ];
 
-  vendorHash = "sha256-YWqrdjB6lOOdt99XOrh27O1gza6qZ2Xn+9XfTnwOJsw=";
+  vendorHash = "sha256-qlzHbGOcr+TeWkGNsGYsUodHaKbAW/5qyObRhOFa10M=";
 
   ldflags = [ "-s" ];
 
diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix
index cf7f4d7ebcf2..99a4ee90d9af 100644
--- a/pkgs/by-name/st/stormlib/package.nix
+++ b/pkgs/by-name/st/stormlib/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
     (lib.cmakeBool "WITH_LIBTOMCRYPT" true)
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix
index 3aedac217310..d4fa0f7bd7d0 100644
--- a/pkgs/by-name/st/strace-analyzer/package.nix
+++ b/pkgs/by-name/st/strace-analyzer/package.nix
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "strace-analyzer";
     homepage = "https://github.com/wookietreiber/strace-analyzer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index bb08112461f0..23b9b4b359e8 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "6.16";
+  version = "6.17";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-PXrufk8ESy9n89UainbtoYB26fsndN5UrDUdd31Ov/o=";
+    hash = "sha256-Cnx77cfvwHbzJCoDEK8q5jwpKjbdQjbweeiKk+mMucA=";
   };
 
   separateDebugInfo = true;
diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix
index d8f46ac8f746..b8debe3c96a9 100644
--- a/pkgs/by-name/st/strongswan/package.nix
+++ b/pkgs/by-name/st/strongswan/package.nix
@@ -122,13 +122,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "strongswan";
-  version = "6.0.2"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
+  version = "6.0.3"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
 
   src = fetchFromGitHub {
     owner = "strongswan";
     repo = "strongswan";
     tag = version;
-    hash = "sha256-wjz41gt+Xu4XJkEXRRVl3b3ryEoEtijeqmfVFoRjnA4=";
+    hash = "sha256-uH6RExDOmrm1LBi0zBrCn+qp2oL522mdshe62UDV8I0=";
   };
 
   patches = [
diff --git a/pkgs/by-name/st/strutcpp/package.nix b/pkgs/by-name/st/strutcpp/package.nix
new file mode 100644
index 000000000000..f15f2bfaa1be
--- /dev/null
+++ b/pkgs/by-name/st/strutcpp/package.nix
@@ -0,0 +1,39 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  tinycmmc,
+}:
+
+stdenv.mkDerivation {
+  pname = "strutcpp";
+  version = "0-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "strutcpp";
+    rev = "3c9cbf6cd0e09b34e464a0ff01aca99290d79870";
+    sha256 = "sha256-pyLNbjvhGjEOGcj4Krtcm/Rms2rvBfWD1lqrEmm7gnI=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    gtest
+    tinycmmc
+  ];
+
+  cmakeFlags = [
+    "-DBUILD_TESTS=ON"
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Collection of string utilities";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
+  };
+}
diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index ef95636772c7..7d10d60e8120 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stu";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "stu";
     rev = "v${version}";
-    hash = "sha256-To1x65UuYSdkjIghy0UOA70LULGZZcC5waxYh99qXbs=";
+    hash = "sha256-zjfIBYFlEG6OQ+vWOJhVuek30uG1R28wJpUhRIMcYks=";
   };
 
-  cargoHash = "sha256-YmEzjbGIvgpPlMJln42Q9m/v3HhfsjLMHvES/4S1928=";
+  cargoHash = "sha256-CrliGsShW6wDkCpOVlK9m24BXr3lyxtU12GAdD/2dWE=";
 
   passthru.tests.version = testers.testVersion { package = stu; };
 
diff --git a/pkgs/by-name/st/stunnel/package.nix b/pkgs/by-name/st/stunnel/package.nix
index 2a5c7722534e..cc8fafd940c8 100644
--- a/pkgs/by-name/st/stunnel/package.nix
+++ b/pkgs/by-name/st/stunnel/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "stunnel";
-  version = "5.75";
+  version = "5.76";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://www.stunnel.org/archive/${lib.versions.major finalAttrs.version}.x/stunnel-${finalAttrs.version}.tar.gz";
-    hash = "sha256-DB7w7YUkCXTcy5T+dPuS1jg0dMfA0Q6HltH3gaO6VoM=";
+    hash = "sha256-zaN+tND7HhKXGO0nrXe1c16Jk5TOBAuyvii7uTf9eeE=";
     # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256",
     # not the output of `nix-prefetch-url`
   };
diff --git a/pkgs/by-name/st/stxxl/package.nix b/pkgs/by-name/st/stxxl/package.nix
index d045a889a016..324e0c76115b 100644
--- a/pkgs/by-name/st/stxxl/package.nix
+++ b/pkgs/by-name/st/stxxl/package.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
     inherit parallelSupport;
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     homepage = "https://github.com/stxxl/stxxl";
diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index c0da19f43ca3..33f3265bfd5f 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -2,6 +2,8 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
+  testers,
   # lua54 implies lua52/lua53
   features ? [
     "lua54"
@@ -10,18 +12,18 @@
   ],
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stylua";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = "stylua";
-    rev = "v${version}";
-    sha256 = "sha256-iyZ30Gc32TQsQyMLwArfIRtM0NkbXkqmca46nI0526M=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-wpFp6K5O1Vb/yHq+Lm0235nbeOdOgBK0NrlVAthz12A=";
   };
 
-  cargoHash = "sha256-H50/e/XyFvXHhwrKUbKZFZwSHfwAkAtddEvFiOr5220=";
+  cargoHash = "sha256-+llL9WoKnrXJjlaPNqdN4jGPjSHz2EuI2V44fghF5aM=";
 
   # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
   postPatch = ''
@@ -30,12 +32,17 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = features;
 
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Opinionated Lua code formatter";
     homepage = "https://github.com/johnnymorganz/stylua";
-    changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/johnnymorganz/stylua/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ lib.maintainers.LunNova ];
     mainProgram = "stylua";
   };
-}
+})
diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix
index 6d176cd6c643..b36424f3e907 100644
--- a/pkgs/by-name/su/subxt/package.nix
+++ b/pkgs/by-name/su/subxt/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "subxt";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "subxt";
     rev = "v${version}";
-    hash = "sha256-BV/zP0L0gDmLSuzkp4OkOPfgldXBUiaHL4rciM7lrno=";
+    hash = "sha256-gn8PdVvXGDEAfeDMXtMILsGBTy6y1jFdYXVeFrbHNyo=";
   };
 
-  cargoHash = "sha256-7kmxnlhgNj0hY9FwVrzmdHw73Jf/pSeTHi6sqDg9X24=";
+  cargoHash = "sha256-JLQr2GDdAFXlsr2F9a5VQ8HwAFpEhYWfsLEdLfABGDM=";
 
   # Only build the command line client
   cargoBuildFlags = [
diff --git a/pkgs/by-name/su/suckit/package.nix b/pkgs/by-name/su/suckit/package.nix
index 911b9ce66db5..15cc97e8831f 100644
--- a/pkgs/by-name/su/suckit/package.nix
+++ b/pkgs/by-name/su/suckit/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "suckit";
   };
 }
diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
index 767d7b45b720..497bb4c37840 100644
--- a/pkgs/by-name/su/suitesparse-graphblas/package.nix
+++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "suitesparse-graphblas";
-  version = "10.1.1";
+  version = "10.2.0";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "DrTimothyAldenDavis";
     repo = "GraphBLAS";
     rev = "v${version}";
-    hash = "sha256-De2ZDP4Lsik3+Wz6yvm+ro4Q7Q8L5ZDdBaYXHg4LO20=";
+    hash = "sha256-iZe5zHDaJtH1N6zXir38U2VJOD9fPChhwB7c3uCvjYc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix
index 401ed6a52aeb..53bcf829711e 100644
--- a/pkgs/by-name/su/summon/package.nix
+++ b/pkgs/by-name/su/summon/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "summon";
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "cyberark";
     repo = "summon";
     rev = "v${version}";
-    hash = "sha256-Z98NgC9abNOHscwtV14gbI8SL8ODMbthMZMjhKz7KEk=";
+    hash = "sha256-BUT8pCLfhss3OgB3JN2lEZTXzyT607ABn6/2g01jxbM=";
   };
 
-  vendorHash = "sha256-QOCPATTs2vvww+ekt6HFg2IUA/NFmE8+2WkMby2f/OE=";
+  vendorHash = "sha256-ZT3lVL8qoonmeWsmCzjMbOsAf2NvpheC6ThDzn4izkU=";
 
   subPackages = [ "cmd" ];
 
diff --git a/pkgs/by-name/su/sundials/package.nix b/pkgs/by-name/su/sundials/package.nix
index aea189af3a20..29ca0a19b99a 100644
--- a/pkgs/by-name/su/sundials/package.nix
+++ b/pkgs/by-name/su/sundials/package.nix
@@ -1,18 +1,19 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
   cmake,
-  fetchurl,
+  gfortran,
   python3,
   blas,
   lapack,
-  gfortran,
   suitesparse,
+  nix-update-script,
   lapackSupport ? true,
   kluSupport ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sundials";
   version = "7.5.0";
 
@@ -21,9 +22,11 @@ stdenv.mkDerivation rec {
     "examples"
   ];
 
-  src = fetchurl {
-    url = "https://github.com/LLNL/sundials/releases/download/v${version}/sundials-${version}.tar.gz";
-    hash = "sha256-CJrGWVB973OLemW1dP/jqQDThWnjMj2XCevtPkRa3sw=";
+  src = fetchFromGitHub {
+    owner = "LLNL";
+    repo = "sundials";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZyUTFaMEbfNtR9oGIy0fQ+qQwb3hQ7CxTv9IevkeidE=";
   };
 
   nativeBuildInputs = [
@@ -51,34 +54,36 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DEXAMPLES_INSTALL_PATH=${placeholder "examples"}/share/examples"
+    (lib.cmakeFeature "EXAMPLES_INSTALL_PATH" "${placeholder "examples"}/share/examples")
   ]
   ++ lib.optionals lapackSupport [
-    "-DENABLE_LAPACK=ON"
-    "-DLAPACK_LIBRARIES=${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}"
+    (lib.cmakeBool "ENABLE_LAPACK" true)
+    (lib.cmakeFeature "LAPACK_LIBRARIES" "${lapack}/lib/liblapack${stdenv.hostPlatform.extensions.sharedLibrary}")
   ]
   ++ lib.optionals kluSupport [
-    "-DENABLE_KLU=ON"
-    "-DKLU_INCLUDE_DIR=${suitesparse.dev}/include"
-    "-DKLU_LIBRARY_DIR=${suitesparse}/lib"
+    (lib.cmakeBool "ENABLE_KLU" true)
+    (lib.cmakeFeature "KLU_INCLUDE_DIR" "${lib.getDev suitesparse}/include")
+    (lib.cmakeFeature "KLU_LIBRARY_DIR" "${suitesparse}/lib")
   ]
   ++ [
-    (
-      # Use the correct index type according to lapack and blas used. They are
-      # already supposed to be compatible but we check both for extra safety. 64
-      # should be the default but we prefer to be explicit, for extra safety.
-      if blas.isILP64 then "-DSUNDIALS_INDEX_SIZE=64" else "-DSUNDIALS_INDEX_SIZE=32"
-    )
+    # Use the correct index type according to lapack and blas used. They are
+    # already supposed to be compatible but we check both for extra safety. 64
+    # should be the default but we prefer to be explicit, for extra safety.
+    (lib.cmakeFeature "SUNDIALS_INDEX_SIZE" (toString (if blas.isILP64 then 64 else 32)))
   ];
 
   doCheck = true;
   checkTarget = "test";
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Suite of nonlinear differential/algebraic equation solvers";
     homepage = "https://computing.llnl.gov/projects/sundials";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ idontgetoutmuch ];
-    license = licenses.bsd3;
+    downloadPage = "https://github.com/LLNL/sundials";
+    changelog = "https://github.com/LLNL/sundials/releases/tag/v${finalAttrs.version}";
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ idontgetoutmuch ];
+    license = lib.licenses.bsd3;
   };
-}
+})
diff --git a/pkgs/by-name/su/sunsetr/package.nix b/pkgs/by-name/su/sunsetr/package.nix
index dd72a816fcf5..29ed442b9186 100644
--- a/pkgs/by-name/su/sunsetr/package.nix
+++ b/pkgs/by-name/su/sunsetr/package.nix
@@ -6,20 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sunsetr";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "psi4j";
     repo = "sunsetr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DbTEHJjYcxzr+ELlN4qgcQpZS/r5P2rcPPnPT8Qkbok=";
+    hash = "sha256-ds5z/Um7NaewS4f5n2xVpr+EFile6Nz6P6sVW+XcnRo=";
   };
 
-  cargoHash = "sha256-jRDa7wSJLXP+jv0lbCiVzgAhdh9eJfq314Gpw0npRos=";
-
-  checkFlags = [
-    "--skip=config::tests::test_geo_toml_exists_before_config_creation"
-  ];
+  cargoHash = "sha256-fbSN52WOIxxISaP90UQ6YGSqPqFqEcUSH88xDkvLGlM=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/su/sunshine/package-lock.json b/pkgs/by-name/su/sunshine/package-lock.json
index 2c15793ed12d..8ba531828603 100644
--- a/pkgs/by-name/su/sunshine/package-lock.json
+++ b/pkgs/by-name/su/sunshine/package-lock.json
@@ -8,16 +8,16 @@
       "name": "sunshine",
       "version": "0.0.0",
       "dependencies": {
-        "@lizardbyte/shared-web": "2025.626.181239",
-        "vue": "3.5.17",
-        "vue-i18n": "11.1.7"
+        "@lizardbyte/shared-web": "2025.922.181114",
+        "vue": "3.5.21",
+        "vue-i18n": "11.1.12"
       },
       "devDependencies": {
         "@codecov/vite-plugin": "1.9.1",
-        "@vitejs/plugin-vue": "4.6.2",
-        "serve": "14.2.4",
-        "vite": "4.5.14",
-        "vite-plugin-ejs": "1.6.4"
+        "@vitejs/plugin-vue": "6.0.1",
+        "serve": "14.2.5",
+        "vite": "6.3.6",
+        "vite-plugin-ejs": "1.7.0"
       }
     },
     "node_modules/@actions/core": {
@@ -94,12 +94,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.7.tgz",
-      "integrity": "sha512-qnzXzDXdr/po3bOTbTIQZ7+TxNKxpkN5IifVLXS+r7qwynkZfPyjZfE7hCXbo7IoO9TNcSyibgONsf2HauUd3Q==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
+      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.7"
+        "@babel/types": "^7.28.4"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -109,9 +109,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.7.tgz",
-      "integrity": "sha512-8OLQgDScAOHXnAz2cV+RfzzNMipuLVBz2biuAJFMV9bfkNf393je3VM8CLkjQodW5+iWsSJdSgSWT6rsZoXHPw==",
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
+      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -156,10 +156,27 @@
         "vite": "4.x || 5.x || 6.x"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
+      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
+      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
       "cpu": [
         "arm"
       ],
@@ -170,13 +187,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
+      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
       "cpu": [
         "arm64"
       ],
@@ -187,13 +204,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
+      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
       "cpu": [
         "x64"
       ],
@@ -204,13 +221,13 @@
         "android"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
-      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
+      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
       "cpu": [
         "arm64"
       ],
@@ -221,13 +238,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
+      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
       "cpu": [
         "x64"
       ],
@@ -238,13 +255,13 @@
         "darwin"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
       "cpu": [
         "arm64"
       ],
@@ -255,13 +272,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
+      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
       "cpu": [
         "x64"
       ],
@@ -272,13 +289,13 @@
         "freebsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
+      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
       "cpu": [
         "arm"
       ],
@@ -289,13 +306,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
+      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
       "cpu": [
         "arm64"
       ],
@@ -306,13 +323,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
+      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
       "cpu": [
         "ia32"
       ],
@@ -323,13 +340,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
+      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
       "cpu": [
         "loong64"
       ],
@@ -340,13 +357,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
+      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
       "cpu": [
         "mips64el"
       ],
@@ -357,13 +374,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
+      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
       "cpu": [
         "ppc64"
       ],
@@ -374,13 +391,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
+      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
       "cpu": [
         "riscv64"
       ],
@@ -391,13 +408,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
+      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
       "cpu": [
         "s390x"
       ],
@@ -408,13 +425,13 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
+      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
       "cpu": [
         "x64"
       ],
@@ -425,13 +442,30 @@
         "linux"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
+      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
       "cpu": [
         "x64"
       ],
@@ -442,13 +476,30 @@
         "netbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
+      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
       "cpu": [
         "x64"
       ],
@@ -459,13 +510,30 @@
         "openbsd"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
+      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
+      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
       "cpu": [
         "x64"
       ],
@@ -476,13 +544,13 @@
         "sunos"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
+      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
       "cpu": [
         "arm64"
       ],
@@ -493,13 +561,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
+      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
       "cpu": [
         "ia32"
       ],
@@ -510,13 +578,13 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
+      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
       "cpu": [
         "x64"
       ],
@@ -527,7 +595,7 @@
         "win32"
       ],
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       }
     },
     "node_modules/@fastify/busboy": {
@@ -541,22 +609,22 @@
       }
     },
     "node_modules/@fortawesome/fontawesome-free": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-6.7.2.tgz",
-      "integrity": "sha512-JUOtgFW6k9u4Y+xeIaEiLr3+cjoUPiAuLXoyKOJSia6Duzb7pq+A76P9ZdPDoAoxHdHzq6gE9/jKBGXlZT8FbA==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@fortawesome/fontawesome-free/-/fontawesome-free-7.0.1.tgz",
+      "integrity": "sha512-RLmb9U6H2rJDnGxEqXxzy7ANPrQz7WK2/eTjdZqyU9uRU5W+FkAec9uU5gTYzFBH7aoXIw2WTJSCJR4KPlReQw==",
       "license": "(CC-BY-4.0 AND OFL-1.1 AND MIT)",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/@intlify/core-base": {
-      "version": "11.1.7",
-      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.7.tgz",
-      "integrity": "sha512-gYiGnQeJVp3kNBeXQ73m1uFOak0ry4av8pn+IkEWigyyPWEMGzB+xFeQdmGMFn49V+oox6294oGVff8bYOhtOw==",
+      "version": "11.1.12",
+      "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-11.1.12.tgz",
+      "integrity": "sha512-whh0trqRsSqVLNEUCwU59pyJZYpU8AmSWl8M3Jz2Mv5ESPP6kFh4juas2NpZ1iCvy7GlNRffUD1xr84gceimjg==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/message-compiler": "11.1.7",
-        "@intlify/shared": "11.1.7"
+        "@intlify/message-compiler": "11.1.12",
+        "@intlify/shared": "11.1.12"
       },
       "engines": {
         "node": ">= 16"
@@ -566,12 +634,12 @@
       }
     },
     "node_modules/@intlify/message-compiler": {
-      "version": "11.1.7",
-      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.7.tgz",
-      "integrity": "sha512-0ezkep1AT30NyuKj8QbRlmvMORCCRlOIIu9v8RNU8SwDjjTiFCZzczCORMns2mCH4HZ1nXgrfkKzYUbfjNRmng==",
+      "version": "11.1.12",
+      "resolved": "https://registry.npmjs.org/@intlify/message-compiler/-/message-compiler-11.1.12.tgz",
+      "integrity": "sha512-Fv9iQSJoJaXl4ZGkOCN1LDM3trzze0AS2zRz2EHLiwenwL6t0Ki9KySYlyr27yVOj5aVz0e55JePO+kELIvfdQ==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/shared": "11.1.7",
+        "@intlify/shared": "11.1.12",
         "source-map-js": "^1.0.2"
       },
       "engines": {
@@ -582,9 +650,9 @@
       }
     },
     "node_modules/@intlify/shared": {
-      "version": "11.1.7",
-      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.7.tgz",
-      "integrity": "sha512-4yZeMt2Aa/7n5Ehy4KalUlvt3iRLcg1tq9IBVfOgkyWFArN4oygn6WxgGIFibP3svpaH8DarbNaottq+p0gUZQ==",
+      "version": "11.1.12",
+      "resolved": "https://registry.npmjs.org/@intlify/shared/-/shared-11.1.12.tgz",
+      "integrity": "sha512-Om86EjuQtA69hdNj3GQec9ZC0L0vPSAnXzB3gP/gyJ7+mA7t06d9aOAiqMZ+xEOsumGP4eEBlfl8zF2LOTzf2A==",
       "license": "MIT",
       "engines": {
         "node": ">= 16"
@@ -594,19 +662,19 @@
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-      "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
       "license": "MIT"
     },
     "node_modules/@lizardbyte/shared-web": {
-      "version": "2025.626.181239",
-      "resolved": "https://registry.npmjs.org/@lizardbyte/shared-web/-/shared-web-2025.626.181239.tgz",
-      "integrity": "sha512-8wZxaUkgnnABMlxzg4Q786yTXufYR0gfgiclkOVgxoqXAWIAiQr10GfKDfb7TKvslqj4EZ8eg7CWJ92Sr9DFPQ==",
+      "version": "2025.922.181114",
+      "resolved": "https://registry.npmjs.org/@lizardbyte/shared-web/-/shared-web-2025.922.181114.tgz",
+      "integrity": "sha512-ISJLK79h10WkZf/fz7wEkrmlEEf9tUe5RQpADdOONXIybAKP/TC2cTfPr1NSRvL4sCoHTHv1oOlMkauaEAI3kg==",
       "license": "AGPL-3.0-only",
       "dependencies": {
-        "@fortawesome/fontawesome-free": "6.7.2",
-        "bootstrap": "5.3.7"
+        "@fortawesome/fontawesome-free": "7.0.1",
+        "bootstrap": "5.3.8"
       },
       "funding": {
         "url": "https://app.lizardbyte.dev"
@@ -623,9 +691,9 @@
       }
     },
     "node_modules/@octokit/core": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.1.tgz",
-      "integrity": "sha512-dKYCMuPO1bmrpuogcjQ8z7ICCH3FP6WmxpwC03yjzGfZhj9fTJg6+bS1+UAplekbN2C+M61UNllGOOoAfGCrdQ==",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-5.2.2.tgz",
+      "integrity": "sha512-/g2d4sW9nUDJOMz3mabVQvOGhVa4e/BN/Um7yca9Bb2XTzPPnfTWHWQg+IsEYO7M3Vx+EXvaM/I2pJWIMun1bg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -795,68 +863,393 @@
         "url": "https://opencollective.com/popperjs"
       }
     },
-    "node_modules/@vitejs/plugin-vue": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.6.2.tgz",
-      "integrity": "sha512-kqf7SGFoG+80aZG6Pf+gsZIVvGSCKE98JbiWqcCV9cThtg91Jav0yvYFC9Zb+jKetNGF6ZKeoaxgZfND21fWKw==",
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-beta.29",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.29.tgz",
+      "integrity": "sha512-NIJgOsMjbxAXvoGq/X0gD7VPMQ8j9g0BiDaNjVNVjvl+iKXxL3Jre0v31RmBYeLEmkbj2s02v8vFTbUXi5XS2Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.4.tgz",
+      "integrity": "sha512-BTm2qKNnWIQ5auf4deoetINJm2JzvihvGb9R6K/ETwKLql/Bb3Eg2H1FBp1gUb4YGbydMA3jcmQTR73q7J+GAA==",
+      "cpu": [
+        "arm"
+      ],
       "dev": true,
       "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.4.tgz",
+      "integrity": "sha512-P9LDQiC5vpgGFgz7GSM6dKPCiqR3XYN1WwJKA4/BUVDjHpYsf3iBEmVz62uyq20NGYbiGPR5cNHI7T1HqxNs2w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.4.tgz",
+      "integrity": "sha512-QRWSW+bVccAvZF6cbNZBJwAehmvG9NwfWHwMy4GbWi/BQIA/laTIktebT2ipVjNncqE6GLPxOok5hsECgAxGZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.4.tgz",
+      "integrity": "sha512-hZgP05pResAkRJxL1b+7yxCnXPGsXU0fG9Yfd6dUaoGk+FhdPKCJ5L1Sumyxn8kvw8Qi5PvQ8ulenUbRjzeCTw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.4.tgz",
+      "integrity": "sha512-xmc30VshuBNUd58Xk4TKAEcRZHaXlV+tCxIXELiE9sQuK3kG8ZFgSPi57UBJt8/ogfhAF5Oz4ZSUBN77weM+mQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.4.tgz",
+      "integrity": "sha512-WdSLpZFjOEqNZGmHflxyifolwAiZmDQzuOzIq9L27ButpCVpD7KzTRtEG1I0wMPFyiyUdOO+4t8GvrnBLQSwpw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.4.tgz",
+      "integrity": "sha512-xRiOu9Of1FZ4SxVbB0iEDXc4ddIcjCv2aj03dmW8UrZIW7aIQ9jVJdLBIhxBI+MaTnGAKyvMwPwQnoOEvP7FgQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.4.tgz",
+      "integrity": "sha512-FbhM2p9TJAmEIEhIgzR4soUcsW49e9veAQCziwbR+XWB2zqJ12b4i/+hel9yLiD8pLncDH4fKIPIbt5238341Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.4.tgz",
+      "integrity": "sha512-4n4gVwhPHR9q/g8lKCyz0yuaD0MvDf7dV4f9tHt0C73Mp8h38UCtSCSE6R9iBlTbXlmA8CjpsZoujhszefqueg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.4.tgz",
+      "integrity": "sha512-u0n17nGA0nvi/11gcZKsjkLj1QIpAuPFQbR48Subo7SmZJnGxDpspyw2kbpuoQnyK+9pwf3pAoEXerJs/8Mi9g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.4.tgz",
+      "integrity": "sha512-0G2c2lpYtbTuXo8KEJkDkClE/+/2AFPdPAbmaHoE870foRFs4pBrDehilMcrSScrN/fB/1HTaWO4bqw+ewBzMQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.4.tgz",
+      "integrity": "sha512-teSACug1GyZHmPDv14VNbvZFX779UqWTsd7KtTM9JIZRDI5NUwYSIS30kzI8m06gOPB//jtpqlhmraQ68b5X2g==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.4.tgz",
+      "integrity": "sha512-/MOEW3aHjjs1p4Pw1Xk4+3egRevx8Ji9N6HUIA1Ifh8Q+cg9dremvFCUbOX2Zebz80BwJIgCBUemjqhU5XI5Eg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.4.tgz",
+      "integrity": "sha512-1HHmsRyh845QDpEWzOFtMCph5Ts+9+yllCrREuBR/vg2RogAQGGBRC8lDPrPOMnrdOJ+mt1WLMOC2Kao/UwcvA==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.4.tgz",
+      "integrity": "sha512-seoeZp4L/6D1MUyjWkOMRU6/iLmCU2EjbMTyAG4oIOs1/I82Y5lTeaxW0KBfkUdHAWN7j25bpkt0rjnOgAcQcA==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.4.tgz",
+      "integrity": "sha512-Wi6AXf0k0L7E2gteNsNHUs7UMwCIhsCTs6+tqQ5GPwVRWMaflqGec4Sd8n6+FNFDw9vGcReqk2KzBDhCa1DLYg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.4.tgz",
+      "integrity": "sha512-dtBZYjDmCQ9hW+WgEkaffvRRCKm767wWhxsFW3Lw86VXz/uJRuD438/XvbZT//B96Vs8oTA8Q4A0AfHbrxP9zw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.4.tgz",
+      "integrity": "sha512-1ox+GqgRWqaB1RnyZXL8PD6E5f7YyRUJYnCqKpNzxzP0TkaUh112NDrR9Tt+C8rJ4x5G9Mk8PQR3o7Ku2RKqKA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.4.tgz",
+      "integrity": "sha512-8GKr640PdFNXwzIE0IrkMWUNUomILLkfeHjXBi/nUvFlpZP+FA8BKGKpacjW6OUUHaNI6sUURxR2U2g78FOHWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.4.tgz",
+      "integrity": "sha512-AIy/jdJ7WtJ/F6EcfOb2GjR9UweO0n43jNObQMb6oGxkYTfLcnN7vYYpG+CN3lLxrQkzWnMOoNSHTW54pgbVxw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.4.tgz",
+      "integrity": "sha512-UF9KfsH9yEam0UjTwAgdK0anlQ7c8/pWPU2yVjyWcF1I1thABt6WXE47cI71pGiZ8wGvxohBoLnxM04L/wj8mQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.4.tgz",
+      "integrity": "sha512-bf9PtUa0u8IXDVxzRToFQKsNCRz9qLYfR/MpECxl4mRoWYjAeFjgxj1XdZr2M/GNVpT05p+LgQOHopYDlUu6/w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@types/estree": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@vitejs/plugin-vue": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.1.tgz",
+      "integrity": "sha512-+MaE752hU0wfPFJEUAIxqw18+20euHHdxVtMvbFcOEpjEyfqXH/5DCoTHiVJ0J29EhTJdoTkjEv5YBKU9dnoTw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@rolldown/pluginutils": "1.0.0-beta.29"
+      },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^4.0.0 || ^5.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
         "vue": "^3.2.25"
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
-      "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.21.tgz",
+      "integrity": "sha512-8i+LZ0vf6ZgII5Z9XmUvrCyEzocvWT+TeR2VBUVlzIH6Tyv57E20mPZ1bCS+tbejgUgmjrEh7q/0F0bibskAmw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.5",
-        "@vue/shared": "3.5.17",
+        "@babel/parser": "^7.28.3",
+        "@vue/shared": "3.5.21",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
-      "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.21.tgz",
+      "integrity": "sha512-jNtbu/u97wiyEBJlJ9kmdw7tAr5Vy0Aj5CgQmo+6pxWNQhXZDPsRr1UWPN4v3Zf82s2H3kF51IbzZ4jMWAgPlQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-core": "3.5.21",
+        "@vue/shared": "3.5.21"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
-      "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.21.tgz",
+      "integrity": "sha512-SXlyk6I5eUGBd2v8Ie7tF6ADHE9kCR6mBEuPyH1nUZ0h6Xx6nZI29i12sJKQmzbDyr2tUHMhhTt51Z6blbkTTQ==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.27.5",
-        "@vue/compiler-core": "3.5.17",
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/compiler-ssr": "3.5.17",
-        "@vue/shared": "3.5.17",
+        "@babel/parser": "^7.28.3",
+        "@vue/compiler-core": "3.5.21",
+        "@vue/compiler-dom": "3.5.21",
+        "@vue/compiler-ssr": "3.5.21",
+        "@vue/shared": "3.5.21",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.17",
+        "magic-string": "^0.30.18",
         "postcss": "^8.5.6",
         "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
-      "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.21.tgz",
+      "integrity": "sha512-vKQ5olH5edFZdf5ZrlEgSO1j1DMA4u23TVK5XR1uMhvwnYvVdDF0nHXJUblL/GvzlShQbjhZZ2uvYmDlAbgo9w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-dom": "3.5.21",
+        "@vue/shared": "3.5.21"
       }
     },
     "node_modules/@vue/devtools-api": {
@@ -866,53 +1259,53 @@
       "license": "MIT"
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
-      "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.21.tgz",
+      "integrity": "sha512-3ah7sa+Cwr9iiYEERt9JfZKPw4A2UlbY8RbbnH2mGCE8NwHkhmlZt2VsH0oDA3P08X3jJd29ohBDtX+TbD9AsA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.17"
+        "@vue/shared": "3.5.21"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.17.tgz",
-      "integrity": "sha512-QQLXa20dHg1R0ri4bjKeGFKEkJA7MMBxrKo2G+gJikmumRS7PTD4BOU9FKrDQWMKowz7frJJGqBffYMgQYS96Q==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.21.tgz",
+      "integrity": "sha512-+DplQlRS4MXfIf9gfD1BOJpk5RSyGgGXD/R+cumhe8jdjUcq/qlxDawQlSI8hCKupBlvM+3eS1se5xW+SuNAwA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/reactivity": "3.5.21",
+        "@vue/shared": "3.5.21"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.17.tgz",
-      "integrity": "sha512-8El0M60TcwZ1QMz4/os2MdlQECgGoVHPuLnQBU3m9h3gdNRW9xRmI8iLS4t/22OQlOE6aJvNNlBiCzPHur4H9g==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.21.tgz",
+      "integrity": "sha512-3M2DZsOFwM5qI15wrMmNF5RJe1+ARijt2HM3TbzBbPSuBHOQpoidE+Pa+XEaVN+czbHf81ETRoG1ltztP2em8w==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.17",
-        "@vue/runtime-core": "3.5.17",
-        "@vue/shared": "3.5.17",
+        "@vue/reactivity": "3.5.21",
+        "@vue/runtime-core": "3.5.21",
+        "@vue/shared": "3.5.21",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.17.tgz",
-      "integrity": "sha512-BOHhm8HalujY6lmC3DbqF6uXN/K00uWiEeF22LfEsm9Q93XeJ/plHTepGwf6tqFcF7GA5oGSSAAUock3VvzaCA==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.21.tgz",
+      "integrity": "sha512-qr8AqgD3DJPJcGvLcJKQo2tAc8OnXRcfxhOJCPF+fcfn5bBGz7VCcO7t+qETOPxpWK1mgysXvVT/j+xWaHeMWA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-ssr": "3.5.21",
+        "@vue/shared": "3.5.21"
       },
       "peerDependencies": {
-        "vue": "3.5.17"
+        "vue": "3.5.21"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
-      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.21.tgz",
+      "integrity": "sha512-+2k1EQpnYuVuu3N7atWyG3/xoFWIVJZq4Mz8XNOdScFI0etES75fbny/oU4lKWk/577P1zmg0ioYvpGEDZ3DLw==",
       "license": "MIT"
     },
     "node_modules/@zeit/schemas": {
@@ -922,20 +1315,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/accepts": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
-      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mime-types": "~2.1.34",
-        "negotiator": "0.6.3"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/acorn": {
       "version": "8.15.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
@@ -1022,9 +1401,9 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "version": "6.2.2",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz",
+      "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1100,9 +1479,9 @@
       "license": "Apache-2.0"
     },
     "node_modules/bootstrap": {
-      "version": "5.3.7",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.7.tgz",
-      "integrity": "sha512-7KgiD8UHjfcPBHEpDNg+zGz8L3LqR3GVwqZiBRFX04a1BCArZOz1r2kjly2HQ0WokqTO0v1nF+QAt8dsW4lKlw==",
+      "version": "5.3.8",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.8.tgz",
+      "integrity": "sha512-HP1SZDqaLDPwsNiqRqi5NcP0SSXciX2s9E+RyqJIIqGo+vJeN5AJVM98CXmW/Wux0nQ5L7jeWUdplCEf0Ee+tg==",
       "funding": [
         {
           "type": "github",
@@ -1142,9 +1521,9 @@
       }
     },
     "node_modules/boxen/node_modules/chalk": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-      "integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1166,9 +1545,9 @@
       }
     },
     "node_modules/bytes": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
-      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+      "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1286,18 +1665,18 @@
       }
     },
     "node_modules/compression": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
-      "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz",
+      "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "accepts": "~1.3.5",
-        "bytes": "3.0.0",
-        "compressible": "~2.0.16",
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
         "debug": "2.6.9",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.1.2",
+        "negotiator": "~0.6.4",
+        "on-headers": "~1.1.0",
+        "safe-buffer": "5.2.1",
         "vary": "~1.1.2"
       },
       "engines": {
@@ -1412,9 +1791,9 @@
       }
     },
     "node_modules/esbuild": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
-      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
+      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -1422,31 +1801,35 @@
         "esbuild": "bin/esbuild"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/android-arm": "0.18.20",
-        "@esbuild/android-arm64": "0.18.20",
-        "@esbuild/android-x64": "0.18.20",
-        "@esbuild/darwin-arm64": "0.18.20",
-        "@esbuild/darwin-x64": "0.18.20",
-        "@esbuild/freebsd-arm64": "0.18.20",
-        "@esbuild/freebsd-x64": "0.18.20",
-        "@esbuild/linux-arm": "0.18.20",
-        "@esbuild/linux-arm64": "0.18.20",
-        "@esbuild/linux-ia32": "0.18.20",
-        "@esbuild/linux-loong64": "0.18.20",
-        "@esbuild/linux-mips64el": "0.18.20",
-        "@esbuild/linux-ppc64": "0.18.20",
-        "@esbuild/linux-riscv64": "0.18.20",
-        "@esbuild/linux-s390x": "0.18.20",
-        "@esbuild/linux-x64": "0.18.20",
-        "@esbuild/netbsd-x64": "0.18.20",
-        "@esbuild/openbsd-x64": "0.18.20",
-        "@esbuild/sunos-x64": "0.18.20",
-        "@esbuild/win32-arm64": "0.18.20",
-        "@esbuild/win32-ia32": "0.18.20",
-        "@esbuild/win32-x64": "0.18.20"
+        "@esbuild/aix-ppc64": "0.25.10",
+        "@esbuild/android-arm": "0.25.10",
+        "@esbuild/android-arm64": "0.25.10",
+        "@esbuild/android-x64": "0.25.10",
+        "@esbuild/darwin-arm64": "0.25.10",
+        "@esbuild/darwin-x64": "0.25.10",
+        "@esbuild/freebsd-arm64": "0.25.10",
+        "@esbuild/freebsd-x64": "0.25.10",
+        "@esbuild/linux-arm": "0.25.10",
+        "@esbuild/linux-arm64": "0.25.10",
+        "@esbuild/linux-ia32": "0.25.10",
+        "@esbuild/linux-loong64": "0.25.10",
+        "@esbuild/linux-mips64el": "0.25.10",
+        "@esbuild/linux-ppc64": "0.25.10",
+        "@esbuild/linux-riscv64": "0.25.10",
+        "@esbuild/linux-s390x": "0.25.10",
+        "@esbuild/linux-x64": "0.25.10",
+        "@esbuild/netbsd-arm64": "0.25.10",
+        "@esbuild/netbsd-x64": "0.25.10",
+        "@esbuild/openbsd-arm64": "0.25.10",
+        "@esbuild/openbsd-x64": "0.25.10",
+        "@esbuild/openharmony-arm64": "0.25.10",
+        "@esbuild/sunos-x64": "0.25.10",
+        "@esbuild/win32-arm64": "0.25.10",
+        "@esbuild/win32-ia32": "0.25.10",
+        "@esbuild/win32-x64": "0.25.10"
       }
     },
     "node_modules/estree-walker": {
@@ -1486,6 +1869,24 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/fdir": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/filelist": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -1647,16 +2048,15 @@
       "license": "ISC"
     },
     "node_modules/jake": {
-      "version": "10.9.2",
-      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz",
-      "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==",
+      "version": "10.9.4",
+      "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.4.tgz",
+      "integrity": "sha512-wpHYzhxiVQL+IV05BLE2Xn34zW1S223hvjtqk0+gsPrwd/8JNLXJgZZM/iPFsYc1xyphF+6M6EvdE5E9MBGkDA==",
       "dev": true,
       "license": "Apache-2.0",
       "dependencies": {
-        "async": "^3.2.3",
-        "chalk": "^4.0.2",
+        "async": "^3.2.6",
         "filelist": "^1.0.4",
-        "minimatch": "^3.1.2"
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "jake": "bin/cli.js"
@@ -1673,12 +2073,12 @@
       "license": "MIT"
     },
     "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "version": "0.30.19",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz",
+      "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
     "node_modules/merge-stream": {
@@ -1699,22 +2099,22 @@
       }
     },
     "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "mime-db": "1.52.0"
+        "mime-db": "~1.33.0"
       },
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types/node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1780,9 +2180,9 @@
       }
     },
     "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1803,9 +2203,9 @@
       }
     },
     "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz",
+      "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1868,6 +2268,19 @@
       "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
       "license": "ISC"
     },
+    "node_modules/picomatch": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
+      "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
@@ -1967,33 +2380,72 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.29.5",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.5.tgz",
-      "integrity": "sha512-GVsDdsbJzzy4S/v3dqWPJ7EfvZJfCHiDqe80IyrF59LYuP+e6U1LJoUqeuqRbwAWoMNoXivMNeNAOf5E22VA1w==",
+      "version": "4.52.4",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.4.tgz",
+      "integrity": "sha512-CLEVl+MnPAiKh5pl4dEWSyMTpuflgNQiLGhMv8ezD5W/qP8AKvmYpCOKRRNOh7oRKnauBZ4SyeYkMS+1VSyKwQ==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@types/estree": "1.0.8"
+      },
       "bin": {
         "rollup": "dist/bin/rollup"
       },
       "engines": {
-        "node": ">=14.18.0",
+        "node": ">=18.0.0",
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
+        "@rollup/rollup-android-arm-eabi": "4.52.4",
+        "@rollup/rollup-android-arm64": "4.52.4",
+        "@rollup/rollup-darwin-arm64": "4.52.4",
+        "@rollup/rollup-darwin-x64": "4.52.4",
+        "@rollup/rollup-freebsd-arm64": "4.52.4",
+        "@rollup/rollup-freebsd-x64": "4.52.4",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.52.4",
+        "@rollup/rollup-linux-arm-musleabihf": "4.52.4",
+        "@rollup/rollup-linux-arm64-gnu": "4.52.4",
+        "@rollup/rollup-linux-arm64-musl": "4.52.4",
+        "@rollup/rollup-linux-loong64-gnu": "4.52.4",
+        "@rollup/rollup-linux-ppc64-gnu": "4.52.4",
+        "@rollup/rollup-linux-riscv64-gnu": "4.52.4",
+        "@rollup/rollup-linux-riscv64-musl": "4.52.4",
+        "@rollup/rollup-linux-s390x-gnu": "4.52.4",
+        "@rollup/rollup-linux-x64-gnu": "4.52.4",
+        "@rollup/rollup-linux-x64-musl": "4.52.4",
+        "@rollup/rollup-openharmony-arm64": "4.52.4",
+        "@rollup/rollup-win32-arm64-msvc": "4.52.4",
+        "@rollup/rollup-win32-ia32-msvc": "4.52.4",
+        "@rollup/rollup-win32-x64-gnu": "4.52.4",
+        "@rollup/rollup-win32-x64-msvc": "4.52.4",
         "fsevents": "~2.3.2"
       }
     },
     "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==",
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true,
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ],
       "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -2004,9 +2456,9 @@
       }
     },
     "node_modules/serve": {
-      "version": "14.2.4",
-      "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.4.tgz",
-      "integrity": "sha512-qy1S34PJ/fcY8gjVGszDB3EXiPSk5FKhUa7tQe0UPRddxRidc2V6cNHPNewbE1D7MAkgLuWEt3Vw56vYy73tzQ==",
+      "version": "14.2.5",
+      "resolved": "https://registry.npmjs.org/serve/-/serve-14.2.5.tgz",
+      "integrity": "sha512-Qn/qMkzCcMFVPb60E/hQy+iRLpiU8PamOfOSYoAHmmF+fFFmpPpqa6Oci2iWYpTdOUM3VF+TINud7CfbQnsZbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2017,7 +2469,7 @@
         "chalk": "5.0.1",
         "chalk-template": "0.4.0",
         "clipboardy": "3.0.0",
-        "compression": "1.7.4",
+        "compression": "1.8.1",
         "is-port-reachable": "4.0.0",
         "serve-handler": "6.1.6",
         "update-check": "1.5.4"
@@ -2045,27 +2497,14 @@
         "range-parser": "1.2.0"
       }
     },
-    "node_modules/serve-handler/node_modules/mime-db": {
-      "version": "1.33.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
-      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+    "node_modules/serve-handler/node_modules/bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha512-pMhOfFDPiv9t5jjIXkHosWmkSyQbvsgEVNkz0ERHbuLh2T/7j4Mqqpz523Fe8MVY89KC6Sh/QfS2sM+SjgFDcw==",
       "dev": true,
       "license": "MIT",
       "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-handler/node_modules/mime-types": {
-      "version": "2.1.18",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
-      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "~1.33.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8"
       }
     },
     "node_modules/serve/node_modules/chalk": {
@@ -2139,9 +2578,9 @@
       }
     },
     "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -2187,6 +2626,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/tinyglobby": {
+      "version": "0.2.15",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+      "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fdir": "^6.5.0",
+        "picomatch": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/SuperchupuDev"
+      }
+    },
     "node_modules/tunnel": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
@@ -2276,41 +2732,51 @@
       }
     },
     "node_modules/vite": {
-      "version": "4.5.14",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.14.tgz",
-      "integrity": "sha512-+v57oAaoYNnO3hIu5Z/tJRZjq5aHM2zDve9YZ8HngVHbhk66RStobhb1sqPMIPEleV6cNKYK4eGrAbE9Ulbl2g==",
+      "version": "6.3.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.6.tgz",
+      "integrity": "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "esbuild": "^0.18.10",
-        "postcss": "^8.4.27",
-        "rollup": "^3.27.1"
+        "esbuild": "^0.25.0",
+        "fdir": "^6.4.4",
+        "picomatch": "^4.0.2",
+        "postcss": "^8.5.3",
+        "rollup": "^4.34.9",
+        "tinyglobby": "^0.2.13"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
+        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
       },
       "optionalDependencies": {
-        "fsevents": "~2.3.2"
+        "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": ">= 14",
+        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "jiti": ">=1.21.0",
         "less": "*",
         "lightningcss": "^1.21.0",
         "sass": "*",
+        "sass-embedded": "*",
         "stylus": "*",
         "sugarss": "*",
-        "terser": "^5.4.0"
+        "terser": "^5.16.0",
+        "tsx": "^4.8.1",
+        "yaml": "^2.4.2"
       },
       "peerDependenciesMeta": {
         "@types/node": {
           "optional": true
         },
+        "jiti": {
+          "optional": true
+        },
         "less": {
           "optional": true
         },
@@ -2320,6 +2786,9 @@
         "sass": {
           "optional": true
         },
+        "sass-embedded": {
+          "optional": true
+        },
         "stylus": {
           "optional": true
         },
@@ -2328,30 +2797,39 @@
         },
         "terser": {
           "optional": true
+        },
+        "tsx": {
+          "optional": true
+        },
+        "yaml": {
+          "optional": true
         }
       }
     },
     "node_modules/vite-plugin-ejs": {
-      "version": "1.6.4",
-      "resolved": "https://registry.npmjs.org/vite-plugin-ejs/-/vite-plugin-ejs-1.6.4.tgz",
-      "integrity": "sha512-23p1RS4PiA0veXY5/gHZ60pl3pPvd8NEqdBsDgxNK8nM1rjFFDcVb0paNmuipzCgNP/Y0f/Id22M7Il4kvZ2jA==",
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/vite-plugin-ejs/-/vite-plugin-ejs-1.7.0.tgz",
+      "integrity": "sha512-JNP3zQDC4mSbfoJ3G73s5mmZITD8NGjUmLkq4swxyahy/W0xuokK9U9IJGXw7KCggq6UucT6hJ0p+tQrNtqTZw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "ejs": "^3.1.8"
+        "ejs": "^3.1.9"
+      },
+      "peerDependencies": {
+        "vite": ">=5.0.0"
       }
     },
     "node_modules/vue": {
-      "version": "3.5.17",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.17.tgz",
-      "integrity": "sha512-LbHV3xPN9BeljML+Xctq4lbz2lVHCR6DtbpTf5XIO6gugpXUN49j2QQPcMj086r9+AkJ0FfUT8xjulKKBkkr9g==",
+      "version": "3.5.21",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.21.tgz",
+      "integrity": "sha512-xxf9rum9KtOdwdRkiApWL+9hZEMWE90FHh8yS1+KJAiWYh+iGWV1FquPjoO9VUHQ+VIhsCXNNyZ5Sf4++RVZBA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.17",
-        "@vue/compiler-sfc": "3.5.17",
-        "@vue/runtime-dom": "3.5.17",
-        "@vue/server-renderer": "3.5.17",
-        "@vue/shared": "3.5.17"
+        "@vue/compiler-dom": "3.5.21",
+        "@vue/compiler-sfc": "3.5.21",
+        "@vue/runtime-dom": "3.5.21",
+        "@vue/server-renderer": "3.5.21",
+        "@vue/shared": "3.5.21"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -2363,13 +2841,13 @@
       }
     },
     "node_modules/vue-i18n": {
-      "version": "11.1.7",
-      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.1.7.tgz",
-      "integrity": "sha512-CDrU7Cmyh1AxJjerQmipV9nVa//exVBdhTcWGlbfcDCN8bKp/uAe7Le6IoN4//5emIikbsSKe9Uofmf/xXkhOA==",
+      "version": "11.1.12",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-11.1.12.tgz",
+      "integrity": "sha512-BnstPj3KLHLrsqbVU2UOrPmr0+Mv11bsUZG0PyCOzsawCivk8W00GMXHeVUWIDOgNaScCuZah47CZFE+Wnl8mw==",
       "license": "MIT",
       "dependencies": {
-        "@intlify/core-base": "11.1.7",
-        "@intlify/shared": "11.1.7",
+        "@intlify/core-base": "11.1.12",
+        "@intlify/shared": "11.1.12",
         "@vue/devtools-api": "^6.5.0"
       },
       "engines": {
@@ -2440,9 +2918,9 @@
       }
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "version": "6.2.3",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz",
+      "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2460,9 +2938,9 @@
       "license": "ISC"
     },
     "node_modules/zod": {
-      "version": "3.25.67",
-      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.67.tgz",
-      "integrity": "sha512-idA2YXwpCdqUSKRCACDE6ItZD9TZzy3OZMtpfLoh6oPR47lipysRrJfjzMqFxQ3uJuUPyUeWe1r9vLH33xO/Qw==",
+      "version": "3.25.76",
+      "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
+      "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "dev": true,
       "license": "MIT",
       "funding": {
diff --git a/pkgs/by-name/su/sunshine/package.nix b/pkgs/by-name/su/sunshine/package.nix
index 3f73c662ebe6..71ba7020c52d 100644
--- a/pkgs/by-name/su/sunshine/package.nix
+++ b/pkgs/by-name/su/sunshine/package.nix
@@ -56,13 +56,13 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "sunshine";
-  version = "2025.628.4510";
+  version = "2025.924.154138";
 
   src = fetchFromGitHub {
     owner = "LizardByte";
     repo = "Sunshine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xNWFo6a4YrJ+tBFTSReoAEi1oZ4DSguBEusizWeWKYY=";
+    hash = "sha256-QrPfZqd9pgufohUjxlTpO6V0v7B41UrXHZaESsFjZ48=";
     fetchSubmodules = true;
   };
 
@@ -70,7 +70,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ui = buildNpmPackage {
     inherit (finalAttrs) src version;
     pname = "sunshine-ui";
-    npmDepsHash = "sha256-kUixeLf8prsWQolg1v+vJ5rvwKZOsU+88+0hVOgTZ0A=";
+    npmDepsHash = "sha256-miRw5JGZ8L+CKnoZkCuVW+ptzFV3Dg21zuS9lqNeHro=";
 
     # use generated package-lock.json as upstream does not provide one
     postPatch = ''
@@ -187,6 +187,7 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.cmakeBool "SYSTEMD_FOUND" true)
     (lib.cmakeFeature "UDEV_RULES_INSTALL_DIR" "lib/udev/rules.d")
     (lib.cmakeFeature "SYSTEMD_USER_UNIT_INSTALL_DIR" "lib/systemd/user")
+    (lib.cmakeFeature "SYSTEMD_MODULES_LOAD_DIR" "lib/modules-load.d")
     (lib.cmakeBool "BOOST_USE_STATIC" false)
     (lib.cmakeBool "BUILD_DOCS" false)
     (lib.cmakeFeature "SUNSHINE_PUBLISHER_NAME" "nixpkgs")
diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 5759285e91d7..4afee56add8f 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -4,14 +4,15 @@
   fetchzip,
   alsa-lib,
   autoPatchelfHook,
+  copyDesktopItems,
   libglvnd,
   libjack2,
   libX11,
   libXi,
+  makeDesktopItem,
   makeWrapper,
   SDL2,
 }:
-
 let
   platforms = {
     "x86_64-linux" = "linux_x86_64";
@@ -27,20 +28,21 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sunvox";
-  version = "2.1.2b";
+  version = "2.1.3";
 
   src = fetchzip {
     urls = [
       "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
       # Upstream removes downloads of older versions, please save bumped versions to archive.org
-      "https://web.archive.org/web/20250831231045/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
+      "https://web.archive.org/web/20251019141206/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
     ];
-    hash = "sha256-4GcSNu6ikAGNcPWz5ghrL78U6xrcIUqjFabs26LACRM=";
+    hash = "sha256-egOaIZEyI5x2VV660qbO+pan22BFRaa4d+8sOpJhpBM=";
   };
 
   nativeBuildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
+      copyDesktopItems
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       makeWrapper
@@ -58,6 +60,21 @@ stdenv.mkDerivation (finalAttrs: {
     libjack2
   ];
 
+  desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
+    (makeDesktopItem {
+      name = "sunvox";
+      exec = "sunvox";
+      desktopName = "SunVox";
+      genericName = "Modular Synthesizer";
+      comment = "Modular synthesizer with pattern-based sequencer";
+      categories = [
+        "AudioVideo"
+        "Audio"
+        "Midi"
+      ];
+    })
+  ];
+
   dontConfigure = true;
   dontBuild = true;
 
diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 5f1c463ccdf2..b8698cad5acc 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.50.3";
+  version = "2.58.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-ydo3f7TRhHwyrWrKxCT0wFXT5v5NSmoCMRjWf43MizM=";
+    hash = "sha256-JvFfA8hgzVLs+DQqt5CWEdUkgQMrB3zaWaHZAx4d5rg=";
   };
 
-  vendorHash = "sha256-SJisDIpk/xiPffhtA2wKRfftODnchnaOL0wCrLx94k0=";
+  vendorHash = "sha256-oogYnjcoSS+9BX6ybISpzbKuV9AJjxJ8mvuNY66vsQ4=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index db78c39f1121..0c9a7cf2a8c1 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -14,13 +14,13 @@
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "15.2.2";
+  version = "16.2.1";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-jnHPlKA2I/HIUoxDn+h4F9BDTr5G0mLcq6pAlFgxTv8=";
+    hash = "sha256-R+GZE7hxPUOF5eny0vxH7H1Ja82AbXx4xcL4tszaDQc=";
 
     postFetch = ''
       find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -63,7 +63,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-0HQ0+/1gxlODdHeLxgj0y5RtWUOizB+9SULtOmi0DFk=";
+      hash = "sha256-MPTLx/5+0qP7PcxcsIyJEZVUPsoA5J+NG+g92n6vNEk=";
     }
   );
 
@@ -101,7 +101,8 @@ buildNpmPackage rec {
     npm run build
     npm exec electron-builder -- --dir \
       -c.electronDist=electron-dist \
-      -c.electronVersion=${electron.version}
+      -c.electronVersion=${electron.version} \
+      -c.mac.identity=null
 
     runHook postBuild
   '';
diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index 5b4cf6f8f577..35a74463adff 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchsvn,
-  fetchpatch,
   cmake,
   pkg-config,
   makeWrapper,
@@ -29,8 +28,8 @@
 let
   assets = fetchsvn {
     url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
-    rev = "18464";
-    sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa";
+    rev = "18621";
+    sha256 = "sha256-iqQSezGu0tecA53qhrtYA77SLj28WUUCcL4ZCJbK5C8=";
     name = "stk-assets";
   };
 
@@ -68,29 +67,15 @@ in
 stdenv.mkDerivation rec {
 
   pname = "supertuxkart";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "supertuxkart";
     repo = "stk-code";
-    rev = version;
-    hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM=";
+    tag = version;
+    hash = "sha256-/fp5iqTHVrVcxRqbTy/3r+dp19oUj9MI2JauvtPWTWA=";
   };
 
-  patches = [
-    # upstreamed patches required to build against cmake 4.0; remove with next release update.
-    (fetchpatch {
-      name = "Require-Cmake-3.6-or-higher";
-      url = "https://github.com/supertuxkart/stk-code/commit/7d4e8433c124c08c62f5335e2a884aeea71cf184.patch?full_index=1";
-      hash = "sha256-5q/Gf1I/maFPQ83NDIa7Sn6gtLfErwxP16fup4SZ+gc=";
-    })
-    (fetchpatch {
-      name = "Fixed-cmake-4.0-warnings";
-      url = "https://github.com/supertuxkart/stk-code/commit/184c80138faf5232c33ff99ffe7706e821be70c2.patch?full_index=1";
-      hash = "sha256-5zoDmKBRBC2rAUjgpmyc0ZCObGofjuImqk07Tr5K7Og=";
-    })
-  ];
-
   postPatch = ''
     # Deletes all bundled libs in stk-code/lib except those
     # That couldn't be replaced with system packages
@@ -162,17 +147,18 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Free 3D kart racing game";
+    description = "3D open-source arcade racer";
     mainProgram = "supertuxkart";
     longDescription = ''
-      SuperTuxKart is a Free 3D kart racing game, with many tracks,
-      characters and items for you to try, similar in spirit to Mario
-      Kart.
+      Karts. Nitro. Action! SuperTuxKart is a 3D open-source arcade racer
+      with a variety of characters, tracks, and modes to play.
+      It aims to be more fun than realistic, and provides an enjoyable experience for all ages.
     '';
     homepage = "https://supertuxkart.net/";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       peterhoeg
+      SchweGELBin
     ];
     platforms = with lib.platforms; unix;
     changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md";
diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 8bddcb3a20b1..587444f6e36b 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ aware70 ];
   };
 
-  env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow";
+  env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow -DQT_NO_USE_NODISCARD_FILE_OPEN";
   env.GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}";
 
   doCheck = true;
@@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # These may be or already are submitted upstream {{{
     ./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp
+    ./patches/fix-qt-6.10.patch
     # }}}
   ];
 
diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch
new file mode 100644
index 000000000000..d58710225f2d
--- /dev/null
+++ b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch
@@ -0,0 +1,13 @@
+diff --git a/external/qt6ct.cmake b/external/qt6ct.cmake
+index 665b5368..9e6ed0e9 100644
+--- a/external/qt6ct.cmake
++++ b/external/qt6ct.cmake
+@@ -5,7 +5,7 @@ find_package(QT NAMES Qt6
+              COMPONENTS Gui Widgets
+              REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR}
+-             COMPONENTS Gui Widgets
++             COMPONENTS Gui Widgets WidgetsPrivate
+              REQUIRED)
+ 
+ #extract version from qt6ct.h
diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix
index 06e50fbb3495..d7b08a39e6b1 100644
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "supercronic";
-  version = "0.2.35";
+  version = "0.2.38";
 
   src = fetchFromGitHub {
     owner = "aptible";
     repo = "supercronic";
     rev = "v${version}";
-    hash = "sha256-SGW/G9Ud0xsNwD+EXDegh6cGAr4cWeoah7IY6yTREWo=";
+    hash = "sha256-/+jGi1l9q7nlT5uRJVtFk490XuAw8Fi5QOdMnLUTac4=";
   };
 
-  vendorHash = "sha256-q2uH9kY0s1UM2uy6F/x1S0RqIfqXpV5KxnHJLLoAjZY=";
+  vendorHash = "sha256-+fEAlt6KBXfyzfDffde/XmWBXre8w41Q1zr7CfRX9bs=";
 
   excludedPackages = [ "cronexpr/cronexpr" ];
 
diff --git a/pkgs/by-name/su/superhtml/package.nix b/pkgs/by-name/su/superhtml/package.nix
index 33209068dfed..e097b3ff019c 100644
--- a/pkgs/by-name/su/superhtml/package.nix
+++ b/pkgs/by-name/su/superhtml/package.nix
@@ -10,13 +10,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "superhtml";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "kristoff-it";
     repo = "superhtml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jwyhTD3QP017W6sjWhujeSo0C/kPRKyaJqSiSWIsqdc=";
+    hash = "sha256-z8Tc869VTLQSQgfz291i/XgK7STxpZA9cuBdqbVgIsY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index c89aa1c23c17..a123aee689ea 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -18,16 +18,16 @@
 
 buildGoModule rec {
   pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
-  version = "0.18.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "dweymouth";
     repo = "supersonic";
     tag = "v${version}";
-    hash = "sha256-NzgmkxG58XvaxcIcu9J0VeRjCQ922rJOp3IWX49dgIU=";
+    hash = "sha256-GMmIUDgbFFrOqDJ13C0o1fHg1tiWSjbCm36VPD7/IGw=";
   };
 
-  vendorHash = "sha256-dG5D7a13TbVurjqFbKwiZ5IOPul39sCmyPCCzRx0NEY=";
+  vendorHash = "sha256-FQmaxDIVWCxyFdgz03aNRXFyi8UeMeCqiVHNZOqq/8Q=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/pkgs/by-name/su/surf/package.nix b/pkgs/by-name/su/surf/package.nix
index 1e902f4ad50f..fe1c29899ae5 100644
--- a/pkgs/by-name/su/surf/package.nix
+++ b/pkgs/by-name/su/surf/package.nix
@@ -10,7 +10,8 @@
   gsettings-desktop-schemas,
   gtk2,
   libsoup_2_4,
-  webkitgtk_4_0,
+  # webkitgtk_4_0,
+  webkitgtk_4_1,
   xorg,
   dmenu,
   findutils,
@@ -42,7 +43,7 @@ stdenv.mkDerivation rec {
     gsettings-desktop-schemas
     gtk2
     libsoup_2_4
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ]
   ++ (with gst_all_1; [
     # Audio & video support for webkitgtk WebView
@@ -75,6 +76,9 @@ stdenv.mkDerivation rec {
     '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed. master is supposed to support 4.1
+    # but it crashes with BadWindow X Error
+    broken = true;
     description = "Simple web browser based on WebKitGTK";
     mainProgram = "surf";
     longDescription = ''
@@ -85,7 +89,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://surf.suckless.org";
     license = licenses.mit;
-    platforms = webkitgtk_4_0.meta.platforms;
+    platforms = webkitgtk_4_1.meta.platforms;
     maintainers = with maintainers; [ joachifm ];
   };
 }
diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index 67e0a382bd4c..dc598907aa79 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -15,15 +15,15 @@
   makeWrapper,
   zenity,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "surfer";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitLab {
     owner = "surfer-project";
     repo = "surfer";
-    rev = "v${version}";
-    hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rNJIe6FlAQI2B3lsRYHKMIGgJ1Q5EFX7kWgml+sXxtc=";
     fetchSubmodules = true;
   };
 
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     libXi
   ];
 
-  cargoHash = "sha256-89pkHS0YQ77PmQfT8epdu2tPRNAenYGgtoiJVuuVYiI=";
+  cargoHash = "sha256-Q4SyuBNR7FnBe3h1rUo48Sxk2COdQbECiXXrGpwXhPk=";
 
   # Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
   doCheck = false;
@@ -61,10 +61,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Extensible and Snappy Waveform Viewer";
     homepage = "https://surfer-project.org/";
-    changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}";
+    changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${finalAttrs.version}";
     license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ hakan-demirli ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "surfer";
   };
-}
+})
diff --git a/pkgs/by-name/su/surge-XT/clap-option.diff b/pkgs/by-name/su/surge-XT/clap-option.diff
new file mode 100644
index 000000000000..e01502c4d9f8
--- /dev/null
+++ b/pkgs/by-name/su/surge-XT/clap-option.diff
@@ -0,0 +1,21 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 31bee8d5..834ee6f6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -12,6 +12,8 @@ if (NOT SURGE_COMPILE_BLOCK_SIZE)
+   set(SURGE_COMPILE_BLOCK_SIZE 32)
+ endif()
+ 
++option(SURGE_BUILD_CLAP "Build Surge as a CLAP" ON)
++
+ set(SURGE_JUCE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/JUCE" CACHE STRING "Path to JUCE library source tree")
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+@@ -29,7 +31,6 @@ if(${CMAKE_VERSION} VERSION_LESS 3.21)
+   set(SURGE_BUILD_CLAP FALSE)
+ else()
+   message(STATUS "CMake version ${CMAKE_VERSION} allows CLAP build")
+-  set(SURGE_BUILD_CLAP TRUE)
+ endif()
+ 
+ if(SURGE_BUILD_CLAP)
diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index 3cc5357ef96c..bed5df8bc456 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  gitUpdater,
   cmake,
   pkg-config,
   alsa-lib,
@@ -13,20 +14,42 @@
   libXext,
   libXinerama,
   libXrandr,
+
+  buildVST3 ? true,
+  buildLV2 ? true,
+  buildCLAP ? true,
+  buildStandalone ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "surge-XT";
   version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = "surge";
-    tag = "release_xt_${version}";
+    tag = "${finalAttrs.finalPackage.passthru.rev-prefix}${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
 
+  patches = [
+    # NOTE: merged in upstream, remove on package update
+    #     (https://github.com/surge-synthesizer/surge/pull/8202)
+    ./clap-option.diff
+  ];
+
+  postPatch = ''
+    # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333
+    export XDG_DOCUMENTS_DIR=$(mktemp -d)
+
+    # Required for CMake 4
+    # NOTE: libsamplerate is no longer used in Surge-XT, remove on package update
+    substituteInPlace libs/libsamplerate/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1..3.18)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -36,23 +59,21 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libjack2
-    lv2
     libX11
     libXcursor
     libXext
     libXinerama
     libXrandr
-  ];
+  ]
+  ++ lib.optionals buildLV2 [ lv2 ];
 
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DSURGE_BUILD_LV2=TRUE"
-  ];
-
-  CXXFLAGS = [
-    # GCC 13: error: 'uint32_t' has not been declared
-    "-include cstdint"
+    (lib.cmakeBool "SURGE_SKIP_STANDALONE" (!buildStandalone))
+    (lib.cmakeBool "SURGE_SKIP_VST3" (!buildVST3))
+    (lib.cmakeBool "SURGE_SKIP_LV2" buildLV2)
+    (lib.cmakeBool "SURGE_BUILD_CLAP" buildCLAP)
   ];
 
   # JUCE dlopen's these at runtime, crashes without them
@@ -66,19 +87,22 @@ stdenv.mkDerivation rec {
     ]
   );
 
-  # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333
-  postPatch = ''
-    export XDG_DOCUMENTS_DIR=$(mktemp -d)
-  '';
+  passthru = {
+    rev-prefix = "release_xt_";
+    updateScript = gitUpdater {
+      inherit (finalAttrs.finalPackage.passthru) rev-prefix;
+    };
+  };
 
-  meta = with lib; {
+  meta = {
     description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
     homepage = "https://surge-synthesizer.github.io";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       magnetophon
       orivej
+      mrtnvgr
     ];
   };
-}
+})
diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index f5496d621092..af14e136c846 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -77,6 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
       --replace '"zenity' '"${zenity}/bin/zenity'
     patchShebangs scripts/linux/
     cp -r $extraContent/Skins/ resources/data/skins
+
+    substituteInPlace libs/libsamplerate/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1..3.18)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   installPhase = ''
diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index b72ba3e6316b..ee4ef1d3c843 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -11,20 +11,21 @@
   python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sv-lang";
-  version = "7.0";
+  version = "9.1";
 
   src = fetchFromGitHub {
     owner = "MikePopoloski";
     repo = "slang";
-    rev = "v${version}";
-    sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA=";
   };
 
   postPatch = ''
-    substituteInPlace external/CMakeLists.txt \
-      --replace-fail 'set(mimalloc_min_version "2.1")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
+    substituteInPlace external/CMakeLists.txt --replace-fail \
+      'set(mimalloc_min_version "2.2")' \
+      'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
   '';
 
   cmakeFlags = [
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_LIBDIR=lib"
 
-    "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
   ];
 
   nativeBuildInputs = [
@@ -41,6 +42,8 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
+  strictDeps = true;
+
   buildInputs = [
     boost
     fmt
@@ -62,4 +65,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})
diff --git a/pkgs/by-name/sv/svd2rust/package.nix b/pkgs/by-name/sv/svd2rust/package.nix
index 966d25495199..69c4d149f4be 100644
--- a/pkgs/by-name/sv/svd2rust/package.nix
+++ b/pkgs/by-name/sv/svd2rust/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svd2rust";
-  version = "0.37.0";
+  version = "0.37.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-42Yz6BGmT5EcS3N5x6aHyvnfpnYqicje2rtPx3z+Bu0=";
+    hash = "sha256-50g5YVmVYTLYJdaWXk91OYdlghDchkyHXS9j2Z7IXSw=";
   };
 
-  cargoHash = "sha256-pSZrLhEZwbnbjiIHmU5bcpHOEcodgD1mVgO6oI7zTG4=";
+  cargoHash = "sha256-poP1az7Hv/qPrTUvqHbd7aylJrI9LGBMu88g+pFmXF4=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''
diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json
index 14e6cbbb2e17..803047ea156f 100644
--- a/pkgs/by-name/sv/svelte-language-server/package-lock.json
+++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "svelte-language-server",
-  "version": "0.17.19",
+  "version": "0.17.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "svelte-language-server",
-      "version": "0.17.19",
+      "version": "0.17.21",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
@@ -19,7 +19,7 @@
         "prettier": "~3.3.3",
         "prettier-plugin-svelte": "^3.4.0",
         "svelte": "^4.2.19",
-        "svelte2tsx": "~0.7.35",
+        "svelte2tsx": "~0.7.45",
         "typescript": "^5.9.2",
         "typescript-auto-import-cache": "^0.3.6",
         "vscode-css-languageservice": "~6.3.5",
@@ -135,9 +135,9 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.30",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
-      "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -240,9 +240,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.19.122",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.122.tgz",
-      "integrity": "sha512-yzegtT82dwTNEe/9y+CM8cgb42WrUfMMCg2QqSddzO1J6uPmBD7qKCZ7dOHZP2Yrpm/kb0eqdNMn2MUyEiqBmA==",
+      "version": "18.19.130",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz",
+      "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -733,10 +733,13 @@
       "license": "MIT"
     },
     "node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -1101,22 +1104,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "version": "0.30.19",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz",
+      "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
     "node_modules/make-error": {
@@ -1284,16 +1278,6 @@
         "@sinonjs/commons": "^3.0.1"
       }
     },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -1346,16 +1330,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "license": "MIT",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -1511,10 +1485,16 @@
       ],
       "license": "MIT"
     },
+    "node_modules/scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+      "license": "MIT"
+    },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -1696,13 +1676,13 @@
       }
     },
     "node_modules/svelte2tsx": {
-      "version": "0.7.42",
-      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.42.tgz",
-      "integrity": "sha512-PSNrKS16aVdAajoFjpF5M0t6TA7ha7GcKbBajD9RG3M+vooAuvLnWAGUSC6eJL4zEOVbOWKtcS2BuY4rxPljoA==",
+      "version": "0.7.45",
+      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.45.tgz",
+      "integrity": "sha512-cSci+mYGygYBHIZLHlm/jYlEc1acjAHqaQaDFHdEBpUueM9kSTnPpvPtSl5VkJOU1qSJ7h1K+6F/LIUYiqC8VA==",
       "license": "MIT",
       "dependencies": {
         "dedent-js": "^1.0.1",
-        "pascal-case": "^3.1.1"
+        "scule": "^1.3.0"
       },
       "peerDependencies": {
         "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",
@@ -1776,12 +1756,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
-    },
     "node_modules/type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
@@ -1793,9 +1767,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -1829,9 +1803,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.7",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.7.tgz",
-      "integrity": "sha512-5TmXHKllPzfkPhW4UE9sODV3E0bIOJPOk+EERKllf2SmAczjfTmYeq5txco+N3jpF8KIZ6loj/JptpHBQuVQRA==",
+      "version": "6.3.8",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.8.tgz",
+      "integrity": "sha512-dBk/9ullEjIMbfSYAohGpDOisOVU1x2MQHOeU12ohGJQI7+r0PCimBwaa/pWpxl/vH4f7ibrBfxIZY3anGmHKQ==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix
index 7ed2dfa682b1..fd6f70afe676 100644
--- a/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/pkgs/by-name/sv/svelte-language-server/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
 }:
 let
-  version = "0.17.19";
+  version = "0.17.21";
 in
 buildNpmPackage {
   pname = "svelte-language-server";
@@ -12,10 +12,10 @@ buildNpmPackage {
 
   src = fetchurl {
     url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
-    hash = "sha256-5Jap4dZzVWZxrIQSWUnTXG63re4T2mjcSvSilM7EReI=";
+    hash = "sha256-zRUeAocuEyoaBUrCDkqxJhMY7ryv9y7hYQC5/CsL2NM=";
   };
 
-  npmDepsHash = "sha256-stE8uno/Oc/LvEWvD8KqoQ/mfNJHWa4PatGDwE+ix7E=";
+  npmDepsHash = "sha256-0nad0gdQhl3nwHbmDyLCfnIfgn4ixBbZn/oy3THDniw=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix
index f70e0192d7b1..dafbaa95d41c 100644
--- a/pkgs/by-name/sv/svg2pdf/package.nix
+++ b/pkgs/by-name/sv/svg2pdf/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with maintainers; [
       doronbehar
-      figsoda
     ];
     mainProgram = "svg2pdf";
   };
diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix
index 10f0c8c68cde..3b8e4a2a246a 100644
--- a/pkgs/by-name/sv/svlint/package.nix
+++ b/pkgs/by-name/sv/svlint/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svlint";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-YtBI2AnwSyeirHAXRavRKayfAmgXyyCMNhfEbUMXPgk=";
+    hash = "sha256-RjdhXp9Dm6ZrRfJKsjnzAFgXTIQB3DJmDMwwtQD4Uzw=";
   };
 
-  cargoHash = "sha256-78v28MEW06AIMZa2lNmql3/3t6bI+HCW48vKzRTDjFQ=";
+  cargoHash = "sha256-in8DObo5QENl1N36lI16DpEXepFU3Y0BYkJOXinmUjE=";
 
   cargoBuildFlags = [
     "--bin"
diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix
index ccfa44fb24ce..da8f22499b6c 100644
--- a/pkgs/by-name/sv/svp/package.nix
+++ b/pkgs/by-name/sv/svp/package.nix
@@ -1,26 +1,23 @@
 {
   stdenv,
+  lib,
   buildFHSEnv,
   writeShellScriptBin,
   fetchurl,
   callPackage,
   makeDesktopItem,
   copyDesktopItems,
-  ffmpeg,
-  glibc,
-  jq,
-  lib,
-  libmediainfo,
-  libsForQt5,
-  libusb1,
-  ocl-icd,
-  p7zip,
-  patchelf,
   socat,
+  jq,
+  kdePackages,
+  ffmpeg,
+  libmediainfo,
+  libusb1,
   vapoursynth,
-  xdg-utils,
   xorg,
-  zenity,
+  systemdLibs,
+  openssl,
+  p7zip,
 }:
 let
   mpvForSVP = callPackage ./mpv.nix { };
@@ -39,49 +36,50 @@ let
     done
   '';
 
+  # SVP expects findmnt to return path to storage device for software protection.
+  # Workaround for tmp-as-root and encrypted root use cases, by returning first storage device on system.
+  fakeFindmnt = writeShellScriptBin "findmnt" ''
+    find /dev/ -name 'nvme*n*p*' -or -name 'sd*' -or -name 'vd*' 2>/dev/null | sort | head -n1
+  '';
+
   libraries = [
-    fakeLsof
-    ffmpeg.bin
-    glibc
-    zenity
-    libmediainfo
-    libsForQt5.qtbase
-    libsForQt5.qtwayland
-    libsForQt5.qtdeclarative
-    libsForQt5.qtscript
-    libsForQt5.qtsvg
-    libusb1
     mpvForSVP
-    ocl-icd
+    fakeLsof
+    fakeFindmnt
     (lib.getLib stdenv.cc.cc)
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    ffmpeg.bin
+    libmediainfo
+    libusb1
     vapoursynth
-    xdg-utils
     xorg.libX11
+    systemdLibs
+    openssl
   ];
 
-  svp-dist = stdenv.mkDerivation rec {
+  svp-dist = stdenv.mkDerivation (finalAttrs: {
     pname = "svp-dist";
-    version = "4.6.263";
+    version = "4.7.305";
     src = fetchurl {
-      url = "https://www.svp-team.com/files/svp4-linux.${version}.tar.bz2";
-      sha256 = "sha256-HyRDVFHVmTan/Si3QjGQpC3za30way10d0Hk79oXG98=";
+      url = "https://www.svp-team.com/files/svp4-linux.${finalAttrs.version}.tar.bz2";
+      hash = "sha256-PWAcm/hIA4JH2QtJPP+gSJdJLRdfdbZXIVdWELazbxQ=";
     };
 
     nativeBuildInputs = [
       p7zip
-      patchelf
     ];
     dontFixup = true;
 
     unpackPhase = ''
-      tar xf ${src}
+      tar xf ${finalAttrs.src}
     '';
 
     buildPhase = ''
       mkdir installer
-      LANG=C grep --only-matching --byte-offset --binary --text  $'7z\xBC\xAF\x27\x1C' "svp4-linux-64.run" |
+      LANG=C grep --only-matching --byte-offset --binary --text  $'7z\xBC\xAF\x27\x1C' "svp4-linux.run" |
         cut -f1 -d: |
-        while read ofs; do dd if="svp4-linux-64.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done
+        while read ofs; do dd if="svp4-linux.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done
     '';
 
     installPhase = ''
@@ -96,7 +94,7 @@ let
       done
       rm -f $out/opt/{add,remove}-menuitem.sh
     '';
-  };
+  });
 
   fhs = buildFHSEnv {
     pname = "SVPManager";
diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 350eb6bc22f8..ff0671cada78 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -22,7 +22,7 @@ let
     requests-mock
     ;
 
-  version = "4.137";
+  version = "4.163";
 
 in
 
@@ -35,7 +35,7 @@ buildPythonApplication {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    hash = "sha256-KBX2YfDyEu9nwlaZlOw+4FKy+hhLncVr8xhXn7XhvAU=";
+    hash = "sha256-2Qge6jmmymIBPWVwaY43h/njlqGzQWPD718gsaIAYx0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
index 4600a0aeaff9..e69a0ea7abd4 100644
--- a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
+++ b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
@@ -1,68 +1,72 @@
 {
-  "@biomejs/cli-darwin-arm64@npm:2.1.4": "11ec854dec62d9ba34df3ce240a6baca6ff78d41d2bbcfed47741f3c13566007a93f60290eb043d6e4bc4b5f7997ebcbd843781d6cdadb74368bad788e7f8d86",
-  "@biomejs/cli-darwin-x64@npm:2.1.4": "e35434896cb45410cd2565d1c476526c6ac0421368d27624a84b12993ccb8afdd5b8b45eaec9b4fe92497a0718ecb6d0ff26de4d8d2647ac821906e8d77bdbea",
-  "@biomejs/cli-linux-arm64-musl@npm:2.1.4": "42f9e3ca494471875fd404c79d5fa19c01626aee48fde619861ebe695d40fd5ecca3a6d211eb165058ba2091e3e0df317e16e4c887794198291144de0d3742b3",
-  "@biomejs/cli-linux-arm64@npm:2.1.4": "49896343090353fdd1b5f1bdd109bcd2f93ce43a73d3d58bafbd58b5dfda2b1cde288adcd9d58603a9b34c2c83ba0471ee2bde06724b4388af940df9fb4ae4a0",
-  "@biomejs/cli-linux-x64-musl@npm:2.1.4": "11f30c976bd395e7cdaac88858055c06327bd20a4f7d499a799286c05c653d025ce2783b1ed741e07afb2757803dd324a8f217fc804d04859ab6f9650c050811",
-  "@biomejs/cli-linux-x64@npm:2.1.4": "3e9831d10f9113be37ecdd293a3fb54645e63edc3acae9d810a37e028ebe2061d71ba6e8589f6a2e41c31533fa011403366cadff7d1606765dd7363e1bf7cd14",
-  "@biomejs/cli-win32-arm64@npm:2.1.4": "44a1400a476e76c48d4522a723af594afb1c2d837b3bebcb084ce84fedd3cf58c7c848cff72c788ee7e428ff40954baefb54b754632cd41a3649e1dc5f027284",
-  "@biomejs/cli-win32-x64@npm:2.1.4": "2414e6b01d637739c851b08393a3298cfc6a6912037042f58ec63d789cdd6ccd2ad634d44613b09daa21ade9d880a0575d67486c0ed37668dab4746fb9ae519b",
-  "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
-  "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
-  "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
-  "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
-  "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
-  "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
-  "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
-  "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
-  "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
-  "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
-  "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
-  "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
-  "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
-  "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
-  "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
-  "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
-  "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
-  "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
-  "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
-  "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
-  "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
-  "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
-  "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
-  "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
-  "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
-  "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
-  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
-  "@rollup/rollup-android-arm-eabi@npm:4.45.1": "c8f4939edd5bdac2d846307e7accddd8d777accbc900757386feeb26b609813b1e6cb1860464700b8f724f0175701a52cfe35aaab40193e471d72967d2580cea",
-  "@rollup/rollup-android-arm64@npm:4.45.1": "f4a842bbd8ec08eea0a3d76381bf7441e0bd9cca34b83519044c9d30514639d6c9125234253705b14dcade1faef603829892627f3e5b3fb79ca2fffdb7f0a1dc",
-  "@rollup/rollup-darwin-arm64@npm:4.45.1": "9cd3c451dd4727ea97d67f7a1d19c16cd91b53509c2b7f0e123ca2ecfa5a542ac9e0d7ed5d4a2fc6e0e2636b2d783a5ea94d3d9b079e58094807f46af2d3b1f5",
-  "@rollup/rollup-darwin-x64@npm:4.45.1": "beff80194e9aa470f233783230e607c16c3180c479c630b1affb792ea94517305c7736f5bcc50bf7485532179713258b8688904ffd1a39b4cedbbd37a60fc676",
-  "@rollup/rollup-freebsd-arm64@npm:4.45.1": "92a873121ff3828a904ae5c073ac11206749cffaa2f0f717a0261318cda8992d951993ae57aae519ffd840fe74b8e4cb41a419996e4b7114007e163dafd24d28",
-  "@rollup/rollup-freebsd-x64@npm:4.45.1": "919ff2d364ddeb2c4ed717c772b9f9e4b616dbcb8db25123a9f48468b1777e0db0ab2a80a48674e0dad7036cbf5407de83532123b09986226ad3759806fe369e",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.45.1": "f519dc61d585495502a81f10898eed4a1d7d3d3d7675c0e9082924622a68212d586dcc31ad6fff4562eacdf0420c3017e66c9960fc972b4c3605d2f7bc3d6581",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.45.1": "aad10aefd9142278a87f9d6489d1f14666ca4c9345b099942dee8e30fb5e1cc6bee630c8de48d4b11302315e8341bdc0664560388792db248823532eb81eee4a",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.45.1": "2822750ecd8f9566095c3a51e2666c9e35d307fb322f730303259d035b3d2f3960441d9647cc3fd15b3bc5e37bc8190461c318a05c189dc95ff636024b0b4169",
-  "@rollup/rollup-linux-arm64-musl@npm:4.45.1": "372430e2ae57007b64358eb4c26720b1dcdd80fd2ee24688ceb4d6031158790039f9d1a48f60df7a57e17e82395609428eca90e5e467766d867a60104c73eed5",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.45.1": "fb0063b86d3308eea4940798ea711867a8de1a7494070b55bbf86a03b401b41b75cb88868e13f45148653699a18b1d2363351801a5b0c0b653867e4e662daa98",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.45.1": "bc9f4c68939f98562864b5100a78a6f6e3d9597db2f459b99fa114e498c14f06171647be3d7a560781483ee1971122a7e3b3ab58e2584b960447994ba444eb4e",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.45.1": "bc0a285841a777e14836be0102d58ecaf064d0373fde1aae730844d27c7f2982ccdfc0cab41d3c689b1472258fdc93568ca71660423ed670d938e3583570f69b",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.45.1": "2150cb74acb44af2a2ead9068006efc76201b651f0ee09061aebd4e6e22b75254b3e64a8e1684c422ef72ea4001049379110199126dac288602464c4432dbdb6",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.45.1": "a11dad7ddd921104d33d1d5aed05beef4ac8d6e79b69e5afc3612d424a2e12e67c6cd67d916b4f0f981bdb5738fe7c59a5e342fe265bc989a2acc9c981d3e212",
-  "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
-  "@rollup/rollup-linux-x64-musl@npm:4.45.1": "dd53812371c9e7c68d4a4d6d96993c3d2def5c91c7bd9f264d832263f5fb0b7601789cb394b4ee835ff5c828a02da7421bef43e31131c44eccb548cca576d886",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.45.1": "5d336c675befca41c76b0529e194e30eca93465512db3a95afcb626cf3fe56664d9e1e9b124a29c02383f43fe8638c5a1652171bdd341d8ea65ebc8462050e3f",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.45.1": "53e1aea2fb90f3704b272d3f89009a04891ce318d7cdf5dea85092b1f039499a8f916065e9775ddebaa1af411bf8213d656bd540eabfcd7f764eaf0d21c33b98",
-  "@rollup/rollup-win32-x64-msvc@npm:4.45.1": "801641e0ecef2e8fd0e616ba443b029adb9a2ed5303b8f7ad8caf23a6615ba5e221dbefb138d17ef77039e6a240c0ba1ea022cf1e116a5545ea518a6063c1e63"
+  "@biomejs/cli-darwin-arm64@npm:2.2.6": "38ade81bfc2cf3c981fc6c06f15d41faefec1eed3be7a9c856304db9d0010700769479e2df16f7f421bf335a910b72fa1bf5185f30dd8372d416972a623c7841",
+  "@biomejs/cli-darwin-x64@npm:2.2.6": "42d5a3ca874969d3e1d72a7151f1ef3a40cb887f8c6c315a1898cf53f8a825eeb1419fbc691adf1551ec06355cf4c11f5400ecb42720e63a44c5c5b0db6f1cbc",
+  "@biomejs/cli-linux-arm64-musl@npm:2.2.6": "866839019a2a5ad2e731a4f04c1effdeb41a2559e04639ecc33bbc119c0d217175dd8e972ec54d34f84edea8db00ee75fda7bca44bbdcba5495ebffbaf3dc709",
+  "@biomejs/cli-linux-arm64@npm:2.2.6": "18db4d7c04347b2095584b9ed851234aeb31599a112176418d8b29d3dcc73f6e2b4a759e3c20b3a0440d57b6656056c418f8b9f52aad5e1bbb02385f97792bee",
+  "@biomejs/cli-linux-x64-musl@npm:2.2.6": "b43573c8cda9b9026d911931b8fd517a0e1f661ff6529ad718852cc8716a68632361d06f1c14bcc73fd600c69aeb7542680ac66a46a2461f6a4a645e7cef1d9b",
+  "@biomejs/cli-linux-x64@npm:2.2.6": "06f32d1d001eb09d9783587318f94fa52c3055826c0b835f48c18fc480aecfd311bcc0ddac678c709949f3b99b1283450cb073bbcc8b1631c39877d7264ac62e",
+  "@biomejs/cli-win32-arm64@npm:2.2.6": "fbdbb024198c027edc2043e1f6416592263624a4534768a98a46b359bfa813e9b919e2bb89f10114b7bfd7e78d29b298773262a255c924555096b39df9d35323",
+  "@biomejs/cli-win32-x64@npm:2.2.6": "7ceac86065c5e7c765993d4b300fd29c710678d2c65ea4394ed68ccf6ae1fa5133730829a7db8915dfb2877792093b8d5fe6eaea3ed727826ee5e2ac11530274",
+  "@esbuild/aix-ppc64@npm:0.25.11": "46c2697b0e5bf6a1d1d57e80358ee04fcb0d59a1c6648759ec94e12a83af50d35ecf2469cf7c5643f85a9b2c5b2f91173bc6485ebec9bb9add4a6b30b5dab95c",
+  "@esbuild/android-arm64@npm:0.25.11": "cc45d931e813767a15ad6e7fd6071c97865a2e9aaa0d3a78374da452d303dbea71a4f13c63426b01f71ce3c10dd208f9382e6387505111adaf631e39749aa404",
+  "@esbuild/android-arm@npm:0.25.11": "b8ee90079d3d6c02b732529b04d2e6c017d12b2c401f2f8d6e60ec5fb1060d819edde5429acfbc7471b2224b4457de8cb99b97bea4164e94a3da2cbf121e60a4",
+  "@esbuild/android-x64@npm:0.25.11": "c03182ed17c50ab29973b19814cbdee85ff67ba00e13f001fafabcf7538d061fd737a783fc4131f96e22b2e7bed26936e5e730b717bb88ffb0b8c429fadd6536",
+  "@esbuild/darwin-arm64@npm:0.25.11": "67114421780e01c947d3a646d9737d5965e2bf39ea75a2440d614971b7b2565a8cc91c39780f5b86adc25cdc466bbf1ade79a05cef71827e3f3a2be00435d868",
+  "@esbuild/darwin-x64@npm:0.25.11": "da5612584d5fc2e714efc0876826fa45a48fa3b881be4a728516f2394c6aeb72f6ca8ce08272106c24ea6a9b040513afd847b4ea9bfcc5a6637e427a1634acd7",
+  "@esbuild/freebsd-arm64@npm:0.25.11": "8ad357e0b7605a320d428b10ab704a2f34383786bb43e663ebb62ded22297343c72149ab126257629308195cd18b4828f9b90579b224c26d2ca56f416dcb3e48",
+  "@esbuild/freebsd-x64@npm:0.25.11": "a42ea4c6801eb2ff09b0f1e67a04b2d4a00da9dc08233a8dc227b25468efa954ea13478bd2f2dad46bf78e8d1ec3cf11b1edbc1b50af7e61da05e715f0ea0fc7",
+  "@esbuild/linux-arm64@npm:0.25.11": "c8f87df1d15ff5c835d782e26213bb28653eed9388351e42c073431ffa8e3606fa8e0670ccb0df325f56a9695782b34c98af2fe30756953a883f9da63d1eb42a",
+  "@esbuild/linux-arm@npm:0.25.11": "122d069ed8332d3eb6e3f0d99c7f25d8920d6aff3655013d6bc2f3666fcba85ae074402b54f3a2ca9a3a3a9cd54350fac1f56252d84d466daefca7a8dc82975b",
+  "@esbuild/linux-ia32@npm:0.25.11": "dbd90c3efbbb33b920abb3f3def4a61fcff258b8a60289c61c0ba6d5210fae8fd569af991ff9aaebe03b3c24a0c67a5fd74d8e32e8fd7c5a0dbf1898aeeb2bf3",
+  "@esbuild/linux-loong64@npm:0.25.11": "c58d14d84cf4f024f5cc585efd759b161ec4122767d94500578cf32f9649542ab7e7b5e2b88389d774d4544d50a39ba1e0d791793170643645ec6a2eb8836ffe",
+  "@esbuild/linux-mips64el@npm:0.25.11": "5a3f4ccefe0d8ed30806a6984b7b6cee17e2f2a14d3f6d64c37f05f78f6dddd04821fd5ff4d61044ce23c0206a8fd4f1535a90d534e26cb5e90c8c04d1203a0a",
+  "@esbuild/linux-ppc64@npm:0.25.11": "e35d0a4e54f7d48aa931abe6211b7fc374291b26cd59849fff938499114b5b34e3da15b71e67b76f83c1d712d6f78a50255d8b96bacaad8df233771126544ebe",
+  "@esbuild/linux-riscv64@npm:0.25.11": "4e932cf5950d97aec76aa5c52d7d15e7135f2b865414c97cd4410adc3f8b26e1588cda7a09222b92f54fff8c888180219e822b9a633c833098bb876b1e66ac02",
+  "@esbuild/linux-s390x@npm:0.25.11": "af2b8a5c0a6147985b1d194a7c1323b4693b72ad5884de1292f045882b41436cf4e64828c18cdbf7b85763060404279cc070fbf74c00f9f82d8f35469b8c0073",
+  "@esbuild/linux-x64@npm:0.25.11": "1e1fe2d9c8ae8ed76f3090ff2e4d3d084d581cc9298e349daf8addd398ae9b466a1817d9640202956d72479a82e602979ca364035d10e8cb6e2c2baf6e850081",
+  "@esbuild/netbsd-arm64@npm:0.25.11": "03e86862f25a9d3ed05383031ab3430ba73b80e5a1617cf0b9f91ce2a4d5700125398722a4a6145299d6f3626caca556d30604bd24f88af1a289794822322814",
+  "@esbuild/netbsd-x64@npm:0.25.11": "af848a8e720c5ba4fb63a748c657e366770e4f00a249dd4a0eb996bdafa0fcad7f04c88df3ed29cb1b488f76c4f7c3355e192ff71392c81d641dd52bc453355c",
+  "@esbuild/openbsd-arm64@npm:0.25.11": "40d46a15da7643aa57ba7a61aa8174cc7ead37f67b3438eaeb407f6527712b848327a025484a57ce936debced507a2d405614e790491aa181f8178c09b8f2ad2",
+  "@esbuild/openbsd-x64@npm:0.25.11": "8ee73b8cfe0b5d24433400bddcb20c3ceb2cab3d11112ba01c5ee799e3629d24267f6dcfcb2f3aef89726ddc5d10592e35ec46b9725cc9e297af3d8d35a3122b",
+  "@esbuild/openharmony-arm64@npm:0.25.11": "bf2fa9985a1aaba0a4376657e72e73c7d5368d0a1972e12788ec276384e6a20637904c5d07b52a9f10306735898730dbebd55a6234cc0cd30962ee130c7b9a8b",
+  "@esbuild/sunos-x64@npm:0.25.11": "7ac357650fadc4ad44a0615a184920734ab5f4432ddd913bef2cf4e4ef7855f7ffd1995cfabb323c10cb9b876f252cf3f7938b4450cfa9ce3b1488e47d91b6cf",
+  "@esbuild/win32-arm64@npm:0.25.11": "01a7db317fecb784cd273ddfb0f3eb35871709904cc879adfbeca139cb33fbe8db6d33ee53ae4eb3b4185ef9fb6d6f140d9ac0fcbbe61518cf546487d7430dcb",
+  "@esbuild/win32-ia32@npm:0.25.11": "cdb90fcd780022685374b762b2f6fdd19501ff43c4b4b63b9b875cdb56d4c79b4747f36f4893ce57d3f0c520aaf30b0f31309e606bae14738300b22bbb30b1df",
+  "@esbuild/win32-x64@npm:0.25.11": "a7b6080abc4d575c0572e880cefcb24faf89f7e48057652d6ab11e2e5b3fbd4555d27246ee281d5a1ac1f744a29ff90573e7075310e171ade9e2838665caefce",
+  "@rolldown/binding-android-arm64@npm:1.0.0-beta.44": "3584478753a119db5c345c314b7a80a122fe1f4aa868773d5103942f62e81493f922f440c040af86902296b8343a418f8ff325f0336ca477c58a3f00a5fe92cd",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.44": "b3ffe5e3e54d7db2aa77ea24399016c934b68e3c4e7d5124ea90e85a7814e74ef933e07fd640ca0608fbf4a46f6db21087fa301ebf209883db8d0f43b97b5081",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.44": "ecad93425fde8cbc0ab451592887f068fbd3b2e6e7c6a54c12e4f02dceb499ec584a5ebd854b94691e78ad1a097846e0328485adc7c8f69a66531001dfd3afa0",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.44": "4b397b3e5bf3ba2b3f4af648921bd027fbaf9859041b92aa36c9a60d4e25eb7f67da8812d61b80078957ffd2836d3a9618dfa6c4d1141e2c4eb1dd6d4b7a051c",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.44": "0d2be4daa7358490a081769efc6bf5a7ef8007706bf8a54d354950214b4eff91b367f21f4cb4d05d0e0a3dc759528bf8d7eab7e482754c74321d66d612997f43",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.44": "4a0d9d0e06fae39dcd984e5dcb858aa38d34d412e8472290593f3b907aac6e8c1e60b7659020b71063d469faa904dee78fb6678979292ddc7060e765cf0258a7",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.44": "3dfb95b4663bc950d1ed5f93162ed1b7a2cb02281f1ee82901844a9e22e34369dece54d5a9bbf9d3d2381407ca363b8536d236421a793dbd72350dc65d7bfc46",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.44": "d6329c568d9ccd363b215ebffff7b86df0a102d0dcf2b56e32a81e2d1961d052691d8a90e9df5dff3c819a0965635b3b5beb71e125fb7f385aebdf458b3f53a8",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.44": "b0fd15a216b02ff03cb927e84802bc9d8454d5cafcc3561cb9f642997fd5869c6611bdbb5e3391d9d6866ea8b764876db8dcbab6a52017025f4f349c83c6a51f",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.44": "e367f21610a6daf111f337824334474213172f4050d67bf4c7a29f69ba43e35733911cf4c44906b3170cdcaf9fb96ba6386eff29e02650109e11130da46dc53a",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.44": "a53092c1338dfc25fc0447a223748ef5048058ee420fefda15e846131b31c3c8fc6d3f2e975467190905f91abccf8de570653aed77a147513d3dae7ff0004931",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.44": "d985908536816c176699b21626ad57106af36a99d665437cf58f827f54491200763f2b47870c218ac3022d4a43c6ff5bb38438f81a18a1fc88fc837d9e53a459",
+  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.44": "f247d3a00caa1238fed18d6d7f884d02291e3fd570d987f50bf77b0886e767529dae2586093bfd820320eb0548cbdba6784f5b49afd49032a883bfc3f1ea19b4",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.44": "9f13f6cd9f6ba17c79a7c398c1931cd2e8321703d30aea0de56e5c6175e4979d96988ca941576d0d424e928e873625c5802d081498e8111e52382ada737656f2",
+  "@rollup/rollup-android-arm-eabi@npm:4.52.5": "62451748fde2f4a8e8423b2e7f83fd0342e57433fa0f71d378ea38ed3f85dc6a0706ef9feae21d79428f4e274da45c07bc49eb1b3a82c08f6b98d8cf20de83f7",
+  "@rollup/rollup-android-arm64@npm:4.52.5": "d050880ec4e14c0d1ab7e32e6a843c3f39b4161ddd574532482807e6e559e34dee8bfe3862bf06a62e79e46a410afaa3dafedc5e0db41db5cf39c10bbcf32330",
+  "@rollup/rollup-darwin-arm64@npm:4.52.5": "4c7a2994ec5bb915b5b455a507b296c892c914ed0c0c3e8e1958d7e021dc47627a27c756f1628aca2e2ace8487dc93dd801483f0ec40f92603b6a788322e66ed",
+  "@rollup/rollup-darwin-x64@npm:4.52.5": "fcdc3b7954afea6dc191a6244e793a32e8373e1798020d1cfcaf5da48bd23c533b661763d2dbfb87412bf5b1a59377ec06560f64da869126ab8c995391de9047",
+  "@rollup/rollup-freebsd-arm64@npm:4.52.5": "f52788b616f5bc4c5edbc41ca2ac4fde7fbed678a0d2c3249111f4322a76550e682037563d07a0f07eb21f82289e9c5616c41797f3d9caa6d5b4261b8e1ce642",
+  "@rollup/rollup-freebsd-x64@npm:4.52.5": "8fcb45fd9b7ec02848230cefac866bca73f38071e2e85e1217627007df211e814743e3e2525b236dc410acea7f7c4484050e2338391bda509bac34e7e0bc9ca4",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.52.5": "ff055f9efd2f8d1e1ced74a0defa0d089b54789f2b3d3d8f9261180059d6cd45fb895399c938c87467419ce1b37f7c50eaec333d5f140e7d8b53874cfba7bad9",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.52.5": "2932799d8e79831d1f79032d2bced666503466a5d3b87e98a12f577400bad80dfb5ce2883318059c038d061319ed51ed58213bc9b253b3c60a1ac5ca3807ba46",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.52.5": "f2bf47b114856efd75e23baa3c3954fc2a8b864d678610fec5c2ecdab5736d1068fe3c813d29592a9de3f54c0de4055190670ef842333f5bc9e34e1221fb403e",
+  "@rollup/rollup-linux-arm64-musl@npm:4.52.5": "26c8ded405da1a31c414677de84c261d1139cd7bf568e979036d39c613a2783bff559ba9cd4ebeda06c517d709050fea97ed65ca482316322984a1bad51ccc05",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.52.5": "3fec9dbb69d304495c40c26d49e736ae98ac173368ed0f0115fdf90b464e8bdd716b5a10f0458438a8ee31d5b13cb219ceff2ea0773537a87b597a3aaf6c0fbd",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.52.5": "542b1171f910f3298a1f326ca6dfb41463ac8a9291f21502830a75217d91c38a0701517c4424c1d114b7fcba06b5fdc1ac95b9814ff542fc1c5741c965a12fc0",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.52.5": "3f8a728b372d5cd2964281bdfe6184cd6dcff579681ea3a9bcb240d2fdaa0181a763f6f34930eae206d00c687cbecfa3d3b18b49bfdef0b772809fac80e007d8",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.52.5": "26b5a6d0983aeea544421d697787a540de653a84f948389280cfde0add366fa0fb7af4a5e67ca490a63a8fabca801f04b23a70bb948cbe06d48aa0ab0b3fff73",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.52.5": "6f4b1605d9cb191ec404ad2418f5fbc43d5585a83eeb33f8a8de6d2393e4ec85fb42a4e55da7d100bdd708e830e89b815d4e444f34b3002096370b1e1e80bee7",
+  "@rollup/rollup-linux-x64-gnu@npm:4.52.5": "70fdee240db9c56c9a2a202450f4fb2b8cad059bb001c10cfc37b8ba1a333f1ad61b4a9bc01df005d9d0eb9c7ae57103c70c4ba58ef89942e11b0eb449cb3fd8",
+  "@rollup/rollup-linux-x64-musl@npm:4.52.5": "871865574e0a5f79af49151685b1e243d43f0eb11100cffb9d835c4aa3423a471dfbb56ba7d16928eb11df7956e307c74d0b5cd872db711cd382bc36e487be9a",
+  "@rollup/rollup-openharmony-arm64@npm:4.52.5": "15150989aa46138a5675962f1bfb01640a212e26976e799be4b0029c2e6f0e7a21b32754457b13dac05d02aa04814b6d0a6ee43dbf3473dc9fce00c7d8c0155f",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.52.5": "6433d349de33e71bb1cd11192ac58827630ef1b4eef79af40708cd7a8375922bfdcde69ed9e31309ae9b9224e3d9237ac00191a1c8406c7e3bbfa99d57baae00",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.52.5": "0da2d66ad1bc046a601b9de5a1266ba61a08e211df670d056451a58ee92a1a1de3739cfae853bf133c4204802ec7c72d2fae607f7ef31789e6124c23441f3f07",
+  "@rollup/rollup-win32-x64-gnu@npm:4.52.5": "a7d3489e79f1cd8e4d34e784f3e32e9681170e4fc7d568cf43b31511c6b9c0e03db722c76baa595799c85ebd96a7e6ce66670ec00ed253e674d7e732a244c554",
+  "@rollup/rollup-win32-x64-msvc@npm:4.52.5": "eb1c823b1e13f27b49321ae56f4c35710194d674034820f6c0b66a2309cbefaff7bc4a58e6c3fbb2453f8913f4aa1cc173cf9f6e9085df47f1922626630260da"
 }
diff --git a/pkgs/by-name/sw/swagger-typescript-api/package.nix b/pkgs/by-name/sw/swagger-typescript-api/package.nix
index 55277421c6e6..b54a6c588812 100644
--- a/pkgs/by-name/sw/swagger-typescript-api/package.nix
+++ b/pkgs/by-name/sw/swagger-typescript-api/package.nix
@@ -8,7 +8,7 @@
 }:
 let
   pname = "swagger-typescript-api";
-  version = "13.2.8";
+  version = "13.2.16";
   yarn-berry = yarn-berry_4;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "acacode";
     repo = "swagger-typescript-api";
     rev = version;
-    hash = "sha256-3IPap3Ln8UheYD3/PE4y1ga1KXMNihm36bkMCKy6WuQ=";
+    hash = "sha256-SPvOCoxtf7x8MLPV8kylyaNXHaNtsHvs6liagd7iyF8=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-3vVaW9beLNuudq7RB8pnw6aMJ8nJ1YBFaYr1d9K/k5U=";
+    hash = "sha256-ZIF+sA/Wp2Rbu9CeERZo1X1oC00SjE64Mk5verb8IxU=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix
index 47745212f78f..30fd4cbd0407 100644
--- a/pkgs/by-name/sw/swayidle/package.nix
+++ b/pkgs/by-name/sw/swayidle/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swayidle";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swayidle";
-    rev = version;
-    hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
+    rev = "v${version}";
+    hash = "sha256-fxDwRfAXb9D6epLlyWnXpy9g8V3ovJRpQ/f3M4jxY/s=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix
index 674d84f83878..95c55943e525 100644
--- a/pkgs/by-name/sw/swaylock/package.nix
+++ b/pkgs/by-name/sw/swaylock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swaylock";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swaylock";
     tag = "v${version}";
-    hash = "sha256-5JAA8mCY3vOsauvRK2zquBrzA2ROakEfahzp4a6j/Ac=";
+    hash = "sha256-l3fu04cw2Jin2F6UcDK0kWRJLKuwXpxuImUjoLk32Fc=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index 4778c0f8cd55..a34e16966a33 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -12,13 +12,13 @@
 
 swift.stdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.58.2";
+  version = "0.58.5";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = version;
-    sha256 = "sha256-v0ZJzB8PndVo6x4TZuxdw4bAALemY0mubPdmUdcAuHk=";
+    sha256 = "sha256-QTfdMJpdm4m2YSZefPclGcAZFjyFgJeeWIYLf3apuFo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sw/swiftlint/package.nix b/pkgs/by-name/sw/swiftlint/package.nix
index 99c0f63474ae..6de5c097e849 100644
--- a/pkgs/by-name/sw/swiftlint/package.nix
+++ b/pkgs/by-name/sw/swiftlint/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "swiftlint";
-  version = "0.61.0";
+  version = "0.62.1";
 
   src = fetchurl {
     url = "https://github.com/realm/SwiftLint/releases/download/${version}/portable_swiftlint.zip";
-    hash = "sha256-I0LzeEMHoCEX4Y90X801DGrMbKsOUhwMDgHDKlOjsnQ=";
+    hash = "sha256-VB20vZT4z4+6q3YvWX5/DkkBan+MpccNhrQ3CnzSNkE=";
   };
 
   dontPatch = true;
diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix
index 238e214c382f..2add2ab01753 100644
--- a/pkgs/by-name/sw/swiftshader/package.nix
+++ b/pkgs/by-name/sw/swiftshader/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation {
   pname = "swiftshader";
-  version = "2023-09-11";
+  version = "2025-10-15";
 
   src = fetchgit {
     url = "https://swiftshader.googlesource.com/SwiftShader";
-    rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa";
-    hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI=";
+    rev = "3d536c0fc62b1cdea0f78c3c38d79be559855b88";
+    hash = "sha256-RLc9ZJeq/97mi4/5vRnPPOPBHK2lc9/6Y7p1YVwxWkc=";
     # Remove 1GB of test files to get under Hydra output limit
     postFetch = ''
       rm -r $out/third_party/llvm-project/llvm/test
@@ -24,6 +24,17 @@ stdenv.mkDerivation {
     '';
   };
 
+  postPatch = ''
+    substituteInPlace third_party/googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace third_party/googletest/googlemock/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace third_party/googletest/googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace third_party/marl/CMakeLists.txt \
+      --replace-fail  "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.5)"
+  '';
+
   nativeBuildInputs = [
     cmake
     python3
@@ -49,13 +60,13 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "High-performance CPU-based implementation of the Vulkan 1.3 graphics API";
     homepage = "https://opensource.google/projects/swiftshader";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     # Should be possible to support Darwin by changing the install phase with
     # 's/Linux/Darwin/' and 's/so/dylib/' or something similar.
-    platforms = with platforms; linux;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
index a33b391a524a..2641aba9f13a 100644
--- a/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
+++ b/pkgs/by-name/sw/switch-to-configuration-ng/src/src/main.rs
@@ -149,7 +149,7 @@ fn parse_os_release() -> Result<HashMap<String, String>> {
 fn do_pre_switch_check(command: &str, toplevel: &Path, action: &Action) -> Result<()> {
     let mut cmd_split = command.split_whitespace();
     let Some(argv0) = cmd_split.next() else {
-        bail!("missing first argument in install bootloader commands");
+        bail!("missing first argument in pre-switch check");
     };
 
     match std::process::Command::new(argv0)
diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix
index 5331a060a489..3bdcf7309b7c 100644
--- a/pkgs/by-name/sw/switchfin/package.nix
+++ b/pkgs/by-name/sw/switchfin/package.nix
@@ -7,7 +7,7 @@
   curl,
   dbus,
   ffmpeg,
-  fmt,
+  fmt_11,
   libwebp,
   mpv,
   SDL2,
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchfin";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "dragonflylee";
     repo = "switchfin";
     rev = version;
-    hash = "sha256-vmf7urq3lnfvmdZUJ+G5zn4ZpNA2N4jlLo8D5ZG3tUQ=";
+    hash = "sha256-WEqscGd7K5tTQcK8XXc02EQU2yCbTIdrzw40eXw8lYY=";
     fetchSubmodules = true;
   };
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     curl
     dbus
     ffmpeg
-    fmt
+    fmt_11
     libwebp
     mpv
     SDL2
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/dragonflylee/switchfin/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.k900 ];
-    mainProgram = "switchfin";
+    mainProgram = "Switchfin";
     platforms = lib.platforms.all;
   };
 }
diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix
index 75b6c994da35..da7139ae86b1 100644
--- a/pkgs/by-name/sw/swt/package.nix
+++ b/pkgs/by-name/sw/swt/package.nix
@@ -17,10 +17,21 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   passthru.srcMetadataByPlatform = {
+    # Note: This may look like an error but the content of the src.zip is in fact
+    # equal on all linux systems as well as all darwin systems. Even though each
+    # of these zip archives themselves contains a different hash.
     x86_64-linux.platform = "gtk-linux-x86_64";
     x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
+    aarch64-linux.platform = "gtk-linux-aarch64";
+    aarch64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
+    ppc64le-linux.platform = "gtk-linux-ppc64le";
+    ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
+    riscv64-linux.platform = "gtk-linux-riscv64";
+    riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
     x86_64-darwin.platform = "cocoa-macosx-x86_64";
     x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
+    aarch64-darwin.platform = "cocoa-macosx-aarch64";
+    aarch64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI";
   };
   passthru.srcMetadata =
     finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;
diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix
index 0bd42715c42e..2ba36a610c82 100644
--- a/pkgs/by-name/sx/sx/package.nix
+++ b/pkgs/by-name/sx/sx/package.nix
@@ -56,8 +56,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "sx";
     maintainers = with lib.maintainers; [
-      figsoda
       thiagokokada
+      liberodark
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/sx/sxhkd/package.nix b/pkgs/by-name/sx/sxhkd/package.nix
index 531eca8d0018..3a454b69034e 100644
--- a/pkgs/by-name/sx/sxhkd/package.nix
+++ b/pkgs/by-name/sx/sxhkd/package.nix
@@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd2;
     mainProgram = "sxhkd";
     maintainers = with lib.maintainers; [
-      vyp
       ncfavier
     ];
     inherit (libxcb.meta) platforms;
diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 9951760b51ec..2ae0939f2706 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.39.1";
+  version = "3.41.4";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LJHZb4TGo+Lep7yiej2G1H6mXAoEk5ixn/lGDxAWqvg=";
+    hash = "sha256-RILehKm5DzhCLfhGRUuoXYmrpO/b5TSTnzrVNvhSNrg=";
   };
 
-  cargoHash = "sha256-mUeJ3A2HW2pXWXW3Abb+aqTaZjVrchYJNCJCDC2Em9s=";
+  cargoHash = "sha256-t9p4RDQnz/C5TLgbDug3vnod+osY7oEPtW+dNzz9pEE=";
 
   nativeBuildInputs = [
     mandoc
diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index 32cfb2219905..f06260678818 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "1.33.0";
+  version = "1.36.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     tag = "v${version}";
-    hash = "sha256-S7PvaLjrd6W7AyCgi8yAC0kjFwVxpf/FlzyOq3yvayE=";
+    hash = "sha256-JSoKidueNwCI4Fbqs5K4RxfObJlet5FV6JgEWuLqd08=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule rec {
   # hash mismatch with darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-JppXYoge4hK5hw2O2KSRL1n/UX/bc2LmGEzwQW6xD44=";
+  vendorHash = "sha256-dKT2bEeIG3tndj5UuJO2g8gnVGM9AfB5ebu3CfWDhRg=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index d0093c4ffaf2..6e84b2c50cf9 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "symbolicator";
-  version = "25.9.0";
+  version = "25.10.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolicator";
     rev = version;
-    hash = "sha256-1pjp2ryzoiI/brXv/clrseh0LPs1ZW67vk5QT1l6KCk=";
+    hash = "sha256-bXoLhQVOzCic/n6/YlmFEpvN1lBD9sFDKzwi7VxW8iM=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-L3+ZQC9rVUpkkQs1KzdCtYA/hj1F6K8mf7aJpxfRh+0=";
+  cargoHash = "sha256-r7HtHvizA/NoJI496db5ahQ/6Qwp+KwQRmYQ7S72cqQ=";
 
   nativeBuildInputs = [
     pkg-config
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://getsentry.github.io/symbolicator/";
     changelog = "https://github.com/getsentry/symbolicator/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "symbolicator";
   };
 }
diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index cfeeafc81675..4c35cfbe4f2f 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -12,14 +12,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "symfony-cli";
-  version = "5.14.2";
-  vendorHash = "sha256-SGD8jFRvdJ5GOeQiW3Whe6EnybQ60wOsC/OureOCn7k=";
+  version = "5.15.1";
+  vendorHash = "sha256-tAaTgcZMvpw1a6sSu86gbgP66Wzkvga1FIIGZHCFSQA=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qgCuerKn7R4bn3YgzpMprIUDfn2SJdIiXC+9avnzDm4=";
+    hash = "sha256-sjiGHIwCI2W/hN/+b3SPiSANtZyOnv110E9Dgi0qr70=";
     leaveDotGit = true;
     postFetch = ''
       git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE
diff --git a/pkgs/by-name/sy/synadm/package.nix b/pkgs/by-name/sy/synadm/package.nix
index 9abb85fb09bd..6cfcd2bcc48d 100644
--- a/pkgs/by-name/sy/synadm/package.nix
+++ b/pkgs/by-name/sy/synadm/package.nix
@@ -7,7 +7,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "synadm";
-  version = "0.48";
+  version = "0.49.2";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -15,7 +15,7 @@ python3Packages.buildPythonApplication rec {
     owner = "synadm";
     repo = "synadm";
     tag = "v${version}";
-    hash = "sha256-6t4CXXt22/yR0gIxSsM/r+zJQeoKz5q/Ifg8PLNojLI=";
+    hash = "sha256-Nh4pzOXBXwbhq49Hq8vmPi6AS6N/tRqDBjIVKH3Gh6s=";
   };
 
   build-system = [ python3Packages.setuptools ];
@@ -27,6 +27,7 @@ python3Packages.buildPythonApplication rec {
     tabulate
     pyyaml
     requests
+    requests-unixsocket
   ];
 
   checkPhase = ''
diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index d1aa50ba853f..57f5d44815c4 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke48";
+  version = "0.11.1-etke49";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1bxkC91OPXPjwPgbjRlCvUth/Q7w7O4WeW3vYaGmo5A=";
+    hash = "sha256-PbqO+Y740GWqfh584W6OS4HeQtO6Rkz6lc5IaTjadq0=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-Vv/keQXNBxBDgKXNBHLFuNDNHEnEWJuFa/pU+ejpDCY=";
+    hash = "sha256-4o6TVbOSDm7btMDd4ItQR+jCFNZGhTXvycqcIh0FQnk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/sy/syncall/package.nix b/pkgs/by-name/sy/syncall/package.nix
deleted file mode 100644
index 9cfcd9599b05..000000000000
--- a/pkgs/by-name/sy/syncall/package.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "syncall";
-  version = "1.8.5";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "bergercookie";
-    repo = "syncall";
-    rev = "v${version}";
-    hash = "sha256-f9WVZ1gpVG0wvIqoAkeaYBE4QsGXSqrYS4KyHy6S+0Q=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-    --replace-fail 'loguru = "^0.5.3"' 'loguru = "^0.7"' \
-    --replace-fail 'PyYAML = "~5.3.1"' 'PyYAML = "^6.0"' \
-    --replace-fail 'bidict = "^0.21.2"' 'bidict = "^0.23"' \
-    --replace-fail 'typing = "^3.7.4"' '''
-  '';
-
-  nativeBuildInputs = [
-    python3.pkgs.poetry-core
-    python3.pkgs.poetry-dynamic-versioning
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    bidict
-    bubop
-    click
-    item-synchronizer
-    loguru
-    python-dateutil
-    pyyaml
-    rfc3339
-    typing
-
-    # asana optional-dep
-    asana
-    # caldav optional-dep
-    caldav
-    icalendar
-    # fs optional-dep
-    xattr
-    # gkeep optional-dep
-    # gkeepapi is unavailable in nixpkgs
-    # google optional-dep
-    google-api-python-client
-    google-auth-oauthlib
-    # notion optional-dep
-    # FIXME: notion-client -- broken, doesn't build.
-    # taskwarrior optional-dep
-    taskw-ng
-  ];
-
-  postInstall = ''
-    # We do not support gkeep
-    rm $out/bin/tw_gkeep_sync
-  '';
-
-  pythonImportsCheck = [ "syncall" ];
-
-  meta = with lib; {
-    description = "Bi-directional synchronization between services such as Taskwarrior, Google Calendar, Notion, Asana, and more";
-    homepage = "https://github.com/bergercookie/syncall";
-    license = licenses.mit;
-    maintainers = with maintainers; [ raitobezarius ];
-    # Upstream issue making it practically unusable:
-    # https://github.com/bergercookie/syncall/issues/99
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 46f6ed461417..8d91b26ae515 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -22,13 +22,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "syncstorage-rs";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "syncstorage-rs";
     tag = version;
-    hash = "sha256-B9eZmpNV7eOpnQZU7M6KSGgFjlCI7+Vh7rWsqKMNGm8=";
+    hash = "sha256-WkUU6013sdLMh3hq9CE/D5+ftpdisihVD6W+FvjwbP4=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
   '';
 
-  cargoHash = "sha256-3JW0vaTSYDF5tfjDa6nzhKA58QDODhtMEZNK3bah1VQ=";
+  cargoHash = "sha256-V6shIxNpw+WHqypNgE02Sr7DO8l3H9tb72a1u2UHDfo=";
 
   # almost all tests need a DB to test against
   doCheck = false;
diff --git a/pkgs/applications/misc/synergy/darwin-non-static-openssl.patch b/pkgs/by-name/sy/synergy/darwin-non-static-openssl.patch
similarity index 100%
rename from pkgs/applications/misc/synergy/darwin-non-static-openssl.patch
rename to pkgs/by-name/sy/synergy/darwin-non-static-openssl.patch
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/by-name/sy/synergy/package.nix
similarity index 85%
rename from pkgs/applications/misc/synergy/default.nix
rename to pkgs/by-name/sy/synergy/package.nix
index ab350c2509ae..ca46b4721acc 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
 
   cmake,
   openssl,
@@ -14,7 +13,6 @@
   pkg-config,
   gdk-pixbuf,
   libnotify,
-  qttools,
   libICE,
   libSM,
   libX11,
@@ -26,7 +24,7 @@
   xkeyboardconfig,
   xinput,
   avahi-compat,
-
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -48,21 +46,24 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/gui/src/SslCertificate.cpp \
-      --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
+      --replace-fail 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
+
+    substituteInPlace CMakeLists.txt cmake/Version.cmake src/gui/CMakeLists.txt \
+    --replace-fail "cmake_minimum_required (VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
-      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+      --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
   '';
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ]
-  ++ lib.optional withGUI wrapQtAppsHook;
+  ++ lib.optional withGUI libsForQt5.wrapQtAppsHook;
 
   buildInputs = [
-    qttools # Used for translations even when not building the GUI
+    libsForQt5.qttools # Used for translations even when not building the GUI
     openssl
     pcre
   ]
diff --git a/pkgs/by-name/sy/synth/package.nix b/pkgs/by-name/sy/synth/package.nix
index 8fe291d2667b..baa1bd3b9c76 100644
--- a/pkgs/by-name/sy/synth/package.nix
+++ b/pkgs/by-name/sy/synth/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Tool for generating realistic data using a declarative data model";
     homepage = "https://github.com/getsynth/synth";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/by-name/sy/synthv1/package.nix
similarity index 50%
rename from pkgs/applications/audio/synthv1/default.nix
rename to pkgs/by-name/sy/synthv1/package.nix
index 4f6582a875cc..cda48be4f6ae 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/by-name/sy/synthv1/package.nix
@@ -1,42 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   pkg-config,
-  qtbase,
-  qttools,
   libjack2,
   alsa-lib,
   liblo,
   lv2,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "synthv1";
   version = "0.9.23";
 
   src = fetchurl {
-    url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
-    sha256 = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
+    url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz";
+    hash = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
   };
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libjack2
     alsa-lib
     liblo
     lv2
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
     mainProgram = "synthv1_jack";
     homepage = "https://synthv1.sourceforge.io/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/sy/syrics/package.nix b/pkgs/by-name/sy/syrics/package.nix
index 4ad660a1d507..9ce5458083f5 100644
--- a/pkgs/by-name/sy/syrics/package.nix
+++ b/pkgs/by-name/sy/syrics/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "syrics";
-  version = "0.1.2.4";
+  version = "0.1.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "akashrchandran";
     repo = "syrics";
     tag = "v${version}";
-    hash = "sha256-udW6i3nRWECXpQGGGK2U8QVRJVrsHeqjDK8QCMH5I8s=";
+    hash = "sha256-VV/IZg30GatCGRoKnSro83ZtitnHg4+UEnXajVR7o/A=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
index dfe8a6633d64..ff2cf9437eff 100644
--- a/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
+++ b/pkgs/by-name/sy/sysdig-cli-scanner/sysdig-cli-scanner.versions.nix
@@ -1,23 +1,23 @@
 {
-  version = "1.22.6";
+  version = "1.23.0";
 
   x86_64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/linux/amd64/sysdig-cli-scanner";
-    hash = "sha256-aOwvxIxq1h66YKJGnFVIFTcA/tq0CseeNLe6pfLobkI=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/linux/amd64/sysdig-cli-scanner";
+    hash = "sha256-7J2hz9p5QphMtC1PNVsicLuDnubjs26siT+Yctf5P9A=";
   };
 
   aarch64-linux = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/linux/arm64/sysdig-cli-scanner";
-    hash = "sha256-m79OVmW+9D+941BX9xBwBxrZrDBBrFBDyjS8T6sE3m4=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/linux/arm64/sysdig-cli-scanner";
+    hash = "sha256-EZS+p9/CAaeDJTCkW5Cr2hVcBzG4HDv4zwt7LuOrXrc=";
   };
 
   x86_64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/darwin/amd64/sysdig-cli-scanner";
-    hash = "sha256-RGc+ZHkX4y6kDwzaZeGWpB3TLRvThUbPkriMDK7U3cQ=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/darwin/amd64/sysdig-cli-scanner";
+    hash = "sha256-PNhdZsC1uhG8KQHEAKeqECBuObfGpflVShikaCojapk=";
   };
 
   aarch64-darwin = {
-    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.22.6/darwin/arm64/sysdig-cli-scanner";
-    hash = "sha256-mFHxETd96ZGJUYDXi6mjhfJDlozDAo4IHaoisbNhwwc=";
+    url = "https://download.sysdig.com/scanning/bin/sysdig-cli-scanner/1.23.0/darwin/arm64/sysdig-cli-scanner";
+    hash = "sha256-dZ9Fyk6UqJobZbSmEpIxvT1oZhfExaI/lSu4K/0eHI4=";
   };
 }
diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix
index 3fe9f6367f87..6bf5a0ed818d 100644
--- a/pkgs/by-name/sy/syshud/package.nix
+++ b/pkgs/by-name/sy/syshud/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "syshud";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "System64fumo";
     repo = "syshud";
-    rev = "60d3e362cf6983e7d7ebea7584a8bd84eb815f4c";
-    hash = "sha256-GxJWGRm7N/TgvAtuWXjusyUT7Pnuw0uIySp6i6Kn7Gs=";
+    rev = "57594787b68da8f221deb03295df21cc0b239b03";
+    hash = "sha256-8kXBcu2hUefV7ZEfqZdxg6Dz3vgxhekaZEhEqERP4ro=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/sy/syslinux/package.nix b/pkgs/by-name/sy/syslinux/package.nix
index a77d8f66a2c0..abc948ed3321 100644
--- a/pkgs/by-name/sy/syslinux/package.nix
+++ b/pkgs/by-name/sy/syslinux/package.nix
@@ -83,7 +83,6 @@ stdenv.mkDerivation {
 
   hardeningDisable = [
     "pic"
-    "pie" # MBR gets too big with PIE
     "stackprotector"
     "fortify"
   ];
diff --git a/pkgs/by-name/sy/systemd-lsp/package.nix b/pkgs/by-name/sy/systemd-lsp/package.nix
index 219cf112c3b0..ab0b87c851c8 100644
--- a/pkgs/by-name/sy/systemd-lsp/package.nix
+++ b/pkgs/by-name/sy/systemd-lsp/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "systemd-lsp";
-  version = "2025.07.14";
+  version = "2025.10.16";
 
   src = fetchFromGitHub {
     owner = "JFryy";
     repo = "systemd-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JjrPgpQ94C01nZ3E1NE88TBzI03YFs+x37edtYStlnc=";
+    hash = "sha256-xhk1jUAA81Rkq9Nmcw+XyWrSbq3ygRvS615Z56j0WBM=";
   };
 
-  cargoHash = "sha256-G1cQWOgtx+Bmi05ji9Z4TBj5pnhglNcfLRoq2zSmyK0=";
+  cargoHash = "sha256-6hePUny2iBjslkIk8wVXHnuAHzG3WpBdcj8D5FM9Bc4=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/sy/systemdgenie/package.nix b/pkgs/by-name/sy/systemdgenie/package.nix
new file mode 100644
index 000000000000..bb4b43072d40
--- /dev/null
+++ b/pkgs/by-name/sy/systemdgenie/package.nix
@@ -0,0 +1,49 @@
+{
+  stdenv,
+  lib,
+  cmake,
+  fetchFromGitLab,
+  kdePackages,
+  pkg-config,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation {
+  pname = "systemdgenie";
+  version = "0.99.0-unstable-2025-10-11";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    repo = "SystemdGenie";
+    owner = "system";
+    rev = "dcfd937a711fb124da6c717c51334dbbb430e48e";
+    hash = "sha256-X/qUWStT3vRvJNQMdzUV818bsZkbxaaAd7RHJcK+WEE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    kdePackages.extra-cmake-modules
+    kdePackages.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    kdePackages.kirigami-addons
+    kdePackages.kio
+    kdePackages.ktexteditor
+    kdePackages.kxmlgui
+  ];
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Systemd management utility";
+    mainProgram = "systemdgenie";
+    homepage = "https://kde.org";
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.pasqui23 ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix
index c5f316f0cb45..7e7c312944d4 100644
--- a/pkgs/by-name/sy/systeroid/package.nix
+++ b/pkgs/by-name/sy/systeroid/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch b/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch
new file mode 100644
index 000000000000..a13cdd4a917e
--- /dev/null
+++ b/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch
@@ -0,0 +1,17 @@
+--- a/src/linebreak/CMakeLists.txt
++++ b/src/linebreak/CMakeLists.txt
+@@ -72,12 +72,12 @@
+   ${LINEBREAK_BINARY_DIR} 
+   ${LINEBREAK_SOURCE_DIR} 
+   ${CMAKE_CURRENT_BINARY_DIR})
+-  
++add_library(linebreak STATIC ${LINEBREAK_SOURCES} ${LINEBREAK_HEADERS})
+ if (ICONV_FOUND)
+   include_directories(${ICONV_INCLUDE_DIR})
+   target_link_libraries(linebreak ${ICONV_LIBRARY})
+ endif (ICONV_FOUND)
+-add_library(linebreak STATIC ${LINEBREAK_SOURCES} ${LINEBREAK_HEADERS})
++
+ 
+ #project_source_group("${GROUP_CODE}" LINEBREAK_SOURCES LINEBREAK_HEADERS)
+ 
diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix
index 956002f5a0e7..f59e0309260d 100644
--- a/pkgs/by-name/t4/t4kcommon/package.nix
+++ b/pkgs/by-name/t4/t4kcommon/package.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
       url = "https://salsa.debian.org/tux4kids-pkg-team/t4kcommon/raw/f7073fa384f5a725139f54844e59b57338b69dc7/debian/patches/libpng16.patch";
       hash = "sha256-auQ8VvOyvLE1PD2dfeHZJV+MzIt1OtUa7OcOqsXTAYI=";
     })
+    # Fix "Cannot specify link libraries for target "linebreak" which is not built by this project."
+    ./linebreak-fix.patch
   ];
 
   # Workaround build failure on -fno-common toolchains like upstream
@@ -55,6 +57,11 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
+  postPatch = ''
+    substituteInPlace {src/,./}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Library of code shared between tuxmath and tuxtype";
     homepage = "https://github.com/tux4kids/t4kcommon";
diff --git a/pkgs/by-name/ta/taco/package.nix b/pkgs/by-name/ta/taco/package.nix
index 5cf747348056..4dd472fd36b1 100644
--- a/pkgs/by-name/ta/taco/package.nix
+++ b/pkgs/by-name/ta/taco/package.nix
@@ -37,6 +37,14 @@ stdenv.mkDerivation (finalAttrs: {
     rm -rf python_bindings/pybind11/*
     cp -r ${finalAttrs.src-new-pybind11}/* python_bindings/pybind11
     find python_bindings/pybind11 -exec chmod +w {} \;
+
+    # CMake4 no longer support version < 3.5
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.4.0 FATAL_ERROR)" \
+      "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace apps/tensor_times_vector/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.12)" \
+      "cmake_minimum_required(VERSION 3.5)"
   '';
 
   # Remove test cases from cmake build as they violate modern C++ expectations
diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index 49ba340dbb2e..d8758809f685 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tageditor";
-  version = "3.9.7";
+  version = "3.9.8";
 
   src = fetchFromGitHub {
     owner = "martchus";
     repo = "tageditor";
     tag = "v${version}";
-    hash = "sha256-ETRlyAOCWIz8tioCsGXnmnuTnzWiUOb64vKsPm1hIt0=";
+    hash = "sha256-D4O02QQNoyY61w/9OB4lY3QkiwJ6q1KdX9GNKgW5ZY0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix
index d834998f22f6..5b92b2fd9774 100644
--- a/pkgs/by-name/ta/tagparser/package.nix
+++ b/pkgs/by-name/ta/tagparser/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tagparser";
-  version = "12.5.1";
+  version = "12.5.2";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "tagparser";
     rev = "v${version}";
-    hash = "sha256-i9WJcdMvPg6Hg6auyPa9dwgtd7Ihte2oPLUImRelO50=";
+    hash = "sha256-QVeEwQFXr2xYKFtrrWumMoo3sVRtCWCVZvwK71BgoSg=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index 7d8f4d3a089c..0850840ca3fb 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -1,53 +1,33 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
+  installShellFiles,
   texinfo,
   versionCheckHook,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # tahoe-lafs is incompatible with magic-wormhole >= 0.19.0
-      # TODO: unpin, when https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4180 is fixed
-      magic-wormhole = super.magic-wormhole.overridePythonAttrs (oldAttrs: rec {
-        version = "0.18.0";
-
-        src = fetchFromGitHub {
-          owner = "magic-wormhole";
-          repo = "magic-wormhole";
-          tag = version;
-          hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";
-        };
-
-        nativeCheckInputs = lib.filter (
-          input: (input.pname or null) != "pytest-twisted"
-        ) oldAttrs.nativeCheckInputs;
-
-        doCheck = false;
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-in
 python3Packages.buildPythonApplication rec {
   pname = "tahoe-lafs";
-  version = "1.20.0";
+  version = "1.20.0-unstable-2025-10-12";
   pyproject = true;
 
+  # workaround required to build an unstable version
+  # TODO: when moving to a tagged version, remove this and the workaround for versionCheckHook
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = builtins.elemAt (builtins.split "-" version) 0;
+
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
     repo = "tahoe-lafs";
-    tag = "tahoe-lafs-${version}";
-    hash = "sha256-9qaL4GmdjClviKTnwAxaTywvJChQ5cVVgWs1IkFxhIY=";
+    rev = "7b96d16aba511fd34dcc0c14c9db754229e19531";
+    hash = "sha256-7qMeyL0j0D6Yos7qDhhplinKPV87Vu72dbE4eWql/g4=";
   };
 
   outputs = [
     "out"
     "doc"
     "info"
+    "man"
   ];
 
   # Remove broken and expensive tests.
@@ -68,13 +48,16 @@ python3Packages.buildPythonApplication rec {
     hatchling
   ];
 
-  nativeBuildInputs = with python3Packages; [
-    # docs
+  nativeBuildInputs = # docs
+  [
+    installShellFiles
+    texinfo
+  ]
+  ++ (with python3Packages; [
     recommonmark
     sphinx
     sphinx-rtd-theme
-    texinfo
-  ];
+  ]);
 
   dependencies =
     with python3Packages;
@@ -89,8 +72,8 @@ python3Packages.buildPythonApplication rec {
       eliot
       filelock
       foolscap
-      future
       klein
+      legacy-cgi
       magic-wormhole
       netifaces
       psutil
@@ -121,6 +104,8 @@ python3Packages.buildPythonApplication rec {
       make info
       mkdir -p "$info/share/info"
       cp -rv _build/texinfo/*.info "$info/share/info"
+
+      installManPage man/man*/*
     )
   '';
 
@@ -139,13 +124,13 @@ python3Packages.buildPythonApplication rec {
     ++ [
       versionCheckHook
     ];
-  versionCheckProgram = "${placeholder "out"}/bin/tahoe";
+
   versionCheckProgramArg = "--version";
 
   checkPhase = ''
     runHook preCheck
 
-    runHook versionCheckHook
+    version=$SETUPTOOLS_SCM_PRETEND_VERSION runHook versionCheckHook
     trial --rterrors allmydata
 
     runHook postCheck
diff --git a/pkgs/by-name/ta/tailer/package.nix b/pkgs/by-name/ta/tailer/package.nix
index d9899b7d2cac..06567867ac9f 100644
--- a/pkgs/by-name/ta/tailer/package.nix
+++ b/pkgs/by-name/ta/tailer/package.nix
@@ -6,14 +6,14 @@
   tailer,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "tailer";
   version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "hionay";
     repo = "tailer";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE=";
   };
 
@@ -21,8 +21,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
   passthru.tests = {
@@ -31,11 +30,11 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to insert lines when command output stops";
     homepage = "https://github.com/hionay/tailer";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    license = lib.licenses.mit;
     mainProgram = "tailer";
   };
-}
+})
diff --git a/pkgs/by-name/ta/tailscale/package.nix b/pkgs/by-name/ta/tailscale/package.nix
index d74d12f85971..590fdc997d6f 100644
--- a/pkgs/by-name/ta/tailscale/package.nix
+++ b/pkgs/by-name/ta/tailscale/package.nix
@@ -24,7 +24,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "tailscale";
-  version = "1.88.4";
+  version = "1.90.6";
 
   outputs = [
     "out"
@@ -35,10 +35,10 @@ buildGoModule (finalAttrs: {
     owner = "tailscale";
     repo = "tailscale";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fzJwRTB2U2GuLmv1XUSMLnhyLlp+4kGorLGAvRVjDqw=";
+    hash = "sha256-Uy5HDhZTO/lydVzT/dzp8OWgaZ8ZVQo0b7lvvzXyysI=";
   };
 
-  vendorHash = "sha256-8aE6dWMkTLdWRD9WnLVSzpOQQh61voEnjZAJHtbGCSs=";
+  vendorHash = "sha256-AUOjLomba75qfzb9Vxc0Sktyeces6hBSuOMgboWcDnE=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index da963b1858d1..feba98214600 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.14";
+  version = "4.1.17";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-5yK3UvUd74bULohrTBFx8tCaS+GnSHoKUeSv+OdgPOM=";
-      aarch64-linux = "sha256-MUlB9fbhQ+dOdAxYetH7qu3lRiVy3TMLvgk35hHpZts=";
-      x86_64-darwin = "sha256-Z7JbYQP6dndjflpd4zJ/7DM12jFtkNP9saTNcr2kHAo=";
-      x86_64-linux = "sha256-vDTDAbCAtua5jtJBGEGYM/lm9vNH5VaUXWVX02pEpW4=";
+      aarch64-darwin = "sha256-hSti2Rpt+laWloa8ikuuDkci3o9am0KxArtYm37OjP4=";
+      aarch64-linux = "sha256-JkaJmEMRzCyhBKnWpNA5tCZ67PRUPcnqC7wJTusMzI0=";
+      x86_64-darwin = "sha256-YzfIcYUyHAeSRN+9nCRQKjAGQBvRU50ZzcnfjekQGEM=";
+      x86_64-linux = "sha256-zBFdm2xO3k5CO/6mo8/D8D5sFwK32RA2m5VA4rTPOGA=";
     }
     .${system} or throwSystem;
 in
diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix
index c5ea950928a3..cee2f858b382 100644
--- a/pkgs/by-name/ta/taizen/package.nix
+++ b/pkgs/by-name/ta/taizen/package.nix
@@ -8,26 +8,17 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taizen";
-  version = "0-unstable-2023-06-05";
+  version = "0-unstable-2024-11-16";
 
   src = fetchFromGitHub {
     owner = "oppiliappan";
     repo = "taizen";
-    rev = "5486cd4f4c5aa4e0abbcee180ad2ec22839abd31";
-    hash = "sha256-pGcD3+3Ds3U8NuNySaDnz0zzAvZlSDte1jRPdM5qrZA=";
+    rev = "e57f10845d32d51e78c5bbadf9c40780a0fa2481";
+    hash = "sha256-5XLRANBRtT8LyyS4EhKgZS+Hc3xFg/+N3rZJTVvVrpo=";
   };
 
-  cargoPatches = [
-    # update cargo dependencies upstreamed: https://github.com/oppiliappan/taizen/pull/27
-    (fetchpatch2 {
-      name = "update-cargo-lock.patch";
-      url = "https://github.com/oppiliappan/taizen/commit/104a1663268623e9ded45afaf2fe98c9c42b7b21.patch";
-      hash = "sha256-ujsr7MjZWEu+2mijVH1aqtTJXKZC4m5vl73Jre9XHbU=";
-    })
-  ];
-
   cargoHash = "sha256-kK9na2Pk3Hl4TYYVVUfeBv6DDDkrD7mIv7eVHXkS5QY=";
 
   nativeBuildInputs = [ pkg-config ];
@@ -37,11 +28,11 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Curses-based mediawiki browser";
     homepage = "https://github.com/oppiliappan/taizen";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    license = lib.licenses.mit;
     mainProgram = "taizen";
   };
-}
+})
diff --git a/pkgs/by-name/ta/talhelper/package.nix b/pkgs/by-name/ta/talhelper/package.nix
index 763e3aa6b194..d419285d36a3 100644
--- a/pkgs/by-name/ta/talhelper/package.nix
+++ b/pkgs/by-name/ta/talhelper/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "talhelper";
-  version = "3.0.37";
+  version = "3.0.38";
 
   src = fetchFromGitHub {
     owner = "budimanjojo";
     repo = "talhelper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GWm2ZTBq+g9mF7KktI+A6Sec8iHzfTtGt59PZjPW2B0=";
+    hash = "sha256-KYIRpr90iPyLxeQZhqQCwRX6P4fYoqi7luneRXTkzGc=";
   };
 
-  vendorHash = "sha256-vqec4Hd+jLKDuiwdfweWonitX3g5Hot0COpU5GKrpbE=";
+  vendorHash = "sha256-DRjgZlxoYKUcrjh8xEHjz8WTwMrUEHbp8/Jjgpkrc+Y=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix
index f43b941547e4..c95b764c42f5 100644
--- a/pkgs/by-name/ta/talosctl/package.nix
+++ b/pkgs/by-name/ta/talosctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.11.2";
+  version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     tag = "v${version}";
-    hash = "sha256-r78O/FdsfD29wM6fcbuwYea/b7J60iAdtrw4CEBM/mo=";
+    hash = "sha256-TA84RIn5ZRW9ZrsnEYB094n+H8MBBSyRjubcy4Qqmnw=";
   };
 
-  vendorHash = "sha256-T8lJjJfCLpQIsmCW/FQk/CJstyH6u/gNZ6R+COH909M=";
+  vendorHash = "sha256-8yy0lLC+9Ubw9gHUOnq3ZgrjaOxSxtorSJxuxM9laKE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ta/tana/package.nix b/pkgs/by-name/ta/tana/package.nix
index fe96c58a3405..049126417b23 100644
--- a/pkgs/by-name/ta/tana/package.nix
+++ b/pkgs/by-name/ta/tana/package.nix
@@ -62,7 +62,7 @@ let
     stdenv.cc.cc
     stdenv.cc.libc
   ];
-  version = "1.0.47";
+  version = "1.0.48";
 in
 stdenv.mkDerivation {
   pname = "tana";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://github.com/tanainc/tana-desktop-releases/releases/download/v${version}/tana_${version}_amd64.deb";
-    hash = "sha256-Si02dSMH7hnUNz3kxJavhfZLO46RAcanRvl8F/DrLY0=";
+    hash = "sha256-IQ7KRqPvLiUzNU279IirHq21Q9DeFfkQ+B3i9rTgYR0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix
index 394c5bb331ed..98d324d770b3 100644
--- a/pkgs/by-name/ta/tangerine/package.nix
+++ b/pkgs/by-name/ta/tangerine/package.nix
@@ -37,6 +37,14 @@ stdenv.mkDerivation {
     libX11
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.24)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace third_party/glm-0.9.9.8/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 3.2)" "cmake_policy(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "System for creating 3D models procedurally from a set of Signed Distance Function (SDF) primitive shapes and combining operators";
     homepage = "https://github.com/Aeva/tangerine";
diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index c38f2ba1816a..c866d85ee39f 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -2,56 +2,103 @@
   stdenv,
   lib,
   rustPlatform,
-  fetchCrate,
+  fetchFromGitHub,
   pkg-config,
   openssl,
-  withLsp ? true,
   installShellFiles,
+  versionCheckHook,
+
+  # passthru dependencies
+  nix-update-script,
+  runCommand,
+  toml-test,
+
+  # Optional feature
+  withLsp ? true,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taplo";
   version = "0.10.0";
 
-  src = fetchCrate {
-    inherit version;
-    pname = "taplo-cli";
-    hash = "sha256-iKc4Nu7AZE1LSuqXffi3XERbOqZMOkI3PV+6HaJzh4c=";
+  src = fetchFromGitHub {
+    owner = "tamasfe";
+    repo = "taplo";
+    tag = "release-taplo-cli-${finalAttrs.version}";
+    hash = "sha256-FW8OQ5TRUuQK8M2NDmp4c6p22jsHodxKqzOMrcdiqXU=";
   };
 
-  cargoHash = "sha256-tvijtB5fwOzQnnK/ClIvTbjCcMeqZpXcRdWWKZPIulM=";
+  cargoPatches = [
+    # Update reqwest to fix darwin sandboxing issues
+    # See also: https://github.com/tamasfe/taplo/pull/669
+    ./update-reqwest.patch
+  ];
+
+  cargoHash = "sha256-FMpGo+kRcNgDj4qwYvdQKGwGazUKKMIVq0HCYMrTql0=";
+
+  buildAndTestSubdir = "crates/taplo-cli";
 
   nativeBuildInputs = [
     installShellFiles
     pkg-config
   ];
 
-  buildInputs = [
-    openssl
-  ];
+  buildInputs = [ openssl ];
 
   buildFeatures = lib.optional withLsp "lsp";
 
-  postInstall =
-    lib.optionalString
-      (
-        stdenv.buildPlatform.canExecute stdenv.hostPlatform
-        &&
-          # Creation of the completions fails on Darwin platforms.
-          !stdenv.hostPlatform.isDarwin
-      )
-      ''
-        installShellCompletion --cmd taplo \
-          --bash <($out/bin/taplo completions bash) \
-          --fish <($out/bin/taplo completions fish) \
-          --zsh <($out/bin/taplo completions zsh)
-      '';
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd taplo \
+      --bash <($out/bin/taplo completions bash) \
+      --fish <($out/bin/taplo completions fish) \
+      --zsh <($out/bin/taplo completions zsh)
+  '';
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests = {
+      toml-test =
+        let
+          # Unfortunately, taplo does not yet pass all toml-test v1.6.0 tests.
+          # Some of the failures are reported issues, others may not be.
+          # https://github.com/tamasfe/taplo/issues/486
+          skips = [
+            "valid/comment/nonascii"
+            "valid/datetime/edge"
+            "valid/key/quoted-unicode"
+            "valid/string/quoted-unicode"
+            "invalid/control/multi-cr"
+            "invalid/control/rawmulti-cr"
+            "invalid/table/super-twice"
+          ];
+        in
+        runCommand "taplo-toml-test"
+          {
+            nativeBuildInputs = [
+              finalAttrs.finalPackage
+              toml-test
+            ];
+          }
+          ''
+            toml-test taplo ${lib.concatMapStringsSep " " (a: "-skip ${a}") skips} -- toml-test
+            touch "$out"
+          '';
+    };
+  };
+
+  meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      defelo
+      yzx9
+    ];
     mainProgram = "taplo";
   };
-}
+})
diff --git a/pkgs/by-name/ta/taplo/update-reqwest.patch b/pkgs/by-name/ta/taplo/update-reqwest.patch
new file mode 100644
index 000000000000..078469baad12
--- /dev/null
+++ b/pkgs/by-name/ta/taplo/update-reqwest.patch
@@ -0,0 +1,1291 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index ea88fad..01ecbb1 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -24,11 +24,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+ dependencies = [
+  "cfg-if",
+- "getrandom",
++ "getrandom 0.2.12",
+  "once_cell",
+  "serde",
+  "version_check",
+- "zerocopy",
++ "zerocopy 0.7.32",
+ ]
+ 
+ [[package]]
+@@ -168,7 +168,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -179,7 +179,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -218,6 +218,12 @@ version = "0.21.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+ 
++[[package]]
++name = "base64"
++version = "0.22.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
++
+ [[package]]
+ name = "beef"
+ version = "0.5.2"
+@@ -290,9 +296,9 @@ checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+ 
+ [[package]]
+ name = "bytes"
+-version = "1.5.0"
++version = "1.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
++checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+ 
+ [[package]]
+ name = "cast"
+@@ -315,6 +321,12 @@ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+ 
++[[package]]
++name = "cfg_aliases"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
++
+ [[package]]
+ name = "ciborium"
+ version = "0.2.2"
+@@ -382,7 +394,7 @@ dependencies = [
+  "heck",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -591,15 +603,6 @@ version = "1.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+ 
+-[[package]]
+-name = "encoding_rs"
+-version = "0.8.34"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+-dependencies = [
+- "cfg-if",
+-]
+-
+ [[package]]
+ name = "equator"
+ version = "0.2.2"
+@@ -617,7 +620,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -773,7 +776,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -829,6 +832,20 @@ dependencies = [
+  "wasm-bindgen",
+ ]
+ 
++[[package]]
++name = "getrandom"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
++dependencies = [
++ "cfg-if",
++ "js-sys",
++ "libc",
++ "r-efi",
++ "wasip2",
++ "wasm-bindgen",
++]
++
+ [[package]]
+ name = "gimli"
+ version = "0.28.1"
+@@ -854,25 +871,6 @@ dependencies = [
+  "regex-syntax 0.8.5",
+ ]
+ 
+-[[package]]
+-name = "h2"
+-version = "0.3.26"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+-dependencies = [
+- "bytes",
+- "fnv",
+- "futures-core",
+- "futures-sink",
+- "futures-util",
+- "http",
+- "indexmap",
+- "slab",
+- "tokio",
+- "tokio-util",
+- "tracing",
+-]
+-
+ [[package]]
+ name = "half"
+ version = "2.4.1"
+@@ -913,9 +911,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+ 
+ [[package]]
+ name = "http"
+-version = "0.2.12"
++version = "1.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
++checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -924,76 +922,107 @@ dependencies = [
+ 
+ [[package]]
+ name = "http-body"
+-version = "0.4.6"
++version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
++checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+ dependencies = [
+  "bytes",
+  "http",
+- "pin-project-lite",
+ ]
+ 
+ [[package]]
+-name = "httparse"
+-version = "1.8.0"
++name = "http-body-util"
++version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
++checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
++dependencies = [
++ "bytes",
++ "futures-core",
++ "http",
++ "http-body",
++ "pin-project-lite",
++]
+ 
+ [[package]]
+-name = "httpdate"
+-version = "1.0.3"
++name = "httparse"
++version = "1.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
++checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+ 
+ [[package]]
+ name = "hyper"
+-version = "0.14.30"
++version = "1.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
++checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+ dependencies = [
+  "bytes",
+  "futures-channel",
+- "futures-core",
+  "futures-util",
+- "h2",
+  "http",
+  "http-body",
+  "httparse",
+- "httpdate",
+  "itoa",
+  "pin-project-lite",
+- "socket2",
++ "smallvec",
+  "tokio",
+- "tower-service",
+- "tracing",
+  "want",
+ ]
+ 
+ [[package]]
+ name = "hyper-rustls"
+-version = "0.24.2"
++version = "0.27.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
++checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+ dependencies = [
+- "futures-util",
+  "http",
+  "hyper",
++ "hyper-util",
+  "rustls",
++ "rustls-pki-types",
+  "tokio",
+  "tokio-rustls",
++ "tower-service",
++ "webpki-roots",
+ ]
+ 
+ [[package]]
+ name = "hyper-tls"
+-version = "0.5.0"
++version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+ dependencies = [
+  "bytes",
++ "http-body-util",
+  "hyper",
++ "hyper-util",
+  "native-tls",
+  "tokio",
+  "tokio-native-tls",
++ "tower-service",
++]
++
++[[package]]
++name = "hyper-util"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
++dependencies = [
++ "base64 0.22.1",
++ "bytes",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "http",
++ "http-body",
++ "hyper",
++ "ipnet",
++ "libc",
++ "percent-encoding",
++ "pin-project-lite",
++ "socket2 0.6.1",
++ "tokio",
++ "tower-service",
++ "tracing",
+ ]
+ 
+ [[package]]
+@@ -1042,6 +1071,16 @@ version = "2.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+ 
++[[package]]
++name = "iri-string"
++version = "0.7.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
++dependencies = [
++ "memchr",
++ "serde",
++]
++
+ [[package]]
+ name = "is-terminal"
+ version = "0.4.12"
+@@ -1085,10 +1124,11 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+ 
+ [[package]]
+ name = "js-sys"
+-version = "0.3.72"
++version = "0.3.82"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
++checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+ dependencies = [
++ "once_cell",
+  "wasm-bindgen",
+ ]
+ 
+@@ -1109,11 +1149,11 @@ checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978"
+ dependencies = [
+  "ahash",
+  "anyhow",
+- "base64",
++ "base64 0.21.7",
+  "bytecount",
+  "fancy-regex",
+  "fraction",
+- "getrandom",
++ "getrandom 0.2.12",
+  "iso8601",
+  "itoa",
+  "memchr",
+@@ -1137,9 +1177,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.161"
++version = "0.2.177"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+ 
+ [[package]]
+ name = "linux-raw-sys"
+@@ -1195,6 +1235,12 @@ dependencies = [
+  "hashbrown",
+ ]
+ 
++[[package]]
++name = "lru-slab"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
++
+ [[package]]
+ name = "lsp-async-stub"
+ version = "0.7.0"
+@@ -1202,7 +1248,7 @@ dependencies = [
+  "anyhow",
+  "async-trait",
+  "futures",
+- "getrandom",
++ "getrandom 0.2.12",
+  "lsp-types",
+  "rowan",
+  "serde",
+@@ -1257,12 +1303,6 @@ dependencies = [
+  "autocfg",
+ ]
+ 
+-[[package]]
+-name = "mime"
+-version = "0.3.17"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+-
+ [[package]]
+ name = "minimal-lexical"
+ version = "0.2.1"
+@@ -1498,7 +1538,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -1635,7 +1675,16 @@ dependencies = [
+  "smallvec",
+  "symbolic-demangle",
+  "tempfile",
+- "thiserror",
++ "thiserror 1.0.57",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
++dependencies = [
++ "zerocopy 0.8.27",
+ ]
+ 
+ [[package]]
+@@ -1650,9 +1699,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.78"
++version = "1.0.103"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
++checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+ dependencies = [
+  "unicode-ident",
+ ]
+@@ -1666,6 +1715,61 @@ dependencies = [
+  "memchr",
+ ]
+ 
++[[package]]
++name = "quinn"
++version = "0.11.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
++dependencies = [
++ "bytes",
++ "cfg_aliases",
++ "pin-project-lite",
++ "quinn-proto",
++ "quinn-udp",
++ "rustc-hash 2.1.1",
++ "rustls",
++ "socket2 0.5.5",
++ "thiserror 2.0.17",
++ "tokio",
++ "tracing",
++ "web-time",
++]
++
++[[package]]
++name = "quinn-proto"
++version = "0.11.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
++dependencies = [
++ "bytes",
++ "getrandom 0.3.4",
++ "lru-slab",
++ "rand",
++ "ring",
++ "rustc-hash 2.1.1",
++ "rustls",
++ "rustls-pki-types",
++ "slab",
++ "thiserror 2.0.17",
++ "tinyvec",
++ "tracing",
++ "web-time",
++]
++
++[[package]]
++name = "quinn-udp"
++version = "0.5.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
++dependencies = [
++ "cfg_aliases",
++ "libc",
++ "once_cell",
++ "socket2 0.5.5",
++ "tracing",
++ "windows-sys 0.52.0",
++]
++
+ [[package]]
+ name = "quote"
+ version = "1.0.35"
+@@ -1675,6 +1779,41 @@ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "r-efi"
++version = "5.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
++
++[[package]]
++name = "rand"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
++dependencies = [
++ "rand_chacha",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
++dependencies = [
++ "getrandom 0.3.4",
++]
++
+ [[package]]
+ name = "rayon"
+ version = "1.8.1"
+@@ -1750,46 +1889,43 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+ 
+ [[package]]
+ name = "reqwest"
+-version = "0.11.27"
++version = "0.12.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
++checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+ dependencies = [
+- "base64",
++ "base64 0.22.1",
+  "bytes",
+- "encoding_rs",
+  "futures-core",
+- "futures-util",
+- "h2",
+  "http",
+  "http-body",
++ "http-body-util",
+  "hyper",
+  "hyper-rustls",
+  "hyper-tls",
+- "ipnet",
++ "hyper-util",
+  "js-sys",
+  "log",
+- "mime",
+  "native-tls",
+- "once_cell",
+  "percent-encoding",
+  "pin-project-lite",
++ "quinn",
+  "rustls",
+- "rustls-pemfile",
++ "rustls-pki-types",
+  "serde",
+  "serde_json",
+  "serde_urlencoded",
+  "sync_wrapper",
+- "system-configuration",
+  "tokio",
+  "tokio-native-tls",
+  "tokio-rustls",
++ "tower",
++ "tower-http",
+  "tower-service",
+  "url",
+  "wasm-bindgen",
+  "wasm-bindgen-futures",
+  "web-sys",
+  "webpki-roots",
+- "winreg",
+ ]
+ 
+ [[package]]
+@@ -1808,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+ dependencies = [
+  "cc",
+- "getrandom",
++ "getrandom 0.2.12",
+  "libc",
+  "spin",
+  "untrusted",
+@@ -1824,7 +1960,7 @@ dependencies = [
+  "countme",
+  "hashbrown",
+  "memoffset",
+- "rustc-hash",
++ "rustc-hash 1.1.0",
+  "text-size",
+ ]
+ 
+@@ -1840,6 +1976,12 @@ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+ 
++[[package]]
++name = "rustc-hash"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
++
+ [[package]]
+ name = "rustix"
+ version = "0.38.31"
+@@ -1855,32 +1997,36 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.21.12"
++version = "0.23.34"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
++checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+ dependencies = [
+- "log",
++ "once_cell",
+  "ring",
++ "rustls-pki-types",
+  "rustls-webpki",
+- "sct",
++ "subtle",
++ "zeroize",
+ ]
+ 
+ [[package]]
+-name = "rustls-pemfile"
+-version = "1.0.4"
++name = "rustls-pki-types"
++version = "1.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
++checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+ dependencies = [
+- "base64",
++ "web-time",
++ "zeroize",
+ ]
+ 
+ [[package]]
+ name = "rustls-webpki"
+-version = "0.101.7"
++version = "0.103.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
++checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+ dependencies = [
+  "ring",
++ "rustls-pki-types",
+  "untrusted",
+ ]
+ 
+@@ -1945,16 +2091,6 @@ version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+ 
+-[[package]]
+-name = "sct"
+-version = "0.7.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+-dependencies = [
+- "ring",
+- "untrusted",
+-]
+-
+ [[package]]
+ name = "security-framework"
+ version = "2.9.2"
+@@ -2015,7 +2151,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2049,7 +2185,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2118,6 +2254,16 @@ dependencies = [
+  "windows-sys 0.48.0",
+ ]
+ 
++[[package]]
++name = "socket2"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
++dependencies = [
++ "libc",
++ "windows-sys 0.60.2",
++]
++
+ [[package]]
+ name = "spin"
+ version = "0.9.8"
+@@ -2142,6 +2288,12 @@ version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+ 
++[[package]]
++name = "subtle"
++version = "2.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
++
+ [[package]]
+ name = "symbolic-common"
+ version = "12.10.0"
+@@ -2178,9 +2330,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.48"
++version = "2.0.108"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
++checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -2189,29 +2341,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "sync_wrapper"
+-version = "0.1.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+-
+-[[package]]
+-name = "system-configuration"
+-version = "0.5.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+-dependencies = [
+- "bitflags 1.3.2",
+- "core-foundation",
+- "system-configuration-sys",
+-]
+-
+-[[package]]
+-name = "system-configuration-sys"
+-version = "0.5.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
++checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+ dependencies = [
+- "core-foundation-sys",
+- "libc",
++ "futures-core",
+ ]
+ 
+ [[package]]
+@@ -2239,7 +2373,7 @@ dependencies = [
+  "schemars",
+  "serde",
+  "serde_json",
+- "thiserror",
++ "thiserror 1.0.57",
+  "time",
+  "toml",
+  "tracing",
+@@ -2307,7 +2441,7 @@ dependencies = [
+  "sha1",
+  "tap",
+  "taplo",
+- "thiserror",
++ "thiserror 1.0.57",
+  "time",
+  "tokio",
+  "tracing",
+@@ -2352,7 +2486,7 @@ dependencies = [
+  "clap",
+  "console_error_panic_hook",
+  "futures",
+- "getrandom",
++ "getrandom 0.2.12",
+  "indexmap",
+  "js-sys",
+  "lsp-async-stub",
+@@ -2404,7 +2538,16 @@ version = "1.0.57"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+ dependencies = [
+- "thiserror-impl",
++ "thiserror-impl 1.0.57",
++]
++
++[[package]]
++name = "thiserror"
++version = "2.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
++dependencies = [
++ "thiserror-impl 2.0.17",
+ ]
+ 
+ [[package]]
+@@ -2415,7 +2558,18 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "2.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2497,7 +2651,7 @@ dependencies = [
+  "num_cpus",
+  "parking_lot",
+  "pin-project-lite",
+- "socket2",
++ "socket2 0.5.5",
+  "tokio-macros",
+  "windows-sys 0.48.0",
+ ]
+@@ -2510,7 +2664,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2525,27 +2679,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "tokio-rustls"
+-version = "0.24.1"
++version = "0.26.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
++checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+ dependencies = [
+  "rustls",
+  "tokio",
+ ]
+ 
+-[[package]]
+-name = "tokio-util"
+-version = "0.7.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+-dependencies = [
+- "bytes",
+- "futures-core",
+- "futures-sink",
+- "pin-project-lite",
+- "tokio",
+-]
+-
+ [[package]]
+ name = "toml"
+ version = "0.7.8"
+@@ -2580,11 +2721,50 @@ dependencies = [
+  "winnow",
+ ]
+ 
++[[package]]
++name = "tower"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
++dependencies = [
++ "futures-core",
++ "futures-util",
++ "pin-project-lite",
++ "sync_wrapper",
++ "tokio",
++ "tower-layer",
++ "tower-service",
++]
++
++[[package]]
++name = "tower-http"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
++dependencies = [
++ "bitflags 2.4.2",
++ "bytes",
++ "futures-util",
++ "http",
++ "http-body",
++ "iri-string",
++ "pin-project-lite",
++ "tower",
++ "tower-layer",
++ "tower-service",
++]
++
++[[package]]
++name = "tower-layer"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
++
+ [[package]]
+ name = "tower-service"
+-version = "0.3.2"
++version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
++checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+ 
+ [[package]]
+ name = "tracing"
+@@ -2605,7 +2785,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2769,28 +2949,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+ 
+ [[package]]
+-name = "wasm-bindgen"
+-version = "0.2.100"
++name = "wasip2"
++version = "1.0.1+wasi-0.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+ dependencies = [
+- "cfg-if",
+- "once_cell",
+- "rustversion",
+- "wasm-bindgen-macro",
++ "wit-bindgen",
+ ]
+ 
+ [[package]]
+-name = "wasm-bindgen-backend"
+-version = "0.2.100"
++name = "wasm-bindgen"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
++checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+ dependencies = [
+- "bumpalo",
+- "log",
+- "proc-macro2",
+- "quote",
+- "syn 2.0.48",
++ "cfg-if",
++ "once_cell",
++ "rustversion",
++ "wasm-bindgen-macro",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -2808,9 +2984,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.100"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
++checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -2818,22 +2994,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.100"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
++checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+ dependencies = [
++ "bumpalo",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
+- "wasm-bindgen-backend",
++ "syn 2.0.108",
+  "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.100"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
++checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+ dependencies = [
+  "unicode-ident",
+ ]
+@@ -2848,11 +3024,24 @@ dependencies = [
+  "wasm-bindgen",
+ ]
+ 
++[[package]]
++name = "web-time"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
++dependencies = [
++ "js-sys",
++ "wasm-bindgen",
++]
++
+ [[package]]
+ name = "webpki-roots"
+-version = "0.25.4"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
++checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
++dependencies = [
++ "rustls-pki-types",
++]
+ 
+ [[package]]
+ name = "winapi"
+@@ -2885,6 +3074,12 @@ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ 
++[[package]]
++name = "windows-link"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
++
+ [[package]]
+ name = "windows-sys"
+ version = "0.48.0"
+@@ -2903,6 +3098,15 @@ dependencies = [
+  "windows-targets 0.52.0",
+ ]
+ 
++[[package]]
++name = "windows-sys"
++version = "0.60.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
++dependencies = [
++ "windows-targets 0.53.5",
++]
++
+ [[package]]
+ name = "windows-targets"
+ version = "0.48.5"
+@@ -2933,6 +3137,23 @@ dependencies = [
+  "windows_x86_64_msvc 0.52.0",
+ ]
+ 
++[[package]]
++name = "windows-targets"
++version = "0.53.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
++dependencies = [
++ "windows-link",
++ "windows_aarch64_gnullvm 0.53.1",
++ "windows_aarch64_msvc 0.53.1",
++ "windows_i686_gnu 0.53.1",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc 0.53.1",
++ "windows_x86_64_gnu 0.53.1",
++ "windows_x86_64_gnullvm 0.53.1",
++ "windows_x86_64_msvc 0.53.1",
++]
++
+ [[package]]
+ name = "windows_aarch64_gnullvm"
+ version = "0.48.5"
+@@ -2945,6 +3166,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+ 
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
++
+ [[package]]
+ name = "windows_aarch64_msvc"
+ version = "0.48.5"
+@@ -2957,6 +3184,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+ 
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
++
+ [[package]]
+ name = "windows_i686_gnu"
+ version = "0.48.5"
+@@ -2969,6 +3202,18 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+ 
++[[package]]
++name = "windows_i686_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
++
++[[package]]
++name = "windows_i686_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
++
+ [[package]]
+ name = "windows_i686_msvc"
+ version = "0.48.5"
+@@ -2981,6 +3226,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+ 
++[[package]]
++name = "windows_i686_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
++
+ [[package]]
+ name = "windows_x86_64_gnu"
+ version = "0.48.5"
+@@ -2993,6 +3244,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+ 
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
++
+ [[package]]
+ name = "windows_x86_64_gnullvm"
+ version = "0.48.5"
+@@ -3005,6 +3262,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+ 
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
++
+ [[package]]
+ name = "windows_x86_64_msvc"
+ version = "0.48.5"
+@@ -3017,6 +3280,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+ 
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
++
+ [[package]]
+ name = "winnow"
+ version = "0.5.40"
+@@ -3027,14 +3296,10 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "winreg"
+-version = "0.50.0"
++name = "wit-bindgen"
++version = "0.46.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+-dependencies = [
+- "cfg-if",
+- "windows-sys 0.48.0",
+-]
++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+ 
+ [[package]]
+ name = "zerocopy"
+@@ -3042,7 +3307,16 @@ version = "0.7.32"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+ dependencies = [
+- "zerocopy-derive",
++ "zerocopy-derive 0.7.32",
++]
++
++[[package]]
++name = "zerocopy"
++version = "0.8.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
++dependencies = [
++ "zerocopy-derive 0.8.27",
+ ]
+ 
+ [[package]]
+@@ -3053,5 +3327,22 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
++
++[[package]]
++name = "zerocopy-derive"
++version = "0.8.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "zeroize"
++version = "1.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+diff --git a/Cargo.toml b/Cargo.toml
+index d98197c..e1100e2 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -30,7 +30,7 @@ lsp-types          = { version = "0.93.0" }
+ once_cell          = { version = "1.4" }
+ parking_lot        = { version = "0.12.0" }
+ regex              = { version = "1.5" }
+-reqwest            = { version = "0.11.9", default-features = false }
++reqwest            = { version = "0.12.24", default-features = false }
+ rowan              = { version = "0.15.3" }
+ schemars           = { version = "0.8.3" }
+ serde              = { version = "1" }
diff --git a/pkgs/by-name/ta/tapview/package.nix b/pkgs/by-name/ta/tapview/package.nix
index 5d186f9a5d37..bd95d188bbea 100644
--- a/pkgs/by-name/ta/tapview/package.nix
+++ b/pkgs/by-name/ta/tapview/package.nix
@@ -5,30 +5,27 @@
   stdenv,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tapview";
-  version = "1.1";
+  version = "1.15";
 
   nativeBuildInputs = [ asciidoctor ];
 
   src = fetchFromGitLab {
     owner = "esr";
     repo = "tapview";
-    rev = version;
-    hash = "sha256-inrxICNglZU/tup+YnHaDiVss32K2OXht/7f8lOZI4g=";
+    tag = finalAttrs.version;
+    hash = "sha256-6v+CxNjj3gPE3wmhit6e5OuhkjVACFv/4QAbFDCySGc=";
   };
 
-  # Remove unnecessary `echo` checks: `/bin/echo` fails, and `echo -n` works as expected.
-  patches = [ ./dont_check_echo.patch ];
-
   makeFlags = [ "prefix=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Minimalist pure consumer for TAP (Test Anything Protocol)";
     mainProgram = "tapview";
     homepage = "https://gitlab.com/esr/tapview";
-    license = licenses.bsd2;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ pamplemousse ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ pamplemousse ];
   };
-}
+})
diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix
index 357a77a53d82..a207bf40819a 100644
--- a/pkgs/by-name/ta/tart/package.nix
+++ b/pkgs/by-name/ta/tart/package.nix
@@ -14,11 +14,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tart";
-  version = "2.28.6";
+  version = "2.30.0";
 
   src = fetchurl {
     url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz";
-    hash = "sha256-F6bYWVHtzXo6TH4CAvdF6qx7OCVvKACsh2KdRYFsxOw=";
+    hash = "sha256-NUjF5hX+M12WcT+T/QXqHBFz2UOVm0NFtYzKGQmS6kg=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix
index e6c8cbb5051b..59785e43a152 100644
--- a/pkgs/by-name/ta/tarts/package.nix
+++ b/pkgs/by-name/ta/tarts/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
     description = "Screen saves and visual effects for your terminal";
     homepage = "https://github.com/oiwn/tarts";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "tarts";
   };
 }
diff --git a/pkgs/by-name/ta/taskserver/package.nix b/pkgs/by-name/ta/taskserver/package.nix
index 7d424cc874c0..5112984aaf6a 100644
--- a/pkgs/by-name/ta/taskserver/package.nix
+++ b/pkgs/by-name/ta/taskserver/package.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
       makeWrapper  $pkipath/$i $out/bin/taskd-pki-$i \
         --prefix PATH : ${lib.makeBinPath [ gnutls ]}
     done
+
+    substituteInPlace {doc/,src/,./}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_policy(SET CMP0037 OLD)" ""
   '';
 
   buildInputs = [
diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index b595a4b8ee27..9ca19b9b21d2 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "taskwarrior-tui";
-  version = "0.26.3";
+  version = "0.26.4";
 
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
     rev = "v${version}";
-    sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ=";
+    sha256 = "sha256-Ubl2xSFb5ZJ/5JqNI0In3hX6SxZd4g/AEq+CLdN2FsE=";
   };
 
-  cargoHash = "sha256-y5tHZIsbHLU9acIUM/QUx1T0eLK/E/jR+XXys5JnGjU=";
+  cargoHash = "sha256-lq2mqMrhcRX2gX7youx8NrZEKmEOJYuhIsHHixuQmmk=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix
index 91e801cc0bb9..7d14bac00104 100644
--- a/pkgs/by-name/ta/taskwarrior2/package.nix
+++ b/pkgs/by-name/ta/taskwarrior2/package.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       marcweber
       oxalica
+      Necior
     ];
     mainProgram = "task";
     platforms = platforms.unix;
diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index 3f100fbb6b7c..9a1c94241827 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -11,6 +11,7 @@
   installShellFiles,
 
   # buildInputs
+  corrosion,
   libuuid,
 
   # passthru.tests
@@ -24,18 +25,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "taskwarrior";
-  version = "3.4.1";
+  version = "3.4.2";
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "taskwarrior";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-00HiGju4pIswx8Z+M+ATdBSupiMS2xIm2ZnE52k/RwA=";
+    hash = "sha256-Y0jnAW4OtPI9GCOSFRPf8/wo4qBB6O1FASj40S601+E=";
     fetchSubmodules = true;
   };
   cargoDeps = rustPlatform.fetchCargoVendor {
     name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-trc5DIWf68XRBSMjeG/ZchuwFA56wJnLbqm17gE+jYQ=";
+    hash = "sha256-03HG8AGe6PJ516zL23iNjGUYmGOZa8NuFljb1ll2pjs=";
   };
 
   # The CMakeLists files used by upstream issue a `cargo install` command to
@@ -46,6 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
   postUnpack = ''
     export CARGO_HOME=$PWD/.cargo
   '';
+  cmakeFlags = [
+    (lib.cmakeBool "SYSTEM_CORROSION" true)
+  ];
   failingTests = [
     # It would be very hard to make this test succeed, as the bash completion
     # needs to be installed and the builder's `bash` should be aware of it.
@@ -74,12 +78,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    corrosion
     libuuid
   ];
 
   doCheck = true;
   # See:
-  # https://github.com/GothenburgBitFactory/taskwarrior/blob/v3.2.0/doc/devel/contrib/development.md#run-the-test-suite
+  # https://github.com/GothenburgBitFactory/taskwarrior/blob/v3.4.1/doc/devel/contrib/development.md#run-the-test-suite
   preCheck = ''
     make test_runner
   '';
diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 7230003001fe..6ad11e238957 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taze";
-  version = "19.7.0";
+  version = "19.9.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "taze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-O+xeAM6sh6YK+yAtxQCTI59Dle/6Z4/ePbgqRGmZxlU=";
+    hash = "sha256-Xpi5Wc8YP3hUSbEnfEM6uNvdlNiVMRz0oqZAJCBkLHQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-vXw5LPNcuF9wyI23rZhsvvMYTsPNOvSY3LoLntFdm3g=";
+    hash = "sha256-g1LGiCb2NESywYN4tTVf8sXbuJla2whCm5amvPsdmRc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 2515e5067f71..abfe58d17510 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -1,29 +1,31 @@
 {
-  lib,
-  stdenv,
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  testers,
-  tbls,
+  lib,
+  stdenv,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.89.1";
+  version = "1.91.2";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-fGaH9766OjPNz0eVG4M1hKdqRaEkAzwz1lL2o4TxyAo=";
+    hash = "sha256-iL8d8fvc0zawe5UyeOwp5cfnE1K58IY39RSzq/jCc4c=";
   };
 
-  vendorHash = "sha256-hupOff2cJ+UrJFgMyDu3XYvEjyE/XvvyqiQq408wJsw=";
+  vendorHash = "sha256-HE3/h77APsNRitAAo4R/5tWrX36IPcJRAUFv6M6P6x4=";
 
   excludedPackages = [ "scripts/jsonschema" ];
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ];
 
   ldflags = [
     "-s"
@@ -46,11 +48,9 @@ buildGoModule rec {
       --zsh <($out/bin/tbls completion zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = tbls;
-    command = "tbls version";
-    inherit version;
-  };
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "version";
 
   meta = {
     description = "Tool to generate documentation based on a database structure";
diff --git a/pkgs/by-name/tb/tbox/package.nix b/pkgs/by-name/tb/tbox/package.nix
index 16f26e2d82d4..0077ef701cfd 100644
--- a/pkgs/by-name/tb/tbox/package.nix
+++ b/pkgs/by-name/tb/tbox/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tbox";
-  version = "1.7.7";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "tboox";
     repo = "tbox";
     rev = "v${version}";
-    hash = "sha256-piPfPg3NAvP2zhWgtPlNvlAHoqIU77TE/kd1B/6GIuc=";
+    hash = "sha256-lAuazxlPOfZ7gWGS0pQ22Yk3PjgrB9wlxNkq1TTVEoM=";
   };
 
   configureFlags = [
diff --git a/pkgs/by-name/te/tea/package.nix b/pkgs/by-name/te/tea/package.nix
index 8b804c770f6f..ad6a1ff7de00 100644
--- a/pkgs/by-name/te/tea/package.nix
+++ b/pkgs/by-name/te/tea/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "tea";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "tea";
     rev = "v${version}";
-    sha256 = "sha256-jM/TR3bApWv0ci98Vb/0YPjlmLuO91WPY9eMHBInIQI=";
+    sha256 = "sha256-bphXaE5qPNzqn+PlzESZadpwbS6KryJEnL7hH/CBoTI=";
   };
 
   vendorHash = "sha256-Y9YDwfubT+RR1v6BTFD+A8GP2ArQaIIoMJmak+Vcx88=";
diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 8791ec8783c7..f45f1ab39265 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.5.10";
+  version = "2.6.11";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-AUvsH1ul+pkWQq2GKJTjsds7IPLQoDhWBcu4LN0HRg0=";
+    hash = "sha256-jx58Bg/jMGqf9M/Ss4cYIHtuUmtkej67ScrcttSxNhg=";
   };
 
-  npmDepsHash = "sha256-zicJ9orYgnusTHrMX5rSrnsXA1ENjZZJKXvkqn8XLC4=";
+  npmDepsHash = "sha256-tgLO4EsD3j5mg3c9M+I8jkeytw2ZrgQsKs10aryaFhw=";
 
   nativeBuildInputs = [
     makeWrapper
@@ -132,6 +132,7 @@ buildNpmPackage rec {
       qjoly
       chvp
       khaneliman
+      HarisDotParis
     ];
     platforms = with lib.platforms; darwin ++ linux;
   };
diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix
index a05263c1353d..274a3dfc3280 100644
--- a/pkgs/by-name/te/teamspeak6-client/package.nix
+++ b/pkgs/by-name/te/teamspeak6-client/package.nix
@@ -21,7 +21,9 @@
   libpulseaudio,
   libxkbcommon,
   libgbm,
+  libvdpau,
   nss,
+  pipewire,
   udev,
   libGL,
   xorg,
@@ -29,11 +31,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "teamspeak6-client";
-  version = "6.0.0-beta2";
+  version = "6.0.0-beta3.2";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
-    hash = "sha256-3jNPv3uQ2RztR1p4XQNLUg5IVrvW/dcdtqXdiGJKVSs=";
+    hash = "sha256-sZrYGonBw3BgUSExovs8GW5E54vhr3i/VR9eH9/qjWM=";
   };
 
   sourceRoot = ".";
@@ -54,7 +56,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     libpulseaudio
     libxkbcommon
     libgbm
+    libvdpau
     nss
+    pipewire
     xorg.libX11
     xorg.libXScrnSaver
     xorg.libXdamage
@@ -102,6 +106,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           udev
           libGL
           libpulseaudio
+          libvdpau
+          pipewire
         ]
       }"
 
@@ -116,6 +122,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.teamspeak;
     mainProgram = "TeamSpeak";
     maintainers = with lib.maintainers; [
+      drafolin
       gepbird
       jojosch
     ];
diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix
new file mode 100644
index 000000000000..8ef60ecc8cfd
--- /dev/null
+++ b/pkgs/by-name/te/teamtype/package.nix
@@ -0,0 +1,58 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  versionCheckHook,
+  installShellFiles,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "teamtype";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "teamtype";
+    repo = "teamtype";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-B/4xR16cEG90fK12XQqjlpWzd6tyUVYXOBXK0j5fvNU=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/daemon";
+
+  cargoHash = "sha256-yuAk4SqYzNK1gD6lqVVDOyAJNq/NIf44DWdZ3aM/Q8s=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage \
+      target/manpages/teamtype.1 \
+      target/manpages/teamtype-client.1 \
+      target/manpages/teamtype-join.1 \
+      target/manpages/teamtype-share.1
+
+    installShellCompletion --bash target/completions/teamtype.bash
+    installShellCompletion --zsh target/completions/_teamtype
+    installShellCompletion --fish target/completions/teamtype.fish
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Real-time co-editing of local text files";
+    homepage = "https://teamtype.github.io/teamtype/";
+    downloadPage = "https://github.com/teamtype/teamtype";
+    changelog = "https://github.com/teamtype/teamtype/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.agpl3Plus;
+    mainProgram = "teamtype";
+    teams = [ lib.teams.ngi ];
+    maintainers = with lib.maintainers; [
+      prince213
+      ethancedwards8
+    ];
+  };
+})
diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 0fee424811fb..7bfa9a9f6f8e 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -46,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_HELP=OFF"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Table Editor And Planner, Or: Teapot";
     longDescription = ''
diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index bb609016a324..b1e46c54a1a0 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Gskartwii/teehee";
     changelog = "https://github.com/Gskartwii/teehee/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "teehee";
   };
 }
diff --git a/pkgs/by-name/te/teensy-cmake-macros/package.nix b/pkgs/by-name/te/teensy-cmake-macros/package.nix
index 45098cb5ffb5..0461db32c00f 100644
--- a/pkgs/by-name/te/teensy-cmake-macros/package.nix
+++ b/pkgs/by-name/te/teensy-cmake-macros/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "CMake macros for building teensy projects";
     platforms = platforms.all;
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index e32b148673ad..9a08eba9d865 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/greymd/teip";
     changelog = "https://github.com/greymd/teip/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/te/tektoncd-cli-pac/package.nix b/pkgs/by-name/te/tektoncd-cli-pac/package.nix
index 718643366ae2..22ace41e9b2f 100644
--- a/pkgs/by-name/te/tektoncd-cli-pac/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli-pac/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tektoncd-cli-pac";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "openshift-pipelines";
     repo = "pipelines-as-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ti2IVI6ECXOhSxeeW7ufD1XjsOtr1R2J5Beq/ADRHaA=";
+    hash = "sha256-39jVFnLEUQHakVcSkrjrTRANp6D8FAoy+kIGi/QL5gk=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/te/tektoncd-cli/package.nix b/pkgs/by-name/te/tektoncd-cli/package.nix
index 082b85a549ff..cacb2ac2ba05 100644
--- a/pkgs/by-name/te/tektoncd-cli/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli/package.nix
@@ -3,16 +3,23 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+
+  writableTmpDirAsHomeHook,
+
+  stdenv,
+  buildPackages,
+
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "tektoncd-cli";
   version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "tektoncd";
     repo = "cli";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-WB3XsXT8bXo2GpHC6hGKilRwloy31y18JD09cQklsV0=";
   };
 
@@ -21,47 +28,62 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${version}"
+    "-X github.com/tektoncd/cli/pkg/cmd/version.clientVersion=${finalAttrs.version}"
   ];
 
+  # tests bind to ::1
+  __darwinAllowLocalNetworking = true;
+
   nativeBuildInputs = [ installShellFiles ];
 
-  subPackages = [ "cmd/tkn" ];
+  subPackages = [
+    "cmd/tkn"
+  ];
+
+  excludedPackages = [
+    "test/e2e"
+  ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+  ];
 
   preCheck = ''
-    # some tests try to write to the home dir
-    export HOME="$TMPDIR"
-
     # run all tests
     unset subPackages
 
     # the tests expect the clientVersion ldflag not to be set
     unset ldflags
-
-    # remove tests with networking
-    rm pkg/cmd/version/version_test.go
   '';
 
   postInstall = ''
     installManPage docs/man/man1/*
+  ''
+  + (
+    let
+      exe =
+        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+          "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}"
+        else
+          lib.getExe buildPackages.tektoncd-cli;
+    in
+    ''
+      installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
+        --bash <(${exe} completion bash) \
+        --fish <(${exe} completion fish) \
+        --zsh <(${exe} completion zsh)
+    ''
+  );
 
-    installShellCompletion --cmd tkn \
-      --bash <($out/bin/tkn completion bash) \
-      --fish <($out/bin/tkn completion fish) \
-      --zsh <($out/bin/tkn completion zsh)
-  '';
-
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
   doInstallCheck = true;
-  installCheckPhase = ''
-    runHook preInstallCheck
-    $out/bin/tkn --help
-    $out/bin/tkn version | grep "Client version: ${version}"
-    runHook postInstallCheck
-  '';
+  versionCheckProgramArg = "version";
 
   meta = {
     homepage = "https://tekton.dev";
-    changelog = "https://github.com/tektoncd/cli/releases/tag/v${version}";
+    changelog = "https://github.com/tektoncd/cli/releases/tag/${finalAttrs.src.tag}";
     description = "Provides a CLI for interacting with Tekton - tkn";
     longDescription = ''
       The Tekton Pipelines cli project provides a CLI for interacting with
@@ -77,4 +99,4 @@ buildGoModule rec {
     ];
     mainProgram = "tkn";
   };
-}
+})
diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix
index 149e88d07928..bb8a1ef8ee4f 100644
--- a/pkgs/by-name/te/tela-icon-theme/package.nix
+++ b/pkgs/by-name/te/tela-icon-theme/package.nix
@@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.gpl3Only;
     # darwin systems use case-insensitive filesystems that cause hash mismatches
     platforms = subtractLists platforms.darwin platforms.unix;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index 6dbb853a213f..4a165b103098 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.36.2";
+  version = "1.36.3";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -18,10 +18,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-nIYAGsGYZUK5o1KqcH4bI3wPRRXCynN6N5T6f2oy2bo=";
+    hash = "sha256-aEMvBKDE+fbjXyvi3MkbV1/Bu0q4F7W7DPwTRUcWY8M=";
   };
 
-  vendorHash = "sha256-k4hI/qIQgV1qChOWDCqWcMboaVoDe3k/DP/wNa0Aqg4=";
+  vendorHash = "sha256-BofW6hvcpQb1OWTbfoS+o2RJg4N0zMqid1ergeVh/wM=";
   proxyVendor = true;
 
   ldflags = [
diff --git a/pkgs/by-name/te/telepathy-haze/package.nix b/pkgs/by-name/te/telepathy-haze/package.nix
deleted file mode 100644
index 56ff4ef9c293..000000000000
--- a/pkgs/by-name/te/telepathy-haze/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pidgin,
-  telepathy-glib,
-  python3,
-  glib,
-  dbus-glib,
-  pkg-config,
-  libxslt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "telepathy-haze";
-  version = "0.8.1";
-
-  src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz";
-    hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo=";
-  };
-
-  buildInputs = [
-    glib
-    telepathy-glib
-    dbus-glib
-    pidgin
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    libxslt
-    python3
-  ];
-
-  meta = {
-    description = "Telepathy connection manager based on libpurple";
-    homepage = "https://telepathy.freedesktop.org/components/telepathy-haze/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/by-name/te/telepathy-mission-control/package.nix b/pkgs/by-name/te/telepathy-mission-control/package.nix
index e09780096df0..0e460038debe 100644
--- a/pkgs/by-name/te/telepathy-mission-control/package.nix
+++ b/pkgs/by-name/te/telepathy-mission-control/package.nix
@@ -61,5 +61,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Only;
     maintainers = [ ];
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 }
diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 93697b54bc97..64af74563365 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -1,5 +1,5 @@
 {
-  teleport_17,
+  teleport_18,
 }:
 
-teleport_17
+teleport_18
diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index cfd330a470b2..2599a4488b81 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -6,10 +6,10 @@
   extPatches ? [ ],
 }:
 buildTeleport {
-  version = "16.5.15";
-  hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA=";
-  vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo=";
-  pnpmHash = "sha256-8xnH9PkKz77whtq/LVYUjyG1Z1reRtW03Gv8sZ/1vww=";
+  version = "16.5.18";
+  hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo=";
+  vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8=";
+  pnpmHash = "sha256-Sn3rM6l6pADG7GHenlL3NC0oLc4GFZLTzqDHgzInLbk=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 7aa71820e439..7296c80c50a9 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "17.7.3";
-  hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo=";
-  vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ=";
+  version = "17.7.8";
+  hash = "sha256-z520UT17nFLBwyVLjdfx9aTbkMv1fljsN88G6WRPvZE=";
+  vendorHash = "sha256-mtOCLAcVIxaEhGzdsVWxnKQ4FRTXZ5vVAF+NVMdFItk=";
   cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg=";
+  pnpmHash = "sha256-zTl7hSVPEdnFXx76QpApdY/qDKVNA3yrhaprSYp7YQo=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   inherit buildGoModule withRdpClient extPatches;
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 7585fde5f5b0..9312a428633c 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -7,10 +7,10 @@
 }:
 
 buildTeleport {
-  version = "18.2.0";
-  hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c=";
-  vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo=";
-  pnpmHash = "sha256-wW4RT1uqOTpy8wKIsAOfIlxoOamTzPqEbFQRAub+sn4=";
+  version = "18.3.1";
+  hash = "sha256-HM0pu+3O7zoClH15YC0naxxmKJC9ngamnvraTosRqG0=";
+  vendorHash = "sha256-HyS0KKW7lyn3NzedxM4+UxFV9OnxgtFDMW5jkj3ir/8=";
+  pnpmHash = "sha256-6sThtwACNEdV0fleaQf3iMmFxPsd0AshYeYZUatFMcg=";
   cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;
diff --git a/pkgs/by-name/te/telepresence2/package.nix b/pkgs/by-name/te/telepresence2/package.nix
index 3420bac48456..92529d59f4be 100644
--- a/pkgs/by-name/te/telepresence2/package.nix
+++ b/pkgs/by-name/te/telepresence2/package.nix
@@ -31,13 +31,13 @@ let
 in
 buildGoModule rec {
   pname = "telepresence2";
-  version = "2.24.1";
+  version = "2.25.0";
 
   src = fetchFromGitHub {
     owner = "telepresenceio";
     repo = "telepresence";
     rev = "v${version}";
-    hash = "sha256-f9KlDKLRLmYAGMWdlKb4PbGZ+hn8J55EAmQ19oJ5+q4=";
+    hash = "sha256-ke3Si55CVc3JJgzwcCXmeGiT1GQKF+8ocrNfiLtRRcA=";
   };
 
   propagatedBuildInputs = [
@@ -51,7 +51,7 @@ buildGoModule rec {
     export CGO_ENABLED=0
   '';
 
-  vendorHash = "sha256-I2FyoOKSU1h6a2LwmAdFKGIcqVGbtxujjarqdSX7HFI=";
+  vendorHash = "sha256-R+7tw2nX2rM46ETOgcQuwMCRLU23ejtNOGA3Bt/+Guw=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/te/teleprompter/package.nix b/pkgs/by-name/te/teleprompter/package.nix
index 6ca518f821e2..50b602c81591 100644
--- a/pkgs/by-name/te/teleprompter/package.nix
+++ b/pkgs/by-name/te/teleprompter/package.nix
@@ -57,6 +57,6 @@ python3Packages.buildPythonApplication {
     changelog = "https://github.com/Nokse22/teleprompter/releases/tag/v${version}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "teleprompter";
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index ee92352468e8..55a1b4ad9517 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -1,60 +1,99 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
-  makeWrapper,
-  testers,
-  television,
+  callPackage,
+  installShellFiles,
   nix-update-script,
-  extraPackages ? [ ],
+  testers,
+  targetPackages,
+  extraPackages ? null,
 }:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "television";
-  version = "0.13.5";
 
-  src = fetchFromGitHub {
-    owner = "alexpasmantier";
-    repo = "television";
-    tag = finalAttrs.version;
-    hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ=";
-  };
+assert
+  (extraPackages == null)
+  || lib.warn "Overriding television with the 'extraPackages' attribute is deprecated. Please use `television.withPackages (p: [ p.fd ...])` instead.";
 
-  cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E=";
+let
+  television = rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "television";
 
-  nativeBuildInputs = [ makeWrapper ];
+    version = "0.13.5";
 
-  postInstall = lib.optionalString (extraPackages != [ ]) ''
-    wrapProgram $out/bin/tv \
-      --prefix PATH : ${lib.makeBinPath extraPackages}
-  '';
-
-  # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them
-  # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941
-  doCheck = false;
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = television;
-      command = "XDG_DATA_HOME=$TMPDIR tv --version";
+    src = fetchFromGitHub {
+      owner = "alexpasmantier";
+      repo = "television";
+      tag = finalAttrs.version;
+      hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ=";
     };
-    updateScript = nix-update-script { };
-  };
 
-  meta = {
-    description = "Blazingly fast general purpose fuzzy finder TUI";
-    longDescription = ''
-      Television is a fast and versatile fuzzy finder TUI.
-      It lets you quickly search through any kind of data source (files, git
-      repositories, environment variables, docker images, you name it) using a
-      fuzzy matching algorithm and is designed to be easily extensible.
-    '';
-    homepage = "https://github.com/alexpasmantier/television";
-    changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}";
-    license = lib.licenses.mit;
-    mainProgram = "tv";
-    maintainers = with lib.maintainers; [
-      louis-thevenet
-      getchoo
+    cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E=";
+
+    strictDeps = true;
+    nativeBuildInputs = [
+      installShellFiles
     ];
-  };
-})
+
+    # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them
+    # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941
+    doCheck = false;
+
+    postInstall = ''
+      installManPage target/${stdenv.hostPlatform.rust.cargoShortTarget}/assets/tv.1
+
+      installShellCompletion --cmd tv \
+        television/utils/shell/completion.bash \
+        television/utils/shell/completion.fish \
+        television/utils/shell/completion.nu \
+        television/utils/shell/completion.zsh
+    '';
+
+    passthru = {
+      updateScript = nix-update-script { };
+
+      withPackages =
+        f:
+        callPackage ./wrapper.nix {
+          television = finalAttrs.finalPackage;
+          extraPackages = f targetPackages;
+        };
+
+      tests = {
+        version = testers.testVersion {
+          package = finalAttrs.finalPackage;
+          command = "XDG_DATA_HOME=$TMPDIR tv --version";
+        };
+        wrapper = testers.testVersion {
+          package = finalAttrs.finalPackage.withPackages (pkgs: [
+            pkgs.fd
+            pkgs.git
+          ]);
+
+          command = "XDG_DATA_HOME=$TMPDIR tv --version";
+        };
+      };
+    };
+
+    meta = {
+      description = "Blazingly fast general purpose fuzzy finder TUI";
+      longDescription = ''
+        Television is a fast and versatile fuzzy finder TUI.
+        It lets you quickly search through any kind of data source (files, git
+        repositories, environment variables, docker images, you name it) using a
+        fuzzy matching algorithm and is designed to be easily extensible.
+      '';
+      homepage = "https://github.com/alexpasmantier/television";
+      changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}";
+      license = lib.licenses.mit;
+      mainProgram = "tv";
+      maintainers = with lib.maintainers; [
+        louis-thevenet
+        getchoo
+        RossSmyth
+      ];
+    };
+  });
+in
+
+if extraPackages == null then television else television.withPackages (lib.const extraPackages)
diff --git a/pkgs/by-name/te/television/wrapper.nix b/pkgs/by-name/te/television/wrapper.nix
new file mode 100644
index 000000000000..75725f0051df
--- /dev/null
+++ b/pkgs/by-name/te/television/wrapper.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  symlinkJoin,
+  television,
+  makeBinaryWrapper,
+  extraPackages,
+}:
+
+symlinkJoin {
+  inherit (television) version;
+  pname = "${television.pname}-with-pkgs";
+
+  paths = [ television ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/tv \
+      --prefix PATH : "${lib.makeBinPath extraPackages}"
+  '';
+
+  meta = {
+    inherit (television.meta)
+      description
+      longDescription
+      homepage
+      changelog
+      license
+      mainProgram
+      maintainers
+      ;
+  };
+}
diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index 51f159f4eb42..8e7202fa05aa 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "templ";
-  version = "0.3.943";
+  version = "0.3.960";
 
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
     rev = "v${version}";
-    hash = "sha256-7owKjFrIHi5+RhWXzUTWwwxFLu9RNmq2g3SUf9RuDDc=";
+    hash = "sha256-GCbqaRC9KipGdGfgnGjJu04/rJlg+2lgi2vluP05EV4=";
   };
 
   vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A=";
diff --git a/pkgs/by-name/te/template-glib/package.nix b/pkgs/by-name/te/template-glib/package.nix
index e4a1a4034d25..454149b612f8 100644
--- a/pkgs/by-name/te/template-glib/package.nix
+++ b/pkgs/by-name/te/template-glib/package.nix
@@ -5,6 +5,7 @@
   meson,
   ninja,
   pkg-config,
+  gi-docgen,
   glib,
   gobject-introspection,
   flex,
@@ -12,14 +13,11 @@
   vala,
   gettext,
   gnome,
-  gtk-doc,
-  docbook_xsl,
-  docbook_xml_dtd_43,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "template-glib";
-  version = "3.36.3";
+  version = "3.38.0";
 
   outputs = [
     "out"
@@ -28,8 +26,8 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor version}/template-glib-${version}.tar.xz";
-    hash = "sha256-1SizWyz5Dgfa5Q4l4S+62w6wSPV/1RUc+fbpjM4d8g4=";
+    url = "mirror://gnome/sources/template-glib/${lib.versions.majorMinor finalAttrs.version}/template-glib-${finalAttrs.version}.tar.xz";
+    hash = "sha256-QNANwiPc8ut/LsQi997FpnNzoMoRAavKD0nGLwUMsxI=";
   };
 
   nativeBuildInputs = [
@@ -40,10 +38,8 @@ stdenv.mkDerivation rec {
     flex
     bison
     vala
+    gi-docgen
     glib
-    gtk-doc
-    docbook_xsl
-    docbook_xml_dtd_43
     gobject-introspection
   ];
 
@@ -52,11 +48,16 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
-    "-Dgtk_doc=true"
+    "-Ddocs=true"
   ];
 
   doCheck = true;
 
+  postFixup = ''
+    # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back.
+    moveToOutput share/doc/template-glib-1.0 "$devdoc"
+  '';
+
   passthru = {
     updateScript = gnome.updateScript {
       packageName = "template-glib";
@@ -71,4 +72,4 @@ stdenv.mkDerivation rec {
     teams = [ teams.gnome ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 2f52cb8cbe7e..688b2bf3d036 100644
--- a/pkgs/by-name/te/tempo/package.nix
+++ b/pkgs/by-name/te/tempo/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "tempo";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tempo";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-mROhsqbCwPulxtg3pHVZi8FmW9PrYzGPdE0ajVvzRBY=";
+    hash = "sha256-98qK+U1SltwTdeNH+MXVU9ql9Be2tMOYZ9W3dEqBqAI=";
   };
 
   vendorHash = null;
@@ -39,11 +39,11 @@ buildGoModule (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "High volume, minimal dependency trace storage";
     changelog = "https://github.com/grafana/tempo/releases/tag/v${finalAttrs.version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://grafana.com/oss/tempo/";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.kashw2 ];
   };
 })
diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix
index a8b9aa69f393..cfd4ce4208b6 100644
--- a/pkgs/by-name/te/temporal-cli/package.nix
+++ b/pkgs/by-name/te/temporal-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-cli";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V0ob6Y7ns0ZEH1nZUIDFXxw8JFSzqbMoS4x2KT8pV+k=";
+    hash = "sha256-Y/hTD31WUcVn/OBuNwdhbjDZd36EKbOJRr9PFDKHifg=";
   };
 
-  vendorHash = "sha256-ZftQ1jt4y6HUF4aI2x3i7hnqNO4GKgblzjS1Zzb9sWo=";
+  vendorHash = "sha256-dZhrozZc3SeZQQ7lGeeICrptL2I0DH0EpsjCt4CjCJU=";
 
   overrideModAttrs = old: {
     # https://gitlab.com/cznic/libc/-/merge_requests/10
diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index eeff38ecea96..85ca39845bb7 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "temporal";
-  version = "1.29.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     rev = "v${version}";
-    hash = "sha256-oxn/78nQCvlEkSqabVV47siWSSnz32tpDOweqScPYvY=";
+    hash = "sha256-rUm1zHxM0KYPgKpK7w0XLU7aF3H6sECgSe/UtbNdgJM=";
   };
 
   vendorHash = "sha256-HW2j8swbaWwU1i3udqlT8VyFreML6ZH14zWxF8L5NTQ=";
diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix
index e11ba7ea2c42..4c7cb47c66a0 100644
--- a/pkgs/by-name/te/termimage/package.nix
+++ b/pkgs/by-name/te/termimage/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nabijaczleweli/termimage";
     changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "termimage";
   };
 }
diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix
index 8ed3f8939cab..a53e2d224ef2 100644
--- a/pkgs/by-name/te/termius/package.nix
+++ b/pkgs/by-name/te/termius/package.nix
@@ -17,8 +17,8 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "9.28.0";
-  revision = "234";
+  version = "9.32.2";
+  revision = "240";
 
   src = fetchurl {
     # find the latest version with
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     # and the sha512 with
     # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
     url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
-    hash = "sha512-2zGt4nL8E99s4J9vmzKoOGgEI3XnEx3m7JwFkWuT5wYv/JWoJWnh9dNWlHzRHPpLU8/lAZUG2F4AVYCmPGa96A==";
+    hash = "sha512-TPfQ413zbnuKAhflLZPvLeVdrqdUEi+I/inWAs8SJ1j8rYW1TrHDyMB8S/HpWboRWXmUhPHulNXfGpHKUu453Q==";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/by-name/te/termonad/package.nix b/pkgs/by-name/te/termonad/package.nix
index 482ab2d3c4f2..54059a34a4f0 100644
--- a/pkgs/by-name/te/termonad/package.nix
+++ b/pkgs/by-name/te/termonad/package.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "termonad-with-packages";
-  inherit (termonadEnv) version;
+  inherit (haskellPackages.termonad) version;
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix
index 7e984c2c5406..be9e5a4ea63e 100644
--- a/pkgs/by-name/te/termsvg/package.nix
+++ b/pkgs/by-name/te/termsvg/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "termsvg";
-  version = "0.9.3";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
-    owner = "mrmarble";
+    owner = "MrMarble";
     repo = "termsvg";
     rev = "v${version}";
-    hash = "sha256-ejrg1UywPQDCeaymkGzU+xZoPXME6XEP/SBe3Yxf4YU=";
+    hash = "sha256-tNvr8ptMortP7iI6GwT4AGbqTvNFposca8I2JribGnk=";
   };
 
   vendorHash = "sha256-BoXRLWhQmfvMIN658MiXGCFMbnvuXfv/H/jCE6h4aWk=";
@@ -27,7 +27,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Record, share and export your terminal as a animated SVG image";
-    homepage = "https://github.com/mrmarble/termsvg";
+    homepage = "https://github.com/MrMarble/termsvg";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ pbsds ];
     mainProgram = "termsvg";
diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
index 15dcbd4326f3..904523ee8470 100644
--- a/pkgs/by-name/te/terraform-mcp-server/package.nix
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "terraform-mcp-server";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ck2bwlonkcnZ6DoiVIupjefBRGKLROzfUY+PjkW1yE4=";
+    hash = "sha256-FcjeEp+uwlfezGlmBd2nSTdfnXuPnSDTxTPlP6CtcrE=";
   };
 
-  vendorHash = "sha256-bWh2ttw6q5+iOSskqxRG4UisoROlx87PTrvXfYYuzng=";
+  vendorHash = "sha256-ObNuenbCmmbkRPKUmdMg+ERfUV+RiS2OEOneJOmteZU=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"
diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 43e53782e93c..304ce55bbca0 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.90.0";
+  version = "0.93.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tc+3+H/u/6IpkmvlwObzVjUnJzBzElme0tT+zktGfkw=";
+    hash = "sha256-wi5Ff2wYPMgMMHZAJlq1v/UHjnRyNFbAy3IUYA+T5yI=";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-+4mDmC1B4YmExOJqS/vlTxBiI5/rKcn3Vyw53BfvAxA=";
+  vendorHash = "sha256-GLdUM5vlLO6B8ZCGiBAz5L32Wzr9eeYZxPtUc9MkjhE=";
 
   doCheck = false;
 
diff --git a/pkgs/by-name/te/tetgen/package.nix b/pkgs/by-name/te/tetgen/package.nix
index 56b6bcbe9297..d2b307a24b56 100644
--- a/pkgs/by-name/te/tetgen/package.nix
+++ b/pkgs/by-name/te/tetgen/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
     mainProgram = "tetgen";
diff --git a/pkgs/by-name/te/texlab/package.nix b/pkgs/by-name/te/texlab/package.nix
index 2b57e2308932..0a0cbb80a7b2 100644
--- a/pkgs/by-name/te/texlab/package.nix
+++ b/pkgs/by-name/te/texlab/package.nix
@@ -14,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "texlab";
-  version = "5.23.1";
+  version = "5.24.0";
 
   src = fetchFromGitHub {
     owner = "latex-lsp";
     repo = "texlab";
     tag = "v${version}";
-    hash = "sha256-QGC2UFmbMCMr0i853M5mdXklqZFYy00fbqeLllpQ4Sg=";
+    hash = "sha256-gwF4cBlS43u2PfOQBxD7iq2JL9tUo8TPJqR0tWNdW9k=";
   };
 
-  cargoHash = "sha256-hJDKzHrNUmN4jqp4P1Is3mYvRC5H3nnHtIW7xjDH+xo=";
+  cargoHash = "sha256-9sAurVJSpLNgQvJOG7kSXHIr38MHsw3BhGAaxi9xjUE=";
 
   outputs = [ "out" ] ++ lib.optional (!isCross) "man";
 
@@ -37,7 +37,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.23.0/.github/workflows/publish.yml#L110-L114
+    # https://github.com/latex-lsp/texlab/blob/v5.24.0/.github/workflows/publish.yml#L110-L114
     help2man --no-info "$out/bin/texlab" > texlab.1
     installManPage texlab.1
   '';
diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix
index 7e65525348fb..ddda76c43b6d 100644
--- a/pkgs/by-name/te/texpresso/package.nix
+++ b/pkgs/by-name/te/texpresso/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "texpresso";
-  version = "0-unstable-2025-01-29";
+  version = "0.1";
 
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "texpresso";
-    rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13";
-    hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-d+wNQIysn3hdTQnHN9MJbFOIhJQ0ml6PoeuwsryntTI=";
   };
 
   postPatch = ''
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
       #!nix-shell -i bash -p curl jq nix-update
 
       tectonic_version="$(curl -s "https://api.github.com/repos/let-def/texpresso/contents/tectonic" | jq -r '.sha')"
-      nix-update --version=branch texpresso
+      nix-update texpresso
       nix-update --version=branch=$tectonic_version texpresso.tectonic
     '';
   };
diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix
index a1718d619f44..73214d143c3f 100644
--- a/pkgs/by-name/te/texstudio/package.nix
+++ b/pkgs/by-name/te/texstudio/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "texstudio";
-  version = "4.8.9";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "texstudio-org";
     repo = "texstudio";
     rev = finalAttrs.version;
-    hash = "sha256-nI7aNZ7/IAjgjmHRO78uwkah8l+3m+w1ZQ096177eAU=";
+    hash = "sha256-LHG+QFtUYf6gqF8WGUlAYd5LWNt2YlyXmQH2nwPV5MQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix
index 92f2175245c9..18f4fb1a6bf7 100644
--- a/pkgs/by-name/te/textadept/package.nix
+++ b/pkgs/by-name/te/textadept/package.nix
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   ''
   + lib.concatStringsSep "\n" (
-    lib.mapAttrsToList (
-      name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
-    ) (import ./deps.nix)
+    lib.mapAttrsToList (name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}") (
+      import ./deps.nix
+    )
   );
 
   meta = {
diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix
index 6d023297bc15..2a1612a6fb8c 100644
--- a/pkgs/by-name/te/textcompare/package.nix
+++ b/pkgs/by-name/te/textcompare/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "textcompare";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "josephmawa";
     repo = "TextCompare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KWW83866dZRpuJzzYwk2X1/6OoD4gPnm2LD6IlP3fps=";
+    hash = "sha256-d+P5Vf1WQCNCTXUl6yK2dYp8HhwTj1Wjf8puFKHuFtw=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix
index 041f0fefee13..b1f608802112 100644
--- a/pkgs/by-name/te/textplots/package.nix
+++ b/pkgs/by-name/te/textplots/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Terminal plotting written in Rust";
     homepage = "https://github.com/loony-bean/textplots-rs";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "textplots";
   };
 }
diff --git a/pkgs/by-name/te/texture-synthesis/package.nix b/pkgs/by-name/te/texture-synthesis/package.nix
index 2346dfe4c027..55e1499fac85 100644
--- a/pkgs/by-name/te/texture-synthesis/package.nix
+++ b/pkgs/by-name/te/texture-synthesis/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "texture-synthesis";
   };
 }
diff --git a/pkgs/by-name/tf/tflint/package.nix b/pkgs/by-name/tf/tflint/package.nix
index 45dc9d696097..0c164ffb3d5b 100644
--- a/pkgs/by-name/tf/tflint/package.nix
+++ b/pkgs/by-name/tf/tflint/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
-  buildGoModule,
+  buildGo125Module,
   fetchFromGitHub,
+  versionCheckHook,
   runCommand,
   makeWrapper,
   tflint,
@@ -9,21 +10,18 @@
   symlinkJoin,
 }:
 
-let
+buildGo125Module (finalAttrs: {
   pname = "tflint";
-  version = "0.58.1";
-in
-buildGoModule {
-  inherit pname version;
+  version = "0.59.1";
 
   src = fetchFromGitHub {
     owner = "terraform-linters";
     repo = "tflint";
-    tag = "v${version}";
-    hash = "sha256-1SuNcqU8JtMypoltbNBZHZZi78jvbbAD+nmj2v8NU5g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tE8h0sAKCJEZzZqUAcgyVWVRXdG3F7F1Vh7Je0+0Xeg=";
   };
 
-  vendorHash = "sha256-8sHiCEtVs+rUnmJ9NPYJJcr4sDlFaEWklE3JaoXEu9w=";
+  vendorHash = "sha256-KVKxtH/Hgxe7We3K8ArovsRDPz6a2wEfQ8Zx3ScCo74=";
 
   doCheck = false;
 
@@ -34,6 +32,12 @@ buildGoModule {
     "-w"
   ];
 
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = "--version";
+
   passthru.withPlugins =
     plugins:
     let
@@ -43,10 +47,10 @@ buildGoModule {
         paths = [ actualPlugins ];
       };
     in
-    runCommand "tflint-with-plugins-${version}"
+    runCommand "tflint-with-plugins-${finalAttrs.version}"
       {
         nativeBuildInputs = [ makeWrapper ];
-        inherit version;
+        inherit (finalAttrs) version;
       }
       ''
         makeWrapper ${tflint}/bin/tflint $out/bin/tflint \
@@ -57,8 +61,8 @@ buildGoModule {
     description = "Terraform linter focused on possible errors, best practices, and so on";
     mainProgram = "tflint";
     homepage = "https://github.com/terraform-linters/tflint";
-    changelog = "https://github.com/terraform-linters/tflint/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/terraform-linters/tflint/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ momeemt ];
   };
-}
+})
diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index f6162a40b3db..b721c1d26e2a 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "tfswitch";
-  version = "1.7.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${version}";
-    sha256 = "sha256-Lxczo2zlBqDyHAcGPR1UM1s8tR4+F80YeNI0JJXLN30=";
+    sha256 = "sha256-0yK4/eQ2WNnNopA2dMbvMr5mv3w9vQhfQuJExQM2gvc=";
   };
 
-  vendorHash = "sha256-JnfRdircsabRP1O8dSs8/OGwTSvv4xmIXeFQsnbpb5o=";
+  vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674=";
 
   # Disable tests since it requires network access and relies on the
   # presence of release.hashicorp.com
diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index 0e1205299f84..b56882f7d653 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -7,23 +7,30 @@
   nixosTests,
   testers,
   thanos,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
   pname = "thanos";
-  version = "0.39.2";
+  version = "0.40.1";
 
   src = fetchFromGitHub {
     owner = "thanos-io";
     repo = "thanos";
     tag = "v${version}";
-    hash = "sha256-yKw+HGlqEgQmydZ+PIk5y/z5H57nZ0dtw/kEh8079Ws=";
+    hash = "sha256-g0xvtBwPoX906xHdyOEUfudio/9MZhkzdBp5FcATRsM=";
   };
 
-  vendorHash = "sha256-6qTxCAD1hbS77erG1Z52JU2iOXAU+qtY3yivX+4bjlw=";
+  vendorHash = "sha256-ukKoiA7UhqDdMvAWYL5BGf6+FSPSkcRR/Scj5o/MMKc=";
 
   subPackages = "cmd/thanos";
 
+  # Verify in sync with https://github.com/thanos-io/thanos/blob/main/.promu.yml
+  tags = [
+    "netgo"
+    "slicelabels"
+  ];
+
   ldflags =
     let
       t = "github.com/prometheus/common/version";
@@ -39,6 +46,12 @@ buildGoModule rec {
 
   doCheck = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
     tests = {
diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix
index 4a1d176549e7..1fc9a0b42d75 100644
--- a/pkgs/by-name/th/the-way/package.nix
+++ b/pkgs/by-name/th/the-way/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      figsoda
       numkem
     ];
   };
diff --git a/pkgs/by-name/th/theme-obsidian2/package.nix b/pkgs/by-name/th/theme-obsidian2/package.nix
index 25bd7ccbb554..7813f74ec001 100644
--- a/pkgs/by-name/th/theme-obsidian2/package.nix
+++ b/pkgs/by-name/th/theme-obsidian2/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "theme-obsidian2";
-  version = "2.24";
+  version = "2.25";
 
   src = fetchurl {
     url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
-    sha256 = "sha256-P+62cdYiCk8419S+u1w6EmzJL0rgHAh7G5eTuBOrAGY=";
+    sha256 = "sha256-Hajz2bFcsi+9kSjxuZ6Jav8t7S6trDUF5yJivw+Vypw=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/th/theme-sh/package.nix b/pkgs/by-name/th/theme-sh/package.nix
index 653bf7b148a6..c1a9249f0a92 100644
--- a/pkgs/by-name/th/theme-sh/package.nix
+++ b/pkgs/by-name/th/theme-sh/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/lemnos/theme.sh";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "theme.sh";
   };
 }
diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index ba60faa15860..8a6e1def88de 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "thin-provisioning-tools";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${version}";
-    hash = "sha256-JnibI3txqPXwEemLtgtfe6NAZrOX09p0w4sp9/HEXBQ=";
+    hash = "sha256-KjX+qAiHkbv3DicAfJxEFv/4CKdE0ZeB9Ktia93oiaU=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  cargoHash = "sha256-1spipVIT49G0l6yLyv3/7jsR2xyJQPjtB5vouyAjpgA=";
+  cargoHash = "sha256-IgP5JehP/mlsjYSTn5hepWVgZmPGoyZix83rgO08WfA=";
 
   passthru.tests = {
     inherit (nixosTests.lvm2) lvm-thinpool-linux-latest;
diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix
index 57347b91052d..17b964ee7286 100644
--- a/pkgs/by-name/th/thinkfan/package.nix
+++ b/pkgs/by-name/th/thinkfan/package.nix
@@ -7,6 +7,7 @@
   yaml-cpp,
   pkg-config,
   procps,
+  coreutils,
   smartSupport ? false,
   libatasmart,
 }:
@@ -31,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   + ''
     substituteInPlace rcscripts/systemd/thinkfan-sleep.service \
       --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}"
+    substituteInPlace rcscripts/systemd/thinkfan-sleep.service \
+      --replace-fail "ExecStart=sleep " "ExecStart=${lib.getExe' coreutils "sleep"} "
     substituteInPlace rcscripts/systemd/thinkfan-wakeup.service \
       --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}"
     substituteInPlace rcscripts/systemd/thinkfan.service.cmake \
diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix
index c59a6cae210f..6aae0ef9990e 100644
--- a/pkgs/by-name/th/thokr/package.nix
+++ b/pkgs/by-name/th/thokr/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Typing tui with visualized results and historical logging";
     homepage = "https://github.com/thatvegandev/thokr";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "thokr";
   };
 }
diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index b9f6e9cc6b17..82e08012f082 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -7,6 +7,7 @@
   rake,
   curl,
   fetchFromGitHub,
+  kubazip,
   libGL,
   libGLU,
   libX11,
@@ -20,7 +21,7 @@
 }:
 let
   # git rev-list HEAD --count
-  revision = "3016";
+  revision = "3042";
   year = "2025";
 in
 
@@ -28,18 +29,18 @@ stdenv.mkDerivation {
   pname = "tic-80";
   # use an untagged version until upstream tags a new version. We want
   # 'PREFER_SYSTEM_LIBRARIES', and without it tic-80 won't build
-  version = "1.1-unstable-2025-05-26";
+  version = "1.1-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "nesbox";
     repo = "TIC-80";
-    rev = "663d43924abf6fd7620de6bf25c009ce5b30ab83";
-    hash = "sha256-UjBnXxYZ5gfk58sI1qek5fkKpJ7LzOVmrxdjVgONcXc=";
+    rev = "a2c875f7275541e7724199ce8e504fb578b819a6";
     # TIC-80 vendors its dependencies as submodules. For the following dependencies,
     # there are no (or no compatible) packages in nixpkgs yet, so we use the vendored
-    # ones as a fill-in: kubazip, wasm, squirrel, pocketpy, argparse, naett,
+    # ones as a fill-in: wasm, squirrel, pocketpy, argparse, naett,
     # sdlgpu, mruby.
     fetchSubmodules = true;
+    hash = "sha256-S/v1WHrvVndW4qHFWRJc3dcQkjw5vCU1/mN0PW9Wfkc=";
   };
 
   # TIC-80 tries to determine the revision part of the version using its Git history.
@@ -90,6 +91,7 @@ stdenv.mkDerivation {
     rake
   ];
   buildInputs = [
+    kubazip
     libGL
     libGLU
     libX11
@@ -99,7 +101,7 @@ stdenv.mkDerivation {
     SDL2
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Free and open source fantasy computer for making, playing and sharing tiny games";
     longDescription = ''
       TIC-80 is a free and open source fantasy computer for making, playing and
@@ -117,9 +119,9 @@ stdenv.mkDerivation {
       channel sound and etc.
     '';
     homepage = "https://github.com/nesbox/TIC-80";
-    license = licenses.mit;
-    platforms = with platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "tic80";
-    maintainers = with maintainers; [ blinry ];
+    maintainers = with lib.maintainers; [ blinry ];
   };
 }
diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix
index 438805baf9d7..742878db7449 100644
--- a/pkgs/by-name/ti/tideways-cli/package.nix
+++ b/pkgs/by-name/ti/tideways-cli/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-cli";
-  version = "1.2.12";
+  version = "1.2.14";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-SsXVDNXaxppF9E9CGJBwdWoseV7YXbuWfsVrkB+R5To=";
+        hash = "sha256-fx8h/JmVS+s2Gzk2bUQre+MfOBCuXlVHekaskIdk1c8=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-MUUsDNN03i3+ZrKLKptex+P7SWjZ+YIUkXHkZf21Q+0=";
+        hash = "sha256-8inyaKajz3OAegXOevNfrMYFmH9shCvtCM4OEpgi6UE=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-ue0RV57rpL5KIhCEVy6/J3cwZKOEg5Kq+490ABJrxXE=";
+        hash = "sha256-tLN4B4JNKr7+V1ZgVKZEcRpfYwLNB84D3ix2vGINnXg=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-OEtEjo8/qFt/iQlUBho7G5uBdCqFrHWpoTXrCzyO/oo=";
+        hash = "sha256-fcpN/YvpmZA/EFxfqWWVTfF6RcwgePf0JZ4430bPLTU=";
       };
     };
 
diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index 4515b76beb5d..37f2ef718a4f 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.10.0";
+  version = "1.11.4";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-XxKwT7VgdEZclim14H3oZNAE25DoALcpRzx/IPEE4sc=";
+        hash = "sha256-wHiVNkoiaPF4HhE6dnBQXlGMOTqi6Mq0L7HCIFfybRk=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-0G9SwZHZSHgTAfB+GWTEoSGVhk+Xk8o/aX2zCcnoInI=";
+        hash = "sha256-5ga73KByQ2g/L23t+TOLrd3tQa4O5ehN/C26I/mbVuM=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-nD2d5XOxV2N4o5LiiF+ZomHXdWmVEYUIz5Yhs0awjEs=";
+        hash = "sha256-5fSEqaTDR0u6vnQuIv8cRuIMlfFDfw2vh9uFzAf7nTs=";
       };
     };
     updateScript = "${
diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 981f67f6ad16..c6e26ee7606a 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -4,31 +4,25 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tidy-viewer";
   version = "1.8.93";
 
   src = fetchFromGitHub {
     owner = "alexhallam";
     repo = "tv";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "sha256-wiVcdTnjEFh5kSyxmK+ab0LkEAbQaygmLdrFfM12DyM=";
   };
 
   cargoHash = "sha256-HF7M4s2OHCAyVkbCIBxGButAxbxrhjmY3YE/do8et1s=";
 
-  # this test parses command line arguments
-  # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
-  checkFlags = [
-    "--skip=build_reader_can_create_reader_without_file_specified"
-  ];
-
   meta = {
+    changelog = "https://github.com/alexhallam/tv/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment";
-    mainProgram = "tidy-viewer";
     homepage = "https://github.com/alexhallam/tv";
-    changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ figsoda ];
+    mainProgram = "tidy-viewer";
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
-}
+})
diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index d0b465fa8b17..ec13d6d2b992 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-m/T1Ns8mmifODTLoQ426Co/07rg/kpq/XewNKozDStE=";
-    "x86_64-linux" = "sha256-ClQLzae+8xd9Jb9fGRJ3u/SAYSlk/bxgSITDxSIbS7U=";
-    "aarch64-linux" = "sha256-G2l2636rhXbhegdehSJj6VQpOYHe1Lp8jsBaG53kzUk=";
+    "universal-macos" = "sha256-4lpJxXRwngBUdImBrIeuLVU6GJr6n6g/71bueuZTFj8=";
+    "x86_64-linux" = "sha256-5rJHyFRrU5N5wYIohISBRuwH7WfrSDUyHHmCppSvcfM=";
+    "aarch64-linux" = "sha256-CSB6PGr/EGV/ZdxfWMwY/R9/pObQRSASYE3Cp4cm1/E=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.61";
+  version = "0.16.62";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";
diff --git a/pkgs/by-name/ti/time/package.nix b/pkgs/by-name/ti/time/package.nix
index af26954c2c57..cd49f0f89850 100644
--- a/pkgs/by-name/ti/time/package.nix
+++ b/pkgs/by-name/ti/time/package.nix
@@ -17,11 +17,9 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # fixes cross-compilation to riscv64-linux
     ./time-1.9-implicit-func-decl-clang.patch
+    # https://lists.gnu.org/archive/html/bug-time/2025-10/msg00000.html
     # fix compilation with gcc15
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/time/raw/191440912c2e9a63af87802e507ca3ccb923e805/f/time-1.9-Fix-compiling-with-GCC15.patch";
-      hash = "sha256-4Qp3mV8XuCmz518GPtrW52gyaPOb+97RE6FDPKNCyJw=";
-    })
+    ./time-1.9-fix-sighandler-prototype-for-c23.patch
   ];
 
   meta = {
diff --git a/pkgs/by-name/ti/time/time-1.9-fix-sighandler-prototype-for-c23.patch b/pkgs/by-name/ti/time/time-1.9-fix-sighandler-prototype-for-c23.patch
new file mode 100644
index 000000000000..d092fa39ef2f
--- /dev/null
+++ b/pkgs/by-name/ti/time/time-1.9-fix-sighandler-prototype-for-c23.patch
@@ -0,0 +1,30 @@
+In C23 functions with empty argument list in the prototype are treated
+as taking no arguments. This means that the `int` argument of the
+sighandler must be specified explicitly or the code will fail to
+compile due to mismatched function type.
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+This fixes the same issue as
+<https://lists.gnu.org/archive/html/bug-time/2025-01/msg00000.html> and
+<https://lists.gnu.org/archive/html/bug-time/2025-03/msg00000.html> but does not
+rely on `sighandler_t` which is a GNU extension.
+
+ src/time.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/time.c b/src/time.c
+index 7b401bc..88287dd 100644
+--- a/src/time.c
++++ b/src/time.c
+@@ -77,7 +77,7 @@ enum
+
+
+ /* A Pointer to a signal handler.  */
+-typedef RETSIGTYPE (*sighandler) ();
++typedef RETSIGTYPE (*sighandler) (int);
+
+ /* msec = milliseconds = 1/1,000 (1*10e-3) second.
+    usec = microseconds = 1/1,000,000 (1*10e-6) second.  */
+--
+2.51.0
diff --git a/pkgs/by-name/ti/timelimit/package.nix b/pkgs/by-name/ti/timelimit/package.nix
index 75c708445708..d4af294c7e8f 100644
--- a/pkgs/by-name/ti/timelimit/package.nix
+++ b/pkgs/by-name/ti/timelimit/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = "https://devel.ringlet.net/sysutils/timelimit/";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "timelimit";
   };
 }
diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix
index d62a9f615d33..e13aeefcd4dc 100644
--- a/pkgs/by-name/ti/tinfoil-cli/package.nix
+++ b/pkgs/by-name/ti/tinfoil-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tinfoil-cli";
-  version = "0.1.4";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "tinfoilsh";
     repo = "tinfoil-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-prLp9IpBINFNfam23ErvcwlOrLZ4pFoZn8C7/w3kdZs=";
+    hash = "sha256-ei3noC/RXUCfwLHjiYZ/+M1vjn/9g1JhTI2A4O4DJZM=";
   };
 
-  vendorHash = "sha256-wZlpxAwWgFpuLhbG6EBhBbFMgyZ7yZxCaiBYz4utCto=";
+  vendorHash = "sha256-S+aiL1nY57gOXgaNwFXUk9xfUpFOok8XHYKBtQKHmOc=";
 
   # The attestation test requires internet access
   checkFlags = [ "-skip=TestAttestationVerifySEV" ];
diff --git a/pkgs/by-name/ti/tiny/package.nix b/pkgs/by-name/ti/tiny/package.nix
index cba3ba635607..7afa3629b866 100644
--- a/pkgs/by-name/ti/tiny/package.nix
+++ b/pkgs/by-name/ti/tiny/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      vyp
     ];
     mainProgram = "tiny";
   };
diff --git a/pkgs/by-name/ti/tinyalsa/package.nix b/pkgs/by-name/ti/tinyalsa/package.nix
index c1d2c67a0b3c..2f911bc7014e 100644
--- a/pkgs/by-name/ti/tinyalsa/package.nix
+++ b/pkgs/by-name/ti/tinyalsa/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
     "-Wno-error=sign-compare"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/tinyalsa/tinyalsa";
     description = "Tiny library to interface with ALSA in the Linux kernel";
diff --git a/pkgs/by-name/ti/tinycmmc/package.nix b/pkgs/by-name/ti/tinycmmc/package.nix
new file mode 100644
index 000000000000..796639ee45b3
--- /dev/null
+++ b/pkgs/by-name/ti/tinycmmc/package.nix
@@ -0,0 +1,27 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation {
+  pname = "tinycmmc";
+  version = "0.1.0-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "tinycmmc";
+    rev = "caf1af301e388e97dca31ee7fdc12f17cff34f82";
+    sha256 = "sha256-62ykvAIfOCXH+3bF1IkR+WukeJBLcYC/4Mv3ptqAxEM=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Tiny CMake Module Collections";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.zlib;
+  };
+}
diff --git a/pkgs/by-name/ti/tinyemu/package.nix b/pkgs/by-name/ti/tinyemu/package.nix
index 2a769cb68f22..bfef099f21ea 100644
--- a/pkgs/by-name/ti/tinyemu/package.nix
+++ b/pkgs/by-name/ti/tinyemu/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU=";
   };
 
+  postPatch = ''
+    substituteInPlace fs_wget.c \
+      --replace-fail '#include <curl/multi.h>' '#include <curl/curl.h>'
+  '';
+
   nativeBuildInputs = [ SDL ];
 
   buildInputs = [
diff --git a/pkgs/by-name/ti/tinygettext/package.nix b/pkgs/by-name/ti/tinygettext/package.nix
new file mode 100644
index 000000000000..7ea1ea0fc1b9
--- /dev/null
+++ b/pkgs/by-name/ti/tinygettext/package.nix
@@ -0,0 +1,31 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  tinycmmc,
+  libiconv,
+}:
+
+stdenv.mkDerivation {
+  pname = "tinygettext";
+  version = "0.1.0-unstable-2025-05-07";
+
+  src = fetchFromGitHub {
+    owner = "tinygettext";
+    repo = "tinygettext";
+    rev = "ef4164639004d7de5bf8ab28ed0e85ea521b7c5e";
+    sha256 = "sha256-if+uiVzDA3J+0HM6bVcXvm4lk82TmQmFHG4MtaxIFCk=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ tinycmmc ];
+  propagatedBuildInputs = [ libiconv ];
+
+  meta = {
+    description = "A simple gettext replacement that works directly on .po files";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.zlib;
+  };
+}
diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix
new file mode 100644
index 000000000000..6ea3a0ba875e
--- /dev/null
+++ b/pkgs/by-name/ti/tinygltf/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+
+  stdenv,
+  fetchFromGitHub,
+  nix-update-script,
+
+  # nativeBuildInputs
+  cmake,
+
+  # propagatedBuildInputs
+  nlohmann_json,
+  stb,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tinygltf";
+  version = "2.9.7";
+
+  src = fetchFromGitHub {
+    owner = "syoyo";
+    repo = "tinygltf";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-tG9hrR2rsfgS8zCBNdcplig2vyiIcNspSVKop03Zx9A=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    nlohmann_json
+    stb
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "TINYGLTF_INSTALL_VENDOR" false)
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Header only C++11 tiny glTF 2.0 library";
+    homepage = "https://github.com/syoyo/tinygltf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nim65s ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index fecd0217f94b..3538af9a24db 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.13.28";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z2FAlFjFHCzFhlLILcXseynoSdMhRQ30fWC7rW946N4=";
+    hash = "sha256-0b9gB7vHvw1wjoTxWcQOcshpuIKfcaQJeI8GCo+rvF4=";
   };
 
-  cargoHash = "sha256-7p+TNZO+uFqXhhMzmHj0r1X2WgDdg8aonMc0jgsrEnk=";
+  cargoHash = "sha256-ctyb/llOYBiyBwKylacpXrEp3hXix64zwHxv/E54rrM=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ti/tinysparql/package.nix b/pkgs/by-name/ti/tinysparql/package.nix
index 627fca114f06..fbe6f91e9348 100644
--- a/pkgs/by-name/ti/tinysparql/package.nix
+++ b/pkgs/by-name/ti/tinysparql/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchurl,
-  fetchpatch2,
   gettext,
   meson,
   mesonEmulatorHook,
@@ -35,7 +34,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tinysparql";
-  version = "3.9.2";
+  version = "3.10.1";
 
   outputs = [
     "out"
@@ -47,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "mirror://gnome/sources/tinysparql/${lib.versions.majorMinor version}/tinysparql-${version}.tar.xz";
-    hash = "sha256-FM4DkCQTXhgQIrzOSxqtLgA3fdnH2BK5g5HM/HVtrY4=";
+    hash = "sha256-Wn8+eJ22ZxpVDtYoDtT2CmC+p3No2pK+aNx9jX4jAmU=";
   };
 
   strictDeps = true;
@@ -112,14 +111,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  patches = [
-    (fetchpatch2 {
-      name = "make-dbus-dep-optional.patch";
-      url = "https://gitlab.gnome.org/GNOME/tinysparql/-/commit/31b5a793cd40cdce032e0f7d7c3ef7841c6e3691.patch?full_index=1";
-      hash = "sha256-YoWJEa2bFIjZdPW9pJ3iHTxi0dvveYDjKaDokcIvnj8=";
-    })
-  ];
-
   postPatch = ''
     patchShebangs \
       utils/data-generators/cc/generate
diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index 07f3d5cc9e5d..c6703b03e00b 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
     "-DTCAM_INTERNAL_ARAVIS=OFF"
     "-DTCAM_ARAVIS_USB_VISION=${if withAravis && withAravisUsbVision then "ON" else "OFF"}"
     "-DTCAM_INSTALL_FORCE_PREFIX=ON"
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
   ];
 
   env.CXXFLAGS = "-include cstdint";
diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
index 15e9e1857a14..35fe2d8ab99d 100644
--- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix
+++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchzip,
+  fetchurl,
   makeShellWrapper,
   makeDesktopItem,
   stdenv,
@@ -9,63 +9,59 @@
   glib,
   zlib,
   wrapGAppsHook3,
+  copyDesktopItems,
+  bintools,
+  unzip,
 }:
 
-let
-  desktopItem = makeDesktopItem rec {
-    name = "TLA+Toolbox";
-    exec = "tla-toolbox";
-    icon = "tla-toolbox";
-    comment = "IDE for TLA+";
-    desktopName = name;
-    genericName = comment;
-    categories = [ "Development" ];
-    startupWMClass = "TLA+ Toolbox";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tlaplus-toolbox";
+  version = "1.7.4";
+
+  src = fetchurl {
+    url = "https://tla.msr-inria.inria.fr/tlatoolbox/branches/${finalAttrs.version}/products/TLAToolbox-${finalAttrs.version}-linux.gtk.x86_64.zip";
+    hash = "sha256-eYK2cXJvLIQfkK+onromwhNfAmzWSyCZXCsEORxkjaU=";
   };
 
-in
-stdenv.mkDerivation rec {
-  pname = "tla-toolbox";
-  version = "1.7.1";
-  src = fetchzip {
-    url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.x86_64.zip";
-    sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80";
-  };
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeShellWrapper
+    wrapGAppsHook3
+    unzip
+  ];
 
   buildInputs = [ gtk3 ];
 
-  nativeBuildInputs = [
-    makeShellWrapper
-    wrapGAppsHook3
-  ];
-
   dontWrapGApps = true;
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "TLA+Toolbox";
+      exec = "tla-toolbox";
+      icon = "tla-toolbox";
+      comment = "IDE for TLA+";
+      desktopName = "TLA+Toolbox";
+      genericName = "IDE for TLA+";
+      categories = [ "Development" ];
+      startupWMClass = "TLA+ Toolbox";
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin"
-    cp -r "$src" "$out/toolbox"
-    chmod -R +w "$out/toolbox"
+    mkdir -p "$out/bin" "$out/libexec"
+    cp -r . "$out/libexec/toolbox"
 
-    fixupPhase
-    gappsWrapperArgsHook
+    patchelf --set-interpreter ${bintools.dynamicLinker} "$out/libexec/toolbox/toolbox"
+    patchelf --set-interpreter ${bintools.dynamicLinker} \
+      --add-rpath "${lib.makeLibraryPath [ zlib ]}" \
+      "$(find "$out/libexec/toolbox" -name java)"
+    patchelf --set-interpreter ${bintools.dynamicLinker} \
+      "$(find "$out/libexec/toolbox" -name jspawnhelper)"
 
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$out/toolbox/toolbox"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "${lib.makeLibraryPath [ zlib ]}:$(patchelf --print-rpath $(find "$out/toolbox" -name java))" \
-      "$(find "$out/toolbox" -name java)"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$(find "$out/toolbox" -name jspawnhelper)"
-
-    makeShellWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
-      --chdir "$out/toolbox" \
+    makeShellWrapper $out/libexec/toolbox/toolbox $out/bin/tla-toolbox \
+      --chdir "$out/libexec/toolbox" \
       --add-flags "-data ~/.tla-toolbox" \
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
@@ -78,18 +74,12 @@ stdenv.mkDerivation rec {
       "''${gappsWrapperArgs[@]}"
 
     echo -e "\nCreating TLA Toolbox icons..."
-    pushd "$src"
     for icon_in in $(find . -path "./plugins/*/icons/full/etool16/tla_launch_check_wiz_*.png")
     do
       icon_size=$(echo $icon_in | grep -Po "wiz_\K[0-9]+")
       icon_out="$out/share/icons/hicolor/$icon_size""x$icon_size/apps/tla-toolbox.png"
-      mkdir -p "$(dirname $icon_out)"
-      cp "$icon_in" "$icon_out"
+      install -D --mode=0644 "$icon_in" "$icon_out"
     done
-    popd
-
-    echo -e "\nCreating TLA Toolbox desktop entry..."
-    cp -r "${desktopItem}/share/applications"* "$out/share/applications"
 
     runHook postInstall
   '';
@@ -109,4 +99,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/by-name/tl/tlrender/minizip-ng-4.patch b/pkgs/by-name/tl/tlrender/minizip-ng-4.patch
new file mode 100644
index 000000000000..2df1ed4d460f
--- /dev/null
+++ b/pkgs/by-name/tl/tlrender/minizip-ng-4.patch
@@ -0,0 +1,95 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95a03bbd..9ce32264 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,7 +123,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ find_package(Imath REQUIRED)
+ find_package(nlohmann_json REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(minizip REQUIRED)
++find_package(minizip-ng REQUIRED)
+ find_package(OpenTimelineIO REQUIRED)
+ 
+ # OpenColorIO dependencies
+diff --git a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
+index 513e7351..2db48491 100644
+--- a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
++++ b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ find_package(ZLIB REQUIRED)
+-find_package(minizip REQUIRED)
++find_package(minizip-ng REQUIRED)
+ find_package(OpenColorIO REQUIRED)
+ 
+ set(source main.cpp)
+ 
+ add_executable(OpenColorIOTest ${header} ${source})
+-target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip ZLIB::ZLIB)
++target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip-ng ZLIB::ZLIB)
+ 
+ add_test(OpenColorIOTest OpenColorIOTest)
+diff --git a/lib/tlCore/CMakeLists.txt b/lib/tlCore/CMakeLists.txt
+index d02fa96a..877c8462 100644
+--- a/lib/tlCore/CMakeLists.txt
++++ b/lib/tlCore/CMakeLists.txt
+@@ -40,7 +40,7 @@ else()
+ endif()
+ 
+ set(LIBRARIES tlResource feather-tk::feather-tk-core OTIO::opentimelineio Imath::Imath nlohmann_json::nlohmann_json)
+-set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip ZLIB::ZLIB)
++set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip-ng ZLIB::ZLIB)
+ if(TLRENDER_OCIO)
+     list(APPEND LIBRARIES OpenColorIO::OpenColorIO)
+ endif()
+diff --git a/lib/tlTimeline/CMakeLists.txt b/lib/tlTimeline/CMakeLists.txt
+index ad384749..82a6aacb 100644
+--- a/lib/tlTimeline/CMakeLists.txt
++++ b/lib/tlTimeline/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SOURCE
+     Video.cpp)
+ 
+ add_library(tlTimeline ${HEADERS} ${PRIVATE_HEADERS} ${SOURCE})
+-target_link_libraries(tlTimeline tlIO)
++target_link_libraries(tlTimeline tlIO MINIZIP::minizip-ng)
+ set_target_properties(tlTimeline PROPERTIES FOLDER lib)
+ set_target_properties(tlTimeline PROPERTIES PUBLIC_HEADER "${HEADERS}")
+ 
+diff --git a/lib/tlTimeline/TimelineCreate.cpp b/lib/tlTimeline/TimelineCreate.cpp
+index 9596ab21..c8884435 100644
+--- a/lib/tlTimeline/TimelineCreate.cpp
++++ b/lib/tlTimeline/TimelineCreate.cpp
+@@ -99,7 +99,7 @@ namespace tl
+         public:
+             ZipReader(const std::string& fileName)
+             {
+-                mz_zip_reader_create(&reader);
++                reader = mz_zip_reader_create();
+                 if (!reader)
+                 {
+                     throw std::runtime_error(feather_tk::Format(
+diff --git a/lib/tlTimeline/Util.cpp b/lib/tlTimeline/Util.cpp
+index 611f02ad..338df840 100644
+--- a/lib/tlTimeline/Util.cpp
++++ b/lib/tlTimeline/Util.cpp
+@@ -662,7 +662,7 @@ namespace tl
+                 }
+ 
+                 // Open the output file.
+-                mz_zip_writer_create(&_writer);
++                _writer = mz_zip_writer_create();
+                 if (!_writer)
+                 {
+                     throw std::runtime_error(feather_tk::Format("Cannot create writer: \"{0}\"").arg(fileName));
+diff --git a/tlRenderConfig.cmake.in b/tlRenderConfig.cmake.in
+index 11312d32..e6ec1184 100644
+--- a/tlRenderConfig.cmake.in
++++ b/tlRenderConfig.cmake.in
+@@ -9,7 +9,7 @@ include(CMakeFindDependencyMacro)
+ find_package(Imath REQUIRED)
+ find_package(nlohmann_json REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(minizip REQUIRED)
++find_package(minizip-ng REQUIRED)
+ find_package(OpenTimelineIO REQUIRED)
+ 
+ # OpenColorIO dependencies
diff --git a/pkgs/by-name/tl/tlrender/package.nix b/pkgs/by-name/tl/tlrender/package.nix
new file mode 100644
index 000000000000..81893619f5af
--- /dev/null
+++ b/pkgs/by-name/tl/tlrender/package.nix
@@ -0,0 +1,155 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  pkg-config,
+
+  bzip2,
+  feather-tk,
+  ffmpeg,
+  freetype,
+  glfw,
+  imath,
+  libGL,
+  libjpeg,
+  libtiff,
+  libpng,
+  lunasvg,
+  minizip-ng,
+  nasm,
+  nativefiledialog-extended,
+  nlohmann_json,
+  opencolorio,
+  openexr,
+  openssl,
+  opentimelineio,
+  openusd,
+  plutovg,
+  SDL2,
+  sdl3,
+  xz,
+  zlib,
+  zstd,
+
+  # optional dependencies
+  enableNet ? false,
+  enableOcio ? true,
+  enableSdl2 ? true,
+  enableSdl3 ? false,
+  enableJpeg ? true,
+  enableTiff ? true,
+  enableStb ? true,
+  enablePng ? true,
+  enableOpenexr ? true,
+  enableFfmpeg ? true,
+  enableUsd ? false,
+
+  # build options
+  enableShared ? !stdenv.hostPlatform.isStatic,
+  enableProgram ? true,
+  enableExamples ? false,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tlrender";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "darbyjohnston";
+    repo = "tlRender";
+    tag = finalAttrs.version;
+    hash = "sha256-TxiDZtMvNmrV1FKXZnekCZHnr/eCWZlsP6VJRnaoWg4=";
+  };
+
+  patches = [
+    # Minizip-ng 4 support: https://github.com/darbyjohnston/tlRender/pull/145
+    ./minizip-ng-4.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "include(Package)" ""
+
+    substituteInPlace lib/tlCore/CMakeLists.txt \
+      --replace-fail "SDL2::SDL2-static" "SDL2::SDL2" \
+      --replace-fail "SDL3::SDL3-static" "SDL3::SDL3" \
+
+    substituteInPlace lib/tlIO/CMakeLists.txt \
+      --replace-fail \
+        "list(APPEND LIBRARIES_PRIVATE libjpeg-turbo::turbojpeg-static)" \
+        "list(APPEND LIBRARIES_PRIVATE libjpeg-turbo::jpeg libjpeg-turbo::turbojpeg)"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    bzip2 # required by minizip-ng
+    feather-tk
+    freetype # required by feather-tk
+    glfw
+    libGL
+    lunasvg # required by feather-tk
+    imath
+    minizip-ng
+    nativefiledialog-extended
+    nlohmann_json
+    openssl # required by minizip-ng
+    opentimelineio
+    plutovg # required by feather-tk -> lunasvg
+    xz # libLZMA, required by minizip-ng
+    zlib # required by minizip-ng
+    zstd # required by minizip-ng
+  ]
+  ++ lib.optionals enableNet [ nasm ]
+  ++ lib.optionals enableOcio [ opencolorio ]
+  ++ lib.optionals enableSdl2 [ SDL2 ]
+  ++ lib.optionals enableSdl3 [ sdl3 ]
+  ++ lib.optionals enableJpeg [ libjpeg ]
+  ++ lib.optionals enableTiff [ libtiff ]
+  ++ lib.optionals enablePng [ libpng ]
+  ++ lib.optionals enableOpenexr [ openexr ]
+  ++ lib.optionals enableFfmpeg [ ffmpeg ]
+  ++ lib.optionals enableUsd [ openusd ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "TLRENDER_NET" enableNet)
+    (lib.cmakeBool "TLRENDER_OCIO" enableOcio)
+    (lib.cmakeBool "TLRENDER_SDL2" enableSdl2)
+    (lib.cmakeBool "TLRENDER_SDL3" enableSdl3)
+    (lib.cmakeBool "TLRENDER_JPEG" enableJpeg)
+    (lib.cmakeBool "TLRENDER_TIFF" enableTiff)
+    (lib.cmakeBool "TLRENDER_STB" enableStb)
+    (lib.cmakeBool "TLRENDER_PNG" enablePng)
+    (lib.cmakeBool "TLRENDER_EXR" enableOpenexr)
+    (lib.cmakeBool "TLRENDER_FFMPEG" enableFfmpeg)
+    (lib.cmakeBool "TLRENDER_USD" enableUsd)
+
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "TLRENDER_PROGRAMS" enableProgram)
+    (lib.cmakeBool "TLRENDER_EXAMPLES" enableExamples)
+    (lib.cmakeBool "TLRENDER_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+
+  # GLFW requires a working X11 session.
+  doCheck = false;
+
+  meta = {
+    description = "Open source library for building playback and review applications";
+    longDescription = ''
+      An open source library for building playback and review applications for
+      visual effects, film, and animation.
+
+      The library can render and playback timelines with multiple video clips,
+      image sequences, audio clips, and transitions. Examples are provided for
+      integrating the library with Qt and OpenGL applications.
+    '';
+    homepage = "https://github.com/darbyjohnston/tlRender";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ yzx9 ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+})
diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index 598f0c462528..71404f0f9926 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/liamg/tml";
     changelog = "https://github.com/liamg/tml/releases/tag/v${version}";
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 830bb3aad435..385f1f74f736 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -8,8 +8,8 @@
   ncurses,
   pkg-config,
   runCommand,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-  systemd,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
+  systemdLibs,
   # broken on i686-linux https://github.com/tmux/tmux/issues/4597
   withUtf8proc ? !(stdenv.hostPlatform.is32bit),
   utf8proc, # gets Unicode updates faster than glibc
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     libevent
   ]
-  ++ lib.optionals withSystemd [ systemd ]
+  ++ lib.optionals withSystemd [ systemdLibs ]
   ++ lib.optionals withUtf8proc [ utf8proc ]
   ++ lib.optionals withUtempter [ libutempter ];
 
@@ -118,7 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     mainProgram = "tmux";
     maintainers = with lib.maintainers; [
-      thammers
       fpletz
     ];
   };
diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix
index d3935cebdb86..9cce54583c2d 100644
--- a/pkgs/by-name/tm/tmuxai/package.nix
+++ b/pkgs/by-name/tm/tmuxai/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tmuxai";
-  version = "1.1.2";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "alvinunreal";
     repo = "tmuxai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PbIPMKkUYgrIMoBB7AGB89e7MssnL4dxLDW4ATvY05M=";
+    hash = "sha256-t9VGJnIXgRxUF1vtPtR4orbr/elc+xwjdLmvWqEn9cE=";
   };
 
-  vendorHash = "sha256-6X79tFZCiuVq3ZgHC/EhwF9Nlge/8UoubRG1O9DGwxc=";
+  vendorHash = "sha256-exp9qJwiis2sagw1D3toyQoYFwn+AigG+CspABMXh98=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/to/tocaia/package.nix b/pkgs/by-name/to/tocaia/package.nix
new file mode 100644
index 000000000000..1ba0b6493120
--- /dev/null
+++ b/pkgs/by-name/to/tocaia/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  gitUpdater,
+  versionCheckHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tocaia";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "manipuladordedados";
+    repo = "tocaia";
+    tag = finalAttrs.version;
+    hash = "sha256-Np+Awn5KGoAbeoUEkcAeVwnNCqI2Iy+19Zj1RkNfgXU=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
+    description = "Portable TUI Gopher client written in C89 for POSIX systems";
+    homepage = "https://github.com/manipuladordedados/tocaia";
+    changelog = "https://github.com/manipuladordedados/tocaia/releases/tag/${finalAttrs.version}";
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ manipuladordedados ];
+    mainProgram = "tocaia";
+  };
+})
diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix
index e77fec6f4e25..edf79a484893 100644
--- a/pkgs/by-name/to/todds/package.nix
+++ b/pkgs/by-name/to/todds/package.nix
@@ -1,16 +1,30 @@
 {
   lib,
+  config,
   stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
   cmake,
+  ispc,
   ninja,
   pkg-config,
-  ispc,
+  cudaPackages,
+
+  # buildInputs
   boost,
   fmt,
   hyperscan,
-  opencv,
   onetbb,
-  fetchFromGitHub,
+  opencv,
+
+  # tests
+  versionCheckHook,
+
+  # passthru
+  nix-update-script,
+
+  cudaSupport ? config.cudaSupport,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "todds";
@@ -22,30 +36,44 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "todds-encoder";
     repo = "todds";
     tag = finalAttrs.version;
-    hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c=";
     fetchSubmodules = true;
+    hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c=";
   };
 
   nativeBuildInputs = [
     cmake
+    ispc
     ninja
     pkg-config
-    ispc
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.getBin cudaPackages.cuda_nvcc)
   ];
 
   buildInputs = [
     boost
     fmt
     hyperscan
-    opencv
     onetbb
+    opencv
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
   ];
 
   strictDeps = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "CPU-based DDS encoder optimized for fast batch conversions with high encoding quality";
     homepage = "https://github.com/todds-encoder/todds";
+    changelog = "https://github.com/todds-encoder/todds/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ weirdrock ];
     mainProgram = "todds";
diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index 49c38c8b9210..6460fdd606a8 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -32,18 +32,20 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python3.pkgs; [
-    atomicwrites
     click
     click-log
-    click-repl
     humanize
     icalendar
     parsedatetime
+    python-dateutil
     pyxdg
-    tabulate
     urwid
   ];
 
+  optional-dependencies = with python3.pkgs; {
+    repl = [ click-repl ];
+  };
+
   nativeCheckInputs = with python3.pkgs; [
     freezegun
     hypothesis
diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix
index eddaf47fa17a..0a2ffe98f742 100644
--- a/pkgs/by-name/to/tokio-console/package.nix
+++ b/pkgs/by-name/to/tokio-console/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tokio-console";
-  version = "0.1.13";
+  version = "0.1.14";
 
   src = fetchFromGitHub {
     owner = "tokio-rs";
     repo = "console";
     rev = "tokio-console-v${version}";
-    hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA=";
+    hash = "sha256-mZCYdz0AQhCBqbvcjXNp2bXSKf7tJ/01fz2W4wpjVX8=";
   };
 
-  cargoHash = "sha256-9jnBgrfB0nWOq2+hfDq3/2Wo4z7WSfBKxoGrQ888lKw=";
+  cargoHash = "sha256-aF9bylDYeTZOldAK9rl+19xTv0y9AdxCjRfaVRNfR3E=";
 
   buildAndTestSubdir = "tokio-console";
 
diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index d7570353e5cb..08031e8f6c9a 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-10-14";
+    version = "0-unstable-2025-10-23";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "9d67b24f1d326816a645ba47933f9986a1ff8a23";
-      hash = "sha256-KsVa5tAi8mPmfSxtO34swNErRgAprBV6xr1+2rkCXCI=";
+      rev = "6c340e058e84c1975a038a8e5d1e384477225dc0";
+      hash = "sha256-7H2n9wTaW8Db1RejWK071ITV1j5KIuzfql0Tx9WT6zM=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];
diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix
new file mode 100644
index 000000000000..e2f842e5ebc3
--- /dev/null
+++ b/pkgs/by-name/to/tomat/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  alsa-lib,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tomat";
+  version = "2.4.0";
+
+  src = fetchFromGitHub {
+    owner = "jolars";
+    repo = "tomat";
+    tag = "v${version}";
+    hash = "sha256-xIIkyPcW/gIOS28efGR8ausBdnIj0/OkWLEM0MMTJLI=";
+  };
+
+  cargoHash = "sha256-Ij91tU31fPUapxwCjpP0ASw96OGs/D/RzmDA1pKmrgQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+  ];
+
+  checkFlags = [
+    # Skip tests that require access to file system locations not available during Nix builds
+    "--skip=timer::tests::test_icon_path_creation"
+    "--skip=timer::tests::test_notification_icon_config"
+    "--skip=integration::"
+  ];
+
+  meta = {
+    description = "Pomodoro timer for status bars";
+    homepage = "https://github.com/jolars/tomat";
+    changelog = "https://github.com/jolars/tomat/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jolars ];
+    mainProgram = "tomat";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index b63ac9146d4f..5de6b076c880 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.6.25";
+  version = "0.6.40";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J7H7m6Z6CpzvZuX2PF2DAvw4UT6GIs1qGWZ5xJmQUO8=";
+    hash = "sha256-gsy+Ua/e0oUwu5OCHC27aj4EHVOl3eEIi3HWiysMadM=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-BN9jduAGLPkfnphCqjXZ7Tgcwnh2bA/zghkmR2kwDe4=";
+  cargoHash = "sha256-5X8YmfKh+X1ConSW0fvjwAMXiv/QLDZ8oX+6BPMgQQI=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \
diff --git a/pkgs/by-name/to/tome4/0001-web-missing-include.patch b/pkgs/by-name/to/tome4/0001-web-missing-include.patch
new file mode 100644
index 000000000000..e23aa77c1ca2
--- /dev/null
+++ b/pkgs/by-name/to/tome4/0001-web-missing-include.patch
@@ -0,0 +1,24 @@
+From e0c17a8665250b3e3e7f4938f7b256ff50b78fc8 Mon Sep 17 00:00:00 2001
+From: Tom van Dijk <18gatenmaker6@gmail.com>
+Date: Thu, 23 Oct 2025 15:01:01 +0200
+Subject: [PATCH 1/3] web missing include
+
+---
+ src/web.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/web.c b/src/web.c
+index f12eebb..940aaf9 100644
+--- a/src/web.c
++++ b/src/web.c
+@@ -32,6 +32,7 @@
+ #include "te4web.h"
+ #include "web-external.h"
+ #include "lua_externs.h"
++#include <unistd.h>
+ 
+ /*
+  * Grab web browser methods -- availabe only here
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch b/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch
new file mode 100644
index 000000000000..d6fb92441f2b
--- /dev/null
+++ b/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch
@@ -0,0 +1,24 @@
+From a14890a8a7080c73cac10ff31365833b179c0464 Mon Sep 17 00:00:00 2001
+From: Tom van Dijk <18gatenmaker6@gmail.com>
+Date: Thu, 23 Oct 2025 15:45:03 +0200
+Subject: [PATCH 2/3] zlib missing include
+
+---
+ src/zlib/gzguts.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/zlib/gzguts.h b/src/zlib/gzguts.h
+index 990a4d2..7c89751 100644
+--- a/src/zlib/gzguts.h
++++ b/src/zlib/gzguts.h
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include "zlib.h"
+ #ifdef STDC
++#  include <unistd.h>
+ #  include <string.h>
+ #  include <stdlib.h>
+ #  include <limits.h>
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch b/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..f2e1b36b34de
--- /dev/null
+++ b/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch
@@ -0,0 +1,71 @@
+From ed9f9819c3a0d6b8e92f66aafa6324eb4b310282 Mon Sep 17 00:00:00 2001
+From: Tom van Dijk <18gatenmaker6@gmail.com>
+Date: Thu, 23 Oct 2025 15:53:06 +0200
+Subject: [PATCH 3/3] incompatible pointer types
+
+---
+ src/display_sdl.c                  | 2 +-
+ src/physfs/archivers/bind_physfs.c | 2 +-
+ src/physfs/physfs.c                | 3 ++-
+ src/tgl.h                          | 2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/display_sdl.c b/src/display_sdl.c
+index 61b2f0e..c533c8b 100644
+--- a/src/display_sdl.c
++++ b/src/display_sdl.c
+@@ -78,5 +78,5 @@ GLuint gl_c_shader = 0;
+ int nb_draws = 0;
+ int gl_c_vertices_nb = 0, gl_c_texcoords_nb = 0, gl_c_colors_nb = 0;
+ GLfloat *gl_c_vertices_ptr = NULL;
+-GLfloat *gl_c_texcoords_ptr = NULL;
++void *gl_c_texcoords_ptr = NULL;
+ GLfloat *gl_c_colors_ptr = NULL;
+diff --git a/src/physfs/archivers/bind_physfs.c b/src/physfs/archivers/bind_physfs.c
+index d02d323..c0d77c1 100644
+--- a/src/physfs/archivers/bind_physfs.c
++++ b/src/physfs/archivers/bind_physfs.c
+@@ -222,7 +222,7 @@ static fvoid *doOpen(dvoid *opaque, const char *name,
+ 
+ static fvoid *BIND_PHYSFS_openRead(dvoid *opaque, const char *fnm, int *exist)
+ {
+-	return(doOpen(opaque, fnm, PHYSFS_openRead, exist));
++	return(doOpen(opaque, fnm, (void * (*)(const char *)) PHYSFS_openRead, exist));
+ } /* BIND_PHYSFS_openRead */
+ 
+ 
+diff --git a/src/physfs/physfs.c b/src/physfs/physfs.c
+index 03eb86d..32e2c91 100644
+--- a/src/physfs/physfs.c
++++ b/src/physfs/physfs.c
+@@ -68,12 +68,13 @@ extern const PHYSFS_Archiver       __PHYSFS_Archiver_MVL;
+ extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_WAD;
+ extern const PHYSFS_Archiver       __PHYSFS_Archiver_WAD;
+ extern const PHYSFS_Archiver       __PHYSFS_Archiver_DIR;
++extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_BIND_PHYSFS;
+ extern const PHYSFS_Archiver       __PHYSFS_Archiver_BIND_PHYSFS;
+ 
+ 
+ static const PHYSFS_ArchiveInfo *supported_types[] =
+ {
+-    &__PHYSFS_Archiver_BIND_PHYSFS,
++    &__PHYSFS_ArchiveInfo_BIND_PHYSFS,
+ #if (defined PHYSFS_SUPPORTS_ZIP)
+     &__PHYSFS_ArchiveInfo_SUBZIP,
+     &__PHYSFS_ArchiveInfo_ZIP,
+diff --git a/src/tgl.h b/src/tgl.h
+index e2ec026..f905033 100644
+--- a/src/tgl.h
++++ b/src/tgl.h
+@@ -71,7 +71,7 @@ extern int nb_draws;
+ 
+ extern int gl_c_vertices_nb, gl_c_texcoords_nb, gl_c_colors_nb;
+ extern GLfloat *gl_c_vertices_ptr;
+-extern GLfloat *gl_c_texcoords_ptr;
++extern void *gl_c_texcoords_ptr;
+ extern GLfloat *gl_c_colors_ptr;
+ #define glVertexPointer(nb, t, v, p) \
+ { \
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index c9c23e185156..d74852014c8e 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
+  fetchpatch2,
+  copyDesktopItems,
   makeDesktopItem,
   makeWrapper,
   premake4,
-  unzip,
   openal,
   libpng,
   libvorbis,
@@ -13,39 +14,53 @@
   SDL2,
   SDL2_image,
   SDL2_ttf,
+  xorg,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+let
+  sdlInputs = [
+    SDL2
+    SDL2_ttf
+    SDL2_image
+  ];
+in
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "tome4";
   version = "1.7.6";
 
-  src = fetchurl {
-    url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
-    sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
-  };
-
-  desktop = makeDesktopItem {
-    desktopName = pname;
-    name = pname;
-    exec = "@out@/bin/${pname}";
-    icon = pname;
-    comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
-    type = "Application";
-    categories = [
-      "Game"
-      "RolePlaying"
-    ];
-    genericName = pname;
+  # Official source according to https://te4.org/wiki/How_to_compile
+  src = fetchFromGitLab {
+    domain = "git.net-core.org";
+    owner = "tome";
+    repo = "t-engine4";
+    tag = "tome-${finalAttrs.version}";
+    hash = "sha256-v0YPbmaOqKYgFkOe/X0FCirucrMo2UGAyhZ7MFj+nsU=";
   };
 
   prePatch = ''
     # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354
-    sed -i 's|#include <GL/glext.h>||' src/tgl.h
+    substituteInPlace src/tgl.h \
+      --replace-fail "#include <GL/glext.h>" ""
   '';
 
+  patches = [
+    # https://forums.te4.org/viewtopic.php?f=69&t=39859&p=168681&hilit=luaopen_shaders#p168681
+    (fetchpatch2 {
+      url = "https://gist.githubusercontent.com/hasufell/cb3b10f834e891d90f83/raw/cb4adda13868f6b94585575db4f8df70877ae45a/tome4-1.1.3-fix-implicit-declaration.patch";
+      hash = "sha256-g47N/bi2/DDKqaEkfTaGp9ItS57QVnObzMDWXqrCjWE=";
+    })
+    # unistd required for execv
+    ./0001-web-missing-include.patch
+    # unistd required for read and close
+    ./0002-zlib-missing-include.patch
+    ./0003-incompatible-pointer-types.patch
+  ];
+
   nativeBuildInputs = [
+    copyDesktopItems
     makeWrapper
-    unzip
     premake4
   ];
 
@@ -56,52 +71,77 @@ stdenv.mkDerivation rec {
     openal
     libpng
     libvorbis
-    SDL2
-    SDL2_ttf
-    SDL2_image
-  ];
+    xorg.libX11
+    xorg.xorgproto
+  ]
+  ++ sdlInputs;
 
   # disable parallel building as it caused sporadic build failures
   enableParallelBuilding = false;
 
-  env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2";
+  env = {
+    NIX_CFLAGS_COMPILE =
+      lib.concatMapStringsSep " " (i: "-I${lib.getInclude i}/include/SDL2") sdlInputs
+      + " "
+      + lib.concatMapStringsSep " " (i: "-I${lib.getInclude i}") finalAttrs.buildInputs;
+
+    NIX_CFLAGS_LINK = lib.concatMapStringsSep " " (i: "-L${lib.getLib i}/lib") finalAttrs.buildInputs;
+  };
 
   makeFlags = [ "config=release" ];
 
+  desktopItems = [
+    (makeDesktopItem {
+      desktopName = "Tales of Maj'Eyal";
+      name = "tome4";
+      exec = "tome4";
+      icon = "te4-icon";
+      comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
+      type = "Application";
+      categories = [
+        "Game"
+        "RolePlaying"
+      ];
+      genericName = "2D roguelike RPG";
+    })
+  ];
+
   # The wrapper needs to cd into the correct directory as tome4's detection of
   # the game asset root directory is faulty.
 
   installPhase = ''
     runHook preInstall
 
-    dir=$out/share/${pname}
+    dir=$out/share/tome4
 
     install -Dm755 t-engine $dir/t-engine
     cp -r bootstrap game $dir
-    makeWrapper $dir/t-engine $out/bin/${pname} \
+    makeWrapper $dir/t-engine $out/bin/tome4 \
       --chdir "$dir"
 
-    install -Dm755 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
-    substituteInPlace $out/share/applications/${pname}.desktop \
-      --subst-var out
+    install -Dm644 game/engines/default/data/gfx/te4-icon.png -t $out/share/icons/hicolor/64x64
 
-    unzip -oj -qq game/engines/te4-${version}.teae data/gfx/te4-icon.png
-    install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/${pname}.png
-
-    install -Dm644 -t $out/share/doc/${pname} CONTRIBUTING COPYING COPYING-MEDIA CREDITS
+    install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS
 
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "tome-(.*)"
+    ];
+  };
+
+  meta = {
     description = "Tales of Maj'eyal (rogue-like game)";
     mainProgram = "tome4";
     homepage = "https://te4.org/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
     platforms = [
       "i686-linux"
       "x86_64-linux"
     ];
   };
-}
+})
diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix
new file mode 100644
index 000000000000..14cbd6b129fe
--- /dev/null
+++ b/pkgs/by-name/to/toml-test/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "toml-test";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "toml-lang";
+    repo = "toml-test";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jOFkSEDNvvx8svgyYYpAbveQsclMsQRKJ2ocA6ty1Kw=";
+  };
+
+  vendorHash = "sha256-yt5rwpYzO38wEUhcyG4G367Byek20Uz3u+buAazq/5A=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X zgo.at/zli.version=${finalAttrs.version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Language agnostic test suite for TOML parsers";
+    homepage = "https://github.com/toml-lang/toml-test";
+    changelog = "https://github.com/toml-lang/toml-test/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      yzx9
+      defelo
+    ];
+    mainProgram = "toml-test";
+  };
+})
diff --git a/pkgs/by-name/to/toml11/package.nix b/pkgs/by-name/to/toml11/package.nix
index 8bf21b712a05..dd5924edd489 100644
--- a/pkgs/by-name/to/toml11/package.nix
+++ b/pkgs/by-name/to/toml11/package.nix
@@ -3,7 +3,9 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  doctest,
   fetchpatch,
+  nlohmann_json,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -14,8 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ToruNiina";
     repo = "toml11";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NnM+I43UVcd72Y9h+ysAAc7s5gZ78mjVwIMReTJ7G5M=";
-    fetchSubmodules = true;
+    hash = "sha256-sgWKYxNT22nw376ttGsTdg0AMzOwp8QH3E8mx0BZJTQ=";
   };
 
   patches = [
@@ -26,11 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  # Required to use the system `doctest` over upstream's submodule
+  postPatch = lib.optionalString finalAttrs.finalPackage.doCheck ''
+    substituteInPlace tests/*.{c,h}pp \
+      --replace-warn '"doctest.h"' '"doctest/doctest.h"'
+  '';
+
   nativeBuildInputs = [
     cmake
   ];
   cmakeFlags = [
-    (lib.cmakeBool "TOML11_BUILD_TOML_TESTS" true)
+    (lib.cmakeBool "TOML11_BUILD_TOML_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+  checkInputs = [
+    doctest
+    nlohmann_json
   ];
   doCheck = true;
 
diff --git a/pkgs/by-name/to/toml2nix/package.nix b/pkgs/by-name/to/toml2nix/package.nix
index d173ad659d4b..3d4d84439aa5 100644
--- a/pkgs/by-name/to/toml2nix/package.nix
+++ b/pkgs/by-name/to/toml2nix/package.nix
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/to/tonelib-zoom/package.nix b/pkgs/by-name/to/tonelib-zoom/package.nix
index 32ba6b2bb39e..2d2e9d62fcf8 100644
--- a/pkgs/by-name/to/tonelib-zoom/package.nix
+++ b/pkgs/by-name/to/tonelib-zoom/package.nix
@@ -13,7 +13,6 @@
   libXrandr,
   libXrender,
   libjack2,
-  webkitgtk_4_0,
 }:
 
 stdenv.mkDerivation rec {
@@ -35,7 +34,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     freetype
     libglvnd
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ]
   ++ runtimeDependencies;
 
@@ -56,6 +55,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "ToneLib Zoom – change and save all the settings in your Zoom(r) guitar pedal";
     homepage = "https://tonelib.net/";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
diff --git a/pkgs/applications/audio/tony/default.nix b/pkgs/by-name/to/tony/package.nix
similarity index 78%
rename from pkgs/applications/audio/tony/default.nix
rename to pkgs/by-name/to/tony/package.nix
index 643228bfad91..d2a8d6abd115 100644
--- a/pkgs/applications/audio/tony/default.nix
+++ b/pkgs/by-name/to/tony/package.nix
@@ -4,7 +4,6 @@
   fetchurl,
   fetchpatch2,
   pkg-config,
-  wrapQtAppsHook,
   alsa-lib,
   boost,
   bzip2,
@@ -23,19 +22,18 @@
   libsndfile,
   lrdf,
   opusfile,
-  qtbase,
-  qtsvg,
   rubberband,
   serd,
   sord,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tony";
   version = "2.1.1";
 
   src = fetchurl {
-    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/${pname}-${version}.tar.gz";
+    url = "https://code.soundsoftware.ac.uk/attachments/download/2616/tony-${finalAttrs.version}.tar.gz";
     sha256 = "03g2bmlj08lmgvh54dyd635xccjn730g4wwlhpvsw04bffz8b7fp";
   };
 
@@ -44,20 +42,20 @@ stdenv.mkDerivation rec {
       url = "https://github.com/sonic-visualiser/svcore/commit/5a7b517e43b7f0b3f03b7fc3145102cf4e5b0ffc.patch";
       stripLen = 1;
       extraPrefix = "svcore/";
-      sha256 = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
+      hash = "sha256-DOCdQqCihkR0g/6m90DbJxw00QTpyVmFzCxagrVWKiI=";
     })
     (fetchpatch2 {
       url = "https://github.com/sonic-visualiser/svgui/commit/5b6417891cff5cc614e8c96664d68674eb12b191.patch";
       stripLen = 1;
       extraPrefix = "svgui/";
       excludes = [ "svgui/widgets/CSVExportDialog.cpp" ];
-      sha256 = "sha256-pBCtoMXgjreUm/D0pl6+R9x1Ovwwwj8Ohv994oMX8XA=";
+      hash = "sha256-pBCtoMXgjreUm/D0pl6+R9x1Ovwwwj8Ohv994oMX8XA=";
     })
   ];
 
   nativeBuildInputs = [
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -79,8 +77,8 @@ stdenv.mkDerivation rec {
     libsndfile
     lrdf
     opusfile
-    qtbase
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtsvg
     rubberband
     serd
     sord
@@ -93,12 +91,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Pitch and note annotation of unaccompanied melody";
     mainProgram = "tony";
     homepage = "https://www.sonicvisualiser.org/tony/";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/to/toolhive/package.nix b/pkgs/by-name/to/toolhive/package.nix
new file mode 100644
index 000000000000..3271d421732c
--- /dev/null
+++ b/pkgs/by-name/to/toolhive/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  testers,
+  toolhive,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "toolhive";
+  version = "0.0.47";
+
+  src = fetchFromGitHub {
+    owner = "stacklok";
+    repo = "toolhive";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-FXJUEEyCw7ChuzmSAzwXd2LoJXT6vpH+j3muXx5TjPI=";
+  };
+
+  vendorHash = "sha256-aP923ezK4/2zTaU9QQLUmNN6KIddOaTlpsYMT2flRaE=";
+
+  # Build only the main CLI and operator binaries
+  subPackages = [
+    "cmd/thv"
+    "cmd/thv-operator"
+  ];
+
+  doCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests = {
+      version = testers.testVersion {
+        package = toolhive;
+        command = "thv version";
+        version = "ToolHive build-unknown";
+      };
+    };
+  };
+
+  meta = {
+    description = "Run any MCP server — securely, instantly, anywhere";
+    longDescription = ''
+      ToolHive is an open-source tool for deploying Model Context Protocol (MCP)
+      servers with a focus on security and ease of use. It provides a CLI to
+      discover and deploy MCP servers, run servers in isolated containers,
+      manage server configurations, and auto-configure clients like GitHub Copilot.
+    '';
+    homepage = "https://github.com/stacklok/toolhive";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ thrix ];
+    mainProgram = "thv";
+  };
+})
diff --git a/pkgs/by-name/to/toot/package.nix b/pkgs/by-name/to/toot/package.nix
index 22ab021d6b74..2d75a8b47016 100644
--- a/pkgs/by-name/to/toot/package.nix
+++ b/pkgs/by-name/to/toot/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "toot";
-  version = "0.50.1";
+  version = "0.51.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ihabunek";
     repo = "toot";
     tag = version;
-    hash = "sha256-qcxJeUDRYVFcyrvecG5xGy02O7otj1fg0HgBMuGS1d4=";
+    hash = "sha256-A3ValIMDPcfrvOdOJIkeurT+fAj1TzGf6cy12yaaBQE=";
   };
 
   nativeCheckInputs = with python3Packages; [ pytest ];
diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix
index 28a0a066ea02..fe23d7efd0eb 100644
--- a/pkgs/by-name/to/tootik/package.nix
+++ b/pkgs/by-name/to/tootik/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tootik";
-  version = "0.19.6";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "tootik";
     tag = "v${version}";
-    hash = "sha256-xbYmIH3dsZg2mL4coUwIAyQA5EhnTUOXs6Vu6ThfwUg=";
+    hash = "sha256-8ZvLdEeuPOcjZnumy6bwu5jeloSKa+vvSnH7VH0BI6g=";
   };
 
-  vendorHash = "sha256-hVhAtKW6O2wpmQS4l/O8ltt+aHxW6nDVpegOIip545c=";
+  vendorHash = "sha256-UENMw+kuZHD4x+gON3g3zNsH0Z3weRKpJZh58IiazLw=";
 
   nativeBuildInputs = [ openssl ];
 
diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index 5f4b29c046e4..9c6e3cb1e2e6 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -4,24 +4,24 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topfew-rs";
   version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "djc";
     repo = "topfew-rs";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY=";
   };
 
   cargoHash = "sha256-NAM/s3m+ZqgHoX6GESgJOxr88sy4+JieWB8u8aKbW7Y=";
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of Tim Bray's topfew tool";
     homepage = "https://github.com/djc/topfew-rs";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "tf";
   };
-}
+})
diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix
index a4853fda5d23..906bd91cfaa2 100644
--- a/pkgs/by-name/to/topfew/package.nix
+++ b/pkgs/by-name/to/topfew/package.nix
@@ -5,14 +5,14 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "topfew";
   version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "timbray";
     repo = "topfew";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI=";
   };
 
@@ -24,18 +24,17 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
   ];
 
   postInstall = ''
     installManPage doc/tf.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Finds the fields (or combinations of fields) which appear most often in a stream of records";
     homepage = "https://github.com/timbray/topfew";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "tf";
   };
-}
+})
diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 7a01f13de2a8..97807599db2e 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "16.0.4";
+  version = "16.1.2";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     rev = "v${version}";
-    hash = "sha256-b/xzmC49ETGtcf9ekrSkq75cKxSL4ZrvKPkparwz6zU=";
+    hash = "sha256-oDIEvBM7TDJlnkZSHkbtIUGRJ+RK48u9S4tuMeKSwO0=";
   };
 
-  cargoHash = "sha256-d6jX+3ZcCswhKy5SsSpvXZL9el70+OyIa7lYQ3B/o8M=";
+  cargoHash = "sha256-9jfKnjCbxo47qUWYdqBHoObxth3pporRZ0oauCkWwkc=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index 79439f3a1d25..0fcab6db3f9c 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -3,41 +3,29 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  iconv,
   installShellFiles,
   versionCheckHook,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topiary";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "topiary";
-    tag = "v${version}";
-    hash = "sha256-CyqZhkzAOqC3xWhwUzCpkDO0UFsO0S4/3sV7zIILiVg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-49LTUtgroD0wCwJYYb/IN1lsWbAtdfKjGNMuUa2+vhI=";
   };
 
+  cargoHash = "sha256-I3hsaA4N2x00J5+U0z2B1gi1N7QVf7Vnab2scjDpWoo=";
+
   nativeBuildInputs = [ installShellFiles ];
-  nativeInstallCheckInputs = [ versionCheckHook ];
-
-  cargoHash = "sha256-akAjn9a7dMwjPSNveDY2KJ62evjHCAWpRR3A7Ghkb5A=";
-
-  # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
-  depsExtraArgs.postBuild = ''
-    find $out -name '*.ps1' -print | while read -r file; do
-      if [ "$(file --brief --mime-encoding "$file")" == utf-16be ]; then
-        ${iconv}/bin/iconv -f UTF-16BE -t UTF16LE "$file" > tmp && mv tmp "$file"
-      fi
-    done
-  '';
 
   cargoBuildFlags = [
     "-p"
     "topiary-cli"
   ];
-  cargoTestFlags = cargoBuildFlags;
 
   # Skip tests that cannot be executed in sandbox (operation not permitted)
   checkFlags = [
@@ -76,6 +64,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_vis"
     "--skip=test_vis_invalid"
   ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";
 
@@ -89,6 +78,8 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/topiary completion zsh)
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
@@ -96,13 +87,12 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     description = "Uniform formatter for simple languages, as part of the Tree-sitter ecosystem";
-    mainProgram = "topiary";
     homepage = "https://github.com/tweag/topiary";
-    changelog = "https://github.com/tweag/topiary/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/tweag/topiary/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       nartsiss
     ];
+    mainProgram = "topiary";
   };
-}
+})
diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index e5d139bd6453..2f52b3481bf9 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -55,11 +55,6 @@
   libvaSupport ? mediaSupport,
   libva,
 
-  # Hardening
-  graphene-hardened-malloc,
-  # Whether to use graphene-hardened-malloc
-  useHardenedMalloc ? null,
-
   # Whether to use IPC for communicating with Tor
   useIPCTorService ? false,
   # Whether to disable multiprocess support
@@ -69,317 +64,307 @@
   extraPrefs ? "",
 }:
 
-lib.warnIf (useHardenedMalloc != null)
-  "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues"
+let
+  libPath = lib.makeLibraryPath (
+    [
+      alsa-lib
+      atk
+      cairo
+      dbus
+      dbus-glib
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libxcb
+      libX11
+      libXext
+      libXrender
+      libXt
+      libXtst
+      libgbm
+      pango
+      pciutils
+      stdenv.cc.cc
+      stdenv.cc.libc
+      zlib
+    ]
+    ++ lib.optionals libnotifySupport [ libnotify ]
+    ++ lib.optionals waylandSupport [
+      libxkbcommon
+      libdrm
+      libGL
+    ]
+    ++ lib.optionals pipewireSupport [ pipewire ]
+    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+    ++ lib.optionals libvaSupport [ libva ]
+    ++ lib.optionals mediaSupport [ ffmpeg ]
+  );
 
-  (
-    let
-      libPath = lib.makeLibraryPath (
-        [
-          alsa-lib
-          atk
-          cairo
-          dbus
-          dbus-glib
-          fontconfig
-          freetype
-          gdk-pixbuf
-          glib
-          gtk3
-          libxcb
-          libX11
-          libXext
-          libXrender
-          libXt
-          libXtst
-          libgbm
-          pango
-          pciutils
-          stdenv.cc.cc
-          stdenv.cc.libc
-          zlib
-        ]
-        ++ lib.optionals libnotifySupport [ libnotify ]
-        ++ lib.optionals waylandSupport [
-          libxkbcommon
-          libdrm
-          libGL
-        ]
-        ++ lib.optionals pipewireSupport [ pipewire ]
-        ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
-        ++ lib.optionals libvaSupport [ libva ]
-        ++ lib.optionals mediaSupport [ ffmpeg ]
-      );
+  version = "15.0";
 
-      version = "14.5.8";
-
-      sources = {
-        x86_64-linux = fetchurl {
-          urls = [
-            "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-            "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-          ];
-          hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
-        };
-
-        i686-linux = fetchurl {
-          urls = [
-            "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-            "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-          ];
-          hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
-        };
-      };
-
-      distributionIni = writeText "distribution.ini" (
-        lib.generators.toINI { } {
-          # Some light branding indicating this build uses our distro preferences
-          Global = {
-            id = "nixos";
-            version = "1.0";
-            about = "Tor Browser for NixOS";
-          };
-        }
-      );
-
-      policiesJson = writeText "policies.json" (
-        builtins.toJSON {
-          policies.DisableAppUpdate = true;
-        }
-      );
-    in
-    stdenv.mkDerivation rec {
-      pname = "tor-browser";
-      inherit version;
-
-      src =
-        sources.${stdenv.hostPlatform.system}
-          or (throw "unsupported system: ${stdenv.hostPlatform.system}");
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        patchelfUnstable
-        copyDesktopItems
-        makeWrapper
-        wrapGAppsHook3
+  sources = {
+    x86_64-linux = fetchurl {
+      urls = [
+        "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      buildInputs = [
-        gtk3
-        alsa-lib
-        dbus-glib
-        libXtst
+      hash = "sha256-I2dNohgNfhtcNaqbOZiPc55Obpcn07f6VHpVEjzI/qA=";
+    };
+
+    i686-linux = fetchurl {
+      urls = [
+        "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
+        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
+        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
+        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
+      hash = "sha256-W+jPCVtCkJtvgErcp2a/wSNd7SL3qPqvxHBN4hYBuqg=";
+    };
+  };
 
-      # Firefox uses "relrhack" to manually process relocations from a fixed offset
-      patchelfFlags = [ "--no-clobber-old-sections" ];
-
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-
-      desktopItems = [
-        (makeDesktopItem {
-          name = "torbrowser";
-          exec = "tor-browser %U";
-          icon = "tor-browser";
-          desktopName = "Tor Browser";
-          genericName = "Web Browser";
-          comment = meta.description;
-          categories = [
-            "Network"
-            "WebBrowser"
-            "Security"
-          ];
-          mimeTypes = [
-            "text/html"
-            "text/xml"
-            "application/xhtml+xml"
-            "application/vnd.mozilla.xul+xml"
-            "x-scheme-handler/http"
-            "x-scheme-handler/https"
-          ];
-          startupWMClass = "Tor Browser";
-        })
-      ];
-
-      buildPhase = ''
-        runHook preBuild
-
-        # For convenience ...
-        TBB_IN_STORE=$out/share/tor-browser
-
-        # Unpack & enter
-        mkdir -p "$TBB_IN_STORE"
-        tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
-        pushd "$TBB_IN_STORE"
-
-        # Set ELF interpreter
-        autoPatchelf firefox.real TorBrowser/Tor
-
-        # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
-        mv firefox.real firefox
-
-        # store state at `~/.tor browser` instead of relative to executable
-        touch "$TBB_IN_STORE/system-install"
-
-        # The final libPath.  Note, we could split this into firefoxLibPath
-        # and torLibPath for accuracy, but this is more convenient ...
-        libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
-
-        # apulse uses a non-standard library path.  For now special-case it.
-        ${lib.optionalString (audioSupport && !pulseaudioSupport) ''
-          libPath=${apulse}/lib/apulse:$libPath
-        ''}
-
-        # Fixup paths to pluggable transports.
-        substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
-          --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
-
-        # Prepare for autoconfig.
-        #
-        # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
-        cat >defaults/pref/autoconfig.js <<EOF
-        //
-        pref("general.config.filename", "mozilla.cfg");
-        pref("general.config.obscure_value", 0);
-        EOF
-
-        # Hard-coded Firefox preferences.
-        cat >mozilla.cfg <<EOF
-        // First line must be a comment
-
-        // Reset pref that captures store paths.
-        clearPref("extensions.xpiState");
-
-        // Stop obnoxious first-run redirection.
-        lockPref("noscript.firstRunRedirection", false);
-
-        // User should never change these.  Locking prevents these
-        // values from being written to prefs.js, avoiding Store
-        // path capture.
-        lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
-        lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
-
-        // Optionally use IPC for communicating with Tor
-        //
-        // Sockets are created at \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
-        ${lib.optionalString useIPCTorService ''
-          lockPref("extensions.torlauncher.control_port_use_ipc", true);
-          lockPref("extensions.torlauncher.socks_port_use_ipc", true);
-        ''}
-
-        // Optionally disable multiprocess support.  We always set this to ensure that
-        // toggling the pref takes effect.
-        lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
-
-        // Allow sandbox access to sound devices if using ALSA directly
-        ${
-          if (audioSupport && !pulseaudioSupport) then
-            ''
-              pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
-            ''
-          else
-            ''
-              clearPref("security.sandbox.content.write_path_whitelist");
-            ''
-        }
-
-        ${lib.optionalString (extraPrefs != "") ''
-          ${extraPrefs}
-        ''}
-        EOF
-
-        # FONTCONFIG_FILE is required to make fontconfig read the TBB
-        # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
-        # indicates the system fonts.conf being used instead.
-        FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf
-        substituteInPlace "$FONTCONFIG_FILE" \
-          --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"
-
-        # Hard-code paths to geoip data files.  TBB resolves the geoip files
-        # relative to torrc-defaults_path but if we do not hard-code them
-        # here, these paths end up being written to the torrc in the user's
-        # state dir.
-        cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
-        GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
-        GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
-        EOF
-
-        mkdir -p $out/bin
-
-        makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \
-          --prefix LD_PRELOAD : "${
-            lib.optionalString (
-              useHardenedMalloc == true
-            ) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"
-          }" \
-          --prefix LD_LIBRARY_PATH : "$libPath" \
-          --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
-          --set-default MOZ_ENABLE_WAYLAND 1
-
-        # Easier access to docs
-        mkdir -p $out/share/doc
-        ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
-
-        # Install icons
-        for i in 16 32 48 64 128; do
-          mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
-          ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
-        done
-
-        # Check installed apps
-        echo "Checking bundled Tor ..."
-        LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
-
-        echo "Checking tor-browser wrapper ..."
-        $out/bin/tor-browser --version >/dev/null
-
-        runHook postBuild
-      '';
-
-      installPhase = ''
-        runHook preInstall
-
-        # Install distribution customizations
-        install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
-        install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
-
-        runHook postInstall
-      '';
-
-      passthru = {
-        inherit sources;
-        updateScript = callPackage ./update.nix {
-          inherit pname version meta;
-        };
-      };
-
-      meta = {
-        description = "Privacy-focused browser routing traffic through the Tor network";
-        mainProgram = "tor-browser";
-        homepage = "https://www.torproject.org/";
-        changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
-        platforms = lib.attrNames sources;
-        maintainers = with lib.maintainers; [
-          c4patino
-          felschr
-          hax404
-          joachifm
-          panicgh
-        ];
-        # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
-        # the compound is "libre" in a strict sense (some components place certain
-        # restrictions on redistribution), it's free enough for our purposes.
-        license = with lib.licenses; [
-          mpl20
-          lgpl21Plus
-          lgpl3Plus
-          free
-        ];
-        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  distributionIni = writeText "distribution.ini" (
+    lib.generators.toINI { } {
+      # Some light branding indicating this build uses our distro preferences
+      Global = {
+        id = "nixos";
+        version = "1.0";
+        about = "Tor Browser for NixOS";
       };
     }
-  )
+  );
+
+  policiesJson = writeText "policies.json" (
+    builtins.toJSON {
+      policies.DisableAppUpdate = true;
+    }
+  );
+in
+stdenv.mkDerivation rec {
+  pname = "tor-browser";
+  inherit version;
+
+  src =
+    sources.${stdenv.hostPlatform.system}
+      or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    patchelfUnstable
+    copyDesktopItems
+    makeWrapper
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    gtk3
+    alsa-lib
+    dbus-glib
+    libXtst
+  ];
+
+  # Firefox uses "relrhack" to manually process relocations from a fixed offset
+  patchelfFlags = [ "--no-clobber-old-sections" ];
+
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "torbrowser";
+      exec = "tor-browser %U";
+      icon = "tor-browser";
+      desktopName = "Tor Browser";
+      genericName = "Web Browser";
+      comment = meta.description;
+      categories = [
+        "Network"
+        "WebBrowser"
+        "Security"
+      ];
+      mimeTypes = [
+        "text/html"
+        "text/xml"
+        "application/xhtml+xml"
+        "application/vnd.mozilla.xul+xml"
+        "x-scheme-handler/http"
+        "x-scheme-handler/https"
+      ];
+      startupWMClass = "Tor Browser";
+    })
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    # For convenience ...
+    TBB_IN_STORE=$out/share/tor-browser
+
+    # Unpack & enter
+    mkdir -p "$TBB_IN_STORE"
+    tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
+    pushd "$TBB_IN_STORE"
+
+    # Set ELF interpreter
+    autoPatchelf firefox.real TorBrowser/Tor
+
+    # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
+    mv firefox.real firefox
+
+    # store state at `~/.tor browser` instead of relative to executable
+    touch "$TBB_IN_STORE/system-install"
+
+    # The final libPath.  Note, we could split this into firefoxLibPath
+    # and torLibPath for accuracy, but this is more convenient ...
+    libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
+
+    # apulse uses a non-standard library path.  For now special-case it.
+    ${lib.optionalString (audioSupport && !pulseaudioSupport) ''
+      libPath=${apulse}/lib/apulse:$libPath
+    ''}
+
+    # Fixup paths to pluggable transports.
+    substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
+      --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
+
+    # Prepare for autoconfig.
+    #
+    # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
+    cat >defaults/pref/autoconfig.js <<EOF
+    //
+    pref("general.config.filename", "mozilla.cfg");
+    pref("general.config.obscure_value", 0);
+    EOF
+
+    # Hard-coded Firefox preferences.
+    cat >mozilla.cfg <<EOF
+    // First line must be a comment
+
+    // Reset pref that captures store paths.
+    clearPref("extensions.xpiState");
+
+    // Stop obnoxious first-run redirection.
+    lockPref("noscript.firstRunRedirection", false);
+
+    // User should never change these.  Locking prevents these
+    // values from being written to prefs.js, avoiding Store
+    // path capture.
+    lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
+    lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
+
+    // Optionally use IPC for communicating with Tor
+    //
+    // Sockets are created at \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
+    ${lib.optionalString useIPCTorService ''
+      lockPref("extensions.torlauncher.control_port_use_ipc", true);
+      lockPref("extensions.torlauncher.socks_port_use_ipc", true);
+    ''}
+
+    // Optionally disable multiprocess support.  We always set this to ensure that
+    // toggling the pref takes effect.
+    lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
+
+    // Allow sandbox access to sound devices if using ALSA directly
+    ${
+      if (audioSupport && !pulseaudioSupport) then
+        ''
+          pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
+        ''
+      else
+        ''
+          clearPref("security.sandbox.content.write_path_whitelist");
+        ''
+    }
+
+    ${lib.optionalString (extraPrefs != "") ''
+      ${extraPrefs}
+    ''}
+    EOF
+
+    # FONTCONFIG_FILE is required to make fontconfig read the TBB
+    # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+    # indicates the system fonts.conf being used instead.
+    FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf
+    substituteInPlace "$FONTCONFIG_FILE" \
+      --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"
+
+    # Hard-code paths to geoip data files.  TBB resolves the geoip files
+    # relative to torrc-defaults_path but if we do not hard-code them
+    # here, these paths end up being written to the torrc in the user's
+    # state dir.
+    cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
+    GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
+    GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
+    EOF
+
+    mkdir -p $out/bin
+
+    makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \
+      --prefix LD_LIBRARY_PATH : "$libPath" \
+      --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
+      --set-default MOZ_ENABLE_WAYLAND 1
+
+    # Easier access to docs
+    mkdir -p $out/share/doc
+    ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
+
+    # Install icons
+    for i in 16 32 48 64 128; do
+      mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
+      ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
+    done
+
+    # Check installed apps
+    echo "Checking bundled Tor ..."
+    LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
+
+    echo "Checking tor-browser wrapper ..."
+    $out/bin/tor-browser --version >/dev/null
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Install distribution customizations
+    install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
+    install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit sources;
+    updateScript = callPackage ./update.nix {
+      inherit pname version meta;
+    };
+  };
+
+  meta = {
+    description = "Privacy-focused browser routing traffic through the Tor network";
+    mainProgram = "tor-browser";
+    homepage = "https://www.torproject.org/";
+    changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
+    platforms = lib.attrNames sources;
+    maintainers = with lib.maintainers; [
+      c4patino
+      felschr
+      hax404
+      joachifm
+      panicgh
+    ];
+    # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
+    # the compound is "libre" in a strict sense (some components place certain
+    # restrictions on redistribution), it's free enough for our purposes.
+    license = with lib.licenses; [
+      mpl20
+      lgpl21Plus
+      lgpl3Plus
+      free
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}
diff --git a/pkgs/by-name/to/torrential/package.nix b/pkgs/by-name/to/torrential/package.nix
deleted file mode 100644
index f10ee282beae..000000000000
--- a/pkgs/by-name/to/torrential/package.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  nix-update-script,
-  desktop-file-utils,
-  meson,
-  ninja,
-  pkg-config,
-  python3,
-  vala,
-  wrapGAppsHook4,
-  curl,
-  dht,
-  glib,
-  gtk4,
-  libb64,
-  libevent,
-  libgee,
-  libnatpmp,
-  libtransmission_3,
-  libutp,
-  miniupnpc,
-  openssl,
-  pantheon,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "torrential";
-  version = "3.0.0";
-
-  src = fetchFromGitHub {
-    owner = "davidmhewitt";
-    repo = "torrential";
-    rev = version;
-    sha256 = "sha256-uHc/VNtbhetmGyuhynZH1TvxJscVX17eWO6dzX6Ft3A=";
-  };
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    meson
-    ninja
-    pkg-config
-    python3
-    vala
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    curl
-    dht
-    glib
-    gtk4
-    libb64
-    libevent
-    libgee
-    libnatpmp
-    libtransmission_3
-    libutp
-    miniupnpc
-    openssl
-    pantheon.granite7
-  ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-
-    substituteInPlace meson/post_install.py \
-      --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS";
-    homepage = "https://github.com/davidmhewitt/torrential";
-    maintainers = with maintainers; [ xiorcale ];
-    teams = [ teams.pantheon ];
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    mainProgram = "com.github.davidmhewitt.torrential";
-  };
-}
diff --git a/pkgs/by-name/to/totem/package.nix b/pkgs/by-name/to/totem/package.nix
index c5e8d2d5c7da..5f294657bfd0 100644
--- a/pkgs/by-name/to/totem/package.nix
+++ b/pkgs/by-name/to/totem/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   meson,
   ninja,
   gettext,
@@ -40,6 +41,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-CwB9MPu5O5WmBPFISKSX9X/DM6dcLmOKJJly6ZwB5qQ=";
   };
 
+  patches = [
+    # Use girepository-2.0
+    # This will be ported to libpeas2 in https://gitlab.gnome.org/GNOME/totem/-/merge_requests/373
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/totem/raw/a213a514b7c2ac22d4e012e168e41eaf839e8112/f/girepository-2.0.patch";
+      hash = "sha256-D+i45yebZMbA7Ybfog3bwtOghoIHHVMqyXiUcZTkpxk=";
+    })
+  ];
+
   nativeBuildInputs = [
     meson
     ninja
diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix
index 8f4decacdda3..feff10598d92 100644
--- a/pkgs/by-name/to/toxic/package.nix
+++ b/pkgs/by-name/to/toxic/package.nix
@@ -17,15 +17,15 @@
   libnotify,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "toxic";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "TokTok";
     repo = "toxic";
-    rev = "v${version}";
-    hash = "sha256-qwMkqPTONtG+LnH6a/Debp+n39dJpbUMoy1nIukYjKo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HNZKQPNwKLvtT/0EJlDaJnGI04gpJqXHKjd/85H3zH8=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
     libconfig
   ];
 
-  meta = src.meta // {
+  meta = finalAttrs.src.meta // {
     description = "Reference CLI for Tox";
     mainProgram = "toxic";
     homepage = "https://github.com/TokTok/toxic";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/to/toxvpn/package.nix b/pkgs/by-name/to/toxvpn/package.nix
index 971d533404ef..60cab8acab30 100644
--- a/pkgs/by-name/to/toxvpn/package.nix
+++ b/pkgs/by-name/to/toxvpn/package.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation {
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = "cp ${./bootstrap.json} $out/share/toxvpn/";
 
   installCheckPhase = "$out/bin/toxvpn -h";
diff --git a/pkgs/by-name/to/toybox/package.nix b/pkgs/by-name/to/toybox/package.nix
index 416ccc2d5ada..2d6570e0baa8 100644
--- a/pkgs/by-name/to/toybox/package.nix
+++ b/pkgs/by-name/to/toybox/package.nix
@@ -17,13 +17,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "toybox";
-  version = "0.8.12";
+  version = "0.8.13";
 
   src = fetchFromGitHub {
     owner = "landley";
     repo = "toybox";
     rev = version;
-    sha256 = "sha256-D+tf2bJQlf2pLMNZdMUOoUdE3ea/KgkqoXGsnl1MVOE=";
+    sha256 = "sha256-b5sigIxyg4T4wVc5z8Das+RdEXmNBPFsXpWwXxU/ERE=";
   };
 
   depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/pkgs/by-name/tp/tparted/package.nix b/pkgs/by-name/tp/tparted/package.nix
index 14aad27b6f14..e2d8f8f56ea8 100644
--- a/pkgs/by-name/tp/tparted/package.nix
+++ b/pkgs/by-name/tp/tparted/package.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tparted";
-  version = "2025-01-24";
+  version = "2025-10-31";
 
   src = fetchurl {
     url = "https://github.com/Kagamma/tparted/releases/download/${finalAttrs.version}/linux_x86-64_tparted_${finalAttrs.version}.tar.gz";
-    hash = "sha256-7V3bdsP4uqZ5zyw3j/s8fhMYFCyQ1Rz5Z1JiPFc1oFY=";
+    hash = "sha256-uBuYZUiQB/RnAXRNqwkz87rYjBanqiJBbRFAPSmEmnw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tp/tpm2-abrmd/package.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
index 28e9069d983c..9b1275ab4f59 100644
--- a/pkgs/by-name/tp/tpm2-abrmd/package.nix
+++ b/pkgs/by-name/tp/tpm2-abrmd/package.nix
@@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with maintainers; [
+      matthiasbeyer
+      scottstephens
+    ];
   };
 }
diff --git a/pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix b/pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix
new file mode 100644
index 000000000000..ea2188da5a0b
--- /dev/null
+++ b/pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix
@@ -0,0 +1,5 @@
+{
+  tpm2-pkcs11,
+  ...
+}@args:
+tpm2-pkcs11.abrmd.override args
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch b/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
index bd4760ba3b53..a036a2faaebd 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
+++ b/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile-integration.am b/Makefile-integration.am
-index e2255de..3cea1d8 100644
+index 01c3408..b515784 100644
 --- a/Makefile-integration.am
 +++ b/Makefile-integration.am
 @@ -7,7 +7,6 @@ integration_scripts = \
@@ -9,8 +9,8 @@ index e2255de..3cea1d8 100644
 -    test/integration/pkcs11-javarunner.sh.java \
      test/integration/nss-tests.sh \
      test/integration/ptool-link.sh.nosetup \
-     test/integration/python-pkcs11.sh
-@@ -110,13 +109,5 @@ test_integration_pkcs_lockout_int_CFLAGS  = $(AM_CFLAGS) $(TESTS_CFLAGS)
+     test/integration/ptool-link-persistent.sh.nosetup \
+@@ -111,13 +110,5 @@ test_integration_pkcs_lockout_int_CFLAGS  = $(AM_CFLAGS) $(TESTS_CFLAGS)
  test_integration_pkcs_lockout_int_LDADD   = $(TESTS_LDADD)  $(SQLITE3_LIBS)
  test_integration_pkcs_lockout_int_SOURCES = test/integration/pkcs-lockout.int.c test/integration/test.c
  
@@ -25,16 +25,18 @@ index e2255de..3cea1d8 100644
  endif
  # END INTEGRATION
 diff --git a/configure.ac b/configure.ac
-index 1ec6eb4..7a0a8ee 100644
+index 104cf12..ccade64 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -258,13 +258,6 @@ AC_ARG_ENABLE(
+@@ -259,15 +259,6 @@ AC_ARG_ENABLE(
      [build and execute integration tests])],,
    [enable_integration=no])
  
 -# Test for Java compiler and interpreter without throwing fatal errors (since
 -# these macros are defined using AC_DEFUN they cannot be called conditionally)
--m4_pushdef([AC_MSG_ERROR], [have_javac=no])
+-# Test for javac by checking JAVAC variable since have_javac is not quite stable
+-# across versions of ax_prog_javac.m4 that provides AX_PROG_JAVAC
+-m4_pushdef([AC_MSG_ERROR], [true])
 -AX_PROG_JAVAC()
 -AX_PROG_JAVA()
 -m4_popdef([AC_MSG_ERROR])
@@ -42,11 +44,11 @@ index 1ec6eb4..7a0a8ee 100644
  AC_DEFUN([integration_test_checks], [
  
    AC_CHECK_PROG([tpm2_createprimary], [tpm2_createprimary], [yes], [no])
-@@ -382,13 +375,6 @@ AC_DEFUN([integration_test_checks], [
+@@ -385,13 +376,6 @@ AC_DEFUN([integration_test_checks], [
          [AC_MSG_ERROR([Integration tests enabled but tss2_provision executable not found.])])
    ])
  
--  AS_IF([test "x$have_javac" = "xno"],
+-  AS_IF([test -z "$JAVAC"],
 -    [AC_MSG_ERROR([Integration tests enabled but no Java compiler was found])])
 -  AX_CHECK_CLASS([org.junit.Assert], ,
 -    [AC_MSG_ERROR([Integration tests enabled but JUnit not found, try setting CLASSPATH])])
@@ -55,4 +57,4 @@ index 1ec6eb4..7a0a8ee 100644
 -
    AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])
  ]) # end function integration_test_checks
-  
+ 
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index 233f578d6596..1bbe78d978b5 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -16,6 +16,7 @@
   opensc,
   openssh,
   openssl,
+  nix-update-script,
   nss,
   p11-kit,
   patchelf,
@@ -45,13 +46,13 @@ let
 in
 chosenStdenv.mkDerivation (finalAttrs: {
   pname = "tpm2-pkcs11";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-pkcs11";
     tag = finalAttrs.version;
-    hash = "sha256-W74ckrpK7ypny1L3Gn7nNbOVh8zbHavIk/TX3b8XbI8=";
+    hash = "sha256-o0a5MiFqLH7SuHG/BEtPVGOaDoV+kCu2l1MCHt5rWFc=";
   };
 
   # Disable Java‐based tests because of missing dependencies
@@ -87,7 +88,7 @@ chosenStdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature finalAttrs.doCheck "integration")
 
     # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag.
-    "--with-fapi=${if fapiSupport then "yes" else "no"}"
+    "--with-fapi=${lib.boolToYesNo fapiSupport}"
   ]
   ++ lib.optionals enableFuzzing [
     "--enable-fuzzing"
@@ -242,6 +243,7 @@ chosenStdenv.mkDerivation (finalAttrs: {
         fapi-abrmd
         ;
     };
+    updateScript = nix-update-script { };
   };
 
   meta = {
diff --git a/pkgs/by-name/tp/tpm2-tools/package.nix b/pkgs/by-name/tp/tpm2-tools/package.nix
index 363ba53c7b00..9c19a654a637 100644
--- a/pkgs/by-name/tp/tpm2-tools/package.nix
+++ b/pkgs/by-name/tp/tpm2-tools/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ scottstephens ];
   };
 }
diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/by-name/tp/tpmmanager/package.nix
similarity index 92%
rename from pkgs/applications/misc/tpmmanager/default.nix
rename to pkgs/by-name/tp/tpmmanager/package.nix
index 2164b56642b8..b9a6ac8a1f5c 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/by-name/tp/tpmmanager/package.nix
@@ -2,10 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
-  wrapQtAppsHook,
   trousers,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     trousers
   ];
 
diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 5dc592333593..06f44f3036fc 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.25.15";
+  version = "1.25.16";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vmHRpY2KvG6vxVQ6OVi/u6wpD8oqQFXn2IJOT0Nh/V0=";
+    hash = "sha256-gltzK1C+4qddJ49vv+OZ8AVuMeBWArwOZkL+v7cxFzw=";
   };
 
-  cargoHash = "sha256-dltBOA6pxy2gLemVoX8l0Z+xkiJvhGWSmediWWnN1bc=";
+  cargoHash = "sha256-OH3aSQdcAGNRJWGmgQ4LNnD89hqCIEh+ieHosjFhAbk=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/tr/traccar/package.nix b/pkgs/by-name/tr/traccar/package.nix
index 69a1795a5b7e..efb72643499f 100644
--- a/pkgs/by-name/tr/traccar/package.nix
+++ b/pkgs/by-name/tr/traccar/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "traccar";
-  version = "6.9.1";
+  version = "6.10.0";
   nativeBuildInputs = [ pkgs.makeWrapper ];
 
   src = fetchzip {
     stripRoot = false;
     url = "https://github.com/traccar/traccar/releases/download/v${version}/traccar-other-${version}.zip";
-    hash = "sha256-PR0crdEGYr4lVp5JSFSLGsR+uZKWulfp6LA57y9K88E=";
+    hash = "sha256-esXmcN3j7rZ6Sx9n772LC39hN25tHKq7RIn+j/PyISw=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/tr/tracefilegen/package.nix b/pkgs/by-name/tr/tracefilegen/package.nix
index df37c0d8256e..d67b26451c2a 100644
--- a/pkgs/by-name/tr/tracefilegen/package.nix
+++ b/pkgs/by-name/tr/tracefilegen/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/.
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Automatically generate all types of basic memory management operations and write into trace files";
     mainProgram = "TraceFileGen";
diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix
index af6e1619e7a3..a19ed8864e20 100644
--- a/pkgs/by-name/tr/tradingview/package.nix
+++ b/pkgs/by-name/tr/tradingview/package.nix
@@ -24,12 +24,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tradingview";
-  version = "2.12.0";
-  revision = "66";
+  version = "2.14.0";
+  revision = "68";
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";
-    hash = "sha512-ydk0/mJh4M02oIEfU3PKTwEO+nMpeJGuxQAly8WqJLx5GOQAb/J7VRB8IQpHHqWGeRfbwhantdZryQF8ngFJ/g==";
+    hash = "sha512-wuMQBfJfMbQdq4eUNl9bitf4IGcpczX0FDdnQAgyALBpHI7CbcIF9Aq4hIy0dblYgeISM1HFqPiSIcFCS+VuSQ==";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index 5b0ecef2daac..475faea34b89 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -8,16 +8,16 @@
 
 buildGo124Module (finalAttrs: {
   pname = "traefik";
-  version = "3.5.3";
+  version = "3.5.4";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-vKpOlB29OJHppQOspIICYgeAtemBGb419TIXIW9zrhU=";
+    hash = "sha256-gA1H2oJXm6l3JQdn1+SMPf3ZzG0pvXRDiVgZu2MAT3E=";
     stripRoot = false;
   };
 
-  vendorHash = "sha256-Juf5LYB/o1hyTIZB5NQrJBOLdkEjL1mOsBgndF3vpd8=";
+  vendorHash = "sha256-UziRO6cNgbVRyLWm8i/oOXVktOAt8exCNz2bdpX8yk8=";
 
   subPackages = [ "cmd/traefik" ];
 
diff --git a/pkgs/by-name/tr/translatelocally/package.nix b/pkgs/by-name/tr/translatelocally/package.nix
index 3ade4781eca9..5e4344db5744 100644
--- a/pkgs/by-name/tr/translatelocally/package.nix
+++ b/pkgs/by-name/tr/translatelocally/package.nix
@@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     echo '#define GIT_REVISION "${rev} ${finalAttrs.version}"' > \
       3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h
+
+    substituteInPlace 3rd_party/bergamot-translator/3rd_party/marian-dev/src/3rd_party/sentencepiece/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace 3rd_party/bergamot-translator/3rd_party/marian-dev/src/3rd_party/ruy/third_party/cpuinfo/deps/clog/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
deleted file mode 100644
index 3c7947d9c24b..000000000000
--- a/pkgs/by-name/tr/transmission_3/package.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  openssl,
-  curl,
-  libevent,
-  inotify-tools,
-  systemd,
-  zlib,
-  pcre,
-  libb64,
-  libutp,
-  miniupnpc,
-  dht,
-  libnatpmp,
-  libiconv,
-  # Build options
-  enableGTK3 ? false,
-  gtk3,
-  xorg,
-  wrapGAppsHook3,
-  enableQt ? false,
-  qt5,
-  nixosTests,
-  enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-  enableDaemon ? true,
-  enableCli ? true,
-  installLib ? false,
-  apparmorRulesFromClosure,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "transmission";
-  version = "3.00";
-
-  src = fetchFromGitHub {
-    owner = "transmission";
-    repo = "transmission";
-    tag = finalAttrs.version;
-    hash = "sha256-n4iEDt9AstDZPZXN47p13brNLbNWS3BTB+A4UuoEjzE=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    # fix build with openssl 3.0
-    ./transmission-3.00-openssl-3.patch
-    # fix build with miniupnpc 2.2.8
-    ./transmission-3.00-miniupnpc-2.2.8.patch
-  ];
-
-  # Compatibility with CMake < 3.5 has been removed from CMake.
-  postPatch = ''
-    substituteInPlace \
-      CMakeLists.txt \
-      --replace-fail \
-        "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" \
-        "cmake_minimum_required(VERSION 3.5)"
-  '';
-
-  outputs = [
-    "out"
-    "apparmor"
-  ];
-
-  cmakeFlags =
-    let
-      mkFlag = opt: if opt then "ON" else "OFF";
-    in
-    [
-      "-DENABLE_MAC=OFF" # requires xcodebuild
-      "-DENABLE_GTK=${mkFlag enableGTK3}"
-      "-DENABLE_QT=${mkFlag enableQt}"
-      "-DENABLE_DAEMON=${mkFlag enableDaemon}"
-      "-DENABLE_CLI=${mkFlag enableCli}"
-      "-DINSTALL_LIB=${mkFlag installLib}"
-    ];
-
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-  ]
-  ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ]
-  ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ];
-
-  buildInputs = [
-    openssl
-    curl
-    libevent
-    zlib
-    pcre
-    libb64
-    libutp
-    miniupnpc
-    dht
-    libnatpmp
-  ]
-  ++ lib.optionals enableQt [
-    qt5.qttools
-    qt5.qtbase
-  ]
-  ++ lib.optionals enableGTK3 [
-    gtk3
-    xorg.libpthreadstubs
-  ]
-  ++ lib.optionals enableSystemd [ systemd ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  postInstall = ''
-    mkdir $apparmor
-    cat >$apparmor/bin.transmission-daemon <<EOF
-    include <tunables/global>
-    $out/bin/transmission-daemon {
-      include <abstractions/base>
-      include <abstractions/nameservice>
-      include <abstractions/ssl_certs>
-      include "${
-        apparmorRulesFromClosure { name = "transmission-daemon"; } (
-          [
-            curl
-            libevent
-            openssl
-            pcre
-            zlib
-            libnatpmp
-            miniupnpc
-          ]
-          ++ lib.optionals enableSystemd [ systemd ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
-        )
-      }"
-      r @{PROC}/sys/kernel/random/uuid,
-      r @{PROC}/sys/vm/overcommit_memory,
-      r @{PROC}/@{pid}/environ,
-      r @{PROC}/@{pid}/mounts,
-      rwk /tmp/tr_session_id_*,
-
-      r $out/share/transmission/web/**,
-
-      include <local/bin.transmission-daemon>
-    }
-    EOF
-  '';
-
-  env = {
-    # Fix GCC 14 build
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-  };
-
-  passthru.tests = {
-    apparmor = nixosTests.transmission_3; # starts the service with apparmor enabled
-    smoke-test = nixosTests.bittorrent;
-  };
-
-  meta = {
-    description = "Fast, easy and free BitTorrent client (deprecated version 3)";
-    mainProgram =
-      if enableQt then
-        "transmission-qt"
-      else if enableGTK3 then
-        "transmission-gtk"
-      else
-        "transmission-cli";
-    longDescription = ''
-      Transmission is a BitTorrent client which features a simple interface
-      on top of a cross-platform back-end.
-      Feature spotlight:
-        * Uses fewer resources than other clients
-        * Native Mac, GTK and Qt GUI clients
-        * Daemon ideal for servers, embedded systems, and headless use
-        * All these can be remote controlled by Web and Terminal clients
-        * Bluetack (PeerGuardian) blocklists with automatic updates
-        * Full encryption, DHT, and PEX support
-    '';
-    homepage = "http://www.transmissionbt.com/";
-    license = lib.licenses.gpl2Plus; # parts are under MIT
-    platforms = lib.platforms.unix;
-  };
-
-})
diff --git a/pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch b/pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch
deleted file mode 100644
index 66de8f9bf510..000000000000
--- a/pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
-index c9e248a379...c7b2580bcb 100644
---- a/libtransmission/upnp.c
-+++ b/libtransmission/upnp.c
-@@ -194,8 +194,13 @@
- 
-         errno = 0;
- 
-+#if (MINIUPNPC_API_VERSION >= 18)
-         if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, handle->lanaddr,
-+            sizeof(handle->lanaddr), NULL, 0) == UPNP_IGD_VALID_CONNECTED)
-+#else
-+        if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, handle->lanaddr,
-             sizeof(handle->lanaddr)) == UPNP_IGD_VALID_CONNECTED)
-+#endif
-         {
-             tr_logAddNamedInfo(getKey(), _("Found Internet Gateway Device \"%s\""), handle->urls.controlURL);
-             tr_logAddNamedInfo(getKey(), _("Local Address is \"%s\""), handle->lanaddr);
diff --git a/pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch b/pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch
deleted file mode 100644
index f288298cbf3d..000000000000
--- a/pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 15 May 2022 10:54:38 -0400
-Subject: [PATCH] openssl: load "legacy" provider for RC4
-
----
- libtransmission/crypto-utils-openssl.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
-index 45fd71913..14d680654 100644
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -20,6 +20,9 @@
- #include <openssl/rand.h>
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
-+#if OPENSSL_VERSION_MAJOR >= 3
-+#include <openssl/provider.h>
-+#endif
- 
- #include "transmission.h"
- #include "crypto-utils.h"
-@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle)
- 
- tr_rc4_ctx_t tr_rc4_new(void)
- {
-+#if OPENSSL_VERSION_MAJOR >= 3
-+    OSSL_PROVIDER_load(NULL, "default");
-+    OSSL_PROVIDER_load(NULL, "legacy");
-+#endif
-     EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new();
- 
-     if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1)))
--- 
-2.35.1
-
diff --git a/pkgs/by-name/tr/trashy/package.nix b/pkgs/by-name/tr/trashy/package.nix
index 372878772b22..29f0bf8cc70b 100644
--- a/pkgs/by-name/tr/trashy/package.nix
+++ b/pkgs/by-name/tr/trashy/package.nix
@@ -24,6 +24,8 @@ rustPlatform.buildRustPackage rec {
       --bash <($out/bin/trash completions bash) \
       --fish <($out/bin/trash completions fish) \
       --zsh <($out/bin/trash completions zsh) \
+
+    installManPage --name trashy.1 <($out/bin/trash manpage)
   '';
 
   meta = {
diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/by-name/tr/traverso/package.nix
similarity index 54%
rename from pkgs/applications/audio/traverso/default.nix
rename to pkgs/by-name/tr/traverso/package.nix
index d58ccbf940f0..d17f129eed4f 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/by-name/tr/traverso/package.nix
@@ -1,7 +1,7 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
-  fetchurl,
+  fetchgit,
   cmake,
   pkg-config,
   alsa-lib,
@@ -15,21 +15,25 @@
   libsndfile,
   libvorbis,
   portaudio,
-  qtbase,
+  qt6,
   wavpack,
 }:
-mkDerivation {
+stdenv.mkDerivation {
   pname = "traverso";
-  version = "0.49.6";
+  version = "0-unstable-2024-09-28";
 
-  src = fetchurl {
-    url = "https://traverso-daw.org/traverso-0.49.6.tar.gz";
-    sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q";
+  src = fetchgit {
+    url = "https://git.savannah.nongnu.org/git/traverso.git";
+    rev = "f34717623a8d19dd7c04d9604ef4468734140abc";
+    hash = "sha256-eobQFJohndwQjXRXBAehkTWS9jR/1bQOjrOF1XJN5L4=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
@@ -43,7 +47,7 @@ mkDerivation {
     libsndfile.dev
     libvorbis
     portaudio
-    qtbase
+    qt6.qtbase
     wavpack
   ];
 
@@ -54,17 +58,16 @@ mkDerivation {
     "-DWANT_LV2=0"
   ];
 
-  hardeningDisable = [ "format" ];
-
-  meta = with lib; {
+  meta = {
     description = "Cross-platform multitrack audio recording and audio editing suite";
     mainProgram = "traverso";
-    homepage = "https://traverso-daw.org/";
-    license = with licenses; [
+    homepage = "https://savannah.nongnu.org/projects/traverso";
+    license = with lib.licenses; [
       gpl2Plus
       lgpl21Plus
     ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ coconnor ];
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
+    maintainers = with lib.maintainers; [ coconnor ];
   };
 }
diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix
index bce2583cba1e..ea0a7e425e12 100644
--- a/pkgs/by-name/tr/trdl-client/package.nix
+++ b/pkgs/by-name/tr/trdl-client/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "trdl-client";
-  version = "0.12.0";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "trdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CVJdnGrQRaenQ8/1EzUr6BNc0DtfAL1fLVfqJzy5A3Q=";
+    hash = "sha256-0hyo32LjPG/Zu0n1WHg7O3f9blxiGUkfUD1i/80UIRE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/client";
diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index c4fd225003d6..26228e5e77d4 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.83.17";
+  version = "2.84.11";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mJuafIfRfyhD8yMqAjM749qbLqX4n+Gq53YZKCibB7A=";
+    hash = "sha256-x42s6h0niDUnFqqi/t8Mn/FdncivlI7ApTmo6TIx1aE=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/tr/treefmt/package.nix b/pkgs/by-name/tr/treefmt/package.nix
index af54b60210c4..e38f05966a46 100644
--- a/pkgs/by-name/tr/treefmt/package.nix
+++ b/pkgs/by-name/tr/treefmt/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "treefmt";
-  version = "2.3.1";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "treefmt";
     rev = "v${version}";
-    hash = "sha256-Z1AGLaGrRrUd75aQJc/UKwzMGb9gI/p5WxQ5XUgp98o=";
+    hash = "sha256-Okwwu5ls3BwLtm8qaq+QX3P+6uwuodV82F3j38tuszk=";
   };
 
-  vendorHash = "sha256-9yAvqz99YlBfFU/hGs1PB/sH0iOyWaVadqGhfXMkj5E=";
+  vendorHash = "sha256-fiBpyhbkzyhv7i4iHDTsgFcC/jx6onOzGP/YMcUAe9I=";
 
   subPackages = [ "." ];
 
diff --git a/pkgs/by-name/tr/trelby/package.nix b/pkgs/by-name/tr/trelby/package.nix
index bce17334a878..d135f1c589a7 100644
--- a/pkgs/by-name/tr/trelby/package.nix
+++ b/pkgs/by-name/tr/trelby/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "trelby";
-  version = "2.4.15";
+  version = "2.4.16.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "trelby";
     repo = "trelby";
     tag = version;
-    hash = "sha256-CTasd+YlRHjYUVepZf2RDOuw1p0OdQfJENZamSmXXFw=";
+    hash = "sha256-YblilPQXjlSgkBstewfiuW0DZCnJw4dk6vZfEhdBGbk=";
   };
 
   build-system = [
diff --git a/pkgs/by-name/tr/tremc/package.nix b/pkgs/by-name/tr/tremc/package.nix
index 5268128e41fa..213185c421d2 100644
--- a/pkgs/by-name/tr/tremc/package.nix
+++ b/pkgs/by-name/tr/tremc/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   python3Packages,
   x11Support ? !stdenv.hostPlatform.isDarwin,
   xclip ? null,
@@ -10,36 +9,20 @@
   useGeoIP ? false, # Require /var/lib/geoip-databases/GeoIP.dat
 }:
 let
-  wrapperPath = lib.makeBinPath (
-    lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy
-  );
+  version = "0.9.5";
 in
-python3Packages.buildPythonApplication rec {
+python3Packages.buildPythonApplication {
   pname = "tremc";
-  version = "0.9.3";
-  format = "other";
+  inherit version;
+  pyproject = false;
 
   src = fetchFromGitHub {
     owner = "tremc";
     repo = "tremc";
-    rev = version;
-    hash = "sha256-219rntmetmj1JFG+4NyYMFTWmrHKJL7fnLoMIvnTP4Y=";
+    tag = version;
+    hash = "sha256-t7GH3flTLN8O+nnv/kwwzu5x3VoCyF11bqb1EJ8LQs8=";
   };
 
-  patches = [
-    # Remove when tremc > 0.9.3 is released
-    (fetchpatch {
-      url = "https://github.com/tremc/tremc/commit/a8aaf9a6728a9ef3d8f13b3603456b0086122891.patch";
-      hash = "sha256-+HYdWTbcpvZqjshdHLZ+Svmr6U/aKFc3sy0aka6rn/A=";
-      name = "support-transmission-4.patch";
-    })
-  ];
-
-  buildInputs = with python3Packages; [
-    python
-    wrapPython
-  ];
-
   pythonPath =
     with python3Packages;
     [
@@ -51,18 +34,19 @@ python3Packages.buildPythonApplication rec {
   dontBuild = true;
   doCheck = false;
 
-  makeWrapperArgs = [ "--prefix PATH : ${lib.escapeShellArg wrapperPath}" ];
+  makeFlags = [ "DESTDIR=${placeholder "out"}" ];
 
-  installPhase = ''
-    make DESTDIR=$out install
-    wrapPythonPrograms
-  '';
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath (lib.optional x11Support xclip ++ lib.optional stdenv.hostPlatform.isDarwin pbcopy)
+    }"
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Curses interface for transmission";
     mainProgram = "tremc";
     homepage = "https://github.com/tremc/tremc";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ kashw2 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ kashw2 ];
   };
 }
diff --git a/pkgs/by-name/tr/trenchbroom/package.nix b/pkgs/by-name/tr/trenchbroom/package.nix
deleted file mode 100644
index bc7a43919e18..000000000000
--- a/pkgs/by-name/tr/trenchbroom/package.nix
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  writeText,
-  cmake,
-  ninja,
-  curl,
-  git,
-  pandoc,
-  pkg-config,
-  unzip,
-  zip,
-  libGL,
-  libGLU,
-  freeimage,
-  freetype,
-  assimp,
-  catch2,
-  fmt,
-  glew,
-  miniz,
-  tinyxml-2,
-  xorg,
-  qt6,
-  copyDesktopItems,
-  makeDesktopItem,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "TrenchBroom";
-  version = "2025.2";
-
-  src = fetchFromGitHub {
-    owner = "TrenchBroom";
-    repo = "TrenchBroom";
-    tag = "v${version}";
-    hash = "sha256-aOHhL0yBDgFTMcDY7RKZXRrReRiThcQdf7QMHEpRuks=";
-    fetchSubmodules = true;
-  };
-
-  # Manually simulate a vcpkg installation so that it can link the libraries
-  # properly.
-  postUnpack =
-    let
-      vcpkg_target = "x64-linux";
-
-      vcpkg_pkgs = [
-        "assimp"
-        "catch2"
-        "fmt"
-        "freeimage"
-        "freetype"
-        "glew"
-        "miniz"
-        "tinyxml2"
-      ];
-
-      updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" (
-        lib.concatMapStringsSep "\n" (name: ''
-          Package : ${name}
-          Architecture : ${vcpkg_target}
-          Version : 1.0
-          Status : is installed
-        '') vcpkg_pkgs
-      );
-    in
-    ''
-      export VCPKG_ROOT="$TMP/vcpkg"
-
-      mkdir -p $VCPKG_ROOT/.vcpkg-root
-      mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
-      mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
-      ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
-      mkdir -p $VCPKG_ROOT/installed/vcpkg/info
-      ${lib.concatMapStrings (name: ''
-        touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list
-      '') vcpkg_pkgs}
-
-      ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-    '';
-
-  postPatch = ''
-    substituteInPlace common/src/Version.h.in \
-      --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
-      --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
-      --subst-var-by GIT_DESCRIBE v${version}
-    substituteInPlace app/CMakeLists.txt \
-      --replace-fail 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")'
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    curl
-    git
-    pandoc
-    qt6.wrapQtAppsHook
-    copyDesktopItems
-    pkg-config
-    unzip
-    zip
-  ];
-
-  buildInputs = [
-    libGL
-    libGLU
-    xorg.libXxf86vm
-    xorg.libSM
-    freeimage
-    freetype
-    qt6.qtbase
-    qt6.qtwayland
-    qt6.qtsvg
-    catch2
-    fmt
-    glew
-    miniz
-    tinyxml-2
-    assimp
-  ];
-
-  QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}";
-
-  QT_QPA_PLATFORM = "offscreen";
-
-  cmakeFlags = [
-    "-DCMAKE_MAKE_PROGRAM=ninja"
-    "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
-    "-DVCPKG_MANIFEST_INSTALL=OFF"
-    # https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780
-    "-DCMAKE_PREFIX_PATH=cmake/packages"
-  ];
-
-  ninjaFlags = [ "TrenchBroom" ];
-
-  postInstall = ''
-    pushd ../app/resources/linux/icons
-
-    for F in icon_*.png; do
-      SIZE=$(echo $F|sed -e s/icon_// -e s/.png//)
-      DIR=$out/share/icons/hicolor/$SIZE"x"$SIZE/apps
-      install -Dm644 $F $DIR/trenchbroom.png
-    done
-
-    popd
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "TrenchBroom";
-      desktopName = "TrenchBroom level editor";
-      icon = "trenchbroom";
-      comment = meta.description;
-      categories = [ "Development" ];
-      exec = "trenchbroom";
-    })
-  ];
-
-  meta = {
-    homepage = "https://trenchbroom.github.io/";
-    changelog = "https://github.com/TrenchBroom/TrenchBroom/releases/tag/v${version}";
-    description = "Level editor for Quake-engine based games";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ astro ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index 6b460db45daf..a50a7d9341c7 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.9.3";
+  version = "25.10.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-mDEqlIxDKHD2xcwcnvehMJExytNBmvhp5iDIKBb/FfxY44We6SAknsocbeWPqq5XLkUbFjjG07IWGtZzdqTj7A==";
-        x86_64-linux = "sha512-rxCTYvi+I5ymlS9N4Y2ffIt5ZSgXf6U24mNKe1FNo5++6NfCXFf4vMWJreQ2TNUHsa8V0IixXrtar7AdWCpYQQ==";
+        aarch64-linux = "sha512-0fGDyJ+l6TIaf3+tvS6ei18+JyNKqWLuH5rn1MSwdcpGW+5PeVj7nfHk0NVsKH+oeNpUQ9JXDlNKOmLH/eCxRg==";
+        x86_64-linux = "sha512-0gWpCbVcD42xJCfABesX7ylJpO7AIK/vM81z+EB83taPkgJ2yJBB71NxvDlVBjTCX8Am5INWOPRnnOFGKLQ7gA==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix
index 8fcbc3aa3ff2..17cd26773c38 100644
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -1,26 +1,23 @@
 {
   lib,
-  stdenv,
   python312,
-  makeWrapper,
   nix-update-script,
   fetchFromGitHub,
-  rustPlatform,
   buildNpmPackage,
   nodejs_24,
   wrapGAppsHook3,
   libappindicator-gtk3,
 }:
 let
-  version = "8.2.3";
+  version = "8.2.3-unstable-2025-10-14";
   python3 = python312;
   nodejs = nodejs_24;
 
   src = fetchFromGitHub {
     owner = "tribler";
     repo = "Tribler";
-    tag = "v${version}";
-    hash = "sha256-yThl3HhPtwi/pK5Rcr2ClVLY8uCnIyfvdc53A8gjKDg=";
+    rev = "3e5bc56a15c568d0ba41262cad63155445e062da";
+    hash = "sha256-zGh2nVcJyOwVfPEdU8ZDgANFt0KnTqEXU3I3ZOGot2c=";
   };
 
   tribler-webui = buildNpmPackage {
@@ -59,7 +56,6 @@ python3.pkgs.buildPythonApplication {
 
   dependencies = with python3.pkgs; [
     # requirements.txt
-    bitarray
     configobj
     pyipv8
     ipv8-rust-tunnels
@@ -68,12 +64,17 @@ python3.pkgs.buildPythonApplication {
     pillow
     pony
     pystray
+
+    # build/requirements.txt
+    cx-freeze
+    requests
   ];
 
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
   buildInputs = with python3.pkgs; [
     # setup.py requirements
     pygobject3
-    setuptools
     # sphinx requirements
     sphinxHook
     sphinx
@@ -81,43 +82,40 @@ python3.pkgs.buildPythonApplication {
     sphinx-rtd-theme
     astroid
     # tray icon deps
-    wrapGAppsHook3
     libappindicator-gtk3
     # test phase requirements
     pytestCheckHook
-
   ];
 
   outputs = [
     "out"
   ];
 
+  postPatch = ''
+    # fix the entrypoint
+    substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"'
+    substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():'
+
+    # ValueError: ZIP does not support timestamps before 1980
+    substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:"
+
+    # copy the built webui
+    rm -r src/tribler/ui
+    ln -s ${tribler-webui} src/tribler/ui
+  '';
+
   buildPhase = ''
-          # fix the entrypoint
-          substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"'
-          substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():'
+    runHook preBuild
 
-          # copy the built webui
-          rm -r src/tribler/ui
-          ln -s ${tribler-webui} src/tribler/ui
+    export GITHUB_TAG=v${version}
+    python3 build/debian/update_metainfo.py
+    python3 build/setup.py bdist_wheel
 
-          # build the docs
-    # FIXME:      make doc SPHINXBUILD=${lib.getExe' python3.pkgs.sphinx "sphinx-build"}
-
-          # build the wheel
-          substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:"
-          export GITHUB_TAG=v${version}
-          python3 build/debian/update_metainfo.py
-          python3 build/setup.py bdist_wheel
-
-        runHook pytestCheckHook
-
-          # build the docs
-        runHook sphinxHook
+    runHook postBuild
   '';
 
   postInstall = ''
-    ln -s ${tribler-webui} $out/lib/python3.12/site-packages/tribler/ui
+    ln -s ${tribler-webui} $out/lib/python*/site-packages/tribler/ui
   '';
 
   preFixup = ''
@@ -126,10 +124,6 @@ python3.pkgs.buildPythonApplication {
     )
   '';
 
-  postFixup = ''
-    runHook wrapGAppsHook3
-  '';
-
   disabledTests = [
     "test_request_for_version"
     "test_establish_connection"
@@ -139,9 +133,6 @@ python3.pkgs.buildPythonApplication {
     "test_get_set_explicit"
   ];
 
-  disabledTestPaths = [
-  ];
-
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix
index 0e2f3c3a2b69..c1b89dd2e06b 100644
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "trickest-cli";
-  version = "2.1.4";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "trickest";
     repo = "trickest-cli";
     tag = "v${version}";
-    hash = "sha256-zE52gBcajw62sSyjd50PDiC6cTLQl8r18UL2XIoLkY0=";
+    hash = "sha256-4KVrDUmart2jGKFOGmHeBoy8ctA5wOYNRt2Udrf82/I=";
   };
 
   vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo=";
diff --git a/pkgs/by-name/tr/trilinos/package.nix b/pkgs/by-name/tr/trilinos/package.nix
index 45331a18cc98..062ed1ef2561 100644
--- a/pkgs/by-name/tr/trilinos/package.nix
+++ b/pkgs/by-name/tr/trilinos/package.nix
@@ -60,15 +60,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "trilinos";
-  # Xyce 7.4 requires version 12.12.1
-  # nixpkgs-update: no auto update
-  version = "12.12.1";
+  version = "16.1.0";
 
   src = fetchFromGitHub {
     owner = "trilinos";
     repo = "Trilinos";
     tag = "trilinos-release-${lib.replaceStrings [ "." ] [ "-" ] version}";
-    sha256 = "sha256-Nqjr7RAlUHm6vs87a1P84Y7BIZEL0Vs/A1Z6dykfv+o=";
+    hash = "sha256-9Yn79kt7JHS30lc+qImSbLOU3Cdb87S3xmlm3v9G1uo=";
   };
 
   nativeBuildInputs = [
@@ -95,11 +93,6 @@ stdenv.mkDerivation rec {
         cmakeFlagsArray+=(${flagsBase})
       '';
 
-  postInstall = ''
-    # remove dangling symlink
-    rm $out/lib/cmake/tribits/doc/developers_guide/TribitsBuildReference.html
-  '';
-
   passthru = {
     inherit withMPI;
   };
diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index 151a132289ad..09fef4b4181d 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "trilium-desktop";
-  version = "0.99.1";
+  version = "0.99.3";
 
   triliumSource = os: arch: hash: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.hash = "sha256-cn1Y6wMYoVCuNNdAxesNKcZiRo2uKGV8nL6yK1KtNP8=";
-  aarch64-linux.hash = "sha256-KhSSrdITpbGiIAEkdNfRAoIlhC2uUV6+8ZUaEYW7dyA=";
-  x86_64-darwin.hash = "sha256-jKAZnCtNEEnvJ6p6lziOG7+uAyMuEel4dAKRXvMHo8c=";
-  aarch64-darwin.hash = "sha256-1p0rUoZPunP3fRgn/EO3obdGp6l5BbsfZyKMlsgrl80=";
+  x86_64-linux.hash = "sha256-xq0T2Qi6kabKD66eY7GERE4VB5cXy+1Oixh1Q7O4Eh4=";
+  aarch64-linux.hash = "sha256-QjhmvwoX7N8HjUEStUGuJUA2MndrS6RsA68JhZqZLBQ=";
+  x86_64-darwin.hash = "sha256-jXT8EuKn9vmXyFInwvWOjKz92+XdZplHw4zA09mamZk=";
+  aarch64-darwin.hash = "sha256-N0aKPfUd8oV5QQ1IrAdnxff1fB6QCT09QSAqAcCeyHU=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
index 8aaf775d5145..cca71a873286 100644
--- a/pkgs/by-name/tr/trilium-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.99.1";
+  version = "0.99.3";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.hash = "sha256-4DiPgWKXzVMm6JTBnJGOZrQLOIjQQvxkNvcawkzsg4M=";
+  serverSource_x64.hash = "sha256-WcyLXpVfVzKFj0pvC4j+0Hx3eSUC0euwfkKIQ2qxCN8=";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.hash = "sha256-dyf6t2y1RO6+NCPDAD19DocAYchkIgV+x4Shn3BNEK8=";
+  serverSource_arm64.hash = "sha256-SUcv9N4/mSqDAAWjlB1bG6y7/PQpqwOte7UniN8SwZI=";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then
diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index b87fb6801510..1f060203854d 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://trippy.cli.rs";
     changelog = "https://github.com/fujiapple852/trippy/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "trip";
   };
 }
diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index 4d5a074dc4f9..08fa92c2bb99 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.90.9";
+  version = "3.90.12";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${version}";
-    hash = "sha256-XxFgki6haUbfHkhOMuYJW8zNBsJ6a8Rir7s6GqLTbho=";
+    hash = "sha256-r+j9YnRKQ5m7XLavM5rARRZwDiNTcGmxpL6Sv8eTZLE=";
   };
 
-  vendorHash = "sha256-pP8dT211fq/y5Z0poLqJngCY45ba1vJilmkpgnCUHhY=";
+  vendorHash = "sha256-zQ67yLN/HCshOndP/FAUOOyiQpOjyOJChkZZmFb06WM=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix
index 053e58c8b29d..8d0dcad7b22e 100644
--- a/pkgs/by-name/tr/trurl/package.nix
+++ b/pkgs/by-name/tr/trurl/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   curl,
   python3,
   perl,
@@ -20,6 +21,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-VCMT4WgZ6LG7yiKaRy7KTgTkbACVXb4rw62lWnVAuP0=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/curl/trurl/commit/f22a2c45956f35702e437fb83ac05376f1956ec5.patch";
+      hash = "sha256-7CkUs5tMk77WKc7SlgE2NslHtU5cViKSGhHj3IBlpWo=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs scripts/*
   '';
diff --git a/pkgs/by-name/tr/trustymail/package.nix b/pkgs/by-name/tr/trustymail/package.nix
index 38c1ae1066d3..7bf821b7025e 100644
--- a/pkgs/by-name/tr/trustymail/package.nix
+++ b/pkgs/by-name/tr/trustymail/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "trustymail";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cisagov";
     repo = "trustymail";
     tag = "v${version}";
-    hash = "sha256-t8Z/jMCqxqCpurQWejT7tnW9l0xMkgsD6Dfe5PZ9OqA=";
+    hash = "sha256-EA8RomXREDAHZIuq8x+t6w7V1ErUOuuo0TUyaxIgdR8=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];
diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix
index 2a4ba92e82cd..8194ae38e2f1 100644
--- a/pkgs/by-name/tr/trzsz-ssh/package.nix
+++ b/pkgs/by-name/tr/trzsz-ssh/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "trzsz-ssh";
-  version = "0.1.22";
+  version = "0.1.23";
 
   src = fetchFromGitHub {
     owner = "trzsz";
     repo = "trzsz-ssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VvPdWRP+lrhho+Bk5rT9pktEvKe01512WoDfAu5d868=";
+    hash = "sha256-Cp5XI7ggpt48llojcmarYPi9mTM+YBqwjG/eNAnKTxc=";
   };
 
-  vendorHash = "sha256-EllXxDyWI4Dy5E6KnzYFxuYDQcdk9+01v5svpARZU44=";
+  vendorHash = "sha256-pI9BlttS9a1XrgBBmUd+h529fLbsbwSMwjKn4P50liE=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ts/tsid/package.nix b/pkgs/by-name/ts/tsid/package.nix
index bdc1bae1acd9..d9d38e929fcd 100644
--- a/pkgs/by-name/ts/tsid/package.nix
+++ b/pkgs/by-name/ts/tsid/package.nix
@@ -9,23 +9,21 @@
   pinocchio,
   proxsuite,
   stdenv,
-  pythonSupport ? false,
-  python3Packages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tsid";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "tsid";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SS6JhU4fuZtTzv/EY31ixwwLOzmO/dN3H5HEMh/URTA=";
+    hash = "sha256-enSYneV/Av7lF8ADdLqU1Wj2z8/ePocgecFtOBXS0EY=";
   };
 
   cmakeFlags = [
-    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" pythonSupport)
+    (lib.cmakeBool "BUILD_PYTHON_INTERFACE" false)
     (lib.cmakeBool "BUILD_WITH_OSQP" true)
     (lib.cmakeBool "BUILD_WITH_PROXQP" true)
     (lib.cmakeBool "INSTALL_DOCUMENTATION" true)
@@ -40,22 +38,16 @@ stdenv.mkDerivation (finalAttrs: {
     doxygen
     cmake
     pkg-config
-  ]
-  ++ lib.optionals pythonSupport [
-    python3Packages.python
-    python3Packages.pythonImportsCheckHook
   ];
 
   propagatedBuildInputs = [
     eiquadprog
     osqp-eigen
+    pinocchio
     proxsuite
-  ]
-  ++ lib.optional (!pythonSupport) pinocchio
-  ++ lib.optional pythonSupport python3Packages.pinocchio;
+  ];
 
   doCheck = true;
-  pythonImportsCheck = [ "tsid" ];
 
   meta = {
     description = "Efficient Task Space Inverse Dynamics (TSID) based on Pinocchio";
diff --git a/pkgs/by-name/ts/tslib/package.nix b/pkgs/by-name/ts/tslib/package.nix
index b4e4a575dd01..ec21279b1272 100644
--- a/pkgs/by-name/ts/tslib/package.nix
+++ b/pkgs/by-name/ts/tslib/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-2YJDADh/WCksAEIjngAdji98YGmwjpvxSBZkxAwFc7k=";
   };
 
+  patches = [
+    # CMake 4 dropped support of versions lower than 3.5
+    ./tslib-1.23-cmake4.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   passthru.updateScript = nix-update-script { };
diff --git a/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch
new file mode 100644
index 000000000000..d9f6b3ce0c5d
--- /dev/null
+++ b/pkgs/by-name/ts/tslib/tslib-1.23-cmake4.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -8,7 +8,7 @@
+ #
+ #
+ 
+-cmake_minimum_required(VERSION 3.3)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project(tslib LANGUAGES C)
+ 
\ No newline at end of file
diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix
index dc6d877f7a02..3733045c7d62 100644
--- a/pkgs/by-name/tt/tt-metal/package.nix
+++ b/pkgs/by-name/tt/tt-metal/package.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
     (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true)
     (lib.cmakeFeature "VERSION_NUMERIC" finalAttrs.version)
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix
index 5ca4733fbc76..f160bd9ec15a 100644
--- a/pkgs/by-name/tt/ttop/package.nix
+++ b/pkgs/by-name/tt/ttop/package.nix
@@ -35,7 +35,6 @@ buildNimPackage (finalAttrs: {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      figsoda
       sikmir
     ];
     mainProgram = "ttop";
diff --git a/pkgs/by-name/tt/tts-mod-vault/package.nix b/pkgs/by-name/tt/tts-mod-vault/package.nix
new file mode 100644
index 000000000000..4f0e5c19a2ac
--- /dev/null
+++ b/pkgs/by-name/tt/tts-mod-vault/package.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  flutter329,
+  makeDesktopItem,
+  copyDesktopItems,
+  fetchFromGitHub,
+}:
+
+flutter329.buildFlutterApplication rec {
+  pname = "tts-mod-vault";
+  version = "1.3.0";
+
+  src = fetchFromGitHub {
+    owner = "markomijic";
+    repo = "TTS-Mod-Vault";
+    tag = "v${version}";
+    hash = "sha256-BTs+4QeyVJeg415uiNXww8twQwUInHfB8voWJjeVs20=";
+  };
+
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "tts-mod-vault";
+      exec = "tts-mod-vault";
+      icon = "tts-mod-vault";
+      comment = "Tabletop Simulator Mod Vault";
+      desktopName = "TTS Mod Vault";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  nativeBuildInputs = [ copyDesktopItems ];
+
+  postInstall = ''
+    install -m 444 -D assets/icon/tts_mod_vault_icon.png $out/share/icons/hicolor/1024x1024/apps/tts-mod-vault.png
+  '';
+
+  meta = {
+    description = "Download and backup assets for your Tabletop Simulator mods";
+    homepage = "https://github.com/markomijic/TTS-Mod-Vault";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ esch ];
+    mainProgram = "tts-mod-vault";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
new file mode 100644
index 000000000000..8e0693d40d25
--- /dev/null
+++ b/pkgs/by-name/tt/tts-mod-vault/pubspec.lock.json
@@ -0,0 +1,1278 @@
+{
+    "packages": {
+        "_fe_analyzer_shared": {
+            "dependency": "transitive",
+            "description": {
+                "name": "_fe_analyzer_shared",
+                "sha256": "f0bb5d1648339c8308cc0b9838d8456b3cfe5c91f9dc1a735b4d003269e5da9a",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "88.0.0"
+        },
+        "analyzer": {
+            "dependency": "transitive",
+            "description": {
+                "name": "analyzer",
+                "sha256": "0b7b9c329d2879f8f05d6c05b32ee9ec025f39b077864bdb5ac9a7b63418a98f",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "8.1.1"
+        },
+        "archive": {
+            "dependency": "direct main",
+            "description": {
+                "name": "archive",
+                "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.0.7"
+        },
+        "args": {
+            "dependency": "transitive",
+            "description": {
+                "name": "args",
+                "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.7.0"
+        },
+        "async": {
+            "dependency": "transitive",
+            "description": {
+                "name": "async",
+                "sha256": "d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.12.0"
+        },
+        "boolean_selector": {
+            "dependency": "transitive",
+            "description": {
+                "name": "boolean_selector",
+                "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.2"
+        },
+        "bson": {
+            "dependency": "direct main",
+            "description": {
+                "name": "bson",
+                "sha256": "f8c80be7a62a88f4add7c48cc83567c36a77532de107224df8328ef71f125045",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "5.0.7"
+        },
+        "build": {
+            "dependency": "transitive",
+            "description": {
+                "name": "build",
+                "sha256": "5b887c55a0f734b433b3b2d89f9cd1f99eb636b17e268a5b4259258bc916504b",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.0.0"
+        },
+        "build_config": {
+            "dependency": "transitive",
+            "description": {
+                "name": "build_config",
+                "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.2.0"
+        },
+        "build_daemon": {
+            "dependency": "transitive",
+            "description": {
+                "name": "build_daemon",
+                "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.0.4"
+        },
+        "build_runner": {
+            "dependency": "direct dev",
+            "description": {
+                "name": "build_runner",
+                "sha256": "804c47c936df75e1911c19a4fb8c46fa8ff2b3099b9f2b2aa4726af3774f734b",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.8.0"
+        },
+        "built_collection": {
+            "dependency": "transitive",
+            "description": {
+                "name": "built_collection",
+                "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "5.1.1"
+        },
+        "built_value": {
+            "dependency": "transitive",
+            "description": {
+                "name": "built_value",
+                "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "8.12.0"
+        },
+        "characters": {
+            "dependency": "transitive",
+            "description": {
+                "name": "characters",
+                "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.4.0"
+        },
+        "checked_yaml": {
+            "dependency": "transitive",
+            "description": {
+                "name": "checked_yaml",
+                "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.0.3"
+        },
+        "cli_util": {
+            "dependency": "transitive",
+            "description": {
+                "name": "cli_util",
+                "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.4.2"
+        },
+        "clock": {
+            "dependency": "transitive",
+            "description": {
+                "name": "clock",
+                "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.1.2"
+        },
+        "code_builder": {
+            "dependency": "transitive",
+            "description": {
+                "name": "code_builder",
+                "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.11.0"
+        },
+        "collection": {
+            "dependency": "direct main",
+            "description": {
+                "name": "collection",
+                "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.19.1"
+        },
+        "convert": {
+            "dependency": "transitive",
+            "description": {
+                "name": "convert",
+                "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.1.2"
+        },
+        "cross_file": {
+            "dependency": "transitive",
+            "description": {
+                "name": "cross_file",
+                "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.3.4+2"
+        },
+        "crypto": {
+            "dependency": "transitive",
+            "description": {
+                "name": "crypto",
+                "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.0.6"
+        },
+        "dart_style": {
+            "dependency": "transitive",
+            "description": {
+                "name": "dart_style",
+                "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.1.2"
+        },
+        "dbus": {
+            "dependency": "transitive",
+            "description": {
+                "name": "dbus",
+                "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.7.11"
+        },
+        "decimal": {
+            "dependency": "transitive",
+            "description": {
+                "name": "decimal",
+                "sha256": "fc706a5618b81e5b367b01dd62621def37abc096f2b46a9bd9068b64c1fa36d0",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.2.4"
+        },
+        "dio": {
+            "dependency": "direct main",
+            "description": {
+                "name": "dio",
+                "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "5.9.0"
+        },
+        "dio_web_adapter": {
+            "dependency": "transitive",
+            "description": {
+                "name": "dio_web_adapter",
+                "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.1"
+        },
+        "fake_async": {
+            "dependency": "transitive",
+            "description": {
+                "name": "fake_async",
+                "sha256": "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.3.2"
+        },
+        "ffi": {
+            "dependency": "transitive",
+            "description": {
+                "name": "ffi",
+                "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.4"
+        },
+        "file": {
+            "dependency": "transitive",
+            "description": {
+                "name": "file",
+                "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "7.0.1"
+        },
+        "file_picker": {
+            "dependency": "direct main",
+            "description": {
+                "name": "file_picker",
+                "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "10.3.3"
+        },
+        "fixnum": {
+            "dependency": "transitive",
+            "description": {
+                "name": "fixnum",
+                "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.1.1"
+        },
+        "flutter": {
+            "dependency": "direct main",
+            "description": "flutter",
+            "source": "sdk",
+            "version": "0.0.0"
+        },
+        "flutter_archive": {
+            "dependency": "direct main",
+            "description": {
+                "name": "flutter_archive",
+                "sha256": "5ca235f304c12bf468979235f400f79846d204169d715939e39197106f5fc970",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.0.3"
+        },
+        "flutter_hooks": {
+            "dependency": "direct main",
+            "description": {
+                "name": "flutter_hooks",
+                "sha256": "b772e710d16d7a20c0740c4f855095026b31c7eb5ba3ab67d2bd52021cd9461d",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.21.2"
+        },
+        "flutter_launcher_icons": {
+            "dependency": "direct dev",
+            "description": {
+                "name": "flutter_launcher_icons",
+                "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.14.4"
+        },
+        "flutter_lints": {
+            "dependency": "direct dev",
+            "description": {
+                "name": "flutter_lints",
+                "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "5.0.0"
+        },
+        "flutter_localizations": {
+            "dependency": "direct main",
+            "description": "flutter",
+            "source": "sdk",
+            "version": "0.0.0"
+        },
+        "flutter_plugin_android_lifecycle": {
+            "dependency": "transitive",
+            "description": {
+                "name": "flutter_plugin_android_lifecycle",
+                "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.0.30"
+        },
+        "flutter_riverpod": {
+            "dependency": "transitive",
+            "description": {
+                "name": "flutter_riverpod",
+                "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.6.1"
+        },
+        "flutter_test": {
+            "dependency": "direct dev",
+            "description": "flutter",
+            "source": "sdk",
+            "version": "0.0.0"
+        },
+        "flutter_web_plugins": {
+            "dependency": "transitive",
+            "description": "flutter",
+            "source": "sdk",
+            "version": "0.0.0"
+        },
+        "frontend_server_client": {
+            "dependency": "transitive",
+            "description": {
+                "name": "frontend_server_client",
+                "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.0.0"
+        },
+        "glob": {
+            "dependency": "transitive",
+            "description": {
+                "name": "glob",
+                "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.3"
+        },
+        "graphs": {
+            "dependency": "transitive",
+            "description": {
+                "name": "graphs",
+                "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.3.2"
+        },
+        "hive_ce": {
+            "dependency": "direct main",
+            "description": {
+                "name": "hive_ce",
+                "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.13.2"
+        },
+        "hive_ce_flutter": {
+            "dependency": "direct main",
+            "description": {
+                "name": "hive_ce_flutter",
+                "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.3.2"
+        },
+        "hive_ce_generator": {
+            "dependency": "direct dev",
+            "description": {
+                "name": "hive_ce_generator",
+                "sha256": "8c677690c8ead43778ddf7ed8ff17e852dd5d22d082c75182b072842c0dc5055",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.9.5"
+        },
+        "hooks_riverpod": {
+            "dependency": "direct main",
+            "description": {
+                "name": "hooks_riverpod",
+                "sha256": "70bba33cfc5670c84b796e6929c54b8bc5be7d0fe15bb28c2560500b9ad06966",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.6.1"
+        },
+        "http": {
+            "dependency": "direct main",
+            "description": {
+                "name": "http",
+                "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.5.0"
+        },
+        "http_multi_server": {
+            "dependency": "transitive",
+            "description": {
+                "name": "http_multi_server",
+                "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.2.2"
+        },
+        "http_parser": {
+            "dependency": "transitive",
+            "description": {
+                "name": "http_parser",
+                "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.1.2"
+        },
+        "image": {
+            "dependency": "direct main",
+            "description": {
+                "name": "image",
+                "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.5.4"
+        },
+        "intl": {
+            "dependency": "direct main",
+            "description": {
+                "name": "intl",
+                "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.19.0"
+        },
+        "io": {
+            "dependency": "transitive",
+            "description": {
+                "name": "io",
+                "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.0.5"
+        },
+        "isolate_channel": {
+            "dependency": "transitive",
+            "description": {
+                "name": "isolate_channel",
+                "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.2+1"
+        },
+        "json_annotation": {
+            "dependency": "transitive",
+            "description": {
+                "name": "json_annotation",
+                "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.9.0"
+        },
+        "leak_tracker": {
+            "dependency": "transitive",
+            "description": {
+                "name": "leak_tracker",
+                "sha256": "c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "10.0.8"
+        },
+        "leak_tracker_flutter_testing": {
+            "dependency": "transitive",
+            "description": {
+                "name": "leak_tracker_flutter_testing",
+                "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.0.9"
+        },
+        "leak_tracker_testing": {
+            "dependency": "transitive",
+            "description": {
+                "name": "leak_tracker_testing",
+                "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.0.1"
+        },
+        "lints": {
+            "dependency": "transitive",
+            "description": {
+                "name": "lints",
+                "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "5.1.1"
+        },
+        "logging": {
+            "dependency": "transitive",
+            "description": {
+                "name": "logging",
+                "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.3.0"
+        },
+        "matcher": {
+            "dependency": "transitive",
+            "description": {
+                "name": "matcher",
+                "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.12.17"
+        },
+        "material_color_utilities": {
+            "dependency": "transitive",
+            "description": {
+                "name": "material_color_utilities",
+                "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.11.1"
+        },
+        "meta": {
+            "dependency": "transitive",
+            "description": {
+                "name": "meta",
+                "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.16.0"
+        },
+        "mime": {
+            "dependency": "direct main",
+            "description": {
+                "name": "mime",
+                "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.0.0"
+        },
+        "open_filex": {
+            "dependency": "direct main",
+            "description": {
+                "name": "open_filex",
+                "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.7.0"
+        },
+        "package_config": {
+            "dependency": "transitive",
+            "description": {
+                "name": "package_config",
+                "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.2.0"
+        },
+        "package_info_plus": {
+            "dependency": "direct main",
+            "description": {
+                "name": "package_info_plus",
+                "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "9.0.0"
+        },
+        "package_info_plus_platform_interface": {
+            "dependency": "transitive",
+            "description": {
+                "name": "package_info_plus_platform_interface",
+                "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.2.1"
+        },
+        "packages_extensions": {
+            "dependency": "transitive",
+            "description": {
+                "name": "packages_extensions",
+                "sha256": "1fb328695a9828c80d275ce1650a2bb5947690070de082dfa1dfac7429378daf",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.1.1"
+        },
+        "path": {
+            "dependency": "direct main",
+            "description": {
+                "name": "path",
+                "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.9.1"
+        },
+        "path_provider": {
+            "dependency": "direct main",
+            "description": {
+                "name": "path_provider",
+                "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.5"
+        },
+        "path_provider_android": {
+            "dependency": "transitive",
+            "description": {
+                "name": "path_provider_android",
+                "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.2.18"
+        },
+        "path_provider_foundation": {
+            "dependency": "transitive",
+            "description": {
+                "name": "path_provider_foundation",
+                "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.4.2"
+        },
+        "path_provider_linux": {
+            "dependency": "transitive",
+            "description": {
+                "name": "path_provider_linux",
+                "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.2.1"
+        },
+        "path_provider_platform_interface": {
+            "dependency": "transitive",
+            "description": {
+                "name": "path_provider_platform_interface",
+                "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.2"
+        },
+        "path_provider_windows": {
+            "dependency": "transitive",
+            "description": {
+                "name": "path_provider_windows",
+                "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.3.0"
+        },
+        "petitparser": {
+            "dependency": "transitive",
+            "description": {
+                "name": "petitparser",
+                "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.1.0"
+        },
+        "platform": {
+            "dependency": "transitive",
+            "description": {
+                "name": "platform",
+                "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.1.6"
+        },
+        "plugin_platform_interface": {
+            "dependency": "transitive",
+            "description": {
+                "name": "plugin_platform_interface",
+                "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.8"
+        },
+        "pool": {
+            "dependency": "transitive",
+            "description": {
+                "name": "pool",
+                "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.5.2"
+        },
+        "posix": {
+            "dependency": "transitive",
+            "description": {
+                "name": "posix",
+                "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.0.3"
+        },
+        "power_extensions": {
+            "dependency": "transitive",
+            "description": {
+                "name": "power_extensions",
+                "sha256": "ad0e8b2420090d996fe8b7fd32cdf02b9b924b6d4fc0fb0b559ff6aa5e24d5b0",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.3"
+        },
+        "pub_semver": {
+            "dependency": "transitive",
+            "description": {
+                "name": "pub_semver",
+                "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.2.0"
+        },
+        "pubspec_parse": {
+            "dependency": "transitive",
+            "description": {
+                "name": "pubspec_parse",
+                "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.5.0"
+        },
+        "rational": {
+            "dependency": "transitive",
+            "description": {
+                "name": "rational",
+                "sha256": "cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.2.3"
+        },
+        "riverpod": {
+            "dependency": "transitive",
+            "description": {
+                "name": "riverpod",
+                "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.6.1"
+        },
+        "screen_retriever": {
+            "dependency": "transitive",
+            "description": {
+                "name": "screen_retriever",
+                "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.0"
+        },
+        "screen_retriever_linux": {
+            "dependency": "transitive",
+            "description": {
+                "name": "screen_retriever_linux",
+                "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.0"
+        },
+        "screen_retriever_macos": {
+            "dependency": "transitive",
+            "description": {
+                "name": "screen_retriever_macos",
+                "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.0"
+        },
+        "screen_retriever_platform_interface": {
+            "dependency": "transitive",
+            "description": {
+                "name": "screen_retriever_platform_interface",
+                "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.0"
+        },
+        "screen_retriever_windows": {
+            "dependency": "transitive",
+            "description": {
+                "name": "screen_retriever_windows",
+                "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.2.0"
+        },
+        "shelf": {
+            "dependency": "transitive",
+            "description": {
+                "name": "shelf",
+                "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.4.2"
+        },
+        "shelf_web_socket": {
+            "dependency": "transitive",
+            "description": {
+                "name": "shelf_web_socket",
+                "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.0.0"
+        },
+        "sky_engine": {
+            "dependency": "transitive",
+            "description": "flutter",
+            "source": "sdk",
+            "version": "0.0.0"
+        },
+        "source_gen": {
+            "dependency": "transitive",
+            "description": {
+                "name": "source_gen",
+                "sha256": "ccf30b0c9fbcd79d8b6f5bfac23199fb354938436f62475e14aea0f29ee0f800",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.0.1"
+        },
+        "source_helper": {
+            "dependency": "transitive",
+            "description": {
+                "name": "source_helper",
+                "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.3.8"
+        },
+        "source_span": {
+            "dependency": "transitive",
+            "description": {
+                "name": "source_span",
+                "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.10.1"
+        },
+        "sprintf": {
+            "dependency": "transitive",
+            "description": {
+                "name": "sprintf",
+                "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "7.0.0"
+        },
+        "stack_trace": {
+            "dependency": "transitive",
+            "description": {
+                "name": "stack_trace",
+                "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.12.1"
+        },
+        "state_notifier": {
+            "dependency": "transitive",
+            "description": {
+                "name": "state_notifier",
+                "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.0.0"
+        },
+        "stream_channel": {
+            "dependency": "transitive",
+            "description": {
+                "name": "stream_channel",
+                "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.4"
+        },
+        "stream_transform": {
+            "dependency": "transitive",
+            "description": {
+                "name": "stream_transform",
+                "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.1"
+        },
+        "string_scanner": {
+            "dependency": "transitive",
+            "description": {
+                "name": "string_scanner",
+                "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.4.1"
+        },
+        "term_glyph": {
+            "dependency": "transitive",
+            "description": {
+                "name": "term_glyph",
+                "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.2.2"
+        },
+        "test_api": {
+            "dependency": "transitive",
+            "description": {
+                "name": "test_api",
+                "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.7.4"
+        },
+        "typed_data": {
+            "dependency": "transitive",
+            "description": {
+                "name": "typed_data",
+                "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.4.0"
+        },
+        "url_launcher": {
+            "dependency": "direct main",
+            "description": {
+                "name": "url_launcher",
+                "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.3.2"
+        },
+        "url_launcher_android": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_android",
+                "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.3.20"
+        },
+        "url_launcher_ios": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_ios",
+                "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.3.4"
+        },
+        "url_launcher_linux": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_linux",
+                "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.2.1"
+        },
+        "url_launcher_macos": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_macos",
+                "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.2.3"
+        },
+        "url_launcher_platform_interface": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_platform_interface",
+                "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.3.2"
+        },
+        "url_launcher_web": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_web",
+                "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.4.1"
+        },
+        "url_launcher_windows": {
+            "dependency": "transitive",
+            "description": {
+                "name": "url_launcher_windows",
+                "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.1.4"
+        },
+        "uuid": {
+            "dependency": "transitive",
+            "description": {
+                "name": "uuid",
+                "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "4.5.1"
+        },
+        "vector_math": {
+            "dependency": "transitive",
+            "description": {
+                "name": "vector_math",
+                "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.4"
+        },
+        "vm_service": {
+            "dependency": "transitive",
+            "description": {
+                "name": "vm_service",
+                "sha256": "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "14.3.1"
+        },
+        "watcher": {
+            "dependency": "transitive",
+            "description": {
+                "name": "watcher",
+                "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.1.3"
+        },
+        "web": {
+            "dependency": "transitive",
+            "description": {
+                "name": "web",
+                "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.1.1"
+        },
+        "web_socket": {
+            "dependency": "transitive",
+            "description": {
+                "name": "web_socket",
+                "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.0.1"
+        },
+        "web_socket_channel": {
+            "dependency": "transitive",
+            "description": {
+                "name": "web_socket_channel",
+                "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.0.3"
+        },
+        "win32": {
+            "dependency": "transitive",
+            "description": {
+                "name": "win32",
+                "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "5.13.0"
+        },
+        "window_manager": {
+            "dependency": "direct main",
+            "description": {
+                "name": "window_manager",
+                "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "0.5.1"
+        },
+        "xdg_directories": {
+            "dependency": "transitive",
+            "description": {
+                "name": "xdg_directories",
+                "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "1.1.0"
+        },
+        "xml": {
+            "dependency": "transitive",
+            "description": {
+                "name": "xml",
+                "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "6.5.0"
+        },
+        "yaml": {
+            "dependency": "transitive",
+            "description": {
+                "name": "yaml",
+                "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "3.1.3"
+        },
+        "yaml_writer": {
+            "dependency": "transitive",
+            "description": {
+                "name": "yaml_writer",
+                "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5",
+                "url": "https://pub.dev"
+            },
+            "source": "hosted",
+            "version": "2.1.0"
+        }
+    },
+    "sdks": {
+        "dart": ">=3.7.0 <4.0.0",
+        "flutter": ">=3.29.0"
+    }
+}
diff --git a/pkgs/by-name/tt/ttwatch/package.nix b/pkgs/by-name/tt/ttwatch/package.nix
index 03913b58134b..1fce9718389f 100644
--- a/pkgs/by-name/tt/ttwatch/package.nix
+++ b/pkgs/by-name/tt/ttwatch/package.nix
@@ -41,6 +41,11 @@ stdenv.mkDerivation {
     chmod +x $out/bin/ttbin2mysports
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/ryanbinns/ttwatch";
     description = "Linux TomTom GPS Watch Utilities";
diff --git a/pkgs/by-name/tt/ttylog/package.nix b/pkgs/by-name/tt/ttylog/package.nix
index d98e3a27acc7..44d08f59c4a0 100644
--- a/pkgs/by-name/tt/ttylog/package.nix
+++ b/pkgs/by-name/tt/ttylog/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://ttylog.sourceforge.net";
     description = "Simple serial port logger";
diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix
index 4fe025f650b0..a3645548774c 100644
--- a/pkgs/by-name/tt/ttyper/package.nix
+++ b/pkgs/by-name/tt/ttyper/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/max-niederman/ttyper/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       max-niederman
     ];
     mainProgram = "ttyper";
diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 57b72915a3fc..5c377cc73405 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -5,16 +5,17 @@
   pkg-config,
   libgit2,
   zlib,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tui-journal";
   version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-crrh7lV5ZMKaxsrFmhXsUgBMbN5nmbf8wQ6croTqUKI=";
   };
 
@@ -29,12 +30,16 @@ rustPlatform.buildRustPackage rec {
     zlib
   ];
 
-  meta = with lib; {
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  meta = {
     description = "Your journal app if you live in a terminal";
     homepage = "https://github.com/AmmarAbouZor/tui-journal";
-    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${finalAttrs.src.rev}/CHANGELOG.ron";
+    license = lib.licenses.mit;
     mainProgram = "tjournal";
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
-}
+})
diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index ba3e9dc26b15..b51755c4b0fb 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "turso-cli";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${version}";
-    hash = "sha256-1wvr2E1sYcDSelTxfl+LYoSDnYBdQqmMt6+UzjpkKa0=";
+    hash = "sha256-c4RtEqMCpRgr4p6STWrRv7+UIA11WySTNhyvkLgzRso=";
   };
 
   vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU=";
diff --git a/pkgs/by-name/tu/turso/package.nix b/pkgs/by-name/tu/turso/package.nix
new file mode 100644
index 000000000000..f2315e5499a8
--- /dev/null
+++ b/pkgs/by-name/tu/turso/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "turso";
+  version = "0.3.2";
+
+  src = fetchFromGitHub {
+    owner = "tursodatabase";
+    repo = "turso";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-biElXD4d6h28Nq7LIjuL+at/y69TxnsJzvnEX8cOM9E=";
+  };
+
+  cargoHash = "sha256-G2VowcxnCRulQ4pJcpfJbH73vkG+KIteeUF1Hq8TEZg=";
+
+  cargoBuildFlags = [
+    "-p"
+    "turso_cli"
+  ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Interactive SQL shell for Turso";
+    homepage = "https://github.com/tursodatabase/turso";
+    changelog = "https://github.com/tursodatabase/turso/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "tursodb";
+  };
+})
diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix
index f9bbdccd0eec..577f7d1acef9 100644
--- a/pkgs/by-name/tu/turtle-build/package.nix
+++ b/pkgs/by-name/tu/turtle-build/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "turtle";
   };
 }
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 3d7987579513..66e0afc45c46 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "310.251008.0";
+  version = "314.251030.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-HMwfSMEEP3+CWSiThiEGbCkLiKndmLyt4KIZ4fPHCxM=";
+    hash = "sha256-xGErTMDLJOQIRxFavo8lOZUjTyUvVOD10Df4EPNF+eo=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];
@@ -47,7 +47,7 @@ appimageTools.wrapType2 rec {
     license = lib.licenses.gpl3Only;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       s0ssh
     ];
     mainProgram = "tutanota-desktop";
diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix
index d749cd4d5f7d..91ff260607ae 100644
--- a/pkgs/by-name/tv/tv/package.nix
+++ b/pkgs/by-name/tv/tv/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/uzimaru0000/tv";
     changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
index d55af5b4b6e9..570630b5a683 100644
--- a/pkgs/by-name/tw/twemoji-color-font/package.nix
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchzip,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -10,19 +11,21 @@ stdenv.mkDerivation (finalAttrs: {
 
   # We fetch the prebuilt font because building it takes 1.5 hours on hydra.
   # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
-  src = fetchurl {
-    url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU=";
+  src = fetchzip {
+    url = "https://github.com/13rac1/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
+    hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40=";
   };
 
-  dontBuild = true;
-
   installPhase = ''
+    runHook preInstall
     install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
     install -Dm644 fontconfig/46-twemoji-color.conf $out/etc/fonts/conf.d/46-twemoji-color.conf
+    runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
     longDescription = ''
       A color and B&W emoji SVGinOT font built from the Twitter Emoji for
@@ -35,12 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
       systems and applications. Regular B&W outline emoji are included for
       backwards/fallback compatibility.
     '';
-    homepage = "https://github.com/eosrei/twemoji-color-font";
-    downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
-    license = with licenses; [
+    homepage = "https://github.com/13rac1/twemoji-color-font";
+    downloadPage = "https://github.com/13rac1/twemoji-color-font/releases";
+    license = with lib.licenses; [
       cc-by-40
       mit
     ];
-    maintainers = [ maintainers.fgaz ];
+    maintainers = [ lib.maintainers.fgaz ];
   };
 })
diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix
index 982ef9919ca4..ed2d8aaebb45 100644
--- a/pkgs/by-name/tw/twitch-hls-client/package.nix
+++ b/pkgs/by-name/tw/twitch-hls-client/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "twitch-hls-client";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "2bc4";
     repo = "twitch-hls-client";
     rev = version;
-    hash = "sha256-B/gOqgn5g3L8Qs7a6vvjdHX4s+5KW2zg2z9mkzsdQqA=";
+    hash = "sha256-ARAIinaUDXD3hRsPNvWof/3s7vx/DTQCv65rXZ5UzmY=";
   };
 
-  cargoHash = "sha256-5LEMYUwPu6ydmL0mZVgXHKGkjnamvhw9e6II/xEnr04=";
+  cargoHash = "sha256-Qm/J+pkfVDQdhls+AIeGudUYj4HYXYVHiEr6kZHJF20=";
 
   meta = with lib; {
     description = "Minimal CLI client for watching/recording Twitch streams";
diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix
index 2d2eb20b2817..b9ff82ddf66e 100644
--- a/pkgs/by-name/tx/txtpbfmt/package.nix
+++ b/pkgs/by-name/tx/txtpbfmt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "txtpbfmt";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "txtpbfmt";
-    rev = "0b0c2708cf8453209ac9864099a502d5d1723ee4";
-    hash = "sha256-d6fT98Po7c+ZIwn3UG4JlsLRVjurnE0htrCUzM9sxGk=";
+    rev = "16587c79cd916daf09ade0a7d72e6a5de7c81f81";
+    hash = "sha256-3rzsw6CvN8mzjRM8OCDNvVquQNx+82NPeHizNOF+g54=";
   };
 
   vendorHash = "sha256-aeYa7a/oKH2dxXHRkkqyh7f04citRDGQxAaKQTJst4o=";
diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 98bc3ed43c37..3846715e48f9 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.22";
+  version = "0.0.1-alpha.25";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-jNjYorSybR33wDFUbmTz0BroVbR1wNjNXn5XsNRIqMg=";
+    hash = "sha256-roN8sU0WjGXd1jfQiTXSJ0OQRW8MbNYUfCdz744lnRM=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-71pu0cC0CzOv3tJk7+eirUUUr/OertdIgWCatScXTqQ=";
+  cargoHash = "sha256-A2lPCweusmDPwh6IXAj4D6+GRK6CaZSP5gFDhrsBI5Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/pkgs/by-name/ty/typer/package.nix b/pkgs/by-name/ty/typer/package.nix
index bc7403b3e92a..5ae829b443a0 100644
--- a/pkgs/by-name/ty/typer/package.nix
+++ b/pkgs/by-name/ty/typer/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Typing test in your terminal";
     homepage = "https://github.com/maaslalani/typer";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "typer";
   };
 }
diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 35f15a34e38d..b1134aa2d169 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2025-10-11";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "a05e479428cb43c6228f78dc04f8326bbd91317b";
-    hash = "sha256-ypn+DCfSfASgigjer0n65qGx0DGZzflTyinITgGbdeU=";
+    rev = "3d247ef578b7291790fe059fc06a1ae9eaad9187";
+    hash = "sha256-pfWeztSI41TTJ/oQwi6QX9Ow9nU3cXzv8Lq5TNn8Av0=";
     fetchSubmodules = false;
   };
 
diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix
index 68982c758621..04a997db0805 100644
--- a/pkgs/by-name/ty/typescript-language-server/package.nix
+++ b/pkgs/by-name/ty/typescript-language-server/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typescript-language-server";
-  version = "5.0.1";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "typescript-language-server";
     repo = "typescript-language-server";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ziiiw6MXoIa1bWtME7dvzg+kQ8iXMG3P5rNR1B/Iifg=";
+    hash = "sha256-MpcTyjew/SgmWrpeqXLjQPPdwUuMTWQYyyM9TG5jNbQ=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-ODO1G1AJd38cGqHhau1t4D8Mrug44pLk36d9dGtb/nM=";
+    hash = "sha256-CSjxiuUN+hHmoWwkVe6c5lLFeX3ROB3QlBQ15rVmPhk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix
index 3ce54e6aa766..935f2d1a477f 100644
--- a/pkgs/by-name/ty/typeshare/package.nix
+++ b/pkgs/by-name/ty/typeshare/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index e6825050b51c..2a06e30892ea 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
   nodejs,
   pnpm,
-  testers,
+  versionCheckHook,
 }:
 
 let
@@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       postPatch
       ;
-    fetcherVersion = 1;
-    hash = "sha256-/Y7KhdNeyUV2CQQWjhYBDDT24oE6UdBO6HTweUUaNqc=";
+    fetcherVersion = 2;
+    hash = "sha256-ztig1B10cQQy+4XKZjwwlCxGenwcU+C28TfTWHqZ59Y=";
   };
 
   postPatch = ''
@@ -91,9 +91,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ];
diff --git a/pkgs/by-name/ty/typewriter/package.nix b/pkgs/by-name/ty/typewriter/package.nix
index f45935c8b31f..706257a3a2e6 100644
--- a/pkgs/by-name/ty/typewriter/package.nix
+++ b/pkgs/by-name/ty/typewriter/package.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://gitlab.gnome.org/JanGernert/typewriter/-/releases/v.${finalAttrs.version}";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 })
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 815f96170e22..c9fba03465ce 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/stepchowfun/typical";
     changelog = "https://github.com/stepchowfun/typical/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix
index dfc9d61398bb..192109c75a9f 100644
--- a/pkgs/by-name/ty/typioca/package.nix
+++ b/pkgs/by-name/ty/typioca/package.nix
@@ -6,14 +6,14 @@
   typioca,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "typioca";
   version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "bloznelis";
     repo = "typioca";
-    rev = version;
+    tag = "${finalAttrs.version}";
     hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE=";
   };
 
@@ -22,7 +22,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/bloznelis/typioca/cmd.Version=${version}"
+    "-X=github.com/bloznelis/typioca/cmd.Version=${finalAttrs.version}"
   ];
 
   passthru.tests = {
@@ -31,12 +31,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cozy typing speed tester in terminal";
     homepage = "https://github.com/bloznelis/typioca";
-    changelog = "https://github.com/bloznelis/typioca/releases/tag/${src.rev}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/bloznelis/typioca/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ iedame ];
     mainProgram = "typioca";
   };
-}
+})
diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index 9cf0bde5ae6c..4a87315d3a67 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -22,14 +22,27 @@
 
 let
   pname = "typora";
-  version = "1.11.5";
-  src = fetchurl {
-    urls = [
-      "https://download.typora.io/linux/typora_${version}_amd64.deb"
-      "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
-    ];
-    hash = "sha256-CpUF8pRLzR3RzFD85Cobbmo3BInaeCee0NWKsmelPGs=";
-  };
+  version = "1.12.2";
+
+  src =
+    fetchurl
+      {
+        x86_64-linux = {
+          urls = [
+            "https://download.typora.io/linux/typora_${version}_amd64.deb"
+            "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
+          ];
+          hash = "sha256-g5GB4hc1cphnOXcVV+YR+YULJOzWAslio3yXjW9MGOk=";
+        };
+        aarch64-linux = {
+          urls = [
+            "https://download.typora.io/linux/typora_${version}_arm64.deb"
+            "https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
+          ];
+          hash = "sha256-br9kn3P4Pzbef6u581YcX8c0uiB/c1pKqGogLX3sruw=";
+        };
+      }
+      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
 
   typoraBase = stdenv.mkDerivation {
     inherit pname version src;
@@ -116,7 +129,7 @@ let
 
 in
 stdenv.mkDerivation {
-  inherit pname version;
+  inherit pname version src;
 
   dontUnpack = true;
   dontConfigure = true;
@@ -132,11 +145,17 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "A minimal Markdown editor and reader.";
     homepage = "https://typora.io/";
+    changelog = "https://typora.io/releases/all";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ npulidomateo ];
+    maintainers = with lib.maintainers; [
+      npulidomateo
+      chillcicada
+    ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "typora";
   };
diff --git a/pkgs/by-name/ty/typora/update.sh b/pkgs/by-name/ty/typora/update.sh
new file mode 100755
index 000000000000..21f2c63395c8
--- /dev/null
+++ b/pkgs/by-name/ty/typora/update.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -euo pipefail
+
+version=$(curl -s "https://typora.io/#linux" | sed -E -n 's/.*typora_([0-9.]+)_amd64.*/\1/p')
+
+amd64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_amd64.deb))
+update-source-version typora $version $amd64_hash --system=x86_64-linux --ignore-same-version
+
+arm64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_arm64.deb))
+update-source-version typora $version $arm64_hash --system=aarch64-linux --ignore-same-version
diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index b640031a3eca..c81d03799e06 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.38.1";
+  version = "1.39.0";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "typos";
     tag = "v${version}";
-    hash = "sha256-xr3k3wx9EWKm00kt1GxE31Mw5wa3N3VJJCKaUbQa4ic=";
+    hash = "sha256-S4toajgpKtPfvr6hhXE59lt0HPDHK/hF5vJJtxR0lTM=";
   };
 
-  cargoHash = "sha256-2XgnCXYqBvx7LRWaPt4iXznIXIEzYBlWMXbwEVZyGA8=";
+  cargoHash = "sha256-DFbWFhj7ixO1kpgJNDIrtZ+FZfc4GEyw4AnwlTCXw4w=";
 
   passthru.updateScript = nix-update-script { };
 
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       mgttlinger
     ];
   };
diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix
index 1fb570f918e4..1fce6af1bb64 100644
--- a/pkgs/by-name/ty/typst-live/package.nix
+++ b/pkgs/by-name/ty/typst-live/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     description = "Hot reloading for your typst files";
     homepage = "https://github.com/ItsEthra/typst-live";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "typst-live";
   };
 }
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index dffa2109626d..cf9bad1243b7 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -12,16 +12,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typst";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "typst";
     repo = "typst";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vbBwIQt4xWZaKpXgFwDsRQIQ0mmsQPRR39m8iZnnuj0=";
+    hash = "sha256-Sdl60VNjrSVj8YFZR/b2WOzN8taZ6wsJx5FnED9XQbw=";
+    leaveDotGit = true;
+    postFetch = ''
+      cd $out
+      git rev-parse HEAD > COMMIT
+      rm -rf .git
+    '';
   };
 
-  cargoHash = "sha256-4kVj2BODEFjLcrh5sxfcgsdLF2Zd3K1GnhA4DEz1Nl4=";
+  cargoHash = "sha256-6o7IbDBJU+FGYezfm37Z4eBBWa7G06vFbopI0FqJu7c=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -35,14 +41,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env = {
     GEN_ARTIFACTS = "artifacts";
     OPENSSL_NO_VENDOR = true;
-    # to not have "unknown hash" in help output
-    TYPST_VERSION = finalAttrs.version;
   };
 
   # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
   postPatch = ''
-    substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads'
-    substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads'
+    substituteInPlace tests/src/tests.rs --replace-fail \
+      'ARGS.num_threads' \
+      'ARGS.test_threads'
+    substituteInPlace tests/src/args.rs --replace-fail \
+      'num_threads' \
+      'test_threads'
+    substituteInPlace crates/typst-cli/build.rs --replace-fail \
+      '"cargo:rustc-env=TYPST_COMMIT_SHA={}", typst_commit_sha()' \
+      "\"cargo:rustc-env=TYPST_COMMIT_SHA={}\", \"$(cat COMMIT | cut -c1-8)\""
   '';
 
   postInstall = ''
@@ -71,7 +82,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "typst";
     maintainers = with lib.maintainers; [
-      figsoda
       kanashimia
       RossSmyth
     ];
diff --git a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
index 183c00c244c4..94db47726ccd 100644
--- a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
+++ b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
@@ -82,6 +82,18 @@ license = [
 ]
 homepage = "https://github.com/avonmoll/ifacconf-typst"
 
+[abyss-book."0.2.9"]
+url = "https://packages.typst.org/preview/abyss-book-0.2.9.tar.gz"
+hash = "sha256-mBsXJ5sW4w4UMpOS812ZQcz/DUoNEPLKx7H95tXiNoU="
+typstDeps = [
+    "zh-kit_0_1_0",
+]
+description = "A dark-themed typst template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/CrossDark/AbyssBook"
+
 [academic-conf-pre."0.1.0"]
 url = "https://packages.typst.org/preview/academic-conf-pre-0.1.0.tar.gz"
 hash = "sha256-12BrUly7fU/7c0ZB+OMY3UaV7ZpYUSWQUywc042ciL8="
@@ -190,6 +202,16 @@ license = [
 ]
 homepage = "https://github.com/eltos/accelerated-jacow/"
 
+[acrostiche."0.6.0"]
+url = "https://packages.typst.org/preview/acrostiche-0.6.0.tar.gz"
+hash = "sha256-/XY6OuGBYvx6+aXwg1EhMM04swOQ7asp3JgLk/JEMwM="
+typstDeps = []
+description = "Manage acronyms and their definitions in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Grisely/packages"
+
 [acrostiche."0.5.2"]
 url = "https://packages.typst.org/preview/acrostiche-0.5.2.tar.gz"
 hash = "sha256-49mE2p7lh6AfiMcXQuPctfPoKuvN4f9/KMnUXe/o4uA="
@@ -404,6 +426,19 @@ license = [
 ]
 homepage = "https://github.com/tristanduncombe/aero-navigator"
 
+[agregyst."0.1.0"]
+url = "https://packages.typst.org/preview/agregyst-0.1.0.tar.gz"
+hash = "sha256-ejVmOx40ozuzVXhUf6nvnHm6Gg0be+RYT1uuMx7dNk0="
+typstDeps = [
+    "cetz_0_4_1",
+    "jumble_0_0_1",
+]
+description = "Agregation Template for writting teaching lesson"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pauladam94/agregyst"
+
 [ailab-isetbz."0.1.0"]
 url = "https://packages.typst.org/preview/ailab-isetbz-0.1.0.tar.gz"
 hash = "sha256-1VmymGotEYdX/RuIncMg7c61E3uC/KTgUNzFr0TWo7Q="
@@ -416,6 +451,16 @@ license = [
 ]
 homepage = "https://github.com/a-mhamdi/ailab-isetbz"
 
+[aio-studi-and-thesis."0.1.2"]
+url = "https://packages.typst.org/preview/aio-studi-and-thesis-0.1.2.tar.gz"
+hash = "sha256-b4ThVYZcKwjw2n2Fl2fGcyPJ0J+y6pkMMs+THxDsHv0="
+typstDeps = []
+description = "All-in-one template for students and theses"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fuchs-fabian/typst-template-aio-studi-and-thesis"
+
 [aio-studi-and-thesis."0.1.1"]
 url = "https://packages.typst.org/preview/aio-studi-and-thesis-0.1.1.tar.gz"
 hash = "sha256-k3w4PQ0GBP5g3WQ4mtv+M7L/S4wtcXrGEUPj7OiuZt4="
@@ -444,6 +489,30 @@ license = [
 ]
 homepage = "https://github.com/fuchs-fabian/typst-template-aio-studi-and-thesis"
 
+[alchemist."0.1.8"]
+url = "https://packages.typst.org/preview/alchemist-0.1.8.tar.gz"
+hash = "sha256-GGOJ9TxctfYABiDU9NwMNDUjEzPoheuVnggfzIvhk6E="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "A package to render skeletal formulas using CeTZ"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Typsium/alchemist"
+
+[alchemist."0.1.7"]
+url = "https://packages.typst.org/preview/alchemist-0.1.7.tar.gz"
+hash = "sha256-PvuEbsV9aePaa6iPTZjJDVe5UF/iT+fZm6crLGrBSWc="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "A package to render skeletal formulas using CeTZ"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Typsium/alchemist"
+
 [alchemist."0.1.6"]
 url = "https://packages.typst.org/preview/alchemist-0.1.6.tar.gz"
 hash = "sha256-+P34Ok62beVlxLq86Do3PWl7ispM4k3VvNxpEMEB/Ts="
@@ -529,6 +598,16 @@ license = [
 ]
 homepage = "https://github.com/Robotechnic/alchemist"
 
+[alexandria."0.2.1"]
+url = "https://packages.typst.org/preview/alexandria-0.2.1.tar.gz"
+hash = "sha256-bK+GyrEE0VXiKARCEy2oFEMkp6TTfQhQ+scM5i7+a8A="
+typstDeps = []
+description = "Use multiple bibliographies in a single Typst document "
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SillyFreak/typst-alexandria"
+
 [alexandria."0.2.0"]
 url = "https://packages.typst.org/preview/alexandria-0.2.0.tar.gz"
 hash = "sha256-N8O9v1tD6CemqbJjX8yTMK2ZGFFASLchZSEie1v2Y3w="
@@ -649,6 +728,46 @@ license = [
 ]
 homepage = "https://github.com/platformer/typst-algorithms"
 
+[algorithmic."1.0.5"]
+url = "https://packages.typst.org/preview/algorithmic-1.0.5.tar.gz"
+hash = "sha256-FM7k3Rkmwm0HKWqF3iI+79k+0AB84/t3aOfnW20VPjg="
+typstDeps = []
+description = "Algorithm pseudocode typesetting for Typst, inspired by algorithmicx in LaTeX"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/typst-algorithmic"
+
+[algorithmic."1.0.4"]
+url = "https://packages.typst.org/preview/algorithmic-1.0.4.tar.gz"
+hash = "sha256-yjGUubK5gClOug/r9ffg0kv2Z6N3moRZ7uBdYvkOwqA="
+typstDeps = []
+description = "Algorithm pseudocode typesetting for Typst, inspired by algorithmicx in LaTeX"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/typst-algorithmic"
+
+[algorithmic."1.0.3"]
+url = "https://packages.typst.org/preview/algorithmic-1.0.3.tar.gz"
+hash = "sha256-/wXKu7z+Z6aLhrjEdJzHyAgY47DQxea8yINSbf1M/gs="
+typstDeps = []
+description = "Algorithm pseudocode typesetting for Typst, inspired by algorithmicx in LaTeX"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/typst-algorithmic"
+
+[algorithmic."1.0.2"]
+url = "https://packages.typst.org/preview/algorithmic-1.0.2.tar.gz"
+hash = "sha256-crawgOMqisxSpBcqtzZIEYrmFULACaG9i4EiolOwB1I="
+typstDeps = []
+description = "Algorithm pseudocode typesetting for Typst, inspired by algorithmicx in LaTeX"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/typst-algorithmic"
+
 [algorithmic."1.0.0"]
 url = "https://packages.typst.org/preview/algorithmic-1.0.0.tar.gz"
 hash = "sha256-PANFP/4IuLSVMn6SbECdEvSsyYc9KHJn7Ztqfl6DA4c="
@@ -974,6 +1093,18 @@ license = [
 ]
 homepage = "https://github.com/mrwunderbar666/typst-apa7ish"
 
+[ape."0.4.1"]
+url = "https://packages.typst.org/preview/ape-0.4.1.tar.gz"
+hash = "sha256-ngFhXySkHryy+mTGP4dFgNtnPC9NdpBsbZMhoRda0eM="
+typstDeps = [
+    "cetz_0_3_2",
+    "cetz-plot_0_1_1",
+]
+description = "Stop monkeying around with your layouts! Get sophisticated with Ape for Typst"
+license = [
+    "MIT",
+]
+
 [ape."0.4.0"]
 url = "https://packages.typst.org/preview/ape-0.4.0.tar.gz"
 hash = "sha256-rlOMgzE9+1OrwLA4ng6gZQoa/oceq4IUKF8TbgOnPVc="
@@ -1126,6 +1257,20 @@ license = [
 ]
 homepage = "https://github.com/mgoulao/arkheion"
 
+[articulate-coderscompass."0.1.7"]
+url = "https://packages.typst.org/preview/articulate-coderscompass-0.1.7.tar.gz"
+hash = "sha256-XyH0cQZHBNGCN8Abq95anO9nGt5bS8e7tC2AknVIiuY="
+typstDeps = [
+    "cmarker_0_1_6",
+    "mitex_0_2_5",
+    "zebraw_0_5_5",
+]
+description = ""
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Coders-Compass/articulate-coderscompass"
+
 [ascii-ipa."2.0.0"]
 url = "https://packages.typst.org/preview/ascii-ipa-2.0.0.tar.gz"
 hash = "sha256-E/ookDGdRJh0Ac29xnNV+AJVALUW/uM7MyztcFJlKdg="
@@ -1166,6 +1311,28 @@ license = [
 ]
 homepage = "https://github.com/imatpot/typst-ascii-ipa"
 
+[asciim."0.1.0"]
+url = "https://packages.typst.org/preview/asciim-0.1.0.tar.gz"
+hash = "sha256-UXJiGffdHPLMl7NwKWavNvzPiFljne3M1v9jjcJWrpE="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "Displaying ASCII tables with a 16x16 grid and overlays on elements"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/waterlens/ascii-matrix"
+
+[athena-tu-darmstadt-exercise."0.2.0"]
+url = "https://packages.typst.org/preview/athena-tu-darmstadt-exercise-0.2.0.tar.gz"
+hash = "sha256-dtDAL9DwtJStoXylWkSWIfYJcV24lB5kw9fC9YXwJME="
+typstDeps = []
+description = "Exercise template for TU Darmstadt (Technische Universität Darmstadt"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JeyRunner/tuda-typst-templates"
+
 [athena-tu-darmstadt-exercise."0.1.0"]
 url = "https://packages.typst.org/preview/athena-tu-darmstadt-exercise-0.1.0.tar.gz"
 hash = "sha256-xZafuXAwXLTvpJvzjeFwSCla1rJZGsBSJjNkZgIJzQY="
@@ -1176,6 +1343,18 @@ license = [
 ]
 homepage = "https://github.com/JeyRunner/tuda-typst-templates"
 
+[athena-tu-darmstadt-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/athena-tu-darmstadt-thesis-0.1.1.tar.gz"
+hash = "sha256-z9ZlsCzidynlnCPaQrniwAhS71lcOYv61mvCy8oczss="
+typstDeps = [
+    "i-figured_0_2_3",
+]
+description = "Thesis template for TU Darmstadt (Technische Universität Darmstadt"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JeyRunner/tuda-typst-templates"
+
 [athena-tu-darmstadt-thesis."0.1.0"]
 url = "https://packages.typst.org/preview/athena-tu-darmstadt-thesis-0.1.0.tar.gz"
 hash = "sha256-xp2+xdOvfp4W49CAx7FAASLUMmwJ8YBx01m/zmdicO8="
@@ -1373,6 +1552,36 @@ license = [
 ]
 homepage = "https://github.com/avonmoll/bamdone-rebuttal"
 
+[barcala."0.1.4"]
+url = "https://packages.typst.org/preview/barcala-0.1.4.tar.gz"
+hash = "sha256-yRzq6t8JJLc9+BJeBuSxLyBBm6Z9jTcHuVMUE6r6pX4="
+typstDeps = [
+    "lilaq_0_4_0",
+    "physica_0_9_5",
+    "valkyrie_0_2_2",
+    "zero_0_5_0",
+]
+description = "A report template for UNLP students, specially for engineering"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JuanM04/barcala"
+
+[barcala."0.1.3"]
+url = "https://packages.typst.org/preview/barcala-0.1.3.tar.gz"
+hash = "sha256-dzreqfQe6lME5w/huud3TcehZSSPE1sR2gVjVI6Vfps="
+typstDeps = [
+    "fancy-units_0_1_1",
+    "lilaq_0_2_0",
+    "physica_0_9_5",
+    "valkyrie_0_2_2",
+]
+description = "A report template for UNLP students, specially for engineering"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JuanM04/barcala"
+
 [barcala."0.1.2"]
 url = "https://packages.typst.org/preview/barcala-0.1.2.tar.gz"
 hash = "sha256-TrQa+i1lZP7CF7pHLF1BvTIzaYGimIiyVp5/S8/ZCYo="
@@ -1497,6 +1706,18 @@ license = [
 ]
 homepage = "https://github.com/polylux-typ/basic"
 
+[basic-report."0.3.1"]
+url = "https://packages.typst.org/preview/basic-report-0.3.1.tar.gz"
+hash = "sha256-HXEA2FpnVTicdOSkCggH2i0JLx5ENxQCSaUhcCzEncs="
+typstDeps = [
+    "hydra_0_6_2",
+]
+description = "A simple template for reports"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/roland-KA/basic-report-typst-template"
+
 [basic-report."0.3.0"]
 url = "https://packages.typst.org/preview/basic-report-0.3.0.tar.gz"
 hash = "sha256-AMmfXmqp4ckLYl4tF0Rm9C5AqYuWSq5jQw6xqo20xNc="
@@ -1681,6 +1902,50 @@ license = [
 ]
 homepage = "https://github.com/stuxf/basic-typst-resume-template"
 
+[beautiful-abs."0.1.0"]
+url = "https://packages.typst.org/preview/beautiful-abs-0.1.0.tar.gz"
+hash = "sha256-UEOg8aoRaKZRIJxU+UO8dwnDJQ0jR9rmUwNB9M8t8ak="
+typstDeps = []
+description = "A package for creating beautiful standard abbreviations like i.e. or e.g"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/judgeNotFound/beautiful-abs"
+
+[bei-report."0.1.1"]
+url = "https://packages.typst.org/preview/bei-report-0.1.1.tar.gz"
+hash = "sha256-b1Sa3TubVcJiA0vYnoJuelN4ZqsJoa4KCoWL+gcMERY="
+typstDeps = []
+description = "An unofficial Typst template for ENSIMAG internship report"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/beatussum/typst-bei-report-template"
+
+[bei-report."0.1.0"]
+url = "https://packages.typst.org/preview/bei-report-0.1.0.tar.gz"
+hash = "sha256-LQ4gvAXLWGX0F3p3wos9tpln1wKofaAy52dJTpoTHPw="
+typstDeps = []
+description = "An unofficial Typst template for ENSIMAG internship report"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/beatussum/typst-bei-report-template"
+
+[bellbird-udesc-paper."0.0.1"]
+url = "https://packages.typst.org/preview/bellbird-udesc-paper-0.0.1.tar.gz"
+hash = "sha256-Olx+u3MjRjS4SaAoDxcMiRQpmMXrmepDLI7bRORtQYI="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "physica_0_9_5",
+]
+description = "An Udesc-style academic paper template"
+license = [
+    "LGPL-2.1-only",
+]
+homepage = "https://github.com/lucas-bublitz/bellbird-udesc-paper"
+
 [biceps."0.0.1"]
 url = "https://packages.typst.org/preview/biceps-0.0.1.tar.gz"
 hash = "sha256-w72oSOKuw72q7hK5mF78nwRsWVnI/mAXQvFWtdp89KM="
@@ -1964,6 +2229,46 @@ license = [
     "Apache-2.0",
 ]
 
+[booktabs."0.0.4"]
+url = "https://packages.typst.org/preview/booktabs-0.0.4.tar.gz"
+hash = "sha256-EEJk86YztAFJixGvuMQ1fSgY7uiULgFZZ9f/kTS68eM="
+typstDeps = []
+description = "Table styling, inspired by LaTeX's Booktabs package"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/bzindovic/booktabs"
+
+[booktabs."0.0.3"]
+url = "https://packages.typst.org/preview/booktabs-0.0.3.tar.gz"
+hash = "sha256-f9J2kIj7gnihkFoFF2OBLV+M/OCIvVFeQq6Z9TUgLcU="
+typstDeps = []
+description = "Table styling, inspired by LaTeX's Booktabs package"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/bzindovic/booktabs"
+
+[booktabs."0.0.2"]
+url = "https://packages.typst.org/preview/booktabs-0.0.2.tar.gz"
+hash = "sha256-GkBxfqvi21C4wtE6Y/Ze5zia+wAZEAUK2UkZU+bLLhg="
+typstDeps = []
+description = "Table styling, inspired by LaTeX's Booktabs package"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/bzindovic/typst-packages"
+
+[booktabs."0.0.1"]
+url = "https://packages.typst.org/preview/booktabs-0.0.1.tar.gz"
+hash = "sha256-Glnax8JCr50n8Khwa7ZOR8uy5RIa7UGDaRvMI0bSQKs="
+typstDeps = []
+description = "Table styling, inspired by LaTeX's Booktabs package"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/bzindovic/typst-packages"
+
 [boxed-sheet."0.1.0"]
 url = "https://packages.typst.org/preview/boxed-sheet-0.1.0.tar.gz"
 hash = "sha256-Es5jOwqOPhtbE3vZJKEoH2W/WFJyRdOLVS/fJ7pVcMc="
@@ -1994,6 +2299,18 @@ license = [
 ]
 homepage = "https://app.radicle.xyz/nodes/seed.radicle.garden/rad:z3bYXx6FurPtAURke7sUV8ktrtFNt"
 
+[brilliant-cv."2.0.6"]
+url = "https://packages.typst.org/preview/brilliant-cv-2.0.6.tar.gz"
+hash = "sha256-kcu3pxuMNlsNIvBed4Q9PEnCT9/y7NPcQNfHc5ZvaoQ="
+typstDeps = [
+    "fontawesome_0_5_0",
+]
+description = "💼 another CV template for your job application, yet powered by Typst and more"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/yunanwg/brilliant-CV"
+
 [brilliant-cv."2.0.5"]
 url = "https://packages.typst.org/preview/brilliant-cv-2.0.5.tar.gz"
 hash = "sha256-55ldsGnrsDowYYz1mxIlcLXIna8gRteDikv6K56aXDo="
@@ -2118,6 +2435,60 @@ license = [
 ]
 homepage = "https://github.com/hzkonor/bubble-template"
 
+[bubble-zju."0.1.0"]
+url = "https://packages.typst.org/preview/bubble-zju-0.1.0.tar.gz"
+hash = "sha256-AjBPrxEEk6OhhyFkXEBkXNobhWf1QzfR7xrrN8N3XHQ="
+typstDeps = [
+    "fletcher_0_5_8",
+    "note-me_0_5_0",
+]
+description = "Modern Zhejiang Univerisity report"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/inuEbisu/bubble-zju"
+
+[bullseye."0.1.0"]
+url = "https://packages.typst.org/preview/bullseye-0.1.0.tar.gz"
+hash = "sha256-L9eFegLTTCE/Vf38KzirwHqSRk1vHRHqnv+wOrQolV4="
+typstDeps = []
+description = "Hit the target (HTML or paged/PDF) when styling your Typst document"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SillyFreak/typst-bullseye"
+
+[burik."0.1.0"]
+url = "https://packages.typst.org/preview/burik-0.1.0.tar.gz"
+hash = "sha256-m7+iJFQv3vXz78f8Ncr9uNe6SaSrVJltRTSWtY0KWas="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "Visualization of 3x3 Rubik's Cube Algorithms for easier tutorials edition"
+license = [
+    "MIT",
+]
+
+[bye-ubc."0.2.2"]
+url = "https://packages.typst.org/preview/bye-ubc-0.2.2.tar.gz"
+hash = "sha256-LOCUeu61I++mdCKZWEJQEZpKPCDheD58qd6858jpGA4="
+typstDeps = []
+description = "A template for theses at the University of British Columbia"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/DJDuque/bye-ubc"
+
+[bye-ubc."0.2.1"]
+url = "https://packages.typst.org/preview/bye-ubc-0.2.1.tar.gz"
+hash = "sha256-QWVdNzxyf0C4oeH4X5P0tAWtg5eAtDbIwJyZRTbO9Pc="
+typstDeps = []
+description = "A template for theses at the University of British Columbia"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/DJDuque/bye-ubc"
+
 [bytefield."0.0.7"]
 url = "https://packages.typst.org/preview/bytefield-0.0.7.tar.gz"
 hash = "sha256-9DfhrwSRR/W/YC5N0IdYyh/ILP+2n+C88tWdCekWnt0="
@@ -2398,6 +2769,16 @@ license = [
 ]
 homepage = "https://github.com/jneug/typst-ccicons"
 
+[cellpress-unofficial."0.1.0"]
+url = "https://packages.typst.org/preview/cellpress-unofficial-0.1.0.tar.gz"
+hash = "sha256-ZCR1iYidFEGUO868TXkR0BicnvhFsy9KM8EimrU08MM="
+typstDeps = []
+description = "Unofficial Cell Press styles for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/cellpress-unofficial"
+
 [celluloid."0.1.0"]
 url = "https://packages.typst.org/preview/celluloid-0.1.0.tar.gz"
 hash = "sha256-MIR1y575oBcufXUDNL4I8D1LwHLqBVLW5iU+1QbU4PM="
@@ -2429,6 +2810,30 @@ license = [
 ]
 homepage = "https://github.com/andreasKroepelin/cetramed-polylux"
 
+[cetz."0.4.2"]
+url = "https://packages.typst.org/preview/cetz-0.4.2.tar.gz"
+hash = "sha256-fbYS5HNKNKF7JYAdG0xFMLryFoLAv4Kd3kV3rqiKWVo="
+typstDeps = [
+    "oxifmt_1_0_0",
+]
+description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/cetz-package/cetz"
+
+[cetz."0.4.1"]
+url = "https://packages.typst.org/preview/cetz-0.4.1.tar.gz"
+hash = "sha256-OhoYtv7j2//FT6qYlCw4ISuXwMOGEgMyiN/Mpwq2saM="
+typstDeps = [
+    "oxifmt_1_0_0",
+]
+description = "Drawing with Typst made easy, providing an API inspired by TikZ and Processing. Includes modules for plotting, charts and tree layout"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/cetz-package/cetz"
+
 [cetz."0.4.0"]
 url = "https://packages.typst.org/preview/cetz-0.4.0.tar.gz"
 hash = "sha256-f4x0/Bm2ivGu17hsYcly2K7R00gJNhbYckAjbczqM8I="
@@ -2685,6 +3090,16 @@ license = [
 ]
 homepage = "https://github.com/johannes-wolf/cetz-venn"
 
+[charged-ieee."0.1.4"]
+url = "https://packages.typst.org/preview/charged-ieee-0.1.4.tar.gz"
+hash = "sha256-sMm8mundrBeSU/FiFOvA/4Uu2S0vYRdpFO+vbudkf+A="
+typstDeps = []
+description = "An IEEE-style paper template to publish at conferences and journals for Electrical Engineering, Computer Science, and Computer Engineering"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/typst/templates"
+
 [charged-ieee."0.1.3"]
 url = "https://packages.typst.org/preview/charged-ieee-0.1.3.tar.gz"
 hash = "sha256-Ry2Xnw6YpWS9I3PzE+dj9ZRdZhtXDBLnVJKDAJY4au8="
@@ -2878,6 +3293,26 @@ license = [
 ]
 homepage = "https://github.com/JamesxX/chemicoms-paper"
 
+[cheq."0.3.0"]
+url = "https://packages.typst.org/preview/cheq-0.3.0.tar.gz"
+hash = "sha256-v/iuiH/dHNHTXRF9beWMQ61GCyo1qBh6/mSbrjhYUxw="
+typstDeps = []
+description = "Write markdown-like checklist easily"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-cheq"
+
+[cheq."0.2.3"]
+url = "https://packages.typst.org/preview/cheq-0.2.3.tar.gz"
+hash = "sha256-mVnZgQndN5dIBKN+ICyOi/3C6GVAzW1ppcOAQ+hS9e4="
+typstDeps = []
+description = "Write markdown-like checklist easily"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-cheq"
+
 [cheq."0.2.2"]
 url = "https://packages.typst.org/preview/cheq-0.2.2.tar.gz"
 hash = "sha256-YtoXDJaC3CdggMpuT8WeWmo+adyOag9SMrQ6P20XypI="
@@ -3067,6 +3502,18 @@ license = [
 ]
 homepage = "https://github.com/ljgago/typst-chords"
 
+[chribel."1.0.0"]
+url = "https://packages.typst.org/preview/chribel-1.0.0.tar.gz"
+hash = "sha256-bgyOuNPJRo4XNVnIpXdXwcVRvCXcEePIgiIJBo1Qmf8="
+typstDeps = [
+    "tableau-icons_0_334_1",
+]
+description = "A compact summary template with custom callouts"
+license = [
+    "EUPL-1.2",
+]
+homepage = "https://codeberg.org/joelvonrotz/typst-chribel-template"
+
 [chromo."0.1.0"]
 url = "https://packages.typst.org/preview/chromo-0.1.0.tar.gz"
 hash = "sha256-oNDEPTHeTtnnfkhL2C0ewNLnBJJWqpWp7wyG4A+xrVM="
@@ -3218,6 +3665,16 @@ license = [
 ]
 homepage = "https://git.kb28.ch/HEL/circuiteria"
 
+[citegeist."0.2.0"]
+url = "https://packages.typst.org/preview/citegeist-0.2.0.tar.gz"
+hash = "sha256-4bvuLxM+h82wS/VroIksuwtC36nW2PRqvp23l7ny1uI="
+typstDeps = []
+description = "Makes a Bibtex bibliography available as a Typst dictionary"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alexanderkoller/typst-citegeist"
+
 [citegeist."0.1.0"]
 url = "https://packages.typst.org/preview/citegeist-0.1.0.tar.gz"
 hash = "sha256-3tESfy/IyQSo2ubvAvm2BHwWPZQJVlJULndLjlVeSZo="
@@ -3228,6 +3685,18 @@ license = [
 ]
 homepage = "https://github.com/alexanderkoller/typst-citegeist"
 
+[cjk-unbreak."0.2.0"]
+url = "https://packages.typst.org/preview/cjk-unbreak-0.2.0.tar.gz"
+hash = "sha256-M6R3NaJ1bFMGPj7Ro8aMbwrVXe0aDr0iP8BYv2woL4Q="
+typstDeps = [
+    "touying_0_6_1",
+]
+description = "Remove spaces caused by line breaks around CJK"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/KZNS/cjk-unbreak"
+
 [cjk-unbreak."0.1.1"]
 url = "https://packages.typst.org/preview/cjk-unbreak-0.1.1.tar.gz"
 hash = "sha256-if3e285Aj86MpsgHI0tyS4NlRH3W5A4VhLl/Yp+vTpc="
@@ -3252,6 +3721,21 @@ license = [
 ]
 homepage = "https://github.com/KZNS/cjk-unbreak"
 
+[classic-aau-report."0.3.1"]
+url = "https://packages.typst.org/preview/classic-aau-report-0.3.1.tar.gz"
+hash = "sha256-kDy0Z0f2ifKOdKa/PaPP608qXzmw1E6NTL40dIUY0iQ="
+typstDeps = [
+    "glossy_0_8_0",
+    "headcount_0_1_0",
+    "hydra_0_6_2",
+    "subpar_0_2_2",
+]
+description = "A report template for students at Aalborg University (AAU"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Tinggaard/classic-aau-report"
+
 [classic-aau-report."0.3.0"]
 url = "https://packages.typst.org/preview/classic-aau-report-0.3.0.tar.gz"
 hash = "sha256-SqWI3LPyvv5nGWeLfrMD3rLOMXer2UT2djt/iA9NlSE="
@@ -3474,6 +3958,76 @@ license = [
 ]
 homepage = "https://github.com/roland-KA/clean-dhbw-typst-template"
 
+[clean-hda."0.1.0"]
+url = "https://packages.typst.org/preview/clean-hda-0.1.0.tar.gz"
+hash = "sha256-P94SIGHfF+KmFSfOsUQFcsgLqUWjplsAQMevPa96SSw="
+typstDeps = [
+    "codelst_2_0_2",
+    "glossarium_0_5_6",
+    "hydra_0_6_1",
+]
+description = "Computer Science Thesis for Hochschule Darmstadt (h_da"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/stefan-ctrl/clean-hda-typst-template"
+
+[clean-hwr."0.1.4"]
+url = "https://packages.typst.org/preview/clean-hwr-0.1.4.tar.gz"
+hash = "sha256-1/Bi1Vkr4fO+2f/U8RyX8UMukFmV6pdFcOVIvhbqnao="
+typstDeps = [
+    "acrostiche_0_6_0",
+    "glossarium_0_5_8",
+    "wordometer_0_1_4",
+]
+description = "A simple and good looking template for the Berlin School for Economics and Law"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/testspieler09/clean-hwr"
+
+[clean-hwr."0.1.3"]
+url = "https://packages.typst.org/preview/clean-hwr-0.1.3.tar.gz"
+hash = "sha256-dnWXMoYUBeTszSGyp234LhpF5+S47LJVPQsxt396hqM="
+typstDeps = [
+    "acrostiche_0_6_0",
+    "glossarium_0_5_8",
+    "wordometer_0_1_4",
+]
+description = "A simple and good looking template for the Berlin School for Economics and Law"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/testspieler09/clean-hwr"
+
+[clean-hwr."0.1.2"]
+url = "https://packages.typst.org/preview/clean-hwr-0.1.2.tar.gz"
+hash = "sha256-Jvki1+ZnoYgP4aryIt6Kqm131ZrtNn7UlUfik/iBung="
+typstDeps = [
+    "acrostiche_0_6_0",
+    "glossarium_0_5_8",
+    "wordometer_0_1_4",
+]
+description = "A simple and good looking template for the Berlin School for Economics and Law"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/testspieler09/clean-hwr"
+
+[clean-hwr."0.1.1"]
+url = "https://packages.typst.org/preview/clean-hwr-0.1.1.tar.gz"
+hash = "sha256-FxkyyaJmLoV43mSRz9Ns/uMGlXB/dSPHWjUlx+MjxUc="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "glossarium_0_5_6",
+    "wordometer_0_1_4",
+]
+description = "A simple and good looking template for the Berlin School for Economics and Law"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/testspieler09/clean-hwr"
+
 [clean-hwr."0.1.0"]
 url = "https://packages.typst.org/preview/clean-hwr-0.1.0.tar.gz"
 hash = "sha256-on5VP/Qrk2rpn2t3YoEhcs9qgaG/Dyu4S7pkqFvvd1c="
@@ -3488,6 +4042,48 @@ license = [
 ]
 homepage = "https://github.com/testspieler09/clean-hwr-template"
 
+[clean-math-paper."0.2.4"]
+url = "https://packages.typst.org/preview/clean-math-paper-0.2.4.tar.gz"
+hash = "sha256-stmqMjEBgbeQTLrBo3Gdi8lP6rOrm3saOV23WYibCu4="
+typstDeps = [
+    "great-theorems_0_1_2",
+    "i-figured_0_2_4",
+    "rich-counters_0_2_2",
+]
+description = "A simple and good looking template for mathematical papers"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JoshuaLampert/clean-math-paper"
+
+[clean-math-paper."0.2.3"]
+url = "https://packages.typst.org/preview/clean-math-paper-0.2.3.tar.gz"
+hash = "sha256-f/ECy7LyeDxjamQ0Wwcmr/CnnWQgp71aqmgPT5IOj40="
+typstDeps = [
+    "great-theorems_0_1_2",
+    "i-figured_0_2_4",
+    "rich-counters_0_2_2",
+]
+description = "A simple and good looking template for mathematical papers"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JoshuaLampert/clean-math-paper"
+
+[clean-math-paper."0.2.2"]
+url = "https://packages.typst.org/preview/clean-math-paper-0.2.2.tar.gz"
+hash = "sha256-6V9d+JByXXDVTC8jCY25D8EkbLyOBmYRdVieDy+4AoI="
+typstDeps = [
+    "great-theorems_0_1_2",
+    "i-figured_0_2_4",
+    "rich-counters_0_2_2",
+]
+description = "A simple and good looking template for mathematical papers"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JoshuaLampert/clean-math-paper"
+
 [clean-math-paper."0.2.1"]
 url = "https://packages.typst.org/preview/clean-math-paper-0.2.1.tar.gz"
 hash = "sha256-DyXu46y/WFZPZeCLkrX/piFhy6lmZZm0ZuTB6CHf6iE="
@@ -3570,6 +4166,23 @@ license = [
 ]
 homepage = "https://github.com/JoshuaLampert/clean-math-presentation"
 
+[clean-math-thesis."0.4.0"]
+url = "https://packages.typst.org/preview/clean-math-thesis-0.4.0.tar.gz"
+hash = "sha256-J7HoM4aC3FTdKSZDrz2OlmtCwMzQSKJ0qjU+E0BKzCA="
+typstDeps = [
+    "equate_0_3_2",
+    "great-theorems_0_1_2",
+    "hydra_0_6_1",
+    "i-figured_0_2_4",
+    "lovelace_0_3_0",
+    "rich-counters_0_2_2",
+]
+description = "A simple and good looking template for mathematical theses"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/sebaseb98/clean-math-thesis"
+
 [clean-math-thesis."0.3.0"]
 url = "https://packages.typst.org/preview/clean-math-thesis-0.3.0.tar.gz"
 hash = "sha256-67E7/gEnO9z7lnDLqcsEysCtVtbw5VA4BXVmG/QmpvQ="
@@ -3619,6 +4232,62 @@ license = [
 ]
 homepage = "https://github.com/sebaseb98/clean-math-thesis"
 
+[clean-uoft-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/clean-uoft-thesis-0.1.0.tar.gz"
+hash = "sha256-r+ojrTHkXSjQJD0nyQXbu8YgybLcP8Zr4LZPU/Zcwsg="
+typstDeps = [
+    "wordometer_0_1_4",
+]
+description = "Unofficial formatting-compliant masters and doctoral thesese for the School of Graduate Studies at the University of Toronto"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pvelayudhan/clean-uoft-thesis"
+
+[cleanified-hpi-research-proposal."0.1.0"]
+url = "https://packages.typst.org/preview/cleanified-hpi-research-proposal-0.1.0.tar.gz"
+hash = "sha256-/n21OXWns8xee8gscLjsmZhshKZFuflY0XA+FgF+IPs="
+typstDeps = [
+    "biceps_0_0_1",
+]
+description = "Clean-Asthetic HPI Research Proposal"
+license = [
+    "MIT",
+]
+homepage = "https://gitlab.hpi.de/robert.richter/typst-research-proposal-template/"
+
+[cleanified-hpi-research-proposal."0.0.2"]
+url = "https://packages.typst.org/preview/cleanified-hpi-research-proposal-0.0.2.tar.gz"
+hash = "sha256-VjirzYDxEL03o3sAcY7+Iv3Skb7cuxxuqSPPXKKDNts="
+typstDeps = [
+    "biceps_0_0_1",
+]
+description = "Clean-Asthetic HPI Research Proposal"
+license = [
+    "MIT",
+]
+homepage = "https://gitlab.hpi.de/robert.richter/typst-research-proposal-template/"
+
+[cleanified-hpi-research-proposal."0.0.1"]
+url = "https://packages.typst.org/preview/cleanified-hpi-research-proposal-0.0.1.tar.gz"
+hash = "sha256-rQcyLHCAZE42YbBvr4B/YTy8N+caDL6D8z/Tlgyo+7s="
+typstDeps = []
+description = "Clean-Asthetic HPI Research Proposal"
+license = [
+    "MIT",
+]
+homepage = "https://gitlab.hpi.de/robert.richter/typst-research-proposal-template/"
+
+[cleanified-hpi-thesis."0.0.1"]
+url = "https://packages.typst.org/preview/cleanified-hpi-thesis-0.0.1.tar.gz"
+hash = "sha256-g4gquvnBSVczNbu5dg7xcO9QcVHfDWQ28e231INWAN8="
+typstDeps = []
+description = "Clean-Asthetic Bachelor's and Master's thesis for HPI, University of Potsdam"
+license = [
+    "MIT",
+]
+homepage = "https://gitlab.hpi.de/robert.richter/typst-thesis-template/"
+
 [clear-iclr."0.7.0"]
 url = "https://packages.typst.org/preview/clear-iclr-0.7.0.tar.gz"
 hash = "sha256-d5Jv1xtNJllFK6nC56jU6xmfMZa2tp2GvNwspDLxW6c="
@@ -3639,6 +4308,26 @@ license = [
 ]
 homepage = "https://github.com/daskol/typst-templates"
 
+[clickworthy-resume."1.0.1"]
+url = "https://packages.typst.org/preview/clickworthy-resume-1.0.1.tar.gz"
+hash = "sha256-pTBkOTg2dpwyp19lP73AVasB2mQUhb8ZnBcbJHXDmgw="
+typstDeps = []
+description = "A simple, flexible, responsive, ATS-friendly, and click-worthy resume. Extra cover letter and extendable to a CV"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/AbdullahHendy/clickworthy-resume"
+
+[clickworthy-resume."1.0.0"]
+url = "https://packages.typst.org/preview/clickworthy-resume-1.0.0.tar.gz"
+hash = "sha256-YcSLT+J5y24eDbba5qCTC4J5kjbvXCR6b/vboWTVs98="
+typstDeps = []
+description = "A simple, flexible, responsive, ATS-friendly, and click-worthy resume. Extra cover letter and extendable to a CV"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/AbdullahHendy/clickworthy-resume"
+
 [cmarker."0.1.6"]
 url = "https://packages.typst.org/preview/cmarker-0.1.6.tar.gz"
 hash = "sha256-L/lp2Skb/MUxNYmLL1D2MXW/pkQK8Rw6WgkmBIfnc74="
@@ -3711,6 +4400,18 @@ license = [
 ]
 homepage = "https://github.com/SabrinaJewson/cmarker.typ"
 
+[cob-unofficial."0.1.0"]
+url = "https://packages.typst.org/preview/cob-unofficial-0.1.0.tar.gz"
+hash = "sha256-gIsw3tI15T62pBPUqESOfhr3JyZzZhuTKOcLcxbckKU="
+typstDeps = [
+    "hallon_0_1_2",
+]
+description = "Unofficial CoB (The Company of Biologists) template for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/cob-unofficial"
+
 [codedis."0.1.0"]
 url = "https://packages.typst.org/preview/codedis-0.1.0.tar.gz"
 hash = "sha256-SWQUciVv3d7LY65zCYMq88JVnWWJsWV0WhW5wIf+UGw="
@@ -4139,6 +4840,20 @@ license = [
 ]
 homepage = "https://gitlab.com/giacomogallina/commute"
 
+[conchord."0.4.0"]
+url = "https://packages.typst.org/preview/conchord-0.4.0.tar.gz"
+hash = "sha256-4q/sHHFsy5zWHEumQRr8chYaONCmAhVZbznOQxrr7TE="
+typstDeps = [
+    "cetz_0_4_1",
+    "chordx_0_6_0",
+    "tidy_0_4_3",
+]
+description = "Easily write lyrics with chords, generate chord diagrams by chord names and draw tabs"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/sitandr/conchord"
+
 [conchord."0.3.0"]
 url = "https://packages.typst.org/preview/conchord-0.3.0.tar.gz"
 hash = "sha256-0hBsYDHBywChgFvPj4blEYfWTEYeDIFhtOB0FW9M53c="
@@ -4409,6 +5124,51 @@ license = [
 ]
 homepage = "https://github.com/lublak/typst-ctxjs-package"
 
+[ctyp."0.2.0"]
+url = "https://packages.typst.org/preview/ctyp-0.2.0.tar.gz"
+hash = "sha256-QqO/mQ3QIAMFbcwpxm73D4LZIb2jOhGGJSAc9YropD0="
+typstDeps = []
+description = "A Typst package for Chinese typography"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hpdell/ctyp"
+
+[ctyp."0.1.1"]
+url = "https://packages.typst.org/preview/ctyp-0.1.1.tar.gz"
+hash = "sha256-y4aB+s3RsqfK46lhgnf6DpKwsNzt4FFdsBEdud86GqI="
+typstDeps = []
+description = "A Typst package for Chinese typography"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hpdell/ctyp"
+
+[ctyp."0.1.0"]
+url = "https://packages.typst.org/preview/ctyp-0.1.0.tar.gz"
+hash = "sha256-sXVnCvnr9KSPN2RXQF75tF9ZUDwTK6Hb6ht/ZOgWkIs="
+typstDeps = [
+    "cjk-unbreak_0_1_1",
+]
+description = "A Typst package for Chinese typography"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hpdell/ctyp"
+
+[cumcm-muban."0.4.0"]
+url = "https://packages.typst.org/preview/cumcm-muban-0.4.0.tar.gz"
+hash = "sha256-+fYW/GtAfmYMg7cO9I7qrTEVqWcOu+EFl5I4w2IOvSI="
+typstDeps = [
+    "ctheorems_1_1_3",
+    "cumcm-muban_0_3_0",
+]
+description = "为高教社杯全国大学生数学建模竞赛设计的 Typst 模板"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/a-kkiri/CUMCM-typst-template"
+
 [cumcm-muban."0.3.0"]
 url = "https://packages.typst.org/preview/cumcm-muban-0.3.0.tar.gz"
 hash = "sha256-C96mN6opUM3+w4g9iQBnVCuIHROfUvTU6vt5PDSLLbQ="
@@ -4592,6 +5352,16 @@ license = [
 ]
 homepage = "https://github.com/csimide/cuti"
 
+[cv-soft-and-hard."0.1.0"]
+url = "https://packages.typst.org/preview/cv-soft-and-hard-0.1.0.tar.gz"
+hash = "sha256-mmOJjM+f4EfATDnGN7DgviAZkfJ4r+2XZHlr2GdSYGk="
+typstDeps = []
+description = "Clean CV Template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jonaspleyer/cv-soft-and-hard"
+
 [cvssc."0.1.1"]
 url = "https://packages.typst.org/preview/cvssc-0.1.1.tar.gz"
 hash = "sha256-COZzBQ2MqLGKlUlXweYpkERIzC3OE4OUeKNKntQhPpg="
@@ -4616,6 +5386,97 @@ license = [
     "MIT",
 ]
 
+[cyberschool-errorteaplate."0.1.12"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.12.tar.gz"
+hash = "sha256-w2wTPyhs9NmvF7t/uNDr/rmbXLacThyB5cXBwBw1KB0="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
+[cyberschool-errorteaplate."0.1.11"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.11.tar.gz"
+hash = "sha256-J06OIEFnyDkb3JDt1sFOTrThqHGnQhwbw2JYFKl2Wdw="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
+[cyberschool-errorteaplate."0.1.10"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.10.tar.gz"
+hash = "sha256-Rwhv9Nmb+/wwob2VJjCaBjVV3MKthnKI70Xj36/tcFc="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
+[cyberschool-errorteaplate."0.1.9"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.9.tar.gz"
+hash = "sha256-mjBkQnccyBMI8F3/KHQIni4xXgihLJlde4a4Ie65eQM="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
+[cyberschool-errorteaplate."0.1.8"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.8.tar.gz"
+hash = "sha256-OWkBfbrYXy297UCChk+kqsVZex/+sP5OmpvE1XSbjfw="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
+[cyberschool-errorteaplate."0.1.7"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.7.tar.gz"
+hash = "sha256-StXx82ER7YFKq74zXl3EknpVIya3oC/xgvPIsW7Gp3Y="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
+[cyberschool-errorteaplate."0.1.6"]
+url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.6.tar.gz"
+hash = "sha256-PbIiyqQTw10S8BHB8eY/G3e8D0282vHImiR8YWzli54="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+]
+description = "This is a template originaly made for the Cyberschool of Rennes, a Cybersecurity school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ErrorTeaPot/Cyberschool_template"
+
 [cyberschool-errorteaplate."0.1.5"]
 url = "https://packages.typst.org/preview/cyberschool-errorteaplate-0.1.5.tar.gz"
 hash = "sha256-byWzwRm13Vqd1c/bJ/1yZdm1dw+wfg9QwIpTOZSBuJg="
@@ -4675,6 +5536,36 @@ license = [
 ]
 homepage = "https://github.com/typst/templates"
 
+[dashy-todo."0.1.2"]
+url = "https://packages.typst.org/preview/dashy-todo-0.1.2.tar.gz"
+hash = "sha256-tOGjesNbx7KVfv/MWYgakDVfT/xlVizxc2lPhrHDt3c="
+typstDeps = []
+description = "A method to display TODOs at the side of the page"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/Otto-AA/dashy-todo"
+
+[dashy-todo."0.1.1"]
+url = "https://packages.typst.org/preview/dashy-todo-0.1.1.tar.gz"
+hash = "sha256-cWoPd5ok4LktN3J3O6d/nw37pMtERfoWb2y7QmTvyKg="
+typstDeps = []
+description = "A method to display TODOs at the side of the page"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/Otto-AA/dashy-todo"
+
+[dashy-todo."0.1.0"]
+url = "https://packages.typst.org/preview/dashy-todo-0.1.0.tar.gz"
+hash = "sha256-RVLDYHGVXzd+L3gm6dKbkcUfQnX6EcB+wVPXm6cszno="
+typstDeps = []
+description = "A method to display TODOs at the side of the page"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/Otto-AA/dashy-todo"
+
 [dashy-todo."0.0.3"]
 url = "https://packages.typst.org/preview/dashy-todo-0.0.3.tar.gz"
 hash = "sha256-PijpOpLWjVAvoabzsxNk9gZVMbgLPVgFUJ2LncJqrHA="
@@ -4705,6 +5596,18 @@ license = [
 ]
 homepage = "https://github.com/Otto-AA/dashy-todo"
 
+[datify."1.0.0"]
+url = "https://packages.typst.org/preview/datify-1.0.0.tar.gz"
+hash = "sha256-bzh3ODfa7AaZedQplm4oObKcyt13pHhrnVHGtUW260E="
+typstDeps = [
+    "datify-core_1_0_0",
+]
+description = "Datify is a Typst package for flexible, locale-aware date formatting. It leverages datify-core for internationalization and supports CLDR-style date patterns"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Jeomhps/datify"
+
 [datify."0.1.4"]
 url = "https://packages.typst.org/preview/datify-0.1.4.tar.gz"
 hash = "sha256-L4Ke+165ukcmBoWilOeBm0Jvx2vtbMLH+uyUxFyvdF0="
@@ -4745,6 +5648,16 @@ license = [
 ]
 homepage = "https://github.com/Jeomhps/datify"
 
+[datify-core."1.0.0"]
+url = "https://packages.typst.org/preview/datify-core-1.0.0.tar.gz"
+hash = "sha256-esUWhE9bQZiEoM+FBkEypMpIS2Jwg5GvOHElfXo+P8U="
+typstDeps = []
+description = "Localization data and date formatting patterns for Typst, powered by CLDR. Backend for Datify, reusable in any Typst project"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Jeomhps/datify-core"
+
 [decasify."0.10.1"]
 url = "https://packages.typst.org/preview/decasify-0.10.1.tar.gz"
 hash = "sha256-qW5gjrNSaK8xU9JIs1NxE2Bj1yB7g1WyHTR1bc3FlR0="
@@ -4775,6 +5688,69 @@ license = [
 ]
 homepage = "https://github.com/alerque/decasify"
 
+[deckz."0.3.1"]
+url = "https://packages.typst.org/preview/deckz-0.3.1.tar.gz"
+hash = "sha256-JokybXRtOLS6KcZ87nthnWGTialA5Vufd0i15zLMeFQ="
+typstDeps = [
+    "cetz_0_4_1",
+    "digestify_0_1_0",
+    "linguify_0_4_2",
+    "mantys_1_0_2",
+    "suiji_0_4_0",
+    "tidy_0_4_3",
+]
+description = "Render poker-style cards and full decks"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/micheledusi/Deckz"
+
+[deckz."0.3.0"]
+url = "https://packages.typst.org/preview/deckz-0.3.0.tar.gz"
+hash = "sha256-NlVc+NYWtf/QEXiSfoxi3sHilzIcNpFsh5+ZUqIusmQ="
+typstDeps = [
+    "cetz_0_4_1",
+    "digestify_0_1_0",
+    "linguify_0_4_2",
+    "mantys_1_0_2",
+    "suiji_0_4_0",
+    "tidy_0_4_3",
+]
+description = "Render poker-style cards and full decks"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/micheledusi/Deckz"
+
+[deckz."0.2.0"]
+url = "https://packages.typst.org/preview/deckz-0.2.0.tar.gz"
+hash = "sha256-wGTOfUt8QFYbVAuw5Svlv0K8DXjixFzVd8Y/UOxW84A="
+typstDeps = [
+    "cetz_0_4_1",
+    "linguify_0_4_2",
+    "mantys_1_0_2",
+    "suiji_0_4_0",
+    "tidy_0_4_3",
+]
+description = "Render poker-style cards and full decks"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/micheledusi/Deckz"
+
+[deckz."0.1.0"]
+url = "https://packages.typst.org/preview/deckz-0.1.0.tar.gz"
+hash = "sha256-bw9RqJaWQmhlLo1KN+tgfdUT6hOhKMLFro5Kri34D1E="
+typstDeps = [
+    "cetz_0_4_0",
+    "suiji_0_4_0",
+]
+description = "Render poker-style cards and full decks"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/micheledusi/Deckz"
+
 [defined."0.1.0"]
 url = "https://packages.typst.org/preview/defined-0.1.0.tar.gz"
 hash = "sha256-4ON8im4nwdi8cydBmnwYRY7d8Qovu+X2+63G+Z8aEH4="
@@ -4787,6 +5763,42 @@ license = [
 ]
 homepage = "https://github.com/profetia/defined"
 
+[definitely-not-isec-slides."1.0.1"]
+url = "https://packages.typst.org/preview/definitely-not-isec-slides-1.0.1.tar.gz"
+hash = "sha256-WYSUwzTpoDCa+rkYnPC9NAvdmb+AwemyW/WjGiMUi8U="
+typstDeps = [
+    "cetz_0_4_2",
+    "codly_1_3_0",
+    "fletcher_0_5_8",
+    "showybox_2_0_4",
+    "tableau-icons_0_331_0",
+    "tiaoma_0_3_0",
+    "touying_0_6_1",
+]
+description = "An unofficial ISEC TUGraz slides template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ecomaikgolf/typst-isec-slides-template"
+
+[definitely-not-isec-slides."1.0.0"]
+url = "https://packages.typst.org/preview/definitely-not-isec-slides-1.0.0.tar.gz"
+hash = "sha256-ghFp+8LmIpGNmJPM/s/m/RvMFghG/vyMJ1EJQ0rMdyw="
+typstDeps = [
+    "cetz_0_4_1",
+    "codly_1_3_0",
+    "fletcher_0_5_8",
+    "showybox_2_0_4",
+    "tableau-icons_0_331_0",
+    "tiaoma_0_3_0",
+    "touying_0_6_1",
+]
+description = "An unofficial ISEC TUGraz slides template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ecomaikgolf/typst-isec-slides-template"
+
 [definitely-not-isec-thesis."2.0.1"]
 url = "https://packages.typst.org/preview/definitely-not-isec-thesis-2.0.1.tar.gz"
 hash = "sha256-5mxFjH8gF1biPwEclEdRpMgth8FHBcrJWauc3PCYmIo="
@@ -4819,6 +5831,18 @@ license = [
 ]
 homepage = "https://github.com/ecomaikgolf/typst-isec-master-thesis-template/"
 
+[definitely-not-tuw-thesis."0.2.0"]
+url = "https://packages.typst.org/preview/definitely-not-tuw-thesis-0.2.0.tar.gz"
+hash = "sha256-iCD1hRTNh+5ok8+QRCwRbNIZN/SwqdE4i566zYExHJ8="
+typstDeps = [
+    "linguify_0_4_2",
+]
+description = "An unofficial template for a thesis at the TU Wien informatics institute"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/Otto-AA/definitely-not-tuw-thesis"
+
 [definitely-not-tuw-thesis."0.1.0"]
 url = "https://packages.typst.org/preview/definitely-not-tuw-thesis-0.1.0.tar.gz"
 hash = "sha256-cVvHDgg9H95Npk91WMyWNKoXKO+zydRDKQkyx4nSmtM="
@@ -4911,6 +5935,26 @@ license = [
 ]
 homepage = "https://github.com/0rphee/derive-it"
 
+[diagraph."0.3.6"]
+url = "https://packages.typst.org/preview/diagraph-0.3.6.tar.gz"
+hash = "sha256-LBplb807NgR0oovh7fxRWpqhOBfxm7uyETgj3Q7otTw="
+typstDeps = []
+description = "Draw graphs with Graphviz. Use mathematical formulas as labels"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Robotechnic/diagraph.git"
+
+[diagraph."0.3.5"]
+url = "https://packages.typst.org/preview/diagraph-0.3.5.tar.gz"
+hash = "sha256-diUbQHUePKawZLOYc09LgfH8dgENl6xWmKL42AfgYM4="
+typstDeps = []
+description = "Draw graphs with Graphviz. Use mathematical formulas as labels"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Robotechnic/diagraph.git"
+
 [diagraph."0.3.4"]
 url = "https://packages.typst.org/preview/diagraph-0.3.4.tar.gz"
 hash = "sha256-xhvuq7xva0vIRdxYFrMcQTfcZATfxN+SBbV7ofAx58I="
@@ -5051,6 +6095,40 @@ license = [
 ]
 homepage = "https://github.com/Robotechnic/diagraph.git"
 
+[diagraph-layout."0.0.1"]
+url = "https://packages.typst.org/preview/diagraph-layout-0.0.1.tar.gz"
+hash = "sha256-AnBILoe4D9xCfFFJZ2+Hf3XIDnHYZH7OK4WAzAfme+I="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "Exposes the graphviz layout engines api to render graph without dot"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Robotechnic/diagraph-layout.git"
+
+[diatypst."0.7.1"]
+url = "https://packages.typst.org/preview/diatypst-0.7.1.tar.gz"
+hash = "sha256-OPTOQ/VJ2oKaanPY22Y2b9UX7Sb1PtMWXiuzP+J7eiQ="
+typstDeps = []
+description = "easy slides in typst - sensible defaults, easy syntax, well styled"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/skriptum/Diatypst"
+
+[diatypst."0.7.0"]
+url = "https://packages.typst.org/preview/diatypst-0.7.0.tar.gz"
+hash = "sha256-Gy4fZVqn/yMEZY3Xl+lBeQZ0fA+tjDrieRJRIP6K578="
+typstDeps = [
+    "diatypst_0_2_0",
+]
+description = "easy slides in typst - sensible defaults, easy syntax, well styled"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/skriptum/Diatypst"
+
 [diatypst."0.6.0"]
 url = "https://packages.typst.org/preview/diatypst-0.6.0.tar.gz"
 hash = "sha256-mBIH+lXGlFoeEfAHKuHoklrg0DT2UxMEjYlfnmx/g+E="
@@ -5121,6 +6199,25 @@ license = [
 ]
 homepage = "https://github.com/skriptum/Diatypst"
 
+[dice."1.0.0"]
+url = "https://packages.typst.org/preview/dice-1.0.0.tar.gz"
+hash = "sha256-9twA11NPECU9qIhQBo7IRsd5Llks2abda8On7cbm16c="
+typstDeps = []
+description = "A versatile random number toolkit for Typst"
+license = [
+    "MIT",
+]
+
+[digestify."0.1.0"]
+url = "https://packages.typst.org/preview/digestify-0.1.0.tar.gz"
+hash = "sha256-Qc8OG1dYAsF2vgw0+APLNG/hrMqg/g05s+V/7zpnOGs="
+typstDeps = []
+description = "A blazing fast cryptographic hash package for Typst, powered by WebAssembly"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ParaN3xus/digestify"
+
 [dining-table."0.1.0"]
 url = "https://packages.typst.org/preview/dining-table-0.1.0.tar.gz"
 hash = "sha256-JoZd2QGPf0JK6pPiaMTB88JEoBR/JUvgsXclq0gvhxE="
@@ -5150,6 +6247,30 @@ license = [
 ]
 homepage = "https://github.com/tedius-git/divine-words"
 
+[dmi-basilea-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/dmi-basilea-thesis-0.1.1.tar.gz"
+hash = "sha256-1cM98KWcEYSwbemwb17HV7/WfG344YjlOyjtT5uH0Q4="
+typstDeps = [
+    "unibas-thesis_0_1_0",
+]
+description = "A thesis template for the dmi at the university of basel"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Nifalu/dmi-basilea-thesis"
+
+[dmi-basilea-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/dmi-basilea-thesis-0.1.0.tar.gz"
+hash = "sha256-lhMAWQgsbfT//XEjdU34cFxsCUBnDySMgaTyIcW+aXo="
+typstDeps = [
+    "unibas-thesis_0_1_0",
+]
+description = "A thesis template for the dmi at the university of basel"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Nifalu/dmi-basilea-thesis"
+
 [dovenv."0.1.0"]
 url = "https://packages.typst.org/preview/dovenv-0.1.0.tar.gz"
 hash = "sha256-H0yY6dW6FwFTkTE6K8A0UmjSbPbIFuh+RH2ggD6JbZw="
@@ -5229,6 +6350,16 @@ license = [
     "Unlicense",
 ]
 
+[dragonling."0.2.0"]
+url = "https://packages.typst.org/preview/dragonling-0.2.0.tar.gz"
+hash = "sha256-9zRApaho2RpPKhMTjY6hAT+ZPOKxCMpa6b2iXl+mtDc="
+typstDeps = []
+description = "A comprehensive Typst template for creating Dungeons & Dragons 5E content including stat blocks, spell cards, and adventure modules"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/coljac/typst-dnd5e"
+
 [droplet."0.3.1"]
 url = "https://packages.typst.org/preview/droplet-0.3.1.tar.gz"
 hash = "sha256-ngKk23tUePES0KJ8ywikO1xSDmYkJyr1VANLxV3ILVY="
@@ -5330,6 +6461,18 @@ license = [
 ]
 homepage = "https://github.com/monaqa/typst-easytable"
 
+[echarm."0.3.0"]
+url = "https://packages.typst.org/preview/echarm-0.3.0.tar.gz"
+hash = "sha256-15yGdTrYH7/qpo+3QYuKbYiTMlAfhkhSwcvun2Axe9U="
+typstDeps = [
+    "ctxjs_0_3_1",
+]
+description = "Run echarts in typst with the use of CtxJS"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lublak/typst-echarm-package"
+
 [echarm."0.2.1"]
 url = "https://packages.typst.org/preview/echarm-0.2.1.tar.gz"
 hash = "sha256-7msh2oSNLToUkDKIrDDkUs9Zj2im09EE1xcHxRgoXF4="
@@ -5388,6 +6531,27 @@ license = [
 ]
 homepage = "https://github.com/neuralpain/edgeframe"
 
+[eeaabb."0.1.0"]
+url = "https://packages.typst.org/preview/eeaabb-0.1.0.tar.gz"
+hash = "sha256-yHl7i9R/+tCnSXGi2h7lNvzMNMN4JyjLV1lhl6RUv8o="
+typstDeps = [
+    "oxifmt_1_0_0",
+]
+description = "Extract element AABBs and inspect sizes"
+license = [
+    "MIT",
+]
+
+[efilrst."0.3.2"]
+url = "https://packages.typst.org/preview/efilrst-0.3.2.tar.gz"
+hash = "sha256-oBjix+GtlekSToHjLgn9deZWmjRZoqxWGvMbNLWUpMQ="
+typstDeps = []
+description = "A simple referenceable list library for typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jmigual/typst-efilrst"
+
 [efilrst."0.3.1"]
 url = "https://packages.typst.org/preview/efilrst-0.3.1.tar.gz"
 hash = "sha256-Xrt6aikAZeV0KodY6qNELZ5STxZuVwflA6J+2ES4jz8="
@@ -5428,6 +6592,22 @@ license = [
 ]
 homepage = "https://github.com/jmigual/typst-efilrst"
 
+[efter-plugget."0.1.0"]
+url = "https://packages.typst.org/preview/efter-plugget-0.1.0.tar.gz"
+hash = "sha256-fH8lLnbxSV4521N+zjDIqQMOqZnqeqVFWBodVkhWlX4="
+typstDeps = [
+    "cellpress-unofficial_0_1_0",
+    "hallon_0_1_2",
+    "latex-lookalike_0_1_4",
+    "nth_1_0_1",
+    "smartaref_0_1_0",
+]
+description = "Lab report, essay and exam template for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/efter-plugget"
+
 [eggs."0.1.0"]
 url = "https://packages.typst.org/preview/eggs-0.1.0.tar.gz"
 hash = "sha256-e+giwCf/rFnzqeI/aSKh/oMZILsPUn2Wdrb5UCdQoD8="
@@ -5472,6 +6652,24 @@ license = [
 ]
 homepage = "https://github.com/ctypst/elegant-paper-typst"
 
+[elegant-polimi-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/elegant-polimi-thesis-0.1.1.tar.gz"
+hash = "sha256-bt14wB+1v4iq0Zxp+4upsTS00uzmwuED1qPCn5O3rMw="
+typstDeps = [
+    "algo_0_3_6",
+    "great-theorems_0_1_2",
+    "headcount_0_1_0",
+    "lovelace_0_3_0",
+    "metalogo_1_2_0",
+    "subpar_0_2_2",
+    "tidy_0_4_3",
+]
+description = "An unofficial thesis template for the Polytechnic University of Milan"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/VictuarVi/PoliMi-PhD-Thesis"
+
 [elegant-polimi-thesis."0.1.0"]
 url = "https://packages.typst.org/preview/elegant-polimi-thesis-0.1.0.tar.gz"
 hash = "sha256-oacgSwj6UWnvlkibSYHpru0mCCAhw5ES9HprqnRlzbc="
@@ -5487,6 +6685,17 @@ license = [
 ]
 homepage = "https://github.com/VictuarVi/PoliMi-PhD-Thesis"
 
+[elembic."1.1.1"]
+url = "https://packages.typst.org/preview/elembic-1.1.1.tar.gz"
+hash = "sha256-IHXobR+tsQhOOkHRmu+GzbGWeslTVqkw11Vyu6TulQY="
+typstDeps = []
+description = "Framework for custom elements and types in Typst"
+license = [
+    "MIT",
+    "Apache-2.0",
+]
+homepage = "https://github.com/PgBiel/elembic"
+
 [elembic."1.1.0"]
 url = "https://packages.typst.org/preview/elembic-1.1.0.tar.gz"
 hash = "sha256-O8V0/e1fWZh1UdIHlJM2IU6SGpqvWBwbzkCqyBn91Gg="
@@ -5509,6 +6718,38 @@ license = [
 ]
 homepage = "https://github.com/PgBiel/elembic"
 
+[elsearticle."1.0.0"]
+url = "https://packages.typst.org/preview/elsearticle-1.0.0.tar.gz"
+hash = "sha256-kZx2W3DAgUkPL04zkXldX1svczlqVhGFYhdMFrCQGc0="
+typstDeps = [
+    "cheq_0_2_2",
+    "equate_0_3_2",
+    "mantys_1_0_2",
+    "subpar_0_2_2",
+    "swank-tex_0_1_0",
+]
+description = "Conversion of the LaTeX elsearticle.cls"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/elsearticle"
+
+[elsearticle."0.4.3"]
+url = "https://packages.typst.org/preview/elsearticle-0.4.3.tar.gz"
+hash = "sha256-ztIXrmwtjL5hnv7s7vPXKb7lwltM6ZZjgzegQOmKa1A="
+typstDeps = [
+    "cheq_0_2_2",
+    "equate_0_3_2",
+    "mantys_1_0_2",
+    "subpar_0_2_2",
+    "swank-tex_0_1_0",
+]
+description = "Conversion of the LaTeX elsearticle.cls"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/elsearticle"
+
 [elsearticle."0.4.2"]
 url = "https://packages.typst.org/preview/elsearticle-0.4.2.tar.gz"
 hash = "sha256-QlnOgnxC5dBlFtBVKlgbdE/QnC3yeIUpT7Kn445HrXI="
@@ -5607,6 +6848,38 @@ license = [
     "MIT",
 ]
 
+[elsevier-replica."0.1.0"]
+url = "https://packages.typst.org/preview/elsevier-replica-0.1.0.tar.gz"
+hash = "sha256-o1IUljQZYsG07P89VYzDL0yAUu7Jv8jf19hNjPK7DEI="
+typstDeps = [
+    "cheq_0_2_2",
+    "equate_0_3_2",
+    "mantys_1_0_2",
+    "subpar_0_2_2",
+    "swank-tex_0_1_0",
+]
+description = "Elsevier article template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/elsevier-replica"
+
+[elspub."0.2.0"]
+url = "https://packages.typst.org/preview/elspub-0.2.0.tar.gz"
+hash = "sha256-Mo7MoDUb0k5fAKfzvvj5FenANeUNZhWGDIqOpE6/BOc="
+typstDeps = [
+    "cheq_0_2_2",
+    "equate_0_3_2",
+    "mantys_1_0_2",
+    "subpar_0_2_2",
+    "swank-tex_0_1_0",
+]
+description = "Elsevier article template for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/maucejo/elspub"
+
 [embiggen."0.0.1"]
 url = "https://packages.typst.org/preview/embiggen-0.0.1.tar.gz"
 hash = "sha256-6IDxLVIVGD7xVAJAjeWwuywUoxjPvVswb7GeT4bjhsg="
@@ -5636,6 +6909,15 @@ license = [
 ]
 homepage = "https://github.com/leana8959/univ-rennes.typ"
 
+[enseeiht-internship-report."0.1.0"]
+url = "https://packages.typst.org/preview/enseeiht-internship-report-0.1.0.tar.gz"
+hash = "sha256-jukEUSPLrDtLV5JtPlsvHeti6R/KF3/kY3sN+dYFkQs="
+typstDeps = []
+description = "Unofficial Internship Report Template for ENSEEIHT"
+license = [
+    "MIT",
+]
+
 [enunciado-facil-fcfm."0.1.0"]
 url = "https://packages.typst.org/preview/enunciado-facil-fcfm-0.1.0.tar.gz"
 hash = "sha256-sJQRnJ7opLSbBWTcS9YNOCQlZ2lYiuMAGBSeeC3MChM="
@@ -5756,6 +7038,36 @@ license = [
 ]
 homepage = "https://github.com/EpicEricEE/typst-equate"
 
+[ergo."0.1.1"]
+url = "https://packages.typst.org/preview/ergo-0.1.1.tar.gz"
+hash = "sha256-/ZnVEa9Zbl+bpnC54sJJBmGpzPJKYmAG0pZy+YRgABU="
+typstDeps = [
+    "cetz_0_4_1",
+    "fletcher_0_5_8",
+    "lovelace_0_3_0",
+    "physica_0_9_5",
+]
+description = "A suite of customizable block environments for taking notes and doing problem sets, especially in Mathematics, Computer Science, and Physics"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/EsotericSquishyy/ergo"
+
+[ergo."0.1.0"]
+url = "https://packages.typst.org/preview/ergo-0.1.0.tar.gz"
+hash = "sha256-CPVMrp1FlQ1WGDDypmwLgOk/8hs3yDtPdTmxUI1wxMQ="
+typstDeps = [
+    "cetz_0_4_0",
+    "fletcher_0_5_4",
+    "lovelace_0_3_0",
+    "physica_0_9_5",
+]
+description = "A suite of customizable block environments for ease of taking notes or doing problem sets in Mathematics, Computer Science, Physics, and more"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/EsotericSquishyy/ergo"
+
 [esotefy."1.0.0"]
 url = "https://packages.typst.org/preview/esotefy-1.0.0.tar.gz"
 hash = "sha256-Yaex2nIpddDiJoTyV0Sl7oWltnxD4MfSIHoNbQuFv+s="
@@ -5764,7 +7076,19 @@ description = "A brainfuck implementation in pure Typst"
 license = [
     "MIT",
 ]
-homepage = "git@github.com:Thumuss/brainfuck.git"
+homepage = "https://github.com/Thumuss/brainfuck"
+
+[etykett."0.1.1"]
+url = "https://packages.typst.org/preview/etykett-0.1.1.tar.gz"
+hash = "sha256-tqTIN+FiC5JgIhoNq8ZkWouWn9/UVJewk0WUcYCgPQk="
+typstDeps = [
+    "valkyrie_0_2_2",
+]
+description = "a template for printing onto label sheets with rectangular grids of labels"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SillyFreak/typst-etykett"
 
 [etykett."0.1.0"]
 url = "https://packages.typst.org/preview/etykett-0.1.0.tar.gz"
@@ -5798,6 +7122,16 @@ license = [
 ]
 homepage = "https://github.com/tarunjana/examify"
 
+[examine-ib."0.1.2"]
+url = "https://packages.typst.org/preview/examine-ib-0.1.2.tar.gz"
+hash = "sha256-NDYgQxre+UbnBlvNaTFKgUmvGmCvdyIC9+y2Ccf1MtA="
+typstDeps = []
+description = "Template for creating exams, tests, quizzes, based on the IB exam formatting"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/nycrat/typst-ib-exam-template"
+
 [examine-ib."0.1.1"]
 url = "https://packages.typst.org/preview/examine-ib-0.1.1.tar.gz"
 hash = "sha256-ETq7Oh6yUjasgA/Z4TtuxWw2fVJtOn/vgDa1wBhBQkc="
@@ -5844,6 +7178,18 @@ license = [
     "Unlicense",
 ]
 
+[exercism."1.0.0"]
+url = "https://packages.typst.org/preview/exercism-1.0.0.tar.gz"
+hash = "sha256-mXdQ7mXg/oRbnUBh3k/dS4i3OoF6+XyhzcZ7KDUpen8="
+typstDeps = [
+    "digestify_0_1_0",
+]
+description = "Organise exercises and defer their solutions"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/mkorje/typst-exercism"
+
 [exmllent."0.1.0"]
 url = "https://packages.typst.org/preview/exmllent-0.1.0.tar.gz"
 hash = "sha256-9MCCdvY8ozy6LsYFq8dcskQydcrWE3wnsvZ8UAeLtWA="
@@ -5935,6 +7281,108 @@ license = [
 ]
 homepage = "https://github.com/CarloSchafflik12/typst-ez-today"
 
+[ezchem."0.1.0"]
+url = "https://packages.typst.org/preview/ezchem-0.1.0.tar.gz"
+hash = "sha256-hz1jR4YM86sqCpaSeVe0bpEo1WRhQ/3N2axGJ5hPxMk="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "Draw atomic or ionic structures powered by ctez and single or double line bridge"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezchem.git"
+
+[ezexam."0.1.8"]
+url = "https://packages.typst.org/preview/ezexam-0.1.8.tar.gz"
+hash = "sha256-ejNg3UWMwpzUTEni/kcNnx4CAC46qJsW/X69anAGlTY="
+typstDeps = []
+description = "A exam and handouts template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.7"]
+url = "https://packages.typst.org/preview/ezexam-0.1.7.tar.gz"
+hash = "sha256-KLW2DnNGh6NL1w568Lzh4GP/Mvh8xBwxeP1OeE2Diyg="
+typstDeps = []
+description = "A exam and handouts template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.6"]
+url = "https://packages.typst.org/preview/ezexam-0.1.6.tar.gz"
+hash = "sha256-FntbC7PBRwz7r+Qeb4lt6L43lunA6Y3WniNUKKzcI3Q="
+typstDeps = []
+description = "A exam and handouts template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.5"]
+url = "https://packages.typst.org/preview/ezexam-0.1.5.tar.gz"
+hash = "sha256-I6FdclhhnoGxS5fpR9XivrmMz+HKVFtpun3TLZN4Ygg="
+typstDeps = []
+description = "A exam and handouts template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.4"]
+url = "https://packages.typst.org/preview/ezexam-0.1.4.tar.gz"
+hash = "sha256-XxwPswQ+2VQJWxRC2DT+Sup2IljH/+naCCyQ20k/KD0="
+typstDeps = []
+description = "A exam and lecture notes template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.3"]
+url = "https://packages.typst.org/preview/ezexam-0.1.3.tar.gz"
+hash = "sha256-8W2bGo2wRZonlIGUsAebqC59pUtsN4vzNwx2dugnwy8="
+typstDeps = []
+description = "A test paper and lecture notes template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.2"]
+url = "https://packages.typst.org/preview/ezexam-0.1.2.tar.gz"
+hash = "sha256-Qnq4JPLCTS6sPMlOu7muPgnjKj77cZxQDRAC6U6WDfo="
+typstDeps = []
+description = "A test paper and lecture notes template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.1"]
+url = "https://packages.typst.org/preview/ezexam-0.1.1.tar.gz"
+hash = "sha256-dvk8mr0dDtiSKtRU0D5Wltk4fqH0CIgFs5AGy4jeMho="
+typstDeps = []
+description = "A test paper and lecture notes template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
+[ezexam."0.1.0"]
+url = "https://packages.typst.org/preview/ezexam-0.1.0.tar.gz"
+hash = "sha256-uIcH1+dMpkwa+zO+a1Q8v8FDEJ21pj5fAAWWmryFqEc="
+typstDeps = []
+description = "A test paper and lecture notes template inspired by the LaTeX package exam-zh"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gbchu/ezexam.git"
+
 [fancy-affil."0.1.0"]
 url = "https://packages.typst.org/preview/fancy-affil-0.1.0.tar.gz"
 hash = "sha256-3w4k0AfmEp+wvXIkC1koKjIQxkQm3zLBrNgNh7IfNw0="
@@ -6019,6 +7467,18 @@ license = [
 ]
 homepage = "https://github.com/leiserfg/fervojo"
 
+[fh-joanneum-iit-thesis."2.2.0"]
+url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.2.0.tar.gz"
+hash = "sha256-p/7AqeKKolUCKpn46uxFKKuOCZZyjfYub8jZGEYaJHQ="
+typstDeps = [
+    "glossarium_0_5_8",
+]
+description = "BA or MA thesis at FH JOANNEUM"
+license = [
+    "MIT",
+]
+homepage = "https://git-iit.fh-joanneum.at/oss/thesis-template"
+
 [fh-joanneum-iit-thesis."2.1.2"]
 url = "https://packages.typst.org/preview/fh-joanneum-iit-thesis-2.1.2.tar.gz"
 hash = "sha256-BfTqeHsL04xPFI2KWwW1HuUlyv5bpPIJhKpDXLwFFgk="
@@ -6100,6 +7560,30 @@ license = [
     "MIT",
 ]
 
+[fibber."0.1.0"]
+url = "https://packages.typst.org/preview/fibber-0.1.0.tar.gz"
+hash = "sha256-bgIP7f8XDbPySrSRV7Kjf3XRxgvmX8ID8SBIwsV92UY="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "Draw microfabrication process diagrams in typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/gauthamrmn/fibber"
+
+[fine-lncs."0.2.0"]
+url = "https://packages.typst.org/preview/fine-lncs-0.2.0.tar.gz"
+hash = "sha256-9DgBvyZHmVHPpsU8HxqZuKVceKRkO+WqJlxToHGKKv8="
+typstDeps = [
+    "lemmify_0_1_8",
+]
+description = "An Springer's Lecture Notes in Computer Science (LNCS) styled template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Jozott00/typst-fine-lncs"
+
 [fine-lncs."0.1.0"]
 url = "https://packages.typst.org/preview/fine-lncs-0.1.0.tar.gz"
 hash = "sha256-H2QM5j3Jx6Y/Di7D8yZTlu9AEnKQ7deMVhHwbWnHpjc="
@@ -6229,6 +7713,26 @@ license = [
     "MIT",
 ]
 
+[flagada."1.0.1"]
+url = "https://packages.typst.org/preview/flagada-1.0.1.tar.gz"
+hash = "sha256-B9yP1QmuOLMYa8KM3bzNya4evE3XN7xIlWAJqUazyh4="
+typstDeps = []
+description = "A package to generate countries flags, selecting country based on its ISO3166-1 code"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/samrenault/flagada"
+
+[flagada."1.0.0"]
+url = "https://packages.typst.org/preview/flagada-1.0.0.tar.gz"
+hash = "sha256-GnBlkFJMjZ0hBc0w4PuIYyLBPCE1ksPCTmIkE3ouVQs="
+typstDeps = []
+description = "A package to generate countries flags, selecting country based on its ISO3166-1 code"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/samrenault/flagada"
+
 [flagada."0.2.0"]
 url = "https://packages.typst.org/preview/flagada-0.2.0.tar.gz"
 hash = "sha256-kXIHE69IXN9ibklRoVMB8RWDVWCaspU6B+fuWNo1VAI="
@@ -6637,6 +8141,16 @@ license = [
 ]
 homepage = "https://github.com/Tetragramm/flying-circus-typst-template"
 
+[fontawesome."0.6.0"]
+url = "https://packages.typst.org/preview/fontawesome-0.6.0.tar.gz"
+hash = "sha256-17IcZiVwT6xCucSIi5kfMDqWG1a503vVyLiiaTyoASU="
+typstDeps = []
+description = "A Typst library for Font Awesome icons through the desktop fonts"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/duskmoon314/typst-fontawesome"
+
 [fontawesome."0.5.0"]
 url = "https://packages.typst.org/preview/fontawesome-0.5.0.tar.gz"
 hash = "sha256-deUJ24arS9YenlMNjUgxsq9cZ7R/TksgNDDblCcPT5Q="
@@ -6707,6 +8221,16 @@ license = [
 ]
 homepage = "https://github.com/duskmoon314/typst-fontawesome"
 
+[formalettre."0.2.0"]
+url = "https://packages.typst.org/preview/formalettre-0.2.0.tar.gz"
+hash = "sha256-JPOTl+Gwdlpma58BMRQWv/v5vOHnvrqG3Kgsp3S7u5k="
+typstDeps = []
+description = "French formal letter template"
+license = [
+    "BSD-3-Clause",
+]
+homepage = "https://github.com/Brndan/lettre"
+
 [formalettre."0.1.3"]
 url = "https://packages.typst.org/preview/formalettre-0.1.3.tar.gz"
 hash = "sha256-51SXjB7Icsb0NUPvhPhmaZxa2AJF8D0DLhm5zFzH7YI="
@@ -6918,6 +8442,16 @@ license = [
 ]
 homepage = "https://github.com/polylux-typ/friendly"
 
+[frogst."1.0.0"]
+url = "https://packages.typst.org/preview/frogst-1.0.0.tar.gz"
+hash = "sha256-YxVBCbrlm6532moORtmQcHfd39ljXJ9Y+/46GOuaPBs="
+typstDeps = []
+description = "Literal naming of numbers in French"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Raphael-CV/frogst"
+
 [fruitify."0.1.1"]
 url = "https://packages.typst.org/preview/fruitify-0.1.1.tar.gz"
 hash = "sha256-CEvzympelzWxXFudpn/7w1noPcfrq7RWUxcVHw+FqIs="
@@ -7034,6 +8568,18 @@ license = [
     "GPL-3.0-or-later",
 ]
 
+[g-exam."0.4.3"]
+url = "https://packages.typst.org/preview/g-exam-0.4.3.tar.gz"
+hash = "sha256-nQd4e5V6M8HSIzq5o7yDHrTljmVvFDzBteMCoSkM1qs="
+typstDeps = [
+    "oxifmt_1_0_0",
+]
+description = "Create exams with student information, grade chart, score control, questions, and sub-questions"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/MatheSchool/typst-g-exam"
+
 [g-exam."0.4.2"]
 url = "https://packages.typst.org/preview/g-exam-0.4.2.tar.gz"
 hash = "sha256-PLlZ4+/CPccRlre8hTfe8/tNe/372pHPeX6ZuikuyCI="
@@ -7147,6 +8693,16 @@ license = [
 ]
 homepage = "https://github.com/MatheSchool/typst-g-exam"
 
+[gallus-hsg."1.0.0"]
+url = "https://packages.typst.org/preview/gallus-hsg-1.0.0.tar.gz"
+hash = "sha256-A747wV1XUbuIclmAC39vvZ2pBXlVR2R7evhuajKNV4I="
+typstDeps = []
+description = "Thesis at the University of St. Gallen (HSG"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/joshuabeny1999/unisg-thesis-template-typst"
+
 [game-theoryst."0.1.0"]
 url = "https://packages.typst.org/preview/game-theoryst-0.1.0.tar.gz"
 hash = "sha256-1FtNDcbP6TBXZQ9SlWzmHSrp6F8pTPEnjDKougnlCqI="
@@ -7159,6 +8715,18 @@ license = [
 ]
 homepage = "https://github.com/connortwiegand/game-theoryst"
 
+[gantty."0.4.0"]
+url = "https://packages.typst.org/preview/gantty-0.4.0.tar.gz"
+hash = "sha256-ySsKh1/9wrrAnUFGIW/x+MqtYxcRsRgJYavf5RIEp44="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "Create gantt charts using datetimes"
+license = [
+    "LGPL-3.0-only",
+]
+homepage = "https://gitlab.com/john_t/typst-gantty"
+
 [gantty."0.3.0"]
 url = "https://packages.typst.org/preview/gantty-0.3.0.tar.gz"
 hash = "sha256-yfyaSGb3c8+ZnyJdF3gfI+faUbjhZI0qhYMXCRPh6nk="
@@ -7195,6 +8763,19 @@ license = [
 ]
 homepage = "https://gitlab.com/john_t/typst-gantty"
 
+[genealotree."0.3.0"]
+url = "https://packages.typst.org/preview/genealotree-0.3.0.tar.gz"
+hash = "sha256-zRq5Wn25rsrmFXiThlVhPhEQYU5/umgmJ5XK5tKoa34="
+typstDeps = [
+    "cetz_0_4_1",
+    "t4t_0_4_3",
+]
+description = "A package to draw genealogical trees, based on CeTZ"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://codeberg.org/drloiseau/genealogy"
+
 [genealotree."0.2.0"]
 url = "https://packages.typst.org/preview/genealotree-0.2.0.tar.gz"
 hash = "sha256-RvKMkv1h5huYkLTNdGOijBi+wBMZxud93f24WDhJ28s="
@@ -7385,6 +8966,16 @@ license = [
 ]
 homepage = "https://github.com/elegaanz/georges-yetyp"
 
+[gloat."0.1.0"]
+url = "https://packages.typst.org/preview/gloat-0.1.0.tar.gz"
+hash = "sha256-n+56p2NjXlfa07rW0L4hNaH9nh6ATMBytQqZuS5RbU4="
+typstDeps = []
+description = "Academic CV for the natural sciences"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/eweix/gloat"
+
 [gloss-awe."0.0.5"]
 url = "https://packages.typst.org/preview/gloss-awe-0.0.5.tar.gz"
 hash = "sha256-DVVxTx6TN3oZjWy1W9VZdAj0ymLpoFtEIaS0RO3KkE4="
@@ -7415,6 +9006,36 @@ license = [
 ]
 homepage = "https://github.com/RolfBremer/typst-glossary"
 
+[glossarium."0.5.9"]
+url = "https://packages.typst.org/preview/glossarium-0.5.9.tar.gz"
+hash = "sha256-0dnDMC0jWETnlEouT/gTO1zF8bOe6fHREU0Op3VzpHI="
+typstDeps = []
+description = "Glossarium is a simple, easily customizable typst glossary"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/glossarium"
+
+[glossarium."0.5.8"]
+url = "https://packages.typst.org/preview/glossarium-0.5.8.tar.gz"
+hash = "sha256-sh1Dl2QJmVSBkbin5+LNUpRkFm9iTg16iKKQVcwo5C8="
+typstDeps = []
+description = "Glossarium is a simple, easily customizable typst glossary"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/glossarium"
+
+[glossarium."0.5.7"]
+url = "https://packages.typst.org/preview/glossarium-0.5.7.tar.gz"
+hash = "sha256-5+1SaEv+x4rXLNcuYQTgEegt7U1V8CWo4CY1ctM0LHA="
+typstDeps = []
+description = "Glossarium is a simple, easily customizable typst glossary"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/glossarium"
+
 [glossarium."0.5.6"]
 url = "https://packages.typst.org/preview/glossarium-0.5.6.tar.gz"
 hash = "sha256-PSJistNVYaEt1VjLxTzieSrOCNKkdbl8x5JWrF/6qfM="
@@ -7777,6 +9398,22 @@ license = [
 ]
 homepage = "https://github.com/swaits/typst-collection"
 
+[gqe-lemoulon-presentation."0.0.6"]
+url = "https://packages.typst.org/preview/gqe-lemoulon-presentation-0.0.6.tar.gz"
+hash = "sha256-Zx1OqxAJaZd6yuONAGxyArJllT6HoaqMOsn3fXi7TE4="
+typstDeps = [
+    "codly_1_3_0",
+    "showybox_2_0_4",
+    "tablem_0_3_0",
+    "tidy_0_4_3",
+    "touying_0_6_1",
+]
+description = "Quickly generate slides for a GQE-Le moulon presentation"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://forge.inrae.fr/gqe-moulon/gqe-presentation.git"
+
 [gqe-lemoulon-presentation."0.0.5"]
 url = "https://packages.typst.org/preview/gqe-lemoulon-presentation-0.0.5.tar.gz"
 hash = "sha256-EKRM2pcccly4vMbMWCTOQednyIpPBet5RBOzrsZGLs4="
@@ -7895,6 +9532,26 @@ license = [
 ]
 homepage = "https://github.com/piepert/grape-suite"
 
+[grayness."0.4.1"]
+url = "https://packages.typst.org/preview/grayness-0.4.1.tar.gz"
+hash = "sha256-Qb0zbsAe+VUjVqoH7MjMp0ZSswCoRaqW3Sa/1uk9KfQ="
+typstDeps = []
+description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/nineff/grayness"
+
+[grayness."0.4.0"]
+url = "https://packages.typst.org/preview/grayness-0.4.0.tar.gz"
+hash = "sha256-U1+Mode80Wshk6IzB8N6hNG2MLkxydCWQS2drEgdZtU="
+typstDeps = []
+description = "Simple image editing capabilities like converting to grayscale and cropping via a WASM plugin"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/nineff/grayness"
+
 [grayness."0.3.0"]
 url = "https://packages.typst.org/preview/grayness-0.3.0.tar.gz"
 hash = "sha256-0mZHo4t/5q/rVkaM7YqKs7ugPADWcofFvYa2eeU59K8="
@@ -8013,6 +9670,16 @@ license = [
 ]
 homepage = "https://github.com/ssotoen/gridlock"
 
+[grotesk-cv."1.0.5"]
+url = "https://packages.typst.org/preview/grotesk-cv-1.0.5.tar.gz"
+hash = "sha256-nlJgqKh/asgWSbgxDkg3lw/SduR0HNzcRguKOkwYsaM="
+typstDeps = []
+description = "A clean CV and cover letter template based on Brilliant-cv and fireside templates"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/AsiSkarp/grotesk-cv"
+
 [grotesk-cv."1.0.4"]
 url = "https://packages.typst.org/preview/grotesk-cv-1.0.4.tar.gz"
 hash = "sha256-NMRU0vPoGT5xrbG/lcGwMs0vsaV56rwEmacQ+1SF2iM="
@@ -8156,6 +9823,38 @@ license = [
 ]
 homepage = "https://github.com/EdwinChang24/typst-gru"
 
+[gruvy."2.1.0"]
+url = "https://packages.typst.org/preview/gruvy-2.1.0.tar.gz"
+hash = "sha256-xL9xd3Wvo+/Vz+2ZVatpmMhTtLgquETE2RvJe+7cvNc="
+typstDeps = []
+description = "Gruvbox colors"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/arsmoriendy/typst-gruvy"
+
+[gruvy."2.0.0"]
+url = "https://packages.typst.org/preview/gruvy-2.0.0.tar.gz"
+hash = "sha256-yGk0DdmDsdE+wHsJJM5ZRzHA/ag2DPuVixFGBY3q/iM="
+typstDeps = []
+description = "Gruvbox colors"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/arsmoriendy/typst-gruvy"
+
+[gruvy."1.0.0"]
+url = "https://packages.typst.org/preview/gruvy-1.0.0.tar.gz"
+hash = "sha256-BxizZJmkyRSf/lsZ0lqG+2F0+tBawBd1yYZ8gKhGSCw="
+typstDeps = [
+    "valkyrie_0_2_2",
+]
+description = "Gruvbox colors"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/arsmoriendy/typst-gruvy"
+
 [guided-resume-starter-cgc."2.0.0"]
 url = "https://packages.typst.org/preview/guided-resume-starter-cgc-2.0.0.tar.gz"
 hash = "sha256-vj/U0MOVCQBsw/5EJPraeyl3ifjrvMsgpoE26NC1xqM="
@@ -8176,6 +9875,18 @@ license = [
 ]
 homepage = "https://codeberg.org/Sekoia/gviz-typst"
 
+[h-graph."0.1.0"]
+url = "https://packages.typst.org/preview/h-graph-0.1.0.tar.gz"
+hash = "sha256-GnjgPD5TP4tET7aV8YRK8IIlUs45NpD6WFon1zn28bM="
+typstDeps = [
+    "fletcher_0_5_8",
+]
+description = "Draw image releted to graph theory with a very simple mark-up language"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fogsong233/h-graph"
+
 [hagakiii."0.1.0"]
 url = "https://packages.typst.org/preview/hagakiii-0.1.0.tar.gz"
 hash = "sha256-cIJ562PgOM0flVEhS+7tyuMX+SH/2rxlifpqI5PBr+E="
@@ -8186,6 +9897,46 @@ license = [
 ]
 homepage = "https://github.com/34j/typst-hagakiii"
 
+[hallon."0.1.2"]
+url = "https://packages.typst.org/preview/hallon-0.1.2.tar.gz"
+hash = "sha256-SkgRu6hERjq7PAcOS9wfJJzzEFe1bcQWk4NoffonDKU="
+typstDeps = []
+description = "Utility functions for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/hallon-typ"
+
+[hallon."0.1.1"]
+url = "https://packages.typst.org/preview/hallon-0.1.1.tar.gz"
+hash = "sha256-83Cg+Xbvx/We9jQw/wV0R2VHujKpdXpRJYMyTN/epBs="
+typstDeps = []
+description = "Utility functions for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/hallon-typ"
+
+[hallon."0.1.0"]
+url = "https://packages.typst.org/preview/hallon-0.1.0.tar.gz"
+hash = "sha256-LqhTqD9TwYQrjft30iBBj+MDQHPk/z0+ct+1jH3wdWk="
+typstDeps = []
+description = "Utility functions for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/hallon-typ"
+
+[hamnosys-includer."1.0.0"]
+url = "https://packages.typst.org/preview/hamnosys-includer-1.0.0.tar.gz"
+hash = "sha256-+HqWRYwCFPSfGwjKhMwt8RDytys/DN8767BuXiSYcek="
+typstDeps = []
+description = "For using HamNoSys in Typst"
+license = [
+    "LPPL-1.3c",
+]
+homepage = "https://github.com/TestTimothy/Typst-HamNoSys"
+
 [hamnosys-includer."0.1.0"]
 url = "https://packages.typst.org/preview/hamnosys-includer-0.1.0.tar.gz"
 hash = "sha256-t1aYMwmrttYE9XPIMVKJbXw75tr8jy5dEaYK4T0aqJ8="
@@ -8235,6 +9986,16 @@ license = [
 ]
 homepage = "https://github.com/yuegeao/hanzi-calligraphy"
 
+[harvard-gsas-thesis-oat."0.1.5"]
+url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.5.tar.gz"
+hash = "sha256-hMBp9QOB4t0OC1Fpfem4bGMak9lQ1otHMTbPYhTbu1w="
+typstDeps = []
+description = "PhD Thesis template for Harvard GSAS (Graduate School of Arts and Sciences"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat"
+
 [harvard-gsas-thesis-oat."0.1.4"]
 url = "https://packages.typst.org/preview/harvard-gsas-thesis-oat-0.1.4.tar.gz"
 hash = "sha256-yurD53i4zYGfYjTWd0NREli8bhRZZwvbBN8VZDBbyD4="
@@ -8285,6 +10046,26 @@ license = [
 ]
 homepage = "https://github.com/Moelf/harvard-gsas-thesis-oat"
 
+[haw-hamburg."0.6.1"]
+url = "https://packages.typst.org/preview/haw-hamburg-0.6.1.tar.gz"
+hash = "sha256-x/C4y3iCQugH81bEUUK+0OyZA3l1hRoVSzWeTa6zMDE="
+typstDeps = []
+description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
+[haw-hamburg."0.6.0"]
+url = "https://packages.typst.org/preview/haw-hamburg-0.6.0.tar.gz"
+hash = "sha256-QIgvoMmKnqjrlY48C1g70JtoeYuOcUGCh9Z+bodFtB0="
+typstDeps = []
+description = "Unofficial template for writing a report or thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
 [haw-hamburg."0.5.1"]
 url = "https://packages.typst.org/preview/haw-hamburg-0.5.1.tar.gz"
 hash = "sha256-B9r2CqFlw7129Ow8y9aOQXe6y2O3/GKm2YSDP5pHU6k="
@@ -8370,6 +10151,32 @@ license = [
 ]
 homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
 
+[haw-hamburg-bachelor-thesis."0.6.1"]
+url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.6.1.tar.gz"
+hash = "sha256-jbUnnOt0TODnD3Deh6zvIbswpaRP/fEQ0JxqtWTqUu8="
+typstDeps = [
+    "glossarium_0_5_8",
+    "haw-hamburg_0_6_1",
+]
+description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
+[haw-hamburg-bachelor-thesis."0.6.0"]
+url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.6.0.tar.gz"
+hash = "sha256-FBXdCA+5kfzSsB01ipfq0eLY9wNgoob1g9bN12VH5io="
+typstDeps = [
+    "glossarium_0_5_8",
+    "haw-hamburg_0_6_0",
+]
+description = "Unofficial template for writing a bachelor-thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
 [haw-hamburg-bachelor-thesis."0.5.1"]
 url = "https://packages.typst.org/preview/haw-hamburg-bachelor-thesis-0.5.1.tar.gz"
 hash = "sha256-keM157SF7OS0FT0HGgFbhhZhA7lUqDMaRDmNHU6CIzE="
@@ -8448,6 +10255,32 @@ license = [
 ]
 homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
 
+[haw-hamburg-master-thesis."0.6.1"]
+url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.6.1.tar.gz"
+hash = "sha256-ShHUj4JxP30JF2KDN7KiuDbRC7Rkmp263gTsgiv+ydM="
+typstDeps = [
+    "glossarium_0_5_8",
+    "haw-hamburg_0_6_1",
+]
+description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
+[haw-hamburg-master-thesis."0.6.0"]
+url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.6.0.tar.gz"
+hash = "sha256-BvIj2dfhDdaWL5H/ys3LsEDztSNDZ5x7cHe42kZYN1M="
+typstDeps = [
+    "glossarium_0_5_8",
+    "haw-hamburg_0_6_0",
+]
+description = "Unofficial template for writing a master-thesis in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
 [haw-hamburg-master-thesis."0.5.1"]
 url = "https://packages.typst.org/preview/haw-hamburg-master-thesis-0.5.1.tar.gz"
 hash = "sha256-UxzkkPmWO6frdPI57xxelpE3mqgnpZn9aobQAHBTjIQ="
@@ -8526,6 +10359,32 @@ license = [
 ]
 homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
 
+[haw-hamburg-report."0.6.1"]
+url = "https://packages.typst.org/preview/haw-hamburg-report-0.6.1.tar.gz"
+hash = "sha256-ADv7KuOYNegyKwBxKhvi3DZoJ2MvjfMDmngSzIr3dHU="
+typstDeps = [
+    "glossarium_0_5_8",
+    "haw-hamburg_0_6_1",
+]
+description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
+[haw-hamburg-report."0.6.0"]
+url = "https://packages.typst.org/preview/haw-hamburg-report-0.6.0.tar.gz"
+hash = "sha256-ilJne1VLW2RzqatnJpP9f2Ziy5yGqovkRX+DrW10xFw="
+typstDeps = [
+    "glossarium_0_5_8",
+    "haw-hamburg_0_6_0",
+]
+description = "Unofficial template for writing a report in the HAW Hamburg department of Computer Science design"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/LasseRosenow/HAW-Hamburg-Typst-Template"
+
 [haw-hamburg-report."0.5.1"]
 url = "https://packages.typst.org/preview/haw-hamburg-report-0.5.1.tar.gz"
 hash = "sha256-wKWew9SRGfaI1bvZ2HUGsIGNUWWS9Jc2DydoEs+4i9k="
@@ -8644,6 +10503,45 @@ license = [
 ]
 homepage = "https://github.com/hei-templates/hei-synd-report"
 
+[hei-synd-thesis."0.2.2"]
+url = "https://packages.typst.org/preview/hei-synd-thesis-0.2.2.tar.gz"
+hash = "sha256-2NhNKIdJIFpWUyb9el7WzPvagXTm9Pwm16a07kBBySA="
+typstDeps = [
+    "cheq_0_2_3",
+    "codelst_2_0_2",
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "fractusist_0_3_2",
+    "glossarium_0_5_8",
+    "icu-datetime_0_1_2",
+    "muchpdf_0_1_1",
+    "wordometer_0_1_4",
+]
+description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hei-templates/hei-synd-thesis"
+
+[hei-synd-thesis."0.2.1"]
+url = "https://packages.typst.org/preview/hei-synd-thesis-0.2.1.tar.gz"
+hash = "sha256-lJzGweOwikQWH0Y+o/u+mFGCs23y9hzez94AqRPUeNI="
+typstDeps = [
+    "cheq_0_2_2",
+    "codelst_2_0_2",
+    "codly_1_3_0",
+    "codly-languages_0_1_1",
+    "fractusist_0_3_2",
+    "glossarium_0_5_6",
+    "icu-datetime_0_1_2",
+    "wordometer_0_1_4",
+]
+description = "A thesis template tailored to the Systems Engineering (Synd) program at the HEI-Vs School of Engineering, Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hei-templates/hei-synd-thesis"
+
 [hei-synd-thesis."0.2.0"]
 url = "https://packages.typst.org/preview/hei-synd-thesis-0.2.0.tar.gz"
 hash = "sha256-GZCE71ji6RNfjeF4FSFkacMbo8p8sIdvoAU0/lM1w34="
@@ -8691,6 +10589,18 @@ license = [
 ]
 homepage = "https://github.com/hei-templates/hei-synd-thesis"
 
+[herodot."0.2.0"]
+url = "https://packages.typst.org/preview/herodot-0.2.0.tar.gz"
+hash = "sha256-qkKxherzKhwbczv54ZNpJhAKU+ysf0Q4ueBkM6yLK9o="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "A package for making linear timelines, inspired by chronology"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://github.com/gnist-dev/herodot"
+
 [herodot."0.1.0"]
 url = "https://packages.typst.org/preview/herodot-0.1.0.tar.gz"
 hash = "sha256-hZItUzNJe3TNxMjk2JiN7+wuI5AhGwUdx8p8HOUMnUI="
@@ -8713,6 +10623,20 @@ license = [
 ]
 homepage = "https://github.com/jneug/typst-heroic"
 
+[hetvid."0.1.0"]
+url = "https://packages.typst.org/preview/hetvid-0.1.0.tar.gz"
+hash = "sha256-UxljXgBDSIoKK5vBu7V6tU3OZPkx4Ps5BS+Hbqujnyk="
+typstDeps = [
+    "cetz_0_4_1",
+    "fancy-units_0_1_1",
+    "metalogo_1_2_0",
+    "zebraw_0_5_5",
+]
+description = "A template for light notes"
+license = [
+    "MIT-0",
+]
+
 [hhn-unitylab-thesis-template."0.0.2"]
 url = "https://packages.typst.org/preview/hhn-unitylab-thesis-template-0.0.2.tar.gz"
 hash = "sha256-JaL4bV591+AiFXijkuQBFhoDGYhfU8ZwPyxrp0S9o08="
@@ -8874,6 +10798,38 @@ license = [
     "MIT",
 ]
 
+[hy-dro-gen."0.1.1"]
+url = "https://packages.typst.org/preview/hy-dro-gen-0.1.1.tar.gz"
+hash = "sha256-qm+YWpliV3QICQCwvCssTZlFBQeuqGXU+ptc8iLH2qU="
+typstDeps = []
+description = "Word hyphenation via bindings to typst/hypher"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/hy-dro-gen"
+
+[hy-dro-gen."0.1.0"]
+url = "https://packages.typst.org/preview/hy-dro-gen-0.1.0.tar.gz"
+hash = "sha256-dFXCI13tg4wcoH+UHHRZGSN37Jic/OEhOs6fzCvcBpQ="
+typstDeps = []
+description = "Word hyphenation via bindings to typst/hypher"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/hy-dro-gen"
+
+[hydra."0.6.2"]
+url = "https://packages.typst.org/preview/hydra-0.6.2.tar.gz"
+hash = "sha256-umnjqplojf5gpPh6JzgMwStBo0HDqVj++gTIWOh599Q="
+typstDeps = [
+    "oxifmt_1_0_0",
+]
+description = "Query and display headings in your documents and templates"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tingerrr/hydra"
+
 [hydra."0.6.1"]
 url = "https://packages.typst.org/preview/hydra-0.6.1.tar.gz"
 hash = "sha256-7gq7nGp7zzv4A0A1FbQWmDINEICEHps1HcbO+hi2GyA="
@@ -8990,6 +10946,46 @@ license = [
 ]
 homepage = "https://github.com/tshort/hyperscript"
 
+[i-am-acro."0.1.3"]
+url = "https://packages.typst.org/preview/i-am-acro-0.1.3.tar.gz"
+hash = "sha256-S/PHqBJIpNdCOnNs5mZliCd21r8DFzF2yOM2DeSfe68="
+typstDeps = []
+description = "Acronym package for typst, aiming for multilanguage support and feature richness"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/etwasmitbaum/i-am-acro"
+
+[i-am-acro."0.1.2"]
+url = "https://packages.typst.org/preview/i-am-acro-0.1.2.tar.gz"
+hash = "sha256-vCcBQz0Ge4eBDSe2AGATRhn7f7mmfIAQHx0WYzORa3M="
+typstDeps = []
+description = "Acronym package for typst, aiming for multilanguage support and feature richness"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/etwasmitbaum/i-am-acro"
+
+[i-am-acro."0.1.1"]
+url = "https://packages.typst.org/preview/i-am-acro-0.1.1.tar.gz"
+hash = "sha256-psTaDPrS+dfiI8wGYmI/fjwQYAwZDRBOmIr82ukRBlc="
+typstDeps = []
+description = "Acronym package for typst, aiming for multilanguage support and feature richness"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/etwasmitbaum/i-am-acro"
+
+[i-am-acro."0.1.0"]
+url = "https://packages.typst.org/preview/i-am-acro-0.1.0.tar.gz"
+hash = "sha256-qutdVAEIbT1M+LSIq63fYFI0+QRf+DTkB58+UlH7SAI="
+typstDeps = []
+description = "Acronym package for typst, aiming for multilanguage support and feature richness"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/etwasmitbaum/i-am-acro"
+
 [i-figured."0.2.4"]
 url = "https://packages.typst.org/preview/i-figured-0.2.4.tar.gz"
 hash = "sha256-508q3J4Sj5QnxexJndtbrvekcBpuLjyv9Bkt7QgdkPk="
@@ -9162,6 +11158,16 @@ license = [
 ]
 homepage = "https://github.com/Bi0T1N/typst-iconic-salmon-svg"
 
+[icu-datetime."0.2.0"]
+url = "https://packages.typst.org/preview/icu-datetime-0.2.0.tar.gz"
+hash = "sha256-6CeuNilPvenD4jTYKWK2JY/IVOoz0nv7kF/vjK83xhE="
+typstDeps = []
+description = "Date and time formatting using ICU4X via WASM"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Nerixyz/icu-typ"
+
 [icu-datetime."0.1.2"]
 url = "https://packages.typst.org/preview/icu-datetime-0.1.2.tar.gz"
 hash = "sha256-1dWi/4Cos6YwvR/6uUXIeXY5zREnJKWcpoS26va6jFs="
@@ -9524,6 +11530,16 @@ license = [
 ]
 homepage = "https://github.com/JeppeKlitgaard/impressive-impression"
 
+[in-dexter."0.7.2"]
+url = "https://packages.typst.org/preview/in-dexter-0.7.2.tar.gz"
+hash = "sha256-e2bO70xWHPBqaLd2GnN2tBuNHvrkQ4yus9orINknjYY="
+typstDeps = []
+description = "Create an 'hand picked' Index"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/RolfBremer/in-dexter"
+
 [in-dexter."0.7.0"]
 url = "https://packages.typst.org/preview/in-dexter-0.7.0.tar.gz"
 hash = "sha256-yzRnJe14VYyYWSYAs3pEDDZLU8QfBfC2sK1OP0Bkc50="
@@ -9686,6 +11702,26 @@ license = [
 ]
 homepage = "https://github.com/cecoeco/indic-numerals"
 
+[intextual."0.1.0"]
+url = "https://packages.typst.org/preview/intextual-0.1.0.tar.gz"
+hash = "sha256-AuTGRdTIY9a8ETKXLiEv+ESUJFnF9UGDco/NfPB04Hw="
+typstDeps = []
+description = "Flushed left/right text and individual line tagging in equations"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/euwbah/intextual"
+
+[invicta-thesis."1.0.0"]
+url = "https://packages.typst.org/preview/invicta-thesis-1.0.0.tar.gz"
+hash = "sha256-1Zo0/JKWkpWeOKGBoBT+iwyqP7GQ+lA9Da3HPFB9U4M="
+typstDeps = []
+description = "Master's thesis for Faculty of Engineering of University of Porto"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Tonevanda/invicta-thesis"
+
 [invoice-maker."1.1.0"]
 url = "https://packages.typst.org/preview/invoice-maker-1.1.0.tar.gz"
 hash = "sha256-IT1P65mtzpgUUUHwOIDHoYG8x3GeP3MtSU+OzJFGFVs="
@@ -9728,6 +11764,174 @@ license = [
     "MIT",
 ]
 
+[isc-hei-bthesis."0.6.0"]
+url = "https://packages.typst.org/preview/isc-hei-bthesis-0.6.0.tar.gz"
+hash = "sha256-n3e2GMZHLKtnz8WqshHjbo32eK/TW5SrQDG+Ot7qkMI="
+typstDeps = [
+    "acrostiche_0_6_0",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-bthesis."0.5.3"]
+url = "https://packages.typst.org/preview/isc-hei-bthesis-0.5.3.tar.gz"
+hash = "sha256-Fg91DRIus2eqYD9P4atooWdYWBla/pb2ciEhUhNpqVM="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-bthesis."0.5.2"]
+url = "https://packages.typst.org/preview/isc-hei-bthesis-0.5.2.tar.gz"
+hash = "sha256-QFljcFpF6rWq57HmIODOx2RqyHBGqufvluQB6I7qTOs="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-bthesis."0.5.0"]
+url = "https://packages.typst.org/preview/isc-hei-bthesis-0.5.0.tar.gz"
+hash = "sha256-G3ALq44SjUVAOZcGqwcQHwYLGuHEE4Rkhr151tg35oY="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/ISC-report"
+
+[isc-hei-exec-summary."0.6.0"]
+url = "https://packages.typst.org/preview/isc-hei-exec-summary-0.6.0.tar.gz"
+hash = "sha256-SE0U10GbKFfHndhan6jH7vY6L0AZgjmya97j62XX1y0="
+typstDeps = [
+    "cetz_0_4_0",
+    "cetz-plot_0_1_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official executive summary for the bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-exec-summary."0.5.3"]
+url = "https://packages.typst.org/preview/isc-hei-exec-summary-0.5.3.tar.gz"
+hash = "sha256-QtKHrRjswcRY2aQMT9qFR+RN20qp8Er6x5sM+jQ4s48="
+typstDeps = [
+    "cetz_0_4_0",
+    "cetz-plot_0_1_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official executive summary for the bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-exec-summary."0.5.2"]
+url = "https://packages.typst.org/preview/isc-hei-exec-summary-0.5.2.tar.gz"
+hash = "sha256-8MoRA3ViivS4QW/+2gMSseLmbZswP1+xkz399JznKwM="
+typstDeps = [
+    "cetz_0_4_0",
+    "cetz-plot_0_1_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official executive summary for the bachelor thesis at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-report."0.6.0"]
+url = "https://packages.typst.org/preview/isc-hei-report-0.6.0.tar.gz"
+hash = "sha256-26k85qM7WxpRdRJM+qQ8hC7jY17zIVsAIGyV0FKoC3s="
+typstDeps = [
+    "acrostiche_0_6_0",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official report at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-report."0.5.3"]
+url = "https://packages.typst.org/preview/isc-hei-report-0.5.3.tar.gz"
+hash = "sha256-JUkPOj7yGYhsJM4eUInFhAYSagCBMZx2RUa197XkxGA="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official report at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-report."0.5.2"]
+url = "https://packages.typst.org/preview/isc-hei-report-0.5.2.tar.gz"
+hash = "sha256-YdPVkSIpD8kPzZEeuVlKMOLIzVZdglY69nJGJHeblYA="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official report at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme, School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/isc-hei-student-templates"
+
+[isc-hei-report."0.3.1"]
+url = "https://packages.typst.org/preview/isc-hei-report-0.3.1.tar.gz"
+hash = "sha256-y8D9d6HGCcgNzuLtp+4hdX1oUhMcduiqzPXgEf2e4rw="
+typstDeps = [
+    "acrostiche_0_5_2",
+    "codelst_2_0_2",
+    "datify_0_1_4",
+    "showybox_2_0_4",
+]
+description = "Official report at the 'Informatique et systèmes de communication' (ISC) bachelor degree programme at the School of Engineering (HEI) in Sion, Switzerland"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ISC-HEI/ISC-report"
+
 [isc-hei-report."0.2.0"]
 url = "https://packages.typst.org/preview/isc-hei-report-0.2.0.tar.gz"
 hash = "sha256-z+XY4IaAOqxAZxjKDLVb/aou/RVOFSnnrTowcRVua60="
@@ -9786,6 +11990,42 @@ license = [
 ]
 homepage = "https://github.com/ISC-HEI/ISC-report"
 
+[itemize."0.1.2"]
+url = "https://packages.typst.org/preview/itemize-0.1.2.tar.gz"
+hash = "sha256-odjgULdhQlhl9+mY4QATSguJ8egMxnTNcSoi1ptzzFA="
+typstDeps = [
+    "elembic_1_1_1",
+]
+description = "An easy way to customize enum and list"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tianyi-smile/itemize"
+
+[itemize."0.1.1"]
+url = "https://packages.typst.org/preview/itemize-0.1.1.tar.gz"
+hash = "sha256-xODP6pJQ/3pt4ZZTnwUYjn2vwr7VaRkBMOeJtvSQ8II="
+typstDeps = [
+    "elembic_1_1_1",
+]
+description = "An easy way to customize enum and list"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tianyi-smile/itemize"
+
+[itemize."0.1.0"]
+url = "https://packages.typst.org/preview/itemize-0.1.0.tar.gz"
+hash = "sha256-Ul4x4BpuHYAHHK8OsFUEPedWMDbCsmwc8r9oVUzIYFM="
+typstDeps = [
+    "elembic_1_1_1",
+]
+description = "An easy way to customize enum and list"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tianyi-smile/itemize"
+
 [its-scripted."0.1.0"]
 url = "https://packages.typst.org/preview/its-scripted-0.1.0.tar.gz"
 hash = "sha256-Q7zPoW9hjAoirl2xb5sG2/tY3ornofX1hq6B6OIQBHo="
@@ -9806,6 +12046,83 @@ license = [
 ]
 homepage = "https://github.com/glpda/typst-iversymbols"
 
+[jabiz."0.1.1"]
+url = "https://packages.typst.org/preview/jabiz-0.1.1.tar.gz"
+hash = "sha256-0lZChZ7XzZ1WUHD5zzUYPvMi8Hgu5LbnmLG73HKNhho="
+typstDeps = [
+    "cjk-unbreak_0_1_1",
+]
+description = "Template for Japanese business documents. 日本語のビジネス文書テンプレート"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/kimushun1101/typst-jabiz"
+
+[jabiz."0.1.0"]
+url = "https://packages.typst.org/preview/jabiz-0.1.0.tar.gz"
+hash = "sha256-3bNtG+KOksuICZeBpUFRenzEnclwKmqbJxxU3AhOp7Q="
+typstDeps = []
+description = "Template for Japanese business documents. 日本語のビジネス文書テンプレート"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/kimushun1101/typst-jabiz"
+
+[jaconf."0.5.1"]
+url = "https://packages.typst.org/preview/jaconf-0.5.1.tar.gz"
+hash = "sha256-pTFqoSsvhXyq2zjwLwhPlQ/8pCf5bLzoEhO/49y5Zik="
+typstDeps = [
+    "cjk-unbreak_0_1_1",
+    "codly_1_3_0",
+    "ctheorems_1_1_3",
+]
+description = "Template for Japanese academic conference papers. 日本語の学会論文テンプレート"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/kimushun1101/typst-jp-conf-template"
+
+[jaconf."0.5.0"]
+url = "https://packages.typst.org/preview/jaconf-0.5.0.tar.gz"
+hash = "sha256-bjaYZJTPSx5wdqkYvnEm59dQjG6+ZHvqxPE/vzyTk4s="
+typstDeps = [
+    "cjk-unbreak_0_1_1",
+    "codly_1_3_0",
+    "ctheorems_1_1_3",
+]
+description = "Template for Japanese academic conference papers. 日本語の学会論文テンプレート"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/kimushun1101/typst-jp-conf-template"
+
+[jaconf."0.4.1"]
+url = "https://packages.typst.org/preview/jaconf-0.4.1.tar.gz"
+hash = "sha256-jEKMQvb/KMrwxEP2mBLoWrk+trKigKPVr5LpalW/+II="
+typstDeps = [
+    "cjk-unbreak_0_1_1",
+    "codly_1_3_0",
+    "ctheorems_1_1_3",
+]
+description = "Template for Japanese academic conference papers. 日本語の学会論文テンプレート"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/kimushun1101/typst-jp-conf-template"
+
+[jaconf."0.4.0"]
+url = "https://packages.typst.org/preview/jaconf-0.4.0.tar.gz"
+hash = "sha256-2pAoMSsqx5MuMfJfq3Wr45tORwlrcbbdxVrkZhq9M+M="
+typstDeps = [
+    "codly_1_3_0",
+    "ctheorems_1_1_3",
+]
+description = "Template for Japanese academic conference papers. 日本語の学会論文テンプレート"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/kimushun1101/typst-jp-conf-template"
+
 [jaconf."0.3.0"]
 url = "https://packages.typst.org/preview/jaconf-0.3.0.tar.gz"
 hash = "sha256-b5um0HbkDzjEGf+4BQ0jl3/kzQ1K/WLnPM8Yf/ezEKU="
@@ -9871,6 +12188,16 @@ license = [
 ]
 homepage = "https://github.com/kimushun1101/typst-jp-conf-template"
 
+[jastylest."0.1.1"]
+url = "https://packages.typst.org/preview/jastylest-0.1.1.tar.gz"
+hash = "sha256-3b3jtsw3E6EIbsVyB7RE0dBibdjp1P6PHSYN+OAJyww="
+typstDeps = []
+description = "You can set up style templates for writing reports, papers, and slides in Japanese. It works similarly to LaTeX"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/raygo0312/jastylest.git"
+
 [jastylest."0.1.0"]
 url = "https://packages.typst.org/preview/jastylest-0.1.0.tar.gz"
 hash = "sha256-PCCVfomVgNn6R4R77vwK99tOV+0Dn618SJkPxnHTa4o="
@@ -9881,6 +12208,19 @@ license = [
 ]
 homepage = "https://github.com/raygo0312/jastylest.git"
 
+[jastylest-zh."0.1.1"]
+url = "https://packages.typst.org/preview/jastylest-zh-0.1.1.tar.gz"
+hash = "sha256-3uAg9oFE0K3dmNJqJHvVnreHTPmXPgsnmCPc1f8SfOQ="
+typstDeps = [
+    "cjk-unbreak_0_1_1",
+    "pointless-size_0_1_1",
+]
+description = "Article optimized for Chinese typesetting"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/mike-unk/jastylest-zh.git"
+
 [jastylest-zh."0.1.0"]
 url = "https://packages.typst.org/preview/jastylest-zh-0.1.0.tar.gz"
 hash = "sha256-WHHkRwIGWcgm7ekFuTp5BoIs5DHosiPNj+ZMx8Zo/00="
@@ -10246,6 +12586,16 @@ license = [
     "MIT",
 ]
 
+[komet."0.1.0"]
+url = "https://packages.typst.org/preview/komet-0.1.0.tar.gz"
+hash = "sha256-Hy06Ct0OsvmBZJSK77d7EhGM3u4M/z/spqIt3sSU9CE="
+typstDeps = []
+description = "Selected high-performance computations for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Mc-Zen/komet"
+
 [kouhu."0.2.0"]
 url = "https://packages.typst.org/preview/kouhu-0.2.0.tar.gz"
 hash = "sha256-Q5qLfexfuH7oRNDiyff1/moFN7QplvzkPYdxpjgkR1A="
@@ -10286,6 +12636,22 @@ license = [
 ]
 homepage = "https://github.com/Harry-Chen/kouhu"
 
+[kthesis."0.1.2"]
+url = "https://packages.typst.org/preview/kthesis-0.1.2.tar.gz"
+hash = "sha256-p8FiG2pRXHh1YCZJXOda4u5/1WXj+q0XWq4FkOfhCVA="
+typstDeps = [
+    "glossarium_0_5_8",
+    "headcount_0_1_0",
+    "hydra_0_6_1",
+    "linguify_0_4_2",
+]
+description = "Unofficial thesis template for KTH Royal Institute of Technology"
+license = [
+    "MIT",
+    "MIT-0",
+]
+homepage = "https://github.com/RafDevX/kthesis-typst"
+
 [kthesis."0.1.1"]
 url = "https://packages.typst.org/preview/kthesis-0.1.1.tar.gz"
 hash = "sha256-SEGkBuf1UtnO0/DA74gsbSH/BUkWjORsAj7UYb8EwEA="
@@ -10328,6 +12694,34 @@ license = [
 ]
 homepage = "https://github.com/mbollmann/typst-kunskap"
 
+[labtyp."0.1.0"]
+url = "https://packages.typst.org/preview/labtyp-0.1.0.tar.gz"
+hash = "sha256-moVnxeUgf+MwN0KJMxfARFVFg/LsZMciPL9unp992+s="
+typstDeps = []
+description = "Label text and extract to json using typst query"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/evidlabel/labtyp"
+
+[lacy-ubc-math-project."0.2.0"]
+url = "https://packages.typst.org/preview/lacy-ubc-math-project-0.2.0.tar.gz"
+hash = "sha256-QPhVZOJm2s4ds8SLTrVQbbiGZkYaMc/mhwZlcenoaoU="
+typstDeps = [
+    "cetz_0_4_0",
+    "cetz-plot_0_1_2",
+    "equate_0_3_2",
+    "lilaq_0_3_0",
+    "physica_0_9_5",
+    "showman_0_1_2",
+    "unify_0_7_1",
+]
+description = "A UBC MATH 100/101 group project template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lace-wing/lacy-ubc-math-project"
+
 [lacy-ubc-math-project."0.1.1"]
 url = "https://packages.typst.org/preview/lacy-ubc-math-project-0.1.1.tar.gz"
 hash = "sha256-F8BESXsANR3yQ3Rjm1yb4fgVSxuNt6WhHkB6StNydPU="
@@ -10406,6 +12800,34 @@ license = [
 ]
 homepage = "https://github.com/yangwenbo99/typst-lasaveur"
 
+[laskutys."1.1.0"]
+url = "https://packages.typst.org/preview/laskutys-1.1.0.tar.gz"
+hash = "sha256-Zm+E+QMAGJMMXZfJQT5WzcoK5ZH5dlhJZHbm8NxHkrs="
+typstDeps = [
+    "linguify_0_4_2",
+    "oxifmt_1_0_0",
+    "tiaoma_0_3_0",
+]
+description = "Make invoices satisfying Finnish standards (VH/3634/00.01.00/2023) and with bank barcode and/or EPC QR code"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/TheJiahao/laskutys"
+
+[laskutys."1.0.0"]
+url = "https://packages.typst.org/preview/laskutys-1.0.0.tar.gz"
+hash = "sha256-L2Gvc+S7m2LQdEb6VztrXPj/DulV0aRARUdKtYhYaTw="
+typstDeps = [
+    "linguify_0_4_2",
+    "oxifmt_1_0_0",
+    "tiaoma_0_3_0",
+]
+description = "Make invoices satisfying Finnish standards (VH/3634/00.01.00/2023) and with bank barcode and/or EPC QR code"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/TheJiahao/laskutys"
+
 [latedef."0.1.0"]
 url = "https://packages.typst.org/preview/latedef-0.1.0.tar.gz"
 hash = "sha256-L1+lMDnYxw6IE6Gu3IOe7AmjUG0eAW/2fQ3MOJIFfo0="
@@ -10416,6 +12838,93 @@ license = [
 ]
 homepage = "https://codeberg.org/T0mstone/typst-latedef"
 
+[latex-lookalike."0.1.4"]
+url = "https://packages.typst.org/preview/latex-lookalike-0.1.4.tar.gz"
+hash = "sha256-jqdXb7WgAosPzNvbgJGm6cJPN66ogMbV5aRiIhRES28="
+typstDeps = []
+description = "LaTeX style for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/latex-lookalike"
+
+[latex-lookalike."0.1.3"]
+url = "https://packages.typst.org/preview/latex-lookalike-0.1.3.tar.gz"
+hash = "sha256-HAiQuES9J57OxYuOtx7Bjj7vJWtCmzBMJQhsu0rh3Zo="
+typstDeps = []
+description = "LaTeX style for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/latex-lookalike"
+
+[latex-lookalike."0.1.2"]
+url = "https://packages.typst.org/preview/latex-lookalike-0.1.2.tar.gz"
+hash = "sha256-XXzY7J1HhFffj+kXFerV5ft57vXmtGpxEF9TFDE3EtY="
+typstDeps = []
+description = "LaTeX style for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/latex-lookalike"
+
+[latex-lookalike."0.1.1"]
+url = "https://packages.typst.org/preview/latex-lookalike-0.1.1.tar.gz"
+hash = "sha256-+DmDx5A9Jm5GmMM96e3Zt84ey4YYLx9Tez78M2YBELM="
+typstDeps = []
+description = "LaTeX style for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/latex-lookalike"
+
+[latex-lookalike."0.1.0"]
+url = "https://packages.typst.org/preview/latex-lookalike-0.1.0.tar.gz"
+hash = "sha256-CbauKjElRLgWBt+pYRSbuKqEB6uDZqaP9qltrZaO+Dk="
+typstDeps = []
+description = "LaTeX style for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/latex-lookalike"
+
+[latexlike-report."1.0.0"]
+url = "https://packages.typst.org/preview/latexlike-report-1.0.0.tar.gz"
+hash = "sha256-RGtMby3IkWGRbOI70BtfGyg93ntsOnC772t4NVyhDBM="
+typstDeps = [
+    "chic-hdr_0_5_0",
+    "equate_0_3_2",
+]
+description = "A simple report for Typst with LaTeX style, fully customizable"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jorgexbeta/latexlike-report.git"
+
+[lavandula."0.1.1"]
+url = "https://packages.typst.org/preview/lavandula-0.1.1.tar.gz"
+hash = "sha256-AgN8aUYZNgReiUX1XJMrzzWGsSoE7wMMnJdDlZVBUS4="
+typstDeps = [
+    "fontawesome_0_6_0",
+]
+description = "A modern, clean and customizable resume template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/face0xff/lavandula"
+
+[lavandula."0.1.0"]
+url = "https://packages.typst.org/preview/lavandula-0.1.0.tar.gz"
+hash = "sha256-Gc2DfwKzMA9unlIeMFGdEgHUKbREqVPl+iBghLCYeWs="
+typstDeps = [
+    "fontawesome_0_6_0",
+]
+description = "A modern, clean and customizable resume template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/face0xff/lavandula"
+
 [layout-ltd."0.1.0"]
 url = "https://packages.typst.org/preview/layout-ltd-0.1.0.tar.gz"
 hash = "sha256-opKfAj/Ax3WWsjqUE4li6EVESgY0I3bSGjnpk4MvRqU="
@@ -10586,6 +13095,16 @@ license = [
 ]
 homepage = "https://github.com/LordBlacky/leonux"
 
+[lets-go."0.1.0"]
+url = "https://packages.typst.org/preview/lets-go-0.1.0.tar.gz"
+hash = "sha256-j2s/szII6HdC5v2fU/GLIetLkm2+ftuT6EIP3Vy0u+Y="
+typstDeps = []
+description = "Draw go game boards easily, with some customization features"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/nmielec/lets-go"
+
 [letter-pro."3.0.0"]
 url = "https://packages.typst.org/preview/letter-pro-3.0.0.tar.gz"
 hash = "sha256-Ow22loLjb/wiiB3iSmdZirbtfDR2XIveWgFcnWctBtI="
@@ -10606,6 +13125,36 @@ license = [
 ]
 homepage = "https://github.com/Sematre/typst-letter-pro"
 
+[letterloom."1.0.0"]
+url = "https://packages.typst.org/preview/letterloom-1.0.0.tar.gz"
+hash = "sha256-f15LQT7JF0NxpkNHACNrbLO1fJtyIHVYxxFETEkvEVk="
+typstDeps = []
+description = "The letterloom package is a user-friendly and customizable template designed to streamline the creation of professional-looking letters"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/nandac/letterloom"
+
+[letterloom."0.1.0"]
+url = "https://packages.typst.org/preview/letterloom-0.1.0.tar.gz"
+hash = "sha256-qum5YHiLRKG+lVUIiqAY82Eo7+07g9dErf6qEQRoob8="
+typstDeps = []
+description = "The letterloom package is a user-friendly, highly customizable template for creating professional letters with ease"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/nandac/letterloom"
+
+[libra."0.1.0"]
+url = "https://packages.typst.org/preview/libra-0.1.0.tar.gz"
+hash = "sha256-gr7l1lW843DQsgbnD7NeqZ28PxlgHVl3Bv9aZGrAMkQ="
+typstDeps = []
+description = "Balance your lines"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/mentonin/libra"
+
 [light-cv."0.2.0"]
 url = "https://packages.typst.org/preview/light-cv-0.2.0.tar.gz"
 hash = "sha256-GYYEH6YzC+yWoItv6om5HruDMqe1DbhiCYQ65bV6VDc="
@@ -10655,6 +13204,34 @@ license = [
 ]
 homepage = "https://github.com/sebastos1/light-report-uia"
 
+[lilaq."0.5.0"]
+url = "https://packages.typst.org/preview/lilaq-0.5.0.tar.gz"
+hash = "sha256-C57XfnLsvVMqzkbyXN73Wa1vnuW1n3jbmt8PSstv1WA="
+typstDeps = [
+    "elembic_1_1_1",
+    "tiptoe_0_3_1",
+    "zero_0_5_0",
+]
+description = "Scientific data visualization"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lilaq-project/lilaq"
+
+[lilaq."0.4.0"]
+url = "https://packages.typst.org/preview/lilaq-0.4.0.tar.gz"
+hash = "sha256-TIw0Ur2sFQgjGNby6ISK3ltlpPIQ3N+UbqciSMlS0o0="
+typstDeps = [
+    "elembic_1_1_0",
+    "tiptoe_0_3_1",
+    "zero_0_4_0",
+]
+description = "Scientific data visualization"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lilaq-project/lilaq"
+
 [lilaq."0.3.0"]
 url = "https://packages.typst.org/preview/lilaq-0.3.0.tar.gz"
 hash = "sha256-YdAsrkapRmN/U+CE5nEoxPlwjivgTCdWH8Lm9FW75xw="
@@ -10776,6 +13353,42 @@ license = [
 ]
 homepage = "https://github.com/jomaway/typst-linguify"
 
+[linkify."0.1.1"]
+url = "https://packages.typst.org/preview/linkify-0.1.1.tar.gz"
+hash = "sha256-UZ9ewiKMMs0hT3vR4NQ4SMJPlQzRwZ42iyHZDDradtU="
+typstDeps = [
+    "based_0_2_0",
+    "percencode_0_1_0",
+]
+description = "Generate URLs and nicely formatted links to web media contents"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/vanleefxp/linkify_typ"
+
+[linkify."0.1.0"]
+url = "https://packages.typst.org/preview/linkify-0.1.0.tar.gz"
+hash = "sha256-aCWY9t4msIBvFrYqK6kG/dR9IngrE2mtKTtEiBHj5zo="
+typstDeps = [
+    "based_0_2_0",
+    "percencode_0_1_0",
+]
+description = "Generate URLs and nicely formatted links to web media contents"
+license = [
+    "MIT",
+]
+
+[linkst."0.2.1"]
+url = "https://packages.typst.org/preview/linkst-0.2.1.tar.gz"
+hash = "sha256-52Sc5VFGry2OSR2Wuxk+wuPWDaGLlzJuS8hXsP8DXzc="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "A knot drawing package for knot theory"
+license = [
+    "MIT-0",
+]
+
 [linkst."0.1.0"]
 url = "https://packages.typst.org/preview/linkst-0.1.0.tar.gz"
 hash = "sha256-LVklnr/CcjK5TrZUlyWN8ovLsu33Oqn9RFhsn8X+DsE="
@@ -10787,6 +13400,25 @@ license = [
     "MIT-0",
 ]
 
+[linphon."0.1.0"]
+url = "https://packages.typst.org/preview/linphon-0.1.0.tar.gz"
+hash = "sha256-q6cIbvbh9jEEfKOfcd6bCZ7JEr01MKMH2AbT8G98X4k="
+typstDeps = []
+description = "Set phonological feature matrices, linear rewrite rules, and more"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/thatfloflo/typst-linphon"
+
+[litfass."0.1.0"]
+url = "https://packages.typst.org/preview/litfass-0.1.0.tar.gz"
+hash = "sha256-Tzul9IqpXlDeMJ/z5WY+KOnu3hx1Nej+m2vRXZK952Y="
+typstDeps = []
+description = "A typst package to design content like posters based on a tiling layout"
+license = [
+    "MIT",
+]
+
 [lovelace."0.3.0"]
 url = "https://packages.typst.org/preview/lovelace-0.3.0.tar.gz"
 hash = "sha256-thSCDGxcTfykwUYjUsxBC7Xnei6dXiGybA8wyUoqKjo="
@@ -10843,6 +13475,16 @@ license = [
 ]
 homepage = "https://github.com/daskol/typst-templates"
 
+[lumen."0.1.2"]
+url = "https://packages.typst.org/preview/lumen-0.1.2.tar.gz"
+hash = "sha256-25ZXn7Fg1T7vav7oekne13JVyIJNwtBdram9OqRh3Sk="
+typstDeps = []
+description = "unofficial template of the Université libre de Bruxelles thesis front cover"
+license = [
+    "MIT-0",
+]
+homepage = "https://codeberg.org/mononym/typst-ulb-phd-cover"
+
 [lumen."0.1.1"]
 url = "https://packages.typst.org/preview/lumen-0.1.1.tar.gz"
 hash = "sha256-mJv6jC/A4Ncnm+0BKwQuZ53e+EhuOrbRLg/lH73rWRw="
@@ -10863,6 +13505,16 @@ license = [
 ]
 homepage = "https://codeberg.org/mononym/typst-ulb-phd-cover"
 
+[lure."0.1.0"]
+url = "https://packages.typst.org/preview/lure-0.1.0.tar.gz"
+hash = "sha256-AhJHPrxXiptVvI2mvIbwyzQg1X10cmmCmGxsrriIrPI="
+typstDeps = []
+description = "Parse and normalize URLs, based on the WHATWG URL Standard, powered by rust-url and WebAssembly"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/YDX-2147483647/typst-lure"
+
 [lyceum."0.1.0"]
 url = "https://packages.typst.org/preview/lyceum-0.1.0.tar.gz"
 hash = "sha256-R9YJpG9Qh3Wfrad9kSZKLOJXMScffGX7adVigIb0mKs="
@@ -10872,6 +13524,18 @@ license = [
     "MIT",
 ]
 
+[m-jaxon."0.1.2"]
+url = "https://packages.typst.org/preview/m-jaxon-0.1.2.tar.gz"
+hash = "sha256-xeQSdBubE8ZYeQTslv3sj7/1o0LTkgyddBeZPtc1WCM="
+typstDeps = [
+    "jogs_0_2_4",
+]
+description = "Render LaTeX equation in typst using MathJax"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Enter-tainer/m-jaxon"
+
 [m-jaxon."0.1.1"]
 url = "https://packages.typst.org/preview/m-jaxon-0.1.1.tar.gz"
 hash = "sha256-ye2dPp64nLk+FOupkPEOwdN8u2x7C5lDsfx5NfmNtTc="
@@ -10930,6 +13594,18 @@ license = [
 ]
 homepage = "https://codeberg.org/Andrew15-5/magnifying-glass"
 
+[mahou-cv."0.1.0"]
+url = "https://packages.typst.org/preview/mahou-cv-0.1.0.tar.gz"
+hash = "sha256-kPyD4KWb2dMlFRnHKAFVsX5znpj6pEjNqnJxSHMHJNg="
+typstDeps = [
+    "valkyrie_0_2_2",
+]
+description = "A clean and composable CV template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/NanamiNakano/typst-mahou-cv"
+
 [mannot."0.3.0"]
 url = "https://packages.typst.org/preview/mannot-0.3.0.tar.gz"
 hash = "sha256-akdMPerbH8WpVQ1OACR9HOceZunKGTkj6jfh7s6ChFA="
@@ -11145,6 +13821,16 @@ license = [
 ]
 homepage = "https://github.com/EpicEricEE/typst-marge"
 
+[marginalia."0.2.3"]
+url = "https://packages.typst.org/preview/marginalia-0.2.3.tar.gz"
+hash = "sha256-MlRBH+5enH8cb+E2+8X0X4I9wuB8mgbH0k5SONdUN08="
+typstDeps = []
+description = "Configurable margin-notes and matching wide blocks"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/nleanba/typst-marginalia"
+
 [marginalia."0.2.2"]
 url = "https://packages.typst.org/preview/marginalia-0.2.2.tar.gz"
 hash = "sha256-WVRgVUXK3VK/vurr+8w0P0zf9kYoQ6PkLSI0QoLetWc="
@@ -11225,6 +13911,16 @@ license = [
 ]
 homepage = "https://github.com/nleanba/typst-marginalia"
 
+[marina-uol-thesis."1.0.0"]
+url = "https://packages.typst.org/preview/marina-uol-thesis-1.0.0.tar.gz"
+hash = "sha256-KgM63o/1npLcO3d62T534BXd3B7bCSyENEfCgvsaYXk="
+typstDeps = []
+description = "Unofficial thesis template for the University of Lincoln"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/krisjdev/university-of-lincoln-thesis"
+
 [markly."0.3.0"]
 url = "https://packages.typst.org/preview/markly-0.3.0.tar.gz"
 hash = "sha256-tOTkwsozXxUaOPFWUhiMjltd6yNjMaJskdb869AJjdU="
@@ -11269,6 +13965,34 @@ license = [
 ]
 homepage = "https://github.com/OptimisticPeach/matset"
 
+[may."0.1.1"]
+url = "https://packages.typst.org/preview/may-0.1.1.tar.gz"
+hash = "sha256-qXCnwn4gk5x3rsmTVdBitdU40dSi3/NC5IOc4w96SO8="
+typstDeps = [
+    "physica_0_9_5",
+    "touying_0_6_1",
+    "wrap-it_0_1_1",
+]
+description = "A simple and elegant document template for multiple daily tasks"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Carlos-Mero/may"
+
+[may."0.1.0"]
+url = "https://packages.typst.org/preview/may-0.1.0.tar.gz"
+hash = "sha256-ABrAb/n3PYZy0gmm2z6unrVgxwDbKayywRjKmtCCQs0="
+typstDeps = [
+    "physica_0_9_5",
+    "touying_0_6_1",
+    "wrap-it_0_1_1",
+]
+description = "A simple and elegant document template for multiple daily tasks"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Carlos-Mero/may"
+
 [may."0.0.1"]
 url = "https://packages.typst.org/preview/may-0.0.1.tar.gz"
 hash = "sha256-wntZIT9ENZKZx4Vs50b6LrH6DGI7ZGQEpoQiF/P+XFk="
@@ -11306,6 +14030,46 @@ license = [
 ]
 homepage = "https://github.com/sxdl/MCM-Typst-template"
 
+[meander."0.2.2"]
+url = "https://packages.typst.org/preview/meander-0.2.2.tar.gz"
+hash = "sha256-IPJ9tcI5jF3WO6a8XKAUquipvmlAuob/GxkxzIoN0D8="
+typstDeps = []
+description = "Page layout engine with image wrap-around and text threading"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/meander.typ"
+
+[meander."0.2.1"]
+url = "https://packages.typst.org/preview/meander-0.2.1.tar.gz"
+hash = "sha256-rDPwBSOBxhbaaX7FmcyBSa7TjDSvob2x+VIUQVIc/uM="
+typstDeps = []
+description = "Page layout engine with image wrap-around and text threading"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/meander.typ"
+
+[meander."0.2.0"]
+url = "https://packages.typst.org/preview/meander-0.2.0.tar.gz"
+hash = "sha256-54ZKSim/kYPbn4/cs1IfCdwrC6+7g9aUuqo9uzTQJww="
+typstDeps = []
+description = "Page layout engine with image wrap-around and text threading"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/meander.typ"
+
+[meander."0.1.0"]
+url = "https://packages.typst.org/preview/meander-0.1.0.tar.gz"
+hash = "sha256-JXnvPC1K1LtYX4IqaY1qUCVzn0HkW6Feq331ib+7z5w="
+typstDeps = []
+description = "Page layout engine with image wrap-around and text threading"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/meander.typ"
+
 [mechanical-system-cetz-34j."0.1.0"]
 url = "https://packages.typst.org/preview/mechanical-system-cetz-34j-0.1.0.tar.gz"
 hash = "sha256-PPoQ0Gy6Xh19JPPnL2uyGhVomZbOHOOUCFJDp/U/cTc="
@@ -11380,6 +14144,26 @@ license = [
 ]
 homepage = "https://github.com/CL4R3T/meppp"
 
+[mercator."0.1.1"]
+url = "https://packages.typst.org/preview/mercator-0.1.1.tar.gz"
+hash = "sha256-AL6pJCWLG5M2JnGy+mFIf03Xg33gWHj8Xji0xQd7AMI="
+typstDeps = []
+description = "🌎 Render GeoJSON in typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/bernsteining/mercator/"
+
+[mercator."0.1.0"]
+url = "https://packages.typst.org/preview/mercator-0.1.0.tar.gz"
+hash = "sha256-PLhFjXTu7yky/a3RCsu2a/Kr/Jhp7cLthc+A9iAVNjU="
+typstDeps = []
+description = "Render GeoJSON in typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/bernsteining/mercator/"
+
 [messeji."0.3.0"]
 url = "https://packages.typst.org/preview/messeji-0.3.0.tar.gz"
 hash = "sha256-vqIQjUdm4KvrDNTr5SnWqzVwSkG/dRVvQy/0W6o0P/g="
@@ -11568,6 +14352,38 @@ license = [
 ]
 homepage = "https://github.com/mayconfmelo/min-article"
 
+[min-book."1.2.1"]
+url = "https://packages.typst.org/preview/min-book-1.2.1.tar.gz"
+hash = "sha256-5iCwJwBZmSfo6MbdHfnKd+lUrjyPWtzzBq8J+Sklcto="
+typstDeps = []
+description = "Simple and complete books without introducing new syntax"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/min-book"
+
+[min-book."1.2.0"]
+url = "https://packages.typst.org/preview/min-book-1.2.0.tar.gz"
+hash = "sha256-UZyqmjP69EqrUX1QkVjlrh1KGMRGkjxzzg1ggopMi38="
+typstDeps = []
+description = "Simple and complete books without introducing new syntax"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/min-book"
+
+[min-book."1.1.0"]
+url = "https://packages.typst.org/preview/min-book-1.1.0.tar.gz"
+hash = "sha256-r64D8Ie2A0b+swwRHmlD6RVSj8heW9Qk774e6NLML88="
+typstDeps = [
+    "numbly_0_1_0",
+]
+description = "Simple and complete books without introducing new syntax"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/min-book"
+
 [min-book."1.0.0"]
 url = "https://packages.typst.org/preview/min-book-1.0.0.tar.gz"
 hash = "sha256-mw88Ui43I5pufLM8Uwvtjsd8J9kgwnCubg1iP3AFBCo="
@@ -11604,6 +14420,30 @@ license = [
 ]
 homepage = "https://github.com/mayconfmelo/min-book"
 
+[min-manual."0.2.1"]
+url = "https://packages.typst.org/preview/min-manual-0.2.1.tar.gz"
+hash = "sha256-vvJO5bd+LY7RCmkt0La008wKxNbQABewEs1zAepC6/c="
+typstDeps = [
+    "pkg-name_0_4_2",
+]
+description = "Modern but sober manuals inspired by the manpages of old"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/min-manual"
+
+[min-manual."0.2.0"]
+url = "https://packages.typst.org/preview/min-manual-0.2.0.tar.gz"
+hash = "sha256-aT5UEweCGWAGCWEtojE1KKALoEGWdvAivgAgixFa128="
+typstDeps = [
+    "pkg-name_0_4_2",
+]
+description = "Modern but sober manuals inspired by the manpages of old"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/min-manual"
+
 [min-manual."0.1.0"]
 url = "https://packages.typst.org/preview/min-manual-0.1.0.tar.gz"
 hash = "sha256-jqwfu2iOgnoHPO3zvw8b/qo4Zq+dhoWcqFl0ljLoQg8="
@@ -11670,6 +14510,32 @@ license = [
 ]
 homepage = "https://github.com/Dav1com/minerva-report-fcfm"
 
+[minerva-thesis."0.2.0"]
+url = "https://packages.typst.org/preview/minerva-thesis-0.2.0.tar.gz"
+hash = "sha256-NgQzAXTwqHrYVe+h3q+MZbrKVBN44wjyRQ05QlDXcKU="
+typstDeps = [
+    "abbr_0_2_3",
+    "alexandria_0_2_1",
+    "subpar_0_2_2",
+]
+description = "Doctoral and master's theses with both Ghent University specific and generic features"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lvandevelde/typst-minerva-thesis"
+
+[minerva-thesis."0.1.3"]
+url = "https://packages.typst.org/preview/minerva-thesis-0.1.3.tar.gz"
+hash = "sha256-GPwurX32A3rfFCLQ3O/TnzumCxBHwWhht5AWwdSJWnM="
+typstDeps = [
+    "subpar_0_2_2",
+]
+description = "Theses following guidelines at Ghent University and with some additional functions and features"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/lvandevelde/Typst-UGent-thesis"
+
 [minideck."0.2.1"]
 url = "https://packages.typst.org/preview/minideck-0.2.1.tar.gz"
 hash = "sha256-UuH/zXlYpibGZaQgpiifTmmA/8swJ+OUAlgWkBghsYk="
@@ -11693,6 +14559,16 @@ license = [
     "MIT",
 ]
 
+[minimal-cv."0.2.0"]
+url = "https://packages.typst.org/preview/minimal-cv-0.2.0.tar.gz"
+hash = "sha256-SGHp8rtk125grQBOMH8LvS+PSOB8+SzKS4XE9QfQFfo="
+typstDeps = []
+description = "A clean and customizable CV template"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/lelimacon/typst-minimal-cv"
+
 [minimal-cv."0.1.0"]
 url = "https://packages.typst.org/preview/minimal-cv-0.1.0.tar.gz"
 hash = "sha256-YQrVb43sOKaG3kgNma2GVYT+xA5pmPlIfbrkAu/wtSA="
@@ -11703,6 +14579,28 @@ license = [
 ]
 homepage = "https://github.com/lelimacon/typst-minimal-cv"
 
+[minimal-note."0.10.0"]
+url = "https://packages.typst.org/preview/minimal-note-0.10.0.tar.gz"
+hash = "sha256-bipnk5hl+qg3ejVq2Qxfo8iuRRApjZxIVTK/28rBmkY="
+typstDeps = [
+    "algorithmic_1_0_0",
+]
+description = "Notes with colorful minimalism"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/Michel-Liao/minimal-note"
+
+[minimal-presentation."0.7.0"]
+url = "https://packages.typst.org/preview/minimal-presentation-0.7.0.tar.gz"
+hash = "sha256-Vory9li+8aMwQ8ceEmqTar8I9QqKXguu1LH2Lugf1/Y="
+typstDeps = []
+description = "A modern minimalistic presentation template ready to use"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/flavio20002/typst-presentation-minimal-template"
+
 [minimal-presentation."0.6.0"]
 url = "https://packages.typst.org/preview/minimal-presentation-0.6.0.tar.gz"
 hash = "sha256-OqITcVSkhql4T3oVctyE36f5Tm3eZ6JtrVYAYjvRl7M="
@@ -11763,6 +14661,58 @@ license = [
 ]
 homepage = "https://github.com/flavio20002/typst-presentation-minimal-template"
 
+[minimal-thesis-luebeck."0.8.0"]
+url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.8.0.tar.gz"
+hash = "sha256-OcV2RAzGpR2UNFeU3W7HM3n6M+t+viubK4r44NszJpk="
+typstDeps = [
+    "abbr_0_2_3",
+    "hydra_0_6_2",
+]
+description = "A minimalistic template for writing a thesis"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fhemstra/minimal-thesis-luebeck"
+
+[minimal-thesis-luebeck."0.7.0"]
+url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.7.0.tar.gz"
+hash = "sha256-7QX4v57u/KQmkFO2BOI5xVnH18Noj/JUsq/VFREKYpc="
+typstDeps = [
+    "abbr_0_2_3",
+    "hydra_0_6_1",
+]
+description = "A minimalistic template for writing a thesis"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fhemstra/minimal-thesis-luebeck"
+
+[minimal-thesis-luebeck."0.6.0"]
+url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.6.0.tar.gz"
+hash = "sha256-aDWKaMSpInSrpoNh09RQqjW8KJj5Uv7VCqayX7dJ618="
+typstDeps = [
+    "abbr_0_2_3",
+    "hydra_0_6_1",
+]
+description = "A minimalistic template for writing a thesis"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fhemstra/minimal-thesis-luebeck"
+
+[minimal-thesis-luebeck."0.5.0"]
+url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.5.0.tar.gz"
+hash = "sha256-t8DVWepVFjOt1M8LcDbZGYizjrCunFNrCIbwJirM9YQ="
+typstDeps = [
+    "abbr_0_2_3",
+    "hydra_0_6_1",
+]
+description = "A minimalistic template for writing a thesis"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/fhemstra/minimal-thesis-luebeck"
+
 [minimal-thesis-luebeck."0.4.0"]
 url = "https://packages.typst.org/preview/minimal-thesis-luebeck-0.4.0.tar.gz"
 hash = "sha256-p/r2Jf0T+64MEtL6oMSXo1lfeQgsGQe9iMOXYYtgRss="
@@ -11810,6 +14760,26 @@ license = [
     "MIT",
 ]
 
+[minimal-unilim-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/minimal-unilim-thesis-0.1.1.tar.gz"
+hash = "sha256-6iEN4JnsL6p08knbDbpaFh9QionD3A2nX/A7hUuax10="
+typstDeps = []
+description = "Minimal example for a thesis at University of Limoges"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/kawiluca/packages-unilim-thesis"
+
+[minimal-unilim-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/minimal-unilim-thesis-0.1.0.tar.gz"
+hash = "sha256-70B6Z/FT8RXyCaGe6bNdcyTOTjnMKoIxsazL3aKH8pg="
+typstDeps = []
+description = "Minimal example for a thesis at University of Limoges"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/kawiluca/template-typst-unilim"
+
 [minimalbc."0.0.1"]
 url = "https://packages.typst.org/preview/minimalbc-0.0.1.tar.gz"
 hash = "sha256-JN6jgcnII6jPACdceOqtpnb9kx43fkyLK7Z21PmwvPg="
@@ -11966,6 +14936,19 @@ license = [
 ]
 homepage = "https://github.com/OrangeX4/mitex"
 
+[modern-acad-cv."0.1.4"]
+url = "https://packages.typst.org/preview/modern-acad-cv-0.1.4.tar.gz"
+hash = "sha256-FPgeJ02NPf8LJkluLdlus2oQCjQHtuqaKJB3ufjiOlo="
+typstDeps = [
+    "fontawesome_0_5_0",
+    "use-academicons_0_1_0",
+]
+description = "A CV template for academics based on moderncv LaTeX package"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/philkleer/typst-modern-acad-cv"
+
 [modern-acad-cv."0.1.3"]
 url = "https://packages.typst.org/preview/modern-acad-cv-0.1.3.tar.gz"
 hash = "sha256-md1GRHWOxDNNy4iavFGqSmgpxMKJR8KGsT0pR2XAPso="
@@ -12071,6 +15054,20 @@ license = [
 ]
 homepage = "https://github.com/mosrat/modern-bnu-thesis"
 
+[modern-buaa-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/modern-buaa-thesis-0.1.0.tar.gz"
+hash = "sha256-++OOFppMGyurhhbXBMtrIKVofN+ldhqcdYH3m+8g0aA="
+typstDeps = [
+    "cuti_0_3_0",
+    "lovelace_0_3_0",
+    "subpar_0_2_2",
+]
+description = "A modern thesis template for BUAA"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/wangjq4214/buaa-thesis"
+
 [modern-cqut-thesis."0.1.0"]
 url = "https://packages.typst.org/preview/modern-cqut-thesis-0.1.0.tar.gz"
 hash = "sha256-75yWFP5K6VmsPKff/BvzKHK15Bch6CwRXEHsTIaZJYQ="
@@ -12239,6 +15236,19 @@ license = [
 ]
 homepage = "https://github.com/Rsweater/cug-thesis-typst"
 
+[modern-cv."0.9.0"]
+url = "https://packages.typst.org/preview/modern-cv-0.9.0.tar.gz"
+hash = "sha256-WDxVubQ1UYDUnjMgpYTwbQQ+0QoP7Ya9ZfyKPBfkWtI="
+typstDeps = [
+    "fontawesome_0_6_0",
+    "linguify_0_4_2",
+]
+description = "A modern resume template based on the Awesome-CV Latex template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/DeveloperPaul123/modern-cv"
+
 [modern-cv."0.8.0"]
 url = "https://packages.typst.org/preview/modern-cv-0.8.0.tar.gz"
 hash = "sha256-p8ZkhcYvO3vdidAYRYobapreiZSqE4Pihd0eEeLIQ24="
@@ -12354,6 +15364,26 @@ license = [
 ]
 homepage = "https://github.com/DeveloperPaul123/modern-cv"
 
+[modern-ecnu-thesis."0.3.0"]
+url = "https://packages.typst.org/preview/modern-ecnu-thesis-0.3.0.tar.gz"
+hash = "sha256-26L1M0A2j6+DNZq0/R+kjO8xDeI8oKGvvZpco0vl2yw="
+typstDeps = [
+    "cuti_0_2_1",
+    "hydra_0_5_2",
+    "i-figured_0_1_0",
+    "i-figured_0_2_4",
+    "kouhu_0_1_0",
+    "outrageous_0_3_0",
+    "pinit_0_1_3",
+    "tablex_0_0_8",
+    "wordometer_0_1_4",
+]
+description = "华东师范大学本科 / 研究生学位论文模板。Modern East China Normal University Thesis Template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jtchen2k/modern-ecnu-thesis"
+
 [modern-ecnu-thesis."0.2.0"]
 url = "https://packages.typst.org/preview/modern-ecnu-thesis-0.2.0.tar.gz"
 hash = "sha256-d9JuuJUbBPELbgJ0KHVX+hcYzap41sd8CD023oPu1Jk="
@@ -12495,6 +15525,16 @@ license = [
 ]
 homepage = "https://github.com/MrToWy/hsh-thesis"
 
+[modern-iu-thesis."0.1.2"]
+url = "https://packages.typst.org/preview/modern-iu-thesis-0.1.2.tar.gz"
+hash = "sha256-D7f+z1GZAomGWR+DhcwXEC0vkj03GpCMmQoWuCdq6Cc="
+typstDeps = []
+description = "Modern Typst thesis template for Indiana University"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/bojohnson5/modern-iu-thesis"
+
 [modern-iu-thesis."0.1.1"]
 url = "https://packages.typst.org/preview/modern-iu-thesis-0.1.1.tar.gz"
 hash = "sha256-2ki23KYifJMk0zCVnFTu/KlJsmo5LeOT8UoCeuecsdQ="
@@ -12515,6 +15555,28 @@ license = [
 ]
 homepage = "https://github.com/bojohnson5/modern-iu-thesis"
 
+[modern-nenu-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/modern-nenu-thesis-0.1.0.tar.gz"
+hash = "sha256-VTZxh33UXcUDsglbmskbTJNEeM21tga942QtJwYQf9U="
+typstDeps = [
+    "cetz_0_4_2",
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "cuti_0_3_0",
+    "gentle-clues_1_2_0",
+    "i-figured_0_2_4",
+    "kouhu_0_2_0",
+    "lovelace_0_3_0",
+    "numbly_0_1_0",
+    "tablex_0_0_9",
+    "tidy_0_4_3",
+]
+description = "A thesis template for NENU students"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/virgiling/NENU-Thesis-Typst"
+
 [modern-nju-thesis."0.4.0"]
 url = "https://packages.typst.org/preview/modern-nju-thesis-0.4.0.tar.gz"
 hash = "sha256-3F1HXZfxlLgbcTNfe37YHIW5M/EY5zGy4thnlVFBfzU="
@@ -12803,6 +15865,31 @@ license = [
 ]
 homepage = "https://github.com/XY-cpp/typst-shu-thesis"
 
+[modern-sjtu-thesis."0.5.0"]
+url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.5.0.tar.gz"
+hash = "sha256-mT20e+5dQeK6uq/kkVOp/VV69cPOBFcKxgqkCyzTTuE="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "cuti_0_3_0",
+    "equate_0_3_2",
+    "fletcher_0_5_8",
+    "i-figured_0_2_4",
+    "itemize_0_1_2",
+    "lilaq_0_4_0",
+    "lovelace_0_3_0",
+    "numbly_0_1_0",
+    "suiji_0_4_0",
+    "theorion_0_4_0",
+    "unify_0_7_1",
+    "wordometer_0_1_4",
+]
+description = "上海交通大学学位论文 Typst 模板。Shanghai Jiao Tong University Thesis Typst Template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tzhtaylor/modern-sjtu-thesis"
+
 [modern-sjtu-thesis."0.4.1"]
 url = "https://packages.typst.org/preview/modern-sjtu-thesis-0.4.1.tar.gz"
 hash = "sha256-syG66QD8d+MNFNfmvhFHDU3OhvySr/Mk/+IWOfj8F9Y="
@@ -13152,6 +16239,36 @@ license = [
     "MIT",
 ]
 
+[modern-ucas-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/modern-ucas-thesis-0.1.0.tar.gz"
+hash = "sha256-poI/Jg1TBlmKqGxGeXYqF63OjOuMsZxmh6cVkw6kQSc="
+typstDeps = [
+    "cuti_0_3_0",
+    "i-figured_0_2_4",
+    "pinit_0_2_2",
+    "tablex_0_0_9",
+]
+description = "Master's or doctoral thesis at the University of Chinese Academy of Sciences"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/WayneXuCN/modern-ucas-thesis"
+
+[modern-uestc-thesis."1.0.0"]
+url = "https://packages.typst.org/preview/modern-uestc-thesis-1.0.0.tar.gz"
+hash = "sha256-NjOkA1jp6Y0wBYIiaJ8bW5ZnGatK9RL3v+6bs/TxgNw="
+typstDeps = [
+    "i-figured_0_2_4",
+    "muchpdf_0_1_0",
+    "numbly_0_1_0",
+    "pointless-size_0_1_2",
+    "zebraw_0_5_4",
+]
+description = "电子科技大学硕士学位论文模板.Modern UESTC Thesis Template"
+license = [
+    "MIT",
+]
+
 [modern-uit-thesis."0.1.6"]
 url = "https://packages.typst.org/preview/modern-uit-thesis-0.1.6.tar.gz"
 hash = "sha256-UyFBhs7rQwHYED4sV3Tnb+vqtq3ZDADn42Tu9qF4q+c="
@@ -13294,6 +16411,20 @@ license = [
 ]
 homepage = "https://github.com/eduardz1/unito-typst-template"
 
+[modern-ustc-proposal."0.0.1"]
+url = "https://packages.typst.org/preview/modern-ustc-proposal-0.0.1.tar.gz"
+hash = "sha256-T8Ww9uol1majaqFX1maCoEyakAse5lOX74dagYyihWU="
+typstDeps = [
+    "cuti_0_3_0",
+    "diagraph_0_3_3",
+    "fontawesome_0_5_0",
+]
+description = "template for University of Science and Technology of China proposal 中国科学技术大学开题报告模板"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://github.com/ustctug/modern-ustc-proposal"
+
 [modern-whs-assignment."0.2.1"]
 url = "https://packages.typst.org/preview/modern-whs-assignment-0.2.1.tar.gz"
 hash = "sha256-uP8ZDJN5kFfUW/4ZlgQGYfUe9gnxZAvVv6hcwtoZkp0="
@@ -13404,6 +16535,16 @@ license = [
 ]
 homepage = "https://github.com/alex289/whs-typst-templates"
 
+[modern-wku-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/modern-wku-thesis-0.1.0.tar.gz"
+hash = "sha256-tD2YKtR2PC68wKqtPrH7J2nI0uKsHiNadcRd51cUrmk="
+typstDeps = []
+description = "A Typst template for graduate thesis at Wenzhou-Kean University Computer Science and Mathematics department"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Timmycheng/wku-thesis"
+
 [modern-xmu-thesis."0.2.1"]
 url = "https://packages.typst.org/preview/modern-xmu-thesis-0.2.1.tar.gz"
 hash = "sha256-Vb4HmFiK9iAsCKydWL286nxT0KVkr/YJnAyRXWbI+ok="
@@ -13639,6 +16780,20 @@ license = [
 ]
 homepage = "https://github.com/ludwig-austermann/modpattern"
 
+[moodular."0.1.0"]
+url = "https://packages.typst.org/preview/moodular-0.1.0.tar.gz"
+hash = "sha256-DdYByRv7l7idU6PCXSjmfwr/yVlZYn/U8yvLIE1Q470="
+typstDeps = [
+    "bullseye_0_1_0",
+    "fontawesome_0_6_0",
+    "umbra_0_1_0",
+]
+description = "Use Typst's HTML export to generate content for your Moodle courses"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/SillyFreak/typst-moodular"
+
 [muchpdf."0.1.1"]
 url = "https://packages.typst.org/preview/muchpdf-0.1.1.tar.gz"
 hash = "sha256-E1ixacLZmArz2m9vPXEQDnvzqon2lsfyztMUOVxeNks="
@@ -13659,6 +16814,43 @@ license = [
 ]
 homepage = "https://github.com/frozolotl/muchpdf"
 
+[muw-community-templates."0.1.1"]
+url = "https://packages.typst.org/preview/muw-community-templates-0.1.1.tar.gz"
+hash = "sha256-cXOeiTlWHM7h4IGm/2SXT0wKYnVjfLW0rqdAgFYAqpg="
+typstDeps = [
+    "polylux_0_4_0",
+]
+description = "Library of templates in MedUni Wien CD"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/felixbd/muw-templates"
+
+[muw-community-templates."0.1.0"]
+url = "https://packages.typst.org/preview/muw-community-templates-0.1.0.tar.gz"
+hash = "sha256-EhT7izsoi3DX17CTiZPk7eOdaTXAldXL/fgexEauYYw="
+typstDeps = [
+    "gru_0_1_0",
+    "polylux_0_4_0",
+]
+description = "Library of templates in MedUni Wien CD"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/felixbd/muw-templates"
+
+[muw-touying-community."0.1.0"]
+url = "https://packages.typst.org/preview/muw-touying-community-0.1.0.tar.gz"
+hash = "sha256-gPTg7Cl6Gf9LGrbvFRyaQL3SZgzXZIU0BR3gKST/H5c="
+typstDeps = [
+    "touying_0_6_1",
+]
+description = "Touying theme for Medical University of Vienna"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Emberwhirl/muw-touying-community"
+
 [name-it."0.1.2"]
 url = "https://packages.typst.org/preview/name-it-0.1.2.tar.gz"
 hash = "sha256-Pdz3NnF03i37t8k7rmS29MEf4oRW2j0eqQPipyAmw7w="
@@ -13757,6 +16949,66 @@ license = [
 ]
 homepage = "https://github.com/Haouo/NCKU-Thesis-Typst"
 
+[neat-cv."0.4.0"]
+url = "https://packages.typst.org/preview/neat-cv-0.4.0.tar.gz"
+hash = "sha256-ffJa8JESI8+gr1QMcvSm+VmHea5HI0AANDlIFTjUjvA="
+typstDeps = [
+    "fontawesome_0_6_0",
+]
+description = "A modern and elegant CV template for Typst, inspired by Awesome CV and simple-hisptercv"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/dialvarezs/neat-cv"
+
+[neat-cv."0.3.1"]
+url = "https://packages.typst.org/preview/neat-cv-0.3.1.tar.gz"
+hash = "sha256-tGLhyoIDKtY32MSOLf/Ww890FMuUfTGJIdE3YaDErZo="
+typstDeps = [
+    "fontawesome_0_6_0",
+]
+description = "A modern and elegant CV template for Typst, inspired by Awesome CV and simple-hisptercv"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/dialvarezs/neat-cv"
+
+[neat-cv."0.3.0"]
+url = "https://packages.typst.org/preview/neat-cv-0.3.0.tar.gz"
+hash = "sha256-3DuZwfHdfIaRWszMLIix7CRYUiOUeV23PSBPwd11lb8="
+typstDeps = [
+    "fontawesome_0_6_0",
+]
+description = "A modern and elegant CV template for Typst, inspired by Awesome CV and simple-hisptercv"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/dialvarezs/neat-cv"
+
+[neat-cv."0.2.1"]
+url = "https://packages.typst.org/preview/neat-cv-0.2.1.tar.gz"
+hash = "sha256-sF7ju+g2yseovHua2TrkFM+lg3sHa6eB3EK0JOw9t4A="
+typstDeps = [
+    "fontawesome_0_5_0",
+]
+description = "A modern and elegant CV template for Typst, inspired by Awesome CV and simple-hisptercv"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/dialvarezs/neat-cv"
+
+[neat-cv."0.2.0"]
+url = "https://packages.typst.org/preview/neat-cv-0.2.0.tar.gz"
+hash = "sha256-tWDkOqJYgp1gQJjlKDPZ8s55sO0B3LsFbJQUm6CI32A="
+typstDeps = [
+    "fontawesome_0_5_0",
+]
+description = "A modern and elegant CV template for Typst, inspired by Awesome CV and simple-hisptercv"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/dialvarezs/neat-cv"
+
 [neat-cv."0.1.0"]
 url = "https://packages.typst.org/preview/neat-cv-0.1.0.tar.gz"
 hash = "sha256-dyv9Doh1uUSSzRLKOvVSZDkv0uLL4OmiJLbPpG79XvI="
@@ -13769,6 +17021,16 @@ license = [
 ]
 homepage = "https://github.com/dialvarezs/neat-cv"
 
+[neat-timetable."0.1.0"]
+url = "https://packages.typst.org/preview/neat-timetable-0.1.0.tar.gz"
+hash = "sha256-y1M3UliR0UE1INZAPoaupG9mgmhiurw9y0JeWvtt1RU="
+typstDeps = []
+description = "Easily create 2-week (numerator/denominator) class schedule"
+license = [
+    "AGPL-3.0-only",
+]
+homepage = "https://codeberg.org/Andrew15-5/neat-timetable"
+
 [neoplot."0.0.3"]
 url = "https://packages.typst.org/preview/neoplot-0.0.3.tar.gz"
 hash = "sha256-zkXZL1Ed9oBVGiuS+pMrT94XFmAFVBIHxdOa6NePXj4="
@@ -13799,6 +17061,26 @@ license = [
 ]
 homepage = "https://github.com/KNnut/neoplot"
 
+[nerd-icons."0.2.0"]
+url = "https://packages.typst.org/preview/nerd-icons-0.2.0.tar.gz"
+hash = "sha256-ZYGZNOectAUDm/CbhwVs2UsIhNm9yAOIe8EsO6O0j+M="
+typstDeps = []
+description = "Include seemlessly nerd font icons (10 000+ icons) in your documents"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://gitlab.com/TuTiuTe/typst-nerdfont"
+
+[nerd-icons."0.1.0"]
+url = "https://packages.typst.org/preview/nerd-icons-0.1.0.tar.gz"
+hash = "sha256-aCx/GtNPX/663zlXSgichvonyaKUB1C8mYlsdTgPnlM="
+typstDeps = []
+description = "Incldue seemlessly nerd font icons (10 000+ icons) in your documents"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://gitlab.com/TuTiuTe/typst-nerdfont"
+
 [nifty-ntnu-thesis."0.1.3"]
 url = "https://packages.typst.org/preview/nifty-ntnu-thesis-0.1.3.tar.gz"
 hash = "sha256-GU/OcgxTdR4WgoOs6Sa9cmLT0emtGyci2dkhFXSViRg="
@@ -13851,6 +17133,42 @@ license = [
 ]
 homepage = "https://github.com/saimnaveediqbal/thesis-NTNU-typst"
 
+[nikonova."0.1.1"]
+url = "https://packages.typst.org/preview/nikonova-0.1.1.tar.gz"
+hash = "sha256-Mjo8nMuiGvz3ALHdiSaSgCHMLMK1+2h0/PkpDbanlJA="
+typstDeps = [
+    "mannot_0_3_0",
+    "showybox_2_0_4",
+]
+description = "For Math exercises, with a unique dark theme"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/atraphaxia/nikonova"
+
+[nikonova."0.1.0"]
+url = "https://packages.typst.org/preview/nikonova-0.1.0.tar.gz"
+hash = "sha256-N45jfPZ1/aYbAPADwi/qgWd1YXmwXmRT4NCm8/2XXdI="
+typstDeps = [
+    "mannot_0_3_0",
+    "showybox_2_0_4",
+]
+description = "For Math exercises, with a unique dark theme"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/atraphaxia/nikonova"
+
+[nine-patch."0.1.0"]
+url = "https://packages.typst.org/preview/nine-patch-0.1.0.tar.gz"
+hash = "sha256-105oQ2Ba+e7XT0iL59FkH9XaeqWh7TtPA+RxecmAb3U="
+typstDeps = []
+description = "Resizable Bitmap Plugin using the Android 9-patch technique"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/PentaPhi/nine-patch"
+
 [niram-css."0.1.0"]
 url = "https://packages.typst.org/preview/niram-css-0.1.0.tar.gz"
 hash = "sha256-PHcYJreCtl76p9OOPEGQlZ1IZV650rJAOvQnONFoFc4="
@@ -14193,6 +17511,19 @@ license = [
     "MIT",
 ]
 
+[nup."0.1.2"]
+url = "https://packages.typst.org/preview/nup-0.1.2.tar.gz"
+hash = "sha256-bfZ8olL7TCD6AibsnuWVLaooRl6LJlRBqrcbm2Hpats="
+typstDeps = [
+    "muchpdf_0_1_1",
+    "shadowed_0_2_0",
+]
+description = "Preview multipage documents with a defined grid layout"
+license = [
+    "MPL-2.0",
+]
+homepage = "https://github.com/baptiste/nup"
+
 [nup."0.1.1"]
 url = "https://packages.typst.org/preview/nup-0.1.1.tar.gz"
 hash = "sha256-UEG7L4KtOcMsILjhcNDZPrzrjFMDqYLTMWQQnjLmNWM="
@@ -14219,6 +17550,36 @@ license = [
 ]
 homepage = "https://github.com/baptiste/nup"
 
+[nutrition-label-nam."0.2.0"]
+url = "https://packages.typst.org/preview/nutrition-label-nam-0.2.0.tar.gz"
+hash = "sha256-56fGm87eiQLPvoUJ2dfbVcsW4IOmoSHfgxzwz6VSGEE="
+typstDeps = []
+description = "A configurable template to generate FDA-style nutrition fact labels"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alpharesearch/packages"
+
+[nutrition-label-nam."0.1.0"]
+url = "https://packages.typst.org/preview/nutrition-label-nam-0.1.0.tar.gz"
+hash = "sha256-I0vP8WtAwC2x+bZuEVu1PO1YV6AxscLRW0S41EoJlss="
+typstDeps = []
+description = "A configurable template to generate FDA-style nutrition fact labels"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alpharesearch/packages"
+
+[nutshell."0.1.1"]
+url = "https://packages.typst.org/preview/nutshell-0.1.1.tar.gz"
+hash = "sha256-eFq4hhtXPVVx13ABg/ULZaV78Ks/9ej4GAGgixtR7HI="
+typstDeps = []
+description = "Template for resumes"
+license = [
+    "MPL-2.0",
+]
+homepage = "https://github.com/baptiste/nutshell"
+
 [nutshell."0.1.0"]
 url = "https://packages.typst.org/preview/nutshell-0.1.0.tar.gz"
 hash = "sha256-TXCxBWkva9PL3lDAkSRj8vObQtgeWtZOxRu6gSsXos4="
@@ -14229,6 +17590,16 @@ license = [
 ]
 homepage = "https://github.com/baptiste/nutshell"
 
+[oasis-align."0.3.0"]
+url = "https://packages.typst.org/preview/oasis-align-0.3.0.tar.gz"
+hash = "sha256-pzOzbLP3sjwDkGKefcqnPFkjyDdQ6s3nQQg3j2+l8QQ="
+typstDeps = []
+description = "Cleanly place content side by side with equal heights using automatic content sizing"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jdpieck/oasis-align"
+
 [oasis-align."0.2.0"]
 url = "https://packages.typst.org/preview/oasis-align-0.2.0.tar.gz"
 hash = "sha256-XB8YyrcSP3+jHSik+aE8JybL8Pncju/2MKW3MC85TTA="
@@ -14274,6 +17645,16 @@ license = [
 ]
 homepage = "https://github.com/l0drex/obsidius"
 
+[octique."0.1.1"]
+url = "https://packages.typst.org/preview/octique-0.1.1.tar.gz"
+hash = "sha256-dH2yqqRFc4i+kYwSef/yEl5LKt2zXQ43eG3o+aDhoQI="
+typstDeps = []
+description = "GitHub Octicons for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/0x6b/typst-octique"
+
 [octique."0.1.0"]
 url = "https://packages.typst.org/preview/octique-0.1.0.tar.gz"
 hash = "sha256-rBU06k0iuTMRfSD4s+AsgdVyhvonKzKihh1OCGqvs1w="
@@ -14305,6 +17686,41 @@ license = [
     "MIT-0",
 ]
 
+[oicana."0.1.0"]
+url = "https://packages.typst.org/preview/oicana-0.1.0.tar.gz"
+hash = "sha256-+HPH7jSoXTSvTzxgwSiLcMJ6GCDZ3nVoHSIDu0JMofY="
+typstDeps = []
+description = "PDF templating across multiple platforms"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/oicana/oicana"
+
+[olaii-upn-qr."0.0.2"]
+url = "https://packages.typst.org/preview/olaii-upn-qr-0.0.2.tar.gz"
+hash = "sha256-6xahh7zRL/QFM1xsfdgnFwBEooJULJe2R8+KOg+5AXc="
+typstDeps = [
+    "based_0_2_0",
+    "tiaoma_0_3_0",
+]
+description = "Univerzalni plačilni nalog UPN QR (Obrazec UPN QR"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Olaii/olaii-upn-qr-typst-template"
+
+[olaii-upn-qr."0.0.1"]
+url = "https://packages.typst.org/preview/olaii-upn-qr-0.0.1.tar.gz"
+hash = "sha256-eOUoBPbatjKVu6Z3qEsiCiqoekL6yCJVfkCgTBeWwc0="
+typstDeps = [
+    "tiaoma_0_3_0",
+]
+description = "Univerzalni plačilni nalog UPN QR (Obrazec UPN QR"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Olaii/olaii-upn-qr-typst-template"
+
 [one-liner."0.2.0"]
 url = "https://packages.typst.org/preview/one-liner-0.2.0.tar.gz"
 hash = "sha256-bl5orWMBgaPJl9IGU+kPBCOGdtJC2AryB3351ZoJrWw="
@@ -14415,6 +17831,22 @@ license = [
 ]
 homepage = "https://github.com/flavio20002/typst-orange-template"
 
+[ori."0.2.3"]
+url = "https://packages.typst.org/preview/ori-0.2.3.tar.gz"
+hash = "sha256-OFOrz5bKfy8ch9kStWAZJTPi2fivOJXnH52+kQJMYOE="
+typstDeps = [
+    "cmarker_0_1_6",
+    "mitex_0_2_5",
+    "numbly_0_1_0",
+    "tablem_0_3_0",
+    "theorion_0_4_0",
+]
+description = "Simple enough but expressive template for notes, reports, and documents in Chinese and English"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-ori"
+
 [ori."0.2.2"]
 url = "https://packages.typst.org/preview/ori-0.2.2.tar.gz"
 hash = "sha256-2MWM9GPjEyOQXpcAzDXrsEZxNtsaAvtGCm+cVOx5j9o="
@@ -14493,6 +17925,16 @@ license = [
 ]
 homepage = "https://github.com/TobiBeh/HS-Emden-Leer-Typst-Template"
 
+[ourchat."0.2.0"]
+url = "https://packages.typst.org/preview/ourchat-0.2.0.tar.gz"
+hash = "sha256-yajMT4z06lyWNGn4DCWFy8SIAyRwYWg3nXb4cnRvvLQ="
+typstDeps = []
+description = "Forge wonderful chat messages"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/QuadnucYard/ourchat-typ"
+
 [ourchat."0.1.0"]
 url = "https://packages.typst.org/preview/ourchat-0.1.0.tar.gz"
 hash = "sha256-2fY2FGTSaUD9HDdI1A3SSD20l0nKQKUzcc99z03/deg="
@@ -14653,6 +18095,26 @@ license = [
 ]
 homepage = "https://github.com/TJ-CSCCG/tongji-undergrad-thesis-typst.git"
 
+[paiagram."0.1.1"]
+url = "https://packages.typst.org/preview/paiagram-0.1.1.tar.gz"
+hash = "sha256-IUjn4Aoy5cEz6PpSMRnggYSSQEyBMxbU0AZpkDrS5yc="
+typstDeps = []
+description = "Draw transportation timetable diagrams"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/wensimehrp/paiagram"
+
+[para-lipics."0.1.2"]
+url = "https://packages.typst.org/preview/para-lipics-0.1.2.tar.gz"
+hash = "sha256-jnhebK659+ANmZTBJ3E18lVPZohCTICbK788KxtHaeI="
+typstDeps = []
+description = "Unofficial Dagstuhl LIPIcs template"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/para-lipics/para-lipics/"
+
 [parcio-slides."0.1.1"]
 url = "https://packages.typst.org/preview/parcio-slides-0.1.1.tar.gz"
 hash = "sha256-iOXl+QEOSLYkGNzbHDVckikJGSLV4z/6f+625Gmwmfg="
@@ -14763,6 +18225,18 @@ license = [
 ]
 homepage = "https://github.com/QuadnucYard/pavemat"
 
+[payqr-swiss."0.3.0"]
+url = "https://packages.typst.org/preview/payqr-swiss-0.3.0.tar.gz"
+hash = "sha256-QPwRSwW0nxGZ3ZwTv1aV6r+GVepyjqdMrdOgjLk7N24="
+typstDeps = [
+    "tiaoma_0_3_0",
+]
+description = "A Swiss QR bill generator for Typst"
+license = [
+    "LGPL-3.0-only",
+]
+homepage = "https://github.com/philippdrebes/typst-payqr-swiss"
+
 [payqr-swiss."0.2.0"]
 url = "https://packages.typst.org/preview/payqr-swiss-0.2.0.tar.gz"
 hash = "sha256-AnkmEdX5z32FapkNuC1oLK3oRH2E1jkZ62hFhipTji4="
@@ -14787,6 +18261,36 @@ license = [
 ]
 homepage = "https://github.com/philippdrebes/typst-payqr-swiss"
 
+[pc-letter."0.2.0"]
+url = "https://packages.typst.org/preview/pc-letter-0.2.0.tar.gz"
+hash = "sha256-d0KtOAAXGm5rTa72AkOyzwaKQmQvLGMa/XpwL5j33JI="
+typstDeps = []
+description = "A simple letter template for personal correspondence"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/thatfloflo/typst-pc-letter"
+
+[pc-letter."0.1.0"]
+url = "https://packages.typst.org/preview/pc-letter-0.1.0.tar.gz"
+hash = "sha256-Y8HLuqYfjdpUaaDoL382PbdVOFo16FiZaD8mwCDS4fI="
+typstDeps = []
+description = "A simple letter template for personal correspondence"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/thatfloflo/typst-pc-letter"
+
+[pc-letter."0.0.1"]
+url = "https://packages.typst.org/preview/pc-letter-0.0.1.tar.gz"
+hash = "sha256-G8DguegLzNJaVU6QkUgxJ8gNEdDhRowDkxiLlH8MBVU="
+typstDeps = []
+description = "A simple letter template for personal correspondence"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/thatfloflo/typst-pc-letter"
+
 [peace-of-posters."0.5.6"]
 url = "https://packages.typst.org/preview/peace-of-posters-0.5.6.tar.gz"
 hash = "sha256-oFZwuAptnhscrFLeJ3cjaZsIs1gbAMrxjkxKwwoMGmg="
@@ -14887,6 +18391,16 @@ license = [
 ]
 homepage = "https://github.com/jonaspleyer/peace-of-posters"
 
+[penpo."0.1.0"]
+url = "https://packages.typst.org/preview/penpo-0.1.0.tar.gz"
+hash = "sha256-vrlqER4diWEetWCGrv8nNigwfzIjVBHF8HqBDyekuQY="
+typstDeps = []
+description = "ni li ken alasa e pakala lili, li ken sitelen e lipu sina | toki pona spellchecker and typesetter"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Vanille-N/penpo.typ"
+
 [percencode."0.1.0"]
 url = "https://packages.typst.org/preview/percencode-0.1.0.tar.gz"
 hash = "sha256-uMSxUuO2bjAWwr8SQ+8jQIA4J/F0TetNAHr/MUYeqIE="
@@ -14899,6 +18413,48 @@ license = [
 ]
 homepage = "https://github.com/Servostar/typst-percencode"
 
+[pergamon."0.3.0"]
+url = "https://packages.typst.org/preview/pergamon-0.3.0.tar.gz"
+hash = "sha256-7LHGXM4oCRPxrvibuVtsvtKXlR7TnpWydi7CjEShNpE="
+typstDeps = [
+    "citegeist_0_2_0",
+    "nth_1_0_1",
+    "oxifmt_1_0_0",
+]
+description = "Biblatex-style reference management for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alexanderkoller/pergamon"
+
+[pergamon."0.2.0"]
+url = "https://packages.typst.org/preview/pergamon-0.2.0.tar.gz"
+hash = "sha256-E1YLBDmbgDm5KH9Wquv+sIywWNyUxrp1IftmzEe+YYM="
+typstDeps = [
+    "citegeist_0_1_0",
+    "nth_1_0_1",
+    "oxifmt_1_0_0",
+]
+description = "Biblatex-style reference management for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alexanderkoller/pergamon"
+
+[pergamon."0.1.0"]
+url = "https://packages.typst.org/preview/pergamon-0.1.0.tar.gz"
+hash = "sha256-5IjAaxyQS3K5M7bPOcVXZyt0tC8uH1UbQY1mSOGAxOM="
+typstDeps = [
+    "citegeist_0_1_0",
+    "nth_1_0_1",
+    "oxifmt_1_0_0",
+]
+description = "Biblatex-style reference management for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/alexanderkoller/pergamon"
+
 [pesha."0.4.0"]
 url = "https://packages.typst.org/preview/pesha-0.4.0.tar.gz"
 hash = "sha256-IsYeDU+O7e4KSTl9+nWJiyRgki3QikYJdoDhZF3kYBQ="
@@ -15089,6 +18645,18 @@ license = [
 ]
 homepage = "https://github.com/neuralpain/pigmentpedia"
 
+[pillar."0.3.3"]
+url = "https://packages.typst.org/preview/pillar-0.3.3.tar.gz"
+hash = "sha256-h4ObyYmgodOLEK5bWk7HMnwq9bzX+dWhW/8umCv7P6o="
+typstDeps = [
+    "zero_0_4_0",
+]
+description = "Faster column specifications for tables"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Mc-Zen/pillar"
+
 [pillar."0.3.2"]
 url = "https://packages.typst.org/preview/pillar-0.3.2.tar.gz"
 hash = "sha256-2Wriav61AfMHQhvwAauKKsR13aR+9x45FK/JTSGIFOg="
@@ -15356,6 +18924,18 @@ license = [
 ]
 homepage = "https://github.com/Pegacraft/typst-plotting"
 
+[plotsy-3d."0.2.1"]
+url = "https://packages.typst.org/preview/plotsy-3d-0.2.1.tar.gz"
+hash = "sha256-AsOA01XIfSMuSBdQNClscGsMD8Vc3LBhEWMI4uR1YC4="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "3D plotting for surfaces and parametric equations using CeTZ similar to pgfplots for LaTeX"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/misskacie/plotsy-3d"
+
 [plotsy-3d."0.2.0"]
 url = "https://packages.typst.org/preview/plotsy-3d-0.2.0.tar.gz"
 hash = "sha256-msL0DxwCBbdTKp7lSfqGCcjGD0PGjIA8GIgJOJaNZO0="
@@ -15380,9 +18960,19 @@ license = [
 ]
 homepage = "https://github.com/misskacie/plotsy-3d"
 
+[pointless-size."0.1.2"]
+url = "https://packages.typst.org/preview/pointless-size-0.1.2.tar.gz"
+hash = "sha256-4ONS8ENcA0agL+32H+SlKOHdpXpbmy25TdugHaVNGCU="
+typstDeps = []
+description = "中文字号的号数制及字体度量单位 Chinese size system (hào-system) and type-related measurements units"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/YDX-2147483647/typst-pointless-size"
+
 [pointless-size."0.1.1"]
 url = "https://packages.typst.org/preview/pointless-size-0.1.1.tar.gz"
-hash = "sha256-vf1pBfUfnEk0d15uz+2qaVI8yP3aE9C/V+ePRfZa+ls="
+hash = "sha256-zVVSbnSsTLgbIBBHOycL9lv7WHKnCYyLWKGv6xxgCos="
 typstDeps = []
 description = "中文字号的号数制及字体度量单位 Chinese size system (hào-system) and type-related measurements units"
 license = [
@@ -15400,6 +18990,19 @@ license = [
 ]
 homepage = "https://github.com/YDX-2147483647/typst-pointless-size"
 
+[politemplate."0.1.0"]
+url = "https://packages.typst.org/preview/politemplate-0.1.0.tar.gz"
+hash = "sha256-vfQsAiCVy2mDhRE/Uab7WpvDM4dNZALaSSpi/OM2oXs="
+typstDeps = [
+    "hydra_0_6_1",
+    "tablex_0_0_9",
+]
+description = "Report and assignment template for Poli-USP university"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/AlanJs26/politemplate"
+
 [polylux."0.4.0"]
 url = "https://packages.typst.org/preview/polylux-0.4.0.tar.gz"
 hash = "sha256-bhceuU/TCLHCItOw0EPWUIm/fraa4YzVZxbgvIlqYtk="
@@ -15440,6 +19043,30 @@ license = [
 ]
 homepage = "https://github.com/dei-layborer/polytonoi"
 
+[porygon."0.1.0"]
+url = "https://packages.typst.org/preview/porygon-0.1.0.tar.gz"
+hash = "sha256-10XdfmEyu2Qh5CeA+ihO6oPo7yIPe3awTv8G6RnUog0="
+typstDeps = [
+    "fontawesome_0_6_0",
+]
+description = "Create a CV from a JSON file"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Its-Just-Nans/porygon"
+
+[poster-syndrome."0.1.0"]
+url = "https://packages.typst.org/preview/poster-syndrome-0.1.0.tar.gz"
+hash = "sha256-KjFn7wEIfESEPXZFgDGyv9f7vJrgF+q2QpTINOpz0jI="
+typstDeps = [
+    "codetastic_0_2_2",
+]
+description = "A poster template with custom frame placement"
+license = [
+    "MPL-2.0",
+]
+homepage = "https://github.com/baptiste/poster-syndrome"
+
 [postercise."0.1.0"]
 url = "https://packages.typst.org/preview/postercise-0.1.0.tar.gz"
 hash = "sha256-QMTn5TcAstahWnqU0OCCir2fU9NEd1nym/2gJk450Ec="
@@ -15460,6 +19087,16 @@ license = [
 ]
 homepage = "https://github.com/jskaza/preprintx"
 
+[prequery."0.2.0"]
+url = "https://packages.typst.org/preview/prequery-0.2.0.tar.gz"
+hash = "sha256-xgx/vctOHpWso2bKgfi2E+cUFJ/RrFEH46AHN+bemIM="
+typstDeps = []
+description = "library for extracting metadata for preprocessing from a typst document"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/typst-community/prequery"
+
 [prequery."0.1.0"]
 url = "https://packages.typst.org/preview/prequery-0.1.0.tar.gz"
 hash = "sha256-SgjfD/wSGavgRWXSG2iG+bu+4pBuf76a1oFYQyQkN7o="
@@ -15473,6 +19110,16 @@ license = [
 ]
 homepage = "https://github.com/SillyFreak/typst-prequery"
 
+[presentate."0.2.0"]
+url = "https://packages.typst.org/preview/presentate-0.2.0.tar.gz"
+hash = "sha256-wpyQQMJu35DTHR42MdIJaz70BUCXz6do6+xcbT5c+U0="
+typstDeps = []
+description = "A package to create slides with ease"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pacaunt/typst-presentate"
+
 [presentate."0.1.0"]
 url = "https://packages.typst.org/preview/presentate-0.1.0.tar.gz"
 hash = "sha256-NyXpTM7rkHImpJ15UeQA1tiSIK6nTQDb33w1XDO4QOQ="
@@ -15483,6 +19130,30 @@ license = [
 ]
 homepage = "https://github.com/pacaunt/typst-presentate"
 
+[pretty-hdm-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/pretty-hdm-thesis-0.1.1.tar.gz"
+hash = "sha256-wIT0YhzFOSCivAxr5Aij6ihClOQF9BAbGF552F/N93M="
+typstDeps = [
+    "glossarium_0_5_9",
+]
+description = "Unofficial HdM Thesis Template inspired by the template by Prof. Dr. Dirk Heuzeroth"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/miawinter98/hdm-thesis"
+
+[pretty-hdm-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/pretty-hdm-thesis-0.1.0.tar.gz"
+hash = "sha256-cv0v+C5dn9D1Cfh8lormQBcJF9BKoBcxmkpbSblND4w="
+typstDeps = [
+    "glossarium_0_5_7",
+]
+description = "Unofficial HdM Thesis Template inspired by the template by Prof. Dr. Dirk Heuzeroth"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/miawinter98/hdm-thesis"
+
 [prismath."0.1.0"]
 url = "https://packages.typst.org/preview/prismath-0.1.0.tar.gz"
 hash = "sha256-O7PaP1OUcba6j5MBMOmggdPAQDsQkJT5O8RgjP6qfjs="
@@ -15564,6 +19235,36 @@ license = [
 ]
 homepage = "https://github.com/david-davies/typst-prooftree"
 
+[proteograph."0.2.0"]
+url = "https://packages.typst.org/preview/proteograph-0.2.0.tar.gz"
+hash = "sha256-OWLh2tRcVqXeh2HxUH/k9gpydyWaMlCrVXgfceBuKQE="
+typstDeps = [
+    "codly_1_3_0",
+    "fletcher_0_5_8",
+    "lilaq_0_4_0",
+    "tidy_0_4_3",
+    "tiptoe_0_3_1",
+]
+description = "A package to visualise proteomics data"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://codeberg.org/olangella/proteograph"
+
+[proteograph."0.1.0"]
+url = "https://packages.typst.org/preview/proteograph-0.1.0.tar.gz"
+hash = "sha256-68bbmG66U38sACork4g7VSkh6JcbLIukGLhCy1iTYXU="
+typstDeps = [
+    "lilaq_0_4_0",
+    "tidy_0_4_3",
+    "tiptoe_0_3_1",
+]
+description = "A package to visualise proteomics data"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://codeberg.org/olangella/proteograph"
+
 [psl-thesis."0.1.0"]
 url = "https://packages.typst.org/preview/psl-thesis-0.1.0.tar.gz"
 hash = "sha256-MxuFFtr0ZQ74qipJ4W9mRGBl03ehXeTXF2INoFaFOcY="
@@ -15614,6 +19315,18 @@ license = [
 ]
 homepage = "https://github.com/curvenote/pubmatter"
 
+[pull-eh."0.1.1"]
+url = "https://packages.typst.org/preview/pull-eh-0.1.1.tar.gz"
+hash = "sha256-u3ICsM79Vk1Vni1jQ4v5M2hqoHpe2Fm6zZhhtpYHgjs="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "Visualize pulleys with Typst and CeTZ"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SillyFreak/typst-pull-eh"
+
 [pull-eh."0.1.0"]
 url = "https://packages.typst.org/preview/pull-eh-0.1.0.tar.gz"
 hash = "sha256-E6U+SrfTA0IZKkyjn34ZWHR4hh+RZqG+EmsVpw1o7w4="
@@ -15683,6 +19396,18 @@ license = [
 ]
 homepage = "https://github.com/ludwig-austermann/qcm"
 
+[qec-thrust."0.1.1"]
+url = "https://packages.typst.org/preview/qec-thrust-0.1.1.tar.gz"
+hash = "sha256-vc0ok9xMZ09m4hoQ8MgAg6uruH2ZMIVpPS1E12nw/LA="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "A package for drawing quantum error correction codes with Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/nzy1997/qec-thrust"
+
 [qec-thrust."0.1.0"]
 url = "https://packages.typst.org/preview/qec-thrust-0.1.0.tar.gz"
 hash = "sha256-0Qofs0kXArco7PDC3iRU1Nnjm1hngYcA4tqxj/a1spo="
@@ -15695,6 +19420,22 @@ license = [
 ]
 homepage = "https://github.com/nzy1997/qec-thrust"
 
+[qooklet."0.6.1"]
+url = "https://packages.typst.org/preview/qooklet-0.6.1.tar.gz"
+hash = "sha256-K/X9tM4rcW1B3zuxPlj16fsZ65aL8wwIEko3E6D+2Bo="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "hydra_0_6_1",
+    "physica_0_9_5",
+    "theorion_0_3_3",
+]
+description = "A quick start template for scientific booklets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ivaquero/typst-qooklet.git"
+
 [qooklet."0.6.0"]
 url = "https://packages.typst.org/preview/qooklet-0.6.0.tar.gz"
 hash = "sha256-CMs9EV6tZnxPSZEV5SbToEr9VONkB+I3HKiTYWU/z5U="
@@ -15884,6 +19625,16 @@ license = [
 ]
 homepage = "https://github.com/FlorentCLMichel/quetta"
 
+[quic-style."0.0.1"]
+url = "https://packages.typst.org/preview/quic-style-0.0.1.tar.gz"
+hash = "sha256-USSaHG1dqu2htQAkorD3CXELRRkBb/TQ8/4DqotKjRs="
+typstDeps = []
+description = "A cohesive Typst design template that can be used in various situations—daily life, research, and experiments"
+license = [
+    "Unlicense",
+]
+homepage = "https://github.com/taniiicom/typst-quic-style"
+
 [quick-cards."0.1.1"]
 url = "https://packages.typst.org/preview/quick-cards-0.1.1.tar.gz"
 hash = "sha256-tXvD7cCih9ma1qhdNGzaPqqyA82p5YE1NIjUtDDSAgo="
@@ -16038,6 +19789,16 @@ license = [
 ]
 homepage = "https://github.com/artomweb/Quick-Sip-Typst-Template"
 
+[quill."0.7.2"]
+url = "https://packages.typst.org/preview/quill-0.7.2.tar.gz"
+hash = "sha256-LvDsUl4e8n9paScgV7rxMLMYBhLFw6kvHA84D980Ks0="
+typstDeps = []
+description = "Effortlessly create quantum circuit diagrams"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Mc-Zen/quill"
+
 [quill."0.7.1"]
 url = "https://packages.typst.org/preview/quill-0.7.1.tar.gz"
 hash = "sha256-KNnmvvamKnCEGxTI6mytLk4D/Ntse1ethrP4ey6MlyM="
@@ -16145,6 +19906,29 @@ license = [
     "MIT",
 ]
 
+[railynx."0.1.0"]
+url = "https://packages.typst.org/preview/railynx-0.1.0.tar.gz"
+hash = "sha256-WrucV9+nwnSdKuxbry1n1/Itmtw145j0gY/0lA8/asU="
+typstDeps = []
+description = "Draw rail track diagrams with concise syntax"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/yusancky/railynx"
+
+[realhats."0.1.0"]
+url = "https://packages.typst.org/preview/realhats-0.1.0.tar.gz"
+hash = "sha256-Ek0AqBU3af+tWe/JthyKtxuTpNRN8xZac2O20Aaik5g="
+typstDeps = [
+    "jumble_0_0_1",
+    "physica_0_8_1",
+    "suiji_0_3_0",
+]
+description = "Put real hats on symbols instead of circumflexes"
+license = [
+    "MIT",
+]
+
 [red-agora."0.1.1"]
 url = "https://packages.typst.org/preview/red-agora-0.1.1.tar.gz"
 hash = "sha256-K35bSciizmhhCU9hHlkPg2+wR8VCsQeTvisO/kuwVOU="
@@ -16240,6 +20024,52 @@ license = [
 ]
 homepage = "https://github.com/fky2015/resume-ng-typst"
 
+[retrofit."0.1.2"]
+url = "https://packages.typst.org/preview/retrofit-0.1.2.tar.gz"
+hash = "sha256-pw/GkrP6An3P7hrX+2fkONXJKgs3L4AfLhmMpl+ibCk="
+typstDeps = [
+    "tidy_0_4_3",
+]
+description = "Adds clickable backreferences to each bibliography entry, enabling custom formatting of all cited pages"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/xkevio/retrofit"
+
+[retrofit."0.1.1"]
+url = "https://packages.typst.org/preview/retrofit-0.1.1.tar.gz"
+hash = "sha256-PMXi0muwObTgvc8Iw+muDTJUl0zn0HZ5NYN4BmEvhnE="
+typstDeps = [
+    "tidy_0_4_3",
+]
+description = "Adds clickable backreferences to each bibliography entry, enabling custom formatting of all cited pages"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/xkevio/retrofit"
+
+[retrofit."0.1.0"]
+url = "https://packages.typst.org/preview/retrofit-0.1.0.tar.gz"
+hash = "sha256-64rjgz7BbX5A2Sd3hk6HCz4dVJy0kmQJw3a3pyBS0lw="
+typstDeps = [
+    "tidy_0_4_3",
+]
+description = "Adds clickable backreferences to each bibliography entry, enabling custom formatting of all cited pages"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/xkevio/retrofit"
+
+[rexllent."0.3.4"]
+url = "https://packages.typst.org/preview/rexllent-0.3.4.tar.gz"
+hash = "sha256-vttv5PO3TNh0ESBwNZ31djSTY6VHawr2nVpSV36o+0A="
+typstDeps = []
+description = "Parsing xlsx file into a typst table, powered by wasm"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/hongjr03/typst-rexllent"
+
 [rexllent."0.3.3"]
 url = "https://packages.typst.org/preview/rexllent-0.3.3.tar.gz"
 hash = "sha256-XIkYNdCwH8R1ZuLb6fwz+CRMBltqjI81qPKlHAnSqQY="
@@ -16496,6 +20326,26 @@ license = [
 ]
 homepage = "https://github.com/rose-pine/typst"
 
+[rowmantic."0.5.0"]
+url = "https://packages.typst.org/preview/rowmantic-0.5.0.tar.gz"
+hash = "sha256-jisIDc09G3Us+O4wylU5WNypTTjRzJPfQebA48e0/2U="
+typstDeps = []
+description = "Define tables row-wise, with inline separators between cells"
+license = [
+    "EUPL-1.2",
+]
+homepage = "https://github.com/typst-community/rowmantic"
+
+[rowmantic."0.4.0"]
+url = "https://packages.typst.org/preview/rowmantic-0.4.0.tar.gz"
+hash = "sha256-HoXBo02YR97AS1v2VwPWPnMeBd8BDMHbX7bYJFv9KJY="
+typstDeps = []
+description = "Define tables row-wise, with inline separators between cells"
+license = [
+    "EUPL-1.2",
+]
+homepage = "https://github.com/typst-community/rowmantic"
+
 [rowmantic."0.3.0"]
 url = "https://packages.typst.org/preview/rowmantic-0.3.0.tar.gz"
 hash = "sha256-CXibQEKW5URyH/xA0r7gZWbNB4l6CvK7oxnFJ9wvIHs="
@@ -16536,6 +20386,19 @@ license = [
 ]
 homepage = "https://github.com/typst-community/rowmantic"
 
+[rubber-article."0.5.0"]
+url = "https://packages.typst.org/preview/rubber-article-0.5.0.tar.gz"
+hash = "sha256-5IhFTrk1r9FXTA9IpvWejnxKpJlN3svKrDH2XD+9o30="
+typstDeps = [
+    "hydra_0_6_1",
+    "pillar_0_3_3",
+]
+description = "A simple template recreating the look of the classic LaTeX article"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/npikall/rubber-article.git"
+
 [rubber-article."0.4.2"]
 url = "https://packages.typst.org/preview/rubber-article-0.4.2.tar.gz"
 hash = "sha256-eJ/R0evHL162/vEvn5wpbLzXMKhyqQGVtf7DpN+4yrE="
@@ -16707,6 +20570,16 @@ license = [
 ]
 homepage = "https://github.com/swaits/typst-collection"
 
+[rustycure."0.1.0"]
+url = "https://packages.typst.org/preview/rustycure-0.1.0.tar.gz"
+hash = "sha256-Yg9JuGPi8xDGJ1+ulXvJK43d3r0j6ZEHqf5Lok1n7XU="
+typstDeps = []
+description = "Generate QR codes fast"
+license = [
+    "EUPL-1.2",
+]
+homepage = "https://codeberg.org/fussgaenger/rustycure"
+
 [s6t5-page-bordering."1.0.0"]
 url = "https://packages.typst.org/preview/s6t5-page-bordering-1.0.0.tar.gz"
 hash = "sha256-djet6k3bfA6oi+IpfoN6bsZ8sPkR0y2RVPB0bKKcgI4="
@@ -16809,6 +20682,16 @@ license = [
 ]
 homepage = "https://github.com/augustebaum/epfl-thesis-typst"
 
+[scholarly-tauthesis."0.16.3"]
+url = "https://packages.typst.org/preview/scholarly-tauthesis-0.16.3.tar.gz"
+hash = "sha256-WkhIH+VBCYAyYT7z5MuYyPwrt8Hs3DeF5EteTT0aXaM="
+typstDeps = []
+description = "A template for writing Tampere University theses"
+license = [
+    "MIT",
+]
+homepage = "https://gitlab.com/tuni-official/thesis-templates/tau-typst-thesis-template"
+
 [scholarly-tauthesis."0.15.2"]
 url = "https://packages.typst.org/preview/scholarly-tauthesis-0.15.2.tar.gz"
 hash = "sha256-YLv4e/VxeKpS7TWRor4LMKmMd6u/UOpbxzzMkV5yIXk="
@@ -17119,6 +21002,25 @@ license = [
 ]
 homepage = "https://github.com/Dregen-Yor/sdu-exp-report"
 
+[sdu-touying-simpl."1.0.0"]
+url = "https://packages.typst.org/preview/sdu-touying-simpl-1.0.0.tar.gz"
+hash = "sha256-ZM2jkUisW5nCk2PTSX+eukmSOxnJg0h9e4VjxMb3PIA="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "ctheorems_1_1_3",
+    "fletcher_0_5_8",
+    "gentle-clues_1_2_0",
+    "mitex_0_2_2",
+    "showybox_2_0_4",
+    "touying_0_6_1",
+]
+description = "An templete based on touying, "
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://github.com/Dregen-Yor/sdu-touying-simpl"
+
 [sdu-touying-simpl."0.3.1"]
 url = "https://packages.typst.org/preview/sdu-touying-simpl-0.3.1.tar.gz"
 hash = "sha256-3QSKmhYF1Qj9RT3rHR+DW8miDX+3RIlpQRurt6JMQ+Y="
@@ -17363,6 +21265,36 @@ license = [
 ]
 homepage = "https://github.com/shaneworld/HHU-Thesis-Template"
 
+[sheetstorm."0.3.3"]
+url = "https://packages.typst.org/preview/sheetstorm-0.3.3.tar.gz"
+hash = "sha256-HDm3UT7rQzDvUIgE5v+cYxT6UPdx44prtNnP72PDAOU="
+typstDeps = []
+description = "A template for university exercise sheets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rabuu/sheetstorm"
+
+[sheetstorm."0.2.0"]
+url = "https://packages.typst.org/preview/sheetstorm-0.2.0.tar.gz"
+hash = "sha256-0Kxp6+T8fojGg4I1RCvpj8z5/fyp/wj/bMlN8yHIAg8="
+typstDeps = []
+description = "A template for university exercise sheets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rabuu/sheetstorm"
+
+[sheetstorm."0.1.0"]
+url = "https://packages.typst.org/preview/sheetstorm-0.1.0.tar.gz"
+hash = "sha256-J6WL95oE0eowdDCIYDFjYaPY71YJsx9X6hjhBbYih60="
+typstDeps = []
+description = "A template for university exercise sheets"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/rabuu/sheetstorm"
+
 [shiroa."0.2.3"]
 url = "https://packages.typst.org/preview/shiroa-0.2.3.tar.gz"
 hash = "sha256-Yb2tdrqI1j/hZDV0gBctZssJaj3b7qqVVfCQ6BhG5uY="
@@ -17725,6 +21657,26 @@ license = [
 ]
 homepage = "https://github.com/VWWVVW/shuxuejuan"
 
+[sicons."15.13.0"]
+url = "https://packages.typst.org/preview/sicons-15.13.0.tar.gz"
+hash = "sha256-injvgnY5RDBV5Ni4Y1FM8dicVeYgNoL6nJ8US0Cq6+4="
+typstDeps = []
+description = "Access High quality Simple Icons SVGs from Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/cscnk52/typst-sicons"
+
+[sicons."15.12.0"]
+url = "https://packages.typst.org/preview/sicons-15.12.0.tar.gz"
+hash = "sha256-CvfifVb4Qo5NCJFUcJpdYbGfYGE12Vg22e3r0z1mvEU="
+typstDeps = []
+description = "Access High quality Simple Icons SVGs from Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/cscnk52/typst-sicons"
+
 [siddhi-syntax."0.1.0"]
 url = "https://packages.typst.org/preview/siddhi-syntax-0.1.0.tar.gz"
 hash = "sha256-fwiowLjoDTWvnY9d7k6AH4MmRpt6m94bSikczYxCX8o="
@@ -17735,6 +21687,19 @@ license = [
 ]
 homepage = "https://github.com/mahgoh/typst-siddhi-syntax"
 
+[siefken-syllabus."0.1.0"]
+url = "https://packages.typst.org/preview/siefken-syllabus-0.1.0.tar.gz"
+hash = "sha256-ryRf+u8wCUBfDdvEaGQIczBJgzAKlZFGvNEPbqYkFcg="
+typstDeps = [
+    "elembic_1_1_1",
+]
+description = "Template for a syllabus originally designed for the University of Toronto"
+license = [
+    "MIT",
+    "Apache-2.0",
+]
+homepage = "https://github.com/siefkenj/typst-siefken-syllabus"
+
 [sigfig."0.1.0"]
 url = "https://packages.typst.org/preview/sigfig-0.1.0.tar.gz"
 hash = "sha256-C/AoEPkroDYqtHr+r3rzQmdAvE8M9di0rE5EIcOWcsk="
@@ -17785,6 +21750,16 @@ license = [
 ]
 homepage = "https://github.com/SkytAsul/INSA-Typst-Template"
 
+[silky-report-insa."0.5.2"]
+url = "https://packages.typst.org/preview/silky-report-insa-0.5.2.tar.gz"
+hash = "sha256-Mr+8YvChHTKny7YZJ9s9dhYIs/7X1RBLm5o0IjIJzug="
+typstDeps = []
+description = "A template made for reports and other documents of INSA, a French engineering school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SkytAsul/INSA-Typst-Template"
+
 [silky-report-insa."0.5.1"]
 url = "https://packages.typst.org/preview/silky-report-insa-0.5.1.tar.gz"
 hash = "sha256-SnAuJ1qLZ3UE7CMSYO0Y8V+Dz9cYutJT4JksFFZ79AU="
@@ -17916,6 +21891,18 @@ license = [
     "MIT",
 ]
 
+[simple-bupt-report."0.1.1"]
+url = "https://packages.typst.org/preview/simple-bupt-report-0.1.1.tar.gz"
+hash = "sha256-BaR7WO5wwLjd6PlihGms1W9r/OKNs3zUqHzrg4FyZWk="
+typstDeps = [
+    "cuti_0_3_0",
+]
+description = "一份简单的北邮实验报告模板 Simple BUPT Report"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/zhao-leo/BUPT-Report-Typst"
+
 [simple-bupt-report."0.1.0"]
 url = "https://packages.typst.org/preview/simple-bupt-report-0.1.0.tar.gz"
 hash = "sha256-GeL1I2NCqZItRhfDPHI1u0aXJtTGnaYmFzouZ0fIIvk="
@@ -17941,6 +21928,21 @@ license = [
 ]
 homepage = "https://github.com/chillcicada/simple-handout-template"
 
+[simple-ntnu-report."0.1.0"]
+url = "https://packages.typst.org/preview/simple-ntnu-report-0.1.0.tar.gz"
+hash = "sha256-nTqMzQDZGzBaFRjEBK3HFJkCy6XQE4w6MoyEKpZaE2E="
+typstDeps = [
+    "icu-datetime_0_1_2",
+    "swank-tex_0_1_0",
+    "zero_0_3_3",
+]
+description = "Shorter academic reports at NTNU in Trondheim"
+license = [
+    "AGPL-3.0-or-later",
+    "MIT-0",
+]
+homepage = "https://github.com/torsteinnh/simple-ntnu-report"
+
 [simple-preavis."0.1.0"]
 url = "https://packages.typst.org/preview/simple-preavis-0.1.0.tar.gz"
 hash = "sha256-x5dtbcF3MGGGkGjAYSLHphn7XcrCnmRsf1g27aAq3vI="
@@ -18001,6 +22003,18 @@ license = [
 ]
 homepage = "https://github.com/VictuarVi/Template-Tesi-UniMi"
 
+[simple-ve-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/simple-ve-thesis-0.1.0.tar.gz"
+hash = "sha256-H4UmyPf1iLOLEYx+KhXyXWPylVXVGDO+91TXoWpMnOs="
+typstDeps = [
+    "grayness_0_3_0",
+]
+description = "Unofficial thesis template for Ca' Foscari University of Venice"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/biipo/typst-unive-template"
+
 [simplebnf."0.1.1"]
 url = "https://packages.typst.org/preview/simplebnf-0.1.1.tar.gz"
 hash = "sha256-dGCrPJW/E4rRKwO8Q+M0g1+zuC5N58Y5nrp1l4Q/9W8="
@@ -18126,6 +22140,19 @@ license = [
     "MIT",
 ]
 
+[smartaref."0.1.0"]
+url = "https://packages.typst.org/preview/smartaref-0.1.0.tar.gz"
+hash = "sha256-sGf+wEKbA0jgsORdjYcBObyvObDQQU8+dQeNR5ScUZc="
+typstDeps = [
+    "hallon_0_1_0",
+    "subpar_0_2_2",
+]
+description = "Smart handling of consecutive references (i.e. cleveref for Typst"
+license = [
+    "0BSD",
+]
+homepage = "https://github.com/mewmew/smartaref-typ"
+
 [smooth-tmlr."0.4.0"]
 url = "https://packages.typst.org/preview/smooth-tmlr-0.4.0.tar.gz"
 hash = "sha256-qJ/+wPqqN/ZYYkTil4YIs8hUc+SustHn0ERBT7QX0sE="
@@ -18194,6 +22221,16 @@ license = [
 ]
 homepage = "https://github.com/Bi0T1N/typst-socialhub-fa"
 
+[solo-lu-df."0.1.0"]
+url = "https://packages.typst.org/preview/solo-lu-df-0.1.0.tar.gz"
+hash = "sha256-9dQYiOOm0SuXFoQ+uJKMNLj4n95Vxs95BrhDjvCc20E="
+typstDeps = []
+description = "Write qualification papers, bachelor’s theses, and master’s theses for University of Lativa, Computer Science programme"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/kristoferssolo/LU-DF-Typst-Template"
+
 [solving-physics."0.1.0"]
 url = "https://packages.typst.org/preview/solving-physics-0.1.0.tar.gz"
 hash = "sha256-aioIHCKBnf8BBlYvO1UtrQ27o1/oCEvRieY1I29V3Sg="
@@ -18216,6 +22253,37 @@ license = [
 ]
 homepage = "https://codeberg.org/pfad.fr/typst-songbook"
 
+[songting-book."0.0.4"]
+url = "https://packages.typst.org/preview/songting-book-0.0.4.tar.gz"
+hash = "sha256-+iCuTslAKUV1ZSChKFtYkpRPkTGRb1fRpsZDanF710c="
+typstDeps = [
+    "hydra_0_6_1",
+    "i-figured_0_2_4",
+    "modern-nju-thesis_0_4_0",
+    "numbly_0_1_0",
+    "outrageous_0_4_0",
+]
+description = "Create Chinese-style books effortlessly using markup with built-in styling"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/zhinenggongziliaoku/songting-book"
+
+[songting-book."0.0.3"]
+url = "https://packages.typst.org/preview/songting-book-0.0.3.tar.gz"
+hash = "sha256-PrzVgAnJxVDRqWrolTX/r/aUk/jJSkj419zZPZLu3lM="
+typstDeps = [
+    "hydra_0_6_1",
+    "modern-nju-thesis_0_4_0",
+    "numbly_0_1_0",
+    "outrageous_0_4_0",
+]
+description = "Create Chinese-style books effortlessly using markup with built-in styling"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/zhinenggongziliaoku/songting-book"
+
 [songting-book."0.0.2"]
 url = "https://packages.typst.org/preview/songting-book-0.0.2.tar.gz"
 hash = "sha256-uNl6DIU8lxclkuDbwlEsmggUcS2ca6ZMVRWUJKtX3jg="
@@ -18246,6 +22314,30 @@ license = [
 ]
 homepage = "https://github.com/zhinenggongziliaoku/songting-book"
 
+[sos-ugent-style."0.2.0"]
+url = "https://packages.typst.org/preview/sos-ugent-style-0.2.0.tar.gz"
+hash = "sha256-NgcPW5AsXOFMaALkcrMATJeXK3JZQK4HrwPb/0NbsPg="
+typstDeps = [
+    "drafting_0_2_2",
+]
+description = "Write documents, presentations and dissertations in the same, uniform UGent style. Unofficial template"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://codeberg.org/th1j5/typst-sos-ugent-style"
+
+[sos-ugent-style."0.1.0"]
+url = "https://packages.typst.org/preview/sos-ugent-style-0.1.0.tar.gz"
+hash = "sha256-JJDKC25tBanY0psaxHRBOww7m8OYhvG17XSssJtkbSM="
+typstDeps = [
+    "drafting_0_2_2",
+]
+description = "Write documents, presentations and dissertations in the same, uniform UGent style. Unofficial template"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://codeberg.org/th1j5/typst-sos-ugent-style"
+
 [sourcerer."0.2.1"]
 url = "https://packages.typst.org/preview/sourcerer-0.2.1.tar.gz"
 hash = "sha256-WrNizB+4ZYOoIOlJxiuzaWqaI7htDzuGjJ5ZsmfxiAA="
@@ -18276,6 +22368,18 @@ license = [
 ]
 homepage = "https://github.com/miestrode/sourcerer"
 
+[soviet-matrix."0.2.1"]
+url = "https://packages.typst.org/preview/soviet-matrix-0.2.1.tar.gz"
+hash = "sha256-Ky+Ldu/M7ITs0iLN1gesdND9kLCvdLRuKIyQ/kzTrGo="
+typstDeps = [
+    "suiji_0_4_0",
+]
+description = "Tetris game in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/YouXam/soviet-matrix"
+
 [soviet-matrix."0.2.0"]
 url = "https://packages.typst.org/preview/soviet-matrix-0.2.0.tar.gz"
 hash = "sha256-8b/4OqWjlSVdGy1UlgIvqC4SEY81OPvNd1cvWPYmdKo="
@@ -18533,6 +22637,16 @@ license = [
 ]
 homepage = "https://github.com/HPDell/typst-starter-journal-article"
 
+[stash."0.1.0"]
+url = "https://packages.typst.org/preview/stash-0.1.0.tar.gz"
+hash = "sha256-gna1r70z+G7+qySDBN+75o7cfvX2ZOi6P9chWVEQ004="
+typstDeps = []
+description = "Stash content to display it later"
+license = [
+    "GPL-3.0-or-later",
+]
+homepage = "https://github.com/VanessB/typst-stash"
+
 [statastic."1.0.0"]
 url = "https://packages.typst.org/preview/statastic-1.0.0.tar.gz"
 hash = "sha256-zAYUeBwLwXHhLVBdYenuEpcG0RTBh0lBbqAiPXDafoY="
@@ -18579,6 +22693,17 @@ license = [
 ]
 homepage = "https://github.com/Riley719/typst-statementsp"
 
+[stellar-iac."0.5.0"]
+url = "https://packages.typst.org/preview/stellar-iac-0.5.0.tar.gz"
+hash = "sha256-lZqPmrK+Mdip7bI8h5UwgoMjC91AEWkuhAKKcHjU/Cg="
+typstDeps = []
+description = "Template for the International Astronautical Congress (IAC) manuscript"
+license = [
+    "MIT",
+    "MIT-0",
+]
+homepage = "https://github.com/shunichironomura/iac-typst-template"
+
 [stellar-iac."0.4.1"]
 url = "https://packages.typst.org/preview/stellar-iac-0.4.1.tar.gz"
 hash = "sha256-vxJ+YZEpi3w8pkFhmupmifPOI8G8A+tS8sJ+bGEsreM="
@@ -18610,6 +22735,18 @@ license = [
 ]
 homepage = "https://github.com/coco33920/stonewall"
 
+[storytiles."0.0.1"]
+url = "https://packages.typst.org/preview/storytiles-0.0.1.tar.gz"
+hash = "sha256-xVfQrBNh/7GsSvPSm2+Arvi2aweabNr1ETrwI9RclBI="
+typstDeps = [
+    "cuti_0_3_0",
+]
+description = "4 images per slide, for group meeting"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/xbttkunhao/storytiles"
+
 [structogrammer."0.1.2"]
 url = "https://packages.typst.org/preview/structogrammer-0.1.2.tar.gz"
 hash = "sha256-q0/P9yStQHs2dQDT820EfLUHMtu0pdIgFa9xn+dLtnM="
@@ -19342,6 +23479,42 @@ license = [
 ]
 homepage = "https://github.com/jneug/typst-tools4typst"
 
+[tabbyterms."0.1.0"]
+url = "https://packages.typst.org/preview/tabbyterms-0.1.0.tar.gz"
+hash = "sha256-B0EYn1QlEbwrbR0FADO3ZRr2obD3l3QI0WW+7X83w2Y="
+typstDeps = []
+description = "Layout the term list as a table, even with multiple columns"
+license = [
+    "EUPL-1.2",
+]
+homepage = "https://github.com/typst-community/tabbyterms"
+
+[tableau-icons."0.334.1"]
+url = "https://packages.typst.org/preview/tableau-icons-0.334.1.tar.gz"
+hash = "sha256-lnJo0dJflKQJO1YFmJKwlUX7mhHXmUXBlPkm5KZLM3Y="
+typstDeps = [
+    "shadowed_0_2_0",
+    "tidy_0_4_3",
+]
+description = "Tabler.io Icons v3.34.0 for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://codeberg.org/joelvonrotz/tableau-icons"
+
+[tableau-icons."0.334.0"]
+url = "https://packages.typst.org/preview/tableau-icons-0.334.0.tar.gz"
+hash = "sha256-UiTdLTQN9xIWaTYBwfOmJCStm5V16ey+PGfkAeHHr3A="
+typstDeps = [
+    "shadowed_0_2_0",
+    "tidy_0_4_2",
+]
+description = "Tabler.io Icons v3.34.0 for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://codeberg.org/joelvonrotz/tableau-icons"
+
 [tableau-icons."0.331.0"]
 url = "https://packages.typst.org/preview/tableau-icons-0.331.0.tar.gz"
 hash = "sha256-9ljNMcVEhP1eKUCdLITB4vFxRqDaT9KSptDGxjBOgXo="
@@ -19378,6 +23551,16 @@ license = [
 ]
 homepage = "https://github.com/joelvonrotz/tableau-icons"
 
+[tablem."0.3.0"]
+url = "https://packages.typst.org/preview/tablem-0.3.0.tar.gz"
+hash = "sha256-rAer99mHZDzgUqFI31j19JZglsLbAGWxCNG5UvVaiN8="
+typstDeps = []
+description = "Write markdown-like tables easily"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-tablem"
+
 [tablem."0.2.0"]
 url = "https://packages.typst.org/preview/tablem-0.2.0.tar.gz"
 hash = "sha256-xXsq6mh6lm2ZL8z9d9gQK+LYB8vHofHK+MfgcX5yWBY="
@@ -19633,6 +23816,44 @@ license = [
 ]
 homepage = "https://github.com/maxcrees/tbl.typ"
 
+[tblr."0.4.1"]
+url = "https://packages.typst.org/preview/tblr-0.4.1.tar.gz"
+hash = "sha256-W+ATn3TwrhVQIk/sEEijBwFiDHuM4qFo6qHUovYwu/Q="
+typstDeps = [
+    "rowmantic_0_4_0",
+    "zero_0_3_0",
+]
+description = "Table generation and alignment helpers inspired by LaTeX's Tabularray package"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tshort/tblr"
+
+[tblr."0.4.0"]
+url = "https://packages.typst.org/preview/tblr-0.4.0.tar.gz"
+hash = "sha256-dTUzcfJEAlauek+HnkG3Rv22G2PCOy5S8vfvRQvCNP4="
+typstDeps = [
+    "rowmantic_0_4_0",
+    "zero_0_3_0",
+]
+description = "Table generation and alignment helpers inspired by LaTeX's Tabularray package"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tshort/tblr"
+
+[tblr."0.3.2"]
+url = "https://packages.typst.org/preview/tblr-0.3.2.tar.gz"
+hash = "sha256-Jp0P3r7kovJ532O68oHxKaK+P6QAfEMaYbnWU6PUufo="
+typstDeps = [
+    "zero_0_3_0",
+]
+description = "Table generation and alignment helpers inspired by LaTeX's Tabularray package"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tshort/tblr"
+
 [tblr."0.3.1"]
 url = "https://packages.typst.org/preview/tblr-0.3.1.tar.gz"
 hash = "sha256-dIFBY7VHPz0n2LiyzTcUsCyEk0X1bDtxu/Dwitne1gk="
@@ -19711,6 +23932,18 @@ license = [
 ]
 homepage = "https://github.com/chillcicada/typst-dotenv"
 
+[tessera."0.1.0"]
+url = "https://packages.typst.org/preview/tessera-0.1.0.tar.gz"
+hash = "sha256-fiR/uD6HNyUeGGEdkQvJc9uufh9mdbt6IBdN/2kKRvA="
+typstDeps = [
+    "elembic_1_1_1",
+]
+description = "A package for combining multiple images into masonry or matrix layout"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/vanleefxp/tesselate_typ"
+
 [text-dirr."1.0.0"]
 url = "https://packages.typst.org/preview/text-dirr-1.0.0.tar.gz"
 hash = "sha256-qn4cfK9i1f8ClTsrA0CM5+KLsEPVCUqgDEVUIQm4iqk="
@@ -19773,6 +24006,23 @@ license = [
 ]
 homepage = "https://github.com/TGM-HIT/typst-protocol"
 
+[tgm-hit-thesis."0.4.0"]
+url = "https://packages.typst.org/preview/tgm-hit-thesis-0.4.0.tar.gz"
+hash = "sha256-1oDjbsmMnO2UI2H9XdHeeuIB0nYFDYdSG+ZkWNUoFRw="
+typstDeps = [
+    "alexandria_0_2_1",
+    "codly_1_3_0",
+    "datify_0_1_4",
+    "glossarium_0_5_9",
+    "hydra_0_6_2",
+    "linguify_0_4_2",
+]
+description = "Diploma thesis template for students of the HIT department at TGM Wien"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/TGM-HIT/typst-diploma-thesis"
+
 [tgm-hit-thesis."0.3.1"]
 url = "https://packages.typst.org/preview/tgm-hit-thesis-0.3.1.tar.gz"
 hash = "sha256-9lHo3QhUG7AnjwhRBf+NLBJb9PmHvzsh9XOCgCo49TM="
@@ -19896,6 +24146,18 @@ license = [
 ]
 homepage = "https://github.com/nleanba/typst-theoretic"
 
+[theorion."0.4.0"]
+url = "https://packages.typst.org/preview/theorion-0.4.0.tar.gz"
+hash = "sha256-jRF5VEUHq9OHi9t5UtnOtvzlpPr/zcIVnxqIdSeh4Og="
+typstDeps = [
+    "showybox_2_0_4",
+]
+description = "Out-of-the-box, customizable and multilingual theorem environment package"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/OrangeX4/typst-theorion"
+
 [theorion."0.3.3"]
 url = "https://packages.typst.org/preview/theorion-0.3.3.tar.gz"
 hash = "sha256-JXD+gEwf78Cnt0RkRWvtKjdt1nMGU2/OVxRg6pDXNQc="
@@ -20032,6 +24294,16 @@ license = [
 ]
 homepage = "https://github.com/tfachada/thesist"
 
+[thmbox."0.3.0"]
+url = "https://packages.typst.org/preview/thmbox-0.3.0.tar.gz"
+hash = "sha256-aW9tioGuSpnGNSFhSm/Svc/j4ChFhQ+AnLWajgFnjIA="
+typstDeps = []
+description = "Creating beautiful theorem environments in typst with ease"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/s15n/typst-thmbox"
+
 [thmbox."0.2.0"]
 url = "https://packages.typst.org/preview/thmbox-0.2.0.tar.gz"
 hash = "sha256-2k4K8b5E1jkEm7lhCb9UeADUBqK3jZxTougU2SD2KQ0="
@@ -20102,6 +24374,15 @@ license = [
 ]
 homepage = "https://github.com/Enter-tainer/zint-wasi"
 
+[tidbit-uoc."0.1.0"]
+url = "https://packages.typst.org/preview/tidbit-uoc-0.1.0.tar.gz"
+hash = "sha256-ak5zPsWhBxQFo+MluIzcem72GvuW6FqS/byVAPpg+tw="
+typstDeps = []
+description = "Academic reports at the UOC with APA styling"
+license = [
+    "MIT",
+]
+
 [tidy."0.4.3"]
 url = "https://packages.typst.org/preview/tidy-0.4.3.tar.gz"
 hash = "sha256-3F4nBSvietpAevp+EgZIFoLfv4GRMLjSyGD+7RCYjjg="
@@ -20170,6 +24451,28 @@ license = [
     "MIT",
 ]
 
+[tiefletter."0.1.3"]
+url = "https://packages.typst.org/preview/tiefletter-0.1.3.tar.gz"
+hash = "sha256-BZER3U5LIYvGdlk63Gi0Pylx2xhs9cTK29YXjm7HJ2Y="
+typstDeps = [
+    "tiaoma_0_3_0",
+]
+description = "Invoice and offer template for Austrian freelancers"
+license = [
+    "MIT",
+]
+
+[tiefletter."0.1.2"]
+url = "https://packages.typst.org/preview/tiefletter-0.1.2.tar.gz"
+hash = "sha256-qX7SXHWZTlSAxHIa/03RDejAK/puIPf7ZRIAj8oNE4I="
+typstDeps = [
+    "tiaoma_0_3_0",
+]
+description = "Invoice and offer template for Austrian freelancers"
+license = [
+    "MIT",
+]
+
 [tiefletter."0.1.1"]
 url = "https://packages.typst.org/preview/tiefletter-0.1.1.tar.gz"
 hash = "sha256-536tEljAru3xi7OaK53ehX3WeK5cdHyQkuwfQEeD580="
@@ -20192,6 +24495,33 @@ license = [
     "MIT",
 ]
 
+[tieflied."0.2.0"]
+url = "https://packages.typst.org/preview/tieflied-0.2.0.tar.gz"
+hash = "sha256-u7FwEuClg+OW82StKG0Q4JM2IY9L/JrGuPR71mPJquU="
+typstDeps = []
+description = "Song book template (Liederbuch"
+license = [
+    "MIT",
+]
+
+[tieflied."0.1.1"]
+url = "https://packages.typst.org/preview/tieflied-0.1.1.tar.gz"
+hash = "sha256-+lqJuaewHr45Y83wRZ6/gzB93PzjEwyfs8JH4fqo/eA="
+typstDeps = []
+description = "Song book template (Liederbuch"
+license = [
+    "MIT",
+]
+
+[tieflied."0.1.0"]
+url = "https://packages.typst.org/preview/tieflied-0.1.0.tar.gz"
+hash = "sha256-sLP7vBYIu3wswGhFIvcLkhD9NWL8n5tI/PszvV/RNxE="
+typstDeps = []
+description = "Song book (Liederbuch"
+license = [
+    "MIT",
+]
+
 [tierpist."0.1.0"]
 url = "https://packages.typst.org/preview/tierpist-0.1.0.tar.gz"
 hash = "sha256-p9EUIa5z1f22OlPbJtdUojsnE3Kb2BDAwivkh3himQg="
@@ -20204,6 +24534,19 @@ license = [
 ]
 homepage = "https://github.com/bastienvoirin/tierpist"
 
+[timeliney."0.4.0"]
+url = "https://packages.typst.org/preview/timeliney-0.4.0.tar.gz"
+hash = "sha256-atAcyhjup40j1YQgVE80wk3FNbTS5oxovEDz56yb+pQ="
+typstDeps = [
+    "cetz_0_4_1",
+    "mantys_0_1_4",
+]
+description = "Create Gantt charts in Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/pta2002/typst-timeliney"
+
 [timeliney."0.3.0"]
 url = "https://packages.typst.org/preview/timeliney-0.3.0.tar.gz"
 hash = "sha256-k5psWk1IImnwZlg3s/6JH9hZLPlBesq5TAt8bKVnBmw="
@@ -20338,6 +24681,15 @@ license = [
 ]
 homepage = "https://gitlab.com/SolidTux/titleize"
 
+[tlacuache-thesis-fc-unam."0.1.2"]
+url = "https://packages.typst.org/preview/tlacuache-thesis-fc-unam-0.1.2.tar.gz"
+hash = "sha256-/ykgKoHTmgAT1jSsaBV9ewCHfnxQwz5aBN/tMiZn2qM="
+typstDeps = []
+description = "Template para escribir una tesis para la facultad de ciencias"
+license = [
+    "MIT",
+]
+
 [tlacuache-thesis-fc-unam."0.1.1"]
 url = "https://packages.typst.org/preview/tlacuache-thesis-fc-unam-0.1.1.tar.gz"
 hash = "sha256-skc0agrYuWNsDTToeI/SM8u+37NVfvySkoY6D58QZ4w="
@@ -20347,6 +24699,48 @@ license = [
     "MIT",
 ]
 
+[tntt."0.3.4"]
+url = "https://packages.typst.org/preview/tntt-0.3.4.tar.gz"
+hash = "sha256-TZwGr69ghMVQXIebK6Uf5ahe0i6xg7MEoNMBUZcFW+s="
+typstDeps = [
+    "cuti_0_3_0",
+    "i-figured_0_2_4",
+    "lovelace_0_3_0",
+]
+description = "Tntt is Not a Tex Thesis Template for Tsinghua university"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/chillcicada/tntt"
+
+[tntt."0.3.3"]
+url = "https://packages.typst.org/preview/tntt-0.3.3.tar.gz"
+hash = "sha256-AQeb++fU24YbX3Kb5B2RtfLBX6utR7FhP3f1Ku3sNKE="
+typstDeps = [
+    "cuti_0_3_0",
+    "i-figured_0_2_4",
+    "lovelace_0_3_0",
+]
+description = "Tntt is Not a Tex Thesis Template for Tsinghua university"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/chillcicada/tntt"
+
+[tntt."0.3.2"]
+url = "https://packages.typst.org/preview/tntt-0.3.2.tar.gz"
+hash = "sha256-SHg1t53CtwGpmMfu/Hd7gK/E1EdWfz2oOD6Uk6qqIW4="
+typstDeps = [
+    "cuti_0_3_0",
+    "i-figured_0_2_4",
+    "lovelace_0_3_0",
+]
+description = "Tntt is Not a Tex Thesis Template for Tsinghua university"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/chillcicada/tntt"
+
 [tntt."0.3.1"]
 url = "https://packages.typst.org/preview/tntt-0.3.1.tar.gz"
 hash = "sha256-nw8c2BeoQe0/oeVvB9F9kINqOJiLllWUZSpOPa1GKYs="
@@ -20401,6 +24795,36 @@ license = [
 ]
 homepage = "https://github.com/chillcicada/tntt"
 
+[tonguetoquill-usaf-memo."0.1.0"]
+url = "https://packages.typst.org/preview/tonguetoquill-usaf-memo-0.1.0.tar.gz"
+hash = "sha256-ZUQ6RZfSbFDzDIP9JJ+uL0/t9GhKOKGzCOGA9HAqBDA="
+typstDeps = []
+description = "Typeset memos that are fully compliant with AFH 33-337 'The Tongue and Quill"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SnpM/tonguetoquill-usaf-memo"
+
+[tonguetoquill-usaf-memo."0.0.2"]
+url = "https://packages.typst.org/preview/tonguetoquill-usaf-memo-0.0.2.tar.gz"
+hash = "sha256-CicYLmS4DxFJ4dsrbq7xgx78tbsf88Gyy2QdTuP8Cbo="
+typstDeps = []
+description = "Typeset memos that are fully compliant with AFH 33-337 'The Tongue and Quill"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SnpM/tonguetoquill-usaf-memo"
+
+[tonguetoquill-usaf-memo."0.0.1"]
+url = "https://packages.typst.org/preview/tonguetoquill-usaf-memo-0.0.1.tar.gz"
+hash = "sha256-f3mD3aPQok9fgSu/lOOG7DHrQxgxjzQb2q9ySLFIJuE="
+typstDeps = []
+description = "Typeset memos that are fully compliant with AFH 33-337 'The Tongue and Quill"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/SnpM/tonguetoquill-usaf-memo"
+
 [touying."0.6.1"]
 url = "https://packages.typst.org/preview/touying-0.6.1.tar.gz"
 hash = "sha256-AutRIIoJa75hrDTQVyoVAxajm1nmkypFLwYkmAyp39A="
@@ -20989,6 +25413,19 @@ license = [
 ]
 homepage = "https://github.com/Quaternijkon/Typst_USTC_CS"
 
+[touying-quarto-clean."0.1.2"]
+url = "https://packages.typst.org/preview/touying-quarto-clean-0.1.2.tar.gz"
+hash = "sha256-VjH0PkaGedpLOnrCo9Qofv3hE2bEXrTNliSpztMkibI="
+typstDeps = [
+    "fontawesome_0_5_0",
+    "touying_0_6_1",
+]
+description = "A Clean Slide Theme for Touying"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/kazuyanagimoto/quarto-clean-typst"
+
 [touying-quarto-clean."0.1.1"]
 url = "https://packages.typst.org/preview/touying-quarto-clean-0.1.1.tar.gz"
 hash = "sha256-9zYawo4SimWNIrJCKUe27CHJq3er23/YEJa4iTGesrw="
@@ -21015,6 +25452,22 @@ license = [
 ]
 homepage = "https://github.com/kazuyanagimoto/quarto-clean-typst"
 
+[touying-quick."0.2.1"]
+url = "https://packages.typst.org/preview/touying-quick-0.2.1.tar.gz"
+hash = "sha256-hNiiAXKpfd5JX4MKN9rf7HxA5MKUfqTQ5z2opV7w+VA="
+typstDeps = [
+    "codly_1_3_0",
+    "codly-languages_0_1_8",
+    "physica_0_9_5",
+    "theorion_0_3_3",
+    "touying_0_6_1",
+]
+description = "A quick-start template based on touying for academic reports"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/ivaquero/touying-quick.git"
+
 [touying-quick."0.2.0"]
 url = "https://packages.typst.org/preview/touying-quick-0.2.0.tar.gz"
 hash = "sha256-KJ4P2LudaxyIs9uCqAbMK6+Cn9OwLr0d1NqXBM+Y7RA="
@@ -21084,6 +25537,20 @@ license = [
 ]
 homepage = "https://github.com/maxchang3/touying-simpl-cau"
 
+[touying-simpl-hkustgz."0.1.2"]
+url = "https://packages.typst.org/preview/touying-simpl-hkustgz-0.1.2.tar.gz"
+hash = "sha256-KAfxpNi8hLwlscFZvc2yFSdeagvmNFquuQHxit3NWwk="
+typstDeps = [
+    "cetz_0_3_3",
+    "fletcher_0_5_5",
+    "touying_0_6_1",
+]
+description = "Touying Slide Theme for HKUST(GZ"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/exAClior/touying-simpl-hkustgz"
+
 [touying-simpl-hkustgz."0.1.1"]
 url = "https://packages.typst.org/preview/touying-simpl-hkustgz-0.1.1.tar.gz"
 hash = "sha256-hPzAv/zrLYdniHhKcXhiw4NqivEzu/MH0NO7utaIv/Q="
@@ -21112,6 +25579,30 @@ license = [
 ]
 homepage = "https://github.com/exAClior/touying-simpl-hkustgz"
 
+[touying-simpl-sjtu."0.1.0"]
+url = "https://packages.typst.org/preview/touying-simpl-sjtu-0.1.0.tar.gz"
+hash = "sha256-cMHpV1gcDaxYeNXuvNmuMSCDKTbNMwPNPCdNxAsLC9A="
+typstDeps = [
+    "touying_0_6_1",
+]
+description = "上海交通大学 Touying 幻灯片主题 (Touying Slide Theme for SJTU"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/tzhTaylor/touying-sjtu"
+
+[touying-unistra-pristine."1.4.2"]
+url = "https://packages.typst.org/preview/touying-unistra-pristine-1.4.2.tar.gz"
+hash = "sha256-EudAdb0VLoAgUUJX5Hwyfd/9xE3RG7NjSeqF2d+VRTg="
+typstDeps = [
+    "touying_0_6_1",
+]
+description = "Touying theme adhering to the core principles of the style guide of the University of Strasbourg, France"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/spidersouris/touying-unistra-pristine"
+
 [touying-unistra-pristine."1.4.1"]
 url = "https://packages.typst.org/preview/touying-unistra-pristine-1.4.1.tar.gz"
 hash = "sha256-4X1Wh/8oPbTfMtjmjo3ACJXsltkh2Jnlib5JTGJpMGU="
@@ -21206,6 +25697,16 @@ license = [
 ]
 homepage = "https://github.com/yangwenbo99/touying2video"
 
+[toy-cv."0.1.0"]
+url = "https://packages.typst.org/preview/toy-cv-0.1.0.tar.gz"
+hash = "sha256-nU26DfZ3HvwhF0S6RBykDgQjaHGU2E0bi8zHFP1nkUw="
+typstDeps = []
+description = "✨ Colorful and elegant 2-column CV and cover letter template. Simple to use and adapt to your needs"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/ToyHugs/toy-cv"
+
 [tracl."0.6.1"]
 url = "https://packages.typst.org/preview/tracl-0.6.1.tar.gz"
 hash = "sha256-YdVxUtfyTrXQxgMuMm1Vju/Oi4cCaf/xAPy/n7rOrYk="
@@ -21268,6 +25769,36 @@ license = [
 ]
 homepage = "https://github.com/coli-saar/tracl"
 
+[transl."0.1.1"]
+url = "https://packages.typst.org/preview/transl-0.1.1.tar.gz"
+hash = "sha256-J2fZLflEpddplzgUsOxPyYuYHr+R7VetwkVJT7QXTiw="
+typstDeps = []
+description = "Easy and simple translations for words and expressions, with support for localization"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/transl"
+
+[transl."0.1.0"]
+url = "https://packages.typst.org/preview/transl-0.1.0.tar.gz"
+hash = "sha256-ZTNCsWelFOHHPVLgNNKLI5g8o2scG34mkm1QEw3iWSw="
+typstDeps = []
+description = "Easy and simple translations for words and expressions, with support for localization"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/mayconfmelo/transl"
+
+[treet."1.0.0"]
+url = "https://packages.typst.org/preview/treet-1.0.0.tar.gz"
+hash = "sha256-D2pntfQqe2yN1i+FNmz1iy5WmWanHcMF5UrIh8MiChA="
+typstDeps = []
+description = "Create tree lists easily"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/8LWXpg/typst-treet"
+
 [treet."0.1.1"]
 url = "https://packages.typst.org/preview/treet-0.1.1.tar.gz"
 hash = "sha256-tBOgW6NB5MAU+LHRAOHkRxq+vKpmkkh2vh/VnBbMEJ0="
@@ -21702,6 +26233,37 @@ license = [
     "Unlicense",
 ]
 
+[twig."0.1.0"]
+url = "https://packages.typst.org/preview/twig-0.1.0.tar.gz"
+hash = "sha256-H/N3bFJq0GdMFYtdBrF7ku4898SGqZMDdUxgP3w4qtc="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "Creates trees from lists using Cetz"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://github.com/QuantumRange/twig"
+
+[tyipa."0.1.0"]
+url = "https://packages.typst.org/preview/tyipa-0.1.0.tar.gz"
+hash = "sha256-DYIL0JnmjvxNTFj5XFHYuWPrbcbp+R8vSSE6cx4gVtw="
+typstDeps = []
+description = "Write phonetic transcriptions using the IPA"
+license = [
+    "MIT",
+]
+
+[tyniverse."0.2.3"]
+url = "https://packages.typst.org/preview/tyniverse-0.2.3.tar.gz"
+hash = "sha256-bOYQNeJ5XgAMdt3EwJsb3QRwrjyHnYhXmhz1gfT/fiE="
+typstDeps = []
+description = "A collection of templates for homeworks, cheatpapers and more"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Fr4nk1inCs/tyniverse"
+
 [typ2anki."0.1.0"]
 url = "https://packages.typst.org/preview/typ2anki-0.1.0.tar.gz"
 hash = "sha256-J/BOFlowljl2P7FQVklS0YXlI0bf9XzWYZ/NwIZp1m8="
@@ -21814,6 +26376,16 @@ license = [
 ]
 homepage = "https://github.com/remigerme/typst-polytechnique"
 
+[typographix-polytechnique-slides."0.1.0"]
+url = "https://packages.typst.org/preview/typographix-polytechnique-slides-0.1.0.tar.gz"
+hash = "sha256-WTLeE7ShtnExt5X54pP04rvn6AHWwpoYJTm3b5HP92Q="
+typstDeps = []
+description = "A presentation slide template for Polytechnique students (from TypographiX"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/remigerme/typst-polytechnique"
+
 [typpuccino."0.1.0"]
 url = "https://packages.typst.org/preview/typpuccino-0.1.0.tar.gz"
 hash = "sha256-UgXOQCLOv27dB78K7m271A7HZkDyWi+LoR3uqxrEnH4="
@@ -21834,6 +26406,18 @@ license = [
 ]
 homepage = "https://github.com/Glomzzz/typsite"
 
+[typsium."0.3.0"]
+url = "https://packages.typst.org/preview/typsium-0.3.0.tar.gz"
+hash = "sha256-xIjBM7z34QJ8iTbc5LldXBkyee4r/Nie1hHy7A50b4s="
+typstDeps = [
+    "elembic_1_1_0",
+]
+description = "Typeset chemical formulas and reactions"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Typsium/typsium"
+
 [typsium."0.2.0"]
 url = "https://packages.typst.org/preview/typsium-0.2.0.tar.gz"
 hash = "sha256-6regfP95XRjL1cRahkIjTR0FM+z0bfaVAJFtOkN4oz8="
@@ -22003,6 +26587,43 @@ license = [
 ]
 homepage = "https://github.com/ShapeLayer/ucpc-solutions__typst"
 
+[ucph-nielsine-touying."0.1.1"]
+url = "https://packages.typst.org/preview/ucph-nielsine-touying-0.1.1.tar.gz"
+hash = "sha256-WkQME/KmiF9QlBoKmJWX/NEys+sM583sPEoP7qsYYRQ="
+typstDeps = [
+    "theorion_0_3_3",
+    "touying_0_6_1",
+]
+description = "Slide template built on Touying for the University of Copenhagen"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jorgenhost/ucph-nielsine-touying"
+
+[ucph-nielsine-touying."0.1.0"]
+url = "https://packages.typst.org/preview/ucph-nielsine-touying-0.1.0.tar.gz"
+hash = "sha256-7YE6KZQjAIaV42cJpAyU5DYRlKLzhtlO/Vb7rnF2xFk="
+typstDeps = [
+    "touying_0_6_1",
+]
+description = "Slide template built on Touying for the University of Copenhagen"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/jorgenhost/ucph-nielsine-touying"
+
+[umbra."0.1.1"]
+url = "https://packages.typst.org/preview/umbra-0.1.1.tar.gz"
+hash = "sha256-jWwsmOcVIPdlYkTHHCkViz4NqPM8KjqfHnQUQZxgiPQ="
+typstDeps = [
+    "suiji_0_3_0",
+]
+description = "Basic shadows for Typst"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/davystrong/umbra"
+
 [umbra."0.1.0"]
 url = "https://packages.typst.org/preview/umbra-0.1.0.tar.gz"
 hash = "sha256-DabsDQMs5r76fU9Jil2bgwDunZdcYJaYRNcbEQLrel0="
@@ -22578,6 +27199,16 @@ license = [
 ]
 homepage = "https://github.com/pdcxs/unofficial-tyut-thesis"
 
+[unofficial-ukim-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/unofficial-ukim-thesis-0.1.0.tar.gz"
+hash = "sha256-D8YIx6C3FfZ87rfuJXXNbyYxNnQ3w82GDllLmCkNu8Q="
+typstDeps = []
+description = "Unofficial thesis style for the University of St. Cyril and Methodius in Skopje"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/nikkelo/unofficial-ukim-thesis"
+
 [untypsignia."0.1.1"]
 url = "https://packages.typst.org/preview/untypsignia-0.1.1.tar.gz"
 hash = "sha256-skdLt8VjBpWG4eWHArBgPnAxOPcknFrYHCNw7aeiBOE="
@@ -22741,6 +27372,26 @@ license = [
 ]
 homepage = "https://github.com/bpkleer/typst-academicons"
 
+[use-tabler-icons."0.15.0"]
+url = "https://packages.typst.org/preview/use-tabler-icons-0.15.0.tar.gz"
+hash = "sha256-NsBCnHiP99sxUp3jufF+QyhMeYxHwXsPzPXCmnntIg0="
+typstDeps = []
+description = "Tabler Icons for Typst using webfont"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/zyf722/typst-tabler-icons"
+
+[use-tabler-icons."0.14.0"]
+url = "https://packages.typst.org/preview/use-tabler-icons-0.14.0.tar.gz"
+hash = "sha256-/wwxXUBVsJBiww5DfhbAUXd6dgfcGr4Wg/zMnICb1LA="
+typstDeps = []
+description = "Tabler Icons for Typst using webfont"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/zyf722/typst-tabler-icons"
+
 [use-tabler-icons."0.13.0"]
 url = "https://packages.typst.org/preview/use-tabler-icons-0.13.0.tar.gz"
 hash = "sha256-gVqEG2sGy2vJb8Vc45PTN2W6vfT/rVRvekrXtWxG+98="
@@ -23007,6 +27658,30 @@ license = [
 ]
 homepage = "https://github.com/sardorml/vantage-typst"
 
+[vartable."0.2.2"]
+url = "https://packages.typst.org/preview/vartable-0.2.2.tar.gz"
+hash = "sha256-suByQvM/FxOSZv50ww7+NOviuxXsqLEatJeWqrv3xcY="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "A simple package to make variation table"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Le-foucheur/Typst-VarTable"
+
+[vartable."0.2.1"]
+url = "https://packages.typst.org/preview/vartable-0.2.1.tar.gz"
+hash = "sha256-WU1N5jsAdyn0224Cs46c7klAdlcYr7mc7omILuTn668="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "A simple package to make variation table"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Le-foucheur/Typst-VarTable"
+
 [vartable."0.2.0"]
 url = "https://packages.typst.org/preview/vartable-0.2.0.tar.gz"
 hash = "sha256-nPJw1lKOeCWb03tm4l5MBn8Se7nW8PGt4ELD/9wB+iE="
@@ -23097,6 +27772,26 @@ license = [
 ]
 homepage = "https://github.com/elegaanz/vercanard"
 
+[versatile-apa."7.1.4"]
+url = "https://packages.typst.org/preview/versatile-apa-7.1.4.tar.gz"
+hash = "sha256-Je3xSXgoaRqALJa+9n7nO5sszNnzI2scohZTQEWY4kE="
+typstDeps = []
+description = "Comprehensive APA 7th Edition Style Template for Typst, suitable for both student and professional papers"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/jassielof/typst-templates"
+
+[versatile-apa."7.1.3"]
+url = "https://packages.typst.org/preview/versatile-apa-7.1.3.tar.gz"
+hash = "sha256-o7FPeu6sfuUV3k+ZW+JiSZnz3DxOuxKUebSz7kZhF9I="
+typstDeps = []
+description = "Comprehensive APA 7th Edition Style Template for Typst, suitable for both student and professional papers"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/jassielof/typst-templates"
+
 [versatile-apa."7.1.2"]
 url = "https://packages.typst.org/preview/versatile-apa-7.1.2.tar.gz"
 hash = "sha256-g0w9jFsBSyeCjVWGp4/Tu++4VQ5KqRWZt6v8zpDh5k8="
@@ -23256,6 +27951,55 @@ license = [
 ]
 homepage = "https://github.com/ShinoYumi/typst-vlna/"
 
+[volt-internship-ensea."0.1.2"]
+url = "https://packages.typst.org/preview/volt-internship-ensea-0.1.2.tar.gz"
+hash = "sha256-+i0DVS/3DG4ds6sutcMcO6IPiHgwfh2kMKaVns+irfE="
+typstDeps = [
+    "glossy_0_8_0",
+    "hydra_0_6_2",
+]
+description = "Unofficial template for internship reports at ENSEA, a French engineering school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Dawod-G/ENSEA_Typst-Template"
+
+[volt-internship-ensea."0.1.1"]
+url = "https://packages.typst.org/preview/volt-internship-ensea-0.1.1.tar.gz"
+hash = "sha256-hGd+Ta6yhLBkVtLvqefBGrj58uHvL0fKkxRah0WoO8s="
+typstDeps = [
+    "glossy_0_8_0",
+    "hydra_0_6_2",
+]
+description = "Unofficial template for internship reports at ENSEA, a French engineering school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Dawod-G/ENSEA_Typst-Template"
+
+[volt-internship-ensea."0.1.0"]
+url = "https://packages.typst.org/preview/volt-internship-ensea-0.1.0.tar.gz"
+hash = "sha256-dNTpyGRy4H7HET1K7dM4d6BX7FyWMOAuBhump5PwlmA="
+typstDeps = [
+    "glossy_0_8_0",
+    "hydra_0_6_2",
+]
+description = "Unofficial Typst template for internship reports at ENSEA, a French engineering school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Dawod-G/ENSEA_Typst-Template"
+
+[volt-lab-ensea."0.1.0"]
+url = "https://packages.typst.org/preview/volt-lab-ensea-0.1.0.tar.gz"
+hash = "sha256-WlKSxCRZJwuUoC6M9PJdJeNaWKYCy7lrqcEdh2YksBg="
+typstDeps = []
+description = "Unofficial Typst template for lab reports at ENSEA, a French engineering school"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Dawod-G/ENSEA_Typst-Template"
+
 [vonsim."0.2.0"]
 url = "https://packages.typst.org/preview/vonsim-0.2.0.tar.gz"
 hash = "sha256-c/0A2Z8JkEbmQulQ5PkBMVfM8pzWHbhauyOMkZ9iPnc="
@@ -23330,6 +28074,19 @@ license = [
     "MIT",
 ]
 
+[wenyuan-campaign."0.1.2"]
+url = "https://packages.typst.org/preview/wenyuan-campaign-0.1.2.tar.gz"
+hash = "sha256-8cEG8eSoCFZYH/UqBYAcvz4dWCr1t1cpz8Bw6WiGPy4="
+typstDeps = [
+    "droplet_0_3_1",
+    "tidy_0_4_3",
+]
+description = "Easily write DnD 5e style campaign documents"
+license = [
+    "Apache-2.0",
+]
+homepage = "https://github.com/yanwenywan/typst-packages/tree/master/wenyuan-campaign"
+
 [wenyuan-campaign."0.1.1"]
 url = "https://packages.typst.org/preview/wenyuan-campaign-0.1.1.tar.gz"
 hash = "sha256-Hcf+rRsW5rw6giD5SjdkjLs0Gyl4ejA2CBd1xsNRfBA="
@@ -23411,6 +28168,16 @@ license = [
 ]
 homepage = "https://github.com/ZaninDavide/wicked"
 
+[wonderous-book."0.1.2"]
+url = "https://packages.typst.org/preview/wonderous-book-0.1.2.tar.gz"
+hash = "sha256-05BbnYMtnaHePyE72ZUr5GUWKdm8rnRdgD7PnDAwdUs="
+typstDeps = []
+description = "A fiction book template with running headers and serif typography"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/typst/templates"
+
 [wonderous-book."0.1.1"]
 url = "https://packages.typst.org/preview/wonderous-book-0.1.1.tar.gz"
 hash = "sha256-r4JxV3GBOJjX+7kYZUCeB/MlBGiKGu1Mqo5V0gb359c="
@@ -23431,6 +28198,18 @@ license = [
 ]
 homepage = "https://github.com/typst/templates"
 
+[wordometer."0.1.5"]
+url = "https://packages.typst.org/preview/wordometer-0.1.5.tar.gz"
+hash = "sha256-8641l2B26RMq4aNzNnFHjJeTzqH0JD/utjOHnn81RS8="
+typstDeps = [
+    "tidy_0_4_3",
+]
+description = "Word counts and document statistics"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Jollywatt/typst-wordometer"
+
 [wordometer."0.1.4"]
 url = "https://packages.typst.org/preview/wordometer-0.1.4.tar.gz"
 hash = "sha256-H3h8Dq2SZrRWwOGJkfYq/d4cz1hyZ3iQoExGZ1OyBok="
@@ -23521,6 +28300,42 @@ license = [
 ]
 homepage = "https://github.com/ntjess/wrap-it"
 
+[wut-thesis."0.1.1"]
+url = "https://packages.typst.org/preview/wut-thesis-0.1.1.tar.gz"
+hash = "sha256-cAIU5KyyPqwwjITWBx0hgMl/dzPXpYU+nC/N01hJ4MU="
+typstDeps = [
+    "cheq_0_2_2",
+    "drafting_0_2_2",
+    "glossarium_0_5_8",
+    "hydra_0_6_1",
+    "linguify_0_4_2",
+    "lovelace_0_3_0",
+    "wrap-it_0_1_1",
+]
+description = "Official thesis template for the Warsaw University of Technology"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/fuine/wut-thesis-typst"
+
+[wut-thesis."0.1.0"]
+url = "https://packages.typst.org/preview/wut-thesis-0.1.0.tar.gz"
+hash = "sha256-1Oc3LTtrWq6tZRhtjHNDz2jtrRq45vM8mqdu6I4mJ2Q="
+typstDeps = [
+    "cheq_0_2_2",
+    "drafting_0_2_2",
+    "glossarium_0_5_7",
+    "hydra_0_6_1",
+    "linguify_0_4_2",
+    "lovelace_0_3_0",
+    "wrap-it_0_1_1",
+]
+description = "Official thesis template for the Warsaw University of Technology"
+license = [
+    "MIT-0",
+]
+homepage = "https://github.com/fuine/wut-thesis-typst"
+
 [xarrow."0.3.1"]
 url = "https://packages.typst.org/preview/xarrow-0.3.1.tar.gz"
 hash = "sha256-5DdscbcplvUldzNiGpVCbutM23uVmm+zniXHM3ayN+E="
@@ -23571,6 +28386,16 @@ license = [
 ]
 homepage = "https://codeberg.org/loutr/typst-xarrow/"
 
+[xyznote."0.4.0"]
+url = "https://packages.typst.org/preview/xyznote-0.4.0.tar.gz"
+hash = "sha256-XTTZF60IxFdXkd3O9qMvR01PkNjgqLmRPVfYJNIP2ZY="
+typstDeps = []
+description = "Simple and Functional Typst Note Template"
+license = [
+    "GPL-3.0-only",
+]
+homepage = "https://github.com/wardenxyz/xyznote"
+
 [xyznote."0.3.0"]
 url = "https://packages.typst.org/preview/xyznote-0.3.0.tar.gz"
 hash = "sha256-L0nzab7cGaw7/ZPUgWorAah/tBnitnAREpsZA4VB65w="
@@ -23642,6 +28467,16 @@ license = [
 ]
 homepage = "https://github.com/0warning0error/typst-yats"
 
+[yi."0.1.0"]
+url = "https://packages.typst.org/preview/yi-0.1.0.tar.gz"
+hash = "sha256-aqMg2N5/v9EUnJPxnKmeop33n3F57r99ARWSwgADStk="
+typstDeps = []
+description = "简单、快速地绘制卦象图 Draw Gua easily"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/JWangL5/Yi-typst"
+
 [yinsh-record."1.0.0"]
 url = "https://packages.typst.org/preview/yinsh-record-1.0.0.tar.gz"
 hash = "sha256-yQIzG8lsIla11JRKuP5hwnM4KET3hX553UraaUWLuYI="
@@ -23665,6 +28500,42 @@ license = [
 ]
 homepage = "https://github.com/visika/yuan-resume"
 
+[zap."0.4.0"]
+url = "https://packages.typst.org/preview/zap-0.4.0.tar.gz"
+hash = "sha256-UX6zBUjNEGrH+fDwRfYV8ROTpoQz06TJpPILelCD/eU="
+typstDeps = [
+    "cetz_0_4_2",
+]
+description = "A package to draw amazing electronic circuits using CeTZ superpowers"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/l0uisgrange/zap"
+
+[zap."0.3.0"]
+url = "https://packages.typst.org/preview/zap-0.3.0.tar.gz"
+hash = "sha256-OesUnBYIIIPVL/08IE4ekhfOQAdrmCW6MTuaZCdXJPU="
+typstDeps = [
+    "cetz_0_4_1",
+]
+description = "A package to draw amazing electronic circuits using CeTZ superpowers"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/l0uisgrange/zap"
+
+[zap."0.2.1"]
+url = "https://packages.typst.org/preview/zap-0.2.1.tar.gz"
+hash = "sha256-Iq8JjxAlzrIitSfobcijxRQNYBORRI5v0cF8Aob42Pk="
+typstDeps = [
+    "cetz_0_4_0",
+]
+description = "A package to draw amazing electronic circuits using CeTZ superpowers"
+license = [
+    "LGPL-3.0-or-later",
+]
+homepage = "https://github.com/l0uisgrange/zap"
+
 [zap."0.2.0"]
 url = "https://packages.typst.org/preview/zap-0.2.0.tar.gz"
 hash = "sha256-JpQv3gBoSOjYSfIi8eeCDllRCJIC7hFALoJvxUBs1QE="
@@ -23895,6 +28766,26 @@ license = [
 ]
 homepage = "https://github.com/tomeichlersmith/zen-zine"
 
+[zero."0.5.0"]
+url = "https://packages.typst.org/preview/zero-0.5.0.tar.gz"
+hash = "sha256-mvS4ZMl0XdpL9W0gn5C2iQhTQSjBDmiYzwTI36wBeIM="
+typstDeps = []
+description = "Advanced scientific number formatting"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Mc-Zen/zero"
+
+[zero."0.4.0"]
+url = "https://packages.typst.org/preview/zero-0.4.0.tar.gz"
+hash = "sha256-1XXifJ71lNdvoK0VmDJE6kcEjekeArmeXaM+m6VIJE8="
+typstDeps = []
+description = "Advanced scientific number formatting"
+license = [
+    "MIT",
+]
+homepage = "https://github.com/Mc-Zen/zero"
+
 [zero."0.3.3"]
 url = "https://packages.typst.org/preview/zero-0.3.3.tar.gz"
 hash = "sha256-Th64GzjLyStvOax85IQXUpAuZxU3p3ZdAJDGsDzQEyg="
diff --git a/pkgs/by-name/ty/typstfmt/package.nix b/pkgs/by-name/ty/typstfmt/package.nix
deleted file mode 100644
index b3d393eb8022..000000000000
--- a/pkgs/by-name/ty/typstfmt/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "typstfmt";
-  version = "0.2.10";
-
-  src = fetchFromGitHub {
-    owner = "astrale-sharp";
-    repo = "typstfmt";
-    rev = version;
-    hash = "sha256-JsNaHeFYr92VdruE87dLj2kPGc9M+ww7AGiGO4Gbbr0=";
-  };
-
-  cargoHash = "sha256-sY2LLBsyRt7Zc84//WZWNq6e7Vx/TtPC/zoDF2Ug7yQ=";
-
-  meta = {
-    changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md";
-    description = "Formatter for the Typst language";
-    homepage = "https://github.com/astrale-sharp/typstfmt";
-    license = lib.licenses.mit;
-    mainProgram = "typstfmt";
-    maintainers = with lib.maintainers; [
-      figsoda
-      geri1701
-    ];
-  };
-}
diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 2115346fa317..4c132b3d4e6e 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.18";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "typstyle-rs";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sQZbk4XlhpFR4FUgD7Z0EoZVUMQaJQ2baTWbOp4I3QA=";
+    hash = "sha256-L6MmXipkpTfSvSzuUmE6/hUqDoLbe3+2/bHgFbTfLpo=";
   };
 
-  cargoHash = "sha256-anA7jJEK/Wr6trpc/6x2kExt8j9J3fxxgpWusQbbPaM=";
+  cargoHash = "sha256-xGGuZw87CjS/tA74SiIyMqM6PS0OJt00axiI3jyAAr0=";
 
   # Disabling tests requiring network access
   checkFlags = [
diff --git a/pkgs/by-name/ty/tyson/package.nix b/pkgs/by-name/ty/tyson/package.nix
index ddd04518a6b0..14a2bf2ed790 100644
--- a/pkgs/by-name/ty/tyson/package.nix
+++ b/pkgs/by-name/ty/tyson/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/jetify-com/tyson";
     changelog = "https://github.com/jetify-com/tyson/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/tz/tzf-rs/package.nix b/pkgs/by-name/tz/tzf-rs/package.nix
index 0bd8349f0a32..60f5c77c6ce1 100644
--- a/pkgs/by-name/tz/tzf-rs/package.nix
+++ b/pkgs/by-name/tz/tzf-rs/package.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tzf-rs";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "ringsaturn";
     repo = "tzf-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cYi8FsB1aR0h1HxqkdFlLwCLzRwVM9Ak1LtjHezCSe0=";
+    hash = "sha256-aYsrwfmM9g9zUpcHpNMEI7HpR0oMkcuSAFnmEGtdwq4=";
   };
 
-  cargoHash = "sha256-9bUQpEP+vc3xwWCicHpl+56OYz3huirSOA4yw1iaxaY=";
+  cargoHash = "sha256-VGfxnl4rnDvyr4GjdtTDC6yaQVLqG/2eBw21BkR2AZ8=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch b/pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch
new file mode 100644
index 000000000000..a27afae6f686
--- /dev/null
+++ b/pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch
@@ -0,0 +1,37 @@
+commit 111bb8d98b4ff1897c36ff23806c492e9a313457
+Author: Will Dillon <william@housedillon.com>
+Date:   Mon Aug 11 13:58:40 2025 -0700
+
+    Update CMAKE version
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea0dfa6..9f1bcb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ #
+ #top level cmake project for ubertooth lib + tools
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ project(ubertooth_all)
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules
+ 	CACHE STRING "CMake module path")
+diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
+index f728056..4336fb0 100644
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -1,2 +1,2 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ add_subdirectory(udev)
+diff --git a/misc/udev/CMakeLists.txt b/misc/udev/CMakeLists.txt
+index a7d4ed0..f7dcaf8 100644
+--- a/misc/udev/CMakeLists.txt
++++ b/misc/udev/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ 
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+     SET(SYSTEM_IS_LINUX TRUE)
diff --git a/pkgs/by-name/ub/ubertooth/package.nix b/pkgs/by-name/ub/ubertooth/package.nix
index 9663fa2812f9..294d772515b4 100644
--- a/pkgs/by-name/ub/ubertooth/package.nix
+++ b/pkgs/by-name/ub/ubertooth/package.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${src.name}/host";
 
+  patches = [
+    # https://github.com/greatscottgadgets/ubertooth/pull/546
+    ./fix-cmake4-build.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/ub/ubports-pdk/package.nix b/pkgs/by-name/ub/ubports-pdk/package.nix
index a22e26a14fe6..838d63264de8 100644
--- a/pkgs/by-name/ub/ubports-pdk/package.nix
+++ b/pkgs/by-name/ub/ubports-pdk/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ubports-pdk";
-  version = "0-unstable-2025-06-23";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "ubports";
     repo = "ubports-pdk";
-    rev = "f97daec1a96f9427b23e35c8cc12e7c21fe893fd";
-    hash = "sha256-s9GC5TiIQSn5JGRy3TU5COdbcW9cDZZ8eQpflSffyOw=";
+    rev = "10d9e3c09fedefd990c13f7202accef30e59e7ab";
+    hash = "sha256-Vb82029iDzHKLgAjUINJHYZRzTWKoJ5+XhcHm4z0k1Y=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ub/ubus/package.nix b/pkgs/by-name/ub/ubus/package.nix
index 5c28c5aab3a5..ae59682cff6f 100644
--- a/pkgs/by-name/ub/ubus/package.nix
+++ b/pkgs/by-name/ub/ubus/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation {
   pname = "ubus";
-  version = "unstable-2023-12-18";
+  version = "unstable-202-10-17";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/ubus.git";
-    rev = "65bb027054def3b94a977229fd6ad62ddd32345b";
-    hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ=";
+    rev = "60e04048a0e2f3e33651c19e62861b41be4c290f";
+    hash = "sha256-fjxO77z+do5gZ7nLwHbC14UnP9cmZ5eANNn4X6Sudn0=";
   };
 
   cmakeFlags = [ "-DBUILD_LUA=OFF" ];
diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix
index 284fcdc68cf4..fc43ddc832d4 100644
--- a/pkgs/by-name/uc/ucc/package.nix
+++ b/pkgs/by-name/uc/ucc/package.nix
@@ -15,7 +15,7 @@ inputs@{
   enableSse42 ? stdenv.hostPlatform.sse4_2Support,
 }:
 let
-  inherit (lib.attrsets) getLib;
+  inherit (lib.attrsets) getOutput;
   inherit (lib.lists) optionals;
   inherit (lib.strings) concatStringsSep;
 
@@ -88,8 +88,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   # referring to an array!
   env.LDFLAGS = toString (
     optionals enableCuda [
+      # Fake libcuda.so (the real one is deployed impurely)
+      "-L${getOutput "stubs" cuda_cudart}/lib/stubs"
       # Fake libnvidia-ml.so (the real one is deployed impurely)
-      "-L${getLib cuda_nvml_dev}/lib/stubs"
+      "-L${getOutput "stubs" cuda_nvml_dev}/lib/stubs"
     ]
   );
 
diff --git a/pkgs/by-name/uc/uci/package.nix b/pkgs/by-name/uc/uci/package.nix
index d6318106a3fe..1e7eaf22700b 100644
--- a/pkgs/by-name/uc/uci/package.nix
+++ b/pkgs/by-name/uc/uci/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation {
   pname = "uci";
-  version = "unstable-2023-08-10";
+  version = "unstable-2025-10-12";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/uci.git";
-    rev = "5781664d5087ccc4b5ab58505883231212dbedbc";
-    hash = "sha256-8MyFaZdAMh5oMPO/5QyNT+Or57eBL3mamJLblGGoF9g=";
+    rev = "57c1e8cd2c051d755ca861a9ab38a8049d2e3f95";
+    hash = "sha256-/Ian7WoBvm9nmniHdVTEIyRW1BPTmOe3O0v59aDaXc0=";
   };
 
   hardeningDisable = [ "all" ];
diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index ad2d6c4fb7c0..2fe0afaebc95 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -63,11 +63,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uclibc-ng";
-  version = "1.0.54";
+  version = "1.0.55";
 
   src = fetchurl {
     url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0ez2XMIhfdQRik2vwavyfFhbXLV48715kfxkC3lkP/I=";
+    hash = "sha256-X386r92yygj7KVvkVWHAGIQHED10Rs/SZLm4Iv7T7S0=";
   };
 
   # 'ftw' needed to build acl, a coreutils dependency
diff --git a/pkgs/by-name/uc/uclient/package.nix b/pkgs/by-name/uc/uclient/package.nix
index a80896b15c92..af69a84ab72e 100644
--- a/pkgs/by-name/uc/uclient/package.nix
+++ b/pkgs/by-name/uc/uclient/package.nix
@@ -5,23 +5,29 @@
   cmake,
   pkg-config,
   libubox,
+  ucode,
+  json_c,
 }:
 
 stdenv.mkDerivation {
   pname = "uclient";
-  version = "unstable-2023-04-13";
+  version = "unstable-2025-10-03";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/uclient.git";
-    rev = "007d945467499f43656b141171d31f5643b83a6c";
-    hash = "sha256-A47dyVc2MtOL6aImZ0b3SMWH2vzjfAXzRAOF4nfH6S0=";
+    rev = "dc909ca71bc884c0e5362e1d7cc7808696cb2add";
+    hash = "sha256-jrhLBB3Mb7FvxMtKxG7e7D/hcyygTjx868POGtF+Dcc=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
-  buidInputs = [ libubox ];
+  buildInputs = [
+    libubox
+    ucode
+    json_c
+  ];
 
   preConfigure = ''
     sed -e 's|ubox_include_dir libubox/ustream-ssl.h|ubox_include_dir libubox/ustream-ssl.h HINTS ${libubox}/include|g' \
@@ -36,6 +42,5 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ mkg20001 ];
     mainProgram = "uclient-fetch";
     platforms = platforms.all;
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/uc/ucode/package.nix b/pkgs/by-name/uc/ucode/package.nix
index d3e1c4e603a2..30fb32cbcb2f 100644
--- a/pkgs/by-name/uc/ucode/package.nix
+++ b/pkgs/by-name/uc/ucode/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     description = "JavaScript-like language with optional templating";
     homepage = "https://github.com/jow-/ucode";
     license = licenses.isc;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ mkg20001 ];
   };
 }
diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix
index b3a10fc8454e..aecefb06fd48 100644
--- a/pkgs/by-name/uc/ucx/package.nix
+++ b/pkgs/by-name/uc/ucx/package.nix
@@ -34,6 +34,13 @@ let
   };
 in
 stdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  # TODO(@connorbaker):
+  # When strictDeps is enabled, `cuda_nvcc` is required as the argument to `--with-cuda` in `configureFlags` or else
+  # configurePhase fails with `checking for cuda_runtime.h... no`.
+  # This is odd, especially given `cuda_runtime.h` is provided by `cuda_cudart.dev`, which is already in `buildInputs`.
+  strictDeps = true;
+
   pname = "ucx";
   version = "1.19.0";
 
@@ -75,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableRocm rocmList;
 
-  LDFLAGS = lib.optionals enableCuda [
-    # Fake libnvidia-ml.so (the real one is deployed impurely)
-    "-L${lib.getLib cudaPackages.cuda_nvml_dev}/lib/stubs"
-  ];
+  # NOTE: With `__structuredAttrs` enabled, `LDFLAGS` must be set under `env` so it is assured to be a string;
+  # otherwise, we might have forgotten to convert it to a string and Nix would make LDFLAGS a shell variable
+  # referring to an array!
+  env.LDFLAGS = toString (
+    lib.optionals enableCuda [
+      # Fake libcuda.so (the real one is deployed impurely)
+      "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"
+      # Fake libnvidia-ml.so (the real one is deployed impurely)
+      "-L${lib.getOutput "stubs" cudaPackages.cuda_nvml_dev}/lib/stubs"
+    ]
+  );
 
   configureFlags = [
     "--with-rdmacm=${lib.getDev rdma-core}"
diff --git a/pkgs/by-name/ud/udebug/package.nix b/pkgs/by-name/ud/udebug/package.nix
index eb21aab56c84..ab8f9c99bb8a 100644
--- a/pkgs/by-name/ud/udebug/package.nix
+++ b/pkgs/by-name/ud/udebug/package.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation {
   pname = "udebug";
-  version = "unstable-2023-12-06";
+  version = "unstable-2025-09-28";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/udebug.git";
-    rev = "6d3f51f9fda706f0cf4732c762e4dbe8c21e12cf";
-    hash = "sha256-5dowoFZn9I2IXMQ3Pz+2Eo3rKfihLzjca84MytQIXcU=";
+    rev = "5327524e715332daaebf6b04c155d2880d230979";
+    hash = "sha256-Zcbbo7Jo7JxNSjUlbB2m2Id8crdxzKc/QFeduPGvows=";
   };
 
   buildInputs = [
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     mainProgram = "udebugd";
     homepage = "https://git.openwrt.org/?p=project/udebug.git;a=summary";
     license = licenses.free;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = with maintainers; [ mkg20001 ];
   };
 }
diff --git a/pkgs/by-name/ud/udevCheckHook/hook.sh b/pkgs/by-name/ud/udevCheckHook/hook.sh
index bdb8e9c1f746..06740394a277 100644
--- a/pkgs/by-name/ud/udevCheckHook/hook.sh
+++ b/pkgs/by-name/ud/udevCheckHook/hook.sh
@@ -12,7 +12,7 @@ udevCheckHook() {
     for output in $(getAllOutputNames); do
         for path in etc lib ; do
             if [ -d "${!output}/$path/udev/rules.d" ]; then
-                @udevadm@ verify --resolve-names=never --no-style "${!output}/$path/udev/rules.d"
+                @udevadm@ verify --resolve-names=late --no-style "${!output}/$path/udev/rules.d"
             fi
         done
     done
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 1fa8d58a5c8c..eeb66d548513 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -9,7 +9,7 @@
   libnotify,
   librsvg,
   python3Packages,
-  udisks2,
+  udisks,
   wrapGAppsHook3,
   testers,
   udiskie,
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     libappindicator-gtk3
     libnotify
     librsvg # SVG icons
-    udisks2
+    udisks
   ];
 
   dependencies = with python3Packages; [
diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/by-name/ud/udisks/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/udisks/fix-paths.patch
rename to pkgs/by-name/ud/udisks/fix-paths.patch
diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/by-name/ud/udisks/force-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/udisks/force-path.patch
rename to pkgs/by-name/ud/udisks/force-path.patch
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/by-name/ud/udisks/package.nix
similarity index 87%
rename from pkgs/os-specific/linux/udisks/2-default.nix
rename to pkgs/by-name/ud/udisks/package.nix
index 76f8d5ae7eb4..0514dac00904 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/by-name/ud/udisks/package.nix
@@ -36,6 +36,8 @@
   ntfs3g,
   nixosTests,
   udevCheckHook,
+  libiscsi,
+  libconfig,
 }:
 
 stdenv.mkDerivation rec {
@@ -45,8 +47,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "udisks";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
+    tag = "udisks-${version}";
+    hash = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
   };
 
   outputs = [
@@ -114,6 +116,8 @@ stdenv.mkDerivation rec {
     libatasmart
     polkit
     util-linux
+    libiscsi
+    libconfig
   ];
 
   preConfigure = "NOCONFIGURE=1 ./autogen.sh";
@@ -125,6 +129,10 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-udevdir=$(out)/lib/udev"
     "--with-tmpfilesdir=no"
+    "--enable-all-modules"
+    "--enable-btrfs"
+    "--enable-lvm2"
+    "--enable-smart"
   ];
 
   makeFlags = [
@@ -146,15 +154,15 @@ stdenv.mkDerivation rec {
     tests.vm = nixosTests.udisks2;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
     homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl2Plus
       gpl2Plus
     ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
-    maintainers = with maintainers; [ johnazoidberg ];
-    teams = [ teams.freedesktop ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
+    teams = [ lib.teams.freedesktop ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ud/udpreplay/package.nix b/pkgs/by-name/ud/udpreplay/package.nix
index 3367597e688c..766b180082f8 100644
--- a/pkgs/by-name/ud/udpreplay/package.nix
+++ b/pkgs/by-name/ud/udpreplay/package.nix
@@ -3,6 +3,7 @@
   cmake,
   libpcap,
   fetchFromGitHub,
+  fetchpatch,
   lib,
 }:
 stdenv.mkDerivation rec {
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA=";
   };
 
+  patches = [
+    # Increase minimum CMake required to 3.5
+    (fetchpatch {
+      url = "https://github.com/rigtorp/udpreplay/commit/52bd71d6c004cd69899dbe8d529f3ce0a8154e7f.patch?full_index=1";
+      hash = "sha256-nWtC77SNpNDDkEli5loc8eVJ1ll0AdgEKQ4pV84JoSk=";
+    })
+  ];
+
   meta = with lib; {
     description = "Replay UDP packets from a pcap file";
     longDescription = ''
diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 20e6377951ab..3e25c1ad7b1c 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ueberzugpp";
-  version = "2.9.7";
+  version = "2.9.8";
 
   src = fetchFromGitHub {
     owner = "jstkdng";
     repo = "ueberzugpp";
     rev = "v${version}";
-    hash = "sha256-FR05vBKIMbGiOnugkBi8IkLfHU7LzNF2ihxD7FWWYGU=";
+    hash = "sha256-BTOuOS0zCdYTTc47UHaGI6wqFEv6e71cD2XBZtnKGLU=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix
index 8461b065bead..873239cfbb22 100644
--- a/pkgs/by-name/ue/uefisettings/package.nix
+++ b/pkgs/by-name/ue/uefisettings/package.nix
@@ -1,24 +1,24 @@
 {
   fetchFromGitHub,
   lib,
+  nix-update-script,
   rustPlatform,
-  unstableGitUpdater,
 }:
 
 rustPlatform.buildRustPackage {
-  name = "uefisettings";
-  version = "0-unstable-2024-11-28";
+  pname = "uefisettings";
+  version = "0-unstable-2025-07-29";
 
   src = fetchFromGitHub {
     owner = "linuxboot";
     repo = "uefisettings";
-    rev = "f4d12fbdb32d1bc355dd37d5077add0a0a049be4";
-    hash = "sha256-f6CTmnY/BzIP/nfHa3Q4HWd1Ee+b7C767FB/8A4DUUM=";
+    rev = "149bc92970949d44be641ae1e3e942220d7390e7";
+    hash = "sha256-n6RWqNKkfighoGpQkCWB7TEQ0lLo6cwGUBLN7lv3TrA=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
 
-  cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w=";
+  cargoHash = "sha256-CQn5esC31hCwEqZYX8OKeyJrwIKuo7x3aAZExBEcdB4=";
 
   checkFlags = [
     # Expects filesystem access to /proc and rootfs
diff --git a/pkgs/by-name/uf/ufetch/package.nix b/pkgs/by-name/uf/ufetch/package.nix
index 3f2543d53263..00f6fca8e348 100644
--- a/pkgs/by-name/uf/ufetch/package.nix
+++ b/pkgs/by-name/uf/ufetch/package.nix
@@ -1,6 +1,7 @@
 {
   stdenvNoCC,
   fetchFromGitLab,
+  nix-update-script,
   lib,
   full ? true,
   # see https://gitlab.com/jschx/ufetch for a list
@@ -34,6 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Tiny system info for Unix-like operating systems";
     homepage = "https://gitlab.com/jschx/ufetch";
diff --git a/pkgs/by-name/uf/ufmt/package.nix b/pkgs/by-name/uf/ufmt/package.nix
new file mode 100644
index 000000000000..6c1728c35114
--- /dev/null
+++ b/pkgs/by-name/uf/ufmt/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication ufmt
diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix
index 5765e0898b09..14880464bb59 100644
--- a/pkgs/by-name/ug/ugrep/package.nix
+++ b/pkgs/by-name/ug/ugrep/package.nix
@@ -13,6 +13,28 @@
   xz,
   zlib,
   zstd,
+  # The `ugrep+` and `ug+` commands are the same as the
+  # `ugrep` and `ug` commands, but also use filters to
+  # search PDFs, documents, e-books, image metadata,
+  # when these filter tools are present:
+  poppler-utils, # Provides `pdftotext`.
+  antiword,
+  pandoc,
+  exiftool,
+  # Alleviates the need for users to pollute their
+  # environment with these packages, but grows the
+  # closure size massively; hence this is opt-in.
+  wrapWithFilterUtils ? false,
+  # `ugrep` has a compatibility mode for the `gnugrep`
+  # variants. When `$0` is one of the variants, `ugrep`
+  # behaves like it to be drop-in compatible. This can
+  # be done simply through symlinks, just like is done
+  # with `coreutils`. These will of course shadow the
+  # `pkgs.gnugrep` binaries in `system-path`.
+  createGrepReplacementLinks ? false,
+  # All we need is its `meta.priority` to ensure `ugrep`
+  # beats it.
+  gnugrep,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,8 +63,39 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postFixup = ''
+    # Needed because `ug+` and `ugrep+` are
+    # just scripts that call `ug` or `ugrep`
+    # with certain arguments. They must be
+    # reachable.
     for i in ug+ ugrep+; do
-      wrapProgram "$out/bin/$i" --prefix PATH : "$out/bin"
+      wrapProgram "$out/bin/$i" --prefix PATH : "${
+        lib.makeBinPath (
+          [ "$out" ]
+          ++ (lib.optionals wrapWithFilterUtils [
+            poppler-utils
+            antiword
+            pandoc
+            exiftool
+          ])
+        )
+      }"
+    done
+  ''
+  + lib.optionalString createGrepReplacementLinks ''
+    # These will be made relative by the
+    # `_makeSymlinksRelativeInAllOutputs`
+    # `postFixupHook`.
+    for i in ${
+      lib.concatStringsSep " " [
+        "grep"
+        "egrep"
+        "fgrep"
+        "zgrep"
+        "zegrep"
+        "zfgrep"
+      ]
+    }; do
+      ln -s "$out/bin/ugrep" "$out/bin/$i"
     done
   '';
 
@@ -52,16 +105,23 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
-    description = "Ultra fast grep with interactive query UI";
-    homepage = "https://github.com/Genivia/ugrep";
-    changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}";
-    maintainers = with maintainers; [
-      numkem
-      mikaelfangel
-    ];
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    mainProgram = "ug";
-  };
+  meta =
+    with lib;
+    {
+      description = "Ultra fast grep with interactive query UI";
+      homepage = "https://github.com/Genivia/ugrep";
+      changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}";
+      maintainers = with maintainers; [
+        numkem
+        mikaelfangel
+      ];
+      license = licenses.bsd3;
+      platforms = platforms.all;
+      mainProgram = "ug";
+    }
+    # Needed to ensure that the grep replacements take precedence over
+    # `gnugrep` when installed. Lower priority values win.
+    // lib.optionalAttrs createGrepReplacementLinks {
+      priority = (gnugrep.meta.priority or meta.defaultPriority) - 1;
+    };
 })
diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
new file mode 100644
index 000000000000..71cb46c212b2
--- /dev/null
+++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
@@ -0,0 +1,63 @@
+{
+  alsa-lib,
+  cmake,
+  curl,
+  fetchFromGitHub,
+  freetype,
+  lib,
+  libGL,
+  libXcursor,
+  libXext,
+  libXinerama,
+  libXrandr,
+  libjack2,
+  pkg-config,
+  stdenv,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uhhyou-plugins-juce";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "ryukau";
+    repo = "UhhyouPluginsJuce";
+    tag = "UhhyouPluginsJuce${finalAttrs.version}";
+    hash = "sha256-oHxyOTiqEwdNUKGQNjjfdRkzMa+4TYX6Vf6ZS9BTcC0=";
+    fetchSubmodules = true;
+  };
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ];
+  buildInputs = [
+    alsa-lib
+    curl
+    freetype
+    libGL
+    libXcursor
+    libXext
+    libXinerama
+    libXrandr
+    libjack2
+  ];
+
+  # Disable LTO to avoid optimization mismatch issues
+  NIX_CFLAGS_COMPILE = [
+    "-fno-lto"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/vst3
+    cp -r *_artefacts/Release/VST3/*.vst3 $out/lib/vst3/
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/ryukau/UhhyouPluginsJuce";
+    description = "A collection of VST3 effect plugins";
+    license = [ lib.licenses.agpl3Only ];
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
new file mode 100644
index 000000000000..b6f8ad14779d
--- /dev/null
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  writableTmpDirAsHomeHook,
+  cairo,
+  fontconfig,
+  freetype,
+  libxcb,
+  xcbutil,
+  xorg,
+  xcbutilkeysyms,
+  libxkbcommon,
+  libX11,
+  libXrandr,
+  libXinerama,
+  libXcursor,
+  pango,
+  gtkmm3,
+  sqlite,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uhhyou-plugins";
+  version = "0.67.0";
+  src = fetchFromGitHub {
+    owner = "ryukau";
+    repo = "VSTPlugins";
+    rev = "UhhyouPlugins${finalAttrs.version}";
+    hash = "sha256-8YGfcnWkOQwwq6m3510GPpZu6UbDmVi3K/dOGLrAnhM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    writableTmpDirAsHomeHook
+  ];
+
+  buildInputs = [
+    cairo
+    fontconfig
+    freetype
+    libxcb
+    xcbutil
+    xorg.xcbutilcursor
+    xcbutilkeysyms
+    libxkbcommon
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    pango
+    gtkmm3
+    sqlite
+  ];
+
+  postPatch = ''
+    # see: https://github.com/ryukau/VSTPlugins/blob/master/build_instruction.md#linux-ubuntu
+    patch -p1 -d lib/vst3sdk/vstgui4 < ci/linux_patch/cairographicscontext.patch
+    patchShebangs lib/vst3sdk/vstgui4/vstgui/uidescription/editing/createuidescdata.sh
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/vst3
+    cp -r VST3/Release/*.vst3 $out/lib/vst3/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Collection of VST3 audio synthesis and processing plugins.";
+    homepage = "https://ryukau.github.io/VSTPlugins/";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ magnetophon ];
+  };
+})
diff --git a/pkgs/by-name/uh/uhub/package.nix b/pkgs/by-name/uh/uhub/package.nix
index 0cf1f8d2e8ba..9ad62b6accde 100644
--- a/pkgs/by-name/uh/uhub/package.nix
+++ b/pkgs/by-name/uh/uhub/package.nix
@@ -35,8 +35,9 @@ stdenv.mkDerivation {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "/usr/lib/uhub/" "$out/plugins" \
-      --replace "/etc/uhub" "$TMPDIR"
+      --replace-fail "/usr/lib/uhub/" "$out/plugins" \
+      --replace-fail "/etc/uhub" "$TMPDIR" \
+      --replace-fail "cmake_minimum_required (VERSION 2.8.2)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/by-name/ui/uitest/package.nix b/pkgs/by-name/ui/uitest/package.nix
new file mode 100644
index 000000000000..9eff2ef5b47f
--- /dev/null
+++ b/pkgs/by-name/ui/uitest/package.nix
@@ -0,0 +1,34 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  tinycmmc,
+}:
+
+stdenv.mkDerivation {
+  pname = "uitest";
+  version = "0-unstable-2024-05-26";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "uitest";
+    rev = "d845427140cbcbce99bb6c72919199ac5f033784";
+    sha256 = "sha256-xD2Ecs9hW3lcQW6RNcjVhGX/eor2RbCHHXohTafC9y0=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ tinycmmc ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
+    description = "Simple testing framework for interactive tests";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index 1c40d2b0e89a..dfc61152edf7 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -80,8 +80,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.tests.run =
     runCommand "uiua-test-run" { nativeBuildInputs = [ finalAttrs.finalPackage ]; }
       ''
-        uiua init
-        diff -U3 --color=auto <(uiua run main.ua 2>&1) <(echo '"Hello, World!"')
+        echo '&p "Hello, World!"' > test.ua
+        diff -U3 --color=auto <(uiua run test.ua) <(echo 'Hello, World!')
         touch $out
       '';
 
diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index a9a37051bd47..a8d2084b76c0 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.17.3";
+  version = "0.18.0-dev.2";
   tag = version;
-  hash = "sha256-TiJAj+wBVb8Z9pnoscF65tB7flbk/XWW+7XrHlvIHeo=";
-  cargoHash = "sha256-smonKftOpGXy0WxI8Qqr0rTeI/pW6f+G4TxzoaEMsuc=";
+  hash = "sha256-coa+jE83EAIJDHrSdLMG/zDXxRYx6/uivTbNNufz17Q=";
+  cargoHash = "sha256-i8YFLkV2T9Cx/shRTbeYrNlccCzCO8w2zoa5ZuEuLSM=";
   updateScript = ./update-unstable.sh;
 }
diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index f1dffd0eee30..dce41f939ec0 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -2,16 +2,17 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "ulid";
   version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "oklog";
     repo = "ulid";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-kPNLaZMGwGc7ngPCivf/n4Bis219yOkGAaa6mt7+yTY=";
   };
 
@@ -27,12 +28,14 @@ buildGoModule rec {
     "-skip=TestMonotonicSafe"
   ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
     homepage = "https://github.com/oklog/ulid";
-    changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    changelog = "https://github.com/oklog/ulid/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "ulid";
   };
-}
+})
diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index 4a520a31950a..172c9bd9cb44 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Application-focused API for memory management on NUMA & GPU architectures";
     homepage = "https://github.com/LLNL/Umpire";
-    maintainers = with maintainers; [ sheepforce ];
-    license = with licenses; [ mit ];
-    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ sheepforce ];
+    license = with lib.licenses; [ mit ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/un/unbound/package.nix b/pkgs/by-name/un/unbound/package.nix
index 99fcaf1497c4..62657e2f4c36 100644
--- a/pkgs/by-name/un/unbound/package.nix
+++ b/pkgs/by-name/un/unbound/package.nix
@@ -56,13 +56,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unbound";
-  version = "1.24.0";
+  version = "1.24.1";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "unbound";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-M5gn18HTgcpqsOZGtxPoQbQd5tPW3T4r0YeMK5Mwgls=";
+    hash = "sha256-meWgu1UGhR9d8wVb8guqbnGE3UHs6uJHR20iDFnIThQ=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index 068c2fe60804..dee5c524f0fc 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -12,7 +12,7 @@
   nix-update-script,
 }:
 let
-  version = "4.18.4";
+  version = "4.18.12";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-xF9Y6pil7UZzrN0k/2qZ/FKSj7WudRwF3u167Sz3RyA=";
+    hash = "sha256-h0Y7a/wvmYOwr+AhVjY+P7uQQQbofpqkX5/Nd8tL3Cg=";
   };
 
   dontUnpack = true;
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     description = "Open-source Android/Desktop remake of Civ V";
     mainProgram = "unciv";
     homepage = "https://github.com/yairm210/Unciv";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.mpl20;
     platforms = platforms.all;
diff --git a/pkgs/by-name/un/undercut-f1/deps.json b/pkgs/by-name/un/undercut-f1/deps.json
new file mode 100644
index 000000000000..446e8c24aaf8
--- /dev/null
+++ b/pkgs/by-name/un/undercut-f1/deps.json
@@ -0,0 +1,1007 @@
+[
+  {
+    "pname": "AutoMapper",
+    "version": "14.0.0",
+    "hash": "sha256-gaq2pLkiuki7Pmlb6Ld3+x/hrnoue1zGVw8oGOpSsrw="
+  },
+  {
+    "pname": "AutoMapper.Collection",
+    "version": "11.0.0",
+    "hash": "sha256-zOXvQz0kcrc7PwiAUkYD3HtefETvsbaBzVzrbO/5fqo="
+  },
+  {
+    "pname": "Castle.Core",
+    "version": "5.0.0",
+    "hash": "sha256-o0dLsy0RfVOIggymFbUJMhfR3XDp6uFI3G1o4j9o2Lg="
+  },
+  {
+    "pname": "FFMpegCore",
+    "version": "5.2.0",
+    "hash": "sha256-YLJJchPe7vpiLTt6lwuPrdvgTm0xxz/4ELJOjnqWw5E="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "Humanizer.Core",
+    "version": "2.14.1",
+    "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
+  },
+  {
+    "pname": "InMemoryLogger",
+    "version": "1.0.66",
+    "hash": "sha256-Co/4Mk5CEeEVMGG0vAEPmkKQzh8p6+mcvoClxXYDIa8="
+  },
+  {
+    "pname": "Instances",
+    "version": "3.0.1",
+    "hash": "sha256-vWfpCcQ/iTsVot9rug/TSu5nPCJ3JUyxzX6bP3uEtfM="
+  },
+  {
+    "pname": "Json.More.Net",
+    "version": "2.1.1",
+    "hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU="
+  },
+  {
+    "pname": "JsonPointer.Net",
+    "version": "5.3.1",
+    "hash": "sha256-nV1r0doxPiApc2sEI4AulBz+arLWF2VSnHm9tymBJzE="
+  },
+  {
+    "pname": "JsonSchema.Net",
+    "version": "7.4.0",
+    "hash": "sha256-j6QMakexHXNAsf7emMnYgjTvnXSj0xCHgYLs184Z0p0="
+  },
+  {
+    "pname": "JsonSchema.Net.Generation",
+    "version": "5.1.1",
+    "hash": "sha256-7bMXejeds/8g0b3upesiLqzjE3KvyU7qT4FdyJhMGss="
+  },
+  {
+    "pname": "LiveChartsCore",
+    "version": "2.0.0-rc5.4",
+    "hash": "sha256-Qw1Iyld75RXpvGJn/EQvd+f4Jh1SVAoqjjl/I0ctyWw="
+  },
+  {
+    "pname": "LiveChartsCore.SkiaSharpView",
+    "version": "2.0.0-rc5.4",
+    "hash": "sha256-hlFYZu25Z2iTgoIL9cczN4BYYHzSXvzC7593e52x914="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.Connections.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-w2tDobldb+kxZpJf2SwLYkvkgysgyo8jnZRzhAyW2FY="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.Http.Connections.Client",
+    "version": "9.0.10",
+    "hash": "sha256-E1RBf/lG+vJY2kMXb1rCFy2/7SUi8c6J/xn6nnZ7buk="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.Http.Connections.Common",
+    "version": "9.0.10",
+    "hash": "sha256-nWdTQRfznzjPeHZ3hQhJr1TSkcEr9Aenvj0PCe4DJ9k="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Client",
+    "version": "9.0.10",
+    "hash": "sha256-/HhDVi1MhSZCFEpA2AFCotl3/uba4O/rwX0o4XO6KIs="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Client.Core",
+    "version": "9.0.10",
+    "hash": "sha256-QtoZ/C1xj1Q1moxhwzqjbMGkWIZ6Eegm1y5TCUWSOJk="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Common",
+    "version": "9.0.10",
+    "hash": "sha256-s/YrLu1SwZvMG1ep9Sriz/nlhKkiAaVdsDc4Li8VVaY="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
+    "version": "9.0.10",
+    "hash": "sha256-ERiXEu/r9FSOU93Qd9er/63avF6nEbAiowQ9Msbqk58="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
+    "version": "3.3.4",
+    "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+  },
+  {
+    "pname": "Microsoft.CodeCoverage",
+    "version": "17.14.1",
+    "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.Extensions.ApiDescription.Server",
+    "version": "6.0.5",
+    "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "9.0.10",
+    "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "2.2.0",
+    "hash": "sha256-cigv0t9SntPWjJyRWMy3Q5KnuF17HoDyeKq26meTHoM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.0",
+    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "9.0.10",
+    "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.CommandLine",
+    "version": "9.0.10",
+    "hash": "sha256-lgBXA1ovyeEqH9xmLNxxMB2/OLILt7AW6BXf+yc8wqs="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
+    "version": "9.0.10",
+    "hash": "sha256-D4Myt5rp8jxOvuQ4zwo/1bfNfLDZHrBYx7+UDOnhWgA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.FileExtensions",
+    "version": "9.0.10",
+    "hash": "sha256-I8ywPAfg7GPQgOuA5TPXuseurWKk7BmXsnaowF80XEQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Json",
+    "version": "9.0.10",
+    "hash": "sha256-ykcnGdvnx19q3dpwZ9A09k+6iIGNurVebe4nUaOBtng="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.UserSecrets",
+    "version": "9.0.10",
+    "hash": "sha256-t4ssmlaX/lVemYekfubS841MStq00+C2h2HY1HyZQvQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.10",
+    "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "2.2.0",
+    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "7.0.0",
+    "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "8.0.0",
+    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "9.0.10",
+    "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Features",
+    "version": "9.0.10",
+    "hash": "sha256-SVtG0MpqgdSRU4hLOe7uDY/MYo8o/70ZCEhCTjwMDCs="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Physical",
+    "version": "9.0.10",
+    "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileSystemGlobbing",
+    "version": "9.0.10",
+    "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting",
+    "version": "9.0.10",
+    "hash": "sha256-SImJyuK5D7uR0AjWFz6JwqvPZ5VVHPVK79T7vqTUs0g="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Systemd",
+    "version": "8.0.0",
+    "hash": "sha256-uIOHZNnFRu9mgyoGnZ4sqKJdfSsSjOv21RuF6TnqHco="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http",
+    "version": "9.0.10",
+    "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "2.2.0",
+    "hash": "sha256-lY9axb6/MyPAhE+N8VtfCIpD80AFCtxUnnGxvb2koy8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "8.0.0",
+    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.10",
+    "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "2.2.0",
+    "hash": "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "9.0.10",
+    "hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Console",
+    "version": "9.0.10",
+    "hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Debug",
+    "version": "9.0.10",
+    "hash": "sha256-x3B8uLpMuIUru3LxEg1ZMYkE5QkcfFe9fMCSUO1kakM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.EventLog",
+    "version": "9.0.10",
+    "hash": "sha256-TzOq62cH8KolfIvXnWapvPdmCdDxiKF7tg5ICE6iwEk="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.EventSource",
+    "version": "9.0.10",
+    "hash": "sha256-GGxnzocUi1se0kkysvkZ5QpN3p/N1VbrLkpeVPS18Ks="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.0",
+    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.10",
+    "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "9.0.10",
+    "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.10",
+    "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w="
+  },
+  {
+    "pname": "Microsoft.NET.Test.Sdk",
+    "version": "17.14.1",
+    "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "Microsoft.OpenApi",
+    "version": "1.2.3",
+    "hash": "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.14.1",
+    "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.TestHost",
+    "version": "17.14.1",
+    "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
+  },
+  {
+    "pname": "Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
+  },
+  {
+    "pname": "Nerdbank.GitVersioning",
+    "version": "3.7.115",
+    "hash": "sha256-sqn+i7vvBgBUtm7j82mH+SpApgI2hsmL5DYfLm1Z7gw="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "1.6.1",
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "NSubstitute",
+    "version": "5.0.0",
+    "hash": "sha256-E+eDNK6qzsN8MDbT0STfNeVKXf41aVe86v+ib9NgTMU="
+  },
+  {
+    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
+  },
+  {
+    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
+  },
+  {
+    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.native.System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
+  },
+  {
+    "pname": "runtime.native.System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
+  {
+    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
+  },
+  {
+    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
+  },
+  {
+    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
+  },
+  {
+    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
+  },
+  {
+    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
+  },
+  {
+    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
+  },
+  {
+    "pname": "Serilog",
+    "version": "2.10.0",
+    "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.1.0",
+    "hash": "sha256-1CDAp+AjfFjQqoLvKYp/j6pKTUfNOGfKVlWyqCGHo7k="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.1.1",
+    "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
+  },
+  {
+    "pname": "Serilog",
+    "version": "4.0.0",
+    "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
+  },
+  {
+    "pname": "Serilog.AspNetCore",
+    "version": "8.0.1",
+    "hash": "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="
+  },
+  {
+    "pname": "Serilog.Extensions.Hosting",
+    "version": "8.0.0",
+    "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="
+  },
+  {
+    "pname": "Serilog.Extensions.Logging",
+    "version": "8.0.0",
+    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+  },
+  {
+    "pname": "Serilog.Formatting.Compact",
+    "version": "2.0.0",
+    "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="
+  },
+  {
+    "pname": "Serilog.Settings.Configuration",
+    "version": "8.0.0",
+    "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="
+  },
+  {
+    "pname": "Serilog.Sinks.Console",
+    "version": "5.0.0",
+    "hash": "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI="
+  },
+  {
+    "pname": "Serilog.Sinks.Debug",
+    "version": "2.0.0",
+    "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "5.0.0",
+    "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "6.0.0",
+    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+  },
+  {
+    "pname": "SharpWebview",
+    "version": "0.11.3",
+    "hash": "sha256-HLZw90EOVXFGL/pnPHeaAmRQLCxZHSsHvFO6c7RlRIw="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp.HarfBuzz",
+    "version": "2.88.9",
+    "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "Spectre.Console",
+    "version": "0.48.0",
+    "hash": "sha256-hr7BkVJ5v+NOPytlINjo+yoJetRUKmBhZbTMVKOMf2w="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore",
+    "version": "6.5.0",
+    "hash": "sha256-thAX5M8OihCU5Pmht5FzQPR7K+gbia580KnI8i9kwUw="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.Swagger",
+    "version": "6.5.0",
+    "hash": "sha256-bKJG6fhLBB5rKoVm0nc4PfecBtDg/r2G1hrZ6Izryug="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerGen",
+    "version": "6.5.0",
+    "hash": "sha256-A+n8r9bM8UU0ZpzS5pHqa/JOX+cY0jTbfTH7XfwbCUM="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerUI",
+    "version": "6.5.0",
+    "hash": "sha256-BxYBRvabFUIRkZ67YbUY6djxbLPtmPlAfREeFNg8HZ4="
+  },
+  {
+    "pname": "System.AppContext",
+    "version": "4.3.0",
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.3.0",
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
+  },
+  {
+    "pname": "System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
+  },
+  {
+    "pname": "System.Collections.Concurrent",
+    "version": "4.3.0",
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.CommandLine",
+    "version": "2.0.0-beta6.25358.103",
+    "hash": "sha256-bBd8zRElNoxv793V1bpRbc6etWvLq3I9AKR0/gmhmBY="
+  },
+  {
+    "pname": "System.Console",
+    "version": "4.3.0",
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
+  },
+  {
+    "pname": "System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.3.0",
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "6.0.0",
+    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "9.0.10",
+    "hash": "sha256-Nl5DqIAwczE10eWNlVz1UpAVO668eNdhyWq+Rfw+QI0="
+  },
+  {
+    "pname": "System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
+  },
+  {
+    "pname": "System.Diagnostics.Tracing",
+    "version": "4.3.0",
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
+  },
+  {
+    "pname": "System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
+  },
+  {
+    "pname": "System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
+  },
+  {
+    "pname": "System.Globalization.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
+  },
+  {
+    "pname": "System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
+  },
+  {
+    "pname": "System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
+  },
+  {
+    "pname": "System.IO.Compression.ZipFile",
+    "version": "4.3.0",
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
+  },
+  {
+    "pname": "System.IO.FileSystem",
+    "version": "4.3.0",
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
+  },
+  {
+    "pname": "System.IO.FileSystem.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Linq",
+    "version": "4.3.0",
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
+  },
+  {
+    "pname": "System.Linq.Expressions",
+    "version": "4.3.0",
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
+  {
+    "pname": "System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
+  },
+  {
+    "pname": "System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
+  },
+  {
+    "pname": "System.Net.ServerSentEvents",
+    "version": "9.0.10",
+    "hash": "sha256-CbvTNiqbAvtR/zEHdRvfVM+6a/pX7S+8gFX+Yda4b1I="
+  },
+  {
+    "pname": "System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
+  },
+  {
+    "pname": "System.ObjectModel",
+    "version": "4.3.0",
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
+  },
+  {
+    "pname": "System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.3.0",
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.3.0",
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.3.0",
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
+  },
+  {
+    "pname": "System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+  },
+  {
+    "pname": "System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.3.0",
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
+  },
+  {
+    "pname": "System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
+  },
+  {
+    "pname": "System.Runtime.Handles",
+    "version": "4.3.0",
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
+  },
+  {
+    "pname": "System.Runtime.InteropServices",
+    "version": "4.3.0",
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
+  },
+  {
+    "pname": "System.Runtime.InteropServices.RuntimeInformation",
+    "version": "4.3.0",
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
+  },
+  {
+    "pname": "System.Runtime.Numerics",
+    "version": "4.3.0",
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
+  },
+  {
+    "pname": "System.Security.Cryptography.Algorithms",
+    "version": "4.3.0",
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.3.0",
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
+  },
+  {
+    "pname": "System.Security.Cryptography.Csp",
+    "version": "4.3.0",
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
+  },
+  {
+    "pname": "System.Security.Cryptography.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
+  },
+  {
+    "pname": "System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
+  },
+  {
+    "pname": "System.Security.Cryptography.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
+  },
+  {
+    "pname": "System.Security.Cryptography.X509Certificates",
+    "version": "4.3.0",
+    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
+  },
+  {
+    "pname": "System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encoding.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.2",
+    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
+  },
+  {
+    "pname": "System.Text.RegularExpressions",
+    "version": "4.3.0",
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
+  },
+  {
+    "pname": "System.Threading",
+    "version": "4.3.0",
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "9.0.10",
+    "hash": "sha256-1SSATu8rInAryjFE98mInmAfrPQ48KixeqqAjn4xp64="
+  },
+  {
+    "pname": "System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
+  },
+  {
+    "pname": "System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
+  },
+  {
+    "pname": "System.Xml.ReaderWriter",
+    "version": "4.3.0",
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
+  },
+  {
+    "pname": "System.Xml.XDocument",
+    "version": "4.3.0",
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
+  },
+  {
+    "pname": "TextCopy",
+    "version": "6.2.1",
+    "hash": "sha256-Lb+e9BwWdRFhxyshIIZAywhDFA5ql3uIV6iQTFUkGUA="
+  },
+  {
+    "pname": "Vezel.Cathode",
+    "version": "0.14.17",
+    "hash": "sha256-On2OfZXLTA5nQ5CY7Aat21Uqbp0J94Cr0+8+Hff1n9Q="
+  },
+  {
+    "pname": "Vezel.Cathode.Common",
+    "version": "0.14.17",
+    "hash": "sha256-FCxSaBzo8KW+cHNYhF9JzELVbhoMQm3yxEtoT4kJyQA="
+  },
+  {
+    "pname": "Vezel.Cathode.Extensions",
+    "version": "0.14.17",
+    "hash": "sha256-Bhp9yVpce0BbVfYcw2CtJHIqO122JgA0gOOuMg2SjTA="
+  },
+  {
+    "pname": "Wcwidth",
+    "version": "2.0.0",
+    "hash": "sha256-XLlZbsC/FZUHZjXsJepg3AlWnDCjW+AfYmct001YKV4="
+  },
+  {
+    "pname": "Whisper.net",
+    "version": "1.8.1",
+    "hash": "sha256-h1iUHXwaf641TgMKkW4sBQS3UoRNJBIIm6ioydFC9qQ="
+  },
+  {
+    "pname": "Whisper.net.Runtime",
+    "version": "1.8.1",
+    "hash": "sha256-zoOe2wL174lnYjY0tln43v76VZxuksZ6GzCPWvCjOCE="
+  },
+  {
+    "pname": "xunit",
+    "version": "2.5.0",
+    "hash": "sha256-cbUJZpTrX9Dk/Z10fjp9FTom0y57q4nzATqt7NzyLqE="
+  },
+  {
+    "pname": "xunit.abstractions",
+    "version": "2.0.3",
+    "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="
+  },
+  {
+    "pname": "xunit.analyzers",
+    "version": "1.2.0",
+    "hash": "sha256-6ZcGSbzIQtSSqh5RAmOLr7RbXSMqWkzzfVL3twSPcdM="
+  },
+  {
+    "pname": "xunit.assert",
+    "version": "2.5.0",
+    "hash": "sha256-kbjRf1VFYiZ11ZzahMAi79wP7OEL9uh/Mv4rLEUtEvk="
+  },
+  {
+    "pname": "xunit.core",
+    "version": "2.5.0",
+    "hash": "sha256-rnH1PDG1mj2iV/MRrzfgC4XXvnwsA9mXAKVEqMCSed0="
+  },
+  {
+    "pname": "xunit.extensibility.core",
+    "version": "2.5.0",
+    "hash": "sha256-pVss4yr9rvgtwx4I5mB+OKZTznwvc8ERq7nfB8LXc6c="
+  },
+  {
+    "pname": "xunit.extensibility.execution",
+    "version": "2.5.0",
+    "hash": "sha256-r3r8PU8XtHjQbSjduAjrpyqAOVmg7BCxOAgfpbKqSI0="
+  },
+  {
+    "pname": "xunit.runner.visualstudio",
+    "version": "2.5.0",
+    "hash": "sha256-cceyYc7bvuo+bRINIdOoO8R9JM9av68pPY9tJV4VGmI="
+  }
+]
diff --git a/pkgs/by-name/un/undercut-f1/package.nix b/pkgs/by-name/un/undercut-f1/package.nix
new file mode 100644
index 000000000000..c81c4712e628
--- /dev/null
+++ b/pkgs/by-name/un/undercut-f1/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  ffmpeg,
+  mpg123,
+  webkitgtk_4_1,
+  nix-update-script,
+  versionCheckHook,
+  autoPatchelfHook,
+  makeWrapper,
+  gtk3,
+  openssl,
+  krb5,
+  icu,
+  zlib,
+}:
+buildDotnetModule rec {
+  pname = "undercut-f1";
+  version = "3.3.51";
+  src = fetchFromGitHub {
+    owner = "JustAman62";
+    repo = "undercut-f1";
+    tag = "v${version}";
+    hash = "sha256-jmA8j7uAbtjvXJTH+jG/HVc6Lk1NxBTzIGc8ttg36w4=";
+  };
+
+  projectFile = "UndercutF1.Console/UndercutF1.Console.csproj";
+
+  executables = [ "undercutf1" ];
+
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.sdk_9_0;
+
+  nugetDeps = ./deps.json;
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    stdenv.cc.cc.lib
+    gtk3
+    webkitgtk_4_1
+    openssl
+    krb5
+    icu
+    zlib
+  ];
+
+  postPatch = ''
+    rm -f .config/dotnet-tools.json
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/undercutf1 \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          ffmpeg
+          mpg123
+        ]
+      }
+  '';
+
+  dotnetBuildFlags = [
+    "-p:PublishSingleFile=true"
+    "-p:IncludeNativeLibrariesForSelfExtract=true"
+    "-p:OverridePackageVersion=${version}"
+  ];
+
+  dotnetPublishFlags = [
+    "-p:PublishTrimmed=false"
+    "-p:OverridePackageVersion=${version}"
+  ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  installCheckPhase = ''
+    $out/bin/undercutf1 --version | grep -q "${version}"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open-source F1 Live Timing TUI client with replay, driver tracker and team-radio transcription";
+    homepage = "https://github.com/JustAman62/undercut-f1";
+    changelog = "https://github.com/JustAman62/undercut-f1/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ linuxmobile ];
+    mainProgram = "undercutf1";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/by-name/un/unfurl/package.nix b/pkgs/by-name/un/unfurl/package.nix
index ccca02140d70..2f4e31f2bd57 100644
--- a/pkgs/by-name/un/unfurl/package.nix
+++ b/pkgs/by-name/un/unfurl/package.nix
@@ -32,6 +32,6 @@ buildGoModule rec {
     mainProgram = "unfurl";
     homepage = "https://github.com/tomnomnom/unfurl";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/un/unicode-character-database/package.nix b/pkgs/by-name/un/unicode-character-database/package.nix
index 48e17bdd6654..a2237aa121dc 100644
--- a/pkgs/by-name/un/unicode-character-database/package.nix
+++ b/pkgs/by-name/un/unicode-character-database/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "unicode-character-database";
-  version = "16.0.0";
+  version = "17.0.0";
 
   src = fetchurl {
-    url = "https://www.unicode.org/Public/zipped/${version}/UCD.zip";
-    sha256 = "sha256-yG3YHysUpDsMwGSqX4mqckE4aAHjXFnHmE5XmDJjTrI=";
+    url = "https://www.unicode.org/Public/${version}/ucd/UCD.zip";
+    sha256 = "sha256-IGbRkJsuqTkWzgktocDuSAjqPvhAfJS08U9bfrJj0o4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix
index 2b3ac152a4ce..8a3d7028f74b 100644
--- a/pkgs/by-name/un/unicode-paracode/package.nix
+++ b/pkgs/by-name/un/unicode-paracode/package.nix
@@ -19,6 +19,14 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY=";
   };
 
+  patches = [
+    # Fix 3.13+ mutable locals()
+    (fetchurl {
+      url = "https://github.com/garabik/unicode/commit/412952b9b4730263f5b560924b84f8934ea4ba21.patch";
+      hash = "sha256-Rfm6Jc7V5n7ggQzA/yeDrYedGMWqRkeUX6FRCUkBWcI=";
+    })
+  ];
+
   ucdtxt = fetchurl {
     url = "https://www.unicode.org/Public/16.0.0/ucd/UnicodeData.txt";
     sha256 = "sha256-/1jlgjvQlRZlZKAG5H0RETCBPc+L8jTvefpRqHDttI8=";
diff --git a/pkgs/by-name/un/unicorn-angr/package.nix b/pkgs/by-name/un/unicorn-angr/package.nix
index d85ac29a12d2..1153f0aad872 100644
--- a/pkgs/by-name/un/unicorn-angr/package.nix
+++ b/pkgs/by-name/un/unicorn-angr/package.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Lightweight multi-platform CPU emulator library";
     homepage = "https://www.unicorn-engine.org";
diff --git a/pkgs/by-name/un/unifdef/package.nix b/pkgs/by-name/un/unifdef/package.nix
index d3a8bf96ae74..ac4c84e882fe 100644
--- a/pkgs/by-name/un/unifdef/package.nix
+++ b/pkgs/by-name/un/unifdef/package.nix
@@ -4,25 +4,31 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "unifdef";
   version = "2.12";
 
   src = fetchurl {
-    url = "https://dotat.at/prog/unifdef/unifdef-${version}.tar.xz";
-    sha256 = "00647bp3m9n01ck6ilw6r24fk4mivmimamvm4hxp5p6wxh10zkj3";
+    url = "https://dotat.at/prog/unifdef/unifdef-${finalAttrs.version}.tar.xz";
+    hash = "sha256-Q84PAuzc3HI7JHVXVWPdsZLpiMiG02gmC8CmOu46xAA=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/fanf2/unifdef/pull/19
+    ./unifdef-fix-build-with-gcc15.patch
+  ];
+
   makeFlags = [
     "prefix=$(out)"
     "DESTDIR="
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://dotat.at/prog/unifdef/";
     description = "Selectively remove C preprocessor conditionals";
-    license = licenses.bsd2;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})
diff --git a/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch b/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch
new file mode 100644
index 000000000000..0b6fbb0b3a7e
--- /dev/null
+++ b/pkgs/by-name/un/unifdef/unifdef-fix-build-with-gcc15.patch
@@ -0,0 +1,54 @@
+From d616741e6b0d5b57b66447e85ad32b283b28adde Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 17 Nov 2024 01:26:27 +0000
+Subject: [PATCH] Don't use C23 constexpr keyword
+
+This fixes building with upcoming GCC 15 which defaults to -std=gnu23.
+---
+ unifdef.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/unifdef.c b/unifdef.c
+index dc145a2..4bd3bda 100644
+--- a/unifdef.c
++++ b/unifdef.c
+@@ -202,7 +202,7 @@ static int              depth;			/* current #if nesting */
+ static int              delcount;		/* count of deleted lines */
+ static unsigned         blankcount;		/* count of blank lines */
+ static unsigned         blankmax;		/* maximum recent blankcount */
+-static bool             constexpr;		/* constant #if expression */
++static bool             is_constexpr;		/* constant #if expression */
+ static bool             zerosyms;		/* to format symdepth output */
+ static bool             firstsym;		/* ditto */
+ 
+@@ -1086,7 +1086,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ 			*valp = (value[sym] != NULL);
+ 			lt = *valp ? LT_TRUE : LT_FALSE;
+ 		}
+-		constexpr = false;
++		is_constexpr = false;
+ 	} else if (!endsym(*cp)) {
+ 		debug("eval%d symbol", prec(ops));
+ 		sym = findsym(&cp);
+@@ -1103,7 +1103,7 @@ eval_unary(const struct ops *ops, long *valp, const char **cpp)
+ 			lt = *valp ? LT_TRUE : LT_FALSE;
+ 			cp = skipargs(cp);
+ 		}
+-		constexpr = false;
++		is_constexpr = false;
+ 	} else {
+ 		debug("eval%d bad expr", prec(ops));
+ 		return (LT_ERROR);
+@@ -1170,10 +1170,10 @@ ifeval(const char **cpp)
+ 	long val = 0;
+ 
+ 	debug("eval %s", *cpp);
+-	constexpr = killconsts ? false : true;
++	is_constexpr = killconsts ? false : true;
+ 	ret = eval_table(eval_ops, &val, cpp);
+ 	debug("eval = %d", val);
+-	return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
++	return (is_constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
+ }
+ 
+ /*
diff --git a/pkgs/by-name/un/unigine-heaven/package.nix b/pkgs/by-name/un/unigine-heaven/package.nix
index 54557ca0631d..9b3e3e22e86b 100644
--- a/pkgs/by-name/un/unigine-heaven/package.nix
+++ b/pkgs/by-name/un/unigine-heaven/package.nix
@@ -98,7 +98,7 @@ stdenv.mkDerivation {
     homepage = "https://benchmark.unigine.com/heaven";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/by-name/un/unihan-database/package.nix b/pkgs/by-name/un/unihan-database/package.nix
index e3b2d493c644..9e0a0937d10f 100644
--- a/pkgs/by-name/un/unihan-database/package.nix
+++ b/pkgs/by-name/un/unihan-database/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "unihan-database";
-  version = "15.1.0";
+  version = "17.0.0";
 
   src = fetchurl {
-    url = "https://www.unicode.org/Public/zipped/${version}/Unihan.zip";
-    hash = "sha256-oCJmEOMkvPeErDgOEfTL9TPuHms9AosJkb+MDcP4WFM=";
+    url = "https://www.unicode.org/Public/${version}/ucd/Unihan.zip";
+    hash = "sha256-96SLK1Raz6p3stYHrih0dATOArrv7hY5bF0teo7zS14=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index 8776c65270ee..112e1ac04d7c 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Edu4rdSHL/unimap";
     changelog = "https://github.com/Edu4rdSHL/unimap/releases/tag/${src.rev}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "unimap";
   };
 }
diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix
index eb3841fbac71..7262caef8a9a 100644
--- a/pkgs/by-name/un/unit/package.nix
+++ b/pkgs/by-name/un/unit/package.nix
@@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
     ${optionalString withPerl "./configure perl   --module=perl     --perl=${perl}/bin/perl"}
   '';
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    # 'EVP_PKEY_asn1_find_str' is deprecated since OpenSSL 3.6
+    "-Wno-error=deprecated-declarations"
+  ];
+
   passthru.tests = {
     unit-perl = nixosTests.unit-perl;
     unit-php = nixosTests.unit-php;
diff --git a/pkgs/by-name/un/universal-ctags/package.nix b/pkgs/by-name/un/universal-ctags/package.nix
index 87fb6ab8bdd1..484317717d18 100644
--- a/pkgs/by-name/un/universal-ctags/package.nix
+++ b/pkgs/by-name/un/universal-ctags/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "universal-ctags";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-M2MuVWUsN9kBRF4OAavTYQGPUYvzNmP30AWnW1SendU=";
+    hash = "sha256-x5ZlWTNUc1J/yslKHc8rCIl9LtNTN/HTaAJpFyF0KRI=";
   };
 
   depsBuildBuild = [
diff --git a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
index 363aec592a94..5ae151e0cf69 100644
--- a/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
+++ b/pkgs/by-name/un/unnamed-sdvx-clone/package.nix
@@ -25,14 +25,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "unnamed-sdvx-clone";
-  version = "0.6.0";
+  version = "0.6.0-unstable-2025-07-31";
 
   src = fetchFromGitHub {
     owner = "Drewol";
     repo = "unnamed-sdvx-clone";
-    tag = "v${finalAttrs.version}";
+    rev = "2472fcc5c8b6b8bc7323dc61ea80b3b1899dd45f";
     fetchSubmodules = true;
-    hash = "sha256-wuf7xZztoxzNQJzlJOfH/Dc25/717NevBx7E0RDybho=";
+    hash = "sha256-Z0eU3xNzVmv2PwUvS2HoRe2TQzQ8seL0R/YAYCQWR28=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unordered_dense/package.nix b/pkgs/by-name/un/unordered_dense/package.nix
index eb22d59b56e0..41d1f23ef0bf 100644
--- a/pkgs/by-name/un/unordered_dense/package.nix
+++ b/pkgs/by-name/un/unordered_dense/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "unordered-dense";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "martinus";
     repo = "unordered_dense";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j+iBqmedykRYJm8Q6WudQrfPc1CHP9URHip+gkFhK0I=";
+    hash = "sha256-irjzMx0QVE6W/Tg4TV+RNw1kD16yIJPR3sBseauu6AQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix
index 24e9dee0d0ad..5fc8a2ca57ec 100644
--- a/pkgs/by-name/un/unrar/package.nix
+++ b/pkgs/by-name/un/unrar/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar";
-  version = "7.1.10";
+  version = "7.2.1";
 
   src = fetchzip {
     url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
     stripRoot = false;
-    hash = "sha256-qUqUJ7NZyF+/skmdYMeE+u6KoHswcJvQSnRQ8rAKXp8=";
+    hash = "sha256-er4F+TUFZ7Iv48PbV5FT371CPQ93Zorc5fCxfqGmij0=";
   };
 
   sourceRoot = finalAttrs.src.name;
diff --git a/pkgs/by-name/un/unzrip/package.nix b/pkgs/by-name/un/unzrip/package.nix
index ffec04c309fc..7e592bfce66c 100644
--- a/pkgs/by-name/un/unzrip/package.nix
+++ b/pkgs/by-name/un/unzrip/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
     description = "Unzip implementation, support for parallel decompression, automatic detection encoding";
     homepage = "https://github.com/quininer/unzrip";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "unzrip";
   };
 }
diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
index 7d5240c0c754..de250cc13890 100644
--- a/pkgs/by-name/up/upcloud-cli/package.nix
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "upcloud-cli";
-  version = "3.23.0";
+  version = "3.24.1";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oATz3ZvOeFT0wJ7R69cleGdpD9ICWQVOINKelJguBR4=";
+    hash = "sha256-D9IF3yS0c4QxLbEE1ix8ann69Bhsbs24W79crVe//XI=";
   };
 
-  vendorHash = "sha256-Q/FokLGjc65ptbouRT5L0bxPIzzctTo87oFu9qd/NHs=";
+  vendorHash = "sha256-biRfhrlCI1JvXx9739yNlYXPgTaBslZ7OSleWLAaOzA=";
 
   ldflags = [
     "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}"
diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index cfb0fa161a36..9770640704c8 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -65,6 +65,9 @@ buildGoModule rec {
     changelog = "https://github.com/updatecli/updatecli/releases/tag/${src.rev}";
     license = licenses.asl20;
     mainProgram = "updatecli";
-    maintainers = with maintainers; [ croissong ];
+    maintainers = with maintainers; [
+      croissong
+      lpostula
+    ];
   };
 }
diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix
index 3c6dda83a42f..5d210f2f0b67 100644
--- a/pkgs/by-name/up/upiano/package.nix
+++ b/pkgs/by-name/up/upiano/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Piano in your terminal";
     homepage = "https://github.com/eliasdorneles/upiano";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "upiano";
   };
 }
diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix
index 6d85d57bc05e..2042988e5104 100644
--- a/pkgs/by-name/up/upower/package.nix
+++ b/pkgs/by-name/up/upower/package.nix
@@ -38,7 +38,7 @@ assert withDocs -> withIntrospection;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "upower";
-  version = "1.90.6";
+  version = "1.90.10";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "upower";
     repo = "upower";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Y3MIB6a11P00B/6E3UyoyjLLP8TIT3vM2FDO7zlBz/w=";
+    hash = "sha256-08lAt91RJ/sFIGlq1gfn4wUiwNxWyTO+pX41HKzQTG8=";
   };
 
   patches =
@@ -63,18 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ [
       ./installed-tests-path.patch
-
-      # Fix a race condition in test_sibling_priority_no_overwrite
-      # Remove when updating to > 1.90.6
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch";
-        hash = "sha256-E56iz/iHn+VM7Opo0a13A5nhnB9nf6C7Y1kyWzk4ZnU=";
-      })
-      # Fix style issues in the udev rules file
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/upower/upower/-/commit/6f9d84694da56b317989b8c34250b60d833a4b29.patch";
-        hash = "sha256-xBUbf4qz9Llmw7CuKKMp/uPk7JqwjB4+p7z9kMOVRuE=";
-      })
     ];
 
   strictDeps = true;
diff --git a/pkgs/by-name/up/uppy-companion/missing-hashes.json b/pkgs/by-name/up/uppy-companion/missing-hashes.json
new file mode 100644
index 000000000000..b95352dbd3c1
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/missing-hashes.json
@@ -0,0 +1,355 @@
+{
+  "@biomejs/cli-darwin-arm64@npm:2.0.5": "a15bc3bd3ceaaaa65adf6afd29538be7ecaacfa2d7fa798154241de8f38a087b2c1a5fc103f43d3e49381a2b7f13501d829776213263984f580b8599af9b3259",
+  "@biomejs/cli-darwin-x64@npm:2.0.5": "10d3bf203a16de1d91b45419c97146552e07f47654073fc1dfff3cc0bb761561a61ff44b4943e3b46f3beff8a14497e87f33ab18c0a52734cd7ec15691f054e3",
+  "@biomejs/cli-linux-arm64-musl@npm:2.0.5": "d3f9067e186fefcd154325c06d40d52a06b80347024825eba5eb03432d1ad7287d9dced6dc3dc085a82a5f46e8490b39826f77ce847a27d3e2e7a413149e410f",
+  "@biomejs/cli-linux-arm64@npm:2.0.5": "bd2121689d4dab98ad3a7cd01542ec1556feed795e7326f33c1c54dcb0d3043f6a22b5f9a3b1d897c781a2b096cc1b71b7c00cd60e45af6ef486b3c6d4d41c09",
+  "@biomejs/cli-linux-x64-musl@npm:2.0.5": "88e9d8dce4b5240ed85197cdd44af13f2685527af68359f1eccb050f737e29bcd4ea6fa453561b08fea91f6d216c5fafaebf8c33611d1e597cc2cdd18118c55d",
+  "@biomejs/cli-linux-x64@npm:2.0.5": "f5df56a3296bdde562f89b3b637b3238d15ae40701d29a18603686f231f2c3def9ec82ac47c86f290f0504eb0634065e053e268466b99787e622e80b864e850b",
+  "@biomejs/cli-win32-arm64@npm:2.0.5": "5a93662a6e5ce3eded50f4ba8bb3fb38be5df630ac6cbb3a61e6086a05e3d554aaaccc9b709b8f75b573b42d48015a1318efa3b4cce8f82fa261bf09b17dcf32",
+  "@biomejs/cli-win32-x64@npm:2.0.5": "5fbb511151b6d642a7c34a207fb3985eda16a8f11f748e4217336ec99f6bcb99a85eae737ae1dd74ddacc00a60b998bd43cd5701295b2af613ffc2b54e7eeaae",
+  "@esbuild/aix-ppc64@npm:0.25.0": "f9a1263789c799c54255f102aa7e5eb92ff2938e5f1e28d7270ae9388d7f0b07a89c6928201089e9917da3531c3370675cbdf3ee213dbb46c219168826dcbf07",
+  "@esbuild/aix-ppc64@npm:0.25.1": "b7b13c0ba1ad3251586c094b8a62620f3d47ff5b7037ece162a6be0b6219ef7e7af54dd723172f997188433ab767f375ad213cad3d515ea41ab09390d84e726c",
+  "@esbuild/aix-ppc64@npm:0.25.4": "c3d5aaf00899940960a27f93a63d9169efc4ff317f10bc3608291678ce71255d657129061dbfa016a0d16fd7b6bfbeb9d37558e9113432f8ff5d04b8b8e54b2f",
+  "@esbuild/aix-ppc64@npm:0.25.9": "3a1a51a11958a1899d83530f381bc4d8ffc62fd3a2d500392f28dd701650c738a994bdc8df862f6b8666b267f5f91adffcb909be1673bae1277040b6a34b92ea",
+  "@esbuild/android-arm64@npm:0.25.0": "b935e4909cfecaf6166268edb337ac481eb79760230efe9893d09dfffc242915307edc890220ff1fe6378f9a6dc88043971a8282929e21ee92d5bb32d1ff33ad",
+  "@esbuild/android-arm64@npm:0.25.1": "88003e0f79cf75f4d034b3bdf2c0e9e44ad90aa10b6b75b7241e468fb751f5de5610afd4ed9fdc2febf1ddbad16b20bd376cd5aaef694f46a62763ba164e5ea3",
+  "@esbuild/android-arm64@npm:0.25.4": "aa5285109d86607c973ee8d20b582cb444bae31457982dbd3b004feaa4776d145d48a6692537defd8477f2bd0bdf06ff8c7e688dd07fe30b5d031c6dd434c580",
+  "@esbuild/android-arm64@npm:0.25.9": "cd20fb34e2223d404a1710715e3fc259e901e61cf594a4bb0c692525d5bbf91d52a906b9c9e7d7f0292fddffb4d76ec31989fb1cfaf732e6b779d06e728aab8b",
+  "@esbuild/android-arm@npm:0.25.0": "109a800ac79c78770cbc5f76c6ba8d2c3a3324c408748016429b5c8aad211463e33d8c0ed7a740f55d8df7a1bac4e78bc5029521f07e740731b7564c688c2206",
+  "@esbuild/android-arm@npm:0.25.1": "ef86951b4b247fc530180607da8d67671586f02859cd8b6ba922658c34c48135a1729df352308051efb4fd7856e01f60a90f921f4159a56fe9ae9d422ed948fc",
+  "@esbuild/android-arm@npm:0.25.4": "8c5c306e03044527fb2f4eaaeda255d7f40d6a3d02aa9abd1334d67a9ea1a5ab2ab654df77eb7e17e64947c5893e1ba53fc9d3bbefa15f0692e6b56823c47abc",
+  "@esbuild/android-arm@npm:0.25.9": "2b4e144cd6817407d748800548183b7bfee9feac7b77e70d22438c0ee51970d600865f9757f21c2e7adc7289fedf28a7805aa9456ef0a262b606f2fe0f8f5649",
+  "@esbuild/android-x64@npm:0.25.0": "033e21f87df0b0a50b6f54de5ba2dc20c232f008fc62c377c8a359dc27c6d96eaaf57fab8c87c829e36fb49249811bcb0dfb0df958fc2cd1a2311fe443db7a2c",
+  "@esbuild/android-x64@npm:0.25.1": "eb6e9285ea5e629983b065d6cc2bfe882337861fd4491cf497291cb9628b95d498e86bd0ea440e2e3aa9cd0bcb913cdfce6bd75c947b6d0e22bc0ae549ca6d89",
+  "@esbuild/android-x64@npm:0.25.4": "aa8665b302b65ca62e15a34e72e43d1ce7a253a354d8684cbe5ea1a04a79d1323416b46c727d6ab73a76a4ec047fb2859b054f8f80fe9ac1d286a4d00ed754e6",
+  "@esbuild/android-x64@npm:0.25.9": "d9c522016432d1aba5fe248c373f6cc0479685ef08cdb1b002b910393b9a7b178e52a6efede98dff8836ea7595557a2b289090a907ed5346d2643a7554d59703",
+  "@esbuild/darwin-arm64@npm:0.25.0": "d82d5f8b724a77ee7d65b7d47159930015135c7fb0fc7dc3ad056203bb97a1a933f516fd91f0213420a80c0a9ddfec954c952c554edf00629d9bc964313a3836",
+  "@esbuild/darwin-arm64@npm:0.25.1": "34c125754c2103eb497937df842eadf32acd2bc074de0918db43f51913688651003457e8d837cb2aea371db47aefa162a73bcbed7529efb3fce41e162236ea9c",
+  "@esbuild/darwin-arm64@npm:0.25.4": "81b4d0482813ccff8c783035317d78220a4ec3eee3798e50b804a781a071f5790c7903c2f9216a25f5c167becd4c3d78fcf0a13e454b3973eb7d82b7ce1d4688",
+  "@esbuild/darwin-arm64@npm:0.25.9": "61f3de9f8bb8fb67515365ea320d26bb1f1a7e497dc1cd22e2a9ffb1f04cf9b71017ca60b6ff979ec7a854abdda2b58b281bd3070aef3a0fe13bf5831af121b4",
+  "@esbuild/darwin-x64@npm:0.25.0": "ae029503666bfa48c6cbcbc991ac9d841e1f03f056f71782b78e57ac4083022eb505deab330651ee05deab76688cf3139bdbea84caea6491fcaf5caa2b912946",
+  "@esbuild/darwin-x64@npm:0.25.1": "0920b1622909f001028fa9c8978edd53ee3ec3cb6321a50f0b20ce67d5d82ed55a4acdb459800a4fe374bd70b953b51366026756d169a26982bbc3f1a7131f16",
+  "@esbuild/darwin-x64@npm:0.25.4": "633d97f18c299c8da3730ae04831895779b5f1271020cc924e06c6a5f0c5aac9f0653d60cca7d6ac23926797368301cd6ce2059b25f432aa2f1f378fcb34530d",
+  "@esbuild/darwin-x64@npm:0.25.9": "6e7dd258a63eabc10ea93c79b0d33867b19f40d74d8279f81ed67554e39a845d1c4688cbe661f4ef0b7600995537cd7279d0c5e681fe6a71245bd53648eeaf3c",
+  "@esbuild/freebsd-arm64@npm:0.25.0": "9f72aaa0c1845f3ada5a6a1cffa43c7683c25313455aa997ca8b233316a87d163722d8c26a0e86663c5ebbdca6ab91cf1975f0c0e7fbe062087cbef92c666b04",
+  "@esbuild/freebsd-arm64@npm:0.25.1": "5f30c81b55eb9586778e4f832616b2f66d8aaade864ac46e605d33c2b7daa83ef04485830e96cd138375b5b79bd9b765386c3d8abe7d88c2bbecc0ca19a628a7",
+  "@esbuild/freebsd-arm64@npm:0.25.4": "4d52cf4e18e1f4ab2fd80c4c4a9ab9c20658c77d832d33603b5d19b3ed4565ad7186b86e30a92b78aa11694d884201d0914dba649d6277737574896a897a2af7",
+  "@esbuild/freebsd-arm64@npm:0.25.9": "31cea93710c6835c6eaf8db5a6b90295bc6cd570b450773e14afdb06d7eaafa65a85d5687d0e742201c0e1791c6c8d7ad44be8589519d9c2e84cd2995de5eb8e",
+  "@esbuild/freebsd-x64@npm:0.25.0": "b96749a6d7da71fff98309655eb85b09de84416ae5c09a02e803342bba25c81e0ac181212bac49fa8d8cc28bfa5e1fbb8d349f2b4722e2ca2df2e4a383d17935",
+  "@esbuild/freebsd-x64@npm:0.25.1": "9b5086c0ba8a1c8bd19eeb4536f3efdee186dfbc954821e5d8e041d38e4698c2eed46ac95d72018a9914b994f1de12be9f5dbe054994a0a72e4f0dabf9f1a6f7",
+  "@esbuild/freebsd-x64@npm:0.25.4": "af75d6724969c4d831bb09209f4ddb46532516932db98a3e4c5c5dcc7f3cd0fe0930f2875fa901b8bb9c0ecfe0a65313da6127ea9387c63859e5d58cff975e68",
+  "@esbuild/freebsd-x64@npm:0.25.9": "b257a2a3f4bc4de4bb82e630856eb43bfeea858efcf89e585680c385b048df06c05cc320fe3417af80a142c392764af2e21c2c106453a0c9519bd0130885d378",
+  "@esbuild/linux-arm64@npm:0.25.0": "1dbf78595fed87287eccde8fb9a5e35d448ab3b7cd84c03fdfa47c250701a62160d7aa45b4de9ca5e11039975680829644529636bbe254e1627836c5227efca2",
+  "@esbuild/linux-arm64@npm:0.25.1": "202515560459ecb05044e0ae6079c0fbecbe863f35dfa5d2adc2f9e830a543ed6412aa277a79fd1e94d33c499ca5b5984bdc25124268950d8f95375f76999810",
+  "@esbuild/linux-arm64@npm:0.25.4": "72b7e3b8fe3bd27206577f8eceea1e0c289dc01fa2f5b03fe22f4ea27931ca664a9b93b35f9ae424e78552caec76330383fe7dc5afeeaffa0e00645ec143a49b",
+  "@esbuild/linux-arm64@npm:0.25.9": "773aa296a2bdab2274de049ae4d1daf4f556914231a9de06e96e9e9808e5428853aef9271aa3a866a075204b4c71590a5ba5bf3e6183ac4806c59b70ae2c6443",
+  "@esbuild/linux-arm@npm:0.25.0": "b1a165678166d006b32f965cb51719403fdea18c9ec2e498807f0b273b46a3a555b214d5d5f832393471180e1d39ca9f06e7bfe3c2c97c0cbc30314a38b422c0",
+  "@esbuild/linux-arm@npm:0.25.1": "c6fe6372e4870ad2d232c4bfe926c41be76cbd67143df8377320ae38971bc1cea50f342f88a31e54a43c4ca0a84e2c3a1accf780ba630b356b87eb51dc5ee5a2",
+  "@esbuild/linux-arm@npm:0.25.4": "407dcf9e8fc4ebc75689b6257be576047c03285067b5b22db74dd07ae067f8dd9126936dedfeb27934e09d0d700ecb3f8d70876fe61b90d92355f35c2a5d6540",
+  "@esbuild/linux-arm@npm:0.25.9": "564067cc9f949805834bf9a3dd071fc9d4ed77ffa1dda188106fb5b86383a9ff0be567610642f8b778cce90d575a28593db68589f4d9c6b69b7d3feab7a343c2",
+  "@esbuild/linux-ia32@npm:0.25.0": "21a136d8301fac7f23724061832426efddc2f9769b29b37e88443245ed0406f0b1f9bc05a02b6d0cf7b3e2e8ec2c8e1e8d99b3178a01ace6974369930f0020f6",
+  "@esbuild/linux-ia32@npm:0.25.1": "2719e82d4d6718ad034856e1588e9946e7390d8c4e2dbe61cfb6feec15464a999ebee477fa5189fef31517b27816b312fb68f0a496c6e8895989db2c0cbcd96b",
+  "@esbuild/linux-ia32@npm:0.25.4": "47b13c9952c893e749380551dfa3580eb562a0394911a9ced68b23c0cafe116614b30ffd6744dc71ec312fab8bc7115f856f078fe29f1253a1dd99d3215a1424",
+  "@esbuild/linux-ia32@npm:0.25.9": "a29cfea7fe73ad910e40971c82824f7df766c790967cad99aaa459be87333e7d964ff09741af4a52465b26e6a606f54686b394f73dc736ee78b769b43166886a",
+  "@esbuild/linux-loong64@npm:0.25.0": "f87baa1534a52b24198d9d845821f37bec9c4afb08307ee66c3f1d223d3c684151749f4a0eeb96f3905d365bea9f6256787256ff35b9f80fdd51ed7d4f8356b6",
+  "@esbuild/linux-loong64@npm:0.25.1": "ae79c5760e03418100376dbbd89ba21b85b31b5959035ac127c927c09acc097e3f24747e56496ce63f5b4a94a2d5e0aa538ad74060c2a21f4b5d6dfc69bbd7ae",
+  "@esbuild/linux-loong64@npm:0.25.4": "75222fb808060b3f2507aee40c6ee877a1ed768c593dd8f192e1ea640bddf3b414080407ddaccac6d0cde35750a7f92c434e04af2c142075dc810c5b7a7ce5eb",
+  "@esbuild/linux-loong64@npm:0.25.9": "16c020192d6bb3aadc208b5ed84e3e06d79c27f889af1c7be0ec2b876f59b5e868e77e976fe89bd8bb4261eea7fc53a38b9d67a5879773d11b5cba18d3a9f33d",
+  "@esbuild/linux-mips64el@npm:0.25.0": "2bfdec2d2730879795f6884d8f8a38a0297f0cd46bc3357c568fc59432d49d7e26c723d9b8111c799517628cafb469e30fa968387105079aa4b4b4d4192638bf",
+  "@esbuild/linux-mips64el@npm:0.25.1": "00bfc596edb4e20d0c267f6c8874a0e99960ecc24a8f1755ddfa31f472a35dd58de835982e0721a7641ce494b6947cfd271cf933580674c6e4451a371d0723ba",
+  "@esbuild/linux-mips64el@npm:0.25.4": "3f129931a6973a4fa470ddc46e3e3fa150aca64029951fe7a8d9616f41ddf8422d3744a30b0c5f36a35bff19b32b25c85bf1e5760537b329f18558e289213eea",
+  "@esbuild/linux-mips64el@npm:0.25.9": "3c58927449a856c92895591d797224135327cb97cc115dc794fef98b65b7d1fec98f7fedbf71374bc31f045921cb851bcc103f12358047c22be67f7d3ea9c103",
+  "@esbuild/linux-ppc64@npm:0.25.0": "bca7b660b91939b5d9f4942b4f2e404efad88fa166c51ba49474b3b5ba200213e1c44499c419d2b13c5afe01b560f361b46d201acc146d76515b953be497bd4f",
+  "@esbuild/linux-ppc64@npm:0.25.1": "cfab66cdb8ad5fe15ea74ce19b945ef7a9291f252f7f063095e0d718d3be36abcc85f9cac26463865dfa03970c28e7e4e6a93fc75adb405cea492ca6f22ead4e",
+  "@esbuild/linux-ppc64@npm:0.25.4": "6f84018eda99c3f06d519abbdbdf15700707236b8643ba24150d5168062ba310ee3c972645554b05d4b768438697a9a04014bc884a1beb15bf05bbe1b29e34ca",
+  "@esbuild/linux-ppc64@npm:0.25.9": "8479e472067788a0942c662c47a107190284cb1dcb08006c4b548430b99f88eb144447a5a67165443c0816284eb458f2c1344ed887bc00a875614fd6e0719449",
+  "@esbuild/linux-riscv64@npm:0.25.0": "dfb00cd66f717315b9afab667a484c67a69a7a3f6bb9e4662cd3dd0b7465da3feb5182bca414ce0ad0f7a95d0a1fd248c792561c63008d483146eff8af6e678c",
+  "@esbuild/linux-riscv64@npm:0.25.1": "ef46ca2ef7ae0f3f96a795317297ceac2a08d4a4052a133d30722666de8bbae20029ad1ef79c63adce5f66b7afc017bd4611c71ae22d8db34b60170c2b45c637",
+  "@esbuild/linux-riscv64@npm:0.25.4": "c5b674c2f48c5292f594141a4739f9f266ce8a1a2514eaefacc6fac761f1fa6c208981ca4c9e774c383ca33a46cad539b1fa46af6827cf89db721f33c36093c8",
+  "@esbuild/linux-riscv64@npm:0.25.9": "4f65b7e6a7967df2e5608719bf232ef1d39da8015f5b0c090b108469426859739ce96fd0c90c97e3ee49965931a4558765145e8362ba34b7b3cd9993eb971956",
+  "@esbuild/linux-s390x@npm:0.25.0": "4c5872f244ade04c71f1d0f14bd0d3ef0cd24c5404e55e33964fa5ce7b6f2e1283e9d9adb5356db76468cd85724f6cfdb1cd9674ad630344a7d01ca614bf59e3",
+  "@esbuild/linux-s390x@npm:0.25.1": "cd9a4641369c3df48da83895a2dfa66e02170ecee190fa817f03b659732f6b20dceb02dc281cfdfb145a4407e3aea98eb2c0587ff6d161d16de8d7a502112a5c",
+  "@esbuild/linux-s390x@npm:0.25.4": "a54c0972230a2264714371f6545ff0d9b20d349b08e4837e7063378886f88c08ade0ed5b2c7ba744c4679deb2f60e8485ef475f92cdbadca9d34f462a2724cc1",
+  "@esbuild/linux-s390x@npm:0.25.9": "e5f93356bc568aaae6de618428be09dfae4e837ce9a6ef5071972181cce761d10b9c7d3a42cfa8eb3b39e5981333a8a11cf5d1d95e20e193d61d7e15b8c9e268",
+  "@esbuild/linux-x64@npm:0.25.0": "22f6bfbb856653ee8cff0a93ce63947fd3bd4565c8bc7e9d437845fc4b44a2b3954b5e412b4aa4b63e62977beca12e0214b2607c7bc8c4ce359bd10118755df4",
+  "@esbuild/linux-x64@npm:0.25.1": "c73b51929e1dc770b8eb25c93551c6f6808858623647266b49a9aacbbf0b68ecffa6cb54bebd5b8c14c498a42a7631081033de6be4a35ff049dfda37e52fda3f",
+  "@esbuild/linux-x64@npm:0.25.4": "1ba32d40895c826e6990157a141e23d68fdf00b46d60ef3572a89781f177df75e023d38b130087b167a6e38410c3af0a6bec7b2d3b1af2a37a21c1ed70dcba45",
+  "@esbuild/linux-x64@npm:0.25.9": "68f9b2a672b1dfb552b360826a6c3cf174169456f5c1d7dbd6a8aa94c9b9c286feffbe8edb5cd1e970783d58d094fbffa132f0a9d639032acfed2528e6d3a4c3",
+  "@esbuild/netbsd-arm64@npm:0.25.0": "a8286e8b687857779047d005d4a540a693a2e173893a34273773d0272e9908006e10085a52788f54775ca231ad231e8a7af9270dbd8203b9182dbe2c7fee68b6",
+  "@esbuild/netbsd-arm64@npm:0.25.1": "a094af97cb886c65034445492d0679588e66daf0317c3567da2b529816154a581944e18888d2515cf543be4c4b7a1509ebcc7871d01c2ac66b9f53f56af5ea8d",
+  "@esbuild/netbsd-arm64@npm:0.25.4": "37bc10864f14c60f995e2ef13bb53102d0ce0eab1d32dfe5f48254aafe6d791d7129cbb00c6acf9e32b561db5420c5558b84800cf6958d40d3d55a7e3f456ebb",
+  "@esbuild/netbsd-arm64@npm:0.25.9": "825f875bd799219eef2bb130cc1c70c387225851f17331143ab46834818a5331cae2d29dbab14ed7183e027c57f1472220a8a1becf27813c87b50442598e4ee9",
+  "@esbuild/netbsd-x64@npm:0.25.0": "e618540e5e086cabc260010e62110a8afb5b0dfc445e5cd6db843d8a7541403decee971265c5cf59e6f1268b03e8fb50e27b65f709faf647c4e20e0916f19621",
+  "@esbuild/netbsd-x64@npm:0.25.1": "7461fd218fc88ae4b6534573bc84af995be0faa5b5dbd8be2635c12bb0d74c7c860487fbc07fd0487d4231fc3272f02f5db180d6c79e632f6e8f33138b626462",
+  "@esbuild/netbsd-x64@npm:0.25.4": "6875cc83961e613dd28f1c1d5c3b7404dc7cd4b54071596712c56574b1a24517424483c7c363c0aefa8259cf2d621e080b8270c0c242010ad04ce367aa87e897",
+  "@esbuild/netbsd-x64@npm:0.25.9": "333f27d61b99fb2388ee9d0317089069bdc890f0a91092fcfd7012766b2ef3c0ba499057a097657fc77707e9491d647cc8f07e6b93d31f2856b09fcbd0d78fc6",
+  "@esbuild/openbsd-arm64@npm:0.25.0": "60cc4ce058e03389155dd34f777d4d5cae1fb62f9bb9659c615ce5d70e8093a58aa89a9ebb8fde4d2dba56e5771c6aaf4442db45f4a1c9d54d6c36a149b857d0",
+  "@esbuild/openbsd-arm64@npm:0.25.1": "014da561c510c2f80a2917560a0d24af8a951cbb60fc54fb8b03361ce1fb2e9c8baa361e970509db4f4690fb039a564fa5393c781042ba94a76681871e787f75",
+  "@esbuild/openbsd-arm64@npm:0.25.4": "a7981586bbfea74746aa87113089020c73677209b71fadab43e6693c141b9415c342df01694e70aa607a1e80e9e37ccf4682dc2f095cae1ffb60c740e63e7d32",
+  "@esbuild/openbsd-arm64@npm:0.25.9": "ae8ca7bed39cd8d9788e9d4c3f066ec11a51bfba534be975d24b8c64d3daf9af95c134b80143d3bfcc9ae7a0967f1ab3f06850f76ad8ea1e85c531d5b241528a",
+  "@esbuild/openbsd-x64@npm:0.25.0": "7ba16accc220c711d1bcbb17ada40de4503f9ed54b8a42957345a8a9b9a7c55eac550b234c6a5a812acf50386f2972fb6a5b0381b38f76cff4b3c44ba38ae1ac",
+  "@esbuild/openbsd-x64@npm:0.25.1": "bc500e5610f6584c2c8412e9b9f2df827b83a91f0d3c04a91b6d031a2c7f0ee45b37984b4a7d2299c54e6188e6dab551f71bb38331e7fbb91009a8bc9852ff57",
+  "@esbuild/openbsd-x64@npm:0.25.4": "7b1bf4a5032e32ed3ce33bf9373964bdf29e49b0e16179e179d7c7dd0a36dbc6ee98ba67e0ef637ed7823b3ac094e21ccde848a066deb091bacc6ea4726a2ede",
+  "@esbuild/openbsd-x64@npm:0.25.9": "e6f601057b127cc2f168248071fc5cce3663b0ade4d8603f75e7e9660e5a2aeb307d786593fcd9572e7577211ab3e7b839e7e572b7cc55d41cd5dd8d46d86942",
+  "@esbuild/openharmony-arm64@npm:0.25.9": "c75a51c729b67314c6ea9b7388b1bc510d1a8353da965c5703669accb4718017202ca8695a1583f42a6761c873ee04f986e038cca54d9ce57e49bd7118b959b8",
+  "@esbuild/sunos-x64@npm:0.25.0": "e6cbfb0a93b9f78ef991ff43af2ab33faacf382d9b8db44bf53a80b3fc27a9d0f598061b9a77de1db9481d69fd43a3fd4b20a40a2938923fa52cabdcac84e972",
+  "@esbuild/sunos-x64@npm:0.25.1": "d915f595373916b96c6f531a45bfb04297ce199d4c8d86e1c980e6508af157b25e5e6d19a7b4bc05a657d08bdfbac099457bccd624c6da574e8f5dbbff9f0ce6",
+  "@esbuild/sunos-x64@npm:0.25.4": "e1807f6dbd3bdf2f1ff9dc404fe0b667dea3bb03825344728de264c4f15323e99e3f1d8125b5c39e2aae94d2c1cad344e3b8a77b5e8c8e0004f09aa12daa82d9",
+  "@esbuild/sunos-x64@npm:0.25.9": "22216cfed4d97193531a44b8db408081c210ce8366fda7c087f5c2f353b00236e9404ec6beac76685d422a6e971310c7185f8c8ab704414849f902ef32c1e426",
+  "@esbuild/win32-arm64@npm:0.25.0": "47bd8e32c90da8472515ddc625e6284cf745b1b9eeecf16e2e699b94b3d11c2d773b16944c8de33d857a8e59426601063a3df04433cb670ed3e8421def07d96b",
+  "@esbuild/win32-arm64@npm:0.25.1": "be20428d1e4bdd2a3e77e30127f8fb24fe073f7317b9aa3474d8a59a6e832bb93c323128a8f10841ba2d3838d7d8f8bb2bebf90ef196087f766d5a32f81c642d",
+  "@esbuild/win32-arm64@npm:0.25.4": "0422de25c136f407bc223e1a9a65a6f528e64201a1b06b7ddcf3190045914c6d68f550a8190d18e58c4e22231acc4c7982d45bd5ceab6a739e2c539d135376fe",
+  "@esbuild/win32-arm64@npm:0.25.9": "bb6e3e9c5acb2a2e5136c9af730f9171c83ca322add74aba54f960b0def02413f3f61d40d4cc86fa5cf867ebed7d9e9517eb50e5d7d7d407c5bcf213546d66ab",
+  "@esbuild/win32-ia32@npm:0.25.0": "072874686fe049446bba0ec18285414275ac74e8232307a856966ede8a822e72ab9f6119f7352f8feb51c629a20065dbc88f4412120480fe5bcc039dd439d0a7",
+  "@esbuild/win32-ia32@npm:0.25.1": "7f3fa011cc38ba05c31d07e89eb19aa1587720d8dc44df727e5d14b02d5b2a238297e88597cbcbba4fa2b8c9d4f2f96124020114b4981e533fedd8a8e2fe27bb",
+  "@esbuild/win32-ia32@npm:0.25.4": "5a8738ba94c72bc07bd17952cb5ba7f7f13593687cfe57792d36fcd9809082ac95ceb54b7739da68044de01f6d5d6826a2587ea2bce48b0de1c70f8de9b5257e",
+  "@esbuild/win32-ia32@npm:0.25.9": "807108b8615459830afe5a57656806641292e22ad53fbecded0d9b4113c5e6ab697f57553601defee1fec6acca0a1d0671e193ec5e396fb268e672ca6127a2f9",
+  "@esbuild/win32-x64@npm:0.25.0": "ce021c1bb895345ee30f363d89e1f3631040fb44d2e27e614b65dc697090c30c5b66b80aa9d6e5e3b3153010b37e523d6ef34c7b4f2248192b1b4bdd30701b3f",
+  "@esbuild/win32-x64@npm:0.25.1": "51a470813dd92d7ca58bfd30a2d94d7ce7a363f750df8164f359ffe28caa270d36ffae3aa8407eddfa5b214d173ada1a121ccf19c5d21fc36092634b9e5fea17",
+  "@esbuild/win32-x64@npm:0.25.4": "0bc72a7dc50b20d2cb7cd38a0d85ab3ff0c6467ba7d817a74da8c671703f97c7c7f7a7375d0069c3f0a76571dc04a1072852e711131cf4d1a62a70e7a38449db",
+  "@esbuild/win32-x64@npm:0.25.9": "8da054c6f1c7e3a0b59fc953a893b37aa32b9be22d47ef781cfc07006a8deb7c2435582608ce1a87c643c08c740f15565a9550b96a23f6c755775e9cb74cf8ed",
+  "@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f",
+  "@img/sharp-darwin-x64@npm:0.34.3": "57ccfecf25b6e21b3df16694a959200ee6d00ac150bf4c5e3787bedfa8f944cbc95c7130fb6d66b207a0bd987e30f302b67de35a7481909b9bc175581da1be6f",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "77a6a47fe9cbc1e6d1c66fd3f617bc64a8b710ed7cb44eee64409d49456dba054495e5ef8de3442e655ad11263ed19df554e9c33c2976e3226c121d826188587",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "334c823aa129365e7f71b3467fb3c37e7a0065d7cf192b08b2bf85d400a568da42cb236dd238ff35670f296ec5b81f08415e11c257e1c8b8df680923c3acd72a",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "c8e7d5641ed6d1a406d08b45536fa6a9e221024bad1b3b6e7e16942500c5ca3f5ae444ac141a61ed9b43f6f7e73ee66bf973e24a90fd94dfcf83d4617492c085",
+  "@img/sharp-libvips-linux-arm@npm:1.2.0": "9a854fff624303ed4bfdc7e936af47b3c6b07e486d0b366c8881306d49766b8e972c5a26fa53288b00f4b92a019b374bb66106c9d34f6fb23489cde5b861d2e3",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "bd4e956d5f01efc158e992047460be6b8cddb9f89cdd02f4e377a178da1703ed12125f161ec2eeb99de9d11232333bf501bf5e70b85e0e6f94f1cddf7d5fc954",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "6ed6d891c2ddae07fff09290b24c1ee3531264dcdb0d0d461279fa2168c196490874f84d5b5fa045a3063e76957fee0bfa765860db486779e3acb68ab743400d",
+  "@img/sharp-libvips-linux-x64@npm:1.2.0": "2a80a045237e56c5f4ec2b5c4febe9d95066beadff06bd936439f34bdd615205346dbbf996b5b4d1e43af6a128cdfd4b1a76d6fb36d9eb62f61a7248fb242728",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "4225b0af93ec3a600f81930bb0ac70671cb76917a033f5ac6033252a79dd04c54b1d1bf602f79877efd07d9382106d8b2058b7c9a2bfcb7beabb6861eab0879a",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "d2a47388c6d1ff90bd85fa0a93f8bf9c5855c2834736bdd78d47d12689e3bcd41c695788c6bef9a8e1c5156951a675e22dc51a0ddf35a7d56c96cae3e9f55688",
+  "@img/sharp-linux-arm64@npm:0.34.3": "a4ec64134484037e6a1583b11e39a16afb95eff963bf9c52deb17557b0a35dbc509325368040b04939e859f3b9531d64e6405fe54d13b3633628a4f77bfd8672",
+  "@img/sharp-linux-arm@npm:0.34.3": "fe4106211c93c566d3712302c081391435caaeb6ecd41e88e94e3e9780d0f27934a02a871d6280625944f625350c4f81871d92210ff6ae5511318248a4ba3ebe",
+  "@img/sharp-linux-ppc64@npm:0.34.3": "0671ccb3a25e53a665d50b2b52cd779b57a07f642686bbb7311c288c44b2d861cd1eacf6bd6883421c73cc5efc8fa8536280dd48fde9a6de8d287e4a99c9ab69",
+  "@img/sharp-linux-s390x@npm:0.34.3": "a5e2c3c14faa997616caf0a9296302c58b9565bb24f156dae7ad1770f5f984919fb34a0d1f59f0112205db060e8bc665842fd27621147786893619c51b81af45",
+  "@img/sharp-linux-x64@npm:0.34.3": "83a82d1a97b975b64be0ed6fd35fe87609ffcbfb7a068a7ea0e67dba7ecd71f32382b86a024bcfda8aceb4ed1628f4ee4a567c4e157e9cd3c9fafa0b225fe6c2",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "53f9f3f673441b21ea0a8d6d95b7ba8f051d4c2d2d4c4cb0fd83bb7593a56f854b255a1b706ddd376f8003adc6431b602afbb8a1ffe0850896147b24912a9504",
+  "@img/sharp-linuxmusl-x64@npm:0.34.3": "ebd702f0f88121b31e87db93a87839085605a02826aba5207e9ad4fed89471daf0e32276ef3e13dc289e53042baaa8244bd43c0768c0733e3a4fce02fdf30dab",
+  "@img/sharp-wasm32@npm:0.34.3": "3a64ba7dec1883eaae60925d77b04322a81d9c2d39359fa021677252df7da3be72f469a298cf2470f7350553eb30ee84e874d7032b06fa91ce27a81e1ec5f6c7",
+  "@img/sharp-win32-arm64@npm:0.34.3": "9328ef81ef6df02a8f83123f59c0addea7dd12681af3068e677ac274ed238321dd5522f2e4157b1a53ee0bc27ea22733263dddf5d4b65d2c5a2533ffb724f81e",
+  "@img/sharp-win32-ia32@npm:0.34.3": "cf08bf95ff895c831bd74c7c4567d6c4ac20100e0d1badd0a9f7100486f3f416022222e29fcbae79b379defd1f0bc13adccc16c119fd4705d00c11c35ca9988a",
+  "@img/sharp-win32-x64@npm:0.34.3": "07078e460f2749ad6422135193bacdfea1f223fab9f8442b5c0cbecb6d3e92070dd0a968219ff386a03930ec4104162627ffcad5b362ec8dc0247848deb52bbc",
+  "@lmdb/lmdb-darwin-arm64@npm:3.2.6": "24aa52f4ec93c28e0c42b4409308f04c641103e7d5378640290093c886f0d7f661b6bd0fce865898f4c81c0eec1b84dcb55151cef037ed5a003dcb821b637da1",
+  "@lmdb/lmdb-darwin-x64@npm:3.2.6": "c10346c9c46f5cbc20e37bbad94c13a152483e2252ed9c066f9cdab9fb94c3e2461cb483271bc423f538a79fff9b31053952be99ca6429c2d2f9fe61adf6ac31",
+  "@lmdb/lmdb-linux-arm64@npm:3.2.6": "1d8a8d6a3723a4337c42dbc8b331fd010bcc8ee440d5cba9ead1cd733a0fe445f30440774b0c01ac3210407fa0dbadbbbb0648ff567369161a353a129fe09598",
+  "@lmdb/lmdb-linux-arm@npm:3.2.6": "c0099392b863e0f079e0fb3cce6cbba93506531d998ace175566dfb8e828ac6938bfd84a7f076b842f1e033b1f3069a4f627391962f845f88604631d30519c70",
+  "@lmdb/lmdb-linux-x64@npm:3.2.6": "498a9c325ebb9678852b6165a5bc7ef14c399b078a390212fd90c37ae2dbfe8475c79b6e364b013dd9725391e5912a421d2fd8f035c5cf6a83c831ca6c9e7010",
+  "@lmdb/lmdb-win32-x64@npm:3.2.6": "825c811162a90f6f74ef5b66f6db256fe3ba25163594c4b4ec59e30ff5eedb2c1d993b043674984b03f46259baf364b32af8f2c3c2b12ed399cefb033549693d",
+  "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": "ce4bfbfa35187ff8ec3c89a1cd0ee4563b811e8990d2dc2b90da7607de6a653482c780b9f7b670716850cf58834d106c1be11802a7aed45f23e80f4ec61901ad",
+  "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3": "43cbd79892d9974070243ef89205eac56893fa5de06b6c6a6ac31692d59e53091b7b500bed7cb68920eceb4091318b2528e676de5264d1de86500da97216e82a",
+  "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3": "d1261cc5bad94ae873f4b0b963d9025f738d04691dce542f9caa9848248ef8fca483d11dbd8a9cd318b2c41bf8dd74e63ad12dc7d187b88f912f61be3fbe3b51",
+  "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": "5f94c97a3fb9d8a69edbd36588a4b24b11048e156489fe1160cd15d61e283759c068f510f0bde8ba5f9dffeecb2cc5e77211b8a3237fce99dfa4a5e288c0d583",
+  "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": "f950a67e371e80de9cc2b19efbe191b027340314aa19d2384b12036cfb393de4a703845a36b27e8eb01b2eaae4d974c16dbf16d44b977f1dbb528896c555b6df",
+  "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": "edb796b289b77f286cb3b59b794e13b67f963c04f1c1f60199365f1ab763a6fbee26d33d4bbfefdc4d6ea6bd5ed0ffb51d49e5d624b6f8233ba4fa1060d4b38a",
+  "@napi-rs/nice-android-arm-eabi@npm:1.0.1": "ad03e9ad3e47dc38be026d83fb0538f8ab5156cb0b47c2e88b029aef1d65c8b83fcdae5c8ca612ba5852bae333c379ef3f195ffe86a8e84d48696f716eda7364",
+  "@napi-rs/nice-android-arm64@npm:1.0.1": "d9283d174af5c076f13f8b08ba012b7d1e5404e681b2da5c6e51d73130a723b9dcf9de601b41524bf4ccc0e554929c9d159d92c26b5343e25b419b4c1ffec6df",
+  "@napi-rs/nice-darwin-arm64@npm:1.0.1": "d2c013a1d8d7bba15bff8554a0dd5c5cb3718ef9a9dfb7e8219e739422f1c6ea32689a17525d529bc3316217c26f16f2ac9ad8fb22eaa502b1dcd03276492e8f",
+  "@napi-rs/nice-darwin-x64@npm:1.0.1": "7bff05ac82335364cc6f0711cdb80c3e802dfc879e0aff091a2e6c8ac6d62d1b80f77daa67a0a493c9df7f239c598bdda307e1636bbf6d81d2c9bdec2632b9a7",
+  "@napi-rs/nice-freebsd-x64@npm:1.0.1": "f3c00d7dcef69b874f7e155cec696c05c481a019b8a40aa57da0ee67cf33433b30dfa2a1ec8d17d89b90992fe29b23692c0dcbfbded5a7ff6de8fbf970b1320e",
+  "@napi-rs/nice-linux-arm-gnueabihf@npm:1.0.1": "e6491e589bb5be58d8f0e2114156036fe92c34dffac9297076bec031d6738a53657b87ab8072595c36659798de57207359cdb3903703af8358934088bcf3e61c",
+  "@napi-rs/nice-linux-arm64-gnu@npm:1.0.1": "1fd7d01c10ff497d7d37749f2de8c602ed28a9145c693bb3676fa57d1789fe145fb5acefbbb46c5e386dbdc33d5f66e448a1ac4d7fcc80c46c5e2778d0119224",
+  "@napi-rs/nice-linux-arm64-musl@npm:1.0.1": "bfd1b4b02da0c5e4d71e8fd0bc8be0d1af344fabc63565d5ac6b8212cc91cc69bd980199ebf4e5ca9794bee7cf6444b9352463423cf428f2f8f4cde23a2ac319",
+  "@napi-rs/nice-linux-ppc64-gnu@npm:1.0.1": "e3ba80bb29fff1405ef925937b9c45bacc378e5a2813e983534a6f75ba495d27de4be8156ef7856179a4f65c9908b967b0af79f9a9267987a9d3f4180e132acb",
+  "@napi-rs/nice-linux-riscv64-gnu@npm:1.0.1": "5793c5a406daa97f19a0621d266a6b536ee22a797af4771d442bd9c9d90f56c875f27cbdf654d3445a5a577494e5f79bd81732a5c164079f6d5ede4bc36c4d3f",
+  "@napi-rs/nice-linux-s390x-gnu@npm:1.0.1": "7f568ac1686c2cda9bc264ee29ebd140d1d0800c9f0094675761e8043472d2c9cf53259e2e0cc39bb0f03e8c3eabf594f0462e6c2e2071bfdd999955fb611840",
+  "@napi-rs/nice-linux-x64-gnu@npm:1.0.1": "7d7f34e151c4051e72e86dd3ea58b146fabe7857c3346bceec27d312792f050b5de26f2d2b5b82435fd47ca699b28614fdf0d5bfc369da9199870a23cd6d14f3",
+  "@napi-rs/nice-linux-x64-musl@npm:1.0.1": "83cf4650e7b388dddaac728adacdc693d688712bc53b84efc1517c916e56eeaf92c5d75bdc19e7c4115533ce4a83bcae7881e437ad87f013dacac072dfcec5f1",
+  "@napi-rs/nice-win32-arm64-msvc@npm:1.0.1": "022aad4fd8f6b065f6e0516f6f99e88b9d533e86903eedeb9ce077938fb39267c7fc14fd05c43d805769259c2e293df6dffa1b585f7843a18659fe49866a6b3d",
+  "@napi-rs/nice-win32-ia32-msvc@npm:1.0.1": "d6e191dc3420c68901d5bffce332b37b6e506604a4bf21d1ebe7713950e1491ff156e9bba0be16673da293ceff3be075f975fe526b749fed82514446b5aa7662",
+  "@napi-rs/nice-win32-x64-msvc@npm:1.0.1": "bd0b5bd57fcfe879e677d9bc204582cc3896e84c2b021da52f397488aed672373bc6bd6958217744a3357ea89d62d8145fdf86953e0c75559b639c53b8f48266",
+  "@next/swc-darwin-arm64@npm:15.5.2": "46b3738c0ef12d99bfedcda6782e2a75e05606089d0d7d59e9752c56db914b932dc54ee38f821fd64dc6d0f71b72402d21d11327e83418fb9444fff03a1e7280",
+  "@next/swc-darwin-x64@npm:15.5.2": "f26625805731858319df090dae1eb8612b328846513149987bbe1e8c4bc8bb86172da89bd7684a8b055ba449ff164577d72d5245727758bda565de99ea4fd855",
+  "@next/swc-linux-arm64-gnu@npm:15.5.2": "a6c40e59d1cbc8c8ed74b1dabc8ec28a30407aaf478f05e435456b9f6a90e3b6cb045318f50b8b9e79a43f43447af2042264b4562ae2525cf5e82fe377f4059c",
+  "@next/swc-linux-arm64-musl@npm:15.5.2": "7f6ff8850667a341720a7a355bb1d838145bebf1a6f8e4dafe33a68acf0a8b0d8b53d9ba214a6020f19deeed9a95267bfe1f42cb978684626f5e3a86ac090c7e",
+  "@next/swc-linux-x64-gnu@npm:15.5.2": "6158ead4481b995b5d466ee0e3b653585ab4a077f988dcc6b1f61dc67fb230ec86c51b6b35b86e17436191387c51eca3365af98c14fa2800e25816a56f2673f8",
+  "@next/swc-linux-x64-musl@npm:15.5.2": "2c93d6cce2fba7a8a8fbd3e135638aed29d1c371a1eb35038bcac1241a9dc0e4878bde7750bfeb5e7d48680a22da17c2ede9573e68e64a355dd4a4d7cd7ff289",
+  "@next/swc-win32-arm64-msvc@npm:15.5.2": "593dc1760fcd73846b1d75aa9f8298fc170820db8191f548de9dbe8a877915cf37a49836b789060aab66c34bfbe86ef6e433f92ef6135971a7fa482da4acfbc4",
+  "@next/swc-win32-x64-msvc@npm:15.5.2": "b16645a21e6b8a8d738748636ea2b7132c96e0d2bcc77ef55baf9aa27bf167c32a9e658b17a3d9a0eaa44679fa9a62e62b65d592df2abadcc86515c7693eb958",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.34.8": "52c8fa00eff53e8840e017388303a7613286068133027f734000c84893dfdf1e1dd72bc005ab1d7c52a82fd1b4fe6b7cd1e73242be032ba6d680482e63ea1f70",
+  "@rollup/rollup-android-arm-eabi@npm:4.39.0": "67fa54fadd0bb5a6e9d7df15ecf8971b799cc36ebeca027fc6edb4801a3b809fbbaa127b34243dbeb95eeb4d9331f5b04827abc0b358f900fecd4696f49ac48e",
+  "@rollup/rollup-android-arm-eabi@npm:4.40.0": "4d507765ccac7532b9638121cbd01259c4e76ca2c1188fb1a44b0c454023d69548d9a8f16872bfa98053b71c90c7eb035ba1febf6cc10eefbce238573ec19bf4",
+  "@rollup/rollup-android-arm-eabi@npm:4.44.2": "d44ff495052b0185518d1c07648b3759ab520b3b6e34c052160b4e9e46d35ed9cd70e3fc6088e1f343e60d8d3d0cd28dec09cee2e25d26cca17d0e15ffb6636c",
+  "@rollup/rollup-android-arm-eabi@npm:4.50.1": "90ccd8a9ff348a7d0962dda730d3663daec1cf20798fc6011cc0c937572826c98a0baf16299206644738719cea9478396a3746ded1c9f16d426c150b6b99ec53",
+  "@rollup/rollup-android-arm64@npm:4.34.8": "49d1e177871892244abf4bf6ed5d5b3f5217ecd9de56e684b917e43f2942264d3d296a381fdd8847034065d1662a6d414087239d334fead73ea259160f8625e5",
+  "@rollup/rollup-android-arm64@npm:4.39.0": "d9a55e94274cddc4b9a52cee24cb723426632a1b759381f6f3b51ca48b90616a74642c5e0d6343176c48c8287cc2464f7b58cf225e14dac08a80da87a6cae3ae",
+  "@rollup/rollup-android-arm64@npm:4.40.0": "0b8b77ad8aa62a4a7c349dd2352ad3c7d6767a993607db28ccf8126e755257c70a356481947129995fec0974f8b92afa82890271ff459f9226dd9f166a9716aa",
+  "@rollup/rollup-android-arm64@npm:4.44.2": "f00d7f1f99fad636fdaebe38bd3fe467fb4e8c9f06793e2b02fc56b1466fbdd652413fa613e856e8c266ab87bbf374fbb30fd43d8cf3786e5efbdb8582e8441a",
+  "@rollup/rollup-android-arm64@npm:4.50.1": "7cc9a4a1b8553163cf3e94ee3afe1c8c3b036802274988741c9269ba4fceeb0b88ef70b6d5b845e1aaf570aebd0f2ecdedff668f76fcd00a635d530f2b2fa3d7",
+  "@rollup/rollup-darwin-arm64@npm:4.34.8": "a95e59580ff3e195d340dff31cbf47dfefa624295708186b7865c2d5a001f18c4b54ed849fb618d966716714a053864361d3c08c4444210b8a350617ad2a4f73",
+  "@rollup/rollup-darwin-arm64@npm:4.39.0": "e13a44b2cbd92e4bf4d4dfe44c9e3bed44f6a437c63979099942a6c6423881a707eedf0934e9c893b6a338d9f375ee2449230c33cc9c561ff39ea4c579d659eb",
+  "@rollup/rollup-darwin-arm64@npm:4.40.0": "b0a0e66b07286c50f754220951743f0db3fc7b95a5cd5abd69c7c26b89ea470ab3699698729498bd031167f1a79943be2c3d93bc696c10a4c29832ba525b0204",
+  "@rollup/rollup-darwin-arm64@npm:4.44.2": "96ce8e3cba9364f21b07389dae47ab5532ca14be4075d43c5642d337d13acc5b5e60ec721e5070b99fc6d657864988b642ddc859118112cf017b952bd3e71824",
+  "@rollup/rollup-darwin-arm64@npm:4.50.1": "746b48a675b0f93cc1a4646053d266f81b39a824859c9ecfaf042364358d9e0785a16b6044c8337a8e87c7590e5439582624ade23218a68058f1dc75274ef9f3",
+  "@rollup/rollup-darwin-x64@npm:4.34.8": "dc622672dc2778ecd4c1bd2d3b433a41da3cda161958ecce561b1cc29b1d56f21f819bc7f6403ae001ee0f2ec093cf6f064ee0733eab38888b9461f932e80093",
+  "@rollup/rollup-darwin-x64@npm:4.39.0": "ecda22160d9562330f31a68c445f8613bd2e306cdacb966574cbcb11344f1e77dce068307c9ae2da1bcf3c1353fcabdfda7f5f720e6f4247bc4c92a2ddbb9882",
+  "@rollup/rollup-darwin-x64@npm:4.40.0": "021b2ad6de640c3a2a16282bd8bed11101430690bb42e00284d4e3ce34c4ef607d5352be851d790add523136cc510cc0062a79229f39dae528521469a49014a6",
+  "@rollup/rollup-darwin-x64@npm:4.44.2": "3f610c390c05b2c2d6e4060e7e005beb3d3737323a8b4fb7879ee8b576eeabca4345bd1f7d6a29efa7fab0459a8d911c60c02222a9cafc30656f12a817a230ea",
+  "@rollup/rollup-darwin-x64@npm:4.50.1": "b6ecf737c66e6e876e84c6bdf819c20346f2f3734fb54a6c3fafbe458014c6dc750c339f19efdc88e7e340053bad57a2adf248dba489ac5935832450cf7d1022",
+  "@rollup/rollup-freebsd-arm64@npm:4.34.8": "4307691354fd6080a1092331bbeb68232c0ce0ea60619dec72edcd140c1eb9bd4620482ac7d4c38bb4aab9e3e7106eb2758f82686308b23cb17d0b5495040b72",
+  "@rollup/rollup-freebsd-arm64@npm:4.39.0": "08d734630bd862caef29713262fa9f1b913c991b269387dacb096193b6190bafd683d5fd3180f55f8d7d12cf18134871c02a62c8a2491d3cc57fdad48f2fb7c4",
+  "@rollup/rollup-freebsd-arm64@npm:4.40.0": "fce9a10a8a688257fdd365421a45d35a3fa557c100674cee6a52e90d0125785a52fe476efe58afaa3aa230bfd45e8aadc66188ad5480e4bcaa9de31dc02d58e7",
+  "@rollup/rollup-freebsd-arm64@npm:4.44.2": "1f0f7957ed02e8a758096ec03198142bca77992f0d43744fa41ebe5d7a58205d70ad3615b8d0b22b612f671a920119d0069743e596024cace0706a6fac87b013",
+  "@rollup/rollup-freebsd-arm64@npm:4.50.1": "4c37734cd74bcc6d9902be6e58a65a33e2364831b2f54a9279f71dc86fe03471b7e24e247381d28aad90c7932531777213564f2f9d5413adb0eca93b1005e253",
+  "@rollup/rollup-freebsd-x64@npm:4.34.8": "9b1c96b307040cecf29c39b914558c26f2f2f52dac4e9c4cc215a658436fa97043a606d68733180e05e0ad66d5c6632c5ffe2be32a1da97b92fb61c729486cbb",
+  "@rollup/rollup-freebsd-x64@npm:4.39.0": "1fd1945fdd39a220f4176fec68a10fac4e395290f836b43ec9ebc272d87e2aa3c917db1a813abe6c7930b3574fec6c97c0014bcb6e7e24778effec2fffcf0926",
+  "@rollup/rollup-freebsd-x64@npm:4.40.0": "38ddb05c107f622563b96f18493bc0f1ca41ffa2b7e80deb28d4735ddbb8780e2d8374b9cc740a7d9a316d8eafdf49f98f548cc993f44f03e2c400e9d750665c",
+  "@rollup/rollup-freebsd-x64@npm:4.44.2": "81c91e10d1d34372bf81bdae15653956fc8d76c6081c5aae9e37d68f0b8aa1f83a96a12081a7eb656b30f2b9474d6c36b12801ff4ca86868f84f05a4cd9c6a58",
+  "@rollup/rollup-freebsd-x64@npm:4.50.1": "985a27ce38b6544e56cf0a93b4efc378c44635958180b91ff242adc68cd9e22a312e1ecd9ca5be9aab6e5f22ab8065e7d268011d1a80b19e12f3bd53ce5bc29f",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "0d616bdbee859b081b87f6ce3faabd9580dd914e84710e6f05bbd89b1fcbeb24a756839851e0889551554e3a6f93c3579d917fb3e166b85f3f672091c0497ade",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.39.0": "7d41df315c2041dd79b2a115e26ed25c0910ee9d80c5156604a8130bf7585a09cca88cfabbd632c6f6194a472126ff57d556c89685097c5c94d5b3e7a7f221fe",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "f489082b9ba893656692362e9b1972da5f12258ed12c81fbdd910dee822cb475f7ddf754659c3331b8f754692ac33b3c530cfbb178803794339eaaa3de7f4a64",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.44.2": "d4f7b0db7e325f2b2a7af9b2d7ce95de1670299d8e6675db35a48e9e27e8e95e60187b85b710ec6e58383f726ac52785152c7261710ea2726dae27dbb44c9efa",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.50.1": "8be28c7acbca9d6948823b1b292426afb2a6ef24ec16532c2beb394b44fa225b252a19a3d570e7a8445720bfc84c0ca1e5574c9c852a9784c30f758e307f0334",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "11439a3909996147719ec4b061b7fb3b3fe77a15a2582a83b095b88f3dc428de3bb3e34a10e618b8c57aeec06c4c19a14632e36ac08dfc3c9ade3e6c55352be6",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.39.0": "8f037dd06639394c0b27f1803d32f3b27434206a401ef587af283e5a8b86b9b2e2c1f1c2cda186f6f887717558b26c1dad4cac7e9f5b5e7dd9dceaf918ab44e2",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "e98e12c8392ab38c76ce04d19ba5105abdc99e968a8cea8c98e16827b74d133899dd5fe4ab1c109719a0a32376cea86acf76840434b96fd9b8d7641eaeed2087",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.44.2": "11c2f1f56cbd7bee75ee8ee70f4b68e1cca334d314aeac421834b18a8b13657bd0a3a10489a1785a51b00f359a38cd5bd481a75058f44f7c4bcf2a07b07020df",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.50.1": "10f3caa27339af674c8dea27dc3a6ef3dcecf43f5f976d245559c3e7268dc77dde406cfa35e0f759dd66b54cc744f6925039ddb4a467f0f638d441c560b6de4a",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "c19cafa18d2a461e77f65e0a1142f362244df1cefa9bff0934514b2a55eaa0e4e64b776d30b72d3b84847be20dc14bd52d19ef189e103bd464f982d8b33c75ba",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.39.0": "94b4544f904a4321389507ecc42cd865fbe5aa83fdb8bf13bdb1c58b3a62fc0679f6c2ad10bdf8774ef17eff375f246b013e4201d3e3e458d7e21e5fb3ebdc05",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "6b78d3c657aca2331158654bf26f7b33a50f5ee69df9c40aa7ab3861cbd9f558d6fd56b538fe7f070300f81513f2f1d4f466aba3040d19f4ace35b3d274469a6",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.44.2": "31731dce4972b67e689b97d2ab695e77c2134c8adaf13e3363ce589af702c5f6e4acbcded6d302dddd2bd3abaae1686264bc8d921edb40d8fcfe811bd887ca7e",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.50.1": "7b83b6bb5e8b8634d880b273b0a62d589745b44e82ad887fb854c2544af4091a14115e13f911a29111366bb978da894418260b310fb79e04bc83f93e0601e680",
+  "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "54743996070942d7ee54928ad5b4b4f00a3bad840b0886435695c0a4bcabccab42e221a33f0d17a37ecd2ee5577903585e544212d9e218aa1a5a19c77b5df5b8",
+  "@rollup/rollup-linux-arm64-musl@npm:4.39.0": "24566428c40ad7a62f11ab7917546c5b11efc7735b757895cb8930446d9ee255521b389476b4d33b3da7ea82a1f1639167698af1e845c1e63ab7f7c5f452da43",
+  "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "ad51f17187757817454520e7cf89458cfd8e062319e3fdf89f8d9d466c5df3e7e80623543cd34fd89273e9daf67b17759cc18b31d1ec9270815ffc6907357bf6",
+  "@rollup/rollup-linux-arm64-musl@npm:4.44.2": "e7c93738b807ba618d2f77edbd2e242e41a4bff20dde0d07bc498ee9a05f5aab8a1a656a2f3c6e70357a4aea5b424f0666b98424aabb99f6fd3e63c41aa687a5",
+  "@rollup/rollup-linux-arm64-musl@npm:4.50.1": "69051b3fb5615e2f99527e6d6fe5cd8375c76e8e17ae979d608f3e0e62b2c7e6b9c372132c72a3a0840febe5064ece956b8101054f300ec3e016800fa68360e1",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "ff0423d7ee90a314d75ddb4fddfe48d2b19e48ec4b99b61f7ae764c79a789ac298b20383a247a20c720fac5ce610e22c7bb567b27182e85f75f99952ae8613e7",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.39.0": "72a844cc8bd7d7ac91baa23a14fa7eb838a3335e6aa3429b08ad0beaeb73f57be4a04f033c278536f9a0c6ea8d7ef2b21e4a573ee5b9aaab84121d97a228903d",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "962e93930087e9a8cdee3db404edaaefa3353f2065b9d45700e60e475ec0a99ade169704847c0d34b2ab61568bd9f734629a3913d828c503ac17869ba01a33c7",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.44.2": "e0039176ddbe0e4b17e81a3112719ad18ca6dfb95b044f5e225f7fcb76fbd2aff8ea8dd5a20e8af7582d89b0b32ef1a36a27e43d87c3fb3f8091b5704b9f642a",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.50.1": "fb7765bc241f5456a045c61046aadc5be94cd62021a51b081f3b8819aeaa1fce12352f2b89399388fbc14cccd3f5e66baea5b9ea20a8e60f02a32a04a744ef1c",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "ffed15556313e1076465ba19db95574e794237fa385beb4fe5242ae86c4cdddf84adaa46c7459a3a22c88636334167b488f971f7fd2aabc4405edea6326d573a",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.39.0": "b758097e4a1f66f3d5e840736d69be0f2733c769832766076a9414b80d8ac2cf2dfa1c709ee1650a9424ea135fc94349c0ea35e647d88a65641e4d516eb73b1d",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "9a3b1e7765cc1de3900f0e1ed4c12d841376b28d5c364efea7c63947b6bda4b05e4569d83e73912d6890130484b9e046e9dd4e91c4632d0c74efa02187abe042",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.44.2": "2ba3325590a423e8aaad5a056a373413abffaa40898fd795794428659ff747d03c0ea8cac979e7524f9a3898faf05da783eca86b63204d3a1a4ce9eac3a2ed1a",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.50.1": "666b5634e294725f7eb6620d2f94cc2d1a116cff11d92be7ca032811c9e5a6367ce546b7a7b7affc8794fc8cbddbaa8c302efc128855a3560b8ea1553bbbe789",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "beff08ebcb7ce824a97cbb202c780e7e991c61041ee8f8ce7334f74a9f7f2b18d3901235e09a527068f3c1e8fe63e9b2e3c5e446e0f773a11714b9eaa7a835b8",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.39.0": "9136d3172cb5acba4ff416b064ef31e6fc94a112ee7f428626f6cf62e5944f02a0a2b0d355db90e7f94b3ad1e8ee9d6b862637b5ef0db601440a7b27a131b890",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "1a96bd4aaa4c9fe11d2b870542ded1758328408dd71f4dea2bbf1776d10f20970445de7ad464682d01bed3b8788de1b7f8f3b3b4fe62e88f311361e936a1fa62",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.44.2": "3090ffd9d6460c5ddf769b055bba221cc508b4f0c56b043c4453354e9a9e234ac56c4756f4d724dea9d23db59f0cc288acd0fbe276ed8b201484a83868b66454",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.50.1": "817248ae38f4ef3cab1f305ae870d0ddad8d7fc1531ada95aedcf123836d573f29cd002e9f84a2458e82b0686ccf86f762ada155258365151e304ce5166aecf6",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.39.0": "5351c41030f68324324c0a6437d2bc0b89637a5c74892a65da6d156217cb6a2b8d9c466a5c2e2e0f04fd77dbfafd0c44e6d39a2a95b20abe9bf8bba5be922fa2",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "5ffc7589905a89a69384b53bca8a25203ef208c30fbdf83739cb8277473b7567c96376898d940a871917d960fd267f878f1b35c71802139a2fbb54252b9098ad",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.44.2": "d648965919b496f5c32f74c89e0764c50cc193675445e106baa29e9cffb63f569298b923157d40d9590c4175b3640b1686c4ef9ae7a01bf9168dd3bb6d7ff89c",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.50.1": "9b10eeb7b71aed8fbe54cefe9f1fe38caf401d2f64439b26f03b15dbd95570f8a9d2154340be7c50cef5df3256eb062fe0c5ca1eb98105c2d7257fe0fc73fc81",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "ba4eb8884458a0e4a530fa2af951541c5cee1da32759bea3288a185d6a88a2cb4ba8cb79db1442cee76372cd30dbe0e84b08367832781541866a56a16af6e6d2",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.39.0": "9adf9794d4fe42bae92b247d2656528736c0df334c102a82f63bdf416667ddfb7ba1b5aa9fbf45d55771599d21453208fe9c128adee11cc799040d821fd065d7",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "0342c5f2986150d7420fc16f29105f29affe36d38422d3b2b4b821da34f65b07557ddaed4d36e0aa6599c1c6156a4489b3fe885b089c12b26bdbd002771b5e53",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.44.2": "cc1568916f1609da502e762355b835c98b383a3426a1850c762e65067a7d877a573ef11a3160a826d85c6bcbdcb8685d60c91be51cd80b0cc97412a95df0ad54",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.50.1": "84f8df6cb43001c2b22d681b08a557177aa3c62ea006ed0b2ecc69ce21727e078670d83e31b6067e639df1cc0eefb78222562bc81f128779c50c3e0b58efc3ee",
+  "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "f7cd20a88c3142337fdfee312031f82970edd18579c4116a316e23f81429e73c16ee1b5f255050580cc9557790650642d26f69bd4b4b22e8703bfe4497f50c1f",
+  "@rollup/rollup-linux-x64-gnu@npm:4.39.0": "4dda8acaa1c91c715f403c5e356c71f6418f7901ce641b3854e4fc6beddde4a6d54aff1a784350e9380d2d1656dfbe1c0179187227f9aaff330323e23d148566",
+  "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "9219541d8835d2cf04688ad40b3cac0f35c6e4ca2157a651b20228e241b1749c43b65f6bccdcbbcead54aae598327f9d508a74e0465957fff12ef3024a81ae7a",
+  "@rollup/rollup-linux-x64-gnu@npm:4.44.2": "16c564a95c61ba8a36dfcf83957eb2bf59eb89a90f7de145eaf985b46aa223fe27d752f83da304ef0f7fcdbf24e5b34c95b94fd37b6cff6fba0532e2e69d3dbc",
+  "@rollup/rollup-linux-x64-gnu@npm:4.50.1": "17826a16e94636f9e8a5524a13bd52cfbc47e2dfffb5cc6744cc182fbcc76f0351850418093daf314f80d5965b09d0157d3b503a4e80ff36d040373c1b95ec7e",
+  "@rollup/rollup-linux-x64-musl@npm:4.34.8": "2c72840440062d011bcd5c1e78d693dd92270c790a59905641fdd414eadb15c7381d3def36c5b9be7f49f2fe6281bdb4461c32d792ab31020bb26138e5c38b5d",
+  "@rollup/rollup-linux-x64-musl@npm:4.39.0": "910644f9be269b1bfbe995444bf99d1123f0e78f2db2babf91cc1fd415a9f7d9052ac42e3092842ed6888544e5f788ae863d2e67b073a3494ae34ac52aaab598",
+  "@rollup/rollup-linux-x64-musl@npm:4.40.0": "d75772c17644d8522d847014b5e6284b7b7703df5564f61fc74eee4fae9d5516203f9ca5f05d6c8d64cc3d88f86ab25d4233d0b5003fd48069b8520491f4d7dd",
+  "@rollup/rollup-linux-x64-musl@npm:4.44.2": "e371bab526e48d5f7c1eb988dbf8274f0f1bd47b3da99b06e96fd078ec05ac2b66bb4484f276eeab52c6f070e1e92283b8d10b10b2c7d0ce95c1c0542d159c05",
+  "@rollup/rollup-linux-x64-musl@npm:4.50.1": "a621eec14e6bcd39dac234da8e6adf2563d41271737c20f8f6f1898f619e5ae9be65f98228e3fdfa1b88f5579214a97feca0b5221ef09f114e6797cd4eaf6d50",
+  "@rollup/rollup-openharmony-arm64@npm:4.50.1": "900bb0962ad7e5e753a03efa59e1562f0942d40fa216e741bbbf7b4cc736cdddd217aad01b0f1a3a955b182e4039d83ad90e1eccf176e9f9c439efd85dc5b384",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5ac8e7b0ebb441b2f35d3dbfec3f4def4083a33681f57dfff12b4ad5c57b54855d48f7ebf3cf719c815cf25f51af53396840896a977693b70b40f373d61684b4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.39.0": "c15dc877c35f43d6b16b3776bc0f4fffe1c761f60ccd937593ced8e7a5b73e9ffd156f078f6e820fea9d88bcbc5b15467b9afd687a686e94e28fffff1507971a",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "71fd6af68890af51653646602b23403937fd8b0bd622feb619c0f4cbee7de859af7bcc5c68771500e8e1d3f85fbf8d85a2083ffe65f9f32c1179296343e68bde",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.44.2": "f635fd978f5af0b1b594722adbca16b2c67bb3d8a5874ca13030a9d1f58f093e3d20f8cde3b8aab037fe0abb7cab3d2501496e4a90d0d014ccb8f24e36d81ef4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.50.1": "41664cb2bc8c56eb5103112988ddf4b6f73b01c0949fc9692e5998e395591d4813bdc400a736f8dea321ad1f1847ca7c096f4cd19836f43acfcfab36b00a2058",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "f21126d2b06e4c46d894c910dedcf4e10afc44b842e3c62a31c9a88c2788bc39a1cbdfc83d9747dfc769d3f1a1bb46a137e8b9e1bf4dcef47323093ca152861e",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.39.0": "ff5eff135c9a4a2f70b1c496a0f73069c17c945dbc6b0293f212f3d84b5b9f81a50628de972bb1d788521e0462af1067701e5420bfd8efe37c6f990c34b98a41",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "0c846c2a985470f85f473ca32f0757c6c5f6bc885d295770d18d56dcc56d33100ab63e2ce7d2ffb4ef8d0726fe40d3d9fa79ba05ae787f7a532b0933622c6e1e",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.44.2": "02b84dc3940ef53cee39149fc718a865d32932ac3d4ff7e29e3b9ea3355aaef25572087ed75c6b8490c42e58eb0c605d5c51c567aaf89e7a8f6b7c65fa9d2c4f",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.50.1": "fee9fd6ce9e95168949a41d24b51aabdc1f1548dd58cdaf3418f91c6e0be0718ca08905f445036a7f2c5b9487472f4870a116234456f1af5df71dfe58b1bb908",
+  "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "b457c1787514e146ef8cf48ff0a142406fcee484d2e63d6b479aa9611a5fede53eaaa32b1565c2a95776aa4738832534933003304e02eb89a9fa9bbc83cb0a01",
+  "@rollup/rollup-win32-x64-msvc@npm:4.39.0": "aa6fad14d5e48286bc7f47049f1a59a58df288c5cda78883542901c3421cc2d9133a0974d49f6a46fb0129dc0c2ba21b414e084dae2f6dcaad650f63b8ef6e94",
+  "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "b725fda501efb1b7d6a2af1723a778dd46c24dee30693987a60495739766cef902d6bb106c391074445471854e55bb6317c44d2434ae24deebc2e4ef72f31e68",
+  "@rollup/rollup-win32-x64-msvc@npm:4.44.2": "5ef55ed9a502399af6c60cd3c1b0e57c19d71baec335edc6de1fe1a3c330d67ddd88881f22fab2186ef1723e83841d23027491efa432f23b5406a62a7f2e748b",
+  "@rollup/rollup-win32-x64-msvc@npm:4.50.1": "a595a1a593fad015bb6a1cd521b40c506f55efd59f195621c55d5b272bdfcdd936b8152c33fa4ba06bcdacf1c5117888c24e61cd95f8176c0f4e609b3026c4b9",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.1": "c600ada269526e164380d41354c4cdc523bfb2a899ec66812f6564fd0ef9116a03fa44f90f5a6e05fd7605c3731e047dd4cfed9aed767236c4300bc1f39571d3",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.11": "a4a57a2e0afea1546c6d863d91bf704fbedaee9c0431621b60dfc52cf5afff460c7655c412165e0a1ccc66ba3dbb1de841cfe1c14d7f44d145fbaad21f59d03e",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.12": "3c9d4e93ab9ba651d60cda3accd7a5b26485b6bfa39c1d4023142023fc68dd7c13ca7cbc7796679c74aa0847312d9487067402d4ea497141753d495ca2833d62",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.4": "fdb096ee5386b3157a3112432afe23cc133a443422939489d41416a2a3bcb18d1df3bc8ad8a719914320ed3f3fb7ea82c98a819774ff612d085bca0361589b4b",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.1": "f956535627ae4a70e863ed708a015e793555782b4cf7d8b0621229178bffa728d06084540702e94648a9a6aadab4bff359dfe8db2ba9604d52cea78df936b7cf",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.11": "98579827cd4ece72884303248746fcd921fc97ab254e3ea3f8a02687fd1ff1caee7d722c9f596cc97376979b383a135615a411498d6767812c1f5147eefef040",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.12": "d748a602c0b8685e5ce4295d64b1e37f7c1ffb936fd89c2459c52954d35adce42d76e6b1c48bc3db8347303b62c1d2314557a3fb8bd830ba3b812e99945fe3e5",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.4": "c76c2a8a50f1412da67bb3d0b53d9c41897503b209421254cb76a3262e8f4cf4b8ecea2b8c472d9283ec8eb8a7331f1e2a5f4d79af2345c601ca154814f7291c",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.1": "902714a58cb83cb7adc958b81168dc4971e167029ef9c9be6ed6977fa9003de52b94aa110b5cbdf6295c9ba3afcb60bd7412a3d5e9efabf03879b16cb0d23a9d",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.11": "d116ed080005a09829480cff79d40ff18fbae1f15299da2a7b51e68a349cbcb18c7bc8b46cb98d963f67f39a4b2acfcb20a7d5265310aefaa3f0832fac54aa4f",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.12": "89f244bfd2929e5d2633c9f54a6beca6697337fc6f91035af3ba27563a2a98185f240ebb016a2292d6c386190fd5097276a1da3b376041277af2dcc8d09412ac",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.4": "156947b3611839e09a4db6845a798150940e08df5d87cde711d2b80ddf2edef5bcd33d389191652f3f12b54fad8506faf82e50dd0e8ae4d7fb7edbff7532817c",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.1": "4f83bebf99926b709b7af37ffae49c39135cc74a4213fd66860712433a280b024589663ee988e1e16ef4cefd20146f5178bd2248a96b8e40f60ad4bf0d67aa5f",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.11": "0c1bbb535a21b0df012c6a4c4bfb5538e44f161cca5bf2f14a1defbb4d87f2a8ea45cd5661888c88085105258cdaf34b099e7d48e0d7b32fda3897025722d751",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.12": "5f416f1f097a062f9c1fae383c752344d7b9da05074c6070ee1ddb0ce1380b1ebbf603712438e75bd8fb1801c7cec0a04ae83b520c63865b1fef9ac3b322fb83",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.4": "959278204b530122ec6223d1a83b50409462dfb18777bcfdb555b12e0f004acb6a42253323c8a3f7d449121edacb071f52d0d9ac661d91d4ea8f174bd1bdb337",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.1": "bd678c19a7d55ba8e4ab6886d45b60fb09991be4a471f27cf07c7d62cfc15fd4c85d699646e2d6cbabefa00cb0fb7ca37112876696872cefbb687b3a4000ed6f",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.11": "047dc5dc59a577ffaa1ec21eafc377223a04b3f9b883fa6990ccc008846eea2bb68f04012af81d32bbd83b66861910c2c54b78adaf158cb721580df7ba9f9370",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.12": "e47a443bc60cfb6029240b36c83fce63fd47064c62a787afd1471c7ac518f4499578b5eadd378582302da48388ba15d890dad4c33b1477720149a450e4a52720",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.4": "bd736762174c6b0c8f5b038fcf752928e17735c8f7e75060afe69cda7a4be9c87f4f901aa0e699df6a77167a55a62de7e71e6d8dba3eb84dd6e51c4ee7468d10",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.1": "e9c901fc2d182b39e1c3ef248f7da0d04110179912d2c12c3d3322b411ea9399e682784f75b4c4024e9e8859fc4e77bef8c9232be6a602393fc5c9bd16d8a5b2",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.11": "ed882ffcb6356e271ae708a61e5af3b1b0306819411fdd364283488138d2e8e222deff1ae935059fffed48f9f3e2b42aca616ff2e019de1133f693eb6b75ab96",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.12": "ef15ebb5e515b1a032769e2eca28086933106d0c0a835f4dc3af25ee2426277e1cc40ff4cbcaf1e174719a9af7c600becdce38fb98b825117751551e1bb2605e",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.4": "376e5fb2b08e8b3cb393cbdea5b79df82514812d9f583675b257062b22b0ba197b945dbc4ff17015720455ba039432a978111ce961623d47de57991c153b1847",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.1": "9efec82697d9940a691f00f49ead52d42b65e6d34e395f6856267af945a35f8024468473c6a2065ba989f4d581744140c3d8f928cf9b4f6da0d31abf0b9436ec",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.11": "4705892615540b131e96256bbbffaca9f89eebcf65c76fe2d2f5e17718770b1629065828b427c1044a71c063765cbe0fbc84491494fc1dc7d6672688f365ab0c",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.12": "c36cd60bbb5b78f9ac02c151fdd319f9d7c592338e0d8ad8998b6bb4dc2b02dc28222cc00b41bdf4cf90dcb7fcb47a1b28d43e6ce6ded86be7b099ff33034cf3",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.4": "7854762a01232135fef7bca426fcb08c08b99049a2f65714a72480c01aaa73c573e6e5f0711ad9ee6d6b56e9596edee311f0ed9df216ba42d6933f9acd11e252",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.1": "61a1e8b639111ce9036933b0ffa7b6fdb7242a3cb482a7009add05449d718716f1a7879ab23eae6fc6759940c64d6a1c441245c93ab2472d42e54d5b0c1f11cd",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.11": "cc08b2ce1dfd5ad67f746ecde41bdc3d01375a97acbe15d58bc23441832fcf844a2f1cddf227132cabcefac2d6036c41875221684722eaef5b1b1e9c4cfa066e",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.12": "fc50a9a1f4f2b663f40340efa5f5335ed1c942e21f0c22d6cfb4170e48159d39952f6a3f38de4ffa8b724f341f662d4dd2457c93f50fb93ffcc026fce14be76d",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.4": "0efe0a9b4fdfa336f79e54deec18829b9c6c9219be23c7e790c1435fa472bedf80184faae96a1d26e0db920077ed7144cdac3512f02284dcfdfcd6ee330d8b16",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.1": "697de321dd0d3d0224b566660c41e723434eb1fa27d0bc16f77e46441f9703f51f682b3e6baf124d64badd374af4b1862a28096eb21865e24f250fc33e4bd69a",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.11": "489d40af4c33d56ec9bdaa7965f8ae2e1311033214cd8418e3f977cc333c923591e39e0ba82d55f1179de442fb61aad09d5318685bd7020a4bd6fb15d9fad1f7",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.12": "11067a2ae532adaa9db819b5a94462acd1750771582a66d89bf437264fc95cf53b960d2e395105a6efa238e159b98b463ecc88103e848515af5a4ea45c5e57a0",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.4": "2e7f54494f0292687172d2468212aaacc314f91b3feaebcaf9541ad061711976e933014e1e26e1e408241256e28faf6e4a4d7f4eee39b2f40476e98ab7e30db9",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.11": "b5c0ad4260e24f77cd339204ab228a0faf309d3cf24e4aacb4398d694587326ea7c0d40b0530f602a561384857194afb48356d370acb6af19aae6438702d30c3",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.12": "4a2a57b9aeb093c1db94953489e7e1fb22e2855db01f982f4a06481484112e0152cbb883098ba56bd3d51f3bc7c71899759edc871b3218d73c8c610ee47793ce",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.4": "330fb7dec1bd50439bed83a05a601b4b8a10979b92105b96b63dc2a6ac4e7b8f68391473c20d11431901ab5d7d68d43dcac0856747d052401614ca72dbf03409",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.1": "60103d9f02b44c5b7862535407491770b59bcd7665a306adae9475a162725e2aeacdd9431c536a2f096ca0e31f69767512cf26ec43445bed88f421300400b48d",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.11": "0d1b1ba3355e371e06fe253e1664e4fbf15f4080a1ab151e6c4dacf0b8fd16af2cd88cfda4a2ee717bba4fcd8c22ea2a709fcaf60ac2e1675bc5e7c9133a8d67",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.12": "137b19bdec1f9e501e58c48e89265dde88d52fe15b93d51046f1640cdce9920bbd63c266f313b3c08f494c5a403ae448e9699e7dca13612269de8e4286836bb8",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.4": "de06c73d566f5dcd06979b7c73a08bc82660757b7d0c4b6d4a44aecf59b5aef57b4ee0bed4283936046d47366e63660e2aabd8e3caa2cc9b1c56305244670a81",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.1": "39bfb14b5060e90e653174a5c6213b2d3cfe870defd1a9ea22d56c141b99ed6dca036c815c33e7ba46bbb966263b7bb54f43099b07e9779b34ceb1e3ad52ead3",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.11": "e81e9a44e2e87e2a1e2c9687e0279b2fedc41cb1355b3211829f6da29a19a0eacca135eebb8eaac92cce80f1e4f1093491203e5a855d7e57ea657b34a59dd5fc",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.12": "c33748d2b58fe86b1e47564dc33a1efe0daa5408a837f673a1c985f92b78158c2fcd2a1bc2941ed1d53cef2071f2396007271f1a14e9076c641c10b181d52e5d",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.4": "416c4460d463105d6a57d523ac07aeec37d0e4afe59175a86d7621957bbe266e0b8d318f9092a585ef25d402c76f8f2d119bc340c6c4ac2fddf7673337959ef4",
+  "lightningcss-darwin-arm64@npm:1.29.2": "ecba3cfba59d1abf2e487f020c02a6a73635e717c490ca489476958876a44893f393d92b84e844f312b560fc53b940c7086409e1b17ea0a98bc290fb1fd914ff",
+  "lightningcss-darwin-arm64@npm:1.30.1": "e539855e1c1975a942ea63c641a10b14dbfe7751657ea091aa40d414d8dca83ab008c79ba59ca215cd4e32018b67545842469d6e947911d80ce9008875ee90d5",
+  "lightningcss-darwin-x64@npm:1.29.2": "2d190974ddda8dd943aa61586a2d0fb90b8fb87b4ceefa7bf947acbd6f930b474f8d13a4f3cb4de62d507e27ec29f9e3977f7f52c8bfe9d6aee95a49b45a7ae1",
+  "lightningcss-darwin-x64@npm:1.30.1": "89d59789a53dfe2ddff3f9ee7dd825339b8044ed2fffebe6f77139e52857c5c88ab9e026adf76d72d77789c111f304a7dece5782c8ab7b03b1b732b389caec56",
+  "lightningcss-freebsd-x64@npm:1.29.2": "c14a65c022db9fb806412061dd458d4eeced41fba7853b59b42bd23e0cddd3e9bf82d80b742f6e3075c358f7f41149043ab79afbf588b7a4f9e9a51826cf00bc",
+  "lightningcss-freebsd-x64@npm:1.30.1": "175b4126fcfa789061bc980cb887d1b63465168e6b551f672dce100e00dc82023071f4c83daab1a1c9d8321fbc064c7470832a1b71d24a700494b8c116242054",
+  "lightningcss-linux-arm-gnueabihf@npm:1.29.2": "ba5501475726fb193964a378ee2f88d9afcfaf6c35b22a72ecd427cc3d5a0a28824d246168c21f4d8ac1caa9b2b8e6c835bb75f1638ab2eda13c8e8888246617",
+  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "7000b866497ff4650bb6cee0d890d1951ab6e2b3d76cd375a93a688b745d2503f6f95a59e5a34fbf780ee5a59412ba59f36e73ed32b3c572a45b4b4c33fd48c3",
+  "lightningcss-linux-arm64-gnu@npm:1.29.2": "17d22114fcdb98990b7a9527eff1995a56f5c7fa196ec58595600a374385cf724f4648e59ed2410d62c2e3ebc2fd872e925b11d548fd88f3b291582203acad5f",
+  "lightningcss-linux-arm64-gnu@npm:1.30.1": "b96fd4bb9dd2d507769fbbf83376386027174b08bf088f8f662c0d5da73d1c047b9a0eb2f5bab426cc9e0888f841bd2ee7f4c2386154380d405b1ddf198eb519",
+  "lightningcss-linux-arm64-musl@npm:1.29.2": "ee99aea9d6425fbf937bdd99945208cefc4376fe162d181a68542164c4920c1cd7c63869050de12c44dcd367cc67dc08f63b522e81147d05444ad4f93afb126f",
+  "lightningcss-linux-arm64-musl@npm:1.30.1": "28af49fd88bb0f6f673c2a0b69fd21c3f42a48dccd5ba78afea10c5f3ef274bea0034dc36adf747f2a19af77704d72b417c0d6cf57bcf834d11e343ca5d98b13",
+  "lightningcss-linux-x64-gnu@npm:1.29.2": "17002e82ad3fae9ebf5ce8e1eb66464ca4f256604cb0db4c745f78bc85730f2d4d4f847ebc939327176d3e7dbed771b02f487d58960a62fa4c32b86a915d0a8e",
+  "lightningcss-linux-x64-gnu@npm:1.30.1": "35aaa0f2fa21561b4a45b1fff3f2e00452562c6839afa646f8b94f5ac247e5bfbce32802557f93c90813f0f27c39f54b2443de84a41a1c44db5f16f01705c5ed",
+  "lightningcss-linux-x64-musl@npm:1.29.2": "6a2f54a992d53522852ae37dea730831bb2e434206a58363d0c34a67a4368edcc471e209b022bd525c33ac5886ab0cdd584afe606b92e4e03e18ddd57e667ceb",
+  "lightningcss-linux-x64-musl@npm:1.30.1": "d5feaf9c72ebbfbd4da504102ebe08106f6b9c3e2f03b0ce6f8ee5e2ced7e9364bbeb6cdaa51b9e7361dba8b15bd3a6ed39cb9898c842f1c0fab62e5f2c43cdc",
+  "lightningcss-win32-arm64-msvc@npm:1.29.2": "707e80205917f654db00d0a83e853d198ad74a200bb9d45d8d822158d942866c575fed398f4edf51fc8bbf1ad42b2eeeddfce5fffdb232024b10114475c8f7ea",
+  "lightningcss-win32-arm64-msvc@npm:1.30.1": "cb840e2f4eadd758ad96d8226b84ecb3127edaee44f053aa83c837900c237fa2e4c3b956663a55b6d4364f7b29830b8021a0a1e9bae03d1f7930bcf37c433bff",
+  "lightningcss-win32-x64-msvc@npm:1.29.2": "059cfe0875d086630df9df682728fad52daf1c925dfe6a8280d3adfcadd4f64a301365cb3bf751fc755b08d786a51c4e0be4ec5b9981b2547ab73d038da4eb3f",
+  "lightningcss-win32-x64-msvc@npm:1.30.1": "a99e857773ac3f245eca561b79ffcf7ddf0e4a54cc00a86e96c7cda65a8e7acf75dcffbe02814836b3425cf984cf07c5bc4cf234877616074be00cbe932a3812",
+  "turbo-darwin-64@npm:2.5.4": "49ea24cf702baa0fc1e8a6acfbe75e425b52cd654f654c9da7aa7095fb65a02590de8a9ec85a22b268f3ce558e3fc40b7512634699b090d43c8def450e75ff7e",
+  "turbo-darwin-arm64@npm:2.5.4": "7a8f17ee644c5a4d07fad3b734d2f557267360783de2f70de7c265ed13e6b7281a2c5620f89732f3f9868fd432ad1ec7ea6a93bf95fde01626d16e782df22d2c",
+  "turbo-linux-64@npm:2.5.4": "c219ee1dc8144d874aff9f411c3a84066b66c4c4fd3ccbdf8111ded326f2846f0a17ae943dee2f4a7597f276d9c039be5b770af798b69bb258c60f3000618fb3",
+  "turbo-linux-arm64@npm:2.5.4": "e786417fdb7955badf18ab590bd264cbd300f6ce1976a4c059a30fcc1a1c3ca5e7917f15d97214f172f57d24e54bfb05b2f844c0b364f29a12c8f2b2d08ffa2c",
+  "turbo-windows-64@npm:2.5.4": "ec8b9487214645340840f53162ab848ae59b5ec0a8673de7ce0ad89301c6751faaea637534d461562028a7933aba124d25557b74316d5fe10bf7842661859b70",
+  "turbo-windows-arm64@npm:2.5.4": "2b9227498ada4f341f20c40d637b550ee8572eecc983be4e74d0f06f852e418b880238c5ab7f027aada53566331bd4804a4eafce860645d467948587f2fcae1a"
+}
diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix
new file mode 100644
index 000000000000..01791714fe0a
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  fetchFromGitHub,
+  yarn-berry_4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uppy-companion";
+  version = "6.2.0";
+
+  src = fetchFromGitHub {
+    owner = "transloadit";
+    repo = "uppy";
+    tag = "@uppy/companion@${finalAttrs.version}";
+    hash = "sha256-FF5I4D9obRVJqyjucemnxZiPcNHdQdo3S0z/h96Fe6c=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarnBerryConfigHook
+    yarn-berry_4
+  ];
+
+  buildInputs = [
+    nodejs
+  ];
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-euKvBI3Y15SmBoVOEbS8GIJT/kIOhayLKGVSd8JztqI=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn workspace '@uppy/companion' run build
+    yarn workspace '@uppy/companion' run test
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/packages/@uppy
+    mkdir $out/bin
+    mv packages/@uppy/companion $out/lib/packages/@uppy/companion
+    # Remove extra files
+    rm -rf $out/lib/packages/@uppy/companion/{*.md,LICENSE,Makefile,.*ignore,infra/,output/,test/,__mocks__/,*/json}
+    # Remove dev dependencies
+    rm -rf $out/lib/packages/@uppy/companion/node_modules/{.bin,webpack*,update*,tyepscript,jest*,eslint*,{@,}esbuild,{@,}rollup,terser,@types,execa,http-proxy,nock,supertest,vite*}
+
+    # Link final binary
+    ln -s $out/lib/packages/@uppy/companion/bin/companion $out/bin/companion
+
+    patchShebangs $out/bin/companion
+
+    runHook postInstall
+  '';
+
+  updateScript = ./update.sh;
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    changelog = "https://github.com/transloadit/uppy/releases/tag/%2540uppy%252Fcompanion%2540${finalAttrs.version}";
+    description = "Server integration for Uppy file uploader";
+    homepage = "https://uppy.io/";
+    license = lib.licenses.mit;
+    mainProgram = "companion";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/up/uppy-companion/update.sh b/pkgs/by-name/up/uppy-companion/update.sh
new file mode 100755
index 000000000000..9280c873158f
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodejs curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+NEW_VERSION=$(npm view '@uppy/companion' version)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$NEW_VERSION" || true
+
+HOME=$(mktemp -d)
+export HOME
+
+src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src")
+WORKDIR=$(mktemp -d)
+
+cp --recursive --no-preserve=mode "$src/*" "$WORKDIR"
+pushd "$WORKDIR"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+rm -rf "$WORKDIR"
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix
index 70a99363ef04..4720b0db79d2 100644
--- a/pkgs/by-name/up/upsies/package.nix
+++ b/pkgs/by-name/up/upsies/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitea,
   fetchpatch,
   ffmpeg-headless,
@@ -72,10 +73,32 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ runtimeDeps;
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fail during object comparisons on Darwin
+    "test_group"
+    "test_has_commentary"
+    "test_special_case"
+    "test_set_release_info"
+    "test_Query_from_release"
+    # Depend on directory format
+    "test_home_directory_property"
+    # Depends on specific cocdecs not available on Darwin
+    "test_generate_episode_queries"
+    # Assert false == true
+    "test_is_mixed_scene_release"
+    # Fails due to expecting a non-darwin path format
+    "test_search"
+  ];
+
   disabledTestPaths = [
     # DNS resolution errors in the sandbox on some of the tests
     "tests/utils_test/http_test/http_test.py"
     "tests/utils_test/http_test/http_tls_test.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fail due to the different set of codecs on Darwin
+    "tests/utils_test/predbs_test/predbs_integration_test.py"
+    "tests/utils_test/release_info_test.py"
   ];
 
   preCheck = ''
@@ -90,11 +113,13 @@ python3Packages.buildPythonApplication rec {
     (lib.makeBinPath runtimeDeps)
   ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Toolkit for collecting, generating, normalizing and sharing video metadata";
     homepage = "https://upsies.readthedocs.io/";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "upsies";
-    maintainers = with maintainers; [ ambroisie ];
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }
diff --git a/pkgs/by-name/uq/uqmi/package.nix b/pkgs/by-name/uq/uqmi/package.nix
index 6ee2d0f28f04..f4706afbf70d 100644
--- a/pkgs/by-name/uq/uqmi/package.nix
+++ b/pkgs/by-name/uq/uqmi/package.nix
@@ -10,12 +10,12 @@
 
 stdenv.mkDerivation {
   pname = "uqmi";
-  version = "unstable-2024-01-16";
+  version = "unstable-2025-07-30";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/uqmi.git";
-    rev = "c3488b831ce6285c8107704156b9b8ed7d59deb3";
-    hash = "sha256-O5CeLk0WYuBs3l5xBUk9kXDRMzFvYSRoqP28KJ5Ztos=";
+    rev = "7914da43cddaaf6cfba116260c81e6e9adffd5ab";
+    hash = "sha256-Ny5Jd/6N1nTcv2GGP1YLFe+ljn15sUQJVAEVPvYtz3M=";
   };
 
   postPatch = ''
@@ -33,13 +33,9 @@ stdenv.mkDerivation {
   ];
 
   env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
-      # Needed with GCC 12 but breaks on darwin (with clang) or older gcc
-      "-Wno-error=dangling-pointer"
-      "-Wno-error=maybe-uninitialized"
-    ]
-    ++ lib.optionals stdenv.cc.isClang [
-      "-Wno-error=sometimes-uninitialized"
+    lib.optionals stdenv.cc.isClang [
+      # error: unknown warning option '-Wno-dangling-pointer' [-Werror,-Wunknown-warning-option]
+      "-Wno-error=unknown-warning-option"
     ]
   );
 
diff --git a/pkgs/by-name/ur/uri/package.nix b/pkgs/by-name/ur/uri/package.nix
index 5b788d8d424a..fadb45516731 100644
--- a/pkgs/by-name/ur/uri/package.nix
+++ b/pkgs/by-name/ur/uri/package.nix
@@ -41,6 +41,14 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
   ];
 
+  # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postBuild = "make doc";
 
   postInstall = ''
diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix
index dfed0d748921..54a9f90f2aa2 100644
--- a/pkgs/by-name/ur/url-parser/package.nix
+++ b/pkgs/by-name/ur/url-parser/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "url-parser";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "url-parser";
     tag = "v${version}";
-    hash = "sha256-5QpcioReUAO11QOLbU+KtUd4Zs+hi/lvNvEzDpDQbhU=";
+    hash = "sha256-5llWyqIO5vsjvf8NChssgWaiJ9ENUN72sy4shjmA9co=";
   };
 
-  vendorHash = "sha256-3TOUdwBq6TgzZIDtaoIoi2ur83DmAjBfi1ILJIGpyJU=";
+  vendorHash = "sha256-SHW/l1TVq5zzYcjhkIMbF5yF5KKIbMfPgrASNQ9A3VU=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix
index c56e8686fa98..f8e23e4da99a 100644
--- a/pkgs/by-name/ur/urn-timer/package.nix
+++ b/pkgs/by-name/ur/urn-timer/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "urn-timer";
-  version = "0-unstable-2025-08-07";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "paoloose";
     repo = "urn";
-    rev = "7acdab69eaec05f173d95eff190e5d7a03db8847";
-    hash = "sha256-jFatHlkQr6O9E2pKroFWk6F2BccnfSr1pq43Q5qQbC4=";
+    rev = "cae0763f7d5c0d895faf6d2ab7448d1b05b60dff";
+    hash = "sha256-jG+Xibdsu53/aycUf/TzsQtegGY/buwswJ9ediZIJ4w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ur/urn/package.nix b/pkgs/by-name/ur/urn/package.nix
index 9f1ee36f59a6..409de4471f2e 100644
--- a/pkgs/by-name/ur/urn/package.nix
+++ b/pkgs/by-name/ur/urn/package.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
     description = "Yet another Lisp variant which compiles to Lua";
     mainProgram = "urn";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ CrazedProgrammer ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 
diff --git a/pkgs/by-name/ur/ursadb/package.nix b/pkgs/by-name/ur/ursadb/package.nix
index 108c9ef067cc..ec3f808df0ee 100644
--- a/pkgs/by-name/ur/ursadb/package.nix
+++ b/pkgs/by-name/ur/ursadb/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "target_clangformat_setup(ursadb_test)" "" \
       --replace 'target_include_directories(ursadb_test PUBLIC ${"$"}{CMAKE_SOURCE_DIR})' "" \
       --replace "ursadb_test" ""
+
+    substituteInPlace extern/spdlog/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace extern/libzmq/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -37,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     maintainers = with maintainers; [ msm ];
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 })
diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix
index 945109a7dfa9..6111d773cefe 100644
--- a/pkgs/by-name/us/usacloud/package.nix
+++ b/pkgs/by-name/us/usacloud/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "usacloud";
-  version = "1.16.2";
+  version = "1.19.3";
 
   src = fetchFromGitHub {
     owner = "sacloud";
     repo = "usacloud";
     tag = "v${version}";
-    hash = "sha256-AZX3vOlKnSJlquZcDhWnVViji2+B41ApLxCDBU277+U=";
+    hash = "sha256-uHZJnhj36NEAZxWfwrm0Dsw42NgQp37SgOduEGA8SEU=";
   };
 
-  vendorHash = "sha256-pCmu/mhh0k3J9fhuWbGS7AzLfCqVO0MytfoYQJ2EwqE=";
+  vendorHash = "sha256-bJV/m3b6UC3j1/SGJ7riz0GRxoCQ6lVU5DiatQWnIVc=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/us/usermount/package.nix b/pkgs/by-name/us/usermount/package.nix
index 3c8478000037..f1d02de14496 100644
--- a/pkgs/by-name/us/usermount/package.nix
+++ b/pkgs/by-name/us/usermount/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   dbus,
   libnotify,
-  udisks2,
+  udisks,
   gdk-pixbuf,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [
     dbus
     libnotify
-    udisks2
+    udisks
     gdk-pixbuf
   ];
 
diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index ebaff9ecb83d..b609e22aab5a 100644
--- a/pkgs/by-name/ut/utf8cpp/package.nix
+++ b/pkgs/by-name/ut/utf8cpp/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "utf8cpp";
-  version = "4.0.6";
+  version = "4.0.8";
 
   src = fetchFromGitHub {
     owner = "nemtrif";
     repo = "utfcpp";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-e8qH4eygLnQw7B8x+HN+vH8cr8fkxnTFz+PKtFJ8dGE=";
+    hash = "sha256-9lfs2tqsSDbf1appDC+S3qdmS4DipHhXoiJQluKytbM=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 70303a99050e..ac034405d500 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -41,11 +41,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "util-linux" + lib.optionalString isMinimal "-minimal";
-  version = "2.41.1";
+  version = "2.41.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor finalAttrs.version}/util-linux-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vprZonb0MFq33S9SJci+H/VDUvVl/03t6WKMGqp97Fc=";
+    hash = "sha256-YGKh2JtXGmGTLm/AIR82BgxBg1aLge6GbPNjvOn2WD4=";
   };
 
   patches = [
diff --git a/pkgs/by-name/ut/utox/package.nix b/pkgs/by-name/ut/utox/package.nix
index 701496ddf60c..ac77e70d798f 100644
--- a/pkgs/by-name/ut/utox/package.nix
+++ b/pkgs/by-name/ut/utox/package.nix
@@ -61,6 +61,11 @@ stdenv.mkDerivation rec {
     "-DENABLE_TESTS=${if doCheck then "ON" else "OFF"}"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   nativeCheckInputs = [ check ];
 
diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
index dfa3b0e8f117..1b1c2bf067df 100644
--- a/pkgs/by-name/uu/uutils-coreutils/package.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -21,19 +21,19 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uutils-coreutils";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "coreutils";
     tag = finalAttrs.version;
-    hash = "sha256-VcwdCi40Tm8J3t0qFSFGvRwW6B5cCDj1wm+H3i20axo=";
+    hash = "sha256-qvHNV3oy89CVR4LtrxFQJpev3yhHXy2Fh5PTik7Eo8g=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "uutils-coreutils-${finalAttrs.version}";
-    hash = "sha256-/QNOrfqdMviOVP1Fzorc6RAsgLDSKtg/MXfXJEzxwMc=";
+    hash = "sha256-yJHp8FCk7W6EDhO/MLrhui50RHW4GOwPQnQmfkdkWd8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff b/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff
index 1d76fbb412bf..5257c07d8756 100644
--- a/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff
+++ b/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff
@@ -1,10 +1,10 @@
 diff --git a/GNUmakefile b/GNUmakefile
-index 20dc731d3..400e5b84f 100644
+index e4bc5f435..b677d119c 100644
 --- a/GNUmakefile
 +++ b/GNUmakefile
-@@ -69,19 +69,6 @@ TOYBOX_SRC  := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
- #------------------------------------------------------------------------
- OS ?= $(shell uname -s)
+@@ -76,19 +76,6 @@ ifeq ($(OS),Windows_NT)
+ endif
+ LN ?= ln -sf
  
 -ifdef SELINUX_ENABLED
 -	override SELINUX_ENABLED := 0
@@ -21,8 +21,8 @@ index 20dc731d3..400e5b84f 100644
 -
  # Possible programs
  PROGS       := \
- 	base32 \
-@@ -200,8 +187,10 @@ endif
+ 	arch \
+@@ -224,8 +211,10 @@ endif
  
  ifneq ($(OS),Windows_NT)
  	PROGS := $(PROGS) $(UNIX_PROGS)
@@ -31,6 +31,6 @@ index 20dc731d3..400e5b84f 100644
 -	PROGS := $(PROGS) $(SELINUX_PROGS)
 +		PROGS := $(PROGS) $(SELINUX_PROGS)
 +	endif
- # Always use external libstdbuf when building with make (Unix only)
- 	CARGOFLAGS += --features feat_external_libstdbuf
  endif
+ 
+ UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))
diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index f77377765b65..a324cbee3d21 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.19";
+  version = "0.9.8";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-TbCkkZQoRItBmzwn7B8JbXWs72lYiqWV5mOfkvRarsg=";
+    hash = "sha256-e7yvEQggfBLq4akqnVoZTfvcpZLlbQRWr2fruGfF/N4=";
   };
 
-  cargoHash = "sha256-09A40qwbRex8WEgCFC2yRZoq+6UnxurJAX8e27G+Rhg=";
+  cargoHash = "sha256-lEGhXwzotvCuDAvVyrt22e/ReotWT7m1lt6d2GL8lFU=";
 
   buildInputs = [
     rust-jemalloc-sys
@@ -62,7 +62,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru = {
     tests.uv-python = python3Packages.uv;
 
-    # Updating `uv` needs to be done on staging. Disabling r-ryantm update bot:
+    # Updating `uv` needs to be done on staging until the next staging branch-off.
+    # Disabling r-ryantm update bot:
     # nixpkgs-update: no auto update
     updateScript = nix-update-script { };
   };
diff --git a/pkgs/by-name/uv/uvcdynctrl/package.nix b/pkgs/by-name/uv/uvcdynctrl/package.nix
index a369d9941bc9..33afb27143e7 100644
--- a/pkgs/by-name/uv/uvcdynctrl/package.nix
+++ b/pkgs/by-name/uv/uvcdynctrl/package.nix
@@ -39,6 +39,15 @@ stdenv.mkDerivation {
     done
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libwebcam/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace uvcdynctrl/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   doInstallCheck = true;
 
   meta = with lib; {
diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 6886ba53cae8..593835879c79 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -81,13 +81,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsgi";
-  version = "2.0.30";
+  version = "2.0.31";
 
   src = fetchFromGitHub {
     owner = "unbit";
     repo = "uwsgi";
     tag = finalAttrs.version;
-    hash = "sha256-I03AshxZyxrRmtYUH1Q+B6ISykjYRMGG+ZQSHRS7vDs=";
+    hash = "sha256-WWZ+ClLWoUFi64xsiyuLXcxQsYdOv1DVhG+4oVYJJMI=";
   };
 
   patches = [
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # this is a hack to make the php plugin link with session.so (which on nixos is a separate package)
   # the hack works in coordination with ./additional-php-ldflags.patch
-  UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) (
+  UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (lib.elem "php" needed) (
     lib.concatStringsSep "," [
       "-Wl"
       "-rpath=${php-embed.extensions.session}/lib/php/extensions/"
@@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  postFixup = lib.optionalString (builtins.any (x: x.name == "php") needed) ''
+  postFixup = lib.optionalString (lib.elem "php" needed) ''
     wrapProgram $out/bin/uwsgi --set PHP_INI_SCAN_DIR ${php-embed}/lib
   '';
 
diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 3080fde6c372..99be1f986702 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -29,22 +29,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.23.3";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UP9Ztps5oWl0bdXhSlE4SCxHFprUf74DWygJy6GvO4k=";
+    hash = "sha256-gX+6fNnndmnEpuKymqVt/5U8RmUq2j9X99L34BJy6LI=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/Vladimir-csp/uwsm/commit/bd4db0fd1880b9b798e8f67e2d4c5e4ca2a28aca.patch?full_index=1";
-      hash = "sha256-GxGwy9BkpBKZGkG00+bVIh6iDNBgRG1f1f9GUKm3ERw=";
-    })
-  ];
-
   nativeBuildInputs = [
     makeBinaryWrapper
     meson
diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 3e7ac3f1fc8f..d53309d6d1c4 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20250916122507";
+    version = "20251105132907";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-8uRKXlPoO5lQoBdlpkTzEEBbnN1qeRiTbZO5pEX60uM=";
+      hash = "sha256-yH3vykMcxxlGXRUlZm6kKBkvsaQrTrnv+bYnZywu3go=";
     };
     vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU=";
     meta = with lib; {
diff --git a/pkgs/by-name/v2/v2ray/package.nix b/pkgs/by-name/v2/v2ray/package.nix
index f19c2bd6a87f..3411e95985e3 100644
--- a/pkgs/by-name/v2/v2ray/package.nix
+++ b/pkgs/by-name/v2/v2ray/package.nix
@@ -16,18 +16,18 @@
 
 buildGoModule rec {
   pname = "v2ray-core";
-  version = "5.40.0";
+  version = "5.41.0";
 
   src = fetchFromGitHub {
     owner = "v2fly";
     repo = "v2ray-core";
     rev = "v${version}";
-    hash = "sha256-pb9kZEdGkT2B1MhNnneAi4oP3aqYkgY86dodInorSbA=";
+    hash = "sha256-SHmcjpxqTyTm/jHbAwm5hD2s9Kg/YdhmpQqa6iwpHCI=";
   };
 
   # `nix-update` doesn't support `vendorHash` yet.
   # https://github.com/Mic92/nix-update/pull/95
-  vendorHash = "sha256-lphbRsPc8lSf8BzcfcFnh3Z+Wa9wJe98I3VE5ZoQHBE=";
+  vendorHash = "sha256-5YSVjZ14/vQA8MZA/imVkcHMAvaaMHbR6/+4Dzwejfo=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix
index 42f4d34710d6..a56633d319eb 100644
--- a/pkgs/by-name/v2/v2raya/package.nix
+++ b/pkgs/by-name/v2/v2raya/package.nix
@@ -18,13 +18,13 @@
 }:
 let
   pname = "v2raya";
-  version = "2.2.7.1";
+  version = "2.2.7.3";
 
   src = fetchFromGitHub {
     owner = "v2rayA";
     repo = "v2rayA";
     tag = "v${version}";
-    hash = "sha256-yKXtohZVmeeIaHIjdGIGQ7aIREIjup/bOpozjw9cmEw=";
+    hash = "sha256-tgSZJGHkpQGhja5C62w6QpflYBBtt3rPCCPT+3yTzm4=";
     postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
   };
 
diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index d44298118198..03b57f5c569e 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -1,4 +1,9 @@
 [
+  {
+    "pname": "Avalonia",
+    "version": "11.0.0",
+    "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
+  },
   {
     "pname": "Avalonia",
     "version": "11.1.3",
@@ -6,19 +11,29 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.1",
-    "hash": "sha256-KdjhwDKlii12v7HNI3NsYAM1qYoXKRsVN2scQJbYMTc="
+    "version": "11.3.7",
+    "hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM="
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.4",
-    "hash": "sha256-3ojATZlOAUEZ6Io3fUwtaJaD2h9vWMw/X/mGyZljRPU="
+    "version": "11.3.8",
+    "hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
     "version": "2.1.25547.20250602",
     "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.3.0",
+    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.28",
+    "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
+  },
   {
     "pname": "Avalonia.BuildServices",
     "version": "0.0.29",
@@ -26,43 +41,43 @@
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.31",
-    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+    "version": "11.3.1",
+    "hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.4",
-    "hash": "sha256-/RbL/Yi5d/xmPVTG2pJFZ1K44iECajkUU8MfZStKxAM="
+    "version": "11.3.8",
+    "hash": "sha256-cB3mYR1X8Gzu1FQfWCJpfWosnpojIQhRSxrjYz4zD6g="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.4",
-    "hash": "sha256-x3EtbbdgJ/WNBpltO+ztmI6JSQ2p5Ey4LDDX8FI1rXQ="
+    "version": "11.3.8",
+    "hash": "sha256-5rB33sqLIoDIEjlGlJFRGf1lLwvnVh8o8/16GQzu15Q="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.4",
-    "hash": "sha256-HTLnySk+navLLYE05m4HDpHwgp3RAk1OKYAjVaUirDk="
+    "version": "11.3.8",
+    "hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.4",
-    "hash": "sha256-85N0jIcrFNThaDhvcPU8/g84ISWILx2cXHVTPW0kJbI="
+    "version": "11.3.8",
+    "hash": "sha256-eOLf2Id4Olbq/nMWERarked+vg5ZnVMCxMKOXBfqAqM="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.4",
-    "hash": "sha256-mH9d3yJbf10NqOI3PR1cCoGyyEQbnKRNDmxFN+2bS9c="
+    "version": "11.3.8",
+    "hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.4",
-    "hash": "sha256-49rMUvhG5Dsl9RqhtD0i6H9X1g5768VdrW5l8axkwNI="
+    "version": "11.3.8",
+    "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
   },
   {
-    "pname": "Avalonia.ReactiveUI",
-    "version": "11.3.4",
-    "hash": "sha256-6AZrrX1S0SSB5GzqJx4nPI/nSyvlu/iXW99mO4v1jK0="
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.0.0",
+    "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -71,33 +86,33 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.1",
-    "hash": "sha256-RlO65QbExBdjEUY66CTlHefRdTZWzZbN4ksibVXxKv4="
+    "version": "11.3.7",
+    "hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.4",
-    "hash": "sha256-kVHhVHtwl1ssEf4STciY6OV0u2zyV8nOb2mSXnPH+nk="
+    "version": "11.3.8",
+    "hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.4",
-    "hash": "sha256-CCjlniydh91cypVmnK88UvYZH1Arjbfr7L/kNJMjyTo="
+    "version": "11.3.8",
+    "hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.4",
-    "hash": "sha256-lvjlqHU6X9ftLOXHAp0uzPfApIfte9YyIBJ+4CAp1/s="
+    "version": "11.3.8",
+    "hash": "sha256-GSD4yvyDKqBSGV/rwE/EO3CTp9dG4eR4B5H0Y/u9+hE="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.4",
-    "hash": "sha256-pBc4jtBOalc29D+4XzOATDjiyuK+sMMpQfhXn2m9XJo="
+    "version": "11.3.8",
+    "hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.4",
-    "hash": "sha256-POuDAvqpPYV6Ob0a4W6QIVL0s4/bQbRhshat9z5lvt0="
+    "version": "11.3.8",
+    "hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0="
   },
   {
     "pname": "CliWrap",
@@ -174,20 +189,30 @@
     "version": "5.0.0",
     "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
   },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
   {
     "pname": "NLog",
-    "version": "6.0.2",
-    "hash": "sha256-sToQRwukDjUo3ytSmHXT5p4j6fTv1utHkQKeF48EWnQ="
+    "version": "6.0.5",
+    "hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY="
   },
   {
     "pname": "QRCoder",
-    "version": "1.6.0",
-    "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="
+    "version": "1.7.0",
+    "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU="
   },
   {
     "pname": "ReactiveUI",
-    "version": "20.4.1",
-    "hash": "sha256-YXd4A5akZ/dMOo9IalKPoNMGlBGxk60o3u6pGB4BCXY="
+    "version": "22.2.1",
+    "hash": "sha256-MZNBNP2ajvfRU4OaG8JjbbaQ3xbE+FjE9RZK+TZdOCE="
+  },
+  {
+    "pname": "ReactiveUI.Avalonia",
+    "version": "11.3.8",
+    "hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo="
   },
   {
     "pname": "ReactiveUI.Fody",
@@ -196,13 +221,18 @@
   },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.2.1.9",
-    "hash": "sha256-4NsQyk70xjD+V0X/0wuWhQshkadbBVs1iyRNEPmExkk="
+    "version": "11.3.7",
+    "hash": "sha256-iOf7KhTmHt0vqkRyloM+yueo/acHHwFQd/5UZ1r0SD8="
+  },
+  {
+    "pname": "Semi.Avalonia.AvaloniaEdit",
+    "version": "11.2.0.1",
+    "hash": "sha256-W0gAoDPlStqsznFS6eLDI4GFAlIDGyQq2L+DG/WKY1I="
   },
   {
     "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.2.1.9",
-    "hash": "sha256-6V1agOI1KcTXQN1+uab7tSZH1ZdJEQrVfxZ5ha1cvGI="
+    "version": "11.3.7",
+    "hash": "sha256-XD7a6YY5L24peG24GaItZq7PZEdK1RP1eS0QxFbASJU="
   },
   {
     "pname": "SkiaSharp",
@@ -246,18 +276,23 @@
   },
   {
     "pname": "Splat",
-    "version": "15.3.1",
-    "hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU="
+    "version": "17.1.1",
+    "hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo="
   },
   {
-    "pname": "Splat",
-    "version": "15.5.3",
-    "hash": "sha256-nG2Q8PYkGgasSCoK2dO1TK4drljqr+1D6K9letsOQ08="
+    "pname": "Splat.Builder",
+    "version": "17.1.1",
+    "hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI="
   },
   {
-    "pname": "Splat.NLog",
-    "version": "15.5.3",
-    "hash": "sha256-8s6PBlwaqOQfOR3NsloIufdXQELVyzrItcIUjrwec6U="
+    "pname": "Splat.Core",
+    "version": "17.1.1",
+    "hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0="
+  },
+  {
+    "pname": "Splat.Logging",
+    "version": "17.1.1",
+    "hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY="
   },
   {
     "pname": "sqlite-net-pcl",
@@ -286,14 +321,19 @@
   },
   {
     "pname": "System.ComponentModel.Annotations",
-    "version": "5.0.0",
-    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
+    "version": "4.5.0",
+    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
   {
     "pname": "System.Diagnostics.EventLog",
     "version": "6.0.0",
     "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
   },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
+  },
   {
     "pname": "System.IO.Pipelines",
     "version": "8.0.0",
@@ -306,8 +346,13 @@
   },
   {
     "pname": "System.Reactive",
-    "version": "6.0.1",
-    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+    "version": "6.0.2",
+    "hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.1.0",
+    "hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y="
   },
   {
     "pname": "System.Security.AccessControl",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 8aff827ea49a..9bcf2f643d49 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -15,19 +15,18 @@
   krb5,
   bash,
   xorg,
-  xdg-utils,
   nix-update-script,
 }:
 
 buildDotnetModule (finalAttrs: {
   pname = "v2rayn";
-  version = "7.14.4";
+  version = "7.15.7";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = finalAttrs.version;
-    hash = "sha256-zfQza07GhYFEHwl4w5hqqE9JP/0yY5KIj0zRRNmAECA=";
+    hash = "sha256-xTD1bdL/UUGqUxDmrguO6Oapv37clDD2b3YWCe7B+Bs=";
     fetchSubmodules = true;
   };
 
@@ -41,13 +40,11 @@ buildDotnetModule (finalAttrs: {
     chmod +x v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
     patchShebangs v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
     substituteInPlace v2rayN/ServiceLib/Global.cs \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
+      --replace-fail "/bin/bash" "${lib.getExe bash}"
     substituteInPlace v2rayN/ServiceLib/Manager/CoreAdminManager.cs \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
+      --replace-fail "/bin/bash" "${lib.getExe bash}"
     substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
       --replace-fail "Utils.GetExePath())" '"v2rayN")'
-    substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
-      --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
     substituteInPlace v2rayN/ServiceLib/Manager/CoreManager.cs \
       --replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
   '';
diff --git a/pkgs/by-name/v4/v4l-utils/package.nix b/pkgs/by-name/v4/v4l-utils/package.nix
index beaaeaffdd0f..b8adda9766ac 100644
--- a/pkgs/by-name/v4/v4l-utils/package.nix
+++ b/pkgs/by-name/v4/v4l-utils/package.nix
@@ -34,11 +34,11 @@ in
 # we need to use stdenv.mkDerivation in order not to pollute the libv4l’s closure with Qt
 stdenv.mkDerivation (finalAttrs: {
   pname = "v4l-utils";
-  version = "1.30.1";
+  version = "1.32.0";
 
   src = fetchurl {
     url = "https://linuxtv.org/downloads/v4l-utils/v4l-utils-${finalAttrs.version}.tar.xz";
-    hash = "sha256-wc9UnC7DzznrXse/FXMTSeYbJqIbXpY5IttCIzO64Zc=";
+    hash = "sha256-aCiCihd3VSbrk/slipKU0dEHPWM8NE3XHs1Oeh/7ffw=";
   };
 
   patches = [
@@ -106,17 +106,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   propagatedBuildInputs = [ libjpeg ];
 
-  # these two `substituteInPlace` have been sent upstream as patches
-  # https://lore.kernel.org/linux-media/867c4d2e-7871-4280-8c89-d4b654597f32@public-files.de/T/
-  # they might fail and have to be removed once the patches get accepted
   postPatch = ''
     patchShebangs utils/
-    substituteInPlace \
-      lib/libdvbv5/meson.build \
-      --replace-fail "install_dir: 'include/libdvbv5'" "install_dir: get_option('includedir') / 'libdvbv5'"
-    substituteInPlace \
-      meson.build \
-      --replace-fail "get_option('datadir') / 'locale'" "get_option('localedir')"
   '';
 
   # Meson unable to find moc/uic/rcc in case of cross-compilation
diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 76d774d12bd7..5a37135f7841 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.18.6";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9qRdikwZcTEZEQON2/n3dy9FA34Bu8YTfNfssOcUwgg=";
+    hash = "sha256-BNm4daNfbVNFXFdeeJ6v+RqYOXidajS+kMURearUoOE=";
   };
 
-  vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18=";
+  vendorHash = "sha256-smzYCcAlQnit4fdFIXHcJSbpf4CMcE5hkBXxYdVo4r0=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index e34bddbe5876..227f35f3d2d9 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   buildNpmPackage,
   fetchFromGitHub,
   lib,
@@ -9,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.3.20";
+  version = "1.3.23";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-DmuJ01xrA+rrKnzVQT3X2bfcIwqdn+plWg5o1GwyiS4=";
+    hash = "sha256-/gxMhUkGtImSdye/mEzUGG62Lv2mKXeWbOMlZ2sXOLE=";
   };
 
-  npmDepsHash = "sha256-L/2qSPkHNH7H0Pk4WrX0gfwJs1Dy5DDyJmggCO/ET9s=";
+  npmDepsHash = "sha256-9D1vve10vuwakfSbthI/FUI4OVM0s96msjrEEFT49A8=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = true;
@@ -68,5 +69,7 @@ buildNpmPackage rec {
     mainProgram = "VacuumTube";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ theCapypara ];
+    # https://github.com/NixOS/nixpkgs/pull/453698#issuecomment-3422020307
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/va/valgrind/package.nix b/pkgs/by-name/va/valgrind/package.nix
index f15572b5acbf..bb420e060fac 100644
--- a/pkgs/by-name/va/valgrind/package.nix
+++ b/pkgs/by-name/va/valgrind/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "valgrind";
-  version = "3.25.1";
+  version = "3.26.0";
 
   src = fetchurl {
     url = "https://sourceware.org/pub/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-Yd640HJ7RcJo79wbO2yeZ5zZfL9e5LKNHerXyLeica8=";
+    hash = "sha256-jVTHFwKRBvFkSq2vgCq5aS5T2T3QFcvRnnQZDrpha9c=";
   };
 
   patches = [
@@ -25,6 +25,12 @@ stdenv.mkDerivation rec {
       url = "https://bugsfiles.kde.org/attachment.cgi?id=148912";
       sha256 = "Za+7K93pgnuEUQ+jDItEzWlN0izhbynX2crSOXBBY/I=";
     })
+    # https://bugs.kde.org/show_bug.cgi?id=511548
+    (fetchpatch {
+      url = "https://bugsfiles.kde.org/attachment.cgi?id=186451";
+      hash = "sha256-IGmyHwwGoy00hcz3XxQSDcwcU8zHLBJ9dfqTvWDQ520=";
+    })
+
     # Fix build on armv7l.
     # see also https://bugs.kde.org/show_bug.cgi?id=454346
     (fetchpatch {
@@ -41,7 +47,6 @@ stdenv.mkDerivation rec {
   ];
 
   hardeningDisable = [
-    "pie"
     "stackprotector"
   ];
 
@@ -105,7 +110,7 @@ stdenv.mkDerivation rec {
       Valgrind to build new tools.
     '';
 
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl3Plus;
 
     maintainers = [ lib.maintainers.eelco ];
     platforms =
diff --git a/pkgs/by-name/va/valkey/package.nix b/pkgs/by-name/va/valkey/package.nix
index beb4b27c8f3e..9f8d6098eaa0 100644
--- a/pkgs/by-name/va/valkey/package.nix
+++ b/pkgs/by-name/va/valkey/package.nix
@@ -64,8 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
   env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [ "-std=c11" ]);
 
   # darwin currently lacks a pure `pgrep` which is extensively used here
diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index dce3c9bdbd4f..e8191271ee92 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "vals";
-  version = "0.42.2";
+  version = "0.42.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "helmfile";
     repo = "vals";
-    sha256 = "sha256-NdK7toICK9NJ6H8trCYJCEFE0weYH1Ban7dSlG1SM/c=";
+    sha256 = "sha256-a81U6AOzgD4GwQ1vhfFD2CquvmWOyvIzVMDIFg4rXgE=";
   };
 
-  vendorHash = "sha256-FjTxef9LHQopxiJYJFcAWcGJk5byVcEBlQFUssbfYwY=";
+  vendorHash = "sha256-O2lW3hs16osGSTcj3rc4tmK4YjCZZkYzEtcJP2uxa/A=";
 
   proxyVendor = true;
 
diff --git a/pkgs/by-name/va/valuta/package.nix b/pkgs/by-name/va/valuta/package.nix
index 8e7c473742b1..366bdc07e61a 100644
--- a/pkgs/by-name/va/valuta/package.nix
+++ b/pkgs/by-name/va/valuta/package.nix
@@ -17,7 +17,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "valuta";
-  version = "1.3.2";
+  version = "1.4.2";
 
   pyproject = false;
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "ideveCore";
     repo = "Valuta";
     rev = "v${version}";
-    hash = "sha256-g2x+pqs7dXdTMSxzSU5TeQtE+Q+tdQ93xaMtUVEE5/U=";
+    hash = "sha256-1vcjmSXEKy6XTEPV5jiz+ZxzFFUhVnmLK6MDjqoWTHs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix
index 0143ae4261b9..b4a06d427bca 100644
--- a/pkgs/by-name/va/vangers/package.nix
+++ b/pkgs/by-name/va/vangers/package.nix
@@ -4,6 +4,7 @@
   callPackage,
   stdenv,
   cmake,
+  installShellFiles,
   SDL2,
   SDL2_net,
   libogg,
@@ -26,6 +27,14 @@ stdenv.mkDerivation {
     hash = "sha256-IhCQh60wBzaRsj72Y8NUHrv9lvss0fmgHjzrO/subOI=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)" \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)"
+  '';
+
+  strictDeps = true;
+
   buildInputs = [
     SDL2
     SDL2_net
@@ -35,13 +44,20 @@ stdenv.mkDerivation {
     clunk
     zlib
   ];
-  nativeBuildInputs = [ cmake ];
+
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+  ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    install -T -m755 server/vangers_server $out/bin/vangers_server
-    install -T -m755 src/vangers $out/bin/vangers
-    install -T -m755 surmap/surmap $out/bin/surmap
+    runHook preInstall
+
+    installBin server/vangers_server
+    installBin src/vangers
+    installBin surmap/surmap
+
+    runHook postInstall
   '';
 
   meta = {
diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix
index b16a2a12cafe..1396767e3f7b 100644
--- a/pkgs/by-name/va/vapoursynth/package.nix
+++ b/pkgs/by-name/va/vapoursynth/package.nix
@@ -13,6 +13,7 @@
   libass,
   python3,
   testers,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,6 +41,9 @@ stdenv.mkDerivation rec {
         cython
       ]
     ))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (darwinMinVersionHook "13.3")
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix
index 89eda9592ad6..cc8effc37674 100644
--- a/pkgs/by-name/va/vassal/package.nix
+++ b/pkgs/by-name/va/vassal/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "VASSAL";
-  version = "3.7.17";
+  version = "3.7.18";
 
   src = fetchzip {
     url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
-    sha256 = "sha256-UQ2Y6A1zPVqMSyNTWpfrqdeSLF4AbuAVm0A4jeZdsW8=";
+    sha256 = "sha256-Mf0zBXaATtk42W41LzOhT9TgqAEoQsE+QxndyRiV2dU=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/vb/vboot_reference/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
similarity index 51%
rename from pkgs/by-name/vb/vboot_reference/package.nix
rename to pkgs/by-name/vb/vboot-utils/package.nix
index 3c9ffbf9a881..981202ea1fa0 100644
--- a/pkgs/by-name/vb/vboot_reference/package.nix
+++ b/pkgs/by-name/vb/vboot-utils/package.nix
@@ -3,29 +3,38 @@
   stdenv,
   fetchFromGitiles,
   pkg-config,
+  makeBinaryWrapper,
   libuuid,
   openssl,
   libyaml,
   xz,
+  flashrom,
+
+  withFlashrom ? true,
 }:
 
-stdenv.mkDerivation {
-  pname = "vboot_reference";
-  version = "135.16209";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vboot-utils";
+  version = "143.16463";
 
   src = fetchFromGitiles {
     url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
-    rev = "bf4b21294a1c2c6b94f400819d3fce4a905b3afe"; # refs/heads/release-R135-16209.B
-    hash = "sha256-frg7NkK173wAHJRedtbJI5jI8Kee/VkByh5DCUzD9OA=";
+    rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B";
+    hash = "sha256-8a49xD+EYXDouFuBmLyAtPxThYET6DtKImBPzXVhpxE=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    makeBinaryWrapper
+  ];
+
   buildInputs = [
     libuuid
     libyaml
     openssl
     xz
-  ];
+  ]
+  ++ lib.optional withFlashrom finalAttrs.passthru.flashromChromeos;
 
   enableParallelBuilding = true;
 
@@ -42,7 +51,7 @@ stdenv.mkDerivation {
   makeFlags = [
     "DESTDIR=$(out)"
     "HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
-    "USE_FLASHROM=0"
+    "USE_FLASHROM=${if withFlashrom then "1" else "0"}"
     # Upstream has weird opinions about DESTDIR
     # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R135-16209.B/Makefile#51
     "UB_DIR=${placeholder "out"}/bin"
@@ -54,12 +63,33 @@ stdenv.mkDerivation {
   postInstall = ''
     mkdir -p $out/share/vboot
     cp -r tests/devkeys* $out/share/vboot/
+  ''
+  + lib.optionalString withFlashrom ''
+    wrapProgram $out/bin/crossystem \
+      --prefix PATH : ${lib.makeBinPath [ finalAttrs.passthru.flashromChromeos ]}
   '';
 
+  passthru = {
+    versionFormatted = lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version);
+    flashromChromeos = flashrom.overrideAttrs (_prev: {
+      src = fetchFromGitiles {
+        url = "https://chromium.googlesource.com/chromiumos/third_party/flashrom";
+        rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B-master";
+        hash = "sha256-zOoWpuS/vDLvnRPdA9FNGhNbcwh3PMQwbdfqsyqj858=";
+      };
+
+      # requires git
+      mesonFlags = _prev.mesonFlags ++ [ (lib.mesonEnable "documentation" false) ];
+
+      # requires specific hardware
+      doCheck = false;
+    });
+  };
+
   meta = {
     description = "Chrome OS partitioning and kernel signing tools";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.jmbaur ];
   };
-}
+})
diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index 487b4510263e..8db97500a18f 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -1,34 +1,57 @@
 {
   lib,
+
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
+
+  # nativeBuildInputs
+  cmake,
+
+  # propagatedBuildInputs
   eigen,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcg";
   version = "2025.07";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "vcglib";
-    rev = version;
-    sha256 = "sha256-OZnqFnHGXC9fS7JCLTiHNCeA//JBAZGLB5SP/rGzaA8=";
+    tag = finalAttrs.version;
+    hash = "sha256-OZnqFnHGXC9fS7JCLTiHNCeA//JBAZGLB5SP/rGzaA8=";
   };
 
-  propagatedBuildInputs = [ eigen ];
+  patches = [
+    # CMake: install lib and exports
+    # ref. https://github.com/cnr-isti-vclab/vcglib/pull/248
+    # merged upstream
+    (fetchpatch {
+      name = "cmake-install-lib-and-exports.patch";
+      url = "https://github.com/cnr-isti-vclab/vcglib/commit/4a8dd8d6e54890aee76917d27aabfa7031cbc68d.patch";
+      hash = "sha256-b3qsmLu+4VSs943VS3C4gdG/PDR2mhr9/dDTmkep8zo=";
+    })
+  ];
 
-  installPhase = ''
-    mkdir -p $out/include
-    cp -r vcg wrap $out/include
-    find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \;
-  '';
+  nativeBuildInputs = [
+    cmake
+  ];
 
-  meta = with lib; {
+  propagatedBuildInputs = [
+    eigen
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "VCG_ALLOW_BUNDLED_EIGEN" false)
+    (lib.cmakeBool "VCG_BUILD_EXAMPLES" false)
+  ];
+
+  meta = {
     homepage = "https://vcg.isti.cnr.it/vcglib/install.html";
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = [ ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
+    maintainers = [ lib.maintainers.nim65s ];
   };
-}
+})
diff --git a/pkgs/by-name/vc/vclab-nexus/package.nix b/pkgs/by-name/vc/vclab-nexus/package.nix
new file mode 100644
index 000000000000..2bdfe17547b6
--- /dev/null
+++ b/pkgs/by-name/vc/vclab-nexus/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+
+  # nativeBuildInputs
+  cmake,
+  libsForQt5,
+
+  # buildInputs
+  corto,
+  glew,
+  llvmPackages,
+  vcg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nexus";
+  version = "2025.05";
+
+  src = fetchFromGitHub {
+    owner = "cnr-isti-vclab";
+    repo = "nexus";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lC3nKQJwkixwGzPP/oS0J+WIFgYqky6NaXu9bX28+3I=";
+  };
+
+  outputs = [
+    "out"
+    "bin"
+  ];
+
+  patches = [
+    # CMake: install lib & exports
+    # ref. https://github.com/cnr-isti-vclab/nexus/pull/173
+    # merged upstream
+    (fetchpatch {
+      url = "https://github.com/cnr-isti-vclab/nexus/commit/141ba17059f3680a74ce1178ed4245412f76061f.patch";
+      hash = "sha256-iY84QIpliC1BIImI/6S6E6fQwMKPmmTiwouCXW6wLuM=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    corto
+    glew
+    libsForQt5.qtbase
+    vcg
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_NXS_VIEW" (!stdenv.hostPlatform.isDarwin))
+  ];
+
+  meta = {
+    description = "Library for creation and visualization of a batched multiresolution mesh";
+    homepage = "https://github.com/cnr-isti-vclab/nexus";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ nim65s ];
+    mainProgram = "nxsview";
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+})
diff --git a/pkgs/games/vcmi/default.nix b/pkgs/by-name/vc/vcmi/package.nix
similarity index 82%
rename from pkgs/games/vcmi/default.nix
rename to pkgs/by-name/vc/vcmi/package.nix
index 88b26e0a1175..b7aa3e7dbdd9 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/by-name/vc/vcmi/package.nix
@@ -16,25 +16,23 @@
   ninja,
   pkg-config,
   python3,
-  qtbase,
-  qttools,
   onetbb,
   unshield,
-  wrapQtAppsHook,
   xz,
   zlib,
   testers,
   vcmi,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcmi";
   version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
-    rev = version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-k6tkylNXEzU+zzYoFWtx+AkoHQzAwbBxPB2DVevsryw=";
   };
@@ -44,7 +42,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -57,8 +55,8 @@ stdenv.mkDerivation rec {
     fuzzylite
     luajit
     minizip
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     onetbb
     xz
     zlib
@@ -97,16 +95,16 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source engine for Heroes of Might and Magic III";
     homepage = "https://vcmi.eu";
-    changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md";
-    license = with licenses; [
+    changelog = "https://github.com/vcmi/vcmi/blob/${finalAttrs.src.rev}/ChangeLog.md";
+    license = with lib.licenses; [
       gpl2Plus
       cc-by-sa-40
     ];
-    maintainers = with maintainers; [ azahi ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ azahi ];
+    platforms = lib.platforms.linux;
     mainProgram = "vcmilauncher";
   };
-}
+})
diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 9e8059e3c2ad..66f16a27dd51 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vcpkg-tool";
-  version = "2025-10-10";
+  version = "2025-10-16";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg-tool";
     rev = finalAttrs.version;
-    hash = "sha256-u88yjYhBKo8uX/jVQypYzOqWeE6PSM+GJD5v5qZyjC4=";
+    hash = "sha256-Qu7e2cb4fDAiJ4PXRzgdsvTMM8eo6dwRCNpd/w3vWLw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 9be733374954..8fbbcd9b3b4a 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2025.09.17";
+  version = "2025.10.17";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     tag = finalAttrs.version;
-    hash = "sha256-DySLGZrsUwXEW3NbcG6hEvcJZyPHub+oI9HWiKvYIpM=";
+    hash = "sha256-prWpMtvXWZ53y2gzr7IIqL/5kQZRfErnynEHMqi15/A=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
index 64860aa4202d..4f143f3a7c12 100644
--- a/pkgs/by-name/vd/vdo/package.nix
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vdo";
-  version = "8.3.1.1";
+  version = "8.3.2.1";
 
   src = fetchFromGitHub {
     owner = "dm-vdo";
     repo = "vdo";
     rev = version;
-    hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U=";
+    hash = "sha256-y3u9f17jMV9dwhfJrsW/GOqszVNvPLDyETfku1t3Djo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 545d0c9238f3..bec3504bbdb9 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   rustPlatform,
   pkg-config,
   openssl,
@@ -21,21 +20,22 @@
   nixosTests,
   nix-update-script,
   darwin,
+  versionCheckHook,
   zlib,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vector";
-  version = "0.50.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = "vector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vyRvBCpWOKeI7Y+RbxCdVCAF45vWjC7ZD4PCS0QloPg=";
+    hash = "sha256-aIe+s1Zw6J2Indh0+QmvvykRHx4S2sWqHJxodtQoAQY=";
   };
 
-  cargoHash = "sha256-4Nsq5Ta08wlHuevOfrr1mPi+qY+49q9S+AtbY35sfEM=";
+  cargoHash = "sha256-LqvXWIsSDzGznyIr1kyNU5e8rUSyoAiRn/4Nc9rzvM0=";
 
   nativeBuildInputs = [
     pkg-config
@@ -112,6 +112,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "#[tokio::test]" ""
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     tests = {
       inherit (nixosTests) vector;
diff --git a/pkgs/by-name/ve/vectorcode/package.nix b/pkgs/by-name/ve/vectorcode/package.nix
index 33c580bf5c76..12b02e55615a 100644
--- a/pkgs/by-name/ve/vectorcode/package.nix
+++ b/pkgs/by-name/ve/vectorcode/package.nix
@@ -93,14 +93,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "vectorcode";
-  version = "0.7.15";
+  version = "0.7.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Davidyz";
     repo = "VectorCode";
     tag = version;
-    hash = "sha256-YRvJVdNZLmNongYEy06QPsmJkPvmg7cucjLJY05yD54=";
+    hash = "sha256-xtFSERuXivdqY5XT/JJ4lZ1HgGTAE+DGV7pxH1163ZQ=";
   };
 
   build-system = with python.pkgs; [
@@ -184,6 +184,7 @@ python.pkgs.buildPythonApplication rec {
 
   disabledTests = [
     # Require internet access
+    "test_build_query_results_chunk_mode_success"
     "test_chunked_add"
     "test_chunked_add_empty_file"
     "test_chunked_add_truncated"
diff --git a/pkgs/by-name/ve/vega-lite/package.nix b/pkgs/by-name/ve/vega-lite/package.nix
new file mode 100644
index 000000000000..0cba997f3f78
--- /dev/null
+++ b/pkgs/by-name/ve/vega-lite/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  pkg-config,
+  pixman,
+  cairo,
+  pango,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "vega-lite";
+  version = "6.4.1";
+
+  src = fetchFromGitHub {
+    owner = "vega";
+    repo = "vega-lite";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X6O7ZehY3tS7dFBaKnBuDokCfG+zWmSDHl1d+ifyc/o=";
+  };
+
+  npmDepsHash = "sha256-YjZdh5R7hawgf8EAGlKEAkqchcFuN1j2yMJo9Ptnjyk=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    cairo
+    pixman
+    pango
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/vega/vega-lite/releases/tag/v${finalAttrs.version}";
+    description = "Concise grammar of interactive graphics, built on Vega";
+    homepage = "https://vega.github.io/vega-lite/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index d6bc2e960d62..433196cdd82e 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "velero";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2hffuTcz6mBwrEjCMhZqrDvNbC5m6lK3vM9umgV4l+0=";
+    hash = "sha256-ZVnYHBcnYOCBFJ9wyvMDrRIf3NyDV1Zqqf7e6JbA+go=";
   };
 
   ldflags = [
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
   ];
 
-  vendorHash = "sha256-khG/6mSYOCKBjTY+JyakFD65bLWLXpcQKPlhPT31uxc=";
+  vendorHash = "sha256-AuvJmHRAmxKduP6q7k81GapGbGLS4x7cwccSnZWvPwI=";
 
   excludedPackages = [
     "issue-template-gen"
diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index e1b3449497ea..7d6b36dba278 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -661,102 +661,102 @@
    "jar": "sha256-wmJ0R0s4RLzbfYPPc6eFNm+EtFO8F6GRz6T4/D4CIjQ=",
    "pom": "sha256-3Etrgt7DQXBSvBc7lC+5asogUIpLmkfp8b2yQAXkPuc="
   },
-  "io/netty#netty-buffer/4.2.5.Final": {
-   "jar": "sha256-3XR8KTv2gur7LDmx74hmHQOu1ULYQIpp5498Bs6b1Xs=",
-   "pom": "sha256-+jvLNiXnbkm4KPxs2ObM/xxTjyxWLWEDGgKBGItOzJk="
+  "io/netty#netty-buffer/4.2.7.Final": {
+   "jar": "sha256-uBYTyO0iscw57M8qKL0MHUVh+y5eVCBhYX70zh0ii/U=",
+   "pom": "sha256-6mGx9EqNui22yX8iou5DGsVil430rDlUcei28oZtwH4="
   },
-  "io/netty#netty-codec-base/4.2.5.Final": {
-   "jar": "sha256-ZevstZFFd/Z5lP6w3UsdVNd+Alh4I4cBA5EAk98XVso=",
-   "pom": "sha256-Nt7PQ+hpHymPJwGDBf+80tazqfgRw+u2NEOZerFetBI="
+  "io/netty#netty-codec-base/4.2.7.Final": {
+   "jar": "sha256-Y2BBW3yHFgr83l59SUbDVTm58EPoFmyRp//5XMYGfZ8=",
+   "pom": "sha256-Mu41Sjk4YJqMC/Ay9GxwqzJ9eFVR0mmDdwyakDIJKPo="
   },
-  "io/netty#netty-codec-compression/4.2.5.Final": {
-   "jar": "sha256-GjlLIhGjGWQxAJANs+V+uuAV3Tkp+uV1mGsappWxfgM=",
-   "pom": "sha256-Mvvtf2zeQ5jkjn3l08jHTD7ymwKIb/tQ1kYkP/lmQiA="
+  "io/netty#netty-codec-compression/4.2.7.Final": {
+   "jar": "sha256-7dU600mRgEMBpGVxET2P+01vZ+bYdGdNr7uRVyQnXLM=",
+   "pom": "sha256-uAzpd/6sX//UviPOI03TtvtMNXVrJRL7AdzcAdinSoc="
   },
-  "io/netty#netty-codec-haproxy/4.2.5.Final": {
-   "jar": "sha256-qdk1CPi0CJhOXCWHfBL89/FV3sq6etzooTyNJCTKQZ4=",
-   "pom": "sha256-rXDI4xaT6A7R7w0avs3t33YyKBPRuziNJdMXc1OBHfs="
+  "io/netty#netty-codec-haproxy/4.2.7.Final": {
+   "jar": "sha256-bwnVN5FKpGWJE4TIpM8NuXfdkAmgtzqBoFDwpsv6lfc=",
+   "pom": "sha256-Rc/v9/EyJXbOPaHMuoo0i0ANceNu1UVGEm1q1ZcJBPo="
   },
-  "io/netty#netty-codec-http/4.2.5.Final": {
-   "jar": "sha256-+ltOm0fVZmxQeEo3/fb70g9DC+6U0lQ+jiJOMZS9shE=",
-   "pom": "sha256-u2EeuknTKj3hyiYG5Lpi0QNA04FiGWamWvOOnzcVTa0="
+  "io/netty#netty-codec-http/4.2.7.Final": {
+   "jar": "sha256-KYTdOEIKYcTdaPysxR/8Uo60b3P3eVza/bOk1vy3aGI=",
+   "pom": "sha256-hQc6wlleQUiRi1psLnAZMtedm+GNTx212S1qojlj4oA="
   },
-  "io/netty#netty-codec-marshalling/4.2.5.Final": {
-   "jar": "sha256-tbMAHA1W6+zjEkoqjf5+nnNQnZqzhCPy4PMe27KdWDY=",
-   "pom": "sha256-jD+p6mlUF80oxCtDbRfhOLaqW4mJtP7RxLQXZcOeCx0="
+  "io/netty#netty-codec-marshalling/4.2.7.Final": {
+   "jar": "sha256-5VCtt1jupDqkneAOdBiwmJMXEdSjHWLmXEGwmUyVsjc=",
+   "pom": "sha256-77XNFeXpIODSbygJ+aiRp5fxOJ9hEX5VFLfmNaOPmjM="
   },
-  "io/netty#netty-codec-protobuf/4.2.5.Final": {
-   "jar": "sha256-8+kJdquyUHbwQ2mRWU8YmgVojxdOhxIgGiDO+QtdRuU=",
-   "pom": "sha256-9N2ofsIrP4Scp9QXjM5lVvDURgLX3x/JQ9WFjK1ZcPs="
+  "io/netty#netty-codec-protobuf/4.2.7.Final": {
+   "jar": "sha256-SyUlm2916/x38BSgj2m60BkRbU9cpUj9xB89rYwN4zE=",
+   "pom": "sha256-Ub3X5EMhhkFp9Oqt7RQaaXLBhkh+/fAa59t/3jaQcSU="
   },
-  "io/netty#netty-codec/4.2.5.Final": {
-   "jar": "sha256-ldefnyrnzpAJD6DhIgCAjZ5K2mKAxRb5xbFbgbc4RSc=",
-   "pom": "sha256-BoPfFBysofMIKQbfgxoe+GdqTcbTIQUQMDy48HVJ950="
+  "io/netty#netty-codec/4.2.7.Final": {
+   "jar": "sha256-XzaWWDgXiZmMBCqY8C2nHZw5iEu7T3/VgoL3ZeCcoDE=",
+   "pom": "sha256-5FSK3jVlANmEy7jJP9iEZacPdWHlGbyV6y/O7s4bKjE="
   },
-  "io/netty#netty-common/4.2.5.Final": {
-   "jar": "sha256-SwTG+QaQjqcQARfXUp4FW6To+s9ibTklKVotoiOxOk0=",
-   "pom": "sha256-20vxaZsgxg214QCuYs49jnZNqu9OGr9MLqKt4kXpzdI="
+  "io/netty#netty-common/4.2.7.Final": {
+   "jar": "sha256-I0W8DtWEP6V6pJ66Z1KUhcOh1CD88EKTJMgiDHqA6aY=",
+   "pom": "sha256-/jMRoayD8KGH/n2+Be6B6Ef2JvmtkN2wx4WusJ0Y/DM="
   },
-  "io/netty#netty-handler/4.2.5.Final": {
-   "jar": "sha256-VPDE56/mSwJ6jkTPqdgsWsyklCFjtlgP6s9N4tpkF8g=",
-   "pom": "sha256-MK1O0cFi4lwQxYZvc4BXYLl3+Vty/aZcJWFdy/ikc5g="
+  "io/netty#netty-handler/4.2.7.Final": {
+   "jar": "sha256-IdBjQJwS287EbTgMiFag97altou18dAF6wZbTWQUbLM=",
+   "pom": "sha256-79QqDJKAKPlJsWREfBtOFt7eccgihRppL1hzEhTr0oM="
   },
-  "io/netty#netty-parent/4.2.5.Final": {
-   "pom": "sha256-FTTxAc+z3mlU4XAyaFzkJdZHaVHeA9KeC8egC9rimZs="
+  "io/netty#netty-parent/4.2.7.Final": {
+   "pom": "sha256-56FYFCV9GpaNpyU3yRUscw7d9uf9Wj581wJuVclladM="
   },
-  "io/netty#netty-resolver/4.2.5.Final": {
-   "jar": "sha256-f+RoI2Art+TpZvXTCX1JnmOfsmCsbCEB7gALqZlWEnU=",
-   "pom": "sha256-r5azHqO2vIjoatYM58BZ4j68MNUh4bCWQ1rR/JKAJho="
+  "io/netty#netty-resolver/4.2.7.Final": {
+   "jar": "sha256-fk1WmGfmwIQ3+yGiIOoBwpSw448BFJtoPIlaG82ShDg=",
+   "pom": "sha256-F6vZjvgRyuBYbZ41xMUUZ3GXLrJy+Fek2eDDBe0hs5g="
   },
-  "io/netty#netty-transport-classes-epoll/4.2.5.Final": {
-   "jar": "sha256-t4GKIt8uuYksOHNM5RoTo/xz9gRbLAwXSI2sb0+xGuE=",
-   "pom": "sha256-JSTG6SuvgtaRLethiDY52MNtSsxhGEF4Zk3xcQxvFhs="
+  "io/netty#netty-transport-classes-epoll/4.2.7.Final": {
+   "jar": "sha256-RJKUjmp2lDmOUZfPFe0uIdZmKnOdAQrmZvonbnIihTw=",
+   "pom": "sha256-RoQ5xbLK4wAXuv2XaqJJfEiA/aYSSyPBrUKQt5CMXA8="
   },
-  "io/netty#netty-transport-classes-io_uring/4.2.5.Final": {
-   "jar": "sha256-eGqI2zhSIo1QyL1V5hyp0EmurxWAK4VzertMD7kC2Ec=",
-   "pom": "sha256-JGGbc9y7TaRAylfgYtSJ3vUR7cGcALy4tP/gCwBd86g="
+  "io/netty#netty-transport-classes-io_uring/4.2.7.Final": {
+   "jar": "sha256-/5ZodMYvU+0HKWLxv128Sf3dS9PGC/yafhfONLOax68=",
+   "pom": "sha256-fEFSqfVOcE6KSVjdiggLCaW3d6jqcxjxKNfOM4ayqic="
   },
-  "io/netty#netty-transport-classes-kqueue/4.2.5.Final": {
-   "jar": "sha256-P45empwDvk2wIVPiuj0o8dfEYEYXtH7J8nqZqAl69wg=",
-   "pom": "sha256-fEXK6S/QjZMPhrnsd16WiBie+Ms0VZMYcjAZi0pB4Dg="
+  "io/netty#netty-transport-classes-kqueue/4.2.7.Final": {
+   "jar": "sha256-o+sclK4aa+nh0exSw/XFEKdbBLjvHqhrfnez8Sh648w=",
+   "pom": "sha256-mtwTZN1F7chJ933s8SVy3FR4XPbqx5wuhqdyXRGhczM="
   },
-  "io/netty#netty-transport-native-epoll/4.2.5.Final": {
-   "jar": "sha256-gMmYUyacv1OSQ2C16Z2+gbCZFcqX3XHAFkp5ZkrT7RQ=",
-   "pom": "sha256-XXjoG/qvHv8MoaAWwFY6fmpskg9vYAdjXbRyMdtIHhs="
+  "io/netty#netty-transport-native-epoll/4.2.7.Final": {
+   "jar": "sha256-vc+Af3LZqbf5hklxcQdlLKcVMkVwLomTnM63D4zKsY8=",
+   "pom": "sha256-ygZltZ4tBvqQRF5G/UBaYumOhrFL9TwC0eyCUYE8Vto="
   },
-  "io/netty#netty-transport-native-epoll/4.2.5.Final/linux-aarch_64": {
-   "jar": "sha256-58rjjoCrVXxuqCnxSlv3/3QG9ZEr09pnCJWiegFUQwo="
+  "io/netty#netty-transport-native-epoll/4.2.7.Final/linux-aarch_64": {
+   "jar": "sha256-LwxzCdffSKiPs3TALPtEbhoeX7WX+wLXc8cKwH2iwmg="
   },
-  "io/netty#netty-transport-native-epoll/4.2.5.Final/linux-x86_64": {
-   "jar": "sha256-h+TjnoNCHO1Y9OCdzJkgpzZUTxE6lurb8SgWsEViKvI="
+  "io/netty#netty-transport-native-epoll/4.2.7.Final/linux-x86_64": {
+   "jar": "sha256-fzlcj9vmmQ92ZECLV9kZBCQBuJMXj8uki+vxphv3hhg="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.5.Final": {
-   "jar": "sha256-G6yc5FBTpSmQEf2W9NOywpFnrH4R0jig+7/IgE3MKrw=",
-   "pom": "sha256-z6EQRHOtojYkkB1k7iBM61Euh4IeaRgSS2DpCLAkQgY="
+  "io/netty#netty-transport-native-io_uring/4.2.7.Final": {
+   "jar": "sha256-mKjWMVHe0xcscfhVIDrhlpgvAFIZaso7a6l9PoXUJgk=",
+   "pom": "sha256-Q543Rm1v45ZZHsS6JjVcjkRMOB0j9wVMIKL9isXJe0I="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.5.Final/linux-aarch_64": {
-   "jar": "sha256-VYOo0DLAclkVfTEv+wQjbvk3yFakpp1ZpdmlA0O4EDY="
+  "io/netty#netty-transport-native-io_uring/4.2.7.Final/linux-aarch_64": {
+   "jar": "sha256-hPw53BAZ9KbFJEsdealxTLZ/BFu9rk/vJvSYHm9nrb4="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.5.Final/linux-x86_64": {
-   "jar": "sha256-8Tb8qT44ZzaOwvQDMrPTddjCKY06yNLqOohtIs6lh20="
+  "io/netty#netty-transport-native-io_uring/4.2.7.Final/linux-x86_64": {
+   "jar": "sha256-wjZQn1W/khZm8CMu/rdWMnm2y0YNnko2xKukDSIXv2I="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.5.Final": {
-   "jar": "sha256-rr9gy2LUD+q/pjaVUe5aj6pELNixgXL8LxQoFbsmUDw=",
-   "pom": "sha256-TtTZxdXYadsSG88D0nG2by6GCEsnY+W9TZcdiwp82yo="
+  "io/netty#netty-transport-native-kqueue/4.2.7.Final": {
+   "jar": "sha256-8BrzuSyghzja6ep5E3jCiF8wXSEK0W48VxZVueJr0Dw=",
+   "pom": "sha256-/0QzBLr/YGgE922pFg73w/Kh7mZcZe9it74n1vfAMqM="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.5.Final/osx-aarch_64": {
-   "jar": "sha256-T7yUPQqQu3FC7qDMqdZYXIHcN5g+ANxwhKOSEjJpkUo="
+  "io/netty#netty-transport-native-kqueue/4.2.7.Final/osx-aarch_64": {
+   "jar": "sha256-dkemlVjj1Jo1J4HCroGpfha0QtfGVloGtK4PFSmEidU="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.5.Final/osx-x86_64": {
-   "jar": "sha256-w/pmI401PBlBmwFysdazuaS1mvOgS/bsAiXZamk0D9o="
+  "io/netty#netty-transport-native-kqueue/4.2.7.Final/osx-x86_64": {
+   "jar": "sha256-opwItolXRqrKeW5ypCm8cF9AJn/rNfdc2Pu81N5t6Z8="
   },
-  "io/netty#netty-transport-native-unix-common/4.2.5.Final": {
-   "jar": "sha256-znLyQj2jEvnZZV/lT0oLVZneVPuRYOvX7D+ycwr4q8M=",
-   "pom": "sha256-TQGNBAkDVC8OitiqHHYeOfQ67Ou5GBCanvP1N+WRcmI="
+  "io/netty#netty-transport-native-unix-common/4.2.7.Final": {
+   "jar": "sha256-c2cDs/bRJ+GC9b6Ii24VcysMCNZjTgByU1KmqdGZdLI=",
+   "pom": "sha256-EnhcnEoH0qFDJYYWRWrqw6bgIqoXJBeYA04x+LDtHqk="
   },
-  "io/netty#netty-transport/4.2.5.Final": {
-   "jar": "sha256-ArTpqs4SYLENANeBb7Quoj+wVobte3+45q1Ozz2mH/8=",
-   "pom": "sha256-PcP4jk6N0k7Bf6EDeuRDJGOtR6Iv8jjmuD/RRJeCMPQ="
+  "io/netty#netty-transport/4.2.7.Final": {
+   "jar": "sha256-qtxvsFwU+3iTaMo/hUchVJxy9sDYF5i7zPneG7cWiSs=",
+   "pom": "sha256-zQTiYzq09WBE6aFdUV6ZyBY4iZ2vB9gJdhlzp8DPnqo="
   },
   "it/unimi/dsi#fastutil/8.5.15": {
    "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index f75c40a88885..82e035b2c226 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.4.0-unstable-2025-10-11";
+  version = "3.4.0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "806b386cdb8da23051a9679682ed6a76370b9818";
-    hash = "sha256-2Wy9mnIvGab/vgH6fVK+HJcpOUwPMkgncXOGcZPnDhg=";
+    rev = "b6b6b20fe97cd9cb0d6b4e817d3e7db72aca2d8d";
+    hash = "sha256-UHkioSGKikYxHq/petnJSHpvx/ioH01N6FSl0176YVA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index fcc43ce64836..b56682f189a4 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.13.3";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wKLI2YE1rEzkRjDeM85XAx2DIrWYGoZrQT8OHtsNJ7E=";
+    hash = "sha256-btbGURE3szy7qiC9W3N3+RdfnH+EUJv78m9tDZYeA1M=";
   };
 
   patches = [ ./fix-deps.patch ];
diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index d2ffcedfd8e4..99de216280d7 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "1.5.0";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "venera-app";
     repo = "venera";
     tag = "v${version}";
-    hash = "sha256-LhPtoMD7IjxbTFTSzP+vtflDUixUoN9eqE1AQyWhJzg=";
+    hash = "sha256-yjO7nQ3F+DLudjqXUp0N13lhBZSAKwAeKXRAKxPxDVQ=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json
index 5891ffafb0f0..d170ac3807a2 100644
--- a/pkgs/by-name/ve/venera/pubspec.lock.json
+++ b/pkgs/by-name/ve/venera/pubspec.lock.json
@@ -40,6 +40,16 @@
       "source": "hosted",
       "version": "1.0.4"
     },
+    "archive": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "archive",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.7"
+    },
     "args": {
       "dependency": "transitive",
       "description": {
@@ -505,11 +515,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_memory_info",
-        "sha256": "1f112f1d7503aa1681fc8e923f6cd0e847bb2fbeec3753ed021cf1e5f7e9cd74",
+        "sha256": "eacfd0dd01ff596b4e5bf022442769a1807a73f2af43d62802436f0a5de99137",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.1"
+      "version": "0.0.3"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
@@ -957,6 +967,16 @@
       "source": "hosted",
       "version": "4.0.0"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
+    },
     "rhttp": {
       "dependency": "direct main",
       "description": {
@@ -1389,6 +1409,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.35.2"
+    "flutter": ">=3.35.5"
   }
 }
diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix
index d1e5e09a7c11..27d99631c2eb 100644
--- a/pkgs/by-name/ve/verco/package.nix
+++ b/pkgs/by-name/ve/verco/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
     homepage = "https://vamolessa.github.io/verco";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "verco";
   };
 }
diff --git a/pkgs/by-name/ve/vermin/package.nix b/pkgs/by-name/ve/vermin/package.nix
index 3fe5c63dc1e8..4946cf4ee9a3 100644
--- a/pkgs/by-name/ve/vermin/package.nix
+++ b/pkgs/by-name/ve/vermin/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "vermin";
-  version = "1.6.0";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "netromdk";
     repo = "vermin";
     rev = "v${version}";
-    hash = "sha256-lgxYQ8oNfa0+8BUf3nRv0fcNLP+UATjz733ms3pM6gQ=";
+    hash = "sha256-9rEJSj/dsP6fMXTfbIhTMwfZnmfq9wdAE4mHdAxag7Y=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index 1fd54eed863b..6d2449b0c5e5 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "versatiles";
-  version = "1.0.1"; # When updating: Replace with current version
+  version = "2.0.1"; # When updating: Replace with current version
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     tag = "v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-Byc8w1NCJbLPInXgva41CO2SnqWRubXeELJLlMFf54k="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    hash = "sha256-qFVqikq1T6LQnOWgM66uKzFhWQbVjEuUK3N5vNvaDq4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
-  cargoHash = "sha256-kWRzxaGDVV3FuVrg+hqpCHPvbCQ0KMO1luCgNiNHYeg="; # When updating: Same as above
+  cargoHash = "sha256-kkYdQEBydxPwxxSjTiwk4huCDK3xJ9FoyrcHL88ytfk="; # When updating: Same as above
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix
index 98682898e598..a20bcbd1f06b 100644
--- a/pkgs/by-name/ve/veryfasttree/package.nix
+++ b/pkgs/by-name/ve/veryfasttree/package.nix
@@ -35,5 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.all;
+    # last successful hydra build on darwin was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/ve/vesktop/disable_update_checking.patch b/pkgs/by-name/ve/vesktop/disable_update_checking.patch
deleted file mode 100644
index 2fcc1fc24be7..000000000000
--- a/pkgs/by-name/ve/vesktop/disable_update_checking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/main/index.ts b/src/main/index.ts
-index 37fd471..d0a9e56 100644
---- a/src/main/index.ts
-+++ b/src/main/index.ts
-@@ -18,7 +18,6 @@ import { Settings, State } from "./settings";
- import { isDeckGameMode } from "./utils/steamOS";
-
- if (!IS_DEV) {
--    autoUpdater.checkForUpdatesAndNotify();
- }
-
- console.log("Vesktop v" + app.getVersion());
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 2555add4a42f..b31f5a78d051 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
-  version = "1.5.8";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "Vencord";
     repo = "Vesktop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9wYIg1TGcntUMMp6SqYrgDRl3P41eeOqt76OMjSAi5M=";
+    hash = "sha256-ZFAsyH+5duKerZissOR/lESLetqqEMLk86msLlQO1xU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 2;
-    hash = "sha256-rJzXbIQUxCImTqeH8EsGiyGNGoHYUqoekoa+VXpob5Y=";
+    hash = "sha256-7fYD4lTSLCMOa+CqGlL45Mjw6qMfIJddPcRF5/dGGrk=";
   };
 
   nativeBuildInputs = [
@@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    ./disable_update_checking.patch
     ./fix_read_only_settings.patch
   ]
   ++ lib.optional withSystemVencord (
diff --git a/pkgs/by-name/ve/vesktop/use_system_vencord.patch b/pkgs/by-name/ve/vesktop/use_system_vencord.patch
index 99ac643ef653..a9df59da9268 100644
--- a/pkgs/by-name/ve/vesktop/use_system_vencord.patch
+++ b/pkgs/by-name/ve/vesktop/use_system_vencord.patch
@@ -1,13 +1,10 @@
-diff --git a/src/main/constants.ts b/src/main/constants.ts
-index 40d91a5..7b46bbf 100644
---- a/src/main/constants.ts
-+++ b/src/main/constants.ts
-@@ -49,7 +49,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
- // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
- export const VENCORD_FILES_DIR =
-     (require("./settings") as typeof import("./settings")).State.store.vencordDir ||
--    join(SESSION_DATA_DIR, "vencordFiles");
-+    "@vencord@";
- 
- export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;
+diff --git a/src/main/vencordFilesDir.ts b/src/main/vencordFilesDir.ts
+index 8ef9ab8..ac376e0 100644
+--- a/src/main/vencordFilesDir.ts
++++ b/src/main/vencordFilesDir.ts
+@@ -10,4 +10,4 @@ import { SESSION_DATA_DIR } from "./constants";
+ import { State } from "./settings";
  
+ // this is in a separate file to avoid circular dependencies
+-export const VENCORD_FILES_DIR = State.store.vencordDir || join(SESSION_DATA_DIR, "vencordFiles");
++export const VENCORD_FILES_DIR = State.store.vencordDir || "@vencord@";
diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix
new file mode 100644
index 000000000000..6ee005925662
--- /dev/null
+++ b/pkgs/by-name/ve/vesta-viewer/package.nix
@@ -0,0 +1,122 @@
+{
+  lib,
+  fetchzip,
+  fetchurl,
+  stdenvNoCC,
+  makeDesktopItem,
+  copyDesktopItems,
+  autoPatchelfHook,
+  _7zz,
+
+  glib,
+  libGL,
+  libGLU,
+  libgcc,
+  gtk3,
+  gtk2,
+  xorg,
+  temurin-jre-bin,
+}:
+
+let
+  pname = "vesta-viewer";
+  version = "3.5.8";
+  meta = {
+    description = "3D visualization program for structural models, volumetric data such as electron/nuclear densities, and crystal morphologies";
+    homepage = "https://jp-minerals.org/vesta/";
+    license = lib.licenses.unfree;
+    downloadPage = "https://jp-minerals.org/vesta/en/download.html";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+    ];
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    mainProgram = "VESTA";
+  };
+
+  linuxArgs = {
+    nativeBuildInputs = [
+      copyDesktopItems
+      autoPatchelfHook
+    ];
+    buildInputs = [
+      glib
+      libGL
+      libGLU
+      libgcc
+      gtk3
+      gtk2
+      temurin-jre-bin
+    ]
+    ++ (with xorg; [
+      libXxf86vm
+      libXtst
+    ]);
+
+    src = fetchzip {
+      url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2";
+      hash = "sha256-Dm4exMUgNZ6Sh8dVhsvLZGS38UXxe9t+9s3ttBQajGg=";
+    };
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/lib/VESTA
+      cp -r * $out/lib/VESTA
+
+      mkdir -p $out/bin
+      ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin
+
+      mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps
+      ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png
+      ln -s $out/lib/VESTA/img/logo@2x.png $out/share/icons/hicolor/256x256/apps/VESTA.png
+
+      runHook postInstall
+    '';
+
+    desktopItems = [
+      (makeDesktopItem {
+        name = "vesta";
+        comment = meta.description;
+        desktopName = "VESTA";
+        genericName = "VESTA";
+        exec = "VESTA %u";
+        icon = "VESTA";
+        categories = [ "Science" ];
+        mimeTypes = [ "application/x-vesta" ];
+      })
+    ];
+  };
+
+  darwinArgs = {
+    nativeBuildInputs = [
+      _7zz # instead of undmg because of APFS
+    ];
+    src = fetchurl {
+      url = "https://jp-minerals.org/vesta/archives/${version}/VESTA.dmg";
+      hash = "sha256-L8vj3MNwHo3m5wP1lByNjHZ4VTVOWSm0Aiw1ItosbSw=";
+    };
+    sourceRoot = "VESTA/VESTA";
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications
+      cp -r *.app $out/Applications
+
+      runHook postInstall
+    '';
+  };
+in
+stdenvNoCC.mkDerivation (
+  {
+    inherit pname version meta;
+    # I could've written an update script here,
+    # but I didn't bother because the stable version hasn't been updated for years.
+  }
+  // {
+    "x86_64-linux" = linuxArgs;
+    "x86_64-darwin" = darwinArgs;
+  }
+  .${stdenvNoCC.hostPlatform.system} or { }
+)
diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix
index 752de83ed93e..5333cdc423a5 100644
--- a/pkgs/by-name/vf/vfox/package.nix
+++ b/pkgs/by-name/vf/vfox/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vfox";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "version-fox";
     repo = "vfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lVhw2OB4TVkqYbI+kGvBX2RMisc+1aF3Sl6z/kshmZE=";
+    hash = "sha256-Dtu0A+BC/9sypnWvA8XOlmQFPsV5LUGCXpdarYeCdlU=";
   };
 
   vendorHash = "sha256-+5hJMip3wAR1k6n21I3QFYe++nw4J4Ip+43EujQl2ec=";
diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index d17e6585ecc8..f1c3ef1a0447 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -13,51 +13,26 @@
   libao,
   speex,
   nix-update-script,
+
+  audaciousSupport ? stdenv.hostPlatform.isLinux,
 }:
 
-let
-  # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
-  atrac9-src = fetchFromGitHub {
-    owner = "Thealexbarney";
-    repo = "LibAtrac9";
-    rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
-    hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
-  };
+assert lib.assertMsg (
+  audaciousSupport -> stdenv.hostPlatform.isLinux
+) "Only Linux supports building the Audacious plugin.";
 
-  # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
-  celt-0_6_1-src = fetchzip {
-    url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
-    hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
-  };
-  celt-0_11_0-src = fetchzip {
-    url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
-    hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
-  };
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vgmstream";
   version = "2055";
 
   src = fetchFromGitHub {
     owner = "vgmstream";
     repo = "vgmstream";
-    tag = "r${version}";
+    tag = "r${finalAttrs.version}";
     hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU=";
   };
 
-  passthru.updateScript = nix-update-script {
-    attrPath = "vgmstream";
-    extraArgs = [
-      "--version-regex"
-      "r(.*)"
-    ];
-  };
-
-  outputs = [
-    "out"
-    "audacious"
-  ];
+  outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious";
 
   nativeBuildInputs = [
     cmake
@@ -71,8 +46,8 @@ stdenv.mkDerivation rec {
     libvorbis
     libao
     speex
-    audacious-bare
-  ];
+  ]
+  ++ lib.optional audaciousSupport audacious-bare;
 
   preConfigure = ''
     substituteInPlace cmake/dependencies/audacious.cmake \
@@ -83,20 +58,49 @@ stdenv.mkDerivation rec {
     # Therefore, CELT_0110_PATH needs to point to a mutable directory.
     lib.optionalString (stdenv.system == "x86_64-linux") ''
       mkdir -p dependencies/celt-0.11.0/
-      cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/
+      cp -r ${finalAttrs.passthru.sources.celt-0_11_0-src}/* dependencies/celt-0.11.0/
       chmod -R +w dependencies/celt-0.11.0/
     '';
 
   cmakeFlags = [
-    "-DATRAC9_PATH=${atrac9-src}"
+    "-DATRAC9_PATH=${finalAttrs.passthru.sources.atrac9-src}"
+    (lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport)
   ]
   # Only supported on x86_64-linux
   ++ lib.optionals (stdenv.system == "x86_64-linux") [
-    "-DCELT_0061_PATH=${celt-0_6_1-src}"
+    "-DCELT_0061_PATH=${finalAttrs.passthru.sources.celt-0_6_1-src}"
     "-DCELT_0110_PATH=../dependencies/celt-0.11.0"
     # libg719_decode omitted because it doesn't have a free software license
   ];
 
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "vgmstream";
+      extraArgs = [
+        "--version-regex"
+        "r(.*)"
+      ];
+    };
+    sources = {
+      # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
+      atrac9-src = fetchFromGitHub {
+        owner = "Thealexbarney";
+        repo = "LibAtrac9";
+        rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
+        hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
+      };
+      # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
+      celt-0_6_1-src = fetchzip {
+        url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
+        hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
+      };
+      celt-0_11_0-src = fetchzip {
+        url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
+        hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
+      };
+    };
+  };
+
   meta = with lib; {
     description = "Library for playback of various streamed audio formats used in video games";
     homepage = "https://vgmstream.org";
@@ -110,4 +114,4 @@ stdenv.mkDerivation rec {
       ++ optional (stdenv.system == "x86_64-linux") bsd2;
     platforms = with platforms; unix;
   };
-}
+})
diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix
index f71bec903e13..ce0e16aadba4 100644
--- a/pkgs/by-name/vg/vgmtools/package.nix
+++ b/pkgs/by-name/vg/vgmtools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "vgmtools";
-  version = "0.1-unstable-2025-08-20";
+  version = "0.1-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "vgmrips";
     repo = "vgmtools";
-    rev = "7e071f9fff11031e6bbe3ccc73d180be08727804";
-    hash = "sha256-GTdMLDGVAeV4aIrnKYc/NE1FVU5DS1TspeTcx4qwUQA=";
+    rev = "606db7fa229389b80bccb4c6e28b3d71dfddc984";
+    hash = "sha256-kOkBIN1/FG6snpriLiu8ZMqGa2MXOC79zUZwGrMyk/A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vi/viber/package.nix b/pkgs/by-name/vi/viber/package.nix
index a2847e7d5206..158bde24d1cb 100644
--- a/pkgs/by-name/vi/viber/package.nix
+++ b/pkgs/by-name/vi/viber/package.nix
@@ -1,11 +1,13 @@
 {
-  fetchurl,
   lib,
   stdenv,
+  fetchurl,
   dpkg,
   makeWrapper,
   alsa-lib,
+  bintools,
   brotli,
+  cairo,
   cups,
   curl,
   dbus,
@@ -13,53 +15,73 @@
   fontconfig,
   freetype,
   glib,
+  gsm,
   gst_all_1,
   harfbuzz,
   lcms,
+  libbluray,
   libcap,
+  libdrm,
   libevent,
+  libgbm,
   libGL,
   libGLU,
   libkrb5,
+  libmng,
+  libopenmpt,
   libopus,
   libpulseaudio,
+  librsvg,
+  libtheora,
+  libtiff,
+  libva,
+  libvdpau,
+  libwebp,
   libxkbcommon,
   libxkbfile,
   libxml2,
   libxslt,
-  libwebp,
-  libgbm,
+  mtdev,
   nspr,
   nss,
+  numactl,
+  ocl-icd,
+  openjpeg,
   openssl,
   snappy,
-  systemd,
+  speex,
+  systemdLibs,
+  tslib,
+  twolame,
+  wavpack,
   wayland,
   xorg,
+  xvidcore,
   zlib,
   zstd,
+  zvbi,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "viber";
-  version = "23.2.0.3";
+  version = "24.9.0.3";
 
   src = fetchurl {
     # Taking Internet Archive snapshot of a specific version to avoid breakage
     # on new versions
-    url = "https://web.archive.org/web/20240824071651/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
-    hash = "sha256-9WHiI2WlsgEhCPkrQoAunmF6lSb2n5RgQJ2+sdnSShM=";
+    url = "https://web.archive.org/web/20250830135453/https://download.cdn.viber.com/cdn/desktop/Linux/viber.deb";
+    hash = "sha256-i7fG8Sdl/v5QAyTsCh6OKe4BDYnQ0jBJgSdqMOrkLNo=";
   };
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildInputs = [ dpkg ];
-
-  dontUnpack = true;
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
 
   libPath = lib.makeLibraryPath [
     alsa-lib
     brotli
+    cairo
     cups
     curl
     dbus
@@ -67,37 +89,53 @@ stdenv.mkDerivation {
     fontconfig
     freetype
     glib
+    gsm
+    gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
     gst_all_1.gstreamer
     harfbuzz
     lcms
+    libbluray
     libcap
+    libdrm
     libevent
-    libGLU
+    libgbm
     libGL
+    libGLU
     libkrb5
+    libmng
+    libopenmpt
     libopus
     libpulseaudio
+    librsvg
+    libtheora
+    libtiff
+    libva
+    libvdpau
+    libwebp
     libxkbcommon
     libxkbfile
     libxml2
     libxslt
-    libwebp
-    libgbm
+    mtdev
     nspr
     nss
+    numactl
+    ocl-icd
+    openjpeg
     openssl
     snappy
+    speex
     stdenv.cc.cc
-    systemd
+    systemdLibs
+    tslib
+    twolame
+    wavpack
     wayland
-    zlib
-    zstd
-
     xorg.libICE
     xorg.libSM
     xorg.libX11
-    xorg.libxcb
     xorg.libXcomposite
     xorg.libXcursor
     xorg.libXdamage
@@ -108,44 +146,45 @@ stdenv.mkDerivation {
     xorg.libXrender
     xorg.libXScrnSaver
     xorg.libXtst
+    xorg.libxcb
     xorg.xcbutilimage
     xorg.xcbutilkeysyms
     xorg.xcbutilrenderutil
     xorg.xcbutilwm
+    xvidcore
+    zlib
+    zstd
+    zvbi
   ];
 
   installPhase = ''
-    dpkg-deb -x $src $out
-    mkdir -p $out/bin
+    runHook preInstall
 
-    # Soothe nix-build "suspicions"
-    chmod -R g-w $out
+    cp -r . $out
 
     for file in $(find $out -type f \( -perm /0111 -o -name \*.so\* \) ); do
-      patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$file" || true
-      patchelf --set-rpath $libPath:$out/opt/viber/lib:$out/lib $file || true
+      patchelf --set-interpreter ${bintools.dynamicLinker} "$file" || true
+      patchelf --set-rpath ${finalAttrs.libPath}:$out/opt/viber/lib $file || true
     done
 
+    mkdir $out/bin
     # qt.conf is not working, so override everything using environment variables
-    wrapProgram $out/opt/viber/Viber \
+    makeWrapper $out/opt/viber/Viber $out/bin/viber \
       --set QT_QPA_PLATFORM "xcb" \
       --set QT_PLUGIN_PATH "$out/opt/viber/plugins" \
       --set QT_XKB_CONFIG_ROOT "${xorg.xkeyboardconfig}/share/X11/xkb" \
       --set QTCOMPOSE "${xorg.libX11.out}/share/X11/locale" \
       --set QML2_IMPORT_PATH "$out/opt/viber/qml"
-    ln -s $out/opt/viber/Viber $out/bin/viber
 
     mv $out/usr/share $out/share
     rm -rf $out/usr
-
     # Fix the desktop link
     substituteInPlace $out/share/applications/viber.desktop \
-      --replace /opt/viber/Viber $out/opt/viber/Viber \
-      --replace /usr/share/ $out/share/
-
+      --replace-fail "/opt/viber/" "$out/opt/viber/"
     # Fix libxml2 breakage. See https://github.com/NixOS/nixpkgs/pull/396195#issuecomment-2881757108
-    mkdir -p "$out/lib"
     ln -s "${lib.getLib libxml2}/lib/libxml2.so" "$out/opt/viber/lib/libxml2.so.2"
+
+    runHook postInstall
   '';
 
   dontStrip = true;
@@ -159,5 +198,4 @@ stdenv.mkDerivation {
     platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [ jagajaga ];
   };
-
-}
+})
diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix
index 54e7203b8fcb..b5ed99eab189 100644
--- a/pkgs/by-name/vi/viceroy/package.nix
+++ b/pkgs/by-name/vi/viceroy/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viceroy";
-  version = "0.14.4";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "viceroy";
     rev = "v${version}";
-    hash = "sha256-rK+Us4QvvWpHtMvq5s3koPyy7xKhVQsxUMQnpyfMtDU=";
+    hash = "sha256-CG+D4jh5p6bcc0E6qTvecwkoxCRoHJAGiAOtR8A+Otc=";
   };
 
-  cargoHash = "sha256-SacepQEMpDxqd7vl/sjkxyTb3R7z+Q1IQOrfZyV8nRU=";
+  cargoHash = "sha256-K4nh/ODbk++UxxIoeLpq4boWGbID2DJW845rx605Z7Y=";
 
   cargoTestFlags = [
     "--package viceroy-lib"
diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
new file mode 100644
index 000000000000..ccdabb49d74e
--- /dev/null
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -0,0 +1,104 @@
+{
+  cmake,
+  cmark-gfm,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  grpc-tools,
+  kdePackages,
+  lib,
+  libqalculate,
+  minizip,
+  ninja,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  protobuf,
+  qt6,
+  rapidfuzz-cpp,
+  stdenv,
+  wayland,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vicinae";
+  version = "0.16.1";
+
+  src = fetchFromGitHub {
+    owner = "vicinaehq";
+    repo = "vicinae";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-PWfgR7wyQINl0Xy/AJAaaUo1WtrkznGcaL1aCACqI7U=";
+  };
+
+  apiDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/typescript/api";
+    hash = "sha256-VrtxQG1wQGcRHbJWPPt6aS7x1hAHc4Z1+0l+cKv3YdI=";
+  };
+
+  extensionManagerDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/typescript/extension-manager";
+    hash = "sha256-krDFHTG8irgVk4a79LMz148drLgy2oxEoHCKRpur1R4=";
+  };
+
+  cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {
+    "VICINAE_GIT_TAG" = "v${finalAttrs.version}";
+    "VICINAE_PROVENANCE" = "nix";
+    "INSTALL_NODE_MODULES" = "OFF";
+    "CMAKE_INSTALL_PREFIX" = placeholder "out";
+    "CMAKE_INSTALL_DATAROOTDIR" = "share";
+    "CMAKE_INSTALL_BINDIR" = "bin";
+    "CMAKE_INSTALL_LIBDIR" = "lib";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    nodejs
+    pkg-config
+    protobuf
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    cmark-gfm
+    grpc-tools
+    kdePackages.layer-shell-qt
+    kdePackages.qtkeychain
+    libqalculate
+    minizip
+    nodejs
+    protobuf
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtwayland
+    rapidfuzz-cpp
+    wayland
+  ];
+
+  postPatch = ''
+    local postPatchHooks=()
+    source ${npmHooks.npmConfigHook}/nix-support/setup-hook
+    npmRoot=typescript/api npmDeps=${finalAttrs.apiDeps} npmConfigHook
+    npmRoot=typescript/extension-manager npmDeps=${finalAttrs.extensionManagerDeps} npmConfigHook
+  '';
+
+  qtWrapperArgs = [
+    "--prefix PATH :  ${
+      lib.makeBinPath [
+        nodejs
+        (placeholder "out")
+      ]
+    }"
+  ];
+
+  meta = {
+    description = "A focused launcher for your desktop — native, fast, extensible";
+    homepage = "https://github.com/vicinaehq/vicinae";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      dawnofmidnight
+      zstg
+    ];
+    platforms = lib.platforms.linux;
+    mainProgram = "vicinae";
+  };
+})
diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 2ceb5c9ace3c..43a9ddc37869 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.127.0";
+  version = "1.129.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI=";
+    hash = "sha256-LLiiA+A3s3WcJcwyqRYKFn+VwaEbbufiawZsyG+ibGU=";
   };
 
   vendorHash = null;
@@ -52,8 +52,8 @@ buildGoModule (finalAttrs: {
     rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
 
     # Allow older go versions
-    substituteInPlace go.mod \
-      --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}"
+    sed -i go.mod -e 's/^go .*/go ${finalAttrs.passthru.go.version}/'
+    sed -i vendor/modules.txt -e 's/## explicit; go .*/## explicit; go ${finalAttrs.passthru.go.version}/'
 
     # Increase timeouts in tests to prevent failure on heavily loaded builders
     substituteInPlace lib/storage/storage_test.go \
diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index 542cd901e8c6..b7b828443966 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -13,7 +13,7 @@
   # adds support for handling removable media (vifm-media). Linux only!
   mediaSupport ? false,
   python3 ? null,
-  udisks2 ? null,
+  udisks ? null,
   lib ? null,
   gitUpdater,
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   postFixup =
     let
       path = lib.makeBinPath [
-        udisks2
+        udisks
         (python3.withPackages (p: [ p.dbus-python ]))
       ];
 
diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 2a72ca017194..2590f2cc3eb8 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.21.4";
+  version = "1.21.5";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-npffJgxgUMefX9OiveNk1r4kVqsMaVCC1jcWaibz9l8=";
+    hash = "sha256-dG1D2Buqht+bRyxx2ie34Z+U1bdKgi5R3w29BG/a5jg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index aa753468ae7e..a2213c1e1679 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -52,7 +52,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vips";
-  version = "8.17.2";
+  version = "8.17.3";
 
   outputs = [
     "bin"
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libvips";
     repo = "libvips";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jwb1bH0y3lmv/IU5JqcnAxiMK4gj+aTBj5nLKZ+XnKY=";
+    hash = "sha256-yxjfkb2R3JPHbz0vCG4hkW9Davoc9MUPHL9Cqc+Ik0Y=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
diff --git a/pkgs/by-name/vi/virtnbdbackup/package.nix b/pkgs/by-name/vi/virtnbdbackup/package.nix
index 5e502efc2162..613e3f63f66f 100644
--- a/pkgs/by-name/vi/virtnbdbackup/package.nix
+++ b/pkgs/by-name/vi/virtnbdbackup/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "virtnbdbackup";
-  version = "2.37";
+  version = "2.38";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "virtnbdbackup";
     tag = "v${version}";
-    hash = "sha256-G3nDaAIWxSA6EsqiVpdouBRWprSbogcMTTroquK8Big=";
+    hash = "sha256-GKFMldHqIVi8PjnfYjj1nyS6hDH9ANHEm4kH9K+Al9E=";
   };
 
   build-system = with python3Packages; [
diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 2e5709600e93..c363abe2a31d 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "1.3.0";
+  version = "1.3.1";
   withSubprojects = stdenv.mkDerivation {
     pname = "sources-with-subprojects";
     inherit version;
@@ -31,7 +31,7 @@ let
       repo = "vivictpp";
       tag = "v${version}";
       fetchSubmodules = true;
-      hash = "sha256-yzUgLZbqEzyJINWQUTC/j33XbjSXP1vpDlgiKv6Jx9Q=";
+      hash = "sha256-g/M3blW48uwL6v60IU4sRObYvR7Gjjn/X0lYSS86x+0=";
     };
 
     nativeBuildInputs = [
@@ -49,7 +49,7 @@ let
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-PtOb47QOffGje1U8Tle9AQon7ZCgMp/lITPAfM9/wr4=";
+    outputHash = "sha256-UbULDurC6qbcjP+fZJgd0nSVsimAyw3sYC08xeXcI14=";
   };
 in
 stdenv.mkDerivation {
diff --git a/pkgs/by-name/vi/vivify/package.nix b/pkgs/by-name/vi/vivify/package.nix
index e943e0e15d36..e466377401d0 100644
--- a/pkgs/by-name/vi/vivify/package.nix
+++ b/pkgs/by-name/vi/vivify/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  nix-update-script,
   fetchYarnDeps,
   fetchFromGitHub,
   yarnConfigHook,
@@ -12,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vivify";
-  version = "0.8.2";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "jannis-baum";
     repo = "Vivify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2lxf21T9y4GMFlk0+qbaJJ/twRffYEBoBXZXe/NRDQk=";
+    hash = "sha256-LQX7HBTWDR43aMqJrogL9rDFL5qRF0Xzw/O35Uq7R3g=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-mOgfwetiLMTDquw3f3+U1iEhBbvf0OC5lkNJHdrRSK0=";
+    hash = "sha256-rztQiOod7xI/gF9NQTCsfE7Wulm1eZHjyNLBI1YSNKk=";
   };
 
   installPhase = ''
@@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace node_modules/.bin/postject \
       --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}'
 
-    make linux
+    make VIV_VERSION=${finalAttrs.version} linux
 
     mkdir -p $out/bin
     install -Dm755 ./build/linux/viv $out/bin/viv
@@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
   # (segmentation fault)
   dontStrip = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Live Markdown viewer";
     longDescription = ''
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/by-name/vk/vkquake/package.nix
similarity index 89%
rename from pkgs/games/quakespasm/vulkan.nix
rename to pkgs/by-name/vk/vkquake/package.nix
index 1f1db3b66a0d..b71f9e69af97 100644
--- a/pkgs/games/quakespasm/vulkan.nix
+++ b/pkgs/by-name/vk/vkquake/package.nix
@@ -1,6 +1,7 @@
 {
   SDL2,
   fetchFromGitHub,
+  fetchpatch2,
   flac,
   glslang,
   gzip,
@@ -20,6 +21,7 @@
   vulkan-loader,
   copyDesktopItems,
   makeDesktopItem,
+  spirv-tools,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkquake";
@@ -35,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     glslang
+    spirv-tools
     meson
     ninja
     pkg-config
@@ -57,6 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/Novum/vkQuake/pull/809
+      url = "https://github.com/Novum/vkQuake/commit/85ddf2386f15944c26317a763d4044077fc8731f.patch?full_index=1";
+      hash = "sha256-t+atA+ilCwGwLpql5BZO2OF4Xh1KdzRFjOpglTIA/KY=";
+    })
+  ];
+
   mesonFlags = [ "-Ddo_userdirs=enabled" ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
diff --git a/pkgs/by-name/vm/vmime/package.nix b/pkgs/by-name/vm/vmime/package.nix
index 7b82f03b1cfe..238e8bc41ee9 100644
--- a/pkgs/by-name/vm/vmime/package.nix
+++ b/pkgs/by-name/vm/vmime/package.nix
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
   pname = "vmime";
   # XXX: using unstable rev for now to comply with the removal of
   # deprecated symbols in the latest release of gsasl
-  version = "unstable-2022-03-26";
+  version = "0-unstable-2025-07-21";
   src = fetchFromGitHub {
     owner = "kisli";
     repo = "vmime";
-    rev = "fc69321d5304c73be685c890f3b30528aadcfeaf";
-    sha256 = "sha256-DUcGQcT7hp5Rs2Z5C8wo+3BYwWqED0KrF3h3vgLiiow=";
+    rev = "7046a4360bbeea21d1d8b5cfa4589bb4df7f980d";
+    sha256 = "sha256-cwilSnybH5E0wq384lPnqAjPkQTLtlWS8NhmoFE/13k=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/vm/vmmlib/disable-cpack.patch b/pkgs/by-name/vm/vmmlib/disable-cpack.patch
deleted file mode 100644
index 8b9a7983a928..000000000000
--- a/pkgs/by-name/vm/vmmlib/disable-cpack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	1970-01-01 00:00:01.000000000 +0000
-+++ b/CMakeLists.txt	2016-02-19 08:49:30.053759000 +0000
-@@ -178,6 +178,5 @@
- install(FILES ${DOCS} DESTINATION share/vmmlib COMPONENT dev)
- 
- include(DoxygenRule) # must be after all targets
--include(CPackConfig)
- include(CTest)
--include(PackageConfig)
-+
diff --git a/pkgs/by-name/vm/vmmlib/package.nix b/pkgs/by-name/vm/vmmlib/package.nix
index 3a15b69d453a..426a4c04fd80 100644
--- a/pkgs/by-name/vm/vmmlib/package.nix
+++ b/pkgs/by-name/vm/vmmlib/package.nix
@@ -9,18 +9,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.14.0";
   pname = "vmmlib";
 
   src = fetchFromGitHub {
-    owner = "VMML";
+    owner = "Eyescale";
     repo = "vmmlib";
-    rev = "release-${version}";
-    sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
+    tag = "${version}";
+    hash = "sha256-QEfeQcE66XbsFTN/Fojgldem5C+RhbOBmRyBX3sfUrg=";
+
+    fetchSubmodules = true;
   };
 
-  patches = [
-    ./disable-cpack.patch # disable the need of cpack/rpm
+  cmakeFlags = [
+    # Prevent -Werror=deprecated-copy from failing the build
+    "-DCMAKE_CXX_FLAGS=-Wno-error=deprecated-copy"
   ];
 
   nativeBuildInputs = [
@@ -32,6 +35,14 @@ stdenv.mkDerivation rec {
     lapack
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "include(CPackConfig)" ""
+    substituteInPlace CMake/common/Common.cmake \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   checkTarget = "test";
diff --git a/pkgs/by-name/vn/vnote/package.nix b/pkgs/by-name/vn/vnote/package.nix
index 8827834ec375..8862db31ead7 100644
--- a/pkgs/by-name/vn/vnote/package.nix
+++ b/pkgs/by-name/vn/vnote/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vnote";
-  version = "3.19.2";
+  version = "3.19.2-unstable-2025-10-12";
 
   src = fetchFromGitHub {
     owner = "vnotex";
     repo = "vnote";
-    tag = "v${finalAttrs.version}";
+    rev = "1ebe3fd4ecef69c2bacb7f2ec915666f99195ce1";
     fetchSubmodules = true;
-    hash = "sha256-40k0wSqRdwlUqrbb9mDK0dqsSEqCfbNLt+cUKeky+do=";
+    hash = "sha256-vbud2IjmkIIkuZ7ocrQ199CEsKy1nMnidGe/d0UN9jU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vo/vobsub2srt/package.nix b/pkgs/by-name/vo/vobsub2srt/package.nix
index 71ec2ceb2d68..753617b8ad91 100644
--- a/pkgs/by-name/vo/vobsub2srt/package.nix
+++ b/pkgs/by-name/vo/vobsub2srt/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
   buildInputs = [ libtiff ];
   propagatedBuildInputs = [ tesseract3 ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     homepage = "https://github.com/ruediger/VobSub2SRT";
     description = "Converts VobSub subtitles into SRT subtitles";
diff --git a/pkgs/by-name/vo/voikko-fi/package.nix b/pkgs/by-name/vo/voikko-fi/package.nix
new file mode 100644
index 000000000000..c51ccaae5d83
--- /dev/null
+++ b/pkgs/by-name/vo/voikko-fi/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  python3,
+  foma,
+  libvoikko,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "voikko-fi";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "voikko";
+    repo = "corevoikko";
+    tag = "rel-voikko-fi-${finalAttrs.version}";
+    hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/voikko-fi";
+
+  enableParallelBuilding = true;
+
+  installTargets = "vvfst-install DESTDIR=$(out)/share/voikko-fi";
+
+  nativeBuildInputs = [
+    python3
+    foma
+    libvoikko
+  ];
+
+  meta = {
+    homepage = "https://voikko.puimula.org";
+    description = "Description of Finnish morphology written for libvoikko";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ lajp ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
deleted file mode 100644
index 4ce83db262f2..000000000000
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  python3,
-  enableModTool ? true,
-  removeReferencesTo,
-  fetchpatch,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "volk";
-  # Version 2.5.1 seems to cause a build issue for aarch64-darwin[1], and for
-  # gnuradio 3.8 on all platforms[2]. Hence we pin this package to 2.5.0 and
-  # use it for GR 3.8 for all platforms.
-  #
-  # [1]: https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A
-  # [2]: https://github.com/NixOS/nixpkgs/pull/330477#issuecomment-2254477735
-  version = "2.5.0";
-
-  src = fetchFromGitHub {
-    owner = "gnuradio";
-    repo = "volk";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff";
-      hash = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI=";
-      extraPrefix = "";
-    })
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "ENABLE_MODTOOL" enableModTool)
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
-    # volk_32f_log2_32f: fail on arch neon
-    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
-  ];
-
-  postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    python3
-    python3.pkgs.mako
-    python3.pkgs.distutils
-    removeReferencesTo
-  ];
-
-  doCheck = true;
-
-  meta = {
-    homepage = "http://libvolk.org/";
-    description = "Vector Optimized Library of Kernels (version 2.5.0 - for GR 3.8)";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ doronbehar ];
-  };
-})
diff --git a/pkgs/by-name/vo/voxinput/package.nix b/pkgs/by-name/vo/voxinput/package.nix
index ec769c62ecdd..005ff8565c14 100644
--- a/pkgs/by-name/vo/voxinput/package.nix
+++ b/pkgs/by-name/vo/voxinput/package.nix
@@ -17,16 +17,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "voxinput";
-  version = "0.6.4";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "richiejp";
     repo = "VoxInput";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aFsAAT3hNbTSSkeMH65+jnhpjJRxVvfRUiiXdKIvZqM=";
+    hash = "sha256-b+lyoVugm6FSGnmyB4UcrIRic5ZpTcB5BrJCona14zM=";
   };
 
-  vendorHash = "sha256-jopDuqIuc45zT36B7D7WCtYtdZUn4hvE45s/FLBGrms=";
+  vendorHash = "sha256-CquIwApcQvq5r8CckrcL1Qmet0Y4G1L9R3sZyVrZNqw=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index b397f413008f..005c69e3ee76 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vpl-gpu-rt";
-  version = "25.3.4";
+  version = "25.4.1";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${version}";
-    hash = "sha256-tnRYP8mdG0bocdQTcpeJAGX+sHA52JuqeKazlkL2Y+0=";
+    hash = "sha256-JuvMz4O3HGwfcOd8QuyFXsBoz5M4Lw3Se73ObJ9s73c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vs/vscode-solidity-server/package.nix b/pkgs/by-name/vs/vscode-solidity-server/package.nix
index d70eb8b90b97..aa91cf45f815 100644
--- a/pkgs/by-name/vs/vscode-solidity-server/package.nix
+++ b/pkgs/by-name/vs/vscode-solidity-server/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   pkg-config,
   libsecret,
+  stdenv,
+  clang_20,
 }:
 
 buildNpmPackage {
@@ -19,7 +21,7 @@ buildNpmPackage {
 
   npmDepsHash = "sha256-zXhWtPuiu+CRk712KskuHP4vglogJmFoCak6qWczPFM=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.isDarwin [ clang_20 ]; # clang_21 breaks keytar
 
   buildInputs = [ libsecret ];
 
diff --git a/pkgs/by-name/vt/vte/package.nix b/pkgs/by-name/vt/vte/package.nix
index c873530f2037..87e264851ba7 100644
--- a/pkgs/by-name/vt/vte/package.nix
+++ b/pkgs/by-name/vt/vte/package.nix
@@ -23,9 +23,11 @@
   pango,
   pcre2,
   cairo,
+  fmt_11,
   fribidi,
   lz4,
   icu,
+  simdutf,
   systemd,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
   fast-float,
@@ -36,7 +38,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vte";
-  version = "0.80.3";
+  version = "0.82.0";
 
   outputs = [
     "out"
@@ -46,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/vte/${lib.versions.majorMinor finalAttrs.version}/vte-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Lllv0/vqu3FTFmIiTnH2osN/aEQmE21ihUYnJ2709pk=";
+    hash = "sha256-sHGNsyVHMHAbQ79eETy/jNssFHFdMu4einB9xutwU18=";
   };
 
   patches = [
@@ -76,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     cairo
+    fmt_11
     fribidi
     gnutls
     pango # duplicated with propagatedBuildInputs to support gtkVersion == null
@@ -83,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     lz4
     icu
     fast-float
+    simdutf
   ]
   ++ lib.optionals systemdSupport [
     systemd
diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index a3118cef43b7..a646b93cb859 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -9,19 +9,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.1.1";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/dTNfQdgDFJ8m7t8QnTghE5CGgVm0eGSriocFiEgoCw=";
+    hash = "sha256-bzVqlO6Q3pgw9Kor6agpAlqyp3nj96+7f8j2nOzyEZ0=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-BBhTx5pAM+7MlMig11fjodJ2YL1SP+zvdI0JSCLv5lo=";
+    hash = "sha256-VcQbzvPa5FL8OH4Sk0j64M9D4Si/N4rm9nvIAN/xODs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix
index b6c61902323d..3d0ba6b09ae5 100644
--- a/pkgs/by-name/vu/vuetorrent/package.nix
+++ b/pkgs/by-name/vu/vuetorrent/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "vuetorrent";
-  version = "2.29.0";
+  version = "2.30.1";
 
   src = fetchFromGitHub {
     owner = "VueTorrent";
     repo = "VueTorrent";
     tag = "v${version}";
-    hash = "sha256-EnyLMaLElgGUjwxpkhTxV7aVa8l5B5wpBBzg5qyagIQ=";
+    hash = "sha256-sek5kiO1T7s+PIIa0mBGj+9CfF56eRB3En9tsOcEK5Y=";
   };
 
-  npmDepsHash = "sha256-JA5nl+otuyloSi7JPRb8ZJe6PRAaYxuuEpqlmLE65yU=";
+  npmDepsHash = "sha256-vEgwEYVlyTJLOQ8j6hm1O4iTIXNPDZyrmvXyRBgEvQY=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
index b64bfb519150..057589a9a18c 100644
--- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ExtensionLayer";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-tWUi+yCI7wNLVeGg/h5a+yvKWAu8KZqtgEujfCUtYQ4=";
+    hash = "sha256-J9l20abn7meSF0WnCh3cepYKQh10ezb0mAKzc0HAo1w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix
index c1b118fc6cef..cd719a2021ce 100644
--- a/pkgs/by-name/vu/vulkan-headers/package.nix
+++ b/pkgs/by-name/vu/vulkan-headers/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or
   # later the build fails as:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-Yznjiiu/EEW7B37hbO0aw8Lvc6aVxOy7J/zSwmGxVc0=";
+    hash = "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU=";
   };
 
   passthru.updateScript = ./update.sh;
diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 323dbd95dcbe..97cfc1168acf 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-loader";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-i06il1GRkjSlhY36XpIUCcd1Wy+If+Eennzbb//1dzk=";
+    hash = "sha256-+cuKdhdCMIL4b+GzIpCNrDBmC7cVX0iX2QW7BQIj9Tc=";
   };
 
   patches = [ ./fix-pkgconfig.patch ];
diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 47bd85ab67b8..b4ec722ca336 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools-lunarg";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "VulkanTools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-Wd37AYfZ8Ia5kXS9Nvxyj7s+W2DPHUONtqD+tX45XGk=";
+    hash = "sha256-kywAcpBYLSlhEbgssXGwMoXQC03QUEz4dwsvI0I8Nh4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index dfd2fc523697..122e75d0e40b 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-cd7aLDhXiZ4Wlnrx2dfCQG3j+9vosM3SeohhCNvVN48=";
+    hash = "sha256-QoqlHrhgaV1SRLAxmYUXaKxH1IdbnxqkcJklDy20ORg=";
   };
 
   patches = [ ./wayland-scanner.patch ];
@@ -70,9 +70,6 @@ stdenv.mkDerivation rec {
   env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = lib.getExe buildPackages.wayland-scanner;
 
   cmakeFlags = [
-    # Temporarily disabled, see https://github.com/KhronosGroup/Vulkan-Tools/issues/1130
-    # FIXME: remove when fixed upstream
-    "-DBUILD_CUBE=OFF"
     # Don't build the mock ICD as it may get used instead of other drivers, if installed
     "-DBUILD_ICD=OFF"
     # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH
diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
index 71601060ee97..03066b567ef5 100644
--- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
+++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-utility-libraries";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Utility-Libraries";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-MaEn0qVTnhp5kKCbyMhFXysIcAnZF+ba4+KaVD4wSPY=";
+    hash = "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index 5ec68fa4c0b1..9a363aacc58d 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-aTO8AIwN6/oOcxu6AgYBoOQiUHQkT6MJGAYNgP5js9I=";
+    hash = "sha256-iz6kWvnfVnznn78XNHJqSvIW4TYkp2KgEFT302VAiaY=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix
index 22be9032106e..5168ba77f452 100644
--- a/pkgs/by-name/vu/vulkan-volk/package.nix
+++ b/pkgs/by-name/vu/vulkan-volk/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "volk";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "volk";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-Revi0OVvLI23yh1R6mNfcUCo1DXlACLjIw+k6EZQb/U=";
+    hash = "sha256-7JhTLhCqdn/zDIYdIb2xJnjJVk57i+6M5OXk0KvfpDk=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix
index 04f5b615b985..dc3c5e323b53 100644
--- a/pkgs/by-name/vu/vuls/package.nix
+++ b/pkgs/by-name/vu/vuls/package.nix
@@ -6,17 +6,17 @@
 
 buildGo124Module rec {
   pname = "vuls";
-  version = "0.35.1";
+  version = "0.36.2";
 
   src = fetchFromGitHub {
     owner = "future-architect";
     repo = "vuls";
     tag = "v${version}";
-    hash = "sha256-bgeg5y1wFYDXr2M4yNNWbgKJhtdoUZJRPxpniAXCyRU=";
+    hash = "sha256-z6hNC8VDsz5gzzA6VP9PFAJAE7dzrZnxHD/TlBu/uxI=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-DUkF1iqofgO9o34owkvQRkV+e7fA0VmeUz1VOPMiZIs=";
+  vendorHash = "sha256-JO3W8VUQiypQ8AGXTtCIHTNu6PO0kJCPp7LDu+xDqOk=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 681c5441f286..b8ef20873450 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.41.0";
+  version = "0.43.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-YlyhIT8hlkFGo7xBjxa/5feiqv7H2HfA/E4+gz9cCkw=";
+    hash = "sha256-DHuNhizYDY/z3DPAPPOgGWn1m86yGHamiVCHGxlaC1w=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 4cb3648a56c5..c9d00588502a 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     "CFLAGS=-std=gnu17"
   ]
   ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+    "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ]
   ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb"
   ++ lib.optional (graphicsSupport && !x11Support) "--without-x";
diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix
index 3cf6e2fc91b0..da5e3e2c3c76 100644
--- a/pkgs/by-name/wa/wait4x/package.nix
+++ b/pkgs/by-name/wa/wait4x/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "wait4x";
-  version = "3.5.1";
+  version = "3.6.0";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "wait4x";
     repo = "wait4x";
     rev = "v${version}";
-    hash = "sha256-VAt61k2eHQwyLSsvbWxe7jJ/Wyj4U4O2+LzCsoP/Yq4=";
+    hash = "sha256-RiF5tcnzMteXaYmw4mfQdamwV1PAyNC8pUownJzfACs=";
   };
 
-  vendorHash = "sha256-KJOKLTjwwgu2MFNIRDk8eeSVnZyjO9dfVyWrF5vqj9g=";
+  vendorHash = "sha256-fa3XEqLkzriMFYea3bv4FzaKgK2FsGwn5IQG48vh7+M=";
 
   # Tests make network access
   doCheck = false;
diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 9b9f63243817..07f4247f9014 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "wallabag";
-  version = "2.6.13";
+  version = "2.6.14";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   # Release tarball includes vendored files
   src = fetchurl {
     url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
-    hash = "sha256-GnnXAnn8jqndy3GCrovuS5dddzZbS/RnX8JL5yNVppY=";
+    hash = "sha256-AEk0WuxZfazo4r4shcK453RCF/4V/VMDvKs4EXGe/w0=";
   };
 
   patches = [
diff --git a/pkgs/by-name/wa/wamrc/package.nix b/pkgs/by-name/wa/wamrc/package.nix
new file mode 100644
index 000000000000..f2143da08c18
--- /dev/null
+++ b/pkgs/by-name/wa/wamrc/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  llvmPackages,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wamrc";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "bytecodealliance";
+    repo = "wasm-micro-runtime";
+    tag = "WAMR-${finalAttrs.version}";
+    hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    llvmPackages.llvm
+  ];
+
+  cmakeFlags =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}"
+    ]
+    ++ [
+      "-DWAMR_BUILD_WITH_CUSTOM_LLVM=ON"
+      "-DLLVM_DIR=${llvmPackages.llvm.dev}/lib/cmake/llvm"
+    ];
+
+  sourceRoot = "${finalAttrs.src.name}/wamr-compiler";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=WAMR-(.*)" ]; };
+
+  meta = {
+    description = "WebAssembly Micro Runtime AOT compiler";
+    homepage = "https://github.com/bytecodealliance/wasm-micro-runtime";
+    license = lib.licenses.asl20;
+    mainProgram = "wamrc";
+    maintainers = with lib.maintainers; [ bubblepipe ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/wa/wangle/package.nix b/pkgs/by-name/wa/wangle/package.nix
index 56928c88ffbd..baba9795b63a 100644
--- a/pkgs/by-name/wa/wangle/package.nix
+++ b/pkgs/by-name/wa/wangle/package.nix
@@ -24,7 +24,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wangle";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "facebook";
     repo = "wangle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S2L3ifQTwyidz3x5pPrVEGEJXvM1czqTRXYsYUqIeRY=";
+    hash = "sha256-lptILtCaVeO8yXlIYHaATfJw6VyPxUJCx7nxfOZVIIc=";
   };
 
   patches = [
@@ -109,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
       kylesferrazza
       emily
       techknowlogick
+      lf-
     ];
   };
 })
diff --git a/pkgs/by-name/wa/warmux/package.nix b/pkgs/by-name/wa/warmux/package.nix
deleted file mode 100644
index c3115ad02d7e..000000000000
--- a/pkgs/by-name/wa/warmux/package.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  zlib,
-  curl,
-  gnutls,
-  fribidi,
-  libpng,
-  SDL,
-  SDL_gfx,
-  SDL_image,
-  SDL_mixer,
-  SDL_net,
-  SDL_ttf,
-  libunwind,
-  libX11,
-  xorgproto,
-  libxml2,
-  pkg-config,
-  gettext,
-  intltool,
-  libtool,
-  perl,
-}:
-
-stdenv.mkDerivation {
-  pname = "warmux";
-  version = "unstable-2017-10-20";
-
-  src = fetchFromGitHub {
-    owner = "fluxer";
-    repo = "warmux";
-    rev = "8f81d4fc309a548ae89a068c2dde27b7e7ef8851";
-    sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr";
-  };
-
-  __structuredAttrs = true;
-
-  preConfigure = "patchShebangs autogen.sh && ./autogen.sh";
-  configureFlags = [ "CFLAGS=-include ${zlib.dev}/include/zlib.h" ];
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    gettext
-    intltool
-    libtool
-    pkg-config
-  ];
-  buildInputs = [
-    zlib
-    curl
-    gnutls
-    fribidi
-    libpng
-    SDL
-    SDL_gfx
-    SDL_image
-    SDL_mixer
-    SDL_net
-    SDL_ttf
-    libunwind
-    libX11
-    xorgproto
-    libxml2
-    perl
-  ];
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "Ballistics turn-based battle game between teams - unofficial copy";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = with licenses; [
-      gpl2Plus
-      ufl
-    ];
-    homepage = "https://github.com/fluxer/warmux";
-  };
-}
diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index d8a12f381140..306d24e41939 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -1,30 +1,30 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
 
   nix-update-script,
-  testers,
-  warp-plus,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+# fails with go 1.25, downgrade to 1.24
+# error tls.ConnectionState: struct field count mismatch: 17 vs 16
+buildGo124Module (finalAttrs: {
   pname = "warp-plus";
-  version = "1.2.6-unstable-2025-09-13";
+  version = "1.2.6-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    rev = "4af9b2abfc4e79dceea41ac577f1683f62f57b8c";
-    hash = "sha256-7i/06Qn+BRH/bWel9OvgVUAZZSwL2Euv179JDJNn2EE=";
+    rev = "3653f7519d2a08a36222accff6899522bb8b03d0";
+    hash = "sha256-T0YTxQ7iciv5i7lw+bU00B6iYquzBwzYkAlOGZiKeWc=";
   };
 
   vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";
 
   ldflags = [
     "-s"
-    "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   patches = [
@@ -44,19 +44,18 @@ buildGoModule rec {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-    tests.version = testers.testVersion {
-      package = warp-plus;
-      command = "warp-plus version";
-    };
-  };
+  nativeCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
+    changelog = "https://github.com/bepass-org/warp-plus/releases";
     description = "Warp + Psiphon, an anti censorship utility for Iran";
     homepage = "https://github.com/bepass-org/warp-plus";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "warp-plus";
   };
-}
+})
diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 74906ea972a5..141842198ee4 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-faZ4/CdCxxpx2mVtLvMvzlcdokk/bkaGgLynQnqiBBI=",
-    "version": "0.2025.10.08.08.12.stable_03"
+    "hash": "sha256-7l9U9onDdMhyWwXs2+qfkTJwujq+KricG40YCXknMF4=",
+    "version": "0.2025.10.29.08.12.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-PfHWgzQYbz+JX+5DNkyjnfzycZZFZtW1plWYtcFiIks=",
-    "version": "0.2025.10.08.08.12.stable_03"
+    "hash": "sha256-Se1/UN9W8jiI6ylhC8H9l4RKdg1OAm6gcg1OWjS31mo=",
+    "version": "0.2025.10.29.08.12.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-OfI+sm7/wpFSEoRSGr4XLO1WhY7nXoN1oLDJHNE7cws=",
-    "version": "0.2025.10.08.08.12.stable_03"
+    "hash": "sha256-9m0oK+OIxCOMp2YZaRUDlj5kBTUxsf+HIA0glMLeu8w=",
+    "version": "0.2025.10.29.08.12.stable_03"
   }
 }
diff --git a/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch b/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
new file mode 100644
index 000000000000..8db9aba1c95a
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
@@ -0,0 +1,14 @@
+diff --git a/.cargo/config.toml b/.cargo/config.toml
+index 8ab4225..8e0c812 100644
+--- a/.cargo/config.toml
++++ b/.cargo/config.toml
+@@ -1,8 +1,5 @@
+ # https://github.com/rust-lang/cargo/issues/5376#issuecomment-2163350032
+ [target.'cfg(all())']
+ rustflags = [
+-    "--cfg", "tokio_unstable",
+-    "-Zremap-cwd-prefix=/reproducible-cwd",
+-    "--remap-path-prefix=$HOME=/reproducible-home",
+-    "--remap-path-prefix=$PWD=/reproducible-pwd",
++    "--cfg", "tokio_unstable"
+ ]
diff --git a/pkgs/by-name/wa/warpgate/hardcode-version.patch b/pkgs/by-name/wa/warpgate/hardcode-version.patch
new file mode 100644
index 000000000000..a23cd10b01a8
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/hardcode-version.patch
@@ -0,0 +1,14 @@
+diff --git a/warpgate-common/src/version.rs b/warpgate-common/src/version.rs
+index 07db547..2a7967f 100644
+--- a/warpgate-common/src/version.rs
++++ b/warpgate-common/src/version.rs
+@@ -1,8 +1,3 @@
+-use git_version::git_version;
+-
+ pub fn warpgate_version() -> &'static str {
+-    git_version!(
+-        args = ["--tags", "--always", "--dirty=-modified"],
+-        fallback = "unknown"
+-    )
++    "v@version@"
+ }
diff --git a/pkgs/by-name/wa/warpgate/package.nix b/pkgs/by-name/wa/warpgate/package.nix
new file mode 100644
index 000000000000..440b3f762724
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  replaceVars,
+  fetchurl,
+  fetchFromGitHub,
+  rustPlatform,
+  buildNpmPackage,
+  openapi-generator-cli,
+  nixosTests,
+}:
+rustPlatform.buildRustPackage (
+  finalAttrs:
+  let
+    warpgate-web = buildNpmPackage {
+      pname = "${finalAttrs.pname}-web";
+      version = finalAttrs.version;
+
+      src = finalAttrs.src;
+      sourceRoot = "${finalAttrs.src.name}/warpgate-web";
+
+      patches = [ ./web-ui-package-json.patch ];
+
+      npmDepsHash = "sha256-1zCxKAH2IAKSFdL8Pyd8dJi0i8Y5mgYcWNKVpiQszc0=";
+
+      nativeBuildInputs = [ openapi-generator-cli ];
+
+      preBuild = "rm node_modules/.bin/openapi-generator-cli";
+
+      installPhase = ''
+        runHook preInstall
+        cp -R dist $out
+        runHook postInstall
+      '';
+    };
+  in
+  {
+    pname = "warpgate";
+    version = "0.17.0";
+
+    src = fetchFromGitHub {
+      owner = "warp-tech";
+      repo = "warpgate";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-nr0z8c0o5u4Rqs9pFUaxnasRHUhwT3qQe5+JNV+LObg=";
+    };
+
+    cargoHash = "sha256-pIr5Z7rp+dYOuKYnlsBdya6MqAdL0U2gUhwXvLfmM34=";
+
+    patches = [
+      (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; })
+      ./disable-rust-reproducible-build.patch
+    ];
+
+    buildFeatures = [
+      "postgres"
+      "mysql"
+      "sqlite"
+    ];
+
+    preBuild = ''ln -rs "${warpgate-web}" warpgate-web/dist'';
+
+    # skip check, project included tests require python stuff and docker
+    doCheck = false;
+
+    passthru.tests = {
+      inherit (nixosTests) warpgate;
+    };
+
+    meta = {
+      description = "Smart SSH, HTTPS, MySQL and Postgres bastion that requires no additional client-side software";
+      homepage = "https://warpgate.null.page";
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.linux;
+      mainProgram = "warpgate";
+      maintainers = with lib.maintainers; [ alemonmk ];
+    };
+  }
+)
diff --git a/pkgs/by-name/wa/warpgate/web-ui-package-json.patch b/pkgs/by-name/wa/warpgate/web-ui-package-json.patch
new file mode 100644
index 000000000000..4799dea3dd1b
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/web-ui-package-json.patch
@@ -0,0 +1,15 @@
+diff --git a/package.json b/package.json
+index 54125c3..6942dfb 100644
+--- a/package.json
++++ b/package.json
+@@ -12,8 +12,8 @@
+     "postinstall": "npm run openapi:client:gateway && npm run openapi:client:admin",
+     "openapi:schema:gateway": "cargo run -p warpgate-protocol-http > src/gateway/lib/openapi-schema.json",
+     "openapi:schema:admin": "cargo run -p warpgate-admin > src/admin/lib/openapi-schema.json",
+-    "openapi:client:gateway": "openapi-generator-cli generate -g typescript-fetch -i src/gateway/lib/openapi-schema.json -o src/gateway/lib/api-client -p npmName=warpgate-gateway-api-client -p useSingleRequestParameter=true && cd src/gateway/lib/api-client && npm i typescript@5 && npm i && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
+-    "openapi:client:admin": "openapi-generator-cli generate -g typescript-fetch -i src/admin/lib/openapi-schema.json -o src/admin/lib/api-client -p npmName=warpgate-admin-api-client -p useSingleRequestParameter=true && cd src/admin/lib/api-client && npm i typescript@5 && npm i && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
++    "openapi:client:gateway": "openapi-generator-cli generate -g typescript-fetch -i src/gateway/lib/openapi-schema.json -o src/gateway/lib/api-client -p npmName=warpgate-gateway-api-client -p useSingleRequestParameter=true && ln -sr node_modules src/gateway/lib/api-client/node_modules && cd src/gateway/lib/api-client && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
++    "openapi:client:admin": "openapi-generator-cli generate -g typescript-fetch -i src/admin/lib/openapi-schema.json -o src/admin/lib/api-client -p npmName=warpgate-admin-api-client -p useSingleRequestParameter=true && ln -sr node_modules src/admin/lib/api-client/node_modules && cd src/admin/lib/api-client && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
+     "openapi:tests-sdk": "openapi-generator-cli generate -g python -i src/admin/lib/openapi-schema.json -o ../tests/api_sdk",
+     "openapi": "npm run openapi:schema:admin && npm run openapi:schema:gateway && npm run openapi:client:admin && npm run openapi:client:gateway"
+   },
diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix
index 3b5f437983cd..6a30c62856ba 100644
--- a/pkgs/by-name/wa/warzone2100/package.nix
+++ b/pkgs/by-name/wa/warzone2100/package.nix
@@ -94,6 +94,8 @@ stdenv.mkDerivation (finalAttrs: {
                       --replace '"which "' '"${which}/bin/which "'
     substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
                       --replace "which %s" "${which}/bin/which %s"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CONFIGURE_WZ_COMPILER_WARNINGS()" ""
   '';
 
   cmakeFlags = [
diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix
index ba186067ffb9..77795b1e3194 100644
--- a/pkgs/by-name/wa/wasabiwallet/package.nix
+++ b/pkgs/by-name/wa/wasabiwallet/package.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "wasabiwallet";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "https://github.com/WalletWasabi/WalletWasabi/releases/download/v${version}/Wasabi-${version}-linux-x64.tar.gz";
-    sha256 = "sha256-w2xLahVxeCxwM6LVS5Mtr7IAXoZ7ju9aeXGjHMO2GPE=";
+    sha256 = "sha256-o2e2NDG2aMrEYc/7x5iFex9oRlrQXeKIINuW80ZwWcI=";
   };
 
   dontBuild = true;
diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix
index 89375f733618..ca0455f62d50 100644
--- a/pkgs/by-name/wa/wash-cli/package.nix
+++ b/pkgs/by-name/wa/wash-cli/package.nix
@@ -1,51 +1,35 @@
 {
   lib,
-  fetchCrate,
+  fetchFromGitHub,
   rustPlatform,
-  pkg-config,
-  openssl,
-  fetchurl,
 }:
 
-let
-  wasiPreviewCommandComponentAdapter = fetchurl {
-    url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.command.wasm";
-    hash = "sha256-UVBFddlI0Yh1ZNs0b2jSnKsHvGGAS5U09yuwm8Q6lxw=";
-  };
-  wasiPreviewReactorComponentAdapter = fetchurl {
-    url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.reactor.wasm";
-    hash = "sha256-oE53IRMZgysSWT7RhrpZJjdaIyzCRf0h4d1yjqj/PSk=";
-  };
-
-in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wash-cli";
-  version = "0.39.0";
+  version = "1.0.0-beta.10";
 
-  src = fetchCrate {
-    inherit version pname;
-    hash = "sha256-qOxYBhwkcn4g1cUBHuF0AoecpxN4ukgTjBnzVhWtw7A=";
+  src = fetchFromGitHub {
+    owner = "wasmCloud";
+    repo = "wash";
+    tag = "wash-v${finalAttrs.version}";
+    hash = "sha256-g1OXyxLSKicMz0mnTyHNmihtt5WMx91bNo83NhZpx9s=";
   };
 
-  cargoHash = "sha256-dPHzRZh5jBxbPt+1a9wVbsBclAkfrcAXhpZgTw7e4Qo=";
+  cargoHash = "sha256-/Dah1F3pJBqtrCw7iVRGidQUl8rmD31Eoqva9ejc1iw=";
 
-  nativeBuildInputs = [ pkg-config ];
+  checkFlags = [
+    # Requires internet access
+    "--skip=test_end_to_end_template_to_execution"
+    "--skip=test_plugin_test_inspect_comprehensive"
+    "--skip=test_pull_and_validate_ghcr_component"
+  ];
 
-  buildInputs = [ openssl ];
-
-  preBuild = "
-    export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter}
-    export WASI_PREVIEW1_REACTOR_COMPONENT_ADAPTER=${wasiPreviewReactorComponentAdapter}
-  ";
-
-  # Tests require the internet and don't work when running in nix
-  doCheck = false;
-
-  meta = with lib; {
-    description = "wasmCloud Shell (wash) CLI tool";
-    homepage = "https://wasmcloud.com/";
+  meta = {
+    description = "Command-line tool for developing, building, and managing WebAssembly components";
+    homepage = "https://github.com/wasmCloud/wash";
+    changelog = "https://github.com/wasmCloud/wash/releases/tag/wash-v${finalAttrs.version}";
     mainProgram = "wash";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bloveless ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bloveless ];
   };
-}
+})
diff --git a/pkgs/by-name/wa/wasilibc/package.nix b/pkgs/by-name/wa/wasilibc/package.nix
index c5c5204454f7..219d639aadd7 100644
--- a/pkgs/by-name/wa/wasilibc/package.nix
+++ b/pkgs/by-name/wa/wasilibc/package.nix
@@ -19,6 +19,12 @@ stdenvNoLibc.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  # These flags break pkgsCross.wasi32.llvmPackages.libcxx
+  hardeningDisable = [
+    "libcxxhardeningfast"
+    "libcxxhardeningextensive"
+  ];
+
   outputs = [
     "out"
     "dev"
diff --git a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix b/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
deleted file mode 100644
index 3d908a9501ff..000000000000
--- a/pkgs/by-name/wa/wasm-bindgen-cli_0_2_92/package.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  buildWasmBindgenCli,
-  fetchCrate,
-  rustPlatform,
-}:
-
-buildWasmBindgenCli rec {
-  src = fetchCrate {
-    pname = "wasm-bindgen-cli";
-    version = "0.2.92";
-    hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    inherit (src) pname version;
-    hash = "sha256-81vQkKubMWaX0M3KAwpYgMA1zUQuImFGvh5yTW+rIAs=";
-  };
-}
diff --git a/pkgs/by-name/wa/wasm-text-gen/package.nix b/pkgs/by-name/wa/wasm-text-gen/package.nix
new file mode 100644
index 000000000000..2c93576c9986
--- /dev/null
+++ b/pkgs/by-name/wa/wasm-text-gen/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  makeBinaryWrapper,
+  gcc,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wasm-text-gen";
+  version = "1.14.1";
+
+  src = fetchFromGitHub {
+    owner = "xtuc";
+    repo = "webassemblyjs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8=";
+  };
+
+  postPatch = ''
+    substituteInPlace packages/**/package.json \
+      --replace-warn "1.13.2" "1.14.1"
+
+    patchShebangs scripts/
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ];
+
+  preInstall = ''
+    yarn install --offline --prod --no-bin-links
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/{packages,node_modules}
+    mkdir $out/bin
+    mv -t $out/lib/packages packages/**
+    mv -t $out/lib/node_modules node_modules/**
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/wasmgen \
+      --add-flags "$out/lib/packages/wasm-text-gen/lib/cli.js" \
+      --set NODE_PATH "$out/lib/node_modules"
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Toolbox for WebAssembly";
+    homepage = "https://webassembly.js.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "wasmgen";
+  };
+})
diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
index f9f780bed6e7..84b454a42365 100644
--- a/pkgs/by-name/wa/wasmer-pack/package.nix
+++ b/pkgs/by-name/wa/wasmer-pack/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/wasmerio/wasmer-pack";
     changelog = "https://github.com/wasmerio/wasmer-pack/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 45f0b5a3cd60..3788dee242c9 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "37.0.2";
+  version = "38.0.3";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OQyGcxWMOxxzBHyOg2LUVsFuBEow6NIJCfrnsYWZtzk=";
+    hash = "sha256-eszpPYtueCuAMIVrWKagS1qFCWGd0rVFTsCqRYaSGu4=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-PXvhwnfGvGF4D6U+2dKp3wg6cbk/i+0bWRAMSkyd6i8=";
+  cargoHash = "sha256-agTF0GszX1f6oqo9oIPMD/GSmwbL8Ovg52TmtPq/z78=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"
diff --git a/pkgs/by-name/wa/wast-refmt/package.nix b/pkgs/by-name/wa/wast-refmt/package.nix
new file mode 100644
index 000000000000..c0805e922448
--- /dev/null
+++ b/pkgs/by-name/wa/wast-refmt/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  makeBinaryWrapper,
+  gcc,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wast-refmt";
+  version = "1.14.1";
+
+  src = fetchFromGitHub {
+    owner = "xtuc";
+    repo = "webassemblyjs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8=";
+  };
+
+  postPatch = ''
+    substituteInPlace packages/**/package.json \
+      --replace-warn "1.13.2" "1.14.1"
+
+    patchShebangs scripts/
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ];
+
+  preInstall = ''
+    yarn install --offline --prod --no-bin-links
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/{packages,node_modules}
+    mkdir $out/bin
+    mv -t $out/lib/packages packages/**
+    mv -t $out/lib/node_modules node_modules/**
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/wast-refmt \
+      --add-flags "$out/lib/packages/wast-refmt/lib/cli.js" \
+      --set NODE_PATH "$out/lib/node_modules"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "WAST Reformatter";
+    homepage = "https://webassembly.js.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "wast-refmt";
+  };
+})
diff --git a/pkgs/by-name/wa/watchgha/package.nix b/pkgs/by-name/wa/watchgha/package.nix
new file mode 100644
index 000000000000..ac87868e3033
--- /dev/null
+++ b/pkgs/by-name/wa/watchgha/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "watchgha";
+  version = "2.4.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "watchgha";
+    hash = "sha256-RtmCC+twOk+viWY7WTbTzuxHTM3MOww+sRuEvlemCcI=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    dulwich
+    exceptiongroup
+    httpx
+    rich
+    trio
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "watchgha" ];
+
+  meta = {
+    description = "Live display of current GitHub action runs";
+    mainProgram = "watch_gha_runs";
+    homepage = "https://github.com/nedbat/watchgha";
+    license = lib.licenses.apsl20;
+    maintainers = with lib.maintainers; [ purcell ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/by-name/wa/watchman/package.nix b/pkgs/by-name/wa/watchman/package.nix
index 960f02a70355..0dcd7685782d 100644
--- a/pkgs/by-name/wa/watchman/package.nix
+++ b/pkgs/by-name/wa/watchman/package.nix
@@ -26,21 +26,17 @@
   cpptoml,
 
   gtest,
-
-  nix-update-script,
-
-  stateDir ? "",
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "watchman";
-  version = "2025.09.15.00";
+  version = "2025.10.13.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZIFGCOoIuy4Ns51oek3HnBLtCSnI742FTA2YmorBpyk=";
+    hash = "sha256-yD8OaA6n2aqwgyQ58VEiBw6+IbwUgXrWEUPinJDip+U=";
   };
 
   patches = [
@@ -78,8 +74,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "CMAKE_INSTALL_RPATH_USE_LINK_PATH" true)
+    # If we want to have one watchman per system, we need to have the state in
+    # $HOME for reliability in face of differing TMPDIR values.
+    # https://github.com/facebook/watchman/issues/1092
+    (lib.cmakeBool "WATCHMAN_USE_XDG_STATE_HOME" true)
 
-    (lib.cmakeFeature "WATCHMAN_STATE_DIR" stateDir)
     (lib.cmakeFeature "WATCHMAN_VERSION_OVERRIDE" finalAttrs.version)
   ];
 
@@ -118,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
       kylesferrazza
       emily
       techknowlogick
+      lf-
     ];
     mainProgram = "watchman";
     platforms = lib.platforms.unix;
diff --git a/pkgs/by-name/wa/wavelog/package.nix b/pkgs/by-name/wa/wavelog/package.nix
index 9bee77d5cea2..58306a79ec34 100644
--- a/pkgs/by-name/wa/wavelog/package.nix
+++ b/pkgs/by-name/wa/wavelog/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wavelog";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "wavelog";
     repo = "wavelog";
     tag = finalAttrs.version;
-    hash = "sha256-FVQ3eAXj/KUa/myHm0+7L62c8cGEa9kmmlGnLPGqSwU=";
+    hash = "sha256-NXQY9ICU6YVVTnXb19pFqOx4VyTfxzk1RA03RqpEOeA=";
   };
 
   installPhase = ''
diff --git a/pkgs/by-name/wa/way-displays/package.nix b/pkgs/by-name/wa/way-displays/package.nix
index c22df9c1a546..74570b6959e4 100644
--- a/pkgs/by-name/wa/way-displays/package.nix
+++ b/pkgs/by-name/wa/way-displays/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "way-displays";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "way-displays";
     rev = version;
-    sha256 = "sha256-IW9LolTZaPn2W8IZ166RebQRIug0CyFz/Prgr34wNwM=";
+    sha256 = "sha256-M1d6o4mODnFNInSt0GL1aCUcRU9VBVhHFQuwTrw6zY4=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/wa/waybar-lyric/package.nix b/pkgs/by-name/wa/waybar-lyric/package.nix
index ee5956c32df1..046aa48bedcb 100644
--- a/pkgs/by-name/wa/waybar-lyric/package.nix
+++ b/pkgs/by-name/wa/waybar-lyric/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "waybar-lyric";
-  version = "0.11.0";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "Nadim147c";
     repo = "waybar-lyric";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1n00yxeDlxn/BzDF4cc+JkJZMmEtZftqey3Hwg6aAKI=";
+    hash = "sha256-2iuMlcKDnhRc3PZNMjhkHElEyVdx8+p+ONHn8lC4dQ0=";
   };
 
-  vendorHash = "sha256-DBtSC+ePl6dvHqB10FyeojnYoT3mmsWAnbs/lZLibl8=";
+  vendorHash = "sha256-JpAlpTHPxPWHBCeegnUVYsM9LjUCuvfFd0JjQpCccaM=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index e2ac48057949..d915092c3346 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -14,7 +14,6 @@
   gtkmm3,
   iniparser,
   jsoncpp,
-  libcava,
   libdbusmenu-gtk3,
   libevdev,
   libinotify-kqueue,
@@ -81,9 +80,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mGiBZjfvtZZkSHrha4UF2l1Ogbij8J//r2h4gcZAJ6w=";
   };
 
+  libcavaSrc = fetchFromGitHub {
+    owner = "LukashonakV";
+    repo = "cava";
+    tag = "0.10.4";
+    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+  };
+
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
-    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.4
+    cp -R --no-preserve=mode,ownership ${finalAttrs.libcavaSrc} subprojects/cava-0.10.4
     patchShebangs .
     popd
   '';
diff --git a/pkgs/by-name/wa/wayclip/package.nix b/pkgs/by-name/wa/wayclip/package.nix
index d5279ddce99b..f9619567506b 100644
--- a/pkgs/by-name/wa/wayclip/package.nix
+++ b/pkgs/by-name/wa/wayclip/package.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayclip";
-  version = "0.4.2";
+  version = "0.5";
 
   outputs = [
     "out"
@@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "~noocsharp";
     repo = "wayclip";
     rev = finalAttrs.version;
-    hash = "sha256-/xii/FF8JPv6KbMMxzww9AYqYJrpKYowsxQ5Bz7m+/M=";
+    hash = "sha256-Uej5ggtlPeDid1yKSfZt5FlCen1GLea6EWa4lL+BPRM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 7c69c637fe9c..4d6920f37407 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -12,11 +12,13 @@
   lxc,
   iproute2,
   iptables,
+  nftables,
   util-linux,
   wrapGAppsHook3,
   wl-clipboard,
   runtimeShell,
   nix-update-script,
+  withNftables ? false,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -65,6 +67,10 @@ python3Packages.buildPythonApplication rec {
     "USE_SYSTEMD=0"
     "SYSCONFDIR=$(out)/etc"
   ];
+  postInstall = lib.optionalString withNftables ''
+    substituteInPlace $out/lib/waydroid/data/scripts/waydroid-net.sh \
+      --replace-fail 'LXC_USE_NFT="false"' 'LXC_USE_NFT="true"'
+  '';
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -76,7 +82,7 @@ python3Packages.buildPythonApplication rec {
           dnsmasq
           getent
           iproute2
-          iptables
+          (if withNftables then nftables else iptables)
         ]
       }
 
diff --git a/pkgs/by-name/wa/wayland-bongocat/package.nix b/pkgs/by-name/wa/wayland-bongocat/package.nix
index 5574421c87ad..41e0a94d8175 100644
--- a/pkgs/by-name/wa/wayland-bongocat/package.nix
+++ b/pkgs/by-name/wa/wayland-bongocat/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
   stdenv,
+  bash,
   fetchFromGitHub,
+  gitUpdater,
   pkg-config,
   wayland,
   wayland-protocols,
@@ -25,17 +27,21 @@ stdenv.mkDerivation (finalAttrs: {
     wayland-scanner
   ];
   buildInputs = [
+    bash
     wayland
     wayland-protocols
   ];
 
-  # Build phases
-  # Ensure that the Makefile has the correct directory with the Wayland protocols
-  preBuild = ''
-    export WAYLAND_PROTOCOLS_DIR="${wayland-protocols}/share/wayland-protocols"
+  makeFlags = [
+    "WAYLAND_PROTOCOLS_DIR=${wayland-protocols}/share/wayland-protocols"
+    "release"
+  ];
+
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail 'CC = gcc' 'CC ?= gcc'
   '';
 
-  makeFlags = [ "release" ];
   installPhase = ''
     runHook preInstall
 
@@ -49,7 +55,18 @@ stdenv.mkDerivation (finalAttrs: {
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
 
-  # Package information
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    $out/bin/bongocat-find-devices --help
+
+    runHook postInstallCheck
+  '';
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
+  };
+
   meta = {
     description = "Delightful Wayland overlay that displays an animated bongo cat reacting to keyboard input";
     homepage = "https://github.com/saatvik333/wayland-bongocat";
diff --git a/pkgs/by-name/wa/waymore/package.nix b/pkgs/by-name/wa/waymore/package.nix
index 12deadd09578..7a4670514c67 100644
--- a/pkgs/by-name/wa/waymore/package.nix
+++ b/pkgs/by-name/wa/waymore/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waymore";
-  version = "6.2";
+  version = "6.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xnl-h4ck3r";
     repo = "waymore";
     tag = "v${version}";
-    hash = "sha256-5fpG+ulSt/pTUQ3upzyitjkAc3x3jJi/JFblW6M/FUs=";
+    hash = "sha256-3nvdbQydtnk/tod2WyJLAGKKjwTv6Z6JA7+qwqgp2o4=";
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 83d784d51d2e..93ea549ba19f 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -18,18 +18,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.7.4";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-I7juUTIN+ZhD9w2WXSU5YMBulxcGUYDdv6eiLZ1Byyw=";
+    hash = "sha256-zFRSWAVyTWvH6nxiacQbrrLRlu0Xac53XFaA6FcSf6M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU=";
+    hash = "sha256-/QCDxno0xZ9hLq0U6FNAZX7x+Kx5xaMtT/mR/GrNavs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index e2ebdf957d1e..ed311b5740ec 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -6,14 +6,14 @@
   wazero,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "wazero";
   version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "tetratelabs";
     repo = "wazero";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yxnHLc0PFxh8NRBgK2hvhKaxRM1w3IZ9TnfJM0+uadg=";
   };
 
@@ -25,8 +25,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=github.com/tetratelabs/wazero/internal/version.version=${version}"
+    "-X=github.com/tetratelabs/wazero/internal/version.version=${finalAttrs.version}"
   ];
 
   checkFlags = [
@@ -41,12 +40,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Zero dependency WebAssembly runtime for Go developers";
     homepage = "https://github.com/tetratelabs/wazero";
-    changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = with lib.maintainers; [ liberodark ];
+    changelog = "https://github.com/tetratelabs/wazero/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
     mainProgram = "wazero";
   };
-}
+})
diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index 42ff4f8d080d..b4cd2c1e59ef 100644
--- a/pkgs/by-name/wd/wdt/package.nix
+++ b/pkgs/by-name/wd/wdt/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation {
     };
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Warp speed Data Transfer";
     homepage = "https://github.com/facebook/wdt";
diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index f3c7fbdecbb8..149ee390d12c 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "weasis";
-  version = "4.6.3";
+  version = "4.6.5";
 
   # Their build instructions indicate to use the packaging script
   src = fetchzip {
     url = "https://github.com/nroduit/Weasis/releases/download/v${finalAttrs.version}/weasis-native.zip";
-    hash = "sha256-1dvBKxInuk8FpZjo59+LkIuEBTr57wkLaHfvvvT6bOg=";
+    hash = "sha256-wUkHHbqlFl4L0l4Bd6iXXjEgDwVay2zCJ7ucSvfAGWw=";
     stripRoot = false;
   };
 
diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index aa8a0bd7f52b..b04008383408 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -1,28 +1,39 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   testers,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "weaver";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kEGz6alm+P6zKR4vxzsyZ67R99tVBjEIK0OEx6SzdvQ=";
+    hash = "sha256-6rBgGU+6/EZaKkDdbRZPY+5ZS2mnUiPIPymhVpqVPX0=";
   };
 
-  cargoHash = "sha256-//nPXBUi7swKPusaamSJdsUTObnyh+wNc7i8CoyGWrU=";
+  cargoHash = "sha256-9i+6xqOUUSWBPeoqgO9TpS2AkVLRB1CCZfMrPsZj8JQ=";
 
   checkFlags = [
     # Skip tests requiring network
     "--skip=test_cli_interface"
   ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
+      --bash <($out/bin/${finalAttrs.meta.mainProgram} completion bash) \
+      --zsh <($out/bin/${finalAttrs.meta.mainProgram} completion zsh) \
+      --fish <($out/bin/${finalAttrs.meta.mainProgram} completion fish)
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = finalAttrs.finalPackage;
   };
@@ -30,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "OpenTelemetry tool for dealing with semantic conventions and application telemetry schemas";
     homepage = "https://github.com/open-telemetry/weaver";
+    changelog = "https://github.com/open-telemetry/weaver/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "weaver";
diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index 903712e8cb5f..772483eceab1 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.33.0";
+  version = "1.33.2";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-vFjP/GesZg2G57zyF3LLDla9W+4gQyeAI3vAvSw+wls=";
+    hash = "sha256-+QchAvIBJcbrwveeGHXFC+96oD5Uy/+lqMV/vxRPzbk=";
   };
 
-  vendorHash = "sha256-sMpYk2uXXt8oJ7HC3n9Gqa1cOvspxt0oof3E1fbRgco=";
+  vendorHash = "sha256-KiDU9fw/4vIhI0XbEzUfw+HhopJniVeGhFVJBbLkixU=";
 
   subPackages = [ "cmd/weaviate-server" ];
 
diff --git a/pkgs/by-name/we/webassemblyjs-cli/package.nix b/pkgs/by-name/we/webassemblyjs-cli/package.nix
new file mode 100644
index 000000000000..3dd8b359c655
--- /dev/null
+++ b/pkgs/by-name/we/webassemblyjs-cli/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  makeBinaryWrapper,
+  gcc,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "webassemblyjs-cli";
+  version = "1.14.1";
+
+  src = fetchFromGitHub {
+    owner = "xtuc";
+    repo = "webassemblyjs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8=";
+  };
+
+  postPatch = ''
+    substituteInPlace packages/**/package.json \
+      --replace-warn "1.13.2" "1.14.1"
+
+    patchShebangs scripts/
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ];
+
+  preInstall = ''
+    yarn install --offline --prod --no-bin-links
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/{packages,node_modules}
+    mkdir $out/bin
+    mv -t $out/lib/packages packages/**
+    mv -t $out/lib/node_modules node_modules/**
+
+    declare -a cmds=("wasmdump" "wasmast" "wasmrun"
+                    "wasm2wast" "wastast" "get-producer-section"
+                    "wast-to-wasm-semantics")
+    for c in "''${cmds[@]}"
+    do
+      makeWrapper ${lib.getExe nodejs} $out/bin/$c \
+        --add-flags "$out/lib/packages/cli/lib/$c.js" \
+        --set NODE_PATH "$out/lib/node_modules"
+    done
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Toolbox for WebAssembly";
+    homepage = "https://webassembly.js.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/we/webassemblyjs-repl/package.nix b/pkgs/by-name/we/webassemblyjs-repl/package.nix
new file mode 100644
index 000000000000..d564c7d541cd
--- /dev/null
+++ b/pkgs/by-name/we/webassemblyjs-repl/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  makeBinaryWrapper,
+  gcc,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "webassemblyjs-repl";
+  version = "1.14.1";
+
+  src = fetchFromGitHub {
+    owner = "xtuc";
+    repo = "webassemblyjs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zkZyI/bLSCZkgSEH9kx8Qls7RZuiTVP5CwWlFaK1yI8=";
+  };
+
+  postPatch = ''
+    substituteInPlace packages/**/package.json \
+      --replace-warn "1.13.2" "1.14.1"
+
+    patchShebangs scripts/
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-gweiisUVp1D4BAcyuf3V81jN+ehm6z5ztftG+tc7M+A=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    nodejs
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ gcc ];
+
+  preInstall = ''
+    yarn install --offline --prod --no-bin-links
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/{packages,node_modules}
+    mkdir $out/bin
+    mv -t $out/lib/packages packages/**
+    mv -t $out/lib/node_modules node_modules/**
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/wasm \
+      --add-flags "$out/lib/packages/repl/lib/bin.js" \
+      --set NODE_PATH "$out/lib/node_modules"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "WebAssembly REPL";
+    homepage = "https://webassembly.js.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "wasm";
+  };
+})
diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 075254605ab4..896e588ed300 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "webdav";
-  version = "5.8.0";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${version}";
-    hash = "sha256-6G9NlQVYFDLuIxKJXq0Rcixx1AiDhTHUekumMNqXi44=";
+    hash = "sha256-W0l9VVgZJujJpxK97wsdMKAp3zAX5GJVwEaOA/SYRW4=";
   };
 
-  vendorHash = "sha256-B78O13FPpkcuE808c2hLiIDPQdS5qlaw1dWLc9T7hvM=";
+  vendorHash = "sha256-BHSkSGgL6Ns4kjQV5OaiViIVhnOg1qpdvv4LPhkeAnw=";
 
   __darwinAllowLocalNetworking = true;
 
diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 1633cb8018d3..6b84aa55a8ad 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -57,11 +57,11 @@
 
 stdenv.mkDerivation rec {
   pname = "webex";
-  version = "45.6.2.32823";
+  version = "45.10.0.33234";
 
   src = fetchurl {
-    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20250725151734/Webex_ubuntu.7z";
-    sha256 = "72e9693d7c1c09ebf2c93c5e29e2b52a012eaf3ac108d7759d66be500c528b3b";
+    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20251014140645/Webex_ubuntu.7z";
+    sha256 = "126ac38dbf659d26c213a9ccd5930f6a88d1aa90fd9de90cba74b2f2bfbe7793";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/we/webkit2-sharp/package.nix b/pkgs/by-name/we/webkit2-sharp/package.nix
deleted file mode 100644
index e50da66aa854..000000000000
--- a/pkgs/by-name/we/webkit2-sharp/package.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  stdenv,
-  autoreconfHook,
-  fetchFromGitHub,
-  gtk-sharp-3_0,
-  lib,
-  libxslt,
-  mono,
-  pkg-config,
-  webkitgtk_4_0,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "webkit2-sharp";
-  version = "a59fd76dd730432c76b12ee6347ea66567107ab9";
-
-  src = fetchFromGitHub {
-    owner = "hbons";
-    repo = "webkit2-sharp";
-    rev = version;
-    sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    libxslt
-    mono
-    pkg-config
-  ];
-
-  buildInputs = [
-    gtk-sharp-3_0
-    webkitgtk_4_0
-  ];
-
-  postPatch = ''
-    # Workaround build failure with WebKitGTK 2.40.0
-    # https://github.com/hbons/webkit2-sharp/issues/6
-    substituteInPlace sources/webkit2-sharp-api.raw --replace \
-      '<field cname="parentInstance" access="public" writeable="false" readable="true" name="ParentInstance" type="GtkContainer*"/>' \
-      '<field cname="parent" access="public" writeable="false" readable="true" name="Parent" type="GtkContainer*"/>'
-  '';
-
-  ac_cv_path_MONODOCER = "no";
-  installFlags = [ "GAPIXMLDIR=/tmp/gapixml" ];
-
-  passthru = {
-    webkitgtk = webkitgtk_4_0;
-  };
-
-  meta = {
-    description = "C# bindings for WebKit 2 with GTK+ 3";
-    homepage = "https://github.com/hbons/webkit2-sharp";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ kevincox ];
-  };
-}
diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index a84ece94bd64..8a34ea867162 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -16,18 +16,13 @@
 let
   python = python3.override {
     packageOverrides = final: prev: {
-      # https://github.com/django-crispy-forms/crispy-bootstrap3/issues/12
-      django = prev.django_5_1;
-      djangorestframework = prev.djangorestframework.overridePythonAttrs (old: {
-        # https://github.com/encode/django-rest-framework/discussions/9342
-        disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ];
-      });
+      django = prev.django_5_2;
     };
   };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.13.3";
+  version = "5.14";
 
   pyproject = true;
 
@@ -40,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-PM5h9RqCMdt0FODE7MoCWv9I+RMFTgjDmSrid59cHOA=";
+    hash = "sha256-XIaVM9bsgv6qJ1Q/6wzfO7D04WsUEkxNnJlyLd5+bY4=";
   };
 
   build-system = with python.pkgs; [ setuptools ];
@@ -68,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
     '';
 
   pythonRelaxDeps = [
-    "rapidfuzz"
+    "certifi"
   ];
 
   dependencies =
diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
index 188fa813d5a2..431b8431f353 100644
--- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix
+++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "webp-pixbuf-loader";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "aruiz";
     repo = "webp-pixbuf-loader";
     rev = version;
-    sha256 = "sha256-2GDH5+YCwb2mPdMfEscmWDOzdGnWRcppE+4rcDCZog4=";
+    sha256 = "sha256-IJEweV2ACFp+Ua2ESrRUNApXWBg3NED60FDKijYO5TI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix
index b64d19521905..8f2d5bcb4c1a 100644
--- a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix
+++ b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
   '';
 
diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index 9b6f1f2a905c..4d4bc0ea199d 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -43,12 +43,9 @@
   libva,
   libGL,
   libnotify,
+  krb5,
   buildFHSEnv,
   writeShellScript,
-  runCommandLocal,
-  cacert,
-  coreutils,
-  curl,
 }:
 let
   wechat-uos-env = stdenvNoCC.mkDerivation {
@@ -125,6 +122,7 @@ let
     pulseaudio
     qt6.qt5compat
     bzip2
+    krb5
   ];
 
   wechat =
@@ -133,37 +131,14 @@ let
 
       pname = "wechat-uos";
       version = sources.version;
-      fetch =
+      src = fetchurl (
         {
-          url,
-          hash,
-        }:
-        runCommandLocal "wechat-uos-${version}-src"
-          {
-            outputHashAlgo = "sha256";
-            outputHash = hash;
-
-            nativeBuildInputs = [
-              curl
-              coreutils
-            ];
-
-            impureEnvVars = lib.fetchers.proxyImpureEnvVars;
-            SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-          }
-          ''
-            curl -A "debian APT-HTTP/1.3 (1.6.11)" --retry 3 --retry-delay 3 -L "${url}" > $out
-          '';
-
-      srcs = {
-        x86_64-linux = fetch sources.amd64;
-        aarch64-linux = fetch sources.arm64;
-        loongarch64-linux = fetch sources.loongarch64;
-      };
-
-      src =
-        srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
+          curlOpts = "-A apt";
+        }
+        // (sources.${stdenv.hostPlatform.system}
+          or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
+        )
+      );
     in
     stdenvNoCC.mkDerivation {
       inherit pname src version;
diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix
index 20506a002dbe..519edc3a8a2a 100644
--- a/pkgs/by-name/we/wechat-uos/sources.nix
+++ b/pkgs/by-name/we/wechat-uos/sources.nix
@@ -1,17 +1,17 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-09-25
+# Last updated: 2025-11-04
 {
-  version = "4.0.1.12";
-  amd64 = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
-    hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
+  version = "4.1.0.12";
+  x86_64-linux = {
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_amd64.deb";
+    hash = "sha256-qnu7ZPJ/xSuF8QV87y3MNkpf8FIfFR8OuPzpE2pn0LA=";
   };
-  arm64 = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
-    hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
+  aarch64-linux = {
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_arm64.deb";
+    hash = "sha256-+XEVzVBlKZoPfTWgHjjKDLvzkGsH2Ul8m64H9Y1u7bE=";
   };
-  loongarch64 = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
-    hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
+  loongarch64-linux = {
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_loongarch64.deb";
+    hash = "sha256-A+k/xfwWwMaDR8FT02b+TZSKn9HL6b5WC/Jkaeu6mTc=";
   };
 }
diff --git a/pkgs/by-name/we/wechat-uos/update.sh b/pkgs/by-name/we/wechat-uos/update.sh
old mode 100644
new mode 100755
index ecf2deafa75c..00a0abb9f5f2
--- a/pkgs/by-name/we/wechat-uos/update.sh
+++ b/pkgs/by-name/we/wechat-uos/update.sh
@@ -13,7 +13,7 @@ hash=()
 for i in amd64 arm64 loongarch64
 do
     current_url=$base_url_suffix$i$base_url_appendix
-    curl -A "debian APT-HTTP/1.3 (1.6.11)" -v -L -O $current_url
+    curl -A "apt" -v -L -O $current_url
     current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" '
     BEGIN { found = 0 }
     {
@@ -48,15 +48,15 @@ cat >sources.nix <<EOF
 # Last updated: $(date +%F)
 {
   version = "${version[0]}";
-  amd64 = {
+  x86_64-linux = {
     url = "${url[0]}";
     hash = "${hash[0]}";
   };
-  arm64 = {
+  aarch64-linux = {
     url = "${url[1]}";
     hash = "${hash[1]}";
   };
-  loongarch64 = {
+  loongarch64-linux = {
     url = "${url[2]}";
     hash = "${hash[2]}";
   };
diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 945a202f9c78..5b748f1fac79 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.0.19-29668";
+          version = "4.1.4.15-31252";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-EAKfskB3zY4C05MVCoyxzW6wuRw8b2nXIynyEjx8Rvw=";
+            hash = "sha256-nG9fYaQjeCwYFV7yKdlUxbXnFALc1VomQ/hnGQtJ17o=";
           };
         };
     in
@@ -45,17 +45,17 @@ let
       aarch64-darwin = any-darwin;
       x86_64-darwin = any-darwin;
       aarch64-linux = {
-        version = "4.1.0.10";
+        version = "4.1.0.13";
         src = fetchurl {
-          url = "https://web.archive.org/web/20250930121708/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-          hash = "sha256-qkNLA8nILsIi2ciIzr9pb3PejhbEvZ5fe4GlmjyjrEI=";
+          url = "https://web.archive.org/web/20251106024910/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
+          hash = "sha256-/d5crM6IGd0k0fSlBSQx4TpIVX/8iib+an0VMkWMNdw=";
         };
       };
       x86_64-linux = {
-        version = "4.1.0.10";
+        version = "4.1.0.13";
         src = fetchurl {
-          url = "https://web.archive.org/web/20250930121506/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-          hash = "sha256-d/zdb69gmIcgAFCbWLKGfmD8ZFfuDlYdOy7vUJ7SiXc=";
+          url = "https://web.archive.org/web/20251106024907/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
+          hash = "sha256-+r5Ebu40GVGG2m2lmCFQ/JkiDsN/u7XEtnLrB98602w=";
         };
       };
     };
diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix
index 6fbf70d6335d..e7122a299b35 100644
--- a/pkgs/by-name/we/wemeet/package.nix
+++ b/pkgs/by-name/we/wemeet/package.nix
@@ -133,16 +133,16 @@ let
 in
 stdenv.mkDerivation {
   pname = "wemeet";
-  version = "3.19.2.400";
+  version = "3.26.10.400";
 
   src = selectSystem {
     x86_64-linux = fetchurl {
-      url = "https://updatecdn.meeting.qq.com/cos/fb7464ffb18b94a06868265bed984007/TencentMeeting_0300000000_3.19.2.400_x86_64_default.publish.officialwebsite.deb";
-      hash = "sha256-PSGc4urZnoBxtk1cwwz/oeXMwnI02Mv1pN2e9eEf5kE=";
+      url = "https://updatecdn.meeting.qq.com/cos/9cfd93b10ee81b2fc3ad26357f27ed13/TencentMeeting_0300000000_3.26.10.400_x86_64_default.publish.officialwebsite.deb";
+      hash = "sha256-7gN40mkAD/0/k0E+bBNfiMcY+YtIaLWycFoI+hhrjgc=";
     };
     aarch64-linux = fetchurl {
-      url = "https://updatecdn.meeting.qq.com/cos/867a8a2e99a215dcd4f60fe049dbe6cf/TencentMeeting_0300000000_3.19.2.400_arm64_default.publish.officialwebsite.deb";
-      hash = "sha256-avN+PHKKC58lMC5wd0yVLD0Ct7sbb4BtXjovish0ULU=";
+      url = "https://updatecdn.meeting.qq.com/cos/e5f447f30343e27c49438db8d035ae23/TencentMeeting_0300000000_3.26.10.400_arm64_default.publish.officialwebsite.deb";
+      hash = "sha256-ShxcDwwBThwe2YKNy/5+HmYcnnodPhrMaOwkw3gTq0E=";
     };
   };
 
@@ -206,6 +206,21 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  postInstall = selectSystem {
+    x86_64-linux = ''
+      # According to @mnixry:
+      #   The thing is, it's a coroutine library that involves a series of low-level operations like stack and register restoration and saving, so there's quite a bit of code that looks like hand-written assembly.
+      #   Then they apparently changed the usage of co_jump_to_link, but the registers used in the assembly weren't updated accordingly.
+      #   And then under certain versions of libc/libcpp implementations, that original register happens to have a value, so the tests also pass.
+
+      # cmp rdi, 0 -> cmp r12, 0, at co_jump_to_link to address coroutine context resume issue
+      echo -ne '\x49\x83\xfc\x00' | dd of=$out/app/wemeet/lib/libwemeet_base.so bs=1 seek=$((0x94c833)) conv=notrunc
+    '';
+    aarch64-linux = ''
+      # I don't know if aarch64-linux version needs similar patch, I don't have aarch64 device.
+    '';
+  };
+
   # set LP_NUM_THREADS limit the number of cores used by rendering
   # set XDG_SESSION_TYPE; unset WAYLAND_DISPLAY getting border shadows to work
   # set QT_STYLE_OVERRIDE solve the color of the font is not visible when using the included Qt
@@ -227,6 +242,7 @@ stdenv.mkDerivation {
       ];
       xwaylandWrapperArgs = baseWrapperArgs ++ [
         "--set XDG_SESSION_TYPE x11"
+        "--set QT_QPA_PLATFORM xcb"
         "--unset WAYLAND_DISPLAY"
         "--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so:${wemeet-wayland-screenshare}/lib/wemeet/libhook.so"
       ];
diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 60ff9bb9cdc4..cad94a2edf39 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -1,26 +1,26 @@
 {
-  lib,
-  stdenv,
+  btrfs-progs,
   buildGoModule,
   fetchFromGitHub,
-  btrfs-progs,
-  writableTmpDirAsHomeHook,
   installShellFiles,
+  lib,
+  stdenv,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.49.0";
+  version = "2.51.3";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K999EgTbyQeLO1xm94WeOAQ5Ld3stOuAI4LGs4fSU5g=";
+    hash = "sha256-xka8poabuG1Bwmo+Q+VeWLZIkKSY9+k5JHYTO2ecz2I=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-Vjce/pmFRusBOJEQjgrlhS4LPlOy4nOWwCm7o5BB+OQ=";
+  vendorHash = "sha256-v2/b618nKua8+y7Imyz3+expBQlIS13TWkNRMh2NCVo=";
 
   subPackages = [ "cmd/werf" ];
 
diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix
index 16663c625477..be34a6058bc8 100644
--- a/pkgs/by-name/we/wesnoth/package.nix
+++ b/pkgs/by-name/we/wesnoth/package.nix
@@ -23,10 +23,12 @@
   lua5_4,
   curl,
   nix-update-script,
+  enableDevel ? false,
 }:
 
 let
   boost = boost186;
+  suffix = lib.optionalString enableDevel "-devel";
   # wesnoth requires lua built with c++, see https://github.com/wesnoth/wesnoth/pull/8234
   lua = lua5_4.override {
     postConfigure = ''
@@ -36,14 +38,18 @@ let
 in
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "wesnoth";
-  version = "1.18.5";
+  pname = "wesnoth${suffix}";
+  version = if enableDevel then "1.19.17" else "1.18.5";
 
   src = fetchFromGitHub {
     owner = "wesnoth";
     repo = "wesnoth";
     tag = finalAttrs.version;
-    hash = "sha256-0VZJAmaCg12x4S07H1kl5s2NGMEo/NSVnzMniREmPJk=";
+    hash =
+      if enableDevel then
+        "sha256-8JFJR4ghL2uSI5zG63MPX5NwlvIc3/xR0SQ2FjG5JCw="
+      else
+        "sha256-0VZJAmaCg12x4S07H1kl5s2NGMEo/NSVnzMniREmPJk=";
   };
 
   nativeBuildInputs = [
@@ -73,10 +79,31 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     "-DENABLE_SYSTEM_LUA=ON"
+    "-DBINARY_SUFFIX=${suffix}"
   ];
 
+  postPatch = lib.optionalString (suffix != "") ''
+    mv packaging/org.wesnoth.Wesnoth.desktop packaging/org.wesnoth.Wesnoth${suffix}.desktop
+    mv packaging/org.wesnoth.Wesnoth.appdata.xml packaging/org.wesnoth.Wesnoth${suffix}.appdata.xml
+
+    substituteInPlace packaging/org.wesnoth.Wesnoth${suffix}.desktop \
+      --replace-fail "Name=Battle for Wesnoth" "Name=Battle for Wesnoth${suffix}" \
+      --replace-fail "Exec=sh -c \"wesnoth >/dev/null 2>&1\"" "Exec=sh -c \"wesnoth${suffix} >/dev/null 2>&1\"" \
+      --replace-fail "Exec=sh -c \"wesnoth -e  >/dev/null 2>&1\"" "Exec=sh -c \"wesnoth${suffix} -e  >/dev/null 2>&1\""
+
+    substituteInPlace packaging/org.wesnoth.Wesnoth${suffix}.appdata.xml \
+      --replace-fail "<name>Battle for Wesnoth</name>" "<name>Battle for Wesnoth${suffix}</name>" \
+      --replace-fail "org.wesnoth.Wesnoth" "org.wesnoth.Wesnoth${suffix}" \
+      --replace-fail "<binary>wesnoth</binary>" "<binary>wesnoth${suffix}</binary>" \
+      --replace-fail "<binary>wesnothd</binary>" "<binary>wesnothd${suffix}</binary>"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "org.wesnoth.Wesnoth.desktop" "org.wesnoth.Wesnoth${suffix}.desktop" \
+      --replace-fail "org.wesnoth.Wesnoth.appdata.xml" "org.wesnoth.Wesnoth${suffix}.appdata.xml"
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    app_name="The Battle for Wesnoth"
+    app_name="The Battle for Wesnoth${suffix}"
     app_bundle="$out/Applications/$app_name.app"
     app_contents="$app_bundle/Contents"
     mkdir -p "$app_contents"
@@ -85,8 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
     mv $out/share/wesnoth "$app_contents/Resources"
     pushd ../projectfiles/Xcode
     substitute Info.plist "$app_contents/Info.plist" \
-      --replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth \
-      --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth \
+      --replace-fail ''\'''${EXECUTABLE_NAME}' wesnoth${suffix} \
+      --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' org.wesnoth.Wesnoth${suffix} \
       --replace-fail ''\'''${PRODUCT_NAME}' "$app_name"
     cp -r Resources/SDLMain.nib "$app_contents/Resources/"
     install -m0644 Resources/{container-migration.plist,icon.icns} "$app_contents/Resources"
@@ -94,22 +121,27 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Make the game and dedicated server binary available for shell users
     mkdir -p "$out/bin"
-    ln -s "$app_contents/MacOS/wesnothd" "$out/bin/wesnothd"
+    ln -s "$app_contents/MacOS/wesnothd${suffix}" "$out/bin/wesnothd${suffix}"
     # Symlinking the game binary is unsifficient as it would be unable to
     # find the bundle resources
-    cat << EOF > "$out/bin/wesnoth"
+    cat << EOF > "$out/bin/wesnoth${suffix}"
     #!${stdenvNoCC.shell}
     open -na "$app_bundle" --args "\$@"
     EOF
-    chmod +x "$out/bin/wesnoth"
+    chmod +x "$out/bin/wesnoth${suffix}"
   '';
 
   passthru.updateScript = nix-update-script {
     extraArgs = [
       "--version-regex"
-      # the minor release number also denotes if this is a beta release:
-      # even is stable, odd is beta
-      "^(\\d+\\.\\d*[02468]\\.\\d+)$"
+      (
+        if enableDevel then
+          # Devel matches odd minor release numbers
+          "^(\\d+\\.\\d*[13579]\\.\\d+.*)$"
+        else
+          # Stable matches even minor release numbers
+          "^(\\d+\\.\\d*[02468]\\.\\d+)$"
+      )
     ];
   };
 
@@ -131,6 +163,6 @@ stdenv.mkDerivation (finalAttrs: {
       iedame
     ];
     platforms = lib.platforms.unix;
-    mainProgram = "wesnoth";
+    mainProgram = "wesnoth${suffix}";
   };
 })
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 4a07300af6b4..3980a633deae 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -10,7 +10,7 @@
   wayland-scanner,
   cairo,
   libGL,
-  libdisplay-info,
+  libdisplay-info_0_2,
   libdrm,
   libevdev,
   libinput,
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cairo
     libGL
-    libdisplay-info
+    libdisplay-info_0_2
     libdrm
     libevdev
     libinput
diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index a729c9b9bfe4..2e37932cc914 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -28,14 +28,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wezterm";
-  version = "0-unstable-2025-10-05";
+  version = "0-unstable-2025-10-14";
 
   src = fetchFromGitHub {
     owner = "wezterm";
     repo = "wezterm";
-    rev = "db5d7437389eac5f63ad32e3b50d95b2b86065d1";
+    rev = "64f2907c635b7bab407ac300b2261c77a85c1c8e";
     fetchSubmodules = true;
-    hash = "sha256-4OzgrXsSq68CP6iImhqW896X6ekv2seg4kaH3md6QLs=";
+    hash = "sha256-o/SSN18DmoN5LsB9RvWuAw7voGevOR5DqPBheqmq7AI=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix
index 3d5af80a5bef..f56afa8fa09f 100644
--- a/pkgs/by-name/wg/wgo/package.nix
+++ b/pkgs/by-name/wg/wgo/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "wgo";
-  version = "0.5.14";
+  version = "0.6.2";
 in
 buildGoModule {
   inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "bokwoon95";
     repo = "wgo";
     rev = "v${version}";
-    hash = "sha256-zqRcGUfqvn0NX1rL/+jMVE/LCIT2IrqUUPDGThSueAY=";
+    hash = "sha256-Z3adi1PQ5v0BxcjkOJZWeUxwLlLXpNuJxrQztV2pCiA=";
   };
 
-  vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU=";
+  vendorHash = "sha256-6ZJNXw/ahaIziQGVNgjbTbm53JiO3dYCqJtdB///cmo=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix
index 6a1b1fbacbaf..0ac8d12ce6ed 100644
--- a/pkgs/by-name/wg/wgpu-native/package.nix
+++ b/pkgs/by-name/wg/wgpu-native/package.nix
@@ -9,15 +9,15 @@
   callPackage,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wgpu-native";
-  version = "25.0.2.2";
+  version = "27.0.2.0";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu-native";
-    tag = "v${version}";
-    hash = "sha256-ihA1pfTW6EHpihL4IUv7YTsU1SLkxEM6wUDr7NiHmLc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-sJEDCt8DTP6FjtbROVCZVD0we0OA07wjkiLnXoQfTuc=";
     fetchSubmodules = true;
   };
 
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     "dev"
   ];
 
-  cargoHash = "sha256-8Axm9gIX6yW0ScV5SjB6AWlmlIeGuQYonWsGwcIH2os=";
+  cargoHash = "sha256-ZQiX7IZsbjlDzRNlYgpRnLfCKGAYnSwvACRMNkZPjbE=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
@@ -37,6 +37,8 @@ rustPlatform.buildRustPackage rec {
     vulkan-loader
   ];
 
+  env.WGPU_NATIVE_VERSION = finalAttrs.version;
+
   postInstall = ''
     rm $out/lib/libwgpu_native.a
     install -Dm644 ./ffi/wgpu.h -t $dev/include/webgpu
@@ -46,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   passthru = {
     updateScript = nix-update-script { };
     examples = callPackage ./examples.nix {
-      inherit version src;
+      inherit (finalAttrs) version src;
     };
   };
 
@@ -59,4 +61,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ niklaskorz ];
   };
-}
+})
diff --git a/pkgs/by-name/wh/wheelwizard/deps.json b/pkgs/by-name/wh/wheelwizard/deps.json
new file mode 100644
index 000000000000..54158417541b
--- /dev/null
+++ b/pkgs/by-name/wh/wheelwizard/deps.json
@@ -0,0 +1,522 @@
+[
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.25547.20250602",
+    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
+  },
+  {
+    "pname": "Avalonia.HtmlRenderer",
+    "version": "11.0.0",
+    "hash": "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4="
+  },
+  {
+    "pname": "Castle.Core",
+    "version": "5.1.1",
+    "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="
+  },
+  {
+    "pname": "coverlet.collector",
+    "version": "6.0.4",
+    "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0="
+  },
+  {
+    "pname": "CSharpier.MsBuild",
+    "version": "0.30.6",
+    "hash": "sha256-FhXf9ggWmWzGp6vz6vJP+ly4SOeyluP6Ic3MfCz1uUA="
+  },
+  {
+    "pname": "DotNet.Glob",
+    "version": "3.1.3",
+    "hash": "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "8.3.1.1",
+    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
+  },
+  {
+    "pname": "ini-parser",
+    "version": "2.5.2",
+    "hash": "sha256-IGUP2iEBuL8QpcllvPfeuqn7O908H16Kg0oOrXUUJ3Y="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "6.0.0",
+    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeCoverage",
+    "version": "17.13.0",
+    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
+  },
+  {
+    "pname": "Microsoft.Extensions.AmbientMetadata.Application",
+    "version": "9.3.0",
+    "hash": "sha256-aTR4eSGHPWdbmVsmUYJ+qKEG1ah+zubpZyrM6jEqOEQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Abstractions",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-yc4xSH5JuFXsCka5A5FGuUtvgEIjyj1VDav8pZ52s3U="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Memory",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-jLC6jhzDJTNcOMuwdaGEMaAKuftIMFnO+oPwjTcLNh0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Compliance.Abstractions",
+    "version": "9.3.0",
+    "hash": "sha256-kTZy+spk9bbXIWXcL9PS42v8NkJc7XHVtRF+B10JOkA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "8.0.0",
+    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.0",
+    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.2",
+    "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.3",
+    "hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-kcXuldbnR8++yNGQj9/rVJOyFaJPKPxecWU9b0KX7AY="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.3",
+    "hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.AutoActivation",
+    "version": "9.3.0",
+    "hash": "sha256-Y5C0GmvBqaH7LbDpnNUgGLSEUkhLTdbio40wjqRcSiE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "8.0.1",
+    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.ExceptionSummarization",
+    "version": "9.3.0",
+    "hash": "sha256-r1HuCwGdX90bU3FzBvq8sxmA/gw3MVCjuG6hqowdoqs="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http",
+    "version": "8.0.1",
+    "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http.Diagnostics",
+    "version": "9.3.0",
+    "hash": "sha256-e1Sq+sEtZA5oVoB7WjICrFg9SZ1IiOp+CUpk5rJCSRU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http.Resilience",
+    "version": "9.3.0",
+    "hash": "sha256-X5MIsQsvIGJ8DmsUZHyY9ZOSeKKI7LZ+WoHYDgaFERc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.3",
+    "hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-8ls/8wAEqMI5HEAeHz82tjmM9Xel/m3JymxEdUni6ig="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.3",
+    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.3",
+    "hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "8.0.1",
+    "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
+  },
+  {
+    "pname": "Microsoft.Extensions.ObjectPool",
+    "version": "8.0.14",
+    "hash": "sha256-qd+fKVbI6xjy8pm2JIPWljFjdphHQhxHv5sOLzsW1B8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-TqviXNJUy9wTWwSLP6/QdfN6+VUg2HHR7skVrotPHGU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.0",
+    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.2",
+    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.3",
+    "hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "8.0.0",
+    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-E1rTPmEYK/ssqHS1CF7xUTRbFWuYxbelV9w2VRST01E="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "5.0.1",
+    "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.3",
+    "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus="
+  },
+  {
+    "pname": "Microsoft.Extensions.Resilience",
+    "version": "9.3.0",
+    "hash": "sha256-GegeV0A5RNlSJuA5Pq78hIE5tZJxQWXQZ3fVtQZRZr8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Telemetry",
+    "version": "9.3.0",
+    "hash": "sha256-DCwTXtK81v+rDeRrRQQCdiiwCzZpQEEwwU1wVJgbEbs="
+  },
+  {
+    "pname": "Microsoft.Extensions.Telemetry.Abstractions",
+    "version": "9.3.0",
+    "hash": "sha256-X9hooaCbC2G5PT022Yj7iJgEzS/bFyBxJbh6QQJTOQU="
+  },
+  {
+    "pname": "Microsoft.NET.Test.Sdk",
+    "version": "17.13.0",
+    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.13.0",
+    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.TestHost",
+    "version": "17.13.0",
+    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.1",
+    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
+  },
+  {
+    "pname": "NSubstitute",
+    "version": "5.3.0",
+    "hash": "sha256-fa6Hn9Qmpia2labWOs1Xp2LnJBOHfrWIwxvqKRRccs0="
+  },
+  {
+    "pname": "Polly.Core",
+    "version": "8.4.2",
+    "hash": "sha256-4fn5n6Bu29uqWg8ciii3MDsi9bO2/moPa9B3cJ9Ihe8="
+  },
+  {
+    "pname": "Polly.Extensions",
+    "version": "8.4.2",
+    "hash": "sha256-oyf9CNi8NXLyeMLwBBCifFvV6erIEaurs8i9BZdr0ik="
+  },
+  {
+    "pname": "Polly.RateLimiting",
+    "version": "8.4.2",
+    "hash": "sha256-432TfbcJ8UUhDWKLcAFksMjbcU0PlLrK+BrrDxFw4/8="
+  },
+  {
+    "pname": "Refit",
+    "version": "8.0.0",
+    "hash": "sha256-YORvtZtDy0+wlUoJTur1lO5wJMovFY/jxoIvfkEkObI="
+  },
+  {
+    "pname": "Refit.HttpClientFactory",
+    "version": "8.0.0",
+    "hash": "sha256-VNVCqzq3HwPSRK/GrcBkbdhb2iRYrqoeDBvGnPNyrbA="
+  },
+  {
+    "pname": "Semver",
+    "version": "3.0.0",
+    "hash": "sha256-nX5ka27GY6pz9S73H6sLSQCrnAyyI9xDVdzrtlMp4BQ="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.1.1",
+    "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
+  },
+  {
+    "pname": "Serilog",
+    "version": "4.0.0",
+    "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
+  },
+  {
+    "pname": "Serilog.Extensions.Logging",
+    "version": "8.0.0",
+    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+  },
+  {
+    "pname": "Serilog.Sinks.Console",
+    "version": "6.0.0",
+    "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "6.0.0",
+    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+  },
+  {
+    "pname": "SharpCompress",
+    "version": "0.39.0",
+    "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-iI1z0kg5z1aTg3fTm/tMCXGQe7JqgOxaCf6Ac85G9+Y="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "9.0.3",
+    "hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "6.0.0",
+    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Linq.Async",
+    "version": "6.0.1",
+    "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "1.6.0",
+    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "9.0.2",
+    "hash": "sha256-Ubs57l7OtgMyC/N1qiAFcfqAxqghRVXs9tB7Jws30t8="
+  },
+  {
+    "pname": "System.Threading.RateLimiting",
+    "version": "8.0.0",
+    "hash": "sha256-KOEWEt6ZthvZHJ2Wp70d9nBhBrPqobGQDi2twlKYh/w="
+  },
+  {
+    "pname": "TestableIO.System.IO.Abstractions.Analyzers",
+    "version": "2022.0.0",
+    "hash": "sha256-BbH3iS85/cmk9+9xUq69cCCgHQasyoHAYsa+QaYNInE="
+  },
+  {
+    "pname": "Testably.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-9X6gA+8wBb2JzryKrq2Vt3flbDJA7v/cLTY2alaNoQA="
+  },
+  {
+    "pname": "Testably.Abstractions.FileSystem.Interface",
+    "version": "9.0.0",
+    "hash": "sha256-6JW+qDtqQT9StP4oTR7uO0NnmVc2xcjSZ6ds2H71wtg="
+  },
+  {
+    "pname": "Testably.Abstractions.Interface",
+    "version": "9.0.0",
+    "hash": "sha256-UuzE7101YnWkuPvOJsEZ8xVjXl3P/gyDyKdScmT51do="
+  },
+  {
+    "pname": "Testably.Abstractions.Testing",
+    "version": "4.0.1",
+    "hash": "sha256-EXIEjrR91ZMOwU6Qf0Se5G7v0XEWMEMQe95EXkV1Iw4="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+  },
+  {
+    "pname": "xunit",
+    "version": "2.9.3",
+    "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c="
+  },
+  {
+    "pname": "xunit.abstractions",
+    "version": "2.0.3",
+    "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="
+  },
+  {
+    "pname": "xunit.analyzers",
+    "version": "1.18.0",
+    "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0="
+  },
+  {
+    "pname": "xunit.assert",
+    "version": "2.9.3",
+    "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA="
+  },
+  {
+    "pname": "xunit.core",
+    "version": "2.9.3",
+    "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw="
+  },
+  {
+    "pname": "xunit.extensibility.core",
+    "version": "2.9.3",
+    "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g="
+  },
+  {
+    "pname": "xunit.extensibility.execution",
+    "version": "2.9.3",
+    "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw="
+  },
+  {
+    "pname": "xunit.runner.visualstudio",
+    "version": "3.0.2",
+    "hash": "sha256-Q0IxAFO9EDnIGzRl2HCWBujPZL8kqBcNZez1Y29hjPc="
+  },
+  {
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.4",
+    "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
+  }
+]
diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix
new file mode 100644
index 000000000000..633344d45f7f
--- /dev/null
+++ b/pkgs/by-name/wh/wheelwizard/package.nix
@@ -0,0 +1,85 @@
+{
+  lib,
+  buildDotnetModule,
+  desktop-file-utils,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  makeDesktopItem,
+  makeWrapper,
+  avalonia,
+  # Runtime dependencies
+  libglvnd,
+  # passthru
+  nix-update-script,
+}:
+buildDotnetModule rec {
+  pname = "wheelwizard";
+  version = "2.3.3";
+
+  src = fetchFromGitHub {
+    owner = "TeamWheelWizard";
+    repo = "WheelWizard";
+    tag = "${version}";
+    hash = "sha256-DuEI6bmvNP6wRuZX9Do0FGDsu80ldy0SCefBk6gqT9s=";
+  };
+  postPatch = ''
+    rm .config/dotnet-tools.json
+  '';
+
+  projectFile = "WheelWizard.sln";
+  buildType = "Release";
+  dotnet-sdk = dotnetCorePackages.sdk_8_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0-bin;
+  nugetDeps = ./deps.json;
+  mapNuGetDependencies = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    avalonia
+  ];
+
+  runtimeDeps = [
+    libglvnd
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/wheelwizard $out/bin
+    cp -r WheelWizard/bin/Release/net8.0/* $out/lib/wheelwizard/
+
+    makeWrapper $out/lib/wheelwizard/WheelWizard $out/bin/WheelWizard \
+      --prefix PATH : ${lib.makeBinPath [ dotnet-runtime ]}
+
+    install -D $desktopItem/share/applications/* -t $out/share/applications
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    rm $out/bin/*.{so,dylib}
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "wheelwizard";
+    exec = "WheelWizard";
+    comment = "WheelWizard, Retro Rewind Launcher";
+    desktopName = "Wheel Wizard";
+    categories = [ "Game" ];
+  };
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = with lib; {
+    description = "WheelWizard, Retro Rewind Launcher";
+    homepage = "https://github.com/TeamWheelWizard/WheelWizard";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    mainProgram = "WheelWizard";
+    maintainers = with maintainers; [ DerHalbGrieche ];
+  };
+}
diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 2fcc319e5eb3..82ee0911960c 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -29,16 +29,16 @@ let
     ."${system}" or (throw "Unsupported system: ${system}");
   hash =
     {
-      arm64-linux-hash = "sha256-o2iZAgpKM/E9EL+jXpcJhQkyIfC3ytcW5erAuHsNNCo=";
-      arm64-osx-hash = "sha256-axa2VeieIdsjp09DG8vAlvYHX4PmqoLhiTe1OtAK8/k=";
-      x64-linux-hash = "sha256-bLmTovZrO3+8CrYM7h46k2TvGK0v7Mn3CXdkLgwCoD4=";
-      x64-osx-hash = "sha256-mExZSwmeSkssPRbRoXKN3htstPPyAju2Z7/cSZ8ZeU0=";
+      arm64-linux-hash = "sha256-AGERhD8EiTkaXw7GWVaWPFVuQkclSarNOGMgs+6zxfI=";
+      arm64-osx-hash = "sha256-AUZoAAEmgrb1A7OKLc7QOliGTgctD9MuM9rqNWQ3ySM=";
+      x64-linux-hash = "sha256-ZRbV1nxAIiHUL8DzmlAJRcFOnl5t8+ur3zXhw29mUfk=";
+      x64-osx-hash = "sha256-WfR0x89wQNAiLYX1Dg5AsEuiqHSX9IhhxEOoVuPjRH8=";
     }
     ."${arch}-${os}-hash";
 in
 stdenv.mkDerivation rec {
   pname = "whisparr";
-  version = "2.0.0.1278";
+  version = "2.0.0.1282";
 
   src = fetchurl {
     name = "${pname}-${arch}-${os}-${version}.tar.gz";
diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 109db97b9eda..e54b0c4f5bd8 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   cmake,
   git,
-  apple-sdk_13,
   ninja,
   fetchFromGitHub,
   SDL2,
@@ -47,8 +46,6 @@ let
     optionals
     ;
 
-  darwinBuildInputs = [ apple-sdk_13 ];
-
   cudaBuildInputs = with cudaPackages; [
     cuda_cccl # <nv/target>
 
@@ -73,13 +70,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "whisper.cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lE25O/C55INo4xufCSzrPFX2kyodXiKwf80kknIy1Os=";
+    hash = "sha256-OU5mDnLZHmtdSEN5u0syJcU91L+NCO45f9eG6OsgFfU=";
   };
 
   # The upstream download script tries to download the models to the
@@ -111,7 +108,6 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
   buildInputs =
     optional withSDL SDL2
-    ++ optionals effectiveStdenv.hostPlatform.isDarwin darwinBuildInputs
     ++ optionals cudaSupport cudaBuildInputs
     ++ optionals rocmSupport rocmBuildInputs
     ++ optionals vulkanSupport vulkanBuildInputs;
diff --git a/pkgs/by-name/wh/whisper/package.nix b/pkgs/by-name/wh/whisper/package.nix
index 08aa9ffc4c0b..9ce1836b25d3 100644
--- a/pkgs/by-name/wh/whisper/package.nix
+++ b/pkgs/by-name/wh/whisper/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # The package comes with prebuilt static
+  # libraries of bzip2, zlib, libdeflate and asmlib.
+  # They are not built with -fPIE and thus linking fails.
+  # As asmlib is not packages in nixpkgs let's disable PIE.
+  env.NIX_LDFLAGS = "-no-pie";
+
   installPhase = ''
     runHook preInstall
     install -Dt $out/bin whisper whisper-index
@@ -48,5 +54,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/refresh-bio/whisper";
     maintainers = with maintainers; [ jbedo ];
     platforms = platforms.x86_64;
+    sourceProvenance = [ sourceTypes.binaryNativeCode ];
   };
 }
diff --git a/pkgs/by-name/wh/whois/package.nix b/pkgs/by-name/wh/whois/package.nix
index 44d87d25a7b6..f5b434fc5b8a 100644
--- a/pkgs/by-name/wh/whois/package.nix
+++ b/pkgs/by-name/wh/whois/package.nix
@@ -11,14 +11,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "5.6.4";
+  version = "5.6.5";
   pname = "whois";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    hash = "sha256-9c67LrpJu3cW/j1hfNhatB4nkCxMTCfHpszawGtU7ko=";
+    hash = "sha256-zCaM3fMittoEzuMRELqc1ES8QPgZRXVjyHUfMsS5tJA=";
   };
 
   patches = [
diff --git a/pkgs/by-name/wi/wild/adapterTest.nix b/pkgs/by-name/wi/wild/adapterTest.nix
new file mode 100644
index 000000000000..44f80e2634e9
--- /dev/null
+++ b/pkgs/by-name/wi/wild/adapterTest.nix
@@ -0,0 +1,151 @@
+{
+  lib,
+  stdenv,
+  gccStdenv,
+  clangStdenv,
+  buildPackages,
+  runCommandCC,
+  makeBinaryWrapper,
+  gcc,
+  wild,
+  binutils-unwrapped-all-targets,
+  clang,
+  lld,
+  clang-tools,
+  useWildLinker,
+  hello,
+}:
+let
+  # These wrappers are REQUIRED for the Wild test suite to pass
+  #
+  # Write a wrapper for GCC that passes -B to *unwrapped* binutils.
+  # This ensures that if -fuse-ld=bfd is used, gcc picks up unwrapped ld.bfd
+  # instead of the hardcoded wrapper search directory.
+  # We pass it last because apparently gcc likes picking ld from the *first* -B,
+  # which we want our wild target directory to be if passed.
+  gccWrapper = stdenv.mkDerivation {
+    inherit (gcc) name;
+    dontUnpack = true;
+    dontConfigure = true;
+    dontInstall = true;
+
+    buildInputs = [ makeBinaryWrapper ];
+    buildPhase = ''
+      runHook preBuild
+
+      makeWrapper ${lib.getExe gcc} $out/bin/gcc \
+        --append-flag -B${binutils-unwrapped-all-targets}/bin
+
+      runHook postBuild
+    '';
+
+  };
+
+  gppWrapper = stdenv.mkDerivation {
+    dontUnpack = true;
+    dontConfigure = true;
+    dontInstall = true;
+
+    name = "g++-wrapped";
+    buildInputs = [ makeBinaryWrapper ];
+    buildPhase = ''
+      runHook preBuild
+
+      makeWrapper ${lib.getExe' gcc "g++"} $out/bin/g++ \
+        --append-flag -B${binutils-unwrapped-all-targets}/bin
+
+      runHook postBuild
+    '';
+  };
+
+  # Test helper that takes in a binary and checks that it runs
+  # and was built with Wild
+  helloTest =
+    name: helloWild:
+    let
+      command = "$READELF -p .comment ${lib.getExe helloWild}";
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    runCommandCC "wild-${name}-test" { passthru = { inherit helloWild; }; } ''
+      echo "Testing running the 'hello' binary which should be linked with 'wild'" >&2
+      ${emulator} ${lib.getExe helloWild}
+
+      echo "Checking for wild in the '.comment' section" >&2
+      if output=$(${command} 2>&1); then
+        if grep -Fw -- "Wild" - <<< "$output"; then
+          touch $out
+        else
+          echo "No mention of 'wild' detected in the '.comment' section" >&2
+          echo "The command was:" >&2
+          echo "${command}" >&2
+          echo "The output was:" >&2
+          echo "$output" >&2
+          exit 1
+        fi
+      else
+        echo -n "${command}" >&2
+        echo " returned a non-zero exit code." >&2
+        echo "$output" >&2
+        exit 1
+      fi
+    '';
+in
+{
+  testWild = wild.overrideAttrs {
+    pname = "wild-tests";
+    doCheck = true;
+    doInstallCheck = false;
+    dontBuild = true;
+    buildType = "debug";
+
+    checkInputs = [
+      stdenv.cc.libc.out
+      stdenv.cc.libc.static
+    ];
+
+    # https://github.com/davidlattimore/wild/discussions/832#discussioncomment-14482948
+    checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [
+      "--skip=integration_test::program_name_71___unresolved_symbols_object_c__"
+    ];
+
+    # wild's tests compare the outputs of several different linkers. nixpkgs's
+    # patching and wrappers change the output behavior, so we must make sure
+    # that their behavior is compatible.
+    #
+    # Does not work if they are put in nativeCheckInputs or checkInputs
+    preCheck = ''
+      export LD_LIBRARY_PATH=${
+        lib.makeLibraryPath [
+          stdenv.cc.cc.lib
+        ]
+      }:$LD_LIBRARY_PATH
+
+      export PATH=${
+        lib.makeBinPath [
+          binutils-unwrapped-all-targets
+          clang
+          gccWrapper
+          gppWrapper
+          lld
+          clang-tools
+        ]
+      }:$PATH
+    '';
+
+    installPhase = "touch $out";
+  };
+
+  # Test that the adapter works with a gcc stdenv
+  adapterGcc = helloTest "adapter-gcc" (
+    hello.override (_: {
+      stdenv = useWildLinker gccStdenv;
+    })
+  );
+
+  # Test the adapter works with a clang stdenv
+  adapter-llvm = helloTest "adapter-llvm" (
+    hello.override (_: {
+      stdenv = useWildLinker clangStdenv;
+    })
+  );
+}
diff --git a/pkgs/by-name/wi/wild/package.nix b/pkgs/by-name/wi/wild/package.nix
new file mode 100644
index 000000000000..544a56eebabf
--- /dev/null
+++ b/pkgs/by-name/wi/wild/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchFromGitHub,
+  callPackage,
+  versionCheckHook,
+  rustPlatform,
+  pkg-config,
+  zstd,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "wild";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "davidlattimore";
+    repo = "wild";
+    tag = finalAttrs.version;
+    hash = "sha256-x0IZuWjj0LRMj4pu2FVaD8SENm/UVtE1e4rl0EOZZZM=";
+  };
+
+  cargoHash = "sha256-5s0qS8y0+EH+R1tgN2W5/+t+GdjbQdRVLlcA2KjpHsE=";
+
+  cargoBuildFlags = [ "-p wild-linker" ];
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    zstd
+  ];
+
+  env.ZSTD_SYS_USE_PKG_CONFIG = true;
+
+  doCheck = false; # Tests are ran in passthru tests
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests = callPackage ./adapterTest.nix { wild = finalAttrs.finalPackage; };
+  };
+
+  meta = {
+    description = "Very fast linker for Linux";
+    homepage = "https://github.com/davidlattimore/wild";
+    changelog = "https://github.com/davidlattimore/wild/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = [
+      lib.licenses.asl20 # or
+      lib.licenses.mit
+    ];
+    mainProgram = "wild";
+    maintainers = with lib.maintainers; [ RossSmyth ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/by-name/wi/winboat/guest-server.nix b/pkgs/by-name/wi/winboat/guest-server.nix
new file mode 100644
index 000000000000..15ae46e6ae44
--- /dev/null
+++ b/pkgs/by-name/wi/winboat/guest-server.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  winboat,
+}:
+buildGoModule {
+  inherit (winboat) version src;
+  modRoot = "guest_server";
+  pname = "winboat-guest-server";
+  vendorHash = "sha256-JglpTv1hkqxmcbD8xmG80Sukul5hzGyyANfe+GeKzQ4=";
+
+  env = {
+    GOOS = "windows";
+    GOARCH = "amd64";
+    PACKAGE = "winboat-server";
+  };
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${winboat.version}"
+    "-X main.CommitHash=${winboat.src.rev}"
+  ];
+
+  meta = {
+    mainProgram = "winboat-server.exe";
+    description = "Guest server for winboat";
+    homepage = "https://github.com/TibixDev/winboat";
+    changelog = "https://github.com/TibixDev/winboat/releases/tag/v${winboat.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      rexies
+      ppom
+    ];
+    platforms = [ "x86_64-windows" ];
+  };
+}
diff --git a/pkgs/by-name/wi/winboat/package.nix b/pkgs/by-name/wi/winboat/package.nix
new file mode 100644
index 000000000000..68c725210acc
--- /dev/null
+++ b/pkgs/by-name/wi/winboat/package.nix
@@ -0,0 +1,123 @@
+{
+  lib,
+  electron,
+  zip,
+  nodejs_24,
+  makeWrapper,
+  udev,
+  usbutils,
+  freerdp,
+  docker-compose,
+  pkgsCross,
+  buildNpmPackage,
+  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  nix-update-script,
+}:
+buildNpmPackage (final: {
+  pname = "winboat";
+  version = "0.8.7";
+
+  src = fetchFromGitHub {
+    owner = "TibixDev";
+    repo = "winboat";
+    tag = "v${final.version}";
+    hash = "sha256-30WzvdY8Zn4CAj76bbC0bevuTeOSfDo40FPWof/39Es=";
+  };
+
+  postPatch = ''
+    substituteInPlace package.json \
+      --replace-fail "main/main.js" "src/main/main.ts"
+  '';
+
+  nativeBuildInputs = [
+    zip
+    makeWrapper
+    copyDesktopItems
+  ];
+
+  buildInputs = [ udev ];
+
+  env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  npmDepsHash = "sha256-nW+cGX4Y0Ndn1ubo4U3n8ZrjM5NkxIt4epB0AghPrNQ=";
+  nodejs = nodejs_24;
+  makeCacheWritable = true;
+
+  guest-server = pkgsCross.mingwW64.callPackage ./guest-server.nix { };
+  passthru = {
+    guest-server = final.guest-server;
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "guest-server"
+      ];
+    };
+  };
+
+  buildPhase = ''
+    node scripts/build.ts
+    npm exec electron-builder --linux -- \
+      --dir \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version} \
+      -c.npmRebuild=false
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # install built artifacts
+    mkdir -p $out/bin $out/share/winboat
+    cp -r dist/linux-unpacked/resources $out/share/winboat/resources
+
+    # install winboat icon
+    install -Dm444 icons/icon.png $out/share/icons/hicolor/256x256/apps/winboat.png
+
+    # copy the the winboat-guest-server executable and generate the zip
+    cp ${lib.getExe final.guest-server} $out/share/winboat/resources/guest_server/winboat_guest_server.exe
+    (cd $out/share/winboat/resources/guest_server/ && zip -r winboat_guest_server.zip .)
+
+    # symlink data/ and guest_server/ into parent folder
+    ln -sf $out/share/winboat/resources/data $out/share/winboat/data
+    ln -sf $out/share/winboat/resources/guest_server $out/share/winboat/guest_server
+
+    makeWrapper ${electron}/bin/electron $out/bin/winboat \
+      --add-flag "$out/share/winboat/resources/app.asar" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --suffix PATH : ${
+        lib.makeBinPath [
+          usbutils
+          docker-compose
+          freerdp
+        ]
+      }
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "winboat";
+      desktopName = "WinBoat";
+      type = "Application";
+      exec = "winboat %U";
+      terminal = false;
+      icon = "winboat";
+      categories = [ "Utility" ];
+    })
+  ];
+
+  meta = {
+    mainProgram = "winboat";
+    description = "Run Windows apps on Linux with seamless integration";
+    homepage = "https://github.com/TibixDev/winboat";
+    changelog = "https://github.com/TibixDev/winboat/releases/tag/v${final.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      rexies
+      ppom
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+})
diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix
index 555591192ecb..e8d5d71753e4 100644
--- a/pkgs/by-name/wi/winbox4/package.nix
+++ b/pkgs/by-name/wi/winbox4/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "winbox";
-  version = "4.0beta33";
+  version = "4.0beta35";
 
   metaCommon = {
     description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
   x86_64-zip = callPackage ./build-from-zip.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-jGYqzmqH/0cbYoI5rGqSALzU8/dtDIKXCoFn9adDBZY=";
+    hash = "sha256-gmFAxa9ogFwbSZ9yOCkDzHDoRwc3FRx/HS9/yqdUpZc=";
   };
 
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-INMSKYGpXMBIF11Xaz+MLmCk78+rn7jf5BaFsErIG1E=";
+    hash = "sha256-FeUEr9Kpu92NDOyp8inpSvx42xRboHb/Ey3Bo4S91S0=";
   };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {
diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index abba0fc641e3..c5b1d6180859 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.12.16",
-    "vscodeVersion": "1.100.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-darwin-arm64-1.12.16.zip",
-    "sha256": "c18f78671472b03bf06f48f966f4674c2a3adf1b55febf4ea6dddd87d455255d"
+    "version": "1.12.27",
+    "vscodeVersion": "1.105.0",
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-arm64-1.12.27.zip",
+    "sha256": "294f3a3aab7665caf936ef43b384540695849928c956c28b4b783bb3b34913a2"
   },
   "x86_64-darwin": {
-    "version": "1.12.16",
-    "vscodeVersion": "1.100.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-darwin-x64-1.12.16.zip",
-    "sha256": "c23ef27510bb321cba5cdefdba4a4118f2b3f1904caf521981d514e16fa14667"
+    "version": "1.12.27",
+    "vscodeVersion": "1.105.0",
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-x64-1.12.27.zip",
+    "sha256": "61e0dac30fa014f42f99138434f289504d4d2a79aaa9f4cc61c30c663c6ab979"
   },
   "x86_64-linux": {
-    "version": "1.12.16",
-    "vscodeVersion": "1.100.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/6a266ac3a91f80e64147aaf1e7640a92571474cf/Windsurf-linux-x64-1.12.16.tar.gz",
-    "sha256": "e335bfbcdec5a919ea1bf8fdc0acde52df8a8a95ea0019c7c8c56513b119d3e5"
+    "version": "1.12.27",
+    "vscodeVersion": "1.105.0",
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-linux-x64-1.12.27.tar.gz",
+    "sha256": "8f380755df34a1b466c28448f22fc92d3cfb13da55e9d8f2c9db5a4db83f6cac"
   }
 }
diff --git a/pkgs/by-name/wi/wineasio/package.nix b/pkgs/by-name/wi/wineasio/package.nix
index 21ddf7083b35..a6727bcc8f15 100644
--- a/pkgs/by-name/wi/wineasio/package.nix
+++ b/pkgs/by-name/wi/wineasio/package.nix
@@ -6,6 +6,9 @@
   pkg-config,
   wineWowPackages,
   pkgsi686Linux,
+  python3,
+  python3Packages,
+  qt6,
 }:
 
 multiStdenv.mkDerivation rec {
@@ -20,6 +23,34 @@ multiStdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  wineasio-settings = python3Packages.buildPythonApplication {
+    inherit src version;
+    pname = "wineasio-settings";
+    pyproject = false;
+
+    sourceRoot = "${src.name}/gui";
+
+    postPatch = ''
+      patchShebangs wineasio-settings
+      substituteInPlace wineasio-settings \
+        --replace-fail /usr/bin/python3 ${python3}/bin/python3
+    '';
+
+    nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+    buildInputs = [ qt6.qtbase ];
+    dependencies = with python3Packages; [ pyqt6 ];
+
+    makeFlags = [ "PREFIX=$(out)" ];
+
+    dontWrapQtApps = true;
+    dontWrapPythonPrograms = true;
+
+    postFixup = ''
+      wrapQtApp $out/bin/wineasio-settings \
+        --prefix PYTHONPATH : "$PYTHONPATH"
+    '';
+  };
+
   nativeBuildInputs = [
     pkg-config
     wineWowPackages.stable
@@ -43,15 +74,21 @@ multiStdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
+
     install -D build32/wineasio32.dll    $out/lib/wine/i386-windows/wineasio32.dll
     install -D build32/wineasio32.dll.so $out/lib/wine/i386-unix/wineasio32.dll.so
     install -D build64/wineasio64.dll    $out/lib/wine/x86_64-windows/wineasio64.dll
     install -D build64/wineasio64.dll.so $out/lib/wine/x86_64-unix/wineasio64.dll.so
+
+    mkdir -p $out/bin
+    ln -s ${wineasio-settings}/bin/wineasio-settings $out/bin/wineasio-settings
+
     runHook postInstall
   '';
 
   meta = with lib; {
     homepage = "https://github.com/wineasio/wineasio";
+    changelog = "https://github.com/wineasio/wineasio/releases/tag/${src.tag}";
     description = "ASIO to JACK driver for WINE";
     license = with licenses; [
       gpl2
diff --git a/pkgs/by-name/wi/wireless-regdb/package.nix b/pkgs/by-name/wi/wireless-regdb/package.nix
index f07d4f3e2652..a7b6b5bc2d73 100644
--- a/pkgs/by-name/wi/wireless-regdb/package.nix
+++ b/pkgs/by-name/wi/wireless-regdb/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     description = "Wireless regulatory database for CRDA";
-    homepage = "http://wireless.kernel.org/en/developers/Regulatory/";
+    homepage = "https://wireless.docs.kernel.org/en/latest/en/developers/regulatory/wireless-regdb.html";
     license = licenses.isc;
     platforms = platforms.all;
     maintainers = with maintainers; [ fpletz ];
diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 1c1e22d7c819..0e950640a512 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wit-bindgen";
-  version = "0.46.0";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
     rev = "v${version}";
-    hash = "sha256-PBvFa5BrgtKC8f999JJsCdFz34w/xZD57qBFW510oeI=";
+    hash = "sha256-yeL97ljyfxH7qiCeLngYEnIV2ZZp8v5i7TAhv/wfXcc=";
   };
 
-  cargoHash = "sha256-5nz7+2pB5F63vvCecYpp3ExBDIqbRU3MwLNfmMdA2vE=";
+  cargoHash = "sha256-fkaNgWpKOSuZXe2FEM4Llqn8hw0fokejGYJNgsxwliI=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
   # However, GitHub Actions ensures a proper build.
diff --git a/pkgs/by-name/wi/witness/package.nix b/pkgs/by-name/wi/witness/package.nix
index 214aec9cf025..bd8f7799e5df 100644
--- a/pkgs/by-name/wi/witness/package.nix
+++ b/pkgs/by-name/wi/witness/package.nix
@@ -3,24 +3,24 @@
   stdenv,
   buildGoModule,
   fetchFromGitHub,
+
+  buildPackages,
   installShellFiles,
 
-  # testing
-  testers,
-  witness,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "witness";
-  version = "0.9.2";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "in-toto";
     repo = "witness";
-    rev = "v${version}";
-    sha256 = "sha256-0Q+6nG5N3Xp5asmRMPZccLxw6dWiZVX6fuIUf1rT+mI=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-MKiPIZFeCWOT4zTbG7SjwdNUHFuqsL4pGu4VvVwyn3s=";
   };
-  vendorHash = "sha256-oH/aWt8Hl/BIN+IYLcuVYWDpQZaYABAOGxXyLssjQg0=";
+  vendorHash = "sha256-V3SuhBbhXyA0SFOGfBrV/qH+cROr2obHOBcivkgRO6U=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -30,7 +30,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/in-toto/witness/cmd.Version=v${version}"
+    "-X github.com/in-toto/witness/cmd.Version=${finalAttrs.src.tag}"
   ];
 
   # Feed in all tests for testing
@@ -38,20 +38,30 @@ buildGoModule rec {
   # want but also limits the tests
   preCheck = ''
     unset subPackages
+    # tests expect no version set
+    unset ldflags
   '';
 
-  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd witness \
-      --bash <($out/bin/witness completion bash) \
-      --fish <($out/bin/witness completion fish) \
-      --zsh <($out/bin/witness completion zsh)
-  '';
+  postInstall =
+    let
+      exe =
+        if stdenv.buildPlatform.canExecute stdenv.hostPlatform then
+          "$out/bin/witness"
+        else
+          lib.getExe buildPackages.witness;
+    in
+    ''
+      installShellCompletion --cmd witness \
+        --bash <(${exe} completion bash) \
+        --fish <(${exe} completion fish) \
+        --zsh <(${exe} completion zsh)
+    '';
 
-  passthru.tests.version = testers.testVersion {
-    package = witness;
-    command = "witness version";
-    version = "v${version}";
-  };
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "version";
 
   meta = {
     description = "Pluggable framework for software supply chain security. Witness prevents tampering of build materials and verifies the integrity of the build process from source to target";
@@ -66,11 +76,11 @@ buildGoModule rec {
     '';
     mainProgram = "witness";
     homepage = "https://github.com/testifysec/witness";
-    changelog = "https://github.com/testifysec/witness/releases/tag/v${version}";
+    changelog = "https://github.com/testifysec/witness/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fkautz
       jk
     ];
   };
-}
+})
diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 447af13452dc..de7275675457 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -90,6 +90,15 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
+  patches = [
+    # See https://github.com/WiVRn/WiVRn/pull/557
+    (fetchpatch {
+      name = "wivrn-fix-qt6.10-build.patch";
+      url = "https://github.com/WiVRn/WiVRn/commit/2204fdd39682cfc052556d58fdb9404dd8ecf63f.patch?full_index=1";
+      hash = "sha256-05MLfJNCznBt6eaggUfSk1jaNDB2/eou6CfexUkIHZE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     git
diff --git a/pkgs/by-name/wl/wlock/package.nix b/pkgs/by-name/wl/wlock/package.nix
index b6870e7fd0ff..24d7462a648a 100644
--- a/pkgs/by-name/wl/wlock/package.nix
+++ b/pkgs/by-name/wl/wlock/package.nix
@@ -2,54 +2,61 @@
   lib,
   stdenv,
   fetchFromGitea,
-  libxcrypt,
   pkg-config,
+  wayland-scanner,
   wayland,
   wayland-protocols,
   libxkbcommon,
-  wayland-scanner,
+  libxcrypt,
+  nix-update-script,
 }:
-stdenv.mkDerivation {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "wlock";
-  version = "0-unstable-2024-09-13";
+  version = "1.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "sewn";
     repo = "wlock";
-    rev = "be975445fa0da7252f8e13b610c518dd472652d0";
-    hash = "sha256-Xt7Q51RhFG+UXYukxfORIhc4Df86nxtpDhAhaSmI38A=";
+    tag = finalAttrs.version;
+    hash = "sha256-vbGrePrZN+IWwzwoNUzMHmb6k9nQbRLVZmbWIAsYneY=";
   };
 
   postPatch = ''
     substituteInPlace Makefile --replace-fail 'chmod 4755' 'chmod 755'
   '';
 
-  buildInputs = [
-    libxcrypt
-    wayland
-    wayland-protocols
-    libxkbcommon
-  ];
-
   strictDeps = true;
 
-  makeFlags = [
-    "PREFIX=$(out)"
-    ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner)
-  ];
-
   nativeBuildInputs = [
     pkg-config
     wayland-scanner
   ];
 
+  buildInputs = [
+    wayland
+    wayland-protocols
+    libxkbcommon
+    libxcrypt
+  ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    ("WAYLAND_SCANNER=" + lib.getExe wayland-scanner)
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Sessionlocker for Wayland compositors that support the ext-session-lock-v1 protocol";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Only;
     homepage = "https://codeberg.org/sewn/wlock";
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ fliegendewurst ];
+    maintainers = with lib.maintainers; [
+      fliegendewurst
+      yiyu
+    ];
     mainProgram = "wlock";
   };
-}
+})
diff --git a/pkgs/by-name/wo/wootility/package.nix b/pkgs/by-name/wo/wootility/package.nix
index 1abf4032cb49..4f54ec5c5dd9 100644
--- a/pkgs/by-name/wo/wootility/package.nix
+++ b/pkgs/by-name/wo/wootility/package.nix
@@ -7,10 +7,10 @@
 
 let
   pname = "wootility";
-  version = "5.1.1";
+  version = "5.1.2";
   src = fetchurl {
     url = "https://wootility-updates.ams3.cdn.digitaloceanspaces.com/wootility-linux/Wootility-${version}.AppImage";
-    sha256 = "sha256-NDTRsrOZljvFOkvBN40CmH4GD6szT3c9qoFdFGpZ5Oc=";
+    sha256 = "sha256-JcVyuilhy1qjXyIeniXZ0s4qxXr/4wLXrXgTTxjCkBk=";
   };
 in
 
diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix
index 34bcbff3076d..ab688f5000d5 100644
--- a/pkgs/by-name/wo/worker-build/package.nix
+++ b/pkgs/by-name/wo/worker-build/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "worker-build";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-rs";
     tag = "v${version}";
-    hash = "sha256-Ia921UNb++9Y1NoEd7nNdJaEEqRxQLAzZ8yYaxPrWYc=";
+    hash = "sha256-c0PXLuWEY+keYRAjQkgd84Hn7IDh17SePKDF9J4ZQ5M=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-sIxsGeORhWpL3lWzXas7fK4QVuB03UT7rAN8uEzOdr0=";
+  cargoHash = "sha256-axK9/EVNKBb4xoYMOJ+0Y5nQvtkYyFDE6RsiL2MqxTM=";
 
   buildAndTestSubdir = "worker-build";
 
diff --git a/pkgs/by-name/wo/workrave/package.nix b/pkgs/by-name/wo/workrave/package.nix
index 1a84f57c656f..9a5c7ffc7d6d 100644
--- a/pkgs/by-name/wo/workrave/package.nix
+++ b/pkgs/by-name/wo/workrave/package.nix
@@ -33,13 +33,13 @@
 
 stdenv.mkDerivation rec {
   pname = "workrave";
-  version = "1.10.53";
+  version = "1.10.54";
 
   src = fetchFromGitHub {
     repo = "workrave";
     owner = "rcaelers";
     rev = "v" + lib.concatStringsSep "_" (lib.splitVersion version);
-    sha256 = "sha256-Dt0KY6nchcGZLyiUGGS4pnVagreIhuQpSq2DdvWqtn8=";
+    sha256 = "sha256-pbMkzwxgKc4vjFhBeOf513hFytYiTPST19L8Nq4CVTg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/wp/wpaperd/package.nix b/pkgs/by-name/wp/wpaperd/package.nix
index 921e6abc113e..2814bcec78e4 100644
--- a/pkgs/by-name/wp/wpaperd/package.nix
+++ b/pkgs/by-name/wp/wpaperd/package.nix
@@ -9,6 +9,7 @@
   dav1d,
   installShellFiles,
   scdoc,
+  rust-jemalloc-sys,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -34,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     libGL
     libxkbcommon
     dav1d
+    rust-jemalloc-sys
   ];
 
   buildFeatures = [
diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index 45852245a759..64a8f6cb7483 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -1,27 +1,30 @@
 {
   lib,
   stdenv,
-  dpkg,
   autoPatchelfHook,
+  runCommandLocal,
+  curl,
+  coreutils,
+  cacert,
+  # wpsoffice dependencies
   alsa-lib,
-  at-spi2-core,
+  libjpeg,
   libtool,
   libxkbcommon,
+  nss,
   nspr,
   udev,
   gtk3,
   libgbm,
   libusb1,
+  unixODBC,
+  libmysqlclient,
   libsForQt5,
   xorg,
+  # wpsoffice runtime dependencies
   cups,
+  dbus,
   pango,
-  bzip2,
-  libmysqlclient,
-  runCommandLocal,
-  curl,
-  coreutils,
-  cacert,
 }:
 
 let
@@ -32,10 +35,9 @@ let
   fetch =
     {
       url,
-      uri,
       hash,
     }:
-    runCommandLocal "wpsoffice-cn-${version}-src"
+    runCommandLocal "wpsoffice-cn-${version}.deb"
       {
         outputHashAlgo = "sha256";
         outputHash = hash;
@@ -52,7 +54,7 @@ let
         readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b"
 
         timestamp10=$(date '+%s')
-        md5hash=($(printf '%s' "$SECURITY_KEY${uri}$timestamp10" | md5sum))
+        md5hash=($(printf '%s' "$SECURITY_KEY${lib.removePrefix "https://wps-linux-personal.wpscdn.cn" url}$timestamp10" | md5sum))
 
         curl --retry 3 --retry-delay 3 "${url}?t=$timestamp10&k=$md5hash" > $out
       '';
@@ -68,24 +70,20 @@ in
 stdenv.mkDerivation {
   inherit pname src version;
 
-  unpackCmd = "dpkg -x $src .";
-  sourceRoot = ".";
-
-  nativeBuildInputs = [
-    dpkg
-    autoPatchelfHook
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = [
     alsa-lib
-    at-spi2-core
+    libjpeg
     libtool
     libxkbcommon
+    nss
     nspr
     udev
     gtk3
     libgbm
     libusb1
+    unixODBC
     libsForQt5.qtbase
     xorg.libXdamage
     xorg.libXtst
@@ -98,12 +96,21 @@ stdenv.mkDerivation {
 
   runtimeDependencies = map lib.getLib [
     cups
+    dbus
     pango
   ];
 
-  autoPatchelfIgnoreMissingDeps = [
-    "libpeony.so.3"
-  ];
+  unpackPhase = ''
+    # Unpack the .deb file
+    ar x $src
+    tar -xf data.tar.xz
+
+    # Remove unneeded files
+    rm -rf usr/share/{fonts,locale}
+    rm -f usr/bin/misc
+    rm -rf opt/kingsoft/wps-office/{desktops,INSTALL}
+    rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,nss*,dbus-1}.so*
+  '';
 
   installPhase = ''
     runHook preInstall
@@ -127,8 +134,6 @@ stdenv.mkDerivation {
   '';
 
   preFixup = ''
-    # libbz2 dangling symlink
-    ln -sf ${bzip2.out}/lib/libbz2.so $out/opt/kingsoft/wps-office/office6/libbz2.so
     # dlopen dependency
     patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so
     # libmysqlclient dependency
@@ -138,19 +143,20 @@ stdenv.mkDerivation {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Office suite, formerly Kingsoft Office";
-    homepage = "https://www.wps.com";
+    homepage = "https://www.wps.cn";
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     hydraPlatforms = [ ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       mlatus
       th0rgal
       wineee
       pokon548
       chillcicada
     ];
+    mainProgram = "wps";
   };
 }
diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
index 9d00360fd99f..2d882c757308 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
@@ -1,10 +1,9 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-09-15
+# Last updated: 2025-10-27
 {
   version = "12.1.2.22571";
   x86_64 = {
     url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/22571/wps-office_12.1.2.22571.AK.preread.sw_480057_amd64.deb";
-    uri = "/wps/download/ep/Linux2023/22571/wps-office_12.1.2.22571.AK.preread.sw_480057_amd64.deb";
     hash = "sha256-aB1EWP0Ev5WuAuzih3ybD23qaRRTUjlES1emas+sUDA=";
   };
 }
diff --git a/pkgs/by-name/wp/wpsoffice-cn/update.sh b/pkgs/by-name/wp/wpsoffice-cn/update.sh
index 501bdec5ad63..af186c592407 100755
--- a/pkgs/by-name/wp/wpsoffice-cn/update.sh
+++ b/pkgs/by-name/wp/wpsoffice-cn/update.sh
@@ -13,12 +13,11 @@ payload=$(curl -s "https://www.wps.cn/product/wpslinux")
 version=$(echo "$payload" | grep -oP '(?<=banner_txt">)[^<]+')
 
 amd64_url=$(echo "$payload" | grep -oP "downLoad\('[^']*'" | head -1 | sed "s/downLoad('//;s/'$//")
-amd64_uri="${amd64_url#$prefix}"
 
 timestamp10=$(date '+%s')
-md5hash=($(printf '%s' "$SECURITY_KEY$amd64_uri$timestamp10" | md5sum))
+amd64_md5hash=($(printf '%s' "$SECURITY_KEY${amd64_url#$prefix}$timestamp10" | md5sum))
 
-amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$version.deb" "$amd64_url?t=$timestamp10&k=$md5hash")
+amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$version.deb" "$amd64_url?t=$timestamp10&k=$amd64_md5hash")
 
 amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$amd64_hash")
 
@@ -29,7 +28,6 @@ cat > sources.nix << EOF
   version = "$version";
   x86_64 = {
     url = "$amd64_url";
-    uri = "$amd64_uri";
     hash = "$amd64_hash";
   };
 }
diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix
index 3ea67f6f612a..e25162c64481 100644
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/bahdotsh/wrkflw/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       FKouhai
       tebriel
     ];
diff --git a/pkgs/by-name/ws/wstsound/package.nix b/pkgs/by-name/ws/wstsound/package.nix
new file mode 100644
index 000000000000..2464faaf69ed
--- /dev/null
+++ b/pkgs/by-name/ws/wstsound/package.nix
@@ -0,0 +1,64 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  tinycmmc,
+  libmodplug,
+  libogg,
+  libvorbis,
+  mpg123,
+  openal,
+  opusfile,
+  libopus,
+}:
+
+stdenv.mkDerivation {
+  pname = "wstsound";
+  version = "0.3.0-unstable-2025-07-21";
+
+  src = fetchFromGitHub {
+    owner = "WindstilleTeam";
+    repo = "wstsound";
+    rev = "2c7b00dc1af52432185dc28c4ae87c09c9f4f444";
+    sha256 = "sha256-fus1ydypnDDHsQwMkYyZuRikZLbZXLlc/cY8Qol5Hwo=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    gtest
+    tinycmmc
+  ];
+  propagatedBuildInputs = [
+    libmodplug
+    libogg
+    libvorbis
+    mpg123
+    openal
+    opusfile
+    libopus
+  ];
+
+  cmakeFlags = [
+    "-DWARNINGS=ON"
+    "-DWERROR=ON"
+    "-DBUILD_TESTS=ON"
+    "-DBUILD_EXTRA=ON"
+  ];
+
+  # Test "openal_info fails"
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "COMMAND openal_info" "COMMAND openal-info"
+  '';
+
+  meta = {
+    description = "Windstille Sound Library";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
+  };
+}
diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix
index 8c807433a1e5..bc01a7f3e448 100644
--- a/pkgs/by-name/wt/wthrr/package.nix
+++ b/pkgs/by-name/wt/wthrr/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ttytm/wthrr-the-weathercrab";
     changelog = "https://github.com/ttytm/wthrr-the-weathercrab/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "wthrr";
   };
 }
diff --git a/pkgs/by-name/wv/wv2/fix-libtool-location.patch b/pkgs/by-name/wv/wv2/fix-libtool-location.patch
new file mode 100644
index 000000000000..8b647de55e41
--- /dev/null
+++ b/pkgs/by-name/wv/wv2/fix-libtool-location.patch
@@ -0,0 +1,22 @@
+--- a/cmake/MacroCreateLibtoolFile.cmake
++++ b/cmake/MacroCreateLibtoolFile.cmake
+@@ -9,7 +9,7 @@
+ ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT)
+ 
+ MACRO(CREATE_LIBTOOL_FILE _target _install_DIR)
+-  GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
++
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0)
+@@ -19,8 +19,8 @@
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
+-  GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
+-  GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
++  SET(_laname "lib${_target}")
++  SET(_soname "${_laname}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+   SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la)
+   FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
+   FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
diff --git a/pkgs/by-name/wv/wv2/package.nix b/pkgs/by-name/wv/wv2/package.nix
index 1908fdf4e4be..5fabc08f05d0 100644
--- a/pkgs/by-name/wv/wv2/package.nix
+++ b/pkgs/by-name/wv/wv2/package.nix
@@ -7,6 +7,7 @@
   libgsf,
   glib,
   libxml2,
+  libiconvReal,
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +18,10 @@ stdenv.mkDerivation rec {
     sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz";
   };
 
-  patches = [ ./fix-include.patch ];
+  patches = [
+    ./fix-include.patch
+    ./fix-libtool-location.patch
+  ];
 
   # Newer versions of clang default to C++17, which removes some deprecated APIs such as bind1st.
   # Setting the language version to C++14 makes them available again.
@@ -36,10 +40,16 @@ stdenv.mkDerivation rec {
     libgsf
     glib
     libxml2
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconvReal;
 
   env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Excellent MS Word filter lib, used in most Office suites";
     mainProgram = "wv2-config";
diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix
index 8977315072c0..91701392b304 100644
--- a/pkgs/by-name/wv/wvkbd/package.nix
+++ b/pkgs/by-name/wv/wvkbd/package.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-RfZbPAaf8UB4scUZ9XSL12QZ4UkYMzXqfmNt9ObOgQ0=";
   };
 
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace-fail "pkg-config" "$PKG_CONFIG"
-  '';
-
   nativeBuildInputs = [
     pkg-config
     scdoc
@@ -52,5 +47,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
     mainProgram = "wvkbd-mobintl";
+    maintainers = with lib.maintainers; [ colinsane ];
   };
 }
diff --git a/pkgs/by-name/wy/wyoming-openwakeword/package.nix b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
index c1db4c30ad9f..2e626d246c86 100644
--- a/pkgs/by-name/wy/wyoming-openwakeword/package.nix
+++ b/pkgs/by-name/wy/wyoming-openwakeword/package.nix
@@ -1,26 +1,30 @@
 {
   lib,
-  python312Packages,
+  python3Packages,
   fetchFromGitHub,
+  fetchpatch,
 }:
 
-let
-  # tensorflow-bin unsupported on Python 3.13
-  python3Packages = python312Packages;
-in
-
 python3Packages.buildPythonApplication rec {
   pname = "wyoming-openwakeword";
-  version = "1.10.0";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "wyoming-openwakeword";
     rev = "refs/tags/v${version}";
-    hash = "sha256-5suYJ+Z6ofVAysoCdHi5b5K0JTYaqeFZ32Cm76wC5LU=";
+    hash = "sha256-edSZ5W6oSPYLKuxjQerWRkAO/C+WeTiCosNnbS2sbh0=";
   };
 
+  patches = [
+    (fetchpatch {
+      # Expose entrypoint as wyoming-openwakeword script
+      url = "https://github.com/rhasspy/wyoming-openwakeword/commit/a8c8419bc65fab07a554aa0925f898a7f3b65d79.patch";
+      hash = "sha256-GSViQA01RwkFYEH7CPdU1P0EQ2ml6Vp1OukQ/0VOm+Y=";
+    })
+  ];
+
   build-system = with python3Packages; [
     setuptools
   ];
@@ -29,12 +33,8 @@ python3Packages.buildPythonApplication rec {
     "wyoming"
   ];
 
-  pythonRemoveDeps = [
-    "tflite-runtime-nightly"
-  ];
-
   dependencies = with python3Packages; [
-    tensorflow-bin
+    pyopen-wakeword
     wyoming
   ];
 
diff --git a/pkgs/by-name/x1/x11perf/package.nix b/pkgs/by-name/x1/x11perf/package.nix
new file mode 100644
index 000000000000..f707af8810e3
--- /dev/null
+++ b/pkgs/by-name/x1/x11perf/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxft,
+  libxmu,
+  libxrender,
+  freetype,
+  fontconfig,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "x11perf";
+  version = "1.7.0";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/test/x11perf-${finalAttrs.version}.tar.xz";
+    hash = "sha256-JPgNhLDpYXGpmJMv8Adpj9F3bamXXtQuUdV7nPypGCg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxft
+    libxmu
+    libxrender
+    freetype
+    fontconfig
+  ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/x11perfcomp \
+      --replace-fail "/bin/cat" "cat"
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/test/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X11 server performance test program";
+    homepage = "https://gitlab.freedesktop.org/xorg/test/x11perf";
+    license = lib.licenses.hpnd;
+    mainProgram = "x11perf";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix
index e393bd0f67e2..c3610a634857 100644
--- a/pkgs/by-name/x2/x265/package.nix
+++ b/pkgs/by-name/x2/x265/package.nix
@@ -120,6 +120,13 @@ stdenv.mkDerivation rec {
     (mkFlag vtuneSupport "ENABLE_VTUNE")
     (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
   ]
+  ++ lib.optionals stdenv.hostPlatform.isPower [
+    # baseline for everything but ppc64le doesn't have AltiVec
+    # ppc64le: https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
+    (lib.cmakeBool "ENABLE_ALTIVEC" false)
+    # baseline for everything but ppc64le is pre-POWER8
+    (lib.cmakeBool "CPU_POWER8" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
+  ]
   # Clang does not support the endfunc directive so use GCC.
   ++ lib.optional (
     stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
@@ -137,9 +144,6 @@ stdenv.mkDerivation rec {
     "-DENABLE_SHARED=OFF"
     "-DEXPORT_C_API=OFF"
   ]
-  ++ lib.optionals stdenv.hostPlatform.isPower [
-    "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
-  ]
   ++ lib.optionals isCross [
     (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
     (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")
diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/x2/x2t/package.nix
index e067a41fbe46..3fbc08b902e4 100644
--- a/pkgs/by-name/x2/x2t/package.nix
+++ b/pkgs/by-name/x2/x2t/package.nix
@@ -164,10 +164,6 @@ let
     };
     sourceRoot = "${finalAttrs.src.name}/build";
 
-    postPatch = ''
-      cp npm-shrinkwrap.json package-lock.json
-    '';
-
     npmDepsHash = "sha256-Hpf+z3RGqZ1LTdow6xP00hNmWf4xs+KnVBj4NbPW4uM=";
 
     dontNpmBuild = true;
diff --git a/pkgs/by-name/x4/x42-plugins/package.nix b/pkgs/by-name/x4/x42-plugins/package.nix
index f235f1babda8..6b43f0f9dea8 100644
--- a/pkgs/by-name/x4/x42-plugins/package.nix
+++ b/pkgs/by-name/x4/x42-plugins/package.nix
@@ -11,7 +11,6 @@
   libjack2,
   libGLU,
   lv2,
-  gtk2,
   cairo,
   pango,
   fftwFloat,
@@ -20,11 +19,11 @@
 
 stdenv.mkDerivation rec {
   pname = "x42-plugins";
-  version = "20250512";
+  version = "20251025";
 
   src = fetchurl {
     url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
-    hash = "sha256-HBENTb1BGxBDIOWtswCe6t0mEzVNZf65NhLjsfE4KYk=";
+    hash = "sha256-ZY9KGtkLqjdUVo2BCOO/gnVo+19Ewx2gkj1zsWKxUS8=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
     libsndfile
     libsamplerate
     lv2
-    gtk2
     cairo
     pango
     fftwFloat
diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index 5fffab2ae0a8..b0453410b136 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -96,6 +96,10 @@ stdenv.mkDerivation rec {
   # Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
   env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
 
+  preFixup = ''
+    wrapGApp $out/lib/xapps/xapp-sn-watcher
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/xapp";
     description = "Cross-desktop libraries and common resources";
diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix
index be79532cef07..f79f0f95aea2 100644
--- a/pkgs/by-name/xa/xautoclick/package.nix
+++ b/pkgs/by-name/xa/xautoclick/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   xorg,
   pkg-config,
   cmake,
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
     sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "bump-cmake-required-version.patch";
+      url = "https://github.com/qarkai/xautoclick/commit/a6cd4058fa7d8579bf4ada3f48441f333fca9dab.patch?full_index=1";
+      hash = "sha256-4ovcaVrXQqFZX85SnewtfjZpipcGTw52ZrTkT6iWZQM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix
index 0fd8c4647601..9a2e7b287c8f 100644
--- a/pkgs/by-name/xc/xc/package.nix
+++ b/pkgs/by-name/xc/xc/package.nix
@@ -50,7 +50,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/joerdav/xc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       joerdav
     ];
   };
diff --git a/pkgs/by-name/xc/xc3sprog/package.nix b/pkgs/by-name/xc/xc3sprog/package.nix
index f07fcb841464..1bbe1fbcc136 100644
--- a/pkgs/by-name/xc/xc3sprog/package.nix
+++ b/pkgs/by-name/xc/xc3sprog/package.nix
@@ -37,6 +37,13 @@ stdenv.mkDerivation rec {
     "-DCMAKE_CXX_STANDARD=14"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace javr/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Command-line tools for programming FPGAs, microcontrollers and PROMs via JTAG";
     homepage = "https://xc3sprog.sourceforge.net/";
diff --git a/pkgs/by-name/xc/xcalc/package.nix b/pkgs/by-name/xc/xcalc/package.nix
new file mode 100644
index 000000000000..a784ed745d13
--- /dev/null
+++ b/pkgs/by-name/xc/xcalc/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  wrapWithXFileSearchPathHook,
+  libx11,
+  libxaw,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcalc";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xcalc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-hXjfoUV+lCifbW7WFGcUMH2Kc6G1TS9CrxMhtiX8HNQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxaw
+    libxt
+  ];
+
+  installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Scientific calculator X11 client that can emulate a TI-30 or an HP-10C";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcalc";
+    license = with lib.licenses; [
+      x11
+      hpndSellVariant
+    ];
+    mainProgram = "xcalc";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xc/xchainkeys/package.nix b/pkgs/by-name/xc/xchainkeys/package.nix
index dfe0c036e4b2..ac6ec9aa0d47 100644
--- a/pkgs/by-name/xc/xchainkeys/package.nix
+++ b/pkgs/by-name/xc/xchainkeys/package.nix
@@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3;
     platforms = lib.platforms.unix;
     mainProgram = "xchainkeys";
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/xc/xcodegen/nix/default.nix b/pkgs/by-name/xc/xcodegen/nix/default.nix
index e9d58741591f..10ffd303aaf4 100644
--- a/pkgs/by-name/xc/xcodegen/nix/default.nix
+++ b/pkgs/by-name/xc/xcodegen/nix/default.nix
@@ -2,7 +2,7 @@
 {
   workspaceStateFile = ./workspace-state.json;
   hashes = {
-    "AEXML" = "sha256-bQcXq1aS76sOjW8yYCOlGVZ2tStDvzRQSyj9VrAj6nI=";
+    "AEXML" = "sha256-6KvO8zT667Td+4qOeYzHbd51hDzFJFrxcVyYr2h5igc=";
     "ArtifactBundleGen" = "sha256-mSXJiRGFIm2RtzBG8l6s4RJ2BzSbPZKUZIqWM4vDIhc=";
     "JSONUtilities" = "sha256-jl8XfgoB5IX0qwwDtzcWgK0u3SNG2HfrPoEb2a6/mlA=";
     "PathKit" = "sha256-ewxTC1kpu6PXhwamCxYfI50ooYO1SIU0+IXH2tc/uv4=";
@@ -10,7 +10,7 @@
     "Spectre" = "sha256-fipGRIgw+jV7Wrxa+xivRk7YMyxDhGFB6SHIHscrmV8=";
     "SwiftCLI" = "sha256-PmjzLss0D12iy6YKsudFa8i63NQAssyCBqqq8VjRiH4=";
     "Version" = "sha256-4IwQlexWtIH9M0sSai1a+ITTAKkD2zJtbYoV4Cg+Snw=";
-    "XcodeProj" = "sha256-ycHDzay37YtT/3QqUpG6XPjRh32P5iU/I5GpfjrXs/I=";
+    "XcodeProj" = "sha256-UMnSV/kdRlUxp23Rd70xCHzJeP6Vh1viyHNERo3haRE=";
     "Yams" = "sha256-5qxuCkmopm3uFcoYJKQA8ofW98f53H1gZaPiOh2DS4U=";
   };
 }
diff --git a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
index 0f95461da6e0..ab48b77ec269 100644
--- a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
+++ b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
@@ -12,8 +12,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
-            "version": "4.6.1"
+            "revision": "db806756c989760b35108146381535aec231092b",
+            "version": "4.7.0"
           },
           "name": "sourceControlCheckout"
         },
@@ -148,8 +148,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "447c159b0c5fb047a024fd8d942d4a76cf47dde0",
-            "version": "8.16.0"
+            "revision": "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4",
+            "version": "8.27.7"
           },
           "name": "sourceControlCheckout"
         },
diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix
index 24dda3eb9c97..17ace827e11b 100644
--- a/pkgs/by-name/xc/xcodegen/package.nix
+++ b/pkgs/by-name/xc/xcodegen/package.nix
@@ -16,13 +16,13 @@ in
 
 swiftPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "xcodegen";
-  version = "2.42.0";
+  version = "2.44.1";
 
   src = fetchFromGitHub {
     owner = "yonaskolb";
     repo = "XcodeGen";
     tag = finalAttrs.version;
-    hash = "sha256-wcjmADG+XnS2kR8BHe6ijApomucS9Tx7ZRjWZmTCUiI=";
+    hash = "sha256-RQlmQfmrLZRrgIA09fE84JuqmYkkrz4KSw2dvYXw0Rs=";
   };
 
   # Including SwiftPM as a nativeBuildInput provides a buildPhase for you.
diff --git a/pkgs/by-name/xc/xcodes/package.nix b/pkgs/by-name/xc/xcodes/package.nix
index bd5a56ce145d..1fad5edafa02 100644
--- a/pkgs/by-name/xc/xcodes/package.nix
+++ b/pkgs/by-name/xc/xcodes/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xcodes";
-  version = "1.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "XcodesOrg";
     repo = "xcodes";
     rev = finalAttrs.version;
-    hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";
+    hash = "sha256-eH6AdboJsGQ0iWoRllOMzhjM/1t43DB1U0bOu6J/uo4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xc/xcompmgr/package.nix b/pkgs/by-name/xc/xcompmgr/package.nix
new file mode 100644
index 000000000000..e40cc7b807f3
--- /dev/null
+++ b/pkgs/by-name/xc/xcompmgr/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrender,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcompmgr";
+  version = "1.1.10";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xcompmgr-${finalAttrs.version}.tar.xz";
+    hash = "sha256-eCT3CcTyJDLq6nVC7JM4Tl3Uj2/LhcEv+C1yFCOwuY8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxrender
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Sample X11 compositing manager";
+    longDescription = ''
+      xcompmgr is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, RENDER
+      and COMPOSITE extensions. It enables basic eye-candy effects.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcompmgr";
+    license = lib.licenses.hpndSellVariant;
+    mainProgram = "xcompmgr";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index d82a321cd69c..81fae7c36cfc 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -10,24 +10,23 @@
   pipewire,
   gst_all_1,
   cosmic-wallpapers,
-  coreutils,
   nix-update-script,
   nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-EkhOa1Tircgyta98Zf4ZaV/tR4zZh4/bU35xjn3xU8c=";
+    hash = "sha256-ONAj1yfTL6VdpK1iO89ika/HBFBADdaGQPZ1ml8vg1g=";
   };
 
-  cargoHash = "sha256-uJKwwESkzqweM4JunnMIsDE8xhCyjFFZs1GiJAwnbG8=";
+  cargoHash = "sha256-V1tFOZa2f+Z0MMuIoHlbB7BrXfsUhmuhoqOu9fjteEA=";
 
   separateDebugInfo = true;
 
@@ -59,10 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # [2]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/data/v1/all#L3
     substituteInPlace src/screenshot.rs src/widget/screenshot.rs \
       --replace-fail '/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png' '${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg'
-
-    # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly.
-    substituteInPlace data/org.freedesktop.impl.portal.desktop.cosmic.service \
-      --replace-fail 'Exec=/bin/false' 'Exec=${lib.getExe' coreutils "true"}'
   '';
 
   dontCargoInstall = true;
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
index 9fa4feeef447..ac116af4e2ff 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-gnome/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-gnome";
-  version = "48.0";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/xdg-desktop-portal-gnome/${lib.versions.major finalAttrs.version}/xdg-desktop-portal-gnome-${finalAttrs.version}.tar.xz";
-    hash = "sha256-zRWsouE2TaMI6zeWu4rkpXfmDKT+EgBrMVIyz9GciGE=";
+    hash = "sha256-QB2vzfjLkR8JwI0oE/d03YZBJ6v8qT/0yvH8TJtexNI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch
new file mode 100644
index 000000000000..881a22dbcf82
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch
@@ -0,0 +1,30 @@
+diff --git a/subprojects/pfs/Cargo.lock b/subprojects/pfs/Cargo.lock
+index efe74be..9b5f48e 100644
+--- a/subprojects/pfs/Cargo.lock
++++ b/subprojects/pfs/Cargo.lock
+@@ -458,9 +458,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+ [[package]]
+ name = "libadwaita"
+-version = "0.7.1"
++version = "0.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247"
++checksum = "500135d29c16aabf67baafd3e7741d48e8b8978ca98bac39e589165c8dc78191"
+ dependencies = [
+  "gdk4",
+  "gio",
+diff --git a/subprojects/pfs/Cargo.toml b/subprojects/pfs/Cargo.toml
+index ae3b519..6cf25dd 100644
+--- a/subprojects/pfs/Cargo.toml
++++ b/subprojects/pfs/Cargo.toml
+@@ -18,7 +18,7 @@ path = "src/examples/open/pfs_open.rs"
+ 
+ [dependencies]
+ gettext-rs = { version = "0.7", features = ["gettext-system"] }
+-glib-macros = "0.20.5"
++glib-macros = "0.20.12"
+ gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
+ 
+ [dependencies.adw]
+
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
new file mode 100644
index 000000000000..f36161e79090
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
@@ -0,0 +1,83 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gnome-desktop,
+  libadwaita,
+  meson,
+  ninja,
+  pkg-config,
+  xdg-desktop-portal,
+  rustc,
+  desktop-file-utils,
+  cargo,
+  rustPlatform,
+  gettext,
+}:
+let
+  # Derived from subprojects/pfs.wrap
+  pfs = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "guidog";
+    repo = "pfs";
+    tag = "v0.0.4";
+    hash = "sha256-b0S/jNE03h26bGA76fb/qlyJ8/MifZeltTc16UX2h9w=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdg-desktop-portal-phosh";
+  version = "0.49.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "guidog";
+    repo = "xdg-desktop-portal-phosh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VF+ZNUP5Y2xm2nlNN3QsLJh8yNRJH7d3k+kLJ+4eu9s=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-h+VQqtirReLIHlVByKSb6DpqR1FtCxSwQpjowHX1mcg=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    rustc
+    desktop-file-utils
+    cargo
+    rustPlatform.cargoSetupHook
+    gettext
+  ];
+
+  buildInputs = [
+    libadwaita
+    gnome-desktop
+    xdg-desktop-portal
+  ];
+
+  strictDeps = true;
+
+  prePatch = ''
+    cp -r ${pfs} subprojects/pfs
+    chmod +w -R subprojects/pfs # Allow patches for subprojects to work
+  '';
+
+  patches = [
+    # Patch that fixes the issue with two Rust package versions.
+    # For reasons that I don't understand, rustPlatform.fetchCargoVendor seems to not fetch the version inside the Cargo.lock file.
+    # Like with libadwaita, fetchCargoVendor download the version 0.7.2 but in the lock file specified 0.7.1 and in the toml file specified 0.7.
+    ./cargo_lock_deps_version.patch
+  ];
+
+  meta = with lib; {
+    description = "A backend implementation for xdg-desktop-portal that is using GTK/GNOME/Phosh to provide interfaces that aren't provided by the GTK portal";
+    homepage = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh";
+    changelog = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh/-/blob/main/NEWS";
+    maintainers = with maintainers; [ armelclo ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Only;
+  };
+})
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
index 6dfac779d3c7..daec6e238113 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-wlr";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "xdg-desktop-portal-wlr";
     rev = "v${version}";
-    sha256 = "sha256-GIIDeZMIGUiZV0IUhcclRVThE5LKaqVc5VwnNT8beNU=";
+    sha256 = "sha256-TAWrDH6kud4eXFJvfihImuEFm2uTOaqAOatG+7JmaEM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index bcb6d2d44c48..93cdd25fe14f 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -11,8 +11,8 @@
   gtk3,
   gsettings-desktop-schemas,
   mate,
-  xdg-desktop-portal,
   xapp,
+  xdg-desktop-portal,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     gtk3
     gsettings-desktop-schemas # org.gnome.system.location
     mate.mate-desktop # org.mate.background
+    xapp # org.x.apps.portal
     xdg-desktop-portal
   ];
 
diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
index e1efbdea7299..6b7c410ce889 100644
--- a/pkgs/by-name/xd/xdg-ninja/package.nix
+++ b/pkgs/by-name/xd/xdg-ninja/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "xdg-ninja";
-  version = "0.2.0.2-unstable-2025-08-07";
+  version = "0.2.0.2-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "b3nj5m1n";
     repo = "xdg-ninja";
-    rev = "854929e5413e8d2cf84e90c5cc3ccb0188ab5d22";
-    hash = "sha256-Kgu+LEU1SeB3ODyLihYG+IaQ2TMEFf3gxtjNM1FZz98=";
+    rev = "cb09ebd6479e276070a55fcffae9a5320bc52ed5";
+    hash = "sha256-VpMSMWwYD0GIPtAuSkdG417RxSx6XCRh09IMrLDOi6A=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/by-name/xd/xdgcpp/package.nix b/pkgs/by-name/xd/xdgcpp/package.nix
new file mode 100644
index 000000000000..ef8162e9fa15
--- /dev/null
+++ b/pkgs/by-name/xd/xdgcpp/package.nix
@@ -0,0 +1,27 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation {
+  pname = "xdgcpp";
+  version = "0-unstable-2024-05-26";
+
+  src = fetchFromGitHub {
+    owner = "Grumbel";
+    repo = "xdgcpp";
+    rev = "e2c40c081e2ee2d315d1d0b3ae5981d5fd77260e";
+    sha256 = "sha256-eujYRUw8UpDFgEvjHUPsJ/QJN+A+hzcebfgteM9kvXM=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Implementation of the XDG Base Directory Specification in C++";
+    maintainers = [ lib.maintainers.SchweGELBin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.lgpl3;
+  };
+}
diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix
index 33b8087ad225..92d9355fb31f 100644
--- a/pkgs/by-name/xd/xdummy/package.nix
+++ b/pkgs/by-name/xd/xdummy/package.nix
@@ -34,9 +34,9 @@ let
       FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc"
       FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc"
     ${lib.optionalString unfreeFonts ''
-      FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi"
-      FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi"
-      FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi"
+      FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi"
+      FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi"
+      FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi"
     ''}
     EndSection
 
diff --git a/pkgs/by-name/xe/xed-editor/package.nix b/pkgs/by-name/xe/xed-editor/package.nix
index bc87c6c0775e..a9aa21391afd 100644
--- a/pkgs/by-name/xe/xed-editor/package.nix
+++ b/pkgs/by-name/xe/xed-editor/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   libxml2,
   libpeas,
   glib,
@@ -34,6 +35,12 @@ stdenv.mkDerivation rec {
     # We patch gobject-introspection and meson to store absolute paths to libraries in typelibs
     # but that requires the install_dir is an absolute path.
     ./correct-gir-lib-path.patch
+
+    # Switch to girepository-2.0
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/xed/raw/6c1a775158f166a3bc5759a6c7bd57bab8f2771a/f/libpeas_libgirepository2.patch";
+      hash = "sha256-wGbmS33YHMiSfd3S0fQRhL6tT536kto69MSgPkY2QIs=";
+    })
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 223d1c696451..e4505e15d1a0 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -29,19 +29,18 @@
   wrapGAppsHook3,
   cacert,
   darwin,
-  apple-sdk_12,
   desktopToDarwinBundle,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.106";
+  version = "0.8.111";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QlhK86yj0ZvhbXfZyoHkpgxC9rZx/XRZ1LdFNFH1LMk=";
+    hash = "sha256-73dFFdhX36G1GeBVdbJ7ST4s98PtPsfnBBDeL8h+h04=";
 
     nativeBuildInputs = [
       git
@@ -98,9 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     libdrm
     libgbm
     vte
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_12
   ];
 
   configureFlags = [
diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 152ecf6fdd5b..e8645badd14d 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -215,6 +215,22 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://xenbits.xen.org/xsa/xsa473-2.patch";
       hash = "sha256-tGuIGxJFBXbckIruSUeTyrM6GabdIj6Pr3cVxeDvNNY=";
     })
+
+    # XSA 475
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa475-1.patch";
+      hash = "sha256-Bzvtr12g+7+M9jY9Nt2jd41CwYTL+h2fuwzJFsxroio=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa475-2.patch";
+      hash = "sha256-7MKtDAJpihpfcBK+hyBFGCP6gHWs2cdgTks8B439b2s=";
+    })
+
+    # XSA 476
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa476-4.20.patch";
+      hash = "sha256-nZUHcMr9RpQqrazG+RtTw+/s1gzqN1D565RuQjuALTQ=";
+    })
   ];
 
   outputs = [
diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 50650eba17f9..b830d9fb3b78 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "703531d541fb9391afed4fbb951db198c9193c28";
-    hash = "sha256-xLZBEnSxDhGWGscvE4Ht4wSAnSxY+0wBLAA2MVVobHg=";
+    rev = "b800011265bf47ea6b3f4f2b234d25249823a9be";
+    hash = "sha256-XufXayBfpq8PUReAiNxAbt4gUhH+aYxMN10ZU7HVhJs=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix
index d2bb4afed02a..6d42b94f8589 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.3";
+  version = "5.2.4";
 
   src = fetchFromGitHub {
     owner = "jupyter-xeus";
     repo = "xeus";
     tag = finalAttrs.version;
-    hash = "sha256-7hT2Ellgut25R3R28nRKd6/kKmfQf9NCoJ2BV9ZGt8I=";
+    hash = "sha256-siQzTu2IYHLbZrgLTbHPt8Ek8vLA/wXB0jx7oXC6d7k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xe/xeyes/package.nix b/pkgs/by-name/xe/xeyes/package.nix
new file mode 100644
index 000000000000..b23c50e764ae
--- /dev/null
+++ b/pkgs/by-name/xe/xeyes/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxcb,
+  libxext,
+  libxi,
+  libxmu,
+  libxrender,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xeyes";
+  version = "1.3.1";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xeyes-${finalAttrs.version}.tar.xz";
+    hash = "sha256-VgjXa3sarF7X8i8ba1rXTvmMhpMiDzK0uH3M7kqVbqo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxcb
+    libxext
+    libxi
+    libxmu
+    libxrender
+    libxt
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "A \"follow the mouse\" X demo, using the X SHAPE extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xeyes";
+    license = lib.licenses.x11;
+    mainProgram = "xeyes";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/xf/xfel/package.nix b/pkgs/by-name/xf/xfel/package.nix
index 7eecffcbc3bc..17e7e0e17170 100644
--- a/pkgs/by-name/xf/xfel/package.nix
+++ b/pkgs/by-name/xf/xfel/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfel";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "xboot";
     repo = "xfel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5Io2qOIeGovDpbxSlmqtGMrGMxUjMu/e1304euTEtJc=";
+    hash = "sha256-3eWVIPfUpa8ZJjce2F6eLdLttmoBI47VQ0IheSSgGmU=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index 7d54c0a76891..6bcff096cbcc 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -60,6 +60,12 @@ stdenv.mkDerivation {
   ]
   ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc;
 
+  preConfigure = ''
+    substituteInPlace "CMakeLists.txt" \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.12.2)' \
+                     'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
     stdenv.hostPlatform.libc == "glibc"
   ) "-I${libtirpc.dev}/include/tirpc";
diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix
index 0529b8efbfbf..61698c6b9176 100644
--- a/pkgs/by-name/xf/xfsprogs/package.nix
+++ b/pkgs/by-name/xf/xfsprogs/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xfsprogs";
-  version = "6.16.0";
+  version = "6.17.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
-    hash = "sha256-+nuow1y5iOfWW352MP6dDhfo15eZ07mNt+GfK5sVBQY=";
+    hash = "sha256-Ww9WqB9kEyYmb3Yq6KVjsp2Vzbzag7x5OPaM4SLx7dk=";
   };
 
   outputs = [
diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index fe0e48d2f95c..dade3dfebf3d 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -16,7 +16,7 @@
   rPackages,
 }@inputs:
 
-assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported);
+assert ncclSupport -> (cudaSupport && cudaPackages.nccl.meta.available);
 # Disable regular tests when building the R package
 # because 1) the R package runs its own tests and
 # 2) the R package creates a different binary shared
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index 47e4e14ce9dd..c7dc146bbf62 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/ducaale/xh/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
     mainProgram = "xh";
diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix
index 79b4bc8b089e..8d5f57ef048f 100644
--- a/pkgs/by-name/xk/xk6/package.nix
+++ b/pkgs/by-name/xk/xk6/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "xk6";
-  version = "1.1.6";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "xk6";
     tag = "v${version}";
-    hash = "sha256-9sCf4EOYsyOv1OZbFOU/O6B0GN4JVz3bUi75IDveceA=";
+    hash = "sha256-he6m5mkQ5Pp8hWPEU+/PD/ADCk0AQOyTAO8CVeNUa8o=";
   };
 
   vendorHash = null;
diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
index 2b65df932864..d7746e165c85 100644
--- a/pkgs/by-name/xk/xkb-switch-i3/package.nix
+++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix
@@ -9,6 +9,7 @@
   libX11,
   libxkbfile,
   pkg-config,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +24,20 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      name = "bump-cmake-required-version.patch";
+      url = "https://github.com/Zebradil/xkb-switch-i3/commit/95f6ff96c77fc17891d57332f6d3a014500396eb.patch?full_index=1";
+      hash = "sha256-J8EITYxi5EpYwROmFrAXgqFgbnFh8/fy9nxEKNhBvek=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace i3ipc++/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" \
+        "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index b70bb479b640..7148d30d8373 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2025.10.2";
+  version = "2025.12";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-LfT1AQktBklN1IUiJdqxFY4bM/CQEBg/5sxEvWUQkGQ=";
+    hash = "sha256-INB4x2iCzjpURL7VhugCcYo+X6p6aKIY5Dx5dy1ZjJ8=";
   };
 
   meta = {
diff --git a/pkgs/by-name/xm/xmake/package.nix b/pkgs/by-name/xm/xmake/package.nix
index 9b7e9531fbdc..6fd39bef9a3a 100644
--- a/pkgs/by-name/xm/xmake/package.nix
+++ b/pkgs/by-name/xm/xmake/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xmake";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "xmake-io";
     repo = "xmake";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DXSqdiVw+40Ii1/j7SJ/SYoji3dLRYjhJTuAEN+6ekQ=";
+    hash = "sha256-0Hh7XqKAt0yrg1GejEZmKpY3c8EvK7Z2eBS8GNaxYlg=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix
index f1b8f9b472e3..2a2b52ee337a 100644
--- a/pkgs/by-name/xm/xmlsec/package.nix
+++ b/pkgs/by-name/xm/xmlsec/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchurl,
+  fetchpatch,
   libxml2,
   gnutls,
   libxslt,
@@ -33,6 +34,11 @@ lib.fix (
     patches = [
       ./lt_dladdsearchdir.patch
       ./remove_bsd_base64_decode_flag.patch
+      (fetchpatch {
+        # xmlDoc.encoding is no longer const in libxml 2.15, so fetch the fix
+        url = "https://github.com/lsh123/xmlsec/commit/ef0e3b5cac04db13ce070b1e5bcad7dd7b0eb49b.patch?full_index=1";
+        hash = "sha256-Hv8PaJXkXLq++NuCAJ4IvsYBPj8wkN7dBTniYucq18o=";
+      })
     ];
 
     postPatch = ''
diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix
index 5daa9c72b5f4..ea2e3a0076ba 100644
--- a/pkgs/by-name/xn/xnec2c/package.nix
+++ b/pkgs/by-name/xn/xnec2c/package.nix
@@ -16,13 +16,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xnec2c";
-  version = "4.4.16";
+  version = "4.4.17";
 
   src = fetchFromGitHub {
     owner = "KJ7LNW";
     repo = "xnec2c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W8JwbCSXt5cjgncOzV1wltPnJxwWC6B29eaT8emIU9Y=";
+    hash = "sha256-ZxKpClB5IBfcpIOJsGVSiZU8WGu/8Yzeru96uCKkCGQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/xp/xpilot-ng/package.nix b/pkgs/by-name/xp/xpilot-ng/package.nix
index b5e54059c896..4b7b17d5ed80 100644
--- a/pkgs/by-name/xp/xpilot-ng/package.nix
+++ b/pkgs/by-name/xp/xpilot-ng/package.nix
@@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Multiplayer X11 space combat game";
     homepage = "http://xpilot.sf.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/xp/xplorer/package.nix b/pkgs/by-name/xp/xplorer/package.nix
index 33bc53e5ecae..1b88e9e984d7 100644
--- a/pkgs/by-name/xp/xplorer/package.nix
+++ b/pkgs/by-name/xp/xplorer/package.nix
@@ -14,7 +14,6 @@
   openssl,
   pkg-config,
   rustPlatform,
-  webkitgtk_4_0,
 }:
 
 let
@@ -75,7 +74,7 @@ rustPlatform.buildRustPackage {
     freetype
     libsoup_2_4
     gtk3
-    webkitgtk_4_0
+    # webkitgtk_4_0
   ];
 
   checkFlags = [
@@ -88,6 +87,8 @@ rustPlatform.buildRustPackage {
   '';
 
   meta = with lib; {
+    # webkitgtk_4_0 was removed
+    broken = true;
     description = "Customizable, modern file manager";
     homepage = "https://xplorer.space";
     license = licenses.asl20;
diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix
index e433da28e38e..927620f41df4 100644
--- a/pkgs/by-name/xp/xplr/package.nix
+++ b/pkgs/by-name/xp/xplr/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
       suryasr007
       pyrox0
       mimame
-      figsoda
     ];
   };
 }
diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 3c4db4ba3d84..f093f2fe3021 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -89,7 +89,7 @@ let
 in
 buildPythonApplication rec {
   pname = "xpra";
-  version = "6.3.3";
+  version = "6.3.5";
   format = "setuptools";
 
   stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv;
@@ -98,7 +98,7 @@ buildPythonApplication rec {
     owner = "Xpra-org";
     repo = "xpra";
     tag = "v${version}";
-    hash = "sha256-hk+C6I/QS6ihwmuNlnoNFipJ98SW6LO+Qa3Uh1h1Ji8=";
+    hash = "sha256-f4neqEqln7F3tUR1ZF5lyl5HkcPAJWFCdx2qOKLHd74=";
   };
 
   patches = [
diff --git a/pkgs/by-name/xp/xpwn/package.nix b/pkgs/by-name/xp/xpwn/package.nix
index 24f2e9eb1e52..31c4d8d825c6 100644
--- a/pkgs/by-name/xp/xpwn/package.nix
+++ b/pkgs/by-name/xp/xpwn/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation {
     openssl
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";
diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index 94571f41c3f8..924eed55e5d3 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     homepage = "https://github.com/sibprogrammer/xq";
     changelog = "https://github.com/sibprogrammer/xq/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/xr/xray/package.nix b/pkgs/by-name/xr/xray/package.nix
index d7573b864d60..617cf66676d6 100644
--- a/pkgs/by-name/xr/xray/package.nix
+++ b/pkgs/by-name/xr/xray/package.nix
@@ -15,16 +15,16 @@
 
 buildGoModule rec {
   pname = "xray";
-  version = "25.9.11";
+  version = "25.10.15";
 
   src = fetchFromGitHub {
     owner = "XTLS";
     repo = "Xray-core";
     rev = "v${version}";
-    hash = "sha256-498Kf+V2g2i0hpQy+vAEzf3hVoPUAWfUyWcJmP3Bgb4=";
+    hash = "sha256-E3Ozd2pFLuoV1xc3rPIoh6+ErAN9MYquxwzVTvETMlA=";
   };
 
-  vendorHash = "sha256-xhd4KGHGA82gacugM6rgYAz8gVdGWu0LHEiLeRnx3xQ=";
+  vendorHash = "sha256-Dzml+y6KSCcRqgWk8rP3gGFE1UsGNhNpu2I5NkCBztw=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index f0187e972ffd..ae68a1135a58 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -3,83 +3,71 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
+  xremap,
+
+  withVariant ? "wlroots",
 }:
 let
-  pname = "xremap";
-  version = "0.14.1";
-
-  src = fetchFromGitHub {
-    owner = "xremap";
-    repo = "xremap";
-    tag = "v${version}";
-    hash = "sha256-80Fzf5hnRBWx0NxV1z8majc7JbDNj0DZSRNkbPvI7Ck=";
-  };
-
-  cargoHash = "sha256-T/UMNRPGpXjrSqq+cNVtCckYRQbJJAF5tUwWnrIjj8M=";
-
-  buildXremap =
-    {
-      suffix ? "",
-      features ? [ ],
-      descriptionSuffix ? "",
-    }:
-    assert descriptionSuffix != "" && features != [ ];
-    rustPlatform.buildRustPackage {
-      pname = "${pname}${suffix}";
-      inherit version src cargoHash;
-
-      nativeBuildInputs = [ pkg-config ];
-
-      buildNoDefaultFeatures = true;
-      buildFeatures = features;
-
-      meta = {
-        description =
-          "Key remapper for X11 and Wayland"
-          + lib.optionalString (descriptionSuffix != "") " (${descriptionSuffix} support)";
-        homepage = "https://github.com/xremap/xremap";
-        changelog = "https://github.com/xremap/xremap/blob/${src.tag}/CHANGELOG.md";
-        license = lib.licenses.mit;
-        mainProgram = "xremap";
-        maintainers = [ lib.maintainers.hakan-demirli ];
-        platforms = lib.platforms.linux;
-      };
-    };
-
   variants = {
-    x11 = buildXremap {
+    x11 = {
       features = [ "x11" ];
       descriptionSuffix = "X11";
     };
-    gnome = buildXremap {
+    gnome = {
       suffix = "-gnome";
       features = [ "gnome" ];
       descriptionSuffix = "Gnome";
     };
-    kde = buildXremap {
+    kde = {
       suffix = "-kde";
       features = [ "kde" ];
       descriptionSuffix = "KDE";
     };
-    wlroots = buildXremap {
+    wlroots = {
       suffix = "-wlroots";
       features = [ "wlroots" ];
       descriptionSuffix = "wlroots";
     };
-    hyprland = buildXremap {
+    hyprland = {
       suffix = "-hyprland";
       features = [ "hypr" ];
       descriptionSuffix = "Hyprland";
     };
   };
 
+  variant = variants.${withVariant} or null;
 in
-variants.wlroots.overrideAttrs (finalAttrs: {
-  passthru = {
-    gnome = variants.gnome;
-    kde = variants.kde;
-    wlroots = variants.wlroots;
-    hyprland = variants.hyprland;
-    x11 = variants.x11;
+assert (
+  lib.assertMsg (variant != null)
+    "Unknown variant ${withVariant}: expected one of ${lib.concatStringsSep ", " (lib.attrNames variants)}"
+);
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xremap${variant.suffix or ""}";
+  version = "0.14.3";
+
+  src = fetchFromGitHub {
+    owner = "xremap";
+    repo = "xremap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UHkwTz5KEDAqXKpN/YVzY0xP7b6nN8WkPilzpF8YU3A=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = variant.features;
+
+  cargoHash = "sha256-ucyBQPCskHwz8rYzOULJ3enL6rhvpLxJzS7sTNwuBW4=";
+
+  passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
+
+  meta = {
+    description = "Key remapper for X11 and Wayland (${variant.descriptionSuffix} support)";
+    homepage = "https://github.com/xremap/xremap";
+    changelog = "https://github.com/xremap/xremap/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "xremap";
+    maintainers = [ lib.maintainers.hakan-demirli ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/xs/xst/package.nix b/pkgs/by-name/xs/xst/package.nix
index 8a089ac6ee85..826df612b4be 100644
--- a/pkgs/by-name/xs/xst/package.nix
+++ b/pkgs/by-name/xs/xst/package.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Simple terminal fork that can load config from Xresources";
     mainProgram = "xst";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.vyp ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/xs/xsuspender/package.nix b/pkgs/by-name/xs/xsuspender/package.nix
index 2d4c230ee712..3084617a5522 100644
--- a/pkgs/by-name/xs/xsuspender/package.nix
+++ b/pkgs/by-name/xs/xsuspender/package.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
     libwnck
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     wrapProgram $out/bin/xsuspender \
       --prefix PATH : "${lib.makeBinPath [ procps ]}"
diff --git a/pkgs/by-name/xt/xterm/package.nix b/pkgs/by-name/xt/xterm/package.nix
index 2c06f83173ee..a53997d95010 100644
--- a/pkgs/by-name/xt/xterm/package.nix
+++ b/pkgs/by-name/xt/xterm/package.nix
@@ -16,14 +16,14 @@
 
 stdenv.mkDerivation rec {
   pname = "xterm";
-  version = "402";
+  version = "403";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
       "https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
     ];
-    hash = "sha256-UmDFeTzVZMaeU+9vUowArwZq5ntC0CE3+374+v5wu3o=";
+    hash = "sha256-EzGw31kZyyQ//jJtxv8QopHmg6Ji9wzflkpmS+czrYM=";
   };
 
   patches = [ ./sixel-256.support.patch ];
diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix
index 999634c8a9b1..a88e1e764391 100644
--- a/pkgs/by-name/xv/xv/package.nix
+++ b/pkgs/by-name/xv/xv/package.nix
@@ -7,7 +7,9 @@
   libpng,
   libwebp,
   libtiff,
+  libjpeg,
   jasper,
+  libxrandr,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +30,9 @@ stdenv.mkDerivation rec {
     libpng
     libwebp
     libtiff
+    libjpeg
     jasper
+    libxrandr
   ];
 
   meta = {
diff --git a/pkgs/by-name/xv/xva-img/package.nix b/pkgs/by-name/xv/xva-img/package.nix
index 84d72f57b0cf..32ba5ad35fd1 100644
--- a/pkgs/by-name/xv/xva-img/package.nix
+++ b/pkgs/by-name/xv/xva-img/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
     xxHash
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     maintainers = [ ];
     description = "Tool for converting Xen images to raw and back";
diff --git a/pkgs/by-name/xv/xviewer/package.nix b/pkgs/by-name/xv/xviewer/package.nix
index 40f5c9275929..d4326ad4b1b0 100644
--- a/pkgs/by-name/xv/xviewer/package.nix
+++ b/pkgs/by-name/xv/xviewer/package.nix
@@ -65,6 +65,18 @@ stdenv.mkDerivation rec {
     xapp
   ];
 
+  postPatch = ''
+    # Switch to girepository-2.0
+    substituteInPlace src/main.c \
+      --replace-fail "#include <girepository.h>" "#include <girepository/girepository.h>" \
+      --replace-fail "g_irepository_get_option_group" "gi_repository_get_option_group"
+
+    substituteInPlace src/xviewer-plugin-engine.c \
+      --replace-fail "#include <girepository.h>" "#include <girepository/girepository.h>" \
+      --replace-fail "g_irepository_get_default" "gi_repository_dup_default" \
+      --replace-fail "g_irepository_require" "gi_repository_require"
+  '';
+
   meta = with lib; {
     description = "Generic image viewer from Linux Mint";
     mainProgram = "xviewer";
diff --git a/pkgs/by-name/xw/xwinmosaic/package.nix b/pkgs/by-name/xw/xwinmosaic/package.nix
index a6ce3afe44bb..75ffc31d4bd5 100644
--- a/pkgs/by-name/xw/xwinmosaic/package.nix
+++ b/pkgs/by-name/xw/xwinmosaic/package.nix
@@ -39,6 +39,11 @@ stdenv.mkDerivation rec {
     libXdamage
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "X window switcher drawing a colourful grid";
     license = lib.licenses.bsd2;
diff --git a/pkgs/by-name/ya/yaak/package.nix b/pkgs/by-name/ya/yaak/package.nix
index 39d891ce8cae..ccca382348cd 100644
--- a/pkgs/by-name/ya/yaak/package.nix
+++ b/pkgs/by-name/ya/yaak/package.nix
@@ -20,25 +20,28 @@
   makeWrapper,
   nix-update-script,
   stdenv,
+  lld,
+  wasm-pack,
+  wasm-bindgen-cli_0_2_100,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yaak";
-  version = "2025.1.2";
+  version = "2025.6.1";
 
   src = fetchFromGitHub {
     owner = "mountain-loop";
     repo = "yaak";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gD6gp7Qtf162zpRY0b3+g98GSH2aY07s2Auv4+lmbXQ=";
+    hash = "sha256-3sEq7VpzaIMbkvHQTQLf3NRbAJjtpOJpirdcA7y2FIE=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
-    hash = "sha256-4D7ETUOLixpFB4luqQlwkGR/C6Ke6+ZmPg3dKKkrw7c=";
+    hash = "sha256-zz9wlJ3yQ3oTyCFrAV7vD1xENLW+vmf2Pzly4yYas/g=";
   };
 
-  cargoHash = "sha256-YxOSfSyn+gUsw0HeKrkXZg568X9CAY1UWKnGHHWCC78=";
+  cargoHash = "sha256-CMx7vTSGeQMXpXeH4LIOKEb29CfKXQV+r8tSYdmW5U4=";
 
   cargoRoot = "src-tauri";
 
@@ -51,6 +54,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     protobuf
     perl
     makeWrapper
+    lld
+    wasm-pack
+    wasm-bindgen-cli_0_2_100
   ];
 
   buildInputs = [
@@ -66,11 +72,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  # This must be set so that `npm rebuild` doesn't download wasm-pack
+  env.NPM_CONFIG_IGNORE_SCRIPTS = "true";
 
   postPatch = ''
     substituteInPlace src-tauri/tauri.conf.json \
-      --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' \
       --replace-fail '"0.0.0"' '"${finalAttrs.version}"'
+    substituteInPlace src-tauri/tauri.commercial.conf.json \
+      --replace-fail '"createUpdaterArtifacts": "v1Compatible"' '"createUpdaterArtifacts": false' \
+      --replace-fail '"https://update.yaak.app/check/{{target}}/{{arch}}/{{current_version}}"' '"https://non.existent.domain"'
     substituteInPlace package.json \
       --replace-fail '"bootstrap:vendor-node": "node scripts/vendor-node.cjs",' "" \
       --replace-fail '"bootstrap:vendor-protoc": "node scripts/vendor-protoc.cjs",' ""
@@ -95,13 +105,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
       ln -s ${protobuf}/include src-tauri/vendored/protoc/include
     '';
 
+  tauriBuildFlags = [
+    "--config"
+    "./src-tauri/tauri.commercial.conf.json"
+  ];
+
   # Permission denied (os error 13)
   # write to src-tauri/vendored/protoc/include
   doCheck = false;
 
   preInstall = "pushd src-tauri";
 
-  postInstall = "popd";
+  postInstall =
+    lib.optionalString stdenv.hostPlatform.isDarwin ''
+      mkdir $out/bin
+      makeWrapper $out/Applications/Yaak.app/Contents/MacOS/yaak-app $out/bin/yaak-app
+    ''
+    + ''
+      popd
+    '';
 
   postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     wrapProgram $out/bin/yaak-app \
@@ -117,7 +139,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/mountain-loop/yaak/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ redyf ];
-    mainProgram = "yaak";
+    mainProgram = "yaak-app";
     platforms = [
       "x86_64-linux"
       "aarch64-linux"
diff --git a/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch b/pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch
similarity index 100%
rename from pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch
rename to pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/by-name/ya/yacas/package.nix
similarity index 95%
rename from pkgs/applications/science/math/yacas/default.nix
rename to pkgs/by-name/ya/yacas/package.nix
index d028f3fc93df..40a0784299a7 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/by-name/ya/yacas/package.nix
@@ -6,9 +6,6 @@
   cmake,
   perl,
   enableGui ? false,
-  qtbase,
-  wrapQtAppsHook,
-  qtwebengine,
   enableJupyter ? true,
   boost,
   jsoncpp,
@@ -17,6 +14,7 @@
   enableJava ? false,
   openjdk,
   gtest,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,9 +67,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
   ]
   ++ lib.optionals enableGui [
-    qtbase
-    wrapQtAppsHook
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtwebengine
   ]
   ++ lib.optionals enableJupyter [
     boost
diff --git a/pkgs/by-name/ya/yaegi/package.nix b/pkgs/by-name/ya/yaegi/package.nix
index 50426b5d7946..030b296e7a92 100644
--- a/pkgs/by-name/ya/yaegi/package.nix
+++ b/pkgs/by-name/ya/yaegi/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildGoModule,
   fetchFromGitHub,
@@ -42,6 +43,8 @@ buildGoModule rec {
     homepage = "https://github.com/traefik/yaegi";
     changelog = "https://github.com/traefik/yaegi/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ya/yafc-ce/deps.json b/pkgs/by-name/ya/yafc-ce/deps.json
index e3e3d046b6da..b408392da3a5 100644
--- a/pkgs/by-name/ya/yafc-ce/deps.json
+++ b/pkgs/by-name/ya/yafc-ce/deps.json
@@ -34,6 +34,21 @@
     "version": "3.26.1",
     "hash": "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc="
   },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
   {
     "pname": "Microsoft.CodeCoverage",
     "version": "17.11.1",
@@ -94,11 +109,21 @@
     "version": "6.0.0",
     "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
   },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
+  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+  },
   {
     "pname": "xunit",
     "version": "2.9.2",
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 39a2b714a961..d2099636373b 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.14.0";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
-    rev = finalAttrs.version;
-    hash = "sha256-EbVPPSci4AziF+n/8pIa9M44WEUj+vvEOQqu3HJ6aNQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6+GGxEwn3tenmcukOZPTIZ7UZg/d9uudQP0qwU8mifY=";
   };
 
   projectFile = [
diff --git a/pkgs/by-name/ya/yajl/package.nix b/pkgs/by-name/ya/yajl/package.nix
index 936e1d9a6225..2d10ad86590c 100644
--- a/pkgs/by-name/ya/yajl/package.nix
+++ b/pkgs/by-name/ya/yajl/package.nix
@@ -41,6 +41,5 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.isc;
     pkgConfigModules = [ "yajl" ];
     platforms = with lib.platforms; linux ++ darwin;
-    maintainers = with lib.maintainers; [ maggesi ];
   };
 })
diff --git a/pkgs/by-name/ya/yaml-filter/package.nix b/pkgs/by-name/ya/yaml-filter/package.nix
index 1f7f19b9ddef..56884cd7ec40 100644
--- a/pkgs/by-name/ya/yaml-filter/package.nix
+++ b/pkgs/by-name/ya/yaml-filter/package.nix
@@ -6,11 +6,15 @@
   libyaml,
   pkg-config,
 }:
-
 stdenv.mkDerivation rec {
   pname = "yaml-filter";
   version = "0.2.0";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2." "cmake_minimum_required(VERSION 3.10"
+  '';
+
   src = fetchFromGitHub {
     owner = "OpenSCAP";
     repo = "yaml-filter";
diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index b597cd02b5ad..8445ab4f7421 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -1,39 +1,20 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
-  fetchYarnDeps,
-  nodejs,
-  yarnConfigHook,
-  yarnBuildHook,
-  yarnInstallHook,
+  buildNpmPackage,
 }:
-
-stdenv.mkDerivation (finalAttrs: {
+buildNpmPackage (finalAttrs: {
   pname = "yaml-language-server";
-  version = "1.18.0";
+  version = "1.19.2";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-HBhoadWIebeuHZXSdnFiPMSmDla77yhrTNMdz8si88c=";
+    hash = "sha256-wy6+aOtDaWnIU4vyzrOxCZnFWtrn58+zkeU/1Kt6SLs=";
   };
 
-  offlineCache = fetchYarnDeps {
-    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE=";
-  };
-
-  nativeBuildInputs = [
-    nodejs
-    yarnConfigHook
-    yarnBuildHook
-    yarnInstallHook
-  ];
-
-  # NodeJS is also needed here so that script interpreter get patched
-  buildInputs = [ nodejs ];
+  npmDepsHash = "sha256-8PBVVgVghZvEpxj6E2imfNbAe8f4//43oioaLnlKOE0=";
 
   strictDeps = true;
 
diff --git a/pkgs/by-name/ya/yamlfix/package.nix b/pkgs/by-name/ya/yamlfix/package.nix
new file mode 100644
index 000000000000..a51f5ccde843
--- /dev/null
+++ b/pkgs/by-name/ya/yamlfix/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication yamlfix
diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index c48d98d630ab..fce075e3f7aa 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "yamlfmt";
-  version = "0.18.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "yamlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ifrRqa6GRwzwr9ORsmvDaLmznDp3KVtFyEzaG3EqEhY=";
+    hash = "sha256-KMIkll7seKslvb4ErelpKxWg/T2P9FLYKfTyAEWlbWk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > "$out/.git_head"
diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 2c248e36c928..2d2ad12b4017 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.168.0",
+  "version": "0.171.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/arm64/yc",
-      "hash": "sha256-BeaUE3hSFNw9xoIsqfPVI3d4c2mE/mXQPGKx43DEE38="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/darwin/arm64/yc",
+      "hash": "sha256-yasNFnjZJgtEcF9leIrk45lmpsvoggqJ71PFMcKqpZQ="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/arm64/yc",
-      "hash": "sha256-H0H+V94jQJCLJODcUj1ekK7v3PpipFLpuPaCtAKtEh0="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/linux/arm64/yc",
+      "hash": "sha256-FLPY5kk1C6UZnFgieaZ8h4Uupj+/GYzbGwo/9DBWMNs="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/386/yc",
-      "hash": "sha256-TgqkCo3kitCLd8LhmJH5uaf6dA2Zq1HkPczGk7NBpJ4="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/linux/386/yc",
+      "hash": "sha256-fcnnQG9RcFzfW7pd/bhJErSW4xFJwyjh0RUj+uQkCVM="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/amd64/yc",
-      "hash": "sha256-xom3Ml8+3IHew2CskcnDj+VWQdD+A7DjEjq3pGrwlIU="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/darwin/amd64/yc",
+      "hash": "sha256-hbrp90y0p1ylgEGEWtGeLBFwaRn8yr58C9W1miz8mkQ="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/amd64/yc",
-      "hash": "sha256-hj1zCcq4FYvWhfX0t9P/8wl94M0Rl6ieROPt4szYRZo="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/linux/amd64/yc",
+      "hash": "sha256-uxPHCY9RdosL8wQePYUccKjIpMZlcfCGSS/SjAtyPIQ="
     }
   }
 }
diff --git a/pkgs/by-name/ya/yaneuraou/package.nix b/pkgs/by-name/ya/yaneuraou/package.nix
index f0f8280db1be..644b503fad90 100644
--- a/pkgs/by-name/ya/yaneuraou/package.nix
+++ b/pkgs/by-name/ya/yaneuraou/package.nix
@@ -43,13 +43,13 @@
 #   with clangStdenv.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "yaneuraou";
-  version = "8.60";
+  version = "9.01";
 
   src = fetchFromGitHub {
     owner = "yaneurao";
     repo = "YaneuraOu";
     tag = "v${finalAttrs.version}git";
-    hash = "sha256-1awnGCGIdeMAqAd0TWgoJr5spJo2mFBWdR3iMc2i4OM=";
+    hash = "sha256-uhr3jS+ttN5pF1zZpHq2xWy3sdMV19eRUhuj2uPspak=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/source";
diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix
index eed356f397ab..e8f14777bd45 100644
--- a/pkgs/by-name/ya/yap/package.nix
+++ b/pkgs/by-name/ya/yap/package.nix
@@ -9,18 +9,20 @@
   gmp,
   zlib,
   librdf_raptor2,
-  nix-update-script,
+  writeShellScript,
+  nix-update,
+  common-updater-scripts,
 }:
 
 stdenv.mkDerivation {
   pname = "yap";
-  version = "7.6.0-unstable-2025-05-23";
+  version = "8.0.1-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "vscosta";
     repo = "yap";
-    rev = "010bb5e48d2f4fbdc0c47ae9faa830a179b3c31b";
-    hash = "sha256-ojhporq7vCEtdwCIRHwzjpc6dbFFXAgF+p6M7eL3JIE=";
+    rev = "d5ef32dec671e8d1bc7465e3d2ecdf468c568f16";
+    hash = "sha256-aNA7OV+UjdcCL5Ia2tzPgDLcn6/bzvKfdk2aWk300zk=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +52,13 @@ stdenv.mkDerivation {
   #     libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here
   env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon";
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  passthru.updateScript = writeShellScript "update-yap" ''
+    ${lib.getExe nix-update} yap --version=branch
+    version=$(nix eval --raw --file . yap.version)
+    src=$(nix eval --raw --file . yap.src)
+    latestVersion=$(grep -E '^[[:space:]]*set\(YAP_(MAJOR|MINOR|PATCH)_VERSION' "$src"/CMakeLists.txt | sed -E 's/.* ([0-9]+).*/\1/' | paste -sd.)
+    ${lib.getExe' common-updater-scripts "update-source-version"} yap ''${latestVersion}-''${version#*-} --ignore-same-hash
+  '';
 
   meta = {
     # linux 32 bit build fails.
diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index dc46416df19d..43d596d448c4 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yara-x";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dl2uxMo81K2ZEAfZk2OP0FXTY4lKGmzqZe0QQo/YIsA=";
+    hash = "sha256-yoQoAtgXBgniNebU9HMxF1m0UHFD6iU095he9tCNNIo=";
   };
 
-  cargoHash = "sha256-+Bva1uch6fd6gl2MH2ss3S6Ea1QkvgVePhdUVUDuIE8=";
+  cargoHash = "sha256-/HMyNofKpeYaFfRcZ1LAb3vfW/TQy+DsILXRCpJFlCQ=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/pkgs/by-name/ya/yara/package.nix b/pkgs/by-name/ya/yara/package.nix
index 0867a3175cef..317575a66bfc 100644
--- a/pkgs/by-name/ya/yara/package.nix
+++ b/pkgs/by-name/ya/yara/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yara";
-  version = "4.5.4";
+  version = "4.5.5";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vSwjP0wbC65jEOxY9zrHAV1gEhcZ96emqvkuUw20Twc=";
+    hash = "sha256-a+oLxVJgdDrnOra85PPo8ZlFhinawWHuRtVE39S8yJk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yarp/0001-format-security.patch b/pkgs/by-name/ya/yarp/0001-format-security.patch
new file mode 100644
index 000000000000..dc5e55f8712e
--- /dev/null
+++ b/pkgs/by-name/ya/yarp/0001-format-security.patch
@@ -0,0 +1,13 @@
+diff --git i/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp w/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp
+index a9024cb03..f4860ac62 100644
+--- i/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp
++++ w/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp
+@@ -111,7 +111,7 @@ int Companion::cmdSplit(int argc, char *argv[])
+             inData->mutex.unlock();
+             if (siz != 0)
+             {
+-                yCInfo(COMPANION, std::string("Received a Bottle of "+std::to_string(siz)+" elements.").c_str());
++                yCInfo(COMPANION, "Received a Bottle of %z elements.", siz);
+                 outPort = new BufferedPort<Bottle> [siz];
+                 for (size_t i = 0; i < siz; i++)
+                 {
diff --git a/pkgs/by-name/ya/yarp/package.nix b/pkgs/by-name/ya/yarp/package.nix
index f14e40f931fa..71ef9b5dfc53 100644
--- a/pkgs/by-name/ya/yarp/package.nix
+++ b/pkgs/by-name/ya/yarp/package.nix
@@ -4,20 +4,30 @@
   fetchFromGitHub,
   cmake,
   ace,
+  ycm-cmake-modules,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "yarp";
-  version = "2.3.70.2";
+  version = "3.12.1";
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "yarp";
     rev = "v${version}";
-    sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
+    hash = "sha256-6PyXMEUh0ENsRjbsXbwDr4ZqAulw8rgY5G0l/RewWys=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ ace ];
+  buildInputs = [
+    ace
+    ycm-cmake-modules
+  ];
+
+  patches = [
+    # Weird string interpolation causes compilation to fail due to -Wformat-security.
+    ./0001-format-security.patch
+  ];
 
   cmakeFlags = [
     "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
@@ -28,6 +38,8 @@ stdenv.mkDerivation rec {
 
   postInstall = "mv ./$out/lib/*.so $out/lib/";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Yet Another Robot Platform";
     homepage = "http://yarp.it";
diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix
index c074527301c5..89f29151af47 100644
--- a/pkgs/by-name/ya/yaru-theme/package.nix
+++ b/pkgs/by-name/ya/yaru-theme/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yaru";
-  version = "25.10.2";
+  version = "25.10.3";
 
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
     rev = version;
-    hash = "sha256-3NTqRmAdO3+9e9B7Fe0B9PPeMUBAmin+51cfqAijV0w=";
+    hash = "sha256-3cSVPObfmr62S6yTD2c8AO3s7lxb9KFVuYSydTIJ1jE=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ya/yatto/package.nix b/pkgs/by-name/ya/yatto/package.nix
index 4ce3cba28c97..496e8aa4df98 100644
--- a/pkgs/by-name/ya/yatto/package.nix
+++ b/pkgs/by-name/ya/yatto/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "yatto";
-  version = "0.18.1";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "handlebargh";
     repo = "yatto";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GI/Q9lI6SqIOSYi5shMKlgegS8WdlWSFsPs7WLCB6Qg=";
+    hash = "sha256-ZIGtRPy2DfMzCK0WHJcv75d2oeHd2Sh3twrV6G/m5SI=";
   };
 
-  vendorHash = "sha256-BqOuZUtyA7a8imzj3Oj1SUZ4k3kNjDYWiPlQRG9I0m8=";
+  vendorHash = "sha256-e+xv1mr8F3ODSsk67shJ+vI3isWcN3vaaqElUoDnvs0=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/by-name/ya/yaydl/package.nix b/pkgs/by-name/ya/yaydl/package.nix
index dbc9e670e139..ef637879a17b 100644
--- a/pkgs/by-name/ya/yaydl/package.nix
+++ b/pkgs/by-name/ya/yaydl/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "yaydl";
-  version = "0.17.3";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "dertuxmalwieder";
     repo = "yaydl";
     rev = "release-${version}";
-    sha256 = "sha256-bDsI61iWKgXDJ6wnK8a+1HCMlgRM0ol0bWb6a8IiY08=";
+    sha256 = "sha256-PSrLjqZ38gBlTiV6qMB3LzrcaqtM6hnZMI1uto24H94=";
   };
 
-  cargoHash = "sha256-WLWz+xzkxIqlYkNgefyc7c13YjPWpYz9VUlUfWwDN+g=";
+  cargoHash = "sha256-+BBB9YbYjNG7S+Lex/pwp7z06JbG+qMRI+TwSvMcYgg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/ya/yazi/plugins/dupes/default.nix b/pkgs/by-name/ya/yazi/plugins/dupes/default.nix
new file mode 100644
index 000000000000..c078d2eb70cc
--- /dev/null
+++ b/pkgs/by-name/ya/yazi/plugins/dupes/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  fetchFromGitHub,
+  mkYaziPlugin,
+  jdupes,
+  bash,
+}:
+mkYaziPlugin {
+  pname = "dupes.yazi";
+  version = "0-unstable-2025-10-23";
+
+  src = fetchFromGitHub {
+    owner = "mshnwq";
+    repo = "dupes.yazi";
+    rev = "18a9395d38f42e406805b92834154fc7ad15a7b8";
+    hash = "sha256-hBpUoMKGZgKrgxAOYZQ9CU4BKPSiYpYVWyuHYXHZ/Pc=";
+  };
+
+  postPatch = ''
+    substituteInPlace main.lua --replace-fail \
+      'set_state("cmdline", "jdupes")' \
+      'set_state("cmdline", "${lib.getExe jdupes}")'
+    substituteInPlace main.lua --replace-fail \
+      'set_state("shell", "bash")' \
+      'set_state("shell", "${lib.getExe bash}")'
+  '';
+
+  meta = {
+    description = "Duplicate files plugin for Yazi";
+    homepage = "https://github.com/Mshnwq/dupes.yazi";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mshnwq ];
+  };
+}
diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 4da00adcaff1..03ae14ae1972 100644
--- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mount.yazi";
-  version = "25.5.31-unstable-2025-08-11";
+  version = "25.5.31-unstable-2025-10-13";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "e95c7b384e7b0a9793fe1471f0f8f7810ef2a7ed";
-    hash = "sha256-TUS+yXxBOt6tL/zz10k4ezot8IgVg0/2BbS8wPs9KcE=";
+    rev = "9a52857eac61ede58d11c06ca813c3fa63fe3609";
+    hash = "sha256-YM53SsE10wtMqI1JGa4CqZbAgr7h62MZ5skEdAavOVA=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
index c621c86acd4f..5de164d5d744 100644
--- a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "recycle-bin.yazi";
-  version = "0-unstable-2025-09-16";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "uhs-robert";
     repo = "recycle-bin.yazi";
-    rev = "03f6c4a3085c218a0909671dcc2014558fff18a7";
-    hash = "sha256-M33RjtFQhnh9pIFKQKrsvZuWZNbe0lfepDKFsAuaYC4=";
+    rev = "8bb62865fdef06ea27c10367595017c118ef2831";
+    hash = "sha256-p7UBJCWvyOHpt2EbjDNJJ0wuPxK425vyy+9lf9al9F0=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
index f1738bf96d7a..412035d7c296 100644
--- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "rich-preview.yazi";
-  version = "0-unstable-2025-05-31";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "AnirudhG07";
     repo = "rich-preview.yazi";
-    rev = "843c3faf0a99f5ce31d02372c868d8dae92ca29d";
-    hash = "sha256-celObHo9Y3pFCd1mTx1Lz77Tc22SJTleRblAkbH/RqY=";
+    rev = "831234e828d292913f4b174a1ca2be2fb1080f22";
+    hash = "sha256-CK3ynjs53I1tRqARoOYMgBczBrcle+pwpUhHt3VpSXs=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
index 1fe61990500d..3ee1b393b3c8 100644
--- a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
@@ -5,12 +5,12 @@
 }:
 mkYaziPlugin {
   pname = "rsync.yazi";
-  version = "0-unstable-2025-09-20";
+  version = "0-unstable-2025-10-23";
   src = fetchFromGitHub {
     owner = "GianniBYoung";
     repo = "rsync.yazi";
-    rev = "824d8a35bf1f13742d19ecd93521bedc547fa809";
-    hash = "sha256-GqrwhJ4Fyxk4vzOSkFPoxvq5EV50YejaB84m2K006Bc=";
+    rev = "14d28283f49b39593a2763d7457e0dacb78f7597";
+    hash = "sha256-LT+4NKiCkiF72RG9g/tOjS6F+Wc4tY3vtnHNHPxbn1w=";
   };
 
   meta = {
diff --git a/pkgs/by-name/yc/ycm-cmake-modules/package.nix b/pkgs/by-name/yc/ycm-cmake-modules/package.nix
new file mode 100644
index 000000000000..8c532b714969
--- /dev/null
+++ b/pkgs/by-name/yc/ycm-cmake-modules/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ycm-cmake-modules";
+  version = "0.18.4";
+  src = fetchFromGitHub {
+    owner = "robotology";
+    repo = "ycm-cmake-modules";
+    rev = "v${version}";
+    hash = "sha256-Xmc23r3hmwg9v620KGfUV/s7feJUVVZD1OaT3TAQBBY=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Collection of various useful CMake modules";
+    homepage = "https://robotology.github.io/ycm-cmake-modules/gh-pages/latest/index.html";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix
index 520dd5f23461..6978a1b60085 100644
--- a/pkgs/by-name/yc/ycmd/package.nix
+++ b/pkgs/by-name/yc/ycmd/package.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
 
       ...  then set something similar to following in `programs.vim.extraConfig`;
 
-          let g:ycm_server_python_interpreter = "${python3.interpreter}"
+          let g:ycm_server_python_interpreter = "''${python3.interpreter}"
     '';
     mainProgram = "ycmd";
     homepage = "https://github.com/ycm-core/ycmd";
diff --git a/pkgs/by-name/ye/yelp-xsl/package.nix b/pkgs/by-name/ye/yelp-xsl/package.nix
index 4004318a7ce1..a908a60c0449 100644
--- a/pkgs/by-name/ye/yelp-xsl/package.nix
+++ b/pkgs/by-name/ye/yelp-xsl/package.nix
@@ -7,18 +7,17 @@
   fetchurl,
   pkg-config,
   itstool,
-  libxml2,
   libxslt,
   gnome,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yelp-xsl";
-  version = "42.4";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp-xsl/${lib.versions.major finalAttrs.version}/yelp-xsl-${finalAttrs.version}.tar.xz";
-    hash = "sha256-/euwfrLman+3oNzmrYJIrSmku7E0uoKRKMoQT1ir19E=";
+    hash = "sha256-WdQ6j4/me3hPFPmgTdSnoJKn9KZKZecbkP4CpHpQ++w=";
   };
 
   nativeBuildInputs = [
@@ -27,7 +26,6 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     gettext
     itstool
-    libxml2
     libxslt
   ];
 
diff --git a/pkgs/by-name/ye/yelp/package.nix b/pkgs/by-name/ye/yelp/package.nix
index ca376a4359f5..197b9a79dff1 100644
--- a/pkgs/by-name/ye/yelp/package.nix
+++ b/pkgs/by-name/ye/yelp/package.nix
@@ -2,20 +2,21 @@
   stdenv,
   lib,
   fetchurl,
+  desktop-file-utils,
   gettext,
   itstool,
   meson,
   ninja,
   pkg-config,
-  wrapGAppsHook3,
+  wrapGAppsHook4,
   bzip2,
   glib,
-  gtk3,
-  libhandy,
+  gtk4,
+  libadwaita,
   libxml2,
   libxslt,
   sqlite,
-  webkitgtk_4_1,
+  webkitgtk_6_0,
   xz,
   yelp-xsl,
   gnome,
@@ -23,31 +24,32 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "yelp";
-  version = "42.3";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/yelp/${lib.versions.major finalAttrs.version}/yelp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JszEImeanmp6OqCD2Q/Ns0f18jAL4+AUMaMNDN0qiaM=";
+    hash = "sha256-5mFOCx9Lpf57jRSb3UJnPwMGVvvc1zaumGBxkZfGNFc=";
   };
 
   nativeBuildInputs = [
+    desktop-file-utils
     gettext
     itstool
     meson
     ninja
     pkg-config
-    wrapGAppsHook3
+    wrapGAppsHook4
   ];
 
   buildInputs = [
     bzip2
     glib
-    gtk3
-    libhandy
+    gtk4
+    libadwaita
     libxml2
     libxslt
     sqlite
-    webkitgtk_4_1
+    webkitgtk_6_0
     xz
     yelp-xsl
   ];
diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index 79ee27477386..8990711ad726 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     owner = "hepcedar";
     repo = "yoda";
     rev = "yoda-${version}";
-    hash = "sha256-cYJNB4Nk6r9EbTbMrhUFvj6s0VR/QH2o9wl/cUw9jQ0=";
+    hash = "sha256-cgThoxqPX6dVyGNTLXatW3uQV+41o38fTfkvHXsDs9A=";
   };
 
   nativeBuildInputs = with python3.pkgs; [
diff --git a/pkgs/by-name/yo/youki/package.nix b/pkgs/by-name/yo/youki/package.nix
index 29ce3647255d..3c5ce7d2fed3 100644
--- a/pkgs/by-name/yo/youki/package.nix
+++ b/pkgs/by-name/yo/youki/package.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "youki";
-  version = "0.5.5";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "youki";
     rev = "v${version}";
-    hash = "sha256-r8/H/qTPBoNubg3f4+WC8lBkQXpdEE8Dapt2sGoFcTc=";
+    hash = "sha256-b2R9/ADoZfRSu1Qh7hImR1Y+ZX15Uhk7JFwD8ipec6o=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
     "youki"
   ];
 
-  cargoHash = "sha256-S2Cv7k4ine9/VbY2r8BSRwqVBtuqX55RYglm9W+LXvc=";
+  cargoHash = "sha256-R/1wE7twjMwlSns7ZV5nr8PZ/OzghcslvU+0Ic/oamQ=";
 
   meta = {
     description = "Container runtime written in Rust";
diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index b19d6e752f6d..4cb7bc2b8394 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -12,7 +12,7 @@ let
 
   vPath = v: lib.elemAt (lib.splitString "-" v) 0;
 
-  version = "2025.3-b154";
+  version = "2025.9-b161";
 
   arches = {
     aarch64-linux = "arm64";
@@ -22,8 +22,8 @@ let
   arch = arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
 
   hashes = {
-    arm64 = "sha256-X9YQy12rfTWOVKX2ufmS4GxLGp/I6jhZAZyRBfLuOuk=";
-    x64 = "sha256-BuEfpMEgkOcbUra6eT/sTiVhXpheMaCe55M/CuG0kHE=";
+    arm64 = "sha256-8fBe6evrCdbobx7tvWw+zqKBSLrnksib/EQmskmKiZc=";
+    x64 = "sha256-h+8BHW6Y1Km2iHyONA4DPyUWxrA9R66322lPFBz/bGw=";
   };
 
   desktopItem = makeDesktopItem {
diff --git a/pkgs/by-name/yo/youtube-tui/package.nix b/pkgs/by-name/yo/youtube-tui/package.nix
index cfbcb3020f84..c712e5843772 100644
--- a/pkgs/by-name/yo/youtube-tui/package.nix
+++ b/pkgs/by-name/yo/youtube-tui/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "youtube-tui";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchFromGitHub {
     owner = "Siriusmart";
     repo = "youtube-tui";
     tag = "v${version}";
-    hash = "sha256-TuXfgJTY+f+9GH6gsATsnV8WMAfqHUAglbbCvOgJ1NQ=";
+    hash = "sha256-a2Y0CATnKmZsYr3eUch3EUgHw41X1a2iOP0CjEJLXnc=";
   };
 
-  cargoHash = "sha256-lJDIkOokhKo6BxrZAD4s2FtLXNhU2IysltjhiHQQUlU=";
+  cargoHash = "sha256-W3MBYcxb51cBjHUF7zXMOrRVzcxUX/TxiLyYGuOPFyI=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index ae0b2733f6b9..a54f623a3b51 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.10.14";
+  version = "2025.10.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-x7vpuXUihlC4jONwjmWnPECFZ7xiVAOFSDUgBNvl+aA=";
+    hash = "sha256-jQaENEflaF9HzY/EiMXIHgUehAJ3nnDT9IbaN6bDcac=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix
index 34adb6af4991..9e2288d7c48a 100644
--- a/pkgs/by-name/yt/ytcc/package.nix
+++ b/pkgs/by-name/yt/ytcc/package.nix
@@ -60,6 +60,8 @@ python3Packages.buildPythonApplication {
     "test_update"
     "test_download"
     "test_comma_list_error"
+    "test_cleanup"
+    "test_pipe_mark"
   ];
 
   postInstall = ''
diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index bc6ce0bdd363..2578b4b3fcd3 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.09.27.post4";
+  version = "2025.11.07.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-b+7K5qpIo1Yfeg18bYMCYVvHgr/7NKiZoelFdtq+KZo=";
+    hash = "sha256-gg4KcYLnHKpIJKhL8x1xUDf38LvmTIc/mgd0Py6Uoe4=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch b/pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch
new file mode 100644
index 000000000000..c24c7c8888af
--- /dev/null
+++ b/pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch
@@ -0,0 +1,403 @@
+From 5acf0a321cd3393d145e7b158d21f790e1e94a39 Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Wed, 22 Oct 2025 21:01:34 -0700
+Subject: [PATCH] Update Cargo.lock
+
+---
+ Cargo.lock | 240 ++++++++++-------------------------------------------
+ 1 file changed, 44 insertions(+), 196 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 1fd1883..f555e92 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,21 +1,12 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 3
++version = 4
+ 
+ [[package]]
+ name = "aho-corasick"
+-version = "0.6.10"
++version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
+-dependencies = [
+- "memchr",
+-]
+-
+-[[package]]
+-name = "aho-corasick"
+-version = "0.7.18"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+ dependencies = [
+  "memchr",
+ ]
+@@ -42,9 +33,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "base64"
+-version = "0.13.0"
++version = "0.13.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+ 
+ [[package]]
+ name = "bitflags"
+@@ -52,12 +43,6 @@ version = "1.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+ 
+-[[package]]
+-name = "cfg-if"
+-version = "1.0.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+-
+ [[package]]
+ name = "clap"
+ version = "2.34.0"
+@@ -69,7 +54,7 @@ dependencies = [
+  "bitflags",
+  "strsim",
+  "textwrap",
+- "unicode-width",
++ "unicode-width 0.1.14",
+  "vec_map",
+ ]
+ 
+@@ -81,19 +66,13 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+ 
+ [[package]]
+ name = "getopts"
+-version = "0.2.21"
++version = "0.2.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
++checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
+ dependencies = [
+- "unicode-width",
++ "unicode-width 0.2.2",
+ ]
+ 
+-[[package]]
+-name = "heck"
+-version = "0.4.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+-
+ [[package]]
+ name = "hermit-abi"
+ version = "0.1.19"
+@@ -105,15 +84,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "lazy_static"
+-version = "1.4.0"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.126"
++version = "0.2.177"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+ 
+ [[package]]
+ name = "libyubihsm-sys"
+@@ -124,42 +103,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "log"
+-version = "0.3.9"
++version = "0.4.28"
+ 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",
+-]
++checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.5.0"
++version = "2.7.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
++checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+ 
+ [[package]]
+ name = "pkg-config"
+-version = "0.3.25"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+-
+-[[package]]
+-name = "proc-macro2"
+-version = "1.0.69"
++version = "0.3.32"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+-dependencies = [
+- "unicode-ident",
+-]
++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+ 
+ [[package]]
+ name = "quick-error"
+@@ -167,15 +125,6 @@ version = "1.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+ 
+-[[package]]
+-name = "quote"
+-version = "1.0.33"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+-dependencies = [
+- "proc-macro2",
+-]
+-
+ [[package]]
+ name = "rand"
+ version = "0.3.23"
+@@ -225,54 +174,38 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex"
+-version = "0.2.11"
++version = "1.12.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
++checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+ dependencies = [
+- "aho-corasick 0.6.10",
++ "aho-corasick",
+  "memchr",
+- "regex-syntax 0.5.6",
+- "thread_local",
+- "utf8-ranges",
++ "regex-automata",
++ "regex-syntax",
+ ]
+ 
+ [[package]]
+-name = "regex"
+-version = "1.5.6"
++name = "regex-automata"
++version = "0.4.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
++checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+ dependencies = [
+- "aho-corasick 0.7.18",
++ "aho-corasick",
+  "memchr",
+- "regex-syntax 0.6.26",
+-]
+-
+-[[package]]
+-name = "regex-syntax"
+-version = "0.5.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
+-dependencies = [
+- "ucd-util",
++ "regex-syntax",
+ ]
+ 
+ [[package]]
+ name = "regex-syntax"
+-version = "0.6.26"
++version = "0.8.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
++checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+ 
+ [[package]]
+ name = "rustc-serialize"
+-version = "0.3.24"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+-
+-[[package]]
+-name = "rustversion"
+-version = "1.0.14"
++version = "0.3.25"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
+ 
+ [[package]]
+ name = "rusty_secrets"
+@@ -294,114 +227,32 @@ dependencies = [
+  "quick-error",
+ ]
+ 
+-[[package]]
+-name = "serde"
+-version = "1.0.190"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+-dependencies = [
+- "serde_derive",
+-]
+-
+-[[package]]
+-name = "serde_derive"
+-version = "1.0.190"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "syn 2.0.38",
+-]
+-
+ [[package]]
+ name = "strsim"
+ version = "0.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+ 
+-[[package]]
+-name = "strum"
+-version = "0.24.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+-
+-[[package]]
+-name = "strum_macros"
+-version = "0.24.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+-dependencies = [
+- "heck",
+- "proc-macro2",
+- "quote",
+- "rustversion",
+- "syn 1.0.109",
+-]
+-
+-[[package]]
+-name = "syn"
+-version = "1.0.109"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "unicode-ident",
+-]
+-
+-[[package]]
+-name = "syn"
+-version = "2.0.38"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "unicode-ident",
+-]
+-
+ [[package]]
+ name = "textwrap"
+ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+ dependencies = [
+- "unicode-width",
++ "unicode-width 0.1.14",
+ ]
+ 
+-[[package]]
+-name = "thread_local"
+-version = "0.3.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+-dependencies = [
+- "lazy_static",
+-]
+-
+-[[package]]
+-name = "ucd-util"
+-version = "0.1.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236"
+-
+-[[package]]
+-name = "unicode-ident"
+-version = "1.0.12"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+-
+ [[package]]
+ name = "unicode-width"
+-version = "0.1.9"
++version = "0.1.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+ 
+ [[package]]
+-name = "utf8-ranges"
+-version = "1.0.5"
++name = "unicode-width"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
++checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+ 
+ [[package]]
+ name = "vec_map"
+@@ -433,12 +284,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ 
+ [[package]]
+ name = "yubihsm-setup"
+-version = "2.3.1"
++version = "2.3.3"
+ dependencies = [
+  "base64",
+  "clap",
+  "lazy_static",
+- "regex 1.5.6",
++ "regex",
+  "rusty_secrets",
+  "scan_dir",
+  "yubihsmrs",
+@@ -446,14 +297,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "yubihsmrs"
+-version = "2.1.3"
++version = "2.1.4"
+ dependencies = [
+  "lazy_static",
+  "libyubihsm-sys",
+- "log 0.3.9",
+- "regex 0.2.11",
++ "log",
++ "regex",
+  "rustc-serialize",
+- "serde",
+- "strum",
+- "strum_macros",
+ ]
diff --git a/pkgs/by-name/yu/yubihsm-setup/package.nix b/pkgs/by-name/yu/yubihsm-setup/package.nix
new file mode 100644
index 000000000000..50fedb2c0213
--- /dev/null
+++ b/pkgs/by-name/yu/yubihsm-setup/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  yubihsm-shell,
+}:
+
+rustPlatform.buildRustPackage (finalPackage: {
+  pname = "yubihsm-setup";
+  version = "2.3.3";
+
+  src = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubihsm-setup";
+    tag = finalPackage.version;
+    hash = "sha256-ScpcEDNWLhywtcPPG84vZyIAQ5lF07udmGsmsyc3+iU=";
+  };
+
+  yubihsmrs = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubihsmrs";
+    tag = "2.1.4";
+    hash = "sha256-MQwp2dkAkPNyclDgRhHWRHZ9y4LC+bGIeLBv8CgMGXY=";
+  };
+
+  prePatch = ''
+    ln -s $yubihsmrs yubihsmrs
+    substituteInPlace Cargo.toml --replace-fail ../yubihsmrs/ ./yubihsmrs/
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ yubihsm-shell ];
+
+  # https://github.com/Yubico/yubihsm-setup/pull/20
+  cargoPatches = [ ./cargo-lock.patch ];
+
+  cargoHash = "sha256-Mk0uGNb0WGygSqocpo566sVHs13zvoFBbAevJj4OSBM=";
+
+  meta = {
+    description = "Tool to easily set up a YubiHSM device";
+    homepage = "https://github.com/Yubico/yubihsm-setup";
+    maintainers = with lib.maintainers; [
+      numinit
+    ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/yu/yubihsm-shell/package.nix b/pkgs/by-name/yu/yubihsm-shell/package.nix
index 4f9354ea4316..3261fc7c0d7b 100644
--- a/pkgs/by-name/yu/yubihsm-shell/package.nix
+++ b/pkgs/by-name/yu/yubihsm-shell/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   openssl,
   libusb1,
@@ -25,6 +26,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-ymGS35kjhNlFee3FEXF8n6Jm7NVaynjv+lpix6F75BQ=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/Yubico/yubihsm-shell/pull/493.patch";
+      hash = "sha256-mM4ef1GV7BJT+EZ8B7+ejleTocglhxCWO/RKHZN69GE=";
+    })
+  ];
+
   postPatch = ''
     # Can't find libyubihsm at runtime because of dlopen() in C code
     substituteInPlace lib/yubihsm.c \
@@ -65,7 +73,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Thin wrapper around libyubihsm providing both an interactive and command-line interface to a YubiHSM";
     homepage = "https://github.com/Yubico/yubihsm-shell";
-    maintainers = with maintainers; [ matthewcroughan ];
+    maintainers = with maintainers; [
+      matthewcroughan
+      numinit
+    ];
     license = licenses.asl20;
     platforms = platforms.all;
   };
diff --git a/pkgs/by-name/yu/yutto/package.nix b/pkgs/by-name/yu/yutto/package.nix
index 8d33084bc7cc..b91da1019880 100644
--- a/pkgs/by-name/yu/yutto/package.nix
+++ b/pkgs/by-name/yu/yutto/package.nix
@@ -3,12 +3,11 @@
   python3Packages,
   fetchFromGitHub,
   ffmpeg,
-  nix-update-script,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "yutto";
-  version = "2.0.3";
+  version = "2.1.0";
   pyproject = true;
 
   pythonRelaxDeps = true;
@@ -17,21 +16,21 @@ python3Packages.buildPythonApplication rec {
     owner = "yutto-dev";
     repo = "yutto";
     tag = "v${version}";
-    hash = "sha256-giwCLA9M1XR0neLJVfO017Q1wK34yVQpOxUzgShDJL0=";
+    hash = "sha256-A9LM+hdev9/vH4HV2DUhpiA2XqvXYxtSUt2dyUnZwsU=";
   };
 
-  build-system = with python3Packages; [ hatchling ];
+  build-system = with python3Packages; [ uv-build ];
 
   dependencies =
     with python3Packages;
     [
-      httpx
       aiofiles
       biliass
       dict2xml
-      colorama
+      httpx
       typing-extensions
       pydantic
+      returns
     ]
     ++ (with httpx.optional-dependencies; http2 ++ socks);
 
@@ -41,8 +40,6 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "yutto" ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = with lib; {
     description = "Bilibili downloader";
     homepage = "https://github.com/yutto-dev/yutto";
diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index a5faee7d7820..f21176fb6f8a 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zabbix-cli";
-  version = "3.5.2";
+  version = "3.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unioslo";
     repo = "zabbix-cli";
     tag = version;
-    hash = "sha256-Sgt3kVbyzNJCSVUYErHNOrgc7Jd3tIwYhwOESRPeAyw=";
+    hash = "sha256-Fk3o0+cNCX/ixqNd9oldY6JJ+wQWlMjBAEwuAWCLURQ=";
   };
 
   build-system = with python3Packages; [
@@ -56,6 +56,11 @@ python3Packages.buildPythonApplication rec {
     export HOME=$(mktemp -d)
   '';
 
+  disabledTests = [
+    # Disable failing test with Click >= v8.2.0
+    "test_patch_get_click_type"
+  ];
+
   pythonImportsCheck = [ "zabbix_cli" ];
 
   passthru.tests.version = testers.testVersion {
diff --git a/pkgs/by-name/za/zandronum-server/package.nix b/pkgs/by-name/za/zandronum-server/package.nix
new file mode 100644
index 000000000000..12056a754794
--- /dev/null
+++ b/pkgs/by-name/za/zandronum-server/package.nix
@@ -0,0 +1,7 @@
+{
+  zandronum,
+}:
+
+zandronum.override {
+  serverOnly = true;
+}
diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/by-name/za/zandronum/package.nix
similarity index 80%
rename from pkgs/games/doom-ports/zandronum/default.nix
rename to pkgs/by-name/za/zandronum/package.nix
index 837339921bb5..eaeddab5c79a 100644
--- a/pkgs/games/doom-ports/zandronum/default.nix
+++ b/pkgs/by-name/za/zandronum/package.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchhg,
+  fetchFromGitLab,
   cmake,
   pkg-config,
   makeWrapper,
@@ -9,6 +9,7 @@
   soundfont-fluid,
   SDL_compat,
   libGL,
+  libopus,
   glew,
   bzip2,
   zlib,
@@ -29,25 +30,21 @@ let
   clientLibPath = lib.makeLibraryPath [ fluidsynth ];
 
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zandronum${suffix}";
-  version = "3.1.0";
+  version = "3.2.1";
 
-  src = fetchhg {
-    # expired ssl certificate
-    url = "http://hg.osdn.net/view/zandronum/zandronum-stable";
-    rev = "4178904d7698";
-    hash = "sha256-5t36CoRPPjDKQE0DVSv2Qqpqko6JAXBI53tuAYiylHQ=";
+  src = fetchFromGitLab {
+    domain = "foss.heptapod.net";
+    owner = "zandronum";
+    repo = "zandronum-stable";
+    tag = "ZA_${finalAttrs.version}";
+    hash = "sha256-A5sfZMiCypBxAUOsoB8yuinZf7b9D7+HH9rpVs3esgA=";
   };
 
   # zandronum tries to download sqlite now when running cmake, don't let it
-  # it also needs the current mercurial revision info embedded in gitinfo.h
-  # otherwise, the client will fail to connect to servers because the
-  # protocol version doesn't match.
   patches = [
     ./zan_configure_impurity.patch
-    ./dont_update_gitinfo.patch
-    ./add_gitinfo.patch
   ];
 
   # I have no idea why would SDL and libjpeg be needed for the server part!
@@ -66,6 +63,7 @@ stdenv.mkDerivation {
     glew
     fmod
     fluidsynth
+    libopus
     gtk2
   ];
 
@@ -117,12 +115,12 @@ stdenv.mkDerivation {
     inherit fmod sqlite;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://zandronum.com/";
     description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
     mainProgram = "zandronum-server";
-    maintainers = with maintainers; [ lassulus ];
-    license = licenses.sleepycat;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ lassulus ];
+    license = lib.licenses.sleepycat;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/games/doom-ports/zandronum/sqlite.nix b/pkgs/by-name/za/zandronum/sqlite.nix
similarity index 100%
rename from pkgs/games/doom-ports/zandronum/sqlite.nix
rename to pkgs/by-name/za/zandronum/sqlite.nix
diff --git a/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch b/pkgs/by-name/za/zandronum/zan_configure_impurity.patch
similarity index 98%
rename from pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
rename to pkgs/by-name/za/zandronum/zan_configure_impurity.patch
index 9dafc6219d29..b0cef1c8f91e 100644
--- a/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
+++ b/pkgs/by-name/za/zandronum/zan_configure_impurity.patch
@@ -2,8 +2,6 @@ diff -r 4178904d7698 sqlite/CMakeLists.txt
 --- a/sqlite/CMakeLists.txt	Sat Dec 11 16:35:55 2021 -0500
 +++ b/sqlite/CMakeLists.txt	Fri Dec 01 12:57:55 2023 -0300
 @@ -1,65 +1,5 @@
- cmake_minimum_required( VERSION 2.4 )
- 
 -# [BB/EP] Download SQLite archive and extract the sources if necessary.
 -set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0
 -set( ZAN_SQLITE_YEAR 2021 )
diff --git a/pkgs/by-name/za/zapret/package.nix b/pkgs/by-name/za/zapret/package.nix
index 1bb54c54e980..f554c4f56b7b 100644
--- a/pkgs/by-name/za/zapret/package.nix
+++ b/pkgs/by-name/za/zapret/package.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zapret";
-  version = "72";
+  version = "72.2";
 
   src = fetchFromGitHub {
     owner = "bol-van";
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u9vtxkFxh7JK6Zb/IuS4qldf8ysDYospqOEuPObGyps=";
+    hash = "sha256-tDoo4PxfK/JB4Q10QQECYKf34nL2YkoHcUhp3aKbtYI=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix
index 423776fe2a66..7b1ed9aa1a51 100644
--- a/pkgs/by-name/za/zapzap/package.nix
+++ b/pkgs/by-name/za/zapzap/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zapzap";
-  version = "6.2.1";
+  version = "6.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rafatosta";
     repo = "zapzap";
     tag = version;
-    hash = "sha256-DvQuhoO7jxnkX7uW+fltEjKu2Ugg8cgLKe+5pkln6g4=";
+    hash = "sha256-pbRq+gYKGEezKkjkn8wbYtgaChfiEczWy0e/Dp5gTF8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index 3bb48a577497..326e7f5b7fe4 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.62.0";
+  version = "0.64.0";
 
   src = fetchFromGitHub {
     owner = "zarf-dev";
     repo = "zarf";
     tag = "v${version}";
-    hash = "sha256-mabp4G7LbtOmIVEmOK/YhjTX/RRM8ObAS6YXTJe2P/U=";
+    hash = "sha256-0QauJONX31g3XB8pObS9SuxSBo/R610sdDU1ZyfQMFE=";
   };
 
-  vendorHash = "sha256-As7xDEo+bMslv9Xd6CbHTqvf2XaXmO6Gp3f9+xD3kNU=";
+  vendorHash = "sha256-0IAD7wa/ycgwVTa9r33kLFvIzTL/C1UUeQxRHQ/5c1g=";
   proxyVendor = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index ddc05c1236a8..ee7901d6c84c 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zashboard";
-  version = "1.103.1";
+  version = "1.108.0";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xZg0ca11TfiB2rRFONDTBv8kX25JR9kSelwPqS/HvhI=";
+    hash = "sha256-+CSih7AoP9rOkxVBtX+GkEWrpo6mpPy6d/zF5iyVCt4=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-O4MayQ9r+++0XvRmXnuVnw4nHx66jVahs0sm221wfV0=";
+    hash = "sha256-0qoyN46DDdj9vy7qMRGtNrWKZVsBRv22NQBhB7sz1+U=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch
new file mode 100644
index 000000000000..992a31664df6
--- /dev/null
+++ b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch
@@ -0,0 +1,25 @@
+From 9cf8d3f1025689f3765da2f0a27561a6bfe5c3cb Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Fri, 7 Nov 2025 00:23:44 +0800
+Subject: [PATCH] Fix SDL_main redefinition issue on macOS
+
+---
+ src/zatackax.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/zatackax.c b/src/zatackax.c
+index dad2fa9..47a8bd7 100644
+--- a/src/zatackax.c
++++ b/src/zatackax.c
+@@ -16,6 +16,8 @@
+  */
+ 
+ #include "zatackax.h"
++// override SDL_main.h redefining main to SDL_main on darwin
++#define main main
+ 
+ static const unsigned int FPS_CAP = 100;
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/za/zatackax/package.nix b/pkgs/by-name/za/zatackax/package.nix
new file mode 100644
index 000000000000..62385ebb299d
--- /dev/null
+++ b/pkgs/by-name/za/zatackax/package.nix
@@ -0,0 +1,61 @@
+{
+  autoreconfHook,
+  fetchFromGitHub,
+  SDL,
+  SDL_image,
+  SDL_mixer,
+  SDL_ttf,
+  stdenv,
+  lib,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zatackax";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "simenheg";
+    repo = "zatackax";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1m99hi0kjpj5Yl1nAmwSMMdQWcP0rfLLPFJPkU4oVbM=";
+  };
+
+  # src/zatackax.c:2069:5: error: conflicting types for 'SDL_main'
+  # Fix SDL_main redefinition issue on darwin
+  patches = lib.optional stdenv.hostPlatform.isDarwin ./0001-Fix-SDL_main-redefinition-issue-on-macOS.patch;
+
+  # malloc.h is not needed because stdlib.h is already included.
+  # On darwin, malloc.h does not even exist, resulting in an error.
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/zatackax.h \
+      --replace-fail '#include <malloc.h>' ""
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    SDL_mixer
+    SDL_ttf
+    SDL_image
+    SDL
+  ];
+
+  configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open-source remake of the early computer game \"Achtung, die Kurve!\"";
+    homepage = "https://github.com/simenheg/zatackax";
+    changelog = "https://github.com/simenheg/zatackax/releases";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.alch-emi ];
+    mainProgram = "zatackax";
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+})
diff --git a/pkgs/by-name/zd/zdelta/package.nix b/pkgs/by-name/zd/zdelta/package.nix
index fd0cf1ae08b4..41f3573b5450 100644
--- a/pkgs/by-name/zd/zdelta/package.nix
+++ b/pkgs/by-name/zd/zdelta/package.nix
@@ -24,5 +24,7 @@ stdenv.mkDerivation {
     homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
     platforms = platforms.all;
     license = licenses.zlib;
+    # last successful hydra build on darwin was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index 5c410836489c..fbcb0ce56783 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9tlo7+namWNWrWVQNqaOvtK4NQIdb0p8qvFrrbUamOo=";
   };
 
+  patches = [ ./qt6_10.patch ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/by-name/ze/zeal/qt6_10.patch b/pkgs/by-name/ze/zeal/qt6_10.patch
new file mode 100644
index 000000000000..574c063a3b75
--- /dev/null
+++ b/pkgs/by-name/ze/zeal/qt6_10.patch
@@ -0,0 +1,34 @@
+diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp
+index 8c9fe63..5c73480 100644
+--- a/src/libs/ui/docsetsdialog.cpp
++++ b/src/libs/ui/docsetsdialog.cpp
+@@ -360,7 +360,7 @@ void DocsetsDialog::downloadCompleted()
+         QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
+         if (!tmpFile) {
+             tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
+-            tmpFile->open();
++            (void)tmpFile->open();
+             m_tmpFiles.insert(docsetName, tmpFile);
+         }
+ 
+@@ -403,7 +403,7 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total)
+         QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
+         if (!tmpFile) {
+             tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
+-            tmpFile->open();
++            (void)tmpFile->open();
+             m_tmpFiles.insert(docsetName, tmpFile);
+         }
+ 
+diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+index 476c2f5..f49da88 100644
+--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
++++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+@@ -42,6 +42,7 @@ elseif(UNIX AND X11_FOUND)
+         find_package(Qt5 COMPONENTS X11Extras REQUIRED)
+         target_link_libraries(QxtGlobalShortcut Qt5::X11Extras)
+     else()
++        find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+         target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate)
+     endif()
+ 
diff --git a/pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patch b/pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patch
deleted file mode 100644
index 27b49e8ddf1b..000000000000
--- a/pkgs/by-name/ze/zed-editor/0001-fix-duplicate-reqwest.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 22427fb..75a924a 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -12162,43 +12162,6 @@ dependencies = [
-  "winreg 0.50.0",
- ]
-
--[[package]]
--name = "reqwest"
--version = "0.12.15"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d19c46a6fdd48bc4dab94b6103fccc55d34c67cc0ad04653aad4ea2a07cd7bbb"
--dependencies = [
-- "base64 0.22.1",
-- "bytes 1.10.1",
-- "futures-channel",
-- "futures-core",
-- "futures-util",
-- "http 1.3.1",
-- "http-body 1.0.1",
-- "http-body-util",
-- "hyper 1.6.0",
-- "hyper-util",
-- "ipnet",
-- "js-sys",
-- "log",
-- "mime",
-- "once_cell",
-- "percent-encoding",
-- "pin-project-lite",
-- "serde",
-- "serde_json",
-- "serde_urlencoded",
-- "sync_wrapper 1.0.2",
-- "tokio",
-- "tower 0.5.2",
-- "tower-service",
-- "url",
-- "wasm-bindgen",
-- "wasm-bindgen-futures",
-- "web-sys",
-- "windows-registry 0.4.0",
--]
--
- [[package]]
- name = "reqwest"
- version = "0.12.15"
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 1247ce354597..33ad77f07b85 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.207.4";
+  version = "0.211.6";
 
   outputs = [
     "out"
@@ -114,23 +114,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IKACHMKHIyq8UuqWlA6U/cdCi+wrevZwl2CINSWmmRc=";
+    hash = "sha256-JlRsiQHDsQ80/8aM0trCrfvEAAXQtkO75CAKotP1mFs=";
   };
 
-  cargoPatches = [
-    ./0001-fix-duplicate-reqwest.patch
-  ];
-
   postPatch = ''
     # Dynamically link WebRTC instead of static
     substituteInPlace $cargoDepsCopy/webrtc-sys-*/build.rs \
       --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc"
 
-    # Zed team renamed the function but forgot to update its usage in this file
-    # We rename it ourselves for now, until upstream fixes the issue
-    substituteInPlace $cargoDepsCopy/reqwest-0.12*/src/blocking/client.rs \
-      --replace-fail "inner.redirect(policy)" "inner.redirect_policy(policy)"
-
     # The generate-licenses script wants a specific version of cargo-about eventhough
     # newer versions work just as well.
     substituteInPlace script/generate-licenses \
@@ -143,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-jv8ytsttXFG5VlFWI885zLJsZn8rFkiFdPhUvNKOwpY=";
+  cargoHash = "sha256-DHAERsHGDk7bjTi+nCTf75qt6+uGzHLojEzoDCFkVDc=";
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/ze/zed-open-capture/package.nix b/pkgs/by-name/ze/zed-open-capture/package.nix
index ece760178aa8..7d3d6b2f77df 100644
--- a/pkgs/by-name/ze/zed-open-capture/package.nix
+++ b/pkgs/by-name/ze/zed-open-capture/package.nix
@@ -38,10 +38,16 @@ stdenv.mkDerivation {
     "-DBUILD_EXAMPLES=OFF"
   ];
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Platform-agnostic camera and sensor capture API for the ZED 2, ZED 2i, and ZED Mini stereo cameras";
     homepage = "https://github.com/stereolabs/zed-open-capture";
-    license = licenses.mit;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marius851000 ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix
index fc81ec1b707c..1570a8149ee9 100644
--- a/pkgs/by-name/ze/zeekscript/package.nix
+++ b/pkgs/by-name/ze/zeekscript/package.nix
@@ -1,32 +1,36 @@
 {
   lib,
   python3,
-  fetchPypi,
+  fetchFromGitHub,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "zeekscript";
-  version = "1.2.8";
+  version = "1.3.2-unstable-2025-09-29";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-v0PJY0Ahxa4k011AwtWSIAWBXvt3Aybrd382j1SIT6M=";
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "zeekscript";
+    rev = "f0fa5746633a709759a94695fcc81b43feb8e2d9";
+    hash = "sha256-g4Iv9xw6Owuqi+UudRzWatK09mjNDWdp0cBvH7iuV+U=";
   };
 
-  postPatch = ''
-    sed -i '/name = "zeekscript"/a version = "${version}"' pyproject.toml
-  '';
+  build-system = with python3.pkgs; [ setuptools ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-    wheel
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
+    argcomplete
     tree-sitter
+    tree-sitter-zeek
   ];
 
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-cov-stub
+  ];
+
+  checkInputs = with python3.pkgs; [ syrupy ];
+
   pythonImportsCheck = [
     "zeekscript"
   ];
@@ -34,13 +38,12 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Zeek script formatter and analyzer";
     homepage = "https://github.com/zeek/zeekscript";
-    changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES";
+    changelog = "https://github.com/zeek/zeekscript/blob/${src.rev}/CHANGES";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       fab
       tobim
+      mdaniels5757
     ];
-    # Incompatible with tree-sitter > 0.21.
-    broken = true;
   };
 }
diff --git a/pkgs/by-name/ze/zenity/package.nix b/pkgs/by-name/ze/zenity/package.nix
index 72ee2d493225..0f612d9468e1 100644
--- a/pkgs/by-name/ze/zenity/package.nix
+++ b/pkgs/by-name/ze/zenity/package.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zenity";
-  version = "4.1.90";
+  version = "4.2.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/zenity/${lib.versions.majorMinor finalAttrs.version}/zenity-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vzZ5xiBf9I3OvR4d/zo6SmoLOlPhy8OwmKnsC2K9cjY=";
+    hash = "sha256-X5gzQMb6VfT6tal2nQdxss3xNl4sFYrBHMFv/Ykva80=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ze/zeno/package.nix b/pkgs/by-name/ze/zeno/package.nix
new file mode 100644
index 000000000000..f553c0326ce3
--- /dev/null
+++ b/pkgs/by-name/ze/zeno/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+buildGoModule (finalAttrs: {
+  pname = "zeno";
+  version = "2.0.17";
+
+  src = fetchFromGitHub {
+    owner = "internetarchive";
+    repo = "Zeno";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RPWvn4FEK1Fpkvvud/1CaSFFvTV1zxjzvXbBjqWRCIQ=";
+  };
+
+  vendorHash = "sha256-Zi7wmT72f8KJHkysGg8rWTUk8iMjlYDGeZUFvKmtQtk=";
+
+  env.CGO_ENABLED = true;
+  ldFlags = [
+    "-s"
+    "-w"
+  ];
+
+  # Attempts to access internet
+  doCheck = false;
+
+  meta = {
+    description = "State-of-the-art web crawler";
+    longDescription = ''
+      Zeno is a web crawler designed to operate wide crawls or to simply
+      archive one web page. Zeno's key concepts are: portability,
+      performance, simplicity. With an emphasis on performance.
+    '';
+    homepage = "https://github.com/internetarchive/Zeno";
+    changelog = "https://github.com/internetarchive/Zeno/releases/tag/v${finalAttrs.version}";
+    mainProgram = "Zeno";
+    license = lib.licenses.agpl3Only;
+    maintainers = [ lib.maintainers.RossSmyth ];
+  };
+})
diff --git a/pkgs/by-name/ze/zenstates/package.nix b/pkgs/by-name/ze/zenstates/package.nix
index ea07fc018122..58e63ce31b87 100644
--- a/pkgs/by-name/ze/zenstates/package.nix
+++ b/pkgs/by-name/ze/zenstates/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     mainProgram = "zenstates";
     homepage = "https://github.com/r4m0n/ZenStates-Linux";
     license = licenses.mit;
-    maintainers = with maintainers; [ savannidgerinel ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ze/zerobin/package.nix b/pkgs/by-name/ze/zerobin/package.nix
index 679aa4ce5e44..c267b38d883b 100644
--- a/pkgs/by-name/ze/zerobin/package.nix
+++ b/pkgs/by-name/ze/zerobin/package.nix
@@ -62,7 +62,8 @@ python3Packages.buildPythonApplication rec {
 
   meta = with lib; {
     description = "Client side encrypted pastebin";
-    homepage = "https://0bin.net/";
+    homepage = "https://github.com/Tygs/0bin";
+    changelog = "https://github.com/Tygs/0bin/releases/tag/v${version}";
     license = licenses.wtfpl;
     platforms = platforms.all;
     maintainers = with maintainers; [ julm ];
diff --git a/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
index 475655f94a56..bb4bb976df25 100644
--- a/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
+++ b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
@@ -1,7 +1,7 @@
-From f71d88a15f537cbc5ea80ad2922c013553a5caab Mon Sep 17 00:00:00 2001
+From 1bc576196d82b801df4e52548808068c4cb9ab9e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Fri, 21 Jun 2024 14:43:03 +0200
-Subject: [PATCH 2/2] darwin: disable link-time optimization
+Subject: [PATCH 1/2] darwin: disable link-time optimization
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,18 +15,18 @@ Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/make-mac.mk b/make-mac.mk
-index 7af200ad..b388c05a 100644
+index e63fb7f88..3cf0be175 100644
 --- a/make-mac.mk
 +++ b/make-mac.mk
-@@ -84,7 +84,7 @@ ifeq ($(ZT_DEBUG),1)
+@@ -89,7 +89,7 @@ ifeq ($(ZT_DEBUG),1)
  node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS)
  else
- 	CFLAGS?=-Ofast -fstack-protector-strong
+ 	CFLAGS?=-O3 -fstack-protector-strong
 -	CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 +	CFLAGS+=$(ARCH_FLAGS) -Wall -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
  	STRIP=strip
  	EXTRA_CARGO_FLAGS=--release
  	RUST_VARIANT=release
 -- 
-2.44.1
+2.51.0
 
diff --git a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
deleted file mode 100644
index 0db2b4d26fa2..000000000000
--- a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b83e6354de099860bcb1ca3876c222c57de89f0c Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Mon, 10 Feb 2025 18:03:12 +0700
-Subject: [PATCH] rustfsm: remove unsupported `lints.workspace`
-
-This patch will no longer be necessary when
-https://github.com/NixOS/nixpkgs/pull/300532 is merged
----
- fsm/Cargo.toml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/fsm/Cargo.toml b/fsm/Cargo.toml
-index 5e9e1c9..3fda704 100644
---- a/fsm/Cargo.toml
-+++ b/fsm/Cargo.toml
-@@ -17,5 +17,3 @@ rustfsm_trait = { version = "0.1", path = "rustfsm_trait" }
- [package.metadata.workspaces]
- independent = true
- 
--[lints]
--workspace = true
--- 
-2.46.0
-
diff --git a/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch b/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch
new file mode 100644
index 000000000000..2b2c67023b25
--- /dev/null
+++ b/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch
@@ -0,0 +1,52 @@
+From 5c6f3e6c8c33e23b8bb3fe39b9ce26495724af09 Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer <danielrf12@gmail.com>
+Date: Sat, 4 Oct 2025 19:27:19 -0700
+Subject: [PATCH 2/2] Support single arch builds on macOS
+
+Co-Authored-By: Michael Hoang <enzime@users.noreply.github.com>
+---
+ make-mac.mk | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/make-mac.mk b/make-mac.mk
+index 3cf0be175..8da630e90 100644
+--- a/make-mac.mk
++++ b/make-mac.mk
+@@ -5,7 +5,8 @@ TOPDIR=$(shell pwd)
+ INCLUDES=-I$(shell pwd)/rustybits/target -isystem $(TOPDIR)/ext  -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/core/include -I$(TOPDIR)/ext-prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/simpleapi/include
+ DEFS=
+ LIBS=
+-ARCH_FLAGS=-arch x86_64 -arch arm64
++ARCH := x86_64 arm64
++ARCH_FLAGS=$(addprefix -arch ,$(ARCH))
+ 
+ CODESIGN=echo
+ PRODUCTSIGN=echo
+@@ -79,6 +80,7 @@ endif
+ # Debug mode -- dump trace output, build binary with -g
+ ifeq ($(ZT_DEBUG),1)
+ 	ZT_TRACE=1
++	ARCH=
+ 	ARCH_FLAGS=
+ 	CFLAGS+=-Wall -g $(INCLUDES) $(DEFS) $(ARCH_FLAGS)
+ 	STRIP=echo
+@@ -156,12 +158,12 @@ rustybits/target/libsmeeclient.a:	FORCE
+ endif
+ 
+ rustybits/target/libzeroidc.a:	FORCE
+-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
+-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
+-	cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a
++	if [[ "$(ARCH)" == *"x86_64"* ]]; then cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS); fi
++	if [[ "$(ARCH)" == *"arm64"* ]]; then cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS); fi
++	cd rustybits && lipo -create target/*/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a
+ 
+ central-controller:
+-	make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one
++	make ARCH=x86_64 ZT_CONTROLLER=1 one
+ 
+ zerotier-idtool: one
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix
index 6b258b96a046..1969a933aef6 100644
--- a/pkgs/by-name/ze/zerotierone/package.nix
+++ b/pkgs/by-name/ze/zerotierone/package.nix
@@ -12,18 +12,20 @@
   rustc,
   zlib,
   libiconv,
-  fetchpatch,
+  # enableUnfree enables building the zerotier controller, which is subject to
+  # a source-available license that permits non-commercial use
+  enableUnfree ? false,
 }:
 
 let
   pname = "zerotierone";
-  version = "1.14.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "ZeroTierOne";
     tag = version;
-    hash = "sha256-D+7/ja5uYzH1iNd+Ti3k+dWOf5GvN4U+GuVBA9gxtTc=";
+    hash = "sha256-bFfRz695sbdZJd5DIfF7j8lbEqWHSaIqHq/AfXZgZ4s=";
   };
 
 in
@@ -33,23 +35,13 @@ stdenv.mkDerivation {
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     sourceRoot = "${src.name}/rustybits";
-    hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ=";
-
-    # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged
-    postBuild = ''
-      pushd $out/git/730aadcc02767ae630e88f8f8c788a85d6bc81e6
-      patch --verbose -p1 <${./0001-rustfsm-remove-unsupported-lints.workspace.patch}
-      popd
-    '';
+    hash = "sha256-u3gqETbn4I+mtUeSkSym4s+qhA3eDb4Qaq7bl58M+AY=";
   };
 
   patches = [
     ./0001-darwin-disable-link-time-optimization.patch
     # https://github.com/zerotier/ZeroTierOne/pull/2435
-    (fetchpatch {
-      url = "https://github.com/zerotier/ZeroTierOne/commit/8f56d484b681ea30cd28e19cab34499acfa6e64d.patch";
-      hash = "sha256-UplkX2O4o8XKKTlR3ZsSG9E0y5gVhAagyepqwyGEYmA=";
-    })
+    ./0002-Support-single-arch-builds-on-macOS.patch
   ];
 
   postPatch = ''
@@ -112,9 +104,12 @@ stdenv.mkDerivation {
   buildFlags = [
     "all"
     "selftest"
-  ];
+  ]
+  ++ lib.optional enableUnfree "ZT_NONFREE=1";
+
+  # darwin: disabled due to a test which fails to bind to 127.0.0.1 in a sandbox.
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin;
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   checkPhase = ''
     runHook preCheck
     ./zerotier-selftest
@@ -147,7 +142,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = "https://www.zerotier.com";
-    license = licenses.bsl11;
+    license = if enableUnfree then licenses.unfree else licenses.mpl20;
     maintainers = with maintainers; [
       sjmackenzie
       zimbatm
diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix
index f5b8a81bf02d..0a6b95bb02f5 100644
--- a/pkgs/by-name/ze/zet/package.nix
+++ b/pkgs/by-name/ze/zet/package.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ze/zeyple/package.nix b/pkgs/by-name/ze/zeyple/package.nix
index 7bf788f6ea8d..943cf8dc9c10 100644
--- a/pkgs/by-name/ze/zeyple/package.nix
+++ b/pkgs/by-name/ze/zeyple/package.nix
@@ -17,9 +17,19 @@ python3Packages.buildPythonApplication {
     sha256 = "0r2d1drg2zvwmn3zg0qb32i9mh03r5di9q1yszx23r32rsax9mxh";
   };
 
+  # SafeConfigParser was deprecated in Python 3.12: https://github.com/infertux/zeyple/issues/76
+  postPatch = ''
+    substituteInPlace zeyple/zeyple.py \
+      --replace-fail 'from configparser import SafeConfigParser' 'from configparser import ConfigParser as SafeConfigParser'
+  '';
+
   propagatedBuildInputs = [ python3Packages.gpgme ];
   installPhase = ''
-    install -Dm755 $src/zeyple/zeyple.py $out/bin/zeyple
+    runHook preInstall
+
+    install -Dm755 zeyple/zeyple.py $out/bin/zeyple
+
+    runHook postInstall
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix
index 5dda2cbf9661..1f3cea51152d 100644
--- a/pkgs/by-name/zf/zf/package.nix
+++ b/pkgs/by-name/zf/zf/package.nix
@@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
       mmlb
     ];
     mainProgram = "zf";
diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
index 3536c881cae6..2c894ab0d819 100644
--- a/pkgs/by-name/zi/zigbee2mqtt/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix
@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zigbee2mqtt";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     tag = finalAttrs.version;
-    hash = "sha256-tPjIfFAXtezdHDXBSAYLRPYd0G4p1XnU9R36YBRkYTQ=";
+    hash = "sha256-50f5cSwrLiGfMeb3pqOc+599f0y8vG/7emQO1GLrO/4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-E4FAtOa8FQnPbv0wiMdp1k/L/RYoVOLMPZynag5iGjM=";
+    hash = "sha256-Z8wZX4kGvCG6uAwBxhtY8kFn7WPid8PuxPFjr95nE/I=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix
index e62e6af6b995..786afde2d789 100644
--- a/pkgs/by-name/zi/zine/package.nix
+++ b/pkgs/by-name/zi/zine/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
     ];
     mainProgram = "zine";
   };
diff --git a/pkgs/by-name/zi/zipline/package.nix b/pkgs/by-name/zi/zipline/package.nix
index d6eb64956ceb..ba65f44c4cc1 100644
--- a/pkgs/by-name/zi/zipline/package.nix
+++ b/pkgs/by-name/zi/zipline/package.nix
@@ -32,13 +32,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zipline";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchFromGitHub {
     owner = "diced";
     repo = "zipline";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tQRfgLU0Dvf3vhELsttprfzscvHUgI1u7k9RA4S4vqo=";
+    hash = "sha256-t83LYLjAdXQkQKZlzaBCIs1wKk3v3GVQi8QHUPRHC18=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse --short HEAD > $out/.git_head
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-zbr57RVBKGpnL5u0evbQAKGyMftHXj6cuntYBHiUxiM=";
+    hash = "sha256-i5unHz7Hs9zvnjgLwHJaoFdM2z/5ucXZG8eouko1Res=";
   };
 
   buildInputs = [
@@ -67,7 +67,9 @@ stdenv.mkDerivation (finalAttrs: {
     python3
   ];
 
-  env = environment;
+  env = environment // {
+    DATABASE_URL = "dummy";
+  };
 
   buildPhase = ''
     runHook preBuild
@@ -116,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgram = "${placeholder "out"}/bin/ziplinectl";
   versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "DATABASE_URL" ];
   doInstallCheck = true;
 
   passthru = {
diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index db8f2685ba1b..1ec7ad36259b 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  rust-jemalloc-sys,
   installShellFiles,
   nix-update-script,
   rustPlatform,
@@ -10,16 +11,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.13.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-D4SJFueWUUABkJeKpgVywoJcQETVKCFA9dYisFIh11I=";
+    hash = "sha256-B1FdgH8IKvcrynFENgpmwAZC/vbKfHVGvyV8bJMFh7k=";
   };
 
-  cargoHash = "sha256-7MKTw1XeZk4VYRA3q24iEGD/gXs+Uy0XC090kx+/Z5I=";
+  cargoHash = "sha256-1Mf1/ReLrwD/0TE/PhTicMW80oCehAuTy7taztwg6aE=";
+
+  buildInputs = [
+    rust-jemalloc-sys
+  ];
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
diff --git a/pkgs/by-name/zl/zlint/package.nix b/pkgs/by-name/zl/zlint/package.nix
index a2e1b497c529..ff92681b975e 100644
--- a/pkgs/by-name/zl/zlint/package.nix
+++ b/pkgs/by-name/zl/zlint/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "zlint";
-  version = "3.6.7";
+  version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "zmap";
     repo = "zlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qd6QqOeSfLpXwbni8wqmG5X9zYXDXwAxRotCws4AWsA=";
+    hash = "sha256-Mi7ySXVqnL/LVi4YS1r4hBcM/JrjThJEkw3+1k1vjRQ=";
   };
 
   modRoot = "v3";
diff --git a/pkgs/by-name/zm/zmqpp/package.nix b/pkgs/by-name/zm/zmqpp/package.nix
index 02a46f02e982..171872f3ed8c 100644
--- a/pkgs/by-name/zm/zmqpp/package.nix
+++ b/pkgs/by-name/zm/zmqpp/package.nix
@@ -7,15 +7,15 @@
   zeromq,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zmqpp";
   version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "zmqpp";
-    rev = version;
-    sha256 = "08v34q3sd8g1b95k73n7jwryb0xzwca8ib9dz8ngczqf26j8k72i";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-UZyJpBEOf/Ys+i2tiBTjv4PlM5fHjjNLWuGhpgcmYyM=";
   };
 
   outputs = [
@@ -30,11 +30,16 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zeromq ];
 
-  meta = with lib; {
-    inherit (src.meta) homepage;
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
+    homepage = "https://github.com/zeromq/zmqpp";
     description = "C++ wrapper for czmq. Aims to be minimal, simple and consistent";
-    license = licenses.lgpl3;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [ chris-martin ];
+    license = lib.licenses.lgpl3Plus;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ chris-martin ];
   };
-}
+})
diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index d186ea9f002f..cc06292c12f4 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-09-02";
+  version = "3.7.2-2-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "4e4a529c3b63c7d4c7897ba736f1cd52cc163134";
-    hash = "sha256-aRQQAG0qZOrkdbQoQRXeddhMmQaB+/ESD6Ba+q4UIlI=";
+    rev = "eab7bf421ca319e3096b3b5192c7b0c32647c335";
+    hash = "sha256-vG/btpXRI/8G98iakevtHOG4yEOx7EsrWHCLApAIQMQ=";
   };
 
   vendorHash = "sha256-urXYBv8+C2jwnr5PjXz7nUyX/Gz4wmtS76UTXFqfQFk=";
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index 380b52d1de21..1d2bdd9cefe5 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/nix-community/zon2nix/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
-      figsoda
       RossComputerGuy
     ];
     inherit (zig_0_14.meta) platforms;
diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 54bcc294ed12..287782ce0350 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -54,25 +54,25 @@ let
   # Zoom versions are released at different times per platform and often with different versions.
   # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.6.0.64511";
-  versions.x86_64-darwin = "6.6.0.64511";
+  versions.aarch64-darwin = "6.6.6.67409";
+  versions.x86_64-darwin = "6.6.6.67409";
 
   # This is the fallback version so that evaluation can produce a meaningful result.
-  versions.x86_64-linux = "6.6.0.4410";
+  versions.x86_64-linux = "6.6.6.5306";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-2GdiJ/2K3TDF6nvVaIBVLJHgasx1e22aS4rhP30L2/o=";
+      hash = "sha256-puoU/uTKkx9X2ZhnS0+YIzDwrt1M0tHSIFdb5tAnwB0=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-td0EltgpfSGlyo9Pg/4qS8qUdELP+A97iY9z3g19MW8=";
+      hash = "sha256-ZtVMXFO1Aa/CVBBMtO1Kqjzp9I0kuYF+CsAXPHseY9E=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-KTg6VO1GT/8ppXFevGDx0br9JGl9rdUtuBzHmnjiOuk=";
+      hash = "sha256-a8Yngk6KwBsUCouv5FFfEZQheJSU88grlQm27qhANRw=";
     };
   };
 
@@ -175,6 +175,7 @@ let
       pkgs.glib.dev
       pkgs.gtk3
       pkgs.libGL
+      pkgs.libGLU
       pkgs.libdrm
       pkgs.libgbm
       pkgs.libkrb5
diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix
index f7aaebb8993f..9a0cec7b3630 100644
--- a/pkgs/by-name/zo/zotero/darwin.nix
+++ b/pkgs/by-name/zo/zotero/darwin.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";
-    hash = "sha256-DeiQbg8wMFHsJ/jlbGj3wdXrRsGLJ0tOyGRex2w43lU=";
+    hash = "sha256-YivHBEFPkm79y2R5QIV+trm8O3aFzvXTqVzFr1tcoIo=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
index f0626da413fa..2d84e0bbe7f2 100644
--- a/pkgs/by-name/zo/zotero/linux.nix
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    hash = "sha256-L2Mvi11X4YBU4ezHDJosl7qHClmzUwmghvXG8TChA8c=";
+    hash = "sha256-ce0Lvz0k3DH6rGzdGoqYIW1OBiaJwaxn8pDnMQbqtv4=";
   };
 
   dontPatchELF = true;
diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix
index 7abf2bd8e4e8..1bfda3290939 100644
--- a/pkgs/by-name/zo/zotero/package.nix
+++ b/pkgs/by-name/zo/zotero/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "zotero";
-  version = "7.0.20";
+  version = "7.0.27";
   meta = {
     homepage = "https://www.zotero.org";
     description = "Collect, organize, cite, and share your research sources";
diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 7e833921b438..d9e449a4e57f 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zpaqfranz";
-  version = "63.1";
+  version = "63.5";
 
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
     rev = finalAttrs.version;
-    hash = "sha256-j8UmKCiwlFPmrlBA7rr9qlejxYKkXrH1i3Qd0MhO3YU=";
+    hash = "sha256-hgT11teZQOzaJ89zg0dOLcEgJRrdSUpKpEwyQwULhPg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix
index 065642d495db..13b449e7dba8 100644
--- a/pkgs/by-name/zp/zps/package.nix
+++ b/pkgs/by-name/zp/zps/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/orhun/zps";
     changelog = "https://github.com/orhun/zps/releases/tag/${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "zps";
   };
diff --git a/pkgs/by-name/zs/zsh-autosuggestions/package.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
index 9afe6b870916..1710b482d7b8 100644
--- a/pkgs/by-name/zs/zsh-autosuggestions/package.nix
+++ b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
@@ -20,8 +20,12 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   installPhase = ''
+    install -D zsh-autosuggestions.plugin.zsh \
+      $out/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
     install -D zsh-autosuggestions.zsh \
-      $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+      $out/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+    ln -s $out/share/zsh/plugins/zsh-autosuggestions \
+      $out/share/zsh-autosuggestions
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zs/zsh-bd/package.nix b/pkgs/by-name/zs/zsh-bd/package.nix
index 843ffc135ca5..24d1d8c390c0 100644
--- a/pkgs/by-name/zs/zsh-bd/package.nix
+++ b/pkgs/by-name/zs/zsh-bd/package.nix
@@ -19,10 +19,16 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/share/zsh-bd
-    cp {.,$out/share/zsh-bd}/bd.zsh
-    cd $out/share/zsh-bd
-    ln -s bd{,.plugin}.zsh
+    runHook preInstall
+
+    install -D bd.zsh \
+      $out/share/plugins/zsh-bd/bd.zsh
+    ln -s $out/share/plugins/zsh-bd/bd.zsh \
+      $out/share/plugins/zsh-bd/bd.plugin.zsh
+    ln -s $out/share/plugins/zsh-bd \
+      $out/share/zsh-bd
+
+    runHook postInstall
   '';
 
   meta = {
diff --git a/pkgs/by-name/zs/zsh-completion-sync/package.nix b/pkgs/by-name/zs/zsh-completion-sync/package.nix
new file mode 100644
index 000000000000..d094b8964c78
--- /dev/null
+++ b/pkgs/by-name/zs/zsh-completion-sync/package.nix
@@ -0,0 +1,36 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "zsh-completion-sync";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "BronzeDeer";
+    repo = "zsh-completion-sync";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-GTW4nLVW1/09aXNnZJuKs12CoalzWGKB79VsQ2a2Av4=";
+  };
+
+  strictDeps = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    install -D zsh-completion-sync.plugin.zsh  $out/share/zsh-completion-sync/zsh-completion-sync.plugin.zsh
+  '';
+
+  meta = {
+    description = "Automatically loads completions added dynamically to FPATH or XDG_DATA_DIRS";
+    homepage = "https://github.com/BronzeDeer/zsh-completion-sync";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      ambroisie
+      BronzeDeer
+    ];
+  };
+})
diff --git a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
index d3b6129e4592..d7cbdab2ef1c 100644
--- a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
+++ b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    plugindir="$out/share/zsh/site-functions"
+    plugindir="$out/share/zsh/plugins/fast-syntax-highlighting"
 
     mkdir -p "$plugindir"
     cp -r -- {,_,-,.}fast-* *chroma themes "$plugindir"/
diff --git a/pkgs/by-name/zs/zsh-history-substring-search/package.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
index e291025f6ee1..61af2fec16ac 100644
--- a/pkgs/by-name/zs/zsh-history-substring-search/package.nix
+++ b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
@@ -17,8 +17,12 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   installPhase = ''
+    install -D zsh-history-substring-search.plugin.zsh \
+      "$out/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh"
     install -D zsh-history-substring-search.zsh \
-      "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
+      "$out/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh"
+    ln -s $out/share/zsh/plugins/zsh-history-substring-search \
+      $out/share/zsh-history-substring-search
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zs/zsh-nix-shell/package.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix
index 75bf5db1c4e5..48d4c6497796 100644
--- a/pkgs/by-name/zs/zsh-nix-shell/package.nix
+++ b/pkgs/by-name/zs/zsh-nix-shell/package.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
   strictDeps = true;
   buildInputs = [ bash ];
   installPhase = ''
-    install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell
-    install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts
+    install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh/plugins/zsh-nix-shell
+    install -D scripts/* --target-directory=$out/share/zsh/plugins/zsh-nix-shell/scripts
+    ln -s $out/share/zsh/plugins/zsh-nix-shell $out/share/zsh-nix-shell
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
index 2435105d33d0..cbc33168774e 100644
--- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
@@ -32,11 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k
-    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k
-    install -D config/* --target-directory=$out/share/zsh-powerlevel10k/config
-    install -D internal/* --target-directory=$out/share/zsh-powerlevel10k/internal
-    cp -R gitstatus $out/share/zsh-powerlevel10k/gitstatus
+    install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh/themes/powerlevel10k
+    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh/themes/powerlevel10k
+    install -D config/* --target-directory=$out/share/zsh/themes/powerlevel10k/config
+    install -D internal/* --target-directory=$out/share/zsh/themes/powerlevel10k/internal
+    cp -R gitstatus $out/share/zsh/themes/powerlevel10k/gitstatus
+    ln -s $out/share/zsh/themes/powerlevel10k $out/share/zsh-powerlevel10k
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/zs/zsh-powerlevel9k/package.nix b/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
index a9ec9e8d1a00..e66aa6e9995d 100644
--- a/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation {
 
   strictDeps = true;
   installPhase = ''
-    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel9k
-    install -D functions/* --target-directory=$out/share/zsh-powerlevel9k/functions
+    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh/themes/powerlevel9k
+    install -D functions/* --target-directory=$out/share/zsh/themes/powerlevel9k/functions
+    ln -s $out/share/zsh/themes/powerlevel9k $out/share/zsh-powerlevel9k
   '';
 
   meta = {
diff --git a/pkgs/by-name/zs/zsv/package.nix b/pkgs/by-name/zs/zsv/package.nix
index b057b2d47c2a..238adbef4db5 100644
--- a/pkgs/by-name/zs/zsv/package.nix
+++ b/pkgs/by-name/zs/zsv/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsv";
-  version = "0.4.4-alpha";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "liquidaty";
     repo = "zsv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XZE7jMQaPP2B1OIlkHucNrtiJy8wMEVY9gcc5X4FyNI=";
+    hash = "sha256-o5n6pUMdirtNsLAi17+sp0xteFCfFUcr2k8q57pTW2A=";
   };
 
   nativeBuildInputs = [ perl ];
diff --git a/pkgs/by-name/zs/zsync2/package.nix b/pkgs/by-name/zs/zsync2/package.nix
index c39eee9baa76..ead4189ad33a 100644
--- a/pkgs/by-name/zs/zsync2/package.nix
+++ b/pkgs/by-name/zs/zsync2/package.nix
@@ -2,33 +2,24 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   libgcrypt,
   libcpr,
   libargs,
+  zlib,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsync2";
-  version = "2.0.0-alpha-1-20230304";
+  version = "2.0.0-alpha-1-20250926";
 
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "zsync2";
     rev = finalAttrs.version;
-    hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0=";
+    hash = "sha256-dbIe47cDaQJAOiHcLRwEbLgvrDUHOnPkYqDbkX74gZk=";
   };
 
-  patches = [
-    # Add missing cstdint includes
-    (fetchpatch {
-      url = "https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch";
-      hash = "sha256-iLXxD6v+pSwFKmwAEyzbYUJ3DmtpvV/DYr8kcD+t5Cg=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'VERSION "2.0.0-alpha-1"' 'VERSION "${finalAttrs.version}"' \
@@ -46,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     libcpr
     libargs
+    zlib
   ];
 
   cmakeFlags = [
@@ -53,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_ARGS" true)
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  env.NIX_CFLAGS_COMPILE = "-lz -Wno-error=incompatible-pointer-types";
 
   meta = {
     description = "Rewrite of the advanced file download/sync tool zsync";
diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix
index 5640918d8c55..9113ff02aca3 100644
--- a/pkgs/by-name/zt/ztags/package.nix
+++ b/pkgs/by-name/zt/ztags/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Generate tags files for Zig projects";
     homepage = "https://github.com/gpanders/ztags";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ztags";
     inherit (zig.meta) platforms;
   };
diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix
index a1ba2288f0d2..f072b38cec86 100644
--- a/pkgs/by-name/zu/zuban/package.nix
+++ b/pkgs/by-name/zu/zuban/package.nix
@@ -8,18 +8,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zuban";
 
-  version = "0.0.23";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "zubanls";
     repo = "zuban";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EPF1HW/oqUKHLTorkO3C+X+ziq6i1lCxGY5y1ioKg6A=";
+    hash = "sha256-nSQf3I9O5TP1V8kwJrcBRREqS/47UlILx3IZMmt5ljQ=";
   };
 
   buildAndTestSubdir = "crates/zuban";
 
-  cargoHash = "sha256-TAFdS4NmXchmhqVRcsckz6GhZG35IE2fukDlZiRF8Ms=";
+  cargoHash = "sha256-Q09ZUBVa52fXIKiL6aC9VZB+4Rt/hI045CIjb/t3Xyg=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix
index ee4103805ed4..91dd61297ad7 100644
--- a/pkgs/by-name/zu/zulip-term/package.nix
+++ b/pkgs/by-name/zu/zulip-term/package.nix
@@ -29,25 +29,35 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "zulip-term";
-  version = "0.7.0";
+  version = "0.7.0-unstable-2025-05-19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-terminal";
-    rev = "refs/tags/${version}";
-    hash = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
+    rev = "8e5c0357c8746df64ac427d5db3d2cb0f002f975";
+    hash = "sha256-DW3GZ1hY/wZ6P/djPUlAvNIFcBV994FLJ3aiPfDVUBM=";
   };
 
   patches = [
     ./pytest-executable-name.patch
   ];
 
-  nativeBuildInputs = with py.pkgs; [
+  build-system = with py.pkgs; [
     setuptools
   ];
 
-  propagatedBuildInputs = with py.pkgs; [
+  pythonRelaxDeps = [
+    # zulip-term sets these versions for compat with python 3.6/3.7
+    "lxml"
+    "pygments"
+    "typing_extensions"
+    "tzlocal"
+    "urwid_readline"
+    "zulip"
+  ];
+
+  dependencies = with py.pkgs; [
     beautifulsoup4
     lxml
     pygments
@@ -70,6 +80,13 @@ buildPythonApplication rec {
     pytest-mock
   ]);
 
+  disabledTests = [
+    # these break the build but don't seem to affect
+    # the application at all
+    "test_soup2markup"
+    "test_main_help"
+  ];
+
   makeWrapperArgs = [
     "--prefix"
     "PATH"
diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix
index b1d2591220bb..48c39bf3d9ef 100644
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-server";
-  version = "3.2.1";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-server";
     rev = version;
-    hash = "sha256-oZA+tMYxiWc+PiPiqGEJpEa434CqNjPbutBWjXBgmhw=";
+    hash = "sha256-JmPO1faJgpJ+RjocvauP0EQGken61G59CLqQAZiRSUU=";
   };
 
-  npmDepsHash = "sha256-1JgfXF3kNuUj0jprKBsJSPeFH6ZpqpU4lceTQm5FBgg=";
+  npmDepsHash = "sha256-lCJ4dcLIv+PQkoNdaP9FsXbWIzy2sdooQw08ZVbESCM=";
 
   # For some reason the zwave-js dependency is in devDependencies
   npmFlags = [ "--include=dev" ];
diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index f7b03c41bcc0..380fd85a7b01 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.4.1";
+  version = "11.6.1";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-28FaP8T5TllbibUPJIQBgmnR8Bc4dXWyIS2AGSY0YtE=";
+    hash = "sha256-SNxwZw4ebcngUD6EEI9GGAsxhcR6wQBs2sdnmuZycmw=";
   };
-  npmDepsHash = "sha256-OEewVf9CL17Koq2bFE0rOjPaBIgotSo8iHWl3Lp/chk=";
+  npmDepsHash = "sha256-Aec2IWCeeOTrHMfk1uqCHNL30Kbsa5uCf4NkZc+Q4rA=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 
diff --git a/pkgs/by-name/zx/zxpy/package.nix b/pkgs/by-name/zx/zxpy/package.nix
index f107171d1185..3a89e406979c 100644
--- a/pkgs/by-name/zx/zxpy/package.nix
+++ b/pkgs/by-name/zx/zxpy/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/tusharsadhwani/zxpy";
     changelog = "https://github.com/tusharsadhwani/zxpy/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "zxpy";
   };
 }
diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix
index ac7e8c2ce677..1de84b0ff499 100644
--- a/pkgs/data/icons/bibata-cursors/translucent.nix
+++ b/pkgs/data/icons/bibata-cursors/translucent.nix
@@ -25,6 +25,6 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ AdsonCicilioti ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/data/icons/la-capitaine-icon-theme/default.nix b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
index 05d115b2be91..bf0df6858f0c 100644
--- a/pkgs/data/icons/la-capitaine-icon-theme/default.nix
+++ b/pkgs/data/icons/la-capitaine-icon-theme/default.nix
@@ -15,8 +15,8 @@ stdenvNoCC.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "keeferrourke";
     repo = "la-capitaine-icon-theme";
-    rev = "v${version}";
-    sha256 = "0id2dddx6rl71472l47vafx968wnklmq6b980br68w82kcvqczzs";
+    tag = "v${version}";
+    hash = "sha256-+n+GN5sCcWTyAigtgyudliOTulP7ECoOCYdm01trokU=";
   };
 
   propagatedBuildInputs = [
@@ -40,6 +40,7 @@ stdenvNoCC.mkDerivation rec {
     mkdir -p $out/share/icons/$pname
     cp -a * $out/share/icons/$pname
     rm $out/share/icons/$pname/{configure,COPYING,LICENSE,*.md}
+    cp "$out/share/icons/$pname/places/scalable/"distributor-logo-{archlinux,debian,kubuntu}.svg "$out/share/icons/$pname/apps/scalable/"
     runHook postInstall
   '';
 
diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index e0558ce70c38..295f595a57b1 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -39,6 +39,13 @@ stdenv.mkDerivation {
 
   dontWrapQtApps = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace {icons,icons-dark}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     for theme in $out/share/icons/*; do
       gtk-update-icon-cache $theme
diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index e4ae29b56beb..907e51a6e5cf 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "25.10.04.2";
+  version = "25.10.26";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme";
     rev = version;
-    sha256 = "sha256-im3stA90tyn1JOx8ygF0nnPk+xeJMQB6sShYy8Kk3Hw=";
+    sha256 = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/data/json-schema/default.nix b/pkgs/data/json-schema/default.nix
index f12bab479074..5033e5b1f71b 100644
--- a/pkgs/data/json-schema/default.nix
+++ b/pkgs/data/json-schema/default.nix
@@ -24,5 +24,5 @@ let
 in
 {
   # Exported to `pkgs`
-  inherit jsonSchemaCatalogs;
+  jsonSchemaCatalogs = lib.recurseIntoAttrs jsonSchemaCatalogs;
 }
diff --git a/pkgs/data/misc/hackage/pin.json b/pkgs/data/misc/hackage/pin.json
index 3f9a293f08ae..c14222511324 100644
--- a/pkgs/data/misc/hackage/pin.json
+++ b/pkgs/data/misc/hackage/pin.json
@@ -1,6 +1,6 @@
 {
-  "commit": "c074fec58a2c83bfb17c273302005fe2625207f1",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c074fec58a2c83bfb17c273302005fe2625207f1.tar.gz",
-  "sha256": "1my6xrg3m694fr3k5386yx5wqd2j0wdxfx6g3scnh5af0sx2hx0w",
-  "msg": "Update from Hackage at 2025-09-14T21:34:10Z"
+  "commit": "598216fa2815cc50449239d72043b12a04a83709",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/598216fa2815cc50449239d72043b12a04a83709.tar.gz",
+  "sha256": "030yfbdzzdsxfjin97kl1kzqqnvkvjvjfns3p84xkq59fw8096cr",
+  "msg": "Update from Hackage at 2025-10-22T21:20:29Z"
 }
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index 4814232fbfe7..180cc89b8dd7 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,5 +1,5 @@
-{ callPackage }:
+{ callPackage, lib }:
 
 {
-  wallpapers = callPackage ./wallpapers.nix { };
+  wallpapers = lib.recurseIntoAttrs (callPackage ./wallpapers.nix { });
 }
diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
index d808ae3690a8..f90fa9a68697 100644
--- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   extra-cmake-modules,
   wrapQtAppsHook,
@@ -23,6 +24,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-ef63PVG0JOHY4zyq5M5oAAcxtfhm1XOvpsxgSeXvgDo=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/matinlotfali/KDE-Rounded-Corners/commit/5d63212e65ed06ca65a2a7f0ad2436045b839ddd.patch";
+      hash = "sha256-wfjxMKRmJu3gflldNvWLghw5oFyyxY2ml1lsl/TVzxI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index 9339cdbf3380..2265c3550aed 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -39,6 +39,11 @@ mkDerivation rec {
   };
 
   patches = [
+    # Fix build with CMake 4
+    (fetchpatch {
+      url = "https://github.com/KDE/qtcurve/commit/d2c84577505641e647fbb64bce825b3e0a4129f5.patch";
+      sha256 = "sha256-WBmzlVDxRNXZmi6c03cR1MuIr+hBaeFXgNLzhsv0bZo=";
+    })
     # Remove unnecessary constexpr, this is not allowed in C++14
     (fetchpatch {
       url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch";
diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix
index 8521e6ff85cd..cbbe5d32c719 100644
--- a/pkgs/desktops/enlightenment/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/enlightenment/default.nix
@@ -14,7 +14,7 @@
   libexif,
   pam,
   xkeyboard_config,
-  udisks2,
+  udisks,
   waylandSupport ? false,
   wayland-protocols,
   xwayland,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     libexif
     pam
     xkeyboard_config
-    udisks2 # for removable storage mounting/unmounting
+    udisks # for removable storage mounting/unmounting
   ]
   ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
   ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
diff --git a/pkgs/desktops/expidus/default.nix b/pkgs/desktops/expidus/default.nix
index 2072455e2f6d..3506e1e51699 100644
--- a/pkgs/desktops/expidus/default.nix
+++ b/pkgs/desktops/expidus/default.nix
@@ -1,10 +1,10 @@
 { callPackage, flutterPackages }:
 {
   calculator = callPackage ./calculator {
-    flutter = flutterPackages.v3_24;
+    flutter = flutterPackages.v3_35;
   };
 
   file-manager = callPackage ./file-manager {
-    flutter = flutterPackages.v3_24;
+    flutter = flutterPackages.v3_35;
   };
 }
diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 509e569123c1..c6504c7e8d42 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   boost,
@@ -29,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
     tag = finalAttrs.version;
-    hash = "sha256-dVyel4NL5LFORNTQzOyeTFkt9Wn23+4uwHsKcj+/0rk=";
+    hash = "sha256-e4HyUi8GXImEtM5I7dH27cDceUn+VCFpb9xgbMpQBJU=";
   };
 
   outputs = [
@@ -44,15 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withDocumentation [ "doc" ];
 
-  patches = [
-    # Remove when version > 0.2.1
-    (fetchpatch {
-      name = "0001-lomiri-download-manager-treewide-Make-pkg-config-includedir-values-reasonable.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/230aa1965917f90d235f55477a257eca1f5eaf46.patch";
-      hash = "sha256-Kdmu4U98Yc213pHS0o4DjpG8T5p50Q5hijRgdvscA/c=";
-    })
-  ];
-
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \
diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index fdb5fa86417d..f7fb175bcbd7 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
       --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {
diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 74a5afc95c60..16c946f919be 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -15,24 +15,24 @@
   qttools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.0",
+  version ? "2.3.0",
   qtx11extras ? null,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfm-qt";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libfm-qt";
-    rev = version;
+    tag = finalAttrs.version;
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
-        "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
+        "2.3.0" = "sha256-A0kBwLiPvHIsJWQvg6lwb5lrojU8oDDQYHuC2pTXdPc=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
   nativeBuildInputs = [
@@ -52,15 +52,20 @@ stdenv.mkDerivation rec {
     lxqt-menu-data
     menu-cache
   ]
-  ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]);
+  ++ (lib.optionals (lib.versionAtLeast "2.0.0" finalAttrs.version) [ qtx11extras ]);
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  postPatch = lib.optionals (version == "1.4.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     homepage = "https://github.com/lxqt/libfm-qt";
     description = "Core library of PCManFM-Qt (Qt binding for libfm)";
-    license = licenses.lgpl21Plus;
-    platforms = with platforms; unix;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})
diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 77e9be0f687f..a859514c9b7d 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblxqt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "liblxqt";
     rev = version;
-    hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494=";
+    hash = "sha256-KAteTQRJ7xfh21tYcNoZjvLfWSiUYboasqL5D4YKARo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 3ea0a857efe8..ab9038c110fb 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -8,23 +8,23 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "4.2.0",
+  version ? "4.3.0",
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libqtxdg";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libqtxdg";
-    rev = version;
+    tag = finalAttrs.version;
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
-        "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
+        "4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
   nativeBuildInputs = [
@@ -46,13 +46,18 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  postPatch = lib.optionals (version == "3.12.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/libqtxdg";
     description = "Qt implementation of freedesktop.org xdg specs";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})
diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 3bd04943d3e0..ea2e137cdad0 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lximage-qt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lximage-qt";
     rev = version;
-    hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog=";
+    hash = "sha256-RJKXcaZJe5gyDubdglOmzmJ9XCH0gAW4fc7OR3anCoU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 868b41f1033a..8f54b81c124d 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-about";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-about";
     rev = version;
-    hash = "sha256-StPepm6XWaK1kDAspnBJ4X1/QGqHmSj48RBobJ46Sao=";
+    hash = "sha256-EP0Sd/VvLufqtn/7ZQwdI/h+BJhkGks7jTlEoEqYWgk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index e3fd0d11679f..6aadcee69e73 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-admin";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-admin";
     rev = version;
-    hash = "sha256-Yne4EWP/bgWXa4XNP8oyUtkOfxBRcT4iuV8CpSq2ooY=";
+    hash = "sha256-FzYKmqCd61jLfbyPknsWuf7KpdF+SoAMqeSEZPOYc8w=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index a2c56c066b66..e3fbd1845239 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-archiver";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
     rev = version;
-    hash = "sha256-4xGP/3ft29PFzJ3ty/9wJbv/hqcdTw9U+4xDneKHF8g=";
+    hash = "sha256-57ufvirD1YYEVoFtX/JY8EnMRWZ4ouhbxNm8przg5XA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index abb1611778da..32cf1a6aabd1 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
   perl,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.1",
+  version ? "2.3.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-        "2.2.1" = "sha256-dewsmkma8QHgb3LzRGvfntI48bOaFFsrEDrOznaC8eg=";
+        "2.3.0" = "sha256-lbDcIOrOkGU/n0bPPAlZSsdBYMlBh3afXwwTkTWQLpo=";
       }
       ."${version}";
   };
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
     # Without this, dependants fail to link.
     substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
       --replace-fail AppleClang Clang
+  ''
+  + lib.optionalString (lib.versionOlder version "2.3.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index e5fe0ca54639..60ffcdf745a9 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-config";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-config";
     rev = version;
-    hash = "sha256-iyAqdAWcg94a65lPjq412slvSKdP3W62LTyyvYdWipA=";
+    hash = "sha256-2CAQeX2X0DPmgOaAEJoCLtgjFT+Z6epc/dUCbaEIlB0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index c6b75a2f0ed4..4fffc7cfcacf 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-globalkeys";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-globalkeys";
     rev = version;
-    hash = "sha256-xVirPi0UD4lzOA1+Gw7SgUvFRIc1KYFUJtljNA7xAWo=";
+    hash = "sha256-ahRKkWmr6BkSByE5Vm5oqkkgQQ0Hyh4Ka7PYI8Es7AY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 1a55737e7e44..9a01fd5dc1a4 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-menu-data";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-menu-data";
     rev = version;
-    hash = "sha256-kFgrR7BSl08REC9SgBvLYFhJ9H++FCDQdqQaoAm5Oyw=";
+    hash = "sha256-9TYW3VA4qGlrkUzgZGkxf8RkIW2cTLkY6H8JHGDnoLg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 693e065083d2..dfa381ece604 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-notificationd";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-notificationd";
     rev = version;
-    hash = "sha256-pMBshwqfG/8tvpwuR3wCQ/N5IT1rXJl+nZfcSqxMjM0=";
+    hash = "sha256-VmPVGqCmkTkib2T5ysov1hUY3J74GTuXdJsn5Sivreo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 01d02e823405..9d4c22452038 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-openssh-askpass";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-openssh-askpass";
     rev = version;
-    hash = "sha256-ktB8zlrK3ymnwoGSnWNHM6EGcwn4btdlyBQzBLQdqmY=";
+    hash = "sha256-f8v9HBuL78YOauipCnMRIEydudFilpFJz+KgMlnJWGU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 957287946690..74072939347d 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -33,15 +33,15 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-panel";
-  version = "2.2.2";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-panel";
-    rev = version;
-    hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
+    tag = finalAttrs.version;
+    hash = "sha256-cwemHe092vNRDeseXkGoWAEXawNTVbSiB87owfaLeAo=";
   };
 
   nativeBuildInputs = [
@@ -80,12 +80,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/lxqt-panel";
     description = "LXQt desktop panel";
     mainProgram = "lxqt-panel";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})
diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 6866e0508b69..fda806a7b9ac 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-policykit";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-policykit";
     rev = version;
-    hash = "sha256-TVgrr+Qakkk0rr7qwQPQNO7p5Wx6eVW8lK2gJ/HysZY=";
+    hash = "sha256-Hk8ig9x1UIKpugbJ2x16DsbCmRT0I1AnX/Y5lvP5u4Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index f467a2f42158..f34466040617 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-powermanagement";
     rev = version;
-    hash = "sha256-Awk/NlYd8HldmEL0G/LUgj101Y1BTQBrDJfG56Y/aX4=";
+    hash = "sha256-1TA9v2zrPoHiKUy6P4enmzvxWTD+/rGjrChE5WGMt3c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 8f11a11dbb96..4765a792c437 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -14,15 +14,15 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-qtplugin";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-qtplugin";
-    rev = version;
-    hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
+    tag = finalAttrs.version;
+    hash = "sha256-3rY9VpZKnl1E3ma1ioiKECpazeymQYVuXrLXhRL407o=";
   };
 
   nativeBuildInputs = [
@@ -47,11 +47,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/lxqt-qtplugin";
     description = "LXQt Qt platform integration plugin";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})
diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 7135a93c32f9..4c53248cac49 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-runner";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-runner";
     rev = version;
-    hash = "sha256-lvJuqwBqR/OqDsk2XdjIakxIrnOZjgWrY5DtMUV5XEM=";
+    hash = "sha256-h+pZiSuCdQknsyfUb9Ve1yxVyOUqNgYhIpO7kD5z3pQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index eabe94b4b2bb..647d3889e166 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-session";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-session";
     rev = version;
-    hash = "sha256-AwL7X8ygBkVINMCEcyImUrbwmk/T6/fwk0PEEu6iBb8=";
+    hash = "sha256-5VJxRho6qdPvBFr0RkYaajvVZRwhc1emzqpII+lUyOQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index f98f7c43fdc9..0f56e6889df8 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-sudo";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-sudo";
     rev = version;
-    hash = "sha256-H2uprArYfiX1KyoWx3RRHkLcA0z9LKGDeghD+085VC4=";
+    hash = "sha256-skxPI6KEHXJReadxQinBArkCx/FjpTYDFdEpRRiqx8E=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index f64395c948f9..d004f4d19d32 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-themes";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-themes";
     rev = version;
-    hash = "sha256-oarj+byRfe9xHvtw80kifA2AspXHfigbuDwvi5xqrMQ=";
+    hash = "sha256-sdfLwLYE29Qh0QCU6t5pKIyW2RYx32WRNvNV46nCaXo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 1a4fe48c72e2..20ba7d6d4426 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-wayland-session";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
     rev = version;
-    hash = "sha256-VjOLw6ByS0se9jy1VY4xhBSs26yvoffFVAc1v0gMyYk=";
+    hash = "sha256-MmiYPclMW8Y9VMZsY8wx52S3fN3RzUVrhQAGs5qSTfI=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 74937bcfb22d..35de208fb41c 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol-qt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pavucontrol-qt";
     rev = version;
-    hash = "sha256-D8x3CqzttlNqQgy6k4hfjJkD/MjAG4eeCn68TQA8NSM=";
+    hash = "sha256-6t7nbuC/13S+Q9mINP1WuyaDqZUKp4s9LObcbSRuJ1c=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 2d6f3094be2c..0e64b9e10c79 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcmanfm-qt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pcmanfm-qt";
     rev = version;
-    hash = "sha256-mYjbOb9c7Qc3qhVYt1EHy50YOVguLnwg0NJg2zBgwOM=";
+    hash = "sha256-Pv3N/JfUbLyCBpnmnEHL7i2du1q8vSKxTR1uIEsEe/U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index 8c6e5b8bd261..ff55554a5335 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "qlipper";
-  version = "5.1.2-unstable-2025-07-04";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "pvanek";
     repo = "qlipper";
-    rev = "d3e605fb9d44c523a95e3aac53c7d179a560c85f";
-    hash = "sha256-9V9s0oxWKqd9MHKlkZF3SetrAjHX4cAenAg7as4TLn0=";
+    rev = "4e9fcfe6684c465944baa153aeb7603ec27728b1";
+    hash = "sha256-7qaLY3F67uBtX1wI667MaqtrKLDfeG9jKwlC1pUOteQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 7fa62fb0c3e5..bc21f9b95447 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qps";
-  version = "2.11.1";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qps";
     rev = version;
-    hash = "sha256-uWKTcFO5CoTU5jXB9x5tQ0goEvUpMaeUlMlTG2/xvYg=";
+    hash = "sha256-npTkPcjcxi/hAxUtyayEZeUnVx41iRJThKzhidC+4bQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index d3bdb38a5c04..502f13516799 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qterminal";
     rev = version;
-    hash = "sha256-H1UmPIZG8KiVNPW3GqgnSq39JsZeowiAVwwEKwCkWoM=";
+    hash = "sha256-HwWgVcO9swywei8Z3ifoGJjZ785gdF2A/kBHm4zgzFc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 9cf2f488b91d..75aaee511936 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.0",
+  version ? "2.3.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
-        "2.2.0" = "sha256-tzgHNGB063rgFB15lHTKQplNhwJZtrRprUhMm5H62AA=";
+        "2.3.0" = "sha256-l+IFXiUst9PDNuD/KGzxYCUjymhWvcpMY9CF60gIfKg=";
       }
       ."${version}";
   };
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
+  postPatch = lib.optionals (version == "1.4.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://github.com/lxqt/qtermwidget";
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index ec94d18a1710..eb7c1261fa5a 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtxdg-tools";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qtxdg-tools";
     rev = version;
-    hash = "sha256-hVX1UfPWa1KHMhjazSopAc1/Kk3tnUQzwtG4P7K32eE=";
+    hash = "sha256-v6mIpGuZ3YFb+P9FLlgNp5xf0ceAaVnMxRG+sQLP72Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index f2ef16012680..292985ceb2db 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -20,15 +20,15 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "screengrab";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "screengrab";
-    rev = version;
-    hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
+    tag = finalAttrs.version;
+    hash = "sha256-LORWv3qLgQF2feKodOg72g5DCfWZvB8vi0bw9jbr+tQ=";
   };
 
   nativeBuildInputs = [
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/screengrab";
     description = "Crossplatform tool for fast making screenshots";
     mainProgram = "screengrab";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})
diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 52956cd0bc64..9a45f570dbf7 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -14,15 +14,15 @@
   extraQtStyles ? [ ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-lxqt";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "xdg-desktop-portal-lxqt";
-    rev = version;
-    hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
+    tag = finalAttrs.version;
+    hash = "sha256-DNlvqZzTzZURuHTURBUXaLvMKy2HxVpgI9JwJq6A5Sw=";
   };
 
   nativeBuildInputs = [
@@ -42,11 +42,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt";
     description = "Backend implementation for xdg-desktop-portal that is using Qt/KF5/libfm-qt";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.romildo ];
   };
-}
+})
diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix
index 2d5fc1840b9b..e93b46a08ccb 100644
--- a/pkgs/desktops/mate/eom/default.nix
+++ b/pkgs/desktops/mate/eom/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   pkg-config,
   gettext,
   itstool,
@@ -29,6 +30,14 @@ stdenv.mkDerivation rec {
     sha256 = "mgHKsplaGoxyWMhl6uXxgu1HMMRGcq/cOgfkI+3VOrw=";
   };
 
+  patches = [
+    # Switch to girepository-2.0
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/eom/raw/84b45dc6302f378926be390d39a7cca3ec4f26ea/f/libpeas1_pygobject352.patch";
+      hash = "sha256-HcwWXAnVzz5uuAz8Mljci2FA72TZJTD28qLvczXVtZU=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     gettext
diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 2315ba4c11a9..5aa9e3a8fbd3 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
+  autoconf-archive,
   autoreconfHook,
-  fetchurl,
   pkg-config,
   gettext,
   glib,
@@ -12,15 +13,18 @@
   gtk-doc,
   libsoup_3,
   tzdata,
+  mate-common,
   mateUpdateScript,
 }:
 stdenv.mkDerivation rec {
   pname = "libmateweather";
-  version = "1.28.0";
+  version = "1.28.1";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "VUNz3rWzk7nYSydd0spmyaSi0ObskgRPq4qlPjAy0rU=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "libmateweather";
+    tag = "v${version}";
+    hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ=";
   };
 
   patches = [
@@ -31,12 +35,15 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   nativeBuildInputs = [
+    autoconf-archive
     autoreconfHook # the libsoup patch changes the autoconf file
     pkg-config
     gettext
     glib # glib-compile-schemas
+    gtk3 # gtk-update-icon-cache
     gtk-doc # required for autoconf
     libxml2 # xmllint
+    mate-common # mate-compiler-flags.m4 macros
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch b/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
index c5395f9e0ac7..09fa79934119 100644
--- a/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
+++ b/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
@@ -351,7 +351,7 @@ index 7bc24fc..d470822 100644
  
      loc = info->location;
  
-     searchkey = g_strdup_printf ("<raw_text>%s", loc->code);
+     searchkey = g_strdup_printf ("<raw_text>METAR %s", loc->code);
 -    p = strstr (msg->response_body->data, searchkey);
 -    g_free (searchkey);
 +
@@ -398,7 +398,7 @@ index 7bc24fc..d470822 100644
      }
  
 -    msg = soup_form_request_new (
--        "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php",
+-        "GET", "https://aviationweather.gov/api/data/dataserver",
 +    query = soup_form_encode (
          "dataSource", "metars",
          "requestType", "retrieve",
@@ -409,7 +409,7 @@ index 7bc24fc..d470822 100644
          NULL);
 -    soup_session_queue_message (info->session, msg, metar_finish, info);
 +    msg = soup_message_new_from_encoded_form (
-+        "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php",
++        "GET", "https://aviationweather.gov/api/data/dataserver",
 +        query);
 +    soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT,
 +                                      NULL, metar_finish, info);
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 4a4126538b12..0ff0deef6bc3 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -28,7 +28,7 @@
   mate-menus,
   mate-panel,
   mate-settings-daemon,
-  udisks2,
+  udisks,
   systemd,
   hicolor-icon-theme,
   wrapGAppsHook3,
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     mate-menus
     mate-panel # for org.mate.panel schema, see m-c-c#678
     mate-settings-daemon
-    udisks2
+    udisks
     systemd
   ];
 
diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 2d71ec226d46..027faa67898f 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,7 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
   pkg-config,
   gettext,
   glib,
@@ -11,6 +13,7 @@
   gtk-layer-shell,
   gtk3,
   libxml2,
+  mate-common,
   mate-desktop,
   mate-panel,
   wrapGAppsHook3,
@@ -19,17 +22,22 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-notification-daemon";
-  version = "1.28.3";
+  version = "1.28.5";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-4Azssf+fdbnMwmRFWORDQ7gJQe20A3fdgQDtOSKt9BM=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "mate-notification-daemon";
+    tag = "v${version}";
+    hash = "sha256-6N6lD63JL9xAtALn9URjYiCEhMZBC9TfIsrdalyY3YY=";
   };
 
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
     pkg-config
     gettext
     libxml2 # for xmllint
+    mate-common # mate-common.m4 macros
     wrapGAppsHook3
   ];
 
diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix
index abbe84809a73..49320fa936ca 100644
--- a/pkgs/desktops/mate/mate-panel/default.nix
+++ b/pkgs/desktops/mate/mate-panel/default.nix
@@ -31,14 +31,14 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-panel";
-  version = "1.28.6";
+  version = "1.28.7";
 
   src = fetchFromGitHub {
     owner = "mate-desktop";
     repo = "mate-panel";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-jfPXvb/iQGP+WwhquKtQICDUtjMhBY10YY8+dMfM8S8=";
+    hash = "sha256-8GS6JY5kS2YKscItAo8dzudgkZeG51JsSBUj0EfLiZQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index ced2cfb68fb5..ac75a4848548 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -12,7 +12,7 @@
   libgtop,
   libcanberra-gtk3,
   inkscape,
-  udisks2,
+  udisks,
   mate-desktop,
   mate-panel,
   hicolor-icon-theme,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     libgtop
     libcanberra-gtk3
     libxml2
-    udisks2
+    udisks
     mate-desktop
     mate-panel
     hicolor-icon-theme
diff --git a/pkgs/desktops/mate/pluma/default.nix b/pkgs/desktops/mate/pluma/default.nix
index 274d01796e70..13d03f2e0212 100644
--- a/pkgs/desktops/mate/pluma/default.nix
+++ b/pkgs/desktops/mate/pluma/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   pkg-config,
   gettext,
   perl,
@@ -26,6 +27,14 @@ stdenv.mkDerivation rec {
     sha256 = "qorflYk0UJOlDjCyft5KeKJCHRcnwn9GX8h8Q1llodQ=";
   };
 
+  patches = [
+    # Switch to girepository-2.0
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/pluma/raw/55b770fa4d899bd92aa5ce94f3be7e2e3523a096/f/libpeas1_pygobject352.patch";
+      hash = "sha256-uNGz6LEnJU4HxU1yzcm2mmrGM6QyuRSwc3w7XDYCNaQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     gettext
     isocodes
diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 0dc979e18b85..faf3de7c06c5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "8.1.1";
+  version = "8.1.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
-    rev = version;
-    hash = "sha256-4IGun7MnrMRmpXD0Kxm/ND4C3pFVhjHqDeP6jUmRg7k=";
+    tag = version;
+    hash = "sha256-DZ6smq339VgR33jQm0OFD9CM8sQ0Rz7aHKL1EWFSyBM=";
   };
 
   strictDeps = true;
diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 89c4f06872b5..1fbd44a3e8ec 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "7.1.5";
+  version = "7.1.6";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = "files";
     rev = version;
-    hash = "sha256-fS285BRTP/i50WE4oM+xgoj6cBgas+dQ6WdK9WebURQ=";
+    hash = "sha256-z6trjczB+ZLPvWO/R41PTSA1tSBIVD/kMF12TupwId4=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
index a8b9958f4c8e..882055e26b4f 100644
--- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   nix-update-script,
   pkg-config,
   meson,
@@ -33,6 +34,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-6T/OTiuDVAPBqp8BPawf/MVEuWTPrLa3/N1Blvt/7Q8=";
   };
 
+  patches = [
+    # Adapt to libcamel API changes in 3.57.1
+    # https://github.com/elementary/mail/pull/1023
+    (fetchpatch {
+      url = "https://github.com/elementary/mail/commit/8cb5bb87ceca9000c2a556bafeb059b9f1cbf2f1.patch";
+      hash = "sha256-NFZVvKJyPTV+lRcefTIgm2jOmCfrY+TlawDYzGTBd7Y=";
+    })
+  ];
+
   nativeBuildInputs = [
     libxml2
     meson
diff --git a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
index 0bcd1ea66166..bc03018529f3 100644
--- a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
@@ -22,7 +22,7 @@
   linuxPackages,
   live-chart,
   pciutils,
-  udisks2,
+  udisks,
   wingpanel,
   nix-update-script,
 }:
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     live-chart
     pciutils
-    udisks2
+    udisks
     wingpanel
   ];
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 91d7fb794fb0..fe14c2553960 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -19,7 +19,7 @@
   packagekit,
   polkit,
   switchboard,
-  udisks2,
+  udisks,
   fwupd,
   appstream,
   elementary-settings-daemon,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     packagekit
     polkit
     switchboard
-    udisks2
+    udisks
   ];
 
   passthru = {
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 52a174b213a8..8f828a70040c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-power";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = "switchboard-plug-power";
-    rev = version;
-    sha256 = "sha256-GKZouuWdWl1JDCmzPImeW/hStyFQA6NOAFFmAhiiFe8=";
+    repo = "settings-power";
+    tag = version;
+    hash = "sha256-JfOLGDS2/Qa6RmEfiDBZfeT+dM4NN4N2NoXRNJ4Q+Es=";
   };
 
   nativeBuildInputs = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Switchboard Power Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-power";
+    homepage = "https://github.com/elementary/settings-power";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     teams = [ teams.pantheon ];
diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index a75c7f4f9ca1..6bffd49239cb 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   meson,
   ninja,
+  adwaita-icon-theme,
   hicolor-icon-theme,
   gtk3,
   xcursorgen,
@@ -13,13 +14,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "elementary-icon-theme";
-  version = "8.1.0";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "icons";
-    rev = version;
-    sha256 = "sha256-WltMfWMcfUqpnfuGa6NzfxSeTais0MLsiu82ybaOcvs=";
+    tag = version;
+    hash = "sha256-ntv+efkyfB66HL3tWEkiOj+MFRGqhfMo1/FUO2fIqBM=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +32,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
+    adwaita-icon-theme
     hicolor-icon-theme
   ];
 
diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index ebc521c3b292..6af460863614 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -19,17 +19,16 @@
   meson,
   ninja,
 }:
-stdenv.mkDerivation {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "elementary-session-settings";
-  # Allow disabling x11 session
-  # nixpkgs-update: no auto update
-  version = "8.0.1-unstable-2025-09-15";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    rev = "e708fd49356f145acd926d30683012d9488f0f9d";
-    hash = "sha256-wb9UUrEtwtmqtfNS2YPli99ZeY17UdJFQijTKs8mHn4=";
+    tag = finalAttrs.version;
+    hash = "sha256-mdfmCzR9ikXDlDc7FeOITsdbPbz+G66jUrl1BobY+g8=";
   };
 
   /*
@@ -91,4 +90,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     teams = [ teams.pantheon ];
   };
-}
+})
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
index 153c9051b8b5..4c27e4d0056c 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     export GDK_PIXBUF_MODULE_FILE="${
       gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
         extraLoaders = [
-          libheif.out
+          libheif.lib
           libjxl
           librsvg
           webp-pixbuf-loader
diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
index 88d2741a52f5..2cb7dea4c316 100644
--- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
@@ -57,11 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { rev-prefix = "xfce4-panel-profiles-"; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.xfce.org/apps/xfce4-panel-profiles/start";
     description = "Simple application to manage Xfce panel layouts";
+    license = lib.licenses.gpl3Plus;
     mainProgram = "xfce4-panel-profiles";
-    teams = [ teams.xfce ];
-    platforms = platforms.linux;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index ac6d913e2590..9d1264a8ed1e 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -11,6 +11,7 @@
   wrapGAppsHook3,
   exo,
   gtk3,
+  gtk-layer-shell,
   libX11,
   libXext,
   libXfixes,
@@ -21,23 +22,19 @@
   wlr-protocols,
   xfce4-panel,
   xfconf,
-  curl,
-  zenity,
-  jq,
-  xclip,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-screenshooter";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.xfce.org";
     owner = "apps";
     repo = "xfce4-screenshooter";
     tag = "xfce4-screenshooter-${finalAttrs.version}";
-    hash = "sha256-LELPY3SU25e3Dk9/OljWMLIbZYrDiQD1h6dMq+jRaH8=";
+    hash = "sha256-VN9j5Ieg3MZwhS4mE4LMRbQ5AM9F8O2n5lx/V0Qk0Po=";
   };
 
   strictDeps = true;
@@ -59,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     exo
     gtk3
+    gtk-layer-shell
     libX11
     libXext
     libXfixes
@@ -71,21 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
     xfconf
   ];
 
-  preFixup = ''
-    # For Imgur upload action
-    # https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
-    gappsWrapperArgs+=(
-      --prefix PATH : ${
-        lib.makeBinPath [
-          curl
-          zenity
-          jq
-          xclip
-        ]
-      }
-    )
-  '';
-
   passthru.updateScript = gitUpdater { rev-prefix = "xfce4-screenshooter-"; };
 
   meta = {
diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 583506b325df..1433a9e18a11 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -23,9 +23,9 @@
 mkXfceDerivation {
   category = "xfce";
   pname = "thunar";
-  version = "4.20.5";
+  version = "4.20.6";
 
-  sha256 = "sha256-Q8gzXRR2ZO98rbHhxnf472d8rGOLqEv7WP6LDONRgS0=";
+  sha256 = "sha256-Ll1mJEkkxYGASWQ2z7GRiubNjggqeHXzgGSXQK+10qs=";
 
   nativeBuildInputs = [
     docbook_xsl
diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix
index 6cd55e28c0bb..015c2e54e276 100644
--- a/pkgs/development/ada-modules/gnatcoll/core.nix
+++ b/pkgs/development/ada-modules/gnatcoll/core.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
     "PROCESSORS=$(NIX_BUILD_CORES)"
     # confusingly, for gprbuild --target is autoconf --host
     "TARGET=${stdenv.hostPlatform.config}"
-    "GNATCOLL_MINIMAL_ONLY=${if !enableGnatcollCore then "yes" else "no"}"
-    "GNATCOLL_PROJECTS=${if enableGnatcollProjects then "yes" else "no"}"
+    "GNATCOLL_MINIMAL_ONLY=${lib.boolToYesNo (!enableGnatcollCore)}"
+    "GNATCOLL_PROJECTS=${lib.boolToYesNo enableGnatcollProjects}"
   ];
 
   passthru.tests = {
diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix
index 11c6006884f5..7448d251a692 100644
--- a/pkgs/development/ada-modules/gpr2/default.nix
+++ b/pkgs/development/ada-modules/gpr2/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "prefix=$(out)"
     "PROCESSORS=$(NIX_BUILD_CORES)"
-    "ENABLE_SHARED=${if enableShared then "yes" else "no"}"
+    "ENABLE_SHARED=${lib.boolToYesNo enableShared}"
     "GPR2_BUILD=release"
   ]
   ++ lib.optionals (gpr2kbdir != null) [
diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix
index b6f4a32fb441..c8d530466ca7 100644
--- a/pkgs/development/ada-modules/gprbuild/default.nix
+++ b/pkgs/development/ada-modules/gprbuild/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ];
 
   makeFlags = [
-    "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}"
+    "ENABLE_SHARED=${lib.boolToYesNo (!stdenv.hostPlatform.isStatic)}"
     "PROCESSORS=$(NIX_BUILD_CORES)"
     # confusingly, for gprbuild --target is autoconf --host
     "TARGET=${stdenv.hostPlatform.config}"
diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 34a18b07231e..b2c6e263134a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,15 +1,12 @@
 {
   lib,
-  __splicedPackages,
+  pkgs,
   erlang,
 }:
 
 let
-  pkgs = __splicedPackages;
   inherit (lib) makeExtensible;
 
-  lib' = pkgs.callPackage ./lib.nix { };
-
   # FIXME: add support for overrideScope
   callPackageWithScope =
     scope: drv: args:
@@ -51,27 +48,27 @@ let
       # BEAM-based languages.
       elixir = elixir_1_18;
 
-      elixir_1_19 = lib'.callElixir ../interpreters/elixir/1.19.nix {
+      elixir_1_19 = callPackage ../interpreters/elixir/1.19.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix {
+      elixir_1_18 = callPackage ../interpreters/elixir/1.18.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix {
+      elixir_1_17 = callPackage ../interpreters/elixir/1.17.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_16 = lib'.callElixir ../interpreters/elixir/1.16.nix {
+      elixir_1_16 = callPackage ../interpreters/elixir/1.16.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix {
+      elixir_1_15 = callPackage ../interpreters/elixir/1.15.nix {
         inherit erlang;
         debugInfo = true;
       };
diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 5263899d4221..3d1f5a0e6320 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.38.4";
+  version = "0.39.1";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-/gZczKm/IF5QQemrdcda9oKVIGDFSqdiu8YrBwT6Mtk=";
+    hash = "sha256-edK484d5Fn5Kb/UEV1g3XinFF1rQJ1DypLEueET//Bg=";
   };
 in
 mixRelease {
diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index c773d15241c0..75d44154d76e 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -18,13 +18,13 @@ let
     self:
     stdenv.mkDerivation rec {
       pname = "hex";
-      version = "2.2.2";
+      version = "2.3.1";
 
       src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
         rev = "v${version}";
-        sha256 = "sha256-Qih10OeI7KsnAthAW0yuH+YL8uoeLy7tOVn9rdkGA4M=";
+        sha256 = "sha256-1LFWyxXR33qsvbzkBfUVgcT1/w1FuQDy3PBsRscyTpk=";
       };
 
       setupHook = writeText "setupHook.sh" ''
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
deleted file mode 100644
index 368e6163daa9..000000000000
--- a/pkgs/development/beam-modules/lib.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ __splicedPackages, lib }:
-
-let
-  pkgs = __splicedPackages;
-in
-rec {
-
-  # Similar to callPackageWith/callPackage, but without makeOverridable
-  callPackageWith =
-    autoArgs: fn: args:
-    let
-      f = if pkgs.lib.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
-    in
-    f (auto // args);
-
-  callPackage = callPackageWith pkgs;
-
-  /*
-    Uses generic-builder to evaluate provided drv containing OTP-version
-    specific data.
-
-    drv: package containing version-specific args;
-    builder: generic builder for all Erlang versions;
-    args: arguments merged into version-specific args, used mostly to customize
-          dependencies;
-
-    Arguments passed to the generic-builder are overridable, used to
-    enable/disable high-level OTP features, like ODBC or WX support;
-
-    Please note that "mkDerivation" defined here is the one called from R16.nix
-    and similar files.
-  */
-  callErlang =
-    drv: args:
-    let
-      genericBuilder =
-        versionArgs: import ../../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
-    in
-    pkgs.callPackage (import drv genericBuilder) { };
-
-  /*
-    Uses generic-builder to evaluate provided drv containing Elixir version
-    specific data.
-
-    drv: file containing version-specific args;
-    genericBuilder: generic builder for all Erlang versions;
-    args: arguments merged into version-specific args, used mostly to customize
-          high level options;
-
-    Arguments passed to the generic-builder are overridable.
-  */
-  callElixir =
-    drv: args:
-    let
-      builder = callPackage ../interpreters/elixir/generic-builder.nix args;
-    in
-    callPackage drv {
-      mkDerivation = pkgs.makeOverridable builder;
-    };
-
-  /*
-    Uses generic-builder to evaluate provided drv containing Elixir version
-    specific data.
-
-    drv: package containing version-specific args;
-    builder: generic builder for all Erlang versions;
-    args: arguments merged into version-specific args, used mostly to customize
-          dependencies;
-
-    Arguments passed to the generic-builder are overridable.
-
-    Please note that "mkDerivation" defined here is the one called from 1.2.nix
-    and similar files.
-  */
-  callLFE =
-    drv: args:
-    let
-      builder = callPackage ../interpreters/lfe/generic-builder.nix args;
-    in
-    callPackage drv {
-      mkDerivation = pkgs.makeOverridable builder;
-    };
-
-}
diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
index 03c2d5111f87..47d5e548c3a9 100644
--- a/pkgs/development/beam-modules/livebook/default.nix
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -9,7 +9,7 @@
 
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.17.2";
+  version = "0.17.3";
 
   inherit (beamPackages) elixir;
 
@@ -21,7 +21,7 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-9AlvEqyQJvcRbAuuxF5Q5S9hG96vaQYVBYwPYp4lGQM=";
+    hash = "sha256-WElJgW2TxjeUgv6GZwq+hcgl6n4xr8mmCBPqoOGc1+w=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index d4d2bc26d076..44e306b83f41 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -31,7 +31,7 @@ in
   breadline = addToBuildInputs pkgs.readline;
   blas = addToBuildInputsWithPkgConfig pkgs.blas;
   blosc = addToBuildInputs pkgs.c-blosc;
-  botan = addToBuildInputsWithPkgConfig pkgs.botan2;
+  botan = broken;
   cairo =
     old:
     (addToBuildInputsWithPkgConfig pkgs.cairo old)
@@ -98,7 +98,6 @@ in
       ] old
     )
     // (addToBuildInputs pkgs.libglut old);
-  iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv);
   icu = addToBuildInputsWithPkgConfig pkgs.icu;
   imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2;
   inotify =
@@ -193,7 +192,6 @@ in
       addToNativeBuildInputs pkgs.taglib_1 old
     );
   uuid-lib = addToBuildInputs pkgs.libuuid;
-  webview = addToBuildInputsWithPkgConfig pkgs.webkitgtk_4_0;
   ws-client = addToBuildInputs pkgs.zlib;
   xlib = addToPropagatedBuildInputs pkgs.xorg.libX11;
   yaml = addToBuildInputs pkgs.libyaml;
@@ -302,9 +300,13 @@ in
   sundials = broken;
   svn-client = broken;
   tokyocabinet = broken;
+  # webkitgtk_4_0 was removed
+  webview = broken;
 
   # mark broken darwin
 
+  # The last successful Darwin Hydra build was in 2024
+  iconv = brokenOnDarwin;
   # fatal error: 'mqueue.h' file not found
   posix-mq = brokenOnDarwin;
   # Undefined symbols for architecture arm64: "_pthread_setschedprio"
diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 367a08aa87cb..30c53688cbeb 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -325,5 +325,13 @@ rec {
     doCheck = false;
   };
 
-  crystal = crystal_1_16;
+  crystal_1_18 = generic {
+    version = "1.18.2";
+    sha256 = "sha256-bwKs9bwD1WfS95DSxVY5AjT5Q61jOsfAH897tmiurng=";
+    binary = binaryCrystal_1_10;
+    llvmPackages = llvmPackages_21;
+    doCheck = false;
+  };
+
+  crystal = crystal_1_18;
 }
diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index c19832506b78..16e70b9ec0ba 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -7,6 +7,7 @@
   flutter_vodozemac = callPackage ./flutter_vodozemac { };
   flutter_volume_controller = callPackage ./flutter_volume_controller { };
   handy_window = callPackage ./handy-window { };
+  hotkey_manager_linux = callPackage ./hotkey_manager_linux { };
   matrix = callPackage ./matrix { };
   media_kit_libs_linux = callPackage ./media_kit_libs_linux { };
   olm = callPackage ./olm { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
index b4aec34f897c..513c0a44cbdf 100644
--- a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
@@ -17,6 +17,7 @@ let
     cargoHash =
       {
         _1_0_0 = "sha256-C9WDE9+6V59yNCNVeMUY5lRpMJ+8XWpHpxzdTmz+/Yw=";
+        _1_1_0 = "sha256-Kztnt30EcqjXUNEAJW65P6yLjdnyW4Q+lHe6qlCe3xM=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'flutter_discord_rpc': '${version}'
diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
index 4b5ae9129273..3bd9994cf9e9 100644
--- a/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
@@ -17,6 +17,7 @@ let
     cargoHash =
       {
         _0_2_2 = "sha256-Iw0AkHVjR1YmPe+C0YYBTDu5FsRk/ZpaRyBilcvqm6M=";
+        _0_3_0 = "sha256-eKKrcroV2yl/FV2WmgZWFPO5MPAGz0xCvpr0fgIuGZ4=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'flutter_vodozemac': '${version}'
diff --git a/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix
new file mode 100644
index 000000000000..51b2d8d69847
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix
@@ -0,0 +1,27 @@
+{
+  stdenv,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation {
+  pname = "hotkey_manager_linux";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = ''
+    pushd ${src.passthru.packageRoot}
+    substituteInPlace linux/hotkey_manager_linux_plugin.cc \
+      --replace-fail "const char* identifier;" "const char* identifier = nullptr;" \
+      --replace-fail "const char* keystring;" "const char* keystring = nullptr;"
+    popd
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp --recursive . "$out"
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix
index a2ec3318e443..7c0989f1eb2a 100644
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@@ -1,23 +1,23 @@
 let
-  version = "3.9.3";
+  version = "3.9.4";
 in
 { fetchurl }:
 {
   versionUsed = version;
   "${version}-x86_64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    hash = "sha256-QnY9KG/zFj+5o/4wdR0lETHhRn3a6l340s/ybuNWxx0=";
+    hash = "sha256-8nkG1hUPn0B3r5xxBnGMjgOa66Ax3LQgVqMx+3Tj3S8=";
   };
   "${version}-aarch64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    hash = "sha256-aMSMOV5kzd48z5aQgjjpQoJNWznz4slrXSdC8LRe8u8=";
+    hash = "sha256-2gqn816Usv8l69QrfJsh1DCu5ljibaBfZQn4ThUBlIA=";
   };
   "${version}-aarch64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    hash = "sha256-iEfEhHv3eu2VjAYrzPjVlXle1ISHZxJoC69MbIMXw1Y=";
+    hash = "sha256-IXkJWLbGXLV6Gjw/tQj0Tdz7d7gioJADnuR+WD/N4Og=";
   };
   "${version}-x86_64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    hash = "sha256-0ZMR3rNRBKQaQNt642xJaxUDdFpcrtWkFdMitMJz8ds=";
+    hash = "sha256-YbS5SI4bQlW5S+F61Iri3bI8b75ngkz4ED0LKPqKuBY=";
   };
 }
diff --git a/pkgs/development/compilers/dotnet/10/deps.json b/pkgs/development/compilers/dotnet/10/deps.json
index 9486ae8a4bb6..55eb5b7b22f4 100644
--- a/pkgs/development/compilers/dotnet/10/deps.json
+++ b/pkgs/development/compilers/dotnet/10/deps.json
@@ -1,50 +1,50 @@
 [
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "f4222e017b34fd1aab9c18f83a800c6ad506aa9de9c2dbc01ff0d08ee77c64d1",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-rc.1.25420.111/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "sha256": "8ed127320ebfd4933ebc498add9695994dc37d5b09b951fdeb5d0fbc730b72db",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/10.0.0-rc.1.25451.107/runtime.linux-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "3020dae646564df57f13443c749afdbe02fe696ea6f795657d431e5f134dec5d",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-rc.1.25420.111/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "sha256": "7c54a1cd8fc4c790f17a6775c7d7c23c9ed0b5246c68f1b80bd8b090c5a87612",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/10.0.0-rc.1.25451.107/runtime.linux-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
-    "hash": "sha256-6CKoHQ6npL+zAKjx3hgAKAQnMvHC2jircy5A5i41SNA=",
+    "hash": "sha256-rLL0sHtjWK8mnwS3jGirWovPc0ZEysw0Ue/BoZ1pwzM=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-rc.1.25420.111/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/10.0.0-rc.1.25451.107/runtime.linux-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
-    "hash": "sha256-VNhtqxkzIYd6KHZK86ZagD4P6HCYzgIGERPjhZgDq1U=",
+    "hash": "sha256-rREnUxSbCyNsKicVK1OaeLwLYzE3TtKLk9qVvQj8/5o=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-rc.1.25420.111/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/10.0.0-rc.1.25451.107/runtime.linux-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "609cd171ad2358ec195d19b9d466a954e8b7ec20b1af6143741aa03840d535b6",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-rc.1.25420.111/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "sha256": "17b13efa4cc6f2b85e770e4601e442713d73fb1c852b22496691f8ac56e33c88",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/10.0.0-rc.1.25451.107/runtime.osx-arm64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "7fd9df0ebb210b51a3586afcaf1eea269c7d4d9fb9cffd5931cfacf28c298095",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-rc.1.25420.111/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "sha256": "fd30817d3c9fb89bc6309bc0d3841f9f8678ec560f0a9b39976f7865b2b8fab1",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/10.0.0-rc.1.25451.107/runtime.osx-arm64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "6107d07f2e0754efe41ef87de31219e7468e7fd305c2c9f2925cb607e7b3c6d0",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-rc.1.25420.111/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "sha256": "f03f3eb320016cb6721049aee14141959037219b3b8d995838b5bbf90250d8f3",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/10.0.0-rc.1.25451.107/runtime.osx-x64.microsoft.netcore.ilasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "acb299873fdfea3672631696b78fc40f23347783b43b8464eff262a8598f9bb3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/299b99f1-f3f1-4630-81e2-4fb223c52e70/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-rc.1.25420.111/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25420.111.nupkg",
-    "version": "10.0.0-rc.1.25420.111"
+    "sha256": "9ae291866d11f3fc2664094de79f7c3506fce33efca1c40414ff1b10c2d28214",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/10.0.0-rc.1.25451.107/runtime.osx-x64.microsoft.netcore.ildasm.10.0.0-rc.1.25451.107.nupkg",
+    "version": "10.0.0-rc.1.25451.107"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/10/release-info.json b/pkgs/development/compilers/dotnet/10/release-info.json
index 569be89f26d2..3185980378ad 100644
--- a/pkgs/development/compilers/dotnet/10/release-info.json
+++ b/pkgs/development/compilers/dotnet/10/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-irvbvBrENVa+7C0Vm7bQMcUoirwxwha4BoOiLhD7F4Y=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-rc.1.25420.111.centos.10-x64.tar.gz",
-  "artifactsHash": "sha256-vXoVORa2ZB7HQ3gUy1L9xZaqBDO/fbTcMt0HlqmcWGA="
+  "tarballHash": "sha256-OMandJDISBC8MEX0uWp7ibZfebKRzd+KiMzU1YOCV+k=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.10.0.100-rc.1.25451.107.centos.10-x64.tar.gz",
+  "artifactsHash": "sha256-Nf6wSkQ2klRxZpH7ioWeIhx44Y+51Bh/YTSx1bqCUS8="
 }
diff --git a/pkgs/development/compilers/dotnet/10/release.json b/pkgs/development/compilers/dotnet/10/release.json
index b0e6839fc1e9..b0ffc0d08a48 100644
--- a/pkgs/development/compilers/dotnet/10/release.json
+++ b/pkgs/development/compilers/dotnet/10/release.json
@@ -1,11 +1,11 @@
 {
-  "release": "10.0.0-rc.1",
+  "release": "10.0.0-rc.2",
   "channel": "10.0",
-  "tag": "v10.0.100-rc.1.25451.107",
-  "sdkVersion": "10.0.100-rc.1.25451.107",
-  "runtimeVersion": "10.0.0-rc.1.25451.107",
-  "aspNetCoreVersion": "10.0.0-rc.1.25451.107",
+  "tag": "v10.0.100-rc.2.25502.107",
+  "sdkVersion": "10.0.100-rc.2.25502.107",
+  "runtimeVersion": "10.0.0-rc.2.25502.107",
+  "aspNetCoreVersion": "10.0.0-rc.2.25502.107",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "2db1f5ee2bdda2e8d873769325fabede32e420e0",
-  "officialBuildId": "20250901.7"
+  "sourceVersion": "89c8f6a112d37d2ea8b77821e56d170a1bccdc5a",
+  "officialBuildId": "20251002.7"
 }
diff --git a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
index f8c752fed0dd..c58d462068f0 100644
--- a/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/8/bootstrap-sdk.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.19";
-      hash = "sha512-P0MXwA3k7np2YGyPmYZSWIICTCwzGGka350Xqa+EucRAn9aoyurrm+ZjCJKzA+N9gRc9BaFLaE8p4vLDzQJSww==";
+      version = "8.0.20";
+      hash = "sha512-w8Q6dYKAxAkZXJyw6WP/eRUQf9yCWIlM5ygiKcbAODA/hVyo1JCiWQ896c1G1sy7wa+/3Q0vE+HkVFCNvcTfDQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.19";
-      hash = "sha512-VhKbsaln9sfOfDvxFh3eVnIQEZhfPnXG9bV9N+unU1GqcZ/CaTSfe1ASAJ230LtMlrtxNk3EqUgSQGX0TQITLQ==";
+      version = "8.0.20";
+      hash = "sha512-ReqCsIPouP9rnL6Xrf+bmZujKQAnTk/rd9iIQhrEtwzKNxbfwa0MhdUo6D6oUiJXvVsRJbrn8aRnlCJfAXFwAQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.19";
-      hash = "sha512-qtdfpsuFFEQx+26ZUv/95fSUYSpZ6r2Ch0vFKgIwnnwtEOEw7B6h8D8t9P1XkYn6tJvHTdSC0ohcOk+HwELU0Q==";
+      version = "8.0.20";
+      hash = "sha512-bdyPf8QDM104vzSBaxmCN52RMxbs/WBLbunXswNCUE9AczVdlCo2G7SZIimphcnzG0X02CITHiUiD+z8bTFVOg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.19";
-      hash = "sha512-PMYSj+WRBCmeERhq7w+qzqCDAKNR5t2EAMv5w+TFzehtfqQQR8rKZDpYAmzYFaWl6Rn1wOZmjHqsaGbvoL+eMg==";
+      version = "8.0.20";
+      hash = "sha512-ohUx65qZpbiYP9jyu5H66IlW1wfcnUQ31Y/igebwG96EE221DRVKlfZeDMVtKnX+BpNWyzBi3k7bp+N699x+Gg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.19";
-      hash = "sha512-42gDcb3t2l6sjYOGsDtZiR/PuY99Ctj0UnUgY+BeavYXqM2huKLa+r0Yg8YRJLkLeWF/MT3KXRReUE5Dnu0daw==";
+      version = "8.0.20";
+      hash = "sha512-EUqSxZh+Sa/wqzUbeFHVtCmiAqH8B+hjGGmTtXB6NjfhhfINQu1nrc+Aoz+6iPpOaP+q3qaAtDjU2gh1IXSdxw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.19";
-      hash = "sha512-lvC9ihhOhbjbAwG90fnb6BIHnB/kz3HDz+9JSTaoBIyd+XBnckIWdtDxPtroWrvoWqydk0TPYxPXNGDY+I4E3A==";
+      version = "8.0.20";
+      hash = "sha512-cwfZXFLRsDXgBqg7+im1mztDSw4bYRR/OVSjnetq6nY5JC7rHiBg6vPFdFgX3B/E9ihEuoCErOPscR4DkwQIgg==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.19";
-      hash = "sha512-oADBsA42EoW8MmpuTl5e5TrNZSNtlpOPsSWtY/dmVdK7EJf1QAQdvHAxZQ6IGDNsKrI4h0VEo+75Grmmc41RTQ==";
+      version = "8.0.20";
+      hash = "sha512-MTyuSFZTIWzf1bQ9U2W/pR7+k3a8pNm+2U+5E/r0pfq6tAX6VghOUCSAPphOUewlCk5MPHsgVa9I9hVTI7I9+Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.19";
-      hash = "sha512-GoPqp8InCwdG8uqW1M5KOqlBHyYLFRuHRQxhBKNJCVwv+EIkCbVkxE+SzLYQaqMZZGOl86WFBLDMdTq0d9+Tag==";
+      version = "8.0.20";
+      hash = "sha512-4Iz1Qb7MIybAKAQmBvhlEVpZBWz8za0WPX6COTuvcK1ZnJ8YuA3JvzPOwd7Ni6729dEuxEdTVC3Yzs55tvMqEg==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-CBq+wJbsMgLVJJLS7vDyefSpH4f5VT0+m80rmB/XtwiFNe8oQJHs3bRpSef+JnKCJoU62ijGs8IQMFsXYbraYQ==";
+        version = "8.0.20";
+        hash = "sha512-QzpP1LCuFNCVdMF8zxw41t41F0QBb1BOPFcmM5LAYkBb92pvwazmdXpUwl+KwqwCu3XZfLDGLQN1qkCKdgtTKQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-jTF36xYRwLtBq67lUy2IBUZzsRK6nTQuduGtaaWUqO6YcTb15SzN17MeJWanD1nEeleKWR1AL1GJb2cAsEnUiQ==";
+        version = "8.0.20";
+        hash = "sha512-9FVoJFIBCbcHf3IfAbVrKzwztax3Aexm0QMWzwW9zbzKATDkM/7a8zSWsCpCHn9XGeKu2qWPE4pdTd3cKEgGsg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-EryMsQIZXDc3NLdZ2c14LV7XxkTtIJrF2e4uVE8Ycvqo6PiBZdUiuNEe5HI/wsMyOx5TJJWVW8M5bvykSFNUpQ==";
+        version = "8.0.20";
+        hash = "sha512-+VqaO6X2RpIPbqwd0yaoUpxe4gmzOwfDjiLxGsv8f3V1H52iFLkoQAYPqtEizaUSshvRUlm/9qTfaHzRLP9jVg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-ovKKlV/bfPMcOX2NIr7QXZwZceFSqFwwzLdYNZI1sm9WsXuc3oYrwUoWwcyjXobAQGo1pY1QW6l2eU6TFIDBVA==";
+        version = "8.0.20";
+        hash = "sha512-nOzF8i5n7DNg8it1yx1oKmMpdn1h+jJYpKLntAbdVuxrCS9vZsSKg3HIDug8CQ1bXFasv6NEhEfefy1IXSeh3w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-YuSYCslUdV+10cBI5q3oIxVPFWeQPXMAnkdKpZtOFNCPy+1I11cali6yKe++Dq1LeYAhviLbYnnL+1nFPP9jPA==";
+        version = "8.0.20";
+        hash = "sha512-uQ3+qVeMUFmcxlS8r40ZNu3YFEz1mVR6rGJNv3JoJhtMU7+dZ7tsG43vUgD4MdfAIpAFHKv9Ybm7dbFK6ZV2ZQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-KHOxnCTTVWjYhItEHUi437lfjTz7GJDN7UjUILN1qe0q1i0kFA+2HdQwKt/SKBdF9iMJiDS/XotD+EOYbWSS6g==";
+        version = "8.0.20";
+        hash = "sha512-EuPbJuyEdGCNJS0lvVWzgLGI6U6fsyjc55KhvLJooKE688M8rHAcL+TOE09sG6gKu9u08WleDmh4scBVPSkI6g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-cDvawzOkUtG+BMHhqrwAu3F0AZIXoeMOMAx43x5zH1XerKAGh09ggu53jnIByHmYHI2F9Wze2fSwcmNm2akkgg==";
+        version = "8.0.20";
+        hash = "sha512-SPo9VDDJKEY7cOxfTe3JA0wKSc5a7Mg3gPHTolmd1oh6fRQZ3bapoyZerk2CqxH5C/PZ5U8z345klghdOBNI3Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-X4Ku+V3mehusrwoGqQ6PSoWfvCe5cMepsoKG3JSylJsd6CL2MzMBQa6CZU8ByB29JE/dwOo7MmYbNsxdDACq3Q==";
+        version = "8.0.20";
+        hash = "sha512-7IvfZjZ4XJz0bId2SBBr1UcE2+8Lrcx36qJL0ZiGGEYzWF4K9Vkn/IFKOjLlDbKQBVIikDiA8N7WEHZWhWwuVQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-MnPFQfcebuYBLfIxKrzO/z6fNGhUpm8JMtDkoX9zm/OitWkHBpYhPANnz4baao8t/X6xvLY4jgURXurqt8VWIw==";
+        version = "8.0.20";
+        hash = "sha512-Iz8rwdlyzt6u2aeIXBPD8d+QX4jJKboZpA2ubeS7FkXjABusVQFaFMLbDkYhDOaK5+uaPiQIr8ph5ZfIIjSsFg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-eGiP0kagfsqjLFYuW21kAriFJ0EdThyCpPoB1657p24cg4Xhd2Yeh97FU9pb0UAZA4zqjhqcCmqWvcAbyx5Oig==";
+        version = "8.0.20";
+        hash = "sha512-ntG1wuh8qyda0UUamps27EwHMf0EpoLG4GqIkbFMOzgwUhCql2rT4PUlrYQPeQ9hdmnQXL2x0kyFhcJMjMTOKQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-pBo4JhEGeCG627NFpSO7+KJgh/DPcjuz/bEgZ6dRHXZI/bDmyjLTGJQvyvonW7jhgbxgBbo2WayHCrgHFA74Zg==";
+        version = "8.0.20";
+        hash = "sha512-0Mv0kixOTORiDEyqpXpv6MyohFQQGXEDyRp+mzb/XSjtIWxjS/gNpVjuIAf6BgJl7xAldBPGHxG11iLda24zkg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-0+1JQFBD8qKmK1j+5VyY/5fLUU5lKt3oKLqDnIE0KZlJc9uJSi174JsEqF6rjrEtWRPXSaDd5QuwCUzeEuKd2A==";
+        version = "8.0.20";
+        hash = "sha512-BM9xD2qHUAz6FTZhaHjdYjWL3M+SNDESboKRTbvlmcIeNu863foCVuceDgk7fEPpoMchFp92nujJ06LZ8CWkUA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-dBj8Xuk6EbKF/UdeP7e40ULe1XDBTBy4W2EzYBJoaZ8+Qi9LY9PbsEfrXEc94/o0cBM6vPiBNahEpJcS+ao1iw==";
+        version = "8.0.20";
+        hash = "sha512-X/ZolZ8ZKsXAe7qxqWIIbtXFqywUO70jsiScwYJjNsRDjQ4iEsafiGcP4sMWSATxJjZx7O2DUhjXG9k5EGxiWg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-Jfu88czW2sKACGPJ/yMV6UEiPUI8yiodPd24p6LAPRUCX6CI7UbEc30cCAmkN9TuEt/zAK4dKG2hs3isfdjpNA==";
+        version = "8.0.20";
+        hash = "sha512-eXMwwqnY4cPsuseGoEtuGuxdKPrqDFjy84a4HtbnYTRLnMYDyxd6PZauz3YxKgCvR0tWcousOMoDxSYWljo3Iw==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-UjZI9mQLY4k8jwdq9NgyzfPwWxDmEiT2ahqV8a9AXa33AUKhXr1X4aW22e5QSUZF997psI0HI4DAYgnRrZN6vQ==";
+        version = "8.0.20";
+        hash = "sha512-4fyajE6dozHNiFDhPfeokqO+n5imY6il3eqG5Gi1iwdkf5Nk6ORkro5pIwzYZXkrZFFsSqjxTkjOFzVdg9OwfQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-MV6poe/eVPrbO3CQvQNn3RNIymVBNWJ7updS3aSZVhlL9IZUuw0Oyn92pi8Fd3qOWvZQcdireVua0AWBmD14Hg==";
+        version = "8.0.20";
+        hash = "sha512-h0Fk0cjgl/UTD/JTpAzVwynCduv/f5LUgw2KtnDBDTztHyj2xw/zDMNDve5pF7+izVqfqg2Nm1UvuTuQR5HohQ==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.19";
-        hash = "sha512-AQJC7awIrQnM6TIj1ZrWaRc3HveorRrQaGxfCd4Gdn/RFJXkiETDSUZuakkHLmND1HUcBWZ003UlJasJoDe57A==";
+        version = "8.0.20";
+        hash = "sha512-+xqTx6KQIgc/rj1EoG6xs9mL8h1rV9d7+/3wx/BiNWA9Yz99ua3nc3vBLTj0RvYF3Q7bxs8w3ivHR6WhjqQDYQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.19";
-        hash = "sha512-zkLC9ydX+0bsZWrJxWsWM/8LPujWC7Z0L6QHdYehClKa4Lrk3glBex2O5q2QirqLjCFDjYRMw7KSyO4CUGv5ng==";
+        version = "8.0.20";
+        hash = "sha512-vl1JvrYO7I6HtcDsJRRwfXlNnfi0B0YIg9tJ8kkkGpEk51JbPzwKUUf5UgGMYJYBwCx5VLzNB1H5adYUv51D+w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.19";
-        hash = "sha512-ECYlGtxCIAHIMQRTjTrrAG6O+iTP+2LV8g02ttgII6BPw7fpsViPtYpgXAKMx2SW3NjlS9ePxXS+LsDmJ6peKA==";
+        version = "8.0.20";
+        hash = "sha512-1cX9cT5qBWUHk/LQLuZ2Fg8ovMCXkGU+KBCgNmmJ90g7rJ07DjJV6MNaeXhvK3Mg7uJpIuN17EBHye3EVRIJmg==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-CXwG/jLFrC1njHjZnwI0cDjd7Q1CQPGAn0HFM9BekI3xJb3MtlfPyyx0jN7NMsejToWeXgw6wlQ7rLCxwcGREg==";
+        version = "8.0.20";
+        hash = "sha512-G6UpxCxt9sW3mtHtsCQhQJNEIgdLzgGo6BcVEUX6RQNgdfCw6YgGVy5KdN4R45Zqo6K/UVEF0C2ZUVPYk8wrRA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-He223oJT1MMpZKYApV4yb8KFrP4x1Ei+Z2ovHubJ9IYJxApvw17R8GfCVWYDwQiUITd5xxfXQZAvq9Uhzrdumw==";
+        version = "8.0.20";
+        hash = "sha512-EJRGxhZBLdGjyTIjOb/fAmDL87ysiFfOc6aMHx5vKPe7kxshjvTVy4Nr/9YXt6poXoeQaDBAw7TWItle6vVu1Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-Bb8wAYk8zTCXwd25mOhVQg/wXQrRxQplxD0t189tfRox90zE4QSWPljMR61AAeuFvnAmFHX2/WJtYXq3tjSrRQ==";
+        version = "8.0.20";
+        hash = "sha512-aW2Fh3+p2gQgRd7tPVgY34+GGPXhIEQJnh20w9Z6d6PtUNXGRaKIcngu6W4LB0QPrHtprsRFBpt3p3yocALFHA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-kaSQrToRQW4cNifw0bHzfFt8bXJb0bxYYXzOm6sKdw+MAMO5fIIybr3DpLSGLmqqz/B63Jz22Fx6OoVFw7G+tQ==";
+        version = "8.0.20";
+        hash = "sha512-T5HlmUcha2Fz6U2/9tKLMPp9muJyxbuGsuWwzMjAKFUIrHXErkJxYV9v2gfoj198BHwB8eb3/b31TppxXLIrbw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-XNqp2Kf81OCORVhDCLUUVIyQWmnTW+xqdeKcv1/DWUwE0Bs5jzhpk/LmE0yRoduTpXAyYkPRWpxWZGOVa2twVg==";
+        version = "8.0.20";
+        hash = "sha512-/LpPKsVBnxlwlRkkBN6IIDGPMaHqf7opxBNMkjEoU2Z436X9dbmrD8psSx+phiCFvoqaw3X9dn/TqskfFVJokA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-91csMX2qwGariQVFLhCOX6sRywEuX+qoOht0GgjmqmaKI2JxEleCJEMcJ+n7RqieSia2txmVzeHYDED3+5xlKQ==";
+        version = "8.0.20";
+        hash = "sha512-IaPyKzOi6vA9r1OHjgAdqUO0Hf19LKqxhAYJSEFk193uSTsttorcPT8AD/eqRb04rI1T9NiL6RAAvcO6s2wTVA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-fivtZRiA9IH/8JqTnXxVfQ4cak3hnte3tZLgPQ4z47/xAxcvz1nRjHRbblIl3FEfGvj3oHJakbgttSvvwdrI3g==";
+        version = "8.0.20";
+        hash = "sha512-7G/+fiuxYl5kS1g/2faF+V+LDW8+0+Wsyf86Io6Wz4YHeJesFocA5hTy2dzBHZ2RXSrLA30xn8kQPnCx0iVyCA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.19";
-        hash = "sha512-gP/Qk9rYTT7upplXUbUmhMnxUC8KcJWZ3dLFdW0zQ78zxkfkIDbJ60HQQetEohnhUbOCX+/j2N/oEzeLrESGFw==";
+        version = "8.0.20";
+        hash = "sha512-nBRFxKOGlEX7M/XAjbftd/L3OjQd3kLe68NO5a5y8eL34/o08zeWAz5w6ooLsr/Xb0+33g1Fxx1pwN+kWUjRjQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-RZ4+PXfM587j+4jVt5fMFvx3qy1OkR1q4Ztj7LekJBCidfkNcmHI64sVm+ev1nS1xhBQNgdCLRFa8VUqqPSgFw==";
+        version = "8.0.20";
+        hash = "sha512-lR4xMDs5E5SUB260+61wzYqLM4Fw8WVLOhhpnzDQ6sfCGcnIpAdyywwS6hWn4bTkDbLCUWZOMddahUlz1w3rxw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-Y3BL9qgrcCZBZVlM3anKLX8F2atrzvCm4gxED1hTxJGQyCp24xEaGKa6BRfq5NdQO4sKOS3UWDM/XB6qr4yx+A==";
+        version = "8.0.20";
+        hash = "sha512-g2d/PUPe8FvPmQiFLasrQFJEqihsxBw/iI2C0gqg7bVWTliEKll9fTkO590MHTs2IX7HooGc6OlDPdPgqrP18g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-29KXiTrQ5adugytgWnZfdBSyBQHvlPwuClP4RyR0DRERHfMFWfZc+IFYCvqr1LLquPBR2Ev/xO4SgOfgQyu9kQ==";
+        version = "8.0.20";
+        hash = "sha512-NiB7rBLXcA0gUjjm5Ayl4xSS/28FWrF69wRPxvX4vfZIaM7GKPoqkPdpGAQRdO5AQsnESDPoXm8gKZywupPRzg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-ppU9Qz/PQ6ilQze2Ep7iG7KCzjMMWnd/JxY0c7oYeJfT9yTjBZOZeu4CHM8Vi0qewih1fI521CsIbvBKLHndSA==";
+        version = "8.0.20";
+        hash = "sha512-MtY9IP4p+bPOA5UY2Ora6XUsmOZFZe/NQYycXp+msZmC7V+XIaJ1JxCvb/wZYPSzdj3o7d7wHrp18fOKI5Y8Kg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-jIThUl9XLKaVo+bTUtNzO03JAvmP/mc8Tqcc9xSCvf9TzroV/MrapKju/iN+zNFeS5OnJIF3doKEbYnKnCWs7g==";
+        version = "8.0.20";
+        hash = "sha512-SRhF9VzpT8nLEfSixN9B89gi84Cg5CL98v9ZJTR9oQmfzbE219UaXsWxzRdB3kInT6fkP7c+940tpDudrU6htw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-zQlXKZ7Lcmy5iGGIFj1dGAdAGysgJm0r67quupe3tlBxHvi17Pntb+zesPSp31kaX+gqLdVWLylBLnb2EF41bg==";
+        version = "8.0.20";
+        hash = "sha512-EzCsF0E13D4k3akvyCnOSLXeyKeS4vmsBN8p0h5T2BlDf1jsNnBTdrvO7lBoXpo1W20wzgic33533E7l0pdeWA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-XuYUWuqO1rOCKgU0T0OHgjdlYg1xYzZC/LnIoM1UBV+RiByUVCDlNmctSNlNm9nNOHVDxrDGMJmjG0LH2/66dg==";
+        version = "8.0.20";
+        hash = "sha512-Gub22p6ELMUhID2PkyDJ+31LJqIij58Mauwn8//pmW0RlviI/0fHt0MUoW7F8XpYGsMc7DFDPmczVKBAWWrnQg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.19";
-        hash = "sha512-+tKz3/AS0uatyMFciALifG0HF25uRxYOGfMZy8FIg2xrkjW1xDKg/Aqk2kHu5K+yxpO3ez8yutqG7AZjGO2bAw==";
+        version = "8.0.20";
+        hash = "sha512-NeMgGpDGbFYQyQyDufBkTZguc1N+6uM38qalGsmsc4kXqYY/oa9fjy4YCRNL4NB+3hAtO2W7qP9IALGUPih6bw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-OVA3+spWeTytk2DCo9syBHUmc0K0Yqyh+AvULvV9S4rAsdmgjKDARVNYcImDhMqRTTzX5r4uczoWnBN7wPqEtg==";
+        version = "8.0.20";
+        hash = "sha512-pK1xMLndZf0nTfM8qYoJ+WmOKvSrpvV4qqeiNBgw+/d+mzboCU85J4vLtEzGuYXWIJTKDJuxM7GqJU+scAreTA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-A3KMblUwJ9Zezrr/lX753sK8JamQbN8T7W/c73PXXlnikdvGSDJh78VtyMAeMPfYlwJQlunSAK0GmYBTaT6hnA==";
+        version = "8.0.20";
+        hash = "sha512-FmeBNXl+vmZ0wI18YOFhB2w8koEWmV47RQKwUZdPnx8lf8tG1aSrRAt4i3wIiSJ+fqcZ4Umbp25s9bpKhp3Kog==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-vKT8qP8s2Q+Eef3gvp8dBhqAmspLUjrc5EpfGBuy8ALUhZhKCZUXPuvwx5QjkPTcOb1hOUmEcOAenQ+WEbvnFQ==";
+        version = "8.0.20";
+        hash = "sha512-y1bMcE2NE63Ro7RzoCSkjrQW2TDwKbwZHqrYRjSYhO8E0uq4uYeGSuEjE9o2Ooq049xNdYsdTfSF2ipqFmb50A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-6OEEohAtoOS4ep+vSrKXi8/Vu4jIRD8woZkwh3Tt0QtT8xV1tmWeNH2jCr76sP3FbIJaVZ6NHQRkrZfov9yxig==";
+        version = "8.0.20";
+        hash = "sha512-RCpG2N7+A0/ljYpcIW1qWG2YAFU7Mqs6uBRsb51ZCKfYeqnnrsx4rLSjzwha9nc2C/GATLGXdKTMumpub9YRxg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-GLxAezIXi563N2/q3n8KRxYuhcJaLGJth1gd+G+sQJw6uEv51YPP6s7DsBgewF6VyXDDnesLTGnkv8fkPyWPKw==";
+        version = "8.0.20";
+        hash = "sha512-GNQt2cD/FnvbX9rQa5JbIQxeP10+PtZYxaN9AuhI33RXphH2xM9SAL9sOumSvbxjRwNJs2eVjFAnKMQ7A0Jylg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-H7e34VBAQ8P9afWKyKn8u2FMGkx6SPqwxk59KvvJNXGE1tt64Y1xcjtoKWU7yY/xgRNyW/7BxBjyjGs96HG9BA==";
+        version = "8.0.20";
+        hash = "sha512-VF3LetcpHjzxjsght5M54+RThSbMX3PWpYlUfa8EJiOWRDxxXJzN9GN2736huINuMaVjnwRipfVTc0RAGgiFsw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-MaZramDW2KIdn5sn5IaHGpdr9AvLbBwh6TNzDb8GyzJX1BXzy0QIQPBGM95uiZ7bPZXovgvM/P2myS3aChOX+g==";
+        version = "8.0.20";
+        hash = "sha512-7jvFAaLaQzsHOWJ1uhDtiptUFYifuBGHRm1mb4qWvyM8fOlDe0hkVtkV/32IKDECsqU1XkVr7uRpkbQcA9N7yQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.19";
-        hash = "sha512-Elc+6ExneINHtEnt4Iq5M9s3t0HEJN0dqPaWMHsag5dzGi6Qx69XboScBNWQhRTKMxoKYihPOL3pk5t4Df5rOw==";
+        version = "8.0.20";
+        hash = "sha512-3lxzEUUNkq03eCVfnw0y6T6VPjI0nVp7kGBa29yvYj4gtwqt4fupOj7dFNzjcsHiokoAPvMKoQX8uB64oxt94w==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-vl83UEXMS2sVQ5vPRPAr/KX/6gqA3VxVuuzdN4rAo/d1dFK6cFyMLVubcCxIYxSIetaLXLagjWxwKT7TE/E6Zw==";
+        version = "8.0.20";
+        hash = "sha512-iH6z6a8C5GbCTskOlkBdBiRUzO77AbUOdBeqy71E5Z/nbyii90MkG5vaHCFzGg9Xd9y7AAI2vQWJ/tYeU5GHpg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-qt3IKRfsRC01XEGZYcMK2Na4Ji9J8BFoLTccxVweCNiWxr5QYCTXuAlSCtXPaYtxM0W257peDibq5GIVD2afzQ==";
+        version = "8.0.20";
+        hash = "sha512-UJeSYV9ksc6iEFAWu280wxIX2RG26u4y33cjO6IVLDtatcQC71kSRCjKOjEp+34WFsHaAPJnv0tNiiIM1ntx0w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.19";
-        hash = "sha512-GfV9610N8O7/5aKSauBTA96FAk64ukA3tCZXRjwZrFM3OENfZV2T8NsVSC34lslpaotKxUC7nmQp0ey5nzaPYw==";
+        version = "8.0.20";
+        hash = "sha512-/YRAHE/55Hdt5BCh0K7//AfyLnVsWQv6E5WqqCrILeXuFu6GIg/Xe827xPLF1SzeyZsT8CwvRLx+JoaK34ZE/g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-3z1K3i+s6eyJ0/8OXrW3J6n4pIDv2bQ0pptDpqUuPv1ghiw5BJiF9Vmm1xxhi+HLZkc0wz9Qfg4OAoAyiYE7xA==";
+        version = "8.0.20";
+        hash = "sha512-r9MHRknh3Dug0E7QMdCy/HsCgiNir3V4si2E3/ya3ewJqtM9zCosCyTXRk60Hy9y+7GKk8IL0UPyxVsaVy7v/w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-W39Zdgq9WUqwd0jY68BWcl9ufhSWtDYwoZB+VAkNauBs0r5yetHsvnkXJAQPli7/d7EVLfhpqhQb+KKcJdFpRQ==";
+        version = "8.0.20";
+        hash = "sha512-zmrrxrQCnBNh4d8jdHAtPYvpaZGB2cspy54sIk1vFQ3sAvtyPSfs5h04lTBactetSWBaBY3Qjzf/hFUno8EU3w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-kRSdI5ex95sqFc2DBQ9sddp0cRLAdy150AFVdK1LbwyoYceP9OrEgp2gImAC2nvsFPh/ol8XioV4SHwPss1haA==";
+        version = "8.0.20";
+        hash = "sha512-0rCiA+fx9zQX9+LvmvjKbdKqpAqYrvZRBE/bXM8qLGpBcLyIK63IKBUCaG4CXH9biy1NLG7fSp2CfaI21d6r9g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-bTvHoP75ZewPL2+dt0fdwKBgEGxZxyQLLc4KspJ2z728QXBtAdvdjoMoHwbOyC//oApzcB68v7jP5ADmfzk5Rw==";
+        version = "8.0.20";
+        hash = "sha512-kmsMtjMZD0mp0kQqZIWMRAXKDSDwyBdNADDSyc0kjT2A/QXy90m9+fS4g18Fc8XUT/LDaJDCH/hAEnN4/z77Zg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-bBiA+tLA5pZOrtC4u9KhUlh8mcXFMZoUmGLDII4Iu5uJxWoq2tox70OHOgjwbHF83Q5600xAX/lJ4cNw9WVIJg==";
+        version = "8.0.20";
+        hash = "sha512-rm8nD/z9X7KYcYBV4z8mt5QGIWQjkh6YJygK2+Vj3kCy/s1KCNXVoHMgnZ8XrX20t2vC03gpPPK+s1MI0Kwgng==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-rTUR6aubOfJFQOnmWuYhhzWQfT2SgnMXNglHXNTk9uod+C+P20ZaiJGU0YUObsNhi52MeTObNXPorBBqk5yKqQ==";
+        version = "8.0.20";
+        hash = "sha512-dOhLVfBO916TVgUqNwcaw7zTqs67iFRoJRl3jUweVFU6tgKpsiD8kMu3mkJ3wZ4VPFrJVKQ8+CCZ8jyZ8r4zfQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.19";
-        hash = "sha512-s4W4o/3xrWkMYmpYeRVk/POlelIZ1XuHvVFhC760mVp8jN1zvyhJ5anAR2DKBOP8RhrMRQAyvv6g+5yYG/b1HQ==";
+        version = "8.0.20";
+        hash = "sha512-ealoK3QVdtxWrKol2M3EvRN5PiUNN5PbhSVM3QE4mqxTknorsJwTvMm0YxqP7ii409KlttWLGLXzm2oqsVnkXQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-nFTMBMKK0daVxvMxE0ORujxVBRSbdfBDZ9em4i4rbipCjmy9tFMbyzTccG3HykaG5X8czARrWs2zZMMRjwnNRQ==";
+        version = "8.0.20";
+        hash = "sha512-WEaxn8dvmeGfUjdkmWLVMibh7VRCFn6YPARsFPaKY6hhp9q5Y4qfc7s632igIsfm2H1NFKGaWfqAccD1aVQZGg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-Jvzq5CmlYbc31/jf36++T/7PLMzkD5PemLeIM9i1lo8R53yRT8CjoyJhJ1GXWrdRCdwEqbGU2LDDCp10lWSyhw==";
+        version = "8.0.20";
+        hash = "sha512-hOcmXXo82VDqnbX+RaBFTXqglvYGxTwx7iM+JmYgcxnlhb1EV5NIWeNoLcEudBCijRgTRufJFAQES3U6s12LNQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-ZEiEHIQnRNuCJpyuUqtIDgS+m6ZtlHSuDwqxdnEUV8RQtsgcLGF4kMnr7sfw/BjjRqLwf79lcRCiOFWVrwiiZQ==";
+        version = "8.0.20";
+        hash = "sha512-SpmPD+pPVdq/adTKdsnIQIVyOlN+lUOj0ao89HKn93z3GPNr0wPkUPAOKScGJ+a5OztwBCxIBQrXYstIi4w18w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-pdJKTqFZEnWjO7YX3c1FU+gGB4/l+tILT5cDzRUUxf3hkUT8FeWzxcYLUySWk1MyoQcHLbyLvR1rygGbOf2y0w==";
+        version = "8.0.20";
+        hash = "sha512-KNrsKUKMljQJion4qdaFPBiFi+YbJsLMJ5vs44yawMhBOo9NObr7aw0mpYvJG6uhVgerM4xqTKaCPMF5Xc+Y7w==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-+I52qNaW8BZAbCUO26826ZCHUjXB7OXdMbS+bAOOv3gt/yAZ3NiN7RSj7BhO3yfQdam5YBbuj0cBiqdrayJhNA==";
+        version = "8.0.20";
+        hash = "sha512-JJYQ7liq6SOwcx6Tk0qi09EimH/SS4+qskF/qvzFC9wuJzAzL+rPkfBPZNRA/l7CRaBJ2SYF3Iy/jIGWHHb2+w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-dV/b0WViiujT19HQwz6fLKUB/orjGRJudQIQFmHM1Q/0mJ2Hr8GK103ZMpXHHGH+Fl/TqSCQzu8t/U0F9q3+Kw==";
+        version = "8.0.20";
+        hash = "sha512-UfD6B3qxSQWT1vcKxPi5V6FwmxKTgOFQxncFyIvJTr+9s7HrSJXieOLicqoO3yqdt/Kzzk7p6wjV0A7neBp35w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-S9oXhzzMHc7eNO+f6qwEDddpBzzeTqtasZ+HpSFPkCQwolaJ+FMe+YoDDvsvsyzr55rCIhjl1HlhzMyv18TFtg==";
+        version = "8.0.20";
+        hash = "sha512-osKzTHfYnmPn3KWbni+S6g3hpoAsI8K1cwgt9q2w+yKX1M7aZbRVD3jlDgGDRqMP4qEB0IiwL9LL2oxKGMpocQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-PwRDoFO8M8OPF6RzJfXYamSsXKCNqbZBS075eSp7b/+gGusjVHZ0ZAcVpLCQJWQmcR0AVx5g0VfN+Yu9F7NDvA==";
+        version = "8.0.20";
+        hash = "sha512-tl8FRifWfQTJCGijYeHICJm8MVpmlrRdRZSjb3ngn11aUrPT3kUgez5ACfONPuRiGytSqvFdZETs8IQ5QC+WGg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-9OHIz+fXQuYSL90LYJaPctGzan90FFiwJRDCTA4Zc32vDaXagKtJ/QCiTnqomCsyo7JZDLTkKdasArGfvdbZRw==";
+        version = "8.0.20";
+        hash = "sha512-TTYIos9sWCsMlqZ1d+zuSC8KrGQ5qiDlaX20Z+/PKKDc4IEcEZoHHAHw6HRbOaCN2+Q22h/rPZQZNAZsafwcQg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-VcehwYA/43AmPo9udZYDx6UMQXxI5hMh0h9gKK8qrdT9B0dJaVfdlKvlAs6uN/wGQId6ggVRJbRUZnKLpdoDsg==";
+        version = "8.0.20";
+        hash = "sha512-1350+8oe4EDEOPOrIq+MjFZ8KiOHmCE9gbLbFq7ELGjbrL1Q6WGO3zehotUUkGm0LkyYV574h624xFa4NHSilQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-g/LtDzB8jRYARNCN2q878xlDIeuRifUl3kSucaLoh30Z3cngd6+Aej3+cpZYMgM7jz+llfow0Bn4OJWvt1gqpQ==";
+        version = "8.0.20";
+        hash = "sha512-wVeihvD869ze+VzQTYgrYVUDGvP/3MHrU7oTnGCFU+9EHIjrsgC0kzV/Br0ix7lQBbhkvQMUlO1PJ4Ti1NN5EA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.19";
-        hash = "sha512-k0G2wrG2HHgC9p3BlePoshY+dhCtTHIvwaOd10DP0Uxanc2p1A1DAiekzJJPyigijzNXVX485Dp+muCPcfOjhA==";
+        version = "8.0.20";
+        hash = "sha512-2Yp4gHZDcFjP3/Tneo4kNR8xdU1wnVKnlRqyrfoNY/7aGdqC0gT3bHfCQn2Yx2dqcPw9OiWTlQupG+lSOzshMQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-KUPz6ft9EX6olnkY4hJESg7vX00GBD8VF9J5d1kV7E50sUNAT1csl69MzINcdtFHoc5DXF+rEB6lVGH05h1u9w==";
+        version = "8.0.20";
+        hash = "sha512-84ttmC61etKqolo6LQNDUutTAPFegR/OfhjjsVRd9Eb4nOSfsj1B+5DrtAZOySdDr4ajEXDDGQZxfwRppD2ReQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-+x0kVdmffJet7+YuFHKcREPMBV37bx7e4kfAjbD+5/+dA5KyAffcrQore4+gp8y9GY5q/lxgHpLdT9YF4X8ZVQ==";
+        version = "8.0.20";
+        hash = "sha512-UtAxgEjg4ouof5y4cRcTWVnx13chf5GjUx8tLnPoVvVy4nCQ1vAXz8p7xpX7ynIcOv0+xeE6gB2lqAUrBt6BRA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-v+Q43E/2RVECjIjyU/yIaKAdK2ipwf9iJ95LlFtBVaIxev+/CuFI6qiZ7TPWmh6ZmdlilqNdqFQj7qngTZG+fw==";
+        version = "8.0.20";
+        hash = "sha512-qQhPKP9gvxC5amms/hUOZstl3G15nSysUNusJyQFez4mssEMByaggQFcNSJQ7qVdUbHBe8pr7oXq+gqLeRh3mQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-FjuQE98YBxVTdMqhMN6ciE8af/J6EwkpW4XYC7vcJz53gSWJvB416C9Bs/1R09hP7Mua3lxTCzhKfnxWUmxCCw==";
+        version = "8.0.20";
+        hash = "sha512-BqGeZS7zLL21E3m9/kFnQJiMa/RDzH5IDxZ6Ie6GqGIWF/2JCrpFQ0Tojdztsd2HOyB0et4f4zmk5NwwJixRmA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-fWdoxak72kgmdK/e31YPvADhoFXjIOuUTe5BfhNr+oXFX6jCGxttf3L/W3NKzMntuHqpy303d3IrtgICJu75EA==";
+        version = "8.0.20";
+        hash = "sha512-9eAKWh0ctsXZIPyIFj98xnLmdvzGykKnKGnq/wCXDpSl31H32ZPk8ykHvdTsoWet2dgpXDk4QEmkDCQ7k3Jtvw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-P1RHomV7Ei5h31DTIQOtUNMq/CziuWdfjmtU9ykBOWyWBH3aCl1K3jDm2hUs88C8Cb7NuOP0FI6So59ic8lhmQ==";
+        version = "8.0.20";
+        hash = "sha512-ZhhScmWp7O3PQmDF4/P9yrJcbmxRRG5xWyun4/tgQ0tRiB5yWHi4GsEC1qYWDBeZgCWh3R/RQZpfrQw7XDEqzg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-olOQVkYIeCv0FFYfrV9IfFJVLAnhjk1T/HDIRiNnyJ7JH8HFVytxAx8hQaIPL5xLGQquM/mxPlAoH0Tm2+k6XA==";
+        version = "8.0.20";
+        hash = "sha512-zVpBal6XL6NzaWjLMILvv+xmd+dVgGzJxUkAUANFNzaA2tzaAhUdM+o/c/diSRXn90twNRTqZVjxN2gmHpOorA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.19";
-        hash = "sha512-4tRtmqt7/dUFo5EUzDwZ7CWYn3mOXbLO8+kQ23+CwPaTmkisNhOVX8oAAG6U2LZ2lCms6bFz0SI/C9zSMd+2Xw==";
+        version = "8.0.20";
+        hash = "sha512-nzloh0qieQdMYcVvdyDGh5mhIY8iX23btA4fml7QkN5mP44bfBhhKEn/x7XUUmOyiWU803ilQrXKq2w1KldH8Q==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-Q5PYdYTILXVSPTTXfKn+O8IvUH7kxY1YHc+Xl3r2aIUS7cAbKaWAV2S2WGUwlrC64E+ECyApC8hkJo8z7VOjHw==";
+        version = "8.0.20";
+        hash = "sha512-9FXDRSRDPn7Rv0kBhZcK8vHcXdPsWATa/qmRUYHAz1NOjJmwyvP0mUE4n5RyxCzBXftCC0MxefYthO2hyaHXyw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-2vg1H2cjXAZAiFqhuej6VRDPyFuiye5t6T4wdtCtQtE/xQYY2T2CgU1ibeLEFusezKhPYLHV5lJn040UevXhpA==";
+        version = "8.0.20";
+        hash = "sha512-xyfTViQUODt2a2Ddv+/43rAx6OznKrdztETIKWojJSKtZ99h7xjRsnTl3wfGNF4rsO+zwwsjzQvimB2qhacBtw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-Ci70ENA+3UZOxnQWgPUXuAuiWX9vtQVewQjkgds9plKsZTz9d1YsIsJcZy6yHeoOsJshiWmOfmTI2BlXtUsRIA==";
+        version = "8.0.20";
+        hash = "sha512-2Yh4LcGEhJdGywCpcnzSBjR+JdBRfNq40UUawMyEZVCW4agwE9F0oLte1tETd0xBAKgpkLaSKApIyOu0E+zhJQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-aA/2lxsdfu47/Jy97k0WO3jbA/8TCtc4eXli0zlHw9g3WFE7PcHlw52nLoY8nvTh6baB98f0mNE7nHqyWQ58mQ==";
+        version = "8.0.20";
+        hash = "sha512-WuPzqbeh1mS2QY5urYXIg9rec0pwt6soof/ikSX4B3nN6oE5bG65AwtQH1SLqcIHbFXH5qIWMRHEyorKeXRd6A==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-L0EG4UgRxbfDAXXMBIOCGt6MFCjEvasR0xUkriJZgK4YBldO47mePbesFxSGVCAtz0+t0hH2JNPZXBpKPajjBQ==";
+        version = "8.0.20";
+        hash = "sha512-PNwoTDK3fAoa16XlhCkfGxAw4Lh54aMxLN+oADsGtbTuDewjlmClsg29xXXfkXaPVt6wT6dJ4nS5S4QEx5nAqg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-MKWcwNJiO1e0fBQVHcJWnAYwwLqe78HtaCrWr9Bhe00bTeZb38+e/59tW68O+W81RbGJ9teBuUWHnk8MGQsTuQ==";
+        version = "8.0.20";
+        hash = "sha512-43bjE2OWN9+3d8vAlUltpr3Lf+TS1xNiFBXZCw8PDAJIr80PhWyyKmAUj8LSmFkKRxNED5mlcF/oH7bID2Dtfg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-QLYgv1LYdehkZ64BaCQ/tAjhPdGDHEq4TmLY9Afh3Hi18UNZ43HldL5v3bJ8rHsScoRf6mNCOjtiahBU1ziPVg==";
+        version = "8.0.20";
+        hash = "sha512-JefSxGVUpddeKa+vtOiuPkVwUWsVN9IEcbIwz2kLnj/UNm1dWb4Dw8+bvGmrHOieKy1crNb+hUCNhaG1tlEpkQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.19";
-        hash = "sha512-cesMCMuSgKdhTe0G1Ix+RJ0dzrZa0r7SYsH6uQSXIR9zbSlyqs9EhqSP4GWoF8YuBc76AxYTSOuXp2hwqkmHCA==";
+        version = "8.0.20";
+        hash = "sha512-rIlOBxUbcuPPgUWA0rK3s4XeTRg1a53JE7cPdtFjBLlM0z+dmeBdzm3WIjpOGu/UKmMst5x5ryoujHLC3dX4xg==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-C/MtxBxoEnhHwQUdz776+FBVSuJgxqcaVp9IqoXjsE6axAq5M4opbs0DeaMyeiSCbHcsiihCDjnLnFb3uSVCVQ==";
+        version = "8.0.20";
+        hash = "sha512-AP9EHyB7ss5643rWAKE7FaRt/SVHPTUEhrKRISd5/HI3xnr9gnsjEUykX3fjVPp6ax8ICPb4T9IHf6/alLJXMg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-K8JWBy0ampzz8lsHMAnnZY1m74C2aVQ8QTi77rQZpDFmDxXDwgvW8FArmRyN1eJC8cO0B/XKK+Ytwug0EqTTwA==";
+        version = "8.0.20";
+        hash = "sha512-YWtThzSyr27k7r9H/7Y8tYwYmrXgfaBq97UWLh8JDBfq+ghlP3KINgyLaTTAW3OIH5zU+ezy1MIhwqM8xZrPKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.19";
-        hash = "sha512-y7SMliDR8ePTMmVj/VJWYI5R6kXeUuZDPfhyF0E7m+FzXaSbe7OgLGJbslkeoglZbyQ+GFPBeE/HqvHZwfrOMA==";
+        version = "8.0.20";
+        hash = "sha512-AfmWcWzB58IUuNWMpeAd+otKj0OALXxdZDwLnPhCySVk5/9EmT2WxceiQsXThfs1DxVW1R4o34Pu7HFQF7i0aA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-QEQSSsQ9tijRXHU6Xe1z4Xm+nLP0xSyG0pm4QV4IyNGCZGRYJ2B1WDKRRUR2yddaiZ4ic5ZyDFdUFFx7oHpzkQ==";
+        version = "8.0.20";
+        hash = "sha512-ew6SqixVxQdEjZCCqpdNQpl7L3/L8bJeaJoiIGidjDRel1yy9xIT6tWytPdJNFe/OJ2TEQmhqUfbHyXt5sa5nA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-4pRwedZaoa+WHS87F9xWVbOGLXnOAHMjgUhApg2rqAjXFmPNbgNJsXNe79WRin5b8F0A9RH7WqwCW0dC1MgJVA==";
+        version = "8.0.20";
+        hash = "sha512-S0y77RmklFuJxOqzT6FTFFXSH7BxHzFtFVY/EbdJkEG5XBuj/EgPUJgjSgObZyRKKxxEkA98x5wzddWzXRcO5Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-XTk+WJsxDOqUeAe6PLTNEPohOURWpufLTtnoLAB7jey4yRTs4BN1RVHB1fzb2JVYt0ZrmAGhFl65U2HP8freow==";
+        version = "8.0.20";
+        hash = "sha512-OT5q4JyXX7Nr/cy5jMdhAVt8NjgJ8/73Z/3qvWjz3PxoGgo1Q11gbS/h6COascUcY3URJOgwObkZ7eu2vseM0Q==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-HJm2e3BmQp1AmtazVr5GgRn3JDnvG/3Wy0b8PE3zToMKJ/ibUrjpmdxsCPjn1ZCJLTTwGf4rJGVj7ivivNBgkw==";
+        version = "8.0.20";
+        hash = "sha512-Yvidrsu5zVlxXAO/H/ybtAiipZHLZZSWeKZGfg6YWNsg7KuGw9hSQMe18PfuhWaYxzvxCxf0cA0jkA4ZOOVm9A==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.19";
-        hash = "sha512-CW2COJrFqYMeWd7hkNXlE3X05+9wEsxmAjW7oeGaU9FimgB9ksCOv9mqsf5Cu4IPDYHwQOuazvd63+89UjFBXQ==";
+        version = "8.0.20";
+        hash = "sha512-ZutvBMofw1MJ+9OG+kRmySbLG60y3VdFcCuqmEspF66qquHSqyXznz7Ex4grpvw4qyp8pZx/v8M890JTQZTyug==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.19";
-        hash = "sha512-3xbWEAv/E2aKa+0x6LIVsDFnjuLzyU5H/2ozDW8+nnA/JPdI1YWTTM5naxdIyWzRuGmxowfoUKd2aA2+qtt0Zw==";
+        version = "8.0.20";
+        hash = "sha512-PQidh2wSE073ZaKjf85LWQ75w9kuLMroHyJ7NWXUlIptHC+asUbHDUwUYHSilOYeTlNMxVeKcZ6qJ1zG7ubCJg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.19";
-        hash = "sha512-E/C4I96r86EjKqW2Tn2zN8390oSymQei/YhXg9QK7x2kBwuwCs5gTHaApUXxRp4d6BqqUaX7GNZesKq1FLqxNQ==";
+        version = "8.0.20";
+        hash = "sha512-FJGlsipj+/8ywOfkYnzimVWx3qSTiF6nsgKT/ysdeypBTC4YqRjc/alJksMRjOGLvJ/IWGfmbhVH5UTFZki8bQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-pGUh9N4I8QFfZ40Rmlyed7ATMT1boIYM+dLNdqhJPttttQzmv5gbFb0ed6sz7HvCYcfJTFWv32F8lTcLjp92GQ==";
+        version = "8.0.20";
+        hash = "sha512-nRJqYuX9OC7/S/SD9tSqYdjVJBLDpzOuzJN3r0s0eYn2xZYfzGqZqR1yHus1FQKnDECJMUlQXQ0S3PcXcel1Xg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-qAMK+KMMJqvY0U8L3knVx1zFK6G6nLvr7Pes2LGQQ5o/WXHGEIzju9Ga65NeF4thn/teXx+Cm2l41/QxiyJARg==";
+        version = "8.0.20";
+        hash = "sha512-qnSGS/vF3E8/gOxdhm8K0faqm3ldaKPFeksLzQRTZFi4o7Bi4AHwUaa7DK4JmRQZdATqJxXhau/JvvT02Gckzw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-Uu8uktFHgeD0K2HblQxoSpW9QXL/1QT1IDNQ9PTPQ0+qHUkASxpVmW22Q/OuLqjmhLoDuTwBQbzHTt1726hXow==";
+        version = "8.0.20";
+        hash = "sha512-8LrbEM9eLe18sAIWyWi7M3AAmjh05lZ7XkX6MXFzYm6zVJJ39E346zCGaTxbQ2NmoYv6OYN2Vxhz2Fpqh7wEVg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-Ai4Ufjt0Ax7HrQE8JtH7Y/zT4yas0XukRWRDBUrsuCIyddx4gm5u1lNCOZvJFIDerEacnWoRiUFW6CaKVlw1gg==";
+        version = "8.0.20";
+        hash = "sha512-TvXVK/2GINdFnI7XtkPRmLc4E7dBjUo4rZjsLb4CNzGz3D537cONTDDuWxjkAxoCacAbBi8MKLviPAewTo12Qw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.19";
-        hash = "sha512-u9qb/jJRjGTjkFRkSKQC9hfnK7IHDmP/PCbhYF7PiJH8/XlSpKcM5fhfZ68UxEuOnRpwTJNXxLISqgjffDorAQ==";
+        version = "8.0.20";
+        hash = "sha512-Z5s4bwM8OTiF9JU9wGu7j+3AO/xmt/UqvKR1zhw7KyeuzxFdvGRFhg7Jd0AfuzSrlFlu+M1br4mEe4Y3OAa7WQ==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.19";
-        hash = "sha512-aqqj3wMguPyHC9A+Za59KfhfKqKTZrX0b8YI5p2oQME6KL6FnUqnOBtMWA+EqVRmpnstuWbNQr7fYEZ6AkfZWw==";
+        version = "8.0.20";
+        hash = "sha512-iFfqMX5CyeyO0ZAkN7fwQ0TrOosiPl7g4CzNIswHurqho42akKt3n4z7NJ4oJXSuE7S0+QqSuT2uEXCBAdGs1g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.19";
-        hash = "sha512-4hGpGg8mphHFlJ/Z9q1VBUucrTrayVz8yf7Q01nheO3TIeJzR6oBif2CiiBggZWGjyze5om29FWUes3dku2Ddg==";
+        version = "8.0.20";
+        hash = "sha512-thAg1upqdp0FI0TdG0XeHbvzTvKfTB/bqr/U8eDN6C/hQlqzyTinvv7A9KDzUn+RsUIMr4WSHKsyO+VpjNntfg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.19";
-        hash = "sha512-M3DsPVjB/r8D0jQzJdPq0TetSSc1TbafVfzRMNfdzeXH8tLEjoW+f7X+/H8pRpFifnf1je/ZudShNx43EcStdA==";
+        version = "8.0.20";
+        hash = "sha512-9u88OqkWZze46aWsltLwCd8kZ9H90wjk1Npq2rNzvS2ZX+PzG6+c7PeRH+19esBREB9ii4E/Y6PnD7CqmLmxGw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.19";
-        hash = "sha512-CV648uVcnDWldJRlFFi8Ew2nvp5KnJnnQEfPUoQKFATFHkAQbUIRNovRHfaNawXWGmKKn4/nzxKH+0lxs+VdBg==";
+        version = "8.0.20";
+        hash = "sha512-mdH+zdMoAcKWJHr/DRktxkDHEjhcqawma/+vd13IQsb/L7Ogt11c4ko3dQK+r1FnP3J3L0AX/NfpdzkFl/1kcA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.19";
-        hash = "sha512-qGcn373HrhZLCxZf/hLlG/OgrmZ5XZkh2mzVci5IPsp8jzqimStPcI4M7jgpYXfAkP3KJ1DsgtcqnSSHxz1Q8A==";
+        version = "8.0.20";
+        hash = "sha512-Ajwwi5j8c370lpsBBFkOMD6G7RXwCgIRquEuUoYSfskfL6TNu8P84KWx9DAdEZyDR0djHOAYPRI0a4681weGYA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.19";
-        hash = "sha512-BzT/17Ig4SqQIvkK42a3BcCQZMupZbtPTHBTdQn3qpgeZjXMiqxIxlbmrVqQcAMgFDo3EJlevy5hcDTLHd6YAQ==";
+        version = "8.0.20";
+        hash = "sha512-bScjeRSsoRSxW+MCnggiYaa3FNM8En4pnAcjIx41GZTof0sAGCA9/8ay7kf4+zXDPJFXBb+EBwGZuzVemMtY9g==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.19";
-        hash = "sha512-X2QLkgVo+ECd4ToqoXJs252UvB0gLF/pVzIADzczVmwnnZ3xw3QscvkEBQxTJRxfzH8y2n5BTJ7WXKVHPs6Gpw==";
+        version = "8.0.20";
+        hash = "sha512-cyjz6KHwDaCvpLR1DM9JsJB42iCvq655XojxuXb4Cfi1I/fJ3eUXvTf8lv6gWIkU99m50QhbO4/ZWte9+s4ymg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.19";
-        hash = "sha512-h422hRX55IIMQzTpHJXsKHWYTjmQhnu9SqH5etR8RToZpL9nIHXo0dWpl3bmsBpfKPhy+UUXU0OaR8OSbgzETA==";
+        version = "8.0.20";
+        hash = "sha512-jYFR6eljhQrhg5rDRzJ99SR4PyM/VVMvHSx08bTw52PIdmBLoVdwz/kS8XTfsJiRyqI1pBOWOCAhIQK8sy/EMA==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.19";
+  release_8_0 = "8.0.20";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.19";
+    version = "8.0.20";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm.tar.gz";
-        hash = "sha512-a0r+fc5qsucGLLSFxGEm3OnP2wADch4NiIbM+qmm3uw+66+KTeaevklGOUDGyO9a3cRRLZwiY9gXELk09BuR6A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-arm.tar.gz";
+        hash = "sha512-GI3R8sTr6JMqoyVInQGSNlYdIhkki382gBYJtCPOzPa1tv+vDtNl+xmy2gtUN4tRRdnoevXNlfpG+nxZXzy+Qg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-arm64.tar.gz";
-        hash = "sha512-zBRQPlwdlKMz/YBI9ih2D23ysqzU4NXvRly7/ME1F3U9b9Wx1f5LOLB3BEGKcT4TOABUU6fLuPs/MAdg0A/G5g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-arm64.tar.gz";
+        hash = "sha512-F7AdYwmJnupAIA/ESctgbfVUHFgCuXPCHnHX9VObcss14trzi9nhfsbcz7I8PBev2x5/BfsT8QcBVh0uALGWRQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-x64.tar.gz";
-        hash = "sha512-lQP+hGJ3Fsud8CxkjjSXHG7E1EaG8hO8b2vXS8VP+0HvJy+9LIqj8KMJsgZkeWwS+cd7E3AV+EWBrCZa8vIWhw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-x64.tar.gz";
+        hash = "sha512-IocT88NgDEnnkk4m3IYRXJZ0tTCLRFFKU/Zw+nhQOKqIXq2M0sHBhQ0VZbaJqVqS6X9HLYZCmTDb+xFKpgIOtw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm.tar.gz";
-        hash = "sha512-fOY8CoBCDB7T+ylYy0oj10/yXvzvCmeP93H4LDU5ySg/1txVQDoKtMlcuigGp24MjXhkvr6Y2JFP773u+XBJJg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-arm.tar.gz";
+        hash = "sha512-y2JY3VMirftGTz0MBVNPxP0+LAm/+d2E62UiFh3nfqYHWslZ086aaQFRT7t916ohcp78OgqaG0AUDBG3ZBrL1Q==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-arm64.tar.gz";
-        hash = "sha512-TGVuirBIgvdMkfeTEXTwg7Ju2QR4vPyQmEsXg9T8pr6x0CHsBEafrmEOuwLfc/v6WK898ejVLL9eBoy/NBiNIQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-arm64.tar.gz";
+        hash = "sha512-8Q4ZN592YR83btGbcB3MKjQHzYOlfYBvmSkpWpAVP6KPxidA+OXDQJSpVeg0pwS/QBsJk/JSig7i9dnPh2F5uw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-linux-musl-x64.tar.gz";
-        hash = "sha512-7YmdUku5ok0MPK/e1tD0bsYghX89i0Oq8In+hgb6hsJehdksX+6aAW1Bp13XbDA+LtwtM5PA603DhsWuNjTCLw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-x64.tar.gz";
+        hash = "sha512-dFje2NJ1SZ0Bkq2olrBCUBgwwsKYWVgeLi2x02u8ZSryLzACnQhmIM0cKnJpq5TQ69lOK01ZkJYomUbvOQNRMg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-arm64.tar.gz";
-        hash = "sha512-Dd8cdJjFKLIJgmOz0wr67QtARqorQ9XHqDdAOh5VgzXBqViqhZtJjdKiU6851B8YHLJpqukc2N0QO2SgYJ+YQQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-osx-arm64.tar.gz";
+        hash = "sha512-79IqhUjjfn2fAhTFrG+TLEUqMDgHlow4xbDgQzs2rUY9V1Be/pdKzv4Nk164br2y9xCqmnQrf0lYhZ5HW0frxA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.19/aspnetcore-runtime-8.0.19-osx-x64.tar.gz";
-        hash = "sha512-msIOtqYmFd+4LFZXwRWHtiHz5/DHxt0xEd8GFIIJLWPBy1T9Ka2w/kOljGPrLKitMi98cixuR7JLeDhf65PqRQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-osx-x64.tar.gz";
+        hash = "sha512-U53FTV0qVC1W2loz9KNr0EyvA805P9xxD/82ES2cyQ0f1fcOE0uFFVAGS8AKka9hrsL/SZOrh7F8Qc63XvG18Q==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.19";
+    version = "8.0.20";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm.tar.gz";
-        hash = "sha512-sqsF9qKc/yuEQCEbxZGvCTD7Hp0IKxgLleYbfU4bP3n9KnKbKbqrcRSHgNksZGGOz4xWqM86ymIq+yn0h3Adgg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-arm.tar.gz";
+        hash = "sha512-OhX2U53Nqx2JZeI+hSrymYrYaN3GzubM1GCnfZ2hjfgsazcw8zZ7kLH3A4+T1m9VMk5e/Q986l+E3HfXVjCy5Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-arm64.tar.gz";
-        hash = "sha512-E/VgfaousPmg+2o2GT0oq8lFQgivVXPai8X+9cvrcLGH3q2valKz1G/cxZyFZ9t3wpN3XP12pD6B/5nEtCUFjA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-arm64.tar.gz";
+        hash = "sha512-WP0Zr+zl5BvvDsrxUQVNdH0T+Qjzpifg/bc7hf9Au7XSq6hapD7gbVFblZHLzdT4esG050kj3KiU35t/xZlR+w==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-x64.tar.gz";
-        hash = "sha512-D2buVk/JqGuOrlQD9DGvWVZeYvXrWfblA3fnLFitJFUts7cuz9gkuFCkI0+u2yE5g7icxHk3L8Q2pVP7CGu5qA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-x64.tar.gz";
+        hash = "sha512-S4ARd+AJ7HENXiURUAqmC+yVgRrdUP3FmwClxIaEDGbwDEjycs96L4Ep7RWOxbiH0d1gWU5hL3SbpI/PSK+c0g==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm.tar.gz";
-        hash = "sha512-PVaVISyjZ0XjqelPUn0krVhdOL6hcfectHIl/wEEx8b4KBXDFpg+Er5UJquSsmB1XTtE3hRHxqsiVjJuhWFyEw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-arm.tar.gz";
+        hash = "sha512-A7oEEe/iG6JKAJo4CpiujBP7knH2mmCGuLmGMD7A2FCWfWy2vjGmn0RakyI+MYfm64nvf3PmgvDc67ZUw8Fd3A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-arm64.tar.gz";
-        hash = "sha512-iOLYHKbsUtB/5xA3LQZPKjCJVzXHZNLZrcFI5OR//Iqjd2EDKZfvfTF8KevKvdqcoKmd0fpfF7nslrxtNKiGOw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-arm64.tar.gz";
+        hash = "sha512-MhS3znevvLh+W6qqS4i+7VQ9vF8s391ytkccudzRvzxWzGfeqaIVDTDeoO8MWFwEnbFyQ9nsYT75KFCeudZLTA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-linux-musl-x64.tar.gz";
-        hash = "sha512-NvvF7er4ec5DBE4eEAAgfyKfLxK+5MNSETBHaYAJHIMqdBDc9fN3neITSYeu3C+j94R9v5oxPWJ/IJS/vNMqFg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-x64.tar.gz";
+        hash = "sha512-l6bO7rPRMsfPKjyxCSMEwCULN2yCylDLCyeJ5888XgTqJcZkRH+SZtoGDk9XP9un7XX8V1lhqIOqMzD8x5XXuA==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-arm64.tar.gz";
-        hash = "sha512-FLRqUrgqF5zF0Sk/S8CWgFFHHw5is341Jaj3QR0pkP4Gds4OF/5QsrJIgA7rPRvZvYO+w6UntnDYJeGkxD6Pjg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-osx-arm64.tar.gz";
+        hash = "sha512-Racowrq4laEPg2p2ne1IPw9XIAaAIPw16QJw22wShR0rqz1oeb8hIrTKGMCvwqV46gwVJ/hIPAVymIueLyO2Dw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.19/dotnet-runtime-8.0.19-osx-x64.tar.gz";
-        hash = "sha512-utNVjAqIbe35M+ZUKue0G3BhI26hRBcLOeD76bYVunbZ8GVt3Rub6J75MviU7enhtQMC7Qk+oNigDwSuYTZLyw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-osx-x64.tar.gz";
+        hash = "sha512-NuVPrATi61Gl7IYlGXggAAc0EAPN000hKW5LhsdcX9Fsux+FIte7VX9Rr66F53RjT6mkfdlQzxhYI24tjJxufg==";
       };
     };
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.119";
+    version = "8.0.120";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm.tar.gz";
-        hash = "sha512-XlKdFdSfvXbJiMSL4zKr5ALd1UJClUJAwvHLYkZSd1kujMdjTxnNseQgBYLKd3ogu3Yc+PyYRV5aupzp440TjQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-arm.tar.gz";
+        hash = "sha512-VOUr4dIsQTlGzhcFY2NkgsjLrykFPGk0/jteVdaAwOlZsUWpxTaiTwePwo9Lmi4a39ee3UTtIIvrLUAA2uQ/SA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-arm64.tar.gz";
-        hash = "sha512-y6QVS1UcGCsRhc34mlb/UrtGoTXzS99kGrE0DeqyPubQ8kwHDwt6WuIBBdcdwxURfyit4v+jLCJCvbLpyCUszQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-arm64.tar.gz";
+        hash = "sha512-RXG93cvaH9BkIZuM/aLMWLRMvjdZXTePf4E3tajrFsP1IY0JxCBpuKvXox9tdWvI/Sw3s75U3U8Kev4gEroKBg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-x64.tar.gz";
-        hash = "sha512-L/7DOAoqwj6AHHx1B7OWL/0jKRGtBgJLdLl92stvRoBNj2MZ60x/x7Al9xZ3fUcRAhnK7rwwo7H+kiMGb/ioyg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-x64.tar.gz";
+        hash = "sha512-IYTw8G5rBj4MWt9iGQ+B8ATGMc+fNAAR4lUX7OsDzTWpTBh2Nm5acwv5M10nNOG3eWytGWQVS8Tcpaunj8Znfg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm.tar.gz";
-        hash = "sha512-XVXCZxX9srBQJE4TZeW3FZ0gbLTsvgXUDxbjtYbVp/vbSQQSr3IXF77mHuF8FtcJyOUY3TywxRxtEcKQp2mgrg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-arm.tar.gz";
+        hash = "sha512-M4wFGI23FBB2L6kKuc3oObIKqJ0oD9weOL3/2eFtdx276rSPntZIj26qw4QZRoDrHS3zlKvWwwkyRns4j/P7bg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-arm64.tar.gz";
-        hash = "sha512-JV5KFwlIKBYCHLwrn7cC3BG9nueksa6M3YnbV202M5moD2Fvftq2RXerNNwGf2BezyR2BuQX26TjxkjrtOppSQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-arm64.tar.gz";
+        hash = "sha512-xur3K9S/URIQoUqlyXLrJ1EXbheLOxKfd93GolcBPHW7+iLHz8LcOKLB7vf7c4beJR8xiFb/+3a3ba3afOXyRA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-linux-musl-x64.tar.gz";
-        hash = "sha512-HO040qC2vVYJdccMiHBotk4JyAUjlZFk/wXw2VaUqbe+c/jrAt7LknGDLpIEtEZkNOo+LIiqujufyshTgzbUzw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-x64.tar.gz";
+        hash = "sha512-sRIq3M4ltCP9ezgbuHa6c04ueHrvV18Xp4gT0A2Ypb7ATRG6MPza9gLZ6/HZhUukOAyAdo43cxjhESuI2fY2Ww==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-arm64.tar.gz";
-        hash = "sha512-NNERmqe/mqzEJgaZOu8C0pD13B5snm2aTbCb9JIRe9HX4V1Qt7hp8AlUzUqpfol6HoXvRe9S79TtLoLdKAnpgA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-osx-arm64.tar.gz";
+        hash = "sha512-d95WUshteRi1HCAUBxDcbpeOza9G4HQWPbR15D2SrClLUN8zQ4laxkgKfNqXUan7HiaDvDgcNvC5Wxu9pQt0TA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.119/dotnet-sdk-8.0.119-osx-x64.tar.gz";
-        hash = "sha512-A9H6KOJDmrTSCoFRjdOWOSlS80A4AzXQ9i8JRWDmoiQx1Gn0UDd0CtuAfXwCT0KAcJ+XXgUUBrR2nfIlGoHd+A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-osx-x64.tar.gz";
+        hash = "sha512-74HY3JOfgDWzszkkOVODCKr5EP0XmP71t8zKdXgYpt/HsjW51y2/Ime1abqgro4kKwhfoKHQOEXLgTzfKRMssA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/8/deps.json b/pkgs/development/compilers/dotnet/8/deps.json
index fc79ff523958..d31c1bacfd7d 100644
--- a/pkgs/development/compilers/dotnet/8/deps.json
+++ b/pkgs/development/compilers/dotnet/8/deps.json
@@ -1,4 +1,34 @@
 [
+  {
+    "hash": "sha256-ZCVXo5j7/gdd1XNirzopmGLr8gQ2YjsVejF34oJIpnI=",
+    "pname": "Microsoft.Build.Framework",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.8.29/microsoft.build.framework.17.8.29.nupkg",
+    "version": "17.8.29"
+  },
+  {
+    "hash": "sha256-OHQ6xD72djcnILY6OWJbmg1MG1SUAhvoKvwcu2Gq2oA=",
+    "pname": "Microsoft.Build.Tasks.Core",
+    "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.8.29/microsoft.build.tasks.core.17.8.29.nupkg",
+    "version": "17.8.29"
+  },
+  {
+    "hash": "sha256-3ZvH65ZQBRboRH0TbHEqOuWG0TcoOB1Duuwi6x+HYtY=",
+    "pname": "Microsoft.Build.Utilities.Core",
+    "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.8.29/microsoft.build.utilities.core.17.8.29.nupkg",
+    "version": "17.8.29"
+  },
+  {
+    "hash": "sha256-XWYYBmjI6F4UVUetfbaXgrDXc76Amm42mXsIk8b+q/I=",
+    "pname": "Microsoft.NET.StringTools",
+    "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.8.29/microsoft.net.stringtools.17.8.29.nupkg",
+    "version": "17.8.29"
+  },
+  {
+    "hash": "sha256-ic5h0cmHIaowJfItTLXLnmFhIg4NhaoMoWVAFMHKdzQ=",
+    "pname": "Microsoft.VisualStudio.Setup.Configuration.Interop",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.setup.configuration.interop/3.2.2146/microsoft.visualstudio.setup.configuration.interop.3.2.2146.nupkg",
+    "version": "3.2.2146"
+  },
   {
     "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo=",
     "pname": "Newtonsoft.Json",
@@ -31,50 +61,50 @@
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "b97773aff2abf8d64309ee22aa298978175435a2a431f2c95c4d07ccd43a23fd",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "sha256": "5f06615900e6a7bfb980e129d14dac426cf58d14a763656673f8018651f8e5c2",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/8.0.20-servicing.25419.14/runtime.linux-arm64.microsoft.netcore.ilasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "ecd77edd965eb444eac6b19cd930524ee588259b35049fd611d5313338897ff3",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "sha256": "42af2724ff0d6fea3f17ad6bd562e4d9997a26c1594583eade689b2227957377",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/8.0.20-servicing.25419.14/runtime.linux-arm64.microsoft.netcore.ildasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
-    "hash": "sha256-g0fUr4yUN+qcqsydiqdMkFT5nmuH5KKKC3XyrOXKQpg=",
+    "hash": "sha256-pZsmvZYwumSSa8wRXK+xWQEiFKwz1uZ6bIOuE3mcsCs=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.linux-x64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/8.0.20-servicing.25419.14/runtime.linux-x64.microsoft.netcore.ilasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
-    "hash": "sha256-bf/f8L0OmzBW5KhrJFVurdtbewUGxcUbgbEgIZ6NLYw=",
+    "hash": "sha256-9PdUpzRxGkbk3oe0XOA2ZzRcPHSGtgF8Q5mD+Ac0FXU=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.linux-x64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/8.0.20-servicing.25419.14/runtime.linux-x64.microsoft.netcore.ildasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "c02b0af5c5d1d0a608d25111d95279d0e880c33a96fd0757be192be9f7eb5023",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "sha256": "3e2329fc43df3ef86a90598337e2293b88f9a5bbc986a3c634cccd9c5ddb4dc7",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/8.0.20-servicing.25419.14/runtime.osx-arm64.microsoft.netcore.ilasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "d9b48b8452e6451ebc121d6ea135085d8426575457b08745126f6e022709e29d",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "sha256": "c22e86074544b9d4a9ae462f736ea5d6370fa4ccecc2a7a1eebe6146386e7159",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/8.0.20-servicing.25419.14/runtime.osx-arm64.microsoft.netcore.ildasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "17ad72cfd2b22fa3d7ad9bf032554c21df39515fb66126b4aeca6734e687f79e",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.19-servicing.25365.14/runtime.osx-x64.microsoft.netcore.ilasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "sha256": "78ffd9cde00c64cb7bbf9aa5b041457898e73935495c23eb7b6b78298577ecbc",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/8.0.20-servicing.25419.14/runtime.osx-x64.microsoft.netcore.ilasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "7374baafd5248e2b6a720e669bc1e9f07feefd8d3ae9017e6249e8ea79a90a6e",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.19-servicing.25365.14/runtime.osx-x64.microsoft.netcore.ildasm.8.0.19-servicing.25365.14.nupkg",
-    "version": "8.0.19-servicing.25365.14"
+    "sha256": "340876d128fe391cd3cae24ce73b08ff36b2582b2b32c40aabe6a28bb51f4c20",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/a65e5cb4-26c0-410f-9457-06db3c5254be/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/8.0.20-servicing.25419.14/runtime.osx-x64.microsoft.netcore.ildasm.8.0.20-servicing.25419.14.nupkg",
+    "version": "8.0.20-servicing.25419.14"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/8/release-info.json b/pkgs/development/compilers/dotnet/8/release-info.json
index 654f832639d0..777a4e02c68f 100644
--- a/pkgs/development/compilers/dotnet/8/release-info.json
+++ b/pkgs/development/compilers/dotnet/8/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-4mzLIWt2bYFqZQZqjMlm+WGnvxux1eorqUHEHsDs67Q=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.119-servicing.25373.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-pB2tVzeB/EAwXTNbzG42NT/3gnczxtaQ+oH0FvtHgnM="
+  "tarballHash": "sha256-ofEnxp3dS2Zb0wCwRY5zWa3y2fcg4QHeMn6H5QSpOMo=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.120-servicing.25421.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-7Vf/6+FrbIxn6WxlV1rEEr5dt3XdwTx8fiFcFgUkaYQ="
 }
diff --git a/pkgs/development/compilers/dotnet/8/release.json b/pkgs/development/compilers/dotnet/8/release.json
index db2d0e9e6e23..9ed73aa5df9b 100644
--- a/pkgs/development/compilers/dotnet/8/release.json
+++ b/pkgs/development/compilers/dotnet/8/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "8.0.20",
+  "release": "8.0.21",
   "channel": "8.0",
-  "tag": "v8.0.120",
-  "sdkVersion": "8.0.120",
-  "runtimeVersion": "8.0.20",
-  "aspNetCoreVersion": "8.0.20",
+  "tag": "v8.0.121",
+  "sdkVersion": "8.0.121",
+  "runtimeVersion": "8.0.21",
+  "aspNetCoreVersion": "8.0.21",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "6825a8d5c72c1893049c2c5ffa491b65cbcea7e0"
+  "sourceVersion": "eed318ae2d2a3b35d344b9ec73c361265a938310"
 }
diff --git a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
index be63474d9fef..3206eea1180c 100644
--- a/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
+++ b/pkgs/development/compilers/dotnet/9/bootstrap-sdk.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.8";
-      hash = "sha512-HSxwnf37OGRcVt9qq6zwaPoqnve6MXpwjq/gzTagXAJTM3AgYE7gtAzFKUPj2/yYLAgdHEi2y+7N4e6LJXJAQQ==";
+      version = "9.0.9";
+      hash = "sha512-W8dh2WCiNWN4NAyhWaKGrAM/ZcCBem0Bp0EMPOEDcMlFrIm6ibjCnA7DxDxWPM/W1Kyzt5eLToqTXhhdw/4QuQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.8";
-      hash = "sha512-14cuFcWzlQUTtNwpeVNCP0q9bUfdm0lXFGd8fP47uulSBIJlcvUmucas1BpSmB9ofsVC+jcmkLr7EvK/l2zCXQ==";
+      version = "9.0.9";
+      hash = "sha512-jhI8LV56Ba2Ft6tzbpdUqf0eH7aMCEZvVQlurV7EYUoexSzhqT+qb5t7S8YxU/57R6psvvnA6uMoVahh7SFQhw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.8";
-      hash = "sha512-rXC+UlNcK0NDSKCc6NTc6KGlBSKXvu0hP/oamJ0+6mgETnlySbRimOOp9ZOipoXitRk7sXdWBQH7F4Jy1UEFyg==";
+      version = "9.0.9";
+      hash = "sha512-iO2vcnhfd2DmDdLf7JwJDZWgH9PSSsKEYkuyRKFioQSPYGr0LonWcB+tlacP3LzQjSUH/WSL7sNBRybJMt34hQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.8";
-      hash = "sha512-LVju0J0eNHVvP8nQUmCiJIWTZrAo1TPoNRtMe4mB8WpqW+VzOHNkKNqycTCPxJ2ytN5DlQL055LtSLW7+lS/4Q==";
+      version = "9.0.9";
+      hash = "sha512-T8yCcJrvW7U1Lr8wk6mhRbxr7tpv1ixLmmSxKFRRSAX5jw0fFDwFP6UftrfFG8joxL91n56vvkMuO1+cZgDIMQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.8";
-      hash = "sha512-qa9R51SRJWc9SdEM3BGVEnV3AQm9rSQ6EjBELmcwE6mUymrLCSnHu3HcEh6BNtj3Jb1mk4i/mU1dWag/C+qdMg==";
+      version = "9.0.9";
+      hash = "sha512-69+Y2iyi+p5X7EOF+iGs6foOhCpA1JIfXxaimipMh3U+5vUU1g5jf+BexzCidM6FgbhkFCEt5lw1TFMrxZiphg==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-U7dmRLkAb8vAO0UlHXtPHsljYS8XRZW2GnTc/3KCvtnePTQvVaOwAr7iLyY5buPykg9Pd88wwzBBOtF/97mlsw==";
+        version = "9.0.9";
+        hash = "sha512-l7spf3TE7A5XsgA0HRkbmYDM9S9F0MRCkORxp+wi36OxbKrxkTg2YoD7EjZGPFD374ZRZY5ExZWhZd33Y9P/Ig==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-N4tnUp+0xdKb/m0tmHBic2YKlO3oWluKGtf5nd3eRZmtUdHQOCOjwCZzzSG1TW4MMIBbtc0ul21CeDd3xTghCA==";
+        version = "9.0.9";
+        hash = "sha512-kyQI7HZcsIjNScBcpy4IDk/OSa8fcdRgJkQLnMaGGBoM0ou2d73d0in3Jh0YIKwDnmCPI4O/54+kDB7e73TxJQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-01bVanORYWTIBcqg8SJfqVrWcadM/u9MYe6Y35fKjTm+S7nqmyXXxkJqsSW1nSiVTKLopIomBZU0vF6s6EHwXg==";
+        version = "9.0.9";
+        hash = "sha512-zH+nJapjIL97SGQnVe7lSSnB4SCNvLaebGkBe9/4j85Z9F37DdX2lPRFrDAhbN/RnBhQaf8iKqHZ2O6Oj+pzLw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-4JvBQlwuNpWip4n/jOMirgb+KTq40S1dHcq5/nBmojKRMARUU/lJiUqdH85NRamUE5iJocNsndWMLuqfJg9BaA==";
+        version = "9.0.9";
+        hash = "sha512-zzTkfpsabKX7gw986tFP35KUUSdvnJsPTYoH5fXAGP+wkyeUXEkRdyq8rMnDPOgNPvD58iOotmjcwO/SXNssLg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-rRu/lQKiSzP5a0Jo0Y+gD6dF26ZeRXkJWoRwxYGmj1NowU3DedL4tidTdFSVDJJ7p8jGLRhDB6x+MjpE05QL+g==";
+        version = "9.0.9";
+        hash = "sha512-nbbjJS04mF4DB41P92BNuzGfVoxnxaoDUqDNsIPfd7V2o45/QhM9rbxzKEA8CxajsQ0g+l/LDp/Fpv4fkKe5sQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-vWcLP1paVt0v4fwHJB0GYYybIhfMFCiD/hdg7Vfnvm1kkNOARP88U9xfSMhYN/EBxMzG2Q29kI6e6vTMrXrVNg==";
+        version = "9.0.9";
+        hash = "sha512-ZBaxX3Bgg5k3El5i0Cd7VGOhbp2h7Zvz6qa1RpTFoBFlekxAf2x4KgqCWVgZTHBd+Uuq2Lf/Uwi3grEKPkOZBQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-IkE1/clVa/ECX5w/hQy1Kt2BEMWjpmPhJJX/IDT6Igd7gckL4Funf31B7MJwGwmACF6uzGYSZHXM4GcyPYTyCw==";
+        version = "9.0.9";
+        hash = "sha512-bi2NGA67gk67VROUpbdo3ilm8kFYyilNLw6pWzkr77/urDVZhiw3gu46STI+wC+lwTTZx4j50H4h0mnZv567aw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-RiKfoTAn5AeGNBuAANq0Raz91lSkTXFc5xFVNW7Ff7Gtv5unLAVvGfP/xwQVZtLHhIcvmyWo20mYf2uScdk12A==";
+        version = "9.0.9";
+        hash = "sha512-OV1ZU4dAdukE8my0sxxueygWhUfhHIVliQUtDZYjvXRhR8IAKX5mOiD0vT5b+PakutqBght7Jn3Kh/Ft/EimqQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-dX1sfzQ+VMxakA/Q1g86LDpZdPAypT3GuYpd0HyzoFUoOMGS0KfQjBlG6Ujz6nGTrBR1627DB8o4UjrCtZO1Mg==";
+        version = "9.0.9";
+        hash = "sha512-3+wb9BwPwaqkIu1ki2zf4StqhWHNbMzxVKIEdbLTYFmHRb9J8EidVSsE9mO/0EjIrI5B3hvHgDQXQTodn5w1WQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-kOOuClCiRSu4qzUzBSnSQJiUtvZb6P0HB/005dDLB7hqVB0AtYRp7qu7qi0y5nYx/c6c0vdBqtyPMPkRx3NXGQ==";
+        version = "9.0.9";
+        hash = "sha512-5esm4aBp1NtzxfujLWxm3FuKSzou/JFFOa36yfF0sPJRe5aNjlHJ7iKIdVY6HpZTcq6YB8APqL7haRso8fT1ZA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-RL39h0pyBnVYPshzvJOJtlbmdKvUvuWgf+tHBzl455jZqfwt7RsPf2WvROXCME0alrExZB6g3VSNbHhoFIo5CQ==";
+        version = "9.0.9";
+        hash = "sha512-xrgbfVvjHKKpLd/JPiDR6ubhC+igwzUny21PT92jGEQI8Q4XW0odmlsSFTxvcxNBJqFC22HrHx8YBjai0fIjcQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-v12pAEBEbWm651O1lVlTZS1NyM/mEhORJ0JcVnEJQpS5u317/uDdqZ7LknIppwQJfqhF2rIg02jS3yElfg8O9Q==";
+        version = "9.0.9";
+        hash = "sha512-tJh+NJffHrQCRxrj9dV7RR6Blnpr6MfNRAcGAwM0NZuU2YaVrhQAkaXYIvKcKxG84e9eFCH9g6+PVNI/WCAF4A==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-GfVFJvhYUoJI4WbvOiAgMT4HS1+gMTizEXRuxlL6nmI7fVJNReIWOB3LsEBAaZOJbqBoGtciwVU7Oeu+nsOekQ==";
+        version = "9.0.9";
+        hash = "sha512-WogVCntUYVpqoceJARNXWdfQAFj4EgeaKjNJqVRIp4oqoQA/FPMJ0O08Le7gAJs54yn23hbLHd6qwyWE0Iln+g==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-+XMW1cOzIwTSTcnam+tlZPa80BHlvugmxATXttjXY1u1DlJJXZCBHiE0cjCeO99k9VpwFr4g9MRHKgfJcNHKIA==";
+        version = "9.0.9";
+        hash = "sha512-YAAE7p296usegl6dDQdsZw0/iktpvsaDWT6UKb0xNypOtooHrlm/NDnKbck9aMi5oaZjbu2KIixxB6JeB/V0ag==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-tGARYv1U56BWPK0A3/2KmtYNPBSovSxIRVEP/7hh2d8kFbszy3RqzKaFNz4Anf3ZfNHGMrMK2A5DvqEIxR83eA==";
+        version = "9.0.9";
+        hash = "sha512-30sfrI/hwMtS6Ko52i0OuQYxIVJUt/8dW7Mrc97Rjm6H7kzanMtGDdT3aJOyivmWZNuOc81PrpTrfRttLNhhKg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-4slzmfzzj8K05cua+22dKz5OwNyYxEBXUzvosh/+jKmgEFpug74PPdTp2sgYliRUxUO/o1O3mWcXxMgp510k2w==";
+        version = "9.0.9";
+        hash = "sha512-Dy4dOnT/QrFkSAFldlDnIsD+AU8f6/fGKa/OL7uAocllb6kwE2fSZ7HpDYYWmreVoIjiyuZ9e3wBy1HTPDe4MA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.8";
-        hash = "sha512-3VG/IV40RDsfc1F84fqE4e9t2MZG24pT29acsLpIeIt0K8GbfTFG9yPDK8/XXWqAqDSdVuVrLzQKHHFbN1hFVg==";
+        version = "9.0.9";
+        hash = "sha512-gVGT7ewQ+/2PcJ5BMyKOLkHUvCy++Sr1ZCiphUTO4nZq5Nw6D+M88YpGEYSN7znS01NDacMyfn9SpmzyIdJIag==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.8";
-        hash = "sha512-QIrPBAMJx0FBhFDMTwjwKm0Wp32egd3Zb6Fy454VkhWKq+bHZStSVVeLIfNnpemqZn5ULkmCQQWoOooAw21I7g==";
+        version = "9.0.9";
+        hash = "sha512-kFNKIL6LWxofPO4JkcpXu0BDCdRmRHu1DgQJwIf3ONOv4FKILb0jLftw5ZhpMVYtzM0ZkpMt7p+pcJ86yM8MTw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.8";
-        hash = "sha512-kauELS7o6BPUFsLueozrv/dtUgY3HYlK8xxlsWkQNMILiTWhmkNoXyptjFAc8sCdthPTXryws5DFBg4A+kxmYQ==";
+        version = "9.0.9";
+        hash = "sha512-8it9shRGYYMx3yWp4d2K7gjuQDhcPJDlBi/7HQH4CYt1kOp28Feq0u89kxsOAuEG7aP620kMVOjUXwvx8VTgkQ==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-1C0R3FapqJo3Cu+DyMX0mwKVFTRtJnQNtQ0TOWEnT1N8lH/PRDsZH+tHal3U7/PkdWY9D1FmbsKQ7uxZNOmeKw==";
+        version = "9.0.9";
+        hash = "sha512-2yYu8wPbzfXQBU61nU4/tTUDLPSj80jIjNCz66sJ45mjJ0xJkdOaBOlyJ2lu98C0AUwkJ0BKRM7FJ9WTtxSxrg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-4p6EKTtSGhY4WV3XbdNVsNnWl7JvZkzmCBJImCIqY4eB0kV8BpqbNCO0kopi7gNmNGWsp97yPI4D3HuFi+IQHg==";
+        version = "9.0.9";
+        hash = "sha512-7Cn2JMd5KZWw0n6QakSjUsIO39YW9swm0y63M+m2JkCtHdTnBT6CZGswleGOBinebMJXrJcBv/m2eTYq5R4icw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.8";
-        hash = "sha512-opZhwxdkU3wGOc42sLvsaoEfZ6cIzB0VfYlTowUeLqISP6Bw1YLE2x9y5IXjVHbRp6sKyIDQyrs45h4+MzLTMQ==";
+        version = "9.0.9";
+        hash = "sha512-3nPmFqr69XC1HbUbzUgo3gGz/d5ACZ7HC6aVKiiPp/EL7ze6Y25+1KJY/E04lQ6KqPi9MkGww0hxrKVXA3ulLw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-5vJoOboU6uFIKZxF+oLVoCg7kuH+94YtC+nrO7l8YWdwba2oyWTPXoAfM6HnbzY/g5Omcc8oUNlKRZdwBuGBXg==";
+        version = "9.0.9";
+        hash = "sha512-J8in2qwkMY/iuLf+JQXz7yegNGvi4Evy6GlFcMw/UZ05wMmpGYT4j0yPo0XU2WEsjmZbIXTkdqGSejerJ/DMDQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-LxFcfH3yCeCTCu4YY0Rw4ZikgDqTD4TTZ19SZSqD69BDw74dKxcmCrQ9/A4d0DAFiqKEMMKTk3EVZ+Bqo/jVHw==";
+        version = "9.0.9";
+        hash = "sha512-T8gEze69wKZuJJq3hPrLis2orzgdsFIHF5gQYYnvlqjshzUvA7CFJ/lQIKxVUF8nXxAvbXutN0znT+OSVRn6mg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-tyRDrV53rTqdgEZNeWnLqOUpHuTdN0DwWuo726hpftJS0gqh+HpZpGazuzePUToD27O7gNx8Z6+eUbqUvpldKg==";
+        version = "9.0.9";
+        hash = "sha512-VU2iPvoScdX72B+jgCd4NhkFzGj8HX5Pq4/TTdE5QglEFg6gJT+UtVhOWyL/orVpphx5YmMvw3edS5cFDhkWaw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.8";
-        hash = "sha512-jH9WiOhUASzf/3XNOQGZtmkd4Zb+3qjhTB0qItNQO+HqJV8QZI/4XSrK6xEnoJS2J75N8vg/SDCTRi3BbR/qew==";
+        version = "9.0.9";
+        hash = "sha512-FGmeDfP2ys1zJrGfHpErBTPtXXo7aoBe9MQsndijsygBiJIRLAxY+IYCd8EM0NWjuWrhiTyZFxeNG6m+8eBG1Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-ldyC7aYLVx8PBpT9/SJw6Gi4pd6fEEMPCwxXpjUPtmhQVqjHKOtSeyt4mERDGlJBY5egNzHkF5Rc99yca20Y9w==";
+        version = "9.0.9";
+        hash = "sha512-FaJsi8Yedy/eE4I7aT7lV4/L42kB1Omp0REHCUEtTXsdY+X7S1G8j2/iy7G5wG/ptgjzC0Zuzg2PHPa3OCel4g==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-kuP8TvuVRSUqTFW+Ui5IfVA8ewaRkerGRW/5ktUnViqtCPQsjkvxLxlWqt1SO4sRW57q9y+QZNDO2dHdNCTd7A==";
+        version = "9.0.9";
+        hash = "sha512-A9veAnV1k0Chjs4e3Zj5qG4QDPuH3EX60S6KrH/xTiVxoLPQkeBEIERD8DK3LbA1sTgqZpninVdZ5WunGJxBmw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-+Iz4IIEdJhFUKsbzFn12YR9lGs3O5XAuXw1e4M4wzzVyoix1J/O7JE/p6Ep/MxdWUrud89hledyBgbk2A7tLEA==";
+        version = "9.0.9";
+        hash = "sha512-R9z/YVnJ6XhtsUJMl5TQEs5MEPEtIEyQoW7gU36y4uOqJNDT2n92dIffNv6rXig7VxilNS285VlvZh/jx2dPpA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.8";
-        hash = "sha512-EKY7/AGlcUsgcMTm+0XJQtGZUH3MXQiIHaUsgK4UvugRzVAdqvwkSAs0un1mc4evvzTgWzMl9Yp8HapVWIMdpw==";
+        version = "9.0.9";
+        hash = "sha512-z8hZUGhxelmSl/s0yqBkc3n7IUv8EUg4FEetPJJss2qjDX+Bwhao+bLYqCzpMugd/2iDD4EhLznrIkxl9ZJtBg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-pnIOiulipfx52mhy96M3v21YBsDYfzLJ21hr7tHCNaWtnBsr5dsnIfVNPUvaQQ2QJcadmrkoyhk18Dmb3QTmog==";
+        version = "9.0.9";
+        hash = "sha512-fJn4MpQtw4UUCgqVgqt9cTfc3xsmUs/zpzwoVgDB3HO7h/evIOIOu8bodG4FRySPmumgmWUuNYYIXEy0PTSQDQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-lzTfzT1Yd2o4KG8z+qu+CwJ1dNV2RhKOrypH6wIRHRd1ewTE3fLTOesq/OAhSJswIxjyG1g0a4K1kL98UfhKlA==";
+        version = "9.0.9";
+        hash = "sha512-uWh3vHt4f7pBzW8JZIt5IyD9p4IzjQvWqw4TdpSL33KN1s5r/lfiy9YFwf5iNVxVfC3Djo3N+KE1mNKBj2l9Ew==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-v2Gg1viOsyHEuZT56c2P0zVUFpZGrYjdzXIsQejjAd6aRGu3Xl23sRob5cM49p4VOq1Ywv8sHAB1lhVwa7Mxjw==";
+        version = "9.0.9";
+        hash = "sha512-WUWAi0jtODxARVNj5mdG55eTFjmZGVUQeS9daagsjFDUZuuPGkb6bP1fM7z7jUCK9o718jfUyAdE/L9Zbp4PKw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.8";
-        hash = "sha512-jcMcr02ix+UM7wfSuSHGO/ZVbjDllhEQo0G6hPvL0n+8qQAu7p694JbFCVO+1h+wMOgudlFOBPLSb8ucTHb4Mw==";
+        version = "9.0.9";
+        hash = "sha512-eXZKZxY5E5pSztmIF9V9+TURwZd3CMF5zmHoRennOM054pzFSouBXlWTOlfWRNmIM+MP1Jg0IUxgIJpDJmLBNw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-rephD4BBZWGzDM0nBn/IJCKyUaHhFFweXlZDQg7SzADACJDhr7pnAXr6WBDWBOZvtoScDO42W9SXBxebLlee0w==";
+        version = "9.0.9";
+        hash = "sha512-frSOH04K9koPazK76I8ZwM7fym0qm4L39+M0KfTfkjky5h1pyF0wyU1bYGC+S2+yZT6nFW2zHqhurakc81USqw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-Fdc0fvuu9ufeF05mPezAlQGjNw48O0050itpfpc2xaPz6Tkmt4t4QS46iHKUlek3eosQo+TWgKr8+ydA2rTtiQ==";
+        version = "9.0.9";
+        hash = "sha512-1kYCnZNFFJ9F397Z3gl2SwcURBhJWPiGzBvO/6iMm4RC6ZWUuk91qhM8FrVJJMhoohEkwXhmlsuxBaNaANIOYg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-IbAy/N9knqt52d8Jg0ZPlht8PLGlxFrkUFGLOu9q1B6wyNAxcr+SNcAuqIQndV2aiC1JX1LxF+Z/RtR/dllmMw==";
+        version = "9.0.9";
+        hash = "sha512-3uqbDc7fIJItKIWxh7wGabTa0wskjFuIXjA3h2zX4Q3/dewAZ2OYH1LCth0AMfmOMlJxBHPjSRdCElzUHX511g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.8";
-        hash = "sha512-eiuv/paMs3fiSFeGtP6EvmappnNAPl6oSWJJGPPcGCyjHKlvbvXXAGB4bo1gh08bDfyh42y9tzkFjj+N3eoJ8Q==";
+        version = "9.0.9";
+        hash = "sha512-w9ftFt+wK2g04eDOgXSxGSqCpnquZ20G8breOb3sBM0S2YnOOo4A64/yvQbvXdSYhsajAqNNSRjo/Z3nQ08erQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-n3582g9jXAzHDeBllHPjaihaGd8Q5ZMKgSh/2NpVB0SRw3Ie7jCHBloadFAqsz4CbMqBqz9bcwWJSs3UelF6Cg==";
+        version = "9.0.9";
+        hash = "sha512-e8tW+vdm1DDGpkJr6Wb5WvDFnD02q02255IwEmO4wFo9Qj+bCpUHMlCPda4HAgknxMh75zk+AB87QwOvluaCUA==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-7Iu6w3otpfLf3PDvtus6k0DHYfyFiZ4/FrltO/3+7CPhYYNWtz69/CS7zMUbSebr47CMtGxDHa7sgwRhuQ0udg==";
+        version = "9.0.9";
+        hash = "sha512-E4XDkM4huvFvu8w7icD/oIUivcF+15Ro0mea0Qq9gvTIMmCLdwUNe27yb3PDc6CtC7MAgANlyVAGwGVVWer9jQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-2MV4Mm2P0a7Xj33qe2DhxcUxORg4rOBx1MPrmFScypuzqwlcm7Ky6ValuVodGVAeziqxewG+TwEfQ+tlQtKTKw==";
+        version = "9.0.9";
+        hash = "sha512-K8QFb8DhBzFouXazTEFy3Y2TVE2HjY3XTeuZRHwk6ySHos+TXZZA6EHXhnn+u39zgTMQaSD7LQIswHYHIfdobw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.8";
-        hash = "sha512-jx7ySFpxyeGIGu2e/RwWI5Qp0/Qi+7LLAnGa3p2ErCbEmx8cQpfzGijxKekjEhtOVIEFt3XDVUBaiShiFCAp7w==";
+        version = "9.0.9";
+        hash = "sha512-09cNAKRq9I8jqY+7KyMvKn1/QRExtF+KGO4NvqJDZquH9DvHowIhbKc9sktEEiviJ25zEI9EXT8VIq+6Y2iUfA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-DAzBxlAn4kHG5UPmIIcNzLyVOFWmsSw3FBFE2k1gFBINRJQxsch/OYGeHJOvcV9AE1kCdOpwfvXkAuYsZ1yqJw==";
+        version = "9.0.9";
+        hash = "sha512-nGpqXHHhhWzlTBFsK47TSU0H7j3ShOTTlT6iaM7qquoCur7+ycLSW4g4GwcnD0mPAX/0khW31WLbzosQSP1+nw==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-7/dik29myG9DpI57mqgQUZKBqUTch4gJPUVTsGwCrpX/+2fCRUMh6wTDZKVJigQmIEAOPDmjVjLsB/46QhCDdw==";
+        version = "9.0.9";
+        hash = "sha512-aeVhbXDevdrsKqRyFqiNwY0YXevA+z0VYmT4IsW51UtmnvJ56iPByoJYdSrz0leYTSYROZofTJmx2bkQ0uKwiQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-bCH5hRqBpZXNuNO2xmhx4EmZtP6qvH7qlNP3neR9LhaRR2V6ttRwH2LOPZNaMiroNo1V4T+aDYsqP+4blJ7vFg==";
+        version = "9.0.9";
+        hash = "sha512-xileSZyCIhYQJy4IXAsMZ+OktYWnz5wzTNsTKseA6q/maRZoqNTLNu52gBT4fYlMHiAKMahXymVuPbS4sGwmIA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.8";
-        hash = "sha512-VKdx5FBTl0DJSx3tXhSpEQmveT3plCbxvWmDiNmpZ1mroNunXT8F5HLfpnHBLfJ/AYoA/aR/rDDLK5521EjScg==";
+        version = "9.0.9";
+        hash = "sha512-tPSjzec3eQ5yl2s31JWBMQ7eU+uYwHwwR11/IUnkJJhYucFtOwEcbtsN1YQhIPEUNFqDJb59+/UZ1SyAqHe9eg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-Jzq382A89/24L3mRaWqD7SBzBO8Q3gFPksq5xnMrkt/kvTES68kMChvime8TE9Swq22vQNdmWc7Oleco/VsocA==";
+        version = "9.0.9";
+        hash = "sha512-cbIksRu6+gRPYnaSSeXzUbsmPqShDmmqO8y590qKa1yL+SELQQwQ5NyhsMw6b40VpAzjNtB2IQsTW5s77+gYzA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-gsCIp/l+fBFkghgipU7AlJmbN9mBioZ0gTJ/71Ue3brd8oT+JTHljk7Byth43Wz/QHqvW6NtMfB/KMba+Ovcrw==";
+        version = "9.0.9";
+        hash = "sha512-Ro/9lBic5EUjAd5tEgQJF5KDtO4B6a/g2CiHt41S8tMddQ71VHuBAvfH9HoHrdJWXK9kkBzqV+gXNqsfariD4w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-1bPBwHyTuD+bM2mIs/lDzPSbxUv3td2KvxqoslykADooEXMkEldhP4h6GRJabTygMKzpG36kaUbVhmY0Z3YzQg==";
+        version = "9.0.9";
+        hash = "sha512-HLRXCdV8JHuZCDAyQC4mW0h/dx8Al9h1zZw7HQBd7Q3RZb29myQr0CWvyXgunMKkMBOI79SvfJe3qKfawwyerQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.8";
-        hash = "sha512-iOBFiwX+SH3Sz6Re+xDVTUrdtNzD+A0w4CgmhKyvGEm+S2gXHKptcYTfuHPWxgXkewJfLFGb6SNjcdqpbC2ETA==";
+        version = "9.0.9";
+        hash = "sha512-4BWz2/9630bM3jT0eYeNWUeFTzS/aUnDhHLu7oIabp7DuRO6QY8uOQHdfqZyuRrDloNTXWGskMIm8a17NHAwvg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-KZKJ7e4Mq8E06pMAtTnyjmk/SqNEEMLHcbESLJ7ggVedHcJA/elymIGepIZP9jSwQjtI1v7ggIc3g9C63QDrtA==";
+        version = "9.0.9";
+        hash = "sha512-f8yHrJ0nPQ6VweI6J0F9SsZbzFaekmX+ljSpyz/rHo3RwtTe5ag32wBxJu6yweXkW/co8zFKQyC94s413/RwLQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-NJTDO+UX/6NpAORJ+AsL177tpbgCTAaSavaDKKTkz8wwdesjcT0OEMa6XveImmOA4KDQsD9dyPZk8CY+y/+6EQ==";
+        version = "9.0.9";
+        hash = "sha512-JT2kFQLUwkaGjEWYNQT4w9xCe6qgn7KnkVswIcmq+BCsnj1GNkR5eiTS1J9WMbKdCOafFuxR+4GeWJgBUrs2Og==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-LJ3kCcdyacCBeii37XDf8uSWGrkEa2rpwyCQRnQdPKDQKs3QemPqXBiodbUGe40jxsWeg/aTh68ux3E0w5A6ug==";
+        version = "9.0.9";
+        hash = "sha512-l/3rxZ4z7ektuLBC1jy6q/JrB9avNZLkY/TakGRmuV0klv1Uepbj8lJPnYm02IOlYJ+oyhWGFjeVzAhmTmr9FA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.8";
-        hash = "sha512-r5eVgUvphRSxeAkmjQsbSQI7phyaFklVs4Mwu4Qgr4HAu+UkZI8UJi23jKbK8B5iUuqj+L2bE6/hNti1XIvQNw==";
+        version = "9.0.9";
+        hash = "sha512-SsKEfphdtBw16QyRLTAbVht3LifNGZ/IllQqVSX5DG7qD2BxJ3//qoboNOmpupf7JsZQe3fWKObWoNdcUYpmGg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-KpD57JOPE5YykXteBFpIhQAs5TVrJKWxryEPpW9jdr0K73gGClquXUexYGjiHk++EPTr59aRKcUKQrNyZXOmDw==";
+        version = "9.0.9";
+        hash = "sha512-isb8z7xhoL13Rtm8ZCzVCTWf5fWjyMERGkDqQNoQics33WfcCp3HgVRL5Gufr63lg+JFKz49q0C0LSa59pkSkA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.8";
-        hash = "sha512-gXQpEX6W6CWyUpmX1zbRE4pGR3c0EJLbBqkXOpqiPpLc/qh6in+tC4MhGWesCNLOsZXf0nlFikBUouKeX4heUA==";
+        version = "9.0.9";
+        hash = "sha512-aHeIlK4Ve8U503fKPmZghAIeN3Ws/9iRLmsey5ObIS4UkR7+lFZDoCFAcqWKCi+UAQERLudqorKkHWLsAWytsg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.8";
-        hash = "sha512-shIJcIsVRmlyuiBNu/OJ0cl3YS2g8LAUwN+r42Jin+HZYkZE5Esf3Zl6KNrBG4JdhZD32jNZ9JE/m0uB0PbLRQ==";
+        version = "9.0.9";
+        hash = "sha512-VaEZPPqvJasmjS2URZzIhF89xVqx4FywxeWaXTIhNSJ6lbgyZ7L7s558fii+L/7nTQ2fOXARKZykSHeLvPBMlQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.8";
-        hash = "sha512-ubHRXN/19HpDTzlaXIAJUVOpfgOOnsPwIwxk+rlaO1nv2w74aa8dUQGtPeqNkpo87CSdwpc1uaDe79NLGeY0HQ==";
+        version = "9.0.9";
+        hash = "sha512-M3umAJUMNf59Vb28nAU+QLT30NP41jd9HaJ8MQi4Kf8ncJ6P8obpwSjMgS71ZtqSZBT2pNXAo/FU3xjzIQ6K4w==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-RFXToE31qPxev1Ei0hosMf8jN9U9hivDSiTWGFaBg8Bjyeai5YZ4JcYfNi3yNyaBKrra8sdPtcKMBHn3JtRnTw==";
+        version = "9.0.9";
+        hash = "sha512-EfonSMd6dCLyyUuscaCtE1h0NTYE1RjeLPVU2NHXw3vBRy0w2lSTNqJp83bT+2rejSpw3L0FU0jMmt2w9UhbhA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.8";
-        hash = "sha512-Hq2Jkbv1dN5A6hojoNpZYsWdHlmALRRZSAxWY6y/bYfwczY7xRXPcwDWcXg3TgURZ3tYDjLAZmKvmkxe8CGOWQ==";
+        version = "9.0.9";
+        hash = "sha512-0fcf+gMcarIvA1WT9bj2Zf3as4lz2xUAp2KAM5D/qq5ZYcH2WqIJHH5FTAcDNZ6fFziDad+ufuR0z2KCjNiQ2Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.8";
-        hash = "sha512-iAKhXmVqwtB1oU09QaFgY1rHegt+GczpjlpmKibZCGjewULMevVnFaNTUGgnNKfnFziEy9Ou9khGyRjumrDbsg==";
+        version = "9.0.9";
+        hash = "sha512-QCrojepAqm6pzOipcLvYOz0WzlqrfW9rQa0s9bjQ905i1AYIxGE65yg8jVJwDkJofPp3sKSNIyQXY/2fb5ffKg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.8";
-        hash = "sha512-JTcyKAl8lxnWoIptRAw9qdF1wfxKQb6JNs898g/HJQIOBQCuW6DkJy7TAn6QHhJPQ0o5KS4LtG/wCTs05IO3+g==";
+        version = "9.0.9";
+        hash = "sha512-tISq/TnUjXKtrDy2AKTjQuavexCpspcuylFZ4ySov3HEgCGmPA8v6JYhIRR6yAKuAJy0tvL4wt8W8kvOgPGpog==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.8";
-        hash = "sha512-SkW+QLlwQVY3G1yYd8ECVY22NtMo+gkGvnzOSQqsQ91e1Ihf8kGtAQ8mX8/NNmM4ekj7XuwsdGK6mt89HNoFXA==";
+        version = "9.0.9";
+        hash = "sha512-VaPzur2V/itmMg81CVVTNyJ2JG8N+HceVL4BLGEiF02mRo8Th9JOTjU74YzpURJ+W0Ubdt2AR7rLWSmBNCGMKQ==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.8";
+  release_9_0 = "9.0.9";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.8";
+    version = "9.0.9";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm.tar.gz";
-        hash = "sha512-qZREscunr0rNEtmtQSb+Ss3fLvDgK5md4LwYU3QuE27/sD7XrcKgpHBi0AUbMXkyCkf9PSOdD7hvl3W3PeQ9Gg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-arm.tar.gz";
+        hash = "sha512-3ipS6kqbhyrb4hcJ1uHYhzHkIFcDe4Jvk9ucmLDujRDrMVn73IQhNF8pfPo11pKnNr5l4WRU2y5NNAs7uSjM4Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-arm64.tar.gz";
-        hash = "sha512-zx5y9LMnuTwaw/Le+cqDvuJ6QI5bWRP4TtlUz9bEY52hZk/j9OOSWIPbd+0p+lNkucqK83lvM8pzpMt0hOMmvA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-arm64.tar.gz";
+        hash = "sha512-zS0k4W7f29NCh6SuJeClF6rxu/oP/U07x+rGPYXdVE1DsS0IGqJBmvE6wn/bUk+Rjs8v36kWA5rtZtUCMYpy7g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-x64.tar.gz";
-        hash = "sha512-CK/fkk0A+HW0TMTv9otV+5tj5Mxo5rXN6HPaK86cW19BIOhptqHf3qSrEEqwrIeD7xV3tNMnWq6JmlPNiBMPHQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-x64.tar.gz";
+        hash = "sha512-f/G1F8RbLHcg/BvoCIQsW39kT/kTjyIYYmIOI2YNtSi1lh95FDSqdYhcgI7LO/nSE6M+j/PqpHfffWJW0hWmxA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm.tar.gz";
-        hash = "sha512-RND6DTb5z/mT9wie/TsrPg5g1AO8K1o5URa+fWtDqCRx4qu0TNFwJGStMCM3vD4M5J4kLwL6FKEUKI8PimYilg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-arm.tar.gz";
+        hash = "sha512-joG2ImzqEELoXG8y/t5fVx4Zq0Sr68soQbclKTCP59PYS2d8GdEvVzo3eA/cOw/nvDkiw6Ac8ItdV6WcGOrDGg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-arm64.tar.gz";
-        hash = "sha512-5ExwXEbRT8tXVPF7o0bqKHb8G9tEv6A3K0jAmXkZmnaOuCdmuOfiK53AGnw4uFPvG1P4stxX3vFbPcJf0I6yVg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-arm64.tar.gz";
+        hash = "sha512-4y2qLqw+0y1yyTUY8ytx88DvfqUkXwTo6eHWshDaFJNAB5ZwoQiFzEDYsSKuiY+Q+cnqtirGSVA9mvEyeW8UaA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-linux-musl-x64.tar.gz";
-        hash = "sha512-5D3IU1sy+f0Xtrgc+7l1vkbwn3eTAkBC5i/htJnbZu6tbbESylH+/ZojxnbLbcsBkcWYXC9TQGmB9OFfC272Zw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-x64.tar.gz";
+        hash = "sha512-rZBDC4/Enl8DVK+JPhVd6z59nmUKCKgRJZVuVc34ghQI1OnWAq5tJ7Jd+HBe0qTKglDakIax0ycKtffQmQ5Ulw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-arm64.tar.gz";
-        hash = "sha512-T+od1lxCvVoGUOG+m2K8ygX0jKLI0bWX6VjGX5TfZZZmUHx+twPdnQbyStAHmI/pKvc2P+2z20lQK4pcVPmthA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-osx-arm64.tar.gz";
+        hash = "sha512-HtiNUoiZPve4Hc9mKUJoTTBx0WC0p3pvwvC8r4tgjCr/hi7MuB9CjxhBA127FAaeDuV1JXLjLmqrAYqNOq/OXg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.8/aspnetcore-runtime-9.0.8-osx-x64.tar.gz";
-        hash = "sha512-cOgD8+BEnqxWQ43hL4dx8yJgcpbuU+DmiWziEfXa/gg/XzP54sdsVAEsk/wblR4MFjDJdEd3fcRovvn7EZSfww==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-osx-x64.tar.gz";
+        hash = "sha512-wl7EpMuh2GfWvXkH0LGokDyLOMNJyy1xvnCgcukbWURrhCZ2DOvWpfOHHzWpzF3lDpf3LCBF4D5lAV5kJJaiSw==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.8";
+    version = "9.0.9";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm.tar.gz";
-        hash = "sha512-XitlwgOdZuHGyasekrvUh/zRvXphI8FwvqzbHOJGiNc0noSuizhr11i9JHK3NtGO3qg3DMY+tV+sCqs1ZYgP3g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-arm.tar.gz";
+        hash = "sha512-rJxs5NQ+i8YuZT00XTK1QYaUTvd4cR9/g1Lfvj5fuoY/jgiHcdKe+/0t9x2hUShhshAvddKnS7KI1RCx+ilFhA==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-arm64.tar.gz";
-        hash = "sha512-MBXpX/DDc7jVlJHPHDIMgPTsdBjWNAC/ZQjU4l5xpH2yhUkVNIqxhuWKktWsLyD77BPWPfXF9gH/SvXynD2c0w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-arm64.tar.gz";
+        hash = "sha512-SGjAZGfLXbDHDUA3Yxdl1jn24Pq3gNNjHwSyL/Ov7/iKpbmQBIhtoG9uRDlngZI0xFkV0pKcBm7dhST+JcUdCw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-x64.tar.gz";
-        hash = "sha512-92luoqMKErrQyPcyGsQoQ87TBxhNiUyUpkyFKJs88wk23zc/9YVDzpt3YFqAJD0fx3e8lZV1Y0qq2cqogPv4Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-x64.tar.gz";
+        hash = "sha512-T69+YViA42gGgeGBCOjxKIB0/UPmrAzRwkS1bov/em6ovaKnHs2EvACRCUq8v3kqnaH6rycf1DEpdzZC4nsl1w==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm.tar.gz";
-        hash = "sha512-sQh1B3IPZCmiSihUVMzVSokifIXcsb3wwjQkdyMJR8kc4/FmW+diYRNqk1yXPUvtjF0c7AiX+GsJMWuq7h27Qg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-arm.tar.gz";
+        hash = "sha512-1EbSMp9px1XSzzCXqO0mi65mvHMegt0otm5oePqhPV0Ik96QZv+eX+qd0g8Fg25oIgnNXrSjlpv4d3qSXeTnfg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-arm64.tar.gz";
-        hash = "sha512-AYQXIV58CoKhnsfhGaQ4vKkYucRI84SyffuH+YGpiKwhTFdvKKrv7IV0WwBc/3C/0pm+Mb8k4xlVOKTpH6bv4w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-arm64.tar.gz";
+        hash = "sha512-kybCaV4zt8GECzPBUJFn52Y5H97uETHL1kuNwSLB/l04y3Dp96bc808yylipYOlTWlLQ3XXyxNMwBQQxE9vJZg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-linux-musl-x64.tar.gz";
-        hash = "sha512-oAgYUGPY80Y15AMoMTrzHnuuI5yNokcmsf8gEuyTDDLvDcDWcpKuvE2FMNKyb6Rs/7M5PPFrzfZsEOqINFitcQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-x64.tar.gz";
+        hash = "sha512-o30yHsCQ8PlHJkYyCT21xohfkT2gNsvUcSL766vHVMFQqsSYxLce/W9kGW4RFKOXx+OW03Ause0AWA67FQ7Myw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-arm64.tar.gz";
-        hash = "sha512-+n7QPNWl4FVfZfjwEBx3Yua/2gBfpJWvoSZRjU1ByXNMZX/DWc+A+Qv2+/GGwmrwOBnbrdUlHpftTL0Ej8J7OA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-osx-arm64.tar.gz";
+        hash = "sha512-wJWKMlJ9/h9B2lctqQ3d7SpTTx5Ore31EpZS0QooFgYOMo1VG2VGeJr2cVlGJxL2lLXEL1Or7izEYZP7Q6IfIw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.8/dotnet-runtime-9.0.8-osx-x64.tar.gz";
-        hash = "sha512-M5jxrKx2R+Jc0kdoBMWtJkyhjhUtDiKzLr2mvV13RMHpMqqQhq7NN5S4208vcl7SD/3UT/YV5ygaCsXdlQc7nw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-osx-x64.tar.gz";
+        hash = "sha512-YsL2HrbB7d0y6hV3nGBWo/0zy9FP1U2bMAhjCkn5f4lQJs1Oy6g8lhAw39eDyuSA/nw2E0KNKIGlxa9O6n+j/w==";
       };
     };
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.109";
+    version = "9.0.110";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm.tar.gz";
-        hash = "sha512-QJEtXxu/WbBx0uHTHsHZq93b893GSzIz58fpFpawI+H6eglHJdOZW5MciAA4Ql7OvAXwE/dZYye/SWaSnpgBtQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-arm.tar.gz";
+        hash = "sha512-7MKKzj1ADdYEjkod5P7dCjpPNEgkBI4gk4WZug+Ar6b0thBYQ3vHEQaaWQnu2IoIg7TaGG4KwQSr7AxaNJg9Dw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-arm64.tar.gz";
-        hash = "sha512-Kd/68u4iQCxgHD4cvvNoKbow/jLpdrMfJH32BaFF76KafiPfUJ7YH6mm0T8eVYFeKlkiA6p5wudniNkBpuGrWA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-arm64.tar.gz";
+        hash = "sha512-Pia+La8ITGul2TLmqBbhXPyZfw2o7PfyxPyYSqJdXKOEHSvxpLuUirXisonvJ6N6Tz6rhA2WDu9oaDbJ0lV0Yw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-x64.tar.gz";
-        hash = "sha512-zDhqjnAJhVpumjqKFT2htc5UwuC3t64wVEXunw1XNVGN/u8Nj/MqREeC4180oxZ1ck4EBTYAGnbJ3Bt1W1omBQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-x64.tar.gz";
+        hash = "sha512-7UOpQly1Qk2W1PTMFlVL6G+nqezUTPEC13x1d50QNrNmNLZv2IX8qTOAAxgYdBsxj5UyKjynHg0Uzr2/6yLkCA==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm.tar.gz";
-        hash = "sha512-62kBlt/TQmebHm0Mw/UAZ74dDypu+RFx/rcS5MSkkb7jgeNQBjgpDh5Z6TP3f1fMZL7ZLK1u6h62VnarikxmoQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-arm.tar.gz";
+        hash = "sha512-VGJHpI+OUm/UmGlgTMA6aHdFgobl8C4V49rtf2MdTtd80qztDIstg61nczL068PTvpW85VPO31F3qtZsxKXx9w==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-arm64.tar.gz";
-        hash = "sha512-CZ+bh0Cjx1hBU8KWFg/Jb8y8GMfCRnjv9+ZCXWAsdw1TTE8ttWOTPNT+XJ6y1A99A6H2mu9em5RZDzYM9qFCgQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-arm64.tar.gz";
+        hash = "sha512-StOknkxvDoLRMcH9QuHWZ1kYH1M2qnBUsuUD/B4/YMVpFDadpT/8B4hisOtIjcw/RIVOXp9k0haU2HQ2C+rwkw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-linux-musl-x64.tar.gz";
-        hash = "sha512-FonLs6wXs3SQOyFKFz8kFgByrlfMXRMH9bJgUbb/BAV3K2A7amx+8ZUvc3sYyfO5dvc1S4S4mra/Fb4g3QY2tg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-x64.tar.gz";
+        hash = "sha512-n3rnIENhsiIZekinlrgobNrfWI6XLXhlZk2Ev1UqrUTexok9B4cce8Qx2A7l4zxn6+VBh6VD4/nsiKStGs1/Zg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-arm64.tar.gz";
-        hash = "sha512-ri68P3dAq4gK9W4209Kh7lpU/BErb9zCUo8sjFmAjTZHbV+rXNqn0lgZsOSpARdF86nlxyaSzZMrMA62/YX1rw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-osx-arm64.tar.gz";
+        hash = "sha512-Sc1ZgBa1hO/JRG/W/GEnmeW0YqxB/cmHmaavjHATIaBhmYJ+HlDRJp8ddFbjkysR9gT/O0Lw2anErHwgR0pJkA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.109/dotnet-sdk-9.0.109-osx-x64.tar.gz";
-        hash = "sha512-O3Lvl5RoYzAitNIi2jGnP45zjR6n1ENAghXecxGCTk8lycbdGTxEAUwmVZIoKTiVwWSlGTTzB+FT2SfnDLbztw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-osx-x64.tar.gz";
+        hash = "sha512-3i/spTBHsFyhcQZ/2h3ONPE2elQ/K7xqBwUXS+aA3U1rxrmcfYzPaL/agi9Jj8ZFm4sMbD0j2tuOMBFRkfR5ug==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/9/deps.json b/pkgs/development/compilers/dotnet/9/deps.json
index fda290cb02cd..c105384a7354 100644
--- a/pkgs/development/compilers/dotnet/9/deps.json
+++ b/pkgs/development/compilers/dotnet/9/deps.json
@@ -1,50 +1,50 @@
 [
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "dfde67692b77b9298c63d0748c02961409eaf9ec1f519b3709f40b74d6e4bce0",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.8/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "sha256": "1ec9f8f68fb5220aef9638a421214cb2f8e3e61a979728e2adf597f4180c8e31",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ilasm/9.0.9/runtime.linux-arm64.microsoft.netcore.ilasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
     "pname": "runtime.linux-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "d58559760799329796108006ed50d2307340e99d910089132b45bb08d9f63746",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.8/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "sha256": "15ebc8bd31746f5c8060da270a93cce45aad1de6f6723ebb5f54e0027dc67e51",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-arm64.microsoft.netcore.ildasm/9.0.9/runtime.linux-arm64.microsoft.netcore.ildasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
-    "hash": "sha256-L45+wVapWxxvfamjT3xTtJbYfIkUfi0JVptDp06DRUA=",
+    "hash": "sha256-nw1yLRpoob8pDyqPo77o2wHQOv0R3gNC0EUkT5V3uEY=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.8/runtime.linux-x64.microsoft.netcore.ilasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ilasm/9.0.9/runtime.linux-x64.microsoft.netcore.ilasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
-    "hash": "sha256-pC7+si0En60bPU1bqM+RxcaDlBUTCwmCgJOqgYdVO8I=",
+    "hash": "sha256-G8kDknKyFKFqMJB2GT4DdvgH+sZospe0LBswH+aci88=",
     "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.8/runtime.linux-x64.microsoft.netcore.ildasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.linux-x64.microsoft.netcore.ildasm/9.0.9/runtime.linux-x64.microsoft.netcore.ildasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILAsm",
-    "sha256": "fe448edf57d1782e08cfbbc85b4044f227bcd2c5148f5b784afaac22a3708901",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.8/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "sha256": "61654befdebb0b3e3da3b0e23a415cc97b0e1a4eea9ccd6d8c41f6c306ddf891",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ilasm/9.0.9/runtime.osx-arm64.microsoft.netcore.ilasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
     "pname": "runtime.osx-arm64.Microsoft.NETCore.ILDAsm",
-    "sha256": "a8c7fc434d9af9ab767ccaf3416046759c9d25c7ae5385096bf05ca4e4f354d9",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.8/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "sha256": "5e819f4a2e53a3022bf8bf378d45dfa904f398dd3170f6a398efa9e3aeb1501d",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-arm64.microsoft.netcore.ildasm/9.0.9/runtime.osx-arm64.microsoft.netcore.ildasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILAsm",
-    "sha256": "448816bf6f7e1400d8ebe89ac1537dc796a8553b0ef2a2403c32e5afccdbc559",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.8/runtime.osx-x64.microsoft.netcore.ilasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "sha256": "eb37d35286407aaf7908d72ba164702dad283a9f7c821eedcce49ea8af977f7c",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ilasm/9.0.9/runtime.osx-x64.microsoft.netcore.ilasm.9.0.9.nupkg",
+    "version": "9.0.9"
   },
   {
     "pname": "runtime.osx-x64.Microsoft.NETCore.ILDAsm",
-    "sha256": "161f30bfea6df634d6e80b4b93a62f598b2380e20cdb82df97f954f72f19532e",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.8/runtime.osx-x64.microsoft.netcore.ildasm.9.0.8.nupkg",
-    "version": "9.0.8"
+    "sha256": "d0b819b6e0542b4f11153ee798666d4ee121eba35586edd1574e33e21490f2e0",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/runtime.osx-x64.microsoft.netcore.ildasm/9.0.9/runtime.osx-x64.microsoft.netcore.ildasm.9.0.9.nupkg",
+    "version": "9.0.9"
   }
 ]
diff --git a/pkgs/development/compilers/dotnet/9/release-info.json b/pkgs/development/compilers/dotnet/9/release-info.json
index cf8f95e26780..33c4941cc119 100644
--- a/pkgs/development/compilers/dotnet/9/release-info.json
+++ b/pkgs/development/compilers/dotnet/9/release-info.json
@@ -1,5 +1,5 @@
 {
-  "tarballHash": "sha256-MQFwplcvl8bRQ3Ak60exusXgoWl3ZjHfBhdUJj3PYtY=",
-  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.109-servicing.25368.1.centos.9-x64.tar.gz",
-  "artifactsHash": "sha256-RoEaBJESjYehHRzrRPNmZjY9yI9WCNLhmqb/8EgSuqw="
+  "tarballHash": "sha256-oYy/mkjlilFsHaPFjw5G9m3PHF5+8CjocQGx3CRuU2o=",
+  "artifactsUrl": "https://builds.dotnet.microsoft.com/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.9.0.110-servicing.25421.1.centos.9-x64.tar.gz",
+  "artifactsHash": "sha256-RcF5iXV8tVkoOBqDLsM5CszV7vCEP2x95j7DbvP8sVU="
 }
diff --git a/pkgs/development/compilers/dotnet/9/release.json b/pkgs/development/compilers/dotnet/9/release.json
index ac4ad5be87b1..8980b12a6537 100644
--- a/pkgs/development/compilers/dotnet/9/release.json
+++ b/pkgs/development/compilers/dotnet/9/release.json
@@ -1,10 +1,10 @@
 {
-  "release": "9.0.9",
+  "release": "9.0.10",
   "channel": "9.0",
-  "tag": "v9.0.110",
-  "sdkVersion": "9.0.110",
-  "runtimeVersion": "9.0.9",
-  "aspNetCoreVersion": "9.0.9",
+  "tag": "v9.0.111",
+  "sdkVersion": "9.0.111",
+  "runtimeVersion": "9.0.10",
+  "aspNetCoreVersion": "9.0.10",
   "sourceRepository": "https://github.com/dotnet/dotnet",
-  "sourceVersion": "999243871ad8799c178193bb2d384dfbcfd94ce6"
+  "sourceVersion": "838867fec3d758e34188af097f4f18a23c3800e8"
 }
diff --git a/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch b/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch
deleted file mode 100644
index deb7f49211cb..000000000000
--- a/pkgs/development/compilers/dotnet/bundler-fix-file-size-estimation-when-bundling-symli.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8fa3570bf75c48bf68f42b74790bf8ba0f032a3f Mon Sep 17 00:00:00 2001
-From: David McFarland <corngood@gmail.com>
-Date: Thu, 14 Aug 2025 10:49:40 -0300
-Subject: [PATCH] bundler: fix file size estimation when bundling symlinks
-
----
- .../managed/Microsoft.NET.HostModel/Bundle/Bundler.cs  | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
-index a5e8b593484..39f39334251 100644
---- a/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
-+++ b/src/runtime/src/installer/managed/Microsoft.NET.HostModel/Bundle/Bundler.cs
-@@ -284,6 +284,12 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
-                 throw new ArgumentException("Invalid input specification: Must specify the host binary");
-             }
- 
-+            static long GetFileLength(string path)
-+            {
-+                var info = new FileInfo(path);
-+                return ((FileInfo?)info.ResolveLinkTarget(true) ?? info).Length;
-+            }
-+
-             (FileSpec Spec, FileType Type)[] relativePathToSpec = GetFilteredFileSpecs(fileSpecs);
-             long bundledFilesSize = 0;
-             // Conservatively estimate the size of bundled files.
-@@ -293,7 +299,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
-             // We will memory map a larger file than needed, but we'll take that trade-off.
-             foreach (var (spec, type) in relativePathToSpec)
-             {
--                bundledFilesSize += new FileInfo(spec.SourcePath).Length;
-+                bundledFilesSize += GetFileLength(spec.SourcePath);
-                 if (type == FileType.Assembly)
-                 {
-                     // Alignment could be as much as AssemblyAlignment - 1 bytes.
-@@ -314,7 +320,7 @@ public string GenerateBundle(IReadOnlyList<FileSpec> fileSpecs)
-             {
-                 Directory.CreateDirectory(destinationDirectory);
-             }
--            var hostLength = new FileInfo(hostSource).Length;
-+            var hostLength = GetFileLength(hostSource);
-             var bundleManifestLength = Manifest.GetManifestLength(BundleManifest.BundleMajorVersion, relativePathToSpec.Select(x => x.Spec.BundleRelativePath));
-             long bundleTotalSize = hostLength + bundledFilesSize + bundleManifestLength;
-             if (_target.IsOSX && _macosCodesign)
--- 
-2.50.1
-
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 72d5cde2e1c3..3f0dc69af3e4 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -8,7 +8,6 @@
 {
   lib,
   config,
-  recurseIntoAttrs,
   generateSplicesForMkScope,
   makeScopeWithSplicing',
   writeScriptBin,
@@ -92,9 +91,9 @@ let
         mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
         addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { };
 
-        dotnet_8 = recurseIntoAttrs (callPackage ./8 { });
-        dotnet_9 = recurseIntoAttrs (callPackage ./9 { });
-        dotnet_10 = recurseIntoAttrs (callPackage ./10 { });
+        dotnet_8 = lib.recurseIntoAttrs (callPackage ./8 { });
+        dotnet_9 = lib.recurseIntoAttrs (callPackage ./9 { });
+        dotnet_10 = lib.recurseIntoAttrs (callPackage ./10 { });
       }
     );
   };
diff --git a/pkgs/development/compilers/dotnet/update.nix b/pkgs/development/compilers/dotnet/update.nix
index fbbac2845c4b..b3c59d020bd0 100644
--- a/pkgs/development/compilers/dotnet/update.nix
+++ b/pkgs/development/compilers/dotnet/update.nix
@@ -115,14 +115,18 @@ writeScript "update-dotnet-vmr.sh" ''
       tarballHash=$(nix-hash --to-sri --type sha256 "''${prefetch[0]}")
       tarball=''${prefetch[1]}
 
-      curl -fssL "$sigUrl" -o release.sig
+      # recent dotnet 10 releases don't have a signature for the github tarball
+      if [[ ! $sigUrl = */dotnet-source-* ]]; then
+        curl -fssL "$sigUrl" -o release.sig
 
-      (
-          export GNUPGHOME=$PWD/.gnupg
-          trap 'gpgconf --kill all' EXIT
-          gpg --batch --import ${releaseKey}
-          gpg --batch --verify release.sig "$tarball"
-      )
+        (
+            export GNUPGHOME=$PWD/.gnupg
+            mkdir -m 700 -p $GNUPGHOME
+            trap 'gpgconf --kill all' EXIT
+            gpg --no-autostart --batch --import ${releaseKey}
+            gpg --no-autostart --batch --verify release.sig "$tarball"
+        )
+      fi
 
       tar --strip-components=1 --no-wildcards-match-slash --wildcards -xzf "$tarball" \*/eng/Versions.props \*/global.json \*/prep\*.sh
       artifactsVersion=$(xq -r '.Project.PropertyGroup |
diff --git a/pkgs/development/compilers/dotnet/versions/10.0.nix b/pkgs/development/compilers/dotnet/versions/10.0.nix
index db6d10d0b1a2..c92e82748a4e 100644
--- a/pkgs/development/compilers/dotnet/versions/10.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/10.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "10.0.0-rc.1.25451.107";
-      hash = "sha512-0wQQq3RPKM6EU5FXQT7bMvbPsKE+6UGlfP5FHQh/91fb09/lhVlFCO9oMUOkX8/ntQN4w+eqnrB2tPCHXu++iA==";
+      version = "10.0.0-rc.2.25502.107";
+      hash = "sha512-hz7scU+GeR8opmEoYFby2mIzR6Q/4/XqKrb4XsusXHFrIFNnGiyuO6pYVEAy/AmUZ97YCy6m41ybzAuKLL7m3w==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "10.0.0-rc.1.25451.107";
-      hash = "sha512-hMhKJaqLUWSaHBcNP/OLQ9RFIppWqztgWh1Mi28aCj6a1+aTfjLNc9NmAsGC27SeqIylMYC9zoKTp6BMPdF/fA==";
+      version = "10.0.0-rc.2.25502.107";
+      hash = "sha512-9qeh8T+LChz+UZYhAJcf/POP7WeLhRtyb4Z0+bmRnv0Xm5HPPmLqEy6zADiVU9aZyjPu9Ft0NtvLdcfzXT50+A==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "10.0.0-rc.1.25451.107";
-      hash = "sha512-j/HfJgOT/5dMNPQsEQvilDp5LyTRa5SIVHZ5dYsckLrnlff5KHot4lYoyPvQNfFzag1hxsgMUtOfbslDFHUEGQ==";
+      version = "10.0.0-rc.2.25502.107";
+      hash = "sha512-a9Ul0tE8XV7ipMMHlbkhQPi6qpqiaYiGNZ9wTHJlQhDoD0AsKycbiYjWnsITXsuccOjAXGIPjnX4mwTNcD/VSA==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "10.0.0-rc.1.25451.107";
-      hash = "sha512-0x4km79b8z+HFPd1qXOhx65BGDLRYECLKbjyzhrFaOx69zBNQHbL7nqTS+qXZ0BzckdGEBARrYa80QinpIIF6A==";
+      version = "10.0.0-rc.2.25502.107";
+      hash = "sha512-lXNTcDjyw9E47AZE0w0AoCRIls+nBtOWb5t/QTbrNX+OgawCGKJn5oHTjyOrZ38wR6YdWQbr8wi1/B/pwR7gow==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "10.0.0-rc.1.25451.107";
-      hash = "sha512-XisyrroZsOir2prziGawVqx8sVAFvyamu5W5ordZYYuHIr/yeLlC6xDCgZ1CMhHE00ElUyc34ChHl6gUgQdCeg==";
+      version = "10.0.0-rc.2.25502.107";
+      hash = "sha512-KgEeHi54wovjvzjW6Ma4chuj20ux1s3dbuo2pvCAKjisOyc6hHS0Xr/LvAcnCKjafa0Q+HZ2IRZ+HS+O9VWA+g==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-OaAv+l8BEw6MTrpB8e/j3QBGRR5IUr9pX5cjP5e0ooc71fl2JYVmcSgiY+D3diEHhkCMf5T9A+esQxctbZ1CIg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-pYS9JBkV7rUMaHEESpR2rahJ2ZvaJNsdt4oa8f1WuPFG45XJ/2u12IdV1vsuaU+9f9rYMVfhj0iux+2F8LYqFQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-gh184Rc4Jappn49zJ8Buwv1IQYjnTsS5Y2NRM9Un9m9lazL4vGTrnn3JArCJhq30K9Fhs1CkOZdbqGT3RFNYcw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-O6kG5AngtMsrdyVCNqlpBUDcmeq3od7Ucg2xN43pyZOcwmLO7AHl49SKqniW5JyoZP4ZqWt4KwYM5mmw0XV3LA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-qkVVYbGTFTdyrLjPTbzglGNdkL6R3z/DBs+rxcM/T7AVwP3Tz8WKkoFRZaRNclrwR2ZuEEACBvMULpTAF6HJqg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-hYNGcBFVkmmJRVAryuSKJges5+CKfI459ksjbIkPAhUHGwfOQIpKcX+TppfE3jJmCSl+eQL+2lbZl1jiGHXtlw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-P0WUXdJK1STziFoDpTuMqPy8uU6ZyVaRe2zkoOZsQZi61wKjT2SDMvF9hn6qWlcOI9eUS9sriqRsErrdjiICAg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-hIWTBNODFZiqZLtHrs9hMTkXIDIcacrcF9B05YvzeJp9+0dFJiZYH1knXpDoTos3O5KwDObfb2nq5YirPBAPXw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-6z1jv0LvBwHU+vshvjc/PHb0f5QtKpTukl5QajjcwzP6sJ4tBKJejbNNYuFhUECsetMbtszBHhTuqSC/wTY71A==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-GR4jPLadQCCaS+1DD2v+/MQrSC+hFk0G1yEw2BbhcgQtYgxM2GtEPNEUPoIIss3YmeCM2vjXZBgLZtS6yUkZdw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-EmYPxjHZfLErsOcJlqBwI/zk74tHsT46ItDhn+a8OzBWJkFBrjpbgjHwyx9kEYK+jrXZv+o2WpWVVtmBD/+zyA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-YnnezTFKvLbmSjJSKxNU+JZDiz++ku2ZSNeTP0KYxuMKKXx0C86dR4xvbSqmB4aHd8SZk5Ka4UH6PUTDrEVT3g==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-6W1aeaZGo6oQGRAN016jgsLev1RKqktn8w5+omWLgq5L8Rq1SCMp1qrutiJmMyKHS++9c+s34ze5uF8iz3jnUA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-F+jX7XP8Fs4E3Tt/HekmuL864IUgH5aN72Gt8uEEtThjn7kl26c/gu05R7pk+57GOinv5Ob/bkTTXOcCb3S+gA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-pZ/VK7ghPyIZGg0GOJpc8PWuv1PZe30t49tkBpT7ge7w2CAs+JYHwLL1QpkRVuhlokL12ReASj06DNy6rAMV5g==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-Ki53xQRuNgmsZ1sUaV41PMVABQKepRFEKsfUYBvyZy0e9hGDCV50wEcbCRhJj07WahcP7aMf7hK0s+yCtbp8Ow==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-k43sAfvYJ8+dupxMpwBAuY8g8Zyqt6yvaZfguWfZDe0o7njGlVXhllq3IL+v9WGMjGf4Cg1WEXNDuldn9yVzhQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-V9tGJ2/s5CYJeu2kCJAImHrJ6/a7k+1GgFgAjbUXcPghEhQyqBaVkekeDQbEiNBQCqv2eWJ5gRAxZn57LHEGHQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-Ikd+sEhKE0Tgl5jrGGQgKvVuk+/e3WmXZcUwheBmQqpggs7YMMD9k/BMxE5ro5G9ENEmP8hfJ9suJxG2OupDPA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-IYdAy1GSZcd5i9c8PPotMhdCnExU1AwLHn12WQ0UmGg3bjTvtgVuFen7dkFTISqJn5T/3AU+89QG/d0oJTlIaQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-FxbAID6dZL0aaKDFr0usSHWC7JZ0ZqZVMIP20rWZJ2Qsvg9C++yoMoRxvfj/WD6ZIbSaU0sg5HxS2OxR1N37Kw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-iXSGPUT4HxCO0wxmNM2dE2phDcC4W5BSJkjn2RnA/FC/tAVZD6O1T6SuMtgeA8m9vVVrSy7sA708J+j6zzyOfg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-1PC+i3R6fAauQoxegCNPHaHx4hwkkHv6v2+OotoAGUf1Dz4YyED/Ho10HW+fCHklBmHkcg6CMMC3IzuPIo7IXw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-NOy0zl+gyoS8h1qUmNYxm/KSRWCd2sLAATH5KhFatV9GwGc/JHhJfWuN8oXaIWuHkXklWpsCgIE+BuEYpKUkhw==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-s6K4cCACFPHmvJddqn9zVrz1za9CjyOMNgsZA4Oi2ItTgsCB/pQzr6IpCUzZKrMWiojxHCSx/uch7V5kWE+GVA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-XlncsgNGIi18zQe0A3ANBDa+KG1tB/s2Dmn0jfLsPMjbyYTJuUpmVZvNgOequimdiM+pBWX4tvVqRfsV5hImww==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-SawdfjnEJnfC/W9ptl89rS83enNKCyoDN2x459bx7I90U6AfGumGd2r+phGBGyHRhhiLHt7+z+3mzs2uuId6Rg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-Xl4KiHx8RuL/DSAAcxMUh1fNtaRYIKwzqoUxN6qrjsE9A5mlWlsWQ3CXP/DFkP1ooWoQEH/Cyk71IHQCHCKZ7A==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-rHnlR/R0UqASrXuSQD2rJoN4iOrJcexSHmk9nPfCDIgNYSd8c/8JE17SGU7Y6ufR0JuiP1f09KV2jibaKutHEQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-cTSKXdydpMJx2AC8n0wvrHSx0aoHI0QSxo81D9w7O8wrxrpv9B7gPKU2j8/gpe5n6gSmdjuYFTT9GTbt40wpTA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-CrFnRAHFOQUFaU3Q2XlJeWN9pKUX1YVZDTHpZ/e0+t1ZfCuu28CRmCdaB7OoWcwRRA3z8CqniK/sUpg+VmJhfw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-gWcOAXM1iT4NkVnftI3njn5aqLRgn4DXnpbW5BtRBcsqkHHlamc+sSdWXltVweKIsz/jZbCrEiMjl8sYOS3qmQ==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-mnfrlJ2jELYNVRZEXsgJdseeiEIkjIME6I/GFO8jUaXW1v1ydYSs+AycagoNqNb4Ac231DLnLu8LU15M2YJljA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-+itZL0t/HjXzRhKVFIvysPjiLRov9TY8U9SsuRE6JH47x2T7JR6u01z3zhYf6CF1N+omN4NqnxnUBTw+E9ubsQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-ELGeVjCCBpYHZFl0wYqztcb53M8fHcuhX8g5Hp6ycUlc9sD6Zg7lXOh3fXSHOf73wEG9125DvC9U0eMnnugV7w==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-xxLmFZWpqUqIF5eSGlcJLFPTMclNWvPASqPdvLaiu8HtjtopoFC5u5Y2B9529XXJS3TZmaPQXkeiOscz6ux1fA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-DQ4H2zfLSkyh8LyfdUUhgaWIZWBsuK++gE0++1KVgm6MceKAuoShj2vJ7bdGSaSJIrlg2Mcc/USgNpdRcXt4vQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-uMUck4T50qnHf97xwLxsy6MR93BN6g8BvXFXfILFwPeN/8GhmXBJMOqRf1c7Lobt7+jHlQ3DYj0/z1jVwjnJlw==";
       })
     ];
   };
@@ -160,416 +160,416 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-V76NEL8Pf7FMvaglUhYTWvmbQlQHF4MKTWXU5z6l/63E/NE/GijuXi9+otgGmlfxBKCsdbCm6+JoMx3H1YQy5Q==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-mbrXpbknOjIMa8YNqzHO1HRP0V3lgHPGzFNYh+/VMmer1IqVt4FmlR4BjMeU+jfSW31gtfvaDFqu6YfKhobstg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-HVKJb0V/eNXtq5wqhN/cSYcTWpTVtGQCg1ZhfVdAftkscOYkSv+IoDWMptmoMnmW91jTpe62+KkqoymNRQ8uqQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-bjlIIxeoCrqrnEjsk0wbzGTSv+BhdUR5SnFC33Ar5/CwMH33p/X+WWAe3Ac6hQLVdxeIuRrbxgceDsf3Hn2zIQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-XooWEHZOLNd9G9+/Vh6zb7dP+FiW5l5DhLeWLreThBr6PVvojYf8fSB/J7gqk59x+mjgp+7JyLWDRBljiUbM6Q==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-j2y4ZAy0wnEAoOsteO4CpOao9Hz0zcvyeqENoGG4HMrYivzYQmXDkM8gGuKO2c2+77sSNYa/TjUiU3oE6bCmxQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-Z3tvIyDNhcR0Io5A/SxfhegCxX7wZwja9v9o/PJbwFgAJKby3YLv4Z0bFVt6h7UgtcMZQqzHFOn/pwsTEub0Zw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-G9AQlTjJJlOoqC+IZzaSzg6k0GAdXXeywa7rcMRHxtSuLeWoVakM5gBYwvJnWfSJ1kqJlIo67neV2vvBqwjpWQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-MR2RtWm4VBoGST8XUmdEIQrLVktNkp92pblT1NSd5M09v3pU7eNeKwt/BvO/BE+UVrsLbHXrXAJ+rP3Ycw7qqw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-cIucCZIOGtVkjsvyQYuhPBBonOHwD2oGGSJNkizjXXHJ1Gp1/sIrAXPEg62k3uyKWPsiFqBSgsn1Wes0Wd0mSw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-/za89BIwa39QXQOKX9S91MAJqnO9Xuc3s+LTiTK2/rwNYJy2TwB+wB8RKqjGg/Z8nejgHrjC4+7V4krvVBf5Rg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-2VertB1ttEHJARtDySmH8Knon1/C1ZKho060g0Dqj0I2opdm6bPglHm7fwmVZLZNzWPUzk6j4OEs+0kdHEDSsw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-a5mSgakxI87jUB3EhXje0LbbU+RpYFq+kI169o7dLH4jg2nDE173cvh19psJrM08ktwOYClGyvIAuvmeEwX1RA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-tQ6OaYTMlWXON+cBPGC1IVnveaF7Ctwc0SdoQzKN16icMNdYTD8ZHMlkcMYWV1GrPHXH/Dew63IeP6bpt6nYXw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-zR78sN00inx8O5CyDdDcwuvwUApTZlYSmA5t+wd9mzzKVIGbZ4Cz9vEcpN8aHUN1XDEBATbx5wSkjB5GepfNVQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-rjTcmCMvPOqxLpNWP5lot7tnK8Gk3LkWCkC1xhUJj0WWnCIkbrpa8hlusirRIiR2olKJAo/z2vzdcrSqkQe61w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-BJURYGy/fPMPR2V2ba/rtHCTpUfJzioEYLZcckSUj3+wYsrMyy55sF0nI9Ds2p8Fg/EalCFXoHYP8/2euX5Vlw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-hRN3Uh0q9iu23qVFrPeOch3DdgkFDYRoGd+ApvmRv7p5w+lX9Fkxfu2m0BMV2o0QgbWDIlLZOKZq+AU64/3Dvw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-oM+nJTEa7d9PHjAMuUCvKDtqqPPrFXJpoMacVPgYw3pAOsSp/g9mrULkD/h5paeL5v7cAsSf6bvHZEUkoWwbIQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-zemzdje8OMIrKzAePlCytq2akcdHs5YevVqedUSLp45z8SC6+058i/vI5/WeM28hQumAjFdWQz0jtEUC62u3xA==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-znRScAxeGIwwg6vKV2ADd2EDvfQLIubASsgoVLLVAOIW+W2LGF2Ia3uxgozn0b9wf2fV29w0S5DaeY97xl8DXg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-i6xet9EgM3zw4UcH6OzlIc4FaqODYS1hBf1LBvdKmIbFGp79pkCVT/s60eV1fu1eTQk4/cH4u6CCNdA/+jTDAw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-xA5c2BK8D2p5xsJXvlIutBAjVBUWUVM1f85doMoIgzPwUaceyl6eFsEQ2zjDh1HCgtdkGFeJpGQ4aDzpKlpa3Q==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-2s/iuHKVirb0v2UV9v0D2AzmJS35VM3x7nB98Aur2MTq9gK1Y9CfklQErsZApPclBdzThIXUKdFYVHOZY8as9g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-K9FqPXfxZLiWkreTc8hXclaxo9mQ4EkHeAihT4NARE9O9lkVOZTBEZo+BcZuZxLZgO3Pj6GtBncMvTBKn6r/Hg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-5lbYjjFzasjYa2NgNTFR5OExu6xDOjBteaUUv1efVC1acJYa6F7Sv8y9Duzq/GHB2SCnFr5e2RG4duzVKUkqkw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-a6OPa8GApjr1CuaIREog/GL9pzxHiorvCP/YaYZtW0yNtRSv06cbdwEB+FYxc6tDSMIClzrUwshyR/hV5nSd0Q==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-Rxo9qZOaGprb6qXsLWzM09CHk5YiG5LwuuRLTA5r+ZymZnyDpo7VsmT2p97Hr9abmFe04inezbeItoqfTat7kA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-ed/97KH2jVc0oedjN2EbzkMpiynEMr6YEhQWvGE0NKugdGLLR6Z72b1NyImy64UOs2FZX3zWg7tBBq+rDwlo1A==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-gfO0It9AMdlFTffP5g+ZJrbyI8Ul6aS8MKwb+xNrVg/0WculnWhsFL+r6hIeSo+0XvScIK/rj6ukg9bF91yGXQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-LzquzSN4IqJg/EADkUT8l+PCgGyuPcb2K80Oq9MXSgAEVCD2SRd3GepER785CpIlZfeXQsd4lsaklBo7GSoTBw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-2y1TmuKQeUeHIl35WTb8liWu8m2LD+HQq1HSSvmB6Mp/BCJjleO2TCnWPuuAh3P0FVKn0uK60CdgUJ9MOJqrDQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-IFge3TxF+cZHd1z2RPokKpGiqNtSp2WtGza0HX9RYRHewP0hARf0d3hq1bDQAMLjJxf8mvoakDoH190dyXQITA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-MoImFJInSf4NYK3dpOIRgV0GYHLm69d1jXvNodphn6iV+PdsXX1KuGKtKhG4AVeO8Yw3Fl7pgxHnxsR9c5eqmg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-0G7roKbZ3URRaC+cOLAGkGADaZpUD4AJoYJBVnaH3HRsizbG7gASjmLfEiN6kvMnJI9Wf6K1f2yXVQeBryIzdQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-7wr08dBr7MK/SXrWzt83fwdT7xyH14SJXwsa5/Mwse2k91zu43QJu1S+t7ahgwn95pVsx35pzZpkGD78ZXO9OQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-oWghxDXOEcNSUvjUuH+2OfqT0A1+MWf8YTNwMgRsxKQR/1XFtKthjR2oNnji7Jy3+2Tigmh4qeOOqk5VFNWeIg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-l8xBHbdF+yDgIiljNCMJGSqhFITeB2OiUdkaxkeSVRcMEAKpz6aBOtMgvbD7VswH3zKX6nA+kdpjWyXXtdIP1w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-AXyNqsmO+buzieRznlOThn0IiFWyTKInH9+7yq6EceZUFBmEanPrgKDZAOxqSjJ6wtOPo4vBkKhO0/7JB8kOeQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-zXMQ4rzOYjdBPKLSi2YagXPMylYbusxZR6s/6NuGfgCnUNiaJqSmHv7SUsusDoRaR4kaurHVoHKn7P1/ZwNDXQ==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-siYdx85ZKIejQRsVe2+kQi9b2u1/6PXu0meoCoG/VQdl3zVXueKCsZwZne3yCou4lvxX+PnnGkYXk2tr9vVf4A==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-+OILb/rE2p6IlAE+2kd2fi+aowKz11Ydn/2e5HUmCOkGl2JPs/fx1WNGaFtFLzPGeL3NnRn9FDfii/wC7SWAoQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-bOcl+8cIvTOtlYHJaHA9A5ebYma4XYjv2L3ziW+gG9HTOAgJjs82ql5RF7yRnHc/dPfvteeAOQzmaNJYFA7yvQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-Vl5f7lYlYbLd42Ivc+rcSpqXsTkdSVB2PIjl60zISBZ3pkC5zo9K2WEb5SreT9HJzS0Gccn4MWa8CtBINJg62Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-nRq3fnqsD3vc7M9GewuY8eX9spFG10t5NbrBAwMZ0EyZXbN5oj8oX+O3croxGLvmED9E4OhTY5Fn30EoKTnYMQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-IBScSHBaist1VDe55jf0DI9FXnCs5sLz+gzznK5Da4AP4IJm3ouqp3JPkuwxVIManPfXKpTcFGb61G6n/zl3/g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-7uMe/dvlcUoQbQ4U4V1esj2kdzR+d2G1IDqW7PEO46Je7alN9dGCaFjrYfg4H16g2p/nkguqregXXt51Nv2Tog==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-Ng5H5Hepl6+6I/qLFGCYnHwlr9t4UAk7zjksAmK2PIVO2dz60AHY8jijDHPtZ/VF/C5YtUi7qOos6KUu3rHyiQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-65sKH2vG/00xutyEIPB9exGkhpG4cwlYvkty6AdI/2g7Zvfke5WT2UW2aME9vVEmB4Zn+gNDTaRjRyFVK3n7SQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-9kfX46cD/zco4hUhEYEesn2zhqq6cTqKGYcNLiwQVUp5XJl5wwcsIGqQ2lA55YC+ZcecFCicWeJu5bgTNn1k+Q==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-wAhZFtY3E/JEIfkGdX/P2MzYj09G1tDrPi4+zaCxFjXzgcxfU6vLPNzaR/EMQb82ibluhiriFTG1aeCJBd2qpQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-mpE/aLq3eo9B6MX+EGWEt/bSFfB1ZImIIj0i1fMsHjaVRwLTB5E5xDbQzjJWVEHr74F2FJISz2dJ0qC/wNbjtA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-ALDcdrSuoBXDekpuPy3J+RS8vu6d3vt5HTaZkfT6VpJGotv9qq7cvm6kZ10VfFmZ//UbC8LibDsJk/jbzGf0LA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-TknoBknlA9KSB3GbabdjxGHX8xNCtuKM+hA/dhwUSyUN/0aDwLuuF5/pOb3q33AxPAMcaubKHcqpjPSiyuFKZA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-2MkZiOoWMIBfx1a/lN3Yz4qWszpjkynS6LR4nT89uCjk4riE+xpx2JQb5FDxVfxLFBoYlis4wyMmSrqLSd1pMQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-fPUXXXvAGqmwme+EnEhx0koHPx/nIgZLDjw9wLOQTOOt8HdQboKebk77z31/mM5lDgmruUEwfOEP35ZnzpEdKA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-7x0L8WWLcShkEROnccmVsvAEB11yfvV21lngDLlgWPKH7b/YBHjziS4rlN6pzuA1xozViQkUByyiRaMIwRm4iA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-ZMmkniq9nGb6HmzdHgrYqUh4KAWqPS3LQZXe0c/TL1U2AYaM+go+05kkWYSD85phnmERUHDmgMEDo1zipqOFVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.linux-musl-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-kl/eWcRGhOnIFhwPexi0qRLw2x/hV7SNkX9FyasNUkYi/6HwMOBViB7RnZe1iV4NRZF6153Nv7Z949/DkUFb2A==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-UHHIErnjcdbTe4ZSGoJtDZ6PrErZCLpwRBDtE6/wARb5jBl39jXzS8Ol+MCpZ9sXjyPvuv8sTt7LVmHkdriRgA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-LNwqyHG1K2o2olSjErf8m+O6vxh3iPHLu05s4GRDYjyUz5uaunEwKVi3m7Nj3EmlQdxnfrpoLH3cfXuA7/mNsg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-K0a2aLkcdAzrnHZa0OXcKu8i6Vpw4BYLqF0jK56228M6pT6W1wiDQbolSo0a2tU2omjQTAS/Zpxt+BeH8W+6Jw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-1YxkbUSrVZXo2IXlIrB0z3B0wrkHtgIcVn1M+7b7qM0Si9KGFkZzsI7T2X7CQwW01jpRbv1NcQW8A528i1DOWw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-l6ue5zHQwXVQeFTO+knYTZdfdaMMaK4k3wHidQUQ3foIA6y6RSdBx7/UvkVfQMNJijyGgOK/oliNa79BItBV/A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-Z5Rhv4e0FljV3m+w4F0Ek4SMuRMpvDs/tsrYmwZboj7KAECrQ7PXWee93FbcecK6Tu64ZtvsU8fkWmffRqfp+Q==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-G0rQT5lSuWK0gQXzEdwHU/Xs1Aa1xF8VNsvSpb0o/CUYqI6oO02HVHA04+cYCh/l9lBMrqb6uPSfUqDzhu2I8w==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-McSCf7ELjtNy6gbV2EFU+D1XEi7lw1xI2eqv8VGqX8FyOHlC1nofhyb0PLd7OQLelQpR9Xajv1JuhzUtPkhgPg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-CaTNddVLNUsBB32zjgkGUl7V9nlaIzp03PF7FhM4bIprWoZZ8RqYJB7Nte52W1XTiGqc1ss/0CvRFCaGnTK8sg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-RmJ88+HJ9AqPIMwIlJs/Qujmab64997iyQ3kKdORrFIezKd85+zKgHbnM+CUbxAzqpBNufECmhWm7oXMjyoPTw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-mWxo7u0R0Hl7D9E/SNp9Uw1AiojSojv1j0aaDp3OEIHKoGi3iuzYu8Nsts/9D08Ec4vk87TY0jrreKxyHlvJKA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-ORvugqCwtaRhQ1T9v9LPNI1TO0R3WUYsCyHPU+eBSmoesTql5/I6fEVqyuRrKGf94PlJAyY2w6tSeluV45B9ow==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-bWUtvQ9r4yN9q+yT9EQUWUyo/KnStkvCEo1sfmVZily0aAjcH4ZT1B8qg1KG5IjOdHE9l9orqD/tY0QA7a1/Vw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-sK/K13o1GY/6MWR0ZrqhhnG9wXtZSISTSXOo8hA/SL/OXEyucXlXyxgXaF5bGtwnUjgibObA5B+4Z8RJlMal0A==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-he8tZSRxjBEYYFD5BCmjkb8AGIiE+34TPMX9d6BmSHTR9Z8hSjWR2FBSxLo+1+ePBvnWJj4+Mgt+bg07tGU9pQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-um50+EJ40pHY1ufx5lcVPWjl5eWfHF8Jg/d90XMRD69R1DJ8oOhPTWYSlia6F1AWyW/DQ/ncf4SphUzLNFpdOA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-+WUulk3XUCVctkBZg2sU5DTN+94xDu0KZoZjotxu7y8o0QDDzbc0l89QobAXv+HkH/5VPL+03hbTW43V7zyVgQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-0OuXkUPLTxK9aOijYilEOvJI/wAA9ohXy7Y10tRwaNX70oNkUA8C5VUuW1rrdMqhrGk1tLaE98DrN9IXXyP3ag==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-bjIe19Dvrr1zm9YjOfu1XUxgZCFuEDs42oRfo7Wp6gUQWO3VMSz7MyG9hNWCsa/ZTZDUi6AJjpwIRyCXqEH0QQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.osx-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-B8T4TBq/pkJxzqC/GgJ4UmV1xEeMsLjnnyeaFWXfN06HGrlIumFLR0GQu5PFmwEDjgS9m+sJ1m2CYP3FGAeaRA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-k6/cqrVhhdxR9+xWomz3kbmBR5gbzrpfckUEofY+Ohj59MNdmVXmPCECz9myA+XAkFAY0vQ1MViqaf+TuEEuoQ==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-46d5U65sw8Qr2qXegWUtZ822g+AYLGMNo+BVKnU8xZQNyom7Kib0bFHnqJ2b0vQtYP/Z0tEhOvKc7cwu1Yox4g==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-ldyfSWeDI4RkCY6Mcj/N1KcPAMZKlAcEryoXnmTj7oh587JM/usoVNDe+a9EwQMA69mPga5d9XMkRk6zCsGNDA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-RdNmEOu3U0aPwLKL0mTo48/Ou9RBg/3lVcp21iVQyqDmqRBJSSWnxzPwqQURUvY8GbYb//gSezJYBll4BgqgRg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-CYQAD3jv1uXiNLxd5aNVONW5Jsg3pILM1d4hSnPNTT58cUpJBM85ad8CiJJQOWnCOIuynthIRZEazf1zs10AAA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-yDZ/fSQckLPS0rsYRBMIgAMcm1ZJspToWoHrM2OuMjkoZU8JPGebekOAmW19EsAz9NzEiVoAae4vOVCQSQEWAA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-K4eYnEoap+fFlDmPVpHQ35vKj8JAuAzBst8EQkAxRpnMYkdH6PXpUB6VMLfs/RT25fiESgEoFJjmVcJ8LpngOg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-OEb/13XW+yXDYWTZIV9qspJ/ahWY5j7UdJo+vuwW6VOxHv234ZHHh9jV6jQxFxkipaq7FgtWXUqk4oBDGVF7/g==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-/ffNVsL1eWoQB8I2O2Ehiz/e6B3KwesNAvima4B1gHgrZxjwH8HOdUCx1jl+OAt9A8IJckseCWlvATy0MRBugA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-arm64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-Le2dxO6rTOvCVdWoITiMzo9H8oTWqyOHW+dvU6dXNVVNHnM3N40ppXKaDjA7jhFc0kJUjrTj2anQcdSFdmgUzA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-JM3SUjoC0qYmZjhqPE/9PuitA9uYHMZIGgGYL42DEvpb3HnPz2j795bITCW0O9Yi+OWCsaWEK9B4l2pmMY1W8A==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-G9CQRcLF8jfnqWkqXdrVTGO9Z5Jie4HTJZ0MUJl9wlIbKT+U2gPQq0PPEHOtPkbuQuJHyxFg/v/i9Dy8/v41QA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-zlguqkKffJpKnIVBe0ofS87mkD951sUxRlCzr7isu1IjvKDHriwsIx7wxLhsjZELXDuI1HlkV/7Xhi4cludhyQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-GHAP5bqAaWMg5SlrQNPJxSsCKM7Wc8JfFBDxJKdwBFe+zb7WHJdk4cNftM2HKlM9aFaljKVx5zyLuky1yI8fTw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-MagJHz4q0OewlKxt6KAl2Qtzq2IegXeMWtk3bAIE8WFoDtLl1LwkOF3xnfEp+F4gIkv46jrbVNPMYqbQ7/yq+Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-grvZytFhVIuIOicS6Fdbf2YMqZ7rZ8TbIac4MBeDDlTWkCO62EbL+lUZbUStHnmnDdOnkOa2OtNsuCQCKr5ftQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-vDvBho8UNgWnLDKjOeKjAG+2a7kGJNO2XSF4vqOFTetEduXE/U9bFA0mCV+oDborDg6toHaFqctmW2WhbSQ/cA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-EciQy/vlJDOXBDDvCiMfwdRmrqL8p6K5DahT3cjJ5R2g0vVDQ9M3oEUqjQhqIhNZddL3EVqaAIr/JVk9DW4NXQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-z+WtgZVatzoNkznwoffuv8tKjy8Nz7WA9fIYnxYne6EQ+ptOR8RppYJgIAixPB3tQ0+BpO2l+YtpI6kbDSXXbg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x64";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-lBu7jV6lNTX2YJ+sNh25yvQh/15zw1vrzMZy7zypuXi7dwy4TNCf1AyJzc4YYTpkVAsQLStEofQhZ8acNweY6g==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-9VW7n8wkmweyp/87tyRSL0Abmc7FIZrbLIyrH6LiOgALNPkaFIfSJgxmDqur3MUTsQAAx50iM/YA0+lNALIq6w==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-c1BeA+VI35IumWblDAB7kXHPTWA/CBexyySFbT5MizGa8tcjL3RPr5sYctyAN3wQ+bt47X1XpWxibBzERXj6qA==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-kjRe/NXF4CPbYAtPfng7zVkwIvvRSqzzylUMiZvxrotuXHUpDD5K8qXM4F6+XUQrzxLlZRZUg+OKuxswpFYU1w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-Pa2P9F6OZ8GTmGk4hPqBq0av9r11gicHEteG0l8tV+8vpvbcwFGDS04dYJkDehoCMhyDpVI1N1h2oEzN62bSGg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-nYinKgx3/v4XcxNUmS3xyzF7LZbunqGCa0311lMC4KAVuP4fXqcUpBeV1HenBMVKnmsKMNa6blHVRebTNDqT2Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-Z2Hcf39NRB0bZwVZ5y3Wf8ETRkGCxkCjh9VpNlHUctWxYzGkGi9/Rei6wJNVh/XT1zhyN5eh3uH8SukbfCErzg==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-qQnhXCUI8A5yD3w7ElDubv6GNI+FDutjWvWqB4fxXnGAcPmu+SNEWfmSgYVRq4LnL5Nnj5ZSsBePOeXirv9HXg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-mzXyLP0VOi4QTII1lfVoDx/vZ/1SQD+cDsjjcNDdPLr3ufptEg2j2SAFnvKyurOnzlbnZdO1ogip0VLGYUFnyw==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-wmvYzbEsKYDFAeWBsfJebIAuLtolrkDDToxqO8BW7KEt9zoeqVKeR91uAWcW5kyd6GSc4WpTyU7oXCW8jMx9bA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.NativeAOT.win-x86";
-        version = "10.0.0-rc.1.25451.107";
-        hash = "sha512-7vF41HU0xbpHBA7IX3Fs0HtKOgtXplTIkPWJ1FOpDxjH/R6xPCWxv8sRUNeh8SGhs7mGpf7rwcDGIEIapVLcBQ==";
+        version = "10.0.0-rc.2.25502.107";
+        hash = "sha512-2j+ONnDhOIcS75JLL4OGZj4NJnha5si4D8ylnHWsJi5nZ5jGfHnuABpUMOn2T5yaw6vUPyQc6+e1qYWUW7NuQQ==";
       })
     ];
   };
 
 in
 rec {
-  release_10_0 = "10.0.0-rc.1";
+  release_10_0 = "10.0.0-rc.2";
 
   aspnetcore_10_0 = buildAspNetCore {
-    version = "10.0.0-rc.1.25451.107";
+    version = "10.0.0-rc.2.25502.107";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-arm.tar.gz";
-        hash = "sha512-gQWKGGYpZ+glr9syJBA/2xEc4cD8MDCFfGLMStHHAW9JdH1zPXWM4eyoAXLeJmyBEmr4mB6+HA1d9yZGZPm2eg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-linux-arm.tar.gz";
+        hash = "sha512-RXOXwcFuMTHcNkKezwQUwnjnbnqwVhNill3BUplT8zQBzMnivYJApuPQlxG5k0Ye6h+JI5AeE4qeGyZ7hCMclg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-arm64.tar.gz";
-        hash = "sha512-vYa6xIQFCE/sthAmDmCh9kXeRV368gjK7JdxrxYP0de9yZpKH4gWnBzvdZVTbVXcVxRyynoVkoJx1ArkX97e+g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-linux-arm64.tar.gz";
+        hash = "sha512-4HXBe9WZLPaqsfi1mGRaCXa6Qfz8dBTn9z8l/pZk2bFF1KYa31DCF0GPJJUTE3GvBejfTaeFjHKsSxOmeRB2EA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-x64.tar.gz";
-        hash = "sha512-0iGYUMq3POvjYlo+UyHGfikh07/vtsI4BEoh2KlcoHynMVB7p8AnqLA/6O66fyPY2ITTTwJDfWpYMEI0hAU9cA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-linux-x64.tar.gz";
+        hash = "sha512-FAO6wy9LQ3DWZ4QaOkyr0R4zDrClSRiUSR08QYxf2c53ndYpgAlHqx6gGOWnJg/O538gLij6jBiW16AXfQOMfw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-arm.tar.gz";
-        hash = "sha512-AGgWPjB0ejP5EVLthi8okS/4A9rxK9kVpS/rL/0GqLFTwMidnbllZ0oR/9ct8rE8uikSTCqXkL3jjWDelxrNeg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-linux-musl-arm.tar.gz";
+        hash = "sha512-ahZGywTD2ZEUT2FfFsyszICvtaBX+dlmIPmr24qvkXC3MZOWRVsRk6b793U4UWurEVVF6ZrpWY5qXY7FD2ZeXQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-arm64.tar.gz";
-        hash = "sha512-0w4mUoypPzUn81NduD4eGazxLXhwj0si9c4pdTS0fYMHqeNGpYgqrxWfpzuATN9x9cWeLtOUjKuu1cc3kQr7NQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-ax3VcSTsMrKWKOzfrBMjf/pO3y+fKwT+w75qfFgRNmDgHlSr4qR50AJs6GX13lPFmM0yhL3crByBjo35vx0XCA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-linux-musl-x64.tar.gz";
-        hash = "sha512-hs//dBAVHciEJ9C5x5UZTnnYE5Ya+SoCYE3UenPIemLMtsvf1m7824oQlu59FTjFNfgBbXZ6Gbz3jM26vs8X4A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-linux-musl-x64.tar.gz";
+        hash = "sha512-vrVCuMUmveGoriyyKGwJlmpS00KJomVpjDJgAQCoNzq4hYqEVBqEP43xl5YEhURcaAk+sDvctiwjmOKe146HUQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-osx-arm64.tar.gz";
-        hash = "sha512-4erPMY9DFFB8uXn7jw7ldK1FCumPa+K8CzXcSt+EeKq0vs1q98DSrFaCundnoRkKT7X8mze2a1rTYmBt2YGk1g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-osx-arm64.tar.gz";
+        hash = "sha512-nydHh5ePwdcun6BZDdQY0yIDUqODqQmFTQvbgqfDIxZU4hSW7661kCiS3Mo/JvEz7B3yY38+hXj7mcjClQkBXA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.1.25451.107/aspnetcore-runtime-10.0.0-rc.1.25451.107-osx-x64.tar.gz";
-        hash = "sha512-XWSTyx94DCBb0hjJmQ7p6KvES8gdho0ZYEbWj/MN8LcHJe/67i7jez6CrnW7DRoUtWwKOWQreubQp1LGvJ6piw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/10.0.0-rc.2.25502.107/aspnetcore-runtime-10.0.0-rc.2.25502.107-osx-x64.tar.gz";
+        hash = "sha512-lVKMR713KOs6wRK6VD64X18QEgU+WGxT+VKbo/7phAmA29Hl9+0xTaTh2gXQrz/HsXVKpx3Bq4s+53/mO8gVCA==";
       };
     };
   };
 
   runtime_10_0 = buildNetRuntime {
-    version = "10.0.0-rc.1.25451.107";
+    version = "10.0.0-rc.2.25502.107";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-arm.tar.gz";
-        hash = "sha512-k5DvoQVATX3xd52jDNO5Ufta5oFU4dzqKA9BclduVGpOJuEWgqgHi4N+CWWoDgbqxdrLtWzXBFpEzP65AdJisw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-linux-arm.tar.gz";
+        hash = "sha512-DJXv15WufpXB20TlEJvX/BdIelELi+i+HwB5uAZmxa+qPtqAN0gWA9Cqz/0l9pH7z6OItLlXc0aQHGMffgN6EQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-arm64.tar.gz";
-        hash = "sha512-jXbk5mWvff26Xkoxy28buxh7wrm43lZe9e1xV2ja6FkSMEKvezhHZAltDLiaPWCfnkm8J8Ip0sEWVM1IiJYmPw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-linux-arm64.tar.gz";
+        hash = "sha512-5Fua/p7gZFDY0mNmJdCiJX5ABdn0RIQ2Xcsxs2K7tq9Q7VqSQq210tlzoyWeRE3CF/reJbqZ36B+wCFd/qwvLw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-x64.tar.gz";
-        hash = "sha512-v2t/ca+OsG6guof80owXgiLQ/JOlscqTZgA8JPyvvcSXs4gJ5DEKl7+wT9J6C26JLnbo1AP2AY1vyViMajgXDw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-linux-x64.tar.gz";
+        hash = "sha512-hqcTeMqtJmJuVbT0fLDqEFRK+lqt29DzPZuIsf2fpTJuKsZPnf5BaYS6E8GJNpDP4Ek94D7uAdqGXEtVGT8RwQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-arm.tar.gz";
-        hash = "sha512-GXH4Fi6PENK4qKMT7s1BgF00kdKHLGIrzxhdnBf+ghg3CvAhkg0AKXnOa7EEO/eg2RPi8nNG1kveoXxJmTWVIg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-linux-musl-arm.tar.gz";
+        hash = "sha512-ozCEpKgdIi8lrnOWZHGOXGdo69vWKsFM0eD1cOfF5MWB9ou67WUyHE4G3Jp9hf9gwNWf1VW++RqRTzM+o5Nt3Q==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-arm64.tar.gz";
-        hash = "sha512-KU3/OCc6q1Muqu15ATmRJQkGEvIfjC45OIXGG2Saq/WkzLhQ2GYvBI1aIfNb8wArA+AcVJd0d6NRkAhKbtJfWQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-I81zfdNIDK/ZBhWiLzbwrK0rpXgNhNDke45jE6SUvYK4fCrROr99kQ26jkTv6zZWgJ1U3MRsIwhmgtYWk3fdBQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-linux-musl-x64.tar.gz";
-        hash = "sha512-FHVFTKpRnNOvpr+3qVF1B8SRTFPQp5KO9/XTQqVr2jUaUL3ClCT648tezazSPX7zwYfdx5kyzKRjm5qkMbElbQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-linux-musl-x64.tar.gz";
+        hash = "sha512-eplb4vU0ro3ZzuzXq7q6WyJ5ujbdkAcUHx7dbfQSFK4WNrLIxaqtYCoStN69o+oVzocWljHoiGiy7DiHBNnIxg==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-osx-arm64.tar.gz";
-        hash = "sha512-2faVsHe0g93Wririe3Hn3hY5sR+jGQVIKhvJdXSHrNVL9qR4FrAkQVjZG3ZCPFQsaiguR3BaFFJXYergsvpQRw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-osx-arm64.tar.gz";
+        hash = "sha512-e4Z16OTkJMXqpnUVO32Tx43tSu34R7EWt6d8/itpKoxi6Lwegqhg+FAG/ZBHN5GmHtN9Cep+m4SMcmT8ma0mMg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.1.25451.107/dotnet-runtime-10.0.0-rc.1.25451.107-osx-x64.tar.gz";
-        hash = "sha512-XOjEkl0dL3D2/NbRpP0AH6wFowKWElGaHpbNeE1WmkgT6PHIWlE463WiLdPE7C2acEZciQQqaFdqeWWZbl7agw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/10.0.0-rc.2.25502.107/dotnet-runtime-10.0.0-rc.2.25502.107-osx-x64.tar.gz";
+        hash = "sha512-gEKnCKZlrfDgSDftoUM/zKBzycAIYZbdHPYMMQyBjs0sJXU+HoEHfJv7KvNkgxj8fRABfXnJG0j0KcE/vfeTHA==";
       };
     };
   };
 
   sdk_10_0_1xx = buildNetSdk {
-    version = "10.0.100-rc.1.25451.107";
+    version = "10.0.100-rc.2.25502.107";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-arm.tar.gz";
-        hash = "sha512-SnuClIY0v0mB5HspK/xPlAeSWTbqc2QgpRrM8OzQXG4aqhx/+UDvV1CxHNe5AkkLii9NpzDtcphGJwdR860LVg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-linux-arm.tar.gz";
+        hash = "sha512-eiIncogEsBXQse0KJrkAQrbqcR6nxEMAsA0reWwBSalfX78wPMzBXQVKI44Cm9ANetxzSvA2FLAGv8eCk8moOQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-arm64.tar.gz";
-        hash = "sha512-calHXMECIFjzOR7vhQtRhEDS4TTeY7HLi+BIqw3NwTOSiMVlboBrEJemA/0cJl1OZ3NZCCYRRiSC7kAvr/rD0g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-linux-arm64.tar.gz";
+        hash = "sha512-pEEEWfBX9/h0DLH31pZSe7pIuoZLUZ51e4jIYitPwxK6ZFN3Rjdw9y0aslLd6Y8Hi+3wzVmv3gxRm4I67ijmww==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-x64.tar.gz";
-        hash = "sha512-uzS5PVriMQHmd0gA1hJDwjatAfJ7IqFnDZh8EGjOB1YBtN/VITIKclplS2Vf/ZEoeLL8hDYXoLOMWmHzCkzSnw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-linux-x64.tar.gz";
+        hash = "sha512-EgD/M9fCqDRJlZDgX0bAZdD33B91IPNUA7XU/B+wC937fEquIwKA6NxokP5fxcpzjepHiQVmFO0CqE0ehtBo6Q==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-arm.tar.gz";
-        hash = "sha512-YdcnEuKVJQ89I0OvqXvnwnK34pIn3Prb0G2aR+wrhxWNOi7B9VnpiZekz3mlQQuFAhpmkKi941BnKEkmsjQusA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-linux-musl-arm.tar.gz";
+        hash = "sha512-tNgUQhCt+jwefr9wmNgUP/IjN0wjHjqcO5UjBg+P4CpaAkBJVEjRl95sm5fKta954Ofhnl8p7FSp31WvFeUQ5A==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-arm64.tar.gz";
-        hash = "sha512-/1HV6qNuFkmAr0f5nuX2CbGf188Mr34WfUDG8wMkByshdhUo8mbGuSHAfn+sIkBwHn0bmvirVIvNBdNyCKpVlQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-linux-musl-arm64.tar.gz";
+        hash = "sha512-73pA0+ULVFYs+gUrCxXOTE0we0dYdAHtSgshPKEstFX6YO2hR1pAgBtVblMP5GF3Cjf4EPskZ9MLVOkmKvzNDQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-linux-musl-x64.tar.gz";
-        hash = "sha512-zH65o01c6pdXkRWRpFX/IJDTIcP/XioWyBGe3+0Tzn7/H/9AgTTYtaYr/7sbiH6mzLYKdJd6XOd6KZc18J4Ciw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-linux-musl-x64.tar.gz";
+        hash = "sha512-oxvqxFB36unAENrLA/UvZ82A9wvzrssCy0pdAN9HfGDSKeOU6cWwknHyMRlyEW8cKgmrwEBARSB0giys1mhLdQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-osx-arm64.tar.gz";
-        hash = "sha512-Q8Uy7gqgPwJF7wVXh4nASCLqacOOhS9XuwobSzR1D20PjHeghcTrDWEwGPg2dK+5CW6Z/OZoqHYwmKvoIbm34A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-osx-arm64.tar.gz";
+        hash = "sha512-4qjERriGb97WCmbhT4kW5bbUcnBxPT+b/dUIvo8B0D+EoldgQob3Oq47T8t9KJVk3Rvc6E4HoDz6HkO2KuXdvw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.1.25451.107/dotnet-sdk-10.0.100-rc.1.25451.107-osx-x64.tar.gz";
-        hash = "sha512-k3DDv4JJjXPBc4FCN+zhCMIHWOhCk+dlMoN9h3vn6+mqinL/7os3G7wKzqokEQ03eHFTIneKQhWb0ykQ2p8HaA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/10.0.100-rc.2.25502.107/dotnet-sdk-10.0.100-rc.2.25502.107-osx-x64.tar.gz";
+        hash = "sha512-kZVpQU9HhCxahNlq+WXPg41YgwvOW4f2dHez9N8OYL7O3Rz7PPUeBKZLl4PDlE3yjuTe4uSRi9TIFFICVMo58g==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/versions/8.0.nix b/pkgs/development/compilers/dotnet/versions/8.0.nix
index f36afa68d6c9..557b1bfa59fa 100644
--- a/pkgs/development/compilers/dotnet/versions/8.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/8.0.nix
@@ -11,43 +11,43 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "8.0.20";
-      hash = "sha512-w8Q6dYKAxAkZXJyw6WP/eRUQf9yCWIlM5ygiKcbAODA/hVyo1JCiWQ896c1G1sy7wa+/3Q0vE+HkVFCNvcTfDQ==";
+      version = "8.0.21";
+      hash = "sha512-yc73wTdJLhG2sR1hMabTbHI19IcW+vXBoRTGj25j3TF6uvY4Ls6dfj/WKTKqnTr4QVIVTK75TowNolMw26f/pg==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "8.0.20";
-      hash = "sha512-ReqCsIPouP9rnL6Xrf+bmZujKQAnTk/rd9iIQhrEtwzKNxbfwa0MhdUo6D6oUiJXvVsRJbrn8aRnlCJfAXFwAQ==";
+      version = "8.0.21";
+      hash = "sha512-cVO97DE1umgDuedYZl2zsMh9iU0/QrHuOAcuihG0bJ9knW4afskk6ZXxpy4tQyUiOpUxiPHZKAa4+EETnBgK9g==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "8.0.20";
-      hash = "sha512-bdyPf8QDM104vzSBaxmCN52RMxbs/WBLbunXswNCUE9AczVdlCo2G7SZIimphcnzG0X02CITHiUiD+z8bTFVOg==";
+      version = "8.0.21";
+      hash = "sha512-IzcIXfFk6W8iqZLkywFuOXfBe21AQYPsLu/CPmRIPPWO4S7uNKz+NlsdTLqKlpCKuBeD2F6bAJAzWViim/RIfA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHost";
-      version = "8.0.20";
-      hash = "sha512-ohUx65qZpbiYP9jyu5H66IlW1wfcnUQ31Y/igebwG96EE221DRVKlfZeDMVtKnX+BpNWyzBi3k7bp+N699x+Gg==";
+      version = "8.0.21";
+      hash = "sha512-+vwjvnsacecF5UA8QihAcKgBIibgaoa0SEp3lG+RXLHf/ueLFSgbixumrGYQ9ka+lcL2Quq6IVPBHruErp4mug==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostPolicy";
-      version = "8.0.20";
-      hash = "sha512-EUqSxZh+Sa/wqzUbeFHVtCmiAqH8B+hjGGmTtXB6NjfhhfINQu1nrc+Aoz+6iPpOaP+q3qaAtDjU2gh1IXSdxw==";
+      version = "8.0.21";
+      hash = "sha512-evORqy7uBpKFqK/RGKJbb/09HZJNxFgXMYKMbKLKW9jsdPnwStD1ClQQgb5JF15OEKPmQRFlow6Oh/v/VQ4nIQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetHostResolver";
-      version = "8.0.20";
-      hash = "sha512-cwfZXFLRsDXgBqg7+im1mztDSw4bYRR/OVSjnetq6nY5JC7rHiBg6vPFdFgX3B/E9ihEuoCErOPscR4DkwQIgg==";
+      version = "8.0.21";
+      hash = "sha512-KLGjflueOy8ZeZswJB5FMjy++kZwCFGLZYXWjvWldx4cAMJixlaMEj29+pVNsIVCbSacCXaBQ0P+u93P2vjcuw==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "8.0.20";
-      hash = "sha512-MTyuSFZTIWzf1bQ9U2W/pR7+k3a8pNm+2U+5E/r0pfq6tAX6VghOUCSAPphOUewlCk5MPHsgVa9I9hVTI7I9+Q==";
+      version = "8.0.21";
+      hash = "sha512-sfsbiG5QRnauxXssJzserNwsodKBK1/RYdEHe9im/VLgiEjgxi5f/n9hf0wspWfezf/5suQXKqDkG8s02dqW5Q==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "8.0.20";
-      hash = "sha512-4Iz1Qb7MIybAKAQmBvhlEVpZBWz8za0WPX6COTuvcK1ZnJ8YuA3JvzPOwd7Ni6729dEuxEdTVC3Yzs55tvMqEg==";
+      version = "8.0.21";
+      hash = "sha512-d3n+cSysJGgejTvRfR3mS0EHNk++6i2TBM+C0lR7dOwNc7Jl9dkzak/Q3c0MQIIamncpkTE9YH7dP/JTy4Sy2Q==";
     })
   ];
 
@@ -55,118 +55,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "8.0.20";
-        hash = "sha512-QzpP1LCuFNCVdMF8zxw41t41F0QBb1BOPFcmM5LAYkBb92pvwazmdXpUwl+KwqwCu3XZfLDGLQN1qkCKdgtTKQ==";
+        version = "8.0.21";
+        hash = "sha512-ljnJ91rhZhIHv/ChBk6tRSnJGy7NjOp1+ZJBeaHiJTbjyonVHh2R0VDtL3RB8yarfO77NTc8gIjltxHF/umK/w==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "8.0.20";
-        hash = "sha512-9FVoJFIBCbcHf3IfAbVrKzwztax3Aexm0QMWzwW9zbzKATDkM/7a8zSWsCpCHn9XGeKu2qWPE4pdTd3cKEgGsg==";
+        version = "8.0.21";
+        hash = "sha512-PLnZveiP0RpmoHb3vd5Erx5mKjZgUtPLNEtbCHepo6Cw8j9s9ZzMtdGOsq3NRCqIYng0gjDrw0ANAajKB3yY/Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-+VqaO6X2RpIPbqwd0yaoUpxe4gmzOwfDjiLxGsv8f3V1H52iFLkoQAYPqtEizaUSshvRUlm/9qTfaHzRLP9jVg==";
+        version = "8.0.21";
+        hash = "sha512-C4boV1ip3hPK9UnOUm3r7nj05dukE9oFKxjkJZj8lbE7ynRgNsiXTtF0PDrz2erxSWEyf/msadiyw+d9nO+j2Q==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "8.0.20";
-        hash = "sha512-nOzF8i5n7DNg8it1yx1oKmMpdn1h+jJYpKLntAbdVuxrCS9vZsSKg3HIDug8CQ1bXFasv6NEhEfefy1IXSeh3w==";
+        version = "8.0.21";
+        hash = "sha512-lwURW6r9omeQXJB4bLWH7ax1x/QrEo0L0A/nG8HZlgwPSK+TPcSHS8XPNm8nsxT2G1rn40o9Od0h3LjB7N5UNw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-uQ3+qVeMUFmcxlS8r40ZNu3YFEz1mVR6rGJNv3JoJhtMU7+dZ7tsG43vUgD4MdfAIpAFHKv9Ybm7dbFK6ZV2ZQ==";
+        version = "8.0.21";
+        hash = "sha512-3vHIO915Y6yjKcux0yG4ivaGeKWaCQjcAhuZ3r+RddtlHyRx9D4GT7vwCYLvFtlGGzGljDHBF1NjaEZ+500Snw==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "8.0.20";
-        hash = "sha512-EuPbJuyEdGCNJS0lvVWzgLGI6U6fsyjc55KhvLJooKE688M8rHAcL+TOE09sG6gKu9u08WleDmh4scBVPSkI6g==";
+        version = "8.0.21";
+        hash = "sha512-Mh4W3poMC73qhGA2vj0QpW4w8oBZ5ToRBL1ibMGIxDhnRFJLDXkGBnaemRP6fNU+grFhubpP/C7erqRD8M15Lg==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "8.0.20";
-        hash = "sha512-SPo9VDDJKEY7cOxfTe3JA0wKSc5a7Mg3gPHTolmd1oh6fRQZ3bapoyZerk2CqxH5C/PZ5U8z345klghdOBNI3Q==";
+        version = "8.0.21";
+        hash = "sha512-L3/tnjm7gVFOTP/5n1fINFFKOH9bqAtBZOEQAD8U9S+BQ090OwXftgKiZLL0rJM6/VpHllksxfwu+f+KjTRfOg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-7IvfZjZ4XJz0bId2SBBr1UcE2+8Lrcx36qJL0ZiGGEYzWF4K9Vkn/IFKOjLlDbKQBVIikDiA8N7WEHZWhWwuVQ==";
+        version = "8.0.21";
+        hash = "sha512-lIVnO/LvjjXG2NvRYGdFxVbUGqfqTAHupEdBalJXRLd/JeLq60ZFLlgTLyn8yetgGWt/VnjiM/yI+DxWDlzynQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "8.0.20";
-        hash = "sha512-Iz8rwdlyzt6u2aeIXBPD8d+QX4jJKboZpA2ubeS7FkXjABusVQFaFMLbDkYhDOaK5+uaPiQIr8ph5ZfIIjSsFg==";
+        version = "8.0.21";
+        hash = "sha512-Ip70xw7W9N3OokPJFW7pV9FK4uRqyXj7SS+lv3ZVuEklRv68yJkfGJz9uXdJ+ZECAHhtw4s/iqbx1Ty1bnGuHA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-ntG1wuh8qyda0UUamps27EwHMf0EpoLG4GqIkbFMOzgwUhCql2rT4PUlrYQPeQ9hdmnQXL2x0kyFhcJMjMTOKQ==";
+        version = "8.0.21";
+        hash = "sha512-WRhHr78NxzTNyvAm2B6bjVd702Kw53t5TagyX8rT4Z8wsjNOjPqWFQT1/lI3Ll7iM60jUBvDGgq3oa3koGIViA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "8.0.20";
-        hash = "sha512-0Mv0kixOTORiDEyqpXpv6MyohFQQGXEDyRp+mzb/XSjtIWxjS/gNpVjuIAf6BgJl7xAldBPGHxG11iLda24zkg==";
+        version = "8.0.21";
+        hash = "sha512-zvYJ94T1J2yUJ37dJE5tTurk4JS5QpuHdfq9xxbbVz/QDsvGLJ0K5OxTsaQ+yJAle/LLfWP8T6v6oIObAy0Y7Q==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-BM9xD2qHUAz6FTZhaHjdYjWL3M+SNDESboKRTbvlmcIeNu863foCVuceDgk7fEPpoMchFp92nujJ06LZ8CWkUA==";
+        version = "8.0.21";
+        hash = "sha512-KKhqzmloJjacTe5Tx296G653jRNMq2rfF6vwHOGY2Jye5GxpAm7MghHLquRAS4V6VPPPWXdGX2z3S7IIR0EoBg==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "8.0.20";
-        hash = "sha512-X/ZolZ8ZKsXAe7qxqWIIbtXFqywUO70jsiScwYJjNsRDjQ4iEsafiGcP4sMWSATxJjZx7O2DUhjXG9k5EGxiWg==";
+        version = "8.0.21";
+        hash = "sha512-9eu6hn8PWTwn2vHzhU/kz3V6GCpLh89QjW/Wh6n0E+Dq7qhLuv8YoSIKZ25pFI5b23+WiFK0XLhF3oFb61D4SA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-eXMwwqnY4cPsuseGoEtuGuxdKPrqDFjy84a4HtbnYTRLnMYDyxd6PZauz3YxKgCvR0tWcousOMoDxSYWljo3Iw==";
+        version = "8.0.21";
+        hash = "sha512-Fq/lDXetp5rif96K+tbHWXD83scAiuAhvOLuSfsJ0KVoc5tGk5wfGTo2pVLLjyOE8BZZlnMUgPKQ3WC/4KDplA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "8.0.20";
-        hash = "sha512-4fyajE6dozHNiFDhPfeokqO+n5imY6il3eqG5Gi1iwdkf5Nk6ORkro5pIwzYZXkrZFFsSqjxTkjOFzVdg9OwfQ==";
+        version = "8.0.21";
+        hash = "sha512-+Iw4rhRUPmrXd1P5XuChvhWYBtuAN+eF3VMukhlddwMBY/bZX02yaM3nWw6ajptiI1mE6kLE19je0rnWnPXqQA==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-h0Fk0cjgl/UTD/JTpAzVwynCduv/f5LUgw2KtnDBDTztHyj2xw/zDMNDve5pF7+izVqfqg2Nm1UvuTuQR5HohQ==";
+        version = "8.0.21";
+        hash = "sha512-xYYzikbH3aOorrGLknEi95+72Wm+rfUtjCbxearizy8f2hADy1IQaqTMdv/CyQX07tRa2Vr1byc/t2BW7dMMAQ==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "8.0.20";
-        hash = "sha512-+xqTx6KQIgc/rj1EoG6xs9mL8h1rV9d7+/3wx/BiNWA9Yz99ua3nc3vBLTj0RvYF3Q7bxs8w3ivHR6WhjqQDYQ==";
+        version = "8.0.21";
+        hash = "sha512-jh08n88+Mwq51iTcv6Fo/hZ1KrplfhStjeaVbnqsqCm/yXNNP1DuOtkpIRqGHu5NFERhiWCeJPDsrXycnT3iZA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "8.0.20";
-        hash = "sha512-vl1JvrYO7I6HtcDsJRRwfXlNnfi0B0YIg9tJ8kkkGpEk51JbPzwKUUf5UgGMYJYBwCx5VLzNB1H5adYUv51D+w==";
+        version = "8.0.21";
+        hash = "sha512-OXNvUh/icQk6aLVwrvkNsX1J4W639y9/eN2kepIcNaSe+qaQoRfZ3F2gSHKlr2b0TACH9cPLQkyanXtiDfWezw==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "8.0.20";
-        hash = "sha512-1cX9cT5qBWUHk/LQLuZ2Fg8ovMCXkGU+KBCgNmmJ90g7rJ07DjJV6MNaeXhvK3Mg7uJpIuN17EBHye3EVRIJmg==";
+        version = "8.0.21";
+        hash = "sha512-MwKTA97WfrP8o7Dlaw/nEpl9NJzC5R8DmXTroO3L4ItwkRkZTU0pLgl+cI+1g5qyfRPQ8Sdsd9FyWkWZNv8agg==";
       })
     ];
   };
@@ -175,566 +175,566 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "8.0.20";
-        hash = "sha512-G6UpxCxt9sW3mtHtsCQhQJNEIgdLzgGo6BcVEUX6RQNgdfCw6YgGVy5KdN4R45Zqo6K/UVEF0C2ZUVPYk8wrRA==";
+        version = "8.0.21";
+        hash = "sha512-jqOX9Zyggx0i+UOca+UAMKDCKF9dDZICJR/IfPAMHwuwolkOSLC0piCsum376yaFdcD15lpAaw4M+5QuXOJ0HQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "8.0.20";
-        hash = "sha512-EJRGxhZBLdGjyTIjOb/fAmDL87ysiFfOc6aMHx5vKPe7kxshjvTVy4Nr/9YXt6poXoeQaDBAw7TWItle6vVu1Q==";
+        version = "8.0.21";
+        hash = "sha512-i54n9r38yCc3XtJSm/X97C4i5bNtCuFPThP4Pz1soYztIenFk1Bp9h8GQC9L7wbl0cKgf1r3CI6vcoV7Tsqwww==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "8.0.20";
-        hash = "sha512-aW2Fh3+p2gQgRd7tPVgY34+GGPXhIEQJnh20w9Z6d6PtUNXGRaKIcngu6W4LB0QPrHtprsRFBpt3p3yocALFHA==";
+        version = "8.0.21";
+        hash = "sha512-SPprl0F7EXUjdUD6ScflmKB+rROmMvLh43rQA0Zv7n/IQ8Yisepejpecv0zkVk0BrsqRHDMldNACBISae20U1g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-T5HlmUcha2Fz6U2/9tKLMPp9muJyxbuGsuWwzMjAKFUIrHXErkJxYV9v2gfoj198BHwB8eb3/b31TppxXLIrbw==";
+        version = "8.0.21";
+        hash = "sha512-50iIWmKNdW+8MdeiqoFZFeFP54Qpovg5FNxfjIsmz7b1SJh2DPPiQwqvVcAhiV2hHAc9ezz4vyI1ozAvJns+Lw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-/LpPKsVBnxlwlRkkBN6IIDGPMaHqf7opxBNMkjEoU2Z436X9dbmrD8psSx+phiCFvoqaw3X9dn/TqskfFVJokA==";
+        version = "8.0.21";
+        hash = "sha512-4MHkWTS4hIecvhCJinvuA+OQZ/2gtURMBWU4RtGThiJcZEE8hSia8+y5J07pGiQsvs4gpyFq4XqkYut/uYtchw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-IaPyKzOi6vA9r1OHjgAdqUO0Hf19LKqxhAYJSEFk193uSTsttorcPT8AD/eqRb04rI1T9NiL6RAAvcO6s2wTVA==";
+        version = "8.0.21";
+        hash = "sha512-D6eQCi8Y5ghEoVd5W9cGdXuoHY5HEdXzxzAB1Osthxcfb+fSUNfia482xull2gdM4IIIF8kG6HsopMxLT6ExTg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-7G/+fiuxYl5kS1g/2faF+V+LDW8+0+Wsyf86Io6Wz4YHeJesFocA5hTy2dzBHZ2RXSrLA30xn8kQPnCx0iVyCA==";
+        version = "8.0.21";
+        hash = "sha512-oQM3hrE2Ob1ovCPGe1CRlBpFb9owhwYjui+mmOrVqJraj6aZRANVNhtRUAmqOgMZSMNGNpIAeOnQmi7f7nbiWg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm";
-        version = "8.0.20";
-        hash = "sha512-nBRFxKOGlEX7M/XAjbftd/L3OjQd3kLe68NO5a5y8eL34/o08zeWAz5w6ooLsr/Xb0+33g1Fxx1pwN+kWUjRjQ==";
+        version = "8.0.21";
+        hash = "sha512-/a9sB9s9DdK5FEktAfR9bg2E+Jsfv6pXm1tiLBx4NuuCcDY6LI8l+YXtdnHelE/AeQCY4/+yifSzVmPGmnd2iw==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "8.0.20";
-        hash = "sha512-lR4xMDs5E5SUB260+61wzYqLM4Fw8WVLOhhpnzDQ6sfCGcnIpAdyywwS6hWn4bTkDbLCUWZOMddahUlz1w3rxw==";
+        version = "8.0.21";
+        hash = "sha512-nP1x+umjfH6N/7JjHcnh54aa9kPu5dt8oeipjEml6lqH3dRPpyLtXdc7eeekGTMDX5QezQ/jhsQXTuecEtT2GA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "8.0.20";
-        hash = "sha512-g2d/PUPe8FvPmQiFLasrQFJEqihsxBw/iI2C0gqg7bVWTliEKll9fTkO590MHTs2IX7HooGc6OlDPdPgqrP18g==";
+        version = "8.0.21";
+        hash = "sha512-7q3rFhymaqofMRyBfsHl86W87YwsL3blst076CwXpwBm122673aWVxaI9JsPaUMR+6Cqju5UXYowq9NVcByGdg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "8.0.20";
-        hash = "sha512-NiB7rBLXcA0gUjjm5Ayl4xSS/28FWrF69wRPxvX4vfZIaM7GKPoqkPdpGAQRdO5AQsnESDPoXm8gKZywupPRzg==";
+        version = "8.0.21";
+        hash = "sha512-FmFVwR3zvNUJZSaCpvDTK3P8eK26T0/wpuApalPyX10PnBOruptBrtOAz9YHdmaqC/Hv/dOhksIQPkixH4zybw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-MtY9IP4p+bPOA5UY2Ora6XUsmOZFZe/NQYycXp+msZmC7V+XIaJ1JxCvb/wZYPSzdj3o7d7wHrp18fOKI5Y8Kg==";
+        version = "8.0.21";
+        hash = "sha512-emEawWXpjWHfW14ZcIz2OGddug9lvdpUJJ3WmGh4TsvoDBj/LqgsPUb1UpwONnnY5YTec57Cz/t2RUUt8ZVNTA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-SRhF9VzpT8nLEfSixN9B89gi84Cg5CL98v9ZJTR9oQmfzbE219UaXsWxzRdB3kInT6fkP7c+940tpDudrU6htw==";
+        version = "8.0.21";
+        hash = "sha512-aP10MuOfgC3itaiF+ITqUihJhkYqoxqZltHfOBivSRlHr1Hwp5ZvmpwelQuGi4uE6/YplYp1U6KnanJV3fSdLg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-EzCsF0E13D4k3akvyCnOSLXeyKeS4vmsBN8p0h5T2BlDf1jsNnBTdrvO7lBoXpo1W20wzgic33533E7l0pdeWA==";
+        version = "8.0.21";
+        hash = "sha512-vHNMmGk4Pp0vCVTGsmZTmtNsK28rO+LvY6KAMgqgKoFQ7gVsEAi67dvxAuyPgSDio5fJImnSqfJfXSCKCuF5xQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-Gub22p6ELMUhID2PkyDJ+31LJqIij58Mauwn8//pmW0RlviI/0fHt0MUoW7F8XpYGsMc7DFDPmczVKBAWWrnQg==";
+        version = "8.0.21";
+        hash = "sha512-e7QK61BOpJKRpLUQaJ0VG5H/su1iKiiqZhH99KOL8e364L2KytAQXmWnzPP+OcvO5tCgPHx2y+OJAqZ05/vzyQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-arm64";
-        version = "8.0.20";
-        hash = "sha512-NeMgGpDGbFYQyQyDufBkTZguc1N+6uM38qalGsmsc4kXqYY/oa9fjy4YCRNL4NB+3hAtO2W7qP9IALGUPih6bw==";
+        version = "8.0.21";
+        hash = "sha512-AcCrxXcOtA+XpsPqTOFonjDy+ZQU5xgKeWvj5WRhvmIWnWK7CITRnZm6jbWardjgUjz3MD3mIWGyJRATqzjpAg==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "8.0.20";
-        hash = "sha512-pK1xMLndZf0nTfM8qYoJ+WmOKvSrpvV4qqeiNBgw+/d+mzboCU85J4vLtEzGuYXWIJTKDJuxM7GqJU+scAreTA==";
+        version = "8.0.21";
+        hash = "sha512-QCdXPdmM2syzSW0k/6RrdN2sHgtugQQh0LRTNV81FIkGZG6ycEB7oloqN0+QeLZ0tz62Cxy7Wgj9/Mp6Dm7SaA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "8.0.20";
-        hash = "sha512-FmeBNXl+vmZ0wI18YOFhB2w8koEWmV47RQKwUZdPnx8lf8tG1aSrRAt4i3wIiSJ+fqcZ4Umbp25s9bpKhp3Kog==";
+        version = "8.0.21";
+        hash = "sha512-ADPTh/6mwvdezX5OJJDRO5q7Lq5YXFtGKxYlaC7WHspN4LuU0Y8F378G/M/G8Qo7GrPoi98GPELq8Rj45eygmA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "8.0.20";
-        hash = "sha512-y1bMcE2NE63Ro7RzoCSkjrQW2TDwKbwZHqrYRjSYhO8E0uq4uYeGSuEjE9o2Ooq049xNdYsdTfSF2ipqFmb50A==";
+        version = "8.0.21";
+        hash = "sha512-CMfwzQ9rZXwpSnGqB2igJBGv6USJSMImwQx4UFoEQvBkGjQ4G6uG2szVuiEGLLnZ8iPmUuBCxytGGkAPC/A+4Q==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-RCpG2N7+A0/ljYpcIW1qWG2YAFU7Mqs6uBRsb51ZCKfYeqnnrsx4rLSjzwha9nc2C/GATLGXdKTMumpub9YRxg==";
+        version = "8.0.21";
+        hash = "sha512-UlBBcWyhC02hXeLv9aDeHe9RxSk1yJFuKSxqiQSMs5R4zjDLZfkuy4I+e50r7nsAY91am4A7FWf/Vkvze2Qslw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-GNQt2cD/FnvbX9rQa5JbIQxeP10+PtZYxaN9AuhI33RXphH2xM9SAL9sOumSvbxjRwNJs2eVjFAnKMQ7A0Jylg==";
+        version = "8.0.21";
+        hash = "sha512-qzvhPznwQENQCyQlDp4O0kldzC5uXX96gxq3cyxLwbo1PiHwo7+vrnpcXkzO/vXuHa1pVuSsBxeMWaOZUbgklA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-VF3LetcpHjzxjsght5M54+RThSbMX3PWpYlUfa8EJiOWRDxxXJzN9GN2736huINuMaVjnwRipfVTc0RAGgiFsw==";
+        version = "8.0.21";
+        hash = "sha512-lGDv0t414T1zC1Il5yEy8WVRGxU/km7Sqg29bfSYHW1ZlgmpI8NUPupaGBVy2rO/zFJ6cm4/QxfncRJXSLXFuA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-7jvFAaLaQzsHOWJ1uhDtiptUFYifuBGHRm1mb4qWvyM8fOlDe0hkVtkV/32IKDECsqU1XkVr7uRpkbQcA9N7yQ==";
+        version = "8.0.21";
+        hash = "sha512-wY6FK/Tu2Vnj+mr869reUwey08evEVXF1scJgUmBKtWz47/Atk5QGzr+uqrPVzrD6R3UbedNYoHHMPi9bIHyew==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-x64";
-        version = "8.0.20";
-        hash = "sha512-3lxzEUUNkq03eCVfnw0y6T6VPjI0nVp7kGBa29yvYj4gtwqt4fupOj7dFNzjcsHiokoAPvMKoQX8uB64oxt94w==";
+        version = "8.0.21";
+        hash = "sha512-QMgaIfpuAaMSdaY0OO3+S6nEQbntWkeV9Ql408JRWXYLM0f0Utl4ZHfV3xPOllf7ZpW8ha8jZRyyJB/AH3el8g==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "8.0.20";
-        hash = "sha512-iH6z6a8C5GbCTskOlkBdBiRUzO77AbUOdBeqy71E5Z/nbyii90MkG5vaHCFzGg9Xd9y7AAI2vQWJ/tYeU5GHpg==";
+        version = "8.0.21";
+        hash = "sha512-KREhQ36LS8yxeuzY67nA79mmAEAj1pyVLeC2Nk8eDhsNslG8+AB0uk5sESPPjJs8Wqpodh8WcrN1cw/SbKKKbg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "8.0.20";
-        hash = "sha512-UJeSYV9ksc6iEFAWu280wxIX2RG26u4y33cjO6IVLDtatcQC71kSRCjKOjEp+34WFsHaAPJnv0tNiiIM1ntx0w==";
+        version = "8.0.21";
+        hash = "sha512-u55E0jcZgDMRmWlaFSUH6eCc9wNOiZjmM4lhVBZUaxyE5U9cAah7qLDnvm2urr0aPgCQgK8vaoXYqCqUHPAQVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "8.0.20";
-        hash = "sha512-/YRAHE/55Hdt5BCh0K7//AfyLnVsWQv6E5WqqCrILeXuFu6GIg/Xe827xPLF1SzeyZsT8CwvRLx+JoaK34ZE/g==";
+        version = "8.0.21";
+        hash = "sha512-pv+XQeaGJbac+pR/0ghI7yFcGoMVAwJKTD1HP+R5883gNAsIknGiyxqxXh7zR3l8v4XBYtGKw6vp8AY5ndZZ0g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-r9MHRknh3Dug0E7QMdCy/HsCgiNir3V4si2E3/ya3ewJqtM9zCosCyTXRk60Hy9y+7GKk8IL0UPyxVsaVy7v/w==";
+        version = "8.0.21";
+        hash = "sha512-9U1qOXMrzB+R8salrR88WndcFpqokrg59Cg5RJ+zhC8jdhMyS9HNG8pZQ0MvPbjP2YRkhH85wOaI8TyB+lXDdQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-zmrrxrQCnBNh4d8jdHAtPYvpaZGB2cspy54sIk1vFQ3sAvtyPSfs5h04lTBactetSWBaBY3Qjzf/hFUno8EU3w==";
+        version = "8.0.21";
+        hash = "sha512-XiRNdQ3vc8Z1VYUBp5pV2RT0KfR1f1dgSxjfTNf+R7VhWBjS5NTy9i8lcT7KEhFXV812l5WZuhSyhzIzMwFGXg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-0rCiA+fx9zQX9+LvmvjKbdKqpAqYrvZRBE/bXM8qLGpBcLyIK63IKBUCaG4CXH9biy1NLG7fSp2CfaI21d6r9g==";
+        version = "8.0.21";
+        hash = "sha512-zAXGV4WisaMmoXxiFz1DzJ5lfIq6y9FN39pG/MX3vY2RW9Uoq8qwEOf9s0xeDbvMXv4WKRwYX4dFYCfINYE0bw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-kmsMtjMZD0mp0kQqZIWMRAXKDSDwyBdNADDSyc0kjT2A/QXy90m9+fS4g18Fc8XUT/LDaJDCH/hAEnN4/z77Zg==";
+        version = "8.0.21";
+        hash = "sha512-AFb14uH8CVruWu8grwr8vVIJiSQU9uHYfJNrFulAXdhBOqTETvjQ4Xjtv/e9ItDp4iW+uXjWhnYrxxrya/0C7w==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.20";
-        hash = "sha512-rm8nD/z9X7KYcYBV4z8mt5QGIWQjkh6YJygK2+Vj3kCy/s1KCNXVoHMgnZ8XrX20t2vC03gpPPK+s1MI0Kwgng==";
+        version = "8.0.21";
+        hash = "sha512-MbFNR6brjUMvFEBas+RCL1UKAjqZBZI9LyH74aRj084mX7AsfP2BOCQm7ZXjX+X0DaKTu0F6mNG/2MxYHcOvig==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "8.0.20";
-        hash = "sha512-dOhLVfBO916TVgUqNwcaw7zTqs67iFRoJRl3jUweVFU6tgKpsiD8kMu3mkJ3wZ4VPFrJVKQ8+CCZ8jyZ8r4zfQ==";
+        version = "8.0.21";
+        hash = "sha512-QYfhB1YdIGvT1Nl095EqD/locaE8b/pior4CYT3lrPhMGvWuEKYPPdMFy4u4OOg6BhOScsWPdqFFEDxD9W1Q8A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "8.0.20";
-        hash = "sha512-ealoK3QVdtxWrKol2M3EvRN5PiUNN5PbhSVM3QE4mqxTknorsJwTvMm0YxqP7ii409KlttWLGLXzm2oqsVnkXQ==";
+        version = "8.0.21";
+        hash = "sha512-k667dPCRgvN1MEM37lkrrh97Y66LOW/JA3C8TkVnjctmK3WTHteZJk/x0mq7hH9ProeHfN7hwQXVCkocmgkJgQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-WEaxn8dvmeGfUjdkmWLVMibh7VRCFn6YPARsFPaKY6hhp9q5Y4qfc7s632igIsfm2H1NFKGaWfqAccD1aVQZGg==";
+        version = "8.0.21";
+        hash = "sha512-1TDAcZjWec0cM50aeYBubaOm8UJ6+0fyPGqPcz1CCCgjz3zJE9I9XKtBz0LCm2oHrAjLNC0x2qZFhFWteK/Emg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-hOcmXXo82VDqnbX+RaBFTXqglvYGxTwx7iM+JmYgcxnlhb1EV5NIWeNoLcEudBCijRgTRufJFAQES3U6s12LNQ==";
+        version = "8.0.21";
+        hash = "sha512-+EfASoBXc1v7W+zJVuswjuCa0zJlqxjMPCfkpNSCyJ2fZbAAM+0vhTg4T0HlacRHPyH51qjeMmeBANbrhqNvPQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-SpmPD+pPVdq/adTKdsnIQIVyOlN+lUOj0ao89HKn93z3GPNr0wPkUPAOKScGJ+a5OztwBCxIBQrXYstIi4w18w==";
+        version = "8.0.21";
+        hash = "sha512-6Y9ycNMabHRzTOcDNv7c9/eYP7WgRFuCvvS95brE5xAwRaUnbQ1k3u9lnHEb7OJ8+m/10MWNEPI+QECerL/x0w==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-KNrsKUKMljQJion4qdaFPBiFi+YbJsLMJ5vs44yawMhBOo9NObr7aw0mpYvJG6uhVgerM4xqTKaCPMF5Xc+Y7w==";
+        version = "8.0.21";
+        hash = "sha512-JYxEkLMnAkTunEb1qcG8W5XK/tf5jN5wsKZTqwQicoeU3OQ6doMne6ywrFSFFlLjSuEl8MQQZ6mVzmppzBaWRw==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "8.0.20";
-        hash = "sha512-JJYQ7liq6SOwcx6Tk0qi09EimH/SS4+qskF/qvzFC9wuJzAzL+rPkfBPZNRA/l7CRaBJ2SYF3Iy/jIGWHHb2+w==";
+        version = "8.0.21";
+        hash = "sha512-q4DUdU6sjaZhO84ejcU21w8O+dv4hNyqiKUeEldZ9D/u4Rxm6CEW25omYHfYz8XCFNqpp0a3fkla4bWCHWuQXg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "8.0.20";
-        hash = "sha512-UfD6B3qxSQWT1vcKxPi5V6FwmxKTgOFQxncFyIvJTr+9s7HrSJXieOLicqoO3yqdt/Kzzk7p6wjV0A7neBp35w==";
+        version = "8.0.21";
+        hash = "sha512-Tlve5t81ruUovhh7/FS8sWtF/OvNtWfggg8IjIvgnwTr6trNf2VTM3dsT0rtZ5IjAhQUhOBT6ajZGnp6YdjVbw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "8.0.20";
-        hash = "sha512-osKzTHfYnmPn3KWbni+S6g3hpoAsI8K1cwgt9q2w+yKX1M7aZbRVD3jlDgGDRqMP4qEB0IiwL9LL2oxKGMpocQ==";
+        version = "8.0.21";
+        hash = "sha512-OlK1cQC4y2o01wRxvErpL4SOne+TkVQBKUNPANzPjRlwzf2SMjlJ/o2k63kvH86t5InqC9iU6acsHiKUTKkoOg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-tl8FRifWfQTJCGijYeHICJm8MVpmlrRdRZSjb3ngn11aUrPT3kUgez5ACfONPuRiGytSqvFdZETs8IQ5QC+WGg==";
+        version = "8.0.21";
+        hash = "sha512-ajadIF0no53b6fSakfgw84GrdDYYYyvcStsjlDJKSYKu/EvxsWDWFpJ433D4/ZdYHlaLKtL3Jz1xeXzoFvXa8g==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-TTYIos9sWCsMlqZ1d+zuSC8KrGQ5qiDlaX20Z+/PKKDc4IEcEZoHHAHw6HRbOaCN2+Q22h/rPZQZNAZsafwcQg==";
+        version = "8.0.21";
+        hash = "sha512-9xn3u4mOTzJEeWwmmAd8ESO/+RqS+6sScmoiin18l71hpbV3Rbd4Gxw8KE1TUN3ktw/x1yR/rqe8b+cKp/kk5A==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-1350+8oe4EDEOPOrIq+MjFZ8KiOHmCE9gbLbFq7ELGjbrL1Q6WGO3zehotUUkGm0LkyYV574h624xFa4NHSilQ==";
+        version = "8.0.21";
+        hash = "sha512-xdsmVry7Cl+d55Of4YAkPJ01zRD/E1DTNNHPTMViY2dPo9ljZUAycO5Lzx4lZ4fTTd8xAYTXoOiuEiPSACS2Mg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-wVeihvD869ze+VzQTYgrYVUDGvP/3MHrU7oTnGCFU+9EHIjrsgC0kzV/Br0ix7lQBbhkvQMUlO1PJ4Ti1NN5EA==";
+        version = "8.0.21";
+        hash = "sha512-TAiEEsZzznQrgueWciaRL15kqnpu75mSjG2OxVyylWcJEtuHaKmgkdbRRJfqr9LsiEbU6Xnz4bfoKwZnZRYJVQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.linux-musl-x64";
-        version = "8.0.20";
-        hash = "sha512-2Yp4gHZDcFjP3/Tneo4kNR8xdU1wnVKnlRqyrfoNY/7aGdqC0gT3bHfCQn2Yx2dqcPw9OiWTlQupG+lSOzshMQ==";
+        version = "8.0.21";
+        hash = "sha512-O3b0F3/hyfXaWmxaN3VGPcSz6mR9RTTi6av62xNpQmK5+Ocv6d+Byj4cM7de6KKS0Zpp2Q9s5MOEX9hJNtnaEQ==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "8.0.20";
-        hash = "sha512-84ttmC61etKqolo6LQNDUutTAPFegR/OfhjjsVRd9Eb4nOSfsj1B+5DrtAZOySdDr4ajEXDDGQZxfwRppD2ReQ==";
+        version = "8.0.21";
+        hash = "sha512-xr6ey6MitYjPk1xl2+5ZraHGcaAzROh1EN7tVsrTijl2cR9JXlmX1tmOcz0QNWzBN+0O8tkmQU59mjwLjNNgYA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "8.0.20";
-        hash = "sha512-UtAxgEjg4ouof5y4cRcTWVnx13chf5GjUx8tLnPoVvVy4nCQ1vAXz8p7xpX7ynIcOv0+xeE6gB2lqAUrBt6BRA==";
+        version = "8.0.21";
+        hash = "sha512-DKM1H8a+WY+f513DrttnERzE854tUQEIXXLsQ6oLsFAZioKkkwZXq/IffIrRNLaF45/YHBInlxk9+onUhvC7LA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "8.0.20";
-        hash = "sha512-qQhPKP9gvxC5amms/hUOZstl3G15nSysUNusJyQFez4mssEMByaggQFcNSJQ7qVdUbHBe8pr7oXq+gqLeRh3mQ==";
+        version = "8.0.21";
+        hash = "sha512-eRbEBR44c/r59E/M/N5GfUBeE/+2GdtU1sr8rKBKhRLxkNIBASt9BD1zwCGc/JrryQhPtPM2CIsn66zfCCbBKw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-BqGeZS7zLL21E3m9/kFnQJiMa/RDzH5IDxZ6Ie6GqGIWF/2JCrpFQ0Tojdztsd2HOyB0et4f4zmk5NwwJixRmA==";
+        version = "8.0.21";
+        hash = "sha512-p4gs/KkZivZyWK3ik3OYlYVh7jaAMvhMRqRbrHRZuW4RVmm8IdIw+HXpa8GFys36aoFuW+PQIt33p54hfC+Fpg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-9eAKWh0ctsXZIPyIFj98xnLmdvzGykKnKGnq/wCXDpSl31H32ZPk8ykHvdTsoWet2dgpXDk4QEmkDCQ7k3Jtvw==";
+        version = "8.0.21";
+        hash = "sha512-xhwn5InZvPG75p6lWHU7u5Bt2VEAq81XpIsNn51WOfhojLFE5oTCz8hz+S0bcyW3LEHugfWZc2hMYi3VCNlIrw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-ZhhScmWp7O3PQmDF4/P9yrJcbmxRRG5xWyun4/tgQ0tRiB5yWHi4GsEC1qYWDBeZgCWh3R/RQZpfrQw7XDEqzg==";
+        version = "8.0.21";
+        hash = "sha512-fxgN/ePkeIF++8OIkufP/AoWsfLtOUB4E0P9BhHxKVtqBiZWerPPGRzbUheUDq/Kq2MKHsiJd3QNNwzoZLxLnw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-zVpBal6XL6NzaWjLMILvv+xmd+dVgGzJxUkAUANFNzaA2tzaAhUdM+o/c/diSRXn90twNRTqZVjxN2gmHpOorA==";
+        version = "8.0.21";
+        hash = "sha512-B45J6gG24MoBjgU6PVNQ8ldXVvcJmzn9GLfvnNHhkfhpKQ3VXUTrm5KuX2Z5LQHstxuwPPlsmPqKDp2DBEakeA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-arm64";
-        version = "8.0.20";
-        hash = "sha512-nzloh0qieQdMYcVvdyDGh5mhIY8iX23btA4fml7QkN5mP44bfBhhKEn/x7XUUmOyiWU803ilQrXKq2w1KldH8Q==";
+        version = "8.0.21";
+        hash = "sha512-xgwd/3vSDlibBpY5XvDIjefOg6nEiH6o/24oRzZF7yk0FRq1yOBs9gxygkRp+c3/bYy5A2zQYnqYUMenPJ0t9w==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "8.0.20";
-        hash = "sha512-9FXDRSRDPn7Rv0kBhZcK8vHcXdPsWATa/qmRUYHAz1NOjJmwyvP0mUE4n5RyxCzBXftCC0MxefYthO2hyaHXyw==";
+        version = "8.0.21";
+        hash = "sha512-37s5nLcLfigZtsSMhoQXs7ILZw3lkXy07C93DOKGI1Z2OKdroPNWeBt1BpwAx3BoLrUsmJnXgS73grfJM29D+Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "8.0.20";
-        hash = "sha512-xyfTViQUODt2a2Ddv+/43rAx6OznKrdztETIKWojJSKtZ99h7xjRsnTl3wfGNF4rsO+zwwsjzQvimB2qhacBtw==";
+        version = "8.0.21";
+        hash = "sha512-pqPuNmbFAXnF0nJL6imGmQQo/V0orIDe713lVbYEH1y4DfGL8ichPM1abCvY4WFb7gwaGHvqCsZkl/WAUde+kQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "8.0.20";
-        hash = "sha512-2Yh4LcGEhJdGywCpcnzSBjR+JdBRfNq40UUawMyEZVCW4agwE9F0oLte1tETd0xBAKgpkLaSKApIyOu0E+zhJQ==";
+        version = "8.0.21";
+        hash = "sha512-xRiJayebcwD8lge6jK7mc3FB3F3XGUi3x97DAOIIPwWug3bmFA+bjq0o2+iGuI6cddeTIeV1wYeh7ONtdddfDg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-WuPzqbeh1mS2QY5urYXIg9rec0pwt6soof/ikSX4B3nN6oE5bG65AwtQH1SLqcIHbFXH5qIWMRHEyorKeXRd6A==";
+        version = "8.0.21";
+        hash = "sha512-AvAKwP2a8yCZ00aOMgrudrNHF1csUnmOSqC4zVulg2GFAEYYqkyORbbPTpOdNqwHGVEoC7qPnVqtYVuzG0mIUg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-PNwoTDK3fAoa16XlhCkfGxAw4Lh54aMxLN+oADsGtbTuDewjlmClsg29xXXfkXaPVt6wT6dJ4nS5S4QEx5nAqg==";
+        version = "8.0.21";
+        hash = "sha512-cwMLV5UbNKp2M9Ad75GFFmFT/HgUcNo3nUepMAkN33Bz9U/blqFgMcy6qJ47ySJKVyZ61avxyAGOWWQVlISTqQ==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-43bjE2OWN9+3d8vAlUltpr3Lf+TS1xNiFBXZCw8PDAJIr80PhWyyKmAUj8LSmFkKRxNED5mlcF/oH7bID2Dtfg==";
+        version = "8.0.21";
+        hash = "sha512-SkRaFeVA73rH788FwpLxR3MHX8LQ1ZRnax4wGtr8FVtY2p6/8P3vGk5aOekwI2ywwefrKVz7zNKXocSCB/7N0Q==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-JefSxGVUpddeKa+vtOiuPkVwUWsVN9IEcbIwz2kLnj/UNm1dWb4Dw8+bvGmrHOieKy1crNb+hUCNhaG1tlEpkQ==";
+        version = "8.0.21";
+        hash = "sha512-zOU3NwZcpmz5Rilm9sp3RisEQrpat8V6ljtJq9t/6uwlkSciqtcHkXQ0W1Fh7+YbQmi0iPPbsA6sYN0tio6GPg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.osx-x64";
-        version = "8.0.20";
-        hash = "sha512-rIlOBxUbcuPPgUWA0rK3s4XeTRg1a53JE7cPdtFjBLlM0z+dmeBdzm3WIjpOGu/UKmMst5x5ryoujHLC3dX4xg==";
+        version = "8.0.21";
+        hash = "sha512-zlyWDssdENXNvkLian87o6fzuzn9j5G1hWdc44HBRUREC3ydAZgKy/EevRh6Bd312VUdNkfRjB0heECYqcVNUA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "8.0.20";
-        hash = "sha512-AP9EHyB7ss5643rWAKE7FaRt/SVHPTUEhrKRISd5/HI3xnr9gnsjEUykX3fjVPp6ax8ICPb4T9IHf6/alLJXMg==";
+        version = "8.0.21";
+        hash = "sha512-WaYQOOV9G1DYUYrLI+DqQAu2DSr3EeD8rC3yH5yykmfZ8EhiYT4LXWjCRQl/quBKEKgHqQ0KxY21Gzac6EbOYA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "8.0.20";
-        hash = "sha512-YWtThzSyr27k7r9H/7Y8tYwYmrXgfaBq97UWLh8JDBfq+ghlP3KINgyLaTTAW3OIH5zU+ezy1MIhwqM8xZrPKw==";
+        version = "8.0.21";
+        hash = "sha512-aZf/AtZlfgr4nKm4v0aKlv6acDCo3EYKNYyRLeWdZXKRhfVuK+lDjp7rQSljFmdRyZLM4DdJG/YfMu63ya3eUQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "8.0.20";
-        hash = "sha512-AfmWcWzB58IUuNWMpeAd+otKj0OALXxdZDwLnPhCySVk5/9EmT2WxceiQsXThfs1DxVW1R4o34Pu7HFQF7i0aA==";
+        version = "8.0.21";
+        hash = "sha512-fVMu8WYT2ST0TaHuUtovoyrrLCT8B1WGxeUEJhPxeTE2yyFVL/0TTQ0zMV77lekRASl3yfBSex2jLm3qNNobvw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-ew6SqixVxQdEjZCCqpdNQpl7L3/L8bJeaJoiIGidjDRel1yy9xIT6tWytPdJNFe/OJ2TEQmhqUfbHyXt5sa5nA==";
+        version = "8.0.21";
+        hash = "sha512-iPmjDeyWH+VnS3J9P6e+j9EpKZGmb5HLKPLyz+MgCpiajgf29UEJBWpzxB2hwAMyYn5NksYsDFeOecg5NM1STg==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-S0y77RmklFuJxOqzT6FTFFXSH7BxHzFtFVY/EbdJkEG5XBuj/EgPUJgjSgObZyRKKxxEkA98x5wzddWzXRcO5Q==";
+        version = "8.0.21";
+        hash = "sha512-Nydz8ewNZn1IoHrKMXVN/SpDKSKxDeqeYF1rCwzdNaX0aKGjJ4w/mQChxcXCTALGcEQ977+NluxCnH1cl33ZQw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-OT5q4JyXX7Nr/cy5jMdhAVt8NjgJ8/73Z/3qvWjz3PxoGgo1Q11gbS/h6COascUcY3URJOgwObkZ7eu2vseM0Q==";
+        version = "8.0.21";
+        hash = "sha512-ZFi4KULMjcxL8U5Swdn/KQSkrqWJAcv5oRXJefth41DbeJtI95xnJg99AXn1FNYLD5fdN6V3DpwJ3kWiVC5trw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-Yvidrsu5zVlxXAO/H/ybtAiipZHLZZSWeKZGfg6YWNsg7KuGw9hSQMe18PfuhWaYxzvxCxf0cA0jkA4ZOOVm9A==";
+        version = "8.0.21";
+        hash = "sha512-B5ahysmcyx8c8Hx2MaUlHLG9O9yc68r6IV0NGBHeuYoLjnZNcBMjAB32eX7hrsT3vZwJuCQV84Ah0D9pFJvRoA==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "8.0.20";
-        hash = "sha512-ZutvBMofw1MJ+9OG+kRmySbLG60y3VdFcCuqmEspF66qquHSqyXznz7Ex4grpvw4qyp8pZx/v8M890JTQZTyug==";
+        version = "8.0.21";
+        hash = "sha512-nTiRRAt5Aq/gYoVZ1rB06ELfJdBSzWkTgxfzpFdRoV6y45B4G3uGfv/PNbY85RVpUrubQSJ/b6o4dhQMsuJhEQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "8.0.20";
-        hash = "sha512-PQidh2wSE073ZaKjf85LWQ75w9kuLMroHyJ7NWXUlIptHC+asUbHDUwUYHSilOYeTlNMxVeKcZ6qJ1zG7ubCJg==";
+        version = "8.0.21";
+        hash = "sha512-NU44IQfTUAxJPwuZnB/G/Lzy4dx6nRwzMdw/Z4+qeDrpwBILfm+J+UH5XlU2yMEfBqj/8G6TFfia+sjyBIC8ew==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "8.0.20";
-        hash = "sha512-FJGlsipj+/8ywOfkYnzimVWx3qSTiF6nsgKT/ysdeypBTC4YqRjc/alJksMRjOGLvJ/IWGfmbhVH5UTFZki8bQ==";
+        version = "8.0.21";
+        hash = "sha512-TdynS3rFM9NS+9VPEsOvNxrAJkz66bX/GmOhMhr7Dlc1vQRwfsrac4jXEvNKa6P+yAcuphGuCjKMCHrMyKbcJw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-nRJqYuX9OC7/S/SD9tSqYdjVJBLDpzOuzJN3r0s0eYn2xZYfzGqZqR1yHus1FQKnDECJMUlQXQ0S3PcXcel1Xg==";
+        version = "8.0.21";
+        hash = "sha512-53iaTSx0gKFfNdQwbvxkTNgkZaDgwoySnDNNsIQxd7rdsCE/wjxNYBNBpxWauDyMiWhVLrULq8vOgUAUoYE7jA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-qnSGS/vF3E8/gOxdhm8K0faqm3ldaKPFeksLzQRTZFi4o7Bi4AHwUaa7DK4JmRQZdATqJxXhau/JvvT02Gckzw==";
+        version = "8.0.21";
+        hash = "sha512-tuhQt6o+qTrvD2h7HeaL5qfL9vhEOmGGuYrokXLC+YqJAQEJLBmXf8I7BU8lUHUMNWsQuKIgS5OVGuI/fsX9Hw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-8LrbEM9eLe18sAIWyWi7M3AAmjh05lZ7XkX6MXFzYm6zVJJ39E346zCGaTxbQ2NmoYv6OYN2Vxhz2Fpqh7wEVg==";
+        version = "8.0.21";
+        hash = "sha512-IdksTz02dZyEAkzjiJdnR3sJFLdo0BI+nZju0yRB1xZoJrmsJaH6ioKpS59bOSZages/Tsbu/E0KauMakdodWw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-TvXVK/2GINdFnI7XtkPRmLc4E7dBjUo4rZjsLb4CNzGz3D537cONTDDuWxjkAxoCacAbBi8MKLviPAewTo12Qw==";
+        version = "8.0.21";
+        hash = "sha512-C9zXOY66ASbVQOt4Fk2aK1Bo0a1GVNe8m2WP/aD36YAyWtNQuKf7ZZXxKK1G+9no2gbEIuuyfAKLvC2/YU3IWg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x64";
-        version = "8.0.20";
-        hash = "sha512-Z5s4bwM8OTiF9JU9wGu7j+3AO/xmt/UqvKR1zhw7KyeuzxFdvGRFhg7Jd0AfuzSrlFlu+M1br4mEe4Y3OAa7WQ==";
+        version = "8.0.21";
+        hash = "sha512-e/fOvEWkpAHmkvMHWzFNXO1Y92Pa2VsDbINPKNwuxg2PnM3vig1m7GRSeoMP6IZcJ7ROBAcSgrF33G8Sueh9hA==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "8.0.20";
-        hash = "sha512-iFfqMX5CyeyO0ZAkN7fwQ0TrOosiPl7g4CzNIswHurqho42akKt3n4z7NJ4oJXSuE7S0+QqSuT2uEXCBAdGs1g==";
+        version = "8.0.21";
+        hash = "sha512-BMkP2ksUWsXVMG2jPD6y6xBqJ+sZz/VScvpbarq9M+vgM8k0/ixuHADtJeI77NUiJnyubPlwi1RSOW0zPgK4Aw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "8.0.20";
-        hash = "sha512-thAg1upqdp0FI0TdG0XeHbvzTvKfTB/bqr/U8eDN6C/hQlqzyTinvv7A9KDzUn+RsUIMr4WSHKsyO+VpjNntfg==";
+        version = "8.0.21";
+        hash = "sha512-7R7KhOzVY47vFExDUuKd/KeuNzE/DslGw8yimHSqfwZ7WWK3qWzKMY2or2j3Wb2TwawzE/EWjnHo/v0oH2TGyg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "8.0.20";
-        hash = "sha512-9u88OqkWZze46aWsltLwCd8kZ9H90wjk1Npq2rNzvS2ZX+PzG6+c7PeRH+19esBREB9ii4E/Y6PnD7CqmLmxGw==";
+        version = "8.0.21";
+        hash = "sha512-KhM0tkbgvN5nRw4smtbAjt0tmBAS54MwfC34h6mUJOalqYGZkQBiSqSr+W6GS5yDXsCJII90GaELIxrAjqdrHQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "8.0.20";
-        hash = "sha512-mdH+zdMoAcKWJHr/DRktxkDHEjhcqawma/+vd13IQsb/L7Ogt11c4ko3dQK+r1FnP3J3L0AX/NfpdzkFl/1kcA==";
+        version = "8.0.21";
+        hash = "sha512-9UlhDkmNcBdX6+nhcERW/pY5jlgsM5pBef7MG+bsVadQSBThhCc5K6tLSIu9dgA9+rqYyaEsUvUyipmFptXLpg==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHost";
-        version = "8.0.20";
-        hash = "sha512-Ajwwi5j8c370lpsBBFkOMD6G7RXwCgIRquEuUoYSfskfL6TNu8P84KWx9DAdEZyDR0djHOAYPRI0a4681weGYA==";
+        version = "8.0.21";
+        hash = "sha512-dCsnjflmNTbNpSD0xs140+24j2cfSrhSADNfGTyVZ/dJyDXa8zx6ZEpXuKrKMLADtPZHGPkfPZrg/9t9M7bOsA==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostPolicy";
-        version = "8.0.20";
-        hash = "sha512-bScjeRSsoRSxW+MCnggiYaa3FNM8En4pnAcjIx41GZTof0sAGCA9/8ay7kf4+zXDPJFXBb+EBwGZuzVemMtY9g==";
+        version = "8.0.21";
+        hash = "sha512-zBV8AaqYLrZN2EMx8F4lN//kJewH1L63oIZCHj3c/gC+4ZPNdjxzYew2fNe81P/8cJxtDB5fwOY1Ss2iHC4Jgw==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetHostResolver";
-        version = "8.0.20";
-        hash = "sha512-cyjz6KHwDaCvpLR1DM9JsJB42iCvq655XojxuXb4Cfi1I/fJ3eUXvTf8lv6gWIkU99m50QhbO4/ZWte9+s4ymg==";
+        version = "8.0.21";
+        hash = "sha512-Me1FCUj5ILgMnQDTYKLyYn1Un+xOxoh5v1xeZPJkGi5voe+8I+ydJsi5swoAU+SDaovEQBBkZiMmIOec5jA9Vg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.Mono.win-x86";
-        version = "8.0.20";
-        hash = "sha512-jYFR6eljhQrhg5rDRzJ99SR4PyM/VVMvHSx08bTw52PIdmBLoVdwz/kS8XTfsJiRyqI1pBOWOCAhIQK8sy/EMA==";
+        version = "8.0.21";
+        hash = "sha512-/g2qSSAS2KfcIaQfRfoyglYZRaGx7F/SoGPWjiwtoi0/kTjltgLAbcUO+iRj2HXK4AFoVUEQ+7s4HeNcwYggxg==";
       })
     ];
   };
 
 in
 rec {
-  release_8_0 = "8.0.20";
+  release_8_0 = "8.0.21";
 
   aspnetcore_8_0 = buildAspNetCore {
-    version = "8.0.20";
+    version = "8.0.21";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-arm.tar.gz";
-        hash = "sha512-GI3R8sTr6JMqoyVInQGSNlYdIhkki382gBYJtCPOzPa1tv+vDtNl+xmy2gtUN4tRRdnoevXNlfpG+nxZXzy+Qg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-linux-arm.tar.gz";
+        hash = "sha512-GGI79z8iNr4pPXRWtrGdC9r79Blx1C6NS4b6U2npM1EyQ2Zy5lb2MHqrWYQrsaIuRHNh13oY2lm3tw8QCNsLnQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-arm64.tar.gz";
-        hash = "sha512-F7AdYwmJnupAIA/ESctgbfVUHFgCuXPCHnHX9VObcss14trzi9nhfsbcz7I8PBev2x5/BfsT8QcBVh0uALGWRQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-linux-arm64.tar.gz";
+        hash = "sha512-2wSwhcTOHXMuVb5X7+dxtL5Ma8+bU1n7+ImTsZAm135+EIpBqwxEfaEAMG34396QvJwgbO+xhW99prYYts7aMg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-x64.tar.gz";
-        hash = "sha512-IocT88NgDEnnkk4m3IYRXJZ0tTCLRFFKU/Zw+nhQOKqIXq2M0sHBhQ0VZbaJqVqS6X9HLYZCmTDb+xFKpgIOtw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-linux-x64.tar.gz";
+        hash = "sha512-SqlFjT3ntP+WCtzEplXk1+TmVw6XeRkZETuMmlWIOWSmAkHa86cMYElM3hphFV2AIznsA7BGRm6sZymPCsxyiQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-arm.tar.gz";
-        hash = "sha512-y2JY3VMirftGTz0MBVNPxP0+LAm/+d2E62UiFh3nfqYHWslZ086aaQFRT7t916ohcp78OgqaG0AUDBG3ZBrL1Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-linux-musl-arm.tar.gz";
+        hash = "sha512-MawjT0wEHz/EWy64GfZHfZIQgaVFIoSN5DgVkjDRYe9Cev9KBYJFlXu8DXfWMRp9O/X2PFzj3oxfN5Mfucu0sg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-arm64.tar.gz";
-        hash = "sha512-8Q4ZN592YR83btGbcB3MKjQHzYOlfYBvmSkpWpAVP6KPxidA+OXDQJSpVeg0pwS/QBsJk/JSig7i9dnPh2F5uw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-linux-musl-arm64.tar.gz";
+        hash = "sha512-dinHqDFpcKY1RriIMd2ndlDyowdhXfQtc1x14pm5NewfUp8pMV5ETRb6SYM546r3uWGpGKye/mbevIq3nh+3Rg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-linux-musl-x64.tar.gz";
-        hash = "sha512-dFje2NJ1SZ0Bkq2olrBCUBgwwsKYWVgeLi2x02u8ZSryLzACnQhmIM0cKnJpq5TQ69lOK01ZkJYomUbvOQNRMg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-linux-musl-x64.tar.gz";
+        hash = "sha512-dPnb6yUl1q2+SauOU5aYYLL3ffOe/riA3YR5h651gy5EsRmiszmCjKFRaFo6tQQ7cBjMlkb/dw47wQhcRqT07Q==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-osx-arm64.tar.gz";
-        hash = "sha512-79IqhUjjfn2fAhTFrG+TLEUqMDgHlow4xbDgQzs2rUY9V1Be/pdKzv4Nk164br2y9xCqmnQrf0lYhZ5HW0frxA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-osx-arm64.tar.gz";
+        hash = "sha512-W2v1nXx1AqYZSUtaIEcJWgTkx71IYK497l/hnS6ltUEJvUzWZvGGYC1pLD8qBWEYHdSJp9oY5IQXsRsMciiG1Q==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.20/aspnetcore-runtime-8.0.20-osx-x64.tar.gz";
-        hash = "sha512-U53FTV0qVC1W2loz9KNr0EyvA805P9xxD/82ES2cyQ0f1fcOE0uFFVAGS8AKka9hrsL/SZOrh7F8Qc63XvG18Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/8.0.21/aspnetcore-runtime-8.0.21-osx-x64.tar.gz";
+        hash = "sha512-HErHWsAt2YRVg96hDIIx3lgffHoyAHONWLdCYuCZiIPmI9tZuIeV+XJMwntG80RgbeWuK+8pCFaO5OyY2q1u1w==";
       };
     };
   };
 
   runtime_8_0 = buildNetRuntime {
-    version = "8.0.20";
+    version = "8.0.21";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-arm.tar.gz";
-        hash = "sha512-OhX2U53Nqx2JZeI+hSrymYrYaN3GzubM1GCnfZ2hjfgsazcw8zZ7kLH3A4+T1m9VMk5e/Q986l+E3HfXVjCy5Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-linux-arm.tar.gz";
+        hash = "sha512-8H2BCeRjn6X4qct94/RsrqWBbdZFn0gyh9i1HUB7lCbtWijdEbedqf3XZF7ERsz9YuY8aV/g4IOOslar+XGaUw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-arm64.tar.gz";
-        hash = "sha512-WP0Zr+zl5BvvDsrxUQVNdH0T+Qjzpifg/bc7hf9Au7XSq6hapD7gbVFblZHLzdT4esG050kj3KiU35t/xZlR+w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-linux-arm64.tar.gz";
+        hash = "sha512-fq6tvMoWmy/dK6B4wkK3ddF76Ifw4Fi5Nt1vhywberMmCmhS45i4T0yRZdD1W7D83r+LPeJv+YCrfTpD0yC9RQ==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-x64.tar.gz";
-        hash = "sha512-S4ARd+AJ7HENXiURUAqmC+yVgRrdUP3FmwClxIaEDGbwDEjycs96L4Ep7RWOxbiH0d1gWU5hL3SbpI/PSK+c0g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-linux-x64.tar.gz";
+        hash = "sha512-tXcfmPiby3C6GN8jTdgvAG7jskH+SGNIXqZJ18Qo0S8uFN5iCk7An1a5uYtSFsWyFqR/C1zZARo4OZPu9peQFQ==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-arm.tar.gz";
-        hash = "sha512-A7oEEe/iG6JKAJo4CpiujBP7knH2mmCGuLmGMD7A2FCWfWy2vjGmn0RakyI+MYfm64nvf3PmgvDc67ZUw8Fd3A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-linux-musl-arm.tar.gz";
+        hash = "sha512-5iizEWpoY76/71ACrC6EcIEOBo7h4iGasI5+YJRT6YDU3xkRXSU1Zgm3qZp8/FOAj98wr0K2snc6njRuGDXpzw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-arm64.tar.gz";
-        hash = "sha512-MhS3znevvLh+W6qqS4i+7VQ9vF8s391ytkccudzRvzxWzGfeqaIVDTDeoO8MWFwEnbFyQ9nsYT75KFCeudZLTA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-linux-musl-arm64.tar.gz";
+        hash = "sha512-T7MSWfqLzCUJicDpBtUt+i/1ol8q3dOGeNeI7Sl9ug/lqUd/mwA7BqqvBap51mhM5de19JviGORyosxg+BL6fw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-linux-musl-x64.tar.gz";
-        hash = "sha512-l6bO7rPRMsfPKjyxCSMEwCULN2yCylDLCyeJ5888XgTqJcZkRH+SZtoGDk9XP9un7XX8V1lhqIOqMzD8x5XXuA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-linux-musl-x64.tar.gz";
+        hash = "sha512-hprd9TZogQTFOipcmzZUlZKvc+7Kv8xUNPMwRTIaSEC81BTs2MqTU75j1Oh5RecvI+0oenAlcBbSkZqod9ia0Q==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-osx-arm64.tar.gz";
-        hash = "sha512-Racowrq4laEPg2p2ne1IPw9XIAaAIPw16QJw22wShR0rqz1oeb8hIrTKGMCvwqV46gwVJ/hIPAVymIueLyO2Dw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-osx-arm64.tar.gz";
+        hash = "sha512-2t8yeB7dhoPjxD4B8ZjbMNzciTG1Z2igR/vH1zalQsiYjBec8HSOdRzPq/EOTWH0Q9Q/K0a56tYK3tmbThbp4g==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.20/dotnet-runtime-8.0.20-osx-x64.tar.gz";
-        hash = "sha512-NuVPrATi61Gl7IYlGXggAAc0EAPN000hKW5LhsdcX9Fsux+FIte7VX9Rr66F53RjT6mkfdlQzxhYI24tjJxufg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/8.0.21/dotnet-runtime-8.0.21-osx-x64.tar.gz";
+        hash = "sha512-eDrVixiyGl9LfU3tFJ4sKlVLaQ7dEs45dFGqtaEBy5dKq0BI1ACrIW4VYjCeF6JyE18rZHl0Kj9J2A/2sjLnfg==";
       };
     };
   };
 
   sdk_8_0_4xx = buildNetSdk {
-    version = "8.0.414";
+    version = "8.0.415";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-arm.tar.gz";
-        hash = "sha512-NijaK5Q4ytWNO9/Ra/3Uvvqbdl2M+/HDltKaKL+ZEw9Y8tsWWPyxbQTCT8vGEHjF1RANvm6g7emmJzJlXAaviQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-linux-arm.tar.gz";
+        hash = "sha512-zmtBU2PSefmkhDQ1J1H0AsBwgWqcLBZC9EnGsce967o7nIXvQ3Nknrdt8wlg/jlAWo6eEmBKDENXgWz7QhUY/g==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-arm64.tar.gz";
-        hash = "sha512-IQJRV3BfZ8nUiXr2as+JlaszZxu27VIRf4ah282qGvsEWcXnFBzlyGOvcXOL2c+eJwo1ttQDRKnoMAtBwd8D7Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-linux-arm64.tar.gz";
+        hash = "sha512-wu/Mz9g2kEgtMxSyOp2bU9QVkXletQ4ChXy0ld0f3hMvLDMtwkMJVGMzjS3GzTYs1+p646nOdbMqtUpRe5He+A==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-x64.tar.gz";
-        hash = "sha512-vfaxUfeHrFfTk+Yl6Lj8jhmsdZAudiJ9pzbyDgQs9/+Yv9GmZpt3/ep7/meKDyMQPgys4duD6a7laMzW8bWyZA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-linux-x64.tar.gz";
+        hash = "sha512-D8BJmoV/Fh98NXdbs/UKxvAzPwL13yHSEUfVOOsmqahygtS6NwcYHEbzwJ0izcmE53ggpZU6dzUl1vezMt638g==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-musl-arm.tar.gz";
-        hash = "sha512-zVdA2yF3ijrCNcOBXkG5dynzgtNUd1hpB1occ49zwNHJkU5gnEqJX2Nc+3E2xLhdca3DapbkXGnPH9MyDqUqtQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-linux-musl-arm.tar.gz";
+        hash = "sha512-M2KT67QaYbYC9YAdw5olLCdAHrCcAa0vIpbT8/uGhQ7BsCfGTKb9LymoZrKl3bFGCVmQ+lBifHt18EGSfX9voQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-musl-arm64.tar.gz";
-        hash = "sha512-/F5yjOvPhSr3eBn7y8Q8ps2XRtM+YeP+XQdI06Z1Ejh7851Klxg+Q97f99GwiU4p8XKt94Wn9Pek3KY1kvLyBQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-linux-musl-arm64.tar.gz";
+        hash = "sha512-KBSfadUGbDMfjFrGkuxyJRybAH0eIwzigR6uWbBaQJhSmgRLpKbmvW1U1oTfNcvI214RZ0R31HzhFIsKiqzzSg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-linux-musl-x64.tar.gz";
-        hash = "sha512-QpoGAT+8bPVezqfrxcQps8tBXILuuTfavX9G8ChxnFUBhfOMlzIPCCXPW76awHp7TSK3DvQnJh8b9oapjRiC6A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-linux-musl-x64.tar.gz";
+        hash = "sha512-5vBcdSv9kNflPusoPYdB9UH1J0XLufv9azgMt6j902zeOCE5/FCqMHfmsCpvAIqtNrW1NGISS9e1lhGRb8K95A==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-osx-arm64.tar.gz";
-        hash = "sha512-jopFLqouKBlesbsz4Nm/8x4iPkfQ+kdhujOaR6ZzbwAQE9wSFpW1gIg4RZIePBFR1f1Gk+vK78B/DWUAoMAeNg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-osx-arm64.tar.gz";
+        hash = "sha512-P/Zx7ioFNalsX+3cbg4ljel51O3bgihHO/1LZWuleHLhE1cnZ7eKXh6UYmGSXH7KfbEVn+M3dgbuCrqL0QHcBw==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.414/dotnet-sdk-8.0.414-osx-x64.tar.gz";
-        hash = "sha512-39u4+RJKKWRqVTQ3mM5mdQ0nxevlPbHtedzE9fF4X21LCliCAsZSd6FqNo12iMmokSL/+qqDzZRQCkc5XvWE3g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.415/dotnet-sdk-8.0.415-osx-x64.tar.gz";
+        hash = "sha512-pemIo2kEQa1daLDu2KDe0YgBoj5fVsWEqpQFSQ8glxglTH7ibFsb5FrNQxiQYMw3ENJe8cIZJSpMFrbPe2+ZfQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -743,39 +743,39 @@ rec {
   };
 
   sdk_8_0_3xx = buildNetSdk {
-    version = "8.0.317";
+    version = "8.0.318";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-arm.tar.gz";
-        hash = "sha512-btSKmf2qXLgCVt4kP5TpocDIepIBNBJC6d4NgiKsNHW1UH0XPbyBaXSk+dGkiuN1ywqJW2K6ihKWNQ14Le2JMg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-linux-arm.tar.gz";
+        hash = "sha512-1WMoeN8Rl8/oFfKUNQkwQE5AcZkoo0W8LV1mWfJOD92ctCPTL74qt62UItrNypG3+KIFHxcUIgrvmAfbhYziFQ==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-arm64.tar.gz";
-        hash = "sha512-8XZBfZPjhz0QGiL7nbnMtESwGFnNG7pl6ZHHEADU96R17gzHIKHgefnmBauxkO5/RcgJZQO8/cV6NHIUtcopUQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-linux-arm64.tar.gz";
+        hash = "sha512-oxGu9CXmwok3R/2JX4AEtA/t1siq170ZAv0j5CpTcwlq75KDADavtrJaaALuSZBmqGnXqMvqT9grFUvHBpoJRA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-x64.tar.gz";
-        hash = "sha512-F1utSZ7RQ3TePWcm8Pog0r9dlLIO7V4OA4hkfXZc9KYYPiK/VZ4h719ffWqn1G0gxwjaPjhnZUOKIwFKozSMWQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-linux-x64.tar.gz";
+        hash = "sha512-Ay0dybsZJ3ewU3nO7CsGMNR3iZ9lkhqHRYER74q27nHQN4fWFWTCYnPnfdHJ6zTafXli6V2g/sRz/839Hvtxtw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-musl-arm.tar.gz";
-        hash = "sha512-8dpOUvpyrfw2Aqyobtrt25vsjp0vHhBDtbl1Z+hTxnNhf2hBS9kEUXu1ee8sGj6dbwqobaUlrKxg4Z6vQaXV2A==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-linux-musl-arm.tar.gz";
+        hash = "sha512-LXNOLl84jA8KInGAsHmGDAOxxokCBynGI0T/B5uCReHcKaQyGd5DgoVkw6+Xi7Kd5dVlbQbi/qTpUDC/Gls3OQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-musl-arm64.tar.gz";
-        hash = "sha512-J4WXc9Bw7dAp04WMnk8uxibL5iyxOWumf6K3BDXF0jZkOMnkNTQlRFOjRe616kdvdfl4JnHKrxefKGlxXZUZhA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-linux-musl-arm64.tar.gz";
+        hash = "sha512-IYqpuqa2PJbRA9MLzleJsu6QlrrS093NPfch1f6Aq2+z/6Zs3TXIhlNOhbzEEdqRqhg8+EuV3+2zMmwx+8YKBQ==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-linux-musl-x64.tar.gz";
-        hash = "sha512-lXZZvAC1QjSDbUuX/ciF9UMYDAj5cXOFVxkfh7DCXyrmlCJYpMn07T/aRbLe+92KwSnEn2UXDzhUeZ2maLcLAQ==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-linux-musl-x64.tar.gz";
+        hash = "sha512-EltlbXltIMRy+Fj2MLcucusEw3igqNhlm8FD+mwEnxYOQlUKJ95TRBrZkBiA/V6Gw8AmAjfLGWB0LX2Q+w2z/A==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-osx-arm64.tar.gz";
-        hash = "sha512-/UCk79i8J2vNY5BgB1Jc7Hjt7eBRdfwql2Hr5lgR7jQLKYkKGhZQqWZqQWf8y/zYhBWFMzDnH7ZYmiSsrwvxJg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-osx-arm64.tar.gz";
+        hash = "sha512-4mLam0wRJu0Dawl9E2A7cum2R1u8XOKEb1ubE1dqyCgFb6BzH6aIuoZOfEiRpuOT4qaVj6vwawBrTUTFBVQXlg==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.317/dotnet-sdk-8.0.317-osx-x64.tar.gz";
-        hash = "sha512-wnrUkKLL6u0eIwo6p6SxEhgnRKQ5gFJfjPCZ7WgPMyhAlVrsgN+z9suND4GOgVZ9bo3Sz/LOlCkTptDYfzr2ng==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.318/dotnet-sdk-8.0.318-osx-x64.tar.gz";
+        hash = "sha512-9PHLqLiKiANWCGQBRdqa+iDQzWiTyrfqS/Z42JZl9LbZK6ukx+KV0C/6uVAYicgCrbEVul61n/YwibAp+GwPJQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -784,39 +784,39 @@ rec {
   };
 
   sdk_8_0_1xx = buildNetSdk {
-    version = "8.0.120";
+    version = "8.0.121";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-arm.tar.gz";
-        hash = "sha512-VOUr4dIsQTlGzhcFY2NkgsjLrykFPGk0/jteVdaAwOlZsUWpxTaiTwePwo9Lmi4a39ee3UTtIIvrLUAA2uQ/SA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-linux-arm.tar.gz";
+        hash = "sha512-5xiXyifpLF7pXuNRg6kUKDhHB0k0soh1P6pPQ79ZNJZ/BCR36f1Kzmvz0oPpSOjDS8nAAwhQSTnA8z6kuAxMsw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-arm64.tar.gz";
-        hash = "sha512-RXG93cvaH9BkIZuM/aLMWLRMvjdZXTePf4E3tajrFsP1IY0JxCBpuKvXox9tdWvI/Sw3s75U3U8Kev4gEroKBg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-linux-arm64.tar.gz";
+        hash = "sha512-/vVvEX+bnOqOQa18MFfAk9/uUZIIxnR6VK39cbQLSsBoPAoNSj5sYGZBdDeAIrd7wxgSKQmjATaoPuMu6KqKZA==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-x64.tar.gz";
-        hash = "sha512-IYTw8G5rBj4MWt9iGQ+B8ATGMc+fNAAR4lUX7OsDzTWpTBh2Nm5acwv5M10nNOG3eWytGWQVS8Tcpaunj8Znfg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-linux-x64.tar.gz";
+        hash = "sha512-XzVUBmqfc4w6E32rqIXKbrZp8ehNU2zHBkhkghrMcSPzSeuiz12QwlKHg3nLxl6SFPZeAeJIL3bgPDXi08m5og==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-arm.tar.gz";
-        hash = "sha512-M4wFGI23FBB2L6kKuc3oObIKqJ0oD9weOL3/2eFtdx276rSPntZIj26qw4QZRoDrHS3zlKvWwwkyRns4j/P7bg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-linux-musl-arm.tar.gz";
+        hash = "sha512-e6rW8lVKbUMqayrowSh8oKiIOoy160mvfK5V6DP4aVkQkpDYxvy2Pisl5qGoFWgPWSeBJ5qTnYl2Cb4zrV8adw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-arm64.tar.gz";
-        hash = "sha512-xur3K9S/URIQoUqlyXLrJ1EXbheLOxKfd93GolcBPHW7+iLHz8LcOKLB7vf7c4beJR8xiFb/+3a3ba3afOXyRA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-linux-musl-arm64.tar.gz";
+        hash = "sha512-0EcEZTTZewI4hoXvzwjZaevYZx4AqTL/kMQyvvngG4ZfW8xRpqnIcgG9pWzYbsmy/tViaQvX7JMMrgT4co7RRw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-linux-musl-x64.tar.gz";
-        hash = "sha512-sRIq3M4ltCP9ezgbuHa6c04ueHrvV18Xp4gT0A2Ypb7ATRG6MPza9gLZ6/HZhUukOAyAdo43cxjhESuI2fY2Ww==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-linux-musl-x64.tar.gz";
+        hash = "sha512-wnlpHCb1CuYhiVlpP+6/In19YcF5Bt1giDakgl7rRvw69ovDCyodOT4Bt7oRes4/sFnZfAusWQ5fbOyzCxbH/g==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-osx-arm64.tar.gz";
-        hash = "sha512-d95WUshteRi1HCAUBxDcbpeOza9G4HQWPbR15D2SrClLUN8zQ4laxkgKfNqXUan7HiaDvDgcNvC5Wxu9pQt0TA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-osx-arm64.tar.gz";
+        hash = "sha512-hR8ajS+/chLw2d25zmZfZt+YAezBVBnPMlrZ7+A7uGrgmecTWxx+oX7V/5oU6ayGYDeGUXj3vvHkYUZbW6jFIA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.120/dotnet-sdk-8.0.120-osx-x64.tar.gz";
-        hash = "sha512-74HY3JOfgDWzszkkOVODCKr5EP0XmP71t8zKdXgYpt/HsjW51y2/Ime1abqgro4kKwhfoKHQOEXLgTzfKRMssA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/8.0.121/dotnet-sdk-8.0.121-osx-x64.tar.gz";
+        hash = "sha512-X14oqsO9JyT2R5LAwj+cWl1e+Fd1HSR+t3+Fyui3h9qjFSt9jsTWt3ObtagDXwAVr0isR7E9p2ydxfNP8P03Sg==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/versions/9.0.nix b/pkgs/development/compilers/dotnet/versions/9.0.nix
index 4e76907b4d3e..d45a0d07ee23 100644
--- a/pkgs/development/compilers/dotnet/versions/9.0.nix
+++ b/pkgs/development/compilers/dotnet/versions/9.0.nix
@@ -11,28 +11,28 @@ let
   commonPackages = [
     (fetchNupkg {
       pname = "Microsoft.AspNetCore.App.Ref";
-      version = "9.0.9";
-      hash = "sha512-W8dh2WCiNWN4NAyhWaKGrAM/ZcCBem0Bp0EMPOEDcMlFrIm6ibjCnA7DxDxWPM/W1Kyzt5eLToqTXhhdw/4QuQ==";
+      version = "9.0.10";
+      hash = "sha512-DZAx5FDPMkz/cn4IWhivgBWLnzZw4qDhnFKTnumNeNVs/2PK0lrF5TM4bKYBSEf+tBXdMVkDKcdq8NFUfj3UCw==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.DotNetAppHost";
-      version = "9.0.9";
-      hash = "sha512-jhI8LV56Ba2Ft6tzbpdUqf0eH7aMCEZvVQlurV7EYUoexSzhqT+qb5t7S8YxU/57R6psvvnA6uMoVahh7SFQhw==";
+      version = "9.0.10";
+      hash = "sha512-3EgfFYftlGJQ0GecUldlpfnuYrzYyrNhPrOBYFG+lYLvLt0n/J6FqPZr1VGd1KZOPBO51gySSA665PM7SN2LNA==";
     })
     (fetchNupkg {
       pname = "Microsoft.NETCore.App.Ref";
-      version = "9.0.9";
-      hash = "sha512-iO2vcnhfd2DmDdLf7JwJDZWgH9PSSsKEYkuyRKFioQSPYGr0LonWcB+tlacP3LzQjSUH/WSL7sNBRybJMt34hQ==";
+      version = "9.0.10";
+      hash = "sha512-rmARXaPmhSO0WJetsDhQRJV+ksMqI8ogN/eZaxaRaPs8zucL+2CD3ePo01BlnhWjj6AuNunNZhCucxYXRQ8JmQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.DotNet.ILCompiler";
-      version = "9.0.9";
-      hash = "sha512-T8yCcJrvW7U1Lr8wk6mhRbxr7tpv1ixLmmSxKFRRSAX5jw0fFDwFP6UftrfFG8joxL91n56vvkMuO1+cZgDIMQ==";
+      version = "9.0.10";
+      hash = "sha512-KjFCN1IHZ/SOBKfyndUy9ULvqFNUMNtNlHngaFUOq65gGemr04LmqQNHt8WnfDZoJoxrSs2jygW80R2Ui2HJcQ==";
     })
     (fetchNupkg {
       pname = "Microsoft.NET.ILLink.Tasks";
-      version = "9.0.9";
-      hash = "sha512-69+Y2iyi+p5X7EOF+iGs6foOhCpA1JIfXxaimipMh3U+5vUU1g5jf+BexzCidM6FgbhkFCEt5lw1TFMrxZiphg==";
+      version = "9.0.10";
+      hash = "sha512-tG1AR2e1woas/SuydzLqA8HrAqhChedExrq1vA5FohTPa1rEKjFNuhUT/qEOYCKyvy99HeszDLdrmDsz0URu+g==";
     })
   ];
 
@@ -40,118 +40,118 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm";
-        version = "9.0.9";
-        hash = "sha512-l7spf3TE7A5XsgA0HRkbmYDM9S9F0MRCkORxp+wi36OxbKrxkTg2YoD7EjZGPFD374ZRZY5ExZWhZd33Y9P/Ig==";
+        version = "9.0.10";
+        hash = "sha512-A55fVw2zn5ES62I5NCEe6e05pcaD4XU2xYrVX3cXJsK2OpmbW3Y7kN7Wedf6zjIgD+yks0bDlIhI05ESZsFMPQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-arm64";
-        version = "9.0.9";
-        hash = "sha512-kyQI7HZcsIjNScBcpy4IDk/OSa8fcdRgJkQLnMaGGBoM0ou2d73d0in3Jh0YIKwDnmCPI4O/54+kDB7e73TxJQ==";
+        version = "9.0.10";
+        hash = "sha512-/RhEj23nJiFv/tbazben1tUi8c5G11xe+A9SF7eQ12El+3+M9ALl/0vPz8KKg7qmNaRPS2cVOiEKWavLSjbRog==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-zH+nJapjIL97SGQnVe7lSSnB4SCNvLaebGkBe9/4j85Z9F37DdX2lPRFrDAhbN/RnBhQaf8iKqHZ2O6Oj+pzLw==";
+        version = "9.0.10";
+        hash = "sha512-b2hh2Xyn2C2ygN/Tg6xKz2mjiwV8A+yzyOjC2TBwzf0r1txcy758P8i7/VgOWd7uyVNvg3Pbtiu1pcPCsa6kOQ==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-x64";
-        version = "9.0.9";
-        hash = "sha512-zzTkfpsabKX7gw986tFP35KUUSdvnJsPTYoH5fXAGP+wkyeUXEkRdyq8rMnDPOgNPvD58iOotmjcwO/SXNssLg==";
+        version = "9.0.10";
+        hash = "sha512-HY1hQ4SjivI6EbNgCpxjvGTTarZU71hU2VQsD15jsGA7eBR3uADrf1XopYzYI1IX18pJuLquJfYa2UtzAbyGKw==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-nbbjJS04mF4DB41P92BNuzGfVoxnxaoDUqDNsIPfd7V2o45/QhM9rbxzKEA8CxajsQ0g+l/LDp/Fpv4fkKe5sQ==";
+        version = "9.0.10";
+        hash = "sha512-KdVekQRuXfBHyRfmqqMHa/oLOqCw+4d52s1lQsj8xJdtc5CHrHkAivYihb7qIAPmo0kRaKaeui8NoVN96gddvQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm";
-        version = "9.0.9";
-        hash = "sha512-ZBaxX3Bgg5k3El5i0Cd7VGOhbp2h7Zvz6qa1RpTFoBFlekxAf2x4KgqCWVgZTHBd+Uuq2Lf/Uwi3grEKPkOZBQ==";
+        version = "9.0.10";
+        hash = "sha512-eaAyvA4BRPZl4AsdwdvN5MDOMuwoZzmAjw6GVy6swTt1PJURNfJ6Imt9dHBJ02KadmN0zLF7IhC+bNoaRqqKHw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-arm64";
-        version = "9.0.9";
-        hash = "sha512-bi2NGA67gk67VROUpbdo3ilm8kFYyilNLw6pWzkr77/urDVZhiw3gu46STI+wC+lwTTZx4j50H4h0mnZv567aw==";
+        version = "9.0.10";
+        hash = "sha512-D8rQBhJevMzdiz2vvDHNhAMG6TM4wUngbHfkd5FV7fIBzdB5WounVjXe1vAHE5ugQ0RkHi34XZUcecuap2DfQQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-OV1ZU4dAdukE8my0sxxueygWhUfhHIVliQUtDZYjvXRhR8IAKX5mOiD0vT5b+PakutqBght7Jn3Kh/Ft/EimqQ==";
+        version = "9.0.10";
+        hash = "sha512-oNEzffrhwQsjMPsgKn3wr8zSx4QoHEAgJo/1r2ZleGhDaf/dZqPSMYMFQSwA+/U7tc76/L4hmC0rkqAaiEZBjQ==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.linux-musl-x64";
-        version = "9.0.9";
-        hash = "sha512-3+wb9BwPwaqkIu1ki2zf4StqhWHNbMzxVKIEdbLTYFmHRb9J8EidVSsE9mO/0EjIrI5B3hvHgDQXQTodn5w1WQ==";
+        version = "9.0.10";
+        hash = "sha512-6nLhXIm/0EfJSIWavz4HMij7tlLeg8v4PAm3ITlocSv/k2r4f2di6KFzLgVuWz8dwKbsvbdAmrFHGraOKU4IEQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-5esm4aBp1NtzxfujLWxm3FuKSzou/JFFOa36yfF0sPJRe5aNjlHJ7iKIdVY6HpZTcq6YB8APqL7haRso8fT1ZA==";
+        version = "9.0.10";
+        hash = "sha512-VIJCu165l2oO5EGH6nqZ+5j2sFM89jCjtqUigNe4w7lQWN1KvUdzNY1wRCP9EUj6GMy+ZDZEXykm9QdFQfpHoA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-arm64";
-        version = "9.0.9";
-        hash = "sha512-xrgbfVvjHKKpLd/JPiDR6ubhC+igwzUny21PT92jGEQI8Q4XW0odmlsSFTxvcxNBJqFC22HrHx8YBjai0fIjcQ==";
+        version = "9.0.10";
+        hash = "sha512-G6JZGWnodWOaXDLNduFWjuTrDRUvKnwLQnNcXRbH/HanYxkXJcGb4FEg7T/HxG5WFzK1aSb40CRZJzs/nQ+BwA==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-tJh+NJffHrQCRxrj9dV7RR6Blnpr6MfNRAcGAwM0NZuU2YaVrhQAkaXYIvKcKxG84e9eFCH9g6+PVNI/WCAF4A==";
+        version = "9.0.10";
+        hash = "sha512-eS3wDIwRM6bf/vu+wBY4si7NcxedC2NnhAJdnnJaGkSb+AoK++Fh9kp4JGYx05ZCMVY+TIY12L1+53sqgquYiQ==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.osx-x64";
-        version = "9.0.9";
-        hash = "sha512-WogVCntUYVpqoceJARNXWdfQAFj4EgeaKjNJqVRIp4oqoQA/FPMJ0O08Le7gAJs54yn23hbLHd6qwyWE0Iln+g==";
+        version = "9.0.10";
+        hash = "sha512-RoVubEeoQPK930leil3c2IpHI15696sp8pTsLj5svT/GNn6gEfzEvSqfXrPYSUwB+BcCTUrAujYEeTbzsutgrw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-YAAE7p296usegl6dDQdsZw0/iktpvsaDWT6UKb0xNypOtooHrlm/NDnKbck9aMi5oaZjbu2KIixxB6JeB/V0ag==";
+        version = "9.0.10";
+        hash = "sha512-486rN8RueFeThh4GviVkTCIozZaXxkyVLU/jPhDRn/4Sc02nHh+M7M8lM/wSfhwB3GF/nBnIoun/G8bG4KF6rA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-arm64";
-        version = "9.0.9";
-        hash = "sha512-30sfrI/hwMtS6Ko52i0OuQYxIVJUt/8dW7Mrc97Rjm6H7kzanMtGDdT3aJOyivmWZNuOc81PrpTrfRttLNhhKg==";
+        version = "9.0.10";
+        hash = "sha512-8eKvQ9LXOY0c2LNesJufNdO28u2eA58jxGlZ3uR06mkUWXDO7EfXddpPYSdvux/4eHhrb6t2SCf0T6NL8eYajw==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-Dy4dOnT/QrFkSAFldlDnIsD+AU8f6/fGKa/OL7uAocllb6kwE2fSZ7HpDYYWmreVoIjiyuZ9e3wBy1HTPDe4MA==";
+        version = "9.0.10";
+        hash = "sha512-1GfbzaQm+Oi5ZFjKcTVvckt/oRJW8j/2Ejt/RrjO4HYFU/6dejBlJ2ByGGuR44kb5pRR6h8b+x9l6XsS5qxIYw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x64";
-        version = "9.0.9";
-        hash = "sha512-gVGT7ewQ+/2PcJ5BMyKOLkHUvCy++Sr1ZCiphUTO4nZq5Nw6D+M88YpGEYSN7znS01NDacMyfn9SpmzyIdJIag==";
+        version = "9.0.10";
+        hash = "sha512-+K9+h7Y8go5wKq2xHchsmL7s5yRrCLoyLXeuujks7mo/3Dq8B2TITXCx1UiAhAY/zqxpcXnOygpGKdatw5Rl+A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.DotNet.ILCompiler";
-        version = "9.0.9";
-        hash = "sha512-kFNKIL6LWxofPO4JkcpXu0BDCdRmRHu1DgQJwIf3ONOv4FKILb0jLftw5ZhpMVYtzM0ZkpMt7p+pcJ86yM8MTw==";
+        version = "9.0.10";
+        hash = "sha512-gLjz+tUBox/YJyZJ4mmfbgvymG3Lp73JDQXzGA8pc4DSXDWBINeI/KUC14UUvZrI8Q14tiZZhkcYPdcqEkzY0g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Crossgen2.win-x86";
-        version = "9.0.9";
-        hash = "sha512-8it9shRGYYMx3yWp4d2K7gjuQDhcPJDlBi/7HQH4CYt1kOp28Feq0u89kxsOAuEG7aP620kMVOjUXwvx8VTgkQ==";
+        version = "9.0.10";
+        hash = "sha512-CFoY9eWh9GRBWFDi/40Tf+LVBDnB6ec60Z5Mg2vVjpFo+vKDJhpVEnww1NhGfew7xPNYRDsK59sVwNBGntAT9Q==";
       })
     ];
   };
@@ -160,361 +160,361 @@ let
     linux-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm";
-        version = "9.0.9";
-        hash = "sha512-2yYu8wPbzfXQBU61nU4/tTUDLPSj80jIjNCz66sJ45mjJ0xJkdOaBOlyJ2lu98C0AUwkJ0BKRM7FJ9WTtxSxrg==";
+        version = "9.0.10";
+        hash = "sha512-jukl9oaKPvLI27MCJokX8YBZKPnUdyNlYhuXk+7uUpAt8TJfVCjzOc2plLmebpAfxUyBLL3j9YBUijRRJzpoYA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm";
-        version = "9.0.9";
-        hash = "sha512-7Cn2JMd5KZWw0n6QakSjUsIO39YW9swm0y63M+m2JkCtHdTnBT6CZGswleGOBinebMJXrJcBv/m2eTYq5R4icw==";
+        version = "9.0.10";
+        hash = "sha512-puY/SDVlMufIM7F8hwVgwghPstsw1tDx61MV/XchF9rqqFbKZqe5U3yiy9Q75rFvVWyU4nBaAC/EbJsMFTJB4w==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm";
-        version = "9.0.9";
-        hash = "sha512-3nPmFqr69XC1HbUbzUgo3gGz/d5ACZ7HC6aVKiiPp/EL7ze6Y25+1KJY/E04lQ6KqPi9MkGww0hxrKVXA3ulLw==";
+        version = "9.0.10";
+        hash = "sha512-ge2i0IsVqaoewscMnVh1h6MbWFruFxkZh7t0FW+VdWSseKxIfqQg+7XMDd0RCZ/I4qup7JWizGY6I5Iq0wTWLg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-J8in2qwkMY/iuLf+JQXz7yegNGvi4Evy6GlFcMw/UZ05wMmpGYT4j0yPo0XU2WEsjmZbIXTkdqGSejerJ/DMDQ==";
+        version = "9.0.10";
+        hash = "sha512-h4D/Hd/j1kfS3QFhGutp6mlet5lPbPcY0l8QXuVxKNN2af2ynOCiFA2mmYaEHHPNeZhO8mgQoDlvuJopH8VIRQ==";
       })
     ];
     linux-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64";
-        version = "9.0.9";
-        hash = "sha512-T8gEze69wKZuJJq3hPrLis2orzgdsFIHF5gQYYnvlqjshzUvA7CFJ/lQIKxVUF8nXxAvbXutN0znT+OSVRn6mg==";
+        version = "9.0.10";
+        hash = "sha512-34kgieVQ5KIKjCoWeruEt9SNSRORiEozianOx8Ah173B/3fMhfMo1Ltf7JL4BR4Y1J/Chz95CLfnhUww4/UAPQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-arm64";
-        version = "9.0.9";
-        hash = "sha512-VU2iPvoScdX72B+jgCd4NhkFzGj8HX5Pq4/TTdE5QglEFg6gJT+UtVhOWyL/orVpphx5YmMvw3edS5cFDhkWaw==";
+        version = "9.0.10";
+        hash = "sha512-/GcghB1kxtasfUwLoUc8kUWZKu0CLyFIIawTgejBsyxeViwyHjhBBq0DruxsRcXAw8FyeIYw41i7N4s4ED07Xg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-arm64";
-        version = "9.0.9";
-        hash = "sha512-FGmeDfP2ys1zJrGfHpErBTPtXXo7aoBe9MQsndijsygBiJIRLAxY+IYCd8EM0NWjuWrhiTyZFxeNG6m+8eBG1Q==";
+        version = "9.0.10";
+        hash = "sha512-KLWNY8+mfMvWobEE38u3i75nV3I/1DLPkmcO5nEC4wamjeJ3IcR2pNS99h4QLl4oG0U73LRWi88wPcMEliZbhA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-FaJsi8Yedy/eE4I7aT7lV4/L42kB1Omp0REHCUEtTXsdY+X7S1G8j2/iy7G5wG/ptgjzC0Zuzg2PHPa3OCel4g==";
+        version = "9.0.10";
+        hash = "sha512-Pe1fX/lv+FBxo2Parlm9iirdDQoBpBGtIOfFb3AYtFcno2zmvD6ZHr6Jr0d+BRAzbEx1GveGy3mGOfUIrHziFw==";
       })
     ];
     linux-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-x64";
-        version = "9.0.9";
-        hash = "sha512-A9veAnV1k0Chjs4e3Zj5qG4QDPuH3EX60S6KrH/xTiVxoLPQkeBEIERD8DK3LbA1sTgqZpninVdZ5WunGJxBmw==";
+        version = "9.0.10";
+        hash = "sha512-tRqIuT+Dh6ZGPW0Wj4d1xEn7KQRE+/Zf+IUzu/cedwuYL7C8hd4cFmv7GyOlE1WZLhkiv/T6O+dKCdzO4OGd2Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-x64";
-        version = "9.0.9";
-        hash = "sha512-R9z/YVnJ6XhtsUJMl5TQEs5MEPEtIEyQoW7gU36y4uOqJNDT2n92dIffNv6rXig7VxilNS285VlvZh/jx2dPpA==";
+        version = "9.0.10";
+        hash = "sha512-tP1SxfaqZsUuLG4u4k1EOM1W8kCGZD8csKvlMe+nxGvXcE36Ba3nfJcRKdkZwaxxvIFTNCw9d8RBNC+m88IKoA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-x64";
-        version = "9.0.9";
-        hash = "sha512-z8hZUGhxelmSl/s0yqBkc3n7IUv8EUg4FEetPJJss2qjDX+Bwhao+bLYqCzpMugd/2iDD4EhLznrIkxl9ZJtBg==";
+        version = "9.0.10";
+        hash = "sha512-ZFTGqSsaB+MlUtcS+nH2dsUh3gq8aD0lkzDTkwqWPGPRUjmBQ87K+UTDZGLDzUGKXhBrrsQhTIXIMPtL0JJOZQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-fJn4MpQtw4UUCgqVgqt9cTfc3xsmUs/zpzwoVgDB3HO7h/evIOIOu8bodG4FRySPmumgmWUuNYYIXEy0PTSQDQ==";
+        version = "9.0.10";
+        hash = "sha512-cpxCMDdnOY2bajyIJ+h5xpQ3VsZfFScAxcQv1pohaguaksGHJgRoWJpVDfnE3+yCwWK08ye0HbbI60NPI5vurQ==";
       })
     ];
     linux-musl-arm = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm";
-        version = "9.0.9";
-        hash = "sha512-uWh3vHt4f7pBzW8JZIt5IyD9p4IzjQvWqw4TdpSL33KN1s5r/lfiy9YFwf5iNVxVfC3Djo3N+KE1mNKBj2l9Ew==";
+        version = "9.0.10";
+        hash = "sha512-z/B8WqPhX2HBMr4S/oa80Veq7rvW7C66t7SobB2I0U5bvKST+O90rpCLvgO82S0LfhQl2E9tr+yzY7yZWcl/9Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm";
-        version = "9.0.9";
-        hash = "sha512-WUWAi0jtODxARVNj5mdG55eTFjmZGVUQeS9daagsjFDUZuuPGkb6bP1fM7z7jUCK9o718jfUyAdE/L9Zbp4PKw==";
+        version = "9.0.10";
+        hash = "sha512-bg2uNWg3+Hq4JEArSnx8Ro+MycKm40OTcI8hM3Hj1mLDxHMA1vt4EvgkZrMN+rAr0Lj2apukx2fNpxGG+NSEzw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm";
-        version = "9.0.9";
-        hash = "sha512-eXZKZxY5E5pSztmIF9V9+TURwZd3CMF5zmHoRennOM054pzFSouBXlWTOlfWRNmIM+MP1Jg0IUxgIJpDJmLBNw==";
+        version = "9.0.10";
+        hash = "sha512-4lVp5Jva7/DGvV6TPP4SuEO2rQkX5dlmZeTT40j7NZt2alVkKFIg2RTeTY08ufsP12N0+CIv6Kp/wZ+rl40/gQ==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-frSOH04K9koPazK76I8ZwM7fym0qm4L39+M0KfTfkjky5h1pyF0wyU1bYGC+S2+yZT6nFW2zHqhurakc81USqw==";
+        version = "9.0.10";
+        hash = "sha512-Z622RPpQAt6KZxKPE47xRxo4BljsmMMoT69/3Bz1ogSQzS8gZL9fggtyc2d/ULrann2ZHxRyZ1XkPEMeW6eGLw==";
       })
     ];
     linux-musl-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.9";
-        hash = "sha512-1kYCnZNFFJ9F397Z3gl2SwcURBhJWPiGzBvO/6iMm4RC6ZWUuk91qhM8FrVJJMhoohEkwXhmlsuxBaNaANIOYg==";
+        version = "9.0.10";
+        hash = "sha512-vBa8K8o9jB2NYvyYaqSvcQRSnlBBwRSvnqr5I5vTERBwwsVm/rnujSJyoYP+myRd8kB5UB+uyxVkR/rJYMb/7A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-arm64";
-        version = "9.0.9";
-        hash = "sha512-3uqbDc7fIJItKIWxh7wGabTa0wskjFuIXjA3h2zX4Q3/dewAZ2OYH1LCth0AMfmOMlJxBHPjSRdCElzUHX511g==";
+        version = "9.0.10";
+        hash = "sha512-UcMs7QkbrdCCE83y3UXNyl8sHftlrjYXWpS01oDKkAXU5eHQGQ8QdwliYMd08CWMJNYl+KrhZ6JouLht03Kfcg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-arm64";
-        version = "9.0.9";
-        hash = "sha512-w9ftFt+wK2g04eDOgXSxGSqCpnquZ20G8breOb3sBM0S2YnOOo4A64/yvQbvXdSYhsajAqNNSRjo/Z3nQ08erQ==";
+        version = "9.0.10";
+        hash = "sha512-2Y+hIitvGjHionOXNweRjikMHJP+QOhGWDnIxGP6wb1sapbPZa5UDW+MkZsysZ8aHswDzKmYgKIbzeIA5bnMHg==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-e8tW+vdm1DDGpkJr6Wb5WvDFnD02q02255IwEmO4wFo9Qj+bCpUHMlCPda4HAgknxMh75zk+AB87QwOvluaCUA==";
+        version = "9.0.10";
+        hash = "sha512-YJcDRyLrbwJe1wWQBaxSekhc25lJE/a12LpAVEwS277i0X7nKBDwrdbqkAZMaN111cMMXnTjPz5rHRK6iPA96g==";
       })
     ];
     linux-musl-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.linux-musl-x64";
-        version = "9.0.9";
-        hash = "sha512-E4XDkM4huvFvu8w7icD/oIUivcF+15Ro0mea0Qq9gvTIMmCLdwUNe27yb3PDc6CtC7MAgANlyVAGwGVVWer9jQ==";
+        version = "9.0.10";
+        hash = "sha512-FPeEQrCGtDGwumZ2tZXUBqM0fOVUTJy6JjXdYSd0cjkXkWWPm2vDPYumvccgzuSF2RqZ/xct9qOF4Y+FKaeKqQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.linux-musl-x64";
-        version = "9.0.9";
-        hash = "sha512-K8QFb8DhBzFouXazTEFy3Y2TVE2HjY3XTeuZRHwk6ySHos+TXZZA6EHXhnn+u39zgTMQaSD7LQIswHYHIfdobw==";
+        version = "9.0.10";
+        hash = "sha512-N1q/arfVktI+TQQrYDrMIiiFcmvgVvG6c16jYYaI3M9Ca3pSR8CVrtHYGpPNliDLlNMesFwmqlFq3oiFZ4Crgw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.linux-musl-x64";
-        version = "9.0.9";
-        hash = "sha512-09cNAKRq9I8jqY+7KyMvKn1/QRExtF+KGO4NvqJDZquH9DvHowIhbKc9sktEEiviJ25zEI9EXT8VIq+6Y2iUfA==";
+        version = "9.0.10";
+        hash = "sha512-MSaeWizOepQBNsHNgwkOH+jDAjLhuEVDxpqJSXaHsbcoYRwb2QGZWrIhhWPCPJtDxfMGaF9/tCeb2eJO/rYpkA==";
       })
       (fetchNupkg {
         pname = "runtime.linux-musl-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-nGpqXHHhhWzlTBFsK47TSU0H7j3ShOTTlT6iaM7qquoCur7+ycLSW4g4GwcnD0mPAX/0khW31WLbzosQSP1+nw==";
+        version = "9.0.10";
+        hash = "sha512-5bndNosFdT6vueS0dA30cpcl3Lm8o+BkmXhAFmnr43xxYWThqpkPz+pCgZVs3GSaglXyRPr0QHfSvhXbLkOWTA==";
       })
     ];
     osx-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64";
-        version = "9.0.9";
-        hash = "sha512-aeVhbXDevdrsKqRyFqiNwY0YXevA+z0VYmT4IsW51UtmnvJ56iPByoJYdSrz0leYTSYROZofTJmx2bkQ0uKwiQ==";
+        version = "9.0.10";
+        hash = "sha512-dtl0t5l+FX3XcXBhZChlNCZlEKQtNA14/VDG54z6d74OOwpygN+IxVI/q5awpwnZU4hNsTo4FZWXFZFzkF5f9A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-arm64";
-        version = "9.0.9";
-        hash = "sha512-xileSZyCIhYQJy4IXAsMZ+OktYWnz5wzTNsTKseA6q/maRZoqNTLNu52gBT4fYlMHiAKMahXymVuPbS4sGwmIA==";
+        version = "9.0.10";
+        hash = "sha512-srvSV4GOoME1JBtmxgenTv8gOyBGJohVrjvCfp3rAy8VZFFe30nt2fdCAcswisxWrqMYMxe1YtbhRo+Wc6Xydg==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-arm64";
-        version = "9.0.9";
-        hash = "sha512-tPSjzec3eQ5yl2s31JWBMQ7eU+uYwHwwR11/IUnkJJhYucFtOwEcbtsN1YQhIPEUNFqDJb59+/UZ1SyAqHe9eg==";
+        version = "9.0.10";
+        hash = "sha512-h8NNNJt9ZdJziuRKYA/+HkOhjAABktWpUPbFB/80Xg4gGWvQhdnAgBaQgMaJ1wB7p4l2Ar3EnkRhrx/P7Q+ASg==";
       })
       (fetchNupkg {
         pname = "runtime.osx-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-cbIksRu6+gRPYnaSSeXzUbsmPqShDmmqO8y590qKa1yL+SELQQwQ5NyhsMw6b40VpAzjNtB2IQsTW5s77+gYzA==";
+        version = "9.0.10";
+        hash = "sha512-CBE1dJLOTApv3TfPanklJERgxEbd75d/xJhIrstGdQt6po8YVVVRNUK+4/TCdIRaBNkHb1HnoZ/VJCYDc8IrBA==";
       })
     ];
     osx-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.osx-x64";
-        version = "9.0.9";
-        hash = "sha512-Ro/9lBic5EUjAd5tEgQJF5KDtO4B6a/g2CiHt41S8tMddQ71VHuBAvfH9HoHrdJWXK9kkBzqV+gXNqsfariD4w==";
+        version = "9.0.10";
+        hash = "sha512-59O6WHQ0qD5Bcasqf4gSgdvQSZAHwzpMyl4q320J+NOw+wkt+C1A3PbdGpFQDXKTm4b30K/wwhgHWIxDeP8fnQ==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.osx-x64";
-        version = "9.0.9";
-        hash = "sha512-HLRXCdV8JHuZCDAyQC4mW0h/dx8Al9h1zZw7HQBd7Q3RZb29myQr0CWvyXgunMKkMBOI79SvfJe3qKfawwyerQ==";
+        version = "9.0.10";
+        hash = "sha512-UHzJKuK6hMq8YkwUFWv9VGQQJKxjlxmy5otAkPUzU7XAPljORlcawf2jX3ax5pfYBR9/npx47UyBGysL0lTw0g==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.osx-x64";
-        version = "9.0.9";
-        hash = "sha512-4BWz2/9630bM3jT0eYeNWUeFTzS/aUnDhHLu7oIabp7DuRO6QY8uOQHdfqZyuRrDloNTXWGskMIm8a17NHAwvg==";
+        version = "9.0.10";
+        hash = "sha512-hWAGbrhPv0wl0cxtOgkRMQsmvxYd0W/K80ImV1nteJKSg9qZf+jaFvXOadTA4bp67pEt8k6Jf88CQObhFw8LHw==";
       })
       (fetchNupkg {
         pname = "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-f8yHrJ0nPQ6VweI6J0F9SsZbzFaekmX+ljSpyz/rHo3RwtTe5ag32wBxJu6yweXkW/co8zFKQyC94s413/RwLQ==";
+        version = "9.0.10";
+        hash = "sha512-7onIdFISoMLBVssn0VkktcccyDwhVj0zy4pPCbV6VsA3z1aDeL2uK7mjAnP7H3baZmhMp9Y82clpULg84M6ciA==";
       })
     ];
     win-arm64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-arm64";
-        version = "9.0.9";
-        hash = "sha512-JT2kFQLUwkaGjEWYNQT4w9xCe6qgn7KnkVswIcmq+BCsnj1GNkR5eiTS1J9WMbKdCOafFuxR+4GeWJgBUrs2Og==";
+        version = "9.0.10";
+        hash = "sha512-PnMUZ/8D1M2EQ/Y90ZYLBsloPYaFhsrTfCnXooDk9ncFO4fEQ5m4Wyr22Y6Fcd8wMaZ6qeTIvHrT8nxkqy45fw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-arm64";
-        version = "9.0.9";
-        hash = "sha512-l/3rxZ4z7ektuLBC1jy6q/JrB9avNZLkY/TakGRmuV0klv1Uepbj8lJPnYm02IOlYJ+oyhWGFjeVzAhmTmr9FA==";
+        version = "9.0.10";
+        hash = "sha512-BiM7R6HEkg/0LopnCfkZ4gftoTJKy/CVbimDiAaOi65QQny10piKhYVBxuYIYgIeXgrMM0/yG0uJ+Oga4wFlWw==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-arm64";
-        version = "9.0.9";
-        hash = "sha512-SsKEfphdtBw16QyRLTAbVht3LifNGZ/IllQqVSX5DG7qD2BxJ3//qoboNOmpupf7JsZQe3fWKObWoNdcUYpmGg==";
+        version = "9.0.10";
+        hash = "sha512-esRCulo1jzqjLsJIlyv6G5Vm2N1/4c73uHxXBwypsGQQv1mWiH662dhEWQYxFMzPvj16xbZFKFnzWH7GXg9nsQ==";
       })
       (fetchNupkg {
         pname = "runtime.win-arm64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-isb8z7xhoL13Rtm8ZCzVCTWf5fWjyMERGkDqQNoQics33WfcCp3HgVRL5Gufr63lg+JFKz49q0C0LSa59pkSkA==";
+        version = "9.0.10";
+        hash = "sha512-CHZo6vpuOUcFSxICauu0acyT5cNXULDhChXAjbWQ7HTYqQ0wwG2KrccbNgI3Z23P8WzInGOhcSANsmkQONuTAw==";
       })
     ];
     win-x64 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x64";
-        version = "9.0.9";
-        hash = "sha512-aHeIlK4Ve8U503fKPmZghAIeN3Ws/9iRLmsey5ObIS4UkR7+lFZDoCFAcqWKCi+UAQERLudqorKkHWLsAWytsg==";
+        version = "9.0.10";
+        hash = "sha512-CSu9MZsgF8JosvF4gcYcupqOhMPw9MQZVCC4o1rEVeNHd8xuBrNYLTHfG+fhM0/HHHXPG7FinGOfFzVeKMvJOA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x64";
-        version = "9.0.9";
-        hash = "sha512-VaEZPPqvJasmjS2URZzIhF89xVqx4FywxeWaXTIhNSJ6lbgyZ7L7s558fii+L/7nTQ2fOXARKZykSHeLvPBMlQ==";
+        version = "9.0.10";
+        hash = "sha512-Vm2zCt45BN6M2kRj7XYiq7ZjGisRMo53+4uhp0hAepJIgg/r5layecEfu1H2USKT9BS36cID6fy1CDqtPoL9JA==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x64";
-        version = "9.0.9";
-        hash = "sha512-M3umAJUMNf59Vb28nAU+QLT30NP41jd9HaJ8MQi4Kf8ncJ6P8obpwSjMgS71ZtqSZBT2pNXAo/FU3xjzIQ6K4w==";
+        version = "9.0.10";
+        hash = "sha512-r6SDNsf07SZ9zBkmZ4nvc/Ad9hN3P12nuo62CKW6AK8gyEyLPfbzcNBob+4QWRBEMCF0ZqOqVQyEKsUiw6Ll7A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x64.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-EfonSMd6dCLyyUuscaCtE1h0NTYE1RjeLPVU2NHXw3vBRy0w2lSTNqJp83bT+2rejSpw3L0FU0jMmt2w9UhbhA==";
+        version = "9.0.10";
+        hash = "sha512-jC9MjbCbm0PREfwQFCyPskKzBEKfQKNO2Mo3LW4csYOTGCRJq+UOTbgxDWJd0/nOhvYBmwqvXFayebZvbfJd0g==";
       })
     ];
     win-x86 = [
       (fetchNupkg {
         pname = "Microsoft.AspNetCore.App.Runtime.win-x86";
-        version = "9.0.9";
-        hash = "sha512-0fcf+gMcarIvA1WT9bj2Zf3as4lz2xUAp2KAM5D/qq5ZYcH2WqIJHH5FTAcDNZ6fFziDad+ufuR0z2KCjNiQ2Q==";
+        version = "9.0.10";
+        hash = "sha512-AHcgn7jZreQG1h//VMxStIK841EV5redVIP8npSbiuePf+5xHHFiqPnY5KsHvsSxZqPx8WZS79Txjo/pRE+Z2A==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Host.win-x86";
-        version = "9.0.9";
-        hash = "sha512-QCrojepAqm6pzOipcLvYOz0WzlqrfW9rQa0s9bjQ905i1AYIxGE65yg8jVJwDkJofPp3sKSNIyQXY/2fb5ffKg==";
+        version = "9.0.10";
+        hash = "sha512-y1oG3/v+po2IyJr3uvqCaA8m0QSHTApY4riwzKjjlZNQFE3rsdg9Nt0K4KpoTw6pohokl8zR+LCPnCao2Zf36Q==";
       })
       (fetchNupkg {
         pname = "Microsoft.NETCore.App.Runtime.win-x86";
-        version = "9.0.9";
-        hash = "sha512-tISq/TnUjXKtrDy2AKTjQuavexCpspcuylFZ4ySov3HEgCGmPA8v6JYhIRR6yAKuAJy0tvL4wt8W8kvOgPGpog==";
+        version = "9.0.10";
+        hash = "sha512-NdHZ7L4Os4lHzlc3SQloTiI/AqHSoiZG2bN8i62dfbM+CXCrBtPG6ZeJN2HMGrCpkvuAQOo5svV7RP71PqtL4A==";
       })
       (fetchNupkg {
         pname = "runtime.win-x86.Microsoft.NETCore.DotNetAppHost";
-        version = "9.0.9";
-        hash = "sha512-VaPzur2V/itmMg81CVVTNyJ2JG8N+HceVL4BLGEiF02mRo8Th9JOTjU74YzpURJ+W0Ubdt2AR7rLWSmBNCGMKQ==";
+        version = "9.0.10";
+        hash = "sha512-uXVdcOr5womf6l2CUE+J489BgVUIUegZGQ0oMvd5wYA33AuznTmK+PBsEgqFpCmbi0pqbCiftvcg9LA8HOyt/w==";
       })
     ];
   };
 
 in
 rec {
-  release_9_0 = "9.0.9";
+  release_9_0 = "9.0.10";
 
   aspnetcore_9_0 = buildAspNetCore {
-    version = "9.0.9";
+    version = "9.0.10";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-arm.tar.gz";
-        hash = "sha512-3ipS6kqbhyrb4hcJ1uHYhzHkIFcDe4Jvk9ucmLDujRDrMVn73IQhNF8pfPo11pKnNr5l4WRU2y5NNAs7uSjM4Q==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-linux-arm.tar.gz";
+        hash = "sha512-DrJyEIKTz1e3aAjWMzTphRd/CaaV0I+ugXdIy0iuxdisN+CNxsx9wIosoJDT8piG49/Hq/LsBxj9SCFYhxQsbg==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-arm64.tar.gz";
-        hash = "sha512-zS0k4W7f29NCh6SuJeClF6rxu/oP/U07x+rGPYXdVE1DsS0IGqJBmvE6wn/bUk+Rjs8v36kWA5rtZtUCMYpy7g==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-linux-arm64.tar.gz";
+        hash = "sha512-7yaWobgIAxLoevi/EzWXGkmgt9B0sKYnZHPljlRg7LVdGQhBPTTTJlxt1c/IwcYKsE/LUJyUCyDmHqWuSdBJJg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-x64.tar.gz";
-        hash = "sha512-f/G1F8RbLHcg/BvoCIQsW39kT/kTjyIYYmIOI2YNtSi1lh95FDSqdYhcgI7LO/nSE6M+j/PqpHfffWJW0hWmxA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-linux-x64.tar.gz";
+        hash = "sha512-uhsYTzvBx9QjGGJA+jDkrNC4OS6MYbe1k7jRL4rMxl3M/NQSDZuewlw6J430+68yT/LPG405l6JEF+squy2AQw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-arm.tar.gz";
-        hash = "sha512-joG2ImzqEELoXG8y/t5fVx4Zq0Sr68soQbclKTCP59PYS2d8GdEvVzo3eA/cOw/nvDkiw6Ac8ItdV6WcGOrDGg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-linux-musl-arm.tar.gz";
+        hash = "sha512-q2Jy7eY+qfSikE16ZdEBCpdJ/cTBozgRl+63reQDE4c5WbGSh9qnBLpRBko0QBEupnrrPbMyj1eZFz/WGt1cIA==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-arm64.tar.gz";
-        hash = "sha512-4y2qLqw+0y1yyTUY8ytx88DvfqUkXwTo6eHWshDaFJNAB5ZwoQiFzEDYsSKuiY+Q+cnqtirGSVA9mvEyeW8UaA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-linux-musl-arm64.tar.gz";
+        hash = "sha512-tU5MHks/k76nrKe5SBGKAEikoDt+AP8eGfIBpXCH4Ozx5VDdBU3JyE/E15I/gEWtoDnyVzoivjaoR9zWv4psgg==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-linux-musl-x64.tar.gz";
-        hash = "sha512-rZBDC4/Enl8DVK+JPhVd6z59nmUKCKgRJZVuVc34ghQI1OnWAq5tJ7Jd+HBe0qTKglDakIax0ycKtffQmQ5Ulw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-linux-musl-x64.tar.gz";
+        hash = "sha512-sptOMWM0mv9ZrZnax6B6O5qO6hUwYOVXP+LGh0+FaZQHI6HyLdcDVLIGK6jsBVhgs0Xdy49F8Qgrg6RdDECfdQ==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-osx-arm64.tar.gz";
-        hash = "sha512-HtiNUoiZPve4Hc9mKUJoTTBx0WC0p3pvwvC8r4tgjCr/hi7MuB9CjxhBA127FAaeDuV1JXLjLmqrAYqNOq/OXg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-osx-arm64.tar.gz";
+        hash = "sha512-Vqzoaf3qwKkzfSl0qEk9AEH0WtSsDc6gHBYsTYzrl3BpfGqCzgg321B3ZlbiOy5G758F/HscrVaq+O97LojsxA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.9/aspnetcore-runtime-9.0.9-osx-x64.tar.gz";
-        hash = "sha512-wl7EpMuh2GfWvXkH0LGokDyLOMNJyy1xvnCgcukbWURrhCZ2DOvWpfOHHzWpzF3lDpf3LCBF4D5lAV5kJJaiSw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/9.0.10/aspnetcore-runtime-9.0.10-osx-x64.tar.gz";
+        hash = "sha512-W77nh80jQNKE1UgYEP6KGM5ohYx6i3fLbayL7Njc8j2CXOE9DFIw17nN4kIu+fJAxbjbJG9e5FFOWoQeVSWXcQ==";
       };
     };
   };
 
   runtime_9_0 = buildNetRuntime {
-    version = "9.0.9";
+    version = "9.0.10";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-arm.tar.gz";
-        hash = "sha512-rJxs5NQ+i8YuZT00XTK1QYaUTvd4cR9/g1Lfvj5fuoY/jgiHcdKe+/0t9x2hUShhshAvddKnS7KI1RCx+ilFhA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-linux-arm.tar.gz";
+        hash = "sha512-ieTvCRmRC4aMnHxH4pnJs0F0fs8fz8Xp38VPW1a61AqcrIPl9URkTRqNqhaY4td9T7Qg74F3R/hRAQPh8SJyMw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-arm64.tar.gz";
-        hash = "sha512-SGjAZGfLXbDHDUA3Yxdl1jn24Pq3gNNjHwSyL/Ov7/iKpbmQBIhtoG9uRDlngZI0xFkV0pKcBm7dhST+JcUdCw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-linux-arm64.tar.gz";
+        hash = "sha512-ew2QitVOBIQKbOavzyGlIwnr2hCTEhimal4vY8Pf3o1dJn9QPi+oLi4raBmpIFJSXRQzQYbXfAh40C/H11S5aw==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-x64.tar.gz";
-        hash = "sha512-T69+YViA42gGgeGBCOjxKIB0/UPmrAzRwkS1bov/em6ovaKnHs2EvACRCUq8v3kqnaH6rycf1DEpdzZC4nsl1w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-linux-x64.tar.gz";
+        hash = "sha512-bOs13cb04sA5o4eeLxj+c/QnuSS4aLAwm/YffSNjbknVK1zbq12X+LTgh2mr886CHnrNgCIl74SIJqAWXGynwg==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-arm.tar.gz";
-        hash = "sha512-1EbSMp9px1XSzzCXqO0mi65mvHMegt0otm5oePqhPV0Ik96QZv+eX+qd0g8Fg25oIgnNXrSjlpv4d3qSXeTnfg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-linux-musl-arm.tar.gz";
+        hash = "sha512-cfWfV0HMlJ7RsMGDQeja5bLL1i/yVeyBgfk6y3dVSY7Oa5cW6OeUthpBEdUyZ9NzHSymoB/JFVHMNa2cVZaCFw==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-arm64.tar.gz";
-        hash = "sha512-kybCaV4zt8GECzPBUJFn52Y5H97uETHL1kuNwSLB/l04y3Dp96bc808yylipYOlTWlLQ3XXyxNMwBQQxE9vJZg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-linux-musl-arm64.tar.gz";
+        hash = "sha512-UeOls1JOw5S4hBwhJlr8xwc9bkYKPBxm7Yysh7nxdZ/qXbb0fETCsOFu5YB5C+iehnSz/xTdS82G1sZHUbH2hA==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-linux-musl-x64.tar.gz";
-        hash = "sha512-o30yHsCQ8PlHJkYyCT21xohfkT2gNsvUcSL766vHVMFQqsSYxLce/W9kGW4RFKOXx+OW03Ause0AWA67FQ7Myw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-linux-musl-x64.tar.gz";
+        hash = "sha512-bTZhDomqc7dGXMaEvlgjDG625E+UXoL9SHeU3KtlVumszYmjUabSpL63DWlXxpJLBj4evewIIqbRxMN+qigIZw==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-osx-arm64.tar.gz";
-        hash = "sha512-wJWKMlJ9/h9B2lctqQ3d7SpTTx5Ore31EpZS0QooFgYOMo1VG2VGeJr2cVlGJxL2lLXEL1Or7izEYZP7Q6IfIw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-osx-arm64.tar.gz";
+        hash = "sha512-zTNls2XAqCSP+8NLejaWmWnTMBMxxeTYb6OMjjVTaxWcWwyEy4u8aXS+iZiAa+vUx1VEbYF3+mEqxzA0fK3dGA==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.9/dotnet-runtime-9.0.9-osx-x64.tar.gz";
-        hash = "sha512-YsL2HrbB7d0y6hV3nGBWo/0zy9FP1U2bMAhjCkn5f4lQJs1Oy6g8lhAw39eDyuSA/nw2E0KNKIGlxa9O6n+j/w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Runtime/9.0.10/dotnet-runtime-9.0.10-osx-x64.tar.gz";
+        hash = "sha512-QxtbMnVNpR98VkXzC6GxmMtS2nwdT1dYGR7un8XJ3eXpKR7FxHSUpbMguIKwyLK64t1g3AlvnfZiiWsPIfEVuw==";
       };
     };
   };
 
   sdk_9_0_3xx = buildNetSdk {
-    version = "9.0.305";
+    version = "9.0.306";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-arm.tar.gz";
-        hash = "sha512-dxFj7TY8UaGrImqxQqGw/dCcZ14uCpedAsaBbLVC0Jwm01PvIBIbp6VtI1NN+WsGRcuUoGHXMWpWPjW8PnOwug==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-linux-arm.tar.gz";
+        hash = "sha512-RfZZR4AZYfjck8erfSiQbrNLC9lD4VX9cRO9lgMwS7mM0eq4DGurW/NlqpUSxnlvHoIL1cVCJlKaT5+Wz/6zHw==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-arm64.tar.gz";
-        hash = "sha512-u9pgPRChNOT+9FlyA0kZN7tPuu7hkPi23see54KSofUoqELtRLems3tJUXzxnHKFUQeMxrIcCystbYEfyV+cjg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-linux-arm64.tar.gz";
+        hash = "sha512-cmZ+tBZzCP7HgKn7tZoWCH0QFa+gnOdxoE4hZjeCyrvVnDlVh69oNdzB804uZ3x2XkTcxopEbSyqTtSkoOMp7g==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-x64.tar.gz";
-        hash = "sha512-+RQOFB1zHTfem24eqwslcm8LneJNKIikIAZJiA6eQ2ceuziXokn0MkwhTVbrPn8O8M+lazKFCpwDgRsh5jd7yg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-linux-x64.tar.gz";
+        hash = "sha512-u7a9w8gEjnzBiXWbQGJXg559S9a4sbpLza7qj5I0DmhVIxBD3XP5AhMMpTV69yuBC7UaTaTRMVopJ/+F+DHx1Q==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-musl-arm.tar.gz";
-        hash = "sha512-K9N86Ycyoe1dQQO5Pnz0Jb4RGsXSTxC930GeKFCQ6tZ3QRxTY1EnvmRTG6DFHRja8W0yCv7aigBRfwoukuwrhA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-linux-musl-arm.tar.gz";
+        hash = "sha512-tq4I4OE1WCVwBJ57QgtwAv1CVQmrUUoKxVp5vx6+6W45OBf2nGQy4/nL8kUI8Sb31ssX3EbrVgVyeZnW9sngmQ==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-musl-arm64.tar.gz";
-        hash = "sha512-7wAN4jGjrsvYTFAEBKD/9d7+9PZRbzifLb5CTKwn3J03xPGFa7p6/Uq3ltw5stkMULdjfzqaomjCRhWD3O8Yqg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-linux-musl-arm64.tar.gz";
+        hash = "sha512-LzcDOdzHjfrJl4dZrttGzhLjaj6wxafLSneQdruG0L6hpO/nBFsaaTptNpvsF2xxQiKDLHdqp5K8kwUj0Afsig==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-linux-musl-x64.tar.gz";
-        hash = "sha512-94d42Zee2EQ+EPV1uXpxicxjLhAjtWcQ9fuazQMCZ+GpKsZtM9RAD+4i5eNsitXVm30RAYV+IRcOt/1UA1JOCw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-linux-musl-x64.tar.gz";
+        hash = "sha512-wRWEtVk8+cKStgwvV50CbMyKCF3ZI140ECj7aWqIL/XgowaSOp+qAkkh1PwhYiaRDrXwevzpPpdOaA6fAAs23w==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-osx-arm64.tar.gz";
-        hash = "sha512-V/PWT88Dz9ysTkzg/ItVMlXdU4AHtuBdr39CWihqBE3lT/Z7HMyg6WAeZ+MigQzAWQIe+AWwLeg9WCi3hylBzw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-osx-arm64.tar.gz";
+        hash = "sha512-K7Xm7+mLzuVcM4Wsa7P93yt2/mXd9wXt0dcdY2dNz2quioYuLPyQ8jpvoLfI/hKwU+xGIlhL2JDdSuk3YvZD9w==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.305/dotnet-sdk-9.0.305-osx-x64.tar.gz";
-        hash = "sha512-asCTTDgBzp27WJJ5k0joAtZN7q9hqlaYJgLZ0v3n1mvdhVu9FWaWJhsGXwxq1BQLHSlC17z+8MWjDCO/1f/QYw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.306/dotnet-sdk-9.0.306-osx-x64.tar.gz";
+        hash = "sha512-qXAPmOWqT3CyoI3borHGCFEGsNF4KL1xn9zvRgsGyJCzLXUvv/jkZZzRykF0tLIRswH+aCQ56poktlIcpaZMaQ==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
@@ -523,39 +523,39 @@ rec {
   };
 
   sdk_9_0_1xx = buildNetSdk {
-    version = "9.0.110";
+    version = "9.0.111";
     srcs = {
       linux-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-arm.tar.gz";
-        hash = "sha512-7MKKzj1ADdYEjkod5P7dCjpPNEgkBI4gk4WZug+Ar6b0thBYQ3vHEQaaWQnu2IoIg7TaGG4KwQSr7AxaNJg9Dw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-linux-arm.tar.gz";
+        hash = "sha512-/IaiIgIsWRhN5VTG/l3yCifS3W+6pjTWb8me5KXydH49HoMoTzdhqg1SkmHeUscZk7i7cvtu0sujliTwnjTp0Q==";
       };
       linux-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-arm64.tar.gz";
-        hash = "sha512-Pia+La8ITGul2TLmqBbhXPyZfw2o7PfyxPyYSqJdXKOEHSvxpLuUirXisonvJ6N6Tz6rhA2WDu9oaDbJ0lV0Yw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-linux-arm64.tar.gz";
+        hash = "sha512-/4A5uvVy4o6OdPBiimxrL36J3uugLO6zyFGAHmxgvJAPkKwso3c+Kdij46lzUKq1JOvyn5HFvbsuwuEO+UXBkg==";
       };
       linux-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-x64.tar.gz";
-        hash = "sha512-7UOpQly1Qk2W1PTMFlVL6G+nqezUTPEC13x1d50QNrNmNLZv2IX8qTOAAxgYdBsxj5UyKjynHg0Uzr2/6yLkCA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-linux-x64.tar.gz";
+        hash = "sha512-kngglXr9840rTNs8oNJM5x1ngh9Qp/cUE8OOYnuHdAxam7DiQEmL63q6U2vBy6wOfdQbMCXs+GQ8TuQOlz0pYw==";
       };
       linux-musl-arm = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-arm.tar.gz";
-        hash = "sha512-VGJHpI+OUm/UmGlgTMA6aHdFgobl8C4V49rtf2MdTtd80qztDIstg61nczL068PTvpW85VPO31F3qtZsxKXx9w==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-linux-musl-arm.tar.gz";
+        hash = "sha512-eUwJze9/itrIWjqOcACWzqA2PK6cKLQACQYZeJfnSBlqN03KnW/uJWfcO4JJCRXj0UqzWV/tQQduL1eZXPDkSg==";
       };
       linux-musl-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-arm64.tar.gz";
-        hash = "sha512-StOknkxvDoLRMcH9QuHWZ1kYH1M2qnBUsuUD/B4/YMVpFDadpT/8B4hisOtIjcw/RIVOXp9k0haU2HQ2C+rwkw==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-linux-musl-arm64.tar.gz";
+        hash = "sha512-n5Gx/KaRbRjzbITBRLO1AZ363f8gFv8K1N79LvohQ4BuO8oZNxfG5iAG9bpPEkr6nr5MLxH5VA994+uwbqPrKw==";
       };
       linux-musl-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-linux-musl-x64.tar.gz";
-        hash = "sha512-n3rnIENhsiIZekinlrgobNrfWI6XLXhlZk2Ev1UqrUTexok9B4cce8Qx2A7l4zxn6+VBh6VD4/nsiKStGs1/Zg==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-linux-musl-x64.tar.gz";
+        hash = "sha512-+AmEq2w0Ipcd6fI1kvyR4wtxOQBu1P7IEaGTa7cKLeAjyv28oaz0gHi6gvwWgZefwUHPCbft2zMx8tF23hTm5g==";
       };
       osx-arm64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-osx-arm64.tar.gz";
-        hash = "sha512-Sc1ZgBa1hO/JRG/W/GEnmeW0YqxB/cmHmaavjHATIaBhmYJ+HlDRJp8ddFbjkysR9gT/O0Lw2anErHwgR0pJkA==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-osx-arm64.tar.gz";
+        hash = "sha512-WW3TP1oLkR6uN7u3isSd7CE0IG4VhhPJs+NDE6LuG9Zng1jqX8VOl4lucNJGRqc8TRrqTA2BT/494IwZtdsO2w==";
       };
       osx-x64 = {
-        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.110/dotnet-sdk-9.0.110-osx-x64.tar.gz";
-        hash = "sha512-3i/spTBHsFyhcQZ/2h3ONPE2elQ/K7xqBwUXS+aA3U1rxrmcfYzPaL/agi9Jj8ZFm4sMbD0j2tuOMBFRkfR5ug==";
+        url = "https://builds.dotnet.microsoft.com/dotnet/Sdk/9.0.111/dotnet-sdk-9.0.111-osx-x64.tar.gz";
+        hash = "sha512-Vuo+OdD89Kv0g+f9kZhbhjluKmISHq2Za4uQlHZMqI1a0gV6k8pUyzPLUDoHB0gLknJ9rNSaBN7JZVhOn7cyRA==";
       };
     };
     inherit commonPackages hostPackages targetPackages;
diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix
index 5f1882e777eb..dfa746b215f0 100644
--- a/pkgs/development/compilers/dotnet/vmr.nix
+++ b/pkgs/development/compilers/dotnet/vmr.nix
@@ -18,7 +18,6 @@
   darwin,
   xcbuild,
   swiftPackages,
-  apple-sdk_13,
   openssl,
   getconf,
   python3,
@@ -112,15 +111,12 @@ stdenv.mkDerivation rec {
     krb5
     lttng-ust_2_12
   ]
-  ++ lib.optionals isDarwin (
-    [
-      xcbuild
-      swift
-      krb5
-      sigtool
-    ]
-    ++ lib.optional (lib.versionAtLeast version "10") apple-sdk_13
-  );
+  ++ lib.optionals isDarwin [
+    xcbuild
+    swift
+    krb5
+    sigtool
+  ];
 
   # This is required to fix the error:
   # > CSSM_ModuleLoad(): One or more parameters passed to a function were not valid.
@@ -145,15 +141,6 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (lib.versionOlder version "9") [
       ./fix-aspnetcore-portable-build.patch
       ./vmr-compiler-opt-v8.patch
-    ]
-    ++ lib.optionals (lib.versionAtLeast version "10") [
-      ./bundler-fix-file-size-estimation-when-bundling-symli.patch
-      (fetchpatch {
-        url = "https://github.com/dotnet/runtime/commit/118eacc4f40f1ef48b47c0b7ff40ac0b3ae8c28a.patch";
-        hash = "sha256-5sRGEpULAgjDjU1LKm7Pcx3Qfbr891CB9apOpYdzPyA=";
-        stripLen = 1;
-        extraPrefix = "src/runtime/";
-      })
     ];
 
   postPatch = ''
diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix
index 16d8441af83b..e4cf6e158f71 100644
--- a/pkgs/development/compilers/dotnet/wrapper.nix
+++ b/pkgs/development/compilers/dotnet/wrapper.nix
@@ -19,7 +19,6 @@
   nugetPackageHook,
   xmlstarlet,
   pkgs,
-  recurseIntoAttrs,
 }:
 type: unwrapped:
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -282,7 +281,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         };
       }
       // lib.optionalAttrs (type == "sdk") {
-        buildDotnetModule = recurseIntoAttrs (
+        buildDotnetModule = lib.recurseIntoAttrs (
           (pkgs.appendOverlays [
             (self: super: {
               dotnet-sdk = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index 2b15b448538c..c26fa0a73d2d 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -71,10 +71,8 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
     ''
       export FLUTTER_ROOT="$NIX_BUILD_TOP"
       lndir -silent '${flutter'}' "$FLUTTER_ROOT"
-      rm -rf "$FLUTTER_ROOT/bin/cache"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache"
       mkdir "$FLUTTER_ROOT/bin/cache"
-    ''
-    + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
       mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
       lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
     ''
@@ -89,18 +87,16 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
           flutter ? engine && flutter.engine.meta.available
         ) "--local-engine ${flutter.engine.outName}"
       } \
-        -v '--${flutterPlatform}' ${
+        --verbose '--${flutterPlatform}' ${
           builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))
         }
 
-      rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
-    ''
-    + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
-      rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache/lockfile"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache/dart-sdk"
     ''
     + ''
       find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
 
-      cp -r bin/cache "$out"
+      cp --recursive bin/cache "$out"
     ''
   )
diff --git a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
index 0a79a707bbaa..dbdd81ba596a 100644
--- a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
+++ b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
@@ -4,9 +4,9 @@
   ...
 }:
 {
+  # Use arm64 instead of arm64e.
   postPatch = ''
     if [ "$pname" == "flutter-tools" ]; then
-      # Use arm64 instead of arm64e.
       substituteInPlace lib/src/ios/xcodeproj.dart \
         --replace-fail arm64e arm64
     fi
diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
index a98fa1ff0487..64eb4072d24e 100644
--- a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
@@ -15,9 +15,9 @@
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin"
-    cp -r . "$out/bin/cache"
-    rm -f "$out/bin/cache/flutter.version.json"
+    mkdir --parents "$out/bin"
+    cp --recursive . "$out/bin/cache"
+    rm --force "$out/bin/cache/flutter.version.json"
 
     runHook postInstall
   '';
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 32e7581df049..1b3cd7eecfce 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -54,19 +54,19 @@ let
           sources = {
             "${dartVersion}-x86_64-linux" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-              sha256 = dartHash.x86_64-linux;
+              hash = dartHash.x86_64-linux;
             };
             "${dartVersion}-aarch64-linux" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
-              sha256 = dartHash.aarch64-linux;
+              hash = dartHash.aarch64-linux;
             };
             "${dartVersion}-x86_64-darwin" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
-              sha256 = dartHash.x86_64-darwin;
+              hash = dartHash.x86_64-darwin;
             };
             "${dartVersion}-aarch64-darwin" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
-              sha256 = dartHash.aarch64-darwin;
+              hash = dartHash.aarch64-darwin;
             };
           };
         };
@@ -75,7 +75,7 @@ let
             source = fetchFromGitHub {
               owner = "flutter";
               repo = "flutter";
-              rev = version;
+              tag = version;
               hash = flutterHash;
             };
           in
@@ -83,7 +83,7 @@ let
             if lib.versionAtLeast version "3.32" then
               # # Could not determine engine revision
               (runCommand source.name { } ''
-                cp -r ${source} $out
+                cp --recursive ${source} $out
                 chmod +w $out/bin
                 mkdir $out/bin/cache
                 cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp
diff --git a/pkgs/development/compilers/flutter/engine/dart.nix b/pkgs/development/compilers/flutter/engine/dart.nix
index 5d7d126cae02..4846392aa8ba 100644
--- a/pkgs/development/compilers/flutter/engine/dart.nix
+++ b/pkgs/development/compilers/flutter/engine/dart.nix
@@ -3,13 +3,10 @@ runCommand "flutter-engine-${engine.version}-dart"
   {
     version = engine.dartSdkVersion;
 
-    inherit engine;
-    inherit (engine) outName;
-
     meta = engine.meta // {
       description = "Dart SDK compiled from the Flutter Engine";
     };
   }
   ''
-    ln -s ${engine}/out/$outName/dart-sdk $out
+    ln --symbolic ${engine}/out/${engine.outName}/dart-sdk $out
   ''
diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix
index 6e90cc916ec7..0821bce822a5 100644
--- a/pkgs/development/compilers/flutter/engine/default.nix
+++ b/pkgs/development/compilers/flutter/engine/default.nix
@@ -9,12 +9,9 @@
   url,
   patches,
   runtimeModes,
-  isOptimized ? null,
   lib,
   stdenv,
-  dart,
-  mainRuntimeMode ? null,
-  altRuntimeMode ? null,
+  ...
 }@args:
 let
   mainRuntimeMode = args.mainRuntimeMode or builtins.elemAt runtimeModes 0;
@@ -41,25 +38,16 @@ in
 stdenv.mkDerivation (
   {
     pname = "flutter-engine";
-    inherit url runtimeModes;
-    inherit (runtimeModesBuilds.${mainRuntimeMode})
-      meta
-      src
-      version
-      dartSdkVersion
-      isOptimized
-      runtimeMode
-      outName
-      dart
-      swiftshader
-      ;
-    inherit altRuntimeMode;
+    inherit url runtimeModes altRuntimeMode;
+    inherit (runtimeModesBuilds.${mainRuntimeMode}) version src meta;
 
     dontUnpack = true;
     dontBuild = true;
 
     installPhase = ''
-      mkdir -p $out/out
+      runHook preInstall
+
+      mkdir --parents $out/out
     ''
     + lib.concatMapStrings (
       runtimeMode:
@@ -68,9 +56,23 @@ stdenv.mkDerivation (
         runtimeModeOut = runtimeModeBuild.outName;
       in
       ''
-        ln -sf ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
+        ln --symbolic --force ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
       ''
-    ) runtimeModes;
+    ) runtimeModes
+    + ''
+      runHook postInstall
+    '';
+
+    passthru = {
+      inherit (runtimeModesBuilds.${mainRuntimeMode})
+        dartSdkVersion
+        isOptimized
+        runtimeMode
+        outName
+        dart
+        swiftshader
+        ;
+    };
   }
   // runtimeModesBuilds
 )
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index 53438ed9794e..5814d29084a2 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   callPackage,
-  writeText,
+  fetchurl,
+  bash,
+  bintools,
   symlinkJoin,
   darwin,
   clang,
-  llvm,
   tools ? callPackage ./tools.nix {
     inherit (stdenv)
       hostPlatform
@@ -13,10 +14,8 @@
       ;
   },
   stdenv,
-  stdenvNoCC,
   dart,
   fetchgit,
-  runCommand,
   llvmPackages,
   patchelf,
   openbox,
@@ -49,18 +48,12 @@
   isOptimized ? runtimeMode != "debug",
 }:
 let
-  expandSingleDep =
-    dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs);
-
-  expandDeps = deps: lib.flatten (map expandSingleDep deps);
-
   constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; };
 
   python3 = python312;
 
   src = callPackage ./source.nix {
     inherit
-      tools
       flutterVersion
       version
       hashes
@@ -93,22 +86,11 @@ let
 
   outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt"}";
 
-  dartPath = "${
-    if (lib.versionAtLeast flutterVersion "3.23") then "flutter/third_party" else "third_party"
-  }/dart";
+  dartPath = "flutter/third_party/dart";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}";
-  inherit
-    version
-    runtimeMode
-    patches
-    isOptimized
-    dartSdkVersion
-    src
-    outName
-    swiftshader
-    ;
+  inherit version src patches;
 
   setOutputFlags = false;
   doStrip = isOptimized;
@@ -117,36 +99,39 @@ stdenv.mkDerivation (finalAttrs: {
     name = "flutter-engine-toolchain-${version}";
 
     paths =
-      expandDeps (
-        lib.optionals (stdenv.hostPlatform.isLinux) [
-          gtk3
-          wayland
-          libepoxy
-          libglvnd
-          freetype
-          at-spi2-atk
-          glib
-          gdk-pixbuf
-          harfbuzz
-          pango
-          cairo
-          xorg.libxcb
-          xorg.libX11
-          xorg.libXcursor
-          xorg.libXrandr
-          xorg.libXrender
-          xorg.libXinerama
-          xorg.libXi
-          xorg.libXext
-          xorg.libXfixes
-          xorg.libXxf86vm
-          xorg.xorgproto
-          zlib
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-          clang
-          llvm
-        ]
+      lib.flatten (
+        map (dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs))
+          (
+            lib.optionals (stdenv.hostPlatform.isLinux) [
+              gtk3
+              wayland
+              libepoxy
+              libglvnd
+              freetype
+              at-spi2-atk
+              glib
+              gdk-pixbuf
+              harfbuzz
+              pango
+              cairo
+              xorg.libxcb
+              xorg.libX11
+              xorg.libXcursor
+              xorg.libXrandr
+              xorg.libXrender
+              xorg.libXinerama
+              xorg.libXi
+              xorg.libXext
+              xorg.libXfixes
+              xorg.libXxf86vm
+              xorg.xorgproto
+              zlib
+            ]
+            ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+              clang
+              llvm
+            ]
+          )
       )
       ++ [
         stdenv.cc.libc_dev
@@ -156,19 +141,16 @@ stdenv.mkDerivation (finalAttrs: {
     # Needed due to Flutter expecting everything to be relative to $out
     # and not true absolute path (ie relative to "/").
     postBuild = ''
-      mkdir -p $(dirname $(dirname "$out/$out"))
-      ln -s $(dirname "$out") $out/$(dirname "$out")
+      mkdir --parents $(dirname $(dirname "$out/$out"))
+      ln --symbolic $(dirname "$out") $out/$(dirname "$out")
     '';
   };
 
   NIX_CFLAGS_COMPILE = [
     "-I${finalAttrs.toolchain}/include"
+    "-Wno-error"
   ]
-  ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"
-  ++ lib.optionals (lib.versionAtLeast flutterVersion "3.35") [
-    "-Wno-macro-redefined"
-    "-Wno-error=macro-redefined"
-  ];
+  ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE";
 
   nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
     xorg.xorgserver
@@ -195,77 +177,93 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (stdenv.cc.libc ? bin) [ stdenv.cc.libc.bin ];
 
-  buildInputs = [ gtk3 ];
+  buildInputs = [
+    gtk3
+    libepoxy
+  ];
 
   patchtools = [ "flutter/third_party/gn/gn" ];
 
   dontPatch = true;
 
-  patchgit = [
+  env.patchgit = toString [
     dartPath
     "flutter"
     "."
-  ]
-  ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia";
+    "flutter/third_party/skia"
+  ];
 
-  postUnpack = ''
-    pushd ${src.name}
+  sourceRoot = if lib.versionAtLeast flutterVersion "3.38" then "${src.name}/engine" else src.name;
 
-    cp ${./pkg-config.py} src/build/config/linux/pkg-config.py
+  postUnpack =
+    lib.optionalString (lib.versionAtLeast flutterVersion "3.38") ''
+      chmod --recursive +w ${src.name}
+      echo '#!${lib.getExe bash}' > ${src.name}/bin/internal/content_aware_hash.sh
+      echo 'echo 1111111111111111111111111111111111111111' >> ${src.name}/bin/internal/content_aware_hash.sh
+    ''
+    + ''
+      pushd ${finalAttrs.sourceRoot}
 
-    cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader
-    chmod -R u+w -- src/flutter/third_party/swiftshader
+      cp ${
+        fetchurl {
+          url = "https://raw.githubusercontent.com/chromium/chromium/631a813125b886a52274653144019fd1681a0e97/build/config/linux/pkg-config.py";
+          hash = "sha256-9coRpgCewlkFXSGrMVkudaZUll0IFc9jDRBP+2PloOI=";
+        }
+      } src/build/config/linux/pkg-config.py
 
-    ln -s ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project
+      cp --preserve=mode,ownership,timestamps --recursive --reflink=auto ${swiftshader} src/flutter/third_party/swiftshader
+      chmod --recursive u+w -- src/flutter/third_party/swiftshader
 
-    mkdir -p src/flutter/buildtools/${constants.alt-platform}
-    ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang
+      ln --symbolic ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project
 
-    mkdir -p src/buildtools/${constants.alt-platform}
-    ln -s ${llvm} src/buildtools/${constants.alt-platform}/clang
+      mkdir --parents src/flutter/buildtools/${constants.alt-platform}
+      ln --symbolic ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang
 
-    mkdir -p src/${dartPath}/tools/sdks
-    ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk
+      mkdir --parents src/buildtools/${constants.alt-platform}
+      ln --symbolic ${llvm} src/buildtools/${constants.alt-platform}/clang
 
-    ${lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      for patchtool in ''${patchtools[@]}; do
-        patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker)
+      mkdir --parents src/${dartPath}/tools/sdks
+      ln --symbolic ${dart} src/${dartPath}/tools/sdks/dart-sdk
+
+      ${lib.optionalString (stdenv.hostPlatform.isLinux) ''
+        for patchtool in ''${patchtools[@]}; do
+          patchelf src/$patchtool --set-interpreter ${bintools.dynamicLinker}
+        done
+      ''}
+
+      for dir in ''${patchgit[@]}; do
+        pushd src/$dir
+        rm --recursive --force .git
+        git init
+        git add .
+        git config user.name "nobody"
+        git config user.email "nobody@local.host"
+        git commit --all --message="$dir" --quiet
+        popd
+      done
+
+      dart src/${dartPath}/tools/generate_package_config.dart
+      echo "${dartSdkVersion}" >src/${dartPath}/sdk/version
+
+      rm --recursive --force src/third_party/angle/.git
+      python3 src/flutter/tools/pub_get_offline.py
+
+      pushd src/flutter
+
+      for p in ''${patches[@]}; do
+        patch -p1 -i $p
       done
-    ''}
 
-    for dir in ''${patchgit[@]}; do
-      pushd src/$dir
-      rm -rf .git
-      git init
-      git add .
-      git config user.name "nobody"
-      git config user.email "nobody@local.host"
-      git commit -a -m "$dir" --quiet
       popd
-    done
-
-    dart src/${dartPath}/tools/generate_package_config.dart
-    echo "${dartSdkVersion}" >src/${dartPath}/sdk/version
-
-    rm -rf src/third_party/angle/.git
-    python3 src/flutter/tools/pub_get_offline.py
-
-    pushd src/flutter
-
-    for p in ''${patches[@]}; do
-      patch -p1 -i $p
-    done
-
-    popd
-  ''
-  # error: 'close_range' is missing exception specification 'noexcept(true)'
-  + lib.optionalString (lib.versionAtLeast flutterVersion "3.35") ''
-    substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \
-      --replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)"
-  ''
-  + ''
-    popd
-  '';
+    ''
+    # error: 'close_range' is missing exception specification 'noexcept(true)'
+    + lib.optionalString (lib.versionAtLeast flutterVersion "3.35") ''
+      substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \
+        --replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)"
+    ''
+    + ''
+      popd
+    '';
 
   configureFlags = [
     "--no-prebuilt-dart-sdk"
@@ -281,7 +279,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-unittests"
   ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--no-enable-unittests";
 
-  # NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk"
   configurePhase = ''
     runHook preConfigure
 
@@ -292,12 +289,13 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + ''
     python3 ./src/flutter/tools/gn $configureFlags \
-      --runtime-mode $runtimeMode \
+      --runtime-mode ${runtimeMode} \
       --out-dir $out \
-      --target-sysroot $toolchain \
-      --target-dir $outName \
+      --target-sysroot ${finalAttrs.toolchain} \
+      --target-dir ${outName} \
       --target-triple ${stdenv.targetPlatform.config} \
-      --enable-fontconfig
+      --enable-fontconfig \
+      --no-prebuilt-dart-sdk
 
     runHook postConfigure
   '';
@@ -306,14 +304,14 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preBuild
 
     export TERM=dumb
-
-    ${lib.optionalString (lib.versionAtLeast flutterVersion "3.29") ''
-      # ValueError: ZIP does not support timestamps before 1980
-      substituteInPlace src/flutter/build/zip.py \
-        --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
-    ''}
-
-    ninja -C $out/out/$outName -j$NIX_BUILD_CORES
+  ''
+  # ValueError: ZIP does not support timestamps before 1980
+  + ''
+    substituteInPlace src/flutter/build/zip.py \
+      --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
+  ''
+  + ''
+    ninja -C $out/out/${outName} -j$NIX_BUILD_CORES
 
     runHook postBuild
   '';
@@ -321,28 +319,39 @@ stdenv.mkDerivation (finalAttrs: {
   # Tests are broken
   doCheck = false;
   checkPhase = ''
-    ln -s $out/out src/out
+    runHook preCheck
+
+    ln --symbolic $out/out src/out
     touch src/out/run_tests.log
-    sh src/flutter/testing/run_tests.sh $outName
+    sh src/flutter/testing/run_tests.sh ${outName}
     rm src/out/run_tests.log
+
+    runHook postCheck
   '';
 
   installPhase = ''
     runHook preInstall
 
-    rm -rf $out/out/$outName/{obj,exe.unstripped,lib.unstripped,zip_archives}
-    rm $out/out/$outName/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
-    find $out/out/$outName -name '*_unittests' -delete
-    find $out/out/$outName -name '*_benchmarks' -delete
+    rm -rf $out/out/${outName}/{obj,exe.unstripped,lib.unstripped,zip_archives}
+    rm $out/out/${outName}/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
+    find $out/out/${outName} -name '*_unittests' -delete
+    find $out/out/${outName} -name '*_benchmarks' -delete
   ''
   + lib.optionalString (finalAttrs.finalPackage.doCheck) ''
-    rm $out/out/$outName/{display_list_rendertests,flutter_tester}
+    rm $out/out/${outName}/{display_list_rendertests,flutter_tester}
   ''
   + ''
     runHook postInstall
   '';
 
   passthru = {
+    inherit
+      dartSdkVersion
+      isOptimized
+      runtimeMode
+      outName
+      swiftshader
+      ;
     dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; };
   };
 
@@ -359,6 +368,5 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
-  }
-  // lib.optionalAttrs (lib.versionOlder flutterVersion "3.22") { hydraPlatforms = [ ]; };
+  };
 })
diff --git a/pkgs/development/compilers/flutter/engine/pkg-config.py b/pkgs/development/compilers/flutter/engine/pkg-config.py
deleted file mode 100644
index 1df08211e570..000000000000
--- a/pkgs/development/compilers/flutter/engine/pkg-config.py
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-
-import json
-import os
-import subprocess
-import sys
-import re
-from optparse import OptionParser
-
-# This script runs pkg-config, optionally filtering out some results, and
-# returns the result.
-#
-# The result will be [ <includes>, <cflags>, <libs>, <lib_dirs>, <ldflags> ]
-# where each member is itself a list of strings.
-#
-# You can filter out matches using "-v <regexp>" where all results from
-# pkgconfig matching the given regular expression will be ignored. You can
-# specify more than one regular expression my specifying "-v" more than once.
-#
-# You can specify a sysroot using "-s <sysroot>" where sysroot is the absolute
-# system path to the sysroot used for compiling. This script will attempt to
-# generate correct paths for the sysroot.
-#
-# When using a sysroot, you must also specify the architecture via
-# "-a <arch>" where arch is either "x86" or "x64".
-#
-# CrOS systemroots place pkgconfig files at <systemroot>/usr/share/pkgconfig
-# and one of <systemroot>/usr/lib/pkgconfig or <systemroot>/usr/lib64/pkgconfig
-# depending on whether the systemroot is for a 32 or 64 bit architecture. They
-# specify the 'lib' or 'lib64' of the pkgconfig path by defining the
-# 'system_libdir' variable in the args.gn file. pkg_config.gni communicates this
-# variable to this script with the "--system_libdir <system_libdir>" flag. If no
-# flag is provided, then pkgconfig files are assumed to come from
-# <systemroot>/usr/lib/pkgconfig.
-#
-# Additionally, you can specify the option --atleast-version. This will skip
-# the normal outputting of a dictionary and instead print true or false,
-# depending on the return value of pkg-config for the given package.
-
-
-def SetConfigPath(options):
-  """Set the PKG_CONFIG_LIBDIR environment variable.
-
-  This takes into account any sysroot and architecture specification from the
-  options on the given command line.
-  """
-
-  sysroot = options.sysroot
-  assert sysroot
-
-  # Compute the library path name based on the architecture.
-  arch = options.arch
-  if sysroot and not arch:
-    print("You must specify an architecture via -a if using a sysroot.")
-    sys.exit(1)
-
-  libdir = sysroot + '/' + options.system_libdir + '/pkgconfig'
-  libdir += ':' + sysroot + '/share/pkgconfig'
-  os.environ['PKG_CONFIG_LIBDIR'] = libdir
-  return libdir
-
-
-def GetPkgConfigPrefixToStrip(options, args):
-  """Returns the prefix from pkg-config where packages are installed.
-
-  This returned prefix is the one that should be stripped from the beginning of
-  directory names to take into account sysroots.
-  """
-  # Some sysroots, like the Chromium OS ones, may generate paths that are not
-  # relative to the sysroot. For example,
-  # /path/to/chroot/build/x86-generic/usr/lib/pkgconfig/pkg.pc may have all
-  # paths relative to /path/to/chroot (i.e. prefix=/build/x86-generic/usr)
-  # instead of relative to /path/to/chroot/build/x86-generic (i.e prefix=/usr).
-  # To support this correctly, it's necessary to extract the prefix to strip
-  # from pkg-config's |prefix| variable.
-  prefix = subprocess.check_output([options.pkg_config,
-      "--variable=prefix"] + args, env=os.environ).decode('utf-8')
-  return prefix
-
-
-def MatchesAnyRegexp(flag, list_of_regexps):
-  """Returns true if the first argument matches any regular expression in the
-  given list."""
-  for regexp in list_of_regexps:
-    if regexp.search(flag) != None:
-      return True
-  return False
-
-
-def RewritePath(path, strip_prefix, sysroot):
-  """Rewrites a path by stripping the prefix and prepending the sysroot."""
-  if os.path.isabs(path) and not path.startswith(sysroot):
-    if path.startswith(strip_prefix):
-      path = path[len(strip_prefix):]
-    path = path.lstrip('/')
-    return os.path.join(sysroot, path)
-  else:
-    return path
-
-
-def main():
-  # If this is run on non-Linux platforms, just return nothing and indicate
-  # success. This allows us to "kind of emulate" a Linux build from other
-  # platforms.
-  if "linux" not in sys.platform:
-    print("[[],[],[],[],[]]")
-    return 0
-
-  parser = OptionParser()
-  parser.add_option('-d', '--debug', action='store_true')
-  parser.add_option('-p', action='store', dest='pkg_config', type='string',
-                    default='pkg-config')
-  parser.add_option('-v', action='append', dest='strip_out', type='string')
-  parser.add_option('-s', action='store', dest='sysroot', type='string')
-  parser.add_option('-a', action='store', dest='arch', type='string')
-  parser.add_option('--system_libdir', action='store', dest='system_libdir',
-                    type='string', default='lib')
-  parser.add_option('--atleast-version', action='store',
-                    dest='atleast_version', type='string')
-  parser.add_option('--libdir', action='store_true', dest='libdir')
-  parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir')
-  parser.add_option('--version-as-components', action='store_true',
-                    dest='version_as_components')
-  (options, args) = parser.parse_args()
-
-  # Make a list of regular expressions to strip out.
-  strip_out = []
-  if options.strip_out != None:
-    for regexp in options.strip_out:
-      strip_out.append(re.compile(regexp))
-
-  if options.sysroot:
-    libdir = SetConfigPath(options)
-    if options.debug:
-      sys.stderr.write('PKG_CONFIG_LIBDIR=%s\n' % libdir)
-    prefix = GetPkgConfigPrefixToStrip(options, args)
-  else:
-    prefix = ''
-
-  if options.atleast_version:
-    # When asking for the return value, just run pkg-config and print the return
-    # value, no need to do other work.
-    if not subprocess.call([options.pkg_config,
-                            "--atleast-version=" + options.atleast_version] +
-                            args):
-      print("true")
-    else:
-      print("false")
-    return 0
-
-  if options.version_as_components:
-    cmd = [options.pkg_config, "--modversion"] + args
-    try:
-      version_string = subprocess.check_output(cmd).decode('utf-8')
-    except:
-      sys.stderr.write('Error from pkg-config.\n')
-      return 1
-    print(json.dumps(list(map(int, version_string.strip().split(".")))))
-    return 0
-
-
-  if options.libdir:
-    cmd = [options.pkg_config, "--variable=libdir"] + args
-    if options.debug:
-      sys.stderr.write('Running: %s\n' % cmd)
-    try:
-      libdir = subprocess.check_output(cmd).decode('utf-8')
-    except:
-      print("Error from pkg-config.")
-      return 1
-    sys.stdout.write(libdir.strip())
-    return 0
-
-  if options.dridriverdir:
-    cmd = [options.pkg_config, "--variable=dridriverdir"] + args
-    if options.debug:
-      sys.stderr.write('Running: %s\n' % cmd)
-    try:
-      dridriverdir = subprocess.check_output(cmd).decode('utf-8')
-    except:
-      print("Error from pkg-config.")
-      return 1
-    sys.stdout.write(dridriverdir.strip())
-    return
-
-  cmd = [options.pkg_config, "--cflags", "--libs"] + args
-  if options.debug:
-    sys.stderr.write('Running: %s\n' % ' '.join(cmd))
-
-  try:
-    flag_string = subprocess.check_output(cmd).decode('utf-8')
-  except:
-    sys.stderr.write('Could not run pkg-config.\n')
-    return 1
-
-  # For now just split on spaces to get the args out. This will break if
-  # pkgconfig returns quoted things with spaces in them, but that doesn't seem
-  # to happen in practice.
-  all_flags = flag_string.strip().split(' ')
-
-
-  sysroot = options.sysroot
-  if not sysroot:
-    sysroot = ''
-
-  includes = []
-  cflags = []
-  libs = []
-  lib_dirs = []
-
-  for flag in all_flags[:]:
-    if len(flag) == 0 or MatchesAnyRegexp(flag, strip_out):
-      continue;
-
-    if flag[:2] == '-l':
-      libs.append(RewritePath(flag[2:], prefix, sysroot))
-    elif flag[:2] == '-L':
-      lib_dirs.append(RewritePath(flag[2:], prefix, sysroot))
-    elif flag[:2] == '-I':
-      includes.append(RewritePath(flag[2:], prefix, sysroot))
-    elif flag[:3] == '-Wl':
-      # Don't allow libraries to control ld flags.  These should be specified
-      # only in build files.
-      pass
-    elif flag == '-pthread':
-      # Many libs specify "-pthread" which we don't need since we always include
-      # this anyway. Removing it here prevents a bunch of duplicate inclusions
-      # on the command line.
-      pass
-    else:
-      cflags.append(flag)
-
-  # Output a GN array, the first one is the cflags, the second are the libs. The
-  # JSON formatter prints GN compatible lists when everything is a list of
-  # strings.
-  print(json.dumps([includes, cflags, libs, lib_dirs]))
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix
index 989953ce9d1f..1d90f21c89c0 100644
--- a/pkgs/development/compilers/flutter/engine/source.nix
+++ b/pkgs/development/compilers/flutter/engine/source.nix
@@ -1,12 +1,10 @@
 {
   lib,
   callPackage,
-  fetchgit,
-  tools ? null,
-  curl,
+  curlMinimal,
   pkg-config,
-  git,
-  python3,
+  gitMinimal,
+  python312,
   runCommand,
   writeText,
   cacert,
@@ -17,6 +15,7 @@
   hostPlatform,
   targetPlatform,
   buildPlatform,
+  ...
 }@pkgs:
 let
   target-constants = callPackage ./constants.nix { platform = targetPlatform; };
@@ -24,20 +23,46 @@ let
   tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; });
 
   boolOption = value: if value then "True" else "False";
+
+  gclient = writeText "flutter-engine-${version}.gclient" ''
+    solutions = [{
+      "managed": False,
+      "name": "${lib.optionalString (lib.versionAtLeast flutterVersion "3.29") "engine/"}src/flutter",
+      "url": "${url}",
+      "custom_vars": {
+        "download_fuchsia_deps": False,
+        "download_android_deps": False,
+        "download_linux_deps": ${boolOption targetPlatform.isLinux},
+        "setup_githooks": False,
+        "download_esbuild": False,
+        "download_dart_sdk": False,
+        "host_cpu": "${build-constants.alt-arch}",
+        "host_os": "${build-constants.alt-os}",
+      },
+    }]
+
+    target_os_only = True
+    target_os = [
+      "${target-constants.alt-os}"
+    ]
+
+    target_cpu_only = True
+    target_cpu = [
+      "${target-constants.alt-arch}"
+    ]
+  '';
 in
 runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}"
   {
     pname = "flutter-engine-source";
     inherit version;
 
-    inherit (tools) depot_tools;
-
     nativeBuildInputs = [
-      curl
+      curlMinimal
       pkg-config
-      git
+      gitMinimal
       tools.cipd
-      (python3.withPackages (
+      (python312.withPackages (
         ps: with ps; [
           httplib2
           six
@@ -45,40 +70,14 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
       ))
     ];
 
-    gclient = writeText "flutter-engine-${version}.gclient" ''
-      solutions = [{
-        "managed": False,
-        "name": "${lib.optionalString (lib.versionAtLeast flutterVersion "3.29") "engine/"}src/flutter",
-        "url": "${url}",
-        "custom_vars": {
-          "download_fuchsia_deps": False,
-          "download_android_deps": False,
-          "download_linux_deps": ${boolOption targetPlatform.isLinux},
-          "setup_githooks": False,
-          "download_esbuild": False,
-          "download_dart_sdk": False,
-          "host_cpu": "${build-constants.alt-arch}",
-          "host_os": "${build-constants.alt-os}",
-        },
-      }]
-
-      target_os_only = True
-      target_os = [
-        "${target-constants.alt-os}"
-      ]
-
-      target_cpu_only = True
-      target_cpu = [
-        "${target-constants.alt-arch}"
-      ]
-    '';
-
-    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    DEPOT_TOOLS_UPDATE = "0";
-    DEPOT_TOOLS_COLLECT_METRICS = "0";
-    PYTHONDONTWRITEBYTECODE = "1";
+    env = {
+      NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      DEPOT_TOOLS_UPDATE = "0";
+      DEPOT_TOOLS_COLLECT_METRICS = "0";
+      PYTHONDONTWRITEBYTECODE = "1";
+    };
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
@@ -92,38 +91,32 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
       export -f clean_git
       export -f make_deterministic_repo
 
-    ''
-    + (
-      if lib.versionAtLeast flutterVersion "3.29" then
-        ''
-          mkdir -p source
-          cp $gclient source/.gclient
-          cd source
-        ''
-      else
-        ''
-          mkdir -p $out
-          cp $gclient $out/.gclient
-          cd $out
-        ''
-    )
-    + ''
-
-      export PATH=$PATH:$depot_tools
-      python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES
+      mkdir --parents source
+      cp ${gclient} source/.gclient
+      cd source
+      export PATH=$PATH:${tools.depot_tools}
+      python3 ${tools.depot_tools}/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES
     ''
     + lib.optionalString (lib.versionAtLeast flutterVersion "3.29") ''
-      cp -r engine/src/flutter/third_party/* engine/src/flutter/engine/src/flutter/third_party/
-      mv engine/src/flutter/engine $out
+      cp --recursive engine/src/flutter/third_party/* engine/src/flutter/engine/src/flutter/third_party/
+      ${
+        if (lib.versionAtLeast flutterVersion "3.38") then
+          "mv engine/src/flutter $out"
+        else
+          "mv engine/src/flutter/engine $out"
+      }
     ''
     + ''
-      find $out -name '.git' -exec rm -rf {} \; || true
+      ${if (lib.versionAtLeast flutterVersion "3.38") then "pushd $out/engine" else "pushd $out"}
+      find $out -name '.git' -exec rm --recursive --force {} \; || true
 
-      rm -rf $out/src/{buildtools,fuchsia}
-      rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions}
-      rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java}
-      rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test}
+      rm --recursive --force src/{buildtools,fuchsia}
+      rm --recursive --force src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions}
+      rm --recursive --force src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java}
+      rm --recursive --force src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test}
 
-      rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits
+      rm --recursive --force .cipd .gclient .gclient_entries .gclient_previous_custom_vars .gclient_previous_sync_commits
+
+      popd
     ''
   )
diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix
index 4baf34b201f7..d0f0c1148754 100644
--- a/pkgs/development/compilers/flutter/engine/tools.nix
+++ b/pkgs/development/compilers/flutter/engine/tools.nix
@@ -9,25 +9,28 @@
   runCommand,
   darwin,
   writeShellScriptBin,
-  depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1",
-  depot_toolsHash ? "sha256-F7KDuVg11qLKkohIjuXpNdxpnSsT6Z3hE9+wFIG2sSk=",
-  cipdCommit ? "89ada246fcbf10f330011e4991d017332af2365b",
+  depot_toolsCommit ? "580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7",
+  depot_toolsHash ? "sha256-k+XQSYJQYc9vAUjwrRxaAlX/sK74W45m5byS31hSpwc=",
+  cipdCommit ? "7120a6a515089a3ff5d1f61ff4ee17750dc038af",
   cipdHashes ? {
-    "linux-386" = "7f264198598af2ef9d8878349d33c1940f1f3739e46d986962c352ec4cce2690";
-    "linux-amd64" = "2ada6b46ad1cd1350522c5c05899d273f5c894c7665e30104e7f57084a5aeeb9";
-    "linux-arm64" = "96eca7e49f6732c50122b94b793c3a5e62ed77bce1686787a8334906791b4168";
-    "linux-armv6l" = "06394601130652c5e1b055a7e4605c21fc7c6643af0b3b3cac8d2691491afa81";
-    "linux-mips64" = "f3eda6542b381b7aa8f582698498b0e197972c894590ec35f18faa467c868f5c";
-    "linux-mips64le" = "74229ada8e2afd9c8e7c58991126869b2880547780d4a197a27c1dfa96851622";
-    "linux-mipsle" = "2f3c18ec0ad48cd44a9ff39bb60e9afded83ca43fb9c7a5ea9949f6fdd4e1394";
-    "linux-ppc64" = "79425c0795fb8ba12b39a8856bf7ccb853e85def4317aa6413222f307d4c2dbd";
-    "linux-ppc64le" = "f9b3d85dde70f1b78cd7a41d2477834c15ac713a59317490a4cdac9f8f092325";
-    "linux-riscv64" = "bd695164563a66e8d3799e8835f90a398fbae9a4eec24e876c92d5f213943482";
-    "linux-s390x" = "6f501af80541e733fda23b4208a21ea05919c95d236036a2121e6b6334a2792c";
-    "macos-amd64" = "41d05580c0014912d6c32619c720646fd136e4557c9c7d7571ecc8c0462733a1";
-    "macos-arm64" = "dc672bd16d9faf277dd562f1dc00644b10c03c5d838d3cc3d3ea29925d76d931";
-    "windows-386" = "fa6ed0022a38ffc51ff8a927e3947fe7e59a64b2019dcddca9d3afacf7630444";
-    "windows-amd64" = "b5423e4b4429837f7fe4d571ce99c068aa0ccb37ddbebc1978a423fd2b0086df";
+    "linux-386" = "sha256-CshLfw49uglvWNwWE4K7ucBUF+IZlXDaIQsTXtFEJ8U=";
+    "linux-amd64" = "sha256-rxpI+HqfZiOYvzyyQ9P93s70feDmrLgbm4Xh3o88LwQ=";
+    "linux-arm64" = "sha256-XTTKbw1Q2lin+pf7VADalpBy3AWMTEd7yItsE/pePxw=";
+    "linux-armv6l" = "sha256-e5qe2KcguRLPuAq6wOG7A3YghHHon+oHY3fRLhU+e9E=";
+    "linux-loong64" = "sha256-LPTK4Ly173jac+cSGrsWw0ajrWEYepeJDGtP/7Xh528=";
+    "linux-mips" = "sha256-nR5khvHbAijs0MEr8+UgbuHTRNQAsMOyGTU/DI3K5Os=";
+    "linux-mips64" = "sha256-4a/zD1CrC/sxtBHqSRpom0SYVoN38bz3FAM40OSdVI0=";
+    "linux-mips64le" = "sha256-JnfKuBGLHYNLnRieS0KV8sYaTjh2rbp1yijvNOrU0FE=";
+    "linux-mipsle" = "sha256-nWqoay8c4faRk2+G5TvwbsbnndjTU4oglOTfhSC+TLQ=";
+    "linux-ppc64" = "sha256-pjeI/bx0i+QchQLhNB88ACPI34SrFvvFA01F5Nb16Ys=";
+    "linux-ppc64le" = "sha256-ZDMDwrP1zYlOI1hdbd3iZwKr59v/8CWj2sZ1RdosAiE=";
+    "linux-riscv64" = "sha256-O2EvOnjwbNssB7FtbK44yFcXfkrh9HOsPs/HF+uD2m8=";
+    "linux-s390x" = "sha256-BKeNDtuc9IkmV4GpuZcdsGc2F039KQeLdozxh7u+FDw=";
+    "mac-amd64" = "sha256-ZKBm8PbKjg4t0jIBPRKAv85L8eZOwJ1wBvh3cRSqHOI=";
+    "mac-arm64" = "sha256-AvjJp7JF05CetYDnwNJneAsotm1vBHWqB/vCdcIohoU=";
+    "windows-386" = "sha256-AVLbWh+WtJKynFDS6IfhuvYudw4Ow9s6w2JyDWG/2CI=";
+    "windows-amd64" = "sha256-puAQhiPGuwzkElWiBdTRGWOaUR2AIP7Qv9S3pwEY74E=";
+    "windows-arm64" = "sha256-4wxOMG+zvkM7gjhAiQvvNqNS0AamKKJdaBM/+rRxgXk=";
   },
 }:
 let
@@ -50,12 +53,12 @@ in
             src = fetchurl {
               name = "cipd-${cipdCommit}-unwrapped";
               url = "https://chrome-infra-packages.appspot.com/client?platform=${stdenv-constants.platform}&version=git_revision:${cipdCommit}";
-              sha256 = cipdHashes.${stdenv-constants.platform};
+              hash = cipdHashes.${stdenv-constants.platform};
             };
           }
           ''
-            mkdir -p $out/bin
-            install -m755 $src $out/bin/cipd
+            mkdir --parents $out/bin
+            install --mode=0755 $src $out/bin/cipd
           '';
     in
     writeShellScriptBin "cipd" ''
@@ -89,7 +92,10 @@ in
 
   vpython =
     pythonPkg:
-    runCommand "vpython3" { } "mkdir -p $out/bin && ln -s ${pythonPkg}/bin/python $out/bin/vpython3";
+    runCommand "vpython3" { } ''
+      mkdir --parents $out/bin
+      ln --symbolic ${pythonPkg}/bin/python $out/bin/vpython3
+    '';
 
   xcode-select = writeShellScriptBin "xcode-select" ''
     echo ${darwin.xcode}/Contents/Developer
diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix
index 00db44021a8c..e99b347c69af 100644
--- a/pkgs/development/compilers/flutter/flutter-tools.nix
+++ b/pkgs/development/compilers/flutter/flutter-tools.nix
@@ -37,11 +37,13 @@ buildDartApplication.override { inherit dart; } {
 
   src = flutterSrc;
   sourceRoot = "${flutterSrc.name}/packages/flutter_tools";
-  postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"'';
 
   inherit patches;
   # The given patches are made for the entire SDK source tree.
-  prePatch = ''pushd "$NIX_BUILD_TOP/source"'';
+  prePatch = ''
+    chmod --recursive u+w "../.."
+    pushd "../.."
+  '';
   postPatch = ''
     popd
   ''
@@ -66,9 +68,9 @@ buildDartApplication.override { inherit dart; } {
   ];
   preConfigure = ''
     export HOME=.
-    export FLUTTER_ROOT="$NIX_BUILD_TOP/source"
-    mkdir -p "$FLUTTER_ROOT/bin/cache"
-    ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
+    export FLUTTER_ROOT="$(realpath ../../)"
+    mkdir --parents "$FLUTTER_ROOT/bin/cache"
+    ln --symbolic '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
   '';
 
   dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ];
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 328be87053e8..40ad7183b9f8 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -3,11 +3,7 @@
   version,
   engineVersion,
   engineHashes ? { },
-  engineUrl ?
-    if lib.versionAtLeast version "3.29" then
-      "https://github.com/flutter/flutter.git@${engineVersion}"
-    else
-      "https://github.com/flutter/engine.git@${engineVersion}",
+  engineUrl ? "https://github.com/flutter/flutter.git@${engineVersion}",
   enginePatches ? [ ],
   engineRuntimeModes ? [
     "release"
@@ -29,6 +25,7 @@
   gitMinimal,
   which,
   jq,
+  writableTmpDirAsHomeHook,
   flutterTools ? null,
 }@args:
 
@@ -90,34 +87,38 @@ let
     '';
 
     buildPhase = ''
-      # The flutter_tools package tries to run many Git commands. In most
-      # cases, unexpected output is handled gracefully, but commands are never
-      # expected to fail completely. A blank repository needs to be created.
-      rm -rf .git # Remove any existing Git directory
-      git init -b nixpkgs
+      runHook preBuild
+    ''
+    # The flutter_tools package tries to run many Git commands. In most
+    # cases, unexpected output is handled gracefully, but commands are never
+    # expected to fail completely. A blank repository needs to be created.
+    + ''
+      rm --recursive --force .git # Remove any existing Git directory
+      git init --initial-branch=nixpkgs
       GIT_AUTHOR_NAME=Nixpkgs GIT_COMMITTER_NAME=Nixpkgs \
       GIT_AUTHOR_EMAIL= GIT_COMMITTER_EMAIL= \
       GIT_AUTHOR_DATE='1/1/1970 00:00:00 +0000' GIT_COMMITTER_DATE='1/1/1970 00:00:00 +0000' \
-        git commit --allow-empty -m "Initial commit"
+        git commit --allow-empty --message="Initial commit"
       (. '${../../../build-support/fetchgit/deterministic-git}'; make_deterministic_repo .)
-
-      mkdir -p bin/cache
+    ''
+    + ''
+      mkdir --parents bin/cache
 
       # Add a flutter_tools artifact stamp, and build a snapshot.
       # This is the Flutter CLI application.
       echo "$(git rev-parse HEAD)" > bin/cache/flutter_tools.stamp
-      ln -s '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot
+      ln --symbolic '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot
 
       # Some of flutter_tools's dependencies contain static assets. The
       # application attempts to read its own package_config.json to find these
       # assets at runtime.
-      mkdir -p packages/flutter_tools/.dart_tool
-      ln -s '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json
+      mkdir --parents packages/flutter_tools/.dart_tool
+      ln --symbolic '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json
 
       echo -n "${version}" > version
       cat <<EOF > bin/cache/flutter.version.json
       {
-        "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq -r .version)",
+        "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq --raw-output .version)",
         "flutterVersion": "${version}",
         "frameworkVersion": "${version}",
         "channel": "${channel}",
@@ -131,22 +132,24 @@ let
 
       # Suppress a small error now that `.gradle`'s location changed.
       # Location changed because of the patch "gradle-flutter-tools-wrapper.patch".
-      mkdir -p "$out/packages/flutter_tools/gradle/.gradle"
+      mkdir --parents "$out/packages/flutter_tools/gradle/.gradle"
+
+      runHook postBuild
     '';
 
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out
-      cp -r . $out
-      rm -rf $out/bin/cache/dart-sdk
-      ln -sf ${dart} $out/bin/cache/dart-sdk
+      mkdir --parents $out
+      cp --recursive . $out
+      rm --recursive --force $out/bin/cache/dart-sdk
+      ln --symbolic --force ${dart} $out/bin/cache/dart-sdk
 
       # The regular launchers are designed to download/build/update SDK
       # components, and are not very useful in Nix.
       # Replace them with simple links and wrappers.
       rm "$out/bin"/{dart,flutter}
-      ln -s "$out/bin/cache/dart-sdk/bin/dart" "$out/bin/dart"
+      ln --symbolic "$out/bin/cache/dart-sdk/bin/dart" "$out/bin/dart"
       makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \
         --set-default FLUTTER_ROOT "$out" \
         --set FLUTTER_ALREADY_LOCKED true \
@@ -158,15 +161,15 @@ let
     doInstallCheck = true;
     nativeInstallCheckInputs = [
       which
+      writableTmpDirAsHomeHook
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
     installCheckPhase = ''
       runHook preInstallCheck
 
-      export HOME="$(mktemp -d)"
       $out/bin/flutter config --android-studio-dir $HOME
       $out/bin/flutter config --android-sdk $HOME
-      $out/bin/flutter --version | fgrep -q '${builtins.substring 0 10 engineVersion}'
+      $out/bin/flutter --version | fgrep --quiet '${builtins.substring 0 10 engineVersion}'
 
       runHook postInstallCheck
     '';
diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix
index c171b7dbd1da..d71bd5d09428 100644
--- a/pkgs/development/compilers/flutter/sdk-symlink.nix
+++ b/pkgs/development/compilers/flutter/sdk-symlink.nix
@@ -20,7 +20,7 @@ let
 
       # symlinkJoin seems to be missing the .git directory for some reason.
       if [ -d '${flutter.sdk}/.git' ]; then
-        ln -s '${flutter.sdk}/.git' "$out"
+        ln --symbolic '${flutter.sdk}/.git' "$out"
       fi
 
       # For iOS/macOS builds, *.xcframework/'s from the pre-built
@@ -40,8 +40,8 @@ let
         # Remove the symlinkJoin .xcframework dir and replace it with a symlink
         # to the unwrapped .xcframework dir.
         frameworkDir="$(dirname "$file")"
-        rm -r "$frameworkDir"
-        ln -s "$origFrameworkDir" "$frameworkDir"
+        rm --recursive "$frameworkDir"
+        ln --symbolic "$origFrameworkDir" "$frameworkDir"
       done
       shopt -u globstar
     '';
diff --git a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
index 73f3b3e1f13e..8edff6a2e876 100644
--- a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
@@ -1,8 +1,8 @@
-{ callPackage
-, flutterPackages
-, lib
-, symlinkJoin
-,
+{
+  callPackage,
+  flutterPackages,
+  lib,
+  symlinkJoin,
 }:
 let
   nixpkgsRoot = "@nixpkgs_root@";
@@ -25,25 +25,20 @@ let
     "aarch64-darwin"
   ];
 
-  derivations =
-    lib.foldl'
-      (
-        acc: flutterPlatform:
-          acc
-          ++ (map
-            (systemPlatform:
-              callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix" {
-                flutter = flutterPackages."v${flutterCompactVersion}";
-                inherit flutterPlatform;
-                inherit systemPlatform;
-                hash = lib.fakeSha256;
-              })
-            systemPlatforms)
-      ) [ ]
-      flutterPlatforms;
+  derivations = lib.foldl' (
+    acc: flutterPlatform:
+    acc
+    ++ (map (
+      systemPlatform:
+      callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix" {
+        flutter = flutterPackages."v${flutterCompactVersion}";
+        inherit flutterPlatform systemPlatform;
+        hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+      }
+    ) systemPlatforms)
+  ) [ ] flutterPlatforms;
 in
 symlinkJoin {
   name = "evaluate-derivations";
   paths = derivations;
 }
-
diff --git a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
index 941a9769a9cb..44291afd59bc 100644
--- a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
@@ -4,24 +4,29 @@ let
   channel = "@channel@";
 in
 {
-  x86_64-linux = { fetchzip }:
+  x86_64-linux =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-  aarch64-linux = { fetchzip }:
+  aarch64-linux =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-  x86_64-darwin = { fetchzip }:
+  x86_64-darwin =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-  aarch64-darwin = { fetchzip }:
+  aarch64-darwin =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-}.${platform}
+}
+.${platform}
diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
index 25b200811a00..c96a7b9adad2 100644
--- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
@@ -1,4 +1,8 @@
-{ callPackage, symlinkJoin, stdenv, lib }:
+{
+  callPackage,
+  symlinkJoin,
+  lib,
+}:
 let
   nixpkgsRoot = "@nixpkgs_root@";
   version = "@flutter_version@";
@@ -9,25 +13,22 @@ let
     "aarch64-linux"
   ];
 
-  derivations =
-    lib.foldl'
-      (
-        acc: buildPlatform:
-          acc
-          ++ (map
-            (targetPlatform:
-              callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
-                targetPlatform = lib.systems.elaborate targetPlatform;
-                hostPlatform = lib.systems.elaborate buildPlatform;
-                buildPlatform = lib.systems.elaborate buildPlatform;
-                flutterVersion = version;
-                version = engineVersion;
-                url = "https://github.com/flutter/flutter.git@${engineVersion}";
-                hashes."${buildPlatform}"."${targetPlatform}" = lib.fakeSha256;
-              })
-            systemPlatforms)
-      ) [ ]
-      systemPlatforms;
+  derivations = lib.foldl' (
+    acc: buildPlatform:
+    acc
+    ++ (map (
+      targetPlatform:
+      callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
+        targetPlatform = lib.systems.elaborate targetPlatform;
+        hostPlatform = lib.systems.elaborate buildPlatform;
+        buildPlatform = lib.systems.elaborate buildPlatform;
+        flutterVersion = version;
+        version = engineVersion;
+        url = "https://github.com/flutter/flutter.git@${engineVersion}";
+        hashes."${buildPlatform}"."${targetPlatform}" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
+      }
+    ) systemPlatforms)
+  ) [ ] systemPlatforms;
 in
 symlinkJoin {
   name = "evaluate-derivations";
diff --git a/pkgs/development/compilers/flutter/update/get-flutter.nix.in b/pkgs/development/compilers/flutter/update/get-flutter.nix.in
index 81680797229b..02d802e026f0 100644
--- a/pkgs/development/compilers/flutter/update/get-flutter.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-flutter.nix.in
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "flutter";
   repo = "flutter";
-  rev = "@flutter_version@";
+  tag = "@flutter_version@";
   hash = "@hash@";
 }
diff --git a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
index ff72046bcecb..e4894dffeff3 100644
--- a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
@@ -1,30 +1,41 @@
-{ flutterPackages
-, stdenv
-, cacert
-,
+{
+  flutterPackages,
+  stdenv,
+  cacert,
+  writableTmpDirAsHomeHook,
 }:
 let
   flutterCompactVersion = "@flutter_compact_version@";
   inherit (flutterPackages."v${flutterCompactVersion}") dart;
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   name = "pubspec-lock";
   src = @flutter_src@;
 
-  nativeBuildInputs = [ dart ];
+  sourceRoot = "${finalAttrs.src.name}/packages/flutter_tools";
+
+  nativeBuildInputs = [
+    dart
+    writableTmpDirAsHomeHook
+  ];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = "@hash@";
 
   buildPhase = ''
-    cd ./packages/flutter_tools
+    runHook preBuild
 
-    export HOME="$(mktemp -d)"
-    dart --root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt pub get -v
+    dart --root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt pub get -verbose
+
+    runHook postBuild
   '';
 
   installPhase = ''
-    cp -r ./pubspec.lock $out
+    runHook preInstall
+
+    cp pubspec.lock $out
+
+    runHook postInstall
   '';
-}
+})
diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json
deleted file mode 100644
index 5111395d5990..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/data.json
+++ /dev/null
@@ -1,1036 +0,0 @@
-{
-  "version": "3.24.5",
-  "engineVersion": "a18df97ca57a249df5d8d68cd0820600223ce262",
-  "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
-  "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
-  "channel": "stable",
-  "engineHashes": {
-    "aarch64-linux": {
-      "aarch64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8=",
-      "x86_64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8="
-    },
-    "x86_64-linux": {
-      "aarch64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q=",
-      "x86_64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q="
-    }
-  },
-  "dartVersion": "3.5.4",
-  "dartHash": {
-    "x86_64-linux": "sha256-jHyCMOkrd8DEq/IBqCMTqJg9uFkcoAwHiJBFNUHENZY=",
-    "aarch64-linux": "sha256-fFHpWvwKYBC4fbKTMwfhemu4RCdyAqj+cIJgcoE1P30=",
-    "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=",
-    "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk="
-  },
-  "flutterHash": "sha256-9aA0HU/c32ixhnqAGwm1v87uDnYhNbe5laFbed1XPw8=",
-  "artifactHashes": {
-    "android": {
-      "aarch64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=",
-      "aarch64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk=",
-      "x86_64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=",
-      "x86_64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk="
-    },
-    "fuchsia": {
-      "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
-    },
-    "ios": {
-      "aarch64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
-      "aarch64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
-      "x86_64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
-      "x86_64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM="
-    },
-    "linux": {
-      "aarch64-darwin": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=",
-      "aarch64-linux": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=",
-      "x86_64-darwin": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig=",
-      "x86_64-linux": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig="
-    },
-    "macos": {
-      "aarch64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
-      "aarch64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
-      "x86_64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
-      "x86_64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k="
-    },
-    "universal": {
-      "aarch64-darwin": "sha256-o2dT/b6mWm34I3uGrrONVljGr6ApH6oOJbhTuUHQ664=",
-      "aarch64-linux": "sha256-M78yC1x+LXBnvTNogC6xrQ1QM+wu5hxMna5Ii50HcMA=",
-      "x86_64-darwin": "sha256-4Gx4SPvm+kJnDUJSA5DmYuMluhNp3qulA+dkM+XkDVY=",
-      "x86_64-linux": "sha256-AM8fDpGb4BLl/xbvq5IjXZqrtrUTW340WqUGAPguep8="
-    },
-    "web": {
-      "aarch64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
-      "aarch64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
-      "x86_64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
-      "x86_64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0="
-    },
-    "windows": {
-      "x86_64-darwin": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I=",
-      "x86_64-linux": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I="
-    }
-  },
-  "pubspecLock": {
-    "packages": {
-      "_fe_analyzer_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "_fe_analyzer_shared",
-          "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "72.0.0"
-      },
-      "_macros": {
-        "dependency": "transitive",
-        "description": "dart",
-        "source": "sdk",
-        "version": "0.3.2"
-      },
-      "analyzer": {
-        "dependency": "direct main",
-        "description": {
-          "name": "analyzer",
-          "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.7.0"
-      },
-      "archive": {
-        "dependency": "direct main",
-        "description": {
-          "name": "archive",
-          "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.6.1"
-      },
-      "args": {
-        "dependency": "direct main",
-        "description": {
-          "name": "args",
-          "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.5.0"
-      },
-      "async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "async",
-          "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.11.0"
-      },
-      "boolean_selector": {
-        "dependency": "direct main",
-        "description": {
-          "name": "boolean_selector",
-          "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.1"
-      },
-      "browser_launcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "browser_launcher",
-          "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.1"
-      },
-      "built_collection": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_collection",
-          "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.1.1"
-      },
-      "built_value": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_value",
-          "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "8.9.2"
-      },
-      "checked_yaml": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "checked_yaml",
-          "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.3"
-      },
-      "cli_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "cli_config",
-          "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.2.0"
-      },
-      "clock": {
-        "dependency": "direct main",
-        "description": {
-          "name": "clock",
-          "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.1"
-      },
-      "collection": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "collection",
-          "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.18.0"
-      },
-      "completion": {
-        "dependency": "direct main",
-        "description": {
-          "name": "completion",
-          "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.1"
-      },
-      "convert": {
-        "dependency": "direct main",
-        "description": {
-          "name": "convert",
-          "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.1"
-      },
-      "coverage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "coverage",
-          "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.8.0"
-      },
-      "crypto": {
-        "dependency": "direct main",
-        "description": {
-          "name": "crypto",
-          "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.3"
-      },
-      "csslib": {
-        "dependency": "direct main",
-        "description": {
-          "name": "csslib",
-          "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.0"
-      },
-      "dap": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dap",
-          "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "dds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds",
-          "sha256": "f3bca60b6b7d2b005268a1a579c82e38bec3d85cc85c332a872fe623c7ba94d7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.4+2"
-      },
-      "dds_service_extensions": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds_service_extensions",
-          "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "devtools_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "devtools_shared",
-          "sha256": "a6e66165629ec004cabd84e6971f502aeac07f1a5f6ffd9b3244cd05b1a06fb0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "10.0.1"
-      },
-      "dtd": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dtd",
-          "sha256": "58ac5c2d628e575dbcdfda44a698cd4c1212663e27fe5f8ced37aea85faa0d30",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.2.0"
-      },
-      "dwds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dwds",
-          "sha256": "61ebaabb04d779d040b47d3b4d0b3963449ced0920fb8efd81ca6d5e51ccfc1a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "24.0.0"
-      },
-      "extension_discovery": {
-        "dependency": "direct main",
-        "description": {
-          "name": "extension_discovery",
-          "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "fake_async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fake_async",
-          "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.1"
-      },
-      "ffi": {
-        "dependency": "direct main",
-        "description": {
-          "name": "ffi",
-          "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "file": {
-        "dependency": "direct main",
-        "description": {
-          "name": "file",
-          "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "7.0.0"
-      },
-      "file_testing": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "file_testing",
-          "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.0"
-      },
-      "fixnum": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fixnum",
-          "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "flutter_template_images": {
-        "dependency": "direct main",
-        "description": {
-          "name": "flutter_template_images",
-          "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.0"
-      },
-      "frontend_server_client": {
-        "dependency": "direct main",
-        "description": {
-          "name": "frontend_server_client",
-          "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.0.0"
-      },
-      "glob": {
-        "dependency": "direct main",
-        "description": {
-          "name": "glob",
-          "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "graphs": {
-        "dependency": "direct main",
-        "description": {
-          "name": "graphs",
-          "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.3.1"
-      },
-      "html": {
-        "dependency": "direct main",
-        "description": {
-          "name": "html",
-          "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.15.4"
-      },
-      "http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http",
-          "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.13.6"
-      },
-      "http_multi_server": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_multi_server",
-          "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.2.1"
-      },
-      "http_parser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_parser",
-          "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.0.2"
-      },
-      "intl": {
-        "dependency": "direct main",
-        "description": {
-          "name": "intl",
-          "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.19.0"
-      },
-      "io": {
-        "dependency": "direct main",
-        "description": {
-          "name": "io",
-          "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "js": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "js",
-          "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.1"
-      },
-      "json_annotation": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "json_annotation",
-          "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.9.0"
-      },
-      "json_rpc_2": {
-        "dependency": "direct main",
-        "description": {
-          "name": "json_rpc_2",
-          "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "logging": {
-        "dependency": "direct main",
-        "description": {
-          "name": "logging",
-          "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.0"
-      },
-      "macros": {
-        "dependency": "transitive",
-        "description": {
-          "name": "macros",
-          "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.2-main.4"
-      },
-      "matcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "matcher",
-          "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.12.16+1"
-      },
-      "meta": {
-        "dependency": "direct main",
-        "description": {
-          "name": "meta",
-          "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.15.0"
-      },
-      "mime": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mime",
-          "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.5"
-      },
-      "multicast_dns": {
-        "dependency": "direct main",
-        "description": {
-          "name": "multicast_dns",
-          "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.2+7"
-      },
-      "mustache_template": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mustache_template",
-          "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "native_assets_builder": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_builder",
-          "sha256": "e6612ad01cbc3c4d1b00a1a42aa25aa567950ab10ae1f95721574923540f3bd8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.0"
-      },
-      "native_assets_cli": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_cli",
-          "sha256": "f54ddc4a3f8cff1d8d63723b4938902da7586a5a47fe3c1bfa226eb80223f32e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.0"
-      },
-      "native_stack_traces": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_stack_traces",
-          "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.5.7"
-      },
-      "node_preamble": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "node_preamble",
-          "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.2"
-      },
-      "package_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "package_config",
-          "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.0"
-      },
-      "path": {
-        "dependency": "direct main",
-        "description": {
-          "name": "path",
-          "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.9.0"
-      },
-      "petitparser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "petitparser",
-          "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.0.2"
-      },
-      "platform": {
-        "dependency": "direct main",
-        "description": {
-          "name": "platform",
-          "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.5"
-      },
-      "pool": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pool",
-          "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.5.1"
-      },
-      "process": {
-        "dependency": "direct main",
-        "description": {
-          "name": "process",
-          "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.0.2"
-      },
-      "pub_semver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pub_semver",
-          "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.4"
-      },
-      "pubspec_parse": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "pubspec_parse",
-          "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "shelf": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf",
-          "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.4.1"
-      },
-      "shelf_packages_handler": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_packages_handler",
-          "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "shelf_proxy": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_proxy",
-          "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "shelf_static": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_static",
-          "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.2"
-      },
-      "shelf_web_socket": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_web_socket",
-          "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "source_map_stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_map_stack_trace",
-          "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.1"
-      },
-      "source_maps": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_maps",
-          "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.10.12"
-      },
-      "source_span": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_span",
-          "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.10.0"
-      },
-      "sse": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sse",
-          "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.5"
-      },
-      "stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stack_trace",
-          "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.11.1"
-      },
-      "standard_message_codec": {
-        "dependency": "direct main",
-        "description": {
-          "name": "standard_message_codec",
-          "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.0.1+4"
-      },
-      "stream_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stream_channel",
-          "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "string_scanner": {
-        "dependency": "direct main",
-        "description": {
-          "name": "string_scanner",
-          "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.0"
-      },
-      "sync_http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sync_http",
-          "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.1"
-      },
-      "term_glyph": {
-        "dependency": "direct main",
-        "description": {
-          "name": "term_glyph",
-          "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "test": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "test",
-          "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.25.7"
-      },
-      "test_api": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_api",
-          "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.2"
-      },
-      "test_core": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_core",
-          "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.4"
-      },
-      "typed_data": {
-        "dependency": "direct main",
-        "description": {
-          "name": "typed_data",
-          "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.2"
-      },
-      "unified_analytics": {
-        "dependency": "direct main",
-        "description": {
-          "name": "unified_analytics",
-          "sha256": "916215af2dc2f54a204c6bfbc645ec401b6a150048764814379f42e09b557d2d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.1.2"
-      },
-      "usage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "usage",
-          "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.1"
-      },
-      "uuid": {
-        "dependency": "direct main",
-        "description": {
-          "name": "uuid",
-          "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.7"
-      },
-      "vm_service": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service",
-          "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "14.2.5"
-      },
-      "vm_service_interface": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service_interface",
-          "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "vm_snapshot_analysis": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_snapshot_analysis",
-          "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.6"
-      },
-      "watcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "watcher",
-          "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "web": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web",
-          "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.5.1"
-      },
-      "web_socket_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web_socket_channel",
-          "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.4.5"
-      },
-      "webdriver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webdriver",
-          "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.3"
-      },
-      "webkit_inspection_protocol": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webkit_inspection_protocol",
-          "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "xml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "xml",
-          "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.5.0"
-      },
-      "yaml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml",
-          "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.2"
-      },
-      "yaml_edit": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml_edit",
-          "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.2.1"
-      }
-    },
-    "sdks": {
-      "dart": ">=3.4.3 <4.0.0"
-    }
-  }
-}
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch
deleted file mode 100644
index 01e34c6d292c..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
-index 252021cf78..e50ef0885d 100644
---- a/packages/flutter_tools/lib/src/flutter_cache.dart
-+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
-@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
-       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
-     }
-     registerArtifact(FontSubsetArtifacts(this, platform: platform));
--    registerArtifact(PubDependencies(
--      logger: logger,
--      // flutter root and pub must be lazily initialized to avoid accessing
--      // before the version is determined.
--      flutterRoot: () => Cache.flutterRoot!,
--      pub: () => pub,
--      projectFactory: projectFactory,
--    ));
-   }
- }
- 
\ No newline at end of file
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch
deleted file mode 100644
index de6080efbba8..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch introduces an intermediate Gradle build step to alter the behavior
-of flutter_tools' Gradle project, specifically moving the creation of `build`
-and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
-
-Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
-directories within the Nix Store. Resulting in read-only errors when trying to build a
-Flutter Android app at runtime.
-
-This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
-when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
-
-`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
-
-The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
-This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
-`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
-
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
---- /dev/null
-+++ b/packages/flutter_tools/gradle/settings.gradle
-@@ -0,0 +1,19 @@
-+rootProject.buildFileName = "/dev/null"
-+
-+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
-+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
-+dir.mkdirs()
-+def file = new File(dir, "settings.gradle")
-+
-+file.text = """
-+rootProject.projectDir = new File("$settingsDir")
-+apply from: new File("$settingsDir/settings.gradle.kts")
-+
-+gradle.allprojects { project ->
-+  project.beforeEvaluate {
-+    project.layout.buildDirectory = new File("$dir/build")
-+  }
-+}
-+"""
-+
-+includeBuild(dir)
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
deleted file mode 100644
index 01e34c6d292c..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
-index 252021cf78..e50ef0885d 100644
---- a/packages/flutter_tools/lib/src/flutter_cache.dart
-+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
-@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
-       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
-     }
-     registerArtifact(FontSubsetArtifacts(this, platform: platform));
--    registerArtifact(PubDependencies(
--      logger: logger,
--      // flutter root and pub must be lazily initialized to avoid accessing
--      // before the version is determined.
--      flutterRoot: () => Cache.flutterRoot!,
--      pub: () => pub,
--      projectFactory: projectFactory,
--    ));
-   }
- }
- 
\ No newline at end of file
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
deleted file mode 100644
index 2ad292efd222..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-index e4e474ab6e..5548599802 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
- 
-     // Populate the cache. We call this before pub get below so that the
-     // sky_engine package is available in the flutter cache for pub to find.
--    if (shouldUpdateCache) {
-+    if (false) {
-       // First always update universal artifacts, as some of these (e.g.
-       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
-       final bool offline;
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 50783f8435..db94062840 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.analytics.suppressTelemetry();
-         }
- 
--        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
--        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
--          await globals.flutterVersion.checkFlutterVersionFreshness();
--        }
- 
-         // See if the user specified a specific device.
-         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
-
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
deleted file mode 100644
index 825d40fc6176..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
-From: Philip Hayes <philiphayes9@gmail.com>
-Date: Thu, 12 Sep 2024 13:23:00 -0700
-Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
- `NixOS/nixpkgs` flutter
-
-This patch cleans up `xcode_backend.sh`. It now effectively just runs
-`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
-
-The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
-argv[0], even though its presence is already guaranteed (the wrapped
-`xcode_backend.dart` also relies on this env).
-
-When using nixpkgs flutter, the flutter SDK directory is composed of several
-layers, joined together using symlinks (called a `symlinkJoin`). Without this
-patch, the auto-discover traverses the symlinks into the wrong layer, and so it
-uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
-important envs/flags (like `$FLUTTER_ROOT`).
-
-Using the "unwrapped" dart then manifests in this error when compiling, since
-it doesn't see the ios build-support artifacts:
-
-```
-$ flutter run -d iphone
-Running Xcode build...
-Xcode build done.                                            6.4s
-Failed to build iOS app
-Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
-```
----
- packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
-index 2889d7c8e4..48b9d06c6e 100755
---- a/packages/flutter_tools/bin/xcode_backend.sh
-+++ b/packages/flutter_tools/bin/xcode_backend.sh
-@@ -6,24 +6,7 @@
- # exit on error, or usage of unset var
- set -euo pipefail
- 
--# Needed because if it is set, cd may print the path it changed to.
--unset CDPATH
--
--function follow_links() (
--  cd -P "$(dirname -- "$1")"
--  file="$PWD/$(basename -- "$1")"
--  while [[ -h "$file" ]]; do
--    cd -P "$(dirname -- "$file")"
--    file="$(readlink -- "$file")"
--    cd -P "$(dirname -- "$file")"
--    file="$PWD/$(basename -- "$file")"
--  done
--  echo "$file"
--)
--
--PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
--BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
--FLUTTER_ROOT="$BIN_DIR/../../.."
--DART="$FLUTTER_ROOT/bin/dart"
--
--"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
-+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
-+dart="${FLUTTER_ROOT}/bin/dart"
-+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
-+exec "${dart}" "${xcode_backend_dart}" "$@"
--- 
-2.46.0
-
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
deleted file mode 100644
index de6080efbba8..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch introduces an intermediate Gradle build step to alter the behavior
-of flutter_tools' Gradle project, specifically moving the creation of `build`
-and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
-
-Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
-directories within the Nix Store. Resulting in read-only errors when trying to build a
-Flutter Android app at runtime.
-
-This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
-when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
-
-`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
-
-The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
-This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
-`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
-
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
---- /dev/null
-+++ b/packages/flutter_tools/gradle/settings.gradle
-@@ -0,0 +1,19 @@
-+rootProject.buildFileName = "/dev/null"
-+
-+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
-+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
-+dir.mkdirs()
-+def file = new File(dir, "settings.gradle")
-+
-+file.text = """
-+rootProject.projectDir = new File("$settingsDir")
-+apply from: new File("$settingsDir/settings.gradle.kts")
-+
-+gradle.allprojects { project ->
-+  project.beforeEvaluate {
-+    project.layout.buildDirectory = new File("$dir/build")
-+  }
-+}
-+"""
-+
-+includeBuild(dir)
diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index f383afef4294..6d04fcf6b864 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.35.5",
-  "engineVersion": "d3d45dcf251823c1769909cd43698d126db38deb",
+  "version": "3.35.7",
+  "engineVersion": "035316565ad77281a75305515e4682e6c4c6f7ca",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM=",
-      "x86_64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM="
+      "aarch64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws=",
+      "x86_64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM=",
-      "x86_64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM="
+      "aarch64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk=",
+      "x86_64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk="
     }
   },
   "dartVersion": "3.9.2",
@@ -21,53 +21,53 @@
     "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
     "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
   },
-  "flutterHash": "sha256-EVJ/2Qk5r9CL/WObLsH3J/KW/ota6HgkAUYNgLYZwkw=",
+  "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=",
-      "aarch64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0=",
-      "x86_64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=",
-      "x86_64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0="
+      "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=",
+      "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "aarch64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "x86_64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "x86_64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro="
+      "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM="
     },
     "ios": {
-      "aarch64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "aarch64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "x86_64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "x86_64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w="
+      "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY="
     },
     "linux": {
-      "aarch64-darwin": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=",
-      "aarch64-linux": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=",
-      "x86_64-darwin": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY=",
-      "x86_64-linux": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY="
+      "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=",
+      "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA="
     },
     "macos": {
-      "aarch64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "aarch64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "x86_64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "x86_64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII="
+      "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c="
     },
     "universal": {
-      "aarch64-darwin": "sha256-dXJmnOZunesXmUAGt32LE+hXB2b3KNhauSYeduPuK70=",
-      "aarch64-linux": "sha256-xWvFZH3RcTMuV2wn6bpEe4eiKdjGy7u/YlxZrqfOCQA=",
-      "x86_64-darwin": "sha256-9anTlYdSTIK1go8dxZ0TqfWQNz0YTCEGEESvXw+nTec=",
-      "x86_64-linux": "sha256-5DQ+4pPBtmc391cm446Ql6OtSGz3DLtO4pI3ueX0jUY="
+      "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=",
+      "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=",
+      "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=",
+      "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8="
     },
     "web": {
-      "aarch64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "aarch64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "x86_64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "x86_64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA="
+      "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o="
     },
     "windows": {
-      "x86_64-darwin": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ=",
-      "x86_64-linux": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ="
+      "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=",
+      "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k="
     }
   },
   "pubspecLock": {
diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json
similarity index 62%
rename from pkgs/development/compilers/flutter/versions/3_27/data.json
rename to pkgs/development/compilers/flutter/versions/3_38/data.json
index c6361eb21b06..6726942c0678 100644
--- a/pkgs/development/compilers/flutter/versions/3_27/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_38/data.json
@@ -1,73 +1,73 @@
 {
-  "version": "3.27.4",
-  "engineVersion": "82bd5b7209295a5b7ff8cae0df96e7870171e3a5",
-  "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
-  "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
-  "channel": "stable",
+  "version": "3.38.0-0.2.pre",
+  "engineVersion": "d7ec7e8064d93a8d8bdd418103ec48cfafbc4841",
+  "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
+  "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
+  "channel": "beta",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-Av8G5i4g9s6SrOpLUIw9WOSJ4hMQO+ANIaTIVpTsP+Y=",
-      "x86_64-linux": "sha256-Av8G5i4g9s6SrOpLUIw9WOSJ4hMQO+ANIaTIVpTsP+Y="
+      "aarch64-linux": "sha256-rcZdEXo2L388X02qSR/EnvRb/rTSsJjw4E4y0wFzUmk=",
+      "x86_64-linux": "sha256-rcZdEXo2L388X02qSR/EnvRb/rTSsJjw4E4y0wFzUmk="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-PDSA0B/6mZTLC5gRlR8F6+p8V5dKmM7OALjehrPlQ1g=",
-      "x86_64-linux": "sha256-PDSA0B/6mZTLC5gRlR8F6+p8V5dKmM7OALjehrPlQ1g="
+      "aarch64-linux": "sha256-lfhAF16MxDVeHjqfFE5FsRCTuxdiM9j254gd3/7Ylrc=",
+      "x86_64-linux": "sha256-lfhAF16MxDVeHjqfFE5FsRCTuxdiM9j254gd3/7Ylrc="
     }
   },
-  "dartVersion": "3.6.2",
+  "dartVersion": "3.10.0-290.1.beta",
   "dartHash": {
-    "x86_64-linux": "sha256-um3/S/XleAVGor8YVUIjhViDAXUiSKnJI7RchM9k1yc=",
-    "aarch64-linux": "sha256-PSGO/MVDO3fgvlrfzdXQizgtVI5+fDWwHk/DG3yH0X4=",
-    "x86_64-darwin": "sha256-QshSLyTOYZn7N+vE6AfqLZ5CFei4h3xlWJo//iyaVA4=",
-    "aarch64-darwin": "sha256-Js1Mk0M19+0eQwprtlDSryI1vDEO5wvx8gzklb5au0Y="
+    "x86_64-linux": "sha256-ygZTZBUC/ynV8jCIUTYpXU5GoSdo+o+FcNt4RkAvD3I=",
+    "aarch64-linux": "sha256-l3f1mo2zeB9C9fwAoTrRQEXhe8PCEhbmwT4w14H/ZJ4=",
+    "x86_64-darwin": "sha256-cLwwRwNvXGkJh0T5rr5jgzbRJXPed2uQzKPhiU0/kXs=",
+    "aarch64-darwin": "sha256-Iy+cmlBSCTQAMdT3e7Zt1f5p4CGtq/xewMl+gxzcjtM="
   },
-  "flutterHash": "sha256-OvWmEvrkXrGGda3vVVuMo90pZeZcWOzJUztL5qW5Foc=",
+  "flutterHash": "sha256-axcR0M1jQjll+D0fQobgHcX98ysGzYN+s3OgdUddmLc=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=",
-      "aarch64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q=",
-      "x86_64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=",
-      "x86_64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q="
+      "aarch64-darwin": "sha256-IvM7Yxq0bJpkRZTfVvkYltn4kgltNE/7sP7no8Qwv7M=",
+      "aarch64-linux": "sha256-oTn2X/8UysTArqFc6i5kzdV3s3noJXcd5kigMued34Q=",
+      "x86_64-darwin": "sha256-IvM7Yxq0bJpkRZTfVvkYltn4kgltNE/7sP7no8Qwv7M=",
+      "x86_64-linux": "sha256-oTn2X/8UysTArqFc6i5kzdV3s3noJXcd5kigMued34Q="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
+      "aarch64-darwin": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY=",
+      "aarch64-linux": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY=",
+      "x86_64-darwin": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY=",
+      "x86_64-linux": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY="
     },
     "ios": {
-      "aarch64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "aarch64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "x86_64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "x86_64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk="
+      "aarch64-darwin": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ=",
+      "aarch64-linux": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ=",
+      "x86_64-darwin": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ=",
+      "x86_64-linux": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ="
     },
     "linux": {
-      "aarch64-darwin": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=",
-      "aarch64-linux": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=",
-      "x86_64-darwin": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg=",
-      "x86_64-linux": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg="
+      "aarch64-darwin": "sha256-9SNHFyTBUicTibXWN7kvFNsI1bZspz7BznwaNd8irwU=",
+      "aarch64-linux": "sha256-9SNHFyTBUicTibXWN7kvFNsI1bZspz7BznwaNd8irwU=",
+      "x86_64-darwin": "sha256-cU0tc23FCjz0TsfalcFLFSS3MqeBtIN/H8EMIxcaLos=",
+      "x86_64-linux": "sha256-cU0tc23FCjz0TsfalcFLFSS3MqeBtIN/H8EMIxcaLos="
     },
     "macos": {
-      "aarch64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "aarch64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "x86_64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "x86_64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M="
+      "aarch64-darwin": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA=",
+      "aarch64-linux": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA=",
+      "x86_64-darwin": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA=",
+      "x86_64-linux": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA="
     },
     "universal": {
-      "aarch64-darwin": "sha256-48EzEp20xrYt63fo7onlTkb74w0zipIkM3vBlV8x5DE=",
-      "aarch64-linux": "sha256-m1eTxvOef6V6Mo5nXd+Jr3NNrOhE8lq9QBz+93ipvS8=",
-      "x86_64-darwin": "sha256-05XSP1LcjchgwTNg4qTyFRQRLS04N1e13lNSdk5YaXQ=",
-      "x86_64-linux": "sha256-QwcKF6APpvTLGVRKHHwAJ0QYYaQPC7PeMggb+fn61ro="
+      "aarch64-darwin": "sha256-V3ImxYK12PYaB7zX5FnvCJoiIG6DhzQkflJT/hYi4iw=",
+      "aarch64-linux": "sha256-iNHp9UGYI6Q8kWbfw6UhgEu80nBBYLboJMou1uzUPtI=",
+      "x86_64-darwin": "sha256-YMeoAm3HmYnrAcSaAtjoJHRSUDHhMtxdDS5iiGw5YaU=",
+      "x86_64-linux": "sha256-4otDADLa0HoFsyasQSaoNu018mwSjXDQOiUQUEgxE1g="
     },
     "web": {
-      "aarch64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "aarch64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "x86_64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "x86_64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc="
+      "aarch64-darwin": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4=",
+      "aarch64-linux": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4=",
+      "x86_64-darwin": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4=",
+      "x86_64-linux": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4="
     },
     "windows": {
-      "x86_64-darwin": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg=",
-      "x86_64-linux": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg="
+      "x86_64-darwin": "sha256-tetSC5y9Zb5tNPR2mm9ukP0cZRmYVdAzVipF7mMAn1U=",
+      "x86_64-linux": "sha256-tetSC5y9Zb5tNPR2mm9ukP0cZRmYVdAzVipF7mMAn1U="
     }
   },
   "pubspecLock": {
@@ -76,27 +76,21 @@
         "dependency": "direct main",
         "description": {
           "name": "_fe_analyzer_shared",
-          "sha256": "f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356",
+          "sha256": "dd3d2ad434b9510001d089e8de7556d50c834481b9abc2891a0184a8493a19dc",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "74.0.0"
-      },
-      "_macros": {
-        "dependency": "transitive",
-        "description": "dart",
-        "source": "sdk",
-        "version": "0.3.3"
+        "version": "89.0.0"
       },
       "analyzer": {
         "dependency": "direct main",
         "description": {
           "name": "analyzer",
-          "sha256": "f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c",
+          "sha256": "c22b6e7726d1f9e5db58c7251606076a71ca0dbcf76116675edfadbec0c9e875",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "6.9.0"
+        "version": "8.2.0"
       },
       "archive": {
         "dependency": "direct main",
@@ -112,41 +106,41 @@
         "dependency": "direct main",
         "description": {
           "name": "args",
-          "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+          "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.5.0"
+        "version": "2.7.0"
       },
       "async": {
         "dependency": "direct main",
         "description": {
           "name": "async",
-          "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+          "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.11.0"
+        "version": "2.13.0"
       },
       "boolean_selector": {
         "dependency": "direct main",
         "description": {
           "name": "boolean_selector",
-          "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+          "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.1.1"
+        "version": "2.1.2"
       },
       "browser_launcher": {
         "dependency": "direct main",
         "description": {
           "name": "browser_launcher",
-          "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734",
+          "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.1.2"
+        "version": "1.1.3"
       },
       "built_collection": {
         "dependency": "direct main",
@@ -162,21 +156,21 @@
         "dependency": "direct main",
         "description": {
           "name": "built_value",
-          "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+          "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "8.9.2"
+        "version": "8.12.0"
       },
       "checked_yaml": {
         "dependency": "direct dev",
         "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": "direct main",
@@ -192,131 +186,181 @@
         "dependency": "direct main",
         "description": {
           "name": "clock",
-          "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+          "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.1.1"
+        "version": "1.1.2"
+      },
+      "code_assets": {
+        "dependency": "direct main",
+        "description": {
+          "name": "code_assets",
+          "sha256": "5865a34983367f6884e8311f67d9ae459945b99bad20c0e66484a1aae7feaae0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.19.7"
+      },
+      "code_builder": {
+        "dependency": "direct main",
+        "description": {
+          "name": "code_builder",
+          "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.11.0"
       },
       "collection": {
-        "dependency": "direct dev",
+        "dependency": "direct main",
         "description": {
           "name": "collection",
-          "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+          "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.19.0"
+        "version": "1.19.1"
       },
       "completion": {
         "dependency": "direct main",
         "description": {
           "name": "completion",
-          "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
+          "sha256": "82fa09800c0b71a2e8396bf3ca6b36b43cd35fe7ba2aeab53b6349ac671d0f5b",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.0.1"
+        "version": "1.0.2"
       },
       "convert": {
         "dependency": "direct main",
         "description": {
           "name": "convert",
-          "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+          "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.1.1"
+        "version": "3.1.2"
       },
       "coverage": {
         "dependency": "direct main",
         "description": {
           "name": "coverage",
-          "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5",
+          "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.9.2"
+        "version": "1.15.0"
       },
       "crypto": {
         "dependency": "direct main",
         "description": {
           "name": "crypto",
-          "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+          "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.0.5"
+        "version": "3.0.6"
       },
       "csslib": {
         "dependency": "direct main",
         "description": {
           "name": "csslib",
-          "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+          "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.0.0"
+        "version": "1.0.2"
       },
       "dap": {
         "dependency": "direct main",
         "description": {
           "name": "dap",
-          "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa",
+          "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.3.0"
+        "version": "1.4.0"
+      },
+      "dart_service_protocol_shared": {
+        "dependency": "transitive",
+        "description": {
+          "name": "dart_service_protocol_shared",
+          "sha256": "1737875c176d7e3d87bb3a359182828b542fe20a0b34198b8d31a81af5c7a76d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.0.3"
+      },
+      "dart_style": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dart_style",
+          "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.2"
+      },
+      "data_assets": {
+        "dependency": "direct main",
+        "description": {
+          "name": "data_assets",
+          "sha256": "ecd2682157e882f17d5653110b835f4885f36379eaef7f21b500af2485a0d6dd",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.19.3"
       },
       "dds": {
         "dependency": "direct main",
         "description": {
           "name": "dds",
-          "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95",
+          "sha256": "b80c44468f5549867f65c43b0c6ecf0872261e86beb75087ed6c1d7f82e9db22",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "4.2.7"
+        "version": "5.0.3"
       },
       "dds_service_extensions": {
         "dependency": "direct main",
         "description": {
           "name": "dds_service_extensions",
-          "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2",
+          "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.0.0"
+        "version": "2.1.0"
       },
       "devtools_shared": {
         "dependency": "direct main",
         "description": {
           "name": "devtools_shared",
-          "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50",
+          "sha256": "275e48a8a145fa09c7ae433a96fd433c01cc079d39b40acf5ba883236ae2c887",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "10.0.2"
+        "version": "12.0.0"
       },
       "dtd": {
         "dependency": "direct main",
         "description": {
           "name": "dtd",
-          "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86",
+          "sha256": "09ddb228b3d1478a093556357692a4c203ff4f9d5f8cda05dfdca0ff3fb7c5d3",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.3.0"
+        "version": "4.0.0"
       },
       "dwds": {
         "dependency": "direct main",
         "description": {
           "name": "dwds",
-          "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc",
+          "sha256": "40b2ca48063d593a0a31144beba282b6688e64e3b0e9f5dbe17250fef078f352",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "24.1.0"
+        "version": "25.1.0+2"
       },
       "extension_discovery": {
         "dependency": "direct main",
@@ -332,61 +376,61 @@
         "dependency": "direct main",
         "description": {
           "name": "fake_async",
-          "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+          "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.3.1"
+        "version": "1.3.3"
       },
       "ffi": {
         "dependency": "direct main",
         "description": {
           "name": "ffi",
-          "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+          "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.1.3"
+        "version": "2.1.4"
       },
       "file": {
         "dependency": "direct main",
         "description": {
           "name": "file",
-          "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+          "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "7.0.0"
+        "version": "7.0.1"
       },
       "file_testing": {
         "dependency": "direct dev",
         "description": {
           "name": "file_testing",
-          "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5",
+          "sha256": "eb0c85fd118ddc0d41c295c09f64e0924c256b071087cdc9828d5372c80d554d",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.0.0"
+        "version": "3.0.2"
       },
       "fixnum": {
         "dependency": "direct main",
         "description": {
           "name": "fixnum",
-          "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+          "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.1.0"
+        "version": "1.1.1"
       },
       "flutter_template_images": {
         "dependency": "direct main",
         "description": {
           "name": "flutter_template_images",
-          "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6",
+          "sha256": "0120589a786dbae4e86af1f61748baccd8530abd56a60e7a13479647a75222fe",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "4.2.0"
+        "version": "5.0.0"
       },
       "frontend_server_client": {
         "dependency": "direct main",
@@ -402,11 +446,11 @@
         "dependency": "direct main",
         "description": {
           "name": "glob",
-          "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+          "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.1.2"
+        "version": "2.1.3"
       },
       "graphs": {
         "dependency": "direct main",
@@ -418,75 +462,95 @@
         "source": "hosted",
         "version": "2.3.2"
       },
+      "hooks": {
+        "dependency": "direct main",
+        "description": {
+          "name": "hooks",
+          "sha256": "22abd27b650a571e53576abe732e4d9053aacaaa6dee23e9ff106c63e3e5b96c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.20.1"
+      },
+      "hooks_runner": {
+        "dependency": "direct main",
+        "description": {
+          "name": "hooks_runner",
+          "sha256": "da70762516f169bedf97978fe142853c4599ff26f48b77167ba0e8158629ec14",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.23.0"
+      },
       "html": {
         "dependency": "direct main",
         "description": {
           "name": "html",
-          "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+          "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.15.4"
+        "version": "0.15.6"
       },
       "http": {
         "dependency": "direct main",
         "description": {
           "name": "http",
-          "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+          "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.2.2"
+        "version": "1.5.0"
       },
       "http_multi_server": {
         "dependency": "direct main",
         "description": {
           "name": "http_multi_server",
-          "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+          "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.2.1"
+        "version": "3.2.2"
       },
       "http_parser": {
         "dependency": "direct main",
         "description": {
           "name": "http_parser",
-          "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4",
+          "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "4.1.0"
+        "version": "4.1.2"
       },
       "intl": {
         "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": "direct main",
         "description": {
           "name": "io",
-          "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+          "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.0.4"
+        "version": "1.0.5"
       },
       "js": {
-        "dependency": "direct main",
+        "dependency": "direct dev",
         "description": {
           "name": "js",
-          "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
+          "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.7.1"
+        "version": "0.7.2"
       },
       "json_annotation": {
         "dependency": "direct dev",
@@ -502,114 +566,84 @@
         "dependency": "direct main",
         "description": {
           "name": "json_rpc_2",
-          "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e",
+          "sha256": "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.0.2"
+        "version": "3.0.3"
       },
       "logging": {
         "dependency": "direct main",
         "description": {
           "name": "logging",
-          "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
+          "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.2.0"
-      },
-      "macros": {
-        "dependency": "transitive",
-        "description": {
-          "name": "macros",
-          "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.3-main.0"
+        "version": "1.3.0"
       },
       "matcher": {
         "dependency": "direct main",
         "description": {
           "name": "matcher",
-          "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+          "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.12.16+1"
+        "version": "0.12.17"
       },
       "meta": {
         "dependency": "direct main",
         "description": {
           "name": "meta",
-          "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+          "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.15.0"
+        "version": "1.17.0"
       },
       "mime": {
         "dependency": "direct main",
         "description": {
           "name": "mime",
-          "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.6"
-      },
-      "multicast_dns": {
-        "dependency": "direct main",
-        "description": {
-          "name": "multicast_dns",
-          "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.2+7"
-      },
-      "mustache_template": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mustache_template",
-          "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
+          "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
           "url": "https://pub.dev"
         },
         "source": "hosted",
         "version": "2.0.0"
       },
-      "native_assets_builder": {
+      "multicast_dns": {
         "dependency": "direct main",
         "description": {
-          "name": "native_assets_builder",
-          "sha256": "ad76e66cc1ca7aa922d682651aee2663cd80e6ba483a346d13a8c40f604ebfd9",
+          "name": "multicast_dns",
+          "sha256": "de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.8.3"
+        "version": "0.3.3"
       },
-      "native_assets_cli": {
+      "mustache_template": {
         "dependency": "direct main",
         "description": {
-          "name": "native_assets_cli",
-          "sha256": "db902509468ec2a6c6d11fa9ce02805ede280e8dbfb5f0014ef3de8483cadfce",
+          "name": "mustache_template",
+          "sha256": "d9aa84d114368b7f1727b7014b85bb0b234daeafe1518824c82d32703b3964f6",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.8.0"
+        "version": "2.0.1"
       },
       "native_stack_traces": {
         "dependency": "direct main",
         "description": {
           "name": "native_stack_traces",
-          "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f",
+          "sha256": "d34cf916db87b14d39465b3e3b4b4a8ee1f304bde6ed7605571e34802e3d6a11",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.6.0"
+        "version": "0.6.1"
       },
       "node_preamble": {
-        "dependency": "direct main",
+        "dependency": "direct dev",
         "description": {
           "name": "node_preamble",
           "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
@@ -622,81 +656,81 @@
         "dependency": "direct main",
         "description": {
           "name": "package_config",
-          "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+          "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.1.0"
+        "version": "2.2.0"
       },
       "path": {
         "dependency": "direct main",
         "description": {
           "name": "path",
-          "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+          "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.9.0"
+        "version": "1.9.1"
       },
       "petitparser": {
         "dependency": "direct main",
         "description": {
           "name": "petitparser",
-          "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+          "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "6.0.2"
+        "version": "6.1.0"
       },
       "platform": {
         "dependency": "direct main",
         "description": {
           "name": "platform",
-          "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+          "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.1.5"
+        "version": "3.1.6"
       },
       "pool": {
         "dependency": "direct main",
         "description": {
           "name": "pool",
-          "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+          "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.5.1"
+        "version": "1.5.2"
       },
       "process": {
         "dependency": "direct main",
         "description": {
           "name": "process",
-          "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
+          "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "5.0.2"
+        "version": "5.0.5"
       },
       "pub_semver": {
         "dependency": "direct main",
         "description": {
           "name": "pub_semver",
-          "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+          "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.1.4"
+        "version": "2.2.0"
       },
       "pubspec_parse": {
-        "dependency": "direct dev",
+        "dependency": "direct main",
         "description": {
           "name": "pubspec_parse",
-          "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+          "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.3.0"
+        "version": "1.5.0"
       },
       "shelf": {
         "dependency": "direct main",
@@ -742,11 +776,11 @@
         "dependency": "direct main",
         "description": {
           "name": "shelf_web_socket",
-          "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+          "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.0.0"
+        "version": "2.0.1"
       },
       "source_map_stack_trace": {
         "dependency": "direct main",
@@ -762,21 +796,21 @@
         "dependency": "direct main",
         "description": {
           "name": "source_maps",
-          "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
+          "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.10.12"
+        "version": "0.10.13"
       },
       "source_span": {
         "dependency": "direct main",
         "description": {
           "name": "source_span",
-          "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+          "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.10.0"
+        "version": "1.10.1"
       },
       "sprintf": {
         "dependency": "direct main",
@@ -792,21 +826,21 @@
         "dependency": "direct main",
         "description": {
           "name": "sse",
-          "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a",
+          "sha256": "fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "4.1.6"
+        "version": "4.1.8"
       },
       "stack_trace": {
         "dependency": "direct main",
         "description": {
           "name": "stack_trace",
-          "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+          "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.12.0"
+        "version": "1.12.1"
       },
       "standard_message_codec": {
         "dependency": "direct main",
@@ -822,21 +856,21 @@
         "dependency": "direct main",
         "description": {
           "name": "stream_channel",
-          "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+          "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.1.2"
+        "version": "2.1.4"
       },
       "string_scanner": {
         "dependency": "direct main",
         "description": {
           "name": "string_scanner",
-          "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+          "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.3.0"
+        "version": "1.4.1"
       },
       "sync_http": {
         "dependency": "direct main",
@@ -852,61 +886,61 @@
         "dependency": "direct main",
         "description": {
           "name": "term_glyph",
-          "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+          "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.2.1"
+        "version": "1.2.2"
       },
       "test": {
-        "dependency": "direct main",
+        "dependency": "direct dev",
         "description": {
           "name": "test",
-          "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f",
+          "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.25.8"
+        "version": "1.26.3"
       },
       "test_api": {
         "dependency": "direct main",
         "description": {
           "name": "test_api",
-          "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+          "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.7.3"
+        "version": "0.7.7"
       },
       "test_core": {
         "dependency": "direct main",
         "description": {
           "name": "test_core",
-          "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d",
+          "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.6.5"
+        "version": "0.6.12"
       },
       "typed_data": {
         "dependency": "direct main",
         "description": {
           "name": "typed_data",
-          "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+          "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.3.2"
+        "version": "1.4.0"
       },
       "unified_analytics": {
         "dependency": "direct main",
         "description": {
           "name": "unified_analytics",
-          "sha256": "9f3c68cb30faa6d05b920498d2af79eace00fef0bae9beba9f3cda84fdbe46df",
+          "sha256": "8d1429a4b27320a9c4fc854287d18c8fde1549bf622165c5837202a9f370b53d",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "6.1.4"
+        "version": "8.0.5"
       },
       "usage": {
         "dependency": "direct main",
@@ -932,21 +966,21 @@
         "dependency": "direct main",
         "description": {
           "name": "vm_service",
-          "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+          "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "14.3.0"
+        "version": "15.0.2"
       },
       "vm_service_interface": {
         "dependency": "direct main",
         "description": {
           "name": "vm_service_interface",
-          "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c",
+          "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.1.0"
+        "version": "2.0.1"
       },
       "vm_snapshot_analysis": {
         "dependency": "direct main",
@@ -962,51 +996,51 @@
         "dependency": "direct main",
         "description": {
           "name": "watcher",
-          "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+          "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.1.0"
+        "version": "1.1.4"
       },
       "web": {
         "dependency": "direct main",
         "description": {
           "name": "web",
-          "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+          "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "1.1.0"
+        "version": "1.1.1"
       },
       "web_socket": {
         "dependency": "direct main",
         "description": {
           "name": "web_socket",
-          "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+          "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "0.1.6"
+        "version": "1.0.1"
       },
       "web_socket_channel": {
         "dependency": "direct main",
         "description": {
           "name": "web_socket_channel",
-          "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+          "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.0.1"
+        "version": "3.0.3"
       },
       "webdriver": {
         "dependency": "direct main",
         "description": {
           "name": "webdriver",
-          "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
+          "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.0.4"
+        "version": "3.1.0"
       },
       "webkit_inspection_protocol": {
         "dependency": "direct main",
@@ -1032,25 +1066,25 @@
         "dependency": "direct main",
         "description": {
           "name": "yaml",
-          "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+          "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "3.1.2"
+        "version": "3.1.3"
       },
       "yaml_edit": {
         "dependency": "direct main",
         "description": {
           "name": "yaml_edit",
-          "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
+          "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
           "url": "https://pub.dev"
         },
         "source": "hosted",
-        "version": "2.2.1"
+        "version": "2.2.2"
       }
     },
     "sdks": {
-      "dart": ">=3.4.3 <4.0.0"
+      "dart": ">=3.9.0 <4.0.0"
     }
   }
 }
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch
new file mode 100644
index 000000000000..c99d771299fe
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch
@@ -0,0 +1,21 @@
+diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
+index df67547..eacc7c4 100644
+--- a/packages/flutter_tools/lib/src/flutter_cache.dart
++++ b/packages/flutter_tools/lib/src/flutter_cache.dart
+@@ -51,16 +51,6 @@ class FlutterCache extends Cache {
+       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
+     }
+     registerArtifact(FontSubsetArtifacts(this, platform: platform));
+-    registerArtifact(
+-      PubDependencies(
+-        logger: logger,
+-        // flutter root and pub must be lazily initialized to avoid accessing
+-        // before the version is determined.
+-        flutterRoot: () => Cache.flutterRoot!,
+-        pub: () => pub,
+-        projectFactory: projectFactory,
+-      ),
+-    );
+   }
+ }
+ 
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch
similarity index 72%
rename from pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch
rename to pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch
index 2ad292efd222..58be974b10db 100644
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch
@@ -12,19 +12,18 @@ index e4e474ab6e..5548599802 100644
        // ios-deploy on macOS) are required to determine `requiredArtifacts`.
        final bool offline;
 diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 50783f8435..db94062840 100644
+index a1104da..1749d65 100644
 --- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
 +++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.analytics.suppressTelemetry();
-         }
+@@ -437,11 +437,6 @@
+         // Required to support `flutter --version` before artifacts are cached.
+         await globals.cache.updateAll(<DevelopmentArtifact>{DevelopmentArtifact.informative});
  
 -        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
--        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
+-        if (await _shouldCheckForUpdates(topLevelResults)) {
 -          await globals.flutterVersion.checkFlutterVersionFreshness();
 -        }
- 
+-
          // See if the user specified a specific device.
-         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
-
+         final specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
+         if (specifiedDeviceId != null) {
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch
similarity index 95%
rename from pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch
rename to pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch
index 825d40fc6176..9e43b62cbb4d 100644
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch
@@ -35,10 +35,10 @@ diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tool
 index 2889d7c8e4..48b9d06c6e 100755
 --- a/packages/flutter_tools/bin/xcode_backend.sh
 +++ b/packages/flutter_tools/bin/xcode_backend.sh
-@@ -6,24 +6,7 @@
+@@ -13,24 +13,7 @@
  # exit on error, or usage of unset var
  set -euo pipefail
- 
+
 -# Needed because if it is set, cd may print the path it changed to.
 -unset CDPATH
 -
@@ -59,11 +59,10 @@ index 2889d7c8e4..48b9d06c6e 100755
 -FLUTTER_ROOT="$BIN_DIR/../../.."
 -DART="$FLUTTER_ROOT/bin/dart"
 -
--"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
+-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" "ios"
 +# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
 +dart="${FLUTTER_ROOT}/bin/dart"
 +xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
-+exec "${dart}" "${xcode_backend_dart}" "$@"
++exec "${dart}" "${xcode_backend_dart}" "$@" "ios"
 -- 
 2.46.0
-
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch
new file mode 100644
index 000000000000..312ec3a5c1ba
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch
@@ -0,0 +1,59 @@
+Fix for macOS build issue in Flutter >= 3.35
+
+Since version 3.35, the behavior of macos_assemble.sh and xcode_backend.sh
+is almost identical. This caused the same error for macOS that previously
+occurred for iOS.
+
+Derived from the iOS patch: ./fix-ios-build-xcode-backend-sh.patch
+
+Example error:
+```
+$ flutter run -d macos
+Launching lib/main.dart on macOS in debug mode...
+Target debug_unpack_macos failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.35.1-unwrapped/bin/cache/artifacts".
+Please ensure that the SDK and/or project is installed in a location that has read/write permissions for the current user.
+Failed to copy Flutter framework.
+** BUILD FAILED **
+```
+
+---
+
+diff --git a/packages/flutter_tools/bin/macos_assemble.sh b/packages/flutter_tools/bin/macos_assemble.sh
+index 28acf8842..d0f2923df 100644
+--- a/packages/flutter_tools/bin/macos_assemble.sh
++++ b/packages/flutter_tools/bin/macos_assemble.sh
+@@ -13,29 +13,13 @@
+ # exit on error, or usage of unset var
+ set -euo pipefail
+ 
+-# Needed because if it is set, cd may print the path it changed to.
+-unset CDPATH
+-
+-function follow_links() (
+-  cd -P "$(dirname -- "$1")"
+-  file="$PWD/$(basename -- "$1")"
+-  while [[ -h "$file" ]]; do
+-    cd -P "$(dirname -- "$file")"
+-    file="$(readlink -- "$file")"
+-    cd -P "$(dirname -- "$file")"
+-    file="$PWD/$(basename -- "$file")"
+-  done
+-  echo "$file"
+-)
+-
+-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
+-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+-FLUTTER_ROOT="$BIN_DIR/../../.."
+-DART="$FLUTTER_ROOT/bin/dart"
++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
++dart="${FLUTTER_ROOT}/bin/dart"
++xcode_backend_dart="$(dirname "${BASH_SOURCE[0]}")/xcode_backend.dart"
+ 
+ # Main entry point.
+ if [[ $# == 0 ]]; then
+-  "$DART" "$BIN_DIR/xcode_backend.dart" "build" "macos"
++  exec "${dart}" "${xcode_backend_dart}" "build" "macos"
+ else
+-  "$DART" "$BIN_DIR/xcode_backend.dart" "$@" "macos"
++  exec "${dart}" "${xcode_backend_dart}" "$@" "macos"
+ fi
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch
new file mode 100644
index 000000000000..4c5b258be373
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch
@@ -0,0 +1,220 @@
+This patch introduces an intermediate Gradle build step to alter the behavior
+of flutter_tools' Gradle project, specifically moving the creation of `build`
+and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
+
+Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
+directories within the Nix Store. Resulting in read-only errors when trying to build a
+Flutter Android app at runtime.
+
+This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
+when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
+
+`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
+
+The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
+This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
+`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
+
+To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, we need to set `buildDirectory`.
+To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper.
+Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in.
+--- /dev/null
++++ b/packages/flutter_tools/gradle/settings.gradle
+@@ -0,0 +1,19 @@
++rootProject.buildFileName = "/dev/null"
++
++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
++dir.mkdirs()
++def file = new File(dir, "settings.gradle")
++
++file.text = """
++rootProject.projectDir = new File("$settingsDir")
++apply from: new File("$settingsDir/settings.gradle.kts")
++
++gradle.allprojects { project ->
++  project.beforeEvaluate {
++    project.layout.buildDirectory = new File("$dir/build")
++  }
++}
++"""
++
++includeBuild(dir)
+--- a/packages/flutter_tools/gradle/build.gradle.kts
++++ b/packages/flutter_tools/gradle/build.gradle.kts
+@@ -4,6 +4,11 @@
+ 
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+ 
++// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter
++// is not passed correctly to the Kotlin Gradle plugin for some reason, and so
++// must be set here as well.
++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
++
+ plugins {
+     `java-gradle-plugin`
+     groovy
+--- a/packages/flutter_tools/lib/src/android/gradle.dart
++++ b/packages/flutter_tools/lib/src/android/gradle.dart
+@@ -474,9 +474,9 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     // from the local.properties file.
+     updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo);
+ 
+-    final options = <String>[];
+-
+-    final String gradleExecutablePath = _gradleUtils.getExecutable(project);
++    final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++      project,
++    );
+ 
+     // All automatically created files should exist.
+     if (configOnly) {
+@@ -797,7 +797,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
+       'aar_init_script.gradle',
+     );
+     final command = <String>[
+-      _gradleUtils.getExecutable(project),
++      ..._gradleUtils.getExecutable(project),
+       '-I=$initScript',
+       '-Pflutter-root=$flutterRoot',
+       '-Poutput-dir=${outputDirectory.path}',
+@@ -912,6 +912,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     final results = <String>[];
+ 
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         _kBuildVariantTaskName,
+         preRunTask: () {
+@@ -927,10 +931,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: const <String>['-q'],
++        options: <String>[...options, '-q'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+         outputParser: (String line) {
+           if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) {
+             results.add(match.namedGroup(_kBuildVariantRegexGroupName)!);
+@@ -964,6 +968,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     late Stopwatch sw;
+     var exitCode = 1;
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         taskName,
+         preRunTask: () {
+@@ -979,10 +987,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: <String>['-q', '-PoutputPath=$outputPath'],
++        options: <String>[...options, '-q', '-PoutputPath=$outputPath'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+       );
+     } on Error catch (error) {
+       _logger.printError(error.toString());
+--- a/packages/flutter_tools/lib/src/android/gradle_errors.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart
+@@ -228,7 +228,12 @@ final flavorUndefinedHandler = GradleHandledError(
+   },
+   handler: ({required String line, required FlutterProject project, required bool usesAndroidX}) async {
+     final RunResult tasksRunResult = await globals.processUtils.run(
+-      <String>[globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'],
++      <String>[
++        ...globals.gradleUtils!.getExecutable(project),
++        'app:tasks',
++        '--all',
++        '--console=auto',
++      ],
+       throwOnError: true,
+       workingDirectory: project.android.hostAppGradleRoot.path,
+       environment: globals.java?.environment,
+--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+ 
+ import 'package:meta/meta.dart';
++import 'package:path/path.dart';
+ import 'package:process/process.dart';
+ import 'package:unified_analytics/unified_analytics.dart';
+ 
+@@ -197,9 +198,29 @@ class GradleUtils {
+   final Logger _logger;
+   final OperatingSystemUtils _operatingSystemUtils;
+ 
++  List<String> get _requiredArguments {
++    final String cacheDir = join(
++      switch (globals.platform.environment['XDG_CACHE_HOME']) {
++        final String cacheHome => cacheHome,
++        _ => join(
++          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),
++          '.cache',
++        ),
++      },
++      'flutter',
++      'nix-flutter-tools-gradle',
++      globals.flutterVersion.engineRevision.substring(0, 10),
++    );
++
++    return <String>[
++      '--project-cache-dir=${join(cacheDir, 'cache')}',
++      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',
++    ];
++  }
++
+   /// Gets the Gradle executable path and prepares the Gradle project.
+   /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.
+-  String getExecutable(FlutterProject project) {
++  List<String> getExecutable(FlutterProject project) {
+     final Directory androidDir = project.android.hostAppGradleRoot;
+     injectGradleWrapperIfNeeded(androidDir);
+ 
+@@ -210,7 +231,7 @@ class GradleUtils {
+       // If the Gradle executable doesn't have execute permission,
+       // then attempt to set it.
+       _operatingSystemUtils.makeExecutable(gradle);
+-      return gradle.absolute.path;
++      return <String>[gradle.absolute.path, ..._requiredArguments];
+     }
+     throwToolExit(
+       'Unable to locate gradlew script. Please check that ${gradle.path} '
+--- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
+@@ -2606,8 +2606,8 @@ Gradle Crashed
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
+--- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
+@@ -1633,8 +1633,8 @@ Platform fakePlatform(String name) {
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 703e280dc14b..5a79e9f7b118 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -24,7 +24,7 @@
   makeWrapper,
   writeShellScript,
   wrapGAppsHook3,
-  git,
+  gitMinimal,
   which,
   pkg-config,
   atk,
@@ -64,8 +64,8 @@ let
     name = "flutter-cache-dir";
     paths = builtins.attrValues flutterPlatformArtifacts;
     postBuild = ''
-      mkdir -p "$out/bin/cache"
-      ln -s '${flutter}/bin/cache/dart-sdk' "$out/bin/cache"
+      mkdir --parents "$out/bin/cache"
+      ln --symbolic '${flutter}/bin/cache/dart-sdk' "$out/bin/cache"
     '';
     passthru.flutterPlatform = flutterPlatformArtifacts;
   };
@@ -79,7 +79,7 @@ let
 
   # Tools that the Flutter tool depends on.
   tools = [
-    git
+    gitMinimal
     which
   ];
 
@@ -184,7 +184,7 @@ in
         addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
       done
 
-      mkdir -p $out/bin
+      mkdir --parents $out/bin
       makeWrapper '${immutableFlutter}' $out/bin/flutter \
         --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
     ''
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 7ac3fc752443..7cef2840a902 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -80,9 +80,6 @@ stdenv.mkDerivation rec {
     "FPC=${startFPC}/bin/fpc"
   ];
 
-  # disabled by default in fpcsrc/compiler/llvm/agllvm.pas
-  hardeningDisable = [ "pie" ];
-
   installFlags = [ "INSTALL_PREFIX=\${out}" ];
 
   postInstall = ''
diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index 1aba286411bd..26fa34c03c30 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -2,11 +2,12 @@
   lib,
   stdenv,
   pkgs,
+  overrideCC,
+  buildPackages,
   targetPackages,
   callPackage,
   isl_0_20,
   noSysDirs,
-  lowPrio,
   wrapCC,
 }@args:
 
@@ -18,7 +19,7 @@ let
       majorVersion = lib.versions.major majorMinorVersion;
       atLeast = lib.versionAtLeast majorMinorVersion;
       attrName = "gcc${lib.replaceStrings [ "." ] [ "" ] majorMinorVersion}";
-      pkg = lowPrio (
+      pkg = lib.lowPrio (
         wrapCC (
           callPackage ./default.nix {
             inherit noSysDirs;
@@ -62,7 +63,7 @@ let
                 )
                 && stdenv.cc.isGNU
               then
-                pkgs."gcc${majorVersion}Stdenv"
+                overrideCC stdenv buildPackages."gcc${majorVersion}"
               else
                 stdenv;
           }
diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index e6acca591005..7f5ba5aa8bf1 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -19,7 +19,7 @@
   cargo,
   staticCompiler ? false,
   enableShared ? stdenv.targetPlatform.hasSharedLibraries,
-  enableDefaultPie ? true,
+  enableDefaultPie ? stdenv.targetPlatform.hasSharedLibraries,
   enableLTO ? stdenv.hostPlatform.hasSharedLibraries,
   texinfo ? null,
   perl ? null, # optional, for texi2pod (then pod2man)
@@ -234,7 +234,6 @@ pipe
 
       hardeningDisable = [
         "format"
-        "pie"
         "stackclashprotection"
       ];
 
diff --git a/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix b/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
index 33b817420035..307a7061bc57 100644
--- a/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
@@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir ../../build
     cd ../../build
     configureScript=../$sourceRoot/configure
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # GNU debuglink is not supported on macOS (Mach-O format)
+    # Skip the gnudebuglink tests which fail on Darwin
+    export libbacktrace_cv_objcopy_debuglink=no
   '';
 
   installPhase = ''
diff --git a/pkgs/development/compilers/gcc/ng/default.nix b/pkgs/development/compilers/gcc/ng/default.nix
index dd70df537853..a205ab6a055a 100644
--- a/pkgs/development/compilers/gcc/ng/default.nix
+++ b/pkgs/development/compilers/gcc/ng/default.nix
@@ -3,7 +3,6 @@
   callPackage,
   stdenv,
   stdenvAdapters,
-  recurseIntoAttrs,
   gccVersions ? { },
   patchesFn ? lib.id,
   buildPackages,
@@ -44,7 +43,7 @@ let
         args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
     in
     lib.nameValuePair attrName (
-      recurseIntoAttrs (
+      lib.recurseIntoAttrs (
         callPackage ./common (
           {
             inherit (stdenvAdapters) overrideCC;
diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index eb902364dee6..93a1d4eb5cf3 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -222,7 +222,7 @@ optionals noSysDirs (
   .${majorVersion} or [ ]
 )
 
-++ optional targetPlatform.isCygwin (fetchpatch {
+++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (fetchpatch {
   name = "libstdc-fix-compilation-in-freestanding-win32.patch";
   url = "https://inbox.sourceware.org/gcc-patches/20250922182808.2599390-2-corngood@gmail.com/raw";
   hash = "sha256-+EYW9lG8CviVX7RyNHp+iX+8BRHUjt5b07k940khbbY=";
diff --git a/pkgs/development/compilers/ghc/9.0.2-binary.nix b/pkgs/development/compilers/ghc/9.0.2-binary.nix
index acf7effd7083..3ff091165b39 100644
--- a/pkgs/development/compilers/ghc/9.0.2-binary.nix
+++ b/pkgs/development/compilers/ghc/9.0.2-binary.nix
@@ -474,13 +474,6 @@ stdenv.mkDerivation {
       "$out/bin/ghc-pkg" --package-db="$package_db" recache
     '';
 
-  # GHC cannot currently produce outputs that are ready for `-pie` linking.
-  # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
-  # See:
-  # * https://github.com/NixOS/nixpkgs/issues/129247
-  # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
-  hardeningDisable = [ "pie" ];
-
   doInstallCheck = true;
   installCheckPhase = ''
     # Sanity check, can ghc create executables?
diff --git a/pkgs/development/compilers/ghc/9.10.1.nix b/pkgs/development/compilers/ghc/9.10.1.nix
deleted file mode 100644
index d1824ce680fd..000000000000
--- a/pkgs/development/compilers/ghc/9.10.1.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common-hadrian.nix {
-  version = "9.10.1";
-  sha256 = "bf386a302d4ee054791ffd51748900f15d71760fd199157922d120cc1f89e2f7";
-}
diff --git a/pkgs/development/compilers/ghc/9.12.1.nix b/pkgs/development/compilers/ghc/9.12.1.nix
deleted file mode 100644
index 6dd4bac79411..000000000000
--- a/pkgs/development/compilers/ghc/9.12.1.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common-hadrian.nix {
-  version = "9.12.1";
-  sha256 = "4a7410bdeec70f75717087b8f94bf5a6598fd61b3a0e1f8501d8f10be1492754";
-}
diff --git a/pkgs/development/compilers/ghc/9.2.4-binary.nix b/pkgs/development/compilers/ghc/9.2.4-binary.nix
deleted file mode 100644
index 44544744244a..000000000000
--- a/pkgs/development/compilers/ghc/9.2.4-binary.nix
+++ /dev/null
@@ -1,500 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  perl,
-  gcc,
-  ncurses5,
-  ncurses6,
-  gmp,
-  libiconv,
-  numactl,
-  libffi,
-  coreutils,
-  targetPackages,
-
-  # minimal = true; will remove files that aren't strictly necessary for
-  # regular builds and GHC bootstrapping.
-  # This is "useful" for staying within hydra's output limits for at least the
-  # aarch64-linux architecture.
-  minimal ? false,
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
-  downloadsUrl = "https://downloads.haskell.org/ghc";
-
-  # Copy sha256 from https://downloads.haskell.org/~ghc/9.2.4/SHA256SUMS
-  version = "9.2.4";
-
-  # Information about available bindists that we use in the build.
-  #
-  # # Bindist library checking
-  #
-  # The field `archSpecificLibraries` also provides a way for us get notified
-  # early when the upstream bindist changes its dependencies (e.g. because a
-  # newer Debian version is used that uses a new `ncurses` version).
-  #
-  # Usage:
-  #
-  # * You can find the `fileToCheckFor` of libraries by running `readelf -d`
-  #   on the compiler binary (`exePathForLibraryCheck`).
-  # * To skip library checking for an architecture,
-  #   set `exePathForLibraryCheck = null`.
-  # * To skip file checking for a specific arch specific library,
-  #   set `fileToCheckFor = null`.
-  ghcBinDists = {
-    # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin)
-    # nixpkgs uses for the respective system.
-    defaultLibc = {
-      i686-linux = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
-          sha256 = "5dc1eb9c65f01b1e5c5693af72af07a4e9e75c6920e620fd598daeefa804487a";
-        };
-        exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          # The i686-linux bindist provided by GHC HQ is currently built on Debian 9,
-          # which link it against `libtinfo.so.5` (ncurses 5).
-          # Other bindists are linked `libtinfo.so.6` (ncurses 6).
-          {
-            nixPackage = ncurses5;
-            fileToCheckFor = "libtinfo.so.5";
-          }
-        ];
-      };
-      x86_64-linux = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
-          sha256 = "a77a91a39d9b0167124b7e97648b2b52973ae0978cb259e0d44f0752a75037cb";
-        };
-        exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = "libtinfo.so.6";
-          }
-        ];
-      };
-      aarch64-linux = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
-          sha256 = "fc7dbc6bae36ea5ac30b7e9a263b7e5be3b45b0eb3e893ad0bc2c950a61f14ec";
-        };
-        exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = "libtinfo.so.6";
-          }
-          {
-            nixPackage = numactl;
-            fileToCheckFor = null;
-          }
-        ];
-      };
-      x86_64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-          sha256 = "f2e8366fd3754dd9388510792aba2d2abecb1c2f7f1e5555f6065c3c5e2ffec4";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-        isHadrian = true;
-      };
-      aarch64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
-          sha256 = "8cf8408544a1a43adf1bbbb0dd6b074efadffc68bfa1a792947c52e825171224";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-        isHadrian = true;
-      };
-    };
-    # Binary distributions for the musl libc for the respective system.
-    musl = {
-      x86_64-linux = {
-        variantSuffix = "-musl";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.12-linux-gmp.tar.xz";
-          sha256 = "026348947d30a156b84de5d6afeaa48fdcb2795b47954cd8341db00d3263a481";
-        };
-        isStatic = true;
-        isHadrian = true;
-        # We can't check the RPATH for statically linked executable
-        exePathForLibraryCheck = null;
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp.override { withStatic = true; };
-            fileToCheckFor = null;
-          }
-        ];
-      };
-    };
-  };
-
-  distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc";
-
-  binDistUsed =
-    ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}
-      or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')");
-
-  gmpUsed =
-    (builtins.head (
-      builtins.filter (
-        drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "")
-      ) binDistUsed.archSpecificLibraries
-    )).nixPackage;
-
-  libPath = lib.makeLibraryPath (
-    # Add arch-specific libraries.
-    map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
-  );
-
-  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
-
-  runtimeDeps = [
-    targetPackages.stdenv.cc
-    targetPackages.stdenv.cc.bintools
-    coreutils # for cat
-  ]
-  # On darwin, we need unwrapped bintools as well (for otool)
-  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-    targetPackages.stdenv.cc.bintools.bintools
-  ];
-
-in
-
-stdenv.mkDerivation {
-  inherit version;
-  pname = "ghc-binary${binDistUsed.variantSuffix}";
-
-  src = fetchurl binDistUsed.src;
-
-  nativeBuildInputs = [ perl ];
-
-  # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
-  # of the bindist installer can find the libraries they expect.
-  # Cannot patchelf beforehand due to relative RPATHs that anticipate
-  # the final install location.
-  ${libEnvVar} = libPath;
-
-  postUnpack =
-    # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
-    # so that we know when ghc bindists upgrade that and we need to update the
-    # version used in `libPath`.
-    lib.optionalString (binDistUsed.exePathForLibraryCheck != null)
-      # Note the `*` glob because some GHCs have a suffix when unpacked, e.g.
-      # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`.
-      # As a result, don't shell-quote this glob when splicing the string.
-      (
-        let
-          buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
-        in
-        lib.concatStringsSep "\n" [
-          ''
-            shopt -u nullglob
-            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
-            if ! test -e ${buildExeGlob}; then
-              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
-            fi
-          ''
-          (lib.concatMapStringsSep "\n" (
-            { fileToCheckFor, nixPackage }:
-            lib.optionalString (fileToCheckFor != null) ''
-              echo "Checking bindist for ${fileToCheckFor} to ensure that is still used"
-              if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then
-                echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
-              fi
-
-              echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}"
-              if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then
-                echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
-              fi
-            ''
-          ) binDistUsed.archSpecificLibraries)
-        ]
-      )
-    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
-    # during linking
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export NIX_LDFLAGS+=" -no_dtrace_dof"
-      # not enough room in the object files for the full path to libiconv :(
-      for exe in $(find . -type f -executable); do
-        isScript $exe && continue
-        ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-      done
-    ''
-    +
-
-      # Some scripts used during the build need to have their shebangs patched
-      ''
-        patchShebangs ghc-${version}/utils/
-        patchShebangs ghc-${version}/configure
-        test -d ghc-${version}/inplace/bin && \
-          patchShebangs ghc-${version}/inplace/bin
-      ''
-    +
-      # We have to patch the GMP paths for the integer-gmp package.
-      ''
-        find . -name ghc-bignum.buildinfo \
-            -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${lib.getLib gmpUsed}/lib@" {} \;
-
-        # we need to modify the package db directly for hadrian bindists
-        find . -name 'ghc-bignum*.conf' \
-            -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib gmpUsed}/lib' -i {} \;
-      ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # we need to modify the package db directly for hadrian bindists
-      # (all darwin bindists are hadrian-based for 9.2.2)
-      find . -name 'base*.conf' \
-          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libiconv}/lib' -i {} \;
-
-      # To link RTS in the end we also need libffi now
-      find . -name 'rts*.conf' \
-          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libffi}/lib' \
-                    -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
-                    -i {} \;
-    ''
-    +
-      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
-      # FFI_LIB_DIR is a good indication of places it must be needed.
-      lib.optionalString
-        (
-          lib.meta.availableOn stdenv.hostPlatform numactl
-          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
-        )
-        ''
-          find . -name package.conf.in \
-              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
-        ''
-    +
-      # Rename needed libraries and binaries, fix interpreter
-      lib.optionalString stdenv.hostPlatform.isLinux ''
-        find . -type f -executable -exec patchelf \
-            --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
-      '';
-
-  # fix for `configure: error: Your linker is affected by binutils #16177`
-  preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
-
-  configurePlatforms = [ ];
-  configureFlags = [
-    "--with-gmp-includes=${lib.getDev gmpUsed}/include"
-    # Note `--with-gmp-libraries` does nothing for GHC bindists:
-    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6124
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-  # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
-  ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
-
-  # No building is necessary, but calling make without flags ironically
-  # calls install-strip ...
-  dontBuild = true;
-
-  # GHC tries to remove xattrs when installing to work around Gatekeeper
-  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
-  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
-  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
-  # modified (such as target of the symlink to `libiconv.dylib`).
-  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
-  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
-  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
-
-  # Patch scripts to include runtime dependencies in $PATH.
-  postInstall = ''
-    for i in "$out/bin/"*; do
-      test ! -h "$i" || continue
-      isScript "$i" || continue
-      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
-    done
-  '';
-
-  # Apparently necessary for the ghc Alpine (musl) bindist:
-  # When we strip, and then run the
-  #     patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
-  # below, running ghc (e.g. during `installCheckPhase)` gives some apparently
-  # corrupted rpath or whatever makes the loader work on nonsensical strings:
-  #     running install tests
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
-  # This is extremely bogus and should be investigated.
-  dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness
-
-  # On Linux, use patchelf to modify the executables so that they can
-  # find editline/gmp.
-  postFixup =
-    lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (
-      if stdenv.hostPlatform.isAarch64 then
-        # Keep rpath as small as possible on aarch64 for patchelf#244.  All Elfs
-        # are 2 directories deep from $out/lib, so pooling symlinks there makes
-        # a short rpath.
-        ''
-          (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6)
-          (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10)
-          (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1)
-          for p in $(find "$out/lib" -type f -name "*\.so*"); do
-            (cd $out/lib; ln -s $p)
-          done
-
-          for p in $(find "$out/lib" -type f -executable); do
-            if isELF "$p"; then
-              echo "Patchelfing $p"
-              patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p
-            fi
-          done
-        ''
-      else
-        ''
-          for p in $(find "$out" -type f -executable); do
-            if isELF "$p"; then
-              echo "Patchelfing $p"
-              patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
-            fi
-          done
-        ''
-    )
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # not enough room in the object files for the full path to libiconv :(
-      for exe in $(find "$out" -type f -executable); do
-        isScript $exe && continue
-        ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-      done
-
-      for file in $(find "$out" -name setup-config); do
-        substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
-      done
-    ''
-    + lib.optionalString minimal ''
-      # Remove profiling files
-      find $out -type f -name '*.p_o' -delete
-      find $out -type f -name '*.p_hi' -delete
-      find $out -type f -name '*_p.a' -delete
-      # `-f` because e.g. musl bindist does not have this file.
-      rm -f $out/lib/ghc-*/bin/ghc-iserv-prof
-      # Hydra will redistribute this derivation, so we have to keep the docs for
-      # legal reasons (retaining the legal notices etc)
-      # As a last resort we could unpack the docs separately and symlink them in.
-      # They're in $out/share/{doc,man}.
-    ''
-    # Recache package db which needs to happen for Hadrian bindists
-    # where we modify the package db before installing
-    + ''
-      shopt -s nullglob
-      package_db=("$out"/lib/ghc-*/lib/package.conf.d "$out"/lib/ghc-*/package.conf.d)
-      "$out/bin/ghc-pkg" --package-db="$package_db" recache
-    '';
-
-  # GHC cannot currently produce outputs that are ready for `-pie` linking.
-  # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
-  # See:
-  # * https://github.com/NixOS/nixpkgs/issues/129247
-  # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
-  hardeningDisable = [ "pie" ];
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    # Sanity check, can ghc create executables?
-    cd $TMP
-    mkdir test-ghc; cd test-ghc
-    cat > main.hs << EOF
-      {-# LANGUAGE TemplateHaskell #-}
-      module Main where
-      main = putStrLn \$([|"yes"|])
-    EOF
-    env -i $out/bin/ghc --make main.hs || exit 1
-    echo compilation ok
-    [ $(./main) == "yes" ]
-  '';
-
-  passthru = {
-    targetPrefix = "";
-    enableShared = true;
-
-    llvmPackages = null;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-${version}";
-  }
-  # We duplicate binDistUsed here since we have a sensible default even if no bindist is available,
-  # this makes sure that getting the `meta` attribute doesn't throw even on unsupported platforms.
-  // lib.optionalAttrs (ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}.isHadrian or false) {
-    # Normal GHC derivations expose the hadrian derivation used to build them
-    # here. In the case of bindists we just make sure that the attribute exists,
-    # as it is used for checking if a GHC derivation has been built with hadrian.
-    # The isHadrian mechanism will become obsolete with GHCs that use hadrian
-    # exclusively, i.e. 9.6 (and 9.4?).
-    hadrian = null;
-  };
-
-  meta = {
-    homepage = "http://haskell.org/ghc";
-    description = "Glasgow Haskell Compiler";
-    license = lib.licenses.bsd3;
-    # HACK: since we can't encode the libc / abi in platforms, we need
-    # to make the platform list dependent on the evaluation platform
-    # in order to avoid eval errors with musl which supports less
-    # platforms than the default libcs (i. e. glibc / libSystem).
-    # This is done for the benefit of Hydra, so `packagePlatforms`
-    # won't return any platforms that would cause an evaluation
-    # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as
-    # long as the evaluator runs on a platform that supports
-    # `pkgsMusl`.
-    platforms = builtins.attrNames ghcBinDists.${distSetName};
-    teams = [ lib.teams.haskell ];
-    broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
-  };
-}
diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix
deleted file mode 100644
index 2ca353f8ee21..000000000000
--- a/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ /dev/null
@@ -1,474 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  perl,
-  gcc,
-  ncurses5,
-  ncurses6,
-  gmp,
-  libiconv,
-  numactl,
-  libffi,
-  coreutils,
-  targetPackages,
-
-  # minimal = true; will remove files that aren't strictly necessary for
-  # regular builds and GHC bootstrapping.
-  # This is "useful" for staying within hydra's output limits for at least the
-  # aarch64-linux architecture.
-  minimal ? false,
-}:
-
-# Prebuilt only does native
-assert stdenv.targetPlatform == stdenv.hostPlatform;
-
-let
-  downloadsUrl = "https://downloads.haskell.org/ghc";
-
-  # Copy sha256 from https://downloads.haskell.org/~ghc/9.6.3/SHA256SUMS
-  version = "9.6.3";
-
-  # Information about available bindists that we use in the build.
-  #
-  # # Bindist library checking
-  #
-  # The field `archSpecificLibraries` also provides a way for us get notified
-  # early when the upstream bindist changes its dependencies (e.g. because a
-  # newer Debian version is used that uses a new `ncurses` version).
-  #
-  # Usage:
-  #
-  # * You can find the `fileToCheckFor` of libraries by running `readelf -d`
-  #   on the compiler binary (`exePathForLibraryCheck`).
-  # * To skip library checking for an architecture,
-  #   set `exePathForLibraryCheck = null`.
-  # * To skip file checking for a specific arch specific library,
-  #   set `fileToCheckFor = null`.
-  ghcBinDists = {
-    # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin)
-    # nixpkgs uses for the respective system.
-    defaultLibc = {
-      i686-linux = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
-          sha256 = "58be26f8b8f6b5bd8baf5c32abb03e2c4621646b2142fab10e5c7de5af5c50f8";
-        };
-        exePathForLibraryCheck = "bin/ghc";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          # The i686-linux bindist provided by GHC HQ is currently built on Debian 9,
-          # which link it against `libtinfo.so.5` (ncurses 5).
-          # Other bindists are linked `libtinfo.so.6` (ncurses 6).
-          {
-            nixPackage = ncurses5;
-            fileToCheckFor = "libtinfo.so.5";
-          }
-        ];
-      };
-      x86_64-linux = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb11-linux.tar.xz";
-          sha256 = "c4c0124857265926f1cf22a09d950d7ba989ff94053a4ddf3dcdab5359f4cab7";
-        };
-        exePathForLibraryCheck = "bin/ghc";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = "libtinfo.so.6";
-          }
-        ];
-      };
-      aarch64-linux = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
-          sha256 = "03c389859319f09452081310fc13af7525063ea8930830ef76be2a14b312271e";
-        };
-        exePathForLibraryCheck = "bin/ghc";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = "libtinfo.so.6";
-          }
-          {
-            nixPackage = numactl;
-            fileToCheckFor = null;
-          }
-        ];
-      };
-      x86_64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
-          sha256 = "dde46118ab8388fb1066312c097123e93b1dcf6ae366e3370f88ea456382c9db";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-      };
-      aarch64-darwin = {
-        variantSuffix = "";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
-          sha256 = "e1cdf458926b2eaf52d2a8287d99a965040ff9051171f5c3b7467049cf0eb213";
-        };
-        exePathForLibraryCheck = null; # we don't have a library check for darwin yet
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = libiconv;
-            fileToCheckFor = null;
-          }
-        ];
-      };
-    };
-    # Binary distributions for the musl libc for the respective system.
-    musl = {
-      x86_64-linux = {
-        variantSuffix = "-musl";
-        src = {
-          url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3_12-linux.tar.xz";
-          sha256 = "8f457af0aa40127049c11134c8793f64351a446e87da1f8ec256e1279b5ab61f";
-        };
-        exePathForLibraryCheck = "bin/ghc";
-        archSpecificLibraries = [
-          {
-            nixPackage = gmp;
-            fileToCheckFor = null;
-          }
-          {
-            nixPackage = ncurses6;
-            fileToCheckFor = "libncursesw.so.6";
-          }
-        ];
-      };
-    };
-  };
-
-  distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc";
-
-  binDistUsed =
-    ghcBinDists.${distSetName}.${stdenv.hostPlatform.system}
-      or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')");
-
-  gmpUsed =
-    (builtins.head (
-      builtins.filter (
-        drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "")
-      ) binDistUsed.archSpecificLibraries
-    )).nixPackage;
-
-  libPath = lib.makeLibraryPath (
-    # Add arch-specific libraries.
-    map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries
-  );
-
-  libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH";
-
-  runtimeDeps = [
-    targetPackages.stdenv.cc
-    targetPackages.stdenv.cc.bintools
-    coreutils # for cat
-  ]
-  # On darwin, we need unwrapped bintools as well (for otool)
-  ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
-    targetPackages.stdenv.cc.bintools.bintools
-  ];
-
-in
-
-stdenv.mkDerivation {
-  inherit version;
-  pname = "ghc-binary${binDistUsed.variantSuffix}";
-
-  src = fetchurl binDistUsed.src;
-
-  nativeBuildInputs = [ perl ];
-
-  # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
-  # of the bindist installer can find the libraries they expect.
-  # Cannot patchelf beforehand due to relative RPATHs that anticipate
-  # the final install location.
-  ${libEnvVar} = libPath;
-
-  postUnpack =
-    # Verify our assumptions of which `libtinfo.so` (ncurses) version is used,
-    # so that we know when ghc bindists upgrade that and we need to update the
-    # version used in `libPath`.
-    lib.optionalString (binDistUsed.exePathForLibraryCheck != null)
-      # Note the `*` glob because some GHCs have a suffix when unpacked, e.g.
-      # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`.
-      # As a result, don't shell-quote this glob when splicing the string.
-      (
-        let
-          buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"'';
-        in
-        lib.concatStringsSep "\n" [
-          ''
-            shopt -u nullglob
-            echo "Checking that ghc binary exists in bindist at ${buildExeGlob}"
-            if ! test -e ${buildExeGlob}; then
-              echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
-            fi
-          ''
-          (lib.concatMapStringsSep "\n" (
-            { fileToCheckFor, nixPackage }:
-            lib.optionalString (fileToCheckFor != null) ''
-              echo "Checking bindist for ${fileToCheckFor} to ensure that is still used"
-              if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then
-                echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
-              fi
-
-              echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}"
-              if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then
-                echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1;
-              fi
-            ''
-          ) binDistUsed.archSpecificLibraries)
-        ]
-      )
-    # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
-    # during linking
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      export NIX_LDFLAGS+=" -no_dtrace_dof"
-      # not enough room in the object files for the full path to libiconv :(
-      for exe in $(find . -type f -executable); do
-        isMachO $exe || continue
-        ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-      done
-    ''
-
-    # We have to patch the GMP paths for the ghc-bignum package, for hadrian by
-    # modifying the package-db directly
-    + ''
-      find . -name 'ghc-bignum*.conf' \
-          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib gmpUsed}/lib' -i {} \;
-    ''
-    # Similar for iconv and libffi on darwin
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      find . -name 'base*.conf' \
-          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libiconv}/lib' -i {} \;
-
-      # To link RTS in the end we also need libffi now
-      find . -name 'rts*.conf' \
-          -exec sed -e '/^[a-z-]*library-dirs/a \    ${lib.getLib libffi}/lib' \
-                    -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \
-                    -i {} \;
-    ''
-    +
-      # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in
-      # FFI_LIB_DIR is a good indication of places it must be needed.
-      lib.optionalString
-        (
-          lib.meta.availableOn stdenv.hostPlatform numactl
-          && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries
-        )
-        ''
-          find . -name package.conf.in \
-              -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \;
-        ''
-    +
-      # Rename needed libraries and binaries, fix interpreter
-      lib.optionalString stdenv.hostPlatform.isLinux ''
-        find . -type f -executable -exec patchelf \
-            --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \;
-      '';
-
-  # fix for `configure: error: Your linker is affected by binutils #16177`
-  preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold";
-
-  # GHC has a patched config.sub and bindists' platforms should always work
-  dontUpdateAutotoolsGnuConfigScripts = true;
-
-  configurePlatforms = [ ];
-  configureFlags =
-    lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"
-    # From: https://github.com/NixOS/nixpkgs/pull/43369/commits
-    ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override";
-
-  # No building is necessary, but calling make without flags ironically
-  # calls install-strip ...
-  dontBuild = true;
-
-  # GHC tries to remove xattrs when installing to work around Gatekeeper
-  # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally
-  # succeeds in nixpkgs because xattrs are not allowed in the store, but it
-  # can fail when a file has the `com.apple.provenance` xattr, and it can’t be
-  # modified (such as target of the symlink to `libiconv.dylib`).
-  # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13.
-  # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/
-  makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ];
-
-  # Patch scripts to include runtime dependencies in $PATH.
-  postInstall = ''
-    for i in "$out/bin/"*; do
-      test ! -h "$i" || continue
-      isScript "$i" || continue
-      sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i"
-    done
-  ''
-  + lib.optionalString stdenv.targetPlatform.isDarwin ''
-    # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it
-    # detects `llvm-ar` even though the resulting archives are not supported by ld64.
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/23188
-    # https://github.com/haskell/cabal/issues/8882
-    sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings"
-  '';
-
-  # Apparently necessary for the ghc Alpine (musl) bindist:
-  # When we strip, and then run the
-  #     patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
-  # below, running ghc (e.g. during `installCheckPhase)` gives some apparently
-  # corrupted rpath or whatever makes the loader work on nonsensical strings:
-  #     running install tests
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found
-  #     Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found
-  # This is extremely bogus and should be investigated.
-  dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness
-
-  # On Linux, use patchelf to modify the executables so that they can
-  # find editline/gmp.
-  postFixup =
-    lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) (
-      if stdenv.hostPlatform.isAarch64 then
-        # Keep rpath as small as possible on aarch64 for patchelf#244.  All Elfs
-        # are 2 directories deep from $out/lib, so pooling symlinks there makes
-        # a short rpath.
-        ''
-          (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6)
-          (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10)
-          (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1)
-          for p in $(find "$out/lib" -type f -name "*\.so*"); do
-            (cd $out/lib; ln -s $p)
-          done
-
-          for p in $(find "$out/lib" -type f -executable); do
-            if isELF "$p"; then
-              echo "Patchelfing $p"
-              patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p
-            fi
-          done
-        ''
-      else
-        ''
-          for p in $(find "$out" -type f -executable); do
-            if isELF "$p"; then
-              echo "Patchelfing $p"
-              patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p
-            fi
-          done
-        ''
-    )
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      # not enough room in the object files for the full path to libiconv :(
-      for exe in $(find "$out" -type f -executable); do
-        isMachO $exe || continue
-        ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
-        install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe
-      done
-
-      for file in $(find "$out" -name setup-config); do
-        substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)"
-      done
-    ''
-    # Recache package db which needs to happen for Hadrian bindists
-    # where we modify the package db before installing
-    + ''
-      package_db=("$out"/lib/ghc-*/lib/package.conf.d)
-      "$out/bin/ghc-pkg" --package-db="$package_db" recache
-    '';
-
-  # GHC cannot currently produce outputs that are ready for `-pie` linking.
-  # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
-  # See:
-  # * https://github.com/NixOS/nixpkgs/issues/129247
-  # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
-  hardeningDisable = [ "pie" ];
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    # Sanity check, can ghc create executables?
-    cd $TMP
-    mkdir test-ghc; cd test-ghc
-    cat > main.hs << EOF
-      {-# LANGUAGE TemplateHaskell #-}
-      module Main where
-      main = putStrLn \$([|"yes"|])
-    EOF
-    env -i $out/bin/ghc --make main.hs || exit 1
-    echo compilation ok
-    [ $(./main) == "yes" ]
-  '';
-
-  passthru = {
-    targetPrefix = "";
-    enableShared = true;
-
-    llvmPackages = null;
-
-    # Our Cabal compiler name
-    haskellCompilerName = "ghc-${version}";
-
-    # Normal GHC derivations expose the hadrian derivation used to build them
-    # here. In the case of bindists we just make sure that the attribute exists,
-    # as it is used for checking if a GHC derivation has been built with hadrian.
-    hadrian = null;
-  };
-
-  meta = {
-    homepage = "http://haskell.org/ghc";
-    description = "Glasgow Haskell Compiler";
-    license = lib.licenses.bsd3;
-    # HACK: since we can't encode the libc / abi in platforms, we need
-    # to make the platform list dependent on the evaluation platform
-    # in order to avoid eval errors with musl which supports less
-    # platforms than the default libcs (i. e. glibc / libSystem).
-    # This is done for the benefit of Hydra, so `packagePlatforms`
-    # won't return any platforms that would cause an evaluation
-    # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as
-    # long as the evaluator runs on a platform that supports
-    # `pkgsMusl`.
-    platforms = builtins.attrNames ghcBinDists.${distSetName};
-    teams = [ lib.teams.haskell ];
-    broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; });
-  };
-}
diff --git a/pkgs/development/compilers/ghc/9.8.4-binary.nix b/pkgs/development/compilers/ghc/9.8.4-binary.nix
index df3f507f33d8..0ef74e55f430 100644
--- a/pkgs/development/compilers/ghc/9.8.4-binary.nix
+++ b/pkgs/development/compilers/ghc/9.8.4-binary.nix
@@ -100,10 +100,6 @@ let
             nixPackage = ncurses6;
             fileToCheckFor = "libtinfo.so.6";
           }
-          {
-            nixPackage = numactl;
-            fileToCheckFor = null;
-          }
         ];
       };
       x86_64-darwin = {
@@ -432,13 +428,6 @@ stdenv.mkDerivation {
       "$out/bin/ghc-pkg" --package-db="$package_db" recache
     '';
 
-  # GHC cannot currently produce outputs that are ready for `-pie` linking.
-  # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
-  # See:
-  # * https://github.com/NixOS/nixpkgs/issues/129247
-  # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
-  hardeningDisable = [ "pie" ];
-
   doInstallCheck = true;
   installCheckPhase = ''
     # Sanity check, can ghc create executables?
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 250147021e16..e32880fb02b7 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -55,7 +55,8 @@
   gmp,
 
   # If enabled, use -fPIC when compiling static libs.
-  enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform,
+  enableRelocatedStaticLibs ?
+    stdenv.targetPlatform != stdenv.hostPlatform && !stdenv.targetPlatform.isWindows,
 
   # Exceeds Hydra output limit (at the time of writing ~3GB) when cross compiled to riscv64.
   # A riscv64 cross-compiler fits into the limit comfortably.
@@ -185,32 +186,9 @@
           || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11");
       in
 
-      lib.optionals
-        (
-          # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4
-          lib.versionOlder version "9.11"
-          && !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8")
-          && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9")
-          && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.11")
-        )
-        [
-          # Determine size of time related types using hsc2hs instead of assuming CLong.
-          # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
-          # https://github.com/haskell/ghcup-hs/issues/1107
-          # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
-          # Note that in normal situations this shouldn't be the case since nixpkgs
-          # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
-          (fetchpatch {
-            name = "unix-fix-ctimeval-size-32-bit.patch";
-            url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch";
-            sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv";
-            stripLen = 1;
-            extraPrefix = "libraries/unix/";
-          })
-        ]
-      ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [
+      lib.optionals (lib.versionOlder version "9.8") [
         # Fix unlit being installed under a different name than is used in the
-        # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317
+        # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 krank:ignore-line
         (fetchpatch {
           name = "ghc-9.6-fix-unlit-path.patch";
           url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8fde4ac84ec7b1ead238cb158bbef48555d12af9.patch";
@@ -223,7 +201,7 @@
         #
         # These cause problems as they're not eliminated by GHC's dead code
         # elimination on aarch64-darwin. (see
-        # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+        # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line
         (
           if lib.versionOlder version "9.10" then
             ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
@@ -239,12 +217,17 @@
           hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
         })
       ]
+      ++ lib.optionals stdenv.targetPlatform.isGhcjs [
+        # https://gitlab.haskell.org/ghc/ghc/-/issues/26290
+        ./export-heap-methods.patch
+      ]
       # Prevents passing --hyperlinked-source to haddock. Note that this can
       # be configured via a user defined flavour now. Unfortunately, it is
       # impossible to import an existing flavour in UserSettings, so patching
       # the defaults is actually simpler and less maintenance intensive
       # compared to keeping an entire flavour definition in sync with upstream
-      # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625
+      # manually.
+      # See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 krank:ignore-line
       ++ lib.optionals (!enableHyperlinkedSource) [
         (
           if lib.versionOlder version "9.8" then
@@ -261,9 +244,25 @@
           hash = "sha256-L3FQvcm9QB59BOiR2g5/HACAufIG08HiT53EIOjj64g=";
         })
       ]
+      # Fix build with gcc15
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25662
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863
+      ++
+        lib.optionals
+          (
+            lib.versionOlder version "9.12.3"
+            && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.12")
+          )
+          [
+            (fetchpatch {
+              name = "ghc-hp2ps-c-gnu17.patch";
+              url = "https://src.fedoraproject.org/rpms/ghc/raw/9c26d7c3c3de73509a25806e5663b37bcf2e0b4e/f/hp2ps-C-gnu17.patch";
+              hash = "sha256-Vr5wkiSE1S5e+cJ8pWUvG9KFpxtmvQ8wAy08ElGNp5E=";
+            })
+          ]
       # Fixes stack overrun in rts which crashes an process whenever
       # freeHaskellFunPtr is called with nixpkgs' hardening flags.
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line
       # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
       ++ lib.optionals (lib.versionOlder version "9.13") [
         (fetchpatch {
@@ -276,7 +275,9 @@
       # Missing ELF symbols
       ++ lib.optionals stdenv.targetPlatform.isAndroid [
         ./ghc-define-undefined-elf-st-visibility.patch
-      ];
+      ]
+
+      ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
 
     stdenv = stdenvNoCC;
   },
@@ -332,6 +333,8 @@ let
     # documentation) makes the GHC RTS able to load static libraries, which may
     # be needed for TemplateHaskell. This solution was described in
     # https://www.tweag.io/blog/2020-09-30-bazel-static-haskell
+    #
+    # Note `-fexternal-dynamic-refs` causes `undefined reference` errors when building GHC cross compiler for windows
     lib.optionals enableRelocatedStaticLibs [
       "*.*.ghc.*.opts += -fPIC -fexternal-dynamic-refs"
     ]
@@ -764,14 +767,8 @@ stdenv.mkDerivation (
 
     checkTarget = "test";
 
-    # GHC cannot currently produce outputs that are ready for `-pie` linking.
-    # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
-    # See:
-    # * https://github.com/NixOS/nixpkgs/issues/129247
-    # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
     hardeningDisable = [
       "format"
-      "pie"
     ];
 
     # big-parallel allows us to build with more than 2 cores on
@@ -792,7 +789,8 @@ stdenv.mkDerivation (
 
     ''
     # the bindist configure script uses different env variables than the GHC configure script
-    # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211
+    # see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/24211  krank:ignore-line
     + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
       export InstallNameToolCmd=$INSTALL_NAME_TOOL
       export OtoolCmd=$OTOOL
@@ -843,6 +841,12 @@ stdenv.mkDerivation (
       ghc-settings-edit "$settingsFile" \
       "windres command" "${toolPath "windres" installCC}"
     ''
+    + lib.optionalString (stdenv.targetPlatform.isGhcjs && lib.versionOlder version "9.12") ''
+      ghc-settings-edit "$settingsFile" \
+        "JavaScript CPP command" "${toolPath "cc" installCC}"
+      ghc-settings-edit "$settingsFile" \
+        "JavaScript CPP flags" "-E -CC -Wno-unicode -nostdinc"
+    ''
     + ''
 
       # Install the bash completion file.
@@ -872,8 +876,6 @@ stdenv.mkDerivation (
       timeout = 24 * 3600;
       platforms = lib.platforms.all;
       inherit (bootPkgs.ghc.meta) license;
-      # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.
-      broken = useLLVM;
     };
 
     dontStrip = targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm;
diff --git a/pkgs/development/compilers/ghc/common-llvm-patches.nix b/pkgs/development/compilers/ghc/common-llvm-patches.nix
new file mode 100644
index 000000000000..999e77f44ad4
--- /dev/null
+++ b/pkgs/development/compilers/ghc/common-llvm-patches.nix
@@ -0,0 +1,126 @@
+{
+  lib,
+  version,
+  fetchpatch,
+}:
+
+# Backports for LLVM support.
+#
+# These primarily focus on backporting patches that are relevant to
+# supporting newer LLVM versions, rather than aiming to backport every
+# LLVM backend bug fix or improvement from newer GHC releases.
+#
+# Potentially of interest for cross‐compiling GHC 9.4.8 to LoongArch64:
+#
+# * <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9292>
+# * <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13620>
+
+[ ]
+
+++ lib.optionals (lib.versionOlder version "9.6") [
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/9857>
+  (fetchpatch {
+    name = "ghc-9.4-llvm-support-15.patch";
+    url = "https://gitlab.haskell.org/ghc/ghc/-/commit/0cc16aaf89d7dc3963764b7193ceac73e4e3329b.patch";
+    hash = "sha256-G0gqrj5iPuQ5JuC2+d151yka72XZMbrqMWPZd4EuT04=";
+  })
+
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13763>
+  ./ghc-9.4-llvm-fix-version-detection.patch
+]
+
+++ lib.optionals (lib.versionOlder version "9.8") [
+  (
+    # The upstream backport of !13763 in 9.6.7 removed an unused import
+    # that is required by the next series.
+    if lib.versionOlder version "9.6" then null else ./ghc-9.6-llvm-restore-import.patch
+  )
+]
+
+++ lib.optionals (lib.versionOlder version "9.10") [
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/11124>
+  (
+    if lib.versionOlder version "9.8" then
+      ./ghc-9.4-llvm-add-metadata-exports.patch
+    else
+      fetchpatch {
+        name = "ghc-9.8-llvm-add-metadata-exports.patch";
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/fcfc1777c22ad47613256c3c5e7304cfd29bc761.patch";
+        hash = "sha256-9rpyeH8TUVeKoW4PA6qn7DG2+P9MhBCywmbi1O/NsTQ=";
+      }
+  )
+  (
+    if lib.versionOlder version "9.8" then
+      ./ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch
+    else
+      fetchpatch {
+        name = "ghc-9.8-llvm-allow-llvmlits-in-metaexprs.patch";
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5880fff6d353a14785c457999fded5a7100c9514.patch";
+        hash = "sha256-NDMGNc0PYpWJUW+nI2YvMsBOWRIfNix4oWHQZAIxrVY=";
+      }
+  )
+  (
+    # `GHC.Driver.DynFlags` was not split out until 9.8, so this can be
+    # omitted with no functional effect on the rest of the series on
+    # earlier versions.
+    if lib.versionOlder version "9.8" then
+      null
+    else
+      fetchpatch {
+        name = "ghc-9.8-move-feature-predicates-to-dynflags.patch";
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/86ce92a2f81a04aa980da2891d0e300cb3cb7efd.patch";
+        hash = "sha256-SzJgzq4b5wAMPz+/QSa67iSOxB2enqejvV0lsF0+9L8=";
+      }
+  )
+  (fetchpatch {
+    name = "ghc-9.4-llvm-add-module-flag-metadata-infra.patch";
+    url = "https://gitlab.haskell.org/ghc/ghc/-/commit/a6a3874276ced1b037365c059dcd0a758e813a5b.patch";
+    hash = "sha256-tAYDRNXmpp5cZtyONpO8vlsDmnNEBbh4J3oSCy/uWWc=";
+  })
+  (
+    if lib.versionOlder version "9.8" then
+      ./ghc-9.4-llvm-fix-stack-alignment.patch
+    else
+      fetchpatch {
+        name = "ghc-9.8-llvm-fix-stack-alignment.patch";
+        url = "https://gitlab.haskell.org/ghc/ghc/-/commit/e9af2cf3f16ab60b5c79ed91df95359b11784df6.patch";
+        hash = "sha256-RmYwFN3c3AgJxF9KXWQLdwOgugzepCW1wcTdJX1h0C4=";
+      }
+  )
+
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/8999>
+  (
+    if lib.versionOlder version "9.6" then
+      ./ghc-9.4-llvm-use-new-pass-manager.patch
+    else if lib.versionOlder version "9.8" then
+      ./ghc-9.6-llvm-use-new-pass-manager.patch
+    else
+      ./ghc-9.8-llvm-use-new-pass-manager.patch
+  )
+]
+
+++ lib.optionals (lib.versionOlder version "9.12") [
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/12726>
+  (fetchpatch {
+    name = "ghc-9.4-llvm-support-16-17-18.patch";
+    url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ae170155e82f1e5f78882f7a682d02a8e46a5823.patch";
+    hash = "sha256-U1znWqXZTORmAg480p5TjTL53T2Zn+1+9Fnk2V1Drfs=";
+  })
+
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13311>
+  (fetchpatch {
+    name = "ghc-9.4-llvm-support-19.patch";
+    url = "https://gitlab.haskell.org/ghc/ghc/-/commit/36bbb167f354a2fbc6c4842755f2b1e374e3580e.patch";
+    excludes = [ ".gitlab-ci.yml" ];
+    hash = "sha256-v8T/FtriDPbibcIDZmU2yotBoDVo+wU2+gw+CCdQlm0=";
+  })
+]
+
+++ lib.optionals (lib.versionOlder version "9.14") [
+  # <https://gitlab.haskell.org/ghc/ghc/-/merge_requests/14600>
+  (fetchpatch {
+    name = "ghc-9.4-llvm-support-20.patch";
+    url = "https://gitlab.haskell.org/ghc/ghc/-/commit/ca03226db2db2696460bfcb8035dd3268d546706.patch";
+    hash = "sha256-7cO049DQtJHUAhwPujoFO+zQtXsMg6VFTHtMDwenrKs=";
+  })
+]
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 82bb830cd860..2300e0470ca7 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -14,14 +14,12 @@
 
   # build-tools
   bootPkgs,
-  autoconf,
-  automake,
+  autoreconfHook,
   coreutils,
   fetchpatch,
   fetchurl,
   perl,
   python3,
-  m4,
   sphinx,
   xattr,
   autoSignDarwinBinariesHook,
@@ -134,7 +132,7 @@ let
     # program is built (which we generally always want to have a complete GHC install)
     # and whether it is run on the GHC sources to generate hyperlinked source code
     # (which is impossible for cross-compilation); see:
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 krank:ignore-line
     # This implies that currently a cross-compiled GHC will never have a `haddock`
     # program, so it can never generate haddocks for any packages.
     # If this is solved in the future, we'd like to unconditionally
@@ -292,8 +290,8 @@ stdenv.mkDerivation (
     patches = [
       # Determine size of time related types using hsc2hs instead of assuming CLong.
       # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
-      # https://github.com/haskell/ghcup-hs/issues/1107
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
+      # https://github.com/haskell/ghcup-hs/issues/1107   krank:ignore-line
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 krank:ignore-line
       # Note that in normal situations this shouldn't be the case since nixpkgs
       # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
       (fetchpatch {
@@ -304,7 +302,7 @@ stdenv.mkDerivation (
         extraPrefix = "libraries/unix/";
       })
 
-      # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+      # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line
       ./docs-sphinx-7.patch
 
       # Correctly record libnuma's library and include directories in the
@@ -328,7 +326,7 @@ stdenv.mkDerivation (
     # the solution is to backport those changes from GHC 9.6 that skip the intermediate
     # assembly step.
     #
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589 krank:ignore-line
     # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6877
     ++ [
       # Need to use this patch so the next one applies, passes file location info to the cc phase
@@ -345,6 +343,17 @@ stdenv.mkDerivation (
       })
     ]
 
+    # Fix build with gcc15
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/25662
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863
+    ++ lib.optionals (lib.versions.majorMinor version == "9.4") [
+      (fetchpatch {
+        name = "ghc-hp2ps-c-gnu17.patch";
+        url = "https://src.fedoraproject.org/rpms/ghc/raw/9c26d7c3c3de73509a25806e5663b37bcf2e0b4e/f/hp2ps-C-gnu17.patch";
+        hash = "sha256-Vr5wkiSE1S5e+cJ8pWUvG9KFpxtmvQ8wAy08ElGNp5E=";
+      })
+    ]
+
     ++ [
       # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
       # Can be removed if the Cabal library included with ghc backports the linked fix
@@ -358,7 +367,7 @@ stdenv.mkDerivation (
 
     # Fixes stack overrun in rts which crashes an process whenever
     # freeHaskellFunPtr is called with nixpkgs' hardening flags.
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line
     # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
     # TODO: patch doesn't apply for < 9.4, but may still be necessary?
     ++ [
@@ -375,9 +384,11 @@ stdenv.mkDerivation (
       #
       # These cause problems as they're not eliminated by GHC's dead code
       # elimination on aarch64-darwin. (see
-      # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+      # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line
       ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
-    ];
+    ]
+
+    ++ (import ./common-llvm-patches.nix { inherit lib version fetchpatch; });
 
     postPatch = "patchShebangs .";
 
@@ -433,7 +444,6 @@ stdenv.mkDerivation (
       export AR_STAGE0="$AR_FOR_BUILD"
 
       echo -n "${buildMK}" > mk/build.mk
-      sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
     ''
     # Haddock and sphinx need a working locale
     + lib.optionalString (enableDocs || enableHaddockProgram) (
@@ -468,8 +478,7 @@ stdenv.mkDerivation (
       grep linux-musl llvm-targets | sed 's/^/  /'
 
       echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
-      # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
-      for x in configure aclocal.m4; do
+      for x in aclocal.m4; do
         substituteInPlace $x \
           --replace '*-android*|*-gnueabi*)' \
                     '*-android*|*-gnueabi*|*-musleabi*)'
@@ -536,10 +545,8 @@ stdenv.mkDerivation (
     dontAddExtraLibs = true;
 
     nativeBuildInputs = [
+      autoreconfHook
       perl
-      autoconf
-      automake
-      m4
       python3
       bootPkgs.alex
       bootPkgs.happy
@@ -589,14 +596,8 @@ stdenv.mkDerivation (
 
     checkTarget = "test";
 
-    # GHC cannot currently produce outputs that are ready for `-pie` linking.
-    # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
-    # See:
-    # * https://github.com/NixOS/nixpkgs/issues/129247
-    # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
     hardeningDisable = [
       "format"
-      "pie"
     ];
 
     # big-parallel allows us to build with more than 2 cores on
@@ -672,8 +673,6 @@ stdenv.mkDerivation (
       timeout = 24 * 3600;
       platforms = lib.platforms.all;
       inherit (bootPkgs.ghc.meta) license;
-      # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.
-      broken = useLLVM;
     };
 
   }
diff --git a/pkgs/development/compilers/ghc/docs-sphinx-7.patch b/pkgs/development/compilers/ghc/docs-sphinx-7.patch
index 49fa45d1b9a2..d1321c421492 100644
--- a/pkgs/development/compilers/ghc/docs-sphinx-7.patch
+++ b/pkgs/development/compilers/ghc/docs-sphinx-7.patch
@@ -1,6 +1,6 @@
 Fix build of docs after sphinx update.
 https://github.com/sphinx-doc/sphinx/pull/11381
-https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line
 --- a/docs/users_guide/rtd-theme/layout.html
 +++ b/docs/users_guide/rtd-theme/layout.html
 @@ -67 +67 @@
diff --git a/pkgs/development/compilers/ghc/export-heap-methods.patch b/pkgs/development/compilers/ghc/export-heap-methods.patch
new file mode 100644
index 000000000000..ff4ce1263aee
--- /dev/null
+++ b/pkgs/development/compilers/ghc/export-heap-methods.patch
@@ -0,0 +1,11 @@
+diff --git a/rts/js/mem.js b/rts/js/mem.js
+index 44c5c37ac4..1f150c5d55 100644
+--- a/rts/js/mem.js
++++ b/rts/js/mem.js
+@@ -1,5 +1,5 @@
+ //#OPTIONS:CPP
+-//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot
++//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8,HEAPU8
+ 
+ // #define GHCJS_TRACE_META 1
+ 
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch
new file mode 100644
index 000000000000..ec2fa19d452c
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-add-metadata-exports.patch
@@ -0,0 +1,31 @@
+From 701154fdbceff2edb121768eb660713a98580af8 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Tue, 22 Aug 2023 12:23:26 -0400
+Subject: [PATCH] llvmGen: Add export list to GHC.Llvm.MetaData
+
+(cherry picked from commit fcfc1777c22ad47613256c3c5e7304cfd29bc761)
+---
+ compiler/GHC/Llvm/MetaData.hs | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs
+index f46ae0a101..3526c11bc3 100644
+--- a/compiler/GHC/Llvm/MetaData.hs
++++ b/compiler/GHC/Llvm/MetaData.hs
+@@ -1,6 +1,12 @@
+ {-# LANGUAGE GeneralizedNewtypeDeriving #-}
+ 
+-module GHC.Llvm.MetaData where
++module GHC.Llvm.MetaData
++  ( MetaId(..)
++  , ppr
++  , MetaExpr(..)
++  , MetaAnnot(..)
++  , MetaDecl(..)
++  ) where
+ 
+ import GHC.Prelude
+ 
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch
new file mode 100644
index 000000000000..6c34f9800472
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-allow-llvmlits-in-metaexprs.patch
@@ -0,0 +1,40 @@
+From 51765e343e9829f1d3e95d1d7303fa3594ae91cc Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Tue, 22 Aug 2023 12:24:53 -0400
+Subject: [PATCH] llvmGen: Allow LlvmLits in MetaExprs
+
+This omission appears to be an oversight.
+
+(cherry picked from commit 5880fff6d353a14785c457999fded5a7100c9514)
+---
+ compiler/GHC/Llvm/MetaData.hs | 1 +
+ compiler/GHC/Llvm/Ppr.hs      | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/compiler/GHC/Llvm/MetaData.hs b/compiler/GHC/Llvm/MetaData.hs
+index f46ae0a101..121cdd5788 100644
+--- a/compiler/GHC/Llvm/MetaData.hs
++++ b/compiler/GHC/Llvm/MetaData.hs
+@@ -68,6 +68,7 @@ instance Outputable MetaId where
+ 
+ -- | LLVM metadata expressions
+ data MetaExpr = MetaStr !LMString
++              | MetaLit !LlvmLit
+               | MetaNode !MetaId
+               | MetaVar !LlvmVar
+               | MetaStruct [MetaExpr]
+diff --git a/compiler/GHC/Llvm/Ppr.hs b/compiler/GHC/Llvm/Ppr.hs
+index f48e7aa034..bc88a13439 100644
+--- a/compiler/GHC/Llvm/Ppr.hs
++++ b/compiler/GHC/Llvm/Ppr.hs
+@@ -256,6 +256,7 @@ ppMetaExpr :: LlvmCgConfig -> MetaExpr -> SDoc
+ ppMetaExpr opts = \case
+   MetaVar (LMLitVar (LMNullLit _)) -> text "null"
+   MetaStr    s                     -> char '!' <> doubleQuotes (ftext s)
++  MetaLit    l                     -> ppTypeLit opts l
+   MetaNode   n                     -> ppr n
+   MetaVar    v                     -> ppVar opts v
+   MetaStruct es                    -> char '!' <> braces (ppCommaJoin (map (ppMetaExpr opts) es))
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch
new file mode 100644
index 000000000000..23c4e0717c5e
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-stack-alignment.patch
@@ -0,0 +1,137 @@
+From 646d62e74c16be785ef08735ae5b24f4af6bcf78 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Tue, 22 Aug 2023 13:26:58 -0400
+Subject: [PATCH] llvmGen: Don't pass stack alignment via command line
+
+As of https://reviews.llvm.org/D103048 LLVM no longer supports the
+`-stack-alignment=...` flag. Instead this information is passed via a
+module flag metadata node.
+
+This requires dropping support for LLVM 11 and 12.
+
+Fixes #23870
+
+(cherry picked from commit e9af2cf3f16ab60b5c79ed91df95359b11784df6)
+---
+ compiler/GHC/CmmToLlvm.hs               | 29 ++++++++++++++++++++++++-
+ compiler/GHC/CmmToLlvm/Config.hs        |  1 +
+ compiler/GHC/Driver/Config/CmmToLlvm.hs |  1 +
+ compiler/GHC/Driver/Pipeline/Execute.hs |  7 ------
+ configure.ac                            |  2 +-
+ 5 files changed, 31 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs
+index 7d48693765..b9036daef1 100644
+--- a/compiler/GHC/CmmToLlvm.hs
++++ b/compiler/GHC/CmmToLlvm.hs
+@@ -190,7 +190,7 @@ cmmLlvmGen _ = return ()
+ 
+ cmmMetaLlvmPrelude :: LlvmM ()
+ cmmMetaLlvmPrelude = do
+-  metas <- flip mapM stgTBAA $ \(uniq, name, parent) -> do
++  tbaa_metas <- flip mapM stgTBAA $ \(uniq, name, parent) -> do
+     -- Generate / lookup meta data IDs
+     tbaaId <- getMetaUniqueId
+     setUniqMeta uniq tbaaId
+@@ -203,9 +203,36 @@ cmmMetaLlvmPrelude = do
+               -- just a name on its own. Previously `null` was accepted as the
+               -- name.
+               Nothing -> [ MetaStr name ]
++
++  platform <- getPlatform
++  cfg <- getConfig
++  let stack_alignment_metas =
++          case platformArch platform of
++            ArchX86_64 | llvmCgAvxEnabled cfg -> [mkStackAlignmentMeta 32]
++            _                                 -> []
++  module_flags_metas <- mkModuleFlagsMeta stack_alignment_metas
++  let metas = tbaa_metas ++ module_flags_metas
+   cfg <- getConfig
+   renderLlvm $ ppLlvmMetas cfg metas
+ 
++mkNamedMeta :: LMString -> [MetaExpr] -> LlvmM [MetaDecl]
++mkNamedMeta name exprs = do
++    (ids, decls) <- unzip <$> mapM f exprs
++    return $ decls ++ [MetaNamed name ids]
++  where
++    f expr = do
++      i <- getMetaUniqueId
++      return (i, MetaUnnamed i expr)
++
++mkModuleFlagsMeta :: [ModuleFlag] -> LlvmM [MetaDecl]
++mkModuleFlagsMeta =
++    mkNamedMeta "llvm.module.flags" . map moduleFlagToMetaExpr
++
++mkStackAlignmentMeta :: Integer -> ModuleFlag
++mkStackAlignmentMeta alignment =
++    ModuleFlag MFBError "override-stack-alignment" (MetaLit $ LMIntLit alignment i32)
++
++
+ -- -----------------------------------------------------------------------------
+ -- | Marks variables as used where necessary
+ --
+diff --git a/compiler/GHC/CmmToLlvm/Config.hs b/compiler/GHC/CmmToLlvm/Config.hs
+index 649a33c2f6..ecab7fdcc1 100644
+--- a/compiler/GHC/CmmToLlvm/Config.hs
++++ b/compiler/GHC/CmmToLlvm/Config.hs
+@@ -36,6 +36,7 @@ data LlvmCgConfig = LlvmCgConfig
+   , llvmCgContext           :: !SDocContext  -- ^ Context for LLVM code generation
+   , llvmCgFillUndefWithGarbage :: !Bool      -- ^ Fill undefined literals with garbage values
+   , llvmCgSplitSection      :: !Bool         -- ^ Split sections
++  , llvmCgAvxEnabled        :: !Bool
+   , llvmCgBmiVersion        :: Maybe BmiVersion  -- ^ (x86) BMI instructions
+   , llvmCgLlvmVersion       :: Maybe LlvmVersion -- ^ version of Llvm we're using
+   , llvmCgDoWarn            :: !Bool         -- ^ True ==> warn unsupported Llvm version
+diff --git a/compiler/GHC/Driver/Config/CmmToLlvm.hs b/compiler/GHC/Driver/Config/CmmToLlvm.hs
+index 8097bbec7e..752ba987ca 100644
+--- a/compiler/GHC/Driver/Config/CmmToLlvm.hs
++++ b/compiler/GHC/Driver/Config/CmmToLlvm.hs
+@@ -23,6 +23,7 @@ initLlvmCgConfig logger config_cache dflags = do
+     , llvmCgContext              = initSDocContext dflags PprCode
+     , llvmCgFillUndefWithGarbage = gopt Opt_LlvmFillUndefWithGarbage dflags
+     , llvmCgSplitSection         = gopt Opt_SplitSections dflags
++    , llvmCgAvxEnabled           = isAvxEnabled dflags
+     , llvmCgBmiVersion           = case platformArch (targetPlatform dflags) of
+                                       ArchX86_64 -> bmiVersion dflags
+                                       ArchX86    -> bmiVersion dflags
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index fac2a595f2..4fa72be475 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -992,8 +992,6 @@ llvmOptions llvm_config dflags =
+        [("-enable-tbaa -tbaa",  "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+     ++ [("-relocation-model=" ++ rmodel
+         ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+-    ++ [("-stack-alignment=" ++ (show align)
+-        ,"-stack-alignment=" ++ (show align)) | align > 0 ]
+ 
+     -- Additional llc flags
+     ++ [("", "-mcpu=" ++ mcpu)   | not (null mcpu)
+@@ -1012,11 +1010,6 @@ llvmOptions llvm_config dflags =
+ 
+         platform = targetPlatform dflags
+ 
+-        align :: Int
+-        align = case platformArch platform of
+-                  ArchX86_64 | isAvxEnabled dflags -> 32
+-                  _                                -> 0
+-
+         attrs :: String
+         attrs = intercalate "," $ mattr
+               ++ ["+sse42"   | isSse4_2Enabled dflags   ]
+diff --git a/configure.ac b/configure.ac
+index 16f2e8b339..0440d5051b 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -555,7 +555,7 @@ AC_SUBST(InstallNameToolCmd)
+ # tools we are looking for. In the past, GHC supported a number of
+ # versions of LLVM simultaneously, but that stopped working around
+ # 3.5/3.6 release of LLVM.
+-LlvmMinVersion=11  # inclusive
++LlvmMinVersion=13  # inclusive
+ LlvmMaxVersion=16 # not inclusive
+ AC_SUBST([LlvmMinVersion])
+ AC_SUBST([LlvmMaxVersion])
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch
new file mode 100644
index 000000000000..721909363d6b
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-fix-version-detection.patch
@@ -0,0 +1,103 @@
+From c1229507e29e5c44b6f23d6f2afb5d55e7fb9606 Mon Sep 17 00:00:00 2001
+From: ARATA Mizuki <minorinoki@gmail.com>
+Date: Wed, 25 Dec 2024 22:50:46 +0900
+Subject: [PATCH] Fix LLVM version detection
+
+With a recent LLVM, `llc -version` emits the version on the first line
+if the vendor is set.  It emits the version on the second line
+otherwise.
+
+Therefore, we need to check the both lines to detect the version.
+
+GHC now emits a warning if it fails to detect the LLVM version,
+so we can notice if the output of `llc -version` changes in the future.
+
+Also, the warning for using LLVM < 10 on s390x is removed, because
+we assume LLVM >= 13 now.
+
+This fixes the definition of __GLASGOW_HASKELL_LLVM__ macro.
+
+Fixes #25606
+
+(cherry picked from commit a928c326011f1a6bef3289a4c36d4e19b5951229)
+---
+ compiler/GHC/CmmToLlvm.hs      | 14 ++++++++------
+ compiler/GHC/SysTools/Tasks.hs | 13 ++++++++-----
+ docs/users_guide/phases.rst    |  2 +-
+ 3 files changed, 17 insertions(+), 12 deletions(-)
+
+diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs
+index ecf111c636..76541c477c 100644
+--- a/compiler/GHC/CmmToLlvm.hs
++++ b/compiler/GHC/CmmToLlvm.hs
+@@ -38,7 +38,7 @@ import GHC.Utils.Logger
+ import qualified GHC.Data.Stream as Stream
+ 
+ import Control.Monad ( when, forM_ )
+-import Data.Maybe ( fromMaybe, catMaybes )
++import Data.Maybe ( fromMaybe, catMaybes, isNothing )
+ import System.IO
+ 
+ -- -----------------------------------------------------------------------------
+@@ -68,11 +68,13 @@ llvmCodeGen logger cfg h cmm_stream
+            "up to" <+> text (llvmVersionStr supportedLlvmVersionUpperBound) <+> "(non inclusive) is supported." <+>
+            "System LLVM version: " <> text (llvmVersionStr ver) $$
+            "We will try though..."
+-         let isS390X = platformArch (llvmCgPlatform cfg)  == ArchS390X
+-         let major_ver = head . llvmVersionList $ ver
+-         when (isS390X && major_ver < 10 && doWarn) $ putMsg logger $
+-           "Warning: For s390x the GHC calling convention is only supported since LLVM version 10." <+>
+-           "You are using LLVM version: " <> text (llvmVersionStr ver)
++
++       when (isNothing mb_ver) $ do
++         let doWarn = llvmCgDoWarn cfg
++         when doWarn $ putMsg logger $
++           "Failed to detect LLVM version!" $$
++           "Make sure LLVM is installed correctly." $$
++           "We will try though..."
+ 
+        -- HACK: the Nothing case here is potentially wrong here but we
+        -- currently don't use the LLVM version to guide code generation
+diff --git a/compiler/GHC/SysTools/Tasks.hs b/compiler/GHC/SysTools/Tasks.hs
+index 7cd5188d5f..165e1602cf 100644
+--- a/compiler/GHC/SysTools/Tasks.hs
++++ b/compiler/GHC/SysTools/Tasks.hs
+@@ -236,14 +236,17 @@ figureLlvmVersion logger dflags = traceToolCommand logger "llc" $ do
+               (pin, pout, perr, p) <- runInteractiveProcess pgm args'
+                                               Nothing Nothing
+               {- > llc -version
+-                  LLVM (http://llvm.org/):
+-                    LLVM version 3.5.2
++                  <vendor> LLVM version 15.0.7
+                     ...
++                  OR
++                  LLVM (http://llvm.org/):
++                    LLVM version 14.0.6
+               -}
+               hSetBinaryMode pout False
+-              _     <- hGetLine pout
+-              vline <- hGetLine pout
+-              let mb_ver = parseLlvmVersion vline
++              line1 <- hGetLine pout
++              mb_ver <- case parseLlvmVersion line1 of
++                mb_ver@(Just _) -> return mb_ver
++                Nothing -> parseLlvmVersion <$> hGetLine pout -- Try the second line
+               hClose pin
+               hClose pout
+               hClose perr
+diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst
+index 6a2d4b3c20..9ccd2aa034 100644
+--- a/docs/users_guide/phases.rst
++++ b/docs/users_guide/phases.rst
+@@ -474,7 +474,7 @@ defined by your local GHC installation, the following trick is useful:
+     .. index::
+        single: __GLASGOW_HASKELL_LLVM__
+ 
+-    Only defined when `:ghc-flag:`-fllvm` is specified. When GHC is using version
++    Only defined when :ghc-flag:`-fllvm` is specified. When GHC is using version
+     ``x.y.z`` of LLVM, the value of ``__GLASGOW_HASKELL_LLVM__`` is the
+     integer ⟨xyy⟩ (if ⟨y⟩ is a single digit, then a leading zero
+     is added, so for example when using version 3.7 of LLVM,
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch
new file mode 100644
index 000000000000..6fbaa6b6c36a
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.4-llvm-use-new-pass-manager.patch
@@ -0,0 +1,87 @@
+From 857d84f43f288019d6b926ac562f0d3eff30bc1e Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Wed, 31 Jan 2024 08:58:58 -0500
+Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager.
+
+We now must use `-passes` in place of `-O<n>` due to #21936.
+
+Closes #21936.
+
+(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796)
+---
+ compiler/GHC/Driver/Flags.hs            | 2 --
+ compiler/GHC/Driver/Pipeline/Execute.hs | 3 +--
+ compiler/GHC/Driver/Session.hs          | 2 --
+ llvm-passes                             | 6 +++---
+ 4 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs
+index 8f6c37d5a7..2e5189f42f 100644
+--- a/compiler/GHC/Driver/Flags.hs
++++ b/compiler/GHC/Driver/Flags.hs
+@@ -213,7 +213,6 @@ data GeneralFlag
+    | Opt_RegsGraph                      -- do graph coloring register allocation
+    | Opt_RegsIterative                  -- do iterative coalescing graph coloring register allocation
+    | Opt_PedanticBottoms                -- Be picky about how we treat bottom
+-   | Opt_LlvmTBAA                       -- Use LLVM TBAA infrastructure for improving AA (hidden flag)
+    | Opt_LlvmFillUndefWithGarbage       -- Testing for undef bugs (hidden flag)
+    | Opt_IrrefutableTuples
+    | Opt_CmmSink
+@@ -446,7 +445,6 @@ optimisationFlags = EnumSet.fromList
+    , Opt_RegsGraph
+    , Opt_RegsIterative
+    , Opt_PedanticBottoms
+-   , Opt_LlvmTBAA
+    , Opt_LlvmFillUndefWithGarbage
+    , Opt_IrrefutableTuples
+    , Opt_CmmSink
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index b78ed19160..8c752f5546 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -882,8 +882,7 @@ getOutputFilename logger tmpfs stop_phase output basename dflags next_phase mayb
+ llvmOptions :: DynFlags
+             -> [(String, String)]  -- ^ pairs of (opt, llc) arguments
+ llvmOptions dflags =
+-       [("-enable-tbaa -tbaa",  "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+-    ++ [("-relocation-model=" ++ rmodel
++       [("-relocation-model=" ++ rmodel
+         ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+ 
+     -- Additional llc flags
+diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
+index 51d27cd0f8..ae8566ffb2 100644
+--- a/compiler/GHC/Driver/Session.hs
++++ b/compiler/GHC/Driver/Session.hs
+@@ -3457,7 +3457,6 @@ fFlagsDeps = [
+   flagSpec "late-dmd-anal"                    Opt_LateDmdAnal,
+   flagSpec "late-specialise"                  Opt_LateSpecialise,
+   flagSpec "liberate-case"                    Opt_LiberateCase,
+-  flagHiddenSpec "llvm-tbaa"                  Opt_LlvmTBAA,
+   flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage,
+   flagSpec "loopification"                    Opt_Loopification,
+   flagSpec "block-layout-cfg"                 Opt_CfgBlocklayout,
+@@ -3992,7 +3991,6 @@ optLevelFlags :: [([Int], GeneralFlag)]
+ optLevelFlags -- see Note [Documenting optimisation flags]
+   = [ ([0,1,2], Opt_DoLambdaEtaExpansion)
+     , ([0,1,2], Opt_DoEtaReduction)       -- See Note [Eta-reduction in -O0]
+-    , ([0,1,2], Opt_LlvmTBAA)
+     , ([0,1,2], Opt_ProfManualCcs )
+     , ([2], Opt_DictsStrict)
+ 
+diff --git a/llvm-passes b/llvm-passes
+index 52d203e745..0ee2889d32 100644
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
+-(1, "-enable-new-pm=0 -O1 -globalopt"),
+-(2, "-enable-new-pm=0 -O2")
++(0, "-passes=function(require<tbaa>),function(mem2reg),globalopt,function(lower-expect)"),
++(1, "-passes=default<O1>"),
++(2, "-passes=default<O2>")
+ ]
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch b/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch
new file mode 100644
index 000000000000..01f933bebc7d
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.6-llvm-restore-import.patch
@@ -0,0 +1,12 @@
+diff --git a/compiler/GHC/CmmToLlvm.hs b/compiler/GHC/CmmToLlvm.hs
+index 7d48693765..6290779a44 100644
+--- a/compiler/GHC/CmmToLlvm.hs
++++ b/compiler/GHC/CmmToLlvm.hs
+@@ -28,6 +28,7 @@
+ 
+ import GHC.Utils.BufHandle
+ import GHC.Driver.Session
++import GHC.Platform ( platformArch, Arch(..) )
+ import GHC.Utils.Error
+ import GHC.Data.FastString
+ import GHC.Utils.Outputable
diff --git a/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch
new file mode 100644
index 000000000000..e42ae9151a1a
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.6-llvm-use-new-pass-manager.patch
@@ -0,0 +1,87 @@
+From 291a336ac81d009b66a2d09c3bb5271e40646e15 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Wed, 31 Jan 2024 08:58:58 -0500
+Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager.
+
+We now must use `-passes` in place of `-O<n>` due to #21936.
+
+Closes #21936.
+
+(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796)
+---
+ compiler/GHC/Driver/Flags.hs            | 2 --
+ compiler/GHC/Driver/Pipeline/Execute.hs | 3 +--
+ compiler/GHC/Driver/Session.hs          | 2 --
+ llvm-passes                             | 6 +++---
+ 4 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs
+index bd9e3355f0..970dba81d0 100644
+--- a/compiler/GHC/Driver/Flags.hs
++++ b/compiler/GHC/Driver/Flags.hs
+@@ -273,7 +273,6 @@ data GeneralFlag
+    | Opt_RegsGraph                      -- do graph coloring register allocation
+    | Opt_RegsIterative                  -- do iterative coalescing graph coloring register allocation
+    | Opt_PedanticBottoms                -- Be picky about how we treat bottom
+-   | Opt_LlvmTBAA                       -- Use LLVM TBAA infrastructure for improving AA (hidden flag)
+    | Opt_LlvmFillUndefWithGarbage       -- Testing for undef bugs (hidden flag)
+    | Opt_IrrefutableTuples
+    | Opt_CmmSink
+@@ -511,7 +510,6 @@ optimisationFlags = EnumSet.fromList
+    , Opt_EnableRewriteRules
+    , Opt_RegsGraph
+    , Opt_RegsIterative
+-   , Opt_LlvmTBAA
+    , Opt_IrrefutableTuples
+    , Opt_CmmSink
+    , Opt_CmmElimCommonBlocks
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index 4fa72be475..d63b409fc1 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -989,8 +989,7 @@ llvmOptions :: LlvmConfig
+             -> DynFlags
+             -> [(String, String)]  -- ^ pairs of (opt, llc) arguments
+ llvmOptions llvm_config dflags =
+-       [("-enable-tbaa -tbaa",  "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+-    ++ [("-relocation-model=" ++ rmodel
++       [("-relocation-model=" ++ rmodel
+         ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+ 
+     -- Additional llc flags
+diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
+index 21d27c406e..9656f1d247 100644
+--- a/compiler/GHC/Driver/Session.hs
++++ b/compiler/GHC/Driver/Session.hs
+@@ -3431,7 +3431,6 @@ fFlagsDeps = [
+   flagSpec "late-dmd-anal"                    Opt_LateDmdAnal,
+   flagSpec "late-specialise"                  Opt_LateSpecialise,
+   flagSpec "liberate-case"                    Opt_LiberateCase,
+-  flagHiddenSpec "llvm-tbaa"                  Opt_LlvmTBAA,
+   flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage,
+   flagSpec "loopification"                    Opt_Loopification,
+   flagSpec "block-layout-cfg"                 Opt_CfgBlocklayout,
+@@ -3992,7 +3991,6 @@ optLevelFlags :: [([Int], GeneralFlag)]
+ optLevelFlags -- see Note [Documenting optimisation flags]
+   = [ ([0,1,2], Opt_DoLambdaEtaExpansion)
+     , ([0,1,2], Opt_DoEtaReduction)       -- See Note [Eta-reduction in -O0]
+-    , ([0,1,2], Opt_LlvmTBAA)
+     , ([0,1,2], Opt_ProfManualCcs )
+     , ([2], Opt_DictsStrict)
+ 
+diff --git a/llvm-passes b/llvm-passes
+index 52d203e745..0ee2889d32 100644
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
+-(1, "-enable-new-pm=0 -O1 -globalopt"),
+-(2, "-enable-new-pm=0 -O2")
++(0, "-passes=function(require<tbaa>),function(mem2reg),globalopt,function(lower-expect)"),
++(1, "-passes=default<O1>"),
++(2, "-passes=default<O2>")
+ ]
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch b/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch
new file mode 100644
index 000000000000..1ed19d9d5d46
--- /dev/null
+++ b/pkgs/development/compilers/ghc/ghc-9.8-llvm-use-new-pass-manager.patch
@@ -0,0 +1,92 @@
+From c7667212c958ef00926986782b8e1ac173bce0f9 Mon Sep 17 00:00:00 2001
+From: Ben Gamari <ben@smart-cactus.org>
+Date: Wed, 31 Jan 2024 08:58:58 -0500
+Subject: [PATCH] llvmGen: Adapt to allow use of new pass manager.
+
+We now must use `-passes` in place of `-O<n>` due to #21936.
+
+Closes #21936.
+
+(cherry picked from commit 77db84aba1ba00f6d146e9107b24c6203798e796)
+---
+ compiler/GHC/Driver/DynFlags.hs         | 1 -
+ compiler/GHC/Driver/Flags.hs            | 2 --
+ compiler/GHC/Driver/Pipeline/Execute.hs | 3 +--
+ compiler/GHC/Driver/Session.hs          | 1 -
+ llvm-passes                             | 6 +++---
+ 5 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/compiler/GHC/Driver/DynFlags.hs b/compiler/GHC/Driver/DynFlags.hs
+index ac9e6581cf..edc92e35ad 100644
+--- a/compiler/GHC/Driver/DynFlags.hs
++++ b/compiler/GHC/Driver/DynFlags.hs
+@@ -1261,7 +1261,6 @@ optLevelFlags :: [([Int], GeneralFlag)]
+ optLevelFlags -- see Note [Documenting optimisation flags]
+   = [ ([0,1,2], Opt_DoLambdaEtaExpansion)
+     , ([0,1,2], Opt_DoEtaReduction)       -- See Note [Eta-reduction in -O0]
+-    , ([0,1,2], Opt_LlvmTBAA)
+     , ([0,1,2], Opt_ProfManualCcs )
+     , ([2], Opt_DictsStrict)
+ 
+diff --git a/compiler/GHC/Driver/Flags.hs b/compiler/GHC/Driver/Flags.hs
+index 0f6715f3cb..32e52b4b9a 100644
+--- a/compiler/GHC/Driver/Flags.hs
++++ b/compiler/GHC/Driver/Flags.hs
+@@ -285,7 +285,6 @@ data GeneralFlag
+    | Opt_RegsGraph                      -- do graph coloring register allocation
+    | Opt_RegsIterative                  -- do iterative coalescing graph coloring register allocation
+    | Opt_PedanticBottoms                -- Be picky about how we treat bottom
+-   | Opt_LlvmTBAA                       -- Use LLVM TBAA infrastructure for improving AA (hidden flag)
+    | Opt_LlvmFillUndefWithGarbage       -- Testing for undef bugs (hidden flag)
+    | Opt_IrrefutableTuples
+    | Opt_CmmSink
+@@ -525,7 +524,6 @@ optimisationFlags = EnumSet.fromList
+    , Opt_EnableRewriteRules
+    , Opt_RegsGraph
+    , Opt_RegsIterative
+-   , Opt_LlvmTBAA
+    , Opt_IrrefutableTuples
+    , Opt_CmmSink
+    , Opt_CmmElimCommonBlocks
+diff --git a/compiler/GHC/Driver/Pipeline/Execute.hs b/compiler/GHC/Driver/Pipeline/Execute.hs
+index 40d0aec44a..ca5c13442a 100644
+--- a/compiler/GHC/Driver/Pipeline/Execute.hs
++++ b/compiler/GHC/Driver/Pipeline/Execute.hs
+@@ -968,8 +968,7 @@ llvmOptions :: LlvmConfig
+             -> DynFlags
+             -> [(String, String)]  -- ^ pairs of (opt, llc) arguments
+ llvmOptions llvm_config dflags =
+-       [("-enable-tbaa -tbaa",  "-enable-tbaa") | gopt Opt_LlvmTBAA dflags ]
+-    ++ [("-relocation-model=" ++ rmodel
++       [("-relocation-model=" ++ rmodel
+         ,"-relocation-model=" ++ rmodel) | not (null rmodel)]
+ 
+     -- Additional llc flags
+diff --git a/compiler/GHC/Driver/Session.hs b/compiler/GHC/Driver/Session.hs
+index 582fa5bd8d..1c19f8368b 100644
+--- a/compiler/GHC/Driver/Session.hs
++++ b/compiler/GHC/Driver/Session.hs
+@@ -2401,7 +2401,6 @@ fFlagsDeps = [
+   flagSpec "late-dmd-anal"                    Opt_LateDmdAnal,
+   flagSpec "late-specialise"                  Opt_LateSpecialise,
+   flagSpec "liberate-case"                    Opt_LiberateCase,
+-  flagHiddenSpec "llvm-tbaa"                  Opt_LlvmTBAA,
+   flagHiddenSpec "llvm-fill-undef-with-garbage" Opt_LlvmFillUndefWithGarbage,
+   flagSpec "loopification"                    Opt_Loopification,
+   flagSpec "block-layout-cfg"                 Opt_CfgBlocklayout,
+diff --git a/llvm-passes b/llvm-passes
+index 52d203e745..0ee2889d32 100644
+--- a/llvm-passes
++++ b/llvm-passes
+@@ -1,5 +1,5 @@
+ [
+-(0, "-enable-new-pm=0 -mem2reg -globalopt -lower-expect"),
+-(1, "-enable-new-pm=0 -O1 -globalopt"),
+-(2, "-enable-new-pm=0 -O2")
++(0, "-passes=function(require<tbaa>),function(mem2reg),globalopt,function(lower-expect)"),
++(1, "-passes=default<O1>"),
++(2, "-passes=default<O2>")
+ ]
+-- 
+2.50.1
+
diff --git a/pkgs/development/compilers/ghc/subopt.bash b/pkgs/development/compilers/ghc/subopt.bash
index 1f3d3a3ebdcc..0f3817fdeab1 100644
--- a/pkgs/development/compilers/ghc/subopt.bash
+++ b/pkgs/development/compilers/ghc/subopt.bash
@@ -14,8 +14,9 @@
 #
 # No attempt is made to support custom LLVM optimization flags, or the
 # undocumented flag to disable TBAA, or avoid
-# <https://gitlab.haskell.org/ghc/ghc/-/issues/23870>, as these are not
-# required to bootstrap GHC and at worst will produce an error message.
+# <https://gitlab.haskell.org/ghc/ghc/-/issues/23870> (krank:ignore-line),
+# as these are not required to bootstrap GHC and at worst will produce an
+# error message.
 #
 # It is called `subopt` to reflect the fact that it uses `opt(1)` as a
 # subprocess, and the fact that the GHC build system situation
diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 39d61674a21b..da57d07f7205 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -9,29 +9,50 @@
   buildPackages,
   pkgsBuildTarget,
   targetPackages,
-  testers,
-  skopeo,
   buildGo124Module,
+  callPackage,
 }:
 
 let
   goBootstrap = buildPackages.callPackage ./bootstrap122.nix { };
 
-  skopeoTest = skopeo.override { buildGoModule = buildGo124Module; };
-
   # We need a target compiler which is still runnable at build time,
   # to handle the cross-building case where build != host == target
   targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
 
   isCross = stdenv.buildPlatform != stdenv.targetPlatform;
+
+  # In order for buildmode=pie to work either Go's internal linker must know how
+  # to produce position-independent executables or Go must be using an external linker.
+  #
+  # go-default-pie.patch tries to enable position-independent codegen (PIE) only when the platform
+  # reports support (via BuildModeSupported(..., "pie", ...)).
+  #
+  # That probe is not fully reliable: for example, `pkgsi686Linux.go` can fail during bootstrap
+  # with message 'default PIE binary requires external (cgo) linking, but cgo is not enabled'
+  # despite CGO being enabled. (we set `CGO_ENABLED=1`).
+  #
+  # To avoid such breakage, limit this patch to a small set of explicitly tested platforms
+  # rather than relying on the general BuildModeSupported("pie") check.
+  supportsDefaultPie =
+    let
+      hasPie = {
+        "amd64" = true;
+        "arm64" = true;
+        "ppc64le" = true;
+        "riscv64" = true;
+      };
+    in
+    hasPie.${stdenv.hostPlatform.go.GOARCH} or false
+    && hasPie.${stdenv.targetPlatform.go.GOARCH} or false;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24.9";
+  version = "1.24.10";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-xy+BulT+AO/n8+dJnUAJeSRogbE7d16am7hVQcEb5pU=";
+    hash = "sha256-NAANzEelF7ePzyZX7n0DMyilcHn+YMTti3uEJg0dGdM=";
   };
 
   strictDeps = true;
@@ -64,6 +85,12 @@ stdenv.mkDerivation (finalAttrs: {
     })
     ./remove-tools-1.11.patch
     ./go_no_vendor_checks-1.23.patch
+    ./go-env-go_ldso.patch
+  ]
+  ++ lib.optionals supportsDefaultPie [
+    (replaceVars ./go-default-pie.patch {
+      inherit (stdenv.targetPlatform.go) GOARCH;
+    })
   ];
 
   inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
@@ -99,6 +126,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
     export GOCACHE=$TMPDIR/go-cache
+    if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then
+      export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker)
+    fi
 
     export PATH=$(pwd)/bin:$PATH
 
@@ -106,6 +136,12 @@ stdenv.mkDerivation (finalAttrs: {
       # Independent from host/target, CC should produce code for the building system.
       # We only set it when cross-compiling.
       export CC=${buildPackages.stdenv.cc}/bin/cc
+      # Prefer external linker for cross when CGO is supported, since
+      # we haven't taught go's internal linker to pick the correct ELF
+      # interpreter for cross
+      # When CGO is not supported we rely on static binaries being built
+      # since they don't need an ELF interpreter
+      export GO_EXTLINK_ENABLED=${toString finalAttrs.CGO_ENABLED}
     ''}
     ulimit -a
 
@@ -156,14 +192,10 @@ stdenv.mkDerivation (finalAttrs: {
   disallowedReferences = [ goBootstrap ];
 
   passthru = {
-    inherit goBootstrap skopeoTest;
-    tests = {
-      skopeo = testers.testVersion { package = skopeoTest; };
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "go version";
-        version = "go${finalAttrs.version}";
-      };
+    inherit goBootstrap;
+    tests = callPackage ./tests.nix {
+      go = finalAttrs.finalPackage;
+      buildGoModule = buildGo124Module;
     };
   };
 
diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index b25f60b3d5ae..fc472c987040 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  apple-sdk_12,
   tzdata,
   replaceVars,
   iana-etc,
@@ -10,29 +9,51 @@
   buildPackages,
   pkgsBuildTarget,
   targetPackages,
-  testers,
-  skopeo,
+  # for testing
   buildGo125Module,
+  callPackage,
 }:
 
 let
   goBootstrap = buildPackages.callPackage ./bootstrap122.nix { };
 
-  skopeoTest = skopeo.override { buildGoModule = buildGo125Module; };
-
   # We need a target compiler which is still runnable at build time,
   # to handle the cross-building case where build != host == target
   targetCC = pkgsBuildTarget.targetPackages.stdenv.cc;
 
   isCross = stdenv.buildPlatform != stdenv.targetPlatform;
+
+  # go-default-pie.patch tries to enable position-independent codegen (PIE) only when the platform
+  # reports support (via BuildModeSupported(..., "pie", ...)).
+  #
+  # In order for buildmode=pie to work either Go's internal linker must know how
+  # to produce position-independent executables or Go must be using an external linker.
+  #
+  # That probe is not fully reliable: for example, `pkgsi686Linux.go` can fail during bootstrap
+  # with message 'default PIE binary requires external (cgo) linking, but cgo is not enabled'
+  # despite CGO being enabled. (we set `CGO_ENABLED=1`).
+  #
+  # To avoid such breakage, limit this patch to a small set of explicitly tested platforms
+  # rather than relying on the general BuildModeSupported("pie") check.
+  supportsDefaultPie =
+    let
+      hasPie = {
+        "amd64" = true;
+        "arm64" = true;
+        "ppc64le" = true;
+        "riscv64" = true;
+      };
+    in
+    hasPie.${stdenv.hostPlatform.go.GOARCH} or false
+    && hasPie.${stdenv.targetPlatform.go.GOARCH} or false;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.25.1";
+  version = "1.25.4";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ=";
+    hash = "sha256-FgBDt/F7bWC1A2lDaRf9qNUDRkC6Oa4kMca5WoicyYw=";
   };
 
   strictDeps = true;
@@ -41,10 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optionals stdenv.hostPlatform.isLinux [ stdenv.cc.libc.out ]
     ++ lib.optionals (stdenv.hostPlatform.libc == "glibc") [ stdenv.cc.libc.static ];
 
-  depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
-    apple-sdk_12
-  ];
-
   depsBuildTarget = lib.optional isCross targetCC;
 
   depsTargetTarget = lib.optional stdenv.targetPlatform.isMinGW targetPackages.threads.package;
@@ -69,6 +86,12 @@ stdenv.mkDerivation (finalAttrs: {
     })
     ./remove-tools-1.11.patch
     ./go_no_vendor_checks-1.23.patch
+    ./go-env-go_ldso.patch
+  ]
+  ++ lib.optionals supportsDefaultPie [
+    (replaceVars ./go-default-pie.patch {
+      inherit (stdenv.targetPlatform.go) GOARCH;
+    })
   ];
 
   inherit (stdenv.targetPlatform.go) GOOS GOARCH GOARM;
@@ -104,6 +127,9 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
     export GOCACHE=$TMPDIR/go-cache
+    if [ -f "$NIX_CC/nix-support/dynamic-linker" ]; then
+      export GO_LDSO=$(cat $NIX_CC/nix-support/dynamic-linker)
+    fi
 
     export PATH=$(pwd)/bin:$PATH
 
@@ -111,6 +137,12 @@ stdenv.mkDerivation (finalAttrs: {
       # Independent from host/target, CC should produce code for the building system.
       # We only set it when cross-compiling.
       export CC=${buildPackages.stdenv.cc}/bin/cc
+      # Prefer external linker for cross when CGO is supported, since
+      # we haven't taught go's internal linker to pick the correct ELF
+      # interpreter for cross
+      # When CGO is not supported we rely on static binaries being built
+      # since they don't need an ELF interpreter
+      export GO_EXTLINK_ENABLED=${toString finalAttrs.CGO_ENABLED}
     ''}
     ulimit -a
 
@@ -161,14 +193,10 @@ stdenv.mkDerivation (finalAttrs: {
   disallowedReferences = [ goBootstrap ];
 
   passthru = {
-    inherit goBootstrap skopeoTest;
-    tests = {
-      skopeo = testers.testVersion { package = skopeoTest; };
-      version = testers.testVersion {
-        package = finalAttrs.finalPackage;
-        command = "go version";
-        version = "go${finalAttrs.version}";
-      };
+    inherit goBootstrap;
+    tests = callPackage ./tests.nix {
+      go = finalAttrs.finalPackage;
+      buildGoModule = buildGo125Module;
     };
   };
 
diff --git a/pkgs/development/compilers/go/go-default-pie.patch b/pkgs/development/compilers/go/go-default-pie.patch
new file mode 100644
index 000000000000..bce8d8dafd3d
--- /dev/null
+++ b/pkgs/development/compilers/go/go-default-pie.patch
@@ -0,0 +1,13 @@
+diff --git a/src/internal/platform/supported.go b/src/internal/platform/supported.go
+index f9706a6988..abac42d550 100644
+--- a/src/internal/platform/supported.go
++++ b/src/internal/platform/supported.go
+@@ -249,7 +253,7 @@ func DefaultPIE(goos, goarch string, isRace bool) bool {
+ 	case "darwin":
+ 		return true
+ 	}
+-	return false
++	return goarch == "@GOARCH@" && BuildModeSupported("gc", "pie", goos, goarch)
+ }
+ 
+ // ExecutableHasDWARF reports whether the linked executable includes DWARF
diff --git a/pkgs/development/compilers/go/go-env-go_ldso.patch b/pkgs/development/compilers/go/go-env-go_ldso.patch
new file mode 100644
index 000000000000..395b1dab3bf4
--- /dev/null
+++ b/pkgs/development/compilers/go/go-env-go_ldso.patch
@@ -0,0 +1,44 @@
+diff --git a/src/cmd/dist/buildruntime.go b/src/cmd/dist/buildruntime.go
+index 87e8867176..dbb635011f 100644
+--- a/src/cmd/dist/buildruntime.go
++++ b/src/cmd/dist/buildruntime.go
+@@ -62,7 +62,7 @@ func mkbuildcfg(file string) {
+ 	fmt.Fprintf(&buf, "const DefaultGORISCV64 = `%s`\n", goriscv64)
+ 	fmt.Fprintf(&buf, "const defaultGOEXPERIMENT = `%s`\n", goexperiment)
+ 	fmt.Fprintf(&buf, "const defaultGO_EXTLINK_ENABLED = `%s`\n", goextlinkenabled)
+-	fmt.Fprintf(&buf, "const defaultGO_LDSO = `%s`\n", defaultldso)
++	fmt.Fprintf(&buf, "const DefaultGO_LDSO = `%s`\n", defaultldso)
+ 	fmt.Fprintf(&buf, "const version = `%s`\n", findgoversion())
+ 	fmt.Fprintf(&buf, "const defaultGOOS = runtime.GOOS\n")
+ 	fmt.Fprintf(&buf, "const defaultGOARCH = runtime.GOARCH\n")
+diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
+index 6ff1d94383..147a7d91c9 100644
+--- a/src/cmd/link/internal/ld/elf.go
++++ b/src/cmd/link/internal/ld/elf.go
+@@ -1927,8 +1927,12 @@ func asmbElf(ctxt *Link) {
+ 		sh.Flags = uint64(elf.SHF_ALLOC)
+ 		sh.Addralign = 1
+ 
+-		if interpreter == "" && buildcfg.GOOS == runtime.GOOS && buildcfg.GOARCH == runtime.GOARCH && buildcfg.GO_LDSO != "" {
+-			interpreter = buildcfg.GO_LDSO
++		if interpreter == "" {
++			if goLdso := os.Getenv("GO_LDSO"); goLdso != "" {
++				interpreter = goLdso
++			} else if buildcfg.GOOS == runtime.GOOS && buildcfg.GOARCH == runtime.GOARCH {
++				interpreter = buildcfg.DefaultGO_LDSO
++			}
+ 		}
+ 
+ 		if interpreter == "" {
+diff --git a/src/internal/buildcfg/cfg.go b/src/internal/buildcfg/cfg.go
+index 7e4ee365df..8aaa70fb36 100644
+--- a/src/internal/buildcfg/cfg.go
++++ b/src/internal/buildcfg/cfg.go
+@@ -33,7 +33,6 @@ var (
+ 	GORISCV64 = goriscv64()
+ 	GOWASM    = gowasm()
+ 	ToolTags  = toolTags()
+-	GO_LDSO   = defaultGO_LDSO
+ 	GOFIPS140 = gofips140()
+ 	Version   = version
+ )
diff --git a/pkgs/development/compilers/go/tests.nix b/pkgs/development/compilers/go/tests.nix
new file mode 100644
index 000000000000..3eeaa8b53262
--- /dev/null
+++ b/pkgs/development/compilers/go/tests.nix
@@ -0,0 +1,61 @@
+{
+  lib,
+  stdenv,
+  go,
+  buildGoModule,
+  # A package that relies on CGO
+  skopeo,
+  testers,
+  runCommand,
+  bintools,
+  # A package with CGO_ENABLED=0
+  athens,
+}:
+let
+  skopeo' = skopeo.override { buildGoModule = buildGoModule; };
+  athens' = athens.override { buildGoModule = buildGoModule; };
+  expectedCgoEnabledType = "DYN";
+  expectedCgoDisabledType = "EXE";
+in
+{
+  skopeo = testers.testVersion { package = skopeo'; };
+  version = testers.testVersion {
+    package = go;
+    command = "go version";
+    version = "go${go.version}";
+  };
+  athens = testers.testVersion { package = athens'; };
+}
+# bin type tests assume ELF file + linux-specific exe types
+// lib.optionalAttrs stdenv.hostPlatform.isLinux {
+  skopeo-bin-type = runCommand "skopeo-bin-type" { meta.broken = stdenv.hostPlatform.isStatic; } ''
+    bin="${lib.getExe' skopeo' ".skopeo-wrapped"}"
+    if ! ${lib.getExe' bintools "readelf"} -p .comment $bin | grep -Fq "GCC: (GNU)"; then
+      echo "${lib.getExe skopeo} should have been externally linked, but no GNU .comment section found"
+      exit 1
+    fi
+    if ${lib.getExe' bintools "readelf"} -h $bin | grep -q "Type:.*${expectedCgoEnabledType}"; then
+      touch $out
+    else
+      echo "ERROR: $bin is NOT ${expectedCgoEnabledType}"
+      exit 1
+    fi
+  '';
+  athens-bin-type = runCommand "athens-bin-type" { meta.broken = stdenv.hostPlatform.isStatic; } ''
+    bin="${lib.getExe athens'}"
+    ${lib.optionalString (stdenv.buildPlatform == stdenv.targetPlatform) ''
+      # For CGO_ENABLED=0 the internal linker should be used, except
+      # for cross where we rely on external linking by default
+      if ${lib.getExe' bintools "readelf"} -p .comment ${lib.getExe athens'} | grep -Fq "GCC: (GNU)"; then
+        echo "${lib.getExe athens'} has a GCC .comment, but it should have used the internal go linker"
+        exit 1
+      fi
+    ''}
+    if ${lib.getExe' bintools "readelf"} -h "$bin" | grep -q "Type:.*${expectedCgoDisabledType}"; then
+      touch $out
+    else
+      echo "ERROR: $bin is NOT ${expectedCgoDisabledType}"
+      exit 1
+    fi
+  '';
+}
diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index bb75fa8142c7..2a0202554eb6 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -6,20 +6,20 @@
 {
   "25" = {
     "aarch64-linux" = {
-      hash = "sha256-pGirVIPXTz0p39qpybKbKSYaOp5JeG0hxKnACwbBVuo=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-aarch64_bin.tar.gz";
+      hash = "sha256-7dd1ZcdlcKbfXzjlPVRSQQLywbHPdO69n1Hn/Bn2Z80=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      hash = "sha256-BNuoXdzg33UtbWngR2Z2/a0JmLfaXToPmq0f5uP/ocU=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz";
+      hash = "sha256-1KsCuhAp5jnwM3T9+RwkLh0NSQeYgOGvGTLqe3xDGDc=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      hash = "sha256-+Z4+6kgIoLc7VZ4oxGRs8JHfEtakwGX+80ZkqxcpkTc=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_macos-x64_bin.tar.gz";
+      hash = "sha256-p2LKHZoWPjJ5C5KG869MFjaXKf8nmZ2NurYNe+Fs/y8=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      hash = "sha256-bnfxewEInf2wxUzOiqk2hH4qAZ4BEEGIE7SbO9l03JA=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_macos-aarch64_bin.tar.gz";
+      hash = "sha256-Gd/UmtES5ubCve3FB8aFm/ISlPpMFk8b5nDUacZbeZM=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_macos-aarch64_bin.tar.gz";
     };
   };
   "17" = {
diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix
index 9a5a1f2818d7..93fb40f2af86 100644
--- a/pkgs/development/compilers/idris2/build-idris.nix
+++ b/pkgs/development/compilers/idris2/build-idris.nix
@@ -49,8 +49,8 @@ let
   idrName = "idris2-${idris2.version}";
   libSuffix = "lib/${idrName}";
   libDirs = libs: (lib.makeSearchPath libSuffix libs) + ":${idris2}/${idrName}";
-  supportDir = "${idris2}/${idrName}/lib";
-  drvAttrs = removeAttrs attrs [
+  supportDir = "${idris2.libidris2_support}/lib";
+  drvAttrs = builtins.removeAttrs attrs [
     "ipkgName"
     "idrisLibraries"
   ];
diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix
index 57031f673d3e..8cb6edca8fcd 100644
--- a/pkgs/development/compilers/idris2/default.nix
+++ b/pkgs/development/compilers/idris2/default.nix
@@ -1,6 +1,6 @@
-{ callPackage }:
+{ callPackage, idris2 }:
 {
-  idris2 = callPackage ./idris2.nix { };
+  inherit idris2;
   idris2Api = callPackage ./idris2-api.nix { };
   idris2Lsp = callPackage ./idris2-lsp.nix { };
 
diff --git a/pkgs/development/compilers/idris2/idris2-api.nix b/pkgs/development/compilers/idris2/idris2-api.nix
index bd408a64dee1..49f24e927176 100644
--- a/pkgs/development/compilers/idris2/idris2-api.nix
+++ b/pkgs/development/compilers/idris2/idris2-api.nix
@@ -2,7 +2,7 @@
 let
   inherit (idris2Packages) idris2 buildIdris;
   apiPkg = buildIdris {
-    inherit (idris2) src version;
+    inherit (idris2.unwrapped) src version;
     ipkgName = "idris2api";
     idrisLibraries = [ ];
     preBuild = ''
diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix
index f5a3d93eab4a..388bcb77b3a3 100644
--- a/pkgs/development/compilers/idris2/idris2-lsp.nix
+++ b/pkgs/development/compilers/idris2/idris2-lsp.nix
@@ -6,39 +6,40 @@
 }:
 
 let
-  globalLibraries =
+  globalLibrariesPath =
     let
       idrName = "idris2-${idris2Packages.idris2.version}";
-      libSuffix = "lib/${idrName}";
     in
-    [
-      "\\$HOME/.nix-profile/lib/${idrName}"
-      "/run/current-system/sw/lib/${idrName}"
-      "${idris2Packages.idris2}/${idrName}"
-    ];
-  globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
+    lib.makeSearchPath idrName (
+      [
+        "\\$HOME/.nix-profile/lib/"
+        "/run/current-system/sw/lib/"
+        "${idris2Packages.idris2}"
+      ]
+      ++ idris2Packages.idris2.prelude
+    );
 
   inherit (idris2Packages) idris2Api;
   lspLib = idris2Packages.buildIdris {
     ipkgName = "lsp-lib";
-    version = "2024-01-21";
+    version = "2025-08-14";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "LSP-lib";
-      rev = "03851daae0c0274a02d94663d8f53143a94640da";
-      hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM=";
+      rev = "ca77e80a392b8cfeee3aaeb150069957699cdb82";
+      hash = "sha256-maXHx/OrflIdV7XPfDCRShUGZekLbLOSFQPHnL6DxnI=";
     };
     idrisLibraries = [ ];
   };
 
   lspPkg = idris2Packages.buildIdris {
     ipkgName = "idris2-lsp";
-    version = "2024-01-21";
+    version = "2025-09-10";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "idris2-lsp";
-      rev = "a77ef2d563418925aa274fa29f06880dde43f4ec";
-      hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o=";
+      rev = "81344545c134c8e7105ecf1fdd7a1caae6647035";
+      hash = "sha256-uYmg9Jd98RiO5SpRFox2xNAxY4nocPuK//zxuaIi/DM=";
     };
     idrisLibraries = [
       idris2Api
diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/development/compilers/idris2/idris2.nix
deleted file mode 100644
index b34cda66e497..000000000000
--- a/pkgs/development/compilers/idris2/idris2.nix
+++ /dev/null
@@ -1,119 +0,0 @@
-# Almost 1:1 copy of idris2's nix/package.nix. Some work done in their flake.nix
-# we do here instead.
-{
-  stdenv,
-  lib,
-  chez,
-  chez-racket,
-  clang,
-  gmp,
-  fetchFromGitHub,
-  makeWrapper,
-  gambit,
-  nodejs,
-  zsh,
-  callPackage,
-}:
-
-# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
-
-let
-  platformChez =
-    if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then
-      chez
-    else
-      chez-racket;
-in
-stdenv.mkDerivation rec {
-  pname = "idris2";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    owner = "idris-lang";
-    repo = "Idris2";
-    rev = "v${version}";
-    sha256 = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
-  };
-
-  strictDeps = true;
-  nativeBuildInputs = [
-    makeWrapper
-    clang
-    platformChez
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
-  buildInputs = [
-    platformChez
-    gmp
-  ];
-
-  prePatch = ''
-    patchShebangs --build tests
-  '';
-
-  makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
-
-  # The name of the main executable of pkgs.chez is `scheme`
-  buildFlags = [
-    "bootstrap"
-    "SCHEME=scheme"
-  ];
-
-  checkTarget = "test";
-  nativeCheckInputs = [
-    gambit
-    nodejs
-  ]; # racket ];
-  checkFlags = [ "INTERACTIVE=" ];
-
-  # TODO: Move this into its own derivation, such that this can be changed
-  #       without having to recompile idris2 every time.
-  postInstall =
-    let
-      name = "${pname}-${version}";
-      globalLibraries = [
-        "\\$HOME/.nix-profile/lib/${name}"
-        "/run/current-system/sw/lib/${name}"
-        "$out/${name}"
-      ];
-      globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
-    in
-    ''
-      # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
-      rm $out/bin/idris2
-      # The only thing we need from idris2_app is the actual binary
-      mv $out/bin/idris2_app/idris2.so $out/bin/idris2
-      rm $out/bin/idris2_app/*
-      rmdir $out/bin/idris2_app
-      # idris2 needs to find scheme at runtime to compile
-      # idris2 installs packages with --install into the path given by
-      #   IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the
-      #   behaviour of the standard Makefile install.
-      # TODO: Make support libraries their own derivation such that
-      #       overriding LD_LIBRARY_PATH is unnecessary
-      wrapProgram "$out/bin/idris2" \
-        --set-default CHEZ "${platformChez}/bin/scheme" \
-        --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \
-        --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
-        --suffix IDRIS2_DATA ':' "$out/${name}/support" \
-        --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \
-        --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \
-        --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
-    '';
-
-  # Run package tests
-  passthru.tests = callPackage ./tests.nix { inherit pname; };
-
-  meta = {
-    description = "Purely functional programming language with first class types";
-    mainProgram = "idris2";
-    homepage = "https://github.com/idris-lang/Idris2";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      fabianhjr
-      wchresta
-      mattpolzin
-    ];
-    inherit (chez.meta) platforms;
-  };
-}
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 8c38c5ce701b..67e11e7082cf 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -46,26 +46,26 @@ in
 jdk.overrideAttrs (oldAttrs: rec {
   pname = "jetbrains-jdk" + lib.optionalString withJcef "-jcef";
   javaVersion = "21.0.8";
-  build = "1140.54";
+  build = "1148.57";
   # To get the new tag:
   # git clone https://github.com/jetbrains/jetbrainsruntime
   # cd jetbrainsruntime
   # git tag --points-at [revision]
   # Look for the line that starts with jbr-
-  openjdkTag = "jbr-release-21.0.8b1140.54";
+  openjdkTag = "jbr-release-21.0.8b1148.57";
   version = "${javaVersion}-b${build}";
 
   src = fetchFromGitHub {
     owner = "JetBrains";
     repo = "JetBrainsRuntime";
     rev = "jb${version}";
-    hash = "sha256-Iz5Sh9qRktFYsT7m90IG6LC5+tARtVnvqaiEEGLCAXc=";
+    hash = "sha256-RgXwWNHAeFxmrFmyB+DP5dOif06iql2UvimEaARnQvg=";
   };
 
   env = {
     BOOT_JDK = jdk.home;
     # run `git log -1 --pretty=%ct` in jdk repo for new value on update
-    SOURCE_DATE_EPOCH = 1758959208;
+    SOURCE_DATE_EPOCH = 1759539679;
   };
 
   patches = [ ];
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 6f8b92d7a34b..80fcfd5a0add 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -51,6 +51,17 @@ in
       };
     }) { }
   );
+  julia_112-bin = wrapJulia (
+    callPackage (import ./generic-bin.nix {
+      version = "1.12.1";
+      sha256 = {
+        x86_64-linux = "7d2add9ee74ee2f12b5c268bc194794cc52ea440f8687fbab29db6afefbf69b7";
+        aarch64-linux = "2e3d6ca07e251721fa3e0cd3460fc240e60f2a9bd97bae0ea2144f586da19297";
+        x86_64-darwin = "7dd841cd853ad64f5e90a4b459631b49ee388891ceaba81857f5b8959392c4b2";
+        aarch64-darwin = "cc65620b71a725380e59d0e31dc0b4140f30229b70a4b8eec8e32c222bc54fc1";
+      };
+    }) { }
+  );
   julia_19 = wrapJulia (
     callPackage (import ./generic.nix {
       version = "1.9.4";
@@ -86,4 +97,13 @@ in
       ];
     }) { }
   );
+  julia_112 = wrapJulia (
+    callPackage (import ./generic.nix {
+      version = "1.12.1";
+      hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI=";
+      patches = [
+        ./patches/1.12/0001-skip-failing-and-flaky-tests.patch
+      ];
+    }) { }
+  );
 }
diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix
index b6622dfc4b3d..5190ba3226bf 100644
--- a/pkgs/development/compilers/julia/generic-bin.nix
+++ b/pkgs/development/compilers/julia/generic-bin.nix
@@ -15,9 +15,6 @@ let
   skip_tests = [
     # Test flaky on ofborg
     "channels"
-    # Test flaky because of our RPATH patching
-    # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
-    "compiler/codegen"
     # Test flaky
     "read"
   ]
@@ -34,6 +31,16 @@ let
     "loading"
     "cmdlineargs"
   ]
+  ++ lib.optionals (lib.versionAtLeast version "1.12") [
+    # Test flaky because of our RPATH patching
+    # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
+    "Compiler/codegen"
+    "precompile"
+    "compileall"
+  ]
+  ++ lib.optionals (lib.versionOlder version "1.12") [
+    "compiler/codegen" # older versions' test was in lowercase
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Test flaky on ofborg
     "FileWatching"
diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
index 469e0206514d..0bd32f379562 100644
--- a/pkgs/development/compilers/julia/generic.nix
+++ b/pkgs/development/compilers/julia/generic.nix
@@ -60,6 +60,15 @@ stdenv.mkDerivation rec {
     substituteInPlace deps/curl.mk \
       --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \
                      'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff'
+  ''
+  + lib.optionalString (lib.versionOlder version "1.12") ''
+    substituteInPlace deps/tools/common.mk \
+      --replace-fail "CMAKE_COMMON := " "CMAKE_COMMON := ${lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10"} "
+  ''
+  + lib.optionalString (lib.versionAtLeast version "1.12") ''
+    substituteInPlace deps/openssl.mk \
+      --replace-fail 'cd $(dir $<) && $(TAR) -zxf $<' \
+                     'cd $(dir $<) && $(TAR) -zxf $< && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" openssl-$(OPENSSL_VER)/Configure'
   '';
 
   makeFlags = [
diff --git a/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch
new file mode 100644
index 000000000000..4ab76c9fa642
--- /dev/null
+++ b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch
@@ -0,0 +1,25 @@
+From e26b82d0c162b6c22b65b2a5d2cd03d98fd9f5d4 Mon Sep 17 00:00:00 2001
+From: Sergey Volkov <taranarmo@gmail.com>
+Date: Thu, 9 Oct 2025 13:00:31 +0200
+Subject: [PATCH] disable failing and flaky tests
+
+---
+ test/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 69b7ad1451..583e64a287 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -30,7 +30,7 @@ default:
+ 
+ $(TESTS):
+ 	@cd $(SRCDIR) && \
+-	$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
++	$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs Distributed precompile compileall $@)
+ 
+ $(addprefix revise-, $(TESTS)): revise-% :
+ 	@cd $(SRCDIR) && \
+-- 
+2.51.0
+
diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 03b588f085e5..1e2ec624894d 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.2.20";
+  version = "2.2.21";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-gfAmTJBztcu9s/+EGM8sXawHaHn8FW+hpkYvWlrMRCA=";
+    sha256 = "sha256-piOHHxzZyTiUaUi3DvkXCHnwdYBDiFu9MMMvAk5RFxQ=";
   };
 
   propagatedBuildInputs = [ jre ];
diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix
index 1c3334a6d392..aeb98f646f58 100644
--- a/pkgs/development/compilers/kotlin/native.nix
+++ b/pkgs/development/compilers/kotlin/native.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "kotlin-native";
-  version = "2.2.20";
+  version = "2.2.21";
 
   src =
     let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
         {
           "macos-aarch64" = "sha256-UnDl9wj/7RXrEaApuAaLczIfz0lscQPf+pCeSdJxJeY=";
           "macos-x86_64" = "sha256-mmsBQrx0yKqvvhnD8CU+oxqhWsOT1RzvzSniN3CeG7g=";
-          "linux-x86_64" = "sha256-2Ff+4rTj/W0tQBo6lADcQMIN4dAj32UnIXF9PRme0Nw=";
+          "linux-x86_64" = "sha256-oTW6qe+SklxcKu8gwc8DZzTKj+L65duYYXO+uWp6gfg=";
         }
         .${arch};
     in
diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix
index e36d2f143dde..68d0afabee6c 100644
--- a/pkgs/development/compilers/llvm/common/bolt/default.nix
+++ b/pkgs/development/compilers/llvm/common/bolt/default.nix
@@ -12,7 +12,7 @@
   libclang,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   patches ? [ ],
   devExtraCmakeFlags ? [ ],
   fetchpatch,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
   ]
   ++ devExtraCmakeFlags;
 
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 9005a9627346..9d0441dd50b3 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -12,7 +12,7 @@
   release_version,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   fixDarwinDylibNames,
   enableManpages ? false,
   enableClangToolsExtra ? true,
@@ -95,16 +95,17 @@ stdenv.mkDerivation (
       (lib.cmakeFeature "CLANG_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/clang")
       (lib.cmakeBool "CLANGD_BUILD_XPC" false)
       (lib.cmakeBool "LLVM_ENABLE_RTTI" true)
-      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-      (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmTools.tblgen}/bin/clang-tblgen")
+      (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
+      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
+      (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmPackages.tblgen}/bin/clang-tblgen")
+      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmPackages.tblgen}/bin/clang-tidy-confusable-chars-gen")
     ]
+    ++ lib.optional (lib.versionAtLeast release_version "20") (
+      lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
+    )
     ++ lib.optionals (lib.versionAtLeast release_version "21") [
       (lib.cmakeFeature "CLANG_RESOURCE_DIR" "${placeholder "lib"}/lib/clang/${lib.versions.major release_version}")
     ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
-    ]
     ++ lib.optionals enableManpages [
       (lib.cmakeBool "CLANG_INCLUDE_DOCS" true)
       (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)
@@ -112,20 +113,10 @@ stdenv.mkDerivation (
       (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)
       (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)
     ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      # Added in LLVM15:
-      # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb
-      # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7
-      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")
-    ]
     ++ lib.optionals (lib.versionOlder release_version "20") [
       # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935
-      (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmTools.tblgen}/bin/clang-pseudo-gen")
+      (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmPackages.tblgen}/bin/clang-pseudo-gen")
     ]
-    ++ lib.optional (lib.versionAtLeast release_version "20") (
-      lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
-    )
     ++ devExtraCmakeFlags;
 
     postPatch = ''
@@ -173,20 +164,13 @@ stdenv.mkDerivation (
       patchShebangs $python/bin
 
       mkdir -p $dev/bin
-    ''
-    # TODO(@LunNova): Clean up this rebuild avoidance in staging
-    + lib.optionalString enableClangToolsExtra (
-      if lib.versionOlder release_version "20" then
-        ''
-          cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin
-        ''
-      else
-        ''
-          cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin
-        ''
-    )
-    + lib.optionalString (!enableClangToolsExtra) ''
       cp bin/clang-tblgen $dev/bin
+    ''
+    + lib.optionalString enableClangToolsExtra ''
+      cp bin/clang-tidy-confusable-chars-gen $dev/bin
+    ''
+    + lib.optionalString (enableClangToolsExtra && lib.versionOlder release_version "20") ''
+      cp bin/clang-pseudo-gen $dev/bin
     '';
 
     env =
diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 4b4b2212e264..a81e79aad26c 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -15,7 +15,6 @@
   libcxx,
   linuxHeaders,
   freebsd,
-  libxcrypt,
 
   # Some platforms have switched to using compiler-rt, but still want a
   # libgcc.a for ABI compat purposes. The use case would be old code that
@@ -123,9 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_C_COMPILER_TARGET" stdenv.hostPlatform.config)
     (lib.cmakeFeature "CMAKE_ASM_COMPILER_TARGET" stdenv.hostPlatform.config)
   ]
-  ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
-    (lib.cmakeFeature "SANITIZER_COMMON_CFLAGS" "-I${libxcrypt}/include")
-  ]
   ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [
     (lib.cmakeFeature "SANITIZER_CXX_ABI" "libcxxabi")
     (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index df2f95aa0a1e..806cf214b4ea 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -1,34 +1,30 @@
 {
-  lowPrio,
-  newScope,
   pkgs,
   targetPackages,
   lib,
   stdenv,
-  libxcrypt,
-  substitute,
-  replaceVars,
   fetchFromGitHub,
-  fetchpatch,
-  fetchpatch2,
   overrideCC,
   wrapCCWith,
   wrapBintoolsWith,
-  buildPackages,
-  buildLlvmTools, # tools, but from the previous stage, for cross
-  targetLlvmLibraries, # libraries, but from the next stage, for cross
-  targetLlvm,
+  makeScopeWithSplicing',
+  otherSplices,
+  splicePackages,
   # This is the default binutils, but with *this* version of LLD rather
   # than the default LLVM version's, if LLD is the choice. We use these for
   # the `useLLVM` bootstrapping below.
-  bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
-  bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
+  bootBintoolsNoLibc,
+  bootBintools,
   darwin,
   gitRelease ? null,
   officialRelease ? null,
   monorepoSrc ? null,
   version ? null,
   patchesFn ? lib.id,
+  cmake,
+  cmakeMinimal,
+  python3,
+  python3Minimal,
   # Allows passthrough to packages via newScope. This makes it possible to
   # do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get
   # an llvmPackages whose packages are overridden in an internally consistent way.
@@ -110,11 +106,24 @@ let
       };
   };
 
-  tools = lib.makeExtensible (
-    tools:
+  buildLlvmPackages = otherSplices.selfBuildHost;
+in
+makeScopeWithSplicing' {
+  inherit otherSplices;
+  extra = _spliced0: args // metadata // { inherit buildLlvmPackages; };
+  f =
+    self:
     let
-      callPackage = newScope (tools // args // metadata);
+      targetLlvmPackages =
+        if otherSplices.selfTargetTarget == { } then self else otherSplices.selfTargetTarget;
+
+      # FIXME: This is a tragic and unprincipled hack, but I don’t
+      # know what would actually be good instead.
+      newScope = scope: self.newScope ({ inherit (args) stdenv; } // scope);
+      callPackage = newScope { };
+
       clangVersion = lib.versions.major metadata.release_version;
+
       mkExtraBuildCommands0 =
         cc:
         ''
@@ -134,37 +143,40 @@ let
               ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc"
             ''
         );
+
       mkExtraBuildCommandsBasicRt =
         cc:
         mkExtraBuildCommands0 cc
         + ''
-          ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmPackages.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
         '';
+
       mkExtraBuildCommands =
         cc:
         mkExtraBuildCommands0 cc
         + ''
-          ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
-          ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
+          ln -s "${targetLlvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmPackages.compiler-rt.out}/share" "$rsrc/share"
         '';
 
-      bintoolsNoLibc' = if bootBintoolsNoLibc == null then tools.bintoolsNoLibc else bootBintoolsNoLibc;
-      bintools' = if bootBintools == null then tools.bintools else bootBintools;
+      bintoolsNoLibc' = if bootBintoolsNoLibc == null then self.bintoolsNoLibc else bootBintoolsNoLibc;
+      bintools' = if bootBintools == null then self.bintools else bootBintools;
     in
     {
-      libllvm = callPackage ./llvm {
-      };
+      inherit (metadata) release_version;
+
+      libllvm = callPackage ./llvm { };
 
       # `llvm` historically had the binaries.  When choosing an output explicitly,
       # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-      llvm = tools.libllvm;
+      llvm = self.libllvm;
 
       tblgen = callPackage ./tblgen.nix {
         patches =
           builtins.filter
             # Crude method to drop polly patches if present, they're not needed for tblgen.
             (p: (!lib.hasInfix "-polly" p))
-            tools.libllvm.patches;
+            self.libllvm.patches;
         clangPatches = [
           # Would take tools.libclang.patches, but this introduces a cycle due
           # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
@@ -173,20 +185,19 @@ let
         ];
       };
 
-      libclang = callPackage ./clang {
-      };
+      libclang = callPackage ./clang { };
 
-      clang-unwrapped = tools.libclang;
+      clang-unwrapped = self.libclang;
 
-      llvm-manpages = lowPrio (
-        tools.libllvm.override {
+      llvm-manpages = lib.lowPrio (
+        self.libllvm.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
       );
 
-      clang-manpages = lowPrio (
-        tools.libclang.override {
+      clang-manpages = lib.lowPrio (
+        self.libclang.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
@@ -198,55 +209,59 @@ let
       # pick clang appropriate for package set we are targeting
       clang =
         if stdenv.targetPlatform.libc == null then
-          tools.clangNoLibc
+          self.clangNoLibc
         else if stdenv.targetPlatform.isDarwin then
-          tools.systemLibcxxClang
+          self.systemLibcxxClang
         else if stdenv.targetPlatform.useLLVM or false then
-          tools.clangUseLLVM
-        else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then
-          tools.libstdcxxClang
+          self.clangUseLLVM
+        else if (targetPackages.stdenv or stdenv).cc.isGNU then
+          self.libstdcxxClang
         else
-          tools.libcxxClang;
+          self.libcxxClang;
 
       libstdcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper.
         libcxx = null;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
       libcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
-        libcxx = targetLlvmLibraries.libcxx;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        cc = self.clang-unwrapped;
+        libcxx = targetLlvmPackages.libcxx;
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
       # Darwin uses the system libc++ by default. It is set up as its own clang definition so that `libcxxClang`
       # continues to use the libc++ from LLVM.
       systemLibcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = darwin.libcxx;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
-      lld = callPackage ./lld {
-      };
+      lld = callPackage ./lld { };
 
-      lldbPlugins = lib.makeExtensible (
-        lldbPlugins:
-        let
-          callPackage = newScope (lldbPlugins // tools // args // metadata);
-        in
-        lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
+      lldbPlugins = lib.recurseIntoAttrs (
+        lib.makeScopeWithSplicing'
+          {
+            inherit splicePackages newScope;
+          }
+          {
+            otherSplices = lib.mapAttrs (_: selfSplice: selfSplice.lldbPlugins or { }) otherSplices;
+            f = selfLldbPlugins: {
+              llef = selfLldbPlugins.callPackage ./lldb-plugins/llef.nix { };
+            };
+          }
       );
 
       lldb = callPackage ./lldb { };
 
-      lldb-manpages = lowPrio (
-        tools.lldb.override {
+      lldb-manpages = lib.lowPrio (
+        self.lldb.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
@@ -262,27 +277,29 @@ let
       bintools-unwrapped = callPackage ./bintools.nix { };
 
       bintoolsNoLibc = wrapBintoolsWith {
-        bintools = tools.bintools-unwrapped;
+        bintools = self.bintools-unwrapped;
         libc = targetPackages.preLibcHeaders;
       };
 
-      bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };
+      bintools = wrapBintoolsWith {
+        bintools = self.bintools-unwrapped;
+      };
 
       clangUseLLVM = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
-        libcxx = targetLlvmLibraries.libcxx;
+        cc = self.clang-unwrapped;
+        libcxx = targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
-          targetLlvmLibraries.compiler-rt
+          targetLlvmPackages.compiler-rt
         ]
         ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
-          targetLlvmLibraries.libunwind
+          targetLlvmPackages.libunwind
         ];
         extraBuildCommands = mkExtraBuildCommands cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
           "-Wno-unused-command-line-argument"
-          "-B${targetLlvmLibraries.compiler-rt}/lib"
+          "-B${targetLlvmPackages.compiler-rt}/lib"
         ]
         ++ lib.optional (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
@@ -295,16 +312,19 @@ let
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
         nixSupport.cc-ldflags = lib.optionals (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
-        ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        ) [ "-L${targetLlvmPackages.libunwind}/lib" ];
       };
 
       clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         # This is used to build compiler-rt. Make sure to use the system libc++ on Darwin.
-        libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmLibraries.libcxx;
+        #
+        # FIXME: This should almost certainly use
+        # `stdenv.targetPlatform` and `targetPackages.darwin.libcxx`.
+        libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
-          targetLlvmLibraries.compiler-rt-no-libc
+          targetLlvmPackages.compiler-rt-no-libc
         ]
         ++
           lib.optionals
@@ -312,13 +332,13 @@ let
               !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
             )
             [
-              targetLlvmLibraries.libunwind
+              targetLlvmPackages.libunwind
             ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
           "-Wno-unused-command-line-argument"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
         ]
         ++ lib.optional (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
@@ -331,187 +351,152 @@ let
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
         nixSupport.cc-ldflags = lib.optionals (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
-        ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        ) [ "-L${targetLlvmPackages.libunwind}/lib" ];
       };
 
       clangWithLibcAndBasicRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintools';
-        extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
+        extraPackages = [ targetLlvmPackages.compiler-rt-no-libc ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
           "-nostdlib++"
         ]
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       clangNoLibcWithBasicRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintoolsNoLibc';
-        extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
+        extraPackages = [ targetLlvmPackages.compiler-rt-no-libc ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
         ]
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       clangNoLibcNoRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintoolsNoLibc';
         extraPackages = [ ];
-        # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
         extraBuildCommands = mkExtraBuildCommands0 cc;
+        # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
         nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       # This is an "oddly ordered" bootstrap just for Darwin. Probably
       # don't want it otherwise.
-      clangNoCompilerRtWithLibc =
-        wrapCCWith rec {
-          cc = tools.clang-unwrapped;
-          libcxx = null;
-          bintools = bintools';
-          extraPackages = [ ];
-          extraBuildCommands = mkExtraBuildCommands0 cc;
-        }
-        # FIXME: This should be inside the `wrapCCWith` call.
-        // lib.optionalAttrs stdenv.targetPlatform.isWasm {
-          nixSupport.cc-cflags = [ "-fno-exceptions" ];
-        };
+      clangNoCompilerRtWithLibc = wrapCCWith rec {
+        cc = self.clang-unwrapped;
+        libcxx = null;
+        bintools = bintools';
+        extraPackages = [ ];
+        extraBuildCommands = mkExtraBuildCommands0 cc;
+        nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
+      };
 
       # Aliases
-      clangNoCompilerRt = tools.clangNoLibcNoRt;
-      clangNoLibc = tools.clangNoLibcWithBasicRt;
-      clangNoLibcxx = tools.clangWithLibcAndBasicRt;
+      clangNoCompilerRt = self.clangNoLibcNoRt;
+      clangNoLibc = self.clangNoLibcWithBasicRt;
+      clangNoLibcxx = self.clangWithLibcAndBasicRt;
+
+      compiler-rt-libc = callPackage ./compiler-rt (
+        let
+          # temp rename to avoid infinite recursion
+          stdenv =
+            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+            if args.stdenv.hostPlatform.isDarwin then
+              overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx
+            else if args.stdenv.hostPlatform.useLLVM or false then
+              overrideCC args.stdenv buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx
+            else
+              args.stdenv;
+        in
+        {
+          inherit stdenv;
+        }
+      );
+
+      compiler-rt-no-libc = callPackage ./compiler-rt {
+        doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
+        stdenv =
+          # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangNoLibcNoRt
+          else
+            overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+      };
+
+      compiler-rt =
+        if
+          stdenv.hostPlatform.libc == null
+          # Building the with-libc compiler-rt and WASM doesn't yet work,
+          # because wasilibc doesn't provide some expected things. See
+          # compiler-rt's file for further details.
+          || stdenv.hostPlatform.isWasm
+          # Failing `#include <term.h>` in
+          # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
+          # sanitizers, not sure where to get it.
+          || stdenv.hostPlatform.isFreeBSD
+        then
+          self.compiler-rt-no-libc
+        else
+          self.compiler-rt-libc;
+
+      stdenv = overrideCC stdenv buildLlvmPackages.clang;
+
+      libcxxStdenv = overrideCC stdenv buildLlvmPackages.libcxxClang;
+
+      libcxx = callPackage ./libcxx {
+        stdenv =
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangWithLibcAndBasicRt
+          else
+            overrideCC stdenv buildLlvmPackages.clangWithLibcAndBasicRt;
+      };
+
+      libunwind = callPackage ./libunwind {
+        stdenv = overrideCC stdenv buildLlvmPackages.clangWithLibcAndBasicRt;
+      };
+
+      openmp = callPackage ./openmp { };
 
       mlir = callPackage ./mlir { };
 
       libclc = callPackage ./libclc { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {
-      bolt = callPackage ./bolt {
-      };
+      bolt = callPackage ./bolt { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
-      flang = callPackage ./flang {
-        mlir = tools.mlir;
+      flang = callPackage ./flang { };
+
+      libc-overlay = callPackage ./libc {
+        isFullBuild = false;
+        # Use clang due to "gnu::naked" not working on aarch64.
+        # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+        stdenv = overrideCC stdenv buildLlvmPackages.clang;
       };
-    }
-  );
 
-  libraries = lib.makeExtensible (
-    libraries:
-    let
-      callPackage = newScope (libraries // buildLlvmTools // args // metadata);
-    in
-    (
-      {
-        compiler-rt-libc = callPackage ./compiler-rt (
-          let
-            # temp rename to avoid infinite recursion
-            stdenv =
-              # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-              if args.stdenv.hostPlatform.isDarwin then
-                overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-              else if args.stdenv.hostPlatform.useLLVM or false then
-                overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-              else
-                args.stdenv;
-          in
-          {
-            inherit stdenv;
-          }
-          // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
-            libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {
-              configureFlags = old.configureFlags ++ [ "--disable-symvers" ];
-            });
-          }
-        );
+      libc-full = callPackage ./libc {
+        isFullBuild = true;
+        # Use clang due to "gnu::naked" not working on aarch64.
+        # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+        stdenv = overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+        # FIXME: This should almost certainly be `stdenv.hostPlatform`.
+        cmake = if stdenv.targetPlatform.libc == "llvm" then cmakeMinimal else cmake;
+        python3 = if stdenv.targetPlatform.libc == "llvm" then python3Minimal else python3;
+      };
 
-        compiler-rt-no-libc = callPackage ./compiler-rt {
-          doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
-          stdenv =
-            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt
-            else
-              overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-        };
-
-        compiler-rt =
-          if
-            stdenv.hostPlatform.libc == null
-            # Building the with-libc compiler-rt and WASM doesn't yet work,
-            # because wasilibc doesn't provide some expected things. See
-            # compiler-rt's file for further details.
-            || stdenv.hostPlatform.isWasm
-            # Failing `#include <term.h>` in
-            # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
-            # sanitizers, not sure where to get it.
-            || stdenv.hostPlatform.isFreeBSD
-          then
-            libraries.compiler-rt-no-libc
-          else
-            libraries.compiler-rt-libc;
-
-        stdenv = overrideCC stdenv buildLlvmTools.clang;
-
-        libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
-
-        libcxx = callPackage ./libcxx {
-          stdenv =
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
-            else
-              overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        };
-
-        libunwind = callPackage ./libunwind {
-          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        };
-
-        openmp = callPackage ./openmp {
-        };
-      }
-      // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
-        libc-overlay = callPackage ./libc {
-          isFullBuild = false;
-          # Use clang due to "gnu::naked" not working on aarch64.
-          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
-          stdenv = overrideCC stdenv buildLlvmTools.clang;
-        };
-
-        libc-full = callPackage ./libc {
-          isFullBuild = true;
-          # Use clang due to "gnu::naked" not working on aarch64.
-          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
-          stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-          cmake =
-            if stdenv.targetPlatform.libc == "llvm" then buildPackages.cmakeMinimal else buildPackages.cmake;
-          python3 =
-            if stdenv.targetPlatform.libc == "llvm" then
-              buildPackages.python3Minimal
-            else
-              buildPackages.python3;
-        };
-
-        libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;
-      }
-    )
-  );
-
-  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
-in
-{
-  inherit tools libraries;
-  inherit (metadata) release_version;
+      libc =
+        # FIXME: This should almost certainly be `stdenv.hostPlatform`.
+        if stdenv.targetPlatform.libc == "llvm" then self.libc-full else self.libc-overlay;
+    };
 }
-// (noExtend libraries)
-// (noExtend tools)
diff --git a/pkgs/development/compilers/llvm/common/flang/default.nix b/pkgs/development/compilers/llvm/common/flang/default.nix
index 4a452c0dc962..335633d7d19c 100644
--- a/pkgs/development/compilers/llvm/common/flang/default.nix
+++ b/pkgs/development/compilers/llvm/common/flang/default.nix
@@ -15,7 +15,7 @@
   mlir,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   devExtraCmakeFlags ? [ ],
 }:
 
@@ -64,11 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
     (lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm")
-    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmTools.tblgen}/bin/")
-    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmTools.tblgen}/bin/llvm-lit")
+    # TODO: Needs patches and the `lit` package like other LLVM builds?
+    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmPackages.tblgen}/bin/")
+    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmPackages.tblgen}/bin/llvm-lit")
     (lib.cmakeFeature "CLANG_DIR" "${libclang.dev}/lib/cmake/clang")
     (lib.cmakeFeature "MLIR_DIR" "${mlir.dev}/lib/cmake/mlir")
-    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/mlir-tblgen")
     (lib.cmakeFeature "MLIR_TABLEGEN_TARGET" "MLIR-TBLGen")
     (lib.cmakeBool "LLVM_BUILD_EXAMPLES" false)
     (lib.cmakeBool "LLVM_ENABLE_PLUGINS" false)
diff --git a/pkgs/development/compilers/llvm/common/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
index f1ae54c0a9a5..304ee54d8a7a 100644
--- a/pkgs/development/compilers/llvm/common/libclc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -6,7 +6,7 @@
   monorepoSrc,
   llvm,
   buildPackages,
-  buildLlvmTools,
+  buildLlvmPackages,
   ninja,
   cmake,
   python3,
@@ -15,7 +15,7 @@
 }:
 let
   spirv-llvm-translator = buildPackages.spirv-llvm-translator.override {
-    inherit (buildLlvmTools) llvm;
+    inherit (buildLlvmPackages) llvm;
   };
 
   # The build requires an unwrapped clang but wrapped clang++ thus we need to
@@ -23,7 +23,7 @@ let
   # unwrapped clang++
   clang-only = runCommand "clang-only" { } ''
     mkdir -p "$out"/bin
-    ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin
+    ln -s "${lib.getExe' buildLlvmPackages.clang.cc "clang"}" "$out"/bin
   '';
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -59,13 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString (lib.versionOlder release_version "19") ''
       substituteInPlace CMakeLists.txt \
         --replace-fail 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_CLANG clang PATHS "${buildLlvmPackages.clang.cc}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_AS llvm-as PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_OPT opt PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
                   'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
     ''
@@ -74,13 +74,13 @@ stdenv.mkDerivation (finalAttrs: {
         ''
           substituteInPlace CMakeLists.txt \
             --replace-fail 'COMMAND prepare_builtins' \
-                           'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'
+                           'COMMAND ${buildLlvmPackages.libclc.dev}/bin/prepare_builtins'
         ''
       else
         ''
           substituteInPlace CMakeLists.txt \
             --replace-fail 'set( prepare_builtins_exe prepare_builtins )' \
-                           'set( prepare_builtins_exe ${buildLlvmTools.libclc.dev}/bin/prepare_builtins )'
+                           'set( prepare_builtins_exe ${buildLlvmPackages.libclc.dev}/bin/prepare_builtins )'
         ''
     );
 
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (lib.versionAtLeast release_version "19") [
     clang-only
-    buildLlvmTools.llvm
+    llvm
     spirv-llvm-translator
   ];
   buildInputs = [ llvm ];
diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix
index b59161683842..be38ae92d8ec 100644
--- a/pkgs/development/compilers/llvm/common/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix
@@ -143,9 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs utils/cat_files.py
   '';
 
-  # TODO: Remove on `staging`.
-  patches = [ ];
-
   nativeBuildInputs = [
     cmake
     ninja
diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
index f0e39e7ed391..bbd33110149f 100644
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
@@ -21,9 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit version;
 
-  # TODO: Remove on `staging`.
-  patches = [ ];
-
   src =
     if monorepoSrc != null then
       runCommand "libunwind-src-${version}" { inherit (monorepoSrc) passthru; } ''
@@ -60,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ devExtraCmakeFlags;
 
-  # TODO: Remove on `staging`.
-  prePatch = "";
-  postPatch = "";
-
   postInstall =
     lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows)
       ''
diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix
index e9c0ee543437..b9c9152ec98d 100644
--- a/pkgs/development/compilers/llvm/common/lld/default.nix
+++ b/pkgs/development/compilers/llvm/common/lld/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   llvm_meta,
   release_version,
-  buildLlvmTools,
+  buildLlvmPackages,
   monorepoSrc ? null,
   src ? null,
   runCommand,
@@ -59,13 +59,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeFeature "LLD_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/lld")
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
   ]
   ++ devExtraCmakeFlags;
 
-  # TODO: Remove on `staging`.
-  postPatch = "";
-
   # Musl's default stack size is too small for lld to be able to link Firefox.
   LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";
 
diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix
index 9fbcbb0f3839..f67da5042667 100644
--- a/pkgs/development/compilers/llvm/common/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/common/lldb/default.nix
@@ -74,6 +74,7 @@ stdenv.mkDerivation (
 
     nativeBuildInputs = [
       cmake
+      ninja
       python3
       which
       swig
@@ -84,10 +85,6 @@ stdenv.mkDerivation (
     ++ lib.optionals enableManpages [
       python3.pkgs.sphinx
       python3.pkgs.myst-parser
-    ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      ninja
     ];
 
     buildInputs = [
@@ -112,6 +109,7 @@ stdenv.mkDerivation (
       (lib.cmakeBool "LLVM_ENABLE_RTTI" false)
       (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake")
       (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/lit")
+      (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       (lib.cmakeBool "LLDB_USE_SYSTEM_DEBUGSERVER" true)
@@ -119,10 +117,6 @@ stdenv.mkDerivation (
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic
     ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")
-    ]
     ++ lib.optionals enableManpages [
       (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)
       (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)
@@ -184,9 +178,6 @@ stdenv.mkDerivation (
   // lib.optionalAttrs enableManpages {
     pname = "lldb-manpages";
 
-    # TODO: Remove on `staging`.
-    buildPhase = "";
-
     ninjaFlags = [ "docs-lldb-man" ];
 
     propagatedBuildInputs = [ ];
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index ceb7b35688de..a7821a0d976a 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -22,7 +22,7 @@
   zlib,
   which,
   sysctl,
-  buildLlvmTools,
+  buildLlvmPackages,
   updateAutotoolsGnuConfigScriptsHook,
   enableManpages ? false,
   enableSharedLibraries ? !stdenv.hostPlatform.isStatic,
@@ -85,9 +85,6 @@ stdenv.mkDerivation (
     pname = "llvm";
     inherit version;
 
-    # TODO: Remove on `staging`.
-    shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version));
-
     src =
       if monorepoSrc != null then
         runCommand "llvm-src-${version}" { inherit (monorepoSrc) passthru; } (
@@ -471,7 +468,7 @@ stdenv.mkDerivation (
           (lib.cmakeFeature "LLVM_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/llvm")
           (lib.cmakeBool "LLVM_ENABLE_RTTI" true)
           (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" enableSharedLibraries)
-          (lib.cmakeFeature "LLVM_TABLEGEN" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+          (lib.cmakeFeature "LLVM_TABLEGEN" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
         ];
       in
       flagsForLlvmConfig
diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix
index 3d39c9a25d72..ec4944c34aaf 100644
--- a/pkgs/development/compilers/llvm/common/mlir/default.nix
+++ b/pkgs/development/compilers/llvm/common/mlir/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   llvm_meta,
   release_version,
-  buildLlvmTools,
+  buildLlvmPackages,
   monorepoSrc,
   runCommand,
   cmake,
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config)
     (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config)
     (lib.cmakeBool "LLVM_ENABLE_DUMP" true)
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/mlir-tblgen")
     (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" (!stdenv.hostPlatform.isStatic))
   ]
   ++ lib.optionals stdenv.hostPlatform.isStatic [
diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 322031df1938..a08376522d9e 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -9,7 +9,6 @@
   cmake,
   ninja,
   llvm,
-  targetLlvm,
   lit,
   clang-unwrapped,
   perl,
@@ -46,9 +45,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  # TODO: Remove on `staging`.
-  patchFlags = null;
-
   patches =
     lib.optional (lib.versionOlder release_version "19") (getVersionFile "openmp/fix-find-tool.patch")
     ++ [
@@ -57,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    python3.pythonOnBuildForHost
+    python3
     perl
     ninja
     pkg-config
@@ -65,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
+    llvm
   ]
   ++ lib.optionals (ompdSupport && ompdGdbSupport) [
     python3
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index efdf35dcbcc3..c8cd6d4f48ac 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -6,13 +6,13 @@
   targetPackages,
   stdenv,
   pkgs,
-  recurseIntoAttrs,
   # This is the default binutils, but with *this* version of LLD rather
   # than the default LLVM version's, if LLD is the choice. We use these for
   # the `useLLVM` bootstrapping below.
   bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
   bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
   llvmVersions ? { },
+  generateSplicesForMkScope,
   patchesFn ? lib.id,
   # Allows passthrough to packages via newScope in ./common/default.nix.
   # This makes it possible to do
@@ -25,11 +25,11 @@ let
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
-    "21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc=";
+    "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
     "22.0.0-git".gitRelease = {
-      rev = "550b2ef041ba16ee8b5f55b5f2307f501b2c15a0";
-      rev-version = "22.0.0-unstable-2025-10-05";
-      sha256 = "sha256-K3wjvVFCjFpEDLdLWGWvAoAFGWWAKoD8a6xgXDslC7M=";
+      rev = "492f82fa46065b3afcfed1a4dca9a029d7c5acf1";
+      rev-version = "22.0.0-unstable-2025-11-02";
+      sha256 = "sha256-N0OJrXy9vtEFrr6pxoEdPIdOUju6sIjKX1s6wtYZ/7c=";
     };
   }
   // llvmVersions;
@@ -55,23 +55,21 @@ let
         args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
     in
     lib.nameValuePair attrName (
-      recurseIntoAttrs (
+      lib.recurseIntoAttrs (
         callPackage ./common (
           {
             inherit (stdenvAdapters) overrideCC;
-            buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools;
-            targetLlvmLibraries =
-              # Allow overriding targetLlvmLibraries; this enables custom runtime builds.
-              packageSetArgs.targetLlvmLibraries or targetPackages."llvmPackages_${attrName}".libraries
-                or llvmPackages."${attrName}".libraries;
-            targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm;
             inherit
               officialRelease
               gitRelease
               monorepoSrc
               version
               patchesFn
+              bootBintools
+              bootBintoolsNoLibc
               ;
+
+            otherSplices = generateSplicesForMkScope "llvmPackages_${attrName}";
           }
           // packageSetArgs # Allow overrides.
         )
diff --git a/pkgs/development/compilers/mezzo/default.nix b/pkgs/development/compilers/mezzo/default.nix
index 51df8e7062d4..033266efa564 100644
--- a/pkgs/development/compilers/mezzo/default.nix
+++ b/pkgs/development/compilers/mezzo/default.nix
@@ -15,69 +15,66 @@
   functory,
 }:
 
-if lib.versionAtLeast ocaml.version "4.06" then
-  throw "mezzo is not available for OCaml ${ocaml.version}"
-else
+let
+  check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml);
+in
 
-  let
-    check-ocaml-version = lib.versionAtLeast (lib.getVersion ocaml);
-  in
+assert check-ocaml-version "4";
 
-  assert check-ocaml-version "4";
+stdenv.mkDerivation {
 
-  stdenv.mkDerivation {
+  pname = "mezzo";
+  version = "0.0.m8";
 
-    pname = "mezzo";
-    version = "0.0.m8";
+  src = fetchFromGitHub {
+    owner = "protz";
+    repo = "mezzo";
+    rev = "m8";
+    sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
+  };
 
-    src = fetchFromGitHub {
-      owner = "protz";
-      repo = "mezzo";
-      rev = "m8";
-      sha256 = "0yck5r6di0935s3iy2mm9538jkf77ssr789qb06ms7sivd7g3ip6";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    camlp4
+    menhir
+  ];
+  buildInputs = [
+    yojson
+    menhirLib
+    ulex
+    pprint
+    fix
+    functory
+    ocamlbuild
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      camlp4
-      menhir
-    ];
-    buildInputs = [
-      yojson
-      menhirLib
-      ulex
-      pprint
-      fix
-      functory
-      ocamlbuild
-    ];
-
-    # Sets warning 3 as non-fatal
-    prePatch =
-      lib.optionalString (check-ocaml-version "4.02") ''
-        substituteInPlace myocamlbuild.pre.ml \
-        --replace '@1..3' '@1..2+3'
-      ''
-      # Compatibility with PPrint ≥ 20220103
-      + ''
-        substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml
-      '';
-
-    createFindlibDestdir = true;
-
-    postInstall = ''
-      mkdir $out/bin
-      cp mezzo $out/bin/
+  # Sets warning 3 as non-fatal
+  prePatch =
+    lib.optionalString (check-ocaml-version "4.02") ''
+      substituteInPlace myocamlbuild.pre.ml \
+      --replace '@1..3' '@1..2+3'
+    ''
+    # Compatibility with PPrint ≥ 20220103
+    + ''
+      substituteInPlace typing/Fact.ml --replace PPrintOCaml PPrint.OCaml
     '';
 
-    meta = with lib; {
-      homepage = "http://protz.github.io/mezzo/";
-      description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
-      license = licenses.gpl2;
-      platforms = ocaml.meta.platforms or [ ];
-    };
-  }
+  createFindlibDestdir = true;
+
+  postInstall = ''
+    mkdir $out/bin
+    cp mezzo $out/bin/
+  '';
+
+  meta = with lib; {
+    homepage = "http://protz.github.io/mezzo/";
+    description = "Programming language in the ML tradition, which places strong emphasis on the control of aliasing and access to mutable memory";
+    license = licenses.gpl2;
+    broken = lib.versionAtLeast ocaml.version "4.06";
+    platforms = ocaml.meta.platforms or [ ];
+  };
+}
diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix
index 88736dffdeec..d9f82898c8e7 100644
--- a/pkgs/development/compilers/mozart/default.nix
+++ b/pkgs/development/compilers/mozart/default.nix
@@ -76,6 +76,17 @@ stdenv.mkDerivation rec {
     tk
   ];
 
+  postPatch = ''
+    substituteInPlace {vm,.}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace vm/vm/test/gtest/{googletest,.}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace bootcompiler/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace {boosthost,opi,wish,stdlib}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Open source implementation of Oz 3";
     maintainers = with maintainers; [
diff --git a/pkgs/development/compilers/ocaml/generic.nix b/pkgs/development/compilers/ocaml/generic.nix
index 4d834f272740..f7cba3bda116 100644
--- a/pkgs/development/compilers/ocaml/generic.nix
+++ b/pkgs/development/compilers/ocaml/generic.nix
@@ -134,8 +134,7 @@ stdenv.mkDerivation (
         ];
     # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
     hardeningDisable =
-      lib.optional (lib.versionAtLeast version "4.09" && stdenv.hostPlatform.isMusl) "pie"
-      ++ lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow"
+      lib.optional (lib.versionAtLeast version "5.0" && stdenv.cc.isClang) "strictoverflow"
       ++ lib.optionals (args ? hardeningDisable) args.hardeningDisable;
 
     # Older versions have some race:
diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
index f6a4db45ee48..04380496e601 100644
--- a/pkgs/development/compilers/openjdk/11/source.json
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-yJljuO6jflh6kbe4ipflPiNDbKvKyA4grMAFu4UCM+Y=",
+  "hash": "sha256-nFRxcL9fkh9NhDVTUwwOXhmFRBVPTq79zeUsWBdmIfk=",
   "owner": "openjdk",
   "repo": "jdk11u",
-  "rev": "refs/tags/jdk-11.0.28+6"
+  "rev": "refs/tags/jdk-11.0.29+7"
 }
diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json
index 5a27a56c4714..110fdf3a2223 100644
--- a/pkgs/development/compilers/openjdk/17/source.json
+++ b/pkgs/development/compilers/openjdk/17/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-YN9mPfi3oMGjeRIren2cdWWySpYXsIcOnP29Zh3ym8c=",
+  "hash": "sha256-U2/ZQ9m3fi2rni2RAXyr5laDvNq0T5M2wZX+FdmCwFc=",
   "owner": "openjdk",
   "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.16+8"
+  "rev": "refs/tags/jdk-17.0.17+10"
 }
diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
index a514f2dc908e..a43dec0d9066 100644
--- a/pkgs/development/compilers/openjdk/21/source.json
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-8wUwxjhAGIp1bzny2e86vPH9q4vw1kLDoTjO7FrJbx4=",
+  "hash": "sha256-VYTitbgKgd9co9LXVnneaaKjMwAXFmscYp9McJV01Jg=",
   "owner": "openjdk",
   "repo": "jdk21u",
-  "rev": "refs/tags/jdk-21.0.8+9"
+  "rev": "refs/tags/jdk-21.0.9+10"
 }
diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json
deleted file mode 100644
index e6d7076744b6..000000000000
--- a/pkgs/development/compilers/openjdk/23/source.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "hash": "sha256-zlL2DV6iOfV3hgq/Ci95gTwVrhcvz5MWsg4/+O2ntE8=",
-  "owner": "openjdk",
-  "repo": "jdk23u",
-  "rev": "refs/tags/jdk-23.0.2+7"
-}
diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json
index b34a8438ef74..26056e281d80 100644
--- a/pkgs/development/compilers/openjdk/25/source.json
+++ b/pkgs/development/compilers/openjdk/25/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=",
+  "hash": "sha256-t5eUiWhAst3Aa16YVx7sMaHK6BHwLWyvxGfTq0C+Z4M=",
   "owner": "openjdk",
   "repo": "jdk25u",
-  "rev": "refs/tags/jdk-25+36"
+  "rev": "refs/tags/jdk-25.0.1+8"
 }
diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json
index ba66b2d05b20..d6ef95341b3c 100644
--- a/pkgs/development/compilers/openjdk/8/source.json
+++ b/pkgs/development/compilers/openjdk/8/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-CQZKhDojo+a4vZsIzRM/KoUfR17LedQYBWCRJxDFJUM=",
+  "hash": "sha256-2TN7JG42h9tYJNUzL2OLsbCWdKjWcvRf/4L9jfVfRSQ=",
   "owner": "openjdk",
   "repo": "jdk8u",
-  "rev": "refs/tags/jdk8u462-b08"
+  "rev": "refs/tags/jdk8u472-b08"
 }
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 6196350c32c8..b783cd7fbf0d 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -58,13 +58,11 @@
   enableJavaFX ? false,
   openjfx17,
   openjfx21,
-  openjfx23,
   openjfx25,
   openjfx_jdk ?
     {
       "17" = openjfx17;
       "21" = openjfx21;
-      "23" = openjfx23;
       "25" = openjfx25;
     }
     .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
@@ -78,7 +76,6 @@
   temurin-bin-11,
   temurin-bin-17,
   temurin-bin-21,
-  temurin-bin-23,
   temurin-bin-25,
   jdk-bootstrap ?
     {
@@ -86,7 +83,6 @@
       "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11;
       "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;
       "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
-      "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
       "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25;
     }
     .${featureVersion},
diff --git a/pkgs/development/compilers/polyml/5.6.nix b/pkgs/development/compilers/polyml/5.6.nix
index 02c8d79a2468..5b1d9f799738 100644
--- a/pkgs/development/compilers/polyml/5.6.nix
+++ b/pkgs/development/compilers/polyml/5.6.nix
@@ -50,7 +50,6 @@ stdenv.mkDerivation {
     platforms = with lib.platforms; linux;
     maintainers = [
       # Add your name here!
-      lib.maintainers.maggesi
     ];
   };
 }
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index 40ef97ebd871..3444b08ae241 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -61,8 +61,8 @@ stdenv.mkDerivation rec {
     homepage = "https://www.polyml.org/";
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
-    maintainers = with maintainers; [ maggesi ];
     # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index c3c78d99990a..5443e865454d 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
     maintainers = with maintainers; [
-      maggesi
       kovirobi
     ];
   };
diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_91.nix
similarity index 51%
rename from pkgs/development/compilers/rust/1_89.nix
rename to pkgs/development/compilers/rust/1_91.nix
index 768d02987ff3..b349ade55ec2 100644
--- a/pkgs/development/compilers/rust/1_89.nix
+++ b/pkgs/development/compilers/rust/1_91.nix
@@ -44,8 +44,8 @@ let
 in
 import ./default.nix
   {
-    rustcVersion = "1.89.0";
-    rustcSha256 = "sha256-JXb59EDdmbAVG9KPWaoKxhAtXE8+1O+KgQyN0FBXJQ0=";
+    rustcVersion = "1.91.0";
+    rustcSha256 = "sha256-Mn9SgVF1MBPworLH9IlVoDPXGPJppLxYYxTWddDUPoo=";
 
     llvmSharedForBuild = llvmSharedFor pkgsBuildBuild;
     llvmSharedForHost = llvmSharedFor pkgsBuildHost;
@@ -59,29 +59,30 @@ import ./default.nix
     # Note: the version MUST be the same version that we are building. Upstream
     # ensures that each released compiler can compile itself:
     # https://github.com/NixOS/nixpkgs/pull/351028#issuecomment-2438244363
-    bootstrapVersion = "1.89.0";
+    bootstrapVersion = "1.91.0";
 
     # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
     bootstrapHashes = {
-      i686-unknown-linux-gnu = "676ef74ce8ce3137ca66e3941b0221516e1713862053d8aa219e91b491417dd9";
-      x86_64-unknown-linux-gnu = "542f517d0624cbee516627221482b166bf0ffe5fd560ec32beb778c01f5c99b6";
-      x86_64-unknown-linux-musl = "35695721d53d7eb83ce0153be4c399babf5afd8597bed84f3386d9aac2b4b391";
-      arm-unknown-linux-gnueabihf = "e618d08b1547c143cfbfc040023914f4a33a4fcf7addff6778d7cfccbd444c5e";
-      armv7-unknown-linux-gnueabihf = "09a295d2d6821a404ca3bf5d1163b9642139105618d0583241b05b7dbf6e22dc";
-      aarch64-unknown-linux-gnu = "26d6de84ac59da702aa8c2f903e3c344e3259da02e02ce92ad1c735916b29a4a";
-      aarch64-unknown-linux-musl = "b5fdcad8289adf94c45727c33773a05acca994b01b333cf7a508f95fa6adc454";
-      x86_64-apple-darwin = "8590528cade978ecb5249184112887489c9d77ae846539e3ef4d04214a6d8663";
-      aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118";
-      powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337";
-      powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6";
-      riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161";
-      s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7";
-      loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec";
-      loongarch64-unknown-linux-musl = "86e5d8b0f0c868559de3ec2a0902d0e516a710adb845c8904595c54807e821c2";
-      x86_64-unknown-freebsd = "4baf0d5a44e64eecc91dc7ab89d8b0a8f8607e1d39b6989767861b34459a0396";
+      i686-unknown-linux-gnu = "7f455c2b498a6197db7f00d636899ed0fb20ce152f1b1573a3ee524ee98b1b80";
+      x86_64-unknown-linux-gnu = "bad9a353330d9f409fe9db790da5701074112f804073506bb2808dd97b940b3c";
+      x86_64-unknown-linux-musl = "ac925e53b6cef81445f73e6d45213ab56d11585ac525a3ac21fc09ef4ca664ab";
+      arm-unknown-linux-gnueabihf = "4cba316544d91b240529a5e835a42526eaeba85d3574f72b24e7ef73a7bb9132";
+      armv7-unknown-linux-gnueabihf = "d86de4cd9e8264ff8dff1b2ec52b8fd2dbb9a01acb6c23ad73e38695d2de98e6";
+      aarch64-unknown-linux-gnu = "29c5a608861cc9c06d3f86852a7d7b1a868de2d7ab90d4ff625aeebfb9383390";
+      aarch64-unknown-linux-musl = "e97e8821ca7e3aa9986a776cd145ee1b01b8984d31912d345c6059b9535cb72e";
+      x86_64-apple-darwin = "b329b458c8074023e5f6934bcd6c0bbef5075ac0090548c3d45a7de82e0c5b0c";
+      aarch64-apple-darwin = "ec42d93940933340ee55e67003699ebe264aa82d7cf0d5ae08100c06b1bfacfa";
+      powerpc64-unknown-linux-gnu = "9c325b63643bbc4ca98aec820c056f6fb4e82ddc6cc14b1e1382db1f10855ff3";
+      powerpc64le-unknown-linux-gnu = "1a357b1e44f7ec7c2da62461a4180d8d8b599dd06045e7e2b83cd7f93972d6d7";
+      powerpc64le-unknown-linux-musl = "584b4e37b7c06f850f167b2f8e5095a7a1ca961d8e66c8aae0f4a5ccfba4736e";
+      riscv64gc-unknown-linux-gnu = "216a1c6d178e0494ac488f3310e600ef17c62ce38d43e9b14557d1f16f3637f7";
+      s390x-unknown-linux-gnu = "e2cda4e86f68e3d4ca9df4f9d80d53fc34a555a96012fceefa4190a388e987d4";
+      loongarch64-unknown-linux-gnu = "8121c8d7d9152a835c84bf6b586c107ae582ed051780d37cb1e6f4f9bdad23aa";
+      loongarch64-unknown-linux-musl = "58344f7047aceefa44e9aef552b9b84ae3d16fded31a5c6ba9b63abc2c269f43";
+      x86_64-unknown-freebsd = "b996571bffafb11951b1a29526bb79518c9f5d74618cf414989b297375c7264f";
     };
 
-    selectRustPackage = pkgs: pkgs.rust_1_89;
+    selectRustPackage = pkgs: pkgs.rust_1_91;
   }
 
   (
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 37728f81d5b3..ea637477cc76 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -38,7 +38,7 @@ let
         mit # or
         asl20
       ];
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = with maintainers; [ RossSmyth ];
       broken = stdenv.hostPlatform != stdenv.buildPlatform;
     };
   };
diff --git a/pkgs/development/compilers/rust/cargo.nix b/pkgs/development/compilers/rust/cargo.nix
index 475d61d06d0a..b1302a8f0a36 100644
--- a/pkgs/development/compilers/rust/cargo.nix
+++ b/pkgs/development/compilers/rust/cargo.nix
@@ -62,6 +62,13 @@ rustPlatform.buildRustPackage.override
     # fixes: the cargo feature `edition` requires a nightly version of Cargo, but this is the `stable` channel
     RUSTC_BOOTSTRAP = 1;
 
+    RUSTFLAGS =
+      if stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu" then
+        # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker
+        "-Clinker-features=-lld -Clink-self-contained=-linker"
+      else
+        null;
+
     postInstall = ''
       wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"
 
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 42dbbc340273..44df681237c4 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -19,6 +19,7 @@ PLATFORMS=(
   aarch64-apple-darwin
   powerpc64-unknown-linux-gnu
   powerpc64le-unknown-linux-gnu
+  powerpc64le-unknown-linux-musl
   riscv64gc-unknown-linux-gnu
   s390x-unknown-linux-gnu
   loongarch64-unknown-linux-gnu
diff --git a/pkgs/development/compilers/rust/rustc.nix b/pkgs/development/compilers/rust/rustc.nix
index d8f25d52d850..97f86780a4d4 100644
--- a/pkgs/development/compilers/rust/rustc.nix
+++ b/pkgs/development/compilers/rust/rustc.nix
@@ -62,12 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     passthru.isReleaseTarball = true;
   };
 
-  hardeningDisable = optionals stdenv.cc.isClang [
-    # remove once https://github.com/NixOS/nixpkgs/issues/318674 is
-    # addressed properly
-    "zerocallusedregs"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   # rustc complains about modified source files otherwise
@@ -97,8 +91,17 @@ stdenv.mkDerivation (finalAttrs: {
     ++ optional stdenv.hostPlatform.isDarwin "-rpath ${llvmSharedForHost.lib}/lib"
   );
 
-  # Increase codegen units to introduce parallelism within the compiler.
-  RUSTFLAGS = "-Ccodegen-units=10";
+  RUSTFLAGS = lib.concatStringsSep " " (
+    [
+      # Increase codegen units to introduce parallelism within the compiler.
+      "-Ccodegen-units=10"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu") [
+      # Upstream defaults to lld on x86_64-unknown-linux-gnu, we want to use our linker
+      "-Clinker-features=-lld"
+      "-Clink-self-contained=-linker"
+    ]
+  );
   RUSTDOCFLAGS = "-A rustdoc::broken-intra-doc-links";
 
   # We need rust to build rust. If we don't provide it, configure will try to download it.
@@ -229,6 +232,11 @@ stdenv.mkDerivation (finalAttrs: {
       # doesn't work) to build a linker.
       "--disable-llvm-bitcode-linker"
     ]
+    ++ optionals (!fastCross && stdenv.targetPlatform.config != "wasm32-unknown-none") [
+      # See https://github.com/rust-lang/rust/issues/132802
+      "--set=target.wasm32-unknown-unknown.optimized-compiler-builtins=false"
+      "--set=target.wasm32v1-none.optimized-compiler-builtins=false"
+    ]
     ++ optionals (stdenv.targetPlatform.isLinux && !(stdenv.targetPlatform.useLLVM or false)) [
       "--enable-profiler" # build libprofiler_builtins
     ]
@@ -272,12 +280,13 @@ stdenv.mkDerivation (finalAttrs: {
       ''
         runHook preBuild
 
-        mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/
+        mkdir -p build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage{0,1}-{std,rustc}/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/
         ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/libstd-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/libstd.so
         ln -s ${rustc.unwrapped}/lib/rustlib/${stdenv.hostPlatform.rust.rustcTargetSpec}/librustc_driver-*.so build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/librustc.so
         ln -s ${rustc.unwrapped}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main
+        ln -s ${rustc.unwrapped}/bin/rustc build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage1-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/rustc-main
         touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-std/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.libstd-stamp
-        touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage0-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc-stamp
+        touch build/${stdenv.hostPlatform.rust.rustcTargetSpec}/stage{0,1}-rustc/${stdenv.hostPlatform.rust.rustcTargetSpec}/release/.librustc-stamp
         python ./x.py --keep-stage=0 --stage=1 build library
 
         runHook postBuild
diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index aa202adfa4cf..9c08f4fe4725 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   callPackage,
+  darwin,
   ecl,
   coreutils,
   fetchurl,
@@ -69,6 +70,7 @@ let
       "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
     else
       "${lib.getExe ecl} --norc";
+  posixUtils = if stdenv.hostPlatform.isDarwin then darwin.shell_cmds else coreutils;
 
 in
 
@@ -152,6 +154,26 @@ stdenv.mkDerivation (self: {
       # Fail intermittently
       "gc.impure.lisp"
       "threads.pure.lisp"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # This test has a gotcha on Darwin which originally showed up in
+      # 57b36ea5c83a1841b174ec6cd5e423439fe9d7a0, and later again around Oct
+      # 2025 in staging.  The test wants a clean environment (using
+      # run-program, akin to fork & execve), but darwin keeps injecting this
+      # envvar:
+      #
+      #   __CF_USER_TEXT_ENCODING=0x15F:0:0
+      #
+      # It’s not clear to maintainers where the problem lies exactly, but
+      # removing the test at least fixes the build and unblocks others.
+      #
+      # see:
+      # - https://github.com/NixOS/nixpkgs/pull/359214
+      # - https://github.com/NixOS/nixpkgs/pull/453099
+      "run-program.test.sh"
+
+      # Fails in sandbox
+      "sb-posix.impure.lisp"
     ];
 
   patches =
@@ -188,8 +210,8 @@ stdenv.mkDerivation (self: {
         # definitely NOT be patched this way, hence just a single * (and no
         # globstar).
         substituteInPlace ${if self.purgeNixReferences then "tests" else "{tests,src/code}"}/*.{lisp,sh} \
-          --replace-quiet /usr/bin/env "${coreutils}/bin/env" \
-          --replace-quiet /bin/uname "${coreutils}/bin/uname" \
+          --replace-quiet /usr/bin/env "${posixUtils}/bin/env" \
+          --replace-quiet /bin/uname "${posixUtils}/bin/uname" \
           --replace-quiet /bin/sh "${stdenv.shell}"
       )
       # Official source release tarballs will have a version.lispexpr, but if you
@@ -286,6 +308,8 @@ stdenv.mkDerivation (self: {
     ''
   );
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Common Lisp compiler";
     homepage = "https://sbcl.org";
diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py
index d2f840632a89..0ebf923b1078 100755
--- a/pkgs/development/compilers/temurin-bin/generate-sources.py
+++ b/pkgs/development/compilers/temurin-bin/generate-sources.py
@@ -6,7 +6,7 @@ import re
 import requests
 import sys
 
-feature_versions = (8, 11, 17, 21, 23, 25)
+feature_versions = (8, 11, 17, 21, 25)
 oses = ("mac", "linux", "alpine-linux")
 types = ("jre", "jdk")
 impls = ("hotspot",)
diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
index 6a97a46675dc..037f0811f3f0 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
@@ -19,9 +19,6 @@ in
   jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
   jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
 
-  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
-  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
-
   jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
   jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
 }
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix
index 2ec2e35a80fc..9e40a4722ce3 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix
@@ -24,9 +24,6 @@ in
   jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
   jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
 
-  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
-  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
-
   jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
   jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
 }
diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json
index ba71e263bef1..88b3850ba249 100644
--- a/pkgs/development/compilers/temurin-bin/sources.json
+++ b/pkgs/development/compilers/temurin-bin/sources.json
@@ -38,22 +38,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -118,22 +102,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -266,34 +234,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "riscv64": {
-            "build": "7",
-            "sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -460,34 +400,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "riscv64": {
-            "build": "7",
-            "sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -602,22 +514,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -694,22 +590,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
diff --git a/pkgs/development/compilers/yosys/plugins/symbiflow.nix b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
index 4b6a8c3ecbd6..6e36efad1331 100644
--- a/pkgs/development/compilers/yosys/plugins/symbiflow.nix
+++ b/pkgs/development/compilers/yosys/plugins/symbiflow.nix
@@ -39,7 +39,6 @@ let
 
   static_gtest = gtest.overrideAttrs (old: {
     dontDisableStatic = true;
-    disableHardening = [ "pie" ];
     cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_SHARED_LIBS=OFF" ];
   });
 
diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index b68750a56154..8d6af23eae29 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -145,9 +145,5 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.zig ];
     mainProgram = "zig";
     platforms = lib.platforms.unix;
-    # Zig 0.15.1 fails some tests on x86_64-darwin thus we mark it broken
-    # see https://github.com/ziglang/zig/issues/24974
-    broken =
-      stdenv.hostPlatform.system == "x86_64-darwin" && lib.versionAtLeast finalAttrs.version "0.15";
   };
 })
diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 370d9ee0f836..dbbbc1d7c438 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -28,7 +28,7 @@ in
     lib.switch
       [ coq.coq-version mathcomp-boot.version ]
       [
-        (case (lib.versions.range "8.15" "9.0") lib.pred.true "2.0.4")
+        (case (lib.versions.range "8.15" "9.1") lib.pred.true "2.1.1")
         (case (lib.versions.range "8.13" "8.17") lib.pred.true "1.6.5")
         (case "8.13" lib.pred.true "1.5.0")
         (case "8.12" lib.pred.true "1.4.0")
@@ -41,6 +41,7 @@ in
         (case "8.5" lib.pred.true "20170512")
       ]
       null;
+  release."2.1.1".sha256 = "sha256-tcZFpf8joEdVCgy1oKWdaM/9q3EMsF/jT+zz+kIsix8=";
   release."2.0.4".sha256 = "sha256-WD8B+n8gyGctHMO+M8201Ca3Uw8zCWYsOatSNGCf0/s=";
   release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs=";
   release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY=";
diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 9c415098e663..8e96965d5996 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -17,6 +17,7 @@
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
+      (case "9.1" "1.3.1+9.1")
       (case "9.0" "1.3.1+9.0")
       (case "8.20" "1.3.1+8.20")
       (case "8.19" "1.3+8.19")
@@ -80,6 +81,8 @@
   release."1.3.1+8.20".sha256 = "sha256-u8LB1KiACM5zVaoL7dSdHYvZgX7pf30VuqtjLLGuTzc=";
   release."1.3.1+9.0".rev = "v1.3.1-9.0";
   release."1.3.1+9.0".sha256 = "sha256-186Z0/wCuGAjIvG1LoYBMPooaC6HmnKWowYXuR0y6bA=";
+  release."1.3.1+9.1".rev = "v1.3.1-9.1";
+  release."1.3.1+9.1".sha256 = "sha256-LtYbAR3jt+JbYcqP+m1n3AZhAWSMIeOZtmdSJwg7L1A=";
 
   mlPlugin = true;
 
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index c62587e9d964..86898967dd71 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -26,7 +26,6 @@ let
       (case "8.18" "1.3.1-8.18")
       (case "8.19" "1.3.3-8.19")
       (case "8.20" "1.3.4-8.20")
-      (case "9.0" "1.3.4-9.0")
     ] null;
   release = {
     "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix
index 6f7ac6b11b44..ba2a7ba8c40a 100644
--- a/pkgs/development/coq-modules/metarocq/default.nix
+++ b/pkgs/development/coq-modules/metarocq/default.nix
@@ -15,10 +15,13 @@ let
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
-      (case "9.0" "1.4-9.0")
+      (case "9.1" "1.4-9.1")
+      (case "9.0" "1.4-9.0.1")
     ] null;
   release = {
     "1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg=";
+    "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
+    "1.4-9.1".sha256 = "sha256-v6jFvUavIzyb/e6ytAaZjxQLFM9uW9TDUB77yRO74eE=";
   };
   releaseRev = v: "v${v}";
 
diff --git a/pkgs/development/coq-modules/wasmcert/default.nix b/pkgs/development/coq-modules/wasmcert/default.nix
index 60cdc24283e8..124e78b285b8 100644
--- a/pkgs/development/coq-modules/wasmcert/default.nix
+++ b/pkgs/development/coq-modules/wasmcert/default.nix
@@ -32,7 +32,7 @@ mkCoqDerivation {
     lib.switch
       [ coq.coq-version mathcomp-boot.version ]
       [
-        (case (isEq "8.20") (isEq "2.4") "2.2.0")
+        (case (range "8.20" "9.0") (isEq "2.4") "2.2.0")
       ]
       null;
 
diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index 8d450302a45d..8b1b1856cb3f 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -10,39 +10,48 @@ package set by [cuda-packages.nix](../../top-level/cuda-packages.nix).
 
 ## Top-level directories
 
-- `cuda`: CUDA redistributables! Provides extension to `cudaPackages` scope.
-- `cudatoolkit`: monolithic CUDA Toolkit run-file installer. Provides extension
-    to `cudaPackages` scope.
-- `cudnn`: NVIDIA cuDNN library.
-- `cutensor`: NVIDIA cuTENSOR library.
-- `fixups`: Each file or directory (excluding `default.nix`) should contain a
-    `callPackage`-able expression to be provided to the `overrideAttrs` attribute
-    of a package produced by the generic manifest builder.
-    These fixups are applied by `pname`, so packages with multiple versions
-    (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function
-    (i.e., `fixups/cudnn.nix`).
-- `generic-builders`:
-  - Contains a builder `manifest.nix` which operates on the `Manifest` type
-      defined in `modules/generic/manifests`. Most packages are built using this
-      builder.
-  - Contains a builder `multiplex.nix` which leverages the Manifest builder. In
-      short, the Multiplex builder adds multiple versions of a single package to
-      single instance of the CUDA Packages package set. It is used primarily for
-      packages like `cudnn` and `cutensor`.
-- `modules`: Nixpkgs modules to check the shape and content of CUDA
-    redistributable and feature manifests. These modules additionally use shims
-    provided by some CUDA packages to allow them to re-use the
-    `genericManifestBuilder`, even if they don't have manifest files of their
-    own. `cudnn` and `tensorrt` are examples of packages which provide such
-    shims. These modules are further described in the
-    [Modules](./modules/README.md) documentation.
+- `_cuda`: Fixed-point used to configure, construct, and extend the CUDA package
+    set. This includes NVIDIA manifests.
+- `buildRedist`: Contains the logic to build packages using NVIDIA's manifests.
 - `packages`: Contains packages which exist in every instance of the CUDA
     package set. These packages are built in a `by-name` fashion.
-- `setup-hooks`: Nixpkgs setup hooks for CUDA.
-- `tensorrt`: NVIDIA TensorRT library.
+- `tests`: Contains tests which can be run against the CUDA package set.
+
+Many redistributable packages are in the `packages` directory. Their presence
+ensures that, even if a CUDA package set which no longer includes a given package
+is being constructed, the attribute for that package will still exist (but refer
+to a broken package). This prevents missing attribute errors as the package set
+evolves.
 
 ## Distinguished packages
 
+Some packages are purposefully not in the `packages` directory. These are packages
+which do not make sense for Nixpkgs, require further investigation, or are otherwise
+not straightforward to include. These packages are:
+
+- `cuda`:
+  - `collectx_bringup`: missing `libssl.so.1.1` and `libcrypto.so.1.1`; not sure how
+    to provide them or what the package does.
+  - `cuda_sandbox_dev`: unclear on purpose.
+  - `driver_assistant`: we don't use the drivers from the CUDA releases; irrelevant.
+  - `mft_autocomplete`: unsure of purpose; contains FHS paths.
+  - `mft_oem`: unsure of purpose; contains FHS paths.
+  - `mft`: unsure of purpose; contains FHS paths.
+  - `nvidia_driver`: we don't use the drivers from the CUDA releases; irrelevant.
+  - `nvlsm`: contains FHS paths/NVSwitch and NVLINK software
+  - `libnvidia_nscq`: NVSwitch software
+  - `libnvsdm`: NVSwitch software
+- `cublasmp`:
+  - `libcublasmp`: `nvshmem` isnt' packaged.
+- `cudnn`:
+  - `cudnn_samples`: requires FreeImage, which is abandoned and not packaged.
+
+> [!NOTE]
+>
+> When packaging redistributables, prefer `autoPatchelfIgnoreMissingDeps` to providing
+> paths to stubs with `extraAutoPatchelfLibs`; the stubs are meant to be used for
+> projects where linking against libraries available only at runtime is unavoidable.
+
 ### CUDA Compatibility
 
 [CUDA Compatibility](https://docs.nvidia.com/deploy/cuda-compatibility/),
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
index eaee60b2434e..4157dc9ddf65 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
@@ -100,10 +100,27 @@
         }
       )
       {
+        # Tesla K40
+        "3.5" = {
+          archName = "Kepler";
+          minCudaMajorMinorVersion = "10.0";
+          dontDefaultAfterCudaMajorMinorVersion = "11.0";
+          maxCudaMajorMinorVersion = "11.8";
+        };
+
+        # Tesla K80
+        "3.7" = {
+          archName = "Kepler";
+          minCudaMajorMinorVersion = "10.0";
+          dontDefaultAfterCudaMajorMinorVersion = "11.0";
+          maxCudaMajorMinorVersion = "11.8";
+        };
+
         # Tesla/Quadro M series
         "5.0" = {
           archName = "Maxwell";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           dontDefaultAfterCudaMajorMinorVersion = "11.0";
         };
 
@@ -111,6 +128,7 @@
         "5.2" = {
           archName = "Maxwell";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           dontDefaultAfterCudaMajorMinorVersion = "11.0";
         };
 
@@ -118,6 +136,7 @@
         "6.0" = {
           archName = "Pascal";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           # Removed from TensorRT 10.0, which corresponds to CUDA 12.4 release.
           # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1001/support-matrix/index.html
           dontDefaultAfterCudaMajorMinorVersion = "12.3";
@@ -128,6 +147,7 @@
         "6.1" = {
           archName = "Pascal";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           # Removed from TensorRT 10.0, which corresponds to CUDA 12.4 release.
           # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1001/support-matrix/index.html
           dontDefaultAfterCudaMajorMinorVersion = "12.3";
@@ -137,11 +157,22 @@
         "7.0" = {
           archName = "Volta";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           # Removed from TensorRT 10.5, which corresponds to CUDA 12.6 release.
           # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1050/support-matrix/index.html
           dontDefaultAfterCudaMajorMinorVersion = "12.5";
         };
 
+        # Jetson AGX Xavier, Drive AGX Pegasus, Xavier NX
+        "7.2" = {
+          archName = "Volta";
+          minCudaMajorMinorVersion = "10.0";
+          # Note: without `cuda_compat`, maxCudaMajorMinorVersion is 11.8
+          # https://docs.nvidia.com/cuda/cuda-for-tegra-appnote/index.html#deployment-considerations-for-cuda-upgrade-package
+          maxCudaMajorMinorVersion = "12.2";
+          isJetson = true;
+        };
+
         # GTX/RTX Turing – GTX 1660 Ti, RTX 2060, RTX 2070, RTX 2080, Titan RTX, Quadro RTX 4000,
         # Quadro RTX 5000, Quadro RTX 6000, Quadro RTX 8000, Quadro T1000/T2000, Tesla T4
         "7.5" = {
@@ -163,20 +194,30 @@
           minCudaMajorMinorVersion = "11.2";
         };
 
-        # Jetson AGX Orin and Drive AGX Orin only
+        # Tegra T234 (Jetson Orin)
         "8.7" = {
           archName = "Ampere";
-          minCudaMajorMinorVersion = "11.5";
+          minCudaMajorMinorVersion = "11.4";
           isJetson = true;
         };
 
+        # Tegra T239 (Switch 2?)
+        # "8.8" = {
+        #   archName = "Ampere";
+        #   minCudaMajorMinorVersion = "13.0";
+        #   # It's not a Jetson device, but it does use the same architecture.
+        #   isJetson = true;
+        #   # Should never be default.
+        #   dontDefaultAfterCudaMajorMinorVersion = "13.0";
+        # };
+
         # NVIDIA GeForce RTX 4090, RTX 4080, RTX 6000, Tesla L40
         "8.9" = {
           archName = "Ada";
           minCudaMajorMinorVersion = "11.8";
         };
 
-        # NVIDIA H100 (GH100)
+        # NVIDIA H100, H200, GH200
         "9.0" = {
           archName = "Hopper";
           minCudaMajorMinorVersion = "11.8";
@@ -187,7 +228,7 @@
           minCudaMajorMinorVersion = "12.0";
         };
 
-        # NVIDIA B100
+        # NVIDIA B200, GB200
         "10.0" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.7";
@@ -203,26 +244,33 @@
           minCudaMajorMinorVersion = "12.9";
         };
 
-        # NVIDIA Jetson Thor Blackwell
+        # NVIDIA Jetson Thor Blackwell, T4000, T5000 (CUDA 12.7-12.9)
+        # Okay, so:
+        # - Support for Thor was added in CUDA 12.7, which was never released but is referenced in docs
+        # - NVIDIA changed the compute capability from 10.0 to 11.0 in CUDA 13.0
+        # - From CUDA 13.0 and on, 10.1 is no longer a valid compute capability
         "10.1" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.7";
+          maxCudaMajorMinorVersion = "12.9";
           isJetson = true;
         };
 
         "10.1a" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.7";
+          maxCudaMajorMinorVersion = "12.9";
           isJetson = true;
         };
 
         "10.1f" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.9";
+          maxCudaMajorMinorVersion = "12.9";
           isJetson = true;
         };
 
-        # NVIDIA ???
+        # NVIDIA B300
         "10.3" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.9";
@@ -238,6 +286,25 @@
           minCudaMajorMinorVersion = "12.9";
         };
 
+        # NVIDIA Jetson Thor Blackwell, T4000, T5000 (CUDA 13.0+)
+        "11.0" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "13.0";
+          isJetson = true;
+        };
+
+        "11.0a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "13.0";
+          isJetson = true;
+        };
+
+        "11.0f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "13.0";
+          isJetson = true;
+        };
+
         # NVIDIA GeForce RTX 5090 (GB202) etc.
         "12.0" = {
           archName = "Blackwell";
@@ -254,7 +321,7 @@
           minCudaMajorMinorVersion = "12.9";
         };
 
-        # NVIDIA ???
+        # NVIDIA DGX Spark
         "12.1" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.9";
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index 76704f9c5c65..7a1548f81645 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -28,7 +28,204 @@
       ```
   */
   nvccCompatibilities = {
-    # Our baseline
+    # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.0" = {
+      clang = {
+        maxMajorVersion = "9";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "9";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 10 and GCC 10
+    # https://docs.nvidia.com/cuda/archive/11.1.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.1" = {
+      clang = {
+        maxMajorVersion = "10";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 11
+    # https://docs.nvidia.com/cuda/archive/11.2.2/cuda-installation-guide-linux/index.html#system-requirements
+    "11.2" = {
+      clang = {
+        maxMajorVersion = "11";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.2 to 11.3
+    "11.3" = {
+      clang = {
+        maxMajorVersion = "11";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 12 and GCC 11
+    # https://docs.nvidia.com/cuda/archive/11.4.4/cuda-toolkit-release-notes/index.html#cuda-general-new-features
+    # NOTE: There is a bug in the version of GLIBC that GCC 11 uses which causes it to fail to compile some CUDA
+    # code. As such, we skip it for this release, and do the bump in 11.6 (skipping 11.5).
+    # https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15
+    "11.4" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.4 to 11.5
+    "11.5" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.5 to 11.6
+    # However, as mentioned above, we add GCC 11 this release.
+    "11.6" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 13
+    # https://docs.nvidia.com/cuda/archive/11.7.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.7" = {
+      clang = {
+        maxMajorVersion = "13";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 14
+    # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-installation-guide-linux/index.html#system-requirements
+    "11.8" = {
+      clang = {
+        maxMajorVersion = "14";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for GCC 12
+    # https://docs.nvidia.com/cuda/archive/12.0.1/cuda-installation-guide-linux/index.html#system-requirements
+    "12.0" = {
+      clang = {
+        maxMajorVersion = "14";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 15
+    # https://docs.nvidia.com/cuda/archive/12.1.1/cuda-toolkit-release-notes/index.html#cuda-compilers-new-features
+    "12.1" = {
+      clang = {
+        maxMajorVersion = "15";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 16
+    # https://docs.nvidia.com/cuda/archive/12.2.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.2" = {
+      clang = {
+        maxMajorVersion = "16";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 12.2 to 12.3
+    # https://docs.nvidia.com/cuda/archive/12.3.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.3" = {
+      clang = {
+        maxMajorVersion = "16";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Maximum Clang version is 17
+    # Minimum GCC version is still 6, but all versions prior to GCC 7.3 are deprecated.
+    # Maximum GCC version is 13.2
+    # https://docs.nvidia.com/cuda/archive/12.4.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.4" = {
+      clang = {
+        maxMajorVersion = "17";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "13";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 12.4 to 12.5
+    # https://docs.nvidia.com/cuda/archive/12.5.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.5" = {
+      clang = {
+        maxMajorVersion = "17";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "13";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 18
     # https://docs.nvidia.com/cuda/archive/12.6.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
     "12.6" = {
       clang = {
@@ -55,7 +252,7 @@
     };
 
     # No changes from 12.8 to 12.9
-    # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    # https://docs.nvidia.com/cuda/archive/12.9.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
     "12.9" = {
       clang = {
         maxMajorVersion = "19";
@@ -66,5 +263,18 @@
         minMajorVersion = "6";
       };
     };
+
+    # 12.9 to 13.0 adds support for GCC 15 and Clang 20
+    # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "13.0" = {
+      clang = {
+        maxMajorVersion = "20";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "15";
+        minMajorVersion = "6";
+      };
+    };
   };
 }
diff --git a/pkgs/development/cuda-modules/_cuda/default.nix b/pkgs/development/cuda-modules/_cuda/default.nix
index fdbac3c8fbd7..9f7fe75ecfa5 100644
--- a/pkgs/development/cuda-modules/_cuda/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/default.nix
@@ -1,9 +1,7 @@
 # The _cuda attribute set is a fixed-point which contains the static functionality required to construct CUDA package
 # sets. For example, `_cuda.bootstrapData` includes information about NVIDIA's redistributables (such as the names
-# NVIDIA uses for different systems), `_cuda.lib` contains utility functions like `formatCapabilities` (which generate
-# common arguments passed to NVCC and `cmakeFlags`), and `_cuda.fixups` contains `callPackage`-able functions which
-# are provided to the corresponding package's `overrideAttrs` attribute to provide package-specific fixups
-# out of scope of the generic redistributable builder.
+# NVIDIA uses for different systems), and `_cuda.lib` contains utility functions like `formatCapabilities` (which generate
+# common arguments passed to NVCC and `cmakeFlags`).
 #
 # Since this attribute set is used to construct the CUDA package sets, it must exist outside the fixed point of the
 # package sets. Make these attributes available directly in the package set construction could cause confusion if
@@ -23,7 +21,7 @@ lib.fixedPoints.makeExtensible (final: {
     inherit lib;
   };
   extensions = [ ]; # Extensions applied to every CUDA package set.
-  fixups = import ./fixups { inherit lib; };
+  manifests = import ./manifests { inherit lib; };
   lib = import ./lib {
     _cuda = final;
     inherit lib;
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
deleted file mode 100644
index 1f5736ba059a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ flags, lib }:
-prevAttrs: {
-  autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
-    "libnvrm_gpu.so"
-    "libnvrm_mem.so"
-    "libnvdla_runtime.so"
-  ];
-  # `cuda_compat` only works on aarch64-linux, and only when building for Jetson devices.
-  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
-    "Trying to use cuda_compat on aarch64-linux targeting non-Jetson devices" = !flags.isJetsonBuild;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
deleted file mode 100644
index d95b014cdca6..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from
-# (getDev cuda_nvcc). It would be nice to be able to encode that.
-{ addDriverRunpath, lib }:
-prevAttrs: {
-  # Remove once cuda-find-redist-features has a special case for libcuda
-  outputs =
-    prevAttrs.outputs or [ ]
-    ++ lib.lists.optionals (!(builtins.elem "stubs" prevAttrs.outputs)) [ "stubs" ];
-
-  allowFHSReferences = false;
-
-  # The libcuda stub's pkg-config doesn't follow the general pattern:
-  postPatch =
-    prevAttrs.postPatch or ""
-    + ''
-      while IFS= read -r -d $'\0' path; do
-        sed -i \
-          -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \
-          -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
-          "$path"
-      done < <(find -iname 'cuda-*.pc' -print0)
-    ''
-    # Namelink may not be enough, add a soname.
-    # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/25536
-    + ''
-      if [[ -f lib/stubs/libcuda.so && ! -f lib/stubs/libcuda.so.1 ]]; then
-        ln -s libcuda.so lib/stubs/libcuda.so.1
-      fi
-    '';
-
-  postFixup = prevAttrs.postFixup or "" + ''
-    mv "''${!outputDev}/share" "''${!outputDev}/lib"
-    moveToOutput lib/stubs "$stubs"
-    ln -s "$stubs"/lib/stubs/* "$stubs"/lib/
-    ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"
-  '';
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
deleted file mode 100644
index 817f9d1a0302..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  libglut,
-  libcufft,
-  libcurand,
-  libGLU,
-  libglvnd,
-  libgbm,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    libglut
-    libcufft
-    libcurand
-    libGLU
-    libglvnd
-    libgbm
-  ];
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
deleted file mode 100644
index e3593b0a90f0..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  cudaAtLeast,
-  gmp,
-  expat,
-  libxcrypt-legacy,
-  ncurses6,
-  python310,
-  python311,
-  python312,
-  stdenv,
-  lib,
-}:
-prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [
-      gmp
-      libxcrypt-legacy
-      ncurses6
-      python310
-      python311
-      python312
-    ]
-    # aarch64,sbsa needs expat
-    ++ lib.lists.optionals (stdenv.hostPlatform.isAarch64) [ expat ];
-
-  installPhase =
-    prevAttrs.installPhase or ""
-    # Python 3.8 is not in nixpkgs anymore, delete Python 3.8 cuda-gdb support
-    # to avoid autopatchelf failing to find libpython3.8.so.
-    + ''
-      find $bin -name '*python3.8*' -delete
-      find $bin -name '*python3.9*' -delete
-    '';
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
deleted file mode 100644
index f042222ab9fd..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  backendStdenv,
-  setupCudaHook,
-}:
-prevAttrs: {
-  # Merge "bin" and "dev" into "out" to avoid circular references
-  outputs = builtins.filter (
-    x:
-    !(builtins.elem x [
-      "dev"
-      "bin"
-    ])
-  ) prevAttrs.outputs or [ ];
-
-  # Patch the nvcc.profile.
-  # Syntax:
-  # - `=` for assignment,
-  # - `?=` for conditional assignment,
-  # - `+=` to "prepend",
-  # - `=+` to "append".
-
-  # Cf. https://web.archive.org/web/20230308044351/https://arcb.csc.ncsu.edu/~mueller/cluster/nvidia/2.0/nvcc_2.0.pdf
-
-  # We set all variables with the lowest priority (=+), but we do force
-  # nvcc to use the fixed backend toolchain. Cf. comments in
-  # backend-stdenv.nix
-
-  postPatch =
-    prevAttrs.postPatch or ""
-    + ''
-      substituteInPlace bin/nvcc.profile \
-        --replace-fail \
-          '$(TOP)/$(_TARGET_DIR_)/include' \
-          "''${!outputDev}/include"
-    ''
-    + ''
-      cat << EOF >> bin/nvcc.profile
-
-      # Fix a compatible backend compiler
-      PATH += "${backendStdenv.cc}/bin":
-
-      # Expose the split-out nvvm
-      LIBRARIES =+ "-L''${!outputBin}/nvvm/lib"
-      INCLUDES =+ "-I''${!outputBin}/nvvm/include"
-      EOF
-    '';
-
-  # Entries here will be in nativeBuildInputs when cuda_nvcc is in nativeBuildInputs.
-  propagatedBuildInputs = prevAttrs.propagatedBuildInputs or [ ] ++ [ setupCudaHook ];
-
-  postInstall = prevAttrs.postInstall or "" + ''
-    moveToOutput "nvvm" "''${!outputBin}"
-  '';
-
-  # The nvcc and cicc binaries contain hard-coded references to /usr
-  allowFHSReferences = true;
-
-  meta = prevAttrs.meta or { } // {
-    mainProgram = "nvcc";
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
deleted file mode 100644
index 7452e41bad7b..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] ++ [ cuda_cupti ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
deleted file mode 100644
index df0019f4d827..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: _: { outputs = [ "out" ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix b/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
deleted file mode 100644
index dbf36688f011..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  cudaOlder,
-  cudaMajorMinorVersion,
-  fetchurl,
-  lib,
-  libcublas,
-  patchelf,
-  zlib,
-}:
-let
-  inherit (lib)
-    attrsets
-    maintainers
-    meta
-    strings
-    ;
-in
-finalAttrs: prevAttrs: {
-  src = fetchurl { inherit (finalAttrs.passthru.redistribRelease) hash url; };
-
-  # Useful for inspecting why something went wrong.
-  badPlatformsConditions =
-    let
-      cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
-      cudaTooNew =
-        (finalAttrs.passthru.featureRelease.maxCudaVersion != null)
-        && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
-    in
-    prevAttrs.badPlatformsConditions or { }
-    // {
-      "CUDA version is too old" = cudaTooOld;
-      "CUDA version is too new" = cudaTooNew;
-    };
-
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    zlib
-    (attrsets.getLib libcublas)
-  ];
-
-  # Tell autoPatchelf about runtime dependencies. *_infer* libraries only
-  # exist in CuDNN 8.
-  # NOTE: Versions from CUDNN releases have four components.
-  postFixup =
-    prevAttrs.postFixup or ""
-    +
-      strings.optionalString
-        (
-          strings.versionAtLeast finalAttrs.version "8.0.5.0"
-          && strings.versionOlder finalAttrs.version "9.0.0.0"
-        )
-        ''
-          ${meta.getExe patchelf} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
-          ${meta.getExe patchelf} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so
-        '';
-
-  meta = prevAttrs.meta or { } // {
-    homepage = "https://developer.nvidia.com/cudnn";
-    maintainers =
-      prevAttrs.meta.maintainers or [ ]
-      ++ (with maintainers; [
-        mdaiter
-        samuela
-        connorbaker
-      ]);
-    # TODO(@connorbaker): Temporary workaround to avoid changing the derivation hash since introducing more
-    # brokenConditions would change the derivation as they're top-level and __structuredAttrs is set.
-    teams = prevAttrs.meta.teams or [ ];
-    license = {
-      shortName = "cuDNN EULA";
-      fullName = "NVIDIA cuDNN Software License Agreement (EULA)";
-      url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement";
-      free = false;
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/default.nix b/pkgs/development/cuda-modules/_cuda/fixups/default.nix
deleted file mode 100644
index 0c9874672ce4..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-lib.concatMapAttrs (
-  fileName: _type:
-  let
-    # Fixup is in `./${attrName}.nix` or in `./${fileName}/default.nix`:
-    attrName = lib.removeSuffix ".nix" fileName;
-    fixup = import (./. + "/${fileName}");
-    isFixup = fileName != "default.nix";
-  in
-  lib.optionalAttrs isFixup { ${attrName} = fixup; }
-) (builtins.readDir ./.)
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix b/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
deleted file mode 100644
index e9c50b2f4eaf..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-_: prevAttrs: {
-  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
-    "Package is not supported; use drivers from linuxPackages" = true;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix b/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
deleted file mode 100644
index fa2073ce002a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ zlib }: prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] ++ [ zlib ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/imex.nix b/pkgs/development/cuda-modules/_cuda/fixups/imex.nix
deleted file mode 100644
index fa2073ce002a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/imex.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ zlib }: prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] ++ [ zlib ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
deleted file mode 100644
index b4fc02e89655..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  libcublas,
-  numactl,
-  rdma-core,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    libcublas
-    numactl
-    rdma-core
-  ];
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
deleted file mode 100644
index 699f0f708260..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  cudaAtLeast,
-  lib,
-  libcublas,
-  libcusparse ? null,
-  libnvjitlink ? null,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    libcublas
-    libnvjitlink
-    libcusparse
-  ];
-
-  brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing (CUDA >= 12.0)" = libnvjitlink == null;
-    "libcusparse missing (CUDA >= 12.1)" = libcusparse == null;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
deleted file mode 100644
index e895e568d784..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  cudaAtLeast,
-  lib,
-  libnvjitlink ? null,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [ libnvjitlink ];
-
-  brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing (CUDA >= 12.0)" = libnvjitlink == null;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
deleted file mode 100644
index 009e64555133..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  cuda_cudart,
-  lib,
-  libcublas,
-}:
-finalAttrs: prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [ (lib.getLib libcublas) ]
-    # For some reason, the 1.4.x release of cusparselt requires the cudart library.
-    ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
-  meta = prevAttrs.meta or { } // {
-    description = "cuSPARSELt: A High-Performance CUDA Library for Sparse Matrix-Matrix Multiplication";
-    homepage = "https://developer.nvidia.com/cusparselt-downloads";
-    maintainers = prevAttrs.meta.maintainers or [ ] ++ [ lib.maintainers.sepiabrown ];
-    teams = prevAttrs.meta.teams or [ ];
-    license = lib.licenses.unfreeRedistributable // {
-      shortName = "cuSPARSELt EULA";
-      fullName = "cuSPARSELt SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
-      url = "https://docs.nvidia.com/cuda/cusparselt/license.html";
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
deleted file mode 100644
index 530e35af5635..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  cuda_cudart,
-  lib,
-  libcublas,
-}:
-finalAttrs: prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [ (lib.getLib libcublas) ]
-    # For some reason, the 1.4.x release of cuTENSOR requires the cudart library.
-    ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
-  meta = prevAttrs.meta or { } // {
-    description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives";
-    homepage = "https://developer.nvidia.com/cutensor";
-    maintainers = prevAttrs.meta.maintainers or [ ] ++ [ lib.maintainers.obsidian-systems-maintenance ];
-    teams = prevAttrs.meta.teams;
-    license = lib.licenses.unfreeRedistributable // {
-      shortName = "cuTENSOR EULA";
-      fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
-      url = "https://docs.nvidia.com/cuda/cutensor/license.html";
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
deleted file mode 100644
index 2865b0e2fecc..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  cudaAtLeast,
-  cudaMajorMinorVersion,
-  cudaOlder,
-  e2fsprogs,
-  elfutils,
-  flags,
-  gst_all_1,
-  lib,
-  libjpeg8,
-  qt6,
-  rdma-core,
-  stdenv,
-  ucx,
-}:
-prevAttrs:
-let
-  qtwayland = lib.getLib qt6.qtwayland;
-  inherit (qt6) wrapQtAppsHook qtwebview;
-  archDir =
-    {
-      aarch64-linux = "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "desktop") + "-t210-a64";
-      x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
-{
-  outputs = [ "out" ]; # NOTE(@connorbaker): Force a single output so relative lookups work.
-  nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ wrapQtAppsHook ];
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [
-      qtwayland
-      qtwebview
-      (qt6.qtwebengine or qt6.full)
-      rdma-core
-    ]
-    ++ lib.optionals (cudaOlder "12.7") [
-      e2fsprogs
-      ucx
-    ]
-    ++ lib.optionals (cudaMajorMinorVersion == "12.9") [
-      elfutils
-    ];
-  dontWrapQtApps = true;
-  preInstall = prevAttrs.preInstall or "" + ''
-    if [[ -d nsight-compute ]]; then
-      nixLog "Lifting components of Nsight Compute to the top level"
-      mv -v nsight-compute/*/* .
-      nixLog "Removing empty directories"
-      rmdir -pv nsight-compute/*
-    fi
-
-    rm -rf host/${archDir}/Mesa/
-  '';
-  postInstall =
-    prevAttrs.postInstall or ""
-    + ''
-      moveToOutput 'ncu' "''${!outputBin}/bin"
-      moveToOutput 'ncu-ui' "''${!outputBin}/bin"
-      moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
-      moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
-      wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
-    ''
-    # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
-    + lib.optionalString (flags.isJetsonBuild && cudaOlder "12.9") ''
-      nixLog "Removing QNX 700 target directory for Jetson builds"
-      rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
-    ''
-    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
-      nixLog "Removing QNX 800 target directory for Jetson builds"
-      rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
-    '';
-  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-  preFixup = prevAttrs.preFixup or "" + ''
-    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
-  '';
-  autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
-    "libnvidia-ml.so.1"
-  ];
-  # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
-  # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
-  # messages like
-  #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
-  #   target (AArch64)
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
deleted file mode 100644
index 9983f880b58b..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  boost178,
-  cuda_cudart,
-  cudaAtLeast,
-  e2fsprogs,
-  gst_all_1,
-  lib,
-  nss,
-  numactl,
-  pulseaudio,
-  qt6,
-  rdma-core,
-  stdenv,
-  ucx,
-  wayland,
-  xorg,
-}:
-prevAttrs:
-let
-  qtwayland = lib.getLib qt6.qtwayland;
-  qtWaylandPlugins = "${qtwayland}/${qt6.qtbase.qtPluginPrefix}";
-  # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux.
-  hostDir =
-    {
-      aarch64-linux = "host-linux-armv8";
-      x86_64-linux = "host-linux-x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  targetDir =
-    {
-      aarch64-linux = "target-linux-sbsa-armv8";
-      x86_64-linux = "target-linux-x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
-{
-  outputs = [ "out" ]; # NOTE(@connorbaker): Force a single output so relative lookups work.
-
-  # An ad hoc replacement for
-  # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
-  env = prevAttrs.env or { } // {
-    rmPatterns =
-      prevAttrs.env.rmPatterns or ""
-      + toString [
-        "${hostDir}/lib{arrow,jpeg}*"
-        "${hostDir}/lib{ssl,ssh,crypto}*"
-        "${hostDir}/libboost*"
-        "${hostDir}/libexec"
-        "${hostDir}/libstdc*"
-        "${hostDir}/python/bin/python"
-        "${hostDir}/Mesa"
-      ];
-  };
-
-  # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
-  prePatch = prevAttrs.prePatch or "" + ''
-    if [[ -d bin ]]; then
-      nixLog "Removing bin wrapper scripts"
-      for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
-        [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
-      done
-      unset -v knownWrapper
-
-      nixLog "Removing empty bin directory"
-      rmdir -v bin
-    fi
-
-    if [[ -d nsight-systems ]]; then
-      nixLog "Lifting components of Nsight System to the top level"
-      mv -v nsight-systems/*/* .
-      nixLog "Removing empty nsight-systems directory"
-      rmdir -pv nsight-systems/*
-    fi
-  '';
-
-  postPatch = prevAttrs.postPatch or "" + ''
-    for path in $rmPatterns; do
-      rm -r "$path"
-    done
-    patchShebangs nsight-systems
-  '';
-
-  nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ qt6.wrapQtAppsHook ];
-
-  dontWrapQtApps = true;
-
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [
-      (qt6.qtdeclarative or qt6.full)
-      (qt6.qtsvg or qt6.full)
-      (qt6.qtimageformats or qt6.full)
-      (qt6.qtpositioning or qt6.full)
-      (qt6.qtscxml or qt6.full)
-      (qt6.qttools or qt6.full)
-      (qt6.qtwebengine or qt6.full)
-      (qt6.qtwayland or qt6.full)
-      boost178
-      cuda_cudart.stubs
-      e2fsprogs
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      nss
-      numactl
-      pulseaudio
-      qt6.qtbase
-      qtWaylandPlugins
-      rdma-core
-      ucx
-      wayland
-      xorg.libXcursor
-      xorg.libXdamage
-      xorg.libXrandr
-      xorg.libXtst
-    ]
-    # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      gst_all_1.gst-plugins-bad
-    ];
-
-  postInstall = prevAttrs.postInstall or "" + ''
-    moveToOutput '${hostDir}' "''${!outputBin}"
-    moveToOutput '${targetDir}' "''${!outputBin}"
-    moveToOutput 'bin' "''${!outputBin}"
-    wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
-  '';
-
-  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-  preFixup = prevAttrs.preFixup or "" + ''
-    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
-  '';
-
-  autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
-    "libnvidia-ml.so.1"
-  ];
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix b/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
deleted file mode 100644
index e9c50b2f4eaf..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-_: prevAttrs: {
-  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
-    "Package is not supported; use drivers from linuxPackages" = true;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix b/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
deleted file mode 100644
index 49d1018ab305..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  _cuda,
-  cudaOlder,
-  cudaPackages,
-  cudaMajorMinorVersion,
-  lib,
-  patchelf,
-  requireFile,
-  stdenv,
-}:
-let
-  inherit (lib)
-    attrsets
-    maintainers
-    meta
-    strings
-    versions
-    ;
-  inherit (stdenv) hostPlatform;
-  # targetArch :: String
-  targetArch = attrsets.attrByPath [ hostPlatform.system ] "unsupported" {
-    x86_64-linux = "x86_64-linux-gnu";
-    aarch64-linux = "aarch64-linux-gnu";
-  };
-in
-finalAttrs: prevAttrs: {
-  # Useful for inspecting why something went wrong.
-  brokenConditions =
-    let
-      cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
-      cudaTooNew =
-        (finalAttrs.passthru.featureRelease.maxCudaVersion != null)
-        && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
-      cudnnVersionIsSpecified = finalAttrs.passthru.featureRelease.cudnnVersion != null;
-      cudnnVersionSpecified = versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion;
-      cudnnVersionProvided = versions.majorMinor finalAttrs.passthru.cudnn.version;
-      cudnnTooOld =
-        cudnnVersionIsSpecified && (strings.versionOlder cudnnVersionProvided cudnnVersionSpecified);
-      cudnnTooNew =
-        cudnnVersionIsSpecified && (strings.versionOlder cudnnVersionSpecified cudnnVersionProvided);
-    in
-    prevAttrs.brokenConditions or { }
-    // {
-      "CUDA version is too old" = cudaTooOld;
-      "CUDA version is too new" = cudaTooNew;
-      "CUDNN version is too old" = cudnnTooOld;
-      "CUDNN version is too new" = cudnnTooNew;
-    };
-
-  src = requireFile {
-    name = finalAttrs.passthru.redistribRelease.filename;
-    inherit (finalAttrs.passthru.redistribRelease) hash;
-    message = ''
-      To use the TensorRT derivation, you must join the NVIDIA Developer Program and
-      download the ${finalAttrs.version} TAR package for CUDA ${cudaMajorMinorVersion} from
-      ${finalAttrs.meta.homepage}.
-
-      Once you have downloaded the file, add it to the store with the following
-      command, and try building this derivation again.
-
-      $ nix-store --add-fixed sha256 ${finalAttrs.passthru.redistribRelease.filename}
-    '';
-  };
-
-  # We need to look inside the extracted output to get the files we need.
-  sourceRoot = "TensorRT-${finalAttrs.version}";
-
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [ (finalAttrs.passthru.cudnn.lib or null) ];
-
-  preInstall =
-    prevAttrs.preInstall or ""
-    + strings.optionalString (targetArch != "unsupported") ''
-      # Replace symlinks to bin and lib with the actual directories from targets.
-      for dir in bin lib; do
-        rm "$dir"
-        mv "targets/${targetArch}/$dir" "$dir"
-      done
-
-      # Remove broken symlinks
-      for dir in include samples; do
-        rm "targets/${targetArch}/$dir" || :
-      done
-    '';
-
-  # Tell autoPatchelf about runtime dependencies.
-  postFixup =
-    let
-      versionTriple = "${versions.majorMinor finalAttrs.version}.${versions.patch finalAttrs.version}";
-    in
-    prevAttrs.postFixup or ""
-    + ''
-      ${meta.getExe' patchelf "patchelf"} --add-needed libnvinfer.so \
-        "$lib/lib/libnvinfer.so.${versionTriple}" \
-        "$lib/lib/libnvinfer_plugin.so.${versionTriple}" \
-        "$lib/lib/libnvinfer_builder_resource.so.${versionTriple}"
-    '';
-
-  passthru = prevAttrs.passthru or { } // {
-    # The CUDNN used with TensorRT.
-    # If null, the default cudnn derivation will be used.
-    # If a version is specified, the cudnn derivation with that version will be used,
-    # unless it is not available, in which case the default cudnn derivation will be used.
-    cudnn =
-      let
-        desiredName = _cuda.lib.mkVersionedName "cudnn" (
-          lib.versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion
-        );
-      in
-      if finalAttrs.passthru.featureRelease.cudnnVersion == null || (cudaPackages ? desiredName) then
-        cudaPackages.cudnn
-      else
-        cudaPackages.${desiredName};
-  };
-
-  meta = prevAttrs.meta or { } // {
-    badPlatforms =
-      prevAttrs.meta.badPlatforms or [ ]
-      ++ lib.optionals (targetArch == "unsupported") [ hostPlatform.system ];
-    homepage = "https://developer.nvidia.com/tensorrt";
-    teams = prevAttrs.meta.teams or [ ];
-
-    # Building TensorRT on Hydra is impossible because of the non-redistributable
-    # license and because the source needs to be manually downloaded from the
-    # NVIDIA Developer Program (see requireFile above).
-    hydraPlatforms = lib.platforms.none;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/lib/cuda.nix b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
index 16f99e57709a..09cf9c588f4a 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
@@ -1,4 +1,4 @@
-{ lib }:
+{ _cuda, lib }:
 {
   /**
     Returns whether a capability should be built by default for a particular CUDA version.
@@ -114,16 +114,14 @@
     ```
   */
   allowUnfreeCudaPredicate =
-    package:
-    lib.all (
-      license:
-      license.free
-      || lib.elem license.shortName [
-        "CUDA EULA"
-        "cuDNN EULA"
-        "cuSPARSELt EULA"
-        "cuTENSOR EULA"
-        "NVidia OptiX EULA"
+    let
+      cudaLicenseNames = [
+        lib.licenses.nvidiaCuda.shortName
       ]
-    ) (lib.toList package.meta.license);
+      ++ lib.map (license: license.shortName) (lib.attrValues _cuda.lib.licenses);
+    in
+    package:
+    lib.all (license: license.free || lib.elem (license.shortName or null) cudaLicenseNames) (
+      lib.toList package.meta.license
+    );
 }
diff --git a/pkgs/development/cuda-modules/_cuda/lib/default.nix b/pkgs/development/cuda-modules/_cuda/lib/default.nix
index b2fe9838de61..376abcd27f7b 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/default.nix
@@ -11,13 +11,16 @@
     ;
 
   # See ./cuda.nix for documentation.
-  inherit (import ./cuda.nix { inherit lib; })
+  inherit (import ./cuda.nix { inherit _cuda lib; })
     _cudaCapabilityIsDefault
     _cudaCapabilityIsSupported
     _mkCudaVariant
     allowUnfreeCudaPredicate
     ;
 
+  # See ./licenses.nix for documentation.
+  licenses = import ./licenses.nix;
+
   # See ./meta.nix for documentation.
   inherit (import ./meta.nix { inherit _cuda lib; })
     _mkMetaBadPlatforms
@@ -30,6 +33,7 @@
     getNixSystems
     getRedistSystem
     mkRedistUrl
+    selectManifests
     ;
 
   # See ./strings.nix for documentation.
diff --git a/pkgs/development/cuda-modules/_cuda/lib/licenses.nix b/pkgs/development/cuda-modules/_cuda/lib/licenses.nix
new file mode 100644
index 000000000000..68b5ec7cc32a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/lib/licenses.nix
@@ -0,0 +1,55 @@
+{
+  cudnn = {
+    shortName = "cuDNN EULA";
+    fullName = "cuDNN SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/deeplearning/cudnn/backend/latest/reference/eula.html";
+    free = false;
+    redistributable = false;
+  };
+
+  cusparse_lt = {
+    shortName = "cuSPARSELt EULA";
+    fullName = "cuSPARSELt SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/cuda/cusparselt/license.html";
+    free = false;
+    redistributable = false;
+  };
+
+  cutensor = {
+    shortName = "cuTENSOR EULA";
+    fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/cuda/cutensor/latest/license.html";
+    free = false;
+    redistributable = false;
+  };
+
+  tensorrt = {
+    shortName = "TensorRT EULA";
+    fullName = "TensorRT SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/deeplearning/tensorrt/latest/reference/sla.html";
+    free = false;
+    redistributable = false;
+  };
+
+  math_sdk_sla = {
+    shortName = "NVIDIA Math SDK SLA";
+    fullName = "LICENSE AGREEMENT FOR NVIDIA MATH LIBRARIES SOFTWARE DEVELOPMENT KITS";
+    url = "https://developer.download.nvidia.com/compute/mathdx/License.txt";
+    free = false;
+    redistributable = false;
+  };
+
+  # "license": "CUDA Toolkit",
+  # "license": "NVIDIA Driver",
+  # "license": "NVIDIA Proprietary",
+  # "license": "NVIDIA",
+  # "license": "NVIDIA SLA",
+  # "license": "cuDSS library",
+  # "license": "cuQuantum",
+  # "license": "libcusolvermp library",
+  # "license": "NPP PLUS library",
+  # "license": "nvCOMP library",
+  # "license": "nvJPEG 2K",
+  # "license": "NVPL",
+  # "license": "nvTIFF",
+}
diff --git a/pkgs/development/cuda-modules/_cuda/lib/meta.nix b/pkgs/development/cuda-modules/_cuda/lib/meta.nix
index 72f71973b0cd..7adc36474935 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/meta.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/meta.nix
@@ -2,7 +2,7 @@
 {
   /**
     Returns a list of bad platforms for a given package if assertsions in `finalAttrs.passthru.platformAssertions`
-    fail, optionally logging evaluation warnings for each reason.
+    fail, optionally logging evaluation warnings with `builtins.traceVerbose` for each reason.
 
     NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
 
@@ -12,31 +12,39 @@
     # Type
 
     ```
-    _mkMetaBadPlatforms :: (warn :: Bool) -> (finalAttrs :: AttrSet) -> List String
+    _mkMetaBadPlatforms :: (finalAttrs :: AttrSet) -> List String
     ```
+
+    # Inputs
+
+    `finalAttrs`
+
+    : The final attributes of the package
   */
   _mkMetaBadPlatforms =
-    warn: finalAttrs:
+    finalAttrs:
     let
       failedAssertionsString = _cuda.lib._mkFailedAssertionsString finalAttrs.passthru.platformAssertions;
       hasFailedAssertions = failedAssertionsString != "";
       finalStdenv = finalAttrs.finalPackage.stdenv;
-    in
-    lib.warnIf (warn && hasFailedAssertions)
-      "Package ${finalAttrs.finalPackage.name} is unsupported on this platform due to the following failed assertions:${failedAssertionsString}"
-      (
-        lib.optionals hasFailedAssertions (
-          lib.unique [
-            finalStdenv.buildPlatform.system
-            finalStdenv.hostPlatform.system
-            finalStdenv.targetPlatform.system
-          ]
-        )
+      badPlatforms = lib.optionals hasFailedAssertions (
+        lib.unique [
+          finalStdenv.buildPlatform.system
+          finalStdenv.hostPlatform.system
+          finalStdenv.targetPlatform.system
+        ]
       );
+      handle =
+        if hasFailedAssertions then
+          builtins.traceVerbose "Package ${finalAttrs.finalPackage.name} is unsupported on this platform due to the following failed assertions:${failedAssertionsString}"
+        else
+          lib.id;
+    in
+    handle badPlatforms;
 
   /**
     Returns a boolean indicating whether the package is broken as a result of `finalAttrs.passthru.brokenAssertions`,
-    optionally logging evaluation warnings for each reason.
+    optionally logging evaluation warnings with `builtins.traceVerbose` for each reason.
 
     NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
 
@@ -46,26 +54,25 @@
     # Type
 
     ```
-    _mkMetaBroken :: (warn :: Bool) -> (finalAttrs :: AttrSet) -> Bool
+    _mkMetaBroken :: (finalAttrs :: AttrSet) -> Bool
     ```
 
     # Inputs
 
-    `warn`
-
-    : A boolean indicating whether to log warnings
-
     `finalAttrs`
 
     : The final attributes of the package
   */
   _mkMetaBroken =
-    warn: finalAttrs:
+    finalAttrs:
     let
       failedAssertionsString = _cuda.lib._mkFailedAssertionsString finalAttrs.passthru.brokenAssertions;
       hasFailedAssertions = failedAssertionsString != "";
+      handle =
+        if hasFailedAssertions then
+          builtins.traceVerbose "Package ${finalAttrs.finalPackage.name} is marked as broken due to the following failed assertions:${failedAssertionsString}"
+        else
+          lib.id;
     in
-    lib.warnIf (warn && hasFailedAssertions)
-      "Package ${finalAttrs.finalPackage.name} is marked as broken due to the following failed assertions:${failedAssertionsString}"
-      hasFailedAssertions;
+    handle hasFailedAssertions;
 }
diff --git a/pkgs/development/cuda-modules/_cuda/lib/redist.nix b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
index a7053dc582c4..3138097c1694 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/redist.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
@@ -111,26 +111,39 @@
   /**
     Maps a Nix system to a NVIDIA redistributable system.
 
-    NOTE: We swap out the default `linux-sbsa` redist (for server-grade ARM chips) with the `linux-aarch64` redist
-    (which is for Jetson devices) if we're building any Jetson devices. Since both are based on aarch64, we can only
-    have one or the other, otherwise there's an ambiguity as to which should be used.
+    NOTE: Certain Nix systems can map to multiple NVIDIA redistributable systems. In particular, ARM systems can map to
+    either `linux-sbsa` (for server-grade ARM chips) or `linux-aarch64` (for Jetson devices). Complicating matters
+    further, as of CUDA 13.0, Jetson Thor devices use `linux-sbsa` instead of `linux-aarch64`. (It is unknown whether
+    NVIDIA plans to make the Orin series use `linux-sbsa` as well for the CUDA 13.0 release.)
 
     NOTE: This function *will* be called by unsupported systems because `cudaPackages` is evaluated on all systems. As
     such, we need to handle unsupported systems gracefully.
 
+    NOTE: This function does not check whether the provided CUDA capabilities are valid for the given CUDA version.
+    The heavy validation work to ensure consistency of CUDA capabilities is performed by backendStdenv.
+
     # Type
 
     ```
-    getRedistSystem :: (hasJetsonCudaCapability :: Bool) -> (nixSystem :: String) -> String
+    getRedistSystem ::
+      { cudaCapabilities :: List String
+      , cudaMajorMinorVersion :: String
+      , system :: String
+      }
+      -> String
     ```
 
     # Inputs
 
-    `hasJetsonCudaCapability`
+    `cudaCapabilities`
 
-    : If configured for a Jetson device
+    : The list of CUDA capabilities to build GPU code for
 
-    `nixSystem`
+    `cudaMajorMinorVersion`
+
+    : The major and minor version of CUDA (e.g. "12.6")
+
+    `system`
 
     : The Nix system
 
@@ -140,22 +153,53 @@
     ## `cudaLib.getRedistSystem` usage examples
 
     ```nix
-    getRedistSystem true "aarch64-linux"
+    getRedistSystem {
+      cudaCapabilities = [ "8.7" ];
+      cudaMajorMinorVersion = "12.6";
+      system = "aarch64-linux";
+    }
     => "linux-aarch64"
     ```
 
     ```nix
-    getRedistSystem false "aarch64-linux"
+    getRedistSystem {
+      cudaCapabilities = [ "11.0" ];
+      cudaMajorMinorVersion = "13.0";
+      system = "aarch64-linux";
+    }
+    => "linux-sbsa"
+    ```
+
+    ```nix
+    getRedistSystem {
+      cudaCapabilities = [ "8.0" "8.9" ];
+      cudaMajorMinorVersion = "12.6";
+      system = "aarch64-linux";
+    }
     => "linux-sbsa"
     ```
     :::
   */
   getRedistSystem =
-    hasJetsonCudaCapability: nixSystem:
-    if nixSystem == "x86_64-linux" then
+    {
+      cudaCapabilities,
+      cudaMajorMinorVersion,
+      system,
+    }:
+    if system == "x86_64-linux" then
       "linux-x86_64"
-    else if nixSystem == "aarch64-linux" then
-      if hasJetsonCudaCapability then "linux-aarch64" else "linux-sbsa"
+    else if system == "aarch64-linux" then
+      # If all the Jetson devices are at least 10.1 (Thor, CUDA 12.9; CUDA 13.0 and later use 11.0 for Thor), then
+      # we've got SBSA.
+      if
+        lib.all (
+          cap: _cuda.db.cudaCapabilityToInfo.${cap}.isJetson -> lib.versionAtLeast cap "10.1"
+        ) cudaCapabilities
+      then
+        "linux-sbsa"
+      # Otherwise we've got some Jetson devices older than Thor and need to use linux-aarch64.
+      else
+        "linux-aarch64"
     else
       "unsupported";
 
@@ -193,4 +237,34 @@
       )
       ++ [ relativePath ]
     );
+
+  /**
+    Function which accepts an attribute set mapping redistributable name to version and retrieves the corresponding
+    collection of manifests from `_cuda.manifests`. Additionally, the version provided is used to populate the
+    `release_label` field in the corresponding manifest if it is missing.
+
+    It is an error to provide a redistributable name and version for which there is no corresponding manifest.
+
+    # Type
+
+    ```
+    selectManifests :: (versions :: AttrSet RedistName Version) -> AttrSet RedistName Manifest
+    ```
+
+    # Inputs
+
+    `versions`
+
+    : An attribute set mapping redistributable name to manifest version
+  */
+  selectManifests = lib.mapAttrs (
+    name: version:
+    let
+      manifest = _cuda.manifests.${name}.${version};
+    in
+    manifest
+    // {
+      release_label = manifest.release_label or version;
+    }
+  );
 }
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md
new file mode 100644
index 000000000000..de9d7fcd41c2
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md
@@ -0,0 +1,5 @@
+# cublasmp
+
+Link: <https://developer.download.nvidia.com/compute/cublasmp/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cublasmp/getting_started/index.html#hardware-and-software-requirements>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json
new file mode 100644
index 000000000000..f3c90fe91791
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json
@@ -0,0 +1,43 @@
+{
+    "release_date": "2025-09-09",
+    "release_label": "0.6.0",
+    "release_product": "cublasmp",
+    "libcublasmp": {
+        "name": "NVIDIA cuBLASMp library",
+        "license": "cuBLASMp library",
+        "license_path": "libcublasmp/LICENSE.txt",
+        "version": "0.6.0.84",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcublasmp/linux-x86_64/libcublasmp-linux-x86_64-0.6.0.84_cuda12-archive.tar.xz",
+                "sha256": "214a439031cc53be7d02961651e5e6ee520d80ab09b772d5a470e678477a6c57",
+                "md5": "2a6a91fd58b90a16a1c2b3c3e4d2bdce",
+                "size": "4324732"
+            },
+            "cuda13": {
+                "relative_path": "libcublasmp/linux-x86_64/libcublasmp-linux-x86_64-0.6.0.84_cuda13-archive.tar.xz",
+                "sha256": "f3892486ac72649ab5e140fd1466421e5638ce23a56a5360a42f32450fcfbf83",
+                "md5": "b3f96dce5e52f432a36e0a6a006f6b27",
+                "size": "4815848"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcublasmp/linux-sbsa/libcublasmp-linux-sbsa-0.6.0.84_cuda12-archive.tar.xz",
+                "sha256": "6af07f02ed01eee761509ad5c733a7196520f09ce036d5d047f38a1768287080",
+                "md5": "f6efeba7b2e1ae8b164a69f208c5a53b",
+                "size": "4273376"
+            },
+            "cuda13": {
+                "relative_path": "libcublasmp/linux-sbsa/libcublasmp-linux-sbsa-0.6.0.84_cuda13-archive.tar.xz",
+                "sha256": "9c3ea75c2a2705cb415d37316a6f540dbeb021ac3dc7bf0404dac314eb098aa0",
+                "md5": "35bac35e00eb29a86e54bb4fb703d258",
+                "size": "4751836"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md
new file mode 100644
index 000000000000..3a5eb56b6f9f
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md
@@ -0,0 +1,5 @@
+# cuda
+
+Link: <https://developer.download.nvidia.com/compute/cuda/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#cuda-toolkit-major-component-versions>
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.6.3.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.6.3.json
similarity index 100%
rename from pkgs/development/cuda-modules/cuda/manifests/redistrib_12.6.3.json
rename to pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.6.3.json
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.8.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.8.1.json
similarity index 100%
rename from pkgs/development/cuda-modules/cuda/manifests/redistrib_12.8.1.json
rename to pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.8.1.json
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json
new file mode 100644
index 000000000000..835340899e33
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json
@@ -0,0 +1,1151 @@
+{
+    "release_date": "2025-06-05",
+    "release_label": "12.9.1",
+    "release_product": "cuda",
+    "collectx_bringup": {
+        "name": "UFM telemetry CollectX Bringup",
+        "license": "NVIDIA Proprietary",
+        "license_path": "collectx_bringup/LICENSE.txt",
+        "version": "1.19.13",
+        "linux-x86_64": {
+            "relative_path": "collectx_bringup/linux-x86_64/collectx_bringup-linux-x86_64-1.19.13-archive.tar.xz",
+            "sha256": "4965fe096fca645a6d4565fd4d12366ae0ec31ec54ca20274910f34eea74b41a",
+            "md5": "d48b8c177f312c8774c54988594f725c",
+            "size": "125307508"
+        },
+        "linux-sbsa": {
+            "relative_path": "collectx_bringup/linux-sbsa/collectx_bringup-linux-sbsa-1.19.13-archive.tar.xz",
+            "sha256": "5d716fbb80ef7b9ac89f9e3fa8b900a29d4e6c0be487420dc4ee7a05340b57a9",
+            "md5": "dc2c0bfedf790ba7dc21f684510e592e",
+            "size": "120696772"
+        }
+    },
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cccl/LICENSE.txt",
+        "version": "12.9.27",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.9.27-archive.tar.xz",
+            "sha256": "8b1a5095669e94f2f9afd7715533314d418179e9452be61e2fde4c82a3e542aa",
+            "md5": "59e3cb66aeb96423dcca73218c85bc02",
+            "size": "997888"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.9.27-archive.tar.xz",
+            "sha256": "8c3da24801b500f1d9217d191bb4b63e5d2096c8e7d0b7695e876853180ba82f",
+            "md5": "b39d03cfac57a3b2ded8e9b0a6b0e782",
+            "size": "997840"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.9.27-archive.zip",
+            "sha256": "17aaa7c6b8f94a417d8f3261780b7e34b9cbdfab7513bce86768623b06aa28b5",
+            "md5": "afdfa89a35951f67b5bd70c513f5ef09",
+            "size": "3127658"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.9.27-archive.tar.xz",
+            "sha256": "8c87c2db67130108861609eacd40d30ee109656a7765e5172eab71dd6da4c453",
+            "md5": "25b1a257ed35393052577bd9ee432d3f",
+            "size": "998228"
+        }
+    },
+    "cuda_compat": {
+        "name": "CUDA compat L4T",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_compat/LICENSE.txt",
+        "version": "12.9.40580548",
+        "linux-aarch64": {
+            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.9.40580548-archive.tar.xz",
+            "sha256": "c03fe18b9d23881f068ac97b45001a47778f83d2361728427a3f92b551b1c898",
+            "md5": "3ca26403b8b36c5cc18104ee174ec874",
+            "size": "37422044"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cudart/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "1f6ad42d4f530b24bfa35894ccf6b7209d2354f59101fd62ec4a6192a184ce99",
+            "md5": "6153e2b6a43389e5be3d68b04c6488f5",
+            "size": "1514676"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "8b422a3b2cb8452cb678181b0bf9d7aa7342df168b5319c5488ae3b8514101fc",
+            "md5": "c4b3e0d206f5dc3aceaddb78a32424d3",
+            "size": "1521596"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "179e9c43b0735ffe67207b3da556eb5a0c50f3047961882b7657d3b822d34ef8",
+            "md5": "22e500ce68dc9e099ec18f57e1309808",
+            "size": "3521238"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "f893e2c72be81b0d0e3bc33827c785a96db15fd5aafdc51cc187f3df6fdbb657",
+            "md5": "8970e9d40a7edada8cd9270906b1daa3",
+            "size": "1223440"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuobjdump/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "ee0de40e8c18068bfcc53e73510e7e7a1a80555205347940df67fa525d24452f",
+            "md5": "fb4ceb446f3ca58c4ca5381a2c0eee06",
+            "size": "214896"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "2d39ae9309f81a7980df296a93c0e49215c6fb22d316fd9daae211d29a731d27",
+            "md5": "9ec739cea851b184b55017d0a6185304",
+            "size": "208936"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "1eda43a76a2eac25fce5bdb4b68673b5bda737d54cca5513148c36362ab7c811",
+            "md5": "0a1c8b1f69537bc605c0d5fc28110258",
+            "size": "6219088"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "91a9ae2935b411d136c2c61ccbbc0df3a83f17cce122d12d262be202217163ee",
+            "md5": "ec5905b13be30f8f39e18d1f41dbcf18",
+            "size": "197604"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cupti/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "f779a24e8f0177b4ce45cbf118cb470139fb5107858df96689d0a0aa01f0fba1",
+            "md5": "5fe49729261d1f899bd0948026b755ae",
+            "size": "16799436"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "84f8657375c23a425b2d107c3cde1ce75777bff9798b744b78e146fdc02d2de0",
+            "md5": "ff4c04b183cc173aa2937a21a3569b5b",
+            "size": "12805704"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "c96018456dc4db6af6d69d6db0170a2ccc656ddde8c8ce6ee05682c2c5569daa",
+            "md5": "1cecfef05160d4e6b0f2549534fe7973",
+            "size": "13359912"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "74a884691b2c7e5c8db8bd2a38143fc82f7502f0dd484051809df7953f7ae719",
+            "md5": "7f92adb9aed6fdb047ebe3c7617c7179",
+            "size": "4781260"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuxxfilt/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "833d7e56351d032717f217212577d369d230e284b2ded4bf151403cc11213add",
+            "md5": "a7f4a446e4fb00657f5bd7eb1dd814a7",
+            "size": "188692"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "2175ef96b523eb8fea5d6ccfd21b70d6afaee623d00dbab70f11e8aa892c2828",
+            "md5": "fde8b2db7d7e4afb08e7c703fa735440",
+            "size": "177440"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "ec5911d680394d90968c480c7359e7f5a4025b9c4806dad673d489e57585afd3",
+            "md5": "537cd82a0945fe20275d4791e353c3f5",
+            "size": "178570"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "37acae6576874c3781e844ea268a9fe076d13aaab3acda6f65bbe885a3726a3c",
+            "md5": "c8e23bff8cc13fb58a57c90d69e7b374",
+            "size": "170436"
+        }
+    },
+    "cuda_demo_suite": {
+        "name": "CUDA Demo Suite",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_demo_suite/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "92e0b324bf02d9705b8dd5bf1d36149c06512c720ceda7cc7d791fc3ecf64f0e",
+            "md5": "5030cddcab7101704bb8a9b53c6137ad",
+            "size": "4036604"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "adffd0b0f7cca262025f171dcaa73f62af020de5d9a0d6e0fbe7dbd827dd77a8",
+            "md5": "9a8c3bbd696392e768ae3278e269cbd9",
+            "size": "5164004"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_documentation/LICENSE.txt",
+        "version": "12.9.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.9.88-archive.tar.xz",
+            "sha256": "d6e44c454654016a3650f3101688231ba111cd00647b726b34d18ff0bd721933",
+            "md5": "17436d82e589824bbf3f4ff669201d81",
+            "size": "67920"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.9.88-archive.tar.xz",
+            "sha256": "e1c47f32279a827baf8b4339c1737d7bd8e54c73388835e5fae3e2db83db2479",
+            "md5": "995f5692be016e44821fb85ebc3a62d9",
+            "size": "67924"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.9.88-archive.zip",
+            "sha256": "660f2f71b94c13a021850a8bb6227dfb4eb9a8dd8e0f6bc9feb0b993dea180fd",
+            "md5": "3d21d1b9056629557bb2745f962af636",
+            "size": "107626"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.9.88-archive.tar.xz",
+            "sha256": "830476a755f9a8c9780a6876d0ed562c073f29968c3e0e91962d0fd14b3f3618",
+            "md5": "098d318ebb7700a6513e57e41edf20c8",
+            "size": "67948"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_gdb/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "3dbb657683cd4f2989c30bdad31b3f4493795a9acc8a2214f48df3cfca7c37c0",
+            "md5": "1405f9cf4a5d2c03785a69aefa05de16",
+            "size": "67691620"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "251b9bd86ffcce0cdc4a5480ef3d8d609ca3a276cbbb5c793ca9978721d31faf",
+            "md5": "b76ab824a5b651ecec31978e6e2f41bf",
+            "size": "45695592"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "5473c27f1ec03fe064a09399e52b251e6ca5d3b9a67f21c1a26a02a26102f165",
+            "md5": "95325479bec751d72d4f063d8d244049",
+            "size": "45662012"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nsight/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "5c3994440ce7aa6ac5ab120e45f25f5f5eaa631af0f793fab860a5edbc499518",
+            "md5": "3bce6195222da1c1d549fbd2d83422e8",
+            "size": "118693300"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvcc/LICENSE.txt",
+        "version": "12.9.86",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.9.86-archive.tar.xz",
+            "sha256": "7a1a5b652e5ef85c82b721d10672fc9a2dbaab44e9bd3c65a69517bf53998c35",
+            "md5": "ac1871c955070267e117bd985f6dbb36",
+            "size": "81100244"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.9.86-archive.tar.xz",
+            "sha256": "0aa1fce92dbae76c059c27eefb9d0ffb58e1291151e44ff7c7f1fc2dd9376c0d",
+            "md5": "1322a14e4d6482f69d4b8a14a7d5f4c5",
+            "size": "73407012"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.9.86-archive.zip",
+            "sha256": "227b109663b5e57d2718bcabb24a4ba0d9d4e52d958e327dc476f7c28691be85",
+            "md5": "ff9b2942aaa3a1dfb487da6767bc689f",
+            "size": "126917884"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.9.86-archive.tar.xz",
+            "sha256": "2432ef8a7c12d0a9ce3332a8af42b123c07f256390b3390802b1b2c6254c6c74",
+            "md5": "f846e79e53be949484a4968880eb9dd9",
+            "size": "77162776"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvdisasm/LICENSE.txt",
+        "version": "12.9.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.9.88-archive.tar.xz",
+            "sha256": "49296dd550e05434185a8588ec639f1325b2de413e2321ddd7e56c5182a476ff",
+            "md5": "87ec016e430618bf724a3e8332bfcca6",
+            "size": "5483340"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.9.88-archive.tar.xz",
+            "sha256": "28b2597f0901cfafcd050cba0877c1eb5edcd7ebd8164aea356cec832e636ee3",
+            "md5": "0d6f0b8883e55ca07d64cbb746b80e8c",
+            "size": "5408212"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.9.88-archive.zip",
+            "sha256": "955ba1f52f7115031f10408ce3cec4c745df41dba8fdf6024c3983d899e9fbbc",
+            "md5": "43cd76e59014be18d96ce03e2ed09d6b",
+            "size": "5791897"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.9.88-archive.tar.xz",
+            "sha256": "99bf70149423c42c8dc2649f76f8983101dcf9879d355cfb2582b2adbed84614",
+            "md5": "cb9f7798d824ef1696fdde67f9506aa4",
+            "size": "5416148"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvml_dev/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "1ad0866dbfff6a9e2661f5348e4ca4c2a4e40882b90014ab127f2734856ecccb",
+            "md5": "7e615aa7b4525d3cc1b28379abcf6ce5",
+            "size": "129244"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "e97e668ead7ebc1fb7e93ffe303019660d0119c4e4d0e8ef26ce012bbbea9b34",
+            "md5": "d48bcaa83a7299b836d381b32e94a99d",
+            "size": "130480"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "1894b70c5487a739c740929263fa3fbca80e53790647abc02b74eac024b97be8",
+            "md5": "213d773bb297b15e9f697ec8f1363bd9",
+            "size": "144955"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "531ac94b8b83209657cd14b28d23660df252393fb34c24f5d8919c56c977477e",
+            "md5": "3fe82d3f6042a22ac3d119192577db79",
+            "size": "130544"
+        }
+    },
+    "cuda_nvprof": {
+        "name": "CUDA nvprof",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvprof/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "8d8d1a9004710bad8d7a653769f088064b0285a06a80b46c4da7598115a0c6a2",
+            "md5": "df8f768c6c21b06cb048b9a4b0ac39e7",
+            "size": "2402440"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "81aefd12ab0a24f88feee10303b814fcf21887b3947d5e73523ed14338ef4e2b",
+            "md5": "69ada7050609c5860a2396a6354665e0",
+            "size": "1705346"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvprune/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "a06f0e2959a4dd3dbb62a984dbe77b813397022596f5c62d74ddd83b238571f2",
+            "md5": "db647ad5946c1e4cb0289c16e5ec92d8",
+            "size": "59372"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "15e1d6527bf04c162950251940b10b8b8254f68028e2ffc0bfb7ed84bb2e1382",
+            "md5": "3d51536a3582379389d821afa05becfd",
+            "size": "51052"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "be23018507f015ca948c503a43a3c48449c0dc1ceaab1e721caf01f024727312",
+            "md5": "f5c1eaa20c7c8c67a564f04cec87fca2",
+            "size": "142316"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "69fa4cf2cede678825e0c8032ccd629e17de1b9d8667b05b6702d873fd2fb926",
+            "md5": "00c370560287a3dcdeedb32fe13e7e0e",
+            "size": "52876"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvrtc/LICENSE.txt",
+        "version": "12.9.86",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.9.86-archive.tar.xz",
+            "sha256": "82913658363892dbc0f2638b070476234476e06e084fed60db861cb7e161a6af",
+            "md5": "8ed74b72c44ee50759f820dee875589c",
+            "size": "114231976"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.9.86-archive.tar.xz",
+            "sha256": "fb2d50c791465f333fc2236d2419170cf7a7886f48dd9b967a10f8233c686029",
+            "md5": "483dc56df046c9c03eb17cd637bb8fc9",
+            "size": "53265740"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.9.86-archive.zip",
+            "sha256": "1aa0644fa53c8ca34cdc73db17bcc73530557bdd3f582c7bfdbd7916c8b48f65",
+            "md5": "76317f5006ce9de6720cea0b3bdc7db6",
+            "size": "314608748"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.9.86-archive.tar.xz",
+            "sha256": "785b0952c0f77dd0feb9a674f3fcca3fcf05541bbe27f70a5926da9f85339152",
+            "md5": "b49aeba8583248a4cd628154361d313d",
+            "size": "57633224"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvtx/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "819bc39192955e6ba2067de39b85f30e157de462945e54b12bfdeda429d793fb",
+            "md5": "3a56b3c5c1e20d99cff4c354e57ea30f",
+            "size": "64496"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "dae359c2c51f83a5cd402468f481a82aeb6d32d79dc707d3625607e83cf97ceb",
+            "md5": "d783ac2926973ad682c69270d047c3f3",
+            "size": "64856"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "b9d506ce9ba056bf171b60e9dada06fb3d8bed5453a6399d0541960bf9b81659",
+            "md5": "907cfcf3f3b637912ded30349ecfd515",
+            "size": "87029"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "f1a4366e45dbfd0a4e6210a5a4b9b51501aaebb6b58845d3f1b271ec3d7f3e15",
+            "md5": "6b40a46f73f46a7d8bac37b212989007",
+            "size": "65396"
+        }
+    },
+    "cuda_nvvp": {
+        "name": "CUDA NVVP",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvvp/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "6cdf9196373a848856c1afc6f1df1023649fb5fe77b896967ecc0b014b200003",
+            "md5": "0ded9b80cf8fc2c2233b28d582f2334e",
+            "size": "117732648"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "a7e1ac0de34c69afc288283ea75314b67f109b08d046c3622405dff8f66b0720",
+            "md5": "dd673788d3fae14c38af5c1506fae11d",
+            "size": "120342251"
+        }
+    },
+    "cuda_opencl": {
+        "name": "CUDA OpenCL",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_opencl/LICENSE.txt",
+        "version": "12.9.19",
+        "linux-x86_64": {
+            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.9.19-archive.tar.xz",
+            "sha256": "1bddacc2f0de77901faad5fecfad8fef8136ea8dd708e02177d10eef97d85b78",
+            "md5": "d0a85b602afc8957374d3f536dfd0306",
+            "size": "94140"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.9.19-archive.zip",
+            "sha256": "7c78e05697a3f74510c4154b175ce4597ed0719c7793236ca7f3989eccae0ff6",
+            "md5": "e2dec7d45f8d87045c4a37bb882e9cf4",
+            "size": "139663"
+        }
+    },
+    "cuda_profiler_api": {
+        "name": "CUDA Profiler API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_profiler_api/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "8c50636bfb97e9420905aa795b9fa6e3ad0b30ec6a6c8b0b8db519beb9241ce6",
+            "md5": "483998e0e5b012d976bf62ada20bd4fa",
+            "size": "16316"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "e07f47ef3aeb3a3ca995e9070d77d98ad79460216bf2075c9f9018962ae1d03b",
+            "md5": "55345cd640f299f8da43ef946dd8aa89",
+            "size": "16316"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "b05519f8ce4f02167bfc859358f62eb771d89ac2af3a6952a82317f2af4bc5bd",
+            "md5": "f5da20e1160f547602ec1c558dd0bc64",
+            "size": "20352"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "e26d82b4ce994dc445dc0191b1a5fe68dacc7290bfb9c2133b4979fe90e05433",
+            "md5": "738fe1e26407ab88e0fd3209b4da1cfa",
+            "size": "16308"
+        }
+    },
+    "cuda_sandbox_dev": {
+        "name": "CUDA nvsandboxutils Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sandbox_dev/LICENSE.txt",
+        "version": "12.9.19",
+        "linux-x86_64": {
+            "relative_path": "cuda_sandbox_dev/linux-x86_64/cuda_sandbox_dev-linux-x86_64-12.9.19-archive.tar.xz",
+            "sha256": "058c9616f9bb4e57c58996a053cf9a87f655c139dc2fa11af7bed74432bd8153",
+            "md5": "ce4326bc03b26b88a552db8b163d7f5f",
+            "size": "29172"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sanitizer_api/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "e23aad21132ff58b92a22aad372a7048793400b79c625665d325d4ecec6979bf",
+            "md5": "9d138eb96c11e1b9293408e5b7a97114",
+            "size": "9758036"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "281538927b6818d4687fad102c0603ab7b389513c9c129f3e0de8c61ac7f474d",
+            "md5": "3192ef7e50255f80430471ae6add0ebf",
+            "size": "7753752"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "b1f366312cb52164dfe7b78463ab085b742f052e74b89e9da08561a8ca8b06e9",
+            "md5": "1821743a8a46f3e4bab0fe96dac813f8",
+            "size": "10103190"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "2baaba3ff47eceb529ddcc866fc7e647fd02427ef3dbb8bec06689f919c14c69",
+            "md5": "e48b00b6ed2124ac4a3a0b20201ba4dd",
+            "size": "4808620"
+        }
+    },
+    "driver_assistant": {
+        "name": "NVIDIA Driver Assistant",
+        "license": "MIT",
+        "license_path": "driver_assistant/LICENSE.txt",
+        "version": "0.21.57.08",
+        "linux-all": {
+            "relative_path": "driver_assistant/source/driver_assistant-0.21.57.08-archive.tar.xz",
+            "sha256": "4904c08e1de1aa790d200f36528aaa672ab6b3c6620bbfe5e221312b9ef1120a",
+            "md5": "ebb37f4ad248ddba8071c570f5267da3",
+            "size": "38644"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "license_path": "fabricmanager/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "2e7dc4db6788e618af345fb50dee63115b5116ccb57d6d27d93c1ff5e2c3a8cf",
+            "md5": "39f4aa35a3f7cda55297bb73c91a5481",
+            "size": "8077772"
+        },
+        "linux-sbsa": {
+            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "239a7f8406987fb6d44cd4f7f6ba6e843b3f3acb7b1732e6ab5c0d370690ee85",
+            "md5": "4d288febfed83ff3d532ebbc692f65ec",
+            "size": "7336832"
+        }
+    },
+    "imex": {
+        "name": "Nvidia-Imex",
+        "license": "NVIDIA Proprietary",
+        "license_path": "imex/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "5dfe195429b0967788b7e9b4bab85d4936220d6d2f6cf394a61bd3439b437506",
+            "md5": "909fd5da3b23f54e39484efd187f4c3e",
+            "size": "7718644"
+        },
+        "linux-sbsa": {
+            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "36d1a49fb52294ef5352eeea457d131f3d14320fca0a56633d7798ab32eead18",
+            "md5": "bd3d1ce8d91e1fd7d26191c05292698e",
+            "size": "7149236"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "license_path": "libcublas/LICENSE.txt",
+        "version": "12.9.1.4",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.9.1.4-archive.tar.xz",
+            "sha256": "546addc4a9d82b8f23aa9ba9274b6bc0429a63008a31c759884ac24880796057",
+            "md5": "9b07f0c3d94534e56e003c6016b9771c",
+            "size": "933611504"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.9.1.4-archive.tar.xz",
+            "sha256": "e99b074e6f66034e563508118804599d7579f73afc8424c55ad5fd8d12e085a5",
+            "md5": "4c7cdc43283c0ba62e665b02e9ec7540",
+            "size": "932528492"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.9.1.4-archive.zip",
+            "sha256": "d534d98b0b453a98914dbf3adf47d7e84b55037abf02f87466439e1dcef581ed",
+            "md5": "3f092963b0767968fe6f02febc1b0cbf",
+            "size": "549755186"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.9.1.4-archive.tar.xz",
+            "sha256": "f75938d72153902cf08d1666311f35851e7eb6a16af743b2346bc68d7ba6b341",
+            "md5": "15f6396431885647e961af811a90cc06",
+            "size": "493899648"
+        }
+    },
+    "libcudla": {
+        "name": "cuDLA",
+        "license": "CUDA Toolkit",
+        "license_path": "libcudla/LICENSE.txt",
+        "version": "12.9.19",
+        "linux-aarch64": {
+            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.9.19-archive.tar.xz",
+            "sha256": "ef7c1a05d9927c53aa089ec2217a1e999ffac0e776145d798bf784279fc79d40",
+            "md5": "dd1fc18bd0fe3ed38b87a453d31575a0",
+            "size": "38548"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufft/LICENSE.txt",
+        "version": "11.4.1.4",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.4.1.4-archive.tar.xz",
+            "sha256": "b0e65af59b0c2f6c8ed9f5552a9b375890855b7926ae2c0404d15dcf2565bda4",
+            "md5": "3ffadd77d5b084470aa8d9215d760e76",
+            "size": "470942192"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.4.1.4-archive.tar.xz",
+            "sha256": "b87637db96e485f4793d7ca8bd2cf07250eca5c86f6c56744a36683418359c03",
+            "md5": "4a0906639fd293f529b8f949bc3ad9eb",
+            "size": "471560648"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.4.1.4-archive.zip",
+            "sha256": "f26f80bb9abff3269c548e1559e8c2b4ba58ccb8acc6095bbc6404fc962d4b80",
+            "md5": "504ad2e94fd0d923b8a7082659813431",
+            "size": "198361265"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.4.1.4-archive.tar.xz",
+            "sha256": "5d992b98f0d3d294e339ed2f65a477a587803c1567598a120349fae52596bf20",
+            "md5": "1f10a57d45e9078e940340cdeff26478",
+            "size": "471529132"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufile/LICENSE.txt",
+        "version": "1.14.1.1",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.14.1.1-archive.tar.xz",
+            "sha256": "7ba9834b8dc2f8cdb1710a49f3de3f627bbcd4cc1f8a754019c66c8c80fdaee7",
+            "md5": "e59833cbd8e423948fa5814a276315e3",
+            "size": "42129088"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.14.1.1-archive.tar.xz",
+            "sha256": "6b1d2a771bd822fdd06a6286eb59acba179b13fe063ae5b0de8fc0f4991a39d8",
+            "md5": "5a8499cdc22754fe5c9335065d708ea4",
+            "size": "41676328"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.14.1.1-archive.tar.xz",
+            "sha256": "196b61a1bf02b85e76c21bdfe414a3f4db4380df41d9212c9eb6d0aa92eee1ce",
+            "md5": "c7e269a01ecd2dc427941c5bc775c2ef",
+            "size": "41655988"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "license_path": "libcurand/LICENSE.txt",
+        "version": "10.3.10.19",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.10.19-archive.tar.xz",
+            "sha256": "48281b4caadb1cf790d44ac76b23c77d06f474c0b1799814f314aafec9258ad6",
+            "md5": "e2fd0b8dd197f3bccc0ee19e5640fc93",
+            "size": "89582256"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.10.19-archive.tar.xz",
+            "sha256": "078afec842c99b3a953d62cc76bd74afa2d883dc436e6d642e6440bb1e85eb8e",
+            "md5": "fae5b6ce60678f452a2c760e8bf27563",
+            "size": "89544732"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.10.19-archive.zip",
+            "sha256": "d0411f0b8c07e90d0fb6e01bfa7a54c9cb80f2ddf67e4ded2d96a50e19aadad6",
+            "md5": "6ccce2f4f1f6d9592c908fa1cb91536d",
+            "size": "67904600"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.10.19-archive.tar.xz",
+            "sha256": "e5087640b5c9cd8bc173efb6a21f8388b24da59511cc3d57e60afc5e05d14b50",
+            "md5": "71ed8ff7a7e539c0be8ca4b699f2f3e1",
+            "size": "79761424"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusolver/LICENSE.txt",
+        "version": "11.7.5.82",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.7.5.82-archive.tar.xz",
+            "sha256": "3d3b96f3087dbc43893a28691b172f31725b316d524f5a3c1e6837257c898d06",
+            "md5": "efcc5d100623563d1a56dff59b45b65d",
+            "size": "324393196"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.7.5.82-archive.tar.xz",
+            "sha256": "db463593ffcbc78f542a7f1ef808da43bf742acae654d970d99a47289c2a83e5",
+            "md5": "63113f462dc11289f996eec8bab1db74",
+            "size": "323573816"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.7.5.82-archive.zip",
+            "sha256": "e991d64a0bbe3e0bb69ce2adce000244288002b0341894729666d66adb9b4f25",
+            "md5": "e2d79987f6e38f63cc64816f393a8e51",
+            "size": "322216184"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.7.5.82-archive.tar.xz",
+            "sha256": "45e2fefeee5797c0492d8a9ee26c3dbb7af0cdcefe6f1cd25bd586daa633d9a0",
+            "md5": "e311d62bfc65c6afc29152f6e923f78c",
+            "size": "113258352"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusparse/LICENSE.txt",
+        "version": "12.5.10.65",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.5.10.65-archive.tar.xz",
+            "sha256": "a83415dcd3e1183afe363d4740f9f0309cfe560c6c08016c2a61468304f4b848",
+            "md5": "c7ed952d12dec0f50a4386e5d09203f6",
+            "size": "398914580"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.5.10.65-archive.tar.xz",
+            "sha256": "8d1c8a57ba3eaecc3f7c11e29fed275a2f3dca5cea51dd2a24d07ab5d9998583",
+            "md5": "2d48c3aecca07be0a458a977350ce175",
+            "size": "398606816"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.5.10.65-archive.zip",
+            "sha256": "abb4bfc01198f82fbc956773ccb98c578c03027b6ad425e829355be0c0a11a4a",
+            "md5": "33ce31c3d880596c31304c965dbfcdce",
+            "size": "358114928"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.5.10.65-archive.tar.xz",
+            "sha256": "b294b6cd0acf5e68078d2fe4d41d95a4073fed780805adca7774bce7cbbe5b65",
+            "md5": "ce4d363d3affd40fe751f065ec2bd4cf",
+            "size": "131075108"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "license_path": "libnpp/LICENSE.txt",
+        "version": "12.4.1.87",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.4.1.87-archive.tar.xz",
+            "sha256": "49351448d896854284ec708c14506eaaceb92aa01fbe35c91d5c52ad482e17ae",
+            "md5": "03de546e34ad54d0119594bc237c5e87",
+            "size": "331733872"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.4.1.87-archive.tar.xz",
+            "sha256": "992d461905366cec4243b26ce7bfe997c0c0eabf53a001333025930a1a0c7237",
+            "md5": "8de3be3d9043a07011b0de46c49ea668",
+            "size": "330804724"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.4.1.87-archive.zip",
+            "sha256": "cfcfbf59e4e5ce71113c058bd4eba3dd56e4db080932146d4047c0d44b4a558e",
+            "md5": "7549e1191510ae5ca9291e5f13c70296",
+            "size": "274109870"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.4.1.87-archive.tar.xz",
+            "sha256": "50c9f80592eaf4f246c82475143768b848333d9f540782257d42023f5fe68fdf",
+            "md5": "869efb32d5ab9468fda4cb94848cf90f",
+            "size": "104647240"
+        }
+    },
+    "libnvfatbin": {
+        "name": "NVIDIA compiler library for fatbin interaction",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvfatbin/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "315be969a303437329bf72d7141babed024fc54f90a10aa748b03be8f826d57b",
+            "md5": "d5e2dc19c01ab62dbf437a1ef80847b1",
+            "size": "930820"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "87bf71288ea7390d039b246fa794cad2ddd3b164ce9566f8542bb15039432cdb",
+            "md5": "91902ce86f6f55a4ecc948f95bf1c032",
+            "size": "836312"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "86563b25096bbc21d74b1c043701ec8596499f76b40e32f9ec9179fc10404d00",
+            "md5": "c0963a07d7f2cbffd34b0b1ec6cae5c0",
+            "size": "2217262"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvfatbin/linux-aarch64/libnvfatbin-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "248e77ede9afbd6060cda7de0475d222731ac021e22e696ce75ed72b426dfca9",
+            "md5": "814b2ff13e944a07669580eb85c0e653",
+            "size": "808780"
+        }
+    },
+    "libnvidia_nscq": {
+        "name": "NVIDIA NSCQ API",
+        "license": "NVIDIA Driver",
+        "license_path": "libnvidia_nscq/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "7c54e959ee50212be8595e01ee76581c1f3a13c19b2279424b55a8d26385c41a",
+            "md5": "b86a87c4f9fd58a79ced07cf82cec271",
+            "size": "455504"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "931004b8b2062249016a9bded2499f70331d27b265226ed879428b8bd7e4bb20",
+            "md5": "790ca3dd29b03a71f32ad1dd05611a9e",
+            "size": "446980"
+        }
+    },
+    "libnvjitlink": {
+        "name": "NVIDIA compiler library for JIT LTO functionality",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjitlink/LICENSE.txt",
+        "version": "12.9.86",
+        "linux-x86_64": {
+            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.9.86-archive.tar.xz",
+            "sha256": "392cac3144b52ba14900bc7259ea6405ae6da88a8c704eab9bbbcc9ba4824b07",
+            "md5": "9156156146001536d1c8346783991d1b",
+            "size": "54021940"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.9.86-archive.tar.xz",
+            "sha256": "9c9227c1e9122fd8448cafced3b32bc69f40d3c041d25034ea23611a1262852f",
+            "md5": "7fdf2864352ac613415327ebde38598b",
+            "size": "50981988"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.9.86-archive.zip",
+            "sha256": "ee7175da9628d47ccc92dce6d28d57ca77633e79079a2aee90e2a645edcd1384",
+            "md5": "4cdb56f88316a5ade3edf69a1e7192e8",
+            "size": "265666466"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.9.86-archive.tar.xz",
+            "sha256": "a24842165d98660d4ba9fd753395f7c9834445552110fabce4baa4c211fd2c52",
+            "md5": "548a35d56f08d07b1dc294a3c8172f71",
+            "size": "54783780"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjpeg/LICENSE.txt",
+        "version": "12.4.0.76",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.4.0.76-archive.tar.xz",
+            "sha256": "ddd8245b2803f5b55211261d7e5d7abf803c05f3b032238d0feaa6e09ea9401d",
+            "md5": "b9f7806fb279c9cdd0b4a40e4171b87b",
+            "size": "6378624"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.4.0.76-archive.tar.xz",
+            "sha256": "405b5627ffd772d2837ae4ece123fdee841c34894dba2180a1c8e1b84c0f2665",
+            "md5": "bad1da3ec8865dbd3955a757bb6b7ba0",
+            "size": "6179324"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.4.0.76-archive.zip",
+            "sha256": "b253241fc88bf30947b8ee068101aca8930960f113d8ee4a9583de021a79ffa1",
+            "md5": "d19d13f9bd3dbc9c9361a3c1fee99dd5",
+            "size": "4667529"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.4.0.76-archive.tar.xz",
+            "sha256": "a9841bff40e577bec81352054e05c5d98720ae8e2ccfc4863eaac9dd35444c27",
+            "md5": "0a7197330938f8b5363d38bdde63562c",
+            "size": "1821640"
+        }
+    },
+    "libnvsdm": {
+        "name": "LIBNVSDM",
+        "license": "NVIDIA",
+        "license_path": "libnvsdm/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "7a6ee934d5c328f9c05e967b63053c211f80485e0443ac119d887612a510ad53",
+            "md5": "788f7c59de54096d84dc7f645964ad2a",
+            "size": "500100"
+        }
+    },
+    "mft": {
+        "name": "NVLink 5 MFT",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft/LICENSE.txt",
+        "version": "4.30.1.510",
+        "linux-x86_64": {
+            "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.30.1.510-archive.tar.xz",
+            "sha256": "512714ab076d90d88550e60f5da65181363336cee94c67bff8821face8ef10b4",
+            "md5": "30698cf8741826df5ca3d4d3bb3a982c",
+            "size": "45536612"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.30.1.510-archive.tar.xz",
+            "sha256": "95c05e1bc03ff81dffa58bfff26a1dd59c6300d6d5922662ae59c7af5788a310",
+            "md5": "78ef93686e91302f7b751fed8f83d9be",
+            "size": "44222004"
+        }
+    },
+    "mft_autocomplete": {
+        "name": "NVLink 5 MFT AUTOCOMPLETE",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_autocomplete/LICENSE.txt",
+        "version": "4.30.1.510",
+        "linux-x86_64": {
+            "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.30.1.510-archive.tar.xz",
+            "sha256": "dc9069baa888c7ca0c3e55a3043d27b0100c29c81e6ed3346907dd49dabb1325",
+            "md5": "b65cb40bacfe276b3444920e8eef1f2f",
+            "size": "11884"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.30.1.510-archive.tar.xz",
+            "sha256": "64647ce2a4de62e535ea7060d20d58c2613937071008c2a93894e1995facce2b",
+            "md5": "bf034fbf9f887d62434f83dc9727db80",
+            "size": "11880"
+        }
+    },
+    "mft_oem": {
+        "name": "NVLink 5 MFT OEM",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_oem/LICENSE.txt",
+        "version": "4.30.1.510",
+        "linux-x86_64": {
+            "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.30.1.510-archive.tar.xz",
+            "sha256": "7a4729f8b91ba5c179820583189a4c95ffa9669312a28fe7ac03feebb726bbc3",
+            "md5": "7329d76d0e5b976f88ef1f2484d962de",
+            "size": "4708108"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.30.1.510-archive.tar.xz",
+            "sha256": "b71bb03130b6dd3388a3e909cdf91cc9bca8b8098a8b80b5f376f5726e5b5e1c",
+            "md5": "e55a4d898553c2cf92be57724a8204e1",
+            "size": "4429188"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_compute/LICENSE.txt",
+        "version": "2025.2.1.3",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2025.2.1.3-archive.tar.xz",
+            "sha256": "02ab8867197aaf6a6ae3171293d70b6a9ddb20296be94ff4287741338cc2e1df",
+            "md5": "e81faf319af6b21f241bae535d3d1907",
+            "size": "300347320"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2025.2.1.3-archive.tar.xz",
+            "sha256": "0e336a5139f76778b8ad70fdb49fb43817ec1bb3ee6e7425d59d99d8c455d976",
+            "md5": "18334b109fe6f10fdba2c2681726ba96",
+            "size": "107009604"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2025.2.1.3-archive.zip",
+            "sha256": "e9d558654c98d83049969d133b98922b53ab8f4e3ba9e0a37bdb5e2ff300b7de",
+            "md5": "7cb9cff3e0718212866c7fbb4365dee5",
+            "size": "341265370"
+        },
+        "linux-aarch64": {
+            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2025.2.1.3-archive.tar.xz",
+            "sha256": "51c7762110c34728acd37878d4340f13612401fa622be0031b1a9e2ce112cfb2",
+            "md5": "355babae2f49f3f2c7ec1cf1c0b07966",
+            "size": "221171904"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_systems/LICENSE.txt",
+        "version": "2025.1.3.140",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2025.1.3.140-archive.tar.xz",
+            "sha256": "dded4227619340307be0ba5bc4e23bcbc966e2df3763170ebb20410c2b54754e",
+            "md5": "0b16c35f6e63a4fc33d14795e65bcd61",
+            "size": "1075732108"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2025.1.3.140-archive.tar.xz",
+            "sha256": "479c46de1c459f7c760ef1ea5e5bbe61bfe7f4ba525ce4778d5ba25d874b8e1f",
+            "md5": "6d70406b53a94eba94d7c3552b938fe6",
+            "size": "980282844"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2025.1.3.140-archive.zip",
+            "sha256": "8d61f266a8a1bc1ababd44de3ee38f7b85c8cdfcdaebace14c8f065d7624d0b3",
+            "md5": "b741046881531cbf6e3ccedb0b403432",
+            "size": "403084779"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_vse/LICENSE.txt",
+        "version": "2025.2.1.25125",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2025.2.1.25125-archive.zip",
+            "sha256": "3f2b6ca8705929c97e0f931f0559921b110b9337cf11af5e017d0c95b5b31feb",
+            "md5": "7e74f479c09aece6e5b46c97d0d4cc86",
+            "size": "136237151"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "license_path": "nvidia_driver/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "27ddfabde120a107527cbf88a6c96d1f81ee5c977462ce1a793051a3e678f552",
+            "md5": "9007dddd1e2d48f897958b676fbe30ff",
+            "size": "471616744"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "4a7d1accb257f2539ff7dabb02319339fc3a8db622073e5dde33a5446910346a",
+            "md5": "3c2b686f392789d8f3a1db1ae2ad62be",
+            "size": "349127420"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "license_path": "nvidia_fs/LICENSE.txt",
+        "version": "2.25.7",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.25.7-archive.tar.xz",
+            "sha256": "6e11ec0b885177ab21f4b864ff7417ea3cc1b0994f1c318767984557cd5b29d1",
+            "md5": "60d2fa54d55b739302e3db38a8a389c9",
+            "size": "60280"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.25.7-archive.tar.xz",
+            "sha256": "62baf0beac2d446c0ff033fb3780cf348ab9c090d7903c210106dc98bb29d7eb",
+            "md5": "3859bed4b5e330cde0e2316f9cdcdaeb",
+            "size": "60296"
+        },
+        "linux-aarch64": {
+            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.25.7-archive.tar.xz",
+            "sha256": "b8c67e28e9e23453183fb7d12ed9fed449427b2c11a21b1de4e7046a57d8d366",
+            "md5": "5128c63c80c1089340b65807445d921a",
+            "size": "60272"
+        }
+    },
+    "nvlsm": {
+        "name": "NVLSM SM component",
+        "license": "NVIDIA Proprietary",
+        "license_path": "nvlsm/LICENSE.txt",
+        "version": "2025.03.1",
+        "linux-x86_64": {
+            "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.03.1-archive.tar.xz",
+            "sha256": "b034dad10a3154359e244b85206cd73f0fbce8e1cdf76058417b7b562c337388",
+            "md5": "6e09669fe8e4fb26e5334a1c4aa9dabb",
+            "size": "6890300"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.03.1-archive.tar.xz",
+            "sha256": "e260285ec01c6beb562a14625e9564b96374bb824ec62cc9866066a48710fa54",
+            "md5": "bc90989f567c27d8b39e607f719acba8",
+            "size": "6175832"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "license_path": "visual_studio_integration/LICENSE.txt",
+        "version": "12.9.79",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "d5b6514866395f52f04107da1aa523954f8dc76daf18a9f8699c3d564f294449",
+            "md5": "680fbdf0f345619c1fa3de5f1fc79090",
+            "size": "864204"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
new file mode 100644
index 000000000000..d4caeeddd7e4
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
@@ -0,0 +1,1031 @@
+{
+    "release_date": "2025-10-09",
+    "release_label": "13.0.2",
+    "release_product": "cuda",
+    "collectx_bringup": {
+        "name": "UFM telemetry CollectX Bringup",
+        "license": "NVIDIA Proprietary",
+        "license_path": "collectx_bringup/LICENSE.txt",
+        "version": "1.22.1",
+        "linux-x86_64": {
+            "relative_path": "collectx_bringup/linux-x86_64/collectx_bringup-linux-x86_64-1.22.1-archive.tar.xz",
+            "sha256": "ba1676715cc32ddf9695e1e59fe283c0489a9a18f6a0bfdd1b0104631766a1ca",
+            "md5": "e480e74d2ca1ec226c1f15f47d0fac30",
+            "size": "142950700"
+        },
+        "linux-sbsa": {
+            "relative_path": "collectx_bringup/linux-sbsa/collectx_bringup-linux-sbsa-1.22.1-archive.tar.xz",
+            "sha256": "8f7dd62d0adf8dfd0543aa82c1859f161fea23e8d5bb5b4b2bcc698508329a22",
+            "md5": "5e44cf49922aec1937414c0f54b2e491",
+            "size": "125513356"
+        }
+    },
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cccl/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "ed845eae8c1767706b6ee91e40c608a03f6f633551a849b63f7346d32d73ee60",
+            "md5": "c0dd26e0c41dc35bd73435a4799c7508",
+            "size": "991284"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "eca22ded176804a78afcba3fe1909e7d473366ee1cb9f3784080df23bc8e74d5",
+            "md5": "e50b07ae0a9920ce07a107a5c7030157",
+            "size": "990368"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "f4f5187f7976d8057d76e1e04e72c8b7d0a2a22793107a671ad709b1d8d3408d",
+            "md5": "8dba9713ce4b4e6f0c58a92a8a1379db",
+            "size": "3119228"
+        }
+    },
+    "cuda_crt": {
+        "name": "CUDA CRT",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_crt/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_crt/linux-x86_64/cuda_crt-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "5a3279a049ffc1cdb951c44cb95206acfdde9e9ae5e87825fc18d7e4a6878bb0",
+            "md5": "f90b38d702a29668d97e8f94a399ea31",
+            "size": "79800"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_crt/linux-sbsa/cuda_crt-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "c03b92941ba7bf58a4992231ceb572477784ef450ce678f6545bed02392cae50",
+            "md5": "3db54b1fb543f00c1cca085569bffd9e",
+            "size": "79916"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_crt/windows-x86_64/cuda_crt-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "ff413c89dbd96ed3b3dcfac923437de78acea32fb90309277197c8a127588112",
+            "md5": "29b09d1ab8f3b5550a8e8da587b105f1",
+            "size": "140187"
+        }
+    },
+    "cuda_ctadvisor": {
+        "name": "ctadvisor",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_ctadvisor/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_ctadvisor/linux-x86_64/cuda_ctadvisor-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "9c82af2dbd2d0db7c8108bc9f150ddb02f36d2b66a5edc552ffb94ab41fda065",
+            "md5": "86766786f7e67b75320f7b79c1cdb8f9",
+            "size": "617204"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_ctadvisor/linux-sbsa/cuda_ctadvisor-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "7a2b60e949fcce748318bda190ff4c54d6d4b9753a1be44bbeed254b6880b91a",
+            "md5": "03361a3736df8719d2294649419d637f",
+            "size": "529764"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_ctadvisor/windows-x86_64/cuda_ctadvisor-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "beeab2bf9575ff04f9a9d1c94b743f29ed817a12b294b8928db84fb26f5ef056",
+            "md5": "72a0e640cabd8baa6455117d375dbb4d",
+            "size": "861030"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cudart/LICENSE.txt",
+        "version": "13.0.96",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-13.0.96-archive.tar.xz",
+            "sha256": "25b8071951baba827be1580b841d363464f6ee6c39f48d33a81646f90cc95ed1",
+            "md5": "26ebf8fd2c0fe1f303d5d27c49624d5e",
+            "size": "1487960"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-13.0.96-archive.tar.xz",
+            "sha256": "e2c78564330a09d890f98a066a2082a32c78256ffcc6bccca1696bd2abbaf445",
+            "md5": "ff3140b2fb00f583295484fe36f77995",
+            "size": "1489276"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-13.0.96-archive.zip",
+            "sha256": "a2ed875f9997aa24904fb70cc9db3acd9308433cde99bc8e63ec1271c9da31b4",
+            "md5": "dc22a52b5b75c198a12ce8c4d885e2e5",
+            "size": "2873447"
+        }
+    },
+    "cuda_culibos": {
+        "name": "CUDA MATH Library (cuda culibos)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_culibos/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_culibos/linux-x86_64/cuda_culibos-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "98fca11f9ab89be61385a67eee686c1ebf76fad9c7269d0cf9090edfcdb8a8ac",
+            "md5": "4b61b30864c47e1292f6d132653140d1",
+            "size": "21412"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_culibos/linux-sbsa/cuda_culibos-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "ab5ecee37c8adc7efbc2a88ab091de9d978924c4d7f66c3e0c42f23983a1beb3",
+            "md5": "86aa2f9aca3cddc7c61d6029ce22a5d3",
+            "size": "21444"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuobjdump/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "bd624dcb2089842add8f293efab1d21aa076c98b36d8dcb64347fe08fb03315d",
+            "md5": "1f6f98ec1dcf7f0b1b50ca88f2c4cd7b",
+            "size": "242604"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "cd0304f70ff905421da2ca0fe53cfc384baa48d6ff6b34f92a80cf723064e827",
+            "md5": "eb64d979ba5c6e75e14bac6ec4c58e08",
+            "size": "232276"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "cddbc524dc229c708cc989e4ff2d636ba342c695e0f60c1026a1b5f76de4b77b",
+            "md5": "f4738a4ff851ffed9d83e03ad98e4c13",
+            "size": "6272066"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cupti/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "92fb7e0430521517174c4c171173b888aaa8d78d8762e59752dea2ed14a0ad7d",
+            "md5": "da5bac6241e10114d6dd941c25b0e1b0",
+            "size": "16253056"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "f6f34d534cce56f91b1496abf51be3b1559ba879985d34eb89c808004b77513a",
+            "md5": "bafe0e433c575ab69369919a04ab923d",
+            "size": "12542416"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "e739e96415e1fb9a650eaac826f7cd24701e18ae2f7c26b78f3fabaf64c8e39b",
+            "md5": "d4affebe5c588520fb13a4ba04a9da22",
+            "size": "13282089"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuxxfilt/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "ae1acfe8dca8453e0b243ecde8a45e88a9584bf050b307b96ec9dc286fd8e714",
+            "md5": "8f6fa1787171abc922814d6b4c6824c1",
+            "size": "189496"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "8f0dd0433d2fa4591f7dbdf8169ec4b355fe567657dd28bc8ac2e8ec41fda4f9",
+            "md5": "bdadf71bdfc2a4418e1cc25828a69c0b",
+            "size": "177300"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "f885168de4d35ee4c8ea3d37068bc476726310334dcbcc74e2c1b76b3d088ece",
+            "md5": "293ca297f3263c0cbd3487ad5d5a4749",
+            "size": "186499"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_documentation/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "05df885f5b825e51a69da1318ca6713112ec09baf4d3c6262663111255504eae",
+            "md5": "6467a953e2492ddb3d812b5e8768bb9a",
+            "size": "67948"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "f6bdca23da438ce1ce11f557e7a9571e1a81aa49a56d3b9eaaee2419111dae13",
+            "md5": "8f6f5d7fe9a964bce7560ee6a55d08ec",
+            "size": "68052"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "4879ab75b0fefc591ec0752d80c846b9a191fe6e9528380cc2f105210403e9c2",
+            "md5": "8c1f9a2a0bb9cfb51cc1660da920cc96",
+            "size": "107985"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_gdb/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "a6bf87dac5edb64eee36425f6f8a91676966c456c49a213da5b3158581a4432f",
+            "md5": "24267797e580285a899686e6909cb425",
+            "size": "68531784"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "48bfce61e6f86661ec12bb65dd97e1607799406de5ceafccba2212962568d40e",
+            "md5": "b50bc5c7d85c3bb669b0f4b907eaaa6d",
+            "size": "66117920"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nsight/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "26bace58e46a4aa038ac531d6ef3a3abd12f43da65ba24c29b894e08ca64f5e9",
+            "md5": "937fcefb4d045d1c986bc459b1df078e",
+            "size": "118691392"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvcc/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "48e35be3cfbf4b4fbc16828eaec8a7048ee789403049dc409f7b643d6259cf7a",
+            "md5": "e3e925c644055b9306aec9c9b84d1975",
+            "size": "26657716"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "01b01e10aa2662ad1b3aeab3317151d7d6d4a650eeade55ded504f6b7fced18e",
+            "md5": "4defe04ac10e7231bfa63cbd72dd8e21",
+            "size": "22383012"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "61760e24a44937c6c29a20ddea69067b4d3860ccd6a9a0564573f840d96e6c5f",
+            "md5": "00f382c4efc8602a6fce54fd61da0c23",
+            "size": "29142142"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvdisasm/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "0541e0230f724a43d67288ef882c63351d0c302bf567591b7620d40f93c2c93c",
+            "md5": "c087569ce5afb128f99fadf280c98815",
+            "size": "4129456"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "77e2ef1494270839829d5608352ba67a278e80fdaf4e3cc3c8ac9cb73e1c463c",
+            "md5": "004432bcd5466fdc6a4bcb8ce67c14cc",
+            "size": "4057500"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "c15885ed180cc6439b92a59fede41082434fdd9baac7280d5f0570f1d0786b04",
+            "md5": "00cd56f73b5de05c94c7858cb1219c79",
+            "size": "4450492"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvml_dev/LICENSE.txt",
+        "version": "13.0.87",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-13.0.87-archive.tar.xz",
+            "sha256": "92d441fa7ae41bba92e06c928cacdb32f4703763512f68d10c9c230f09ffe6d8",
+            "md5": "f293cd0388e3d57f4e216a7843f0af3a",
+            "size": "140148"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-13.0.87-archive.tar.xz",
+            "sha256": "71740823e837c2a1a6e314f0fe801f8fa6aef1055220e9a504f6f4c67e21d72b",
+            "md5": "d8455698e595b0a78bec35ee84065c90",
+            "size": "142288"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-13.0.87-archive.zip",
+            "sha256": "b19b2b5fd534f37c3f0aab49d25ebb28496963aef3e819466bcf0fa20607b0cd",
+            "md5": "6f820eb0f0de554e48e6dd627acd0845",
+            "size": "162340"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvprune/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "b182d8b0398ba9ff8ee75fc2ffef3ff1e2069e6bec6938bcf02a6c9e69d40456",
+            "md5": "ae2e691465a09e92768b3aada7092f38",
+            "size": "59948"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "956e1f1b282522ff40b331e5cea83b5d7a87bd97cd9c2bea3454bb0c6adf5414",
+            "md5": "b9529445dd0d916e71e9e4af96ba63ec",
+            "size": "51700"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "b52ca2d51d0e41c317f68f38ce88f4ae7184443eac04203e7a80fd054f2028ec",
+            "md5": "fef61c48fdef576c2f44d26da5168bd3",
+            "size": "150099"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvrtc/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "00038aac08e1dba6f1933237dbfb217ac6452ae24fab970edcac808f103ca64b",
+            "md5": "62a842b5c00b0d44a5a03a18fad07945",
+            "size": "116779532"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "decf9977ab114ff195c8cdfce6fbc94aea4a62efdae628092cbb9fd1c31cda1a",
+            "md5": "1fdf86efd1ad72fe618404d4cd1947c6",
+            "size": "52411212"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "8c50a52467826167e0dbe99936140c52d62272bfc5849fe2d6587d050c8c5d29",
+            "md5": "584ae7baced761d594e2e53eb30f1411",
+            "size": "318076161"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvtx/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "ed150e6fb1b50663ff068cccee3c5e2ca581c3b939b321656afbc9193671137d",
+            "md5": "56273621b95441995c72c199cfd5226b",
+            "size": "94140"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "6f50a3729091aa5a0ae61cda979ea020e09aeb7c07cec0c8962949599d2b72c6",
+            "md5": "1a2ed71befd31ee92a91b12ee257c406",
+            "size": "94612"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "184f578d7bcce2012edf266c51dfa7834ded41464f62459f4ebcb2398cddc665",
+            "md5": "9b01b0d114755775d98626f6dd176137",
+            "size": "147156"
+        }
+    },
+    "cuda_opencl": {
+        "name": "CUDA OpenCL",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_opencl/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "f48040e3054d561484e4ba136650cec68eeebaf4ff4d70d1d704dcdc5f38cf90",
+            "md5": "36009e7503e87c28dc66f8840287eb0d",
+            "size": "95092"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "ef7b189fba61e0fd13e5f50b940fc0e22f9d211481d1c7061b9d586641929f3b",
+            "md5": "ac85141514a2f42eb30f0f6550b5b9bf",
+            "size": "140926"
+        }
+    },
+    "cuda_profiler_api": {
+        "name": "CUDA Profiler API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_profiler_api/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "dc233d88a5cafa095b197e6246b4c468a4581c128da8f951d67e063cdd6bca4c",
+            "md5": "643aa0f86952f61a183c7342ef877632",
+            "size": "17044"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "58c304116de3d184cebcc7d04934bff9d99d2276ff28c46372664bc3fcc32976",
+            "md5": "75920888da1f2ab140a90f490195a636",
+            "size": "17048"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "38c6c854f325b64e7ca0a8b14e1996dedb5abbb38f3580e5c7744b688abdc56e",
+            "md5": "61c405a619241f213110f0a5ea7fe559",
+            "size": "21185"
+        }
+    },
+    "cuda_sandbox_dev": {
+        "name": "CUDA nvsandboxutils Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sandbox_dev/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_sandbox_dev/linux-x86_64/cuda_sandbox_dev-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "642d3dccf9c59d3238659687cdb968f85f643b089c946e35ce278ae59288d73e",
+            "md5": "6ea5dd26e7ea3c047ebb6c8de171ab2c",
+            "size": "30208"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sandbox_dev/linux-sbsa/cuda_sandbox_dev-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "d3aaa63a9fbbee1eb656b10390dd2f0d86c9e9329b578e27c11bbe4fea3cdab6",
+            "md5": "483d362d27d9b828f10b16ee32f2e90d",
+            "size": "30792"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sanitizer_api/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "8eeba425f66fdd17e78d0dff49baa8b3e4599fc0579984eab7ad9c486a95ebf2",
+            "md5": "47623b2482a3c6e09710d63b44d97b90",
+            "size": "11399964"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "68cc7d0144cdf746d4e76565dca86002979ecab5c5674be01bb3fbd3628531e5",
+            "md5": "02b4d469d5099b8853a2669f338e155d",
+            "size": "8547700"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "dcca7ce173165d75eb7f5df76672ec598b11f12e583356eaf80b16f6d43ace9f",
+            "md5": "07ac1cb30f5ea1810092ea08bd4d0fbb",
+            "size": "10867115"
+        }
+    },
+    "driver_assistant": {
+        "name": "NVIDIA Driver Assistant",
+        "license": "MIT",
+        "license_path": "driver_assistant/LICENSE.txt",
+        "version": "0.22.95.05",
+        "linux-all": {
+            "relative_path": "driver_assistant/source/driver_assistant-0.22.95.05-archive.tar.xz",
+            "sha256": "1f4d19c468988dc0f23ca7c1844d6434dfc9a6f0c4eaca43a7a63ab9a51c8552",
+            "md5": "bce1617e3337e8bbab4a51937e0ff544",
+            "size": "38944"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "license_path": "fabricmanager/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "f0220bfb67d04b4107acf00cc95abe5a9268fd8f8b5bae26971f4df232e4369c",
+            "md5": "a6568aa288cb4784b85ba6826463f918",
+            "size": "8249864"
+        },
+        "linux-sbsa": {
+            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "ea91191e91b306da1ee2932da399fab8fe46395ec6820f638432b0176fc7a28e",
+            "md5": "3acd0c87be46dfcc6a45704aa34f0f03",
+            "size": "7501248"
+        }
+    },
+    "imex": {
+        "name": "Nvidia-Imex",
+        "license": "NVIDIA Proprietary",
+        "license_path": "imex/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "8f8c2fe1571ffbc9d7810289b8fb323340083a896d51daffeebee94d5a60b37e",
+            "md5": "0557449a6dadc51171bc54323a1b64c9",
+            "size": "7772976"
+        },
+        "linux-sbsa": {
+            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "3d0179eeed5899b32bb893ec3466c9e3ae347bf7947e35313224480eb966ed92",
+            "md5": "c7e9affa44fbb1d94d7888808b706eed",
+            "size": "7212868"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "license_path": "libcublas/LICENSE.txt",
+        "version": "13.1.0.3",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-13.1.0.3-archive.tar.xz",
+            "sha256": "88bc951efd906032a371153ca61975e0d9c4761e4012169169a6b3a47931606e",
+            "md5": "980968a3f2a7fc483be4a07dd56e09ad",
+            "size": "838952932"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-13.1.0.3-archive.tar.xz",
+            "sha256": "18832d4798b0a4fc75fa90d58c1780203713ca2e35751a2492262e58f2620c50",
+            "md5": "5773abd5980d9a7af9c0732700287156",
+            "size": "1084803912"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-13.1.0.3-archive.zip",
+            "sha256": "4ac4847bbe4f7709b244956fcfc32197a2954ee70b155cb67eebd9ee26f7e339",
+            "md5": "1d3169b46c18bbb58df11c1227931a54",
+            "size": "403672823"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufft/LICENSE.txt",
+        "version": "12.0.0.61",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-12.0.0.61-archive.tar.xz",
+            "sha256": "5cdef1238c270f8f148da18587fdba8b9478c596e40f5490bba2b15c94915dd9",
+            "md5": "aec4ffbf2d55707649295e0372ee3d36",
+            "size": "354634628"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-12.0.0.61-archive.tar.xz",
+            "sha256": "5361f3b22a50923204e07f7ff601150dc67aab6b0fff26c47bd3ac0a50c921a0",
+            "md5": "d4a1bd6640e13b13bc919ba6d5128290",
+            "size": "354230580"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-12.0.0.61-archive.zip",
+            "sha256": "4f2695ea50f895618316ee32636f5d0e5e0bc330e74b3e0876bff002af9e1eb3",
+            "md5": "3d031b8a3629ea62add09f974d608f3f",
+            "size": "212026245"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufile/LICENSE.txt",
+        "version": "1.15.1.6",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.15.1.6-archive.tar.xz",
+            "sha256": "2c1f544ab1b0e215590d943cbd1b0a192a066e9b7592e605c2e28b22e886688f",
+            "md5": "c745668d5bebe08c01473d48bf398833",
+            "size": "42256540"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.15.1.6-archive.tar.xz",
+            "sha256": "e41292a40bb89bb6f64e19972d3d9a209eddcbb96299a777b2edfa6b7d5b8777",
+            "md5": "91e1dc883031e2b90351634ad4768e4d",
+            "size": "42514828"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "license_path": "libcurand/LICENSE.txt",
+        "version": "10.4.0.35",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.4.0.35-archive.tar.xz",
+            "sha256": "ee0dbf473998050bda876cb945634bec87d44b90b05a5550e9c2499ab7c1a5c3",
+            "md5": "e236c0f2483e83d614b563a9dc136ba3",
+            "size": "86175028"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.4.0.35-archive.tar.xz",
+            "sha256": "12a0afe1ee73e806924fc6c9bdd33a47a970d31967a634ec9ab2f0662a502ed2",
+            "md5": "1aa3ad816d7bd327c2561712426c471a",
+            "size": "87176908"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.4.0.35-archive.zip",
+            "sha256": "c4db1ed0595fcdba3c4da0f5605ca4c3f4340b6be833d94765994e239c775a32",
+            "md5": "b204f174a5bf30a728a4f6f68356ad8c",
+            "size": "54762976"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusolver/LICENSE.txt",
+        "version": "12.0.4.66",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-12.0.4.66-archive.tar.xz",
+            "sha256": "1cd13dcb58c5e4bb0ce47ea8876aba21091c1e67165c616144b2dd6331d252ec",
+            "md5": "0dd4b521ddaa0a475a528ef61bd91f7c",
+            "size": "265714920"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-12.0.4.66-archive.tar.xz",
+            "sha256": "882c480bedd5ec6e416fe0a9edb7bfdd78f6ffa885310870e4a04d8fce8e655d",
+            "md5": "c43e9ec46e165d5af53df9353eee9512",
+            "size": "291337460"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-12.0.4.66-archive.zip",
+            "sha256": "8fe0aa8b2f8709402a8a7494037cdb648f0be7da1ed14e511cefea88a532ef8b",
+            "md5": "ab03f6e62dadab74f4a475068615b935",
+            "size": "193265103"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusparse/LICENSE.txt",
+        "version": "12.6.3.3",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.6.3.3-archive.tar.xz",
+            "sha256": "b9de356c3478329e2589d91284f2a685a36f041060f3cb897441ab46a480a30a",
+            "md5": "4c101a89f3b6185ac36e1e98e2d45f15",
+            "size": "278384532"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.6.3.3-archive.tar.xz",
+            "sha256": "50c9fb74e8468af559150f3f072cc2793a5ff70792fa79962146096385cf7346",
+            "md5": "fed1a66a5af73ab124faf01e886c4470",
+            "size": "308854880"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.6.3.3-archive.zip",
+            "sha256": "21f70385aae76de5c24c6baab4df4337d0bc9e1ce69e9ebad228d87d686a28e6",
+            "md5": "4980a04d3a1a810fe86e76693dc9624e",
+            "size": "143747284"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "license_path": "libnpp/LICENSE.txt",
+        "version": "13.0.1.2",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-13.0.1.2-archive.tar.xz",
+            "sha256": "b99e7e145283667728e5fd1bf99c79ed9825c164d3c4a40f6dc549cb0b0e1333",
+            "md5": "27a886d47c737964fa4a628997efad31",
+            "size": "240938928"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-13.0.1.2-archive.tar.xz",
+            "sha256": "6d06bd527b3cb17e354a3d25f9334ff9f972f6af7dc1fe0a7e0f5b87ba6e618a",
+            "md5": "d5e81e33a02980c1320f45c482b34f39",
+            "size": "267380224"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-13.0.1.2-archive.zip",
+            "sha256": "cec65b472cdbd97c557cc45cabc5998288b48c166b9e05d95b8ee3e44083906b",
+            "md5": "b4eeff86fa222309f114eced88ee3bd5",
+            "size": "129562453"
+        }
+    },
+    "libnvfatbin": {
+        "name": "NVIDIA compiler library for fatbin interaction",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvfatbin/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "2f23e25c90517aefd0417304a6b428760373bac78a57d0137645b1bd326f754d",
+            "md5": "298af14438a14e755d2c9deb90ea2604",
+            "size": "940220"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "2599efa23bd85d29526bc579ee86c810705bfbfbefd033e4df85b13a2e8e661f",
+            "md5": "9208373e18a48e5ae61d161a07b3ffcc",
+            "size": "848440"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "ba40fc248c8cf1e709004adeb8c92ac1343048b23a56961e93d282eaed9b3566",
+            "md5": "7200ba0c4a4c786fd671acfe85fd425d",
+            "size": "2242775"
+        }
+    },
+    "libnvidia_nscq": {
+        "name": "NVIDIA NSCQ API",
+        "license": "NVIDIA Driver",
+        "license_path": "libnvidia_nscq/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "c2285c12f10ec2afc0ad2949f7fcc282b6fd37f32165c1df241451ccabb1067a",
+            "md5": "6bc20061ebdae98fadd7a76110b44430",
+            "size": "380464"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "67cba21aad38e48247e88f480ed67a3096f7173abc190a3f3fbcb312f9649ac6",
+            "md5": "e368f46e7ea592090d3efe425ffc5bbe",
+            "size": "351076"
+        }
+    },
+    "libnvjitlink": {
+        "name": "NVIDIA compiler library for JIT LTO functionality",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjitlink/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "25f9763fd60122a4f728eec22ac4e64e46ea8679e140234f15eaec008e6c41a8",
+            "md5": "ad488d8956b7e93e6386ede30a3f2e6d",
+            "size": "55521316"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "b7c25896af24ea88309301c8325449cd3d4907b3f1db4060f43a8ca8f4738cdc",
+            "md5": "3febdc80a7af025dc93a2091bb97648e",
+            "size": "49924684"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "4b2cff3cfcec50cab2193f11cee023589b1b3b15388ab38780ea08b7ebbf15e3",
+            "md5": "e4b5c1e668ce33e44b643e14342504e8",
+            "size": "269633168"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjpeg/LICENSE.txt",
+        "version": "13.0.1.86",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-13.0.1.86-archive.tar.xz",
+            "sha256": "ebef16a52d31d2de0e888f0fd9c788bfe99be988ebad4927754e5ccdfdae6360",
+            "md5": "23291f980056e22961a2ab83e6a1c52c",
+            "size": "3618252"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-13.0.1.86-archive.tar.xz",
+            "sha256": "6132e76ec6064881592b38ef5b2a135237005d8533660ee8f525b120a178d1f4",
+            "md5": "b2c038c246ca28a1446eaf235769ea62",
+            "size": "3460824"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-13.0.1.86-archive.zip",
+            "sha256": "b8d64f9fb90632e33685529e2b8baee245ca3dcaecab4b8998815ae0f44c5171",
+            "md5": "8c0faada587f472d75ae4e22ced3f6c1",
+            "size": "3144778"
+        }
+    },
+    "libnvptxcompiler": {
+        "name": "CUDA libnvptxcompiler",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvptxcompiler/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "libnvptxcompiler/linux-x86_64/libnvptxcompiler-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "3d2a51c6816278b90167550a7e0e9adfff9c8c919d87ef980565c0eb7fc23830",
+            "md5": "c2877d647902ab01f88b922306189a8c",
+            "size": "13779680"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvptxcompiler/linux-sbsa/libnvptxcompiler-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "fa47b2045245c5e86d41f9f13d571514f12a9f84eaaf0680087813fd71c3c0bd",
+            "md5": "5a4d6a737853f25547a2a47287572c08",
+            "size": "12913976"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvptxcompiler/windows-x86_64/libnvptxcompiler-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "863efcf751575f17111b99d0e553de954d3e8c9a91315505605601b0cc33fe4d",
+            "md5": "b920f1abf2214e335d6ff22d8188cbeb",
+            "size": "46889642"
+        }
+    },
+    "libnvsdm": {
+        "name": "LIBNVSDM",
+        "license": "NVIDIA",
+        "license_path": "libnvsdm/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "61731fb08bcc5cc143e8514d5ec4f24d42ef9f2563d0ba1ea78bac9eabee8075",
+            "md5": "a46f9176919e90badd89240de658ec7c",
+            "size": "499756"
+        }
+    },
+    "libnvvm": {
+        "name": "CUDA NVVM",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvvm/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "libnvvm/linux-x86_64/libnvvm-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "17ef1665b63670887eeba7d908da5669fa8c66bb73b5b4c1367f49929c086353",
+            "md5": "816927093ffbdc10fddd751f045396b1",
+            "size": "43645408"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvvm/linux-sbsa/libnvvm-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "f94feb1a0da0c55ceb5c7f039c1f0ffad5d162e0fedfb565efb87771187ddcfd",
+            "md5": "b9730ee7e25db76caa843c858af31d98",
+            "size": "38570872"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvvm/windows-x86_64/libnvvm-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "6dda4a82d22a2c173a65c66b4b4c933e3424a56ce845e2864bdca9cc66e6c524",
+            "md5": "779d2fb0a5235cc7763c06686def0226",
+            "size": "52909116"
+        }
+    },
+    "mft": {
+        "name": "NVLink 5 MFT",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft/LICENSE.txt",
+        "version": "4.33.0.3004",
+        "linux-x86_64": {
+            "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.33.0.3004-archive.tar.xz",
+            "sha256": "d8b885df13e32730275436d56cd48a3c4a755b2591ff4e3e6836c7a9f9433af1",
+            "md5": "0ee5b7ee7e9e3d982d39c65117891db9",
+            "size": "50206528"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.33.0.3004-archive.tar.xz",
+            "sha256": "26aa6ecb6827d88003b50c7d649962b78eb58cba190fdb1f4836b9a3bc75b22e",
+            "md5": "93f81aed65d166b5cb4b2c1193778f3d",
+            "size": "46314988"
+        }
+    },
+    "mft_autocomplete": {
+        "name": "NVLink 5 MFT AUTOCOMPLETE",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_autocomplete/LICENSE.txt",
+        "version": "4.33.0.3004",
+        "linux-x86_64": {
+            "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.33.0.3004-archive.tar.xz",
+            "sha256": "8d16437d55f15ab5c6da9fa26aec6806eb7f6e9606006a7f09593344c848acdb",
+            "md5": "00c429dd417652d24a93f7e66fbab865",
+            "size": "12240"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.33.0.3004-archive.tar.xz",
+            "sha256": "b4d492b889d76ea156b97739da4661dfd36c2053a0090065317701c323b51859",
+            "md5": "1a7327e04ae79247054cc551d8f0b263",
+            "size": "12176"
+        }
+    },
+    "mft_oem": {
+        "name": "NVLink 5 MFT OEM",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_oem/LICENSE.txt",
+        "version": "4.33.0.3004",
+        "linux-x86_64": {
+            "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.33.0.3004-archive.tar.xz",
+            "sha256": "0f703047ad69e46c6e3f021fc1ae5e086530a52311da08b3a49451db7f1332e7",
+            "md5": "42498e50e4bdedbb3a99ba434a3ee6a5",
+            "size": "3674360"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.33.0.3004-archive.tar.xz",
+            "sha256": "fb755738e56a883d68bb408f28e293df00d1e66e1554e48f339f0f0cf0b7be04",
+            "md5": "fe00dfbbac0c16f74e0d8f21a759d522",
+            "size": "3276404"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_compute/LICENSE.txt",
+        "version": "2025.3.1.4",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2025.3.1.4-archive.tar.xz",
+            "sha256": "d3c0a0402511034c58227b817cbfed599765f32dc662cdcda58922247b52dd7a",
+            "md5": "05222d0ca8b526f7f94d95e60dbb0459",
+            "size": "322049776"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2025.3.1.4-archive.tar.xz",
+            "sha256": "562acdb72942ba3250fbda1d0a5b45d9d8bebf7295049846d16ffbdb457f9d28",
+            "md5": "e061682e32865f54d6499c402cb1f340",
+            "size": "141672040"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2025.3.1.4-archive.zip",
+            "sha256": "0ad1c310f38cdfc17e85f6efa2da60e7628bd2db81eba8ec487ab6d49c1bcdef",
+            "md5": "a78ed24bbe8554a6ff7ebfff6c516185",
+            "size": "371135506"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_systems/LICENSE.txt",
+        "version": "2025.3.2.474",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2025.3.2.474-archive.tar.xz",
+            "sha256": "fa4e9908e9a593383ac7f669472dd52e712cbc426f69b349ada363e80cdebbd5",
+            "md5": "e0dbd1d1d1d7ab7387eb2cf2c7b6cabc",
+            "size": "1131797276"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2025.3.2.474-archive.tar.xz",
+            "sha256": "547bc5c72df6adc325a761201f4d7e20a2c80c94adf1169f6d365c6995594b4f",
+            "md5": "5a6bdffed12380675d576ca20d81a1b4",
+            "size": "1025797284"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2025.3.2.474-archive.zip",
+            "sha256": "7b55f8fedbcf797817e5062fbdec55f8b90c26c62c0451adc68cf2f30000752a",
+            "md5": "f1f3f495e27127f32a8e6d8486df0385",
+            "size": "446766583"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_vse/LICENSE.txt",
+        "version": "2025.3.1.25227",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2025.3.1.25227-archive.zip",
+            "sha256": "bc92e5c1bb1a45f60d4e8382169990094b1f8531f37cafb180690d5bb14e2fce",
+            "md5": "00022c2eafadf7bc024625629f896b74",
+            "size": "200540705"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "license_path": "nvidia_driver/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "3528df4fb0c7a1665ae2af5d26effeb67f76fc86742ffc1defd7714408405d4d",
+            "md5": "414882bb4f82d3f30f56e22bcb162a67",
+            "size": "492741996"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "95b52919632928d7a245e5696b71cd68285e6bffd1f22cdcd4f9686d5d5b0b09",
+            "md5": "119f7e0375f09e0a9c1ec4befca800f0",
+            "size": "367188496"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "license_path": "nvidia_fs/LICENSE.txt",
+        "version": "2.26.6",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.26.6-archive.tar.xz",
+            "sha256": "39ff513827f39c26140303c2b1eb28cb46e2afb6f6676881dfcd6e7b0248bcee",
+            "md5": "9cdd880eb9678967d8e0712f708eeca5",
+            "size": "60292"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.26.6-archive.tar.xz",
+            "sha256": "de648016c4123afe65684448ee0e8719cf9d4f934bb63a82239411f6c7fd1fc1",
+            "md5": "51c58f7b414b3461f0bdc71316dc2f50",
+            "size": "60308"
+        }
+    },
+    "nvlsm": {
+        "name": "NVLSM SM component",
+        "license": "NVIDIA Proprietary",
+        "license_path": "nvlsm/LICENSE.txt",
+        "version": "2025.06.6",
+        "linux-x86_64": {
+            "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.06.6-archive.tar.xz",
+            "sha256": "bd77ad2504966450aab15041223eea34538a57e870b7d447c097ec721efba792",
+            "md5": "798accd845365da78e2ce99b0aac22ce",
+            "size": "7005320"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.06.6-archive.tar.xz",
+            "sha256": "1f24d590129e4951d57b1ba75f321bc7ec66b487249ac53b771f0d3a5c5ff371",
+            "md5": "953f75c92485fd63057ec365511f27da",
+            "size": "9365804"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "license_path": "visual_studio_integration/LICENSE.txt",
+        "version": "13.0.85",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "babb8113ae3845fff6cac0fd8a14838d384d61960bcc60289b72129e8db08bd9",
+            "md5": "9577f804ebffb01e9876a7d7b33cba1f",
+            "size": "887859"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md
new file mode 100644
index 000000000000..ca6a04ea7074
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md
@@ -0,0 +1,8 @@
+# cudnn
+
+Link: <https://developer.download.nvidia.com/compute/cudnn/redist/>
+
+Requirements: <https://docs.nvidia.com/deeplearning/cudnn/backend/v9.8.0/reference/support-matrix.html#gpu-cuda-toolkit-and-cuda-driver-requirements>
+
+8.9.7 is the latest release from the 8.x series and supports everything but Jetson.
+8.9.5 is the latest release from the 8.x series that supports Jetson.
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json
new file mode 100644
index 000000000000..6d1962435bfa
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json
@@ -0,0 +1,139 @@
+{
+    "release_date": "2024-03-15",
+    "release_label": "8.9.5",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "8.9.5.30",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "bbe10e3c08cd7e4aea1012213781e4fe270e1c908263444f567cafefb2cc6525",
+                "md5": "300aaaa05ca6d12b3ac058fd0bd70c6b",
+                "size": "857471712"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "2a2eb89a2ab51071151c6082f1e816c702167a711a9372f9f73a7b5c4b06e01a",
+                "md5": "afb13f2d7377f4a16b54a6acc373bbd9",
+                "size": "861488496"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "d678f8b2903b95de7eeaef38890c5674705864ea049b2b63e90565f2c0ea682f",
+                "md5": "daed75ed0c9f4dcc5b9521d2a833be3d",
+                "size": "860245008"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "38388ec3c99c6646aaf5c707985cd35e25c67f653d780c4081c2df5557ab665f",
+                "md5": "8893605a415202937ad9f2587e7a16ce",
+                "size": "862346664"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "50e3d38cb70a53bb059da0aefc60e1460729c6988e2697200c43b80d218e556c",
+                "md5": "3479f3fdbda83cd6df104851dc1f940a",
+                "size": "857816268"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "107d3dbec6345e1a3879a151cf3cbf6a2d96162c7b8eeb2ff85b84a67e79e2d1",
+                "md5": "90715ef0e48f6f153587ee59df7c1a87",
+                "size": "859978180"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.5.30_cuda11-archive.zip",
+                "sha256": "e42aaa92203cc101a1619656ae50852a0d818a06ca99684c5f51ba95bd7a7cf9",
+                "md5": "d2f4fbc710da61253570306ed2e63ac4",
+                "size": "701179425"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.5.30_cuda12-archive.zip",
+                "sha256": "be76d407ce0e609f94688aa45bfd5648fd21a4d9f84a588fad10aa4802ca1301",
+                "md5": "54146d8da6df9da3ef125171da959dcf",
+                "size": "705347747"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "0491f7b02f55c22077eb678bf314c1f917524bd507cf5b658239bf98a47233a1",
+                "md5": "fffd4a177c3e2ebaaceb83131d69e4e3",
+                "size": "891432124"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "8.9.5.30",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "9c0d951788461f6e9e000209cf4b100839effd1fd300371dfa6929552c8b1d4e",
+                "md5": "dcbdaaa0171aa6b8331fcd6218558953",
+                "size": "1665468"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "441d262d82888c6ca5a02c8ad0f07c3a876be7b473bc2ec2638d86ea2e80a884",
+                "md5": "a2ca6bf77b610024aff5c1a7ee53ea01",
+                "size": "1664272"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "ded84be373031ff843c0b7118e9fdb48b06ec763eae3c76cb9c57e121b47c228",
+                "md5": "d4d76362cf7ba0a0711088c38a3e17a7",
+                "size": "1666372"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "275d6a6671c210d4c4a92240de24cba0c5ca17e9007f91656b18bbff81621f81",
+                "md5": "b13c3befd24473ad536ef6ea3f4dc939",
+                "size": "1666788"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "fa2150dff6f574fb2927bfd2d10b5c2e2e90603f59d3d3371eaa41f2e9528c74",
+                "md5": "80783b38089b6573943959e873693f0a",
+                "size": "1665660"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "af98dec9cf613cb7f67e27f5a5da24fc183996fc25a875aa0a7dc2914c986fe3",
+                "md5": "5f5b67f5d2862190ae9440ca7041b7a5",
+                "size": "1668336"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-aarch64/cudnn_samples-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "044c0d4436e1ecff6785a8bacf45cf2b5d504eb1c04bb9617aed86bfea77e45f",
+                "md5": "ad2c201cf63561b5f0ddf505706eed97",
+                "size": "1663868"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json
new file mode 100644
index 000000000000..b5940fd5275c
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json
@@ -0,0 +1,123 @@
+{
+    "release_date": "2024-03-15",
+    "release_label": "8.9.7",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "8.9.7.29",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "a3e2509028cecda0117ce5a0f42106346e82e86d390f4bb9475afc976c77402e",
+                "md5": "9ee28df53dc5f83d97f5406f880d3953",
+                "size": "860967256"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "475333625c7e42a7af3ca0b2f7506a106e30c93b1aa0081cd9c13efb6e21e3bb",
+                "md5": "046e32d5ab0fdc56878e9b33f3a6883d",
+                "size": "864984964"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "f23fd7d59f9d4f743fa926f317dab0d37f6ea21edb2726ceb607bea45b0f9f36",
+                "md5": "44d8f80a90b6ba44379727a49a75b1fc",
+                "size": "863759764"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "8574d291b299f9cc0134304473c9933bd098cc717e8d0876f4aba9f9eebe1b76",
+                "md5": "7acbeb71d48373ea343c13028172c783",
+                "size": "865846096"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "91c37cfb458f541419e98510f13aaf5975c0232c613e18b776385490074eea17",
+                "md5": "b4ae46fb80f2f8ef283d038585bbb122",
+                "size": "861355724"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "e98b7c80010785e5d5ca01ee4ce9b5b0c8c73587ea6f8648be34d3f8d1d47bd1",
+                "md5": "52a436f378d20b8e1e1a8a173a8bdeda",
+                "size": "863497272"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.7.29_cuda11-archive.zip",
+                "sha256": "5e45478efe71a96329e6c0d2a3a2f79c747c15b2a51fead4b84c89b02cbf1671",
+                "md5": "7dddb764c0a608ac23e72761be4c92c0",
+                "size": "704240064"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.7.29_cuda12-archive.zip",
+                "sha256": "94fc17af8e83a26cc5d231ed23981b28c29c3fc2e87b1844ea3f46486f481df5",
+                "md5": "30f8a180be36451511306f7837270214",
+                "size": "708408517"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "8.9.7.29",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "8b17f56e9d654d9af3d7711645811fb6f240f53bc2d62c00c063a6d452d80091",
+                "md5": "b5410e97c73ea206b3d8939ce6ff8832",
+                "size": "1664448"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "d3a9a4f3f74b04c393bb9152fe3a53ac1514da679ca57858d69f64243debb905",
+                "md5": "348306c65eb4c865fba72332fa7a5f33",
+                "size": "1665932"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "29a18538f13a63ee54cd795c78f64a1ca45df2de0b140cf095281a16d1d4d4e3",
+                "md5": "9f398a26a5c7913faf58e8ee3bd9c6ff",
+                "size": "1665244"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "80664b7a6abed08633e0dc238f47f26aaaa0add5571bf6f4f4e475686a702c8d",
+                "md5": "6aa5e8e801b5f730a103aaf52c66485e",
+                "size": "1668400"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "dd7b618f4af89fff9cdad9cd87dbc4380c7f6120460c174bd10fef6342099915",
+                "md5": "841a6dde4037a39f7ddd0fb92f245c9d",
+                "size": "1666176"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "4d84211d62e636ad3728674e55e9ce91e29c78d071fcb78453f8a71902758836",
+                "md5": "0e80992ee19918efd714199f41cbe24b",
+                "size": "1664288"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json
new file mode 100644
index 000000000000..15367f5a3fa6
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json
@@ -0,0 +1,121 @@
+{
+    "release_date": "2025-09-04",
+    "release_label": "9.13.0",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "9.13.0.50",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "28c5c59316464434eb7bafe75fc36285160c28d559a50056ded13394955d1f7d",
+                "md5": "55633b6a710506c4e4d704aef42a5fdd",
+                "size": "873944756"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "02f47d9456773c80d97ed245efd9eb22bb985dcfdb74559213536035291e7a01",
+                "md5": "ff33c2783f44d10874f93d32d13764ab",
+                "size": "641302680"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "28f3f86aa102870c5d6804bca1bb1a0dcc1df69d0235c0a4120ae0aa6d14ffc7",
+                "md5": "9bd5d15c46ccc94e7191e47446f22e62",
+                "size": "873177712"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "78931057322ab87b72b0a988462568412edfed5bdef1eaf717961351b53cb3d0",
+                "md5": "aadbfef24b136ce2385170c19213c4fa",
+                "size": "766735516"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.13.0.50_cuda12-archive.zip",
+                "sha256": "827e294e13e352586a5bcf5b2188025fe5cba590df69b8010e97dd30b9a0266f",
+                "md5": "e08c945fd8f570e6779ce9cb216bcf20",
+                "size": "621840857"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.13.0.50_cuda13-archive.zip",
+                "sha256": "6314aa4ca21e727bc012fecf2bf7192276ac7b648e1f709f52947496d70808dd",
+                "md5": "d5fa2f7d1596bc6bbabb6888f9139fd4",
+                "size": "337906764"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "c4b47fe8b1f936aa5cbc312f2d0707990fe5f55693fb5640c7141d301aa7db4c",
+                "md5": "4a00c0ae53ad6fdb761d7ab56993863c",
+                "size": "940699120"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "f18ee7d3fd7b1d136602eb2f5d5d59abe5445db384ad308d22fbeeee11ef151e",
+                "md5": "365f06153492370374e5e7b20d4646eb",
+                "size": "690215112"
+            }
+        }
+    },
+    "cudnn_jit": {
+        "name": "NVIDIA CUDA Deep Neural Network Graph JIT library",
+        "license": "cudnn",
+        "license_path": "cudnn_jit/LICENSE.txt",
+        "version": "9.13.0.50",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "cudnn_jit/linux-x86_64/cudnn_jit-linux-x86_64-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "eb22533f125e4315de501112e2d0f0c001ba50b8f872f2bf7a12d545f609cb59",
+                "md5": "07023563efe85b7aab07b2982e541872",
+                "size": "13417344"
+            },
+            "cuda13": {
+                "relative_path": "cudnn_jit/linux-x86_64/cudnn_jit-linux-x86_64-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "cd76ea09574f3a1c07728c15fc794dbeed181b57b25e02768c5918b0353e658d",
+                "md5": "e9cc3e0e19d4c88158ef48193905b94b",
+                "size": "12722420"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "cudnn_jit/linux-sbsa/cudnn_jit-linux-sbsa-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "f8c91dca056c0128f0ed15296de4b9fcf1cd503241cec02f6e4b3e2965e1be9e",
+                "md5": "adf011a7b7bcbd0c9be0abd546a49e22",
+                "size": "13047884"
+            },
+            "cuda13": {
+                "relative_path": "cudnn_jit/linux-sbsa/cudnn_jit-linux-sbsa-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "d5ce2fb281457eddf6319e517a797d009a4f5db55a565a753f0ba53e541163b2",
+                "md5": "d61024f0d19e5bcdad3e969c79f21d62",
+                "size": "12812136"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "9.13.0.50",
+        "source": {
+            "relative_path": "cudnn_samples/source/cudnn_samples-source-9.13.0.50-archive.tar.xz",
+            "sha256": "34dd694b6a1de34fca31a89b0b41f1f5edbf2dddb5822dda193332be6a2f508d",
+            "md5": "2750b23e2e468d8f5ff0b429d1e60d32",
+            "size": "1666920"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md
new file mode 100644
index 000000000000..95d44eaba298
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md
@@ -0,0 +1,5 @@
+# cudss
+
+Link: <https://developer.download.nvidia.com/compute/cudss/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cudss/release_notes.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json
new file mode 100644
index 000000000000..778d938e3db7
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json
@@ -0,0 +1,46 @@
+{
+    "release_date": "2025-06-16",
+    "release_label": "0.6.0",
+    "release_product": "cudss",
+    "libcudss": {
+        "name": "NVIDIA cuDSS library",
+        "license": "cuDSS library",
+        "license_path": "libcudss/LICENSE.txt",
+        "version": "0.6.0.5",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcudss/linux-x86_64/libcudss-linux-x86_64-0.6.0.5_cuda12-archive.tar.xz",
+                "sha256": "159ce1d4e3e4bba13b0bd15cf943e44b869c53b7a94f9bac980768c927f02e75",
+                "md5": "4ac17f5b35a4ecc550c4d7c479a5c5b5",
+                "size": "68957176"
+            }
+        },
+        "cuda_variant": [
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcudss/linux-sbsa/libcudss-linux-sbsa-0.6.0.5_cuda12-archive.tar.xz",
+                "sha256": "b56cd0841c543bb81b2665063967f56cf3a3a22a445ddf1642c7f765f2059b42",
+                "md5": "490582492aceea286eb6d961d1a55beb",
+                "size": "68786208"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "libcudss/windows-x86_64/libcudss-windows-x86_64-0.6.0.5_cuda12-archive.zip",
+                "sha256": "45319317d9f67fecc9af7e5cf162cb46111f5d35b06871c147fa8f030d7cecc5",
+                "md5": "c1036a4cbadc7b201e08acaac13fcac6",
+                "size": "50807624"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "libcudss/linux-aarch64/libcudss-linux-aarch64-0.6.0.5_cuda12-archive.tar.xz",
+                "sha256": "e6f5d5122d735f9dbfd42c9eaba067a557a5613ee4a6001806935de11aff4b09",
+                "md5": "34fd4b0843da02ebaa76f5711e1b63de",
+                "size": "32347256"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md
new file mode 100644
index 000000000000..e9601dcb9d9c
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md
@@ -0,0 +1,5 @@
+# cuquantum
+
+Link: <https://developer.download.nvidia.com/compute/cuquantum/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cuquantum/latest/getting-started/index.html#dependencies>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json
new file mode 100644
index 000000000000..a66a8c10a557
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json
@@ -0,0 +1,43 @@
+{
+    "release_date": "2025-09-08",
+    "release_label": "25.09.0",
+    "release_product": "cuquantum",
+    "cuquantum": {
+        "name": "NVIDIA cuQuantum",
+        "license": "cuQuantum",
+        "license_path": "cuquantum/LICENSE.txt",
+        "version": "25.09.0.7",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "cuquantum/linux-x86_64/cuquantum-linux-x86_64-25.09.0.7_cuda12-archive.tar.xz",
+                "sha256": "fec8fcceeb9b62f2dff37834a9cd44c6ab05486dec0ebc5ae3452dd8d6390ea0",
+                "md5": "b57e63b14a2a83115fc11ebb0fa93f61",
+                "size": "115548260"
+            },
+            "cuda13": {
+                "relative_path": "cuquantum/linux-x86_64/cuquantum-linux-x86_64-25.09.0.7_cuda13-archive.tar.xz",
+                "sha256": "3f1e706c0ee582341ec4f103d37c92d90ef16d1cfac42f502c44b2feb6861dd9",
+                "md5": "9e11c71d25231c962b8df11adb4e570b",
+                "size": "119378588"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "cuquantum/linux-sbsa/cuquantum-linux-sbsa-25.09.0.7_cuda12-archive.tar.xz",
+                "sha256": "b63237e122a32f2576118297c291597815c9c3573daf5c9b4592ada7af13fc17",
+                "md5": "5b7d6dcf44d2e80eb155a22574b71b3a",
+                "size": "115171716"
+            },
+            "cuda13": {
+                "relative_path": "cuquantum/linux-sbsa/cuquantum-linux-sbsa-25.09.0.7_cuda13-archive.tar.xz",
+                "sha256": "629d3e6749ac49e96de4469477d3b0172581896c7273890bc355420b344fac87",
+                "md5": "624ddcbf89311a43f2d7fb6671e37c6b",
+                "size": "119179132"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md
new file mode 100644
index 000000000000..a142f245fe06
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md
@@ -0,0 +1,5 @@
+# cusolvermp
+
+Link: <https://developer.download.nvidia.com/compute/cusolvermp/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cusolvermp/getting_started/index.html#hardware-and-software-requirements>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json
new file mode 100644
index 000000000000..8181beabbec6
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json
@@ -0,0 +1,43 @@
+{
+    "release_date": "2025-08-12",
+    "release_label": "0.7.0",
+    "release_product": "cusolvermp",
+    "libcusolvermp": {
+        "name": "NVIDIA libcusolvermp library",
+        "license": "libcusolvermp library",
+        "license_path": "libcusolvermp/LICENSE.txt",
+        "version": "0.7.0.833",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcusolvermp/linux-x86_64/libcusolvermp-linux-x86_64-0.7.0.833_cuda12-archive.tar.xz",
+                "sha256": "5383f35eefd45cc0a5cbd173a4a353941f02b912eb2f8d3a85c30345054df5e9",
+                "md5": "f9cf72595e8ff6d72a68b4a23ccc9973",
+                "size": "9293812"
+            },
+            "cuda13": {
+                "relative_path": "libcusolvermp/linux-x86_64/libcusolvermp-linux-x86_64-0.7.0.833_cuda13-archive.tar.xz",
+                "sha256": "4a4bf2d08dad3a276b33f9356f8cd8b5b2a70201257a277c83bb3cfdb7a7107a",
+                "md5": "a95c2c6a6f8d9c07ee99ca1545a71967",
+                "size": "8014464"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcusolvermp/linux-sbsa/libcusolvermp-linux-sbsa-0.7.0.833_cuda12-archive.tar.xz",
+                "sha256": "a0012c5be7ac742a26cf8894bed3c703edea84eddf0d5dca42d35582622ffb9b",
+                "md5": "626c1e35145fa495a7708c5fff007866",
+                "size": "9214676"
+            },
+            "cuda13": {
+                "relative_path": "libcusolvermp/linux-sbsa/libcusolvermp-linux-sbsa-0.7.0.833_cuda13-archive.tar.xz",
+                "sha256": "51b80fc5cdeb197b3e9b1de393a8413943ccb2d0e7509c6a183816be83123260",
+                "md5": "6338b4e581a076214581ec650f9eb92e",
+                "size": "7605548"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md
new file mode 100644
index 000000000000..80252fca2261
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md
@@ -0,0 +1,7 @@
+# cusparselt
+
+Link: <https://developer.download.nvidia.com/compute/cusparselt/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cusparselt/getting_started.html#prerequisites>
+
+NOTE: 0.7.1 only supports CUDA 12.8 and later.
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json
new file mode 100644
index 000000000000..d2d8279c9d75
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json
@@ -0,0 +1,35 @@
+{
+    "release_date": "2024-10-15",
+    "release_label": "0.6.3",
+    "release_product": "cusparselt",
+    "libcusparse_lt": {
+        "name": "NVIDIA cuSPARSELt",
+        "license": "cuSPARSELt",
+        "license_path": "libcusparse_lt/LICENSE.txt",
+        "version": "0.6.3.2",
+        "linux-x86_64": {
+            "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.6.3.2-archive.tar.xz",
+            "sha256": "a2f856e78943f5c538bdef1c9edc64a5ed30bf8bb7d5fcb615c684ffe776cc31",
+            "md5": "d074824e3dc6c382160873a8ef49c098",
+            "size": "110698912"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.6.3.2-archive.tar.xz",
+            "sha256": "3e420ddbff4eb9ac603f57c7aa8b3d5271112816e244eb55ef9f30c4eb6a04b7",
+            "md5": "dd6b0dd464bb8596950ab761890e1ae1",
+            "size": "109919332"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.6.3.2-archive.zip",
+            "sha256": "6d276e33a399008c22ffefd707eefe2f57ff2ff8f1dc1929d9e3e75d3c83562d",
+            "md5": "95de6b57ceceb199f9b86bfbe5d2d394",
+            "size": "328143559"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.6.3.2-archive.tar.xz",
+            "sha256": "91501d0c05d1ff0dd67399ecd7c1bf76a620e842dce54ae4c8a1f07cec0673e5",
+            "md5": "7f00c8663678a97948bbd2e98b65a9fa",
+            "size": "19000276"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json
new file mode 100644
index 000000000000..c0e38e6acec8
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json
@@ -0,0 +1,71 @@
+{
+    "release_date": "2025-09-04",
+    "release_label": "0.8.1",
+    "release_product": "cusparselt",
+    "libcusparse_lt": {
+        "name": "NVIDIA cuSPARSELt",
+        "license": "cuSPARSELt",
+        "license_path": "libcusparse_lt/LICENSE.txt",
+        "version": "0.8.1.1",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.8.1.1_cuda12-archive.tar.xz",
+                "sha256": "b34272e683e9f798435af05dc124657d1444cd0e13802c3d2f3152e31cd898a3",
+                "md5": "8e6d6454a2ac514c592f18fe7e77f84c",
+                "size": "311599728"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.8.1.1_cuda13-archive.tar.xz",
+                "sha256": "82dd3e5ebc199a27011f58857a80cd825e77bba634ab2286ba3d4e13115db89a",
+                "md5": "90e40a8bffe304d14578eb8f2173dee1",
+                "size": "317355908"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.8.1.1_cuda12-archive.tar.xz",
+                "sha256": "e87c2e1a8615aa588864915a05c42309869c96d4046b07a50a7a729af2c1ff22",
+                "md5": "504742ec72d48e75954d1a31e30aebcb",
+                "size": "310432728"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.8.1.1_cuda13-archive.tar.xz",
+                "sha256": "d3ce9fb25961540291c6dc6c7292a1ea7cb886590bf896fdc2564cb2a261a3de",
+                "md5": "032ce0fc1decdca18652ce3fcf05b14e",
+                "size": "425143780"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.8.1.1_cuda12-archive.zip",
+                "sha256": "1a1a4be5c2da47e242d3fbab35b66077916aeb2b8175bc6a0a6691e11972951c",
+                "md5": "78f5c274b42ff56b1b74427d89372a14",
+                "size": "223735080"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.8.1.1_cuda13-archive.zip",
+                "sha256": "d83c3a9c34df98aa999e6a64278a36eb837b411af593d41fe74746a2915e379d",
+                "md5": "ece8942a85c1706547da6c11ed4e48b2",
+                "size": "156765306"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.8.1.1_cuda12-archive.tar.xz",
+                "sha256": "5426a897c73a9b98a83c4e132d15abc63dc4a00f7e38266e7b82c42cd58a01e1",
+                "md5": "fffc61b32112a6c09046bfb3300c840f",
+                "size": "127531168"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.8.1.1_cuda13-archive.tar.xz",
+                "sha256": "0fcf5808f66c71f755b4a73af2e955292e4334fec6a851eea1ac2e20878602b7",
+                "md5": "eb6eb4a96f82ff42e0be38f8486fb5d7",
+                "size": "124707896"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md
new file mode 100644
index 000000000000..5df404c3f6f9
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md
@@ -0,0 +1,5 @@
+# cutensor
+
+Link: <https://developer.download.nvidia.com/compute/cutensor/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cutensor/latest/index.html#support>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json
new file mode 100644
index 000000000000..2a00c57e23b0
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json
@@ -0,0 +1,57 @@
+{
+    "release_date": "2025-09-04",
+    "release_label": "2.3.1",
+    "release_product": "cutensor",
+    "libcutensor": {
+        "name": "NVIDIA cuTENSOR",
+        "license": "cuTensor",
+        "license_path": "libcutensor/LICENSE.txt",
+        "version": "2.3.1.0",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.3.1.0_cuda12-archive.tar.xz",
+                "sha256": "b1d7ad37b24cd66a446ae76ac33bd5125aa58007a604cb64fc9c014a8d685940",
+                "md5": "061f0d50d4642431d284bdd8ad9c45a4",
+                "size": "428900080"
+            },
+            "cuda13": {
+                "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.3.1.0_cuda13-archive.tar.xz",
+                "sha256": "9cb1125f7de01ca319b5c72edeb7169b679b72beacc90354fb18a14056e24372",
+                "md5": "e94ea98ca6e88961a39d52da1c9470c7",
+                "size": "386539432"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.3.1.0_cuda12-archive.tar.xz",
+                "sha256": "f3763cdc7b03ca08e348efb6faa35d461537390ce7d059e279e415b33dad8291",
+                "md5": "048b99ec5a968df2dd2a3f6bd26d6f63",
+                "size": "427395404"
+            },
+            "cuda13": {
+                "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.3.1.0_cuda13-archive.tar.xz",
+                "sha256": "2e4c24bd1621dac7497ca9edf90bfc5dbdcc38490dafd35821066f96f2934aef",
+                "md5": "05e13cda907130e2f77cf86bba05fa11",
+                "size": "385157096"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.3.1.0_cuda12-archive.zip",
+                "sha256": "8df4c1b856c40e72f41d5b92efee5729bf11f00a0e1e3afd546b0d35a360a6cb",
+                "md5": "3aae5e991b780b9c484a4f77883c84f8",
+                "size": "218109706"
+            },
+            "cuda13": {
+                "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.3.1.0_cuda13-archive.zip",
+                "sha256": "8f933694164e310183fffa9cf27d4db43b6edb0fff53b5aa0ab23e705807ac12",
+                "md5": "d4a958abf9ba2f10234364a37302e1ee",
+                "size": "150006958"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/default.nix b/pkgs/development/cuda-modules/_cuda/manifests/default.nix
new file mode 100644
index 000000000000..8f33ebbfb413
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/default.nix
@@ -0,0 +1,19 @@
+{ lib }:
+lib.mapAttrs (
+  redistName: _type:
+  let
+    redistManifestDir = ./. + "/${redistName}";
+  in
+  lib.concatMapAttrs (
+    fileName: _type:
+    let
+      # Manifests all end in .json and are named "redistrib_<version>.json".
+      version = lib.removePrefix "redistrib_" (lib.removeSuffix ".json" fileName);
+    in
+    # NOTE: We do not require that all files have this pattern, as manifest directories may contain documentation
+    # and utility functions we should ignore.
+    lib.optionalAttrs (version != fileName) {
+      "${version}" = lib.importJSON (redistManifestDir + "/${fileName}");
+    }
+  ) (builtins.readDir redistManifestDir)
+) (builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ])
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md
new file mode 100644
index 000000000000..15ca836ce534
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md
@@ -0,0 +1,5 @@
+# nppplus
+
+Link: <https://developer.download.nvidia.com/compute/nppplus/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nppplus/>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json
new file mode 100644
index 000000000000..84c8b1a0d70d
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json
@@ -0,0 +1,71 @@
+{
+    "release_date": "2025-04-18",
+    "release_label": "0.10.0",
+    "release_product": "nppplus",
+    "libnpp_plus": {
+        "name": "NVIDIA NPP PLUS library",
+        "license": "NPP PLUS library",
+        "license_path": "libnpp_plus/LICENSE.txt",
+        "version": "0.10.0.0",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/linux-x86_64/libnpp_plus-linux-x86_64-0.10.0.0_cuda11-archive.tar.xz",
+                "sha256": "dfd0995068504ab9cd14767036680222f73d01a0e38ab9a53f9968d53f9745f7",
+                "md5": "210b430b3b047956a43564f6102664a1",
+                "size": "365025464"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/linux-x86_64/libnpp_plus-linux-x86_64-0.10.0.0_cuda12-archive.tar.xz",
+                "sha256": "0a2f1138b941160863eb1ec75a9f5072b330b234c287504bc5ca06130c5342b9",
+                "md5": "71c7a351c31df634bb9c504ff8d3f9c1",
+                "size": "365024708"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/linux-sbsa/libnpp_plus-linux-sbsa-0.10.0.0_cuda11-archive.tar.xz",
+                "sha256": "108a3126d07c7e4ce5ad0c85a9076bed6c2abeeec66b4c23a35d30d45ecf9110",
+                "md5": "461dbe9d9dbdf1ed68b688634a3aaafa",
+                "size": "363897792"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/linux-sbsa/libnpp_plus-linux-sbsa-0.10.0.0_cuda12-archive.tar.xz",
+                "sha256": "7aab2e7cab1fade883463bdb85a240f66d956395e3a90ca78b5bf413fa9a2fd9",
+                "md5": "f0b042171c6c0290a9afaf1a5766994b",
+                "size": "363891396"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/windows-x86_64/libnpp_plus-windows-x86_64-0.10.0.0_cuda11-archive.zip",
+                "sha256": "333b9181526d8421b3445bc1c2b50ea8a0a8dd06412bf1c5dce3ed760659ec73",
+                "md5": "13d9f5a50932e3c457fec8f38e0b914b",
+                "size": "310918881"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/windows-x86_64/libnpp_plus-windows-x86_64-0.10.0.0_cuda12-archive.zip",
+                "sha256": "55f352478ce111187e2a1a2944f95eff009e156fc16793786f36ed6ed6e334d6",
+                "md5": "5142a28d82bc8470d7a7eea698b10f56",
+                "size": "310918881"
+            }
+        },
+        "linux-aarch64": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/linux-aarch64/libnpp_plus-linux-aarch64-0.10.0.0_cuda11-archive.tar.xz",
+                "sha256": "fa09d1306eadd304913fa7e9904790e00c8acb05bdddd9832b2681d591449ecf",
+                "md5": "0263b51a2cf5ca3b23464dfe5a688044",
+                "size": "114297704"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/linux-aarch64/libnpp_plus-linux-aarch64-0.10.0.0_cuda12-archive.tar.xz",
+                "sha256": "570c4e0c871f9dd0a3e5959c1d144a53b232e8308b7d7f4d496df705f9aa2269",
+                "md5": "44b1e1f7d5671aa08276bcabbe1cc458",
+                "size": "114297660"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md
new file mode 100644
index 000000000000..51bf4844fe93
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md
@@ -0,0 +1,5 @@
+# nvcomp
+
+Link: <https://developer.download.nvidia.com/compute/nvcomp/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nvcomp/installation.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json
new file mode 100644
index 000000000000..d5976c02450a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json
@@ -0,0 +1,76 @@
+{
+    "release_date": "2025-08-04",
+    "release_label": "5.0.0.6",
+    "release_product": "nvcomp",
+    "nvcomp": {
+        "name": "NVIDIA nvCOMP library",
+        "license": "nvCOMP library",
+        "license_path": "nvcomp/LICENSE.txt",
+        "version": "5.0.0.6",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "nvcomp/linux-x86_64/nvcomp-linux-x86_64-5.0.0.6_cuda11-archive.tar.xz",
+                "sha256": "64f5f7cc622f36006c503ee5a3f9d730b5c6cc49e4fab0fc0507c1272d5efa7b",
+                "md5": "e7fcc75a1ed5c056211948c896dccf62",
+                "size": "21128508"
+            },
+            "cuda12": {
+                "relative_path": "nvcomp/linux-x86_64/nvcomp-linux-x86_64-5.0.0.6_cuda12-archive.tar.xz",
+                "sha256": "40ac1d5f8c0a2719f11b21a4d31b6050343607dffd1401d1fe9a154800b56e46",
+                "md5": "58436c6eb41b7a317ddf9131bfe7f92b",
+                "size": "40211608"
+            },
+            "cuda13": {
+                "relative_path": "nvcomp/linux-x86_64/nvcomp-linux-x86_64-5.0.0.6_cuda13-archive.tar.xz",
+                "sha256": "4166e7c3825fa90139d50042154438ba06ea493985aeb7968fc1ad0d5fa5a22a",
+                "md5": "abb06ec210645ce491d66fdf26f89a35",
+                "size": "37072544"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "nvcomp/linux-sbsa/nvcomp-linux-sbsa-5.0.0.6_cuda11-archive.tar.xz",
+                "sha256": "e98a20570e56ad94709c5014960c9f1fa9b4b5a7eb132dede85dd8ffd6c5f3f8",
+                "md5": "d80c48f270668e50e61e718b13643080",
+                "size": "21312128"
+            },
+            "cuda12": {
+                "relative_path": "nvcomp/linux-sbsa/nvcomp-linux-sbsa-5.0.0.6_cuda12-archive.tar.xz",
+                "sha256": "e57e658e35f6b266399ca2286e9439e5e9c9f3db907a718c55a07e6338b1c5bf",
+                "md5": "a32f79f2cef263a7b304d681a3076af5",
+                "size": "40157632"
+            },
+            "cuda13": {
+                "relative_path": "nvcomp/linux-sbsa/nvcomp-linux-sbsa-5.0.0.6_cuda13-archive.tar.xz",
+                "sha256": "26f6189f302affba7a3df726164a809aa7a5118560283627bbaa9aaa860cbc96",
+                "md5": "57c04016e2506a63947e5ccedb3a0be3",
+                "size": "37327100"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "nvcomp/windows-x86_64/nvcomp-windows-x86_64-5.0.0.6_cuda11-archive.zip",
+                "sha256": "5c2e1ee55398f47d28806eb7c53aca33b9e22d6d5b3acec86bbc4253c7e6d1d3",
+                "md5": "40e5c7250ad930aeb1e34d5e01f3ada1",
+                "size": "38916070"
+            },
+            "cuda12": {
+                "relative_path": "nvcomp/windows-x86_64/nvcomp-windows-x86_64-5.0.0.6_cuda12-archive.zip",
+                "sha256": "d851077cf6ebaea21a548c4e55db45f0dd45271e35e7cffda7dd9917603ab8d4",
+                "md5": "da94be1539cf0f709bf9cd2b6881ebd1",
+                "size": "61092352"
+            },
+            "cuda13": {
+                "relative_path": "nvcomp/windows-x86_64/nvcomp-windows-x86_64-5.0.0.6_cuda13-archive.zip",
+                "sha256": "d7d1397a438f6d16dbe9989a72ffcf9e7935f17c836316dd98403929c09c585a",
+                "md5": "b3195c7bbe9775a9ddcaea1c1f43664e",
+                "size": "43017930"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md
new file mode 100644
index 000000000000..5e5a9300ff9a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md
@@ -0,0 +1,5 @@
+# nvjpeg2000
+
+Link: <https://developer.download.nvidia.com/compute/nvjpeg2000/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nvjpeg2000/userguide.html#platforms-supported>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json
new file mode 100644
index 000000000000..a611460cba67
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json
@@ -0,0 +1,35 @@
+{
+    "release_date": "2025-08-05",
+    "release_label": "0.9.0",
+    "release_product": "nvjpeg2000",
+    "libnvjpeg_2k": {
+        "name": "NVIDIA nvJPEG 2000",
+        "license": "nvJPEG 2K",
+        "license_path": "libnvjpeg_2k/LICENSE.txt",
+        "version": "0.9.0.43",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg_2k/linux-x86_64/libnvjpeg_2k-linux-x86_64-0.9.0.43-archive.tar.xz",
+            "sha256": "1d26f62a7141e81c604342a610deb8ad8d10e1c08cb59598881dc201e59f21a3",
+            "md5": "88e231d23f60bfc0effc871ccf465b3a",
+            "size": "15407304"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg_2k/linux-sbsa/libnvjpeg_2k-linux-sbsa-0.9.0.43-archive.tar.xz",
+            "sha256": "03e37b8e0f2d67a1ee376e6ac54fa9d62284bbdbf9edf90ea7d0a05b4c45bce1",
+            "md5": "1b6b06ec71a67e1a70b15e379cd8c9ca",
+            "size": "15432332"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg_2k/windows-x86_64/libnvjpeg_2k-windows-x86_64-0.9.0.43-archive.zip",
+            "sha256": "272d409945cd1c00beaa7f5d4c8197139aa32394358ea76d83f2cd2b51faf0c7",
+            "md5": "6828d19ce79b943705e22d5cd4dbe6c4",
+            "size": "14206962"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvjpeg_2k/linux-aarch64/libnvjpeg_2k-linux-aarch64-0.9.0.43-archive.tar.xz",
+            "sha256": "b2285c1da026bd189e837800da2a26cb75ce45ccb23ea7e6ee65114b3dcee66c",
+            "md5": "608ef4eb15da8fda26b5b649c340855d",
+            "size": "5384888"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md
new file mode 100644
index 000000000000..1a338d1c2461
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md
@@ -0,0 +1,5 @@
+# nvpl
+
+Link: <https://developer.download.nvidia.com/compute/nvpl/redist/>
+
+Requirements: <https://docs.nvidia.com/nvpl/latest/introduction.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json
new file mode 100644
index 000000000000..d7739f946a1c
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json
@@ -0,0 +1,101 @@
+{
+    "release_date": "2025-05-28",
+    "release_label": "25.5",
+    "release_product": "nvpl",
+    "nvpl_blas": {
+        "name": "NVPL BLAS",
+        "license": "NVPL",
+        "license_path": "nvpl_blas/LICENSE.txt",
+        "version": "0.4.1.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_blas/linux-sbsa/nvpl_blas-linux-sbsa-0.4.1.1-archive.tar.xz",
+            "sha256": "57704e2e211999c899bca26346b946b881b609554914245131b390410f7b93e8",
+            "md5": "9e2a95925dcb4bbe0ac337550f317272",
+            "size": "773716"
+        }
+    },
+    "nvpl_common": {
+        "name": "NVPL Common",
+        "license": "NVPL",
+        "license_path": "nvpl_common/LICENSE.txt",
+        "version": "0.3.3",
+        "linux-sbsa": {
+            "relative_path": "nvpl_common/linux-sbsa/nvpl_common-linux-sbsa-0.3.3-archive.tar.xz",
+            "sha256": "fe87ccd63817427c6c9b9e292447a4e8f256b9c9157065fba1a338719fa433c8",
+            "md5": "9ae9f3253461a0565bc3c01a07c50fe3",
+            "size": "9444"
+        }
+    },
+    "nvpl_fft": {
+        "name": "NVPL FFT",
+        "license": "NVPL",
+        "license_path": "nvpl_fft/LICENSE.txt",
+        "version": "0.4.2.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_fft/linux-sbsa/nvpl_fft-linux-sbsa-0.4.2.1-archive.tar.xz",
+            "sha256": "ebb9d98abc23ddee5c492e0bbf2c534570a38d7df1863a0630da2c6d7f5cca3d",
+            "md5": "211ec34eef6b023f7af8e1fc40ae4ad1",
+            "size": "24974464"
+        }
+    },
+    "nvpl_lapack": {
+        "name": "NVPL LAPACK",
+        "license": "NVPL",
+        "license_path": "nvpl_lapack/LICENSE.txt",
+        "version": "0.3.1.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_lapack/linux-sbsa/nvpl_lapack-linux-sbsa-0.3.1.1-archive.tar.xz",
+            "sha256": "f5b916aa36a8549946fc2262acebb082fe8c463bd1523a3c0cc2c93527231653",
+            "md5": "ec0616b0be4616ac7050807a872343a2",
+            "size": "4781368"
+        }
+    },
+    "nvpl_rand": {
+        "name": "NVPL RAND",
+        "license": "NVPL",
+        "license_path": "nvpl_rand/LICENSE.txt",
+        "version": "0.5.2",
+        "linux-sbsa": {
+            "relative_path": "nvpl_rand/linux-sbsa/nvpl_rand-linux-sbsa-0.5.2-archive.tar.xz",
+            "sha256": "1eb5c2a5e98390b2bc76c3218837916df64d33cce220169811e14ecead36933f",
+            "md5": "fe72dcf4600cbd85f7249e95ebbcd363",
+            "size": "34025772"
+        }
+    },
+    "nvpl_scalapack": {
+        "name": "NVPL SCALAPACK",
+        "license": "NVPL",
+        "license_path": "nvpl_scalapack/LICENSE.txt",
+        "version": "0.2.2",
+        "linux-sbsa": {
+            "relative_path": "nvpl_scalapack/linux-sbsa/nvpl_scalapack-linux-sbsa-0.2.2-archive.tar.xz",
+            "sha256": "20cf6c54a0352f2fb0060e6f5ef6b892c5d07a242f8aab31cd9bbceb58a7bd11",
+            "md5": "8e3e728e8587cc4698beb2ab7ce162d6",
+            "size": "4647440"
+        }
+    },
+    "nvpl_sparse": {
+        "name": "NVPL SPARSE",
+        "license": "NVPL",
+        "license_path": "nvpl_sparse/LICENSE.txt",
+        "version": "0.4.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_sparse/linux-sbsa/nvpl_sparse-linux-sbsa-0.4.1-archive.tar.xz",
+            "sha256": "fda868fe6619e94463a93efed1958e67588c607c170a4c658103a24295855e19",
+            "md5": "851080b3e56db9bf6fa37cea198bcb33",
+            "size": "556932"
+        }
+    },
+    "nvpl_tensor": {
+        "name": "NVPL TENSOR",
+        "license": "NVPL",
+        "license_path": "nvpl_tensor/LICENSE.txt",
+        "version": "0.3.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_tensor/linux-sbsa/nvpl_tensor-linux-sbsa-0.3.1-archive.tar.xz",
+            "sha256": "12e9293609b3726cf9e92c648f117412a98a5e54700c877518ec2991e51ab50f",
+            "md5": "613b9a05d867667deae31bfea26688e8",
+            "size": "2338804"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md
new file mode 100644
index 000000000000..cda290cb2c4d
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md
@@ -0,0 +1,5 @@
+# nvtiff
+
+Link: <https://developer.download.nvidia.com/compute/nvtiff/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nvtiff/releasenotes.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json
new file mode 100644
index 000000000000..03e84ce292d4
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json
@@ -0,0 +1,96 @@
+{
+    "release_date": "2025-08-05",
+    "release_label": "0.5.1",
+    "release_product": "nvtiff",
+    "libnvtiff": {
+        "name": "NVIDIA nvTIFF",
+        "license": "nvTIFF",
+        "license_path": "libnvtiff/LICENSE.txt",
+        "version": "0.5.1.75",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda11-archive.tar.xz",
+                "sha256": "5adabfe9c4eac59916bfc464b7325866da99752ade30bbc3ddd3cd9c852f69e7",
+                "md5": "93e04a669a8dd4ff696950bac5e77e7d",
+                "size": "1332668"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda12-archive.tar.xz",
+                "sha256": "1f97778f92c938f5174fda74a913370d4ff200d77809570cecdafcd8aaff84b6",
+                "md5": "1c8508be2791abbd5d78f059bbc3a2be",
+                "size": "1922764"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda13-archive.tar.xz",
+                "sha256": "5d63be4128daf28676ae01a81d2e69f828d2e7eda332c039079ff57b42915d20",
+                "md5": "0aa016e6e9d70866dae1367ee5d8731a",
+                "size": "1498124"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-0.5.1.75_cuda11-archive.tar.xz",
+                "sha256": "9274e74f58c2d85d13089ba3be3e3464c2cb34d2332c9f7a96ec42765bf2b034",
+                "md5": "e174a596cf84862ca903f79a2db356c2",
+                "size": "1236416"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-0.5.1.75_cuda12-archive.tar.xz",
+                "sha256": "d20309617df0bca6b373dfa33bac99703993a0e3759af70d2691d3b829df4d33",
+                "md5": "1a25761b4bfeb2ff7016114701d132b6",
+                "size": "1829060"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-0.5.1.75_cuda13-archive.tar.xz",
+                "sha256": "415c507443c026db501bd58d49428d6378f7d5e02e371f8f05d9cbe421565a90",
+                "md5": "6fb9797d1cef94e17c0ed8c82e9b8bc8",
+                "size": "1559296"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "libnvtiff/windows-x86_64/libnvtiff-windows-x86_64-0.5.1.75_cuda11-archive.zip",
+                "sha256": "c140fb7c0cb40c8796cdc7f3cf604a7fbb85e5b6e0e3315d9c269cfa19caa46a",
+                "md5": "1747419ee8df0434010a89014757065d",
+                "size": "1157130"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/windows-x86_64/libnvtiff-windows-x86_64-0.5.1.75_cuda12-archive.zip",
+                "sha256": "a3db5d37c61845d97aa5f1c1a93f9885239741c169a4c577f1f93293dd139a0d",
+                "md5": "861f76739d7632b9ccf60f9bde2c2b36",
+                "size": "1805927"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/windows-x86_64/libnvtiff-windows-x86_64-0.5.1.75_cuda13-archive.zip",
+                "sha256": "0e75603c23eed4df4d04d8ddd08bc106df9a4423596f32d238fbf7bb623280b1",
+                "md5": "83c07811a9ebcc9aaa3e8d296f018f4a",
+                "size": "1178242"
+            }
+        },
+        "linux-aarch64": {
+            "cuda11": {
+                "relative_path": "libnvtiff/linux-aarch64/libnvtiff-linux-aarch64-0.5.1.75_cuda11-archive.tar.xz",
+                "sha256": "ef8f2f8472959be63e895997c0b13892db4e3c6bf3d06a4752c8e9292531c55a",
+                "md5": "ee0034f50b9c348ce64c7358ebc16ea5",
+                "size": "979744"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/linux-aarch64/libnvtiff-linux-aarch64-0.5.1.75_cuda12-archive.tar.xz",
+                "sha256": "7d37821154aca7846695ccf12369eeb8c0f263d58b6dfb43e23bd12f4c114ef0",
+                "md5": "0491eaec9a956a42a4450b546cc113d4",
+                "size": "1279516"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/linux-aarch64/libnvtiff-linux-aarch64-0.5.1.75_cuda13-archive.tar.xz",
+                "sha256": "8d1b07af6d8b68776d6a6533b4c33134af01d5cb6a0d9c5bcc7a866559de600a",
+                "md5": "94e8fbcbeca5b26e177b3c9c71f18214",
+                "size": "1104224"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
new file mode 100644
index 000000000000..4710f1ff0a39
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
@@ -0,0 +1,30 @@
+# tensorrt
+
+Requirements: <https://docs.nvidia.com/deeplearning/tensorrt/latest/getting-started/support-matrix.html#support-matrix>
+
+These redistributable manifests are made by hand to allow TensorRT to be packaged with the same functionality the other NVIDIA redistributable libraries are packaged with.
+
+Only available from 10.0.0 and onwards, which is when NVIDIA stopped putting them behind a login wall.
+
+You can find them at: <https://github.com/NVIDIA/TensorRT?tab=readme-ov-file#optional---if-not-using-tensorrt-container-specify-the-tensorrt-ga-release-build-path>.
+
+Construct entries using the provider `helper.bash` script.
+
+As an example:
+
+```console
+$ ./tensorrt/helper.bash 12.5 10.2.0.19 windows-x86_64
+main: storePath: /nix/store/l2hq83ihj3bcm4z836cz2dw3ilkhwrpy-TensorRT-10.2.0.19.Windows.win10.cuda-12.5.zip
+{
+  "windows-x86_64": {
+    "cuda12": {
+      "md5": "70282ec501c9e395a3ffdd0d2baf9d95",
+      "relative_path": "tensorrt/10.2.0/zip/TensorRT-10.2.0.19.Windows.win10.cuda-12.5.zip",
+      "sha256": "4a9c6e279fd36559551a6d88e37d835db5ebdc950246160257b0b538960e57fa",
+      "size": "1281366141"
+    }
+  }
+}
+```
+
+I set the `release_date` to the date of the corresponding release on their GitHub: <https://github.com/NVIDIA/TensorRT/releases>.
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.bash b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.bash
new file mode 100755
index 000000000000..b6ee9355e976
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.bash
@@ -0,0 +1,131 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nix jq
+
+# shellcheck shell=bash
+
+set -euo pipefail
+
+mkRedistUrlRelativePath() {
+  local -r cudaMajorMinorVersion=${1:?}
+  local -r tensorrtMajorMinorPatchBuildVersion=${2:?}
+  local -r redistSystem=${3:?}
+
+  local -r tensorrtMajorMinorPatchVersion="$(echo "$tensorrtMajorMinorPatchBuildVersion" | cut -d. -f1-3)"
+  local -r tensorrtMinorVersion="$(echo "$tensorrtMajorMinorPatchVersion" | cut -d. -f2)"
+
+  local archiveDir=""
+  local archiveExtension=""
+  local osName=""
+  local platformName=""
+  case "$redistSystem" in
+  linux-aarch64) archiveDir="tars" && archiveExtension="tar.gz" && osName="l4t" && platformName="aarch64-gnu" ;;
+  linux-sbsa)
+    archiveDir="tars" && archiveExtension="tar.gz" && platformName="aarch64-gnu"
+    # 10.0-10.3 use Ubuntu 22.40
+    # 10.4-10.6 use Ubuntu 24.04
+    # 10.7+ use Linux
+    case "$tensorrtMinorVersion" in
+    0 | 1 | 2 | 3) osName="Ubuntu-22.04" ;;
+    4 | 5 | 6) osName="Ubuntu-24.04" ;;
+    *) osName="Linux" ;;
+    esac
+    ;;
+  linux-x86_64) archiveDir="tars" && archiveExtension="tar.gz" && osName="Linux" && platformName="x86_64-gnu" ;;
+  windows-x86_64)
+    archiveExtension="zip" && platformName="win10"
+    # Windows info is different for 10.0.*
+    case "$tensorrtMinorVersion" in
+    0) archiveDir="zips" && osName="Windows10" ;;
+    *) archiveDir="zip" && osName="Windows" ;;
+    esac
+    ;;
+  *)
+    echo "mkRedistUrlRelativePath: Unsupported redistSystem: $redistSystem" >&2
+    exit 1
+    ;;
+  esac
+
+  local -r relativePath="tensorrt/$tensorrtMajorMinorPatchVersion/$archiveDir/TensorRT-${tensorrtMajorMinorPatchBuildVersion}.${osName}.${platformName}.cuda-${cudaMajorMinorVersion}.${archiveExtension}"
+  echo "$relativePath"
+}
+
+getNixStorePath() {
+  local -r relativePath=${1:?}
+  local -r jsonBlob="$(nix store prefetch-file --json "https://developer.nvidia.com/downloads/compute/machine-learning/$relativePath")"
+  if [[ -z $jsonBlob ]]; then
+    echo "getNixStorePath: Failed to fetch jsonBlob for relativePath: $relativePath" >&2
+    exit 1
+  fi
+  local -r storePath="$(echo "$jsonBlob" | jq -cr '.storePath')"
+  echo "$storePath"
+}
+
+printOutput() {
+  local -r cudaMajorMinorVersion=${1:?}
+  local -r redistSystem=${2:?}
+  local -r md5Hash=${3:?}
+  local -r relativePath=${4:?}
+  local -r sha256Hash=${5:?}
+  local -r size=${6:?}
+
+  local -r cudaVariant="cuda$(echo "$cudaMajorMinorVersion" | cut -d. -f1)"
+
+  # Echo everything to stdout using JQ to format the output as JSON
+  jq \
+    --raw-output \
+    --sort-keys \
+    --null-input \
+    --arg redistSystem "$redistSystem" \
+    --arg cudaVariant "$cudaVariant" \
+    --arg md5Hash "$md5Hash" \
+    --arg relativePath "$relativePath" \
+    --arg sha256Hash "$sha256Hash" \
+    --arg size "$size" \
+    '{
+      $redistSystem: {
+        $cudaVariant: {
+          md5: $md5Hash,
+          relative_path: $relativePath,
+          sha256: $sha256Hash,
+          size: $size
+        }
+      }
+    }'
+}
+
+main() {
+  local -r cudaMajorMinorVersion=${1:?}
+  if [[ ! $cudaMajorMinorVersion =~ ^[0-9]+\.[0-9]+$ ]]; then
+    echo "main: Invalid cudaMajorMinorVersion: $cudaMajorMinorVersion" >&2
+    exit 1
+  fi
+
+  local -r tensorrtMajorMinorPatchBuildVersion=${2:?}
+  if [[ ! $tensorrtMajorMinorPatchBuildVersion =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    echo "main: Invalid tensorrtMajorMinorPatchBuildVersion: $tensorrtMajorMinorPatchBuildVersion" >&2
+    exit 1
+  fi
+
+  local -r redistSystem=${3:?}
+  case "$redistSystem" in
+  linux-aarch64) ;;
+  linux-sbsa) ;;
+  linux-x86_64) ;;
+  windows-x86_64) ;;
+  *)
+    echo "main: Unsupported redistSystem: $redistSystem" >&2
+    exit 1
+    ;;
+  esac
+
+  local -r relativePath="$(mkRedistUrlRelativePath "$cudaMajorMinorVersion" "$tensorrtMajorMinorPatchBuildVersion" "$redistSystem")"
+  local -r storePath="$(getNixStorePath "$relativePath")"
+  echo "main: storePath: $storePath" >&2
+  local -r md5Hash="$(nix hash file --type md5 --base16 "$storePath")"
+  local -r sha256Hash="$(nix hash file --type sha256 --base16 "$storePath")"
+  local -r size="$(du -b "$storePath" | cut -f1)"
+
+  printOutput "$cudaMajorMinorVersion" "$redistSystem" "$md5Hash" "$relativePath" "$sha256Hash" "$size"
+}
+
+main "$@"
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json
new file mode 100644
index 000000000000..58c70ca39332
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json
@@ -0,0 +1,37 @@
+{
+    "release_date": "2024-12-02",
+    "release_label": "10.7.0",
+    "release_product": "tensorrt",
+    "tensorrt": {
+        "name": "NVIDIA TensorRT",
+        "license": "TensorRT",
+        "version": "10.7.0.23",
+        "cuda_variant": [
+            "12"
+        ],
+        "linux-aarch64": {
+            "cuda12": {
+                "md5": "ec486c783455bf31a2561f2b7874585e",
+                "relative_path": "tensorrt/10.7.0/tars/TensorRT-10.7.0.23.l4t.aarch64-gnu.cuda-12.6.tar.gz",
+                "sha256": "b3028a82818a9daf6296f43d0cdecfa51eaea4552ffb6fe6fad5e6e1aea44da6",
+                "size": "655777784"
+            }
+        },
+        "linux-sbsa": {
+            "cuda12": {
+                "md5": "5b49557b4dc47641242a2bfb29e1cff1",
+                "relative_path": "tensorrt/10.7.0/tars/TensorRT-10.7.0.23.Linux.aarch64-gnu.cuda-12.6.tar.gz",
+                "sha256": "6b304cf014f2977e845bd44fdb343f0e7af2d9cded997bc9cfea3949d9e84dcb",
+                "size": "2469927296"
+            }
+        },
+        "linux-x86_64": {
+            "cuda12": {
+                "md5": "925c98fbe9abe82058814159727732a2",
+                "relative_path": "tensorrt/10.7.0/tars/TensorRT-10.7.0.23.Linux.x86_64-gnu.cuda-12.6.tar.gz",
+                "sha256": "d7f16520457caaf97ad8a7e94d802f89d77aedf9f361a255f2c216e2a3a40a11",
+                "size": "4446480887"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json
new file mode 100644
index 000000000000..083119406e07
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json
@@ -0,0 +1,29 @@
+{
+    "release_date": "2025-03-11",
+    "release_label": "10.9.0",
+    "release_product": "tensorrt",
+    "tensorrt": {
+        "name": "NVIDIA TensorRT",
+        "license": "TensorRT",
+        "version": "10.9.0.34",
+        "cuda_variant": [
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "md5": "e56a9f9d7327c65d9b95996d3008ed44",
+                "relative_path": "tensorrt/10.9.0/tars/TensorRT-10.9.0.34.Linux.aarch64-gnu.cuda-12.8.tar.gz",
+                "sha256": "b81ec2a067f67f082c13caec2dcef54385b42a9de6a4ecae6f318aa2d41964f2",
+                "size": "4123115318"
+            }
+        },
+        "linux-x86_64": {
+            "cuda12": {
+                "md5": "ee49e3e6e00b21274907956216b6769f",
+                "relative_path": "tensorrt/10.9.0/tars/TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-12.8.tar.gz",
+                "sha256": "33be0e61e3bf177bbbcabb4892bf013f0c8ac71d2be73f2803848a382cb14272",
+                "size": "6917032417"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 9f73d75d8d2d..73c0f6ed83a1 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -9,20 +9,4 @@ in
 final: _:
 builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
-
-  cudaFlags = {
-    path = "cudaPackages.flags";
-    package = final.flags;
-  };
-
-  cudaVersion = {
-    path = "cudaPackages.cudaMajorMinorVersion";
-    package = final.cudaMajorMinorVersion;
-  };
-
-  cudatoolkit-legacy-runfile = {
-    path = "cudaPackages.cudatoolkit";
-    package = final.cudatoolkit;
-  };
-
 }
diff --git a/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash b/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash
new file mode 100644
index 000000000000..6ca8f3d19dcc
--- /dev/null
+++ b/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash
@@ -0,0 +1,174 @@
+# shellcheck shell=bash
+
+if [[ -n ${strictDeps:-} && ${hostOffset:-0} -ne -1 ]]; then
+  nixLog "skipping sourcing buildRedistHook.bash (hostOffset=${hostOffset:-0}) (targetOffset=${targetOffset:-0})"
+  return 0
+fi
+nixLog "sourcing buildRedistHook.bash (hostOffset=${hostOffset:-0}) (targetOffset=${targetOffset:-0})"
+
+buildRedistHookRegistration() {
+  postUnpackHooks+=(unpackCudaLibSubdir)
+  nixLog "added unpackCudaLibSubdir to postUnpackHooks"
+
+  postUnpackHooks+=(unpackCudaPkgConfigDirs)
+  nixLog "added unpackCudaPkgConfigDirs to postUnpackHooks"
+
+  prePatchHooks+=(patchCudaPkgConfig)
+  nixLog "added patchCudaPkgConfig to prePatchHooks"
+
+  if [[ -z ${allowFHSReferences-} ]]; then
+    postInstallCheckHooks+=(checkCudaFhsRefs)
+    nixLog "added checkCudaFhsRefs to postInstallCheckHooks"
+  fi
+
+  postInstallCheckHooks+=(checkCudaNonEmptyOutputs)
+  nixLog "added checkCudaNonEmptyOutputs to postInstallCheckHooks"
+
+  preFixupHooks+=(fixupPropagatedBuildOutputsForMultipleOutputs)
+  nixLog "added fixupPropagatedBuildOutputsForMultipleOutputs to preFixupHooks"
+
+  postFixupHooks+=(fixupCudaPropagatedBuildOutputsToOut)
+  nixLog "added fixupCudaPropagatedBuildOutputsToOut to postFixupHooks"
+}
+
+buildRedistHookRegistration
+
+unpackCudaLibSubdir() {
+  local -r cudaLibDir="${NIX_BUILD_TOP:?}/${sourceRoot:?}/lib"
+  local -r versionedCudaLibDir="$cudaLibDir/${cudaMajorVersion:?}"
+
+  if [[ ! -d $versionedCudaLibDir ]]; then
+    return 0
+  fi
+
+  nixLog "found versioned CUDA lib dir: $versionedCudaLibDir"
+
+  mv \
+    --verbose \
+    --no-clobber \
+    "$versionedCudaLibDir" \
+    "${cudaLibDir}-new"
+  rm --verbose --recursive "$cudaLibDir" || {
+    nixErrorLog "could not delete $cudaLibDir: $(ls -laR "$cudaLibDir")"
+    exit 1
+  }
+  mv \
+    --verbose \
+    --no-clobber \
+    "${cudaLibDir}-new" \
+    "$cudaLibDir"
+
+  return 0
+}
+
+# Pkg-config's setup hook expects configuration files in $out/share/pkgconfig
+unpackCudaPkgConfigDirs() {
+  local path
+  local -r pkgConfigDir="${NIX_BUILD_TOP:?}/${sourceRoot:?}/share/pkgconfig"
+
+  for path in "${NIX_BUILD_TOP:?}/${sourceRoot:?}"/{pkg-config,pkgconfig}; do
+    [[ -d $path ]] || continue
+    mkdir -p "$pkgConfigDir"
+    mv \
+      --verbose \
+      --no-clobber \
+      --target-directory "$pkgConfigDir" \
+      "$path"/*
+    rm --recursive --dir "$path" || {
+      nixErrorLog "$path contains non-empty directories: $(ls -laR "$path")"
+      exit 1
+    }
+  done
+
+  return 0
+}
+
+patchCudaPkgConfig() {
+  local pc
+
+  for pc in "${NIX_BUILD_TOP:?}/${sourceRoot:?}"/share/pkgconfig/*.pc; do
+    nixLog "patching $pc"
+    sed -i \
+      -e "s|^cudaroot\s*=.*\$|cudaroot=${!outputDev:?}|" \
+      -e "s|^libdir\s*=.*/lib\$|libdir=${!outputLib:?}/lib|" \
+      -e "s|^includedir\s*=.*/include\$|includedir=${!outputInclude:?}/include|" \
+      "$pc"
+  done
+
+  for pc in "${NIX_BUILD_TOP:?}/${sourceRoot:?}"/share/pkgconfig/*-"${cudaMajorMinorVersion:?}.pc"; do
+    nixLog "creating unversioned symlink for $pc"
+    ln -s "$(basename "$pc")" "${pc%-"${cudaMajorMinorVersion:?}".pc}".pc
+  done
+
+  return 0
+}
+
+checkCudaFhsRefs() {
+  nixLog "checking for FHS references..."
+  local -a outputPaths=()
+  local firstMatches
+
+  mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
+  firstMatches="$(grep --max-count=5 --recursive --exclude=LICENSE /usr/ "${outputPaths[@]}")" || true
+  if [[ -n $firstMatches ]]; then
+    nixErrorLog "detected references to /usr: $firstMatches"
+    exit 1
+  fi
+
+  return 0
+}
+
+checkCudaNonEmptyOutputs() {
+  local output
+  local dirs
+  local -a failingOutputs=()
+
+  for output in $(getAllOutputNames); do
+    [[ ${!output:?} == "out" || ${!output:?} == "${!outputDev:?}" ]] && continue
+    dirs="$(find "${!output:?}" -mindepth 1 -maxdepth 1)" || true
+    if [[ -z $dirs || $dirs == "${!output:?}/nix-support" ]]; then
+      failingOutputs+=("$output")
+    fi
+  done
+
+  if ((${#failingOutputs[@]})); then
+    nixErrorLog "detected empty (excluding nix-support) outputs: ${failingOutputs[*]}"
+    nixErrorLog "this typically indicates a failure in packaging or moveToOutput ordering"
+    exit 1
+  fi
+
+  return 0
+}
+
+# TODO(@connorbaker): https://github.com/NixOS/nixpkgs/issues/323126.
+# _multioutPropagateDev() currently expects a space-separated string rather than an array.
+# NOTE: Because _multioutPropagateDev is a postFixup hook, we correct it in preFixup.
+fixupPropagatedBuildOutputsForMultipleOutputs() {
+  nixLog "converting propagatedBuildOutputs to a space-separated string"
+  # shellcheck disable=SC2124
+  export propagatedBuildOutputs="${propagatedBuildOutputs[@]}"
+  return 0
+}
+
+# The multiple outputs setup hook only propagates build outputs to dev.
+# We want to propagate them to out as well, in case the user interpolates
+# the package into a string -- in such a case, the dev output is not selected
+# and no propagation occurs.
+# NOTE: This must run in postFixup because fixupPhase nukes the propagated dependency files.
+fixupCudaPropagatedBuildOutputsToOut() {
+  local output
+
+  # The `out` output should largely be empty save for nix-support/propagated-build-inputs.
+  # In effect, this allows us to make `out` depend on all the other components.
+  # NOTE: It may have been deleted if it was empty, which is why we must recreate it.
+  mkdir -p "${out:?}/nix-support"
+
+  # NOTE: We must use printWords to ensure the output is a single line.
+  for output in $propagatedBuildOutputs; do
+    # Propagate the other components to the out output
+    nixLog "adding ${!output:?} to propagatedBuildInputs of ${out:?}"
+    printWords "${!output:?}" >>"${out:?}/nix-support/propagated-build-inputs"
+  done
+
+  return 0
+}
diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
new file mode 100644
index 000000000000..3cf532859a32
--- /dev/null
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -0,0 +1,474 @@
+# NOTE: buildRedist should never take manifests or fixups as callPackage-provided arguments,
+# since we want to provide the flexibility to call it directly with a different fixup or manifest.
+{
+  _cuda,
+  autoAddCudaCompatRunpath,
+  autoAddDriverRunpath,
+  autoPatchelfHook,
+  backendStdenv,
+  config,
+  cudaMajorMinorVersion,
+  cudaMajorVersion,
+  cudaNamePrefix,
+  fetchurl,
+  lib,
+  manifests,
+  markForCudatoolkitRootHook,
+  setupCudaHook,
+  srcOnly,
+  stdenv,
+  stdenvNoCC,
+}:
+let
+  inherit (backendStdenv) hostRedistSystem;
+  inherit (_cuda.lib) getNixSystems _mkCudaVariant mkRedistUrl;
+  inherit (lib.attrsets)
+    foldlAttrs
+    hasAttr
+    isAttrs
+    attrNames
+    optionalAttrs
+    ;
+  inherit (lib.customisation) extendMkDerivation;
+  inherit (lib.lists)
+    naturalSort
+    concatMap
+    unique
+    ;
+  inherit (lib.trivial) mapNullable pipe;
+  inherit (_cuda.lib) _mkMetaBadPlatforms _mkMetaBroken _redistSystemIsSupported;
+  inherit (lib)
+    licenses
+    sourceTypes
+    teams
+    ;
+  inherit (lib.asserts) assertMsg;
+  inherit (lib.lists)
+    elem
+    findFirst
+    findFirstIndex
+    foldl'
+    intersectLists
+    map
+    subtractLists
+    tail
+    ;
+  inherit (lib.strings)
+    concatMapStringsSep
+    toUpper
+    stringLength
+    substring
+    ;
+  inherit (lib.trivial) flip;
+
+  mkOutputNameVar =
+    output:
+    assert assertMsg (output != "") "mkOutputNameVar: output name variable must not be empty";
+    "output" + toUpper (substring 0 1 output) + substring 1 (stringLength output - 1) output;
+
+  getSupportedReleases =
+    let
+      desiredCudaVariant = _mkCudaVariant cudaMajorVersion;
+    in
+    release:
+    # Always show preference to the "source", then "linux-all" redistSystem if they are available, as they are
+    # the most general.
+    if release ? source then
+      {
+        inherit (release) source;
+      }
+    else if release ? linux-all then
+      {
+        inherit (release) linux-all;
+      }
+    else
+      let
+        hasCudaVariants = release ? cuda_variant;
+      in
+      foldlAttrs (
+        acc: name: value:
+        acc
+        # If the value is an attribute, and when hasCudaVariants is true it has the relevant CUDA variant,
+        # then add it to the set.
+        // optionalAttrs (isAttrs value && (hasCudaVariants -> hasAttr desiredCudaVariant value)) {
+          ${name} = value.${desiredCudaVariant} or value;
+        }
+      ) { } release;
+
+  getPreferredRelease =
+    supportedReleases:
+    supportedReleases.source or supportedReleases.linux-all or supportedReleases.${hostRedistSystem}
+      or null;
+in
+extendMkDerivation {
+  constructDrv = backendStdenv.mkDerivation;
+  # These attributes are moved to passthru to avoid changing derivation hashes.
+  excludeDrvArgNames = [
+    # Core
+    "redistName"
+    "release"
+
+    # Misc
+    "brokenAssertions"
+    "platformAssertions"
+    "expectedOutputs"
+    "outputToPatterns"
+    "outputNameVarFallbacks"
+  ];
+  extendDrvArgs =
+    finalAttrs:
+    {
+      # Core
+      redistName,
+      pname,
+      release ? manifests.${finalAttrs.passthru.redistName}.${finalAttrs.pname} or null,
+
+      # Outputs
+      outputs ? [ "out" ],
+      propagatedBuildOutputs ? [ ],
+
+      # Inputs
+      nativeBuildInputs ? [ ],
+      propagatedBuildInputs ? [ ],
+      buildInputs ? [ ],
+
+      # Checking
+      doInstallCheck ? true,
+      allowFHSReferences ? false,
+
+      # Fixups
+      appendRunpaths ? [ ],
+
+      # Extra
+      passthru ? { },
+      meta ? { },
+
+      # Misc
+      brokenAssertions ? [ ],
+      platformAssertions ? [ ],
+
+      # Order is important here so we use a list.
+      expectedOutputs ? [
+        "out"
+        "doc"
+        "samples"
+        "python"
+        "bin"
+        "dev"
+        "include"
+        "lib"
+        "static"
+        "stubs"
+      ],
+
+      # Traversed in the order of the outputs speficied in outputs;
+      # entries are skipped if they don't exist in outputs.
+      # NOTE: The nil LSP gets angry if we do not parenthesize the default attrset.
+      outputToPatterns ? {
+        bin = [ "bin" ];
+        dev = [
+          "**/*.pc"
+          "**/*.cmake"
+        ];
+        include = [ "include" ];
+        lib = [
+          "lib"
+          "lib64"
+        ];
+        static = [ "**/*.a" ];
+        samples = [ "samples" ];
+        python = [ "**/*.whl" ];
+        stubs = [
+          "stubs"
+          "lib/stubs"
+        ];
+      },
+
+      # Defines a list of fallbacks for each potential output.
+      # The last fallback is the out output.
+      # Taken and modified from:
+      # https://github.com/NixOS/nixpkgs/blob/fe5e11faed6241aacf7220436088789287507494/pkgs/build-support/setup-hooks/multiple-outputs.sh#L45-L62
+      outputNameVarFallbacks ? {
+        outputBin = [ "bin" ];
+        outputDev = [ "dev" ];
+        outputDoc = [ "doc" ];
+        outputInclude = [
+          "include"
+          "dev"
+        ];
+        outputLib = [ "lib" ];
+        outputOut = [ "out" ];
+        outputPython = [ "python" ];
+        outputSamples = [ "samples" ];
+        outputStatic = [ "static" ];
+        outputStubs = [ "stubs" ];
+      },
+      ...
+    }:
+    {
+      __structuredAttrs = true;
+      strictDeps = true;
+
+      # NOTE: `release` may be null if a redistributable isn't available.
+      version = finalAttrs.passthru.release.version or "0-unsupported";
+
+      # Name should be prefixed by cudaNamePrefix to create more descriptive path names.
+      name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+
+      # We should only have the output `out` when `src` is null.
+      # lists.intersectLists iterates over the second list, checking if the elements are in the first list.
+      # As such, the order of the output is dictated by the order of the second list.
+      outputs =
+        if finalAttrs.src == null then
+          [ "out" ]
+        else
+          intersectLists outputs finalAttrs.passthru.expectedOutputs;
+
+      # NOTE: Because the `dev` output is special in Nixpkgs -- make-derivation.nix uses it as the default if
+      # it is present -- we must ensure that it brings in the expected dependencies. For us, this means that `dev`
+      # should include `bin`, `include`, and `lib` -- `static` is notably absent because it is quite large.
+      # We do not include `stubs`, as a number of packages contain stubs for libraries they already ship with!
+      # Only a few, like cuda_cudart, actually provide stubs for libraries we're missing.
+      # As such, these packages should override propagatedBuildOutputs to add `stubs`.
+      propagatedBuildOutputs =
+        intersectLists [
+          "bin"
+          "include"
+          "lib"
+        ] finalAttrs.outputs
+        ++ propagatedBuildOutputs;
+
+      # src :: null | Derivation
+      src = mapNullable (
+        { relative_path, sha256, ... }:
+        srcOnly {
+          __structuredAttrs = true;
+          strictDeps = true;
+          stdenv = stdenvNoCC;
+          inherit (finalAttrs) pname version;
+          src = fetchurl {
+            url = mkRedistUrl finalAttrs.passthru.redistName relative_path;
+            inherit sha256;
+          };
+        }
+      ) (getPreferredRelease finalAttrs.passthru.supportedReleases);
+
+      # Required for the hook.
+      inherit cudaMajorMinorVersion cudaMajorVersion;
+
+      # We do need some other phases, like configurePhase, so the multiple-output setup hook works.
+      dontBuild = true;
+
+      nativeBuildInputs = [
+        ./buildRedistHook.bash
+        autoPatchelfHook
+        # This hook will make sure libcuda can be found
+        # in typically /lib/opengl-driver by adding that
+        # directory to the rpath of all ELF binaries.
+        # Check e.g. with `patchelf --print-rpath path/to/my/binary
+        autoAddDriverRunpath
+        markForCudatoolkitRootHook
+      ]
+      # autoAddCudaCompatRunpath depends on cuda_compat and would cause
+      # infinite recursion if applied to `cuda_compat` itself (beside the fact
+      # that it doesn't make sense in the first place)
+      ++ lib.optionals (finalAttrs.pname != "cuda_compat" && autoAddCudaCompatRunpath.enableHook) [
+        # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
+        # See its documentation in ./setup-hooks/extension.nix.
+        autoAddCudaCompatRunpath
+      ]
+      ++ nativeBuildInputs;
+
+      buildInputs = [
+        # autoPatchelfHook will search for a libstdc++ and we're giving it
+        # one that is compatible with the rest of nixpkgs, even when
+        # nvcc forces us to use an older gcc
+        # NB: We don't actually know if this is the right thing to do
+        # NOTE: Not all packages actually need this, but it's easier to just add it than create overrides for nearly all
+        # of them.
+        (lib.getLib stdenv.cc.cc)
+      ]
+      ++ buildInputs;
+
+      # Picked up by autoPatchelf
+      # Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins
+      appendRunpaths = [ "$ORIGIN" ] ++ appendRunpaths;
+
+      # NOTE: We don't need to check for dev or doc, because those outputs are handled by
+      # the multiple-outputs setup hook.
+      # NOTE: moveToOutput operates on all outputs:
+      # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107
+      # NOTE: installPhase is not moved into the builder hook because we do a lot of Nix templating.
+      installPhase =
+        let
+          mkMoveToOutputCommand =
+            output:
+            let
+              template = pattern: ''
+                moveToOutput "${pattern}" "${"$" + output}"
+              '';
+              patterns = finalAttrs.passthru.outputToPatterns.${output} or [ ];
+            in
+            concatMapStringsSep "\n" template patterns;
+        in
+        # Pre-install hook
+        ''
+          runHook preInstall
+        ''
+        # Create the primary output, out, and move the other outputs into it.
+        + ''
+          mkdir -p "$out"
+          nixLog "moving tree to output out"
+          mv * "$out"
+        ''
+        # Move the outputs into their respective outputs.
+        + ''
+          ${concatMapStringsSep "\n" mkMoveToOutputCommand (tail finalAttrs.outputs)}
+        ''
+        # Post-install hook
+        + ''
+          runHook postInstall
+        '';
+
+      inherit doInstallCheck;
+      inherit allowFHSReferences;
+
+      passthru = passthru // {
+        inherit redistName release;
+
+        supportedReleases =
+          passthru.supportedReleases
+            # NOTE: `release` may be null, so we must use `lib.defaultTo`
+            or (getSupportedReleases (lib.defaultTo { } finalAttrs.passthru.release));
+
+        supportedNixSystems =
+          passthru.supportedNixSystems or (pipe finalAttrs.passthru.supportedReleases [
+            attrNames
+            (concatMap getNixSystems)
+            naturalSort
+            unique
+          ]);
+
+        supportedRedistSystems =
+          passthru.supportedRedistSystems or (naturalSort (attrNames finalAttrs.passthru.supportedReleases));
+
+        # NOTE: Downstream may expand this to include other outputs, but they must remember to set the appropriate
+        # outputNameVarFallbacks!
+        inherit expectedOutputs;
+
+        # Traversed in the order of the outputs speficied in outputs;
+        # entries are skipped if they don't exist in outputs.
+        inherit outputToPatterns;
+
+        # Defines a list of fallbacks for each potential output.
+        # The last fallback is the out output.
+        # Taken and modified from:
+        # https://github.com/NixOS/nixpkgs/blob/fe5e11faed6241aacf7220436088789287507494/pkgs/build-support/setup-hooks/multiple-outputs.sh#L45-L62
+        inherit outputNameVarFallbacks;
+
+        # brokenAssertions :: [Attrs]
+        # Used by mkMetaBroken to set `meta.broken`.
+        # Example: Broken on a specific version of CUDA or when a dependency has a specific version.
+        # NOTE: Do not use this when a broken assertion means evaluation will fail! For example, if
+        # a package is missing and is required for the build -- that should go in platformAssertions,
+        # because attempts to access attributes on the package will cause evaluation errors.
+        brokenAssertions = [
+          {
+            message = "lib output precedes static output";
+            assertion =
+              let
+                libIndex = findFirstIndex (x: x == "lib") null finalAttrs.outputs;
+                staticIndex = findFirstIndex (x: x == "static") null finalAttrs.outputs;
+              in
+              libIndex == null || staticIndex == null || libIndex < staticIndex;
+          }
+          {
+            # NOTE: We cannot (easily) check that all expected outputs have a corresponding outputNameVar attribute in
+            # finalAttrs because of the presence of attributes which use the "output" prefix but are not outputNameVars
+            # (e.g., outputChecks and outputName).
+            message = "outputNameVarFallbacks is a super set of expectedOutputs";
+            assertion =
+              subtractLists (map mkOutputNameVar finalAttrs.passthru.expectedOutputs) (
+                attrNames finalAttrs.passthru.outputNameVarFallbacks
+              ) == [ ];
+          }
+          {
+            message = "outputToPatterns is a super set of expectedOutputs";
+            assertion =
+              subtractLists finalAttrs.passthru.expectedOutputs (attrNames finalAttrs.passthru.outputToPatterns)
+              == [ ];
+          }
+          {
+            message = "propagatedBuildOutputs is a subset of outputs";
+            assertion = subtractLists finalAttrs.outputs finalAttrs.propagatedBuildOutputs == [ ];
+          }
+        ]
+        ++ brokenAssertions;
+
+        # platformAssertions :: [Attrs]
+        # Used by mkMetaBadPlatforms to set `meta.badPlatforms`.
+        # Example: Broken on a specific system when some condition is met, like targeting Jetson or
+        # a required package missing.
+        # NOTE: Use this when a failed assertion means evaluation can fail!
+        platformAssertions =
+          let
+            isSupportedRedistSystem = _redistSystemIsSupported hostRedistSystem finalAttrs.passthru.supportedRedistSystems;
+          in
+          [
+            {
+              message = "src is null if and only if hostRedistSystem is unsupported";
+              assertion = (finalAttrs.src == null) == !isSupportedRedistSystem;
+            }
+            {
+              message = "hostRedistSystem (${hostRedistSystem}) is supported (${builtins.toJSON finalAttrs.passthru.supportedRedistSystems})";
+              assertion = isSupportedRedistSystem;
+            }
+          ]
+          ++ platformAssertions;
+      };
+
+      meta = meta // {
+        longDescription = meta.longDescription or "" + ''
+          By downloading and using this package you accept the terms and conditions of the associated license(s).
+        '';
+        sourceProvenance = meta.sourceProvenance or [ sourceTypes.binaryNativeCode ];
+        platforms = finalAttrs.passthru.supportedNixSystems;
+        broken = _mkMetaBroken finalAttrs;
+        badPlatforms = _mkMetaBadPlatforms finalAttrs;
+        downloadPage =
+          meta.downloadPage
+            or "https://developer.download.nvidia.com/compute/${finalAttrs.passthru.redistName}/redist/${finalAttrs.pname}";
+        # NOTE:
+        #   Every redistributable should set its own license; since that's a lot of manual work, we default to
+        #   nvidiaCudaRedist if the redistributable is from the CUDA redistributables and nvidiaCuda otherwise.
+        #   Despite calling them "redistributable" and the download URL containing "redist", a number of these
+        #   packages are not licensed such that redistribution is allowed.
+        license =
+          if meta ? license then
+            lib.toList meta.license
+          else if finalAttrs.passthru.redistName == "cuda" then
+            [ licenses.nvidiaCudaRedist ]
+          else
+            [ licenses.nvidiaCuda ];
+        teams = meta.teams or [ ] ++ [ teams.cuda ];
+      };
+    }
+    # Setup the outputNameVar variables to gracefully handle missing outputs.
+    # NOTE: We cannot use expectedOutputs from finalAttrs.passthru because we will infinitely recurse: presence of
+    # attributes in finalAttrs cannot depend on finalAttrs.
+    // foldl' (
+      acc: output:
+      let
+        outputNameVar = mkOutputNameVar output;
+      in
+      acc
+      // {
+        ${outputNameVar} =
+          findFirst (flip elem finalAttrs.outputs) "out"
+            finalAttrs.passthru.outputNameVarFallbacks.${outputNameVar};
+      }
+    ) { } expectedOutputs;
+
+  # Don't inherit any of stdenv.mkDerivation's arguments.
+  inheritFunctionArgs = false;
+}
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/extension.nix b/pkgs/development/cuda-modules/cuda-library-samples/extension.nix
deleted file mode 100644
index 1184547c7f93..000000000000
--- a/pkgs/development/cuda-modules/cuda-library-samples/extension.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ lib, stdenv }:
-let
-  inherit (stdenv) hostPlatform;
-
-  # Samples are built around the CUDA Toolkit, which is not available for
-  # aarch64. Check for both CUDA version and platform.
-  platformIsSupported = hostPlatform.isx86_64 && hostPlatform.isLinux;
-
-  # Build our extension
-  extension =
-    final: _:
-    lib.attrsets.optionalAttrs platformIsSupported {
-      cuda-library-samples = final.callPackage ./generic.nix { };
-    };
-in
-extension
diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix
deleted file mode 100644
index 706631c06285..000000000000
--- a/pkgs/development/cuda-modules/cuda/extension.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ cudaMajorMinorVersion, lib }:
-let
-  inherit (lib) attrsets modules trivial;
-  redistName = "cuda";
-
-  # Manifest files for CUDA redistributables (aka redist). These can be found at
-  # https://developer.download.nvidia.com/compute/cuda/redist/
-  # Maps a cuda version to the specific version of the manifest.
-  cudaVersionMap = {
-    "12.6" = "12.6.3";
-    "12.8" = "12.8.1";
-    "12.9" = "12.9.1";
-  };
-
-  # Check if the current CUDA version is supported.
-  cudaVersionMappingExists = builtins.hasAttr cudaMajorMinorVersion cudaVersionMap;
-
-  # fullCudaVersion : String
-  fullCudaVersion = cudaVersionMap.${cudaMajorMinorVersion};
-
-  evaluatedModules = modules.evalModules {
-    modules = [
-      ../modules
-      # We need to nest the manifests in a config.cuda.manifests attribute so the
-      # module system can evaluate them.
-      {
-        cuda.manifests = {
-          redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCudaVersion}.json");
-          feature = trivial.importJSON (./manifests + "/feature_${fullCudaVersion}.json");
-        };
-      }
-    ];
-  };
-
-  # Generally we prefer to do things involving getting attribute names with feature_manifest instead
-  # of redistrib_manifest because the feature manifest will have *only* the redist system
-  # names as the keys, whereas the redistrib manifest will also have things like version, name, license,
-  # and license_path.
-  featureManifest = evaluatedModules.config.cuda.manifests.feature;
-  redistribManifest = evaluatedModules.config.cuda.manifests.redistrib;
-
-  # Builder function which builds a single redist package for a given platform.
-  # buildRedistPackage : callPackage -> PackageName -> Derivation
-  buildRedistPackage =
-    callPackage: pname:
-    callPackage ../generic-builders/manifest.nix {
-      inherit pname redistName;
-      # We pass the whole release to the builder because it has logic to handle
-      # the case we're trying to build on an unsupported platform.
-      redistribRelease = redistribManifest.${pname};
-      featureRelease = featureManifest.${pname};
-    };
-
-  # Build all the redist packages given final and prev.
-  redistPackages =
-    final: _prev:
-    # Wrap the whole thing in an optionalAttrs so we can return an empty set if the CUDA version
-    # is not supported.
-    # NOTE: We cannot include the call to optionalAttrs *in* the pipe as we would strictly evaluate the
-    # attrNames before we check if the CUDA version is supported.
-    attrsets.optionalAttrs cudaVersionMappingExists (
-      trivial.pipe featureManifest [
-        # Get all the package names
-        builtins.attrNames
-        # Build the redist packages
-        (trivial.flip attrsets.genAttrs (buildRedistPackage final.callPackage))
-      ]
-    );
-in
-redistPackages
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json
deleted file mode 100644
index 7ee3951de1d6..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json
+++ /dev/null
@@ -1,1386 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvsdm": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json
deleted file mode 100644
index 20aa77b1ba1e..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json
+++ /dev/null
@@ -1,1410 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sandbox_dev": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "driver_assistant": {
-    "linux-all": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvsdm": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json
deleted file mode 100644
index 00e11ae31f94..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json
+++ /dev/null
@@ -1,1520 +0,0 @@
-{
-  "collectx_bringup": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sandbox_dev": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "driver_assistant": {
-    "linux-all": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvsdm": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "mft": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "mft_autocomplete": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "mft_oem": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvlsm": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json
deleted file mode 100644
index 2ead9b4f283f..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json
+++ /dev/null
@@ -1,1151 +0,0 @@
-{
-  "release_date": "2025-06-05",
-  "release_label": "12.9.1",
-  "release_product": "cuda",
-  "collectx_bringup": {
-    "name": "UFM telemetry CollectX Bringup",
-    "license": "NVIDIA Proprietary",
-    "license_path": "collectx_bringup/LICENSE.txt",
-    "version": "1.19.13",
-    "linux-x86_64": {
-      "relative_path": "collectx_bringup/linux-x86_64/collectx_bringup-linux-x86_64-1.19.13-archive.tar.xz",
-      "sha256": "4965fe096fca645a6d4565fd4d12366ae0ec31ec54ca20274910f34eea74b41a",
-      "md5": "d48b8c177f312c8774c54988594f725c",
-      "size": "125307508"
-    },
-    "linux-sbsa": {
-      "relative_path": "collectx_bringup/linux-sbsa/collectx_bringup-linux-sbsa-1.19.13-archive.tar.xz",
-      "sha256": "5d716fbb80ef7b9ac89f9e3fa8b900a29d4e6c0be487420dc4ee7a05340b57a9",
-      "md5": "dc2c0bfedf790ba7dc21f684510e592e",
-      "size": "120696772"
-    }
-  },
-  "cuda_cccl": {
-    "name": "CXX Core Compute Libraries",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cccl/LICENSE.txt",
-    "version": "12.9.27",
-    "linux-x86_64": {
-      "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.9.27-archive.tar.xz",
-      "sha256": "8b1a5095669e94f2f9afd7715533314d418179e9452be61e2fde4c82a3e542aa",
-      "md5": "59e3cb66aeb96423dcca73218c85bc02",
-      "size": "997888"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.9.27-archive.tar.xz",
-      "sha256": "8c3da24801b500f1d9217d191bb4b63e5d2096c8e7d0b7695e876853180ba82f",
-      "md5": "b39d03cfac57a3b2ded8e9b0a6b0e782",
-      "size": "997840"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.9.27-archive.zip",
-      "sha256": "17aaa7c6b8f94a417d8f3261780b7e34b9cbdfab7513bce86768623b06aa28b5",
-      "md5": "afdfa89a35951f67b5bd70c513f5ef09",
-      "size": "3127658"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.9.27-archive.tar.xz",
-      "sha256": "8c87c2db67130108861609eacd40d30ee109656a7765e5172eab71dd6da4c453",
-      "md5": "25b1a257ed35393052577bd9ee432d3f",
-      "size": "998228"
-    }
-  },
-  "cuda_compat": {
-    "name": "CUDA compat L4T",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_compat/LICENSE.txt",
-    "version": "12.9.40580548",
-    "linux-aarch64": {
-      "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.9.40580548-archive.tar.xz",
-      "sha256": "c03fe18b9d23881f068ac97b45001a47778f83d2361728427a3f92b551b1c898",
-      "md5": "3ca26403b8b36c5cc18104ee174ec874",
-      "size": "37422044"
-    }
-  },
-  "cuda_cudart": {
-    "name": "CUDA Runtime (cudart)",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cudart/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "1f6ad42d4f530b24bfa35894ccf6b7209d2354f59101fd62ec4a6192a184ce99",
-      "md5": "6153e2b6a43389e5be3d68b04c6488f5",
-      "size": "1514676"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "8b422a3b2cb8452cb678181b0bf9d7aa7342df168b5319c5488ae3b8514101fc",
-      "md5": "c4b3e0d206f5dc3aceaddb78a32424d3",
-      "size": "1521596"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "179e9c43b0735ffe67207b3da556eb5a0c50f3047961882b7657d3b822d34ef8",
-      "md5": "22e500ce68dc9e099ec18f57e1309808",
-      "size": "3521238"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "f893e2c72be81b0d0e3bc33827c785a96db15fd5aafdc51cc187f3df6fdbb657",
-      "md5": "8970e9d40a7edada8cd9270906b1daa3",
-      "size": "1223440"
-    }
-  },
-  "cuda_cuobjdump": {
-    "name": "cuobjdump",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cuobjdump/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "ee0de40e8c18068bfcc53e73510e7e7a1a80555205347940df67fa525d24452f",
-      "md5": "fb4ceb446f3ca58c4ca5381a2c0eee06",
-      "size": "214896"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "2d39ae9309f81a7980df296a93c0e49215c6fb22d316fd9daae211d29a731d27",
-      "md5": "9ec739cea851b184b55017d0a6185304",
-      "size": "208936"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "1eda43a76a2eac25fce5bdb4b68673b5bda737d54cca5513148c36362ab7c811",
-      "md5": "0a1c8b1f69537bc605c0d5fc28110258",
-      "size": "6219088"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "91a9ae2935b411d136c2c61ccbbc0df3a83f17cce122d12d262be202217163ee",
-      "md5": "ec5905b13be30f8f39e18d1f41dbcf18",
-      "size": "197604"
-    }
-  },
-  "cuda_cupti": {
-    "name": "CUPTI",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cupti/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "f779a24e8f0177b4ce45cbf118cb470139fb5107858df96689d0a0aa01f0fba1",
-      "md5": "5fe49729261d1f899bd0948026b755ae",
-      "size": "16799436"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "84f8657375c23a425b2d107c3cde1ce75777bff9798b744b78e146fdc02d2de0",
-      "md5": "ff4c04b183cc173aa2937a21a3569b5b",
-      "size": "12805704"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "c96018456dc4db6af6d69d6db0170a2ccc656ddde8c8ce6ee05682c2c5569daa",
-      "md5": "1cecfef05160d4e6b0f2549534fe7973",
-      "size": "13359912"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "74a884691b2c7e5c8db8bd2a38143fc82f7502f0dd484051809df7953f7ae719",
-      "md5": "7f92adb9aed6fdb047ebe3c7617c7179",
-      "size": "4781260"
-    }
-  },
-  "cuda_cuxxfilt": {
-    "name": "CUDA cuxxfilt (demangler)",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cuxxfilt/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "833d7e56351d032717f217212577d369d230e284b2ded4bf151403cc11213add",
-      "md5": "a7f4a446e4fb00657f5bd7eb1dd814a7",
-      "size": "188692"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "2175ef96b523eb8fea5d6ccfd21b70d6afaee623d00dbab70f11e8aa892c2828",
-      "md5": "fde8b2db7d7e4afb08e7c703fa735440",
-      "size": "177440"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "ec5911d680394d90968c480c7359e7f5a4025b9c4806dad673d489e57585afd3",
-      "md5": "537cd82a0945fe20275d4791e353c3f5",
-      "size": "178570"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "37acae6576874c3781e844ea268a9fe076d13aaab3acda6f65bbe885a3726a3c",
-      "md5": "c8e23bff8cc13fb58a57c90d69e7b374",
-      "size": "170436"
-    }
-  },
-  "cuda_demo_suite": {
-    "name": "CUDA Demo Suite",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_demo_suite/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "92e0b324bf02d9705b8dd5bf1d36149c06512c720ceda7cc7d791fc3ecf64f0e",
-      "md5": "5030cddcab7101704bb8a9b53c6137ad",
-      "size": "4036604"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "adffd0b0f7cca262025f171dcaa73f62af020de5d9a0d6e0fbe7dbd827dd77a8",
-      "md5": "9a8c3bbd696392e768ae3278e269cbd9",
-      "size": "5164004"
-    }
-  },
-  "cuda_documentation": {
-    "name": "CUDA Documentation",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_documentation/LICENSE.txt",
-    "version": "12.9.88",
-    "linux-x86_64": {
-      "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.9.88-archive.tar.xz",
-      "sha256": "d6e44c454654016a3650f3101688231ba111cd00647b726b34d18ff0bd721933",
-      "md5": "17436d82e589824bbf3f4ff669201d81",
-      "size": "67920"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.9.88-archive.tar.xz",
-      "sha256": "e1c47f32279a827baf8b4339c1737d7bd8e54c73388835e5fae3e2db83db2479",
-      "md5": "995f5692be016e44821fb85ebc3a62d9",
-      "size": "67924"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.9.88-archive.zip",
-      "sha256": "660f2f71b94c13a021850a8bb6227dfb4eb9a8dd8e0f6bc9feb0b993dea180fd",
-      "md5": "3d21d1b9056629557bb2745f962af636",
-      "size": "107626"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.9.88-archive.tar.xz",
-      "sha256": "830476a755f9a8c9780a6876d0ed562c073f29968c3e0e91962d0fd14b3f3618",
-      "md5": "098d318ebb7700a6513e57e41edf20c8",
-      "size": "67948"
-    }
-  },
-  "cuda_gdb": {
-    "name": "CUDA GDB",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_gdb/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "3dbb657683cd4f2989c30bdad31b3f4493795a9acc8a2214f48df3cfca7c37c0",
-      "md5": "1405f9cf4a5d2c03785a69aefa05de16",
-      "size": "67691620"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "251b9bd86ffcce0cdc4a5480ef3d8d609ca3a276cbbb5c793ca9978721d31faf",
-      "md5": "b76ab824a5b651ecec31978e6e2f41bf",
-      "size": "45695592"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "5473c27f1ec03fe064a09399e52b251e6ca5d3b9a67f21c1a26a02a26102f165",
-      "md5": "95325479bec751d72d4f063d8d244049",
-      "size": "45662012"
-    }
-  },
-  "cuda_nsight": {
-    "name": "Nsight Eclipse Edition Plugin",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nsight/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "5c3994440ce7aa6ac5ab120e45f25f5f5eaa631af0f793fab860a5edbc499518",
-      "md5": "3bce6195222da1c1d549fbd2d83422e8",
-      "size": "118693300"
-    }
-  },
-  "cuda_nvcc": {
-    "name": "CUDA NVCC",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvcc/LICENSE.txt",
-    "version": "12.9.86",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.9.86-archive.tar.xz",
-      "sha256": "7a1a5b652e5ef85c82b721d10672fc9a2dbaab44e9bd3c65a69517bf53998c35",
-      "md5": "ac1871c955070267e117bd985f6dbb36",
-      "size": "81100244"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.9.86-archive.tar.xz",
-      "sha256": "0aa1fce92dbae76c059c27eefb9d0ffb58e1291151e44ff7c7f1fc2dd9376c0d",
-      "md5": "1322a14e4d6482f69d4b8a14a7d5f4c5",
-      "size": "73407012"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.9.86-archive.zip",
-      "sha256": "227b109663b5e57d2718bcabb24a4ba0d9d4e52d958e327dc476f7c28691be85",
-      "md5": "ff9b2942aaa3a1dfb487da6767bc689f",
-      "size": "126917884"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.9.86-archive.tar.xz",
-      "sha256": "2432ef8a7c12d0a9ce3332a8af42b123c07f256390b3390802b1b2c6254c6c74",
-      "md5": "f846e79e53be949484a4968880eb9dd9",
-      "size": "77162776"
-    }
-  },
-  "cuda_nvdisasm": {
-    "name": "CUDA nvdisasm",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvdisasm/LICENSE.txt",
-    "version": "12.9.88",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.9.88-archive.tar.xz",
-      "sha256": "49296dd550e05434185a8588ec639f1325b2de413e2321ddd7e56c5182a476ff",
-      "md5": "87ec016e430618bf724a3e8332bfcca6",
-      "size": "5483340"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.9.88-archive.tar.xz",
-      "sha256": "28b2597f0901cfafcd050cba0877c1eb5edcd7ebd8164aea356cec832e636ee3",
-      "md5": "0d6f0b8883e55ca07d64cbb746b80e8c",
-      "size": "5408212"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.9.88-archive.zip",
-      "sha256": "955ba1f52f7115031f10408ce3cec4c745df41dba8fdf6024c3983d899e9fbbc",
-      "md5": "43cd76e59014be18d96ce03e2ed09d6b",
-      "size": "5791897"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.9.88-archive.tar.xz",
-      "sha256": "99bf70149423c42c8dc2649f76f8983101dcf9879d355cfb2582b2adbed84614",
-      "md5": "cb9f7798d824ef1696fdde67f9506aa4",
-      "size": "5416148"
-    }
-  },
-  "cuda_nvml_dev": {
-    "name": "CUDA NVML Headers",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvml_dev/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "1ad0866dbfff6a9e2661f5348e4ca4c2a4e40882b90014ab127f2734856ecccb",
-      "md5": "7e615aa7b4525d3cc1b28379abcf6ce5",
-      "size": "129244"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "e97e668ead7ebc1fb7e93ffe303019660d0119c4e4d0e8ef26ce012bbbea9b34",
-      "md5": "d48bcaa83a7299b836d381b32e94a99d",
-      "size": "130480"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "1894b70c5487a739c740929263fa3fbca80e53790647abc02b74eac024b97be8",
-      "md5": "213d773bb297b15e9f697ec8f1363bd9",
-      "size": "144955"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "531ac94b8b83209657cd14b28d23660df252393fb34c24f5d8919c56c977477e",
-      "md5": "3fe82d3f6042a22ac3d119192577db79",
-      "size": "130544"
-    }
-  },
-  "cuda_nvprof": {
-    "name": "CUDA nvprof",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvprof/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "8d8d1a9004710bad8d7a653769f088064b0285a06a80b46c4da7598115a0c6a2",
-      "md5": "df8f768c6c21b06cb048b9a4b0ac39e7",
-      "size": "2402440"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "81aefd12ab0a24f88feee10303b814fcf21887b3947d5e73523ed14338ef4e2b",
-      "md5": "69ada7050609c5860a2396a6354665e0",
-      "size": "1705346"
-    }
-  },
-  "cuda_nvprune": {
-    "name": "CUDA nvprune",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvprune/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "a06f0e2959a4dd3dbb62a984dbe77b813397022596f5c62d74ddd83b238571f2",
-      "md5": "db647ad5946c1e4cb0289c16e5ec92d8",
-      "size": "59372"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "15e1d6527bf04c162950251940b10b8b8254f68028e2ffc0bfb7ed84bb2e1382",
-      "md5": "3d51536a3582379389d821afa05becfd",
-      "size": "51052"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "be23018507f015ca948c503a43a3c48449c0dc1ceaab1e721caf01f024727312",
-      "md5": "f5c1eaa20c7c8c67a564f04cec87fca2",
-      "size": "142316"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "69fa4cf2cede678825e0c8032ccd629e17de1b9d8667b05b6702d873fd2fb926",
-      "md5": "00c370560287a3dcdeedb32fe13e7e0e",
-      "size": "52876"
-    }
-  },
-  "cuda_nvrtc": {
-    "name": "CUDA NVRTC",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvrtc/LICENSE.txt",
-    "version": "12.9.86",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.9.86-archive.tar.xz",
-      "sha256": "82913658363892dbc0f2638b070476234476e06e084fed60db861cb7e161a6af",
-      "md5": "8ed74b72c44ee50759f820dee875589c",
-      "size": "114231976"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.9.86-archive.tar.xz",
-      "sha256": "fb2d50c791465f333fc2236d2419170cf7a7886f48dd9b967a10f8233c686029",
-      "md5": "483dc56df046c9c03eb17cd637bb8fc9",
-      "size": "53265740"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.9.86-archive.zip",
-      "sha256": "1aa0644fa53c8ca34cdc73db17bcc73530557bdd3f582c7bfdbd7916c8b48f65",
-      "md5": "76317f5006ce9de6720cea0b3bdc7db6",
-      "size": "314608748"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.9.86-archive.tar.xz",
-      "sha256": "785b0952c0f77dd0feb9a674f3fcca3fcf05541bbe27f70a5926da9f85339152",
-      "md5": "b49aeba8583248a4cd628154361d313d",
-      "size": "57633224"
-    }
-  },
-  "cuda_nvtx": {
-    "name": "CUDA NVTX",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvtx/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "819bc39192955e6ba2067de39b85f30e157de462945e54b12bfdeda429d793fb",
-      "md5": "3a56b3c5c1e20d99cff4c354e57ea30f",
-      "size": "64496"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "dae359c2c51f83a5cd402468f481a82aeb6d32d79dc707d3625607e83cf97ceb",
-      "md5": "d783ac2926973ad682c69270d047c3f3",
-      "size": "64856"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "b9d506ce9ba056bf171b60e9dada06fb3d8bed5453a6399d0541960bf9b81659",
-      "md5": "907cfcf3f3b637912ded30349ecfd515",
-      "size": "87029"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "f1a4366e45dbfd0a4e6210a5a4b9b51501aaebb6b58845d3f1b271ec3d7f3e15",
-      "md5": "6b40a46f73f46a7d8bac37b212989007",
-      "size": "65396"
-    }
-  },
-  "cuda_nvvp": {
-    "name": "CUDA NVVP",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvvp/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "6cdf9196373a848856c1afc6f1df1023649fb5fe77b896967ecc0b014b200003",
-      "md5": "0ded9b80cf8fc2c2233b28d582f2334e",
-      "size": "117732648"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "a7e1ac0de34c69afc288283ea75314b67f109b08d046c3622405dff8f66b0720",
-      "md5": "dd673788d3fae14c38af5c1506fae11d",
-      "size": "120342251"
-    }
-  },
-  "cuda_opencl": {
-    "name": "CUDA OpenCL",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_opencl/LICENSE.txt",
-    "version": "12.9.19",
-    "linux-x86_64": {
-      "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.9.19-archive.tar.xz",
-      "sha256": "1bddacc2f0de77901faad5fecfad8fef8136ea8dd708e02177d10eef97d85b78",
-      "md5": "d0a85b602afc8957374d3f536dfd0306",
-      "size": "94140"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.9.19-archive.zip",
-      "sha256": "7c78e05697a3f74510c4154b175ce4597ed0719c7793236ca7f3989eccae0ff6",
-      "md5": "e2dec7d45f8d87045c4a37bb882e9cf4",
-      "size": "139663"
-    }
-  },
-  "cuda_profiler_api": {
-    "name": "CUDA Profiler API",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_profiler_api/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "8c50636bfb97e9420905aa795b9fa6e3ad0b30ec6a6c8b0b8db519beb9241ce6",
-      "md5": "483998e0e5b012d976bf62ada20bd4fa",
-      "size": "16316"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "e07f47ef3aeb3a3ca995e9070d77d98ad79460216bf2075c9f9018962ae1d03b",
-      "md5": "55345cd640f299f8da43ef946dd8aa89",
-      "size": "16316"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "b05519f8ce4f02167bfc859358f62eb771d89ac2af3a6952a82317f2af4bc5bd",
-      "md5": "f5da20e1160f547602ec1c558dd0bc64",
-      "size": "20352"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "e26d82b4ce994dc445dc0191b1a5fe68dacc7290bfb9c2133b4979fe90e05433",
-      "md5": "738fe1e26407ab88e0fd3209b4da1cfa",
-      "size": "16308"
-    }
-  },
-  "cuda_sandbox_dev": {
-    "name": "CUDA nvsandboxutils Headers",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_sandbox_dev/LICENSE.txt",
-    "version": "12.9.19",
-    "linux-x86_64": {
-      "relative_path": "cuda_sandbox_dev/linux-x86_64/cuda_sandbox_dev-linux-x86_64-12.9.19-archive.tar.xz",
-      "sha256": "058c9616f9bb4e57c58996a053cf9a87f655c139dc2fa11af7bed74432bd8153",
-      "md5": "ce4326bc03b26b88a552db8b163d7f5f",
-      "size": "29172"
-    }
-  },
-  "cuda_sanitizer_api": {
-    "name": "CUDA Compute Sanitizer API",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_sanitizer_api/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "e23aad21132ff58b92a22aad372a7048793400b79c625665d325d4ecec6979bf",
-      "md5": "9d138eb96c11e1b9293408e5b7a97114",
-      "size": "9758036"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "281538927b6818d4687fad102c0603ab7b389513c9c129f3e0de8c61ac7f474d",
-      "md5": "3192ef7e50255f80430471ae6add0ebf",
-      "size": "7753752"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "b1f366312cb52164dfe7b78463ab085b742f052e74b89e9da08561a8ca8b06e9",
-      "md5": "1821743a8a46f3e4bab0fe96dac813f8",
-      "size": "10103190"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "2baaba3ff47eceb529ddcc866fc7e647fd02427ef3dbb8bec06689f919c14c69",
-      "md5": "e48b00b6ed2124ac4a3a0b20201ba4dd",
-      "size": "4808620"
-    }
-  },
-  "driver_assistant": {
-    "name": "NVIDIA Driver Assistant",
-    "license": "MIT",
-    "license_path": "driver_assistant/LICENSE.txt",
-    "version": "0.21.57.08",
-    "linux-all": {
-      "relative_path": "driver_assistant/source/driver_assistant-0.21.57.08-archive.tar.xz",
-      "sha256": "4904c08e1de1aa790d200f36528aaa672ab6b3c6620bbfe5e221312b9ef1120a",
-      "md5": "ebb37f4ad248ddba8071c570f5267da3",
-      "size": "38644"
-    }
-  },
-  "fabricmanager": {
-    "name": "NVIDIA Fabric Manager",
-    "license": "NVIDIA Driver",
-    "license_path": "fabricmanager/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "2e7dc4db6788e618af345fb50dee63115b5116ccb57d6d27d93c1ff5e2c3a8cf",
-      "md5": "39f4aa35a3f7cda55297bb73c91a5481",
-      "size": "8077772"
-    },
-    "linux-sbsa": {
-      "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "239a7f8406987fb6d44cd4f7f6ba6e843b3f3acb7b1732e6ab5c0d370690ee85",
-      "md5": "4d288febfed83ff3d532ebbc692f65ec",
-      "size": "7336832"
-    }
-  },
-  "imex": {
-    "name": "Nvidia-Imex",
-    "license": "NVIDIA Proprietary",
-    "license_path": "imex/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "5dfe195429b0967788b7e9b4bab85d4936220d6d2f6cf394a61bd3439b437506",
-      "md5": "909fd5da3b23f54e39484efd187f4c3e",
-      "size": "7718644"
-    },
-    "linux-sbsa": {
-      "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "36d1a49fb52294ef5352eeea457d131f3d14320fca0a56633d7798ab32eead18",
-      "md5": "bd3d1ce8d91e1fd7d26191c05292698e",
-      "size": "7149236"
-    }
-  },
-  "libcublas": {
-    "name": "CUDA cuBLAS",
-    "license": "CUDA Toolkit",
-    "license_path": "libcublas/LICENSE.txt",
-    "version": "12.9.1.4",
-    "linux-x86_64": {
-      "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.9.1.4-archive.tar.xz",
-      "sha256": "546addc4a9d82b8f23aa9ba9274b6bc0429a63008a31c759884ac24880796057",
-      "md5": "9b07f0c3d94534e56e003c6016b9771c",
-      "size": "933611504"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.9.1.4-archive.tar.xz",
-      "sha256": "e99b074e6f66034e563508118804599d7579f73afc8424c55ad5fd8d12e085a5",
-      "md5": "4c7cdc43283c0ba62e665b02e9ec7540",
-      "size": "932528492"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.9.1.4-archive.zip",
-      "sha256": "d534d98b0b453a98914dbf3adf47d7e84b55037abf02f87466439e1dcef581ed",
-      "md5": "3f092963b0767968fe6f02febc1b0cbf",
-      "size": "549755186"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.9.1.4-archive.tar.xz",
-      "sha256": "f75938d72153902cf08d1666311f35851e7eb6a16af743b2346bc68d7ba6b341",
-      "md5": "15f6396431885647e961af811a90cc06",
-      "size": "493899648"
-    }
-  },
-  "libcudla": {
-    "name": "cuDLA",
-    "license": "CUDA Toolkit",
-    "license_path": "libcudla/LICENSE.txt",
-    "version": "12.9.19",
-    "linux-aarch64": {
-      "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.9.19-archive.tar.xz",
-      "sha256": "ef7c1a05d9927c53aa089ec2217a1e999ffac0e776145d798bf784279fc79d40",
-      "md5": "dd1fc18bd0fe3ed38b87a453d31575a0",
-      "size": "38548"
-    }
-  },
-  "libcufft": {
-    "name": "CUDA cuFFT",
-    "license": "CUDA Toolkit",
-    "license_path": "libcufft/LICENSE.txt",
-    "version": "11.4.1.4",
-    "linux-x86_64": {
-      "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.4.1.4-archive.tar.xz",
-      "sha256": "b0e65af59b0c2f6c8ed9f5552a9b375890855b7926ae2c0404d15dcf2565bda4",
-      "md5": "3ffadd77d5b084470aa8d9215d760e76",
-      "size": "470942192"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.4.1.4-archive.tar.xz",
-      "sha256": "b87637db96e485f4793d7ca8bd2cf07250eca5c86f6c56744a36683418359c03",
-      "md5": "4a0906639fd293f529b8f949bc3ad9eb",
-      "size": "471560648"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.4.1.4-archive.zip",
-      "sha256": "f26f80bb9abff3269c548e1559e8c2b4ba58ccb8acc6095bbc6404fc962d4b80",
-      "md5": "504ad2e94fd0d923b8a7082659813431",
-      "size": "198361265"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.4.1.4-archive.tar.xz",
-      "sha256": "5d992b98f0d3d294e339ed2f65a477a587803c1567598a120349fae52596bf20",
-      "md5": "1f10a57d45e9078e940340cdeff26478",
-      "size": "471529132"
-    }
-  },
-  "libcufile": {
-    "name": "CUDA cuFile",
-    "license": "CUDA Toolkit",
-    "license_path": "libcufile/LICENSE.txt",
-    "version": "1.14.1.1",
-    "linux-x86_64": {
-      "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.14.1.1-archive.tar.xz",
-      "sha256": "7ba9834b8dc2f8cdb1710a49f3de3f627bbcd4cc1f8a754019c66c8c80fdaee7",
-      "md5": "e59833cbd8e423948fa5814a276315e3",
-      "size": "42129088"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.14.1.1-archive.tar.xz",
-      "sha256": "6b1d2a771bd822fdd06a6286eb59acba179b13fe063ae5b0de8fc0f4991a39d8",
-      "md5": "5a8499cdc22754fe5c9335065d708ea4",
-      "size": "41676328"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.14.1.1-archive.tar.xz",
-      "sha256": "196b61a1bf02b85e76c21bdfe414a3f4db4380df41d9212c9eb6d0aa92eee1ce",
-      "md5": "c7e269a01ecd2dc427941c5bc775c2ef",
-      "size": "41655988"
-    }
-  },
-  "libcurand": {
-    "name": "CUDA cuRAND",
-    "license": "CUDA Toolkit",
-    "license_path": "libcurand/LICENSE.txt",
-    "version": "10.3.10.19",
-    "linux-x86_64": {
-      "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.10.19-archive.tar.xz",
-      "sha256": "48281b4caadb1cf790d44ac76b23c77d06f474c0b1799814f314aafec9258ad6",
-      "md5": "e2fd0b8dd197f3bccc0ee19e5640fc93",
-      "size": "89582256"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.10.19-archive.tar.xz",
-      "sha256": "078afec842c99b3a953d62cc76bd74afa2d883dc436e6d642e6440bb1e85eb8e",
-      "md5": "fae5b6ce60678f452a2c760e8bf27563",
-      "size": "89544732"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.10.19-archive.zip",
-      "sha256": "d0411f0b8c07e90d0fb6e01bfa7a54c9cb80f2ddf67e4ded2d96a50e19aadad6",
-      "md5": "6ccce2f4f1f6d9592c908fa1cb91536d",
-      "size": "67904600"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.10.19-archive.tar.xz",
-      "sha256": "e5087640b5c9cd8bc173efb6a21f8388b24da59511cc3d57e60afc5e05d14b50",
-      "md5": "71ed8ff7a7e539c0be8ca4b699f2f3e1",
-      "size": "79761424"
-    }
-  },
-  "libcusolver": {
-    "name": "CUDA cuSOLVER",
-    "license": "CUDA Toolkit",
-    "license_path": "libcusolver/LICENSE.txt",
-    "version": "11.7.5.82",
-    "linux-x86_64": {
-      "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.7.5.82-archive.tar.xz",
-      "sha256": "3d3b96f3087dbc43893a28691b172f31725b316d524f5a3c1e6837257c898d06",
-      "md5": "efcc5d100623563d1a56dff59b45b65d",
-      "size": "324393196"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.7.5.82-archive.tar.xz",
-      "sha256": "db463593ffcbc78f542a7f1ef808da43bf742acae654d970d99a47289c2a83e5",
-      "md5": "63113f462dc11289f996eec8bab1db74",
-      "size": "323573816"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.7.5.82-archive.zip",
-      "sha256": "e991d64a0bbe3e0bb69ce2adce000244288002b0341894729666d66adb9b4f25",
-      "md5": "e2d79987f6e38f63cc64816f393a8e51",
-      "size": "322216184"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.7.5.82-archive.tar.xz",
-      "sha256": "45e2fefeee5797c0492d8a9ee26c3dbb7af0cdcefe6f1cd25bd586daa633d9a0",
-      "md5": "e311d62bfc65c6afc29152f6e923f78c",
-      "size": "113258352"
-    }
-  },
-  "libcusparse": {
-    "name": "CUDA cuSPARSE",
-    "license": "CUDA Toolkit",
-    "license_path": "libcusparse/LICENSE.txt",
-    "version": "12.5.10.65",
-    "linux-x86_64": {
-      "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.5.10.65-archive.tar.xz",
-      "sha256": "a83415dcd3e1183afe363d4740f9f0309cfe560c6c08016c2a61468304f4b848",
-      "md5": "c7ed952d12dec0f50a4386e5d09203f6",
-      "size": "398914580"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.5.10.65-archive.tar.xz",
-      "sha256": "8d1c8a57ba3eaecc3f7c11e29fed275a2f3dca5cea51dd2a24d07ab5d9998583",
-      "md5": "2d48c3aecca07be0a458a977350ce175",
-      "size": "398606816"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.5.10.65-archive.zip",
-      "sha256": "abb4bfc01198f82fbc956773ccb98c578c03027b6ad425e829355be0c0a11a4a",
-      "md5": "33ce31c3d880596c31304c965dbfcdce",
-      "size": "358114928"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.5.10.65-archive.tar.xz",
-      "sha256": "b294b6cd0acf5e68078d2fe4d41d95a4073fed780805adca7774bce7cbbe5b65",
-      "md5": "ce4d363d3affd40fe751f065ec2bd4cf",
-      "size": "131075108"
-    }
-  },
-  "libnpp": {
-    "name": "CUDA NPP",
-    "license": "CUDA Toolkit",
-    "license_path": "libnpp/LICENSE.txt",
-    "version": "12.4.1.87",
-    "linux-x86_64": {
-      "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.4.1.87-archive.tar.xz",
-      "sha256": "49351448d896854284ec708c14506eaaceb92aa01fbe35c91d5c52ad482e17ae",
-      "md5": "03de546e34ad54d0119594bc237c5e87",
-      "size": "331733872"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.4.1.87-archive.tar.xz",
-      "sha256": "992d461905366cec4243b26ce7bfe997c0c0eabf53a001333025930a1a0c7237",
-      "md5": "8de3be3d9043a07011b0de46c49ea668",
-      "size": "330804724"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.4.1.87-archive.zip",
-      "sha256": "cfcfbf59e4e5ce71113c058bd4eba3dd56e4db080932146d4047c0d44b4a558e",
-      "md5": "7549e1191510ae5ca9291e5f13c70296",
-      "size": "274109870"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.4.1.87-archive.tar.xz",
-      "sha256": "50c9f80592eaf4f246c82475143768b848333d9f540782257d42023f5fe68fdf",
-      "md5": "869efb32d5ab9468fda4cb94848cf90f",
-      "size": "104647240"
-    }
-  },
-  "libnvfatbin": {
-    "name": "NVIDIA compiler library for fatbin interaction",
-    "license": "CUDA Toolkit",
-    "license_path": "libnvfatbin/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "315be969a303437329bf72d7141babed024fc54f90a10aa748b03be8f826d57b",
-      "md5": "d5e2dc19c01ab62dbf437a1ef80847b1",
-      "size": "930820"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "87bf71288ea7390d039b246fa794cad2ddd3b164ce9566f8542bb15039432cdb",
-      "md5": "91902ce86f6f55a4ecc948f95bf1c032",
-      "size": "836312"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "86563b25096bbc21d74b1c043701ec8596499f76b40e32f9ec9179fc10404d00",
-      "md5": "c0963a07d7f2cbffd34b0b1ec6cae5c0",
-      "size": "2217262"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnvfatbin/linux-aarch64/libnvfatbin-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "248e77ede9afbd6060cda7de0475d222731ac021e22e696ce75ed72b426dfca9",
-      "md5": "814b2ff13e944a07669580eb85c0e653",
-      "size": "808780"
-    }
-  },
-  "libnvidia_nscq": {
-    "name": "NVIDIA NSCQ API",
-    "license": "NVIDIA Driver",
-    "license_path": "libnvidia_nscq/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "7c54e959ee50212be8595e01ee76581c1f3a13c19b2279424b55a8d26385c41a",
-      "md5": "b86a87c4f9fd58a79ced07cf82cec271",
-      "size": "455504"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "931004b8b2062249016a9bded2499f70331d27b265226ed879428b8bd7e4bb20",
-      "md5": "790ca3dd29b03a71f32ad1dd05611a9e",
-      "size": "446980"
-    }
-  },
-  "libnvjitlink": {
-    "name": "NVIDIA compiler library for JIT LTO functionality",
-    "license": "CUDA Toolkit",
-    "license_path": "libnvjitlink/LICENSE.txt",
-    "version": "12.9.86",
-    "linux-x86_64": {
-      "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.9.86-archive.tar.xz",
-      "sha256": "392cac3144b52ba14900bc7259ea6405ae6da88a8c704eab9bbbcc9ba4824b07",
-      "md5": "9156156146001536d1c8346783991d1b",
-      "size": "54021940"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.9.86-archive.tar.xz",
-      "sha256": "9c9227c1e9122fd8448cafced3b32bc69f40d3c041d25034ea23611a1262852f",
-      "md5": "7fdf2864352ac613415327ebde38598b",
-      "size": "50981988"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.9.86-archive.zip",
-      "sha256": "ee7175da9628d47ccc92dce6d28d57ca77633e79079a2aee90e2a645edcd1384",
-      "md5": "4cdb56f88316a5ade3edf69a1e7192e8",
-      "size": "265666466"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.9.86-archive.tar.xz",
-      "sha256": "a24842165d98660d4ba9fd753395f7c9834445552110fabce4baa4c211fd2c52",
-      "md5": "548a35d56f08d07b1dc294a3c8172f71",
-      "size": "54783780"
-    }
-  },
-  "libnvjpeg": {
-    "name": "CUDA nvJPEG",
-    "license": "CUDA Toolkit",
-    "license_path": "libnvjpeg/LICENSE.txt",
-    "version": "12.4.0.76",
-    "linux-x86_64": {
-      "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.4.0.76-archive.tar.xz",
-      "sha256": "ddd8245b2803f5b55211261d7e5d7abf803c05f3b032238d0feaa6e09ea9401d",
-      "md5": "b9f7806fb279c9cdd0b4a40e4171b87b",
-      "size": "6378624"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.4.0.76-archive.tar.xz",
-      "sha256": "405b5627ffd772d2837ae4ece123fdee841c34894dba2180a1c8e1b84c0f2665",
-      "md5": "bad1da3ec8865dbd3955a757bb6b7ba0",
-      "size": "6179324"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.4.0.76-archive.zip",
-      "sha256": "b253241fc88bf30947b8ee068101aca8930960f113d8ee4a9583de021a79ffa1",
-      "md5": "d19d13f9bd3dbc9c9361a3c1fee99dd5",
-      "size": "4667529"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.4.0.76-archive.tar.xz",
-      "sha256": "a9841bff40e577bec81352054e05c5d98720ae8e2ccfc4863eaac9dd35444c27",
-      "md5": "0a7197330938f8b5363d38bdde63562c",
-      "size": "1821640"
-    }
-  },
-  "libnvsdm": {
-    "name": "LIBNVSDM",
-    "license": "NVIDIA",
-    "license_path": "libnvsdm/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "7a6ee934d5c328f9c05e967b63053c211f80485e0443ac119d887612a510ad53",
-      "md5": "788f7c59de54096d84dc7f645964ad2a",
-      "size": "500100"
-    }
-  },
-  "mft": {
-    "name": "NVLink 5 MFT",
-    "license": "NVIDIA Proprietary",
-    "license_path": "mft/LICENSE.txt",
-    "version": "4.30.1.510",
-    "linux-x86_64": {
-      "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.30.1.510-archive.tar.xz",
-      "sha256": "512714ab076d90d88550e60f5da65181363336cee94c67bff8821face8ef10b4",
-      "md5": "30698cf8741826df5ca3d4d3bb3a982c",
-      "size": "45536612"
-    },
-    "linux-sbsa": {
-      "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.30.1.510-archive.tar.xz",
-      "sha256": "95c05e1bc03ff81dffa58bfff26a1dd59c6300d6d5922662ae59c7af5788a310",
-      "md5": "78ef93686e91302f7b751fed8f83d9be",
-      "size": "44222004"
-    }
-  },
-  "mft_autocomplete": {
-    "name": "NVLink 5 MFT AUTOCOMPLETE",
-    "license": "NVIDIA Proprietary",
-    "license_path": "mft_autocomplete/LICENSE.txt",
-    "version": "4.30.1.510",
-    "linux-x86_64": {
-      "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.30.1.510-archive.tar.xz",
-      "sha256": "dc9069baa888c7ca0c3e55a3043d27b0100c29c81e6ed3346907dd49dabb1325",
-      "md5": "b65cb40bacfe276b3444920e8eef1f2f",
-      "size": "11884"
-    },
-    "linux-sbsa": {
-      "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.30.1.510-archive.tar.xz",
-      "sha256": "64647ce2a4de62e535ea7060d20d58c2613937071008c2a93894e1995facce2b",
-      "md5": "bf034fbf9f887d62434f83dc9727db80",
-      "size": "11880"
-    }
-  },
-  "mft_oem": {
-    "name": "NVLink 5 MFT OEM",
-    "license": "NVIDIA Proprietary",
-    "license_path": "mft_oem/LICENSE.txt",
-    "version": "4.30.1.510",
-    "linux-x86_64": {
-      "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.30.1.510-archive.tar.xz",
-      "sha256": "7a4729f8b91ba5c179820583189a4c95ffa9669312a28fe7ac03feebb726bbc3",
-      "md5": "7329d76d0e5b976f88ef1f2484d962de",
-      "size": "4708108"
-    },
-    "linux-sbsa": {
-      "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.30.1.510-archive.tar.xz",
-      "sha256": "b71bb03130b6dd3388a3e909cdf91cc9bca8b8098a8b80b5f376f5726e5b5e1c",
-      "md5": "e55a4d898553c2cf92be57724a8204e1",
-      "size": "4429188"
-    }
-  },
-  "nsight_compute": {
-    "name": "Nsight Compute",
-    "license": "NVIDIA SLA",
-    "license_path": "nsight_compute/LICENSE.txt",
-    "version": "2025.2.1.3",
-    "linux-x86_64": {
-      "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2025.2.1.3-archive.tar.xz",
-      "sha256": "02ab8867197aaf6a6ae3171293d70b6a9ddb20296be94ff4287741338cc2e1df",
-      "md5": "e81faf319af6b21f241bae535d3d1907",
-      "size": "300347320"
-    },
-    "linux-sbsa": {
-      "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2025.2.1.3-archive.tar.xz",
-      "sha256": "0e336a5139f76778b8ad70fdb49fb43817ec1bb3ee6e7425d59d99d8c455d976",
-      "md5": "18334b109fe6f10fdba2c2681726ba96",
-      "size": "107009604"
-    },
-    "windows-x86_64": {
-      "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2025.2.1.3-archive.zip",
-      "sha256": "e9d558654c98d83049969d133b98922b53ab8f4e3ba9e0a37bdb5e2ff300b7de",
-      "md5": "7cb9cff3e0718212866c7fbb4365dee5",
-      "size": "341265370"
-    },
-    "linux-aarch64": {
-      "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2025.2.1.3-archive.tar.xz",
-      "sha256": "51c7762110c34728acd37878d4340f13612401fa622be0031b1a9e2ce112cfb2",
-      "md5": "355babae2f49f3f2c7ec1cf1c0b07966",
-      "size": "221171904"
-    }
-  },
-  "nsight_systems": {
-    "name": "Nsight Systems",
-    "license": "NVIDIA SLA",
-    "license_path": "nsight_systems/LICENSE.txt",
-    "version": "2025.1.3.140",
-    "linux-x86_64": {
-      "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2025.1.3.140-archive.tar.xz",
-      "sha256": "dded4227619340307be0ba5bc4e23bcbc966e2df3763170ebb20410c2b54754e",
-      "md5": "0b16c35f6e63a4fc33d14795e65bcd61",
-      "size": "1075732108"
-    },
-    "linux-sbsa": {
-      "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2025.1.3.140-archive.tar.xz",
-      "sha256": "479c46de1c459f7c760ef1ea5e5bbe61bfe7f4ba525ce4778d5ba25d874b8e1f",
-      "md5": "6d70406b53a94eba94d7c3552b938fe6",
-      "size": "980282844"
-    },
-    "windows-x86_64": {
-      "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2025.1.3.140-archive.zip",
-      "sha256": "8d61f266a8a1bc1ababd44de3ee38f7b85c8cdfcdaebace14c8f065d7624d0b3",
-      "md5": "b741046881531cbf6e3ccedb0b403432",
-      "size": "403084779"
-    }
-  },
-  "nsight_vse": {
-    "name": "Nsight Visual Studio Edition (VSE)",
-    "license": "NVIDIA SLA",
-    "license_path": "nsight_vse/LICENSE.txt",
-    "version": "2025.2.1.25125",
-    "windows-x86_64": {
-      "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2025.2.1.25125-archive.zip",
-      "sha256": "3f2b6ca8705929c97e0f931f0559921b110b9337cf11af5e017d0c95b5b31feb",
-      "md5": "7e74f479c09aece6e5b46c97d0d4cc86",
-      "size": "136237151"
-    }
-  },
-  "nvidia_driver": {
-    "name": "NVIDIA Linux Driver",
-    "license": "NVIDIA Driver",
-    "license_path": "nvidia_driver/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "27ddfabde120a107527cbf88a6c96d1f81ee5c977462ce1a793051a3e678f552",
-      "md5": "9007dddd1e2d48f897958b676fbe30ff",
-      "size": "471616744"
-    },
-    "linux-sbsa": {
-      "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "4a7d1accb257f2539ff7dabb02319339fc3a8db622073e5dde33a5446910346a",
-      "md5": "3c2b686f392789d8f3a1db1ae2ad62be",
-      "size": "349127420"
-    }
-  },
-  "nvidia_fs": {
-    "name": "NVIDIA filesystem",
-    "license": "CUDA Toolkit",
-    "license_path": "nvidia_fs/LICENSE.txt",
-    "version": "2.25.7",
-    "linux-x86_64": {
-      "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.25.7-archive.tar.xz",
-      "sha256": "6e11ec0b885177ab21f4b864ff7417ea3cc1b0994f1c318767984557cd5b29d1",
-      "md5": "60d2fa54d55b739302e3db38a8a389c9",
-      "size": "60280"
-    },
-    "linux-sbsa": {
-      "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.25.7-archive.tar.xz",
-      "sha256": "62baf0beac2d446c0ff033fb3780cf348ab9c090d7903c210106dc98bb29d7eb",
-      "md5": "3859bed4b5e330cde0e2316f9cdcdaeb",
-      "size": "60296"
-    },
-    "linux-aarch64": {
-      "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.25.7-archive.tar.xz",
-      "sha256": "b8c67e28e9e23453183fb7d12ed9fed449427b2c11a21b1de4e7046a57d8d366",
-      "md5": "5128c63c80c1089340b65807445d921a",
-      "size": "60272"
-    }
-  },
-  "nvlsm": {
-    "name": "NVLSM SM component",
-    "license": "NVIDIA Proprietary",
-    "license_path": "nvlsm/LICENSE.txt",
-    "version": "2025.03.1",
-    "linux-x86_64": {
-      "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.03.1-archive.tar.xz",
-      "sha256": "b034dad10a3154359e244b85206cd73f0fbce8e1cdf76058417b7b562c337388",
-      "md5": "6e09669fe8e4fb26e5334a1c4aa9dabb",
-      "size": "6890300"
-    },
-    "linux-sbsa": {
-      "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.03.1-archive.tar.xz",
-      "sha256": "e260285ec01c6beb562a14625e9564b96374bb824ec62cc9866066a48710fa54",
-      "md5": "bc90989f567c27d8b39e607f719acba8",
-      "size": "6175832"
-    }
-  },
-  "visual_studio_integration": {
-    "name": "CUDA Visual Studio Integration",
-    "license": "CUDA Toolkit",
-    "license_path": "visual_studio_integration/LICENSE.txt",
-    "version": "12.9.79",
-    "windows-x86_64": {
-      "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "d5b6514866395f52f04107da1aa523954f8dc76daf18a9f8699c3d564f294449",
-      "md5": "680fbdf0f345619c1fa3de5f1fc79090",
-      "size": "864204"
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix
deleted file mode 100644
index d8c4d70ddd09..000000000000
--- a/pkgs/development/cuda-modules/cudnn/releases.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-# NOTE: Check the following URLs for support matrices:
-#       v8 -> https://docs.nvidia.com/deeplearning/cudnn/archives/index.html
-#       v9 -> https://docs.nvidia.com/deeplearning/cudnn/frontend/latest/reference/support-matrix.html
-# Version policy is to keep the latest minor release for each major release.
-#             https://developer.download.nvidia.com/compute/cudnn/redist/
-{
-  cudnn.releases = {
-    # jetson
-    linux-aarch64 = [
-      {
-        version = "8.9.5.30";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz";
-        hash = "sha256-BJH3sC9VwiB362eL8xTB+RdSS9UHz1tlgjm/mKRyM6E=";
-      }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-9.7.1.26_cuda12-archive.tar.xz";
-        hash = "sha256-jDPWAXKOiJYpblPwg5FUSh7F0Dgg59LLnd+pX9y7r1w=";
-      }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-9.8.0.87_cuda12-archive.tar.xz";
-        hash = "sha256-8D7OP/B9FxnwYhiXOoeXzsG+OHzDF7qrW7EY3JiBmec=";
-      }
-    ];
-    # powerpc
-    linux-ppc64le = [ ];
-    # server-grade arm
-    linux-sbsa = [
-      {
-        version = "8.9.7.29";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz";
-        hash = "sha256-6Yt8gAEHheXVygHuTOm1sMjHNYfqb4ZIvjTT+NHUe9E=";
-      }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.6";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.3.0.75_cuda12-archive.tar.xz";
-        hash = "sha256-Eibdm5iciYY4VSlj0ACjz7uKCgy5uvjLCear137X1jk=";
-      }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.7.1.26_cuda12-archive.tar.xz";
-        hash = "sha256-koJFUKlesnWwbJCZhBDhLOBRQOBQjwkFZExlTJ7Xp2Q=";
-      }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda12-archive.tar.xz";
-        hash = "sha256-IvYvR08MuzW+9UCtsdhB2mPJzT33azxOQwEPQ2ss2Fw=";
-      }
-      {
-        version = "9.11.0.98";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.9";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.11.0.98_cuda12-archive.tar.xz";
-        hash = "sha256-X81kUdiKnTt/rLwASB+l4rsV8sptxvhuCysgG8QuzVY=";
-      }
-
-    ];
-    # x86_64
-    linux-x86_64 = [
-      {
-        version = "8.9.7.29";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz";
-        hash = "sha256-R1MzYlx+QqevPKCy91BqEG4wyTsaoAgc2cE++24h47s=";
-      }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.6";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.3.0.75_cuda12-archive.tar.xz";
-        hash = "sha256-PW7xCqBtyTOaR34rBX4IX/hQC73ueeQsfhNlXJ7/LCY=";
-      }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.7.1.26_cuda12-archive.tar.xz";
-        hash = "sha256-EJpeXGvN9Dlub2Pz+GLtLc8W7pPuA03HBKGxG98AwLE=";
-      }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda12-archive.tar.xz";
-        hash = "sha256-MhubM7sSh0BNk9VnLTUvFv6rxLIgrGrguG5LJ/JX3PQ=";
-      }
-      {
-        version = "9.11.0.98";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.9";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.11.0.98_cuda12-archive.tar.xz";
-        hash = "sha256-tgyPrQH6FSHS5x7TiIe5BHjX8Hs9pJ/WirEYqf7k2kg=";
-      }
-    ];
-  };
-}
diff --git a/pkgs/development/cuda-modules/cudnn/shims.nix b/pkgs/development/cuda-modules/cudnn/shims.nix
deleted file mode 100644
index 01918e88f07b..000000000000
--- a/pkgs/development/cuda-modules/cudnn/shims.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
-{
-  package,
-  # redistSystem :: String
-  # String is "unsupported" if the given architecture is unsupported.
-  redistSystem,
-}:
-{
-  featureRelease = {
-    inherit (package) minCudaVersion maxCudaVersion;
-    ${redistSystem}.outputs = {
-      lib = true;
-      static = true;
-      dev = true;
-    };
-  };
-  redistribRelease = {
-    name = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    inherit (package) hash url version;
-  };
-}
diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix
deleted file mode 100644
index f53405e3d099..000000000000
--- a/pkgs/development/cuda-modules/cusparselt/extension.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-# Support matrix can be found at
-# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html
-{
-  cudaLib,
-  lib,
-  redistSystem,
-}:
-let
-  inherit (lib)
-    attrsets
-    lists
-    modules
-    trivial
-    ;
-
-  redistName = "cusparselt";
-  pname = "libcusparse_lt";
-
-  cusparseltVersions = [
-    "0.7.1"
-  ];
-
-  # Manifests :: { redistrib, feature }
-
-  # Each release of cusparselt gets mapped to an evaluated module for that release.
-  # From there, we can get the min/max CUDA versions supported by that release.
-  # listOfManifests :: List Manifests
-  listOfManifests =
-    let
-      configEvaluator =
-        fullCusparseltVersion:
-        modules.evalModules {
-          modules = [
-            ../modules
-            # We need to nest the manifests in a config.cusparselt.manifests attribute so the
-            # module system can evaluate them.
-            {
-              cusparselt.manifests = {
-                redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCusparseltVersion}.json");
-                feature = trivial.importJSON (./manifests + "/feature_${fullCusparseltVersion}.json");
-              };
-            }
-          ];
-        };
-      # Un-nest the manifests attribute set.
-      releaseGrabber = evaluatedModules: evaluatedModules.config.cusparselt.manifests;
-    in
-    lists.map (trivial.flip trivial.pipe [
-      configEvaluator
-      releaseGrabber
-    ]) cusparseltVersions;
-
-  # platformIsSupported :: Manifests -> Boolean
-  platformIsSupported =
-    { feature, redistrib, ... }:
-    (attrsets.attrByPath [
-      pname
-      redistSystem
-    ] null feature) != null;
-
-  # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports,
-  # we could filter out releases that don't support our CUDA version.
-  # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever
-  # libPath corresponds to our CUDA version.
-  # supportedManifests :: List Manifests
-  supportedManifests = builtins.filter platformIsSupported listOfManifests;
-
-  # Compute versioned attribute name to be used in this package set
-  # Patch version changes should not break the build, so we only use major and minor
-  # computeName :: RedistribRelease -> String
-  computeName =
-    { version, ... }: cudaLib.mkVersionedName redistName (lib.versions.majorMinor version);
-in
-final: _:
-let
-  # buildCusparseltPackage :: Manifests -> AttrSet Derivation
-  buildCusparseltPackage =
-    { redistrib, feature }:
-    let
-      drv = final.callPackage ../generic-builders/manifest.nix {
-        inherit pname redistName;
-        redistribRelease = redistrib.${pname};
-        featureRelease = feature.${pname};
-      };
-    in
-    attrsets.nameValuePair (computeName redistrib.${pname}) drv;
-
-  extension =
-    let
-      nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname};
-      drvs = builtins.listToAttrs (lists.map buildCusparseltPackage supportedManifests);
-      containsDefault = attrsets.optionalAttrs (drvs != { }) { cusparselt = drvs.${nameOfNewest}; };
-    in
-    drvs // containsDefault;
-in
-extension
diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json
deleted file mode 100644
index 0b368e22bb24..000000000000
--- a/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcusparse_lt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json
deleted file mode 100644
index b9609bd4532a..000000000000
--- a/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "release_date": "2025-02-25",
-    "release_label": "0.7.1",
-    "release_product": "cusparselt",
-    "libcusparse_lt": {
-        "name": "NVIDIA cuSPARSELt",
-        "license": "cuSPARSELt",
-        "license_path": "libcusparse_lt/LICENSE.txt",
-        "version": "0.7.1.0",
-        "linux-x86_64": {
-            "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.7.1.0-archive.tar.xz",
-            "sha256": "a0d885837887c73e466a31b4e86aaae2b7d0cc9c5de0d40921dbe2a15dbd6a88",
-            "md5": "b2e5f3c9b9d69e1e0b55b16de33fdc6e",
-            "size": "353151840"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.7.1.0-archive.tar.xz",
-            "sha256": "4a131d0a54728e53ba536b50bb65380603456f1656e7df8ee52e285618a0b57c",
-            "md5": "612a712c7da6e801ee773687e99af87e",
-            "size": "352406784"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.7.1.0-archive.zip",
-            "sha256": "004bcb1b700c24ca8d60a8ddd2124640f61138a6c29914d2afaa0bfa0d0e3cf2",
-            "md5": "a1d8df8dc8ff4b3bd0e859f992f8f392",
-            "size": "268594665"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.7.1.0-archive.tar.xz",
-            "sha256": "d3b0a660fd552e0bd9a4491b15299d968674833483d5f164cfea35e70646136c",
-            "md5": "54e3f3b28c94118991ce54ec38f531fb",
-            "size": "5494380"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
deleted file mode 100644
index 5f6724549e3e..000000000000
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-# Support matrix can be found at
-# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html
-#
-# TODO(@connorbaker):
-# This is a very similar strategy to CUDA/CUDNN:
-#
-# - Get all versions supported by the current release of CUDA
-# - Build all of them
-# - Make the newest the default
-#
-# Unique twists:
-#
-# - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib`
-#   -- one for each version of CUDA.
-{
-  cudaLib,
-  cudaMajorMinorVersion,
-  lib,
-  redistSystem,
-}:
-let
-  inherit (lib)
-    attrsets
-    lists
-    modules
-    versions
-    trivial
-    ;
-
-  redistName = "cutensor";
-  pname = "libcutensor";
-
-  cutensorVersions = [
-    "2.0.2"
-    "2.1.0"
-  ];
-
-  # Manifests :: { redistrib, feature }
-
-  # Each release of cutensor gets mapped to an evaluated module for that release.
-  # From there, we can get the min/max CUDA versions supported by that release.
-  # listOfManifests :: List Manifests
-  listOfManifests =
-    let
-      configEvaluator =
-        fullCutensorVersion:
-        modules.evalModules {
-          modules = [
-            ../modules
-            # We need to nest the manifests in a config.cutensor.manifests attribute so the
-            # module system can evaluate them.
-            {
-              cutensor.manifests = {
-                redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCutensorVersion}.json");
-                feature = trivial.importJSON (./manifests + "/feature_${fullCutensorVersion}.json");
-              };
-            }
-          ];
-        };
-      # Un-nest the manifests attribute set.
-      releaseGrabber = evaluatedModules: evaluatedModules.config.cutensor.manifests;
-    in
-    lists.map (trivial.flip trivial.pipe [
-      configEvaluator
-      releaseGrabber
-    ]) cutensorVersions;
-
-  # Our cudaMajorMinorVersion tells us which version of CUDA we're building against.
-  # The subdirectories in lib/ tell us which versions of CUDA are supported.
-  # Typically the names will look like this:
-  #
-  # - 11
-  # - 12
-
-  # libPath :: String
-  libPath = versions.major cudaMajorMinorVersion;
-
-  # A release is supported if it has a libPath that matches our CUDA version for our platform.
-  # LibPath are not constant across the same release -- one platform may support fewer
-  # CUDA versions than another.
-  # platformIsSupported :: Manifests -> Boolean
-  platformIsSupported =
-    { feature, redistrib, ... }:
-    (attrsets.attrByPath [
-      pname
-      redistSystem
-    ] null feature) != null;
-
-  # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports,
-  # we could filter out releases that don't support our CUDA version.
-  # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever
-  # libPath corresponds to our CUDA version.
-  # supportedManifests :: List Manifests
-  supportedManifests = builtins.filter platformIsSupported listOfManifests;
-
-  # Compute versioned attribute name to be used in this package set
-  # Patch version changes should not break the build, so we only use major and minor
-  # computeName :: RedistribRelease -> String
-  computeName =
-    { version, ... }: cudaLib.mkVersionedName redistName (lib.versions.majorMinor version);
-in
-final: _:
-let
-  # buildCutensorPackage :: Manifests -> AttrSet Derivation
-  buildCutensorPackage =
-    { redistrib, feature }:
-    let
-      drv = final.callPackage ../generic-builders/manifest.nix {
-        inherit pname redistName libPath;
-        redistribRelease = redistrib.${pname};
-        featureRelease = feature.${pname};
-      };
-    in
-    attrsets.nameValuePair (computeName redistrib.${pname}) drv;
-
-  extension =
-    let
-      nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname};
-      drvs = builtins.listToAttrs (lists.map buildCutensorPackage supportedManifests);
-      containsDefault = attrsets.optionalAttrs (drvs != { }) { cutensor = drvs.${nameOfNewest}; };
-    in
-    drvs // containsDefault;
-in
-extension
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json
deleted file mode 100644
index 4d6a398605a1..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "libcutensor": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json
deleted file mode 100644
index cf790b7746c2..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "release_date": "2024-06-24",
-    "release_label": "2.0.2",
-    "release_product": "cutensor",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "license_path": "libcutensor/LICENSE.txt",
-        "version": "2.0.2.4",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.0.2.4-archive.tar.xz",
-            "sha256": "957b04ef6343aca404fe5f4a3f1f1d3ac0bd04ceb3acecc93e53f4d63bd91157",
-            "md5": "2b994ecba434e69ee55043cf353e05b4",
-            "size": "545271628"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-2.0.2.4-archive.tar.xz",
-            "sha256": "db2c05e231a26fb5efee470e1d8e11cb1187bfe0726b665b87cbbb62a9901ba0",
-            "md5": "6b00e29407452333946744c4084157e8",
-            "size": "543070992"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.0.2.4-archive.tar.xz",
-            "sha256": "9712b54aa0988074146867f9b6f757bf11a61996f3b58b21e994e920b272301b",
-            "md5": "c9bb31a92626a092d0c7152b8b3eaa18",
-            "size": "540299376"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.0.2.4-archive.zip",
-            "sha256": "ab2fca16d410863d14f2716cec0d07fb21d20ecd24ee47d309e9970c9c01ed4a",
-            "md5": "f6cfdb29a9a421a1ee4df674dd54028c",
-            "size": "921154033"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json
deleted file mode 100644
index cf0ce0aa4b9a..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "release_date": "2025-01-27",
-    "release_label": "2.1.0",
-    "release_product": "cutensor",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "license_path": "libcutensor/LICENSE.txt",
-        "version": "2.1.0.9",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.1.0.9-archive.tar.xz",
-            "sha256": "ee59fcb4e8d59fc0d8cebf5f7f23bf2a196a76e6bcdcaa621aedbdcabd20a759",
-            "md5": "ed15120c512dfb3e32b49103850bb9dd",
-            "size": "814871140"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.1.0.9-archive.tar.xz",
-            "sha256": "cef7819c4ecf3120d4f99b08463b8db1a8591be25147d1688371024885b1d2f0",
-            "md5": "fec00a1a825a05c0166eda6625dc587d",
-            "size": "782008004"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.1.0.9-archive.zip",
-            "sha256": "ed835ba7fd617000f77e1dff87403d123edf540bd99339e3da2eaab9d32a4040",
-            "md5": "9efcbc0c9c372b0e71e11d4487aa5ffa",
-            "size": "1514752712"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/default.nix b/pkgs/development/cuda-modules/default.nix
new file mode 100644
index 000000000000..5190dcecdb4c
--- /dev/null
+++ b/pkgs/development/cuda-modules/default.nix
@@ -0,0 +1,152 @@
+{
+  _cuda,
+  config,
+  lib,
+  pkgs,
+  # Manually provided arguments
+  manifests,
+}:
+let
+  inherit (lib.customisation) callPackagesWith;
+  inherit (lib.filesystem) packagesFromDirectoryRecursive;
+  inherit (lib.fixedPoints) composeManyExtensions extends;
+  inherit (lib.lists) optionals;
+  inherit (lib.strings) versionAtLeast versionOlder;
+  inherit (lib.versions) major majorMinor;
+  inherit (_cuda.lib)
+    dropDots
+    formatCapabilities
+    mkVersionedName
+    ;
+
+  # NOTE: This value is considered an implementation detail and should not be exposed in the attribute set.
+  cudaMajorMinorPatchVersion = manifests.cuda.release_label;
+  cudaMajorMinorVersion = majorMinor cudaMajorMinorPatchVersion;
+  cudaMajorVersion = major cudaMajorMinorPatchVersion;
+
+  cudaPackagesMajorMinorVersionedName = mkVersionedName "cudaPackages" cudaMajorMinorVersion;
+
+  # We must use an instance of Nixpkgs where the CUDA package set we're building is the default; if we do not, members
+  # of the versioned, non-default package sets may rely on (transitively) members of the default, unversioned CUDA
+  # package set.
+  # See `Using cudaPackages.pkgs` in doc/languages-frameworks/cuda.section.md for more information.
+  pkgs' =
+    let
+      cudaPackagesUnversionedName = "cudaPackages";
+      cudaPackagesMajorVersionedName = mkVersionedName cudaPackagesUnversionedName cudaMajorVersion;
+    in
+    pkgs.extend (
+      final: _: {
+        recurseForDerivations = false;
+        # The CUDA package set will be available as cudaPackages_x_y, so we need only update the aliases for the
+        # minor-versioned and unversioned package sets.
+        # cudaPackages_x = cudaPackages_x_y
+        ${cudaPackagesMajorVersionedName} = final.${cudaPackagesMajorMinorVersionedName};
+        # cudaPackages = cudaPackages_x
+        ${cudaPackagesUnversionedName} = final.${cudaPackagesMajorVersionedName};
+      }
+    );
+
+  cudaPackagesFixedPoint =
+    finalCudaPackages:
+    {
+      # NOTE:
+      # It is important that _cuda is not part of the package set fixed-point. As described by
+      # @SomeoneSerge:
+      # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
+      # > No arrows should point in the reverse directions.
+      # That is to say that cudaLib should only know about package sets and configurations, because it implements
+      # functionality for interpreting configurations, resolving them against data, and constructing package sets.
+      # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).
+      # Also see the comment in `pkgs/top-level/all-packages.nix` about the `_cuda` attribute.
+
+      inherit
+        cudaMajorMinorPatchVersion
+        cudaMajorMinorVersion
+        cudaMajorVersion
+        ;
+
+      pkgs = pkgs';
+
+      # Core
+      callPackages = callPackagesWith (pkgs' // finalCudaPackages);
+
+      cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
+
+      cudaOlder = versionOlder cudaMajorMinorVersion;
+      cudaAtLeast = versionAtLeast cudaMajorMinorVersion;
+
+      # These must be modified through callPackage, not by overriding the scope, since we cannot
+      # depend on them recursively as they are used to add top-level attributes.
+      inherit manifests;
+
+      # Create backendStdenv variants for different host compilers, since users may want to build a CUDA project with
+      # Clang or GCC specifically.
+      # TODO(@connorbaker): Because of the way our setup hooks and patching of NVCC works, the user's choice of
+      # backendStdenv is largely disregarded or will cause build failures; fixing this would require the setup hooks
+      # and patching to be made aware of the current environment (perhaps by reading certain environment variables set
+      # by our backendStdenv).
+      # backendClangStdenv = finalCudaPackages.callPackage ./packages/backendStdenv.nix {
+      #   stdenv = pkgs'.clangStdenv;
+      # };
+      # backendGccStdenv = finalCudaPackages.callPackage ./packages/backendStdenv.nix {
+      #   stdenv = pkgs'.gccStdenv;
+      # };
+
+      # Must be constructed without `callPackage` to avoid replacing the `override` attribute with that of
+      # `callPackage`'s.
+      buildRedist = import ./buildRedist {
+        inherit (pkgs)
+          _cuda
+          autoAddDriverRunpath
+          autoPatchelfHook
+          config
+          fetchurl
+          lib
+          srcOnly
+          stdenv
+          stdenvNoCC
+          ;
+        inherit (finalCudaPackages)
+          autoAddCudaCompatRunpath
+          backendStdenv
+          cudaMajorMinorVersion
+          cudaMajorVersion
+          cudaNamePrefix
+          manifests
+          markForCudatoolkitRootHook
+          setupCudaHook
+          ;
+      };
+
+      flags =
+        formatCapabilities {
+          inherit (finalCudaPackages.backendStdenv) cudaCapabilities cudaForwardCompat;
+          inherit (_cuda.db) cudaCapabilityToInfo;
+        }
+        # TODO(@connorbaker): Enable the corresponding warnings in `./aliases.nix` after some
+        # time to allow users to migrate to cudaLib and backendStdenv.
+        // {
+          inherit dropDots;
+          cudaComputeCapabilityToName =
+            cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.archName;
+          dropDot = dropDots;
+          isJetsonBuild = finalCudaPackages.backendStdenv.hasJetsonCudaCapability;
+        };
+    }
+    // packagesFromDirectoryRecursive {
+      inherit (finalCudaPackages) callPackage;
+      directory = ./packages;
+    };
+
+  composedExtensions = composeManyExtensions (
+    optionals config.allowAliases [
+      (import ./aliases.nix { inherit lib; })
+    ]
+    ++ _cuda.extensions
+  );
+in
+pkgs'.makeScopeWithSplicing' {
+  otherSplices = pkgs'.generateSplicesForMkScope [ cudaPackagesMajorMinorVersionedName ];
+  f = extends composedExtensions cudaPackagesFixedPoint;
+}
diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
deleted file mode 100644
index 7f346df79809..000000000000
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-  # General callPackage-supplied arguments
-  autoAddDriverRunpath,
-  autoAddCudaCompatRunpath,
-  autoPatchelfHook,
-  backendStdenv,
-  callPackage,
-  _cuda,
-  fetchurl,
-  lib,
-  markForCudatoolkitRootHook,
-  flags,
-  stdenv,
-  # Builder-specific arguments
-  # Short package name (e.g., "cuda_cccl")
-  # pname : String
-  pname,
-  # Common name (e.g., "cutensor" or "cudnn") -- used in the URL.
-  # Also known as the Redistributable Name.
-  # redistName : String,
-  redistName,
-  # If libPath is non-null, it must be a subdirectory of `lib`.
-  # The contents of `libPath` will be moved to the root of `lib`.
-  libPath ? null,
-  # See ./modules/generic/manifests/redistrib/release.nix
-  redistribRelease,
-  # See ./modules/generic/manifests/feature/release.nix
-  featureRelease,
-  cudaMajorMinorVersion,
-}:
-let
-  inherit (lib)
-    attrsets
-    lists
-    strings
-    trivial
-    licenses
-    teams
-    sourceTypes
-    ;
-
-  inherit (stdenv) hostPlatform;
-
-  # Last step before returning control to `callPackage` (adds the `.override` method)
-  # we'll apply (`overrideAttrs`) necessary package-specific "fixup" functions.
-  # Order is significant.
-  maybeFixup = _cuda.fixups.${pname} or null;
-  fixup = if maybeFixup != null then callPackage maybeFixup { } else { };
-
-  # Get the redist systems for which package provides distributables.
-  # These are used by meta.platforms.
-  supportedRedistSystems = builtins.attrNames featureRelease;
-  # redistSystem :: String
-  # The redistSystem is the name of the system for which the redistributable is built.
-  # It is `"unsupported"` if the redistributable is not supported on the target system.
-  redistSystem = _cuda.lib.getRedistSystem backendStdenv.hasJetsonCudaCapability hostPlatform.system;
-
-  sourceMatchesHost = lib.elem hostPlatform.system (_cuda.lib.getNixSystems redistSystem);
-in
-(backendStdenv.mkDerivation (finalAttrs: {
-  # NOTE: Even though there's no actual buildPhase going on here, the derivations of the
-  # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package
-  # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are
-  # also sensitive to the compiler flags provided to stdenv.
-  inherit pname;
-  inherit (redistribRelease) version;
-
-  # Don't force serialization to string for structured attributes, like outputToPatterns
-  # and brokenConditions.
-  # Avoids "set cannot be coerced to string" errors.
-  __structuredAttrs = true;
-
-  # Keep better track of dependencies.
-  strictDeps = true;
-
-  # NOTE: Outputs are evaluated jointly with meta, so in the case that this is an unsupported platform,
-  # we still need to provide a list of outputs.
-  outputs =
-    let
-      # Checks whether the redistributable provides an output.
-      hasOutput =
-        output:
-        attrsets.attrByPath [
-          redistSystem
-          "outputs"
-          output
-        ] false featureRelease;
-      # Order is important here so we use a list.
-      possibleOutputs = [
-        "bin"
-        "lib"
-        "static"
-        "dev"
-        "doc"
-        "sample"
-        "python"
-      ];
-      # Filter out outputs that don't exist in the redistributable.
-      # NOTE: In the case the redistributable isn't supported on the target platform,
-      # we will have `outputs = [ "out" ] ++ possibleOutputs`. This is of note because platforms which
-      # aren't supported would otherwise have evaluation errors when trying to access outputs other than `out`.
-      # The alternative would be to have `outputs = [ "out" ]` when`redistSystem = "unsupported"`, but that would
-      # require adding guards throughout the entirety of the CUDA package set to ensure `cudaSupport` is true --
-      # recall that OfBorg will evaluate packages marked as broken and that `cudaPackages` will be evaluated with
-      # `cudaSupport = false`!
-      additionalOutputs =
-        if redistSystem == "unsupported" then
-          possibleOutputs
-        else
-          builtins.filter hasOutput possibleOutputs;
-      # The out output is special -- it's the default output and we always include it.
-      outputs = [ "out" ] ++ additionalOutputs;
-    in
-    outputs;
-
-  # Traversed in the order of the outputs specified in outputs;
-  # entries are skipped if they don't exist in outputs.
-  outputToPatterns = {
-    bin = [ "bin" ];
-    dev = [
-      "share/pkgconfig"
-      "**/*.pc"
-      "**/*.cmake"
-    ];
-    lib = [
-      "lib"
-      "lib64"
-    ];
-    static = [ "**/*.a" ];
-    sample = [ "samples" ];
-    python = [ "**/*.whl" ];
-  };
-
-  # Useful for introspecting why something went wrong. Maps descriptions of why the derivation would be marked as
-  # broken on have badPlatforms include the current platform.
-
-  # brokenConditions :: AttrSet Bool
-  # Sets `meta.broken = true` if any of the conditions are true.
-  # Example: Broken on a specific version of CUDA or when a dependency has a specific version.
-  brokenConditions = {
-    # Unclear how this is handled by Nix internals.
-    "Duplicate entries in outputs" = finalAttrs.outputs != lists.unique finalAttrs.outputs;
-    # Typically this results in the static output being empty, as all libraries are moved
-    # back to the lib output.
-    "lib output follows static output" =
-      let
-        libIndex = lists.findFirstIndex (x: x == "lib") null finalAttrs.outputs;
-        staticIndex = lists.findFirstIndex (x: x == "static") null finalAttrs.outputs;
-      in
-      libIndex != null && staticIndex != null && libIndex > staticIndex;
-  };
-
-  # badPlatformsConditions :: AttrSet Bool
-  # Sets `meta.badPlatforms = meta.platforms` if any of the conditions are true.
-  # Example: Broken on a specific architecture when some condition is met (like targeting Jetson).
-  badPlatformsConditions = {
-    "No source" = !sourceMatchesHost;
-  };
-
-  # src :: Optional Derivation
-  # If redistSystem doesn't exist in redistribRelease, return null.
-  src = trivial.mapNullable (
-    { relative_path, sha256, ... }:
-    fetchurl {
-      url = "https://developer.download.nvidia.com/compute/${redistName}/redist/${relative_path}";
-      inherit sha256;
-    }
-  ) (redistribRelease.${redistSystem} or null);
-
-  postPatch =
-    # Pkg-config's setup hook expects configuration files in $out/share/pkgconfig
-    ''
-      for path in pkg-config pkgconfig; do
-        [[ -d "$path" ]] || continue
-        mkdir -p share/pkgconfig
-        mv "$path"/* share/pkgconfig/
-        rmdir "$path"
-      done
-    ''
-    # Rewrite FHS paths with store paths
-    # NOTE: output* fall back to out if the corresponding output isn't defined.
-    + ''
-      for pc in share/pkgconfig/*.pc; do
-        sed -i \
-          -e "s|^cudaroot\s*=.*\$|cudaroot=''${!outputDev}|" \
-          -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib|" \
-          -e "s|^includedir\s*=.*/include\$|includedir=''${!outputDev}/include|" \
-          "$pc"
-      done
-    ''
-    # Generate unversioned names.
-    # E.g. cuda-11.8.pc -> cuda.pc
-    + ''
-      for pc in share/pkgconfig/*-"$majorMinorVersion.pc"; do
-        ln -s "$(basename "$pc")" "''${pc%-$majorMinorVersion.pc}".pc
-      done
-    '';
-
-  env.majorMinorVersion = cudaMajorMinorVersion;
-
-  # We do need some other phases, like configurePhase, so the multiple-output setup hook works.
-  dontBuild = true;
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    # This hook will make sure libcuda can be found
-    # in typically /lib/opengl-driver by adding that
-    # directory to the rpath of all ELF binaries.
-    # Check e.g. with `patchelf --print-rpath path/to/my/binary
-    autoAddDriverRunpath
-    markForCudatoolkitRootHook
-  ]
-  # autoAddCudaCompatRunpath depends on cuda_compat and would cause
-  # infinite recursion if applied to `cuda_compat` itself (beside the fact
-  # that it doesn't make sense in the first place)
-  ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [
-    # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
-    # See its documentation in ./setup-hooks/extension.nix.
-    autoAddCudaCompatRunpath
-  ];
-
-  buildInputs = [
-    # autoPatchelfHook will search for a libstdc++ and we're giving it
-    # one that is compatible with the rest of nixpkgs, even when
-    # nvcc forces us to use an older gcc
-    # NB: We don't actually know if this is the right thing to do
-    (lib.getLib stdenv.cc.cc)
-  ];
-
-  # Picked up by autoPatchelf
-  # Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins
-  appendRunpaths = [ "$ORIGIN" ];
-
-  # NOTE: We don't need to check for dev or doc, because those outputs are handled by
-  # the multiple-outputs setup hook.
-  # NOTE: moveToOutput operates on all outputs:
-  # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107
-  installPhase =
-    let
-      mkMoveToOutputCommand =
-        output:
-        let
-          template = pattern: ''moveToOutput "${pattern}" "${"$" + output}"'';
-          patterns = finalAttrs.outputToPatterns.${output} or [ ];
-        in
-        strings.concatMapStringsSep "\n" template patterns;
-    in
-    # Pre-install hook
-    ''
-      runHook preInstall
-    ''
-    # Handle the existence of libPath, which requires us to re-arrange the lib directory
-    + strings.optionalString (libPath != null) ''
-      full_lib_path="lib/${libPath}"
-      if [[ ! -d "$full_lib_path" ]]; then
-        echo "${finalAttrs.pname}: '$full_lib_path' does not exist, only found:" >&2
-        find lib/ -mindepth 1 -maxdepth 1 >&2
-        echo "This release might not support your CUDA version" >&2
-        exit 1
-      fi
-      echo "Making libPath '$full_lib_path' the root of lib" >&2
-      mv "$full_lib_path" lib_new
-      rm -r lib
-      mv lib_new lib
-    ''
-    # Create the primary output, out, and move the other outputs into it.
-    + ''
-      mkdir -p "$out"
-      mv * "$out"
-    ''
-    # Move the outputs into their respective outputs.
-    + strings.concatMapStringsSep "\n" mkMoveToOutputCommand (builtins.tail finalAttrs.outputs)
-    # Add a newline to the end of the installPhase, so that the post-install hook doesn't
-    # get concatenated with the last moveToOutput command.
-    + "\n"
-    # Post-install hook
-    + ''
-      runHook postInstall
-    '';
-
-  doInstallCheck = true;
-  allowFHSReferences = true; # TODO: Default to `false`
-  postInstallCheck = ''
-    echo "Executing postInstallCheck"
-
-    if [[ -z "''${allowFHSReferences-}" ]]; then
-      mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "''${!o}"; done)
-      if grep --max-count=5 --recursive --exclude=LICENSE /usr/ "''${outputPaths[@]}"; then
-        echo "Detected references to /usr" >&2
-        exit 1
-      fi
-    fi
-  '';
-
-  # libcuda needs to be resolved during runtime
-  autoPatchelfIgnoreMissingDeps = [
-    "libcuda.so"
-    "libcuda.so.*"
-  ];
-
-  # _multioutPropagateDev() currently expects a space-separated string rather than an array
-  preFixup = ''
-    export propagatedBuildOutputs="''${propagatedBuildOutputs[@]}"
-  '';
-
-  # Propagate all outputs, including `static`
-  propagatedBuildOutputs = builtins.filter (x: x != "dev") finalAttrs.outputs;
-
-  # Kept in case overrides assume postPhases have already been defined
-  postPhases = [ "postPatchelf" ];
-  postPatchelf = ''
-    true
-  '';
-
-  passthru = {
-    # Provide access to the release information for fixup functions.
-    inherit redistribRelease featureRelease;
-    # Make the CUDA-patched stdenv available
-    stdenv = backendStdenv;
-  };
-
-  meta = {
-    description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}";
-    sourceProvenance = [ sourceTypes.binaryNativeCode ];
-    broken = lists.any trivial.id (attrsets.attrValues finalAttrs.brokenConditions);
-    platforms = trivial.pipe supportedRedistSystems [
-      # Map each redist system to the equivalent nix systems.
-      (lib.concatMap _cuda.lib.getNixSystems)
-      # Take all the unique values.
-      lib.unique
-      # Sort the list.
-      lib.naturalSort
-    ];
-    badPlatforms =
-      let
-        isBadPlatform = lists.any trivial.id (attrsets.attrValues finalAttrs.badPlatformsConditions);
-      in
-      lists.optionals isBadPlatform finalAttrs.meta.platforms;
-    license =
-      if redistName == "cuda" then
-        # Add the package-specific license.
-        let
-          licensePath =
-            if redistribRelease.license_path != null then
-              redistribRelease.license_path
-            else
-              "${pname}/LICENSE.txt";
-          url = "https://developer.download.nvidia.com/compute/cuda/redist/${licensePath}";
-        in
-        lib.licenses.nvidiaCudaRedist // { inherit url; }
-      else
-        licenses.unfree;
-    teams = [ teams.cuda ];
-  };
-})).overrideAttrs
-  fixup
diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
deleted file mode 100644
index 3085ae3e4610..000000000000
--- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  lib,
-  cudaLib,
-  cudaMajorMinorVersion,
-  redistSystem,
-  stdenv,
-  # Builder-specific arguments
-  # Short package name (e.g., "cuda_cccl")
-  # pname : String
-  pname,
-  # Common name (e.g., "cutensor" or "cudnn") -- used in the URL.
-  # Also known as the Redistributable Name.
-  # redistName : String,
-  redistName,
-  # releasesModule :: Path
-  # A path to a module which provides a `releases` attribute
-  releasesModule,
-  # shims :: Path
-  # A path to a module which provides a `shims` attribute
-  # The redistribRelease is only used in ./manifest.nix for the package version
-  # and the package description (which NVIDIA's manifest calls the "name").
-  # It's also used for fetching the source, but we override that since we can't
-  # re-use that portion of the functionality (different URLs, etc.).
-  # The featureRelease is used to populate meta.platforms (by way of looking at the attribute names), determine the
-  # outputs of the package, and provide additional package-specific constraints (e.g., min/max supported CUDA versions,
-  # required versions of other packages, etc.).
-  # shimFn :: {package, redistSystem} -> AttrSet
-  shimsFn ? (throw "shimsFn must be provided"),
-}:
-let
-  evaluatedModules = lib.modules.evalModules {
-    modules = [
-      ../modules
-      releasesModule
-    ];
-  };
-
-  # NOTE: Important types:
-  # - Releases: ../modules/${pname}/releases/releases.nix
-  # - Package: ../modules/${pname}/releases/package.nix
-
-  # Check whether a package supports our CUDA version.
-  # satisfiesCudaVersion :: Package -> Bool
-  satisfiesCudaVersion =
-    package:
-    lib.versionAtLeast cudaMajorMinorVersion package.minCudaVersion
-    && lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion;
-
-  # FIXME: do this at the module system level
-  propagatePlatforms = lib.mapAttrs (redistSystem: lib.map (p: { inherit redistSystem; } // p));
-
-  # Releases for all platforms and all CUDA versions.
-  allReleases = propagatePlatforms evaluatedModules.config.${pname}.releases;
-
-  # Releases for all platforms and our CUDA version.
-  allReleases' = lib.mapAttrs (_: lib.filter satisfiesCudaVersion) allReleases;
-
-  # Packages for all platforms and our CUDA versions.
-  allPackages = lib.concatLists (lib.attrValues allReleases');
-
-  packageOlder = p1: p2: lib.versionOlder p1.version p2.version;
-  packageSupportedPlatform = p: p.redistSystem == redistSystem;
-
-  # Compute versioned attribute name to be used in this package set
-  # Patch version changes should not break the build, so we only use major and minor
-  # computeName :: Package -> String
-  computeName = { version, ... }: cudaLib.mkVersionedName pname (lib.versions.majorMinor version);
-
-  # The newest package for each major-minor version, with newest first.
-  # newestPackages :: List Package
-  newestPackages =
-    let
-      newestForEachMajorMinorVersion = lib.foldl' (
-        newestPackages: package:
-        let
-          majorMinorVersion = lib.versions.majorMinor package.version;
-          existingPackage = newestPackages.${majorMinorVersion} or null;
-        in
-        newestPackages
-        // {
-          ${majorMinorVersion} =
-            # Only keep the existing package if it is newer than the one we are considering or it is supported on the
-            # current platform and the one we are considering is not.
-            if
-              existingPackage != null
-              && (
-                packageOlder package existingPackage
-                || (!packageSupportedPlatform package && packageSupportedPlatform existingPackage)
-              )
-            then
-              existingPackage
-            else
-              package;
-        }
-      ) { } allPackages;
-    in
-    # Sort the packages by version so the newest is first.
-    # NOTE: builtins.sort requires a strict weak ordering, so we must use versionOlder rather than versionAtLeast.
-    # See https://github.com/NixOS/nixpkgs/commit/9fd753ea84e5035b357a275324e7fd7ccfb1fc77.
-    lib.sort (lib.flip packageOlder) (lib.attrValues newestForEachMajorMinorVersion);
-
-  extension =
-    final: _:
-    let
-      # Builds our package into derivation and wraps it in a nameValuePair, where the name is the versioned name
-      # of the package.
-      buildPackage =
-        package:
-        let
-          shims = final.callPackage shimsFn { inherit package redistSystem; };
-          name = computeName package;
-          drv = final.callPackage ./manifest.nix {
-            inherit pname redistName;
-            inherit (shims) redistribRelease featureRelease;
-          };
-        in
-        lib.nameValuePair name drv;
-
-      # versionedDerivations :: AttrSet Derivation
-      versionedDerivations = builtins.listToAttrs (lib.map buildPackage newestPackages);
-
-      defaultDerivation = {
-        ${pname} = (buildPackage (lib.head newestPackages)).value;
-      };
-    in
-    # NOTE: Must condition on the length of newestPackages to avoid non-total function lib.head aborting if
-    # newestPackages is empty.
-    lib.optionalAttrs (lib.length newestPackages > 0) (versionedDerivations // defaultDerivation);
-in
-extension
diff --git a/pkgs/development/cuda-modules/modules/README.md b/pkgs/development/cuda-modules/modules/README.md
deleted file mode 100644
index ab56463eea59..000000000000
--- a/pkgs/development/cuda-modules/modules/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Modules
-
-Modules as they are used in `modules` exist primarily to check the shape and
-content of CUDA redistributable and feature manifests. They are ultimately meant
-to reduce the repetitive nature of repackaging CUDA redistributables.
-
-Building most redistributables follows a pattern of a manifest indicating which
-packages are available at a location, their versions, and their hashes. To avoid
-creating builders for each and every derivation, modules serve as a way for us
-to use a single `genericManifestBuilder` to build all redistributables.
-
-## `generic`
-
-The modules in `generic` are reusable components meant to check the shape and
-content of NVIDIA's CUDA redistributable manifests, our feature manifests (which
-are derived from NVIDIA's manifests), or hand-crafted Nix expressions describing
-available packages. They are used by the `genericManifestBuilder` to build CUDA
-redistributables.
-
-Generally, each package which relies on manifests or Nix release expressions
-will create an alias to the relevant generic module. For example, the [module
-for CUDNN](./cudnn/default.nix) aliases the generic module for release
-expressions, while the [module for CUDA redistributables](./cuda/default.nix)
-aliases the generic module for manifests.
-
-Alternatively, additional fields or values may need to be configured to account
-for the particulars of a package. For example, while the release expressions for
-[CUDNN](../cudnn/releases.nix) and [TensorRT](../tensorrt/releases.nix) are very
-close, they differ slightly in the fields they have. The [module for
-CUDNN](./cudnn/default.nix) is able to use the generic module for
-release expressions, while the [module for
-TensorRT](./tensorrt/default.nix) must add additional fields to the
-generic module.
-
-### `manifests`
-
-The modules in `generic/manifests` define the structure of NVIDIA's CUDA
-redistributable manifests and our feature manifests.
-
-NVIDIA's redistributable manifests are retrieved from their web server, while
-the feature manifests are produced by
-[`cuda-redist-find-features`](https://github.com/connorbaker/cuda-redist-find-features).
-
-### `releases`
-
-The modules in `generic/releases` define the structure of our hand-crafted Nix
-expressions containing information necessary to download and repackage CUDA
-redistributables. These expressions are created when NVIDIA-provided manifests
-are unavailable or otherwise unusable. For example, though CUDNN has manifests,
-a bug in NVIDIA's CI/CD causes manifests for different versions of CUDA to use
-the same name, which leads to the manifests overwriting each other.
-
-### `types`
-
-The modules in `generic/types` define reusable types used in both
-`generic/manifests` and `generic/releases`.
diff --git a/pkgs/development/cuda-modules/modules/cuda/default.nix b/pkgs/development/cuda-modules/modules/cuda/default.nix
deleted file mode 100644
index 2ff6c885623d..000000000000
--- a/pkgs/development/cuda-modules/modules/cuda/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ options, ... }:
-{
-  options.cuda.manifests = options.generic.manifests;
-}
diff --git a/pkgs/development/cuda-modules/modules/cudnn/default.nix b/pkgs/development/cuda-modules/modules/cudnn/default.nix
deleted file mode 100644
index 36a9a26bda52..000000000000
--- a/pkgs/development/cuda-modules/modules/cudnn/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ options, ... }:
-{
-  options.cudnn.releases = options.generic.releases;
-  # TODO(@connorbaker): Figure out how to add additional options to the
-  # to the generic release.
-  # {
-  #   url = options.mkOption {
-  #     description = "URL to download the tarball from";
-  #     type = types.str;
-  #   };
-  # }
-}
diff --git a/pkgs/development/cuda-modules/modules/cusparselt/default.nix b/pkgs/development/cuda-modules/modules/cusparselt/default.nix
deleted file mode 100644
index 745bad811c05..000000000000
--- a/pkgs/development/cuda-modules/modules/cusparselt/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ options, ... }:
-{
-  options.cusparselt.manifests = options.generic.manifests;
-}
diff --git a/pkgs/development/cuda-modules/modules/cutensor/default.nix b/pkgs/development/cuda-modules/modules/cutensor/default.nix
deleted file mode 100644
index e3eb5383669b..000000000000
--- a/pkgs/development/cuda-modules/modules/cutensor/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ options, ... }:
-{
-  options.cutensor.manifests = options.generic.manifests;
-}
diff --git a/pkgs/development/cuda-modules/modules/default.nix b/pkgs/development/cuda-modules/modules/default.nix
deleted file mode 100644
index a173d1cae360..000000000000
--- a/pkgs/development/cuda-modules/modules/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./generic
-    # Always after generic
-    ./cuda
-    ./cudnn
-    ./cusparselt
-    ./cutensor
-    ./tensorrt
-  ];
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/default.nix b/pkgs/development/cuda-modules/modules/generic/default.nix
deleted file mode 100644
index b68aa614f240..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./types
-    ./manifests
-    ./releases
-  ];
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/default.nix b/pkgs/development/cuda-modules/modules/generic/manifests/default.nix
deleted file mode 100644
index c30589af6219..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ lib, config, ... }:
-{
-  options.generic.manifests = {
-    feature = import ./feature/manifest.nix { inherit lib config; };
-    redistrib = import ./redistrib/manifest.nix { inherit lib; };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix
deleted file mode 100644
index 2c874b5e4c25..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib) options trivial types;
-  Release = import ./release.nix { inherit lib config; };
-in
-options.mkOption {
-  description = "Feature manifest is an attribute set which includes a mapping from package name to release";
-  example = trivial.importJSON ../../../../cuda/manifests/feature_11.8.0.json;
-  type = types.attrsOf Release.type;
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix
deleted file mode 100644
index 961f0b968685..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-in
-# https://github.com/ConnorBaker/cuda-redist-find-features/blob/603407bea2fab47f2dfcd88431122a505af95b42/cuda_redist_find_features/manifest/feature/package/package.py
-options.mkOption {
-  description = "Set of outputs that a package can provide";
-  example = {
-    bin = true;
-    dev = true;
-    doc = false;
-    lib = false;
-    sample = false;
-    static = false;
-  };
-  type = types.submodule {
-    options = {
-      bin = options.mkOption {
-        description = "`bin` output requires that we have a non-empty `bin` directory containing at least one file with the executable bit set";
-        type = types.bool;
-      };
-      dev = options.mkOption {
-        description = ''
-          A `dev` output requires that we have at least one of the following non-empty directories:
-
-          - `include`
-          - `lib/pkgconfig`
-          - `share/pkgconfig`
-          - `lib/cmake`
-          - `share/aclocal`
-        '';
-        type = types.bool;
-      };
-      doc = options.mkOption {
-        description = ''
-          A `doc` output requires that we have at least one of the following non-empty directories:
-
-          - `share/info`
-          - `share/doc`
-          - `share/gtk-doc`
-          - `share/devhelp`
-          - `share/man`
-        '';
-        type = types.bool;
-      };
-      lib = options.mkOption {
-        description = "`lib` output requires that we have a non-empty lib directory containing at least one shared library";
-        type = types.bool;
-      };
-      sample = options.mkOption {
-        description = "`sample` output requires that we have a non-empty `samples` directory";
-        type = types.bool;
-      };
-      static = options.mkOption {
-        description = "`static` output requires that we have a non-empty lib directory containing at least one static library";
-        type = types.bool;
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix
deleted file mode 100644
index 2563598a7829..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-  Outputs = import ./outputs.nix { inherit lib; };
-in
-options.mkOption {
-  description = "Package in the manifest";
-  example = (import ./release.nix { inherit lib; }).linux-x86_64;
-  type = types.submodule { options.outputs = Outputs; };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix
deleted file mode 100644
index 6754ae56e0b0..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib) options types;
-  Package = import ./package.nix { inherit lib config; };
-in
-options.mkOption {
-  description = "Release is an attribute set which includes a mapping from platform to package";
-  example = (import ./manifest.nix { inherit lib; }).cuda_cccl;
-  type = types.attrsOf Package.type;
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix
deleted file mode 100644
index ec8cba3c7858..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options trivial types;
-  Release = import ./release.nix { inherit lib; };
-in
-options.mkOption {
-  description = "Redistributable manifest is an attribute set which includes a mapping from package name to release";
-  example = trivial.importJSON ../../../../cuda/manifests/redistrib_11.8.0.json;
-  type = types.submodule {
-    # Allow any attribute name as these will be the package names
-    freeformType = types.attrsOf Release.type;
-    options = {
-      release_date = options.mkOption {
-        description = "Release date of the manifest";
-        type = types.nullOr types.str;
-        default = null;
-        example = "2023-08-29";
-      };
-      release_label = options.mkOption {
-        description = "Release label of the manifest";
-        type = types.nullOr types.str;
-        default = null;
-        example = "12.2.2";
-      };
-      release_product = options.mkOption {
-        example = "cuda";
-        description = "Release product of the manifest";
-        type = types.nullOr types.str;
-        default = null;
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix
deleted file mode 100644
index bf3bd478a123..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-in
-options.mkOption {
-  description = "Package in the manifest";
-  example = (import ./release.nix { inherit lib; }).linux-x86_64;
-  type = types.submodule {
-    options = {
-      relative_path = options.mkOption {
-        description = "Relative path to the package";
-        example = "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.5.62-archive.tar.xz";
-        type = types.str;
-      };
-      sha256 = options.mkOption {
-        description = "Sha256 hash of the package";
-        example = "bbe633d6603d5a96a214dcb9f3f6f6fd2fa04d62e53694af97ae0c7afe0121b0";
-        type = types.str;
-      };
-      md5 = options.mkOption {
-        description = "Md5 hash of the package";
-        example = "e5deef4f6cb71f14aac5be5d5745dafe";
-        type = types.str;
-      };
-      size = options.mkOption {
-        description = "Size of the package as a string";
-        type = types.str;
-        example = "960968";
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix
deleted file mode 100644
index 0165ecbb08bc..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-  Package = import ./package.nix { inherit lib; };
-in
-options.mkOption {
-  description = "Release is an attribute set which includes a mapping from platform to package";
-  example = (import ./manifest.nix { inherit lib; }).cuda_cccl;
-  type = types.submodule {
-    # Allow any attribute name as these will be the platform names
-    freeformType = types.attrsOf Package.type;
-    options = {
-      name = options.mkOption {
-        description = "Full name of the package";
-        example = "CXX Core Compute Libraries";
-        type = types.str;
-      };
-      license = options.mkOption {
-        description = "License of the package";
-        example = "CUDA Toolkit";
-        type = types.str;
-      };
-      license_path = options.mkOption {
-        description = "Path to the license of the package";
-        example = "cuda_cccl/LICENSE.txt";
-        default = null;
-        type = types.nullOr types.str;
-      };
-      version = options.mkOption {
-        description = "Version of the package";
-        example = "11.5.62";
-        type = types.str;
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/releases/default.nix b/pkgs/development/cuda-modules/modules/generic/releases/default.nix
deleted file mode 100644
index 87985ef08134..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/releases/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (config.generic.types) majorMinorVersion majorMinorPatchBuildVersion;
-  inherit (lib) options types;
-in
-{
-  options.generic.releases = options.mkOption {
-    description = "Collection of packages targeting different platforms";
-    type =
-      let
-        Package = options.mkOption {
-          description = "Package for a specific platform";
-          example = {
-            version = "8.0.3.4";
-            minCudaVersion = "10.2";
-            maxCudaVersion = "10.2";
-            hash = "sha256-LxcXgwe1OCRfwDsEsNLIkeNsOcx3KuF5Sj+g2dY6WD0=";
-          };
-          type = types.submodule {
-            # TODO(@connorbaker): Figure out how to extend option sets.
-            freeformType = types.attrsOf types.anything;
-            options = {
-              version = options.mkOption {
-                description = "Version of the package";
-                type = majorMinorPatchBuildVersion;
-              };
-              minCudaVersion = options.mkOption {
-                description = "Minimum CUDA version supported";
-                type = majorMinorVersion;
-              };
-              maxCudaVersion = options.mkOption {
-                description = "Maximum CUDA version supported";
-                type = majorMinorVersion;
-              };
-              hash = options.mkOption {
-                description = "Hash of the tarball";
-                type = types.str;
-              };
-            };
-          };
-        };
-      in
-      types.attrsOf (types.listOf Package.type);
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/types/default.nix b/pkgs/development/cuda-modules/modules/generic/types/default.nix
deleted file mode 100644
index 31e0a4403e81..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/types/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-in
-{
-  options.generic.types = options.mkOption {
-    type = types.attrsOf types.optionType;
-    default = { };
-    description = "Set of generic types";
-  };
-  config.generic.types = {
-    cudaArch = types.strMatching "^sm_[[:digit:]]+[a-z]?$" // {
-      name = "cudaArch";
-      description = "CUDA architecture name";
-    };
-    # https://github.com/ConnorBaker/cuda-redist-find-features/blob/c841980e146f8664bbcd0ba1399e486b7910617b/cuda_redist_find_features/types/_lib_so_name.py
-    libSoName = types.strMatching ".*\\.so(\\.[[:digit:]]+)*$" // {
-      name = "libSoName";
-      description = "Name of a shared object file";
-    };
-
-    majorMinorVersion = types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)$" // {
-      name = "majorMinorVersion";
-      description = "Version number with a major and minor component";
-    };
-
-    majorMinorPatchVersion = types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)$" // {
-      name = "majorMinorPatchVersion";
-      description = "Version number with a major, minor, and patch component";
-    };
-
-    majorMinorPatchBuildVersion =
-      types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)$"
-      // {
-        name = "majorMinorPatchBuildVersion";
-        description = "Version number with a major, minor, patch, and build component";
-      };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/tensorrt/default.nix b/pkgs/development/cuda-modules/modules/tensorrt/default.nix
deleted file mode 100644
index a214a26e434b..000000000000
--- a/pkgs/development/cuda-modules/modules/tensorrt/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ options, ... }:
-{
-  options.tensorrt.releases = options.generic.releases;
-  # TODO(@connorbaker): Figure out how to add additional options to the
-  # to the generic release.
-  # {
-  #   cudnnVersion = lib.options.mkOption {
-  #     description = "CUDNN version supported";
-  #     type = types.nullOr majorMinorVersion;
-  #   };
-  #   filename = lib.options.mkOption {
-  #     description = "Tarball name";
-  #     type = types.str;
-  #   };
-  # }
-}
diff --git a/pkgs/development/cuda-modules/packages/README.md b/pkgs/development/cuda-modules/packages/README.md
new file mode 100644
index 000000000000..322522b048de
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/README.md
@@ -0,0 +1,19 @@
+# packages
+
+Packages which are not created by the redistributable builder.
+
+## Conventions
+
+- All new packages should include the following lines as part of their arguments to `stdenv.mkDerivation`:
+
+  ```nix
+  finalAttrs: {
+    __structuredAttrs = true;
+    strictDeps = true;
+
+    # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+    name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  }
+  ```
+
+  If the package does not require elements of the package set, then the `cudaNamePrefix` must be omitted: changing the name of a derivation yields a different hash and store path, so we would end up with multiple different store paths with the same content.
diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
index fc41024f1551..000c911887a5 100644
--- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
+++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
@@ -3,18 +3,24 @@
 # coming from the cuda_compat package by adding it to the RUNPATH.
 echo "Sourcing auto-add-cuda-compat-runpath-hook"
 
+# shellcheck disable=SC2157
+if [[ -z "@libcudaPath@" ]]; then
+  echo "auto-add-cuda-compat-runpath-hook: cuda_compat not available, skipping hook"
+  return
+fi
+
 addCudaCompatRunpath() {
   local libPath
   local origRpath
 
   if [[ $# -eq 0 ]]; then
-    echo "addCudaCompatRunpath: no library path provided" >&2
+    nixLog "no library path provided" >&2
     exit 1
   elif [[ $# -gt 1 ]]; then
-    echo "addCudaCompatRunpath: too many arguments" >&2
+    nixLog "too many arguments" >&2
     exit 1
-  elif [[ "$1" == "" ]]; then
-    echo "addCudaCompatRunpath: empty library path" >&2
+  elif [[ $1 == "" ]]; then
+    nixLog "empty library path" >&2
     exit 1
   else
     libPath="$1"
diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
index 5df6535bc81d..75a279addf78 100644
--- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
+++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
@@ -6,24 +6,24 @@
 {
   autoFixElfFiles,
   cuda_compat,
+  lib,
   makeSetupHook,
 }:
+let
+  # cuda_compat can be null or broken, depending on the platform, CUDA release, and compute capability.
+  # To avoid requiring all consumers of this hook to do these checks, we do them here; the hook is a no-op if
+  # cuda_compat is not available.
+  enableHook = cuda_compat.meta.available or false;
+in
 makeSetupHook {
   name = "auto-add-cuda-compat-runpath-hook";
-  propagatedBuildInputs = [ autoFixElfFiles ];
+  propagatedBuildInputs = lib.optionals enableHook [ autoFixElfFiles ];
 
   substitutions = {
-    libcudaPath = "${cuda_compat}/compat";
+    libcudaPath = lib.optionalString enableHook "${cuda_compat}/compat";
   };
 
-  meta =
-    let
-      # Handle `null`s in pre-`cuda_compat` releases,
-      # and `badPlatform`s for `!isJetsonBuild`.
-      platforms = cuda_compat.meta.platforms or [ ];
-      badPlatforms = cuda_compat.meta.badPlatforms or platforms;
-    in
-    {
-      inherit badPlatforms platforms;
-    };
+  passthru = {
+    inherit enableHook;
+  };
 } ./auto-add-cuda-compat-runpath.sh
diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix
index c0fbb7068a9a..c7b0dbd549a5 100644
--- a/pkgs/development/cuda-modules/packages/backendStdenv.nix
+++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix
@@ -6,8 +6,8 @@
 # E.g. for cudaPackages_12_9 we use gcc14 with gcc's libstdc++
 # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
 {
-  config,
   _cuda,
+  config,
   cudaMajorMinorVersion,
   lib,
   pkgs,
@@ -15,18 +15,35 @@
   stdenvAdapters,
 }:
 let
-  inherit (builtins) toJSON;
+  inherit (builtins)
+    throw
+    toJSON
+    toString
+    ;
   inherit (_cuda.db) allSortedCudaCapabilities cudaCapabilityToInfo nvccCompatibilities;
   inherit (_cuda.lib)
     _cudaCapabilityIsDefault
     _cudaCapabilityIsSupported
-    _evaluateAssertions
+    _mkFailedAssertionsString
     getRedistSystem
     mkVersionedName
     ;
-  inherit (lib) addErrorContext;
-  inherit (lib.customisation) extendDerivation;
-  inherit (lib.lists) filter intersectLists subtractLists;
+  inherit (lib)
+    assertMsg
+    extendDerivation
+    filter
+    findFirst
+    flip
+    intersectLists
+    pipe
+    range
+    reverseList
+    subtractLists
+    toIntBase10
+    versionAtLeast
+    versionOlder
+    ;
+  inherit (lib.versions) major;
 
   # NOTE: By virtue of processing a sorted list (allSortedCudaCapabilities), our groups will be sorted.
 
@@ -45,11 +62,18 @@ let
   passthruExtra = {
     nvccHostCCMatchesStdenvCC = backendStdenv.cc == stdenv.cc;
 
+    # TODO(@connorbaker): Does it make sense to expose the `stdenv` we were called with and the `stdenv` selected
+    # prior to using `stdenvAdapters.useLibsFrom`?
+
     # The Nix system of the host platform.
     hostNixSystem = stdenv.hostPlatform.system;
 
     # The Nix system of the host platform for the CUDA redistributable.
-    hostRedistSystem = getRedistSystem passthruExtra.hasJetsonCudaCapability stdenv.hostPlatform.system;
+    hostRedistSystem = getRedistSystem {
+      inherit (passthruExtra) cudaCapabilities;
+      inherit cudaMajorMinorVersion;
+      inherit (stdenv.hostPlatform) system;
+    };
 
     # Sets whether packages should be built with forward compatibility.
     # TODO(@connorbaker): If the requested CUDA capabilities are not supported by the current CUDA version,
@@ -98,57 +122,150 @@ let
 
   assertions =
     let
-      # Jetson devices cannot be targeted by the same binaries which target non-Jetson devices. While
+      # Jetson devices (pre-Thor) cannot be targeted by the same binaries which target non-Jetson devices. While
       # NVIDIA provides both `linux-aarch64` and `linux-sbsa` packages, which both target `aarch64`,
       # they are built with different settings and cannot be mixed.
-      jetsonMesssagePrefix = "Jetson CUDA capabilities (${toJSON passthruExtra.requestedJetsonCudaCapabilities})";
+      preThorJetsonCudaCapabilities = filter (flip versionOlder "10.1") passthruExtra.requestedJetsonCudaCapabilities;
+      postThorJetsonCudaCapabilities = filter (flip versionAtLeast "10.1") passthruExtra.requestedJetsonCudaCapabilities;
 
       # Remove all known capabilities from the user's list to find unrecognized capabilities.
       unrecognizedCudaCapabilities = subtractLists allSortedCudaCapabilities passthruExtra.cudaCapabilities;
 
-      # Remove all supported capabilities from the user's list to find unsupported capabilities.
-      unsupportedCudaCapabilities = subtractLists passthruExtra.supportedCudaCapabilities passthruExtra.cudaCapabilities;
+      # Capabilities which are too old for this CUDA version.
+      tooOldCudaCapabilities = filter (
+        cap:
+        let
+          # This can be null!
+          maybeMax = cudaCapabilityToInfo.${cap}.maxCudaMajorMinorVersion;
+        in
+        maybeMax != null && lib.versionOlder maybeMax cudaMajorMinorVersion
+      ) passthruExtra.cudaCapabilities;
+
+      # Capabilities which are too new for this CUDA version.
+      tooNewCudaCapabilities = filter (
+        cap: lib.versionOlder cudaMajorMinorVersion cudaCapabilityToInfo.${cap}.minCudaMajorMinorVersion
+      ) passthruExtra.cudaCapabilities;
     in
     [
       {
-        message = "Unrecognized CUDA capabilities: ${toJSON unrecognizedCudaCapabilities}";
+        message = "Requested unrecognized CUDA capabilities: ${toJSON unrecognizedCudaCapabilities}";
         assertion = unrecognizedCudaCapabilities == [ ];
       }
       {
-        message = "Unsupported CUDA capabilities: ${toJSON unsupportedCudaCapabilities}";
-        assertion = unsupportedCudaCapabilities == [ ];
+        message = "Requested CUDA capabilities which are too old for CUDA ${cudaMajorMinorVersion}: ${toJSON tooOldCudaCapabilities}";
+        assertion = tooOldCudaCapabilities == [ ];
+      }
+      {
+        message = "Requested CUDA capabilities which are too new for CUDA ${cudaMajorMinorVersion}: ${toJSON tooNewCudaCapabilities}";
+        assertion = tooNewCudaCapabilities == [ ];
       }
       {
         message =
-          "${jetsonMesssagePrefix} require hostPlatform (currently ${passthruExtra.hostNixSystem}) "
-          + "to be aarch64-linux";
+          "Requested Jetson CUDA capabilities (${toJSON passthruExtra.requestedJetsonCudaCapabilities}) require "
+          + "hostPlatform (${passthruExtra.hostNixSystem}) to be aarch64-linux";
         assertion = passthruExtra.hasJetsonCudaCapability -> passthruExtra.hostNixSystem == "aarch64-linux";
       }
       {
         message =
-          let
-            # Find the capabilities which are not Jetson capabilities.
-            requestedNonJetsonCudaCapabilities = subtractLists (
-              passthruExtra.requestedJetsonCudaCapabilities
-              ++ passthruExtra.requestedArchitectureSpecificCudaCapabilities
-              ++ passthruExtra.requestedFamilySpecificCudaCapabilities
-            ) passthruExtra.cudaCapabilities;
-          in
-          "${jetsonMesssagePrefix} cannot be specified with non-Jetson capabilities "
-          + "(${toJSON requestedNonJetsonCudaCapabilities})";
+          "Requested pre-Thor (10.1) Jetson CUDA capabilities (${toJSON preThorJetsonCudaCapabilities}) cannot be "
+          + "specified with other capabilities (${toJSON (subtractLists preThorJetsonCudaCapabilities passthruExtra.cudaCapabilities)})";
         assertion =
-          passthruExtra.hasJetsonCudaCapability
-          -> passthruExtra.requestedJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
+          # If there are preThorJetsonCudaCapabilities, they must be the only requested capabilities.
+          preThorJetsonCudaCapabilities != [ ]
+          -> preThorJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
+      }
+      {
+        message =
+          "Requested pre-Thor (10.1) Jetson CUDA capabilities (${toJSON preThorJetsonCudaCapabilities}) require "
+          + "computed NVIDIA hostRedistSystem (${passthruExtra.hostRedistSystem}) to be linux-aarch64";
+        assertion =
+          preThorJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-aarch64";
+      }
+      {
+        message =
+          "Requested post-Thor (10.1) Jetson CUDA capabilities (${toJSON postThorJetsonCudaCapabilities}) require "
+          + "computed NVIDIA hostRedistSystem (${passthruExtra.hostRedistSystem}) to be linux-sbsa";
+        assertion = postThorJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-sbsa";
       }
     ];
 
-  assertCondition = addErrorContext "while evaluating ${mkVersionedName "cudaPackages" cudaMajorMinorVersion}.backendStdenv" (
-    _evaluateAssertions assertions
-  );
+  failedAssertionsString = _mkFailedAssertionsString assertions;
 
+  # TODO(@connorbaker): Seems like `stdenvAdapters.useLibsFrom` breaks clangStdenv's ability to find header files.
+  # To reproduce: use `nix shell .#cudaPackages_12_6.backendClangStdenv.cc` since CUDA 12.6 supports at most Clang
+  # 18, but the current stdenv uses Clang 19, requiring this code path.
+  # With:
+  #
+  # ```cpp
+  # #include <cmath>
+  #
+  # int main() {
+  #     double value = 0.5;
+  #     double result = std::sin(value);
+  #     return 0;
+  # }
+  # ```
+  #
+  # we get:
+  #
+  # ```console
+  # $ clang++ ./main.cpp
+  # ./main.cpp:1:10: fatal error: 'cmath' file not found
+  #     1 | #include <cmath>
+  #       |          ^~~~~~~
+  # 1 error generated.
+  # ```
+  # TODO(@connorbaker): Seems like even using unmodified `clangStdenv` causes issues -- saxpy fails to build CMake
+  # errors during CUDA compiler identification about invalid redefinitions of things like `realpath`.
   backendStdenv =
-    stdenvAdapters.useLibsFrom stdenv
-      pkgs."gcc${nvccCompatibilities.${cudaMajorMinorVersion}.gcc.maxMajorVersion}Stdenv";
+    let
+      hostCCName =
+        if stdenv.cc.isGNU then
+          "gcc"
+        else if stdenv.cc.isClang then
+          "clang"
+        else
+          throw "cudaPackages.backendStdenv: unsupported host compiler: ${stdenv.cc.name}";
+
+      versions = nvccCompatibilities.${cudaMajorMinorVersion}.${hostCCName};
+
+      stdenvIsSupportedVersion =
+        versionAtLeast (major stdenv.cc.version) versions.minMajorVersion
+        && versionAtLeast versions.maxMajorVersion (major stdenv.cc.version);
+
+      maybeGetVersionedCC =
+        if hostCCName == "gcc" then
+          version: pkgs."gcc${version}Stdenv" or null
+        else
+          version: pkgs."llvmPackages_${version}".stdenv or null;
+
+      maybeHostStdenv =
+        pipe (range (toIntBase10 versions.minMajorVersion) (toIntBase10 versions.maxMajorVersion))
+          [
+            # Convert integers to strings.
+            (map toString)
+            # Prefer the highest available version.
+            reverseList
+            # Map to the actual stdenvs or null if unavailable.
+            (map maybeGetVersionedCC)
+            # Get the first available version.
+            (findFirst (x: x != null) null)
+          ];
+    in
+    # If the current stdenv's compiler version is compatible, or we're on an unsupported host system, use stdenv
+    # directly.
+    # If we're on an unsupported host system (like darwin), there's not much else we can do, but we should not break
+    # evaluation on unsupported systems.
+    if stdenvIsSupportedVersion || passthruExtra.hostRedistSystem == "unsupported" then
+      stdenv
+    # Otherwise, try to find a compatible stdenv.
+    else
+      assert assertMsg (maybeHostStdenv != null)
+        "backendStdenv: no supported host compiler found (tried ${hostCCName} ${versions.minMajorVersion} to ${versions.maxMajorVersion})";
+      stdenvAdapters.useLibsFrom stdenv maybeHostStdenv;
 in
 # TODO: Consider testing whether we in fact use the newer libstdc++
-extendDerivation assertCondition passthruExtra backendStdenv
+# NOTE: The assertion message we get from `extendDerivation` is not at all helpful. Instead, we use assertMsg.
+assert assertMsg (failedAssertionsString == "")
+  "${mkVersionedName "cudaPackages" cudaMajorMinorVersion}.backendStdenv has failed assertions:${failedAssertionsString}";
+extendDerivation true passthruExtra backendStdenv
diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix
new file mode 100644
index 000000000000..ff231c8c8c89
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix
@@ -0,0 +1,243 @@
+{
+  backendStdenv,
+  _cuda,
+  cmake,
+  cuda_cccl,
+  cuda_culibos,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvrtc,
+  cuda_nvtx,
+  cuda_profiler_api,
+  cudaAtLeast,
+  cudaNamePrefix,
+  cudaOlder,
+  fetchFromGitHub,
+  flags,
+  lib,
+  libcublas,
+  libcufft,
+  libcurand,
+  libcusolver,
+  libcusparse,
+  libnpp,
+  libnvjitlink,
+  libnvjpeg,
+}:
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "cuda-samples";
+  version = if cudaAtLeast "13" then "13.0" else "12.8";
+
+  # We should be able to use samples from the latest version of CUDA
+  # on most of the CUDA package sets we have.
+  # Plus, 12.8 and later are rewritten to use CMake which makes it much, much easier to build.
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cuda-samples";
+    tag = "v${finalAttrs.version}";
+    hash = lib.getAttr finalAttrs.version {
+      "13.0" = "sha256-bOcAE/OzOI6MWTh+bFZfq1en6Yawu+HI8W+xK+XaCqg=";
+      "12.8" = "sha256-Ba0Fi0v/sQ+1iJ4mslgyIAE+oK5KO0lMoTQCC91vpiA=";
+    };
+  };
+
+  prePatch =
+    let
+      samplesAtLeast = lib.versionAtLeast finalAttrs.version;
+      samplesOlder = lib.versionOlder finalAttrs.version;
+    in
+    # https://github.com/NVIDIA/cuda-samples/issues/333
+    ''
+      nixLog "removing sample 0_Introduction/UnifiedMemoryStreams which requires OpenMP support for CUDA"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/CMakeLists.txt" \
+        --replace-fail \
+          'add_subdirectory(UnifiedMemoryStreams)' \
+          '# add_subdirectory(UnifiedMemoryStreams)'
+    ''
+    # This sample tries to use a relative path, which doesn't work for our splayed installation.
+    + lib.optionalString (samplesOlder "13") ''
+      nixLog "patching sample 0_Introduction/matrixMul_nvrtc"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \
+        --replace-fail \
+          "\''${CUDAToolkit_BIN_DIR}/../include/cooperative_groups" \
+          "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \
+        --replace-fail \
+          "\''${CUDAToolkit_BIN_DIR}/../include/nv" \
+          "${lib.getOutput "include" cuda_cccl}/include/nv" \
+        --replace-fail \
+          "\''${CUDAToolkit_BIN_DIR}/../include/cuda" \
+          "${lib.getOutput "include" cuda_cccl}/include/cuda"
+    ''
+    + lib.optionalString (samplesAtLeast "13") ''
+      nixLog "patching sample 0_Introduction/matrixMul_nvrtc"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \
+        --replace-fail \
+          "\''${CUDA_INCLUDE_DIR}/cooperative_groups" \
+          "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \
+        --replace-fail \
+          "\''${CUDA_INCLUDE_DIR}/cccl/nv" \
+          "${lib.getOutput "include" cuda_cccl}/include/nv" \
+        --replace-fail \
+          "\''${CUDA_INCLUDE_DIR}/cccl/cuda" \
+          "${lib.getOutput "include" cuda_cccl}/include/cuda"
+    ''
+    # These three samples give undefined references, like
+    # nvlink error   : Undefined reference to '__cudaCDP2Free' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    # nvlink error   : Undefined reference to '__cudaCDP2Malloc' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    # nvlink error   : Undefined reference to '__cudaCDP2GetParameterBufferV2' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    # nvlink error   : Undefined reference to '__cudaCDP2LaunchDeviceV2' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    + ''
+      for sample in cdp{AdvancedQuicksort,BezierTessellation,Quadtree,SimplePrint,SimpleQuicksort}; do
+        nixLog "removing sample 3_CUDA_Features/$sample which fails to link"
+        substituteInPlace \
+          "$NIX_BUILD_TOP/$sourceRoot/Samples/3_CUDA_Features/CMakeLists.txt" \
+          --replace-fail \
+            "add_subdirectory($sample)" \
+            "# add_subdirectory($sample)"
+      done
+      unset -v sample
+    ''
+    + lib.optionalString (cudaOlder "12.4") ''
+      nixLog "removing sample 3_CUDA_Features/graphConditionalNodes which requires at least CUDA 12.4"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/3_CUDA_Features/CMakeLists.txt" \
+        --replace-fail \
+          "add_subdirectory(graphConditionalNodes)" \
+          "# add_subdirectory(graphConditionalNodes)"
+    ''
+    # For some reason this sample requires a static library, which we don't propagate by default due to size.
+    + ''
+      nixLog "patching sample 4_CUDA_Libraries/simpleCUFFT_callback to use dynamic library"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/simpleCUFFT_callback/CMakeLists.txt" \
+        --replace-fail \
+          'CUDA::cufft_static' \
+          'CUDA::cufft'
+    ''
+    # Patch to use the correct path to libnvJitLink.so, or disable the sample if older than 12.4.
+    + lib.optionalString (cudaOlder "12.4") ''
+      nixLog "removing sample 4_CUDA_Libraries/jitLto which requires at least CUDA 12.4"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/CMakeLists.txt" \
+        --replace-fail \
+          "add_subdirectory(jitLto)" \
+          "# add_subdirectory(jitLto)"
+    ''
+    + lib.optionalString (samplesOlder "13") ''
+      nixLog "patching sample 4_CUDA_Libraries/jitLto to use correct path to libnvJitLink.so"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt" \
+        --replace-fail \
+          "\''${CUDAToolkit_LIBRARY_DIR}/libnvJitLink.so" \
+          "${lib.getLib libnvjitlink}/lib/libnvJitLink.so"
+    ''
+    # /build/NVIDIA-cuda-samples-v12.8/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp:272:80: error: cannot convert 'size_t*' {aka 'long unsigned int*'} to 'int*'
+    #   272 |         nppStatus = nppiSegmentWatershedGetBufferSize_8u_C1R(oSizeROI[nImage], &aSegmentationScratchBufferSize[nImage]);
+    #       |                                                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #       |                                                                                |
+    #       |                                                                                size_t* {aka long unsigned int*}
+    + lib.optionalString (cudaOlder "12.8") ''
+      nixLog "removing sample 4_CUDA_Libraries/watershedSegmentationNPP which requires at least CUDA 12.8"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/CMakeLists.txt" \
+        --replace-fail \
+          "add_subdirectory(watershedSegmentationNPP)" \
+          "# add_subdirectory(watershedSegmentationNPP)"
+    ''
+    # NVVM samples require a specific build of LLVM, which is a hassle.
+    + ''
+      nixLog "removing samples 7_libNVVM which require a specific build of LLVM"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/CMakeLists.txt" \
+        --replace-fail \
+          'add_subdirectory(7_libNVVM)' \
+          '# add_subdirectory(7_libNVVM)'
+    ''
+    # Don't use hard-coded CUDA architectures
+    + ''
+      nixLog "patching CMakeLists.txt to use provided CUDA architectures"
+      local path=""
+      while IFS= read -r -d $'\0' path; do
+        nixLog "removing CMAKE_CUDA_ARCHITECTURES declaration from $path"
+        substituteInPlace \
+          "$path" \
+          --replace-fail \
+            'set(CMAKE_CUDA_ARCHITECTURES' \
+            '# set(CMAKE_CUDA_ARCHITECTURES'
+      done < <(grep --files-with-matches --null "set(CMAKE_CUDA_ARCHITECTURES" --recursive "$NIX_BUILD_TOP/$sourceRoot")
+      unset -v path
+    '';
+
+  nativeBuildInputs = [
+    cmake
+    cuda_nvcc
+  ];
+
+  buildInputs = [
+    cuda_cccl
+    cuda_cudart
+    cuda_nvrtc
+    cuda_nvtx
+    cuda_profiler_api
+    libcublas
+    libcufft
+    libcurand
+    libcusolver
+    libcusparse
+    libnpp
+    libnvjitlink
+    libnvjpeg
+  ]
+  ++ lib.optionals (cudaAtLeast "13") [ cuda_culibos ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+    (lib.cmakeBool "BUILD_TEGRA" backendStdenv.hasJetsonCudaCapability)
+  ];
+
+  # TODO(@connorbaker):
+  # For some reason, using the combined find command doesn't delete directories:
+  # find "$PWD/Samples" \
+  #     \( -type d -name CMakeFiles \) \
+  #     -o \( -type f -name cmake_install.cmake \) \
+  #     -o \( -type f -name Makefile \) \
+  #     -exec rm -rf {} +
+  installPhase = ''
+    runHook preInstall
+
+    pushd "$NIX_BUILD_TOP/$sourceRoot/''${cmakeBuildDir:?}" >/dev/null
+
+    nixLog "deleting CMake related files"
+
+    find "$PWD/Samples" -type d -name CMakeFiles -exec rm -rf {} +
+    find "$PWD/Samples" -type f -name cmake_install.cmake -exec rm -rf {} +
+    find "$PWD/Samples" -type f -name Makefile -exec rm -rf {} +
+
+    nixLog "copying $PWD/Samples to $out/"
+    mkdir -p "$out"
+    cp -rv "$PWD/Samples"/* "$out/"
+
+    popd >/dev/null
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
+    homepage = "https://github.com/NVIDIA/cuda-samples";
+    license = lib.licenses.nvidiaCuda;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = [ lib.maintainers.connorbaker ];
+    teams = [ lib.teams.cuda ];
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_cccl.nix b/pkgs/development/cuda-modules/packages/cuda_cccl.nix
new file mode 100644
index 000000000000..c4f39f875dd9
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cccl.nix
@@ -0,0 +1,35 @@
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cccl";
+
+  # Restrict header-only packages to a single output.
+  # Also, when using multiple outputs (i.e., `out`, `dev`, and `include`), something isn't being patched correctly,
+  # so libnvshmem fails to build, complaining about being unable to find the thrust include directory. This is likely
+  # because the `dev` output contains the CMake configuration and is written to assume it will share a parent
+  # directory with the include directory rather than be in a separate output.
+  outputs = [ "out" ];
+
+  prePatch = lib.optionalString (cudaAtLeast "13.0") ''
+    nixLog "removing top-level $PWD/include/nv directory"
+    rm -rfv "$PWD/include/nv"
+    nixLog "un-nesting top-level $PWD/include/cccl directory"
+    mv -v "$PWD/include/cccl"/* "$PWD/include/"
+    nixLog "removing empty $PWD/include/cccl directory"
+    rmdir -v "$PWD/include/cccl"
+  '';
+
+  meta = {
+    description = "Building blocks that make it easier to write safe and efficient CUDA C++ code";
+    longDescription = ''
+      The goal of CCCL is to provide CUDA C++ developers with building blocks that make it easier to write safe and
+      efficient code.
+    '';
+    homepage = "https://github.com/NVIDIA/cccl";
+    changelog = "https://github.com/NVIDIA/cccl/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_compat.nix b/pkgs/development/cuda-modules/packages/cuda_compat.nix
new file mode 100644
index 000000000000..09f04f143322
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_compat.nix
@@ -0,0 +1,20 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_compat";
+
+  # NOTE: Using multiple outputs with symlinks causes build cycles.
+  # To avoid that (and troubleshooting why), we just use a single output.
+  outputs = [ "out" ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvdla_runtime.so"
+    "libnvrm_gpu.so"
+    "libnvrm_mem.so"
+  ];
+
+  meta = {
+    description = "Provides minor version forward compatibility for the CUDA runtime";
+    homepage = "https://docs.nvidia.com/deploy/cuda-compatibility";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_crt.nix b/pkgs/development/cuda-modules/packages/cuda_crt.nix
new file mode 100644
index 000000000000..3cf2246235bd
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_crt.nix
@@ -0,0 +1,27 @@
+{ backendStdenv, buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_crt";
+
+  outputs = [ "out" ];
+
+  brokenAssertions = [
+    # TODO(@connorbaker): Build fails on x86 when using pkgsLLVM.
+    #  .../include/crt/host_defines.h:67:2:
+    #  error: "libc++ is not supported on x86 system"
+    #
+    #     67 | #error "libc++ is not supported on x86 system"
+    #        |  ^
+    #
+    #  1 error generated.
+    #
+    #  # --error 0x1 --
+    {
+      message = "cannot use libc++ on x86_64-linux";
+      assertion = backendStdenv.hostNixSystem == "x86_64-linux" -> backendStdenv.cc.libcxx == null;
+    }
+  ];
+
+  # There's a comment with a reference to /usr
+  allowFHSReferences = true;
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix b/pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix
new file mode 100644
index 000000000000..aa7139a53c94
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_ctadvisor";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Analyzes trace files containing compilation time information generated by NVCC or NVRTC";
+    longDescription = ''
+      CUDA Compile Time Advisor (ctadvisor) analyzes trace files containing compilation time information generated by
+      NVCC or NVRTC. ctadvisor identifies compilation bottlenecks that take significant amount of time, for examples,
+      template instantiation and headers processing. The tool provides users with suggestions to reduce compilation
+      time.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-compile-time-advisor";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
new file mode 100644
index 000000000000..ff647525aad3
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
@@ -0,0 +1,96 @@
+# TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from
+# (getDev cuda_nvcc). It would be nice to be able to encode that.
+{
+  _cuda,
+  addDriverRunpath,
+  buildRedist,
+  cuda_cccl,
+  cuda_compat,
+  cuda_crt,
+  cuda_nvcc,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "cuda_cudart";
+
+  # NOTE: A number of packages expect cuda_cudart to be in a single directory. We restrict the package to a single
+  # output to avoid breaking these assumptions. As an example, CMake expects the static libraries to exist alongside
+  # the dynamic libraries.
+  outputs = [
+    "out"
+  ];
+
+  propagatedBuildOutputs =
+    # required by CMake
+    lib.optionals (lib.elem "static" finalAttrs.outputs) [ "static" ]
+    # always propagate, even when cuda_compat is used, to avoid symbol linking errors
+    ++ lib.optionals (lib.elem "stubs" finalAttrs.outputs) [ "stubs" ];
+
+  # When cuda_compat is available, propagate it.
+  # NOTE: `cuda_compat` can be disabled by setting the package to `null`. This is useful in cases where
+  # the host OS has a recent enough CUDA driver that the compatibility library isn't needed.
+  propagatedBuildInputs =
+    # TODO(@SomeoneSerge): Consider propagating `crt/host_config.h`, but only
+    # once we managed to split out `cuda_nvcc`'s headers into a separate output
+    #
+    # TODO(@connorbaker): Check that the dependency offset for this is correct.
+    #
+    # [ (lib.getInclude cuda_nvcc) ]
+
+    # TODO(@connorbaker): From CUDA 13.0, crt/host_config.h is in cuda_crt
+    lib.optionals (cudaAtLeast "13.0") [ (lib.getOutput "include" cuda_crt) ]
+    # Add the dependency on CCCL's include directory.
+    # - nv/target
+    # TODO(@connorbaker): Check that the dependency offset for this is correct.
+    ++ [ (lib.getOutput "include" cuda_cccl) ]
+    # NOTE: cuda_compat may be null or unavailable
+    ++ lib.optionals (cuda_compat.meta.available or false) [ cuda_compat ];
+
+  allowFHSReferences = false;
+
+  # Patch the `cudart` package config files so they reference lib
+  postPatch = ''
+    local path=""
+    while IFS= read -r -d $'\0' path; do
+      nixLog "patching $path"
+      sed -i \
+        -e "s|^cudaroot\s*=.*\$||" \
+        -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
+        "$path"
+    done < <(find -iname 'cudart-*.pc' -print0)
+    unset -v path
+  ''
+  # Patch the `cuda` package config files so they reference stubs
+  # TODO: Will this always pull in the stubs output and cause its setup hook to be executed?
+  + ''
+    local path=""
+    while IFS= read -r -d $'\0' path; do
+      nixLog "patching $path"
+      sed -i \
+        -e "s|^cudaroot\s*=.*\$||" \
+        -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputStubs:?}/lib/stubs|" \
+        -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
+        "$path"
+    done < <(find -iname 'cuda-*.pc' -print0)
+    unset -v path
+  '';
+
+  # Namelink may not be enough, add a soname.
+  # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/25536
+  # NOTE: Relative symlinks is fine since this is all within the same output.
+  postInstall = ''
+    pushd "''${!outputStubs:?}/lib/stubs" >/dev/null
+    if [[ -f libcuda.so && ! -f libcuda.so.1 ]]; then
+      nixLog "creating versioned symlink for libcuda.so stub"
+      ln -srv libcuda.so libcuda.so.1
+    fi
+    popd >/dev/null
+  '';
+
+  # "Never again", cf. https://github.com/NixOS/nixpkgs/pull/457424
+  disallowedRequisites = [ (lib.getBin cuda_nvcc) ];
+
+  meta.description = "CUDA Runtime";
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_culibos.nix b/pkgs/development/cuda-modules/packages/cuda_culibos.nix
new file mode 100644
index 000000000000..c95939a96d86
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_culibos.nix
@@ -0,0 +1,6 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_culibos";
+  outputs = [ "out" ];
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix b/pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix
new file mode 100644
index 000000000000..754c70915497
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix
@@ -0,0 +1,17 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cuobjdump";
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Extracts information from CUDA binary files (both standalone and those embedded in host binaries) and presents them in human readable format";
+    longDescription = ''
+      `cuobjdump` extracts information from CUDA binary files (both standalone and those embedded in host binaries)
+      and presents them in human readable format. The output of cuobjdump includes CUDA assembly code for each kernel,
+      CUDA ELF section headers, string tables, relocators and other CUDA specific sections. It also extracts embedded
+      ptx text from host binaries.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#cuobjdump";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cupti.nix b/pkgs/development/cuda-modules/packages/cuda_cupti.nix
new file mode 100644
index 000000000000..4a1eb1d19dac
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cupti.nix
@@ -0,0 +1,30 @@
+{
+  backendStdenv,
+  buildRedist,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cupti";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "samples"
+  ]
+  ++ lib.optionals (backendStdenv.hostNixSystem == "x86_64-linux") [ "static" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "C-based interface for creating profiling and tracing tools designed for CUDA applications";
+    longDescription = ''
+      The CUDA Profiling Tools Interface (CUPTI) provides a C-based interface for creating profiling and tracing tools
+      designed for CUDA applications.
+    '';
+    homepage = "https://docs.nvidia.com/cupti";
+    changelog = "https://docs.nvidia.com/cupti/release-notes/release-notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix b/pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix
new file mode 100644
index 000000000000..046ddebebfaf
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix
@@ -0,0 +1,21 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cuxxfilt";
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+    "include"
+    "static"
+  ];
+
+  meta = {
+    description = "Decode low-level identifiers that have been mangled by CUDA C++ into user readable names";
+    longDescription = ''
+      cu++filt decodes (demangles) low-level identifiers that have been mangled by CUDA C++ into user readable names.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#cu-filt";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix b/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
new file mode 100644
index 000000000000..1a85c258eb0e
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
@@ -0,0 +1,33 @@
+{
+  buildRedist,
+  libcufft,
+  libcurand,
+  libGLU,
+  libglut,
+  libglvnd,
+  mesa,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_demo_suite";
+
+  buildInputs = [
+    libcufft
+    libcurand
+    libGLU
+    libglut
+    libglvnd
+    mesa
+  ];
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Pre-built applications which use CUDA";
+    longDescription = ''
+      The CUDA Demo Suite contains pre-built applications which use CUDA. These applications demonstrate the
+      capabilities and details of NVIDIA GPUs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/demo-suite";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_documentation.nix b/pkgs/development/cuda-modules/packages/cuda_documentation.nix
new file mode 100644
index 000000000000..dc872008b58a
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_documentation.nix
@@ -0,0 +1,14 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_documentation";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    homepage = "https://docs.nvidia.com/cuda";
+    changelog = "https://docs.nvidia.com/cuda/cuda-toolkit-release-notes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_gdb.nix b/pkgs/development/cuda-modules/packages/cuda_gdb.nix
new file mode 100644
index 000000000000..8dc2812fd325
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_gdb.nix
@@ -0,0 +1,71 @@
+{
+  backendStdenv,
+  buildRedist,
+  cudaAtLeast,
+  expat,
+  gmp,
+  lib,
+  libxcrypt-legacy,
+  ncurses,
+  python3,
+}:
+let
+  python3MajorMinorVersion = lib.versions.majorMinor python3.version;
+in
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_gdb";
+
+  outputs = [
+    "out"
+    "bin"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs =
+    # only needs gmp from 12.0 and on
+    lib.optionals (cudaAtLeast "12.0") [ gmp ]
+    # aarch64, sbsa needs expat
+    ++ lib.optionals backendStdenv.hostPlatform.isAarch64 [ expat ]
+    # From 12.5, cuda-gdb comes with Python TUI wrappers
+    ++ lib.optionals (cudaAtLeast "12.5") [
+      libxcrypt-legacy
+      ncurses
+      python3
+    ];
+
+  # Remove binaries requiring Python3 versions we do not have
+  postInstall = lib.optionalString (cudaAtLeast "12.5") ''
+    pushd "''${!outputBin}/bin" >/dev/null
+    nixLog "removing cuda-gdb-python*-tui binaries for Python 3 versions other than ${python3MajorMinorVersion}"
+    for pygdb in cuda-gdb-python*-tui; do
+      if [[ "$pygdb" == "cuda-gdb-python${python3MajorMinorVersion}-tui" ]]; then
+        continue
+      fi
+      nixLog "removing $pygdb"
+      rm -rf "$pygdb"
+    done
+    unset -v pygdb
+    popd >/dev/null
+  '';
+
+  brokenAssertions = [
+    {
+      # TODO(@connorbaker): Figure out which are supported.
+      message = "python 3 version is supported";
+      assertion = true;
+    }
+  ];
+
+  meta = {
+    description = "NVIDIA tool for debugging CUDA applications on Linux and QNX systems";
+    longDescription = ''
+      CUDA-GDB is the NVIDIA tool for debugging CUDA applications running on Linux and QNX. CUDA-GDB is an extension
+      to GDB, the GNU Project debugger. The tool provides developers with a mechanism for debugging CUDA
+      applications running on actual hardware.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-gdb";
+    changelog = "https://docs.nvidia.com/cuda/cuda-gdb#release-notes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nsight.nix b/pkgs/development/cuda-modules/packages/cuda_nsight.nix
new file mode 100644
index 000000000000..d47e55f6920d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nsight.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nsight";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Nsight Eclipse Plugins Edition";
+    longDescription = ''
+      NVIDIA Nsight Eclipse Edition is a unified CPU plus GPU integrated development environment (IDE) for developing
+      CUDA applications on Linux and Mac OS X for the x86, POWER and ARM platforms. It is designed to help developers
+      on all stages of the software development process.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nsight-eclipse-plugins-guide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
new file mode 100644
index 000000000000..27eacde61847
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -0,0 +1,179 @@
+{
+  _cuda,
+  backendStdenv,
+  buildRedist,
+  setupCudaHook,
+  cudaAtLeast,
+  cudaOlder,
+  cuda_cccl,
+  lib,
+  libnvvm,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "cuda_nvcc";
+
+  # NOTE: We restrict cuda_nvcc to a single output to avoid breaking consumers which expect NVCC to be within a single
+  # directory structure. This happens partly because NVCC is also home to NVVM.
+  outputs = [
+    "out"
+  ];
+
+  # The nvcc and cicc binaries contain hard-coded references to /usr
+  allowFHSReferences = true;
+
+  # Entries here will be in nativeBuildInputs when cuda_nvcc is in nativeBuildInputs
+  propagatedBuildInputs = [ setupCudaHook ];
+
+  # Patch the nvcc.profile.
+  # Syntax:
+  # - `=` for assignment,
+  # - `?=` for conditional assignment,
+  # - `+=` to "prepend",
+  # - `=+` to "append".
+
+  # Cf. https://web.archive.org/web/20220912081901/https://developer.download.nvidia.com/compute/DevZone/docs/html/C/doc/nvcc.pdf
+
+  # We set all variables with the lowest priority (=+), but we do force
+  # nvcc to use the fixed backend toolchain. Cf. comments in
+  # backend-stdenv.nix
+
+  # As an example, here's the nvcc.profile for CUDA 11.8-12.4 (yes, that is a leading newline):
+
+  #
+  # TOP              = $(_HERE_)/..
+  #
+  # NVVMIR_LIBRARY_DIR = $(TOP)/$(_NVVM_BRANCH_)/libdevice
+  #
+  # LD_LIBRARY_PATH += $(TOP)/lib:
+  # PATH            += $(TOP)/$(_NVVM_BRANCH_)/bin:$(_HERE_):
+  #
+  # INCLUDES        +=  "-I$(TOP)/$(_TARGET_DIR_)/include" $(_SPACE_)
+  #
+  # LIBRARIES        =+ $(_SPACE_) "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)/stubs" "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)"
+  #
+  # CUDAFE_FLAGS    +=
+  # PTXAS_FLAGS     +=
+
+  # And here's the nvcc.profile for CUDA 12.5:
+
+  #
+  # TOP              = $(_HERE_)/..
+  #
+  # CICC_PATH        = $(TOP)/nvvm/bin
+  # CICC_NEXT_PATH   = $(TOP)/nvvm-next/bin
+  # NVVMIR_LIBRARY_DIR = $(TOP)/nvvm/libdevice
+  #
+  # LD_LIBRARY_PATH += $(TOP)/lib:
+  # PATH            += $(CICC_PATH):$(_HERE_):
+  #
+  # INCLUDES        +=  "-I$(TOP)/$(_TARGET_DIR_)/include" $(_SPACE_)
+  #
+  # LIBRARIES        =+ $(_SPACE_) "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)/stubs" "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)"
+  #
+  # CUDAFE_FLAGS    +=
+  # PTXAS_FLAGS     +=
+
+  postInstall =
+    let
+      # TODO: Should we also patch the LIBRARIES line's use of $(TOP)/$(_TARGET_DIR_)?
+      oldNvvmDir = lib.concatStringsSep "/" (
+        [ "$(TOP)" ]
+        ++ lib.optionals (cudaOlder "12.5") [ "$(_NVVM_BRANCH_)" ]
+        ++ lib.optionals (cudaAtLeast "12.5") [ "nvvm" ]
+      );
+      newNvvmDir = ''''${!outputBin:?}/nvvm'';
+    in
+    lib.optionalString finalAttrs.finalPackage.meta.available (
+      # From CUDA 13.0, NVVM is available as a separate library and not bundled in the NVCC redist.
+      lib.optionalString (cudaOlder "13.0") ''
+        nixLog "moving $PWD/nvvm to ''${!outputBin:?} and renaming lib64 to lib"
+        moveToOutput "nvvm" "''${!outputBin:?}"
+        mv --verbose --no-clobber "${newNvvmDir}/lib64" "${newNvvmDir}/lib"
+      ''
+      # NVVM is unpacked and made top-level; we cannot make a symlink to it because build systems (like CMake)
+      # may take the target and do relative path operations to it.
+      + lib.optionalString (cudaAtLeast "13.0") ''
+        nixLog "copying ${libnvvm} to ${newNvvmDir} and fixing permissions"
+        cp -rv "${libnvvm}" "${newNvvmDir}"
+        chmod -Rv u+w "${newNvvmDir}"
+      ''
+      # Unconditional patching to remove the use of $(_TARGET_SIZE_) since we don't use lib64 in Nixpkgs
+      + ''
+        nixLog 'removing $(_TARGET_SIZE_) from nvcc.profile'
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '$(_TARGET_SIZE_)' \
+            ""
+      ''
+      # CUDA 13.0+ introduced
+      # SYSTEM_INCLUDES +=  "-isystem" "$(TOP)/$(_TARGET_DIR_)/include/cccl" $(_SPACE_)
+      # so we need to make sure to patch the reference to cccl.
+      + lib.optionalString (cudaAtLeast "13.0") ''
+        nixLog "patching nvcc.profile to include correct path to cccl"
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '$(TOP)/$(_TARGET_DIR_)/include/cccl' \
+            "${lib.getOutput "include" cuda_cccl}/include"
+      ''
+      # Unconditional patching to switch to the correct include paths.
+      # NOTE: _TARGET_DIR_ appears to be used for the target architecture, which is relevant for cross-compilation.
+      + ''
+        nixLog "patching nvcc.profile to use the correct include paths"
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '$(TOP)/$(_TARGET_DIR_)/include' \
+            "''${!outputInclude:?}/include"
+      ''
+      # Fixup the nvcc.profile to use the correct paths for NVVM.
+      # NOTE: In our replacement substitution, we use double quotes to allow for variable expansion.
+      # NOTE: We use a trailing slash only on the NVVM directory replacement to prevent partial matches.
+      + ''
+        nixLog "patching nvcc.profile to use the correct NVVM paths"
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '${oldNvvmDir}/' \
+            "${newNvvmDir}/"
+
+        nixLog "adding ${newNvvmDir} to nvcc.profile"
+        cat << EOF >> "''${!outputBin:?}/bin/nvcc.profile"
+
+        # Expose the split-out nvvm
+        LIBRARIES =+ \$(_SPACE_) "-L${newNvvmDir}/lib"
+        INCLUDES =+ \$(_SPACE_) "-I${newNvvmDir}/include"
+        EOF
+      ''
+      # Add the dependency on backendStdenv.cc to the nvcc.profile.
+      + ''
+        nixLog "adding backendStdenv.cc to nvcc.profile"
+        cat << EOF >> "''${!outputBin:?}/bin/nvcc.profile"
+
+        # Fix a compatible backend compiler
+        PATH += "${backendStdenv.cc}/bin":
+        EOF
+      ''
+    );
+
+  brokenAssertions = [
+    # TODO(@connorbaker): Build fails on x86 when using pkgsLLVM.
+    #  .../include/crt/host_defines.h:67:2:
+    #  error: "libc++ is not supported on x86 system"
+    #
+    #     67 | #error "libc++ is not supported on x86 system"
+    #        |  ^
+    #
+    #  1 error generated.
+    #
+    #  # --error 0x1 --
+    {
+      message = "cannot use libc++ on x86_64-linux";
+      assertion = backendStdenv.hostNixSystem == "x86_64-linux" -> backendStdenv.cc.libcxx == null;
+    }
+  ];
+
+  meta = {
+    description = "CUDA compiler driver";
+    homepage = "https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc";
+    mainProgram = "nvcc";
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix b/pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix
new file mode 100644
index 000000000000..981a0ce420a7
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvdisasm";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Extracts information from standalone cubin files and presents them in human readable format";
+    longDescription = ''
+      `nvdisasm` extracts information from standalone cubin files and presents them in human readable format. The
+      output of `nvdisasm` includes CUDA assembly code for each kernel, listing of ELF data sections and other CUDA
+      specific sections. Output style and options are controlled through `nvdisasm` command-line options. `nvdisasm`
+      also does control flow analysis to annotate jump/branch targets and makes the output easier to read.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#nvdisasm";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix b/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
new file mode 100644
index 000000000000..cb97f2c76210
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
@@ -0,0 +1,45 @@
+{ buildRedist, lib }:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "cuda_nvml_dev";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "stubs"
+  ];
+
+  # TODO(@connorbaker): Add a setup hook to the outputStubs output to automatically replace rpath entries
+  # containing the stubs output with the driver link.
+
+  allowFHSReferences = true;
+
+  # Include the stubs output since it provides libnvidia-ml.so.
+  propagatedBuildOutputs = lib.optionals (lib.elem "stubs" finalAttrs.outputs) [ "stubs" ];
+
+  # TODO: Some programs try to link against libnvidia-ml.so.1, so make an alias.
+  # Not sure about the version number though!
+  postInstall = lib.optionalString (lib.elem "stubs" finalAttrs.outputs) ''
+    pushd "''${!outputStubs:?}/lib/stubs" >/dev/null
+    if [[ -f libnvidia-ml.so && ! -f libnvidia-ml.so.1 ]]; then
+      nixLog "creating versioned symlink for libnvidia-ml.so stub"
+      ln -sr libnvidia-ml.so libnvidia-ml.so.1
+    fi
+    if [[ -f libnvidia-ml.a && ! -f libnvidia-ml.a.1 ]]; then
+      nixLog "creating versioned symlink for libnvidia-ml.a stub"
+      ln -sr libnvidia-ml.a libnvidia-ml.a.1
+    fi
+    popd >/dev/null
+  '';
+
+  meta = {
+    description = "C-based programmatic interface for monitoring and managing various states within Data Center GPUs";
+    longDescription = ''
+      The NVIDIA Management Library (NVML) is a C-based programmatic interface for monitoring and managing various
+      states within Data Center GPUs. It is intended to be a platform for building 3rd party applications, and is also
+      the underlying library for the NVIDIA-supported nvidia-smi tool.
+    '';
+    homepage = "https://developer.nvidia.com/management-library-nvml";
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
new file mode 100644
index 000000000000..994e6ea1126d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
@@ -0,0 +1,43 @@
+{
+  backendStdenv,
+  buildRedist,
+  cuda_cupti,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvprof";
+
+  allowFHSReferences = true;
+
+  outputs = [
+    "out"
+  ]
+  # The `bin` and `lib` output are only available on SBSA starting with CUDA 11.8.
+  ++ lib.optionals (backendStdenv.hostRedistSystem != "linux-sbsa" || cudaAtLeast "11.8") [
+    "bin"
+    "lib"
+  ];
+
+  buildInputs = [
+    cuda_cupti
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
+  ];
+
+  meta = {
+    description = "Collect and view profiling data from the command-line";
+    longDescription = ''
+      The `nvprof` profiling tool enables you to collect and view profiling data from the command-line. `nvprof`
+      enables the collection of a timeline of CUDA-related activities on both CPU and GPU, including kernel execution,
+      memory transfers, memory set and CUDA API calls and events or metrics for CUDA kernels. Profiling options are
+      provided to `nvprof` through command-line options. Profiling results are displayed in the console after the
+      profiling data is collected, and may also be saved for later viewing by either `nvprof` or the Visual Profiler.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/profiler-users-guide#nvprof";
+    changelog = "https://docs.nvidia.com/cuda/profiler-users-guide#changelog";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprune.nix b/pkgs/development/cuda-modules/packages/cuda_nvprune.nix
new file mode 100644
index 000000000000..db3c7b60e6f5
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprune.nix
@@ -0,0 +1,15 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvprune";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Prune host object files and libraries to only contain device code for the specified targets";
+    longDescription = ''
+      `nvprune` prunes host object files and libraries to only contain device code for the specified targets.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#nvprune";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix b/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
new file mode 100644
index 000000000000..d3cc276ab67e
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
@@ -0,0 +1,29 @@
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvrtc";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ]
+  ++ lib.optionals (cudaAtLeast "11.5") [ "static" ]
+  ++ [ "stubs" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Runtime compilation library for CUDA C++";
+    longDescription = ''
+      NVRTC is a runtime compilation library for CUDA C++. It accepts CUDA C++ source code in character string form
+      and creates handles that can be used to obtain the PTX.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvrtc";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvtx.nix b/pkgs/development/cuda-modules/packages/cuda_nvtx.nix
new file mode 100644
index 000000000000..ef079fe0110d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvtx.nix
@@ -0,0 +1,23 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvtx";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "C-based Application Programming Interface (API) for annotating events, code ranges, and resources in your applications";
+    longDescription = ''
+      NVTX is a cross-platform API for annotating source code to provide contextual information to developer tools.
+
+      The NVTX API is written in C, with wrappers provided for C++ and Python.
+    '';
+    homepage = "https://github.com/NVIDIA/NVTX";
+    changelog = "https://github.com/NVIDIA/NVTX/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvvp.nix b/pkgs/development/cuda-modules/packages/cuda_nvvp.nix
new file mode 100644
index 000000000000..8aeb178a2ace
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvvp.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvvp";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Cross-platform performance profiling tool for optimizing CUDA C/C++ applications";
+    longDescription = ''
+      The NVIDIA Visual Profiler is a cross-platform performance profiling tool that delivers developers vital
+      feedback for optimizing CUDA C/C++ applications.
+    '';
+    homepage = "https://developer.nvidia.com/nvidia-visual-profiler";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_opencl.nix b/pkgs/development/cuda-modules/packages/cuda_opencl.nix
new file mode 100644
index 000000000000..50d94e44dbea
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_opencl.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_opencl";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Low-level API for heterogeneous computing that runs on CUDA-powered GPUs";
+    longDescription = ''
+      OpenCL™ (Open Computing Language) is a low-level API for heterogeneous computing that runs on CUDA-powered GPUs.
+      Using the OpenCL API, developers can launch compute kernels written using a limited subset of the C programming
+      language on a GPU.
+    '';
+    homepage = "https://developer.nvidia.com/opencl";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_profiler_api.nix b/pkgs/development/cuda-modules/packages/cuda_profiler_api.nix
new file mode 100644
index 000000000000..39a90d72df2c
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_profiler_api.nix
@@ -0,0 +1,13 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_profiler_api";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+  ];
+
+  meta.description = "API for profiling CUDA runtime";
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix b/pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix
new file mode 100644
index 000000000000..eab5b6c35cb2
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_sanitizer_api";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Enables the creation of sanitizing and tracing tools that target CUDA applications";
+    longDescription = ''
+      The Compute Sanitizer API enables the creation of sanitizing and tracing tools that target CUDA applications.
+      Examples of such tools are memory and race condition checkers.
+    '';
+    homepage = "https://docs.nvidia.com/compute-sanitizer/SanitizerApiGuide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix b/pkgs/development/cuda-modules/packages/cudatoolkit.nix
similarity index 85%
rename from pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix
rename to pkgs/development/cuda-modules/packages/cudatoolkit.nix
index 56ef05a09d6c..4df552d048cc 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix
+++ b/pkgs/development/cuda-modules/packages/cudatoolkit.nix
@@ -26,11 +26,10 @@
 }:
 
 let
-  getAllOutputs = p: [
-    (lib.getBin p)
-    (lib.getLib p)
-    (lib.getDev p)
-  ];
+  # Retrieve all the outputs of a package except for the "static" output.
+  getAllOutputs =
+    p: lib.concatMap (output: lib.optionals (output != "static") [ p.${output} ]) p.outputs;
+
   hostPackages = [
     cuda_cuobjdump
     cuda_gdb
@@ -73,8 +72,9 @@ symlinkJoin rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Wrapper substituting the deprecated runfile-based CUDA installation";
-    license = licenses.nvidiaCuda;
+    license = lib.licenses.nvidiaCudaRedist;
+    teams = [ lib.teams.cuda ];
   };
 }
diff --git a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
index b9e622b9f31e..79a19e321b39 100644
--- a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
+++ b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
@@ -1,21 +1,23 @@
 {
   autoAddDriverRunpath,
+  backendStdenv,
   catch2_3,
   cmake,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvrtc,
+  cudaNamePrefix,
+  cudnn,
   fetchFromGitHub,
   gitUpdater,
   lib,
+  libcublas,
   ninja,
   nlohmann_json,
-  stdenv,
-  cuda_cccl ? null,
-  cuda_cudart ? null,
-  cuda_nvcc ? null,
-  cuda_nvrtc ? null,
-  cudnn ? null,
-  libcublas ? null,
 }:
 let
+  inherit (lib) licenses maintainers teams;
   inherit (lib.lists) optionals;
   inherit (lib.strings)
     cmakeBool
@@ -23,9 +25,14 @@ let
     optionalString
     ;
 in
-
 # TODO(@connorbaker): This should be a hybrid C++/Python package.
-stdenv.mkDerivation (finalAttrs: {
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+
   pname = "cudnn-frontend";
   version = "1.9.0";
 
@@ -46,9 +53,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   # nlohmann_json should be the only vendored dependency.
   postPatch = ''
-    echo "patching source to use nlohmann_json from nixpkgs"
-    rm -rf include/cudnn_frontend/thirdparty/nlohmann
-    rmdir include/cudnn_frontend/thirdparty
+    nixLog "patching source to use nlohmann_json from nixpkgs"
+    rm -rfv include/cudnn_frontend/thirdparty/nlohmann
+    rmdir -v include/cudnn_frontend/thirdparty
     substituteInPlace include/cudnn_frontend_utils.h \
       --replace-fail \
         '#include "cudnn_frontend/thirdparty/nlohmann/json.hpp"' \
@@ -120,13 +127,14 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A c++ wrapper for the cudnn backend API";
     homepage = "https://github.com/NVIDIA/cudnn-frontend";
-    license = lib.licenses.mit;
-    badPlatforms = optionals (cudnn == null) finalAttrs.meta.platforms;
+    license = licenses.mit;
+    # TODO(@connorbaker): How tightly coupled is this library to specific cuDNN versions?
+    # Should it be marked as broken if it doesn't match our expected version?
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
     ];
-    maintainers = with lib.maintainers; [ connorbaker ];
-    teams = [ lib.teams.cuda ];
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
   };
 })
diff --git a/pkgs/development/cuda-modules/packages/cudnn.nix b/pkgs/development/cuda-modules/packages/cudnn.nix
new file mode 100644
index 000000000000..dfe581b72dab
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cudnn.nix
@@ -0,0 +1,117 @@
+{
+  _cuda,
+  backendStdenv,
+  buildRedist,
+  lib,
+  libcublas,
+  patchelf,
+  zlib,
+}:
+buildRedist (
+  finalAttrs:
+  let
+    inherit (backendStdenv) cudaCapabilities;
+    cudnnAtLeast = lib.versionAtLeast finalAttrs.version;
+    cudnnOlder = lib.versionOlder finalAttrs.version;
+  in
+  {
+    redistName = "cudnn";
+    pname = "cudnn";
+
+    outputs = [
+      "out"
+      "dev"
+      "include"
+      "lib"
+      "static"
+    ];
+
+    buildInputs = [
+      # NOTE: Verions of CUDNN after 9.0 no longer depend on libcublas:
+      # https://docs.nvidia.com/deeplearning/cudnn/latest/release-notes.html?highlight=cublas#cudnn-9-0-0
+      # However, NVIDIA only provides libcublasLT via the libcublas package.
+      (lib.getLib libcublas)
+      zlib
+    ];
+
+    # Tell autoPatchelf about runtime dependencies. *_infer* libraries only
+    # exist in CuDNN 8.
+    # NOTE: Versions from CUDNN releases have four components.
+    postFixup = lib.optionalString (cudnnAtLeast "8" && cudnnOlder "9") ''
+      ${lib.getExe patchelf} ''${!outputLib:?}/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
+      ${lib.getExe patchelf} ''${!outputLib:?}/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so
+    '';
+
+    # NOTE:
+    #   With cuDNN forward compatiblity, all non-natively supported compute capabilities JIT compile PTX kernels.
+    #
+    #   While this is sub-optimal and we should warn the user and encourage them to use a newer version of cuDNN, we
+    #   have no clean mechanism by which we can warn the user, or allow silencing such a warning if the use of an
+    #   older cuDNN is intentional.
+    #
+    #   As such, we only warn about capabilities which are no longer supported by cuDNN.
+    #
+    # NOTE:
+    #
+    #   NVIDIA promises forward compatibility of cuDNN for major versions of CUDA. As an example, the cuDNN build for
+    #   CUDA 12 is compatible with all, and will remain compatible with, all CUDA 12 releases. However, this does not
+    #   extend to static linking with CUDA 11!
+    #
+    #   We don't need to check the CUDA version to see if it falls within some supported range -- if a user decides
+    #   to do static linking against some odd combination of CUDA 11 and cuDNN, that's on them.
+    #
+    platformAssertions =
+      let
+        # Create variables and use logical OR to allow short-circuiting.
+
+        cudnnAtLeast912 = cudnnAtLeast "9.12";
+        cudnnAtLeast88 = cudnnAtLeast912 || cudnnAtLeast "8.8";
+        cudnnAtLeast85 = cudnnAtLeast88 || cudnnAtLeast "8.5";
+
+        allCCNewerThan75 = lib.all (lib.flip lib.versionAtLeast "7.5") cudaCapabilities;
+        allCCNewerThan50 = allCCNewerThan75 || lib.all (lib.flip lib.versionAtLeast "5.0") cudaCapabilities;
+        allCCNewerThan35 = allCCNewerThan50 || lib.all (lib.flip lib.versionAtLeast "3.5") cudaCapabilities;
+      in
+      [
+        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html#cudnn-cuda-hardware-versions
+        {
+          message =
+            "cuDNN releases since 8.5 (found ${finalAttrs.version})"
+            + " support CUDA compute capabilities 3.5 and newer (found ${builtins.toJSON cudaCapabilities})";
+          assertion = cudnnAtLeast85 -> allCCNewerThan35;
+        }
+        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html#cudnn-cuda-hardware-versions
+        {
+          message =
+            "cuDNN releases since 8.8 (found ${finalAttrs.version})"
+            + " support CUDA compute capabilities 5.0 and newer (found ${builtins.toJSON cudaCapabilities})";
+          assertion = cudnnAtLeast88 -> allCCNewerThan50;
+        }
+        # https://docs.nvidia.com/deeplearning/cudnn/backend/v9.12.0/reference/support-matrix.html#gpu-cuda-toolkit-and-cuda-driver-requirements
+        {
+          message =
+            "cuDNN releases since 9.12 (found ${finalAttrs.version})"
+            + " support CUDA compute capabilities 7.5 and newer (found ${builtins.toJSON cudaCapabilities})";
+          assertion = cudnnAtLeast912 -> allCCNewerThan75;
+        }
+      ];
+
+    meta = {
+      description = "GPU-accelerated library of primitives for deep neural networks";
+      longDescription = ''
+        The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for deep neural
+        networks.
+      '';
+      homepage = "https://developer.nvidia.com/cudnn";
+      changelog = "https://docs.nvidia.com/deeplearning/cudnn/backend/latest/release-notes.html";
+
+      license = _cuda.lib.licenses.cudnn;
+
+      maintainers = with lib.maintainers; [
+        mdaiter
+        samuela
+        connorbaker
+      ];
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/cuquantum.nix b/pkgs/development/cuda-modules/packages/cuquantum.nix
new file mode 100644
index 000000000000..b9fed9c551c0
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuquantum.nix
@@ -0,0 +1,42 @@
+{
+  buildRedist,
+  cuda_cudart,
+  libcublas,
+  libcurand,
+  libcusolver,
+  libcutensor,
+}:
+buildRedist {
+  redistName = "cuquantum";
+  pname = "cuquantum";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    cuda_cudart
+    libcublas
+    libcurand
+    libcusolver
+    libcutensor
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvidia-ml.so.1"
+  ];
+
+  meta = {
+    description = "Set of high-performance libraries and tools for accelerating quantum computing simulations at both the circuit and device level by orders of magnitude";
+    longDescription = ''
+      NVIDIA cuQuantum SDK is a set of high-performance libraries and tools for accelerating quantum computing
+      simulations at both the circuit and device level by orders of magnitude.
+    '';
+    homepage = "https://developer.nvidia.com/cuquantum-sdk";
+    changelog = "https://docs.nvidia.com/cuda/cuquantum/latest/cuquantum-sdk-release-notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix
new file mode 100644
index 000000000000..c6e0126504f0
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cutlass.nix
@@ -0,0 +1,232 @@
+{
+  _cuda,
+  addDriverRunpath,
+  backendStdenv,
+  cmake,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvrtc,
+  cudaNamePrefix,
+  cudnn,
+  fetchFromGitHub,
+  flags,
+  gtest,
+  lib,
+  libcublas,
+  libcurand,
+  ninja,
+  python3Packages,
+  # Options
+  pythonSupport ? true,
+  enableF16C ? false,
+  enableTools ? false,
+  # passthru.updateScript
+  gitUpdater,
+}:
+let
+  inherit (_cuda.lib) _mkMetaBadPlatforms;
+  inherit (lib) licenses maintainers teams;
+  inherit (lib.asserts) assertMsg;
+  inherit (lib.attrsets) getBin;
+  inherit (lib.lists) all optionals;
+  inherit (lib.strings)
+    cmakeBool
+    cmakeFeature
+    optionalString
+    versionAtLeast
+    ;
+  inherit (lib.trivial) flip;
+in
+# TODO: Tests.
+assert assertMsg (!enableTools) "enableTools is not yet implemented";
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "cutlass";
+  version = "3.9.2";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
+  };
+
+  # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a
+  # superset of the `out` (`bin`) or `dev` outputs (whih is what the multiple-outputs setup hook does by default).
+  outputs = [ "out" ] ++ optionals pythonSupport [ "dist" ];
+
+  nativeBuildInputs = [
+    cuda_nvcc
+    cmake
+    ninja
+    python3Packages.python # Python is always required
+  ]
+  ++ optionals pythonSupport (
+    with python3Packages;
+    [
+      build
+      pythonOutputDistHook
+      setuptools
+    ]
+  );
+
+  postPatch =
+    # Prepend some commands to the CUDA.cmake file so it can find the CUDA libraries using CMake's FindCUDAToolkit
+    # module. These target names are used throughout the project; I (@connorbaker) did not choose them.
+    ''
+      nixLog "patching CUDA.cmake to use FindCUDAToolkit"
+      mv ./CUDA.cmake ./_CUDA_Append.cmake
+      cat > ./_CUDA_Prepend.cmake <<'EOF'
+      find_package(CUDAToolkit REQUIRED)
+      foreach(_target cudart cuda_driver nvrtc)
+        if (NOT TARGET CUDA::''${_target})
+          message(FATAL_ERROR "''${_target} Not Found")
+        endif()
+        message(STATUS "''${_target} library: ''${CUDA_''${_target}_LIBRARY}")
+        add_library(''${_target} ALIAS CUDA::''${_target})
+      endforeach()
+      EOF
+      cat ./_CUDA_Prepend.cmake ./_CUDA_Append.cmake > ./CUDA.cmake
+    ''
+    # Patch cutlass to use the provided NVCC.
+    # '_CUDA_INSTALL_PATH = os.getenv("CUDA_INSTALL_PATH", _cuda_install_path_from_nvcc())' \
+    # '_CUDA_INSTALL_PATH = "${getBin cuda_nvcc}"'
+    + ''
+      nixLog "patching python bindings to make cuda_install_path fail"
+      substituteInPlace ./python/cutlass/__init__.py \
+        --replace-fail \
+          'def cuda_install_path():' \
+      '
+      def cuda_install_path():
+          raise RuntimeException("not supported with Nixpkgs CUDA packaging")
+      '
+    ''
+    # Patch the python bindings to use environment variables set by Nixpkgs.
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L80
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L81
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L317
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L319
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L344
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L360
+    + ''
+      nixLog "patching python bindings to use environment variables"
+      substituteInPlace ./python/cutlass/backend/compiler.py \
+        --replace-fail \
+          'self.include_paths = include_paths' \
+          'self.include_paths = include_paths + [root + "/include" for root in os.getenv("CUDAToolkit_ROOT").split(";")]' \
+        --replace-fail \
+          'self.flags = flags' \
+          'self.flags = flags + ["-L" + root + "/lib" for root in os.getenv("CUDAToolkit_ROOT").split(";")]' \
+        --replace-fail \
+          "\''${cuda_install_path}/bin/nvcc" \
+          '${getBin cuda_nvcc}/bin/nvcc' \
+        --replace-fail \
+          '"cuda_install_path": cuda_install_path(),' \
+          "" \
+        --replace-fail \
+          'f"{cuda_install_path()}/bin/nvcc"' \
+          '"${getBin cuda_nvcc}/bin/nvcc"' \
+        --replace-fail \
+          'cuda_install_path() + "/include",' \
+          ""
+    '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cuda_cudart
+    cuda_nvrtc
+    libcurand
+  ]
+  ++ optionals enableTools [
+    cudnn
+    libcublas
+  ];
+
+  cmakeFlags = [
+    (cmakeFeature "CUTLASS_NVCC_ARCHS" flags.cmakeCudaArchitecturesString)
+    (cmakeBool "CUTLASS_ENABLE_EXAMPLES" false)
+
+    # Tests.
+    (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.doCheck)
+    (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.doCheck)
+    (cmakeBool "CUTLASS_USE_SYSTEM_GOOGLETEST" true)
+
+    # NOTE: Both CUDNN and CUBLAS can be used by the examples and the profiler. Since they are large dependencies, they
+    #       are disabled by default.
+    (cmakeBool "CUTLASS_ENABLE_TOOLS" enableTools)
+    (cmakeBool "CUTLASS_ENABLE_CUBLAS" enableTools)
+    (cmakeBool "CUTLASS_ENABLE_CUDNN" enableTools)
+
+    # NOTE: Requires x86_64 and hardware support.
+    (cmakeBool "CUTLASS_ENABLE_F16C" enableF16C)
+
+    # TODO: Unity builds are supposed to reduce build time, but this seems to just reduce the number of tasks
+    # generated?
+    # NOTE: Good explanation of unity builds:
+    #       https://www.methodpark.de/blog/how-to-speed-up-clang-tidy-with-unity-builds.
+    (cmakeBool "CUTLASS_UNITY_BUILD_ENABLED" false)
+  ];
+
+  postBuild = lib.optionalString pythonSupport ''
+    pushd "$NIX_BUILD_TOP/$sourceRoot"
+    nixLog "building Python wheel"
+    pyproject-build \
+      --no-isolation \
+      --outdir "$NIX_BUILD_TOP/$sourceRoot/''${cmakeBuildDir:?}/dist/" \
+      --wheel
+    popd >/dev/null
+  '';
+
+  doCheck = false;
+
+  checkInputs = [ gtest ];
+
+  # NOTE: Because the test cases immediately create and try to run the binaries, we don't have an opportunity
+  # to patch them with autoAddDriverRunpath. To get around this, we add the driver runpath to the environment.
+  # TODO: This would break Jetson when using cuda_compat, as it must come first.
+  preCheck = optionalString finalAttrs.doCheck ''
+    export LD_LIBRARY_PATH="$(readlink -mnv "${addDriverRunpath.driverLink}/lib")"
+  '';
+
+  # This is *not* a derivation you want to build on a small machine.
+  requiredSystemFeatures = optionals finalAttrs.doCheck [
+    "big-parallel"
+    "cuda"
+  ];
+
+  passthru = {
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
+    # TODO:
+    # tests.test = cutlass.overrideAttrs { doCheck = true; };
+
+    # Include required architectures in compatibility check.
+    # https://github.com/NVIDIA/cutlass/tree/main?tab=readme-ov-file#compatibility
+    platformAssertions = [
+      {
+        message = "all capabilities are >= 7.0 (${builtins.toJSON flags.cudaCapabilities})";
+        assertion = all (flip versionAtLeast "7.0") flags.cudaCapabilities;
+      }
+    ];
+  };
+
+  meta = {
+    description = "CUDA Templates for Linear Algebra Subroutines";
+    homepage = "https://github.com/NVIDIA/cutlass";
+    license = licenses.asl20;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    badPlatforms = _mkMetaBadPlatforms finalAttrs;
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/fabricmanager.nix b/pkgs/development/cuda-modules/packages/fabricmanager.nix
new file mode 100644
index 000000000000..a380c3de5d9b
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/fabricmanager.nix
@@ -0,0 +1,19 @@
+{ buildRedist, zlib }:
+buildRedist {
+  redistName = "cuda";
+  pname = "fabricmanager";
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [ zlib ];
+
+  meta.homepage = "https://docs.nvidia.com/datacenter/tesla/fabric-manager-user-guide";
+}
diff --git a/pkgs/development/cuda-modules/packages/gdrcopy.nix b/pkgs/development/cuda-modules/packages/gdrcopy.nix
new file mode 100644
index 000000000000..433b8b3f3130
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/gdrcopy.nix
@@ -0,0 +1,113 @@
+{
+  _cuda,
+  backendStdenv,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaMajorMinorVersion,
+  cudaNamePrefix,
+  fetchFromGitHub,
+  flags,
+  lib,
+  # passthru.updateScript
+  gitUpdater,
+}:
+let
+  inherit (_cuda.lib) _mkMetaBadPlatforms;
+  inherit (lib) licenses maintainers teams;
+in
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "gdrcopy";
+  version = "2.5.1";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "gdrcopy";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2cDsDc1lGW9rNF1q3EhjmiJhNaIwuFYlNdooPe7/R2I=";
+  };
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs = [
+    cuda_nvcc
+  ];
+
+  postPatch = ''
+    nixLog "patching shebang in $PWD/config_arch"
+    patchShebangs "$PWD/config_arch"
+
+    nixLog "patching awk expression in $PWD/Makefile"
+    substituteInPlace "$PWD/Makefile" \
+      --replace-fail \
+        "/\#" \
+        "/#" \
+      --replace-fail \
+        'lib64' \
+        'lib'
+
+    nixLog "patching $PWD/src/Makefile"
+    substituteInPlace "$PWD/src/Makefile" \
+      --replace-fail \
+        "/\#" \
+        "/#"
+
+    nixLog "patching $PWD/tests/Makefile"
+    substituteInPlace "$PWD/tests/Makefile" \
+      --replace-fail \
+        'CUDA_VERSION := $(shell $(GET_CUDA_VERSION) $(NVCC))' \
+        'CUDA_VERSION := ${cudaMajorMinorVersion}' \
+      --replace-fail \
+        'NVCCFLAGS ?= $(shell $(GET_CUDA_GENCODE) $(NVCC)) $(NVCC_STD)' \
+        'NVCCFLAGS ?= ${flags.gencodeString} $(NVCC_STD)' \
+      --replace-fail \
+        'lib64' \
+        'lib'
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cuda_cudart
+  ];
+
+  buildFlags = [
+    # Makefile variables which must be set explicitly
+    "CUDA=${lib.getLib cuda_cudart}"
+    "NVCC=${lib.getExe cuda_nvcc}" # TODO: shoud be using cuda_nvcc from pkgsBuildHost
+
+    # Make targets
+    # NOTE: We cannot use `all` because it includes the driver, which needs the driver source code.
+    "lib"
+    "exes"
+  ];
+
+  # Tests require gdrdrv be installed (don't know how to communicate dependency on the driver).
+  doCheck = false;
+
+  installFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "prefix=/"
+  ];
+
+  passthru.updateScript = gitUpdater {
+    inherit (finalAttrs) pname version;
+    rev-prefix = "v";
+  };
+
+  meta = {
+    description = "Fast GPU memory copy library based on NVIDIA GPUDirect RDMA technology";
+    homepage = "https://github.com/NVIDIA/gdrcopy";
+    license = licenses.mit;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/imex.nix b/pkgs/development/cuda-modules/packages/imex.nix
new file mode 100644
index 000000000000..1325f7044d3d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/imex.nix
@@ -0,0 +1,16 @@
+{ buildRedist, zlib }:
+buildRedist {
+  redistName = "cuda";
+  pname = "imex";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [ zlib ];
+
+  meta = {
+    description = "Service which supports GPU memory export and import (NVLink P2P) and shared memory operations across OS domains in an NVLink multi-node deployment";
+    homepage = "https://docs.nvidia.com/multi-node-nvlink-systems/imex-guide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcublas.nix b/pkgs/development/cuda-modules/packages/libcublas.nix
new file mode 100644
index 000000000000..0606bba7eb5d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcublas.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcublas";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "CUDA Basic Linear Algebra Subroutine library";
+    longDescription = ''
+      The cuBLAS library is an implementation of BLAS (Basic Linear Algebra Subprograms) on top of the NVIDIA CUDA runtime.
+    '';
+    homepage = "https://developer.nvidia.com/cublas";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcublasmp.nix b/pkgs/development/cuda-modules/packages/libcublasmp.nix
new file mode 100644
index 000000000000..cd77b6dcb56a
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcublasmp.nix
@@ -0,0 +1,43 @@
+{
+  _cuda,
+  buildRedist,
+  libcublas,
+  libnvshmem,
+  nccl,
+}:
+buildRedist {
+  redistName = "cublasmp";
+  pname = "libcublasmp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  # TODO: Looks like the minimum supported capability is 7.0 as of the latest:
+  # https://docs.nvidia.com/cuda/cublasmp/getting_started/index.html
+  buildInputs = [
+    libcublas
+    libnvshmem
+    nccl
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
+  ];
+
+  meta = {
+    description = "High-performance, multi-process, GPU-accelerated library for distributed basic dense linear algebra";
+    longDescription = ''
+      NVIDIA cuBLASMp is a high-performance, multi-process, GPU-accelerated library for distributed basic dense linear
+      algebra.
+
+      cuBLASMp is compatible with 2D block-cyclic data layout and provides PBLAS-like C APIs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cublasmp";
+    changelog = "https://docs.nvidia.com/cuda/cublasmp/release_notes";
+    license = _cuda.lib.licenses.math_sdk_sla;
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix
new file mode 100644
index 000000000000..a24a06b80b36
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcudla.nix
@@ -0,0 +1,38 @@
+{
+  backendStdenv,
+  buildRedist,
+  cudaMajorMinorVersion,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcudla";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "stubs"
+  ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvcudla.so"
+  ]
+  ++ lib.optionals (cudaMajorMinorVersion == "11.8") [
+    "libcuda.so.1"
+    "libnvdla_runtime.so"
+  ];
+
+  platformAssertions = [
+    {
+      message = "Only Xavier (7.2) and Orin (8.7) Jetson devices are supported";
+      assertion =
+        let
+          inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities;
+        in
+        hasJetsonCudaCapability
+        -> (lib.subtractLists [ "7.2" "8.7" ] requestedJetsonCudaCapabilities == [ ]);
+    }
+  ];
+}
diff --git a/pkgs/development/cuda-modules/packages/libcudss.nix b/pkgs/development/cuda-modules/packages/libcudss.nix
new file mode 100644
index 000000000000..6dc547d592bd
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcudss.nix
@@ -0,0 +1,68 @@
+{
+  buildRedist,
+  lib,
+  libcublas,
+  mpi,
+  nccl,
+}:
+buildRedist {
+  redistName = "cudss";
+  pname = "libcudss";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    libcublas
+  ]
+  # MPI brings in NCCL dependency by way of UCC/UCX.
+  ++ lib.optionals nccl.meta.available [
+    mpi
+    nccl
+  ];
+
+  # Update the CMake configurations
+  postFixup = ''
+    pushd "''${!outputDev:?}/lib/cmake/cudss" >/dev/null
+
+    nixLog "patching $PWD/cudss-config.cmake to fix relative paths"
+    substituteInPlace "$PWD/cudss-config.cmake" \
+      --replace-fail \
+        'get_filename_component(PACKAGE_PREFIX_DIR "''${CMAKE_CURRENT_LIST_DIR}/../../../../" ABSOLUTE)' \
+        "" \
+      --replace-fail \
+        'file(REAL_PATH "../../" _cudss_search_prefix BASE_DIRECTORY "''${_cudss_cmake_config_realpath}")' \
+        "set(_cudss_search_prefix \"''${!outputDev:?}/lib;''${!outputLib:?}/lib;''${!outputInclude:?}/include\")"
+
+    nixLog "patching $PWD/cudss-static-targets.cmake to fix INTERFACE_LINK_DIRECTORIES for cublas"
+    sed -Ei \
+      's|INTERFACE_LINK_DIRECTORIES "/usr/local/cuda.*/lib64"|INTERFACE_LINK_DIRECTORIES "${lib.getLib libcublas}/lib"|g' \
+      "$PWD/cudss-static-targets.cmake"
+    if grep -Eq 'INTERFACE_LINK_DIRECTORIES "/usr/local/cuda.*/lib64"' "$PWD/cudss-static-targets.cmake"; then
+      nixErrorLog "failed to patch $PWD/cudss-static-targets.cmake"
+      exit 1
+    fi
+
+    nixLog "patching $PWD/cudss-static-targets-release.cmake to fix the path to the static library"
+    substituteInPlace "$PWD/cudss-static-targets-release.cmake" \
+      --replace-fail \
+        '"''${cudss_LIBRARY_DIR}/libcudss_static.a"' \
+        "\"''${!outputStatic:?}/lib/libcudss_static.a\""
+
+    popd >/dev/null
+  '';
+
+  meta = {
+    description = "Library of GPU-accelerated linear solvers with sparse matrices";
+    longDescription = ''
+      NVIDIA cuDSS (Preview) is a library of GPU-accelerated linear solvers with sparse matrices.
+    '';
+    homepage = "https://developer.nvidia.com/cudss";
+    changelog = "https://docs.nvidia.com/cuda/cudss/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcufft.nix b/pkgs/development/cuda-modules/packages/libcufft.nix
new file mode 100644
index 000000000000..7b7aa3611936
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcufft.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcufft";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "High-performance FFT product CUDA library";
+    homepage = "https://developer.nvidia.com/cufft";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcufile.nix b/pkgs/development/cuda-modules/packages/libcufile.nix
new file mode 100644
index 000000000000..c32a0d0478f1
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcufile.nix
@@ -0,0 +1,38 @@
+{
+  buildRedist,
+  cudaOlder,
+  lib,
+  numactl,
+  rdma-core,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcufile";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  allowFHSReferences = true;
+
+  # TODO(@connorbaker): At some point before 12.6, libcufile depends on libcublas.
+  buildInputs = [
+    numactl
+    rdma-core
+  ];
+
+  # Before 11.7 libcufile depends on itself for some reason.
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
+  ]
+  ++ lib.optionals (cudaOlder "11.7") [ "libcufile.so.0" ];
+
+  meta = {
+    description = "Library to leverage GDS technology";
+    homepage = "https://docs.nvidia.com/gpudirect-storage/api-reference-guide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcurand.nix b/pkgs/development/cuda-modules/packages/libcurand.nix
new file mode 100644
index 000000000000..e05287b1c2d0
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcurand.nix
@@ -0,0 +1,24 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcurand";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "Helper module for the cuBLASMp library that allows it to efficiently perform communications between different GPUs";
+    longDescription = ''
+      Communication Abstraction Library (CAL) is a helper module for the cuBLASMp library that allows it to
+      efficiently perform communications between different GPUs.
+    '';
+    homepage = "https://developer.nvidia.com/curand";
+    changelog = "https://docs.nvidia.com/cuda/cublasmp/release_notes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusolver.nix b/pkgs/development/cuda-modules/packages/libcusolver.nix
new file mode 100644
index 000000000000..0ff5e26d7d52
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusolver.nix
@@ -0,0 +1,39 @@
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+  libcublas,
+  libcusparse,
+  libnvjitlink,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcusolver";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  buildInputs =
+    # Always depends on this
+    [ (lib.getLib libcublas) ]
+    # Dependency from 12.0 and on
+    ++ lib.optionals (cudaAtLeast "12.0") [ libnvjitlink ]
+    # Dependency from 12.1 and on
+    ++ lib.optionals (cudaAtLeast "12.1") [ (lib.getLib libcusparse) ];
+
+  meta = {
+    description = "Collection of dense and sparse direct linear solvers and Eigen solvers";
+    longDescription = ''
+      The NVIDIA cuSOLVER library provides a collection of dense and sparse direct linear solvers and Eigen solvers
+      which deliver significant acceleration for Computer Vision, CFD, Computational Chemistry, and Linear
+      Optimization applications.
+    '';
+    homepage = "https://developer.nvidia.com/cusolver";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusolvermp.nix b/pkgs/development/cuda-modules/packages/libcusolvermp.nix
new file mode 100644
index 000000000000..eb18e2cb7b25
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusolvermp.nix
@@ -0,0 +1,35 @@
+{
+  _cuda,
+  buildRedist,
+  cuda_cudart,
+  libcublas,
+  libcusolver,
+  nccl,
+}:
+buildRedist {
+  redistName = "cusolvermp";
+  pname = "libcusolvermp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [
+    cuda_cudart
+    libcublas
+    libcusolver
+    nccl
+  ];
+
+  meta = {
+    description = "High-performance, distributed-memory, GPU-accelerated library that provides tools for solving dense linear systems and eigenvalue problems";
+    longDescription = ''
+      The NVIDIA cuSOLVERMp library is a high-performance, distributed-memory, GPU-accelerated library that provides
+      tools for solving dense linear systems and eigenvalue problems.
+    '';
+    homepage = "https://developer.nvidia.com/cusolver";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusparse.nix b/pkgs/development/cuda-modules/packages/libcusparse.nix
new file mode 100644
index 000000000000..959cbf8d343b
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusparse.nix
@@ -0,0 +1,33 @@
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+  libnvjitlink,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcusparse";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  buildInputs =
+    # Dependency from 12.0 and on
+    lib.optionals (cudaAtLeast "12.0") [ libnvjitlink ];
+
+  meta = {
+    description = "GPU-accelerated basic linear algebra subroutines for sparse matrix computations for unstructured sparsity";
+    longDescription = ''
+      The cuSPARSE APIs provides GPU-accelerated basic linear algebra subroutines for sparse matrix computations for
+      unstructured sparsity.
+    '';
+    homepage = "https://developer.nvidia.com/cusparse";
+    changelog = "https://docs.nvidia.com/cuda/cusparse";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusparse_lt.nix b/pkgs/development/cuda-modules/packages/libcusparse_lt.nix
new file mode 100644
index 000000000000..9b326baaa96a
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusparse_lt.nix
@@ -0,0 +1,38 @@
+{
+  _cuda,
+  buildRedist,
+  cuda_cudart,
+  lib,
+  libcublas,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cusparselt";
+  pname = "libcusparse_lt";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    (lib.getLib libcublas)
+  ]
+  # For some reason, the 1.4.x release of cusparselt requires the cudart library.
+  ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
+
+  meta = {
+    description = "High-performance CUDA library dedicated to general matrix-matrix operations in which at least one operand is a structured sparse matrix with 50% sparsity ratio";
+    longDescription = ''
+      NVIDIA cuSPARSELt is a high-performance CUDA library dedicated to general matrix-matrix operations in which at
+      least one operand is a structured sparse matrix with 50% sparsity ratio.
+    '';
+    homepage = "https://developer.nvidia.com/cusparselt-downloads";
+    changelog = "https://docs.nvidia.com/cuda/cublasmp/release_notes";
+
+    maintainers = [ lib.maintainers.sepiabrown ];
+    license = _cuda.lib.licenses.cusparse_lt;
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/libcutensor.nix b/pkgs/development/cuda-modules/packages/libcutensor.nix
new file mode 100644
index 000000000000..0b193619021d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcutensor.nix
@@ -0,0 +1,42 @@
+{
+  _cuda,
+  buildRedist,
+  cuda_cudart,
+  lib,
+  libcublas,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cutensor";
+  pname = "libcutensor";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [
+    (lib.getLib libcublas)
+  ]
+  # For some reason, the 1.4.x release of cuTENSOR requires the cudart library.
+  ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
+
+  meta = {
+    description = "GPU-accelerated tensor linear algebra library for tensor contraction, reduction, and elementwise operations";
+    longDescription = ''
+      NVIDIA cuTENSOR is a GPU-accelerated tensor linear algebra library for tensor contraction, reduction, and
+      elementwise operations. Using cuTENSOR, applications can harness the specialized tensor cores on NVIDIA GPUs for
+      high-performance tensor computations and accelerate deep learning training and inference, computer vision,
+      quantum chemistry, and computational physics workloads.
+    '';
+    homepage = "https://developer.nvidia.com/cutensor";
+    changelog = "https://docs.nvidia.com/cuda/cutensor/latest/release_notes.html";
+
+    maintainers = [ lib.maintainers.obsidian-systems-maintenance ];
+    license = _cuda.lib.licenses.cutensor;
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/libnpp.nix b/pkgs/development/cuda-modules/packages/libnpp.nix
new file mode 100644
index 000000000000..5527345a6aab
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnpp.nix
@@ -0,0 +1,23 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnpp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "Library of primitives for image and signal processing";
+    longDescription = ''
+      NPP is a library of over 5,000 primitives for image and signal processing that lets you easily perform tasks
+      such as color conversion, image compression, filtering, thresholding, and image manipulation.
+    '';
+    homepage = "https://developer.nvidia.com/npp";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnpp_plus.nix b/pkgs/development/cuda-modules/packages/libnpp_plus.nix
new file mode 100644
index 000000000000..44e905570472
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnpp_plus.nix
@@ -0,0 +1,24 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nppplus";
+  pname = "libnpp_plus";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "C++ support for interfacing with the NVIDIA Performance Primitives (NPP) library";
+    longDescription = ''
+      NPP is a library of over 5,000 primitives for image and signal processing that lets you easily perform tasks
+      such as color conversion, image compression, filtering, thresholding, and image manipulation.
+    '';
+    homepage = "https://developer.nvidia.com/npp";
+    changelog = "https://docs.nvidia.com/cuda/nppplus/releasenotes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvfatbin.nix b/pkgs/development/cuda-modules/packages/libnvfatbin.nix
new file mode 100644
index 000000000000..965bd22d18cb
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvfatbin.nix
@@ -0,0 +1,12 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvfatbin";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "APIs which can be used at runtime to combine multiple CUDA objects into one CUDA fat binary (fatbin)";
+    homepage = "https://docs.nvidia.com/cuda/nvfatbin";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvjitlink.nix b/pkgs/development/cuda-modules/packages/libnvjitlink.nix
new file mode 100644
index 000000000000..c641cea10d38
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvjitlink.nix
@@ -0,0 +1,23 @@
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvjitlink";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ]
+  ++ lib.optionals (cudaAtLeast "12.2") [ "stubs" ];
+
+  meta = {
+    description = "APIs which can be used at runtime to link together GPU device code";
+    homepage = "https://docs.nvidia.com/cuda/nvjitlink";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvjpeg.nix b/pkgs/development/cuda-modules/packages/libnvjpeg.nix
new file mode 100644
index 000000000000..4cdb9bddfd12
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvjpeg.nix
@@ -0,0 +1,23 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvjpeg";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "Provides high-performance, GPU accelerated JPEG decoding functionality for image formats commonly used in deep learning and hyperscale multimedia applications";
+    longDescription = ''
+      The nvJPEG library provides high-performance, GPU accelerated JPEG decoding functionality for image formats
+      commonly used in deep learning and hyperscale multimedia applications.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvjpeg";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix b/pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix
new file mode 100644
index 000000000000..b9250be6248b
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nvjpeg2000";
+  pname = "libnvjpeg_2k";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "Accelerates the decoding and encoding of JPEG2000 images on NVIDIA GPUs";
+    longDescription = ''
+      The nvJPEG2000 library accelerates the decoding and encoding of JPEG2000 images on NVIDIA GPUs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvjpeg2000";
+    changelog = "https://docs.nvidia.com/cuda/nvjpeg2000/releasenotes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvptxcompiler.nix b/pkgs/development/cuda-modules/packages/libnvptxcompiler.nix
new file mode 100644
index 000000000000..84f0ff1a1932
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvptxcompiler.nix
@@ -0,0 +1,12 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvptxcompiler";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "APIs which can be used to compile a PTX program into GPU assembly code";
+    homepage = "https://docs.nvidia.com/cuda/ptx-compiler-api";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvshmem.nix b/pkgs/development/cuda-modules/packages/libnvshmem.nix
new file mode 100644
index 000000000000..0f92bcee6432
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvshmem.nix
@@ -0,0 +1,193 @@
+{
+  _cuda,
+  backendStdenv,
+  buildPackages,
+  cmake,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvml_dev,
+  cuda_nvtx,
+  cudaAtLeast,
+  cudaMajorMinorVersion,
+  cudaNamePrefix,
+  fetchFromGitHub,
+  flags,
+  gdrcopy,
+  lib,
+  libfabric,
+  mpi,
+  nccl,
+  ninja,
+  pmix,
+  python3Packages,
+  rdma-core,
+  ucx,
+  # passthru.updateScript
+  gitUpdater,
+}:
+let
+  inherit (lib)
+    cmakeBool
+    cmakeFeature
+    getBin
+    getDev
+    getExe
+    getLib
+    licenses
+    maintainers
+    teams
+    ;
+in
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "libnvshmem";
+  version = "3.4.5-0";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "nvshmem";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RHZzjDMYlL7vAVP1/UXM/Pt4bhajeWdCi3ihICeD2mc=";
+  };
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs = [
+    cuda_nvcc
+    cmake
+    ninja
+
+    # NOTE: mpi is in nativeBuildInputs because it contains compilers and is only discoverable by CMake
+    # when a nativeBuildInput.
+    mpi
+
+    # NOTE: Python is required even if not building nvshmem4py:
+    # https://github.com/NVIDIA/nvshmem/blob/131da55f643ac87c810ba0bc51d359258bf433a1/CMakeLists.txt#L173
+    python3Packages.python
+  ];
+
+  # NOTE: Hardcoded standard versions mean CMake doesn't respect values we provide, so we need to patch the files.
+  postPatch = ''
+    for standardName in {CXX,CUDA}_STANDARD
+    do
+      while IFS= read -r cmakeFileToPatch
+      do
+        nixLog "patching $PWD/$cmakeFileToPatch to fix $standardName"
+        substituteInPlace "$PWD/$cmakeFileToPatch" \
+          --replace-fail \
+            "$standardName 11" \
+            "$standardName 17"
+      done < <(grep --recursive --files-with-matches "$standardName 11")
+    done
+    unset -v cmakeFileToPatch
+    unset -v standardName
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cuda_cccl
+    cuda_cudart
+    cuda_nvml_dev
+    cuda_nvtx
+    gdrcopy
+    libfabric
+    nccl
+    pmix
+    rdma-core
+    ucx
+  ];
+
+  # NOTE: This *must* be an environment variable NVIDIA saw fit to *configure and build CMake projects* while *inside*
+  # a CMake build and didn't correctly thread arguments through, so the environment is the only way to get
+  # configurations to the nested build.
+  env.CUDA_HOME = (getBin cuda_nvcc).outPath;
+
+  # https://docs.nvidia.com/nvshmem/release-notes-install-guide/install-guide/nvshmem-install-proc.html#other-distributions
+  cmakeFlags = [
+    (cmakeFeature "NVSHMEM_PREFIX" (placeholder "out"))
+
+    (cmakeFeature "CUDA_HOME" (getBin cuda_nvcc).outPath)
+    (cmakeFeature "CMAKE_CUDA_COMPILER" (getExe cuda_nvcc))
+
+    (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+
+    (cmakeBool "NVSHMEM_USE_NCCL" true)
+    (cmakeFeature "NCCL_HOME" (getDev nccl).outPath)
+
+    (cmakeBool "NVSHMEM_USE_GDRCOPY" true)
+    (cmakeFeature "GDRCOPY_HOME" (getDev gdrcopy).outPath)
+
+    # NOTE: Make sure to use mpi from buildPackages to match the spliced version created through nativeBuildInputs.
+    (cmakeBool "NVSHMEM_MPI_SUPPORT" true)
+    (cmakeFeature "MPI_HOME" (getLib buildPackages.mpi).outPath)
+
+    # TODO: Doesn't UCX need to be built with some argument when we want to use it with libnvshmem?
+    (cmakeBool "NVSHMEM_UCX_SUPPORT" true)
+    (cmakeFeature "UCX_HOME" (getDev ucx).outPath)
+
+    (cmakeBool "NVSHMEM_LIBFABRIC_SUPPORT" true)
+    (cmakeFeature "LIBFABRIC_HOME" (getDev libfabric).outPath)
+
+    (cmakeBool "NVSHMEM_IBGDA_SUPPORT" true)
+    # NOTE: no corresponding _HOME variable for IBGDA.
+
+    (cmakeBool "NVSHMEM_PMIX_SUPPORT" true)
+    (cmakeFeature "PMIX_HOME" (getDev pmix).outPath)
+
+    (cmakeBool "NVSHMEM_BUILD_TESTS" true)
+    (cmakeBool "NVSHMEM_BUILD_EXAMPLES" true)
+
+    (cmakeBool "NVSHMEM_BUILD_DEB_PACKAGE" false)
+    (cmakeBool "NVSHMEM_BUILD_RPM_PACKAGE" false)
+
+    # TODO: Looks like a nightmare to package and depends on things we haven't packaged yet
+    # https://github.com/NVIDIA/nvshmem/tree/131da55f643ac87c810ba0bc51d359258bf433a1/nvshmem4py
+    (cmakeBool "NVSHMEM_BUILD_PYTHON_LIB" false)
+
+    # NOTE: unsupported because it requires Clang
+    (cmakeBool "NVSHMEM_BUILD_BITCODE_LIBRARY" false)
+  ];
+
+  postInstall = ''
+    nixLog "moving top-level files in $out to $out/share"
+    mv -v "$out"/{changelog,git_commit.txt,License.txt,version.txt} "$out/share/"
+  '';
+
+  doCheck = false;
+
+  passthru = {
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
+
+    brokenAssertions = [
+      # CUDA pre-11.7 yeilds macro/type errors in src/include/internal/host_transport/cudawrap.h.
+      {
+        message = "NVSHMEM does not support CUDA releases earlier than 11.7 (found ${cudaMajorMinorVersion})";
+        assertion = cudaAtLeast "11.7";
+      }
+    ];
+  };
+
+  meta = {
+    description = "Parallel programming interface for NVIDIA GPUs based on OpenSHMEM";
+    homepage = "https://github.com/NVIDIA/nvshmem";
+    broken = _cuda.lib._mkMetaBroken finalAttrs;
+    # NOTE: There are many licenses:
+    # https://github.com/NVIDIA/nvshmem/blob/7dd48c9fd7aa2134264400802881269b7822bd2f/License.txt
+    license = licenses.nvidiaCudaRedist;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/libnvtiff.nix b/pkgs/development/cuda-modules/packages/libnvtiff.nix
new file mode 100644
index 000000000000..e3623eb3b47d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvtiff.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nvtiff";
+  pname = "libnvtiff";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "Accelerates TIFF encode/decode on NVIDIA GPUs";
+    longDescription = ''
+      nvTIFF is a GPU accelerated TIFF(Tagged Image File Format) encode/decode library built on the CUDA platform.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvtiff";
+    changelog = "https://docs.nvidia.com/cuda/nvtiff/releasenotes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvvm.nix b/pkgs/development/cuda-modules/packages/libnvvm.nix
new file mode 100644
index 000000000000..868cacae3eba
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvvm.nix
@@ -0,0 +1,25 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvvm";
+
+  # NOTE(@connorbaker): CMake and other build systems may not react well to this library being split into multiple
+  # outputs; they may use relative path accesses.
+  outputs = [ "out" ];
+
+  # Everything is nested under the nvvm directory.
+  prePatch = ''
+    nixLog "un-nesting top-level $PWD/nvvm directory"
+    mv -v "$PWD/nvvm"/* "$PWD/"
+    nixLog "removing empty $PWD/nvvm directory"
+    rmdir -v "$PWD/nvvm"
+  '';
+
+  meta = {
+    description = "Interface for generating PTX code from both binary and text NVVM IR inputs";
+    longDescription = ''
+      libNVVM API provides an interface for generating PTX code from both binary and text NVVM IR inputs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/libnvvm-api";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh
index 0abd651005c6..2540116c017b 100644
--- a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh
+++ b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh
@@ -1,25 +1,25 @@
 # shellcheck shell=bash
 
-(( ${hostOffset:?} == -1 && ${targetOffset:?} == 0)) || return 0
+((${hostOffset:?} == -1 && ${targetOffset:?} == 0)) || return 0
 
 echo "Sourcing mark-for-cudatoolkit-root-hook" >&2
 
 markForCUDAToolkit_ROOT() {
-    mkdir -p "${prefix:?}/nix-support"
-    local markerPath="$prefix/nix-support/include-in-cudatoolkit-root"
+  mkdir -p "${prefix:?}/nix-support"
+  local markerPath="$prefix/nix-support/include-in-cudatoolkit-root"
 
-    # Return early if the file already exists.
-    [[ -f "$markerPath" ]] && return 0
+  # Return early if the file already exists.
+  [[ -f $markerPath ]] && return 0
 
-    # Always create the file, even if it's empty, since setup-cuda-hook relies on its existence.
-    # However, only populate it if strictDeps is not set.
-    touch "$markerPath"
+  # Always create the file, even if it's empty, since setup-cuda-hook relies on its existence.
+  # However, only populate it if strictDeps is not set.
+  touch "$markerPath"
 
-    # Return early if strictDeps is set.
-    [[ -n "${strictDeps-}" ]] && return 0
+  # Return early if strictDeps is set.
+  [[ -n ${strictDeps-} ]] && return 0
 
-    # Populate the file with the package name and output.
-    echo "${pname:?}-${output:?}" > "$markerPath"
+  # Populate the file with the package name and output.
+  echo "${pname:?}-${output:?}" >"$markerPath"
 }
 
 fixupOutputHooks+=(markForCUDAToolkit_ROOT)
diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix
index 4ce489a34d00..e94c03e658d0 100644
--- a/pkgs/development/cuda-modules/packages/nccl-tests.nix
+++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix
@@ -2,81 +2,109 @@
 # the names of dependencies from that package set directly to avoid evaluation errors
 # in the case redistributable packages are not available.
 {
-  config,
-  cudaPackages,
+  backendStdenv,
+  _cuda,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
   fetchFromGitHub,
+  flags,
   gitUpdater,
   lib,
   mpi,
   mpiSupport ? false,
+  nccl,
   which,
 }:
 let
-  inherit (cudaPackages)
-    backendStdenv
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    cudaAtLeast
-    nccl
-    ;
+  inherit (_cuda.lib) _mkMetaBroken;
+  inherit (lib) licenses maintainers teams;
+  inherit (lib.attrsets) getBin getInclude getLib;
+  inherit (lib.lists) optionals;
 in
 backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
 
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "nccl-tests";
-  version = "2.15.0";
+  version = "2.17.6";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nccl-tests";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OgffbW9Vx/sm1I1tpaPGdAhIpV4jbB4hJa9UcEAWkdE=";
+    hash = "sha256-F7F8UcBCX7nsuCNCzWHNY12QFtmYV10Jf785P39SHkM=";
   };
 
   postPatch = ''
-    # fix build failure with GCC14
-    substituteInPlace src/Makefile --replace-fail "-std=c++11" "-std=c++14"
+    nixLog "patching $PWD/src/common.mk to remove NVIDIA's ccbin declaration"
+    substituteInPlace ./src/common.mk \
+      --replace-fail \
+        '-ccbin $(CXX)' \
+        ""
   '';
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     which
     cuda_nvcc
   ];
 
   buildInputs = [
-    nccl
-    cuda_nvcc # crt/host_config.h
-    cuda_cudart
     cuda_cccl # <nv/target>
+    cuda_cudart
+    nccl
   ]
-  ++ lib.optionals mpiSupport [ mpi ];
+  ++ optionals mpiSupport [ mpi ];
 
+  # NOTE: CUDA_HOME is expected to have the bin directory
+  # TODO: This won't work with cross-compilation since cuda_nvcc will come from hostPackages by default (aka pkgs).
   makeFlags = [
-    "NCCL_HOME=${nccl}"
-    "CUDA_HOME=${cuda_nvcc}"
+    "CXXSTD=-std=c++17"
+    "CUDA_HOME=${getBin cuda_nvcc}"
+    "CUDA_INC=${getInclude cuda_cudart}/include"
+    "CUDA_LIB=${getLib cuda_cudart}/lib"
+    "NVCC_GENCODE=${flags.gencodeString}"
+    "PREFIX=$(out)"
   ]
-  ++ lib.optionals mpiSupport [ "MPI=1" ];
+  ++ optionals mpiSupport [ "MPI=1" ];
 
   enableParallelBuilding = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp -r build/* $out/bin/
+    runHook preInstall
+    mkdir -p "$out/bin"
+    install -Dm755 \
+      $(find build -type f -executable) \
+      "$out/bin"
+    runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {
-    inherit (finalAttrs) pname version;
-    rev-prefix = "v";
+  passthru = {
+    brokenAssertions = [
+      {
+        message = "mpi is non-null when mpiSupport is true";
+        assertion = mpiSupport -> mpi != null;
+      }
+    ];
+
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations";
     homepage = "https://github.com/NVIDIA/nccl-tests";
-    platforms = platforms.linux;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     license = licenses.bsd3;
-    broken = !config.cudaSupport || (mpiSupport && mpi == null);
+    broken = _mkMetaBroken finalAttrs;
     maintainers = with maintainers; [ jmillerpdt ];
     teams = [ teams.cuda ];
   };
diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index 2d89653ebe0d..ea5fa5e589a7 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -1,58 +1,86 @@
-# NOTE: Though NCCL is called within the cudaPackages package set, we avoid passing in
-# the names of dependencies from that package set directly to avoid evaluation errors
-# in the case redistributable packages are not available.
 {
-  lib,
+  _cuda,
+  backendStdenv,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaAtLeast,
+  cudaNamePrefix,
   fetchFromGitHub,
+  flags,
+  lib,
   python3,
+  removeReferencesTo,
   which,
-  autoAddDriverRunpath,
-  cudaPackages,
   # passthru.updateScript
   gitUpdater,
 }:
 let
-  inherit (cudaPackages)
-    backendStdenv
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    cudaAtLeast
-    flags
+  inherit (_cuda.lib) _mkMetaBadPlatforms;
+  inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities;
+  inherit (lib)
+    all
+    flip
+    getAttr
+    getBin
+    getInclude
+    getLib
+    licenses
+    maintainers
+    optionalString
+    teams
+    versionAtLeast
+    versionOlder
     ;
-  version = "2.27.6-1";
-  hash = "sha256-/BiLSZaBbVIqOfd8nQlgUJub0YR3SR4B93x2vZpkeiU=";
 in
 backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "nccl";
-  version = version;
+
+  # NOTE:
+  #   Compilation errors resulting from newer versions of NCCL on older releases of CUDA seem to be caused (mostly)
+  #   by differences in assumed version of CCCL: using a newer CCCL with an older release of CUDA can (sometimes) allow
+  #   newer versions of NCCL than what we provide here.
+  version =
+    if cudaAtLeast "11.7" then
+      "2.28.7-1"
+    else if cudaAtLeast "11.6" then
+      "2.26.6-1"
+    else
+      "2.25.1-1";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nccl";
-    rev = "v${finalAttrs.version}";
-    hash = hash;
+    tag = "v${finalAttrs.version}";
+    hash = getAttr finalAttrs.version {
+      "2.28.7-1" = "sha256-NM19OiBBGmv3cGoVoRLKSh9Y59hiDoei9NIrRnTqWeA=";
+      "2.26.6-1" = "sha256-vkWMGXCy+dIpYCecdafmOAGlnfRxIQ5Y2ZQuMjinraI=";
+      "2.25.1-1" = "sha256-3snh0xdL9I5BYqdbqdl+noizJoI38mZRVOJChgEE1I8=";
+    };
   };
 
-  __structuredAttrs = true;
-  strictDeps = true;
-
   outputs = [
     "out"
     "dev"
+    "static"
   ];
 
   nativeBuildInputs = [
-    which
-    autoAddDriverRunpath
-    python3
     cuda_nvcc
+    python3
+    removeReferencesTo
+    which
   ];
 
   buildInputs = [
-    cuda_nvcc # crt/host_config.h
-    cuda_cudart
+    (getInclude cuda_nvcc)
     cuda_cccl
+    cuda_cudart
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ];
@@ -60,35 +88,79 @@ backendStdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs ./src/device/generate.py
     patchShebangs ./src/device/symmetric/generate.py
+
+    nixLog "patching $PWD/makefiles/common.mk to remove NVIDIA's ccbin declaration"
+    substituteInPlace ./makefiles/common.mk \
+      --replace-fail \
+        '-ccbin $(CXX)' \
+        ""
+  ''
+  # 2.27.3-1 was the first to introuce CXXSTD
+  + optionalString (versionOlder finalAttrs.version "2.27.3-1") ''
+    nixLog "patching $PWD/makefiles/common.mk to remove NVIDIA's std hardcoding"
+    substituteInPlace ./makefiles/common.mk \
+      --replace-fail \
+        '-std=c++11' \
+        '$(CXXSTD)'
   '';
 
+  # TODO: This would likely break under cross; need to delineate between build and host packages.
   makeFlags = [
-    "PREFIX=$(out)"
+    "CXXSTD=-std=c++17"
+    "CUDA_HOME=${getBin cuda_nvcc}"
+    "CUDA_INC=${getInclude cuda_cudart}/include"
+    "CUDA_LIB=${getLib cuda_cudart}/lib"
     "NVCC_GENCODE=${flags.gencodeString}"
-    "CUDA_HOME=${cuda_nvcc}"
-    "CUDA_LIB=${lib.getLib cuda_cudart}/lib"
-    "CUDA_INC=${lib.getDev cuda_cudart}/include"
+    "PREFIX=$(out)"
   ];
 
   enableParallelBuilding = true;
 
   postFixup = ''
-    moveToOutput lib/libnccl_static.a $dev
+    _overrideFirst outputStatic "static" "lib" "out"
+    moveToOutput lib/libnccl_static.a "''${!outputStatic:?}"
+  ''
+  # Since CUDA 12.8, the cuda_nvcc path leaks in:
+  # - libnccl.so's .nv_fatbin section
+  # - libnccl_static.a
+  # &devrt -L /nix/store/00000000000000000000000000000000-...nvcc-.../bin/...
+  # This string makes cuda_nvcc a runtime dependency of nccl.
+  # See https://github.com/NixOS/nixpkgs/pull/457803
+  + ''
+    remove-references-to -t "${lib.getBin cuda_nvcc}" \
+      ''${!outputLib}/lib/libnccl.so.* \
+      ''${!outputStatic}/lib/*.a
   '';
 
-  passthru.updateScript = gitUpdater {
-    inherit (finalAttrs) pname version;
-    rev-prefix = "v";
+  # C.f. remove-references-to above. Ensure *all* references to cuda_nvcc are removed
+  disallowedRequisites = [ (lib.getBin cuda_nvcc) ];
+
+  passthru = {
+    platformAssertions = [
+      {
+        message = "Pre-Thor Jetson devices (CUDA capabilities < 10.1) are not supported by NCCL";
+        assertion =
+          !hasJetsonCudaCapability || all (flip versionAtLeast "10.1") requestedJetsonCudaCapabilities;
+      }
+    ];
+
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs";
     homepage = "https://developer.nvidia.com/nccl";
     license = licenses.bsd3;
-    platforms = platforms.linux;
-    # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication.
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    # NCCL is not supported on Pre-Thor Jetsons, because it does not use NVLink or PCI-e for inter-GPU communication.
     # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9
-    badPlatforms = lib.optionals flags.isJetsonBuild [ "aarch64-linux" ];
+    badPlatforms = _mkMetaBadPlatforms finalAttrs;
     maintainers = with maintainers; [
       mdaiter
       orivej
diff --git a/pkgs/development/cuda-modules/packages/nsight_compute.nix b/pkgs/development/cuda-modules/packages/nsight_compute.nix
new file mode 100644
index 000000000000..6f7f1d0772b2
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nsight_compute.nix
@@ -0,0 +1,139 @@
+{
+  backendStdenv,
+  buildRedist,
+  cudaAtLeast,
+  cudaMajorMinorVersion,
+  cudaOlder,
+  e2fsprogs,
+  elfutils,
+  flags,
+  gst_all_1,
+  lib,
+  libjpeg8,
+  qt5 ? null,
+  qt6 ? null,
+  rdma-core,
+  ucx,
+}:
+let
+  archDir =
+    {
+      aarch64-linux = "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "desktop") + "-t210-a64";
+      x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
+    }
+    .${backendStdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
+in
+buildRedist (
+  finalAttrs:
+  let
+    qt = if lib.versionOlder finalAttrs.version "2022.2.0" then qt5 else qt6;
+    qtwayland =
+      if lib.versions.major qt.qtbase.version == "5" then
+        lib.getBin qt.qtwayland
+      else
+        lib.getLib qt.qtwayland;
+    inherit (qt) wrapQtAppsHook qtwebengine qtwebview;
+  in
+  {
+    redistName = "cuda";
+    pname = "nsight_compute";
+
+    # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
+    # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
+    # messages like
+    #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
+    #   target (AArch64)
+    outputs = [ "out" ];
+
+    allowFHSReferences = true;
+
+    nativeBuildInputs = [ wrapQtAppsHook ];
+
+    buildInputs = [
+      (lib.getLib qtwayland)
+      qtwebengine
+      qtwebview
+      rdma-core
+    ]
+    ++ lib.optionals (cudaMajorMinorVersion == "12.0" && backendStdenv.hostPlatform.isAarch64) [
+      libjpeg8
+    ]
+    ++ lib.optionals (cudaAtLeast "12.1" && cudaOlder "12.4") [
+      gst_all_1.gstreamer
+      gst_all_1.gst-plugins-base
+    ]
+    ++ lib.optionals (cudaAtLeast "12.0" && cudaOlder "12.7") [
+      e2fsprogs
+      ucx
+    ]
+    ++ lib.optionals (cudaAtLeast "12.9") [ elfutils ];
+
+    dontWrapQtApps = true;
+
+    preInstall = ''
+      if [[ -d nsight-compute ]]; then
+        nixLog "Lifting components of Nsight Compute to the top level"
+        mv -v nsight-compute/*/* .
+        nixLog "Removing empty directories"
+        rmdir -pv nsight-compute/*
+      fi
+
+      rm -rf host/${archDir}/Mesa/
+
+      patchShebangs .
+    '';
+
+    postInstall = ''
+      moveToOutput 'ncu' "''${!outputBin}/bin"
+      moveToOutput 'ncu-ui' "''${!outputBin}/bin"
+      moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
+      moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
+      wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
+    ''
+    # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
+    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "11.8" && cudaOlder "12.9") ''
+      nixLog "Removing QNX 700 target directory for Jetson builds"
+      rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
+    ''
+    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
+      nixLog "Removing QNX 800 target directory for Jetson builds"
+      rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
+    '';
+
+    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+    preFixup = ''
+      patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
+    '';
+
+    autoPatchelfIgnoreMissingDeps = [
+      "libcuda.so.1"
+      "libnvidia-ml.so.1"
+    ];
+
+    brokenAssertions = [
+      {
+        message = "Qt 5 is required and available";
+        assertion = lib.versionOlder finalAttrs.version "2022.2.0" -> qt5 != null;
+      }
+      {
+        message = "Qt 6 is required and available";
+        assertion = lib.versionAtLeast finalAttrs.version "2022.2.0" -> qt6 != null;
+      }
+    ];
+
+    meta = {
+      description = "Interactive profiler for CUDA and NVIDIA OptiX";
+      longDescription = ''
+        NVIDIA Nsight Compute is an interactive profiler for CUDA and NVIDIA OptiX that provides detailed performance
+        metrics and API debugging via a user interface and command-line tool. Users can run guided analysis and compare
+        results with a customizable and data-driven user interface, as well as post-process and analyze results in their
+        own workflows.
+      '';
+      homepage = "https://developer.nvidia.com/nsight-compute";
+      changelog = "https://docs.nvidia.com/nsight-compute/ReleaseNotes";
+
+      mainProgram = "ncu";
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
new file mode 100644
index 000000000000..f043d5887e51
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -0,0 +1,176 @@
+{
+  backendStdenv,
+  boost178,
+  buildRedist,
+  cudaAtLeast,
+  e2fsprogs,
+  gst_all_1,
+  lib,
+  nss,
+  numactl,
+  pulseaudio,
+  qt5 ? null,
+  qt6 ? null,
+  rdma-core,
+  ucx,
+  wayland,
+  xorg,
+}:
+let
+  # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux.
+  hostDir =
+    {
+      aarch64-linux = "host-linux-armv8";
+      x86_64-linux = "host-linux-x64";
+    }
+    .${backendStdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
+  targetDir =
+    {
+      aarch64-linux = "target-linux-sbsa-armv8";
+      x86_64-linux = "target-linux-x64";
+    }
+    .${backendStdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
+in
+buildRedist (
+  finalAttrs:
+  let
+    qt = if lib.strings.versionOlder finalAttrs.version "2022.4.2.1" then qt5 else qt6;
+    qtwayland =
+      if lib.versions.major qt.qtbase.version == "5" then
+        lib.getBin qt.qtwayland
+      else
+        lib.getLib qt.qtwayland;
+    qtWaylandPlugins = "${qtwayland}/${qt.qtbase.qtPluginPrefix}";
+    inherit (qt) wrapQtAppsHook qtwebengine;
+  in
+  {
+    redistName = "cuda";
+    pname = "nsight_systems";
+
+    allowFHSReferences = true;
+
+    outputs = [ "out" ];
+
+    # An ad hoc replacement for
+    # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
+    env.rmPatterns = toString [
+      "${hostDir}/lib{arrow,jpeg}*"
+      "${hostDir}/lib{ssl,ssh,crypto}*"
+      "${hostDir}/libboost*"
+      "${hostDir}/libexec"
+      "${hostDir}/libstdc*"
+      "${hostDir}/python/bin/python"
+      "${hostDir}/Mesa"
+    ];
+
+    # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
+    prePatch = ''
+      if [[ -d bin ]]; then
+        nixLog "Removing bin wrapper scripts"
+        for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
+          [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
+        done
+        unset -v knownWrapper
+
+        nixLog "Removing empty bin directory"
+        rmdir -v bin
+      fi
+
+      if [[ -d nsight-systems ]]; then
+        nixLog "Lifting components of Nsight System to the top level"
+        mv -v nsight-systems/*/* .
+        nixLog "Removing empty nsight-systems directory"
+        rmdir -pv nsight-systems/*
+      fi
+    '';
+
+    postPatch = ''
+      for path in $rmPatterns; do
+        rm -r "$path"
+      done
+      patchShebangs .
+    '';
+
+    nativeBuildInputs = [ wrapQtAppsHook ];
+
+    dontWrapQtApps = true;
+
+    # TODO(@connorbaker): Fix dependencies for earlier (CUDA <12.6) versions of nsight_systems.
+    buildInputs = [
+      qt6.qtdeclarative
+      qt6.qtsvg
+      qt6.qtimageformats
+      qt6.qtpositioning
+      qt6.qtscxml
+      qt6.qttools
+      qtwebengine
+      qt6.qtwayland
+      boost178
+      e2fsprogs
+      gst_all_1.gst-plugins-base
+      gst_all_1.gstreamer
+      nss
+      numactl
+      pulseaudio
+      qt6.qtbase
+      qtWaylandPlugins
+      rdma-core
+      ucx
+      wayland
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXrandr
+      xorg.libXtst
+    ]
+    # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
+    ++ lib.optionals (backendStdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [
+      gst_all_1.gst-plugins-bad
+    ];
+
+    postInstall = ''
+      moveToOutput '${hostDir}' "''${!outputBin}"
+      moveToOutput '${targetDir}' "''${!outputBin}"
+      moveToOutput 'bin' "''${!outputBin}"
+      wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
+    '';
+
+    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+    preFixup = ''
+      patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
+    '';
+
+    autoPatchelfIgnoreMissingDeps = [
+      "libcuda.so.1"
+      "libnvidia-ml.so.1"
+    ];
+
+    brokenAssertions = [
+      {
+        # Boost 1.70 has been deprecated in Nixpkgs; releases older than the one for CUDA 11.8 are not supported.
+        message = "Boost 1.70 is required and available";
+        assertion = lib.versionAtLeast finalAttrs.version "2022.4.2.1";
+      }
+      {
+        message = "Qt 5 is required and available";
+        assertion = lib.versionOlder finalAttrs.version "2022.4.2.1" -> qt5 != null;
+      }
+      {
+        message = "Qt 6 is required and available";
+        assertion = lib.versionAtLeast finalAttrs.version "2022.4.2.1" -> qt6 != null;
+      }
+    ];
+
+    meta = {
+      description = "System-wide performance analysis and visualization tool";
+      longDescription = ''
+        NVIDIA Nsight Systems is a system-wide performance analysis tool designed to visualize an application's
+        algorithms, identify the largest opportunities to optimize, and tune to scale efficiently across any quantity or
+        size of CPUs and GPUs, from large servers to our smallest systems-on-a-chip (SoCs).
+      '';
+      homepage = "https://developer.nvidia.com/nsight-systems";
+      changelog = "https://docs.nvidia.com/nsight-systems/ReleaseNotes";
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/nvcomp.nix b/pkgs/development/cuda-modules/packages/nvcomp.nix
new file mode 100644
index 000000000000..eb5889c69d60
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvcomp.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nvcomp";
+  pname = "nvcomp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "High-speed data compression and decompression library optimized for NVIDIA GPUs";
+    longDescription = ''
+      NVIDIA nvCOMP is a high-speed data compression and decompression library optimized for NVIDIA GPUs.
+    '';
+    homepage = "https://developer.nvidia.com/nvcomp";
+    changelog = "https://docs.nvidia.com/cuda/nvcomp/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvidia_fs.nix b/pkgs/development/cuda-modules/packages/nvidia_fs.nix
new file mode 100644
index 000000000000..1dbe5d9c9baf
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvidia_fs.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvidia_fs";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "GPUDirect Storage kernel driver to read/write data from supported storage using cufile APIs";
+    longDescription = ''
+      GPUDirect Storage kernel driver nvidia-fs.ko is a kernel module to orchestrate IO directly from DMA/RDMA
+      capable storage to user allocated GPU memory on NVIDIA Graphics cards.
+    '';
+    homepage = "https://github.com/NVIDIA/gds-nvidia-fs";
+    changelog = "https://github.com/NVIDIA/gds-nvidia-fs/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_blas.nix b/pkgs/development/cuda-modules/packages/nvpl_blas.nix
new file mode 100644
index 000000000000..94661a67067d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_blas.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_blas";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Part of NVIDIA Performance Libraries that provides standard Fortran 77 BLAS APIs as well as C (CBLAS)";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/blas/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_common.nix b/pkgs/development/cuda-modules/packages/nvpl_common.nix
new file mode 100644
index 000000000000..86330f5187ed
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_common.nix
@@ -0,0 +1,16 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_common";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  meta = {
+    description = "Common part of NVIDIA Performance Libraries";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_fft.nix b/pkgs/development/cuda-modules/packages/nvpl_fft.nix
new file mode 100644
index 000000000000..30eb09ff9a11
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_fft.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_fft";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Perform Fast Fourier Transform (FFT) calculations on ARM CPUs";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/fft/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_lapack.nix b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix
new file mode 100644
index 000000000000..64637f45d9b5
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix
@@ -0,0 +1,20 @@
+{ buildRedist, nvpl_blas }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_lapack";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [ nvpl_blas ];
+
+  meta = {
+    description = "Part of NVIDIA Performance Libraries that provides standard Fortran 90 LAPACK and LAPACKE APIs";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/lapack/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_rand.nix b/pkgs/development/cuda-modules/packages/nvpl_rand.nix
new file mode 100644
index 000000000000..f65e6f15f0ee
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_rand.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_rand";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Collection of efficient pseudorandom and quasirandom number generators for ARM CPUs";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/rand/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix
new file mode 100644
index 000000000000..d9bf55082b6c
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_scalapack";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Provides an optimized implementation of ScaLAPACK for distributed-memory architectures";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/scalapack/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_sparse.nix b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix
new file mode 100644
index 000000000000..3bd6985e66e0
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_sparse";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "Provides a set of CPU-accelerated basic linear algebra subroutines used for handling sparse matrices";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/sparse/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_tensor.nix b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix
new file mode 100644
index 000000000000..177c267465bd
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix
@@ -0,0 +1,20 @@
+{ buildRedist, nvpl_blas }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_tensor";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [ nvpl_blas ];
+
+  meta = {
+    description = "Part of NVIDIA Performance Libraries that provides tensor primitives";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/tensor/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/saxpy/package.nix b/pkgs/development/cuda-modules/packages/saxpy/package.nix
index 5e3c2bb168ad..076afb708895 100644
--- a/pkgs/development/cuda-modules/packages/saxpy/package.nix
+++ b/pkgs/development/cuda-modules/packages/saxpy/package.nix
@@ -1,43 +1,34 @@
 {
-  autoAddDriverRunpath,
+  backendStdenv,
   cmake,
-  cudaPackages,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
+  flags,
   lib,
+  libcublas,
   saxpy,
 }:
-let
-  inherit (cudaPackages)
-    backendStdenv
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    cudaAtLeast
-    flags
-    libcublas
-    ;
-  inherit (lib) getDev getLib getOutput;
-in
-backendStdenv.mkDerivation {
-  pname = "saxpy";
-  version = "unstable-2023-07-11";
-
-  src = ./src;
-
+backendStdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
   strictDeps = true;
 
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "saxpy";
+  version = "0-unstable-2023-07-11";
+
+  src = ./src;
+
   nativeBuildInputs = [
     cmake
-    autoAddDriverRunpath
     cuda_nvcc
   ];
 
   buildInputs = [
-    (getDev libcublas)
-    (getLib libcublas)
-    (getOutput "static" libcublas)
-    cuda_cudart
     cuda_cccl
+    cuda_cudart
+    libcublas
   ];
 
   cmakeFlags = [
@@ -60,4 +51,4 @@ backendStdenv.mkDerivation {
     mainProgram = "saxpy";
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh b/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
index 95d1cee2c14a..1b0e6bf9c868 100644
--- a/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
+++ b/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
@@ -1,128 +1,129 @@
 # shellcheck shell=bash
 
 # Only run the hook from nativeBuildInputs
-(( "$hostOffset" == -1 && "$targetOffset" == 0)) || return 0
+# shellcheck disable=SC2154
+(("$hostOffset" == -1 && "$targetOffset" == 0)) || return 0
 
 guard=Sourcing
 reason=
 
 [[ -n ${cudaSetupHookOnce-} ]] && guard=Skipping && reason=" because the hook has been propagated more than once"
 
-if (( "${NIX_DEBUG:-0}" >= 1 )) ; then
-    echo "$guard hostOffset=$hostOffset targetOffset=$targetOffset setup-cuda-hook$reason" >&2
+if (("${NIX_DEBUG:-0}" >= 1)); then
+  echo "$guard hostOffset=$hostOffset targetOffset=$targetOffset setup-cuda-hook$reason" >&2
 else
-    echo "$guard setup-cuda-hook$reason" >&2
+  echo "$guard setup-cuda-hook$reason" >&2
 fi
 
-[[ "$guard" = Sourcing ]] || return 0
+[[ $guard == Sourcing ]] || return 0
 
 declare -g cudaSetupHookOnce=1
 declare -Ag cudaHostPathsSeen=()
 declare -Ag cudaOutputToPath=()
 
 extendcudaHostPathsSeen() {
-    (( "${NIX_DEBUG:-0}" >= 1 )) && echo "extendcudaHostPathsSeen $1" >&2
+  (("${NIX_DEBUG:-0}" >= 1)) && echo "extendcudaHostPathsSeen $1" >&2
 
-    local markerPath="$1/nix-support/include-in-cudatoolkit-root"
-    [[ ! -f "${markerPath}" ]] && return 0
-    [[ -v cudaHostPathsSeen[$1] ]] && return 0
+  local markerPath="$1/nix-support/include-in-cudatoolkit-root"
+  [[ ! -f ${markerPath} ]] && return 0
+  [[ -v cudaHostPathsSeen[$1] ]] && return 0
 
-    cudaHostPathsSeen["$1"]=1
+  cudaHostPathsSeen["$1"]=1
 
-    # E.g. cuda_cudart-lib
-    local cudaOutputName
-    # Fail gracefully if the file is empty.
-    # One reason the file may be empty: the package was built with strictDeps set, but the current build does not have
-    # strictDeps set.
-    read -r cudaOutputName < "$markerPath" || return 0
+  # E.g. cuda_cudart-lib
+  local cudaOutputName
+  # Fail gracefully if the file is empty.
+  # One reason the file may be empty: the package was built with strictDeps set, but the current build does not have
+  # strictDeps set.
+  read -r cudaOutputName <"$markerPath" || return 0
 
-    [[ -z "$cudaOutputName" ]] && return 0
+  [[ -z $cudaOutputName ]] && return 0
 
-    local oldPath="${cudaOutputToPath[$cudaOutputName]-}"
-    [[ -n "$oldPath" ]] && echo "extendcudaHostPathsSeen: warning: overwriting $cudaOutputName from $oldPath to $1" >&2
-    cudaOutputToPath["$cudaOutputName"]="$1"
+  local oldPath="${cudaOutputToPath[$cudaOutputName]-}"
+  [[ -n $oldPath ]] && echo "extendcudaHostPathsSeen: warning: overwriting $cudaOutputName from $oldPath to $1" >&2
+  cudaOutputToPath["$cudaOutputName"]="$1"
 }
 addEnvHooks "$targetOffset" extendcudaHostPathsSeen
 
 setupCUDAToolkit_ROOT() {
-    (( "${NIX_DEBUG:-0}" >= 1 )) && echo "setupCUDAToolkit_ROOT: cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
+  (("${NIX_DEBUG:-0}" >= 1)) && echo "setupCUDAToolkit_ROOT: cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
 
-    for path in "${!cudaHostPathsSeen[@]}" ; do
-        addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$path"
-        if [[ -d "$path/include" ]] ; then
-            addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$path/include"
-        fi
-    done
+  for path in "${!cudaHostPathsSeen[@]}"; do
+    addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$path"
+    if [[ -d "$path/include" ]]; then
+      addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$path/include"
+    fi
+  done
 
-    # Use array form so semicolon-separated lists are passed safely.
-    if [[ -n "${CUDAToolkit_INCLUDE_DIR-}" ]]; then
-        cmakeFlagsArray+=("-DCUDAToolkit_INCLUDE_DIR=${CUDAToolkit_INCLUDE_DIR}")
-    fi
-    if [[ -n "${CUDAToolkit_ROOT-}" ]]; then
-        cmakeFlagsArray+=("-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT}")
-    fi
+  # Use array form so semicolon-separated lists are passed safely.
+  if [[ -n ${CUDAToolkit_INCLUDE_DIR-} ]]; then
+    cmakeFlagsArray+=("-DCUDAToolkit_INCLUDE_DIR=${CUDAToolkit_INCLUDE_DIR}")
+  fi
+  if [[ -n ${CUDAToolkit_ROOT-} ]]; then
+    cmakeFlagsArray+=("-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT}")
+  fi
 }
 preConfigureHooks+=(setupCUDAToolkit_ROOT)
 
 setupCUDAToolkitCompilers() {
-    echo Executing setupCUDAToolkitCompilers >&2
+  echo Executing setupCUDAToolkitCompilers >&2
 
-    if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then
-        return 0
-    fi
+  if [[ -n ${dontSetupCUDAToolkitCompilers-} ]]; then
+    return 0
+  fi
 
-    # Point NVCC at a compatible compiler
+  # Point NVCC at a compatible compiler
 
-    # For CMake-based projects:
-    # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
-    # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html
-    # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html
+  # For CMake-based projects:
+  # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
+  # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html
+  # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html
 
-    appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@"
-    appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@"
+  appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@"
+  appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@"
 
-    # For non-CMake projects:
-    # We prepend --compiler-bindir to nvcc flags.
-    # Downstream packages can override these, because NVCC
-    # uses the last --compiler-bindir it gets on the command line.
-    # FIXME: this results in "incompatible redefinition" warnings.
-    # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
-    if [ -z "${CUDAHOSTCXX-}" ]; then
-      export CUDAHOSTCXX="@ccFullPath@";
-    fi
+  # For non-CMake projects:
+  # We prepend --compiler-bindir to nvcc flags.
+  # Downstream packages can override these, because NVCC
+  # uses the last --compiler-bindir it gets on the command line.
+  # FIXME: this results in "incompatible redefinition" warnings.
+  # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
+  if [ -z "${CUDAHOSTCXX-}" ]; then
+    export CUDAHOSTCXX="@ccFullPath@"
+  fi
 
-    appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin"
+  appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin"
 
-    # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled
-    #   binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
-    #   the default set of CUDA capabilities we build can regularly cause this to occur (for
-    #   example, with Magma).
-    #
-    # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix
-    if [[ -z "${dontCompressFatbin-}" ]]; then
-        appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all"
-    fi
+  # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled
+  #   binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
+  #   the default set of CUDA capabilities we build can regularly cause this to occur (for
+  #   example, with Magma).
+  #
+  # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix
+  if [[ -z ${dontCompressFatbin-} ]]; then
+    appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all"
+  fi
 }
 preConfigureHooks+=(setupCUDAToolkitCompilers)
 
 propagateCudaLibraries() {
-    (( "${NIX_DEBUG:-0}" >= 1 )) && echo "propagateCudaLibraries: cudaPropagateToOutput=$cudaPropagateToOutput cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
+  (("${NIX_DEBUG:-0}" >= 1)) && echo "propagateCudaLibraries: cudaPropagateToOutput=$cudaPropagateToOutput cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
 
-    [[ -z "${cudaPropagateToOutput-}" ]] && return 0
+  [[ -z ${cudaPropagateToOutput-} ]] && return 0
 
-    mkdir -p "${!cudaPropagateToOutput}/nix-support"
-    # One'd expect this should be propagated-bulid-build-deps, but that doesn't seem to work
-    echo "@setupCudaHook@" >> "${!cudaPropagateToOutput}/nix-support/propagated-native-build-inputs"
+  mkdir -p "${!cudaPropagateToOutput}/nix-support"
+  # One'd expect this should be propagated-bulid-build-deps, but that doesn't seem to work
+  echo "@setupCudaHook@" >>"${!cudaPropagateToOutput}/nix-support/propagated-native-build-inputs"
 
-    local propagatedBuildInputs=( "${!cudaHostPathsSeen[@]}" )
-    for output in $(getAllOutputNames) ; do
-        if [[ ! "$output" = "$cudaPropagateToOutput" ]] ; then
-            appendToVar propagatedBuildInputs "${!output}"
-        fi
-        break
-    done
+  local propagatedBuildInputs=("${!cudaHostPathsSeen[@]}")
+  for output in $(getAllOutputNames); do
+    if [[ $output != "$cudaPropagateToOutput" ]]; then
+      appendToVar propagatedBuildInputs "${!output}"
+    fi
+    break
+  done
 
-    # One'd expect this should be propagated-host-host-deps, but that doesn't seem to work
-    printWords "${propagatedBuildInputs[@]}" >> "${!cudaPropagateToOutput}/nix-support/propagated-build-inputs"
+  # One'd expect this should be propagated-host-host-deps, but that doesn't seem to work
+  printWords "${propagatedBuildInputs[@]}" >>"${!cudaPropagateToOutput}/nix-support/propagated-build-inputs"
 }
 postFixupHooks+=(propagateCudaLibraries)
diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix
new file mode 100644
index 000000000000..0a1192090e90
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tensorrt.nix
@@ -0,0 +1,161 @@
+{
+  _cuda,
+  backendStdenv,
+  buildRedist,
+  cuda_cudart,
+  cudnn,
+  cuda_nvrtc,
+  lib,
+  libcudla, # only for Jetson
+  patchelf,
+}:
+let
+  inherit (_cuda.lib) majorMinorPatch;
+  inherit (backendStdenv) hasJetsonCudaCapability;
+  inherit (lib.attrsets) getLib;
+  inherit (lib.lists) optionals;
+  inherit (lib.strings) concatStringsSep;
+in
+buildRedist (
+  finalAttrs:
+  let
+    majorMinorPatchVersion = majorMinorPatch finalAttrs.version;
+    majorVersion = lib.versions.major finalAttrs.version;
+  in
+  {
+    redistName = "tensorrt";
+    pname = "tensorrt";
+
+    outputs = [
+      "out"
+      "bin"
+      "dev"
+      "include"
+      "lib"
+      "samples"
+      "static"
+      # "stubs" removed in postInstall
+    ];
+
+    allowFHSReferences = true;
+
+    nativeBuildInputs = [ patchelf ];
+
+    buildInputs = [
+      (getLib cudnn)
+      (getLib cuda_nvrtc)
+      cuda_cudart
+    ]
+    ++ optionals libcudla.meta.available [ libcudla ];
+
+    preInstall =
+      let
+        inherit (backendStdenv.hostPlatform) parsed;
+        # x86_64-linux-gnu
+        targetString = concatStringsSep "-" [
+          parsed.cpu.name
+          parsed.kernel.name
+          parsed.abi.name
+        ];
+      in
+      # Replace symlinks to bin and lib with the actual directories from targets.
+      ''
+        for dir in bin lib; do
+          [[ -L "$dir" ]] || continue
+          nixLog "replacing symlink $NIX_BUILD_TOP/$sourceRoot/$dir with $NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir"
+          rm --verbose "$NIX_BUILD_TOP/$sourceRoot/$dir"
+          mv --verbose --no-clobber "$NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir" "$NIX_BUILD_TOP/$sourceRoot/$dir"
+        done
+        unset -v dir
+      ''
+      # Remove symlinks if they exist
+      + ''
+        for dir in include samples; do
+          if [[ -L "$NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir" ]]; then
+            nixLog "removing symlink $NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir"
+            rm --verbose "$NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir"
+          fi
+        done
+        unset -v dir
+
+        if [[ -d "$NIX_BUILD_TOP/$sourceRoot/targets" ]]; then
+          nixLog "removing targets directory"
+          rm --recursive --verbose "$NIX_BUILD_TOP/$sourceRoot/targets" || {
+            nixErrorLog "could not delete $NIX_BUILD_TOP/$sourceRoot/targets: $(ls -laR "$NIX_BUILD_TOP/$sourceRoot/targets")"
+            exit 1
+          }
+        fi
+      '';
+
+    autoPatchelfIgnoreMissingDeps = optionals hasJetsonCudaCapability [
+      "libnvdla_compiler.so"
+    ];
+
+    # Create a symlink for the Onnx header files in include/onnx
+    # NOTE(@connorbaker): This is shared with the tensorrt-oss package, with the `out` output swapped with `include`.
+    # When updating one, check if the other should be updated.
+    postInstall = ''
+      mkdir "''${!outputInclude:?}/include/onnx"
+      pushd "''${!outputInclude:?}/include" >/dev/null
+      nixLog "creating symlinks for Onnx header files"
+      ln -srvt "''${!outputInclude:?}/include/onnx/" NvOnnx*.h
+      popd >/dev/null
+    ''
+    # Move the python directory, which contains header files, to the include output.
+    + ''
+      nixLog "moving python directory to include output"
+      moveToOutput python "''${!outputInclude:?}"
+
+      nixLog "remove python wheels"
+      rm --verbose "''${!outputInclude:?}"/python/*.whl
+    ''
+    + ''
+      nixLog "moving data directory to samples output"
+      moveToOutput data "''${!outputSamples:?}"
+    ''
+    # Remove the Windows library used for cross-compilation if it exists.
+    + ''
+      if [[ -e "''${!outputLib:?}/lib/libnvinfer_builder_resource_win.so.${majorMinorPatchVersion}" ]]; then
+        nixLog "removing Windows library"
+        rm --verbose "''${!outputLib:?}/lib/libnvinfer_builder_resource_win.so.${majorMinorPatchVersion}"
+      fi
+    ''
+    # Remove the stub libraries.
+    + ''
+      nixLog "removing stub libraries"
+      rm --recursive --verbose "''${!outputLib:?}/lib/stubs" || {
+        nixErrorLog "could not delete ''${!outputLib:?}/lib/stubs"
+        exit 1
+      }
+    '';
+
+    # Tell autoPatchelf about runtime dependencies.
+    postFixup = ''
+      nixLog "patchelf-ing ''${!outputBin:?}/bin/trtexec with runtime dependencies"
+      patchelf \
+        "''${!outputBin:?}/bin/trtexec" \
+        --add-needed libnvinfer_plugin.so.${majorVersion}
+    '';
+
+    passthru = {
+      # The CUDNN used with TensorRT.
+      inherit cudnn;
+    };
+
+    meta = {
+      description = "SDK that facilitates high-performance machine learning inference";
+      longDescription = ''
+        NVIDIA TensorRT is an SDK that facilitates high-performance machine learning inference. It complements training
+        frameworks such as TensorFlow, PyTorch, and MXNet. It focuses on running an already-trained network quickly and
+        efficiently on NVIDIA hardware.
+      '';
+      homepage = "https://developer.nvidia.com/tensorrt";
+      # NOTE: As of 2025-08-31, TensorRT doesn't follow the standard naming convention for URL paths that the rest of
+      # the redistributables do. As such, we need to specify downloadPage manually.
+      downloadPage = "https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt";
+      changelog = "https://docs.nvidia.com/deeplearning/tensorrt/latest/getting-started/release-notes.html#release-notes";
+
+      license = _cuda.lib.licenses.tensorrt;
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/tests/cmake/package.nix b/pkgs/development/cuda-modules/packages/tests/cmake/package.nix
new file mode 100644
index 000000000000..3a1ce899624d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cmake/package.nix
@@ -0,0 +1,203 @@
+{
+  backendStdenv,
+  cmake,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
+  fetchpatch2,
+  flags,
+  lib,
+  srcOnly,
+  stdenv,
+  stdenvNoCC,
+}:
+let
+  inherit (backendStdenv) cc;
+  inherit (lib.attrsets) mapAttrs optionalAttrs recurseIntoAttrs;
+  inherit (lib.fixedPoints) composeExtensions toExtension;
+  inherit (lib.lists) optionals;
+  inherit (lib.strings)
+    cmakeBool
+    cmakeFeature
+    optionalString
+    versionAtLeast
+    ;
+
+  cmake' = cmake.overrideAttrs (prevAttrs: {
+    patches = prevAttrs.patches or [ ] ++ [
+      # Fix errors during configuration when C/CXX is not loaded
+      # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10354
+      (fetchpatch2 {
+        name = "find-cuda-toolkit-check-for-language-enablement.patch";
+        url = "https://gitlab.kitware.com/cmake/cmake/-/commit/c5d81a246852e1ad81a3d55fcaff7e6feb779db7.patch";
+        hash = "sha256-oGxzbp+x88+79V+Cyx0l7+nMxX+n3ixzAFKPK26NMI8=";
+      })
+      # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10289
+      (fetchpatch2 {
+        name = "update-arch-supported-by-cuda-12_8.patch";
+        url = "https://gitlab.kitware.com/cmake/cmake/-/commit/a745b6869ee3681e39544d96d936c95c196c7398.patch";
+        hash = "sha256-B6ny6AZFIcyFhsEnzNk7+vJTb36HeguM53sk/LCnjS4=";
+      })
+    ];
+  });
+
+  isBroken = _: prevAttrs: {
+    meta = prevAttrs.meta or { } // {
+      broken = true;
+    };
+  };
+
+  cmakeSrc = srcOnly {
+    name = "cmake-unpacked";
+    inherit (cmake) src version;
+    stdenv = stdenvNoCC;
+  };
+
+  mkTest =
+    let
+      generic = stdenv.mkDerivation (finalAttrs: {
+        __structuredAttrs = true;
+        strictDeps = true;
+
+        testSuiteName = builtins.throw "testSuiteName must be set";
+        testName = builtins.throw "testName must be set";
+
+        name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+        pname = "tests-cmake-${finalAttrs.testSuiteName}-${finalAttrs.testName}";
+        inherit (cmakeSrc) version;
+
+        src = cmakeSrc;
+
+        setSourceRoot = ''
+          sourceRoot="$(echo */Tests/${finalAttrs.testSuiteName}/${finalAttrs.testName})"
+        '';
+
+        nativeBuildInputs = [
+          cmake'
+          cuda_nvcc
+        ];
+
+        # If our compiler uses C++14, we must modify the CMake files so they don't hardcode C++11.
+        # This behavior has only been seen with GCC 14, but it's possible Clang would also require this.
+        requireCxxStandard14 = cc.isGNU && versionAtLeast cc.version "14";
+
+        cmakeListsReplacements = optionalAttrs finalAttrs.requireCxxStandard14 {
+          "cuda_std_11" = "cuda_std_14";
+          "cxx_std_11" = "cxx_std_14";
+          "set(CMAKE_CUDA_STANDARD 11)" = "set(CMAKE_CUDA_STANDARD 14)";
+          "set(CMAKE_CXX_STANDARD 11)" = "set(CMAKE_CXX_STANDARD 14)";
+        };
+
+        prePatch = optionalString finalAttrs.requireCxxStandard14 ''
+          for key in "''${!cmakeListsReplacements[@]}"; do
+            if grep -q "$key" CMakeLists.txt; then
+              nixLog "replacing occurrences of \"$key\" with \"''${cmakeListsReplacements[$key]}\" in $PWD/CMakeLists.txt"
+              substituteInPlace CMakeLists.txt --replace-fail "$key" "''${cmakeListsReplacements[$key]}"
+            fi
+          done
+        '';
+
+        buildInputs = [
+          cuda_cudart
+        ];
+
+        cmakeFlags = [
+          (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
+          (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+        ]
+        ++ optionals finalAttrs.requireCxxStandard14 [
+          (cmakeFeature "CMAKE_CXX_STANDARD" "14")
+          (cmakeFeature "CMAKE_CUDA_STANDARD" "14")
+        ];
+
+        # The build *is* the check.
+        doCheck = false;
+
+        installPhase = ''
+          runHook preInstall
+          touch "$out"
+          runHook postInstall
+        '';
+
+        # Don't try to run stuff in the patch phase as the setup hooks will error on empty output.
+        dontFixup = true;
+
+        meta = {
+          description = "Generic builder for running CMake tests";
+          license = lib.licenses.mit;
+          maintainers = lib.teams.cuda.members;
+          platforms = [
+            "aarch64-linux"
+            "x86_64-linux"
+          ];
+        };
+      });
+    in
+    testSuiteName: testName: overrideAttrsArg:
+    generic.overrideAttrs (
+      composeExtensions (toExtension { inherit testSuiteName testName; }) (toExtension overrideAttrsArg)
+    );
+in
+recurseIntoAttrs (
+  mapAttrs (testSuiteName: testSuite: recurseIntoAttrs (mapAttrs (mkTest testSuiteName) testSuite)) {
+    # TODO: Handle set(Cuda.Toolkit_BUILD_OPTIONS -DHAS_CUPTI:BOOL=${CMake_TEST_CUDA_CUPTI})
+    # from Tests/Cuda/CMakeLists.txt
+    Cuda = {
+      Complex = { };
+      CXXStandardSetTwice = { };
+      IncludePathNoToolkit = { };
+      MixedStandardLevels1 = { };
+      MixedStandardLevels2 = { };
+      MixedStandardLevels3 = { };
+      MixedStandardLevels4 = if cc.isClang then isBroken else { };
+      MixedStandardLevels5 = if cc.isClang then isBroken else { };
+      NotEnabled = { };
+      ObjectLibrary = { };
+      ProperDeviceLibraries =
+        if cc.isClang then
+          isBroken # Clang lacks __CUDACC_VER*__ defines.
+        else
+          isBroken; # TODO: Fix
+      ProperLinkFlags = { };
+      SeparableCompCXXOnly = { };
+      SharedRuntimePlusToolkit = isBroken; # TODO: Fix
+      StaticRuntimePlusToolkit = isBroken; # TODO: Fix
+      StubRPATH = { };
+      Toolkit = isBroken; # TODO: Fix
+      ToolkitBeforeLang = if cc.isClang then isBroken else { }; # Clang lacks __CUDACC_VER*__ defines.
+      WithC = { };
+    };
+    # TODO: Handle set(CudaOnly.Toolkit_BUILD_OPTIONS -DHAS_CUPTI:BOOL=${CMake_TEST_CUDA_CUPTI})
+    # from Tests/CudaOnly/CMakeLists.txt
+    CudaOnly = {
+      Architecture = { };
+      ArchSpecial = isBroken; # Tries to detect the native architecture, which is impure.
+      CircularLinkLine = { };
+      CompileFlags = { };
+      CUBIN = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      DeviceLTO = isBroken; # TODO: Fix
+      DontResolveDeviceSymbols = { };
+      EnableStandard = { };
+      ExportPTX = { };
+      Fatbin = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      GPUDebugFlag = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      OptixIR = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      PDB = isBroken; # Tests for features that only work with MSVC
+      ResolveDeviceSymbols = { };
+      RuntimeControls = { };
+      SeparateCompilation = { };
+      SeparateCompilationPTX = isBroken; # TODO: Fix
+      SeparateCompilationTargetObjects = { };
+      SharedRuntimePlusToolkit = isBroken; # TODO: Fix
+      SharedRuntimeViaCUDAFlags = if cc.isClang then isBroken else { }; # Clang doesn't have flags for selecting the runtime.
+      Standard98 = if cc.isClang then isBroken else { };
+      StaticRuntimePlusToolkit = isBroken; # TODO: Fix
+      Toolkit = isBroken; # TODO: Fix
+      ToolkitBeforeLang = { };
+      ToolkitMultipleDirs = { };
+      TryCompileTargetStatic = { };
+      Unity = { };
+      WithDefs = { };
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix
similarity index 79%
rename from pkgs/development/cuda-modules/cuda-library-samples/generic.nix
rename to pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix
index 529716220351..67bab4b3483c 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix
@@ -4,18 +4,17 @@
   autoPatchelfHook,
   backendStdenv,
   cmake,
-  cuda_cccl ? null,
-  cuda_cudart ? null,
-  cuda_nvcc ? null,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
   cudatoolkit,
-  cusparselt ? null,
-  cutensor ? null,
+  libcusparse_lt,
+  libcutensor,
   fetchFromGitHub,
   lib,
-  libcusparse ? null,
+  libcusparse,
   setupCudaHook,
 }:
-
 let
   base = backendStdenv.mkDerivation (finalAttrs: {
     src = fetchFromGitHub {
@@ -72,7 +71,7 @@ in
 
       sourceRoot = "${finalAttrs.src.name}/cuTENSOR";
 
-      buildInputs = prevAttrs.buildInputs or [ ] ++ [ cutensor ];
+      buildInputs = prevAttrs.buildInputs or [ ] ++ [ libcutensor ];
 
       cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [
         "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${placeholder "out"}/bin"
@@ -81,14 +80,10 @@ in
       # CUTENSOR_ROOT is double escaped
       postPatch = prevAttrs.postPatch or "" + ''
         substituteInPlace CMakeLists.txt \
-          --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getDev cutensor}/include"
+          --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getOutput "include" libcutensor}/include"
       '';
 
-      CUTENSOR_ROOT = cutensor;
-
-      meta = prevAttrs.meta or { } // {
-        broken = cutensor == null;
-      };
+      CUTENSOR_ROOT = libcutensor;
     }
   );
 
@@ -101,7 +96,7 @@ in
       nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [
         cmake
         addDriverRunpath
-        (lib.getDev cusparselt)
+        (lib.getDev libcusparse_lt)
         (lib.getDev libcusparse)
         cuda_nvcc
         (lib.getDev cuda_cudart) # <cuda_runtime_api.h>
@@ -110,8 +105,8 @@ in
 
       postPatch = prevAttrs.postPatch or "" + ''
         substituteInPlace CMakeLists.txt \
-          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \
-          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a"
+          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib libcusparse_lt}/lib/libcusparseLt.so" \
+          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic libcusparse_lt}/lib/libcusparseLt_static.a"
       '';
 
       postInstall = prevAttrs.postInstall or "" + ''
@@ -121,17 +116,7 @@ in
       '';
 
       CUDA_TOOLKIT_PATH = lib.getLib cudatoolkit;
-      CUSPARSELT_PATH = lib.getLib cusparselt;
-
-      meta = prevAttrs.meta or { } // {
-        broken =
-          # Base dependencies
-          cusparselt == null
-          || libcusparse == null
-          || cuda_nvcc == null
-          || cuda_cudart == null
-          || cuda_cccl == null;
-      };
+      CUSPARSELT_PATH = lib.getLib libcusparse_lt;
     }
   );
 }
diff --git a/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix
new file mode 100644
index 000000000000..ae3226b5a753
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix
@@ -0,0 +1,39 @@
+{
+  cudaNamePrefix,
+  cudnn-frontend,
+  jq,
+  lib,
+  writeShellApplication,
+}:
+let
+  inherit (lib.meta) getExe';
+in
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-cudnn-frontend-legacy-samples";
+  runtimeInputs = [
+    cudnn-frontend.legacy_samples
+    jq
+  ];
+  text = ''
+    args=( "${getExe' cudnn-frontend.legacy_samples "legacy_samples"}" )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+      "''${args[@]}"
+    else
+      args+=(
+        --success
+        --rng-seed=0
+        --reporter=json
+        exclude:"Scale Bias Conv BNGenstats with CPU Reference"
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+      "''${args[@]}" | jq
+    fi
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix
new file mode 100644
index 000000000000..0aa16703acda
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix
@@ -0,0 +1,38 @@
+{
+  cudaNamePrefix,
+  cudnn-frontend,
+  jq,
+  lib,
+  writeShellApplication,
+}:
+let
+  inherit (lib.meta) getExe';
+in
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-cudnn-frontend-samples";
+  runtimeInputs = [
+    cudnn-frontend.samples
+    jq
+  ];
+  text = ''
+    args=( "${getExe' cudnn-frontend.samples "samples"}" )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+      "''${args[@]}"
+    else
+      args+=(
+        --success
+        --rng-seed=0
+        --reporter=json
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+      "''${args[@]}" | jq
+    fi
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix
new file mode 100644
index 000000000000..d0949a0f53e6
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix
@@ -0,0 +1,38 @@
+{
+  cudaNamePrefix,
+  cudnn-frontend,
+  jq,
+  lib,
+  writeShellApplication,
+}:
+let
+  inherit (lib.meta) getExe';
+in
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-cudnn-frontend-tests";
+  runtimeInputs = [
+    cudnn-frontend.tests
+    jq
+  ];
+  text = ''
+    args=( "${getExe' cudnn-frontend.tests "tests"}" )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+      "''${args[@]}"
+    else
+      args+=(
+        --success
+        --rng-seed=0
+        --reporter=json
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+      "''${args[@]}" | jq
+    fi
+  '';
+}
diff --git a/pkgs/development/cuda-modules/tests/flags.nix b/pkgs/development/cuda-modules/packages/tests/flags.nix
similarity index 100%
rename from pkgs/development/cuda-modules/tests/flags.nix
rename to pkgs/development/cuda-modules/packages/tests/flags.nix
diff --git a/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix
new file mode 100644
index 000000000000..eb0fa74db933
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix
@@ -0,0 +1,40 @@
+{
+  cuda_cudart,
+  cudaNamePrefix,
+  onnx-tensorrt,
+  python3,
+  writeShellApplication,
+}:
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-onnx-tensorrt-long";
+  runtimeInputs = [
+    cuda_cudart
+    (python3.withPackages (ps: [
+      ps.onnx-tensorrt
+      ps.pytest
+      ps.six
+    ]))
+  ];
+  text = ''
+    args=(
+      python3
+      "${onnx-tensorrt.test_script}/onnx_backend_test.py"
+    )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+    else
+      args+=( --verbose )
+      echo "Running with default arguments: ''${args[*]}" >&2
+    fi
+
+    mkdir -p "$HOME/.onnx"
+    chmod -R +w "$HOME/.onnx"
+    "''${args[@]}"
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix
new file mode 100644
index 000000000000..9415246f7c67
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix
@@ -0,0 +1,43 @@
+{
+  cuda_cudart,
+  cudaNamePrefix,
+  onnx-tensorrt,
+  python3,
+  writeShellApplication,
+}:
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-onnx-tensorrt-short";
+  runtimeInputs = [
+    cuda_cudart
+    (python3.withPackages (ps: [
+      ps.onnx-tensorrt
+      ps.pytest
+      ps.six
+    ]))
+  ];
+  text = ''
+    args=(
+      python3
+      "${onnx-tensorrt.test_script}/onnx_backend_test.py"
+    )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+    else
+      args+=(
+        --verbose
+        OnnxBackendRealModelTest
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+    fi
+
+    mkdir -p "$HOME/.onnx"
+    chmod -R +w "$HOME/.onnx"
+    "''${args[@]}"
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix b/pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix
new file mode 100644
index 000000000000..86b2780944ea
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix
@@ -0,0 +1,122 @@
+{
+  cudaPackages,
+  lib,
+  writeGpuTestPython,
+}:
+let
+  inherit (lib)
+    listToAttrs
+    mapCartesianProduct
+    optionals
+    concatStringsSep
+    optionalString
+    ;
+
+  bools = [
+    true
+    false
+  ];
+
+  configs = {
+    openCVFirst = bools;
+    useOpenCVDefaultCuda = bools;
+    useTorchDefaultCuda = bools;
+  };
+
+  openCVBlock = ''
+
+    import cv2
+    print("OpenCV version:", cv2.__version__)
+
+    # Ensure OpenCV can access the GPU.
+    assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV"
+    print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice()))
+
+    # Ensure OpenCV can access the GPU.
+    print(cv2.getBuildInformation())
+
+    a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
+    b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
+    c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object.
+
+    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}"
+
+  '';
+
+  torchBlock = ''
+
+    import torch
+    print("Torch version:", torch.__version__)
+
+    # Set up the GPU.
+    torch.cuda.init()
+    # Ensure the GPU is available.
+    assert torch.cuda.is_available(), "CUDA is not available to Torch"
+    print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device()))
+
+    a = torch.ones(256, 256, dtype=torch.int32).cuda()
+    b = torch.ones(256, 256, dtype=torch.int32).cuda()
+    c = (a + b).sum().item()
+    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}"
+
+  '';
+
+  mkNamedTest =
+    {
+      openCVFirst,
+      useOpenCVDefaultCuda,
+      useTorchDefaultCuda,
+    }:
+    {
+      name = concatStringsSep "-" (
+        [
+          "test"
+          (if openCVFirst then "opencv" else "torch")
+        ]
+        ++ optionals (if openCVFirst then useOpenCVDefaultCuda else useTorchDefaultCuda) [
+          "with-default-cuda"
+        ]
+        ++ [
+          "then"
+          (if openCVFirst then "torch" else "opencv")
+        ]
+        ++ optionals (if openCVFirst then useTorchDefaultCuda else useOpenCVDefaultCuda) [
+          "with-default-cuda"
+        ]
+      );
+      value =
+        let
+          content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock;
+
+          torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda";
+          openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda";
+        in
+        # TODO: Ensure the expected CUDA libraries are loaded.
+        # TODO: Ensure GPU access works as expected.
+        writeGpuTestPython {
+          name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}";
+          libraries =
+            # NOTE: These are purposefully in this order.
+            pythonPackages:
+            let
+              effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: {
+                cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
+              });
+              effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: {
+                cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
+              });
+            in
+            if openCVFirst then
+              [
+                effectiveOpenCV
+                effectiveTorch
+              ]
+            else
+              [
+                effectiveTorch
+                effectiveOpenCV
+              ];
+        } content;
+    };
+in
+listToAttrs (mapCartesianProduct mkNamedTest configs)
diff --git a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
new file mode 100644
index 000000000000..6a0ee88ae883
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
@@ -0,0 +1,60 @@
+{
+  _cuda,
+  backendStdenv,
+  cudaNamePrefix,
+  lib,
+  linkFarm,
+  tests,
+}:
+# NOTE: Because Nixpkgs, by default, allows aliases, this derivation may contain multiple entries for a single redistributable.
+let
+  # redists-unpacked has already found all the names of the redistributables
+  availableRedistsForPlatform = lib.filterAttrs (
+    _: value:
+    let
+      canInstantiate =
+        (builtins.tryEval (
+          builtins.deepSeq ((value.drvPath or null) != null) ((value.drvPath or null) != null)
+        )).value;
+    in
+    lib.warnIfNot canInstantiate
+      "Package ${value.name} is unavailable and will not be included in redists-installed"
+      canInstantiate
+  ) tests.redists-unpacked.passthru.redistsForPlatform;
+
+  mkOutputs =
+    name: drv:
+    lib.genAttrs' drv.outputs (output: {
+      name = "${name}-${output}";
+      value = drv.${output};
+    });
+
+  linkedWithoutLicenses = linkFarm "${cudaNamePrefix}-redists-installed" (
+    lib.concatMapAttrs mkOutputs availableRedistsForPlatform
+  );
+in
+linkedWithoutLicenses.overrideAttrs (
+  finalAttrs: prevAttrs: {
+    passthru = prevAttrs.passthru or { } // {
+      inherit availableRedistsForPlatform;
+
+      brokenAssertions = prevAttrs.passthru.brokenAssertions or [ ] ++ [
+        {
+          message =
+            "No redists are available for the current NVIDIA system identifier (${backendStdenv.hostRedistSystem});"
+            + " ensure proper licenses are allowed and that the CUDA version in use supports the system";
+          assertion = availableRedistsForPlatform != { };
+        }
+      ];
+    };
+
+    meta = prevAttrs.meta or { } // {
+      broken = _cuda.lib._mkMetaBroken finalAttrs;
+      license = lib.unique (
+        lib.concatMap (drv: lib.toList (drv.meta.license or [ ])) (
+          lib.attrValues availableRedistsForPlatform
+        )
+      );
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix b/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
new file mode 100644
index 000000000000..cbc0e49de360
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
@@ -0,0 +1,27 @@
+{
+  cudaNamePrefix,
+  cudaPackages,
+  lib,
+  linkFarm,
+}:
+# NOTE: Because Nixpkgs, by default, allows aliases, this derivation may contain multiple entries for a single redistributable.
+let
+  redistsForPlatform = lib.filterAttrs (
+    _: value: value ? passthru.redistName && value.src or null != null
+  ) cudaPackages;
+
+  linkedWithoutLicenses = linkFarm "${cudaNamePrefix}-redists-unpacked" (
+    lib.mapAttrs (_: drv: drv.src) redistsForPlatform
+  );
+in
+linkedWithoutLicenses.overrideAttrs (prevAttrs: {
+  passthru = prevAttrs.passthru or { } // {
+    inherit redistsForPlatform;
+  };
+
+  meta = prevAttrs.meta or { } // {
+    license = lib.unique (
+      lib.concatMap (drv: lib.toList (drv.meta.license or [ ])) (lib.attrValues redistsForPlatform)
+    );
+  };
+})
diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix
deleted file mode 100644
index 9ead3767a286..000000000000
--- a/pkgs/development/cuda-modules/tensorrt/releases.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# NOTE: Check https://developer.nvidia.com/nvidia-tensorrt-8x-download
-#             https://developer.nvidia.com/nvidia-tensorrt-10x-download
-
-# Version policy is to keep the latest minor release for each major release.
-{
-  tensorrt.releases = {
-    # jetson
-    linux-aarch64 = [ ];
-    # powerpc
-    linux-ppc64le = [ ];
-    # server-grade arm
-    linux-sbsa = [
-      {
-        version = "10.8.0.43";
-        minCudaVersion = "12.8";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.8.0.43.Linux.aarch64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-sB5d0sfGQyUhGdA9ku6pcCNBjpL0Wjvg0Ilulikj5Do=";
-      }
-      {
-        version = "10.9.0.34";
-        minCudaVersion = "12.8";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.9.0.34.Linux.aarch64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-uB7CoGf2fwgsE8rsLc71Q4W0Kp3mpOyubzGKotQZZPI=";
-      }
-    ];
-    # x86_64
-    linux-x86_64 = [
-      {
-        version = "10.8.0.43";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.8.0.43.Linux.x86_64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-V31tivU4FTQUuYZ8ZmtPZYUvwusefA6jogbl+vvH1J4=";
-      }
-      {
-        version = "10.9.0.34";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-M74OYeO/F3u7yrtIkr8BPwyKxx0r5z8oA4SKOCyxQnI=";
-      }
-    ];
-  };
-}
diff --git a/pkgs/development/cuda-modules/tensorrt/shims.nix b/pkgs/development/cuda-modules/tensorrt/shims.nix
deleted file mode 100644
index b452a515404c..000000000000
--- a/pkgs/development/cuda-modules/tensorrt/shims.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
-{
-  package,
-  # redistSystem :: String
-  # String is `"unsupported"` if the given architecture is unsupported.
-  redistSystem,
-}:
-{
-  featureRelease = {
-    inherit (package) cudnnVersion minCudaVersion maxCudaVersion;
-    ${redistSystem}.outputs = {
-      bin = true;
-      lib = true;
-      static = true;
-      dev = true;
-      sample = true;
-      python = true;
-    };
-  };
-  redistribRelease = {
-    name = "TensorRT: a high-performance deep learning interface";
-    inherit (package) hash filename version;
-  };
-}
diff --git a/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix b/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix
deleted file mode 100644
index 442bfb8a2dd0..000000000000
--- a/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  cudaPackages,
-  lib,
-  writeGpuTestPython,
-  # Configuration flags
-  openCVFirst,
-  useOpenCVDefaultCuda,
-  useTorchDefaultCuda,
-}:
-let
-  inherit (lib.strings) optionalString;
-
-  openCVBlock = ''
-
-    import cv2
-    print("OpenCV version:", cv2.__version__)
-
-    # Ensure OpenCV can access the GPU.
-    assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV"
-    print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice()))
-
-    # Ensure OpenCV can access the GPU.
-    print(cv2.getBuildInformation())
-
-    a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
-    b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
-    c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object.
-
-    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}"
-
-  '';
-
-  torchBlock = ''
-
-    import torch
-    print("Torch version:", torch.__version__)
-
-    # Set up the GPU.
-    torch.cuda.init()
-    # Ensure the GPU is available.
-    assert torch.cuda.is_available(), "CUDA is not available to Torch"
-    print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device()))
-
-    a = torch.ones(256, 256, dtype=torch.int32).cuda()
-    b = torch.ones(256, 256, dtype=torch.int32).cuda()
-    c = (a + b).sum().item()
-    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}"
-
-  '';
-
-  content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock;
-
-  torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda";
-  openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda";
-in
-# TODO: Ensure the expected CUDA libraries are loaded.
-# TODO: Ensure GPU access works as expected.
-writeGpuTestPython {
-  name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}";
-  libraries =
-    # NOTE: These are purposefully in this order.
-    pythonPackages:
-    let
-      effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: {
-        cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
-      });
-      effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: {
-        cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
-      });
-    in
-    if openCVFirst then
-      [
-        effectiveOpenCV
-        effectiveTorch
-      ]
-    else
-      [
-        effectiveTorch
-        effectiveOpenCV
-      ];
-} content
diff --git a/pkgs/development/embedded/tytools/default.nix b/pkgs/development/embedded/tytools/default.nix
index 14fcec5ac5ea..b69880f20822 100644
--- a/pkgs/development/embedded/tytools/default.nix
+++ b/pkgs/development/embedded/tytools/default.nix
@@ -2,37 +2,55 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  cmake,
-  pkg-config,
-  wrapQtAppsHook,
-  qtbase,
+  installShellFiles,
+  qt6,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tytools";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "Koromix";
-    repo = "tytools";
-    rev = "v${version}";
-    sha256 = "sha256-MKhh0ooDZI1Ks8vVuPRiHhpOqStetGaAhE2ulvBstxA=";
+    repo = "rygel";
+    tag = "tytools/${finalAttrs.version}";
+    hash = "sha256-nQZaNYOTkx79UC0RHencKIQFSYUnQ9resdmmWTmgQxA=";
   };
 
   nativeBuildInputs = [
-    cmake
-    pkg-config
-    wrapQtAppsHook
+    installShellFiles
+    qt6.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    qt6.qtbase
   ];
 
-  meta = with lib; {
+  buildPhase = ''
+    runHook preBuild
+
+    ./bootstrap.sh
+    ./felix -pFast tycmd tycommander tyuploader
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    installBin bin/Fast/tycmd bin/Fast/tycommander bin/Fast/tyuploader
+    install -D --mode 0644 src/tytools/tycommander/tycommander_linux.desktop $out/share/applications/tycommander.desktop
+    install -D --mode 0644 src/tytools/tyuploader/tyuploader_linux.desktop $out/share/applications/tyuploader.desktop
+    install -D --mode 0644 src/tytools/assets/images/tycommander.png $out/share/icons/hicolor/512x512/apps/tycommander.png
+    install -D --mode 0644 src/tytools/assets/images/tyuploader.png $out/share/icons/hicolor/512x512/apps/tyuploader.png
+
+    runHook postInstall
+  '';
+
+  meta = {
     description = "Collection of tools to manage Teensy boards";
     homepage = "https://koromix.dev/tytools";
-    license = licenses.unlicense;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ ahuzik ];
+    license = lib.licenses.unlicense;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ ahuzik ];
   };
-}
+})
diff --git a/pkgs/development/haskell-modules/HACKING.md b/pkgs/development/haskell-modules/HACKING.md
index 0cadbefea0c9..56f72e92abb1 100644
--- a/pkgs/development/haskell-modules/HACKING.md
+++ b/pkgs/development/haskell-modules/HACKING.md
@@ -199,10 +199,6 @@ opening the next one.  When you want to merge the currently open
     $ gh auth status
     ```
 
-1.  Make sure you have setup your `~/.cabal/config` file for authentication
-    for uploading the NixOS package versions to Hackage.  See the following
-    section for details on how to do this.
-
 1.  Make sure you have correctly marked packages broken.  One of the previous
     sections explains how to do this.
 
@@ -237,8 +233,6 @@ opening the next one.  When you want to merge the currently open
 
     1.  Merges the currently open `haskell-updates` PR.
 
-    1.  Updates the version of Haskell packages in NixOS on Hackage.
-
     1.  Updates Stackage and Hackage snapshots.  Regenerates the Haskell package set.
 
     1.  Pushes the commits updating Stackage and Hackage and opens a new
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
index 2acec69475c0..8e72a9cd0691 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/cabal2nix.nix
@@ -35,10 +35,10 @@
 }:
 mkDerivation {
   pname = "cabal2nix";
-  version = "2.20.1-unstable-2025-09-17";
+  version = "2.20.1-unstable-2025-10-31";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
-    sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
+    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
   };
   postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
index eade3a05863b..aec2e430ae4e 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/distribution-nixpkgs.nix
@@ -18,10 +18,10 @@
 }:
 mkDerivation {
   pname = "distribution-nixpkgs";
-  version = "1.7.1.1-unstable-2025-09-17";
+  version = "1.7.1.1-unstable-2025-10-31";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
-    sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
+    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
   };
   postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
   enableSeparateDataOutput = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
index 3ea1fab647d5..34cb94b054c7 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/hackage-db.nix
@@ -17,10 +17,10 @@
 }:
 mkDerivation {
   pname = "hackage-db";
-  version = "2.1.3-unstable-2025-09-17";
+  version = "2.1.3-unstable-2025-10-31";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
-    sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
+    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
   };
   postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
   isLibrary = true;
diff --git a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
index d453e54c9bba..4bb491849207 100644
--- a/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
+++ b/pkgs/development/haskell-modules/cabal2nix-unstable/language-nix.nix
@@ -13,10 +13,10 @@
 }:
 mkDerivation {
   pname = "language-nix";
-  version = "2.3.0-unstable-2025-09-17";
+  version = "2.3.0-unstable-2025-10-31";
   src = fetchzip {
-    url = "https://github.com/NixOS/cabal2nix/archive/3cc36a5df16a10bac9a858208845e3d05b79845d.tar.gz";
-    sha256 = "1z1knv2ggm9ddyl0v120nhcnjmq50z7q1m88qj7rfz51gx1ifnim";
+    url = "https://github.com/NixOS/cabal2nix/archive/e89ec9afd5d6fd8a86e8514fb4406b2adf0783ab.tar.gz";
+    sha256 = "06mdyjy5yds5g51mby4n1jz3r32a24lnba61l0vjm707nzp31r9z";
   };
   postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
   libraryHaskellDepends = [
diff --git a/pkgs/development/haskell-modules/configuration-arm.nix b/pkgs/development/haskell-modules/configuration-arm.nix
index 5a4df23a384c..c124a4e5fc1f 100644
--- a/pkgs/development/haskell-modules/configuration-arm.nix
+++ b/pkgs/development/haskell-modules/configuration-arm.nix
@@ -117,7 +117,7 @@ self: super:
   # AARCH32-SPECIFIC OVERRIDES
 
   # KAT/ECB/D2 test segfaults on armv7l
-  # https://github.com/haskell-crypto/cryptonite/issues/367
+  # https://github.com/haskell-crypto/cryptonite/issues/367 krank:ignore-line
   cryptonite = dontCheck super.cryptonite;
 }
 // lib.optionalAttrs (with pkgs.stdenv.hostPlatform; isAarch && isAndroid) {
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d6bd8bc4302a..ce2c3143bb67 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -52,9 +52,6 @@ with haskellLib;
     }))
   ];
 
-  # https://github.com/ivanperez-keera/dunai/issues/427
-  dunai = addBuildDepend self.list-transformer (enableCabalFlag "list-transformer" super.dunai);
-
   # Make sure that Cabal_* can be built as-is
   Cabal_3_10_3_0 = doDistribute (
     super.Cabal_3_10_3_0.override {
@@ -130,38 +127,7 @@ with haskellLib;
           # to bogus references to some dependencies.
           overrideCabal (
             old:
-            {
-              # Prevent DOS line endings from Hackage from breaking a patch
-              prePatch = old.prePatch or "" + ''
-                ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
-              '';
-              # Ignore unix bound intended to prevent an unix bug on 32bit systems.
-              # We apply a patch for this issue to the GHC core packages directly.
-              # See unix-fix-ctimeval-size-32-bit.patch in ../compilers/ghc/common-*.nix
-              patches =
-                old.patches or [ ]
-                ++
-                  lib.optionals
-                    (
-                      scope.unix == null
-                      && lib.elem self.ghc.version [
-                        "9.6.1"
-                        "9.6.2"
-                        "9.6.3"
-                        "9.6.4"
-                        "9.6.5"
-                        "9.6.6"
-                        "9.8.1"
-                        "9.8.2"
-                        "9.8.3"
-                        "9.10.1"
-                      ]
-                    )
-                    [
-                      ./patches/cabal-install-3.16-lift-unix-bound.patch
-                    ];
-            }
-            // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {
+            lib.optionalAttrs (pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64) {
               postInstall = ''
                 ${old.postInstall or ""}
                 remove-references-to -t ${scope.HTTP} "$out/bin/.cabal-wrapped"
@@ -239,13 +205,8 @@ with haskellLib;
           Cabal = lself.Cabal_3_14_2_0;
           # Jailbreaking cabal-install-parsers to make it pick Cabal 3.14 instead of 3.12.
           cabal-install-parsers = doJailbreak lsuper.cabal-install-parsers;
-          # hls 2.11 needs older cabal-add than in stackage. Also copying over test fix override from configuration-nix.nix
-          cabal-add = overrideCabal (drv: {
-            # tests depend on executable
-            preCheck = ''export PATH="$PWD/dist/build/cabal-add:$PATH"'';
-          }) lself.cabal-add_0_1;
           # Need a newer version of extensions to be compatible with the newer Cabal
-          extensions = doJailbreak lself.extensions_0_1_0_3;
+          extensions = doJailbreak lself.extensions_0_1_1_0;
           # For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
           # because some packages, like ormolu, need a newer Cabal version.
           # ghc-paths is special because it depends on Cabal for building
@@ -264,7 +225,6 @@ with haskellLib;
           # HLS 2.11: Too strict bound on Diff 1.0.
           haskell-language-server = lib.pipe super.haskell-language-server [
             dontCheck
-            doJailbreak
             (
               if versionOlder self.ghc.version "9.10" || versionOlder "9.11" self.ghc.version then
                 addBuildDepends [
@@ -283,6 +243,9 @@ with haskellLib;
     fourmolu
     ormolu
     haskell-language-server
+    hls-plugin-api
+    ghcide
+    lsp-types
     ;
 
   # For -f-auto see cabal.project in haskell-language-server.
@@ -290,9 +253,6 @@ with haskellLib;
     disableCabalFlag "auto" super.ghc-lib-parser-ex
   );
 
-  hls-plugin-api = doJailbreak super.hls-plugin-api; # HLS 2.11: Too strict bound on Diff 1.0.
-  ghcide = doJailbreak super.ghcide; # HLS 2.11: Too strict bound on Diff 1.0.
-
   ###########################################
   ### END HASKELL-LANGUAGE-SERVER SECTION ###
   ###########################################
@@ -383,11 +343,6 @@ with haskellLib;
   HsOpenSSL = appendConfigureFlags [
     "--ghc-option=-optc=-Wno-error=incompatible-pointer-types"
   ] super.HsOpenSSL;
-  # Work around compilation failures with gcc >= 14
-  # https://github.com/audreyt/hssyck/issues/5
-  HsSyck = appendConfigureFlags [
-    "--ghc-option=-optc=-Wno-error=implicit-function-declaration"
-  ] super.HsSyck;
   # https://github.com/rethab/bindings-dsl/issues/46
   bindings-libcddb = appendConfigureFlags [
     "--ghc-option=-optc=-Wno-error=incompatible-pointer-types"
@@ -465,28 +420,15 @@ with haskellLib;
   # store. Testing is done upstream.
   arion-compose = dontCheck super.arion-compose;
 
-  # 2023-07-17: Outdated base bound https://github.com/srid/lvar/issues/5
-  lvar = doJailbreak super.lvar;
-
   # Don't call setEnv in parallel in the test suite (which leads to flaky failures)
-  env-extra =
-    appendPatches
-      [
-        (pkgs.fetchpatch {
-          name = "env-extra-no-parallel-setenv.patch";
-          url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch";
-          sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4=";
-          excludes = [ "package.yaml" ];
-        })
-      ]
-      (
-        overrideCabal (drv: {
-          prePatch = ''
-            ${drv.prePatch or ""}
-            ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
-          '';
-        }) super.env-extra
-      );
+  env-extra = appendPatches [
+    (pkgs.fetchpatch {
+      name = "env-extra-no-parallel-setenv.patch";
+      url = "https://github.com/d12frosted/env-extra/commit/4fcbc031b210e71e4243fcfe7c48d381e2f51d78.patch";
+      sha256 = "sha256-EbXk+VOmxMJAMCMTXpTiW8fkbNI9za7f1alzCeaJaV4=";
+      excludes = [ "package.yaml" ];
+    })
+  ] super.env-extra;
 
   # This used to be a core package provided by GHC, but then the compiler
   # dropped it. We define the name here to make sure that old packages which
@@ -554,19 +496,14 @@ with haskellLib;
 
   # Fixes compilation for basement on i686
   # https://github.com/haskell-foundation/foundation/pull/573
-  # Don't apply patch for GHC == 9.2.* on 64bit where it breaks compilation:
-  # https://github.com/haskell-foundation/foundation/pull/573#issuecomment-1669468867
-  basement = appendPatches (lib.optionals
-    (pkgs.stdenv.hostPlatform.is32bit || lib.versions.majorMinor self.ghc.version != "9.2")
-    [
-      (fetchpatch {
-        name = "basement-i686-ghc-9.4.patch";
-        url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch";
-        sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7";
-        stripLen = 1;
-      })
-    ]
-  ) super.basement;
+  basement = appendPatches [
+    (fetchpatch {
+      name = "basement-i686-ghc-9.4.patch";
+      url = "https://github.com/haskell-foundation/foundation/pull/573/commits/38be2c93acb6f459d24ed6c626981c35ccf44095.patch";
+      sha256 = "17kz8glfim29vyhj8idw8bdh3id5sl9zaq18zzih3schfvyjppj7";
+      stripLen = 1;
+    })
+  ] super.basement;
 
   # Fixes compilation of memory with GHC >= 9.4 on 32bit platforms
   # https://github.com/vincenthz/hs-memory/pull/99
@@ -643,14 +580,6 @@ with haskellLib;
     '';
   } super.containers-unicode-symbols;
 
-  # 2025-09-03: support text 2.1.1
-  hs-opentelemetry-api = appendPatch (pkgs.fetchpatch2 {
-    name = "fix-building-with-the-latest-text-and-persistent-releases.patch";
-    url = "https://github.com/iand675/hs-opentelemetry/commit/ee8a6dad7db306eb67748ddcd77df4974ad8259e.patch";
-    hash = "sha256-CdDrEdm5rCKydTxk42dcURZWcVukgHG+7kfOLiNxhoI=";
-    relative = "api";
-  }) super.hs-opentelemetry-api;
-
   # Test file not included on hackage
   numerals-base = dontCheck (doJailbreak super.numerals-base);
 
@@ -661,10 +590,6 @@ with haskellLib;
   # check requires mysql server
   mysql-simple = dontCheck super.mysql-simple;
 
-  # Test data missing
-  # https://github.com/FPtje/GLuaFixer/issues/165
-  glualint = dontCheck super.glualint;
-
   # Hackage tarball only includes what is supported by `cabal install git-annex`,
   # but we want e.g. completions as well. See
   # https://web.archive.org/web/20160724083703/https://git-annex.branchable.com/bugs/bash_completion_file_is_missing_in_the_6.20160527_tarball_on_hackage/
@@ -676,7 +601,7 @@ with haskellLib;
           name = "git-annex-${super.git-annex.version}-src";
           url = "git://git-annex.branchable.com/";
           rev = "refs/tags/" + super.git-annex.version;
-          sha256 = "sha256-s3EleptCwmVxHjAcPDe40Ch+fULFqf+6H1pLjXNFZ1Y=";
+          sha256 = "sha256-HkUrc9T8qpGsONIuM7ciKbx4vuJTOLFNxneIPte0wv4=";
           # delete android and Android directories which cause issues on
           # darwin (case insensitive directory). Since we don't need them
           # during the build process, we can delete it to prevent a hash
@@ -715,7 +640,8 @@ with haskellLib;
     postPatch = "sed -i s/home/tmp/ test/Spec.hs";
   }) super.shell-conduit;
 
-  # https://github.com/serokell/nixfmt/issues/130
+  # No maintenance planned until eventual removal
+  # https://github.com/NixOS/nixfmt/issues/340#issuecomment-3315920564
   nixfmt = doJailbreak super.nixfmt;
 
   # Too strict upper bounds on turtle and text
@@ -726,81 +652,58 @@ with haskellLib;
   # https://github.com/awakesecurity/nix-graph/issues/5
   nix-graph = doJailbreak super.nix-graph;
 
-  # Allow inspection-testing >= 0.6 in test suite
-  algebraic-graphs =
-    appendPatch
-      (pkgs.fetchpatch2 {
-        name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch";
-        url = "https://github.com/snowleopard/alga/commit/d4e43fb42db05413459fb2df493361d5a666588a.patch";
-        hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s=";
-      })
-      (
-        overrideCabal (drv: {
-          prePatch = ''
-            ${drv.prePatch or ""}
-            ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
-          '';
-        }) super.algebraic-graphs
+  # Pass in `pkgs.nix` for the required tools. This means that overriding
+  # them sort of works, but only if you override all instances.
+  nix-paths =
+    if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
+      super.nix-paths.override {
+        nix-build = pkgs.nix;
+        nix-env = pkgs.nix;
+        nix-hash = pkgs.nix;
+        nix-instantiate = pkgs.nix;
+        nix-store = pkgs.nix;
+      }
+    else
+      # When cross-compiling, nix-paths won't be able to detect
+      # the path to the (host) tools at build time from PATH,
+      # so we instruct it to check at runtime.
+      enableCabalFlag "allow-relative-paths" (
+        super.nix-paths {
+          nix-build = null;
+          nix-env = null;
+          nix-hash = null;
+          nix-instantiate = null;
+          nix-store = null;
+        }
       );
 
-  # Too strict bounds on hspec
-  # https://github.com/illia-shkroba/pfile/issues/2
-  pfile = doJailbreak super.pfile;
+  # Fix `mv` not working on directories
+  turtle = appendPatches [
+    (pkgs.fetchpatch {
+      name = "turtle-fix-mv.patch";
+      url = "https://github.com/Gabriella439/turtle/commit/b3975531f8d6345da54b005f226adab095085865.patch";
+      sha256 = "sha256-EqvMQpRz/7hbY6wJ0xG8Ou6oKhwWdpjzBv+NPW6tnSY=";
+      includes = [ "src/Turtle/Prelude.hs" ];
+    })
+  ] super.turtle;
 
-  # Manually maintained
-  cachix-api = overrideCabal (drv: {
-    # FIXME: should use overrideSrc
-    version = "1.7.9";
-    src = pkgs.fetchFromGitHub {
-      owner = "cachix";
-      repo = "cachix";
-      tag = "v1.7.9";
-      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
-    };
-    postUnpack = "sourceRoot=$sourceRoot/cachix-api";
-  }) super.cachix-api;
-  cachix = (
-    overrideCabal
-      (drv: {
-        # FIXME: should use overrideSrc
-        version = "1.7.9";
-        src = pkgs.fetchFromGitHub {
-          owner = "cachix";
-          repo = "cachix";
-          tag = "v1.7.9";
-          hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
-        };
-        postUnpack = "sourceRoot=$sourceRoot/cachix";
-        # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704
-        postPatch = ''
-          sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs
-        '';
-      })
-      (
-        super.cachix.override {
-          nix = self.hercules-ci-cnix-store.nixPackage;
-          hnix-store-core = self.hnix-store-core_0_8_0_0;
-        }
-      )
-  );
+  # Allow inspection-testing >= 0.6 in test suite
+  algebraic-graphs = appendPatch (pkgs.fetchpatch2 {
+    name = "algebraic-graphs-0.7-allow-inspection-testing-0.6.patch";
+    url = "https://github.com/snowleopard/alga/commit/d4e43fb42db05413459fb2df493361d5a666588a.patch";
+    hash = "sha256-feGEuALVJ0Zl8zJPIfgEFry9eH/MxA0Aw7zlDq0PC/s=";
+  }) super.algebraic-graphs;
+
+  # Too strict bounds on filepath, hpsec, tasty, tasty-quickcheck, transformers
+  # https://github.com/illia-shkroba/pfile/issues/3
+  pfile = doJailbreak super.pfile;
 
   # Overly strict bounds on postgresql-simple (< 0.7), tasty (< 1.5) and tasty-quickcheck (< 0.11)
   # https://github.com/tdammers/migrant/pull/5
   migrant-core = doJailbreak super.migrant-core;
   migrant-sqlite-simple = doJailbreak super.migrant-sqlite-simple;
   migrant-hdbc = doJailbreak super.migrant-hdbc;
-  migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [
-    (overrideCabal {
-      preCheck = ''
-        postgresqlTestUserOptions="LOGIN SUPERUSER"
-      '';
-    })
-    (addTestToolDepends [
-      pkgs.postgresql
-      pkgs.postgresqlTestHook
-    ])
-    doJailbreak
-  ];
+  migrant-postgresql-simple = doJailbreak super.migrant-postgresql-simple;
 
   # https://github.com/froozen/kademlia/issues/2
   kademlia = dontCheck super.kademlia;
@@ -825,8 +728,8 @@ with haskellLib;
     else
       dontDistribute (markBroken super.fclabels);
 
-  # Bounds on base are too strict.
-  # https://github.com/phadej/regex-applicative-text/issues/13
+  # Bounds on base are too strict. Upstream is no longer maintained:
+  # https://github.com/phadej/regex-applicative-text/issues/13 krank:ignore-line
   regex-applicative-text = doJailbreak super.regex-applicative-text;
 
   # Tests require a Kafka broker running locally
@@ -871,9 +774,6 @@ with haskellLib;
   # Upstream notified by e-mail.
   permutation = dontCheck super.permutation;
 
-  # https://github.com/jputcu/serialport/issues/25
-  serialport = dontCheck super.serialport;
-
   # Test suite depends on source code being available
   simple-affine-space = dontCheck super.simple-affine-space;
 
@@ -911,12 +811,9 @@ with haskellLib;
     sha256 = "sha256-EAyTVkAqCvJ0lRD0+q/htzBJ8iD5qP47j5i2fKhRrlw=";
   }) super.xml-picklers;
 
-  # 2025-08-03: Too strict bounds on open-browser, data-default and containers
-  # https://github.com/lierdakil/pandoc-crossref/issues/478 krank:ignore-line
   pandoc-crossref = lib.pipe super.pandoc-crossref [
-    (warnAfterVersion "0.3.21")
+    # https://github.com/lierdakil/pandoc-crossref/issues/492
     doJailbreak
-
     # We are still using pandoc == 3.7.*
     (appendPatch (
       lib.warnIf (lib.versionAtLeast self.pandoc.version "3.8")
@@ -931,6 +828,16 @@ with haskellLib;
     ))
   ];
 
+  pandoc = appendPatches [
+    # Adjust text fixtures for djot >= 0.1.2.3, patch extracted from unrelated change.
+    (pkgs.fetchpatch {
+      name = "pandoc-djot-0.1.2.3.patch";
+      url = "https://github.com/jgm/pandoc/commit/643712ca70b924c0edcc059699aa1ee42234be34.patch";
+      hash = "sha256-khDkb1PzC0fTaWTq3T04UvgoI+XefOJMaTV1d3Du8BU=";
+      includes = [ "test/djot-reader.native" ];
+    })
+  ] super.pandoc;
+
   # Too strict bounds on QuickCheck (<2.15), containers (<0.7), hashable (<1.5), pandoc (<3.7)
   # https://github.com/jaspervdj/patat/issues/194
   patat = doJailbreak super.patat;
@@ -945,7 +852,7 @@ with haskellLib;
   matterhorn = doJailbreak super.matterhorn;
 
   # Too strict bounds on transformers and resourcet
-  # https://github.com/alphaHeavy/lzma-conduit/issues/23
+  # https://github.com/alphaHeavy/lzma-conduit/issues/23 krank:ignore-line
   lzma-conduit = doJailbreak super.lzma-conduit;
 
   # 2020-06-05: HACK: does not pass own build suite - `dontCheck`
@@ -977,10 +884,21 @@ with haskellLib;
   # https://github.com/ekmett/structures/issues/3
   structures = dontCheck super.structures;
 
+  # ships broken Setup.hs https://github.com/facebook/Haxl/issues/165
+  # https://github.com/facebook/Haxl/pull/164
+  haxl = overrideCabal (drv: {
+    postPatch = ''
+      ${drv.postPatch or ""}
+      rm Setup.hs
+    '';
+    # non-deterministic failure https://github.com/facebook/Haxl/issues/85
+    # doesn't compile with text-2.1.2 in <2.5.1.2
+    doCheck = false;
+  }) super.haxl;
+
   # Disable test suites to fix the build.
   acme-year = dontCheck super.acme-year; # http://hydra.cryp.to/build/497858/log/raw
   aeson-lens = dontCheck super.aeson-lens; # http://hydra.cryp.to/build/496769/log/raw
-  aeson-schema = dontCheck super.aeson-schema; # https://github.com/timjb/aeson-schema/issues/9
   angel = dontCheck super.angel;
   apache-md5 = dontCheck super.apache-md5; # http://hydra.cryp.to/build/498709/nixlog/1/raw
   app-settings = dontCheck super.app-settings; # http://hydra.cryp.to/build/497327/log/raw
@@ -1016,12 +934,10 @@ with haskellLib;
   git-vogue = dontCheck super.git-vogue;
   github-rest = dontCheck super.github-rest; # test suite needs the network
   gitlib-cmdline = dontCheck super.gitlib-cmdline;
-  GLFW-b = dontCheck super.GLFW-b; # https://github.com/bsl/GLFW-b/issues/50
   hackport = dontCheck super.hackport;
   hadoop-formats = dontCheck super.hadoop-formats;
   hashed-storage = dontCheck super.hashed-storage;
   hashring = dontCheck super.hashring;
-  haxl = dontCheck super.haxl; # non-deterministic failure https://github.com/facebook/Haxl/issues/85
   haxl-facebook = dontCheck super.haxl-facebook; # needs facebook credentials for testing
   hdbi-postgresql = dontCheck super.hdbi-postgresql;
   hedis = dontCheck super.hedis;
@@ -1261,7 +1177,6 @@ with haskellLib;
   Cabal-ide-backend = dontCheck super.Cabal-ide-backend;
 
   # This package can't be built on non-Windows systems.
-  Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.hostPlatform.isCygwin; }) super.Win32;
   inline-c-win32 = dontDistribute super.inline-c-win32;
   Southpaw = dontDistribute super.Southpaw;
 
@@ -1570,14 +1485,6 @@ with haskellLib;
   # dontCheck: use of non-standard strptime "%s" which musl doesn't support; only used in test
   unix-time = if pkgs.stdenv.hostPlatform.isMusl then dontCheck super.unix-time else super.unix-time;
 
-  # Workaround for https://github.com/sol/hpack/issues/528
-  # The hpack test suite can't deal with the CRLF line endings hackage revisions insert
-  hpack = overrideCabal (drv: {
-    postPatch = drv.postPatch or "" + ''
-      "${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
-    '';
-  }) super.hpack;
-
   # hslua has tests that break when using musl.
   # https://github.com/hslua/hslua/issues/106
   hslua-core =
@@ -1619,33 +1526,6 @@ with haskellLib;
   # https://github.com/mgajda/json-autotype/issues/25
   json-autotype = dontCheck super.json-autotype;
 
-  postgresql-simple-migration = overrideCabal (drv: {
-    preCheck = ''
-      PGUSER=test
-      PGDATABASE=test
-    '';
-    testToolDepends = drv.testToolDepends or [ ] ++ [
-      pkgs.postgresql
-      pkgs.postgresqlTestHook
-    ];
-  }) (doJailbreak super.postgresql-simple-migration);
-
-  postgresql-simple = addTestToolDepends [
-    pkgs.postgresql
-    pkgs.postgresqlTestHook
-  ] super.postgresql-simple;
-
-  beam-postgres = lib.pipe super.beam-postgres [
-    # Requires pg_ctl command during tests
-    (addTestToolDepends [ pkgs.postgresql ])
-    (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck))
-  ];
-
-  users-postgresql-simple = addTestToolDepends [
-    pkgs.postgresql
-    pkgs.postgresqlTestHook
-  ] super.users-postgresql-simple;
-
   gargoyle-postgresql-nix = addBuildTool [ pkgs.postgresql ] super.gargoyle-postgresql-nix;
 
   # PortMidi needs an environment variable to have ALSA find its plugins:
@@ -1676,31 +1556,6 @@ with haskellLib;
   # Fix build with attr-2.4.48 (see #53716)
   xattr = appendPatch ./patches/xattr-fix-build.patch super.xattr;
 
-  esqueleto =
-    overrideCabal
-      (drv: {
-        postPatch = drv.postPatch or "" + ''
-          # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
-          sed -i test/PostgreSQL/Test.hs \
-            -e s^host=localhost^^
-        '';
-        # Match the test suite defaults (or hardcoded values?)
-        preCheck = drv.preCheck or "" + ''
-          PGUSER=esqutest
-          PGDATABASE=esqutest
-        '';
-        testFlags = drv.testFlags or [ ] ++ [
-          # We don't have a MySQL test hook yet
-          "--skip=/Esqueleto/MySQL"
-        ];
-        testToolDepends = drv.testToolDepends or [ ] ++ [
-          pkgs.postgresql
-          pkgs.postgresqlTestHook
-        ];
-      })
-      # https://github.com/NixOS/nixpkgs/issues/198495
-      (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.esqueleto);
-
   # Requires API keys to run tests
   algolia = dontCheck super.algolia;
   openai-hs = dontCheck super.openai-hs;
@@ -1731,10 +1586,6 @@ with haskellLib;
   # https://github.com/haskell-servant/servant-ekg/issues/15
   servant-ekg = doJailbreak super.servant-ekg;
 
-  hledger_1_50 = super.hledger_1_50.override {
-    hledger-lib = self.hledger-lib_1_50;
-  };
-
   # it wants to build a statically linked binary by default
   hledger-flow = overrideCabal (drv: {
     postPatch = (drv.postPatch or "") + ''
@@ -1763,54 +1614,23 @@ with haskellLib;
 
   # Test suite requires database
   persistent-mysql = dontCheck super.persistent-mysql;
-  persistent-postgresql =
-    # TODO: move this override to configuration-nix.nix
-    overrideCabal
-      (drv: {
-        postPatch = drv.postPath or "" + ''
-          # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
-          # NOTE: upstream host variable takes only two values...
-          sed -i test/PgInit.hs \
-            -e s^'host=" <> host <> "'^^
-        '';
-        preCheck = drv.preCheck or "" + ''
-          PGDATABASE=test
-          PGUSER=test
-        '';
-        testToolDepends = drv.testToolDepends or [ ] ++ [
-          pkgs.postgresql
-          pkgs.postgresqlTestHook
-        ];
-      })
-      # https://github.com/NixOS/nixpkgs/issues/198495
-      (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql);
 
-  dhall-lsp-server =
-    appendPatches
-      [
-        # Add support for lsp >= 2.7
-        (pkgs.fetchpatch {
-          name = "dhall-lsp-server-lsp-2.7.patch";
-          url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch";
-          sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY=";
-          relative = "dhall-lsp-server";
-        })
-        # Fix build with text >= 2.1.2
-        (pkgs.fetchpatch {
-          name = "dhall-lsp-server-text-2.1.2.patch";
-          url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch";
-          hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA=";
-          relative = "dhall-lsp-server";
-        })
-      ]
-      (
-        overrideCabal (drv: {
-          prePatch = ''
-            ${drv.prePatch or ""}
-            ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
-          '';
-        }) super.dhall-lsp-server
-      );
+  dhall-lsp-server = appendPatches [
+    # Add support for lsp >= 2.7
+    (pkgs.fetchpatch {
+      name = "dhall-lsp-server-lsp-2.7.patch";
+      url = "https://github.com/dhall-lang/dhall-haskell/commit/a621e1438df5865d966597e2e1b0bb37e8311447.patch";
+      sha256 = "sha256-7edxNIeIM/trl2SUXybvSzkscvr1kj5+tZF50IeTOgY=";
+      relative = "dhall-lsp-server";
+    })
+    # Fix build with text >= 2.1.2
+    (pkgs.fetchpatch {
+      name = "dhall-lsp-server-text-2.1.2.patch";
+      url = "https://github.com/dhall-lang/dhall-haskell/commit/9f2d4d44be643229784bfc502ab49184ec82bc05.patch";
+      hash = "sha256-cwNH5+7YY8UbA9zHhTRfVaqtIMowZGfFT5Kj+wSlapA=";
+      relative = "dhall-lsp-server";
+    })
+  ] super.dhall-lsp-server;
 
   # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392
   reflex-dom-core = lib.pipe super.reflex-dom-core [
@@ -1819,6 +1639,21 @@ with haskellLib;
     unmarkBroken
   ];
 
+  # Unreleased patch fixing compilation with text >= 2.1.2
+  dom-parser = appendPatches [
+    (pkgs.fetchpatch {
+      name = "dom-parser-text-2.1.2.patch";
+      url = "https://github.com/typeable/dom-parser/commit/b8d9af75595072026a1706e94750dba55e65326b.patch";
+      hash = "sha256-c7ea0YCtXhv4u+pTuxcWoISa+yV2oEtxS/RmC6Bbx1M=";
+    })
+  ] super.dom-parser;
+
+  # Requires jsaddle-webkit2gtk to build outside of pkgsCross.ghcjs
+  # which requires a version of libsoup that's marked as insecure
+  reflex-dom = dontDistribute super.reflex-dom;
+  reflex-localize-dom = dontDistribute super.reflex-localize-dom;
+  trasa-reflex = dontDistribute super.trasa-reflex;
+
   # https://github.com/ghcjs/jsaddle/pull/160/
   jsaddle = appendPatch (fetchpatch {
     name = "fix-on-firefox.patch";
@@ -1849,6 +1684,14 @@ with haskellLib;
         }
       );
 
+  # https://github.com/danfran/cabal-macosx/pull/19
+  cabal-macosx = appendPatch (fetchpatch {
+    name = "support-cabal-3.14.patch";
+    url = "https://github.com/danfran/cabal-macosx/commit/24ef850a4c743e525433a6f9eaa3f8924408db10.patch";
+    excludes = [ ".gitignore" ];
+    sha256 = "sha256-ORonk31yStWH0I83B4hCpnap7KK4o49UVrwdrZjCRaU=";
+  }) super.cabal-macosx;
+
   # 2020-06-24: Jailbreaking because of restrictive test dep bounds
   # Upstream issue: https://github.com/kowainik/trial/issues/62
   trial = doJailbreak super.trial;
@@ -1912,7 +1755,7 @@ with haskellLib;
   # Fails with encoding problems, likely needs locale data.
   # Test can be executed by adding which to testToolDepends and
   # $PWD/dist/build/haskeline-examples-Test to $PATH.
-  haskeline_0_8_4_0 = doDistribute (dontCheck super.haskeline_0_8_4_0);
+  haskeline_0_8_4_1 = doDistribute (dontCheck super.haskeline_0_8_4_1);
 
   # Test suite fails to compile https://github.com/agrafix/Spock/issues/177
   Spock = dontCheck super.Spock;
@@ -1947,23 +1790,13 @@ with haskellLib;
   prettyprinter-ansi-terminal = dontCheck super.prettyprinter-ansi-terminal;
 
   # Released version prohibits QuickCheck >= 2.15 at the moment
-  optparse-applicative =
-    appendPatches
-      [
-        (pkgs.fetchpatch2 {
-          name = "optparse-applicative-0.18.1-allow-QuickCheck-2.15.patch";
-          url = "https://github.com/pcapriotti/optparse-applicative/commit/2c2a39ed53e6339d8dc717efeb7d44f4c2b69cab.patch";
-          hash = "sha256-198TfBUR3ygPpvKPvtH69UmbMmoRagmzr9UURPr6Kj4=";
-        })
-      ]
-      (
-        overrideCabal (drv: {
-          prePatch = ''
-            ${drv.prePatch or ""}
-            ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
-          '';
-        }) super.optparse-applicative
-      );
+  optparse-applicative = appendPatches [
+    (pkgs.fetchpatch2 {
+      name = "optparse-applicative-0.18.1-allow-QuickCheck-2.15.patch";
+      url = "https://github.com/pcapriotti/optparse-applicative/commit/2c2a39ed53e6339d8dc717efeb7d44f4c2b69cab.patch";
+      hash = "sha256-198TfBUR3ygPpvKPvtH69UmbMmoRagmzr9UURPr6Kj4=";
+    })
+  ] super.optparse-applicative;
 
   # chell-quickcheck doesn't work with QuickCheck >= 2.15 with no known fix yet
   # https://github.com/typeclasses/chell/issues/5
@@ -2570,8 +2403,6 @@ with haskellLib;
 
   # The shipped Setup.hs file is broken.
   csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
-  # Build-type is simple, but ships a broken Setup.hs
-  digits = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.lhs"; }) super.digits;
 
   cabal-fmt = doJailbreak (
     super.cabal-fmt.override {
@@ -2601,9 +2432,6 @@ with haskellLib;
     ))
   ];
 
-  # 2025-02-11: Too strict bounds on base < 4.17
-  ema = doJailbreak super.ema;
-
   # Too strict bounds on text and tls
   # https://github.com/barrucadu/irc-conduit/issues/54
   # Use crypton-connection instead of connection
@@ -2736,9 +2564,10 @@ with haskellLib;
   # hexstring is not compatible with newer versions of base16-bytestring
   # See https://github.com/solatis/haskell-hexstring/issues/3
   hexstring = overrideCabal (old: {
-    # Prevent DOS line endings from Hackage from breaking a patch
+    # GitHub doesn't generate a patch with DOS line endings, so we
+    # need to convert the patched file to Unix line endings
     prePatch = old.prePatch or "" + ''
-      ${pkgs.buildPackages.dos2unix}/bin/dos2unix src/Data/HexString.hs
+      sed -i -e 's/\r$//' src/Data/HexString.hs
     '';
     patches = old.patches or [ ] ++ [
       (pkgs.fetchpatch {
@@ -2837,36 +2666,27 @@ with haskellLib;
   # Overly strict bounds on tasty-quickcheck (test suite) (< 0.11)
   hashable = doJailbreak super.hashable;
 
-  cborg = lib.pipe super.cborg [
-    (appendPatches [
-      # This patch changes CPP macros form gating on the version of ghc-prim to base
-      # since that's where the definitions are imported from. The source commit
-      # also changes the cabal file metadata which we filter out since we are
-      # only interested in this change as a dependency of cborg-i686-support-upstream.patch.
-      (pkgs.fetchpatch {
-        name = "cborg-no-gate-on-ghc-prim-version.patch";
-        url = "https://github.com/well-typed/cborg/commit/a33f94f616f5047e45608a34ca16bfb1304ceaa1.patch";
-        hash = "sha256-30j4Dksh2nnLKAcUF5XJw3Z/UjfV3F+JFnHeXSUs9Rk=";
-        includes = [ "**/Codec/CBOR/**" ];
-        stripLen = 1;
-      })
-      # Fixes compilation on 32-bit platforms. Unreleased patch committed to the
-      # upstream master branch: https://github.com/well-typed/cborg/pull/351
-      (pkgs.fetchpatch {
-        name = "cborg-i686-support-upstream.patch";
-        url = "https://github.com/well-typed/cborg/commit/ecc1360dcf9e9ee27d08de5206b844e075c88ca4.patch";
-        hash = "sha256-9m2FlG6ziRxA1Dy22mErBaIjiZHa1dqtkbmFnMMFrTI=";
-        stripLen = 1;
-      })
-    ])
-    # Make sure patches to cborg.cabal apply
-    (overrideCabal (drv: {
-      prePatch = ''
-        ${drv.prePatch or ""}
-        ${lib.getExe' pkgs.buildPackages.dos2unix "dos2unix"} *.cabal
-      '';
-    }))
-  ];
+  cborg = appendPatches [
+    # This patch changes CPP macros form gating on the version of ghc-prim to base
+    # since that's where the definitions are imported from. The source commit
+    # also changes the cabal file metadata which we filter out since we are
+    # only interested in this change as a dependency of cborg-i686-support-upstream.patch.
+    (pkgs.fetchpatch {
+      name = "cborg-no-gate-on-ghc-prim-version.patch";
+      url = "https://github.com/well-typed/cborg/commit/a33f94f616f5047e45608a34ca16bfb1304ceaa1.patch";
+      hash = "sha256-30j4Dksh2nnLKAcUF5XJw3Z/UjfV3F+JFnHeXSUs9Rk=";
+      includes = [ "**/Codec/CBOR/**" ];
+      stripLen = 1;
+    })
+    # Fixes compilation on 32-bit platforms. Unreleased patch committed to the
+    # upstream master branch: https://github.com/well-typed/cborg/pull/351
+    (pkgs.fetchpatch {
+      name = "cborg-i686-support-upstream.patch";
+      url = "https://github.com/well-typed/cborg/commit/ecc1360dcf9e9ee27d08de5206b844e075c88ca4.patch";
+      hash = "sha256-9m2FlG6ziRxA1Dy22mErBaIjiZHa1dqtkbmFnMMFrTI=";
+      stripLen = 1;
+    })
+  ] super.cborg;
 
   # Doesn't compile with tasty-quickcheck == 0.11 (see issue above)
   serialise = dontCheck super.serialise;
@@ -2949,20 +2769,6 @@ with haskellLib;
   # https://github.com/brandonchinn178/tasty-autocollect/issues/54
   tasty-autocollect = dontCheck super.tasty-autocollect;
 
-  postgres-websockets = lib.pipe super.postgres-websockets [
-    (addTestToolDepends [
-      pkgs.postgresql
-      pkgs.postgresqlTestHook
-    ])
-    (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
-    (overrideCabal {
-      preCheck = ''
-        export postgresqlEnableTCP=1
-        export PGDATABASE=postgres_ws_test
-      '';
-    })
-  ];
-
   postgrest =
     lib.pipe
       (super.postgrest.overrideScope (
@@ -2986,22 +2792,26 @@ with haskellLib;
         (addBuildDepends [
           self.cache
           self.extra
+          self.focus
           self.fuzzyset_0_2_4
+          self.http-client
           self.jose-jwt
           self.neat-interpolation
           self.prometheus-client
+          self.some
+          self.stm-hamt
           self.timeit
         ])
         # 2022-12-02: Too strict bounds.
         doJailbreak
         # 2022-12-02: Hackage release lags behind actual releases: https://github.com/PostgREST/postgrest/issues/2275
         (overrideSrc rec {
-          version = "13.0.7";
+          version = "14.0";
           src = pkgs.fetchFromGitHub {
             owner = "PostgREST";
             repo = "postgrest";
             rev = "v${version}";
-            hash = "sha256-5bWemChm2MpogtGuiBuuep4lhRBhnKOOeBqm+Sqcgl4=";
+            hash = "sha256-GokYeVDuVdIbowU6xE3l8iaGbH4jnpqQFy/E+sb/Unw=";
           };
         })
       ];
@@ -3117,11 +2927,12 @@ with haskellLib;
     hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0=";
   }) (doJailbreak super.argon2); # Unmaintained
 
-  # 2024-07-09: zinza has bumped their QuickCheck and tasty dependencies beyond stackage lts.
-  # Can possibly be removed once QuickCheck >= 2.15 and tasty >= 1.5
+  # 2025-10-02: Too strict upper bound on tasty-quickcheck (<0.11)
+  # https://github.com/phadej/zinza/pull/28
   zinza = dontCheck super.zinza;
 
   pdftotext = overrideCabal (drv: {
+    jailbreak = true;
     postPatch = ''
       # Fixes https://todo.sr.ht/~geyaeb/haskell-pdftotext/6
       substituteInPlace pdftotext.cabal --replace-quiet c-sources cxx-sources
@@ -3133,29 +2944,21 @@ with haskellLib;
       substituteInPlace pdftotext.cabal --replace-quiet BSD3 BSD-3-Clause
     ''
     + (drv.postPatch or "");
-  }) (doJailbreak (addExtraLibrary pkgs.pkg-config (addExtraLibrary pkgs.poppler super.pdftotext)));
+  }) (super.pdftotext.override { poppler-cpp = pkgs.poppler; });
 
   # QuickCheck <2.15
   # https://github.com/google/proto-lens/issues/403
   proto-lens-arbitrary = doJailbreak super.proto-lens-arbitrary;
 
+  # Forbids QuickCheck >= 2.15
+  # https://github.com/mchav/granite/issues/12#issuecomment-3360209408
+  granite = doJailbreak super.granite;
+
+  # Erroneously forbids vector >= 0.13.2.0
+  # https://github.com/mchav/snappy-hs/commit/400490df38e0db7f353c0427f034a231bdf73098#r167007963
+  snappy-hs = doJailbreak super.snappy-hs;
+
   proto3-wire = appendPatches [
-    (fetchpatch {
-      # https://github.com/awakesecurity/proto3-wire/pull/109
-      name = "bump-outdated-bounds.patch";
-      url = "https://github.com/awakesecurity/proto3-wire/commit/b32f3db6f8d36ea0708fb2f371f62d439ea45b42.patch";
-      hash = "sha256-EGFyk3XawU0+zk299WGwFKB2uW9eJrCDM6NgfIKWgRY=";
-    })
-    (fetchpatch {
-      # https://github.com/awakesecurity/proto3-wire/pull/110
-      name = "support-GHC-9.10.patch";
-      url = "https://github.com/awakesecurity/proto3-wire/commit/6fdf0eb93b2028ade0e3e011ce8429c94546839e.patch";
-      hash = "sha256-jK0ztjuhM7qRH5T7xo75aX7wqmZFymOgWDx6UrlcqWQ=";
-      includes = [
-        "*.cabal"
-        "*.hs"
-      ];
-    })
     (fetchpatch {
       # https://github.com/awakesecurity/proto3-wire/pull/108
       name = "add-reverse-encoders-for-packed-repeated-fields.patch";
@@ -3177,9 +2980,19 @@ with haskellLib;
 
   # 2024-07-27: building test component requires non-trivial custom build steps
   # https://github.com/awakesecurity/proto3-suite/blob/bec9d40e2767143deed5b2d451197191f1d8c7d5/nix/overlays/haskell-packages.nix#L311
+  # Hackage release trails a good deal behind master
   proto3-suite = lib.pipe super.proto3-suite [
-    dontCheck # Hackage release trails a good deal behind master
+    dontCheck
     doJailbreak
+    (overrideSrc {
+      version = "0.9.0-unstable-2025-04-10";
+      src = pkgs.fetchFromGitHub {
+        owner = "awakesecurity";
+        repo = "proto3-suite";
+        rev = "24bb3f9c6c83b4ecc31783fa5a8fa4406e6ef0d8";
+        hash = "sha256-009UNd1rEg/wDCCxReQWhPwHaONwlB6l6qoIPR0mVBU=";
+      };
+    })
   ];
 
   # Tests require docker
@@ -3269,12 +3082,6 @@ with haskellLib;
   # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11
   chimera = warnAfterVersion "0.4.1.0" (doJailbreak super.chimera);
 
-  # 2025-09-03: allow QuickCheck 2.15, containers 0.7, filepath 1.5, witch 1.3
-  hevm = lib.pipe super.hevm [
-    (warnAfterVersion "0.55.1")
-    doJailbreak
-  ];
-
   # 2025-04-09: jailbreak to allow tasty-quickcheck >= 0.11
   bzlib = warnAfterVersion "0.5.2.0" (doJailbreak super.bzlib);
 
@@ -3516,10 +3323,6 @@ with haskellLib;
   # including the current one in nixpkgs.
   liquid-fixpoint = dontCheck super.liquid-fixpoint;
 
-  # 2025-09-20: Too strict upper bound on text (<2.1.3)
-  # https://github.com/mchav/dataframe/issues/61
-  dataframe = doJailbreak (warnAfterVersion "0.3.0.4" super.dataframe);
-
   # 2025-8-26: Too strict bounds on containers and text, see: https://github.com/stackbuilders/inflections-hs/pull/83
   inflections = doJailbreak super.inflections;
 
@@ -3528,13 +3331,24 @@ with haskellLib;
   stripe-signature = doJailbreak super.stripe-signature;
   stripe-wreq = doJailbreak super.stripe-wreq;
 
-  # 2025-08-01: Fixes few build errors related to pointers.
-  # https://github.com/haskell-cryptography/botan/pull/17
-  botan-bindings = appendPatch (pkgs.fetchpatch2 {
-    url = "https://github.com/haskell-cryptography/botan/commit/99de68c3938187b7ab740c6534ec032a4a236747.patch";
-    sha256 = "sha256-v255WFO9HsRuTAWFZG27TYbpoK7rJ1AuiCFNFIV18mI=";
-    stripLen = 1;
-  }) super.botan-bindings;
+  # 2025-10-12: gi-gtk was renamed to gi-gtk3
+  # https://github.com/haskell-gi/haskell-gi/issues/478
+  gi-gtk-hs =
+    appendPatches
+      [
+        (pkgs.fetchpatch {
+          name = "gi-gtk-hs-use-gtk3.patch";
+          url = "https://github.com/haskell-gi/haskell-gi/commit/e2ed85835499f70e119f050a2f37f22481f93886.patch";
+          sha256 = "sha256-MzxXtBNBbJJaNwTOrq/CYqK4yGfS4Yk5fQ38ihFcclA=";
+          relative = "gi-gtk-hs";
+        })
+      ]
+      (
+        super.gi-gtk-hs.override {
+          gi-gdk = self.gi-gdk3;
+          gi-gtk = self.gi-gtk3;
+        }
+      );
 
   # 2025-08-04: Disable failing testcases. It would feel bad to disable all the
   # checks in a cryptography related package.
@@ -4070,3 +3884,41 @@ with haskellLib;
     );
   }
 )
+
+# Cachix packages
+# Manually maintained
+// (
+  let
+    version = "1.9.1";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "cachix";
+      repo = "cachix";
+      tag = "v${version}";
+      hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=";
+    };
+  in
+  {
+    cachix-api = overrideSrc {
+      inherit version;
+      src = src + "/cachix-api";
+    } super.cachix-api;
+
+    cachix = lib.pipe super.cachix [
+      (overrideSrc {
+        inherit version;
+        src = src + "/cachix";
+      })
+      (addBuildDepends [
+        self.pqueue
+      ])
+      (
+        drv:
+        drv.override {
+          nix = self.hercules-ci-cnix-store.nixPackage;
+          hnix-store-core = self.hnix-store-core_0_8_0_0;
+        }
+      )
+    ];
+  }
+)
diff --git a/pkgs/development/haskell-modules/configuration-darwin.nix b/pkgs/development/haskell-modules/configuration-darwin.nix
index f3387cd2ce7f..9569f4b36597 100644
--- a/pkgs/development/haskell-modules/configuration-darwin.nix
+++ b/pkgs/development/haskell-modules/configuration-darwin.nix
@@ -36,10 +36,6 @@ self: super:
 
     double-conversion = addExtraLibrary pkgs.libcxx super.double-conversion;
 
-    # "erf table" test fails on Darwin
-    # https://github.com/bos/math-functions/issues/63
-    math-functions = dontCheck super.math-functions;
-
     # darwin doesn't have sub-second resolution
     # https://github.com/hspec/mockery/issues/11
     mockery = overrideCabal (drv: {
@@ -94,7 +90,7 @@ self: super:
       drv:
       lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
         postPatch = ''
-          substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
+          substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security
         ''
         + (drv.postPatch or "");
       }
@@ -103,11 +99,20 @@ self: super:
       drv:
       lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
         postPatch = ''
-          substituteInPlace System/X509/MacOS.hs --replace security /usr/bin/security
+          substituteInPlace System/X509/MacOS.hs --replace-fail security /usr/bin/security
         ''
         + (drv.postPatch or "");
       }
     ) super.crypton-x509-system;
+    HsOpenSSL-x509-system = overrideCabal (
+      drv:
+      lib.optionalAttrs (!pkgs.stdenv.cc.nativeLibc) {
+        postPatch = ''
+          substituteInPlace OpenSSL/X509/SystemStore/MacOSX.hs --replace-fail security /usr/bin/security
+        ''
+        + (drv.postPatch or "");
+      }
+    ) super.HsOpenSSL-x509-system;
 
     # https://github.com/haskell-foundation/foundation/pull/412
     foundation = dontCheck super.foundation;
@@ -124,7 +129,7 @@ self: super:
       # when called from GHC, probably because clang is version 7, but we are
       # using LLVM8.
       preCompileBuildDriver = ''
-        substituteInPlace Setup.hs --replace "addToLdLibraryPath libDir" "pure ()"
+        substituteInPlace Setup.hs --replace-fail "addToLdLibraryPath libDir" "pure ()"
       ''
       + (oldAttrs.preCompileBuildDriver or "");
     }) super.llvm-hs;
@@ -165,7 +170,7 @@ self: super:
     HTF = overrideCabal (drv: {
       # GNU find is not prefixed in stdenv
       postPatch = ''
-        substituteInPlace scripts/local-htfpp --replace "find=gfind" "find=find"
+        substituteInPlace scripts/local-htfpp --replace-fail "find=gfind" "find=find"
       ''
       + (drv.postPatch or "");
     }) super.HTF;
@@ -185,7 +190,7 @@ self: super:
     # however linking against it is also not necessary there
     GLHUI = overrideCabal (drv: {
       postPatch = ''
-        substituteInPlace GLHUI.cabal --replace " rt" ""
+        substituteInPlace GLHUI.cabal --replace-fail " rt" ""
       ''
       + (drv.postPatch or "");
     }) super.GLHUI;
@@ -194,7 +199,7 @@ self: super:
       # Prevent darwin-specific configuration code path being taken
       # which doesn't work with nixpkgs' SDL libraries
       postPatch = ''
-        substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
+        substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing
       ''
       + (drv.postPatch or "");
       patches = [
@@ -207,7 +212,7 @@ self: super:
     # doesn't work with nixpkgs' SDL libraries
     SDL-mixer = overrideCabal (drv: {
       postPatch = ''
-        substituteInPlace configure --replace xDarwin noDarwinSpecialCasing
+        substituteInPlace configure --replace-fail xDarwin noDarwinSpecialCasing
       ''
       + (drv.postPatch or "");
     }) super.SDL-mixer;
@@ -313,7 +318,7 @@ self: super:
     # Remove a problematic assert, the length is sometimes 1 instead of 2 on darwin
     di-core = overrideCabal (drv: {
       preConfigure = ''
-        substituteInPlace test/Main.hs --replace \
+        substituteInPlace test/Main.hs --replace-fail \
           "2 @=? List.length (List.nub (List.sort (map Di.log_time logs)))" ""
       '';
     }) super.di-core;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
index a204f4d41fb3..1454ea63b514 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
@@ -1,18 +1,6 @@
-{
-  config,
-  pkgs,
-  haskellLib,
-}:
-
-with haskellLib;
-
-let
-  inherit (pkgs.stdenv.hostPlatform) isDarwin;
-  inherit (pkgs) lib;
-in
+{ }:
 
 self: super: {
-
   # Disable GHC 9.0.x core libraries.
   array = null;
   base = null;
@@ -42,161 +30,11 @@ self: super: {
   rts = null;
   stm = null;
   template-haskell = null;
-  # GHC only builds terminfo if it is a native compiler
-  terminfo =
-    if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
-      null
-    else
-      doDistribute self.terminfo_0_4_1_7;
+  terminfo = null;
   text = null;
   time = null;
   transformers = null;
   unix = null;
-  # GHC only bundles the xhtml library if haddock is enabled, check if this is
-  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
-  xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
-
-  # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
-  Cabal-syntax = self.Cabal-syntax_3_6_0_0;
-  # These core package only exist for GHC >= 9.4. The best we can do is feign
-  # their existence to callPackages, but their is no shim for lower GHC versions.
-  system-cxx-std-lib = null;
-
-  # Becomes a core package in GHC >= 9.8
-  semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
-
-  # Becomes a core package in GHC >= 9.10
-  os-string = doDistribute self.os-string_1_0_0;
-
-  # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available
-  ghc-internal = null;
-  # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage
-  ghc-toolchain = null;
-  ghc-platform = null;
-
-  # Only required for ghc >= 9.2
-  nothunks = super.nothunks.override {
-    wherefrom-compat = null;
-  };
-
-  # Needs base-orphans for GHC < 9.8 / base < 4.19
-  some = addBuildDepend self.base-orphans super.some;
-
-  # Jailbreaks & Version Updates
-
-  # tar > 0.6 requires os-string which can't be built with bytestring < 0.11
-  tar = doDistribute (doJailbreak self.tar_0_6_0_0);
-  # text-metrics >= 0.3.3 requires GHC2021
-  text-metrics = doDistribute self.text-metrics_0_3_2;
-
-  # For GHC < 9.4, some packages need data-array-byte as an extra dependency
-  primitive = addBuildDepends [ self.data-array-byte ] super.primitive;
-  # hashable >= 1.5 only supports GHC >= 9.6 / base >= 4.18
-  hashable = self.hashable_1_4_7_0;
-  hashable_1_4_7_0 =
-    # extra deps for GHC < 9.4
-    addBuildDepends
-      [
-        self.data-array-byte
-        self.base-orphans
-      ]
-      # For GHC < 9.2, os-string is not required
-      (super.hashable_1_4_7_0.override { os-string = null; });
-
-  # Too strict lower bounds on base
-  primitive-addr = doJailbreak super.primitive-addr;
-
-  hashable-time = doJailbreak super.hashable-time;
-  tuple = addBuildDepend self.base-orphans super.tuple;
-  vector-th-unbox = doJailbreak super.vector-th-unbox;
-
-  ormolu = self.ormolu_0_5_2_0.override {
-    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
-  };
-
-  stylish-haskell = doJailbreak super.stylish-haskell_0_14_4_0;
-
-  doctest = dontCheck super.doctest;
-
-  haskell-language-server =
-    lib.throwIf config.allowAliases
-      "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"
-      (markBroken super.haskell-language-server);
-
-  # test suite depends on vcr since hpack >= 0.38.1 which requires GHC2021
-  hpack = dontCheck super.hpack;
-
-  # Needs to use ghc-lib due to incompatible GHC
-  ghc-tags = doDistribute self.ghc-tags_1_5;
-
-  # ghc-lib >= 9.6 and friends no longer build with GHC 9.0
-  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
-  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
-  ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729;
-
-  # Test suite sometimes segfaults with GHC 9.0.1 and 9.0.2
-  # https://github.com/ekmett/reflection/issues/51
-  # https://gitlab.haskell.org/ghc/ghc/-/issues/21141
-  reflection = dontCheck super.reflection;
-
-  # Disable tests pending resolution of
-  # https://github.com/Soostone/retry/issues/71
-  retry = dontCheck super.retry;
-
-  ghc-api-compat = unmarkBroken super.ghc-api-compat;
-
-  # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat.
-  hiedb = overrideCabal (old: {
-    libraryHaskellDepends = old.libraryHaskellDepends ++ [ self.ghc-api-compat ];
-  }) super.hiedb;
-
-  # https://github.com/lspitzner/butcher/issues/7
-  butcher = doJailbreak super.butcher;
-
-  # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8
-  aeson = dontCheck super.aeson;
-
-  # We use a GHC patch to support the fix for https://github.com/fpco/inline-c/issues/127
-  # which means that the upstream cabal file isn't allowed to add the flag.
-  inline-c-cpp =
-    (if isDarwin then appendConfigureFlags [ "--ghc-option=-fcompact-unwind" ] else x: x)
-      super.inline-c-cpp;
-
-  # 2022-05-31: weeder 2.4.* requires GHC 9.2
-  weeder = doDistribute self.weeder_2_3_1;
-  # Unnecessarily strict upper bound on lens
-  weeder_2_3_1 = doJailbreak (
-    super.weeder_2_3_1.override {
-      # weeder < 2.6 only supports algebraic-graphs < 0.7
-      # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set
-      algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
-    }
-  );
-
-  # Later versions only support GHC >= 9.2
-  ghc-exactprint = self.ghc-exactprint_0_6_4;
-
-  retrie = dontCheck self.retrie_1_1_0_0;
-
-  # Needs OneTuple for ghc < 9.2
-  binary-orphans = addBuildDepends [ self.OneTuple ] super.binary-orphans;
-
-  hspec-megaparsec = super.hspec-megaparsec_2_2_0;
-
-  # No instance for (Show B.Builder) arising from a use of ‘print’
-  http-types = dontCheck super.http-types;
-
-  # Packages which need compat library for GHC < 9.6
-  inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super)
-    indexed-traversable
-    these
-    ;
-  base-compat-batteries = addBuildDepends [
-    self.foldable1-classes-compat
-    self.OneTuple
-  ] super.base-compat-batteries;
-  OneTuple = addBuildDepends [
-    self.foldable1-classes-compat
-    self.base-orphans
-  ] super.OneTuple;
+  xhtml = null;
+  Win32 = null;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
index 9bf63d98ac6b..7dc391912154 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix
@@ -63,6 +63,7 @@ in
   transformers = null;
   unix = null;
   xhtml = null;
+  Win32 = null;
 
   # “Unfortunately we are unable to support GHC 9.10.”
   apply-refact = dontDistribute (markBroken super.apply-refact);
@@ -88,7 +89,5 @@ in
   # Test suite issues
   #
   call-stack = dontCheck super.call-stack; # https://github.com/sol/call-stack/issues/19
-  fsnotify = dontCheck super.fsnotify; # https://github.com/haskell-fswatch/hfsnotify/issues/115
-  hinotify = pkgs.haskell.lib.dontCheck super.hinotify; # https://github.com/kolmodin/hinotify/issues/38
   monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
index c0a06d50b478..82630d5da2c8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix
@@ -66,6 +66,7 @@ with haskellLib;
   transformers = null;
   unix = null;
   xhtml = null;
+  Win32 = null;
 
   #
   # Hand pick versions that are compatible with ghc 9.12 and base 4.21
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix
index 0ff76cae4892..2a09d3f258c0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix
@@ -51,4 +51,5 @@ self: super: {
   transformers = null;
   unix = null;
   xhtml = null;
+  Win32 = null;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
deleted file mode 100644
index 8bc8c6b6d2a9..000000000000
--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ /dev/null
@@ -1,167 +0,0 @@
-{
-  config,
-  pkgs,
-  haskellLib,
-}:
-
-with haskellLib;
-
-let
-  inherit (pkgs.stdenv.hostPlatform) isDarwin;
-  inherit (pkgs) lib;
-in
-
-self: super: {
-
-  # Disable GHC 9.2.x core libraries.
-  array = null;
-  base = null;
-  binary = null;
-  bytestring = null;
-  Cabal = null;
-  containers = null;
-  deepseq = null;
-  directory = null;
-  exceptions = null;
-  filepath = null;
-  ghc-bignum = null;
-  ghc-boot = null;
-  ghc-boot-th = null;
-  ghc-compact = null;
-  ghc-heap = null;
-  ghc-prim = null;
-  ghci = null;
-  haskeline = null;
-  hpc = null;
-  integer-gmp = null;
-  libiserv = null;
-  mtl = null;
-  parsec = null;
-  pretty = null;
-  process = null;
-  rts = null;
-  stm = null;
-  template-haskell = null;
-  # GHC only builds terminfo if it is a native compiler
-  terminfo =
-    if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
-      null
-    else
-      doDistribute self.terminfo_0_4_1_7;
-  text = null;
-  time = null;
-  transformers = null;
-  unix = null;
-  # GHC only bundles the xhtml library if haddock is enabled, check if this is
-  # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
-  xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
-
-  # Need the Cabal-syntax-3.6.0.0 fake package for Cabal < 3.8 to allow callPackage and the constraint solver to work
-  Cabal-syntax = self.Cabal-syntax_3_6_0_0;
-  # These core package only exist for GHC >= 9.4. The best we can do is feign
-  # their existence to callPackages, but their is no shim for lower GHC versions.
-  system-cxx-std-lib = null;
-
-  # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available
-  ghc-internal = null;
-  # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage
-  ghc-toolchain = null;
-  ghc-platform = null;
-
-  # Becomes a core package in GHC >= 9.8
-  semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
-
-  # Becomes a core package in GHC >= 9.10
-  os-string = doDistribute self.os-string_2_0_8;
-
-  # weeder >= 2.5 requires GHC 9.4
-  weeder = doDistribute self.weeder_2_4_1;
-  # Allow dhall 1.42.*
-  weeder_2_4_1 = doJailbreak (
-    super.weeder_2_4_1.override {
-      # weeder < 2.6 only supports algebraic-graphs < 0.7
-      # We no longer have matching test deps for algebraic-graphs 0.6.1 in the set
-      algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
-    }
-  );
-
-  haskell-language-server =
-    lib.throwIf config.allowAliases
-      "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version"
-      (markBroken super.haskell-language-server);
-
-  # hashable >= 1.5 doesn't support base < 4.18
-  hashable = self.hashable_1_4_7_0;
-  # For GHC < 9.4, some packages need data-array-byte as an extra dependency
-  hashable_1_4_7_0 = addBuildDepends [ self.data-array-byte ] super.hashable_1_4_7_0;
-  primitive = addBuildDepends [ self.data-array-byte ] super.primitive;
-  primitive-unlifted = super.primitive-unlifted_0_1_3_1;
-  # Too strict lower bound on base
-  primitive-addr = doJailbreak super.primitive-addr;
-
-  # Needs base-orphans for GHC < 9.8 / base < 4.19
-  some = addBuildDepend self.base-orphans super.some;
-
-  # Jailbreaks & Version Updates
-  hashable-time = doJailbreak super.hashable-time;
-
-  # Depends on utf8-light which isn't maintained / doesn't support base >= 4.16
-  # https://github.com/haskell-infra/hackage-trustees/issues/347
-  # https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html
-  language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0;
-
-  # Needs to match ghc-lib version
-  ghc-tags = doDistribute (doJailbreak self.ghc-tags_1_7);
-
-  # Needs to match ghc-lib
-  hlint = doDistribute self.hlint_3_6_1;
-
-  # ghc-lib >= 9.8 and friends no longer build with GHC 9.2 since they require semaphore-compat
-  ghc-lib-parser = doDistribute (
-    self.ghc-lib-parser_9_6_7_20250325.override {
-      happy = self.happy_1_20_1_1; # wants happy < 1.21
-    }
-  );
-  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_2;
-  ghc-lib = doDistribute (
-    self.ghc-lib_9_6_7_20250325.override {
-      happy = self.happy_1_20_1_1; # wants happy < 1.21
-    }
-  );
-
-  # 0.2.2.3 requires Cabal >= 3.8
-  shake-cabal = doDistribute self.shake-cabal_0_2_2_2;
-
-  # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8
-  aeson = dontCheck super.aeson;
-
-  # https://github.com/NixOS/cabal2nix/issues/554
-  # https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility
-  clash-prelude = dontDistribute (markBroken super.clash-prelude);
-
-  # Too strict upper bound on bytestring, relevant for GHC 9.2.6 specifically
-  # https://github.com/protolude/protolude/issues/127#issuecomment-1428807874
-  protolude = doJailbreak super.protolude;
-
-  # https://github.com/fpco/inline-c/pull/131
-  inline-c-cpp =
-    (if isDarwin then appendConfigureFlags [ "--ghc-option=-fcompact-unwind" ] else x: x)
-      super.inline-c-cpp;
-
-  # A given major version of ghc-exactprint only supports one version of GHC.
-  ghc-exactprint = super.ghc-exactprint_1_5_0;
-
-  # only broken for >= 9.6
-  calligraphy = doDistribute (unmarkBroken super.calligraphy);
-
-  # Packages which need compat library for GHC < 9.6
-  inherit (lib.mapAttrs (_: addBuildDepends [ self.foldable1-classes-compat ]) super)
-    indexed-traversable
-    OneTuple
-    these
-    ;
-  base-compat-batteries = addBuildDepends [
-    self.foldable1-classes-compat
-    self.OneTuple
-  ] super.base-compat-batteries;
-}
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
index 7673e54c2e74..fe58bea65f88 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
@@ -50,6 +50,7 @@ self: super: {
   # GHC only bundles the xhtml library if haddock is enabled, check if this is
   # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
   xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
+  Win32 = null;
 
   # Becomes a core package in GHC >= 9.8
   semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
@@ -98,6 +99,9 @@ self: super: {
   # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
   hiedb = dontCheck super.hiedb;
 
+  # Tests require skeletest which doesn't support GHC 9.4
+  toml-reader = dontCheck super.toml-reader;
+
   # 2022-10-06: https://gitlab.haskell.org/ghc/ghc/-/issues/22260
   ghc-check = dontHaddock super.ghc-check;
 
@@ -131,37 +135,12 @@ self: super: {
   relude = dontCheck super.relude;
 
   haddock-library = doJailbreak super.haddock-library;
-  apply-refact = addBuildDepend self.data-default-class super.apply-refact;
   path = self.path_0_9_5;
-  inherit
-    (
-      let
-        hls_overlay = lself: lsuper: {
-          Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
-          Cabal = lself.Cabal_3_10_3_0;
-          extensions = dontCheck (doJailbreak (lself.extensions_0_1_0_1));
-        };
-      in
-      lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
-        haskell-language-server = allowInconsistentDependencies (
-          addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server
-        );
-        fourmolu = doJailbreak (dontCheck self.fourmolu_0_14_0_0); # ansi-terminal, Diff
-        ormolu = doJailbreak self.ormolu_0_7_2_0; # ansi-terminal
-        hlint = self.hlint_3_6_1;
-        stylish-haskell = self.stylish-haskell_0_14_5_0;
-        retrie = doJailbreak (unmarkBroken super.retrie);
-        floskell = doJailbreak super.floskell;
-      }
-    )
-    retrie
-    floskell
-    haskell-language-server
-    fourmolu
-    ormolu
-    hlint
-    stylish-haskell
-    ;
+
+  haskell-language-server =
+    lib.throwIf pkgs.config.allowAliases
+      "haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs"
+      (markBroken super.haskell-language-server);
 
   # directory-ospath-streaming requires the ospath API in core packages
   # filepath, directory and unix.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
index ba8c067651f4..41b81b6ba15f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix
@@ -58,6 +58,7 @@ in
   transformers = null;
   unix = null;
   xhtml = null;
+  Win32 = null;
 
   # Becomes a core package in GHC >= 9.8
   semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
@@ -148,6 +149,9 @@ in
   # Tests require nothunks < 0.3 (conflicting with Stackage) for GHC < 9.8
   aeson = dontCheck super.aeson;
 
+  # Tests require skeletest which no longer supports GHC 9.6
+  toml-reader = dontCheck super.toml-reader;
+
   # Apply patch from PR with mtl-2.3 fix.
   ConfigFile = overrideCabal (drv: {
     editedCabalFile = null;
@@ -200,7 +204,6 @@ in
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
   haddock-library = doJailbreak super.haddock-library;
-  apply-refact = addBuildDepend self.data-default-class super.apply-refact;
   inherit
     (
       let
@@ -211,23 +214,29 @@ in
         };
       in
       lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
-        haskell-language-server = allowInconsistentDependencies (
-          addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server
-        );
-        ormolu = doDistribute self.ormolu_0_7_4_0;
-        fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0));
-        hlint = doDistribute self.hlint_3_8;
-        stylish-haskell = self.stylish-haskell_0_14_6_0;
-        retrie = doJailbreak (unmarkBroken super.retrie);
+        apply-refact = addBuildDepend self.data-default-class super.apply-refact;
         floskell = doJailbreak super.floskell;
+        fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);
+        haskell-language-server = addBuildDepends [
+          self.retrie
+          self.floskell
+          self.markdown-unlit
+        ] super.haskell-language-server;
+        hls-plugin-api = super.hls-plugin-api;
+        hlint = self.hlint_3_8;
+        ormolu = self.ormolu_0_7_4_0;
+        retrie = doJailbreak (unmarkBroken super.retrie);
+        stylish-haskell = self.stylish-haskell_0_14_6_0;
       }
     )
-    retrie
+    apply-refact
     floskell
-    haskell-language-server
     fourmolu
-    ormolu
+    haskell-language-server
+    hls-plugin-api
     hlint
+    ormolu
+    retrie
     stylish-haskell
     ;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
index f739c9ddea64..8b430b143451 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix
@@ -61,6 +61,7 @@ in
   transformers = null;
   unix = null;
   xhtml = null;
+  Win32 = null;
 
   # Becomes a core package in GHC >= 9.10
   os-string = doDistribute self.os-string_2_0_8;
@@ -105,7 +106,6 @@ in
   ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
 
   haddock-library = doJailbreak super.haddock-library;
-  apply-refact = addBuildDepend self.data-default-class super.apply-refact;
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
   inherit
@@ -114,27 +114,33 @@ in
         hls_overlay = lself: lsuper: {
           Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
           Cabal = lself.Cabal_3_10_3_0;
-          extensions = dontCheck (doJailbreak super.extensions_0_1_0_1);
+          extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1);
         };
       in
       lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
-        haskell-language-server = allowInconsistentDependencies (
-          addBuildDepends [ self.retrie self.floskell ] super.haskell-language-server
-        );
-        ormolu = doDistribute self.ormolu_0_7_4_0;
-        fourmolu = doDistribute (dontCheck (doJailbreak self.fourmolu_0_15_0_0));
-        hlint = doDistribute self.hlint_3_8;
-        stylish-haskell = self.stylish-haskell_0_14_6_0;
-        retrie = doJailbreak (unmarkBroken super.retrie);
+        apply-refact = addBuildDepend self.data-default-class super.apply-refact;
         floskell = doJailbreak super.floskell;
+        fourmolu = dontCheck (doJailbreak self.fourmolu_0_15_0_0);
+        haskell-language-server = addBuildDepends [
+          self.retrie
+          self.floskell
+          self.markdown-unlit
+        ] super.haskell-language-server;
+        hls-plugin-api = super.hls-plugin-api;
+        hlint = self.hlint_3_8;
+        ormolu = self.ormolu_0_7_4_0;
+        retrie = doJailbreak (unmarkBroken super.retrie);
+        stylish-haskell = self.stylish-haskell_0_14_6_0;
       }
     )
-    retrie
+    apply-refact
     floskell
-    haskell-language-server
     fourmolu
-    ormolu
+    haskell-language-server
+    hls-plugin-api
     hlint
+    ormolu
+    retrie
     stylish-haskell
     ;
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
index 10a399e73063..3d2268de643f 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs-9.x.nix
@@ -35,9 +35,16 @@ with haskellLib;
   patch = haskellLib.disableParallelBuilding super.patch;
   reflex-dom-core = haskellLib.disableParallelBuilding super.reflex-dom-core;
 
-  reflex-dom = super.reflex-dom.override (drv: {
-    jsaddle-webkit2gtk = null;
-  });
+  # Marked as dontDistribute in -common because of jsaddle-webkit2gtk
+  # which requires an unmaintained version of libsoup. Since this dep
+  # is unnecessary for the JS backend, we can re-enable these jobs here.
+  reflex-dom = doDistribute (
+    super.reflex-dom.override (drv: {
+      jsaddle-webkit2gtk = null;
+    })
+  );
+  reflex-localize-dom = doDistribute super.reflex-localize-dom;
+  trasa-reflex = doDistribute super.trasa-reflex;
 
   miso-examples = pkgs.lib.pipe super.miso-examples [
     (addBuildDepends (
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
index eda038782976..1bab28281090 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
@@ -66,7 +66,6 @@ broken-packages:
   - adaptive-containers # failure in job https://hydra.nixos.org/build/233243181 at 2023-09-02
   - adaptive-tuple # failure in job https://hydra.nixos.org/build/233244881 at 2023-09-02
   - adb # failure in job https://hydra.nixos.org/build/233193888 at 2023-09-02
-  - adblock2privoxy # failure in job https://hydra.nixos.org/build/307609942 at 2025-09-19
   - addy # failure in job https://hydra.nixos.org/build/233240594 at 2023-09-02
   - adhoc-fixtures-hspec # failure in job https://hydra.nixos.org/build/252725981 at 2024-03-16
   - adjunction # failure in job https://hydra.nixos.org/build/233237774 at 2023-09-02
@@ -76,7 +75,6 @@ broken-packages:
   - AERN-Basics # failure in job https://hydra.nixos.org/build/233246999 at 2023-09-02
   - aeson-applicative # failure in job https://hydra.nixos.org/build/233213824 at 2023-09-02
   - aeson-bson # failure in job https://hydra.nixos.org/build/233201964 at 2023-09-02
-  - aeson-combinators # failure in job https://hydra.nixos.org/build/307516309 at 2025-09-19
   - aeson-commit # failure in job https://hydra.nixos.org/build/233198515 at 2023-09-02
   - aeson-compat # failure in job https://hydra.nixos.org/build/233208257 at 2023-09-02
   - aeson-decode # failure in job https://hydra.nixos.org/build/233251197 at 2023-09-02
@@ -94,7 +92,6 @@ broken-packages:
   - aeson-iproute # failure in job https://hydra.nixos.org/build/295091261 at 2025-04-22
   - aeson-json-ast # failure in job https://hydra.nixos.org/build/233249406 at 2023-09-02
   - aeson-lens # failure in job https://hydra.nixos.org/build/233235357 at 2023-09-02
-  - aeson-match-qq # failure in job https://hydra.nixos.org/build/295091245 at 2025-04-22
   - aeson-modern-tojson # failure in job https://hydra.nixos.org/build/233202149 at 2023-09-02
   - aeson-options # failure in job https://hydra.nixos.org/build/233245051 at 2023-09-02
   - aeson-parsec-picky # failure in job https://hydra.nixos.org/build/233222117 at 2023-09-02
@@ -147,6 +144,7 @@ broken-packages:
   - alloy # failure in job https://hydra.nixos.org/build/252726555 at 2024-03-16
   - ally-invest # failure in job https://hydra.nixos.org/build/233236224 at 2023-09-02
   - alpaca-netcode # failure in job https://hydra.nixos.org/build/233239392 at 2023-09-02
+  - alpha # failure in job https://hydra.nixos.org/build/309811728 at 2025-10-15
   - alphachar # failure in job https://hydra.nixos.org/build/252722667 at 2024-03-16
   - alpino-tools # failure in job https://hydra.nixos.org/build/233236168 at 2023-09-02
   - alsa # failure in job https://hydra.nixos.org/build/233250059 at 2023-09-02
@@ -303,6 +301,7 @@ broken-packages:
   - ats-storable # failure in job https://hydra.nixos.org/build/233242765 at 2023-09-02
   - attempt # failure in job https://hydra.nixos.org/build/233233073 at 2023-09-02
   - attenuation # failure in job https://hydra.nixos.org/build/252721241 at 2024-03-16
+  - attic # failure in job https://hydra.nixos.org/build/311050775 at 2025-11-02
   - attic-schedule # failure in job https://hydra.nixos.org/build/233249781 at 2023-09-02
   - atto-lisp # failure in job https://hydra.nixos.org/build/233222679 at 2023-09-02
   - AttoBencode # failure in job https://hydra.nixos.org/build/233198079 at 2023-09-02
@@ -330,7 +329,6 @@ broken-packages:
   - autoproc # failure in job https://hydra.nixos.org/build/252730569 at 2024-03-16
   - avatar-generator # failure in job https://hydra.nixos.org/build/233214253 at 2023-09-02
   - aviation-units # failure in job https://hydra.nixos.org/build/233245762 at 2023-09-02
-  - avl-static # failure in job https://hydra.nixos.org/build/233199062 at 2023-09-02
   - avr-shake # failure in job https://hydra.nixos.org/build/233223187 at 2023-09-02
   - avro # failure in job https://hydra.nixos.org/build/307610307 at 2025-09-19
   - avro-piper # failure in job https://hydra.nixos.org/build/233197510 at 2023-09-02
@@ -459,7 +457,6 @@ broken-packages:
   - bindings-cctools # failure in job https://hydra.nixos.org/build/233216939 at 2023-09-02
   - bindings-common # failure in job https://hydra.nixos.org/build/233217363 at 2023-09-02
   - bindings-dc1394 # failure in job https://hydra.nixos.org/build/233200022 at 2023-09-02
-  - bindings-directfb # failure in job https://hydra.nixos.org/build/295091945 at 2025-04-22
   - bindings-eskit # failure in job https://hydra.nixos.org/build/233223517 at 2023-09-02
   - bindings-EsounD # failure in job https://hydra.nixos.org/build/233245565 at 2023-09-02
   - bindings-fann # failure in job https://hydra.nixos.org/build/233232900 at 2023-09-02
@@ -528,8 +525,8 @@ broken-packages:
   - bliplib # failure in job https://hydra.nixos.org/build/233195751 at 2023-09-02
   - blockchain # failure in job https://hydra.nixos.org/build/233245492 at 2023-09-02
   - blockhash # failure in job https://hydra.nixos.org/build/233227049 at 2023-09-02
-  - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/44 at 2025-07-27
-  - blockio-uring # https://github.com/well-typed/blockio-uring/issues/44, added 2025-07-27
+  - blockio-uring # failure in job https://hydra.nixos.org/build/302801498, https://github.com/well-typed/blockio-uring/issues/47 at 2025-07-27
+  - blockio-uring # https://github.com/well-typed/blockio-uring/issues/47, added 2025-07-27
   - Blogdown # failure in job https://hydra.nixos.org/build/233239841 at 2023-09-02
   - BlogLiterately # failure in job https://hydra.nixos.org/build/233202164 at 2023-09-02
   - bloodhound-amazonka-auth # failure building library in job https://hydra.nixos.org/build/237245625 at 2023-10-21
@@ -538,7 +535,6 @@ broken-packages:
   - blosum # failure in job https://hydra.nixos.org/build/233198029 at 2023-09-02
   - blubber-server # failure in job https://hydra.nixos.org/build/233199530 at 2023-09-02
   - bludigon # failure in job https://hydra.nixos.org/build/233248190 at 2023-09-02
-  - bluefin-algae # failure in job https://hydra.nixos.org/build/307517064 at 2025-09-19
   - bluefin-random # failure in job https://hydra.nixos.org/build/307517069 at 2025-09-19
   - Blueprint # failure in job https://hydra.nixos.org/build/233252987 at 2023-09-02
   - bluetileutils # failure in job https://hydra.nixos.org/build/233197334 at 2023-09-02
@@ -607,7 +603,6 @@ broken-packages:
   - buildable # failure in job https://hydra.nixos.org/build/233199077 at 2023-09-02
   - buildbox # failure in job https://hydra.nixos.org/build/233216315 at 2023-09-02
   - builder # failure in job https://hydra.nixos.org/build/233207846 at 2023-09-02
-  - bumper # failure in job https://hydra.nixos.org/build/233234378 at 2023-09-02
   - bunz # failure in job https://hydra.nixos.org/build/233193945 at 2023-09-02
   - bureaucromancy # failure in job https://hydra.nixos.org/build/295092112 at 2025-04-22
   - burst-detection # failure in job https://hydra.nixos.org/build/233254074 at 2023-09-02
@@ -672,7 +667,7 @@ broken-packages:
   - cabal-install-bundle # failure in job https://hydra.nixos.org/build/233194629 at 2023-09-02
   - cabal-install-ghc72 # failure in job https://hydra.nixos.org/build/233246160 at 2023-09-02
   - cabal-install-ghc74 # failure in job https://hydra.nixos.org/build/233226625 at 2023-09-02
-  - cabal-macosx # failure in job https://hydra.nixos.org/build/307517203 at 2025-09-19
+  - cabal-matrix # failure in job https://hydra.nixos.org/build/311051176 at 2025-11-02
   - cabal-meta # failure in job https://hydra.nixos.org/build/233194466 at 2023-09-02
   - cabal-mon # failure in job https://hydra.nixos.org/build/233217320 at 2023-09-02
   - cabal-nirvana # failure in job https://hydra.nixos.org/build/233222083 at 2023-09-02
@@ -706,6 +701,7 @@ broken-packages:
   - cake3 # failure in job https://hydra.nixos.org/build/233231662 at 2023-09-02
   - cal-layout # failure in job https://hydra.nixos.org/build/233191194 at 2023-09-02
   - cal3d # failure in job https://hydra.nixos.org/build/233200357 at 2023-09-02
+  - calamity # failure in job https://hydra.nixos.org/build/309812724 at 2025-10-15
   - caledon # failure in job https://hydra.nixos.org/build/233209888 at 2023-09-02
   - calenderweek # failure in job https://hydra.nixos.org/build/233209930 at 2023-09-02
   - call-alloy # failure in job https://hydra.nixos.org/build/233249056 at 2023-09-02
@@ -828,6 +824,7 @@ broken-packages:
   - cipher-des # failure in job https://hydra.nixos.org/build/233232112 at 2023-09-02
   - circle # failure in job https://hydra.nixos.org/build/252722965 at 2024-03-16
   - circlehs # failure in job https://hydra.nixos.org/build/233246591 at 2023-09-02
+  - circuit-notation # failure in job https://hydra.nixos.org/build/309812708 at 2025-10-15
   - citeproc-hs # failure in job https://hydra.nixos.org/build/233254388 at 2023-09-02
   - cj-token # failure in job https://hydra.nixos.org/build/233253928 at 2023-09-02
   - cjk # failure in job https://hydra.nixos.org/build/233258734 at 2023-09-02
@@ -839,6 +836,7 @@ broken-packages:
   - clarifai # failure in job https://hydra.nixos.org/build/233229480 at 2023-09-02
   - CLASE # failure in job https://hydra.nixos.org/build/233234459 at 2023-09-02
   - clash-finite # failure in job https://hydra.nixos.org/build/295092297 at 2025-04-22
+  - clash-lib # failure in job https://hydra.nixos.org/build/309812683 at 2025-10-15
   - clash-lib-hedgehog # failure in job https://hydra.nixos.org/build/295122808 at 2025-04-22
   - clash-multisignal # failure in job https://hydra.nixos.org/build/273463331 at 2024-10-01
   - clash-prelude-quickcheck # failure in job https://hydra.nixos.org/build/273453747 at 2024-10-01
@@ -863,6 +861,7 @@ broken-packages:
   - clexer # failure in job https://hydra.nixos.org/build/233229804 at 2023-09-02
   - CLI # failure in job https://hydra.nixos.org/build/233191087 at 2023-09-02
   - cli-builder # failure in job https://hydra.nixos.org/build/233209961 at 2023-09-02
+  - clickhouse-haskell # failure in job https://hydra.nixos.org/build/311051388 at 2025-11-02
   - clif # failure in job https://hydra.nixos.org/build/233197110 at 2023-09-02
   - clifm # failure in job https://hydra.nixos.org/build/233227426 at 2023-09-02
   - clingo # failure in job https://hydra.nixos.org/build/233238084 at 2023-09-02
@@ -873,6 +872,7 @@ broken-packages:
   - cloben # failure in job https://hydra.nixos.org/build/233194390 at 2023-09-02
   - clock-extras # failure in job https://hydra.nixos.org/build/233190748 at 2023-09-02
   - clocked # failure in job https://hydra.nixos.org/build/233241524 at 2023-09-02
+  - clod # failure in job https://hydra.nixos.org/build/309812703 at 2025-10-15
   - clogparse # failure in job https://hydra.nixos.org/build/233220294 at 2023-09-02
   - clone-all # failure in job https://hydra.nixos.org/build/233234063 at 2023-09-02
   - closed-classes # failure in job https://hydra.nixos.org/build/233250965 at 2023-09-02
@@ -884,7 +884,9 @@ broken-packages:
   - clr-typed # failure in job https://hydra.nixos.org/build/233212102 at 2023-09-02
   - cltw # failure in job https://hydra.nixos.org/build/252735903 at 2024-03-16
   - cluss # failure in job https://hydra.nixos.org/build/233245341 at 2023-09-02
+  - cmark-gfm-lens # failure in job https://hydra.nixos.org/build/311051270 at 2025-11-02
   - cmark-highlight # failure in job https://hydra.nixos.org/build/233218534 at 2023-09-02
+  - cmark-lens # failure in job https://hydra.nixos.org/build/311051296 at 2025-11-02
   - cmark-patterns # failure in job https://hydra.nixos.org/build/233192983 at 2023-09-02
   - cmark-sections # failure in job https://hydra.nixos.org/build/233222829 at 2023-09-02
   - cmath # failure in job https://hydra.nixos.org/build/233236588 at 2023-09-02
@@ -1058,6 +1060,7 @@ broken-packages:
   - contstuff-monads-tf # failure in job https://hydra.nixos.org/build/233224064 at 2023-09-02
   - contstuff-transformers # failure in job https://hydra.nixos.org/build/233244153 at 2023-09-02
   - conversion-bytestring # failure in job https://hydra.nixos.org/build/295092506 at 2025-04-22
+  - convert-annotation # failure in job https://hydra.nixos.org/build/310117221 at 2025-10-15
   - convex-schema-parser # failure in job https://hydra.nixos.org/build/302801971 at 2025-07-27
   - convexHullNd # failure in job https://hydra.nixos.org/build/307517560 at 2025-09-19
   - cookie-tray # failure in job https://hydra.nixos.org/build/295092527 at 2025-04-22
@@ -1179,6 +1182,7 @@ broken-packages:
   - daemonize-doublefork # failure in job https://hydra.nixos.org/build/252714429 at 2024-03-16
   - dag # failure in job https://hydra.nixos.org/build/233220719 at 2023-09-02
   - DAG-Tournament # failure in job https://hydra.nixos.org/build/233218747 at 2023-09-02
+  - dahdit # failure in job https://hydra.nixos.org/build/309813014 at 2025-10-15
   - damnpacket # failure in job https://hydra.nixos.org/build/233235248 at 2023-09-02
   - danibot # failure in job https://hydra.nixos.org/build/233197740 at 2023-09-02
   - Dao # failure in job https://hydra.nixos.org/build/233207745 at 2023-09-02
@@ -1221,6 +1225,7 @@ broken-packages:
   - data-fin # failure in job https://hydra.nixos.org/build/233216426 at 2023-09-02
   - data-fin-simple # failure in job https://hydra.nixos.org/build/233191648 at 2023-09-02
   - data-flagset # failure in job https://hydra.nixos.org/build/233211231 at 2023-09-02
+  - data-foldapp # failure in job https://hydra.nixos.org/build/309813054 at 2025-10-15
   - data-forced # failure in job https://hydra.nixos.org/build/307517739 at 2025-09-19
   - data-forest # failure in job https://hydra.nixos.org/build/307517728 at 2025-09-19
   - data-index # failure in job https://hydra.nixos.org/build/233197067 at 2023-09-02
@@ -1228,6 +1233,7 @@ broken-packages:
   - data-kiln # failure in job https://hydra.nixos.org/build/233220764 at 2023-09-02
   - data-lens-fd # failure in job https://hydra.nixos.org/build/233252537 at 2023-09-02
   - data-lens-template # failure in job https://hydra.nixos.org/build/233194446 at 2023-09-02
+  - data-list-zigzag # failure in job https://hydra.nixos.org/build/309813043 at 2025-10-15
   - data-map-multikey # failure in job https://hydra.nixos.org/build/233223141 at 2023-09-02
   - data-named # failure in job https://hydra.nixos.org/build/233196088 at 2023-09-02
   - data-nat # failure in job https://hydra.nixos.org/build/233226801 at 2023-09-02
@@ -1331,6 +1337,7 @@ broken-packages:
   - derive-monoid # failure in job https://hydra.nixos.org/build/233205670 at 2023-09-02
   - derive-prim # failure in job https://hydra.nixos.org/build/307517819 at 2025-09-19
   - derive-storable-plugin # failure in job https://hydra.nixos.org/build/295092800 at 2025-04-22
+  - derive-topdown # failure in job https://hydra.nixos.org/build/309813202 at 2025-10-15
   - derive-trie # failure in job https://hydra.nixos.org/build/233207961 at 2023-09-02
   - deriveJsonNoPrefix # failure in job https://hydra.nixos.org/build/233242453 at 2023-09-02
   - deriving-openapi3 # failure in job https://hydra.nixos.org/build/252718489 at 2024-03-16
@@ -1501,6 +1508,7 @@ broken-packages:
   - dtw # failure in job https://hydra.nixos.org/build/233198932 at 2023-09-02
   - dual # failure in job https://hydra.nixos.org/build/252724683 at 2024-03-16
   - dualizer # failure in job https://hydra.nixos.org/build/233237592 at 2023-09-02
+  - duckdb-ffi # failure in job https://hydra.nixos.org/build/311300709, https://github.com/Tritlo/duckdb-haskell/issues/2
   - duckling # failure in job https://hydra.nixos.org/build/233247880 at 2023-09-02
   - duet # failure in job https://hydra.nixos.org/build/233219004 at 2023-09-02
   - dump-core # failure in job https://hydra.nixos.org/build/233244428 at 2023-09-02
@@ -1692,6 +1700,7 @@ broken-packages:
   - eved # failure in job https://hydra.nixos.org/build/233194319 at 2023-09-02
   - event # failure in job https://hydra.nixos.org/build/233209756 at 2023-09-02
   - event-driven # failure in job https://hydra.nixos.org/build/233233946 at 2023-09-02
+  - eventlog-live-influxdb # failure in job https://hydra.nixos.org/build/311052040 at 2025-11-02
   - eventloop # failure in job https://hydra.nixos.org/build/295093203 at 2025-04-22
   - eventsource-api # failure in job https://hydra.nixos.org/build/233243220 at 2023-09-02
   - eventsourced # failure in job https://hydra.nixos.org/build/233192731 at 2023-09-02
@@ -1780,6 +1789,7 @@ broken-packages:
   - faster-megaparsec # failure in job https://hydra.nixos.org/build/252713238 at 2024-03-16
   - fastly # failure in job https://hydra.nixos.org/build/233213136 at 2023-09-02
   - fastmemo # failure in job https://hydra.nixos.org/build/252739389 at 2024-03-16
+  - fastparser # failure in job https://hydra.nixos.org/build/309813509 at 2025-10-15
   - fastpbkdf2 # failure in job https://hydra.nixos.org/build/233218574 at 2023-09-02
   - FastPush # failure in job https://hydra.nixos.org/build/233224507 at 2023-09-02
   - fastsum # failure in job https://hydra.nixos.org/build/252716407 at 2024-03-16
@@ -1851,7 +1861,6 @@ broken-packages:
   - fingertree-psqueue # failure in job https://hydra.nixos.org/build/233224766 at 2023-09-02
   - fingertree-tf # failure in job https://hydra.nixos.org/build/233259910 at 2023-09-02
   - finitary-optics # constraint issues https://hydra.nixos.org/build/295428386
-  - finite # failure in job https://hydra.nixos.org/build/233226313 at 2023-09-02
   - finite-field # failure in job https://hydra.nixos.org/build/295093309 at 2025-04-22
   - finite-fields # failure in job https://hydra.nixos.org/build/233191530 at 2023-09-02
   - FiniteCategoriesGraphViz # failure in job https://hydra.nixos.org/build/295090973 at 2025-04-22
@@ -1859,7 +1868,6 @@ broken-packages:
   - firefly-example # failure in job https://hydra.nixos.org/build/233259350 at 2023-09-02
   - firestore # failure in job https://hydra.nixos.org/build/295093356 at 2025-04-22
   - first-and-last # failure in job https://hydra.nixos.org/build/233256888 at 2023-09-02
-  - first-class-instances # failure in job https://hydra.nixos.org/build/233207181 at 2023-09-02
   - first-class-patterns # failure in job https://hydra.nixos.org/build/252739352 at 2024-03-16
   - FirstPrelude # failure in job https://hydra.nixos.org/build/233256065 at 2023-09-02
   - fit # failure in job https://hydra.nixos.org/build/233239893 at 2023-09-02
@@ -2038,6 +2046,7 @@ broken-packages:
   - fwgl # failure in job https://hydra.nixos.org/build/233246210 at 2023-09-02
   - fwgl-javascript # broken by fwgl, manually entered here, because it does not appear in transitive-broken.yaml at 2024-07-09
   - fx # failure in job https://hydra.nixos.org/build/295093438 at 2025-04-22
+  - fxpak # failure in job https://hydra.nixos.org/build/309813706 at 2025-10-15
   - g-npm # failure in job https://hydra.nixos.org/build/233215965 at 2023-09-02
   - g4ip # failure in job https://hydra.nixos.org/build/233248315 at 2023-09-02
   - gambler # failure in job https://hydra.nixos.org/build/252732701 at 2024-03-16
@@ -2115,9 +2124,11 @@ broken-packages:
   - gf # failure in job https://hydra.nixos.org/build/233237752 at 2023-09-02
   - GGg # failure in job https://hydra.nixos.org/build/233207289 at 2023-09-02
   - ggtsTC # failure in job https://hydra.nixos.org/build/233229612 at 2023-09-02
+  - gh # failure in job https://hydra.nixos.org/build/311052387 at 2025-11-02
   - gh-labeler # failure in job https://hydra.nixos.org/build/233233139 at 2023-09-02
   - ghc-api-compat # failure in job https://hydra.nixos.org/build/233235008 at 2023-09-02
   - ghc-clippy-plugin # failure in job https://hydra.nixos.org/build/233227499 at 2023-09-02
+  - ghc-compat # failure in job https://hydra.nixos.org/build/311052382 at 2025-11-02
   - ghc-core-smallstep # failure in job https://hydra.nixos.org/build/233209763 at 2023-09-02
   - ghc-corroborate # failure in job https://hydra.nixos.org/build/233223692 at 2023-09-02
   - ghc-definitions-th # failure in job https://hydra.nixos.org/build/233254844 at 2023-09-02
@@ -2126,9 +2137,7 @@ broken-packages:
   - ghc-dup # failure in job https://hydra.nixos.org/build/233203978 at 2023-09-02
   - ghc-events-analyze # failure in job https://hydra.nixos.org/build/233207621 at 2023-09-02
   - ghc-events-parallel # failure in job https://hydra.nixos.org/build/233218757 at 2023-09-02
-  - ghc-gc-hook # failure in job https://hydra.nixos.org/build/233195053 at 2023-09-02
   - ghc-generic-instances # failure in job https://hydra.nixos.org/build/233259298 at 2023-09-02
-  - ghc-hie # failure in job https://hydra.nixos.org/build/307518574 at 2025-09-19
   - ghc-hotswap # failure in job https://hydra.nixos.org/build/233220146 at 2023-09-02
   - ghc-internal # failure in job https://hydra.nixos.org/build/260723678 at 2024-05-25
   - ghc-justdoit # failure in job https://hydra.nixos.org/build/233221884 at 2023-09-02
@@ -2147,7 +2156,6 @@ broken-packages:
   - ghc-time-alloc-prof # failure in job https://hydra.nixos.org/build/233242289 at 2023-09-02
   - ghc-typelits-presburger # failure in job https://hydra.nixos.org/build/307518587 at 2025-09-19
   - ghc-usage # failure in job https://hydra.nixos.org/build/233199565 at 2023-09-02
-  - ghci-dap # failure in job https://hydra.nixos.org/build/307518603 at 2025-09-19
   - ghci-diagrams # failure in job https://hydra.nixos.org/build/233194407 at 2023-09-02
   - ghci-haskeline # failure in job https://hydra.nixos.org/build/233216940 at 2023-09-02
   - ghci-history-parser # failure in job https://hydra.nixos.org/build/233204448 at 2023-09-02
@@ -2169,11 +2177,11 @@ broken-packages:
   - gi-gstapp # failure in job https://hydra.nixos.org/build/253686159 at 2024-03-31
   - gi-gsttag # failure in job https://hydra.nixos.org/build/233197576 at 2023-09-02
   - gi-gtk-declarative # failure in job https://hydra.nixos.org/build/307610571 at 2025-09-19
-  - gi-gtk-hs # failure in job https://hydra.nixos.org/build/307610574 at 2025-09-19
   - gi-gtk4-layer-shell # failure in job https://hydra.nixos.org/build/302803068 at 2025-07-27
   - gi-gtksheet # failure in job https://hydra.nixos.org/build/233211386 at 2023-09-02
   - gi-ibus # failure in job https://hydra.nixos.org/build/233220272 at 2023-09-02
   - gi-keybinder # failure in job https://hydra.nixos.org/build/265273447 at 2024-07-14
+  - gi-notify # failure in job https://hydra.nixos.org/build/311052496 at 2025-11-02
   - gi-webkit # failure in job https://hydra.nixos.org/build/307610609 at 2025-09-19
   - gi-webkit2webextension # failure in job https://hydra.nixos.org/build/254424710 at 2024-03-31
   - gi-webkitwebprocessextension # failure in job https://hydra.nixos.org/build/233227647 at 2023-09-02
@@ -2238,6 +2246,7 @@ broken-packages:
   - glualint # failure in job https://hydra.nixos.org/build/295093757 at 2025-04-22
   - glue # failure in job https://hydra.nixos.org/build/233233587 at 2023-09-02
   - glue-ekg # failure in job https://hydra.nixos.org/build/307518731 at 2025-09-19
+  - gmap # failure in job https://hydra.nixos.org/build/309814029 at 2025-10-15
   - gnutls # failure in job https://hydra.nixos.org/build/252734570 at 2024-03-16
   - goa # failure in job https://hydra.nixos.org/build/233193916 at 2023-09-02
   - goal-core # failure in job https://hydra.nixos.org/build/233242261 at 2023-09-02
@@ -2283,6 +2292,7 @@ broken-packages:
   - GPipe # failure in job https://hydra.nixos.org/build/233202480 at 2023-09-02
   - GPipe-Core # failure in job https://hydra.nixos.org/build/233194426 at 2023-09-02
   - gpmf # failure in job https://hydra.nixos.org/build/233245964 at 2023-09-02
+  - gpu-vulkan-middle # failure in job https://hydra.nixos.org/build/311052831 at 2025-11-02
   - gpx-conduit # failure in job https://hydra.nixos.org/build/233245487 at 2023-09-02
   - grab # failure in job https://hydra.nixos.org/build/252727759 at 2024-03-16
   - graceful # failure in job https://hydra.nixos.org/build/233199650 at 2023-09-02
@@ -2290,7 +2300,6 @@ broken-packages:
   - Grafos # failure in job https://hydra.nixos.org/build/233201494 at 2023-09-02
   - grakn # failure in job https://hydra.nixos.org/build/233218052 at 2023-09-02
   - grammatical-parsers # failure in job https://hydra.nixos.org/build/233252219 at 2023-09-02
-  - granite # failure in job https://hydra.nixos.org/build/307518928 at 2025-09-19
   - graph-matchings # failure in job https://hydra.nixos.org/build/233245821 at 2023-09-02
   - graph-rewriting # failure in job https://hydra.nixos.org/build/233191278 at 2023-09-02
   - graph-serialize # failure in job https://hydra.nixos.org/build/233192162 at 2023-09-02
@@ -2341,7 +2350,6 @@ broken-packages:
   - gstreamer # failure in job https://hydra.nixos.org/build/233239224 at 2023-09-02
   - GTALib # failure in job https://hydra.nixos.org/build/233250568 at 2023-09-02
   - gtk-helpers # failure in job https://hydra.nixos.org/build/233244213 at 2023-09-02
-  - gtk-strut # failure in job https://hydra.nixos.org/build/307610816 at 2025-09-19
   - gtk-toy # failure in job https://hydra.nixos.org/build/233208132 at 2023-09-02
   - gtk2hs-cast-th # failure in job https://hydra.nixos.org/build/233244841 at 2023-09-02
   - gtk2hs-hello # failure in job https://hydra.nixos.org/build/233232522 at 2023-09-02
@@ -2358,6 +2366,7 @@ broken-packages:
   - gyah-bin # failure in job https://hydra.nixos.org/build/233206981 at 2023-09-02
   - gym-hs # failure in job https://hydra.nixos.org/build/307518980 at 2025-09-19
   - gym-http-api # failure in job https://hydra.nixos.org/build/233219968 at 2023-09-02
+  - H # failure in job https://hydra.nixos.org/build/311050009 at 2025-11-02
   - h-booru # failure in job https://hydra.nixos.org/build/233258209 at 2023-09-02
   - h-gpgme # failure in job https://hydra.nixos.org/build/233240826 at 2023-09-02
   - h-reversi # failure in job https://hydra.nixos.org/build/233235617 at 2023-09-02
@@ -2378,6 +2387,7 @@ broken-packages:
   - hackage-mirror # failure in job https://hydra.nixos.org/build/233240852 at 2023-09-02
   - hackage-processing # failure in job https://hydra.nixos.org/build/233243914 at 2023-09-02
   - hackage-proxy # failure in job https://hydra.nixos.org/build/233221269 at 2023-09-02
+  - hackage-publish # failure in job https://hydra.nixos.org/build/311052802 at 2025-11-02
   - hackage-server # failure in job https://hydra.nixos.org/build/233254343 at 2023-09-02
   - hackage-whatsnew # failure in job https://hydra.nixos.org/build/233194915 at 2023-09-02
   - hackage2hwn # failure in job https://hydra.nixos.org/build/233246308 at 2023-09-02
@@ -2393,7 +2403,6 @@ broken-packages:
   - hadoop-rpc # failure in job https://hydra.nixos.org/build/233247222 at 2023-09-02
   - hadoop-streaming # failure in job https://hydra.nixos.org/build/233229895 at 2023-09-02
   - hafar # failure in job https://hydra.nixos.org/build/233231237 at 2023-09-02
-  - haggle # failure in job https://hydra.nixos.org/build/233198660 at 2023-09-02
   - Haggressive # failure in job https://hydra.nixos.org/build/233235332 at 2023-09-02
   - HaGL # failure in job https://hydra.nixos.org/build/234457220 at 2023-09-13
   - hahp # failure in job https://hydra.nixos.org/build/233250101 at 2023-09-02
@@ -2528,7 +2537,6 @@ broken-packages:
   - haskell-go-checkers # failure in job https://hydra.nixos.org/build/234459896 at 2023-09-13
   - haskell-halogen-core # failure in job https://hydra.nixos.org/build/299138362 at 2025-06-23
   - haskell-holes-th # failure in job https://hydra.nixos.org/build/233238457 at 2023-09-02
-  - haskell-igraph # failure in job https://hydra.nixos.org/build/233201209 at 2023-09-02
   - haskell-import-graph # failure in job https://hydra.nixos.org/build/233225328 at 2023-09-02
   - haskell-in-space # failure in job https://hydra.nixos.org/build/233207121 at 2023-09-02
   - haskell-kubernetes # failure in job https://hydra.nixos.org/build/233214499 at 2023-09-02
@@ -2624,7 +2632,8 @@ broken-packages:
   - haven # failure in job https://hydra.nixos.org/build/233216806 at 2023-09-02
   - haverer # failure in job https://hydra.nixos.org/build/233210491 at 2023-09-02
   - hax # failure in job https://hydra.nixos.org/build/233212147 at 2023-09-02
-  - haxl # failure in job https://hydra.nixos.org/build/233243740 at 2023-09-02
+  - haxl-amazonka # failure in job https://hydra.nixos.org/build/310117233 at 2025-10-15
+  - haxl-facebook # failure in job https://hydra.nixos.org/build/310117231 at 2025-10-15
   - haxparse # failure in job https://hydra.nixos.org/build/233205900 at 2023-09-02
   - haxr-th # failure in job https://hydra.nixos.org/build/233250109 at 2023-09-02
   - hayland # failure in job https://hydra.nixos.org/build/233201482 at 2023-09-02
@@ -2742,6 +2751,7 @@ broken-packages:
   - hgearman # failure in job https://hydra.nixos.org/build/233231063 at 2023-09-02
   - hGelf # failure in job https://hydra.nixos.org/build/233203909 at 2023-09-02
   - hgeometric # failure in job https://hydra.nixos.org/build/233197856 at 2023-09-02
+  - hgettext # failure in job https://hydra.nixos.org/build/309814473 at 2025-10-15
   - hgis # failure in job https://hydra.nixos.org/build/233200418 at 2023-09-02
   - hgmp # failure in job https://hydra.nixos.org/build/307519217 at 2025-09-19
   - hgom # failure in job https://hydra.nixos.org/build/233255569 at 2023-09-02
@@ -2786,6 +2796,7 @@ broken-packages:
   - hinotify-conduit # failure in job https://hydra.nixos.org/build/252710760 at 2024-03-16
   - hinquire # failure in job https://hydra.nixos.org/build/233235549 at 2023-09-02
   - hinstaller # failure in job https://hydra.nixos.org/build/233244650 at 2023-09-02
+  - hint-nix # failure in job https://hydra.nixos.org/build/309814463 at 2025-10-15
   - hint-server # failure in job https://hydra.nixos.org/build/233240346 at 2023-09-02
   - hinter # failure in job https://hydra.nixos.org/build/233245954 at 2023-09-02
   - hinterface # failure in job https://hydra.nixos.org/build/233250383 at 2023-09-02
@@ -2822,7 +2833,6 @@ broken-packages:
   - hledger-api # failure in job https://hydra.nixos.org/build/295094278 at 2025-04-22
   - hledger-chart # failure in job https://hydra.nixos.org/build/233205387 at 2023-09-02
   - hledger-diff # failure in job https://hydra.nixos.org/build/233199639 at 2023-09-02
-  - hledger-flow # failure in job https://hydra.nixos.org/build/233252169 at 2023-09-02
   - hledger-irr # failure in job https://hydra.nixos.org/build/233230276 at 2023-09-02
   - hledger-makeitso # failure in job https://hydra.nixos.org/build/233213046 at 2023-09-02
   - hledger-vty # failure in job https://hydra.nixos.org/build/233191782 at 2023-09-02
@@ -2874,7 +2884,6 @@ broken-packages:
   - Hmpf # failure in job https://hydra.nixos.org/build/233212948 at 2023-09-02
   - hmumps # failure in job https://hydra.nixos.org/build/233209336 at 2023-09-02
   - hnetcdf # failure in job https://hydra.nixos.org/build/252727915 at 2024-03-16
-  - hnix-store-db # failure in job https://hydra.nixos.org/build/307610909 at 2025-09-19
   - hnn # failure in job https://hydra.nixos.org/build/233253882 at 2023-09-02
   - hnock # failure in job https://hydra.nixos.org/build/233247419 at 2023-09-02
   - hnop # failure in job https://hydra.nixos.org/build/233214340 at 2023-09-02
@@ -2981,7 +2990,16 @@ broken-packages:
   - hs-onnxruntime-capi # failure in job https://hydra.nixos.org/build/307519371 at 2025-09-19
   - hs-openmoji-data # failure in job https://hydra.nixos.org/build/295094356 at 2025-04-22
   - hs-opentelemetry-awsxray # failure in job https://hydra.nixos.org/build/295094396 at 2025-04-22
+  - hs-opentelemetry-exporter-handle # failure in job https://hydra.nixos.org/build/311053149 at 2025-11-02
+  - hs-opentelemetry-exporter-in-memory # failure in job https://hydra.nixos.org/build/311053165 at 2025-11-02
   - hs-opentelemetry-instrumentation-auto # failure in job https://hydra.nixos.org/build/253678404 at 2024-03-31
+  - hs-opentelemetry-instrumentation-conduit # failure in job https://hydra.nixos.org/build/311053155 at 2025-11-02
+  - hs-opentelemetry-instrumentation-hspec # failure in job https://hydra.nixos.org/build/311053154 at 2025-11-02
+  - hs-opentelemetry-instrumentation-persistent # failure in job https://hydra.nixos.org/build/311053162 at 2025-11-02
+  - hs-opentelemetry-instrumentation-postgresql-simple # failure in job https://hydra.nixos.org/build/311053156 at 2025-11-02
+  - hs-opentelemetry-instrumentation-tasty # failure in job https://hydra.nixos.org/build/311053195 at 2025-11-02
+  - hs-opentelemetry-instrumentation-wai # failure in job https://hydra.nixos.org/build/311053157 at 2025-11-02
+  - hs-opentelemetry-utils-exceptions # failure in job https://hydra.nixos.org/build/311053185 at 2025-11-02
   - hs-pattrans # failure in job https://hydra.nixos.org/build/233230577 at 2023-09-02
   - hs-pgms # failure in job https://hydra.nixos.org/build/233237693 at 2023-09-02
   - hs-pkg-config # failure in job https://hydra.nixos.org/build/233240839 at 2023-09-02
@@ -3154,7 +3172,6 @@ broken-packages:
   - huck # failure in job https://hydra.nixos.org/build/233235354 at 2023-09-02
   - HueAPI # failure in job https://hydra.nixos.org/build/233234528 at 2023-09-02
   - huff # failure in job https://hydra.nixos.org/build/233194394 at 2023-09-02
-  - huffman # failure in job https://hydra.nixos.org/build/233230189 at 2023-09-02
   - HulkImport # failure in job https://hydra.nixos.org/build/233193212 at 2023-09-02
   - hum # failure in job https://hydra.nixos.org/build/233203730 at 2023-09-02
   - human-parse # failure in job https://hydra.nixos.org/build/233212317 at 2023-09-02
@@ -3212,7 +3229,6 @@ broken-packages:
   - hylide # failure in job https://hydra.nixos.org/build/233251582 at 2023-09-02
   - HyloDP # failure in job https://hydra.nixos.org/build/307516072 at 2025-09-19
   - hylolib # failure in job https://hydra.nixos.org/build/233197340 at 2023-09-02
-  - hyper-haskell-server # failure in job https://hydra.nixos.org/build/233244991 at 2023-09-02
   - hyperdrive # failure in job https://hydra.nixos.org/build/233223556 at 2023-09-02
   - hyperfunctions # failure in job https://hydra.nixos.org/build/233195544 at 2023-09-02
   - hypergeomatrix # failure in job https://hydra.nixos.org/build/307610969 at 2025-09-19
@@ -3233,6 +3249,7 @@ broken-packages:
   - ib-api # failure in job https://hydra.nixos.org/build/233223054 at 2023-09-02
   - iban # failure in job https://hydra.nixos.org/build/233236424 at 2023-09-02
   - ical # failure in job https://hydra.nixos.org/build/233200229 at 2023-09-02
+  - ice40-prim # failure in job https://hydra.nixos.org/build/309814812 at 2025-10-15
   - icepeak # failure in job https://hydra.nixos.org/build/233242326 at 2023-09-02
   - icfpc2020-galaxy # failure in job https://hydra.nixos.org/build/233208746 at 2023-09-02
   - IcoGrid # failure in job https://hydra.nixos.org/build/233202038 at 2023-09-02
@@ -3260,7 +3277,6 @@ broken-packages:
   - ihaskell-parsec # failure in job https://hydra.nixos.org/build/233244271 at 2023-09-02
   - ihaskell-plot # failure in job https://hydra.nixos.org/build/233255936 at 2023-09-02
   - ihaskell-widgets # failure in job https://hydra.nixos.org/build/265955663 at 2024-07-14
-  - ihp-openai # failure in job https://hydra.nixos.org/build/307610988 at 2025-09-19
   - illuminate # failure in job https://hydra.nixos.org/build/233219478 at 2023-09-02
   - image-type # failure in job https://hydra.nixos.org/build/233251466 at 2023-09-02
   - imagemagick # failure in job https://hydra.nixos.org/build/233598237 at 2023-09-02
@@ -3291,11 +3307,13 @@ broken-packages:
   - indexed-extras # failure in job https://hydra.nixos.org/build/252739554 at 2024-03-16
   - indextype # failure in job https://hydra.nixos.org/build/233230257 at 2023-09-02
   - indices # failure in job https://hydra.nixos.org/build/233198223 at 2023-09-02
+  - indieweb-algorithms # failure in job https://hydra.nixos.org/build/311459982 at 2025-11-02
   - inf-interval # failure in job https://hydra.nixos.org/build/233193217 at 2023-09-02
   - infer-upstream # failure in job https://hydra.nixos.org/build/233191739 at 2023-09-02
   - infernal # failure in job https://hydra.nixos.org/build/233228571 at 2023-09-02
   - inferno-types # failure in job https://hydra.nixos.org/build/233225968 at 2023-09-02
   - infernu # failure in job https://hydra.nixos.org/build/233238697 at 2023-09-02
+  - Infinitree # failure in job https://hydra.nixos.org/build/311049998 at 2025-11-02
   - infix # failure in job https://hydra.nixos.org/build/233256976 at 2023-09-02
   - inflist # failure in job https://hydra.nixos.org/build/233223710 at 2023-09-02
   - informative # failure in job https://hydra.nixos.org/build/233215837 at 2023-09-02
@@ -3429,7 +3447,6 @@ broken-packages:
   - joy-rewrite # failure in job https://hydra.nixos.org/build/233201002 at 2023-09-02
   - jpeg # failure in job https://hydra.nixos.org/build/233204056 at 2023-09-02
   - js-good-parts # failure in job https://hydra.nixos.org/build/233198958 at 2023-09-02
-  - jsdom-extras # failure in job https://hydra.nixos.org/build/295094819 at 2025-04-22
   - json-api # failure in job https://hydra.nixos.org/build/233198171 at 2023-09-02
   - json-api-lib # failure in job https://hydra.nixos.org/build/233210901 at 2023-09-02
   - json-assertions # failure in job https://hydra.nixos.org/build/233196774 at 2023-09-02
@@ -3462,6 +3479,7 @@ broken-packages:
   - jsonnet # failure in job https://hydra.nixos.org/build/233254884 at 2023-09-02
   - jsonresume # failure in job https://hydra.nixos.org/build/233202350 at 2023-09-02
   - jsonrpc-tinyclient # failure in job https://hydra.nixos.org/build/233214174 at 2023-09-02
+  - jsonschema # failure in job https://hydra.nixos.org/build/311053632 at 2025-11-02
   - jsonschema-gen # failure in job https://hydra.nixos.org/build/233225063 at 2023-09-02
   - jsonsql # failure in job https://hydra.nixos.org/build/233255704 at 2023-09-02
   - jsontsv # failure in job https://hydra.nixos.org/build/233234129 at 2023-09-02
@@ -3581,6 +3599,7 @@ broken-packages:
   - Lambdaya # failure in job https://hydra.nixos.org/build/233227702 at 2023-09-02
   - lame # failure in job https://hydra.nixos.org/build/233250932 at 2023-09-02
   - laminar # failure in job https://hydra.nixos.org/build/241426331 at 2023-11-19
+  - langchain-hs # failure in job https://hydra.nixos.org/build/309815178 at 2025-10-15
   - language-asn # failure in job https://hydra.nixos.org/build/233227929 at 2023-09-02
   - language-c-comments # failure in job https://hydra.nixos.org/build/233234112 at 2023-09-02
   - language-c-inline # failure in job https://hydra.nixos.org/build/233245990 at 2023-09-02
@@ -3616,7 +3635,6 @@ broken-packages:
   - language-webidl # failure in job https://hydra.nixos.org/build/233194656 at 2023-09-02
   - laop # failure in job https://hydra.nixos.org/build/233204106 at 2023-09-02
   - large-anon # base >=4.14 && <4.19, ghc >=8.10 && <9.7 https://hydra.nixos.org/build/295428414
-  - large-records # failure in job https://hydra.nixos.org/build/295094961 at 2025-04-22
   - LargeCardinalHierarchy # failure in job https://hydra.nixos.org/build/233250339 at 2023-09-02
   - Lastik # failure in job https://hydra.nixos.org/build/233194460 at 2023-09-02
   - latest-npm-version # failure in job https://hydra.nixos.org/build/233239108 at 2023-09-02
@@ -3738,6 +3756,7 @@ broken-packages:
   - line-indexed-cursor # failure in job https://hydra.nixos.org/build/233210607 at 2023-09-02
   - linear-accelerate # failure in job https://hydra.nixos.org/build/296049888 at 2025-05-02
   - linear-algebra-cblas # failure in job https://hydra.nixos.org/build/233239710 at 2023-09-02
+  - linear-core-prototype # failure in job https://hydra.nixos.org/build/311053837 at 2025-11-02
   - linear-maps # failure in job https://hydra.nixos.org/build/233258332 at 2023-09-02
   - linear-socket # failure in job https://hydra.nixos.org/build/233192053 at 2023-09-02
   - linear-vect # failure in job https://hydra.nixos.org/build/233252054 at 2023-09-02
@@ -3805,6 +3824,7 @@ broken-packages:
   - located # failure in job https://hydra.nixos.org/build/233234945 at 2023-09-02
   - located-monad-logger # failure in job https://hydra.nixos.org/build/233194551 at 2023-09-02
   - loch # failure in job https://hydra.nixos.org/build/233248876 at 2023-09-02
+  - log # failure in job https://hydra.nixos.org/build/311053883 at 2025-11-02
   - log-effect # failure in job https://hydra.nixos.org/build/233211329 at 2023-09-02
   - log-warper # failure in job https://hydra.nixos.org/build/233220417 at 2023-09-02
   - log2json # failure in job https://hydra.nixos.org/build/233211819 at 2023-09-02
@@ -3857,7 +3877,6 @@ broken-packages:
   - lucid-aria # failure in job https://hydra.nixos.org/build/233231489 at 2023-09-02
   - lucid-hyperscript # failure in job https://hydra.nixos.org/build/233191616 at 2023-09-02
   - lucid2-htmx # failure in job https://hydra.nixos.org/build/233196674 at 2023-09-02
-  - luhn # failure in job https://hydra.nixos.org/build/233237661 at 2023-09-02
   - luis-client # failure in job https://hydra.nixos.org/build/233244540 at 2023-09-02
   - luka # failure in job https://hydra.nixos.org/build/233235403 at 2023-09-02
   - luminance # failure in job https://hydra.nixos.org/build/233233551 at 2023-09-02
@@ -4203,6 +4222,7 @@ broken-packages:
   - multiwalk # failure in job https://hydra.nixos.org/build/295095540 at 2025-04-22
   - Munkres # failure in job https://hydra.nixos.org/build/233237379 at 2023-09-02
   - muon # failure in job https://hydra.nixos.org/build/233238364 at 2023-09-02
+  - murder # failure in job https://hydra.nixos.org/build/309815678 at 2025-10-15
   - murmur # failure in job https://hydra.nixos.org/build/233244309 at 2023-09-02
   - music-util # failure in job https://hydra.nixos.org/build/233234440 at 2023-09-02
   - musicScroll # failure in job https://hydra.nixos.org/build/233197933 at 2023-09-02
@@ -4257,6 +4277,7 @@ broken-packages:
   - NaturalLanguageAlphabets # failure in job https://hydra.nixos.org/build/245539294 at 2024-01-02
   - NaturalSort # failure in job https://hydra.nixos.org/build/233213239 at 2023-09-02
   - naver-translate # failure in job https://hydra.nixos.org/build/233225934 at 2023-09-02
+  - nbparts # failure in job https://hydra.nixos.org/build/309815729 at 2025-10-15
   - nbt # failure in job https://hydra.nixos.org/build/233253509 at 2023-09-02
   - ncurses # failure in job https://hydra.nixos.org/build/233238895 at 2023-09-02
   - ndjson-conduit # failure in job https://hydra.nixos.org/build/295095605 at 2025-04-22
@@ -4396,7 +4417,6 @@ broken-packages:
   - nyan-interpolation-core # failure in job https://hydra.nixos.org/build/295095752 at 2025-04-22
   - nylas # failure in job https://hydra.nixos.org/build/233193540 at 2023-09-02
   - o-clock # failure in job https://hydra.nixos.org/build/307520711 at 2025-09-19
-  - oalg-base # failure in job https://hydra.nixos.org/build/295095765 at 2025-04-22
   - oanda-rest-api # failure in job https://hydra.nixos.org/build/233250190 at 2023-09-02
   - oasis-xrd # failure in job https://hydra.nixos.org/build/233199264 at 2023-09-02
   - oauthenticated # failure in job https://hydra.nixos.org/build/233257682 at 2023-09-02
@@ -4418,6 +4438,7 @@ broken-packages:
   - oi # failure in job https://hydra.nixos.org/build/233190838 at 2023-09-02
   - okapi # failure in job https://hydra.nixos.org/build/233193822 at 2023-09-02
   - old-version # failure in job https://hydra.nixos.org/build/233198538 at 2023-09-02
+  - ollama-holes-plugin # failure in job https://hydra.nixos.org/build/309815905 at 2025-10-15
   - om-actor # failure in job https://hydra.nixos.org/build/233231027 at 2023-09-02
   - om-http # failure in job https://hydra.nixos.org/build/233245328 at 2023-09-02
   - om-http-logging # failure in job https://hydra.nixos.org/build/233218069 at 2023-09-02
@@ -4872,7 +4893,6 @@ broken-packages:
   - polysemy-log-co # failure in job https://hydra.nixos.org/build/307521087 at 2025-09-19
   - polysemy-managed # failure in job https://hydra.nixos.org/build/233221190 at 2023-09-02
   - polysemy-optics # failure in job https://hydra.nixos.org/build/233219159 at 2023-09-02
-  - polysemy-readline # failure in job https://hydra.nixos.org/build/233219007 at 2023-09-02
   - polysemy-req # failure in job https://hydra.nixos.org/build/233224435 at 2023-09-02
   - polysemy-several # failure in job https://hydra.nixos.org/build/233216921 at 2023-09-02
   - polysemy-socket # failure in job https://hydra.nixos.org/build/233195754 at 2023-09-02
@@ -5091,7 +5111,6 @@ broken-packages:
   - pushbullet-types # failure in job https://hydra.nixos.org/build/233242388 at 2023-09-02
   - pusher-haskell # failure in job https://hydra.nixos.org/build/233201954 at 2023-09-02
   - pusher-ws # failure in job https://hydra.nixos.org/build/233204133 at 2023-09-02
-  - pushme # failure in job https://hydra.nixos.org/build/233212481 at 2023-09-02
   - pushover # failure in job https://hydra.nixos.org/build/252739908 at 2024-03-16
   - putlenses # failure in job https://hydra.nixos.org/build/233197372 at 2023-09-02
   - puzzle-draw # failure in job https://hydra.nixos.org/build/233204953 at 2023-09-02
@@ -5224,6 +5243,7 @@ broken-packages:
   - reanimate-svg # failure in job https://hydra.nixos.org/build/233242271 at 2023-09-02
   - reason-export # failure in job https://hydra.nixos.org/build/233212942 at 2023-09-02
   - reasonable-lens # failure in job https://hydra.nixos.org/build/233233111 at 2023-09-02
+  - rebound # failure in job https://hydra.nixos.org/build/311055152 at 2025-11-02
   - rec-smallarray # failure in job https://hydra.nixos.org/build/233258592 at 2023-09-02
   - record # failure in job https://hydra.nixos.org/build/233242406 at 2023-09-02
   - record-dot-preprocessor # failure in job https://hydra.nixos.org/build/307521455 at 2025-09-19
@@ -5270,6 +5290,7 @@ broken-packages:
   - reflex-sdl2 # failure in job https://hydra.nixos.org/build/307521569 at 2025-09-19
   - reflex-transformers # failure in job https://hydra.nixos.org/build/233243647 at 2023-09-02
   - reflex-vty # failure in job https://hydra.nixos.org/build/295096544 at 2025-04-22
+  - reform-blaze # failure in job https://hydra.nixos.org/build/309816655 at 2025-10-15
   - reform-hamlet # failure in job https://hydra.nixos.org/build/233230013 at 2023-09-02
   - reform-hsp # failure in job https://hydra.nixos.org/build/233228737 at 2023-09-02
   - reform-lucid # failure in job https://hydra.nixos.org/build/233257636 at 2023-09-02
@@ -5281,7 +5302,6 @@ broken-packages:
   - regex-do # failure in job https://hydra.nixos.org/build/307521538 at 2025-09-19
   - regex-generator # failure in job https://hydra.nixos.org/build/233239502 at 2023-09-02
   - regex-parsec # failure in job https://hydra.nixos.org/build/233223781 at 2023-09-02
-  - regex-pcre2 # failure in job https://hydra.nixos.org/build/295096563 at 2025-04-22
   - regex-posix-unittest # failure in job https://hydra.nixos.org/build/233249685 at 2023-09-02
   - regex-tdfa-pipes # failure in job https://hydra.nixos.org/build/233247416 at 2023-09-02
   - regex-tdfa-quasiquoter # failure in job https://hydra.nixos.org/build/233234166 at 2023-09-02
@@ -5311,7 +5331,6 @@ broken-packages:
   - relational-query-postgresql-pure # failure in job https://hydra.nixos.org/build/296063076 at 2025-05-02
   - relevant-time # failure in job https://hydra.nixos.org/build/233190794 at 2023-09-02
   - reload # failure in job https://hydra.nixos.org/build/233212925 at 2023-09-02
-  - relocant # failure in job https://hydra.nixos.org/build/295096588 at 2025-04-22
   - remark # failure in job https://hydra.nixos.org/build/233240981 at 2023-09-02
   - remarks # failure in job https://hydra.nixos.org/build/233256889 at 2023-09-02
   - rematch-text # failure in job https://hydra.nixos.org/build/307521518 at 2025-09-19
@@ -5394,6 +5413,8 @@ broken-packages:
   - RLP # failure in job https://hydra.nixos.org/build/233222770 at 2023-09-02
   - rme-what4 # failure in job https://hydra.nixos.org/build/307611281 at 2025-09-19
   - robin # failure in job https://hydra.nixos.org/build/233205010 at 2023-09-02
+  - robin-hood-profit # failure in job https://hydra.nixos.org/build/309816727 at 2025-10-15
+  - roboservant # failure in job https://hydra.nixos.org/build/309816799 at 2025-10-15
   - robots-txt # failure in job https://hydra.nixos.org/build/233243090 at 2023-09-02
   - roc-cluster # failure in job https://hydra.nixos.org/build/233202517 at 2023-09-02
   - roguestar # failure in job https://hydra.nixos.org/build/233233677 at 2023-09-02
@@ -5471,6 +5492,7 @@ broken-packages:
   - sandwatch # failure in job https://hydra.nixos.org/build/295096742 at 2025-04-22
   - sandwich-contexts # failure in job https://hydra.nixos.org/build/282178661 at 2024-12-23
   - sarasvati # failure in job https://hydra.nixos.org/build/233208235 at 2023-09-02
+  - sasha # failure in job https://hydra.nixos.org/build/309816856 at 2025-10-15
   - sat # failure in job https://hydra.nixos.org/build/233225713 at 2023-09-02
   - sat-simple # failure in job https://hydra.nixos.org/build/307521671 at 2025-09-19
   - satchmo-backends # failure in job https://hydra.nixos.org/build/233228506 at 2023-09-02
@@ -5499,6 +5521,7 @@ broken-packages:
   - scotty-blaze # failure in job https://hydra.nixos.org/build/233190960 at 2023-09-02
   - scotty-cookie # failure in job https://hydra.nixos.org/build/252738988 at 2024-03-16
   - scotty-format # failure in job https://hydra.nixos.org/build/233249643 at 2023-09-02
+  - scotty-haxl # failure in job https://hydra.nixos.org/build/311055399 at 2025-11-02
   - scotty-path-normalizer # failure in job https://hydra.nixos.org/build/252738625 at 2024-03-16
   - scotty-resource # failure in job https://hydra.nixos.org/build/233258457 at 2023-09-02
   - scotty-rest # failure in job https://hydra.nixos.org/build/233209040 at 2023-09-02
@@ -5586,6 +5609,7 @@ broken-packages:
   - servant-generic # failure in job https://hydra.nixos.org/build/233211338 at 2023-09-02
   - servant-github # failure in job https://hydra.nixos.org/build/233231566 at 2023-09-02
   - servant-github-webhook # failure in job https://hydra.nixos.org/build/233234237 at 2023-09-02
+  - servant-haxl-client # failure in job https://hydra.nixos.org/build/311055508 at 2025-11-02
   - servant-htmx # failure in job https://hydra.nixos.org/build/233214786 at 2023-09-02
   - servant-http-streams # failure in job https://hydra.nixos.org/build/307611341 at 2025-09-19
   - servant-http2-client # failure in job https://hydra.nixos.org/build/260189694 at 2024-05-19
@@ -5684,7 +5708,6 @@ broken-packages:
   - shoap # failure in job https://hydra.nixos.org/build/233207909 at 2023-09-02
   - shopify # failure in job https://hydra.nixos.org/build/233221330 at 2023-09-02
   - shortbytestring # failure in job https://hydra.nixos.org/build/233216026 at 2023-09-02
-  - shortcut-links # failure in job https://hydra.nixos.org/build/233217442 at 2023-09-02
   - shorten-strings # failure in job https://hydra.nixos.org/build/233247947 at 2023-09-02
   - show-prettyprint # failure in job https://hydra.nixos.org/build/233213552 at 2023-09-02
   - show-type # failure in job https://hydra.nixos.org/build/233225756 at 2023-09-02
@@ -5763,7 +5786,6 @@ broken-packages:
   - sized-grid # failure in job https://hydra.nixos.org/build/233239056 at 2023-09-02
   - sized-types # failure in job https://hydra.nixos.org/build/233244977 at 2023-09-02
   - sized-vector # failure in job https://hydra.nixos.org/build/233227779 at 2023-09-02
-  - sizes # failure in job https://hydra.nixos.org/build/307521947 at 2025-09-19
   - sjsp # failure in job https://hydra.nixos.org/build/233225141 at 2023-09-02
   - SJW # failure in job https://hydra.nixos.org/build/233209689 at 2023-09-02
   - skeletal-set # failure in job https://hydra.nixos.org/build/233254711 at 2023-09-02
@@ -5850,7 +5872,6 @@ broken-packages:
   - snaplet-sqlite-simple # failure in job https://hydra.nixos.org/build/252738602 at 2024-03-16
   - snaplet-typed-sessions # failure in job https://hydra.nixos.org/build/252724459 at 2024-03-16
   - snappy-conduit # failure in job https://hydra.nixos.org/build/233196865 at 2023-09-02
-  - snappy-hs # failure in job https://hydra.nixos.org/build/307522028 at 2025-09-19
   - snelstart-import # failure in job https://hydra.nixos.org/build/295097114 at 2025-04-22
   - SNet # failure in job https://hydra.nixos.org/build/233225638 at 2023-09-02
   - snipcheck # failure in job https://hydra.nixos.org/build/233214417 at 2023-09-02
@@ -5896,7 +5917,6 @@ broken-packages:
   - SpatialMath # failure in job https://hydra.nixos.org/build/237243985 at 2023-10-21
   - special-functors # failure in job https://hydra.nixos.org/build/233215268 at 2023-09-02
   - special-keys # failure in job https://hydra.nixos.org/build/233191988 at 2023-09-02
-  - species # failure in job https://hydra.nixos.org/build/307522048 at 2025-09-19
   - spectacle # failure in job https://hydra.nixos.org/build/233207488 at 2023-09-02
   - speculation # failure in job https://hydra.nixos.org/build/233211559 at 2023-09-02
   - sphinx-cli # failure in job https://hydra.nixos.org/build/295097187 at 2025-04-22
@@ -5926,6 +5946,7 @@ broken-packages:
   - sqlcipher # failure in job https://hydra.nixos.org/build/233259217 at 2023-09-02
   - sqlcli # failure in job https://hydra.nixos.org/build/252719841 at 2024-03-16
   - sqlite # failure in job https://hydra.nixos.org/build/233215839 at 2023-09-02
+  - sqlite-easy # failure in job https://hydra.nixos.org/build/309817187 at 2025-10-15
   - sqlite-simple-errors # failure in job https://hydra.nixos.org/build/233232977 at 2023-09-02
   - sqlvalue-list # failure in job https://hydra.nixos.org/build/233197313 at 2023-09-02
   - sqsd-local # failure in updateAutotoolsGnuConfigScriptsPhase in job https://hydra.nixos.org/build/237237046 at 2023-10-21
@@ -6038,6 +6059,7 @@ broken-packages:
   - streamly-binary # failure in job https://hydra.nixos.org/build/233240602 at 2023-09-02
   - streamly-cassava # failure in job https://hydra.nixos.org/build/233237843 at 2023-09-02
   - streamly-examples # failure in job https://hydra.nixos.org/build/252721153 at 2024-03-16
+  - streamly-filepath # failure in job https://hydra.nixos.org/build/309817285 at 2025-10-15
   - streamly-fsevents # failure in job https://hydra.nixos.org/build/307611411 at 2025-09-19
   - streamly-lmdb # failure in job https://hydra.nixos.org/build/252731414 at 2024-03-16
   - streamly-lz4 # failure in job https://hydra.nixos.org/build/233219321 at 2023-09-02
@@ -6153,6 +6175,7 @@ broken-packages:
   - syntactic # failure in job https://hydra.nixos.org/build/233210123 at 2023-09-02
   - syntax-trees # failure in job https://hydra.nixos.org/build/233209576 at 2023-09-02
   - syntax-trees-fork-bairyn # failure in job https://hydra.nixos.org/build/233216989 at 2023-09-02
+  - SyntaxMacros # failure in job https://hydra.nixos.org/build/309811610 at 2025-10-15
   - synthesizer # failure in job https://hydra.nixos.org/build/233259139 at 2023-09-02
   - synthesizer-filter # failure in job https://hydra.nixos.org/build/252718079 at 2024-03-16
   - synthesizer-llvm # failure in job https://hydra.nixos.org/build/266355681 at 2024-07-14
@@ -6254,6 +6277,7 @@ broken-packages:
   - tempo # failure in job https://hydra.nixos.org/build/252731680 at 2024-03-16
   - tempodb # failure in job https://hydra.nixos.org/build/233205994 at 2023-09-02
   - temporal-csound # failure in job https://hydra.nixos.org/build/243818090 at 2024-01-01
+  - temporal-sdk-core # failure in job https://hydra.nixos.org/build/311056095 at 2025-11-02
   - tempus # failure in job https://hydra.nixos.org/build/233245670 at 2023-09-02
   - ten # failure in job https://hydra.nixos.org/build/233216705 at 2023-09-02
   - tensor # failure in job https://hydra.nixos.org/build/233233707 at 2023-09-02
@@ -6312,7 +6336,6 @@ broken-packages:
   - text-register-machine # failure in job https://hydra.nixos.org/build/233239758 at 2023-09-02
   - text-render # failure in job https://hydra.nixos.org/build/252713121 at 2024-03-16
   - text-replace # failure in job https://hydra.nixos.org/build/252727577 at 2024-03-16
-  - text-rope-zipper # failure in job https://hydra.nixos.org/build/307522479 at 2025-09-19
   - text-stream-decode # failure in job https://hydra.nixos.org/build/233237533 at 2023-09-02
   - text-trie # failure in job https://hydra.nixos.org/build/233231841 at 2023-09-02
   - text-utf7 # failure in job https://hydra.nixos.org/build/233254420 at 2023-09-02
@@ -6387,6 +6410,7 @@ broken-packages:
   - timecalc # failure in job https://hydra.nixos.org/build/233207970 at 2023-09-02
   - timemap # failure in job https://hydra.nixos.org/build/233250038 at 2023-09-02
   - timeout # failure in job https://hydra.nixos.org/build/233193307 at 2023-09-02
+  - timeout-snooze # failure in job https://hydra.nixos.org/build/309817674 at 2025-10-15
   - timeout-with-results # failure in job https://hydra.nixos.org/build/233212129 at 2023-09-02
   - timeparsers # failure in job https://hydra.nixos.org/build/233250789 at 2023-09-02
   - TimePiece # failure in job https://hydra.nixos.org/build/233213400 at 2023-09-02
@@ -6569,8 +6593,9 @@ broken-packages:
   - typed-admin # failure in job https://hydra.nixos.org/build/296063081 at 2025-05-02
   - typed-digits # failure in job https://hydra.nixos.org/build/233198266 at 2023-09-02
   - typed-encoding # failure in job https://hydra.nixos.org/build/233208093 at 2023-09-02
+  - typed-gui # failure in job https://hydra.nixos.org/build/309817848 at 2025-10-15
   - typed-process-effectful # failure in job https://hydra.nixos.org/build/236684332 at 2023-10-04
-  - typed-protocols # failure in job https://hydra.nixos.org/build/307522744 at 2025-09-19
+  - typed-protocols-doc # failure in job https://hydra.nixos.org/build/311460024 at 2025-11-02
   - typed-session # failure in job https://hydra.nixos.org/build/270089993 at 2024-08-31
   - typed-session-state-algorithm # failure in job https://hydra.nixos.org/build/273462641 at 2024-10-01
   - typed-spreadsheet # failure in job https://hydra.nixos.org/build/233248967 at 2023-09-02
@@ -6641,7 +6666,6 @@ broken-packages:
   - universal-binary # failure in job https://hydra.nixos.org/build/233240583 at 2023-09-02
   - universe-instances-base # failure in job https://hydra.nixos.org/build/233197845 at 2023-09-02
   - universe-instances-trans # failure in job https://hydra.nixos.org/build/233235623 at 2023-09-02
-  - universum # failure in job https://hydra.nixos.org/build/307522842 at 2025-09-19
   - unix-handle # failure in job https://hydra.nixos.org/build/233233273 at 2023-09-02
   - unix-memory # failure in job https://hydra.nixos.org/build/252735802 at 2024-03-16
   - unix-process-conduit # failure in job https://hydra.nixos.org/build/233191509 at 2023-09-02
@@ -6703,7 +6727,6 @@ broken-packages:
   - util-primitive # failure in job https://hydra.nixos.org/build/233258861 at 2023-09-02
   - uu-cco # failure in job https://hydra.nixos.org/build/233259027 at 2023-09-02
   - uuagc-bootstrap # failure in job https://hydra.nixos.org/build/233254123 at 2023-09-02
-  - uuagc-cabal # failure in job https://hydra.nixos.org/build/307522924 at 2025-09-19
   - uuagc-diagrams # failure in job https://hydra.nixos.org/build/233247645 at 2023-09-02
   - uuid-aeson # failure in job https://hydra.nixos.org/build/233219695 at 2023-09-02
   - uusi # failure in job https://hydra.nixos.org/build/307522902 at 2025-09-19
@@ -6846,6 +6869,7 @@ broken-packages:
   - warc # failure in job https://hydra.nixos.org/build/233215734 at 2023-09-02
   - warp-dynamic # failure in job https://hydra.nixos.org/build/233220479 at 2023-09-02
   - warp-static # failure in job https://hydra.nixos.org/build/233239581 at 2023-09-02
+  - warp-tls-simple # failure in job https://hydra.nixos.org/build/309818122 at 2025-10-15
   - warp-tls-uid # failure in job https://hydra.nixos.org/build/252725883 at 2024-03-16
   - wasm # failure in job https://hydra.nixos.org/build/233249877 at 2023-09-02
   - watcher # failure in job https://hydra.nixos.org/build/233245056 at 2023-09-02
@@ -6907,6 +6931,7 @@ broken-packages:
   - wild-bind-indicator # failure in job https://hydra.nixos.org/build/307611565 at 2025-09-19
   - willow # failure in job https://hydra.nixos.org/build/233215807 at 2023-09-02
   - windns # failure in job https://hydra.nixos.org/build/233242724 at 2023-09-02
+  - winio # failure in job https://hydra.nixos.org/build/309818237 at 2025-10-15
   - wire-streams # failure in job https://hydra.nixos.org/build/299186735 at 2025-06-23
   - wireguard-hs # failure in job https://hydra.nixos.org/build/233218722 at 2023-09-02
   - wires # failure in job https://hydra.nixos.org/build/233192321 at 2023-09-02
@@ -6995,7 +7020,6 @@ broken-packages:
   - xml-conduit-parse # failure in job https://hydra.nixos.org/build/233200360 at 2023-09-02
   - xml-conduit-selectors # failure in job https://hydra.nixos.org/build/233223331 at 2023-09-02
   - xml-conduit-stylist # failure in job https://hydra.nixos.org/build/233226507 at 2023-09-02
-  - xml-conduit-writer # failure in job https://hydra.nixos.org/build/307611574 at 2025-09-19
   - xml-extractors # failure in job https://hydra.nixos.org/build/252718569 at 2024-03-16
   - xml-html-conduit-lens # failure in job https://hydra.nixos.org/build/233238471 at 2023-09-02
   - xml-indexed-cursor # failure in job https://hydra.nixos.org/build/295098303 at 2025-04-22
@@ -7021,7 +7045,6 @@ broken-packages:
   - xmonad-vanessa # failure in job https://hydra.nixos.org/build/233214303 at 2023-09-02
   - xmonad-wallpaper # failure in job https://hydra.nixos.org/build/233217165 at 2023-09-02
   - xmonad-windownames # failure in job https://hydra.nixos.org/build/233258043 at 2023-09-02
-  - xnobar # failure in job https://hydra.nixos.org/build/302807518 at 2025-07-27
   - xorshift-plus # failure in job https://hydra.nixos.org/build/233255176 at 2023-09-02
   - Xorshift128Plus # failure in job https://hydra.nixos.org/build/233225679 at 2023-09-02
   - xsact # failure in job https://hydra.nixos.org/build/233221821 at 2023-09-02
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 977e75c6aa59..8fa57f8401d9 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -27,8 +27,6 @@
 default-package-overrides:
   - chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
   - extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
-  # 2025-07-26: HLS doesn't support hiedb >= 0.7 yet
-  - hiedb < 0.7
   # 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
   # https://github.com/haskell-nix/hnix/pull/1112
   - hnix-store-core < 0.7
@@ -40,11 +38,15 @@ default-package-overrides:
   # liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
   - liquidhaskell == 0.9.10.*
   - liquidhaskell-boot == 0.9.10.*
+  # Needs to match microlens == 0.4.* in Stackage LTS 24
+  - microlens-pro < 0.2.0.4
+  # We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
+  # this no longer works with later versions.
+  - pandoc-crossref == 0.3.21
 # keep-sorted end
 
 # keep-sorted start skip_lines=1 case=no numeric=yes
 extra-packages:
-  - algebraic-graphs < 0.7              # 2023-08-14: Needed for building weeder < 2.6.0
   - ansi-wl-pprint >= 0.6 && < 0.7      # 2025-07-07: used by gren <= 0.5.4
   - attoparsec == 0.13.*                # 2022-02-23: Needed to compile elm for now
   - Cabal == 3.10.*
@@ -52,8 +54,6 @@ extra-packages:
   - Cabal == 3.14.*
   - Cabal == 3.16.*                     # version required for cabal-install and other packages
   - cabal-add == 0.1                    # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it.
-  - Cabal-syntax == 3.6.*               # Dummy package that ensures packages depending on Cabal-syntax can work for Cabal < 3.8
-  - Cabal-syntax == 3.8.*               # version required for ormolu and fourmolu on ghc 9.0
   - Cabal-syntax == 3.10.*
   - Cabal-syntax == 3.12.*
   - Cabal-syntax == 3.14.*
@@ -62,22 +62,17 @@ extra-packages:
   - fourmolu == 0.14.0.0                # 2023-11-13: for ghc-lib-parser 9.6 compat
   - fourmolu == 0.15.0.0                # 2025-09-21: for ghc-lib-parser 9.8 compat
   - fuzzyset == 0.2.4                   # 2023-12-20: Needed for building postgrest > 10
-  - ghc-exactprint == 0.6.*             # 2022-12-12: needed for GHC < 9.2
-  - ghc-exactprint == 1.5.*             # 2023-03-30: needed for GHC == 9.2
   - ghc-exactprint == 1.6.*             # 2023-03-30: needed for GHC == 9.4
   - ghc-exactprint == 1.7.*             # 2025-03-09: needed for GHC == 9.6
   - ghc-exactprint == 1.8.*             # 2024-05-20: needed for GHC == 9.8
   - ghc-exactprint == 1.9.*             # 2024-08-27: needed for GHC == 9.10
-  - ghc-lib == 9.2.*                    # 2022-02-17: preserve for GHC 8.10, 9.0
-  - ghc-lib == 9.6.*                    # 2022-02-17: preserve for GHC 9.2, 9.4
+  - ghc-exactprint == 1.12.*            # 2025-10-15: needed for GHC == 9.12
+  - ghc-lib == 9.6.*                    # 2022-02-17: preserve for GHC 9.4
   - ghc-lib == 9.10.*                   # 2024-12-30: preserve for GHC 9.10/ghc-tags 1.9
-  - ghc-lib-parser == 9.2.*             # 2022-02-17: preserve for GHC 8.10, 9.0
-  - ghc-lib-parser == 9.6.*             # 2024-05-19: preserve for GHC 9.2, 9.4
+  - ghc-lib-parser == 9.6.*             # 2024-05-19: preserve for GHC 9.4
   - ghc-lib-parser == 9.8.*            # 2024-12-26: preserve for GHC 9.6, 9.8
-  - ghc-lib-parser-ex == 9.2.*          # 2022-07-13: preserve for GHC 8.10, 9.0
-  - ghc-lib-parser-ex == 9.6.*          # 2024-05-19: preserve for GHC 9.2, 9.4
+  - ghc-lib-parser-ex == 9.6.*          # 2024-05-19: preserve for GHC 9.4
   - ghc-lib-parser-ex == 9.8.*         # 2024-12-26: preserve for GHC 9.6, 9.8
-  - ghc-tags == 1.5.*                   # 2023-02-18: preserve for ghc-lib == 9.2.*
   - ghc-tags == 1.7.*                   # 2023-02-18: preserve for ghc-lib == 9.6.*
   - ghc-tags == 1.8.*                   # 2023-02-18: preserve for ghc-lib == 9.8.*
   - ghc-typelits-natnormalise < 0.8     # 2025-09-15: Stackage is stuck at 0.7.10
@@ -92,31 +87,21 @@ extra-packages:
   - hlint == 3.6.*                      # 2025-04-14: needed for hls with ghc-lib-parser 9.6
   - hlint == 3.8.*                      # 2025-09-21: needed for hls with ghc-lib-parser 9.8
   - hpack == 0.38.1                     # 2025-09-18: to match exact version upstream stack-3.7.1 uses
-  - hspec-megaparsec == 2.2.0           # 2023-11-18: Latest version compatible with ghc 9.0
   - language-javascript == 0.7.0.0      # required by purescript
   - network-run == 0.4.0                # 2024-10-20: for GHC 9.10/network == 3.1.*
-  - ormolu == 0.5.2.0                   # 2023-08-08: preserve for ghc 9.0
   - ormolu == 0.7.2.0                   # 2023-11-13: for ghc-lib-parser 9.6 compat
   - ormolu == 0.7.4.0                   # 2023-09-21: for ghc-lib-parser 9.8 compat
-  - os-string == 1.*                    # 2025-07-30: dummy package we need for pre os-string GHCs
   - path == 0.9.5                       # 2025-09-21: Pin for hls on ghc 9.4
   - postgresql-binary < 0.14            # 2025-01-19: Needed for building postgrest
-  - primitive-unlifted == 0.1.3.1       # 2024-03-16: preserve for ghc 9.2
-  - retrie < 1.2.0.0                    # 2022-12-30: preserve for ghc < 9.2
   - shake-cabal < 0.2.2.3               # 2023-07-01: last version to support Cabal 3.6.*
   - ShellCheck == 0.9.0                 # 2024-03-21: pinned by haskell-ci
   - simple-get-opt < 0.5                # 2025-05-01: for crux-0.7.2
-  - stylish-haskell == 0.14.4.0         # 2022-09-19: preserve for ghc 9.0
   - stylish-haskell == 0.14.5.0         # 2025-04-14: needed for hls with ghc-lib 9.6
   - stylish-haskell == 0.14.6.0         # 2025-09-21: needed for hls with ghc-lib 9.8
   - stylish-haskell == 0.15.0.1         # 2025-04-14: needed for hls with ghc-lib 9.10
-  - tar == 0.6.0.0                      # 2025-02-08: last version to not require os-string (which can't be built with GHC < 9.2)
   - tar == 0.6.3.0                      # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6)
   - text-builder < 1                    # 2025-08-27: Needed for building postgrest
   - text-builder-dev < 0.4              # 2025-08-27: Needed for building postgrest
-  - text-metrics < 0.3.3                # 2025-02-08: >= 0.3.3 uses GHC2021
-  - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
-  - weeder == 2.4.*                     # 2023-02-02: preserve for GHC 9.2.*
 # keep-sorted end
 
 # keep-sorted start skip_lines=1 case=no
@@ -143,14 +128,12 @@ package-maintainers:
     - generics-sop
     - ghcjs-base
     - ghcjs-dom
-    - ghcjs-dom-hello
     - ghcjs-dom-javascript
     - ghcjs-dom-jsaddle
     - haveibeenpwned
     - jsaddle
     - jsaddle-clib
     - jsaddle-dom
-    - jsaddle-hello
     - jsaddle-warp
     - jsaddle-wkwebview
     - json-sop
@@ -380,6 +363,11 @@ package-maintainers:
     - amazonka
     - libssh2
     - sitemap
+    - ihp-openai
+    - ihp
+    - ihp-ide
+    - ihp-migrate
+    - ihp-postgresql-simple-extra
   ncfavier:
     - Agda
     - agda2hs
@@ -656,6 +644,7 @@ package-maintainers:
   turion:
     - Agda
     - cabal-gild
+    - clay
     - dunai
     - essence-of-live-coding
     - essence-of-live-coding-gloss
@@ -667,6 +656,7 @@ package-maintainers:
     - monad-bayes
     - monad-schedule
     - pulse-simple
+    - openapi3-code-generator
     - rhine
     - rhine-gloss
     - simple-affine-space
@@ -695,7 +685,6 @@ unsupported-platforms:
   Codec-Image-DevIL:                            [ platforms.darwin ] # depends on mesa
   coinor-clp:                                   [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp
   cut-the-crap:                                 [ platforms.darwin ]
-  emanote:                                      [ x86_64-darwin ] # Depends on stork which is broken on macOS sdk < 10.14
   essence-of-live-coding-PortMidi:              [ platforms.darwin ]
   Euterpea:                                     [ platforms.darwin ]
   follow-file:                                  [ platforms.darwin ]
@@ -932,7 +921,9 @@ dont-distribute-packages:
   - yices-painless
 
   # These packages don’t build because they use deprecated libsoup 2.4 versions.
+  - jsaddle-hello
   - jsaddle-webkit2gtk
+  - ghcjs-dom-hello
   - gi-javascriptcore4
   - gi-soup2
   - gi-webkit2
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
index 8732dc0f3ce8..ae01db0b82d4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
@@ -1,4 +1,4 @@
-# Stackage LTS 24.10
+# Stackage LTS 24.16
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -22,7 +22,7 @@ default-package-overrides:
   - aeson-attoparsec ==0.0.0
   - aeson-better-errors ==0.9.1.3
   - aeson-casing ==0.2.0.0
-  - aeson-combinators ==0.1.2.1
+  - aeson-combinators ==0.1.2.2
   - aeson-diff ==1.1.0.13
   - aeson-gadt-th ==0.2.5.4
   - aeson-generic-compat ==0.0.2.0
@@ -102,7 +102,7 @@ default-package-overrides:
   - async-refresh-tokens ==0.4.0.0
   - atom-basic ==0.2.5
   - atom-conduit ==0.9.0.2
-  - atomic-counter ==0.1.2.3
+  - atomic-counter ==0.1.2.4
   - atomic-primops ==0.8.8
   - atomic-write ==0.2.1.1
   - attoparsec ==0.14.4
@@ -198,7 +198,7 @@ default-package-overrides:
   - binary-shared ==0.8.3
   - binaryen ==0.0.6.0
   - bindings-DSL ==1.0.25
-  - bindings-GLFW ==3.3.9.2
+  - bindings-GLFW ==3.3.9.3
   - bindings-libzip ==1.0.1
   - bindings-uname ==0.1
   - BiobaseNewick ==0.0.0.2
@@ -224,8 +224,8 @@ default-package-overrides:
   - blaze-textual ==0.2.3.1
   - bloodhound ==0.23.0.1
   - bloomfilter ==2.0.1.2
-  - bluefin ==0.0.16.0
-  - bluefin-internal ==0.1.0.0
+  - bluefin ==0.0.17.1
+  - bluefin-internal ==0.1.1.0
   - bm ==0.2.0.0
   - bmp ==1.2.6.4
   - bnb-staking-csvs ==0.2.2.0
@@ -316,7 +316,7 @@ default-package-overrides:
   - cairo ==0.13.12.0
   - cairo-image ==0.1.0.5
   - calendar-recycling ==0.0.0.1
-  - call-alloy ==0.6.0.2
+  - call-alloy ==0.6.0.3
   - call-plantuml ==0.0.1.3
   - call-stack ==0.4.0
   - calligraphy ==0.1.8
@@ -324,8 +324,8 @@ default-package-overrides:
   - capability ==0.5.0.1
   - cardano-coin-selection ==1.0.1
   - carray ==0.1.6.8
-  - casa-client ==0.0.2
-  - casa-types ==0.0.2
+  - casa-client ==0.0.3
+  - casa-types ==0.0.3
   - case-insensitive ==1.2.1.0
   - cased ==0.1.0.0
   - cases ==0.1.4.4
@@ -357,7 +357,7 @@ default-package-overrides:
   - Chart-cairo ==1.9.4.1
   - Chart-diagrams ==1.9.5.1
   - chart-svg ==0.8.2.1
-  - ChasingBottoms ==1.3.1.16
+  - ChasingBottoms ==1.3.1.17
   - check-email ==1.0.2
   - checkers ==0.6.0
   - checksum ==0.0.0.1
@@ -374,8 +374,8 @@ default-package-overrides:
   - circle-packing ==0.1.0.6
   - circular ==0.4.0.3
   - citeproc ==0.9.0.1
-  - clash-prelude ==1.8.2
-  - clash-prelude-hedgehog ==1.8.2
+  - clash-prelude ==1.8.3
+  - clash-prelude-hedgehog ==1.8.3
   - classy-prelude ==1.5.0.3
   - classy-prelude-conduit ==1.5.0
   - classy-prelude-yesod ==1.5.0
@@ -414,7 +414,7 @@ default-package-overrides:
   - comfort-blas ==0.0.3.1
   - comfort-fftw ==0.0.0.1
   - comfort-glpk ==0.1
-  - comfort-graph ==0.0.4
+  - comfort-graph ==0.0.4.1
   - commonmark ==0.2.6.1
   - commonmark-extensions ==0.2.6
   - commonmark-pandoc ==0.2.3
@@ -489,7 +489,7 @@ default-package-overrides:
   - countdown-numbers-game ==0.0.0.1
   - country ==0.2.5.0
   - covariance ==0.2.0.1
-  - cpphs ==1.20.9.1
+  - cpphs ==1.20.10
   - cpu ==0.1.2
   - cpuinfo ==0.1.0.3
   - cql ==4.0.4
@@ -513,7 +513,7 @@ default-package-overrides:
   - cryptohash-md5 ==0.11.101.0
   - cryptohash-sha1 ==0.11.101.0
   - cryptohash-sha256 ==0.11.102.1
-  - cryptohash-sha512 ==0.11.102.0
+  - cryptohash-sha512 ==0.11.103.0
   - crypton ==1.0.4
   - crypton-conduit ==0.2.3
   - crypton-connection ==0.4.5
@@ -582,7 +582,6 @@ default-package-overrides:
   - data-sketches ==0.3.1.0
   - data-sketches-core ==0.1.0.0
   - data-textual ==0.3.0.3
-  - dataframe ==0.2.0.2
   - dataurl ==0.1.0.0
   - DAV ==1.3.4
   - dbcleaner ==0.1.3
@@ -609,7 +608,7 @@ default-package-overrides:
   - depq ==0.4.2
   - deque ==0.4.4.2
   - derive-storable ==0.3.1.0
-  - derive-topdown ==0.1.0.0
+  - derive-topdown ==0.1.1.0
   - deriveJsonNoPrefix ==0.1.0.1
   - deriving-aeson ==0.2.10
   - deriving-compat ==0.6.7
@@ -640,7 +639,7 @@ default-package-overrides:
   - Diff ==1.0.2
   - diff-loc ==0.1.0.0
   - digest ==0.0.2.1
-  - digits ==0.3.1
+  - digits ==0.3.2
   - digraph ==0.3.2
   - dimensional ==1.6.1
   - direct-sqlite ==2.3.29
@@ -666,7 +665,7 @@ default-package-overrides:
   - distribution-opensuse ==1.1.4
   - distributive ==0.6.2.1
   - djinn-lib ==0.0.1.4
-  - djot ==0.1.2.2
+  - djot ==0.1.2.3
   - dl-fedora ==2.0.1
   - dlist ==1.0
   - dlist-instances ==0.1.1.1
@@ -694,7 +693,7 @@ default-package-overrides:
   - dot ==0.3
   - dotgen ==0.4.3
   - dotnet-timespan ==0.0.1.0
-  - dotparse ==0.1.2.3
+  - dotparse ==0.1.3.0
   - double-conversion ==2.0.5.0
   - download ==0.3.2.7
   - download-curl ==0.1.4
@@ -853,7 +852,7 @@ default-package-overrides:
   - FindBin ==0.0.5
   - fingertree ==0.1.6.2
   - finite-typelits ==0.2.1.0
-  - first-class-families ==0.8.1.0
+  - first-class-families ==0.8.2.0
   - fits-parse ==0.4.2
   - fitspec ==0.4.10
   - fix-whitespace ==0.1
@@ -866,7 +865,7 @@ default-package-overrides:
   - flac-picture ==0.1.3
   - flags-applicative ==0.1.0.3
   - flat ==0.6
-  - flatparse ==0.5.3.0
+  - flatparse ==0.5.3.1
   - flay ==0.5
   - flexible-defaults ==0.0.3
   - FloatingHex ==0.5
@@ -1174,7 +1173,7 @@ default-package-overrides:
   - greskell ==2.0.3.3
   - greskell-core ==1.0.0.6
   - greskell-websocket ==1.0.0.4
-  - gridtables ==0.1.0.0
+  - gridtables ==0.1.1.0
   - grisette ==0.13.0.1
   - groom ==0.1.2.1
   - group-by-date ==0.1.0.5
@@ -1203,7 +1202,7 @@ default-package-overrides:
   - happy ==2.1.7
   - happy-lib ==2.1.7
   - happy-meta ==0.2.1.0
-  - harpie ==0.1.3.0
+  - harpie ==0.1.3.1
   - harpie-numhask ==0.1.0.2
   - has-transformers ==0.1.0.4
   - HasBigDecimal ==0.2.0.0
@@ -1233,7 +1232,7 @@ default-package-overrides:
   - hasql-listen-notify ==0.1.0.1
   - hasql-migration ==0.3.1
   - hasql-optparse-applicative ==0.9
-  - hasql-pool ==1.3.0.3
+  - hasql-pool ==1.3.0.4
   - hasql-th ==0.4.0.23
   - hasql-transaction ==1.2.1
   - Hastructure ==0.50.4
@@ -1286,13 +1285,8 @@ default-package-overrides:
   - hjsmin ==0.2.1
   - hkd-default ==1.1.0.0
   - hkgr ==0.4.8
-  - hledger ==1.43.2
-  - hledger-iadd ==1.3.21
   - hledger-interest ==1.6.7
-  - hledger-lib ==1.43.2
   - hledger-stockquotes ==0.1.3.2
-  - hledger-ui ==1.43.2
-  - hledger-web ==1.43.2
   - hlibcpuid ==0.2.0
   - hlibgit2 ==0.18.0.16
   - hlibsass ==0.1.10.1
@@ -1367,13 +1361,13 @@ default-package-overrides:
   - hsndfile-vector ==0.5.2
   - HsOpenSSL ==0.11.7.9
   - HsOpenSSL-x509-system ==0.1.0.4
-  - hspec ==2.11.12
-  - hspec-api ==2.11.12
+  - hspec ==2.11.14
+  - hspec-api ==2.11.14
   - hspec-attoparsec ==0.1.0.2
   - hspec-checkers ==0.1.0.2
   - hspec-contrib ==0.5.2
-  - hspec-core ==2.11.12
-  - hspec-discover ==2.11.12
+  - hspec-core ==2.11.14
+  - hspec-discover ==2.11.14
   - hspec-expectations ==0.8.4
   - hspec-expectations-json ==1.0.2.1
   - hspec-expectations-lifted ==0.10.0
@@ -1384,7 +1378,7 @@ default-package-overrides:
   - hspec-junit-formatter ==1.1.2.1
   - hspec-leancheck ==0.0.6
   - hspec-megaparsec ==2.2.1
-  - hspec-meta ==2.11.12
+  - hspec-meta ==2.11.14
   - hspec-need-env ==0.1.0.12
   - hspec-parsec ==0
   - hspec-smallcheck ==0.5.3
@@ -1408,7 +1402,7 @@ default-package-overrides:
   - html-parse ==0.2.2.0
   - HTTP ==4000.4.1
   - http-api-data ==0.6.2
-  - http-api-data-qq ==0.1.0.0
+  - http-api-data-qq ==0.1.0.1
   - http-client ==0.7.19
   - http-client-openssl ==0.3.3
   - http-client-overrides ==0.1.1.0
@@ -1538,7 +1532,7 @@ default-package-overrides:
   - ipython-kernel ==0.11.0.0
   - irc ==0.6.1.1
   - irc-ctcp ==0.1.3.1
-  - iri ==0.5.1.1
+  - iri ==0.5.1.2
   - isbn ==1.1.0.5
   - islink ==0.1.0.0
   - iso3166-country-codes ==0.20140203.8
@@ -1826,7 +1820,7 @@ default-package-overrides:
   - mmsyn7ukr-common ==0.3.1.0
   - mnist-idx ==0.1.3.2
   - mnist-idx-conduit ==0.4.0.0
-  - mockcat ==0.5.2.0
+  - mockcat ==0.5.3.0
   - mockery ==0.3.5
   - mod ==0.2.1.0
   - modern-uri ==0.3.6.1
@@ -2020,7 +2014,7 @@ default-package-overrides:
   - ogma-spec ==1.7.0
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.4
-  - ollama-haskell ==0.2.0.0
+  - ollama-haskell ==0.2.1.0
   - om-doh ==0.1.0.4
   - om-elm ==2.0.1.1
   - om-fail ==0.1.0.6
@@ -2195,7 +2189,7 @@ default-package-overrides:
   - poly ==0.5.1.0
   - poly-arity ==0.1.0
   - polynomials-bernstein ==1.1.2
-  - polyparse ==1.13
+  - polyparse ==1.13.1
   - polysemy ==1.9.2.0
   - polysemy-fs ==0.1.0.0
   - polysemy-plugin ==0.4.5.3
@@ -2230,7 +2224,7 @@ default-package-overrides:
   - pretty-hex ==1.1
   - pretty-relative-time ==0.3.0.0
   - pretty-show ==1.10
-  - pretty-simple ==4.1.3.0
+  - pretty-simple ==4.1.4.0
   - pretty-sop ==0.2.0.3
   - pretty-terminal ==0.1.0.0
   - prettychart ==0.3.0.2
@@ -2254,7 +2248,7 @@ default-package-overrides:
   - primitive-unlifted ==2.2.0.0
   - print-console-colors ==0.1.0.0
   - probability ==0.2.8
-  - probability-polynomial ==1.0.0.1
+  - probability-polynomial ==1.0.1.0
   - process-extras ==0.7.4
   - product-isomorphic ==0.0.3.4
   - product-profunctors ==0.11.1.1
@@ -2397,9 +2391,9 @@ default-package-overrides:
   - regex-pcre-builtin ==0.95.2.3.8.44
   - regex-posix ==0.96.0.2
   - regex-posix-clib ==2.7
-  - regex-tdfa ==1.3.2.4
+  - regex-tdfa ==1.3.2.5
   - regex-with-pcre ==1.1.0.2
-  - registry ==0.6.3.2
+  - registry ==0.6.3.3
   - registry-aeson ==0.3.1.2
   - reinterpret-cast ==0.1.0
   - relapse ==1.0.0.1
@@ -2441,7 +2435,7 @@ default-package-overrides:
   - rhythmic-sequences ==0.8.0.0
   - riak-protobuf ==0.25.0.0
   - richenv ==0.1.0.3
-  - rio ==0.1.22.0
+  - rio ==0.1.23.0
   - rio-orphans ==0.1.2.0
   - rio-prettyprint ==0.1.8.0
   - rng-utils ==0.3.1
@@ -2597,7 +2591,7 @@ default-package-overrides:
   - shellify ==0.14.0.2
   - shellmet ==0.0.5.0
   - shelltestrunner ==1.10
-  - shellwords ==0.1.4.4
+  - shellwords ==0.1.4.6
   - shelly ==1.12.1.1
   - should-not-typecheck ==2.1.0
   - show-combinators ==0.2.0.0
@@ -2783,7 +2777,7 @@ default-package-overrides:
   - swizzle-modify ==0.1.0.0
   - swizzle-set ==0.2.0.0
   - syb ==0.7.2.4
-  - sydtest ==0.20.0.0
+  - sydtest ==0.20.0.1
   - sydtest-aeson ==0.2.0.1
   - sydtest-amqp ==0.1.0.0
   - sydtest-autodocodec ==0.0.0.0
@@ -2852,7 +2846,7 @@ default-package-overrides:
   - tasty-inspection-testing ==0.2.1
   - tasty-kat ==0.0.3
   - tasty-leancheck ==0.0.2
-  - tasty-lua ==1.1.1.1
+  - tasty-lua ==1.1.2
   - tasty-papi ==0.1.2.0
   - tasty-program ==1.1.0
   - tasty-quickcheck ==0.11.1
@@ -3104,7 +3098,7 @@ default-package-overrides:
   - unliftio-pool ==0.4.3.1
   - unliftio-streams ==0.2.0.0
   - unlit ==0.4.0.0
-  - unordered-containers ==0.2.20
+  - unordered-containers ==0.2.20.1
   - unsafe ==0.0
   - uri-bytestring ==0.4.0.1
   - uri-bytestring-aeson ==0.1.0.9
@@ -3240,7 +3234,7 @@ default-package-overrides:
   - wherefrom-compat ==0.1.1.1
   - which ==0.2.0.3
   - wide-word ==0.1.8.1
-  - wild-bind ==0.1.2.12
+  - wild-bind ==0.1.2.13
   - wild-bind-x11 ==0.2.0.17
   - Win32-notify ==0.3.0.3
   - windns ==0.1.0.1
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
index eee71d4e9164..b03d66e0fbe4 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
@@ -50,6 +50,7 @@ dont-distribute-packages:
  - afv
  - agda-server
  - agda-snippets-hakyll
+ - age
  - agentx
  - aip
  - airgql
@@ -224,7 +225,6 @@ dont-distribute-packages:
  - bbi
  - bdcs
  - bdcs-api
- - beam-large-records
  - beam-th
  - beautifHOL
  - bech32-th
@@ -458,6 +458,8 @@ dont-distribute-packages:
  - claferIG
  - claferwiki
  - clash
+ - clash-ghc
+ - clash-shake
  - classify-frog
  - classy-effects
  - classy-effects-th
@@ -478,7 +480,6 @@ dont-distribute-packages:
  - cless
  - cleveland
  - click-clack
- - clickhouse-haskell
  - clifford
  - clippings
  - cloud-haskell
@@ -605,6 +606,7 @@ dont-distribute-packages:
  - cprng-aes
  - cprng-aes-effect
  - cql-io-tinylog
+ - cql_4_1_0_0
  - cqrs-example
  - cqrs-memory
  - cqrs-postgresql
@@ -649,6 +651,7 @@ dont-distribute-packages:
  - cypher
  - dahdit-audio
  - dahdit-midi
+ - dahdit-network
  - dahdit-test
  - daino
  - Dangerous
@@ -676,7 +679,6 @@ dont-distribute-packages:
  - datadog-tracing
  - datafix
  - dataflow
- - dataframe_0_3_0_4
  - datasets
  - date-conversions
  - dbjava
@@ -768,7 +770,7 @@ dont-distribute-packages:
  - distribution-plot
  - dixi
  - dl-fedora
- - dl-fedora_2_1
+ - dl-fedora_2_1_1
  - dmenu-pkill
  - dmenu-pmount
  - dmenu-search
@@ -784,7 +786,6 @@ dont-distribute-packages:
  - DocTest
  - dojang
  - DOM
- - dom-parser
  - domaindriven
  - dormouse-client
  - dovetail
@@ -809,6 +810,7 @@ dont-distribute-packages:
  - dsmc-tools
  - DSTM
  - dtd
+ - duckdb-simple
  - Dust
  - Dust-crypto
  - Dust-tools
@@ -894,6 +896,7 @@ dont-distribute-packages:
  - eventful-sql-common
  - eventful-sqlite
  - eventful-test-helpers
+ - eventlog-live-otelcol
  - EventSocket
  - eventsource-geteventstore-store
  - eventsource-store-specs
@@ -907,6 +910,7 @@ dont-distribute-packages:
  - exference
  - exist
  - exist-instances
+ - expand
  - expat-enumerator
  - expiring-containers
  - explicit-iomodes-bytestring
@@ -1192,6 +1196,13 @@ dont-distribute-packages:
  - GPipe-TextureLoad
  - gps
  - gps2htmlReport
+ - gpu-vulkan
+ - gpu-vulkan-khr-surface
+ - gpu-vulkan-khr-surface-glfw
+ - gpu-vulkan-khr-swapchain
+ - gpu-vulkan-middle-khr-surface
+ - gpu-vulkan-middle-khr-surface-glfw
+ - gpu-vulkan-middle-khr-swapchain
  - GPX
  - grab-form
  - graflog
@@ -1246,7 +1257,6 @@ dont-distribute-packages:
  - gtfs
  - gtfs-realtime
  - gtk-serialized-event
- - gtk-sni-tray
  - gtk2hs-cast-glade
  - gtk2hs-cast-gnomevfs
  - gtk2hs-cast-gtk
@@ -1288,7 +1298,6 @@ dont-distribute-packages:
  - hake
  - hakyll-elm
  - hakyll-ogmarkup
- - hakyll-shortcut-links
  - halberd
  - halide-arrayfire
  - halide-JuicyPixels
@@ -1328,7 +1337,6 @@ dont-distribute-packages:
  - HarmTrace
  - haroonga-httpd
  - has-th
- - hasbolt
  - hascat
  - hascat-lib
  - hascat-setup
@@ -1348,7 +1356,6 @@ dont-distribute-packages:
  - haskell-admin-managed-functions
  - haskell-aliyun
  - haskell-bitmex-client
- - haskell-debug-adapter
  - haskell-debugger
  - haskell-docs
  - haskell-eigen-util
@@ -1437,8 +1444,6 @@ dont-distribute-packages:
  - HaVSA
  - hawitter
  - Hawk
- - haxl-amazonka
- - haxl-facebook
  - haxy
  - Hayoo
  - hback
@@ -1602,6 +1607,7 @@ dont-distribute-packages:
  - hoppy-runtime
  - hoppy-std
  - horde-ad
+ - hotel-california
  - hotswap
  - hp2any-graph
  - hp2any-manager
@@ -1643,6 +1649,9 @@ dont-distribute-packages:
  - hs-functors
  - hs-gen-iface
  - hs-ix
+ - hs-opentelemetry-instrumentation-cloudflare
+ - hs-opentelemetry-instrumentation-http-client
+ - hs-opentelemetry-instrumentation-yesod
  - hs-profunctors
  - hs-sdl-term-emulator
  - hs2ats
@@ -1683,6 +1692,9 @@ dont-distribute-packages:
  - hsql-odbc
  - hsql-postgresql
  - hsql-sqlite3
+ - hsqml-datamodel-vinyl
+ - hsqml-demo-morris
+ - hsqml-morris
  - hsreadability
  - hssourceinfo
  - hssqlppp-th
@@ -1769,6 +1781,7 @@ dont-distribute-packages:
  - hylotab
  - hyloutils
  - hyperbole
+ - hyperbole_0_5_0
  - hyperpublic
  - ide-backend
  - ide-backend-server
@@ -1808,7 +1821,6 @@ dont-distribute-packages:
  - indentation-trifecta
  - indexation
  - IndexedList
- - indieweb-algorithms
  - indigo
  - inferno-core
  - inferno-lsp
@@ -1933,6 +1945,7 @@ dont-distribute-packages:
  - karakuri
  - katip-rollbar
  - keelung
+ - keera-hails-i18n
  - keera-hails-mvc-environment-gtk
  - keera-hails-mvc-model-lightmodel
  - keera-hails-mvc-model-protectedmodel
@@ -2080,6 +2093,7 @@ dont-distribute-packages:
  - linnet-conduit
  - linux-ptrace
  - lio-eci11
+ - lion
  - liquid-base
  - liquid-bytestring
  - liquid-containers
@@ -2365,6 +2379,7 @@ dont-distribute-packages:
  - music-suite
  - musicbrainz-email
  - musicxml2
+ - musig2
  - mutable-iter
  - MutationOrder
  - mute-unmute
@@ -2476,10 +2491,10 @@ dont-distribute-packages:
  - nyan-interpolation-simple
  - nymphaea
  - nyx-game
- - oalg-abg
  - oath
  - oauth2-jwt-bearer
  - obdd
+ - oberon0
  - obj
  - objectid
  - objective
@@ -2751,9 +2766,9 @@ dont-distribute-packages:
  - prometheus-proc
  - propane
  - proplang
+ - PropRatt
  - prosidyc
  - proto-lens-descriptors
- - proto3-suite
  - protobuf-native
  - protocol-buffers-descriptor
  - protocol-buffers-descriptor-fork
@@ -2878,7 +2893,6 @@ dont-distribute-packages:
  - reddit
  - redHandlers
  - redis-io
- - rediscaching-haxl
  - refh
  - reflex-animation
  - reflex-backend-wai
@@ -2902,10 +2916,6 @@ dont-distribute-packages:
  - regions-monadsfd
  - regions-monadstf
  - regions-mtl
- - registry
- - registry-aeson
- - registry-hedgehog
- - registry-hedgehog-aeson
  - regular-extras
  - regular-web
  - regular-xmlpickler
@@ -3036,7 +3046,7 @@ dont-distribute-packages:
  - sandwich-contexts-kubernetes
  - sandwich-contexts-minio
  - sandwich-webdriver
- - sandwich-webdriver_0_4_0_1
+ - sandwich-webdriver_0_4_0_2
  - sarsi
  - sasl
  - sat-micro-hs
@@ -3070,7 +3080,6 @@ dont-distribute-packages:
  - scotty-fay
  - scotty-form
  - scotty-hastache
- - scotty-haxl
  - scotty-params-parser
  - scp-streams
  - scrabble-bot
@@ -3129,7 +3138,6 @@ dont-distribute-packages:
  - servant-db-postgresql
  - servant-ede
  - servant-examples
- - servant-haxl-client
  - servant-js
  - servant-matrix-param
  - servant-oauth2
@@ -3424,7 +3432,6 @@ dont-distribute-packages:
  - systemstats
  - t3-client
  - ta
- - taffybar
  - tag-stream
  - tagged-list
  - tagged-th
@@ -3463,6 +3470,7 @@ dont-distribute-packages:
  - techlab
  - telegram-bot
  - telegram-raw-api
+ - temporal-sdk
  - ten-lens
  - ten-unordered-containers
  - terminal-text
@@ -3589,7 +3597,6 @@ dont-distribute-packages:
  - type-sub-th
  - TypeClass
  - typed-encoding-encoding
- - typed-protocols-doc
  - typed-streams
  - typedflow
  - TypeIlluminator
@@ -3661,7 +3668,6 @@ dont-distribute-packages:
  - uu-cco-hut-parsing
  - uu-cco-uu-parsinglib
  - uu-options
- - uuagc
  - uuid-crypto
  - uvector-algorithms
  - v4l2
@@ -3753,7 +3759,7 @@ dont-distribute-packages:
  - WebCont
  - webcrank-wai
  - webdriver-w3c
- - webdriver_0_13_0_0
+ - webdriver_0_14_0_0
  - webify
  - webserver
  - websnap
diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 77aa797f0ff5..526a96d59fc3 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -286,6 +286,10 @@ builtins.intersectAttrs super {
     }))
   ];
 
+  # Test suite requires access to an actual serial port
+  # https://github.com/jputcu/serialport/issues/25 krank:ignore-line
+  serialport = dontCheck super.serialport;
+
   # Provides a library and an executable (pretty-derivation)
   nix-derivation = enableSeparateBinOutput super.nix-derivation;
 
@@ -526,9 +530,21 @@ builtins.intersectAttrs super {
   ];
 
   # Avoid compiling twice by providing executable as a separate output (with small closure size),
+  # add postgresqlTestHook to allow test executiion
   postgres-websockets = lib.pipe super.postgres-websockets [
     enableSeparateBinOutput
-    (overrideCabal { passthru.tests = pkgs.nixosTests.postgres-websockets; })
+    (overrideCabal {
+      passthru.tests = pkgs.nixosTests.postgres-websockets;
+      preCheck = ''
+        export postgresqlEnableTCP=1
+        export PGDATABASE=postgres_ws_test
+      '';
+    })
+    (addTestToolDepends [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ])
+    (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
   ];
 
   # Test suite requires a running postgresql server,
@@ -580,9 +596,11 @@ builtins.intersectAttrs super {
   gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
   gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
   hsqml = dontCheck (
-    addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5Full; })
+    addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5.qtbase; })
   );
   monomer = dontCheck super.monomer;
+  # GLFW init fails in sandbox https://github.com/bsl/GLFW-b/issues/50 krank:ignore-line
+  GLFW-b = dontCheck super.GLFW-b;
 
   # Wants to check against a real DB, Needs freetds
   odbc = dontCheck (addExtraLibraries [ pkgs.freetds ] super.odbc);
@@ -781,9 +799,6 @@ builtins.intersectAttrs super {
     patches = drv.patches or [ ] ++ [
       ./patches/GLUT.patch
     ];
-    prePatch = drv.prePatch or "" + ''
-      ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
-    '';
   }) super.GLUT;
 
   libsystemd-journal = addExtraLibrary pkgs.systemd super.libsystemd-journal;
@@ -1273,6 +1288,7 @@ builtins.intersectAttrs super {
       pkgs.postgresql
       pkgs.postgresqlTestHook
     ];
+    doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken);
   }) super.relocant;
 
   # https://gitlab.iscpif.fr/gargantext/haskell-pgmq/blob/9a869df2842eccc86a0f31a69fb8dc5e5ca218a8/README.md#running-test-cases
@@ -1285,8 +1301,104 @@ builtins.intersectAttrs super {
       (lib.getBin (pkgs.postgresql.withPackages (ps: [ ps.pgmq ])))
       pkgs.postgresqlTestHook
     ];
+    doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken);
   }) super.haskell-pgmq;
 
+  migrant-postgresql-simple = lib.pipe super.migrant-postgresql-simple [
+    (overrideCabal {
+      preCheck = ''
+        postgresqlTestUserOptions="LOGIN SUPERUSER"
+      '';
+    })
+    (addTestToolDepends [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ])
+    (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
+  ];
+
+  postgresql-simple-migration = overrideCabal (drv: {
+    preCheck = ''
+      PGUSER=test
+      PGDATABASE=test
+    '';
+    testToolDepends = drv.testToolDepends or [ ] ++ [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ];
+    jailbreak = true;
+    doCheck = drv.doCheck or true && !(pkgs.postgresqlTestHook.meta.broken);
+  }) super.postgresql-simple-migration;
+
+  postgresql-simple = lib.pipe super.postgresql-simple [
+    (addTestToolDepends [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ])
+    (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
+  ];
+
+  beam-postgres = lib.pipe super.beam-postgres [
+    # Requires pg_ctl command during tests
+    (addTestToolDepends [ pkgs.postgresql ])
+    (dontCheckIf (!pkgs.postgresql.doInstallCheck || !self.testcontainers.doCheck))
+  ];
+
+  users-postgresql-simple = lib.pipe super.users-postgresql-simple [
+    (addTestToolDepends [
+      pkgs.postgresql
+      pkgs.postgresqlTestHook
+    ])
+    (dontCheckIf pkgs.postgresqlTestHook.meta.broken)
+  ];
+
+  esqueleto =
+    overrideCabal
+      (drv: {
+        postPatch = drv.postPatch or "" + ''
+          # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
+          sed -i test/PostgreSQL/Test.hs \
+            -e s^host=localhost^^
+        '';
+        # Match the test suite defaults (or hardcoded values?)
+        preCheck = drv.preCheck or "" + ''
+          PGUSER=esqutest
+          PGDATABASE=esqutest
+        '';
+        testFlags = drv.testFlags or [ ] ++ [
+          # We don't have a MySQL test hook yet
+          "--skip=/Esqueleto/MySQL"
+        ];
+        testToolDepends = drv.testToolDepends or [ ] ++ [
+          pkgs.postgresql
+          pkgs.postgresqlTestHook
+        ];
+      })
+      # https://github.com/NixOS/nixpkgs/issues/198495
+      (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.esqueleto);
+
+  persistent-postgresql =
+    # TODO: move this override to configuration-nix.nix
+    overrideCabal
+      (drv: {
+        postPatch = drv.postPath or "" + ''
+          # patch out TCP usage: https://nixos.org/manual/nixpkgs/stable/#sec-postgresqlTestHook-tcp
+          # NOTE: upstream host variable takes only two values...
+          sed -i test/PgInit.hs \
+            -e s^'host=" <> host <> "'^^
+        '';
+        preCheck = drv.preCheck or "" + ''
+          PGDATABASE=test
+          PGUSER=test
+        '';
+        testToolDepends = drv.testToolDepends or [ ] ++ [
+          pkgs.postgresql
+          pkgs.postgresqlTestHook
+        ];
+      })
+      # https://github.com/NixOS/nixpkgs/issues/198495
+      (dontCheckIf (pkgs.postgresqlTestHook.meta.broken) super.persistent-postgresql);
+
   # https://gitlab.iscpif.fr/gargantext/haskell-bee/blob/19c8775f0d960c669235bf91131053cb6f69a1c1/README.md#redis
   haskell-bee-redis = overrideCabal (drv: {
     testToolDepends = drv.testToolDepends or [ ] ++ [
@@ -1691,12 +1803,6 @@ builtins.intersectAttrs super {
   # Additionally install documentation
   jacinda = overrideCabal (drv: {
     enableSeparateDocOutput = true;
-    # Test suite is broken by DOS line endings inserted by Hackage revisions
-    # https://github.com/vmchale/jacinda/issues/5
-    postPatch = ''
-      ${drv.postPatch or ""}
-      ${pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
-    '';
     postInstall = ''
       ${drv.postInstall or ""}
 
@@ -1788,8 +1894,6 @@ builtins.intersectAttrs super {
       }))
       super.tailwind;
 
-  emanote = addBuildDepend pkgs.stork super.emanote;
-
   keid-render-basic = addBuildTool pkgs.glslang super.keid-render-basic;
 
   # Disable checks to break dependency loop with SCalendar
diff --git a/pkgs/development/haskell-modules/configuration-windows.nix b/pkgs/development/haskell-modules/configuration-windows.nix
new file mode 100644
index 000000000000..bef866162481
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-windows.nix
@@ -0,0 +1,23 @@
+{ pkgs, haskellLib }:
+
+let
+  inherit (pkgs) fetchpatch lib;
+in
+
+with haskellLib;
+
+(self: super: {
+  # cabal2nix doesn't properly add dependencies conditional on os(windows)
+  network =
+    if pkgs.stdenv.hostPlatform.isWindows then
+      addBuildDepends [ self.temporary ] super.network
+    else
+      super.network;
+
+  # https://github.com/fpco/streaming-commons/pull/84
+  streaming-commons = appendPatch (fetchpatch {
+    name = "fix-headers-case.patch";
+    url = "https://github.com/fpco/streaming-commons/commit/6da611f63e9e862523ce6ee53262ddbc9681ae24.patch";
+    sha256 = "sha256-giEQqXZfoiAvtCFohdgOoYna2Tnu5aSYAOUH8YVldi0=";
+  }) super.streaming-commons;
+})
diff --git a/pkgs/development/haskell-modules/default.nix b/pkgs/development/haskell-modules/default.nix
index b6936742d710..08ee6219edff 100644
--- a/pkgs/development/haskell-modules/default.nix
+++ b/pkgs/development/haskell-modules/default.nix
@@ -15,6 +15,7 @@
   configurationNix ? import ./configuration-nix.nix,
   configurationArm ? import ./configuration-arm.nix,
   configurationDarwin ? import ./configuration-darwin.nix,
+  configurationWindows ? import ./configuration-windows.nix,
   configurationJS ? import ./configuration-ghcjs-9.x.nix,
 }:
 
@@ -42,6 +43,9 @@ let
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       (configurationDarwin { inherit pkgs haskellLib; })
     ]
+    ++ lib.optionals stdenv.hostPlatform.isWindows [
+      (configurationWindows { inherit pkgs haskellLib; })
+    ]
     ++ lib.optionals stdenv.hostPlatform.isGhcjs [
       (configurationJS { inherit pkgs haskellLib; })
     ];
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 6bcc21de75d7..5cebe4aec5d0 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -96,14 +96,14 @@ in
   libraryFrameworkDepends ? [ ],
   executableFrameworkDepends ? [ ],
   homepage ? "https://hackage.haskell.org/package/${pname}",
-  platforms ? with lib.platforms; all, # GHC can cross-compile
+  platforms ? lib.platforms.all, # GHC can cross-compile
   badPlatforms ? lib.platforms.none,
   hydraPlatforms ? null,
   hyperlinkSource ? true,
   isExecutable ? false,
   isLibrary ? !isExecutable,
   jailbreak ? false,
-  license,
+  license ? null,
   enableParallelBuilding ? true,
   maintainers ? null,
   teams ? null,
@@ -184,6 +184,11 @@ in
   # See https://nixos.org/manual/nixpkgs/unstable/#haskell-packaging-helpers
   # or its source doc/languages-frameworks/haskell.section.md
   disallowGhcReference ? false,
+  # By default we convert the `.cabal` file to Unix line endings to work around
+  # Hackage converting them to DOS line endings when revised, see
+  # <https://github.com/haskell/hackage-server/issues/316>.
+  # Pass `true` to disable this behavior.
+  dontConvertCabalFileToUnix ? false,
   # Cabal 3.8 which is shipped by default for GHC >= 9.3 always calls
   # `pkg-config --libs --static` as part of the configure step. This requires
   # Requires.private dependencies of pkg-config dependencies to be present in
@@ -549,8 +554,10 @@ let
   }
   // env
   # Implicit pointer to integer conversions are errors by default since clang 15.
-  # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456.
-  // optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
+  # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. krank:ignore-line
+  # A fix was included in GHC 9.10.* and backported to 9.6.5 and 9.8.2 (but we no longer
+  # ship 9.8.1).
+  // optionalAttrs (lib.versionOlder ghc.version "9.6.5" && stdenv.hasCC && stdenv.cc.isClang) {
     NIX_CFLAGS_COMPILE =
       "-Wno-error=int-conversion"
       + lib.optionalString (env ? NIX_CFLAGS_COMPILE) (" " + env.NIX_CFLAGS_COMPILE);
@@ -601,12 +608,18 @@ lib.fix (
           echo "Replace Cabal file with edited version from ${newCabalFileUrl}."
           cp ${newCabalFile} ${pname}.cabal
         ''
-        + prePatch;
+        + prePatch
+        + "\n"
+        # cabal2nix-generated expressions run hpack not until prePatch to create
+        # the .cabal file (if necessary)
+        + lib.optionalString (!dontConvertCabalFileToUnix) ''
+          sed -i -e 's/\r$//' *.cabal
+        '';
 
       postPatch =
         optionalString jailbreak ''
           echo "Run jailbreak-cabal to lift version restrictions on build inputs."
-          ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
+          ${jailbreak-cabal}/bin/jailbreak-cabal *.cabal
         ''
         + postPatch;
 
@@ -728,13 +741,7 @@ lib.fix (
       # package specifies `hardeningDisable`.
       hardeningDisable =
         lib.optionals (args ? hardeningDisable) hardeningDisable
-        ++ lib.optional (ghc.isHaLVM or false) "all"
-        # Static libraries (ie. all of pkgsStatic.haskellPackages) fail to build
-        # because by default Nix adds `-pie` to the linker flags: this
-        # conflicts with the `-r` and `-no-pie` flags added by GHC (see
-        # https://gitlab.haskell.org/ghc/ghc/-/issues/19580). hardeningDisable
-        # changes the default Nix behavior regarding adding "hardening" flags.
-        ++ lib.optional enableStaticLibraries "pie";
+        ++ lib.optional (ghc.isHaLVM or false) "all";
 
       configurePhase = ''
         runHook preConfigure
@@ -1029,10 +1036,11 @@ lib.fix (
       };
 
       meta = {
-        inherit homepage license platforms;
+        inherit homepage platforms;
       }
       // optionalAttrs (args ? broken) { inherit broken; }
       // optionalAttrs (args ? description) { inherit description; }
+      // optionalAttrs (args ? license) { inherit license; }
       // optionalAttrs (args ? maintainers) { inherit maintainers; }
       // optionalAttrs (args ? teams) { inherit teams; }
       // optionalAttrs (args ? hydraPlatforms) { inherit hydraPlatforms; }
diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index d2f6beb5260c..47e0a4086674 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (
     # Non-NixOS git needs cert
     GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
 
-    # Fixes https://github.com/commercialhaskell/stack/issues/2358
+    # Fixes https://github.com/commercialhaskell/stack/issues/2358 krank:ignore-line
     LANG = "en_US.UTF-8";
 
     preferLocalBuild = true;
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 258b2c2343f9..85cb7460a388 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -511,7 +511,7 @@ self: {
         vector
       ];
       description = "Efficient, high-level dynamic programming";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -1539,6 +1539,8 @@ self: {
       pname = "Agda";
       version = "2.8.0";
       sha256 = "184vjq260zf5w9c8nz11nbhpsvq3a1yxp7mhaz7synlaww3ik146";
+      revision = "2";
+      editedCabalFile = "1a011g959hv8s5slz68a37ppmjyfa84l842g0wll83b5hmk1nfxp";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -1611,7 +1613,7 @@ self: {
       ];
       executableToolDepends = [ emacs ];
       description = "A dependently typed functional programming language and proof assistant";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [
         lib.maintainers.iblech
         lib.maintainers.ncfavier
@@ -1674,7 +1676,7 @@ self: {
         tasty-hunit
       ];
       description = "Aho-Corasick string matching algorithm";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -1925,7 +1927,7 @@ self: {
         text
       ];
       description = "Near-future Sci-Fi roguelike and tactical squad combat game";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       badPlatforms = lib.platforms.darwin;
       mainProgram = "Allure";
     }
@@ -2206,7 +2208,7 @@ self: {
         requirements
       ];
       description = "First-class Attribute Grammars implemented using type-level programming";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -2422,14 +2424,18 @@ self: {
     }:
     mkDerivation {
       pname = "AvlTree";
-      version = "4.2";
-      sha256 = "0bw6856h75wks0mfvvqqm5i31sici1hacyl5zfj225jf9gn5q7dx";
+      version = "4.3";
+      sha256 = "1l4dg904lc4b659dc0flipbj73h6g8kh8g1yjgx077w992z4j8rr";
       libraryHaskellDepends = [
         base
         COrdering
       ];
+      testHaskellDepends = [
+        base
+        COrdering
+      ];
       description = "Balanced binary trees using the AVL algorithm";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -3022,7 +3028,7 @@ self: {
         tasty-hunit
       ];
       description = "Bessel J-function, Anger J-function, Weber E-function, and Anger-Weber function";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -3398,7 +3404,7 @@ self: {
         vector-th-unbox
       ];
       description = "European Nucleotide Archive data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -3548,7 +3554,7 @@ self: {
         text
       ];
       description = "streaming FASTA parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fastaextract";
     }
@@ -4039,7 +4045,7 @@ self: {
         vector-th-unbox
       ];
       description = "Collection of types for bioinformatics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -4218,7 +4224,7 @@ self: {
         vector-th-unbox
       ];
       description = "Efficient RNA/DNA/Protein Primary/Secondary Structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "SubOptDistance";
     }
@@ -5819,7 +5825,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -5870,7 +5876,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -5923,7 +5929,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -5974,7 +5980,7 @@ self: {
       ];
       doCheck = false;
       description = "A framework for packaging Haskell software";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6000,7 +6006,7 @@ self: {
         transformers
       ];
       description = "API for the Hooks build-type";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -6074,68 +6080,6 @@ self: {
     }
   ) { };
 
-  Cabal-syntax_3_6_0_0 = callPackage (
-    { mkDerivation, Cabal }:
-    mkDerivation {
-      pname = "Cabal-syntax";
-      version = "3.6.0.0";
-      sha256 = "0lcj4g55sj5iv727g7k57pscgyj0fx3smwapm1gmd5qkc3yfa9fa";
-      libraryHaskellDepends = [ Cabal ];
-      doHaddock = false;
-      description = "A library for working with .cabal files";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
-  Cabal-syntax_3_8_1_0 = callPackage (
-    {
-      mkDerivation,
-      array,
-      base,
-      binary,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      filepath,
-      mtl,
-      parsec,
-      pretty,
-      text,
-      time,
-      transformers,
-      unix,
-    }:
-    mkDerivation {
-      pname = "Cabal-syntax";
-      version = "3.8.1.0";
-      sha256 = "03yfk3b2sjmqpxmvx3mj185nifiaqapvc8hmbx4825z0kyqxvs07";
-      revision = "3";
-      editedCabalFile = "14zm8h7sfawysr9g37in8by8aj1p87fywj83hmshp8n6lrxr6bgd";
-      libraryHaskellDepends = [
-        array
-        base
-        binary
-        bytestring
-        containers
-        deepseq
-        directory
-        filepath
-        mtl
-        parsec
-        pretty
-        text
-        time
-        transformers
-        unix
-      ];
-      description = "A library for working with .cabal files";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   Cabal-syntax_3_10_3_0 = callPackage (
     {
       mkDerivation,
@@ -6177,7 +6121,7 @@ self: {
         unix
       ];
       description = "A library for working with .cabal files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6223,7 +6167,7 @@ self: {
       ];
       libraryToolDepends = [ alex ];
       description = "A library for working with .cabal files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6269,7 +6213,7 @@ self: {
       ];
       libraryToolDepends = [ alex ];
       description = "A library for working with .cabal files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6315,7 +6259,7 @@ self: {
       ];
       libraryToolDepends = [ alex ];
       description = "A library for working with .cabal files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -6795,7 +6739,7 @@ self: {
         vector
       ];
       description = "A backend for the Chart library for FLTKHS";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -7009,8 +6953,8 @@ self: {
     }:
     mkDerivation {
       pname = "ChasingBottoms";
-      version = "1.3.1.16";
-      sha256 = "08zg018arf4qvp970dcnf0nyaqp7wkp5ba2dhck3v4l49k5cax9m";
+      version = "1.3.1.17";
+      sha256 = "0713mgd71dix9dq1i812ydahcacfpsxmciqxwhg4qj0migyc4ymg";
       libraryHaskellDepends = [
         base
         containers
@@ -7292,7 +7236,7 @@ self: {
         text
       ];
       description = "Typified Tailwind for Rapid Development";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -7367,7 +7311,7 @@ self: {
         wide-word
       ];
       description = "ClickHouse driver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -7576,6 +7520,60 @@ self: {
     }
   ) { };
 
+  Color_0_4_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      colour,
+      criterion,
+      data-default-class,
+      deepseq,
+      hspec,
+      hspec-discover,
+      HUnit,
+      JuicyPixels,
+      massiv,
+      massiv-test,
+      QuickCheck,
+      random,
+      vector,
+    }:
+    mkDerivation {
+      pname = "Color";
+      version = "0.4.1";
+      sha256 = "1h2y48dbmhw6arxmn02r1jg00dm61yppwxxzg4cidjhrzipn6k81";
+      libraryHaskellDepends = [
+        base
+        data-default-class
+        deepseq
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        colour
+        hspec
+        HUnit
+        JuicyPixels
+        massiv
+        massiv-test
+        QuickCheck
+        random
+        vector
+      ];
+      testToolDepends = [ hspec-discover ];
+      benchmarkHaskellDepends = [
+        base
+        colour
+        criterion
+        deepseq
+        random
+      ];
+      description = "Color spaces and conversions between them";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   Combinatorrent = callPackage (
     {
       mkDerivation,
@@ -8083,7 +8081,7 @@ self: {
         text
       ];
       description = "Simple CLI user input library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -9215,7 +9213,7 @@ self: {
         vector
       ];
       description = "utilities for DP";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -11314,7 +11312,7 @@ self: {
         text
       ];
       description = "Environment Variable Parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -13342,7 +13340,7 @@ self: {
         WeakSets
       ];
       description = "Finite categories and usual categorical constructions on them";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -13393,7 +13391,7 @@ self: {
         WeakSets
       ];
       description = "Transform objects of the package FiniteCategories into graphs using GraphViz";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -13449,7 +13447,7 @@ self: {
       sha256 = "00qv9h9i3yy7rh6wl8qs2r00z9hqpm56y9g717qh0skrl1fdk3yk";
       libraryHaskellDepends = [ base ];
       description = "A version of Prelude suitable for teaching";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -13801,7 +13799,7 @@ self: {
         criterion
       ];
       description = "Tree- and forest structures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -13956,7 +13954,7 @@ self: {
         vector
       ];
       description = "(Context-free) grammars in formal language theory";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -14392,7 +14390,7 @@ self: {
         vinyl
       ];
       description = "Frames wrapper for map-reduce-folds and some extra folds helpers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -14507,7 +14505,7 @@ self: {
         vinyl
       ];
       description = "A streamly layer for Frames I/O";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "Demo";
       broken = true;
@@ -15133,7 +15131,7 @@ self: {
         utf8-string
       ];
       description = "Bindings to the GOST R 34.11-2012 hashing implementation";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -15723,7 +15721,7 @@ self: {
         random
       ];
       description = "Automatic SMS message generator";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "GenSmsPdu";
       broken = true;
@@ -17076,7 +17074,9 @@ self: {
       ];
       description = "The Haskell/R mixed programming environment";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "H";
+      broken = true;
     }
   ) { };
 
@@ -19293,7 +19293,7 @@ self: {
         unliftio
       ];
       description = "A flexible mock framework for testing effectful code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -19816,7 +19816,7 @@ self: {
         gauge
       ];
       description = "quantitative finance library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       platforms = lib.platforms.x86;
       hydraPlatforms = lib.platforms.none;
     }
@@ -19856,7 +19856,7 @@ self: {
         HROOT-tree
       ];
       description = "Haskell binding to the ROOT data analysis framework";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -19887,7 +19887,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Core modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -19923,7 +19923,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Graf modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -19956,7 +19956,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Hist modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -19989,7 +19989,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT IO modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20022,7 +20022,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Math modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20059,7 +20059,7 @@ self: {
       ];
       librarySystemDepends = [ RHTTP ];
       description = "Haskell binding to ROOT Net modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { RHTTP = null; };
@@ -20092,7 +20092,7 @@ self: {
         template-haskell
       ];
       description = "Haskell binding to ROOT Tree modules";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -20554,7 +20554,7 @@ self: {
         containers
       ];
       description = "Haskell Bindings for libsvm";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -20769,7 +20769,7 @@ self: {
         strict
       ];
       description = "Tableau based theorem prover for hybrid logics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "htab";
     }
@@ -21710,7 +21710,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "The classic game of Hangman";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "Hangman";
       broken = true;
@@ -21931,8 +21931,8 @@ self: {
     }:
     mkDerivation {
       pname = "HasCacBDD";
-      version = "0.3.0.0";
-      sha256 = "0066sip8362y1kvqcnrmamd42y7cwlkfashkpqnf675b8zrah7sz";
+      version = "0.3.0.1";
+      sha256 = "0vj02bnh14pv7slvj4mr8r9kbjp1ls1lv1jr6xqz1c187jgyv2bj";
       setupHaskellDepends = [
         base
         Cabal
@@ -21940,6 +21940,7 @@ self: {
       ];
       libraryHaskellDepends = [
         base
+        directory
         process
         QuickCheck
       ];
@@ -22002,7 +22003,7 @@ self: {
         transformers
       ];
       description = "Functional choreographic programming in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -22229,7 +22230,7 @@ self: {
         random
       ];
       description = "Combinatorics, group theory, commutative algebra, non-commutative algebra";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -22712,7 +22713,7 @@ self: {
         yaml
       ];
       description = "Cashflow modeling library for structured finance";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "Hastructure-exe";
     }
   ) { };
@@ -24308,7 +24309,7 @@ self: {
         vector
       ];
       description = "JSON to YAML Adapter";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -24576,7 +24577,7 @@ self: {
         MemoTrie
       ];
       description = "A package for solving dynamic programming problems in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -25014,6 +25015,53 @@ self: {
     }
   ) { };
 
+  ImpSpec_0_2_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      deepseq,
+      hspec,
+      hspec-core,
+      hspec-expectations-lifted,
+      HUnit,
+      mtl,
+      prettyprinter,
+      prettyprinter-ansi-terminal,
+      QuickCheck,
+      quickcheck-transformer,
+      random,
+      text,
+      unliftio,
+    }:
+    mkDerivation {
+      pname = "ImpSpec";
+      version = "0.2.0.0";
+      sha256 = "1cjbq9vk488f5jnl478q892ykmjdh8kc3pmx9b2gr820zqsfrlp0";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        hspec
+        hspec-core
+        hspec-expectations-lifted
+        HUnit
+        mtl
+        prettyprinter
+        prettyprinter-ansi-terminal
+        QuickCheck
+        quickcheck-transformer
+        random
+        text
+        unliftio
+      ];
+      testHaskellDepends = [ base ];
+      description = "Imperative approach to testing stateful applications. ImpSpec is built on top of HSpec and QuickCheck.";
+      license = lib.licensesSpdx."Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ImperativeHaskell = callPackage (
     {
       mkDerivation,
@@ -25076,6 +25124,47 @@ self: {
     }
   ) { };
 
+  Infinitree = callPackage (
+    {
+      mkDerivation,
+      adjunctions,
+      base,
+      containers,
+      criterion,
+      distributive,
+      infinite-list,
+      random,
+    }:
+    mkDerivation {
+      pname = "Infinitree";
+      version = "0.1.0.0";
+      sha256 = "0hdhld98nfx64lg9sxvbdhqjqm0g5maycx27xmcgizgg4yzxwyh2";
+      revision = "1";
+      editedCabalFile = "1ks3rnbj8zbiaqdzjad8i1midqa1lakxqph15161zm1i6d1yaj95";
+      libraryHaskellDepends = [
+        adjunctions
+        base
+        containers
+        distributive
+        infinite-list
+        random
+      ];
+      benchmarkHaskellDepends = [
+        adjunctions
+        base
+        containers
+        criterion
+        distributive
+        infinite-list
+        random
+      ];
+      description = "Infinitely deep trees for lazy stateless memoization";
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   InfixApplicative = callPackage (
     {
       mkDerivation,
@@ -26133,7 +26222,7 @@ self: {
         JuicyPixels
       ];
       description = "Efficiently scale, crop, flip images with JuicyPixels";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -26171,7 +26260,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "JuicyPixels wrappers for libjpeg-turbo";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -26484,7 +26573,7 @@ self: {
         mtl
       ];
       description = "A simple parsing library and some additional utilities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -26958,7 +27047,7 @@ self: {
         text-short
       ];
       description = "Lightweight Directory Access Protocol (LDAP) version 3";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -27007,6 +27096,49 @@ self: {
     }
   ) { };
 
+  LPFP_1_2_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      diagrams-cairo,
+      diagrams-lib,
+      gloss,
+      gnuplot,
+      linear,
+      Vis,
+    }:
+    mkDerivation {
+      pname = "LPFP";
+      version = "1.2.1";
+      sha256 = "1d9hrkw14vi70aipd2a37261k4nhkz324jqk9ipihjfxdr79vrmf";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        diagrams-cairo
+        diagrams-lib
+        gloss
+        gnuplot
+        linear
+        Vis
+      ];
+      executableHaskellDepends = [
+        base
+        diagrams-cairo
+        diagrams-lib
+        gloss
+        gnuplot
+        linear
+        Vis
+      ];
+      description = "Code for the book Learn Physics with Functional Programming";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   LPFP-core = callPackage (
     {
       mkDerivation,
@@ -27418,7 +27550,7 @@ self: {
         vector
       ];
       description = "A game engine library for tactical squad ASCII roguelike dungeon crawlers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       mainProgram = "LambdaHack";
     }
@@ -27837,7 +27969,7 @@ self: {
       sha256 = "1rj5n931370nxrnqj1728p38mcqbpswmxc73c5g1mlh66k0gqqk4";
       libraryHaskellDepends = [ base ];
       description = "European option implied vol calculation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -28334,7 +28466,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "Converter to convert from .lhs to .md and vice versa.";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lhsc";
       broken = true;
@@ -29394,7 +29526,7 @@ self: {
         hspec
       ];
       description = "Reals in the interval [0,1), as machine words";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -29840,7 +29972,7 @@ self: {
         process
       ];
       description = "A partial Cabal replacement";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "mcabal";
     }
   ) { };
@@ -29883,7 +30015,7 @@ self: {
         time
       ];
       description = "A small compiler for Haskell";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "mhs";
     }
   ) { };
@@ -29973,7 +30105,7 @@ self: {
       ];
       testToolDepends = [ goldplate ];
       description = "A toy dependently typed programming language with type-based termination";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "miniagda";
       broken = true;
@@ -30942,7 +31074,7 @@ self: {
         warp
       ];
       description = "Type-safe and efficient choreographies with location-set polymorphism";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -31975,7 +32107,7 @@ self: {
         split
       ];
       description = "Instances of NcStore for hypercuboids";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "Main";
     }
@@ -32066,7 +32198,7 @@ self: {
         vector
       ];
       description = "Simple scoring schemes for word alignments";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -32993,7 +33125,7 @@ self: {
             OGDF
           ];
           description = "Haskell binding to OGDF";
-          license = lib.licenses.bsd2;
+          license = lib.licensesSpdx."BSD-2-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -33133,8 +33265,8 @@ self: {
       pname = "OTP";
       version = "0.1.0.0";
       sha256 = "1r7vpc0bv89d70j6pc3z3vam93gahl4j0y5w8smknxwjliwqxkcb";
-      revision = "2";
-      editedCabalFile = "012yi2pvjjlk6vri5zj8a7pipscsfc6rgkw7s5qldqmvvwvrk64s";
+      revision = "3";
+      editedCabalFile = "00xy1xqm9slrb6k4gyha18plp5l1mc1fhgsh2jlv0y8hfy03qjxg";
       libraryHaskellDepends = [
         base
         bytestring
@@ -34114,7 +34246,7 @@ self: {
         criterion
       ];
       description = "Efficient ordered (by popcount) enumeration of bits";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -35098,10 +35230,8 @@ self: {
     }:
     mkDerivation {
       pname = "PenroseKiteDart";
-      version = "1.5";
-      sha256 = "0p0nf91vy5akgpnv8bb0i7bv92y0z774yh5xxynkf5f4rn7bcqjg";
-      revision = "2";
-      editedCabalFile = "1xdnbssmm0h9dvqpxivs2i037r5sj7cn5pnqzsm1h9cainj2w9g9";
+      version = "1.5.1";
+      sha256 = "0812x3ddlqflkypzjid3b5n3pdb2wwmp0b24yfmi9z15v5dbf2hm";
       libraryHaskellDepends = [
         base
         containers
@@ -35757,7 +35887,7 @@ self: {
         vector-th-unbox
       ];
       description = "Efficient multidimensional arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -35922,6 +36052,44 @@ self: {
     }
   ) { };
 
+  PropRatt = callPackage (
+    {
+      mkDerivation,
+      AsyncRattus,
+      base,
+      containers,
+      QuickCheck,
+    }:
+    mkDerivation {
+      pname = "PropRatt";
+      version = "0.1.0.0";
+      sha256 = "0qs8g88hsak7w7qi5qmjzsir71mr5b214cr0h4ni145x6is5fa0j";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        AsyncRattus
+        base
+        containers
+        QuickCheck
+      ];
+      executableHaskellDepends = [
+        AsyncRattus
+        base
+        containers
+        QuickCheck
+      ];
+      testHaskellDepends = [
+        AsyncRattus
+        base
+        containers
+        QuickCheck
+      ];
+      description = "Property-based testing framework for testing asynchronous FRP programs";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   PropaFP = callPackage (
     {
       mkDerivation,
@@ -36326,7 +36494,7 @@ self: {
         time
       ];
       description = "Quasiquotations for a python like interpolated string formatter";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -36581,22 +36749,24 @@ self: {
     }
   ) { };
 
-  QuickCheck_2_16_0_0 = callPackage (
+  QuickCheck_2_17_1_0 = callPackage (
     {
       mkDerivation,
       base,
       containers,
       deepseq,
+      hint,
       process,
       random,
+      split,
       splitmix,
       template-haskell,
       transformers,
     }:
     mkDerivation {
       pname = "QuickCheck";
-      version = "2.16.0.0";
-      sha256 = "1h02m26hvhfcs82rrfmfznwh4vj799gn55kysmv3sr8ixak3ymhb";
+      version = "2.17.1.0";
+      sha256 = "0dvrgc666jik35x6linmzn03k6sgr5b9a1ai8wplv7b2ai7l6c08";
       libraryHaskellDepends = [
         base
         containers
@@ -36610,7 +36780,11 @@ self: {
         base
         containers
         deepseq
+        hint
         process
+        split
+        template-haskell
+        transformers
       ];
       description = "Automatic testing of Haskell programs";
       license = lib.licenses.bsd3;
@@ -36639,7 +36813,7 @@ self: {
         transformers
       ];
       description = "A GenT monad transformer for QuickCheck library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -37539,7 +37713,7 @@ self: {
         time
       ];
       description = "A puzzle game written in Haskell with a cat in lead role";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "raincat";
@@ -38423,7 +38597,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "rounding variants floor, ceil and truncate for floating point operations +-*/√…";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -38474,7 +38648,7 @@ self: {
         vector
       ];
       description = "Haskell wrapper for RtMidi, the lightweight, cross-platform MIDI I/O library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -38548,7 +38722,7 @@ self: {
         X
       ];
       description = "Library for accessing S3 compatible storage services";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -39140,7 +39314,7 @@ self: {
         time
       ];
       description = "The Simple Javascript Wrench";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sjw";
       broken = true;
@@ -39832,7 +40006,7 @@ self: {
         vector-th-unbox
       ];
       description = "Base types and classes for statistics, sciences and humanities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -40031,7 +40205,7 @@ self: {
         bytestring
       ];
       description = "simple static linked SHA3 using private symbols and the ref impl";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -40266,7 +40440,7 @@ self: {
         util
       ];
       description = "See README for more info";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -40660,7 +40834,7 @@ self: {
         warp
       ];
       description = "A programming model for declarative, high performance user interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -40705,7 +40879,7 @@ self: {
         unliftio
       ];
       description = "A Virtual Dom in pure Haskell, based on Html as an Alignable Functor";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -40745,7 +40919,7 @@ self: {
         unliftio
       ];
       description = "Use the high-performance Snabbdom virtual dom library written in JavaScript";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -40769,7 +40943,7 @@ self: {
         text
       ];
       description = "A backend for rendering Shpadoinkle as Text";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -40797,7 +40971,7 @@ self: {
         unliftio
       ];
       description = "Support for the native browser console";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -40883,7 +41057,7 @@ self: {
         unliftio
       ];
       description = "Chrome extension to aide in development";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "devtools";
     }
@@ -40920,7 +41094,7 @@ self: {
         unliftio
       ];
       description = "Shpadoinkle as a static site";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41066,7 +41240,7 @@ self: {
         unliftio
       ];
       description = "A typed, template generated Html DSL, and helpers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41124,7 +41298,7 @@ self: {
         warp
       ];
       description = "Isreal Swan will make a snowman for you!";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "isreal";
       broken = true;
@@ -41150,7 +41324,7 @@ self: {
         text
       ];
       description = "Lens combinators for Shpadoinkle applications";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41218,7 +41392,7 @@ self: {
         warp
       ];
       description = "A single page application rounter for Shpadoinkle based on Servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41244,7 +41418,7 @@ self: {
         text
       ];
       description = "Integration of the streaming library with Shpadoinkle continuations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41291,7 +41465,7 @@ self: {
         text
       ];
       description = "Read standard file formats into Shpadoinkle with Template Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -41357,7 +41531,7 @@ self: {
         quickcheck-classes-base
       ];
       description = "A collection of common reusable types and components";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -43029,6 +43203,8 @@ self: {
       pname = "StrictCheck";
       version = "0.4.0";
       sha256 = "0l7h39a7a1zc7xrsz6ggscn6406q3wi57n50w8hvdm4dd6qf333f";
+      revision = "1";
+      editedCabalFile = "1pklbr8r76mkg3sg9v6qj39d7cg2wswrgr3ymycw91g50l74c721";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -43133,7 +43309,7 @@ self: {
       sha256 = "0nxk4a997sibj8nl1b1r6mcn0r7qbyz68jnirv29lq2yyh6lbja4";
       doHaddock = false;
       description = "Svg Icons and more";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -43196,7 +43372,7 @@ self: {
         random
       ];
       description = "Synapse is a machine learning library written in pure Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -43231,6 +43407,8 @@ self: {
       ];
       description = "Syntax Macros in the form of an EDSL";
       license = "LGPL";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -43479,7 +43657,7 @@ self: {
         template-haskell
       ];
       description = "A \"noDSL\" approach to mixing shell scripting with Haskell programs using Template Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "thsh";
     }
   ) { };
@@ -45204,6 +45382,8 @@ self: {
       pname = "Unique";
       version = "0.4.8.0";
       sha256 = "1wv9dskvs2im5a97h3xm161sbqcbw81d7knk81y876ghqqf3hr56";
+      revision = "1";
+      editedCabalFile = "0cxifpgiq110618hzas1yz3g7ngcliw1skb9nahw3arsz3c3zifj";
       libraryHaskellDepends = [
         base
         containers
@@ -45544,7 +45724,7 @@ self: {
         parsec
       ];
       description = "A Valve Value-keyvalue parser for Haskell made with Parsec";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -45964,7 +46144,7 @@ self: {
         vulkan
       ];
       description = "Bindings to the VulkanMemoryAllocator library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = [
         "i686-linux"
         "armv7l-linux"
@@ -46333,7 +46513,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Simple set types. Useful to create sets of arbitrary types and nested sets.";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -47434,8 +47614,8 @@ self: {
       pname = "X";
       version = "0.3.1.0";
       sha256 = "10paczbaiwag50v8ay9pl0f6whqds6y0yy14z0h8s6j04p9zd50f";
-      revision = "1";
-      editedCabalFile = "1c24q6bh9zq1a9rm9wqi8kasfzcn3cvbzdcgya8clwh3k7xbsvmg";
+      revision = "2";
+      editedCabalFile = "00q4sl0c1yb1gi3ycz46c5h5yl8f8pg6q2wdxxlvpxsxpnxsjdqv";
       libraryHaskellDepends = [
         base
         bytestring
@@ -47607,7 +47787,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libXft ];
       description = "Bindings to the Xft and some Xrender parts";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.slotThe ];
     }
   ) { inherit (pkgs.xorg) libXft; };
@@ -48459,7 +48639,7 @@ self: {
         Z-IO
       ];
       description = "Crypto for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -48530,7 +48710,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Array, vector and text";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -48593,7 +48773,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple and high performance IO toolkit for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -48691,7 +48871,7 @@ self: {
         Z-Data
       ];
       description = "YAML tools";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -48817,7 +48997,7 @@ self: {
         syz
       ];
       description = "An implementation of Attribute Grammars using Functional Zippers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -48863,6 +49043,37 @@ self: {
     }
   ) { };
 
+  Ztrategic = callPackage (
+    {
+      mkDerivation,
+      base,
+      monadplus,
+      mtl,
+      random,
+      syb,
+      syz,
+      transformers,
+      ZipperAG,
+    }:
+    mkDerivation {
+      pname = "Ztrategic";
+      version = "0.1.0";
+      sha256 = "0720gmpijd89sma3699cqc2mwj60bz6gidrgfsnm0zw67saqcq1f";
+      libraryHaskellDepends = [
+        base
+        monadplus
+        mtl
+        random
+        syb
+        syz
+        transformers
+        ZipperAG
+      ];
+      description = "Zipper-based library for strategic programming and attribute grammars";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   Zwaluw = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -48939,7 +49150,7 @@ self: {
         text
       ];
       description = "Convert distfix precedence grammars to unambiguous context-free grammars";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -49437,7 +49648,7 @@ self: {
         wide-word
       ];
       description = "Data structures and algorithms";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example-lazy-segtree";
       broken = true;
@@ -49529,7 +49740,7 @@ self: {
         rerebase
       ];
       description = "Sequence optimized for monoidal construction and folding";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -51825,7 +52036,7 @@ self: {
         wreq
       ];
       description = "implements ACME clients (rfc-8555)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -52256,7 +52467,7 @@ self: {
         text
       ];
       description = "AcousticBrainz API client";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -52279,7 +52490,7 @@ self: {
         transformers
       ];
       description = "Abstraction over management of resources";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -52545,7 +52756,7 @@ self: {
       ];
       doHaddock = false;
       description = "Semigroup actions and torsors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -52651,7 +52862,7 @@ self: {
       sha256 = "07zi06qqmrn14awz7vxn5rx1j62fc9xp2qx52s1j91kh9zy8pzxn";
       libraryHaskellDepends = [ base ];
       description = "Multidimensional integration";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -52729,8 +52940,8 @@ self: {
     }:
     mkDerivation {
       pname = "adblock2privoxy";
-      version = "2.3.0";
-      sha256 = "0aaz9kxvsyiwn0infzf9qlvq7wlrsamg4brr11332aljg8phnsmx";
+      version = "2.3.1";
+      sha256 = "1gnh8w56qkp1bsrdiydsyig6s4vzhg5zgw68hnl4s9fq99016qca";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -52754,9 +52965,7 @@ self: {
       ];
       description = "Convert adblock config files to privoxy format";
       license = lib.licenses.gpl3Only;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "adblock2privoxy";
-      broken = true;
     }
   ) { };
 
@@ -52834,7 +53043,7 @@ self: {
         validation-selective
       ];
       description = "A full-featured library for parsing, validating, and rendering email addresses";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -52869,7 +53078,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Manage fine grained fixtures";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -52905,7 +53114,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Manage fine grained fixtures";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -53028,7 +53237,7 @@ self: {
         hs-functors
       ];
       description = "See README for more info";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -53555,6 +53764,37 @@ self: {
     }
   ) { };
 
+  aes-gcm = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      bytestring,
+      openssl,
+      tasty,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "aes-gcm";
+      version = "0.0.0.0";
+      sha256 = "1shzy466bqy4s15azn8b4ijqdy0drz0zi9f3rxxwdyc730mnikap";
+      libraryHaskellDepends = [
+        base
+        bytestring
+      ];
+      libraryPkgconfigDepends = [ openssl ];
+      testHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        tasty
+        tasty-hunit
+      ];
+      description = "AES Galois/Counter Mode (GCM) AEAD Cipher";
+      license = lib.licensesSpdx."GPL-2.0-or-later";
+    }
+  ) { inherit (pkgs) openssl; };
+
   aeson = callPackage (
     {
       mkDerivation,
@@ -53689,7 +53929,7 @@ self: {
         vector
       ];
       description = "Fast JSON parsing and encoding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -53897,8 +54137,8 @@ self: {
     }:
     mkDerivation {
       pname = "aeson-combinators";
-      version = "0.1.2.1";
-      sha256 = "10r3k8hi0rcvpi2868m4282zrnn57q7gj25ldhkja7mvz199wddz";
+      version = "0.1.2.2";
+      sha256 = "1lpkkjq411xkccrnkfnvg297s46myfpzncm1i89lb213a1agn3br";
       libraryHaskellDepends = [
         aeson
         attoparsec-aeson
@@ -53933,8 +54173,6 @@ self: {
       ];
       description = "Aeson combinators for dead simple JSON decoding";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -54095,7 +54333,7 @@ self: {
         vector
       ];
       description = "Easy functions for converting from Aeson.Value";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -54172,7 +54410,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "JSON encoding/decoding for dependent-sum";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -54662,7 +54900,7 @@ self: {
         text
       ];
       description = "Type-level default fields for aeson Generic FromJSON parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -54716,7 +54954,7 @@ self: {
         time
       ];
       description = "Generates TypeScript definitions that match Generic Aeson encodings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tests";
       broken = true;
@@ -54944,6 +55182,7 @@ self: {
       aeson,
       aeson-qq,
       attoparsec,
+      attoparsec-aeson,
       base,
       bytestring,
       case-insensitive,
@@ -54951,6 +55190,7 @@ self: {
       either,
       haskell-src-meta,
       hspec,
+      hspec-discover,
       pretty,
       scientific,
       template-haskell,
@@ -54960,11 +55200,12 @@ self: {
     }:
     mkDerivation {
       pname = "aeson-match-qq";
-      version = "1.7.0";
-      sha256 = "11cmqk6igrapi9ms211gbmfwkyczjrzpg900fxqypn18lj1k4y60";
+      version = "1.8.0";
+      sha256 = "1jzkxpy7qgln68sz5r9j5n963pnwxnclqav8qfc583yv9zszl0dp";
       libraryHaskellDepends = [
         aeson
         attoparsec
+        attoparsec-aeson
         base
         bytestring
         case-insensitive
@@ -54985,10 +55226,9 @@ self: {
         hspec
         unordered-containers
       ];
+      testToolDepends = [ hspec-discover ];
       description = "Declarative JSON matchers";
       license = lib.licenses.bsd2;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -55218,7 +55458,7 @@ self: {
         tasty-quickcheck-laws
       ];
       description = "Possible values for aeson";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -55667,7 +55907,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Conveniently wrap a single value in a record when encoding to and from JSON";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -55799,7 +56039,7 @@ self: {
         vector
       ];
       description = "Aeson instances for the Tiled map editor";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -55916,7 +56156,7 @@ self: {
         vector
       ];
       description = "Aliases to \"aeson\" AST making it importable unqualified";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -55986,7 +56226,7 @@ self: {
         vector
       ];
       description = "API for parsing \"aeson\" JSON tree into Haskell types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -56379,7 +56619,7 @@ self: {
         uniqueness-periods-vector-stats
       ];
       description = "An AFTOVolio implementation for creating texts with special phonetic / prosodic properties";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -56695,7 +56935,7 @@ self: {
         text
       ];
       description = "Check for unused code in an Agda project";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "agda-unused";
       broken = true;
@@ -56748,7 +56988,7 @@ self: {
         yaml
       ];
       description = "Compiling Agda code to readable Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "agda2hs";
       maintainers = [ lib.maintainers.ncfavier ];
     }
@@ -56873,13 +57113,76 @@ self: {
       ];
       doHaddock = false;
       description = "Agda backend to generate training data for machine learning purposes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "agda2train";
       broken = true;
     }
   ) { };
 
+  age = callPackage (
+    {
+      mkDerivation,
+      attoparsec,
+      base,
+      base16,
+      base64,
+      bech32,
+      binary,
+      bytestring,
+      conduit,
+      conduit-extra,
+      crypton,
+      directory,
+      hedgehog,
+      memory,
+      mmorph,
+      mono-traversable,
+      mtl,
+      text,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "age";
+      version = "0.0.1.0";
+      sha256 = "0zlx7q72yzk9zjks7720w0qvkdgib810c70v13pyldkgq7qjgim2";
+      libraryHaskellDepends = [
+        attoparsec
+        base
+        base64
+        bech32
+        binary
+        bytestring
+        conduit
+        conduit-extra
+        crypton
+        memory
+        mono-traversable
+        mtl
+        text
+        transformers
+      ];
+      testHaskellDepends = [
+        attoparsec
+        base
+        base16
+        bytestring
+        conduit
+        conduit-extra
+        crypton
+        directory
+        hedgehog
+        memory
+        mmorph
+        mtl
+        text
+      ];
+      description = "Actually Good Encryption";
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   agentx = callPackage (
     {
       mkDerivation,
@@ -57411,7 +57714,7 @@ self: {
         unordered-containers
       ];
       description = "Automatically generate a GraphQL API for an SQLite database";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "airgql";
     }
@@ -57566,8 +57869,8 @@ self: {
     }:
     mkDerivation {
       pname = "aivika";
-      version = "6.1.1";
-      sha256 = "0g6f1048bxcyhp1kq7bjyrjfv96fawi5n0j5nvfjq544sc3s7b3m";
+      version = "6.2";
+      sha256 = "04pchpyq79zmsy8gvvd1d06ylq22ngcbdmydwk4x3bkh5qqw1hdl";
       libraryHaskellDepends = [
         array
         base
@@ -58793,47 +59096,6 @@ self: {
     }
   ) { };
 
-  algebraic-graphs_0_6_1 = callPackage (
-    {
-      mkDerivation,
-      array,
-      base,
-      containers,
-      deepseq,
-      extra,
-      inspection-testing,
-      QuickCheck,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "algebraic-graphs";
-      version = "0.6.1";
-      sha256 = "168aqkm7mfd4is95qwpyf9k0k95qf5rfnkhq5ydbr74jj4jrhr1d";
-      revision = "1";
-      editedCabalFile = "1lnzgy3z51jyl1ail3wdd817np84gzi2bplccwzbm72glwbakc5h";
-      libraryHaskellDepends = [
-        array
-        base
-        containers
-        deepseq
-        transformers
-      ];
-      testHaskellDepends = [
-        array
-        base
-        containers
-        deepseq
-        extra
-        inspection-testing
-        QuickCheck
-        transformers
-      ];
-      description = "A library for algebraic graph construction and transformation";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   algebraic-graphs = callPackage (
     {
       mkDerivation,
@@ -58870,7 +59132,7 @@ self: {
         transformers
       ];
       description = "A library for algebraic graph construction and transformation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -59372,7 +59634,7 @@ self: {
         utility-ht
       ];
       description = "Find relative time displacement of two recordings of the same music";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "align-audio";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -59408,7 +59670,7 @@ self: {
         text
       ];
       description = "Aligns text prefixes before '=' for consistent formatting";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "align-equal";
       broken = true;
@@ -59826,7 +60088,9 @@ self: {
       ];
       description = "A compiler for the Alpha language";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "alpha";
+      broken = true;
     }
   ) { };
 
@@ -60167,12 +60431,54 @@ self: {
       ];
       libraryPkgconfigDepends = [ alsa-lib ];
       description = "Binding to the ALSA Library API (MIDI sequencer)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.linux;
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { inherit (pkgs) alsa-lib; };
 
+  alsa-seq_0_6_0_10 = callPackage (
+    {
+      mkDerivation,
+      alsa-core,
+      alsa-lib,
+      array,
+      base,
+      bytestring,
+      data-accessor,
+      enumset,
+      extensible-exceptions,
+      poll,
+      transformers,
+      utility-ht,
+    }:
+    mkDerivation {
+      pname = "alsa-seq";
+      version = "0.6.0.10";
+      sha256 = "066sqfyz41km6qvgqqvaj9kmqxc48sdalbsv2449jdlw6z76md3w";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        alsa-core
+        array
+        base
+        bytestring
+        data-accessor
+        enumset
+        extensible-exceptions
+        poll
+        transformers
+        utility-ht
+      ];
+      libraryPkgconfigDepends = [ alsa-lib ];
+      description = "Binding to the ALSA Library API (MIDI sequencer)";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      platforms = lib.platforms.linux;
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.thielema ];
+    }
+  ) { inherit (pkgs) alsa-lib; };
+
   alsa-seq-tests = callPackage (
     {
       mkDerivation,
@@ -60456,7 +60762,7 @@ self: {
       version = "0.1";
       sha256 = "15fwq1pmb3d46cgsj59q3iz2qs0lgvq5b9d6gxfysnjlm3sp0ivw";
       description = "provides a typeclass that is always satisfied";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -60647,7 +60953,7 @@ self: {
         uuid
       ];
       description = "Comprehensive Amazon Web Services SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -60689,7 +60995,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Access Analyzer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60730,7 +61036,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Account SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60771,7 +61077,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Alexa For Business SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60812,7 +61118,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Prometheus Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60853,7 +61159,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Amplify SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60894,7 +61200,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AmplifyBackend SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60935,7 +61241,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Amplify UI Builder SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -60976,7 +61282,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon API Gateway SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61017,7 +61323,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ApiGatewayManagementApi SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61058,7 +61364,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ApiGatewayV2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61099,7 +61405,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppConfig SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61140,7 +61446,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppConfig Data SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61181,7 +61487,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Appflow SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61222,7 +61528,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppIntegrations Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61263,7 +61569,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Auto Scaling SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61304,7 +61610,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Application Insights SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61345,7 +61651,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Cost Profiler SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61386,7 +61692,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon App Mesh SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61427,7 +61733,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon App Runner SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61468,7 +61774,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppStream SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61509,7 +61815,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon AppSync SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61550,7 +61856,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ARC - Zonal Shift SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61591,7 +61897,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Athena SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61632,7 +61938,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Audit Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61673,7 +61979,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Auto Scaling SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61714,7 +62020,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Auto Scaling Plans SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61755,7 +62061,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Backup SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61796,7 +62102,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Backup Gateway SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61837,7 +62143,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Backup Storage SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61878,7 +62184,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Batch SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61919,7 +62225,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon BillingConductor SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -61960,7 +62266,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Braket SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62001,7 +62307,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Budgets SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62042,7 +62348,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Certificate Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62083,7 +62389,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Certificate Manager Private Certificate Authority SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62124,7 +62430,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62165,7 +62471,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Identity SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62206,7 +62512,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Media Pipelines SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62247,7 +62553,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Meetings SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62288,7 +62594,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Messaging SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62329,7 +62635,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Chime SDK Voice SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62370,7 +62676,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cloud9 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62411,7 +62717,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cloud Control API SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62452,7 +62758,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudDirectory SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62493,7 +62799,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudFormation SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62534,7 +62840,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudFront SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62575,7 +62881,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudHSM SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62616,7 +62922,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudHSM V2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62657,7 +62963,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudSearch SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62698,7 +63004,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudSearch Domain SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62739,7 +63045,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudTrail SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62780,7 +63086,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62821,7 +63127,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EventBridge SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62862,7 +63168,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Logs SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62903,7 +63209,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeArtifact SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62944,7 +63250,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeBuild SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -62985,7 +63291,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeCommit SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63026,7 +63332,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeDeploy SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63067,7 +63373,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeGuru Reviewer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63108,7 +63414,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeGuru Profiler SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63149,7 +63455,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodePipeline SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63190,7 +63496,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeStar SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63231,7 +63537,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeStar connections SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63272,7 +63578,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CodeStar Notifications SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63313,7 +63619,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cognito Identity SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63354,7 +63660,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cognito Identity Provider SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63395,7 +63701,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cognito Sync SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63436,7 +63742,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Comprehend SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63477,7 +63783,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Comprehend Medical SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63518,7 +63824,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Compute Optimizer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63559,7 +63865,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Config SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63600,7 +63906,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63641,7 +63947,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Contact Lens SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63682,7 +63988,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ConnectCampaignService SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63723,7 +64029,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Cases SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63764,7 +64070,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Participant Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63806,7 +64112,7 @@ self: {
         text
       ];
       description = "A Haskell equivalent of \"aws rds generate-db-auth-token\"";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "generate-db-auth-token";
       broken = true;
@@ -63850,7 +64156,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Control Tower SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63942,7 +64248,7 @@ self: {
         time
       ];
       description = "Core data types and functionality for Amazonka libraries";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -63983,7 +64289,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cost Explorer Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64024,7 +64330,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cost and Usage Report Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64065,7 +64371,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Customer Profiles SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64106,7 +64412,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Glue DataBrew SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64147,7 +64453,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Data Exchange SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64188,7 +64494,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Data Pipeline SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64229,7 +64535,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DataSync SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64270,7 +64576,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Detective SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64311,7 +64617,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Device Farm SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64352,7 +64658,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DevOps Guru SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64393,7 +64699,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Direct Connect SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64434,7 +64740,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Discovery Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64475,7 +64781,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Data Lifecycle Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64516,7 +64822,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Database Migration Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64557,7 +64863,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DocumentDB with MongoDB compatibility SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64598,7 +64904,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DocumentDB Elastic Clusters SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64639,7 +64945,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Disaster Recovery Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64680,7 +64986,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Directory Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64730,7 +65036,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DynamoDB SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -64773,7 +65079,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DynamoDB Accelerator (DAX) SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64823,7 +65129,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon DynamoDB Streams SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -64866,7 +65172,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Block Store SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64907,7 +65213,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Compute Cloud SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64948,7 +65254,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Instance Connect SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -64989,7 +65295,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Container Registry SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65030,7 +65336,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Container Registry Public SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65071,7 +65377,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Container Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65112,7 +65418,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic File System SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65153,7 +65459,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Kubernetes Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65194,7 +65500,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Inference SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65235,7 +65541,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ElastiCache SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65276,7 +65582,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Beanstalk SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65317,7 +65623,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elasticsearch Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65358,7 +65664,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Transcoder SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65399,7 +65705,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Load Balancing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65440,7 +65746,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elastic Load Balancing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65481,7 +65787,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EMR SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65522,7 +65828,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EMR Containers SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65563,7 +65869,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EMR Serverless SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65604,7 +65910,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Evidently SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65645,7 +65951,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon FinSpace User Environment Management service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65686,7 +65992,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon FinSpace Public API SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65727,7 +66033,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Fault Injection Simulator SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65768,7 +66074,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Firewall Management Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65809,7 +66115,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Forecast Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65850,7 +66156,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Forecast Query Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65891,7 +66197,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Fraud Detector SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65932,7 +66238,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon FSx SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -65973,7 +66279,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon GameLift SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66014,7 +66320,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon GameSparks SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66055,7 +66361,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Glacier SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66096,7 +66402,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Global Accelerator SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66137,7 +66443,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Glue SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66178,7 +66484,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Grafana SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66219,7 +66525,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Greengrass SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66260,7 +66566,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Greengrass V2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66301,7 +66607,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Ground Station SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66342,7 +66648,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon GuardDuty SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66383,7 +66689,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Health APIs and Notifications SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66424,7 +66730,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon HealthLake SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66465,7 +66771,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Honeycode SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66506,7 +66812,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Identity and Access Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66594,7 +66900,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SSO Identity Store SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66635,7 +66941,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EC2 Image Builder SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66676,7 +66982,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Import/Export SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66717,7 +67023,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Inspector SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66758,7 +67064,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Inspector2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66799,7 +67105,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66840,7 +67146,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Analytics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66881,7 +67187,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Data Plane SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66922,7 +67228,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Jobs Data Plane SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -66963,7 +67269,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT RoboRunner SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67004,7 +67310,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT 1-Click Devices Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67045,7 +67351,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT 1-Click Projects Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67086,7 +67392,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Core Device Advisor SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67127,7 +67433,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Events SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67168,7 +67474,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Events Data SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67209,7 +67515,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Fleet Hub SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67250,7 +67556,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT FleetWise SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67291,7 +67597,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Secure Tunneling SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67332,7 +67638,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT SiteWise SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67373,7 +67679,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Things Graph SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67414,7 +67720,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT TwinMaker SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67455,7 +67761,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IoT Wireless SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67496,7 +67802,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Interactive Video Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67537,7 +67843,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Interactive Video Service Chat SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67578,7 +67884,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Streaming for Kafka SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67619,7 +67925,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Streaming for Kafka Connect SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67660,7 +67966,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon KendraFrontendService SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67701,7 +68007,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Keyspaces SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67742,7 +68048,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67783,7 +68089,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Analytics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67824,7 +68130,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Firehose SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67865,7 +68171,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Streams SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67906,7 +68212,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Streams Archived Media SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67947,7 +68253,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Streams Media SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -67988,7 +68294,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video Signaling Channels SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68029,7 +68335,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Video WebRTC Storage SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68070,7 +68376,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Kinesis Analytics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68111,7 +68417,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Key Management Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68152,7 +68458,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lake Formation SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68193,7 +68499,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lambda SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68234,7 +68540,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lex Model Building Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68275,7 +68581,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lex Runtime Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68316,7 +68622,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lex Model Building V2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68357,7 +68663,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon License Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68398,7 +68704,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon License Manager Linux Subscriptions SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68439,7 +68745,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon License Manager User Subscriptions SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68480,7 +68786,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lightsail SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68521,7 +68827,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Location Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68562,7 +68868,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lookout for Equipment SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68603,7 +68909,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lookout for Metrics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68644,7 +68950,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Lookout for Vision SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68685,7 +68991,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MainframeModernization SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68726,7 +69032,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Macie SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68767,7 +69073,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Macie 2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68808,7 +69114,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Managed Blockchain SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68849,7 +69155,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Commerce Analytics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68890,7 +69196,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Catalog Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68931,7 +69237,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Entitlement Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -68972,7 +69278,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Marketplace Metering SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69013,7 +69319,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Mechanical Turk SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69054,7 +69360,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MediaConnect SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69095,7 +69401,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaConvert SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69136,7 +69442,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaLive SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69177,7 +69483,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaPackage SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69218,7 +69524,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaPackage VOD SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69259,7 +69565,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaStore SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69300,7 +69606,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Elemental MediaStore Data Plane SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69341,7 +69647,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MediaTailor SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69382,7 +69688,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MemoryDB SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69423,7 +69729,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Application Migration Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69464,7 +69770,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Refactor Spaces SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69505,7 +69811,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69546,7 +69852,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Config SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69587,7 +69893,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Orchestrator SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69628,7 +69934,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Migration Hub Strategy Recommendations SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69669,7 +69975,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Machine Learning SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69710,7 +70016,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Mobile SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69751,7 +70057,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MQ SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69847,7 +70153,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon MWAA SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69888,7 +70194,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Neptune SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69929,7 +70235,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Network Firewall SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -69970,7 +70276,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Network Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70011,7 +70317,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon NimbleStudio SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70052,7 +70358,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch Observability Access Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70093,7 +70399,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Omics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70134,7 +70440,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpenSearch Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70175,7 +70481,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpenSearch Service Serverless SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70216,7 +70522,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpsWorks SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70257,7 +70563,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon OpsWorks CM SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70298,7 +70604,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Organizations SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70339,7 +70645,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Outposts SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70380,7 +70686,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Panorama SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70421,7 +70727,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Personalize SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70462,7 +70768,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Personalize Events SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70503,7 +70809,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Personalize Runtime SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70544,7 +70850,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Performance Insights SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70585,7 +70891,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70626,7 +70932,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint Email Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70667,7 +70973,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SMS and Voice Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70708,7 +71014,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SMS Voice V2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70749,7 +71055,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EventBridge Pipes SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70790,7 +71096,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Polly SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70831,7 +71137,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Price List Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70872,7 +71178,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Private 5G SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70913,7 +71219,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Proton SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70954,7 +71260,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon QLDB SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -70995,7 +71301,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon QLDB Session SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71036,7 +71342,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon QuickSight SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71077,7 +71383,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Access Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71118,7 +71424,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Recycle Bin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71159,7 +71465,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Relational Database Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71200,7 +71506,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon RDS DataService SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71241,7 +71547,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Redshift SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71282,7 +71588,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Redshift Data API Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71323,7 +71629,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Redshift Serverless SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71364,7 +71670,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Rekognition SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71405,7 +71711,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resilience Hub SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71446,7 +71752,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Explorer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71487,7 +71793,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Groups SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71528,7 +71834,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Resource Groups Tagging API SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71569,7 +71875,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon RoboMaker SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71610,7 +71916,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon IAM Roles Anywhere SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71652,7 +71958,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route 53 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71693,7 +71999,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Cloud Map SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71734,7 +72040,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route 53 Domains SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71775,7 +72081,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route53 Recovery Cluster SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71816,7 +72122,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route53 Recovery Control Config SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71857,7 +72163,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route53 Recovery Readiness SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71898,7 +72204,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Route 53 Resolver SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71939,7 +72245,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon CloudWatch RUM SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -71983,7 +72289,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Storage Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72058,7 +72364,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Storage Service SDK - Client-Side Encryption";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -72144,7 +72450,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon S3 on Outposts SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72185,7 +72491,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72226,7 +72532,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Augmented AI Runtime SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72267,7 +72573,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Sagemaker Edge Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72308,7 +72614,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Feature Store Runtime SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72349,7 +72655,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker geospatial capabilities SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72390,7 +72696,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Metrics Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72431,7 +72737,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SageMaker Runtime SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72472,7 +72778,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Savings Plans SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72513,7 +72819,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon EventBridge Scheduler SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72554,7 +72860,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Schemas SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72595,7 +72901,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SimpleDB SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72636,7 +72942,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Secrets Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72677,7 +72983,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SecurityHub SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72718,7 +73024,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Security Lake SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72759,7 +73065,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon ServerlessApplicationRepository SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72800,7 +73106,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Quotas SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72841,7 +73147,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Service Catalog SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72882,7 +73188,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Service Catalog App Registry SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72923,7 +73229,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Email Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -72964,7 +73270,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Email Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73005,7 +73311,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Shield SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73046,7 +73352,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Signer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73087,7 +73393,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SimSpace Weaver SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73128,7 +73434,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Server Migration Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73169,7 +73475,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Pinpoint SMS and Voice Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73210,7 +73516,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Snow Device Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73251,7 +73557,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Import/Export Snowball SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73292,7 +73598,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Notification Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73333,7 +73639,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Queue Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73374,7 +73680,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Systems Manager (SSM) SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73415,7 +73721,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Systems Manager Incident Manager Contacts SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73456,7 +73762,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Systems Manager Incident Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73497,7 +73803,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Systems Manager for SAP SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73538,7 +73844,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Single Sign-On SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73579,7 +73885,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Single Sign-On Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73620,7 +73926,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon SSO OIDC SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73661,7 +73967,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Step Functions SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73702,7 +74008,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Storage Gateway SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73743,7 +74049,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Security Token Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73784,7 +74090,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Support SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73825,7 +74131,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Support App SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73866,7 +74172,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Simple Workflow Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73907,7 +74213,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Synthetics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -73964,7 +74270,7 @@ self: {
         yaml
       ];
       description = "Common functionality for Amazonka library test-suites";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74005,7 +74311,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Textract SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74046,7 +74352,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Timestream Query SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74087,7 +74393,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Timestream Write SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74128,7 +74434,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Transcribe Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74169,7 +74475,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Transfer Family SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74210,7 +74516,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Translate SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74251,7 +74557,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Voice ID SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74292,7 +74598,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WAF SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74333,7 +74639,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WAF Regional SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74374,7 +74680,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WAFV2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74415,7 +74721,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Well-Architected Tool SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74456,7 +74762,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon Connect Wisdom Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74497,7 +74803,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkDocs SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74538,7 +74844,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkLink SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74579,7 +74885,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkMail SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74620,7 +74926,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkMail Message Flow SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74661,7 +74967,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkSpaces SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74702,7 +75008,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon WorkSpaces Web SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -74743,7 +75049,7 @@ self: {
         unordered-containers
       ];
       description = "Amazon X-Ray SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -76572,8 +76878,8 @@ self: {
       pname = "ansi-terminal-game";
       version = "1.9.3.0";
       sha256 = "1yy7hzdcawdmwl8wqzabbamzjdg260xbwryj0hdjn7b0n6qlqymk";
-      revision = "3";
-      editedCabalFile = "0m4df8a2p18j29zsgffnyf69hjkyam3rg3xc4zvmxafidj877ykk";
+      revision = "4";
+      editedCabalFile = "0ccd308nkvwihg81p14bjzliaapig5bw697afmvivsxy400yf4x3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -76801,7 +77107,7 @@ self: {
         HUnit
       ];
       description = "Yet another alternative Prelude for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -76985,7 +77291,7 @@ self: {
         time
       ];
       description = "Simple job/task/event scheduler/cronjob";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -77059,7 +77365,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77088,7 +77394,7 @@ self: {
         text
       ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77163,7 +77469,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77215,7 +77521,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77260,7 +77566,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77325,7 +77631,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77370,7 +77676,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77463,7 +77769,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77553,7 +77859,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -77612,7 +77918,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77690,7 +77996,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -77726,7 +78032,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Please see the README on Github at <https://github.com/arbor/antiope#readme>";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78001,7 +78307,7 @@ self: {
         unordered-containers
       ];
       description = "Utility functions commonly used while solving Advent of Code puzzles";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78028,7 +78334,7 @@ self: {
         ghc-prim
       ];
       description = "prelude for Algebra of Programming";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -78331,7 +78637,7 @@ self: {
         vector
       ];
       description = "Adaptation of the apecs library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -80399,7 +80705,7 @@ self: {
       sha256 = "0bkcwrxz313825vvm0yspj7vw2zmky8g2vq1yb9s8wgxzm4b7m8n";
       libraryHaskellDepends = [ base ];
       description = "A class for things that can be applied";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -80464,7 +80770,7 @@ self: {
       sha256 = "0jr81m0mksfxbvzjs3c73kilr09w4gh7zv1amdx9xcvq5zb96imd";
       libraryHaskellDepends = [ base ];
       description = "Generalized logic operations for Applicative and Alternative functors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -80591,8 +80897,8 @@ self: {
       pname = "apply-merge";
       version = "0.1.1.0";
       sha256 = "1snm9m35r3px9vgn64ygcqq37ay6jvwc5jsi3s62rxrh8biy8ir8";
-      revision = "5";
-      editedCabalFile = "1bcpcp6cg50bm4p7snbl8z9vrmps2qzfhzf3v8rk3xlcwfmhvjw0";
+      revision = "6";
+      editedCabalFile = "1b98vn8j14mm4hxxfd34h2mzjjmraxg199z234q7gdgafwwc19ix";
       libraryHaskellDepends = [
         base
         containers
@@ -80623,7 +80929,7 @@ self: {
         vector
       ];
       description = "Lift a binary, non-decreasing function onto ordered lists and order the output";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -80720,7 +81026,7 @@ self: {
         unix-compat
       ];
       description = "Perform refactorings specified by the refact library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "refactor";
     }
   ) { };
@@ -81277,7 +81583,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Datadog client for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -81311,7 +81617,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "LRU cache based on STM";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -81362,7 +81668,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Counter library for submitting metrics to a backend such as datadog";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -81411,7 +81717,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple logging library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "arbor-monad-logger-example";
       broken = true;
@@ -81472,7 +81778,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Core metric library for publishing metrics";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -81544,7 +81850,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Metric library backend for datadog";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -81578,7 +81884,7 @@ self: {
         text
       ];
       description = "Convenience types and functions for postgresql-simple";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -81624,6 +81930,8 @@ self: {
       pname = "arbtt";
       version = "0.12.0.3";
       sha256 = "1wgc17fwnsqff8amwvv6jymhwjqrw653simv6gyxx89s1cla954d";
+      revision = "1";
+      editedCabalFile = "1kbma0ssjg8pd1rk9vi2bi7gy0fkfqpd6syh9271z350avgiwhf9";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -81839,7 +82147,7 @@ self: {
         text
       ];
       description = "Distribute hackage packages to archlinux";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -81917,7 +82225,7 @@ self: {
         time
       ];
       description = "Arch Linux official and AUR web interface binding";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.berberman ];
     }
   ) { };
@@ -82484,7 +82792,7 @@ self: {
         transformers
       ];
       description = "Parse and render JSON";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "argo";
       broken = true;
@@ -82885,7 +83193,7 @@ self: {
         unix
       ];
       description = "Run docker-compose with help from Nix/NixOS";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "arion";
       maintainers = [ lib.maintainers.roberth ];
     }
@@ -83417,7 +83725,7 @@ self: {
         tasty-hunit
       ];
       description = "Builders for arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -83452,7 +83760,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Lists of chunks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -83682,7 +83990,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell bindings to the ArrayFire general-purpose GPU library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -83719,7 +84027,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Memory-efficient ArrayList implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -83970,7 +84278,7 @@ self: {
         text
       ];
       description = "Basic types and instances for Valve's Artifact Card-set API";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -84216,7 +84524,7 @@ self: {
         text
       ];
       description = "The ASCII character set and encoding";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -84276,7 +84584,7 @@ self: {
         hspec
       ];
       description = "ASCII letter case";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -84306,7 +84614,7 @@ self: {
         hspec
       ];
       description = "ASCII character without an upper/lower case distinction";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -84334,7 +84642,7 @@ self: {
         hspec
       ];
       description = "A Char type representing an ASCII character";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -84410,7 +84718,7 @@ self: {
         hspec
       ];
       description = "ASCII character groups";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -84482,7 +84790,7 @@ self: {
         text
       ];
       description = "ASCII representations of numbers";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -84508,7 +84816,7 @@ self: {
         hedgehog
       ];
       description = "Various categorizations of ASCII characters";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -84634,7 +84942,7 @@ self: {
         text
       ];
       description = "Representing ASCII with refined supersets";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -84709,7 +85017,7 @@ self: {
         text
       ];
       description = "Template Haskell support for ASCII";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -85107,7 +85415,7 @@ self: {
         hspec-discover
       ];
       description = "Library for creating and querying segmented feeds";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "asif";
       broken = true;
@@ -85246,7 +85554,7 @@ self: {
         text-short
       ];
       description = "ASN.1 BER Encode and Decode";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -85811,7 +86119,7 @@ self: {
         weigh
       ];
       description = "A solution to the assignment problem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -85851,7 +86159,7 @@ self: {
       editedCabalFile = "0pqq27nzpsabvklgbldqls37mcl2hzs19qy6balsqk7b3x6rpcqa";
       libraryHaskellDepends = [ base ];
       description = "swap and assoc: Symmetric and Semigroupy Bifunctors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -85878,7 +86186,7 @@ self: {
         hedgehog
       ];
       description = "Association lists (lists of tuples)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -85910,7 +86218,7 @@ self: {
         ListLike
       ];
       description = "Association lists (list-like collections of tuples)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -87255,7 +87563,7 @@ self: {
         xml-types
       ];
       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
     }
   ) { };
 
@@ -87295,8 +87603,8 @@ self: {
     }:
     mkDerivation {
       pname = "atomic-counter";
-      version = "0.1.2.3";
-      sha256 = "016gyi2nzgr0lyd3g99snjjh49i2hgs8kbrjprn4439w3cwn6jyf";
+      version = "0.1.2.4";
+      sha256 = "0bzccg6qcd4b544znwzrahpwnbawn3cqf8h22qd0bnk6vkgfh0di";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         async
@@ -87316,7 +87624,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Mutable counters that can be modified with atomic operatinos";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -87362,7 +87670,7 @@ self: {
         text
       ];
       description = "Type-safe, composable CSS utility functions. Inspired by Tailwindcss and Elm-UI";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -87430,7 +87738,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Generalizations of atomicModifyIORef";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -87453,7 +87761,7 @@ self: {
         primitive
       ];
       description = "A safe approach to CAS and other atomic ops in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -87669,7 +87977,7 @@ self: {
         text
       ];
       description = "Interface to automated theorem provers";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -87778,7 +88086,7 @@ self: {
         tasty-bench
       ];
       description = "Faster integer division and modulus operations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -88078,6 +88386,43 @@ self: {
     }
   ) { };
 
+  attic = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      http-api-data,
+      process,
+      relude,
+      safecopy,
+      servant,
+      template-haskell,
+      text,
+      which,
+    }:
+    mkDerivation {
+      pname = "attic";
+      version = "0.1.0.0";
+      sha256 = "1hy7dyw4vks47awx210iq8vcjxxc1d9vkfqf3src7pvs9yqb4amx";
+      libraryHaskellDepends = [
+        aeson
+        base
+        http-api-data
+        process
+        relude
+        safecopy
+        servant
+        template-haskell
+        text
+        which
+      ];
+      description = "Haskell bindings for Nix attic cache";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   attic-schedule = callPackage (
     {
       mkDerivation,
@@ -88424,7 +88769,7 @@ self: {
         vector
       ];
       description = "Parsing of aeson's Value with attoparsec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -88565,7 +88910,7 @@ self: {
         uuid
       ];
       description = "Parsers for the standard Haskell data types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -88665,7 +89010,7 @@ self: {
         text
       ];
       description = "Use Attoparsec to parse framed protocol byte streams";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -88767,8 +89112,8 @@ self: {
     }:
     mkDerivation {
       pname = "attoparsec-isotropic";
-      version = "0.14.5";
-      sha256 = "1bvxy2gydz3kv0fbhp77bwk75l73kz7qc4aa7wlldga90f8y3vhj";
+      version = "0.14.6";
+      sha256 = "0jaw0qqaqkgysaqppg0a89ydrv6cvci7c0synckpbjwbr222zvvm";
       libraryHaskellDepends = [
         array
         base
@@ -88833,7 +89178,7 @@ self: {
       ];
       doHaddock = false;
       description = "right-to-left parser backward compatible with attoparsec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -88962,7 +89307,7 @@ self: {
         text
       ];
       description = "Conveniently run Attoparsec parsers";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -89040,7 +89385,7 @@ self: {
         time
       ];
       description = "Attoparsec parsers of time";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -89418,7 +89763,7 @@ self: {
         tasty-hunit
       ];
       description = "Access metadata from the Arch Linux User Repository";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -89555,7 +89900,7 @@ self: {
         versions
       ];
       description = "A secure package manager for Arch Linux and the AUR";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "aura";
     }
@@ -89867,7 +90212,7 @@ self: {
         tasty-hunit
       ];
       description = "Case splitting plugin";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -90265,7 +90610,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Automatically re-export modules";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "autoexporter";
     }
   ) { };
@@ -90357,7 +90702,7 @@ self: {
         tasty-quickcheck
       ];
       description = "automata";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -90428,7 +90773,7 @@ self: {
         transformers
       ];
       description = "Effectful streams and automata in coalgebraic encoding";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -90625,7 +90970,7 @@ self: {
         filepath
       ];
       description = "Custom Setup to automate package modules discovery";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -91177,6 +91522,8 @@ self: {
       pname = "avl-static";
       version = "0.1.0.0";
       sha256 = "13rl5wrpmbb4c0zsaymivi4d9qg2wl4lfw4nvkd81naqm3vskc10";
+      revision = "1";
+      editedCabalFile = "1rwf1m5v9hy3vrfy3ibgvahcl5zpip65d6pidmwg954lclrbm1gh";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -91186,8 +91533,6 @@ self: {
       ];
       description = "A compile-time balanced AVL tree";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -91356,7 +91701,7 @@ self: {
         vector
       ];
       description = "Avro serialization support for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -91443,7 +91788,7 @@ self: {
         unordered-containers
       ];
       description = "Tool for decoding avro";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "avro-decode";
       broken = true;
@@ -91746,7 +92091,7 @@ self: {
         vector
       ];
       description = "Export grades from AWS Academy to different formats";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "aws-academy-grade-exporter";
       broken = true;
@@ -91791,7 +92136,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Types and optics for manipulating Amazon Resource Names (ARNs)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -91848,7 +92193,7 @@ self: {
         neat-interpolation
       ];
       description = "Generate signed cookies for AWS CloudFront";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "aws-cloudfront-signed-cookies";
       broken = true;
@@ -92829,7 +93174,7 @@ self: {
         text
       ];
       description = "Haskell on AWS Lambda Runtime API";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example-lambda";
       broken = true;
@@ -93271,7 +93616,7 @@ self: {
         validation
       ];
       description = "Fetch data from AWS Secrets Manager";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -93613,7 +93958,7 @@ self: {
         text
       ];
       description = "Extract recent daily AWS costs";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       mainProgram = "aws-spend-summary";
       maintainers = [ lib.maintainers.danielrolls ];
     }
@@ -93871,7 +94216,7 @@ self: {
         text
       ];
       description = "Extract recent daily AWS costs";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "awsspendsummary";
       broken = true;
@@ -94199,7 +94544,7 @@ self: {
         urbit-hob
       ];
       description = "Interact with Azimuth from Haskell";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -94250,7 +94595,7 @@ self: {
         sparse-set
       ];
       description = "A modular game engine and Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -94275,7 +94620,7 @@ self: {
         mtl
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -94311,7 +94656,7 @@ self: {
         QuickCheck
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -94344,7 +94689,7 @@ self: {
         text
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -94381,7 +94726,7 @@ self: {
         text
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -94417,7 +94762,7 @@ self: {
         text
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -94443,7 +94788,7 @@ self: {
         mtl
       ];
       description = "A type-safe and friendly Entity-Component-System (ECS) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -94568,7 +94913,7 @@ self: {
         wreq
       ];
       description = "send email with microsoft azure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -94643,7 +94988,7 @@ self: {
       libraryToolDepends = [ proto-lens-protoc ];
       testHaskellDepends = [ base ];
       description = "Azure Functions Worker";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -95037,7 +95382,7 @@ self: {
         yaml
       ];
       description = "A tool and library for building virtual machine images";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "b9c";
     }
@@ -95121,7 +95466,7 @@ self: {
         tasty-hunit
       ];
       description = "Library for generating parsers from ABNF";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -95355,7 +95700,7 @@ self: {
         unix
       ];
       description = "Backstop a target directory by source directories";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "backstop";
       broken = true;
@@ -95637,7 +95982,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Text layout engine built on top of HarfBuzz";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -96116,7 +96461,7 @@ self: {
         time
       ];
       description = "German bank holidays and public holidays";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -96286,7 +96631,7 @@ self: {
         hspec-discover
       ];
       description = "Barbies with layered clothes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -96315,7 +96660,7 @@ self: {
         base
       ];
       description = "Create strippable HKD via TH";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -96643,7 +96988,7 @@ self: {
         ghc-prim
       ];
       description = "Core data structures and operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -96709,7 +97054,7 @@ self: {
       editedCabalFile = "03x7hrd4xv9xa0v72srn19v402nwws93n7jgakliabfshacd4pp3";
       libraryHaskellDepends = [ base ];
       description = "Backport of 'Foreign.C.ConstPtr'";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -96751,6 +97096,8 @@ self: {
       pname = "base-encoding";
       version = "0.3.0.0";
       sha256 = "1lcqg4wpbry3x165j8rsjbpj1mzd7bl0917hjv0jhvmh5z3wnas8";
+      revision = "1";
+      editedCabalFile = "0m935gpy93dqf2vks0jx7g444p8a6abrkxnhsh3dv7ywkf2b9ns5";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -96760,7 +97107,7 @@ self: {
         text
       ];
       description = "RFC4648 Binary-to-text encodings (e.g. base64)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -96818,7 +97165,7 @@ self: {
       libraryHaskellDepends = [ base ];
       doHaddock = false;
       description = "\"base\" package sans \"Prelude\" module";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -96858,7 +97205,7 @@ self: {
       sha256 = "1lqxa8lhnhiyxkqcwq82a8g2sizhagy3l0z7x57xrmn9y81sy241";
       libraryHaskellDepends = [ base ];
       description = "Featureful preludes formed solely from the \"base\" package";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -96927,7 +97274,7 @@ self: {
         text
       ];
       description = "Fast RFC 4648-compliant Base16 encoding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -97054,7 +97401,7 @@ self: {
         text
       ];
       description = "Fast RFC 4648-compliant Base32 encoding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -97359,7 +97706,7 @@ self: {
         wide-word
       ];
       description = "Base62 encoding and decoding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -97471,7 +97818,7 @@ self: {
         random
       ];
       description = "Base64 encoding of byte sequences";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -97700,7 +98047,7 @@ self: {
       sha256 = "1s4nacp3ripdn895c863hmnpaqmbkiisjp3y45v1q28qdjy052qv";
       libraryHaskellDepends = [ base ];
       description = "alternative prelude";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -97972,7 +98319,7 @@ self: {
       sha256 = "0dgckarxy6lyaq2m02yisv41k7q0k40xph7v039rxx71bgih196d";
       libraryHaskellDepends = [ base ];
       description = "Basic implementation of General Problem Solver algorithm";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -98095,7 +98442,7 @@ self: {
         transformers
       ];
       description = "Modules for primitive types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -98948,7 +99295,7 @@ self: {
         transformers
       ];
       description = "Library for parsing, constructing, and printing BBCode";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -99738,8 +100085,8 @@ self: {
       pname = "beam-core";
       version = "0.10.4.0";
       sha256 = "1zxqyxxyid186s86lfw0sq030jckh83j3rwj6ibx4wg3flslk515";
-      revision = "1";
-      editedCabalFile = "1zwvxqfrmwnvsdj959ir6pwy3bbssyzgngh23kz40965pazxg8g6";
+      revision = "2";
+      editedCabalFile = "0fmbypv1rpgfvfdpn1my8xvx3hwg67s1sijfm1xilra5f8b0xwrx";
       libraryHaskellDepends = [
         aeson
         base
@@ -99783,6 +100130,7 @@ self: {
       large-generics,
       large-records,
       microlens,
+      optics-core,
       record-hasfield,
       sqlite-simple,
       tasty,
@@ -99792,8 +100140,8 @@ self: {
     }:
     mkDerivation {
       pname = "beam-large-records";
-      version = "0.1.2";
-      sha256 = "193r7r9rnbqn3k8kq6s80dq8spvgbbnm9kn80xa7irp0qb2q25p6";
+      version = "0.1.3";
+      sha256 = "1bzxdzqh12m3l4q3whcpc3ig22z6jvqphfw28mscyam4vj9zwm21";
       libraryHaskellDepends = [
         base
         beam-core
@@ -99807,7 +100155,7 @@ self: {
         ghc-prim
         large-generics
         large-records
-        microlens
+        optics-core
         record-hasfield
         sqlite-simple
         tasty
@@ -99816,8 +100164,7 @@ self: {
         time
       ];
       description = "Integration of large-records with beam-core";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -99851,8 +100198,8 @@ self: {
       pname = "beam-migrate";
       version = "0.5.3.2";
       sha256 = "05cz2gh9r00dr6knigq9v7zcdmpk2b19z0pg79wimkcxa2fblb5z";
-      revision = "1";
-      editedCabalFile = "0v1hx1pxwb7xxqdcdqyj8fv9liiz44ak2wmi7my267amxdx2n6h2";
+      revision = "4";
+      editedCabalFile = "1xafh4qb225w32ls2c89cdk13fvfjn69052ja9fm43vgvhxrjjbs";
       libraryHaskellDepends = [
         aeson
         base
@@ -100066,8 +100413,8 @@ self: {
       pname = "beam-sqlite";
       version = "0.5.4.1";
       sha256 = "1f5yjsx7zfbfbxs3xd64rwn2m3vjffrbdn5xadhm1axhghi6srki";
-      revision = "1";
-      editedCabalFile = "0igd6nzypnnpswpybn87j7vzgy2cbgb4l19phimjdacgdjsvb4nf";
+      revision = "2";
+      editedCabalFile = "03j11sgmsaz80qvpb1r4j6zqdwya9gyi4rmlbhjl13wn3dzsf420";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -100104,6 +100451,72 @@ self: {
     }
   ) { };
 
+  beam-sqlite_0_5_5_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      beam-core,
+      beam-migrate,
+      bytestring,
+      direct-sqlite,
+      dlist,
+      free,
+      hashable,
+      monad-control,
+      mtl,
+      network-uri,
+      scientific,
+      sqlite-simple,
+      tasty,
+      tasty-expected-failure,
+      tasty-hunit,
+      text,
+      time,
+      transformers-base,
+    }:
+    mkDerivation {
+      pname = "beam-sqlite";
+      version = "0.5.5.0";
+      sha256 = "0shybfbix30mir99138frswlbd768s5yp6r29jsp6ndgc2k7s6sr";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        beam-core
+        beam-migrate
+        bytestring
+        direct-sqlite
+        dlist
+        free
+        hashable
+        monad-control
+        mtl
+        network-uri
+        scientific
+        sqlite-simple
+        text
+        time
+        transformers-base
+      ];
+      testHaskellDepends = [
+        base
+        beam-core
+        beam-migrate
+        sqlite-simple
+        tasty
+        tasty-expected-failure
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Beam driver for SQLite";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   beam-th = callPackage (
     {
       mkDerivation,
@@ -100247,7 +100660,7 @@ self: {
         word8
       ];
       description = "Low-level Haskell bindings to the BearLibTerminal graphics library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "omni";
       broken = true;
@@ -100372,7 +100785,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Implementation of the Bech32 cryptocurrency address format (BIP 0173)";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bech32";
       broken = true;
@@ -100407,7 +100820,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Template Haskell extensions to the Bech32 library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -100755,7 +101168,7 @@ self: {
         vector
       ];
       description = "Bencode encoding and decoding library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -101028,7 +101441,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bencodex reader/writer for Haskell";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -101086,7 +101499,7 @@ self: {
         ghc-prim
       ];
       description = "A library for encoding and decoding of BEncode data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -101227,7 +101640,7 @@ self: {
         hspec
       ];
       description = "Simplify tests where Either or Maybe types are returned from monadic code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -101766,8 +102179,8 @@ self: {
       pname = "bhoogle";
       version = "0.1.4.4";
       sha256 = "1z19h0jgnipj16rqbrflcjnqaslafq9bvwkyg8q0il76q7s4wyxa";
-      revision = "2";
-      editedCabalFile = "1kpzvlzydrfqjhmpjirb51xhnwircdcnmhbn82nvnvm5s4h0pajd";
+      revision = "4";
+      editedCabalFile = "05qw335svzyklx9pf70kv1vlgs4q4rr9d4jylbilay5279qmydc2";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -101983,7 +102396,7 @@ self: {
         transformers
       ];
       description = "Make instance constraints bidirectional";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -102614,7 +103027,7 @@ self: {
         some
       ];
       description = "Bin: binary natural numbers";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -102753,7 +103166,7 @@ self: {
         zlib
       ];
       description = "Binary serialisation for Haskell values using lazy ByteStrings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -103168,7 +103581,7 @@ self: {
         vector
       ];
       description = "Orphan instances for binary";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -103337,7 +103750,7 @@ self: {
         tasty-quickcheck
       ];
       description = "An efficient but limited parser API specialised to bytestrings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -103757,7 +104170,7 @@ self: {
         unordered-containers
       ];
       description = "Tagged binary serialisation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -103870,7 +104283,7 @@ self: {
         binary
       ];
       description = "VarInt encoding/decoding via Data.Binary";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -103896,7 +104309,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "Haskell bindings to binaryen";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -103977,7 +104390,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Variable binding for abstract syntax tree";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -104156,8 +104569,8 @@ self: {
         }:
         mkDerivation {
           pname = "bindings-GLFW";
-          version = "3.3.9.2";
-          sha256 = "1ydlxnxgh2m9xlsizimchdf8iyr78w9dx8165ni0cwi1szw8955x";
+          version = "3.3.9.3";
+          sha256 = "098zb6j9p8zinr8pjwjyy5qq250rkvbvqb3adczncfcx5ypx0flv";
           libraryHaskellDepends = [
             base
             bindings-DSL
@@ -104440,8 +104853,6 @@ self: {
       description = "Low level bindings to DirectFB";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { inherit (pkgs) directfb; };
 
@@ -104847,7 +105258,7 @@ self: {
         bindings-DSL
       ];
       description = "Low level bindings to libpci";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -105139,7 +105550,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ portaudio ];
       description = "Low-level bindings to portaudio library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) portaudio; };
 
@@ -106317,7 +106728,7 @@ self: {
         tasty-hunit
       ];
       description = "BIP-0032: Hierarchical Deterministic Wallets for Bitcoin and other cryptocurrencies";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -106489,7 +106900,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Birds of Paradise";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -106819,7 +107230,7 @@ self: {
         toolshed
       ];
       description = "Plays chess";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -107035,7 +107446,7 @@ self: {
         tasty-hunit
       ];
       description = "Bitcoin address generation and rendering. Parsing coming soon.";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -107244,7 +107655,7 @@ self: {
         text
       ];
       description = "BIP 158 compact block filters";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -107279,7 +107690,7 @@ self: {
         time
       ];
       description = "Bitcoin hash primitives";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -107387,7 +107798,7 @@ self: {
         tasty-hunit
       ];
       description = "Bitcoin keys";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -107677,7 +108088,7 @@ self: {
         unordered-containers
       ];
       description = "Resources for working with miniscript, and script descriptors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -107829,7 +108240,7 @@ self: {
         text
       ];
       description = "A library for working with bitcoin-core regtest networks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bitcoind-rpc-explorer";
     }
@@ -107878,7 +108289,7 @@ self: {
         transformers
       ];
       description = "A streamlined interface to bitcoin core using Haskoin types and Servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -107910,7 +108321,7 @@ self: {
       ];
       testToolDepends = [ sydtest-discover ];
       description = "Generic and easy to use haskell bitfields";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -108027,6 +108438,28 @@ self: {
     }
   ) { };
 
+  bitmasks = callPackage (
+    {
+      mkDerivation,
+      base,
+      hspec,
+      QuickCheck,
+    }:
+    mkDerivation {
+      pname = "bitmasks";
+      version = "0";
+      sha256 = "0wanpwhi4d5lpsa6rrgw45i7hcy0xgrjlqbf3ij0vic601a19gny";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        hspec
+        QuickCheck
+      ];
+      description = "Bitmasks for efficient storing of boolean flags";
+      license = lib.licensesSpdx."BSD-3-Clause";
+    }
+  ) { };
+
   bits = callPackage (
     {
       mkDerivation,
@@ -108233,7 +108666,7 @@ self: {
         vector
       ];
       description = "Useful bitwise operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -108275,7 +108708,7 @@ self: {
         hspec
       ];
       description = "Showing data as strings of 0 and 1";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -108470,7 +108903,7 @@ self: {
         bytestring
       ];
       description = "Lazy bit strings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -108881,7 +109314,7 @@ self: {
         text
       ];
       description = "A lousy Prelude replacement by a lousy dude";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -108906,7 +109339,7 @@ self: {
         text
       ];
       description = "A lousy Prelude replacement by a lousy dude";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -109266,7 +109699,7 @@ self: {
         criterion
       ];
       description = "A library providing BLAKE2";
-      license = lib.licenses.unlicense;
+      license = lib.licensesSpdx."Unlicense";
     }
   ) { };
 
@@ -109293,7 +109726,7 @@ self: {
         tasty-hunit
       ];
       description = "BLAKE3 hashing algorithm";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -109803,7 +110236,7 @@ self: {
         text
       ];
       description = "blaze-html backend for colonnade";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -110518,7 +110951,7 @@ self: {
         text
       ];
       description = "An HTML generator for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -110657,7 +111090,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "API definitions for blockfrost.io";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -110711,7 +111144,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "blockfrost.io basic client";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.sorki ];
     }
   ) { };
@@ -110759,7 +111192,7 @@ self: {
         text
       ];
       description = "blockfrost.io common client definitions / instances";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -110792,7 +111225,7 @@ self: {
         time
       ];
       description = "blockfrost.io pretty-printing utilities";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -110909,7 +111342,7 @@ self: {
       ];
       doHaddock = false;
       description = "Perform batches of disk I/O operations";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -110933,8 +111366,8 @@ self: {
     }:
     mkDerivation {
       pname = "blockio-uring";
-      version = "0.1.0.1";
-      sha256 = "1vhzi5ad162vdnn13444rf729302zqb2ikfmlb4i6k27pp0z1w58";
+      version = "0.1.0.2";
+      sha256 = "1kal4vrygj12a53m9bavdbffsyqmh7m73vr62z2rz3y0yq3wxj3z";
       libraryHaskellDepends = [
         base
         primitive
@@ -110963,7 +111396,7 @@ self: {
       ];
       benchmarkPkgconfigDepends = [ liburing ];
       description = "Perform batches of asynchronous disk IO operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -111116,11 +111549,11 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Elasticsearch client library for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
-  bloodhound_0_24_0_0 = callPackage (
+  bloodhound_0_26_0_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -111158,8 +111591,8 @@ self: {
     }:
     mkDerivation {
       pname = "bloodhound";
-      version = "0.24.0.0";
-      sha256 = "0zzpf3y6ccc5bwlxbcw2lc2qlcrllqs5ymd8kd19mmhgjkab8ycz";
+      version = "0.26.0.0";
+      sha256 = "0sxs7r4h7j3mv9z2z5p2fryns0m759kgwbpc3p9qnb3vr3c8fq61";
       libraryHaskellDepends = [
         aeson
         base
@@ -111211,7 +111644,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Elasticsearch client library for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -111310,7 +111743,7 @@ self: {
         hedgehog
       ];
       description = "visual bloom filter for neotrellis m4 output";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bloohm";
       broken = true;
@@ -111348,7 +111781,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Pure and impure Bloom Filter implementations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -111401,7 +111834,7 @@ self: {
       ];
       doHaddock = false;
       description = "Classic and block-style bloom filters";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -111775,27 +112208,11 @@ self: {
     { mkDerivation, bluefin-internal }:
     mkDerivation {
       pname = "bluefin";
-      version = "0.0.16.0";
-      sha256 = "12mvcawmm1b2n429lml86jqmnsha74nd6v45gd8sk288h9p4g3ks";
+      version = "0.0.17.1";
+      sha256 = "17vlgidjmz7dyqllfwc9q6r2xvmjhj7w6wwyxrc2xpgpg7jbklm2";
       libraryHaskellDepends = [ bluefin-internal ];
       description = "The Bluefin effect system";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.maralorn ];
-    }
-  ) { };
-
-  bluefin_0_0_17_0 = callPackage (
-    { mkDerivation, bluefin-internal }:
-    mkDerivation {
-      pname = "bluefin";
-      version = "0.0.17.0";
-      sha256 = "145yws2r4as5rvbxdsv31qkhjn2a7gbz3bx9y46fms291l7fi2c7";
-      revision = "1";
-      editedCabalFile = "0qrq7rhw5g855x2hnxd8hs0bffmdrbcyin9ig60pbs3bnx2liiia";
-      libraryHaskellDepends = [ bluefin-internal ];
-      description = "The Bluefin effect system";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -111812,8 +112229,8 @@ self: {
     }:
     mkDerivation {
       pname = "bluefin-algae";
-      version = "0.1.0.1";
-      sha256 = "1mf7sfa6fj18sdbi78imxr7p90m4aqsi22c4pk1g7spb1wgp9aw5";
+      version = "0.1.0.2";
+      sha256 = "02g513vqn052qd41zm9brw8lf1ic4135mi8kr3s4w0721vm4nkhh";
       libraryHaskellDepends = [
         base
         bluefin
@@ -111823,13 +112240,15 @@ self: {
         base
         bluefin
         tasty
-        tasty-bench
         tasty-hunit
       ];
+      benchmarkHaskellDepends = [
+        base
+        bluefin
+        tasty-bench
+      ];
       description = "Algebraic effects and named handlers in Bluefin";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -111848,39 +112267,11 @@ self: {
         bluefin
       ];
       description = "The Bluefin effect system, user contributions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
   bluefin-internal = callPackage (
-    {
-      mkDerivation,
-      async,
-      base,
-      monad-control,
-      transformers,
-      transformers-base,
-      unliftio-core,
-    }:
-    mkDerivation {
-      pname = "bluefin-internal";
-      version = "0.1.0.0";
-      sha256 = "1106fij37sq7xnmb1zrvls94frqs9ard2nggiphmc2lpkcg71whz";
-      libraryHaskellDepends = [
-        async
-        base
-        monad-control
-        transformers
-        transformers-base
-        unliftio-core
-      ];
-      testHaskellDepends = [ base ];
-      description = "The Bluefin effect system, internals";
-      license = lib.licenses.mit;
-    }
-  ) { };
-
-  bluefin-internal_0_1_1_0 = callPackage (
     {
       mkDerivation,
       async,
@@ -111904,8 +112295,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "The Bluefin effect system, internals";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -111926,7 +112316,7 @@ self: {
         random
       ];
       description = "The Bluefin effect system, random generators";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -112000,7 +112390,7 @@ self: {
         text
       ];
       description = "Tools for interacting with Bluesky / AT Protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -112415,6 +112805,104 @@ self: {
     }
   ) { };
 
+  board-games_0_4_0_1 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      boxes,
+      cgi,
+      combinatorial,
+      containers,
+      criterion,
+      doctest-exitcode-stdio,
+      doctest-lib,
+      enummapset,
+      explicit-exception,
+      haha,
+      html,
+      httpd-shed,
+      network-uri,
+      non-empty,
+      parallel,
+      QuickCheck,
+      random,
+      semigroups,
+      shell-utility,
+      transformers,
+      utility-ht,
+    }:
+    mkDerivation {
+      pname = "board-games";
+      version = "0.4.0.1";
+      sha256 = "1zw5061m29kaz4hxn18hz9p7hvxb1ga8x2vqxkpk7iyd25yncd05";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        array
+        base
+        boxes
+        cgi
+        combinatorial
+        containers
+        enummapset
+        explicit-exception
+        haha
+        html
+        non-empty
+        QuickCheck
+        random
+        semigroups
+        transformers
+        utility-ht
+      ];
+      executableHaskellDepends = [
+        array
+        base
+        cgi
+        containers
+        html
+        httpd-shed
+        network-uri
+        non-empty
+        random
+        shell-utility
+        transformers
+        utility-ht
+      ];
+      testHaskellDepends = [
+        array
+        base
+        containers
+        doctest-exitcode-stdio
+        doctest-lib
+        enummapset
+        non-empty
+        QuickCheck
+        random
+        transformers
+        utility-ht
+      ];
+      benchmarkHaskellDepends = [
+        base
+        containers
+        criterion
+        enummapset
+        non-empty
+        parallel
+        QuickCheck
+        random
+        transformers
+        utility-ht
+      ];
+      description = "Three games for inclusion in a web server";
+      license = "GPL";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "board-games";
+      maintainers = [ lib.maintainers.thielema ];
+    }
+  ) { };
+
   boardgame = callPackage (
     {
       mkDerivation,
@@ -112617,7 +113105,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Generate Haskell boilerplate";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "boilerplate";
       broken = true;
@@ -112673,7 +113161,7 @@ self: {
         vector
       ];
       description = "Bolt driver for Neo4j";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -114025,7 +114513,7 @@ self: {
         transformers
       ];
       description = "Boring and Absurd types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -114135,7 +114623,7 @@ self: {
         wide-word
       ];
       description = "Implementation of BORSH serialisation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -114173,15 +114661,15 @@ self: {
     }:
     mkDerivation {
       pname = "botan-bindings";
-      version = "0.0.1.0";
-      sha256 = "0svb55s3y93lj1nk1574dpvinzw1fcy306gl6dcxxszxfm9ndng9";
+      version = "0.1.0.0";
+      sha256 = "1lajqsnf6v03qh3xnksbxh2h2sz4hkrvqw2jy94swyy8abd8qbqs";
       libraryHaskellDepends = [
         base
         bytestring
       ];
       libraryPkgconfigDepends = [ botan ];
       description = "Raw Botan bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mikatammi ];
     }
   ) { botan = null; };
@@ -114201,8 +114689,8 @@ self: {
     }:
     mkDerivation {
       pname = "botan-low";
-      version = "0.0.1.0";
-      sha256 = "0bm4dilvy1hdpf9flx7686djp0bjs2v7zi9iq937a6f20vqqwzvd";
+      version = "0.0.2.0";
+      sha256 = "16sha2cd03n7g3lykvcsfmxadyv3iyq9898sv9xjvcndfii3wg25";
       libraryHaskellDepends = [
         base
         botan-bindings
@@ -114225,7 +114713,7 @@ self: {
         tasty-bench
       ];
       description = "Low-level Botan bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mikatammi ];
     }
   ) { };
@@ -114323,7 +114811,7 @@ self: {
         text
       ];
       description = "Encoding and decoding for the Bottom spec";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bottom";
       broken = true;
@@ -114428,7 +114916,7 @@ self: {
         utf8-string
       ];
       description = "ScopeH and ScopeT extras for bound";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -114541,7 +115029,7 @@ self: {
         tasty-hunit
       ];
       description = "A strict, immutable, thread-safe, single-ended, bounded queue";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -114748,7 +115236,7 @@ self: {
         doctest-parallel
       ];
       description = "A profunctor effect system?";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -114773,7 +115261,7 @@ self: {
         time
       ];
       description = "CSV parsing in a box";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -114818,7 +115306,7 @@ self: {
         doctest-parallel
       ];
       description = "Box websockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "box-socket";
     }
   ) { };
@@ -114914,7 +115402,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A minimal typed unix path library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -115294,7 +115782,7 @@ self: {
         tasty-hunit
       ];
       description = "Set breakpoints using a GHC plugin";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -115426,6 +115914,8 @@ self: {
       pname = "brick";
       version = "2.9";
       sha256 = "1jdhagw5ihp9g5pinmbb1mf3fjcbh4aim9qg9i4b1na9zn07s0f1";
+      revision = "1";
+      editedCabalFile = "09zn3n52dgp795idrxp6wrq8clyknwsgsqhfdvsc5jv70sx54b9x";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -115470,6 +115960,86 @@ self: {
     }
   ) { };
 
+  brick_2_10 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bimap,
+      bytestring,
+      config-ini,
+      containers,
+      data-clist,
+      deepseq,
+      directory,
+      exceptions,
+      filepath,
+      hashable,
+      microlens,
+      microlens-mtl,
+      microlens-th,
+      mtl,
+      QuickCheck,
+      stm,
+      template-haskell,
+      text,
+      text-zipper,
+      time,
+      unix-compat,
+      unordered-containers,
+      vector,
+      vty,
+      vty-crossplatform,
+      word-wrap,
+    }:
+    mkDerivation {
+      pname = "brick";
+      version = "2.10";
+      sha256 = "08byr2w0697bdlnpycnb73f33v2as6sy7q9w9r8a2nhilv49yhmq";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        bimap
+        bytestring
+        config-ini
+        containers
+        data-clist
+        deepseq
+        directory
+        exceptions
+        filepath
+        hashable
+        microlens
+        microlens-mtl
+        microlens-th
+        mtl
+        stm
+        template-haskell
+        text
+        text-zipper
+        time
+        unix-compat
+        unordered-containers
+        vector
+        vty
+        vty-crossplatform
+        word-wrap
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        microlens
+        QuickCheck
+        vector
+        vty
+        vty-crossplatform
+      ];
+      description = "A declarative terminal user interface library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   brick-calendar = callPackage (
     {
       mkDerivation,
@@ -115515,7 +116085,7 @@ self: {
         vty
       ];
       description = "Calendar widget for the Brick TUI library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -115629,7 +116199,7 @@ self: {
         vector
       ];
       description = "Search forward or backward for certain kinds of items in brick list";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -115658,7 +116228,7 @@ self: {
         vector
       ];
       description = "Skip a certain kind of items when moving in brick list";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
     }
   ) { };
 
@@ -115707,7 +116277,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Panes library for Brick providing composition and isolation for TUI apps";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mywork-example";
       broken = true;
@@ -115770,7 +116340,7 @@ self: {
         vty
       ];
       description = "Tabular list widgets for brick";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
     }
   ) { };
 
@@ -116087,7 +116657,7 @@ self: {
         OpenGL
       ];
       description = "Painless 2D vector graphics, animations, and simulations powered by GLFW";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -116110,7 +116680,7 @@ self: {
         ghc-prim
       ];
       description = "Data structures and algorithms for working with 2D graphics";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -116151,7 +116721,7 @@ self: {
         vector
       ];
       description = "Examples using the Brillo library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -116189,7 +116759,7 @@ self: {
         vector
       ];
       description = "Load any image supported by Juicy.Pixels in your brillo application";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "brillo-juicy-viewer";
     }
   ) { };
@@ -116217,7 +116787,7 @@ self: {
         vector
       ];
       description = "Brillo picture data types and rendering functions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -116356,7 +116926,7 @@ self: {
         yaml
       ];
       description = "Haskell source code formatter";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "brittany";
       broken = true;
@@ -116429,7 +116999,7 @@ self: {
       ];
       doHaddock = false;
       description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -116442,7 +117012,7 @@ self: {
       libraryHaskellDepends = [ broadcast-chan ];
       doHaddock = false;
       description = "Conduit-based parallel streaming code for broadcast-chan";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -116457,7 +117027,7 @@ self: {
       libraryHaskellDepends = [ broadcast-chan ];
       doHaddock = false;
       description = "Pipes-based parallel streaming code for broadcast-chan";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -116515,7 +117085,7 @@ self: {
         random
       ];
       description = "Helpers for generating tests for broadcast-chan";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -118365,7 +118935,7 @@ self: {
         transformers
       ];
       description = "Build Systems à la Carte";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -118421,7 +118991,7 @@ self: {
         text
       ];
       description = "Compute, fetch and install Cabal build plans into a local environment";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "build-env";
       broken = true;
@@ -118540,7 +119110,7 @@ self: {
         primitive-unaligned
       ];
       description = "bounded ByteArray builder type";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -118881,35 +119451,29 @@ self: {
       base,
       Cabal,
       containers,
-      fclabels,
+      lens,
       process,
       regex-compat,
       split,
-      strict,
     }:
     mkDerivation {
       pname = "bumper";
-      version = "0.6.0.3";
-      sha256 = "1a6sqkdzq05az6yj3zmlcbx6bmhw4zjx2aijxfi481z3ifiy7z3w";
-      revision = "3";
-      editedCabalFile = "0r4fj5mxl452786jw6pr2nwhs5sszlxb9nwcrakr44jysm181lhw";
+      version = "0.7.0.0";
+      sha256 = "1mjrmlnm733yw2l9jq2cxlq4z9jz102bbh974v15mkry3vnq1k9b";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
         base
         Cabal
         containers
-        fclabels
+        lens
         process
         regex-compat
         split
-        strict
       ];
       description = "Automatically bump package versions, also transitively";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "bumper";
-      broken = true;
     }
   ) { };
 
@@ -119010,7 +119574,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Parse webforms & render to interactive hypertext";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bureaucromancy";
       broken = true;
@@ -119084,7 +119648,7 @@ self: {
         text
       ];
       description = "Parse and render URI templates";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -119626,7 +120190,7 @@ self: {
       sha256 = "0afywcb7n2h2vycxg47myaqz49xrlnjpyq753smildjlkl79jx79";
       libraryHaskellDepends = [ base ];
       description = "Define embeddings of small bit vectors into larger ones";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -119698,7 +120262,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient little-endian bit vector library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -119766,7 +120330,7 @@ self: {
         parameterized-utils
       ];
       description = "Well-typed lenses for bv-sized bitvectors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -119803,7 +120367,7 @@ self: {
         tasty-hunit
       ];
       description = "Give aliases to record fields";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -119864,7 +120428,7 @@ self: {
         text
       ];
       description = "Library for creating command-line interfaces (colors, menus, etc.)";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -119921,7 +120485,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Sets and maps with 8-bit words for keys";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -119957,7 +120521,7 @@ self: {
         text
       ];
       description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       maintainers = [ lib.maintainers.danielrolls ];
     }
   ) { };
@@ -119986,7 +120550,7 @@ self: {
         wide-word
       ];
       description = "Portable big-endian and little-endian conversions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -120105,7 +120669,7 @@ self: {
         text-short
       ];
       description = "Build byte arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -120188,7 +120752,7 @@ self: {
         unordered-containers
       ];
       description = "Universal hashing of bytes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -120215,7 +120779,7 @@ self: {
         primitive
       ];
       description = "Fast logging";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { };
@@ -120427,7 +120991,7 @@ self: {
         random
       ];
       description = "Calculate string metrics on Bytes efficiently";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -120456,7 +121020,7 @@ self: {
         tasty-hunit
       ];
       description = "Template haskell macro for casing on Bytes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -120533,7 +121097,7 @@ self: {
         gauge
       ];
       description = "Slicing managed and unmanaged memory";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -120585,7 +121149,7 @@ self: {
         primitive
       ];
       description = "Nonresumable byte parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -120608,6 +121172,8 @@ self: {
       pname = "bytestring";
       version = "0.12.2.0";
       sha256 = "18zvh1fpj8x4w35hrcp1l8cd9x7v401s17wn5l5vlbgwhdrimnif";
+      revision = "1";
+      editedCabalFile = "06av8jwxnclkzdvaj7l3mpz99yc84s9ql1sszk7d17sr8ihf34m4";
       libraryHaskellDepends = [
         base
         deepseq
@@ -120631,7 +121197,7 @@ self: {
         tasty-bench
       ];
       description = "Fast, compact, strict and lazy byte strings with a list interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -120657,7 +121223,7 @@ self: {
         text
       ];
       description = "Aeson instances for ByteString, using base 64 encoding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -121047,7 +121613,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Efficiently parse and produce common integral and fractional numbers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -121324,7 +121890,7 @@ self: {
         rerebase
       ];
       description = "An efficient strict bytestring builder";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -121347,7 +121913,7 @@ self: {
         primitive
       ];
       description = "break bytestrings up into substrings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -121459,7 +122025,7 @@ self: {
         criterion
       ];
       description = "A very efficient ByteString builder implementation based on the binary tree";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -121509,7 +122075,7 @@ self: {
         QuickCheck
       ];
       description = "An efficient finite map from bytestrings to values";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -121652,7 +122218,7 @@ self: {
         unpacked-maybe
       ];
       description = "Tries with Bytes as keys";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -121797,7 +122363,7 @@ self: {
         tasty-hunit
       ];
       description = "High-level bindings to bz3";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -121832,7 +122398,7 @@ self: {
       sha256 = "0iax0fq5y24lcjkjsk66khry9s6v9hhd3zfrwg8mvgs07waq2m59";
       doHaddock = false;
       description = "bzip2 C sources";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -122466,7 +123032,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Manipulate patterns in cellular automata, create and parse RLE files";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -122635,7 +123201,7 @@ self: {
         temporary
       ];
       description = "Extend Cabal build-depends from the command line";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-add";
     }
@@ -122698,7 +123264,7 @@ self: {
         temporary
       ];
       description = "Extend Cabal build-depends from the command line";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "cabal-add";
     }
   ) { };
@@ -122807,8 +123373,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-bounds";
-      version = "2.6.0";
-      sha256 = "0y4xj4irhppwsg3ljy6yzscfjdj7gh2prsiia51y8ma6gm87sjsy";
+      version = "2.7.0";
+      sha256 = "09xlw66h5k034gr9id4lj8i48r188k55cy8kml6f3q1a7cqcfsfd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -122893,7 +123459,7 @@ self: {
         time
       ];
       description = "Bundling C/C++ projects in Cabal package made easy";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -123043,7 +123609,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "CI Assistant for Haskell projects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-cache";
     }
@@ -123070,8 +123636,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-cargs";
-      version = "1.7.0";
-      sha256 = "17q51lg7vhdzvy9s8f3zplxa4mij2bjclzxry5f9d2pgiq4290p9";
+      version = "1.8.0";
+      sha256 = "0nm20jw8hy9gfv4813jfy7m13i9sa3dcs0633hminsk5xl5a1ff2";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -123310,7 +123876,7 @@ self: {
         text
       ];
       description = "Create a Debianization for a Cabal package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-debian";
       broken = true;
@@ -123364,7 +123930,7 @@ self: {
         QuickCheck
       ];
       description = "QuickCheck for Cabal tests";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -123514,7 +124080,7 @@ self: {
         time
       ];
       description = "Cabal utility";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-edit";
       broken = true;
@@ -123668,7 +124234,7 @@ self: {
         doctest-parallel
       ];
       description = "Fix for cabal files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-fix";
       broken = true;
@@ -123728,7 +124294,7 @@ self: {
         zlib
       ];
       description = "Generate a FlatPak manifest from a Cabal package description";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "cabal-flatpak";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -123915,7 +124481,7 @@ self: {
         transformers
       ];
       description = "Formats package descriptions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "cabal-gild";
       maintainers = [ lib.maintainers.turion ];
     }
@@ -124042,7 +124608,7 @@ self: {
       ];
       doCheck = false;
       description = "Give Haskell development tools access to Cabal project environment";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -124111,7 +124677,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "generate hoogle database for cabal project and dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-hoogle";
       broken = true;
@@ -124216,6 +124782,8 @@ self: {
           pname = "cabal-install";
           version = "3.16.0.0";
           sha256 = "06jndk7xcm837rsy4y9nhy8a0162ckravh8dlnif1vmywfgljai8";
+          revision = "2";
+          editedCabalFile = "1f8gi3v27hr4x2ydqa20ijqdcv3pm09lyykhqcaz8zy7dvz96xb0";
           isLibrary = true;
           isExecutable = true;
           libraryHaskellDepends = [
@@ -124295,7 +124863,7 @@ self: {
             mv bash-completion $out/share/bash-completion/completions
           '';
           description = "The command-line interface for Cabal and Hackage";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           mainProgram = "cabal";
           maintainers = [ lib.maintainers.sternenseemann ];
@@ -124677,7 +125245,7 @@ self: {
         tasty-quickcheck
       ];
       description = "The solver component of cabal-install";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -124776,8 +125344,71 @@ self: {
       ];
       description = "Cabal support for creating Mac OSX application bundles";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "macosx-app";
+    }
+  ) { };
+
+  cabal-matrix = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      Cabal,
+      cabal-install,
+      cabal-install-solver,
+      Cabal-syntax,
+      containers,
+      directory,
+      filepath,
+      hashable,
+      optparse-applicative,
+      primitive,
+      process,
+      safe-exceptions,
+      split,
+      stm,
+      text,
+      transformers,
+      vty,
+      vty-crossplatform,
+      word-wrap,
+    }:
+    mkDerivation {
+      pname = "cabal-matrix";
+      version = "1.0.0.0";
+      sha256 = "1y5hc98w9c6amlzp0nvzgd331nrmnf4qgqr0n6nv80zqy9s80b65";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        Cabal
+        cabal-install
+        cabal-install-solver
+        Cabal-syntax
+        containers
+        directory
+        filepath
+        hashable
+        optparse-applicative
+        primitive
+        process
+        safe-exceptions
+        split
+        stm
+        text
+        transformers
+        vty
+        vty-crossplatform
+        word-wrap
+      ];
+      executableHaskellDepends = [ base ];
+      description = "Matrix builds for cabal";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "cabal-matrix";
       broken = true;
     }
   ) { };
@@ -124915,7 +125546,7 @@ self: {
         process
       ];
       description = "Make Cabal aware of pkg-config package versions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.roberth ];
     }
   ) { };
@@ -124983,7 +125614,7 @@ self: {
         vector
       ];
       description = "Library and utility for processing cabal's plan.json file";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "cabal-plan";
     }
   ) { };
@@ -125017,7 +125648,7 @@ self: {
         text
       ];
       description = "Derives cabal bounds from build plans";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       mainProgram = "cabal-plan-bounds";
       maintainers = [ lib.maintainers.nomeata ];
     }
@@ -125114,6 +125745,8 @@ self: {
       pname = "cabal-rpm";
       version = "2.3.0";
       sha256 = "1scgf9npfjynj5b730zjk0yzyq74v2dghs0pwp2zg4kl0hxp6sw0";
+      revision = "1";
+      editedCabalFile = "1ji882k0kkpxzlw7c3f6b48k2wzzyy8yv5baadmy4j7npqxfsxqy";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -125232,7 +125865,7 @@ self: {
         yaml
       ];
       executableHaskellDepends = [ base ];
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cabal-scaffold";
       broken = true;
@@ -125356,7 +125989,7 @@ self: {
         utility-ht
       ];
       description = "Topologically sort cabal packages";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -125403,7 +126036,7 @@ self: {
         utility-ht
       ];
       description = "Topologically sort cabal packages";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -126516,7 +127149,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "A simple library to cache IO actions";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "test-cachedIO";
     }
   ) { };
@@ -126615,7 +127248,7 @@ self: {
         transformers
       ];
       description = "Cache combinators";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -126711,6 +127344,7 @@ self: {
       nix,
       nix-narinfo,
       optparse-applicative,
+      pqueue,
       pretty-terminal,
       prettyprinter,
       process,
@@ -126745,8 +127379,8 @@ self: {
     }:
     mkDerivation {
       pname = "cachix";
-      version = "1.8.0";
-      sha256 = "0axi9g6v8h29fi4lvxjxqrk4215c41zzp860hl5avdka1l0cvv5q";
+      version = "1.9.1";
+      sha256 = "1jhimq7vjnbpggv1l97icwq6i4qhdazhx9gn23fxcf1xj9lz6q6l";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -126798,6 +127432,7 @@ self: {
         network
         nix-narinfo
         optparse-applicative
+        pqueue
         pretty-terminal
         prettyprinter
         process
@@ -126858,6 +127493,7 @@ self: {
         hercules-ci-cnix-store
         here
         hspec
+        katip
         protolude
         retry
         servant-auth-client
@@ -126865,11 +127501,12 @@ self: {
         stm
         temporary
         time
+        unliftio
         versions
       ];
       testToolDepends = [ hspec-discover ];
       description = "Command-line client for Nix binary cache hosting https://cachix.org";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.domenkozar ];
     }
   ) { inherit (pkgs) nix; };
@@ -126906,8 +127543,8 @@ self: {
     }:
     mkDerivation {
       pname = "cachix-api";
-      version = "1.8.0";
-      sha256 = "02cj18aghnl8w4pr2azpgg52aha6z59lcxy6nqd6yvrzgg0lv97v";
+      version = "1.9.1";
+      sha256 = "1gr35qmx0lrbfqyyrl8xab9k0x38n771by3girlc8sdv0xjil25d";
       libraryHaskellDepends = [
         aeson
         async
@@ -126943,7 +127580,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Servant HTTP API specification for https://cachix.org";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.domenkozar ];
     }
   ) { };
@@ -127042,7 +127679,7 @@ self: {
         random
       ];
       description = "That rabbit's got a vicious streak a mile wide!";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -127154,7 +127791,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ cairo ];
       description = "Binding to the Cairo library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) cairo; };
 
@@ -127669,6 +128306,8 @@ self: {
       ];
       description = "A library for writing discord bots in haskell";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -127999,6 +128638,7 @@ self: {
       file-embed,
       filepath,
       hspec,
+      pretty-show,
       process,
       split,
       string-interpolate,
@@ -128008,8 +128648,8 @@ self: {
     }:
     mkDerivation {
       pname = "call-alloy";
-      version = "0.6.0.2";
-      sha256 = "1b8xb2z3cjlqiz2jj75qbw4p0xhdybhnarq3xg2gdn2c953xyscq";
+      version = "0.6.0.3";
+      sha256 = "1bd9f6nfrrzlzw71gz0fkmiv78wfr4zmwzdisa6c6z2yf4cmf0vd";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         async
@@ -128037,6 +128677,7 @@ self: {
         file-embed
         filepath
         hspec
+        pretty-show
         process
         split
         string-interpolate
@@ -128196,7 +128837,7 @@ self: {
         QuickCheck
       ];
       description = "HIE-based Haskell call graph and source code visualizer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "calligraphy";
     }
   ) { };
@@ -128554,7 +129195,7 @@ self: {
         time
       ];
       description = "Canadian income tax calculation";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -129049,7 +129690,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Convert data to and from a natural number representation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -129162,8 +129803,8 @@ self: {
       pname = "capability";
       version = "0.5.0.1";
       sha256 = "0sksd42ywaq5av7a1h9y66pclsk1fd9qx46q38kgs3av88zhzqci";
-      revision = "4";
-      editedCabalFile = "00lkh7rnys52wji7301ca1nriypwqd8q7gslz3gvnwqmi6as0grv";
+      revision = "5";
+      editedCabalFile = "1gqrc6gql8jfgblx8v9v352a51lj5mnw41hk66cgq269ywsg8igs";
       libraryHaskellDepends = [
         base
         constraints
@@ -129404,7 +130045,7 @@ self: {
         vector
       ];
       description = "Cap'n Proto for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "capnpc-haskell";
     }
@@ -130591,8 +131232,8 @@ self: {
     }:
     mkDerivation {
       pname = "casa-client";
-      version = "0.0.2";
-      sha256 = "0nr6dz6igxkmr4841hppd5zz0vjycfvybr3abqylrssg6vg988p2";
+      version = "0.0.3";
+      sha256 = "0jsnb4a9wwsyxr7i177hsfkybd4qya39jbx2rgyi8l0aiv31vc25";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -130635,8 +131276,8 @@ self: {
     }:
     mkDerivation {
       pname = "casa-types";
-      version = "0.0.2";
-      sha256 = "1c3qvph690pgnqmj132sn1zh878n3ljvmp913vvhwynfhyixs1v7";
+      version = "0.0.3";
+      sha256 = "00v3ydwnr57q40cp4i0x0y2hkm22x1619yvl6frl3j5j329s4slh";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -131061,7 +131702,7 @@ self: {
         rerebase
       ];
       description = "A converter for spinal, snake and camel cases";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -131868,7 +132509,7 @@ self: {
         vector
       ];
       description = "io-streams interface for the cassava CSV library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -131907,7 +132548,7 @@ self: {
         vector
       ];
       description = "`TemplateHaskell` helpers for `cassava`";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -132053,7 +132694,7 @@ self: {
         text
       ];
       description = "Portable CRC-32C";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -132591,7 +133232,7 @@ self: {
       ];
       doHaddock = false;
       description = "Dependency injection library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "cauldron-example-wiring";
     }
   ) { };
@@ -133386,7 +134027,7 @@ self: {
         websockets
       ];
       description = "A library for the Chrome Devtools Protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -134161,7 +134802,7 @@ self: {
         unordered-containers
       ];
       description = "Integration of \"cereal\" and \"unordered-containers\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -134335,6 +134976,7 @@ self: {
       free,
       hedgehog,
       hspec,
+      hspec-api,
       hspec-core,
       hspec-discover,
       hspec-expectations,
@@ -134347,8 +134989,8 @@ self: {
     }:
     mkDerivation {
       pname = "cfg";
-      version = "0.0.2.2";
-      sha256 = "1v0k3gkwwifps4msd2888slaf4wdw5ppfpp0a0rzgmp14fbxz2sw";
+      version = "0.0.2.3";
+      sha256 = "1l6k0lxgjgnyqz08zwgg7nymglljxn6q7b9i5zbi2a6h8gm28h27";
       libraryHaskellDepends = [
         base
         bytestring
@@ -134368,6 +135010,7 @@ self: {
         free
         hedgehog
         hspec
+        hspec-api
         hspec-core
         hspec-discover
         hspec-expectations
@@ -134378,7 +135021,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Type directed application configuration parsing and accessors";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -134556,7 +135199,7 @@ self: {
         base-prelude
       ];
       description = "A Future type that is easy to represent and handle in C/C++";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -134840,7 +135483,7 @@ self: {
         yaml
       ];
       description = "Command line tool";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "cgrep";
     }
   ) { };
@@ -134876,7 +135519,7 @@ self: {
         path-io
       ];
       description = "A container-/cgroup-aware substitute for the GHC RTS `-N` flag";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -135015,7 +135658,7 @@ self: {
         time
       ];
       description = "Mining Client for Kadena Chainweb";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chainweb-mining-client";
     }
@@ -135445,7 +136088,7 @@ self: {
         witherable
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -135480,7 +136123,7 @@ self: {
         tasty-hunit
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -135527,7 +136170,7 @@ self: {
         tasty-hunit
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -135557,7 +136200,7 @@ self: {
         some
       ];
       description = "Stateful monad transformer based on monoidal actions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -135606,7 +136249,7 @@ self: {
         vector
       ];
       description = "A diagnostics library for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -135721,7 +136364,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Pattern synonyms for ASCII characters for Word8, Word16 etc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -135968,7 +136611,7 @@ self: {
         doctest-parallel
       ];
       description = "Charting library targetting SVGs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -136031,7 +136674,7 @@ self: {
         numhask
       ];
       description = "See readme.md";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chart-svg-various";
     }
@@ -136725,7 +137368,7 @@ self: {
         QuickCheck
       ];
       description = "Checks context free grammar for ambiguity using brute force up to given limit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -137016,7 +137659,7 @@ self: {
         transformers
       ];
       description = "A simple and intuitive library for automated testing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -137039,7 +137682,7 @@ self: {
         HUnit
       ];
       description = "HUnit support for Chell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -137064,7 +137707,7 @@ self: {
         random
       ];
       description = "QuickCheck support for Chell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -137339,7 +137982,7 @@ self: {
         containers
       ];
       description = "A Library for Chess Game Logic";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -137457,7 +138100,7 @@ self: {
         text
       ];
       description = "Parse and scrape recipe blogs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chez-grater";
       broken = true;
@@ -137527,7 +138170,7 @@ self: {
         uuid
       ];
       description = "A tmux client for Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -137599,7 +138242,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Testing tools for chiasma";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -137658,7 +138301,7 @@ self: {
         vector
       ];
       description = "Lazy infinite streams with O(1) indexing and applications for memoization";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -138442,7 +139085,7 @@ self: {
         time
       ];
       description = "A high-performance time library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -138482,7 +139125,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Benchmarking tool with focus on comparing results";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "chronos";
       broken = true;
@@ -138747,7 +139390,7 @@ self: {
       sha256 = "018k9a014q4zprsla5k5hrdq1zwpp7hmckc0ldaj7nf6vg1hxas2";
       libraryHaskellDepends = [ base ];
       description = "Automatically convert Generic instances to and from church representations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -138850,7 +139493,7 @@ self: {
         unagi-chan
       ];
       description = "Channel/Arrow based streaming computation library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -138910,7 +139553,7 @@ self: {
         uuid
       ];
       description = "API bindings to IOHK's Cicero job scheduler";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cicero-cli";
       broken = true;
@@ -139739,6 +140382,8 @@ self: {
       ];
       description = "A source plugin for manipulating circuits in clash with a arrow notation";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -139779,7 +140424,7 @@ self: {
         vector
       ];
       description = "Circular fixed-sized mutable vectors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -139800,7 +140445,7 @@ self: {
         hspec
       ];
       description = "Make bounded enum types circular";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -140061,12 +140706,12 @@ self: {
         transformers
       ];
       description = "Generates citations and bibliography from CSL styles";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
   ) { };
 
-  citeproc_0_10 = callPackage (
+  citeproc_0_11 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -140095,8 +140740,8 @@ self: {
     }:
     mkDerivation {
       pname = "citeproc";
-      version = "0.10";
-      sha256 = "0snza31cf2agnpr80dl691insw6f8v1ii7f52q6dyl2cx56cawsh";
+      version = "0.11";
+      sha256 = "1msriz492kgnhljywbxys6jm3j3i41hm6scw9rx6g2mk2cz33z3m";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -140134,7 +140779,7 @@ self: {
         transformers
       ];
       description = "Generates citations and bibliography from CSL styles";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -141011,7 +141656,7 @@ self: {
         tasty-hunit
       ];
       description = "A class for types with only finitely many inhabitants";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -141062,10 +141707,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-ghc";
-      version = "1.8.2";
-      sha256 = "1pwbpk0f502jx37raq4n64c39jgcrzbya7nzzi6mq7wjm1xmxnsw";
-      revision = "2";
-      editedCabalFile = "1fr27hfpj31yaqn46k3jzb3kfba182wnqx7b4y7mi7qbm4pqqyr8";
+      version = "1.8.3";
+      sha256 = "1y2mrn4c8zcn7bjdza28k1p8716iqfc42vjggjalbcrn04zi0dsb";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -141111,7 +141754,8 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Clash: a functional hardware description language - GHC frontend";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -141179,10 +141823,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-lib";
-      version = "1.8.2";
-      sha256 = "02yzqkzaligkvd3830nsgnmnpswydf1a67hrhyhn6gg5crmb2jmg";
-      revision = "2";
-      editedCabalFile = "15h7vb7d0j9g9mnbgyn4sqdnffhvk7igchzyjpvan3h1p3r321wa";
+      version = "1.8.3";
+      sha256 = "114w3vag29famrdz934v42831hbcxvkd0jxhsm730rwni95ik78c";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -141278,8 +141920,10 @@ self: {
         unordered-containers
       ];
       description = "Clash: a functional hardware description language - As a library";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "v16-upgrade-primitives";
+      broken = true;
     }
   ) { };
 
@@ -141305,8 +141949,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-lib-hedgehog";
-      version = "1.8.2";
-      sha256 = "1z3252ac8gs05sp4p0yh73cxk4826hcwzyh7z8fddszhpk9iyhrl";
+      version = "1.8.3";
+      sha256 = "1cihj7m6n46v06np6hbd3z11zr74gy2b3alhfmx1x4hy3ycsr1x9";
       libraryHaskellDepends = [
         base
         clash-lib
@@ -141326,7 +141970,7 @@ self: {
         transformers
       ];
       description = "Hedgehog Generators for clash-lib";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -141413,10 +142057,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-prelude";
-      version = "1.8.2";
-      sha256 = "0pxzb0cj3wp2fjjj6wa2hnbqpvg7rrfza3fqr7m5c7l73yjmi2m3";
-      revision = "3";
-      editedCabalFile = "0b9rd93y48avji9fw6xfxsi3392php6j5qpvmyxjv32m5ljhp83d";
+      version = "1.8.3";
+      sha256 = "00fy0vgp2pj7vad50n53pz70hc6x1mvz3a28cl1xqdyi6mk82kfj";
       libraryHaskellDepends = [
         array
         arrows
@@ -141483,7 +142125,7 @@ self: {
         template-haskell
       ];
       description = "Clash: a functional hardware description language - Prelude library";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -141499,10 +142141,8 @@ self: {
     }:
     mkDerivation {
       pname = "clash-prelude-hedgehog";
-      version = "1.8.2";
-      sha256 = "0fn92r1zhdabqdanh3wqgcrmvqg886jap82r3h25gsldz6f8635m";
-      revision = "1";
-      editedCabalFile = "1hvclgpy4vl129qvm8px9w7hq2cv15m4zacdn2ay300sp0mbiwg3";
+      version = "1.8.3";
+      sha256 = "10mq2mpn6vnsb253p3hb665q94363vq5irmg8ns10p7kc2jc6l2l";
       libraryHaskellDepends = [
         base
         clash-prelude
@@ -141512,7 +142152,7 @@ self: {
         text
       ];
       description = "Hedgehog Generators for clash-prelude";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -141576,6 +142216,7 @@ self: {
       ];
       description = "Shake rules for building Clash programs";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -141900,7 +142541,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "An interface for a handler-independent, typeclass-based effect system";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -141929,7 +142570,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "An interface for a handler-independent, typeclass-based effect system";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -141970,7 +142611,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Automatic compliance with the classy-effects protocols";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -142305,6 +142946,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "CSS preprocessor as embedded Haskell";
       license = lib.licenses.bsd3;
+      maintainers = [ lib.maintainers.turion ];
     }
   ) { };
 
@@ -143888,6 +144530,7 @@ self: {
       description = "A Haskell library as database client for Clickhouse";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -144589,7 +145232,9 @@ self: {
         unix
       ];
       description = "Project file manager for Claude AI integrations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -144730,7 +145375,7 @@ self: {
         template-haskell
       ];
       description = "Closed type class declarations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -144955,7 +145600,7 @@ self: {
         time
       ];
       description = "Unofficial Haskell SDK for the CloudEvents specification";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -145117,7 +145762,7 @@ self: {
         template-haskell
       ];
       description = "CLI tool to easily spin up and control compute instances in various cloud environments";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "cloudy";
       maintainers = [ lib.maintainers.cdepillabout ];
     }
@@ -145877,6 +146522,40 @@ self: {
     }
   ) { };
 
+  cmark-gfm-lens = callPackage (
+    {
+      mkDerivation,
+      base,
+      cmark-gfm,
+      hspec,
+      lens,
+      profunctors,
+      text,
+    }:
+    mkDerivation {
+      pname = "cmark-gfm-lens";
+      version = "0.2.4";
+      sha256 = "1glp394f0c911h4p457c72rc9zhvash3fyzlf8n0f57ldyalvv16";
+      libraryHaskellDepends = [
+        base
+        cmark-gfm
+        profunctors
+        text
+      ];
+      testHaskellDepends = [
+        base
+        cmark-gfm
+        hspec
+        lens
+        text
+      ];
+      description = "Collection of Lens for cmark-gfm with minimal dependencies";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   cmark-highlight = callPackage (
     {
       mkDerivation,
@@ -145906,6 +146585,40 @@ self: {
     }
   ) { };
 
+  cmark-lens = callPackage (
+    {
+      mkDerivation,
+      base,
+      cmark,
+      hspec,
+      lens,
+      profunctors,
+      text,
+    }:
+    mkDerivation {
+      pname = "cmark-lens";
+      version = "0.2.3";
+      sha256 = "10303nnanf27a7maiw0krsla03rl7rmi88l1phjg4i8snfqip4lw";
+      libraryHaskellDepends = [
+        base
+        cmark
+        profunctors
+        text
+      ];
+      testHaskellDepends = [
+        base
+        cmark
+        hspec
+        lens
+        text
+      ];
+      description = "Collection of lens for CMark with minimal dependencies";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   cmark-lucid = callPackage (
     {
       mkDerivation,
@@ -146262,7 +146975,7 @@ self: {
         hedgehog
       ];
       description = "(C)oncurrent (M)onoidal (F)olds";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -146749,7 +147462,7 @@ self: {
         hedgehog
       ];
       description = "Composable Contravariant Comonadic Logging Library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -146772,7 +147485,7 @@ self: {
         stm
       ];
       description = "Asynchronous backend for co-log library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -146794,7 +147507,7 @@ self: {
         Glob
       ];
       description = "Composable Contravariant Comonadic Logging Library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -146846,7 +147559,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "effectful log effect using co-log-core";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -146877,7 +147590,7 @@ self: {
         text
       ];
       description = "Structured messages support in co-log ecosystem";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -146907,7 +147620,7 @@ self: {
         polysemy
       ];
       description = "Composable Contravariant Comonadic Logging Library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       mainProgram = "play-colog-poly";
     }
   ) { };
@@ -146953,7 +147666,7 @@ self: {
         polysemy-plugin
       ];
       description = "A Polysemy logging effect for high quality (unstructured) logs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -146991,7 +147704,7 @@ self: {
         co-log
       ];
       description = "Simple enhancements for logging with co-log";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       mainProgram = "co-log-simple";
     }
   ) { };
@@ -147156,7 +147869,7 @@ self: {
         vector
       ];
       description = "Computational biology toolkit to collaborate with researchers in constructive protein engineering";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -147841,7 +148554,7 @@ self: {
         transformers
       ];
       description = "CodeT";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -147882,7 +148595,7 @@ self: {
         transformers
       ];
       description = "GHC type-checker plugin for solving LiftT instances from codet";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -148116,7 +148829,7 @@ self: {
       sha256 = "1g2a723xlbj2blpyfgcr6jg6a2yyca7pa5dgw9jnpip98hssmhsa";
       libraryHaskellDepends = [ base ];
       description = "Coercions with improved type inference";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -148128,7 +148841,7 @@ self: {
       sha256 = "02xj06qdqy9i33hkp504qmgpb0qvhliyygib072s2k6z4wmwd1ar";
       libraryHaskellDepends = [ base ];
       description = "Coercible but only in one direction";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -148149,7 +148862,7 @@ self: {
         profunctors
       ];
       description = "Combine profunctors with coercible-subtypes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -148780,7 +149493,7 @@ self: {
         tasty-hunit
       ];
       description = "Equivariant CSM classes of coincident root loci";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -148837,7 +149550,7 @@ self: {
             utility-ht
           ];
           description = "Linear Programming using COIN-OR/CLP and comfort-array";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           badPlatforms = [ "aarch64-linux" ];
           maintainers = [ lib.maintainers.thielema ];
         }
@@ -149509,7 +150222,7 @@ self: {
         hashable
       ];
       description = "Generate a color for a hashable object";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -149822,7 +150535,7 @@ self: {
         text
       ];
       description = "Print and parse colors";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -149856,7 +150569,7 @@ self: {
         text
       ];
       description = "Convenient interface for printing colourful messages";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -150440,7 +151153,7 @@ self: {
         mtl
       ];
       description = "Collection of combinators over standard typeclasses";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -150579,7 +151292,7 @@ self: {
       ];
       doHaddock = false;
       description = "Additional shape types for the comfort-array package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -150634,7 +151347,7 @@ self: {
         utility-ht
       ];
       description = "Numerical Basic Linear Algebra using BLAS";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -150679,7 +151392,7 @@ self: {
         storable-record
       ];
       description = "High-level interface to FFTW (Fast Fourier Transform) based on comfort-array";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -150731,7 +151444,7 @@ self: {
         utility-ht
       ];
       description = "Linear Programming using GLPK and comfort-array";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { inherit (pkgs) glpk; };
@@ -150750,10 +151463,8 @@ self: {
     }:
     mkDerivation {
       pname = "comfort-graph";
-      version = "0.0.4";
-      sha256 = "1v3acgdr8srvpddl2kvap556ag93b9yphjf3y1qy14sq6f7v46hc";
-      revision = "2";
-      editedCabalFile = "05fhxw5lb81iah3siqv7liljj07qls6l3zl9kgrx3a9n865vygvw";
+      version = "0.0.4.1";
+      sha256 = "0g3fbv0x0g8d5k09qcsahrys0igkn8hnjwa0281lwsy16inwqlxg";
       libraryHaskellDepends = [
         base
         containers
@@ -151004,7 +151715,7 @@ self: {
         unordered-containers
       ];
       description = "A command line argument/option parser library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "task-manager";
     }
   ) { };
@@ -151030,7 +151741,7 @@ self: {
         mtl
       ];
       description = "A monad for commanders";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -151154,7 +151865,7 @@ self: {
         text
       ];
       description = "Pure Haskell commonmark parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -151280,7 +151991,7 @@ self: {
         text
       ];
       description = "An initial encoding of the CommonMark language";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -151344,7 +152055,7 @@ self: {
         yaml
       ];
       description = "Simple interface to commonmark-hs for parsing real-world Markdown";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -151398,7 +152109,7 @@ self: {
         url-slug
       ];
       description = "Obsidian-friendly commonmark wikilink parser";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -151522,7 +152233,7 @@ self: {
         containers
       ];
       description = "Commutative semigroups";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -151766,7 +152477,7 @@ self: {
         yaml
       ];
       description = "Compatibility checker for OpenAPI";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -151949,7 +152660,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Stacks, queues, and deques with compact representations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -154186,7 +154897,7 @@ self: {
       sha256 = "0aprzrslrbsl3d7j49nmx0kxx71m39zi7xlfyw8wnazqpi8mfwwb";
       libraryHaskellDepends = [ base ];
       description = "Concurrent actions that may fail with a value";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -157787,7 +158498,7 @@ self: {
         text
       ];
       description = "Schema definitions for the config-value package";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -157853,7 +158564,7 @@ self: {
         text
       ];
       description = "Simple, layout-based value language similar to YAML or JSON";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -158058,7 +158769,7 @@ self: {
         yaml
       ];
       description = "Tools for specifying and parsing configurations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "example";
     }
   ) { };
@@ -158200,6 +158911,7 @@ self: {
     {
       mkDerivation,
       base,
+      bytestring,
       containers,
       filepath,
       HUnit,
@@ -158212,12 +158924,11 @@ self: {
     }:
     mkDerivation {
       pname = "configurator-pg";
-      version = "0.2.10";
-      sha256 = "12a67pz6d2vpsa5qdaxm8lwl3jjg8f0idd5r3bjnqw22ji39cysj";
-      revision = "3";
-      editedCabalFile = "156p0hr14ggf2sfiivgndzrsayxfrmr22pr9hs6jban7m5r627ng";
+      version = "0.2.11";
+      sha256 = "0nrkp6w0wqh8ikp3iqz6xf0xd0xiws8nk2k0qqiiv8dn5g5z2nc1";
       libraryHaskellDepends = [
         base
+        bytestring
         containers
         megaparsec
         protolude
@@ -158372,7 +159083,7 @@ self: {
         text
       ];
       description = "Tracable multi-source config management";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -158892,7 +159603,7 @@ self: {
         doctest
       ];
       description = "A safe interface for Const summarization";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -159144,7 +159855,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Existential type that can be constrained";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -159292,7 +160003,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Constraint manipulation";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -159674,7 +160385,7 @@ self: {
         transformers-base
       ];
       description = "Concurrent PostgreSQL data consumers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -159711,7 +160422,7 @@ self: {
         transformers-base
       ];
       description = "Prometheus metrics for the consumers library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -159793,7 +160504,7 @@ self: {
         template-haskell
       ];
       description = "Assorted concrete container types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -160107,7 +160818,7 @@ self: {
         text-show
       ];
       description = "Generate art from context-free grammars";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "examples";
     }
   ) { };
@@ -160361,7 +161072,7 @@ self: {
         weigh
       ];
       description = "Unified interface for primitive arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -160716,7 +161427,7 @@ self: {
         witherable
       ];
       description = "Higher-order functions with their function arguments at the end, for channeling the full power of BlockArguments and LambdaCase";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -161400,7 +162111,9 @@ self: {
       ];
       description = "Convert the annotation of a gene to another in a delimited file using a variety of different databases";
       license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "convert-annotation";
+      broken = true;
     }
   ) { };
 
@@ -161435,7 +162148,7 @@ self: {
         template-haskell
       ];
       description = "Arithmetic and type checked conversions between units";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -161601,7 +162314,7 @@ self: {
       ];
       doHaddock = false;
       description = "A type-safe client generator for Convex for both Rust and Python";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "convex-schema-parser";
       broken = true;
@@ -161635,7 +162348,7 @@ self: {
         Unique
       ];
       description = "Convex hull";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -161738,7 +162451,7 @@ self: {
         time
       ];
       description = "For serving cookies";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -161798,7 +162511,7 @@ self: {
         megaparsec
       ];
       description = "Parser for the Cook markup language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cooklang-hs";
       broken = true;
@@ -162444,7 +163157,7 @@ self: {
       ];
       doHaddock = false;
       description = "System for verifying the correctness of generated Copilot programs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "verify-examples";
       broken = true;
@@ -163247,7 +163960,7 @@ self: {
         text
       ];
       description = "Types for interaction with CoreNLP";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -163302,7 +164015,7 @@ self: {
         transformers
       ];
       description = "classy optical monadic state";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -163821,7 +164534,7 @@ self: {
         tasty-hunit
       ];
       description = "Countable, Searchable, Finite, Empty classes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -163987,7 +164700,7 @@ self: {
         text
       ];
       description = "Country data type and functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -164161,7 +164874,7 @@ self: {
         tasty-hunit
       ];
       description = "Well-conditioned estimation of large-dimensional covariance matrices";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -164184,6 +164897,7 @@ self: {
       QuickCheck,
       quickcheck-instances,
       quickcheck-transformer,
+      smash,
       tasty,
       tasty-expected-failure,
       tasty-hunit,
@@ -164194,8 +164908,8 @@ self: {
     }:
     mkDerivation {
       pname = "covenant";
-      version = "1.1.0";
-      sha256 = "0cgf0l1xsm6l1gqn4mdvlz7j4rh1nx5pkimp6y18x8lp5498bbkj";
+      version = "1.2.0";
+      sha256 = "0iml7gzlyjgy64852wvwmi9j08jzsdriniwjw5v71hy8yxjn1r05";
       libraryHaskellDepends = [
         acc
         base
@@ -164212,6 +164926,7 @@ self: {
         QuickCheck
         quickcheck-instances
         quickcheck-transformer
+        smash
         tasty-hunit
         text
         transformers
@@ -164225,6 +164940,7 @@ self: {
         optics-core
         prettyprinter
         QuickCheck
+        smash
         tasty
         tasty-expected-failure
         tasty-hunit
@@ -164232,7 +164948,7 @@ self: {
         vector
       ];
       description = "Standalone IR for Cardano scripts";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -164285,7 +165001,7 @@ self: {
         semirings
       ];
       description = "Coya monoids";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -164320,7 +165036,7 @@ self: {
         text
       ];
       description = "Haskell bindings to the CozoDB C API";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -164636,7 +165352,7 @@ self: {
         vector-algorithms
       ];
       description = "Competitive programming problemsetting toolchain";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -164674,40 +165390,6 @@ self: {
   ) { };
 
   cpphs = callPackage (
-    {
-      mkDerivation,
-      base,
-      directory,
-      polyparse,
-      time,
-    }:
-    mkDerivation {
-      pname = "cpphs";
-      version = "1.20.9.1";
-      sha256 = "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz";
-      revision = "2";
-      editedCabalFile = "0vxav36p0kplp4dpd17i4cfzrsl3r437d840xwv83lf1bqp7mrxc";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        base
-        directory
-        polyparse
-        time
-      ];
-      executableHaskellDepends = [
-        base
-        directory
-        polyparse
-        time
-      ];
-      description = "A liberalised re-implementation of cpp, the C pre-processor";
-      license = "LGPL";
-      mainProgram = "cpphs";
-    }
-  ) { };
-
-  cpphs_1_20_10 = callPackage (
     {
       mkDerivation,
       base,
@@ -164735,7 +165417,6 @@ self: {
       ];
       description = "A liberalised re-implementation of cpp, the C pre-processor";
       license = "LGPL";
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "cpphs";
     }
   ) { };
@@ -164834,19 +165515,21 @@ self: {
       mkDerivation,
       base,
       containers,
+      deepseq,
       directory,
       parallel,
     }:
     mkDerivation {
       pname = "cpsa";
-      version = "4.4.6";
-      sha256 = "02x57fxwxcs16kn8dgr4pxjx0nrvvlwg3sm05hlipbycyaqwncmf";
+      version = "4.4.7";
+      sha256 = "131ri7wj5lsbsqm9rvcmrsdgb9mls24nf1rjcz9bylxxaizchm39";
       isLibrary = false;
       isExecutable = true;
       enableSeparateDataOutput = true;
       executableHaskellDepends = [
         base
         containers
+        deepseq
         directory
         parallel
       ];
@@ -164884,7 +165567,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "A library to detect CPU features";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "cpu-features-demo";
     }
   ) { };
@@ -164908,7 +165591,7 @@ self: {
         enumset
       ];
       description = "Binding for the cpuid machine instruction on x86 compatible processors";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -165052,6 +165735,67 @@ self: {
     }
   ) { };
 
+  cql_4_1_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      Decimal,
+      iproute,
+      network,
+      persist,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      text,
+      time,
+      transformers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "cql";
+      version = "4.1.0.0";
+      sha256 = "1qvkbnchf56khzvabl1s00sf7p0qdpafb88jqvvgf9gn916pfz30";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        Decimal
+        iproute
+        network
+        persist
+        template-haskell
+        text
+        time
+        transformers
+        uuid
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        Decimal
+        iproute
+        network
+        persist
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        text
+        time
+        uuid
+      ];
+      description = "Cassandra CQL binary protocol";
+      license = lib.licensesSpdx."0BSD";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   cql-io = callPackage (
     {
       mkDerivation,
@@ -165143,6 +165887,113 @@ self: {
     }
   ) { };
 
+  cql-io_2_0_0 = callPackage (
+    {
+      mkDerivation,
+      async,
+      attoparsec,
+      auto-update,
+      base,
+      bluefin,
+      bytestring,
+      containers,
+      cql,
+      crypton,
+      data-default-class,
+      Decimal,
+      exceptions,
+      formatting,
+      hashable,
+      HsOpenSSL,
+      iproute,
+      lens,
+      mtl,
+      mwc-random,
+      network,
+      persist,
+      primes,
+      QuickCheck,
+      random-shuffle,
+      raw-strings-qq,
+      retry,
+      semigroups,
+      semver,
+      stm,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      transformers,
+      unliftio-core,
+      unordered-containers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "cql-io";
+      version = "2.0.0";
+      sha256 = "1mzhyjn5apyivsq55knp4b4d4w5q16vzck660haf0r94rdfk6p8p";
+      libraryHaskellDepends = [
+        async
+        attoparsec
+        auto-update
+        base
+        bluefin
+        bytestring
+        containers
+        cql
+        crypton
+        data-default-class
+        exceptions
+        hashable
+        HsOpenSSL
+        iproute
+        lens
+        mtl
+        mwc-random
+        network
+        persist
+        random-shuffle
+        retry
+        semigroups
+        semver
+        stm
+        text
+        time
+        transformers
+        unliftio-core
+        unordered-containers
+        uuid
+        vector
+      ];
+      testHaskellDepends = [
+        async
+        base
+        containers
+        cql
+        Decimal
+        formatting
+        iproute
+        mtl
+        primes
+        QuickCheck
+        raw-strings-qq
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+        text
+        time
+        uuid
+      ];
+      doHaddock = false;
+      description = "Cassandra CQL client";
+      license = lib.licenses.mpl20;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   cql-io-tinylog = callPackage (
     {
       mkDerivation,
@@ -165590,7 +166441,7 @@ self: {
         tasty-golden
       ];
       description = "Crack various integer and floating-point data formats";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "crackNum";
     }
@@ -166099,7 +166950,7 @@ self: {
         criterion
       ];
       description = "crc32c";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.x86;
     }
   ) { };
@@ -166204,7 +167055,7 @@ self: {
         transformers
       ];
       description = "Garbage collected event folding CRDT";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -166277,7 +167128,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Framework for artificial life experiments";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -166483,7 +167334,7 @@ self: {
         unliftio
       ];
       description = "Reasoning about amortized time complexity";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "creditmonad";
     }
   ) { };
@@ -167019,7 +167870,7 @@ self: {
         vector
       ];
       description = "A simple tool for comparing in Criterion benchmark results";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "criterion-cmp";
       broken = true;
@@ -167560,7 +168411,7 @@ self: {
         unliftio
       ];
       description = "Encryption and decryption";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -167599,7 +168450,7 @@ self: {
         text
       ];
       description = "Dead simple broken links checker on local HTML folders";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       mainProgram = "croque-mort";
     }
   ) { };
@@ -167680,7 +168531,7 @@ self: {
         what4
       ];
       description = "Crucible is a library for language-agnostic symbolic simulation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -167745,7 +168596,7 @@ self: {
         text
       ];
       description = "An interactive debugger for Crucible programs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "crucible-debug";
       broken = true;
@@ -167834,7 +168685,7 @@ self: {
         what4
       ];
       description = "Support for translating and executing LLVM code in Crucible";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -167901,7 +168752,7 @@ self: {
         what4
       ];
       description = "An implementation of symbolic I/O primitives for Crucible";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -167963,7 +168814,7 @@ self: {
         what4
       ];
       description = "A syntax for reading and writing Crucible control-flow graphs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -168120,7 +168971,7 @@ self: {
         yaml
       ];
       description = "Simple top-level library for Crucible Simulation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -168245,7 +169096,7 @@ self: {
         what4
       ];
       description = "A verification tool for C programs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -168497,7 +169348,7 @@ self: {
         QuickCheck
       ];
       description = "An educational tool for studying classical cryptography schemes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -169012,7 +169863,7 @@ self: {
         tasty-hunit
       ];
       description = "Adaptation of the crypto-rng library for the effectful ecosystem";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -169556,10 +170407,8 @@ self: {
     }:
     mkDerivation {
       pname = "cryptohash-sha512";
-      version = "0.11.102.0";
-      sha256 = "0b48qwgyn68rfbq4fh6fmsk1kc07n8qq95217n8gjnlzvsh2395z";
-      revision = "5";
-      editedCabalFile = "1nxnkm5j402rdzv6gigh6dn8y9xbn2b6ql548aswphgvfargj1hd";
+      version = "0.11.103.0";
+      sha256 = "1iwd6my8msqi2hyb10lzmq6w1xrh1pf91lfwdhrj1qwmz6v7zp30";
       libraryHaskellDepends = [
         base
         bytestring
@@ -169579,7 +170428,7 @@ self: {
         criterion
       ];
       description = "Fast, pure and practical SHA-512 implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -169830,7 +170679,7 @@ self: {
       ];
       doHaddock = false;
       description = "Cryptol: The Language of Cryptography";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -170551,8 +171400,8 @@ self: {
     }:
     mkDerivation {
       pname = "cryptostore";
-      version = "0.3.1.0";
-      sha256 = "0fqwzhk2zqfl6313sd77a9rkx98f5q8582ay0qkkjqx1ni719kvi";
+      version = "0.4.0.0";
+      sha256 = "0zkwbfxw6xb940ill8d9naxb7gjb9hxh0k01p4jrf36f56cpq6kd";
       libraryHaskellDepends = [
         asn1-encoding
         asn1-types
@@ -171546,7 +172395,7 @@ self: {
         transformers
       ];
       description = "extracts data from a CSV file";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -172008,7 +172857,7 @@ self: {
       ];
       doHaddock = false;
       description = "Haskell Implementation of Cuckoo Filters";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -172248,7 +173097,7 @@ self: {
         tree-diff
       ];
       description = "CDDL Generator and test utilities";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "cuddle";
       broken = true;
@@ -172299,7 +173148,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Support for construction, rendering, and parsing of CUE sheets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -172561,7 +173410,7 @@ self: {
         text
       ];
       description = "Curly braces (brackets) expanding";
-      license = lib.licenses.lgpl3Only;
+      license = lib.licensesSpdx."LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -172983,20 +173832,29 @@ self: {
   curryer-rpc = callPackage (
     {
       mkDerivation,
+      asn1-types,
       async,
       base,
       binary,
       bytestring,
       containers,
       criterion,
+      crypton-x509,
+      crypton-x509-store,
+      crypton-x509-system,
+      data-default,
+      directory,
       exceptions,
       fast-builder,
+      filepath,
       hashable,
       network,
       network-byte-order,
       optparse-generic,
+      process,
       stm,
       stm-containers,
+      streaming-commons,
       streamly,
       streamly-bytestring,
       streamly-core,
@@ -173004,21 +173862,27 @@ self: {
       tasty-hunit,
       text,
       time,
+      tls,
       uuid,
       winery,
     }:
     mkDerivation {
       pname = "curryer-rpc";
-      version = "0.4.0";
-      sha256 = "0a0jlnwc58zj2lyk0flpqw3ccgiwd75mlwlkcad56ilfi7mgrwd0";
+      version = "0.5.0";
+      sha256 = "1ksz7ixgaqhmxwf8kxixf4zm3d4mbrfd8wbpf0dbagv7870q565d";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
+        asn1-types
         async
         base
         binary
         bytestring
         containers
+        crypton-x509
+        crypton-x509-store
+        crypton-x509-system
+        data-default
         exceptions
         fast-builder
         hashable
@@ -173026,10 +173890,13 @@ self: {
         network-byte-order
         stm
         stm-containers
+        streaming-commons
         streamly
         streamly-bytestring
         streamly-core
+        text
         time
+        tls
         uuid
         winery
       ];
@@ -173044,13 +173911,17 @@ self: {
         async
         base
         bytestring
+        directory
+        filepath
         network
+        process
         stm
         streamly-bytestring
         streamly-core
         tasty
         tasty-hunit
         text
+        tls
         winery
       ];
       benchmarkHaskellDepends = [
@@ -173510,7 +174381,7 @@ self: {
         template-haskell
       ];
       description = "Customizable string interpolation quasiquoters";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -173760,7 +174631,7 @@ self: {
         text
       ];
       description = "Common Vulnerability Scoring System";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -174073,7 +174944,7 @@ self: {
       ];
       doHaddock = false;
       description = "Digits 0-9";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -174336,6 +175207,8 @@ self: {
       ];
       description = "Binary parsing and serialization with integrated size";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -174533,6 +175406,7 @@ self: {
       ];
       description = "Network protocol helpers for Dahdit";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -174737,7 +175611,7 @@ self: {
       ];
       doHaddock = false;
       description = "Servant support for lucid2";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -174917,8 +175791,8 @@ self: {
     }:
     mkDerivation {
       pname = "dap";
-      version = "0.2.0.0";
-      sha256 = "04qv9k6ci2mgw5l39ac6c2kb9d0lby7774zwzr53iqv2xp44hp9l";
+      version = "0.3.0.0";
+      sha256 = "1svn07322j8y77sdnlqsr4rq2w2790ypnvihk34ij86i5vs9jyhn";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -175187,7 +176061,7 @@ self: {
         mv contrib/darcs_completion $out/share/bash-completion/completions/darcs
       '';
       description = "a distributed, interactive, smart revision control system";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "darcs";
     }
   ) { };
@@ -176562,7 +177436,7 @@ self: {
         QuickCheck
       ];
       description = "Simple functional ring type";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -176602,7 +177476,7 @@ self: {
         constraints
       ];
       description = "Define Backwards Compatibility Schemes for Arbitrary Data";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -176723,7 +177597,7 @@ self: {
       ];
       doHaddock = false;
       description = "Fast and safe implementation of common compiler machinery";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -176748,7 +177622,7 @@ self: {
         mtl
       ];
       description = "A class for types with a default value";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -176760,7 +177634,7 @@ self: {
       sha256 = "1d6m12yv5vjciwbig484jrv9qpy7v762k51rpalcimhbzg231r8a";
       libraryHaskellDepends = [ data-default ];
       description = "A class for types with a default value (compatibility shim)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -176866,7 +177740,7 @@ self: {
         data-default-class
       ];
       description = "Default instances for types in base";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -176937,7 +177811,7 @@ self: {
         data-default-class
       ];
       description = "Default instances for types in containers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -176960,7 +177834,7 @@ self: {
         dlist
       ];
       description = "Default instances for types in dlist";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -177004,7 +177878,7 @@ self: {
         old-locale
       ];
       description = "Default instances for types in old-locale";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -177337,7 +178211,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A basic framework for effect systems based on effects represented by GADTs";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -177375,7 +178249,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A basic framework for effect systems based on effects represented by GADTs";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -177426,7 +178300,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Template Haskell utilities for the data-effects library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -177452,7 +178326,7 @@ self: {
         primitive
       ];
       description = "Coerce between unlifted boxed and lifted types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -177792,7 +178666,7 @@ self: {
         hashable
       ];
       description = "Fixpoint data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -177868,6 +178742,8 @@ self: {
       ];
       description = "Fold function applications. Framework for variadic functions.";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -177897,7 +178773,7 @@ self: {
         HUnit
       ];
       description = "Specify that lifted values were forced to WHNF or NF";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -177919,7 +178795,7 @@ self: {
         hspec
       ];
       description = "A simple multi-way tree data structure";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -177987,7 +178863,7 @@ self: {
         distributive
       ];
       description = "Updatable analogue of Distributive functors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -178389,6 +179265,8 @@ self: {
       libraryHaskellDepends = [ base ];
       description = "A list but with a balanced enumeration of Cartesian product";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -178759,7 +179637,7 @@ self: {
         text
       ];
       description = "Read PDF form fields";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pdfreader";
       broken = true;
@@ -178829,7 +179707,7 @@ self: {
         raw-strings-qq
       ];
       description = "Prometheus metrics text format";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -178883,7 +179761,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "R-Tree is a spatial data structure similar to Quadtrees or B-Trees";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -178908,7 +179786,7 @@ self: {
         transformers
       ];
       description = "Unify STRef and IORef in plain Haskell 98";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -179003,7 +179881,7 @@ self: {
         unordered-containers
       ];
       description = "Data.Reify for GADTs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "example-ast";
     }
   ) { };
@@ -179618,7 +180496,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "SVD (System view description) file handling";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "pretty-svd";
     }
   ) { };
@@ -179907,7 +180785,7 @@ self: {
         vector
       ];
       description = "Dynamic growable resizable mutable generic vector";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -180028,7 +180906,7 @@ self: {
       sha256 = "1zq9xsiky6mf0b0n83za0y8w28fl4gf53h49d1zd220dqmxx057q";
       libraryHaskellDepends = [ base ];
       description = "Encryption library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -180215,7 +181093,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Datadog tracing client and mock agent";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "datadog-agent";
     }
@@ -180452,90 +181330,6 @@ self: {
   ) { };
 
   dataframe = callPackage (
-    {
-      mkDerivation,
-      array,
-      attoparsec,
-      base,
-      bytestring,
-      containers,
-      criterion,
-      directory,
-      filepath,
-      hashable,
-      HUnit,
-      random,
-      random-shuffle,
-      snappy,
-      statistics,
-      text,
-      time,
-      vector,
-      vector-algorithms,
-      zstd,
-    }:
-    mkDerivation {
-      pname = "dataframe";
-      version = "0.2.0.2";
-      sha256 = "0h4p5lbcka15zn5iqzvjsq2bwc3c1ivia5jf6p2gns8d0di9swbd";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        array
-        attoparsec
-        base
-        bytestring
-        containers
-        directory
-        filepath
-        hashable
-        snappy
-        statistics
-        text
-        time
-        vector
-        vector-algorithms
-        zstd
-      ];
-      executableHaskellDepends = [
-        array
-        attoparsec
-        base
-        bytestring
-        containers
-        directory
-        hashable
-        snappy
-        statistics
-        text
-        time
-        vector
-        vector-algorithms
-        zstd
-      ];
-      testHaskellDepends = [
-        base
-        HUnit
-        random
-        random-shuffle
-        text
-        time
-        vector
-      ];
-      benchmarkHaskellDepends = [
-        base
-        criterion
-        random
-        text
-        vector
-      ];
-      description = "An intuitive, dynamically-typed DataFrame library";
-      license = lib.licenses.gpl3Plus;
-      mainProgram = "dataframe";
-    }
-  ) { };
-
-  dataframe_0_3_0_4 = callPackage (
     {
       mkDerivation,
       array,
@@ -180546,7 +181340,6 @@ self: {
       containers,
       criterion,
       directory,
-      filepath,
       granite,
       hashable,
       HUnit,
@@ -180554,7 +181347,6 @@ self: {
       random,
       random-shuffle,
       snappy-hs,
-      statistics,
       template-haskell,
       text,
       time,
@@ -180564,8 +181356,8 @@ self: {
     }:
     mkDerivation {
       pname = "dataframe";
-      version = "0.3.0.4";
-      sha256 = "1s18jscs5x4m274v18zgbv0cx4m5x4jda1imacjd56jg7h0vd6sk";
+      version = "0.3.3.4";
+      sha256 = "0s2mjndzn5nly4fmrw6ada8px1mvh9ha18hfflidy3ky3ljbmiis";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -180576,11 +181368,11 @@ self: {
         bytestring-lexing
         containers
         directory
-        filepath
         granite
         hashable
+        process
+        random
         snappy-hs
-        statistics
         template-haskell
         text
         time
@@ -180589,63 +181381,55 @@ self: {
         zstd
       ];
       executableHaskellDepends = [
-        array
-        attoparsec
         base
-        bytestring
-        bytestring-lexing
-        containers
-        directory
-        granite
-        hashable
         random
-        snappy-hs
-        statistics
-        template-haskell
-        text
         time
         vector
-        vector-algorithms
-        zstd
       ];
       testHaskellDepends = [
-        array
-        attoparsec
         base
-        bytestring
-        bytestring-lexing
-        containers
-        directory
-        granite
-        hashable
         HUnit
         random
         random-shuffle
-        snappy-hs
-        statistics
-        template-haskell
         text
         time
         vector
-        vector-algorithms
-        zstd
       ];
       benchmarkHaskellDepends = [
         base
         criterion
         process
-        random
-        text
-        time
-        vector
       ];
       description = "A fast, safe, and intuitive DataFrame library";
-      license = lib.licenses.gpl3Plus;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "dataframe";
     }
   ) { };
 
+  dataframe-hasktorch = callPackage (
+    {
+      mkDerivation,
+      base,
+      dataframe,
+      hasktorch,
+      vector,
+    }:
+    mkDerivation {
+      pname = "dataframe-hasktorch";
+      version = "0.1.0.2";
+      sha256 = "1vm21jzfda3bx3xb60907dpr5a5rv99lcv7371p4xlq1j5njm76i";
+      libraryHaskellDepends = [
+        base
+        dataframe
+        hasktorch
+        vector
+      ];
+      testHaskellDepends = [ base ];
+      description = "Converts between dataframes and hasktorch tensors";
+      license = lib.licensesSpdx."MIT";
+    }
+  ) { };
+
   datalog = callPackage (
     {
       mkDerivation,
@@ -181258,7 +182042,7 @@ self: {
         criterion
       ];
       description = "Generation and traversal of compressed directed acyclic dawg graphs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -181281,7 +182065,7 @@ self: {
         kan-extensions
       ];
       description = "A comonoid w.r.t. Day";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -182987,8 +183771,8 @@ self: {
         }:
         mkDerivation {
           pname = "dear-imgui";
-          version = "2.3.1";
-          sha256 = "0pj973isqpnrg8zd4w5z50abd90cd4dnhdpy5i5ai8k24ak5mkp1";
+          version = "2.4.0";
+          sha256 = "1dzgcmz24yg3pird2gmxqhdnmwkydh54wym2x6lxq0r0dx3jphwz";
           isLibrary = true;
           isExecutable = true;
           libraryHaskellDepends = [
@@ -183019,7 +183803,7 @@ self: {
           ];
           doHaddock = false;
           description = "Haskell bindings for Dear ImGui";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -183127,7 +183911,7 @@ self: {
         text
       ];
       description = "Modules for working with the Debian package system";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -183223,7 +184007,7 @@ self: {
         tasty-quickcheck
       ];
       description = "de Bruijn indices and levels";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -183246,7 +184030,7 @@ self: {
         some
       ];
       description = "de Bruijn indices and levels";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -183589,7 +184373,7 @@ self: {
         tasty-golden
       ];
       description = "Like Debug.Trace but writing to files.";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -183675,7 +184459,7 @@ self: {
         optparse-applicative
       ];
       description = "Utilities for making your applications more debuggable";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -184092,7 +184876,7 @@ self: {
         witherable
       ];
       description = "Deeply-nested, multiple key type maps";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -184417,7 +185201,7 @@ self: {
         stm
       ];
       description = "Candidate NFData Instances for Types in base";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -184530,7 +185314,7 @@ self: {
         semigroupoids
       ];
       description = "Applicative maps";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -184577,7 +185361,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Abstractions over deferred folds";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -184873,7 +185657,7 @@ self: {
         sop-core
       ];
       description = "Defunctionalization helpers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -184895,7 +185679,7 @@ self: {
         singleton-bool
       ];
       description = "Defunctionalization helpers: booleans";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -184909,7 +185693,7 @@ self: {
       sha256 = "0yy02va22bhxk1gl1m1k4c84sc788g891p5m81mr3bai5y7vq402";
       libraryHaskellDepends = [ base ];
       description = "Defunctionalization helpers: core definitions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -184930,7 +185714,7 @@ self: {
         sop-core
       ];
       description = "Defunctionalization helpers: lists";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -185134,7 +185918,7 @@ self: {
         Unique
       ];
       description = "Delaunay tessellation";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -185275,7 +186059,7 @@ self: {
         base
       ];
       description = "Parse bounce messages per RFC3464, RFC3463";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -185403,7 +186187,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Facilities for storing a Haskell value, using delta types";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -185436,7 +186220,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Delta types, also known as change actions";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -185449,6 +186233,8 @@ self: {
       Chart,
       criterion,
       deepseq,
+      diagrams-lib,
+      diagrams-svg,
       hspec,
       hspec-discover,
       hvega,
@@ -185461,14 +186247,16 @@ self: {
     }:
     mkDerivation {
       pname = "deltaq";
-      version = "1.0.0.0";
-      sha256 = "00zpvwxar13rq84li7j21ycapdnyx128cs2yqvn6hwnrr8w25w9d";
+      version = "1.1.0.0";
+      sha256 = "06f71mikkmxpvpywl3ydss1knwy9pd3x9klbxfiz985v9q5nb4ja";
       revision = "1";
-      editedCabalFile = "1i4lkq6w34ik7csx6wpwy4by2vbdijilpynwjf9kr7dfn5ac2gz1";
+      editedCabalFile = "1g9l29msxa2w3yzv3xnvhhzgh1a2vc3s7g39g6rbx9rdx1xw68kc";
       libraryHaskellDepends = [
         base
         Chart
         deepseq
+        diagrams-lib
+        diagrams-svg
         lattices
         probability-polynomial
       ];
@@ -185491,7 +186279,7 @@ self: {
         vector
       ];
       description = "Framework for ∆Q System Development";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -185557,7 +186345,7 @@ self: {
         transformers
       ];
       description = "Demangler for C++ mangled names";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "demangle";
       broken = true;
@@ -185824,7 +186612,7 @@ self: {
         unliftio-core
       ];
       description = "Dependency injection for records-of-functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -185894,7 +186682,7 @@ self: {
         unliftio-core
       ];
       description = "Giving good advice to functions in records-of-functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -185957,7 +186745,7 @@ self: {
         unordered-containers
       ];
       description = "A dynamic environment for dependency injection";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -186015,7 +186803,7 @@ self: {
         unliftio-core
       ];
       description = "Pair resources files with types within your program";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -186087,7 +186875,7 @@ self: {
         some
       ];
       description = "A generalisation of EnumMap to dependent types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -186232,6 +187020,31 @@ self: {
     }
   ) { };
 
+  dependent-map_0_4_0_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      constraints-extras,
+      containers,
+      dependent-sum,
+    }:
+    mkDerivation {
+      pname = "dependent-map";
+      version = "0.4.0.1";
+      sha256 = "1picb90vw5kp1j7dgzrrx0qhwh9vkkkwkfk42vkb3bx8awy2x8sd";
+      libraryHaskellDepends = [
+        base
+        constraints-extras
+        containers
+        dependent-sum
+      ];
+      description = "Dependent finite maps (partial dependent products)";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.alexfmpe ];
+    }
+  ) { };
+
   dependent-monoidal-map = callPackage (
     {
       mkDerivation,
@@ -186621,7 +187434,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Double-ended queues";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -186875,7 +187688,7 @@ self: {
         HUnit
       ];
       description = "This package generates data constructor predicate functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -186956,7 +187769,7 @@ self: {
         primitive-unaligned
       ];
       description = "Derive Prim and PrimUnaligned";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -187039,7 +187852,9 @@ self: {
       mkDerivation,
       base,
       binary,
+      bytestring,
       containers,
+      ghc,
       haskell-src,
       HUnit,
       mtl,
@@ -187052,8 +187867,8 @@ self: {
     }:
     mkDerivation {
       pname = "derive-topdown";
-      version = "0.1.0.0";
-      sha256 = "0pxv77r769wg61pp51ibvkd256f2cyrd9k5mrqz68dwi76xk54hr";
+      version = "0.1.1.0";
+      sha256 = "1ixgy4bmcmkp00cn28kikgkg9ln6pl5wyibrbk8hckf2wpamy0c3";
       libraryHaskellDepends = [
         base
         containers
@@ -187068,7 +187883,9 @@ self: {
       testHaskellDepends = [
         base
         binary
+        bytestring
         containers
+        ghc
         haskell-src
         HUnit
         mtl
@@ -187081,6 +187898,8 @@ self: {
       ];
       description = "Derive type class instances";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -187166,7 +187985,7 @@ self: {
         bytestring
       ];
       description = "Type driven generic aeson instance customisation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -187268,7 +188087,7 @@ self: {
         HUnit
       ];
       description = "Derive a Show instance without field selector names";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -187309,7 +188128,7 @@ self: {
         unliftio-core
       ];
       description = "Derive instances for monad transformer stacks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -187391,7 +188210,7 @@ self: {
         HUnit
       ];
       description = "Parse and render JSON simply";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "derulo";
       broken = true;
@@ -187449,7 +188268,7 @@ self: {
         transformers
       ];
       description = "Combinators for describing binary data structures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -187977,7 +188796,7 @@ self: {
         text
       ];
       description = "Conversion between Devanagari Unicode, Harvard-Kyoto, IAST and ISO15919";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -188194,7 +189013,7 @@ self: {
         xmlbf
       ];
       description = "Render and parse df1 logs as HTML";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -188326,7 +189145,7 @@ self: {
         unordered-containers
       ];
       description = "A generic data integrity layer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dfinity-radix-tree-example";
     }
@@ -188761,7 +189580,7 @@ self: {
       ];
       doCheck = false;
       description = "A configuration language guaranteed to terminate";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "dhall";
       maintainers = [ lib.maintainers.Gabriella439 ];
     }
@@ -189511,7 +190330,7 @@ self: {
         yasi
       ];
       description = "Convert recursive ADTs from and to Dhall";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -189590,7 +190409,7 @@ self: {
         unordered-containers
       ];
       description = "Encrypt Decrypt Dhall expressions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dhall-secret";
     }
@@ -189663,7 +190482,7 @@ self: {
         text
       ];
       description = "Render dhall text with shell commands as function arguments";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dhall-text-shell";
       broken = true;
@@ -189740,7 +190559,7 @@ self: {
         text
       ];
       description = "Compile Dhall expressions to Cabal files";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -190018,8 +190837,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-ast";
-      version = "1.1.1";
-      sha256 = "1bg93w9897ijh28gb13y41slwq5fxr6s9p3q13m8hzv9rva7zzhm";
+      version = "1.1.2";
+      sha256 = "0a98wz9b1d4qpl6d06s48djkgrccgriqd29sz8zk3fcrz0b24r5a";
       libraryHaskellDepends = [
         aeson
         base
@@ -190031,7 +190850,7 @@ self: {
         random
       ];
       description = "abstract syntax tree for multiple programming languages";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -190049,8 +190868,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-bitcode";
-      version = "1.0.7";
-      sha256 = "0z0hqn3f3p5wyk1l93rc14992snbxm2jsda624ix9p2jqj4b104j";
+      version = "1.0.10";
+      sha256 = "0b9b7swrpdy09yj1sqg50xpbarjgh154r6j1ii4xl827x82gs3l3";
       libraryHaskellDepends = [
         aeson
         base
@@ -190065,7 +190884,7 @@ self: {
         random
       ];
       description = "Intermediate language for static code analysis";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -190082,8 +190901,8 @@ self: {
     }:
     mkDerivation {
       pname = "dhscanner-kbgen";
-      version = "1.0.1";
-      sha256 = "19iadc90zg2239h7kffkfgpy3kwdqac75f1r77adn5f9igyaj0pk";
+      version = "1.0.7";
+      sha256 = "1z7l1q9ijk2xzy94vpbkjsx74zccp2a1b3qbjfmhfh5gkpk3gyvv";
       libraryHaskellDepends = [
         aeson
         base
@@ -190092,7 +190911,7 @@ self: {
         dhscanner-bitcode
       ];
       description = "knowledge base predicates for static code analysis";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -191333,6 +192152,8 @@ self: {
       pname = "diagrams-pandoc";
       version = "0.4.1";
       sha256 = "1gil467zp3n6wymiw4d492izf1hhac01j4nafmahjh4ybvi840xr";
+      revision = "1";
+      editedCabalFile = "1pk9asxd89098hrqdvavk7hrqca9msmfvmk2ncs6kj6n5xifybgd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -191376,7 +192197,7 @@ self: {
         text
       ];
       description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "diagrams-pandoc";
     }
   ) { };
@@ -191443,16 +192264,13 @@ self: {
       process,
       split,
       texrunner,
-      time,
       vector,
       zlib,
     }:
     mkDerivation {
       pname = "diagrams-pgf";
-      version = "1.5";
-      sha256 = "13zm00ayyk6gvlh4l2wdmrdqic386v69i3krylgvrajhdsd050al";
-      revision = "1";
-      editedCabalFile = "0vzi1dim76arwjrh9yqb9l2004ffsir8rws4vx26is5wzxsqf8y1";
+      version = "1.5.0.1";
+      sha256 = "0xx4zcqks3n67ffxvvq6vjw0iv2xnc5i2yjbvqmxjkkak4kxif2g";
       libraryHaskellDepends = [
         base
         bytestring
@@ -191470,7 +192288,6 @@ self: {
         process
         split
         texrunner
-        time
         vector
         zlib
       ];
@@ -191874,7 +192691,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A Dialogflow Fulfillment library for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -191902,7 +192719,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "I/O in Haskell Report 1.2";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "examples";
     }
   ) { };
@@ -191994,7 +192811,7 @@ self: {
         random-fu
       ];
       description = "Simplistic D&D style dice-rolling system";
-      license = lib.licenses.unlicense;
+      license = lib.licensesSpdx."Unlicense";
       mainProgram = "dice";
     }
   ) { };
@@ -192332,7 +193149,7 @@ self: {
         show-combinators
       ];
       description = "Map file locations across diffs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -192711,7 +193528,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ zlib ];
       description = "CRC32 and Adler32 hashes for bytestrings";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { inherit (pkgs) zlib; };
 
@@ -193249,8 +194066,8 @@ self: {
     }:
     mkDerivation {
       pname = "digits";
-      version = "0.3.1";
-      sha256 = "0b3arnnwqw53cb2xqmy4j66nw9y6wrazb545qkka9y6w8nbrqjd8";
+      version = "0.3.2";
+      sha256 = "0rvi00scga0ckgp9vhcw4924cmbikw036p1nqfpb7j0adagjvzg5";
       libraryHaskellDepends = [
         base
         QuickCheck
@@ -193260,7 +194077,7 @@ self: {
         QuickCheck
       ];
       description = "Converts integers to lists of digits and back";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -193302,7 +194119,7 @@ self: {
         QuickCheck
       ];
       description = "Directed Graphs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -194233,7 +195050,7 @@ self: {
         unix
       ];
       description = "Platform-agnostic library for filesystem operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -194400,6 +195217,8 @@ self: {
       pname = "directory-ospath-streaming";
       version = "0.2.2";
       sha256 = "1xsfaps14pm68qfva4crqsmpqqcl8yjxrv514a6mxc9xw6z8zphs";
+      revision = "1";
+      editedCabalFile = "0gva9izvl69784297aazmhwm96sd85clwg1j69ksfhicw0nc8kmj";
       libraryHaskellDepends = [
         atomic-counter
         base
@@ -194419,7 +195238,51 @@ self: {
         unix
       ];
       description = "Stream directory entries in constant memory in vanilla IO";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
+    }
+  ) { };
+
+  directory-ospath-streaming_0_3 = callPackage (
+    {
+      mkDerivation,
+      atomic-counter,
+      base,
+      deepseq,
+      directory,
+      filepath,
+      os-string,
+      random,
+      tasty,
+      tasty-hunit,
+      unix,
+    }:
+    mkDerivation {
+      pname = "directory-ospath-streaming";
+      version = "0.3";
+      sha256 = "0hhgy7slx1sbmg9d198r7q970f2n91224gpa8d4qzj8p9m7yx1ky";
+      revision = "1";
+      editedCabalFile = "160q5cz246zla09nkg91jgwbfi1a8pz6zandfndqwf2dx2nsxgvd";
+      libraryHaskellDepends = [
+        atomic-counter
+        base
+        deepseq
+        filepath
+        os-string
+        unix
+      ];
+      testHaskellDepends = [
+        base
+        directory
+        filepath
+        os-string
+        random
+        tasty
+        tasty-hunit
+        unix
+      ];
+      description = "Stream directory entries in constant memory in vanilla IO";
+      license = lib.licensesSpdx."Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -194574,7 +195437,7 @@ self: {
         vector
       ];
       description = "Multivariate Dirichlet distribution";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -194798,7 +195661,7 @@ self: {
         tasty-golden
       ];
       description = "Functional programming language for teaching discrete math";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "disco";
       broken = true;
@@ -195507,7 +196370,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Disjoint containers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -195630,7 +196493,7 @@ self: {
         text
       ];
       description = "On-disk storage, but referentially transparent";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -196051,7 +196914,7 @@ self: {
         network-transport-tcp
       ];
       description = "Cloud Haskell: Erlang-style concurrency in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -196091,7 +196954,7 @@ self: {
         tasty-hunit
       ];
       description = "Cloud Haskell Async API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -196200,7 +197063,7 @@ self: {
         tasty-hunit
       ];
       description = "The Cloud Haskell Application Platform";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -196279,7 +197142,7 @@ self: {
         tasty-hunit
       ];
       description = "Execution Framework for The Cloud Haskell Application Platform";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -196334,7 +197197,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Cloud Haskell Extras";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -196769,7 +197632,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple zero-configuration backend for Cloud Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -196834,7 +197697,7 @@ self: {
         tasty-hunit
       ];
       description = "Supervisors for The Cloud Haskell Application Platform";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -196861,7 +197724,7 @@ self: {
         stm
       ];
       description = "Cloud Haskell Test Support";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -197003,7 +197866,7 @@ self: {
         tasty
       ];
       description = "Tests and test support tools for distributed-process";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -197097,7 +197960,7 @@ self: {
         rank1dynamic
       ];
       description = "Compositional, type-safe, polymorphic static values and closures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -197365,7 +198228,7 @@ self: {
         witherable
       ];
       description = "Unifying Parsers, Printers & Grammars";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -197388,7 +198251,7 @@ self: {
         text
       ];
       description = "ditto is a type-safe HTML form generation and validation library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -197643,7 +198506,7 @@ self: {
         pretty
       ];
       description = "Generate Haskell code from a type";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "djinn";
     }
   ) { };
@@ -197746,8 +198609,8 @@ self: {
     }:
     mkDerivation {
       pname = "djot";
-      version = "0.1.2.2";
-      sha256 = "17fqnzacnnraij9lwca25761sn5gaxjd42vnpmd397fdzd5dm6fh";
+      version = "0.1.2.3";
+      sha256 = "0jcccq9y95byqxm13aghcz59sqbv1qai7488bw5ma57dz96kppdm";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -197785,7 +198648,7 @@ self: {
         tasty-bench
       ];
       description = "Parser and renderer for djot light markup syntax";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "djoths";
     }
   ) { };
@@ -197856,7 +198719,7 @@ self: {
     }
   ) { };
 
-  dl-fedora_2_1 = callPackage (
+  dl-fedora_2_1_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -197882,8 +198745,8 @@ self: {
     }:
     mkDerivation {
       pname = "dl-fedora";
-      version = "2.1";
-      sha256 = "1j0p9nz5nk7bgmsrzw1asaangcwchld9sy9v1wdbswxv31cja2n3";
+      version = "2.1.1";
+      sha256 = "1qj8k9di8v5m0n9fy1ysb7iwnq50bnh22gml50wgps0ycl8qcvh1";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -198399,7 +199262,7 @@ self: {
         text
       ];
       description = "DNS name parsing and pattern matching utilities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -198654,7 +199517,7 @@ self: {
         time
       ];
       description = "DigitalOcean Spaces API bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -199909,7 +200772,7 @@ self: {
         transformers
       ];
       description = "Run doctest's in a Cabal.Test.exitcode-stdio environment";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -199945,7 +200808,7 @@ self: {
         utility-ht
       ];
       description = "Alternative doctest implementation that extracts comments to modules";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "doctest-extract-0.1";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -199959,7 +200822,7 @@ self: {
       sha256 = "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67";
       libraryHaskellDepends = [ base ];
       description = "Parts of doctest exposed as library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -200504,7 +201367,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A cross-platform dotfiles manager";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dojang";
     }
@@ -200673,7 +201536,6 @@ self: {
       ];
       description = "Simple monadic DOM parser";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -200775,7 +201637,7 @@ self: {
         th-orphans
       ];
       description = "Codegen helping you define domain models";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -200820,7 +201682,7 @@ self: {
         rerebase
       ];
       description = "Integration of domain with aeson";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -200903,7 +201765,7 @@ self: {
         rerebase
       ];
       description = "Integration of domain with cereal";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -200928,7 +201790,7 @@ self: {
         th-lift-instances
       ];
       description = "Low-level API of \"domain\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -200963,7 +201825,7 @@ self: {
         rerebase
       ];
       description = "Integration of domain with optics";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -201374,7 +202236,7 @@ self: {
         text
       ];
       description = "Datatypes and encoding for graphviz dot files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -201677,8 +202539,8 @@ self: {
     }:
     mkDerivation {
       pname = "dotparse";
-      version = "0.1.2.3";
-      sha256 = "0r5dzf30shd2piisn8a1z0i8y31h0xlr55is4dyj7zg7l87i16g4";
+      version = "0.1.3.0";
+      sha256 = "1rhd4bd2796hl5w8p7hrqpwjaq76ma37k7578m4b1gzy4j6l0gqv";
       libraryHaskellDepends = [
         algebraic-graphs
         base
@@ -201699,7 +202561,7 @@ self: {
         doctest-parallel
       ];
       description = "dot language parsing and printing";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -201737,7 +202599,7 @@ self: {
         text
       ];
       description = "Fast conversion between single and double precision floating point and text";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -202112,7 +202974,7 @@ self: {
         vector-space
       ];
       description = "Reverse mode automatic differentiation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -202745,7 +203607,7 @@ self: {
         relude
       ];
       description = "See README for more info";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dr-cabal";
       broken = true;
@@ -202847,7 +203709,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Actor library for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -203126,7 +203988,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Deriving without spelling out \"deriving\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -203711,7 +204573,7 @@ self: {
         QuickCheck
       ];
       description = "Haskell Digital Signal Processing";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -203796,7 +204658,7 @@ self: {
         vector
       ];
       description = "DSV (delimiter-separated values)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -204110,7 +204972,7 @@ self: {
         doctest
       ];
       description = "Automatically generate dual constructions";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.sellout ];
       broken = true;
@@ -204179,6 +205041,63 @@ self: {
     }
   ) { };
 
+  duckdb-ffi = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      Cabal,
+      containers,
+      directory,
+      duckdb,
+      exceptions,
+      filepath,
+      mtl,
+      process,
+      tasty,
+      tasty-expected-failure,
+      tasty-hunit,
+      text,
+      time,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "duckdb-ffi";
+      version = "1.4.1.3";
+      sha256 = "1drn5raf1phaqbac3svkww0gs21h51sh1kpmwnvz0xxk5ksmp3lk";
+      setupHaskellDepends = [
+        base
+        Cabal
+        directory
+        filepath
+        process
+      ];
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        exceptions
+        mtl
+        text
+        time
+        transformers
+      ];
+      librarySystemDepends = [ duckdb ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-expected-failure
+        tasty-hunit
+        text
+        time
+      ];
+      description = "Haskell FFI bindings for DuckDB";
+      license = lib.licensesSpdx."MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { inherit (pkgs) duckdb; };
+
   duckdb-haskell = callPackage (
     {
       mkDerivation,
@@ -204205,7 +205124,61 @@ self: {
         vector
       ];
       description = "Haskell bindings for duckdb";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+    }
+  ) { };
+
+  duckdb-simple = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      containers,
+      duckdb-ffi,
+      QuickCheck,
+      tasty,
+      tasty-expected-failure,
+      tasty-hunit,
+      tasty-quickcheck,
+      text,
+      time,
+      transformers,
+      uuid,
+    }:
+    mkDerivation {
+      pname = "duckdb-simple";
+      version = "0.1.2.3";
+      sha256 = "07i67sm28c87jwm36x5y6v4m67jwdby3rjj4hap1k336ri6kcz2i";
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        duckdb-ffi
+        text
+        time
+        transformers
+        uuid
+      ];
+      testHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        duckdb-ffi
+        QuickCheck
+        tasty
+        tasty-expected-failure
+        tasty-hunit
+        tasty-quickcheck
+        text
+        time
+        uuid
+      ];
+      description = "Haskell FFI bindings for DuckDB";
+      license = lib.licensesSpdx."MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -204295,7 +205268,7 @@ self: {
         unordered-containers
       ];
       description = "A Haskell library for parsing text into structured data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -204599,7 +205572,7 @@ self: {
         tasty-hunit
       ];
       description = "Duplicate any closure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -204743,7 +205716,7 @@ self: {
         filepath
       ];
       description = "durable/atomic file system writes (from rio package)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -205131,7 +206104,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A minimal testing library";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -205257,7 +206230,7 @@ self: {
         generics-sop
       ];
       description = "Programatically identify space leaks in your program";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -205492,6 +206465,25 @@ self: {
     }
   ) { };
 
+  dynamic-array = callPackage (
+    {
+      mkDerivation,
+      base,
+      primdata,
+    }:
+    mkDerivation {
+      pname = "dynamic-array";
+      version = "0.1.3";
+      sha256 = "1rd5yvj5hqvd24hwq2g7h3f6zkachkbk7zk0s03hrkim0i0839db";
+      libraryHaskellDepends = [
+        base
+        primdata
+      ];
+      description = "Minimum-overhead mutable dynamic arrays";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   dynamic-cabal = callPackage (
     {
       mkDerivation,
@@ -206348,7 +207340,7 @@ self: {
         vector
       ];
       description = "Configure dzen2 bars in Dhall language";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dzen-dhall";
       broken = true;
@@ -206413,7 +207405,7 @@ self: {
         transformers
       ];
       description = "An event-oriented observability library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -206457,7 +207449,7 @@ self: {
         unordered-containers
       ];
       description = "OpenTelemetry-based rendering for e11y";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -206591,7 +207583,7 @@ self: {
         vector
       ];
       description = "Binding to C++ earcut library";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207080,7 +208072,7 @@ self: {
         time
       ];
       description = "A Haskell description of the eBird API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207122,7 +208114,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "A command-line utility for interacting with the eBird API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ebird-cli";
     }
@@ -207155,7 +208147,7 @@ self: {
         text
       ];
       description = "Client functions for querying the eBird API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207536,6 +208528,31 @@ self: {
     }
   ) { };
 
+  ecstatic = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      process,
+    }:
+    mkDerivation {
+      pname = "ecstatic";
+      version = "0.1.0.0";
+      sha256 = "1l7qhn5lzh39w1lscdc4lm6r6rxniidns98s4943vc6vyafyrzmw";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        directory
+        process
+      ];
+      executableHaskellDepends = [ base ];
+      description = "Build \"as static as possible\" executable on Linux";
+      license = lib.licensesSpdx."MIT";
+      mainProgram = "ecstatic";
+    }
+  ) { };
+
   ecta = callPackage (
     {
       mkDerivation,
@@ -207671,7 +208688,7 @@ self: {
         text
       ];
       description = "Hole-Fit Synthesis using ECTAs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -207887,7 +208904,7 @@ self: {
         text
       ];
       description = "Templating language with similar syntax and features to Liquid or Jinja2";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ede";
       broken = true;
@@ -208671,7 +209688,7 @@ self: {
         unliftio
       ];
       description = "An easy to use, performant extensible effects library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -208706,7 +209723,7 @@ self: {
         unliftio-core
       ];
       description = "An easy to use, performant extensible effects library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -208741,7 +209758,7 @@ self: {
         text
       ];
       description = "effectful support for high-level PostgreSQL operations via Opaleye";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -208767,7 +209784,7 @@ self: {
         effectful-core
       ];
       description = "A GHC plugin for improving disambiguation of effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -208792,7 +209809,7 @@ self: {
         unliftio-pool
       ];
       description = "effectful support for mid-level PostgreSQL operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -208813,7 +209830,7 @@ self: {
         primitive
       ];
       description = "`ST`-style mutation for `effectful`";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -208848,7 +209865,7 @@ self: {
         effectful-core
       ];
       description = "Template Haskell utilities for the effectful library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -208951,7 +209968,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Effectful effects for testing";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -209584,7 +210601,7 @@ self: {
         transformers
       ];
       description = "Minimalistic SMTP client for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -209714,7 +210731,7 @@ self: {
       executableHaskellDepends = [ base ];
       executableToolDepends = [ markdown-unlit ];
       description = "IO with Exceptions tracked on the type-level";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "readme";
       broken = true;
@@ -209737,6 +210754,8 @@ self: {
       pname = "either";
       version = "5.0.3";
       sha256 = "00a8h2jgrpqdlsi8vjrm2qa6rmw33ksirxv9s6i90nlmhhg6jrkd";
+      revision = "1";
+      editedCabalFile = "1kxv5srzblkva3ajiw8jrzj05jbjncwj499hcsk9zsyml9ig9if3";
       libraryHaskellDepends = [
         base
         bifunctors
@@ -209801,7 +210820,7 @@ self: {
         doctest
       ];
       description = "Functions involving lists of Either";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -209838,7 +210857,7 @@ self: {
         hspec-discover
       ];
       description = "The simplest ‘MonadFail’ instance";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -209850,7 +210869,7 @@ self: {
       sha256 = "0llfkcq1j7l09vhn38s1asin90ki2xzkpr9xxqpvx0jvpdppza7i";
       libraryHaskellDepends = [ base ];
       description = "Either with a stricter Semigroup instance";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -209920,7 +210939,7 @@ self: {
             vector
           ];
           description = "Binding to EJDB2 C library, an embedded JSON noSQL database";
-          license = lib.licenses.mit;
+          license = lib.licensesSpdx."MIT";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -210523,7 +211542,7 @@ self: {
         unpacked-maybe-text
       ];
       description = "Serialization of Elasticsearch requests and responses";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -211768,7 +212787,7 @@ self: {
       ];
       doHaddock = false;
       description = "Crossing the road between Haskell and Elm";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -212067,7 +213086,7 @@ self: {
         text
       ];
       description = "Generate Elm datatype definitions, encoders and decoders from Haskell datatypes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "generate-test-app-code";
     }
   ) { };
@@ -212200,8 +213219,8 @@ self: {
     }:
     mkDerivation {
       pname = "elsa";
-      version = "0.2.2.0";
-      sha256 = "0389g6i5jkwlh218ywlysvadm4qqsk1kz4manjsz7xwnmz3m7jlm";
+      version = "0.3.0.0";
+      sha256 = "1gxlcplbqxixahkgmvgrc1754svdmqp4ri1acx3sc4yxnqd1z7h9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -212262,7 +213281,7 @@ self: {
         tlynx
       ];
       description = "Validate and (optionally) redo ELynx analyses";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "elynx";
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -212295,7 +213314,7 @@ self: {
         tlynx
       ];
       description = "Validate and (optionally) redo ELynx analyses";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "elynx";
       maintainers = [ lib.maintainers.dschrempf ];
@@ -212351,7 +213370,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Simulate molecular sequences along trees";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -212405,7 +213424,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Simulate molecular sequences along trees";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -212433,7 +213452,7 @@ self: {
         hspec
       ];
       description = "Import and export Nexus files";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -212460,7 +213479,7 @@ self: {
         hspec
       ];
       description = "Import and export Nexus files";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -212511,7 +213530,7 @@ self: {
         vector
       ];
       description = "Handle molecular sequences";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -212561,7 +213580,7 @@ self: {
         vector
       ];
       description = "Handle molecular sequences";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -212606,7 +213625,7 @@ self: {
         zlib
       ];
       description = "Tools for ELynx";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -212650,7 +213669,7 @@ self: {
         zlib
       ];
       description = "Tools for ELynx";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -212719,7 +213738,7 @@ self: {
         random
       ];
       description = "Handle phylogenetic trees";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -212786,7 +213805,7 @@ self: {
         random
       ];
       description = "Handle phylogenetic trees";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -212856,7 +213875,7 @@ self: {
         websockets
       ];
       description = "Static site generator library with hot reload";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -212907,7 +213926,7 @@ self: {
         url-slug
       ];
       description = "Useful route types for Ema";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -212951,7 +213970,7 @@ self: {
         url-slug
       ];
       description = "Generic deriving for Ema routes";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -213042,7 +214061,59 @@ self: {
         void
       ];
       description = "Utilities to write Emacs dynamic modules";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
+    }
+  ) { };
+
+  emacs-module_0_3 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      deepseq,
+      exceptions,
+      filepath,
+      monad-control,
+      monad-interleave,
+      mtl,
+      os-string,
+      prettyprinter,
+      prettyprinter-combinators,
+      primitive,
+      template-haskell,
+      text,
+      transformers-base,
+      tuples-homogenous-h98,
+      vector,
+      void,
+    }:
+    mkDerivation {
+      pname = "emacs-module";
+      version = "0.3";
+      sha256 = "0z00h71nyzijpvgalq12g1d1l2lw6d8jp9hhjdsy44la4yn2j4jk";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        deepseq
+        exceptions
+        filepath
+        monad-control
+        monad-interleave
+        mtl
+        os-string
+        prettyprinter
+        prettyprinter-combinators
+        primitive
+        template-haskell
+        text
+        transformers-base
+        tuples-homogenous-h98
+        vector
+        void
+      ];
+      description = "Utilities to write Emacs dynamic modules";
+      license = lib.licensesSpdx."Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -213231,7 +214302,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Perform basic syntax and deliverability checks on email addresses";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "email-validator";
     }
   ) { };
@@ -213622,8 +214693,7 @@ self: {
         yaml
       ];
       description = "Emanate a structured view of your plain-text notes";
-      license = lib.licenses.agpl3Only;
-      badPlatforms = [ "x86_64-darwin" ];
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "emanote";
       broken = true;
@@ -213730,7 +214800,7 @@ self: {
         chronos
       ];
       description = "execute actions periodically while avoiding drift";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -213929,7 +214999,7 @@ self: {
         transformers
       ];
       description = "Embedded shell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -215187,7 +216257,7 @@ self: {
         deepseq
       ];
       description = "Enum wrappers for IntMap and IntSet";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -215257,7 +216327,7 @@ self: {
         template-haskell
       ];
       description = "TH-generated EnumSet/EnumMap wrappers around IntSet/IntMap";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -215330,7 +216400,7 @@ self: {
       sha256 = "0xm9638nkikfy62abims10jmmr9y3rm2vb22aqh4qmjcj4r37ibq";
       libraryHaskellDepends = [ base ];
       description = "Conditionally running IO actions based on environment variables";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -215581,7 +216651,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Provides FromEnv in envy instance for Record of extensible";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -215874,7 +216944,7 @@ self: {
         numhask
       ];
       description = "See readme.md";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -216089,7 +217159,7 @@ self: {
         zip-archive
       ];
       description = "Library for parsing epub document metadata";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       mainProgram = "epub-metadata-example";
     }
   ) { };
@@ -216141,7 +217211,7 @@ self: {
         regex-compat
       ];
       description = "Command line utilities for working with epub files";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -216252,7 +217322,7 @@ self: {
         void
       ];
       description = "Proof assistant for Haskell using DataKinds & PolyKinds";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -216321,7 +217391,7 @@ self: {
         time
       ];
       description = "Application level triggered, and edge triggered event multiqueues";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -216505,7 +217575,7 @@ self: {
         websockets
       ];
       description = "Decentralized messaging and synchronization";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "erebos";
       broken = true;
@@ -216565,7 +217635,7 @@ self: {
         unix
       ];
       description = "Test framework with virtual network using Linux namespaces";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       platforms = lib.platforms.linux;
       mainProgram = "erebos-tester";
     }
@@ -216828,7 +217898,7 @@ self: {
         time
       ];
       description = "Generic API client library for ERPNext";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -216869,7 +217939,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Source code error pretty printing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "errata-example";
     }
   ) { };
@@ -216915,7 +217985,7 @@ self: {
         doctest
       ];
       description = "The canonical error type";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -216974,7 +218044,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Error code functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -218208,7 +219278,7 @@ self: {
         wkt-geom
       ];
       description = "postgis bindings for esqueleto";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -218289,7 +219359,7 @@ self: {
         transformers
       ];
       description = "PostgreSQL full text search for Esqueleto";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -218366,7 +219436,7 @@ self: {
         vector-sized
       ];
       description = "General purpose live coding framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -219483,7 +220553,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Mathematics utilities for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -219679,7 +220749,7 @@ self: {
         unix
       ];
       description = "Bindings to libevdev";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.linux;
     }
   ) { inherit (pkgs) libevdev; };
@@ -219717,7 +220787,7 @@ self: {
         unix
       ];
       description = "Bridge for working with evdev and streamly";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -220371,6 +221441,146 @@ self: {
     }
   ) { };
 
+  eventlog-live = callPackage (
+    {
+      mkDerivation,
+      ansi-terminal,
+      base,
+      bytestring,
+      dlist,
+      ghc-events,
+      hashable,
+      machines,
+      network,
+      optparse-applicative,
+      text,
+      unliftio-core,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "eventlog-live";
+      version = "0.3.0.0";
+      sha256 = "0m0wwjazqb03v9ppilp0kr75zd49kbjnbhdsl4v81gg8p2wn3xgn";
+      libraryHaskellDepends = [
+        ansi-terminal
+        base
+        bytestring
+        dlist
+        ghc-events
+        hashable
+        machines
+        network
+        optparse-applicative
+        text
+        unliftio-core
+        unordered-containers
+      ];
+      description = "Live processing of eventlog data";
+      license = lib.licensesSpdx."BSD-3-Clause";
+    }
+  ) { };
+
+  eventlog-live-influxdb = callPackage (
+    {
+      mkDerivation,
+      base,
+      clock,
+      containers,
+      dlist,
+      eventlog-live,
+      ghc-events,
+      influxdb,
+      lens-family,
+      machines,
+      optparse-applicative,
+      text,
+    }:
+    mkDerivation {
+      pname = "eventlog-live-influxdb";
+      version = "0.2.0.0";
+      sha256 = "03biydj51vfs0kh9c4i457ppk3qkr11lp5y7jbyfkg1nfd4cyf76";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        clock
+        containers
+        dlist
+        eventlog-live
+        ghc-events
+        influxdb
+        lens-family
+        machines
+        optparse-applicative
+        text
+      ];
+      description = "Stream eventlog data into InfluxDB";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "eventlog-live-influxdb";
+      broken = true;
+    }
+  ) { };
+
+  eventlog-live-otelcol = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      data-default,
+      dlist,
+      eventlog-live,
+      ghc-events,
+      grapesy,
+      hashable,
+      hs-opentelemetry-otlp,
+      lens-family,
+      machines,
+      optparse-applicative,
+      proto-lens,
+      random,
+      text,
+      unordered-containers,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "eventlog-live-otelcol";
+      version = "0.3.0.0";
+      sha256 = "1jxh4n14sidygy6z64nsfv8jq1bgi60kf6lka4nfkscyvz0mgi31";
+      revision = "1";
+      editedCabalFile = "1kgfd7nszj9rpc2k0frwmpj52pkfyb6grnl7ig2p5hpzp2l6lwxl";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        data-default
+        dlist
+        eventlog-live
+        ghc-events
+        grapesy
+        hashable
+        hs-opentelemetry-otlp
+        lens-family
+        machines
+        optparse-applicative
+        proto-lens
+        random
+        text
+        unordered-containers
+        vector
+        yaml
+      ];
+      description = "Stream eventlog data to the OpenTelemetry Collector";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "eventlog-live-otelcol";
+    }
+  ) { };
+
   eventlog-socket = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -220379,7 +221589,7 @@ self: {
       sha256 = "0rlwasd1hamyhpn4h3kk3s5sfhxvc1j8sz4nkxnmch6xgcqcp4yl";
       libraryHaskellDepends = [ base ];
       description = "Stream GHC eventlog events to external processes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -220452,7 +221662,7 @@ self: {
         text
       ];
       description = "Visualise an eventlog";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "eventlog2html";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -220981,7 +222191,7 @@ self: {
         unliftio-core
       ];
       description = "An event-oriented observability library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -221044,7 +222254,7 @@ self: {
         warp
       ];
       description = "Grab bag of eventuo11y-enriched functionality";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -221064,7 +222274,7 @@ self: {
         template-haskell
       ];
       description = "DSL for defining eventuo11y fields and selectors";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -221099,7 +222309,7 @@ self: {
         uuid
       ];
       description = "aeson-based rendering for eventuo11y";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -221123,7 +222333,7 @@ self: {
         text
       ];
       description = "OpenTelemetry-based rendering for eventuo11y";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -221147,7 +222357,7 @@ self: {
         prometheus
       ];
       description = "Prometheus backend for eventuo11y";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -221444,7 +222654,7 @@ self: {
         tasty-hunit
       ];
       description = "Exact Kantorovich distance between finite probability measures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -221558,7 +222768,7 @@ self: {
       libraryHaskellDepends = [ base ];
       executableHaskellDepends = [ base ];
       description = "Example Haskell Project";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "example-haskell-project";
     }
   ) { };
@@ -221812,7 +223022,7 @@ self: {
     }
   ) { };
 
-  exceptions_0_10_10 = callPackage (
+  exceptions_0_10_11 = callPackage (
     {
       mkDerivation,
       base,
@@ -221827,8 +223037,8 @@ self: {
     }:
     mkDerivation {
       pname = "exceptions";
-      version = "0.10.10";
-      sha256 = "1cddmj2y5h2hqjgmk14c698g8hhq0x2rycdl5vgz8vvzzsg83zq8";
+      version = "0.10.11";
+      sha256 = "1v3gyzy3yjs4ph6jz97ivgddy0saa3rkmxsxfm9fdp7mzlb2z9ai";
       libraryHaskellDepends = [
         base
         mtl
@@ -222259,7 +223469,7 @@ self: {
         xml-optics
       ];
       description = "A library for crawling exhentai";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -222402,7 +223612,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to ExifTool";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -222994,6 +224204,8 @@ self: {
       pname = "exon";
       version = "1.7.2.0";
       sha256 = "120cd6n7sqpakyk91izjblk92vc9bzr1a3bcskzkpky512mw47wm";
+      revision = "2";
+      editedCabalFile = "0kp3yymv09cjbcx4ljkkh370j9pcjz4gxv2kdmvwik1awgcjwix4";
       libraryHaskellDepends = [
         base
         ghc
@@ -223015,7 +224227,7 @@ self: {
         incipit-base
       ];
       description = "Customizable quasiquote interpolation";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -223197,6 +224409,7 @@ self: {
       ];
       description = "Extensible Pandoc";
       license = "LGPL";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -223508,7 +224721,7 @@ self: {
         hspec
       ];
       description = "Predicates that can explain themselves";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -223577,7 +224790,7 @@ self: {
         transformers
       ];
       description = "Exceptions which are explicit in the type signature";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -224125,7 +225338,7 @@ self: {
         HUnit
       ];
       description = "Support for an 80-bit extended float";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -224313,7 +225526,7 @@ self: {
         template-haskell
       ];
       description = "Extensible, efficient, optics-friendly data types and effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -224501,7 +225714,7 @@ self: {
         unliftio
       ];
       description = "Message passing concurrency as extensible-effect";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -224554,7 +225767,7 @@ self: {
         extensible
       ];
       description = "Operational-based extensible effect library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -224671,7 +225884,7 @@ self: {
         text
       ];
       description = "Parse Haskell Language Extensions";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "extensions";
     }
@@ -224734,17 +225947,17 @@ self: {
         text
       ];
       description = "Parse Haskell Language Extensions";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       mainProgram = "extensions";
     }
   ) { };
 
-  extensions_0_1_0_3 = callPackage (
+  extensions_0_1_1_0 = callPackage (
     {
       mkDerivation,
       base,
       bytestring,
-      Cabal,
+      Cabal-syntax,
       colourista,
       containers,
       directory,
@@ -224759,16 +225972,14 @@ self: {
     }:
     mkDerivation {
       pname = "extensions";
-      version = "0.1.0.3";
-      sha256 = "1fks1yfdk0zjc1vccj3nr6li09j64cq6b6x9s5mi8qrsv5igbzlm";
-      revision = "3";
-      editedCabalFile = "06a2yis43q7z4a7hakl8j0hm6wwrylf0f6k2lal4b5lh45dncl1p";
+      version = "0.1.1.0";
+      sha256 = "1v8hikf03p81rzg6cpiadzpbjljfc6q8dj4q8yr09nwgxcjij3h7";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
         base
         bytestring
-        Cabal
+        Cabal-syntax
         containers
         directory
         filepath
@@ -224796,7 +226007,7 @@ self: {
         text
       ];
       description = "Parse Haskell Language Extensions";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "extensions";
     }
@@ -224860,7 +226071,7 @@ self: {
         HUnit
       ];
       description = "Extism bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -224885,7 +226096,7 @@ self: {
         json
       ];
       description = "Extism manifest bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -224921,7 +226132,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Extism Plugin Development Kit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -225383,7 +226594,7 @@ self: {
         toolshed
       ];
       description = "Rational arithmetic in an irrational world";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "factory";
       broken = true;
@@ -226022,7 +227233,7 @@ self: {
         QuickCheck
       ];
       description = "Extensible fake file system for testing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -226052,7 +227263,7 @@ self: {
         QuickCheck
       ];
       description = "Monad to pull from fake stream-like objects";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -226314,7 +227525,7 @@ self: {
         tasty-hunit
       ];
       description = "Property-based testing with internal integrated shrinking";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -227276,6 +228487,8 @@ self: {
       ];
       description = "A fast, but bare bones, bytestring parser combinators library";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -227347,7 +228560,7 @@ self: {
         template-haskell
       ];
       description = "A fast open-union type suitable for 100+ contained alternatives";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -227836,7 +229049,7 @@ self: {
         HUnit
       ];
       description = "Stubs for dependencies of test code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -228007,7 +229220,7 @@ self: {
             vector
           ];
           description = "Various utility libraries";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -228321,7 +229534,7 @@ self: {
         fcf-family
       ];
       description = "Family-of-families instances for base";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -228403,7 +229616,7 @@ self: {
         text
       ];
       description = "Data structures and algorithms for first-class-families";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -228432,7 +229645,7 @@ self: {
         first-class-families
       ];
       description = "Family of families: featherweight defunctionalization";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -228678,7 +229891,7 @@ self: {
         text
       ];
       description = "Admin API for Firebase Cloud Messaging";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fcm-client";
       broken = true;
@@ -228805,7 +230018,7 @@ self: {
       ];
       executablePkgconfigDepends = [ ncurses ];
       description = "A terminal broughlike game about manipulating vision";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fearOfView";
       broken = true;
@@ -228992,7 +230205,7 @@ self: {
         random
       ];
       description = "Forward error correction of ByteStrings";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "benchmark-zfec";
       broken = true;
@@ -229312,6 +230525,62 @@ self: {
     }
   ) { };
 
+  fedora-repoquery_0_8 = callPackage (
+    {
+      mkDerivation,
+      base,
+      case-insensitive,
+      curl,
+      directory,
+      extra,
+      fedora-releases,
+      filepath,
+      Glob,
+      optparse-applicative,
+      regex-compat,
+      safe,
+      simple-cmd,
+      simple-cmd-args,
+      text,
+      time,
+      xdg-basedir,
+    }:
+    mkDerivation {
+      pname = "fedora-repoquery";
+      version = "0.8";
+      sha256 = "0fzydnlaalbnhkmdcsizrbwm7h3i44g29g2l514fw0lvc1s8ln9z";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        case-insensitive
+        curl
+        directory
+        extra
+        fedora-releases
+        filepath
+        Glob
+        optparse-applicative
+        regex-compat
+        safe
+        simple-cmd
+        simple-cmd-args
+        text
+        time
+        xdg-basedir
+      ];
+      testHaskellDepends = [
+        base
+        simple-cmd
+      ];
+      description = "Fedora release repos package query tool";
+      license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "fedora-repoquery";
+      broken = true;
+    }
+  ) { };
+
   fee-estimate = callPackage (
     {
       mkDerivation,
@@ -229832,7 +231101,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Declarative feedback loop manager";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -229890,7 +231159,7 @@ self: {
       executableSystemDepends = [ mxnet ];
       executableToolDepends = [ c2hs ];
       description = "FFI to MXNet";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mxnet-op-gen";
     }
@@ -229968,7 +231237,7 @@ self: {
         store
       ];
       description = "Cocodataset with cocoapi";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "imageutils";
       broken = true;
@@ -230118,7 +231387,7 @@ self: {
         vector
       ];
       description = "Some datasets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -230170,7 +231439,7 @@ self: {
         store
       ];
       description = "fei examples";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -230210,7 +231479,7 @@ self: {
         vector
       ];
       description = "A collection of standard models";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -230272,7 +231541,7 @@ self: {
         wl-pprint-text
       ];
       description = "Train a neural network with MXNet in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -230641,7 +231910,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "C bindings plus conveniences for the festival tts system";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -230869,7 +232138,7 @@ self: {
         unordered-containers
       ];
       description = "Automatic C++ binding generation";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -230890,7 +232159,7 @@ self: {
         template-haskell
       ];
       description = "Runtime for fficxx-generated library";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -231063,7 +232332,7 @@ self: {
             fftwFloat
           ];
           description = "Low-level interface to FFTW (Fast Fourier Transform)";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           maintainers = [ lib.maintainers.thielema ];
         }
       )
@@ -231133,7 +232402,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "FFunctor typeclass";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -231271,7 +232540,7 @@ self: {
         semirings
       ];
       description = "fibonacci algebra";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -231458,7 +232727,7 @@ self: {
         tasty-hunit
       ];
       description = "Codegen Haskell types to other languages";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -231733,7 +233002,7 @@ self: {
         temporary
       ];
       description = "Basic file IO operations via 'OsPath'";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -231913,7 +233182,7 @@ self: {
         tasty-bench
       ];
       description = "File URI parsing";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -232150,7 +233419,7 @@ self: {
         tasty-bench
       ];
       description = "Library for manipulating FilePaths in a cross platform way";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -232435,7 +233704,7 @@ self: {
         semigroups
       ];
       description = "A shared set of abstractions and types for representing filessytem data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -232725,7 +233994,7 @@ self: {
         tagged
       ];
       description = "Nat and Fin: peano naturals and finite numbers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -233158,7 +234427,7 @@ self: {
         vector-sized
       ];
       description = "A better, more type-safe Enum";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
     }
   ) { };
 
@@ -233216,7 +234485,7 @@ self: {
         vector
       ];
       description = "Flexible and easy deriving of type classes for finitary types";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -233252,7 +234521,7 @@ self: {
         optics-core
       ];
       description = "Prisms and Isos between finitary types";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -233289,8 +234558,6 @@ self: {
       ];
       description = "Finite ranges via types";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -233411,7 +234678,7 @@ self: {
         HUnit
       ];
       description = "Operations and classification for finite semigroups";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -233802,8 +235069,8 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "first-class-families";
-      version = "0.8.1.0";
-      sha256 = "1zynw2nvclx3rqjpd9g78mrmhll11x59s21hjppqsgv47zbf5vmk";
+      version = "0.8.2.0";
+      sha256 = "19qpg3vh3qqad395vcs1blidh1ykncy72fcqmwl5g8a7ci8s8g6y";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "First-class type families";
@@ -233838,9 +235105,7 @@ self: {
         template-haskell
       ];
       description = "First-class typeclass instances";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -233859,7 +235124,7 @@ self: {
         transformers
       ];
       description = "First class patterns and pattern matching, using type families";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -234287,7 +235552,7 @@ self: {
         text
       ];
       description = "Fixes whitespace issues";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "fix-whitespace";
     }
   ) { };
@@ -234323,7 +235588,7 @@ self: {
         ghc-internal
       ];
       description = "Fixed-point number build on generic integral number";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -234350,7 +235615,7 @@ self: {
         utility-ht
       ];
       description = "Lists with statically known length based on non-empty package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -234496,7 +235761,7 @@ self: {
         time
       ];
       description = "Pure Haskell library to repeat an action at a specific frequency";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -234533,7 +235798,7 @@ self: {
         template-haskell
       ];
       description = "Generic vectors with statically known size";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -235178,7 +236443,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Complete high-level binding to libFLAC";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) flac; };
 
@@ -235216,7 +236481,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Support for writing pictures into FLAC metadata blocks with JuicyPixels";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -235682,7 +236947,7 @@ self: {
         parsec
       ];
       description = "flatten a latex multi-file latex document and remove all comments";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       mainProgram = "flat-tex";
     }
   ) { };
@@ -235851,7 +237116,7 @@ self: {
         text
       ];
       description = "Flatbuffers encoding based on a syntax tree";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -235896,7 +237161,7 @@ self: {
         text
       ];
       description = "Parse flatbuffers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -235923,8 +237188,8 @@ self: {
     }:
     mkDerivation {
       pname = "flatparse";
-      version = "0.5.3.0";
-      sha256 = "0lgj4w77nkwblnswriq2wddy1c732wir5qd70gm3hz9slv35pnwx";
+      version = "0.5.3.1";
+      sha256 = "1ylmrq0ca5k5yzkg64f39nxcp7ahmpl2qgpz30rxnjf2rmymi2hh";
       libraryHaskellDepends = [
         base
         bytestring
@@ -236047,7 +237312,7 @@ self: {
         text
       ];
       description = "Flexible numeric parsers for real-world programming languages";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -236365,7 +237630,7 @@ self: {
       ];
       libraryToolDepends = [ proto-lens-protoc ];
       description = "Flink stateful functions SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -236716,7 +237981,7 @@ self: {
         HUnit
       ];
       description = "Write more understandable Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -238104,7 +239369,7 @@ self: {
         criterion
       ];
       description = "fnmatch C wrapper";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -238131,7 +239396,7 @@ self: {
         tasty-hunit
       ];
       description = "A general abstraction for manipulating elements of container data structures";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -238433,7 +239698,7 @@ self: {
         safe-exceptions
       ];
       description = "Exception handling with FoldM";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -238619,7 +239884,7 @@ self: {
         lens-family-core
       ];
       description = "Transducers for foldl folds";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -239005,7 +240270,7 @@ self: {
           ];
           doHaddock = false;
           description = "The folly C++ library from Meta";
-          license = lib.licenses.asl20;
+          license = lib.licensesSpdx."Apache-2.0";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -239133,7 +240398,7 @@ self: {
         text
       ];
       description = "Queries your system (Linux/BSD/etc) font database";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fontconfig-pure";
       broken = true;
@@ -239367,7 +240632,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A collection of helpers for ffi";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -239809,7 +241074,7 @@ self: {
         QuickCheck
       ];
       description = "Formatting of doubles";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -239905,7 +241170,7 @@ self: {
         text
       ];
       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -240067,7 +241332,7 @@ self: {
         text
       ];
       description = "Parse and serialize FDF, the Forms Data Format";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -240897,7 +242162,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fourmolu";
     }
@@ -241005,7 +242270,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fourmolu";
     }
@@ -241051,8 +242316,8 @@ self: {
     }:
     mkDerivation {
       pname = "fourmolu";
-      version = "0.19.0.0";
-      sha256 = "0sq9sxj99bzzmc5bdynh9c91yxsgrl2c4n9kdhnj78p7w9mkqfnb";
+      version = "0.19.0.1";
+      sha256 = "1xawjckgf1jsdkdscmfnlqazx0lidbpwy3qjf94by48ld3vpyywm";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -241115,7 +242380,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "fourmolu";
     }
   ) { };
@@ -241156,7 +242421,7 @@ self: {
         tasty-bench
       ];
       description = "IEEE 754-2019 compliant operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -241354,7 +242619,7 @@ self: {
       libraryPkgconfigDepends = [ fplll ];
       testHaskellDepends = [ base ];
       description = "Haskell bindings to <https://fplll.github.io/fplll/ fplll>";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) fplll; };
@@ -241627,7 +242892,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Reference implementation of FractalText";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -241660,7 +242925,7 @@ self: {
       sha256 = "0y2rkbmpzhn0zz273i1lfxv7f270yv89nmacs9m17rhjcj9n7243";
       libraryHaskellDepends = [ base ];
       description = "Numbers in the range [0.005, 1] as a sum of 2, 3, 4 or 5 unit fractions of special types.";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -241949,7 +243214,7 @@ self: {
         process
       ];
       description = "CLI frecency history";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "frecently";
     }
   ) { };
@@ -242550,8 +243815,8 @@ self: {
     }:
     mkDerivation {
       pname = "freckle-prelude";
-      version = "0.0.3.0";
-      sha256 = "0xnxrh3cniwlcjdjlxg1acdhfd51lpx2q112qhgynnfar866zbdc";
+      version = "0.0.4.0";
+      sha256 = "11qhlk66435qw2qkdmansd6x416ibck4xhd5298jciy53snhbhz8";
       libraryHaskellDepends = [
         base
         containers
@@ -242784,7 +244049,7 @@ self: {
         transformers
       ];
       description = "Free algebras";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -242812,7 +244077,7 @@ self: {
         transformers
       ];
       description = "Free Applicative Transformer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -242862,7 +244127,7 @@ self: {
         criterion
       ];
       description = "efficient data types for free categories and arrows";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -243045,7 +244310,7 @@ self: {
         void
       ];
       description = "Create games for free";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -243109,7 +244374,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Lawful list and set monad transformers based on free monads";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -243713,7 +244978,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Freer par monad";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -243763,7 +245028,7 @@ self: {
         mtl
       ];
       description = "A friendly effect system for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "freer-simple-examples";
       broken = true;
@@ -244112,7 +245377,7 @@ self: {
         happy
       ];
       description = "A functional DSL for vertex-centric large-scale graph processing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fregel";
       broken = true;
@@ -244178,7 +245443,7 @@ self: {
         gauge
       ];
       description = "Are you ready to get freaky?";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -244229,7 +245494,7 @@ self: {
         text-replace
       ];
       description = "Identifies and replaces frequent subsequences in long strings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "frequent-substring-exe";
     }
@@ -244306,8 +245571,8 @@ self: {
     }:
     mkDerivation {
       pname = "fresnel";
-      version = "0.1.0.1";
-      sha256 = "02d8d4m4msx7hxmp337zig07cvq7sci31f9x429w19bj43sp9j7g";
+      version = "0.1.0.2";
+      sha256 = "09jy2m20h0dazw6fakqh7kfwm7rwxhs7vfqr7plkx4229j9n9phx";
       libraryHaskellDepends = [
         base
         containers
@@ -244326,7 +245591,7 @@ self: {
         template-haskell
       ];
       description = "high-powered optics in a small package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -244349,7 +245614,7 @@ self: {
         fused-effects
       ];
       description = "fresnel/fused-effects integration";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -244511,7 +245776,7 @@ self: {
         optparse-applicative
       ];
       description = "Attempt to pretty-print any input";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "friendly";
     }
   ) { };
@@ -244569,7 +245834,7 @@ self: {
         semigroups
       ];
       description = "Linear time composable parser for PEG grammars";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -244597,7 +245862,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Provides a generic way to construct values from environment variables";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -245034,7 +246299,7 @@ self: {
         text
       ];
       description = "Abstract interface for the file system";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -245079,10 +246344,8 @@ self: {
     }:
     mkDerivation {
       pname = "fs-sim";
-      version = "0.4.0.0";
-      sha256 = "0wirx3mk2dmjw13adbf4d9qpgx7b9kk0y5my7s3yx1lsm2z9m4pw";
-      revision = "1";
-      editedCabalFile = "1lz7jaq5qp1pdc8dvahc3nl8csgpp0qplriqfnmrryn22dyqfi4s";
+      version = "0.4.1.0";
+      sha256 = "13igdxy6dnqdbvav7a66narfrckz0gaqwyih9wxra3pyf4jzzs9g";
       libraryHaskellDepends = [
         base
         base16-bytestring
@@ -245117,7 +246380,7 @@ self: {
         text
       ];
       description = "Simulated file systems";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -245490,7 +246753,7 @@ self: {
         unix
       ];
       description = "Watch a file/directory and run a command when it's modified";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fswatcher";
       broken = true;
@@ -245895,7 +247158,7 @@ self: {
         vector
       ];
       description = "In-memory full text search engine";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -246696,7 +247959,7 @@ self: {
         transformers
       ];
       description = "FFunctor: functors on (the usual) Functors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -246795,7 +248058,7 @@ self: {
         transformers
       ];
       description = "Convert values from one type into another";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -247064,7 +248327,7 @@ self: {
         time
       ];
       description = "GLL parser with simple combinator interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -247224,7 +248487,7 @@ self: {
       sha256 = "0jf8yhk45n06avl9avgmawvazsz585i7jppvcds6pjd8pqdb2qk4";
       libraryHaskellDepends = [ base ];
       description = "Type-level function utilities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -247267,7 +248530,7 @@ self: {
         transformers
       ];
       description = "A fast, flexible, fused effect system";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -247300,7 +248563,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Handle exceptions thrown in IO with fused-effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -247330,7 +248593,7 @@ self: {
         microlens
       ];
       description = "Monadic lens combinators for fused-effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -247374,7 +248637,7 @@ self: {
         gauge
       ];
       description = "High-quality random number generation as an effect";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -247397,7 +248660,7 @@ self: {
         optics-core
       ];
       description = "Bridge between the optics and fused-effects ecosystems";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -247420,7 +248683,7 @@ self: {
         transformers
       ];
       description = "Random number generation for fused-effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -247450,7 +248713,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A readline-like effect and carrier for fused-effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -247536,7 +248799,7 @@ self: {
         template-haskell
       ];
       description = "Template Haskell helpers for fused-effects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -247607,7 +248870,7 @@ self: {
         transformers
       ];
       description = "GHC plugin to make stream fusion more predictable";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -247619,7 +248882,7 @@ self: {
       sha256 = "14lzymjna6faiwj7bdm1jrz42jfj3w1wi2hv66mldjhadf45613d";
       libraryHaskellDepends = [ base ];
       description = "Types for the fusion-plugin package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -247774,7 +249037,7 @@ self: {
       ];
       doHaddock = false;
       description = "An optimising compiler for a functional, array-oriented language";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       mainProgram = "futhark";
       maintainers = [ lib.maintainers.athas ];
     }
@@ -247831,7 +249094,7 @@ self: {
         vector
       ];
       description = "An implementation of the Futhark data format";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -247870,7 +249133,7 @@ self: {
         text
       ];
       description = "Definition and serialisation instances for Futhark manifests";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -247903,7 +249166,7 @@ self: {
         text
       ];
       description = "Client implementation of the Futhark server protocol";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -248172,7 +249435,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Tools for processing unstructured text data";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -248323,7 +249586,7 @@ self: {
         tasty-hunit
       ];
       description = "Library for constructing and manipulating fuzzy sets and fuzzy relations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -248365,7 +249628,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Fuzzy text matching";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bench";
       broken = true;
@@ -248450,7 +249713,7 @@ self: {
         vector
       ];
       description = "Fuzzy set data structure for approximate string matching";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -248646,6 +249909,8 @@ self: {
       ];
       description = "Interface to the FXPak/FXPak Pro USB interface";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -249106,7 +250371,7 @@ self: {
         hspec
       ];
       description = "Composable, streaming, and efficient left folds";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -249402,7 +250667,7 @@ self: {
       sha256 = "0r8wybcqn7g24q8abrw757h76r75l4jh4hjx91yh44h4c1r6k4yf";
       doHaddock = false;
       description = "TBA";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -249806,7 +251071,7 @@ self: {
         yaml
       ];
       description = "A library for downloading data from a Great Black Swamp server";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -250858,7 +252123,7 @@ self: {
         x509
       ];
       description = "a simple Gemini capsule (server)";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -250957,7 +252222,7 @@ self: {
         transformers
       ];
       description = "A simple Happstack-style Gemini router";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -250992,7 +252257,7 @@ self: {
         utf8-string
       ];
       description = "A lightweight server for the Gemini protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -251039,7 +252304,7 @@ self: {
         transformers
       ];
       description = "A barebones textboard for the Gemini protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "gemini-textboard";
     }
   ) { };
@@ -251065,7 +252330,7 @@ self: {
         text
       ];
       description = "a tiny gemtext parser";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
     }
   ) { };
 
@@ -251155,7 +252420,7 @@ self: {
         unordered-containers
       ];
       description = "yet another static gemlog generator + converter";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
     }
   ) { };
 
@@ -251308,7 +252573,7 @@ self: {
         text
       ];
       description = "A library for interacting with various generative AI LLMs";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -251471,7 +252736,7 @@ self: {
         transformers
       ];
       description = "Exception-safe resource management in more monads";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -251746,7 +253011,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generic case analysis";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -252006,7 +253271,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generic structural diffs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -252048,7 +253313,7 @@ self: {
       sha256 = "0f83fnvmmi4yvdn9i2r1vkpk6cy4lqpxgjv26f380akyf30av90p";
       libraryHaskellDepends = [ base ];
       description = "Generically derived enumerations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -252121,7 +253386,7 @@ self: {
         inspection-testing
       ];
       description = "Generically extract and replace collections of record fields";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -252276,7 +253541,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Monomorphic field lens like with generic-lens";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -252289,7 +253554,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Derive Bounded and Enum for sum types and Enum for product types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -252331,7 +253596,7 @@ self: {
         generics-sop
       ];
       description = "First class pattern matching";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -252509,7 +253774,7 @@ self: {
         optics-core
       ];
       description = "Monomorphic field opics like with generic-lens";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -255362,7 +256627,7 @@ self: {
         QuickCheck
       ];
       description = "Terrestrial coordinate systems and geodetic calculations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -255697,7 +256962,7 @@ self: {
       ];
       testSystemDepends = [ geos ];
       description = "Bindings for GEOS";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -255744,7 +257009,7 @@ self: {
         time
       ];
       description = "A gerrit client library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -255891,7 +257156,7 @@ self: {
         th-lift-instances
       ];
       description = "gettext-th can internationalise a haskell program without runtime dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -255915,7 +257180,7 @@ self: {
         HUnit
       ];
       description = "The family of Extreme Value Distributions";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -256038,6 +257303,44 @@ self: {
     }
   ) { };
 
+  gh = callPackage (
+    {
+      mkDerivation,
+      base,
+      hspec,
+      hspec-discover,
+      process,
+      relude,
+      which,
+    }:
+    mkDerivation {
+      pname = "gh";
+      version = "0.2.0.0";
+      sha256 = "1lj1wz2b1wxhvcs7zww5ljs87v41xic3pj12fa7j58s41a6q5gkg";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        base
+        process
+        relude
+        which
+      ];
+      executableHaskellDepends = [
+        base
+        hspec
+        hspec-discover
+        process
+        relude
+        which
+      ];
+      description = "Haskell bindings for gh CLI";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "gh-test";
+      broken = true;
+    }
+  ) { };
+
   gh-labeler = callPackage (
     {
       mkDerivation,
@@ -256186,7 +257489,7 @@ self: {
             happy
           ];
           description = "The GHC API";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
         }
       )
@@ -256247,7 +257550,7 @@ self: {
         ghc-bignum
       ];
       description = "Backwards-compatible orphan instances for ghc-bignum";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -256289,7 +257592,7 @@ self: {
         unix
       ];
       description = "Shared functionality between GHC and its boot libraries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -256319,7 +257622,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "\"GHC.ByteOrder\" API Compatibility Layer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -256429,6 +257732,20 @@ self: {
     }
   ) { };
 
+  ghc-compat = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "ghc-compat";
+      version = "0.1.0.1";
+      sha256 = "0vb55bx45cdcf4sfvpkc4wx8zgi7h6bzchp4s66ndmqr5p0br3ld";
+      libraryHaskellDepends = [ base ];
+      description = "GHC compatibility for MicroHs";
+      license = lib.licensesSpdx."Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   ghc-core = callPackage (
     {
       mkDerivation,
@@ -256616,7 +257933,7 @@ self: {
         vty-crossplatform
       ];
       description = "A simple TUI using ghc-debug";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ghc-debug-brick";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -256681,7 +257998,7 @@ self: {
         vector
       ];
       description = "Useful functions for writing heap analysis tools which use ghc-debug";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -256724,7 +258041,7 @@ self: {
         unordered-containers
       ];
       description = "Connect to a socket created by ghc-debug-stub and analyse the heap of the debuggee program";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -256745,7 +258062,7 @@ self: {
         filepath
       ];
       description = "Definitions needed by ghc-debug-stub and ghc-debug-common";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -256770,7 +258087,7 @@ self: {
         ghc-prim
       ];
       description = "Functions for instrumenting your application so the heap can be analysed with ghc-debug-common";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -256839,7 +258156,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A step-through machine-interface debugger for GHC Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-debug-adapter";
     }
@@ -256864,7 +258181,7 @@ self: {
         template-haskell
       ];
       description = "Automatically generate GHC API counterparts to Haskell declarations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -256895,7 +258212,7 @@ self: {
         text
       ];
       description = "An AST and compiler plugin for dumping GHC's Core representation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -256998,7 +258315,7 @@ self: {
         regex-tdfa
       ];
       description = "Handy tools for working with ghc-dump dumps";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-dump";
     }
@@ -257060,7 +258377,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Library and tool for parsing .eventlog files from GHC";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ghc-events";
     }
   ) { };
@@ -257121,7 +258438,7 @@ self: {
         base
       ];
       description = "Analyze and visualize event logs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-events-analyze";
       broken = true;
@@ -257176,139 +258493,6 @@ self: {
     }
   ) { };
 
-  ghc-exactprint_0_6_4 = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      containers,
-      Diff,
-      directory,
-      filemanip,
-      filepath,
-      free,
-      ghc,
-      ghc-boot,
-      ghc-paths,
-      HUnit,
-      mtl,
-      silently,
-      syb,
-    }:
-    mkDerivation {
-      pname = "ghc-exactprint";
-      version = "0.6.4";
-      sha256 = "0a6baza962d4pz2m02hxmh8234i47zkizmwhsy68namr05dmlgpw";
-      revision = "1";
-      editedCabalFile = "0qil5rlsvxhwrbciixha8mdaw8wfci797n4wcyxn41mr4a4783f5";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        base
-        bytestring
-        containers
-        directory
-        filepath
-        free
-        ghc
-        ghc-boot
-        ghc-paths
-        mtl
-        syb
-      ];
-      testHaskellDepends = [
-        base
-        bytestring
-        containers
-        Diff
-        directory
-        filemanip
-        filepath
-        ghc
-        ghc-boot
-        ghc-paths
-        HUnit
-        mtl
-        silently
-        syb
-      ];
-      description = "ExactPrint for GHC";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
-  ghc-exactprint_1_5_0 = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      containers,
-      data-default,
-      Diff,
-      directory,
-      fail,
-      filemanip,
-      filepath,
-      free,
-      ghc,
-      ghc-boot,
-      ghc-paths,
-      HUnit,
-      mtl,
-      ordered-containers,
-      silently,
-      syb,
-    }:
-    mkDerivation {
-      pname = "ghc-exactprint";
-      version = "1.5.0";
-      sha256 = "07m4cg47knrrvpyimnbc0nq9176vkzwwa64b2iqfj6azn6q2hagp";
-      revision = "1";
-      editedCabalFile = "1v6my8bnhjhw7k3v2q9iwjpz9lj5g6ilvlzdq6svcabxahmzbr2c";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        base
-        bytestring
-        containers
-        data-default
-        directory
-        fail
-        filepath
-        free
-        ghc
-        ghc-boot
-        ghc-paths
-        mtl
-        ordered-containers
-        syb
-      ];
-      testHaskellDepends = [
-        base
-        bytestring
-        containers
-        data-default
-        Diff
-        directory
-        fail
-        filemanip
-        filepath
-        ghc
-        ghc-boot
-        ghc-paths
-        HUnit
-        mtl
-        ordered-containers
-        silently
-        syb
-      ];
-      description = "ExactPrint for GHC";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   ghc-exactprint_1_6_1_3 = callPackage (
     {
       mkDerivation,
@@ -257562,7 +258746,7 @@ self: {
         syb
       ];
       description = "ExactPrint for GHC";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -257613,7 +258797,7 @@ self: {
         syb
       ];
       description = "ExactPrint for GHC";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -257626,7 +258810,21 @@ self: {
       isLibrary = true;
       isExecutable = true;
       description = "ExactPrint for GHC";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  ghc-exactprint_1_14_0_0 = callPackage (
+    { mkDerivation }:
+    mkDerivation {
+      pname = "ghc-exactprint";
+      version = "1.14.0.0";
+      sha256 = "1nw1ddmwxla9ck3x096zfg8gzncy8pwj99rhsvq1nzs9arrprzzf";
+      isLibrary = true;
+      isExecutable = true;
+      description = "ExactPrint for GHC";
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -257648,7 +258846,7 @@ self: {
         ghc-prim
       ];
       description = "Experimental features of GHC's standard library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -257663,6 +258861,8 @@ self: {
       pname = "ghc-gc-hook";
       version = "0.2.1.0";
       sha256 = "0d98j3wyrwq6rgfdcky5ag3rxx1kzawvhnncr9nab058n2zksi7x";
+      revision = "1";
+      editedCabalFile = "1i3sz12zqcbqfps8wx3rwbdcjbvd654pixj92n2pl6h709xbcc2y";
       libraryHaskellDepends = [
         base
         clock
@@ -257674,8 +258874,6 @@ self: {
       description = "GHC garbage collection hook";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -257741,6 +258939,8 @@ self: {
       pname = "ghc-heap";
       version = "9.12.1";
       sha256 = "02g1r4hxz7w1a82mb9z7zzjad54hl9m4k1i59d1adsr8cc1cg75p";
+      revision = "1";
+      editedCabalFile = "0rk36kpkmlfyfh1lqbmg60c9wg96arx6fgqp2pgj80qlp9gkzasy";
       libraryHaskellDepends = [
         base
         containers
@@ -257749,7 +258949,7 @@ self: {
         rts
       ];
       description = "Functions for walking GHC's heap";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -257817,8 +259017,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-hie";
-      version = "0.0.2";
-      sha256 = "1z51fbm0n9knqrp01gqd7xx0pkfwyr9kgaginvqmdw45gi8rqhm7";
+      version = "0.0.3";
+      sha256 = "06cxddv5mqfwahw0nxn1q01vgzgbrgw1g5g9qibxz8d1cpm14w4y";
       libraryHaskellDepends = [
         array
         base
@@ -257850,8 +259050,6 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "HIE-file parsing machinery that supports multiple versions of GHC";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -257910,7 +259108,7 @@ self: {
         template-haskell
       ];
       description = "Translate Haskell source to Template Haskell expression";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -258106,7 +259304,7 @@ self: {
         rts
       ];
       description = "Basic libraries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -258140,67 +259338,6 @@ self: {
     }
   ) { };
 
-  ghc-lib_9_2_8_20230729 = callPackage (
-    {
-      mkDerivation,
-      alex,
-      array,
-      base,
-      binary,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      exceptions,
-      filepath,
-      ghc-lib-parser,
-      ghc-prim,
-      happy,
-      hpc,
-      parsec,
-      pretty,
-      process,
-      rts,
-      time,
-      transformers,
-      unix,
-    }:
-    mkDerivation {
-      pname = "ghc-lib";
-      version = "9.2.8.20230729";
-      sha256 = "0jxfbzz7w28jcfpd6x5480ml7zp7pza20mr2zqdvzjdidnxqvlml";
-      enableSeparateDataOutput = true;
-      libraryHaskellDepends = [
-        array
-        base
-        binary
-        bytestring
-        containers
-        deepseq
-        directory
-        exceptions
-        filepath
-        ghc-lib-parser
-        ghc-prim
-        hpc
-        parsec
-        pretty
-        process
-        rts
-        time
-        transformers
-        unix
-      ];
-      libraryToolDepends = [
-        alex
-        happy
-      ];
-      description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   ghc-lib_9_6_7_20250325 = callPackage (
     {
       mkDerivation,
@@ -258259,7 +259396,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -258324,7 +259461,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -258391,62 +259528,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  ghc-lib-parser_9_2_8_20230729 = callPackage (
-    {
-      mkDerivation,
-      alex,
-      array,
-      base,
-      binary,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      exceptions,
-      filepath,
-      ghc-prim,
-      happy,
-      parsec,
-      pretty,
-      process,
-      time,
-      transformers,
-      unix,
-    }:
-    mkDerivation {
-      pname = "ghc-lib-parser";
-      version = "9.2.8.20230729";
-      sha256 = "0lk6s6ka0yhqph6wlijlyzgj47r5j7cw6mnn02vgvqdvlmrkwkkl";
-      enableSeparateDataOutput = true;
-      libraryHaskellDepends = [
-        array
-        base
-        binary
-        bytestring
-        containers
-        deepseq
-        directory
-        exceptions
-        filepath
-        ghc-prim
-        parsec
-        pretty
-        process
-        time
-        transformers
-        unix
-      ];
-      libraryToolDepends = [
-        alex
-        happy
-      ];
-      description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -258502,7 +259584,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -258559,7 +259641,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -258618,48 +259700,7 @@ self: {
         happy
       ];
       description = "The GHC API, decoupled from GHC versions";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  ghc-lib-parser-ex_9_2_1_1 = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      containers,
-      directory,
-      extra,
-      filepath,
-      ghc-lib-parser,
-      tasty,
-      tasty-hunit,
-      uniplate,
-    }:
-    mkDerivation {
-      pname = "ghc-lib-parser-ex";
-      version = "9.2.1.1";
-      sha256 = "01004zsi4d3vd9k1d2ik284z6wnkny48yp5d2y6fi9hgba11d53q";
-      libraryHaskellDepends = [
-        base
-        bytestring
-        containers
-        ghc-lib-parser
-        uniplate
-      ];
-      testHaskellDepends = [
-        base
-        directory
-        extra
-        filepath
-        ghc-lib-parser
-        tasty
-        tasty-hunit
-        uniplate
-      ];
-      description = "Algorithms on GHC parse trees";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -258795,7 +259836,7 @@ self: {
         uniplate
       ];
       description = "Programming with GHC parse trees";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ghc-lib-parser-ex-build-tool";
     }
   ) { };
@@ -259300,7 +260341,7 @@ self: {
         hspec
       ];
       description = "GHC Plugin for non-empty lists";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -259329,7 +260370,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "Type checker plugins without the type checking";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -259359,7 +260400,7 @@ self: {
       libraryHaskellDepends = [ rts ];
       librarySystemDepends = [ c ];
       description = "GHC primitives";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { c = null; };
@@ -259407,7 +260448,7 @@ self: {
         text
       ];
       description = "Library for parsing GHC time and allocation profiling reports";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -259772,7 +260813,7 @@ self: {
         text
       ];
       description = "Symbol on term level";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -259804,64 +260845,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Syntax highlighter for Haskell using the lexer of GHC";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  ghc-tags_1_5 = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      async,
-      attoparsec,
-      base,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      filepath,
-      ghc-lib,
-      ghc-paths,
-      optparse-applicative,
-      process,
-      stm,
-      temporary,
-      text,
-      time,
-      vector,
-      yaml,
-    }:
-    mkDerivation {
-      pname = "ghc-tags";
-      version = "1.5";
-      sha256 = "0hscl49qq3lx2a5g6g7g1wa4rl52piizqsykicy1kvi4di7qnyqk";
-      isLibrary = false;
-      isExecutable = true;
-      executableHaskellDepends = [
-        aeson
-        async
-        attoparsec
-        base
-        bytestring
-        containers
-        deepseq
-        directory
-        filepath
-        ghc-lib
-        ghc-paths
-        optparse-applicative
-        process
-        stm
-        temporary
-        text
-        time
-        vector
-        yaml
-      ];
-      description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licenses.mpl20;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "ghc-tags";
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -259918,7 +260902,7 @@ self: {
         yaml
       ];
       description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-tags";
     }
@@ -259977,7 +260961,7 @@ self: {
         yaml
       ];
       description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghc-tags";
     }
@@ -260038,7 +261022,7 @@ self: {
         yaml
       ];
       description = "Utility for generating ctags and etags with GHC API";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       mainProgram = "ghc-tags";
     }
   ) { };
@@ -260072,7 +261056,7 @@ self: {
         text
       ];
       description = "CTags and ETags from Haskell syntax tree";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -260107,7 +261091,7 @@ self: {
         text
       ];
       description = "Streaming interface for ghc-tags-core";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -260154,7 +261138,7 @@ self: {
         text
       ];
       description = "A compiler plugin which generates tags file from GHC parsed syntax tree";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -260170,8 +261154,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-tcplugin-api";
-      version = "0.17.2.0";
-      sha256 = "01p6x6jppap6q82x8m5jw3rbzn60gqmap23x6lxq9jbn6am44vhv";
+      version = "0.18.1.0";
+      sha256 = "0nqcbilwzlvphbf5v902y84xx1f0h15bw2qnbh6zpcw97pbrliz5";
       libraryHaskellDepends = [
         array
         base
@@ -260181,7 +261165,7 @@ self: {
         transformers
       ];
       description = "An API for type-checker plugins";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -260305,7 +261289,7 @@ self: {
         tasty-bench
       ];
       description = "Faster traceEvent and traceMarker, and binary object logging for eventlog";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -260353,6 +261337,51 @@ self: {
     }
   ) { };
 
+  ghc-typelits-extra_0_5_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      ghc,
+      ghc-bignum,
+      ghc-prim,
+      ghc-tcplugin-api,
+      ghc-typelits-knownnat,
+      ghc-typelits-natnormalise,
+      tasty,
+      tasty-hunit,
+      template-haskell,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "ghc-typelits-extra";
+      version = "0.5.1";
+      sha256 = "0aikpiwcmsb71r2fbjik4pwyniks2rfikn6bgz0djnfbxmgy691k";
+      libraryHaskellDepends = [
+        base
+        containers
+        ghc
+        ghc-bignum
+        ghc-prim
+        ghc-tcplugin-api
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        template-haskell
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        ghc-typelits-knownnat
+        ghc-typelits-natnormalise
+        tasty
+        tasty-hunit
+      ];
+      description = "Additional type-level operations on GHC.TypeLits.Nat";
+      license = lib.licensesSpdx."BSD-2-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   ghc-typelits-knownnat = callPackage (
     {
       mkDerivation,
@@ -260392,7 +261421,7 @@ self: {
     }
   ) { };
 
-  ghc-typelits-knownnat_0_8_0 = callPackage (
+  ghc-typelits-knownnat_0_8_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -260400,6 +261429,7 @@ self: {
       ghc-bignum,
       ghc-tcplugin-api,
       ghc-typelits-natnormalise,
+      QuickCheck,
       tasty,
       tasty-hunit,
       tasty-quickcheck,
@@ -260408,8 +261438,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-typelits-knownnat";
-      version = "0.8.0";
-      sha256 = "009vfifi462dqp3z26b3czx1x22ayn3s8r1s4x967yw68mpwhpda";
+      version = "0.8.2";
+      sha256 = "0fljjj0n47wwxbg8kxpnn7kbf7vfdh91q3fhnk0jaq3nnlv05bdy";
       libraryHaskellDepends = [
         base
         ghc
@@ -260422,12 +261452,13 @@ self: {
       testHaskellDepends = [
         base
         ghc-typelits-natnormalise
+        QuickCheck
         tasty
         tasty-hunit
         tasty-quickcheck
       ];
       description = "Derive KnownNat constraints from other KnownNat constraints";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -260511,7 +261542,7 @@ self: {
     }
   ) { };
 
-  ghc-typelits-natnormalise_0_8_0 = callPackage (
+  ghc-typelits-natnormalise_0_9_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -260527,8 +261558,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghc-typelits-natnormalise";
-      version = "0.8.0";
-      sha256 = "1vdhj5pzx76aigim3a0ap3nhzhnhwl5cywz5rzzkplag8970rfdn";
+      version = "0.9.1";
+      sha256 = "190982vj945ppi83fd1j21y9snqrr4v8vbg2hnq5c0rgqch15g6k";
       libraryHaskellDepends = [
         base
         containers
@@ -260545,7 +261576,7 @@ self: {
         template-haskell
       ];
       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -260597,7 +261628,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -260681,7 +261712,7 @@ self: {
         xdot
       ];
       description = "Live visualization of data structures in GHCi";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.dalpd ];
     }
   ) { };
@@ -260705,7 +261736,7 @@ self: {
         time
       ];
       description = "Dump the ghc flags during compilation";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -260777,8 +261808,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghci-dap";
-      version = "0.0.25.0";
-      sha256 = "0za0m1s6hayzgv1j8brqlxylqsqx6cifml96a4rcjgi3g7i51ga8";
+      version = "0.0.26.0";
+      sha256 = "0gmidys4jd65f2fysf1zfnh42pkx5hyzrp7974j118lfk74c9n1i";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -260826,9 +261857,7 @@ self: {
       ];
       description = "ghci-dap is a GHCi having DAP interface";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "ghci-dap";
-      broken = true;
     }
   ) { };
 
@@ -261083,7 +262112,7 @@ self: {
         websockets
       ];
       description = "A websocket server that survives GHCi reloads";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -261144,7 +262173,7 @@ self: {
         text
       ];
       description = "A GHCi session in LaTeX";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ghci4luatex";
     }
   ) { };
@@ -261256,7 +262285,6 @@ self: {
       haddock-library,
       hashable,
       hie-bios,
-      hie-compat,
       hiedb,
       hls-graph,
       hls-plugin-api,
@@ -261293,10 +262321,8 @@ self: {
     }:
     mkDerivation {
       pname = "ghcide";
-      version = "2.11.0.0";
-      sha256 = "0d9rvh6xxw8y64f1pdivwdkmi9wqknl4m2n2h3x4rjmqj2al92vs";
-      revision = "2";
-      editedCabalFile = "0kqdzwf0fpzg69sawsrlhf3x0yv3ixi2x5ia6jb2zckaa5wl4ik2";
+      version = "2.12.0.0";
+      sha256 = "0m0a89ilkwcwpmjkp9jx4f40v3kn6cgjrmsws20blas6kcrjk68l";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -261332,7 +262358,6 @@ self: {
         haddock-library
         hashable
         hie-bios
-        hie-compat
         hiedb
         hls-graph
         hls-plugin-api
@@ -261378,7 +262403,7 @@ self: {
         optparse-applicative
       ];
       description = "The core of an IDE";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "ghcide";
     }
   ) { };
@@ -261475,7 +262500,7 @@ self: {
       ];
       testToolDepends = [ ghcide ];
       description = "An LSP client for running performance experiments on HLS";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghcide-bench";
       broken = true;
@@ -261523,7 +262548,7 @@ self: {
         text
       ];
       description = "Test utils for ghcide";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -261597,7 +262622,7 @@ self: {
       ];
       doHaddock = false;
       description = "A Terminal User Interface (TUI) for GHCi";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ghcitui";
     }
   ) { };
@@ -261634,7 +262659,7 @@ self: {
       version = "0.8.0.4";
       sha256 = "081w3234jramsmafnl86v37lwbckr2vc93gr9pdwc31yzni9kbml";
       description = "base library for GHCJS";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       platforms = [ "javascript-ghcjs" ];
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -261675,7 +262700,7 @@ self: {
         vector
       ];
       description = "Allow GHCJS projects to compile under GHC and develop using intero";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -261717,7 +262742,7 @@ self: {
         transformers
       ];
       description = "DOM library that supports both GHCJS and GHC";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -261755,7 +262780,7 @@ self: {
       ];
       description = "GHCJS DOM Hello World, an example package";
       license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.alexfmpe ];
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -261766,7 +262791,7 @@ self: {
       version = "0.9.9.3";
       sha256 = "1k62w5czg544ias8q2kvhp8qnlafzisgx1p0gq8d2kh662w99kcg";
       description = "DOM library using JSFFI and GHCJS";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       platforms = [ "javascript-ghcjs" ];
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -261781,7 +262806,7 @@ self: {
       libraryHaskellDepends = [ jsaddle-dom ];
       doHaddock = false;
       description = "DOM library that supports both GHCJS and GHC using jsaddle";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -261793,7 +262818,7 @@ self: {
       version = "0.9.9.0";
       sha256 = "0fhcs89x180kw75qgbfh28wjyn55frwdfj4rqlqa1smx0fwhzyy1";
       description = "DOM library using JSFFI and GHCJS";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -262350,7 +263375,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "ghc toolchain installer";
-      license = lib.licenses.lgpl3Only;
+      license = lib.licensesSpdx."LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ghcup";
       broken = true;
@@ -263662,7 +264687,7 @@ self: {
         haskell-gi-base
       ];
       description = "Haskell implementation of GListModel interface from gi-gio";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -264481,8 +265506,6 @@ self: {
       ];
       description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top";
       license = lib.licenses.lgpl21Only;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -265186,9 +266209,9 @@ self: {
       haskell-gi,
       haskell-gi-base,
       haskell-gi-overloading,
+      javascriptcoregtk,
       text,
       transformers,
-      webkitgtk_4_0,
     }:
     mkDerivation {
       pname = "gi-javascriptcore4";
@@ -265213,12 +266236,12 @@ self: {
         text
         transformers
       ];
-      libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+      libraryPkgconfigDepends = [ javascriptcoregtk ];
       description = "JavaScriptCore 4.x bindings";
       license = lib.licenses.lgpl21Only;
       hydraPlatforms = lib.platforms.none;
     }
-  ) { inherit (pkgs) webkitgtk_4_0; };
+  ) { javascriptcoregtk = null; };
 
   gi-javascriptcore6 = callPackage (
     {
@@ -265456,6 +266479,8 @@ self: {
       libraryPkgconfigDepends = [ libnotify ];
       description = "Libnotify bindings";
       license = lib.licenses.lgpl21Only;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { inherit (pkgs) libnotify; };
 
@@ -266125,7 +267150,7 @@ self: {
       haskell-gi-overloading,
       text,
       transformers,
-      webkitgtk_4_0,
+      webkit2gtk,
     }:
     mkDerivation {
       pname = "gi-webkit2";
@@ -266164,13 +267189,13 @@ self: {
         text
         transformers
       ];
-      libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+      libraryPkgconfigDepends = [ webkit2gtk ];
       description = "WebKit2 bindings";
       license = lib.licenses.lgpl21Only;
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
     }
-  ) { inherit (pkgs) webkitgtk_4_0; };
+  ) { webkit2gtk = null; };
 
   gi-webkit2webextension = callPackage (
     {
@@ -266190,7 +267215,7 @@ self: {
       haskell-gi-overloading,
       text,
       transformers,
-      webkitgtk_4_0,
+      webkit2gtk-web-extension,
     }:
     mkDerivation {
       pname = "gi-webkit2webextension";
@@ -266223,14 +267248,14 @@ self: {
         text
         transformers
       ];
-      libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+      libraryPkgconfigDepends = [ webkit2gtk-web-extension ];
       description = "WebKit2-WebExtension 4.x bindings";
       license = lib.licenses.lgpl21Only;
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
-  ) { inherit (pkgs) webkitgtk_4_0; };
+  ) { webkit2gtk-web-extension = null; };
 
   gi-webkitwebprocessextension = callPackage (
     {
@@ -266544,7 +267569,7 @@ self: {
       ];
       doHaddock = false;
       description = "Generate easy-to-remember, hard-to-guess passwords";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -266613,7 +267638,7 @@ self: {
         gauge
       ];
       description = "Refreshed parsec-style library for compatibility with Scala parsley";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -266728,7 +267753,7 @@ self: {
         utf8-string
       ];
       description = "An implementation of the Jinja2 template language in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "ginger";
     }
   ) { };
@@ -266818,7 +267843,7 @@ self: {
         vector
       ];
       description = "Jinja templates for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ginger2";
       broken = true;
@@ -266973,7 +267998,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ system-glib ];
       description = "Binding to GIO";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
     }
   ) { system-glib = pkgs.glib; };
 
@@ -267349,8 +268374,8 @@ self: {
     }:
     mkDerivation {
       pname = "git-annex";
-      version = "10.20250828";
-      sha256 = "11riq7ni0sqpkks2xaiimb7hl76wrnyac1smjs182m2sscn9bym4";
+      version = "10.20250929";
+      sha256 = "1ff30f8ifp2a73d64q25mpzirnrm5q0amri9xcz7814wwynv24hj";
       configureFlags = [
         "-fassistant"
         "-f-benchmark"
@@ -268164,7 +269189,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Recover Git repositories from disk recovery tool output (photorec)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "git-phoenix";
       broken = true;
@@ -268257,7 +269282,7 @@ self: {
         text
       ];
       description = "Git remote helper to store git objects on IPFS";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "git-remote-ipfs";
     }
@@ -268805,7 +269830,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Access to the GitHub API, v3";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -268869,7 +269894,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Github Actions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -269153,7 +270178,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Upload files to GitHub releases";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "github-release";
     }
   ) { };
@@ -269613,7 +270638,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Heads up, and you see your GIT context";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -269893,7 +270918,7 @@ self: {
         vector
       ];
       description = "A Haskell library for the GitLab web API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -270432,7 +271457,7 @@ self: {
         text
       ];
       description = "Compile git revision info into Haskell projects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -270739,7 +271764,7 @@ self: {
       sha256 = "14wm8wp4jxi4fq75bvr6sl4xmsxjfw30yq7011v28xqpm9015ns0";
       libraryHaskellDepends = [ base ];
       description = "Haskell bindings for the gl3w library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -271555,7 +272580,7 @@ self: {
           testPkgconfigDepends = [ gtest_main ];
           doHaddock = false;
           description = "A system for collecting, deriving and working with facts about source code";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
         }
       )
@@ -271600,7 +272625,7 @@ self: {
         text
       ];
       description = "GLFW package with window groups destroyed together";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -271688,7 +272713,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ glib ];
       description = "Binding to the GLIB library for Gtk2Hs";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
     }
   ) { inherit (pkgs) glib; };
 
@@ -271919,7 +272944,7 @@ self: {
         HUnit
       ];
       description = "Console IRC client";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       mainProgram = "glirc";
     }
   ) { };
@@ -272230,7 +273255,7 @@ self: {
         text
       ];
       description = "Globus Data Transfer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -272658,7 +273683,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Massiv-based alternative for gloss-raster";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -272735,7 +273760,7 @@ self: {
         hspec
       ];
       description = "Low-level Haskell bindings to the GLPK library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) glpk; };
 
@@ -273016,7 +274041,7 @@ self: {
         tasty-hunit
       ];
       description = "Attempts to fix your syntax erroring Lua files";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "glualint";
       broken = true;
@@ -273418,6 +274443,8 @@ self: {
       ];
       description = "Composable maps and generic tries";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -273748,7 +274775,7 @@ self: {
         utility-ht
       ];
       description = "2D and 3D plots using gnuplot";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -273867,7 +274894,7 @@ self: {
         mwc-random
       ];
       description = "Common, non-geometric tools for use with Goal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -273896,7 +274923,7 @@ self: {
         indexed-list-literals
       ];
       description = "The basic geometric type system of Goal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -273952,7 +274979,7 @@ self: {
         goal-probability
       ];
       description = "Optimization of latent variable and dynamical models with Goal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -274003,7 +275030,7 @@ self: {
         goal-geometry
       ];
       description = "Optimization on manifolds of probability distributions with Goal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -274318,7 +275345,7 @@ self: {
         text
       ];
       description = "Megaparsec parser for Godot `tscn` and `gdextension` files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "bench";
       broken = true;
@@ -274514,7 +275541,7 @@ self: {
         time
       ];
       description = "Comprehensive Google Services SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274526,7 +275553,7 @@ self: {
       sha256 = "0h6iwa2z863qgi1vixp28xgq8f2vk0dwlvs3ppbh1f4i9viqvr8b";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Abusive Experience Report SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274538,7 +275565,7 @@ self: {
       sha256 = "1a1x97xgpmznjgqjrbgz63vfdlgdilzi6y7myxm8v6fin4pf1y2p";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Accelerated Mobile Pages (AMP) URL SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274550,7 +275577,7 @@ self: {
       sha256 = "0cy8bwkrgwmz2lm1bqq1w3c895x5h6bfd27wlp6zihivj4kmky8j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Access Approval SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274562,7 +275589,7 @@ self: {
       sha256 = "1n0llmpcp8da4nzmz6350gnjaj0ir3wl1iqnx9y1wvq99jr1xb4s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Access Context Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274574,7 +275601,7 @@ self: {
       sha256 = "1msm75jv2p73fxw9nffjyqyw8zyg0xpna1dhir08pzsmwwyysdx8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Exchange Buyer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274586,7 +275613,7 @@ self: {
       sha256 = "1k2is2alb7d5zdxpqbiv07kxbg86gzkc8zmlndva8p7zrrayanwd";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Exchange Seller SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274598,7 +275625,7 @@ self: {
       sha256 = "0k8fdnyyd20qis54nnarj7dk17ncfsn1br83mhjsgkp5x956zlzr";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Exchange Buyer API II SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274610,7 +275637,7 @@ self: {
       sha256 = "0hj5ic3mhigk524d760g9s2xlqfx5aj6rxqwyzfs9hrnvl88m79c";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Ad Experience Report SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274622,7 +275649,7 @@ self: {
       sha256 = "068ib1s04y39q0llrnn64ha1l1q61jspfgkb3chcb056yiam3z7k";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274634,7 +275661,7 @@ self: {
       sha256 = "1aw1369bb5lqzc8z0aqpghjk4pzqk3747ciiwzjibxp5fw6gp8fb";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274667,7 +275694,7 @@ self: {
       sha256 = "189fx1ih296s26rn7m92rmay6csps1ihnyrm8wif1530xf6i7i9j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274679,7 +275706,7 @@ self: {
       sha256 = "02qh6rqmbllfj27zi4ddgfy88ck7gayzr9ziw6r2brajwdd7rmcx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google AdSense Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274691,7 +275718,7 @@ self: {
       sha256 = "1h0iv25rpv495qgn021dlxi0cy9v1yxhr6q1l42nb5sp3nfx8j4l";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google AdSense Host SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274724,7 +275751,7 @@ self: {
       sha256 = "0grqgrczqwa3f8ir7yx8rlw1y0alrqz8m4dhbx6268dz5y192421";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Workspace Alert Center SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274736,7 +275763,7 @@ self: {
       sha256 = "1pqr20s11z75m8lzqq4kx86h8gf9hqmv0n45kbb1v99nmiyl6scq";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Analytics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274748,7 +275775,7 @@ self: {
       sha256 = "1ps7lln0z027g0lmg0b8bs14ycz3i607a6ja5kxh9xpqi2bcj1pq";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Analytics Reporting SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274760,7 +275787,7 @@ self: {
       sha256 = "0l40nv4jfba6h7vpfca548k7y5yya54n237f11gksclyij5xzc5j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play EMM SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274772,7 +275799,7 @@ self: {
       sha256 = "14knrvx11f97jb7z7vbmjmh8zrchds5wzacaaiz68g5pqh44sqqg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Android Developer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274784,7 +275811,7 @@ self: {
       sha256 = "0vf3y14bjzs1yb6fsaizsgcjvpk8r3gxavbkkf9cdy3zz6mdfs6y";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Android Device Provisioning Partner SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274796,7 +275823,7 @@ self: {
       sha256 = "0hcfjz9lz9j4sk5vxsq0a67gbrgi9cmrwblkyslzlc3jqd689grh";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Android Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274808,7 +275835,7 @@ self: {
       sha256 = "1d6nsqd6lynk2cvrb53zd1h74w46f8grjrgawrdczkhn9sjplgg4";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google App Engine Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274820,7 +275847,7 @@ self: {
       sha256 = "0ai1ip5hkqbk0shwhgkjrc81422f0as78spahvyp2b18h9ds3f12";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Drive Activity SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274832,7 +275859,7 @@ self: {
       sha256 = "119gfvs7wfchf4l50r13pwwqilxfkxbpdsr1hxa0qshx7qs4hdn3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Calendar SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274844,7 +275871,7 @@ self: {
       sha256 = "13xr8d87xyv1nif1vm8hx92aqp7w2h68qqpci01jrlgvbwikwg0z";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Enterprise License Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274856,7 +275883,7 @@ self: {
       sha256 = "02as3zv92pmki03ylcjc999cfk4qwgp066ns5wmvhg71x66wcy97";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Workspace Reseller SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274868,7 +275895,7 @@ self: {
       sha256 = "1imkjjq2l8j36anzn4rv51mcdr3j1w9wxk2z4ps8py9whz2yfqa3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Tasks SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274880,7 +275907,7 @@ self: {
       sha256 = "1ipa3a1d6in8kvk6qrbmpsfns30nci95dlsb2x3ds8jx9rwffsad";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google App State SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274913,7 +275940,7 @@ self: {
       sha256 = "0r19gn2i4bvbacvsaw371nwiif41zi3bqvkv1b92nfyzig9nnnpr";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google BigQuery SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274925,7 +275952,7 @@ self: {
       sha256 = "0vv8jhqk2z1ji8l2k83021ycsbqqf4mkzq13k6yra5k62f886hb0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google BigQuery Data Transfer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274937,7 +275964,7 @@ self: {
       sha256 = "1q30h5qgrxwi3vpk28iklmy220lhvpk1bc1cdl2wvj9g87vk3jyg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Bigtable Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274949,7 +275976,7 @@ self: {
       sha256 = "0ws694ymsrlk4hw1jzqi4lpjjmjas8cdvxxz9dcmkbd3yhpsq16z";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Billing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274961,7 +275988,7 @@ self: {
       sha256 = "0m82qlih6dxijd83bsjfbw4dxrn1k1w8gnfdxdxxvccf58xxkb48";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Binary Authorization SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274973,7 +276000,7 @@ self: {
       sha256 = "02qrqqkhy7v14jygqnwv99bkfmnjpkjbxx33avk3fzx5vfh04phh";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Blogger SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274985,7 +276012,7 @@ self: {
       sha256 = "0b8r416cg9cy36adv4frndcc64vy1wcqmhpshbs4ba583yqxndw6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Books SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -274997,7 +276024,7 @@ self: {
       sha256 = "1m5ikfi8gl8xsi1kgv3ca7pfjd56gykw29s4x5mkm76a727sy454";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Chat SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275009,7 +276036,7 @@ self: {
       sha256 = "1cg0xvxs8hkdzrsal7wn0gchscssvnwpfx2kzqqv3k539vjxb07w";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Civic Information SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275021,7 +276048,7 @@ self: {
       sha256 = "0d32fmi65cmhallbiwifwzbwald508025crshh951g2l4sypdbsx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Classroom SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275033,7 +276060,7 @@ self: {
       sha256 = "1r2ijkzlqi2a34qq6978n8f3iqn2f14srw8cyglhy7if6f23ybp0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Asset SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275045,7 +276072,7 @@ self: {
       sha256 = "16scs0jzk0fbvhchf68f69b3pmipffdvi38ihfdn7495dipikpjp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Error Reporting SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275057,7 +276084,7 @@ self: {
       sha256 = "1w5cpsafgks7zhx08bri3sx9m30ad39wxraa296czhvzhlrz95qq";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Functions SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275069,7 +276096,7 @@ self: {
       sha256 = "0ygdq4fvgbbjw1jzrvr7r02qjjvr21fjsyvjs5r781bsps9msr66";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Identity SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275081,7 +276108,7 @@ self: {
       sha256 = "1dvgygzzyk038p6f5qwgiipiz1466zmm760yi1ci9sh7fl4i4ndp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud IoT SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275093,7 +276120,7 @@ self: {
       sha256 = "0wvk6ll7xmlly1bi1kwpj3vp4scg06cjsb1xnpd2rd6j2fhi2vmz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Key Management Service (KMS) SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275126,7 +276153,7 @@ self: {
       sha256 = "18siw287hdcfmcdp0sxd1r94pk4rri71987mi5mjgxgan90lhgxk";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Private Catalog SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275138,7 +276165,7 @@ self: {
       sha256 = "12sf1rmiv52gfml3xcv76iza8mry9vhcpk4xzdb80yaw8343idj3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Private Catalog Producer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275150,7 +276177,7 @@ self: {
       sha256 = "0hwby0sk3rxsii76425hgy9d7p4v5l0infsqj0qbs0197qhwh4zi";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Profiler SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275162,7 +276189,7 @@ self: {
       sha256 = "14gbhgyy8g7kaarxpy8llpvgydapq49sr8gzda144gkfq68svabw";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Scheduler SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275174,7 +276201,7 @@ self: {
       sha256 = "1nhqkvm5v2m4xbcdi29m8padjzmampcsy3l61vknwfc0n6f89rhf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Search SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275186,7 +276213,7 @@ self: {
       sha256 = "1zi69k64klas18kmq525z52nchc9gqdk7v15x8prdln6x46ic1dn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Shell SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275198,7 +276225,7 @@ self: {
       sha256 = "11ygaka332an20cyl5i9bj5jxkgddc36pfdl07mjab68b6500ggc";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Tasks SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275210,7 +276237,7 @@ self: {
       sha256 = "0wnn3pfx28g7iqr8vwk2v5vqh06vwcmgjj0blwi9aznkm1g3qp1k";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Trace SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275222,7 +276249,7 @@ self: {
       sha256 = "1vcwyv86a3mpis6d1rgldn61qzxfz8x2ncfv3r7rrpr79zclqhkj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Perspective Comment Analyzer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275234,7 +276261,7 @@ self: {
       sha256 = "0j4kabhl6wlyhqjiiz6qw6hc8q9c8c0x0ylqxfiwxgr8j0m3x17h";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Composer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275246,7 +276273,7 @@ self: {
       sha256 = "094p7nms03jypq44snnsz05z485dz5ynawcnmjjlmwh387i59j4x";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Compute Engine SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275258,7 +276285,7 @@ self: {
       sha256 = "01q4dmqxwdy8p9ix9dhj0dgqs71z7mmjznybv2r8jmfwxm4nxgka";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Consumer Surveys SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275270,7 +276297,7 @@ self: {
       sha256 = "0ci3xdl0rb5nq54z6i748gh240ipgp9wa36pncq3yasf58pn9rvp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Kubernetes Engine SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275282,7 +276309,7 @@ self: {
       sha256 = "1vzmzbgr88qij6fgi2gsz3iavvbzdxnpjf864l656fkvr5xw83wl";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Container Analysis SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275294,7 +276321,7 @@ self: {
       sha256 = "12mmiza1sd4fryy86kzy88adw8nkswxpf1r2sryndjkyk9a47knx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Build SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275356,7 +276383,7 @@ self: {
         tasty
       ];
       description = "Core data types and functionality for Gogol libraries";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275368,7 +276395,7 @@ self: {
       sha256 = "04yvwb12qpf57p82a7j5h7z0ckxmfircxzyl1a9h8qwmkf2h9g9n";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Custom Search SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275380,7 +276407,7 @@ self: {
       sha256 = "0qi91p8x8jx3rnz4vpk7mkcms1hqjhwlmrvpjzxx489bazllsz66";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Dataflow SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275392,7 +276419,7 @@ self: {
       sha256 = "0r28ccchciw067w1gsm9pcfhnmr6ggk0m5p27i3rhwz1v3mhspnf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Data Fusion SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275404,7 +276431,7 @@ self: {
       sha256 = "1gls8g771b7d90a57zz30cwpg0sr9vjmjwkb2sn1syr3q82vz8ba";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Dataproc SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275416,7 +276443,7 @@ self: {
       sha256 = "0d727wn1yr4w5svvzsfyvn8ybl6l0ijr1mq86zwpz041709llbfg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Datastore SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275428,7 +276455,7 @@ self: {
       sha256 = "0m71pa6ilqy5s20vmn8q4gn1vikr2fjxvhz8h54qswn5sanjpiz8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Debugger API (Deprecated) SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275440,7 +276467,7 @@ self: {
       sha256 = "143k175i32i4nw54r1w7490wqj9g703a5787aw86r468xfagwmdy";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Deployment Manager V2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275452,7 +276479,7 @@ self: {
       sha256 = "1vhc4fx78h26hcxhmgijfprsvshqgh8v6q9dialckh7rq226g0mn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Campaign Manager 360 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275464,7 +276491,7 @@ self: {
       sha256 = "1gijb69hmba7dh493zifv5809zri33fmi7fi8wmf3973qaylp7g6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Dialogflow SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275476,7 +276503,7 @@ self: {
       sha256 = "1a6r481sxp50x5mpw8inp4904jm0a21m1rcya2wijwrj8xblynpp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Digital Asset Links SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275488,7 +276515,7 @@ self: {
       sha256 = "1gyh5fbiv98j74p3bkg0kv1clszdpy8ksb47k4bnpjg8livfgzf4";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google API Discovery Service SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275500,7 +276527,7 @@ self: {
       sha256 = "15q8fr1y21zacz30kjvpxsn2irnzqjl5r2xvhkd2mbcpplyvcbcz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Sensitive Data Protection (DLP) SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275512,7 +276539,7 @@ self: {
       sha256 = "1igqrn1w1jda0xplbslwib2mdv9mzhfb4dpqgymlmp5g1ps9qy28";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud DNS SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275524,7 +276551,7 @@ self: {
       sha256 = "1chxs5a1wlql6vb9wqr9navijis7khbpndy0grwzfcdafcyz71jm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Docs SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275536,7 +276563,7 @@ self: {
       sha256 = "01955ainvq9fmmjvkwpgbarmnplw30ilf05shsnjskdhp6b1hqvc";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google DoubleClick Bid Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275548,7 +276575,7 @@ self: {
       sha256 = "1l70nmx86wvixyr84zjhns69l58z1v65aiycmqi3i441c5hjrax2";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Search Ads 360 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275560,7 +276587,7 @@ self: {
       sha256 = "0alf3jahdmkjxjzqj2bs5wlrvx7d3414kbhpi1pvdcy8s3fm2b49";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Drive SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275572,7 +276599,7 @@ self: {
       sha256 = "06lnmdz833wvkh9h2q8q73mnqyp2klmfhg132zabwpcpkywlinvl";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Drive Activity SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275584,7 +276611,7 @@ self: {
       sha256 = "1v2s3696i71z4pqclqc2x53c51n4llv6wbpvms1mr666zgmchvxr";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Fact Check Tools SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275596,7 +276623,7 @@ self: {
       sha256 = "0fd23xaqcqn6qq696i1dlrbdlk7yw15h8wq9jsy0l8sqa8f9ygn2";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Filestore SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275608,7 +276635,7 @@ self: {
       sha256 = "18ywm1xzr0sqj4pp6lsjw8pbhydimapnxa5xylybc1ii69jqq3xj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Dynamic Links SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275620,7 +276647,7 @@ self: {
       sha256 = "1znwn8xl2yfxarbf6gcmwlhrm7mn4xan89bd2sh1sd520155yw4q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Rules SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275632,7 +276659,7 @@ self: {
       sha256 = "0v0jbgffkxgk17qn79qjbcp3rnnfihcikb9709kwkz5vf246rzs7";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Hosting SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275644,7 +276671,7 @@ self: {
       sha256 = "09n8bfaa9spara3yh5awjcfyxdwcag5qi7w01vk9m9snfzdypfrg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Firebase Remote Config SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275656,7 +276683,7 @@ self: {
       sha256 = "0fillhmd5xdb45mfg62fr6vhki4gdc8mqvqzs56il3p70ykbrgby";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Firestore SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275668,7 +276695,7 @@ self: {
       sha256 = "19a63kbgf8r268ybj1dyd7z4bzaw2dd6ygp3pk4swabjjj1pfrvx";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Fitness SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275680,7 +276707,7 @@ self: {
       sha256 = "15dsq67qnpnmninklr9pm5yy1xn8a459pvgmhaabbp2x31ghqjiv";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Web Fonts Developer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275713,7 +276740,7 @@ self: {
       sha256 = "18scbflas6w5avgsm5ndnj1qyn277mlj3v2fl71mrfjwr6171l5c";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Fusion Tables SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275725,7 +276752,7 @@ self: {
       sha256 = "0l73pqrsfnwxv3mbg6lxkzmbal1xb5gxcb3rnv16d60ng50xrpc3";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Game Services SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275737,7 +276764,7 @@ self: {
       sha256 = "1qfag0mqyp5fk7p225qlc2551hdyzpmflnx0i59b24vm2yym1y4a";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Game Services Publishing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275749,7 +276776,7 @@ self: {
       sha256 = "0zy5bqi8lsb6r19bb5sd8fjcqx9v4g0lphxj60p20p94k5vw7wcd";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Game Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275761,7 +276788,7 @@ self: {
       sha256 = "0ddyddxan844csb6mflrsq42ivvwrwcm6lhqy7wydysbf1wcfgmm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Genomics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275773,7 +276800,7 @@ self: {
       sha256 = "045hqcyypvi8c2d9lh6szp1crz1xk9ll2ll93w5viyvzz2fzlpza";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Gmail SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275785,7 +276812,7 @@ self: {
       sha256 = "0gskbydkk39zs6aa8ss4y3ibnsdb69zmm7jbi6ijr56y7qv11fgm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Groups Migration SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275797,7 +276824,7 @@ self: {
       sha256 = "0n0j1m01y9k2q07mkrdm5n9pp3ahs9byhl0kpi8na30y4zhscxr8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Groups Settings SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275809,7 +276836,7 @@ self: {
       sha256 = "1dskfbpm1mv2dax64izj8sarkssajnbkinc4pwkvgfgjhf9l9sq9";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Healthcare SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275821,7 +276848,7 @@ self: {
       sha256 = "0ylryxz1wa8v246mwzpvqkqmggj2gbd9mxmgf5cbnkibmnbcwswg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Identity and Access Management (IAM) SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275833,7 +276860,7 @@ self: {
       sha256 = "1jzqijf08jmmavgc5f7vpvs1ixiw6h9k4x8y7q8kwiayp57gcgfh";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google IAM Service Account Credentials SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275845,7 +276872,7 @@ self: {
       sha256 = "0v7xm5qr5im2hcvq34s7c880f6yxnzwc4cax1cwm4f3zjq7galmb";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Identity-Aware Proxy SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275857,7 +276884,7 @@ self: {
       sha256 = "1wdm8w4z4iicbla6139501v7ri9k9w6f0b131li0578dxqw411m0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Identity Toolkit SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275869,7 +276896,7 @@ self: {
       sha256 = "1hxk0gzk183vjljj57qkgyi5y4j1rigvjxkivxzvzlqyvpbirdrs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Web Search Indexing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275881,7 +276908,7 @@ self: {
       sha256 = "0i9pi31vz2ngk8fpv16cizc2yjhs0pacnwf2c0fk9nylg9x4ms38";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Talent Solution SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275893,7 +276920,7 @@ self: {
       sha256 = "02py8n5kk1lxmm7bkxag041rwzip4jxpdmldciq4vyq9fkkxvy57";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Knowledge Graph Search SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275905,7 +276932,7 @@ self: {
       sha256 = "0y0r5c1kgzxmsply7zksh9dbzs2sd4fxwb4ps4w4lqzjkchdbj4x";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Natural Language SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275938,7 +276965,7 @@ self: {
       sha256 = "14s5hw0qby8acqmf9f3kh068iaglmf9lp6p802vf3bg3qqx43857";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Library Agent SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275950,7 +276977,7 @@ self: {
       sha256 = "1a2w6dyb0h3dy9fxzsrmq81d7vr3z2nk7xc0wkb4jhsdvn3nwkzk";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Logging SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -275962,7 +276989,7 @@ self: {
       sha256 = "0ydxl3cxrw65bfp708im1mlqgf76bi8m0wl8x295mgzyyvi6q75g";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Manufacturer Center SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276016,7 +277043,7 @@ self: {
       sha256 = "0si4kk7da0mxgqddjamxa8cmci75rlpl2bivjyqx99awff788376";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Mirror SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276028,7 +277055,7 @@ self: {
       sha256 = "1vr7kv86b1cz364a5mbcl8w14k3f0rdkya4dqc99j46rqa89hcjs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google AI Platform Training & Prediction SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276040,7 +277067,7 @@ self: {
       sha256 = "1psii00flwy8yh76ng1ixpzdix4i31gr9nlysvi20m962j2zb8x7";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Monitoring SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276052,7 +277079,7 @@ self: {
       sha256 = "1yrzaa7wab67dw7yyz3kv78rka6vrmq4q53rrjda25y5mbzax08j";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google OAuth2 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276064,7 +277091,7 @@ self: {
       sha256 = "0mwxzx6qqbcybanf8cvdrwi4q2y1rs9wlrs4ivsx5csjk07zrbpy";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud OS Login SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276076,7 +277103,7 @@ self: {
       sha256 = "000p7lhs82fgw80x2g77bgk0ywhxcj22388a37xfdlvfwk7rxxhp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google PageSpeed Insights SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276088,7 +277115,7 @@ self: {
       sha256 = "0jcqch35rw33fp3xc24x6063hfxfd6hkdhy8ns1b3ry0x59r42na";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Partners SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276100,7 +277127,7 @@ self: {
       sha256 = "1qjr57q91kr6gf37y24z0hr4lwkqq5fk474mb53s6ipqiyqxsk1s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google People SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276133,7 +277160,7 @@ self: {
       sha256 = "05nc0w5v5sgg2z1ldx8y6a06nqy81hsq1bln882gv5595mcz3134";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Movies Partner SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276145,7 +277172,7 @@ self: {
       sha256 = "1mga3ppvlzjw133g8li20hjacp8k280qwpcsrfh1a9srmkflnqpi";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Play Custom App Publishing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276157,7 +277184,7 @@ self: {
       sha256 = "1jy99vdjqhlhvgir9h7hfc4w27nql44gqv9bn7g6w77xrh5qbbgg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google + SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276169,7 +277196,7 @@ self: {
       sha256 = "00nyww46c4fxqvzm8jdl8wnmv0a7inm4hcyp56vl336l5fzw6wid";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google + Domains SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276181,7 +277208,7 @@ self: {
       sha256 = "0i87jzs5vrd7zwmrpkbf0jpw7yhq0y9hhiyay18kl78jkwh8gp9v";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Poly SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276214,7 +277241,7 @@ self: {
       sha256 = "13yzm104viq54pddz321bh9fknr4i0pywsnmlayav82gy6q70fnn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Proximity Beacon SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276226,7 +277253,7 @@ self: {
       sha256 = "0ay6npsyzcq2m6dww8xdima8d19bqnrpi942hpmn5ny1rlxahvnj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Pub/Sub SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276238,7 +277265,7 @@ self: {
       sha256 = "1nvn2c936ia0jzkc6lljcrnxp69y7wj8yk4n95y4wqmibi7v1pc6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google QPX Express SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276250,7 +277277,7 @@ self: {
       sha256 = "1xcgfz3d34iac66kld3fjszi6zn03hw6i51niyapnmgs7qwvw8xm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google reCAPTCHA Enterprise SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276262,7 +277289,7 @@ self: {
       sha256 = "1fynpbfhnhpxki81wak3w6256rhb6yj2n6h605zpkmqb6zgdcraw";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Memorystore for Redis SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276274,7 +277301,7 @@ self: {
       sha256 = "0316qcavy06s6lc77nd3kvkcivx99a29kybqk2v8gkm3d3hgnay6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Remote Build Execution SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276286,7 +277313,7 @@ self: {
       sha256 = "1nx55xgghprwzs81x4xvald37xvjzwrsfq5lrrarig5gsz3crb8h";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Replica Pool SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276298,7 +277325,7 @@ self: {
       sha256 = "14cwrx4qw002464i913n6hxq7rw962w2kcrw3bzng74ndhaaswd2";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Compute Engine Instance Group Updater SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276310,7 +277337,7 @@ self: {
       sha256 = "12mhxjw4x9cb5sgpy2z4sk9qkmarhwv8mb8q88qigx4d1abqj5gm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Resource Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276343,7 +277370,7 @@ self: {
       sha256 = "07wqy2cp62d8gs4izqzqv50yaj7b37jfhq5qm67j9dr3s56kzz6q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Run Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276355,7 +277382,7 @@ self: {
       sha256 = "0hrjl2vcbmk3hx38c0alh2lgz10xnsvb90lb5x9fkls2n6l0q3lm";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Runtime Configuration SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276367,7 +277394,7 @@ self: {
       sha256 = "13yyab714dpd42j6683p4c6v97apc2qy4ihyhrsjr7yn6ysyc4jy";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Safe Browsing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276379,7 +277406,7 @@ self: {
       sha256 = "1a2ppyk9869bkwzfhaznqkja5pkdwjwal276k4mzn0ba7jrq47hs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Apps Script SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276391,7 +277418,7 @@ self: {
       sha256 = "0l5q9zj6scj72zg4sd1hkn5jwm4hh4q85wq6y5pm8s1sbqk3wsqz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Search Console SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276403,7 +277430,7 @@ self: {
       sha256 = "0vkipvyapjimizikzfgk4q2cdn0my5j85agnnz79hvlkqb412ggp";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Security Command Center SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276415,7 +277442,7 @@ self: {
       sha256 = "0z5mfig3k7k90r5khcs8is4c278dsp9y6qa5fljfkljkd4bniyv4";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Broker SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276427,7 +277454,7 @@ self: {
       sha256 = "17g49aqdgml3w16mj8qf3m0lz7wa6qhmvz1m7s5q2dly8i7klb9q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Consumer Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276439,7 +277466,7 @@ self: {
       sha256 = "0zw9a5q6nsyar5210ryh3svzv8jgjwjmn6mm1kpiqx32bi0gcb53";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Control SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276451,7 +277478,7 @@ self: {
       sha256 = "0i3v8ryswaz84d27v867v5f3rpa6wa518k9y9sim87l4yvqdd72s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Management SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276463,7 +277490,7 @@ self: {
       sha256 = "0180yqdgrbsf7zazvdsbi1hwy671qc4m80chv458fgnhl6irqzsj";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Networking SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276475,7 +277502,7 @@ self: {
       sha256 = "0mc44gczmh6acgfp3x0lhd7kv7agqdqskv91bvnrk9lmrhcqchr6";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service Usage SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276487,7 +277514,7 @@ self: {
       sha256 = "0gh7flld3vai2fwx9gqw3gcrjwwdk3nkahdxdzrixk96lrvfd2lb";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Service User SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276499,7 +277526,7 @@ self: {
       sha256 = "0jx155xaa053mp7sdrrjng28vdvls51bqg374bp8015dqx8pq388";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Sheets SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276511,7 +277538,7 @@ self: {
       sha256 = "09j3a7scawkxq81mghnypwhxi5jfx1w8nircmmhpm6a9543ikbgl";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Content API for Shopping SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276523,7 +277550,7 @@ self: {
       sha256 = "04nn9382mwi4x83whhp66x99mml2djf97nlvpq0n5d6vs5nl65vf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Site Verification SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276535,7 +277562,7 @@ self: {
       sha256 = "06cc335zva6qdqr3mmhgsmhzyg09lipzmcsffwvngmbbk6adqfag";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Slides SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276547,7 +277574,7 @@ self: {
       sha256 = "1v5wl66rl9kj7ckzvmy65a23s9d3ajfrxc4rsmpx6zzg3xmxjlw0";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Source Repositories SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276559,7 +277586,7 @@ self: {
       sha256 = "0wbkqr2f2dha298n3sz007y9jg9c4yxn69m5ln7ffxa135yan6l8";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Spanner SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276571,7 +277598,7 @@ self: {
       sha256 = "0z1la9nan5dfdksgkajh1a2smlj4vjqk3r2586cshyn4lf1iswsa";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Spectrum Database SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276583,7 +277610,7 @@ self: {
       sha256 = "1bg6kqxjgwj5qrkrvl7gk9h9r60z41k9h7zf6y7a74arw1ycnfcs";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Speech-to-Text SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276595,7 +277622,7 @@ self: {
       sha256 = "0aamc6i0l1ad9x4fnw1psq37fr8iq4pflmi7r9zpqpqh61225qic";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud SQL Admin SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276607,7 +277634,7 @@ self: {
       sha256 = "1sdmnkaclgi1n9kip5v3791dbvl992sbf95kp967261cwdm00mw5";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Storage JSON SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276619,7 +277646,7 @@ self: {
       sha256 = "14v3gk3pp3cn1r27dc9j6f0a8ska2mdpyarx54607x3y23bl1xc5";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Storage Transfer SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276631,7 +277658,7 @@ self: {
       sha256 = "03zd6hk87fchc2v7wch7s2jjlp6kk2pdadd3vqapnfai5b4nmi0c";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Street View Publish SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276643,7 +277670,7 @@ self: {
       sha256 = "1bpybiarlh030k825ikf4sc3wm54qn8jxn9wcycfchz311rahci1";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Surveys SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276655,7 +277682,7 @@ self: {
       sha256 = "1lfadp570iampv44s8kjykimll2h3jrm7kmg696lc4gvr45ps9iz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Tag Manager SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276688,7 +277715,7 @@ self: {
       sha256 = "0spim4pb7l582ydp4p5fz24bdqdl2d3jl75sw90g39fkdhx8b36s";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Testing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276700,7 +277727,7 @@ self: {
       sha256 = "0dal449bcdlr04mllfam1m9n0qz8p3ddlv8vm1xpxzw52090jq3m";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Text-to-Speech SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276712,7 +277739,7 @@ self: {
       sha256 = "108x732f9bxsqwj1wnmp3sb19v2hc0amjq3hjpw8f2iciyy4l5ia";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Tool Results SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276724,7 +277751,7 @@ self: {
       sha256 = "09hbn03scg5axmfy15d29v5nmqxgsc8289x95rahcy00vjcx0aip";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud TPU SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276736,7 +277763,7 @@ self: {
       sha256 = "0a98hq71pl3hiv8axaqibs7i5vx9h36zcp4lhj1ckca9mbqps87g";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Tracing SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276748,7 +277775,7 @@ self: {
       sha256 = "15ai2f66bi5hvfpfqx3kpr7pb9nw5sw13p6igs9a2vmdaqf57mkg";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Translation SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276760,7 +277787,7 @@ self: {
       sha256 = "0j846nnb5w2lki10wnvdslds4bi387hxcfrr3m8q156n0dvgzz5q";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google URL Shortener SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276793,7 +277820,7 @@ self: {
       sha256 = "08dyv38d0ga4dc6zlxz41dgba84ylxc336xv0c33jqxhrzdq6654";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Vault SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276805,7 +277832,7 @@ self: {
       sha256 = "1303p25mdzvk79rhy942f1v27n476cqj1sclycq3mnflf661sbwa";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Video Intelligence SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276817,7 +277844,7 @@ self: {
       sha256 = "13llhpsj0lzd4r6mbgzlcqgj8m14i0qk3il3pynxwhzvn1nccjps";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Cloud Vision SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276829,7 +277856,7 @@ self: {
       sha256 = "1da7zap20g3s8n8pail5sh7wy4i7m718qr1h3dmqpd4413p9ybcn";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Search Console SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276841,7 +277868,7 @@ self: {
       sha256 = "0asdbgv7n7vcc7z2qxr4aqva0w75wzxba2niyq10648ya1dxrx5d";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google Web Security Scanner SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276853,7 +277880,7 @@ self: {
       sha256 = "1zgfx51z3wxmjkyzg876kfmwb516n5dhaygg1bmjhqc6xwzzp2si";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google YouTube Data API v3 SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276865,7 +277892,7 @@ self: {
       sha256 = "01rcrcj83smzhz9bzdhwrnd799w2gg62ypvkffyd1n06frs6jlaf";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google YouTube Analytics SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -276877,7 +277904,7 @@ self: {
       sha256 = "14p05jzz2vpxhgr2gb8pp5i8ni46zy3j5vjhlq3gb2ri7cz76asz";
       libraryHaskellDepends = [ gogol-core ];
       description = "Google YouTube Reporting SDK";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -279056,6 +280083,7 @@ self: {
       ];
       description = "Vulkan library";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279115,7 +280143,7 @@ self: {
         gpu-vulkan-core
       ];
       description = "Thin wrapper for VK_KHR_surface extension of the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -279144,7 +280172,7 @@ self: {
         gpu-vulkan-core-khr-surface
       ];
       description = "Thin wrapper for VK_KHR_swapchain extension of the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -279182,7 +280210,8 @@ self: {
         typelevel-tools-yj
       ];
       description = "VK_KHR_surface extension of the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279226,7 +280255,8 @@ self: {
         typelevel-tools-yj
       ];
       description = "GLFW surface for Vulkan";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279273,7 +280303,8 @@ self: {
         typelevel-tools-yj
       ];
       description = "VK_KHR_swapchain extension of the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279358,6 +280389,8 @@ self: {
       ];
       description = "Medium wrapper for Vulkan API";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -279398,7 +280431,8 @@ self: {
         typelevel-tools-yj
       ];
       description = "medium wrapper for VK_KHR_surface extension of the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279430,7 +280464,8 @@ self: {
         typelevel-tools-yj
       ];
       description = "medium wrapper for GLFW surface for the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279477,7 +280512,8 @@ self: {
         typelevel-tools-yj
       ];
       description = "medium wrapper for VK_KHR_swapchain extension of the Vulkan API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -279541,7 +280577,7 @@ self: {
         criterion
       ];
       description = "Applicative non-linear consumption";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -279574,7 +280610,7 @@ self: {
         text
       ];
       description = "Applicative parsers for form parameter lists";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -279654,7 +280690,7 @@ self: {
         tasty-hunit
       ];
       description = "API for creating grafana dashboards represented as json";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -279693,7 +280729,7 @@ self: {
         unordered-containers
       ];
       description = "Configure grafana dashboards from Dhall expression";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "grafdhall";
     }
   ) { };
@@ -279933,13 +280969,12 @@ self: {
       hspec,
       hspec-discover,
       QuickCheck,
-      random,
       text,
     }:
     mkDerivation {
       pname = "granite";
-      version = "0.3.0.0";
-      sha256 = "0dax05bqkvfa6wj2v7xdqrm3k6jr9qjyax93xasbybsh2zh352dr";
+      version = "0.3.0.4";
+      sha256 = "1h7pxas9zy5brss33402qf23w4wcjkh7gxmjw0l138hf3177sf09";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -279948,7 +280983,6 @@ self: {
       ];
       executableHaskellDepends = [
         base
-        random
         text
       ];
       testHaskellDepends = [
@@ -279959,10 +280993,8 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Easy terminal plotting";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "granite";
-      broken = true;
     }
   ) { };
 
@@ -280173,8 +281205,8 @@ self: {
     }:
     mkDerivation {
       pname = "grapesy";
-      version = "1.1.0";
-      sha256 = "1zr9x487l6aw872sdfdhcl7wl70nwfbdm8f3jrp7naayamxl2hzf";
+      version = "1.1.1";
+      sha256 = "0scxy26pfxcn26vrg2ynbx05lppc5iaz0b9aayharlgjmhf5k82l";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -280259,7 +281291,7 @@ self: {
         unordered-containers
       ];
       description = "Native Haskell implementation of the gRPC framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -280283,7 +281315,7 @@ self: {
         proto-lens-etcd
       ];
       description = "grapesy-etcd - GRPC interface to etcd";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -280790,7 +281822,7 @@ self: {
         transformers
       ];
       description = "Trace the call graph of a program";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -280830,7 +281862,7 @@ self: {
         directory
       ];
       description = "Converts a graph-trace log into a DOT file for use with Graphviz";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "graph-trace-dot";
     }
   ) { };
@@ -280860,7 +281892,7 @@ self: {
         process
       ];
       description = "Converts a graph-trace log into an HTML document";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "graph-trace-viz";
     }
   ) { };
@@ -281533,7 +282565,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "GraphQL with batteries";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -281951,7 +282983,7 @@ self: {
       ];
       testToolDepends = [ tasty-autocollect ];
       description = "Monadic DOT graph builder DSL";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -282142,7 +283174,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Gray encoding schemes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -282749,7 +283781,7 @@ self: {
         tasty-bench
       ];
       description = "Uniformly-random pre-factored numbers (Kalai)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "grfn-exe";
       broken = true;
@@ -282780,7 +283812,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Tools for working with regular grids (graphs, lattices)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -283039,10 +284071,8 @@ self: {
     }:
     mkDerivation {
       pname = "gridtables";
-      version = "0.1.0.0";
-      sha256 = "1smhbb2jxysbqhxww5rikjfnhsdbf0gq3kgnn6ikjzcrqwdk9b6n";
-      revision = "1";
-      editedCabalFile = "0ay4ywi8w5kk4blf8jqxhivzprp1ivpdlw6racr1692psyizmxi0";
+      version = "0.1.1.0";
+      sha256 = "0r2cnlkbw9b6m1x2im1jxdi191f354p47k98hkna7qi9azgnm8g8";
       libraryHaskellDepends = [
         array
         base
@@ -283060,7 +284090,7 @@ self: {
         text
       ];
       description = "Parser for reStructuredText-style grid tables";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -283860,7 +284890,7 @@ self: {
         utility-ht
       ];
       description = "Shell command for grouping files by dates into folders";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "group-by-date";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -284040,7 +285070,7 @@ self: {
       sha256 = "0f5c8dg9b74glfw2sdvdcl9c8igs6knz1bayk4gvvzvypsl547nf";
       libraryHaskellDepends = [ base ];
       description = "Groups";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -284061,7 +285091,7 @@ self: {
         groups
       ];
       description = "Generically derive Group instances";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -284136,7 +285166,7 @@ self: {
         vector
       ];
       description = "A contiguous growable array type";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -284503,7 +285533,7 @@ self: {
         tree-diff
       ];
       description = "Implementation of the pure part of the gRPC spec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -284613,7 +285643,7 @@ self: {
       sha256 = "0if8kvwx51bwsdkwpk9ardmlm9l5v91vfy4g3bj2gmd3184nw6la";
       libraryHaskellDepends = [ base ];
       description = "Gruvbox colors for use in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -284772,7 +285802,7 @@ self: {
         X11
       ];
       description = "A visual generic menu";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "gsmenu";
     }
@@ -285053,7 +286083,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ gtk2 ];
       description = "Binding to the Gtk+ graphical user interface library";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
     }
   ) { inherit (pkgs) gtk2; };
 
@@ -285252,10 +286282,10 @@ self: {
       gi-cairo-connector,
       gi-cairo-render,
       gi-dbusmenugtk3,
-      gi-gdk,
+      gi-gdk3,
       gi-gdkpixbuf,
       gi-glib,
-      gi-gtk,
+      gi-gtk3,
       gtk-strut,
       gtk3,
       haskell-gi,
@@ -285270,8 +286300,8 @@ self: {
     }:
     mkDerivation {
       pname = "gtk-sni-tray";
-      version = "0.1.8.1";
-      sha256 = "0i131ks6m5akgcfahcbfqhg1i5dxz0y6rba3is4s3m5va6spp5yf";
+      version = "0.1.9.0";
+      sha256 = "082y2h267zynqqlpvbqn7pai2lj0izq1q629a3jsw0y89k3vagpi";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -285286,10 +286316,10 @@ self: {
         gi-cairo-connector
         gi-cairo-render
         gi-dbusmenugtk3
-        gi-gdk
+        gi-gdk3
         gi-gdkpixbuf
         gi-glib
-        gi-gtk
+        gi-gtk3
         gtk-strut
         haskell-gi
         haskell-gi-base
@@ -285305,8 +286335,8 @@ self: {
         base
         dbus
         dbus-hslogger
-        gi-gdk
-        gi-gtk
+        gi-gdk3
+        gi-gtk3
         gtk-strut
         hslogger
         optparse-applicative
@@ -285317,7 +286347,6 @@ self: {
       description = "A standalone StatusNotifierItem/AppIndicator tray";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "gtk-sni-tray-standalone";
     }
   ) { inherit (pkgs) gtk3; };
@@ -285327,29 +286356,27 @@ self: {
       mkDerivation,
       base,
       data-default,
-      gi-gdk,
-      gi-gtk,
+      gi-gdk3,
+      gi-gtk3,
       hslogger,
       text,
       transformers,
     }:
     mkDerivation {
       pname = "gtk-strut";
-      version = "0.1.3.2";
-      sha256 = "0rymacvllin8ni2fd7yyfq43rbbyb921c4nm4z7aa2z82fsrkw3q";
+      version = "0.1.4.0";
+      sha256 = "0xc3c9mzfm7d7sncdzqyjlbkvmrv4b9v09q2yjysvs09hhw5lyva";
       libraryHaskellDepends = [
         base
         data-default
-        gi-gdk
-        gi-gtk
+        gi-gdk3
+        gi-gtk3
         hslogger
         text
         transformers
       ];
       description = "Library for creating strut windows with gi-gtk";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -285459,7 +286486,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Tools to build the Gtk2Hs suite of User Interface libraries";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -285743,7 +286770,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ gtk3 ];
       description = "Binding to the Gtk+ 3 graphical user interface library";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
     }
   ) { inherit (pkgs) gtk3; };
 
@@ -286232,7 +287259,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "The border guardian for your package dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "guardian";
       broken = true;
@@ -286385,7 +287412,7 @@ self: {
         unix
       ];
       description = "ghcWithPackages cmdline util";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "gw";
       broken = true;
@@ -286665,8 +287692,8 @@ self: {
         }:
         mkDerivation {
           pname = "h-raylib";
-          version = "5.5.3.0";
-          sha256 = "0r1fr1wisdahqysvj10yb8i1dk5wc980p03db7i8jgvx96m6afhw";
+          version = "5.5.3.1";
+          sha256 = "1977pd0aqb9jiply9fyz1f5rw0vh6wpv8v2dyvk0awk8v5lbsaa0";
           isLibrary = true;
           isExecutable = true;
           enableSeparateDataOutput = true;
@@ -286690,7 +287717,7 @@ self: {
             libXrandr
           ];
           description = "Raylib bindings for Haskell";
-          license = lib.licenses.asl20;
+          license = lib.licensesSpdx."Apache-2.0";
           badPlatforms = lib.platforms.darwin;
         }
       )
@@ -286863,7 +287890,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "A Haskell binding for H3";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -286931,7 +287958,7 @@ self: {
         time
       ];
       description = "Control your Arduino board from Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -287622,7 +288649,7 @@ self: {
         zlib
       ];
       description = "native Haskell implementation of OpenPGP (RFC4880)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -289187,7 +290214,7 @@ self: {
         servant-client
       ];
       description = "An API binding to Hackage API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -289274,7 +290301,7 @@ self: {
       ];
       doHaddock = false;
       description = "CLI tool for Hackage";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "hackage-cli";
     }
   ) { };
@@ -289583,6 +290610,60 @@ self: {
     }
   ) { };
 
+  hackage-publish = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      data-default,
+      directory,
+      filepath,
+      mtl,
+      optics-core,
+      profunctors,
+      relude,
+      shh,
+      shower,
+      template-haskell,
+      temporary,
+      time,
+      which,
+      with-utf8,
+    }:
+    mkDerivation {
+      pname = "hackage-publish";
+      version = "0.1.0.0";
+      sha256 = "1zgsj9jfmapdx099wvgh31m13aknn7gkx42kzsk22s7wv5ldng7y";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        aeson
+        async
+        base
+        data-default
+        directory
+        filepath
+        mtl
+        optics-core
+        profunctors
+        relude
+        shh
+        shower
+        template-haskell
+        temporary
+        time
+        which
+        with-utf8
+      ];
+      description = "No frills releasing to Hackage";
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hackage-publish";
+      broken = true;
+    }
+  ) { };
+
   hackage-repo-tool = callPackage (
     {
       mkDerivation,
@@ -289677,7 +290758,7 @@ self: {
         time
       ];
       description = "List Hackage reverse dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -289729,7 +290810,7 @@ self: {
         time
       ];
       description = "List Hackage reverse dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -290446,7 +291527,7 @@ self: {
       ];
       doHaddock = false;
       description = "Hackage and Portage integration tool";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "hackport";
     }
   ) { };
@@ -290529,7 +291610,7 @@ self: {
         haddock-test
       ];
       description = "A documentation-generation tool for Haskell libraries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "haddock";
     }
@@ -290605,7 +291686,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A documentation-generation tool for Haskell libraries";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -290619,7 +291700,7 @@ self: {
       sha256 = "1nqq7k8ssl6h1d501d8ayzsdlihnbfrqy4l5z43msc6lr7ffvz2r";
       libraryHaskellDepends = [ base ];
       description = "A documentation-only package exemplifying haddock markup features";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -290707,7 +291788,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library exposing some functionality of Haddock";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -290778,7 +291859,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Eliminate warnings for names referred in Haddock only";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -290859,7 +291940,6 @@ self: {
       hspec-discover,
       HsYAML,
       HUnit,
-      ilist,
       language-docker,
       megaparsec,
       mtl,
@@ -290881,8 +291961,8 @@ self: {
     }:
     mkDerivation {
       pname = "hadolint";
-      version = "2.13.1";
-      sha256 = "0c4wazp5xrnbhp8gxg8mjppdb9ys77zxywkqysw6h7vzd1rsk7bd";
+      version = "2.14.0";
+      sha256 = "1zsn381r71iysd85q1m6xngx0hs4a8nb9wwlx6g59dpx9aqs265g";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -290902,7 +291982,6 @@ self: {
         foldl
         gitrev
         HsYAML
-        ilist
         language-docker
         megaparsec
         mtl
@@ -291092,7 +292171,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A simple Hadoop streaming library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -291180,7 +292259,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Confirm delegation of NS and MX records";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "haeredes";
     }
   ) { };
@@ -291342,8 +292421,6 @@ self: {
       ];
       description = "A graph library offering mutable, immutable, and inductive graphs";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -292314,6 +293391,8 @@ self: {
       pname = "hakyll-alectryon";
       version = "0.2.0.0";
       sha256 = "0zcl7wyi922lfp1dp3sbacqjcy8yk7qs6az48x40x2g42grrzddl";
+      revision = "1";
+      editedCabalFile = "03z4g50cdxk9rslcizn10qxwpxnzsgd4cx234w33wyqyd6mc2910";
       libraryHaskellDepends = [
         aeson
         base
@@ -292328,7 +293407,7 @@ self: {
         text
       ];
       description = "Hakyll extension for rendering Coq code using Alectryon";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -292863,7 +293942,7 @@ self: {
         vector
       ];
       description = "Hakyll utilities to work with images";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -293059,8 +294138,8 @@ self: {
     }:
     mkDerivation {
       pname = "hakyll-shortcut-links";
-      version = "0.1.0.2";
-      sha256 = "06wwp9vwxvhizhj8jvz77p5zycaqyjpm2dbh1k6m90hdlpzi0vcz";
+      version = "0.1.1.0";
+      sha256 = "17vhiz3x75dir194jk8pibip8z91a0qghwnrq55141kk6b0vdccv";
       libraryHaskellDepends = [
         base
         hakyll
@@ -293078,8 +294157,7 @@ self: {
         text
       ];
       description = "Use shortcut-links in markdown file for Hakyll";
-      license = lib.licenses.mpl20;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -293356,6 +294434,8 @@ self: {
       pname = "half";
       version = "0.3.3";
       sha256 = "00mb2xfz0q8sq8zxqpw3ycp1p8gjhlgc0wxh5xr7kzyn52b08xpl";
+      revision = "1";
+      editedCabalFile = "1l21z6a7h6qkfnk0mp4qg3mgqjzrx5a9ra0ymb45rr3svvw9w45m";
       libraryHaskellDepends = [
         base
         binary
@@ -293472,7 +294552,7 @@ self: {
       sha256 = "1y09vl853nsc6fx19bwmmmh9k7di825j4y7rsm06wyk35m911yv7";
       libraryHaskellDepends = [ base ];
       description = "A library to provide special kind of two-column output for Phladiprelio";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -293502,7 +294582,7 @@ self: {
         JuicyPixels
       ];
       description = "Integration between Halide and JuicyPixels";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
     }
@@ -293532,7 +294612,7 @@ self: {
         hspec
       ];
       description = "Integration between Halide and ArrayFire";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -293593,7 +294673,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to Halide";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -296568,7 +297648,7 @@ self: {
         list-tries
       ];
       description = "Support for static URL routing with overlap detection for Happstack";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -296870,7 +297950,7 @@ self: {
         Chart-diagrams
       ];
       description = "Generate simple okay-looking bar plots without much effort";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -296899,7 +297979,7 @@ self: {
       ];
       doHaddock = false;
       description = "Happy is a parser generator for Haskell implemented using this library";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -297356,7 +298436,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Haskell program configuration using higher kinded data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -297564,8 +298644,8 @@ self: {
     }:
     mkDerivation {
       pname = "harpie";
-      version = "0.1.3.0";
-      sha256 = "1agkp62rcgk705hp8hlppfiidv5vsz0ps6pq3pvlnn1g73vv5ivr";
+      version = "0.1.3.1";
+      sha256 = "1wdr4jqfaqiy089hkgimaxhmrqh82cb73ycg6sl5bx22k871fjyr";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -297590,7 +298670,7 @@ self: {
         doctest-parallel
       ];
       description = "Haskell array programming";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "harpie-bug-issue1";
     }
   ) { };
@@ -297623,7 +298703,7 @@ self: {
         prettyprinter
       ];
       description = "numhask shim for harpie";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -297776,7 +298856,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "This library 'Has' transformers";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -297788,33 +298868,30 @@ self: {
       base64-bytestring,
       binary,
       bytestring,
-      connection,
       containers,
       criterion,
+      crypton-connection,
       data-binary-ieee754,
       data-default,
       deepseq,
-      deepseq-generics,
       hspec,
       mtl,
       network,
-      QuickCheck,
       text,
     }:
     mkDerivation {
       pname = "hasbolt";
-      version = "0.1.7.0";
-      sha256 = "08df7wxybqyjmk13haq8g72f658s1cskf2vvp25hgly0gcqy57d4";
+      version = "0.1.7.1";
+      sha256 = "1pd7axnr48bc5lqw3zax0cs3722m39pgmgjrkhq8fd30alw3xm2s";
       libraryHaskellDepends = [
         base
         binary
         bytestring
-        connection
         containers
+        crypton-connection
         data-binary-ieee754
         data-default
         deepseq
-        deepseq-generics
         mtl
         network
         text
@@ -297825,7 +298902,6 @@ self: {
         bytestring
         containers
         hspec
-        QuickCheck
         text
       ];
       benchmarkHaskellDepends = [
@@ -297835,11 +298911,9 @@ self: {
         bytestring
         criterion
         data-default
-        hspec
       ];
       description = "Haskell driver for Neo4j 3+ (BOLT protocol)";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -297949,7 +299023,7 @@ self: {
       sha256 = "1vgbmlcd33vky1mf9sx6dkbh8yjp7nyr4528y6qz7xn7z1lxfyyx";
       libraryHaskellDepends = [ base ];
       description = "Haskell to and from Scalameta";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -298454,7 +299528,7 @@ self: {
         temporary
       ];
       description = "Hash-addressed file storage";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -298522,7 +299596,7 @@ self: {
         unordered-containers
       ];
       description = "Hash-addressed file storage app";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hash-addressed";
     }
@@ -298714,7 +299788,7 @@ self: {
         unix
       ];
       description = "A class for types that can be converted to a hash value";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -298774,7 +299848,7 @@ self: {
         unix
       ];
       description = "A class for types that can be converted to a hash value";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -298900,7 +299974,7 @@ self: {
         time-compat
       ];
       description = "Provides instances missing from Hashable";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -299074,7 +300148,7 @@ self: {
         vector
       ];
       description = "Hash digests for files and directories";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hasherize";
       broken = true;
@@ -299118,7 +300192,7 @@ self: {
       ];
       benchmarkSystemDepends = [ openssl ];
       description = "Hash functions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { inherit (pkgs) openssl; };
 
@@ -299422,7 +300496,7 @@ self: {
         vector
       ];
       description = "Mutable hash tables in the ST monad";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -299937,7 +301011,7 @@ self: {
     }
   ) { };
 
-  haskeline_0_8_4_0 = callPackage (
+  haskeline_0_8_4_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -299956,8 +301030,8 @@ self: {
     }:
     mkDerivation {
       pname = "haskeline";
-      version = "0.8.4.0";
-      sha256 = "1jky7h70f6k8qaxkh6f7pd5cam9sjqmibh18kksf8vr98dzh3xhp";
+      version = "0.8.4.1";
+      sha256 = "0kxdgy3s6pakb7yqk9jy747xv6n3plzwxnnzabqnyk83cs0d8n22";
       configureFlags = [ "-fterminfo" ];
       isLibrary = true;
       isExecutable = true;
@@ -300521,7 +301595,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A lightweight library for asynchronous job workers with multiple broker backends";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -300598,7 +301672,7 @@ self: {
         text
       ];
       description = "PostgreSQL/PGMQ broker implementation for haskell-bee";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "simple-worker";
       broken = true;
@@ -300670,7 +301744,7 @@ self: {
         unix-time
       ];
       description = "Redis broker implementation for haskell-bee";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -300736,7 +301810,7 @@ self: {
         unix-time
       ];
       description = "STM broker implementation for haskell-bee";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -300775,7 +301849,7 @@ self: {
         text
       ];
       description = "Reusable test suite for any haskell-bee Broker implementation";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -301080,7 +302154,7 @@ self: {
       ];
       doHaddock = false;
       description = "Cabal package script generator for Travis-CI";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "haskell-ci";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -301388,7 +302462,6 @@ self: {
       ];
       description = "Haskell Debug Adapter";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "haskell-debug-adapter";
     }
   ) { };
@@ -301397,6 +302470,7 @@ self: {
     {
       mkDerivation,
       aeson,
+      aeson-pretty,
       array,
       async,
       base,
@@ -301416,18 +302490,27 @@ self: {
       hie-bios,
       implicit-hie,
       mtl,
+      network,
+      network-run,
       optparse-applicative,
       prettyprinter,
       process,
+      random,
+      regex,
+      tasty,
+      tasty-golden,
+      tasty-hunit,
+      temporary,
       text,
       time,
       transformers,
       unix,
+      unordered-containers,
     }:
     mkDerivation {
       pname = "haskell-debugger";
-      version = "0.7.0.0";
-      sha256 = "18hx1jb6w8yzxh410fsi2lv7xv37gm2k9i7yfchhiqccgbr5zp2j";
+      version = "0.9.0.0";
+      sha256 = "1fla0w681lv9v64aglyyg4i4s83fzcs836cm3xj4a4jviv9m3psg";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -301469,16 +302552,39 @@ self: {
         hie-bios
         implicit-hie
         mtl
+        network
+        network-run
         optparse-applicative
         prettyprinter
         process
         text
         transformers
         unix
+        unordered-containers
+      ];
+      testHaskellDepends = [
+        aeson
+        aeson-pretty
+        async
+        base
+        bytestring
+        containers
+        dap
+        filepath
+        network
+        network-run
+        process
+        random
+        regex
+        tasty
+        tasty-golden
+        tasty-hunit
+        temporary
+        text
+        unordered-containers
       ];
-      testHaskellDepends = [ base ];
       description = "A step-through machine-interface debugger for GHC Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hdb";
     }
@@ -301812,7 +302918,7 @@ self: {
         hspec-expectations
       ];
       description = "Haskell bindings for ffprobe";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -302253,7 +303359,7 @@ self: {
         vector
       ];
       description = "Auto-generated Gemini API Client for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -302399,7 +303505,7 @@ self: {
         uuid-types
       ];
       description = "Haskell port of purescript-halogen library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "halogen-core-prototype";
       broken = true;
@@ -302483,9 +303589,7 @@ self: {
         tasty-hunit
       ];
       description = "Bindings to the igraph C library (v0.8.5).";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -302633,12 +303737,14 @@ self: {
       ghc-boot,
       ghc-boot-th,
       ghc-exactprint,
+      ghc-lib-parser,
+      ghc-lib-parser-ex,
       ghcide,
       githash,
       hashable,
       hie-bios,
-      hie-compat,
       hiedb,
+      hlint,
       hls-graph,
       hls-plugin-api,
       hls-test-utils,
@@ -302663,6 +303769,7 @@ self: {
       process-extras,
       QuickCheck,
       random,
+      refact,
       regex-applicative,
       regex-tdfa,
       row-types,
@@ -302674,6 +303781,7 @@ self: {
       stan,
       stm,
       stm-containers,
+      string-interpolate,
       stylish-haskell,
       syb,
       tasty,
@@ -302682,6 +303790,7 @@ self: {
       tasty-quickcheck,
       tasty-rerun,
       template-haskell,
+      temporary,
       text,
       text-rope,
       time,
@@ -302696,10 +303805,8 @@ self: {
     }:
     mkDerivation {
       pname = "haskell-language-server";
-      version = "2.11.0.0";
-      sha256 = "1acd42sqa76nkrwkb6jcrimbf8va6ikkynv9ssbbamyy4vmx1aa4";
-      revision = "1";
-      editedCabalFile = "06ah5cdcg52azd0jx7n4n7xwrhphjc2k4k8gqda44m1kiv5z2v18";
+      version = "2.12.0.0";
+      sha256 = "1la7kmpapzchypjarvy8vwjggxr4smaqfjpc1wfrgh3y3anb6s8p";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -302727,12 +303834,14 @@ self: {
         ghc-boot
         ghc-boot-th
         ghc-exactprint
+        ghc-lib-parser
+        ghc-lib-parser-ex
         ghcide
         githash
         hashable
         hie-bios
-        hie-compat
         hiedb
+        hlint
         hls-graph
         hls-plugin-api
         hls-test-utils
@@ -302752,6 +303861,7 @@ self: {
         prettyprinter
         process
         process-extras
+        refact
         regex-applicative
         regex-tdfa
         row-types
@@ -302765,6 +303875,7 @@ self: {
         stylish-haskell
         syb
         template-haskell
+        temporary
         text
         text-rope
         time
@@ -302837,6 +303948,7 @@ self: {
         sqlite-simple
         stm
         stm-containers
+        string-interpolate
         tasty
         tasty-expected-failure
         tasty-hunit
@@ -302873,7 +303985,7 @@ self: {
       benchmarkToolDepends = [ eventlog2html ];
       doHaddock = false;
       description = "LSP server for GHC";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -302886,7 +303998,7 @@ self: {
       sha256 = "0h8s19j2flby3qrvb93j1d2lpjl1jgin8lj6dqpb7c86h59f2xlx";
       libraryHaskellDepends = [ base ];
       description = "A fully compliant Haskell 98 lexer";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -303613,7 +304725,7 @@ self: {
         text
       ];
       description = "Haskell interface for Tembo's PGMQ PostgreSQL extension";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -304522,7 +305634,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "haskell-stack-trace-plugin";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -304563,7 +305675,7 @@ self: {
         time
       ];
       description = "A simple throttling library, which drops messages from same group";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -305741,7 +306853,7 @@ self: {
         process
       ];
       description = "Rebuild Haskell dependencies in Gentoo";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "haskell-updater";
     }
   ) { };
@@ -305861,7 +306973,7 @@ self: {
         base
       ];
       description = "Haskell 2020[draft] Standard Library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -307294,7 +308406,7 @@ self: {
         vector
       ];
       description = "embedded DSL for defining epidemiologic cohorts";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -308853,8 +309965,8 @@ self: {
     }:
     mkDerivation {
       pname = "hasktorch";
-      version = "0.2.1.6";
-      sha256 = "0zv1n54bjvisnr5himacq7mxanblldrdxnfvbszp0ahvlgjamm1z";
+      version = "0.2.1.7";
+      sha256 = "1ypzkgmwlf31mjqdrdq7fb7imniaqy7k8h4ii92dcpj7r2gdlb2x";
       setupHaskellDepends = [
         base
         Cabal
@@ -308944,7 +310056,7 @@ self: {
         weigh
       ];
       description = "Haskell bindings to libtorch, supporting both typed and untyped tensors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -308999,7 +310111,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Code generation tools for Hasktorch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ht-codegen";
       broken = true;
@@ -309029,7 +310141,7 @@ self: {
         text
       ];
       description = "Testing library for Hasktorch's FFI bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -309067,7 +310179,7 @@ self: {
         text
       ];
       description = "Bindings to Torch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -309112,7 +310224,7 @@ self: {
         text
       ];
       description = "Bindings to Cutorch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { ATen = null; };
@@ -309181,7 +310293,7 @@ self: {
       ];
       doHaddock = false;
       description = "Core Hasktorch abstractions wrapping FFI bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -309221,7 +310333,7 @@ self: {
       ];
       doHaddock = false;
       description = "Backpack signatures for Tensor operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -309243,7 +310355,7 @@ self: {
         hasktorch-types-th
       ];
       description = "Functions to partially satisfy tensor signatures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -309267,7 +310379,7 @@ self: {
       ];
       doHaddock = false;
       description = "Signatures for support tensors in hasktorch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -309291,7 +310403,7 @@ self: {
       ];
       doHaddock = false;
       description = "Core types for Hasktorch backpack signatures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -309314,7 +310426,7 @@ self: {
       ];
       libraryToolDepends = [ c2hs ];
       description = "C-types for Torch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -309337,7 +310449,7 @@ self: {
       ];
       libraryToolDepends = [ c2hs ];
       description = "C-types for Cutorch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -309390,7 +310502,7 @@ self: {
         vector
       ];
       description = "Neural architectures in hasktorch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -309447,7 +310559,7 @@ self: {
         criterion
       ];
       description = "Haskus binary format manipulation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -309611,7 +310723,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Haskus data utility modules";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -309631,7 +310743,7 @@ self: {
         doctest
       ];
       description = "Haskus types utility modules";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -309683,7 +310795,7 @@ self: {
         QuickCheck
       ];
       description = "Variant and EADT";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -309716,7 +310828,7 @@ self: {
         text
       ];
       description = "Haskus web";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -310028,7 +311140,7 @@ self: {
         vector-sized
       ];
       description = "A monad for interfacing with external SMT solvers";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -310209,7 +311321,7 @@ self: {
       ];
       doHaddock = false;
       description = "An efficient PostgreSQL driver with a flexible mapping API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -310297,7 +311409,92 @@ self: {
       ];
       doHaddock = false;
       description = "Fast PostgreSQL driver with a flexible mapping API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+    }
+  ) { };
+
+  hasql_1_9_3_2 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      attoparsec,
+      base,
+      bytestring,
+      bytestring-strict-builder,
+      containers,
+      contravariant,
+      contravariant-extras,
+      criterion,
+      dlist,
+      hashable,
+      hspec,
+      hspec-discover,
+      iproute,
+      mtl,
+      postgresql-binary,
+      postgresql-libpq,
+      profunctors,
+      QuickCheck,
+      quickcheck-instances,
+      rerebase,
+      scientific,
+      testcontainers-postgresql,
+      text,
+      text-builder,
+      time,
+      transformers,
+      unordered-containers,
+      uuid,
+      vector,
+      witherable,
+    }:
+    mkDerivation {
+      pname = "hasql";
+      version = "1.9.3.2";
+      sha256 = "1qaiawgz9qrkw11p6z6spqsvwmcq6s4xjkl54cn3vpwqzyvfcacf";
+      libraryHaskellDepends = [
+        aeson
+        attoparsec
+        base
+        bytestring
+        bytestring-strict-builder
+        containers
+        contravariant
+        dlist
+        hashable
+        iproute
+        mtl
+        postgresql-binary
+        postgresql-libpq
+        profunctors
+        scientific
+        testcontainers-postgresql
+        text
+        text-builder
+        time
+        transformers
+        unordered-containers
+        uuid
+        vector
+        witherable
+      ];
+      testHaskellDepends = [
+        contravariant-extras
+        hspec
+        QuickCheck
+        quickcheck-instances
+        rerebase
+        testcontainers-postgresql
+      ];
+      testToolDepends = [ hspec-discover ];
+      benchmarkHaskellDepends = [
+        criterion
+        rerebase
+      ];
+      doHaddock = false;
+      description = "Fast PostgreSQL driver with a flexible mapping API";
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -310429,7 +311626,7 @@ self: {
         tasty-hunit
       ];
       description = "A declarative abstraction over PostgreSQL Cursor";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -310464,7 +311661,7 @@ self: {
         transformers
       ];
       description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -310545,7 +311742,7 @@ self: {
         tasty-hunit
       ];
       description = "Toolkit for constructing Hasql statements dynamically";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -310583,7 +311780,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Effectful bindings for hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hasql-effectful-example";
       broken = true;
@@ -310623,7 +311820,7 @@ self: {
         tasty-hunit
       ];
       description = "Hasql queries testing interface";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -310707,7 +311904,7 @@ self: {
         vector
       ];
       description = "Implicit definitions for Hasql, such as default codecs for standard types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -310745,7 +311942,7 @@ self: {
         vector
       ];
       description = "Implicit definitions for Hasql, such as default codecs for standard types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -310808,7 +312005,7 @@ self: {
         tmp-postgres
       ];
       description = "QuasiQuoter that supports expression interpolation for hasql";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -310837,7 +312034,7 @@ self: {
         text
       ];
       description = "LISTEN/NOTIFY with hasql";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -310927,7 +312124,7 @@ self: {
         transformers
       ];
       description = "Hasql migrations library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311049,7 +312246,7 @@ self: {
         time
       ];
       description = "\"optparse-applicative\" parsers for \"hasql\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -311118,7 +312315,7 @@ self: {
         rerebase
       ];
       description = "Pool of connections for Hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -311131,17 +312328,21 @@ self: {
       bytestring,
       hasql,
       hspec,
+      hspec-discover,
       random,
       rerebase,
       stm,
+      testcontainers-postgresql,
       text,
+      text-builder,
       time,
+      tuple,
       uuid,
     }:
     mkDerivation {
       pname = "hasql-pool";
-      version = "1.3.0.3";
-      sha256 = "1r59bn50klalw3g9fal8xpbv86fzzw77nqbymhdvq11wslhpyrm3";
+      version = "1.3.0.4";
+      sha256 = "1spqdiba90sxsx9cwarxmxfq4d89nkdf76a83hpb3bklmcz9sg0w";
       libraryHaskellDepends = [
         base
         bytestring
@@ -311157,9 +312358,13 @@ self: {
         hspec
         random
         rerebase
+        testcontainers-postgresql
+        text-builder
+        tuple
       ];
+      testToolDepends = [ hspec-discover ];
       description = "Pool of connections for Hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -311435,7 +312640,7 @@ self: {
         hspec
       ];
       description = "A pool of connections for Hasql based on resource-pool";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311499,7 +312704,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Conduit";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311522,7 +312727,7 @@ self: {
         hasql-transaction-io
       ];
       description = "Stream Hasql queries";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -311580,7 +312785,7 @@ self: {
         unliftio-core
       ];
       description = "An example program that shows how to use Hasql streams with Rel8";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hasql-streaming";
     }
@@ -311609,7 +312814,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Pipes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311638,7 +312843,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Streaming";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311667,7 +312872,7 @@ self: {
         transformers
       ];
       description = "Stream Hasql queries with Streamly";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311708,7 +312913,7 @@ self: {
         vector
       ];
       description = "Template Haskell utilities for Hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -311784,7 +312989,7 @@ self: {
         rerebase
       ];
       description = "Composable abstraction over retryable transactions for Hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -311819,7 +313024,7 @@ self: {
         unliftio-core
       ];
       description = "Perform IO actions during transactions for Hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -311854,7 +313059,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Parse PostgreSQL connection URI into Hasql.Connection Settings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -312600,7 +313805,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Manipulates network blocks in CIDR notation";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "hath";
     }
   ) { };
@@ -312772,7 +313977,7 @@ self: {
         text
       ];
       description = "Library for checking for weak/compromised passwords";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "readme";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -313084,8 +314289,6 @@ self: {
       ];
       description = "A Haskell library for efficient, concurrent, and concise data access";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -313118,6 +314321,7 @@ self: {
       description = "Haxl data source for accessing AWS services through amazonka";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -313182,6 +314386,7 @@ self: {
       description = "An example Haxl data source for accessing the Facebook Graph API";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -313469,7 +314674,7 @@ self: {
         mmap
       ];
       description = "A command line tool to compute BLAKE3 hashes";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       platforms = lib.platforms.x86;
       mainProgram = "hb3sum";
     }
@@ -313938,7 +315143,7 @@ self: {
         hspec
       ];
       description = "Blosc (numerical compression library) bindings for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -314268,7 +315473,7 @@ self: {
         witherable
       ];
       description = "2d Delaunay triangulation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -314775,7 +315980,7 @@ self: {
         string-interpolate
       ];
       description = "Haskell artifact name counts";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hcount";
       broken = true;
@@ -316128,7 +317333,7 @@ self: {
         selective
       ];
       description = "More informative parser";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -316258,7 +317463,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "License Header Manager";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "headroom";
     }
   ) { };
@@ -316319,7 +317524,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "interactively inspect Haskell values at runtime";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -316904,11 +318109,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "heck";
-      version = "0.2025.5.22";
-      sha256 = "01lxh37sw8sjcmss34nh97im4l3vpdxy1wp7qxgdwynzgz6lf4s9";
+      version = "1.0.0.0";
+      sha256 = "1j318pv3afazvl7m65w2gbmhcddnyn3gxf25k36wkd6rlclzbnrh";
       libraryHaskellDepends = [ base ];
       description = "Abstract unit test interface";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
     }
   ) { };
 
@@ -317058,7 +318263,7 @@ self: {
         microlens
       ];
       description = "Reddit API bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317144,7 +318349,7 @@ self: {
     }
   ) { };
 
-  hedgehog_1_6 = callPackage (
+  hedgehog_1_7 = callPackage (
     {
       mkDerivation,
       ansi-terminal,
@@ -317177,8 +318382,8 @@ self: {
     }:
     mkDerivation {
       pname = "hedgehog";
-      version = "1.6";
-      sha256 = "0lrwwlcp3rihs9z239lf6pd0m2fmi8ww4vvrwiphkrcba4c91bgf";
+      version = "1.7";
+      sha256 = "0kjn3dxyhk55ayjd9m8acr8kxhbzc70piszkiy2gbnwqyyhbrqh9";
       libraryHaskellDepends = [
         ansi-terminal
         async
@@ -317332,7 +318537,7 @@ self: {
         vector
       ];
       description = "Hedgehog will eat your typeclass bugs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -317448,7 +318653,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Supplemental library for hedgehog";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -317532,7 +318737,7 @@ self: {
         typerep-map
       ];
       description = "Customizable Gen for ADT using Generics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317625,7 +318830,7 @@ self: {
         hedgehog
       ];
       description = "GHC Generics automatically derived hedgehog generators";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317667,7 +318872,7 @@ self: {
         hedgehog
       ];
       description = "Golden testing capabilities for hedgehog using Aeson";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317690,7 +318895,7 @@ self: {
         lens
       ];
       description = "Hedgehog properties for lens laws";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317713,7 +318918,7 @@ self: {
         optics-core
       ];
       description = "Hedgehog properties for optics laws";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -317731,8 +318936,8 @@ self: {
       pname = "hedgehog-quickcheck";
       version = "0.1.1";
       sha256 = "1z2ja63wqz83qhwzh0zs98k502v8fjdpnsnhqk3srypx2nw5vdlp";
-      revision = "9";
-      editedCabalFile = "1grw0vh1n3nbhpypb4v4rhmidm5n2hjbr4wiyvwj79bl12bd1x49";
+      revision = "10";
+      editedCabalFile = "18vclwp2i5w0acgs4zjjw82sy0s8sky9baa168qvyj2c1rdhs48q";
       libraryHaskellDepends = [
         base
         hedgehog
@@ -317930,7 +319135,7 @@ self: {
         hedis
       ];
       description = "Adaptation of the hedis library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -317954,7 +319159,7 @@ self: {
         scientific
         time
       ];
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -318280,7 +319485,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "higher-order algebraic effects done right";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -318382,7 +319587,7 @@ self: {
         unliftio
       ];
       description = "higher-order algebraic effects done right";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -318424,7 +319629,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Fast equality saturation in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -318673,7 +319878,7 @@ self: {
         xmlhtml
       ];
       description = "An Haskell template system supporting both HTML5 and XML";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -318917,7 +320122,7 @@ self: {
         xmlhtml
       ];
       description = "Extra heist functionality";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -319064,7 +320269,7 @@ self: {
         zeugma
       ];
       description = "Clipboard Manager";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hel";
     }
@@ -319925,7 +321130,7 @@ self: {
         vector
       ];
       description = "Really fast mutable sparse sets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -319966,7 +321171,7 @@ self: {
         uuid
       ];
       description = "Generate UUIDv7 values";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -320051,7 +321256,7 @@ self: {
         QuickCheck
       ];
       description = "Accessible format for structured data serialization";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       mainProgram = "herb-format";
     }
   ) { };
@@ -320344,7 +321549,7 @@ self: {
           ];
           testToolDepends = [ hspec-discover ];
           description = "Runs Continuous Integration tasks on your machines";
-          license = lib.licenses.asl20;
+          license = lib.licensesSpdx."Apache-2.0";
           maintainers = [ lib.maintainers.roberth ];
         }
       )
@@ -320476,7 +321681,7 @@ self: {
         vector
       ];
       description = "Hercules CI API definition with Servant";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "hercules-gen-swagger";
       maintainers = [ lib.maintainers.roberth ];
     }
@@ -320867,7 +322072,7 @@ self: {
           ];
           testToolDepends = [ hspec-discover ];
           description = "Bindings for the Nix evaluator";
-          license = lib.licenses.asl20;
+          license = lib.licensesSpdx."Apache-2.0";
           maintainers = [ lib.maintainers.roberth ];
         }
       )
@@ -320940,7 +322145,7 @@ self: {
           ];
           testToolDepends = [ hspec-discover ];
           description = "Haskell bindings for Nix's libstore";
-          license = lib.licenses.asl20;
+          license = lib.licensesSpdx."Apache-2.0";
           maintainers = [ lib.maintainers.roberth ];
         }
       )
@@ -321063,7 +322268,7 @@ self: {
         text
       ];
       description = "Heredocument on Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -321153,7 +322358,7 @@ self: {
         vector
       ];
       description = "Fast JSON decoding via simdjson C++ bindings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -321748,7 +322953,7 @@ self: {
         infinite-list
       ];
       description = "Zip lists with Traversables";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -321821,7 +323026,7 @@ self: {
         stm
       ];
       description = "Comparison of distinctly typed values with evidence capture";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -321993,6 +323198,7 @@ self: {
           mkDerivation,
           aeson,
           aeson-optics,
+          aeson-pretty,
           async,
           base,
           base16,
@@ -322013,6 +323219,7 @@ self: {
           gmp,
           here,
           hspec,
+          jsonl,
           libff,
           megaparsec,
           memory,
@@ -322050,7 +323257,6 @@ self: {
           transformers,
           tree-view,
           unliftio-core,
-          unordered-containers,
           utf8-string,
           vector,
           witch,
@@ -322059,13 +323265,14 @@ self: {
         }:
         mkDerivation {
           pname = "hevm";
-          version = "0.55.1";
-          sha256 = "15yrqf0z0phjgvr4d91qkcxh5zzhvk12nlf723hdj2qda9d3cim9";
+          version = "0.56.0";
+          sha256 = "1axwzs066312s3ncr89rmm14ny8ibzhrcqn9f9gfibsgyw9w5z7d";
           isLibrary = true;
           isExecutable = true;
           libraryHaskellDepends = [
             aeson
             aeson-optics
+            aeson-pretty
             async
             base
             base16
@@ -322082,7 +323289,6 @@ self: {
             filemanip
             filepath
             filepattern
-            here
             megaparsec
             memory
             mtl
@@ -322114,7 +323320,6 @@ self: {
             transformers
             tree-view
             unliftio-core
-            unordered-containers
             vector
             witch
             witherable
@@ -322132,6 +323337,8 @@ self: {
             directory
             filepath
             githash
+            jsonl
+            mtl
             optics-core
             optparse-applicative
             optparse-generic
@@ -322156,7 +323363,6 @@ self: {
             here
             hspec
             mtl
-            operational
             optics-core
             optics-extra
             process
@@ -322192,7 +323398,7 @@ self: {
           ];
           doHaddock = false;
           description = "Symbolic EVM Evaluator";
-          license = lib.licenses.agpl3Only;
+          license = lib.licensesSpdx."AGPL-3.0-only";
           mainProgram = "hevm";
           maintainers = [ lib.maintainers.arturcygan ];
         }
@@ -322313,7 +323519,7 @@ self: {
         text
       ];
       description = "ByteString-Text hexidecimal conversions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -322478,7 +323684,7 @@ self: {
         wreq
       ];
       description = "Lenses for the hexml package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -322979,7 +324185,7 @@ self: {
         text
       ];
       description = "Streaming-friendly XML parsers";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -323543,7 +324749,7 @@ self: {
         text
       ];
       description = "File/folder watching for OS X";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.darwin;
     }
   ) { };
@@ -323700,7 +324906,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ gdal ];
       description = "Haskell binding to the GDAL library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) gdal; };
 
@@ -323788,22 +324994,20 @@ self: {
     {
       mkDerivation,
       base,
-      directory,
-      filepath,
+      cmdargs,
       hylolib,
       mtl,
       random,
     }:
     mkDerivation {
       pname = "hgen";
-      version = "1.4.0";
-      sha256 = "190zm0lkr2ymq91ka84a3v2lhxjv9yl43abqcyxj6c3cjqym9ib5";
+      version = "1.5.0";
+      sha256 = "0clvgakfb53w1zh061pa7d07768qwd2grwws7d4610x7qbi45dw5";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
         base
-        directory
-        filepath
+        cmdargs
         hylolib
         mtl
         random
@@ -323952,7 +325156,7 @@ self: {
         vinyl
       ];
       description = "Geometric Algorithms, Data structures, and Data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -324183,7 +325387,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Reading and Writing ipe7 files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -324310,7 +325514,9 @@ self: {
       ];
       description = "Bindings to libintl.h (gettext, bindtextdomain)";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "hgettext";
+      broken = true;
     }
   ) { };
 
@@ -324608,7 +325814,7 @@ self: {
         network
       ];
       description = "Haskell module to interact with the greetd daemon trough it's IPC protocol";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -325354,7 +326560,7 @@ self: {
         yaml
       ];
       description = "Set up a GHC API session";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hie-bios";
     }
   ) { };
@@ -325516,75 +326722,6 @@ self: {
   ) { };
 
   hiedb = callPackage (
-    {
-      mkDerivation,
-      algebraic-graphs,
-      ansi-terminal,
-      array,
-      base,
-      bytestring,
-      containers,
-      directory,
-      extra,
-      filepath,
-      ghc,
-      ghc-paths,
-      hie-compat,
-      hspec,
-      lucid,
-      mtl,
-      optparse-applicative,
-      process,
-      sqlite-simple,
-      temporary,
-      terminal-size,
-      text,
-    }:
-    mkDerivation {
-      pname = "hiedb";
-      version = "0.6.0.2";
-      sha256 = "0sfxykvg5n44lpjj069j25pnff30ckby8k3n7yhp8ixajfnfrb5i";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        algebraic-graphs
-        ansi-terminal
-        array
-        base
-        bytestring
-        containers
-        directory
-        extra
-        filepath
-        ghc
-        hie-compat
-        lucid
-        mtl
-        optparse-applicative
-        sqlite-simple
-        terminal-size
-        text
-      ];
-      executableHaskellDepends = [
-        base
-        ghc-paths
-      ];
-      testHaskellDepends = [
-        base
-        directory
-        filepath
-        ghc-paths
-        hspec
-        process
-        temporary
-      ];
-      description = "Generates a references DB from .hie files";
-      license = lib.licenses.bsd3;
-      mainProgram = "hiedb";
-    }
-  ) { };
-
-  hiedb_0_7_0_0 = callPackage (
     {
       mkDerivation,
       algebraic-graphs,
@@ -325649,8 +326786,7 @@ self: {
         temporary
       ];
       description = "Generates a references DB from .hie files";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hiedb";
     }
   ) { };
@@ -325817,7 +326953,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "hierarchical environments for dependency injection";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -326106,7 +327242,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Partial types as a type constructor";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -326630,7 +327766,7 @@ self: {
         utility-ht
       ];
       description = "Linear Programming using HiGHS and comfort-array";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) highs; };
 
@@ -326669,7 +327805,7 @@ self: {
         text
       ];
       description = "Haskell wrapper for Pikchr, a PIC-like markup language for diagrams";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hikchr";
       broken = true;
@@ -327323,7 +328459,7 @@ self: {
         quickcheck-text
       ];
       description = "Generic project initialization tool";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hi";
       maintainers = [ lib.maintainers.poscat ];
     }
@@ -327589,6 +328725,31 @@ self: {
     }
   ) { };
 
+  hint-nix = callPackage (
+    {
+      mkDerivation,
+      base,
+      hint,
+      include-env,
+      relude,
+    }:
+    mkDerivation {
+      pname = "hint-nix";
+      version = "0.1.0.1";
+      sha256 = "1wdbv1s3abza4min2h9q70q8ndjwwvn5w1rlzvd8d6p402diszf4";
+      libraryHaskellDepends = [
+        base
+        hint
+        include-env
+        relude
+      ];
+      description = "Helper for using hint with Nix package databases";
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   hint-server = callPackage (
     {
       mkDerivation,
@@ -328807,7 +329968,7 @@ self: {
         text
       ];
       description = "Haskell Git Helper Tool";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hit";
       broken = true;
@@ -328923,7 +330084,7 @@ self: {
       ];
       doHaddock = false;
       description = "Haskell/Nix development build tools";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hix";
       broken = true;
@@ -329631,6 +330792,48 @@ self: {
     }
   ) { };
 
+  hkgr_0_5 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      directory,
+      extra,
+      filepath,
+      simple-cabal,
+      simple-cmd,
+      simple-cmd-args,
+      simple-prompt,
+      typed-process,
+      xdg-basedir,
+    }:
+    mkDerivation {
+      pname = "hkgr";
+      version = "0.5";
+      sha256 = "070np9w0dafzlq7mkh11qkm8jr4k9dj927gbhz9vg8xn2p81fxb7";
+      isLibrary = false;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      executableHaskellDepends = [
+        base
+        bytestring
+        directory
+        extra
+        filepath
+        simple-cabal
+        simple-cmd
+        simple-cmd-args
+        simple-prompt
+        typed-process
+        xdg-basedir
+      ];
+      description = "Simple Hackage release workflow for package maintainers";
+      license = lib.licenses.gpl3Only;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "hkgr";
+    }
+  ) { };
+
   hkt = callPackage (
     {
       mkDerivation,
@@ -329871,8 +331074,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger";
-      version = "1.43.2";
-      sha256 = "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1";
+      version = "1.50.2";
+      sha256 = "04rc39c2vvs0pxsabk5fm5d7ldrgn1ahkbqqw296zra94mcc600w";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -330000,194 +331203,7 @@ self: {
         wizards
       ];
       description = "Command-line interface for the hledger accounting system";
-      license = lib.licenses.gpl3Plus;
-      mainProgram = "hledger";
-      maintainers = [
-        lib.maintainers.maralorn
-        lib.maintainers.sternenseemann
-      ];
-    }
-  ) { };
-
-  hledger_1_50 = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      ansi-terminal,
-      base,
-      bytestring,
-      cmdargs,
-      containers,
-      data-default,
-      Decimal,
-      Diff,
-      directory,
-      extra,
-      filepath,
-      githash,
-      hashable,
-      haskeline,
-      hledger-lib,
-      http-client,
-      http-types,
-      lucid,
-      math-functions,
-      megaparsec,
-      microlens,
-      modern-uri,
-      mtl,
-      process,
-      regex-tdfa,
-      req,
-      safe,
-      shakespeare,
-      split,
-      tabular,
-      tasty,
-      temporary,
-      text,
-      text-ansi,
-      time,
-      timeit,
-      transformers,
-      unordered-containers,
-      utf8-string,
-      utility-ht,
-      wizards,
-    }:
-    mkDerivation {
-      pname = "hledger";
-      version = "1.50";
-      sha256 = "140yg0nds681dk2g4lyldvjlwcb3v8lg2dd82vi7zp5i9af2v9k8";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        aeson
-        ansi-terminal
-        base
-        bytestring
-        cmdargs
-        containers
-        data-default
-        Decimal
-        Diff
-        directory
-        extra
-        filepath
-        githash
-        hashable
-        haskeline
-        hledger-lib
-        http-client
-        http-types
-        lucid
-        math-functions
-        megaparsec
-        microlens
-        modern-uri
-        mtl
-        process
-        regex-tdfa
-        req
-        safe
-        shakespeare
-        split
-        tabular
-        tasty
-        temporary
-        text
-        text-ansi
-        time
-        timeit
-        transformers
-        unordered-containers
-        utf8-string
-        utility-ht
-        wizards
-      ];
-      executableHaskellDepends = [
-        aeson
-        ansi-terminal
-        base
-        bytestring
-        cmdargs
-        containers
-        data-default
-        Decimal
-        directory
-        extra
-        filepath
-        githash
-        haskeline
-        hledger-lib
-        http-client
-        http-types
-        math-functions
-        megaparsec
-        microlens
-        mtl
-        process
-        regex-tdfa
-        req
-        safe
-        shakespeare
-        split
-        tabular
-        tasty
-        temporary
-        text
-        text-ansi
-        time
-        timeit
-        transformers
-        unordered-containers
-        utf8-string
-        utility-ht
-        wizards
-      ];
-      testHaskellDepends = [
-        aeson
-        ansi-terminal
-        base
-        bytestring
-        cmdargs
-        containers
-        data-default
-        Decimal
-        directory
-        extra
-        filepath
-        githash
-        haskeline
-        hledger-lib
-        http-client
-        http-types
-        math-functions
-        megaparsec
-        microlens
-        mtl
-        process
-        regex-tdfa
-        req
-        safe
-        shakespeare
-        split
-        tabular
-        tasty
-        temporary
-        text
-        text-ansi
-        time
-        timeit
-        transformers
-        unordered-containers
-        utf8-string
-        utility-ht
-        wizards
-      ];
-      description = "Command-line interface for the hledger accounting system";
-      license = lib.licenses.gpl3Plus;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "hledger";
       maintainers = [
         lib.maintainers.maralorn
@@ -330348,8 +331364,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-flow";
-      version = "0.14.4";
-      sha256 = "1qvh5vgnk6vrhhr1kjqsycz13acxa7ynpqnd1bmchfl4q3aga9gw";
+      version = "0.16.1";
+      sha256 = "0lf3ndx8p4f2mfq0d7hwansc2xvqazhn4ywr6q2z6ygki4jac99g";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -330386,9 +331402,7 @@ self: {
       ];
       description = "An hledger workflow focusing on automated statement import and classification";
       license = lib.licenses.gpl3Only;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "hledger-flow";
-      broken = true;
     }
   ) { };
 
@@ -330421,10 +331435,10 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-iadd";
-      version = "1.3.21";
-      sha256 = "00x0vbfp08kqs1nbknndk9h56hcidf6xnrk0ldz45dvjrmgcv3w2";
-      revision = "10";
-      editedCabalFile = "0138k01cba9xd3sab6kjh59rfxn96w2h21gjl579xqq76yvbibni";
+      version = "1.3.22";
+      sha256 = "077v7jgqhmpkg8m68bg4qi0jxl4zkg17aqk5n58ni3s2h71lkwlv";
+      revision = "1";
+      editedCabalFile = "16ac7v90dd0lwf9dwiylc8w0zq1al45ah2nlr177kvglfsxjvv12";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -330561,166 +331575,6 @@ self: {
   ) { };
 
   hledger-lib = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      aeson-pretty,
-      ansi-terminal,
-      array,
-      base,
-      blaze-html,
-      blaze-markup,
-      bytestring,
-      call-stack,
-      cassava,
-      cassava-megaparsec,
-      cmdargs,
-      colour,
-      containers,
-      data-default,
-      Decimal,
-      deepseq,
-      directory,
-      doclayout,
-      doctest,
-      encoding,
-      extra,
-      file-embed,
-      filepath,
-      Glob,
-      hashtables,
-      lucid,
-      megaparsec,
-      microlens,
-      microlens-th,
-      mtl,
-      parser-combinators,
-      pretty-simple,
-      process,
-      regex-tdfa,
-      safe,
-      tabular,
-      tasty,
-      tasty-hunit,
-      template-haskell,
-      terminal-size,
-      text,
-      time,
-      timeit,
-      transformers,
-      uglymemo,
-      unordered-containers,
-      utf8-string,
-    }:
-    mkDerivation {
-      pname = "hledger-lib";
-      version = "1.43.2";
-      sha256 = "18037qwz7d0h4i86ac0w3hkrvx22vdxf04fjbg0qjlizgb3dlazf";
-      libraryHaskellDepends = [
-        aeson
-        aeson-pretty
-        ansi-terminal
-        array
-        base
-        blaze-html
-        blaze-markup
-        bytestring
-        call-stack
-        cassava
-        cassava-megaparsec
-        cmdargs
-        colour
-        containers
-        data-default
-        Decimal
-        deepseq
-        directory
-        doclayout
-        encoding
-        extra
-        file-embed
-        filepath
-        Glob
-        hashtables
-        lucid
-        megaparsec
-        microlens
-        microlens-th
-        mtl
-        parser-combinators
-        pretty-simple
-        process
-        regex-tdfa
-        safe
-        tabular
-        tasty
-        tasty-hunit
-        template-haskell
-        terminal-size
-        text
-        time
-        timeit
-        transformers
-        uglymemo
-        unordered-containers
-        utf8-string
-      ];
-      testHaskellDepends = [
-        aeson
-        aeson-pretty
-        ansi-terminal
-        array
-        base
-        blaze-html
-        blaze-markup
-        bytestring
-        call-stack
-        cassava
-        cassava-megaparsec
-        cmdargs
-        colour
-        containers
-        data-default
-        Decimal
-        deepseq
-        directory
-        doclayout
-        doctest
-        encoding
-        extra
-        file-embed
-        filepath
-        Glob
-        hashtables
-        lucid
-        megaparsec
-        microlens
-        microlens-th
-        mtl
-        parser-combinators
-        pretty-simple
-        process
-        regex-tdfa
-        safe
-        tabular
-        tasty
-        tasty-hunit
-        template-haskell
-        terminal-size
-        text
-        time
-        timeit
-        transformers
-        uglymemo
-        unordered-containers
-        utf8-string
-      ];
-      description = "A library providing the core functionality of hledger";
-      license = lib.licenses.gpl3Plus;
-    }
-  ) { };
-
-  hledger-lib_1_50 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -330775,8 +331629,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-lib";
-      version = "1.50";
-      sha256 = "1fk579j56wbxxk3bz4m9hwfkdb02mz374y72bplbrf3y40cd2a48";
+      version = "1.50.2";
+      sha256 = "1x070rs92n1y0l07x4lvg77x5k5sclafm1iissfd17dbg5d84383";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -330879,8 +331733,7 @@ self: {
         utf8-string
       ];
       description = "A library providing the core functionality of hledger";
-      license = lib.licenses.gpl3Plus;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
     }
   ) { };
 
@@ -331031,6 +331884,7 @@ self: {
       process,
       safe,
       split,
+      stm,
       text,
       text-zipper,
       time,
@@ -331042,8 +331896,10 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-ui";
-      version = "1.43.2";
-      sha256 = "1xz5ndkg5mci689n82dnmwhhr8a08qw12czsf4b82ha7zlmbkmnv";
+      version = "1.50.2";
+      sha256 = "1g9ygyj99mzr8x3xh4zyrqpivv4c35cadybgg0ihjxpvmz7vlz4n";
+      revision = "1";
+      editedCabalFile = "0n32y9p0z5vvsgpv601vqqir8qm0fkhppvn7aqmhy2450xgzcdrh";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -331069,6 +331925,7 @@ self: {
         process
         safe
         split
+        stm
         text
         text-zipper
         time
@@ -331080,88 +331937,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Terminal interface for the hledger accounting system";
-      license = lib.licenses.gpl3Plus;
-      mainProgram = "hledger-ui";
-      maintainers = [ lib.maintainers.maralorn ];
-    }
-  ) { };
-
-  hledger-ui_1_50 = callPackage (
-    {
-      mkDerivation,
-      ansi-terminal,
-      async,
-      base,
-      brick,
-      cmdargs,
-      containers,
-      data-default,
-      directory,
-      doclayout,
-      extra,
-      filepath,
-      fsnotify,
-      githash,
-      hledger,
-      hledger-lib,
-      megaparsec,
-      microlens,
-      microlens-platform,
-      mtl,
-      process,
-      safe,
-      split,
-      text,
-      text-zipper,
-      time,
-      transformers,
-      unix,
-      vector,
-      vty,
-      vty-crossplatform,
-    }:
-    mkDerivation {
-      pname = "hledger-ui";
-      version = "1.50";
-      sha256 = "15kn2yy44jpn0ag6248z0cmp3rkbdcxbbr02am41jlg6igv9kqkq";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        ansi-terminal
-        async
-        base
-        brick
-        cmdargs
-        containers
-        data-default
-        directory
-        doclayout
-        extra
-        filepath
-        fsnotify
-        githash
-        hledger
-        hledger-lib
-        megaparsec
-        microlens
-        microlens-platform
-        mtl
-        process
-        safe
-        split
-        text
-        text-zipper
-        time
-        transformers
-        unix
-        vector
-        vty
-        vty-crossplatform
-      ];
-      executableHaskellDepends = [ base ];
-      description = "Terminal interface for the hledger accounting system";
-      license = lib.licenses.gpl3Plus;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "hledger-ui";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -331258,8 +332034,8 @@ self: {
     }:
     mkDerivation {
       pname = "hledger-web";
-      version = "1.43.2";
-      sha256 = "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd";
+      version = "1.50.2";
+      sha256 = "1hmqcnpc2wdkp2aysdy1872vcmji00b1s2rpv08fk8pcqsa3892v";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -331316,127 +332092,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Web user interface for the hledger accounting system";
-      license = lib.licenses.gpl3Plus;
-      mainProgram = "hledger-web";
-      maintainers = [ lib.maintainers.maralorn ];
-    }
-  ) { };
-
-  hledger-web_1_50 = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      base,
-      base64,
-      blaze-html,
-      blaze-markup,
-      bytestring,
-      case-insensitive,
-      clientsession,
-      cmdargs,
-      conduit,
-      conduit-extra,
-      containers,
-      data-default,
-      Decimal,
-      directory,
-      extra,
-      file-embed,
-      filepath,
-      githash,
-      hjsmin,
-      hledger,
-      hledger-lib,
-      hspec,
-      http-client,
-      http-conduit,
-      http-types,
-      megaparsec,
-      mtl,
-      network,
-      safe,
-      shakespeare,
-      template-haskell,
-      text,
-      time,
-      transformers,
-      unix-compat,
-      unordered-containers,
-      utf8-string,
-      wai,
-      wai-cors,
-      wai-extra,
-      wai-handler-launch,
-      warp,
-      yaml,
-      yesod,
-      yesod-core,
-      yesod-form,
-      yesod-static,
-      yesod-test,
-    }:
-    mkDerivation {
-      pname = "hledger-web";
-      version = "1.50";
-      sha256 = "04zmvlyij95v31v6p9124jicpgv7mbz2141j60ci18ci17r48fd8";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        aeson
-        base
-        base64
-        blaze-html
-        blaze-markup
-        bytestring
-        case-insensitive
-        clientsession
-        cmdargs
-        conduit
-        conduit-extra
-        containers
-        data-default
-        Decimal
-        directory
-        extra
-        file-embed
-        filepath
-        githash
-        hjsmin
-        hledger
-        hledger-lib
-        hspec
-        http-client
-        http-conduit
-        http-types
-        megaparsec
-        mtl
-        network
-        safe
-        shakespeare
-        template-haskell
-        text
-        time
-        transformers
-        unix-compat
-        unordered-containers
-        utf8-string
-        wai
-        wai-cors
-        wai-extra
-        wai-handler-launch
-        warp
-        yaml
-        yesod
-        yesod-core
-        yesod-form
-        yesod-static
-        yesod-test
-      ];
-      executableHaskellDepends = [ base ];
-      testHaskellDepends = [ base ];
-      description = "Web user interface for the hledger accounting system";
-      license = lib.licenses.gpl3Plus;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "hledger-web";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -331858,7 +332514,7 @@ self: {
         containers
       ];
       description = "GHC plugin for hlint";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332164,7 +332820,7 @@ self: {
         text
       ];
       description = "Provide Alternate Number Formats plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332177,7 +332833,7 @@ self: {
       version = "1.1.0.0";
       sha256 = "11hnkbpg13zvnq69svm46zm5k55yshgz97kjjx1g3jcb9ah1brm1";
       description = "Integration with the Brittany code formatter";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -332221,7 +332877,7 @@ self: {
         hls-test-utils
       ];
       description = "Integration with the cabal-fmt code formatter";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332300,7 +332956,7 @@ self: {
         transformers
       ];
       description = "Cabal integration plugin with Haskell Language Server";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332358,7 +333014,7 @@ self: {
         text
       ];
       description = "Call hierarchy plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -332407,7 +333063,7 @@ self: {
         text
       ];
       description = "Change a declarations type signature with a Code Action";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332420,7 +333076,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0jib2y256fb5b8wgsi9rjsdb3ywwpcbcnbbxmg6q3gwnglrdb1lx";
       description = "Class/instance management plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -332486,7 +333142,7 @@ self: {
         vector
       ];
       description = "HLS Plugin to support smart selection range and Folding range";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332583,7 +333239,7 @@ self: {
         text
       ];
       description = "Eval plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332622,7 +333278,7 @@ self: {
         transformers
       ];
       description = "Common utilities to interaction between ghc-exactprint and HLS plugins";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -332668,7 +333324,7 @@ self: {
         text
       ];
       description = "Show fixity explicitly while hovering";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332728,7 +333384,7 @@ self: {
         text
       ];
       description = "Explicit imports plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332783,7 +333439,7 @@ self: {
         text
       ];
       description = "Explicit record fields plugin for Haskell Language Server";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332796,7 +333452,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "1wyk88lynchhzriqj7m9ph0s2c2ivkqg1nmhgb1knkvp8ag27iik";
       description = "Integration with the Floskell code formatter";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -332851,7 +333507,7 @@ self: {
       ];
       testToolDepends = [ fourmolu ];
       description = "Integration with the Fourmolu code formatter";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -332864,7 +333520,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0aa602m024s3ch23np2iixmkwv6474va20bjdgiwdgc8vahg4grg";
       description = "Convert to GADT syntax plugin";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -332902,8 +333558,8 @@ self: {
     }:
     mkDerivation {
       pname = "hls-graph";
-      version = "2.11.0.0";
-      sha256 = "1mpf9vfnvxd03xhsywzb77g8rkvzj012jn6mz0rfmgvcls7kbgiw";
+      version = "2.12.0.0";
+      sha256 = "1z43wbyy41knmipc3yq8wg18nzbhygphk715xpmlg36xhgcwa85l";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -332942,7 +333598,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell Language Server internal graph API";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -332953,7 +333609,7 @@ self: {
       version = "2.2.0.0";
       sha256 = "0wp8hk5hwl43z5mjcas332z92y3zv9g8wrc5zhzli8pa37ab6r8x";
       description = "Haddock comments plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -332964,7 +333620,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0ix89wp8nq3iywh6d3w8j7lnfm2g3l9gks8sxkww0z0mfhfxvywc";
       description = "Hlint integration plugin with Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333007,7 +333663,7 @@ self: {
         hls-test-utils
       ];
       description = "Module name plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333068,7 +333724,7 @@ self: {
       ];
       testToolDepends = [ ormolu ];
       description = "Integration with the Ormolu code formatter";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333130,7 +333786,7 @@ self: {
         text
       ];
       description = "Overloaded record dot plugin for Haskell Language Server";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333184,8 +333840,8 @@ self: {
     }:
     mkDerivation {
       pname = "hls-plugin-api";
-      version = "2.11.0.0";
-      sha256 = "1jn75zq4nqaml6rzzilaszqy0z4nj6bz5y9svddpl276qw1mcbm8";
+      version = "2.12.0.0";
+      sha256 = "1s13cyvzndf2rlhxdw9kbhj2yrzjlxx2hq9b3gwdd1wrfn0ix1r1";
       libraryHaskellDepends = [
         aeson
         base
@@ -333243,7 +333899,7 @@ self: {
         random-fu
       ];
       description = "Haskell Language Server API for plugin communication";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333295,7 +333951,7 @@ self: {
         text
       ];
       description = "Pragmas plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333348,7 +334004,7 @@ self: {
         text
       ];
       description = "A Haskell Language Server plugin that qualifies imported names";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333361,7 +334017,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "0lqy7c3vqn832gs9z86n4clsqb6g73rhnlrvn3sg3h8hkxasfzjf";
       description = "Exactprint refactorings for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333408,7 +334064,7 @@ self: {
         text
       ];
       description = "Refine imports plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333421,7 +334077,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "15gjh7r9cc43yz1zp52q349fag4nxv25vhzn5pdma4ch366xyr4g";
       description = "Rename plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333432,7 +334088,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "11cl4q79jxl73s62ccdarp1570k95picgn3q8lgnqznc6ywdv3zh";
       description = "Retrie integration plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333487,7 +334143,7 @@ self: {
         text
       ];
       description = "HLS Plugin to support smart selection range";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -333572,7 +334228,7 @@ self: {
         text-rope
       ];
       description = "Call hierarchy plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -333584,7 +334240,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "00fx8rxdnmam0672vb0az2lw5inqyc22cjfrh8wiwx36i28r8zqj";
       description = "HLS Plugin to expand TemplateHaskell Splices and QuasiQuotes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333595,7 +334251,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "1zhw2ysf5ccsrz1vahff6hr683b581v4py2pyf9xfnjfay5gl0id";
       description = "Stan integration plugin with Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333606,7 +334262,7 @@ self: {
       version = "2.6.0.0";
       sha256 = "171068mmb7sdk14s5v794jc0n0mrrq8fkzp2z2wlrmk38mqi3773";
       description = "Integration with the Stylish Haskell code formatter";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333617,7 +334273,7 @@ self: {
       version = "2.2.0.0";
       sha256 = "05rgapkpr3giln245aswlcgwqpfglifsjq1n8sgwgi04bn2w6vng";
       description = "Wingman plugin for Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -333639,8 +334295,8 @@ self: {
       lsp,
       lsp-test,
       lsp-types,
-      neat-interpolation,
       safe-exceptions,
+      string-interpolate,
       tasty,
       tasty-expected-failure,
       tasty-golden,
@@ -333652,8 +334308,8 @@ self: {
     }:
     mkDerivation {
       pname = "hls-test-utils";
-      version = "2.11.0.0";
-      sha256 = "11rswiw1zlsgjjfs78hl73axrwr9lmd334iyla4k98ak6gxllqr6";
+      version = "2.12.0.0";
+      sha256 = "0wqabmas8wkif93ffqw0818v6iha80c1vlr2jqxd86vkbpnl55ig";
       libraryHaskellDepends = [
         aeson
         async
@@ -333670,8 +334326,8 @@ self: {
         lsp
         lsp-test
         lsp-types
-        neat-interpolation
         safe-exceptions
+        string-interpolate
         tasty
         tasty-expected-failure
         tasty-golden
@@ -333682,7 +334338,7 @@ self: {
         text-rope
       ];
       description = "Utilities used in the tests of Haskell Language Server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -334883,7 +335539,7 @@ self: {
       ];
       doHaddock = false;
       description = "Hidden Markov Models using LAPACK primitives";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -334955,8 +335611,8 @@ self: {
     }:
     mkDerivation {
       pname = "hmp3-ng";
-      version = "2.16.2";
-      sha256 = "0n46rjl52vcwmliqaisi6jw9b4phwdcy5b60sq71k76zfhhffybn";
+      version = "2.17.0";
+      sha256 = "131mwn1vcyd2q73cj00vx8silhnacb9nbiba20c6i95kgsblnm0s";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -334977,7 +335633,7 @@ self: {
       ];
       executableSystemDepends = [ ncurses ];
       description = "A 2019 fork of an ncurses mp3 player written in Haskell";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "hmp3";
     }
   ) { inherit (pkgs) ncurses; };
@@ -334996,7 +335652,7 @@ self: {
       libraryHaskellDepends = [ base ];
       librarySystemDepends = [ mpfr ];
       description = "Haskell binding to the MPFR library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) mpfr; };
 
@@ -335058,7 +335714,7 @@ self: {
         time
       ];
       description = "Haskell Music Theory";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -335104,7 +335760,7 @@ self: {
         time
       ];
       description = "Haskell Music Theory Base";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -335447,7 +336103,7 @@ self: {
         time
       ];
       description = "Haskell implementation of the Nix language";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hnix";
       maintainers = [
         lib.maintainers.Anton-Latukha
@@ -335549,7 +336205,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Core effects for interacting with the Nix store";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [
         lib.maintainers.Anton-Latukha
         lib.maintainers.sorki
@@ -335631,7 +336287,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Core types used for interacting with the Nix store";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       maintainers = [
         lib.maintainers.Anton-Latukha
@@ -335662,8 +336318,8 @@ self: {
     }:
     mkDerivation {
       pname = "hnix-store-db";
-      version = "0.1.0.0";
-      sha256 = "1g3wpmjnbzhllw5q85zp1ckkqhlhhmpbm9lq1bd8ax8vq8kzx97v";
+      version = "0.1.0.1";
+      sha256 = "1m6b601cs47rr0v2vbgskhb27i03fp90i914q1wiicf2jlwlk88j";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -335686,9 +336342,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Nix store database support";
-      license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -335730,7 +336384,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "JSON serialization for core types";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -335803,7 +336457,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "NAR file format";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -335847,7 +336501,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Read-only Nix store";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -335890,7 +336544,7 @@ self: {
         unordered-containers
       ];
       description = "Remote hnix store";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [
         lib.maintainers.Anton-Latukha
         lib.maintainers.sorki
@@ -335982,7 +336636,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Remote hnix store";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       maintainers = [
         lib.maintainers.Anton-Latukha
@@ -336040,7 +336694,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Test utilities and instances";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -336309,7 +336963,7 @@ self: {
         stm
       ];
       description = "Simple tools for communicating sequential processes";
-      license = lib.licenses.zlib;
+      license = lib.licensesSpdx."Zlib";
     }
   ) { };
 
@@ -336415,7 +337069,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell OAuth2 authentication client";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -336473,7 +337127,7 @@ self: {
         warp
       ];
       description = "hoauth2 demo application";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hoauth2-demo";
       broken = true;
@@ -336532,7 +337186,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "OAuth2 Identity Providers";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -336574,7 +337228,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "tutorial for hoauth2-providers module";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hoauth2-providers-tutorial";
       broken = true;
@@ -336616,7 +337270,7 @@ self: {
         uri-bytestring
       ];
       description = "Tutorial for using hoauth2";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -336812,7 +337466,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "OpenOCD Haskell interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hocd-read-mem";
     }
   ) { };
@@ -337553,8 +338207,8 @@ self: {
     }:
     mkDerivation {
       pname = "holidays";
-      version = "0.2.0.0";
-      sha256 = "1nxhmpn54q58k4wldlbfnvniwdf914bxyz6bnqdsrnmdmhvrh8cf";
+      version = "0.3.0.0";
+      sha256 = "0av50g2j2ji42cg37lbnr7mwf99ml8sw4asxpd77ahwdscw9hflk";
       libraryHaskellDepends = [
         base
         containers
@@ -337571,7 +338225,7 @@ self: {
         time
       ];
       description = "Library for country public holidays";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -337634,7 +338288,7 @@ self: {
         tasty-discover
       ];
       description = "Tools and combinators for solving constraint problems";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -337808,7 +338462,7 @@ self: {
         text
       ];
       description = "Client library for the Home Assistant API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ha-client";
     }
   ) { };
@@ -337940,7 +338594,7 @@ self: {
         single-tuple
       ];
       description = "Homotuple, all whose elements are the same type";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -339037,7 +339691,7 @@ self: {
         stm
       ];
       description = "Abstraction over creating network connections with SOCKS5 and TLS";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -339359,7 +340013,7 @@ self: {
         happy
       ];
       description = "hOpenPGP-based command-line tools";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -339831,8 +340485,8 @@ self: {
     }:
     mkDerivation {
       pname = "hora";
-      version = "2.2.0";
-      sha256 = "13i3z71xkyisgjms6g48hzgyva3dp83lk9m139ivysscgyr1a1pq";
+      version = "2.2.1";
+      sha256 = "0j6xbijmyv52i4051dp8zgjwlxvxdpmihjljzsf64s0zaxdamrlq";
       libraryHaskellDepends = [
         base
         binary
@@ -339928,7 +340582,7 @@ self: {
       ];
       doHaddock = false;
       description = "Higher Order Reverse Derivatives Efficiently - Automatic Differentiation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -340010,7 +340664,7 @@ self: {
         sydtest
       ];
       description = "Generate nix expressions from horizon-spec definitions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -340043,7 +340697,7 @@ self: {
         th-lift
       ];
       description = "Horizon Stable Package Set Type Definitions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -340066,7 +340720,7 @@ self: {
         lens
       ];
       description = "Horizon Stable Package Set Lenses";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -340099,7 +340753,7 @@ self: {
         text
       ];
       description = "Horizon Stable Package Set Pretty Printer";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -340169,7 +340823,7 @@ self: {
         unliftio
       ];
       description = "horizontal rule for the terminal";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "hr";
     }
   ) { };
@@ -340244,7 +340898,7 @@ self: {
         transformers
       ];
       description = "Haskell Open Sound Control";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -340367,7 +341021,7 @@ self: {
         text
       ];
       description = "Network Host Addresses";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -340527,6 +341181,7 @@ self: {
         unordered-containers
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "hotel";
     }
   ) { };
@@ -341970,7 +342625,7 @@ self: {
         time
       ];
       description = "Code Coverage Library for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -342310,7 +342965,7 @@ self: {
         utf8-string
       ];
       description = "A tool for looking through PDF file using Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hpdft";
       broken = true;
@@ -342690,7 +343345,7 @@ self: {
         vector
       ];
       description = "Haskell bindings to libpqtypes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) libpq; };
 
@@ -342727,7 +343382,7 @@ self: {
         text
       ];
       description = "Adaptation of the hpqtypes library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -342789,7 +343444,7 @@ self: {
         tasty-bench
       ];
       description = "Extra utilities for hpqtypes library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -343351,7 +344006,7 @@ self: {
         hspec-expectations
       ];
       description = "Quantitative Library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) gsl; };
@@ -343380,7 +344035,7 @@ self: {
         random
       ];
       description = "A library for simulating quantum circuits";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hqcsim-exe";
       broken = true;
@@ -343446,7 +344101,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
-      license = lib.licenses.lgpl3Only;
+      license = lib.licensesSpdx."LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mctest";
       broken = true;
@@ -343468,7 +344123,7 @@ self: {
         time
       ];
       description = "HQuantLib Time is a business calendar functions extracted from HQuantLib";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
     }
   ) { };
 
@@ -344065,8 +344720,8 @@ self: {
         }:
         mkDerivation {
           pname = "hs-asapo";
-          version = "0.9.1";
-          sha256 = "0rmmmxfpx2s69jca5rd7jnxb075qjx6b6s97vnsd1gvgcjwal2li";
+          version = "0.9.2";
+          sha256 = "1adggnrf6i0vm7gq343ja6cvcll1mz4cq0ljlhda1y1c9iqpwhc9";
           setupHaskellDepends = [
             base
             cabal-doctest
@@ -344099,7 +344754,7 @@ self: {
             time
           ];
           description = "Haskell bindings for ASAP:O";
-          license = lib.licenses.mit;
+          license = lib.licensesSpdx."MIT";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -344420,7 +345075,7 @@ self: {
         void
       ];
       description = "Conllu validating parser and utils";
-      license = lib.licenses.lgpl3Only;
+      license = lib.licensesSpdx."LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-conllu";
       broken = true;
@@ -344810,7 +345465,7 @@ self: {
         hspec
       ];
       description = "A tool to highlight terminal strings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "test-exe";
     }
   ) { };
@@ -345160,7 +345815,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libonnxruntime ];
       description = "Low-level bindings for ONNX Runtime";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -345227,8 +345882,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-api";
-      version = "0.2.0.0";
-      sha256 = "0hz7qsdqxv63zaj8pihgm4d7bx665zzzlxihr671wbcfl29wik5n";
+      version = "0.3.0.0";
+      sha256 = "0iksazlv4v7shzkq55cnxbvg9ln1gyzjbmngkhnw1hympi7bg2cz";
       libraryHaskellDepends = [
         async
         attoparsec
@@ -345338,6 +345993,8 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345360,6 +346017,8 @@ self: {
         unagi-chan
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345371,6 +346030,7 @@ self: {
       case-insensitive,
       hs-opentelemetry-api,
       hs-opentelemetry-otlp,
+      hs-opentelemetry-propagator-w3c,
       http-client,
       http-conduit,
       http-types,
@@ -345383,14 +346043,15 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-exporter-otlp";
-      version = "0.1.0.0";
-      sha256 = "0qzqr89amg1xvzbmfdnq7dmjd0gybdw668xnpkkj3ig4d96ir03i";
+      version = "0.1.0.1";
+      sha256 = "1l0ggy1xybshl663p43m1maxbljcyh19dshxbrzmacsqb6mc6pqa";
       libraryHaskellDepends = [
         base
         bytestring
         case-insensitive
         hs-opentelemetry-api
         hs-opentelemetry-otlp
+        hs-opentelemetry-propagator-w3c
         http-client
         http-conduit
         http-types
@@ -345455,7 +346116,7 @@ self: {
         unordered-containers
       ];
       description = "Plugin for instrumenting an application";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -345486,6 +346147,7 @@ self: {
         wai
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -345508,6 +346170,8 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345532,6 +346196,8 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345572,6 +346238,7 @@ self: {
         unordered-containers
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -345606,6 +346273,8 @@ self: {
         vault
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345640,6 +346309,8 @@ self: {
         unordered-containers
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345678,6 +346349,8 @@ self: {
         text
       ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345711,6 +346384,8 @@ self: {
       ];
       description = "WAI instrumentation middleware for OpenTelemetry";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -345746,6 +346421,7 @@ self: {
       ];
       description = "Yesod middleware for providing OpenTelemetry instrumentation";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -345757,8 +346433,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-otlp";
-      version = "0.1.0.0";
-      sha256 = "1g9accvfcdn86m2y18imnmj4n73pbs1mncwg4s5jni1fzjg9f45r";
+      version = "0.1.1.0";
+      sha256 = "1qghv5j4br5lkrkndajljfvsmv9cbz38q3z72bmfpxp4n6jykj89";
       libraryHaskellDepends = [
         base
         proto-lens-runtime
@@ -345780,8 +346456,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-propagator-b3";
-      version = "0.0.1.2";
-      sha256 = "1hb1ls0xykp1b2vnjwrfxj33plx24f794s7wp09693d6hwaqxx84";
+      version = "0.0.1.3";
+      sha256 = "0rbzfcg99gsqk3yxxnszkhsn8prcz1nffchgfr959qzjih5ljhj1";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -345813,8 +346489,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-propagator-datadog";
-      version = "0.0.1.0";
-      sha256 = "0sxfcswmwf4bnsyj0d67j32yi32gwhm4c6fs9mcl2wnax2vdwk7n";
+      version = "0.0.1.1";
+      sha256 = "1izsp6jw46i6999jnzgi189v62640rkfxi72m3sm3bs187fwgcw7";
       libraryHaskellDepends = [
         base
         bytestring
@@ -345842,7 +346518,7 @@ self: {
         primitive
       ];
       description = "Datadog Propagator for OpenTelemetry";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -345853,19 +346529,35 @@ self: {
       base,
       bytestring,
       hs-opentelemetry-api,
+      hspec,
+      hspec-discover,
       http-types,
+      QuickCheck,
+      text,
     }:
     mkDerivation {
       pname = "hs-opentelemetry-propagator-w3c";
-      version = "0.0.1.4";
-      sha256 = "0f0fagrsyxhpd2qsbgzkgxzx5hzasplly12c2qjdd8g2ylh8szw1";
+      version = "0.1.0.0";
+      sha256 = "1y4avgvp9fm4z9qrr51glhhks3np6ca33i2adjh09ilxczqlbsg3";
       libraryHaskellDepends = [
         attoparsec
         base
         bytestring
         hs-opentelemetry-api
         http-types
+        text
       ];
+      testHaskellDepends = [
+        attoparsec
+        base
+        bytestring
+        hs-opentelemetry-api
+        hspec
+        hspec-discover
+        QuickCheck
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
       description = "Trace propagation via HTTP headers following the w3c tracestate spec";
       license = lib.licenses.bsd3;
     }
@@ -345898,8 +346590,8 @@ self: {
     }:
     mkDerivation {
       pname = "hs-opentelemetry-sdk";
-      version = "0.1.0.0";
-      sha256 = "08zjfvfnsgsxc73jlgjizr8m2w152hny0myns4m78sjzj53733x1";
+      version = "0.1.0.1";
+      sha256 = "0wdlj4gn0mq3naf0wvn81q97sifw774868wv4yyyy5diwd3hyxk5";
       libraryHaskellDepends = [
         async
         base
@@ -345956,6 +346648,8 @@ self: {
       ];
       testHaskellDepends = [ base ];
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -346416,7 +347110,7 @@ self: {
         hspec
       ];
       description = "Read and write SAM, BAM, and CRAM files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -346523,7 +347217,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Terminal Emulator written in Haskell, SDL2 Backend";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-sdl-term-emulator";
     }
@@ -346626,7 +347320,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Convert an eventlog into the speedscope json format";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hs-speedscope";
     }
   ) { };
@@ -346733,7 +347427,7 @@ self: {
         warp
       ];
       description = "Bindings to the Tango Controls system";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -346783,7 +347477,7 @@ self: {
         criterion
       ];
       description = "Terminal Emulator written in 100% Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -346811,7 +347505,7 @@ self: {
       ];
       doHaddock = false;
       description = "High-level bindings for tree-sitter";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -346842,7 +347536,7 @@ self: {
         tree-sitter-while
       ];
       description = "Low-level bindings for tree-sitter";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -347952,7 +348646,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Haskell bindings to BLST";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -348046,7 +348740,7 @@ self: {
         vector
       ];
       description = "Haskell SuperCollider";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -348958,7 +349652,7 @@ self: {
         text
       ];
       description = "Haskell bindings to the libcdio disc-reading library";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -349456,7 +350150,7 @@ self: {
         time
       ];
       description = "Haskell shell script templates";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -349935,7 +350629,7 @@ self: {
         text
       ];
       description = "Core package representing Haskell advisories";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -350007,7 +350701,7 @@ self: {
         time
       ];
       description = "Synchronize with the Haskell security advisory database";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hsec-sync";
     }
   ) { };
@@ -350140,7 +350834,7 @@ self: {
         toml-parser
       ];
       description = "Tools for working with the Haskell security advisory database";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsec-tools";
       broken = true;
@@ -350239,7 +350933,7 @@ self: {
         tls
       ];
       description = "sendxmpp clone, sending XMPP messages via CLI";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       mainProgram = "hsendxmpp";
     }
   ) { };
@@ -350590,7 +351284,7 @@ self: {
         yaml
       ];
       description = "A SFTP client tool for secure file transfer operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsftp";
       broken = true;
@@ -350920,7 +351614,7 @@ self: {
         tasty-th
       ];
       description = "ini configuration files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -350966,7 +351660,7 @@ self: {
         transformers
       ];
       description = "Inspect Haskell source files";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsinspect";
       broken = true;
@@ -351056,7 +351750,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "LSP interface over the hsinspect binary";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsinspect-lsp";
     }
@@ -351104,12 +351798,12 @@ self: {
         transformers
       ];
       description = "Install Haskell software";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       mainProgram = "hsinstall";
     }
   ) { };
 
-  hsinstall_2_9 = callPackage (
+  hsinstall_2_10 = callPackage (
     {
       mkDerivation,
       base,
@@ -351119,16 +351813,16 @@ self: {
       filepath,
       formatting,
       heredoc,
-      optparse-applicative,
-      prettyprinter,
+      optparse-applicative-dex,
       process,
       safe-exceptions,
+      text,
       transformers,
     }:
     mkDerivation {
       pname = "hsinstall";
-      version = "2.9";
-      sha256 = "0lnby8681spli3qr43mybhcj6l2klfphfzja2gnapqwcm7d894r1";
+      version = "2.10";
+      sha256 = "088xdvjkbdazsfm3gvlpalyxqgy8kwa5rfz3m0f9m394c8kf2yvi";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -351144,14 +351838,14 @@ self: {
         filepath
         formatting
         heredoc
-        optparse-applicative
-        prettyprinter
+        optparse-applicative-dex
         process
         safe-exceptions
+        text
         transformers
       ];
       description = "Install Haskell software";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hsinstall";
     }
@@ -351534,7 +352228,7 @@ self: {
         text
       ];
       description = "Bindings to Lua, an embeddable scripting language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351583,7 +352277,7 @@ self: {
         text
       ];
       description = "Bindings to Lua, an embeddable scripting language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -351647,7 +352341,7 @@ self: {
         vector
       ];
       description = "Allow aeson data types to be used with Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351699,7 +352393,7 @@ self: {
         text
       ];
       description = "Type classes for HsLua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351732,7 +352426,7 @@ self: {
         unix
       ];
       description = "Command-line interface for Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351779,7 +352473,7 @@ self: {
         text
       ];
       description = "Bindings to Lua, an embeddable scripting language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351806,7 +352500,7 @@ self: {
         text
       ];
       description = "Examples of how to combine Haskell and Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351835,7 +352529,7 @@ self: {
         tasty-lua
       ];
       description = "Opinionated, but extensible Lua list type";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351884,7 +352578,7 @@ self: {
         text
       ];
       description = "Marshalling of values between Haskell and Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351919,7 +352613,7 @@ self: {
         text
       ];
       description = "Lua module wrapping Text.DocLayout.";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -351960,7 +352654,7 @@ self: {
         text
       ];
       description = "Lua module to work with file paths";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352005,7 +352699,7 @@ self: {
         text
       ];
       description = "Lua module wrapper around Haskell's System module";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352032,6 +352726,8 @@ self: {
       pname = "hslua-module-system";
       version = "1.2.3";
       sha256 = "125d50q90l9w35aqgwgbv2bdmj65zlvn7pxlwrg1nr2j4bnfmyjk";
+      revision = "1";
+      editedCabalFile = "19bv56i9xpsx5xfl7k411sbbnrl4sxp8hnm1a96iqpk22g3dqv5l";
       libraryHaskellDepends = [
         base
         bytestring
@@ -352055,7 +352751,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module wrapper around Haskell's System module";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -352093,7 +352789,7 @@ self: {
         text
       ];
       description = "Lua module for text";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352134,7 +352830,7 @@ self: {
         text
       ];
       description = "Lua module to work with version specifiers";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352159,6 +352855,8 @@ self: {
       pname = "hslua-module-zip";
       version = "1.1.4";
       sha256 = "1ij2rmy8m4pw7k7w5vvb3g934kms60vhzhhp8kryknbi6bsg8lsy";
+      revision = "1";
+      editedCabalFile = "0i3cvy1g1byx3ajrc608ixz7crgbxmdngabwlrkyp899m6pmlv1i";
       libraryHaskellDepends = [
         base
         hslua-core
@@ -352180,7 +352878,7 @@ self: {
         tasty-lua
       ];
       description = "Lua module to work with file zips";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352238,7 +352936,7 @@ self: {
         text
       ];
       description = "Object orientation tools for HsLua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352277,7 +352975,7 @@ self: {
         tasty-hslua
       ];
       description = "Object orientation tools for HsLua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -352326,7 +353024,7 @@ self: {
         text
       ];
       description = "Utilities to build Lua modules";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352369,7 +353067,7 @@ self: {
         text
       ];
       description = "Utilities to build Lua modules";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -352399,7 +353097,7 @@ self: {
         text
       ];
       description = "Isocline-based Lua REPL";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -352441,7 +353139,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Type specifiers for Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -353234,8 +353932,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec";
-      version = "2.11.12";
-      sha256 = "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip";
+      version = "2.11.14";
+      sha256 = "13zzcrjc6537f848c7b39bn61iwlniiymzjsbn5kfrx6hhxlgb6i";
       libraryHaskellDepends = [
         base
         hspec-core
@@ -353286,8 +353984,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-api";
-      version = "2.11.12";
-      sha256 = "1xn2b2hafyq6qm3zaia9nw27ir4cg8v2qn499bz2zwnp2vkjra07";
+      version = "2.11.14";
+      sha256 = "1cgbqnk2dayys12xm7klcxljivkrs6cv522vv7vdlpyslhhayw28";
       libraryHaskellDepends = [
         base
         hspec-core
@@ -353448,10 +354146,10 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-core";
-      version = "2.11.12";
-      sha256 = "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc";
+      version = "2.11.14";
+      sha256 = "0hnbvcjkylims4xcmajhmwaicnalgi5a93ayk47gvc5z02pgs299";
       revision = "1";
-      editedCabalFile = "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq";
+      editedCabalFile = "0s41xy88mkbxhbf93gdxb23vxr4vaip58519j2c8slz6cmvs0mq5";
       libraryHaskellDepends = [
         ansi-terminal
         array
@@ -353561,8 +354259,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-discover";
-      version = "2.11.12";
-      sha256 = "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp";
+      version = "2.11.14";
+      sha256 = "1bj3nln0cblrhwy7rjnr9qk068mkmn5wzxkh5sr32vm20nr1frwd";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -353871,7 +354569,7 @@ self: {
         hspec-core
       ];
       description = "A Formatter for hspec that provides Github Actions Annotations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -353892,6 +354590,8 @@ self: {
       pname = "hspec-golden";
       version = "0.2.2.0";
       sha256 = "1wpn9ll8x3gr0y86f5s9266x94jlc6hh778vc0npdynabipirwbs";
+      revision = "1";
+      editedCabalFile = "07n1fyqq1caaky2bn5d410srg6bfcmyxlcxr5vpsjhxcmbic1dca";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -354188,37 +354888,6 @@ self: {
     }
   ) { };
 
-  hspec-megaparsec_2_2_0 = callPackage (
-    {
-      mkDerivation,
-      base,
-      containers,
-      hspec,
-      hspec-expectations,
-      megaparsec,
-    }:
-    mkDerivation {
-      pname = "hspec-megaparsec";
-      version = "2.2.0";
-      sha256 = "0hyf06gzzqd6sqd76crwxycwgx804sd39z7i0c2vmv1qgsxv82gn";
-      libraryHaskellDepends = [
-        base
-        containers
-        hspec-expectations
-        megaparsec
-      ];
-      testHaskellDepends = [
-        base
-        hspec
-        hspec-expectations
-        megaparsec
-      ];
-      description = "Utility functions for testing Megaparsec parsers with Hspec";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   hspec-megaparsec = callPackage (
     {
       mkDerivation,
@@ -354242,7 +354911,7 @@ self: {
         megaparsec
       ];
       description = "Utility functions for testing Megaparsec parsers with Hspec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -354271,10 +354940,10 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-meta";
-      version = "2.11.12";
-      sha256 = "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69";
+      version = "2.11.14";
+      sha256 = "1mi1sfmxqf01dxkw8c56ywiclnl1pk6m5g1cj53w3mq8j7mywqz5";
       revision = "2";
-      editedCabalFile = "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d";
+      editedCabalFile = "0iylscmcm5052sqa3xaikiqrlfaqs9cn82r777g43l6wgbzzsxi4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -354836,7 +355505,7 @@ self: {
         hspec-core
       ];
       description = "Table-driven (by-example) HSpec tests";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -354943,7 +355612,7 @@ self: {
         tmp-proc
       ];
       description = "Simplify use of tmp-proc from hspec tests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -355118,8 +355787,8 @@ self: {
     }:
     mkDerivation {
       pname = "hspec-yesod";
-      version = "0.1.0";
-      sha256 = "1ixra4fdfrihlnigqs63xwyrl7ab4kwl7klmhv6xfvprs798g4mb";
+      version = "0.2.0.1";
+      sha256 = "1kil6gggr1q2wnngkgb5a47ay2drdqk9lz0fxa68lhiq814i7a8z";
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -355444,7 +356113,7 @@ self: {
         doctest
       ];
       description = "My opinionated Haskell project formatter";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hspretty";
       broken = true;
@@ -355653,8 +356322,8 @@ self: {
         }:
         mkDerivation {
           pname = "hsqml";
-          version = "0.3.6.1";
-          sha256 = "0wvnxc3kad9ja4s16n9nj6nqknckal93ifbprq6nwd0x5i6zvknm";
+          version = "0.3.7.0";
+          sha256 = "1r4mf15gnfghmjdpkxn33ibc1diyfpzdfj54i4h10sjfnx6xg895";
           setupHaskellDepends = [
             base
             Cabal
@@ -355665,9 +356334,7 @@ self: {
             base
             bytestring
             containers
-            directory
             filepath
-            QuickCheck
             tagged
             text
             transformers
@@ -355686,7 +356353,7 @@ self: {
             text
           ];
           description = "Haskell binding for Qt Quick";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
         }
       )
@@ -355989,7 +356656,7 @@ self: {
         utf8-string
       ];
       description = "RELP (Reliable Event Logging Protocol) server implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -356094,7 +356761,7 @@ self: {
         unix
       ];
       description = "Using Haskell for Unix shell scripting tasks";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -357187,7 +357854,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bindings to TagLib, audio meta-data library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) taglib; };
 
@@ -357686,7 +358353,7 @@ self: {
         unordered-containers
       ];
       description = "A codec library for HTML-escaped text and HTML-entities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -358153,7 +358820,7 @@ self: {
         text
       ];
       description = "Use htmx with various haskell libraries";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -358176,7 +358843,7 @@ self: {
         text
       ];
       description = "Use htmx with lucid";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -358203,7 +358870,7 @@ self: {
         text
       ];
       description = "Use htmx with servant";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -358427,7 +359094,7 @@ self: {
         vector
       ];
       description = "Parse TOML values produced by htoml-megaparsec package";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -358470,7 +359137,7 @@ self: {
         th-compat
       ];
       description = "a library to build and work with heterogeneous, type level indexed rose trees";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -358800,17 +359467,15 @@ self: {
         text
       ];
       description = "Code for using the ip package with http-api-data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
   http-api-data-qq = callPackage (
     {
       mkDerivation,
-      aeson,
       base,
       bytestring,
-      containers,
       http-api-data,
       http-client,
       tasty,
@@ -358821,10 +359486,8 @@ self: {
     }:
     mkDerivation {
       pname = "http-api-data-qq";
-      version = "0.1.0.0";
-      sha256 = "1lvfdbprdwq09k1wkjfvvkpi79053dc4kzkv4g1cx94qb1flbd7a";
-      revision = "6";
-      editedCabalFile = "06bl99wxwb9g5rnkjqgbmb6187gjr821falc78daqc7c9vdp2nv5";
+      version = "0.1.0.1";
+      sha256 = "1dah5sgmqls4x17drs3x2sz7gxx8jlh86yjdsahkq5kjv2jshy1n";
       libraryHaskellDepends = [
         base
         http-api-data
@@ -358832,10 +359495,8 @@ self: {
         text
       ];
       testHaskellDepends = [
-        aeson
         base
         bytestring
-        containers
         http-api-data
         http-client
         tasty
@@ -358899,7 +359560,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "a library to make http requests without worrying much";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -359373,7 +360034,7 @@ self: {
         temporary
       ];
       description = "http-client TLS backend using Rustls";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -359536,7 +360197,7 @@ self: {
         websockets
       ];
       description = "Glue code for http-client and websockets";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
     }
   ) { };
 
@@ -359793,7 +360454,7 @@ self: {
         zlib
       ];
       description = "HTTP downloader tailored for web-crawler needs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -360124,7 +360785,7 @@ self: {
       ];
       doHaddock = false;
       description = "Perform HTTP Requests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -360172,7 +360833,7 @@ self: {
       ];
       doHaddock = false;
       description = "Instantiations of http-exchange";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -360195,7 +360856,7 @@ self: {
         bytestring
       ];
       description = "Attoparsec-based parsers for the RFC-2616 HTTP grammar rules";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -360241,7 +360902,7 @@ self: {
         tasty-golden
       ];
       description = "Types and serialization for HTTP";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -361143,7 +361804,7 @@ self: {
         utf8-string
       ];
       description = "HTTP senmatics libarry";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -361453,7 +362114,7 @@ self: {
         text
       ];
       description = "Generic HTTP types for Haskell (for both client and server code)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -361928,7 +362589,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "HTTP/3 library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -362511,17 +363172,15 @@ self: {
     }:
     mkDerivation {
       pname = "huffman";
-      version = "1.0.1";
-      sha256 = "191llv4s64jrh8cma43r5z740avd5picja5fr45l4mi2gwmkx4s3";
+      version = "1.0.2";
+      sha256 = "1a3s9hrw4w0rcp0jqq7ww4mq8ay88lr0kk0fgl87lk3yb18fr7yp";
       libraryHaskellDepends = [
         base
         containers
         fingertree
       ];
       description = "Pure Haskell implementation of the Huffman encoding algorithm";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -362605,7 +363264,7 @@ self: {
         doctest-parallel
       ];
       description = "uiua port";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -362791,7 +363450,7 @@ self: {
         witherable
       ];
       description = "A TUI MPD client, inspired by ncmpcpp";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hum";
       broken = true;
@@ -362890,7 +363549,7 @@ self: {
         text
       ];
       description = "Redefinition-free prelude alternative";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -364054,7 +364713,7 @@ self: {
         hspec-discover
       ];
       description = "Convenience functions for Aeson";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -364139,7 +364798,7 @@ self: {
         hw-xml
       ];
       description = "Demo library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -364269,7 +364928,7 @@ self: {
       ];
       doHaddock = false;
       description = "Balanced parentheses";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-balancedparens";
     }
@@ -364332,7 +364991,7 @@ self: {
         vector
       ];
       description = "Bit manipulation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -364369,7 +365028,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "CI Assistant for Haskell projects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-ci-assist";
       broken = true;
@@ -364434,7 +365093,7 @@ self: {
         vector
       ];
       description = "Conduits for tokenizing streams";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -364475,7 +365134,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Additional merges and joins for Conduit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -364502,7 +365161,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "Diagnostics library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -364628,7 +365287,7 @@ self: {
         vector
       ];
       description = "Unbelievably fast streaming DSV file parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-dsv";
       broken = true;
@@ -364713,7 +365372,7 @@ self: {
         vector
       ];
       description = "File Dump";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-dump";
       broken = true;
@@ -364821,7 +365480,7 @@ self: {
         vector
       ];
       description = "Elias-Fano";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-eliasfano";
     }
@@ -364884,7 +365543,7 @@ self: {
         vector
       ];
       description = "Excess";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -364927,7 +365586,7 @@ self: {
         hspec-discover
       ];
       description = "Generic finger-tree structure, with example instances";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -364976,7 +365635,7 @@ self: {
         hspec-discover
       ];
       description = "Generic strict finger-tree structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -365009,7 +365668,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "Extra hedgehog functionality";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -365056,7 +365715,7 @@ self: {
         hspec-discover
       ];
       description = "Interoperability between hspec and hedgehog";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -365093,7 +365752,7 @@ self: {
         hspec-discover
       ];
       description = "Additional facilities for Integers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -365165,7 +365824,7 @@ self: {
       ];
       doHaddock = false;
       description = "Library for manipulating IP addresses and CIDR blocks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-ip";
     }
@@ -365303,7 +365962,7 @@ self: {
       ];
       doHaddock = false;
       description = "Memory efficient JSON parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json";
     }
@@ -365351,7 +366010,7 @@ self: {
       ];
       doHaddock = false;
       description = "Memory efficient JSON parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -365426,7 +366085,7 @@ self: {
         lens
       ];
       description = "Lens for hw-json";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -365479,7 +366138,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "SIMD-based JSON semi-indexer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json-simd";
       broken = true;
@@ -365574,7 +366233,7 @@ self: {
         mmap
       ];
       description = "Memory efficient JSON parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json";
     }
@@ -365675,7 +366334,7 @@ self: {
         mmap
       ];
       description = "Memory efficient JSON parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-json-standard-cursor";
     }
@@ -365741,7 +366400,7 @@ self: {
         hw-hspec-hedgehog
       ];
       description = "Avro support for Kafka infrastructure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -365792,7 +366451,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Kafka bindings for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { inherit (pkgs) rdkafka; };
 
@@ -365851,7 +366510,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Conduit bindings for hw-kafka-client";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -365896,7 +366555,7 @@ self: {
         hspec-discover
       ];
       description = "Combinators for lazy IO";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -365944,7 +366603,7 @@ self: {
         hspec-discover
       ];
       description = "Monadic query DSL";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hw-mquery-example";
     }
   ) { };
@@ -366026,7 +366685,7 @@ self: {
         vector
       ];
       description = "Packed Vector";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-packed-vector";
       broken = true;
@@ -366074,7 +366733,7 @@ self: {
         hspec-discover
       ];
       description = "Simple parser support";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366110,7 +366769,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Primitive functions and data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366219,7 +366878,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Opinionated polysemy library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366266,7 +366925,7 @@ self: {
         unliftio
       ];
       description = "Opinionated prelude library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -366336,7 +366995,7 @@ self: {
         vector
       ];
       description = "Primitive functions and data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -366383,7 +367042,7 @@ self: {
         vector
       ];
       description = "Primitive support for bit manipulation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.x86;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-prim-bits-exe";
@@ -366491,7 +367150,7 @@ self: {
       ];
       doHaddock = false;
       description = "Rank-select";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-rankselect";
     }
@@ -366562,7 +367221,7 @@ self: {
         vector
       ];
       description = "Rank-select base";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366658,7 +367317,7 @@ self: {
         vector
       ];
       description = "SIMD library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -366740,7 +367399,7 @@ self: {
       ];
       testToolDepends = [ doctest-discover ];
       description = "SIMD library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-simd";
       broken = true;
@@ -366821,7 +367480,7 @@ self: {
         vector
       ];
       description = "Primitive functions and data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -366859,7 +367518,7 @@ self: {
         hspec-discover
       ];
       description = "String parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -366940,7 +367599,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library for creating and extracting tar archives";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-tar";
       broken = true;
@@ -367039,7 +367698,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Supports IO on URIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-uri";
     }
@@ -367197,7 +367856,7 @@ self: {
         vector
       ];
       description = "XML parser based on succinct data structures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hw-xml";
       broken = true;
@@ -368380,7 +369039,7 @@ self: {
         random
       ];
       description = "A Yahtzee game implementation in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hyahtzee";
     }
   ) { };
@@ -369107,8 +369766,8 @@ self: {
     }:
     mkDerivation {
       pname = "hylolib";
-      version = "1.5.4";
-      sha256 = "0vznqq8z4f42plidagmg2d099gvfk3pwv4xclar8d0gp6dsbks6v";
+      version = "1.5.5";
+      sha256 = "1qdmx5yp5ln0xnc25mfyn0axbpmhn4qkvjlvsh6q5zca9i1hf2xw";
       libraryHaskellDepends = [
         array
         base
@@ -369189,10 +369848,8 @@ self: {
     }:
     mkDerivation {
       pname = "hyper";
-      version = "0.2.1.1";
-      sha256 = "14p7r57g75ny8l9h4ilbm6mhdsfiysfs3rd56300dl0jkpgrh8r2";
-      revision = "5";
-      editedCabalFile = "0dzm6qrqrrmrsmn5y1nhncy2w7kmaa4ilkf1mpi32hs9mywnl5v9";
+      version = "0.2.1.2";
+      sha256 = "03v7pxpn84xhf1x8rcfczgpxgpkkjg3l94virmd4hdq2n6x81gs9";
       libraryHaskellDepends = [
         base
         blaze-html
@@ -369200,7 +369857,7 @@ self: {
         text
       ];
       description = "Display class for the HyperHaskell graphical Haskell interpreter";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -369208,6 +369865,8 @@ self: {
     {
       mkDerivation,
       base,
+      Chart,
+      Chart-diagrams,
       diagrams-lib,
       diagrams-svg,
       hyper,
@@ -369217,12 +369876,12 @@ self: {
     }:
     mkDerivation {
       pname = "hyper-extra";
-      version = "0.2.0.1";
-      sha256 = "13ipxwhxrndl505zzxcq7gz874l0r2g0ma1yhq14bihvlwh3qr8d";
-      revision = "2";
-      editedCabalFile = "1c3lp2wg8axcv20zyz58qcs79vcy8hzsr3gdd9d671yk9m8c7b6n";
+      version = "0.3.0.0";
+      sha256 = "1ra5vik2g1amg2brqcay4mzbhipwk6z023shlscghaxfwfzp5k1i";
       libraryHaskellDepends = [
         base
+        Chart
+        Chart-diagrams
         diagrams-lib
         diagrams-svg
         hyper
@@ -369231,7 +369890,7 @@ self: {
         text
       ];
       description = "Display instances for the HyperHaskell graphical Haskell interpreter";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -369253,10 +369912,8 @@ self: {
     }:
     mkDerivation {
       pname = "hyper-haskell-server";
-      version = "0.2.3.1";
-      sha256 = "0cz1dybzgk5q051r3inv72x154q3qmf5r0hci2cxrb89ncdcszsv";
-      revision = "1";
-      editedCabalFile = "1vk8q06z7q20hq3cs3nnw0ap3gsa983clvykb4zlxl4fspq7rviv";
+      version = "0.2.4.0";
+      sha256 = "0pfabv7faj8bvfq48qvjpvk8jwspsq5yvmhrwknvxv4kzk6692wa";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -369274,10 +369931,8 @@ self: {
         transformers
       ];
       description = "Server back-end for the HyperHaskell graphical Haskell interpreter";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "hyper-haskell-server";
-      broken = true;
     }
   ) { };
 
@@ -369356,7 +370011,112 @@ self: {
         websockets
       ];
       description = "Interactive HTML apps using type-safe serverside Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  hyperbole_0_5_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      atomic-css,
+      attoparsec,
+      attoparsec-aeson,
+      base,
+      bytestring,
+      casing,
+      containers,
+      cookie,
+      data-default,
+      effectful,
+      file-embed,
+      filepath,
+      http-api-data,
+      http-client,
+      http-client-tls,
+      http-types,
+      network,
+      network-uri,
+      random,
+      skeletest,
+      string-conversions,
+      string-interpolate,
+      text,
+      time,
+      wai,
+      wai-websockets,
+      warp,
+      websockets,
+    }:
+    mkDerivation {
+      pname = "hyperbole";
+      version = "0.5.0";
+      sha256 = "0b141p2yd50p4blqynxss8jjk5h1wa3rsq766i37zqfxldbmagd0";
+      libraryHaskellDepends = [
+        aeson
+        atomic-css
+        attoparsec
+        attoparsec-aeson
+        base
+        bytestring
+        casing
+        containers
+        cookie
+        data-default
+        effectful
+        file-embed
+        filepath
+        http-api-data
+        http-client
+        http-client-tls
+        http-types
+        network
+        network-uri
+        random
+        string-conversions
+        string-interpolate
+        text
+        time
+        wai
+        wai-websockets
+        warp
+        websockets
+      ];
+      testHaskellDepends = [
+        aeson
+        atomic-css
+        attoparsec
+        attoparsec-aeson
+        base
+        bytestring
+        casing
+        containers
+        cookie
+        data-default
+        effectful
+        file-embed
+        filepath
+        http-api-data
+        http-client
+        http-client-tls
+        http-types
+        network
+        network-uri
+        random
+        skeletest
+        string-conversions
+        string-interpolate
+        text
+        time
+        wai
+        wai-websockets
+        warp
+        websockets
+      ];
+      testToolDepends = [ skeletest ];
+      description = "Interactive HTML apps using type-safe serverside Haskell";
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -369450,7 +370210,7 @@ self: {
         tasty-hunit
       ];
       description = "Hypergeometric function of a matrix argument";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -370256,7 +371016,7 @@ self: {
         tasty-hunit
       ];
       description = "Haskell interval types. Bounds checking.";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -370433,7 +371193,7 @@ self: {
         time
       ];
       description = "iCalendar data types, parser, and printer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -370663,6 +371423,8 @@ self: {
       ];
       description = "Lattice iCE40 Primitive IP";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -371437,7 +372199,7 @@ self: {
         tf-random
       ];
       description = "Flexible generation of identicons";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -371838,7 +372600,7 @@ self: {
         transformers
       ];
       description = "Functional Programming Language with Dependent Types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) gmp; };
 
@@ -371989,7 +372751,7 @@ self: {
       ];
       doHaddock = false;
       description = "Branch on whether a constraint is satisfied";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -372044,7 +372806,7 @@ self: {
         bytestring
       ];
       description = "Constructing and dissecting IFF files";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -373084,8 +373846,8 @@ self: {
     }:
     mkDerivation {
       pname = "ihp";
-      version = "1.4.0";
-      sha256 = "0k962vpcarq07a0wb5rlpah15q629xi39h2x8x0vb5i8nv7xg0c3";
+      version = "1.4.1";
+      sha256 = "0d5hj8c8qvjqmdjy7dxibhq41qzbfqmrcgmfw84s6gfss9jbanlq";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -373176,7 +373938,8 @@ self: {
         wreq
       ];
       description = "Haskell Web Framework";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+      maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
@@ -373234,7 +373997,7 @@ self: {
       ];
       doHaddock = false;
       description = "JSX-like but for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -373419,7 +374182,8 @@ self: {
         wreq
       ];
       description = "Dev tools for IHP";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+      maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
@@ -373440,8 +374204,9 @@ self: {
         with-utf8
       ];
       description = "Provides the IHP migrate binary";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "migrate";
+      maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
@@ -373449,6 +374214,7 @@ self: {
     {
       mkDerivation,
       aeson,
+      attoparsec-aeson,
       base,
       bytestring,
       HsOpenSSL,
@@ -373456,23 +374222,26 @@ self: {
       http-streams,
       io-streams,
       neat-interpolation,
+      network-uri,
       retry,
+      safe-exceptions,
       text,
     }:
     mkDerivation {
       pname = "ihp-openai";
-      version = "1.3.0";
-      sha256 = "1736f8w1696d5db9shdhqxq1gdng1gh1mijn2rnynrh8lsnndwa4";
-      revision = "1";
-      editedCabalFile = "03g2mz1vfxcfv02675nh33643k4baw2chx1vc9ij6p76868l1nk7";
+      version = "1.4.0";
+      sha256 = "0npcnqdfmqv979gfn7iyl5p76hkggblc9n82z056wppj0i9q0i86";
       libraryHaskellDepends = [
         aeson
+        attoparsec-aeson
         base
         bytestring
         HsOpenSSL
         http-streams
         io-streams
+        network-uri
         retry
+        safe-exceptions
         text
       ];
       testHaskellDepends = [
@@ -373483,9 +374252,8 @@ self: {
         text
       ];
       description = "Call GPT4 from your Haskell apps";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."MIT";
+      maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
@@ -373537,7 +374305,8 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Extra data types for postgresql-simple";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+      maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
 
@@ -373633,7 +374402,7 @@ self: {
         vector
       ];
       description = "Optimised list functions for doing index-related things";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -374425,7 +375194,7 @@ self: {
         xml-types
       ];
       description = "Execute arbitrary actions for each item from RSS/Atom feeds";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -374658,7 +375427,7 @@ self: {
         wires
       ];
       description = "Immutaball platformer game (prototype version)";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -374693,7 +375462,7 @@ self: {
         hspec
       ];
       description = "A GHC plugin for automatically importing modules";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -374885,7 +375654,7 @@ self: {
       ];
       doHaddock = false;
       description = "Framework for defaulting superclasses";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -374975,7 +375744,7 @@ self: {
         parsec
       ];
       description = "A math-inspired programmatic 2D & 3D CAD system";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sorki ];
     }
   ) { };
@@ -375068,7 +375837,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Auto generate hie-bios cradles";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -375143,7 +375912,7 @@ self: {
         yaml
       ];
       description = "Helps maintain consistency of imports";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -375747,7 +376516,7 @@ self: {
         polysemy-time
       ];
       description = "A Prelude for Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -375774,7 +376543,7 @@ self: {
         text
       ];
       description = "A Prelude for Polysemy – Base Reexports";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -375795,7 +376564,7 @@ self: {
         polysemy
       ];
       description = "A Prelude for Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -376417,7 +377186,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Simple, no-frills indexed lists";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -376528,7 +377297,7 @@ self: {
       sha256 = "166329a5jmrs4q1ycb132gq7kbrdyzrvrxzzzwp5czmv00lvns9f";
       libraryHaskellDepends = [ base ];
       description = "Utilities for indexed profunctors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -376576,7 +377345,7 @@ self: {
         transformers
       ];
       description = "Atkey indexed monad transformers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -376814,6 +377583,7 @@ self: {
       description = "A collection of implementations of IndieWeb algorithms";
       license = lib.licenses.publicDomain;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -376921,7 +377691,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Convenient imperative eDSL over Lorentz";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "indigo";
     }
@@ -377198,7 +377968,7 @@ self: {
         text
       ];
       description = "A statically-typed functional scripting language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -377477,7 +378247,7 @@ self: {
         tasty-bench
       ];
       description = "Infinite lists";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -377883,7 +378653,7 @@ self: {
       sha256 = "0k3bl5adj512bzqysapnggvf6fmi0hs3mvxkymsh9af7gan8y504";
       libraryHaskellDepends = [ base ];
       description = "Initialization and Deinitialization of 'Storable' values";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -378005,7 +378775,7 @@ self: {
         text
       ];
       description = "Canonical categorical conversions (injections and projections)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -378173,7 +378943,7 @@ self: {
         vector
       ];
       description = "Lets you embed C++ code into Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.roberth ];
     }
   ) { };
@@ -378222,7 +378992,7 @@ self: {
         vector
       ];
       description = "Lets you embed CUDA code into Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -378253,7 +379023,7 @@ self: {
         inline-c
       ];
       description = "Lets you embed Objective-C code into Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -378411,7 +379181,7 @@ self: {
       ];
       doHaddock = false;
       description = "Python interpreter embedded into haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) python3; };
 
@@ -378510,7 +379280,7 @@ self: {
         template-haskell
       ];
       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) R; };
 
@@ -378671,7 +379441,7 @@ self: {
         unordered-containers
       ];
       description = "Associative containers retaining insertion order for traversals";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -379465,7 +380235,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Direct conversion functions between Ints and Words";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -379595,7 +380365,7 @@ self: {
       editedCabalFile = "11gbra5328854mnjm5hvpvz1wccmki1fy6bkbqd6fpxaj5cffmbp";
       libraryHaskellDepends = [ base ];
       description = "A simple, efficient supply of integers using atomic fetch-and-add";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -379625,7 +380395,7 @@ self: {
         primitive
       ];
       description = "Advent of Code 2019 intcode interpreter";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -379670,7 +380440,7 @@ self: {
         text
       ];
       description = "Conversion from strings to Integer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -379826,7 +380596,7 @@ self: {
         quaalude
       ];
       description = "Integer, Natural, and Positive";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -379991,7 +380761,7 @@ self: {
         unix
       ];
       description = "Poll modern Intel/AMD CPU power consumption on Linux via RAPL";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       mainProgram = "intel-powermon";
     }
   ) { };
@@ -380073,7 +380843,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Type level prompt with openai";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -380115,7 +380885,7 @@ self: {
       testHaskellDepends = [ base ];
       doHaddock = false;
       description = "A GHC Core plugin for intensional datatype refinement checking";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -380337,7 +381107,7 @@ self: {
       sha256 = "1wf6g0a1pz6xiixqnkrdjlb2xr4ck2vab9vd0w6kp0pbhqc6qysp";
       libraryHaskellDepends = [ base ];
       description = "Some simple functions to deal with transformations from structures to other ones, basically lists";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -380791,7 +381561,7 @@ self: {
         utility-ht
       ];
       description = "piecewise linear and cubic Hermite interpolation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -380878,7 +381648,7 @@ self: {
         typed-process
       ];
       description = "Shared memory and control structures for IPC";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -381020,7 +381790,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "An implementation of Allen's interval algebra for temporal logic";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tutorial";
       broken = true;
@@ -381047,7 +381817,7 @@ self: {
         hedgehog
       ];
       description = "Intervals of functors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -381105,7 +381875,7 @@ self: {
         time-compat
       ];
       description = "Intervals, and monoids thereof";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -381127,7 +381897,7 @@ self: {
         QuickCheck
       ];
       description = "Interval Tree Clocks";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -381248,7 +382018,7 @@ self: {
         vector
       ];
       description = "A game of competitive puzzle-design";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "intricacy";
@@ -381697,7 +382467,7 @@ self: {
         vector
       ];
       description = "Automatically generate a function’s inverse";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -381989,7 +382759,7 @@ self: {
       ];
       doHaddock = false;
       description = "Type classes for concurrency with STM, ST and timing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -382016,7 +382786,7 @@ self: {
         si-timers
       ];
       description = "Experimental MTL instances for io-classes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -382046,7 +382816,7 @@ self: {
         template-haskell
       ];
       description = "Use Template Haskell to embed the result of an IO computation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -382217,7 +382987,7 @@ self: {
         io-classes
       ];
       description = "A pure simulator for monadic concurrency with STM";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -382642,7 +383412,7 @@ self: {
         text
       ];
       description = "Library for IP and MAC addresses";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -382731,8 +383501,8 @@ self: {
     }:
     mkDerivation {
       pname = "ip2location-io";
-      version = "1.3.0";
-      sha256 = "1425ca51il1cairnv8qabxb1m242jndsi0m2m1lpvyk5jwj3k2cv";
+      version = "1.4.0";
+      sha256 = "0ipv4ifgm30hjlkgqbdiy6vl6mcd11fyf7kr5mqhhwb60mxwl6za";
       libraryHaskellDepends = [
         aeson
         base
@@ -382836,7 +383606,7 @@ self: {
         text
       ];
       description = "Internal Phonetic Alphabet (IPA)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -383060,7 +383830,7 @@ self: {
         text
       ];
       description = "Auto-generated IPFS HTTP API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -383105,7 +383875,7 @@ self: {
         text
       ];
       description = "IPLD Content-IDentifiers <https://github.com/ipld/cid>";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -383658,7 +384428,7 @@ self: {
         text
       ];
       description = "IRC core library for glirc";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -384030,8 +384800,8 @@ self: {
     }:
     mkDerivation {
       pname = "iri";
-      version = "0.5.1.1";
-      sha256 = "1xyndxzdqpbmwv8f86jlin22snddcm769m84d29sb9dkhyi6hncd";
+      version = "0.5.1.2";
+      sha256 = "1w09gkxndkzkx3387pzrv7bfckln1j90cahfjqz0vi56f2lc8vvf";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -384061,7 +384831,7 @@ self: {
       ];
       doHaddock = false;
       description = "RFC-compliant universal resource identifier library (URL, URI, IRI)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -384231,7 +385001,7 @@ self: {
         text
       ];
       description = "Haskell CLI framework";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -384378,7 +385148,7 @@ self: {
         text
       ];
       description = "ISBN Validation and Manipulation";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -384926,7 +385696,7 @@ self: {
         text
       ];
       description = "Isomorphism typeclass as a lawful solution to the conversion problem";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -386758,7 +387528,7 @@ self: {
       ];
       doHaddock = false;
       description = "Functional, expression-oriented data processing language";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       mainProgram = "ja";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -386801,7 +387571,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libjack2 ];
       description = "Bindings for the JACK Audio Connection Kit";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { inherit (pkgs) libjack2; };
@@ -387045,7 +387815,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Generate flamegraphs from Jaeger .json dumps.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "jaeger-flamegraph";
       broken = true;
@@ -387301,7 +388071,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Japanese holidays utility";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -387413,7 +388183,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Stack-based concatenative language embedded in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -387921,7 +388691,7 @@ self: {
         vector
       ];
       description = "Labeled one-dimensional arrays";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "bench-report";
     }
   ) { };
@@ -387968,7 +388738,7 @@ self: {
         vector
       ];
       description = "Type-safe data frames based on higher-kinded types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -388013,7 +388783,7 @@ self: {
         vector
       ];
       description = "IO operations for the `javelin` package";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -388468,7 +389238,7 @@ self: {
         time
       ];
       description = "Yet another streaming library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -388563,7 +389333,7 @@ self: {
         text
       ];
       description = "Handle Jira wiki markup";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "jira-wiki-markup";
     }
   ) { };
@@ -388981,7 +389751,7 @@ self: {
         time
       ];
       description = "Job queue";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -389341,7 +390111,7 @@ self: {
         text
       ];
       description = "JSON with Structure";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -389395,7 +390165,7 @@ self: {
         text
       ];
       description = "OpenAPI Definitions for Jordan, Automatically";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389455,7 +390225,7 @@ self: {
         transformers
       ];
       description = "Servant Combinators for Jordan";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389509,7 +390279,7 @@ self: {
         transformers
       ];
       description = "Servant Client Instances for Jordan Servant Types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389575,7 +390345,7 @@ self: {
         transformers
       ];
       description = "OpenAPI schemas for Jordan-Powered Servant APIs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389632,7 +390402,7 @@ self: {
         wai
       ];
       description = "Servers for Jordan-Based Servant Combinators";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389734,7 +390504,7 @@ self: {
         time
       ];
       description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -389809,7 +390579,7 @@ self: {
         time
       ];
       description = "JSON Object Signing and Encryption (JOSE) and JSON Web Token (JWT) library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -389979,7 +390749,7 @@ self: {
         hspec
       ];
       description = "Transform Joy code using conditional rewrite rules";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -390032,7 +390802,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "FFI bindings to libjpeg-turbo";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -390312,7 +391082,7 @@ self: {
         transformers
       ];
       description = "DOM library that uses jsaddle to support both GHCJS and GHC";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -390347,8 +391117,8 @@ self: {
         text
       ];
       description = "JSaddle Hello World, an example package";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.alexfmpe ];
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -390412,7 +391182,7 @@ self: {
         websockets
       ];
       description = "Interface for JavaScript that works with GHCJS and GHC";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [
         lib.maintainers.alexfmpe
         lib.maintainers.maralorn
@@ -390440,7 +391210,7 @@ self: {
       ];
       doHaddock = false;
       description = "Run JSaddle JSM with the GHC Wasm backend";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
     }
   ) { };
 
@@ -390540,7 +391310,7 @@ self: {
       version = "0.9.9.3";
       sha256 = "1icj9cll7ifrharpngwhzgfyxixckd6viwk94f8wmqbf4yyyfsmv";
       description = "Interface for JavaScript that works with GHCJS and GHC";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       platforms = lib.platforms.darwin;
       maintainers = [ lib.maintainers.alexfmpe ];
     }
@@ -390584,26 +391354,22 @@ self: {
       aeson,
       base,
       jsaddle,
-      jsaddle-dom,
       lens,
       text,
     }:
     mkDerivation {
       pname = "jsdom-extras";
-      version = "0.1.0.0";
-      sha256 = "0mmvm1vdhfryf9fdbnyb2nz3vc4mdpzdbva3486r5vfkkxajrz5c";
+      version = "0.1.1.0";
+      sha256 = "0di31amvsc13n3306dkn7nbzr8l2lv6rr3km7aq1g47ci931rj85";
       libraryHaskellDepends = [
         aeson
         base
         jsaddle
-        jsaddle-dom
         lens
         text
       ];
       description = "Convenience utilities for JSDOM";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -390660,7 +391426,7 @@ self: {
         text
       ];
       description = "Support for serialising Haskell to and from JSON";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -391178,7 +391944,7 @@ self: {
         text
       ];
       description = "Load JSON from files in a directory structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "jsondir";
     }
   ) { };
@@ -391318,7 +392084,7 @@ self: {
         hspec
       ];
       description = "JSON Feed";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -391743,7 +392509,7 @@ self: {
         text
       ];
       description = "Kitchen sink for querying JSON";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -392139,7 +392905,7 @@ self: {
         vector
       ];
       description = "Type-level JSON specification";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -392175,7 +392941,7 @@ self: {
         text
       ];
       description = "Elm code generate for `json-spec`";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -392251,7 +393017,7 @@ self: {
         uuid
       ];
       description = "Generated elm code for servant APIs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -392293,7 +393059,7 @@ self: {
         time
       ];
       description = "json-spec-openapi";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -392458,7 +393224,7 @@ self: {
         text
       ];
       description = "High-performance JSON parser and encoder";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -392652,7 +393418,7 @@ self: {
         vector
       ];
       description = "Automatic type declaration for JSON input data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "json-to-type";
       broken = true;
@@ -392756,7 +393522,7 @@ self: {
         text
       ];
       description = "Tokenize JSON";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -393168,7 +393934,7 @@ self: {
         text-builder
       ];
       description = "Fast and simple JSON encoding toolkit";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -393255,7 +394021,7 @@ self: {
         tasty-hunit
       ];
       description = "JsonLogic Evaluation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -393305,7 +394071,7 @@ self: {
         tasty-hunit
       ];
       description = "JsonLogic Aeson Support";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -393404,7 +394170,7 @@ self: {
         text
       ];
       description = "Jsonnet implementaton in pure Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hs-jsonnet";
       broken = true;
@@ -393715,6 +394481,47 @@ self: {
     }
   ) { };
 
+  jsonschema = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      containers,
+      regex-tdfa,
+      scientific,
+      tasty,
+      tasty-hunit,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "jsonschema";
+      version = "0.2.0.0";
+      sha256 = "1paqgmyl1q9nllw83vljckdzj5ir300a3qy866rlj24x4vhqk2df";
+      libraryHaskellDepends = [
+        aeson
+        base
+        containers
+        regex-tdfa
+        scientific
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        tasty
+        tasty-hunit
+        text
+        vector
+      ];
+      description = "JSON Schema derivation and validation";
+      license = lib.licensesSpdx."MPL-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   jsonschema-gen = callPackage (
     {
       mkDerivation,
@@ -394242,8 +395049,8 @@ self: {
     }:
     mkDerivation {
       pname = "jukebox";
-      version = "0.5.8";
-      sha256 = "1pb7z95cmqaxbmba2grrbf8dm56821y40v12l4402milnahzl3k9";
+      version = "0.5.9";
+      sha256 = "0nnlqivvsp158wdmbz1xazl1bjyd2g3w41q43plmn8igsifnv6xa";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -394921,7 +395728,7 @@ self: {
         text
       ];
       description = "Application wrapper for the k8s environment";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -394988,7 +395795,7 @@ self: {
       sha256 = "07x6dsc4d4f3vksi21fxd1vix9wqsydrl17f2xq8858m2ay0j28j";
       doHaddock = false;
       description = "TBA";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -395374,7 +396181,7 @@ self: {
         wide-word
       ];
       description = "Serialization for kafka wire protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -395569,7 +396376,7 @@ self: {
         text
       ];
       description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -396206,7 +397013,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Katip integration for Effectful";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -396492,7 +397299,7 @@ self: {
         unordered-containers
       ];
       description = "Katip scribe for raven (https://sentry.io)";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -396661,7 +397468,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "WAI middleware for logging request and response info through katip";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -397542,6 +398349,7 @@ self: {
       ];
       description = "Rapid Gtk Application Development - I18N";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -398617,7 +399425,7 @@ self: {
       ];
       doHaddock = false;
       description = "Kempe compiler";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "kc";
       broken = true;
@@ -398871,12 +399679,12 @@ self: {
         wreq
       ];
       description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "keter";
     }
   ) { };
 
-  keter_2_2_0 = callPackage (
+  keter_2_2_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -398935,8 +399743,8 @@ self: {
     }:
     mkDerivation {
       pname = "keter";
-      version = "2.2.0";
-      sha256 = "0wxq5imn77si6aljhfqka782zwpvqapkaw1qyp2yhq05vy1v2hqq";
+      version = "2.2.1";
+      sha256 = "05mh9a5lvjyjzpfcgrbysn6yzzr20aplcrqk7ifknggy5lh4204l";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -399014,7 +399822,7 @@ self: {
         wreq
       ];
       description = "Web application deployment manager, focusing on Haskell web frameworks. It mitigates downtime.";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "keter";
     }
@@ -399059,8 +399867,8 @@ self: {
     }:
     mkDerivation {
       pname = "keter-rate-limiting-plugin";
-      version = "0.2.0.0";
-      sha256 = "0rswbhdg3ig0c028xdwgp8nb3h6jvf0z0137akrd4d7z8glyg00x";
+      version = "0.2.0.2";
+      sha256 = "1gj66aha6myc27fqdn25j4hvsvdkzp02vqm0msch3hba8djslzzq";
       libraryHaskellDepends = [
         aeson
         base
@@ -399116,7 +399924,7 @@ self: {
         wai-extra
       ];
       description = "Simple Keter rate limiting plugin";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { inherit (pkgs) zlib; };
 
@@ -399242,7 +400050,7 @@ self: {
         split
       ];
       description = "CLI and library to generate QR codes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "kewar";
     }
   ) { };
@@ -399456,7 +400264,7 @@ self: {
         text
       ];
       description = "An abstract Handle for accessing collections in stores like Redis";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -399489,7 +400297,7 @@ self: {
         text
       ];
       description = "Validate a keyed-vals Handle";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -399525,7 +400333,7 @@ self: {
         keyed-vals-hspec-tests
       ];
       description = "Implements a keyed-vals Handle using in-process memory";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -399573,7 +400381,7 @@ self: {
         tmp-proc-redis
       ];
       description = "Access Redis using a keyed-vals Handle";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -400025,7 +400833,7 @@ self: {
         tasty-hunit
       ];
       description = "A lightweight structured concurrency library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -400057,7 +400865,7 @@ self: {
         tasty-hunit
       ];
       description = "Adaptation of the ki library for the effectful ecosystem";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -400082,7 +400890,7 @@ self: {
         unliftio-core
       ];
       description = "A lightweight structured concurrency library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -400278,7 +401086,7 @@ self: {
         hspec-core
       ];
       description = "Boolean strong typing";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -400403,7 +401211,7 @@ self: {
         singletons-base
       ];
       description = "Type-level integers. Like KnownNat, but for integers.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -400432,7 +401240,7 @@ self: {
         singletons-base
       ];
       description = "Type-level rationals. Like KnownNat, but for rationals.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -400464,7 +401272,7 @@ self: {
         hspec
       ];
       description = "A category polymorphic `Functor` typeclass";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -400802,7 +401610,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Advanced keyboard remapping utility";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "kmonad";
       maintainers = [
         lib.maintainers.auscyber
@@ -401091,7 +401899,7 @@ self: {
         transformers
       ];
       description = "Memory-backed handles";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -401389,7 +402197,7 @@ self: {
         vector
       ];
       description = "a concatenative not-quite-lisp for kittens";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "koneko";
       broken = true;
@@ -401424,7 +402232,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Formalising the rules of Konnakol, an Indian percussional art form";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -401500,7 +402308,7 @@ self: {
         transformers-base
       ];
       description = "Utilities for working with many HStringTemplate templates from files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -401775,7 +402583,7 @@ self: {
         unordered-containers
       ];
       description = "Krank checks issue tracker link status in your source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "krank";
       broken = true;
@@ -402520,7 +403328,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "coverage driven random testing framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "kudzu";
       broken = true;
@@ -402702,7 +403510,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Find the alpha emoji";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -403196,7 +404004,7 @@ self: {
         text
       ];
       description = "Generate Ruby clients from Servant APIs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -403312,7 +404120,7 @@ self: {
         text
       ];
       description = "Interpreters for lambda calculus, calculus of constructions, and more";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lambda";
       broken = true;
@@ -403579,7 +404387,7 @@ self: {
         read-bounded
       ];
       description = "Declarative command-line parser with type-driven pattern matching";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -404238,7 +405046,7 @@ self: {
         mtl
       ];
       description = "Lambdabot for Telegram";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "telegram-lambdabot";
       broken = true;
@@ -405003,7 +405811,7 @@ self: {
         tasty-bench
       ];
       description = "A libary for generating low-level sounds with high-level combinators";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -405228,7 +406036,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A high-level binding to the LAME encoder";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -405296,7 +406104,7 @@ self: {
         tasty-hunit
       ];
       description = "Run dependent IO actions asynchronously";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -405356,7 +406164,7 @@ self: {
       testToolDepends = [ markdown-unlit ];
       doHaddock = false;
       description = "Haskell bindings for the Linux Landlock API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "landlocked";
     }
@@ -405456,6 +406264,8 @@ self: {
       ];
       description = "Haskell implementation of Langchain";
       license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -405528,7 +406338,7 @@ self: {
         text
       ];
       description = "Parser, pretty-printer, and more for the Modula-2 programming language";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "parse";
     }
@@ -405565,7 +406375,7 @@ self: {
         vector
       ];
       description = "ASN.1 encoding and decoding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -405754,7 +406564,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Parsing and pretty-printing Bash shell scripts";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -405882,7 +406692,7 @@ self: {
         process
       ];
       description = "Analysis and generation of C code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -406385,7 +407195,65 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Dockerfile parser, pretty-printer and embedded DSL";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
+    }
+  ) { };
+
+  language-docker_15_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      data-default,
+      data-default-class,
+      hspec,
+      hspec-discover,
+      hspec-megaparsec,
+      HUnit,
+      megaparsec,
+      prettyprinter,
+      QuickCheck,
+      split,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "language-docker";
+      version = "15.0.0";
+      sha256 = "1l4pbadd65l4pk30p1xjgs9jmkslldcm8fbw8ck35mwql252kid2";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        data-default
+        data-default-class
+        megaparsec
+        prettyprinter
+        split
+        text
+        time
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        data-default
+        data-default-class
+        hspec
+        hspec-megaparsec
+        HUnit
+        megaparsec
+        prettyprinter
+        QuickCheck
+        split
+        text
+        time
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Dockerfile parser, pretty-printer and embedded DSL";
+      license = lib.licensesSpdx."GPL-3.0-or-later";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -406509,7 +407377,7 @@ self: {
         pretty
       ];
       description = "A library for the analysis and creation of Graphviz DOT files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ppdot";
     }
   ) { };
@@ -406775,7 +407643,7 @@ self: {
         text
       ];
       description = "Datatypes and parsing/printing functions to represent the Gemini markup language";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -407172,7 +408040,7 @@ self: {
         parsec
       ];
       description = "javascript parser for es6 and es7";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -407282,7 +408150,7 @@ self: {
         text
       ];
       description = "Lua parser and pretty-printer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -408699,7 +409567,7 @@ self: {
         QuickCheck
       ];
       description = "Matrix programming library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -408791,7 +409659,7 @@ self: {
         utility-ht
       ];
       description = "Numerical Linear Algebra using LAPACK";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -408956,7 +409824,7 @@ self: {
         vector
       ];
       description = "Conversion of objects between 'lapack' and 'hmatrix'";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -409039,7 +409907,7 @@ self: {
         validation-selective
       ];
       description = "Scalable anonymous records";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -409088,7 +409956,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Generic programming API for large-records and large-anon";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -409195,12 +410063,13 @@ self: {
       containers,
       generic-deriving,
       ghc,
-      ghc-prim,
+      ghc-internal,
       large-generics,
       mtl,
       newtype,
+      optics-core,
+      optics-th,
       primitive,
-      record-dot-preprocessor,
       record-hasfield,
       syb,
       tasty,
@@ -409210,16 +410079,16 @@ self: {
     }:
     mkDerivation {
       pname = "large-records";
-      version = "0.4.3";
-      sha256 = "0byhs4dr86l0shqhhj3nnwcfqb8a08363w212gjqnm3kbvh18nsy";
+      version = "0.4.4";
+      sha256 = "15mk1n86y6lx7ycjraz4lzwqn7rb52qikmgwqd68sq9znfq802rj";
       libraryHaskellDepends = [
         base
         containers
         ghc
         large-generics
         mtl
+        optics-core
         primitive
-        record-dot-preprocessor
         record-hasfield
         syb
         template-haskell
@@ -409228,11 +410097,12 @@ self: {
       testHaskellDepends = [
         base
         generic-deriving
-        ghc-prim
+        ghc-internal
         large-generics
         mtl
         newtype
-        record-dot-preprocessor
+        optics-core
+        optics-th
         record-hasfield
         tasty
         tasty-hunit
@@ -409240,10 +410110,8 @@ self: {
         transformers
       ];
       description = "Efficient compilation for large records, linear in the size of the record";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
-      broken = true;
     }
   ) { };
 
@@ -409689,7 +410557,7 @@ self: {
         pandoc-types
       ];
       description = "Use actual LaTeX to render formulae inside Hakyll pages";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -409727,7 +410595,7 @@ self: {
         transformers
       ];
       description = "A library for rendering LaTeX formulae as SVG using an actual LaTeX";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -409765,7 +410633,7 @@ self: {
         pandoc-types
       ];
       description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "latex-svg-filter";
     }
@@ -409799,7 +410667,7 @@ self: {
         random
       ];
       description = "Pure incremental byte parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -409830,7 +410698,7 @@ self: {
         time
       ];
       description = "lathe + time";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -410128,7 +410996,7 @@ self: {
         transformers
       ];
       description = "Hedgehog support for lawful-classes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -410167,7 +411035,7 @@ self: {
         transformers
       ];
       description = "QuickCheck support for lawful-classes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -410180,7 +411048,7 @@ self: {
       sha256 = "0dza7qrq54k0p50bv7hj9y0c12kl3x51j6kh9k7aammfnl14hrri";
       libraryHaskellDepends = [ base ];
       description = "Types for lawful-classes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -410235,7 +411103,7 @@ self: {
         text
       ];
       description = "Lawful typeclasses for bidirectional conversion between types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -410288,7 +411156,7 @@ self: {
         text
       ];
       description = "Lawful typeclasses for bidirectional conversion between types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -410628,6 +411496,50 @@ self: {
     }
   ) { };
 
+  layoutz = callPackage (
+    {
+      mkDerivation,
+      base,
+      tasty,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "layoutz";
+      version = "0.1.0.0";
+      sha256 = "0hmqi5ly418nqbz8zzj9r5mvcndmympwh5zkxqipf9gj3swppy9z";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+      ];
+      description = "Simple, beautiful CLI output for Haskell";
+      license = lib.licensesSpdx."Apache-2.0";
+    }
+  ) { };
+
+  layoutz-hs = callPackage (
+    {
+      mkDerivation,
+      base,
+      tasty,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "layoutz-hs";
+      version = "0.1.0.0";
+      sha256 = "06ps4smmsb8q0ww40q6d3w72bcad4f24v7jfkkdpqj4bvyiri29a";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+      ];
+      description = "Simple, beautiful CLI output for Haskell";
+      license = lib.licensesSpdx."Apache-2.0";
+    }
+  ) { };
+
   lazify = callPackage (
     {
       mkDerivation,
@@ -410717,7 +411629,7 @@ self: {
         transformers-base
       ];
       description = "Asynchronous actions that don't start right away";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -410748,7 +411660,7 @@ self: {
         tasty-hunit
       ];
       description = "A bracket with lazy resource allocation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -411007,7 +411919,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Alternative lazy ByteString and ST-like IO Handle";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -411123,7 +412035,7 @@ self: {
       sha256 = "1p0qhdbcnmx17j069n3w89jv8wpxzari4ihylrjk2x78k4b3p1cb";
       libraryHaskellDepends = [ base ];
       description = "LazyIO applicative for asymptotic performance";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -411515,7 +412427,7 @@ self: {
         yaml
       ];
       description = "See README for synopsis";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ldap-scim-bridge";
     }
@@ -412209,7 +413121,7 @@ self: {
         text
       ];
       description = "Signed and unsigned LEB128 codec for binary library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -412909,6 +413821,8 @@ self: {
       pname = "lens";
       version = "5.3.5";
       sha256 = "1s0ziznj60l9z3z5dacq58kaq8cdfxcz0r75f5hwj25ivzrsrszg";
+      revision = "1";
+      editedCabalFile = "06asqa9n6grq6dpzd2m9ynhn28mxmyqpj79bnh95x8lynf4kchg0";
       libraryHaskellDepends = [
         array
         assoc
@@ -413263,7 +414177,7 @@ self: {
         lens-action
       ];
       description = "Lens interface for your filesystem; still a bit experimental";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -413284,7 +414198,7 @@ self: {
         lens
       ];
       description = "Indexed version of Plated";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -413453,8 +414367,8 @@ self: {
       pname = "lens-properties";
       version = "4.11.1";
       sha256 = "1caciyn75na3f25q9qxjl7ibjam22xlhl5k2pqfiak10lxsmnz2g";
-      revision = "8";
-      editedCabalFile = "0lp0nkbm38v2i361w79dmqq20v3gn95bh1xixbs20549k73cxxj3";
+      revision = "9";
+      editedCabalFile = "14hiqpw4n3f73s62qqaqzb5pl47bm35qnyiwcxi7gn3acmzycjls";
       libraryHaskellDepends = [
         base
         lens
@@ -413619,7 +414533,7 @@ self: {
         tell
       ];
       description = "MonadTell-based lens combinators";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -413844,7 +414758,7 @@ self: {
         witherable
       ];
       description = "lens-compatible tools for working with witherable";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -414006,7 +414920,87 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "frugal issue tracker";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
+      mainProgram = "lentil";
+      maintainers = [ lib.maintainers.rvl ];
+    }
+  ) { };
+
+  lentil_1_5_9_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      csv,
+      deepseq,
+      directory,
+      dlist,
+      filemanip,
+      filepath,
+      hspec,
+      hspec-discover,
+      megaparsec,
+      mtl,
+      natural-sort,
+      optparse-applicative,
+      prettyprinter,
+      prettyprinter-ansi-terminal,
+      regex-tdfa,
+      semigroups,
+      terminal-progress-bar,
+      text,
+    }:
+    mkDerivation {
+      pname = "lentil";
+      version = "1.5.9.1";
+      sha256 = "0vw5myzycksjcl7r1yjkj1i771v5yqm68k17jj7dxg050dfsnwkc";
+      isLibrary = false;
+      isExecutable = true;
+      executableHaskellDepends = [
+        base
+        bytestring
+        csv
+        deepseq
+        directory
+        dlist
+        filemanip
+        filepath
+        megaparsec
+        mtl
+        natural-sort
+        optparse-applicative
+        prettyprinter
+        prettyprinter-ansi-terminal
+        regex-tdfa
+        semigroups
+        terminal-progress-bar
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        csv
+        deepseq
+        directory
+        dlist
+        filemanip
+        filepath
+        hspec
+        megaparsec
+        mtl
+        natural-sort
+        optparse-applicative
+        prettyprinter
+        prettyprinter-ansi-terminal
+        regex-tdfa
+        semigroups
+        terminal-progress-bar
+        text
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "frugal issue tracker";
+      license = lib.licensesSpdx."GPL-3.0-only";
+      hydraPlatforms = lib.platforms.none;
       mainProgram = "lentil";
       maintainers = [ lib.maintainers.rvl ];
     }
@@ -414430,7 +415424,7 @@ self: {
         util
       ];
       description = "See README for more info";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -414826,7 +415820,7 @@ self: {
         tasty-hunit
       ];
       description = "A binding to the libBF library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -414936,7 +415930,7 @@ self: {
         temporary
       ];
       description = "Haskell interface to libarchive";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) libarchive; };
 
@@ -415571,7 +416565,7 @@ self: {
         uuid
       ];
       description = "A Haskell implementation of JSON Web Token (JWT)";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -416058,7 +417052,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "An MPD client library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -416321,7 +417315,7 @@ self: {
             QuickCheck
           ];
           description = "Parsing, formatting, and validating international phone numbers";
-          license = lib.licenses.mit;
+          license = lib.licensesSpdx."MIT";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -416630,7 +417624,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Move/rename according a set of rules";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "librarian-exe";
     }
@@ -416727,7 +417721,7 @@ self: {
       sha256 = "09iyvp3271l5a1idklzxdcs3wxmjxqigkn1cjjv4vk8vww6zwzkb";
       doHaddock = false;
       description = "TBA";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -416788,7 +417782,7 @@ self: {
             transformers
           ];
           description = "libremidi bindings for haskell";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           mainProgram = "libremidi-exe";
           broken = true;
@@ -416835,7 +417829,7 @@ self: {
             libressl
           ];
           description = "libtls bindings";
-          license = lib.licenses.bsd2;
+          license = lib.licensesSpdx."BSD-2-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -416908,7 +417902,7 @@ self: {
       ];
       doHaddock = false;
       description = "A versatile, flexible and executable formal model for the RISC-V architecture";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "riscv-tiny";
       broken = true;
@@ -417031,7 +418025,7 @@ self: {
       testPkgconfigDepends = [ libsodium ];
       testToolDepends = [ c2hs ];
       description = "Low-level bindings to the libsodium C library";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -417050,7 +418044,7 @@ self: {
       libraryHaskellDepends = [ base ];
       librarySystemDepends = [ libsodium ];
       description = "FFI bindings to libsodium";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { inherit (pkgs) libsodium; };
@@ -417265,7 +418259,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ systemd ];
       description = "Haskell bindings to libsystemd-journal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { inherit (pkgs) systemd; };
@@ -417318,7 +418312,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libtelnet ];
       description = "Bindings to libtelnet";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -417356,8 +418350,8 @@ self: {
         }:
         mkDerivation {
           pname = "libtorch-ffi";
-          version = "2.0.1.8";
-          sha256 = "0aghzvhjdnqb7hx75ga2fls0waw8xwsnqqizj8407iq9n915r0yy";
+          version = "2.0.1.9";
+          sha256 = "0i6l98wf2rg7zd2bvxwdfzwp61hxlhwjasg0q4i3b10k6x5i9wzz";
           setupHaskellDepends = [
             base
             bytestring
@@ -417394,7 +418388,7 @@ self: {
             safe-exceptions
           ];
           description = "Haskell bindings for PyTorch";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
         }
       )
       {
@@ -417418,7 +418412,7 @@ self: {
         ghc
       ];
       description = "Helpers for integrating libtorch-ffi with Hasktorch";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -417439,7 +418433,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libversion ];
       description = "Haskell binding to libversion";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) libversion; };
 
@@ -417464,7 +418458,7 @@ self: {
       libraryPkgconfigDepends = [ libvirt ];
       libraryToolDepends = [ cpphs ];
       description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -417690,7 +418684,7 @@ self: {
       sha256 = "0jaif8y10ql8rmkfhm6nwfk65q8rnpk58a6j5cf4gksz9v2nnlh4";
       doHaddock = false;
       description = "libyaml clibs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -417717,7 +418711,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ libyaml ];
       description = "Low-level, streaming YAML interface via streamly";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) libyaml; };
 
@@ -417812,7 +418806,7 @@ self: {
         directory
       ];
       description = "A license compatibility helper";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "licensor";
       broken = true;
@@ -417925,7 +418919,7 @@ self: {
         tomland
       ];
       description = "Synchronize personal configs across multiple machines";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "life";
       broken = true;
@@ -417970,7 +418964,7 @@ self: {
         zenhack-prelude
       ];
       description = "Flexible manual resource management";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -418438,7 +419432,7 @@ self: {
         transformers
       ];
       description = "LIFX LAN API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -418648,7 +419642,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "LightStep OpenTracing client library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lightstep-haskell-stress-test";
     }
@@ -419236,7 +420230,7 @@ self: {
         random
       ];
       description = "Line-indexed file reader";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -419514,7 +420508,7 @@ self: {
       ];
       doHaddock = false;
       description = "Standard library for linear types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -419620,6 +420614,50 @@ self: {
     }
   ) { };
 
+  linear-core-prototype = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      containers,
+      ghc,
+      mtl,
+      tasty,
+      tasty-hunit,
+      template-haskell,
+      text,
+    }:
+    mkDerivation {
+      pname = "linear-core-prototype";
+      version = "0.1.0.0";
+      sha256 = "028hp67pzwrhqlzii74gjb8fi6iivcin84zlrf9cmr5xlxdapld7";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        containers
+        ghc
+        mtl
+        template-haskell
+        text
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        containers
+        ghc
+        mtl
+        tasty
+        tasty-hunit
+        template-haskell
+        text
+      ];
+      description = "Linear core validates optimizations wrt linearity";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   linear-free = callPackage (
     {
       mkDerivation,
@@ -419645,7 +420683,7 @@ self: {
         QuickCheck
       ];
       description = "Linear free monads";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -419713,7 +420751,7 @@ self: {
         reflection
       ];
       description = "Geographic coordinates, built on the linear package";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -419829,7 +420867,7 @@ self: {
         utility-ht
       ];
       description = "Linear Programming basic definitions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -419856,7 +420894,7 @@ self: {
         constraints
       ];
       description = "Build SMC morphisms using linear types";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
     }
   ) { };
 
@@ -420250,7 +421288,7 @@ self: {
         hspec
       ];
       description = "File extension based programming language detection";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "generate";
       broken = true;
@@ -420848,7 +421886,7 @@ self: {
       sha256 = "0j5q4ddsg3bmkhb82da39rj3h1knhxm74z3jknprzwhavz2wxcn6";
       libraryHaskellDepends = [ base ];
       description = "Linux capabilities Haskell data type";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -421375,7 +422413,8 @@ self: {
         mtl
       ];
       description = "RISC-V Core";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -421683,7 +422722,7 @@ self: {
         unordered-containers
       ];
       description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "fixpoint";
       maintainers = [ lib.maintainers.artem ];
     }
@@ -421802,7 +422841,7 @@ self: {
         unordered-containers
       ];
       description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "fixpoint";
       maintainers = [ lib.maintainers.artem ];
@@ -422000,7 +423039,7 @@ self: {
       ];
       testSystemDepends = [ z3 ];
       description = "Liquid Types for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.artem ];
     }
   ) { inherit (pkgs) z3; };
@@ -422034,7 +423073,7 @@ self: {
       ];
       testSystemDepends = [ z3 ];
       description = "Liquid Types for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.artem ];
     }
@@ -422154,7 +423193,7 @@ self: {
         unordered-containers
       ];
       description = "Liquid Types for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.artem ];
     }
   ) { };
@@ -422273,7 +423312,7 @@ self: {
         unordered-containers
       ];
       description = "Liquid Types for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.artem ];
     }
@@ -422537,7 +423576,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "List all remote forwards for mail accounts stored in a SQL database";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "list-remote-forwards";
     }
   ) { };
@@ -422556,8 +423595,8 @@ self: {
       pname = "list-shuffle";
       version = "1.0.0.1";
       sha256 = "1qcgkkhwnbrl729va8zgv5k6b4lpfy15bbkqnnx0nqz0d91xiqcr";
-      revision = "3";
-      editedCabalFile = "0hk8js5b59xr23fq58f9zp179cjcysnwaadsagz05jk3877vqzsw";
+      revision = "4";
+      editedCabalFile = "14r8qf3nm81qm4ycfpxrh513j9i1x8q78brrclxfpixh3prb5bm2";
       libraryHaskellDepends = [
         base
         primitive
@@ -422575,7 +423614,7 @@ self: {
         tasty-bench
       ];
       description = "List shuffling and sampling";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -422587,7 +423626,7 @@ self: {
       sha256 = "1n1b1fk8zn9hz162lmy9d123icd2i6cnlvpkk2ypbphmnam0xr43";
       libraryHaskellDepends = [ base ];
       description = "Easily and clearly create lists with only one element in them";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -422629,7 +423668,7 @@ self: {
         mtl-prelude
       ];
       description = "ListT done right";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -422894,7 +423933,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Tries and Patricia tries: finite sets and maps for list keys";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -422941,7 +423980,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "List-like operations for tuples";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -423056,7 +424095,7 @@ self: {
       sha256 = "1kyl7gg0prq7cyr0radwqcwdmqj3d0w2rjs1406nkryjfibsxgkh";
       libraryHaskellDepends = [ base ];
       description = "Helpers for working with NonEmpty lists";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -423342,11 +424381,11 @@ self: {
     { mkDerivation, base }:
     mkDerivation {
       pname = "literally";
-      version = "0.2025.9.10";
-      sha256 = "14g4m2qkaq6aanan8wrxawd44c8b6br0kcmhwrwk6k531564bjng";
+      version = "1.0.0.0";
+      sha256 = "0ckprvl1f1iy3960d8wgal3pl54i5b47qlsimgr6i2r6vlqciv0y";
       libraryHaskellDepends = [ base ];
       description = "Type-safe conversion of type literals into runtime values";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
     }
   ) { };
 
@@ -423412,7 +424451,7 @@ self: {
         unliftio
       ];
       description = "transform literate source code to Markdown";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "literatex";
     }
   ) { };
@@ -423445,7 +424484,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple implementation of Earley parsing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -423752,7 +424791,7 @@ self: {
         text
       ];
       description = "Haskell bindings for the llama.cpp llama-server and a simple CLI";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       mainProgram = "llamacall";
     }
   ) { };
@@ -424228,7 +425267,7 @@ self: {
         transformers
       ];
       description = "Support for writing an EDSL with LLVM-JIT as target";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -424267,7 +425306,7 @@ self: {
         utility-ht
       ];
       description = "Processor specific intrinsics for the llvm interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -424329,7 +425368,7 @@ self: {
       ];
       doHaddock = false;
       description = "Utility functions for the llvm interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -424352,7 +425391,7 @@ self: {
       ];
       librarySystemDepends = [ LLVM ];
       description = "FFI bindings to the LLVM compiler toolkit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { LLVM = null; };
@@ -424813,7 +425852,7 @@ self: {
         transformers
       ];
       description = "General purpose LLVM bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -424847,7 +425886,7 @@ self: {
         utility-ht
       ];
       description = "Generate Pkg-Config configuration file for LLVM";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "llvm-pkg-config";
     }
   ) { };
@@ -424894,7 +425933,7 @@ self: {
         text
       ];
       description = "A pretty printing library inspired by the llvm binding";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -424998,7 +426037,7 @@ self: {
         versions
       ];
       description = "LLVM bitcode parsing library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "llvm-disasm";
     }
   ) { };
@@ -425470,7 +426509,7 @@ self: {
         text
       ];
       description = "Support for developing against the LNURL protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -425528,7 +426567,7 @@ self: {
         optparse-applicative
       ];
       description = "A command line tool to manage LNURL auth identities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "lnurl-authenticator";
     }
@@ -425662,7 +426701,7 @@ self: {
         integer-types
       ];
       description = "Line and column positions and ranges in text files";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -425686,7 +426725,7 @@ self: {
         loc
       ];
       description = "Hedgehog generators for loc";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -426171,6 +427210,8 @@ self: {
       ];
       description = "Structured logging solution with multiple backends";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -426217,7 +427258,7 @@ self: {
         unordered-containers
       ];
       description = "Structured logging solution (base package)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -426360,7 +427401,7 @@ self: {
         text
       ];
       description = "Adaptation of the log library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -426413,7 +427454,7 @@ self: {
         vector
       ];
       description = "Structured logging solution (Elasticsearch back end)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -426821,7 +427862,7 @@ self: {
         base
       ];
       description = "Log-domain floating point numbers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -427391,7 +428432,7 @@ self: {
       sha256 = "1jw64bajnz1fizgkw9b01fpk7iyf5w7b8rd1zmhkqxg85npx3kql";
       libraryHaskellDepends = [ base ];
       description = "Simple logical constraints 'syntax-sugar' writing library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -428538,7 +429579,7 @@ self: {
         vector
       ];
       description = "monadic loop dsl";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -429288,7 +430329,7 @@ self: {
         tasty-hunit
       ];
       description = "LPeg – Parsing Expression Grammars For Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -429325,7 +430366,7 @@ self: {
         groups
       ];
       description = "Left and right actions, semidirect products and torsors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -429768,7 +430809,7 @@ self: {
       ];
       doHaddock = false;
       description = "Log-structured merge-trees";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) rocksdb; };
@@ -429852,7 +430893,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell library for the Microsoft Language Server Protocol";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -429932,7 +430973,7 @@ self: {
         unliftio
       ];
       description = "Haskell library for Language Server Protocol clients";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -430032,7 +431073,7 @@ self: {
         process
       ];
       description = "Functional test framework for LSP servers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -430135,7 +431176,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Haskell library for the Microsoft Language Server Protocol, data types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "generator";
     }
   ) { };
@@ -430531,7 +431572,7 @@ self: {
         tasty-hunit
       ];
       description = "Lua, an embeddable scripting language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { inherit (pkgs) lua5_4; };
 
@@ -430552,7 +431593,7 @@ self: {
         QuickCheck
       ];
       description = "Arbitrary instances for Lua types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -430841,7 +431882,7 @@ self: {
         lucid
       ];
       description = "Provides ARIA attributes for Lucid templates";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -430887,7 +431928,7 @@ self: {
         vector
       ];
       description = "Helper functions for using lucid with colonnade";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -431227,17 +432268,19 @@ self: {
     }:
     mkDerivation {
       pname = "luhn";
-      version = "0.2";
-      sha256 = "0ix7x28kmd3iarydl709vqd041h0qx6kv582c8ca54z8ag7lzynz";
+      version = "0.3";
+      sha256 = "1h5hh6kl5wh73lp6xxq36l9zvs49213k39ryc20kv6wmyrcn5qwx";
       libraryHaskellDepends = [
         base
         digits
         QuickCheck
       ];
+      testHaskellDepends = [
+        base
+        QuickCheck
+      ];
       description = "An implementation of Luhn's check digit algorithm";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -431559,7 +432602,7 @@ self: {
         stm
       ];
       description = "TMVar that can be listened to";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -431974,7 +433017,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Bindings to LZ4";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -432124,7 +433167,7 @@ self: {
         temporary
       ];
       description = "lz4 bindings for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -432221,7 +433264,7 @@ self: {
         tasty-quickcheck
       ];
       description = "LZMA/XZ compression and decompression";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) xz; };
 
@@ -432357,7 +433400,7 @@ self: {
         tasty-quickcheck
       ];
       description = "LZMA/XZ compression and decompression (static)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -432575,7 +433618,7 @@ self: {
         transformers
       ];
       description = "A toolkit for working with macaroons";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -432896,7 +433939,7 @@ self: {
         text
       ];
       description = "Parse machines streams with attoparsec parsers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -432997,7 +434040,7 @@ self: {
         text
       ];
       description = "Transcode encodings with machines";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -433809,7 +434852,7 @@ self: {
         ghc-prim
       ];
       description = "magma is an algebraic structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -433959,7 +435002,7 @@ self: {
         optparse-applicative
       ];
       description = "Preconfigured email connection pool on top of smtp";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "exe";
     }
   ) { };
@@ -434007,7 +435050,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Count mailboxes in a SQL database";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "mailbox-count";
     }
   ) { };
@@ -434149,7 +435192,7 @@ self: {
         wreq
       ];
       description = "API binding for Mailgun";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -435751,7 +436794,7 @@ self: {
         HUnit
       ];
       description = "Convert C++ type signatures to their mangled form";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mangle";
     }
@@ -435931,7 +436974,7 @@ self: {
         utility-ht
       ];
       description = "A parser for web documents according to the HTML5 specification";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -436213,7 +437256,7 @@ self: {
         unordered-containers
       ];
       description = "foldl wrappers for map-reduce";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -436301,7 +437344,7 @@ self: {
         vector
       ];
       description = "Efficient, polymorphic Map Algebra";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -436352,7 +437395,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Types which represent functions k -> v";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "view";
     }
   ) { };
@@ -437063,7 +438106,7 @@ self: {
         tasty-golden
       ];
       description = "A markup parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -437631,7 +438674,7 @@ self: {
         text
       ];
       description = "Fast and extensible bytestring builder";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -438041,7 +439084,7 @@ self: {
       executableHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "A micro web framework based on pattern matching";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "matcha-exe";
       broken = true;
@@ -438190,7 +439233,7 @@ self: {
         hedgehog
       ];
       description = "A variety of mathematical utilities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -438304,7 +439347,7 @@ self: {
       sha256 = "0l8jv0zm1mar6848n5jyd6dzy02q0cvkgvgnry9db382i1r4g9bq";
       libraryHaskellDepends = [ base ];
       description = "Class for interpolation of values";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -438318,7 +439361,7 @@ self: {
       sha256 = "092qbl1x0l6hcm9vn3nx3gyxnqcfx3z2kkfkqw5zmmmyn9zkjsgx";
       libraryHaskellDepends = [ base ];
       description = "Typeclass for metric spaces";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -438356,7 +439399,7 @@ self: {
         text
       ];
       description = "A library for formulating and solving math programs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -438396,7 +439439,7 @@ self: {
         unliftio
       ];
       description = "A GLPK backend to the math-programming library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -438434,7 +439477,7 @@ self: {
         text
       ];
       description = "Utility functions for testing implementations of the math-programming library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -438905,7 +439948,7 @@ self: {
         criterion
       ];
       description = "A native implementation of matrix operations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -438973,6 +440016,8 @@ self: {
       pname = "matrix-client";
       version = "0.1.6.1";
       sha256 = "0nr1nk6mxvrs0dspy315pviid7db7ry889y9gsg1i3a0pn3dna08";
+      revision = "1";
+      editedCabalFile = "1n6zv3chb8x5aya14qpcbyssr16labwypbbxfh0zp7kcfmy9acf8";
       libraryHaskellDepends = [
         aeson
         aeson-casing
@@ -439016,7 +440061,7 @@ self: {
         unordered-containers
       ];
       description = "A matrix client library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -439185,7 +440230,7 @@ self: {
         vector
       ];
       description = "Haskell matrix library with interface to C++ linear algebra libraries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -439365,8 +440410,8 @@ self: {
     }:
     mkDerivation {
       pname = "matterhorn";
-      version = "90000.1.0";
-      sha256 = "18miknhl4wk06845v2aqlis4z5br7zzz0fjg6ylc81abg38qnxrr";
+      version = "90000.1.1";
+      sha256 = "0hbkqimdm9bscrky5nr73bxhny7cina6dabpjnglspzwc4r3chvp";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -439484,8 +440529,8 @@ self: {
     }:
     mkDerivation {
       pname = "mattermost-api";
-      version = "90000.1.0";
-      sha256 = "0mp2qch4amgiixmx7zv158fb3ld1dpfad17sb43gxwadrj9afxdh";
+      version = "90000.1.1";
+      sha256 = "0l6nqrn3sdikpi1h2hrx0p7c51qvq89ibqd3z9dzzg1riz4rirfr";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -439547,8 +440592,8 @@ self: {
     }:
     mkDerivation {
       pname = "mattermost-api-qc";
-      version = "90000.1.0";
-      sha256 = "08ifm97c80a8vp9cqlwk7jb7105y2q6w77zvy2p42vk1l1p6yq4m";
+      version = "90000.1.1";
+      sha256 = "0qm462rb9ddpgz5cwrsqpw6sda5g055ivadfdw2yj29i1vqwn8xb";
       libraryHaskellDepends = [
         base
         containers
@@ -440335,7 +441380,7 @@ self: {
         vector
       ];
       description = "Sample from a posterior using Markov chain Monte Carlo";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -440491,7 +441536,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A Haskell implementation of the Model Context Protocol (MCP)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -440551,7 +441596,7 @@ self: {
         text
       ];
       description = "Library for building Model Context Protocol (MCP) servers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -440613,7 +441658,7 @@ self: {
         primitive
       ];
       description = "MD5 Hash";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -440810,7 +441855,7 @@ self: {
         uuid
       ];
       description = "Manipulate FSMs and store them in PostgreSQL";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -440884,7 +441929,7 @@ self: {
         doctest-parallel
       ];
       description = "Mealy machines for processing time-series and ordered data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "mealy-perf";
     }
   ) { };
@@ -441092,7 +442137,7 @@ self: {
         vector
       ];
       description = "A schema language for JSON";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -441767,7 +442812,7 @@ self: {
         weigh
       ];
       description = "Monadic parser combinators";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -441793,8 +442838,8 @@ self: {
       pname = "megaparsec-tests";
       version = "9.7.0";
       sha256 = "17jwz62f8lnrfmmfrsv1jcvn9wmpk4jlhmxjwk5qqx2iyijnrpb1";
-      revision = "1";
-      editedCabalFile = "108nv4c045xg3ks0v7c0figqrl7v90l87cahhmn5mc24vdpxhkrj";
+      revision = "2";
+      editedCabalFile = "08lkj731i0pvynw9kvx72xi7rph84syg0dxvcz2ssnqdg3q6jxqf";
       libraryHaskellDepends = [
         base
         bytestring
@@ -441824,7 +442869,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Test utilities and the test suite of Megaparsec";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -442418,7 +443463,7 @@ self: {
         unix
       ];
       description = "Print the core memory usage of programs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "printmem";
     }
   ) { };
@@ -442448,7 +443493,7 @@ self: {
         th-lift
       ];
       description = "Indices for type level lists";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -442478,7 +443523,7 @@ self: {
         type-spec
       ];
       description = "Type-safe memory units";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -442762,7 +443807,7 @@ self: {
         transformers
       ];
       description = "Open temporary anonymous Linux file handles";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -442989,7 +444034,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A memoization library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -443307,6 +444352,71 @@ self: {
     }
   ) { };
 
+  mempack_0_2_0_0 = callPackage (
+    {
+      mkDerivation,
+      avro,
+      base,
+      binary,
+      bytestring,
+      cereal,
+      criterion,
+      FailT,
+      flat,
+      hspec,
+      mtl,
+      primitive,
+      QuickCheck,
+      random,
+      serialise,
+      store,
+      text,
+      vector,
+    }:
+    mkDerivation {
+      pname = "mempack";
+      version = "0.2.0.0";
+      sha256 = "0prm0rl92j0pgwg0hkb28l846jnlf3fldwbknpx8inashijvqn6a";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        FailT
+        mtl
+        primitive
+        text
+        vector
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        FailT
+        hspec
+        mtl
+        primitive
+        QuickCheck
+        random
+        text
+        vector
+      ];
+      benchmarkHaskellDepends = [
+        avro
+        base
+        binary
+        bytestring
+        cereal
+        criterion
+        flat
+        primitive
+        serialise
+        store
+        vector
+      ];
+      description = "Short description";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   memscript = callPackage (
     {
       mkDerivation,
@@ -443353,7 +444463,7 @@ self: {
         transformers
       ];
       description = "Securely erase memory contents by writing zeros to it";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -443526,7 +444636,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A functor for consistent merging of information";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -443815,7 +444925,7 @@ self: {
         random-bytestring
       ];
       description = "Merkle Tree Logs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -444014,7 +445124,7 @@ self: {
         typed-process
       ];
       description = "Temporary message-db for integration testing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -444445,7 +445555,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "rebindable methods for improving testability";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -445236,7 +446346,7 @@ self: {
         warp-tls
       ];
       description = "a minimalistic DNS-authoritative server";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "microdns";
       broken = true;
@@ -445401,6 +446511,19 @@ self: {
     }
   ) { };
 
+  microlens_0_5_0_0 = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "microlens";
+      version = "0.5.0.0";
+      sha256 = "0rdz2jwbv82gj7gn8rq1x6z5iyjyvmg2wq4b47mr9bqj264qwq04";
+      libraryHaskellDepends = [ base ];
+      description = "A tiny lens library with no dependencies";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   microlens-aeson = callPackage (
     {
       mkDerivation,
@@ -445443,7 +446566,7 @@ self: {
         vector
       ];
       description = "Law-abiding lenses for Aeson, using microlens";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -445468,6 +446591,26 @@ self: {
     }
   ) { };
 
+  microlens-contra_0_1_0_4 = callPackage (
+    {
+      mkDerivation,
+      base,
+      microlens,
+    }:
+    mkDerivation {
+      pname = "microlens-contra";
+      version = "0.1.0.4";
+      sha256 = "15rr6f9n91pnczx8pihlx6dcwfy8f0snkfxfb45b96fp633k95dj";
+      libraryHaskellDepends = [
+        base
+        microlens
+      ];
+      description = "True folds and getters for microlens";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   microlens-each = callPackage (
     {
       mkDerivation,
@@ -445516,6 +446659,34 @@ self: {
     }
   ) { };
 
+  microlens-ghc_0_4_15_2 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      bytestring,
+      containers,
+      microlens,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "microlens-ghc";
+      version = "0.4.15.2";
+      sha256 = "1c1ndgzh532lsnwjag9w566fbcnjkw2lbd6fnnfriccyfxhdx93b";
+      libraryHaskellDepends = [
+        array
+        base
+        bytestring
+        containers
+        microlens
+        transformers
+      ];
+      description = "microlens + array, bytestring, containers, transformers";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   microlens-mtl = callPackage (
     {
       mkDerivation,
@@ -445541,6 +446712,32 @@ self: {
     }
   ) { };
 
+  microlens-mtl_0_2_1_1 = callPackage (
+    {
+      mkDerivation,
+      base,
+      microlens,
+      mtl,
+      transformers,
+      transformers-compat,
+    }:
+    mkDerivation {
+      pname = "microlens-mtl";
+      version = "0.2.1.1";
+      sha256 = "1r9jvn4ka3lakqnwxfh72zy9yc145ll15l7cw7sqn062z74dxk0w";
+      libraryHaskellDepends = [
+        base
+        microlens
+        mtl
+        transformers
+        transformers-compat
+      ];
+      description = "microlens support for Reader/Writer/State from mtl";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   microlens-platform = callPackage (
     {
       mkDerivation,
@@ -445574,6 +446771,40 @@ self: {
     }
   ) { };
 
+  microlens-platform_0_4_4_2 = callPackage (
+    {
+      mkDerivation,
+      base,
+      hashable,
+      microlens,
+      microlens-ghc,
+      microlens-mtl,
+      microlens-th,
+      text,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "microlens-platform";
+      version = "0.4.4.2";
+      sha256 = "08y0mlmlx9hm23bp95m5nzq3zj0bz9q9in237vh0hgris8aaiwv0";
+      libraryHaskellDepends = [
+        base
+        hashable
+        microlens
+        microlens-ghc
+        microlens-mtl
+        microlens-th
+        text
+        unordered-containers
+        vector
+      ];
+      description = "microlens + all batteries included (best for apps)";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   microlens-pro = callPackage (
     {
       mkDerivation,
@@ -445594,8 +446825,8 @@ self: {
     }:
     mkDerivation {
       pname = "microlens-pro";
-      version = "0.2.0.4";
-      sha256 = "099ynp1winji1jn08dqayywliwk9midccfsv13cakhrdnbps8zj3";
+      version = "0.2.0.3";
+      sha256 = "1mmj8y7rvfasas1kqpns8aj9mr52rgb8mm8fy5qwmv0ll8r3siik";
       libraryHaskellDepends = [
         base
         containers
@@ -445617,6 +446848,50 @@ self: {
     }
   ) { };
 
+  microlens-pro_0_2_0_5 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      microlens,
+      microlens-contra,
+      microlens-platform,
+      microlens-th,
+      mtl,
+      profunctors,
+      tagged,
+      template-haskell,
+      text,
+      th-abstraction,
+      unordered-containers,
+      vector,
+    }:
+    mkDerivation {
+      pname = "microlens-pro";
+      version = "0.2.0.5";
+      sha256 = "06fhqzw1g5253680i6q8kjy1h1b278bnrq9cdcqmab3zblzxh95g";
+      libraryHaskellDepends = [
+        base
+        containers
+        microlens
+        microlens-contra
+        microlens-platform
+        microlens-th
+        mtl
+        profunctors
+        tagged
+        template-haskell
+        text
+        th-abstraction
+        unordered-containers
+        vector
+      ];
+      description = "Prisms and isomorphisms for microlens";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   microlens-process = callPackage (
     {
       mkDerivation,
@@ -445691,6 +446966,40 @@ self: {
     }
   ) { };
 
+  microlens-th_0_4_3_18 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      microlens,
+      tagged,
+      template-haskell,
+      th-abstraction,
+      transformers,
+    }:
+    mkDerivation {
+      pname = "microlens-th";
+      version = "0.4.3.18";
+      sha256 = "12zdn20v1jl3q2cr96bf9rcj8qmrfr1kd3q0pdkjmayf108g8zj1";
+      libraryHaskellDepends = [
+        base
+        containers
+        microlens
+        template-haskell
+        th-abstraction
+        transformers
+      ];
+      testHaskellDepends = [
+        base
+        microlens
+        tagged
+      ];
+      description = "Automatic generation of record lenses for microlens";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   micrologger = callPackage (
     {
       mkDerivation,
@@ -445847,7 +447156,7 @@ self: {
         text
       ];
       description = "Mustache templates for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -446250,7 +447559,7 @@ self: {
         wxcore
       ];
       description = "A Memory-like (Concentration, Pairs, ...) game for tones";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "midimory";
     }
@@ -446793,7 +448102,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -446838,7 +448147,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -446881,7 +448190,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -446920,7 +448229,7 @@ self: {
         text
       ];
       description = "Semi-automatic database schema migrations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -447364,7 +448673,7 @@ self: {
         random
       ];
       description = "Double-ended priority queues";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -447378,7 +448687,7 @@ self: {
       sha256 = "07h6hgq4k1wm4ldwb29fgmmbl9ygrlbq3qv3ymfvc25l5rvgss4h";
       doHaddock = false;
       description = "TBA";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -447515,7 +448824,7 @@ self: {
       sha256 = "04gcdvygrk2xxhqafjfnvk7cpz8n4wbwhxjqhfcz65l4id0aslpc";
       libraryHaskellDepends = [ base ];
       description = "Minimal essentials";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -447637,7 +448946,7 @@ self: {
         unix
       ];
       description = "Minimalist CI framework to run checks on local machine";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       mainProgram = "minici";
     }
   ) { };
@@ -447667,7 +448976,7 @@ self: {
         HUnit
       ];
       description = "Minimal bindings to libcurl";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -447843,7 +449152,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A SDL2-based graphics library, batteries-included";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -447893,7 +449202,7 @@ self: {
         mtl
       ];
       description = "A binding library of minilight for Lua langauge";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
     }
@@ -448101,7 +449410,7 @@ self: {
         xml-conduit
       ];
       description = "A MinIO Haskell Library for Amazon S3 compatible cloud storage";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -448156,7 +449465,7 @@ self: {
         warp
       ];
       description = "A Haskell introspectable web router";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -448194,7 +449503,7 @@ self: {
         warp
       ];
       description = "Minion conduit support";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "minion-conduit-example";
     }
   ) { };
@@ -448220,7 +449529,7 @@ self: {
         text
       ];
       description = "Minion HTMX support";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -448264,7 +449573,7 @@ self: {
         warp
       ];
       description = "Minion JWT support";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "minion-jwt-example";
     }
   ) { };
@@ -448314,7 +449623,7 @@ self: {
         text
       ];
       description = "Minion openapi3 support";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -448360,7 +449669,7 @@ self: {
         warp
       ];
       description = "Minion wrappers for wai-extra";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -448517,7 +449826,7 @@ self: {
         system-cxx-std-lib
       ];
       description = "A Haskell bundle of the Minisat SAT solver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -448611,7 +449920,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Simple and lightweight benchmarking utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -448953,7 +450262,7 @@ self: {
         vector
       ];
       description = "fortune-mod clone";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -449305,7 +450614,7 @@ self: {
         transformers
       ];
       description = "A tasty Haskell front-end web framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -449342,7 +450651,7 @@ self: {
       isLibrary = false;
       isExecutable = true;
       description = "A tasty Haskell front-end web framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = [ "javascript-ghcjs" ];
     }
   ) { };
@@ -449460,7 +450769,7 @@ self: {
         unix
       ];
       description = "A Haskell git implimentation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -449494,7 +450803,7 @@ self: {
         posix-paths
       ];
       description = "Useability extras built on top of miss";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -449586,7 +450895,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "A git wrapper with a streamlined UX";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mit";
       broken = true;
@@ -449653,7 +450962,7 @@ self: {
         hspec
       ];
       description = "Vim plugin manager written in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "miv";
     }
   ) { };
@@ -450050,8 +451359,8 @@ self: {
       pname = "mmark";
       version = "0.0.8.0";
       sha256 = "05wzjyqh4605g2y3lhcqrjh4qzj4fv8xg5baf3xi0x6ararrwjgr";
-      revision = "1";
-      editedCabalFile = "13d46lpf5b1kj6b1g89gb1s91h87njz3k69mp39nsfhwq19ygibf";
+      revision = "2";
+      editedCabalFile = "0gy66sawj11za86rwkvmr791acd84f895ym568w7wnbks9p6gmmr";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -450095,7 +451404,7 @@ self: {
         weigh
       ];
       description = "Strict markdown processor for writers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -450139,7 +451448,7 @@ self: {
         text
       ];
       description = "Command line interface to the MMark markdown processor";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "mmark";
     }
   ) { };
@@ -450163,8 +451472,8 @@ self: {
       pname = "mmark-ext";
       version = "0.2.1.5";
       sha256 = "1dy3xnzpbbnp03k3r04q8y10pcj2r708dk8bff0pxzkvypm75g88";
-      revision = "4";
-      editedCabalFile = "0girl659kn2nxzcayjzx8pflws43vp3mfw03g3ril8i49r1wkxkn";
+      revision = "5";
+      editedCabalFile = "1zhkihv0m7as1jxq14if7ksr8lwvbwpa4q7q87xs43n52fassdw9";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         base
@@ -450187,7 +451496,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Commonly useful extensions for the MMark markdown processor";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -450204,6 +451513,8 @@ self: {
       pname = "mmorph";
       version = "1.2.1";
       sha256 = "1rjclyxyr5ajnpmkrlwap77h5fmdwys8bpwfj0n87v33hh1dcn8f";
+      revision = "1";
+      editedCabalFile = "00pf88q7vpgf8inbk50023zpcwy64gvaarpj3w3ssxyk15zi6k7a";
       libraryHaskellDepends = [
         base
         mtl
@@ -450763,8 +452074,8 @@ self: {
     }:
     mkDerivation {
       pname = "mmzk-env";
-      version = "0.1.0.0";
-      sha256 = "1lrm2cp0xl5qbas91rij940c169jv29n2iyjv6nx2873yqa3ig37";
+      version = "0.1.1.1";
+      sha256 = "02bcv8767bjrbbhnl89kcl63b7c9ajadickd84sr93xxdhjx0jfk";
       libraryHaskellDepends = [
         base
         containers
@@ -450777,7 +452088,7 @@ self: {
         hspec
       ];
       description = "Read environment variables into a user-defined data type";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -450837,7 +452148,7 @@ self: {
         uuid-types
       ];
       description = "A TypeID and UUIDv7 implementation for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -450990,7 +452301,7 @@ self: {
         yaml
       ];
       description = "A HTTP server for testing HTTP clients";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mock-httpd";
       broken = true;
@@ -451095,37 +452406,88 @@ self: {
   mockcat = callPackage (
     {
       mkDerivation,
+      async,
       base,
       hspec,
       mtl,
       template-haskell,
       text,
       transformers,
+      unliftio,
+      unliftio-core,
     }:
     mkDerivation {
       pname = "mockcat";
-      version = "0.5.2.0";
-      sha256 = "0b3i5vswlijyf3142shwrw1z8vj152b4k466c0310ayih3mcc61p";
+      version = "0.5.3.0";
+      sha256 = "0vizr1ah8dhxq04chbzz8n48f5m6l86gyi27yi9z74w72g12f7f7";
       libraryHaskellDepends = [
         base
         mtl
         template-haskell
         text
         transformers
+        unliftio
+        unliftio-core
       ];
       testHaskellDepends = [
+        async
         base
         hspec
         mtl
         template-haskell
         text
         transformers
+        unliftio
+        unliftio-core
       ];
       description = "Mock library for test in Haskell";
       license = lib.licenses.mit;
     }
   ) { };
 
+  mockcat_0_5_4_0 = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      hspec,
+      mtl,
+      template-haskell,
+      text,
+      transformers,
+      unliftio,
+      unliftio-core,
+    }:
+    mkDerivation {
+      pname = "mockcat";
+      version = "0.5.4.0";
+      sha256 = "0nzrvavgrw04vz7hq0b55xq8163n8ml9wifscm0y577fq11ab827";
+      libraryHaskellDepends = [
+        base
+        mtl
+        template-haskell
+        text
+        transformers
+        unliftio
+        unliftio-core
+      ];
+      testHaskellDepends = [
+        async
+        base
+        hspec
+        mtl
+        template-haskell
+        text
+        transformers
+        unliftio
+        unliftio-core
+      ];
+      description = "Mock library for test in Haskell";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   mockery = callPackage (
     {
       mkDerivation,
@@ -451385,7 +452747,7 @@ self: {
         weigh
       ];
       description = "Modern library for working with URIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -451517,7 +452879,7 @@ self: {
         doctest
       ];
       description = "A type for integers modulo some constant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -451932,7 +453294,7 @@ self: {
         type-set
       ];
       description = "Monadic Functional Reactive Programming";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -451991,7 +453353,7 @@ self: {
         unordered-containers
       ];
       description = "Samples of moffy";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -452059,7 +453421,7 @@ self: {
         union-color
       ];
       description = "Events for sample codes of moffy";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -452087,7 +453449,7 @@ self: {
         moffy-samples-gtk3-run
       ];
       description = "Sample executables of moffy - GTK3 version";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "moffy_samples_gtk3";
     }
@@ -452153,7 +453515,7 @@ self: {
         union-color
       ];
       description = "Package to run moffy samples - GTK3 version";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -452181,7 +453543,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Sample executables of moffy - GTK4 version";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "moffy_samples_gtk4";
     }
@@ -452250,7 +453612,7 @@ self: {
         union-color
       ];
       description = "Package to run moffy samples - Gtk4 version";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -452316,7 +453678,7 @@ self: {
         bytestring
       ];
       description = "Modular Haskell Web Server";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hws";
       broken = true;
@@ -452619,8 +453981,8 @@ self: {
     }:
     mkDerivation {
       pname = "monad-bayes";
-      version = "1.3.0.4";
-      sha256 = "0r7gmymd8vy8q0hgkm2s9qmlm3q93nss6yl7rahpl2lxb838qrfy";
+      version = "1.3.0.5";
+      sha256 = "0y6rxhc9bw4vf053vj74df5nqz21w69wrizipxwipxkm66bxa058";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -452776,7 +454138,7 @@ self: {
         vty-unix
       ];
       description = "A library for probabilistic programming";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "example";
       maintainers = [ lib.maintainers.turion ];
     }
@@ -453145,6 +454507,80 @@ self: {
     }
   ) { };
 
+  monad-effect = callPackage (
+    {
+      mkDerivation,
+      async,
+      base,
+      containers,
+      criterion,
+      data-default,
+      data-effects,
+      deepseq,
+      effectful,
+      exceptions,
+      fused-effects,
+      haskell-src-meta,
+      heftia-effects,
+      logict,
+      monad-control,
+      mtl,
+      parsec,
+      polysemy,
+      resourcet,
+      stm,
+      tasty-bench,
+      template-haskell,
+      text,
+      transformers-base,
+      unix,
+    }:
+    mkDerivation {
+      pname = "monad-effect";
+      version = "0.2.0.0";
+      sha256 = "0p2karn70ha1bf325in4mwhyb09vb7scrbsji7sy1lbrizq6d428";
+      libraryHaskellDepends = [
+        async
+        base
+        data-default
+        deepseq
+        exceptions
+        haskell-src-meta
+        monad-control
+        mtl
+        parsec
+        resourcet
+        stm
+        template-haskell
+        text
+        transformers-base
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        criterion
+        mtl
+        parsec
+        text
+      ];
+      benchmarkHaskellDepends = [
+        base
+        data-effects
+        effectful
+        fused-effects
+        heftia-effects
+        logict
+        mtl
+        polysemy
+        tasty-bench
+        text
+        unix
+      ];
+      description = "A fast and lightweight effect system";
+      license = lib.licensesSpdx."BSD-3-Clause";
+    }
+  ) { };
+
   monad-exception = callPackage (
     {
       mkDerivation,
@@ -453374,7 +454810,7 @@ self: {
         comonad
       ];
       description = "Ideal Monads and coproduct of them";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -453386,7 +454822,7 @@ self: {
       sha256 = "0ajn06f3q181nf6xa4kish04bv74crqmsmk7i1ny4kw1m9ag139d";
       libraryHaskellDepends = [ base ];
       description = "Monads with an unsaveInterleaveIO-like operation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -454639,7 +456075,7 @@ self: {
         transformers
       ];
       description = "A new, simple, composable concurrency abstraction";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -454652,7 +456088,7 @@ self: {
       sha256 = "0hqlwimwdhxwcikmy41qlkzr09dxx7ibpzr2g4czlv07c6fwlm3q";
       libraryHaskellDepends = [ base ];
       description = "Monads of program skeleta";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -454909,7 +456345,7 @@ self: {
         typed-process
       ];
       description = "Functions to exit the program anywhere in MonadThrow monads";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -454960,7 +456396,7 @@ self: {
         time
       ];
       description = "Adaptation of the monad-time library for the effectful ecosystem";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -455177,7 +456613,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A monad transformer for data validation";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -455252,7 +456688,7 @@ self: {
       sha256 = "048xk3zr7237c0mzr6lfca3qsgh60icnp8vw3vg2pj12z8id62ka";
       libraryHaskellDepends = [ base ];
       description = "A collection of monad transformers";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -455292,7 +456728,7 @@ self: {
         transformers
       ];
       description = "The Acme and AcmeT monads";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -455426,7 +456862,7 @@ self: {
         transformers
       ];
       description = "GHC plugin to desugar ! into do-notation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -455456,7 +456892,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Recursion Schemes for Monadic version";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -455728,7 +457164,7 @@ self: {
         text
       ];
       description = "The best ideas in monad-related classes and types";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -455786,7 +457222,7 @@ self: {
         transformers
       ];
       description = "Monad classes, using type families";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -456577,7 +458013,7 @@ self: {
         witherable
       ];
       description = "A monoidal map with the right group instance";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -456817,7 +458253,7 @@ self: {
         mtl
       ];
       description = "Monoidal Functors Library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "co-log";
     }
   ) { };
@@ -456847,7 +458283,7 @@ self: {
         nothunks
       ];
       description = "Monoidal map type";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -456893,7 +458329,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "JSON support for monoidmap";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -456926,7 +458362,30 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Examples for monoidmap";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
+    }
+  ) { };
+
+  monoidmap-hashable = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      hashable,
+      monoidmap,
+    }:
+    mkDerivation {
+      pname = "monoidmap-hashable";
+      version = "0.0.0.0";
+      sha256 = "0ifqn4998qgmvb7f7vanmrw7qvf6a5ycdxan8dpyp4z2vyslphrl";
+      libraryHaskellDepends = [
+        base
+        containers
+        hashable
+        monoidmap
+      ];
+      description = "Hashing support for monoidmap";
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -456986,7 +458445,7 @@ self: {
         tasty-hunit
       ];
       description = "Internal support for monoidmap";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -457011,7 +458470,7 @@ self: {
         QuickCheck
       ];
       description = "QuickCheck support for monoidmap";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -457553,7 +459012,7 @@ self: {
         time-compat
       ];
       description = "MonthName";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -457584,7 +459043,7 @@ self: {
         tasty-smallcheck
       ];
       description = "a 'Monus' is a commutative monoid that allows a notion of substraction";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -457789,7 +459248,7 @@ self: {
       ];
       doHaddock = false;
       description = "Invocation helpers for the ReaderT-record-of-functions style";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -458343,7 +459802,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Upgradeability infrastructure based on Morley";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "morley-ustore-reader";
     }
@@ -459899,7 +461358,7 @@ self: {
         optparse-applicative
       ];
       description = "Print current MPD song and status as JSON";
-      license = lib.licenses.unlicense;
+      license = lib.licensesSpdx."Unlicense";
       mainProgram = "mpd-current-json";
     }
   ) { };
@@ -460418,7 +461877,7 @@ self: {
         text
       ];
       description = "Datastructures to describe TCP and MPTCP connections";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -460525,7 +461984,7 @@ self: {
         text
       ];
       description = "A Multipath TCP path manager";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcp-pm";
@@ -460705,7 +462164,7 @@ self: {
         QuickCheck
       ];
       description = "A Multipath TCP analyzer";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mptcpanalyzer";
     }
@@ -460885,7 +462344,7 @@ self: {
         hspec
       ];
       description = "A simple way to read environment variables in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -462044,7 +463503,7 @@ self: {
         transformers
       ];
       description = "Monad classes for transformers, using functional dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -462157,7 +463616,7 @@ self: {
         transformers
       ];
       description = "Monad classes for transformers, using functional dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -462289,7 +463748,7 @@ self: {
         mtl
       ];
       description = "Lift substacks of monad transformer stacks";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -462398,7 +463857,7 @@ self: {
         mtl
       ];
       description = "Reified monad transformer stacks";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -463528,7 +464987,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A few multimap variants";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -463556,7 +465015,7 @@ self: {
       ];
       doHaddock = false;
       description = "Multiple Exceptions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -463576,7 +465035,7 @@ self: {
         hedgehog
       ];
       description = "Typeclasses augmented with a phantom type parameter";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -463739,7 +465198,7 @@ self: {
         template-haskell
       ];
       description = "Self-identifying base encodings, implementation of <https://github.com/multiformats/multihash>";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -463765,7 +465224,7 @@ self: {
         sop-core
       ];
       description = "Uncurry functions with multiple arguments";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -463832,7 +465291,7 @@ self: {
         toml-reader
       ];
       description = "Simple tool for running commands in multiple directories";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "muld";
       broken = true;
@@ -464028,7 +465487,7 @@ self: {
         hedgehog
       ];
       description = "Self-identifying hashes, implementation of <https://github.com/multiformats/multihash>";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -464064,7 +465523,7 @@ self: {
         serialise
       ];
       description = "CBOR encoding of multihashes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -464933,7 +466392,7 @@ self: {
         haskeline
       ];
       description = "A framework for multiverse debugging";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "multiverse-debugging-exe";
     }
   ) { };
@@ -464977,7 +466436,7 @@ self: {
         transformers
       ];
       description = "Traverse data types via generics, acting on multiple types simultaneously";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -465056,6 +466515,8 @@ self: {
       ];
       description = "MUtually Recursive Definitions Explicitly Represented";
       license = "LGPL";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -466033,6 +467494,64 @@ self: {
     }
   ) { };
 
+  musig2 = callPackage (
+    {
+      mkDerivation,
+      base,
+      base16-bytestring,
+      binary,
+      bytestring,
+      containers,
+      criterion,
+      deepseq,
+      entropy,
+      ppad-secp256k1,
+      ppad-sha256,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+    }:
+    mkDerivation {
+      pname = "musig2";
+      version = "0.1.0";
+      sha256 = "02398ib1jxb41ksxf1mxzqfbj53dz1gfz87a05fym3jywf2yf2ml";
+      libraryHaskellDepends = [
+        base
+        base16-bytestring
+        binary
+        bytestring
+        containers
+        entropy
+        ppad-secp256k1
+        ppad-sha256
+      ];
+      testHaskellDepends = [
+        base
+        base16-bytestring
+        binary
+        bytestring
+        containers
+        entropy
+        ppad-secp256k1
+        ppad-sha256
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        base16-bytestring
+        bytestring
+        criterion
+        deepseq
+        ppad-secp256k1
+      ];
+      description = "MuSig2 library";
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   mustache = callPackage (
     {
       mkDerivation,
@@ -466334,7 +467853,7 @@ self: {
         vector
       ];
       description = "Mutable Fenwick trees";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -466405,7 +467924,7 @@ self: {
         primitive
       ];
       description = "Interoperate mutable references with regular lens";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -466459,7 +467978,7 @@ self: {
         safe-exceptions
       ];
       description = "A trivial lock based on MVar";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -466695,7 +468214,7 @@ self: {
       ];
       doCheck = false;
       description = "Fast, high quality pseudo random number generation";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -467613,7 +469132,7 @@ self: {
         vector
       ];
       description = "pure haskell MySQL driver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -467828,7 +469347,7 @@ self: {
         vector
       ];
       description = "pure haskell MySQL driver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -468098,7 +469617,7 @@ self: {
         vty
       ];
       description = "Tool to keep track of what you have been working on and where";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "mywork";
     }
@@ -468167,7 +469686,7 @@ self: {
         text
       ];
       description = "A Haskell client for the Myxine GUI server";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -468754,7 +470273,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Named parameters (keyword arguments) for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -468794,7 +470313,7 @@ self: {
         text
       ];
       description = "NBT (named binary tag) serialization and deserialization";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -469030,7 +470549,7 @@ self: {
         unordered-containers
       ];
       description = "A parameterized named text type and associated functionality";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -469421,7 +470940,7 @@ self: {
         transformers
       ];
       description = "Create compilers using small passes and many intermediate representations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "dumb-nanopass-example";
       broken = true;
@@ -469757,7 +471276,7 @@ self: {
         text
       ];
       description = "Refinement types for natural numbers with an optics interface";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -470107,7 +471626,7 @@ self: {
         unlifted
       ];
       description = "Arithmetic of natural numbers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -470287,6 +471806,104 @@ self: {
     }
   ) { };
 
+  nbparts = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      base,
+      base64-bytestring,
+      bytestring,
+      commonmark,
+      containers,
+      crypton,
+      directory,
+      filepath,
+      hedgehog,
+      hspec,
+      hspec-discover,
+      hspec-hedgehog,
+      ipynb,
+      libyaml,
+      megaparsec,
+      memory,
+      mime-types,
+      mtl,
+      optparse-applicative,
+      parsec,
+      req,
+      scientific,
+      temporary,
+      text,
+      transformers,
+      vector,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "nbparts";
+      version = "0.1.1.0";
+      sha256 = "18nmi2z41d1smxia0fyyii855phwmc3ac3bpd3hlixp8fnpr66g1";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        base64-bytestring
+        bytestring
+        commonmark
+        containers
+        crypton
+        directory
+        filepath
+        ipynb
+        libyaml
+        megaparsec
+        memory
+        mime-types
+        mtl
+        parsec
+        text
+        transformers
+        yaml
+      ];
+      executableHaskellDepends = [
+        base
+        mtl
+        optparse-applicative
+        text
+      ];
+      testHaskellDepends = [
+        aeson
+        base
+        bytestring
+        commonmark
+        containers
+        directory
+        filepath
+        hedgehog
+        hspec
+        hspec-hedgehog
+        ipynb
+        mime-types
+        mtl
+        parsec
+        req
+        scientific
+        temporary
+        text
+        vector
+        yaml
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Unpack a Jupyter notebook into its sources, metadata and outputs";
+      license = lib.licensesSpdx."Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "nbparts";
+      broken = true;
+    }
+  ) { };
+
   nbt = callPackage (
     {
       mkDerivation,
@@ -470492,7 +472109,7 @@ self: {
         tasty-hunit
       ];
       description = "Quasiquoter for neat and simple multiline text interpolation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -470677,7 +472294,7 @@ self: {
       sha256 = "08jk7hn5mp89vxfkh9cl7rj5b9sjjwil4lic5gpgsbwpvy8rd8a8";
       libraryHaskellDepends = [ base ];
       description = "The Neither datatype";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -470818,7 +472435,7 @@ self: {
         random
       ];
       description = "Unofficial nekos.best API wrapper";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -470942,7 +472559,7 @@ self: {
         hedgehog
       ];
       description = "NonEmpty lists that look [more, like, this]";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -471059,7 +472676,7 @@ self: {
         vector
       ];
       description = "Neptune Client";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example-app";
       broken = true;
@@ -471074,7 +472691,7 @@ self: {
       sha256 = "0nbgb9lz0ibha72gyh0q86rbssik2fxphab6f1asm0r5kz5va3ly";
       libraryHaskellDepends = [ base ];
       description = "Nerd Font Icons for use in haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -471532,7 +473149,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "NestedText: A Human Friendly Data Format";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -472846,7 +474463,7 @@ self: {
         unix
       ];
       description = "Binding to C socket API operating on bytearrays";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -473299,7 +474916,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Arbitrary Instances for Network Types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -473583,7 +475200,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "CAN bus networking";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -473743,7 +475360,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library to control network protocols";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -473872,7 +475489,7 @@ self: {
         network
       ];
       description = "Adaptation of the network library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -474428,7 +476045,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Types for working with Linux packet sockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -474738,7 +476355,7 @@ self: {
         transformers
       ];
       description = "Simple interface to TLS secured network sockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -474767,7 +476384,7 @@ self: {
         websockets
       ];
       description = "Simple interface to WebSockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -474796,7 +476413,7 @@ self: {
         websockets
       ];
       description = "Simple interface to TLS secured WebSockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -474932,7 +476549,7 @@ self: {
         transformers
       ];
       description = "Network abstraction layer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -475046,7 +476663,7 @@ self: {
         network-transport-tests
       ];
       description = "In-memory instantiation of Network.Transport";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -475085,7 +476702,7 @@ self: {
         network-transport-tests
       ];
       description = "TCP instantiation of Network.Transport";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -475114,7 +476731,7 @@ self: {
         random
       ];
       description = "Unit tests for Network.Transport implementations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -475250,7 +476867,7 @@ self: {
         stm
       ];
       description = "Network functions that do not throw exceptions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { };
@@ -476015,7 +477632,7 @@ self: {
       ];
       doHaddock = false;
       description = "Future-proof system for plain-text notes";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "neuron";
     }
@@ -476154,7 +477771,7 @@ self: {
         text
       ];
       description = "newline specifications as values";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -476266,7 +477883,7 @@ self: {
         warp
       ];
       description = "A basic newsletter implimentation, using various backends";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "newsletter-server";
       broken = true;
@@ -476302,7 +477919,7 @@ self: {
         text
       ];
       description = "A mailgun backend for the newsletter package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -476528,7 +478145,7 @@ self: {
         random
       ];
       description = "Newtype Wrapper Zoo";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -477598,6 +479215,25 @@ self: {
     }
   ) { };
 
+  nix = callPackage (
+    {
+      mkDerivation,
+      base,
+      relude,
+    }:
+    mkDerivation {
+      pname = "nix";
+      version = "0.1.0.0";
+      sha256 = "1crnwkdpr44m9ccx5x525llha6k4iy4n3i8y4g3qpj9zh8iy5pc5";
+      libraryHaskellDepends = [
+        base
+        relude
+      ];
+      description = "Haskell wrapper for the Nix CLI";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   nix-delegate = callPackage (
     {
       mkDerivation,
@@ -477806,7 +479442,7 @@ self: {
         typed-process
       ];
       description = "Explain why two Nix derivations differ";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "nix-diff";
       maintainers = [
         lib.maintainers.Gabriella439
@@ -477909,7 +479545,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Convert a tree of files into fixed-output derivations";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "nix-freeze-tree";
       broken = true;
@@ -477959,7 +479595,7 @@ self: {
         optparse-applicative
       ];
       description = "Reify the Nix build graph into a Haskell graph data structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "nix-graph";
     }
   ) { };
@@ -478003,33 +479639,52 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Parse and render .narinfo files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "pretty-narinfo";
       maintainers = [ lib.maintainers.sorki ];
     }
   ) { };
 
-  nix-paths = callPackage (
-    {
-      mkDerivation,
-      base,
-      nix,
-      process,
-    }:
-    mkDerivation {
-      pname = "nix-paths";
-      version = "1.0.1";
-      sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb";
-      libraryHaskellDepends = [
-        base
-        process
-      ];
-      libraryToolDepends = [ nix ];
-      description = "Knowledge of Nix's installation directories";
-      license = lib.licenses.bsd3;
-      maintainers = [ lib.maintainers.peti ];
-    }
-  ) { inherit (pkgs) nix; };
+  nix-paths =
+    callPackage
+      (
+        {
+          mkDerivation,
+          base,
+          nix-build,
+          nix-env,
+          nix-hash,
+          nix-instantiate,
+          nix-store,
+          process,
+        }:
+        mkDerivation {
+          pname = "nix-paths";
+          version = "1.0.1";
+          sha256 = "1y09wl1ihxmc9p926g595f70pdcsx78r3q5n5rna23lpq8xicdxb";
+          libraryHaskellDepends = [
+            base
+            process
+          ];
+          libraryToolDepends = [
+            nix-build
+            nix-env
+            nix-hash
+            nix-instantiate
+            nix-store
+          ];
+          description = "Knowledge of Nix's installation directories";
+          license = lib.licenses.bsd3;
+          maintainers = [ lib.maintainers.peti ];
+        }
+      )
+      {
+        nix-build = null;
+        nix-env = null;
+        nix-hash = null;
+        nix-instantiate = null;
+        nix-store = null;
+      };
 
   nix-serve-ng = callPackage (
     {
@@ -478095,7 +479750,7 @@ self: {
         vector
       ];
       description = "A drop-in replacement for nix-serve that's faster and more stable";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "nix-serve";
     }
   ) { inherit (pkgs) nix; };
@@ -478310,15 +479965,13 @@ self: {
     }:
     mkDerivation {
       pname = "nix-tree";
-      version = "0.6.3";
-      sha256 = "06dzf87vckd11yiq2ng6l80rd17p920lajykn1vy2azyhivkp59j";
-      isLibrary = false;
+      version = "0.7.0";
+      sha256 = "1h7klpr5km134f6393gjwnfwgpppvar56w8n7ksjw8aawy7czi0c";
+      isLibrary = true;
       isExecutable = true;
-      executableHaskellDepends = [
+      libraryHaskellDepends = [
         aeson
-        async
         base
-        brick
         bytestring
         clock
         containers
@@ -478329,21 +479982,33 @@ self: {
         microlens
         optparse-applicative
         relude
+        text
+        typed-process
+        unordered-containers
+        vty
+      ];
+      executableHaskellDepends = [
+        async
+        base
+        brick
+        clock
+        containers
+        directory
+        filepath
+        hrfsize
+        microlens
+        optparse-applicative
+        relude
         terminal-progress-bar
         text
         typed-process
-        unordered-containers
         vty
       ];
       testHaskellDepends = [
-        aeson
         base
-        brick
-        bytestring
         clock
         containers
         directory
-        dot
         filepath
         hedgehog
         hrfsize
@@ -478352,11 +480017,10 @@ self: {
         relude
         text
         typed-process
-        unordered-containers
         vty
       ];
       description = "Interactively browse a Nix store paths dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "nix-tree";
       maintainers = [ lib.maintainers.utdemir ];
     }
@@ -478739,7 +480403,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Tool for semi-automatic updating of nixpkgs repository";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "nixpkgs-update";
       broken = true;
@@ -478783,7 +480447,7 @@ self: {
       ];
       doHaddock = false;
       description = "Nkeys ed25519 encoding for use with NATS";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -479101,7 +480765,7 @@ self: {
         doctest
       ];
       description = "A GHC plugin to remove support for recursion";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -479860,7 +481524,7 @@ self: {
         utility-ht
       ];
       description = "List-like structures with static restrictions on the number of elements";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -480157,7 +481821,7 @@ self: {
         hedgehog-classes
       ];
       description = "nonempty structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -480192,7 +481856,7 @@ self: {
         vector
       ];
       description = "Non-empty vectors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -480221,7 +481885,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Create NonEmpty version of any container";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -480256,7 +481920,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "aeson instances for 'NonEmpty'";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -480277,7 +481941,7 @@ self: {
         QuickCheck
       ];
       description = "QuickCheck instance for 'NonEmpty'";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -480300,7 +481964,7 @@ self: {
         text
       ];
       description = "'NonEmpty' wrappers for text";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -480782,7 +482446,7 @@ self: {
         transformers
       ];
       description = "An opinionated Prelude replacement library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -480859,7 +482523,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Examine values for unexpected thunks";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -480976,7 +482640,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "Haskell binding to Notmuch, the mail indexer";
-          license = lib.licenses.gpl3Plus;
+          license = lib.licensesSpdx."GPL-3.0-or-later";
         }
       )
       {
@@ -482050,7 +483714,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Efficient, infinite-precision 2D and 3D spatial containers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -482490,7 +484154,7 @@ self: {
         tasty-bench
       ];
       description = "Create number walls and save them as images";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -483011,7 +484675,7 @@ self: {
         utility-ht
       ];
       description = "An experimental alternative hierarchy of numeric type classes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -483173,7 +484837,7 @@ self: {
         vector
       ];
       description = "core package for Numerical Haskell project";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -483193,7 +484857,7 @@ self: {
         system-cxx-std-lib
       ];
       description = "Numerical integration";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -483227,7 +484891,7 @@ self: {
         QuickCheck
       ];
       description = "A numeric class hierarchy";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -483252,7 +484916,7 @@ self: {
         vector
       ];
       description = "Multi-dimensional arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -483287,7 +484951,7 @@ self: {
         numhask
       ];
       description = "numerical free algebras";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -483320,7 +484984,7 @@ self: {
         numhask-prelude
       ];
       description = "Laws and tests for numhask";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -483376,7 +485040,7 @@ self: {
       ];
       testHaskellDepends = [ doctest ];
       description = "A numeric prelude";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -483458,7 +485122,7 @@ self: {
         doctest-parallel
       ];
       description = "Numerical spaces";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -483665,6 +485329,8 @@ self: {
       pname = "nvfetcher";
       version = "0.7.0.0";
       sha256 = "0idcca3g1rfm8rc7zy68pdbhv4s0npdzdb47ixj0hk2pr8rg51ak";
+      revision = "1";
+      editedCabalFile = "0pkcsb97x64fnrrs93l73k1yydrnswh8drwdab90c4ac9wjjxvk8";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -483745,7 +485411,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generate nix sources expr for the latest version of packages";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "nvfetcher";
       maintainers = [ lib.maintainers.berberman ];
     }
@@ -483839,7 +485505,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Haskell plugin backend for neovim";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -484324,7 +485990,7 @@ self: {
         markdown-unlit
       ];
       description = "Type-safe time library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "play-o-clock";
       broken = true;
@@ -484339,8 +486005,8 @@ self: {
     }:
     mkDerivation {
       pname = "oalg-abg";
-      version = "1.0.0.0";
-      sha256 = "14qi1ypsrnngpc1j5vqn6l5nccc23k95h9cn9s9fpcmqcy8czlf0";
+      version = "2.0.0.0";
+      sha256 = "0rs1w1nxm1n6bplkz5krcjfs8jdp7k3fsgckwbg0332q939513mr";
       libraryHaskellDepends = [
         base
         oalg-base
@@ -484351,7 +486017,6 @@ self: {
       ];
       description = "Finitely generated abelian groups";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -484366,8 +486031,8 @@ self: {
     }:
     mkDerivation {
       pname = "oalg-base";
-      version = "1.1.4.0";
-      sha256 = "0i76n1pvak51bnkrq6m4nirzpnmqqclr6wk00vmws3c90w3dm6xm";
+      version = "3.0.0.0";
+      sha256 = "1hd1884i0qfld1vfpjq5sc7ss3wl2cimsvfxdhcg0y2v4zyxm4z1";
       libraryHaskellDepends = [
         array
         base
@@ -484384,8 +486049,6 @@ self: {
       ];
       description = "Algebraic structures on oriented entities and limits as a tool kit to solve algebraic problems";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -484549,7 +486212,7 @@ self: {
         tasty-bench
       ];
       description = "Composable concurrent computation done right";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -484781,7 +486444,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Live in-memory sync of Obsidian Markdown notes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -484875,7 +486538,7 @@ self: {
         text
       ];
       description = "Ordered Reduced Binary Decision Diagrams";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -484919,6 +486582,7 @@ self: {
       doHaddock = false;
       description = "Oberon0 Compiler";
       license = "LGPL";
+      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -485028,7 +486692,7 @@ self: {
         witherable
       ];
       description = "Composable objects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -485213,7 +486877,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Object capability based IO";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -486073,7 +487737,7 @@ self: {
     }
   ) { };
 
-  ogma-cli_1_9_0 = callPackage (
+  ogma-cli_1_10_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -486090,8 +487754,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-cli";
-      version = "1.9.0";
-      sha256 = "0br6rv5bli12xhbr8igxgwrp3j4cbm8mxqhva6mxykg6s2s19wab";
+      version = "1.10.0";
+      sha256 = "1fli4xhdrzbzkwjidz5piif4hs0zscw4rs6z30d9gb2zf4kl5h4z";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -486111,7 +487775,7 @@ self: {
         unix
       ];
       description = "Ogma: Helper tool to interoperate between Copilot and other languages";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ogma";
     }
@@ -486189,7 +487853,7 @@ self: {
     }
   ) { };
 
-  ogma-core_1_9_0 = callPackage (
+  ogma-core_1_10_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -486221,8 +487885,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-core";
-      version = "1.9.0";
-      sha256 = "1nh0qnb84sy0qwks1fpyvz7i7sini5sqk1a7na82axw5jkhjdhrg";
+      version = "1.10.0";
+      sha256 = "010bdip18i0vkhkg2yp1yb4691przni612nwfjz8wrcdxgxvnpz0";
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
@@ -486257,7 +487921,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Ogma: Helper tool to interoperate between Copilot and other languages";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486302,7 +487966,7 @@ self: {
     }
   ) { };
 
-  ogma-extra_1_9_0 = callPackage (
+  ogma-extra_1_10_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -486319,8 +487983,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-extra";
-      version = "1.9.0";
-      sha256 = "0cl4gfkkms75p1yl137dlpfivqqgc491dmh55iwagqszkgaix0lg";
+      version = "1.10.0";
+      sha256 = "0y2jmqnw1nfai225nl9x37klwynrwl2yz1352zix709cc0spma8i";
       libraryHaskellDepends = [
         aeson
         base
@@ -486338,7 +488002,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Ogma: Helper tool to interoperate between Copilot and other languages";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486386,7 +488050,7 @@ self: {
     }
   ) { };
 
-  ogma-language-c_1_9_0 = callPackage (
+  ogma-language-c_1_10_0 = callPackage (
     {
       mkDerivation,
       alex,
@@ -486402,8 +488066,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-c";
-      version = "1.9.0";
-      sha256 = "1s6acmdbvqzhdjd67vlsc0y5ld4s7z0w5g35ka3d6sqk4sj0j795";
+      version = "1.10.0";
+      sha256 = "0gamqxl9ajw1fnywx9wkip86xh6b9pgc6l5f80lvkw486g1qp5qf";
       setupHaskellDepends = [
         base
         Cabal
@@ -486425,7 +488089,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Ogma: Runtime Monitor translator: C Language Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486481,15 +488145,15 @@ self: {
     }
   ) { };
 
-  ogma-language-copilot_1_9_0 = callPackage (
+  ogma-language-copilot_1_10_0 = callPackage (
     { mkDerivation, base }:
     mkDerivation {
       pname = "ogma-language-copilot";
-      version = "1.9.0";
-      sha256 = "0sl2n2m1nkllmzrb2av6s1q1iq7jz9zrjh5mxczriwk3c1jv7x2c";
+      version = "1.10.0";
+      sha256 = "14zx4n9xqd36rn8s6akv5f2rlpvamlg4704n0c0yg2zs6n95zxlw";
       libraryHaskellDepends = [ base ];
       description = "Ogma: Runtime Monitor translator: Copilot Language Endpoints";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486523,7 +488187,7 @@ self: {
     }
   ) { };
 
-  ogma-language-csv_1_9_0 = callPackage (
+  ogma-language-csv_1_10_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -486536,8 +488200,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-csv";
-      version = "1.9.0";
-      sha256 = "0mkkbgia5dvnpqy11pqxvikjvgck0zq7cx1alnsh6hi9j1qj75ad";
+      version = "1.10.0";
+      sha256 = "0j8w9r1618lqv922mdadvhgfyqjhmbh84giz8jwlx7dmqzk28a88";
       libraryHaskellDepends = [
         base
         bytestring
@@ -486548,7 +488212,7 @@ self: {
         vector
       ];
       description = "Ogma: Runtime Monitor translator: CSV Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486658,7 +488322,7 @@ self: {
     }
   ) { };
 
-  ogma-language-jsonspec_1_9_0 = callPackage (
+  ogma-language-jsonspec_1_10_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -486672,8 +488336,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-jsonspec";
-      version = "1.9.0";
-      sha256 = "0wlkl13gg0jbi8fvszk4z1l0c4l7b0n68gnhnmn93srcn14iinkn";
+      version = "1.10.0";
+      sha256 = "1f9ha1jbg3pgyjhjwdf6xyiwsmca29pgpg0zk2gljmw9q7ry4b9i";
       libraryHaskellDepends = [
         aeson
         base
@@ -486685,7 +488349,7 @@ self: {
         text
       ];
       description = "Ogma: Runtime Monitor translator: JSON Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486733,7 +488397,7 @@ self: {
     }
   ) { };
 
-  ogma-language-lustre_1_9_0 = callPackage (
+  ogma-language-lustre_1_10_0 = callPackage (
     {
       mkDerivation,
       alex,
@@ -486749,8 +488413,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-lustre";
-      version = "1.9.0";
-      sha256 = "0rb22md683flgxkg08jzga4q7fynykzh25k1gcr6rsj0kaaxi4fj";
+      version = "1.10.0";
+      sha256 = "12s58r5g9q9c4jmwck97w8ff6567ncyh1kclvw0mcqpgk09cpvk2";
       setupHaskellDepends = [
         base
         Cabal
@@ -486772,7 +488436,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Ogma: Runtime Monitor translator: Lustre Language Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486820,7 +488484,7 @@ self: {
     }
   ) { };
 
-  ogma-language-smv_1_9_0 = callPackage (
+  ogma-language-smv_1_10_0 = callPackage (
     {
       mkDerivation,
       alex,
@@ -486836,8 +488500,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-smv";
-      version = "1.9.0";
-      sha256 = "15dsh5j6iaapaxi6i05z44shvbxvs5945r93046d6shxvxz5q5gb";
+      version = "1.10.0";
+      sha256 = "0cq0kdipn79wvhpfx51w52c78djki7dn7c12dl93w585r6f0spzp";
       setupHaskellDepends = [
         base
         Cabal
@@ -486859,7 +488523,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Ogma: Runtime Monitor translator: SMV Language Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486889,7 +488553,7 @@ self: {
     }
   ) { };
 
-  ogma-language-xlsx_1_9_0 = callPackage (
+  ogma-language-xlsx_1_10_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -486900,8 +488564,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-xlsx";
-      version = "1.9.0";
-      sha256 = "191s4kc2gicgrdl3jzw9j31l0yncaradii2vz7h3gqg2rz63qfsv";
+      version = "1.10.0";
+      sha256 = "0n9i60kdm8blazgpq2swsdnpjryig6w7kykb9gws7hhlg5m16vkx";
       libraryHaskellDepends = [
         base
         bytestring
@@ -486910,7 +488574,7 @@ self: {
         xlsx
       ];
       description = "Ogma: Runtime Monitor translator: XLSX Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486944,7 +488608,7 @@ self: {
     }
   ) { };
 
-  ogma-language-xmlspec_1_9_0 = callPackage (
+  ogma-language-xmlspec_1_10_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -486957,8 +488621,8 @@ self: {
     }:
     mkDerivation {
       pname = "ogma-language-xmlspec";
-      version = "1.9.0";
-      sha256 = "07cp3d543pnbmb7qma8l9v1zfnh3nn41azl1clv8p9bsfgm5a86j";
+      version = "1.10.0";
+      sha256 = "091b8gp7z0hnmcfzx5id3sybp87598zzhbhjw1nmhkszphyd2y7z";
       libraryHaskellDepends = [
         base
         hxt
@@ -486969,7 +488633,7 @@ self: {
         pretty
       ];
       description = "Ogma: Runtime Monitor translator: XML Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -486986,15 +488650,15 @@ self: {
     }
   ) { };
 
-  ogma-spec_1_9_0 = callPackage (
+  ogma-spec_1_10_0 = callPackage (
     { mkDerivation, base }:
     mkDerivation {
       pname = "ogma-spec";
-      version = "1.9.0";
-      sha256 = "1vg67wg2px1lp89m29h1dyy4cqgpxq5yfsdq6kg63b0i8dlv71g8";
+      version = "1.10.0";
+      sha256 = "078npma0dkqlhwiqw75s9q6k3c4h2m6g4v1wpxgj1n9laz4bf1nn";
       libraryHaskellDepends = [ base ];
       description = "Ogma: Runtime Monitor translator: JSON Frontend";
-      license = "unknown";
+      license = lib.licenses.asl20;
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -487081,7 +488745,7 @@ self: {
         xml-types
       ];
       description = "An Entity-Component-Systems engine core";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -487413,8 +489077,8 @@ self: {
     }:
     mkDerivation {
       pname = "ollama-haskell";
-      version = "0.2.0.0";
-      sha256 = "00vgffjzhyc060x59gxrqazzclkm3bspmvzva5kc2c2319l93wy8";
+      version = "0.2.1.0";
+      sha256 = "0xs28lq5x7bc5qf35n2g2vnchvy0fw88yg0qvv4fl7swf15wdr0i";
       libraryHaskellDepends = [
         aeson
         base
@@ -487483,7 +489147,9 @@ self: {
         text
       ];
       description = "A typed-hole plugin that uses LLMs to generate valid hole-fits";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -487592,7 +489258,7 @@ self: {
         text
       ];
       description = "om-doh";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -487631,7 +489297,7 @@ self: {
         wai
       ];
       description = "Haskell utilities for building embedded Elm programs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -487654,7 +489320,7 @@ self: {
         transformers
       ];
       description = "Monad transformer providing MonadFail";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -487695,7 +489361,7 @@ self: {
         unliftio
       ];
       description = "Concurrency utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -487756,7 +489422,7 @@ self: {
         warp
       ];
       description = "Http utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -487819,7 +489485,7 @@ self: {
         warp
       ];
       description = "Http utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -487897,7 +489563,7 @@ self: {
         x509-store
       ];
       description = "om-kubernetes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -487967,7 +489633,7 @@ self: {
         uuid
       ];
       description = "Legion Framework";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -488000,7 +489666,7 @@ self: {
         time
       ];
       description = "Opinionated logging utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -488025,7 +489691,7 @@ self: {
         time
       ];
       description = "Plugin-based explicit import generation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -488048,7 +489714,7 @@ self: {
         text
       ];
       description = "Utilities for showing string-like things";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -488112,7 +489778,7 @@ self: {
         unliftio-core
       ];
       description = "Socket utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -488139,7 +489805,7 @@ self: {
         transformers
       ];
       description = "Misc. time utilites";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -488524,7 +490190,7 @@ self: {
         text
       ];
       description = "Pretty-printing short Aeson values as text";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -488656,7 +490322,7 @@ self: {
         torsor
       ];
       description = "HMAC-Based and Time-Based One-Time Passwords";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "one-time-password";
     }
   ) { };
@@ -488742,7 +490408,7 @@ self: {
         numhask
       ];
       description = "See readme.md";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -488785,7 +490451,7 @@ self: {
         numhask-prelude
       ];
       description = "See readme.md";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -488914,7 +490580,7 @@ self: {
         hspec-discover
       ];
       description = "Combinators for handling errors of many types in a composable way";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -488943,7 +490609,7 @@ self: {
         transformers
       ];
       description = "Oops examples";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -488966,7 +490632,7 @@ self: {
         doctest
       ];
       description = "Common operators encouraging large-scale easy reading";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -489197,7 +490863,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Text search utilities for Opaleye";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -489338,7 +491004,7 @@ self: {
         xml-parser
       ];
       description = "OPC XML-DA Client";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -489657,7 +491323,7 @@ self: {
         witness
       ];
       description = "open witnesses";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -489672,6 +491338,7 @@ self: {
       http-api-data,
       http-client,
       http-client-tls,
+      http-types,
       servant,
       servant-client,
       servant-multipart-api,
@@ -489680,12 +491347,13 @@ self: {
       tasty-hunit,
       text,
       time,
+      unordered-containers,
       vector,
     }:
     mkDerivation {
       pname = "openai";
-      version = "1.1.1";
-      sha256 = "18ny5r06nfs7px4bgr9k930w1v5ksbzc1vslx75y4bb1lndg3ipd";
+      version = "2.1.0";
+      sha256 = "07v6qwp32i6dmxavlcx1kg2jp4lcmp8ah4bf0q55ldbd4b1mc88q";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -489697,12 +491365,14 @@ self: {
         http-api-data
         http-client
         http-client-tls
+        http-types
         servant
         servant-client
         servant-multipart-api
         servant-multipart-client
         text
         time
+        unordered-containers
         vector
       ];
       executableHaskellDepends = [
@@ -489723,7 +491393,7 @@ self: {
         text
       ];
       description = "Servant bindings to OpenAI";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -489924,7 +491594,7 @@ self: {
         warp
       ];
       description = "Auto-generated API bindings for openai";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -490320,6 +491990,7 @@ self: {
       description = "OpenAPI3 Haskell Client Code Generator";
       license = lib.licenses.mit;
       mainProgram = "openapi3-code-generator-exe";
+      maintainers = [ lib.maintainers.turion ];
     }
   ) { };
 
@@ -490340,7 +492011,7 @@ self: {
       ];
       librarySystemDepends = [ opencascade-occt ];
       description = "Thin Wrapper for the OpenCASCADE CAD Kernel";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
     }
   ) { inherit (pkgs) opencascade-occt; };
 
@@ -490374,7 +492045,7 @@ self: {
         transformers
       ];
       description = "OpenCC bindings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -490681,7 +492352,7 @@ self: {
       libraryPkgconfigDepends = [ opendht-c ];
       libraryToolDepends = [ c2hs ];
       description = "Haskell bindings for OpenDHT";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -491047,7 +492718,7 @@ self: {
         unordered-containers
       ];
       description = "An OpenID Connect library that does all the heavy lifting for you";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -491507,7 +493178,7 @@ self: {
         ghc-trace-events
         hashable
       ];
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -491623,7 +493294,7 @@ self: {
         opentelemetry
         tasty-bench
       ];
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -491649,7 +493320,7 @@ self: {
         opentelemetry
         text
       ];
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -491719,7 +493390,7 @@ self: {
         typed-process
         unordered-containers
       ];
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "eventlog-to-lightstep";
     }
@@ -491762,7 +493433,7 @@ self: {
         unordered-containers
       ];
       description = "GHC plugin for open telemetry";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -491788,7 +493459,7 @@ self: {
         text
         wai
       ];
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -492317,7 +493988,7 @@ self: {
         vinyl
       ];
       description = "OpenTracing for Haskell";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -492344,7 +494015,7 @@ self: {
         text
       ];
       description = "OpenTracing instrumentation of http-client";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -492393,7 +494064,7 @@ self: {
         vector-instances
       ];
       description = "Jaeger backend for OpenTracing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -492419,7 +494090,7 @@ self: {
         wai
       ];
       description = "Middleware adding OpenTracing tracing for WAI applications";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -492442,7 +494113,7 @@ self: {
         text
       ];
       description = "Zipkin OpenTracing Backend Commons";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -492489,7 +494160,7 @@ self: {
         vector-instances
       ];
       description = "Zipkin V1 backend for OpenTracing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -492527,7 +494198,7 @@ self: {
         text
       ];
       description = "Zipkin V2 backend for OpenTracing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -492798,7 +494469,7 @@ self: {
         text-builder-linear
       ];
       description = "Stack-based esoteric programming language";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "oplang";
       broken = true;
@@ -492998,6 +494669,58 @@ self: {
     }
   ) { };
 
+  opt-env-conf_0_11_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      autodocodec,
+      autodocodec-nix,
+      autodocodec-schema,
+      autodocodec-yaml,
+      base,
+      containers,
+      hashable,
+      mtl,
+      path,
+      path-io,
+      safe-coloured-text,
+      safe-coloured-text-layout,
+      safe-coloured-text-terminfo,
+      selective,
+      text,
+      validity,
+      validity-containers,
+    }:
+    mkDerivation {
+      pname = "opt-env-conf";
+      version = "0.11.0.0";
+      sha256 = "0krkdybvd3lkjmb6f3x5nmkqh4n025wz5qwmxr34y95ynr36393j";
+      libraryHaskellDepends = [
+        aeson
+        autodocodec
+        autodocodec-nix
+        autodocodec-schema
+        autodocodec-yaml
+        base
+        containers
+        hashable
+        mtl
+        path
+        path-io
+        safe-coloured-text
+        safe-coloured-text-layout
+        safe-coloured-text-terminfo
+        selective
+        text
+        validity
+        validity-containers
+      ];
+      description = "Settings parsing for Haskell: command-line arguments, environment variables, and configuration values";
+      license = lib.licenses.lgpl3Only;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   opt-env-conf-test = callPackage (
     {
       mkDerivation,
@@ -493127,7 +494850,7 @@ self: {
         vector
       ];
       description = "Optics as an abstract interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -493157,7 +494880,7 @@ self: {
         transformers
       ];
       description = "Optics as an abstract interface: core definitions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -493200,7 +494923,7 @@ self: {
         vector
       ];
       description = "Extra utilities and instances for optics-core";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -493273,7 +494996,7 @@ self: {
         tagged
       ];
       description = "Optics construction using TemplateHaskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -493330,7 +495053,7 @@ self: {
         rerebase
       ];
       description = "Simple command line interface arguments parser";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -493359,7 +495082,7 @@ self: {
         time
       ];
       description = "Command-line arguments parsing for Hasql";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -493574,7 +495297,7 @@ self: {
       ];
       doHaddock = false;
       description = "Powerful and easy command-line option parser";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -493720,7 +495443,7 @@ self: {
         text
       ];
       description = "Extra functions for working with optparse-applicative";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -493773,7 +495496,7 @@ self: {
         mtl
       ];
       description = "Declarative command line option parser";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -493963,7 +495686,7 @@ self: {
         text
       ];
       description = "Like `optparse-generic`, but with `TemplateHaskell` for faster builds";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -494047,7 +495770,7 @@ self: {
         microlens
       ];
       description = "Bindings to libopus for the Opus audio codec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -494361,7 +496084,7 @@ self: {
       sha256 = "1fgzxlz2rynscnic1jawvrymhp70wxq04lpvp0ls84ky90zyzak8";
       libraryHaskellDepends = [ base ];
       description = "Axiomata & lemmata for easier use of Data.Type.Ord";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -494534,7 +496257,7 @@ self: {
       sha256 = "1na61sq78r190lcn4lw437mj5wcdq9p53zn3vbz16w3b1vwdwfii";
       libraryHaskellDepends = [ base ];
       description = "Utilities for Orderings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -494740,7 +496463,7 @@ self: {
         time
       ];
       description = "Parser for Emacs org-mode files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -494769,7 +496492,7 @@ self: {
         text
       ];
       description = "Lucid integration for org-mode";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -494826,7 +496549,7 @@ self: {
         time
       ];
       description = "Parser for Org Mode documents";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -495259,94 +496982,6 @@ self: {
     }
   ) { };
 
-  ormolu_0_5_2_0 = callPackage (
-    {
-      mkDerivation,
-      ansi-terminal,
-      array,
-      base,
-      binary,
-      bytestring,
-      Cabal-syntax,
-      containers,
-      Diff,
-      directory,
-      dlist,
-      file-embed,
-      filepath,
-      ghc-lib-parser,
-      gitrev,
-      hspec,
-      hspec-discover,
-      hspec-megaparsec,
-      megaparsec,
-      MemoTrie,
-      mtl,
-      optparse-applicative,
-      path,
-      path-io,
-      QuickCheck,
-      syb,
-      temporary,
-      text,
-    }:
-    mkDerivation {
-      pname = "ormolu";
-      version = "0.5.2.0";
-      sha256 = "1ai2wza4drirvf9pb7qsf03kii5jiayqs49c19ir93jd0ak9pi96";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        ansi-terminal
-        array
-        base
-        binary
-        bytestring
-        Cabal-syntax
-        containers
-        Diff
-        directory
-        dlist
-        file-embed
-        filepath
-        ghc-lib-parser
-        megaparsec
-        MemoTrie
-        mtl
-        syb
-        text
-      ];
-      executableHaskellDepends = [
-        base
-        containers
-        filepath
-        ghc-lib-parser
-        gitrev
-        optparse-applicative
-        text
-      ];
-      testHaskellDepends = [
-        base
-        containers
-        directory
-        filepath
-        ghc-lib-parser
-        hspec
-        hspec-megaparsec
-        path
-        path-io
-        QuickCheck
-        temporary
-        text
-      ];
-      testToolDepends = [ hspec-discover ];
-      description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "ormolu";
-    }
-  ) { };
-
   ormolu_0_7_2_0 = callPackage (
     {
       mkDerivation,
@@ -495433,7 +497068,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ormolu";
     }
@@ -495527,7 +497162,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ormolu";
     }
@@ -495567,8 +497202,8 @@ self: {
     }:
     mkDerivation {
       pname = "ormolu";
-      version = "0.8.0.1";
-      sha256 = "12ix16zvz0i1i8yyhbfbv4r0735r2i2darkbz3jh7lfd1fgh6zs3";
+      version = "0.8.0.2";
+      sha256 = "1fh2m4sy8vzxvm1qm9413apzblqf4sla3454mx64ngkwx0pgi2ad";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -495622,7 +497257,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A formatter for Haskell source code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ormolu";
     }
   ) { };
@@ -495643,8 +497278,8 @@ self: {
     }:
     mkDerivation {
       pname = "orthotope";
-      version = "0.1.7.1";
-      sha256 = "1g2hh8q035mnb7zwfhhsj2la8j96aab52lns6iqlj5ds6rmpvzrg";
+      version = "0.1.7.2";
+      sha256 = "0jj5wfbkgi8q28j9liaj1s52j71rd9nx8sh0vkiavaqcik7a81xs";
       libraryHaskellDepends = [
         base
         deepseq
@@ -495894,7 +497529,7 @@ self: {
         warp
       ];
       description = "API bindings for Ory Kratos";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -495944,21 +497579,7 @@ self: {
         text
       ];
       description = "/etc/os-release helpers";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  os-string_1_0_0 = callPackage (
-    { mkDerivation, filepath }:
-    mkDerivation {
-      pname = "os-string";
-      version = "1.0.0";
-      sha256 = "0znnp88cgbj3r858r2w6mlf2sjg3lxfajyih4bdshs0vgy1dyhr6";
-      libraryHaskellDepends = [ filepath ];
-      doHaddock = false;
-      description = "Library for manipulating Operating system strings";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -496001,7 +497622,7 @@ self: {
         tasty-bench
       ];
       description = "Library for manipulating Operating system strings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -496337,7 +497958,7 @@ self: {
         tasty-hunit
       ];
       description = "Open Source Vulnerability format";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -496560,7 +498181,7 @@ self: {
         text
       ];
       description = "A library to test programs that output text";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -496821,7 +498442,7 @@ self: {
       ];
       doHaddock = false;
       description = "Overloaded pragmas as a plugin";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -496978,7 +498599,7 @@ self: {
       ];
       doHaddock = false;
       description = "An efficient CPU-based multidimensional array (tensor) library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -497001,7 +498622,7 @@ self: {
         pa-prelude
       ];
       description = "Collect a tree of errors and pretty-print";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -497042,7 +498663,7 @@ self: {
         time
       ];
       description = "“Vertical” parsing of values";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -497091,7 +498712,7 @@ self: {
         vector
       ];
       description = "Our JSON parsers/encoders";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -497104,7 +498725,7 @@ self: {
       sha256 = "03y2cn6yy06xcpnjs5zc8hd8iba4k44wrrncl7ksplg8j3iank1x";
       libraryHaskellDepends = [ base ];
       description = "Labels, and labelled tuples and enums (GHC >9.2)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -497153,7 +498774,7 @@ self: {
         vector
       ];
       description = "The Possehl Analytics Prelude";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -497184,7 +498805,7 @@ self: {
         text
       ];
       description = "Some pretty-printing helpers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -497211,7 +498832,7 @@ self: {
         typed-process
       ];
       description = "Helper functions for spawning subprocesses";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -497348,7 +498969,7 @@ self: {
         text
       ];
       description = "A package for retrieving a package's version number";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -497554,7 +499175,7 @@ self: {
         split
         vector
       ];
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "examples";
       broken = true;
@@ -497954,7 +499575,7 @@ self: {
       ];
       doHaddock = false;
       description = "Time Library for Pact";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -498023,7 +499644,7 @@ self: {
         time
       ];
       description = "API to the Paddle payment processor";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -498636,7 +500257,7 @@ self: {
         strict
       ];
       description = "Finding palindromes in strings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "palindromes";
     }
   ) { };
@@ -498658,7 +500279,7 @@ self: {
       librarySystemDepends = [ pam ];
       libraryToolDepends = [ c2hs ];
       description = "Haskell binding for C PAM API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { inherit (pkgs) pam; };
@@ -498741,7 +500362,7 @@ self: {
         primitive
       ];
       description = "Parse syslog traffic from PAN-OS";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pan-os-syslog-to-avro";
       broken = true;
@@ -499005,7 +500626,7 @@ self: {
       ];
       doHaddock = false;
       description = "Conversion between markup formats";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       maintainers = [
         lib.maintainers.maralorn
         lib.maintainers.sternenseemann
@@ -499013,7 +500634,7 @@ self: {
     }
   ) { };
 
-  pandoc_3_8 = callPackage (
+  pandoc_3_8_2_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -499099,8 +500720,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc";
-      version = "3.8";
-      sha256 = "1yj2v60acr1v0x82jqvikdw30qs216g1975kkdxr7hbcrazd7agn";
+      version = "3.8.2.1";
+      sha256 = "1vcdsg9d53bripgizwf2plaxiqlz3yslid78rdv5pn125m9qdhnf";
       configureFlags = [ "-f-trypandoc" ];
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
@@ -499211,7 +500832,7 @@ self: {
       ];
       doHaddock = false;
       description = "Conversion between markup formats";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       maintainers = [
         lib.maintainers.maralorn
@@ -499241,7 +500862,7 @@ self: {
         text
       ];
       description = "A monadic DSL for building pandoc documents";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -499424,13 +501045,13 @@ self: {
         warp
       ];
       description = "Conversion between documentation formats";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "pandoc";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
 
-  pandoc-cli_3_8 = callPackage (
+  pandoc-cli_3_8_2_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -499446,8 +501067,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-cli";
-      version = "3.8";
-      sha256 = "0zhlsbj3k1dgxy382gxsdjnzg6p34llfs8y9v3ahxvyxsgfv5hwq";
+      version = "3.8.2.1";
+      sha256 = "0c6bi9837mcarr7n888zl3hl0makx8ghw51r30v3isdjjvf3x2p3";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -499463,7 +501084,7 @@ self: {
         warp
       ];
       description = "Conversion between documentation formats";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc";
       maintainers = [ lib.maintainers.maralorn ];
@@ -499493,7 +501114,7 @@ self: {
         pandoc-types
       ];
       description = "A pandoc filter that provides a Markdown extension for columns";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-columns";
       broken = true;
@@ -499532,6 +501153,8 @@ self: {
       pname = "pandoc-crossref";
       version = "0.3.21";
       sha256 = "1srfkh987jx3ha8p5yrvy4pxkkypcajb4wvzbnf8sbd4wc2vichh";
+      revision = "2";
+      editedCabalFile = "1j9s9r6xmw8wq48y73q6w87v92wc5p9va38k5csy28hyix9xf32i";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
@@ -499594,6 +501217,101 @@ self: {
     }
   ) { };
 
+  pandoc-crossref_0_3_22 = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      criterion,
+      data-default,
+      deepseq,
+      directory,
+      filepath,
+      gitrev,
+      hspec,
+      microlens,
+      microlens-ghc,
+      microlens-mtl,
+      microlens-th,
+      mtl,
+      open-browser,
+      optparse-applicative,
+      pandoc,
+      pandoc-cli,
+      pandoc-types,
+      syb,
+      template-haskell,
+      temporary,
+      text,
+      utility-ht,
+    }:
+    mkDerivation {
+      pname = "pandoc-crossref";
+      version = "0.3.22";
+      sha256 = "1vjypnw1w6a0m5yls7965xmi71g4fw0j7a0w1p7ygxf6anvcxi0i";
+      isLibrary = true;
+      isExecutable = true;
+      enableSeparateDataOutput = true;
+      libraryHaskellDepends = [
+        base
+        containers
+        data-default
+        directory
+        filepath
+        microlens
+        microlens-ghc
+        microlens-mtl
+        microlens-th
+        mtl
+        pandoc
+        pandoc-types
+        syb
+        template-haskell
+        text
+        utility-ht
+      ];
+      executableHaskellDepends = [
+        base
+        deepseq
+        gitrev
+        open-browser
+        optparse-applicative
+        pandoc
+        pandoc-types
+        template-haskell
+        temporary
+        text
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        data-default
+        directory
+        filepath
+        hspec
+        microlens
+        microlens-mtl
+        mtl
+        pandoc
+        pandoc-types
+        text
+      ];
+      testToolDepends = [ pandoc-cli ];
+      benchmarkHaskellDepends = [
+        base
+        criterion
+        pandoc
+        pandoc-types
+        text
+      ];
+      doHaddock = false;
+      description = "Pandoc filter for cross-references";
+      license = lib.licenses.gpl2Only;
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "pandoc-crossref";
+    }
+  ) { };
+
   pandoc-csv2table = callPackage (
     {
       mkDerivation,
@@ -499989,7 +501707,7 @@ self: {
         pandoc-types
       ];
       description = "Pandoc filter to include files, with image path and heading level adjustment";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-include-plus";
       broken = true;
@@ -500090,7 +501808,7 @@ self: {
         pandoc-types
       ];
       description = "A pandoc filter that provides a Markdown extension to wrap text in table cells";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-linear-table";
       broken = true;
@@ -500118,7 +501836,7 @@ self: {
         text
       ];
       description = "Extract \"contextual links\" from Pandoc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -500147,7 +501865,7 @@ self: {
         pandoc-types
       ];
       description = "A pandoc filter that provides a Markdown extension for logic proofs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-logic-proof";
       broken = true;
@@ -500239,11 +501957,11 @@ self: {
         text
       ];
       description = "Lua engine to power custom pandoc conversions";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
-  pandoc-lua-engine_0_5 = callPackage (
+  pandoc-lua-engine_0_5_0_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -500280,8 +501998,8 @@ self: {
     }:
     mkDerivation {
       pname = "pandoc-lua-engine";
-      version = "0.5";
-      sha256 = "0za5xp1q996bpydkz73779gp5mxlq1a5spk4cz5rsckc18cf11xc";
+      version = "0.5.0.1";
+      sha256 = "1hcscazl4s2cm6wmimjjqax53rbwqij7cphs72f04sqry54802fn";
       libraryHaskellDepends = [
         aeson
         base
@@ -500326,7 +502044,7 @@ self: {
         text
       ];
       description = "Lua engine to power custom pandoc conversions";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -500387,7 +502105,7 @@ self: {
         text
       ];
       description = "Use pandoc types in Lua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -500633,7 +502351,7 @@ self: {
         text
       ];
       description = "A Pandoc filter to include figures generated from code blocks using your plotting toolkit of choice";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "pandoc-plot";
     }
   ) { };
@@ -500743,7 +502461,7 @@ self: {
         text
       ];
       description = "Pandoc filter to extract only the links";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -500768,7 +502486,7 @@ self: {
         pandoc-types
       ];
       description = "Pandoc filter to extract only the code blocks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pandoc-select-code";
       broken = true;
@@ -500816,7 +502534,7 @@ self: {
         wai-cors
       ];
       description = "Pandoc document conversion as an HTTP servant-server";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -500861,7 +502579,7 @@ self: {
         wai-cors
       ];
       description = "Pandoc document conversion as an HTTP servant-server";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -501041,8 +502759,8 @@ self: {
       pname = "pandoc-types";
       version = "1.23.1";
       sha256 = "1hd18l1c5yh7x24gsligkbraadq12hn7mim16xyjnicdsa1s03xd";
-      revision = "3";
-      editedCabalFile = "0w2n4vzxs3jasrivaq49clxdlccnfv2gh4mkp8s7krxa1arambrz";
+      revision = "4";
+      editedCabalFile = "1slrkh9q4vcpsw4dxs8lznh7gxbvp27a3xqpxpyvzahjrlaqm45q";
       libraryHaskellDepends = [
         aeson
         base
@@ -501075,7 +502793,7 @@ self: {
         text
       ];
       description = "Types for representing a structured document";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -501286,7 +503004,7 @@ self: {
         base
       ];
       description = "Merge environment variables and command line options generically";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -501375,7 +503093,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ pango ];
       description = "Binding to the Pango text rendering engine";
-      license = lib.licenses.lgpl21Only;
+      license = lib.licensesSpdx."LGPL-2.1-only";
     }
   ) { inherit (pkgs) pango; };
 
@@ -501805,7 +503523,7 @@ self: {
     }
   ) { };
 
-  pantry_0_11_1 = callPackage (
+  pantry_0_11_2 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -501866,8 +503584,8 @@ self: {
     }:
     mkDerivation {
       pname = "pantry";
-      version = "0.11.1";
-      sha256 = "1qgmxfv74qqyn26x06gnx71ms8k0fiijlpz55k08yn8bcr05phzr";
+      version = "0.11.2";
+      sha256 = "0zlr88489c3gi00ck7yi3zxq1jp0niamgfk3d5b9qkv3zqdvx83z";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -503007,7 +504725,7 @@ self: {
         validators
       ];
       description = "ParDual class for Parallel <-> Sequential";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -503141,6 +504859,30 @@ self: {
     }
   ) { };
 
+  parallel_3_3_0_0 = callPackage (
+    {
+      mkDerivation,
+      array,
+      base,
+      containers,
+      deepseq,
+    }:
+    mkDerivation {
+      pname = "parallel";
+      version = "3.3.0.0";
+      sha256 = "148pakbn546a16fhwrl8n7fzywcy307d6bx7g9jvz3lfimvixhj7";
+      libraryHaskellDepends = [
+        array
+        base
+        containers
+        deepseq
+      ];
+      description = "Parallel programming library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   parallel-io = callPackage (
     {
       mkDerivation,
@@ -503345,7 +505087,7 @@ self: {
         tasty-hunit
       ];
       description = "Classes and data structures for working with data-kind indexed types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -503364,7 +505106,7 @@ self: {
         transformers
       ];
       description = "A known-parametric Functor typeclass";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -503641,7 +505383,7 @@ self: {
         happy
       ];
       description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -503741,7 +505483,7 @@ self: {
         text
       ];
       description = "A quick-and-dirty, low-friction benchmark tool with immediate feedback";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -503792,7 +505534,7 @@ self: {
         protolude
       ];
       description = "Help Manage project specific documentation";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "parochial";
       broken = true;
@@ -503918,7 +505660,7 @@ self: {
         transformers
       ];
       description = "Parsable and Printable classes";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -503949,7 +505691,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Test functions for the parsable package";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -504040,7 +505782,7 @@ self: {
         text
       ];
       description = "Parse machine-readable GHC GC stats";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -504713,7 +506455,7 @@ self: {
         text
       ];
       description = "Regex based parsers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -504745,7 +506487,7 @@ self: {
         regex-applicative
       ];
       description = "Parsing library with unbiased choice and support for embedding arbitrary monad";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505074,7 +506816,7 @@ self: {
       ];
       testToolDepends = [ cpphs ];
       description = "A fast parser combinator library backed by Typed Template Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -505137,7 +506879,7 @@ self: {
         th-test-utils
       ];
       description = "A fast parser combinator library backed by Typed Template Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505396,7 +507138,7 @@ self: {
         hedgehog
       ];
       description = "A partial binary associative operator";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505419,7 +507161,7 @@ self: {
         partial-semigroup
       ];
       description = "Property testing for partial semigroups using Hedgehog";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505479,7 +507221,7 @@ self: {
         hspec
       ];
       description = "Data structure supporting partial orders";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -505592,7 +507334,7 @@ self: {
         transformers-except
       ];
       description = "Platform-Agnostic Security Tokens";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -505701,7 +507443,7 @@ self: {
         random
       ];
       description = "a simple password manager";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "passman";
       broken = true;
@@ -506116,7 +507858,7 @@ self: {
         utf8-string
       ];
       description = "Provides the Pasta curves: Pallas, Vesta and their field elements Fp and Fq";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pasta-curves";
       broken = true;
@@ -506215,6 +507957,8 @@ self: {
       pname = "patat";
       version = "0.15.2.0";
       sha256 = "0r9bx8f7q1h56mf8bvz6jaqrgl9iczac9qffmaqqsnqlvzn85wfi";
+      revision = "1";
+      editedCabalFile = "0x0dkxnkpwghzpmw93b72zfy2gyl4vhnxa0h15dycvd80k54n37x";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -506551,7 +508295,7 @@ self: {
       ];
       doHaddock = false;
       description = "Support for well-typed paths";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -506723,7 +508467,7 @@ self: {
         unix-compat
       ];
       description = "Interface to ‘directory’ package for users of ‘path’";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -506797,7 +508541,7 @@ self: {
         path
       ];
       description = "A singleton wrapper for the `path` library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -506841,7 +508585,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A wrapper around the @path@ library, tagged with semantic name";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -506870,7 +508614,7 @@ self: {
         text
       ];
       description = "Read and write UTF-8 text files";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -506895,7 +508639,7 @@ self: {
         relude
       ];
       description = "`Data.Tree` for file paths";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -507074,7 +508818,7 @@ self: {
         QuickCheck
       ];
       description = "Type-safe replacement for System.FilePath etc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -507177,7 +508921,7 @@ self: {
         uuid
       ];
       description = "Sentry SDK";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -507378,7 +509122,7 @@ self: {
         vector
       ];
       description = "Greatest convex majorants and least concave minorants";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       maintainers = [ lib.maintainers.dschrempf ];
     }
   ) { };
@@ -508339,7 +510083,7 @@ self: {
         tasty-hunit
       ];
       description = "Integration over convex polytopes";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -509043,7 +510787,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Pear Trees: An indexed type using type-level binary numbers";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -510058,7 +511802,7 @@ self: {
         transformers
       ];
       description = "Database migration support for use in other libraries";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -510123,7 +511867,7 @@ self: {
       ];
       benchmarkHaskellDepends = [ base ];
       description = "Performance methods and monad";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "perf-explore";
     }
   ) { };
@@ -510172,7 +511916,7 @@ self: {
         vector
       ];
       description = "analysis example using perf";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "perf-examples";
     }
@@ -510297,7 +512041,7 @@ self: {
         vector
       ];
       description = "Library for performing vector shuffles";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -510890,7 +512634,7 @@ self: {
         text
       ];
       description = "Minimal serialization library with focus on performance";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -512206,7 +513950,7 @@ self: {
         unliftio-core
       ];
       description = "A pure haskell backend for the persistent library using MySQL database server";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "persistent-mysql-pure-example";
       broken = true;
@@ -513037,7 +514781,7 @@ self: {
         temporary
       ];
       description = "STM transactions involving persistent storage";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -513701,7 +515445,7 @@ self: {
         unordered-containers
       ];
       description = "CLI program for profiles management";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "pfile";
     }
   ) { };
@@ -513774,7 +515518,7 @@ self: {
         vector
       ];
       description = "A pleasant PostgreSQL layer";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -513808,7 +515552,7 @@ self: {
         text
       ];
       description = "PostgreSQL database performance insights";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -513970,7 +515714,7 @@ self: {
         proto-lens-protoc
       ];
       description = "Parse PostgreSQL DDL and DML: Haskell bindings for libpg_query";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -514460,7 +516204,7 @@ self: {
         postgresql-simple
       ];
       description = "pgvector support for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -514675,8 +516419,8 @@ self: {
     }:
     mkDerivation {
       pname = "phino";
-      version = "0.0.0.40";
-      sha256 = "0hrnh8l6z9y1a096ddcpqhmcxxcql2al388z7chfvl0mj8w9g77m";
+      version = "0.0.0.45";
+      sha256 = "1m2rq48mkwfy8r29y67mlx4dr65yv9yxfw5j82sawgn4jwhzvc0n";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -514723,7 +516467,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Command-Line Manipulator of 𝜑-Calculus Expressions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "phino";
       broken = true;
@@ -514849,7 +516593,7 @@ self: {
         phonetic-languages-phonetics-basics
       ];
       description = "A shared by different general implementations of the PhLADiPreLiO functionality";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -514899,7 +516643,7 @@ self: {
         rhythmic-sequences
       ];
       description = "A generalized functionality of PhLADiPreLiO for different languages that uses hash algorithms";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -514912,7 +516656,7 @@ self: {
       sha256 = "1ymsxi750bwah3x1cvq1qvjlgibnbvgkrfv1vkjxs4lb8xa20b3g";
       libraryHaskellDepends = [ base ];
       description = "Allows to estimate some kind of the rhythmicity properties for the text";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -514949,7 +516693,7 @@ self: {
         ukrainian-phonetics-basic-array
       ];
       description = "A shared by different Ukrainian implementations of the PhLADiPreLiO functionality";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -515026,7 +516770,7 @@ self: {
         ukrainian-phonetics-basic-array
       ];
       description = "A PhLADiPreLiO implementation for Ukrainian that uses hashes and asynchronous concurrency";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "phladiprelioUkr";
     }
@@ -516316,7 +518060,7 @@ self: {
         unix
       ];
       description = "Rename photo image files based on EXIF shoot date";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "photoname";
       broken = true;
@@ -516845,7 +518589,7 @@ self: {
         text
       ];
       description = "Instant StatsD in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -517622,7 +519366,7 @@ self: {
         text
       ];
       description = "Functional 2D Game Framework";
-      license = lib.licenses.zlib;
+      license = lib.licensesSpdx."Zlib";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -517679,7 +519423,7 @@ self: {
         vector
       ];
       description = "Servant bindings to Pinecone";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "pinecone-example";
     }
   ) { };
@@ -517717,7 +519461,7 @@ self: {
         transformers
       ];
       description = "icmp echo requests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -517838,7 +519582,7 @@ self: {
         tasty-hunit
       ];
       description = "Preserve warnings in a GHCi session";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -518154,7 +519898,7 @@ self: {
         transformers
       ];
       description = "Encode and decode JSON streams using Aeson and Pipes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -518244,7 +519988,7 @@ self: {
         transformers
       ];
       description = "Attoparsec and Pipes integration";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -519998,7 +521742,7 @@ self: {
         pulse-simple
       ];
       description = "Pipes for pulse-simple audio";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -520266,7 +522010,7 @@ self: {
         transformers
       ];
       description = "properly streaming text";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -520711,7 +522455,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A program for turning pixel art into 3D prints";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pixel-printer-exe";
       broken = true;
@@ -520890,7 +522634,7 @@ self: {
         http-client-tls
       ];
       description = "Pixiv API binding based on servant-client";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -521182,7 +522926,7 @@ self: {
         directory
       ];
       description = "Bindings and wrappers for PL_SYNTH - no-deps sound effects synthesizer and tracker";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -521990,7 +523734,7 @@ self: {
         word8
       ];
       description = "Library and executable for working with playlist files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "playlist";
     }
   ) { };
@@ -522040,7 +523784,7 @@ self: {
       sha256 = "1j7jblcmnvg2f5pdsakr9afqyssaspffbr4rdrixzayywbbrgbic";
       libraryHaskellDepends = [ base ];
       description = "A semi-cross-platform interface for pledge(2) and unveil(2)";
-      license = lib.licenses.unlicense;
+      license = lib.licensesSpdx."Unlicense";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -522667,6 +524411,8 @@ self: {
       pname = "plots";
       version = "0.1.1.5";
       sha256 = "0dgjg1idfhmnzdy7c2my1ri98psbm8jq67ssnb2iss4ay9fs13fw";
+      revision = "1";
+      editedCabalFile = "0fp1i55arir0p9gvxgadq29v06p4qkqbrf14qd4nnfjry5i8pgqg";
       libraryHaskellDepends = [
         adjunctions
         base
@@ -523165,7 +524911,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-application-service";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523194,8 +524940,8 @@ self: {
     }:
     mkDerivation {
       pname = "pms-domain-model";
-      version = "0.1.0.0";
-      sha256 = "0y6xi7mqrvl1fp87nxyrx7jfbh8rwmgm5wmcvw9am7mqc7kz2scy";
+      version = "0.1.2.0";
+      sha256 = "0zhc0bf5gbkqqhp6bvhpf2snaagx4v4qsydvbv18blrpkavvqrbk";
       libraryHaskellDepends = [
         aeson
         async
@@ -523227,7 +524973,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-domain-model";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -523301,7 +525047,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-domain-service";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523333,8 +525079,8 @@ self: {
     }:
     mkDerivation {
       pname = "pms-infra-cmdrun";
-      version = "0.0.7.0";
-      sha256 = "1cmyxcvbx7637p96psklpm0vip1998kcl0v4mxvlbb2yjddrb1q2";
+      version = "0.0.8.0";
+      sha256 = "0q0780gl1jadq0qjh7dqknvv9i0g0229nsaxahv6f3n9brx9bf30";
       libraryHaskellDepends = [
         aeson
         async
@@ -523369,7 +525115,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-cmdrun";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523437,7 +525183,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-procspawn";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523511,7 +525257,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-serial";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523583,7 +525329,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-socket";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523653,7 +525399,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infra-watch";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523727,7 +525473,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-infrastructure";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523788,7 +525534,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-notification";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523849,7 +525595,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-request";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -523910,7 +525656,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "pms-ui-response";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -524206,7 +525952,7 @@ self: {
         text
       ];
       description = "A container wrapper";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "podenv";
       broken = true;
@@ -524716,7 +526462,7 @@ self: {
         gauge
       ];
       description = "Texas holdem hand evaluation and simulation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "poker-exe";
     }
@@ -525026,7 +526772,7 @@ self: {
         text
       ];
       description = "Haskell PVP version adviser";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "policeman";
       broken = true;
@@ -525075,7 +526821,7 @@ self: {
         utility-ht
       ];
       description = "Bindings to poll.h";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -525146,7 +526892,7 @@ self: {
         text
       ];
       description = "Functionality to help examine Haddock information of a module";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -525547,7 +527293,7 @@ self: {
         containers
       ];
       description = "Multivariate polynomial rings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -525572,29 +527318,6 @@ self: {
   ) { };
 
   polyparse = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      text,
-    }:
-    mkDerivation {
-      pname = "polyparse";
-      version = "1.13";
-      sha256 = "0yvhg718dlksiw3v27m2d8m1sn4r4f5s0p56zq3lynhy1sc74k0w";
-      revision = "9";
-      editedCabalFile = "0abzqic0askffn6nmh1f08d9rd9fykdlcdd9gj1c7p1ykp9zlq29";
-      libraryHaskellDepends = [
-        base
-        bytestring
-        text
-      ];
-      description = "A variety of alternative parser combinator libraries";
-      license = "LGPL";
-    }
-  ) { };
-
-  polyparse_1_13_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -525612,7 +527335,6 @@ self: {
       ];
       description = "A variety of alternative parser combinator libraries";
       license = "LGPL";
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -525772,7 +527494,7 @@ self: {
         sqel
       ];
       description = "Account management with Servant and Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -525862,7 +527584,7 @@ self: {
         zeugma
       ];
       description = "Account management with Servant and Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -525901,7 +527623,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Polysemy wrapper around the Blockfrost client";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -525977,7 +527699,7 @@ self: {
         tasty
       ];
       description = "A Polysemy effect for Chronos";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -526032,7 +527754,7 @@ self: {
         torsor
       ];
       description = "Polysemy effects for concurrency";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -526063,7 +527785,7 @@ self: {
         uuid
       ];
       description = "Polysemy effects for databases";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -526222,7 +527944,7 @@ self: {
         zeugma
       ];
       description = "Polysemy effects for databases";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -526286,7 +528008,7 @@ self: {
         tasty
       ];
       description = "Test utilities for polysemy-hasql";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -526349,7 +528071,7 @@ self: {
         warp
       ];
       description = "Polysemy effects for HTTP clients";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -526508,7 +528230,7 @@ self: {
         polysemy-plugin
       ];
       description = "Polysemy effects for logging";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -526558,7 +528280,7 @@ self: {
         tasty
       ];
       description = "Colog adapters for polysemy-log";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -526602,7 +528324,7 @@ self: {
         tasty
       ];
       description = "Di adapters for polysemy-log";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -526645,7 +528367,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Primitive functions and data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -526935,7 +528657,7 @@ self: {
         unix
       ];
       description = "Polysemy effects for system processes";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -526950,8 +528672,8 @@ self: {
     }:
     mkDerivation {
       pname = "polysemy-readline";
-      version = "0.2.0.0";
-      sha256 = "0zkzlrwcbxkxiy2xmh3ms9saa379lmw49d9hfkmd487vi33q0isn";
+      version = "0.3.0.0";
+      sha256 = "0clbp7fipz8b8py6kmxm04vg2ln6jpq773v27wkdy0sb2blkj49f";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -526976,10 +528698,8 @@ self: {
         polysemy-plugin
       ];
       description = "Readline effect for polysemy";
-      license = lib.licenses.bsd2;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-2-Clause";
       mainProgram = "echo-repl";
-      broken = true;
     }
   ) { };
 
@@ -527002,7 +528722,7 @@ self: {
         req
       ];
       description = "Polysemy effect for req";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -527040,7 +528760,7 @@ self: {
         tasty
       ];
       description = "Polysemy error tracking";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -527090,7 +528810,7 @@ self: {
         text
       ];
       description = "Well-typed filesystem operation effects";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -527181,7 +528901,7 @@ self: {
         tasty
       ];
       description = "Polysemy effects for testing";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -527217,7 +528937,7 @@ self: {
         time
       ];
       description = "A Polysemy effect for time";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -527511,6 +529231,33 @@ self: {
     }
   ) { };
 
+  polytree = callPackage (
+    {
+      mkDerivation,
+      base,
+      bifunctors,
+      containers,
+      free,
+      lens,
+      semigroupoids,
+    }:
+    mkDerivation {
+      pname = "polytree";
+      version = "0.0.9";
+      sha256 = "17ldq6vd8zfvcd5w5dxy41cyda0j91ikr5437jqxnzw4yv6pp79a";
+      libraryHaskellDepends = [
+        base
+        bifunctors
+        containers
+        free
+        lens
+        semigroupoids
+      ];
+      description = "A polymorphic rose-tree";
+      license = lib.licenses.bsd3;
+    }
+  ) { };
+
   polytypeable = callPackage (
     { mkDerivation, base }:
     mkDerivation {
@@ -527569,7 +529316,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Alternative to `Dynamic` with type guarantees";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -528037,7 +529784,7 @@ self: {
         xml-types
       ];
       description = "An XMPP client library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -528192,7 +529939,7 @@ self: {
         timeit
       ];
       description = "Simple work queue for bounded concurrency";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -528225,7 +529972,7 @@ self: {
         utility-ht
       ];
       description = "Run jobs on a limited number of threads and support data dependencies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -528325,7 +530072,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Static key-value storage backed by poppy";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -528771,7 +530518,7 @@ self: {
         warp
       ];
       description = "A minimalist HTTP server framework written on top of wai";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "porpoise-example";
       broken = true;
@@ -528902,7 +530649,7 @@ self: {
       ];
       doHaddock = false;
       description = "Data structures and functions for interacting with the Portage package manager";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
     }
   ) { };
 
@@ -529033,7 +530780,7 @@ self: {
         PortMidi
       ];
       description = "PortMidi utilities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       mainProgram = "portmidi-list-devices";
     }
@@ -529356,7 +531103,7 @@ self: {
         template-haskell
       ];
       description = "A product-of-sums generics library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -529416,7 +531163,7 @@ self: {
         uuid
       ];
       description = "Simple extensible library to run SQL file against PostgreSQL database";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -529649,7 +531396,7 @@ self: {
         tasty-hunit
       ];
       description = "posix bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
     }
   ) { };
@@ -530210,7 +531957,7 @@ self: {
         websockets
       ];
       description = "Middleware to map LISTEN/NOTIFY messages to Websockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "postgres-websockets";
       maintainers = [ lib.maintainers.wolfgangwalther ];
     }
@@ -530278,7 +532025,7 @@ self: {
         rerebase
       ];
       description = "Encoders and decoders for the PostgreSQL's binary format";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -530345,7 +532092,7 @@ self: {
         rerebase
       ];
       description = "Encoders and decoders for the PostgreSQL's binary format";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -530446,6 +532193,49 @@ self: {
     }
   ) { };
 
+  postgresql-connection-string = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      charset,
+      containers,
+      hashable,
+      hspec,
+      megaparsec,
+      QuickCheck,
+      quickcheck-classes,
+      text,
+      text-builder,
+    }:
+    mkDerivation {
+      pname = "postgresql-connection-string";
+      version = "0.1.0.3";
+      sha256 = "00kc7krgibxdq88wyr8lk6k7rini7rn6md4mlkpinrc0xmafgq47";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        charset
+        containers
+        hashable
+        megaparsec
+        QuickCheck
+        text
+        text-builder
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        hspec
+        QuickCheck
+        quickcheck-classes
+        text
+      ];
+      description = "PostgreSQL connection string type, parser and builder";
+      license = lib.licensesSpdx."MIT";
+    }
+  ) { };
+
   postgresql-connector = callPackage (
     {
       mkDerivation,
@@ -530564,7 +532354,7 @@ self: {
         tasty-hunit
       ];
       description = "low-level binding to libpq";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -530577,7 +532367,7 @@ self: {
       libraryHaskellDepends = [ base ];
       doHaddock = false;
       description = "low-level binding to libpq: configure based provider";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -530630,7 +532420,7 @@ self: {
       libraryPkgconfigDepends = [ libpq ];
       doHaddock = false;
       description = "low-level binding to libpq: pkg-config based provider";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) libpq; };
 
@@ -530750,7 +532540,7 @@ self: {
         postgresql-simple
       ];
       description = "PostgreSQL Schema Migrations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "migrate";
     }
   ) { };
@@ -530782,7 +532572,7 @@ self: {
         text
       ];
       description = "A PostgreSQL persistent schema migration utility";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -530923,7 +532713,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Converter for question mark style and dollar sign style of PostgreSQL SQL";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -531065,7 +532855,7 @@ self: {
         utf8-string
       ];
       description = "pure Haskell PostgreSQL driver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -531247,7 +533037,7 @@ self: {
         postgresql-simple
       ];
       description = "Automatic re-connection support for PostgreSQL";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -531457,13 +533247,14 @@ self: {
       postgresql-libpq,
       postgresql-simple,
       scientific,
+      template-haskell,
       text,
       time,
     }:
     mkDerivation {
       pname = "postgresql-simple-interval";
-      version = "1.0.0.0";
-      sha256 = "01d550bhmbpy3bsz37m21hpgpg9x2v72qhv6fa2p0m6p61p1hadx";
+      version = "1.0.1.0";
+      sha256 = "1qwcywyiw9y5bnvzb0ji32q3yh5fs5nxiw17gr4q4yk0wi01rw92";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -531471,6 +533262,7 @@ self: {
         persistent
         postgresql-simple
         scientific
+        template-haskell
         text
         time
       ];
@@ -531484,7 +533276,7 @@ self: {
         time
       ];
       description = "A simple interval type for PostgreSQL";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -531622,7 +533414,7 @@ self: {
         transformers
       ];
       description = "Implementation of named parameters for `postgresql-simple` library";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -531878,7 +533670,7 @@ self: {
         tasty-hunit
       ];
       description = "PostgreSQL AST parsing and rendering";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -533026,7 +534818,7 @@ self: {
         tasty-hunit
       ];
       description = "PowerDNS API bindings for api/v1";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -533298,7 +535090,7 @@ self: {
         ppad-base16
       ];
       description = "A pure AEAD-ChaCha20-Poly1305 construction";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -533342,7 +535134,7 @@ self: {
         weigh
       ];
       description = "Pure base16 encoding and decoding on bytestrings";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -533385,7 +535177,7 @@ self: {
         criterion
       ];
       description = "base58 and base58check encoding/decoding";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533424,7 +535216,7 @@ self: {
         deepseq
       ];
       description = "bech32 and bech32m encoding/decoding, per BIPs 173 & 350";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -533476,7 +535268,7 @@ self: {
         ppad-secp256k1
       ];
       description = "BIP32 hierarchical deterministic wallets";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533537,7 +535329,7 @@ self: {
         deepseq
       ];
       description = "BIP39 mnemonic codes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533579,7 +535371,7 @@ self: {
         ppad-base16
       ];
       description = "A pure ChaCha20 stream cipher";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -533624,7 +535416,7 @@ self: {
         ppad-sha512
       ];
       description = "A HMAC-based key derivation function";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533670,7 +535462,7 @@ self: {
         ppad-sha512
       ];
       description = "HMAC-based deterministic random bit generator";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533716,7 +535508,7 @@ self: {
         ppad-sha512
       ];
       description = "A password-based key derivation function";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533755,7 +535547,7 @@ self: {
         ppad-base16
       ];
       description = "A pure Poly1305 MAC";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -533796,7 +535588,7 @@ self: {
         SHA
       ];
       description = "The RIPEMD-160 hashing algorithm";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -533842,7 +535634,7 @@ self: {
         weigh
       ];
       description = "Primitive Script support";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -533897,7 +535689,7 @@ self: {
         weigh
       ];
       description = "Schnorr signatures, ECDSA, and ECDH on the elliptic curve secp256k1";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -533939,7 +535731,7 @@ self: {
         SHA
       ];
       description = "The SHA-256 and HMAC-SHA256 algorithms";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -533982,7 +535774,7 @@ self: {
         SHA
       ];
       description = "The SHA-512 and HMAC-SHA512 algorithms";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -534143,6 +535935,45 @@ self: {
     }
   ) { };
 
+  pqueue_1_6_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      deepseq,
+      indexed-traversable,
+      random,
+      tasty,
+      tasty-bench,
+      tasty-quickcheck,
+    }:
+    mkDerivation {
+      pname = "pqueue";
+      version = "1.6.0.0";
+      sha256 = "1bg9z0m062lggmzkrq29vz75d7mxxmx9ka1862j7qszj9gqmqnw6";
+      libraryHaskellDepends = [
+        base
+        deepseq
+        indexed-traversable
+      ];
+      testHaskellDepends = [
+        base
+        deepseq
+        indexed-traversable
+        tasty
+        tasty-quickcheck
+      ];
+      benchmarkHaskellDepends = [
+        base
+        deepseq
+        random
+        tasty-bench
+      ];
+      description = "Reliable, persistent, fast priority queues";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   pqueue-mtl = callPackage (
     {
       mkDerivation,
@@ -534245,7 +536076,7 @@ self: {
         yaml
       ];
       description = "Decentralized git pull request and code review flows";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -534722,7 +536553,7 @@ self: {
         text
       ];
       description = "A library for writing predicates and transformations over predicates in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -535173,7 +537004,7 @@ self: {
         template-haskell
       ];
       description = "A Prelude";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -535866,7 +537697,7 @@ self: {
         wl-pprint
       ];
       description = "Pretty-printing library";
-      license = lib.licenses.lgpl3Only;
+      license = lib.licensesSpdx."LGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536057,7 +537888,7 @@ self: {
       ];
       doHaddock = false;
       description = "Produce nice human-readable HTML";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536224,8 +538055,8 @@ self: {
     }:
     mkDerivation {
       pname = "pretty-simple";
-      version = "4.1.3.0";
-      sha256 = "03nhhavr66ikwmkma3mw2a7dz9w0mhaxj49dgf2cf76v3jq1vara";
+      version = "4.1.4.0";
+      sha256 = "07xf5nz14ra724c46ql1y5i7ifmwn8l4pcbmpk17kfkvk1fall9s";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -536429,7 +538260,7 @@ self: {
         doctest-parallel
       ];
       description = "Pretty print charts from ghci";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "prettychart-watch";
     }
   ) { };
@@ -536478,7 +538309,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "API for prettyprinting custom syntax trees (extracted from elm-format)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536626,7 +538457,7 @@ self: {
         vector
       ];
       description = "Some useful combinators for the prettyprinter package";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -536734,7 +538565,7 @@ self: {
         text
       ];
       description = "Configurable pretty-printing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -536793,7 +538624,7 @@ self: {
         text
       ];
       description = "A prettyprinter backend for graphviz";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -536830,7 +538661,7 @@ self: {
         text
       ];
       description = "Efficient interpolation for Prettyprinter";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -536855,7 +538686,7 @@ self: {
         text
       ];
       description = "A prettyprinter backend for lucid";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -536920,7 +538751,7 @@ self: {
       sha256 = "15igqxb77ycl9lfs1bl1l9x3cynsg4kqzkr54q46ly4l315bsrq4";
       libraryHaskellDepends = [ ghc-prim ];
       description = "An ergonomic but conservative interface to ghc-prim";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -536975,7 +538806,7 @@ self: {
         quickcheck-classes
       ];
       description = "Prim typeclass instances";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537169,8 +539000,8 @@ self: {
     }:
     mkDerivation {
       pname = "primdata";
-      version = "0.1.2.2";
-      sha256 = "0cjsjcm6d71d61idkmb9d8ia26hcwzrmx8k5w1afhzpla73zfia9";
+      version = "0.1.2.3";
+      sha256 = "015k5c0g1l6szvf267f0hdmcw5bms932fqfpqg00r4jjygylli3b";
       libraryHaskellDepends = [
         base
         ghc-prim
@@ -537229,7 +539060,7 @@ self: {
         tasty-bench
       ];
       description = "Bindings to the primecount library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) primecount; };
 
@@ -537374,7 +539205,7 @@ self: {
         primitive
       ];
       description = "Addresses to unmanaged memory";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -537400,7 +539231,7 @@ self: {
         primitive-unlifted
       ];
       description = "Wrappers for primops around atomic operations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -537419,7 +539250,7 @@ self: {
         primitive
       ];
       description = "primitive functions with bounds-checking";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537499,7 +539330,7 @@ self: {
       sha256 = "1xnyyw76kh42fy1b1wkc143bg3588gbp48990xdskcad1aj4fyan";
       libraryHaskellDepends = [ primitive ];
       description = "convenience class for PrimMonad m/PrimState m";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537554,7 +539385,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Extras for the \"primitive\" library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -537579,7 +539410,7 @@ self: {
         QuickCheck
       ];
       description = "using the `Prim` interface for the FFI";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537662,7 +539493,7 @@ self: {
         primitive
       ];
       description = "Types for offsets into unboxed arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -537681,7 +539512,7 @@ self: {
         primitive
       ];
       description = "Unboxed variables for `Prim` values";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537704,7 +539535,7 @@ self: {
         cpu
       ];
       description = "Serialisation of primitive types";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -537760,7 +539591,7 @@ self: {
         primitive-unlifted
       ];
       description = "Slices of primitive arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537811,7 +539642,7 @@ self: {
         random
       ];
       description = "Sort primitive arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -537830,7 +539661,7 @@ self: {
         primitive
       ];
       description = "primitive operations on StableNames";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -537857,39 +539688,7 @@ self: {
         primitive
       ];
       description = "Unaligned access to primitive arrays";
-      license = lib.licenses.bsd3;
-    }
-  ) { };
-
-  primitive-unlifted_0_1_3_1 = callPackage (
-    {
-      mkDerivation,
-      base,
-      bytestring,
-      primitive,
-      stm,
-      text-short,
-    }:
-    mkDerivation {
-      pname = "primitive-unlifted";
-      version = "0.1.3.1";
-      sha256 = "1gilzgclpvz200sybw86nmdm7084nrklscq48cs36qqlgcd0wcwb";
-      revision = "1";
-      editedCabalFile = "0y3zdwbs1fdzspj1k95jyjrhm7za38gb6ada031bp02ifxbvsvsf";
-      libraryHaskellDepends = [
-        base
-        bytestring
-        primitive
-        text-short
-      ];
-      testHaskellDepends = [
-        base
-        primitive
-        stm
-      ];
-      description = "Primitive GHC types with unlifted types inside";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -537928,7 +539727,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Primitive GHC types with unlifted types inside";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -538490,7 +540289,7 @@ self: {
       ];
       doHaddock = false;
       description = "Abstract syntax for writing documents";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -538538,7 +540337,7 @@ self: {
         vector
       ];
       description = "Utilities for tracking source locations";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -538566,7 +540365,7 @@ self: {
         hspec
       ];
       description = "Discrete probability monad";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -538628,7 +540427,7 @@ self: {
         lens
       ];
       description = "A library for modular probabilistic modelling";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prob-fx";
       broken = true;
@@ -538677,10 +540476,10 @@ self: {
     }:
     mkDerivation {
       pname = "probability-polynomial";
-      version = "1.0.0.1";
-      sha256 = "1f06x4d2cbd9j7rxgwdpxn8ff8w32xag96qk86mwggnzlw091gib";
-      revision = "2";
-      editedCabalFile = "039np4z6lzz81n90k1sqbr7n8bxfmh8v4xvbppzzpgk6kp5fxpfm";
+      version = "1.0.1.0";
+      sha256 = "0hyncg56b4jw9yjjl551ql8hinl2m6gjsfdjlsjws619iqxvpp42";
+      revision = "1";
+      editedCabalFile = "1gyx5547m3xkjrinm2pgpna18mzkk47ckmb0qjbn1z7zv4gjyspg";
       libraryHaskellDepends = [
         base
         containers
@@ -538700,7 +540499,7 @@ self: {
         deepseq
       ];
       description = "Probability distributions via piecewise polynomials";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -538830,7 +540629,7 @@ self: {
         unix
       ];
       description = "Process libraries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -539310,7 +541109,7 @@ self: {
         process
       ];
       description = "C bindings for the gnu-extension functions process_vm_readv and process_vm_writev";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -539361,6 +541160,8 @@ self: {
       pname = "procex";
       version = "0.3.3";
       sha256 = "1r5rrdwzjvh2mdsv63hq2rv9qq04qwmvw83niri066ini60ns9ln";
+      revision = "1";
+      editedCabalFile = "1saj9mgscajshbk6hw975chvh2qlmxa0nlp86hx59iza75xq186r";
       libraryHaskellDepends = [
         async
         base
@@ -539378,7 +541179,7 @@ self: {
         unix
       ];
       description = "Ergonomic process launching with extreme flexibility and speed";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -539778,7 +541579,7 @@ self: {
         optparse-applicative
       ];
       description = "Generate flamegraphs from ghc RTS .prof files";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prof-flamegraph";
       broken = true;
@@ -540352,7 +542153,7 @@ self: {
         tasty-hunit
       ];
       description = "A project initialization library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -540685,7 +542486,7 @@ self: {
         winery
       ];
       description = "Relational Algebra Engine";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -540856,7 +542657,7 @@ self: {
         inspection-testing
       ];
       description = "Profunctor-based lightweight implementation of optics";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -541437,7 +543238,7 @@ self: {
         warp
       ];
       description = "Instrument a wai application with various metrics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prometheus-wai-middleware-example";
       broken = true;
@@ -541530,7 +543331,7 @@ self: {
         text
       ];
       description = "A user-friendly, dependently-typed library for asking your users questions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -541553,7 +543354,7 @@ self: {
         text
       ];
       description = "A user-friendly, dependently-typed library for asking your users questions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -541636,7 +543437,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Telegram bot for proof assistants";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "proof-assistant-bot";
       broken = true;
@@ -541741,7 +543542,7 @@ self: {
         containers
       ];
       description = "A Propagator Library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -541930,7 +543731,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A library for tests, based on transforming and writing properties";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -542006,7 +543807,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Proquints: Identifiers that are Readable, Spellable, and Pronounceable";
-      license = "EUPL-1.2";
+      license = lib.licensesSpdx."EUPL-1.2";
     }
   ) { };
 
@@ -542079,7 +543880,7 @@ self: {
         text
       ];
       description = "A simple language for writing documents";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -542116,7 +543917,7 @@ self: {
         unordered-containers
       ];
       description = "A DSL for processing Prosidy documents";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -542230,7 +544031,7 @@ self: {
           ];
           libraryToolDepends = [ c2hs ];
           description = "Simple audio library for Windows, Linux, OSX";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           broken = true;
         }
@@ -542265,7 +544066,7 @@ self: {
       libraryPkgconfigDepends = [ SDL2 ];
       libraryToolDepends = [ c2hs ];
       description = "Simple audio library for SDL";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -542352,7 +544153,7 @@ self: {
         prelate
       ];
       description = "Neovim Project Manager";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "proteome";
       broken = true;
@@ -542549,7 +544350,7 @@ self: {
       ];
       libraryToolDepends = [ proto-lens-protoc ];
       description = "proto-lens-etcd - protobuffer lenses for etcd provided by protoc-lens-protoc";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -542582,7 +544383,7 @@ self: {
         vector
       ];
       description = "JSON protobuf encoding for proto-lens";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -542914,8 +544715,7 @@ self: {
         vector
       ];
       description = "A higher-level API to the proto3-wire library";
-      license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -542949,8 +544749,8 @@ self: {
     }:
     mkDerivation {
       pname = "proto3-wire";
-      version = "1.4.3";
-      sha256 = "0gsb0qzxpgpy64jmx2fsbb7cjzixpfsqb2zjws62kg89sgkid8vz";
+      version = "1.4.4";
+      sha256 = "15r1irfld81j1mm3yr6lnbb74qlkskp2qcwxhicrdrj0w5nvb8vd";
       libraryHaskellDepends = [
         base
         bytestring
@@ -543084,7 +544884,7 @@ self: {
         zigzag
       ];
       description = "Slow protobuf implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -543719,7 +545519,7 @@ self: {
         vinyl
       ];
       description = "Lightweight dependency injection / namespaced+typed implicit-ish arguments";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -543871,7 +545671,7 @@ self: {
         yaml
       ];
       description = "Prune unused Haskell dependencies";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "prune-juice";
       broken = true;
@@ -544147,7 +545947,7 @@ self: {
         vector
       ];
       description = "PostgreSQL client";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -544295,7 +546095,7 @@ self: {
         tasty-hunit
       ];
       description = "Integrate libpsx with the GHC RTS";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -544549,7 +546349,7 @@ self: {
         rerebase
       ];
       description = "Experimental abstractions for operations on pointers";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -544599,7 +546399,7 @@ self: {
         tasty-hunit
       ];
       description = "High-performance composable binary data deserializers";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -544639,7 +546439,7 @@ self: {
         rerebase
       ];
       description = "Pointer poking action construction and composition toolkit";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -544676,8 +546476,8 @@ self: {
     }:
     mkDerivation {
       pname = "pty-mcp-server";
-      version = "0.1.2.0";
-      sha256 = "17mczija7br6l2c4x8svjn60si6hxlv6iy5zwf1l42y2sv5y9hh9";
+      version = "0.1.4.0";
+      sha256 = "0jvchk9g1f0g77filmylqss5h4wx4fn8jssmdzfn358fh36i5710";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -544698,7 +546498,7 @@ self: {
         safe-exceptions
       ];
       description = "pty-mcp-server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pty-mcp-server";
     }
@@ -545485,6 +547285,48 @@ self: {
     }
   ) { };
 
+  pup = callPackage (
+    {
+      mkDerivation,
+      base,
+      comonad,
+      containers,
+      hedgehog,
+      megaparsec,
+      mtl,
+      prettyprinter,
+      stacked,
+      text,
+    }:
+    mkDerivation {
+      pname = "pup";
+      version = "0.1.0";
+      sha256 = "15jyl295frn3ylfwm01cx630hjllcsbmkm4pl2n1anayw6j9pm0r";
+      libraryHaskellDepends = [
+        base
+        comonad
+        containers
+        megaparsec
+        prettyprinter
+        stacked
+        text
+      ];
+      testHaskellDepends = [
+        base
+        comonad
+        containers
+        hedgehog
+        megaparsec
+        mtl
+        prettyprinter
+        stacked
+        text
+      ];
+      description = "Invertible format descriptors";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   puppetresources = callPackage (
     {
       mkDerivation,
@@ -545608,6 +547450,7 @@ self: {
       base,
       deepseq,
       mwc-random,
+      primitive,
       tasty,
       tasty-bench,
       tasty-discover,
@@ -545617,31 +547460,32 @@ self: {
     }:
     mkDerivation {
       pname = "pure-noise";
-      version = "0.1.0.1";
-      sha256 = "116w6scl7kranx567jhnrir9sh0ysjzs45gfhk970q0pzbkgnj1l";
+      version = "0.2.0.0";
+      sha256 = "05wp0nlvang8jfyzxi9b080d4dppn5fmj28dhwh5v65lrnh5fzzf";
       libraryHaskellDepends = [
         base
-        vector
+        primitive
       ];
       testHaskellDepends = [
         base
+        primitive
         tasty
         tasty-discover
         tasty-hunit
         tasty-quickcheck
-        vector
       ];
       testToolDepends = [ tasty-discover ];
       benchmarkHaskellDepends = [
         base
         deepseq
         mwc-random
+        primitive
         tasty
         tasty-bench
         vector
       ];
-      description = "Performant, modern noise generation for Haskell with minimal dependencies. Based on FastNoiseLite.";
-      license = lib.licenses.bsd3;
+      description = "High-performance composable noise generation (Perlin, Simplex, Cellular)";
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -545756,7 +547600,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Derive fromString/toString-like for pure sum types";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -545792,7 +547636,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Derive fromString/toString-like for pure sum types (aeson instances)";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -545973,7 +547817,7 @@ self: {
         time
       ];
       description = "types and parser for email messages (including MIME)";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -546014,7 +547858,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Nix backend for PureScript. Transpile PureScript code to Nix.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "purenix";
     }
   ) { };
@@ -546059,7 +547903,7 @@ self: {
       ];
       doHaddock = false;
       description = "Pure Haskell SAT-solver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -546386,7 +548230,7 @@ self: {
       ];
       doCheck = false;
       description = "PureScript Programming Language Compiler";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "purs";
     }
   ) { };
@@ -546430,7 +548274,7 @@ self: {
         vector
       ];
       description = "PureScript Programming Language Abstract Syntax Tree";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -546557,7 +548401,7 @@ self: {
       ];
       libraryToolDepends = [ happy ];
       description = "PureScript Programming Language Concrete Syntax Tree";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -546745,7 +548589,7 @@ self: {
         text
       ];
       description = "Support for purl (mostly universal package url)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -547374,26 +549218,22 @@ self: {
       base,
       bytestring,
       containers,
+      directory,
+      filepath,
       foldl,
-      io-storage,
       lens,
       logging,
       monad-logger,
       old-locale,
       optparse-applicative,
       parallel-io,
-      pipes,
-      pipes-group,
-      pipes-safe,
-      pipes-text,
+      pretty-show,
+      process,
       regex-posix,
-      safe,
-      shelly,
       system-fileio,
       system-filepath,
       temporary,
       text,
-      text-format,
       time,
       transformers,
       unix,
@@ -547402,8 +549242,8 @@ self: {
     }:
     mkDerivation {
       pname = "pushme";
-      version = "2.1.3";
-      sha256 = "13rc83fqbizcq1pvvmpd90cy5664p21hjg1aw5bjqw19l2g3c153";
+      version = "3.0.0";
+      sha256 = "0wv718mn9i8kvpmrqrq9s5wnsdndlrd1zmk6jbv87b0mkciiwkpj";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -547411,37 +549251,31 @@ self: {
         base
         bytestring
         containers
+        directory
+        filepath
         foldl
-        io-storage
         lens
         logging
         monad-logger
         old-locale
         optparse-applicative
         parallel-io
-        pipes
-        pipes-group
-        pipes-safe
-        pipes-text
+        pretty-show
+        process
         regex-posix
-        safe
-        shelly
         system-fileio
         system-filepath
         temporary
         text
-        text-format
         time
         transformers
         unix
         unordered-containers
         yaml
       ];
-      description = "Tool to synchronize directories with rsync, zfs or git-annex";
+      description = "Synchronize multiple filesets across machines using rsync";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "pushme";
-      broken = true;
     }
   ) { };
 
@@ -547784,7 +549618,7 @@ self: {
         vector-stream
       ];
       description = "Fast persistent vectors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548084,7 +549918,7 @@ self: {
         test-framework-hunit
       ];
       description = "Serialization/deserialization using Python Pickle format";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pickle";
       broken = true;
@@ -548173,7 +550007,7 @@ self: {
         tasty-silver
       ];
       description = "Types and prettyprinter for the IL of the QBE compiler backend";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548374,7 +550208,7 @@ self: {
       ];
       doHaddock = false;
       description = "Command line tool qhs, SQL queries on CSV and TSV files";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "qhs";
     }
@@ -548551,7 +550385,7 @@ self: {
         template-haskell
       ];
       description = "Typesafe library for linear algebra";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -548699,7 +550533,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "QuasiQuoter for byte sequence";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -549263,7 +551097,7 @@ self: {
       editedCabalFile = "0pqi04fvyclnx4lfq8ifax6l4kayay6xbmwp0k0h7yjz14k252gn";
       libraryHaskellDepends = [ base ];
       description = "Extremely minimal prelude";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -549363,7 +551197,7 @@ self: {
         text
       ];
       description = "GHC plugin to automatically insert qualified imports";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -549475,7 +551309,7 @@ self: {
         unordered-containers
       ];
       description = "Rage against the quantification";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -549504,7 +551338,7 @@ self: {
         vector
       ];
       description = "Rage against the quantification - integration with Aeson";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -550158,8 +551992,8 @@ self: {
       pname = "queue-sheet";
       version = "0.8.0.1";
       sha256 = "1s7j51542j4in10ihb47jflwkf6m4gsi1z1aq9mzs2ksj65n1yc9";
-      revision = "1";
-      editedCabalFile = "0bq0abf3qzlpcy6kxrhbzm9zg9fa2ps5fj27i9c67nyc5y520ana";
+      revision = "2";
+      editedCabalFile = "15m5ba4w79vjqj9fd1kw0y004pmrc1a8im0v0i5c90lgpv0fcr74";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -550189,7 +552023,7 @@ self: {
         tasty-hunit
       ];
       description = "queue sheet utility";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "queue-sheet";
     }
   ) { };
@@ -550232,8 +552066,8 @@ self: {
       pname = "queues";
       version = "1.0.0";
       sha256 = "0mnn6lgd7101lrmwqy4lf04ncq8ci2kfxydm1rlh879gjvzz3lsr";
-      revision = "5";
-      editedCabalFile = "00qbr5h2k6hkykfsw6qqqz8krfd06hvridpzijyvdskg97pggjv5";
+      revision = "6";
+      editedCabalFile = "0hbjkkcg8g4mfngpik5fz720k3nsqk7abykikslniqv3g348wh2q";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -550246,7 +552080,7 @@ self: {
         tasty-bench
       ];
       description = "Queue data structures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -550292,7 +552126,7 @@ self: {
         tasty-hunit
       ];
       description = "Convenient SQL query language for Haskell (but only for single tables)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -550548,7 +552382,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Run external processes verified at compilation/installation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -550837,7 +552671,7 @@ self: {
         vector
       ];
       description = "QuickCheck common typeclasses";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -550862,7 +552696,7 @@ self: {
         transformers
       ];
       description = "QuickCheck common typeclasses from `base`";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -550926,7 +552760,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A library for stateful property-based testing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -550985,7 +552819,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Testing group class instances with QuickCheck";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -551093,7 +552927,7 @@ self: {
         QuickCheck
       ];
       description = "Common quickcheck instances";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -551163,7 +552997,7 @@ self: {
         temporary
       ];
       description = "Library for lockstep-style testing with 'quickcheck-dynamic'";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -551212,7 +553046,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Testing monoid subclass instances with QuickCheck";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -551350,7 +553184,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Quasi-unique identifiers for QuickCheck";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -551660,7 +553494,7 @@ self: {
       ];
       doHaddock = false;
       description = "Test monadic programs using state machine based models";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -551809,7 +553643,7 @@ self: {
         transformers
       ];
       description = "A GenT monad transformer for QuickCheck library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -553151,7 +554985,7 @@ self: {
         th-compat
       ];
       description = "Monad transformer for Quote from template-haskell";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -553265,7 +555099,7 @@ self: {
         weigh
       ];
       description = "R-/R*-trees";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -554081,13 +555915,12 @@ self: {
       QuickCheck,
       random,
       stm,
-      tagged,
       template-haskell,
     }:
     mkDerivation {
       pname = "raketka";
-      version = "1.1.3";
-      sha256 = "0mz9639p3ndlq72gask5fdv7kqpkgs4wh0f86wfargyfd36179lw";
+      version = "1.2.0";
+      sha256 = "1f3mj7hq8gm2d8c06vys16bzc9gg18z4rfkifxri8nb83gz4ngdm";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -554105,7 +555938,6 @@ self: {
         network-transport-tcp
         random
         stm
-        tagged
         template-haskell
       ];
       executableHaskellDepends = [
@@ -554123,7 +555955,6 @@ self: {
         network-transport-tcp
         random
         stm
-        tagged
         template-haskell
       ];
       testHaskellDepends = [
@@ -554286,7 +556117,7 @@ self: {
         vector
       ];
       description = "Random access lists";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -554313,7 +556144,7 @@ self: {
         ral
       ];
       description = "Length-indexed random access lists: lens utilities";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -554340,7 +556171,7 @@ self: {
         ral
       ];
       description = "Length-indexed random access lists: optics utilities";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -554376,7 +556207,7 @@ self: {
         deepseq
       ];
       description = "Random access list with a list compatible interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -554448,7 +556279,7 @@ self: {
         hspec
       ];
       description = "Determine how intervals relate to each other";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -554884,7 +556715,7 @@ self: {
         vector
       ];
       description = "Uniform draws of partitions and cycle-partitions, with thinning";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -555110,8 +556941,8 @@ self: {
     }:
     mkDerivation {
       pname = "random-mhs";
-      version = "1.3.2";
-      sha256 = "0kal37pcjh9a3j4mglysar00dz7n1vgyrq30z335v3fsjn0g31i5";
+      version = "1.3.2.1";
+      sha256 = "0i7xwdpghss1r5sd3nrsfwri6x624anfsn8c8pdqy7cd9kqq179y";
       libraryHaskellDepends = [
         base
         bytestring
@@ -555529,7 +557360,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Memory efficient sets with ranges of elements";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -555681,7 +557512,7 @@ self: {
         random-shuffle
       ];
       description = "Efficient sets for semi-contiguous data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -555750,7 +557581,7 @@ self: {
         tasty-hunit
       ];
       description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -556475,7 +558306,7 @@ self: {
         hspec
       ];
       description = "Notify Honeybadger about exceptions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -556504,7 +558335,7 @@ self: {
         wai
       ];
       description = "Notify Honeybadger about exceptions via a WAI middleware";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -556829,7 +558660,7 @@ self: {
         filepath
       ];
       description = "Parse and generate Rocket League replays";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rattletrap";
       broken = true;
@@ -557046,7 +558877,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A writer-biased RAW lock";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -557137,7 +558968,7 @@ self: {
         h-raylib
       ];
       description = "Haskell bindings for rlImGui";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -557179,7 +559010,7 @@ self: {
         random
       ];
       description = "Ray tracing library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -557486,6 +559317,8 @@ self: {
       pname = "rcu";
       version = "0.2.7";
       sha256 = "0iw1w2jch8a6ap2nrkis740vbi5sjgk7hdbv9d4m08j4c402q3c9";
+      revision = "1";
+      editedCabalFile = "0r56khfhyr29wbidvrdlzzayzniaa6pqmjf6kjymackmvy6kiszq";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -557677,7 +559510,7 @@ self: {
         text
       ];
       description = "The ActivityStreams 2 RDF vocabulary for rdf4h";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -557805,7 +559638,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Codecs for use with AWS rds-data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -557901,7 +559734,7 @@ self: {
         tasty-discover
       ];
       description = "Codecs for use with AWS rds-data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rds-data-codecs";
       broken = true;
@@ -558034,7 +559867,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Codecs for use with AWS rds-data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rds-data";
     }
@@ -558119,7 +559952,7 @@ self: {
         text
       ];
       description = "Create React components in Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -558435,8 +560268,8 @@ self: {
       pname = "reactive-banana";
       version = "1.3.2.0";
       sha256 = "0mrsw3hkl0sgwcbay4m1lzs4bilss80g9p6njbbhapbfjyzsr36k";
-      revision = "5";
-      editedCabalFile = "0dydffvlxf6wlkaj1sf2argrpkfwswjcby2an1rcwrk8gs6dklkv";
+      revision = "6";
+      editedCabalFile = "1kjxyjwq8lzxyz42plb8i3d5awwr3vbk27dlqia9s0j1vp3skyw1";
       libraryHaskellDepends = [
         base
         containers
@@ -558978,7 +560811,7 @@ self: {
       sha256 = "0b2syhxan3fpf9h1zq3izpb8bgsl4qrk975afy3r2ji6dhjq81cl";
       libraryHaskellDepends = [ base ];
       description = "Class for reading bounded values";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -559333,7 +561166,7 @@ self: {
         mtl
       ];
       description = "Readline effect for in-other-words";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "echo-repl";
     }
@@ -559407,7 +561240,7 @@ self: {
         numhask
       ];
       description = "Literate programming support";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "readme-lhs-example";
       broken = true;
@@ -559533,7 +561366,7 @@ self: {
         QuickCheck
       ];
       description = "Random number generation based on physical media touched by humans";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "real-dice";
     }
   ) { };
@@ -559778,7 +561611,7 @@ self: {
         vector
       ];
       description = "SVG file loader and serializer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -559945,7 +561778,7 @@ self: {
         void
       ];
       description = "A more progressive alternative to the \"base\" package";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -559970,6 +561803,49 @@ self: {
     }
   ) { };
 
+  rebound = callPackage (
+    {
+      mkDerivation,
+      base,
+      containers,
+      deepseq,
+      fin,
+      mtl,
+      QuickCheck,
+      tasty,
+      tasty-hunit,
+      tasty-quickcheck,
+      vec,
+    }:
+    mkDerivation {
+      pname = "rebound";
+      version = "0.1.1.0";
+      sha256 = "0qg2z0fj79iyygdvi0dy7bcbgkffvnxxvspfdq30hlwhjw3h5zxn";
+      libraryHaskellDepends = [
+        base
+        containers
+        deepseq
+        fin
+        mtl
+        QuickCheck
+        vec
+      ];
+      testHaskellDepends = [
+        base
+        containers
+        mtl
+        QuickCheck
+        tasty
+        tasty-hunit
+        tasty-quickcheck
+      ];
+      description = "A variable binding library based on well-scoped de Bruijn indices";
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   rec-def = callPackage (
     {
       mkDerivation,
@@ -560007,7 +561883,7 @@ self: {
         template-haskell
       ];
       description = "Recursively defined values";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       maintainers = [ lib.maintainers.nomeata ];
     }
   ) { };
@@ -560107,7 +561983,7 @@ self: {
         vector
       ];
       description = "Recommendations using alternating least squares algorithm";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "movielens";
     }
   ) { };
@@ -560617,7 +562493,7 @@ self: {
         vector
       ];
       description = "Recover run-time type information from the GHC heap";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -560941,7 +562817,7 @@ self: {
       ];
       doHaddock = false;
       description = "Extensible records and variants indexed by a type-level Red-Black tree";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -561076,7 +562952,7 @@ self: {
         unliftio
       ];
       description = "hide secret text on the terminal";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "redact";
     }
   ) { };
@@ -561254,7 +563130,7 @@ self: {
         QuickCheck
       ];
       description = "Specify valid redis globs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -561520,7 +563396,6 @@ self: {
       ];
       description = "Combine redis caching and haxl";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -561689,6 +563564,80 @@ self: {
     }
   ) { };
 
+  reduxwise = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      containers,
+      directory,
+      filepath,
+      mtl,
+      optparse-applicative,
+      regex-tdfa,
+      text,
+      time,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "reduxwise";
+      version = "0.1.0.0";
+      sha256 = "0sq8185siqbrdz4nrajrzrjswlmcpk03gxpqnrrad0cabwa64k99";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        mtl
+        optparse-applicative
+        regex-tdfa
+        text
+        time
+        yaml
+      ];
+      executableHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        mtl
+        optparse-applicative
+        regex-tdfa
+        text
+        time
+        yaml
+      ];
+      testHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        directory
+        filepath
+        mtl
+        optparse-applicative
+        regex-tdfa
+        text
+        time
+        yaml
+      ];
+      description = "Static analysis tool for Rust embedded systems complexity";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      mainProgram = "reduxwise-exe";
+    }
+  ) { };
+
   reedsolomon = callPackage (
     {
       mkDerivation,
@@ -562023,7 +563972,7 @@ self: {
         linear-base
       ];
       description = "A reference counting library to alias linear resources";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -562158,7 +564107,7 @@ self: {
         QuickCheck
       ];
       description = "Refinement types with static and runtime checking";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.raehik ];
     }
   ) { };
@@ -562198,7 +564147,7 @@ self: {
         unordered-containers
       ];
       description = "Type-checked proof that a key exists in a container and can be safely indexed";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -562556,6 +564505,145 @@ self: {
     }
   ) { };
 
+  reflex_0_9_4_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bifunctors,
+      commutative-semigroups,
+      comonad,
+      constraints,
+      constraints-extras,
+      containers,
+      criterion,
+      data-default,
+      deepseq,
+      dependent-map,
+      dependent-sum,
+      exception-transformers,
+      exceptions,
+      haskell-src-exts,
+      haskell-src-meta,
+      hspec,
+      lens,
+      loch-th,
+      MemoTrie,
+      mmorph,
+      monad-control,
+      monoidal-containers,
+      mtl,
+      patch,
+      prim-uniq,
+      primitive,
+      process,
+      profunctors,
+      random,
+      ref-tf,
+      reflection,
+      semialign,
+      semigroupoids,
+      split,
+      stm,
+      syb,
+      template-haskell,
+      text,
+      these,
+      these-lens,
+      time,
+      transformers,
+      unbounded-delays,
+      witherable,
+    }:
+    mkDerivation {
+      pname = "reflex";
+      version = "0.9.4.0";
+      sha256 = "1ihknackgbms412ixp2mwwmrqd4sak4vm3654nb4dn08rs50fq4f";
+      libraryHaskellDepends = [
+        base
+        bifunctors
+        commutative-semigroups
+        comonad
+        constraints
+        constraints-extras
+        containers
+        data-default
+        dependent-map
+        dependent-sum
+        exception-transformers
+        exceptions
+        haskell-src-exts
+        haskell-src-meta
+        MemoTrie
+        mmorph
+        monad-control
+        monoidal-containers
+        mtl
+        patch
+        prim-uniq
+        primitive
+        profunctors
+        random
+        ref-tf
+        reflection
+        semialign
+        semigroupoids
+        stm
+        syb
+        template-haskell
+        these
+        time
+        transformers
+        unbounded-delays
+        witherable
+      ];
+      testHaskellDepends = [
+        base
+        bifunctors
+        commutative-semigroups
+        constraints
+        constraints-extras
+        containers
+        deepseq
+        dependent-map
+        dependent-sum
+        hspec
+        lens
+        monoidal-containers
+        mtl
+        patch
+        ref-tf
+        semialign
+        split
+        text
+        these
+        these-lens
+        transformers
+        witherable
+      ];
+      benchmarkHaskellDepends = [
+        base
+        containers
+        criterion
+        deepseq
+        dependent-map
+        dependent-sum
+        loch-th
+        mtl
+        primitive
+        process
+        ref-tf
+        split
+        stm
+        time
+        transformers
+      ];
+      description = "Higher-order Functional Reactive Programming";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.alexfmpe ];
+    }
+  ) { };
+
   reflex-animation = callPackage (
     {
       mkDerivation,
@@ -563135,7 +565223,7 @@ self: {
         text
       ];
       description = "Compatible highlevel Wigdets for some Ionic Input Components";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -563186,7 +565274,7 @@ self: {
         time
       ];
       description = "Render Pandoc documents to HTML using reflex-dom";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -563303,7 +565391,7 @@ self: {
         tasty-hspec
       ];
       description = "reflex-dom-th transpiles HTML templates to haskell code for reflex-dom";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -563475,6 +565563,61 @@ self: {
     }
   ) { };
 
+  reflex-gadt-api_0_3_0_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-gadt-th,
+      base,
+      constraints-extras,
+      containers,
+      data-default,
+      dependent-sum,
+      jsaddle,
+      reflex,
+      reflex-dom-core,
+      some,
+      text,
+      time,
+    }:
+    mkDerivation {
+      pname = "reflex-gadt-api";
+      version = "0.3.0.0";
+      sha256 = "05v5477ycgyib7w3v4r9gsvl2n8ia9ic9c1jr66az9p6w353zzpf";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        aeson-gadt-th
+        base
+        constraints-extras
+        containers
+        data-default
+        jsaddle
+        reflex
+        reflex-dom-core
+        some
+        text
+        time
+      ];
+      executableHaskellDepends = [
+        aeson
+        aeson-gadt-th
+        base
+        constraints-extras
+        dependent-sum
+        reflex-dom-core
+        text
+        time
+      ];
+      description = "Interact with a GADT API in your reflex-dom application";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "readme";
+      maintainers = [ lib.maintainers.alexfmpe ];
+    }
+  ) { };
+
   reflex-ghci = callPackage (
     {
       mkDerivation,
@@ -563545,7 +565688,7 @@ self: {
         temporary
       ];
       description = "A GHCi widget library for use in reflex applications";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "reflex-ghci";
     }
@@ -563773,7 +565916,7 @@ self: {
         reflex
       ];
       description = "Reflex bindings for libtelnet";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       platforms = lib.platforms.linux;
       hydraPlatforms = lib.platforms.none;
     }
@@ -564184,8 +566327,8 @@ self: {
     }:
     mkDerivation {
       pname = "reflex-vty";
-      version = "0.6.1.1";
-      sha256 = "0i1745p0kgc7y2zfzix1vfljmgi4aq8nqng9c3nsm420jkys3xz6";
+      version = "0.6.2.0";
+      sha256 = "0hl7dy5h6fjmlsxmk142rpp36d6gnhka0k7aa2jci8q7g7i1zs4f";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -564282,6 +566425,8 @@ self: {
       ];
       description = "Add support for using blaze-html with Reform";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -564457,7 +566602,7 @@ self: {
         transformers
       ];
       description = "See README for more info";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -564686,7 +566831,7 @@ self: {
       ];
       doHaddock = false;
       description = "Register allocation by graph colorization";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -565378,8 +567523,6 @@ self: {
       testPkgconfigDepends = [ pcre2 ];
       description = "PCRE2 Backend for \"Text.Regex\" (regex-base)";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { inherit (pkgs) pcre2; };
 
@@ -565541,8 +567684,8 @@ self: {
     }:
     mkDerivation {
       pname = "regex-tdfa";
-      version = "1.3.2.4";
-      sha256 = "15x7pisdvi0afg7ybxpga8aa4q38x9pz9ml7nhz1f7s4nw9w72q7";
+      version = "1.3.2.5";
+      sha256 = "0y4a0bgyviad013jl67kqhkbwf8b0jqs3qmlsgvq912lk92gng9f";
       libraryHaskellDepends = [
         array
         base
@@ -565557,13 +567700,10 @@ self: {
         array
         base
         bytestring
-        containers
         directory
         doctest-parallel
         filepath
-        mtl
         regex-base
-        text
         utf8-string
       ];
       description = "Pure Haskell Tagged DFA Backend for \"Text.Regex\" (regex-base)";
@@ -565864,7 +568004,7 @@ self: {
         text
       ];
       description = "Types that can only be constructed if they match a regular expression";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -566230,13 +568370,12 @@ self: {
       template-haskell,
       text,
       transformers-base,
-      universum,
       unliftio,
     }:
     mkDerivation {
       pname = "registry";
-      version = "0.6.3.2";
-      sha256 = "0av7jira1cvbc1cj570fp5d31vqxkb4w9s4hxlqj4hna5h9s5898";
+      version = "0.6.3.3";
+      sha256 = "1w7v2mrpkl6kqxyvavb6fdqj54fgpkwhh3q56sgkdy9z5ksbn2g8";
       libraryHaskellDepends = [
         base
         containers
@@ -566281,13 +568420,11 @@ self: {
         template-haskell
         text
         transformers-base
-        universum
         unliftio
       ];
       testToolDepends = [ tasty-discover ];
       description = "data structure for assembling components";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -566348,7 +568485,6 @@ self: {
       ];
       description = "Aeson encoders / decoders";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -566415,7 +568551,6 @@ self: {
       testToolDepends = [ tasty-discover ];
       description = "utilities to work with Hedgehog generators and `registry`";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -566493,7 +568628,6 @@ self: {
       testToolDepends = [ tasty-discover ];
       description = "Hedgehog generators for Aeson";
       license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
     }
   ) { };
 
@@ -566675,7 +568809,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple linear and quadratic regression";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -567179,7 +569313,7 @@ self: {
         hspec-discover
       ];
       description = "A data structure representing Relations on Sets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -567556,7 +569690,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Automation of Haskell package release process";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "releaser";
     }
   ) { };
@@ -567756,8 +569890,8 @@ self: {
     }:
     mkDerivation {
       pname = "relocant";
-      version = "1.0.0";
-      sha256 = "1iazymf953msr6d7dn99slw12wmnivnx5nfzjbq8h4f84ybwmvr6";
+      version = "1.1.0";
+      sha256 = "0wfifgvaxpjygyc0bcrcasln2mmsc7x0avd0ia6jjwcd9cx9d6mh";
       isLibrary = true;
       isExecutable = true;
       setupHaskellDepends = [
@@ -567795,9 +569929,7 @@ self: {
       ];
       description = "A PostgreSQL migration CLI tool and library";
       license = lib.licenses.bsd2;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "relocant";
-      broken = true;
     }
   ) { };
 
@@ -567827,7 +569959,7 @@ self: {
         transformers
       ];
       description = "Equiprobable draw from publicly verifiable random data";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -567854,6 +569986,8 @@ self: {
       pname = "relude";
       version = "1.2.2.2";
       sha256 = "1865bladis4czglyvkcj05qh3fr2bvrm1w5dm5gz3wjs2cnsivci";
+      revision = "1";
+      editedCabalFile = "130ifkvrksr7p87sll4spgp9xp9cpgfcmy07ibp1j80xjw5wf7sy";
       libraryHaskellDepends = [
         base
         bytestring
@@ -567882,7 +570016,7 @@ self: {
         unordered-containers
       ];
       description = "Safe, performant, user-friendly and lightweight Haskell Standard Library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -568461,7 +570595,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Reorder expressions in a syntax tree according to operator fixities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -569182,7 +571316,7 @@ self: {
         text
       ];
       description = "Find, replace, split string patterns with Megaparsec parsers (instead of regex)";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -569744,7 +571878,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doCheck = false;
       description = "HTTP client library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -569794,7 +571928,7 @@ self: {
         weigh
       ];
       description = "Conduit helpers for the req HTTP client library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -569949,8 +572083,8 @@ self: {
     }:
     mkDerivation {
       pname = "request";
-      version = "0.3.0.0";
-      sha256 = "1cankhlqmqcs1qnrqf2k53vdwdp3x2dh7gqz37cynvi7ndxzxavd";
+      version = "0.3.1.0";
+      sha256 = "1w9l1imizdnksz2czpmf2l9plc9vkzk5ymvdhm79275acc2a5b9h";
       libraryHaskellDepends = [
         base
         bytestring
@@ -570094,7 +572228,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Propagate HasCallStack with constraints";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -570132,6 +572266,8 @@ self: {
       pname = "rere";
       version = "0.2.0.2";
       sha256 = "14lmqbihrhy9cdskxgk9l36ndr323vqiwxs8fry5s64gg00ahlyf";
+      revision = "1";
+      editedCabalFile = "018hk8ng0ca1z37wvm8vr1cfh13dmha300cq1l9mzxvkm7nkbp4m";
       libraryHaskellDepends = [
         base
         containers
@@ -570159,7 +572295,7 @@ self: {
         parsec
       ];
       description = "Regular-expressions extended with fixpoints for context-free powers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -570171,7 +572307,7 @@ self: {
       sha256 = "047wlwvffmgg70d70dsv6160wq6hfxp4frb0414np270grq0vk3p";
       libraryHaskellDepends = [ rebase ];
       description = "Reexports from \"base\" with a bunch of other standard libraries";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -570470,7 +572606,7 @@ self: {
         semigroupoids
       ];
       description = "High performance variable binders";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -570533,7 +572669,7 @@ self: {
         tasty-hunit
       ];
       description = "Domain Name Service (DNS) lookup via the libresolv standard library routines";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -570679,7 +572815,7 @@ self: {
         stm
       ];
       description = "A region-based resource effect for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -570730,7 +572866,7 @@ self: {
         time
       ];
       description = "A high-performance striped resource pooling implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -570757,7 +572893,7 @@ self: {
         time
       ];
       description = "A high-performance striped resource pooling implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -570895,7 +573031,7 @@ self: {
         tree-diff
       ];
       description = "Track allocated resources";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -570984,7 +573120,7 @@ self: {
         resourcet
       ];
       description = "Adaptation of the resourcet library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -571011,7 +573147,7 @@ self: {
         unliftio-core
       ];
       description = "ResourceT extras";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -571070,7 +573206,7 @@ self: {
         utf8-string
       ];
       description = "A fast, non-backtracking parser for the redis RESP3 protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -571962,7 +574098,7 @@ self: {
         unix
       ];
       description = "A tool that returns to a landmark parent directory";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "ret";
     }
   ) { };
@@ -572181,97 +574317,6 @@ self: {
     }
   ) { };
 
-  retrie_1_1_0_0 = callPackage (
-    {
-      mkDerivation,
-      ansi-terminal,
-      async,
-      base,
-      bytestring,
-      containers,
-      data-default,
-      deepseq,
-      directory,
-      filepath,
-      ghc,
-      ghc-exactprint,
-      ghc-paths,
-      haskell-src-exts,
-      HUnit,
-      list-t,
-      mtl,
-      optparse-applicative,
-      process,
-      random-shuffle,
-      syb,
-      tasty,
-      tasty-hunit,
-      temporary,
-      text,
-      transformers,
-      unordered-containers,
-    }:
-    mkDerivation {
-      pname = "retrie";
-      version = "1.1.0.0";
-      sha256 = "148d1pl52mac4mz4pl9qmmynjjbzygg4x6vlsyblb268drcjn3f8";
-      revision = "1";
-      editedCabalFile = "1v2x7n71vvhpybmzqlxg5bqg7ac5zqx1q4ji342xgmy2dfjq29d3";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        ansi-terminal
-        async
-        base
-        bytestring
-        containers
-        data-default
-        directory
-        filepath
-        ghc
-        ghc-exactprint
-        list-t
-        mtl
-        optparse-applicative
-        process
-        random-shuffle
-        syb
-        text
-        transformers
-        unordered-containers
-      ];
-      executableHaskellDepends = [
-        base
-        haskell-src-exts
-      ];
-      testHaskellDepends = [
-        base
-        containers
-        data-default
-        deepseq
-        directory
-        filepath
-        ghc
-        ghc-paths
-        haskell-src-exts
-        HUnit
-        mtl
-        optparse-applicative
-        process
-        syb
-        tasty
-        tasty-hunit
-        temporary
-        text
-        unordered-containers
-      ];
-      description = "A powerful, easy-to-use codemodding tool for Haskell";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
-    }
-  ) { };
-
   retrie = callPackage (
     {
       mkDerivation,
@@ -572542,7 +574587,7 @@ self: {
         tasty-hunit
       ];
       description = "Adaptation of the retry library for the effectful ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -572582,7 +574627,7 @@ self: {
       sha256 = "110hbw4b8gbkgszc7d77rw9qpiwsz4lvsfbsb4cpw9fwzrcpvwnh";
       libraryHaskellDepends = [ base ];
       description = "A library to provide special kind of big numbers writing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -572704,7 +574749,7 @@ self: {
         deepseq
       ];
       description = "reversed lists/snoc lists";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -573581,7 +575626,7 @@ self: {
         vector-sized
       ];
       description = "Functional Reactive Programming with type-level clocks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -574051,7 +576096,7 @@ self: {
         warp
       ];
       description = "Static site generator based on Shake";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -574115,7 +576160,7 @@ self: {
         warp
       ];
       description = "Static site generator based on Shake";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -574205,7 +576250,7 @@ self: {
         tasty
       ];
       description = "Neovim plugin framework for Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -574264,7 +576309,7 @@ self: {
         tasty
       ];
       description = "CLI for Ribosome";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ribosome";
     }
@@ -574347,7 +576392,7 @@ self: {
         tasty
       ];
       description = "Neovim plugin host for Polysemy";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -574381,7 +576426,7 @@ self: {
         ribosome-host
       ];
       description = "Test tools for Ribosome";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -574550,7 +576595,7 @@ self: {
         tasty
       ];
       description = "Test tools for Ribosome";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -574594,7 +576639,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Rich environment variable setup for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -574964,7 +577009,7 @@ self: {
         QuickCheck
       ];
       description = "mutable ring buffers with atomic updates in GHC Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -575033,8 +577078,8 @@ self: {
     }:
     mkDerivation {
       pname = "rio";
-      version = "0.1.22.0";
-      sha256 = "0rpc4f2yvw0y6mqz9ykm3778j6srya7ssww691kpf9nb8vddgjb6";
+      version = "0.1.23.0";
+      sha256 = "089bj6wqh872iy64ivk2wq9g4zb1748kj1wrgk2aa1j5pfbh1cic";
       libraryHaskellDepends = [
         base
         bytestring
@@ -575291,7 +577336,7 @@ self: {
         unliftio-messagebox
       ];
       description = "A library for process pools coupled with asynchronous message queues";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "rio-process-pool-memleak-test";
     }
@@ -575597,7 +577642,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "A DSL for Risk-oriented Object Detection Requirements";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -576070,7 +578115,7 @@ self: {
         vector
       ];
       description = "Reed-Muller Expansion normal form for Boolean Formulas";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -576101,7 +578146,7 @@ self: {
         what4
       ];
       description = "What4 adapter for the RME solver";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -576351,6 +578396,78 @@ self: {
     }
   ) { };
 
+  robin-hood-profit = callPackage (
+    {
+      mkDerivation,
+      attoparsec-isotropic,
+      base,
+      bytestring,
+      containers,
+      Decimal,
+      directory,
+      exceptions,
+      filepath,
+      generic-lens,
+      lens,
+      mtl,
+      optparse-applicative,
+      relude,
+      semigroups,
+      tasty,
+      tasty-discover,
+      tasty-hunit,
+      tasty-quickcheck,
+      template-haskell,
+      text,
+      time,
+      trace-embrace,
+    }:
+    mkDerivation {
+      pname = "robin-hood-profit";
+      version = "0.0.2";
+      sha256 = "164qaimp3q6jbdzm4mfq1ynj5bhh5qpzgd04qqmhn4frd5vndi9x";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        attoparsec-isotropic
+        base
+        bytestring
+        containers
+        Decimal
+        directory
+        exceptions
+        filepath
+        generic-lens
+        lens
+        mtl
+        optparse-applicative
+        relude
+        semigroups
+        template-haskell
+        text
+        time
+        trace-embrace
+      ];
+      executableHaskellDepends = [ base ];
+      testHaskellDepends = [
+        attoparsec-isotropic
+        base
+        relude
+        tasty
+        tasty-discover
+        tasty-hunit
+        tasty-quickcheck
+        text
+      ];
+      testToolDepends = [ tasty-discover ];
+      description = "Calculate per instrument profit from Robin-Hood activity report";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      mainProgram = "rhprofit";
+      broken = true;
+    }
+  ) { };
+
   roboservant = callPackage (
     {
       mkDerivation,
@@ -576386,8 +578503,8 @@ self: {
     }:
     mkDerivation {
       pname = "roboservant";
-      version = "0.1.0.3";
-      sha256 = "1qcxhmppvpbibzq6mmqzz891pmi9c6cjjvxjyn8vlhvydgklh6x4";
+      version = "0.1.0.4";
+      sha256 = "06lna80a0y9bzbbqa32jjrjf7nkgwzdg68ilmr9gf9ss7a8yvljl";
       libraryHaskellDepends = [
         base
         bytestring
@@ -576443,6 +578560,8 @@ self: {
       testToolDepends = [ markdown-unlit ];
       description = "Automatic session-aware servant testing";
       license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -576481,6 +578600,7 @@ self: {
       directory,
       heredoc,
       hspec,
+      hspec-discover,
       old-locale,
       QuickCheck,
       time,
@@ -576488,8 +578608,8 @@ self: {
     }:
     mkDerivation {
       pname = "robots-txt";
-      version = "0.4.1.8";
-      sha256 = "0f6s07zdzjjhx4vk2khrh6y2mhfgjxlg3y3l07riiy171qzp9gkd";
+      version = "0.4.1.9";
+      sha256 = "0fv6wfp3p6p31v6v18p75k7n7fsj11p0kir3f55c4zbcw20fmf1w";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -576507,6 +578627,7 @@ self: {
         QuickCheck
         transformers
       ];
+      testToolDepends = [ hspec-discover ];
       description = "Parser for robots.txt";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -576605,7 +578726,7 @@ self: {
         vector-sized
       ];
       description = "Implementation of the ROC (Taiwan) National ID standard";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -577472,7 +579593,7 @@ self: {
         integer-gmp
       ];
       description = "RON";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -577579,7 +579700,7 @@ self: {
         unordered-containers
       ];
       description = "Replicated Data Types (RON-RDT)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -577619,7 +579740,7 @@ self: {
         transformers
       ];
       description = "RON-Schema";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -577665,7 +579786,7 @@ self: {
         transformers
       ];
       description = "RON Storage";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -577937,7 +580058,7 @@ self: {
         quickcheck-classes
       ];
       description = "rose trees";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -578546,7 +580667,7 @@ self: {
         vector
       ];
       description = "Directed rounding for built-in floating types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -579606,7 +581727,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Let your mind know that your hands need a rest!";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -579737,7 +581858,7 @@ self: {
         xml-types
       ];
       description = "Streaming parser/renderer for the RSS standard";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -579828,7 +581949,7 @@ self: {
         ghc-prim
       ];
       description = "stream-fusion framework from vector";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -579842,7 +581963,7 @@ self: {
       sha256 = "18kpashzq6wnf1yc2xvz7l6c53v45yimzsahaavdf60pvw4zfhrx";
       libraryHaskellDepends = [ base ];
       description = "A more fine-grained version of state threads (ST)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -580457,7 +582578,7 @@ self: {
         primitive-unlifted
       ];
       description = "runST without boxing penalty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -580555,7 +582676,7 @@ self: {
         process
       ];
       description = "Stack wrapper for single-file Haskell programs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "runhs";
       broken = true;
@@ -580670,7 +582791,7 @@ self: {
         type-reflection
       ];
       description = "Look up class instances at runtime";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -580735,7 +582856,7 @@ self: {
         transformers
       ];
       description = "TLS bindings for Rustls";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -581653,7 +583774,7 @@ self: {
         QuickCheck
       ];
       description = "Recursive Arbitrary instances without headaches";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -582056,7 +584177,7 @@ self: {
         doctest
       ];
       description = "Safe arithmetic operations";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -582176,7 +584297,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Use RecordWildCards safely";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -583030,7 +585151,7 @@ self: {
         HUnit
       ];
       description = "Semantic version numbers and constraints";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -583330,7 +585451,7 @@ self: {
         storable-record
       ];
       description = "Handling of samples in an (audio) signal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -583352,7 +585473,7 @@ self: {
         sample-frame
       ];
       description = "Orphan instances for types from sample-frame and numericprelude";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -583412,7 +585533,7 @@ self: {
         tasty-quickcheck
       ];
       description = "A stable adaptive mergesort implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -583989,8 +586110,8 @@ self: {
     }:
     mkDerivation {
       pname = "sandwich-contexts-kubernetes";
-      version = "0.1.1.1";
-      sha256 = "186xbfpx2fgvckzmagmxw3cyp6k1avk3jvdii9857i3xwccinc1s";
+      version = "0.1.2.0";
+      sha256 = "19nvallfy3cqwapdsgxp6pwnxrqycb10awlgac9hx5l6m3qmp7w5";
       libraryHaskellDepends = [
         aeson
         base
@@ -584394,14 +586515,13 @@ self: {
     }
   ) { };
 
-  sandwich-webdriver_0_4_0_1 = callPackage (
+  sandwich-webdriver_0_4_0_2 = callPackage (
     {
       mkDerivation,
       aeson,
       base,
       bytestring,
       containers,
-      data-default,
       directory,
       exceptions,
       filepath,
@@ -584410,11 +586530,8 @@ self: {
       http-conduit,
       http-types,
       microlens,
-      microlens-aeson,
-      monad-control,
       monad-logger,
       mtl,
-      network,
       process,
       random,
       regex-tdfa,
@@ -584431,19 +586548,17 @@ self: {
       unliftio,
       unliftio-core,
       unordered-containers,
-      vector,
       webdriver,
     }:
     mkDerivation {
       pname = "sandwich-webdriver";
-      version = "0.4.0.1";
-      sha256 = "1q2ipwvyn4l9zch5h6cgbvgcjbrywpc5zrz2y9bdlbhdpdk9a2iv";
+      version = "0.4.0.2";
+      sha256 = "1ixcq0vffy4awfv5dimkdq9yzkrbnjm046vsls6pvy1b5dlp9nb6";
       libraryHaskellDepends = [
         aeson
         base
         bytestring
         containers
-        data-default
         directory
         exceptions
         filepath
@@ -584452,11 +586567,8 @@ self: {
         http-conduit
         http-types
         microlens
-        microlens-aeson
-        monad-control
         monad-logger
         mtl
-        network
         process
         random
         regex-tdfa
@@ -584473,7 +586585,6 @@ self: {
         unliftio
         unliftio-core
         unordered-containers
-        vector
         webdriver
       ];
       testHaskellDepends = [
@@ -584481,7 +586592,6 @@ self: {
         base
         bytestring
         containers
-        data-default
         directory
         exceptions
         filepath
@@ -584490,11 +586600,8 @@ self: {
         http-conduit
         http-types
         microlens
-        microlens-aeson
-        monad-control
         monad-logger
         mtl
-        network
         process
         random
         regex-tdfa
@@ -584511,7 +586618,6 @@ self: {
         unliftio
         unliftio-core
         unordered-containers
-        vector
         webdriver
       ];
       description = "Sandwich integration with Selenium WebDriver";
@@ -584708,7 +586814,9 @@ self: {
       ];
       testToolDepends = [ alex ];
       description = "A staged lexer generator";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -584812,7 +586920,7 @@ self: {
         containers
       ];
       description = "A high-level wrapper over minisat";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -584863,7 +586971,7 @@ self: {
         base
       ];
       description = "SAT encoding monad";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -585039,11 +587147,11 @@ self: {
       ];
       doHaddock = false;
       description = "Handle POSIX cron schedules";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
-  saturn_1_1_0_0 = callPackage (
+  saturn_1_1_0_2 = callPackage (
     {
       mkDerivation,
       base,
@@ -585058,8 +587166,8 @@ self: {
     }:
     mkDerivation {
       pname = "saturn";
-      version = "1.1.0.0";
-      sha256 = "0qwv38aas0lv01bgbdrl60bikkpx7wm1zij7jyyb07y4615ssrjx";
+      version = "1.1.0.2";
+      sha256 = "0pixf0xb1y5l0r9hp1d9jvgxdqy8flmrrppaz294p1yjryavk6kq";
       libraryHaskellDepends = [
         base
         containers
@@ -585077,7 +587185,7 @@ self: {
         hspec-core
       ];
       description = "Handle POSIX cron schedules";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -585180,7 +587288,7 @@ self: {
         time
       ];
       description = "The eye that watches everything you did on Twitter";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sauron";
     }
@@ -585368,7 +587476,7 @@ self: {
         text
       ];
       description = "Construction of context-adjusted pretty output";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -585446,6 +587554,81 @@ self: {
     }
   ) { };
 
+  sbp_6_3_0 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      aeson-pretty,
+      array,
+      base,
+      base64-bytestring,
+      basic-prelude,
+      binary,
+      binary-conduit,
+      bytestring,
+      cmdargs,
+      conduit,
+      conduit-extra,
+      data-binary-ieee754,
+      lens,
+      lens-aeson,
+      monad-loops,
+      resourcet,
+      tasty,
+      tasty-hunit,
+      template-haskell,
+      text,
+      time,
+      yaml,
+    }:
+    mkDerivation {
+      pname = "sbp";
+      version = "6.3.0";
+      sha256 = "0s8v31ivnsxm0wnxzbx4s1c0z5hfndkpq91fnfg0zq6bmlwc504w";
+      isLibrary = true;
+      isExecutable = true;
+      libraryHaskellDepends = [
+        aeson
+        array
+        base
+        base64-bytestring
+        basic-prelude
+        binary
+        bytestring
+        data-binary-ieee754
+        lens
+        lens-aeson
+        monad-loops
+        template-haskell
+        text
+      ];
+      executableHaskellDepends = [
+        aeson
+        aeson-pretty
+        base
+        basic-prelude
+        binary-conduit
+        bytestring
+        cmdargs
+        conduit
+        conduit-extra
+        lens
+        resourcet
+        time
+        yaml
+      ];
+      testHaskellDepends = [
+        base
+        basic-prelude
+        tasty
+        tasty-hunit
+      ];
+      description = "SwiftNav's SBP Library";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   sbp2udp = callPackage (
     {
       mkDerivation,
@@ -585581,7 +587764,7 @@ self: {
         time
       ];
       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -585682,7 +587865,7 @@ self: {
         time
       ];
       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -585756,7 +587939,7 @@ self: {
         tasty-golden
       ];
       description = "Formally prove properties of Haskell programs using SBV/SMT";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -586399,7 +588582,7 @@ self: {
         unliftio-core
       ];
       description = "Metadata types for Albedo Scanners";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -586792,7 +588975,7 @@ self: {
         transformers
       ];
       description = "Pure deterministic scheduled computations";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
     }
   ) { };
 
@@ -587638,7 +589821,7 @@ self: {
         x509-store
       ];
       description = "Haskell query for SciDB via shim";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "hquery";
       broken = true;
@@ -587798,7 +589981,7 @@ self: {
         scientific
       ];
       description = "Scientific notation intended for tokenization";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -588178,7 +590361,7 @@ self: {
         unliftio
       ];
       description = "CPS resource allocation but as a Monad and completely safe";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -588623,6 +590806,7 @@ self: {
       description = "Combine scotty and haxl";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -589228,7 +591412,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Take screenshot and copy it to the system clipboard";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "screenshot-to-clipboard";
       broken = true;
@@ -590125,7 +592309,7 @@ self: {
       executableSystemDepends = [ SDL2_mixer ];
       executablePkgconfigDepends = [ SDL2_mixer ];
       description = "Haskell bindings to SDL2_mixer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -591600,7 +593784,7 @@ self: {
         text-display
       ];
       description = "Cryptography for the casual user";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -591622,6 +593806,8 @@ self: {
       pname = "selda";
       version = "0.5.2.0";
       sha256 = "1n0zkd80a9z83q5nld0gyg2p25nfy4rjkihql88binhknhk3hkgk";
+      revision = "1";
+      editedCabalFile = "1vr4yzwvqp9wd7l6yxf7r6vc78bpy2b6n3mx81ximsr7mlpxwg86";
       libraryHaskellDepends = [
         base
         bytestring
@@ -591780,7 +593966,7 @@ self: {
         simple-prompt
       ];
       description = "Select a subset of RPM packages";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -592029,7 +594215,7 @@ self: {
       sha256 = "17vfwyjr3pxzjf35lhqqxid5bds52vk0gdqmnq4hvbjin3l07l98";
       libraryHaskellDepends = [ base ];
       description = "Framework and service for analyzing and diffing untrusted code";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -592074,7 +594260,7 @@ self: {
         text
       ];
       description = "Types and functionality for working with source code";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -592126,7 +594312,7 @@ self: {
         unix
       ];
       description = "Cross-platform abstraction for system semaphores";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -592449,7 +594635,7 @@ self: {
         semigroupoids
       ];
       description = "Support for QualifiedDo with semigroupoids classes";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -592548,8 +594734,8 @@ self: {
     }:
     mkDerivation {
       pname = "semilattices";
-      version = "0.0.0.8";
-      sha256 = "05dmnszyxssbjzw6f7qwq3slzd913afn562f2rnc54q9719xyybn";
+      version = "0.0.0.9";
+      sha256 = "1q0sm7q4v7pwvrv1sak5vchwcsqsrglhxqsaaz0bqpjhirw90qk6";
       libraryHaskellDepends = [
         base
         containers
@@ -592562,7 +594748,7 @@ self: {
         quickcheck-instances
       ];
       description = "Semilattices";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -593106,7 +595292,7 @@ self: {
         wreq
       ];
       description = "A tool to send command execution results to Sensu";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sensu-run";
       broken = true;
@@ -593770,7 +595956,7 @@ self: {
         transformers
       ];
       description = "Sequences and measured sequences";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -594027,7 +596213,7 @@ self: {
         QuickCheck
       ];
       description = "Grammar-based compression algorithms SEQUITUR";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -594116,7 +596302,7 @@ self: {
         tasty-quickcheck
       ];
       description = "`binary` backend for `serdoc`";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -594153,7 +596339,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Generated documentation of serialization formats";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -594399,7 +596585,7 @@ self: {
         uuid-types
       ];
       description = "Encode and decode UUID values in CBOR using uuid-types, cborg and serialise";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -594435,20 +596621,30 @@ self: {
   serialport = callPackage (
     {
       mkDerivation,
+      async,
       base,
       bytestring,
       HUnit,
+      optparse-applicative,
       unix,
     }:
     mkDerivation {
       pname = "serialport";
-      version = "0.5.6";
-      sha256 = "00cymqx8jnlanv75kqgb00harhv8prgk23gwwvadqlzdfv119iql";
+      version = "0.6.0";
+      sha256 = "0npkywiq7gcprlsjq0hlf5zwq882bq8v7cvlqkq2dy7xfh75195h";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         base
         bytestring
+        optparse-applicative
         unix
       ];
+      executableHaskellDepends = [
+        async
+        base
+        optparse-applicative
+      ];
       testHaskellDepends = [
         base
         bytestring
@@ -594456,6 +596652,7 @@ self: {
       ];
       description = "Cross platform serial port library";
       license = lib.licenses.bsd3;
+      mainProgram = "serialport";
     }
   ) { };
 
@@ -594756,7 +596953,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A family of combinators for defining webservices APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -594833,7 +597030,7 @@ self: {
         text
       ];
       description = "Servant endpoints compatible with Rails's ActiveResource";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -594914,7 +597111,7 @@ self: {
         webdriver
       ];
       description = "Generates a TypeScript client for Servant APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tests";
     }
@@ -595020,7 +597217,7 @@ self: {
         unordered-containers
       ];
       description = "Authentication combinators for servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -595083,7 +597280,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "servant-client/servant-auth compatibility";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -595225,7 +597422,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "servant-docs/servant-auth compatibility";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -595439,7 +597636,7 @@ self: {
         markdown-unlit
       ];
       description = "servant-server/servant-auth compatibility";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -595485,7 +597682,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "servant-swagger/servant-auth compatibility";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -596281,7 +598478,7 @@ self: {
         markdown-unlit
       ];
       description = "Automatic derivation of querying functions for servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -596351,7 +598548,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Core functionality and class for client function generation for servant APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -596400,7 +598597,7 @@ self: {
         transformers-base
       ];
       description = "A servant client for frontend JavaScript";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -596578,7 +598775,7 @@ self: {
         warp
       ];
       description = "Servant Stream support for conduit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -596834,7 +599031,7 @@ self: {
         transformers
       ];
       description = "generate API docs for your servant webservice";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "greet-docs";
     }
   ) { };
@@ -596875,7 +599072,7 @@ self: {
         servant
       ];
       description = "Generate endpoints overview for Servant API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -597114,7 +599311,7 @@ self: {
       ];
       testToolDepends = [ markdown-unlit ];
       description = "Servant Errors wai-middlware";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -597349,7 +599546,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Helpers for generating clients for servant APIs in any programming language";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -597597,7 +599794,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "HATEOAS extension for servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -597683,6 +599880,7 @@ self: {
       description = "automatical derivation of querying functions for servant webservices";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -597749,7 +599947,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Servant authentication with HMAC";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -597892,7 +600090,7 @@ self: {
         markdown-unlit
       ];
       description = "Automatic derivation of querying functions for servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -598110,7 +600308,7 @@ self: {
         text
       ];
       description = "JSON-RPC messages and endpoints";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -598135,7 +600333,7 @@ self: {
         servant-jsonrpc
       ];
       description = "Generate JSON-RPC servant clients";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -598162,7 +600360,7 @@ self: {
         servant-server
       ];
       description = "JSON-RPC servant servers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -598245,20 +600443,22 @@ self: {
       containers,
       safe-coloured-text,
       servant,
+      servant-multipart,
       servant-server,
       sydtest,
       text,
     }:
     mkDerivation {
       pname = "servant-lint";
-      version = "0.1.0.0";
-      sha256 = "1y9fc8kp8mclxm0njpdn121k7qa4f4vnwkcxr658pd26g34daqqk";
+      version = "0.1.1.0";
+      sha256 = "0l7mv0f3s97jr5y1nsq98kmm6d8zjcrdfwq2alg9kxvw4g8klcyl";
       libraryHaskellDepends = [
         base
         bytestring
         containers
         safe-coloured-text
         servant
+        servant-multipart
         servant-server
         text
       ];
@@ -598268,12 +600468,13 @@ self: {
         containers
         safe-coloured-text
         servant
+        servant-multipart
         servant-server
         sydtest
         text
       ];
       description = "Lint Servant Routes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -598357,7 +600558,7 @@ self: {
         warp
       ];
       description = "Servant Stream support for machines";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -599145,7 +601346,7 @@ self: {
         warp
       ];
       description = "Servant Stream support for pipes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -599212,7 +601413,7 @@ self: {
         warp
       ];
       description = "Utilities for using servant in a polysemy stack";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -599336,7 +601537,7 @@ self: {
         warp
       ];
       description = "Helpers for using prometheus with servant";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -599567,7 +601768,7 @@ self: {
         servant-queryparam-core
       ];
       description = "Client support for servant-queryparam-core";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -599588,7 +601789,7 @@ self: {
         servant
       ];
       description = "Use records for query parameters in servant APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -599613,7 +601814,7 @@ self: {
         servant-queryparam-core
       ];
       description = "Instances of classes from openapi3 for servant-queryparam-core";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -599638,7 +601839,7 @@ self: {
         text
       ];
       description = "Server support for servant-queryparam-core";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -599727,7 +601928,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "QuickCheck entire APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -600121,7 +602322,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generate route descriptions from Servant APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -600169,7 +602370,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Golden test your Servant APIs using `servant-routes`";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -600515,7 +602716,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A family of combinators for defining webservices APIs and serving them";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "greet";
     }
   ) { };
@@ -601267,7 +603468,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Generate a Swagger/OpenAPI/OAS 2.0 specification for your servant API.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -602132,7 +604333,7 @@ self: {
         xmlbf-xeno
       ];
       description = "Servant support for the XML Content-Type";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -602161,7 +604362,7 @@ self: {
         xml-types
       ];
       description = "Servant XML content-type with support for xml-conduit";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -603236,7 +605437,7 @@ self: {
         utility-ht
       ];
       description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -603454,8 +605655,8 @@ self: {
       pname = "setlocale";
       version = "1.0.0.10";
       sha256 = "19rv89jkhq5ic7j5rzpygnmsbzim2mn8ip0m292za613q88gywir";
-      revision = "6";
-      editedCabalFile = "18i818q67cxfgz7q8zm6a0z032rh0yjhk375f99jwqh9da2h67fb";
+      revision = "7";
+      editedCabalFile = "0mmv245b6dxm4m6lhrnp1bccaklwd222086n952jhgi44hw2iq4a";
       libraryHaskellDepends = [ base ];
       description = "Haskell bindings to setlocale";
       license = lib.licenses.bsd3;
@@ -604369,7 +606570,7 @@ self: {
         vector
       ];
       description = "Validation SHA Implementations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -604402,7 +606603,7 @@ self: {
         primitive
       ];
       description = "SHA-1 Hash";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -604916,7 +607117,7 @@ self: {
         text
       ];
       description = "Build rules for historical benchmarking";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -605867,7 +608068,7 @@ self: {
     }
   ) { };
 
-  shakespeare_2_1_4 = callPackage (
+  shakespeare_2_1_7_1 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -605881,6 +608082,7 @@ self: {
       file-embed,
       ghc-prim,
       hspec,
+      hspec-discover,
       HUnit,
       parsec,
       process,
@@ -605895,8 +608097,8 @@ self: {
     }:
     mkDerivation {
       pname = "shakespeare";
-      version = "2.1.4";
-      sha256 = "1c9lvb0aw00r0wibm061c614phlwsrf888amjn9nc168ix0cxv6x";
+      version = "2.1.7.1";
+      sha256 = "06fix8z3kjgl50k5srbixi100jx5rf050xbh9f564n4s5q2irbys";
       libraryHaskellDepends = [
         aeson
         base
@@ -605938,6 +608140,7 @@ self: {
         time
         transformers
       ];
+      testToolDepends = [ hspec-discover ];
       description = "A toolkit for making compile-time interpolated templates";
       license = lib.licenses.mit;
       hydraPlatforms = lib.platforms.none;
@@ -606102,7 +608305,7 @@ self: {
         vector
       ];
       description = "“Shuffle and merge overlapping chunks” lossless compression";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -606159,7 +608362,7 @@ self: {
         QuickCheck
       ];
       description = "Shannon-fano compression algorithm in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "shannon-fano";
     }
   ) { };
@@ -606610,7 +608813,7 @@ self: {
         template-haskell
       ];
       description = "Transform a shell script into a series of scripts with only shebang lines";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "shebanger";
     }
   ) { };
@@ -606953,7 +609156,7 @@ self: {
         text
       ];
       description = "A tool for generating shell.nix files";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "nix-shellify";
       maintainers = [ lib.maintainers.danielrolls ];
     }
@@ -607097,7 +609300,7 @@ self: {
         Glob
       ];
       description = "Out of the shell solution for scripting in Haskell";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       mainProgram = "readme";
     }
   ) { };
@@ -607202,8 +609405,8 @@ self: {
     }:
     mkDerivation {
       pname = "shellwords";
-      version = "0.1.4.4";
-      sha256 = "1609i2s68hx3h9zbjyfwdj286w1acrd8z9m7g7f9slbdk9ps3hn5";
+      version = "0.1.4.6";
+      sha256 = "00jadd023d3c03d9l69i2dif8zw7x9pdjfxwr2923sv7pc03pqd8";
       libraryHaskellDepends = [
         base
         megaparsec
@@ -607643,7 +609846,7 @@ self: {
       isLibrary = false;
       isExecutable = true;
       description = "Examples for the shine package";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -607955,7 +610158,7 @@ self: {
         tasty-bench
       ];
       description = "Additional ShortByteString API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -607995,8 +610198,8 @@ self: {
     }:
     mkDerivation {
       pname = "shortcut-links";
-      version = "0.5.1.1";
-      sha256 = "0567igvyl43fa06h7dq2lww0ing00n24xgmd25vhgx6kvnawnb90";
+      version = "0.5.2.0";
+      sha256 = "1gmw54vbk6glpa91jylnjw2k8mj2sz3w7xqpqzivrsjjxiq9xz9b";
       libraryHaskellDepends = [
         base
         text
@@ -608006,9 +610209,7 @@ self: {
         doctest
       ];
       description = "Link shortcuts for use in text markup";
-      license = lib.licenses.mpl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -608458,7 +610659,7 @@ self: {
         vector
       ];
       description = "Generate swift types from haskell types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -608526,7 +610727,7 @@ self: {
         tasty-quickcheck
       ];
       description = "timers using SI units (seconds)";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -609203,6 +611404,7 @@ self: {
       case-insensitive,
       crypton,
       exceptions,
+      heck,
       http-types,
       memory,
       tasty,
@@ -609213,14 +611415,15 @@ self: {
     }:
     mkDerivation {
       pname = "signet";
-      version = "0.2025.5.21";
-      sha256 = "01rrc4l5a4vl2mmymckdl5shicgx7n909nzdqn8xnk8626whc93p";
+      version = "1.0.0.0";
+      sha256 = "1wpjsxknlbd2wxiv93mjypcw4s0cryyc4pavgl6dfygwrbb83z8r";
       libraryHaskellDepends = [
         base
         bytestring
         case-insensitive
         crypton
         exceptions
+        heck
         http-types
         memory
         text
@@ -609228,12 +611431,13 @@ self: {
       ];
       testHaskellDepends = [
         base
+        heck
         tasty
         tasty-hunit
         transformers
       ];
       description = "Standard Webhooks";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
     }
   ) { };
 
@@ -609279,7 +611483,7 @@ self: {
         text
       ];
       description = "Calculate expressions involving significant figures";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "significant-figures-cli";
       broken = true;
@@ -609420,7 +611624,7 @@ self: {
         prettyprinter
       ];
       description = "Prettyprinting transformers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -609511,7 +611715,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A Haskell interface to simdutf";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -609576,7 +611780,7 @@ self: {
         text
       ];
       description = "A library to fetch and parse financial data from the SimFin(+) API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -609973,6 +612177,34 @@ self: {
     }
   ) { };
 
+  simple-cabal_0_2_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      Cabal,
+      directory,
+      filepath,
+      safe,
+    }:
+    mkDerivation {
+      pname = "simple-cabal";
+      version = "0.2.0";
+      sha256 = "1mrsa53sacjji56xj3wkp2yd0skblrxnqzq7myy60a7nk6brb30g";
+      libraryHaskellDepends = [
+        base
+        bytestring
+        Cabal
+        directory
+        filepath
+        safe
+      ];
+      description = "Cabal compatibility wrapper library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   simple-cairo = callPackage (
     {
       mkDerivation,
@@ -611491,7 +613723,7 @@ self: {
         text
       ];
       description = "A parser for SQL";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -612485,7 +614717,7 @@ self: {
         hspec
       ];
       description = "Simple pool";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -612636,7 +614868,7 @@ self: {
             xext
           ];
           description = "A programming language for simple GUIs";
-          license = lib.licenses.bsd3;
+          license = lib.licensesSpdx."BSD-3-Clause";
           hydraPlatforms = lib.platforms.none;
           mainProgram = "sindre";
           broken = true;
@@ -612678,7 +614910,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "a class for single tuple implementations";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -612712,7 +614944,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Like singletons, but much smaller";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -612741,7 +614973,7 @@ self: {
         some
       ];
       description = "Type level booleans";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -612928,7 +615160,7 @@ self: {
       ];
       testToolDepends = [ singletons-base-code-generator ];
       description = "A promoted and singled version of the base library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -612952,7 +615184,7 @@ self: {
         filepath
       ];
       description = "Code generator for the singletons-base test suite";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "singletons-base-code-generator";
       broken = true;
@@ -612978,7 +615210,7 @@ self: {
         singletons-base
       ];
       description = "An optional type with type level default";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -613011,7 +615243,7 @@ self: {
         transformers
       ];
       description = "Presburger Arithmetic Solver for GHC Type-level natural numbers with Singletons package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -613280,7 +615512,7 @@ self: {
         vector
       ];
       description = "Encode and decode CSV files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -613700,7 +615932,7 @@ self: {
         vector
       ];
       description = "Sized sequence data-types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -613859,7 +616091,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Create a Sized version of any container";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -613894,7 +616126,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "aeson instances for 'Sized'";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -613915,7 +616147,7 @@ self: {
         sized-wrapper
       ];
       description = "QuickCheck instance for 'Sized'";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -613938,7 +616170,7 @@ self: {
         text
       ];
       description = "'Sized' wrappers for text";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -613960,8 +616192,8 @@ self: {
     }:
     mkDerivation {
       pname = "sizes";
-      version = "2.4.0";
-      sha256 = "1s888f14pnvm71sxpn7bgr5a5zijmf0g3px5bmy36q10rjylwp6b";
+      version = "2.4.1";
+      sha256 = "1hz9ix8rp6av2rknqra5y2wk26vs5mwzjzqa52ya30yk0jnq80m2";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@@ -613980,9 +616212,7 @@ self: {
       ];
       description = "Recursively show space (size and i-nodes) used in subdirectories";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "sizes";
-      broken = true;
     }
   ) { };
 
@@ -614175,7 +616405,7 @@ self: {
         unliftio
       ];
       description = "Batteries-included, opinionated test framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "skeletest-preprocessor";
     }
   ) { };
@@ -614403,7 +616633,7 @@ self: {
         vector
       ];
       description = "Random access lists: skew binary";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -615113,7 +617343,7 @@ self: {
         text
       ];
       description = "A programmable markup language to generate HTML";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       mainProgram = "slab";
     }
   ) { };
@@ -615469,7 +617699,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bindings for the Slack web API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -615716,6 +617946,42 @@ self: {
     }
   ) { };
 
+  slick_1_4_0_1 = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      base,
+      bytestring,
+      directory,
+      extra,
+      mustache,
+      pandoc,
+      shake,
+      text,
+      unordered-containers,
+    }:
+    mkDerivation {
+      pname = "slick";
+      version = "1.4.0.1";
+      sha256 = "1rx555rsljcmqzk2xyk3d7jxnap1l5xpcpwvrf94p66iac654mi6";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        directory
+        extra
+        mustache
+        pandoc
+        shake
+        text
+        unordered-containers
+      ];
+      description = "A quick & easy static site builder built with shake and pandoc";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   slidemews = callPackage (
     {
       mkDerivation,
@@ -615828,7 +618094,7 @@ self: {
         text
       ];
       description = "SLIP-0032: Extended serialization format for BIP-32 wallets";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -615863,7 +618129,7 @@ self: {
         hspec-hedgehog
       ];
       description = "Sized list";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -616117,7 +618383,7 @@ self: {
         text-icu
       ];
       description = "Clean URI slugs for Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "slugger";
     }
   ) { };
@@ -616203,7 +618469,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle molecular sequences";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "slynx";
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -616257,7 +618523,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle molecular sequences";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "slynx";
       maintainers = [ lib.maintainers.dschrempf ];
@@ -616282,7 +618548,7 @@ self: {
       ];
       doHaddock = false;
       description = "Serialize to bytes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -616410,7 +618676,7 @@ self: {
         gauge
       ];
       description = "See README for more info";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -617210,7 +619476,7 @@ self: {
       ];
       doHaddock = false;
       description = "String manipulation tool written in haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "smh";
       broken = true;
@@ -617267,7 +619533,7 @@ self: {
         primitive
       ];
       description = "Parse arrays of tokens";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -617996,21 +620262,27 @@ self: {
       aeson,
       base,
       bytestring,
+      crypton-connection,
+      data-default,
       http-conduit,
       http-types,
       text,
+      tls,
     }:
     mkDerivation {
       pname = "smtpbz";
-      version = "1.1.0";
-      sha256 = "04fr5w139bvi3wdx7ynxkgmb5z34a7wpa4znrhh6vjq2hykxi4nk";
+      version = "1.2.0";
+      sha256 = "1dmp9nzvvx6shkicnxxy9lg6h63q8gaixv5fsg8j85v230kp69af";
       libraryHaskellDepends = [
         aeson
         base
         bytestring
+        crypton-connection
+        data-default
         http-conduit
         http-types
         text
+        tls
       ];
       description = "Unofficial API client for smtp.bz";
       license = lib.licenses.bsd2;
@@ -618153,7 +620425,7 @@ self: {
         typed-process
       ];
       description = "GHC Source Plugin that helps to minimise imports and generate explicit exports";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -618189,7 +620461,7 @@ self: {
         text
       ];
       description = "Strict ByteString Parser Combinator";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -618428,7 +620700,7 @@ self: {
         xmlhtml
       ];
       description = "Top-level package for the Snap Web Framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -618696,7 +620968,7 @@ self: {
         zlib
       ];
       description = "Snap: A Haskell Web Framework (core interfaces and types)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -621292,7 +623564,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Fast Haskell bindings to Google’s Snappy compression library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { inherit (pkgs) snappy; };
 
@@ -621356,7 +623628,7 @@ self: {
         zlib
       ];
       description = "Bindings to Google's Snappy: A fast compression library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "snappy-cli";
     }
   ) { inherit (pkgs) snappy; };
@@ -621420,8 +623692,8 @@ self: {
     }:
     mkDerivation {
       pname = "snappy-hs";
-      version = "0.1.0.3";
-      sha256 = "1fbl5zw8ag379sacd735948qzaikzv01qzfczgn1lp0wy424q9hv";
+      version = "0.1.0.4";
+      sha256 = "0wxqyv955gvd1m1v9cmial2qxdrqm3gm69pl59jaiwmhq74bc56r";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -621435,10 +623707,8 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Snappy compression library";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "snappy-hs";
-      broken = true;
     }
   ) { };
 
@@ -621664,7 +623934,7 @@ self: {
         yesod-form
       ];
       description = "Import to snelstart";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "snelstart-import";
       broken = true;
@@ -621800,7 +624070,7 @@ self: {
         vector
       ];
       description = "SNMP protocol library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -622513,7 +624783,7 @@ self: {
         unix
       ];
       description = "Unix domain sockets";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -622743,7 +625013,7 @@ self: {
       ];
       doHaddock = false;
       description = "High-level network sockets";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       broken = true;
@@ -622808,7 +625078,7 @@ self: {
       ];
       doHaddock = false;
       description = "Support for the Sockets and Pipes book";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -622963,7 +625233,7 @@ self: {
         tls
       ];
       description = "A SOCKS5 (RFC 1928) implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -623346,7 +625616,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "Self-Organising Maps";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -623491,7 +625761,7 @@ self: {
         tasty-hunit
       ];
       description = "Check satisfiability of expressions on natural numbers";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -623809,7 +626079,7 @@ self: {
         type-errors-pretty
       ];
       description = "Haskell EDSL for Souffle";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -623872,7 +626142,7 @@ self: {
         vector
       ];
       description = "Souffle Datalog bindings for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -623911,7 +626181,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Apply sound changes to words";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -623964,7 +626234,7 @@ self: {
         utility-ht
       ];
       description = "Approximate a song from other pieces of sound";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "sound-collage";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -624256,7 +626526,7 @@ self: {
         utility-ht
       ];
       description = "Play, write, read, convert audio signals using Sox";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -624488,7 +626758,7 @@ self: {
         tasty-hunit
       ];
       description = "Gopher server library and daemon";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       mainProgram = "spacecookie";
       maintainers = [ lib.maintainers.sternenseemann ];
     }
@@ -624769,7 +627039,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "A simple programming and debugging environment";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "spade";
@@ -625082,7 +627352,7 @@ self: {
         containers
       ];
       description = "A sparse set-based parsing library for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -625341,7 +627611,7 @@ self: {
         vector
       ];
       description = "Sparse set data structure";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "sparse-set";
     }
   ) { };
@@ -625431,7 +627701,7 @@ self: {
         hspec
       ];
       description = "Sparse vector data structures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "sparse-vector";
     }
   ) { };
@@ -625537,7 +627807,7 @@ self: {
         X11
       ];
       description = "A unix-style (read from stdin, write to stdout) global hotkey daemon";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "spartacon";
     }
@@ -625698,7 +627968,7 @@ self: {
         tasty-quickcheck
       ];
       description = "SPDX license expression language, Extras";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -625734,7 +628004,7 @@ self: {
         text
       ];
       description = "SPDX license templates";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -625920,26 +628190,20 @@ self: {
       multiset-comb,
       np-extras,
       numeric-prelude,
-      template-haskell,
     }:
     mkDerivation {
       pname = "species";
-      version = "0.4.0.1";
-      sha256 = "0d9vkplg2lrwb34i2ziaa9hc8dnpkjkmwd5b27kigcqfigck6ym2";
-      revision = "5";
-      editedCabalFile = "0r3h5gxldzd5kq11a233jd7v94s7r94r5vx0szmdi9q5kp8m4kaj";
+      version = "0.4.1";
+      sha256 = "0gwnggjixazl95hdbi3zgi6id2r2pxlnh08zql6y9aswqn3wf7w5";
       libraryHaskellDepends = [
         base
         containers
         multiset-comb
         np-extras
         numeric-prelude
-        template-haskell
       ];
       description = "Computational combinatorial species";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -625993,7 +628257,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Embedded specification language & model checker in Haskell";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -626152,7 +628416,7 @@ self: {
         text
       ];
       description = "Manage the application of templates to custom yaml";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       mainProgram = "specup";
       maintainers = [ lib.maintainers.danielrolls ];
     }
@@ -626630,7 +628894,7 @@ self: {
         doctest
       ];
       description = "Spiros Boosalis's Custom Prelude";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -626644,7 +628908,7 @@ self: {
       sha256 = "0sr39lxh4jrzinins8i0lv0y715sc11grp2yq47sa1jpzvaf246v";
       libraryHaskellDepends = [ base ];
       description = "SPIR-V enumerations generated from Khronos JSON";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -626669,7 +628933,7 @@ self: {
         text
       ];
       description = "Types and generator for SPIR-V JSON spec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -626835,7 +629099,7 @@ self: {
       isExecutable = true;
       executableHaskellDepends = [ base ];
       description = "Parallel implementation of the Sorokina/Zeilfelder spline scheme";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "spline3";
     }
   ) { };
@@ -626905,7 +629169,7 @@ self: {
         stm
       ];
       description = "HLint as a GHC source plugin";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -627002,7 +629266,7 @@ self: {
         utility-ht
       ];
       description = "Split a big audio file into pieces at positions of silence";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "split-record";
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -627082,7 +629346,7 @@ self: {
         tf-random
       ];
       description = "Fast Splittable PRNG";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { testu01 = null; };
 
@@ -627239,7 +629503,7 @@ self: {
       editedCabalFile = "0j9jsbn4f73fb1a5rp1qzw4jdh6n3mmlky16pvxw2gnz8kcficng";
       libraryHaskellDepends = [ base ];
       description = "Unified API for phantom typed newtypes and type aliases";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -627438,7 +629702,7 @@ self: {
       ];
       doHaddock = false;
       description = "Spotify Web API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "examples";
       broken = true;
@@ -627513,7 +629777,7 @@ self: {
         QuickCheck
       ];
       description = "Read and write spreadsheets from and to CSV files in a lazy way";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -628159,7 +630423,7 @@ self: {
         stm
       ];
       description = "High-level SQLite client";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -628243,7 +630507,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Guided derivation for Hasql statements";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -628509,7 +630773,7 @@ self: {
       testToolDepends = [ tasty-discover ];
       doHaddock = false;
       description = "Generate type-safe Haskell code from SQL via https://github.com/sqlc-dev/sqlc.";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "sqlc-hs";
     }
@@ -628690,7 +630954,9 @@ self: {
         deepseq
       ];
       description = "A primitive yet easy to use sqlite library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -628801,7 +631067,7 @@ self: {
         sqlite-simple
       ];
       description = "Interpolated SQLite queries via quasiquotation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -629055,7 +631321,7 @@ self: {
         with-utf8
       ];
       description = "Squeal PostgreSQL Library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "example";
     }
   ) { };
@@ -629087,7 +631353,7 @@ self: {
         text
       ];
       description = "LTree extension for Squeal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -629100,6 +631366,7 @@ self: {
       generics-sop,
       hspec,
       postgresql-syntax,
+      scientific,
       squeal-postgresql,
       template-haskell,
       text,
@@ -629108,14 +631375,15 @@ self: {
     }:
     mkDerivation {
       pname = "squeal-postgresql-qq";
-      version = "0.1.3.0";
-      sha256 = "04kfccn22ik76fgr9bhlk9rh0ldyk010icr1rbzqs6mj3iddyd3w";
+      version = "0.1.4.0";
+      sha256 = "11mzdng0828r5l00zxk7w9s24f3h666n5sin79rzhdraisqfv35j";
       libraryHaskellDepends = [
         aeson
         base
         bytestring
         generics-sop
         postgresql-syntax
+        scientific
         squeal-postgresql
         template-haskell
         text
@@ -629129,6 +631397,7 @@ self: {
         generics-sop
         hspec
         postgresql-syntax
+        scientific
         squeal-postgresql
         template-haskell
         text
@@ -629136,7 +631405,7 @@ self: {
         uuid
       ];
       description = "QuasiQuoter transforming raw sql into Squeal expressions";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -629155,7 +631424,7 @@ self: {
         squeal-postgresql
       ];
       description = "UUID OSSP extension for Squeal";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -630234,7 +632503,7 @@ self: {
         primitive
       ];
       description = "shared heap regions between local mutable state threads";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -630327,7 +632596,7 @@ self: {
         ghc-prim
       ];
       description = "algorithms around stable marriage";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -630496,7 +632765,7 @@ self: {
         text
       ];
       description = "Mustache templates for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "stache";
     }
   ) { };
@@ -630807,7 +633076,7 @@ self: {
         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
       '';
       description = "The Haskell Tool Stack";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "stack";
       maintainers = [ lib.maintainers.cdepillabout ];
     }
@@ -630977,7 +633246,7 @@ self: {
         turtle
       ];
       description = "Console program used to fix Stack build errors automatically";
-      license = lib.licenses.agpl3Only;
+      license = lib.licensesSpdx."AGPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stack-fix";
       broken = true;
@@ -631610,7 +633879,7 @@ self: {
         text
       ];
       description = "Convert stack projects to cabal.project + cabal.project.freeze";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stack2cabal";
       broken = true;
@@ -632368,7 +634637,7 @@ self: {
         text
       ];
       description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stackage-to-hackage";
       broken = true;
@@ -632629,7 +634898,7 @@ self: {
         utf8-string
       ];
       description = "Program to fold GHC prof files into flamegraph input";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stackcollapse-ghc";
       broken = true;
@@ -632671,6 +634940,7 @@ self: {
       monad-logger,
       mtl,
       optparse-applicative,
+      prettyprinter,
       QuickCheck,
       resourcet,
       rio,
@@ -632688,8 +634958,8 @@ self: {
     }:
     mkDerivation {
       pname = "stackctl";
-      version = "1.7.3.5";
-      sha256 = "1naf2n41d0vhhnkkc4bnkapzqdmap6kp8xh27dqjcg7kmv3hllhi";
+      version = "1.7.3.7";
+      sha256 = "102pc4lgnm78k0zwfha7vglnbflf21nvi8iyzjyclcv9d30ba22m";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -632721,6 +634991,7 @@ self: {
         monad-logger
         mtl
         optparse-applicative
+        prettyprinter
         QuickCheck
         resourcet
         rio
@@ -632767,6 +635038,25 @@ self: {
     }
   ) { };
 
+  stacked = callPackage (
+    {
+      mkDerivation,
+      base,
+      comonad,
+    }:
+    mkDerivation {
+      pname = "stacked";
+      version = "0.1.0";
+      sha256 = "12wh22kh73khs6w0jlf2d011pr4cs7id0rjjl1wms5xph2bcswww";
+      libraryHaskellDepends = [
+        base
+        comonad
+      ];
+      description = "A modern indexed monad stack";
+      license = lib.licenses.mit;
+    }
+  ) { };
+
   stacked-dag = callPackage (
     {
       mkDerivation,
@@ -632844,7 +635134,7 @@ self: {
         th-lift
       ];
       description = "GHC.Generics style staged generics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -632958,7 +635248,7 @@ self: {
         time
       ];
       description = "Retries for humans";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "readme";
     }
   ) { };
@@ -633004,8 +635294,8 @@ self: {
       pname = "stan";
       version = "0.2.1.0";
       sha256 = "1mf01bpy291131jfl4fcslv0jfn8i8jqwr29v1v48j6c6q49rias";
-      revision = "2";
-      editedCabalFile = "1ddjjy5sa22k6hbra3y4v1rlh01x5s5k39ihdwbrl4vr2q93q6c9";
+      revision = "3";
+      editedCabalFile = "1wrr3vpv8hvj2rgb9gqrnwnjwzyyz28c9x1914277qqk39gy8zqq";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -633058,7 +635348,7 @@ self: {
       ];
       doHaddock = false;
       description = "Haskell STatic ANalyser";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       mainProgram = "stan";
     }
   ) { };
@@ -633692,7 +635982,7 @@ self: {
         transformers
       ];
       description = "Type-safe and interoperable static values and closures";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -634185,7 +636475,7 @@ self: {
         vector
       ];
       description = "A library of statistical types, data, and functions";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -634394,7 +636684,7 @@ self: {
       sha256 = "1cg0db7malqm75rlxxcmp2w00pvlf1kki4fz5p7lc86qy7241vzb";
       libraryHaskellDepends = [ base ];
       description = "A discrete probability monad with statistics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -634909,7 +637199,7 @@ self: {
       sha256 = "0ldn5yxpj99yhhp5x7zlxjmd9qgqyjg68avr19k7argwcf3nr9y9";
       doHaddock = false;
       description = "TBA";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -634955,7 +637245,7 @@ self: {
         template-haskell
       ];
       description = "Binding to Standard Template Library C++";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -635302,7 +637592,7 @@ self: {
         QuickCheck
       ];
       description = "Staircase functions or piecewise constant functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -635547,7 +637837,7 @@ self: {
         stm-queue
       ];
       description = "A simplistic actor model based on STM";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -635587,7 +637877,7 @@ self: {
         stm
       ];
       description = "Additional types of channels for STM";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -635736,7 +638026,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Containers for STM";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -635892,7 +638182,7 @@ self: {
         rebase
       ];
       description = "STM-specialised Hash Array Mapped Trie";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -635917,7 +638207,7 @@ self: {
         stm
       ];
       description = "A library for constructing incremental computations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -636073,7 +638363,7 @@ self: {
         time
       ];
       description = "An implementation of a real-time concurrent queue";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -636702,7 +638992,7 @@ self: {
         utility-ht
       ];
       description = "Elegant definition of Storable instances for records";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -636751,7 +639041,7 @@ self: {
         utility-ht
       ];
       description = "Storable instance for pairs and triples";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -636804,7 +639094,7 @@ self: {
         utility-ht
       ];
       description = "Fast, packed, strict storable arrays with a list interface like ByteString";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -637703,7 +639993,7 @@ self: {
         tasty-hunit
       ];
       description = "Attoparsec integration for the streaming ecosystem";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -637797,7 +640087,7 @@ self: {
         vector
       ];
       description = "Measures and compares the performance of streaming libraries";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -638200,7 +640490,7 @@ self: {
         wai-extra
       ];
       description = "Client-side consumption of a ServerEvent";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -638429,7 +640719,7 @@ self: {
         zlib
       ];
       description = "A hand-written streaming byte parser for OpenStreetMap Protobuf data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -638476,7 +640766,7 @@ self: {
         tasty-hunit
       ];
       description = "Stream packets via libpcap";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -638824,7 +641114,7 @@ self: {
         unordered-containers
       ];
       description = "Streaming, dataflow programming and declarative concurrency";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -638855,6 +641145,8 @@ self: {
       pname = "streamly";
       version = "0.11.0";
       sha256 = "1ha7rr6038k1hikfhg2bi0ican8b9yf1gcbaf82b4889wymy7xyc";
+      revision = "1";
+      editedCabalFile = "1h3vpy61p7ivc5cqjlpabz1z97vxf0c7npzkdwnk2jhabsl8wx2d";
       libraryHaskellDepends = [
         atomic-primops
         base
@@ -638876,7 +641168,7 @@ self: {
         unordered-containers
       ];
       description = "Streaming data pipelines with declarative concurrency";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -638938,7 +641230,7 @@ self: {
       ];
       testSystemDepends = [ archive ];
       description = "Stream data from archives using the streamly library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.shlok ];
       broken = true;
@@ -639139,7 +641431,7 @@ self: {
         unix
       ];
       description = "Streaming, parsers, arrays, serialization and more";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -639176,7 +641468,7 @@ self: {
         transformers
       ];
       description = "Streaming, parsers, arrays, serialization and more";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -639230,7 +641522,34 @@ self: {
         vector
       ];
       description = "Examples for Streamly";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
+  streamly-filepath = callPackage (
+    {
+      mkDerivation,
+      base,
+      exceptions,
+      filepath,
+      os-string,
+      streamly-core,
+    }:
+    mkDerivation {
+      pname = "streamly-filepath";
+      version = "0.1.0";
+      sha256 = "1z5qrva7rk4223ai4rm9vn8d4mnrbxsl2gimcrbbxd5yv4l83sjr";
+      libraryHaskellDepends = [
+        base
+        exceptions
+        filepath
+        os-string
+        streamly-core
+      ];
+      description = "Streamly compatibility with filepath package";
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639268,7 +641587,7 @@ self: {
         temporary
       ];
       description = "File system event notification API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639305,7 +641624,7 @@ self: {
         time
       ];
       description = "Folder watching as a Streamly stream";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -639373,7 +641692,7 @@ self: {
       ];
       testSystemDepends = [ lmdb ];
       description = "Stream data to or from LMDB databases using the streamly library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.shlok ];
       broken = true;
@@ -639417,7 +641736,7 @@ self: {
         streamly
       ];
       description = "Streamly combinators for LZ4 compression";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639513,7 +641832,7 @@ self: {
         tasty-bench
       ];
       description = "Use OS processes as stream transformation functions";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639558,7 +641877,7 @@ self: {
         tasty-bench
       ];
       description = "Use OS processes as stream transformation functions";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639585,8 +641904,8 @@ self: {
     }:
     mkDerivation {
       pname = "streamly-statistics";
-      version = "0.1.0";
-      sha256 = "0qm8g33abag2y9xq6cgmk3z8ilxjnz81c4qf7r8a31l89rrswx1z";
+      version = "0.2.0";
+      sha256 = "02px75d8hjgsc13dnfs3khfszd210xcjj96inlzs6zb1yc39pcfl";
       libraryHaskellDepends = [
         base
         containers
@@ -639616,7 +641935,7 @@ self: {
         tasty-bench
       ];
       description = "Statistical measures for finite or infinite data streams";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639652,7 +641971,7 @@ self: {
         text
       ];
       description = "Library for streamly and text interoperation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -639712,7 +642031,7 @@ self: {
       ];
       testSystemDepends = [ zip ];
       description = "Stream data from zip archives using the streamly library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640030,7 +642349,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Strict MVars and TVars with invariant checking for IO and IOSim";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -640121,7 +642440,7 @@ self: {
         vector
       ];
       description = "Strict containers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640379,7 +642698,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Strict linked list";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -640398,7 +642717,7 @@ self: {
         deepseq
       ];
       description = "Strict variants of mutable data types from base";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -640432,7 +642751,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Strict MVars for IO and IOSim";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640480,7 +642799,7 @@ self: {
         stm
       ];
       description = "Strict STM interface polymorphic over stm implementation";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640508,7 +642827,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Strict tuples";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -640529,7 +642848,7 @@ self: {
         strict-tuple
       ];
       description = "Optics for the `strict-tuple` library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -640577,7 +642896,7 @@ self: {
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [ base ];
       description = "Lightweight strict types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -641600,7 +643919,7 @@ self: {
         text
       ];
       description = "Types for the Stripe API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -641851,7 +644170,7 @@ self: {
         text
       ];
       description = "Listen for Stripe webhook events with Scotty";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -641921,7 +644240,7 @@ self: {
         text
       ];
       description = "Verification of Stripe webhook signatures";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -641993,7 +644312,7 @@ self: {
         wreq
       ];
       description = "Use the Stripe API via Wreq";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -642106,7 +644425,7 @@ self: {
         transformers
       ];
       description = "A client for the Strava V3 API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -642143,7 +644462,7 @@ self: {
         transformers
       ];
       description = "A client for the Strava V3 API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -642389,7 +644708,7 @@ self: {
         utf8-string
       ];
       description = "Inspect the padding and size of C data declarations and their fields";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "struct-inspector";
       broken = true;
@@ -642553,7 +644872,7 @@ self: {
         vector
       ];
       description = "Structure (hash) of your data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -643031,113 +645350,6 @@ self: {
     }
   ) { };
 
-  stylish-haskell_0_14_4_0 = callPackage (
-    {
-      mkDerivation,
-      aeson,
-      base,
-      bytestring,
-      Cabal,
-      containers,
-      directory,
-      file-embed,
-      filepath,
-      ghc,
-      ghc-boot,
-      ghc-boot-th,
-      ghc-lib-parser-ex,
-      HsYAML,
-      HsYAML-aeson,
-      HUnit,
-      mtl,
-      optparse-applicative,
-      random,
-      regex-tdfa,
-      strict,
-      syb,
-      test-framework,
-      test-framework-hunit,
-      text,
-    }:
-    mkDerivation {
-      pname = "stylish-haskell";
-      version = "0.14.4.0";
-      sha256 = "0y0vfz5vkvw0wzcsw2ym3nix0v3pwjw2vas0qv3lrhdvn3ba9gb7";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        aeson
-        base
-        bytestring
-        Cabal
-        containers
-        directory
-        file-embed
-        filepath
-        ghc
-        ghc-boot
-        ghc-boot-th
-        ghc-lib-parser-ex
-        HsYAML
-        HsYAML-aeson
-        mtl
-        regex-tdfa
-        syb
-        text
-      ];
-      executableHaskellDepends = [
-        aeson
-        base
-        bytestring
-        Cabal
-        containers
-        directory
-        file-embed
-        filepath
-        ghc
-        ghc-boot
-        ghc-boot-th
-        ghc-lib-parser-ex
-        HsYAML
-        HsYAML-aeson
-        mtl
-        optparse-applicative
-        regex-tdfa
-        strict
-        syb
-        text
-      ];
-      testHaskellDepends = [
-        aeson
-        base
-        bytestring
-        Cabal
-        containers
-        directory
-        file-embed
-        filepath
-        ghc
-        ghc-boot
-        ghc-boot-th
-        ghc-lib-parser-ex
-        HsYAML
-        HsYAML-aeson
-        HUnit
-        mtl
-        random
-        regex-tdfa
-        syb
-        test-framework
-        test-framework-hunit
-        text
-      ];
-      description = "Haskell code prettifier";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "stylish-haskell";
-    }
-  ) { };
-
   stylish-haskell_0_14_5_0 = callPackage (
     {
       mkDerivation,
@@ -643233,7 +645445,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stylish-haskell";
     }
@@ -643332,7 +645544,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stylish-haskell";
     }
@@ -643431,7 +645643,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "stylish-haskell";
     }
@@ -643530,7 +645742,7 @@ self: {
         text
       ];
       description = "Haskell code prettifier";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "stylish-haskell";
     }
   ) { };
@@ -643888,7 +646100,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Subcategories induced by class constraints";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -644492,7 +646704,7 @@ self: {
       ];
       doHaddock = false;
       description = "Memory efficient JSON parser";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -644530,7 +646742,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Suffix arrays and friends";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -644953,7 +647165,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "An implementation of extensible products and sums";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -645028,7 +647240,7 @@ self: {
         validation-selective
       ];
       description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "summon";
       broken = true;
@@ -645074,7 +647286,7 @@ self: {
         relude
       ];
       description = "Tool for scaffolding fully configured batteries-included production-level Haskell projects using TUI";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "summon-tui";
     }
@@ -645792,7 +648004,7 @@ self: {
         text
       ];
       description = "Apache Pulsar client for Haskell";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -645945,7 +648157,7 @@ self: {
         hspec
       ];
       description = "Monitor groups of threads with non-hierarchical lifetimes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -646005,7 +648217,7 @@ self: {
         supply-chain-core
       ];
       description = "Composable request-response pipelines";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -646026,7 +648238,7 @@ self: {
         hspec
       ];
       description = "Composable request-response pipelines";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -646069,7 +648281,7 @@ self: {
         transformers
       ];
       description = "Supply-chain interface for basic streaming";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -646399,7 +648611,7 @@ self: {
         happy
       ];
       description = "SystemVerilog to Verilog conversion";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "sv2v";
     }
   ) { };
@@ -646562,7 +648774,7 @@ self: {
         text
       ];
       description = "Svg Icons and more";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "svg-icons-exe";
     }
   ) { };
@@ -646741,7 +648953,7 @@ self: {
         text
       ];
       description = "Optimise SVGs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "svgone";
     }
@@ -646782,7 +648994,7 @@ self: {
         xml
       ];
       description = "A tool to prune unused symbols from icon SVG files";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "svgsym";
       broken = true;
@@ -647554,7 +649766,7 @@ self: {
       ];
       doHaddock = false;
       description = "2D resource gathering game with programmable robots";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -647762,7 +649974,7 @@ self: {
         time
       ];
       description = "A semantic web toolkit";
-      license = lib.licenses.lgpl21Plus;
+      license = lib.licensesSpdx."LGPL-2.1-or-later";
       mainProgram = "Swish";
     }
   ) { };
@@ -647939,7 +650151,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -647968,7 +650180,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle lens functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -647997,7 +650209,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle modify functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -648020,7 +650232,7 @@ self: {
         template-haskell
       ];
       description = "Swizzle set functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -648277,8 +650489,8 @@ self: {
     }:
     mkDerivation {
       pname = "sydtest";
-      version = "0.20.0.0";
-      sha256 = "0f1ipp6wqykkyiibn1prx61ysvydf4bybiqg5mlzgi5h1cnqh22i";
+      version = "0.20.0.1";
+      sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19";
       libraryHaskellDepends = [
         async
         autodocodec
@@ -648312,7 +650524,7 @@ self: {
     }
   ) { };
 
-  sydtest_0_20_0_1 = callPackage (
+  sydtest_0_22_0_0 = callPackage (
     {
       mkDerivation,
       async,
@@ -648344,8 +650556,8 @@ self: {
     }:
     mkDerivation {
       pname = "sydtest";
-      version = "0.20.0.1";
-      sha256 = "1jnks9znjr4ar6x4a6965w6yijcd80ci6z5qwln4v98ls1a81x19";
+      version = "0.22.0.0";
+      sha256 = "1fvj90c6cmr03w3ac7xa4s1334w8md181gvd87bv0f07s9k9ki1q";
       libraryHaskellDepends = [
         async
         autodocodec
@@ -649514,7 +651726,7 @@ self: {
         unordered-containers
       ];
       description = "Basic symantic combinators for Embedded Domain-Specific Languages (EDSL)";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -649579,7 +651791,7 @@ self: {
         transformers
       ];
       description = "Symantics combinators for generating documents";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -650098,7 +652310,7 @@ self: {
       ];
       doHaddock = false;
       description = "Parser combinators statically optimized and staged via typed meta-programming";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -650335,7 +652547,7 @@ self: {
         unix
       ];
       description = "Symlink functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -650356,7 +652568,7 @@ self: {
         youProbablyWantSymbolizeWithAZ
       ];
       description = "You want Symbolize with a Z";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -650435,7 +652647,7 @@ self: {
         vector-hashtables
       ];
       description = "Efficient global Symbol table, with Garbage Collection";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -650652,6 +652864,39 @@ self: {
     }
   ) { };
 
+  symparsec_2_0_0 = callPackage (
+    {
+      mkDerivation,
+      base,
+      defun-core,
+      singleraeh,
+      type-level-show,
+      type-spec,
+    }:
+    mkDerivation {
+      pname = "symparsec";
+      version = "2.0.0";
+      sha256 = "0w8y31jp3gq5fkf0i45ibim4lm3g8iq4nl5ganqgi457rmcvkisl";
+      libraryHaskellDepends = [
+        base
+        defun-core
+        singleraeh
+        type-level-show
+      ];
+      testHaskellDepends = [
+        base
+        defun-core
+        singleraeh
+        type-level-show
+        type-spec
+      ];
+      description = "Type level string parser combinators";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      maintainers = [ lib.maintainers.raehik ];
+    }
+  ) { };
+
   symtegration = callPackage (
     {
       mkDerivation,
@@ -650725,7 +652970,7 @@ self: {
         random
       ];
       description = "Synapse is a machine learning library written in pure Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -651520,7 +653765,7 @@ self: {
         utility-ht
       ];
       description = "Control synthesizer effects via ALSA/MIDI";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       badPlatforms = lib.platforms.darwin;
       maintainers = [ lib.maintainers.thielema ];
     }
@@ -651815,7 +654060,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient signal processing using runtime compilation";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -652015,7 +654260,7 @@ self: {
         primitive
       ];
       description = "Decode RFC 3164 and RFC 5424 syslog message formats";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -652351,8 +654596,8 @@ self: {
       pname = "system-linux-proc";
       version = "0.1.1.1";
       sha256 = "12nvsvmchhsqs5f3x2075v8v68inb1xz8dbv1q5x48big1bf4vv5";
-      revision = "3";
-      editedCabalFile = "0mkjwv2yw130rpmxby32hqrj26q268wiyfv6f71q09wp1axl6qfc";
+      revision = "4";
+      editedCabalFile = "0q77ybg2x81k9vvmyiwxqgal4s3kai6b93gdirak7ypf5fbb62q5";
       libraryHaskellDepends = [
         attoparsec
         base
@@ -652676,7 +654921,7 @@ self: {
       ];
       librarySystemDepends = [ systemd ];
       description = "systemd bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.linux;
     }
   ) { inherit (pkgs) systemd; };
@@ -652710,7 +654955,7 @@ self: {
         wreq
       ];
       description = "Send notifications for systemd units to ntfy.sh";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "systemd-ntfy";
       broken = true;
@@ -652742,7 +654987,7 @@ self: {
         unix
       ];
       description = "Let systemd bind the server's socket for you";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -652842,7 +655087,7 @@ self: {
       ];
       testToolDepends = [ tasty-autocollect ];
       description = "Let you put anything in the system tray";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "systranything";
     }
   ) { };
@@ -653464,8 +655709,8 @@ self: {
       mkDerivation,
       aeson,
       ansi-terminal,
+      attoparsec,
       base,
-      broadcast-chan,
       bytestring,
       conduit,
       containers,
@@ -653476,15 +655721,17 @@ self: {
       dyre,
       either,
       enclosed-exceptions,
+      extra,
       filepath,
+      fsnotify,
       gi-cairo-connector,
       gi-cairo-render,
-      gi-gdk,
+      gi-gdk3,
       gi-gdkpixbuf,
-      gi-gdkx11,
+      gi-gdkx113,
       gi-glib,
-      gi-gtk,
       gi-gtk-hs,
+      gi-gtk3,
       gi-pango,
       gtk-sni-tray,
       gtk-strut,
@@ -653504,6 +655751,7 @@ self: {
       optparse-applicative,
       parsec,
       process,
+      QuickCheck,
       rate-limit,
       regex-compat,
       safe,
@@ -653512,14 +655760,16 @@ self: {
       status-notifier-item,
       stm,
       template-haskell,
-      temporary,
       text,
       time,
       time-locale-compat,
       time-units,
       transformers,
       tuple,
+      typed-process,
       unix,
+      unliftio,
+      unliftio-core,
       utf8-string,
       X11,
       xdg-basedir,
@@ -653530,16 +655780,16 @@ self: {
     }:
     mkDerivation {
       pname = "taffybar";
-      version = "4.0.3";
-      sha256 = "107hajq6y3hb9n80zncc8qi74dn6qqp7mic4xagnmah82sk1k5x9";
+      version = "4.1.1";
+      sha256 = "1fbh2jgv0isl02w806grsb7xlyjyaj4x0qmx9j556kci172g70mm";
       isLibrary = true;
       isExecutable = true;
       enableSeparateDataOutput = true;
       libraryHaskellDepends = [
         aeson
         ansi-terminal
+        attoparsec
         base
-        broadcast-chan
         bytestring
         conduit
         containers
@@ -653550,20 +655800,23 @@ self: {
         dyre
         either
         enclosed-exceptions
+        extra
         filepath
+        fsnotify
         gi-cairo-connector
         gi-cairo-render
-        gi-gdk
+        gi-gdk3
         gi-gdkpixbuf
-        gi-gdkx11
+        gi-gdkx113
         gi-glib
-        gi-gtk
         gi-gtk-hs
+        gi-gtk3
         gi-pango
         gtk-sni-tray
         gtk-strut
         haskell-gi-base
         hslogger
+        hspec
         HStringTemplate
         http-client
         http-client-tls
@@ -653572,6 +655825,7 @@ self: {
         multimap
         parsec
         process
+        QuickCheck
         rate-limit
         regex-compat
         safe
@@ -653586,7 +655840,10 @@ self: {
         time-units
         transformers
         tuple
+        typed-process
         unix
+        unliftio
+        unliftio-core
         utf8-string
         X11
         xdg-basedir
@@ -653596,6 +655853,7 @@ self: {
         xmonad
       ];
       libraryPkgconfigDepends = [ gtk3 ];
+      libraryToolDepends = [ hspec-discover ];
       executableHaskellDepends = [
         base
         data-default
@@ -653606,18 +655864,20 @@ self: {
       executablePkgconfigDepends = [ gtk3 ];
       testHaskellDepends = [
         base
-        directory
+        data-default
         filepath
+        gi-gtk3
         hspec
         hspec-core
         hspec-golden
-        temporary
+        QuickCheck
+        transformers
       ];
       testToolDepends = [ hspec-discover ];
+      doHaddock = false;
       description = "A desktop bar similar to xmobar, but with more GUI";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "taffybar";
       maintainers = [ lib.maintainers.rvl ];
     }
@@ -653817,7 +656077,7 @@ self: {
         transformers
       ];
       description = "Trivial monad transformer that allows identical monad stacks to have different types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -654399,7 +656659,7 @@ self: {
         utf8-string
       ];
       description = "Black magic tagsoup";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "tagstew";
     }
   ) { };
@@ -654487,7 +656747,7 @@ self: {
         text
       ];
       description = "Hierarchical Tags & Tag Trees";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -654507,7 +656767,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Abstractions related to Tahoe-LAFS \"capabilities\"";
-      license = lib.licenses.lgpl3Plus;
+      license = lib.licensesSpdx."LGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -654665,7 +656925,7 @@ self: {
         text
       ];
       description = "Tahoe-LAFS directory-like abstraction for collections of data objects";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -654874,7 +657134,7 @@ self: {
         yaml
       ];
       description = "An implementation of the \"Great Black Swamp\" LAFS protocol";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -654920,7 +657180,7 @@ self: {
         utility-ht
       ];
       description = "An HSpec for Great Black Swamp storage backends";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -654954,7 +657214,7 @@ self: {
         text
       ];
       description = "Types related to implementation of a Tahoe-LAFS Great Black Swamp server";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -655038,7 +657298,7 @@ self: {
         x509
       ];
       description = "An implementation of the Tahoe-LAFS SSK cryptographic protocols";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -655306,7 +657566,7 @@ self: {
         with-utf8
       ];
       description = "Tailwind wrapped in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "tailwind-run";
     }
   ) { };
@@ -655583,7 +657843,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Line oriented fast enough text search";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "talash";
       broken = true;
@@ -655910,7 +658170,7 @@ self: {
         transformers
       ];
       description = "Heterogenous memoisation monad";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -655980,78 +658240,12 @@ self: {
         vector
       ];
       description = "A tasty enhancement to cassava for easy csv exporting";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
   ) { };
 
-  tar_0_6_0_0 = callPackage (
-    {
-      mkDerivation,
-      array,
-      base,
-      bytestring,
-      containers,
-      deepseq,
-      directory,
-      file-embed,
-      filepath,
-      QuickCheck,
-      tasty,
-      tasty-bench,
-      tasty-quickcheck,
-      temporary,
-      time,
-    }:
-    mkDerivation {
-      pname = "tar";
-      version = "0.6.0.0";
-      sha256 = "11hr2p0lrdkklvn7yf85cqhyzq4ax2lxsfg0rljakkrpnn7s0n44";
-      libraryHaskellDepends = [
-        array
-        base
-        bytestring
-        containers
-        deepseq
-        directory
-        filepath
-        time
-      ];
-      testHaskellDepends = [
-        array
-        base
-        bytestring
-        containers
-        deepseq
-        directory
-        file-embed
-        filepath
-        QuickCheck
-        tasty
-        tasty-quickcheck
-        temporary
-        time
-      ];
-      benchmarkHaskellDepends = [
-        array
-        base
-        bytestring
-        containers
-        deepseq
-        directory
-        filepath
-        tasty-bench
-        temporary
-        time
-      ];
-      doHaddock = false;
-      description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   tar_0_6_3_0 = callPackage (
     {
       mkDerivation,
@@ -656119,7 +658313,7 @@ self: {
       ];
       doHaddock = false;
       description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -656150,8 +658344,8 @@ self: {
       pname = "tar";
       version = "0.6.4.0";
       sha256 = "1apkq11xg0rqbgs83hag85r4ibdw7v09n1qj0l0962d80h0aajbr";
-      revision = "2";
-      editedCabalFile = "074f5a4qcdl5vb7334i41azj4aj8i5ql03qrlr3hb5smxhvvk386";
+      revision = "4";
+      editedCabalFile = "1015pyr21l4apvkqdp08f7gnxawch4qpc1cdlqzcbfni9jvg4pqs";
       libraryHaskellDepends = [
         array
         base
@@ -656196,7 +658390,7 @@ self: {
       ];
       doHaddock = false;
       description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -656226,6 +658420,8 @@ self: {
       pname = "tar";
       version = "0.7.0.0";
       sha256 = "0dlhf8hhcgl5zvqqsykvg4vwi05b2cy0ml3p6yz4bngqxhnd2jkf";
+      revision = "2";
+      editedCabalFile = "0gx6fvmrgs42m3rkwswmfwmnlqyzsi35w7j7phlh092gwfwynp4b";
       libraryHaskellDepends = [
         array
         base
@@ -656265,7 +658461,7 @@ self: {
       ];
       doHaddock = false;
       description = "Reading, writing and manipulating \".tar\" archive files.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -656591,7 +658787,7 @@ self: {
         QuickCheck
       ];
       description = "Targeted generators for QuickCheck";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -656946,7 +659142,7 @@ self: {
         temporary
       ];
       description = "CLI task / todo list manager with SQLite backend";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tasklite";
     }
@@ -657084,7 +659280,7 @@ self: {
         protolude
       ];
       description = "CLI task / todo list manager with SQLite backend";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -657171,7 +659367,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Types and aeson instances for taskwarrior tasks";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -657539,7 +659735,7 @@ self: {
         text
       ];
       description = "Check multiple items during a tasty test";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -657568,7 +659764,7 @@ self: {
         tasty
       ];
       description = "Ingredient for tasty which generates per-test coverage reports";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -657649,7 +659845,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Test discovery for the tasty framework";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "tasty-discover";
     }
   ) { };
@@ -657682,6 +659878,8 @@ self: {
       pname = "tasty-discover";
       version = "5.1.0";
       sha256 = "0y6py4l63idqvvr063cnkqcl3wbsglk3bpizmlgbwmq4gq9aprif";
+      revision = "1";
+      editedCabalFile = "1bac8ll0im08w7n5hj43fkjpilcax9bz0kbq0nr690lh49ws2353";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -657718,7 +659916,7 @@ self: {
         temporary
       ];
       description = "Test discovery for the tasty framework";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tasty-discover";
     }
@@ -657824,7 +660022,7 @@ self: {
         tasty-hunit
       ];
       description = "Handle flaky Tasty-based tests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -657853,7 +660051,7 @@ self: {
         tasty-hunit
       ];
       description = "Simple focus mechanism for tasty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -657930,10 +660128,8 @@ self: {
     }:
     mkDerivation {
       pname = "tasty-golden-extra";
-      version = "0.1.0.0";
-      sha256 = "1bfd9ql3pws2vd37nbc5a8b49p7zbq3n48slxkrrwx1szaxkp8nj";
-      revision = "4";
-      editedCabalFile = "10bcysc2i1s1p0ih2i9nrqpi0839pgpzzl625iqcbjhv9hnx01kd";
+      version = "0.1.0.1";
+      sha256 = "1qfrskhw9qh6w594r9k6x1znz4xr2lma9v16zkdmmdii3wx9ipax";
       libraryHaskellDepends = [
         aeson
         aeson-diff
@@ -657949,7 +660145,7 @@ self: {
         yaml
       ];
       description = "Additional golden test helpers for the tasty-golden package";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -657986,7 +660182,7 @@ self: {
         text
       ];
       description = "Grade your tasty-testsuite";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -658045,8 +660241,8 @@ self: {
       pname = "tasty-hedgehog";
       version = "1.4.0.2";
       sha256 = "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25";
-      revision = "6";
-      editedCabalFile = "1rb8ncp6xyy7jr6v0hyls9m529ba0djndsxgxmkgr52rk3qq8lrc";
+      revision = "7";
+      editedCabalFile = "0xcg6qiw7fgl8hw50zfw8rayzynl4czhmvbgdkydq2a2ajipz06r";
       libraryHaskellDepends = [
         base
         hedgehog
@@ -658131,7 +660327,7 @@ self: {
         tasty-hunit
       ];
       description = "Tasty helpers to test HsLua";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -658151,8 +660347,8 @@ self: {
       pname = "tasty-hspec";
       version = "1.2.0.4";
       sha256 = "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni";
-      revision = "7";
-      editedCabalFile = "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay";
+      revision = "8";
+      editedCabalFile = "1jg5gjmcir11vwj5jp2h077xrb9f7y13zl9asl048nd0wg2qxym8";
       libraryHaskellDepends = [
         base
         hspec
@@ -658164,7 +660360,7 @@ self: {
         tasty-smallcheck
       ];
       description = "Hspec support for the Tasty test framework";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -658300,8 +660496,8 @@ self: {
       pname = "tasty-inspection-testing";
       version = "0.2.1";
       sha256 = "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay";
-      revision = "2";
-      editedCabalFile = "0z9al0hyq381fw146agbpz7rf24rwms1w91m7s0k1w3xbfw16l9n";
+      revision = "3";
+      editedCabalFile = "1gvwk8q20bbjny660qqp43y4ng5m56hk40mpvl8hi94wdw39pr6v";
       libraryHaskellDepends = [
         base
         ghc
@@ -658469,7 +660665,7 @@ self: {
         text
       ];
       description = "JSON reporter for the tasty testing framework";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -658615,8 +660811,8 @@ self: {
     }:
     mkDerivation {
       pname = "tasty-lua";
-      version = "1.1.1.1";
-      sha256 = "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r";
+      version = "1.1.2";
+      sha256 = "1047zbg99n3fvsjkivsj4m18igb1k495ymhkypd11jjdfqwd34rn";
       libraryHaskellDepends = [
         base
         bytestring
@@ -658639,7 +660835,7 @@ self: {
         tasty-hunit
       ];
       description = "Write tests in Lua, integrate into tasty";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -658754,7 +660950,7 @@ self: {
         tasty-focus
       ];
       description = "Unopinionated top-level entry point to tasty ecosystem";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -658864,8 +661060,8 @@ self: {
       pname = "tasty-quickcheck";
       version = "0.11.1";
       sha256 = "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73";
-      revision = "3";
-      editedCabalFile = "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w";
+      revision = "4";
+      editedCabalFile = "13sn5bwvw04d7l3xv6mkj8mf6wyvhqqhabdqnb4xchzcc48akdxz";
       libraryHaskellDepends = [
         base
         optparse-applicative
@@ -658951,7 +661147,7 @@ self: {
         transformers
       ];
       description = "Rerun only tests which failed in a previous test run";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -659238,7 +661434,7 @@ self: {
         tasty
       ];
       description = "Test vector support for tasty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -659429,7 +661625,7 @@ self: {
         profunctors
       ];
       description = "Types and combinators for taxes";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -659454,7 +661650,7 @@ self: {
         time
       ];
       description = "Tax types and computations for Australia";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
     }
   ) { };
 
@@ -659871,7 +662067,7 @@ self: {
         vector-algorithms
       ];
       description = "On-line accumulation of rank-based statistics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -660515,7 +662711,7 @@ self: {
         webgear-core
       ];
       description = "Easily define multiple interrelated data types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tedious-web-exe";
       broken = true;
@@ -660557,7 +662753,7 @@ self: {
         prettyprinter-ansi-terminal
       ];
       description = "Prettier error";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -661038,7 +663234,7 @@ self: {
         in-other-words
       ];
       description = "Binding to the telegraph API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -661228,7 +663424,7 @@ self: {
         transformers
       ];
       description = "The MonadTell class and related monad transformers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -661446,7 +663642,26 @@ self: {
         template-haskell
       ];
       description = "Backward-compatibility layer for Template Haskell newer than 2.8";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+    }
+  ) { };
+
+  template-haskell-lift = callPackage (
+    {
+      mkDerivation,
+      base,
+      template-haskell,
+    }:
+    mkDerivation {
+      pname = "template-haskell-lift";
+      version = "0.1.0.0";
+      sha256 = "09zilw0nbjmn1k688l058183rwa3br0fvh3x8jxqygjh3011w8ps";
+      libraryHaskellDepends = [
+        base
+        template-haskell
+      ];
+      description = "The 'Lift' typeclass";
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -661477,6 +663692,25 @@ self: {
     }
   ) { };
 
+  template-haskell-quasiquoter = callPackage (
+    {
+      mkDerivation,
+      base,
+      template-haskell,
+    }:
+    mkDerivation {
+      pname = "template-haskell-quasiquoter";
+      version = "0.1.0.0";
+      sha256 = "06zm27d72faad2ln7xn7d3kmvy04hq663a1q75cp7yyyca7fgjhf";
+      libraryHaskellDepends = [
+        base
+        template-haskell
+      ];
+      description = "The 'QuasiQuoter' interface";
+      license = lib.licensesSpdx."BSD-2-Clause";
+    }
+  ) { };
+
   template-haskell-util = callPackage (
     {
       mkDerivation,
@@ -661791,7 +664025,7 @@ self: {
       ];
       doHaddock = false;
       description = "You can use template.hs to create a new Haskell GitHub repository.";
-      license = lib.licenses.unlicense;
+      license = lib.licensesSpdx."Unlicense";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "initialise";
       broken = true;
@@ -661894,6 +664128,26 @@ self: {
     }
   ) { };
 
+  temporal-api-protos = callPackage (
+    {
+      mkDerivation,
+      base,
+      proto-lens-protobuf-types,
+      proto-lens-runtime,
+    }:
+    mkDerivation {
+      pname = "temporal-api-protos";
+      version = "2025.10.1.0";
+      sha256 = "0304jkgf2fmkkpi4xyzdn7m3pcwpwb5cgdh9z3xpxhx85f0zhs23";
+      libraryHaskellDepends = [
+        base
+        proto-lens-protobuf-types
+        proto-lens-runtime
+      ];
+      license = lib.licensesSpdx."BSD-3-Clause";
+    }
+  ) { };
+
   temporal-csound = callPackage (
     {
       mkDerivation,
@@ -662009,6 +664263,229 @@ self: {
     }
   ) { };
 
+  temporal-sdk = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      annotated-exception,
+      async,
+      base,
+      base64,
+      bytestring,
+      conduit,
+      containers,
+      directory,
+      discover-instances,
+      exceptions,
+      first-class-families,
+      ghc,
+      hashable,
+      hedgehog,
+      hs-opentelemetry-api,
+      hs-opentelemetry-propagator-w3c,
+      hs-opentelemetry-sdk,
+      hspec,
+      hspec-api,
+      hspec-discover,
+      hspec-hedgehog,
+      lens-family,
+      monad-logger,
+      mtl,
+      network,
+      proto-lens,
+      proto-lens-protobuf-types,
+      random,
+      require-callstack,
+      resourcet,
+      scientific,
+      split,
+      stm,
+      template-haskell,
+      temporal-api-protos,
+      temporal-sdk-core,
+      text,
+      th-lift-instances,
+      these,
+      time,
+      transformers,
+      unliftio,
+      unordered-containers,
+      uuid,
+      uuid-types,
+      validation-selective,
+      vault,
+      vector,
+      zlib,
+    }:
+    mkDerivation {
+      pname = "temporal-sdk";
+      version = "2025.10.1.0";
+      sha256 = "1zck8cm7w6rzap8nmjnyjvlf6xlgywkhk99qb62l4jmr6xmrq8y1";
+      libraryHaskellDepends = [
+        aeson
+        annotated-exception
+        async
+        base
+        base64
+        bytestring
+        conduit
+        containers
+        discover-instances
+        exceptions
+        first-class-families
+        ghc
+        hashable
+        hs-opentelemetry-api
+        hs-opentelemetry-propagator-w3c
+        lens-family
+        monad-logger
+        mtl
+        network
+        proto-lens
+        proto-lens-protobuf-types
+        random
+        require-callstack
+        scientific
+        split
+        stm
+        template-haskell
+        temporal-api-protos
+        temporal-sdk-core
+        text
+        th-lift-instances
+        these
+        time
+        transformers
+        unliftio
+        unordered-containers
+        uuid
+        uuid-types
+        validation-selective
+        vault
+        vector
+        zlib
+      ];
+      testHaskellDepends = [
+        aeson
+        annotated-exception
+        async
+        base
+        base64
+        bytestring
+        conduit
+        containers
+        directory
+        discover-instances
+        exceptions
+        first-class-families
+        ghc
+        hashable
+        hedgehog
+        hs-opentelemetry-api
+        hs-opentelemetry-propagator-w3c
+        hs-opentelemetry-sdk
+        hspec
+        hspec-api
+        hspec-hedgehog
+        lens-family
+        monad-logger
+        mtl
+        network
+        proto-lens
+        proto-lens-protobuf-types
+        random
+        require-callstack
+        resourcet
+        scientific
+        split
+        stm
+        template-haskell
+        temporal-api-protos
+        temporal-sdk-core
+        text
+        th-lift-instances
+        these
+        time
+        transformers
+        unliftio
+        unordered-containers
+        uuid
+        uuid-types
+        validation-selective
+        vault
+        vector
+        zlib
+      ];
+      testToolDepends = [ hspec-discover ];
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
+  temporal-sdk-core = callPackage (
+    {
+      mkDerivation,
+      aeson,
+      async,
+      base,
+      bytestring,
+      Cabal,
+      containers,
+      directory,
+      filepath,
+      lens-family,
+      monad-logger,
+      mtl,
+      network-bsd,
+      proto-lens,
+      stm,
+      temporal-api-protos,
+      temporal_bridge,
+      text,
+      unix,
+      unliftio,
+      unordered-containers,
+      uuid,
+      vector,
+    }:
+    mkDerivation {
+      pname = "temporal-sdk-core";
+      version = "2025.10.1.0";
+      sha256 = "1gz4nrp0ja8s4wawbjzf5v8mbsz2n0gll70bfyfwzjd0izi95j9i";
+      setupHaskellDepends = [
+        base
+        Cabal
+        directory
+        filepath
+        unix
+      ];
+      libraryHaskellDepends = [
+        aeson
+        async
+        base
+        bytestring
+        containers
+        lens-family
+        monad-logger
+        mtl
+        network-bsd
+        proto-lens
+        stm
+        temporal-api-protos
+        text
+        unix
+        unliftio
+        unordered-containers
+        uuid
+        vector
+      ];
+      librarySystemDepends = [ temporal_bridge ];
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { temporal_bridge = null; };
+
   temporary = callPackage (
     {
       mkDerivation,
@@ -663011,7 +665488,7 @@ self: {
         QuickCheck
       ];
       description = "Tunable sorting for responsive robustness and beyond";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "tensort";
     }
   ) { };
@@ -663072,7 +665549,7 @@ self: {
         termbox-bindings-hs
       ];
       description = "termbox";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -663095,7 +665572,7 @@ self: {
         termbox
       ];
       description = "termbox + reactive-banana";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -663130,7 +665607,7 @@ self: {
       sha256 = "1n1z66xwnvrmvb3qd5wx8rwf2v54zvy3bzqrqcwp43jjii4mjqkh";
       libraryHaskellDepends = [ base ];
       description = "termbox bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -663149,7 +665626,7 @@ self: {
         termbox-bindings-c
       ];
       description = "termbox bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -663172,7 +665649,7 @@ self: {
         termbox
       ];
       description = "termbox + The Elm Architecture";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -663882,7 +666359,7 @@ self: {
         tls
       ];
       description = "create temporary SSL certificates in tests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -664516,7 +666993,7 @@ self: {
         simple-get-opt
       ];
       description = "A library to make a quick test-runner script";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "test-runner";
       broken = true;
@@ -665062,15 +667539,15 @@ self: {
     }:
     mkDerivation {
       pname = "testcontainers-postgresql";
-      version = "0.0.1.1";
-      sha256 = "0zycclxn0wnnj0qhhxixlljl0jirsfd00wihhlx6azpy0h6qc8lw";
+      version = "0.0.4";
+      sha256 = "09pa6w7kksxn0dpg99m2f3lhplm1316g782i8gfjxwig84r7z0av";
       libraryHaskellDepends = [
         base
         testcontainers
         text
       ];
       description = "Testcontainers integration for PostgreSQL";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -665134,7 +667611,7 @@ self: {
         vec
       ];
       description = "Pure implementation of tensors, for use in tests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -665482,7 +667959,7 @@ self: {
     }
   ) { };
 
-  texmath_0_13 = callPackage (
+  texmath_0_13_0_1 = callPackage (
     {
       mkDerivation,
       base,
@@ -665505,8 +667982,8 @@ self: {
     }:
     mkDerivation {
       pname = "texmath";
-      version = "0.13";
-      sha256 = "1cap5mgh7ca0b7sk1k68wpxa1alhyvzgayj65llzyw94j9pbb23x";
+      version = "0.13.0.1";
+      sha256 = "1m08i83z1llm3swyjxk56pnyaw2gma4qyq3pmxr3xqzlr6x286x3";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -665653,7 +668130,7 @@ self: {
       ];
       doCheck = false;
       description = "An efficient packed Unicode text type";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -665735,7 +668212,7 @@ self: {
         text-builder-linear
       ];
       description = "Text styling for ANSI terminals";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -665772,7 +668249,7 @@ self: {
         text
       ];
       description = "ASCII string and character processing";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -665833,7 +668310,7 @@ self: {
         rerebase
       ];
       description = "Efficient strict text builder";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -665884,7 +668361,7 @@ self: {
         text-builder-linear
       ];
       description = "Efficient and flexible strict text builder";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -665926,7 +668403,7 @@ self: {
         text-builder-linear
       ];
       description = "Internals of \"text-builder\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -665984,7 +668461,7 @@ self: {
         rerebase
       ];
       description = "Edge of developments for \"text-builder\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -666031,7 +668508,7 @@ self: {
         time
       ];
       description = "Edge of developments for \"text-builder\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -666068,7 +668545,7 @@ self: {
         text-builder
       ];
       description = "Orphan instances of \"lawful-conversions\" for \"text-builder\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -666111,7 +668588,7 @@ self: {
         text
       ];
       description = "Builder for Text and ByteString based on linear types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -666132,7 +668609,7 @@ self: {
         time
       ];
       description = "Various formats for \"time\" in terms of \"text-builder\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -666159,7 +668636,7 @@ self: {
         text
       ];
       description = "A text compression library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -666246,7 +668723,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Safe conversions between textual types";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -666276,7 +668753,7 @@ self: {
         text
       ];
       description = "Convert between various textual representations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -666344,7 +668821,7 @@ self: {
         text-builder-linear
       ];
       description = "A typeclass for user-facing output";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.mangoiv ];
     }
   ) { };
@@ -666399,7 +668876,7 @@ self: {
       ];
       doHaddock = false;
       description = "Classes and newtypes for deriving uniform textual encodings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -666993,7 +669470,7 @@ self: {
         text
       ];
       description = "Case conversion, word boundary manipulation, and textual subjugation";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -667033,50 +669510,6 @@ self: {
     }
   ) { };
 
-  text-metrics_0_3_2 = callPackage (
-    {
-      mkDerivation,
-      base,
-      containers,
-      criterion,
-      deepseq,
-      hspec,
-      QuickCheck,
-      text,
-      vector,
-      weigh,
-    }:
-    mkDerivation {
-      pname = "text-metrics";
-      version = "0.3.2";
-      sha256 = "0vl3vnm7xhy2zwcx1m293gp64q5sxfa3vmzdaqnqmjgby6l31mxx";
-      revision = "4";
-      editedCabalFile = "1blvnlylfs5s91q4n48la7pcl2sz5gajmjdx9jagcml5nmsnirqq";
-      libraryHaskellDepends = [
-        base
-        containers
-        text
-        vector
-      ];
-      testHaskellDepends = [
-        base
-        hspec
-        QuickCheck
-        text
-      ];
-      benchmarkHaskellDepends = [
-        base
-        criterion
-        deepseq
-        text
-        weigh
-      ];
-      description = "Calculate various string metrics efficiently";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-    }
-  ) { };
-
   text-metrics = callPackage (
     {
       mkDerivation,
@@ -667116,7 +669549,7 @@ self: {
         weigh
       ];
       description = "Calculate various string metrics efficiently";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -667510,7 +669943,7 @@ self: {
         text
       ];
       description = "Simple text replacements from a list of search/replace pairs";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "text-replace";
       broken = true;
@@ -667571,6 +670004,8 @@ self: {
       pname = "text-rope-zipper";
       version = "0.1.1.0";
       sha256 = "04hxmpgid7x1b566vsdi8sp18w62k5wlw4s08vchv4y4564hc8vm";
+      revision = "1";
+      editedCabalFile = "0xb3l96vkmnbqh06ppb9l0nfhfdqqw4lpmpgpicy1b6prgsf5wcj";
       libraryHaskellDepends = [
         base
         text
@@ -667584,9 +670019,7 @@ self: {
         text-rope
       ];
       description = "2D text zipper based on text-rope";
-      license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -668864,7 +671297,7 @@ self: {
         unordered-containers
       ];
       description = "Check that datatypes are deep strict using Template Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -669329,7 +671762,7 @@ self: {
         template-haskell
       ];
       description = "Template Haskell construction utilities";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -669358,7 +671791,7 @@ self: {
         transformers
       ];
       description = "Implicit (recursive) let insertion";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -669459,7 +671892,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Serialize compilation of modules with TH code modifing shared state";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -670025,7 +672458,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Give your dependencies stars on GitHub!";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "thank-you-stars";
       broken = true;
@@ -670101,7 +672534,7 @@ self: {
         unagi-chan
       ];
       description = "Minimalistic actor library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -670138,7 +672571,7 @@ self: {
         rerebase
       ];
       description = "Minimalistic actor library experiments";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -670199,7 +672632,7 @@ self: {
         time
       ];
       description = "Haskell API bindings for http://themoviedb.org";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tmdb";
       broken = true;
@@ -671444,7 +673877,7 @@ self: {
         text
       ];
       description = "A compiler from the Thrift Interface Definition Language (IDL) to Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "thrift-compiler";
     }
@@ -671479,7 +673912,7 @@ self: {
         unordered-containers
       ];
       description = "Support for using Haxl with Thrift services";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -671567,7 +674000,7 @@ self: {
       ];
       doHaddock = false;
       description = "Support for Thrift-over-HTTP server and client";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -671669,7 +674102,7 @@ self: {
       testToolDepends = [ thrift-compiler ];
       doHaddock = false;
       description = "Libraries for Haskell Thrift";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -671972,7 +674405,7 @@ self: {
         text
       ];
       description = "Image thumbnail creation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -672096,7 +674529,7 @@ self: {
           unordered-containers,
           utf8-string,
           vector,
-          webkitgtk_4_0,
+          webkit2gtk,
           xdg-basedir,
           xmonad,
           xmonad-contrib,
@@ -672149,7 +674582,7 @@ self: {
           ];
           executablePkgconfigDepends = [
             gtk3
-            webkitgtk_4_0
+            webkit2gtk
           ];
           testHaskellDepends = [
             aeson
@@ -672192,7 +674625,7 @@ self: {
       )
       {
         inherit (pkgs) gtk3;
-        inherit (pkgs) webkitgtk_4_0;
+        webkit2gtk = null;
       };
 
   tibetan-utils = callPackage (
@@ -672329,7 +674762,7 @@ self: {
         text
       ];
       description = "A basic implementation of a personal ticket management system";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "ticket-manager";
       broken = true;
@@ -672536,7 +674969,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Ableton Link integration for Tidal";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       mainProgram = "tidal-linktest";
     }
   ) { };
@@ -672819,7 +675252,7 @@ self: {
       ];
       testSystemDepends = [ tb_client ];
       description = "A Haskell client library for Tigerbeetle database";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tigerbeetle-hs";
       broken = true;
@@ -672968,7 +675401,7 @@ self: {
         tasty-bench
       ];
       description = "Haskell implementation of tiktoken";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -673125,7 +675558,7 @@ self: {
         deepseq
       ];
       description = "A time library";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -673220,7 +675653,7 @@ self: {
         time
       ];
       description = "A library for time domains and durations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.turion ];
     }
   ) { };
@@ -674223,8 +676656,8 @@ self: {
       pname = "timeline";
       version = "0.1.1.0";
       sha256 = "15npn5wfhdg2mcvr92n7c9k7jj1jcifm6rcpmyi64mcfsb2g1ry6";
-      revision = "2";
-      editedCabalFile = "1qqhf50g4b89fa5wjhhgjsvyx3gqrdmpswsyjwkwbrbh6m795xja";
+      revision = "3";
+      editedCabalFile = "12x91d8cijq5ifij08piwjjbv72h0q2bn0dxfjqkl6l791n4mqr4";
       libraryHaskellDepends = [
         base
         containers
@@ -674252,7 +676685,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Data type representing a piecewise-constant function over time";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -674386,6 +676819,39 @@ self: {
     }
   ) { };
 
+  timeout-snooze = callPackage (
+    {
+      mkDerivation,
+      base,
+      hspec,
+      stm,
+      stm-delay,
+      unliftio,
+    }:
+    mkDerivation {
+      pname = "timeout-snooze";
+      version = "0.1.0.0";
+      sha256 = "0xnci3sn0kn864lik3w7lvhqrczyn103z7gzz2zcgih113ky7sn6";
+      libraryHaskellDepends = [
+        base
+        stm
+        stm-delay
+        unliftio
+      ];
+      testHaskellDepends = [
+        base
+        hspec
+        stm
+        stm-delay
+        unliftio
+      ];
+      description = "Efficient timeout with reset";
+      license = lib.licensesSpdx."BSD-3-Clause";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   timeout-with-results = callPackage (
     {
       mkDerivation,
@@ -674548,7 +677014,7 @@ self: {
         tasty-bench
       ];
       description = "A timer wheel";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -674834,7 +677300,7 @@ self: {
         text
       ];
       description = "A library for profiling time in Haskell applications";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -675322,7 +677788,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Library to build tiny apps in Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -675366,7 +677832,7 @@ self: {
         entropy
       ];
       description = "A secure URL-friendly string ID generator";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -676509,7 +678975,7 @@ self: {
     }
   ) { };
 
-  tls_2_1_11 = callPackage (
+  tls_2_1_12 = callPackage (
     {
       mkDerivation,
       asn1-encoding,
@@ -676520,6 +678986,7 @@ self: {
       base64-bytestring,
       bytestring,
       cereal,
+      containers,
       crypton,
       crypton-x509,
       crypton-x509-store,
@@ -676533,17 +679000,19 @@ self: {
       memory,
       mtl,
       network,
+      network-run,
       QuickCheck,
       random,
       serialise,
+      tasty-bench,
       transformers,
       unix-time,
       zlib,
     }:
     mkDerivation {
       pname = "tls";
-      version = "2.1.11";
-      sha256 = "1qw4yvvxv10gh7as8lhg4z1q4l547gikwm1krz6h6kshk0rig6h5";
+      version = "2.1.12";
+      sha256 = "1lhv1c93qaj3mg5mdifjfzddcw6y5j0nzbyy22pqyad1j41lbm2g";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -676585,6 +679054,27 @@ self: {
         serialise
       ];
       testToolDepends = [ hspec-discover ];
+      benchmarkHaskellDepends = [
+        asn1-types
+        async
+        base
+        base64-bytestring
+        bytestring
+        containers
+        crypton
+        crypton-x509
+        crypton-x509-store
+        crypton-x509-validation
+        data-default
+        ech-config
+        hourglass
+        hspec
+        network
+        network-run
+        QuickCheck
+        serialise
+        tasty-bench
+      ];
       description = "TLS protocol native implementation";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
@@ -676740,7 +679230,7 @@ self: {
         tls
       ];
       description = "SSLKEYLOGFILE support for Haskell";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -676794,7 +679284,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle phylogenetic trees";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       mainProgram = "tlynx";
       maintainers = [ lib.maintainers.dschrempf ];
     }
@@ -676850,7 +679340,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Handle phylogenetic trees";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "tlynx";
       maintainers = [ lib.maintainers.dschrempf ];
@@ -677095,7 +679585,7 @@ self: {
         warp-tls
       ];
       description = "Run 'tmp' processes in integration tests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -677168,7 +679658,7 @@ self: {
         hspec
       ];
       description = "Test a simple service with backends running on docker using tmp-proc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -677206,7 +679696,7 @@ self: {
         tmp-proc
       ];
       description = "Launch a PostgreSQL database in docker using tmp-proc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -677242,7 +679732,7 @@ self: {
         tmp-proc
       ];
       description = "Launch RabbitMQ in docker using tmp-proc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -677278,7 +679768,7 @@ self: {
         tmp-proc
       ];
       description = "Launch Redis in docker using tmp-proc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -677315,7 +679805,7 @@ self: {
         tmp-proc
       ];
       description = "Launch ZipKin in docker using tmp-proc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -677775,7 +680265,7 @@ self: {
         text
       ];
       description = "Fast rate limiting using the token bucket algorithm (BSD)";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "token-limiter-extended-tests";
       broken = true;
@@ -677958,7 +680448,7 @@ self: {
         transformers
       ];
       description = "Check uniqueness and tokenize safely";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -678295,7 +680785,7 @@ self: {
         markdown-unlit
       ];
       description = "TOML 1.0.0 parser";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -678393,7 +680883,7 @@ self: {
         toml-reader
       ];
       description = "Alternative parser for TOML values produced by the toml-reader package";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -678426,7 +680916,7 @@ self: {
         toml-parser
       ];
       description = "toml-parser test drivers";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -678491,7 +680981,7 @@ self: {
         unordered-containers
       ];
       description = "Bidirectional TOML serialization";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -679210,7 +681700,7 @@ self: {
         template-haskell
         time
       ];
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -679253,7 +681743,7 @@ self: {
         text
       ];
       description = "Tribial tools";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -679391,7 +681881,7 @@ self: {
         vector
       ];
       description = "Extensible records library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -679493,7 +681983,7 @@ self: {
         vector
       ];
       description = "Directed acyclic graphs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -679559,7 +682049,7 @@ self: {
       sha256 = "0ljcxlv019qfbs3wvp03j8l261i1p6vv3vycabcd0hpy0dbq80d9";
       libraryHaskellDepends = [ base ];
       description = "Torsor Typeclass";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -680151,7 +682641,7 @@ self: {
         vector
       ];
       description = "Assorted decision procedures for SAT, SMT, Max-SAT, PB, MIP, etc";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -680388,7 +682878,7 @@ self: {
         text
       ];
       description = "Data Type for Rewriting Systems";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -680432,7 +682922,7 @@ self: {
         text
       ];
       description = "Parser and pretty printer for the TPTP language";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -680570,7 +683060,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Smart version of Debug.Trace module";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -681747,7 +684237,7 @@ self: {
         transformers
       ];
       description = "An Either monad transformer";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -681772,7 +684262,7 @@ self: {
         transformers
       ];
       description = "An Except monad transformer with";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -681839,7 +684329,7 @@ self: {
         writer-cps-transformers
       ];
       description = "Ad-hoc type classes for lifting";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -682222,7 +684712,7 @@ self: {
         doctest
       ];
       description = "Type Safe Web Routing";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -682259,7 +684749,7 @@ self: {
         trasa
       ];
       description = "Type safe http requests";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -682418,7 +684908,7 @@ self: {
         wai
       ];
       description = "Type safe web server";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -682448,7 +684938,7 @@ self: {
         trasa
       ];
       description = "Template Haskell to generate trasa routes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -682484,7 +684974,7 @@ self: {
         util
       ];
       description = "See README for more info";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -682525,7 +685015,7 @@ self: {
         template-haskell
       ];
       description = "General data structure lifting for Template Haskell";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -682778,7 +685268,7 @@ self: {
         hspec-core
       ];
       description = "Efficient implementation of the implicit treap data structure";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -682869,7 +685359,7 @@ self: {
         Diff
       ];
       description = "Diffing of (expression) trees";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -682914,7 +685404,7 @@ self: {
         vector
       ];
       description = "Tree Edit Distance to determine the similarity between two trees";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "tree-edit-distance-exe";
     }
   ) { };
@@ -682973,7 +685463,7 @@ self: {
         mtl
       ];
       description = "Configurable text rendering of trees";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -683011,7 +685501,7 @@ self: {
         hedgehog
       ];
       description = "Unstable bindings for the tree-sitter parsing library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683031,7 +685521,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for C#";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683051,7 +685541,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Go";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683072,7 +685562,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Haskell (with GHC extensions)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683092,7 +685582,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Java";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683112,7 +685602,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for JSON";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683132,7 +685622,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for OCaml";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683152,7 +685642,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for PHP";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683172,7 +685662,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Python";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683192,7 +685682,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for QL";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683212,7 +685702,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Ruby";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683232,7 +685722,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for Rust";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683252,7 +685742,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for TSX";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683272,7 +685762,7 @@ self: {
         tree-sitter
       ];
       description = "Tree-sitter grammar/parser for TypeScript";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -683299,7 +685789,7 @@ self: {
         mtl
       ];
       description = "Functions and newtype wrappers for traversing Trees";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -683846,7 +686336,7 @@ self: {
       ];
       doHaddock = false;
       description = "Bindings to the TREXIO library for wave function data";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) trexio; };
 
@@ -683896,7 +686386,7 @@ self: {
         splitmix
       ];
       description = "Trial Data Structure";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -683919,7 +686409,7 @@ self: {
         trial
       ];
       description = "Trial helper functions for optparse-applicative";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -683944,7 +686434,7 @@ self: {
         trial
       ];
       description = "Trial helper functions for tomland";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -684278,7 +686768,7 @@ self: {
         hspec
       ];
       description = "A command-line tool for trimming whitespace";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "trim";
       broken = true;
@@ -684549,7 +687039,7 @@ self: {
         time
       ];
       description = "Template Haskell hack to violate module abstractions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -684674,7 +687164,7 @@ self: {
         text
       ];
       description = "An implementation of a trust chain";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -684700,7 +687190,7 @@ self: {
       sha256 = "164jxd8cyjb4qkmwqchzcpvd5fh7d124gbpryi26y8cbabmhfm8z";
       libraryHaskellDepends = [ base ];
       description = "Generalized booleans and truthy values";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -685263,7 +687753,7 @@ self: {
         text-short
       ];
       description = "Textual Type Classes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -685763,7 +688253,7 @@ self: {
         tasty-hunit
       ];
       description = "Access tuple fields using record dot syntax";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "gen-source";
       broken = true;
@@ -686018,7 +688508,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Small monomorphic tuples";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -686500,7 +688990,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Tiny web application framework for WAI";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -687445,7 +689935,7 @@ self: {
         vector
       ];
       description = "Simple 2D Game Engine";
-      license = lib.licenses.zlib;
+      license = lib.licensesSpdx."Zlib";
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
@@ -687498,7 +689988,7 @@ self: {
         wai
       ];
       description = "Haskell twirp foundations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -688475,7 +690965,7 @@ self: {
         Glob
       ];
       description = "Combinators for writing pretty type errors easily";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -689031,7 +691521,7 @@ self: {
         template-haskell
       ];
       description = "Type-level functions for record types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "vector-example";
     }
   ) { };
@@ -689116,7 +691606,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Type-level natural and proofs of their properties";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -689322,7 +691812,7 @@ self: {
         tasty-hunit
       ];
       description = "Support functions to work with type representations";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -689343,7 +691833,7 @@ self: {
         invariant
       ];
       description = "Classes for the rig (sums and products) of types";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -689357,7 +691847,7 @@ self: {
       editedCabalFile = "0xcamv7cy7saywzx2vj7d0l1hpjqkz8jzkdy8hdabz7q9zlynshg";
       libraryHaskellDepends = [ base ];
       description = "Type safe BST and AVL trees";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -689385,7 +691875,7 @@ self: {
         template-haskell
       ];
       description = "Type set";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -689794,7 +692284,7 @@ self: {
         unordered-containers
       ];
       description = "An implementation of LangChain in Haskell";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "typechain-exe";
       broken = true;
@@ -690112,7 +692602,7 @@ self: {
         singletons-base
       ];
       description = "A framework for strongly typed FSM";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -690140,7 +692630,9 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "GUI framework based on typed-fsm";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
     }
   ) { };
 
@@ -690205,8 +692697,8 @@ self: {
     }:
     mkDerivation {
       pname = "typed-process-effectful";
-      version = "1.0.0.3";
-      sha256 = "07vsi991x9aflbk5pza1y20y9pg3zpnqjdj9c7brwv75m9yjasw5";
+      version = "1.0.0.4";
+      sha256 = "1p19zisid3i4wrwa2gfzbad233dcbd6jbryfc3bk0hrcikcvl14y";
       libraryHaskellDepends = [
         base
         bytestring
@@ -690220,7 +692712,7 @@ self: {
         tasty-hunit
       ];
       description = "A binding of the typed-process library for the effectful effect system";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -690245,8 +692737,8 @@ self: {
     }:
     mkDerivation {
       pname = "typed-protocols";
-      version = "1.1.0.0";
-      sha256 = "0zxm7440985vlir9g7qn61g8k31afx33ca5s6jn5yi3j9q5vny5y";
+      version = "1.1.0.1";
+      sha256 = "1sfcdhvb99yzmzsh63qdvghbjhd5r1g3bi6yyb432pdqnw9i4s9g";
       libraryHaskellDepends = [
         base
         bytestring
@@ -690272,9 +692764,7 @@ self: {
       ];
       doHaddock = false;
       description = "A framework for strongly typed protocols";
-      license = lib.licenses.asl20;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -690351,9 +692841,10 @@ self: {
         typed-protocols
       ];
       description = "Derive documentation from typed-protocols source code";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "typed-protocols-doc-demo";
+      broken = true;
     }
   ) { };
 
@@ -690392,7 +692883,7 @@ self: {
         test-framework-quickcheck2
       ];
       description = "An efficient and versatile typed range library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -690431,7 +692922,7 @@ self: {
         template-haskell
       ];
       description = "typed session framework";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -690465,7 +692956,7 @@ self: {
         raw-strings-qq
       ];
       description = "Automatically generate status for typed-session";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -690837,7 +693328,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Plugin to faciliate type-level let";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -691145,7 +693636,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient implementation of a dependent map with types as keys";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       maintainers = [ lib.maintainers.mpscholten ];
     }
   ) { };
@@ -691198,8 +693689,8 @@ self: {
     }:
     mkDerivation {
       pname = "typesafe-precure";
-      version = "0.12.0.1";
-      sha256 = "1cl6dq9mdm3caw3zzwpw7vcyv41apk0d0fxrxrm7d0vp4wvjckff";
+      version = "0.12.1.1";
+      sha256 = "0gba5l5l4cixyfpxkiy4hyz4zbrq7rxf2cfsj1123ycsa7j4j0ph";
       libraryHaskellDepends = [
         aeson
         aeson-pretty
@@ -691221,7 +693712,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Type-safe transformations and purifications of PreCures (Japanese Battle Heroine)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -691313,7 +693804,7 @@ self: {
         text-show
       ];
       description = "Typelevel printf";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -691669,7 +694160,7 @@ self: {
         time
       ];
       description = "Parsing and evaluating typst syntax";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -691688,7 +694179,7 @@ self: {
         text
       ];
       description = "Symbol and emoji lookup for typst language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -692340,7 +694831,7 @@ self: {
         gauge
       ];
       description = "Unicode Character Database — Predicates on characters specified by Unicode";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -692372,7 +694863,7 @@ self: {
         containers
       ];
       description = "Datatype and parser for the Universal Configuration Language (UCL) using libucl";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -692844,7 +695335,7 @@ self: {
       ];
       executableHaskellDepends = [ base ];
       description = "Minimalistic console UI (getLine), arrow key support (edit, browse cmd history)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       mainProgram = "example";
     }
   ) { };
@@ -693094,7 +695585,7 @@ self: {
         time
       ];
       description = "Implementation of ULID - Universally Unique Lexicographically Sortable Identifier";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ulid-exe";
     }
   ) { };
@@ -693142,7 +695633,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Another ULID implementation with tight memory representation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -693198,7 +695689,7 @@ self: {
         hspec
       ];
       description = "Bindings for libunac(3)";
-      license = lib.licenses.unlicense;
+      license = lib.licensesSpdx."Unlicense";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -693510,7 +696001,7 @@ self: {
         unbound-generics
       ];
       description = "Unification based on unbound-generics";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -693667,7 +696158,7 @@ self: {
         vector
       ];
       description = "A library for reference cells backed by unboxed-vectors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
       broken = true;
@@ -693776,7 +696267,7 @@ self: {
       libraryHaskellDepends = [ base ];
       executableHaskellDepends = [ base ];
       description = "Customize uncaught exception handling";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       mainProgram = "uncaught-exception-demo";
     }
   ) { };
@@ -693863,7 +696354,7 @@ self: {
         unliftio
       ];
       description = "a library which implements easy, concurrent and pretty logging";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       mainProgram = "unclogging";
       maintainers = [ lib.maintainers.mangoiv ];
     }
@@ -693886,7 +696377,7 @@ self: {
         int-supply
       ];
       description = "Unconditional jumps";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -694062,7 +696553,7 @@ self: {
         stm
       ];
       description = "Make any action thread safe";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -694408,7 +696899,7 @@ self: {
         text-icu
       ];
       description = "Haskell implementation of the Unicode Collation Algorithm";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -694439,11 +696930,11 @@ self: {
         tasty-bench
       ];
       description = "Access Unicode Character Database (UCD)";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
-  unicode-data_0_7_0 = callPackage (
+  unicode-data_0_8_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -694454,8 +696945,8 @@ self: {
     }:
     mkDerivation {
       pname = "unicode-data";
-      version = "0.7.0";
-      sha256 = "1l21qmhg9pgfnfxi8bsdvbb5zq9izz23caz44s32r9xmd7mdxqc0";
+      version = "0.8.0";
+      sha256 = "02qgvnv6izs3nq8a14nw86pbgazqvjj22rsvvzklck56rmm7paby";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -694468,7 +696959,7 @@ self: {
         tasty-bench
       ];
       description = "Access Unicode Character Database (UCD)";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -694485,8 +696976,8 @@ self: {
     }:
     mkDerivation {
       pname = "unicode-data-names";
-      version = "0.5.0";
-      sha256 = "0hyx4lwz9y2nzk2jmrjcway02wbgam8yrsgggn28p8aabn452kp4";
+      version = "0.6.0";
+      sha256 = "0dr2wb100km8v683aw8ylwc2npj4bl7adsmknrdb0z3nz7xi0j0k";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -694506,7 +696997,7 @@ self: {
         unicode-data
       ];
       description = "Unicode characters names and aliases";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -694527,7 +697018,7 @@ self: {
         bytestring
       ];
       description = "Parsers for Unicode Character Database (UCD) files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -694542,8 +697033,8 @@ self: {
     }:
     mkDerivation {
       pname = "unicode-data-scripts";
-      version = "0.5.0";
-      sha256 = "0s01wjps018i67xgrkrvzw6ncmvsa3hpbl7qs75pvfskhjh9bjvq";
+      version = "0.6.0";
+      sha256 = "0g6a7smdzjp6rxqv86nvh9bp7qihg5a9a9agw14jhg6zvs8kpgy0";
       libraryHaskellDepends = [ base ];
       testHaskellDepends = [
         base
@@ -694556,7 +697047,7 @@ self: {
         tasty-bench
       ];
       description = "Unicode characters scripts";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -694572,8 +697063,8 @@ self: {
     }:
     mkDerivation {
       pname = "unicode-data-security";
-      version = "0.5.0";
-      sha256 = "199gk9444wbr1balpl1nzl0ivbpx5md9qhd9gf4jrjkb2nkk1hi6";
+      version = "0.6.0";
+      sha256 = "16kkvmjqigzgwhw7x0kx9p38m1m9bhm0nc47rm8564czx2bxw7lh";
       libraryHaskellDepends = [
         base
         unicode-data
@@ -694589,7 +697080,7 @@ self: {
         tasty-bench
       ];
       description = "Unicode security mechanisms database";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -694787,8 +697278,8 @@ self: {
       pname = "unicode-transforms";
       version = "0.4.0.1";
       sha256 = "1z29jvli2rqkynfxni1gibl81458j7h8lrb8fg6lpnj8svhy2y1j";
-      revision = "7";
-      editedCabalFile = "1lsb6788m8ibpddfx0ah3v5c09q9i0d1ik92bpgsx5ygx1xcnsj4";
+      revision = "8";
+      editedCabalFile = "0m2frv6g0hnsjif4acxy6dgfzzxhk7g82s57fcwc3zqsr2sr1i0z";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -694818,7 +697309,7 @@ self: {
         text
       ];
       description = "Unicode normalization";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -694951,7 +697442,7 @@ self: {
         mtl
       ];
       description = "Simple generic unification algorithms";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -694974,7 +697465,7 @@ self: {
         test-invariant
       ];
       description = "Pointless functions and a simplistic zero and monoid";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -695031,7 +697522,7 @@ self: {
         uniform-strings
       ];
       description = "Handling errors in the uniform framework";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -695111,7 +697602,7 @@ self: {
         zlib
       ];
       description = "Uniform file handling operations";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -695411,7 +697902,7 @@ self: {
         uniform-algebras
       ];
       description = "Manipulate and convert strings of characters uniformly and consistently";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -695440,7 +697931,7 @@ self: {
         uniform-strings
       ];
       description = "Time in the uniform framework";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -695518,7 +698009,7 @@ self: {
         uniform-time
       ];
       description = "A uniform base to build apps on";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
     }
   ) { };
 
@@ -695586,7 +698077,7 @@ self: {
         lens
       ];
       description = "Extensible type-safe unions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -695757,7 +698248,7 @@ self: {
         with-utf8
       ];
       description = "Union mount filesystem paths into Haskell datastructures";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -695902,7 +698393,7 @@ self: {
         transformers
       ];
       description = "Esoteric programming language where each number can only appear once";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "unique";
       broken = true;
@@ -695939,7 +698430,7 @@ self: {
         utility-ht
       ];
       description = "Solve simple simultaneous equations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -695977,7 +698468,7 @@ self: {
         utility-ht
       ];
       description = "Solve simple simultaneous equations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -696660,7 +699151,7 @@ self: {
         universe-some
       ];
       description = "A class for finite and recursively enumerable types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -696692,7 +699183,7 @@ self: {
         QuickCheck
       ];
       description = "A class for finite and recursively enumerable types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -696713,7 +699204,7 @@ self: {
         universe-some
       ];
       description = "Universe instances for types from dependent-sum";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -696763,7 +699254,7 @@ self: {
         universe-base
       ];
       description = "Universe instances for types from selected extra packages";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -696809,7 +699300,7 @@ self: {
         universe-base
       ];
       description = "Instances of standard classes that are made possible by enumerations";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -696844,7 +699335,7 @@ self: {
         universe-base
       ];
       description = "Universe instances for Some from some";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.alexfmpe ];
     }
   ) { };
@@ -696927,8 +699418,8 @@ self: {
     }:
     mkDerivation {
       pname = "universum";
-      version = "1.8.2.2";
-      sha256 = "0h8ckr60gm5wxly5zyij9avzmlzljp21njd1k9j13nj5z23i1idp";
+      version = "1.8.3";
+      sha256 = "0j1zkhj4x10iycww6qc768sfr9jrxr1awhgv9f7f2npkcynssdkb";
       libraryHaskellDepends = [
         base
         bytestring
@@ -696957,13 +699448,11 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Custom prelude used in Serokell";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
-  unix_2_8_7_0 = callPackage (
+  unix_2_8_8_0 = callPackage (
     {
       mkDerivation,
       base,
@@ -696976,10 +699465,8 @@ self: {
     }:
     mkDerivation {
       pname = "unix";
-      version = "2.8.7.0";
-      sha256 = "10zv2vcq82vv56hll5mpvfwfsx6ymp2f75fwxvp5a1xgbafqgpfb";
-      revision = "2";
-      editedCabalFile = "0xbk68mf4j22kw1a4q732b5n6j8v5yqc55kxdk3hcwgcm0a12wys";
+      version = "2.8.8.0";
+      sha256 = "0gjsg9w6psn1gqzkc8akv5a2343fc3x7dlr25xb1lwzbpyixwa51";
       libraryHaskellDepends = [
         base
         bytestring
@@ -697015,7 +699502,7 @@ self: {
         bytestring
       ];
       description = "Unix/Posix-specific functions for ByteStrings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -697267,7 +699754,7 @@ self: {
         zenhack-prelude
       ];
       description = "Straightforward bindings to the posix API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -697451,7 +699938,7 @@ self: {
         unliftio
       ];
       description = "Unleash feature toggle client";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "example";
     }
@@ -697499,7 +699986,7 @@ self: {
         text
       ];
       description = "Unleash feature toggle client core";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -697524,7 +700011,7 @@ self: {
         transformers-base
       ];
       description = "Typeclass for monads that can be unlifted to arbitrary base monads";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -697551,7 +700038,7 @@ self: {
         unliftio-core
       ];
       description = "(un)lifted classes and functions for the STM monad";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -697574,7 +700061,7 @@ self: {
         text-short
       ];
       description = "Unlifted and levity-polymorphic types";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -697782,7 +700269,7 @@ self: {
         unliftio
       ];
       description = "Fast and robust message queues for concurrent processes";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "unliftio-messagebox-memleak-test";
       broken = true;
@@ -697858,7 +700345,7 @@ self: {
         unliftio-core
       ];
       description = "Use MonadUnliftIO on servant APIs";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -697994,10 +700481,8 @@ self: {
     }:
     mkDerivation {
       pname = "unordered-containers";
-      version = "0.2.20";
-      sha256 = "07gij1y9zhqg2dq8wy815j7s0zk2k65sqg4wvhwjsn80ry3v5kyr";
-      revision = "4";
-      editedCabalFile = "08p4xp43mlqyl8ayh7k22p0q0kxlby9y071rpcr8jsf2lvfvqg13";
+      version = "0.2.20.1";
+      sha256 = "1as6abrhpdn34wm4fhsvkf43lw5g0rhli6hbnq4ix9kd7m8n12kh";
       libraryHaskellDepends = [
         base
         deepseq
@@ -698270,7 +700755,7 @@ self: {
         quickcheck-classes
       ];
       description = "maybes of numeric values with fewer indirections";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -698291,7 +700776,7 @@ self: {
         text-short
       ];
       description = "optional text that unpacks well";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -698507,7 +700992,7 @@ self: {
         ghc
       ];
       description = "Unsatisfiable type class";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -698711,7 +701196,7 @@ self: {
         bifunctors
       ];
       description = "Unzip functions for general Traversable containers";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -698778,7 +701263,7 @@ self: {
         split
       ];
       description = "Command-line tool to generate paths for moving upward in a file system";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "up";
     }
@@ -699888,7 +702373,7 @@ self: {
         uri-encode
       ];
       description = "Encoding and decoding of URL slugs";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -700680,7 +703165,7 @@ self: {
         gauge
       ];
       description = "UTF-8";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -700770,7 +703255,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Unicode";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -700938,7 +703423,7 @@ self: {
         logict
       ];
       description = "See README for more info";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -701092,7 +703577,7 @@ self: {
         QuickCheck
       ];
       description = "Various small helper functions for Lists, Maybes, Tuples, Functions";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -701116,7 +703601,7 @@ self: {
         proto-lens-runtime
       ];
       description = "Generated code for a gRPC interface for UTxO Blockchains";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -701194,7 +703679,7 @@ self: {
         uuid
       ];
       description = "An SDK for clients of the UTxO RPC specification";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -701275,7 +703760,7 @@ self: {
         warp-grpc
       ];
       description = "An SDK for UTxO RPC services";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "server-example";
     }
@@ -701499,7 +703984,7 @@ self: {
         text
       ];
       description = "utilities for parse errors";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -701522,8 +704007,8 @@ self: {
     }:
     mkDerivation {
       pname = "uuagc";
-      version = "0.9.56";
-      sha256 = "0m9svb17ppsfbmrkq94cr5fvdwaly056j4xmg69rrb16ar38mz3l";
+      version = "0.9.57";
+      sha256 = "1blwi40g3vzcqvn7xgal7gxs34r4h88ibwhbp73igabb4i1ibdh5";
       isLibrary = true;
       isExecutable = true;
       setupHaskellDepends = [
@@ -701551,7 +704036,6 @@ self: {
       ];
       description = "Attribute Grammar System of Universiteit Utrecht";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
       mainProgram = "uuagc";
     }
   ) { };
@@ -701619,8 +704103,8 @@ self: {
     }:
     mkDerivation {
       pname = "uuagc-cabal";
-      version = "1.3.1.0";
-      sha256 = "1xq7hxa8lk0b251vd3vqvyj7kz66qwn3hww49f14yx9rn4bz8vr9";
+      version = "1.4.0";
+      sha256 = "1rwfrfc5srj2pmk93swhn0abgxzbv00mf2nxbh4pl5370sw07akk";
       libraryHaskellDepends = [
         base
         Cabal
@@ -701633,8 +704117,6 @@ self: {
       ];
       description = "Cabal plugin for UUAGC";
       license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
     }
   ) { };
 
@@ -702005,7 +704487,7 @@ self: {
         text
       ];
       description = "Tweak .cabal files";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       maintainers = [ lib.maintainers.berberman ];
       broken = true;
@@ -702436,7 +704918,7 @@ self: {
         text
       ];
       description = "Runs commands on remote machines using ssh";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -702753,7 +705235,7 @@ self: {
         text
       ];
       description = "Lighweight pure data validation based on Applicative and Selective functors";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -703286,7 +705768,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       doHaddock = false;
       description = "Simple and powerful data validation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -703413,7 +705895,7 @@ self: {
         stm
       ];
       description = "The VarMonad typeclass, generalizing types of references";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -703454,6 +705936,19 @@ self: {
     }
   ) { };
 
+  varargs = callPackage (
+    { mkDerivation, base }:
+    mkDerivation {
+      pname = "varargs";
+      version = "0.1.0.1";
+      sha256 = "1yxcj287m5jgg80qazw1mlik78vm61jybam7v3pljf9i7a2p2z5m";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [ base ];
+      description = "Utilities for working with variadic functions using type-level lists";
+      license = lib.licensesSpdx."BSD-3-Clause";
+    }
+  ) { };
+
   variable-media-field = callPackage (
     {
       mkDerivation,
@@ -703682,7 +706177,7 @@ self: {
         QuickCheck
       ];
       description = "Variant and EADT";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -703741,7 +706236,7 @@ self: {
         QuickCheck
       ];
       description = "integer arithmetic codes";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -704341,7 +706836,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Library for handling files ignored by VCS systems";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "ignore";
     }
   ) { };
@@ -704543,7 +707038,7 @@ self: {
         vector
       ];
       description = "Vec: length-indexed (sized) list";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -704568,7 +707063,7 @@ self: {
         vec
       ];
       description = "Vec: length-indexed (sized) list: lens support";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -704593,7 +707088,7 @@ self: {
         vec
       ];
       description = "Vec: length-indexed (sized) list: optics support";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -704739,7 +707234,7 @@ self: {
       ];
       doHaddock = false;
       description = "Efficient Arrays";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -704843,7 +707338,7 @@ self: {
         vector
       ];
       description = "Instances of Data.Binary for vector";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -705003,7 +707498,7 @@ self: {
         hedgehog-classes
       ];
       description = "circular vectors";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -705136,7 +707631,7 @@ self: {
       ];
       doHaddock = false;
       description = "Storable vectors with cpu-independent representation";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -705157,7 +707652,7 @@ self: {
         vector
       ];
       description = "Utilities for the \"vector\" library";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -705468,7 +707963,7 @@ self: {
       ];
       doHaddock = false;
       description = "Fast and flexible quicksort implementation for mutable vectors";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -705603,7 +708098,7 @@ self: {
         vector
       ];
       description = "Size tagged vectors";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -705935,7 +708430,7 @@ self: {
         vector
       ];
       description = "GIS Vector Tiles, as defined by Mapbox";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -706080,7 +708575,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "ASCII platform-adventure game";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "venzone";
     }
@@ -706229,10 +708724,8 @@ self: {
     }:
     mkDerivation {
       pname = "verifiable-expressions";
-      version = "0.6.2";
-      sha256 = "1nrlcbimng6qf4g7h4hxg3j05kd0hlihkhp8hj5js44n29vg89qk";
-      revision = "1";
-      editedCabalFile = "15h6zdzqvfkh480y5yp1sfjw79pkc6iv5b8mz785p3bgrspdlvn9";
+      version = "0.6.3";
+      sha256 = "101k93m4q32gvsywfahsjm5asakwa0pkliddk6pd21yffgr20329";
       libraryHaskellDepends = [
         base
         containers
@@ -706472,7 +708965,7 @@ self: {
         uuid
       ];
       description = "Small alternative prelude";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -706632,7 +709125,7 @@ self: {
         text
       ];
       description = "Types and parsers for software version numbers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -706666,7 +709159,7 @@ self: {
         tasty-hunit
       ];
       description = "Vertex enumeration";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -706773,7 +709266,7 @@ self: {
       ];
       doHaddock = false;
       description = "Array library monomorphized with backpack";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -706819,7 +709312,7 @@ self: {
         text
       ];
       description = "types for ingesting vflow data with aeson";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -707562,7 +710055,7 @@ self: {
         yaml
       ];
       description = "Frontend for video metadata tagging tools";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "vimeta";
     }
@@ -707905,7 +710398,7 @@ self: {
         vinyl
       ];
       description = "Syntax sugar for vinyl records using overloaded labels";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -708331,7 +710824,7 @@ self: {
         profunctors
       ];
       description = "Profunctor optics via the profunctor representation theorem";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -709175,6 +711668,8 @@ self: {
       pname = "vty";
       version = "6.4";
       sha256 = "0iha15inmig2j2f4kljwb2jhbqa8vsh2aa8l7y5fsanjiciscrbi";
+      revision = "2";
+      editedCabalFile = "1dcnkfghflgn3qv72pdpa6npfdrrjqhil3wnxd75rbd4mf7812hf";
       libraryHaskellDepends = [
         base
         binary
@@ -709197,6 +711692,52 @@ self: {
     }
   ) { };
 
+  vty_6_5 = callPackage (
+    {
+      mkDerivation,
+      base,
+      binary,
+      blaze-builder,
+      bytestring,
+      deepseq,
+      directory,
+      filepath,
+      microlens,
+      microlens-mtl,
+      mtl,
+      parsec,
+      stm,
+      text,
+      utf8-string,
+      vector,
+    }:
+    mkDerivation {
+      pname = "vty";
+      version = "6.5";
+      sha256 = "03cla811zc1lhgclrd294brp4zkjs8sb0szxmndfckqzv9vmqyd8";
+      libraryHaskellDepends = [
+        base
+        binary
+        blaze-builder
+        bytestring
+        deepseq
+        directory
+        filepath
+        microlens
+        microlens-mtl
+        mtl
+        parsec
+        stm
+        text
+        utf8-string
+        vector
+      ];
+      description = "A simple terminal UI library";
+      license = lib.licenses.bsd3;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   vty-crossplatform = callPackage (
     {
       mkDerivation,
@@ -709216,7 +711757,7 @@ self: {
         vty-unix
       ];
       description = "Cross-platform support for Vty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -709438,7 +711979,7 @@ self: {
         vty
       ];
       description = "Unix backend for Vty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "vty-unix-build-width-table";
     }
   ) { };
@@ -709490,7 +712031,7 @@ self: {
         Win32
       ];
       description = "Windows backend for Vty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.windows;
     }
   ) { };
@@ -709542,7 +712083,7 @@ self: {
         Win32
       ];
       description = "Windows backend for Vty";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.windows;
       hydraPlatforms = lib.platforms.none;
     }
@@ -709584,7 +712125,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Bindings to the Vulkan graphics API";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = [
         "i686-linux"
         "armv7l-linux"
@@ -710377,53 +712918,92 @@ self: {
       mkDerivation,
       aeson,
       base,
-      binary,
       bytestring,
+      case-insensitive,
       cookie,
       crypton,
       directory,
       filepath,
       http-types,
       memory,
-      random,
-      stm,
       text,
       time,
       wai,
+      wai-csrf,
+      wai-extra,
+    }:
+    mkDerivation {
+      pname = "wai-cryptocookie";
+      version = "0.3";
+      sha256 = "1g2i1fjdpca0zq7pib6szh8zadrqb93sw1bqi12il5fhd805swh9";
+      libraryHaskellDepends = [
+        aeson
+        base
+        bytestring
+        case-insensitive
+        cookie
+        crypton
+        http-types
+        memory
+        text
+        time
+        wai
+        wai-csrf
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        cookie
+        directory
+        filepath
+        http-types
+        wai
+        wai-extra
+      ];
+      description = "Encrypted cookies for WAI";
+      license = lib.licensesSpdx."Apache-2.0";
+    }
+  ) { };
+
+  wai-csrf = callPackage (
+    {
+      mkDerivation,
+      base,
+      bytestring,
+      case-insensitive,
+      cookie,
+      crypton,
+      http-types,
+      memory,
+      time,
+      wai,
       wai-extra,
     }:
     mkDerivation {
-      pname = "wai-cryptocookie";
-      version = "0.2";
-      sha256 = "1y97641w1ms0hzzw34v67h60hy4mjwnanvb8511qp033rpyqqh53";
+      pname = "wai-csrf";
+      version = "0.1";
+      sha256 = "0i6bwp6libbbv1q0gcrn5cgk66v4ll84gsycxcw18r3nmh3qdawa";
       libraryHaskellDepends = [
-        aeson
         base
-        binary
         bytestring
+        case-insensitive
         cookie
         crypton
         http-types
         memory
-        stm
-        text
         time
         wai
       ];
       testHaskellDepends = [
-        aeson
         base
-        binary
-        directory
-        filepath
+        bytestring
+        cookie
         http-types
-        random
-        stm
         wai
         wai-extra
       ];
-      description = "Encrypted cookies for WAI";
-      license = lib.licenses.asl20;
+      description = "Cross-site request forgery protection for WAI";
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -711048,7 +713628,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Wrap WAI applications to run on AWS Lambda";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -712478,7 +715058,7 @@ self: {
         warp-tls
       ];
       description = "WAI middleware that delegates handling of requests";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -713440,7 +716020,7 @@ self: {
         wai
       ];
       description = "Problem details middleware for WAI";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -713516,7 +716096,7 @@ self: {
         warp
       ];
       description = "See README for more info";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -714078,7 +716658,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "WAI middleware to automatically encrypt and sign cookies";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "waicookie-genkey";
       broken = true;
@@ -714603,7 +717183,7 @@ self: {
         criterion
       ];
       description = "A request rate limiting middleware using token buckets";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
     }
   ) { };
 
@@ -715098,6 +717678,44 @@ self: {
     }
   ) { };
 
+  warlock = callPackage (
+    {
+      mkDerivation,
+      barbies,
+      base,
+      containers,
+      hspec,
+      hspec-discover,
+      template-haskell,
+      text,
+      witch,
+    }:
+    mkDerivation {
+      pname = "warlock";
+      version = "0.1.0.1";
+      sha256 = "169g7bdcgn0dxqgyxi6p9j486i3f6da4h92qjvz45n1p27i9vykh";
+      libraryHaskellDepends = [
+        barbies
+        base
+        template-haskell
+        witch
+      ];
+      testHaskellDepends = [
+        barbies
+        base
+        containers
+        hspec
+        hspec-discover
+        template-haskell
+        text
+        witch
+      ];
+      testToolDepends = [ hspec-discover ];
+      description = "Automatic type-safe conversion between Haskell data types using Template Haskell";
+      license = lib.licensesSpdx."BSD-3-Clause";
+    }
+  ) { };
+
   warp = callPackage (
     {
       mkDerivation,
@@ -715411,7 +718029,7 @@ self: {
         warp
       ];
       description = "Socket activation and other systemd integration for the Warp web server (WAI)";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "warp-systemd-example";
       maintainers = [ lib.maintainers.mpscholten ];
     }
@@ -715450,6 +718068,41 @@ self: {
     }
   ) { };
 
+  warp-tls-simple = callPackage (
+    {
+      mkDerivation,
+      base,
+      directory,
+      filepath,
+      optparse-applicative,
+      process,
+      wai,
+      warp,
+      warp-tls,
+      which,
+    }:
+    mkDerivation {
+      pname = "warp-tls-simple";
+      version = "0.1.1.0";
+      sha256 = "1xrzkhcc1qdgccf5dncchv81ms944sz9yi9kz0badw8wjrz6kg4p";
+      libraryHaskellDepends = [
+        base
+        directory
+        filepath
+        optparse-applicative
+        process
+        wai
+        warp
+        warp-tls
+        which
+      ];
+      description = "Simple TLS configuration for Warp";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+      broken = true;
+    }
+  ) { };
+
   warp-tls-uid = callPackage (
     {
       mkDerivation,
@@ -715601,7 +718254,7 @@ self: {
         text
       ];
       description = "WebAssembly Language Toolkit and Interpreter";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -715910,7 +718563,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Work with WAVE and RF64 files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -716094,7 +718747,7 @@ self: {
         process
       ];
       description = "Run a command on a specified directory";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "wd";
     }
   ) { };
@@ -716220,7 +718873,7 @@ self: {
         xml
       ];
       description = "Weather and related data info command-line tool";
-      license = lib.licenses.gpl3Plus;
+      license = lib.licensesSpdx."GPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "weatherhs";
     }
@@ -716250,7 +718903,7 @@ self: {
       ];
       doHaddock = false;
       description = "Compositional breadth-first walks";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -716270,7 +718923,7 @@ self: {
         some
       ];
       description = "Core definitions for weave";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -716331,7 +718984,7 @@ self: {
         time
       ];
       description = "Parsing/printing of persistent web cookies";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -716747,7 +719400,7 @@ self: {
         doctest-parallel
       ];
       description = "representations of a web page";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "web-rep-example";
     }
   ) { };
@@ -717149,7 +719802,7 @@ self: {
         text
       ];
       description = "Type-safe HTML and CSS";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -717200,7 +719853,7 @@ self: {
         text
       ];
       description = "Type-safe HTML and CSS with intuitive layouts and composable styles";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -717237,7 +719890,7 @@ self: {
         web-view
       ];
       description = "Build HTML tables using web-view and colonnade";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -717964,7 +720617,7 @@ self: {
         validation
       ];
       description = "Relying party (server) implementation of the WebAuthn 2 specification";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -718036,7 +720689,7 @@ self: {
         wai
       ];
       description = "A super-simple web server framework";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -718074,6 +720727,28 @@ self: {
     }
   ) { };
 
+  webcolor-labels = callPackage (
+    {
+      mkDerivation,
+      base,
+      tasty,
+      tasty-hunit,
+    }:
+    mkDerivation {
+      pname = "webcolor-labels";
+      version = "0.1.0.0";
+      sha256 = "0s4l8w1fba2fk3ym112j2d9x6z86qhkfbcb75kjvwl0qndr69y32";
+      libraryHaskellDepends = [ base ];
+      testHaskellDepends = [
+        base
+        tasty
+        tasty-hunit
+      ];
+      description = "Plug-n-play #hex-syntax for your colors";
+      license = lib.licensesSpdx."MPL-2.0";
+    }
+  ) { };
+
   webcrank = callPackage (
     {
       mkDerivation,
@@ -718284,7 +720959,7 @@ self: {
     }
   ) { };
 
-  webdriver_0_13_0_0 = callPackage (
+  webdriver_0_14_0_0 = callPackage (
     {
       mkDerivation,
       aeson,
@@ -718326,8 +721001,10 @@ self: {
     }:
     mkDerivation {
       pname = "webdriver";
-      version = "0.13.0.0";
-      sha256 = "192dm2bwhdfrmfkimblm43gvh3vnnk6p68kw5cfpar00mli08mbi";
+      version = "0.14.0.0";
+      sha256 = "0sqphl21ma7n6fk40wyh8b79xrz1aznpnpmgds6277ini1lvn3q8";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         aeson
         attoparsec
@@ -718343,6 +721020,7 @@ self: {
         http-types
         microlens-th
         monad-logger
+        mtl
         network
         network-uri
         random
@@ -718359,6 +721037,20 @@ self: {
         websockets
         zip-archive
       ];
+      executableHaskellDepends = [
+        aeson
+        base
+        bytestring
+        exceptions
+        http-client
+        http-types
+        monad-logger
+        mtl
+        string-interpolate
+        text
+        unliftio
+        unliftio-core
+      ];
       testHaskellDepends = [
         aeson
         base
@@ -718389,6 +721081,7 @@ self: {
       description = "a Haskell client for the Selenium WebDriver protocol";
       license = lib.licenses.bsd3;
       hydraPlatforms = lib.platforms.none;
+      mainProgram = "demo";
     }
   ) { };
 
@@ -718486,7 +721179,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "A typed wrapper for W3C WebDriver protocol. A base for other libraries.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -718735,7 +721428,7 @@ self: {
         zlib
       ];
       description = "Wrapper around the webdriver package that automatically manages Selenium";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -719031,7 +721724,7 @@ self: {
         wai-extra
       ];
       description = "Composable, type-safe library to build HTTP APIs";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -719080,7 +721773,7 @@ self: {
         wai-extra
       ];
       description = "Composable, type-safe library to build HTTP APIs";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -719116,7 +721809,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -719151,7 +721844,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -719224,7 +721917,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -719296,7 +721989,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -719330,7 +722023,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -719363,7 +722056,7 @@ self: {
         webgear-core
       ];
       description = "Composable, type-safe library to build HTTP API servers";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -719393,7 +722086,7 @@ self: {
         webgear-core
       ];
       description = "Host swagger UI based on WebGear API specifications";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
     }
   ) { };
 
@@ -719422,7 +722115,7 @@ self: {
         webgear-core
       ];
       description = "Host swagger UI based on WebGear API specifications";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -719595,7 +722288,7 @@ self: {
       base,
       Cabal,
       gtk2hs-buildtools,
-      webkitgtk_4_0,
+      webkit2gtk,
     }:
     mkDerivation {
       pname = "webkit2gtk3-javascriptcore";
@@ -719607,13 +722300,13 @@ self: {
         gtk2hs-buildtools
       ];
       libraryHaskellDepends = [ base ];
-      libraryPkgconfigDepends = [ webkitgtk_4_0 ];
+      libraryPkgconfigDepends = [ webkit2gtk ];
       description = "JavaScriptCore FFI from webkitgtk";
       license = lib.licenses.bsd3;
       badPlatforms = lib.platforms.darwin;
       hydraPlatforms = lib.platforms.none;
     }
-  ) { inherit (pkgs) webkitgtk_4_0; };
+  ) { webkit2gtk = null; };
 
   webkitgtk3 = callPackage (
     {
@@ -720356,126 +723049,6 @@ self: {
     }
   ) { };
 
-  weeder_2_3_1 = callPackage (
-    {
-      mkDerivation,
-      algebraic-graphs,
-      base,
-      bytestring,
-      containers,
-      dhall,
-      directory,
-      filepath,
-      generic-lens,
-      ghc,
-      lens,
-      mtl,
-      optparse-applicative,
-      regex-tdfa,
-      text,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "weeder";
-      version = "2.3.1";
-      sha256 = "16hgfhchmnp32wvcx9r464azycvdq1gsjmnjmnw995y9cp27ayy1";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        algebraic-graphs
-        base
-        bytestring
-        containers
-        dhall
-        directory
-        filepath
-        generic-lens
-        ghc
-        lens
-        mtl
-        optparse-applicative
-        regex-tdfa
-        text
-        transformers
-      ];
-      executableHaskellDepends = [
-        base
-        bytestring
-        containers
-        directory
-        filepath
-        ghc
-        optparse-applicative
-        transformers
-      ];
-      description = "Detect dead code";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "weeder";
-      maintainers = [ lib.maintainers.maralorn ];
-    }
-  ) { };
-
-  weeder_2_4_1 = callPackage (
-    {
-      mkDerivation,
-      algebraic-graphs,
-      base,
-      bytestring,
-      containers,
-      dhall,
-      directory,
-      filepath,
-      generic-lens,
-      ghc,
-      lens,
-      mtl,
-      optparse-applicative,
-      regex-tdfa,
-      text,
-      transformers,
-    }:
-    mkDerivation {
-      pname = "weeder";
-      version = "2.4.1";
-      sha256 = "1z17w8q0s1pgqrxx7f1zijy1j4fwl8x2f5r9y11i0vcsqlx12pi9";
-      isLibrary = true;
-      isExecutable = true;
-      libraryHaskellDepends = [
-        algebraic-graphs
-        base
-        bytestring
-        containers
-        dhall
-        directory
-        filepath
-        generic-lens
-        ghc
-        lens
-        mtl
-        optparse-applicative
-        regex-tdfa
-        text
-        transformers
-      ];
-      executableHaskellDepends = [
-        base
-        bytestring
-        containers
-        directory
-        filepath
-        ghc
-        optparse-applicative
-        transformers
-      ];
-      description = "Detect dead code";
-      license = lib.licenses.bsd3;
-      hydraPlatforms = lib.platforms.none;
-      mainProgram = "weeder";
-      maintainers = [ lib.maintainers.maralorn ];
-    }
-  ) { };
-
   weeder = callPackage (
     {
       mkDerivation,
@@ -720551,7 +723124,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Detect dead code";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "weeder";
       maintainers = [ lib.maintainers.maralorn ];
     }
@@ -721056,7 +723629,7 @@ self: {
       ];
       doHaddock = false;
       description = "WGPU";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -721082,7 +723655,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ SDL2 ];
       description = "WGPU Raw";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -721241,7 +723814,7 @@ self: {
         versions
       ];
       description = "Solver-agnostic symbolic values support for issuing queries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "quickstart";
     }
   ) { };
@@ -721409,7 +723982,7 @@ self: {
         versions
       ];
       description = "Solver-agnostic symbolic values support for issuing queries";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -721516,7 +724089,7 @@ self: {
         tasty-hunit
       ];
       description = "A compatibility layer for GHC's 'wherefrom' function";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -721544,7 +724117,7 @@ self: {
         tasty-hunit
       ];
       description = "A compatibility layer for GHC's 'wherefrom' function";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -721814,6 +724387,8 @@ self: {
       pname = "wide-word";
       version = "0.1.8.1";
       sha256 = "0jisg5y3rxcqwd3kgdvcmz5awwcgzdhdkl768llhh388kp64mjcy";
+      revision = "1";
+      editedCabalFile = "164049ll7rxddxsw5ly8jcbhfmb7gywwrspw63cfwng20hsfqc0y";
       libraryHaskellDepends = [
         base
         binary
@@ -721854,7 +724429,7 @@ self: {
         wide-word
       ];
       description = "Instances for wide-word";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -722382,8 +724957,8 @@ self: {
     }:
     mkDerivation {
       pname = "wild-bind";
-      version = "0.1.2.12";
-      sha256 = "1bjm2vxa6xg7j6wl28rg8djxabpjss22z1w1ymlm2lw5fb148frn";
+      version = "0.1.2.13";
+      sha256 = "03r1a233d6vq6z5pd6lsxf738kna4r369301xr5blyjnj46h0dp1";
       libraryHaskellDepends = [
         base
         containers
@@ -722571,7 +725146,7 @@ self: {
         unordered-containers
       ];
       description = "An implementation of the web Document Object Model, and its rendering";
-      license = lib.licenses.mpl20;
+      license = lib.licensesSpdx."MPL-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -722680,7 +725255,7 @@ self: {
         X11
       ];
       description = "OS window icon/name utilities";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -722874,6 +725449,8 @@ self: {
           ];
           description = "I/O library for Windows";
           license = lib.licenses.bsd3;
+          hydraPlatforms = lib.platforms.none;
+          broken = true;
         }
       )
       {
@@ -723100,7 +725677,7 @@ self: {
         transformers
       ];
       description = "Convert values from one type into another";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       maintainers = [ lib.maintainers.maralorn ];
     }
   ) { };
@@ -723280,7 +725857,7 @@ self: {
         vector
       ];
       description = "filterable traversable";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -723299,7 +725876,7 @@ self: {
         witherable
       ];
       description = "Witherable = Traversable + Filterable";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -723353,7 +725930,7 @@ self: {
         countable
       ];
       description = "values that witness types";
-      license = lib.licenses.bsd2;
+      license = lib.licensesSpdx."BSD-2-Clause";
     }
   ) { };
 
@@ -723562,7 +726139,7 @@ self: {
         text
       ];
       description = "A library for working with .wkt files.";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -723850,7 +726427,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Convenient interface for interacting with WLED devices";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -723967,7 +726544,7 @@ self: {
       sha256 = "0f0pa2vlp56j35llhzq1qqkwkfpm7r96av8jw22jngd0kcpc185b";
       libraryHaskellDepends = [ base ];
       description = "Convenient typeclass for defining arbitrary-index enums";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -724198,7 +726775,7 @@ self: {
         weigh
       ];
       description = "treat integral types as arrays of smaller integral types";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -724218,7 +726795,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Compatibility shim for the Int/Word internal change in GHC 9.2";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -724245,7 +726822,7 @@ self: {
         typed-process
       ];
       description = "SoX for algorithmic composition with groups of notes liken to words";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -724257,7 +726834,7 @@ self: {
       sha256 = "0kpw4gmy4yvpmcvz1sk0nfr21f7zvv3fnd2k59zx1amx8n4c5s7n";
       libraryHaskellDepends = [ base ];
       description = "General datatypes for music creation for one instrument";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -724551,7 +727128,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Word8 set";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -724786,7 +727363,7 @@ self: {
         vector
       ];
       description = "Command-line tool to get random words";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "wordlist";
       broken = true;
@@ -725365,7 +727942,7 @@ self: {
         transformers
       ];
       description = "LOGO-like Turtle graphics with a monadic interface";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -725509,7 +728086,7 @@ self: {
         xml-basic
       ];
       description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
     }
   ) { };
 
@@ -725857,7 +728434,7 @@ self: {
         vector
       ];
       description = "An easy-to-use HTTP client library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -725883,7 +728460,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Adaptation of the wreq library for the effectful ecosystem";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -726966,7 +729543,7 @@ self: {
         yaml
       ];
       description = "Unimportant Unix adminstration tool";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "pao";
     }
@@ -727164,7 +729741,7 @@ self: {
         websockets
       ];
       description = "Secure WebSocket (WSS) clients";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -727780,7 +730357,7 @@ self: {
         pem
       ];
       description = "Basic X509 OCSP implementation";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -728116,8 +730693,8 @@ self: {
     }:
     mkDerivation {
       pname = "xcffib";
-      version = "1.10.0";
-      sha256 = "1pz36rx9shsq16amni0d9xzwvvzhbf2ysm8xzgvgx9irmz4imxv0";
+      version = "1.11.2";
+      sha256 = "0lg9x33ifkr166qkdq7w37dhngb6y1nd987sa6dg4pr3dkg9hrm9";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -728157,7 +730734,7 @@ self: {
         xcb-types
       ];
       description = "A cffi-based python binding for X";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "xcffibgen";
       broken = true;
@@ -728189,7 +730766,7 @@ self: {
         temporary
       ];
       description = "Cabal hooks for producing an XCFramework from a Haskell library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -728444,7 +731021,7 @@ self: {
         unix
       ];
       description = "Parse files conforming to the xdg desktop entry spec";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -729425,6 +732002,128 @@ self: {
     }
   ) { };
 
+  xlsx_1_2_0 = callPackage (
+    {
+      mkDerivation,
+      attoparsec,
+      base,
+      base64-bytestring,
+      binary-search,
+      bytestring,
+      conduit,
+      containers,
+      criterion,
+      data-default,
+      deepseq,
+      Diff,
+      directory,
+      dlist,
+      errors,
+      exceptions,
+      extra,
+      filepath,
+      groom,
+      hexpat,
+      lens,
+      monad-control,
+      mtl,
+      network-uri,
+      old-locale,
+      raw-strings-qq,
+      safe,
+      smallcheck,
+      tasty,
+      tasty-hunit,
+      tasty-smallcheck,
+      text,
+      time,
+      transformers,
+      transformers-base,
+      vector,
+      xeno,
+      xml-conduit,
+      xml-types,
+      zip,
+      zip-archive,
+      zip-stream,
+      zlib,
+    }:
+    mkDerivation {
+      pname = "xlsx";
+      version = "1.2.0";
+      sha256 = "0sd9y6xqd17qxlf5hgaws39xfzhaxxj4yxbnh296lfk2pampyrvl";
+      libraryHaskellDepends = [
+        attoparsec
+        base
+        base64-bytestring
+        binary-search
+        bytestring
+        conduit
+        containers
+        data-default
+        deepseq
+        dlist
+        errors
+        exceptions
+        extra
+        filepath
+        hexpat
+        lens
+        monad-control
+        mtl
+        network-uri
+        old-locale
+        safe
+        text
+        time
+        transformers
+        transformers-base
+        vector
+        xeno
+        xml-conduit
+        xml-types
+        zip
+        zip-archive
+        zip-stream
+        zlib
+      ];
+      testHaskellDepends = [
+        base
+        bytestring
+        conduit
+        containers
+        deepseq
+        Diff
+        directory
+        filepath
+        groom
+        lens
+        mtl
+        raw-strings-qq
+        smallcheck
+        tasty
+        tasty-hunit
+        tasty-smallcheck
+        text
+        time
+        vector
+        xml-conduit
+        zip
+      ];
+      benchmarkHaskellDepends = [
+        base
+        bytestring
+        conduit
+        criterion
+        deepseq
+        lens
+      ];
+      description = "Simple and incomplete Excel file parser/writer";
+      license = lib.licenses.mit;
+      hydraPlatforms = lib.platforms.none;
+    }
+  ) { };
+
   xlsx-tabular = callPackage (
     {
       mkDerivation,
@@ -729547,7 +732246,7 @@ self: {
         utility-ht
       ];
       description = "Basics for XML/HTML representation and processing";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       maintainers = [ lib.maintainers.thielema ];
     }
   ) { };
@@ -729864,8 +732563,8 @@ self: {
     }:
     mkDerivation {
       pname = "xml-conduit-writer";
-      version = "0.1.1.5";
-      sha256 = "1ma25a6kknrhm8n3ldj5bq203dmg52nshhmvi7zf3lz56psjf1f1";
+      version = "0.1.1.6";
+      sha256 = "16zkfivpljkmn5qyyrx1q4wb2p4b9m8f61nl3l3qkngdqb9y9qgy";
       libraryHaskellDepends = [
         base
         containers
@@ -729881,9 +732580,7 @@ self: {
         text
       ];
       description = "Warm and fuzzy creation of XML documents";
-      license = lib.licenses.mit;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -730277,7 +732974,7 @@ self: {
         xml-conduit
       ];
       description = "Lenses, traversals, and prisms for xml-conduit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -730328,7 +733025,7 @@ self: {
         xml-conduit
       ];
       description = "Optics for xml-conduit";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -730399,7 +733096,7 @@ self: {
         xml-conduit
       ];
       description = "XML parser with informative error-reporting and simple API";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -730544,7 +733241,7 @@ self: {
         protolude
       ];
       description = "XML pretty printer";
-      license = lib.licenses.gpl2Only;
+      license = lib.licensesSpdx."GPL-2.0-only";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "xml-prettify";
       broken = true;
@@ -730748,7 +733445,7 @@ self: {
         tasty-hunit
       ];
       description = "Parse XML from bytes";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -730962,7 +733659,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Utilities for dealing with Content-values of \"xml-types\"";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -730995,7 +733692,7 @@ self: {
       ];
       libraryPkgconfigDepends = [ xmlsec1 ];
       description = "Verifying XML signatures";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -731372,7 +734069,7 @@ self: {
         unordered-containers
       ];
       description = "XML parser and renderer with HTML 5 quirks mode";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -732313,10 +735010,12 @@ self: {
     }:
     mkDerivation {
       pname = "xnobar";
-      version = "0.0.0.1";
-      sha256 = "15j9drn1igv5s1z7p5v71vy2i2a2f4gsaz5z6my1vkm097rbz51z";
-      revision = "3";
-      editedCabalFile = "122chc3px07ij5kk69bsbzrppkxxqd29cxma9zp48pjjakibwp3n";
+      version = "0.0.0.2";
+      sha256 = "1cs9kp2h07dx39rzykmylv5fvmdyynwmyj7mlxy6n95bawz4z1f4";
+      revision = "1";
+      editedCabalFile = "1b34ifw8rnb19gjgksljxcxb54y0qskjwwka5ly8bq84ll756v6n";
+      isLibrary = true;
+      isExecutable = true;
       libraryHaskellDepends = [
         async
         base
@@ -732330,6 +735029,10 @@ self: {
         transformers
         xmobar
       ];
+      executableHaskellDepends = [
+        base
+        xmobar
+      ];
       testHaskellDepends = [
         base
         extra
@@ -732337,10 +735040,9 @@ self: {
       ];
       doHaddock = false;
       description = "Text-based notification server for XMobar";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       badPlatforms = lib.platforms.darwin;
-      hydraPlatforms = lib.platforms.none;
-      broken = true;
+      mainProgram = "Echo";
     }
   ) { };
 
@@ -732383,7 +735085,7 @@ self: {
         ghc-byteorder
       ];
       description = "Efficient XOR masking";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -732445,7 +735147,7 @@ self: {
         Xorshift128Plus
       ];
       description = "Simple implementation of xorshift+ PRNG";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -733101,7 +735803,7 @@ self: {
         hedgehog
       ];
       description = "XTEA (eXtended Tiny Encryption Algorithm)";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -733252,7 +735954,7 @@ self: {
         tasty-bench
       ];
       description = "Bindings and high-level helpers for xxHash";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { inherit (pkgs) xxHash; };
 
@@ -733289,7 +735991,7 @@ self: {
         tasty-quickcheck
       ];
       description = "LZMA/XZ compression and decompression";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -733303,7 +736005,7 @@ self: {
       sha256 = "0cycldc04ffkm5kvhb9x9mjgcw9vhzlbh34idpapv9bin9b594ic";
       doHaddock = false;
       description = "LZMA/XZ clibs";
-      license = lib.licenses.bsd0;
+      license = lib.licensesSpdx."0BSD";
     }
   ) { };
 
@@ -734900,7 +737602,7 @@ self: {
         versions
       ];
       description = "Support for parsing and rendering YAML documents";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -735037,7 +737739,7 @@ self: {
         tasty-hunit
       ];
       description = "Flexible declarative YAML parsing toolkit";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -735175,8 +737877,8 @@ self: {
     }:
     mkDerivation {
       pname = "yamlscript";
-      version = "0.2.3.0";
-      sha256 = "09ccfdmhpi0ycsmrxnjcr4rgz4b13sgw76ys6979syfqjqmznr5b";
+      version = "0.2.7.0";
+      sha256 = "1j5m98abj23rakhcq3v1gy4j58aq3z0mn5zvw531p26x6fsqgbkv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@@ -735203,7 +737905,7 @@ self: {
         vector
       ];
       description = "Haskell bindings for YAMLScript";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "yamlscript-test";
       broken = true;
@@ -735641,7 +738343,7 @@ self: {
         deepseq
       ];
       description = "Yet another records libraries";
-      license = lib.licenses.isc;
+      license = lib.licensesSpdx."ISC";
     }
   ) { };
 
@@ -735907,7 +738609,7 @@ self: {
       ];
       testToolDepends = [ tasty-discover ];
       description = "Yet another string interpolator";
-      license = lib.licenses.cc0;
+      license = lib.licensesSpdx."CC0-1.0";
     }
   ) { };
 
@@ -736039,7 +738741,7 @@ self: {
         doctest
       ];
       description = "Total recursion schemes";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -736073,7 +738775,7 @@ self: {
         doctest
       ];
       description = "Pattern functors and instances for types in the containers package";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -736112,7 +738814,7 @@ self: {
         yaya
       ];
       description = "Hedgehog testing support for the Yaya recursion scheme library";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -736146,7 +738848,7 @@ self: {
         doctest
       ];
       description = "QuickCheck testing support for the Yaya recursion scheme library";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -736174,7 +738876,7 @@ self: {
         yaya-hedgehog
       ];
       description = "Test suites for `yaya`";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -736218,7 +738920,7 @@ self: {
         yaya-hedgehog
       ];
       description = "Non-total extensions to the Yaya recursion scheme library";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       maintainers = [ lib.maintainers.sellout ];
     }
   ) { };
@@ -736246,7 +738948,7 @@ self: {
         yaya-unsafe
       ];
       description = "Test suites for `yaya-unsafe`";
-      license = lib.licenses.agpl3Plus;
+      license = lib.licensesSpdx."AGPL-3.0-or-later";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -737904,7 +740606,7 @@ self: {
         yesod-form
       ];
       description = "A yesod-auth plugin for multi-tenant SSO via OpenID Connect";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -738072,7 +740774,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Traditional email/pass auth for Yesod";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       platforms = lib.platforms.x86;
       hydraPlatforms = lib.platforms.none;
       mainProgram = "yesod-auth-simple-test";
@@ -738342,7 +741044,7 @@ self: {
         yesod-elements
       ];
       description = "Helper functions for using yesod with colonnade";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -741633,7 +744335,7 @@ self: {
         yesod-static
       ];
       description = "A streamly-based library providing performance-focused alternatives for functionality found in yesod-static";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -742281,7 +744983,7 @@ self: {
         void
       ];
       description = "Yet Another Logger";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       mainProgram = "example";
     }
   ) { };
@@ -743560,7 +746262,7 @@ self: {
         yaml
       ];
       testToolDepends = [ hspec-discover ];
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       mainProgram = "yiyd";
     }
   ) { };
@@ -743591,7 +746293,7 @@ self: {
         template-haskell
       ];
       description = "try hackage";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "yj-sandbox-exe";
     }
   ) { };
@@ -743790,7 +746492,7 @@ self: {
       ];
       testToolDepends = [ hspec-discover ];
       description = "Bindings to Facebook's Yoga layout library";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -743901,7 +746603,7 @@ self: {
         text
       ];
       description = "Yosys RTL Intermediate Language";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -744060,7 +746762,7 @@ self: {
         yaml
       ];
       description = "Builds a static website from templates and data in YAML or CSV files";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
       mainProgram = "yst";
     }
   ) { };
@@ -745027,7 +747729,7 @@ self: {
       editedCabalFile = "0sj45k2v33x3312yz1bdbck2bcv5q64mh7v7xy35ghp72ynw1z8z";
       libraryHaskellDepends = [ base ];
       description = "@zenhack's personal custom prelude";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
     }
   ) { };
 
@@ -745132,7 +747834,7 @@ self: {
       ];
       doHaddock = false;
       description = "Zeolite is a statically-typed, general-purpose programming language";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -745777,7 +748479,7 @@ self: {
       ];
       testHaskellDepends = [ base ];
       description = "Command-line utility for working with zettelkast files";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "zettelkast";
       broken = true;
@@ -745817,7 +748519,7 @@ self: {
         tasty-hedgehog
       ];
       description = "Polysemy effects for testing";
-      license = "BSD-2-Clause-Patent";
+      license = lib.licensesSpdx."BSD-2-Clause-Patent";
     }
   ) { };
 
@@ -746141,7 +748843,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Zigzag encoding of integers into unsigned integers";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -746232,7 +748934,7 @@ self: {
         tasty-quickcheck
       ];
       description = "Typed templates with jinja like syntax";
-      license = lib.licenses.gpl2Plus;
+      license = lib.licensesSpdx."GPL-2.0-or-later";
     }
   ) { };
 
@@ -746348,7 +749050,7 @@ self: {
         time
       ];
       description = "Operations on zip archives";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       mainProgram = "haskell-zip-app";
       maintainers = [ lib.maintainers.mpscholten ];
     }
@@ -746936,7 +749638,7 @@ self: {
         tasty-quickcheck
       ];
       description = "zlib compression bindings";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
     }
   ) { };
 
@@ -746948,7 +749650,7 @@ self: {
       sha256 = "153aldw8vqy6wzz7knbzyfkxsr3gsv5hjf4y84s12ifx2fi8zfkn";
       doHaddock = false;
       description = "zlib C library bits";
-      license = lib.licenses.zlib;
+      license = lib.licensesSpdx."Zlib";
     }
   ) { };
 
@@ -747494,7 +750196,7 @@ self: {
         Z-Data
       ];
       description = "A haskell binding to Apache Zookeeper C library(mt) using Haskell Z project";
-      license = lib.licenses.bsd3;
+      license = lib.licensesSpdx."BSD-3-Clause";
       hydraPlatforms = lib.platforms.none;
     }
   ) { inherit (pkgs) zookeeper_mt; };
@@ -748018,7 +750720,7 @@ self: {
         tasty-hunit
       ];
       description = "A zuul client library";
-      license = lib.licenses.asl20;
+      license = lib.licensesSpdx."Apache-2.0";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "zuul-cli";
       broken = true;
@@ -748070,7 +750772,7 @@ self: {
         happy
       ];
       description = "a live coding language for playing with nested functions of time";
-      license = lib.licenses.gpl3Only;
+      license = lib.licensesSpdx."GPL-3.0-only";
       hydraPlatforms = lib.platforms.none;
     }
   ) { };
@@ -748170,7 +750872,7 @@ self: {
         zxcvbn-hs
       ];
       description = "Password strength estimation based on zxcvbn";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       broken = true;
     }
@@ -748280,7 +750982,7 @@ self: {
         zlib
       ];
       description = "Password strength estimation based on zxcvbn";
-      license = lib.licenses.mit;
+      license = lib.licensesSpdx."MIT";
       hydraPlatforms = lib.platforms.none;
       mainProgram = "zxcvbn-example";
       broken = true;
diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index fb5d8bcb7dae..7d2e3517f979 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -9,6 +9,7 @@
   haskellPackages,
   writeText,
   runCommand,
+  nixosTests,
 }:
 
 # This argument is a function which selects a list of Haskell packages from any
@@ -137,6 +138,8 @@ buildPackages.stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  passthru.tests.nixos = nixosTests.hoogle;
+
   meta = {
     description = "Local Hoogle database";
     platforms = ghc.meta.platforms;
diff --git a/pkgs/development/haskell-modules/lib/compose.nix b/pkgs/development/haskell-modules/lib/compose.nix
index 220cb49f3d91..055e6c40c784 100644
--- a/pkgs/development/haskell-modules/lib/compose.nix
+++ b/pkgs/development/haskell-modules/lib/compose.nix
@@ -114,7 +114,8 @@ rec {
 
     Note that jailbreaking at this time, doesn't lift bounds on
     conditional branches.
-    https://github.com/peti/jailbreak-cabal/issues/7 has further details.
+    https://github.com/peti/jailbreak-cabal/issues/7 (krank:ignore-line)
+    has further details.
   */
   doJailbreak = overrideCabal (drv: {
     jailbreak = true;
diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix
index b544c80db937..665d8429631d 100644
--- a/pkgs/development/haskell-modules/lib/default.nix
+++ b/pkgs/development/haskell-modules/lib/default.nix
@@ -94,7 +94,8 @@ rec {
 
     Note that jailbreaking at this time, doesn't lift bounds on
     conditional branches.
-    https://github.com/peti/jailbreak-cabal/issues/7 has further details.
+    https://github.com/peti/jailbreak-cabal/issues/7 (krank:ignore-line)
+    has further details.
   */
   doJailbreak = compose.doJailbreak;
 
@@ -339,12 +340,6 @@ rec {
   # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet
   packagesFromDirectory = compose.packagesFromDirectory;
 
-  addOptparseApplicativeCompletionScripts =
-    exeName: pkg:
-    lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" (
-      compose.__generateOptparseApplicativeCompletion exeName pkg
-    );
-
   /*
     Modify a Haskell package to add shell completion scripts for the
     given executable produced by it. These completion scripts will be
diff --git a/pkgs/development/haskell-modules/non-hackage-packages.nix b/pkgs/development/haskell-modules/non-hackage-packages.nix
index e5ec0f1d053e..e0cd3a7ac2e9 100644
--- a/pkgs/development/haskell-modules/non-hackage-packages.nix
+++ b/pkgs/development/haskell-modules/non-hackage-packages.nix
@@ -41,11 +41,12 @@ self: super:
 
   ghc-settings-edit = self.callPackage ../tools/haskell/ghc-settings-edit { };
 
-  # https://github.com/channable/vaultenv/issues/1
+  # Upstream won't upload vaultenv to Hackage:
+  # https://github.com/channable/vaultenv/issues/1 krank:ignore-line
   vaultenv = self.callPackage ../tools/haskell/vaultenv { };
 
-  # spago-legacy is not released to Hackage.
-  # https://github.com/spacchetti/spago/issues/512
+  # spago-legacy won't be released to Hackage:
+  # https://github.com/spacchetti/spago/issues/512 krank:ignore-line
   spago-legacy = self.callPackage ../../by-name/sp/spago-legacy/spago-legacy.nix { };
 
   # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth
diff --git a/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch b/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch
deleted file mode 100644
index b4d7c553baff..000000000000
--- a/pkgs/development/haskell-modules/patches/cabal-install-3.16-lift-unix-bound.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cabal-install.cabal
-+++ b/cabal-install.cabal
-@@ -275,7 +275,7 @@
-         , directory >=1.3.1.0
-     else
-       build-depends:
--        , unix >= 2.5 && < 2.8 || >= 2.8.6.0 && < 2.9
-+        , unix >= 2.5 && < 2.9
- 
-     if flag(lukko)
-       build-depends:
diff --git a/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch b/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch
index 1d571b61e532..8b281cd1f698 100644
--- a/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch
+++ b/pkgs/development/haskell-modules/patches/cryptonite-remove-argon2.patch
@@ -23,7 +23,7 @@ index 044ba00..31dc6f1 100644
  
  hash :: (ByteArrayAccess password, ByteArrayAccess salt, ByteArray out)
 -     => Options
-+     => [Proxy "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"]
++     => [Proxy "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"] -- abandoned project, krank:ignore-line
       -> password
       -> salt
       -> Int
@@ -50,7 +50,7 @@ index 044ba00..31dc6f1 100644
 -  where
 -    saltLen = B.length salt
 -    passwordLen = B.length password
-+hash options password salt outLen = error "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360"
++hash options password salt outLen = error "cryptonite:Crypto.KDF.Argon2.hash is known to be broken on this architecture. See https://github.com/haskell-crypto/cryptonite/issues/360" -- abandoned project, krank:ignore-line
  
  data Pass
  data Salt
diff --git a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch b/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
deleted file mode 100644
index 510e450945b8..000000000000
--- a/pkgs/development/haskell-modules/patches/encoding-Cabal-2.0.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 67bb87ceff53f0178c988dd4e15eeb2daee92b84 Mon Sep 17 00:00:00 2001
-From: Gregor Kleen <pngwjpgh@users.noreply.github.com>
-Date: Tue, 20 Feb 2018 17:46:24 +0100
-Subject: [PATCH] Relax upper version bounds on dependencies
-
----
- Setup.hs       | 20 ++++++++++++++++----
- encoding.cabal |  4 ++--
- stack.yaml     |  4 ++--
- 3 files changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/Setup.hs b/Setup.hs
-index de719e6..fe5b84c 100644
---- a/Setup.hs
-+++ b/Setup.hs
-@@ -1,13 +1,25 @@
-+{-# LANGUAGE CPP #-}
-+
- module Main where
- 
- import Distribution.Simple
- import Data.Encoding.Preprocessor.Mapping
- import Data.Encoding.Preprocessor.XMLMappingBuilder
- 
-+#if MIN_VERSION_Cabal(2,0,0)
-+main = defaultMainWithHooks (simpleUserHooks
-+                             {hookedPreProcessors = ( ("mapping" , \_ _ _ -> mappingPreprocessor)
-+                                                    : ("mapping2", \_ _ _ -> mappingPreprocessor)
-+                                                    : ("xml"     , \_ _ _ -> xmlPreprocessor)
-+                                                    : (hookedPreProcessors simpleUserHooks)
-+                                                    )
-+                             })
-+#else
- main = defaultMainWithHooks (simpleUserHooks
--                             {hookedPreProcessors = (("mapping",\_ _ -> mappingPreprocessor)
--                                                     :("mapping2",\_ _ -> mappingPreprocessor)
--                                                     :("xml",\_ _ -> xmlPreprocessor)
--                                                     :(hookedPreProcessors simpleUserHooks)
-+                             {hookedPreProcessors = ( ("mapping" , \_ _ -> mappingPreprocessor)
-+                                                    : ("mapping2", \_ _ -> mappingPreprocessor)
-+                                                    : ("xml"     , \_ _ -> xmlPreprocessor)
-+                                                    : (hookedPreProcessors simpleUserHooks)
-                                                     )
-                              })
-+#endif
-diff --git a/encoding.cabal b/encoding.cabal
-index ec20617..f221715 100644
---- a/encoding.cabal
-+++ b/encoding.cabal
-@@ -36,7 +36,7 @@ Source-Repository this
- 
- Custom-Setup
-   Setup-Depends: base >=3 && <5,
--                 Cabal >=1.24 && <1.25,
-+                 Cabal >=1.24 && <2.1,
-                  containers,
-                  filepath,
-                  ghc-prim,
-@@ -51,7 +51,7 @@ Library
-                  extensible-exceptions >=0.1 && <0.2,
-                  ghc-prim >=0.3 && <0.6,
-                  mtl >=2.0 && <2.3,
--                 regex-compat >=0.71 && <0.95
-+                 regex-compat >=0.71 && <0.96
- 
-   Extensions: CPP
- 
diff --git a/pkgs/development/haskell-modules/with-packages-wrapper.nix b/pkgs/development/haskell-modules/with-packages-wrapper.nix
index f95ca4b2e717..9968ea355363 100644
--- a/pkgs/development/haskell-modules/with-packages-wrapper.nix
+++ b/pkgs/development/haskell-modules/with-packages-wrapper.nix
@@ -124,7 +124,8 @@ else
         fi
       done
 
-      # haddock was referring to the base ghc, https://github.com/NixOS/nixpkgs/issues/36976
+      # haddock needs to be wrapped like GHC, see
+      # https://github.com/NixOS/nixpkgs/issues/36976 krank:ignore-line
       if [[ -x "${ghc}/bin/haddock" ]]; then
         rm -f $out/bin/haddock
         makeWrapper ${ghc}/bin/haddock $out/bin/haddock    \
@@ -171,7 +172,7 @@ else
         # ghc-pkg is now trying to open the file.  These file are symlink
         # to another nix derivation, so they are not writable.  Removing
         # them allow the correct behavior of ghc-pkg recache
-        # See: https://github.com/NixOS/nixpkgs/issues/79441
+        # See: https://github.com/NixOS/nixpkgs/issues/79441 krank:ignore-line
         rm ${packageCfgDir}/package.cache.lock
         rm ${packageCfgDir}/package.cache
 
@@ -182,7 +183,7 @@ else
     + postBuild;
     preferLocalBuild = true;
     passthru = {
-      inherit (ghc) version targetPrefix;
+      inherit (ghc) version meta targetPrefix;
 
       hoogle = hoogleWithPackages';
 
@@ -203,9 +204,4 @@ else
           Also note that withLLVM has been renamed to useLLVM for consistency with
           the GHC Nix expressions.'';
     };
-    pos = __curPos;
-    meta = ghc.meta // {
-      # To be fixed by <https://github.com/NixOS/nixpkgs/pull/440774>.
-      broken = useLLVM;
-    };
   }
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 9c7ba500961c..c333fa9064f1 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -65,7 +65,7 @@ let
 
       # The set of libraries that comes with idris
 
-      builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
+      builtins = pkgs.lib.attrValues builtins_;
 
       # Libraries
 
diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/development/interpreters/babashka/clojure-tools.nix
index 2ee6a96572d5..82a508f9453d 100644
--- a/pkgs/development/interpreters/babashka/clojure-tools.nix
+++ b/pkgs/development/interpreters/babashka/clojure-tools.nix
@@ -7,10 +7,10 @@
 }:
 clojure.overrideAttrs (previousAttrs: {
   pname = "babashka-clojure-tools";
-  version = "1.12.2.1565";
+  version = "1.12.3.1577";
 
   src = fetchurl {
     url = previousAttrs.src.url;
-    hash = "sha256-qj0RqgIL+pgbqdMnG+vCfHirazBVA8ro2zCKOlDzYXk=";
+    hash = "sha256-u/hROuiLmHPpeBroaty1YLgSCcZv6Uy+ckKK85seusw=";
   };
 })
diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
index 70e275887ec9..487aefa8a341 100644
--- a/pkgs/development/interpreters/babashka/default.nix
+++ b/pkgs/development/interpreters/babashka/default.nix
@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "babashka-unwrapped";
-  version = "1.12.208";
+  version = "1.12.209";
 
   src = fetchurl {
     url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
-    sha256 = "sha256-2tr+MM4CNYaLpVw2q5Hx4hXnUkV4fl5T3znmq8mFycU=";
+    sha256 = "sha256-Br8e011Iy+fr+MrIIRtcga98VSDKDeyRfgVTPnjBMII=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/interpreters/clisp/default.nix b/pkgs/development/interpreters/clisp/default.nix
index 7b2ef292fc42..1a09cdef7895 100644
--- a/pkgs/development/interpreters/clisp/default.nix
+++ b/pkgs/development/interpreters/clisp/default.nix
@@ -122,11 +122,6 @@ stdenv.mkDerivation {
     cd builddir
   '';
 
-  # ;; Loading file ../src/defmacro.lisp ...
-  # *** - handle_fault error2 ! address = 0x8 not in [0x1000000c0000,0x1000000c0000) !
-  # SIGSEGV cannot be cured. Fault address = 0x8.
-  hardeningDisable = [ "pie" ];
-
   doCheck = true;
 
   postInstall = lib.optionalString (withModules != [ ]) ''
diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 6d356626ed2f..c7e0cb75e2e0 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -11,12 +11,12 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "clojure";
-  version = "1.12.2.1565";
+  version = "1.12.3.1577";
 
   src = fetchurl {
     # https://github.com/clojure/brew-install/releases
     url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
-    hash = "sha256-qj0RqgIL+pgbqdMnG+vCfHirazBVA8ro2zCKOlDzYXk=";
+    hash = "sha256-u/hROuiLmHPpeBroaty1YLgSCcZv6Uy+ckKK85seusw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix
index 214fe7f92d28..3ce1c8fceb75 100644
--- a/pkgs/development/interpreters/dhall/build-dhall-package.nix
+++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix
@@ -101,7 +101,7 @@ runCommand name { inherit dependencies; } ''
     mkdir -p $out/${dataDhall}
 
     XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --output-link $out/docs ${
-      lib.cli.toGNUCommandLineShell { } {
+      lib.cli.toCommandLineShellGNU { } {
         base-import-url = baseImportUrl;
 
         input = documentationRoot;
diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix
index 4ed8e67bb8e4..ca38b3b9a2a4 100644
--- a/pkgs/development/interpreters/elixir/1.15.nix
+++ b/pkgs/development/interpreters/elixir/1.15.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.15.7";
-  sha256 = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
+  hash = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
   # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "24";
   maximumOTPVersion = "26";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.16.nix b/pkgs/development/interpreters/elixir/1.16.nix
index 1fdb4094494e..5845ff8bbb52 100644
--- a/pkgs/development/interpreters/elixir/1.16.nix
+++ b/pkgs/development/interpreters/elixir/1.16.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.16.3";
-  sha256 = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
+  hash = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
   # https://hexdocs.pm/elixir/1.16.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "24";
   maximumOTPVersion = "26";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix
index 32d6654e11d5..1f0e05b6f016 100644
--- a/pkgs/development/interpreters/elixir/1.17.nix
+++ b/pkgs/development/interpreters/elixir/1.17.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.17.3";
-  sha256 = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
+  hash = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
   # https://hexdocs.pm/elixir/1.17.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "25";
   maximumOTPVersion = "27";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.18.nix b/pkgs/development/interpreters/elixir/1.18.nix
index 8e4269c4d7a1..20779a12fcdd 100644
--- a/pkgs/development/interpreters/elixir/1.18.nix
+++ b/pkgs/development/interpreters/elixir/1.18.nix
@@ -1,8 +1,6 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.18.4";
-  sha256 = "sha256-PwogI+HfRXy5M7Xn/KyDjm5vUquTBoGxliSV0A2AwSA=";
+  hash = "sha256-PwogI+HfRXy5M7Xn/KyDjm5vUquTBoGxliSV0A2AwSA=";
   # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
   minimumOTPVersion = "25";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix
index bcfda19c6f49..e864b3111c78 100644
--- a/pkgs/development/interpreters/elixir/1.19.nix
+++ b/pkgs/development/interpreters/elixir/1.19.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
-  version = "1.19.0-rc.2";
-  sha256 = "sha256-RtJcnXjIqUw5h8Dsl8IPEaUVif4cHpUylmpmJCZ5EpM=";
+import ./generic-builder.nix {
+  version = "1.19.2";
+  hash = "sha256-sJNwWl6iCWzf8iDVG90DUxU8H3piKyGoU0mIAqfsphQ=";
   # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
   minimumOTPVersion = "26";
   maximumOTPVersion = "28";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 82a53c2509e8..5b7da9856fe1 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,32 +1,22 @@
 {
-  config,
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  erlang,
-  makeWrapper,
-  nix-update-script,
-  coreutils,
-  curl,
-  bash,
-  debugInfo ? false,
-}@inputs:
-
-{
-  baseName ? "elixir",
   version,
-  erlang ? inputs.erlang,
+  hash,
   minimumOTPVersion,
   maximumOTPVersion ? null,
-  sha256 ? null,
-  rev ? "v${version}",
-  src ? fetchFromGitHub {
-    inherit rev sha256;
-    owner = "elixir-lang";
-    repo = "elixir";
-  },
-  escriptPath ? "lib/elixir/generate_app.escript",
-}@args:
+}:
+{
+  bash,
+  config,
+  coreutils,
+  curl,
+  debugInfo ? false,
+  erlang,
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  nix-update-script,
+  stdenv,
+}:
 
 let
   inherit (lib)
@@ -79,9 +69,16 @@ if !config.allowAliases && !bothAssert then
 else
   assert assertMsg bothAssert compatibilityMsg;
   stdenv.mkDerivation {
-    pname = "${baseName}";
+    pname = "elixir";
 
-    inherit src version debugInfo;
+    src = fetchFromGitHub {
+      owner = "elixir-lang";
+      repo = "elixir";
+      rev = "v${version}";
+      inherit hash;
+    };
+
+    inherit version debugInfo;
 
     nativeBuildInputs = [ makeWrapper ];
     buildInputs = [ erlang ];
@@ -95,7 +92,7 @@ else
     };
 
     preBuild = ''
-      patchShebangs ${escriptPath} || true
+      patchShebangs lib/elixir/scripts/generate_app.escript || true
     '';
 
     # copy stdlib source files for LSP access
@@ -136,8 +133,6 @@ else
       ];
     };
 
-    pos = builtins.unsafeGetAttrPos "sha256" args;
-
     meta = {
       homepage = "https://elixir-lang.org/";
       description = "Functional, meta-programming aware language built on top of the Erlang VM";
diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index d51bc6a76572..fd4acce3596b 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "27.3.4.3";
-  hash = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o=";
+  version = "27.3.4.4";
+  hash = "sha256-iHpEYXzaso1ZK9XLrT04t+BoX2Y6nSbT9rNjY1JoHPM=";
 }
diff --git a/pkgs/development/interpreters/erlang/28.nix b/pkgs/development/interpreters/erlang/28.nix
index 46e8455afea0..1ddf359dbb8c 100644
--- a/pkgs/development/interpreters/erlang/28.nix
+++ b/pkgs/development/interpreters/erlang/28.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "28.1";
-  hash = "sha256-rR31Zj7c2eNf608HhLNlrGnVQN/Nymug6EcPfeNHfqk=";
+  version = "28.1.1";
+  hash = "sha256-2Yop9zpx3dY549NFsjBRghb5vw+SnUSEmv6VIA0m5yQ=";
 }
diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 154c23aa18ac..328ecd9dfe02 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   wrapGAppsHook3,
   readline,
@@ -121,6 +122,14 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/gnudatalanguage/gdl/commit/b648a63c5070f38e90167f858a79ba6f01dad1d3.patch?full_index=1";
+      includes = [ "CMakeLists.txt" ];
+      hash = "sha256-lYtAstI21Up4RArf6pXnjiTwJ3Omoisw43Ih1H2Wc0s=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'FATAL_ERROR "The src' 'WARNING "The src' \
diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix
index d3bf1518868c..979c1acb5671 100644
--- a/pkgs/development/interpreters/guile/3.0.nix
+++ b/pkgs/development/interpreters/guile/3.0.nix
@@ -126,6 +126,9 @@ builder rec {
   #  https://github.com/NixOS/nixpkgs/pull/160051#issuecomment-1046193028
   ++ lib.optional (stdenv.hostPlatform.isDarwin) "--disable-lto";
 
+  # Fix build with gcc15
+  env.NIX_CFLAGS_COMPILE = toString [ "-std=gnu17" ];
+
   postInstall = ''
     wrapProgram $out/bin/guile-snarf --prefix PATH : "${gawk}/bin"
   ''
diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index af054c353d85..0b8a388d3ea4 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchurl,
+  fetchMavenArtifact,
   gitUpdater,
   mkRubyVersion,
   makeBinaryWrapper,
@@ -11,15 +12,15 @@
 
 let
   # The version number here is whatever is reported by the RUBY_VERSION string
-  rubyVersion = mkRubyVersion "3" "1" "4" "";
+  rubyVersion = mkRubyVersion "3" "4" "2" "";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jruby";
-  version = "10.0.0.0";
+  version = "10.0.2.0";
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Qn2YJ+0j/mtNEf5hZlx13XR2ujagQ4N26zEM4qjSRzM=";
+    url = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/${finalAttrs.version}/jruby-dist-${finalAttrs.version}-bin.tar.gz";
+    hash = "sha256-uKAm84qphGGgTtCqCyCJHOJX7L5T4SRxnOnuW4BFJfE=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -pv $out/share/jruby/docs
     mv * $out
-    rm $out/bin/*.{bat,dll,exe,sh}
+    rm $out/bin/*.{bat,dll,exe}
     mv $out/samples $out/share/jruby/
     mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/
 
@@ -36,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
         --set JAVA_HOME ${jre.home}
     done
 
-    ln -s $out/bin/jruby $out/bin/ruby
-
     # Bundler tries to create this directory
     mkdir -pv $out/${finalAttrs.passthru.gemPath}
     mkdir -p $out/nix-support
diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix
index 69cd8532d738..a8559005be35 100644
--- a/pkgs/development/interpreters/lua-5/tests/default.nix
+++ b/pkgs/development/interpreters/lua-5/tests/default.nix
@@ -58,7 +58,7 @@ let
       ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;";
   };
 in
-pkgs.recurseIntoAttrs {
+lib.recurseIntoAttrs {
 
   checkInterpreterPath =
     let
diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix
index 5a1397ec3da1..c079cdbbd174 100644
--- a/pkgs/development/interpreters/luajit/openresty.nix
+++ b/pkgs/development/interpreters/luajit/openresty.nix
@@ -6,13 +6,13 @@
 }:
 
 callPackage ./default.nix rec {
-  version = "2.1-20220915";
+  version = "2.1-20250826";
 
   src = fetchFromGitHub {
     owner = "openresty";
     repo = "luajit2";
     rev = "v${version}";
-    hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s=";
+    hash = "sha256-fF3xgAy2IjFy4LdXPlk4RuX+IclOXaw3YR24wyMBNgM=";
   };
 
   inherit self passthruFun;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index b0f3480c01ac..69d02530a90f 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -30,11 +30,7 @@ let
             }:
             let
               perlPackagesFun = callPackage ../../../top-level/perl-packages.nix {
-                # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages
-                # most perl packages aren't called with callPackage so it's not possible to override their arguments individually
-                # the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling
-                pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs;
-                inherit stdenv;
+                inherit stdenv pkgs;
                 perl = self;
               };
 
diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index fe25d10dc5de..d10414d7c7ff 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.26";
-      hash = "sha256-chtj1TSfEx9Ql1N7O+a6aAHi2Ob6uh8fLqlbT9YudSU=";
+      version = "8.3.27";
+      hash = "sha256-od0rUbQ3wKYzfgGQBHeKjvJT206a/31I2IeYypG34qQ=";
     }
   );
 in
diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 87784a47966a..bc43493b9d1a 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.13";
-      hash = "sha256-hRgd3Kez4D8UhSGwQ71iQRlQ1GjGZ9tkAEefGxCBIZQ=";
+      version = "8.4.14";
+      hash = "sha256-8hOc5Mt6bFZD7pjKo05cMrqEHCuik+NKPQNX+qhLs+c=";
     }
   );
 in
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 46a283bd5b2c..e75fb0b193c0 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -323,7 +323,8 @@ stdenv.mkDerivation (
 
     env.NIX_CFLAGS_COMPILE =
       lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2"
-      + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";
+      + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"
+      + " -std=gnu17";
     DETERMINISTIC_BUILD = 1;
 
     setupHook = python-setup-hook sitePackages;
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 58a2a5c4e2e6..2c754ba43fc7 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -516,8 +516,8 @@ stdenv.mkDerivation (finalAttrs: {
     "ac_cv_have_size_t_format=yes"
     "ac_cv_computed_gotos=yes"
     # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
-    "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
-    "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
+    "ac_cv_file__dev_ptmx=${lib.boolToYesNo (!stdenv.hostPlatform.isWindows)}"
+    "ac_cv_file__dev_ptc=${lib.boolToYesNo (!stdenv.hostPlatform.isWindows)}"
   ]
   ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
     "--with-build-python=${pythonOnBuildForHostInterpreter}"
@@ -584,9 +584,6 @@ stdenv.mkDerivation (finalAttrs: {
       export CFLAGS_NODIST="-fno-semantic-interposition"
     '';
 
-  # Our aarch64-linux bootstrap files lack Scrt1.o, which fails the config test
-  hardeningEnable = lib.optionals (!withMinimalDeps && !stdenv.hostPlatform.isAarch64) [ "pie" ];
-
   setupHook = python-setup-hook sitePackages;
 
   postInstall =
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 2764e6a95344..a59a3cff42aa 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
         sourceVersion = {
           major = "3";
           minor = "13";
-          patch = "7";
+          patch = "9";
           suffix = "";
         };
-        hash = "sha256-VGL5CZ39MOI43vg8cdkYl9jKpf9uvHpQ8U1IAs2qp5o=";
+        hash = "sha256-7V7zTNo2z6Lzo0DwfKx+eBT5HH88QR9tNWIyOoZsXGY=";
       };
     };
 
@@ -36,9 +36,9 @@
         major = "2";
         minor = "7";
         patch = "18";
-        suffix = ".8"; # ActiveState's Python 2 extended support
+        suffix = ".12"; # ActiveState's Python 2 extended support
       };
-      hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI=";
+      hash = "sha256-RuEgfpags9wJm9Xe0daotqUx4knABEUc7DvtgnQXEfE=";
       inherit passthruFun;
     };
 
@@ -71,10 +71,10 @@
       sourceVersion = {
         major = "3";
         minor = "12";
-        patch = "11";
+        patch = "12";
         suffix = "";
       };
-      hash = "sha256-wwuyS38emhmxG1WlRkNPdOc5u0wnGj46gP9DgNSfets=";
+      hash = "sha256-+4WhNBSwKMSboYu9UjwtBVowtWsYuSzkVOosUe3GVsQ=";
       inherit passthruFun;
     };
 
diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index b3ef73804311..04deb32b6a3a 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -4,6 +4,8 @@
   lib,
   config,
   python,
+  # Allow passing in a custom stdenv to buildPython*.override
+  stdenv,
   wrapPython,
   unzip,
   ensureNewerSourcesForZipFilesHook,
@@ -192,9 +194,6 @@ in
 
   doCheck ? true,
 
-  # Allow passing in a custom stdenv to buildPython*
-  stdenv ? python.stdenv,
-
   ...
 }@attrs:
 
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index c030a464e133..7c8ef2fbfb80 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
   ]
   ++
     lib.optionals
-      (lib.any (l: l == optimizationLevel) [
+      (lib.elem optimizationLevel [
         "0"
         "1"
         "2"
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index ef0350d93818..2737917c63b5 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation {
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     mainProgram = "pypy";
     license = licenses.mit;
-    platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
+    platforms = lib.attrNames downloadUrls;
   };
 
 }
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index fc8fdf79208c..e5893818407b 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
@@ -175,7 +175,7 @@ stdenv.mkDerivation {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
-    platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
+    platforms = lib.attrNames downloadUrls;
   };
 
 }
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 67600fe972f5..e3a92bef52f3 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -38,23 +38,51 @@ let
         }
       else
         result
-    );
+    )
+    // {
+      # Support overriding `f` itself, e.g. `buildPythonPackage.override { }`.
+      # Ensure `makeOverridablePythonPackage` is applied to the result.
+      override = lib.mirrorFunctionArgs f.override (fdrv: makeOverridablePythonPackage (f.override fdrv));
+    };
+
+  overrideStdenvCompat =
+    f:
+    lib.setFunctionArgs (
+      args:
+      if !(lib.isFunction args) && (args ? stdenv) then
+        lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) ''
+          Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:
+            buildPythonPackage.override { stdenv = customStdenv; } { }
+        '' (f.override { stdenv = args.stdenv; } args)
+      else
+        f args
+    ) (removeAttrs (lib.functionArgs f) [ "stdenv" ])
+    // {
+      # Intentionally drop the effect of overrideStdenvCompat when calling `buildPython*.override`.
+      inherit (f) override;
+    };
 
   mkPythonDerivation =
     if python.isPy3k then ./mk-python-derivation.nix else ./python2/mk-python-derivation.nix;
 
   buildPythonPackage = makeOverridablePythonPackage (
-    callPackage mkPythonDerivation {
-      inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}"
-      inherit toPythonModule; # Libraries provide modules
-    }
+    overrideStdenvCompat (
+      callPackage mkPythonDerivation {
+        inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}"
+        inherit toPythonModule; # Libraries provide modules
+        inherit (python) stdenv;
+      }
+    )
   );
 
   buildPythonApplication = makeOverridablePythonPackage (
-    callPackage mkPythonDerivation {
-      namePrefix = ""; # Python applications should not have any prefix
-      toPythonModule = x: x; # Application does not provide modules.
-    }
+    overrideStdenvCompat (
+      callPackage mkPythonDerivation {
+        namePrefix = ""; # Python applications should not have any prefix
+        toPythonModule = x: x; # Application does not provide modules.
+        inherit (python) stdenv;
+      }
+    )
   );
 
   # Check whether a derivation provides a Python module.
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index b27d3e92eb24..4bdda1506290 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -4,6 +4,8 @@
   lib,
   config,
   python,
+  # Allow passing in a custom stdenv to buildPython*.override
+  stdenv,
   wrapPython,
   unzip,
   ensureNewerSourcesForZipFilesHook,
@@ -101,8 +103,6 @@
 }@attrs:
 
 let
-  inherit (python) stdenv;
-
   withDistOutput = lib.elem format [
     "pyproject"
     "setuptools"
diff --git a/pkgs/development/interpreters/python/tests/test_environments/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py
index 80713418a046..0302ae1a6f0b 100644
--- a/pkgs/development/interpreters/python/tests/test_environments/test_python.py
+++ b/pkgs/development/interpreters/python/tests/test_environments/test_python.py
@@ -8,6 +8,7 @@ that would interfere with the tests.
 
 import platform
 import sys
+import sysconfig
 import unittest
 import site
 
@@ -38,10 +39,14 @@ class TestCasePython(unittest.TestCase):
 
     @unittest.skipIf(IS_PYPY or sys.version_info.major==2, "Python 2 does not have base_prefix")
     def test_base_prefix(self):
-        if IS_VENV or IS_NIXENV or IS_VIRTUALENV:
+        if IS_VENV or IS_VIRTUALENV:
             self.assertNotEqual(sys.prefix, sys.base_prefix)
         else:
             self.assertEqual(sys.prefix, sys.base_prefix)
+        if IS_NIXENV:
+            self.assertNotEqual(sys.base_prefix, sysconfig.get_config_var('prefix'))
+        else:
+            self.assertEqual(sys.base_prefix, sysconfig.get_config_var('prefix'))
 
     @unittest.skipIf(sys.version_info.major==3, "sys.real_prefix is only set by virtualenv in case of Python 2.")
     def test_real_prefix(self):
diff --git a/pkgs/development/interpreters/python/wrapper.nix b/pkgs/development/interpreters/python/wrapper.nix
index 6b6f97b74f3d..55e86a8b9c36 100644
--- a/pkgs/development/interpreters/python/wrapper.nix
+++ b/pkgs/development/interpreters/python/wrapper.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   buildEnv,
+  runCommand,
   makeBinaryWrapper,
 
   # manually pased
@@ -22,7 +23,11 @@
 let
   env =
     let
-      paths = requiredPythonModules (extraLibs ++ [ python ]);
+      paths = requiredPythonModules (extraLibs ++ [ python ]) ++ [
+        (runCommand "bin" { } ''
+          mkdir -p $out/bin
+        '')
+      ];
       pythonPath = "${placeholder "out"}/${python.sitePackages}";
       pythonExecutable = "${placeholder "out"}/bin/${python.executable}";
     in
@@ -36,21 +41,26 @@ let
       nativeBuildInputs = [ makeBinaryWrapper ];
 
       postBuild = ''
-        if [ -L "$out/bin" ]; then
-            unlink "$out/bin"
-        fi
-        mkdir -p "$out/bin"
-
         for path in ${lib.concatStringsSep " " paths}; do
           if [ -d "$path/bin" ]; then
             cd "$path/bin"
             for prg in *; do
-              if [ -f "$prg" ]; then
+              if [ -f "$prg" ] && [ -x "$prg" ]; then
                 rm -f "$out/bin/$prg"
-                if [ -x "$prg" ]; then
-                  makeWrapper "$path/bin/$prg" "$out/bin/$prg" --set NIX_PYTHONPREFIX "$out" --set NIX_PYTHONEXECUTABLE ${pythonExecutable} --set NIX_PYTHONPATH ${pythonPath} ${
-                    lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''
-                  } ${lib.concatStringsSep " " makeWrapperArgs}
+                if [ "$prg" = "${python.executable}" ]; then
+                  makeWrapper "${python.interpreter}" "$out/bin/$prg" \
+                    --inherit-argv0 \
+                    ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \
+                    ${lib.concatStringsSep " " makeWrapperArgs}
+                elif [ "$(readlink "$prg")" = "${python.executable}" ]; then
+                  ln -s "${python.executable}" "$out/bin/$prg"
+                else
+                  makeWrapper "$path/bin/$prg" "$out/bin/$prg" \
+                    --set NIX_PYTHONPREFIX "$out" \
+                    --set NIX_PYTHONEXECUTABLE ${pythonExecutable} \
+                    --set NIX_PYTHONPATH ${pythonPath} \
+                    ${lib.optionalString (!permitUserSite) ''--set PYTHONNOUSERSITE "true"''} \
+                    ${lib.concatStringsSep " " makeWrapperArgs}
                 fi
               fi
             done
diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 17f0f3df04e1..33eaaf90ede2 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -187,13 +187,27 @@ let
           # make: *** [uncommon.mk:373: do-install-all] Error 1
           enableParallelInstalling = false;
 
-          patches = op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch ++ [
-            # When using a baseruby, ruby always sets "libdir" to the build
-            # directory, which nix rejects due to a reference in to /build/ in
-            # the final product. Removing this reference doesn't seem to break
-            # anything and fixes cross compilation.
-            ./dont-refer-to-build-dir.patch
-          ];
+          patches =
+            op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch
+            ++ [
+              # When using a baseruby, ruby always sets "libdir" to the build
+              # directory, which nix rejects due to a reference in to /build/ in
+              # the final product. Removing this reference doesn't seem to break
+              # anything and fixes cross compilation.
+              ./dont-refer-to-build-dir.patch
+            ]
+            ++ ops (lib.versionAtLeast ver.majMin "3.4" && lib.versionOlder ver.majMin "3.5") [
+              (fetchpatch {
+                name = "ruby-3.4-fix-gcc-15-llvm-21-1.patch";
+                url = "https://github.com/ruby/ruby/commit/846bb760756a3bf1ab12d56d8909e104f16e6940.patch";
+                hash = "sha256-+f0mzHsGAe9FT9NWE345BxzaB6vmWzMTvEfWF84uFOs=";
+              })
+              (fetchpatch {
+                name = "ruby-3.4-fix-gcc-15-llvm-21-2.patch";
+                url = "https://github.com/ruby/ruby/commit/18e176659e8afe402cab7d39972f2d56f2cf378f.patch";
+                hash = "sha256-TKPG1hcC1G2WmUkvNV6QSnvUpTEDqrYKrIk/4fAS8QE=";
+              })
+            ];
 
           cargoRoot = opString yjitSupport "yjit";
 
@@ -398,8 +412,8 @@ in
   mkRuby = generic;
 
   ruby_3_3 = generic {
-    version = rubyVersion "3" "3" "9" "";
-    hash = "sha256-0ZkWkKThcjPsazx4RMHhJFwK3OPgDXE1UdBFhGe3J7E=";
+    version = rubyVersion "3" "3" "10" "";
+    hash = "sha256-tVW6pGejBs/I5sbtJNDSeyfpob7R2R2VUJhZ6saw6Sg=";
     cargoHash = "sha256-xE7Cv+NVmOHOlXa/Mg72CTSaZRb72lOja98JBvxPvSs=";
   };
 
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 58295fb55547..0e676a64c2d3 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-dQyMdxGA1B7SNYNE5UYe3ugxWMCoG3eZaaEzmWG8EWM=";
+    hash = "sha256-7+zgEiWlMvS1LPh2TSCgDg0p7W+Fsz2TAt9IlqkPpas=";
   };
 
   patches = [
diff --git a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch b/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch
deleted file mode 100644
index c6e28f11be2f..000000000000
--- a/pkgs/development/interpreters/spidermonkey/140-relax-apple-sdk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
-index 37c00230c853..dd89bea24392 100644
---- a/build/moz.configure/toolchain.configure
-+++ b/build/moz.configure/toolchain.configure
-@@ -233,7 +233,7 @@ with only_when(host_is_osx | target_is_osx):
-     )
- 
-     def mac_sdk_min_version():
--        return "15.5"
-+        return "15.2"
- 
-     @depends(
-         "--with-macos-sdk",
diff --git a/pkgs/development/interpreters/spidermonkey/140.nix b/pkgs/development/interpreters/spidermonkey/140.nix
index f96c8d6ce696..af269d60324a 100644
--- a/pkgs/development/interpreters/spidermonkey/140.nix
+++ b/pkgs/development/interpreters/spidermonkey/140.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "140.3.1";
-  hash = "sha512-qTAtmdfwf0slCqIUY1gUlk3QgyBCaOBf6Hej2DMLnAyqbCntGdpxvYiXm3zzntUvF2mJaLDaWw10MLZ2S0O2zA==";
+  version = "140.4.0";
+  hash = "sha512-z84L3PbUWZx7lrzNn9E5C/s2RduSdqNpowdgzmgZhQqqQlGGnmvTxdhYLqNyi5IHYsXxb3zhLOFRw+dDJ7jIEQ==";
 }
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index d2e542899540..4462bb085472 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -68,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: {
         url = "https://src.fedoraproject.org/rpms/mozjs140/raw/49492baa47bc1d7b7d5bc738c4c81b4661302f27/f/9aa8b4b051dd539e0fbd5e08040870b3c712a846.patch";
         hash = "sha256-SsyO5g7wlrxE7y2+VTHfmUDamofeZVqge8fv2y0ZhuU=";
       })
-      # SDK 15.5 is not available in nixpkgs yet
-      ./140-relax-apple-sdk.patch
     ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/julia-modules/resolve_packages.jl b/pkgs/development/julia-modules/resolve_packages.jl
index c53763827aab..845bfe7b7b3b 100644
--- a/pkgs/development/julia-modules/resolve_packages.jl
+++ b/pkgs/development/julia-modules/resolve_packages.jl
@@ -36,7 +36,7 @@ assert_can_add(ctx, pkgs)
 for (i, pkg) in pairs(pkgs)
     entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid)
     is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps])
-    if VERSION >= VersionNumber("1.11")
+    if VERSION >= VersionNumber("1.11") && VERSION < VersionNumber("1.12")
         pkgs[i] = update_package_add(ctx, pkg, entry, nothing, nothing, is_dep)
     else
         pkgs[i] = update_package_add(ctx, pkg, entry, is_dep)
diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index 7c121da0a806..06800f8c8038 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "71b008e5fb59e0a992724db78d54a5ddcf234515";
-    hash = "sha256-vMhDAwwSrwMd5xWcTiA56fsk7LRz4tHOsKhrt2hXi48=";
+    rev = "6976faba892be4c79d2b8b42710203b319278d7f";
+    hash = "sha256-aPoaaiZ8VCJhmeeuxrkrfNEWk9Ued7qPYjZFpmnRT3k=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-10-09";
+    version = "0-unstable-2025-11-03";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
deleted file mode 100644
index acf68d135c38..000000000000
--- a/pkgs/development/libraries/botan/default.nix
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkgsStatic,
-  python3,
-  docutils,
-  bzip2,
-  zlib,
-  jitterentropy,
-  darwin,
-  esdm,
-  tpm2-tss,
-  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
-  windows,
-
-  # build ESDM RNG plugin
-  withEsdm ? false,
-  # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
-  withTpm2 ? false,
-  policy ? null,
-}:
-
-assert lib.assertOneOf "policy" policy [
-  # no explicit policy is given. The defaults by the library are used
-  null
-  # only allow BSI approved algorithms, FFI and SHAKE for XMSS
-  "bsi"
-  # only allow NIST approved algorithms in FIPS 140
-  "fips140"
-  # only allow "modern" algorithms
-  "modern"
-];
-
-let
-  common =
-    {
-      version,
-      hash,
-      patches ? [ ],
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "botan";
-      inherit version;
-
-      __structuredAttrs = true;
-      enableParallelBuilding = true;
-      strictDeps = true;
-
-      outputs = [
-        "bin"
-        "out"
-        "dev"
-        "doc"
-        "man"
-      ];
-
-      src = fetchurl {
-        url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
-        inherit hash;
-      };
-
-      inherit patches;
-
-      nativeBuildInputs = [
-        python3
-        docutils
-      ];
-
-      buildInputs = [
-        bzip2
-        zlib
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
-        tpm2-tss
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
-        jitterentropy
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW) [
-        esdm
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
-        windows.pthreads
-      ];
-
-      buildTargets = [
-        "cli"
-      ]
-      ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
-      ++ lib.optionals static [ "static" ]
-      ++ lib.optionals (!static) [ "shared" ];
-
-      botanConfigureFlags = [
-        "--prefix=${placeholder "out"}"
-        "--bindir=${placeholder "bin"}/bin"
-        "--docdir=${placeholder "doc"}/share/doc"
-        "--mandir=${placeholder "man"}/share/man"
-        "--no-install-python-module"
-        "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
-        "--with-bzip2"
-        "--with-zlib"
-        "--with-rst2man"
-        "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
-      ]
-      ++ lib.optionals stdenv.cc.isClang [
-        "--cc=clang"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
-        "--with-tpm2"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
-        "--enable-modules=jitter_rng"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW) [
-        "--enable-modules=esdm_rng"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.8.0" && policy != null) [
-        "--module-policy=${policy}"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.8.0" && policy == "bsi") [
-        "--enable-module=ffi"
-        "--enable-module=shake"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
-        "--os=mingw"
-      ];
-
-      configurePhase = ''
-        runHook preConfigure
-        python configure.py ''${botanConfigureFlags[@]}
-        runHook postConfigure
-      '';
-
-      preInstall = ''
-        if [ -d src/scripts ]; then
-          patchShebangs src/scripts
-        fi
-      '';
-
-      postInstall = ''
-        cd "$out"/lib/pkgconfig
-        ln -s botan-*.pc botan.pc || true
-      '';
-
-      doCheck = true;
-
-      passthru.tests = lib.optionalAttrs (lib.versionAtLeast version "3") {
-        static = pkgsStatic.botan3;
-      };
-
-      meta = with lib; {
-        description = "Cryptographic algorithms library";
-        homepage = "https://botan.randombit.net";
-        mainProgram = "botan";
-        maintainers = with maintainers; [
-          raskin
-          thillux
-          nikstur
-        ];
-        platforms = platforms.unix ++ lib.optionals (lib.versionAtLeast version "3.0") platforms.windows;
-        license = licenses.bsd2;
-      };
-    });
-in
-{
-  botan3 = common {
-    version = "3.9.0";
-    hash = "sha256-jD8oS1jd1C6OQ+n6hqcSnYfqfD93aoDT2mPsIHIrCIM=";
-  };
-
-  botan2 = common {
-    version = "2.19.5";
-    hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
-  };
-}
diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix
index 93ebcc7d95de..02cf43f7f5d6 100644
--- a/pkgs/development/libraries/c-blosc/2.nix
+++ b/pkgs/development/libraries/c-blosc/2.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "c-blosc2";
-  version = "2.21.3";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "c-blosc2";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jHp3l9sV5SiIOUjY2NUd5G+rH/8wr3TLZ+q/F8TAVhU=";
+    sha256 = "sha256-0eB+8zSlKCuHK1J2HlBUmWEJumAXSV2xnYMvnFud75A=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/144170
diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix
index a6e0b2a6a738..adb245c9b40e 100644
--- a/pkgs/development/libraries/capstone/4.nix
+++ b/pkgs/development/libraries/capstone/4.nix
@@ -26,6 +26,17 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # CMake 2.6 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)"  \
+      "cmake_minimum_required(VERSION 3.10)" \
+    --replace-fail \
+      "cmake_policy (SET CMP0048 OLD)" \
+      "cmake_policy (SET CMP0048 NEW)"
+  '';
+
   meta = {
     description = "Advanced disassembly library";
     homepage = "http://www.capstone-engine.org";
diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 2d24a8d749e2..32f26c8c639d 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eccodes";
-  version = "2.42.0";
+  version = "2.44.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    hash = "sha256-YDcbNXywEd7lRtsuq6zlt+J/D4fT6kpa3eeJE3GzwSg=";
+    hash = "sha256-x1+x+Rt2W2uLR3RjKopvvOyWk02wFftjwq0lYK7dRDs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix
index cc0332510307..fb761f6f7c7c 100644
--- a/pkgs/development/libraries/ffmpeg/default.nix
+++ b/pkgs/development/libraries/ffmpeg/default.nix
@@ -21,13 +21,13 @@ let
   };
 
   v6 = {
-    version = "6.1.2";
-    hash = "sha256-h/N56iKkAR5kH+PRQceWZvHe3k+70KWMDEP5iVq/YFQ=";
+    version = "6.1.3";
+    hash = "sha256-NQnPOfiNmurY+L9/B7eVQc2JpOi0jhv5g9kVWsTzpis=";
   };
 
   v7 = {
-    version = "7.1.1";
-    hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4=";
+    version = "7.1.2";
+    hash = "sha256-MF/0oSOhxGWuOu6Yat7O68iOvgZ+wKjpQ8zSkwpWXqQ=";
   };
   v8 = {
     version = "8.0";
@@ -65,7 +65,7 @@ rec {
   # unversioned aliases to allow for quicker migration to new releases,
   # but can pin one of the versioned variants if they do not work with
   # the current default version.
-  ffmpeg = ffmpeg_7;
-  ffmpeg-headless = ffmpeg_7-headless;
-  ffmpeg-full = ffmpeg_7-full;
+  ffmpeg = ffmpeg_8;
+  ffmpeg-headless = ffmpeg_8-headless;
+  ffmpeg-full = ffmpeg_8-full;
 }
diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 7a209f62692a..2c072a48d742 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -9,7 +9,6 @@
   perl,
   texinfo,
   texinfo6,
-  yasm,
   nasm,
 
   # You can fetch any upstream version using this derivation by specifying version and hash
@@ -79,6 +78,7 @@
       && !isAarch32
       && !hostPlatform.isLoongArch64
       && !hostPlatform.isRiscV
+      && !(hostPlatform.isPower && hostPlatform.isBigEndian)
       && hostPlatform == buildPlatform
     ), # dynamically linked Nvidia code
   withFlite ? withFullDeps, # Voice Synthesis
@@ -460,36 +460,6 @@ stdenv.mkDerivation (
           url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/cb049d377f54f6b747667a93e4b719380c3e9475";
           hash = "sha256-sxRXKKgUak5vsQTiV7ge8vp+N22CdTIvuczNgVRP72c=";
         })
-        (fetchpatch2 {
-          name = "CVE-2024-31582.patch";
-          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
-          hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
-        })
-        (fetchpatch2 {
-          name = "CVE-2024-31578.patch";
-          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
-          hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
-        })
-        (fetchpatch2 {
-          name = "CVE-2023-49501.patch";
-          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/4adb93dff05dd947878c67784d98c9a4e13b57a7";
-          hash = "sha256-7cwktto3fPMDGvCZCVtB01X8Q9S/4V4bDLUICSNfGgw=";
-        })
-        (fetchpatch2 {
-          name = "CVE-2023-49502.patch";
-          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/737ede405b11a37fdd61d19cf25df296a0cb0b75";
-          hash = "sha256-mpSJwR9TX5ENjjCKvzuM/9e1Aj/AOiQW0+72oOMl9v8=";
-        })
-        (fetchpatch2 {
-          name = "CVE-2023-50007.patch";
-          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/b1942734c7cbcdc9034034373abcc9ecb9644c47";
-          hash = "sha256-v0hNcqBtm8GCGAU9UbRUCE0slodOjZCHrkS8e4TrVcQ=";
-        })
-        (fetchpatch2 {
-          name = "CVE-2023-50008.patch";
-          url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
-          hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
-        })
       ]
       ++ optionals (lib.versionOlder version "7.1.1") [
         (fetchpatch2 {
@@ -520,7 +490,7 @@ stdenv.mkDerivation (
           hash = "sha256-Ixkf1xzuDGk5t8J/apXKtghY0X9cfqSj/q987zrUuLQ=";
         })
       ]
-      ++ optionals (lib.versionOlder version "7.2") [
+      ++ optionals (lib.versionOlder version "7.1.2") [
         (fetchpatch2 {
           name = "unbreak-svt-av1-3.0.0.patch";
           url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/d1ed5c06e3edc5f2b5f3664c80121fa55b0baa95";
@@ -799,6 +769,25 @@ stdenv.mkDerivation (
       (enableFeature withExtraWarnings "extra-warnings")
       (enableFeature withStripping "stripping")
     ]
+    ++ optionals (stdenv.hostPlatform.isPower) [
+      # FFmpeg expects us to pass `--cpu=` to pick a specific feature set to compile for. If unset, it defaults to `generic`.
+      # For POWER, the default doesn't produce baseline-compliant settings. Passing a baseline-like CPU as a target doesn't
+      # produce entirely correct settings either - POWER4 leaves AltiVec enabled, but that's only guaranteed with POWER6.
+      # Just configure together everything on our own.
+
+      # Easy: Only ppc64le's baseline is recent enough to guarantee all of these.
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "altivec")
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "vsx")
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "power8")
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "ldbrx")
+
+      # Instructions that are highly specific to that series of 32-bit embedded CPUs. Never try to enable them.
+      (enableFeature false "ppc4xx")
+
+      # I *think* enabling this on 64-bit POWER is correct? Struggling to find much info on when/where this was introduced.
+      # Definitely present on the Apple G5, and likely Freescale e5500/e6500 as well.
+      (enableFeature (stdenv.hostPlatform.isPower64) "dcbzl")
+    ]
     ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       "--cross-prefix=${stdenv.cc.targetPrefix}"
       "--enable-cross-compile"
@@ -834,8 +823,7 @@ stdenv.mkDerivation (
       perl
       pkg-config
     ]
-    # 8.0 is only compatible with nasm, and we don't want to rebuild all older ffmpeg builds at this moment.
-    ++ (if versionOlder version "8.0" then [ yasm ] else [ nasm ])
+    ++ optionals stdenv.hostPlatform.isx86 [ nasm ]
     # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
     ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
     ++ optionals withCudaLLVM [ clang ]
diff --git a/pkgs/development/libraries/flatbuffers/default.nix b/pkgs/development/libraries/flatbuffers/default.nix
index 7756fd79422e..d9d48f3edd8b 100644
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flatbuffers";
-  version = "25.2.10";
+  version = "25.9.23";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
     rev = "v${version}";
-    hash = "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=";
+    hash = "sha256-A9nWfgcuVW3x9MDFeviCUK/oGcWJQwadI8LqNR8BlQw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/fmt/default.nix b/pkgs/development/libraries/fmt/default.nix
index a88e41c95873..3caa55292a91 100644
--- a/pkgs/development/libraries/fmt/default.nix
+++ b/pkgs/development/libraries/fmt/default.nix
@@ -97,4 +97,9 @@ in
       })
     ];
   };
+
+  fmt_12 = generic {
+    version = "12.0.0";
+    hash = "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=";
+  };
 }
diff --git a/pkgs/development/libraries/gcc/libgcc/default.nix b/pkgs/development/libraries/gcc/libgcc/default.nix
index 1085e9b301f6..022b766d9097 100644
--- a/pkgs/development/libraries/gcc/libgcc/default.nix
+++ b/pkgs/development/libraries/gcc/libgcc/default.nix
@@ -48,8 +48,6 @@ stdenv.mkDerivation (finalAttrs: {
     sourceRoot=$(readlink -e "./libgcc")
   '';
 
-  hardeningDisable = [ "pie" ];
-
   preConfigure = ''
     # Drop in libiberty, as external builds are not expected
     cd "$buildRoot"
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index d1bebbdbbb3c..9ae7a4c31133 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -28,7 +28,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gdk-pixbuf";
-  version = "2.42.12";
+  version = "2.44.3";
 
   outputs = [
     "out"
@@ -44,14 +44,12 @@ stdenv.mkDerivation (finalAttrs: {
     in
     fetchurl {
       url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-      hash = "sha256-uVBbNEW5p+SM7TR2DDvLc+lm3zrJTJWhSMtmmrdI48c=";
+      hash = "sha256-QKktzCN/+UtjqAwVmj9vIs1Z9vtJYfIBx4eZ+iyKwKY=";
     };
 
   patches = [
     # Move installed tests to a separate output
     ./installed-tests-path.patch
-
-    ./static-deps.patch
   ];
 
   # gdk-pixbuf-thumbnailer is not wrapped therefore strictDeps will work
@@ -90,7 +88,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   mesonFlags = [
     "-Dgio_sniffing=false"
-    (lib.mesonBool "gtk_doc" withIntrospection)
+    "-Dandroid=disabled"
+    "-Dglycin=disabled"
+    (lib.mesonBool "documentation" withIntrospection)
     (lib.mesonEnable "introspection" withIntrospection)
     (lib.mesonEnable "others" true)
   ]
@@ -108,8 +108,8 @@ stdenv.mkDerivation (finalAttrs: {
     # it should be a build-time dep for build
     # TODO: send upstream
     substituteInPlace docs/meson.build \
-      --replace "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \
-      --replace "'gi-docgen', req" "'gi-docgen', native:true, req"
+      --replace-fail "dependency('gi-docgen'," "dependency('gi-docgen', native:true," \
+      --replace-fail "'gi-docgen', req" "'gi-docgen', native:true, req"
 
     # Remove 'ani' loader until proper fix for CVE-2022-48622
     substituteInPlace meson.build --replace-fail "'ani'," ""
diff --git a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch b/pkgs/development/libraries/gdk-pixbuf/static-deps.patch
deleted file mode 100644
index da52e432b4e7..000000000000
--- a/pkgs/development/libraries/gdk-pixbuf/static-deps.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 1b7cac1cbdb7078f575a3222be451a9bf1ac35ec Mon Sep 17 00:00:00 2001
-From: Alyssa Ross <hi@alyssa.is>
-Date: Wed, 31 Jan 2024 15:33:02 +0100
-Subject: [PATCH] build: add missing dependency to gdkpixbuf_dep
-
-This should match the dependencies passed to the library() call that
-creates gdkpixbuf.  Otherwise, linking the gdkpixbuf_bin executables
-will fail if -Ddefault_library=static, because static libraries don't
-carry dependency information themselves.
----
-Link: https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/161
-
- gdk-pixbuf/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build
-index a11926eee..450484d68 100644
---- a/gdk-pixbuf/meson.build
-+++ b/gdk-pixbuf/meson.build
-@@ -269,7 +269,7 @@ endif
- gdkpixbuf_dep = declare_dependency(
-   link_with: gdkpixbuf,
-   include_directories: root_inc,
--  dependencies: gdk_pixbuf_deps,
-+  dependencies: [ gdk_pixbuf_deps, included_loaders_deps ],
-   sources: [ gdkpixbuf_enum_h, built_girs ],
- )
- meson.override_dependency('gdk-pixbuf-2.0', gdkpixbuf_dep)
--- 
-GitLab
-
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index 30dd8e2a0401..fb53da723d1a 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -67,5 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     #["BSD" "GLX" "SGI-B" "GPL2"]
     pkgConfigModules = [ "glew" ];
     inherit (mesa.meta) platforms;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch b/pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch
new file mode 100644
index 000000000000..276e9cc0bf32
--- /dev/null
+++ b/pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch
@@ -0,0 +1,50 @@
+From 38e9742ed794febbc8caa4177df14d097607a2d9 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 5 Oct 2025 12:45:25 +0200
+Subject: [PATCH 1/2] localedata: allow reproducible & parallel install of
+ locale-archive
+
+The problem with the current approach is that N processes are compiling
+a locale and updating the locale-archive at the same time. Hence,
+there's a race which process gets to update the archive first and thus
+the build is not reproducible[1].
+
+This patch changes that by adding the `--no-archive` flag to the
+`$(LOCALEDEF)` invocation in `build-one-locale` to parallelize the build
+process in a race-free manner. A single `localedef --add-to-archive`
+then adds all previously built locales to the archive.
+
+[1] https://github.com/NixOS/nixpkgs/issues/245360
+---
+ localedata/Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/localedata/Makefile b/localedata/Makefile
+index 01b32348d4..13f7d3a2c4 100644
+--- a/localedata/Makefile
++++ b/localedata/Makefile
+@@ -538,8 +538,13 @@ LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+ $(rtld-prefix) $(common-objpfx)locale/localedef
+ install-locales: install-locale-archive
+ 
++define install-all-locales
++  $(LOCALEDEF) $$flags --add-to-archive `find $(inst_complocaledir) -maxdepth 1 -mindepth 1 -type d | sort`
++endef
++
+ # Create and install the locale-archive file.
+ install-locale-archive: $(INSTALL-SUPPORTED-LOCALE-ARCHIVE)
++	$(install-all-locales)
+ # Create and install the locales individually (no archive).
+ install-locale-files: $(INSTALL-SUPPORTED-LOCALE-FILES)
+ 
+@@ -565,6 +570,7 @@ define build-one-locale
+ 	$(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
+ 		     -i locales/$$input -f charmaps/$$charset \
+ 		     $(addprefix --prefix=,$(install_root)) $$locale \
++		     --no-archive \
+ 	&& echo ' done';
+ endef
+ 
+-- 
+2.50.1
+
diff --git a/pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch b/pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch
new file mode 100644
index 000000000000..c727912a6d84
--- /dev/null
+++ b/pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch
@@ -0,0 +1,42 @@
+From 887cb6906afa2b2d8abf35ccfc33ce7b8dc902f8 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 5 Oct 2025 12:48:43 +0200
+Subject: [PATCH 2/2] Makeconfig: make inst_complocaledir overridable
+
+On NixOS, we build the locales in a separate package from glibc itself.
+Also, packages aren't installed into a common location such as `/usr`,
+but each package has its own unique prefix below `/nix/store`.
+
+For us, the current state is a problem because `localedef` is built
+in a different package and expects DESTDIR to be the unique
+package-prefix of `glibc` itself. Our current workaround is to
+invoke `localedef` with `--prefix=$TMPDIR` and copy the contents
+to the correct prefix. This was doable without patching when
+`localedef` was doing build & locale-archive creation at the
+same time.
+
+With the previous patch, the Makefile uses `$(inst_complocaledir)` to
+tell localedef where the previously built locales are. In NixOS, we now
+need to override `$(inst_complocaledir)` to point to
+`$TMPDIR/$(glibc.out)`. Hence, this patch makes the variable overridable
+from env.
+---
+ Makeconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makeconfig b/Makeconfig
+index 9eda4fa528..43d88325bc 100644
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -197,7 +197,7 @@ inst_zonedir = $(install_root)$(zonedir)
+ ifndef complocaledir
+ complocaledir = $(libdir)/locale
+ endif
+-inst_complocaledir = $(install_root)$(complocaledir)
++inst_complocaledir ?= $(install_root)$(complocaledir)
+ 
+ # Where to install the message catalog data files (which are
+ # machine-independent).
+-- 
+2.50.1
+
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index a35e5085f87c..5293c6579c5d 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -111,6 +111,10 @@ stdenv.mkDerivation (
         & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991
       */
       ./reenable_DT_HASH.patch
+
+      # enable parallel & reproducible build of glibcLocales
+      ./0001-localedata-allow-reproducible-parallel-install-of-lo.patch
+      ./0002-Makeconfig-make-inst_complocaledir-overridable.patch
     ]
     /*
       NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index bb876ba2ee1f..68ea0b1f0fb9 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -58,12 +58,11 @@ in
       makeFlagsArray+=("bindir=$bin/bin" "sbindir=$bin/sbin" "rootsbindir=$bin/sbin")
     '';
 
-    # The pie, stackprotector and fortify hardening flags are autodetected by
+    # The stackprotector and fortify hardening flags are autodetected by
     # glibc and enabled by default if supported. Setting it for every gcc
     # invocation does not work.
     hardeningDisable = [
       "fortify"
-      "pie"
       "stackprotector"
       "strictflexarrays3"
     ];
diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh
deleted file mode 100644
index 6f10476f1089..000000000000
--- a/pkgs/development/libraries/glibc/locales-builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Glibc cannot have itself in its RPATH.
-export NIX_NO_SELF_RPATH=1
-
-postConfigure() {
-    # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
-    # This has to be done *after* `configure' because it builds some
-    # test binaries.
-    export NIX_CFLAGS_LINK=
-    export NIX_LDFLAGS_BEFORE=
-
-    export NIX_DONT_SET_RPATH=1
-    unset CFLAGS
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index bd61f72fc28e..98f04f22dbcd 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -31,13 +31,25 @@
   (
     finalAttrs: previousAttrs: {
 
-      builder = ./locales-builder.sh;
-
       outputs = [ "out" ];
 
-      LOCALEDEF_FLAGS = [
-        (if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian")
-      ];
+      env = (previousAttrs.env or { }) // {
+        LOCALEDEF_FLAGS = if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian";
+
+        # Glibc cannot have itself in its RPATH.
+        NIX_NO_SELF_RPATH = 1;
+      };
+
+      postConfigure = (previousAttrs.postConfigure or "") + ''
+        # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
+        # This has to be done *after* `configure' because it builds some
+        # test binaries.
+        export NIX_CFLAGS_LINK=
+        export NIX_LDFLAGS_BEFORE=
+
+        export NIX_DONT_SET_RPATH=1
+        unset CFLAGS
+      '';
 
       preBuild =
         (previousAttrs.preBuild or "")
@@ -49,12 +61,14 @@
           # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
           LOCALEDEF_FLAGS+=" --prefix=$TMPDIR"
 
-          mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale"
+          export inst_complocaledir="$TMPDIR/"${buildPackages.glibc.out}/lib/locale
+          mkdir -p "$inst_complocaledir"
 
           echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED
 
           # Hack to allow building of the locales (needed since glibc-2.12)
-          sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef $(LOCALEDEF_FLAGS),' ../glibc-2*/localedata/Makefile
+          substituteInPlace ../glibc-2*/localedata/Makefile \
+            --replace-fail '$(rtld-prefix) $(common-objpfx)locale/localedef' 'localedef $(LOCALEDEF_FLAGS)'
         ''
         + lib.optionalString (!allLocales) ''
           # Check that all locales to be built are supported
@@ -75,12 +89,6 @@
           echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED
         '';
 
-      # Current `nixpkgs` way of building locales is not compatible with
-      # parallel install. `locale-archive` is updated in parallel with
-      # multiple `localedef` processes and causes non-deterministic result:
-      #   https://github.com/NixOS/nixpkgs/issues/245360
-      enableParallelBuilding = false;
-
       makeFlags = (previousAttrs.makeFlags or [ ]) ++ [
         "localedata/install-locales"
         "localedir=${placeholder "out"}/lib/locale"
diff --git a/pkgs/development/libraries/glibmm/2.68.nix b/pkgs/development/libraries/glibmm/2.68.nix
index 3211986f87c1..955a946cdf2f 100644
--- a/pkgs/development/libraries/glibmm/2.68.nix
+++ b/pkgs/development/libraries/glibmm/2.68.nix
@@ -13,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "glibmm";
-  version = "2.84.0";
+  version = "2.86.0";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glibmm/${lib.versions.majorMinor version}/glibmm-${version}.tar.xz";
-    hash = "sha256-Vu5fUcis/Ar99GlZMW5MhVTLUO0ra8XOOJ2XnLtkJQk=";
+    hash = "sha256-OcDp9toEbWeTkHdO/bmtVkQ2I2c23C94JeYUstQIeCY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch b/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch
deleted file mode 100644
index 437e4cd0a7a4..000000000000
--- a/pkgs/development/libraries/gobject-introspection/0001-scanner-Prefer-some-getters-over-others.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 7b2d3699ad117199bc316c7007cc5984c3b09368 Mon Sep 17 00:00:00 2001
-From: Maximiliano Sandoval <msandova@gnome.org>
-Date: Thu, 20 Mar 2025 22:52:54 +0100
-Subject: [PATCH] scanner: Prefer some getters over others
-
-At the moment the current set of heuristics to determine a getter for a
-property is good for finding *a* getter. However, if there are multiple
-candidates we might declare the wrong method as a getter.
-
-We introduce a priority system to determine which getter candidate is
-the most appropriate as the getter. The weight were chosen with gaps in
-between so that new and better heuristics have space to thrive.
-
-For a property named `p`, these are the possible getter candidates:
-
- - A method declared via the `(getter p)` annotation
- - The method `get_p`
- - The method `is_p`
- - The method `p`
-
-we declare the getter to be the first candidate in the list for which a
-method of the same name is available.
-
-See https://gitlab.gnome.org/GNOME/gjs/-/issues/681.
----
- giscanner/maintransformer.py | 22 +++++++++++++++-------
- 1 file changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py
-index a81b1777..9aaf2578 100644
---- a/giscanner/maintransformer.py
-+++ b/giscanner/maintransformer.py
-@@ -1612,7 +1612,10 @@ method or constructor of some type."""
-             if not prop.introspectable:
-                 continue
-             setter = None
--            getter = []
-+            # They keys are method names of candidates for getters. The values
-+            # are priority weights that measure how tasteful was the heuristic
-+            # used to propose their candidate.
-+            getter = {}
-             if prop.setter is None:
-                 if prop.writable and not prop.construct_only:
-                     setter = 'set_' + normalized_name
-@@ -1620,17 +1623,17 @@ method or constructor of some type."""
-                 setter = prop.setter
-             if prop.getter is None:
-                 if prop.readable:
--                    getter = ['get_' + normalized_name]
-+                    getter[f"get_{normalized_name}"] = 50
-                     # Heuristic: boolean properties can have getters that are
-                     # prefixed by is_property_name, like: gtk_window_is_maximized()
-                     if prop.type.is_equiv(ast.TYPE_BOOLEAN) and not normalized_name.startswith("is_"):
--                        getter.append(f"is_{normalized_name}")
-+                        getter[f"is_{normalized_name}"] = 25
-                     # Heuristic: read-only properties can have getters that are
-                     # just the property name, like: gtk_widget_has_focus()
-                     if not prop.writable and prop.type.is_equiv(ast.TYPE_BOOLEAN):
--                        getter.append(normalized_name)
-+                        getter[normalized_name] = 10
-             else:
--                getter = [prop.getter]
-+                getter[prop.getter] = 99
-             for method in node.methods:
-                 if not method.introspectable:
-                     continue
-@@ -1645,7 +1648,7 @@ method or constructor of some type."""
-                         method.set_property = prop.name
-                     prop.setter = method.name
-                     continue
--                if getter is not [] and method.name in getter:
-+                if getter is not {} and method.name in getter:
-                     if method.get_property is None:
-                         method.get_property = prop.name
-                     elif method.get_property != prop.name:
-@@ -1654,7 +1657,12 @@ method or constructor of some type."""
-                                           "mismatched '(get-property %s)' annotation" %
-                                           (method.symbol, prop.name, method.get_property))
-                         method.get_property = prop.name
--                    prop.getter = method.name
-+                    # Check the priority of the last matching getter
-+                    current_priority = -1
-+                    if current_getter := prop.getter:
-+                        current_priority = getter.get(current_getter, -1)
-+                    if getter[method.name] >= current_priority:
-+                        prop.getter = method.name
-                     continue
- 
-     def _pass_member_numeric_name(self, node):
--- 
-2.48.1
-
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index d461983e8d06..f5463c9bd8bc 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -43,7 +43,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gobject-introspection";
-  version = "1.84.0";
+  version = "1.86.0";
 
   # outputs TODO: share/gobject-introspection-1.0/tests is needed during build
   # by pygobject3 (and maybe others), but it's only searched in $out
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${lib.versions.majorMinor finalAttrs.version}/gobject-introspection-${finalAttrs.version}.tar.xz";
-    hash = "sha256-lFtX2n7CYuXCZrieCR0UvoAMxCQnfYKgKHK315SoR3k=";
+    hash = "sha256-kg0aP87ercMqz/lcLiA7MZA53UtKCN0aLf0oPRnAua4=";
   };
 
   patches = [
@@ -67,10 +67,6 @@ stdenv.mkDerivation (finalAttrs: {
     (replaceVars ./absolute_shlib_path.patch {
       inherit nixStoreDir;
     })
-
-    # Fix getter heuristics regression
-    # https://gitlab.gnome.org/GNOME/gobject-introspection/-/merge_requests/529
-    ./0001-scanner-Prefer-some-getters-over-others.patch
   ]
   ++ lib.optionals x11Support [
     # Hardcode the cairo shared library path in the Cairo gir shipped with this package.
diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 111897349641..a4c669eebe9f 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -104,7 +104,6 @@ stdenv.mkDerivation rec {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = "http://www.gupnp.org/";
     license = licenses.lgpl2Plus;
-    teams = [ teams.gnome ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/default.nix
index 760ec0610dee..a33b23e18275 100644
--- a/pkgs/development/libraries/gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/default.nix
@@ -4,11 +4,11 @@
   callPackage,
   ipu6ep-camera-hal,
   ipu6epmtl-camera-hal,
-  apple-sdk_13,
+  apple-sdk,
 }:
 
 let
-  apple-sdk_gstreamer = apple-sdk_13;
+  apple-sdk_gstreamer = apple-sdk;
 in
 {
   inherit apple-sdk_gstreamer;
diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 258644febdbe..46ecec7c2901 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch,
   rustPlatform,
   meson,
   ninja,
@@ -33,7 +32,6 @@
   # Checks meson.is_cross_build(), so even canExecute isn't enough.
   enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null,
   hotdoc,
-  mopidy,
   apple-sdk_gstreamer,
 }:
 
@@ -137,7 +135,7 @@ assert lib.assertMsg (invalidPlugins == [ ])
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-rs";
-  version = "0.14.1";
+  version = "0.14.2";
 
   outputs = [
     "out"
@@ -149,44 +147,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gstreamer";
     repo = "gst-plugins-rs";
     rev = finalAttrs.version;
-    hash = "sha256-gCT/ZcXR9VePXYtEENXxgBNvA84KT1OYUR8kSyLBzrI=";
-    # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
-    postFetch = ''
-      sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
-      \[\[package\]\]
-      name = "color-name"
-      version = "\([^"\n]*\)"
-      source = "registry+https://github.com/rust-lang/crates.io-index"
-      checksum = "[^"\n]*"
-      EOF
-      )"
-      sedReplace="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
-      [[package]]
-      name = "color-name"
-      version = "\1"
-      source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a"
-      EOF
-      )"
-      sed -i -ze "s|$sedSearch|$sedReplace|g" $out/Cargo.lock
-    '';
+    hash = "sha256-mIq8Fo6KoxAo1cL2NQHnSMPgzUWl1eNJUujdaerGjFA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src patches;
+    inherit (finalAttrs) src;
     name = "gst-plugins-rs-${finalAttrs.version}";
-    hash = "sha256-sX3P5qrG0M/vJkvzvJGzv4fcMn6FvrLPOUh++vKJ/gY=";
+    hash = "sha256-Z1mqpVL2SES1v0flykOwoDX2/apZHxg7eI5If4BsP4o=";
   };
 
-  patches = [
-    # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
-    ./ignore-tests.patch
-    (fetchpatch {
-      name = "x264enc-test-fix.patch";
-      url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/c0c9888d66e107f9e0b6d96cd3a85961c7e97d9a.diff";
-      hash = "sha256-/ILdPDjI20k5l9Qf/klglSuhawmFUs9mR+VhBnQqsWw=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
deleted file mode 100644
index 52b231816ce8..000000000000
--- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-index 3489eaa8..569635d6 100644
---- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
-+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-@@ -388,6 +388,7 @@ fn multi_audio() {
-     assert_eq!(current_uri_index, 2);
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn multi_audio_video() {
-     let (_events, current_iteration, current_uri_index, eos) = test(
-@@ -403,6 +404,7 @@ fn multi_audio_video() {
-     assert_eq!(current_uri_index, 1);
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn iterations() {
-     let (_events, current_iteration, current_uri_index, eos) = test(
diff --git a/pkgs/development/libraries/gtk/3.x.nix b/pkgs/development/libraries/gtk/3.x.nix
index e37a40923d1a..01c29e9da024 100644
--- a/pkgs/development/libraries/gtk/3.x.nix
+++ b/pkgs/development/libraries/gtk/3.x.nix
@@ -62,7 +62,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk+3";
-  version = "3.24.49";
+  version = "3.24.51";
 
   outputs = [
     "out"
@@ -82,12 +82,18 @@ stdenv.mkDerivation (finalAttrs: {
     in
     fetchurl {
       url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor version}/gtk-${version}.tar.xz";
-      hash = "sha256-XqUsaijw5ezy6aPC+suzDQQLc4cfzV8zzRMX6QGKFG4=";
+      hash = "sha256-ABOHfGvSPC2+Qq18cKBT0ORJvmZzZXTjeGfEnF+QWk8=";
     };
 
   patches = [
     ./patches/3.0-immodules.cache.patch
     ./patches/3.0-Xft-setting-fallback-compute-DPI-properly.patch
+    # Backport of MR 5531 to fix sincos detection with clang
+    # Adds proper headers and -D_GNU_SOURCE to function checks
+    # MR 5531 was only merged into GTK 4, never backported to gtk-3-24
+    # See: https://github.com/NixOS/nixpkgs/pull/449689
+    # Upstream: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531
+    ./patches/3.0-mr5531-backport.patch
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # X11 module requires <gio/gdesktopappinfo.h> which is not installed on Darwin
diff --git a/pkgs/development/libraries/gtk/4.x.nix b/pkgs/development/libraries/gtk/4.x.nix
index a9217ba92d14..9b5a9daaa063 100644
--- a/pkgs/development/libraries/gtk/4.x.nix
+++ b/pkgs/development/libraries/gtk/4.x.nix
@@ -28,6 +28,7 @@
   libxkbcommon,
   libpng,
   libtiff,
+  librsvg,
   libjpeg,
   libxml2,
   gnome,
@@ -68,7 +69,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk4";
-  version = "4.18.6";
+  version = "4.20.2";
 
   outputs = [
     "out"
@@ -84,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk/${lib.versions.majorMinor finalAttrs.version}/gtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4YF8ZQ3cMmH5qDRbOyKial2ArxVGMN7cA8x77O//0Po=";
+    hash = "sha256-XoJA7eyvr/K4uvRmO9zqpmjvEKIHvuTX+Q4BDhC93Fw=";
   };
 
   depsBuildBuild = [
@@ -119,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     libxkbcommon
     libpng
     libtiff
+    librsvg
     libjpeg
     (libepoxy.override { inherit x11Support; })
     isocodes
diff --git a/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch b/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch
new file mode 100644
index 000000000000..afbfb1f95eb6
--- /dev/null
+++ b/pkgs/development/libraries/gtk/patches/3.0-mr5531-backport.patch
@@ -0,0 +1,93 @@
+From f1fb82c739aebc6b37090f8ebf74d856129116d3 Mon Sep 17 00:00:00 2001
+From: Matteo Pacini <m+github@matteopacini.me>
+Date: Tue, 14 Oct 2025 22:03:27 +0100
+Subject: [PATCH] Backport MR 5531: Fix sincos detection with clang
+
+Add proper headers and -D_GNU_SOURCE to function checks to ensure
+functions like sincos are properly detected, especially with clang.
+
+Also fix gtkgears.c to avoid issues when sincos is in headers but
+not detected by the build system.
+
+Backport of https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5531
+adapted for GTK 3.24.49.
+---
+ meson.build      | 10 +++++++++-
+ tests/gtkgears.c | 22 ++++++++++++----------
+ 2 files changed, 21 insertions(+), 11 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 08337ec..92d7781 100644
+--- a/meson.build
++++ b/meson.build
+@@ -255,7 +255,15 @@ check_functions = [
+ ]
+ 
+ foreach func : check_functions
+-  if cc.has_function(func, dependencies: libm)
++  if cc.has_function(func,
++                     args: '-D_GNU_SOURCE',
++                     prefix:
++                       '#include <stdlib.h>\n' +
++                       '#include <unistd.h>\n' +
++                       '#include <sys/mman.h>\n' +
++                       '#include <fcntl.h>\n' +
++                       '#include <math.h>',
++                     dependencies: libm)
+     cdata.set('HAVE_' + func.underscorify().to_upper(), 1)
+   endif
+ endforeach
+diff --git a/tests/gtkgears.c b/tests/gtkgears.c
+index 062b611..ba7e196 100644
+--- a/tests/gtkgears.c
++++ b/tests/gtkgears.c
+@@ -48,14 +48,16 @@
+ #define VERTICES_PER_TOOTH 34
+ #define GEAR_VERTEX_STRIDE 6
+ 
+-#ifndef HAVE_SINCOS
+-static void
+-sincos (double x, double *_sin, double *_cos)
++static inline void
++_sincos (double x, double *_sin, double *_cos)
+ {
++#ifdef HAVE_SINCOS
++  sincos (x, _sin, _cos);
++#else
+   *_sin = sin (x);
+   *_cos = cos (x);
+-}
+ #endif
++}
+ 
+ /**
+  * Struct describing the vertices in triangle strip
+@@ -306,11 +308,11 @@ create_gear (GLfloat inner_radius,
+     struct point p[7];
+ 
+     /* Calculate needed sin/cos for varius angles */
+-    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+-    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+-    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+-    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+-    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
++    _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
++    _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
++    _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
++    _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
++    _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+ 
+     GEAR_POINT(p[0], r2, 1);
+     GEAR_POINT(p[1], r2, 2);
+@@ -519,7 +521,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
+    identity(tmp);
+ 
+    deltaZ = zFar - zNear;
+-   sincos(radians, &sine, &cosine);
++   _sincos(radians, &sine, &cosine);
+ 
+    if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
+       return;
+-- 
+2.50.1 (Apple Git-155)
+
diff --git a/pkgs/development/libraries/gtkmm/4.x.nix b/pkgs/development/libraries/gtkmm/4.x.nix
index 69db33598e17..4025bee7d92b 100644
--- a/pkgs/development/libraries/gtkmm/4.x.nix
+++ b/pkgs/development/libraries/gtkmm/4.x.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation rec {
   pname = "gtkmm";
-  version = "4.18.0";
+  version = "4.20.0";
 
   outputs = [
     "out"
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtkmm/${lib.versions.majorMinor version}/gtkmm-${version}.tar.xz";
-    hash = "sha256-LuMcFUefxNjpWLA8i1+7yOF7wSLCovVESXtOBWGeM+w=";
+    hash = "sha256-2q2b+bcPkJdfkXgfx6ZWySOpE3QmH1dsiDzTrr1ZyDM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gtksourceview/5.x.nix b/pkgs/development/libraries/gtksourceview/5.x.nix
index 433dca535864..986a9d6ab7b3 100644
--- a/pkgs/development/libraries/gtksourceview/5.x.nix
+++ b/pkgs/development/libraries/gtksourceview/5.x.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtksourceview";
-  version = "5.16.0";
+  version = "5.18.0";
 
   outputs = [
     "out"
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtksourceview/${lib.versions.majorMinor finalAttrs.version}/gtksourceview-${finalAttrs.version}.tar.xz";
-    hash = "sha256-qzXUIBAvPosFXdO4ZC06SCCfiIGJ5iVND/tLan6MNWY=";
+    hash = "sha256-BRp4/jj3kzKAR+W81thVxkJcC0gMINlDIXnjVnQsasA=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/intel-oneapi/base.nix b/pkgs/development/libraries/intel-oneapi/base.nix
new file mode 100644
index 000000000000..065c9dabe9c8
--- /dev/null
+++ b/pkgs/development/libraries/intel-oneapi/base.nix
@@ -0,0 +1,254 @@
+{
+  lib,
+  fetchurl,
+  zlib,
+  rdma-core,
+  libpsm2,
+  ucx,
+  numactl,
+  level-zero,
+  pkg-config,
+  libdrm,
+  elfutils,
+  xorg,
+  glib,
+  nss,
+  nspr,
+  dbus,
+  at-spi2-atk,
+  cups,
+  gtk3,
+  pango,
+  cairo,
+  mesa,
+  expat,
+  libxkbcommon,
+  eudev,
+  alsa-lib,
+  ncurses5,
+  bzip2,
+  gdbm,
+  libxcrypt-legacy,
+  freetype,
+  gtk2,
+  gdk-pixbuf,
+  fontconfig,
+  libuuid,
+  sqlite,
+
+  # The list of components to install;
+  # Either [ "all" ], [ "default" ], or a custom list of components.
+  # If you want to install all default components plus an extra one, pass [ "default" <your extra components here> ]
+  # Note that changing this will also change the `buildInputs` of the derivation.
+  # The default value is not "default" because some of the components in the defualt set are currently broken.
+  components ? [
+    "intel.oneapi.lin.advisor"
+    "intel.oneapi.lin.dpcpp-cpp-compiler"
+    "intel.oneapi.lin.dpcpp_dbg"
+    "intel.oneapi.lin.vtune"
+    "intel.oneapi.lin.mkl.devel"
+  ],
+
+  intel-oneapi,
+
+  # For tests
+  runCommand,
+  libffi,
+  stdenv,
+}:
+intel-oneapi.mkIntelOneApi (fa: {
+  pname = "intel-oneapi-base-toolkit";
+
+  src = fetchurl {
+    url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/3b7a16b3-a7b0-460f-be16-de0d64fa6b1e/intel-oneapi-base-toolkit-2025.2.1.44_offline.sh";
+    hash = "sha256-oVURJZG6uZ3YvYefUuqeakbaVR47ZgWduBV6bS6r5Dk=";
+  };
+
+  versionYear = "2025";
+  versionMajor = "2";
+  versionMinor = "1";
+  versionRel = "44";
+
+  inherit components;
+
+  # Figured out by looking at autoPatchelfHook failure output
+  depsByComponent = rec {
+    advisor = [
+      libdrm
+      zlib
+      gtk2
+      gdk-pixbuf
+      at-spi2-atk
+      glib
+      pango
+      gdk-pixbuf
+      cairo
+      fontconfig
+      glib
+      freetype
+      xorg.libX11
+      xorg.libXxf86vm
+      xorg.libXext
+      xorg.libxcb
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXfixes
+      xorg.libXrandr
+      nss
+      dbus
+      cups
+      mesa
+      expat
+      libxkbcommon
+      eudev
+      alsa-lib
+      ncurses5
+      bzip2
+      libuuid
+      gdbm
+      libxcrypt-legacy
+      sqlite
+      nspr
+    ];
+    dpcpp-cpp-compiler = [
+      zlib
+      level-zero
+    ];
+    dpcpp_dbg = [
+      level-zero
+      zlib
+    ];
+    dpcpp-ct = [ zlib ];
+    mpi = [
+      zlib
+      rdma-core
+      libpsm2
+      ucx
+      libuuid
+      numactl
+      level-zero
+      libffi
+    ];
+    pti = [ level-zero ];
+    vtune = [
+      libdrm
+      elfutils
+      zlib
+      xorg.libX11
+      xorg.libXext
+      xorg.libxcb
+      xorg.libXcomposite
+      xorg.libXdamage
+      xorg.libXfixes
+      xorg.libXrandr
+      glib
+      nss
+      dbus
+      at-spi2-atk
+      cups
+      gtk3
+      pango
+      cairo
+      mesa
+      expat
+      libxkbcommon
+      eudev
+      alsa-lib
+      at-spi2-atk
+      ncurses5
+      bzip2
+      libuuid
+      gdbm
+      libxcrypt-legacy
+      sqlite
+      nspr
+    ];
+    mkl = mpi ++ pti;
+  };
+
+  autoPatchelfIgnoreMissingDeps = [
+    # Needs to be dynamically loaded as it depends on the hardware
+    "libcuda.so.1"
+    # All too old, not in nixpkgs anymore
+    "libffi.so.6"
+    "libgdbm.so.4"
+    "libopencl-clang.so.14"
+  ];
+
+  passthru.updateScript = intel-oneapi.mkUpdateScript {
+    inherit (fa) pname;
+    file = "base.nix";
+    downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/base-toolkit-download.html?packages=oneapi-toolkit&oneapi-toolkit-os=linux&oneapi-lin=offline";
+  };
+
+  passthru.tests = {
+    mkl-libs = stdenv.mkDerivation {
+      name = "intel-oneapi-test-mkl-libs";
+      unpackPhase = ''
+        cp ${./test.c} test.c
+      '';
+
+      nativeBuildInputs = [
+        pkg-config
+      ];
+      buildInputs = [ intel-oneapi.base ];
+
+      buildPhase = ''
+        # This will fail if no libs with mkl- in their name are found
+        libs="$(pkg-config --list-all | cut -d\  -f1 | grep mkl-)"
+        for lib in $libs; do
+          echo "Testing that the build succeeds with $lib" >&2
+          gcc test.c -o test-with-$lib $(pkg-config --cflags --libs $lib)
+        done
+      '';
+
+      doCheck = true;
+
+      checkPhase = ''
+        for lib in $libs; do
+          echo "Testing that the executable built with $lib runs" >&2
+          ./test-with-$lib
+        done
+      '';
+
+      installPhase = ''
+        touch "$out"
+      '';
+    };
+
+    all-binaries-run = runCommand "intel-oneapi-test-all-binaries-run" { } ''
+      # .*-32: 32-bit executables can't be properly patched by patchelf
+      # IMB-.*: all fail with a weird "bad file descriptor" error
+      # fi_info, fi_pingpong: exits with 1 even if ran with `--help`
+      # gdb-openapi: Python not initialized
+      # hydra_bstrap_proxy, hydra_nameserver, hydra_pmi_proxy: doesn't respect --help
+      # mpirun: can't find mpiexec.hydra for some reason
+      # sycl-ls, sycl-trace: doesn't respect --help
+      regex_skip="(.*-32)|(IMB-.*)|fi_info|fi_pingpong|gdb-oneapi|hydra_bstrap_proxy|hydra_nameserver|hydra_pmi_proxy|mpirun|sycl-ls|sycl-trace"
+      export I_MPI_ROOT="${intel-oneapi.base}/mpi/latest"
+      for bin in "${intel-oneapi.base}"/bin/*; do
+        if [[ "$bin" =~ $regex_skip ]] || [ ! -f "$bin" ] || [[ ! -x "$bin" ]]; then
+          echo "skipping $bin"
+          continue
+        fi
+        echo "trying to run $bin --help or -help"
+        "$bin" --help || "$bin" -help
+      done
+      touch "$out"
+    '';
+  };
+
+  meta = {
+    description = "Intel oneAPI Base Toolkit";
+    homepage = "https://software.intel.com/content/www/us/en/develop/tools/oneapi/base-toolkit.html";
+    license = with lib.licenses; [
+      intel-eula
+      issl
+      asl20
+    ];
+    maintainers = with lib.maintainers; [
+      balsoft
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+})
diff --git a/pkgs/development/libraries/intel-oneapi/default.nix b/pkgs/development/libraries/intel-oneapi/default.nix
new file mode 100644
index 000000000000..217756b9a9c1
--- /dev/null
+++ b/pkgs/development/libraries/intel-oneapi/default.nix
@@ -0,0 +1,188 @@
+{
+  lib,
+  callPackage,
+  stdenv,
+  ncurses5,
+  bc,
+  bubblewrap,
+  autoPatchelfHook,
+  python3,
+  libgcc,
+  glibc,
+  writeShellScript,
+  writeText,
+  writeTextFile,
+
+  # For the updater script
+  writeShellApplication,
+  curl,
+  jq,
+  htmlq,
+  common-updater-scripts,
+  writableTmpDirAsHomeHook,
+}:
+
+{
+  mkIntelOneApi = lib.extendMkDerivation {
+    constructDrv = stdenv.mkDerivation;
+
+    excludeDrvArgNames = [
+      "depsByComponent"
+      "components"
+    ];
+
+    extendDrvArgs =
+      fa:
+      {
+        pname,
+        versionYear,
+        versionMajor,
+        versionMinor,
+        versionRel,
+        src,
+        meta,
+        depsByComponent ? { },
+        postInstall ? "",
+        components ? [ "default" ],
+        ...
+      }@args:
+      let
+        shortName = name: builtins.elemAt (lib.splitString "." name) 3;
+      in
+      {
+        version = "${fa.versionYear}.${fa.versionMajor}.${fa.versionMinor}.${fa.versionRel}";
+
+        nativeBuildInputs = [
+          # Installer wants tput
+          ncurses5
+          # Used to check if there's enough disk space
+          bc
+          bubblewrap
+
+          autoPatchelfHook
+          writableTmpDirAsHomeHook
+        ];
+
+        buildInputs = [
+          # For patchShebangs
+          python3
+        ]
+        # autoPatchelfHook will add these libraries to RPATH as required
+        ++ lib.concatMap (
+          comp:
+          if comp == "all" || comp == "default" then
+            lib.concatLists (builtins.attrValues depsByComponent)
+          else
+            depsByComponent.${shortName comp} or [ ]
+        ) components;
+
+        phases = [
+          "installPhase"
+          "fixupPhase"
+        ];
+
+        # See https://software.intel.com/content/www/us/en/develop/documentation/installation-guide-for-intel-oneapi-toolkits-linux/top/installation/install-with-command-line.html
+        installPhase = ''
+          runHook preInstall
+          # The installer expects that the installation directory is already present
+          mkdir -p "$out"
+
+          # Required for the installer to find libstdc++
+          export LD_LIBRARY_PATH="${lib.makeLibraryPath [ libgcc.lib ]}"
+
+          # The installer is an insane four-stage rube goldberg machine:
+          # 1. Our $src (bash script) unpacks install.sh (bash script)
+          # 2. install.sh unpacks bootstrapper (dylinked binary with hardcoded interpreter in /lib)
+          # 3. bootstrapper unpacks installer (dylinked binary with hardcoded interpreter and libraries in /lib)
+          # 4. installer installs the actual components we need
+          #
+          # While stage 1 allows to "only extract", other stages always try running the next executable down, and remove stuff if they fail.
+          # I'm afraid this is the cleanest solution for now.
+          mkdir -p fhs-root/{lib,lib64}
+          ln -s "${glibc}/lib/"* fhs-root/lib/
+          ln -s "${glibc}/lib/"* fhs-root/lib64/
+          bwrap \
+            --bind fhs-root / \
+            --bind /nix /nix \
+            --ro-bind /bin /bin \
+            --dev /dev \
+            --proc /proc \
+            bash "$src" \
+              -a \
+              --silent \
+              --eula accept \
+              --install-dir "$out" \
+              --components ${lib.concatStringsSep ":" components}
+
+          # Non-reproducible
+          rm -rf "$out"/logs
+          # This contains broken symlinks and doesn't seem to be useful
+          rm -rf "$out"/.toolkit_linking_tool
+
+          ln -s "$out/$versionYear.$versionMajor"/{lib,etc,bin,share,opt} "$out"
+
+          runHook postInstall
+        '';
+      };
+  };
+
+  mkUpdateScript =
+    {
+      pname,
+      downloadPage,
+      file,
+    }:
+    writeShellApplication {
+      name = "update-intel-oneapi";
+      runtimeInputs = [
+        curl
+        jq
+        htmlq
+        common-updater-scripts
+      ];
+      text = ''
+        download_page=${lib.escapeShellArg downloadPage}
+        pname=${lib.escapeShellArg pname}
+        nixpkgs="$(git rev-parse --show-toplevel)"
+        packageDir="$nixpkgs/pkgs/by-name/in/intel-oneapi"
+        file="$packageDir"/${lib.escapeShellArg file}
+
+        echo 'Figuring out the download URL' >&2
+
+        # Intel helpfully gives us a wget command to run so that we can download the toolkit installer, as part of their product page.
+        # This variable will contain that command (wget https://...), we will extract the URL from it.
+        wget_command="$(curl "$download_page" \
+          | htmlq 'code' --text \
+          | grep "wget.*$pname.*sh")"
+
+        regex="wget (.*$pname.([0-9]+)[.]([0-9]+)[.]([0-9]+)[.]([0-9]+)_offline[.]sh)"
+        if [[ "$wget_command" =~ $regex ]]; then
+            url="''${BASH_REMATCH[1]}"
+            versionYear="''${BASH_REMATCH[2]}"
+            versionMajor="''${BASH_REMATCH[3]}"
+            versionMinor="''${BASH_REMATCH[4]}"
+            versionRel="''${BASH_REMATCH[5]}"
+        else
+            echo "'$wget_command' does not match the expected format $regex" >&2
+            exit 1
+        fi
+
+        if [[ "$(grep 'url =' "$file")" =~ "$url" ]] && [[ "''${BASH_REMATCH[0]}" == "$url" ]]; then
+            echo "The URL is the same ($url), skipping update" >&2
+        else
+            echo "The new download URL is $url, prefetching it to store" >&2
+            hash="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --quiet "$url")")"
+        fi
+
+        sed -i "s|versionYear = \".*\";|versionYear = \"$versionYear\";|" "$file"
+        sed -i "s|versionMajor = \".*\";|versionMajor = \"$versionMajor\";|" "$file"
+        sed -i "s|versionMinor = \".*\";|versionMinor = \"$versionMinor\";|" "$file"
+        sed -i "s|versionRel = \".*\";|versionRel = \"$versionRel\";|" "$file"
+        sed -i "s|url = \".*\";|url = \"$url\";|" "$file"
+        sed -i "s|hash = \".*\";|hash = \"$hash\";|" "$file"
+      '';
+    };
+
+  base = callPackage ./base.nix { };
+  hpc = callPackage ./hpc.nix { };
+}
diff --git a/pkgs/development/libraries/intel-oneapi/hpc.nix b/pkgs/development/libraries/intel-oneapi/hpc.nix
new file mode 100644
index 000000000000..181205a0ef76
--- /dev/null
+++ b/pkgs/development/libraries/intel-oneapi/hpc.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  fetchurl,
+
+  # The list of components to install;
+  # Either [ "all" ], [ "default" ], or a custom list of components.
+  # If you want to install all default components plus an extra one, pass [ "default" <your extra components here> ]
+  # Note that changing this will also change the `buildInputs` of the derivation.
+  #
+  # If you want other components listed of the toolkit, consider using intel-oneapi.base instead;
+  # This are specifically the components that are not present there.
+  components ? [
+    "intel.oneapi.lin.dpcpp-cpp-compiler"
+    "intel.oneapi.lin.ifort-compiler"
+    "intel.oneapi.lin.mpi.devel"
+    "intel.oneapi.lin.tbb.devel"
+  ],
+
+  intel-oneapi,
+  zlib,
+  rdma-core,
+  libpsm2,
+  ucx,
+  libuuid,
+  numactl,
+  level-zero,
+  libffi,
+}:
+intel-oneapi.mkIntelOneApi (fa: {
+  pname = "intel-oneapi-hpc-toolkit";
+
+  src = fetchurl {
+    url = "https://registrationcenter-download.intel.com/akdlm/IRC_NAS/2d2a6686-ff06-44ce-baf0-ab84f8dafa89/intel-oneapi-hpc-toolkit-2025.2.1.44_offline.sh";
+    hash = "sha256-SC0eDu4TGf9bZB8aAX4AnIvguTpP0afOj9JqA63QSPs=";
+  };
+
+  versionYear = "2025";
+  versionMajor = "2";
+  versionMinor = "1";
+  versionRel = "44";
+
+  inherit components;
+
+  depsByComponent = {
+    mpi = [
+      zlib
+      rdma-core
+      libpsm2
+      ucx
+      libuuid
+      numactl
+      level-zero
+      libffi
+    ];
+    pti = [ level-zero ];
+    ifort-compiler = [ ];
+  };
+
+  autoPatchelfIgnoreMissingDeps = [
+    # Needs to be dynamically loaded as it depends on the hardware
+    "libcuda.so.1"
+  ];
+
+  passthru.updateScript = intel-oneapi.mkUpdateScript {
+    inherit (fa) pname;
+    file = "hpc.nix";
+    downloadPage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit-download.html?packages=hpc-toolkit&hpc-toolkit-os=linux&hpc-toolkit-lin=offline";
+  };
+
+  meta = {
+    description = "Intel oneAPI HPC Toolkit";
+    homepage = "https://www.intel.com/content/www/us/en/developer/tools/oneapi/hpc-toolkit.html";
+    license = with lib.licenses; [
+      intel-eula
+      issl
+      asl20
+    ];
+    maintainers = with lib.maintainers; [
+      balsoft
+    ];
+    platforms = [ "x86_64-linux" ];
+  };
+})
diff --git a/pkgs/development/libraries/intel-oneapi/test.c b/pkgs/development/libraries/intel-oneapi/test.c
new file mode 100644
index 000000000000..9413ac0c68e9
--- /dev/null
+++ b/pkgs/development/libraries/intel-oneapi/test.c
@@ -0,0 +1,12 @@
+#include <assert.h>
+
+#include <mkl_cblas.h>
+
+int main() {
+  float u[] = {1., 2., 3.};
+  float v[] = {4., 5., 6.};
+
+  float dp = cblas_sdot(3, u, 1, v, 1);
+
+  assert(dp == 32.);
+}
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 0995fb7563a0..5215d7d78947 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -57,5 +57,7 @@ stdenv.mkDerivation {
     license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/libraries/isl/0.24.0.nix b/pkgs/development/libraries/isl/0.24.0.nix
deleted file mode 100644
index 90eb5ec0fac2..000000000000
--- a/pkgs/development/libraries/isl/0.24.0.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-import ./generic.nix rec {
-  version = "0.24";
-  urls = [
-    "mirror://sourceforge/libisl/isl-${version}.tar.xz"
-    "https://libisl.sourceforge.io/isl-${version}.tar.xz"
-  ];
-  sha256 = "1bgbk6n93qqn7w8v21kxf4x6dc3z0ypqrzvgfd46nhagak60ac84";
-  configureFlags = [
-    "--with-gcc-arch=generic" # don't guess -march=/mtune=
-  ];
-}
diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index ede33338a811..c55c362c6d4f 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -124,7 +124,8 @@ stdenv.mkDerivation {
     "-DITK_USE_SYSTEM_SWIG=ON"
     "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}"
   ]
-  ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ];
+  ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]
+  ++ lib.optionals (lib.versionOlder version "5.4") [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/development/libraries/jkqtplotter/default.nix b/pkgs/development/libraries/jkqtplotter/default.nix
new file mode 100644
index 000000000000..8699da76be4b
--- /dev/null
+++ b/pkgs/development/libraries/jkqtplotter/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  qttools,
+  wrapQtAppsHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jkqtplotter";
+  version = "5.0.0-unstable-2025-10-13";
+
+  src = fetchFromGitHub {
+    owner = "jkriege2";
+    repo = "JKQtPlotter";
+    rev = "d243218119b1632987df26baea0d4bc6ccdee533";
+    hash = "sha256-fLkZGl4LYr9zdGjxxhcU6IZkpXV/Sex4TC9DFPyw43M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qttools
+  ];
+
+  meta = {
+    description = "Qt plotting framework";
+    maintainers = [ lib.maintainers.sheepforce ];
+    homepage = "https://github.com/jkriege2/JKQtPlotter";
+    license = lib.licenses.lgpl21Plus;
+  };
+})
diff --git a/pkgs/development/libraries/kdb/default.nix b/pkgs/development/libraries/kdb/default.nix
index 8909caffcef7..e04804e60f84 100644
--- a/pkgs/development/libraries/kdb/default.nix
+++ b/pkgs/development/libraries/kdb/default.nix
@@ -1,8 +1,7 @@
 {
   mkDerivation,
   lib,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitLab,
   extra-cmake-modules,
   qtbase,
   kcoreaddons,
@@ -13,28 +12,18 @@
   qttools,
 }:
 
-mkDerivation rec {
+mkDerivation {
   pname = "kdb";
-  version = "3.2.0";
+  version = "3.2.0-unstable-2025-10-17";
 
-  src = fetchurl {
-    url = "mirror://kde/stable/kdb/src/kdb-${version}.tar.xz";
-    sha256 = "0s909x34a56n3xwhqz27irl2gbzidax0685w2kf34f0liny872cg";
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "libraries";
+    repo = "kdb";
+    rev = "819f9f61d629ffd80990ae17ae6c8078721a142b";
+    hash = "sha256-XkpFFzTgLEjPxEzwinbGhHRTULQrhl5TdakJlQuI27A=";
   };
 
-  patches = [
-    # fix build with newer QT versions
-    (fetchpatch {
-      url = "https://github.com/KDE/kdb/commit/b36d74f13a1421437a725fb74502c993c359392a.patch";
-      sha256 = "sha256-ENMZTUZ3yCKUhHPMUcDe1cMY2GLBz0G3ZvMRyj8Hfrw=";
-    })
-    # fix build with newer posgresql versions
-    (fetchpatch {
-      url = "https://github.com/KDE/kdb/commit/40cdaea4d7824cc1b0d26e6ad2dcb61fa2077911.patch";
-      sha256 = "sha256-cZpX6L/NZX3vztnh0s2+v4J7kBcKgUdecY53LRp8CwM=";
-    })
-  ];
-
   nativeBuildInputs = [
     extra-cmake-modules
     qttools
@@ -50,11 +39,11 @@ mkDerivation rec {
 
   propagatedBuildInputs = [ qtbase ];
 
-  meta = with lib; {
+  meta = {
     description = "Database connectivity and creation framework for various database vendors";
     mainProgram = "kdb3_sqlite3_dump";
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ zraexy ];
+    license = lib.licenses.lgpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ zraexy ];
   };
 }
diff --git a/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch b/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch
new file mode 100644
index 000000000000..e41de5e30ac7
--- /dev/null
+++ b/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 12dbdbb..22495bb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project( kdiagram )
+ 
+diff --git a/src/KChart/CMakeLists.txt b/src/KChart/CMakeLists.txt
+index 676b71f..a9a2928 100644
+--- a/src/KChart/CMakeLists.txt
++++ b/src/KChart/CMakeLists.txt
+@@ -359,6 +359,7 @@ install(EXPORT KChartTargets
+ ecm_generate_pri_file(
+     BASE_NAME KChart
+     LIB_NAME KChart
++    VERSION ${KCHARTLIB_VERSION}
+     DEPS "widgets svg"
+     FILENAME_VAR PRI_FILENAME
+     INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KChart
+diff --git a/src/KGantt/CMakeLists.txt b/src/KGantt/CMakeLists.txt
+index 107d762..5cbb254 100644
+--- a/src/KGantt/CMakeLists.txt
++++ b/src/KGantt/CMakeLists.txt
+@@ -183,6 +183,7 @@ install(EXPORT KGanttTargets
+ ecm_generate_pri_file(
+     BASE_NAME KGantt
+     LIB_NAME KGantt
++    VERSION ${KGANTTLIB_VERSION}
+     DEPS "widgets printsupport"
+     FILENAME_VAR PRI_FILENAME
+     INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KGantt
diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix
index 6d52a84c97b8..e280ffbc21ac 100644
--- a/pkgs/development/libraries/kdiagram/default.nix
+++ b/pkgs/development/libraries/kdiagram/default.nix
@@ -18,6 +18,9 @@ mkDerivation rec {
     rev = "v${version}";
     sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8=";
   };
+  patches = [
+    ./cmake-minimum-required.patch
+  ];
   nativeBuildInputs = [
     extra-cmake-modules
     qttools
diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 65db7cc102e9..e5e09c02cbc5 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   bootstrap_cmds,
   byacc, # can also use bison, but byacc has fewer dependencies
   keyutils,
@@ -42,6 +43,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-GogyuMrZI+u/E5T2fi789B46SfRgKFpm41reyPoAU68=";
   };
 
+  patches = lib.optionals stdenv.hostPlatform.isFreeBSD [
+    (fetchpatch {
+      name = "fix-missing-ENODATA.patch";
+      url = "https://cgit.freebsd.org/ports/plain/security/krb5-122/files/patch-lib_krad_packet.c?id=0501f716c4aff7880fde56e42d641ef504593b7d";
+      extraPrefix = "";
+      hash = "sha256-l8ev+WrDKbTqwgBRYhfJGELkCCE8mJTqVHFBvvCPvgE=";
+    })
+  ];
+
   outputs = [
     "out"
     "lib"
diff --git a/pkgs/development/libraries/kf5gpgmepp/default.nix b/pkgs/development/libraries/kf5gpgmepp/default.nix
deleted file mode 100644
index 826a2f25f3c6..000000000000
--- a/pkgs/development/libraries/kf5gpgmepp/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchgit,
-  cmake,
-  extra-cmake-modules,
-  qtbase,
-  boost,
-  gpgme,
-}:
-
-mkDerivation {
-  pname = "kf5gpgmepp";
-  version = "16.08.3";
-
-  src = fetchgit {
-    url = "https://anongit.kde.org/gpgmepp.git";
-    rev = "9826f6674e496ce575f606d17c318566381b3b15";
-    sha256 = "02ck2l3s8s7xh44blqaqnc5k49ccicdnzvhiwa67a3zgicz5i0vh";
-  };
-
-  buildInputs = [
-    qtbase
-    boost
-  ];
-  propagatedBuildInputs = [ gpgme ];
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-  ];
-
-  meta = with lib; {
-    license = [ licenses.lgpl2 ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/development/libraries/kproperty/cmake-minimum-required.patch b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch
new file mode 100644
index 000000000000..9d7143b66a15
--- /dev/null
+++ b/pkgs/development/libraries/kproperty/cmake-minimum-required.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2d589d5..0e1390f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ set(KPROPERTY_GENERATE_PRI TRUE)
+-cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
+ find_package(ECM 1.8.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ include(SetKPropertyCMakePolicies NO_POLICY_SCOPE)
+diff --git a/cmake/modules/SetKPropertyCMakePolicies.cmake b/cmake/modules/SetKPropertyCMakePolicies.cmake
+index bc28d8a..85370c2 100644
+--- a/cmake/modules/SetKPropertyCMakePolicies.cmake
++++ b/cmake/modules/SetKPropertyCMakePolicies.cmake
+@@ -9,7 +9,7 @@ cmake_policy(SET CMP0053 NEW) # TODO remove, temporary fix for a bug in Qt 5.8's
+                               # "Simplify variable reference and escape sequence evaluation"
+ 
+ if(POLICY CMP0059) # Don’t treat DEFINITIONS as a built-in directory property.
+-    cmake_policy(SET CMP0059 OLD)
++    cmake_policy(SET CMP0059 NEW)
+ endif()
+ if(POLICY CMP0063) # Honor visibility properties for all target types (since cmake 3.3)
+     cmake_policy(SET CMP0063 NEW)
diff --git a/pkgs/development/libraries/kproperty/default.nix b/pkgs/development/libraries/kproperty/default.nix
index b1a9aaa2c6e4..8bba65ad63d1 100644
--- a/pkgs/development/libraries/kproperty/default.nix
+++ b/pkgs/development/libraries/kproperty/default.nix
@@ -20,6 +20,10 @@ mkDerivation rec {
     sha256 = "1yldfsdamk4dag8dyryjn5n9j2pzi42s79kkafymfnbifhnhrbv7";
   };
 
+  patches = [
+    ./cmake-minimum-required.patch
+  ];
+
   nativeBuildInputs = [ extra-cmake-modules ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index 455223596877..c8e33ae7f07f 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -29,5 +29,7 @@ stdenv.mkDerivation rec {
     license = licenses.isc;
     maintainers = [ ];
     platforms = platforms.all;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index c809df245d09..51033edff513 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 = "140.1.14";
-  gitRevision = "eb1c06e";
-  chromiumVersion = "140.0.7339.185";
+  version = "141.0.7";
+  gitRevision = "a5714cc";
+  chromiumVersion = "141.0.7390.108";
   buildType = "Release";
 
   srcHash = selectSystem {
-    aarch64-linux = "sha256-psgs+RcEYWKN4NneU4eVIaV2b7y+doxdPs9QWsN8dTA=";
-    x86_64-linux = "sha256-CDVzU+GIAU6hEutot90GMlAS8xEqD3uNLppgGq9d4mE=";
+    aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE=";
+    x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk=";
   };
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix
index e79779980e1d..d048102849ba 100644
--- a/pkgs/development/libraries/libcxxrt/default.nix
+++ b/pkgs/development/libraries/libcxxrt/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation {
     sha256 = "+oTjU/DgOEIwJebSVkSEt22mJSdeONozB8FfzEiESHU=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   outputs = [
diff --git a/pkgs/development/libraries/libffi/default.nix b/pkgs/development/libraries/libffi/default.nix
index 02f93a256c54..dbabceb5230f 100644
--- a/pkgs/development/libraries/libffi/default.nix
+++ b/pkgs/development/libraries/libffi/default.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation (finalAttrs: {
   # cgit) that are needed here should be included directly in Nixpkgs as
   # files.
   patches = [
+    # Threading tests need to be linked against pthread
+    # See: https://github.com/libffi/libffi/pull/944
+    ./freebsd-tsan-pthread.patch
   ];
 
   strictDeps = true;
diff --git a/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch b/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch
new file mode 100644
index 000000000000..05c278bdbc83
--- /dev/null
+++ b/pkgs/development/libraries/libffi/freebsd-tsan-pthread.patch
@@ -0,0 +1,24 @@
+From e52a0790a9b80492cba2907c27d0a9e4248b6608 Mon Sep 17 00:00:00 2001
+From: Jon Hermansen <jon@jh86.org>
+Date: Tue, 28 Oct 2025 18:02:39 -0400
+Subject: [PATCH] fix tsan tests on FreeBSD by linking to pthread
+
+---
+ testsuite/lib/libffi.exp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/testsuite/lib/libffi.exp b/testsuite/lib/libffi.exp
+index 81eff7752..308db6f8d 100644
+--- a/testsuite/lib/libffi.exp
++++ b/testsuite/lib/libffi.exp
+@@ -407,6 +407,10 @@ proc libffi_target_compile { source dest type options } {
+             lappend options "libs= -lpthread"
+         }
+ 
++        if { [string match "*-*-freebsd*" $target_triplet] } {
++            lappend options "libs= -lpthread"
++        }
++
+         lappend options "libs= -lffi"
+ 
+         if { [string match "aarch64*-*-linux*" $target_triplet] } {
diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/development/libraries/libgda/5.x.nix
index 0761542379d3..ff40c3ccf86e 100644
--- a/pkgs/development/libraries/libgda/5.x.nix
+++ b/pkgs/development/libraries/libgda/5.x.nix
@@ -78,15 +78,15 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-mysql=${if mysqlSupport then "yes" else "no"}"
-    "--with-postgres=${if postgresSupport then "yes" else "no"}"
+    "--with-mysql=${lib.boolToYesNo mysqlSupport}"
+    "--with-postgres=${lib.boolToYesNo postgresSupport}"
 
     # macOS builds use the sqlite source code that comes with libgda,
     # as opposed to using the system or brewed sqlite3, which is not supported on macOS,
     # as mentioned in https://github.com/GNOME/libgda/blob/95eeca4b0470f347c645a27f714c62aa6e59f820/libgda/sqlite/README#L31,
     # which references the paper https://web.archive.org/web/20100610151539/http://lattice.umiacs.umd.edu/files/functions_tr.pdf
     # See also https://github.com/Homebrew/homebrew-core/blob/104f9ecd02854a82372b64d63d41356555378a52/Formula/libgda.rb
-    "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
+    "--enable-system-sqlite=${lib.boolToYesNo (!stdenv.hostPlatform.isDarwin)}"
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index c466646c9358..8a166dfe0ea9 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libiconv";
-  version = "1.17";
+  version = "1.18";
 
   src = fetchurl {
     url = "mirror://gnu/libiconv/${pname}-${version}.tar.gz";
-    sha256 = "sha256-j3QhO1YjjIWlClMp934GGYdx5w3Zpzl3n0wC9l2XExM=";
+    sha256 = "sha256-Owj19Pm064LxUacEC/1v5sb7ki7+SxZZxm6pMydpZeg=";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 1a00fab8d27b..868bb2745691 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -9,6 +9,7 @@
   libevdev,
   mtdev,
   udev,
+  wacomSupport ? true,
   libwacom,
   documentationSupport ? false,
   doxygen,
@@ -50,7 +51,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.29.1";
+  version = "1.29.2";
 
   outputs = [
     "bin"
@@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
     owner = "libinput";
     repo = "libinput";
     rev = version;
-    hash = "sha256-wNiI6QPwuK0gUJRadSJx+FOx84kpVC4bXhuQ3ybewoY=";
+    hash = "sha256-oxDGUbZebxAmBd2j51qV9Jn8SXBjUX2NPRgkxbDz7Dk=";
   };
 
   patches = [
@@ -85,7 +86,6 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libevdev
     mtdev
-    libwacom
     (python3.withPackages (
       pp: with pp; [
         pp.libevdev # already in scope
@@ -95,6 +95,9 @@ stdenv.mkDerivation rec {
       ]
     ))
   ]
+  ++ lib.optionals wacomSupport [
+    libwacom
+  ]
   ++ lib.optionals eventGUISupport [
     # GUI event viewer
     cairo
@@ -116,6 +119,7 @@ stdenv.mkDerivation rec {
     (mkFlag documentationSupport "documentation")
     (mkFlag eventGUISupport "debug-gui")
     (mkFlag testsSupport "tests")
+    (mkFlag wacomSupport "libwacom")
     "--sysconfdir=/etc"
     "--libexecdir=${placeholder "bin"}/libexec"
   ];
diff --git a/pkgs/development/libraries/libint/default.nix b/pkgs/development/libraries/libint/default.nix
index 5dbd4e287070..50140fcc6cb4 100644
--- a/pkgs/development/libraries/libint/default.nix
+++ b/pkgs/development/libraries/libint/default.nix
@@ -128,7 +128,7 @@ assert (
 
 let
   pname = "libint";
-  version = "2.11.1";
+  version = "2.11.2";
 
   meta = {
     description = "Library for the evaluation of molecular integrals of many-body operators over Gaussian functions";
@@ -151,7 +151,7 @@ let
       owner = "evaleev";
       repo = "libint";
       rev = "v${version}";
-      hash = "sha256-oV/RWWfD0Kf2egI40fV8z2atG+4Cs+9+Wvy0euNNjtM=";
+      hash = "sha256-pqv3lpaLtbSNi1oC361YeCg57Bb8jQ8eNzU3q4US1vc=";
     };
 
     # Replace hardcoded "/bin/rm" with normal "rm"
diff --git a/pkgs/development/libraries/liblastfm/default.nix b/pkgs/development/libraries/liblastfm/default.nix
index 7530d998e51e..5eba0b261380 100644
--- a/pkgs/development/libraries/liblastfm/default.nix
+++ b/pkgs/development/libraries/liblastfm/default.nix
@@ -30,6 +30,14 @@ stdenv.mkDerivation {
     })
   ];
 
+  # CMake 2.8.6 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.6)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     which
@@ -41,9 +49,9 @@ stdenv.mkDerivation {
     qtbase
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString (
-    stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11"
-  ) "-std=c++11";
+  env.NIX_CFLAGS_COMPILE =
+    (lib.optionalString (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") "-std=c++11")
+    + (lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-dynamic-exception-spec");
 
   dontWrapQtApps = true;
 
diff --git a/pkgs/development/libraries/libpeas/2.x.nix b/pkgs/development/libraries/libpeas/2.x.nix
index 5ea842c86ce1..2fc9b559723d 100644
--- a/pkgs/development/libraries/libpeas/2.x.nix
+++ b/pkgs/development/libraries/libpeas/2.x.nix
@@ -15,7 +15,7 @@
   glib,
   lua5_1,
   python3,
-  spidermonkey_128,
+  spidermonkey_140,
   gnome,
 }:
 
@@ -24,7 +24,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libpeas";
-  version = "2.0.7";
+  version = "2.2.0";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-HpqdaXYdIQnv9bfBHYyWtIZ8z6yiuSHt7UlAEZJ2nsk=";
+    hash = "sha256-wohyM/CEpp+r/H+gFA1BBJGGPXBQr7KGd/mlU7JYCtk=";
   };
 
   patches = [
@@ -65,12 +65,12 @@ stdenv.mkDerivation rec {
     luaEnv
     python3
     python3.pkgs.pygobject3
-    spidermonkey_128
+    spidermonkey_140
   ];
 
   propagatedBuildInputs = [
     # Required by libpeas-2.pc
-    gobject-introspection
+    glib
   ];
 
   mesonFlags = [
diff --git a/pkgs/development/libraries/libpeas/default.nix b/pkgs/development/libraries/libpeas/default.nix
index 4e83219019ba..74fc27b7d7d2 100644
--- a/pkgs/development/libraries/libpeas/default.nix
+++ b/pkgs/development/libraries/libpeas/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   replaceVars,
   meson,
   ninja,
@@ -39,6 +40,18 @@ stdenv.mkDerivation rec {
         python3.pkgs.pygobject3
       ];
     })
+
+    # girepository: port libpeas ABI to girepository
+    # https://gitlab.gnome.org/GNOME/libpeas/-/issues/58
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/73e25b6059d2fdc090a3feb8341ff902c3ec0d16.patch";
+      hash = "sha256-xNp/DbLV2mdMiUALdEWE4ssyD3krWmzmJIwgStsNShM=";
+    })
+    # build: handle depending on development releases of GLib
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libpeas/-/commit/4613accc2e22395bb77bdf612fcdf90bf65f230f.patch";
+      hash = "sha256-VGPLDswH3St/SzS19iHr5dA/ywzDsXhd7FMUg4rII9U=";
+    })
   ];
 
   depsBuildBuild = [
diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 850d0c1caa70..9441dfa4aeea 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   olm,
   openssl,
@@ -12,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libquotient";
-  version = "0.9.1";
+  version = "0.9.5";
 
   outputs = [
     "out"
@@ -23,9 +24,18 @@ stdenv.mkDerivation rec {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    hash = "sha256-R9ms3sYGdHaYKUMnZyBjw5KCik05k93vlvXMRtAXh5Y=";
+    hash = "sha256-wdIE5LI4l3WUvpGfoJBL8sjBl2k8NfZTh9CjfJc9FIA=";
   };
 
+  patches = [
+    # Qt 6.10 compat
+    # FIXME: remove in next update
+    (fetchpatch {
+      url = "https://github.com/quotient-im/libQuotient/commit/ea83157eed37ff97ab275a5d14c971f0a5a70595.diff";
+      hash = "sha256-JMdcywGgZ0Gev/Nce4oPiMJQxTBJYPoq+WoT3WLWWNQ=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index 7a9bb46c76d4..d8710b19efb7 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
     description = "HTTP client/server library for GNOME";
     homepage = "https://gitlab.gnome.org/GNOME/libsoup";
     license = lib.licenses.lgpl2Plus;
-    inherit (glib.meta) maintainers platforms teams;
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
     pkgConfigModules = [
       "libsoup-2.4"
       "libsoup-gnome-2.4"
diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix
index 86aef1036258..1804f4587546 100644
--- a/pkgs/development/libraries/libubox/default.nix
+++ b/pkgs/development/libraries/libubox/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation {
   pname = "libubox";
-  version = "0-unstable-2025-07-23";
+  version = "0-unstable-2025-10-14";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libubox.git";
-    rev = "49056d178f42da98048a5d4c23f83a6f6bc6dd80";
-    hash = "sha256-sk5r18M0hJ+8CrC2G/rb+XqUmUGer2VBrVbuReHj1dM=";
+    rev = "7d6b9d98d0bdd4e14aedeb7908c28e4b318c8191";
+    hash = "sha256-SBw83zT/tMvmndo4bZ19sLWc493G2jefMhrvqjQ6WJc=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 1d703fa5f89f..5e74e9ec0e9b 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -22,11 +22,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libunistring";
-  version = "1.3";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jqjM+GwJ3YAcjKwZh46ATlT3B89piENxEw0gveaDhrc=";
+    hash = "sha256-ElQq12GUcO/ZWmIxdNzUs2TySDyvcIxr7oN8tTpUy50=";
   };
 
   outputs = [
diff --git a/pkgs/development/libraries/libxcrypt/default.nix b/pkgs/development/libraries/libxcrypt/default.nix
index b848ace3879d..d4d67d533f0f 100644
--- a/pkgs/development/libraries/libxcrypt/default.nix
+++ b/pkgs/development/libraries/libxcrypt/default.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxcrypt";
-  version = "4.4.38";
+  version = "4.5.0";
 
   src = fetchurl {
     url = "https://github.com/besser82/libxcrypt/releases/download/v${finalAttrs.version}/libxcrypt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-gDBLnDBup5kyfwHZp1Sb2ygxd4kYJjHxtU9FEbQgbdY=";
+    hash = "sha256-gl52Tk/y5jBK24FM2ilwdLIi1UoE7b2OvHz1j8OvhX0=";
   };
 
   # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion
@@ -78,9 +78,10 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     };
     enabledCryptSchemeIds = [
-      # https://github.com/besser82/libxcrypt/blob/v4.4.35/lib/hashes.conf
+      # https://github.com/besser82/libxcrypt/blob/v4.5.0/lib/hashes.conf
       "y" # yescrypt
       "gy" # gost_yescrypt
+      "sm3y" # sm3_yescrypt
       "7" # scrypt
       "2b" # bcrypt
       "2y" # bcrypt_y
diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index eb16734eede4..4b2f04bbc8f0 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -5,19 +5,11 @@
   pkg-config,
   autoreconfHook,
   python3,
+  doxygen,
   ncurses,
   findXMLCatalogs,
   libiconv,
-  # Python limits cross-compilation to an allowlist of host OSes.
-  # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
-  pythonSupport ?
-    enableShared
-    && (
-      stdenv.hostPlatform == stdenv.buildPlatform
-      || stdenv.hostPlatform.isCygwin
-      || stdenv.hostPlatform.isLinux
-      || stdenv.hostPlatform.isWasi
-    ),
+  pythonSupport ? false,
   icuSupport ? false,
   icu,
   zlibSupport ? false,
@@ -52,27 +44,21 @@ stdenv'.mkDerivation (finalAttrs: {
     "bin"
     "dev"
     "out"
-    "devdoc"
   ]
   ++ lib.optional pythonSupport "py"
   ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
-  patches = [
-    # Unmerged ABI-breaking patch required to fix the following security issues:
-    # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
-    # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
-    # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
-    # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
-    ./xml-attr-extra.patch
-  ]
-  ++ extraPatches;
+  patches = [ ] ++ extraPatches;
 
   strictDeps = true;
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
+  ]
+  ++ lib.optionals pythonSupport [
+    doxygen
   ];
 
   buildInputs =
@@ -101,10 +87,10 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.withFeature icuSupport "icu")
     (lib.withFeature pythonSupport "python")
     (lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
-  ]
-  # avoid rebuilds, can be merged into list in version bumps
-  ++ lib.optional enableHttp "--with-http"
-  ++ lib.optional zlibSupport "--with-zlib";
+    (lib.withFeature enableHttp "http")
+    (lib.withFeature zlibSupport "zlib")
+    (lib.withFeature false "docs") # docs are built with xsltproc, which would be a cyclic dependency
+  ];
 
   installFlags = lib.optionals pythonSupport [
     "pythondir=\"${placeholder "py"}/${python3.sitePackages}\""
@@ -159,6 +145,19 @@ stdenv'.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
     pkgConfigModules = [ "libxml-2.0" ];
+    # Python limits cross-compilation to an allowlist of host OSes.
+    # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
+    broken =
+      pythonSupport
+      && !(
+        enableShared
+        && (
+          stdenv.hostPlatform == stdenv.buildPlatform
+          || stdenv.hostPlatform.isCygwin
+          || stdenv.hostPlatform.isLinux
+          || stdenv.hostPlatform.isWasi
+        )
+      );
   }
   // extraMeta;
 })
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 08c1cbe5fd03..41d2b1f953f0 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -2,7 +2,7 @@
   lib,
   callPackage,
   fetchFromGitLab,
-  fetchpatch2,
+  fetchpatch,
 }:
 
 let
@@ -20,20 +20,27 @@ let
         # same as upstream patch but fixed conflict and added required import:
         # https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0.diff
         ./CVE-2025-6021.patch
-        (fetchpatch2 {
+        (fetchpatch {
           name = "CVE-2025-49794-49796.patch";
           url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f7ebc65f05bffded58d1e1b2138eb124c2e44f21.patch";
-          hash = "sha256-k+IGq6pbv9EA7o+uDocEAUqIammEjLj27Z+2RF5EMrs=";
+          hash = "sha256-p5Vc/lkakHKsxuFNnCQtFczjqFJBeLnCwIwv2GnrQco=";
         })
-        (fetchpatch2 {
+        (fetchpatch {
           name = "CVE-2025-49795.patch";
           url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c24909ba2601848825b49a60f988222da3019667.patch";
-          hash = "sha256-r7PYKr5cDDNNMtM3ogNLsucPFTwP/uoC7McijyLl4kU=";
+          hash = "sha256-vICVSb+X89TTE4QY92/v/6fRk77Hy9vzEWWsADHqMlk=";
           excludes = [ "runtest.c" ]; # tests were rewritten in C and are on schematron for 2.13.x, meaning this does not apply
         })
         # same as upstream, fixed conflicts
         # https://gitlab.gnome.org/GNOME/libxml2/-/commit/c340e419505cf4bf1d9ed7019a87cc00ec200434
         ./CVE-2025-6170.patch
+
+        # Unmerged ABI-breaking patch required to fix the following security issues:
+        # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
+        # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
+        # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
+        # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
+        ./xml-attr-extra.patch
       ];
       freezeUpdateScript = true;
       extraMeta = {
@@ -43,13 +50,13 @@ let
       };
     };
     libxml2 = callPackage ./common.nix {
-      version = "2.14.6";
+      version = "2.15.1";
       src = fetchFromGitLab {
         domain = "gitlab.gnome.org";
         owner = "GNOME";
         repo = "libxml2";
         tag = "v${packages.libxml2.version}";
-        hash = "sha256-EIcNL5B/o74hyc1N+ShrlKsPL5tHhiGgkCR1D7FcDjw=";
+        hash = "sha256-FUfYMq5xT2i88JdIw9OtSofraUL3yjsyOVund+mfJKQ=";
       };
       extraMeta = {
         maintainers = with lib.maintainers; [
diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index eb002cf895a6..d79515d18ded 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -28,6 +28,14 @@ stdenv.mkDerivation {
     inherit lua;
   };
 
+  # CMake 2.8.3 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.3)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   patches = [ ./0.9.1-discover-luajit.patch ];
 
   meta = {
diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix
index 22d30398fed9..773f2eb75d40 100644
--- a/pkgs/development/libraries/mbedtls/2.nix
+++ b/pkgs/development/libraries/mbedtls/2.nix
@@ -10,5 +10,20 @@ callPackage ./generic.nix {
       url = "https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3.patch";
       hash = "sha256-CbDm6CchzoTia7Wbpbe3bo9CmHPOsxY2d055AfbCS0g=";
     })
+    # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls-framework/pull/173)
+    (fetchpatch {
+      name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch";
+      url = "https://github.com/Mbed-TLS/mbedtls-framework/commit/e811994babf84e29e56ebf97265f5fefdf18050f.patch";
+      hash = "sha256-PGXh7tMnl7VqBOWVZP3UqT5pEd0yh4oszEJNMiVOcGo=";
+    })
+    # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls/pull/10215)
+    (fetchpatch {
+      name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch";
+      url = "https://github.com/Mbed-TLS/mbedtls/commit/2e1399f1e1ed6fa1072cf9584f5771322b0d001b.patch";
+      includes = [ "tests/*" ];
+      # drop some context in order to apply the backported patch cleanly
+      decode = "interdiff -U1 /dev/null -";
+      hash = "sha256-OTRnYw7Og6eAsB9pue1jkxO1xnkR48efz5QKjN9H0I8=";
+    })
   ];
 }
diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 09885ec6b7d0..732fc979c1cb 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.2.5";
+  version = "25.2.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-3ZoC1aY0EMbyoQe4twNfyVHaZeyCbvqTJ57tMuc1YYo=";
+    hash = "sha256-erfvNR1Yor3k8gVVClyiBJsgyaOv7BMFd1NSgieTY5I=";
   };
 
   meta = {
diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 9de9314dc37d..cef563d99f7a 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ngtcp2";
-  version = "1.15.1";
+  version = "1.17.0";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-Bbf6cvldAd3fvDVuHL89VPx1h1wvY2CGW5gIsDNM75c=";
+    hash = "sha256-j8hYGdFp5il4pODbNlVILOdJUafqsMdmc3tXoxQY2mE=";
   };
 
   outputs = [
@@ -36,19 +36,14 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional withJemalloc jemalloc;
 
-  cmakeFlags =
-    if stdenv.hostPlatform.isStatic then
-      [
-        # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
-        # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
-        (lib.cmakeBool "ENABLE_LIB_ONLY" true)
-        (lib.cmakeBool "ENABLE_SHARED_LIB" false)
-        (lib.cmakeBool "ENABLE_STATIC_LIB" true)
-      ]
-    else
-      [
-        (lib.cmakeBool "ENABLE_STATIC_LIB" false)
-      ];
+  cmakeFlags = [
+    # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
+    # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
+    # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD too.
+    (lib.cmakeBool "ENABLE_LIB_ONLY" (stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD))
+    (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
+  ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index b12bebc23f2d..7461fdfaeb3c 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -8,17 +8,18 @@
   cunit,
   ncurses,
   knot-dns,
+  curlWithGnuTls,
 }:
 
 stdenv.mkDerivation rec {
   pname = "ngtcp2";
-  version = "1.15.1";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "ngtcp2";
     rev = "v${version}";
-    hash = "sha256-cXYmnE7WqZulGrLQvjFyHVhCGfxB3nafWKeNugu+zL8=";
+    hash = "sha256-+mSVhUF1ZZJqm2HEp99BevY1yKm2jPIkkTcx7akyfro=";
   };
 
   outputs = [
@@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
   nativeCheckInputs = [ cunit ] ++ lib.optional stdenv.hostPlatform.isDarwin ncurses;
 
-  passthru.tests = knot-dns.passthru.tests; # the only consumer so far
+  passthru.tests = knot-dns.passthru.tests // {
+    inherit curlWithGnuTls;
+  };
 
   meta = with lib; {
     homepage = "https://github.com/ngtcp2/ngtcp2";
diff --git a/pkgs/development/libraries/nss/3_115.nix b/pkgs/development/libraries/nss/3_115.nix
deleted file mode 100644
index 7436aee6c513..000000000000
--- a/pkgs/development/libraries/nss/3_115.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-import ./generic.nix {
-  version = "3.115.1";
-  hash = "sha256-SuXNqRW0lBPioYxmoGa3ZbfxC7ud6TW3xVpakVwtm14=";
-  filename = "3_115.nix";
-  versionRegex = "NSS_(3)_(115)(?:_(\\d+))?_RTM";
-}
diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index 88b97a28d545..c7e53ae11ab6 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "3.112.1";
-  hash = "sha256-NpvE/WH+oY231uDKxXJptDojfU4rNsXySpOduWszzjQ=";
+  version = "3.112.2";
+  hash = "sha256-hK0TovR0LrVkB96BwCnhwaljDSElR85fnobzCa9+uKo=";
   filename = "esr.nix";
   versionRegex = "NSS_(3)_(112)(?:_(\\d+))?_RTM";
 }
diff --git a/pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch b/pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch
new file mode 100644
index 000000000000..03f912cef39a
--- /dev/null
+++ b/pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch
@@ -0,0 +1,34 @@
+From fcc689e1887bcbeb9d1c4441266a63ea2114ae9f Mon Sep 17 00:00:00 2001
+From: Connor Baker <ConnorBaker01@gmail.com>
+Date: Thu, 18 Sep 2025 13:15:43 -0700
+Subject: [PATCH] cmake/OpenCVUtils.cmake: invalidate Nix store paths before
+ including in version_string.inc
+
+Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
+---
+ cmake/OpenCVUtils.cmake | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 5886f4f3cb..9f3a3a74e9 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -956,6 +956,15 @@ function(ocv_output_status msg)
+     message(WARNING "String to be inserted to version_string.inc has an unexpected line break: '${msg}'")
+     string(REPLACE "\n" "\\n" msg "${msg}")
+   endif()
++  # The hash portion of Nix store paths are 32 characters long. Replace them with an invalid hash to avoid bloating
++  # the runtime closure by includnig references to the compiler and other build tools.
++  # https://fzakaria.com/2025/03/28/what-s-in-a-nix-store-path
++  # NOTE: This assumes the name of the Nix store is always /nix/store.
++  # NOTE: The regex [a-z0-9] is larger than Nix's base32, but it simplifies things.
++  # NOTE: This assumes all Nix store paths have additional characters after the hash.
++  # NOTE: CMake doesn't support fixed-length matching. See:
++  # https://cmake.org/cmake/help/latest/command/string.html#regex-specification
++  string(REGEX REPLACE "/nix/store/[a-z0-9]+-" "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-" msg "${msg}")
+   set(OPENCV_BUILD_INFO_STR "${OPENCV_BUILD_INFO_STR}\"${msg}\\n\"\n" CACHE INTERNAL "")
+ endfunction()
+ 
+-- 
+2.48.1
+
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 532513e1fe42..4c57a88f5600 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   unzip,
@@ -298,6 +299,17 @@ effectiveStdenv.mkDerivation {
   # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
   patches = [
     ./cmake-don-t-use-OpenCVFindOpenEXR.patch
+    ./0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch
+    (fetchpatch {
+      name = "ffmpeg-8-support.patch";
+      url = "https://github.com/opencv/opencv/commit/90c444abd387ffa70b2e72a34922903a2f0f4f5a.patch";
+      hash = "sha256-iRRparDJoNhrvELH6cAagWcVzpiE2lfivHVxvZyi3ik=";
+    })
+    (fetchpatch {
+      name = "fix-ffmpeg-8-support.patch";
+      url = "https://github.com/opencv/opencv/commit/dbb622b7f59c3f0e5bd3487252ef37cf72dcdcdb.patch";
+      hash = "sha256-MS9WizZQu0Gxw/daDDFmETxcDJYRTyhSq/xK0X5lAZM=";
+    })
   ]
   ++ optionals enableCuda [
     ./cuda_opt_flow.patch
@@ -321,11 +333,6 @@ effectiveStdenv.mkDerivation {
       ${installExtraFiles wechat_qrcode}
     '');
 
-  postConfigure = ''
-    [ -e modules/core/version_string.inc ]
-    echo '"(build info elided)"' > modules/core/version_string.inc
-  '';
-
   buildInputs = [
     boost
     gflags
diff --git a/pkgs/development/libraries/openexr/3.nix b/pkgs/development/libraries/openexr/3.nix
index b07b4ccb711e..6729fb07a69d 100644
--- a/pkgs/development/libraries/openexr/3.nix
+++ b/pkgs/development/libraries/openexr/3.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  ctestCheckHook,
   imath,
   libdeflate,
   pkg-config,
@@ -50,6 +51,9 @@ stdenv.mkDerivation rec {
     imath
     libdeflate
   ];
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
 
   # Without 'sse' enforcement tests fail on i686 as due to excessive precision as:
   #   error reading back channel B pixel 21,-76 got -nan expected -nan
@@ -58,6 +62,24 @@ stdenv.mkDerivation rec {
   # https://github.com/AcademySoftwareFoundation/openexr/issues/1400
   doCheck = !stdenv.hostPlatform.isAarch32;
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isBigEndian [
+    # https://github.com/AcademySoftwareFoundation/openexr/issues/1175
+    # Not sure if these issues are specific to the tests, or if openexr in general is borked on big-endian.
+    # Optimistically assuming the former here.
+    "OpenEXRCore.testReadDeep"
+    "OpenEXRCore.testDWATable"
+    "OpenEXRCore.testDWAACompression"
+    "OpenEXRCore.testDWABCompression"
+    "OpenEXR.testAttributes"
+    "OpenEXR.testCompression"
+    "OpenEXR.testRgba"
+    "OpenEXR.testCRgba"
+    "OpenEXR.testRgbaThreading"
+    "OpenEXR.testSampleImages"
+    "OpenEXR.testSharedFrameBuffer"
+    "OpenEXR.testTiledRgba"
+  ];
+
   passthru.tests = {
     inherit libjxl;
     musl = pkgsCross.musl64.openexr;
diff --git a/pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch b/pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch
new file mode 100644
index 000000000000..ac1750664a5b
--- /dev/null
+++ b/pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch
@@ -0,0 +1,33 @@
+From af3a3f8205968f9e652efa7adf2a359f4eb9d9cc Mon Sep 17 00:00:00 2001
+From: Alexandr Nedvedicky <sashan@openssl.org>
+Date: Mon, 6 Oct 2025 09:33:09 +0200
+Subject: [PATCH] OPENSSL_SYS_WINDOWS is also enabled for mingw build
+
+the test_n() in bioprinttest.c must differentiate between
+MSVC runtime libc and ming runtime libc. The function
+_set_printf_count_output() must be called when openssl
+is linked with MSVC libc only.
+
+Fixes #28679
+
+Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/28759)
+---
+ test/bioprinttest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/bioprinttest.c b/test/bioprinttest.c
+index bd99b9820ecc0..28730631bc201 100644
+--- a/test/bioprinttest.c
++++ b/test/bioprinttest.c
+@@ -541,7 +541,7 @@ static int test_n(int i)
+         ptrdiff_t t;
+     } n = { 0 };
+ 
+-#if defined(OPENSSL_SYS_WINDOWS)
++#if defined(_set_printf_count_output)
+     /*
+      * MS CRT is special and throws an exception when %n is used even
+      * in non-*_s versions of printf routines, and there is a special function
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 8d6a847b235f..c0d299f6b7e2 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -87,7 +87,15 @@ let
         substituteInPlace Configurations/unix-Makefile.tmpl \
           --replace 'ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}' \
                     'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}'
-      '';
+      ''
+      # This test will fail if the error strings between the build libc and host
+      # libc mismatch, e.g. when cross-compiling from glibc to musl
+      +
+        lib.optionalString
+          (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform.libc != stdenv.buildPlatform.libc)
+          ''
+            rm test/recipes/02-test_errstr.t
+          '';
 
       outputs = [
         "bin"
@@ -231,7 +239,10 @@ let
         # the code above, inhibiting `./Configure` from adding the
         # conflicting flags.
         "CFLAGS=-march=${stdenv.hostPlatform.gcc.arch}"
-      ];
+      ]
+      # tests are not being installed, it makes no sense
+      # to build them if check is disabled, e.g. on cross.
+      ++ lib.optional (!finalAttrs.finalPackage.doCheck) "disable-tests";
 
       makeFlags = [
         "MANDIR=$(man)/share/man"
@@ -244,6 +255,13 @@ let
 
       enableParallelBuilding = true;
 
+      doCheck = true;
+      preCheck = ''
+        patchShebangs util
+      '';
+
+      __darwinAllowLocalNetworking = true;
+
       postInstall =
         (
           if static then
@@ -364,16 +382,19 @@ in
   };
 
   openssl_3 = common {
-    version = "3.0.17";
-    hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4=";
+    version = "3.0.18";
+    hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os=";
 
     patches = [
+      # Support for NIX_SSL_CERT_FILE, motivation:
+      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
       ./3.0/nix-ssl-cert-file.patch
 
       # openssl will only compile in KTLS if the current kernel supports it.
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      # Look up SSL certificates in /etc rather than the immutable installation directory
       (
         if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch
       )
@@ -386,23 +407,29 @@ in
     };
   };
 
-  openssl_3_5 = common {
-    version = "3.5.2";
-    hash = "sha256-xTpH5eRByTDDkoz3v2+wDl0Sm2MOCqhzsIJYZW5zRew=";
+  openssl_3_6 = common {
+    version = "3.6.0";
+    hash = "sha256-tqX0S362nj+jXb8VUkQFtEg3pIHUPYHa3d4/8h/LuOk=";
 
     patches = [
+      # Support for NIX_SSL_CERT_FILE, motivation:
+      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
       ./3.0/nix-ssl-cert-file.patch
 
       # openssl will only compile in KTLS if the current kernel supports it.
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      # Look up SSL certificates in /etc rather than the immutable installation directory
       (
         if stdenv.hostPlatform.isDarwin then
           ./3.5/use-etc-ssl-certs-darwin.patch
         else
           ./3.5/use-etc-ssl-certs.patch
       )
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isMinGW [
+      ./3.5/fix-mingw-linking.patch
     ];
 
     withDocs = true;
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index ae018111a2c3..bb889da7ea81 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -77,7 +77,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.8";
+  version = "1.4.9";
 
   outputs = [
     "out"
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-o4puApKXW4pQ0DRcLgZTDor8CAxKehn7Zi56/PzrSLU=";
+    sha256 = "sha256-380KY17l6scVchZAoSHswTvceYl427e79eU11JQallc=";
   };
 
   patches = [
diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 04b36cb31536..279ec8500636 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -55,13 +55,13 @@ let
     domain = "gitlab.freedesktop.org";
     owner = "poppler";
     repo = "test";
-    rev = "c79c6839e859dbee6b73ac260788fa2de8618ba4";
-    hash = "sha256-j66AsBUnFpO5athVgQmf4vcyXxYcJ/plJtHg+3vXG4Y=";
+    rev = "9d5011815a14c157ba25bb160187842fb81579a5";
+    hash = "sha256-sA5f235IJpzzzHqpwHM3zCZC2Yh0ztA6PZa84j/6tfY=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "poppler-${suffix}";
-  version = "25.07.0"; # beware: updates often break cups-filters build, check scribus too!
+  version = "25.10.0"; # beware: updates often break cups-filters build, check scribus too!
 
   outputs = [
     "out"
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xQSpBm29/r43etU87GQf2XHulsTh6Mp05snAPUbYF64=";
+    hash = "sha256-a16btk2rsVeHoU2xZ1KRx6+vk4dDjMk6T7f2rsTub+A=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 22ba9ead8c96..7bae9ca2c6e2 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
     # Backport cursor fix for Qt6 apps
     # Adjusted from https://github.com/FedoraQt/QGnomePlatform/pull/138
     ./qt6-cursor-fix.patch
+
+    # fixing build with Qt>=6.10
+    ./qt6_10.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qgnomeplatform/qt6_10.patch b/pkgs/development/libraries/qgnomeplatform/qt6_10.patch
new file mode 100644
index 000000000000..93466e80ef28
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/qt6_10.patch
@@ -0,0 +1,140 @@
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index e6dcf06..287824c 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -3,6 +3,10 @@ set(common_SRCS
+     gnomesettings.cpp
+ )
+ 
++if(QT_VERSION_MAJOR EQUAL 6)
++    find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
++endif()
++
+ add_library(qgnomeplatform${LIBQGNOMEPLATFORM_SUFFIX} SHARED ${common_SRCS})
+ target_link_libraries(qgnomeplatform${LIBQGNOMEPLATFORM_SUFFIX}
+     Qt${QT_VERSION_MAJOR}::Core
+diff --git a/src/decoration/CMakeLists.txt b/src/decoration/CMakeLists.txt
+index a6fb227..7b6647c 100644
+--- a/src/decoration/CMakeLists.txt
++++ b/src/decoration/CMakeLists.txt
+@@ -8,6 +8,11 @@ set(decoration_SRCS
+     qgnomeplatformdecoration.cpp
+ )
+ 
++if(QT_VERSION_MAJOR EQUAL 6)
++    find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
++    find_package(Qt6 REQUIRED COMPONENTS WaylandClientPrivate)
++endif()
++
+ add_library(qgnomeplatformdecoration MODULE ${decoration_SRCS})
+ target_link_libraries(qgnomeplatformdecoration
+     qgnomeplatform${LIBQGNOMEPLATFORM_SUFFIX}
+diff --git a/src/decoration/qgnomeplatformdecoration.cpp b/src/decoration/qgnomeplatformdecoration.cpp
+index a719cb3..79c0be0 100644
+--- a/src/decoration/qgnomeplatformdecoration.cpp
++++ b/src/decoration/qgnomeplatformdecoration.cpp
+@@ -616,8 +616,12 @@ void QGnomePlatformDecoration::processMouseTop(QWaylandInputDevice *inputDevice,
+         if (local.x() <= margins().left()) {
+             //top left bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++            waylandWindow()->applyCursor(inputDevice, Qt::SizeFDiagCursor);
++#else
+             waylandWindow()->setMouseCursor(inputDevice, Qt::SizeFDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+             startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_TOP_LEFT, b);
+ #else
+@@ -626,8 +630,12 @@ void QGnomePlatformDecoration::processMouseTop(QWaylandInputDevice *inputDevice,
+         } else if (local.x() > window()->width() + margins().left()) {
+             //top right bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++            waylandWindow()->applyCursor(inputDevice, Qt::SizeBDiagCursor);
++#else
+             waylandWindow()->setMouseCursor(inputDevice, Qt::SizeBDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+             startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_TOP_RIGHT, b);
+ #else
+@@ -636,8 +644,12 @@ void QGnomePlatformDecoration::processMouseTop(QWaylandInputDevice *inputDevice,
+         } else {
+             //top resize bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++            waylandWindow()->applyCursor(inputDevice, Qt::SplitVCursor);
++#else
+             waylandWindow()->setMouseCursor(inputDevice, Qt::SplitVCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+             startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_TOP, b);
+ #else
+@@ -682,8 +694,12 @@ void QGnomePlatformDecoration::processMouseBottom(QWaylandInputDevice *inputDevi
+     if (local.x() <= margins().left()) {
+         //bottom left bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        waylandWindow()->applyCursor(inputDevice, Qt::SizeBDiagCursor);
++#else
+         waylandWindow()->setMouseCursor(inputDevice, Qt::SizeBDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_BOTTOM_LEFT, b);
+ #else
+@@ -692,8 +708,12 @@ void QGnomePlatformDecoration::processMouseBottom(QWaylandInputDevice *inputDevi
+     } else if (local.x() > window()->width() + margins().right()) {
+         //bottom right bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        waylandWindow()->applyCursor(inputDevice, Qt::SizeFDiagCursor);
++#else
+         waylandWindow()->setMouseCursor(inputDevice, Qt::SizeFDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT, b);
+ #else
+@@ -702,8 +722,12 @@ void QGnomePlatformDecoration::processMouseBottom(QWaylandInputDevice *inputDevi
+     } else {
+         //bottom bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        waylandWindow()->applyCursor(inputDevice, Qt::SplitVCursor);
++#else
+         waylandWindow()->setMouseCursor(inputDevice, Qt::SplitVCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_BOTTOM, b);
+ #else
+@@ -717,8 +741,12 @@ void QGnomePlatformDecoration::processMouseLeft(QWaylandInputDevice *inputDevice
+     Q_UNUSED(local)
+     Q_UNUSED(mods)
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++    waylandWindow()->applyCursor(inputDevice, Qt::SplitHCursor);
++#else
+     waylandWindow()->setMouseCursor(inputDevice, Qt::SplitHCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_LEFT, b);
+ #else
+@@ -731,8 +759,12 @@ void QGnomePlatformDecoration::processMouseRight(QWaylandInputDevice *inputDevic
+     Q_UNUSED(local)
+     Q_UNUSED(mods)
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++    waylandWindow()->applyCursor(inputDevice, Qt::SplitHCursor);
++#else
+     waylandWindow()->setMouseCursor(inputDevice, Qt::SplitHCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_RIGHT, b);
+ #else
+
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 4edb927e2213..2ac2bb4ff56a 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -17,6 +17,19 @@ stdenv.mkDerivation rec {
     sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
   };
 
+  # CMake 2.8.8 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.8)" \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_policy(SET CMP0020 OLD)" \
+      ""
+  '';
+
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-register";
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qtbase ];
   dontWrapQtApps = true;
diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix
index 2716099bf24e..e16285e940e5 100644
--- a/pkgs/development/libraries/qodeassist-plugin/default.nix
+++ b/pkgs/development/libraries/qodeassist-plugin/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  runCommand,
   cmake,
   pkg-config,
   qttools,
@@ -16,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "qodeassist-plugin";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Palm1r";
     repo = "QodeAssist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XzxuElQQxR2dK7KD0QHUAb7qyizUBhPvGDv3OvnAQjc=";
+    hash = "sha256-7wsRgZEAOd8mGnTCGJM7LTde2ITKW7ibIB7ZGy25s+E=";
   };
 
   dontWrapQtApps = true;
@@ -50,6 +51,15 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = "mkdir -p $out; cp -R lib $out/";
 
+  passthru.tests = {
+    test-version = runCommand "${finalAttrs.pname}-test" { } ''
+      QT_QPA_PLATFORM="offscreen" ${
+        lib.getExe (qtcreator.withPackages [ finalAttrs.finalPackage ])
+      } --version > $out
+      cat $out | grep 'qodeassist ${finalAttrs.version}'
+    '';
+  };
+
   meta = {
     description = "AI-powered coding assistant plugin for Qt Creator";
     longDescription = ''
@@ -62,6 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/Palm1r/QodeAssist";
     license = lib.licenses.gpl3Only;
     maintainers = [ lib.maintainers.zatm8 ];
-    platforms = lib.platforms.linux;
+    platforms = qtcreator.meta.platforms;
   };
 })
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 9c34451b9e84..4573e7c8ba40 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -65,16 +65,6 @@ let
       ./qtdeclarative-default-disable-qmlcache.patch
       # add version specific QML import path
       ./qtdeclarative-qml-paths.patch
-    ]
-    # FIXME: Make unconditional on next staging cycle
-    ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [
-      # Fix an undefined behavior, and fix random-seeming build error with Clang. See:
-      # - https://codereview.qt-project.org/c/qt/qtdeclarative/+/354847
-      # - https://github.com/llvm/llvm-project/issues/74070
-      (fetchpatch {
-        url = "https://github.com/qt/qtdeclarative/commit/636481a31110f1819efaf6500b25fbc395854311.patch";
-        hash = "sha256-ACOG3IjR0SIlLYioODGdhkNTGNvnKu6iOihsVdzyvgo=";
-      })
     ];
     qtlocation = lib.optionals stdenv.cc.isClang [
       # Fix build with Clang 16
@@ -352,42 +342,6 @@ let
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { };
 
       env = callPackage ../qt-env.nix { };
-      full =
-        callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { }
-          # `with self` is ok to use here because having these spliced is unnecessary
-          (
-            with self;
-            [
-              qt3d
-              qtcharts
-              qtconnectivity
-              qtdeclarative
-              qtdoc
-              qtgraphicaleffects
-              qtimageformats
-              qtlocation
-              qtmultimedia
-              qtquickcontrols
-              qtquickcontrols2
-              qtscript
-              qtsensors
-              qtserialport
-              qtsvg
-              qttools
-              qttranslations
-              qtvirtualkeyboard
-              qtwebchannel
-              qtwebengine
-              qtwebsockets
-              qtwebview
-              qtx11extras
-              qtxmlpatterns
-              qtlottie
-              qtdatavis3d
-            ]
-            ++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland
-            ++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras
-          );
 
       qmake = callPackage (
         { qtbase }:
@@ -422,6 +376,9 @@ let
           ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev;
         } ../hooks/wrap-qt-apps-hook.sh
       ) { };
+    }
+    // lib.optionalAttrs config.allowAliases {
+      full = throw "libsForQt5.full has been removed. Please use individual packages instead."; # Added 2025-10-18
     };
 
   baseScope = makeScopeWithSplicing' {
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
index 47b8a3495b70..fd5fcefbff34 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
+++ b/pkgs/development/libraries/qt-5/5.15/srcs-generated.json
@@ -1,202 +1,202 @@
 {
   "qt3d": {
     "url": "https://invent.kde.org/qt/qt/qt3d.git",
-    "rev": "73c1dda553f338c5a3b9ebbfd0e7de114f0c93dc",
-    "sha256": "0szrqm745b541bamwsbbnl7w6yx0hcaj6jsb3v7kxhvb8kfb1jbm"
+    "rev": "208f5835e6c2415c9dc5cbe92bba83aa28bab7ea",
+    "sha256": "0zqvdq5y25b1w7agx5wlr16p1wrx54086r0xcdfg9wx8dayhh1md"
   },
   "qtactiveqt": {
     "url": "https://invent.kde.org/qt/qt/qtactiveqt.git",
-    "rev": "df401a62879521f3fd47097205a440d5b173b524",
-    "sha256": "1zv5a2ywgvv4k3mgz2bbp5696751azf20pxk3xd1dr4dicr2lxf6"
+    "rev": "e4c93bc7cac45bac6bccda3310947e8fe026a9ed",
+    "sha256": "1qq6jvqkl4ff7sw20pi1mawh5pypv7vxmj56d38z6p06r1azkvls"
   },
   "qtandroidextras": {
     "url": "https://invent.kde.org/qt/qt/qtandroidextras.git",
-    "rev": "484bbac0978eccc9031cbf1bf804a81a6bfb1247",
-    "sha256": "0h3x582q3m8cpll5f54h2cqngyd7j1mx0j1jqrjcf4mbg5n9y0i5"
+    "rev": "4928bd58dbc1cdcf44a7e454e3d4654c3c2016f1",
+    "sha256": "02rsh60lyl6bn2jhx0ajn43safbi904nhwvdpikanrmdbg0z6dpp"
   },
   "qtbase": {
     "url": "https://invent.kde.org/qt/qt/qtbase.git",
-    "rev": "128a1d2861ca5693e43e8b79fbd4278dcd451fbc",
-    "sha256": "1jd2my6az2a9l7d1v6f03ygv5m16dij2mmb73jchgrz20h1an7nz"
+    "rev": "bebdfd54917e25d1c100e6bd9f5dd53c2e645fd8",
+    "sha256": "0bg36lxngkq2k11bhqdyfvbc1qyqaghwsi446zfn67vxvyxya3hx"
   },
   "qtcharts": {
     "url": "https://invent.kde.org/qt/qt/qtcharts.git",
-    "rev": "aaf04515611203a32cef866cce9bfeaa4cef20b6",
-    "sha256": "0q0qglksgl50kjq5pqigfvww4rks3ig8xwcz72d0h58ga1i3kgid"
+    "rev": "1093fb53ced126100d14af30a8adffd29b7ef855",
+    "sha256": "0cnlg59l743milkki8mjbrfd4cx5ycbqw73apcrnrsag9dqdbw41"
   },
   "qtconnectivity": {
     "url": "https://invent.kde.org/qt/qt/qtconnectivity.git",
-    "rev": "15961348aa26b73248432a0a274b332c36cd0054",
-    "sha256": "020vh62m098zn8fl43xnd5hhvixfr0q21ziq30jqml0j3slx4adx"
+    "rev": "f1be05c8efeb65b77a8bfd21763ab55bb5c04906",
+    "sha256": "1vl7wfw9sd8qfl8ixzl5wz4v5km5zdf9bii53q3pw4f2lplsralq"
   },
   "qtdatavis3d": {
     "url": "https://invent.kde.org/qt/qt/qtdatavis3d.git",
-    "rev": "a57e633b675d7886c3e5c64441f50ffe831f2de8",
-    "sha256": "0w0cv80sa9w42wgw3yji228wyhwc3c8lz9r3296crq136aykyy87"
+    "rev": "d9b988d3c5f9f34b97f3a9ac1347bfb55464cd60",
+    "sha256": "09jk32kw7wgcrd117a9lsm5w7jszsdhdslk10qn631wz203zbs4i"
   },
   "qtdeclarative": {
     "url": "https://invent.kde.org/qt/qt/qtdeclarative.git",
-    "rev": "11ea94fc8ea95d0ba95745a021a1b139283b8b36",
-    "sha256": "0xw15d7syqw0z6xjnkgckh53rhg7n20j67dm1bhf429ma1cqawqm"
+    "rev": "1189557a50f11e7bc5716467a149cd09987a9f88",
+    "sha256": "0cd89d8i8chy1j1yanp1cq5s7467qr24b9c7cx9qw0nb0rf6f8qr"
   },
   "qtdoc": {
     "url": "https://invent.kde.org/qt/qt/qtdoc.git",
-    "rev": "36ae30d632c978b795bf40aa1c50abaae7c8ac4d",
-    "sha256": "10vwkk2b4ysx6i9nyqnl1g7q7rckp5xppwdawd6avlkxhfjayan7"
+    "rev": "ddb2afda6f713259fc8d95fb22a1c96bb448c36a",
+    "sha256": "0nk2vwl0ppix794xzj8nqrhsc333v8v4vr1rmwddymwlrdqlqd5d"
   },
   "qtgamepad": {
     "url": "https://invent.kde.org/qt/qt/qtgamepad.git",
-    "rev": "fb2191db07738c9a954a77c2fb15dcb925a4c361",
-    "sha256": "1061ad1350bi0jr2vzpsmk6cgwyhv63d67nb8np1nr2j1iy2ncp7"
+    "rev": "269fc0731f6838a1c02877a83c0ada23659c69fc",
+    "sha256": "06jhby671yzbj753yb0lnk4bv2r0nxxibq7fq1yljxdms0rc72iz"
   },
   "qtgraphicaleffects": {
     "url": "https://invent.kde.org/qt/qt/qtgraphicaleffects.git",
-    "rev": "fed60f95ddb75103f83cf67bf2c9f471e49576fe",
-    "sha256": "0ja113vz261farf6c1bilxww4ypzzsnkz7xl37xr1pmxy9hx7lw8"
+    "rev": "dfb2e7b2c98a9b7185c300d0b92b4048f5d89ba5",
+    "sha256": "1sn46lmq0y56mw0q11sgaijr2vg1wpp6lj237finp6vr3bji2816"
   },
   "qtimageformats": {
     "url": "https://invent.kde.org/qt/qt/qtimageformats.git",
-    "rev": "f86afca95741b9c06202fd13c2b8c01d922a0e24",
-    "sha256": "1qql5zc2691iazx94s7arnkmk46y8f4p20is0asjfycs30x5cmp5"
+    "rev": "c91e4c63c1eaf1e23806d9df10e3d5a9ae353c1d",
+    "sha256": "0q0vcymiqfyz8sfs9wdkhhwff55acj2rsmrb8w6yikmwcmcxp2a3"
   },
   "qtlocation": {
     "url": "https://invent.kde.org/qt/qt/qtlocation.git",
-    "rev": "c6e6c63e8566fc75551cb901c3b5939b39e7a25c",
-    "sha256": "1n7wmsmy33v0fihivs18cafrh51bl0sa6gai6mlid0lx4izbs44f"
+    "rev": "ba48a8b5cedd157d972c08d371ac2581db166bf7",
+    "sha256": "00kwv405qq9q8fcwar33s2wvs1dm10fb8plxbz1q0jqcjs2ips6x"
   },
   "qtlottie": {
     "url": "https://invent.kde.org/qt/qt/qtlottie.git",
-    "rev": "76bc48eedf60c5f98ff9eb378fc8ce16b053bc32",
-    "sha256": "00ps9rl4yykbqqqhgnph8090rbq816kj90fb7nyrlr76f6zkjwnh"
+    "rev": "27ed5a3c95a0810a96fac2a8661ea94d8ea3c44e",
+    "sha256": "04ivyxnn8d3pkjsbx0gwyj3f5if4m4cih6wyavm8bd2m2kkszx35"
   },
   "qtmacextras": {
     "url": "https://invent.kde.org/qt/qt/qtmacextras.git",
-    "rev": "4ebefe8d375054d2244ad7197868cb004c5f99d5",
-    "sha256": "0006gajlv8mn3gfp83jiy7pg9am86fa2yncn4fqrlv7q4ikqym3b"
+    "rev": "fc7e9f41d9cec2df05c1d38d6e55d3a0d501dd25",
+    "sha256": "07q1arvdjwmbrayp2b213b8gqm4psczhx9z1m83invwmbs8iqj07"
   },
   "qtmultimedia": {
     "url": "https://invent.kde.org/qt/qt/qtmultimedia.git",
-    "rev": "d342547886448dacf38d2933cd40322c7435ee86",
-    "sha256": "1fyrwbcn9dh6hsqk4z48g4f00aizankjr63ah7nvnzv8y8wcz62p"
+    "rev": "ff83d119c75cd8406f73ccc08958fe36747e7390",
+    "sha256": "09jadnvphilcxxy85dlsr8a6x5w32r1c2hrbh93qbvvf9zlg60ld"
   },
   "qtnetworkauth": {
     "url": "https://invent.kde.org/qt/qt/qtnetworkauth.git",
-    "rev": "2653044915b3fb1941aa0f8b25af50343efcbff7",
-    "sha256": "183cbrwxnp2c7shdqlbjmx4vvb097m67mh3m1mqb0d4xc8fggwa4"
+    "rev": "510687fa4fdee84dd3d6d166e8f080c484016199",
+    "sha256": "0a8abmql94wxpfvdj5a1rnh3xsd49c5z8x93hm311sgjkd0aajx7"
   },
   "qtpurchasing": {
     "url": "https://invent.kde.org/qt/qt/qtpurchasing.git",
-    "rev": "062778d6f80df1ba45b8697720eb781bd477c292",
-    "sha256": "1hakq5aam1x9fpnnj8wavmr4f3bdm0q2kflix0ap9197hj7bvzhy"
+    "rev": "8e9a5ec9f68639162c85c198b28e072e7150883c",
+    "sha256": "04pmwqnw907dg0hpas0pdrh2fxcqn2mvqz82b1vkviksg8ny3saw"
   },
   "qtquick3d": {
     "url": "https://invent.kde.org/qt/qt/qtquick3d.git",
-    "rev": "de6e8026c116a47029f4307fd8a62b5f630f33bf",
-    "sha256": "0w4i0ii7an8z6xiqg1v0i5dm6rp3mi08mhg99mys10996r8f67yr"
+    "rev": "47a325358078b72016081a86be628411df2728a9",
+    "sha256": "18h309g6ni6y4bcss930g04z8ymhl2nfm3sv5s4h2fz3dl0xsqwr"
   },
   "qtquickcontrols": {
     "url": "https://invent.kde.org/qt/qt/qtquickcontrols.git",
-    "rev": "37ee5e07e82296e24cc02c8bf6f31cb6bd8846b1",
-    "sha256": "1xq1a9ci7qvlp5f0ydfx86yw1pk14zdm9262nw65bc1z4nx3qfhw"
+    "rev": "0c3c18bf8bdac1ef1afdb8aade903edb5c2bc041",
+    "sha256": "0h8bhrbgfcf7nbfppah8lxnhvygc09983qrvp935r5sw7251km4d"
   },
   "qtquickcontrols2": {
     "url": "https://invent.kde.org/qt/qt/qtquickcontrols2.git",
-    "rev": "9bdcebd1c093b6f0886e3a739711470cc37b1adb",
-    "sha256": "0ihwjw70cb59qvzbdyz9462n7d8f8mcnidkaph3qyqyblnx5rc6b"
+    "rev": "e464888c53a641ee44a34ff2350cfb156c8ed59f",
+    "sha256": "08lnqz6v48j1hi6dpll7a052p6r5qfb32md16fppqzn6g5jg9ir2"
   },
   "qtquicktimeline": {
     "url": "https://invent.kde.org/qt/qt/qtquicktimeline.git",
-    "rev": "c4f13dd78d6cf2df83335ad0328b892ce4b2ef70",
-    "sha256": "075q6z6dd1aazpyf03bjmxn6j7lr5g8gjx02jgg2h077h9bdkw9j"
+    "rev": "43130f2681b76a8d743a04704465b716b6b2faee",
+    "sha256": "1z1avxxq9d9nzqyxy5pq5maj73cf6dvsn5k83p3sf5kq3x0y75cj"
   },
   "qtremoteobjects": {
     "url": "https://invent.kde.org/qt/qt/qtremoteobjects.git",
-    "rev": "e060a0990380134c054bde675d47db048fd3192f",
-    "sha256": "0qsgixxy6rk8zv8kssfa19asg742y9syl9hc9dkqw0shywi6rm4k"
+    "rev": "b2740a7c7f5b6ac810240404a947ca5cff9de5f7",
+    "sha256": "1jxlwc2y165fxdalcr4iqq55gsg5x4nxqd8wdq3dc1824yfnzm6i"
   },
   "qtscxml": {
     "url": "https://invent.kde.org/qt/qt/qtscxml.git",
-    "rev": "2b7b19239671784fbf79d6dbc0e985da044ff9dd",
-    "sha256": "1a67ihj2z4fc6r3y3z18244wswvhf5hshw72z7z9lmmcznls7921"
+    "rev": "57491f554bc53bd020978b5744437b7ac7e56a27",
+    "sha256": "00mvwgb3xr116nl7649zq7ai2074clzw760c140sy91zqgqkjsx4"
   },
   "qtsensors": {
     "url": "https://invent.kde.org/qt/qt/qtsensors.git",
-    "rev": "79ed5db98f36b8ca70b077edef46fc793debb3ab",
-    "sha256": "1dzbcqsrl5wlc1r54jgz63i516iaj73g2g4476m8va6ip4zrxxnp"
+    "rev": "50a61b360877e7c1300df76b5aabf8d75554a398",
+    "sha256": "0giqwn4grg9999y31avh7ajsv9gkcfzf0xndx8bvv79si0wp59g6"
   },
   "qtserialbus": {
     "url": "https://invent.kde.org/qt/qt/qtserialbus.git",
-    "rev": "971adee604b772d79686126fe8b1e333824f67dc",
-    "sha256": "0fdr81xj9mhyy7il3x2h87gv5qbjjy5rlps372s5qz97z8jdazy6"
+    "rev": "c23069351ec31563c9ea9fcdce42ccdba95ea518",
+    "sha256": "1qgxlgnl53gabrfqihxwygdbdiqjvn2hfajmwb3h44srpq0srk33"
   },
   "qtserialport": {
     "url": "https://invent.kde.org/qt/qt/qtserialport.git",
-    "rev": "9bb2b66259413ac4eda1ddf64209ef44412aa55d",
-    "sha256": "1kpqjmipa2giv1rv1kg25knir9299pnh6gh8l87immnakwnp7q3n"
+    "rev": "b64a7eeda9b6a65b5ed01b1b40b07177f0aa4c0f",
+    "sha256": "134mn0njfvmzgrf325bikazkiq4xdn5wjhj56kxh1hhaz3q25hyp"
   },
   "qtspeech": {
     "url": "https://invent.kde.org/qt/qt/qtspeech.git",
-    "rev": "088b86a0e53ebb714c1276d041ab2c06fee58e6e",
-    "sha256": "0qjpr91wlxq25n72yp5026hdwy560g35xk5419r7hz1snggbly4s"
+    "rev": "aa2376f9b1302222edcd16b4641bbd7004318c00",
+    "sha256": "0vcxgkymzhaw01f26zlny4bka9k829rwzkwk95rr3dfq7wlyxshz"
   },
   "qtsvg": {
     "url": "https://invent.kde.org/qt/qt/qtsvg.git",
-    "rev": "9c149213f46b844607cf7db8f800d906db3a682f",
-    "sha256": "14ww7c66fs224gfkawjbb8gfrjfcj1ww90887c01504k7ipvlbwb"
+    "rev": "b74f7291f343dcbcb487b020868f042d8fe83098",
+    "sha256": "1n0sjn8h5k2sh8p2a85cxdpqbnd63gz4rf9wwbshhd13w623f9s8"
   },
   "qttools": {
     "url": "https://invent.kde.org/qt/qt/qttools.git",
-    "rev": "e02ce0dfa692913bd5dcc50917f7e21f5a41cd2b",
-    "sha256": "0dmv4y2lzdkzj9in3w1cchn0hb637280zl17vnzzgcpj4jmyxm3b"
+    "rev": "fa40a2d3373b89be0cd0a43fe0c1d047e3d34058",
+    "sha256": "06kr88gmwc7xh1whdbcg84y1naak5rv99jkscjbhzyz3z91xy7hl"
   },
   "qttranslations": {
     "url": "https://invent.kde.org/qt/qt/qttranslations.git",
-    "rev": "fd567a42c1b566f22f339db758d29925fd2a8c60",
-    "sha256": "14cxna8ql87b68wriqkda9bdrympv827cpng7pazjzglgk4lp97y"
+    "rev": "3cbcceb8e3e2e63a4022f1be946c7118c527a83e",
+    "sha256": "15lw5snqfkwwcsazh02lhiia39gy08nfijdpkzvll2qvg4b58zkn"
   },
   "qtvirtualkeyboard": {
     "url": "https://invent.kde.org/qt/qt/qtvirtualkeyboard.git",
-    "rev": "0d229d587e578fb4a5144594b926d5d3138c407e",
-    "sha256": "0q7xv7cg4i5aliwaydw7xshwcv1a1icbg58rlwv77vzla7vsyyga"
+    "rev": "859d2a6ee329cc08414410b2ef8c0af77a6853d3",
+    "sha256": "06sdpcanzp1a71d99rjivrbjp780mvwssc4w1sap2gskcmmgkwbs"
   },
   "qtwayland": {
     "url": "https://invent.kde.org/qt/qt/qtwayland.git",
-    "rev": "c1ac089f3f37ab172d8010b0fabf4007d62d1812",
-    "sha256": "16wy4xml5k7bg48ai8777h95clny436lkr9vfcjzsbdlw17mgylw"
+    "rev": "df49b9f3badce793a0a9ea850cf1a02cc5bafef6",
+    "sha256": "01xm2r1pv7kxb4aj72ldfzmax6d799h6bj4h2xhpcii812wf5lda"
   },
   "qtwebchannel": {
     "url": "https://invent.kde.org/qt/qt/qtwebchannel.git",
-    "rev": "85ba097de9759efe5563156e43de1ad8473d5d54",
-    "sha256": "0wkd2fvnwi3hpqpy95mjhkj0msi447302srrfxr9j4xp435dpp9p"
+    "rev": "2a157921861e651f43456cb7941b250c89feb736",
+    "sha256": "1w58b602f20mppd0zfr9yvfdn1xwfkfclnjs0p5mgymq6d946dyk"
   },
   "qtwebglplugin": {
     "url": "https://invent.kde.org/qt/qt/qtwebglplugin.git",
-    "rev": "adb24841f9fc2eea94f1d2636070411fcb6254b4",
-    "sha256": "0ra0906g3cqavkl18qp79jghy5n9avwqwf4vqn9jsci5may1bmv5"
+    "rev": "b9aaac72d0853ba48f6bfd710a43df94d83d4701",
+    "sha256": "07zx55f52jgk31bm6c68iydknrih245ndnvz714l6kxw66fv4rjq"
   },
   "qtwebsockets": {
     "url": "https://invent.kde.org/qt/qt/qtwebsockets.git",
-    "rev": "db9cb84499229143506a9692fc65d3cb223b3978",
-    "sha256": "1kp6gmzh00b07cdpsm062npgf10540aasyhmdqjh4zv9ggnf6dm6"
+    "rev": "0f910acb737cefc889ce1088fc60d15bc18efe9c",
+    "sha256": "1ba9ll28hznd6qpjjiqvc2z6gaz2qgq7105dd0w810xpbaiixy0a"
   },
   "qtwebview": {
     "url": "https://invent.kde.org/qt/qt/qtwebview.git",
-    "rev": "f16dadb6d147c46565537ede46518a352cdd87c9",
-    "sha256": "0jm0wxblrlab3yizyrcip1s9n56mavpygfjivj27nmqwsycs8sfp"
+    "rev": "34342073a59f3a27ef3de02f6b21337c4f8db6cf",
+    "sha256": "1h6n7dkd6mjclxllyw2brz8wv4d68dx2ykckbwb3bkxyd6rmg1f6"
   },
   "qtwinextras": {
     "url": "https://invent.kde.org/qt/qt/qtwinextras.git",
-    "rev": "03d72f7b7df7892024f7a5a380305ad0347c1141",
-    "sha256": "164q0d4dhpb3w1qks26qc79ph3y3h4diihcgc41d4kgmc7gi75s6"
+    "rev": "5e5ae2b77078dbe51fb798743de606e6f9a5e19d",
+    "sha256": "04x8ax197z0dr01nxrb6bh4q8c077ny5n812fx5mq56l54v2m1ks"
   },
   "qtx11extras": {
     "url": "https://invent.kde.org/qt/qt/qtx11extras.git",
-    "rev": "e6e7633bbd0efcc56035fef77f3f45efccf03a64",
-    "sha256": "1h02f17cn6x19d4z37w9pvfivqm2c6qflrhm5n0fqydr1wwb6g3l"
+    "rev": "c44c4fa86fa0794c25baef4ee1f6272aca8c511a",
+    "sha256": "0287cvs9wqlzz6gnj81gi8rp50s2rdnigcmld3fgddsg8f3v7hdj"
   },
   "qtxmlpatterns": {
     "url": "https://invent.kde.org/qt/qt/qtxmlpatterns.git",
-    "rev": "e645537910450ba8bf5ecfbb735f69acdeeef046",
-    "sha256": "08lnchs0svgrv45zc3jwinkqzvd4crzzpipm9g1ql426clcdyq8n"
+    "rev": "0b644263abca66503db1ce8a4e126cf358a34685",
+    "sha256": "1b1zzglvcdp7wvlpgk1gj8gmyy2r21yi6p8xiyvbccq5bbjpn0hw"
   }
 }
diff --git a/pkgs/development/libraries/qt-5/5.15/srcs.nix b/pkgs/development/libraries/qt-5/5.15/srcs.nix
index b3f1e58e14b4..07b617c7b97d 100644
--- a/pkgs/development/libraries/qt-5/5.15/srcs.nix
+++ b/pkgs/development/libraries/qt-5/5.15/srcs.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "5.15.17";
+  version = "5.15.18";
 
   mk = name: args: {
     inherit version;
diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 57f77518ed55..4974937053ca 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -17,7 +17,6 @@
   python3,
   which,
   # darwin support
-  apple-sdk_14,
   xcbuild,
 
   dbus,
@@ -86,11 +85,6 @@ let
       "linux-generic-g++"
     else
       throw "Please add a qtPlatformCross entry for ${plat.config}";
-
-  # Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x.
-  darwinVersionInputs = [
-    apple-sdk_14
-  ];
 in
 
 stdenv.mkDerivation (
@@ -153,7 +147,6 @@ stdenv.mkDerivation (
       ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
         lib.optional withLibinput libinput ++ lib.optional withGtk3 gtk3
       )
-      ++ lib.optional stdenv.hostPlatform.isDarwin darwinVersionInputs
       ++ lib.optional developerBuild gdb
       ++ lib.optional (cups != null) cups
       ++ lib.optional mysqlSupport libmysqlclient
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 165b4271c077..fa21bb05c864 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPackages,
   mkDerivation,
-  apple-sdk_14,
   perl,
   qmake,
   patches,
@@ -29,12 +28,7 @@ mkDerivation (
     inherit pname version src;
     patches = (args.patches or [ ]) ++ (patches.${pname} or [ ]);
 
-    buildInputs =
-      args.buildInputs or [ ]
-      # Per https://doc.qt.io/qt-5/macos.html#supported-versions
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        apple-sdk_14
-      ];
+    buildInputs = args.buildInputs or [ ];
 
     nativeBuildInputs =
       (args.nativeBuildInputs or [ ])
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index e24c2c825240..2236001ad901 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -67,58 +67,6 @@ let
         inherit (srcs.qtbase) src version;
       };
       env = callPackage ./qt-env.nix { };
-      full = callPackage (
-        { env, qtbase }:
-        env "qt-full-${qtbase.version}"
-          # `with self` is ok to use here because having these spliced is unnecessary
-          (
-            with self;
-            [
-              qt3d
-              qt5compat
-              qtcharts
-              qtconnectivity
-              qtdatavis3d
-              qtdeclarative
-              qtdoc
-              qtgraphs
-              qtgrpc
-              qthttpserver
-              qtimageformats
-              qtlanguageserver
-              qtlocation
-              qtlottie
-              qtmultimedia
-              qtmqtt
-              qtnetworkauth
-              qtpositioning
-              qtsensors
-              qtserialbus
-              qtserialport
-              qtshadertools
-              qtspeech
-              qtquick3d
-              qtquick3dphysics
-              qtquickeffectmaker
-              qtquicktimeline
-              qtremoteobjects
-              qtsvg
-              qtscxml
-              qttools
-              qttranslations
-              qtvirtualkeyboard
-              qtwebchannel
-              qtwebengine
-              qtwebsockets
-              qtwebview
-            ]
-            ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-              qtwayland
-              libglvnd
-            ]
-          )
-      ) { };
-
       qt3d = callPackage ./modules/qt3d.nix { };
       qt5compat = callPackage ./modules/qt5compat.nix { };
       qtcharts = callPackage ./modules/qtcharts.nix { };
@@ -213,6 +161,9 @@ let
           };
         } ./hooks/qmake-hook.sh
       ) { };
+    }
+    // lib.optionalAttrs config.allowAliases {
+      full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21
     };
 
   baseScope = makeScopeWithSplicing' {
diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 87d5916f3e38..9c161baa005d 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.2/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.0/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index df8286ee8f46..ab35d1906f73 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -29,6 +29,7 @@
   vulkan-loader,
   libthai,
   libdrm,
+  libgbm,
   libdatrie,
   lttng-ust,
   libepoxy,
@@ -78,6 +79,9 @@
   gtk3,
   withLibinput ? false,
   libinput,
+  withWayland ? lib.meta.availableOn stdenv.hostPlatform wayland,
+  wayland,
+  wayland-scanner,
   # options
   qttranslations ? null,
 }:
@@ -133,6 +137,7 @@ stdenv.mkDerivation rec {
     lttng-ust
     libthai
     libdrm
+    libgbm
     libdatrie
     udev
     # Text rendering
@@ -156,7 +161,11 @@ stdenv.mkDerivation rec {
     xorg.xcbutilcursor
     libepoxy
   ]
-  ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups;
+  ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups
+  ++ lib.optionals withWayland [
+    wayland
+    wayland-scanner
+  ];
 
   buildInputs =
     lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [
@@ -186,7 +195,14 @@ stdenv.mkDerivation rec {
   ]
   # I’m not sure if this is necessary, but the macOS mkspecs stuff
   # tries to call `xcrun xcodebuild`, so better safe than sorry.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]
+  # wayland-scanner needs to be propagated as both build
+  # (for the wayland-scanner binary) and host (for the
+  # actual wayland.xml protocol definition)
+  ++ lib.optionals withWayland [
+    wayland
+    wayland-scanner
+  ];
 
   strictDeps = true;
 
@@ -251,6 +267,9 @@ stdenv.mkDerivation rec {
   qtQmlPrefix = "lib/qt-6/qml";
 
   cmakeFlags = [
+    # makes Qt print the configure summary
+    "--log-level=STATUS"
+
     "-DQT_EMBED_TOOLCHAIN_COMPILER=OFF"
     "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}"
     "-DINSTALL_QMLDIR=${qtQmlPrefix}"
diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
index 627454f85a51..c96ebd0e0f32 100644
--- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
@@ -5,15 +5,23 @@
   qtbase,
   qtdeclarative,
   bluez,
+  pcsclite,
   pkg-config,
 }:
 
 qtModule {
   pname = "qtconnectivity";
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    pcsclite
+    bluez
+  ];
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
   ];
+
+  postPatch = ''
+    substituteInPlace src/nfc/configure.cmake --replace-fail "qt_configure_add_summary_entry(ARGS pcslite)" "qt_configure_add_summary_entry(ARGS pcsclite)"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 26423ac73e7c..91671df7294b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -1,4 +1,5 @@
 {
+  fetchpatch,
   qtModule,
   qtbase,
   qtlanguageserver,
@@ -29,27 +30,26 @@ qtModule {
   ];
 
   patches = [
-    # invalidates qml caches created from nix applications at different
-    # store paths and disallows saving caches of bare qml files in the store.
-    (replaceVars ./invalidate-caches-from-mismatched-store-paths.patch {
+    # don't cache bytecode of bare qml files in the store, as that never gets cleaned up
+    (replaceVars ./dont-cache-nix-store-paths.patch {
       nixStore = builtins.storeDir;
-      nixStoreLength = toString ((builtins.stringLength builtins.storeDir) + 1); # trailing /
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
+    # Fix common crash
+    # https://bugreports.qt.io/browse/QTBUG-140018
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/2b7f93da38d41ffaeb5322a7dca40ec26fc091a1.diff";
+      hash = "sha256-AOXey18lJlswpZ8tpTTZeFb0VE9k1louXy8TPPGNiA4=";
+    })
+    # Fix another common crash
+    # https://bugreports.qt.io/browse/QTBUG-139626
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0de0b0ffdb44d73c605e20f00934dfb44bdf7ad9.diff";
+      hash = "sha256-DCoaSxH1MgywGXmmK21LLzCBi2KAmJIv5YKpFS6nw7M=";
+    })
   ];
 
-  preConfigure =
-    let
-      storePrefixLen = toString ((builtins.stringLength builtins.storeDir) + 1);
-    in
-    ''
-      # "NIX:" is reserved for saved qmlc files in patch 0001, "QTDHASH:" takes the place
-      # of the old tag, which is otherwise the qt version, invalidating caches from other
-      # qtdeclarative store paths.
-      echo "QTDHASH:''${out:${storePrefixLen}:32}" > .tag
-    '';
-
   cmakeFlags = [
     "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
     # for some reason doesn't get found automatically on Darwin
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch
new file mode 100644
index 000000000000..ef5d108db10c
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch
@@ -0,0 +1,17 @@
+--- a/src/qml/common/qv4compileddata.cpp
++++ b/src/qml/common/qv4compileddata.cpp
+@@ -178,6 +178,14 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString)
+         return false;
+     }
+ 
++    if (unitUrl.path().startsWith(QStringLiteral("@nixStore@"))) {
++        // We don't store bytecode for bare QML files in the nix store as the
++        // paths will change every time the application updates, filling caches
++        // endlessly with junk.
++        *errorString = QStringLiteral("Refusing to save bytecode for bare @nixStore@ path.");
++        return false;
++    }
++
+     return SaveableUnitPointer(unitData()).saveToDisk<char>(
+             [&unitUrl, errorString](const char *data, quint32 size) {
+                 const QString cachePath = localCacheFilePath(unitUrl);
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch
deleted file mode 100644
index 364c3ed838e6..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/src/qml/common/qv4compileddata.cpp b/src/qml/common/qv4compileddata.cpp
-index 9dee91f713..9dec5cae67 100644
---- a/src/qml/common/qv4compileddata.cpp
-+++ b/src/qml/common/qv4compileddata.cpp
-@@ -15,6 +15,8 @@
- #include <QtCore/qscopeguard.h>
- #include <QtCore/qstandardpaths.h>
- 
-+#include <QtCore/qcoreapplication.h>
-+
- static_assert(QV4::CompiledData::QmlCompileHashSpace > QML_COMPILE_HASH_LENGTH);
- 
- #if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0
-@@ -26,6 +28,35 @@ __attribute__((section(".qml_compile_hash")))
- const char qml_compile_hash[QV4::CompiledData::QmlCompileHashSpace] = QML_COMPILE_HASH;
- static_assert(sizeof(QV4::CompiledData::Unit::libraryVersionHash) > QML_COMPILE_HASH_LENGTH,
-               "Compile hash length exceeds reserved size in data structure. Please adjust and bump the format version");
-+
-+bool nix__isNixApplication() {
-+    static const bool value = QCoreApplication::applicationFilePath().startsWith(QStringLiteral("@nixStore@"));
-+    return value;
-+}
-+
-+static_assert(sizeof(QV4::CompiledData::Unit::libraryVersionHash) >
-+                  /*sha1*/ 20 + /*NIX:*/ 4,
-+              "Nix compile hash length exceeds the reserved space in data "
-+              "structure. Please review the patch.");
-+
-+const QByteArray &nix__applicationHash() {
-+    static const QByteArray value = [](){
-+        QCryptographicHash applicationHash(QCryptographicHash::Sha1);
-+        applicationHash.addData(QByteArrayView(qml_compile_hash, QML_COMPILE_HASH_LENGTH));
-+
-+        // We only care about the package, not the specific file path.
-+        auto view = QCoreApplication::applicationFilePath().sliced(@nixStoreLength@);
-+        auto pkgEndIdx = view.indexOf(QStringLiteral("/"));
-+        if (pkgEndIdx != -1) view = view.sliced(0, pkgEndIdx);
-+
-+        applicationHash.addData(view.toUtf8());
-+
-+        return QByteArray("NIX:") + applicationHash.result();
-+    }();
-+
-+    return value;
-+}
-+
- #else
- #  error "QML_COMPILE_HASH must be defined for the build of QtDeclarative to ensure version checking for cache files"
- #endif
-@@ -69,13 +100,29 @@ bool Unit::verifyHeader(QDateTime expectedSourceTimeStamp, QString *errorString)
-     }
- 
- #if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0
--    if (qstrncmp(qml_compile_hash, libraryVersionHash, QML_COMPILE_HASH_LENGTH) != 0) {
-+    const bool nixUnit = qstrncmp("NIX:", this->libraryVersionHash, 4) == 0;
-+
-+    if (nixUnit && !nix__isNixApplication()) {
-+        *errorString = QStringLiteral("QML compile hash is for a nix store application.");
-+        return false;
-+    }
-+
-+    const char *targetHash = qml_compile_hash;
-+    size_t targetHashLength = QML_COMPILE_HASH_LENGTH;
-+
-+    if (nixUnit) {
-+        const auto &applicationHash = nix__applicationHash();
-+        targetHash = applicationHash.constData();
-+        targetHashLength = applicationHash.length();
-+    }
-+
-+    if (qstrncmp(targetHash, this->libraryVersionHash, targetHashLength) != 0) {
-         *errorString = QStringLiteral("QML compile hashes don't match. Found %1 expected %2")
-                                .arg(QString::fromLatin1(
--                                            QByteArray(libraryVersionHash, QML_COMPILE_HASH_LENGTH)
-+                                            QByteArray(this->libraryVersionHash, targetHashLength)
-                                                     .toPercentEncoding()),
-                                     QString::fromLatin1(
--                                            QByteArray(qml_compile_hash, QML_COMPILE_HASH_LENGTH)
-+                                            QByteArray(targetHash, targetHashLength)
-                                                     .toPercentEncoding()));
-         return false;
-     }
-@@ -213,6 +260,29 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString)
-         return false;
-     }
- 
-+#if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0
-+    if (nix__isNixApplication() && unitUrl.scheme() == QStringLiteral("qrc")) {
-+        // If the application is running from the nix store, we can safely save
-+        // bytecode for its embedded QML files as long as we hash the
-+        // application path into the version. This will invalidate the caches
-+        // when the store path changes.
-+        const auto &applicationHash = nix__applicationHash();
-+
-+        memcpy(const_cast<char *>(unitData()->libraryVersionHash),
-+               applicationHash.constData(), applicationHash.length());
-+    } else if (unitUrl.path().startsWith(QStringLiteral("@nixStore@"))) {
-+        // We don't store bytecode for bare QML files in the nix store as the
-+        // paths will change every time the application updates, filling caches
-+        // endlessly with junk.
-+        *errorString = QStringLiteral("Refusing to save bytecode for bare @nixStore@ path.");
-+        return false;
-+    } else {
-+        // If the QML file is loaded from a normal file path it doesn't matter
-+        // if the application itself is running from a nix path, so we fall back
-+        // to the default Qt behavior.
-+    }
-+#endif
-+
-     return SaveableUnitPointer(unitData()).saveToDisk<char>(
-             [&unitUrl, errorString](const char *data, quint32 size) {
-                 const QString cachePath = localCacheFilePath(unitUrl);
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
index 7efd9c9cdb70..6de31fae7a77 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
@@ -1,10 +1,14 @@
---- a/src/qml/qml/qqmlimport.cpp
-+++ b/src/qml/qml/qqmlimport.cpp
-@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
+diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
+index 5d09bf21c6..eacc8ccaea 100644
+--- a/src/qml/qml/qqmltypeloader.cpp
++++ b/src/qml/qml/qqmltypeloader.cpp
+@@ -1235,7 +1235,8 @@ QQmlTypeLoader::QQmlTypeLoader(QQmlEngine *engine)
      // env import paths
      addEnvImportPath("QML_IMPORT_PATH");
      addEnvImportPath("QML2_IMPORT_PATH");
+-
 +    addEnvImportPath("NIXPKGS_QT6_QML_IMPORT_PATH");
- 
++ 
      addImportPath(QStringLiteral("qrc:/qt/qml"));
      addImportPath(QStringLiteral("qrc:/qt-project.org/imports"));
+ 
diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 6b7385bd8e71..eec3ee8f7a8d 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.9.2";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     tag = "v${version}";
-    hash = "sha256-/qz93JmMkJW3+lzT+QKvb/VL+xmbg5H8kKaXK+XN2nE=";
+    hash = "sha256-0o0zC8SUlug5xOV5AX9PiTim1td8NA4fq6WfBR5aSXA=";
   };
 
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
index 4fb69db29359..58ef182fff2c 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
@@ -6,7 +6,7 @@
   qtbase,
   qtdeclarative,
   cups,
-  llvmPackages_20,
+  llvmPackages,
   # clang-based c++ parser for qdoc and lupdate
   withClang ? false,
 }:
@@ -30,10 +30,9 @@ qtModule {
     "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""
   ];
 
-  # FIXME: update to LLVM 21 with Qt 6.10
   buildInputs = lib.optionals withClang [
-    llvmPackages_20.libclang
-    llvmPackages_20.llvm
+    llvmPackages.libclang
+    llvmPackages.llvm
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
index ec306ecc480a..6b1eca682c59 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
+++ b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
@@ -18,8 +18,8 @@
 +
  static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location)
  {
--    QString filePath = QLibraryInfo::path(location) + QLatin1Char('/') + toolName;
-+    QString filePath = qtBasePath(location) + QLatin1Char('/') + toolName;
+-    QString filePath = QLibraryInfo::path(location) + u'/' + toolName;
++    QString filePath = qtBasePath(location) + u'/' + toolName;
  #ifdef Q_OS_WIN
      filePath.append(QLatin1String(".exe"));
  #endif
diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index ae34492453c5..54fc9cac7e3c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -5,8 +5,6 @@
   qtModule,
   qtbase,
   qtdeclarative,
-  wayland,
-  wayland-scanner,
   pkg-config,
   libdrm,
 }:
@@ -14,24 +12,15 @@
 qtModule {
   pname = "qtwayland";
 
-  # wayland-scanner needs to be propagated as both build
-  # (for the wayland-scanner binary) and host (for the
-  # actual wayland.xml protocol definition)
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
-    wayland
-    wayland-scanner
-  ];
-  propagatedNativeBuildInputs = [
-    wayland
-    wayland-scanner
   ];
   buildInputs = [ libdrm ];
   nativeBuildInputs = [ pkg-config ];
 
   cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    "-DQt6WaylandScannerTools_DIR=${pkgsBuildBuild.qt6.qtwayland}/lib/cmake/Qt6WaylandScannerTools"
+    "-DQt6WaylandScannerTools_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6WaylandScannerTools"
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 9e18d253ddb8..df88eb6d473e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -7,6 +7,7 @@
   buildPackages,
   bison,
   coreutils,
+  fetchpatch2,
   flex,
   gperf,
   ninja,
@@ -37,7 +38,6 @@
   libopus,
   jsoncpp,
   protobuf,
-  libvpx,
   srtp,
   snappy,
   nss,
@@ -59,13 +59,12 @@
   lcms2,
   libkrb5,
   libgbm,
+  libva,
   enableProprietaryCodecs ? true,
   # darwin
   bootstrap_cmds,
   cctools,
   xcbuild,
-
-  fetchpatch,
 }:
 
 qtModule {
@@ -112,14 +111,14 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
-
-    # Revert "Create EGLImage with eglCreateDRMImageMESA() for exporting dma_buf"
-    # Mesa 25.2 dropped eglCreateDRMImageMESA, so this no longer works.
-    # There are better ways to do this, but this is the easy fix for now.
-    (fetchpatch {
-      url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/ddcd30454aa6338d898c9d20c8feb48f36632e16.diff";
-      revert = true;
-      hash = "sha256-ht7C3GIEaPtmMGLzQKOtMqE9sLKdqqYCgi/W6b430YU=";
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # https://chromium-review.googlesource.com/c/chromium/src/+/6633292
+    (fetchpatch2 {
+      url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch?full_index=1";
+      stripLen = 1;
+      extraPrefix = "src/3rdparty/chromium/";
+      hash = "sha256-zDIlHd8bBtrThkFnrcyA13mhXYIQt6sKsi6qAyQ34yo=";
     })
   ];
 
@@ -210,7 +209,6 @@ qtModule {
 
     # Video formats
     srtp
-    libvpx
 
     # Audio formats
     libopus
@@ -269,6 +267,7 @@ qtModule {
 
     libkrb5
     libgbm
+    libva
   ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix
index ac37bfd4f96e..07aa27e13abf 100644
--- a/pkgs/development/libraries/qt-6/qtModule.nix
+++ b/pkgs/development/libraries/qt-6/qtModule.nix
@@ -37,18 +37,21 @@ stdenv.mkDerivation (
       (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or [ ])
       ++ (args.propagatedBuildInputs or [ ]);
 
-    cmakeFlags =
+    cmakeFlags = [
+      # be more verbose
+      "--log-level=STATUS"
       # don't leak OS version into the final output
       # https://bugreports.qt.io/browse/QTBUG-136060
-      [ "-DCMAKE_SYSTEM_VERSION=" ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
-        # This is only used for the min version check, which we disabled above.
-        # When this variable is not set, cmake tries to execute xcodebuild
-        # to query the version.
-        "-DQT_INTERNAL_XCODE_VERSION=0.1"
-      ]
-      ++ args.cmakeFlags or [ ];
+      "-DCMAKE_SYSTEM_VERSION="
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
+      # This is only used for the min version check, which we disabled above.
+      # When this variable is not set, cmake tries to execute xcodebuild
+      # to query the version.
+      "-DQT_INTERNAL_XCODE_VERSION=0.1"
+    ]
+    ++ args.cmakeFlags or [ ];
 
     moveToDev = false;
 
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index 190e64e037d9..58d46a69ea56 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,315 @@
 
 {
   qt3d = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qt3d-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0ndn5fbsfj2vbcq3siq1gnk2rgblicd6ri2jrh9g41anicxh4vma";
-      name = "qt3d-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qt3d-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1dz9g3nlwgwfycwl5a0c7h339s7azq2xvq99kd76wjqzfkrmz25x";
+      name = "qt3d-everywhere-src-6.10.0.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qt5compat-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0q2vly836wgs462czw7lg0ysf2h48iwbdy43wwf2gz49qq2rja6b";
-      name = "qt5compat-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qt5compat-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0zibn0kq8grlpkvfasjciz71bv6x4cgz02v5l5giyplbcnfwa9fh";
+      name = "qt5compat-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtactiveqt-everywhere-src-6.9.2.tar.xz";
-      sha256 = "003vgfxswi6cpdp9i8kdzm1n34cbrbzlap4sg9h1ap0i9is51s1w";
-      name = "qtactiveqt-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtactiveqt-everywhere-src-6.10.0.tar.xz";
+      sha256 = "15m7g4h4aa3fk5q4an3apd0bdqkxdknnx64p72brrmah773mmlpm";
+      name = "qtactiveqt-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtbase = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtbase-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0h149x8l2ywfr5m034n20z6cjxnldary39x0vv22jhg0ryg9rgj4";
-      name = "qtbase-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtbase-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0v84f9pw387m0ghd4n6s9ipwjvniqspabqxkqmbj58slrcxn5m7a";
+      name = "qtbase-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtcharts-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0jzzlh0jq5fidgs9r4aqpilyj0nan30r1d0pigp1hgz7cigz20cz";
-      name = "qtcharts-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtcharts-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0svz8frryxv811xyg8cawn5icjcin6909mw4k6hlvgz7429m5zqv";
+      name = "qtcharts-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtconnectivity-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0qq4d8hn6s8bb9r2gglb6gzq6isbb13knqh7n2s2wsnx8rqwdzwa";
-      name = "qtconnectivity-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtconnectivity-everywhere-src-6.10.0.tar.xz";
+      sha256 = "16gs86zyaq8rvzd9jribgg51hanas15gpy8zh45n58004v7xa2jn";
+      name = "qtconnectivity-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdatavis3d-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0p6bvia085hx3jb1la06c2q48m9i897r1a1mf6bi2hbmm2hirzsx";
-      name = "qtdatavis3d-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtdatavis3d-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1qinrrk1j9qknwq2x7rl9aw8ajrp1h7kpfg29wcvaklbz9jj5xpx";
+      name = "qtdatavis3d-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdeclarative-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0r16qima008y2999r1djvwry01l295nmwwhqg081d2fr1cn2szs7";
-      name = "qtdeclarative-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtdeclarative-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1c7nar7q92w8l7wkmwbl0f6j4g1c8kw8jbn1bf35sf821593bzbf";
+      name = "qtdeclarative-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdoc-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0qng2lsqmrrj8n85aqh8vl4nlzc23va9hynvvf6gqr35anvbpniz";
-      name = "qtdoc-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtdoc-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0fvx690kap3s2h9lg4d4w3nsiks6h2idggskisg1r1gpwks2brgc";
+      name = "qtdoc-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtgraphs = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtgraphs-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0wsa4iar52dhiilyl053j7lmsw3xdn47b0pjrylb5a0ij1izp057";
-      name = "qtgraphs-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtgraphs-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1shllyk4f5lidw0hij9zhgapck3rf3hm6qw4m1nn79mynfrz3j3f";
+      name = "qtgraphs-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtgrpc = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtgrpc-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0r1z6lbjcsgxhvzylpr8z8wl44ql14ajf99n1hfvf4gy4f43qgd4";
-      name = "qtgrpc-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtgrpc-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0id4j4xgamx9wndc3cgnf5m42ax257xyfy2khq4aw0b10s4j4wpv";
+      name = "qtgrpc-everywhere-src-6.10.0.tar.xz";
     };
   };
   qthttpserver = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qthttpserver-everywhere-src-6.9.2.tar.xz";
-      sha256 = "06a0f7j1b309xffw3rwydz8lpzxnf5jg67savswskzbd3lfzlhqk";
-      name = "qthttpserver-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qthttpserver-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1i8z4l1is5xashh5lq9afj1syhvvz15zgcr5f27mwhjzvc0mfw74";
+      name = "qthttpserver-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtimageformats-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0fciahs4i0nn5z0j624gkfncqg6byxswj45bw81drpjp5xz3y0la";
-      name = "qtimageformats-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtimageformats-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1shcghzjn3v9mbgms0ykk5d91q7hdm8mxv8n6vjhsm3wa190lib4";
+      name = "qtimageformats-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlanguageserver-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1vlb0qn53y1b4zf7zkpxdvdh5ikr1cidq5gv8blvf6pyw6pnw6vq";
-      name = "qtlanguageserver-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtlanguageserver-everywhere-src-6.10.0.tar.xz";
+      sha256 = "19i151qxh2fw2h5w6082bh0myk6skz3dihhs4mahhb1rkzh077jc";
+      name = "qtlanguageserver-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtlocation = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlocation-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1ybk3ig69p6zyrxabcfkb4pcyc251gy1m2brkf4q52cmcwcysias";
-      name = "qtlocation-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtlocation-everywhere-src-6.10.0.tar.xz";
+      sha256 = "007qbni20qajdq6villwp7bc7hqzjlppc30yw3ccqb2bzf3kxm6b";
+      name = "qtlocation-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlottie-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1iiigsb4p1zwkxm1x9c4pbx5rgwz35krdqi3vkql4nawvp997px4";
-      name = "qtlottie-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtlottie-everywhere-src-6.10.0.tar.xz";
+      sha256 = "09bvm3jr2s0hg14dq8b7604hfgxj3cm1i93lkkbjh2n2bfpi793h";
+      name = "qtlottie-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtmultimedia-everywhere-src-6.9.2.tar.xz";
-      sha256 = "04mbwl1mg4rjgai027chldslpjnqrx52c3jxn20j2hx7ayda3y3v";
-      name = "qtmultimedia-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtmultimedia-everywhere-src-6.10.0.tar.xz";
+      sha256 = "09hixwp8sq771rfp4c8bvmpzl6jd906k2rsrkxwij78drwhl0hh4";
+      name = "qtmultimedia-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtnetworkauth-everywhere-src-6.9.2.tar.xz";
-      sha256 = "114c65gyg56v70byyl3if1q7mzhp5kkv1g8sp4y9zaxqirbdjr91";
-      name = "qtnetworkauth-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtnetworkauth-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1j5k6dn0zc5rq82k89nyz5w0ny89mg1pg5aw0h41ybg2f5fqaq04";
+      name = "qtnetworkauth-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtpositioning-everywhere-src-6.9.2.tar.xz";
-      sha256 = "06mwzlyprwz11ks6fsvzh03ilk5fxy3scr1gqqb4p85xzw0ri6j8";
-      name = "qtpositioning-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtpositioning-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1q8yd9sjbm1vzcda1i21x0qf0n4md0k6wwbmr5jrvqbbcf8brgzc";
+      name = "qtpositioning-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquick3d-everywhere-src-6.9.2.tar.xz";
-      sha256 = "002888xfnkxmvn8413fllidl3mm2fcwc4gbzdnbvpjlysaq9f3ig";
-      name = "qtquick3d-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquick3d-everywhere-src-6.10.0.tar.xz";
+      sha256 = "126lxiizd4pxxp43zzwv3k4i73806bgg329qsygz5qbnm0g8q9cq";
+      name = "qtquick3d-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquick3dphysics = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquick3dphysics-everywhere-src-6.9.2.tar.xz";
-      sha256 = "12yc0lswcmyaw19yyxzy73j95ncgqw8mlx8svhrwsllgcf2n9z47";
-      name = "qtquick3dphysics-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquick3dphysics-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0hj90pdxh6x6zm1b4iflhr89sy13qrbwc79pv9z9m7gdwyzhid62";
+      name = "qtquick3dphysics-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquickeffectmaker = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquickeffectmaker-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1yfq1pp0k2d6438x8pn2y73y29bqwg45bjh6msiy64fldr4z31br";
-      name = "qtquickeffectmaker-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquickeffectmaker-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0vmr5s6b4cqxpw5kl5shzydj3if89znm3izj5nrhzsgbic11vhk4";
+      name = "qtquickeffectmaker-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquicktimeline-everywhere-src-6.9.2.tar.xz";
-      sha256 = "09n51qw0y8v1q83xs1ybwwm4a49j2qhshqrasdkzz25mij6nhrdw";
-      name = "qtquicktimeline-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquicktimeline-everywhere-src-6.10.0.tar.xz";
+      sha256 = "182bn72mifx8s867hsmramjfl9qr8szpla9fqw7bi3ywb1fiig6z";
+      name = "qtquicktimeline-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtremoteobjects-everywhere-src-6.9.2.tar.xz";
-      sha256 = "09lby6dqc2sfig1krcszg6fkypgxlz2r7hgjjfi95g7g9gqlwqnz";
-      name = "qtremoteobjects-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtremoteobjects-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1616dagpzs68rhi1wiq1dwl1kbgf2c1mmrb3c7ni204k0rcjsh5i";
+      name = "qtremoteobjects-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtscxml-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1dpb687zbw4akx42kfpbb5cpdlq3hcqn8l3l0x7sd5i9061z2sp0";
-      name = "qtscxml-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtscxml-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1r1ic7kr3xzrg0vyrj4smj2vzyidazwrb5jqn2l6irg1bx06r55m";
+      name = "qtscxml-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtsensors-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0qj4674vim2p34mq3kp99spjyf82qvs75w625namzqp274pshk4n";
-      name = "qtsensors-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtsensors-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0fc7cq067sddfwcn43j5v4h6xzjrvj5gvi08l9bfag43s4d5wlk7";
+      name = "qtsensors-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtserialbus-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0xia9xcz7sjrbf1c4m63qnhz3ggdxr06pycslmsnqizlzb10f7lm";
-      name = "qtserialbus-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtserialbus-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0c7cljc555vcs7jkm63mczxxpg085b161b6vpd9vnrz2zyzv49y6";
+      name = "qtserialbus-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtserialport-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0sz2dkas4qjdd6lkfb9g89vi94q18aiq9xdchlqb2yn0qbqb544b";
-      name = "qtserialport-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtserialport-everywhere-src-6.10.0.tar.xz";
+      sha256 = "01gqv6hc2ycd877jhq6ffnfgizh9pgnzc1gn6m6cfp8ximwa07jg";
+      name = "qtserialport-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtshadertools-everywhere-src-6.9.2.tar.xz";
-      sha256 = "158lpzb1nqspwm0n48d3nfr81q85zka1igrjp6xj8cjlv7wqlrqp";
-      name = "qtshadertools-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtshadertools-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1xpvzmpisglbk3nnczqvj0n1dv6zd79phvczqwpqc9yq7y64gfl7";
+      name = "qtshadertools-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtspeech = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtspeech-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1cc8l2h1frlraay0m40r5a91nsc7b53n6vksa52pwqqia4vngdmj";
-      name = "qtspeech-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtspeech-everywhere-src-6.10.0.tar.xz";
+      sha256 = "07m59akg31010khz82lvbrgjwwacavra5qsi17jqpk0chdk300qk";
+      name = "qtspeech-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtsvg-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1985asvnkd2ar30nh2zyi490qz0vkz6z1f752lfald33yawcm16r";
-      name = "qtsvg-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtsvg-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0cr5vaz485n23fvw4kvh1ykqny61bpdr5vd2q9szywsy9phc1ljy";
+      name = "qtsvg-everywhere-src-6.10.0.tar.xz";
     };
   };
   qttools = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qttools-everywhere-src-6.9.2.tar.xz";
-      sha256 = "12d4czfwvh9rfjwnkpsiwzrpx4ga69c6vz85aabhpk3hx7lggdyq";
-      name = "qttools-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qttools-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0anhvd7yqs9l3dryl43f0f7zq22rwrvz93g16ygmjgiyryc50vfq";
+      name = "qttools-everywhere-src-6.10.0.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qttranslations-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1mky3xj2yhcsrmpz8m28v7pky6ryn7hvdcglakww0rfk3qlbcfy7";
-      name = "qttranslations-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qttranslations-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1pkc0a5kigcp0jcq3ny1ykl0rqw0vabz45w14d2mgjyhrx9q4vij";
+      name = "qttranslations-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1qqizh7kyqbqqnrm1mmlf2709rm1rnflbqdl1bi75yms07d00hbv";
-      name = "qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtvirtualkeyboard-everywhere-src-6.10.0.tar.xz";
+      sha256 = "108klc6cr2ihaka9gnqaqv9i8r4lr8m39yviic3nviibd3r6gcmb";
+      name = "qtvirtualkeyboard-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwayland-everywhere-src-6.9.2.tar.xz";
-      sha256 = "10bpxwpam56gvymz9vjxkppbqsj1369ddzl3k4pz2s2maq39imya";
-      name = "qtwayland-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwayland-everywhere-src-6.10.0.tar.xz";
+      sha256 = "07vnfd0xmzg8vc68g9j2i88lilmic5vhv22gn47vs94v4l52ngv0";
+      name = "qtwayland-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebchannel-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0rcf7i1wamdf1qynq3yi88r77ch5dg1jinxywlfjlb2dmlvn72l7";
-      name = "qtwebchannel-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebchannel-everywhere-src-6.10.0.tar.xz";
+      sha256 = "02ahm7cz8wgvfcgyq85sc2v566x4ihymalmv5xi0wn5zz9j5h5kl";
+      name = "qtwebchannel-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebengine-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1aq35nkgbvhlsmglnjizbkavr7kb0ymf5n3kkllrpqy2mf90gjwr";
-      name = "qtwebengine-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebengine-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0765a5kfkxxi7rq58pivi32xwb17pvg3h2ix88dx3y9h3jqpfk64";
+      name = "qtwebengine-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebsockets-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1vh82w96436pqrp4daf324mqs2zjvn51z78b3ksc5mnqgrk3z0xy";
-      name = "qtwebsockets-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebsockets-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0vl091wnzqjpnp0i0l2dqlbhlwcfzw2ry1p48aifxf63lmyjw2fi";
+      name = "qtwebsockets-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.9.2";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebview-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1w8z3d7w7z2xjfb5l15gb37v9w6pa7d71jalkrqda8l2wr5d3ksc";
-      name = "qtwebview-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebview-everywhere-src-6.10.0.tar.xz";
+      sha256 = "03rszbcr3lnf9cnk7hz99ibxx8na4l3i98q19fahj36ilpk68dd9";
+      name = "qtwebview-everywhere-src-6.10.0.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix
index 8f7c53a7ca80..4abcdb8d83cb 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "QtPBFImagePlugin";
     tag = version;
-    hash = "sha256-3Tfh92ozitvL9EiGJy8Q20C8zDx5eNNJFa7KDXDuS6Y=";
+    hash = "sha256-IU9sA8yipGsqD9HadGlQce4ud0RyfMMh83cdVuSTGjs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index c33658cc59b7..08702ee573d8 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtutilities";
-  version = "6.18.2";
+  version = "6.18.3";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "qtutilities";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SwKXON16a9qmI+FrTA1OH0zIqf5rfAWbGOhCpCIHgr4=";
+    hash = "sha256-x9el1oUyl2xrpehhR9uuexVBErSWudPB56ZpU91zZew=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix
index a9280ae76f47..59b734382ab6 100644
--- a/pkgs/development/libraries/qxlsx/default.nix
+++ b/pkgs/development/libraries/qxlsx/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qtbase,
 }:
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-twOlAiLE0v7+9nWo/Gd+oiKT1umL3UnG1Xa0zDG7u7s=";
   };
 
+  patches = [
+    # Fix for Qt 6.10, can likely be removed when version bump passes v1.5.0.
+    (fetchpatch {
+      url = "https://github.com/QtExcel/QXlsx/commit/90d762625750c6b2c73f6cd96b633e9158aed72e.patch";
+      hash = "sha256-/0xLrkjuJGZRocK1EyBhuaUmg0usueQz2F340DkQhb0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qtbase ];
 
diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix
index cbbddf3d33e4..a9200c388be5 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@@ -17,22 +17,27 @@
   fftw,
   gtest,
   udevCheckHook,
+  versionCheckHook,
   indi-full,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "indilib";
-  version = "2.1.5.1";
+  version = "2.1.6";
 
   src = fetchFromGitHub {
     owner = "indilib";
     repo = "indi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-mbY3iDLRcQ+pis26u6pHzB43ureaKH7KYPkV0CwHU/E=";
+    hash = "sha256-WfVC5CLzwyO40Kpv/SZaYiPGDvWLUydQaA8FvTVhHqg=";
   };
 
   nativeBuildInputs = [
     cmake
+  ];
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
     udevCheckHook
   ];
 
@@ -86,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Implementation of the INDI protocol for POSIX operating systems";
     changelog = "https://github.com/indilib/indi/releases/tag/v${finalAttrs.version}";
     license = licenses.lgpl2Plus;
+    mainProgram = "indiserver";
     maintainers = with maintainers; [
       sheepforce
       returntoreality
diff --git a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
index 57a0371090f6..45ee14aec7ed 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
@@ -9,7 +9,6 @@
   coreutils,
   cfitsio,
   fetchFromGitHub,
-  fetchpatch,
   gtest,
   libusb1,
   libusb-compat-0_1,
@@ -42,12 +41,13 @@
 }:
 
 let
+  thirdparty_version = "2.1.6.2";
   fxload = libusb1.override { withExamples = true; };
   src-3rdparty = fetchFromGitHub {
     owner = "indilib";
     repo = "indi-3rdparty";
-    rev = "v${indilib.version}";
-    hash = "sha256-+WBQdu1iWleHf6xC4SK69y505wqZ36IUM4xnh1fnc6s=";
+    rev = "v${thirdparty_version}";
+    hash = "sha256-FMvdm7dkOkRlmbPNeQjh0jd+2bOinzW13QPP2NnOr/M=";
   };
 
   buildIndi3rdParty =
@@ -58,7 +58,7 @@ let
       cmakeFlags ? [ ],
       postInstall ? "",
       doCheck ? true,
-      version ? indilib.version,
+      version ? thirdparty_version,
       src ? src-3rdparty,
       meta ? { },
       ...
@@ -551,14 +551,6 @@ in
   indi-astarbox = buildIndi3rdParty {
     pname = "indi-astarbox";
     buildInputs = [ indilib ];
-    # TODO patch already upstream, remove with version > 2.1.5.1
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/indilib/indi-3rdparty/commit/c347000ec227a5ef98911aab34c7b08a91509cba.patch";
-        hash = "sha256-M3b4ySoGJRpfNmBaagjDaeEPKqwaVgRUWaQY626SGBI=";
-        stripLen = 1;
-      })
-    ];
   };
 
   indi-astroasis = buildIndi3rdParty {
@@ -713,15 +705,6 @@ in
       glib
       zlib
     ];
-    # TODO patch already upstream, remove with version > 2.1.5.1
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/indilib/indi-3rdparty/commit/c33c08b50093698e2aa73d73783d96f85df488a9.patch";
-        hash = "sha256-EQ2G9gTexf9FESCAR28f2cwzvH4TOAA8bvyJCxFv/E8=";
-        stripLen = 1;
-      })
-    ];
-
   };
 
   indi-gphoto = buildIndi3rdParty {
diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index aa8849e5faaa..89dbbc7dd837 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -12,6 +12,7 @@
   python3,
   libarchive,
   libmsym,
+  jkqtplotter,
   qttools,
   wrapQtAppsHook,
 }:
@@ -28,32 +29,32 @@ let
   moleculesRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "molecules";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
   };
   crystalsRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "crystals";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
   };
   fragmentsRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "fragments";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-x10jGl3lAEfm8OxUZJnjXRJCQg8RLQZTstjwnt5B2bw=";
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avogadrolibs";
-  version = "1.101.0";
+  version = "1.102.1";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadrolibs";
-    tag = version;
-    hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk=";
+    tag = finalAttrs.version;
+    hash = "sha256-RmGRdCy1ubwAkEJlfldscR84NLOMBx33OdHdcq1R1gg=";
   };
 
   postUnpack = ''
@@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
     glew
     libarchive
     libmsym
+    jkqtplotter
     qttools
   ];
 
@@ -96,4 +98,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2Only;
   };
-}
+})
diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
index dba6e33b22e6..122214040a08 100644
--- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix
+++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qttools ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   # Fix the broken CMake files to use the correct paths
   postInstall = ''
     substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index 7f359ebacbdb..b01d34047673 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   perl,
   which,
   # Most packages depending on openblas expect integer width to match
@@ -198,6 +199,13 @@ stdenv.mkDerivation rec {
     # Remove this once https://github.com/OpenMathLib/OpenBLAS/issues/5414 is
     # resolved.
     ./disable-sme-sgemm-kernel.patch
+
+    # https://github.com/OpenMathLib/OpenBLAS/issues/5460
+    (fetchpatch {
+      name = "0001-openblas-Use-generic-kernels-for-SCAL-on-POWER4-5.patch";
+      url = "https://github.com/OpenMathLib/OpenBLAS/commit/14c9dcaac70d9382de00ba4418643d9587f4950e.patch";
+      hash = "sha256-mIOqRc7tE1rV/krrAu630JwApZHdeHCdVmO5j6eDC8U=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index df867ee42121..bf3eeab4682e 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -80,7 +80,7 @@ effectiveStdenv.mkDerivation rec {
     "CFLAGS=-DBLAS64"
   ]
   ++ lib.optionals enableCuda [
-    "CUDA_PATH=${cudaPackages.cuda_nvcc}"
+    "CUDA_PATH=${lib.getBin cudaPackages.cuda_nvcc}"
     "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so"
     "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so"
   ]
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 5a25cb3571d7..768e4a0ec359 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   llvmPackages,
+  fetchpatch,
   fetchurl,
   pkg-config,
   freetype,
@@ -39,7 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     }
   );
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ];
+  patches = [
+    # Fix build with gcc15
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/graphite2/raw/deba28323b0a3b7a3dcfd06df1efc2195b102ed7/f/graphite2-1.3.14-gcc15.patch";
+      hash = "sha256-vkkGkHkcsj1mD3OHCHLWWgpcmFDv8leC4YQm+TsbIUw=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ];
   postPatch = ''
     # disable broken 'nametabletest' test, fails on gcc-13:
     #   https://github.com/silnrsi/graphite/pull/74
diff --git a/pkgs/development/libraries/spandsp/3.nix b/pkgs/development/libraries/spandsp/3.nix
index 77126a7c4cee..5a7f0005a407 100644
--- a/pkgs/development/libraries/spandsp/3.nix
+++ b/pkgs/development/libraries/spandsp/3.nix
@@ -4,16 +4,19 @@
   libjpeg,
 }:
 
-(callPackage ./common.nix { }).overrideAttrs (previousAttrs: {
+((callPackage ./common.nix { }) {
   version = "3.0.0";
   src = fetchFromGitHub {
     owner = "freeswitch";
-    repo = previousAttrs.pname;
+    repo = "spandsp";
     rev = "6ec23e5a7e411a22d59e5678d12c4d2942c4a4b6"; # upstream does not seem to believe in tags
     sha256 = "03w0s99y3zibi5fnvn8lk92dggfgrr0mz5255745jfbz28b2d5y7";
   };
-
-  propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [
-    libjpeg
-  ];
-})
+}).overrideAttrs
+  (
+    finalAttrs: previousAttrs: {
+      propagatedBuildInputs = previousAttrs.propagatedBuildInputs or [ ] ++ [
+        libjpeg
+      ];
+    }
+  )
diff --git a/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch b/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch
new file mode 100644
index 000000000000..a336732b9000
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/Check-for-feenableexcept-explicitly.patch
@@ -0,0 +1,132 @@
+From c0caa79a2aa6ac5b358f30719ff80ee2c6db51f7 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 3 Nov 2025 12:06:15 +0100
+Subject: [PATCH] Check for feenableexcept() explicitly
+
+musl provides <fenv.h>, but not the non-standard feenableexcept()
+function, so using feenableexcept() whenever <fenv.h> was present
+caused build failures on musl.  Instead, explicitly check for the
+non-standard function we want to use.
+---
+ configure.ac         | 2 +-
+ tests/v17_tests.c    | 6 +++---
+ tests/v27ter_tests.c | 6 +++---
+ tests/v29_tests.c    | 6 +++---
+ 4 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index fa87245..a8864d8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -186,6 +186,7 @@ AC_CHECK_FUNCS([strstr])
+ AC_CHECK_FUNCS([strtol])
+ AC_CHECK_FUNCS([gettimeofday])
+ AC_CHECK_FUNCS([drand48])
++AC_CHECK_FUNCS([feenableexcept])
+ 
+ AC_HEADER_SYS_WAIT
+ 
+@@ -209,7 +210,6 @@ AC_CHECK_HEADERS([sys/select.h])
+ AC_CHECK_HEADERS([sys/ioctl.h])
+ AC_CHECK_HEADERS([sys/fcntl.h])
+ AC_CHECK_HEADERS([sndfile.h])
+-AC_CHECK_HEADERS([fenv.h])
+ AC_CHECK_HEADERS([fftw3.h], , [AC_CHECK_HEADERS([fftw.h])])
+ AC_CHECK_HEADERS([pcap.h])
+ AC_CHECK_HEADERS([pthread.h])
+diff --git a/tests/v17_tests.c b/tests/v17_tests.c
+index 17c7fcb..411396c 100644
+--- a/tests/v17_tests.c
++++ b/tests/v17_tests.c
+@@ -59,7 +59,7 @@ display of modem status is maintained.
+ #include <string.h>
+ #include <sndfile.h>
+ #include <signal.h>
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ #define __USE_GNU
+ #include <fenv.h>
+ #endif
+@@ -263,7 +263,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex
+ }
+ /*- End of function --------------------------------------------------------*/
+ 
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ static void sigfpe_handler(int sig_num, siginfo_t *info, void *data)
+ {
+     switch (sig_num)
+@@ -425,7 +425,7 @@ int main(int argc, char *argv[])
+     inhandle = NULL;
+     outhandle = NULL;
+ 
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+     fpe_trap_setup();
+ #endif
+ 
+diff --git a/tests/v27ter_tests.c b/tests/v27ter_tests.c
+index 14b06f8..f0559a4 100644
+--- a/tests/v27ter_tests.c
++++ b/tests/v27ter_tests.c
+@@ -58,7 +58,7 @@ display of modem status is maintained.
+ #include <string.h>
+ #include <sndfile.h>
+ #include <signal.h>
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ #define __USE_GNU
+ #include <fenv.h>
+ #endif
+@@ -286,7 +286,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex
+ }
+ /*- End of function --------------------------------------------------------*/
+ 
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ static void sigfpe_handler(int sig_num, siginfo_t *info, void *data)
+ {
+     switch (sig_num)
+@@ -440,7 +440,7 @@ int main(int argc, char *argv[])
+     inhandle = NULL;
+     outhandle = NULL;
+ 
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+     fpe_trap_setup();
+ #endif
+ 
+diff --git a/tests/v29_tests.c b/tests/v29_tests.c
+index 390663f..7a43797 100644
+--- a/tests/v29_tests.c
++++ b/tests/v29_tests.c
+@@ -58,7 +58,7 @@ display of modem status is maintained.
+ #include <string.h>
+ #include <sndfile.h>
+ #include <signal.h>
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ #define __USE_GNU
+ #include <fenv.h>
+ #endif
+@@ -257,7 +257,7 @@ static void qam_report(void *user_data, const complexf_t *constel, const complex
+ }
+ /*- End of function --------------------------------------------------------*/
+ 
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+ static void sigfpe_handler(int sig_num, siginfo_t *info, void *data)
+ {
+     switch (sig_num)
+@@ -410,7 +410,7 @@ int main(int argc, char *argv[])
+     inhandle = NULL;
+     outhandle = NULL;
+ 
+-#if defined(HAVE_FENV_H)
++#if defined(HAVE_FEENABLEEXCEPT)
+     fpe_trap_setup();
+ #endif
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch b/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch
new file mode 100644
index 000000000000..a7498ab1a63e
--- /dev/null
+++ b/pkgs/development/libraries/spandsp/Fix-tests-pcap_parse-build-on-musl.patch
@@ -0,0 +1,28 @@
+From 5007684cd46fec39d3c8f67a222f2d34d48fd4b4 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Mon, 3 Nov 2025 12:07:48 +0100
+Subject: [PATCH] Fix tests/pcap_parse build on musl
+
+musl only defines the Linux-style struct udphdr member names if
+_GNU_SOURCE is defined, so do that, like certain other tests already
+do.
+---
+ tests/pcap_parse.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/pcap_parse.c b/tests/pcap_parse.c
+index 4e79743..a8a69a3 100644
+--- a/tests/pcap_parse.c
++++ b/tests/pcap_parse.c
+@@ -31,6 +31,8 @@
+ #include "config.h"
+ #endif
+ 
++#define _GNU_SOURCE
++
+ #include <inttypes.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+-- 
+2.51.0
+
diff --git a/pkgs/development/libraries/spandsp/common.nix b/pkgs/development/libraries/spandsp/common.nix
index 7abfee0668c5..317e5494f790 100644
--- a/pkgs/development/libraries/spandsp/common.nix
+++ b/pkgs/development/libraries/spandsp/common.nix
@@ -5,11 +5,28 @@
   libtiff,
   buildPackages,
   fetchpatch,
-  autoreconfHook,
+  autoconf,
+  automake,
+  fftw,
+  libpcap,
+  libsndfile,
+  libtool,
+  libxml2,
+  netpbm,
+  sox,
+  util-linux,
+  which,
+}:
+
+{
+  version,
+  src,
+  patches ? [ ],
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spandsp";
+  inherit version src;
 
   patches = [
     # submitted upstream: https://github.com/freeswitch/spandsp/pull/47
@@ -17,41 +34,185 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/freeswitch/spandsp/commit/1f810894804d3fa61ab3fc2f3feb0599145a3436.patch";
       hash = "sha256-Cf8aaoriAvchh5cMb75yP2gsZbZaOLha/j5mq3xlkVA=";
     })
-  ];
+
+    # https://github.com/freeswitch/spandsp/pull/110
+    ./Check-for-feenableexcept-explicitly.patch
+
+    # https://github.com/freeswitch/spandsp/pull/111
+    ./Fix-tests-pcap_parse-build-on-musl.patch
+  ]
+  ++ patches;
+
+  postPatch = ''
+    patchShebangs autogen.sh
+
+    # pkg-config? What's that?
+    # Actually *check* the value given for --{en,dis}able-tests, not just whether the option was passed
+    substituteInPlace configure.ac \
+      --replace-fail '$xml2_include_dir /usr/include /usr/local/include /usr/include/libxml2 /usr/local/include/libxml2' '$xml2_include_dir ${lib.getDev libxml2}/include ${lib.getDev libxml2}/include/libxml2 /usr/local/include/libxml2' \
+      --replace-fail 'if test -n "$enable_tests" ; then' 'if test "$enable_tests" = "yes" ; then'
+  '';
 
   outputs = [
     "out"
     "dev"
   ];
 
-  nativeBuildInputs = [ autoreconfHook ];
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    util-linux
+    which
+  ];
+
   depsBuildBuild = [ buildPackages.stdenv.cc ];
+
   propagatedBuildInputs = [
     audiofile
     libtiff
   ];
 
+  nativeCheckInputs = [
+    libtiff
+    netpbm
+    sox
+  ];
+
+  checkInputs = [
+    fftw
+    libpcap
+    libsndfile
+    libxml2
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
   configureFlags = [
+    (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests")
+
     # This flag is required to prevent linking error in the cross-compilation case.
     # I think it's fair to assume that realloc(NULL, size) will return a valid memory
     # block for most libc implementation, so let's just assume that and hope for the best.
     "ac_cv_func_malloc_0_nonnull=yes"
   ];
 
-  enableParallelBuilding = true;
+  # Issues with test asset generation under heavy parallelism
+  enableParallelBuilding = false;
 
   makeFlags = [
     "CC=${stdenv.cc.targetPrefix}cc"
     "CC_FOR_BUILD=${buildPackages.stdenv.cc}/bin/cc"
   ];
 
-  strictDeps = true;
+  env.NIX_CFLAGS_COMPILE = toString [
+    # Missing const conversion on some calls
+    "-Wno-error=incompatible-pointer-types"
+  ];
+
+  hardeningDisable = lib.optionals (lib.strings.versionOlder finalAttrs.version "3.0.0") [
+    "format"
+  ];
+
+  doCheck =
+    stdenv.buildPlatform.canExecute stdenv.hostPlatform
+    # Compat with i.e. Clang improved by 0446f4e0c72553f3ea9b50c5333ece6ac980e58d, too big to apply
+    && stdenv.cc.isGNU;
+
+  disabledTests = [
+    # Need proprietary recordings that aren't included
+    "ademco_contactid_tests"
+    "dtmf_rx_tests"
+    "g722_tests"
+    "g726_tests"
+    "gsm0610_tests"
+    "modem_connect_tones_tests"
+    "sig_tone_tests"
+    "t42_tests"
+    "t43_tests"
+    "v42bis_tests"
+
+    # Fails to initialise modem.
+    "data_modems_tests"
+
+    # ERROR PTY Fatal error: failed to create /dev/spandsp/0 symbolic link
+    "dummy_modems_tests" # needs extra setup, but eventually runs into the above error
+    "pseudo_terminal_tests"
+
+    # Hangs. Maybe needs setup / some interaction
+    "fax_tests"
+
+    # Needs an input file, unsure what's suitable
+    "playout_tests"
+
+    # Borked in the packaged versions due to missing audio file - copy-pasting mistake
+    # Maybe fixed after 5394b2cae6c482ccb835335b769469977e6802ae, but too big to apply
+    "super_tone_rx_tests"
+
+    # Stuck
+    "t31_pseudo_terminal_tests"
+
+    # Generated signal has more than the expected maximum samples - 441 vs 422
+    "time_scale_tests"
+
+    # Test failed - -16dBm0 of noise, signal is 9056.993164 (11440.279297)
+    "tone_detect_tests"
+
+    # Fails due to result different from reference
+    "v18_tests"
+
+    # Seemingly runs forever, with tons of output
+    "v22bis_tests"
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    pushd tests
+
+    for test in *_tests; do
+      testArgs=()
+      case "$test" in
+        # Skipped tests
+        ${lib.strings.concatStringsSep "|" finalAttrs.disabledTests})
+          echo "Skipping $test"
+          continue
+          ;;
+
+        # Needs list of subtests to run
+        echo_tests)
+          testArgs+=(
+            sanity 2a 2b 2ca 3a 3ba 3bb 3c 4 5 6 7 8 9 10a 10b 10c 11 12 13 14 15
+          )
+          # Fallthough for running the test
+          ;;&
+
+        *)
+          echo "Running $test"
+          if ! ./"$test" "''${testArgs[@]}" >"$test".log 2>&1; then
+            echo "$test failed! Output:"
+            cat "$test".log
+            exit 1
+          fi
+          ;;
+      esac
+    done
+
+    popd
+
+    runHook postCheck
+  '';
 
   meta = {
     description = "Portable and modular SIP User-Agent with audio and video support";
     homepage = "https://github.com/freeswitch/spandsp";
     platforms = with lib.platforms; unix;
     maintainers = with lib.maintainers; [ misuzu ];
+    teams = [ lib.teams.ngi ];
     license = lib.licenses.gpl2;
     downloadPage = "http://www.soft-switch.org/downloads/spandsp/";
   };
diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix
index 991b9cd8ba17..0a06b112e4c2 100644
--- a/pkgs/development/libraries/spandsp/default.nix
+++ b/pkgs/development/libraries/spandsp/default.nix
@@ -1,12 +1,27 @@
 {
   fetchurl,
+  fetchpatch,
   callPackage,
 }:
 
-(callPackage ./common.nix { }).overrideAttrs (_: rec {
+(callPackage ./common.nix { }) rec {
   version = "0.0.6";
   src = fetchurl {
     url = "https://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz";
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
-})
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
+      includes = [
+        "spandsp-sim/g1050.c"
+        "spandsp-sim/test_utils.c"
+      ];
+      hash = "sha256-2MmVgyMUK0Zn+mL7IX57Y7brYpgmt4GVlis5/NstuNM=";
+    })
+    (fetchpatch {
+      url = "https://github.com/freeswitch/spandsp/commit/f47bcdc301fbddad44e918939eed1b361882f740.patch";
+      hash = "sha256-O+lIC3V92GVFoiHsUQOXkoTN2hJ7v5+LQP7RrAhvwlY=";
+    })
+  ];
+}
diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 524a3c1a8657..87a13c7fc75b 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -171,6 +171,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tpm2-software/tpm2-tss";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ baloo ];
+    maintainers = with maintainers; [
+      baloo
+      scottstephens
+    ];
   };
 })
diff --git a/pkgs/development/libraries/unqlite/default.nix b/pkgs/development/libraries/unqlite/default.nix
index 5e15f7e4d103..ae1261f807ec 100644
--- a/pkgs/development/libraries/unqlite/default.nix
+++ b/pkgs/development/libraries/unqlite/default.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://unqlite.org/";
     description = "Self-contained, serverless, zero-conf, transactional NoSQL DB library";
diff --git a/pkgs/development/libraries/ustream-ssl/default.nix b/pkgs/development/libraries/ustream-ssl/default.nix
index e618431bb01c..28d42d6fd27b 100644
--- a/pkgs/development/libraries/ustream-ssl/default.nix
+++ b/pkgs/development/libraries/ustream-ssl/default.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation {
   pname = "ustream-ssl";
-  version = "0-unstable-2024-03-26";
+  version = "0-unstable-2025-10-03";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/ustream-ssl.git";
-    rev = "7621339d7694abef5da5e5353ac440f2d39dcecb";
-    hash = "sha256-No0Pk8KbkT7W4Rav7W3rMKEJISbp7RRoRx7t6LPMxlk=";
+    rev = "5a81c108d20e24724ed847cc4be033f2a74e6635";
+    hash = "sha256-IC5740+1YT3TDayath3Md3hdjuml1S1A/OWYd0GxbDc=";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/vc/0.7.nix b/pkgs/development/libraries/vc/0.7.nix
deleted file mode 100644
index 7636fbf2a0f5..000000000000
--- a/pkgs/development/libraries/vc/0.7.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "Vc";
-  version = "0.7.5";
-
-  src = fetchFromGitHub {
-    owner = "VcDevel";
-    repo = "Vc";
-    rev = version;
-    sha256 = "190s4r2n3jsivl4j2m288j3rqmgjj6gl308hi9mzwyhcfn17q8br";
-  };
-
-  # Avoid requesting an unreasonable intrinsic
-  patches = lib.optional stdenv.cc.isClang ./vc_0_7_clang_fix.patch;
-
-  nativeBuildInputs = [ cmake ];
-
-  postPatch = ''
-    sed -i '/OptimizeForArchitecture()/d' cmake/VcMacros.cmake
-    sed -i '/AutodetectHostArchitecture()/d' print_target_architecture.cmake
-  '';
-
-  meta = with lib; {
-    description = "Library for multiprecision complex arithmetic with exact rounding";
-    homepage = "https://github.com/VcDevel/Vc";
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    maintainers = [ ];
-    # never built on aarch64-darwin since first introduction in nixpkgs
-    broken =
-      (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)
-      || (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-  };
-}
diff --git a/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch b/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch
deleted file mode 100644
index 29ea6f529490..000000000000
--- a/pkgs/development/libraries/vc/vc_0_7_clang_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur a/sse/intrinsics.h b/sse/intrinsics.h
---- a/sse/intrinsics.h	2021-11-12 22:09:50.000000000 -0500
-+++ b/sse/intrinsics.h	2021-11-12 22:14:08.000000000 -0500
-@@ -498,16 +498,6 @@
-         case 0:
-             f = _mm_cvtss_f32(v);
-             break;
--#if defined VC_IMPL_SSE4_1 && !defined VC_MSVC
--        default:
--#ifdef VC_GCC
--            f = __builtin_ia32_vec_ext_v4sf(static_cast<__v4sf>(v), (i));
--#else
--            // MSVC fails to compile this because it can't optimize i to an immediate
--            _MM_EXTRACT_FLOAT(f, v, i);
--#endif
--            break;
--#else
-         case 1:
-             f = _mm_cvtss_f32(_mm_castsi128_ps(_mm_srli_si128(_mm_castps_si128(v), 4)));
-             break;
-@@ -517,7 +507,6 @@
-         case 3:
-             f = _mm_cvtss_f32(_mm_castsi128_ps(_mm_srli_si128(_mm_castps_si128(v), 12)));
-             break;
--#endif
-         }
-         return f;
-     }
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 31be22e39c43..90d7384bb5bc 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -107,7 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://wayland.freedesktop.org/";
     license = licenses.mit; # Expat version
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
+    # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
+    badPlatforms = lib.platforms.darwin;
     maintainers = with maintainers; [
       codyopel
       qyliss
diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index bed1d40d4fb3..40cc38c2e852 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -18,7 +18,7 @@
   gnutls,
   libgcrypt,
   libgpg-error,
-  gtk3,
+  gtk4,
   wayland,
   wayland-protocols,
   wayland-scanner,
@@ -32,7 +32,7 @@
   at-spi2-core,
   cairo,
   libxml2,
-  libsoup,
+  libsoup_3,
   libsecret,
   libxslt,
   harfbuzz,
@@ -79,16 +79,15 @@
   fetchpatch,
 }:
 
+let
+  abiVersion = if lib.versionAtLeast gtk4.version "4.0" then "6.0" else "4.1";
+in
+
 # https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
   version = "2.50.1";
-  name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${
-    if lib.versionAtLeast gtk3.version "4.0" then
-      "6.0"
-    else
-      "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"
-  }";
+  name = "webkitgtk-${finalAttrs.version}+abi=${abiVersion}";
 
   outputs = [
     "out"
@@ -206,13 +205,13 @@ clangStdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withLibsecret [
     libsecret
   ]
-  ++ lib.optionals (lib.versionAtLeast gtk3.version "4.0") [
+  ++ lib.optionals (lib.versionAtLeast gtk4.version "4.0") [
     wayland-protocols
   ];
 
   propagatedBuildInputs = [
-    gtk3
-    libsoup
+    gtk4
+    libsoup_3
   ];
 
   cmakeFlags =
@@ -222,7 +221,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     [
       "-DENABLE_INTROSPECTION=ON"
       "-DPORT=GTK"
-      "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
+      "-DUSE_SOUP2=${cmakeBool false}"
       "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
       "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
     ]
@@ -241,7 +240,7 @@ clangStdenv.mkDerivation (finalAttrs: {
       "-DUSE_APPLE_ICU=OFF"
       "-DUSE_OPENGL_OR_ES=OFF"
     ]
-    ++ lib.optionals (lib.versionOlder gtk3.version "4.0") [
+    ++ lib.optionals (lib.versionOlder gtk4.version "4.0") [
       "-DUSE_GTK4=OFF"
     ]
     ++ lib.optionals (!systemdSupport) [
@@ -267,9 +266,9 @@ clangStdenv.mkDerivation (finalAttrs: {
     homepage = "https://webkitgtk.org/";
     license = licenses.bsd2;
     pkgConfigModules = [
-      "javascriptcoregtk-4.0"
-      "webkit2gtk-4.0"
-      "webkit2gtk-web-extension-4.0"
+      "javascriptcoregtk-${abiVersion}"
+      "webkit2gtk-${abiVersion}"
+      "webkit2gtk-web-extension-${abiVersion}"
     ];
     platforms = platforms.linux ++ platforms.darwin;
     teams = [ teams.gnome ];
diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 7518d68b2fb1..ea3d8ed42dc3 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -161,27 +161,18 @@ in
   };
 
   wlroots_0_18 = generic {
-    version = "0.18.2";
-    hash = "sha256-vKvMWRPPJ4PRKWVjmKKCdNSiqsQm+uQBoBnBUFElLNA=";
+    version = "0.18.3";
+    hash = "sha256-D8RapSeH+5JpTtq+OU8PyVZubLhjcebbCBPuSO5Q7kU=";
     extraBuildInputs = [
       lcms2
     ];
   };
 
   wlroots_0_19 = generic {
-    version = "0.19.1";
-    hash = "sha256-Q4x6obwzYYncgoUzqFVzn/scjxsiUeAIlEWY43emdvA=";
+    version = "0.19.2";
+    hash = "sha256-8VOhSaH9D0GkqyIP42W3uGcDT5ixPVDMT/OLlMXBNXA=";
     extraBuildInputs = [
       lcms2
     ];
-    patches = [
-      (fetchpatch {
-        # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5134
-        # > backend, output: send commit events after applying all in wlr_backend_commit()
-        # fixes potential crash in sway. Remove once a new release is made of wlroots
-        url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/7392b3313a7b483c61f4fea648ba8f2aa4ce8798.patch";
-        sha256 = "sha256-SK463pnIX2qjwRblCJRbvJeZTL6wAXho6wBIJ10OuNk=";
-      })
-    ];
   };
 }
diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix
index 45ad78c4f236..725a6353f983 100644
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@@ -27,9 +27,6 @@ let
       cl-cairo2-xlib = super.cl-cairo2-xlib.overrideLispAttrs (o: {
         nativeLibs = [ pkgs.gtk2-x11 ];
       });
-      cl-freeimage = super.cl-freeimage.overrideLispAttrs (o: {
-        nativeLibs = [ pkgs.freeimage ];
-      });
       cl-freetype2 = super.cl-freetype2.overrideLispAttrs (o: {
         nativeLibs = [ pkgs.freetype ];
         nativeBuildInputs = [ pkgs.freetype ];
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 4547825dc459..cc1440de0d58 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -651,17 +651,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fennel";
-      version = "1.5.3-1";
+      version = "1.6.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fennel-1.5.3-1.rockspec";
-          sha256 = "1nlibaa6zlik0c164z4c57yy3zizqx8q0wifql5x4ya3s0bn0d9r";
+          url = "mirror://luarocks/fennel-1.6.0-1.rockspec";
+          sha256 = "043nxxr69biy69avpmqx7dsingcpgq7zgihygfdb583aj0xfmry7";
         }).outPath;
       src = fetchFromGitHub {
         owner = "bakpakin";
         repo = "Fennel";
-        rev = "1.5.3";
-        hash = "sha256-7Tq6Vx032jxnfPmtsKiTBQ/yH8vHO8+wMoQHZSIevWY=";
+        rev = "1.6.0";
+        hash = "sha256-WzsQwYgFU0Jm8YeaLCcJ0TbqNJao72TBxnigj7jw8yU=";
       };
 
       disabled = luaOlder "5.1";
@@ -814,15 +814,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2246-1";
+      version = "0.0.2296-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2246-1.rockspec";
-          sha256 = "0lppmjwb4q4czcyavg76awvgjak2xx8sczmgpg1ync936yh0fk60";
+          url = "mirror://luarocks/fzf-lua-0.0.2296-1.rockspec";
+          sha256 = "1nlsfr036l09ry34pidnq8w2ihz4zn16bmzb8jn2nlrf7l8jibqn";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/7b730b69985e33c14bff3bdafd1a2c82fdfa1376.zip";
-        sha256 = "0fzjwfqk1204bad1rjj0dh0nb8amwmm1gvd0q4qxmjh6wsjqs8im";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/a8458b79a957a6e3e217d84106a0fd4b9470ff4c.zip";
+        sha256 = "0wswrbfjjyid1zgqmjcxkl7mljsmlayzkfnkpc3zy82ry8li0nis";
       };
 
       disabled = luaOlder "5.1";
@@ -880,8 +880,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "lewis6991";
         repo = "gitsigns.nvim";
-        rev = "23ae90a2a52fdc9b8c50dc61d6c30ebb18521343";
-        hash = "sha256-8VIW+tPttYTn2vqiYJCZ5ckqFEBGc38rkfla/puYPUQ=";
+        rev = "20ad4419564d6e22b189f6738116b38871082332";
+        hash = "sha256-eGpB7YYWbyCCGYXEYAM432srSp/lUo5C1b0J3OYjwnY=";
       };
 
       disabled = lua.luaversion != "5.1";
@@ -903,15 +903,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "grug-far.nvim";
-      version = "1.6.48-1";
+      version = "1.6.52-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/grug-far.nvim-1.6.48-1.rockspec";
-          sha256 = "02x3rzxz610942xy98zbzz3whcslvqwcpiyjzlw94km1h7m5a3kq";
+          url = "mirror://luarocks/grug-far.nvim-1.6.52-1.rockspec";
+          sha256 = "0drax65xyp8lhk1cahqjdlphb16kicajr4gb7ar4l2q1scl01b4k";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/MagicDuck/grug-far.nvim/archive/50d9ee2b5a19634670441948e7e4afaa042f1059.zip";
-        sha256 = "0pbwlp5i4aq1ffqbcnjf62ygb73b1svyh5ly4vyq6x7jnc0g416g";
+        url = "https://github.com/MagicDuck/grug-far.nvim/archive/3e72397465f774b01aa38e4fe8e6eecf23d766d9.zip";
+        sha256 = "16pbhmb2y8rpvdzib8m56jx54v44vkn452sj9jgwp5q7izqb4kds";
       };
 
       disabled = luaOlder "5.1";
@@ -1414,7 +1414,7 @@ final: prev: {
       meta = {
         homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html";
         description = "Parsing Expression Grammars For Lua";
-        maintainers = with lib.maintainers; [ vyp ];
+        maintainers = [ ];
         license.fullName = "MIT/X11";
       };
     }
@@ -1571,7 +1571,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/rrthomas/lrexlib";
         description = "Regular expression library binding (PCRE flavour).";
-        maintainers = with lib.maintainers; [ vyp ];
+        maintainers = [ ];
         license.fullName = "MIT/X11";
       };
     }
@@ -2012,17 +2012,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lua-resty-openssl";
-      version = "1.6.4-1";
+      version = "1.7.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lua-resty-openssl-1.6.4-1.rockspec";
-          sha256 = "1i8hj91kj2wmpqxk9ahjfhdx6bbkv35f7d2f71nklgvg7wychn6x";
+          url = "mirror://luarocks/lua-resty-openssl-1.7.0-1.rockspec";
+          sha256 = "0p4i14ypbw39ap3dvxhfnnb221909z2lqlk16nbqx33brawydl64";
         }).outPath;
       src = fetchFromGitHub {
         owner = "fffonion";
         repo = "lua-resty-openssl";
-        rev = "1.6.4";
-        hash = "sha256-MO8opf8CgiB6/iESRugrg2OMAyERWJ4Sf5ccgWKJyKs=";
+        rev = "1.7.0";
+        hash = "sha256-xcEnic0aQCgzIlgU/Z6dxH7WTyTK+g5UKo4BiKcvNxQ=";
       };
 
       meta = {
@@ -2768,8 +2768,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "nvim-lualine";
         repo = "lualine.nvim";
-        rev = "b8c23159c0161f4b89196f74ee3a6d02cdc3a955";
-        hash = "sha256-lWt2kpW+hsTMWt8tar/+AISTDrIt4Jn27NmI9j+Xt4s=";
+        rev = "3946f0122255bc377d14a59b27b609fb3ab25768";
+        hash = "sha256-hdrAdG3hC2sAevQ6a9xizqPgEgnNKxuc5rBYn0pKM1c=";
       };
 
       disabled = luaOlder "5.1";
@@ -2822,15 +2822,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "luaossl";
-      version = "20220711-0";
+      version = "20250929-0";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/luaossl-20220711-0.rockspec";
-          sha256 = "0b68kvfz587ilmb5c1p7920kysg9q4m4fl4cz4d93jl3270mzh8y";
+          url = "mirror://luarocks/luaossl-20250929-0.rockspec";
+          sha256 = "11m823vd8cwc3s5420lv042ny1d7hrimzx05ldy8f6rlh6m2d9xl";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/wahern/luaossl/archive/rel-20220711.zip";
-        sha256 = "1a9pgmc6fbhgh1m9ksz9fq057yzz46npqgakcsy9vngg47xacfdb";
+        url = "https://github.com/wahern/luaossl/archive/rel-20250929.zip";
+        sha256 = "115a5r0n7qc9lnjxld551ag6l9rq1wawcbrfjqhz2l6krb3pbv3d";
       };
 
       meta = {
@@ -2870,7 +2870,6 @@ final: prev: {
         homepage = "https://github.com/luaposix/luaposix/";
         description = "Lua bindings for POSIX";
         maintainers = with lib.maintainers; [
-          vyp
           lblasc
         ];
         license.fullName = "MIT/X11";
@@ -3197,7 +3196,7 @@ final: prev: {
       meta = {
         homepage = "https://lunarmodules.github.io/luasql/";
         description = "Database connectivity for Lua (SQLite3 driver)";
-        maintainers = with lib.maintainers; [ vyp ];
+        maintainers = [ ];
         license.fullName = "MIT/X11";
       };
     }
@@ -3908,15 +3907,15 @@ final: prev: {
     { buildLuarocksPackage, fetchurl }:
     buildLuarocksPackage {
       pname = "mpack";
-      version = "1.0.12-0";
+      version = "1.0.13-0";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/mpack-1.0.12-0.rockspec";
-          sha256 = "01jr8vvkqdvadr5kpgsd17gjyz729hbd609qsm682ylggabgqsyy";
+          url = "mirror://luarocks/mpack-1.0.13-0.rockspec";
+          sha256 = "1lyjbmyj6yfv0bhyj50rpz2qm993zsbyw494j9kz4bcvxx0gqac5";
         }).outPath;
       src = fetchurl {
-        url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.12/libmpack-lua-1.0.12.tar.gz";
-        sha256 = "1gzqks9cq3krd9rs3dq9jm1m23pjpqjv9ymkxj9gbyjcy6qn5dh6";
+        url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.13/libmpack-lua-1.0.13.tar.gz";
+        sha256 = "1mwk54jnayw5wjclijyha24xq4sj0lyidb04zyndd9i0yr4anlnx";
       };
 
       meta = {
@@ -3981,15 +3980,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "neotest";
-      version = "5.11.1-1";
+      version = "5.13.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/neotest-5.11.1-1.rockspec";
-          sha256 = "18pj612zpzhl3yv6p5l8ix4j0xr44ff9vwals54szc1sx5784v7l";
+          url = "mirror://luarocks/neotest-5.13.1-1.rockspec";
+          sha256 = "1c60i9vdakbafaij2ip3ki0m1jwd2c2adrq2i0gy3l796w03cf9n";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neotest/neotest/archive/2cf3544fb55cdd428a9a1b7154aea9c9823426e8.zip";
-        sha256 = "1zz376wb3vyw984zjszg8hda4rzskaq7q93ajwdy63ssx8sc9vy4";
+        url = "https://github.com/nvim-neotest/neotest/archive/366175e1e74ff112787f9adbfb072eeaedd2a88e.zip";
+        sha256 = "0d3rlbpdqsj1wk9v6xs63w8pbnhk9nrxdp6kmc4mkj0nf71b3j9a";
       };
 
       disabled = luaOlder "5.1";
@@ -4082,8 +4081,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hrsh7th";
         repo = "nvim-cmp";
-        rev = "b5311ab3ed9c846b585c0c15b7559be131ec4be9";
-        hash = "sha256-l5z+PT4S9b09d2M+J/tHVd9W9Ss3eQQk5Ykpz2Qjxxw=";
+        rev = "cf22c9e32512de3be1fd6b65fd25e3aabead4d8b";
+        hash = "sha256-ePRShNaOBYjsUBrGbNRXAzEs+JNG+LMjMm6Hu+QX1kE=";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -4230,15 +4229,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "papis.nvim";
-      version = "0.9.0-1";
+      version = "0.9.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/papis.nvim-0.9.0-1.rockspec";
-          sha256 = "1l5phfq26yc24ww1hyki9w9x3idzncmzxizda6v7rr1bdppbky7g";
+          url = "mirror://luarocks/papis.nvim-0.9.1-1.rockspec";
+          sha256 = "1ykcnzz2rpcn3v5aw4lhwc2vcc9gzrskkzir136i1szgnvrhhzg0";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/jghauser/papis.nvim/archive/v0.9.0.zip";
-        sha256 = "1na7nxacq6ii75qk1i5ylpnnr27272kp7nrn2xlfd8kwjspap3n7";
+        url = "https://github.com/jghauser/papis.nvim/archive/v0.9.1.zip";
+        sha256 = "1hicipx893p8y8sapn0kyqjinn8nhrrkc0a1cwl16z0mmh0jgk81";
       };
 
       disabled = luaOlder "5.1";
@@ -4649,15 +4648,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "6.9.2-1";
+      version = "6.9.6-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-6.9.2-1.rockspec";
-          sha256 = "0smfa296h60xd88fv9xbhb9l6wxf4vmz3299spiac59r02kalkmr";
+          url = "mirror://luarocks/rustaceanvim-6.9.6-1.rockspec";
+          sha256 = "0azl1qrr7jgrczhgv39f2way8d8693kxid1psvv2zrzqyk5h81gm";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.2.zip";
-        sha256 = "1bkg713a0y9mg86ra3wrn7j3h4wfgk54zzhb2sc6y0km66p136a2";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.6.zip";
+        sha256 = "0n27nkjzr8hcy6yqx3zfxjrwc26imivnqlm28yxncpzvqvwivy4v";
       };
 
       disabled = luaOlder "5.1";
@@ -4903,7 +4902,7 @@ final: prev: {
       meta = {
         homepage = "http://lua-stdlib.github.io/lua-stdlib";
         description = "General Lua Libraries";
-        maintainers = with lib.maintainers; [ vyp ];
+        maintainers = [ ];
         license.fullName = "MIT/X11";
       };
     }
@@ -5067,17 +5066,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "tl";
-      version = "0.24.7-1";
+      version = "0.24.8-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/tl-0.24.7-1.rockspec";
-          sha256 = "0c2xfrw2wasiy3g8b6fpqvlnzb0bp5l9s3pvi9ky1w4b6nbc81s7";
+          url = "mirror://luarocks/tl-0.24.8-1.rockspec";
+          sha256 = "1m60ydmp6mn6iczg2an20ivvgn5rrz6sn0mhpnld9img3khvj7sf";
         }).outPath;
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "tl";
-        rev = "v0.24.7";
-        hash = "sha256-5saLQczm/3jRXmhHUyasGKMH95ft96+CMHkVeI7ip3A=";
+        rev = "v0.24.8";
+        hash = "sha256-bjk/e+FuW0pSaVkRXIiYWhaNGU08Mgyvb7U7lc+8k2w=";
       };
 
       propagatedBuildInputs = [
@@ -5282,7 +5281,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/notomo/vusted";
         description = "`busted` wrapper for testing neovim plugin";
-        maintainers = with lib.maintainers; [ figsoda ];
+        maintainers = [ ];
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
       };
     }
diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index b6ca061fce94..2f9d5ba9e04d 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -12,81 +12,85 @@
   perl,
   pkg-config,
   rustPlatform,
+  toLuaModule,
 }:
 let
   luaMajorMinor = lib.take 2 (lib.splitVersion lua.version);
-  luaVersionDir = if isLuaJIT then "jit" else lib.concatStringsSep "." luaMajorMinor;
+  luxLuaVersionDir = if isLuaJIT then "jit" else lib.concatStringsSep "." luaMajorMinor;
+  luaVersionDir = if isLuaJIT then "5.1" else lib.concatStringsSep "." luaMajorMinor;
   luaFeature = if isLuaJIT then "luajit" else "lua${lib.concatStringsSep "" luaMajorMinor}";
 in
-rustPlatform.buildRustPackage rec {
-  pname = "lux-lua";
+toLuaModule (
+  rustPlatform.buildRustPackage rec {
+    pname = "lux-lua";
 
-  version = lux-cli.version;
+    version = lux-cli.version;
 
-  src = lux-cli.src;
+    src = lux-cli.src;
 
-  buildAndTestSubdir = "lux-lua";
-  buildNoDefaultFeatures = true;
-  buildFeatures = [ luaFeature ];
+    buildAndTestSubdir = "lux-lua";
+    buildNoDefaultFeatures = true;
+    buildFeatures = [ luaFeature ];
 
-  cargoHash = lux-cli.cargoHash;
+    cargoHash = lux-cli.cargoHash;
 
-  nativeBuildInputs = [
-    perl
-    pkg-config
-  ];
-
-  buildInputs = [
-    gnupg
-    gpgme
-    libgit2
-    libgpg-error
-    openssl
-  ];
-
-  propagatedBuildInputs = [
-    lua
-  ];
-
-  doCheck = false; # lux-lua tests are broken in nixpkgs
-  useNextest = true;
-  nativeCheckInputs = [
-    lua
-    nix
-  ];
-
-  env = {
-    LIBGIT2_NO_VENDOR = 1;
-    LIBSSH2_SYS_USE_PKG_CONFIG = 1;
-    LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests
-  };
-
-  buildPhase = ''
-    runHook preBuild
-    cargo xtask-${luaFeature} dist
-    mkdir -p $out
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-    cp -r target/dist/share $out
-    cp -r target/dist/lib $out
-    mkdir -p $out/lib/lua
-    ln -s $out/share/lux-lua/${luaVersionDir} $out/lib/lua/${luaVersionDir}
-    runHook postInstall
-  '';
-
-  cargoTestFlags = "--lib"; # Disable impure integration tests
-
-  meta = {
-    description = "Lua API for the Lux package manager";
-    homepage = "https://lux.lumen-labs.org/";
-    changelog = "https://github.com/lumen-oss/lux/blob/${src.tag}/CHANGELOG.md";
-    license = lib.licenses.lgpl3Plus;
-    maintainers = with lib.maintainers; [
-      mrcjkb
+    nativeBuildInputs = [
+      perl
+      pkg-config
     ];
-    platforms = lib.platforms.all;
-  };
-}
+
+    buildInputs = [
+      gnupg
+      gpgme
+      libgit2
+      libgpg-error
+      openssl
+    ];
+
+    propagatedBuildInputs = [
+      lua
+    ];
+
+    doCheck = false; # lux-lua tests are broken in nixpkgs
+    useNextest = true;
+    nativeCheckInputs = [
+      lua
+      nix
+    ];
+
+    env = {
+      LIBGIT2_NO_VENDOR = 1;
+      LIBSSH2_SYS_USE_PKG_CONFIG = 1;
+      LUX_SKIP_IMPURE_TESTS = 1; # Disable impure unit tests
+    };
+
+    buildPhase = ''
+      runHook preBuild
+      cargo xtask-${luaFeature} dist
+      mkdir -p $out
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      cp -r target/dist/share $out
+      cp -r target/dist/lib $out
+      mkdir -p $out/lib/lua
+      ln -s $out/share/lux-lua/${luxLuaVersionDir} $out/lib/lua/${luaVersionDir}
+      runHook postInstall
+    '';
+
+    cargoTestFlags = "--lib"; # Disable impure integration tests
+
+    meta = {
+      description = "Lua API for the Lux package manager";
+      homepage = "https://lux.lumen-labs.org/";
+      changelog = "https://github.com/lumen-oss/lux/blob/${src.tag}/CHANGELOG.md";
+      license = lib.licenses.lgpl3Plus;
+      maintainers = with lib.maintainers; [
+        mrcjkb
+      ];
+      platforms = lib.platforms.all;
+    };
+  }
+)
diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix
index 83228cb58460..ea7dc1db013f 100644
--- a/pkgs/development/misc/h3/default.nix
+++ b/pkgs/development/misc/h3/default.nix
@@ -36,7 +36,8 @@ let
         (lib.cmakeBool "ENABLE_FORMAT" false)
         (lib.cmakeBool "ENABLE_LINTING" false)
         (lib.cmakeBool "BUILD_FILTERS" withFilters)
-      ];
+      ]
+      ++ (lib.optionals (lib.versionOlder version "4.0.0") [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]);
 
       meta = {
         homepage = "https://h3geo.org/";
diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 6222b629f8df..33332ea8386d 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -14,6 +14,8 @@ let
   # Coerces a string to an int.
   coerceInt = val: if lib.isInt val then val else lib.toIntBase10 val;
 
+  coerceIntVersion = v: coerceInt (lib.versions.major v);
+
   # Parses a single version, substituting "latest" with the latest version.
   parseVersion =
     repo: key: version:
@@ -97,8 +99,8 @@ in
   platformVersions ?
     if minPlatformVersion != null && maxPlatformVersion != null then
       let
-        minPlatformVersionInt = coerceInt (parseVersion repo "platforms" minPlatformVersion);
-        maxPlatformVersionInt = coerceInt (parseVersion repo "platforms" maxPlatformVersion);
+        minPlatformVersionInt = coerceIntVersion (parseVersion repo "platforms" minPlatformVersion);
+        maxPlatformVersionInt = coerceIntVersion (parseVersion repo "platforms" maxPlatformVersion);
       in
       lib.range (lib.min minPlatformVersionInt maxPlatformVersionInt) (
         lib.max minPlatformVersionInt maxPlatformVersionInt
@@ -109,10 +111,8 @@ in
           if minPlatformVersion == null then
             1
           else
-            coerceInt (parseVersion repo "platforms" minPlatformVersion);
-        latestPlatformVersionInt = lib.max minPlatformVersionInt (
-          coerceInt (lib.versions.major repo.latest.platforms)
-        );
+            coerceIntVersion (parseVersion repo "platforms" minPlatformVersion);
+        latestPlatformVersionInt = lib.max minPlatformVersionInt (coerceIntVersion repo.latest.platforms);
         firstPlatformVersionInt = lib.max minPlatformVersionInt (
           latestPlatformVersionInt - (lib.max 1 numLatestPlatformVersions) + 1
         );
@@ -190,18 +190,21 @@ let
             map (
               archive:
               (fetchurl {
+                pname = packageInfo.name;
+                version = packageInfo.revision;
                 inherit (archive) url sha1;
                 inherit meta;
                 passthru = {
                   info = packageInfo;
                 };
               }).overrideAttrs
-                (prev: {
-                  # fetchurl won't generate the correct filename if we specify pname and version,
-                  # and we still want the version attribute to show up in search, so specify these in an override
-                  pname = packageInfo.name;
-                  version = packageInfo.revision;
-                })
+                (
+                  finalAttrs: previousAttrs: {
+                    # fetchurl prioritize `pname` and `version` over the specified `name`,
+                    # so specify custom `name` in an override.
+                    name = baseNameOf (lib.head (finalAttrs.urls));
+                  }
+                )
             ) validArchives
           )
         )
diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index c3615b87584c..fa77a59ac54a 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -91,7 +91,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -156,7 +156,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -233,7 +233,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -280,7 +280,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -357,7 +357,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -404,7 +404,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -483,7 +483,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -576,7 +576,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -669,7 +669,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -762,7 +762,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -855,7 +855,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -948,7 +948,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1041,7 +1041,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1134,7 +1134,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-23",
@@ -1227,7 +1227,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1320,7 +1320,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1413,7 +1413,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1478,7 +1478,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1543,7 +1543,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1608,7 +1608,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1673,7 +1673,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1738,7 +1738,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1803,7 +1803,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1869,7 +1869,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1900,7 +1900,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1931,7 +1931,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1960,7 +1960,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -2010,7 +2010,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2036,7 +2036,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2072,7 +2072,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2101,7 +2101,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2130,7 +2130,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2168,7 +2168,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2197,7 +2197,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2226,7 +2226,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2256,7 +2256,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2285,7 +2285,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2314,7 +2314,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2984,7 +2984,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3030,7 +3030,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3078,7 +3078,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3130,7 +3130,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3179,7 +3179,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3229,7 +3229,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3275,7 +3275,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3323,7 +3323,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3375,7 +3375,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3431,7 +3431,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3470,7 +3470,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3516,7 +3516,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3564,7 +3564,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3616,7 +3616,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3672,7 +3672,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3711,7 +3711,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3757,7 +3757,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3811,7 +3811,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3863,7 +3863,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3919,7 +3919,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3965,7 +3965,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -4013,7 +4013,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4065,7 +4065,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4121,7 +4121,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4167,7 +4167,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4215,7 +4215,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4267,7 +4267,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4316,7 +4316,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4353,7 +4353,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4392,7 +4392,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4438,7 +4438,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4484,7 +4484,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4530,7 +4530,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4571,7 +4571,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4623,7 +4623,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4675,7 +4675,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4727,7 +4727,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4776,7 +4776,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4815,7 +4815,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4861,7 +4861,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4907,7 +4907,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4953,7 +4953,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4994,7 +4994,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -5046,7 +5046,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5098,7 +5098,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5150,7 +5150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5199,7 +5199,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5243,7 +5243,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5282,7 +5282,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5328,7 +5328,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5374,7 +5374,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5420,7 +5420,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5461,7 +5461,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5513,7 +5513,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5565,7 +5565,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5617,7 +5617,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5673,7 +5673,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5712,7 +5712,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5758,7 +5758,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5804,7 +5804,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5850,7 +5850,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5898,7 +5898,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5950,7 +5950,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -6002,7 +6002,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -6056,7 +6056,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6112,7 +6112,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6158,7 +6158,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6202,7 +6202,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6241,7 +6241,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6287,7 +6287,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6333,7 +6333,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6374,7 +6374,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6426,7 +6426,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6478,7 +6478,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6530,7 +6530,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6584,7 +6584,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6655,7 +6655,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6701,7 +6701,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6752,7 +6752,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6796,7 +6796,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6840,7 +6840,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6891,7 +6891,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -7025,7 +7025,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7094,7 +7094,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7201,7 +7201,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7245,7 +7245,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7289,7 +7289,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7340,7 +7340,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7407,7 +7407,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7476,7 +7476,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7537,7 +7537,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7582,7 +7582,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7628,7 +7628,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7679,7 +7679,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7716,7 +7716,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7753,7 +7753,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7871,7 +7871,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7938,7 +7938,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7997,7 +7997,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -8064,7 +8064,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8131,7 +8131,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8192,7 +8192,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8252,7 +8252,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8291,7 +8291,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8354,7 +8354,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8417,7 +8417,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8468,7 +8468,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8525,7 +8525,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -8582,7 +8582,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -8641,7 +8641,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8722,7 +8722,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8803,7 +8803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8864,7 +8864,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8970,7 +8970,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -9014,7 +9014,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -9053,7 +9053,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9102,7 +9102,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9153,7 +9153,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9220,7 +9220,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9287,7 +9287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9353,7 +9353,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9434,7 +9434,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9515,7 +9515,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9586,7 +9586,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9645,7 +9645,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9696,7 +9696,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9745,7 +9745,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9806,7 +9806,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9873,7 +9873,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9949,7 +9949,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -10016,7 +10016,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -10077,7 +10077,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10130,7 +10130,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10185,7 +10185,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10234,7 +10234,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10295,7 +10295,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10362,7 +10362,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10438,7 +10438,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10519,7 +10519,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10580,7 +10580,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -10633,7 +10633,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -10698,7 +10698,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10757,7 +10757,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10803,7 +10803,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10847,7 +10847,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10898,7 +10898,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10947,7 +10947,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -11008,7 +11008,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -11075,7 +11075,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11144,7 +11144,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11211,7 +11211,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11286,7 +11286,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11335,7 +11335,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11398,7 +11398,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11458,7 +11458,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11498,7 +11498,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11535,7 +11535,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11586,7 +11586,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11635,7 +11635,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11696,7 +11696,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11764,7 +11764,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11834,7 +11834,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11903,7 +11903,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11966,7 +11966,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -12019,7 +12019,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -12088,7 +12088,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12137,7 +12137,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12178,7 +12178,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12210,7 +12210,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12256,7 +12256,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12301,7 +12301,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12348,7 +12348,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12406,7 +12406,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12466,7 +12466,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12524,7 +12524,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12584,7 +12584,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12646,7 +12646,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12700,7 +12700,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12733,7 +12733,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12780,7 +12780,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12829,7 +12829,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12880,7 +12880,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12929,7 +12929,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12982,7 +12982,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
@@ -13027,7 +13027,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
@@ -13062,7 +13062,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -13095,7 +13095,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -13142,7 +13142,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -13191,7 +13191,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -13242,7 +13242,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
@@ -13291,7 +13291,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -13342,7 +13342,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -13395,7 +13395,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -13434,9 +13434,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "818b27a07b6e851ddd305139f967fa11111502a3",
-              "size": 1933295305,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36.1_r02.zip"
+              "sha1": "4b3c296dfa125a03944317da5c3b9c852e384a95",
+              "size": 1931618675,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13452,13 +13452,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis/arm64-v8a",
           "revision": "36.1-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -13483,9 +13483,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "269ca25dc3511e2a6bdcaf457734b585807af485",
-              "size": 1965091162,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36.1_r02.zip"
+              "sha1": "e7c2ee3e0efcdc79e13b8c40d93629c83741c143",
+              "size": 1958060347,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13501,13 +13501,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis/x86_64",
           "revision": "36.1-google_apis-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -13534,9 +13534,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "e829404c284fa09105b89e66e3aceeb1fac9a60c",
-              "size": 1960800700,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36.1_r02.zip"
+              "sha1": "240c7164dd250be3c096dd62801e96f7b144bc2f",
+              "size": 1955944487,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13552,13 +13552,13 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore/arm64-v8a",
           "revision": "36.1-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -13583,9 +13583,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "6c0cacff6e3e3021dedd8f80cd302d09dba354e3",
-              "size": 2008752086,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36.1_r02.zip"
+              "sha1": "4931dd84c74db66b29c934b313d407faf3298921",
+              "size": 1998865059,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13601,13 +13601,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore/x86_64",
           "revision": "36.1-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -13652,7 +13652,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13705,7 +13705,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36.1-page_size_16kb-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -13762,7 +13762,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -13811,7 +13811,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -13862,7 +13862,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -13911,7 +13911,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -13964,7 +13964,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a",
@@ -14014,7 +14014,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis/x86_64",
@@ -14066,7 +14066,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a",
@@ -14116,7 +14116,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64",
@@ -14168,7 +14168,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -14222,7 +14222,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -14280,7 +14280,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis/arm64-v8a",
@@ -14330,7 +14330,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis/x86_64",
@@ -14382,7 +14382,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore/arm64-v8a",
@@ -14432,7 +14432,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore/x86_64",
@@ -14484,7 +14484,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -14538,7 +14538,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-page_size_16kb-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -15146,16 +15146,17 @@
   },
   "latest": {
     "build-tools": "36.1.0",
-    "cmake": "4.1.1",
+    "cmake": "4.1.2",
     "cmdline-tools": "19.0",
-    "emulator": "36.2.10",
+    "emulator": "36.2.12",
     "ndk": "29.0.14206865",
     "ndk-bundle": "22.1.7171670",
     "platform-tools": "36.0.0",
     "platforms": "36.1",
     "skiaparser": "8",
     "sources": "36.1",
-    "tools": "26.1.1"
+    "tools": "26.1.1",
+    "fingerprint": "8eb220e182767bf0"
   },
   "licenses": {
     "android-googletv-license": [
@@ -15220,7 +15221,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15269,7 +15270,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15318,7 +15319,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15367,7 +15368,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15416,7 +15417,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15465,7 +15466,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15514,7 +15515,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15563,7 +15564,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15612,7 +15613,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -15660,7 +15661,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -15708,7 +15709,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15757,7 +15758,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15806,7 +15807,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15855,7 +15856,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15904,7 +15905,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15953,7 +15954,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16001,7 +16002,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16050,7 +16051,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16098,7 +16099,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16147,7 +16148,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -16195,7 +16196,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -16243,7 +16244,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -16291,7 +16292,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -16339,7 +16340,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -16387,7 +16388,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -16435,7 +16436,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -16483,7 +16484,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -16531,7 +16532,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -16579,7 +16580,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -16627,7 +16628,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -16675,7 +16676,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -16723,7 +16724,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -16771,7 +16772,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -16819,7 +16820,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -16867,7 +16868,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -16915,7 +16916,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -16963,7 +16964,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17011,7 +17012,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17059,7 +17060,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17107,7 +17108,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17157,7 +17158,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17207,7 +17208,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -17255,7 +17256,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -17303,7 +17304,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -17351,7 +17352,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -17399,7 +17400,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17449,7 +17450,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17499,7 +17500,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17549,7 +17550,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -17597,7 +17598,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -17645,7 +17646,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -17693,7 +17694,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -17741,7 +17742,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -17789,7 +17790,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -17837,7 +17838,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -17878,7 +17879,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -17919,7 +17920,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -17960,7 +17961,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18002,7 +18003,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18043,7 +18044,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18084,7 +18085,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18125,7 +18126,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18166,7 +18167,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -18207,7 +18208,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -18249,7 +18250,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -18291,7 +18292,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -18333,7 +18334,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -18374,7 +18375,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -18416,7 +18417,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -18458,7 +18459,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -18500,7 +18501,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -18542,7 +18543,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -18583,7 +18584,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -18624,7 +18625,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -18666,7 +18667,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -18708,7 +18709,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -18750,7 +18751,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -18792,7 +18793,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -18833,7 +18834,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -18884,7 +18885,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -18925,7 +18926,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -18966,7 +18967,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19007,7 +19008,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -19048,7 +19049,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -19089,7 +19090,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -19130,7 +19131,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -19171,7 +19172,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -19212,7 +19213,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -19253,7 +19254,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -19294,7 +19295,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -19342,7 +19343,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -19383,7 +19384,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -19424,7 +19425,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -19465,7 +19466,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -19506,7 +19507,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -19521,6 +19522,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "4.1.2": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "c8c4f1c19b75c56f28b9dcf1af928d25cf1a1471",
+            "size": 31275750,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.2-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "a0578a0543942c7eb35822c88a516b87e5b9867a",
+            "size": 43690978,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.2-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "06bc3fe29aa49297dcc11a2ffe3a999445df05ae",
+            "size": 21045753,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.2-windows.zip"
+          }
+        ],
+        "displayName": "CMake 4.1.2",
+        "last-available-day": 20377,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/4.1.2",
+        "revision": "4.1.2",
+        "revision-details": {
+          "major:0": "4",
+          "micro:2": "2",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmdline-tools": {
@@ -19549,7 +19591,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -19589,7 +19631,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -19629,7 +19671,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -19707,7 +19749,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -19785,7 +19827,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -19825,7 +19867,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -19866,7 +19908,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -19907,7 +19949,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -19947,7 +19989,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -19988,7 +20030,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20028,7 +20070,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20068,7 +20110,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -20109,7 +20151,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -20150,7 +20192,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -20190,7 +20232,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -20230,7 +20272,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -20270,7 +20312,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -20310,7 +20352,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -20350,7 +20392,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -20390,7 +20432,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -20430,7 +20472,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -21521,7 +21563,7 @@
           }
         ],
         "displayName": "Android Emulator",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
@@ -21537,6 +21579,54 @@
           }
         }
       },
+      "36.2.12": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "b87561b33f5f1df3647519628c3597353dbf534d",
+            "size": 320123396,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-14214601.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "5c1b8bcd88285a343b4436d1082e8a544408e592",
+            "size": 395794431,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-14214601.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "e53928cb3b24acb942ff8003cd9a9a91eddece04",
+            "size": 313352024,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-14214601.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "1140a142d87fa2f6be84f5ebe7ef781a9eba429c",
+            "size": 443355796,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-14214601.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20377,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.2.12",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "12",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "36.2.4": {
         "archives": [
           {
@@ -21632,6 +21722,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.3.4": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "bc4a8c9f80ad58842fe2286bf03e78e4e1292e19",
+            "size": 325925467,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-14257411.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "b40ab44776ebb18d064554bdc623a1549fc802a3",
+            "size": 468816526,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-14257411.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "205aa614c02fc8f59be6bc1dcf7f3ec4f209f27e",
+            "size": 380621007,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-14257411.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "edd34ac4150107b5f9a5840c1810747745d6611e",
+            "size": 449704089,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-14257411.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20377,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.3.4",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "4",
+          "minor:1": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -21757,7 +21895,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -21819,7 +21957,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -21881,7 +22019,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -21943,7 +22081,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22006,7 +22144,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -22068,7 +22206,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22132,7 +22270,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22196,7 +22334,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -22258,7 +22396,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -22306,7 +22444,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -22355,7 +22493,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -22403,7 +22541,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -22459,7 +22597,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -22515,7 +22653,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -22570,7 +22708,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -22626,7 +22764,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -22681,7 +22819,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -22736,7 +22874,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -22791,7 +22929,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -22847,7 +22985,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -22902,7 +23040,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -22957,7 +23095,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -23013,7 +23151,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -23069,7 +23207,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -23125,7 +23263,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -23174,7 +23312,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -23223,7 +23361,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -23272,7 +23410,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -23320,7 +23458,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -23368,7 +23506,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -23416,7 +23554,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -23465,7 +23603,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -23514,7 +23652,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -23563,7 +23701,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -23611,7 +23749,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -23660,7 +23798,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -23709,7 +23847,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -23758,7 +23896,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -23807,7 +23945,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -23855,7 +23993,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -23903,7 +24041,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -23951,7 +24089,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -23993,7 +24131,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -24035,7 +24173,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -24076,7 +24214,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -24117,7 +24255,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -24158,7 +24296,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -24199,7 +24337,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -24241,7 +24379,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -24283,7 +24421,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -24324,7 +24462,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -24365,7 +24503,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -24406,7 +24544,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -24447,7 +24585,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -24489,7 +24627,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -24531,7 +24669,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -24573,7 +24711,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -24614,7 +24752,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -24655,7 +24793,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -24696,7 +24834,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -24738,7 +24876,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -24780,7 +24918,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -24822,7 +24960,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -24864,7 +25002,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -24928,7 +25066,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24990,7 +25128,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25052,7 +25190,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25114,7 +25252,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25177,7 +25315,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25239,7 +25377,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25303,7 +25441,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25367,7 +25505,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25429,7 +25567,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25477,7 +25615,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25526,7 +25664,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25574,7 +25712,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25630,7 +25768,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25686,7 +25824,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25741,7 +25879,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25797,7 +25935,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25852,7 +25990,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25907,7 +26045,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25962,7 +26100,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26018,7 +26156,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26073,7 +26211,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26128,7 +26266,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26184,7 +26322,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26240,7 +26378,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26296,7 +26434,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26459,7 +26597,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -26515,6 +26653,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.0.2": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "3c5c54a14f51a2da59d7c4874372619a42deb94d",
+            "size": 8785200,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.2-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "5998b371cd55fbd3807632ac36f1b3a62558d46d",
+            "size": 15711207,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.2-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "970632ccb7a364767d64d9eec3d143f5d2adcc3c",
+            "size": 7708640,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.2-win.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform-Tools",
+        "last-available-day": 20377,
+        "license": "android-sdk-preview-license",
+        "name": "platform-tools",
+        "path": "platform-tools",
+        "revision": "36.0.2",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "2",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "platforms": {
@@ -26529,7 +26708,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -26568,7 +26747,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -26607,7 +26786,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -26646,7 +26825,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -26685,7 +26864,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -26724,7 +26903,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -26763,7 +26942,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -26802,7 +26981,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -26841,7 +27020,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -26880,7 +27059,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -26933,7 +27112,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26973,7 +27152,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -27012,7 +27191,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -27051,7 +27230,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -27090,7 +27269,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -27129,7 +27308,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -27168,7 +27347,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -27207,7 +27386,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -27246,7 +27425,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -27285,7 +27464,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -27324,7 +27503,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -27377,7 +27556,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27417,7 +27596,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -27456,7 +27635,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -27495,7 +27674,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -27534,7 +27713,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -27574,7 +27753,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -27609,7 +27788,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27655,7 +27834,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -27688,7 +27867,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -27726,7 +27905,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -27759,7 +27938,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -27792,7 +27971,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -27825,7 +28004,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -27872,7 +28051,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27926,7 +28105,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27980,7 +28159,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28020,7 +28199,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -28059,7 +28238,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -28098,7 +28277,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -28137,7 +28316,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava-ext19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava-ext19",
@@ -28171,7 +28350,7 @@
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
@@ -28236,7 +28415,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28354,7 +28533,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -28475,7 +28654,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -28567,7 +28746,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -28594,7 +28773,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -28624,7 +28803,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -28653,7 +28832,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -28682,7 +28861,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -28711,7 +28890,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -28740,7 +28919,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -28769,7 +28948,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -28798,7 +28977,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -28827,7 +29006,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -28856,7 +29035,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -28885,7 +29064,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -28914,7 +29093,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -28943,7 +29122,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -28972,7 +29151,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -29001,7 +29180,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -29030,7 +29209,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -29059,7 +29238,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -29088,7 +29267,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -29117,7 +29296,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -29146,7 +29325,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -29176,7 +29355,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -29206,7 +29385,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -29236,7 +29415,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -29264,7 +29443,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -29331,7 +29510,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",
diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix
index cc03d2fe3261..fe4f3b11451a 100644
--- a/pkgs/development/mobile/androidenv/test-suite.nix
+++ b/pkgs/development/mobile/androidenv/test-suite.nix
@@ -18,8 +18,8 @@ let
 in
 stdenv.mkDerivation {
   name = "androidenv-test-suite";
-  version = lib.substring 0 8 (builtins.hashFile "sha256" ./repo.json);
-  buildInputs = lib.mapAttrsToList (name: value: value) all-tests;
+  version = (lib.importJSON ./repo.json).latest.fingerprint or "0000000000000000";
+  buildInputs = lib.attrValues all-tests;
 
   buildCommand = ''
     touch $out
diff --git a/pkgs/development/mobile/androidenv/update.rb b/pkgs/development/mobile/androidenv/update.rb
index 0b5f3be92fbc..e2d33b2e47ae 100755
--- a/pkgs/development/mobile/androidenv/update.rb
+++ b/pkgs/development/mobile/androidenv/update.rb
@@ -2,6 +2,7 @@
 #!nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ slop curb nokogiri ])"
 
 require 'json'
+require 'digest'
 require 'rubygems'
 require 'shellwords'
 require 'erb'
@@ -560,11 +561,15 @@ fixup_result = fixup(result)
 # Regular installation of Android SDK would keep the previously installed packages even if they are not
 # in the uptodate XML files, so here we try to support this logic by keeping un-available packages,
 # therefore the old packages will work as long as the links are working on the Google servers.
-output = merge input, fixup_result
+output = sort_recursively(merge(input, fixup_result))
+
+# Fingerprint the latest versions.
+fingerprint = Digest::SHA256.hexdigest(output['latest'].tap {_1.delete 'fingerprint'}.to_json)[0...16]
+output['latest']['fingerprint'] = fingerprint
 
 # Write the repository. Append a \n to keep nixpkgs Github Actions happy.
 STDERR.puts "Writing #{opts[:output]}"
-File.write opts[:output], (JSON.pretty_generate(sort_recursively(output)) + "\n")
+File.write opts[:output], (JSON.pretty_generate(output) + "\n")
 
 # Output metadata for the nixpkgs update script.
 if ENV['UPDATE_NIX_ATTR_PATH']
@@ -578,7 +583,7 @@ if ENV['UPDATE_NIX_ATTR_PATH']
 
   cur_latest.each do |k, v|
     prev = prev_latest[k]
-    if prev && prev != v
+    if k != 'fingerprint' && prev && prev != v
       old_versions << "#{k}:#{prev}"
       new_versions << "#{k}:#{v}"
       changes << "#{k}: #{prev} -> #{v}"
diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index be7818a9cab5..a982ae8b7b33 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
 
   setupHook = ./cmake-setup-hook.sh;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace webOS/webOS.cmake \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "CMake modules needed to build Open WebOS components";
     license = licenses.asl20;
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index 9cd3fb152e31..6ce1bfdefb88 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
     webos.cmake-modules
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     install -Dm755 -t $out/bin ../scripts/novaterm
     substituteInPlace $out/bin/novaterm --replace "exec novacom" "exec $out/bin/novacom"
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index 617ec9c83651..65a54306d41d 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) novacomd; };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Daemon for communicating with WebOS devices";
     mainProgram = "novacomd";
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 208e274d4468..4846153350fb 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -35,11 +35,16 @@ in
 mapAliases {
   "@antora/cli" = pkgs.antora; # Added 2023-05-06
   "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12
+  "@babel/cli" =
+    throw "@babel/cli was removed because upstream highly suggests installing it in your project instead of globally."; # Added 2025-11-06
   "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
   "@commitlint/config-conventional" =
     throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16
   "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17
+  "@electron-forge/cli" =
+    throw "@electron-forge/cli was removed because upstream suggests that you install it locally in your project instead."; # Added 2025-11-06
   "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20
+  "@gitbeaker/cli" = pkgs.gitbeaker-cli; # Added 2025-10-29
   "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
   "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17
   "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21
@@ -49,11 +54,17 @@ mapAliases {
   "@prisma/language-server" = throw "@prisma/language-server has been removed because it was broken"; # added 2025-03-23
   "@shopify/cli" = throw "@shopify/cli has been removed because it was broken"; # added 2025-03-12
   "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
+  "@uppy/companion" = pkgs.uppy-companion; # Added 2025-11-01
   "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
+  "@webassemblyjs/cli-1.11.1" = pkgs.webassemblyjs-cli; # Added 2025-11-06
+  "@webassemblyjs/repl-1.11.1" = pkgs.webassemblyjs-repl; # Added 2025-11-06
+  "@webassemblyjs/wasm-strip" =
+    "@webassemblyjs/wasm-strip has been removed because it was deprecated by upstream. Consider using wabt instead"; # Added 2025-11-06
+  "@webassemblyjs/wasm-text-gen-1.11.1" = pkgs.wasm-text-gen; # Added 2025-11-06
+  "@webassemblyjs/wast-refmt-1.11.1" = pkgs.wast-refmt; # Added 2025-11-06
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
   "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
-  antennas = pkgs.antennas; # added 2023-07-30
   inherit (pkgs) autoprefixer; # added 2024-06-25
   inherit (pkgs) asar; # added 2023-08-26
   inherit (pkgs) auto-changelog; # added 2024-06-25
@@ -70,33 +81,62 @@ mapAliases {
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) cdktf-cli; # added 2025-10-02
   inherit (pkgs) clean-css-cli; # added 2023-08-18
-  inherit (pkgs) clubhouse-cli; # added 2023-08-18
   inherit (pkgs) coc-clangd; # added 2024-06-29
+  inherit (pkgs) coc-cmake; # Added 2025-11-05
   inherit (pkgs) coc-css; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   inherit (pkgs) coc-docker; # added 2025-10-01
+  inherit (pkgs) coc-emmet; # Added 2025-11-05
+  inherit (pkgs) coc-eslint; # Added 2025-11-05;
   inherit (pkgs) coc-explorer; # added 2025-10-01
+  inherit (pkgs) coc-flutter; # Added 2025-11-05
   inherit (pkgs) coc-git; # added 2025-10-01
+  inherit (pkgs) coc-haxe; # Added 2025-11-05
+  inherit (pkgs) coc-highlight; # Added 2025-11-05
+  inherit (pkgs) coc-html; # Added 2025-11-05
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
-  inherit (pkgs) coc-pyright; # added 2024-07-14
+  inherit (pkgs) coc-java; # Added 2025-11-05
+  inherit (pkgs) coc-jest; # Added 2025-11-05
+  inherit (pkgs) coc-json; # Added 2025-11-05
+  inherit (pkgs) coc-lists; # Added 2025-11-05
+  inherit (pkgs) coc-markdownlint; # Added 2025-11-05
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
+  inherit (pkgs) coc-pairs; # added 2025-11-05
+  inherit (pkgs) coc-prettier; # added 2025-11-05
+  inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
+  inherit (pkgs) coc-r-lsp; # added 2025-11-05
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
+  inherit (pkgs) coc-rust-analyzer; # added 2025-11-05
   inherit (pkgs) coc-sh; # added 2025-10-02
+  inherit (pkgs) coc-smartf; # Added 2025-11-05
+  inherit (pkgs) coc-snippets; # Added 2025-11-05
+  inherit (pkgs) coc-solargraph; # Added 2025-11-05
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
+  inherit (pkgs) coc-sqlfluff; # Added 2025-11-05
+  inherit (pkgs) coc-stylelint; # Added 2025-11-05
+  inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05
+  inherit (pkgs) coc-tabnine; # Added 2025-11-05
+  inherit (pkgs) coc-texlab; # Added 2025-11-05
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01
+  inherit (pkgs) coc-vimlsp; # Added 2025-11-05
+  inherit (pkgs) coc-vimtex; # Added 2025-11-05
+  inherit (pkgs) coc-wxml; # Added 2025-11-05
+  inherit (pkgs) coc-yaml; # Added 2025-11-05
+  inherit (pkgs) coc-yank; # Added 2025-11-05
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16
   inherit (pkgs) cordova; # added 2023-08-18
-  inherit (pkgs) create-react-app; # added 2023-09-25
+  create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
   create-react-native-app = throw "create-react-native-app was removed because it was deprecated. Upstream suggests using a framework for React Native."; # added 2024-12-08
   inherit (pkgs) cspell;
+  csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) degit; # added 2023-08-18
   inherit (pkgs) diagnostic-languageserver; # added 2024-06-25
@@ -105,6 +145,8 @@ mapAliases {
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
   inherit (pkgs.elmPackages) elm-review;
+  elm-oracle = throw "'elm-oracle' has been removed, since it doesn't work with modern versions of Elm."; # Added 2025-11-07
+  emojione = throw "emojione was archived and abandoned upstream, so it has been removed"; # Added 2025-11-06
   escape-string-regexp = throw "escape-string-regexp was removed because it provides no executable"; # added 2025-03-12
   inherit (pkgs) eslint; # Added 2024-08-28
   inherit (pkgs) eslint_d; # Added 2023-05-26
@@ -112,8 +154,11 @@ mapAliases {
   expo-cli = throw "expo-cli was removed because it was deprecated upstream. Use `npx expo` or eas-cli instead."; # added 2024-12-02
   inherit (pkgs) firebase-tools; # added 2023-08-18
   inherit (pkgs) fixjson; # added 2024-06-26
+  fleek-cli = throw "'fleek-cli' was removed because the upstream source code repo has been deleted."; # Added 2025-11-07
   flood = pkgs.flood; # Added 2023-07-25
+  inherit (pkgs) fx; # Added 2025-11-06
   ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02
+  inherit (pkgs) gatsby-cli; # Added 2025-11-05
   generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24
   inherit (pkgs) git-run; # added 2024-06-26
   git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
@@ -128,6 +173,7 @@ mapAliases {
   inherit (pkgs) graphql-language-service-cli; # added 2025-03-17
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
+  gulp = self.gulp-cli; # Added 2025-11-04
   hs-client = pkgs.hsd; # added 2023-08-20
   inherit (pkgs) hsd; # added 2023-08-19
   inherit (pkgs) html-minifier; # added 2023-08-19
@@ -144,22 +190,32 @@ mapAliases {
   ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
   inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
+  inherit (pkgs) js-beautify; # Added 2025-11-06
+  inherit (pkgs) jshint; # Added 2025-11-06
+  inherit (pkgs) jsonplaceholder; # Added 2025-11-04
+  inherit (pkgs) json-server; # Added 2025-11-06
+  joplin = pkgs.joplin-cli; # Added 2025-11-02
   inherit (pkgs) kaput-cli; # added 2024-12-03
   karma = pkgs.karma-runner; # added 2023-07-29
+  keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20
   leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31
   inherit (pkgs) lerna; # added 2025-02-12
   less = pkgs.lessc; # added 2024-06-15
   less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15
   lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18
+  lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07
   inherit (pkgs) lv_font_conv; # added 2024-06-28
   manta = pkgs.node-manta; # Added 2023-05-06
   inherit (pkgs) markdown-link-check; # added 2024-06-28
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
   inherit (pkgs) markdownlint-cli2; # added 2023-08-22
   inherit (pkgs) mathjax-node-cli; # added 2023-11-02
+  mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07
   mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
+  meat = throw "meat was removed because it was abandoned upstream."; # Added 2025-10-20
   inherit (pkgs) mermaid-cli; # added 2023-10-01
   meshcommander = throw "meshcommander was removed because it was abandoned upstream"; # added 2024-12-02
+  inherit (pkgs) mocha; # Added 2025-11-04
   musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
   inherit (pkgs) near-cli; # added 2023-09-09
   neovim = pkgs.neovim-node-client; # added 2024-11-13
@@ -174,10 +230,12 @@ mapAliases {
     };
   }); # added 2024-10-04
   inherit (pkgs) npm-check-updates; # added 2023-08-22
+  npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07
   ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
   orval = throw "orval has been removed because it was broken"; # added 2025-03-23
   parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12
   parcel-bundler = self.parcel; # added 2023-09-04
+  parsoid = throw "The Javascript version of Parsoid has been deprecated by upstream and no longer works with modern MediaWiki versions"; # Added 2025-11-04
   inherit (pkgs) patch-package; # added 2024-06-29
   pkg = pkgs.vercel-pkg; # added 2023-10-04
   inherit (pkgs) pm2; # added 2024-01-22
@@ -190,7 +248,7 @@ mapAliases {
   inherit (pkgs) pxder; # added 2023-09-26
   inherit (pkgs) quicktype; # added 2023-09-09
   react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25
-  inherit (pkgs) react-static; # added 2023-08-21
+  react-static = throw "'react-static has been removed because of a lack of upstream maintainance"; # Converted to throw 2025-11-04
   react-tools = throw "react-tools was removed because it was deprecated"; # added 2023-09-25
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
   inherit (pkgs) redoc-cli; # added 2023-09-12
@@ -206,6 +264,7 @@ mapAliases {
   shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19
   inherit (pkgs) snyk; # Added 2023-08-30
   "socket.io" = throw "socket.io was removed because it provides no executable"; # added 2025-03-23
+  speed-test = throw "'speed-test' has been removed because it was broken"; # Added 2025-11-07
   inherit (pkgs) sql-formatter; # added 2024-06-29
   "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
   ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
@@ -219,6 +278,7 @@ mapAliases {
   inherit (pkgs) tailwindcss; # added 2024-12-04
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
   tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09
+  tern = throw "'tern' was removed because it has been unmaintained upstream for several years"; # Added 2025-11-07
   inherit (pkgs) terser; # Added 2023-08-31
   inherit (pkgs) textlint; # Added 2024-05-13
   textlint-plugin-latex = throw "textlint-plugin-latex was removed because it is unmaintained for years. Please use textlint-plugin-latex2e instead."; # Added 2024-05-17
@@ -276,12 +336,15 @@ mapAliases {
   thelounge-theme-zenburn-sourcecodepro = throw "thelounge-theme-zenburn-sourcecodepro has been removed because thelounge was moved out of nodePackages"; # added 2025-03-12
   three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
   triton = pkgs.triton; # Added 2023-05-06
+  ts-node = throw "'ts-node' was removed because it is unmaintained, and since NodeJS 22.6.0+, experimental TypeScript support is built-in to NodeJS."; # Added 2025-11-07
   typescript = pkgs.typescript; # Added 2023-06-21
   inherit (pkgs) typescript-language-server; # added 2024-02-27
   inherit (pkgs) uglify-js; # added 2024-06-15
   inherit (pkgs) undollar; # added 2024-06-29
   inherit (pkgs) ungit; # added 2023-08-20
   unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02
+  inherit (pkgs) uppy-companion; # Added 2025-11-01
+  inherit (pkgs) vega-lite; # Added 2025-11-04
   inherit (pkgs) vim-language-server; # added 2024-06-25
   vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
   inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
@@ -293,10 +356,12 @@ mapAliases {
   vue-language-server = self.vls; # added 2023-08-20
   vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12
   inherit (pkgs) web-ext; # added 2023-08-20
+  webpack = throw "'webpack' has been removed because it is a library that should be imported within a Javascript project, not an end-user tool."; # Added 2025-11-04
   inherit (pkgs) webpack-cli; # added 2024-12-03
   webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
   webtorrent-cli = throw "webtorrent-cli has been removed because it was broken"; # added 2025-03-12
   inherit (pkgs) wrangler; # added 2024-07-01
+  wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07
   inherit (pkgs) write-good; # added 2023-08-20
   inherit (pkgs) yalc; # added 2024-06-29
   inherit (pkgs) yaml-language-server; # added 2023-09-05
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index bfdee89b5730..37347bee4e52 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -2,20 +2,11 @@
 {
   # Packages that provide multiple executables where one is clearly the `mainProgram`.
   "@antfu/ni" = "ni";
-  "@electron-forge/cli" = "electron-forge";
   "@microsoft/rush" = "rush";
-  "@webassemblyjs/cli-1.11.1" = "wasm2wast";
 
   # Packages that provide a single executable.
   "@angular/cli" = "ng";
-  "@babel/cli" = "babel";
   "@commitlint/cli" = "commitlint";
-  "@gitbeaker/cli" = "gitbeaker";
-  "@uppy/companion" = "companion";
-  "@webassemblyjs/repl-1.11.1" = "wasm";
-  "@webassemblyjs/wasm-strip" = "wasm-strip";
-  "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen";
-  "@webassemblyjs/wast-refmt-1.11.1" = "wast-refmt";
   aws-cdk = "cdk";
   cdk8s-cli = "cdk8s";
   clipboard-cli = "clipboard";
@@ -25,13 +16,10 @@
   fast-cli = "fast";
   fauna-shell = "fauna";
   fkill-cli = "fkill";
-  fleek-cli = "fleek";
   grunt-cli = "grunt";
   gulp-cli = "gulp";
   jsonlint = "jsonlint";
   localtunnel = "lt";
-  lua-fmt = "luafmt";
-  parsoid = "parse.js";
   poor-mans-t-sql-formatter-cli = "sqlformat";
   pulp = "pulp";
   purescript-language-server = "purescript-language-server";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a78e8402f509..6b644d17d2ac 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -1,19 +1,12 @@
 [
   "@angular/cli"
 , "@antfu/ni"
-, "@babel/cli"
 , "@commitlint/cli"
 , "@microsoft/rush"
 , "@tailwindcss/aspect-ratio"
 , "@tailwindcss/forms"
 , "@tailwindcss/line-clamp"
 , "@tailwindcss/typography"
-, "@uppy/companion"
-, {"@webassemblyjs/cli": "1.11.1"}
-, {"@webassemblyjs/repl": "1.11.1"}
-, "@webassemblyjs/wasm-strip"
-, {"@webassemblyjs/wasm-text-gen": "1.11.1"}
-, {"@webassemblyjs/wast-refmt": "1.11.1"}
 , "alex"
 , "audiosprite"
 , "aws-cdk"
@@ -22,99 +15,48 @@
 , "browser-sync"
 , "cdk8s-cli"
 , "clipboard-cli"
-, "coc-cmake"
-, "coc-emmet"
-, "coc-eslint"
-, "coc-flutter"
 , "coc-go"
-, "coc-haxe"
-, "coc-highlight"
-, "coc-html"
-, "coc-java"
-, "coc-jest"
-, "coc-json"
-, "coc-lists"
 , "coc-ltex"
-, "coc-markdownlint"
-, "coc-pairs"
-, "coc-prettier"
-, "coc-r-lsp"
-, "coc-rust-analyzer"
-, "coc-smartf"
-, "coc-snippets"
-, "coc-solargraph"
-, "coc-stylelint"
-, "coc-sumneko-lua"
-, "coc-sqlfluff"
-, "coc-tabnine"
-, "coc-texlab"
 , "coc-tsserver"
 , "coc-ultisnips"
-, "coc-vimlsp"
-, "coc-vimtex"
-, "coc-wxml"
-, "coc-yaml"
-, "coc-yank"
 , "code-theme-converter"
 , "conventional-changelog-cli"
 , "cpy-cli"
-, "create-cycle-app"
-, "csslint"
 , "dhcp"
 , "diff2html-cli"
 , "dotenv-vault"
 , "elasticdump"
-, "@electron-forge/cli"
-, "elm-oracle"
 , "emoj"
-, "emojione"
 , "esy"
 , "fast-cli"
 , "fauna-shell"
 , "fkill-cli"
-, "fleek-cli"
 , "forever"
-, "fx"
-, "gatsby-cli"
-, "@gitbeaker/cli"
 , "grunt-cli"
 , "makam"
-, "gulp"
 , "gulp-cli"
 , "he"
 , "hs-airdrop"
 , "imapnotify"
-, "joplin"
-, "js-beautify"
 , "js-yaml"
 , "jsdoc"
-, "jshint"
 , "json"
 , "json-diff"
 , "json-refs"
-, "json-server"
 , "jsonlint"
-, "jsonplaceholder"
 , "katex"
-, "keyoxide"
 , "lcov-result-merger"
 , "live-server"
 , "livedown"
 , "localtunnel"
-, "lua-fmt"
 , "madoko"
-, "mastodon-bot"
 , "mathjax"
-, "meat"
-, "mocha"
 , "multi-file-swagger"
 , "nijs"
 , "node-gyp-build"
 , "node2nix"
 , "np"
-, "npm-merge-driver"
 , "nrm"
-, "parsoid"
 , "peerflix"
 , "peerflix-server"
 , "poor-mans-t-sql-formatter-cli"
@@ -130,18 +72,12 @@
 , "semver"
 , "sloc"
 , "smartdc"
-, "speed-test"
 , "svelte-check"
-, "tern"
 , "tiddlywiki"
 , "tsun"
-, "ts-node"
 , "ttf2eot"
 , "vega-cli"
-, "vega-lite"
 , "vercel"
 , "wavedrom-cli"
-, "webpack"
-, "wring"
 , "@yaegassy/coc-nginx"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 34c579d2fd73..f1f1bbb3dfd6 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -12,15 +12,6 @@
 
 let
   sources = {
-    "@adobe/css-tools-4.4.0" = {
-      name = "_at_adobe_slash_css-tools";
-      packageName = "@adobe/css-tools";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz";
-        sha512 = "Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==";
-      };
-    };
     "@alcalzone/ansi-tokenize-0.1.3" = {
       name = "_at_alcalzone_slash_ansi-tokenize";
       packageName = "@alcalzone/ansi-tokenize";
@@ -102,15 +93,6 @@ let
         sha512 = "u/kozRnsPO/x8QtKYJOqoGtC4kH6yg1lfYkB9Au0WhYB0FNLpyFusttQtvhlwjtG3rOwiRz4D8DnnXa8iEpIKA==";
       };
     };
-    "@asamuzakjp/css-color-3.1.1" = {
-      name = "_at_asamuzakjp_slash_css-color";
-      packageName = "@asamuzakjp/css-color";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz";
-        sha512 = "hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==";
-      };
-    };
     "@asyncapi/specs-6.8.1" = {
       name = "_at_asyncapi_slash_specs";
       packageName = "@asyncapi/specs";
@@ -120,1221 +102,6 @@ let
         sha512 = "czHoAk3PeXTLR+X8IUaD+IpT+g+zUvkcgMDJVothBsan+oHN3jfcFcFUNdOPAAFoUCQN1hXF1dWuphWy05THlA==";
       };
     };
-    "@aws-crypto/crc32-3.0.0" = {
-      name = "_at_aws-crypto_slash_crc32";
-      packageName = "@aws-crypto/crc32";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz";
-        sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==";
-      };
-    };
-    "@aws-crypto/crc32-5.2.0" = {
-      name = "_at_aws-crypto_slash_crc32";
-      packageName = "@aws-crypto/crc32";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz";
-        sha512 = "nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==";
-      };
-    };
-    "@aws-crypto/crc32c-3.0.0" = {
-      name = "_at_aws-crypto_slash_crc32c";
-      packageName = "@aws-crypto/crc32c";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz";
-        sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==";
-      };
-    };
-    "@aws-crypto/crc32c-5.2.0" = {
-      name = "_at_aws-crypto_slash_crc32c";
-      packageName = "@aws-crypto/crc32c";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz";
-        sha512 = "+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==";
-      };
-    };
-    "@aws-crypto/ie11-detection-3.0.0" = {
-      name = "_at_aws-crypto_slash_ie11-detection";
-      packageName = "@aws-crypto/ie11-detection";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz";
-        sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==";
-      };
-    };
-    "@aws-crypto/sha1-browser-3.0.0" = {
-      name = "_at_aws-crypto_slash_sha1-browser";
-      packageName = "@aws-crypto/sha1-browser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz";
-        sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==";
-      };
-    };
-    "@aws-crypto/sha1-browser-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha1-browser";
-      packageName = "@aws-crypto/sha1-browser";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz";
-        sha512 = "OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==";
-      };
-    };
-    "@aws-crypto/sha256-browser-3.0.0" = {
-      name = "_at_aws-crypto_slash_sha256-browser";
-      packageName = "@aws-crypto/sha256-browser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz";
-        sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==";
-      };
-    };
-    "@aws-crypto/sha256-browser-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha256-browser";
-      packageName = "@aws-crypto/sha256-browser";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz";
-        sha512 = "AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==";
-      };
-    };
-    "@aws-crypto/sha256-js-3.0.0" = {
-      name = "_at_aws-crypto_slash_sha256-js";
-      packageName = "@aws-crypto/sha256-js";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz";
-        sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==";
-      };
-    };
-    "@aws-crypto/sha256-js-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha256-js";
-      packageName = "@aws-crypto/sha256-js";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz";
-        sha512 = "FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==";
-      };
-    };
-    "@aws-crypto/supports-web-crypto-3.0.0" = {
-      name = "_at_aws-crypto_slash_supports-web-crypto";
-      packageName = "@aws-crypto/supports-web-crypto";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz";
-        sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==";
-      };
-    };
-    "@aws-crypto/supports-web-crypto-5.2.0" = {
-      name = "_at_aws-crypto_slash_supports-web-crypto";
-      packageName = "@aws-crypto/supports-web-crypto";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz";
-        sha512 = "iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==";
-      };
-    };
-    "@aws-crypto/util-3.0.0" = {
-      name = "_at_aws-crypto_slash_util";
-      packageName = "@aws-crypto/util";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz";
-        sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==";
-      };
-    };
-    "@aws-crypto/util-5.2.0" = {
-      name = "_at_aws-crypto_slash_util";
-      packageName = "@aws-crypto/util";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz";
-        sha512 = "4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==";
-      };
-    };
-    "@aws-sdk/abort-controller-3.296.0" = {
-      name = "_at_aws-sdk_slash_abort-controller";
-      packageName = "@aws-sdk/abort-controller";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.296.0.tgz";
-        sha512 = "gNUFBlBw6+sEMfDjPVa83iscpQwXBS4uoiZXnfeQ6s6tnaxqQpJDrBBmNvYqDEXNdaAJX4FhayEwkSvtir/f3A==";
-      };
-    };
-    "@aws-sdk/chunked-blob-reader-3.295.0" = {
-      name = "_at_aws-sdk_slash_chunked-blob-reader";
-      packageName = "@aws-sdk/chunked-blob-reader";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.295.0.tgz";
-        sha512 = "oWWcEKyrx4sNFxfvOgkMai1jJtOuERmND8fAp8vRA6i38HBU80q8jjkoAitFGPHUz57EhI2ewYYNnf7vkGteOQ==";
-      };
-    };
-    "@aws-sdk/chunked-blob-reader-native-3.295.0" = {
-      name = "_at_aws-sdk_slash_chunked-blob-reader-native";
-      packageName = "@aws-sdk/chunked-blob-reader-native";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.295.0.tgz";
-        sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ==";
-      };
-    };
-    "@aws-sdk/client-s3-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-s3";
-      packageName = "@aws-sdk/client-s3";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.296.0.tgz";
-        sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw==";
-      };
-    };
-    "@aws-sdk/client-s3-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-s3";
-      packageName = "@aws-sdk/client-s3";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.758.0.tgz";
-        sha512 = "f8SlhU9/93OC/WEI6xVJf/x/GoQFj9a/xXK6QCtr5fvCjfSLgMVFmKTiIl/tgtDRzxUDc8YS6EGtbHjJ3Y/atg==";
-      };
-    };
-    "@aws-sdk/client-sso-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-sso";
-      packageName = "@aws-sdk/client-sso";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.296.0.tgz";
-        sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA==";
-      };
-    };
-    "@aws-sdk/client-sso-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-sso";
-      packageName = "@aws-sdk/client-sso";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.758.0.tgz";
-        sha512 = "BoGO6IIWrLyLxQG6txJw6RT2urmbtlwfggapNCrNPyYjlXpzTSJhBYjndg7TpDATFd0SXL0zm8y/tXsUXNkdYQ==";
-      };
-    };
-    "@aws-sdk/client-sso-oidc-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-sso-oidc";
-      packageName = "@aws-sdk/client-sso-oidc";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.296.0.tgz";
-        sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw==";
-      };
-    };
-    "@aws-sdk/client-sts-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-sts";
-      packageName = "@aws-sdk/client-sts";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.296.0.tgz";
-        sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA==";
-      };
-    };
-    "@aws-sdk/client-sts-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-sts";
-      packageName = "@aws-sdk/client-sts";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.758.0.tgz";
-        sha512 = "ue9hbzjWNQmmyoSeWDRPwnYddsD3BVao5mSFA1kXFNVqWPEenjpkZ1xAlBVzHMMNoEz7LvGI+onXIHntNyiOLQ==";
-      };
-    };
-    "@aws-sdk/config-resolver-3.296.0" = {
-      name = "_at_aws-sdk_slash_config-resolver";
-      packageName = "@aws-sdk/config-resolver";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.296.0.tgz";
-        sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA==";
-      };
-    };
-    "@aws-sdk/core-3.758.0" = {
-      name = "_at_aws-sdk_slash_core";
-      packageName = "@aws-sdk/core";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.758.0.tgz";
-        sha512 = "0RswbdR9jt/XKemaLNuxi2gGr4xGlHyGxkTdhSQzCyUe9A9OPCoLl3rIESRguQEech+oJnbHk/wuiwHqTuP9sg==";
-      };
-    };
-    "@aws-sdk/credential-provider-env-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-env";
-      packageName = "@aws-sdk/credential-provider-env";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.296.0.tgz";
-        sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g==";
-      };
-    };
-    "@aws-sdk/credential-provider-env-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-env";
-      packageName = "@aws-sdk/credential-provider-env";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.758.0.tgz";
-        sha512 = "N27eFoRrO6MeUNumtNHDW9WOiwfd59LPXPqDrIa3kWL/s+fOKFHb9xIcF++bAwtcZnAxKkgpDCUP+INNZskE+w==";
-      };
-    };
-    "@aws-sdk/credential-provider-http-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-http";
-      packageName = "@aws-sdk/credential-provider-http";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.758.0.tgz";
-        sha512 = "Xt9/U8qUCiw1hihztWkNeIR+arg6P+yda10OuCHX6kFVx3auTlU7+hCqs3UxqniGU4dguHuftf3mRpi5/GJ33Q==";
-      };
-    };
-    "@aws-sdk/credential-provider-imds-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-imds";
-      packageName = "@aws-sdk/credential-provider-imds";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.296.0.tgz";
-        sha512 = "DXqksHyT/GVVYbPGknMARKi6Rk6cqCHJUAejePIx5cz1SCKlDrV704hykafHIjaDoy/Zeoj1wzjfwy83sJfDCg==";
-      };
-    };
-    "@aws-sdk/credential-provider-ini-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-ini";
-      packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.296.0.tgz";
-        sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ==";
-      };
-    };
-    "@aws-sdk/credential-provider-ini-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-ini";
-      packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.758.0.tgz";
-        sha512 = "cymSKMcP5d+OsgetoIZ5QCe1wnp2Q/tq+uIxVdh9MbfdBBEnl9Ecq6dH6VlYS89sp4QKuxHxkWXVnbXU3Q19Aw==";
-      };
-    };
-    "@aws-sdk/credential-provider-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-node";
-      packageName = "@aws-sdk/credential-provider-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.296.0.tgz";
-        sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA==";
-      };
-    };
-    "@aws-sdk/credential-provider-node-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-node";
-      packageName = "@aws-sdk/credential-provider-node";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.758.0.tgz";
-        sha512 = "+DaMv63wiq7pJrhIQzZYMn4hSarKiizDoJRvyR7WGhnn0oQ/getX9Z0VNCV3i7lIFoLNTb7WMmQ9k7+z/uD5EQ==";
-      };
-    };
-    "@aws-sdk/credential-provider-process-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-process";
-      packageName = "@aws-sdk/credential-provider-process";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.296.0.tgz";
-        sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA==";
-      };
-    };
-    "@aws-sdk/credential-provider-process-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-process";
-      packageName = "@aws-sdk/credential-provider-process";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.758.0.tgz";
-        sha512 = "AzcY74QTPqcbXWVgjpPZ3HOmxQZYPROIBz2YINF0OQk0MhezDWV/O7Xec+K1+MPGQO3qS6EDrUUlnPLjsqieHA==";
-      };
-    };
-    "@aws-sdk/credential-provider-sso-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-sso";
-      packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.296.0.tgz";
-        sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA==";
-      };
-    };
-    "@aws-sdk/credential-provider-sso-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-sso";
-      packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.758.0.tgz";
-        sha512 = "x0FYJqcOLUCv8GLLFDYMXRAQKGjoM+L0BG4BiHYZRDf24yQWFCAZsCQAYKo6XZYh2qznbsW6f//qpyJ5b0QVKQ==";
-      };
-    };
-    "@aws-sdk/credential-provider-web-identity-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-web-identity";
-      packageName = "@aws-sdk/credential-provider-web-identity";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.296.0.tgz";
-        sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA==";
-      };
-    };
-    "@aws-sdk/credential-provider-web-identity-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-web-identity";
-      packageName = "@aws-sdk/credential-provider-web-identity";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.758.0.tgz";
-        sha512 = "XGguXhBqiCXMXRxcfCAVPlMbm3VyJTou79r/3mxWddHWF0XbhaQiBIbUz6vobVTD25YQRbWSmSch7VA8kI5Lrw==";
-      };
-    };
-    "@aws-sdk/crt-loader-3.758.0" = {
-      name = "_at_aws-sdk_slash_crt-loader";
-      packageName = "@aws-sdk/crt-loader";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/crt-loader/-/crt-loader-3.758.0.tgz";
-        sha512 = "FnLhsDNK3il4rm6Egv7IEuOf8Oiyte5AVeoYkuqgmkCll58tRZCJXYNG/VE+Tket0s3joueVt7rwvHXnMxG0rg==";
-      };
-    };
-    "@aws-sdk/eventstream-codec-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-codec";
-      packageName = "@aws-sdk/eventstream-codec";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.296.0.tgz";
-        sha512 = "BtmUc1f4vmYykfpYwbez+SV9CnnnUlzjsvoBu88dOYJwYh+47+84bY+t8yDOGtPR5+CGeTsXLITVxAAQB+MD8Q==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-browser";
-      packageName = "@aws-sdk/eventstream-serde-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.296.0.tgz";
-        sha512 = "/8+CK0xlrCPwNj+Y+dOS51n+TJYS9GqWbZbA14tkRJvjEpRWhke69UsON9TA0aW2LsO+Lz+5P9Gjv+1hNqCKGg==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-config-resolver-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-config-resolver";
-      packageName = "@aws-sdk/eventstream-serde-config-resolver";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.296.0.tgz";
-        sha512 = "wJXfJg6z05WcHYWyWtzDKQL8mRYQu8ZCZogLGGu7SZuVBqSVTCLwyPt4JpKkQ6Aw7CqP7LHR77EGCpRHLs2xDQ==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-node";
-      packageName = "@aws-sdk/eventstream-serde-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.296.0.tgz";
-        sha512 = "Y/2xhce3R3MrPR1sEv6WwpkuHvqj/Tz6EuCExJsPB4kOG8hsMPPKNfTyKEkXVGI+C3JgobAZXj7KzbFe2/HigA==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-universal-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-universal";
-      packageName = "@aws-sdk/eventstream-serde-universal";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.296.0.tgz";
-        sha512 = "TbHDJN79UORGVUKBPfEVMOJHj8yQyb9ru41dw3aFy7KxeGQxWH4OL07cEJyjTTq8mgQXPIdPjav7PTvOIuE59g==";
-      };
-    };
-    "@aws-sdk/fetch-http-handler-3.296.0" = {
-      name = "_at_aws-sdk_slash_fetch-http-handler";
-      packageName = "@aws-sdk/fetch-http-handler";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.296.0.tgz";
-        sha512 = "wHuKQ+PGKQkYGVuIGscbcbbASl8yIVOSC+QTrZQ4PNsMDvQd9ey2npsmxZk1Z2ULaxY+qYtZCmByyGc8k51TtQ==";
-      };
-    };
-    "@aws-sdk/hash-blob-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_hash-blob-browser";
-      packageName = "@aws-sdk/hash-blob-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.296.0.tgz";
-        sha512 = "kJJsO9kNDNQIYzIIAB/vHFRfVrc1KUYcPMtCLVprHQhPkSxxnOlHF5wBTJ98IRKi/eGYxD5QrCzrMKLI95BPKw==";
-      };
-    };
-    "@aws-sdk/hash-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_hash-node";
-      packageName = "@aws-sdk/hash-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.296.0.tgz";
-        sha512 = "01Sgxm0NE3rtEznLY8vx1bfNsIeM5Sk5SjY9RXqnvCf9EyaKH9x5FMS/DX/SgDdIYi3aXbTwiwScNVCNBzOIQA==";
-      };
-    };
-    "@aws-sdk/hash-stream-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_hash-stream-node";
-      packageName = "@aws-sdk/hash-stream-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.296.0.tgz";
-        sha512 = "EO3nNQiTq5/AQj55E9T10RC7QRnExCIYsvTiKzQPfJEdKiTy8Xga6oQEAGttRABBlP0wTjG4HVnHEEFZ6HbcoQ==";
-      };
-    };
-    "@aws-sdk/invalid-dependency-3.296.0" = {
-      name = "_at_aws-sdk_slash_invalid-dependency";
-      packageName = "@aws-sdk/invalid-dependency";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.296.0.tgz";
-        sha512 = "dmy4fUds0woHGjxwziaSYCLtb/SOfoEeQjW0GFvHj+YGFyY5hJzna4C759Tt8X5obh1evUXlQcH+FL7TS+7tRQ==";
-      };
-    };
-    "@aws-sdk/is-array-buffer-3.295.0" = {
-      name = "_at_aws-sdk_slash_is-array-buffer";
-      packageName = "@aws-sdk/is-array-buffer";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.295.0.tgz";
-        sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag==";
-      };
-    };
-    "@aws-sdk/lib-storage-3.758.0" = {
-      name = "_at_aws-sdk_slash_lib-storage";
-      packageName = "@aws-sdk/lib-storage";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.758.0.tgz";
-        sha512 = "g07y7rA505zaTJNPTmvW4zYJA3gThFDE1be7kBUKhTKAdwv8jVSbOiAy2AhClXs2evSUoQiFFtD1xWxLRXPPRQ==";
-      };
-    };
-    "@aws-sdk/md5-js-3.296.0" = {
-      name = "_at_aws-sdk_slash_md5-js";
-      packageName = "@aws-sdk/md5-js";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.296.0.tgz";
-        sha512 = "TvDafbHFcplnf0QqRlkjZ/Dz+dLWBmzBEclRk+h34r4XaIWxvmQ9EtQRo6+6sfAVRtAj2l+i1fm9EjwPMVkb9A==";
-      };
-    };
-    "@aws-sdk/middleware-bucket-endpoint-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
-      packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.296.0.tgz";
-        sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg==";
-      };
-    };
-    "@aws-sdk/middleware-bucket-endpoint-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
-      packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.734.0.tgz";
-        sha512 = "etC7G18aF7KdZguW27GE/wpbrNmYLVT755EsFc8kXpZj8D6AFKxc7OuveinJmiy0bYXAMspJUWsF6CrGpOw6CQ==";
-      };
-    };
-    "@aws-sdk/middleware-content-length-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-content-length";
-      packageName = "@aws-sdk/middleware-content-length";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.296.0.tgz";
-        sha512 = "e7lJm3kkC2pWZdIw23gpMUk1GrpRTBRqhdFfVwyduXw6Wo4nBYv8Z5MOYy3/SlpjE1BDCaPBoZ3O19cO3arHxg==";
-      };
-    };
-    "@aws-sdk/middleware-endpoint-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-endpoint";
-      packageName = "@aws-sdk/middleware-endpoint";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.296.0.tgz";
-        sha512 = "t8gc7FHr6KkFD35eSzv3VEYl2vNqzAHbux5Bn0su6TJbaTxXiQKcf2jZDTAh7LzUyrB1LH39mNN+at7r3Qm/3g==";
-      };
-    };
-    "@aws-sdk/middleware-expect-continue-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-expect-continue";
-      packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.296.0.tgz";
-        sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg==";
-      };
-    };
-    "@aws-sdk/middleware-expect-continue-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-expect-continue";
-      packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.734.0.tgz";
-        sha512 = "P38/v1l6HjuB2aFUewt7ueAW5IvKkFcv5dalPtbMGRhLeyivBOHwbCyuRKgVs7z7ClTpu9EaViEGki2jEQqEsQ==";
-      };
-    };
-    "@aws-sdk/middleware-flexible-checksums-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-flexible-checksums";
-      packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.296.0.tgz";
-        sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew==";
-      };
-    };
-    "@aws-sdk/middleware-flexible-checksums-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-flexible-checksums";
-      packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.758.0.tgz";
-        sha512 = "o8Rk71S08YTKLoSobucjnbj97OCGaXgpEDNKXpXaavUM5xLNoHCLSUPRCiEN86Ivqxg1n17Y2nSRhfbsveOXXA==";
-      };
-    };
-    "@aws-sdk/middleware-host-header-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-host-header";
-      packageName = "@aws-sdk/middleware-host-header";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.296.0.tgz";
-        sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ==";
-      };
-    };
-    "@aws-sdk/middleware-host-header-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-host-header";
-      packageName = "@aws-sdk/middleware-host-header";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.734.0.tgz";
-        sha512 = "LW7RRgSOHHBzWZnigNsDIzu3AiwtjeI2X66v+Wn1P1u+eXssy1+up4ZY/h+t2sU4LU36UvEf+jrZti9c6vRnFw==";
-      };
-    };
-    "@aws-sdk/middleware-location-constraint-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-location-constraint";
-      packageName = "@aws-sdk/middleware-location-constraint";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.296.0.tgz";
-        sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA==";
-      };
-    };
-    "@aws-sdk/middleware-location-constraint-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-location-constraint";
-      packageName = "@aws-sdk/middleware-location-constraint";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.734.0.tgz";
-        sha512 = "EJEIXwCQhto/cBfHdm3ZOeLxd2NlJD+X2F+ZTOxzokuhBtY0IONfC/91hOo5tWQweerojwshSMHRCKzRv1tlwg==";
-      };
-    };
-    "@aws-sdk/middleware-logger-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-logger";
-      packageName = "@aws-sdk/middleware-logger";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.296.0.tgz";
-        sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw==";
-      };
-    };
-    "@aws-sdk/middleware-logger-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-logger";
-      packageName = "@aws-sdk/middleware-logger";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.734.0.tgz";
-        sha512 = "mUMFITpJUW3LcKvFok176eI5zXAUomVtahb9IQBwLzkqFYOrMJvWAvoV4yuxrJ8TlQBG8gyEnkb9SnhZvjg67w==";
-      };
-    };
-    "@aws-sdk/middleware-recursion-detection-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-recursion-detection";
-      packageName = "@aws-sdk/middleware-recursion-detection";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.296.0.tgz";
-        sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w==";
-      };
-    };
-    "@aws-sdk/middleware-recursion-detection-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-recursion-detection";
-      packageName = "@aws-sdk/middleware-recursion-detection";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.734.0.tgz";
-        sha512 = "CUat2d9ITsFc2XsmeiRQO96iWpxSKYFjxvj27Hc7vo87YUHRnfMfnc8jw1EpxEwMcvBD7LsRa6vDNky6AjcrFA==";
-      };
-    };
-    "@aws-sdk/middleware-retry-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-retry";
-      packageName = "@aws-sdk/middleware-retry";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.296.0.tgz";
-        sha512 = "Tz3gDZm5viQg7BG5bF9Cg0qbm4+Ur3a7wcGkj1XHQdzGDYR76gxvU0bfnSNUmWRz3kaVNyISyXSOUygG0cbhbw==";
-      };
-    };
-    "@aws-sdk/middleware-sdk-s3-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-sdk-s3";
-      packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.296.0.tgz";
-        sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg==";
-      };
-    };
-    "@aws-sdk/middleware-sdk-s3-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-sdk-s3";
-      packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.758.0.tgz";
-        sha512 = "6mJ2zyyHPYSV6bAcaFpsdoXZJeQlR1QgBnZZ6juY/+dcYiuyWCdyLUbGzSZSE7GTfx6i+9+QWFeoIMlWKgU63A==";
-      };
-    };
-    "@aws-sdk/middleware-sdk-sts-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-sdk-sts";
-      packageName = "@aws-sdk/middleware-sdk-sts";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.296.0.tgz";
-        sha512 = "0EnHtiRzcRcXaF6zEgcRGUtVgX0RqczwlGXjtryHcxiqU/+adqbRuckC7bdMF4Zva6GVPS25XppvGF4M+UzAEw==";
-      };
-    };
-    "@aws-sdk/middleware-serde-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-serde";
-      packageName = "@aws-sdk/middleware-serde";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.296.0.tgz";
-        sha512 = "xk2PpWAAX758oUTGkGBAncpOr7ddIXisjD2Y2r9DDXuE4JMho2x6zcrVSiYsGIQ6MHZ9XNJKBVDiK9PA4iQWGQ==";
-      };
-    };
-    "@aws-sdk/middleware-signing-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-signing";
-      packageName = "@aws-sdk/middleware-signing";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.296.0.tgz";
-        sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q==";
-      };
-    };
-    "@aws-sdk/middleware-ssec-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-ssec";
-      packageName = "@aws-sdk/middleware-ssec";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.296.0.tgz";
-        sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA==";
-      };
-    };
-    "@aws-sdk/middleware-ssec-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-ssec";
-      packageName = "@aws-sdk/middleware-ssec";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.734.0.tgz";
-        sha512 = "d4yd1RrPW/sspEXizq2NSOUivnheac6LPeLSLnaeTbBG9g1KqIqvCzP1TfXEqv2CrWfHEsWtJpX7oyjySSPvDQ==";
-      };
-    };
-    "@aws-sdk/middleware-stack-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-stack";
-      packageName = "@aws-sdk/middleware-stack";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.296.0.tgz";
-        sha512 = "Rgo7/mdk9tt4qa9+pzG3AoGNhuj7NmnF5H+3DoPm75h58BYP8hKbKobdPGgI2rZLPtO3PGgmyw/4K4tQJPIZ8g==";
-      };
-    };
-    "@aws-sdk/middleware-user-agent-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-user-agent";
-      packageName = "@aws-sdk/middleware-user-agent";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.296.0.tgz";
-        sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ==";
-      };
-    };
-    "@aws-sdk/middleware-user-agent-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-user-agent";
-      packageName = "@aws-sdk/middleware-user-agent";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.758.0.tgz";
-        sha512 = "iNyehQXtQlj69JCgfaOssgZD4HeYGOwxcaKeG6F+40cwBjTAi0+Ph1yfDwqk2qiBPIRWJ/9l2LodZbxiBqgrwg==";
-      };
-    };
-    "@aws-sdk/nested-clients-3.758.0" = {
-      name = "_at_aws-sdk_slash_nested-clients";
-      packageName = "@aws-sdk/nested-clients";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.758.0.tgz";
-        sha512 = "YZ5s7PSvyF3Mt2h1EQulCG93uybprNGbBkPmVuy/HMMfbFTt4iL3SbKjxqvOZelm86epFfj7pvK7FliI2WOEcg==";
-      };
-    };
-    "@aws-sdk/node-config-provider-3.296.0" = {
-      name = "_at_aws-sdk_slash_node-config-provider";
-      packageName = "@aws-sdk/node-config-provider";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.296.0.tgz";
-        sha512 = "S/tYcuw9ACOWRmRe5oUkmutQ+TApjVs0yDl504DKs74f3p4kRgI/MGWkBiR3mcfThHaxu81z0gkRL2qfW2SDwg==";
-      };
-    };
-    "@aws-sdk/node-http-handler-3.296.0" = {
-      name = "_at_aws-sdk_slash_node-http-handler";
-      packageName = "@aws-sdk/node-http-handler";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.296.0.tgz";
-        sha512 = "D15jjPqYSNhEq58BwkmIpD3VwqG4bL5acAaNu5wWAI4S4236JlG+nmpi3gEeE25z1KCwtBl7G30fVRgXYJ2CWA==";
-      };
-    };
-    "@aws-sdk/property-provider-3.296.0" = {
-      name = "_at_aws-sdk_slash_property-provider";
-      packageName = "@aws-sdk/property-provider";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.296.0.tgz";
-        sha512 = "kjczxE9Od5LoAKQOmxVWISJ9oPG3aCsB+2+NdI+k9EJFDXUUdMcVV3Skei5uHGgKLMsI6CZy8ezZx6YxOSLSew==";
-      };
-    };
-    "@aws-sdk/protocol-http-3.296.0" = {
-      name = "_at_aws-sdk_slash_protocol-http";
-      packageName = "@aws-sdk/protocol-http";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.296.0.tgz";
-        sha512 = "0U1Z/+tpwdRiSToWo1bpdkbTzjbLugTnd02ATjvK4B7zi363SUGlKfoWgV+v7FU/22CIUI1ZIe7XzXvq5rJfjA==";
-      };
-    };
-    "@aws-sdk/querystring-builder-3.296.0" = {
-      name = "_at_aws-sdk_slash_querystring-builder";
-      packageName = "@aws-sdk/querystring-builder";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.296.0.tgz";
-        sha512 = "+ZrZdTRaVI1R1xKQNrTwuiRoPateUaJ/DNw/myJpTPt+ZRg0H7LKBGaJYwL4pl5l/z1UM/E1fOttSfSW7GHxfw==";
-      };
-    };
-    "@aws-sdk/querystring-parser-3.296.0" = {
-      name = "_at_aws-sdk_slash_querystring-parser";
-      packageName = "@aws-sdk/querystring-parser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.296.0.tgz";
-        sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw==";
-      };
-    };
-    "@aws-sdk/region-config-resolver-3.734.0" = {
-      name = "_at_aws-sdk_slash_region-config-resolver";
-      packageName = "@aws-sdk/region-config-resolver";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.734.0.tgz";
-        sha512 = "Lvj1kPRC5IuJBr9DyJ9T9/plkh+EfKLy+12s/mykOy1JaKHDpvj+XGy2YO6YgYVOb8JFtaqloid+5COtje4JTQ==";
-      };
-    };
-    "@aws-sdk/s3-presigned-post-3.758.0" = {
-      name = "_at_aws-sdk_slash_s3-presigned-post";
-      packageName = "@aws-sdk/s3-presigned-post";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.758.0.tgz";
-        sha512 = "x+TWQ6xYD+/i3IlIM0nn1HGAKCmkG12VslKyJSrZAjwWQeVerj6LPVIJvYFcZbNU5lEPWCnlVqKw3S3NgG+N4Q==";
-      };
-    };
-    "@aws-sdk/s3-request-presigner-3.296.0" = {
-      name = "_at_aws-sdk_slash_s3-request-presigner";
-      packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.296.0.tgz";
-        sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw==";
-      };
-    };
-    "@aws-sdk/s3-request-presigner-3.758.0" = {
-      name = "_at_aws-sdk_slash_s3-request-presigner";
-      packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.758.0.tgz";
-        sha512 = "dVyItwu/J1InfJBbCPpHRV9jrsBfI7L0RlDGyS3x/xqBwnm5qpvgNZQasQiyqIl+WJB4f5rZRZHgHuwftqINbA==";
-      };
-    };
-    "@aws-sdk/service-error-classification-3.296.0" = {
-      name = "_at_aws-sdk_slash_service-error-classification";
-      packageName = "@aws-sdk/service-error-classification";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.296.0.tgz";
-        sha512 = "YIsWSQ38e1+FqXz3CMrkKS0JD8OLlHf6I72PJhbfegePpQQFqi9R8OREjP5V7UR9Z972yruv4i96ROH6SCtmoA==";
-      };
-    };
-    "@aws-sdk/shared-ini-file-loader-3.296.0" = {
-      name = "_at_aws-sdk_slash_shared-ini-file-loader";
-      packageName = "@aws-sdk/shared-ini-file-loader";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.296.0.tgz";
-        sha512 = "S31VfdiruN2trayoeB7HifsEB+WXhtfECosj90K903rzfyX+Eo+uUoK9O07UotxJ2gB3MBQ7R8pNnZio3Lb66w==";
-      };
-    };
-    "@aws-sdk/signature-v4-3.296.0" = {
-      name = "_at_aws-sdk_slash_signature-v4";
-      packageName = "@aws-sdk/signature-v4";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.296.0.tgz";
-        sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig==";
-      };
-    };
-    "@aws-sdk/signature-v4-crt-3.758.0" = {
-      name = "_at_aws-sdk_slash_signature-v4-crt";
-      packageName = "@aws-sdk/signature-v4-crt";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.758.0.tgz";
-        sha512 = "DioxfJ8+KenOwydElJvWwMxw0IN8rTD3lbV3AbURwIp+5FBDz8F5ykMO1o1YUQvrGuUNtala8lX3ScE2L7tw9w==";
-      };
-    };
-    "@aws-sdk/signature-v4-multi-region-3.296.0" = {
-      name = "_at_aws-sdk_slash_signature-v4-multi-region";
-      packageName = "@aws-sdk/signature-v4-multi-region";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.296.0.tgz";
-        sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg==";
-      };
-    };
-    "@aws-sdk/signature-v4-multi-region-3.758.0" = {
-      name = "_at_aws-sdk_slash_signature-v4-multi-region";
-      packageName = "@aws-sdk/signature-v4-multi-region";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.758.0.tgz";
-        sha512 = "0RPCo8fYJcrenJ6bRtiUbFOSgQ1CX/GpvwtLU2Fam1tS9h2klKK8d74caeV6A1mIUvBU7bhyQ0wMGlwMtn3EYw==";
-      };
-    };
-    "@aws-sdk/smithy-client-3.296.0" = {
-      name = "_at_aws-sdk_slash_smithy-client";
-      packageName = "@aws-sdk/smithy-client";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.296.0.tgz";
-        sha512 = "HEpsLNozGe9XOWouq5A1TFw5KhFodi8tZqYVNEbSpLoRR+EQKf6OCRvKIRkOn7FnnaOasOR1n7S0D51UG6/irw==";
-      };
-    };
-    "@aws-sdk/token-providers-3.296.0" = {
-      name = "_at_aws-sdk_slash_token-providers";
-      packageName = "@aws-sdk/token-providers";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.296.0.tgz";
-        sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ==";
-      };
-    };
-    "@aws-sdk/token-providers-3.758.0" = {
-      name = "_at_aws-sdk_slash_token-providers";
-      packageName = "@aws-sdk/token-providers";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.758.0.tgz";
-        sha512 = "ckptN1tNrIfQUaGWm/ayW1ddG+imbKN7HHhjFdS4VfItsP0QQOB0+Ov+tpgb4MoNR4JaUghMIVStjIeHN2ks1w==";
-      };
-    };
-    "@aws-sdk/types-3.296.0" = {
-      name = "_at_aws-sdk_slash_types";
-      packageName = "@aws-sdk/types";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.296.0.tgz";
-        sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg==";
-      };
-    };
-    "@aws-sdk/types-3.734.0" = {
-      name = "_at_aws-sdk_slash_types";
-      packageName = "@aws-sdk/types";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.734.0.tgz";
-        sha512 = "o11tSPTT70nAkGV1fN9wm/hAIiLPyWX6SuGf+9JyTp7S/rC2cFWhR26MvA69nplcjNaXVzB0f+QFrLXXjOqCrg==";
-      };
-    };
-    "@aws-sdk/url-parser-3.296.0" = {
-      name = "_at_aws-sdk_slash_url-parser";
-      packageName = "@aws-sdk/url-parser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.296.0.tgz";
-        sha512 = "nBgeGF+ziuDSLz+y8UAl6zL2tXxDwh3wqeXFe9ZcR4YW71BWuh+vEqEsaEMutOrfnJacCrYKTs9TkIOW41cEGg==";
-      };
-    };
-    "@aws-sdk/util-arn-parser-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-arn-parser";
-      packageName = "@aws-sdk/util-arn-parser";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.295.0.tgz";
-        sha512 = "kSSVymcbjyQQHvCZaTt1teKKW4MSSMPRdPNxSNO1aLsVwxrWdnAggDrpHwFjvPCRUcKtpThepATOz75PfUm9Bg==";
-      };
-    };
-    "@aws-sdk/util-arn-parser-3.723.0" = {
-      name = "_at_aws-sdk_slash_util-arn-parser";
-      packageName = "@aws-sdk/util-arn-parser";
-      version = "3.723.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.723.0.tgz";
-        sha512 = "ZhEfvUwNliOQROcAk34WJWVYTlTa4694kSVhDSjW6lE1bMataPnIN8A0ycukEzBXmd8ZSoBcQLn6lKGl7XIJ5w==";
-      };
-    };
-    "@aws-sdk/util-base64-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-base64";
-      packageName = "@aws-sdk/util-base64";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.295.0.tgz";
-        sha512 = "z1r40BsBiOTALnzASvLb4qutGwPpL+jH2UKTCV5WJLXZFMzRnpZaRfeZGE8lMJ/i0+jv9H9G1FmVzE8UgB4rhw==";
-      };
-    };
-    "@aws-sdk/util-body-length-browser-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-body-length-browser";
-      packageName = "@aws-sdk/util-body-length-browser";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.295.0.tgz";
-        sha512 = "NbG4/RSHV1VueStPRclSo5zRjNUmcDlNAs29sniZF+YaN0+Ad7hEdu/YgJw39shBfUaurz2Wv0pufU3cxE5Tng==";
-      };
-    };
-    "@aws-sdk/util-body-length-node-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-body-length-node";
-      packageName = "@aws-sdk/util-body-length-node";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.295.0.tgz";
-        sha512 = "dvGf8VBmrT66lM0n6P/h7wnlHS4Atafyivyl8f4TUCMvRdpqryvvrtnX6yYcq3T7VKQmas/2SOlgDvcrhGXaiw==";
-      };
-    };
-    "@aws-sdk/util-buffer-from-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-buffer-from";
-      packageName = "@aws-sdk/util-buffer-from";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.295.0.tgz";
-        sha512 = "5ezVEITQnrQKn+CU9qfZHgRp2nrrbX0Clmlm9aiNjAEQEPHY33tWl0t6n8h8yU+IpGiNRMWBVC4aSJaE5NA1mA==";
-      };
-    };
-    "@aws-sdk/util-config-provider-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-config-provider";
-      packageName = "@aws-sdk/util-config-provider";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.295.0.tgz";
-        sha512 = "/5Dl1aV2yI8YQjqwmg4RTnl/E9NmNsx7HIwBZt+dTcOrM0LMUwczQBFFcLyqCj/qv5y+VsvLoAAA/OiBT7hb3w==";
-      };
-    };
-    "@aws-sdk/util-create-request-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-create-request";
-      packageName = "@aws-sdk/util-create-request";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.296.0.tgz";
-        sha512 = "rLiDG18mvuqTiwcd3dhBNSH+82jPBoEpGC4hgWHQlQlOC6ctitkBTUo4Di2OPfrYNxegbU5gj4uy2GT0F69TSw==";
-      };
-    };
-    "@aws-sdk/util-defaults-mode-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-defaults-mode-browser";
-      packageName = "@aws-sdk/util-defaults-mode-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.296.0.tgz";
-        sha512 = "R+nzc0PuTMaOG3LV4FoS5W7oMAqqr8G1IyI+A4Q5iem6YDMF157qV5h6wpIt3A8n9YfjyssLsAT/WPfyv/M79w==";
-      };
-    };
-    "@aws-sdk/util-defaults-mode-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-defaults-mode-node";
-      packageName = "@aws-sdk/util-defaults-mode-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.296.0.tgz";
-        sha512 = "zsIYynqjBE2xlzpJsT3lb5gy06undSgYq9ziId7QaHFagqtrecHI2ZMcu2tBFcONpu9NPj3nqJB+kJUAnBc8sQ==";
-      };
-    };
-    "@aws-sdk/util-endpoints-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-endpoints";
-      packageName = "@aws-sdk/util-endpoints";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.296.0.tgz";
-        sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ==";
-      };
-    };
-    "@aws-sdk/util-endpoints-3.743.0" = {
-      name = "_at_aws-sdk_slash_util-endpoints";
-      packageName = "@aws-sdk/util-endpoints";
-      version = "3.743.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.743.0.tgz";
-        sha512 = "sN1l559zrixeh5x+pttrnd0A3+r34r0tmPkJ/eaaMaAzXqsmKU/xYre9K3FNnsSS1J1k4PEfk/nHDTVUgFYjnw==";
-      };
-    };
-    "@aws-sdk/util-format-url-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-format-url";
-      packageName = "@aws-sdk/util-format-url";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.296.0.tgz";
-        sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw==";
-      };
-    };
-    "@aws-sdk/util-format-url-3.734.0" = {
-      name = "_at_aws-sdk_slash_util-format-url";
-      packageName = "@aws-sdk/util-format-url";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.734.0.tgz";
-        sha512 = "TxZMVm8V4aR/QkW9/NhujvYpPZjUYqzLwSge5imKZbWFR806NP7RMwc5ilVuHF/bMOln/cVHkl42kATElWBvNw==";
-      };
-    };
-    "@aws-sdk/util-hex-encoding-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-hex-encoding";
-      packageName = "@aws-sdk/util-hex-encoding";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.295.0.tgz";
-        sha512 = "XJcoVo41kHzhe28PBm/rqt5mdCp8R6abwiW9ug1dA6FOoPUO8kBUxDv6xaOmA2hfRvd2ocFfBXaUCBqUowkGcQ==";
-      };
-    };
-    "@aws-sdk/util-locate-window-3.723.0" = {
-      name = "_at_aws-sdk_slash_util-locate-window";
-      packageName = "@aws-sdk/util-locate-window";
-      version = "3.723.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.723.0.tgz";
-        sha512 = "Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==";
-      };
-    };
-    "@aws-sdk/util-middleware-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-middleware";
-      packageName = "@aws-sdk/util-middleware";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.296.0.tgz";
-        sha512 = "MNWU+doVuX+mIehEManP6OP+f08T33qQpHoBqKIeKpn3TjZjMHG7ujACTkJiEOHUrnwTov7h0Sm+3OZwk3kh9w==";
-      };
-    };
-    "@aws-sdk/util-retry-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-retry";
-      packageName = "@aws-sdk/util-retry";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.296.0.tgz";
-        sha512 = "0mh7SqOMjuJ4vE423SzA/AfCLM68jykbfpEBkTmfqkpjkeQSW+UXHAUdXsMmfzIneiq7go5Z548F868C3cZnwQ==";
-      };
-    };
-    "@aws-sdk/util-stream-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-stream-browser";
-      packageName = "@aws-sdk/util-stream-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.296.0.tgz";
-        sha512 = "6L72tvxIImTDtZ0ckUfpPA2cGE2XhawNsjdngWySkwYev5Unqm/ywmfZm1wa52/4bmJwX35hcGPFQ8qgrPVeNQ==";
-      };
-    };
-    "@aws-sdk/util-stream-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-stream-node";
-      packageName = "@aws-sdk/util-stream-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.296.0.tgz";
-        sha512 = "Gva28bJVlkR10Wy1IGB9ZaQo6wCP8tDacrxwSWP/cPBegFf8yUX53LUqIWxI6Fo4GcSI/+Blri51Sni7oldYhg==";
-      };
-    };
-    "@aws-sdk/util-uri-escape-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-uri-escape";
-      packageName = "@aws-sdk/util-uri-escape";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.295.0.tgz";
-        sha512 = "1H5DcyIoXF8XcPBWf7wzHt0l+TW2EoR8Oq4gsVrPTQkHMTVclC2Yn8EF3gc4arwVBzwLulI9LMBE2L8fexGfTQ==";
-      };
-    };
-    "@aws-sdk/util-user-agent-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-browser";
-      packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.296.0.tgz";
-        sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog==";
-      };
-    };
-    "@aws-sdk/util-user-agent-browser-3.734.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-browser";
-      packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.734.0.tgz";
-        sha512 = "xQTCus6Q9LwUuALW+S76OL0jcWtMOVu14q+GoLnWPUM7QeUw963oQcLhF7oq0CtaLLKyl4GOUfcwc773Zmwwng==";
-      };
-    };
-    "@aws-sdk/util-user-agent-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-node";
-      packageName = "@aws-sdk/util-user-agent-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.296.0.tgz";
-        sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g==";
-      };
-    };
-    "@aws-sdk/util-user-agent-node-3.758.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-node";
-      packageName = "@aws-sdk/util-user-agent-node";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.758.0.tgz";
-        sha512 = "A5EZw85V6WhoKMV2hbuFRvb9NPlxEErb4HPO6/SPXYY4QrjprIzScHxikqcWv1w4J3apB1wto9LPU3IMsYtfrw==";
-      };
-    };
-    "@aws-sdk/util-utf8-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-utf8";
-      packageName = "@aws-sdk/util-utf8";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.295.0.tgz";
-        sha512 = "ITN8v3F63ZkA4sdmCtSbS/mhav4F0MEAiXDAUXtMJLNqVtaVcyQST4i9vNmPpIVthAPAtP0QjyF2tq/Di8bxtQ==";
-      };
-    };
-    "@aws-sdk/util-utf8-browser-3.259.0" = {
-      name = "_at_aws-sdk_slash_util-utf8-browser";
-      packageName = "@aws-sdk/util-utf8-browser";
-      version = "3.259.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz";
-        sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==";
-      };
-    };
-    "@aws-sdk/util-waiter-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-waiter";
-      packageName = "@aws-sdk/util-waiter";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.296.0.tgz";
-        sha512 = "L57uIC74VyTjAdCH0wQqtvJtwK4+gIT/51K/BJHEqVg6C1pOwgrdT6dHC3q8b+gdOrZ6Ff/vTEfh7FZmVcPPjg==";
-      };
-    };
-    "@aws-sdk/xml-builder-3.295.0" = {
-      name = "_at_aws-sdk_slash_xml-builder";
-      packageName = "@aws-sdk/xml-builder";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.295.0.tgz";
-        sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow==";
-      };
-    };
-    "@aws-sdk/xml-builder-3.734.0" = {
-      name = "_at_aws-sdk_slash_xml-builder";
-      packageName = "@aws-sdk/xml-builder";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.734.0.tgz";
-        sha512 = "Zrjxi5qwGEcUsJ0ru7fRtW74WcTS0rbLcehoFB+rN1GRi2hbLcFaYs4PwVA5diLeAJH0gszv3x4Hr/S87MfbKQ==";
-      };
-    };
     "@azure/abort-controller-2.1.2" = {
       name = "_at_azure_slash_abort-controller";
       packageName = "@azure/abort-controller";
@@ -1479,15 +246,6 @@ let
         sha512 = "SriLPKezypIsiZ+TtlFfE46uuBIap2HeaQVS78e1P7rz5OSbq0rsd52WE1mC5f7vAeLiXqv7I7oRhL3WFZEw3Q==";
       };
     };
-    "@babel/cli-7.26.4" = {
-      name = "_at_babel_slash_cli";
-      packageName = "@babel/cli";
-      version = "7.26.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.26.4.tgz";
-        sha512 = "+mORf3ezU3p3qr+82WvJSnQNE1GAYeoCfEv4fik6B5/2cvKZ75AX8oawWQdXtM9MmndooQj15Jr9kelRFWsuRw==";
-      };
-    };
     "@babel/code-frame-7.26.2" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
@@ -1497,33 +255,6 @@ let
         sha512 = "RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==";
       };
     };
-    "@babel/compat-data-7.26.8" = {
-      name = "_at_babel_slash_compat-data";
-      packageName = "@babel/compat-data";
-      version = "7.26.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz";
-        sha512 = "oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==";
-      };
-    };
-    "@babel/core-7.26.10" = {
-      name = "_at_babel_slash_core";
-      packageName = "@babel/core";
-      version = "7.26.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz";
-        sha512 = "vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==";
-      };
-    };
-    "@babel/generator-7.18.2" = {
-      name = "_at_babel_slash_generator";
-      packageName = "@babel/generator";
-      version = "7.18.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz";
-        sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==";
-      };
-    };
     "@babel/generator-7.26.10" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -1542,96 +273,6 @@ let
         sha512 = "6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.25.9" = {
-      name = "_at_babel_slash_helper-annotate-as-pure";
-      packageName = "@babel/helper-annotate-as-pure";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz";
-        sha512 = "gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==";
-      };
-    };
-    "@babel/helper-compilation-targets-7.26.5" = {
-      name = "_at_babel_slash_helper-compilation-targets";
-      packageName = "@babel/helper-compilation-targets";
-      version = "7.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz";
-        sha512 = "IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==";
-      };
-    };
-    "@babel/helper-create-class-features-plugin-7.26.9" = {
-      name = "_at_babel_slash_helper-create-class-features-plugin";
-      packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.26.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz";
-        sha512 = "ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==";
-      };
-    };
-    "@babel/helper-member-expression-to-functions-7.25.9" = {
-      name = "_at_babel_slash_helper-member-expression-to-functions";
-      packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz";
-        sha512 = "wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==";
-      };
-    };
-    "@babel/helper-module-imports-7.25.9" = {
-      name = "_at_babel_slash_helper-module-imports";
-      packageName = "@babel/helper-module-imports";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz";
-        sha512 = "tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==";
-      };
-    };
-    "@babel/helper-module-transforms-7.26.0" = {
-      name = "_at_babel_slash_helper-module-transforms";
-      packageName = "@babel/helper-module-transforms";
-      version = "7.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz";
-        sha512 = "xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==";
-      };
-    };
-    "@babel/helper-optimise-call-expression-7.25.9" = {
-      name = "_at_babel_slash_helper-optimise-call-expression";
-      packageName = "@babel/helper-optimise-call-expression";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz";
-        sha512 = "FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==";
-      };
-    };
-    "@babel/helper-plugin-utils-7.26.5" = {
-      name = "_at_babel_slash_helper-plugin-utils";
-      packageName = "@babel/helper-plugin-utils";
-      version = "7.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz";
-        sha512 = "RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==";
-      };
-    };
-    "@babel/helper-replace-supers-7.26.5" = {
-      name = "_at_babel_slash_helper-replace-supers";
-      packageName = "@babel/helper-replace-supers";
-      version = "7.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz";
-        sha512 = "bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==";
-      };
-    };
-    "@babel/helper-skip-transparent-expression-wrappers-7.25.9" = {
-      name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
-      packageName = "@babel/helper-skip-transparent-expression-wrappers";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz";
-        sha512 = "K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==";
-      };
-    };
     "@babel/helper-string-parser-7.25.9" = {
       name = "_at_babel_slash_helper-string-parser";
       packageName = "@babel/helper-string-parser";
@@ -1650,42 +291,6 @@ let
         sha512 = "Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==";
       };
     };
-    "@babel/helper-validator-option-7.25.9" = {
-      name = "_at_babel_slash_helper-validator-option";
-      packageName = "@babel/helper-validator-option";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz";
-        sha512 = "e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==";
-      };
-    };
-    "@babel/helpers-7.26.10" = {
-      name = "_at_babel_slash_helpers";
-      packageName = "@babel/helpers";
-      version = "7.26.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz";
-        sha512 = "UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==";
-      };
-    };
-    "@babel/node-7.26.0" = {
-      name = "_at_babel_slash_node";
-      packageName = "@babel/node";
-      version = "7.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/node/-/node-7.26.0.tgz";
-        sha512 = "5ASMjh42hbnqyCOK68Q5chh1jKAqn91IswFTN+niwt4FLABhEWCT1tEuuo6mlNQ4WG/oFQLvJ71PaHAKtWtJyA==";
-      };
-    };
-    "@babel/parser-7.18.4" = {
-      name = "_at_babel_slash_parser";
-      packageName = "@babel/parser";
-      version = "7.18.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz";
-        sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==";
-      };
-    };
     "@babel/parser-7.26.10" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
@@ -1695,69 +300,6 @@ let
         sha512 = "6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==";
       };
     };
-    "@babel/plugin-syntax-jsx-7.25.9" = {
-      name = "_at_babel_slash_plugin-syntax-jsx";
-      packageName = "@babel/plugin-syntax-jsx";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz";
-        sha512 = "ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==";
-      };
-    };
-    "@babel/plugin-syntax-typescript-7.25.9" = {
-      name = "_at_babel_slash_plugin-syntax-typescript";
-      packageName = "@babel/plugin-syntax-typescript";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz";
-        sha512 = "hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==";
-      };
-    };
-    "@babel/plugin-transform-modules-commonjs-7.26.3" = {
-      name = "_at_babel_slash_plugin-transform-modules-commonjs";
-      packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.26.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz";
-        sha512 = "MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==";
-      };
-    };
-    "@babel/plugin-transform-react-jsx-7.25.9" = {
-      name = "_at_babel_slash_plugin-transform-react-jsx";
-      packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz";
-        sha512 = "s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==";
-      };
-    };
-    "@babel/plugin-transform-typescript-7.26.8" = {
-      name = "_at_babel_slash_plugin-transform-typescript";
-      packageName = "@babel/plugin-transform-typescript";
-      version = "7.26.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.8.tgz";
-        sha512 = "bME5J9AC8ChwA7aEPJ6zym3w7aObZULHhbNLU0bKUhKsAkylkzUdq+0kdymh9rzi8nlNFl2bmldFBCKNJBUpuw==";
-      };
-    };
-    "@babel/preset-typescript-7.26.0" = {
-      name = "_at_babel_slash_preset-typescript";
-      packageName = "@babel/preset-typescript";
-      version = "7.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz";
-        sha512 = "NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==";
-      };
-    };
-    "@babel/register-7.25.9" = {
-      name = "_at_babel_slash_register";
-      packageName = "@babel/register";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/register/-/register-7.25.9.tgz";
-        sha512 = "8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==";
-      };
-    };
     "@babel/runtime-7.26.10" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -1794,15 +336,6 @@ let
         sha512 = "k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==";
       };
     };
-    "@babel/types-7.19.0" = {
-      name = "_at_babel_slash_types";
-      packageName = "@babel/types";
-      version = "7.19.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz";
-        sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==";
-      };
-    };
     "@babel/types-7.26.10" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
@@ -1830,15 +363,6 @@ let
         sha512 = "wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==";
       };
     };
-    "@buttercup/fetch-0.2.1" = {
-      name = "_at_buttercup_slash_fetch";
-      packageName = "@buttercup/fetch";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz";
-        sha512 = "sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==";
-      };
-    };
     "@cdktf/cli-core-0.20.11" = {
       name = "_at_cdktf_slash_cli-core";
       packageName = "@cdktf/cli-core";
@@ -2064,15 +588,6 @@ let
         sha512 = "PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw==";
       };
     };
-    "@cronvel/get-pixels-3.4.1" = {
-      name = "_at_cronvel_slash_get-pixels";
-      packageName = "@cronvel/get-pixels";
-      version = "3.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.4.1.tgz";
-        sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g==";
-      };
-    };
     "@cspotcode/source-map-support-0.8.1" = {
       name = "_at_cspotcode_slash_source-map-support";
       packageName = "@cspotcode/source-map-support";
@@ -2082,105 +597,6 @@ let
         sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==";
       };
     };
-    "@csstools/color-helpers-5.0.2" = {
-      name = "_at_csstools_slash_color-helpers";
-      packageName = "@csstools/color-helpers";
-      version = "5.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz";
-        sha512 = "JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==";
-      };
-    };
-    "@csstools/css-calc-2.1.2" = {
-      name = "_at_csstools_slash_css-calc";
-      packageName = "@csstools/css-calc";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz";
-        sha512 = "TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==";
-      };
-    };
-    "@csstools/css-color-parser-3.0.8" = {
-      name = "_at_csstools_slash_css-color-parser";
-      packageName = "@csstools/css-color-parser";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz";
-        sha512 = "pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==";
-      };
-    };
-    "@csstools/css-parser-algorithms-3.0.4" = {
-      name = "_at_csstools_slash_css-parser-algorithms";
-      packageName = "@csstools/css-parser-algorithms";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz";
-        sha512 = "Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==";
-      };
-    };
-    "@csstools/css-tokenizer-3.0.3" = {
-      name = "_at_csstools_slash_css-tokenizer";
-      packageName = "@csstools/css-tokenizer";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz";
-        sha512 = "UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==";
-      };
-    };
-    "@cycle/dom-18.3.0" = {
-      name = "_at_cycle_slash_dom";
-      packageName = "@cycle/dom";
-      version = "18.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/dom/-/dom-18.3.0.tgz";
-        sha512 = "f0/+Hk/fCiODGlCDIcs3O5Gv4AZ8vehs/BbL8EnYB07M/H3sECxox2iYeC/1yVhiUY6kTxyF5ms5bpzJHi8jEQ==";
-      };
-    };
-    "@cycle/http-14.10.0" = {
-      name = "_at_cycle_slash_http";
-      packageName = "@cycle/http";
-      version = "14.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/http/-/http-14.10.0.tgz";
-        sha512 = "FhGyDGraqIUpsBSiqgv6FJNaEJ2MVg/8oJ5obgwQgdrheSIiviXYSq+NQ6PtHfuThes/Z16aY/LrvsqLF5hJMw==";
-      };
-    };
-    "@cycle/isolate-3.4.0" = {
-      name = "_at_cycle_slash_isolate";
-      packageName = "@cycle/isolate";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.4.0.tgz";
-        sha512 = "mOAlwLeTr6wTdHwKWAfaFeuKeD540kKcJlLVKsqLhbfLp6orF1B3CzMfFNlmqNY30t6o6TORCFfV+0EATK9Y7Q==";
-      };
-    };
-    "@cycle/run-3.4.0" = {
-      name = "_at_cycle_slash_run";
-      packageName = "@cycle/run";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz";
-        sha512 = "YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow==";
-      };
-    };
-    "@cycle/run-4.4.0" = {
-      name = "_at_cycle_slash_run";
-      packageName = "@cycle/run";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/run/-/run-4.4.0.tgz";
-        sha512 = "vVxnTqKKlgasE+we9X2z3og8z5KouO2RMiIgHWkVek+NomsdaeZwfvbutqzm3VToEImaz0DE2Iln9AxtCOVjpQ==";
-      };
-    };
-    "@cycle/time-0.10.1" = {
-      name = "_at_cycle_slash_time";
-      packageName = "@cycle/time";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/time/-/time-0.10.1.tgz";
-        sha512 = "BGzQLeZGA1PtwEkbwgItUEOEgE7kDZL151DuqMRaH172dY4NIMpFoLc6OghiGdtNBJGVkbfJ/UTKiM0iRsApIg==";
-      };
-    };
     "@dabh/diagnostics-2.0.3" = {
       name = "_at_dabh_slash_diagnostics";
       packageName = "@dabh/diagnostics";
@@ -2244,206 +660,6 @@ let
         sha512 = "0dEVyRLM/lG4gp1R/Ik5bfPl/1wX00xFwd5KcNH602tzBa09oF7pbTKETEhR1GjZ75K6OJnYFu8II2dyMhONMw==";
       };
     };
-    "@electron-forge/core-7.7.0" = {
-      name = "_at_electron-forge_slash_core";
-      packageName = "@electron-forge/core";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/core/-/core-7.7.0.tgz";
-        sha512 = "BWhg1Zw1bhpDuZowGH3lXDiL9zZBsYFNjtqyMqmkjcEm5xf9Dzs8mpRpNjtkpf3jit3LB4PNGMLj3c8ix0h4vQ==";
-      };
-    };
-    "@electron-forge/core-utils-7.7.0" = {
-      name = "_at_electron-forge_slash_core-utils";
-      packageName = "@electron-forge/core-utils";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.7.0.tgz";
-        sha512 = "kgOkiLzqnySkcpt26rBg8AoZsI1ID3f6s/dQlzfRJisWZTKTu4ryiMcaC0F07DVjaYFnEl9SQ86IvkTcyS97mQ==";
-      };
-    };
-    "@electron-forge/maker-base-7.7.0" = {
-      name = "_at_electron-forge_slash_maker-base";
-      packageName = "@electron-forge/maker-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.7.0.tgz";
-        sha512 = "9u+mmBLBAUHuH0+IGw94EGVTDD4CPKX05h5pp5/PIaijy16ss5dymK4vEp3s2XJMFlza2PsCgLLYBgDcAE2Dqg==";
-      };
-    };
-    "@electron-forge/plugin-base-7.7.0" = {
-      name = "_at_electron-forge_slash_plugin-base";
-      packageName = "@electron-forge/plugin-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.7.0.tgz";
-        sha512 = "6wisQ4ZKOWey48wFF+JHzih7AuQuVma5KauwNEju2Dh2ibwDMJmPy0FWVolMSg7XUIMbGKLADGilxX6XRv8qNQ==";
-      };
-    };
-    "@electron-forge/publisher-base-7.7.0" = {
-      name = "_at_electron-forge_slash_publisher-base";
-      packageName = "@electron-forge/publisher-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.7.0.tgz";
-        sha512 = "jHKvUc1peBBSl2t5d1x6M3CNyCMyNB+NnTO9LmA1dWFQ3oRDFwromIH5KjRqPJj6l4AyH0/XJogdO7Nn4Eyn6Q==";
-      };
-    };
-    "@electron-forge/shared-types-7.7.0" = {
-      name = "_at_electron-forge_slash_shared-types";
-      packageName = "@electron-forge/shared-types";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.7.0.tgz";
-        sha512 = "1zQsmudkAuHv0HnJtSJY3pvTeuN3fnSa9BR6cbeUlcpOfrnG4OTG03FqerHfyIWaBRVy7jGgif0NhKKE9azKyg==";
-      };
-    };
-    "@electron-forge/template-base-7.7.0" = {
-      name = "_at_electron-forge_slash_template-base";
-      packageName = "@electron-forge/template-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.7.0.tgz";
-        sha512 = "jwnhEHNIyQfbwJ6R8SuZIJApHKBykDr/rSgUF3km9nr2qAUSoUUV7RaJa/uiQJMtvamXenuo5K84C2NzumzS3A==";
-      };
-    };
-    "@electron-forge/template-vite-7.7.0" = {
-      name = "_at_electron-forge_slash_template-vite";
-      packageName = "@electron-forge/template-vite";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.7.0.tgz";
-        sha512 = "6p+U6FDWrmF7XgSLkrO07OOgJcrrrArbnExSckGJdBnupxmIDf1Y+exwfHHKdxX6/FfkA6JST5nRGjgA5CFqcw==";
-      };
-    };
-    "@electron-forge/template-vite-typescript-7.7.0" = {
-      name = "_at_electron-forge_slash_template-vite-typescript";
-      packageName = "@electron-forge/template-vite-typescript";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.7.0.tgz";
-        sha512 = "32C/+PF+hIloTdbRx7OutvqnTkkC7BHeQxNw4/zG2TfQ3cjl7JUD6A2UvTUHtv5KHkK2hDw6ZdahPwpJO41YSA==";
-      };
-    };
-    "@electron-forge/template-webpack-7.7.0" = {
-      name = "_at_electron-forge_slash_template-webpack";
-      packageName = "@electron-forge/template-webpack";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.7.0.tgz";
-        sha512 = "7Hb1wejKqtvPXqhelubUNAh39FtClB/4JDtWzyAsL2iC3XeB5qh6pITz8+nW/rF2qW/JAepc/lnreqKn34P2ig==";
-      };
-    };
-    "@electron-forge/template-webpack-typescript-7.7.0" = {
-      name = "_at_electron-forge_slash_template-webpack-typescript";
-      packageName = "@electron-forge/template-webpack-typescript";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.7.0.tgz";
-        sha512 = "w1vRAjGy0MjjdEDYPpZcpkMo2e3z5uEwfJdwVOpBeha7p2WM/Y6go21K+7pSqGp8Xmq4zlE20hq5MEx8Bs8eZg==";
-      };
-    };
-    "@electron-forge/tracer-7.7.0" = {
-      name = "_at_electron-forge_slash_tracer";
-      packageName = "@electron-forge/tracer";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.7.0.tgz";
-        sha512 = "R/JiGFzWhwfVyc6ioT4l5FFChRLS4Z2tWPeQfPcyoemdpzKpI1rvMHti42gzWXFW8GdzkhG0G3ZWfKiF3y3x/Q==";
-      };
-    };
-    "@electron/asar-3.3.1" = {
-      name = "_at_electron_slash_asar";
-      packageName = "@electron/asar";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/asar/-/asar-3.3.1.tgz";
-        sha512 = "WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg==";
-      };
-    };
-    "@electron/get-3.1.0" = {
-      name = "_at_electron_slash_get";
-      packageName = "@electron/get";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz";
-        sha512 = "F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==";
-      };
-    };
-    "@electron/node-gyp-git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" =
-      {
-        name = "_at_electron_slash_node-gyp";
-        packageName = "@electron/node-gyp";
-        version = "10.2.0-electron.1";
-        src = fetchgit {
-          url = "https://github.com/electron/node-gyp.git";
-          rev = "06b29aafb7708acef8b3669835c8a7857ebc92d2";
-          sha256 = "033b279dda9d8576174438fafb804f2b27173433a5fe0359232330ffe5a3b155";
-        };
-      };
-    "@electron/notarize-2.5.0" = {
-      name = "_at_electron_slash_notarize";
-      packageName = "@electron/notarize";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz";
-        sha512 = "jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==";
-      };
-    };
-    "@electron/osx-sign-1.3.3" = {
-      name = "_at_electron_slash_osx-sign";
-      packageName = "@electron/osx-sign";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.3.tgz";
-        sha512 = "KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==";
-      };
-    };
-    "@electron/packager-18.3.6" = {
-      name = "_at_electron_slash_packager";
-      packageName = "@electron/packager";
-      version = "18.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.6.tgz";
-        sha512 = "1eXHB5t+SQKvUiDpWGpvr90ZSSbXj+isrh3YbjCTjKT4bE4SQrKSBfukEAaBvp67+GXHFtCHjQgN9qSTFIge+Q==";
-      };
-    };
-    "@electron/rebuild-3.7.1" = {
-      name = "_at_electron_slash_rebuild";
-      packageName = "@electron/rebuild";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.1.tgz";
-        sha512 = "sKGD+xav4Gh25+LcLY0rjIwcCFTw+f/HU1pB48UVbwxXXRGaXEqIH0AaYKN46dgd/7+6kuiDXzoyAEvx1zCsdw==";
-      };
-    };
-    "@electron/universal-2.0.2" = {
-      name = "_at_electron_slash_universal";
-      packageName = "@electron/universal";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz";
-        sha512 = "mqY1szx5/d5YLvfCDWWoJdkSIjIz+NdWN4pN0r78lYiE7De+slLpuF3lVxIT+hlJnwk5sH2wFRMl6/oUgUVO3A==";
-      };
-    };
-    "@electron/windows-sign-1.2.1" = {
-      name = "_at_electron_slash_windows-sign";
-      packageName = "@electron/windows-sign";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.1.tgz";
-        sha512 = "YfASnrhJ+ve6Q43ZiDwmpBgYgi2u0bYjeAVi2tDfN7YWAKO8X9EEOuPGtqbJpPLM6TfAHimghICjWe2eaJ8BAg==";
-      };
-    };
-    "@emmetio/extract-abbreviation-0.1.6" = {
-      name = "_at_emmetio_slash_extract-abbreviation";
-      packageName = "@emmetio/extract-abbreviation";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz";
-        sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==";
-      };
-    };
     "@eslint-community/eslint-utils-4.5.1" = {
       name = "_at_eslint-community_slash_eslint-utils";
       packageName = "@eslint-community/eslint-utils";
@@ -2525,24 +741,6 @@ let
         sha512 = "JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==";
       };
     };
-    "@ethereumjs/rlp-4.0.1" = {
-      name = "_at_ethereumjs_slash_rlp";
-      packageName = "@ethereumjs/rlp";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz";
-        sha512 = "tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==";
-      };
-    };
-    "@ethereumjs/util-8.1.0" = {
-      name = "_at_ethereumjs_slash_util";
-      packageName = "@ethereumjs/util";
-      version = "8.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz";
-        sha512 = "zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==";
-      };
-    };
     "@ewoudenberg/difflib-0.1.0" = {
       name = "_at_ewoudenberg_slash_difflib";
       packageName = "@ewoudenberg/difflib";
@@ -2588,15 +786,6 @@ let
         sha512 = "vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==";
       };
     };
-    "@gar/promisify-1.1.3" = {
-      name = "_at_gar_slash_promisify";
-      packageName = "@gar/promisify";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz";
-        sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==";
-      };
-    };
     "@gerrit0/mini-shiki-1.27.2" = {
       name = "_at_gerrit0_slash_mini-shiki";
       packageName = "@gerrit0/mini-shiki";
@@ -2606,33 +795,6 @@ let
         sha512 = "GeWyHz8ao2gBiUW4OJnQDxXQnFgZQwwQk05t/CVVgNBN7/rK8XZ7xY6YhLVv9tH3VppWWmr9DCl3MwemB/i+Og==";
       };
     };
-    "@gitbeaker/core-42.1.0" = {
-      name = "_at_gitbeaker_slash_core";
-      packageName = "@gitbeaker/core";
-      version = "42.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/core/-/core-42.1.0.tgz";
-        sha512 = "xoP3mUjiGyUdN+utmQ+wDh9r7b4bcf3wa8jxkDTZTiuyd7Tg+354nJhwBNBsq2vFfyQvONOyOT1hsFjTGbTpBA==";
-      };
-    };
-    "@gitbeaker/requester-utils-42.1.0" = {
-      name = "_at_gitbeaker_slash_requester-utils";
-      packageName = "@gitbeaker/requester-utils";
-      version = "42.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-42.1.0.tgz";
-        sha512 = "q5NXy563UUM2AisM/V6Z3A92hIVQNMyx/VBj5Mg7gJkEtIYL+pEyibjIQxcq6nQ3bnj6bkM8NYguCs5tg7GR0Q==";
-      };
-    };
-    "@gitbeaker/rest-42.1.0" = {
-      name = "_at_gitbeaker_slash_rest";
-      packageName = "@gitbeaker/rest";
-      version = "42.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-42.1.0.tgz";
-        sha512 = "7eSXktkUEF2O2A3F1cO/ZJ/3Mco4v59rptghzhrvjZryPcAxlYWxNJbuFtjc5bc0OnJW7i5AYfJSYvZQSh3gYg==";
-      };
-    };
     "@grpc/grpc-js-1.13.0" = {
       name = "_at_grpc_slash_grpc-js";
       packageName = "@grpc/grpc-js";
@@ -2660,33 +822,6 @@ let
         sha512 = "Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==";
       };
     };
-    "@gulpjs/to-absolute-glob-4.0.0" = {
-      name = "_at_gulpjs_slash_to-absolute-glob";
-      packageName = "@gulpjs/to-absolute-glob";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz";
-        sha512 = "kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==";
-      };
-    };
-    "@hapi/hoek-9.3.0" = {
-      name = "_at_hapi_slash_hoek";
-      packageName = "@hapi/hoek";
-      version = "9.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz";
-        sha512 = "/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==";
-      };
-    };
-    "@hapi/topo-5.1.0" = {
-      name = "_at_hapi_slash_topo";
-      packageName = "@hapi/topo";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz";
-        sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==";
-      };
-    };
     "@httptoolkit/websocket-stream-6.0.1" = {
       name = "_at_httptoolkit_slash_websocket-stream";
       packageName = "@httptoolkit/websocket-stream";
@@ -3011,15 +1146,6 @@ let
         sha512 = "ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==";
       };
     };
-    "@ioredis/commands-1.2.0" = {
-      name = "_at_ioredis_slash_commands";
-      packageName = "@ioredis/commands";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz";
-        sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==";
-      };
-    };
     "@isaacs/cliui-8.0.2" = {
       name = "_at_isaacs_slash_cliui";
       packageName = "@isaacs/cliui";
@@ -3317,96 +1443,6 @@ let
         sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA==";
       };
     };
-    "@joplin/fork-htmlparser2-4.1.57" = {
-      name = "_at_joplin_slash_fork-htmlparser2";
-      packageName = "@joplin/fork-htmlparser2";
-      version = "4.1.57";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.57.tgz";
-        sha512 = "lB92mcQ13i0n1YXEQQqeNACK9qnrh8uMCTgc80MfvV7R9kh9jSDZ78V4phTw+91v26YhtpMNJB/RwtVyB3VxXw==";
-      };
-    };
-    "@joplin/fork-sax-1.2.61" = {
-      name = "_at_joplin_slash_fork-sax";
-      packageName = "@joplin/fork-sax";
-      version = "1.2.61";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.61.tgz";
-        sha512 = "IH6ZslEsS7ykIuQQ7Mv+bC8AY1me/HSBooZN+s7Ru54B3ahzG1MJwgFMCNJqeG5ZGOM9mJCy25sZR8Xt73fKoQ==";
-      };
-    };
-    "@joplin/fork-uslug-1.0.22" = {
-      name = "_at_joplin_slash_fork-uslug";
-      packageName = "@joplin/fork-uslug";
-      version = "1.0.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.22.tgz";
-        sha512 = "xS9/sYsQGXMeLGebyeYux4t/0HlFgsjvHes9gF9DpBBhKDdBm2f4nKvc7sGA0J6ZuwVc9Z7oKthsHMbOdoXC4A==";
-      };
-    };
-    "@joplin/htmlpack-3.2.5" = {
-      name = "_at_joplin_slash_htmlpack";
-      packageName = "@joplin/htmlpack";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-3.2.5.tgz";
-        sha512 = "6pxv89x8Vw0e3KHj/irX1eCTdDIQsuPfdLQPd6TlNZ2b/Jd4OVP9e+YjN8pWckqTxSMwcjR2tIZIF4XNqIsnxw==";
-      };
-    };
-    "@joplin/lib-3.2.5" = {
-      name = "_at_joplin_slash_lib";
-      packageName = "@joplin/lib";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/lib/-/lib-3.2.5.tgz";
-        sha512 = "QI+1ltWGg2q8HJ60EHRzB5OJMGCyuoDIFYazpjbDhqQMsDa2ZsW7Monk9OpIIHxesmePKnI/iEvj9gp+1ZH16A==";
-      };
-    };
-    "@joplin/onenote-converter-3.2.5" = {
-      name = "_at_joplin_slash_onenote-converter";
-      packageName = "@joplin/onenote-converter";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/onenote-converter/-/onenote-converter-3.2.5.tgz";
-        sha512 = "/Wu93pRt0iJmUY60zesOEjOBqoWjF/SpGmB/9n6mtePzZ7WuanDNIjuT9ToWlsqIzXPcU+mAiO5Hud9CyobNtg==";
-      };
-    };
-    "@joplin/renderer-3.2.5" = {
-      name = "_at_joplin_slash_renderer";
-      packageName = "@joplin/renderer";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-3.2.5.tgz";
-        sha512 = "C0iFp3jtc59p/fqtgcIg1LMAy8f8UpWdGMjCOp0LD0J4Bn3GPHu+phdQljc246pK69ZlnF8BXHF7DINYISdkXQ==";
-      };
-    };
-    "@joplin/turndown-4.0.79" = {
-      name = "_at_joplin_slash_turndown";
-      packageName = "@joplin/turndown";
-      version = "4.0.79";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.79.tgz";
-        sha512 = "doFRDn3PgUA6jpVCHFQhvNYlukuralFfV34hOOZ/JxpIhkp7V7VomtVn1Ct0RrFKuqUM5fVle8wG/J/QWPt2iw==";
-      };
-    };
-    "@joplin/turndown-plugin-gfm-1.0.61" = {
-      name = "_at_joplin_slash_turndown-plugin-gfm";
-      packageName = "@joplin/turndown-plugin-gfm";
-      version = "1.0.61";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.61.tgz";
-        sha512 = "m5PNP1OkktlGgmFI7r/HWON/vQA56GCiM1oTWYkY2JFc28Uc8yHj0nT46pahDyU8uRYPj4TXnxLjQzDDJ11i7w==";
-      };
-    };
-    "@joplin/utils-3.2.5" = {
-      name = "_at_joplin_slash_utils";
-      packageName = "@joplin/utils";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/utils/-/utils-3.2.5.tgz";
-        sha512 = "oXIGzaQR6sUv7UxtvT/Bdutz2ET986NYcAn+7FutojI1e3ki7nXuCcNnflZdW9BR/bK5Nby1zuIBk0sBENICsg==";
-      };
-    };
     "@jridgewell/gen-mapping-0.3.8" = {
       name = "_at_jridgewell_slash_gen-mapping";
       packageName = "@jridgewell/gen-mapping";
@@ -3434,15 +1470,6 @@ let
         sha512 = "R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==";
       };
     };
-    "@jridgewell/source-map-0.3.6" = {
-      name = "_at_jridgewell_slash_source-map";
-      packageName = "@jridgewell/source-map";
-      version = "0.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz";
-        sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==";
-      };
-    };
     "@jridgewell/sourcemap-codec-1.5.0" = {
       name = "_at_jridgewell_slash_sourcemap-codec";
       packageName = "@jridgewell/sourcemap-codec";
@@ -3569,69 +1596,6 @@ let
         sha512 = "0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==";
       };
     };
-    "@lmdb/lmdb-darwin-arm64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-darwin-arm64";
-      packageName = "@lmdb/lmdb-darwin-arm64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.5.3.tgz";
-        sha512 = "RXwGZ/0eCqtCY8FLTM/koR60w+MXyvBUpToXiIyjOcBnC81tAlTUHrRUavCEWPI9zc9VgvpK3+cbumPyR8BSuA==";
-      };
-    };
-    "@lmdb/lmdb-darwin-x64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-darwin-x64";
-      packageName = "@lmdb/lmdb-darwin-x64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.5.3.tgz";
-        sha512 = "337dNzh5yCdNCTk8kPfoU7jR3otibSlPDGW0vKZT97rKnQMb9tNdto3RtWoGPsQ8hKmlRZpojOJtmwjncq1MoA==";
-      };
-    };
-    "@lmdb/lmdb-linux-arm-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-linux-arm";
-      packageName = "@lmdb/lmdb-linux-arm";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.5.3.tgz";
-        sha512 = "mU2HFJDGwECkoD9dHQEfeTG5mp8hNS2BCfwoiOpVPMeapjYpQz9Uw3FkUjRZ4dGHWKbin40oWHuL0bk2bCx+Sg==";
-      };
-    };
-    "@lmdb/lmdb-linux-arm64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-linux-arm64";
-      packageName = "@lmdb/lmdb-linux-arm64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.5.3.tgz";
-        sha512 = "VJw60Mdgb4n+L0fO1PqfB0C7TyEQolJAC8qpqvG3JoQwvyOv6LH7Ib/WE3wxEW9nuHmVz9jkK7lk5HfWWgoO1Q==";
-      };
-    };
-    "@lmdb/lmdb-linux-x64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-linux-x64";
-      packageName = "@lmdb/lmdb-linux-x64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.5.3.tgz";
-        sha512 = "qaReO5aV8griBDsBr8uBF/faO3ieGjY1RY4p8JvTL6Mu1ylLrTVvOONqKFlNaCwrmUjWw5jnf7VafxDAeQHTow==";
-      };
-    };
-    "@lmdb/lmdb-win32-x64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-win32-x64";
-      packageName = "@lmdb/lmdb-win32-x64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.5.3.tgz";
-        sha512 = "cK+Elf3RjEzrm3SerAhrFWL5oQAsZSJ/LmjL1joIpTfEP1etJJ9CTRvdaV6XLYAxaEkfdhk/9hOvHLbR9yIhCA==";
-      };
-    };
-    "@malept/cross-spawn-promise-2.0.0" = {
-      name = "_at_malept_slash_cross-spawn-promise";
-      packageName = "@malept/cross-spawn-promise";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz";
-        sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==";
-      };
-    };
     "@mapbox/node-pre-gyp-1.0.11" = {
       name = "_at_mapbox_slash_node-pre-gyp";
       packageName = "@mapbox/node-pre-gyp";
@@ -3659,24 +1623,6 @@ let
         sha512 = "2SBN7A/iCVufTmuXdS+W1wY0MZaEyhxlme/NQTlXbTaYWaMGZJMso3YRBNKJJLE1T7NkxsvCVCp7/2QSh8k+JA==";
       };
     };
-    "@noble/curves-1.4.2" = {
-      name = "_at_noble_slash_curves";
-      packageName = "@noble/curves";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz";
-        sha512 = "TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==";
-      };
-    };
-    "@noble/hashes-1.4.0" = {
-      name = "_at_noble_slash_hashes";
-      packageName = "@noble/hashes";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz";
-        sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==";
-      };
-    };
     "@nodelib/fs.scandir-2.1.5" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
@@ -3722,24 +1668,6 @@ let
         sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g==";
       };
     };
-    "@npmcli/fs-1.1.1" = {
-      name = "_at_npmcli_slash_fs";
-      packageName = "@npmcli/fs";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz";
-        sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==";
-      };
-    };
-    "@npmcli/fs-2.1.2" = {
-      name = "_at_npmcli_slash_fs";
-      packageName = "@npmcli/fs";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz";
-        sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==";
-      };
-    };
     "@npmcli/fs-4.0.0" = {
       name = "_at_npmcli_slash_fs";
       packageName = "@npmcli/fs";
@@ -3776,24 +1704,6 @@ let
         sha512 = "tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==";
       };
     };
-    "@npmcli/move-file-1.1.2" = {
-      name = "_at_npmcli_slash_move-file";
-      packageName = "@npmcli/move-file";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz";
-        sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==";
-      };
-    };
-    "@npmcli/move-file-2.0.1" = {
-      name = "_at_npmcli_slash_move-file";
-      packageName = "@npmcli/move-file";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz";
-        sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==";
-      };
-    };
     "@npmcli/name-from-folder-2.0.0" = {
       name = "_at_npmcli_slash_name-from-folder";
       packageName = "@npmcli/name-from-folder";
@@ -3920,42 +1830,6 @@ let
         sha512 = "yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg==";
       };
     };
-    "@one-ini/wasm-0.1.1" = {
-      name = "_at_one-ini_slash_wasm";
-      packageName = "@one-ini/wasm";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz";
-        sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==";
-      };
-    };
-    "@openpgp/hkp-client-0.0.2" = {
-      name = "_at_openpgp_slash_hkp-client";
-      packageName = "@openpgp/hkp-client";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@openpgp/hkp-client/-/hkp-client-0.0.2.tgz";
-        sha512 = "hA71RhqfLfNltZsy/USTQehE2QAVB3eK4xx8p76XtFJy5Zg6gK2XbZvOC/x/yG8i2Ipbyul1DMTMxH9v8rfPKw==";
-      };
-    };
-    "@openpgp/wkd-client-0.0.3" = {
-      name = "_at_openpgp_slash_wkd-client";
-      packageName = "@openpgp/wkd-client";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@openpgp/wkd-client/-/wkd-client-0.0.3.tgz";
-        sha512 = "qe+uWtCJetuG78KhfiQyEA+ZciC/qeECXRj+LCm4m0s98qR2wPwYHRI1u8aFbtkN6G4ZMyKN+opY++fJS5l3vg==";
-      };
-    };
-    "@opentelemetry/api-1.9.0" = {
-      name = "_at_opentelemetry_slash_api";
-      packageName = "@opentelemetry/api";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz";
-        sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==";
-      };
-    };
     "@orval/angular-7.7.0" = {
       name = "_at_orval_slash_angular";
       packageName = "@orval/angular";
@@ -4037,33 +1911,6 @@ let
         sha512 = "h5DiQG/bQL0lEGMRVvVb/FNfrN1Zx3LZSPA+XvF6EpgPiAqzZVcZ+YhYh9YzDAZg0BLsVyS9jBQzANOgoKc7yQ==";
       };
     };
-    "@peculiar/asn1-schema-2.3.15" = {
-      name = "_at_peculiar_slash_asn1-schema";
-      packageName = "@peculiar/asn1-schema";
-      version = "2.3.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.15.tgz";
-        sha512 = "QPeD8UA8axQREpgR5UTAfu2mqQmm97oUqahDtNdBcfj3qAnoXzFdQW+aNf/tD2WVXF8Fhmftxoj0eMIT++gX2w==";
-      };
-    };
-    "@peculiar/json-schema-1.1.12" = {
-      name = "_at_peculiar_slash_json-schema";
-      packageName = "@peculiar/json-schema";
-      version = "1.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz";
-        sha512 = "coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==";
-      };
-    };
-    "@peculiar/webcrypto-1.5.0" = {
-      name = "_at_peculiar_slash_webcrypto";
-      packageName = "@peculiar/webcrypto";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.5.0.tgz";
-        sha512 = "BRs5XUAwiyCDQMsVA9IDvDa7UBR9gAvPHgugOeGng3YN6vJ9JYonyDc0lNczErgtCWtucjR5N7VtaonboD/ezg==";
-      };
-    };
     "@pnpm/config.env-replace-1.1.0" = {
       name = "_at_pnpm_slash_config.env-replace";
       packageName = "@pnpm/config.env-replace";
@@ -4271,15 +2118,6 @@ let
         sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA==";
       };
     };
-    "@polka/url-1.0.0-next.28" = {
-      name = "_at_polka_slash_url";
-      packageName = "@polka/url";
-      version = "1.0.0-next.28";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz";
-        sha512 = "8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==";
-      };
-    };
     "@prisma/config-6.5.0" = {
       name = "_at_prisma_slash_config";
       packageName = "@prisma/config";
@@ -4559,33 +2397,6 @@ let
         sha512 = "bhtGJtetkiqyB/OR506ftC+o98xLQXnOlvFO/zbkTddkLgMdPpyOt2A9Fuu+z4OVigqBiLBkzmR8i0w8xUUAmw==";
       };
     };
-    "@scure/base-1.1.9" = {
-      name = "_at_scure_slash_base";
-      packageName = "@scure/base";
-      version = "1.1.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz";
-        sha512 = "8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==";
-      };
-    };
-    "@scure/bip32-1.4.0" = {
-      name = "_at_scure_slash_bip32";
-      packageName = "@scure/bip32";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz";
-        sha512 = "sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==";
-      };
-    };
-    "@scure/bip39-1.3.0" = {
-      name = "_at_scure_slash_bip39";
-      packageName = "@scure/bip39";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz";
-        sha512 = "disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==";
-      };
-    };
     "@sec-ant/readable-stream-0.4.1" = {
       name = "_at_sec-ant_slash_readable-stream";
       packageName = "@sec-ant/readable-stream";
@@ -4730,33 +2541,6 @@ let
         sha512 = "zNPPB2cro7fr+gPsNPoEir6pzYfJngkik7EnsSD5uMqwzGB8qtMmausS5XO10KM5c1Hfw/hpe1oXf/UoHNZFlg==";
       };
     };
-    "@sideway/address-4.1.5" = {
-      name = "_at_sideway_slash_address";
-      packageName = "@sideway/address";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz";
-        sha512 = "IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==";
-      };
-    };
-    "@sideway/formula-3.0.1" = {
-      name = "_at_sideway_slash_formula";
-      packageName = "@sideway/formula";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz";
-        sha512 = "/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==";
-      };
-    };
-    "@sideway/pinpoint-2.0.0" = {
-      name = "_at_sideway_slash_pinpoint";
-      packageName = "@sideway/pinpoint";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz";
-        sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==";
-      };
-    };
     "@sigstore/bundle-3.1.0" = {
       name = "_at_sigstore_slash_bundle";
       packageName = "@sigstore/bundle";
@@ -4829,15 +2613,6 @@ let
         sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
       };
     };
-    "@sindresorhus/is-4.6.0" = {
-      name = "_at_sindresorhus_slash_is";
-      packageName = "@sindresorhus/is";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz";
-        sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==";
-      };
-    };
     "@sindresorhus/is-5.6.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -4865,483 +2640,6 @@ let
         sha512 = "tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==";
       };
     };
-    "@smithy/abort-controller-4.0.1" = {
-      name = "_at_smithy_slash_abort-controller";
-      packageName = "@smithy/abort-controller";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.1.tgz";
-        sha512 = "fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==";
-      };
-    };
-    "@smithy/chunked-blob-reader-5.0.0" = {
-      name = "_at_smithy_slash_chunked-blob-reader";
-      packageName = "@smithy/chunked-blob-reader";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.0.0.tgz";
-        sha512 = "+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw==";
-      };
-    };
-    "@smithy/chunked-blob-reader-native-4.0.0" = {
-      name = "_at_smithy_slash_chunked-blob-reader-native";
-      packageName = "@smithy/chunked-blob-reader-native";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.0.0.tgz";
-        sha512 = "R9wM2yPmfEMsUmlMlIgSzOyICs0x9uu7UTHoccMyt7BWw8shcGM8HqB355+BZCPBcySvbTYMs62EgEQkNxz2ig==";
-      };
-    };
-    "@smithy/config-resolver-4.0.1" = {
-      name = "_at_smithy_slash_config-resolver";
-      packageName = "@smithy/config-resolver";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.0.1.tgz";
-        sha512 = "Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==";
-      };
-    };
-    "@smithy/core-3.1.5" = {
-      name = "_at_smithy_slash_core";
-      packageName = "@smithy/core";
-      version = "3.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/core/-/core-3.1.5.tgz";
-        sha512 = "HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==";
-      };
-    };
-    "@smithy/credential-provider-imds-4.0.1" = {
-      name = "_at_smithy_slash_credential-provider-imds";
-      packageName = "@smithy/credential-provider-imds";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.1.tgz";
-        sha512 = "l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==";
-      };
-    };
-    "@smithy/eventstream-codec-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-codec";
-      packageName = "@smithy/eventstream-codec";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.0.1.tgz";
-        sha512 = "Q2bCAAR6zXNVtJgifsU16ZjKGqdw/DyecKNgIgi7dlqw04fqDu0mnq+JmGphqheypVc64CYq3azSuCpAdFk2+A==";
-      };
-    };
-    "@smithy/eventstream-serde-browser-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-browser";
-      packageName = "@smithy/eventstream-serde-browser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.0.1.tgz";
-        sha512 = "HbIybmz5rhNg+zxKiyVAnvdM3vkzjE6ccrJ620iPL8IXcJEntd3hnBl+ktMwIy12Te/kyrSbUb8UCdnUT4QEdA==";
-      };
-    };
-    "@smithy/eventstream-serde-config-resolver-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-config-resolver";
-      packageName = "@smithy/eventstream-serde-config-resolver";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.0.1.tgz";
-        sha512 = "lSipaiq3rmHguHa3QFF4YcCM3VJOrY9oq2sow3qlhFY+nBSTF/nrO82MUQRPrxHQXA58J5G1UnU2WuJfi465BA==";
-      };
-    };
-    "@smithy/eventstream-serde-node-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-node";
-      packageName = "@smithy/eventstream-serde-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.0.1.tgz";
-        sha512 = "o4CoOI6oYGYJ4zXo34U8X9szDe3oGjmHgsMGiZM0j4vtNoT+h80TLnkUcrLZR3+E6HIxqW+G+9WHAVfl0GXK0Q==";
-      };
-    };
-    "@smithy/eventstream-serde-universal-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-universal";
-      packageName = "@smithy/eventstream-serde-universal";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.0.1.tgz";
-        sha512 = "Z94uZp0tGJuxds3iEAZBqGU2QiaBHP4YytLUjwZWx+oUeohCsLyUm33yp4MMBmhkuPqSbQCXq5hDet6JGUgHWA==";
-      };
-    };
-    "@smithy/fetch-http-handler-5.0.1" = {
-      name = "_at_smithy_slash_fetch-http-handler";
-      packageName = "@smithy/fetch-http-handler";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.1.tgz";
-        sha512 = "3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==";
-      };
-    };
-    "@smithy/hash-blob-browser-4.0.1" = {
-      name = "_at_smithy_slash_hash-blob-browser";
-      packageName = "@smithy/hash-blob-browser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.0.1.tgz";
-        sha512 = "rkFIrQOKZGS6i1D3gKJ8skJ0RlXqDvb1IyAphksaFOMzkn3v3I1eJ8m7OkLj0jf1McP63rcCEoLlkAn/HjcTRw==";
-      };
-    };
-    "@smithy/hash-node-4.0.1" = {
-      name = "_at_smithy_slash_hash-node";
-      packageName = "@smithy/hash-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.1.tgz";
-        sha512 = "TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==";
-      };
-    };
-    "@smithy/hash-stream-node-4.0.1" = {
-      name = "_at_smithy_slash_hash-stream-node";
-      packageName = "@smithy/hash-stream-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.0.1.tgz";
-        sha512 = "U1rAE1fxmReCIr6D2o/4ROqAQX+GffZpyMt3d7njtGDr2pUNmAKRWa49gsNVhCh2vVAuf3wXzWwNr2YN8PAXIw==";
-      };
-    };
-    "@smithy/invalid-dependency-4.0.1" = {
-      name = "_at_smithy_slash_invalid-dependency";
-      packageName = "@smithy/invalid-dependency";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.1.tgz";
-        sha512 = "gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==";
-      };
-    };
-    "@smithy/is-array-buffer-2.2.0" = {
-      name = "_at_smithy_slash_is-array-buffer";
-      packageName = "@smithy/is-array-buffer";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz";
-        sha512 = "GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==";
-      };
-    };
-    "@smithy/is-array-buffer-4.0.0" = {
-      name = "_at_smithy_slash_is-array-buffer";
-      packageName = "@smithy/is-array-buffer";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz";
-        sha512 = "saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==";
-      };
-    };
-    "@smithy/md5-js-4.0.1" = {
-      name = "_at_smithy_slash_md5-js";
-      packageName = "@smithy/md5-js";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.0.1.tgz";
-        sha512 = "HLZ647L27APi6zXkZlzSFZIjpo8po45YiyjMGJZM3gyDY8n7dPGdmxIIljLm4gPt/7rRvutLTTkYJpZVfG5r+A==";
-      };
-    };
-    "@smithy/middleware-content-length-4.0.1" = {
-      name = "_at_smithy_slash_middleware-content-length";
-      packageName = "@smithy/middleware-content-length";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.1.tgz";
-        sha512 = "OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==";
-      };
-    };
-    "@smithy/middleware-endpoint-4.0.6" = {
-      name = "_at_smithy_slash_middleware-endpoint";
-      packageName = "@smithy/middleware-endpoint";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.0.6.tgz";
-        sha512 = "ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==";
-      };
-    };
-    "@smithy/middleware-retry-4.0.7" = {
-      name = "_at_smithy_slash_middleware-retry";
-      packageName = "@smithy/middleware-retry";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.7.tgz";
-        sha512 = "58j9XbUPLkqAcV1kHzVX/kAR16GT+j7DUZJqwzsxh1jtz7G82caZiGyyFgUvogVfNTg3TeAOIJepGc8TXF4AVQ==";
-      };
-    };
-    "@smithy/middleware-serde-4.0.2" = {
-      name = "_at_smithy_slash_middleware-serde";
-      packageName = "@smithy/middleware-serde";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.2.tgz";
-        sha512 = "Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==";
-      };
-    };
-    "@smithy/middleware-stack-4.0.1" = {
-      name = "_at_smithy_slash_middleware-stack";
-      packageName = "@smithy/middleware-stack";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.1.tgz";
-        sha512 = "dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==";
-      };
-    };
-    "@smithy/node-config-provider-4.0.1" = {
-      name = "_at_smithy_slash_node-config-provider";
-      packageName = "@smithy/node-config-provider";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.0.1.tgz";
-        sha512 = "8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==";
-      };
-    };
-    "@smithy/node-http-handler-4.0.3" = {
-      name = "_at_smithy_slash_node-http-handler";
-      packageName = "@smithy/node-http-handler";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.3.tgz";
-        sha512 = "dYCLeINNbYdvmMLtW0VdhW1biXt+PPCGazzT5ZjKw46mOtdgToQEwjqZSS9/EN8+tNs/RO0cEWG044+YZs97aA==";
-      };
-    };
-    "@smithy/property-provider-4.0.1" = {
-      name = "_at_smithy_slash_property-provider";
-      packageName = "@smithy/property-provider";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.1.tgz";
-        sha512 = "o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==";
-      };
-    };
-    "@smithy/protocol-http-5.0.1" = {
-      name = "_at_smithy_slash_protocol-http";
-      packageName = "@smithy/protocol-http";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.0.1.tgz";
-        sha512 = "TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==";
-      };
-    };
-    "@smithy/querystring-builder-4.0.1" = {
-      name = "_at_smithy_slash_querystring-builder";
-      packageName = "@smithy/querystring-builder";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.1.tgz";
-        sha512 = "wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==";
-      };
-    };
-    "@smithy/querystring-parser-4.0.1" = {
-      name = "_at_smithy_slash_querystring-parser";
-      packageName = "@smithy/querystring-parser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.1.tgz";
-        sha512 = "Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==";
-      };
-    };
-    "@smithy/service-error-classification-4.0.1" = {
-      name = "_at_smithy_slash_service-error-classification";
-      packageName = "@smithy/service-error-classification";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.1.tgz";
-        sha512 = "3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==";
-      };
-    };
-    "@smithy/shared-ini-file-loader-4.0.1" = {
-      name = "_at_smithy_slash_shared-ini-file-loader";
-      packageName = "@smithy/shared-ini-file-loader";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.1.tgz";
-        sha512 = "hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==";
-      };
-    };
-    "@smithy/signature-v4-5.0.1" = {
-      name = "_at_smithy_slash_signature-v4";
-      packageName = "@smithy/signature-v4";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.0.1.tgz";
-        sha512 = "nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==";
-      };
-    };
-    "@smithy/smithy-client-4.1.6" = {
-      name = "_at_smithy_slash_smithy-client";
-      packageName = "@smithy/smithy-client";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.1.6.tgz";
-        sha512 = "UYDolNg6h2O0L+cJjtgSyKKvEKCOa/8FHYJnBobyeoeWDmNpXjwOAtw16ezyeu1ETuuLEOZbrynK0ZY1Lx9Jbw==";
-      };
-    };
-    "@smithy/types-4.1.0" = {
-      name = "_at_smithy_slash_types";
-      packageName = "@smithy/types";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/types/-/types-4.1.0.tgz";
-        sha512 = "enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==";
-      };
-    };
-    "@smithy/url-parser-4.0.1" = {
-      name = "_at_smithy_slash_url-parser";
-      packageName = "@smithy/url-parser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.1.tgz";
-        sha512 = "gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==";
-      };
-    };
-    "@smithy/util-base64-4.0.0" = {
-      name = "_at_smithy_slash_util-base64";
-      packageName = "@smithy/util-base64";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz";
-        sha512 = "CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==";
-      };
-    };
-    "@smithy/util-body-length-browser-4.0.0" = {
-      name = "_at_smithy_slash_util-body-length-browser";
-      packageName = "@smithy/util-body-length-browser";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz";
-        sha512 = "sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==";
-      };
-    };
-    "@smithy/util-body-length-node-4.0.0" = {
-      name = "_at_smithy_slash_util-body-length-node";
-      packageName = "@smithy/util-body-length-node";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz";
-        sha512 = "q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==";
-      };
-    };
-    "@smithy/util-buffer-from-2.2.0" = {
-      name = "_at_smithy_slash_util-buffer-from";
-      packageName = "@smithy/util-buffer-from";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz";
-        sha512 = "IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==";
-      };
-    };
-    "@smithy/util-buffer-from-4.0.0" = {
-      name = "_at_smithy_slash_util-buffer-from";
-      packageName = "@smithy/util-buffer-from";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz";
-        sha512 = "9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==";
-      };
-    };
-    "@smithy/util-config-provider-4.0.0" = {
-      name = "_at_smithy_slash_util-config-provider";
-      packageName = "@smithy/util-config-provider";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz";
-        sha512 = "L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==";
-      };
-    };
-    "@smithy/util-defaults-mode-browser-4.0.7" = {
-      name = "_at_smithy_slash_util-defaults-mode-browser";
-      packageName = "@smithy/util-defaults-mode-browser";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.7.tgz";
-        sha512 = "CZgDDrYHLv0RUElOsmZtAnp1pIjwDVCSuZWOPhIOBvG36RDfX1Q9+6lS61xBf+qqvHoqRjHxgINeQz47cYFC2Q==";
-      };
-    };
-    "@smithy/util-defaults-mode-node-4.0.7" = {
-      name = "_at_smithy_slash_util-defaults-mode-node";
-      packageName = "@smithy/util-defaults-mode-node";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.7.tgz";
-        sha512 = "79fQW3hnfCdrfIi1soPbK3zmooRFnLpSx3Vxi6nUlqaaQeC5dm8plt4OTNDNqEEEDkvKghZSaoti684dQFVrGQ==";
-      };
-    };
-    "@smithy/util-endpoints-3.0.1" = {
-      name = "_at_smithy_slash_util-endpoints";
-      packageName = "@smithy/util-endpoints";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.1.tgz";
-        sha512 = "zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==";
-      };
-    };
-    "@smithy/util-hex-encoding-4.0.0" = {
-      name = "_at_smithy_slash_util-hex-encoding";
-      packageName = "@smithy/util-hex-encoding";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz";
-        sha512 = "Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==";
-      };
-    };
-    "@smithy/util-middleware-4.0.1" = {
-      name = "_at_smithy_slash_util-middleware";
-      packageName = "@smithy/util-middleware";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.1.tgz";
-        sha512 = "HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==";
-      };
-    };
-    "@smithy/util-retry-4.0.1" = {
-      name = "_at_smithy_slash_util-retry";
-      packageName = "@smithy/util-retry";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.1.tgz";
-        sha512 = "WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==";
-      };
-    };
-    "@smithy/util-stream-4.1.2" = {
-      name = "_at_smithy_slash_util-stream";
-      packageName = "@smithy/util-stream";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.1.2.tgz";
-        sha512 = "44PKEqQ303d3rlQuiDpcCcu//hV8sn+u2JBo84dWCE0rvgeiVl0IlLMagbU++o0jCWhYCsHaAt9wZuZqNe05Hw==";
-      };
-    };
-    "@smithy/util-uri-escape-4.0.0" = {
-      name = "_at_smithy_slash_util-uri-escape";
-      packageName = "@smithy/util-uri-escape";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz";
-        sha512 = "77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==";
-      };
-    };
-    "@smithy/util-utf8-2.3.0" = {
-      name = "_at_smithy_slash_util-utf8";
-      packageName = "@smithy/util-utf8";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz";
-        sha512 = "R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==";
-      };
-    };
-    "@smithy/util-utf8-4.0.0" = {
-      name = "_at_smithy_slash_util-utf8";
-      packageName = "@smithy/util-utf8";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz";
-        sha512 = "b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==";
-      };
-    };
-    "@smithy/util-waiter-4.0.2" = {
-      name = "_at_smithy_slash_util-waiter";
-      packageName = "@smithy/util-waiter";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.0.2.tgz";
-        sha512 = "piUTHyp2Axx3p/kc2CIJkYSv0BAaheBQmbACZgQSSfWUumWNW+R1lL+H9PDBxKJkvOeEX+hKYEFiwO8xagL8AQ==";
-      };
-    };
     "@socket.io/component-emitter-3.1.2" = {
       name = "_at_socket.io_slash_component-emitter";
       packageName = "@socket.io/component-emitter";
@@ -5513,24 +2811,6 @@ let
         sha512 = "Pb6M8TDO9DtSVla9yXSTAxmo9GVEouq5P40DWXdOie69bXogZTkgvopCq+yEvTMA0F6PEvdJmbtTV3ccIp11VQ==";
       };
     };
-    "@stylelint/postcss-css-in-js-0.37.3" = {
-      name = "_at_stylelint_slash_postcss-css-in-js";
-      packageName = "@stylelint/postcss-css-in-js";
-      version = "0.37.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz";
-        sha512 = "scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==";
-      };
-    };
-    "@stylelint/postcss-markdown-0.36.2" = {
-      name = "_at_stylelint_slash_postcss-markdown";
-      packageName = "@stylelint/postcss-markdown";
-      version = "0.36.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz";
-        sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==";
-      };
-    };
     "@sveltejs/acorn-typescript-1.0.5" = {
       name = "_at_sveltejs_slash_acorn-typescript";
       packageName = "@sveltejs/acorn-typescript";
@@ -5594,15 +2874,6 @@ let
         sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
       };
     };
-    "@szmarczak/http-timer-4.0.6" = {
-      name = "_at_szmarczak_slash_http-timer";
-      packageName = "@szmarczak/http-timer";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz";
-        sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==";
-      };
-    };
     "@szmarczak/http-timer-5.0.1" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
@@ -5630,177 +2901,6 @@ let
         sha512 = "DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==";
       };
     };
-    "@tinyhttp/accepts-2.2.3" = {
-      name = "_at_tinyhttp_slash_accepts";
-      packageName = "@tinyhttp/accepts";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.3.tgz";
-        sha512 = "9pQN6pJAJOU3McmdJWTcyq7LLFW8Lj5q+DadyKcvp+sxMkEpktKX5sbfJgJuOvjk6+1xWl7pe0YL1US1vaO/1w==";
-      };
-    };
-    "@tinyhttp/app-2.5.2" = {
-      name = "_at_tinyhttp_slash_app";
-      packageName = "@tinyhttp/app";
-      version = "2.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.5.2.tgz";
-        sha512 = "DcB3Y8GQppLQlO2VxRYF7LzTEAoZb+VRQXuIsErcu2fNaM1xdx6NQZDso5rlZUiaeg6KYYRfU34N4XkZbv6jSA==";
-      };
-    };
-    "@tinyhttp/content-disposition-2.2.2" = {
-      name = "_at_tinyhttp_slash_content-disposition";
-      packageName = "@tinyhttp/content-disposition";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.2.tgz";
-        sha512 = "crXw1txzrS36huQOyQGYFvhTeLeG0Si1xu+/l6kXUVYpE0TjFjEZRqTbuadQLfKGZ0jaI+jJoRyqaWwxOSHW2g==";
-      };
-    };
-    "@tinyhttp/content-type-0.1.4" = {
-      name = "_at_tinyhttp_slash_content-type";
-      packageName = "@tinyhttp/content-type";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/content-type/-/content-type-0.1.4.tgz";
-        sha512 = "dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ==";
-      };
-    };
-    "@tinyhttp/cookie-2.1.1" = {
-      name = "_at_tinyhttp_slash_cookie";
-      packageName = "@tinyhttp/cookie";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.1.tgz";
-        sha512 = "h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA==";
-      };
-    };
-    "@tinyhttp/cookie-signature-2.1.1" = {
-      name = "_at_tinyhttp_slash_cookie-signature";
-      packageName = "@tinyhttp/cookie-signature";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz";
-        sha512 = "VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw==";
-      };
-    };
-    "@tinyhttp/cors-2.0.1" = {
-      name = "_at_tinyhttp_slash_cors";
-      packageName = "@tinyhttp/cors";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.1.tgz";
-        sha512 = "qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A==";
-      };
-    };
-    "@tinyhttp/encode-url-2.1.1" = {
-      name = "_at_tinyhttp_slash_encode-url";
-      packageName = "@tinyhttp/encode-url";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/encode-url/-/encode-url-2.1.1.tgz";
-        sha512 = "AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw==";
-      };
-    };
-    "@tinyhttp/etag-2.1.2" = {
-      name = "_at_tinyhttp_slash_etag";
-      packageName = "@tinyhttp/etag";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.2.tgz";
-        sha512 = "j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw==";
-      };
-    };
-    "@tinyhttp/forwarded-2.1.2" = {
-      name = "_at_tinyhttp_slash_forwarded";
-      packageName = "@tinyhttp/forwarded";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.2.tgz";
-        sha512 = "9H/eulJ68ElY/+zYpTpNhZ7vxGV+cnwaR6+oQSm7bVgZMyuQfgROW/qvZuhmgDTIxnGMXst+Ba4ij6w6Krcs3w==";
-      };
-    };
-    "@tinyhttp/logger-2.1.0" = {
-      name = "_at_tinyhttp_slash_logger";
-      packageName = "@tinyhttp/logger";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/logger/-/logger-2.1.0.tgz";
-        sha512 = "Ma1fJ9CwUbn9r61/4HW6+nflsVoslpOnCrfQ6UeZq7GGIgwLzofms3HoSVG7M+AyRMJpxlfcDdbH5oFVroDMKA==";
-      };
-    };
-    "@tinyhttp/proxy-addr-2.2.1" = {
-      name = "_at_tinyhttp_slash_proxy-addr";
-      packageName = "@tinyhttp/proxy-addr";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.2.1.tgz";
-        sha512 = "BicqMqVI91hHq2BQmnqJUh0FQUnx7DncwSGgu2ghlh+JZG2rHK2ZN/rXkfhrx1rrUw6hnd0L36O8GPMh01+dDQ==";
-      };
-    };
-    "@tinyhttp/req-2.2.5" = {
-      name = "_at_tinyhttp_slash_req";
-      packageName = "@tinyhttp/req";
-      version = "2.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.5.tgz";
-        sha512 = "trfsXwtmsNjMcGKcLJ+45h912kLRqBQCQD06ams3Tq0kf4gHLxjHjoYOC1Z9yGjOn81XllRx8wqvnvr+Kbe3gw==";
-      };
-    };
-    "@tinyhttp/res-2.2.5" = {
-      name = "_at_tinyhttp_slash_res";
-      packageName = "@tinyhttp/res";
-      version = "2.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.5.tgz";
-        sha512 = "yBsqjWygpuKAVz4moWlP4hqzwiDDqfrn2mA0wviJAcgvGiyOErtlQwXY7aj3aPiCpURvxvEFO//Gdy6yV+xEpA==";
-      };
-    };
-    "@tinyhttp/router-2.2.3" = {
-      name = "_at_tinyhttp_slash_router";
-      packageName = "@tinyhttp/router";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/router/-/router-2.2.3.tgz";
-        sha512 = "O0MQqWV3Vpg/uXsMYg19XsIgOhwjyhTYWh51Qng7bxqXixxx2PEvZWnFjP7c84K7kU/nUX41KpkEBTLnznk9/Q==";
-      };
-    };
-    "@tinyhttp/send-2.2.3" = {
-      name = "_at_tinyhttp_slash_send";
-      packageName = "@tinyhttp/send";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.3.tgz";
-        sha512 = "o4cVHHGQ8WjVBS8UT0EE/2WnjoybrfXikHwsRoNlG1pfrC/Sd01u1N4Te8cOd/9aNGLr4mGxWb5qTm2RRtEi7g==";
-      };
-    };
-    "@tinyhttp/type-is-2.2.4" = {
-      name = "_at_tinyhttp_slash_type-is";
-      packageName = "@tinyhttp/type-is";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.4.tgz";
-        sha512 = "7F328NheridwjIfefBB2j1PEcKKABpADgv7aCJaE8x8EON77ZFrAkI3Rir7pGjopV7V9MBmW88xUQigBEX2rmQ==";
-      };
-    };
-    "@tinyhttp/url-2.1.1" = {
-      name = "_at_tinyhttp_slash_url";
-      packageName = "@tinyhttp/url";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/url/-/url-2.1.1.tgz";
-        sha512 = "POJeq2GQ5jI7Zrdmj22JqOijB5/GeX+LEX7DUdml1hUnGbJOTWDx7zf2b5cCERj7RoXL67zTgyzVblBJC+NJWg==";
-      };
-    };
-    "@tinyhttp/vary-0.1.3" = {
-      name = "_at_tinyhttp_slash_vary";
-      packageName = "@tinyhttp/vary";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/vary/-/vary-0.1.3.tgz";
-        sha512 = "SoL83sQXAGiHN1jm2VwLUWQSQeDAAl1ywOm6T0b0Cg1CZhVsjoiZadmjhxF6FHCCY7OHHVaLnTgSMxTPIDLxMg==";
-      };
-    };
     "@tokenizer/token-0.3.0" = {
       name = "_at_tokenizer_slash_token";
       packageName = "@tokenizer/token";
@@ -5810,15 +2910,6 @@ let
         sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==";
       };
     };
-    "@tootallnate/once-1.1.2" = {
-      name = "_at_tootallnate_slash_once";
-      packageName = "@tootallnate/once";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz";
-        sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==";
-      };
-    };
     "@tootallnate/once-2.0.0" = {
       name = "_at_tootallnate_slash_once";
       packageName = "@tootallnate/once";
@@ -5927,33 +3018,6 @@ let
         sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==";
       };
     };
-    "@types/atob-2.1.4" = {
-      name = "_at_types_slash_atob";
-      packageName = "@types/atob";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.4.tgz";
-        sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw==";
-      };
-    };
-    "@types/body-parser-1.19.5" = {
-      name = "_at_types_slash_body-parser";
-      packageName = "@types/body-parser";
-      version = "1.19.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz";
-        sha512 = "fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==";
-      };
-    };
-    "@types/cacheable-request-6.0.3" = {
-      name = "_at_types_slash_cacheable-request";
-      packageName = "@types/cacheable-request";
-      version = "6.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz";
-        sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==";
-      };
-    };
     "@types/cli-progress-3.11.6" = {
       name = "_at_types_slash_cli-progress";
       packageName = "@types/cli-progress";
@@ -5963,24 +3027,6 @@ let
         sha512 = "cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA==";
       };
     };
-    "@types/commander-2.12.5" = {
-      name = "_at_types_slash_commander";
-      packageName = "@types/commander";
-      version = "2.12.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/commander/-/commander-2.12.5.tgz";
-        sha512 = "YXGZ/rz+s57VbzcvEV9fUoXeJlBt5HaKu5iUheiIWNsJs23bz6AnRuRiZBRVBLYyPnixNvVnuzM5pSaxr8Yp/g==";
-      };
-    };
-    "@types/common-tags-1.8.4" = {
-      name = "_at_types_slash_common-tags";
-      packageName = "@types/common-tags";
-      version = "1.8.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.4.tgz";
-        sha512 = "S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg==";
-      };
-    };
     "@types/concat-stream-2.0.3" = {
       name = "_at_types_slash_concat-stream";
       packageName = "@types/concat-stream";
@@ -5990,15 +3036,6 @@ let
         sha512 = "3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==";
       };
     };
-    "@types/connect-3.4.38" = {
-      name = "_at_types_slash_connect";
-      packageName = "@types/connect";
-      version = "3.4.38";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz";
-        sha512 = "K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==";
-      };
-    };
     "@types/conventional-commits-parser-5.0.1" = {
       name = "_at_types_slash_conventional-commits-parser";
       packageName = "@types/conventional-commits-parser";
@@ -6008,15 +3045,6 @@ let
         sha512 = "7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ==";
       };
     };
-    "@types/cookiejar-2.1.5" = {
-      name = "_at_types_slash_cookiejar";
-      packageName = "@types/cookiejar";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz";
-        sha512 = "he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==";
-      };
-    };
     "@types/cors-2.8.17" = {
       name = "_at_types_slash_cors";
       packageName = "@types/cors";
@@ -6035,15 +3063,6 @@ let
         sha512 = "vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==";
       };
     };
-    "@types/diff-3.5.8" = {
-      name = "_at_types_slash_diff";
-      packageName = "@types/diff";
-      version = "3.5.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.8.tgz";
-        sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A==";
-      };
-    };
     "@types/es-aggregate-error-1.0.6" = {
       name = "_at_types_slash_es-aggregate-error";
       packageName = "@types/es-aggregate-error";
@@ -6062,24 +3081,6 @@ let
         sha512 = "03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==";
       };
     };
-    "@types/eslint-9.6.1" = {
-      name = "_at_types_slash_eslint";
-      packageName = "@types/eslint";
-      version = "9.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz";
-        sha512 = "FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==";
-      };
-    };
-    "@types/eslint-scope-3.7.7" = {
-      name = "_at_types_slash_eslint-scope";
-      packageName = "@types/eslint-scope";
-      version = "3.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz";
-        sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==";
-      };
-    };
     "@types/estree-1.0.6" = {
       name = "_at_types_slash_estree";
       packageName = "@types/estree";
@@ -6098,24 +3099,6 @@ let
         sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==";
       };
     };
-    "@types/express-4.17.21" = {
-      name = "_at_types_slash_express";
-      packageName = "@types/express";
-      version = "4.17.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz";
-        sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==";
-      };
-    };
-    "@types/express-serve-static-core-4.19.6" = {
-      name = "_at_types_slash_express-serve-static-core";
-      packageName = "@types/express-serve-static-core";
-      version = "4.19.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz";
-        sha512 = "N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==";
-      };
-    };
     "@types/geojson-7946.0.4" = {
       name = "_at_types_slash_geojson";
       packageName = "@types/geojson";
@@ -6161,24 +3144,6 @@ let
         sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==";
       };
     };
-    "@types/http-errors-2.0.4" = {
-      name = "_at_types_slash_http-errors";
-      packageName = "@types/http-errors";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz";
-        sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==";
-      };
-    };
-    "@types/inquirer-6.5.0" = {
-      name = "_at_types_slash_inquirer";
-      packageName = "@types/inquirer";
-      version = "6.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-6.5.0.tgz";
-        sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==";
-      };
-    };
     "@types/is-empty-1.2.3" = {
       name = "_at_types_slash_is-empty";
       packageName = "@types/is-empty";
@@ -6206,15 +3171,6 @@ let
         sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==";
       };
     };
-    "@types/keyv-3.1.4" = {
-      name = "_at_types_slash_keyv";
-      packageName = "@types/keyv";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz";
-        sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==";
-      };
-    };
     "@types/linkify-it-5.0.0" = {
       name = "_at_types_slash_linkify-it";
       packageName = "@types/linkify-it";
@@ -6269,15 +3225,6 @@ let
         sha512 = "RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==";
       };
     };
-    "@types/mime-1.3.5" = {
-      name = "_at_types_slash_mime";
-      packageName = "@types/mime";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz";
-        sha512 = "/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==";
-      };
-    };
     "@types/minimatch-3.0.5" = {
       name = "_at_types_slash_minimatch";
       packageName = "@types/minimatch";
@@ -6323,15 +3270,6 @@ let
         sha512 = "CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==";
       };
     };
-    "@types/nanoid-3.0.0" = {
-      name = "_at_types_slash_nanoid";
-      packageName = "@types/nanoid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/nanoid/-/nanoid-3.0.0.tgz";
-        sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ==";
-      };
-    };
     "@types/nlcst-1.0.4" = {
       name = "_at_types_slash_nlcst";
       packageName = "@types/nlcst";
@@ -6440,24 +3378,6 @@ let
         sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==";
       };
     };
-    "@types/qs-6.9.18" = {
-      name = "_at_types_slash_qs";
-      packageName = "@types/qs";
-      version = "6.9.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz";
-        sha512 = "kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==";
-      };
-    };
-    "@types/range-parser-1.2.7" = {
-      name = "_at_types_slash_range-parser";
-      packageName = "@types/range-parser";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz";
-        sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==";
-      };
-    };
     "@types/react-19.0.10" = {
       name = "_at_types_slash_react";
       packageName = "@types/react";
@@ -6467,15 +3387,6 @@ let
         sha512 = "JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==";
       };
     };
-    "@types/responselike-1.0.3" = {
-      name = "_at_types_slash_responselike";
-      packageName = "@types/responselike";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz";
-        sha512 = "H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==";
-      };
-    };
     "@types/semver-7.5.8" = {
       name = "_at_types_slash_semver";
       packageName = "@types/semver";
@@ -6485,33 +3396,6 @@ let
         sha512 = "I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==";
       };
     };
-    "@types/send-0.17.4" = {
-      name = "_at_types_slash_send";
-      packageName = "@types/send";
-      version = "0.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz";
-        sha512 = "x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==";
-      };
-    };
-    "@types/serve-static-1.15.7" = {
-      name = "_at_types_slash_serve-static";
-      packageName = "@types/serve-static";
-      version = "1.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz";
-        sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==";
-      };
-    };
-    "@types/superagent-3.8.2" = {
-      name = "_at_types_slash_superagent";
-      packageName = "@types/superagent";
-      version = "3.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.2.tgz";
-        sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA==";
-      };
-    };
     "@types/supports-color-8.1.3" = {
       name = "_at_types_slash_supports-color";
       packageName = "@types/supports-color";
@@ -6521,15 +3405,6 @@ let
         sha512 = "Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg==";
       };
     };
-    "@types/through-0.0.33" = {
-      name = "_at_types_slash_through";
-      packageName = "@types/through";
-      version = "0.0.33";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz";
-        sha512 = "HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==";
-      };
-    };
     "@types/triple-beam-1.3.5" = {
       name = "_at_types_slash_triple-beam";
       packageName = "@types/triple-beam";
@@ -6593,15 +3468,6 @@ let
         sha512 = "oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==";
       };
     };
-    "@types/yoga-layout-1.9.2" = {
-      name = "_at_types_slash_yoga-layout";
-      packageName = "@types/yoga-layout";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.2.tgz";
-        sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==";
-      };
-    };
     "@ungap/structured-clone-1.3.0" = {
       name = "_at_ungap_slash_structured-clone";
       packageName = "@ungap/structured-clone";
@@ -6800,429 +3666,6 @@ let
         sha512 = "/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==";
       };
     };
-    "@webassemblyjs/ast-1.11.1" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz";
-        sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==";
-      };
-    };
-    "@webassemblyjs/ast-1.14.1" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz";
-        sha512 = "nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==";
-      };
-    };
-    "@webassemblyjs/ast-1.8.1" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.1.tgz";
-        sha512 = "gDrC14Ae2b4gP9vYdCzx6ytY4LuYoH3I0h0QzU9RPifGPgjXz8F3s5g9632P7Wf39vQQg6XQ0Bfv29rc5RoTmw==";
-      };
-    };
-    "@webassemblyjs/floating-point-hex-parser-1.11.1" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz";
-        sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==";
-      };
-    };
-    "@webassemblyjs/floating-point-hex-parser-1.13.2" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz";
-        sha512 = "6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==";
-      };
-    };
-    "@webassemblyjs/floating-point-hex-parser-1.8.1" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.1.tgz";
-        sha512 = "g50x4xV7o2b39pB+uppF3kibFXhb9Dl4Jj3fj18eqWPGBgabreIwQmw3B5Uc6Y7Ec7ZZJ8TrUe79swN3iBaPDQ==";
-      };
-    };
-    "@webassemblyjs/helper-api-error-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz";
-        sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==";
-      };
-    };
-    "@webassemblyjs/helper-api-error-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz";
-        sha512 = "U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==";
-      };
-    };
-    "@webassemblyjs/helper-api-error-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.1.tgz";
-        sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w==";
-      };
-    };
-    "@webassemblyjs/helper-buffer-1.14.1" = {
-      name = "_at_webassemblyjs_slash_helper-buffer";
-      packageName = "@webassemblyjs/helper-buffer";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz";
-        sha512 = "jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==";
-      };
-    };
-    "@webassemblyjs/helper-buffer-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-buffer";
-      packageName = "@webassemblyjs/helper-buffer";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.1.tgz";
-        sha512 = "ex3cnmE6V0JfCBIesxF70vsPvh/QNOfaIsL5N0lkiJjVDl65YjH/WZxLe0nTuIuvVQhZH7DdRzUm0G9g12YACg==";
-      };
-    };
-    "@webassemblyjs/helper-code-frame-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-code-frame";
-      packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.11.1.tgz";
-        sha512 = "mPd+wiLANX+0WdXre6/nVufpukwfGBzolYCrzx+QtpUUa9FthKTr+mdg0yVWgs9W7zhOE3tCOK/ffqpu4rsJag==";
-      };
-    };
-    "@webassemblyjs/helper-code-frame-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-code-frame";
-      packageName = "@webassemblyjs/helper-code-frame";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.1.tgz";
-        sha512 = "vSs2ObU/pbPXrvMqfpEUnvTcvlhwHT3ochBdekn+cv5zYR1wtmAIj+UXrmzbkBQYff/yTrZgaeqkFaT3fLLOrA==";
-      };
-    };
-    "@webassemblyjs/helper-compiler-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-compiler";
-      packageName = "@webassemblyjs/helper-compiler";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-compiler/-/helper-compiler-1.11.1.tgz";
-        sha512 = "4fhcksfjZlUO+A6BoHhq+jqIA0IoTCALO7lthg88oSvMnDwI7MLydC0Dxy9L9h8/VX6rgxn+Ks3qFFvUv9TAWQ==";
-      };
-    };
-    "@webassemblyjs/helper-flatten-ast-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-flatten-ast";
-      packageName = "@webassemblyjs/helper-flatten-ast";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-flatten-ast/-/helper-flatten-ast-1.11.1.tgz";
-        sha512 = "fyr0qH03eF/iH8Cos52Z5kE+pdOj5m/ZeCIKxfezDf0r/vmukoMgmLt9gH5u6T1wt7hZHXjV1ocNoqBP+DBgeg==";
-      };
-    };
-    "@webassemblyjs/helper-fsm-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-fsm";
-      packageName = "@webassemblyjs/helper-fsm";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.11.1.tgz";
-        sha512 = "k+B+H6RO3f8xDborqpvTS5T5xp43MmytDSJbsbDmuMIN8yhCs7Oyu7+s08noYkDplj2rRlcq3iW9eGMhY7jxmg==";
-      };
-    };
-    "@webassemblyjs/helper-fsm-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-fsm";
-      packageName = "@webassemblyjs/helper-fsm";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.1.tgz";
-        sha512 = "WeXD3ZkKi2wpAXqPW+COawoNb0Vcu3OGoaQv8/cL3VpTfGO85ZN30h/6CjUHLISGZtpZxQu3D7AuJmI/rlEqAw==";
-      };
-    };
-    "@webassemblyjs/helper-module-context-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-module-context";
-      packageName = "@webassemblyjs/helper-module-context";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.1.tgz";
-        sha512 = "657xpRy6lptA7oCIgOKQAHElsgAXliqutMPLjoEL2T5Uyp1cIDUH7axmphu7bb5U+ZUpwApnZHvdvyJYGDOxsQ==";
-      };
-    };
-    "@webassemblyjs/helper-numbers-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-numbers";
-      packageName = "@webassemblyjs/helper-numbers";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz";
-        sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==";
-      };
-    };
-    "@webassemblyjs/helper-numbers-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-numbers";
-      packageName = "@webassemblyjs/helper-numbers";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz";
-        sha512 = "FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==";
-      };
-    };
-    "@webassemblyjs/helper-wasm-bytecode-1.11.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz";
-        sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==";
-      };
-    };
-    "@webassemblyjs/helper-wasm-bytecode-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz";
-        sha512 = "3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==";
-      };
-    };
-    "@webassemblyjs/helper-wasm-bytecode-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.1.tgz";
-        sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w==";
-      };
-    };
-    "@webassemblyjs/helper-wasm-section-1.14.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-section";
-      packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz";
-        sha512 = "ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==";
-      };
-    };
-    "@webassemblyjs/helper-wasm-section-1.8.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-section";
-      packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.1.tgz";
-        sha512 = "FlNdlARr+mcP8XL+wg6bXqgC+0ZwnltqXExw63e9cgK84bAdTwKnfX9k6CKg8qvK5e/d9dUmk0dkVrkyEpKx5w==";
-      };
-    };
-    "@webassemblyjs/ieee754-1.11.1" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz";
-        sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==";
-      };
-    };
-    "@webassemblyjs/ieee754-1.13.2" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz";
-        sha512 = "4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==";
-      };
-    };
-    "@webassemblyjs/ieee754-1.8.1" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.1.tgz";
-        sha512 = "Pq3IQR3uay+rFC0qIgg6xvD+uu0a9QEWDCRihHuU9wmOBFW3Lda/ObnO0HjC7XUJ8A9h4xExaa1w5TsSk+DxIQ==";
-      };
-    };
-    "@webassemblyjs/leb128-1.11.1" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz";
-        sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==";
-      };
-    };
-    "@webassemblyjs/leb128-1.13.2" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz";
-        sha512 = "Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==";
-      };
-    };
-    "@webassemblyjs/leb128-1.8.1" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.1.tgz";
-        sha512 = "Ir8M3hgTzFLEOKmMMH44neM6sLESfEoSCjNsOInETxbSpPY1MKOsFSAxCUaeXhjtLQfflCCdjgSsU+2veP6SGw==";
-      };
-    };
-    "@webassemblyjs/utf8-1.11.1" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz";
-        sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==";
-      };
-    };
-    "@webassemblyjs/utf8-1.13.2" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz";
-        sha512 = "3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==";
-      };
-    };
-    "@webassemblyjs/utf8-1.8.1" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.1.tgz";
-        sha512 = "I5QQEb5ajQ99ARiyDrVQM/2nvyFFG0tF1TX2Ql7dOjw5GRT6P4FF+gRk7OeAUtI1CLyffUNWbIvpJz13crGSxw==";
-      };
-    };
-    "@webassemblyjs/validation-1.11.1" = {
-      name = "_at_webassemblyjs_slash_validation";
-      packageName = "@webassemblyjs/validation";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/validation/-/validation-1.11.1.tgz";
-        sha512 = "qNByLv/qST8x4CshQ8vUuX/+OebI9gK+FHkGPMnLnwALKFJOG0jIxG8TXaf2L+fVHNyd96qhsZ/GL54G3KTjpg==";
-      };
-    };
-    "@webassemblyjs/wasm-edit-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-edit";
-      packageName = "@webassemblyjs/wasm-edit";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz";
-        sha512 = "RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==";
-      };
-    };
-    "@webassemblyjs/wasm-gen-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-gen";
-      packageName = "@webassemblyjs/wasm-gen";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz";
-        sha512 = "AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==";
-      };
-    };
-    "@webassemblyjs/wasm-gen-1.8.1" = {
-      name = "_at_webassemblyjs_slash_wasm-gen";
-      packageName = "@webassemblyjs/wasm-gen";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.1.tgz";
-        sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug==";
-      };
-    };
-    "@webassemblyjs/wasm-opt-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-opt";
-      packageName = "@webassemblyjs/wasm-opt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz";
-        sha512 = "PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==";
-      };
-    };
-    "@webassemblyjs/wasm-parser-1.11.1" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz";
-        sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==";
-      };
-    };
-    "@webassemblyjs/wasm-parser-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz";
-        sha512 = "JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==";
-      };
-    };
-    "@webassemblyjs/wasm-parser-1.8.1" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.1.tgz";
-        sha512 = "k63WJZdIjTQgZt+cn8rsIEvW0aNKttGip6ygTE/ZPXKZsMTk0G5xyw+MQxphbvt/GYbNu5DdxGN/7WGybO95TA==";
-      };
-    };
-    "@webassemblyjs/wast-parser-1.11.1" = {
-      name = "_at_webassemblyjs_slash_wast-parser";
-      packageName = "@webassemblyjs/wast-parser";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.11.1.tgz";
-        sha512 = "qnd52euxGXBO27fC8SQTqT0HAuDauAk3EJpp1yw68mtdHO6I3YpiRMJK/dvSKU75saT/uRoSgiyfW9vajh7dhA==";
-      };
-    };
-    "@webassemblyjs/wast-parser-1.8.1" = {
-      name = "_at_webassemblyjs_slash_wast-parser";
-      packageName = "@webassemblyjs/wast-parser";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.1.tgz";
-        sha512 = "iXjhXGhZeZIAnWkHD2G4ZOx8x5GYux5dwHuQL/AU8jb2H3BxolxVvNdpDmBTQPKDAgAAEeCFDnftNf4xNR9KMQ==";
-      };
-    };
-    "@webassemblyjs/wast-printer-1.11.1" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz";
-        sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==";
-      };
-    };
-    "@webassemblyjs/wast-printer-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz";
-        sha512 = "kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==";
-      };
-    };
-    "@webassemblyjs/wast-printer-1.8.1" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.1.tgz";
-        sha512 = "YYRBpDCBLeYJBO+sVapLRkEE/+wrjv1O03IEybkqyls3sCZqhu3ZXjJwMSMCgFEyYP2MrdZvqL/dz2RBnULTbA==";
-      };
-    };
     "@xmldom/xmldom-0.8.10" = {
       name = "_at_xmldom_slash_xmldom";
       packageName = "@xmldom/xmldom";
@@ -7241,249 +3684,6 @@ let
         sha512 = "p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A==";
       };
     };
-    "@xmpp/base64-0.13.2" = {
-      name = "_at_xmpp_slash_base64";
-      packageName = "@xmpp/base64";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/base64/-/base64-0.13.2.tgz";
-        sha512 = "RDEq66sW/jqj2HZKoRvnIvlRJMRLEGa0EGyJ0yPCF1+KijmTqrWr1PxZAol850QizXlqpvo8MS8OCFWMryX7RQ==";
-      };
-    };
-    "@xmpp/client-0.13.4" = {
-      name = "_at_xmpp_slash_client";
-      packageName = "@xmpp/client";
-      version = "0.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/client/-/client-0.13.4.tgz";
-        sha512 = "reCdmmDkXjlEXLmMB8tGLyi+2u5KJScAg2l5c0WcwwqlXFMvmIQf5Nf4boXW6rsiLnUwWyAovtx9OzMiLuODIg==";
-      };
-    };
-    "@xmpp/client-core-0.13.3" = {
-      name = "_at_xmpp_slash_client-core";
-      packageName = "@xmpp/client-core";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/client-core/-/client-core-0.13.3.tgz";
-        sha512 = "pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA==";
-      };
-    };
-    "@xmpp/connection-0.13.3" = {
-      name = "_at_xmpp_slash_connection";
-      packageName = "@xmpp/connection";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/connection/-/connection-0.13.3.tgz";
-        sha512 = "EM6/wLUJ6MFJl7Kb+qwQut1gLDp7G107KTOB1W/GljGMd7ydD2Bn0BJt2AAx8EGPve9G2jjhV3+jJmu7KwK4rQ==";
-      };
-    };
-    "@xmpp/connection-tcp-0.13.3" = {
-      name = "_at_xmpp_slash_connection-tcp";
-      packageName = "@xmpp/connection-tcp";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/connection-tcp/-/connection-tcp-0.13.3.tgz";
-        sha512 = "6MMUSM265eBtHeLOYIe5UP1ld3oZaQMso6Cq7KJ0Xe7qC6zDy3YYaRHAe3Z+bdoJxpgmfiN8jvDM+QfypcTpKg==";
-      };
-    };
-    "@xmpp/debug-0.13.3" = {
-      name = "_at_xmpp_slash_debug";
-      packageName = "@xmpp/debug";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/debug/-/debug-0.13.3.tgz";
-        sha512 = "ccN7j/nQoDJh4VG9FKxoadRzIGMv2DjrneGu07IyZM7uwWiEiGlqiblxzYZT+PtUDBMzfFa6sumg8vIqD5lFkA==";
-      };
-    };
-    "@xmpp/error-0.13.2" = {
-      name = "_at_xmpp_slash_error";
-      packageName = "@xmpp/error";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/error/-/error-0.13.2.tgz";
-        sha512 = "bjbxwF8s6jfQNI+ZHV9Jwcb7K2kBeTlD60QHjMJlxIUrjTH1ZsJoDQh9tMdq1mBu/h/bm2SX7yZUqUb1wY6gMw==";
-      };
-    };
-    "@xmpp/events-0.13.2" = {
-      name = "_at_xmpp_slash_events";
-      packageName = "@xmpp/events";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/events/-/events-0.13.2.tgz";
-        sha512 = "fXaAMChvLnP9vEQIatFKWoAm/F9U122hShfRfVw4xS6pympThygWVPIuRuAznMt5tOyTVFWBuPge6hgGousT0g==";
-      };
-    };
-    "@xmpp/id-0.13.2" = {
-      name = "_at_xmpp_slash_id";
-      packageName = "@xmpp/id";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/id/-/id-0.13.2.tgz";
-        sha512 = "LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w==";
-      };
-    };
-    "@xmpp/iq-0.13.3" = {
-      name = "_at_xmpp_slash_iq";
-      packageName = "@xmpp/iq";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/iq/-/iq-0.13.3.tgz";
-        sha512 = "sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw==";
-      };
-    };
-    "@xmpp/jid-0.13.2" = {
-      name = "_at_xmpp_slash_jid";
-      packageName = "@xmpp/jid";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/jid/-/jid-0.13.2.tgz";
-        sha512 = "OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ==";
-      };
-    };
-    "@xmpp/middleware-0.13.3" = {
-      name = "_at_xmpp_slash_middleware";
-      packageName = "@xmpp/middleware";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/middleware/-/middleware-0.13.3.tgz";
-        sha512 = "zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA==";
-      };
-    };
-    "@xmpp/reconnect-0.13.2" = {
-      name = "_at_xmpp_slash_reconnect";
-      packageName = "@xmpp/reconnect";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/reconnect/-/reconnect-0.13.2.tgz";
-        sha512 = "FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow==";
-      };
-    };
-    "@xmpp/resolve-0.13.3" = {
-      name = "_at_xmpp_slash_resolve";
-      packageName = "@xmpp/resolve";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/resolve/-/resolve-0.13.3.tgz";
-        sha512 = "HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ==";
-      };
-    };
-    "@xmpp/resource-binding-0.13.3" = {
-      name = "_at_xmpp_slash_resource-binding";
-      packageName = "@xmpp/resource-binding";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz";
-        sha512 = "cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ==";
-      };
-    };
-    "@xmpp/sasl-0.13.4" = {
-      name = "_at_xmpp_slash_sasl";
-      packageName = "@xmpp/sasl";
-      version = "0.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl/-/sasl-0.13.4.tgz";
-        sha512 = "craijUkSSrYB43YgqHRigVe8JYFLTBdC1eiIlQRAhN37QMTCb0zz3AAgcoxYccrZDStHXNC7WMi149A4AKp6RA==";
-      };
-    };
-    "@xmpp/sasl-anonymous-0.13.2" = {
-      name = "_at_xmpp_slash_sasl-anonymous";
-      packageName = "@xmpp/sasl-anonymous";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz";
-        sha512 = "0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q==";
-      };
-    };
-    "@xmpp/sasl-plain-0.13.2" = {
-      name = "_at_xmpp_slash_sasl-plain";
-      packageName = "@xmpp/sasl-plain";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz";
-        sha512 = "zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg==";
-      };
-    };
-    "@xmpp/sasl-scram-sha-1-0.13.2" = {
-      name = "_at_xmpp_slash_sasl-scram-sha-1";
-      packageName = "@xmpp/sasl-scram-sha-1";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz";
-        sha512 = "qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ==";
-      };
-    };
-    "@xmpp/session-establishment-0.13.3" = {
-      name = "_at_xmpp_slash_session-establishment";
-      packageName = "@xmpp/session-establishment";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz";
-        sha512 = "dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA==";
-      };
-    };
-    "@xmpp/starttls-0.13.3" = {
-      name = "_at_xmpp_slash_starttls";
-      packageName = "@xmpp/starttls";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/starttls/-/starttls-0.13.3.tgz";
-        sha512 = "FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ==";
-      };
-    };
-    "@xmpp/stream-features-0.13.2" = {
-      name = "_at_xmpp_slash_stream-features";
-      packageName = "@xmpp/stream-features";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/stream-features/-/stream-features-0.13.2.tgz";
-        sha512 = "eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg==";
-      };
-    };
-    "@xmpp/stream-management-0.13.3" = {
-      name = "_at_xmpp_slash_stream-management";
-      packageName = "@xmpp/stream-management";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/stream-management/-/stream-management-0.13.3.tgz";
-        sha512 = "hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg==";
-      };
-    };
-    "@xmpp/tcp-0.13.3" = {
-      name = "_at_xmpp_slash_tcp";
-      packageName = "@xmpp/tcp";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/tcp/-/tcp-0.13.3.tgz";
-        sha512 = "WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ==";
-      };
-    };
-    "@xmpp/tls-0.13.3" = {
-      name = "_at_xmpp_slash_tls";
-      packageName = "@xmpp/tls";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/tls/-/tls-0.13.3.tgz";
-        sha512 = "oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg==";
-      };
-    };
-    "@xmpp/websocket-0.13.3" = {
-      name = "_at_xmpp_slash_websocket";
-      packageName = "@xmpp/websocket";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/websocket/-/websocket-0.13.3.tgz";
-        sha512 = "RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw==";
-      };
-    };
-    "@xmpp/xml-0.13.3" = {
-      name = "_at_xmpp_slash_xml";
-      packageName = "@xmpp/xml";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/xml/-/xml-0.13.3.tgz";
-        sha512 = "lYXBg/VlpUeavGgQE8LADfZUzMFUnWFVYgvKUcx97AqjiEJUuo40ijdRcGmkAVtTg0RBkml5WB+Mo+JqynMk7Q==";
-      };
-    };
     "@xstate/fsm-1.6.5" = {
       name = "_at_xstate_slash_fsm";
       packageName = "@xstate/fsm";
@@ -7493,33 +3693,6 @@ let
         sha512 = "b5o1I6aLNeYlU/3CPlj/Z91ybk1gUsKT+5NAJI+2W4UjvS5KLG28K9v5UvNoFVjHV8PajVZ00RH3vnjyQO7ZAw==";
       };
     };
-    "@xtuc/ieee754-1.2.0" = {
-      name = "_at_xtuc_slash_ieee754";
-      packageName = "@xtuc/ieee754";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz";
-        sha512 = "DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==";
-      };
-    };
-    "@xtuc/long-4.2.1" = {
-      name = "_at_xtuc_slash_long";
-      packageName = "@xtuc/long";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.1.tgz";
-        sha512 = "FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==";
-      };
-    };
-    "@xtuc/long-4.2.2" = {
-      name = "_at_xtuc_slash_long";
-      packageName = "@xtuc/long";
-      version = "4.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz";
-        sha512 = "NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==";
-      };
-    };
     "@yarnpkg/lockfile-1.0.2" = {
       name = "_at_yarnpkg_slash_lockfile";
       packageName = "@yarnpkg/lockfile";
@@ -7592,15 +3765,6 @@ let
         sha512 = "ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==";
       };
     };
-    "abab-2.0.6" = {
-      name = "abab";
-      packageName = "abab";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz";
-        sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==";
-      };
-    };
     "abbrev-1.1.1" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -7646,33 +3810,6 @@ let
         sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha512 = "OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==";
-      };
-    };
-    "acorn-5.7.4" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "5.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
-        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
-      };
-    };
-    "acorn-6.4.2" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "6.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz";
-        sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==";
-      };
-    };
     "acorn-7.4.1" = {
       name = "acorn";
       packageName = "acorn";
@@ -7691,15 +3828,6 @@ let
         sha512 = "OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==";
       };
     };
-    "acorn-globals-6.0.0" = {
-      name = "acorn-globals";
-      packageName = "acorn-globals";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz";
-        sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==";
-      };
-    };
     "acorn-import-attributes-1.9.5" = {
       name = "acorn-import-attributes";
       packageName = "acorn-import-attributes";
@@ -7709,15 +3837,6 @@ let
         sha512 = "n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==";
       };
     };
-    "acorn-jsx-3.0.1" = {
-      name = "acorn-jsx";
-      packageName = "acorn-jsx";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
-        sha512 = "AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==";
-      };
-    };
     "acorn-jsx-5.3.2" = {
       name = "acorn-jsx";
       packageName = "acorn-jsx";
@@ -7727,15 +3846,6 @@ let
         sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==";
       };
     };
-    "acorn-loose-6.1.0" = {
-      name = "acorn-loose";
-      packageName = "acorn-loose";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-loose/-/acorn-loose-6.1.0.tgz";
-        sha512 = "FHhXoiF0Uch3IqsrnPpWwCtiv5PYvipTpT1k9lDMgQVVYc9iDuSl5zdJV358aI8twfHCYMFBRVYvAVki9wC/ng==";
-      };
-    };
     "acorn-node-1.8.2" = {
       name = "acorn-node";
       packageName = "acorn-node";
@@ -7745,15 +3855,6 @@ let
         sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==";
       };
     };
-    "acorn-walk-6.2.0" = {
-      name = "acorn-walk";
-      packageName = "acorn-walk";
-      version = "6.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz";
-        sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
-      };
-    };
     "acorn-walk-7.2.0" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
@@ -7799,15 +3900,6 @@ let
         sha512 = "4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==";
       };
     };
-    "adm-zip-0.5.16" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.5.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz";
-        sha512 = "TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==";
-      };
-    };
     "after-0.8.2" = {
       name = "after";
       packageName = "after";
@@ -7817,15 +3909,6 @@ let
         sha512 = "QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==";
       };
     };
-    "agent-base-4.3.0" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz";
-        sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
-      };
-    };
     "agent-base-6.0.2" = {
       name = "agent-base";
       packageName = "agent-base";
@@ -7844,15 +3927,6 @@ let
         sha512 = "jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==";
       };
     };
-    "agentkeepalive-4.6.0" = {
-      name = "agentkeepalive";
-      packageName = "agentkeepalive";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz";
-        sha512 = "kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==";
-      };
-    };
     "aggregate-error-3.1.0" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
@@ -7898,15 +3972,6 @@ let
         sha512 = "oQFi0K+TLDpw8vTeDnkX1opLEGPJ03OeT5dKzYqPHf6JjuaYmXoNdc5GQhZDF+IzX8ypWvYZ/NbftabNU02dkA==";
       };
     };
-    "ajv-4.11.8" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha512 = "I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==";
-      };
-    };
     "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
@@ -7988,24 +4053,6 @@ let
         sha512 = "8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==";
       };
     };
-    "ajv-keywords-1.5.1" = {
-      name = "ajv-keywords";
-      packageName = "ajv-keywords";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
-        sha512 = "vuBv+fm2s6cqUyey2A7qYcvsik+GMDJsw8BARP2sDE76cqmaZVarsvHf7Vx6VJ0Xk8gLl+u3MoAPf6gKzJefeA==";
-      };
-    };
-    "ajv-keywords-5.1.0" = {
-      name = "ajv-keywords";
-      packageName = "ajv-keywords";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz";
-        sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==";
-      };
-    };
     "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
@@ -8024,15 +4071,6 @@ let
         sha512 = "iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A==";
       };
     };
-    "ansi-align-1.1.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha512 = "ncgIO/ZeFcsh3cye0NgGPb5h/3vCiKJxp6HvPtqsFvEL/4b/G2tNgrr8EOYN5RSVnGx69k8dFYSBG/w1yKX58Q==";
-      };
-    };
     "ansi-align-3.0.1" = {
       name = "ansi-align";
       packageName = "ansi-align";
@@ -8042,33 +4080,6 @@ let
         sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==";
       };
     };
-    "ansi-colors-4.1.3" = {
-      name = "ansi-colors";
-      packageName = "ansi-colors";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz";
-        sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==";
-      };
-    };
-    "ansi-escape-sequences-4.1.0" = {
-      name = "ansi-escape-sequences";
-      packageName = "ansi-escape-sequences";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz";
-        sha512 = "dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw==";
-      };
-    };
-    "ansi-escapes-1.4.0" = {
-      name = "ansi-escapes";
-      packageName = "ansi-escapes";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
-        sha512 = "wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==";
-      };
-    };
     "ansi-escapes-3.2.0" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -8114,15 +4125,6 @@ let
         sha512 = "GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==";
       };
     };
-    "ansi-gray-0.1.1" = {
-      name = "ansi-gray";
-      packageName = "ansi-gray";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz";
-        sha512 = "HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==";
-      };
-    };
     "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -8213,15 +4215,6 @@ let
         sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==";
       };
     };
-    "ansi-wrap-0.1.0" = {
-      name = "ansi-wrap";
-      packageName = "ansi-wrap";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz";
-        sha512 = "ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==";
-      };
-    };
     "ansicolors-0.3.2" = {
       name = "ansicolors";
       packageName = "ansicolors";
@@ -8411,15 +4404,6 @@ let
         sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==";
       };
     };
-    "are-we-there-yet-3.0.1" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz";
-        sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==";
-      };
-    };
     "arg-4.1.0" = {
       name = "arg";
       packageName = "arg";
@@ -8519,24 +4503,6 @@ let
         sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==";
       };
     };
-    "array-back-2.0.0" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz";
-        sha512 = "eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==";
-      };
-    };
-    "array-back-3.1.0" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz";
-        sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==";
-      };
-    };
     "array-buffer-byte-length-1.0.2" = {
       name = "array-buffer-byte-length";
       packageName = "array-buffer-byte-length";
@@ -8546,15 +4512,6 @@ let
         sha512 = "LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==";
       };
     };
-    "array-differ-1.0.0" = {
-      name = "array-differ";
-      packageName = "array-differ";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
-        sha512 = "LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==";
-      };
-    };
     "array-differ-3.0.0" = {
       name = "array-differ";
       packageName = "array-differ";
@@ -8663,15 +4620,6 @@ let
         sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
       };
     };
-    "array-uniq-1.0.3" = {
-      name = "array-uniq";
-      packageName = "array-uniq";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz";
-        sha512 = "MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==";
-      };
-    };
     "array-unique-0.2.1" = {
       name = "array-unique";
       packageName = "array-unique";
@@ -8690,24 +4638,6 @@ let
         sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==";
       };
     };
-    "array.prototype.reduce-1.0.7" = {
-      name = "array.prototype.reduce";
-      packageName = "array.prototype.reduce";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz";
-        sha512 = "mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==";
-      };
-    };
-    "arraybuffer.prototype.slice-1.0.4" = {
-      name = "arraybuffer.prototype.slice";
-      packageName = "arraybuffer.prototype.slice";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz";
-        sha512 = "BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==";
-      };
-    };
     "arraybuffer.slice-0.0.7" = {
       name = "arraybuffer.slice";
       packageName = "arraybuffer.slice";
@@ -8780,24 +4710,6 @@ let
         sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
-    "asn1.js-5.4.1" = {
-      name = "asn1.js";
-      packageName = "asn1.js";
-      version = "5.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
-        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
-      };
-    };
-    "asn1js-3.0.5" = {
-      name = "asn1js";
-      packageName = "asn1js";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1js/-/asn1js-3.0.5.tgz";
-        sha512 = "FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==";
-      };
-    };
     "assert-1.5.1" = {
       name = "assert";
       packageName = "assert";
@@ -8888,15 +4800,6 @@ let
         sha512 = "LElXdjswlqjWrPpJFg1Fx4wpkOCxj1TDHlSV4PlaRxHGWko024xICaa97ZkMfs6DRKlCguiAI+rbXv5GWwXIkg==";
       };
     };
-    "async-0.1.22" = {
-      name = "async";
-      packageName = "async";
-      version = "0.1.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async/-/async-0.1.22.tgz";
-        sha512 = "2tEzliJmf5fHNafNwQLJXUasGzQCVctvsNkXmnlELHwypU0p08/rHohYvkqKIjyXpx+0rkrYv6QbhJ+UF4QkBg==";
-      };
-    };
     "async-0.2.10" = {
       name = "async";
       packageName = "async";
@@ -8960,15 +4863,6 @@ let
         sha512 = "htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==";
       };
     };
-    "async-done-2.0.0" = {
-      name = "async-done";
-      packageName = "async-done";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz";
-        sha512 = "j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==";
-      };
-    };
     "async-each-1.0.6" = {
       name = "async-each";
       packageName = "async-each";
@@ -8987,15 +4881,6 @@ let
         sha512 = "p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==";
       };
     };
-    "async-function-1.0.0" = {
-      name = "async-function";
-      packageName = "async-function";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz";
-        sha512 = "hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==";
-      };
-    };
     "async-listen-1.2.0" = {
       name = "async-listen";
       packageName = "async-listen";
@@ -9023,15 +4908,6 @@ let
         sha512 = "cWMaNwUJnf37C/S5TfCkk/15MwbPRwVYALA2jtjkbHjCmAPiDXyNJy2q3p1KAZzDLHAWyarUWSujUoHR4pEgrA==";
       };
     };
-    "async-mutex-0.5.0" = {
-      name = "async-mutex";
-      packageName = "async-mutex";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz";
-        sha512 = "1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==";
-      };
-    };
     "async-sema-3.1.1" = {
       name = "async-sema";
       packageName = "async-sema";
@@ -9041,15 +4917,6 @@ let
         sha512 = "tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==";
       };
     };
-    "async-settle-2.0.0" = {
-      name = "async-settle";
-      packageName = "async-settle";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz";
-        sha512 = "Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -9086,15 +4953,6 @@ let
         sha512 = "kU6FmrwZ3Lx7/7y3hPS5QnbJfaohcIul5fGqf7ok+4KklIEk9tJ0C2IQPdacSbVUWv6zVHXEBWoWd6NrVMT7Cw==";
       };
     };
-    "author-regex-1.0.0" = {
-      name = "author-regex";
-      packageName = "author-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz";
-        sha512 = "KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==";
-      };
-    };
     "auto-bind-4.0.0" = {
       name = "auto-bind";
       packageName = "auto-bind";
@@ -9113,15 +4971,6 @@ let
         sha512 = "ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==";
       };
     };
-    "autoprefixer-9.8.8" = {
-      name = "autoprefixer";
-      packageName = "autoprefixer";
-      version = "9.8.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz";
-        sha512 = "eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==";
-      };
-    };
     "available-typed-arrays-1.0.7" = {
       name = "available-typed-arrays";
       packageName = "available-typed-arrays";
@@ -9149,15 +4998,6 @@ let
         sha512 = "XyzCoWMQ693g6iLFqgeVl6DTMKZIIc0zlzwLvP47az7nRgob8JLiqJDbx1ljKqBxKesRqq9igjTMzOKh3JkvUA==";
       };
     };
-    "aws-sdk-2.1340.0" = {
-      name = "aws-sdk";
-      packageName = "aws-sdk";
-      version = "2.1340.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1340.0.tgz";
-        sha512 = "5amtFHWmJz+x0mKcwKJUBm2nKOJjO0MzzuVhrHFnmDWsUqP1VUsTxENoRdGitwoCH/o+MttLmf1/+lvgkYzbiw==";
-      };
-    };
     "aws-sdk-2.1472.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
@@ -9194,15 +5034,6 @@ let
         sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==";
       };
     };
-    "axios-0.25.0" = {
-      name = "axios";
-      packageName = "axios";
-      version = "0.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz";
-        sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==";
-      };
-    };
     "axios-1.8.3" = {
       name = "axios";
       packageName = "axios";
@@ -9230,51 +5061,6 @@ let
         sha512 = "OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==";
       };
     };
-    "babel-code-frame-6.26.0" = {
-      name = "babel-code-frame";
-      packageName = "babel-code-frame";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
-        sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==";
-      };
-    };
-    "babel-plugin-jsx-pragmatic-1.0.2" = {
-      name = "babel-plugin-jsx-pragmatic";
-      packageName = "babel-plugin-jsx-pragmatic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-1.0.2.tgz";
-        sha512 = "+qeGXSbHZwinZzO6R3wP+6XDKup83Pgg2B3TQt2zwfDdgC7NqT9Kd3ws7iqk53zAO/8iOIRU6VUyUzt2LDE3Eg==";
-      };
-    };
-    "babel-plugin-syntax-jsx-6.18.0" = {
-      name = "babel-plugin-syntax-jsx";
-      packageName = "babel-plugin-syntax-jsx";
-      version = "6.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
-        sha512 = "qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==";
-      };
-    };
-    "babybird-0.0.1" = {
-      name = "babybird";
-      packageName = "babybird";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babybird/-/babybird-0.0.1.tgz";
-        sha512 = "1Niw1j7GKl8L3vyKBKbzKeJ//uPoQpr5RCr5/GV2Fto+U8OqcTWXJH/Ats2lOMYP4sVjRHwSIH+HUPdLkORZ9w==";
-      };
-    };
-    "bach-2.0.1" = {
-      name = "bach";
-      packageName = "bach";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz";
-        sha512 = "A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==";
-      };
-    };
     "backo2-1.0.2" = {
       name = "backo2";
       packageName = "backo2";
@@ -9293,15 +5079,6 @@ let
         sha512 = "wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==";
       };
     };
-    "bail-1.0.5" = {
-      name = "bail";
-      packageName = "bail";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz";
-        sha512 = "xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==";
-      };
-    };
     "bail-2.0.2" = {
       name = "bail";
       packageName = "bail";
@@ -9320,15 +5097,6 @@ let
         sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
       };
     };
-    "balanced-match-2.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz";
-        sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==";
-      };
-    };
     "base-0.11.2" = {
       name = "base";
       packageName = "base";
@@ -9374,15 +5142,6 @@ let
         sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
-    "base64-stream-1.0.0" = {
-      name = "base64-stream";
-      packageName = "base64-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-stream/-/base64-stream-1.0.0.tgz";
-        sha512 = "BQQZftaO48FcE1Kof9CmXMFaAdqkcNorgc8CxesZv9nMbbTF1EFyQe89UOuh//QMmdtfUDXyO8rgUalemL5ODA==";
-      };
-    };
     "base64id-2.0.0" = {
       name = "base64id";
       packageName = "base64id";
@@ -9446,15 +5205,6 @@ let
         sha512 = "KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg==";
       };
     };
-    "beeper-1.1.1" = {
-      name = "beeper";
-      packageName = "beeper";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
-        sha512 = "3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==";
-      };
-    };
     "bencode-0.7.0" = {
       name = "bencode";
       packageName = "bencode";
@@ -9491,15 +5241,6 @@ let
         sha512 = "ct6s33iiwRCUPp9KXnJ4QMWDgHIgaw36caK/5XEQ9L8dCzSQlJt1Vk6VmHh1VD4AlGCAI4C2zmtfItifBBPrhQ==";
       };
     };
-    "better-opn-2.1.1" = {
-      name = "better-opn";
-      packageName = "better-opn";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz";
-        sha512 = "kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==";
-      };
-    };
     "better-path-resolve-1.0.0" = {
       name = "better-path-resolve";
       packageName = "better-path-resolve";
@@ -9554,15 +5295,6 @@ let
         sha512 = "Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==";
       };
     };
-    "binary-search-tree-0.2.5" = {
-      name = "binary-search-tree";
-      packageName = "binary-search-tree";
-      version = "0.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz";
-        sha512 = "CvNVKS6iXagL1uGwLagSXz1hzSMezxOuGnFi5FHGKqaTO3nPPWrAbyALUzK640j+xOTVm7lzD9YP8W1f/gvUdw==";
-      };
-    };
     "bindings-1.5.0" = {
       name = "bindings";
       packageName = "bindings";
@@ -9572,15 +5304,6 @@ let
         sha512 = "p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==";
       };
     };
-    "bintrees-1.0.2" = {
-      name = "bintrees";
-      packageName = "bintrees";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bintrees/-/bintrees-1.0.2.tgz";
-        sha512 = "VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==";
-      };
-    };
     "bit-field-1.9.0" = {
       name = "bit-field";
       packageName = "bit-field";
@@ -9635,15 +5358,6 @@ let
         sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==";
       };
     };
-    "bl-5.1.0" = {
-      name = "bl";
-      packageName = "bl";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz";
-        sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==";
-      };
-    };
     "blob-0.0.5" = {
       name = "blob";
       packageName = "blob";
@@ -9680,15 +5394,6 @@ let
         sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==";
       };
     };
-    "bn.js-4.11.6" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "4.11.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz";
-        sha512 = "XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==";
-      };
-    };
     "bn.js-4.12.1" = {
       name = "bn.js";
       packageName = "bn.js";
@@ -9743,15 +5448,6 @@ let
         sha512 = "RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==";
       };
     };
-    "boolbase-1.0.0" = {
-      name = "boolbase";
-      packageName = "boolbase";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
-        sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==";
-      };
-    };
     "bowser-2.11.0" = {
       name = "bowser";
       packageName = "bowser";
@@ -9761,15 +5457,6 @@ let
         sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==";
       };
     };
-    "boxen-0.6.0" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
-        sha512 = "yL8sYzt0avlYGOY6LqtECkGrJOY3cCLAbFPaNfgE+4fD45ZrdYqLdY8yF4bqyTkpfW9e6W0YqBkN7dIn/PrZoA==";
-      };
-    };
     "boxen-5.1.2" = {
       name = "boxen";
       packageName = "boxen";
@@ -9887,15 +5574,6 @@ let
         sha512 = "cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==";
       };
     };
-    "browser-or-node-1.3.0" = {
-      name = "browser-or-node";
-      packageName = "browser-or-node";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz";
-        sha512 = "0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==";
-      };
-    };
     "browser-pack-6.1.0" = {
       name = "browser-pack";
       packageName = "browser-pack";
@@ -9905,15 +5583,6 @@ let
         sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
-    "browser-process-hrtime-1.0.0" = {
-      name = "browser-process-hrtime";
-      packageName = "browser-process-hrtime";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
-        sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
-      };
-    };
     "browser-resolve-2.0.0" = {
       name = "browser-resolve";
       packageName = "browser-resolve";
@@ -9923,15 +5592,6 @@ let
         sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==";
       };
     };
-    "browser-stdout-1.3.1" = {
-      name = "browser-stdout";
-      packageName = "browser-stdout";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
-      };
-    };
     "browser-sync-client-3.0.3" = {
       name = "browser-sync-client";
       packageName = "browser-sync-client";
@@ -10031,15 +5691,6 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "browserslist-4.24.4" = {
-      name = "browserslist";
-      packageName = "browserslist";
-      version = "4.24.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz";
-        sha512 = "KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==";
-      };
-    };
     "brq-0.1.10" = {
       name = "brq";
       packageName = "brq";
@@ -10121,15 +5772,6 @@ let
         sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
-    "buffer-5.6.0" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz";
-        sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==";
-      };
-    };
     "buffer-5.7.1" = {
       name = "buffer";
       packageName = "buffer";
@@ -10247,15 +5889,6 @@ let
         sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==";
       };
     };
-    "bufferstreams-1.1.3" = {
-      name = "bufferstreams";
-      packageName = "bufferstreams";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
-        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
-      };
-    };
     "bufferutil-4.0.9" = {
       name = "bufferutil";
       packageName = "bufferutil";
@@ -10283,15 +5916,6 @@ let
         sha512 = "k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==";
       };
     };
-    "builtin-modules-3.3.0" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz";
-        sha512 = "zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==";
-      };
-    };
     "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
@@ -10337,24 +5961,6 @@ let
         sha512 = "0tECWShh6wUysgucJcBAoYegf3JJoZWibxdqhTm7OHPeT42qdjkZ29QCMcKwbgU1kiH+auSIasNRXMLWXafXig==";
       };
     };
-    "bunyan-syslog-udp-0.2.0" = {
-      name = "bunyan-syslog-udp";
-      packageName = "bunyan-syslog-udp";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bunyan-syslog-udp/-/bunyan-syslog-udp-0.2.0.tgz";
-        sha512 = "tY6iaw+iYbCjlsAgAyO4CeA7Usnj5VndygMfd2PcHK++626oMoHANcdsH5tq5VxRPsbk9M1fbuk0a5pX9axV2w==";
-      };
-    };
-    "busboy-1.6.0" = {
-      name = "busboy";
-      packageName = "busboy";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz";
-        sha512 = "8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==";
-      };
-    };
     "byline-5.0.0" = {
       name = "byline";
       packageName = "byline";
@@ -10409,24 +6015,6 @@ let
         sha512 = "b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==";
       };
     };
-    "cacache-15.3.0" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "15.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz";
-        sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==";
-      };
-    };
-    "cacache-16.1.3" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "16.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz";
-        sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==";
-      };
-    };
     "cacache-19.0.1" = {
       name = "cacache";
       packageName = "cacache";
@@ -10445,15 +6033,6 @@ let
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
-    "cacheable-lookup-5.0.4" = {
-      name = "cacheable-lookup";
-      packageName = "cacheable-lookup";
-      version = "5.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz";
-        sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==";
-      };
-    };
     "cacheable-lookup-7.0.0" = {
       name = "cacheable-lookup";
       packageName = "cacheable-lookup";
@@ -10481,15 +6060,6 @@ let
         sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
       };
     };
-    "cacheable-request-7.0.4" = {
-      name = "cacheable-request";
-      packageName = "cacheable-request";
-      version = "7.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz";
-        sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==";
-      };
-    };
     "cached-path-relative-1.1.0" = {
       name = "cached-path-relative";
       packageName = "cached-path-relative";
@@ -10544,15 +6114,6 @@ let
         sha512 = "n+21IZC3j06YpCWaxmUy5AnVqhmCIM2bQtqQyy00HJlmStRt6kwDX5F9Z97pqwAB+G/tgSz6q/kUBbNyQzIubw==";
       };
     };
-    "caller-path-0.1.0" = {
-      name = "caller-path";
-      packageName = "caller-path";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz";
-        sha512 = "UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==";
-      };
-    };
     "callsite-1.0.0" = {
       name = "callsite";
       packageName = "callsite";
@@ -10571,15 +6132,6 @@ let
         sha512 = "OqeheDucGKifjQRx524URgV4z4NaKjocGhygTptDea+DLROre4ZEecA4KXDq+P7qlGCohYVNOh3qr+y5XH5Ftg==";
       };
     };
-    "callsites-0.2.0" = {
-      name = "callsites";
-      packageName = "callsites";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz";
-        sha512 = "Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==";
-      };
-    };
     "callsites-3.1.0" = {
       name = "callsites";
       packageName = "callsites";
@@ -10589,15 +6141,6 @@ let
         sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
       };
     };
-    "camel-case-3.0.0" = {
-      name = "camel-case";
-      packageName = "camel-case";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz";
-        sha512 = "+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==";
-      };
-    };
     "camel-case-4.1.2" = {
       name = "camel-case";
       packageName = "camel-case";
@@ -10616,24 +6159,6 @@ let
         sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha512 = "4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==";
-      };
-    };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha512 = "FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==";
-      };
-    };
     "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -10688,15 +6213,6 @@ let
         sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==";
       };
     };
-    "camelcase-keys-7.0.2" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "7.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz";
-        sha512 = "Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==";
-      };
-    };
     "camelcase-keys-8.0.2" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -10706,15 +6222,6 @@ let
         sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==";
       };
     };
-    "caniuse-lite-1.0.30001704" = {
-      name = "caniuse-lite";
-      packageName = "caniuse-lite";
-      version = "1.0.30001704";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz";
-        sha512 = "+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==";
-      };
-    };
     "canvas-2.11.2" = {
       name = "canvas";
       packageName = "canvas";
@@ -10895,15 +6402,6 @@ let
         sha512 = "T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==";
       };
     };
-    "character-entities-1.2.4" = {
-      name = "character-entities";
-      packageName = "character-entities";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz";
-        sha512 = "iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==";
-      };
-    };
     "character-entities-2.0.2" = {
       name = "character-entities";
       packageName = "character-entities";
@@ -10922,15 +6420,6 @@ let
         sha512 = "1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==";
       };
     };
-    "character-entities-legacy-1.1.4" = {
-      name = "character-entities-legacy";
-      packageName = "character-entities-legacy";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz";
-        sha512 = "3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==";
-      };
-    };
     "character-entities-legacy-3.0.0" = {
       name = "character-entities-legacy";
       packageName = "character-entities-legacy";
@@ -10940,15 +6429,6 @@ let
         sha512 = "RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==";
       };
     };
-    "character-reference-invalid-1.1.4" = {
-      name = "character-reference-invalid";
-      packageName = "character-reference-invalid";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz";
-        sha512 = "mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==";
-      };
-    };
     "character-reference-invalid-2.0.1" = {
       name = "character-reference-invalid";
       packageName = "character-reference-invalid";
@@ -10976,15 +6456,6 @@ let
         sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
       };
     };
-    "chardet-1.6.1" = {
-      name = "chardet";
-      packageName = "chardet";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chardet/-/chardet-1.6.1.tgz";
-        sha512 = "RHP0lMTBsIhM/RxxoOzuTsY7IMNE6/XQ7FKGch0D/aluQzgah0BS4i9ND8wPJdIu7WvMMjk88EXcNi6j8Tdung==";
-      };
-    };
     "charenc-0.0.2" = {
       name = "charenc";
       packageName = "charenc";
@@ -11066,15 +6537,6 @@ let
         sha512 = "+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==";
       };
     };
-    "chroma-js-2.6.0" = {
-      name = "chroma-js";
-      packageName = "chroma-js";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.6.0.tgz";
-        sha512 = "BLHvCB9s8Z1EV4ethr6xnkl/P2YRFOGqfgvuMG/MyCbZPrTA+NeiByY6XvgF0zP4/2deU2CXnWyMa3zu1LqQ3A==";
-      };
-    };
     "chrome-dgram-3.0.6" = {
       name = "chrome-dgram";
       packageName = "chrome-dgram";
@@ -11102,15 +6564,6 @@ let
         sha512 = "Jzy2EnzmE+ligqIZUsmWnck9RBXLuUy6CaKyuNMtowFG3ZvLt8d+WBJCTPEludV0DHpIKjAOlwjFmTaEdfdWCw==";
       };
     };
-    "chrome-trace-event-1.0.4" = {
-      name = "chrome-trace-event";
-      packageName = "chrome-trace-event";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz";
-        sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==";
-      };
-    };
     "chromium-bidi-0.6.3" = {
       name = "chromium-bidi";
       packageName = "chromium-bidi";
@@ -11156,15 +6609,6 @@ let
         sha512 = "3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==";
       };
     };
-    "circular-json-0.3.3" = {
-      name = "circular-json";
-      packageName = "circular-json";
-      version = "0.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
-        sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
-      };
-    };
     "cjs-module-lexer-1.2.3" = {
       name = "cjs-module-lexer";
       packageName = "cjs-module-lexer";
@@ -11174,15 +6618,6 @@ let
         sha512 = "0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==";
       };
     };
-    "clarinet-0.11.0" = {
-      name = "clarinet";
-      packageName = "clarinet";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clarinet/-/clarinet-0.11.0.tgz";
-        sha512 = "6hgoCgDgdyEtrXsk1tMomUl+S6wnslv2F1muNTOuhQemOhauR+Q0FtBdrj9k+qyIDLm0TVW0QMZ10aeWwRDgIA==";
-      };
-    };
     "class-utils-0.3.6" = {
       name = "class-utils";
       packageName = "class-utils";
@@ -11192,15 +6627,6 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-css-4.2.4" = {
-      name = "clean-css";
-      packageName = "clean-css";
-      version = "4.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz";
-        sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==";
-      };
-    };
     "clean-stack-2.2.0" = {
       name = "clean-stack";
       packageName = "clean-stack";
@@ -11237,24 +6663,6 @@ let
         sha512 = "TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ==";
       };
     };
-    "cli-1.0.1" = {
-      name = "cli";
-      packageName = "cli";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
-        sha512 = "41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==";
-      };
-    };
-    "cli-boxes-1.0.0" = {
-      name = "cli-boxes";
-      packageName = "cli-boxes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
-        sha512 = "3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg==";
-      };
-    };
     "cli-boxes-2.2.1" = {
       name = "cli-boxes";
       packageName = "cli-boxes";
@@ -11273,15 +6681,6 @@ let
         sha512 = "/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==";
       };
     };
-    "cli-cursor-1.0.2" = {
-      name = "cli-cursor";
-      packageName = "cli-cursor";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz";
-        sha512 = "25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==";
-      };
-    };
     "cli-cursor-2.1.0" = {
       name = "cli-cursor";
       packageName = "cli-cursor";
@@ -11363,15 +6762,6 @@ let
         sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==";
       };
     };
-    "cli-truncate-3.1.0" = {
-      name = "cli-truncate";
-      packageName = "cli-truncate";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz";
-        sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==";
-      };
-    };
     "cli-truncate-4.0.0" = {
       name = "cli-truncate";
       packageName = "cli-truncate";
@@ -11444,33 +6834,6 @@ let
         sha512 = "5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==";
       };
     };
-    "cliss-0.0.2" = {
-      name = "cliss";
-      packageName = "cliss";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz";
-        sha512 = "6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw==";
-      };
-    };
-    "cliui-3.2.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
-        sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==";
-      };
-    };
-    "cliui-5.0.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz";
-        sha512 = "PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==";
-      };
-    };
     "cliui-6.0.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -11543,24 +6906,6 @@ let
         sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==";
       };
     };
-    "clone-deep-4.0.1" = {
-      name = "clone-deep";
-      packageName = "clone-deep";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz";
-        sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==";
-      };
-    };
-    "clone-regexp-2.2.0" = {
-      name = "clone-regexp";
-      packageName = "clone-regexp";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz";
-        sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==";
-      };
-    };
     "clone-response-1.0.3" = {
       name = "clone-response";
       packageName = "clone-response";
@@ -11570,24 +6915,6 @@ let
         sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==";
       };
     };
-    "clone-stats-0.0.1" = {
-      name = "clone-stats";
-      packageName = "clone-stats";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
-        sha512 = "dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==";
-      };
-    };
-    "clone-stats-1.0.0" = {
-      name = "clone-stats";
-      packageName = "clone-stats";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz";
-        sha512 = "au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==";
-      };
-    };
     "clsx-2.1.1" = {
       name = "clsx";
       packageName = "clsx";
@@ -11597,15 +6924,6 @@ let
         sha512 = "eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==";
       };
     };
-    "cluster-key-slot-1.1.2" = {
-      name = "cluster-key-slot";
-      packageName = "cluster-key-slot";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz";
-        sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==";
-      };
-    };
     "cmd-extension-1.0.2" = {
       name = "cmd-extension";
       packageName = "cmd-extension";
@@ -11732,15 +7050,6 @@ let
         sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==";
       };
     };
-    "color-4.2.3" = {
-      name = "color";
-      packageName = "color";
-      version = "4.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-4.2.3.tgz";
-        sha512 = "1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==";
-      };
-    };
     "color-convert-1.9.3" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -11876,42 +7185,6 @@ let
         sha512 = "Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==";
       };
     };
-    "command-exists-1.2.9" = {
-      name = "command-exists";
-      packageName = "command-exists";
-      version = "1.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz";
-        sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==";
-      };
-    };
-    "command-line-usage-4.1.0" = {
-      name = "command-line-usage";
-      packageName = "command-line-usage";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz";
-        sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==";
-      };
-    };
-    "commander-0.6.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-0.6.1.tgz";
-        sha512 = "0fLycpl1UMTGX257hRsu/arL/cUbcvQM4zMKwvLvzXtfdezIV4yotPS2dYtknF+NmEfWSoCEF6+hj9XLm/6hEw==";
-      };
-    };
-    "commander-10.0.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "10.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz";
-        sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==";
-      };
-    };
     "commander-11.1.0" = {
       name = "commander";
       packageName = "commander";
@@ -11957,15 +7230,6 @@ let
         sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
-    "commander-6.2.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz";
-        sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
-      };
-    };
     "commander-7.2.0" = {
       name = "commander";
       packageName = "commander";
@@ -11984,15 +7248,6 @@ let
         sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==";
       };
     };
-    "commander-9.5.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "9.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz";
-        sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==";
-      };
-    };
     "comment-json-4.2.5" = {
       name = "comment-json";
       packageName = "comment-json";
@@ -12011,24 +7266,6 @@ let
         sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==";
       };
     };
-    "common-tags-1.8.2" = {
-      name = "common-tags";
-      packageName = "common-tags";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz";
-        sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==";
-      };
-    };
-    "commondir-1.0.1" = {
-      name = "commondir";
-      packageName = "commondir";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";
-        sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==";
-      };
-    };
     "commonmark-0.31.2" = {
       name = "commonmark";
       packageName = "commonmark";
@@ -12056,24 +7293,6 @@ let
         sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==";
       };
     };
-    "compare-version-0.1.2" = {
-      name = "compare-version";
-      packageName = "compare-version";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz";
-        sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==";
-      };
-    };
-    "compare-versions-6.1.1" = {
-      name = "compare-versions";
-      packageName = "compare-versions";
-      version = "6.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz";
-        sha512 = "4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==";
-      };
-    };
     "component-bind-1.0.0" = {
       name = "component-bind";
       packageName = "component-bind";
@@ -12200,15 +7419,6 @@ let
         sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==";
       };
     };
-    "configstore-2.1.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
-        sha512 = "BOCxwwxF5WPspp1OBq9j0JLyL5JgJOTssz9PdOHr8VWjFijaC3PpjU48vFEX3uxx8sTusnVQckLbNzBq6fmkGw==";
-      };
-    };
     "configstore-4.0.0" = {
       name = "configstore";
       packageName = "configstore";
@@ -12245,15 +7455,6 @@ let
         sha512 = "yk7/5PN5im4qwz0WFZW3PXnzHgPu9mX29Y8uZ3aefe2lBPC1FYttWZRcaW9fKkT0pBCJyuQ2HfbmPVaODi9jcQ==";
       };
     };
-    "connect-1.9.2" = {
-      name = "connect";
-      packageName = "connect";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect/-/connect-1.9.2.tgz";
-        sha512 = "6Z9RPjQOHjaI47gK385djHVv7SEkRm1Y9AAvBhiI7gSXpO5sFktTkAD+dkbcaiEo2xaNlS1KIJU3XRxqbPLx6w==";
-      };
-    };
     "connect-3.6.6" = {
       name = "connect";
       packageName = "connect";
@@ -12272,15 +7473,6 @@ let
         sha512 = "ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==";
       };
     };
-    "connect-busboy-0.0.2" = {
-      name = "connect-busboy";
-      packageName = "connect-busboy";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-busboy/-/connect-busboy-0.0.2.tgz";
-        sha512 = "/Wi+zhcjivLU6dtsVGXWtRoVs4F7jdE9FUp0tXkbV9gCN7MdRQAgBqQ0xH0Iv9g00Z5EuioJo7ihxOAdZOzZ8w==";
-      };
-    };
     "connect-history-api-fallback-1.6.0" = {
       name = "connect-history-api-fallback";
       packageName = "connect-history-api-fallback";
@@ -12299,24 +7491,6 @@ let
         sha512 = "zKcpA7cuXGEhuw9Pz7JmVCFmp85jzGLGm/iiagXTwyEAJp4ypLPtRS/V4IGuGb9KjjrgHBs6P/gDCpZHnFzksA==";
       };
     };
-    "connect-pause-0.1.1" = {
-      name = "connect-pause";
-      packageName = "connect-pause";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz";
-        sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w==";
-      };
-    };
-    "connect-redis-7.1.1" = {
-      name = "connect-redis";
-      packageName = "connect-redis";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.1.tgz";
-        sha512 = "M+z7alnCJiuzKa8/1qAYdGUXHYfDnLolOGAUjOioB07pP39qxjG+X9ibsud7qUBc4jMV5Mcy3ugGv8eFcgamJQ==";
-      };
-    };
     "consola-3.4.0" = {
       name = "consola";
       packageName = "consola";
@@ -12326,15 +7500,6 @@ let
         sha512 = "EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==";
       };
     };
-    "console-browserify-1.1.0" = {
-      name = "console-browserify";
-      packageName = "console-browserify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha512 = "duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==";
-      };
-    };
     "console-browserify-1.2.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -12434,16 +7599,6 @@ let
         sha512 = "nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==";
       };
     };
-    "content-type-git+https://github.com/wikimedia/content-type.git#master" = {
-      name = "content-type";
-      packageName = "content-type";
-      version = "1.0.1";
-      src = fetchgit {
-        url = "https://github.com/wikimedia/content-type.git";
-        rev = "cd73e64490f9620329fe4ed6e3ac383abb6bdee0";
-        sha256 = "e583031138b98e2a09ce14dbd72afa0377201894092c941ef4cc07206c35ed04";
-      };
-    };
     "conventional-changelog-6.0.0" = {
       name = "conventional-changelog";
       packageName = "conventional-changelog";
@@ -12615,15 +7770,6 @@ let
         sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==";
       };
     };
-    "convert-source-map-2.0.0" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz";
-        sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==";
-      };
-    };
     "convert-to-spaces-1.0.2" = {
       name = "convert-to-spaces";
       packageName = "convert-to-spaces";
@@ -12642,15 +7788,6 @@ let
         sha512 = "rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==";
       };
     };
-    "cookie-0.4.1" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
-        sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
-      };
-    };
     "cookie-0.4.2" = {
       name = "cookie";
       packageName = "cookie";
@@ -12678,15 +7815,6 @@ let
         sha512 = "yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==";
       };
     };
-    "cookie-parser-1.4.6" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz";
-        sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==";
-      };
-    };
     "cookie-signature-1.0.6" = {
       name = "cookie-signature";
       packageName = "cookie-signature";
@@ -12696,15 +7824,6 @@ let
         sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==";
       };
     };
-    "cookie-signature-1.0.7" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz";
-        sha512 = "NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==";
-      };
-    };
     "cookiejar-2.1.4" = {
       name = "cookiejar";
       packageName = "cookiejar";
@@ -12732,24 +7851,6 @@ let
         sha512 = "bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==";
       };
     };
-    "core-js-2.6.12" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "2.6.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz";
-        sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
-      };
-    };
-    "core-js-3.41.0" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "3.41.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz";
-        sha512 = "SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==";
-      };
-    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -12885,15 +7986,6 @@ let
         sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==";
       };
     };
-    "create-gatsby-3.14.0" = {
-      name = "create-gatsby";
-      packageName = "create-gatsby";
-      version = "3.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.14.0.tgz";
-        sha512 = "HR90NlcTIAeo7OwcFfGubKa35+/Aj7lEfgcV4n4IIPCMy3A+gYwOEQcLIGtmPCVIl1C9AhT3/0XaWbnhAcbyGQ==";
-      };
-    };
     "create-hash-1.2.0" = {
       name = "create-hash";
       packageName = "create-hash";
@@ -12921,24 +8013,6 @@ let
         sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==";
       };
     };
-    "cron-parser-4.9.0" = {
-      name = "cron-parser";
-      packageName = "cron-parser";
-      version = "4.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz";
-        sha512 = "p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==";
-      };
-    };
-    "cross-dirname-0.1.0" = {
-      name = "cross-dirname";
-      packageName = "cross-dirname";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz";
-        sha512 = "+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==";
-      };
-    };
     "cross-fetch-3.1.8" = {
       name = "cross-fetch";
       packageName = "cross-fetch";
@@ -12957,15 +8031,6 @@ let
         sha512 = "Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==";
       };
     };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==";
-      };
-    };
     "cross-spawn-6.0.6" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
@@ -13038,15 +8103,6 @@ let
         sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==";
       };
     };
-    "css-select-4.3.0" = {
-      name = "css-select";
-      packageName = "css-select";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz";
-        sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==";
-      };
-    };
     "css-select-5.1.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -13074,24 +8130,6 @@ let
         sha512 = "6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==";
       };
     };
-    "css-what-6.1.0" = {
-      name = "css-what";
-      packageName = "css-what";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz";
-        sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
-      };
-    };
-    "cssauron-1.4.0" = {
-      name = "cssauron";
-      packageName = "cssauron";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz";
-        sha512 = "Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==";
-      };
-    };
     "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
@@ -13110,42 +8148,6 @@ let
         sha512 = "0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==";
       };
     };
-    "cssom-0.3.8" = {
-      name = "cssom";
-      packageName = "cssom";
-      version = "0.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz";
-        sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==";
-      };
-    };
-    "cssom-0.4.4" = {
-      name = "cssom";
-      packageName = "cssom";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz";
-        sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==";
-      };
-    };
-    "cssstyle-2.3.0" = {
-      name = "cssstyle";
-      packageName = "cssstyle";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz";
-        sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
-      };
-    };
-    "cssstyle-4.3.0" = {
-      name = "cssstyle";
-      packageName = "cssstyle";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz";
-        sha512 = "6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==";
-      };
-    };
     "csstype-3.1.3" = {
       name = "csstype";
       packageName = "csstype";
@@ -13227,15 +8229,6 @@ let
         sha512 = "p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg==";
       };
     };
-    "cwise-compiler-1.1.3" = {
-      name = "cwise-compiler";
-      packageName = "cwise-compiler";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz";
-        sha512 = "WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==";
-      };
-    };
     "cycle-1.0.3" = {
       name = "cycle";
       packageName = "cycle";
@@ -13245,15 +8238,6 @@ let
         sha512 = "TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA==";
       };
     };
-    "cycle-onionify-4.0.0" = {
-      name = "cycle-onionify";
-      packageName = "cycle-onionify";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cycle-onionify/-/cycle-onionify-4.0.0.tgz";
-        sha512 = "DJxoCbxU8lNxtTUx/q6Xzb+uTVn+MZcq8FgbFzMQlEQyH9+C1HmAPliBjmtHx40BRVE9wIqV7lGR681u2s1sHQ==";
-      };
-    };
     "cyclist-0.1.1" = {
       name = "cyclist";
       packageName = "cyclist";
@@ -13263,15 +8247,6 @@ let
         sha512 = "w8a8nQk9YSCkMmH2wDbFqpH1XMz7l409mSvWnnG6Iu6D0Ydhvq61XASE7QIaA46FxfG2Ag524ZuGgAy2cXPfsw==";
       };
     };
-    "d-1.0.2" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.2.tgz";
-        sha512 = "MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==";
-      };
-    };
     "d3-array-3.2.4" = {
       name = "d3-array";
       packageName = "d3-array";
@@ -13506,60 +8481,6 @@ let
         sha512 = "7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==";
       };
     };
-    "data-urls-2.0.0" = {
-      name = "data-urls";
-      packageName = "data-urls";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz";
-        sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==";
-      };
-    };
-    "data-urls-5.0.0" = {
-      name = "data-urls";
-      packageName = "data-urls";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz";
-        sha512 = "ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==";
-      };
-    };
-    "data-view-buffer-1.0.2" = {
-      name = "data-view-buffer";
-      packageName = "data-view-buffer";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz";
-        sha512 = "EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==";
-      };
-    };
-    "data-view-byte-length-1.0.2" = {
-      name = "data-view-byte-length";
-      packageName = "data-view-byte-length";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz";
-        sha512 = "tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==";
-      };
-    };
-    "data-view-byte-offset-1.0.1" = {
-      name = "data-view-byte-offset";
-      packageName = "data-view-byte-offset";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz";
-        sha512 = "BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==";
-      };
-    };
-    "datauri-4.1.0" = {
-      name = "datauri";
-      packageName = "datauri";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/datauri/-/datauri-4.1.0.tgz";
-        sha512 = "y17kh32+I82G+ED9MNWFkZiP/Cq/vO1hN9+tSZsT9C9qn3NrvcBnh7crSepg0AQPge1hXx2Ca44s1FRdv0gFWA==";
-      };
-    };
     "date-fns-1.30.1" = {
       name = "date-fns";
       packageName = "date-fns";
@@ -13578,51 +8499,6 @@ let
         sha512 = "39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==";
       };
     };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha512 = "AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==";
-      };
-    };
-    "dateformat-2.2.0" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz";
-        sha512 = "GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==";
-      };
-    };
-    "dayjs-1.11.12" = {
-      name = "dayjs";
-      packageName = "dayjs";
-      version = "1.11.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz";
-        sha512 = "Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==";
-      };
-    };
-    "dayjs-1.11.13" = {
-      name = "dayjs";
-      packageName = "dayjs";
-      version = "1.11.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz";
-        sha512 = "oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==";
-      };
-    };
-    "deasync-0.1.20" = {
-      name = "deasync";
-      packageName = "deasync";
-      version = "0.1.20";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz";
-        sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
-      };
-    };
     "debounce-fn-5.1.2" = {
       name = "debounce-fn";
       packageName = "debounce-fn";
@@ -13650,15 +8526,6 @@ let
         sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
-    "debug-3.2.7" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
-      };
-    };
     "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
@@ -13668,15 +8535,6 @@ let
         sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
       };
     };
-    "debug-4.3.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
-        sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
-      };
-    };
     "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
@@ -13731,15 +8589,6 @@ let
         sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==";
       };
     };
-    "decamelize-4.0.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz";
-        sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==";
-      };
-    };
     "decamelize-5.0.1" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -13767,15 +8616,6 @@ let
         sha512 = "WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==";
       };
     };
-    "decimal.js-10.5.0" = {
-      name = "decimal.js";
-      packageName = "decimal.js";
-      version = "10.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz";
-        sha512 = "8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==";
-      };
-    };
     "decode-named-character-reference-1.1.0" = {
       name = "decode-named-character-reference";
       packageName = "decode-named-character-reference";
@@ -13884,15 +8724,6 @@ let
         sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==";
       };
     };
-    "deep-extend-0.5.1" = {
-      name = "deep-extend";
-      packageName = "deep-extend";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
-        sha512 = "N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==";
-      };
-    };
     "deep-extend-0.6.0" = {
       name = "deep-extend";
       packageName = "deep-extend";
@@ -13911,15 +8742,6 @@ let
         sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==";
       };
     };
-    "deepmerge-2.2.1" = {
-      name = "deepmerge";
-      packageName = "deepmerge";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz";
-        sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==";
-      };
-    };
     "deepmerge-4.3.1" = {
       name = "deepmerge";
       packageName = "deepmerge";
@@ -14100,15 +8922,6 @@ let
         sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==";
       };
     };
-    "denque-2.1.0" = {
-      name = "denque";
-      packageName = "denque";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz";
-        sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==";
-      };
-    };
     "depcheck-1.4.7" = {
       name = "depcheck";
       packageName = "depcheck";
@@ -14343,15 +9156,6 @@ let
         sha512 = "PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==";
       };
     };
-    "diff-match-patch-1.0.5" = {
-      name = "diff-match-patch";
-      packageName = "diff-match-patch";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz";
-        sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==";
-      };
-    };
     "diff2html-3.4.51" = {
       name = "diff2html";
       packageName = "diff2html";
@@ -14370,15 +9174,6 @@ let
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
-    "dir-compare-4.2.0" = {
-      name = "dir-compare";
-      packageName = "dir-compare";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz";
-        sha512 = "2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==";
-      };
-    };
     "dir-glob-3.0.1" = {
       name = "dir-glob";
       packageName = "dir-glob";
@@ -14424,15 +9219,6 @@ let
         sha512 = "Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ==";
       };
     };
-    "dnscache-1.0.2" = {
-      name = "dnscache";
-      packageName = "dnscache";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dnscache/-/dnscache-1.0.2.tgz";
-        sha512 = "2FFKzmLGOnD+Y378bRKH+gTjRMuSpH7OKgPy31KjjfCoKZx7tU8Dmqfd/3fhG2d/4bppuN8/KtWMUZBAcUCRnQ==";
-      };
-    };
     "docker-modem-5.0.6" = {
       name = "docker-modem";
       packageName = "docker-modem";
@@ -14460,33 +9246,6 @@ let
         sha512 = "6GYP/EdzEY50HaOxTVTJ2p+mB5xDHTMJhS+UoGrVyS6VC+iQRh7kZ4FRpUYq6nziby7hPqWhOrFFUFTMUZJJ5w==";
       };
     };
-    "doctrine-2.1.0" = {
-      name = "doctrine";
-      packageName = "doctrine";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz";
-        sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
-      };
-    };
-    "doipjs-0.15.7" = {
-      name = "doipjs";
-      packageName = "doipjs";
-      version = "0.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.7.tgz";
-        sha512 = "EtgFvcLZKw2JogMJ3zG4YRtsKP9tSwdbcG5dYoDBvzG8U1zI7MH0lQdJnETdNamqY/LfpN3rzJwecFjq60rd6w==";
-      };
-    };
-    "dom-converter-0.2.0" = {
-      name = "dom-converter";
-      packageName = "dom-converter";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz";
-        sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
-      };
-    };
     "dom-serializer-0.2.2" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
@@ -14496,33 +9255,6 @@ let
         sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
       };
     };
-    "dom-serializer-1.4.1" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz";
-        sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==";
-      };
-    };
-    "dom-serializer-2.0.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz";
-        sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==";
-      };
-    };
-    "dom-storage-2.1.0" = {
-      name = "dom-storage";
-      packageName = "dom-storage";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-storage/-/dom-storage-2.1.0.tgz";
-        sha512 = "g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==";
-      };
-    };
     "dom-walk-0.1.2" = {
       name = "dom-walk";
       packageName = "dom-walk";
@@ -14559,96 +9291,6 @@ let
         sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==";
       };
     };
-    "domexception-2.0.1" = {
-      name = "domexception";
-      packageName = "domexception";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz";
-        sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==";
-      };
-    };
-    "domhandler-2.3.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-        sha512 = "q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==";
-      };
-    };
-    "domhandler-2.4.2" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
-        sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
-      };
-    };
-    "domhandler-4.3.1" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz";
-        sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==";
-      };
-    };
-    "domhandler-5.0.3" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz";
-        sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==";
-      };
-    };
-    "domino-2.1.6" = {
-      name = "domino";
-      packageName = "domino";
-      version = "2.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz";
-        sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==";
-      };
-    };
-    "domutils-1.5.1" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha512 = "gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==";
-      };
-    };
-    "domutils-1.7.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz";
-        sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
-      };
-    };
-    "domutils-2.8.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "2.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz";
-        sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==";
-      };
-    };
-    "domutils-3.1.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz";
-        sha512 = "H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==";
-      };
-    };
     "domutils-3.2.2" = {
       name = "domutils";
       packageName = "domutils";
@@ -14667,15 +9309,6 @@ let
         sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==";
       };
     };
-    "dot-prop-3.0.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
-        sha512 = "k4ELWeEU3uCcwub7+dWydqQBRjAjkV9L33HjVRG5Xo2QybI6ja/v+4W73SRi8ubCqJz0l9XsTP1NbewfyqaSlw==";
-      };
-    };
     "dot-prop-4.2.1" = {
       name = "dot-prop";
       packageName = "dot-prop";
@@ -14766,15 +9399,6 @@ let
         sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA==";
       };
     };
-    "draftlog-1.0.13" = {
-      name = "draftlog";
-      packageName = "draftlog";
-      version = "1.0.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/draftlog/-/draftlog-1.0.13.tgz";
-        sha512 = "GeMWOpXERBpfVDK6v7m0x1hPg8+g8ZsZWqJl2T17wHqrm4h8fnjiZmXcnCrmwogAc6R3YTxFXax15wezfuyCUw==";
-      };
-    };
     "dreamopt-0.8.0" = {
       name = "dreamopt";
       packageName = "dreamopt";
@@ -14820,15 +9444,6 @@ let
         sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==";
       };
     };
-    "duplexer2-0.0.2" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
-        sha512 = "+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==";
-      };
-    };
     "duplexer2-0.1.4" = {
       name = "duplexer2";
       packageName = "duplexer2";
@@ -14937,15 +9552,6 @@ let
         sha512 = "pk+k0oK0PVXdlT4oRp4lwh+unuKB7Ng4iZ2HB+EZ7QCEQizX360Rp/F4aRpgpRgdP2ufB35N+1KppHmYjqIGSg==";
       };
     };
-    "editorconfig-1.0.4" = {
-      name = "editorconfig";
-      packageName = "editorconfig";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz";
-        sha512 = "L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==";
-      };
-    };
     "ee-first-1.1.1" = {
       name = "ee-first";
       packageName = "ee-first";
@@ -14964,15 +9570,6 @@ let
         sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==";
       };
     };
-    "electron-to-chromium-1.5.118" = {
-      name = "electron-to-chromium";
-      packageName = "electron-to-chromium";
-      version = "1.5.118";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.118.tgz";
-        sha512 = "yNDUus0iultYyVoEFLnQeei7LOQkL8wg8GQpkPCRrOlJXlcCwa6eGKZkxQ9ciHsqZyYbj8Jd94X1CTPzGm+uIA==";
-      };
-    };
     "elegant-spinner-1.0.1" = {
       name = "elegant-spinner";
       packageName = "elegant-spinner";
@@ -15000,15 +9597,6 @@ let
         sha512 = "EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==";
       };
     };
-    "emoji-regex-7.0.3" = {
-      name = "emoji-regex";
-      packageName = "emoji-regex";
-      version = "7.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz";
-        sha512 = "CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==";
-      };
-    };
     "emoji-regex-8.0.0" = {
       name = "emoji-regex";
       packageName = "emoji-regex";
@@ -15045,15 +9633,6 @@ let
         sha512 = "b52zmWqBwv9juk6lKaTdYxRQSnpsnT58Sj/x6fE8fZWcsNd43gAPXUbtjLKJvVlPS9FFNCN6nB9Vh1xipnCzXw==";
       };
     };
-    "emphasize-1.5.0" = {
-      name = "emphasize";
-      packageName = "emphasize";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emphasize/-/emphasize-1.5.0.tgz";
-        sha512 = "7iCAsVoMYjRo+3DziH6szDxEL3h10dbuhD/aDKlcH0nzStbn4Yb3zWVaHivGtH5TsqZsTIl94Dr80OqRYcAlAQ==";
-      };
-    };
     "enabled-2.0.0" = {
       name = "enabled";
       packageName = "enabled";
@@ -15180,42 +9759,6 @@ let
         sha512 = "HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==";
       };
     };
-    "enhanced-resolve-2.3.0" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz";
-        sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q==";
-      };
-    };
-    "enhanced-resolve-5.18.1" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "5.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz";
-        sha512 = "ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==";
-      };
-    };
-    "enquirer-2.4.1" = {
-      name = "enquirer";
-      packageName = "enquirer";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz";
-        sha512 = "rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==";
-      };
-    };
-    "entities-1.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
-        sha512 = "LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==";
-      };
-    };
     "entities-1.1.2" = {
       name = "entities";
       packageName = "entities";
@@ -15252,15 +9795,6 @@ let
         sha512 = "V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==";
       };
     };
-    "entities-5.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-5.0.0.tgz";
-        sha512 = "BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==";
-      };
-    };
     "env-paths-2.2.1" = {
       name = "env-paths";
       packageName = "env-paths";
@@ -15279,15 +9813,6 @@ let
         sha512 = "dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==";
       };
     };
-    "envinfo-7.14.0" = {
-      name = "envinfo";
-      packageName = "envinfo";
-      version = "7.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz";
-        sha512 = "CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==";
-      };
-    };
     "environment-1.1.0" = {
       name = "environment";
       packageName = "environment";
@@ -15324,24 +9849,6 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "errorhandler-1.5.1" = {
-      name = "errorhandler";
-      packageName = "errorhandler";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz";
-        sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
-      };
-    };
-    "es-abstract-1.23.9" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.23.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz";
-        sha512 = "py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==";
-      };
-    };
     "es-aggregate-error-1.0.13" = {
       name = "es-aggregate-error";
       packageName = "es-aggregate-error";
@@ -15351,15 +9858,6 @@ let
         sha512 = "KkzhUUuD2CUMqEc8JEqsXEMDHzDPE8RCjZeUBitsnB1eNcAJWQPiciKsMXe3Yytj4Flw1XLl46Qcf9OxvZha7A==";
       };
     };
-    "es-array-method-boxes-properly-1.0.0" = {
-      name = "es-array-method-boxes-properly";
-      packageName = "es-array-method-boxes-properly";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz";
-        sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==";
-      };
-    };
     "es-define-property-1.0.1" = {
       name = "es-define-property";
       packageName = "es-define-property";
@@ -15378,15 +9876,6 @@ let
         sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==";
       };
     };
-    "es-escape-html-0.1.1" = {
-      name = "es-escape-html";
-      packageName = "es-escape-html";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-escape-html/-/es-escape-html-0.1.1.tgz";
-        sha512 = "yUx1o+8RsG7UlszmYPtks+dm6Lho2m8lgHMOsLJQsFI0R8XwUJwiMhM1M4E/S8QLeGyf6MkDV/pWgjQ0tdTSyQ==";
-      };
-    };
     "es-get-iterator-1.1.3" = {
       name = "es-get-iterator";
       packageName = "es-get-iterator";
@@ -15405,15 +9894,6 @@ let
         sha512 = "cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==";
       };
     };
-    "es-module-lexer-1.6.0" = {
-      name = "es-module-lexer";
-      packageName = "es-module-lexer";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz";
-        sha512 = "qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==";
-      };
-    };
     "es-object-atoms-1.1.1" = {
       name = "es-object-atoms";
       packageName = "es-object-atoms";
@@ -15432,15 +9912,6 @@ let
         sha512 = "j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==";
       };
     };
-    "es-to-primitive-1.3.0" = {
-      name = "es-to-primitive";
-      packageName = "es-to-primitive";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz";
-        sha512 = "w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==";
-      };
-    };
     "es-toolkit-1.33.0" = {
       name = "es-toolkit";
       packageName = "es-toolkit";
@@ -15450,33 +9921,6 @@ let
         sha512 = "X13Q/ZSc+vsO1q600bvNK4bxgXMkHcf//RxCmYDaRY5DAcT+eoXjY5hoAPGMdRnWQjvyLEcyauG3b6hz76LNqg==";
       };
     };
-    "es5-ext-0.10.64" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.64";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz";
-        sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==";
-      };
-    };
-    "es6-iterator-2.0.3" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
-        sha512 = "zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==";
-      };
-    };
-    "es6-map-0.1.5" = {
-      name = "es6-map";
-      packageName = "es6-map";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
-        sha512 = "mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==";
-      };
-    };
     "es6-promise-3.3.1" = {
       name = "es6-promise";
       packageName = "es6-promise";
@@ -15486,51 +9930,6 @@ let
         sha512 = "SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==";
       };
     };
-    "es6-promise-4.2.8" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
-        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
-      };
-    };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha512 = "C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==";
-      };
-    };
-    "es6-set-0.1.6" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz";
-        sha512 = "TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==";
-      };
-    };
-    "es6-symbol-3.1.4" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz";
-        sha512 = "U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==";
-      };
-    };
-    "es6-weak-map-2.0.3" = {
-      name = "es6-weak-map";
-      packageName = "es6-weak-map";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
-        sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==";
-      };
-    };
     "esbuild-0.14.47" = {
       name = "esbuild";
       packageName = "esbuild";
@@ -15765,15 +10164,6 @@ let
         sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==";
       };
     };
-    "escape-goat-3.0.0" = {
-      name = "escape-goat";
-      packageName = "escape-goat";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz";
-        sha512 = "w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==";
-      };
-    };
     "escape-goat-4.0.0" = {
       name = "escape-goat";
       packageName = "escape-goat";
@@ -15846,24 +10236,6 @@ let
         sha512 = "2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==";
       };
     };
-    "escope-3.6.0" = {
-      name = "escope";
-      packageName = "escope";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
-        sha512 = "75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==";
-      };
-    };
-    "eslint-3.19.0" = {
-      name = "eslint";
-      packageName = "eslint";
-      version = "3.19.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
-        sha512 = "x6LJGXWCGB/4YOBhL48yeppZTo+YQUNC37N5qqCpC1b1kkNzydlQHQAtPuUSFoZSxgIadrysQoW2Hq602P+uEA==";
-      };
-    };
     "eslint-9.22.0" = {
       name = "eslint";
       packageName = "eslint";
@@ -15891,15 +10263,6 @@ let
         sha512 = "+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A==";
       };
     };
-    "eslint-scope-5.1.1" = {
-      name = "eslint-scope";
-      packageName = "eslint-scope";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz";
-        sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==";
-      };
-    };
     "eslint-scope-8.3.0" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
@@ -15936,15 +10299,6 @@ let
         sha512 = "Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==";
       };
     };
-    "esniff-2.0.1" = {
-      name = "esniff";
-      packageName = "esniff";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz";
-        sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==";
-      };
-    };
     "espree-10.3.0" = {
       name = "espree";
       packageName = "espree";
@@ -15954,15 +10308,6 @@ let
         sha512 = "0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==";
       };
     };
-    "espree-3.5.4" = {
-      name = "espree";
-      packageName = "espree";
-      version = "3.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
-        sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
-      };
-    };
     "esprima-4.0.1" = {
       name = "esprima";
       packageName = "esprima";
@@ -15999,15 +10344,6 @@ let
         sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
       };
     };
-    "estraverse-4.3.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
-        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
-      };
-    };
     "estraverse-5.3.0" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -16053,15 +10389,6 @@ let
         sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
       };
     };
-    "eta-3.5.0" = {
-      name = "eta";
-      packageName = "eta";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz";
-        sha512 = "e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug==";
-      };
-    };
     "etag-1.8.1" = {
       name = "etag";
       packageName = "etag";
@@ -16071,42 +10398,6 @@ let
         sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==";
       };
     };
-    "ethereum-bloom-filters-1.2.0" = {
-      name = "ethereum-bloom-filters";
-      packageName = "ethereum-bloom-filters";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.2.0.tgz";
-        sha512 = "28hyiE7HVsWubqhpVLVmZXFd4ITeHi+BUu05o9isf0GUpMtzBUi+8/gFrGaGYzvGAJQmJ3JKj77Mk9G98T84rA==";
-      };
-    };
-    "ethereum-cryptography-2.2.1" = {
-      name = "ethereum-cryptography";
-      packageName = "ethereum-cryptography";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz";
-        sha512 = "r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==";
-      };
-    };
-    "ethjs-unit-0.1.6" = {
-      name = "ethjs-unit";
-      packageName = "ethjs-unit";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz";
-        sha512 = "/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw==";
-      };
-    };
-    "event-emitter-0.3.5" = {
-      name = "event-emitter";
-      packageName = "event-emitter";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
-        sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==";
-      };
-    };
     "event-stream-3.1.7" = {
       name = "event-stream";
       packageName = "event-stream";
@@ -16260,15 +10551,6 @@ let
         sha512 = "EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==";
       };
     };
-    "execall-2.0.0" = {
-      name = "execall";
-      packageName = "execall";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz";
-        sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==";
-      };
-    };
     "exif-parser-0.1.12" = {
       name = "exif-parser";
       packageName = "exif-parser";
@@ -16278,24 +10560,6 @@ let
         sha512 = "c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw==";
       };
     };
-    "exit-0.1.2" = {
-      name = "exit";
-      packageName = "exit";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
-        sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==";
-      };
-    };
-    "exit-hook-1.1.1" = {
-      name = "exit-hook";
-      packageName = "exit-hook";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz";
-        sha512 = "MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==";
-      };
-    };
     "exit-hook-4.0.0" = {
       name = "exit-hook";
       packageName = "exit-hook";
@@ -16359,15 +10623,6 @@ let
         sha512 = "8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA==";
       };
     };
-    "express-2.5.11" = {
-      name = "express";
-      packageName = "express";
-      version = "2.5.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express/-/express-2.5.11.tgz";
-        sha512 = "gc3jJ0P3Bh1Zjkxe0ICSNmjhDvYWKiXfQIdDWuRPr8S4IZAZexzJHjrzNz56LsRKHTL0OiXQq602GfwZjZ8xPQ==";
-      };
-    };
     "express-4.21.2" = {
       name = "express";
       packageName = "express";
@@ -16377,60 +10632,6 @@ let
         sha512 = "28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==";
       };
     };
-    "express-handlebars-3.1.0" = {
-      name = "express-handlebars";
-      packageName = "express-handlebars";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-handlebars/-/express-handlebars-3.1.0.tgz";
-        sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg==";
-      };
-    };
-    "express-interceptor-1.2.0" = {
-      name = "express-interceptor";
-      packageName = "express-interceptor";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-interceptor/-/express-interceptor-1.2.0.tgz";
-        sha512 = "fCbcJv8ZwabDg0M/3PmHUxfr/WKHGMpAicR9TfGdhANV4M1GBDSrBTenHIK3aegyRN5S6eDwlvyNFiLynnc19w==";
-      };
-    };
-    "express-prom-bundle-7.0.0" = {
-      name = "express-prom-bundle";
-      packageName = "express-prom-bundle";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-7.0.0.tgz";
-        sha512 = "VwVaCyGBGHkHdecpTqRdW1Jm2fXK8weCUKjGjNWorc9g4M+cZ3xoj+N9uQzfRWfIPXJG5QOaiAziOIalQzMwgA==";
-      };
-    };
-    "express-session-1.18.1" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz";
-        sha512 = "a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==";
-      };
-    };
-    "express-validator-6.15.0" = {
-      name = "express-validator";
-      packageName = "express-validator";
-      version = "6.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-validator/-/express-validator-6.15.0.tgz";
-        sha512 = "r05VYoBL3i2pswuehoFSy+uM8NBuVaY7avp5qrYjQBDzagx2Z5A77FZqPT8/gNLF3HopWkIzaTFaC4JysWXLqg==";
-      };
-    };
-    "ext-1.7.0" = {
-      name = "ext";
-      packageName = "ext";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz";
-        sha512 = "6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==";
-      };
-    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -16557,15 +10758,6 @@ let
         sha512 = "GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==";
       };
     };
-    "fancy-log-1.3.3" = {
-      name = "fancy-log";
-      packageName = "fancy-log";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz";
-        sha512 = "k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==";
-      };
-    };
     "fast-csv-4.3.6" = {
       name = "fast-csv";
       packageName = "fast-csv";
@@ -16584,15 +10776,6 @@ let
         sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     };
-    "fast-diff-1.3.0" = {
-      name = "fast-diff";
-      packageName = "fast-diff";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz";
-        sha512 = "VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==";
-      };
-    };
     "fast-fifo-1.3.2" = {
       name = "fast-fifo";
       packageName = "fast-fifo";
@@ -16665,15 +10848,6 @@ let
         sha512 = "Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==";
       };
     };
-    "fast-xml-parser-3.21.1" = {
-      name = "fast-xml-parser";
-      packageName = "fast-xml-parser";
-      version = "3.21.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz";
-        sha512 = "FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==";
-      };
-    };
     "fast-xml-parser-4.1.2" = {
       name = "fast-xml-parser";
       packageName = "fast-xml-parser";
@@ -16719,15 +10893,6 @@ let
         sha512 = "GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==";
       };
     };
-    "fault-1.0.4" = {
-      name = "fault";
-      packageName = "fault";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz";
-        sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==";
-      };
-    };
     "fault-2.0.1" = {
       name = "fault";
       packageName = "fault";
@@ -16863,24 +11028,6 @@ let
         sha512 = "d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==";
       };
     };
-    "file-entry-cache-2.0.0" = {
-      name = "file-entry-cache";
-      packageName = "file-entry-cache";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz";
-        sha512 = "uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==";
-      };
-    };
-    "file-entry-cache-6.0.1" = {
-      name = "file-entry-cache";
-      packageName = "file-entry-cache";
-      version = "6.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz";
-        sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==";
-      };
-    };
     "file-entry-cache-8.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -16980,15 +11127,6 @@ let
         sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==";
       };
     };
-    "filenamify-4.3.0" = {
-      name = "filenamify";
-      packageName = "filenamify";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz";
-        sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==";
-      };
-    };
     "filesize-6.4.0" = {
       name = "filesize";
       packageName = "filesize";
@@ -17025,24 +11163,6 @@ let
         sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha512 = "4XwZ1k4rgoF3Yap59MyXFmiUh2zu9fht32NYPSRYwLv4o8BWHxi60I1VH5kHje14qGMoS3qyfHQUsN16ROOugQ==";
-      };
-    };
-    "filter-obj-1.1.0" = {
-      name = "filter-obj";
-      packageName = "filter-obj";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz";
-        sha512 = "8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==";
-      };
-    };
     "finalhandler-1.1.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -17070,15 +11190,6 @@ let
         sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==";
       };
     };
-    "find-cache-dir-2.1.0" = {
-      name = "find-cache-dir";
-      packageName = "find-cache-dir";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
-        sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
-      };
-    };
     "find-up-1.1.2" = {
       name = "find-up";
       packageName = "find-up";
@@ -17088,24 +11199,6 @@ let
         sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==";
       };
     };
-    "find-up-2.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
-        sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==";
-      };
-    };
-    "find-up-3.0.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz";
-        sha512 = "1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==";
-      };
-    };
     "find-up-4.1.0" = {
       name = "find-up";
       packageName = "find-up";
@@ -17232,33 +11325,6 @@ let
         sha512 = "Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==";
       };
     };
-    "flat-5.0.2" = {
-      name = "flat";
-      packageName = "flat";
-      version = "5.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz";
-        sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
-      };
-    };
-    "flat-cache-1.3.4" = {
-      name = "flat-cache";
-      packageName = "flat-cache";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz";
-        sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==";
-      };
-    };
-    "flat-cache-3.2.0" = {
-      name = "flat-cache";
-      packageName = "flat-cache";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz";
-        sha512 = "CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==";
-      };
-    };
     "flat-cache-4.0.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -17295,15 +11361,6 @@ let
         sha512 = "pzNZh42/A2HmcRIpddSP0T+zBofd119o5rNB2u1YHv36CM2C/ietI2ZsjWZ2LSL7J0BNVkFn1a9Ad+cmO2lDQg==";
       };
     };
-    "flora-colossus-2.0.0" = {
-      name = "flora-colossus";
-      packageName = "flora-colossus";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flora-colossus/-/flora-colossus-2.0.0.tgz";
-        sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA==";
-      };
-    };
     "fluent-ffmpeg-2.1.3" = {
       name = "fluent-ffmpeg";
       packageName = "fluent-ffmpeg";
@@ -17331,15 +11388,6 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.15.6" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "1.15.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz";
-        sha512 = "wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==";
-      };
-    };
     "follow-redirects-1.15.9" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -17349,15 +11397,6 @@ let
         sha512 = "gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==";
       };
     };
-    "font-awesome-filetypes-2.1.0" = {
-      name = "font-awesome-filetypes";
-      packageName = "font-awesome-filetypes";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/font-awesome-filetypes/-/font-awesome-filetypes-2.1.0.tgz";
-        sha512 = "U6hi14GRjfZFIWsTNyVmCBuHyPhiizWEKVbaQqHipKQv3rA1l1PNvmKulzpqxonFnQMToty5ZhfWbc/0IjLDGA==";
-      };
-    };
     "for-each-0.3.5" = {
       name = "for-each";
       packageName = "for-each";
@@ -17367,24 +11406,6 @@ let
         sha512 = "dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==";
       };
     };
-    "for-each-property-0.0.4" = {
-      name = "for-each-property";
-      packageName = "for-each-property";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/for-each-property/-/for-each-property-0.0.4.tgz";
-        sha512 = "xYs28PM0CKXETFzuGC6ZooH0voZlsSDZwidJcy92flQJi3PK7i3gZx23xHXCPOaD4zmet3bDo+wS7E7SujrlCw==";
-      };
-    };
-    "for-each-property-deep-0.0.3" = {
-      name = "for-each-property-deep";
-      packageName = "for-each-property-deep";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/for-each-property-deep/-/for-each-property-deep-0.0.3.tgz";
-        sha512 = "qzP8QkODWVVRPpWiBZacSbBl67cTTWoBfxMG0wE46AsS1yl7qv05sGN+dHvD4s4tnvl/goe6Sp4qBI+rlVBgNg==";
-      };
-    };
     "for-in-1.0.2" = {
       name = "for-in";
       packageName = "for-in";
@@ -17457,33 +11478,6 @@ let
         sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
-    "form-data-2.5.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.5.3.tgz";
-        sha512 = "XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==";
-      };
-    };
-    "form-data-3.0.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz";
-        sha512 = "q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==";
-      };
-    };
-    "form-data-4.0.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz";
-        sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==";
-      };
-    };
     "form-data-4.0.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -17520,15 +11514,6 @@ let
         sha512 = "buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==";
       };
     };
-    "formidable-1.0.17" = {
-      name = "formidable";
-      packageName = "formidable";
-      version = "1.0.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/formidable/-/formidable-1.0.17.tgz";
-        sha512 = "95MFT5qipMvUiesmuvGP1BI4hh5XWCzyTapiNJ/k8JBQda7rPy7UCWYItz2uZEdTgGNy1eInjzlL9Wx1O9fedg==";
-      };
-    };
     "formidable-1.2.6" = {
       name = "formidable";
       packageName = "formidable";
@@ -17583,15 +11568,6 @@ let
         sha512 = "twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==";
       };
     };
-    "from2-2.3.0" = {
-      name = "from2";
-      packageName = "from2";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
-        sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==";
-      };
-    };
     "fs-chunk-store-1.7.0" = {
       name = "fs-chunk-store";
       packageName = "fs-chunk-store";
@@ -17610,24 +11586,6 @@ let
         sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==";
       };
     };
-    "fs-exists-cached-1.0.0" = {
-      name = "fs-exists-cached";
-      packageName = "fs-exists-cached";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz";
-        sha512 = "kSxoARUDn4F2RPXX48UXnaFKwVU7Ivd/6qpzZL29MCDmr9sTvybv4gFCp+qaI4fM9m0z9fgz/yJvi56GAz+BZg==";
-      };
-    };
-    "fs-extra-0.26.7" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "0.26.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz";
-        sha512 = "waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==";
-      };
-    };
     "fs-extra-0.6.4" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -17655,15 +11613,6 @@ let
         sha512 = "0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==";
       };
     };
-    "fs-extra-11.2.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "11.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz";
-        sha512 = "PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==";
-      };
-    };
     "fs-extra-11.3.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -17718,24 +11667,6 @@ let
         sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==";
       };
     };
-    "fs-mkdirp-stream-2.0.1" = {
-      name = "fs-mkdirp-stream";
-      packageName = "fs-mkdirp-stream";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz";
-        sha512 = "UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==";
-      };
-    };
-    "fs-readdir-recursive-1.1.0" = {
-      name = "fs-readdir-recursive";
-      packageName = "fs-readdir-recursive";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz";
-        sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==";
-      };
-    };
     "fs.extra-1.3.2" = {
       name = "fs.extra";
       packageName = "fs.extra";
@@ -17772,15 +11703,6 @@ let
         sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==";
       };
     };
-    "function.prototype.name-1.1.8" = {
-      name = "function.prototype.name";
-      packageName = "function.prototype.name";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz";
-        sha512 = "e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==";
-      };
-    };
     "functions-have-names-1.2.3" = {
       name = "functions-have-names";
       packageName = "functions-have-names";
@@ -17808,24 +11730,6 @@ let
         sha512 = "Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q==";
       };
     };
-    "galactus-1.0.0" = {
-      name = "galactus";
-      packageName = "galactus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/galactus/-/galactus-1.0.0.tgz";
-        sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ==";
-      };
-    };
-    "gatsby-core-utils-4.14.0" = {
-      name = "gatsby-core-utils";
-      packageName = "gatsby-core-utils";
-      version = "4.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.14.0.tgz";
-        sha512 = "h0v20gB213PmhKjioCJ93SrUb7Hihnqxd6X6Iur4u1eiWTUDsGeV9g1bkquiuDl2qovUnjj7mOoHdWiu/Ax/9Q==";
-      };
-    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -17844,15 +11748,6 @@ let
         sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==";
       };
     };
-    "gauge-4.0.4" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz";
-        sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==";
-      };
-    };
     "gaze-1.1.3" = {
       name = "gaze";
       packageName = "gaze";
@@ -17862,51 +11757,6 @@ let
         sha512 = "BRdNm8hbWzFzWHERTrejLqwHDfS4GibPoq5wjTPIoJHoBtKGPg3xAFfxmM+9ztbXelxcf2hwQcaz1PtmFeue8g==";
       };
     };
-    "gc-stats-1.4.1" = {
-      name = "gc-stats";
-      packageName = "gc-stats";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gc-stats/-/gc-stats-1.4.1.tgz";
-        sha512 = "eAvDBpI6UjVIYwLxshPCJJIkPyfamIrJzBtW/103+ooJWkISS+chVnHNnsZ+ubaw2607rFeiRDNWHkNUA+ioqg==";
-      };
-    };
-    "gelf-stream-1.1.1" = {
-      name = "gelf-stream";
-      packageName = "gelf-stream";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gelf-stream/-/gelf-stream-1.1.1.tgz";
-        sha512 = "kCzCfI6DJ8+aaDhwMcsNm2l6CsBj6y4Is6CCxH2W9sYnZGcXg9WmJ/iZMoJVO6uTwTRL7dbIioAS8lCuGUXSFA==";
-      };
-    };
-    "gelfling-0.3.1" = {
-      name = "gelfling";
-      packageName = "gelfling";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gelfling/-/gelfling-0.3.1.tgz";
-        sha512 = "vli3D2RYpLW6XhryNrv7HMjFNbj+ks/CCVDjokxOtZ+p6QYRadj8Zc0ps+LolSsh/I97XO0OduP/ShOej08clA==";
-      };
-    };
-    "generate-function-2.3.1" = {
-      name = "generate-function";
-      packageName = "generate-function";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz";
-        sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==";
-      };
-    };
-    "generate-object-property-1.2.0" = {
-      name = "generate-object-property";
-      packageName = "generate-object-property";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-        sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==";
-      };
-    };
     "generic-pool-3.4.2" = {
       name = "generic-pool";
       packageName = "generic-pool";
@@ -17916,15 +11766,6 @@ let
         sha512 = "H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag==";
       };
     };
-    "gensync-1.0.0-beta.2" = {
-      name = "gensync";
-      packageName = "gensync";
-      version = "1.0.0-beta.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
-        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
-      };
-    };
     "get-assigned-identifiers-1.2.0" = {
       name = "get-assigned-identifiers";
       packageName = "get-assigned-identifiers";
@@ -17943,15 +11784,6 @@ let
         sha512 = "MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==";
       };
     };
-    "get-caller-file-1.0.3" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
-      };
-    };
     "get-caller-file-2.0.5" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -17979,15 +11811,6 @@ let
         sha512 = "9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==";
       };
     };
-    "get-package-info-1.0.0" = {
-      name = "get-package-info";
-      packageName = "get-package-info";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz";
-        sha512 = "SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==";
-      };
-    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -18006,15 +11829,6 @@ let
         sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==";
       };
     };
-    "get-prototype-chain-1.0.1" = {
-      name = "get-prototype-chain";
-      packageName = "get-prototype-chain";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-prototype-chain/-/get-prototype-chain-1.0.1.tgz";
-        sha512 = "2m7WZ0jveIg/dAbCbpUxEToaJ8Dmti5EkgDP8YM3UpHUT6SAORjE2odP8XQGNVGXMHi8q8cCCoy3HTByTaTVTw==";
-      };
-    };
     "get-proxy-2.1.0" = {
       name = "get-proxy";
       packageName = "get-proxy";
@@ -18051,15 +11865,6 @@ let
         sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==";
       };
     };
-    "get-stdin-8.0.0" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz";
-        sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==";
-      };
-    };
     "get-stdin-9.0.0" = {
       name = "get-stdin";
       packageName = "get-stdin";
@@ -18132,15 +11937,6 @@ let
         sha512 = "kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==";
       };
     };
-    "get-symbol-description-1.1.0" = {
-      name = "get-symbol-description";
-      packageName = "get-symbol-description";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz";
-        sha512 = "w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==";
-      };
-    };
     "get-tsconfig-4.10.0" = {
       name = "get-tsconfig";
       packageName = "get-tsconfig";
@@ -18411,33 +12207,6 @@ let
         sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==";
       };
     };
-    "glob-stream-8.0.2" = {
-      name = "glob-stream";
-      packageName = "glob-stream";
-      version = "8.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz";
-        sha512 = "R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==";
-      };
-    };
-    "glob-to-regexp-0.4.1" = {
-      name = "glob-to-regexp";
-      packageName = "glob-to-regexp";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz";
-        sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
-      };
-    };
-    "glob-watcher-6.0.0" = {
-      name = "glob-watcher";
-      packageName = "glob-watcher";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz";
-        sha512 = "wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==";
-      };
-    };
     "global-4.4.0" = {
       name = "global";
       packageName = "global";
@@ -18519,24 +12288,6 @@ let
         sha512 = "oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==";
       };
     };
-    "globals-9.18.0" = {
-      name = "globals";
-      packageName = "globals";
-      version = "9.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
-      };
-    };
-    "globalthis-1.0.4" = {
-      name = "globalthis";
-      packageName = "globalthis";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz";
-        sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==";
-      };
-    };
     "globby-11.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -18564,15 +12315,6 @@ let
         sha512 = "0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==";
       };
     };
-    "globjoin-0.1.4" = {
-      name = "globjoin";
-      packageName = "globjoin";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz";
-        sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==";
-      };
-    };
     "globule-1.3.4" = {
       name = "globule";
       packageName = "globule";
@@ -18582,15 +12324,6 @@ let
         sha512 = "OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==";
       };
     };
-    "glogg-1.0.2" = {
-      name = "glogg";
-      packageName = "glogg";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz";
-        sha512 = "5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==";
-      };
-    };
     "glogg-2.2.0" = {
       name = "glogg";
       packageName = "glogg";
@@ -18600,15 +12333,6 @@ let
         sha512 = "eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==";
       };
     };
-    "gonzales-pe-4.3.0" = {
-      name = "gonzales-pe";
-      packageName = "gonzales-pe";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz";
-        sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==";
-      };
-    };
     "goosig-0.10.0" = {
       name = "goosig";
       packageName = "goosig";
@@ -18627,15 +12351,6 @@ let
         sha512 = "ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==";
       };
     };
-    "got-11.8.6" = {
-      name = "got";
-      packageName = "got";
-      version = "11.8.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-11.8.6.tgz";
-        sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==";
-      };
-    };
     "got-12.6.1" = {
       name = "got";
       packageName = "got";
@@ -18654,15 +12369,6 @@ let
         sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==";
       };
     };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha512 = "1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q==";
-      };
-    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -18708,15 +12414,6 @@ let
         sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
-    "grant-5.4.22" = {
-      name = "grant";
-      packageName = "grant";
-      version = "5.4.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grant/-/grant-5.4.22.tgz";
-        sha512 = "DEi+/JjXT84mmFYhSmv+SX14v+3Z7vuCIYAMwtdPCTXHMSLhWqSYqWAMXDUQZuV7yaJv2d84AYnkCFNooLKBsA==";
-      };
-    };
     "graphlib-2.1.8" = {
       name = "graphlib";
       packageName = "graphlib";
@@ -18744,15 +12441,6 @@ let
         sha512 = "tdcqOOpwArNjEr0gNQKCXwaNCWnQJrog14nJNQPeemcLnXQUUGrsCWpWkVKt46zLjcS6/KGoayeJfHHyPDlvwA==";
       };
     };
-    "growly-1.3.0" = {
-      name = "growly";
-      packageName = "growly";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz";
-        sha512 = "+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==";
-      };
-    };
     "grunt-known-options-2.0.0" = {
       name = "grunt-known-options";
       packageName = "grunt-known-options";
@@ -18762,42 +12450,6 @@ let
         sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==";
       };
     };
-    "gulp-cli-3.0.0" = {
-      name = "gulp-cli";
-      packageName = "gulp-cli";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz";
-        sha512 = "RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA==";
-      };
-    };
-    "gulp-eslint-3.0.1" = {
-      name = "gulp-eslint";
-      packageName = "gulp-eslint";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-3.0.1.tgz";
-        sha512 = "lNEEIgxKyzbjlq/kDfdS06KI+rEhfnWGd6xbMaiCP20jF5sZ/quQsuK7LZRMnQrAuUQ6MbyuYWamtgGp65440Q==";
-      };
-    };
-    "gulp-util-3.0.8" = {
-      name = "gulp-util";
-      packageName = "gulp-util";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
-        sha512 = "q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==";
-      };
-    };
-    "gulplog-1.0.0" = {
-      name = "gulplog";
-      packageName = "gulplog";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz";
-        sha512 = "hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==";
-      };
-    };
     "gulplog-2.2.0" = {
       name = "gulplog";
       packageName = "gulplog";
@@ -18924,15 +12576,6 @@ let
         sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
       };
     };
-    "has-gulplog-0.1.0" = {
-      name = "has-gulplog";
-      packageName = "has-gulplog";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz";
-        sha512 = "+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==";
-      };
-    };
     "has-own-prop-2.0.0" = {
       name = "has-own-prop";
       packageName = "has-own-prop";
@@ -18951,15 +12594,6 @@ let
         sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==";
       };
     };
-    "has-proto-1.2.0" = {
-      name = "has-proto";
-      packageName = "has-proto";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz";
-        sha512 = "KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==";
-      };
-    };
     "has-symbol-support-x-1.4.2" = {
       name = "has-symbol-support-x";
       packageName = "has-symbol-support-x";
@@ -19068,24 +12702,6 @@ let
         sha512 = "vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==";
       };
     };
-    "hash-base-3.1.0" = {
-      name = "hash-base";
-      packageName = "hash-base";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
-        sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
-      };
-    };
-    "hash-wasm-4.12.0" = {
-      name = "hash-wasm";
-      packageName = "hash-wasm";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.12.0.tgz";
-        sha512 = "+/2B2rYLb48I/evdOIhP+K/DD2ca2fgBjp6O+GBEnCDk2e4rpeXIK8GvIyRPjTezgmWn9gmKwkQjjx6BtqDHVQ==";
-      };
-    };
     "hash.js-1.1.7" = {
       name = "hash.js";
       packageName = "hash.js";
@@ -19239,15 +12855,6 @@ let
         sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
       };
     };
-    "header-range-parser-1.1.3" = {
-      name = "header-range-parser";
-      packageName = "header-range-parser";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/header-range-parser/-/header-range-parser-1.1.3.tgz";
-        sha512 = "B9zCFt3jH8g09LR1vHL4pcAn8yMEtlSlOUdQemzHMRKMImNIhhszdeosYFfNW0WXKQtXIlWB+O4owHJKvEJYaA==";
-      };
-    };
     "heap-0.2.7" = {
       name = "heap";
       packageName = "heap";
@@ -19257,24 +12864,6 @@ let
         sha512 = "2bsegYkkHO+h/9MGbn6KWcE45cHZgPANo5LXF7EvWdT0yT2EguSVO1nDgU5c8+ZOPwp2vMNa7YFsJhVcDR9Sdg==";
       };
     };
-    "heapdump-0.3.15" = {
-      name = "heapdump";
-      packageName = "heapdump";
-      version = "0.3.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/heapdump/-/heapdump-0.3.15.tgz";
-        sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
-      };
-    };
-    "helmet-7.2.0" = {
-      name = "helmet";
-      packageName = "helmet";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-7.2.0.tgz";
-        sha512 = "ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==";
-      };
-    };
     "help-me-3.0.0" = {
       name = "help-me";
       packageName = "help-me";
@@ -19302,24 +12891,6 @@ let
         sha512 = "s/SIX6yp/5S1p8aC/NRDC1fwEb+myGIfp8/TzZz0rtAv8fzsdX7vGl3Q1TrXCsczFq8DI3CBFBCySPClfBSdbg==";
       };
     };
-    "highlight.js-11.10.0" = {
-      name = "highlight.js";
-      packageName = "highlight.js";
-      version = "11.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.10.0.tgz";
-        sha512 = "SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==";
-      };
-    };
-    "highlight.js-9.12.0" = {
-      name = "highlight.js";
-      packageName = "highlight.js";
-      version = "9.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
-        sha512 = "qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg==";
-      };
-    };
     "hmac-drbg-1.0.1" = {
       name = "hmac-drbg";
       packageName = "hmac-drbg";
@@ -19356,15 +12927,6 @@ let
         sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==";
       };
     };
-    "hosted-git-info-3.0.8" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz";
-        sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==";
-      };
-    };
     "hosted-git-info-4.1.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
@@ -19401,51 +12963,6 @@ let
         sha512 = "sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg==";
       };
     };
-    "hot-patcher-2.0.1" = {
-      name = "hot-patcher";
-      packageName = "hot-patcher";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hot-patcher/-/hot-patcher-2.0.1.tgz";
-        sha512 = "ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q==";
-      };
-    };
-    "hot-shots-6.8.7" = {
-      name = "hot-shots";
-      packageName = "hot-shots";
-      version = "6.8.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hot-shots/-/hot-shots-6.8.7.tgz";
-        sha512 = "XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w==";
-      };
-    };
-    "hpagent-1.2.0" = {
-      name = "hpagent";
-      packageName = "hpagent";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hpagent/-/hpagent-1.2.0.tgz";
-        sha512 = "A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==";
-      };
-    };
-    "html-encoding-sniffer-2.0.1" = {
-      name = "html-encoding-sniffer";
-      packageName = "html-encoding-sniffer";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz";
-        sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==";
-      };
-    };
-    "html-encoding-sniffer-4.0.0" = {
-      name = "html-encoding-sniffer";
-      packageName = "html-encoding-sniffer";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz";
-        sha512 = "Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==";
-      };
-    };
     "html-entities-1.4.0" = {
       name = "html-entities";
       packageName = "html-entities";
@@ -19455,24 +12972,6 @@ let
         sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
       };
     };
-    "html-minifier-4.0.0" = {
-      name = "html-minifier";
-      packageName = "html-minifier";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz";
-        sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==";
-      };
-    };
-    "html-tags-3.3.1" = {
-      name = "html-tags";
-      packageName = "html-tags";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz";
-        sha512 = "ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==";
-      };
-    };
     "html-void-elements-3.0.0" = {
       name = "html-void-elements";
       packageName = "html-void-elements";
@@ -19491,33 +12990,6 @@ let
         sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==";
       };
     };
-    "htmlparser2-3.10.1" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz";
-        sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==";
-      };
-    };
-    "htmlparser2-3.8.3" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
-        sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==";
-      };
-    };
-    "htmlparser2-6.1.0" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz";
-        sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==";
-      };
-    };
     "http-auth-3.1.3" = {
       name = "http-auth";
       packageName = "http-auth";
@@ -19617,33 +13089,6 @@ let
         sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==";
       };
     };
-    "http-proxy-agent-2.1.0" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
-        sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
-      };
-    };
-    "http-proxy-agent-4.0.1" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz";
-        sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==";
-      };
-    };
-    "http-proxy-agent-5.0.0" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz";
-        sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==";
-      };
-    };
     "http-proxy-agent-7.0.2" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -19689,15 +13134,6 @@ let
         sha512 = "YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q==";
       };
     };
-    "http-status-emojis-2.2.0" = {
-      name = "http-status-emojis";
-      packageName = "http-status-emojis";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-status-emojis/-/http-status-emojis-2.2.0.tgz";
-        sha512 = "ompKtgwpx8ff0hsbpIB7oE4ax1LXoHmftsHHStMELX56ivG3GhofTX8ZHWlUaFKfGjcGjw6G3rPk7dJRXMmbbg==";
-      };
-    };
     "http2-client-1.3.5" = {
       name = "http2-client";
       packageName = "http2-client";
@@ -19707,15 +13143,6 @@ let
         sha512 = "EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==";
       };
     };
-    "http2-wrapper-1.0.3" = {
-      name = "http2-wrapper";
-      packageName = "http2-wrapper";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz";
-        sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==";
-      };
-    };
     "http2-wrapper-2.2.1" = {
       name = "http2-wrapper";
       packageName = "http2-wrapper";
@@ -19743,15 +13170,6 @@ let
         sha512 = "OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==";
       };
     };
-    "https-proxy-agent-3.0.1" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz";
-        sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==";
-      };
-    };
     "https-proxy-agent-5.0.1" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
@@ -19806,15 +13224,6 @@ let
         sha512 = "/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==";
       };
     };
-    "humanize-ms-1.2.1" = {
-      name = "humanize-ms";
-      packageName = "humanize-ms";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz";
-        sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==";
-      };
-    };
     "hyperlinker-1.0.0" = {
       name = "hyperlinker";
       packageName = "hyperlinker";
@@ -19869,15 +13278,6 @@ let
         sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
       };
     };
-    "ignore-3.3.10" = {
-      name = "ignore";
-      packageName = "ignore";
-      version = "3.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
-        sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
-      };
-    };
     "ignore-5.1.9" = {
       name = "ignore";
       packageName = "ignore";
@@ -19923,15 +13323,6 @@ let
         sha512 = "T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==";
       };
     };
-    "image-data-uri-2.0.1" = {
-      name = "image-data-uri";
-      packageName = "image-data-uri";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/image-data-uri/-/image-data-uri-2.0.1.tgz";
-        sha512 = "BZh721F2Q5TwBdwpiqrBrHEdj8daj8KuMZK/DOCyqQlz1CqFhhuZWbK5ZCUnAvFJr8LaKHTaWl9ja3/a3DC2Ew==";
-      };
-    };
     "image-q-4.0.0" = {
       name = "image-q";
       packageName = "image-q";
@@ -19941,15 +13332,6 @@ let
         sha512 = "PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw==";
       };
     };
-    "image-size-1.0.0" = {
-      name = "image-size";
-      packageName = "image-size";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz";
-        sha512 = "JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==";
-      };
-    };
     "imap-0.8.19" = {
       name = "imap";
       packageName = "imap";
@@ -19977,15 +13359,6 @@ let
         sha512 = "0tQyTytUaIUskpv5j5L5ZeQuEjYDl9QIekwDUisdqpAM81OZjBaEIriW7hoiRLaLNxj1fXE8e1yx5JaCGrrE7A==";
       };
     };
-    "immer-7.0.15" = {
-      name = "immer";
-      packageName = "immer";
-      version = "7.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immer/-/immer-7.0.15.tgz";
-        sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA==";
-      };
-    };
     "immer-9.0.21" = {
       name = "immer";
       packageName = "immer";
@@ -20022,15 +13395,6 @@ let
         sha512 = "TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==";
       };
     };
-    "import-from-4.0.0" = {
-      name = "import-from";
-      packageName = "import-from";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz";
-        sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==";
-      };
-    };
     "import-lazy-2.1.0" = {
       name = "import-lazy";
       packageName = "import-lazy";
@@ -20148,24 +13512,6 @@ let
         sha512 = "i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==";
       };
     };
-    "infer-owner-1.0.4" = {
-      name = "infer-owner";
-      packageName = "infer-owner";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz";
-        sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==";
-      };
-    };
-    "inflection-3.0.2" = {
-      name = "inflection";
-      packageName = "inflection";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflection/-/inflection-3.0.2.tgz";
-        sha512 = "+Bg3+kg+J6JUWn8J6bzFmOWkTQ6L/NHfDRSYU+EVvuKHDxUDHAXgqixHfVlzuBQaPOTac8hn43aPhMNk6rMe3g==";
-      };
-    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -20346,15 +13692,6 @@ let
         sha512 = "ZC410b7IbrTrmt8bQb27xUOJgXkJu+XL6MVncb9FGyxjRIHyQqNjpSDY20zvSUttkAiYj0dait/67/sXyWvwYg==";
       };
     };
-    "inquirer-0.12.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
-        sha512 = "bOetEz5+/WpgaW4D1NYOk1aD+JCqRjqu/FwRFgnIfiP7FC/zinsrfyO1vlS3nyH/R7S0IH3BIHBu4DBIDSqiGQ==";
-      };
-    };
     "inquirer-12.4.3" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -20364,15 +13701,6 @@ let
         sha512 = "p9+jcDKhFHKTunvpffCk7I9eKt8+NPNWO8hMSSoLPv5vahP5Vhr78qWzDtA+6FBWQtFTuLFUWmxTyhC6G2Xz/Q==";
       };
     };
-    "inquirer-3.3.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz";
-        sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==";
-      };
-    };
     "inquirer-5.2.0" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -20454,51 +13782,6 @@ let
         sha512 = "becs5gzcHwPrlHawscYkyQ/ShiOiosrXPhA5RVZ3qyWH4aWdD52RnMfXq/dwQXciHwiieD8aIPwdIWYv6eL+sQ==";
       };
     };
-    "inspect-function-0.3.4" = {
-      name = "inspect-function";
-      packageName = "inspect-function";
-      version = "0.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-function/-/inspect-function-0.3.4.tgz";
-        sha512 = "s0RsbJqK/sNZ+U1mykGoTickog3ea1A9Qk4mXniogOBu4PgkkZ56elScO7QC/r8D94lhGmJ2NyDI1ipOA/uq/g==";
-      };
-    };
-    "inspect-parameters-declaration-0.0.10" = {
-      name = "inspect-parameters-declaration";
-      packageName = "inspect-parameters-declaration";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.10.tgz";
-        sha512 = "L8/Bvt9iDXQTZ63xY5/MAyvzz+FagR/qGh1kIXvUpsno3AAE0Z95d6QO51zrcMGaEGpwh/57idfMxTxbvRmytg==";
-      };
-    };
-    "inspect-parameters-declaration-0.0.8" = {
-      name = "inspect-parameters-declaration";
-      packageName = "inspect-parameters-declaration";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.8.tgz";
-        sha512 = "W4QzN1LgFmasKOM+NoLlDd2OAZM3enNZlVUOXoGQKmYBDFgxoPDOyebF55ALaf8avyM9TavNwibXxg347RrzCg==";
-      };
-    };
-    "inspect-parameters-declaration-0.0.9" = {
-      name = "inspect-parameters-declaration";
-      packageName = "inspect-parameters-declaration";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.9.tgz";
-        sha512 = "c3jrKKA1rwwrsjdGMAo2hFWV0vNe3/RKHxpE/OBt41LP3ynOVI1qmgxpZYK5SQu3jtWCyaho8L7AZzCjJ4mEUw==";
-      };
-    };
-    "inspect-property-0.0.6" = {
-      name = "inspect-property";
-      packageName = "inspect-property";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-property/-/inspect-property-0.0.6.tgz";
-        sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ==";
-      };
-    };
     "inspect-with-kind-1.0.5" = {
       name = "inspect-with-kind";
       packageName = "inspect-with-kind";
@@ -20562,51 +13845,6 @@ let
         sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==";
       };
     };
-    "into-stream-6.0.0" = {
-      name = "into-stream";
-      packageName = "into-stream";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz";
-        sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==";
-      };
-    };
-    "inversify-5.1.1" = {
-      name = "inversify";
-      packageName = "inversify";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz";
-        sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==";
-      };
-    };
-    "invert-kv-1.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==";
-      };
-    };
-    "ioredis-5.6.0" = {
-      name = "ioredis";
-      packageName = "ioredis";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ioredis/-/ioredis-5.6.0.tgz";
-        sha512 = "tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==";
-      };
-    };
-    "iota-array-1.0.0" = {
-      name = "iota-array";
-      packageName = "iota-array";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz";
-        sha512 = "pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==";
-      };
-    };
     "ip-1.1.9" = {
       name = "ip";
       packageName = "ip";
@@ -20634,15 +13872,6 @@ let
         sha512 = "zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==";
       };
     };
-    "ip-regex-4.3.0" = {
-      name = "ip-regex";
-      packageName = "ip-regex";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz";
-        sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==";
-      };
-    };
     "ip-set-1.0.2" = {
       name = "ip-set";
       packageName = "ip-set";
@@ -20670,24 +13899,6 @@ let
         sha512 = "Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==";
       };
     };
-    "irc-colors-1.5.0" = {
-      name = "irc-colors";
-      packageName = "irc-colors";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/irc-colors/-/irc-colors-1.5.0.tgz";
-        sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw==";
-      };
-    };
-    "irc-upd-0.11.0" = {
-      name = "irc-upd";
-      packageName = "irc-upd";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/irc-upd/-/irc-upd-0.11.0.tgz";
-        sha512 = "A1hV5cUkl5HZsKWRYcszD2Usfz33hB8igSSox8dEmrMyfy8/Ra6T/o4jwzs7jYMZ7ljLquSIWzcvSZHZ/bEAZA==";
-      };
-    };
     "irregular-plurals-3.5.0" = {
       name = "irregular-plurals";
       packageName = "irregular-plurals";
@@ -20715,15 +13926,6 @@ let
         sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==";
       };
     };
-    "is-alphabetical-1.0.4" = {
-      name = "is-alphabetical";
-      packageName = "is-alphabetical";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz";
-        sha512 = "DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==";
-      };
-    };
     "is-alphabetical-2.0.1" = {
       name = "is-alphabetical";
       packageName = "is-alphabetical";
@@ -20733,15 +13935,6 @@ let
         sha512 = "FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==";
       };
     };
-    "is-alphanumerical-1.0.4" = {
-      name = "is-alphanumerical";
-      packageName = "is-alphanumerical";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz";
-        sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==";
-      };
-    };
     "is-alphanumerical-2.0.1" = {
       name = "is-alphanumerical";
       packageName = "is-alphanumerical";
@@ -20787,15 +13980,6 @@ let
         sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
       };
     };
-    "is-async-function-2.1.1" = {
-      name = "is-async-function";
-      packageName = "is-async-function";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz";
-        sha512 = "9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==";
-      };
-    };
     "is-bigint-1.1.0" = {
       name = "is-bigint";
       packageName = "is-bigint";
@@ -20886,15 +14070,6 @@ let
         sha512 = "UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==";
       };
     };
-    "is-core-module-2.9.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz";
-        sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==";
-      };
-    };
     "is-data-descriptor-1.0.1" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -20904,15 +14079,6 @@ let
         sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==";
       };
     };
-    "is-data-view-1.0.2" = {
-      name = "is-data-view";
-      packageName = "is-data-view";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz";
-        sha512 = "RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==";
-      };
-    };
     "is-date-object-1.1.0" = {
       name = "is-date-object";
       packageName = "is-date-object";
@@ -20922,15 +14088,6 @@ let
         sha512 = "PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==";
       };
     };
-    "is-decimal-1.0.4" = {
-      name = "is-decimal";
-      packageName = "is-decimal";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz";
-        sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==";
-      };
-    };
     "is-decimal-2.0.1" = {
       name = "is-decimal";
       packageName = "is-decimal";
@@ -21048,15 +14205,6 @@ let
         sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==";
       };
     };
-    "is-finalizationregistry-1.1.1" = {
-      name = "is-finalizationregistry";
-      packageName = "is-finalizationregistry";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz";
-        sha512 = "1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==";
-      };
-    };
     "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
@@ -21165,24 +14313,6 @@ let
         sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==";
       };
     };
-    "is-hex-prefixed-1.0.0" = {
-      name = "is-hex-prefixed";
-      packageName = "is-hex-prefixed";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz";
-        sha512 = "WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==";
-      };
-    };
-    "is-hexadecimal-1.0.4" = {
-      name = "is-hexadecimal";
-      packageName = "is-hexadecimal";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz";
-        sha512 = "gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==";
-      };
-    };
     "is-hexadecimal-2.0.1" = {
       name = "is-hexadecimal";
       packageName = "is-hexadecimal";
@@ -21246,24 +14376,6 @@ let
         sha512 = "qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==";
       };
     };
-    "is-invalid-path-0.1.0" = {
-      name = "is-invalid-path";
-      packageName = "is-invalid-path";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz";
-        sha512 = "aZMG0T3F34mTg4eTdszcGXx54oiZ4NtHSft3hWNJMGJXUUqdIj3cOZuHcU0nCWWcY3jd7yRe/3AEm3vSNTpBGQ==";
-      };
-    };
-    "is-lambda-1.0.1" = {
-      name = "is-lambda";
-      packageName = "is-lambda";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz";
-        sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==";
-      };
-    };
     "is-map-2.0.3" = {
       name = "is-map";
       packageName = "is-map";
@@ -21273,24 +14385,6 @@ let
         sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==";
       };
     };
-    "is-my-ip-valid-1.0.1" = {
-      name = "is-my-ip-valid";
-      packageName = "is-my-ip-valid";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz";
-        sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==";
-      };
-    };
-    "is-my-json-valid-2.20.6" = {
-      name = "is-my-json-valid";
-      packageName = "is-my-json-valid";
-      version = "2.20.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz";
-        sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==";
-      };
-    };
     "is-natural-number-4.0.1" = {
       name = "is-natural-number";
       packageName = "is-natural-number";
@@ -21300,24 +14394,6 @@ let
         sha512 = "Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==";
       };
     };
-    "is-negated-glob-1.0.0" = {
-      name = "is-negated-glob";
-      packageName = "is-negated-glob";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
-        sha512 = "czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==";
-      };
-    };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==";
-      };
-    };
     "is-npm-5.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -21516,15 +14592,6 @@ let
         sha512 = "Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==";
       };
     };
-    "is-potential-custom-element-name-1.0.1" = {
-      name = "is-potential-custom-element-name";
-      packageName = "is-potential-custom-element-name";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz";
-        sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==";
-      };
-    };
     "is-primitive-2.0.0" = {
       name = "is-primitive";
       packageName = "is-primitive";
@@ -21543,15 +14610,6 @@ let
         sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==";
       };
     };
-    "is-property-1.0.2" = {
-      name = "is-property";
-      packageName = "is-property";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
-        sha512 = "Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==";
-      };
-    };
     "is-redirect-1.0.0" = {
       name = "is-redirect";
       packageName = "is-redirect";
@@ -21579,15 +14637,6 @@ let
         sha512 = "MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==";
       };
     };
-    "is-regexp-2.1.0" = {
-      name = "is-regexp";
-      packageName = "is-regexp";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz";
-        sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==";
-      };
-    };
     "is-relative-1.0.0" = {
       name = "is-relative";
       packageName = "is-relative";
@@ -21597,15 +14646,6 @@ let
         sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
-    "is-resolvable-1.1.0" = {
-      name = "is-resolvable";
-      packageName = "is-resolvable";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz";
-        sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==";
-      };
-    };
     "is-retry-allowed-1.2.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
@@ -21795,24 +14835,6 @@ let
         sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==";
       };
     };
-    "is-valid-glob-1.0.0" = {
-      name = "is-valid-glob";
-      packageName = "is-valid-glob";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
-        sha512 = "AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==";
-      };
-    };
-    "is-valid-path-0.1.1" = {
-      name = "is-valid-path";
-      packageName = "is-valid-path";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz";
-        sha512 = "+kwPrVDu9Ms03L90Qaml+79+6DZHqHyRoANI6IsZJ/g8frhnfchDOBCa0RbQ6/kdHt5CS5OeIEyrYznNuVN+8A==";
-      };
-    };
     "is-weakmap-2.0.2" = {
       name = "is-weakmap";
       packageName = "is-weakmap";
@@ -21822,15 +14844,6 @@ let
         sha512 = "K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==";
       };
     };
-    "is-weakref-1.1.1" = {
-      name = "is-weakref";
-      packageName = "is-weakref";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz";
-        sha512 = "6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==";
-      };
-    };
     "is-weakset-2.0.4" = {
       name = "is-weakset";
       packageName = "is-weakset";
@@ -21894,15 +14907,6 @@ let
         sha512 = "/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==";
       };
     };
-    "is2-2.0.9" = {
-      name = "is2";
-      packageName = "is2";
-      version = "2.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz";
-        sha512 = "rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==";
-      };
-    };
     "is64bit-2.0.0" = {
       name = "is64bit";
       packageName = "is64bit";
@@ -21948,15 +14952,6 @@ let
         sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
       };
     };
-    "isbinaryfile-4.0.10" = {
-      name = "isbinaryfile";
-      packageName = "isbinaryfile";
-      version = "4.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz";
-        sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==";
-      };
-    };
     "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
@@ -22038,15 +15033,6 @@ let
         sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==";
       };
     };
-    "jade-0.27.0" = {
-      name = "jade";
-      packageName = "jade";
-      version = "0.27.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jade/-/jade-0.27.0.tgz";
-        sha512 = "VPrAZm2V9+0tqISXjca7ipt2LPMpLwnFZFM+1VG7q2LmiUQp1imCa++FgSqWxIs4W5gUTp/xlrUlx5xyFHYE6w==";
-      };
-    };
     "jake-10.9.2" = {
       name = "jake";
       packageName = "jake";
@@ -22056,15 +15042,6 @@ let
         sha512 = "2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==";
       };
     };
-    "jest-worker-27.5.1" = {
-      name = "jest-worker";
-      packageName = "jest-worker";
-      version = "27.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz";
-        sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==";
-      };
-    };
     "jimp-0.16.13" = {
       name = "jimp";
       packageName = "jimp";
@@ -22119,15 +15096,6 @@ let
         sha512 = "b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg==";
       };
     };
-    "joi-17.13.3" = {
-      name = "joi";
-      packageName = "joi";
-      version = "17.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz";
-        sha512 = "otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==";
-      };
-    };
     "jose-5.9.6" = {
       name = "jose";
       packageName = "jose";
@@ -22155,24 +15123,6 @@ let
         sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==";
       };
     };
-    "js-base64-3.7.7" = {
-      name = "js-base64";
-      packageName = "js-base64";
-      version = "3.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz";
-        sha512 = "7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==";
-      };
-    };
-    "js-cookie-3.0.5" = {
-      name = "js-cookie";
-      packageName = "js-cookie";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz";
-        sha512 = "cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==";
-      };
-    };
     "js-levenshtein-1.1.6" = {
       name = "js-levenshtein";
       packageName = "js-levenshtein";
@@ -22263,24 +15213,6 @@ let
         sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==";
       };
     };
-    "jsdom-16.7.0" = {
-      name = "jsdom";
-      packageName = "jsdom";
-      version = "16.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz";
-        sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==";
-      };
-    };
-    "jsdom-24.1.1" = {
-      name = "jsdom";
-      packageName = "jsdom";
-      version = "24.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-24.1.1.tgz";
-        sha512 = "5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==";
-      };
-    };
     "jsep-1.4.0" = {
       name = "jsep";
       packageName = "jsep";
@@ -22290,15 +15222,6 @@ let
         sha512 = "B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==";
       };
     };
-    "jsesc-2.5.2" = {
-      name = "jsesc";
-      packageName = "jsesc";
-      version = "2.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
-        sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
-      };
-    };
     "jsesc-3.1.0" = {
       name = "jsesc";
       packageName = "jsesc";
@@ -22443,15 +15366,6 @@ let
         sha512 = "lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==";
       };
     };
-    "json-parse-helpfulerror-1.0.3" = {
-      name = "json-parse-helpfulerror";
-      packageName = "json-parse-helpfulerror";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
-        sha512 = "XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==";
-      };
-    };
     "json-refs-3.0.15" = {
       name = "json-refs";
       packageName = "json-refs";
@@ -22515,15 +15429,6 @@ let
         sha512 = "XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==";
       };
     };
-    "json-server-0.8.23" = {
-      name = "json-server";
-      packageName = "json-server";
-      version = "0.8.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-server/-/json-server-0.8.23.tgz";
-        sha512 = "a59VWZTCr2IF40Tmr7JC49C76c+3rVpM03G/rT+Srm2a83nIkiqw0rafrstzpK1xxZeUz5gbi6E2Q8y0gUDHNQ==";
-      };
-    };
     "json-stable-stringify-0.0.1" = {
       name = "json-stable-stringify";
       packageName = "json-stable-stringify";
@@ -22533,15 +15438,6 @@ let
         sha512 = "nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==";
       };
     };
-    "json-stable-stringify-1.2.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz";
-        sha512 = "Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==";
-      };
-    };
     "json-stable-stringify-without-jsonify-1.0.1" = {
       name = "json-stable-stringify-without-jsonify";
       packageName = "json-stable-stringify-without-jsonify";
@@ -22551,15 +15447,6 @@ let
         sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
       };
     };
-    "json-stringify-pretty-compact-4.0.0" = {
-      name = "json-stringify-pretty-compact";
-      packageName = "json-stringify-pretty-compact";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz";
-        sha512 = "3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==";
-      };
-    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -22587,15 +15474,6 @@ let
         sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
       };
     };
-    "jsonc-parser-1.0.3" = {
-      name = "jsonc-parser";
-      packageName = "jsonc-parser";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-1.0.3.tgz";
-        sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==";
-      };
-    };
     "jsonc-parser-2.2.1" = {
       name = "jsonc-parser";
       packageName = "jsonc-parser";
@@ -22623,15 +15501,6 @@ let
         sha512 = "KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==";
       };
     };
-    "jsonfile-2.4.0" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
-        sha512 = "PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==";
-      };
-    };
     "jsonfile-3.0.1" = {
       name = "jsonfile";
       packageName = "jsonfile";
@@ -22695,15 +15564,6 @@ let
         sha512 = "8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA==";
       };
     };
-    "jsonpointer-5.0.1" = {
-      name = "jsonpointer";
-      packageName = "jsonpointer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz";
-        sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==";
-      };
-    };
     "jsonschema-1.5.0" = {
       name = "jsonschema";
       packageName = "jsonschema";
@@ -22758,15 +15618,6 @@ let
         sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw==";
       };
     };
-    "junk-3.1.0" = {
-      name = "junk";
-      packageName = "junk";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz";
-        sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==";
-      };
-    };
     "junk-4.0.1" = {
       name = "junk";
       packageName = "junk";
@@ -22812,15 +15663,6 @@ let
         sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==";
       };
     };
-    "jwt-decode-2.2.0" = {
-      name = "jwt-decode";
-      packageName = "jwt-decode";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
-        sha512 = "86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ==";
-      };
-    };
     "k-bucket-0.6.0" = {
       name = "k-bucket";
       packageName = "k-bucket";
@@ -22857,42 +15699,6 @@ let
         sha512 = "8xtA8oqbZ6v1Niryp2/g4GxW16EQh5MvrUylQoOG+zcrDff5CKttON2XUXvMwlIHq4/2zfPVFiinAccJ+WhxoA==";
       };
     };
-    "kad-fs-0.0.4" = {
-      name = "kad-fs";
-      packageName = "kad-fs";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kad-fs/-/kad-fs-0.0.4.tgz";
-        sha512 = "VlLY7MuXy+3Tlqn1NJNgNkta6BRposNsJhqqcLv/M5e/rGBAETU33DhlPwV6/RBZKGzylQFkeYaKaoYin+mGZw==";
-      };
-    };
-    "kad-localstorage-0.0.7" = {
-      name = "kad-localstorage";
-      packageName = "kad-localstorage";
-      version = "0.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kad-localstorage/-/kad-localstorage-0.0.7.tgz";
-        sha512 = "3BEFBPa9cbPvW7WvZSTQHy6dSgw7ob7yTqT+eORWrxm4f4fE26BUVorg36KRbg/W+YWEnippuM68ybFyF3heiA==";
-      };
-    };
-    "kad-memstore-0.0.1" = {
-      name = "kad-memstore";
-      packageName = "kad-memstore";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kad-memstore/-/kad-memstore-0.0.1.tgz";
-        sha512 = "fwGvRXWjaSzMed8iQHkZH41wvaoq+3tIhuIbkqBBYFuuJtWoDWqgCYTADGPqLyaLX4Ct8aP5NtAxCaxk4cfcCg==";
-      };
-    };
-    "katex-0.16.11" = {
-      name = "katex";
-      packageName = "katex";
-      version = "0.16.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/katex/-/katex-0.16.11.tgz";
-        sha512 = "RQrI8rlHY92OLf3rho/Ts8i/XvjgguEjOkO1BEXcU3N8BqPpSzBNwV/G0Ukr+P/l3ivvJUE/Fa/CwbS6HesGNQ==";
-      };
-    };
     "keep-alive-agent-0.0.1" = {
       name = "keep-alive-agent";
       packageName = "keep-alive-agent";
@@ -22911,15 +15717,6 @@ let
         sha512 = "HjorDJFNhnM4SicvaUXac0X77NiskggxJdesG72+O5zBKpSqKFCrqmndKVqpu3pFqkla0St6uGk8Ju0sCurrmg==";
       };
     };
-    "keytar-7.9.0" = {
-      name = "keytar";
-      packageName = "keytar";
-      version = "7.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz";
-        sha512 = "VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==";
-      };
-    };
     "keyv-3.1.0" = {
       name = "keyv";
       packageName = "keyv";
@@ -22965,15 +15762,6 @@ let
         sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     };
-    "klaw-1.3.1" = {
-      name = "klaw";
-      packageName = "klaw";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
-        sha512 = "TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==";
-      };
-    };
     "klaw-3.0.0" = {
       name = "klaw";
       packageName = "klaw";
@@ -22983,15 +15771,6 @@ let
         sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==";
       };
     };
-    "kleur-3.0.3" = {
-      name = "kleur";
-      packageName = "kleur";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz";
-        sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
-      };
-    };
     "kleur-4.1.5" = {
       name = "kleur";
       packageName = "kleur";
@@ -23010,24 +15789,6 @@ let
         sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==";
       };
     };
-    "known-css-properties-0.21.0" = {
-      name = "known-css-properties";
-      packageName = "known-css-properties";
-      version = "0.21.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz";
-        sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==";
-      };
-    };
-    "koa-compose-4.2.0" = {
-      name = "koa-compose";
-      packageName = "koa-compose";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.2.0.tgz";
-        sha512 = "/Io2dpt3uU/wWkn2pkRBj3vudzsi6hMssGkREZCxLIczAIvLWy5Jw9PW7ctTxvcfXKCisbgsMLsgE1BvSZB6Kw==";
-      };
-    };
     "kuler-2.0.0" = {
       name = "kuler";
       packageName = "kuler";
@@ -23055,24 +15816,6 @@ let
         sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==";
       };
     };
-    "last-run-2.0.0" = {
-      name = "last-run";
-      packageName = "last-run";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz";
-        sha512 = "j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==";
-      };
-    };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha512 = "8925wFYLfWBciewimt0VmDyYw0GFCRcbFSTrZGt4JgQ7lh5jb/kodMlUt0uMaxXdRKVi+7F3ib30N7fTv83ikw==";
-      };
-    };
     "latest-version-5.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -23100,15 +15843,6 @@ let
         sha512 = "7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==";
       };
     };
-    "layerr-3.0.0" = {
-      name = "layerr";
-      packageName = "layerr";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/layerr/-/layerr-3.0.0.tgz";
-        sha512 = "tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==";
-      };
-    };
     "lazy-1.0.11" = {
       name = "lazy";
       packageName = "lazy";
@@ -23118,24 +15852,6 @@ let
         sha512 = "Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==";
       };
     };
-    "lazy-req-1.1.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
-        sha512 = "Vn/JuGaYykbelAVNAhfVJxuwHQCOSNE6mqMtD+gnd+QORlAHwWVmVFqQga3yWt84G5vAwEwpT6sAsZ+tgJ88/Q==";
-      };
-    };
-    "lazyness-1.2.0" = {
-      name = "lazyness";
-      packageName = "lazyness";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazyness/-/lazyness-1.2.0.tgz";
-        sha512 = "KenL6EFbwxBwRxG93t0gcUyi0Nw0Ub31FJKN1laA4UscdkL1K1AxUd0gYZdcLU3v+x+wcFi4uQKS5hL+fk500g==";
-      };
-    };
     "lazystream-1.0.1" = {
       name = "lazystream";
       packageName = "lazystream";
@@ -23145,24 +15861,6 @@ let
         sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==";
       };
     };
-    "lcid-1.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
-        sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==";
-      };
-    };
-    "lead-4.0.0" = {
-      name = "lead";
-      packageName = "lead";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz";
-        sha512 = "DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==";
-      };
-    };
     "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
@@ -23181,15 +15879,6 @@ let
         sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
       };
     };
-    "levn-0.3.0" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
-        sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==";
-      };
-    };
     "levn-0.4.1" = {
       name = "levn";
       packageName = "levn";
@@ -23199,15 +15888,6 @@ let
         sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
       };
     };
-    "lie-3.1.1" = {
-      name = "lie";
-      packageName = "lie";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz";
-        sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==";
-      };
-    };
     "lie-3.3.0" = {
       name = "lie";
       packageName = "lie";
@@ -23253,15 +15933,6 @@ let
         sha512 = "2vJ6FDCit0ohq77qdbIdk5JqGs/98W1fGEgozoAMq/oybKPdgLuB8bHH/wWgvCdQzEJpm6Sxh0abG/PtxFr7XA==";
       };
     };
-    "limitation-0.2.3" = {
-      name = "limitation";
-      packageName = "limitation";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/limitation/-/limitation-0.2.3.tgz";
-        sha512 = "IpIBG7WniPI1Og0HYxlo8JRD2E2pExwuol7hjobcNZSYBBxAamPJdV91Q47uw5/KiUKA+We8a33sh6vD1PQ+Yw==";
-      };
-    };
     "limiter-1.1.5" = {
       name = "limiter";
       packageName = "limiter";
@@ -23298,15 +15969,6 @@ let
         sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==";
       };
     };
-    "linkify-it-4.0.1" = {
-      name = "linkify-it";
-      packageName = "linkify-it";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz";
-        sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==";
-      };
-    };
     "linkify-it-5.0.0" = {
       name = "linkify-it";
       packageName = "linkify-it";
@@ -23361,15 +16023,6 @@ let
         sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==";
       };
     };
-    "listr2-7.0.2" = {
-      name = "listr2";
-      packageName = "listr2";
-      version = "7.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/listr2/-/listr2-7.0.2.tgz";
-        sha512 = "rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g==";
-      };
-    };
     "listr2-8.2.5" = {
       name = "listr2";
       packageName = "listr2";
@@ -23379,15 +16032,6 @@ let
         sha512 = "iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==";
       };
     };
-    "lmdb-2.5.3" = {
-      name = "lmdb";
-      packageName = "lmdb";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lmdb/-/lmdb-2.5.3.tgz";
-        sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw==";
-      };
-    };
     "load-bmfont-1.4.2" = {
       name = "load-bmfont";
       packageName = "load-bmfont";
@@ -23406,15 +16050,6 @@ let
         sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==";
       };
     };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha512 = "3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==";
-      };
-    };
     "load-json-file-6.2.0" = {
       name = "load-json-file";
       packageName = "load-json-file";
@@ -23442,15 +16077,6 @@ let
         sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==";
       };
     };
-    "loader-runner-4.3.0" = {
-      name = "loader-runner";
-      packageName = "loader-runner";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz";
-        sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==";
-      };
-    };
     "loady-0.0.5" = {
       name = "loady";
       packageName = "loady";
@@ -23460,15 +16086,6 @@ let
         sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ==";
       };
     };
-    "localforage-1.10.0" = {
-      name = "localforage";
-      packageName = "localforage";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz";
-        sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==";
-      };
-    };
     "locate-character-3.0.0" = {
       name = "locate-character";
       packageName = "locate-character";
@@ -23478,24 +16095,6 @@ let
         sha512 = "SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==";
       };
     };
-    "locate-path-2.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
-        sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==";
-      };
-    };
-    "locate-path-3.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz";
-        sha512 = "7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==";
-      };
-    };
     "locate-path-5.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
@@ -23523,15 +16122,6 @@ let
         sha512 = "gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==";
       };
     };
-    "lock-1.1.0" = {
-      name = "lock";
-      packageName = "lock";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lock/-/lock-1.1.0.tgz";
-        sha512 = "NZQIJJL5Rb9lMJ0Yl1JoVr9GSdo4HTPsUEWsSFzB8dE8DSoiLCVavWZPi7Rnlv/o73u6I24S/XYc/NmG4l8EKA==";
-      };
-    };
     "lodash-3.10.1" = {
       name = "lodash";
       packageName = "lodash";
@@ -23550,15 +16140,6 @@ let
         sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
       };
     };
-    "lodash._basecopy-3.0.1" = {
-      name = "lodash._basecopy";
-      packageName = "lodash._basecopy";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
-        sha512 = "rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==";
-      };
-    };
     "lodash._baseiteratee-4.7.0" = {
       name = "lodash._baseiteratee";
       packageName = "lodash._baseiteratee";
@@ -23568,15 +16149,6 @@ let
         sha512 = "nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ==";
       };
     };
-    "lodash._basetostring-3.0.1" = {
-      name = "lodash._basetostring";
-      packageName = "lodash._basetostring";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz";
-        sha512 = "mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==";
-      };
-    };
     "lodash._basetostring-4.12.0" = {
       name = "lodash._basetostring";
       packageName = "lodash._basetostring";
@@ -23595,15 +16167,6 @@ let
         sha512 = "Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A==";
       };
     };
-    "lodash._basevalues-3.0.0" = {
-      name = "lodash._basevalues";
-      packageName = "lodash._basevalues";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz";
-        sha512 = "H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==";
-      };
-    };
     "lodash._createset-4.0.3" = {
       name = "lodash._createset";
       packageName = "lodash._createset";
@@ -23613,42 +16176,6 @@ let
         sha512 = "GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA==";
       };
     };
-    "lodash._getnative-3.9.1" = {
-      name = "lodash._getnative";
-      packageName = "lodash._getnative";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz";
-        sha512 = "RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==";
-      };
-    };
-    "lodash._isiterateecall-3.0.9" = {
-      name = "lodash._isiterateecall";
-      packageName = "lodash._isiterateecall";
-      version = "3.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz";
-        sha512 = "De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==";
-      };
-    };
-    "lodash._reescape-3.0.0" = {
-      name = "lodash._reescape";
-      packageName = "lodash._reescape";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz";
-        sha512 = "Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==";
-      };
-    };
-    "lodash._reevaluate-3.0.0" = {
-      name = "lodash._reevaluate";
-      packageName = "lodash._reevaluate";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz";
-        sha512 = "OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==";
-      };
-    };
     "lodash._reinterpolate-3.0.0" = {
       name = "lodash._reinterpolate";
       packageName = "lodash._reinterpolate";
@@ -23658,15 +16185,6 @@ let
         sha512 = "xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==";
       };
     };
-    "lodash._root-3.0.1" = {
-      name = "lodash._root";
-      packageName = "lodash._root";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz";
-        sha512 = "O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==";
-      };
-    };
     "lodash._stringtopath-4.8.0" = {
       name = "lodash._stringtopath";
       packageName = "lodash._stringtopath";
@@ -23676,15 +16194,6 @@ let
         sha512 = "SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ==";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha512 = "hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==";
-      };
-    };
     "lodash.camelcase-4.3.0" = {
       name = "lodash.camelcase";
       packageName = "lodash.camelcase";
@@ -23703,24 +16212,6 @@ let
         sha512 = "aVx8ztPv7/2ULbArGJ2Y42bG1mEQ5mGjpdvrbJcJFU3TbYybe+QlLS4pst9zV52ymy2in1KpFPiZnAOATxD4+Q==";
       };
     };
-    "lodash.clone-4.5.0" = {
-      name = "lodash.clone";
-      packageName = "lodash.clone";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clone/-/lodash.clone-4.5.0.tgz";
-        sha512 = "GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==";
-      };
-    };
-    "lodash.clonedeep-4.5.0" = {
-      name = "lodash.clonedeep";
-      packageName = "lodash.clonedeep";
-      version = "4.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz";
-        sha512 = "H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==";
-      };
-    };
     "lodash.defaults-4.2.0" = {
       name = "lodash.defaults";
       packageName = "lodash.defaults";
@@ -23739,15 +16230,6 @@ let
         sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==";
       };
     };
-    "lodash.escape-3.2.0" = {
-      name = "lodash.escape";
-      packageName = "lodash.escape";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz";
-        sha512 = "n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==";
-      };
-    };
     "lodash.escaperegexp-4.1.2" = {
       name = "lodash.escaperegexp";
       packageName = "lodash.escaperegexp";
@@ -23766,15 +16248,6 @@ let
         sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==";
       };
     };
-    "lodash.get-4.4.2" = {
-      name = "lodash.get";
-      packageName = "lodash.get";
-      version = "4.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
-        sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==";
-      };
-    };
     "lodash.groupby-4.6.0" = {
       name = "lodash.groupby";
       packageName = "lodash.groupby";
@@ -23793,24 +16266,6 @@ let
         sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==";
       };
     };
-    "lodash.isarguments-3.1.0" = {
-      name = "lodash.isarguments";
-      packageName = "lodash.isarguments";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz";
-        sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==";
-      };
-    };
-    "lodash.isarray-3.0.4" = {
-      name = "lodash.isarray";
-      packageName = "lodash.isarray";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz";
-        sha512 = "JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==";
-      };
-    };
     "lodash.isboolean-3.0.3" = {
       name = "lodash.isboolean";
       packageName = "lodash.isboolean";
@@ -23928,15 +16383,6 @@ let
         sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==";
       };
     };
-    "lodash.keys-3.1.2" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz";
-        sha512 = "CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==";
-      };
-    };
     "lodash.memoize-3.0.4" = {
       name = "lodash.memoize";
       packageName = "lodash.memoize";
@@ -23982,33 +16428,6 @@ let
         sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==";
       };
     };
-    "lodash.padend-4.6.1" = {
-      name = "lodash.padend";
-      packageName = "lodash.padend";
-      version = "4.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz";
-        sha512 = "sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw==";
-      };
-    };
-    "lodash.repeat-4.1.0" = {
-      name = "lodash.repeat";
-      packageName = "lodash.repeat";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz";
-        sha512 = "eWsgQW89IewS95ZOcr15HHCX6FVDxq3f2PNUIng3fyzsPev9imFQxIYdFZ6crl8L56UR6ZlGDLcEb3RZsCSSqw==";
-      };
-    };
-    "lodash.restparam-3.6.1" = {
-      name = "lodash.restparam";
-      packageName = "lodash.restparam";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz";
-        sha512 = "L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==";
-      };
-    };
     "lodash.snakecase-4.1.1" = {
       name = "lodash.snakecase";
       packageName = "lodash.snakecase";
@@ -24027,15 +16446,6 @@ let
         sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==";
       };
     };
-    "lodash.template-3.6.2" = {
-      name = "lodash.template";
-      packageName = "lodash.template";
-      version = "3.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz";
-        sha512 = "0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==";
-      };
-    };
     "lodash.template-4.5.0" = {
       name = "lodash.template";
       packageName = "lodash.template";
@@ -24045,15 +16455,6 @@ let
         sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==";
       };
     };
-    "lodash.templatesettings-3.1.1" = {
-      name = "lodash.templatesettings";
-      packageName = "lodash.templatesettings";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz";
-        sha512 = "TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==";
-      };
-    };
     "lodash.templatesettings-4.2.0" = {
       name = "lodash.templatesettings";
       packageName = "lodash.templatesettings";
@@ -24180,15 +16581,6 @@ let
         sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==";
       };
     };
-    "log-symbols-5.1.0" = {
-      name = "log-symbols";
-      packageName = "log-symbols";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz";
-        sha512 = "l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==";
-      };
-    };
     "log-symbols-6.0.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
@@ -24216,15 +16608,6 @@ let
         sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==";
       };
     };
-    "log-update-5.0.1" = {
-      name = "log-update";
-      packageName = "log-update";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz";
-        sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==";
-      };
-    };
     "log-update-6.1.0" = {
       name = "log-update";
       packageName = "log-update";
@@ -24288,24 +16671,6 @@ let
         sha512 = "ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==";
       };
     };
-    "long-timeout-0.1.1" = {
-      name = "long-timeout";
-      packageName = "long-timeout";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz";
-        sha512 = "BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==";
-      };
-    };
-    "longest-streak-2.0.4" = {
-      name = "longest-streak";
-      packageName = "longest-streak";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz";
-        sha512 = "vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==";
-      };
-    };
     "longest-streak-3.1.0" = {
       name = "longest-streak";
       packageName = "longest-streak";
@@ -24342,33 +16707,6 @@ let
         sha512 = "RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==";
       };
     };
-    "lowdb-0.13.1" = {
-      name = "lowdb";
-      packageName = "lowdb";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowdb/-/lowdb-0.13.1.tgz";
-        sha512 = "UFdqQF3jrmFgSx7JEPwbEbHh6T/LNBiJGjqrMtG0XN2UtFjCb6eVFOI2GMJO5PApowakhZlMUjWXuR9vWQcnkw==";
-      };
-    };
-    "lowdb-7.0.1" = {
-      name = "lowdb";
-      packageName = "lowdb";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowdb/-/lowdb-7.0.1.tgz";
-        sha512 = "neJAj8GwF0e8EpycYIDFqEPcx9Qz4GUho20jWFR7YiFeXzF1YMLdxB36PypcTSPMA+4+LvgyMacYhlr18Zlymw==";
-      };
-    };
-    "lower-case-1.1.4" = {
-      name = "lower-case";
-      packageName = "lower-case";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz";
-        sha512 = "2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==";
-      };
-    };
     "lower-case-2.0.2" = {
       name = "lower-case";
       packageName = "lower-case";
@@ -24405,15 +16743,6 @@ let
         sha512 = "ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==";
       };
     };
-    "lowlight-1.9.2" = {
-      name = "lowlight";
-      packageName = "lowlight";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowlight/-/lowlight-1.9.2.tgz";
-        sha512 = "Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q==";
-      };
-    };
     "lru-2.0.1" = {
       name = "lru";
       packageName = "lru";
@@ -24450,24 +16779,6 @@ let
         sha512 = "WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==";
       };
     };
-    "lru-cache-4.1.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
-      };
-    };
-    "lru-cache-5.1.1" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
-      };
-    };
     "lru-cache-6.0.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -24486,34 +16797,6 @@ let
         sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==";
       };
     };
-    "ltx-3.0.0" = {
-      name = "ltx";
-      packageName = "ltx";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ltx/-/ltx-3.0.0.tgz";
-        sha512 = "bu3/4/ApUmMqVNuIkHaRhqVtEi6didYcBDIF56xhPRCzVpdztCipZ62CUuaxMlMBUzaVL93+4LZRqe02fuAG6A==";
-      };
-    };
-    "ltx-3.1.2" = {
-      name = "ltx";
-      packageName = "ltx";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ltx/-/ltx-3.1.2.tgz";
-        sha512 = "tFSKojN92FqNK6eRTmKK/ROUTUYVWKAxgohz523TPhF1G3nR3DXQS/I7/705rEPrDSloKDgMdRlh0qgMFQoVYw==";
-      };
-    };
-    "luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" = {
-      name = "luaparse";
-      packageName = "luaparse";
-      version = "0.2.1";
-      src = fetchgit {
-        url = "https://github.com/oxyc/luaparse";
-        rev = "ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802";
-        sha256 = "f813d671f8f8088d70d29f7a7770bdd5ed41ed97240ae9346d7ced0c094ee049";
-      };
-    };
     "lunr-2.3.9" = {
       name = "lunr";
       packageName = "lunr";
@@ -24541,24 +16824,6 @@ let
         sha512 = "sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==";
       };
     };
-    "magicli-0.0.5" = {
-      name = "magicli";
-      packageName = "magicli";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/magicli/-/magicli-0.0.5.tgz";
-        sha512 = "wZbMtnl2v1b+Jp3xlqA9FU/O4I6YhGXR8xSY/eU2+gDAvut/F+W3gl4qs61iL4LELC7jqSAE6aAD5668EbmQHA==";
-      };
-    };
-    "magicli-0.0.8" = {
-      name = "magicli";
-      packageName = "magicli";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/magicli/-/magicli-0.0.8.tgz";
-        sha512 = "x/eBenweAHF+DsYy172sK4doRxZl0yrJnfxhLJiN7H6hPM3Ya0PfI6uBZshZ3ScFFSQD7HXgBqMdbnXKEZsO1g==";
-      };
-    };
     "magnet-uri-2.0.1" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
@@ -24595,15 +16860,6 @@ let
         sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
-    "make-dir-2.1.0" = {
-      name = "make-dir";
-      packageName = "make-dir";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
-        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
-      };
-    };
     "make-dir-3.1.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -24622,15 +16878,6 @@ let
         sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
-    "make-fetch-happen-10.2.1" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "10.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz";
-        sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==";
-      };
-    };
     "make-fetch-happen-14.0.3" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
@@ -24640,15 +16887,6 @@ let
         sha512 = "QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==";
       };
     };
-    "make-fetch-happen-9.1.0" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "9.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz";
-        sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==";
-      };
-    };
     "make-iterator-1.0.1" = {
       name = "make-iterator";
       packageName = "make-iterator";
@@ -24712,15 +16950,6 @@ let
         sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==";
       };
     };
-    "markdown-it-13.0.2" = {
-      name = "markdown-it";
-      packageName = "markdown-it";
-      version = "13.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz";
-        sha512 = "FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==";
-      };
-    };
     "markdown-it-14.1.0" = {
       name = "markdown-it";
       packageName = "markdown-it";
@@ -24739,24 +16968,6 @@ let
         sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==";
       };
     };
-    "markdown-it-abbr-1.0.4" = {
-      name = "markdown-it-abbr";
-      packageName = "markdown-it-abbr";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz";
-        sha512 = "ZeA4Z4SaBbYysZap5iZcxKmlPL6bYA8grqhzJIHB1ikn7njnzaP8uwbtuXc4YXD5LicI4/2Xmc0VwmSiFV04gg==";
-      };
-    };
-    "markdown-it-anchor-5.3.0" = {
-      name = "markdown-it-anchor";
-      packageName = "markdown-it-anchor";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz";
-        sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==";
-      };
-    };
     "markdown-it-anchor-8.6.7" = {
       name = "markdown-it-anchor";
       packageName = "markdown-it-anchor";
@@ -24766,15 +16977,6 @@ let
         sha512 = "FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==";
       };
     };
-    "markdown-it-deflist-2.1.0" = {
-      name = "markdown-it-deflist";
-      packageName = "markdown-it-deflist";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz";
-        sha512 = "3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg==";
-      };
-    };
     "markdown-it-emoji-1.4.0" = {
       name = "markdown-it-emoji";
       packageName = "markdown-it-emoji";
@@ -24784,33 +16986,6 @@ let
         sha512 = "QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg==";
       };
     };
-    "markdown-it-emoji-2.0.2" = {
-      name = "markdown-it-emoji";
-      packageName = "markdown-it-emoji";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz";
-        sha512 = "zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==";
-      };
-    };
-    "markdown-it-expand-tabs-1.0.13" = {
-      name = "markdown-it-expand-tabs";
-      packageName = "markdown-it-expand-tabs";
-      version = "1.0.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-expand-tabs/-/markdown-it-expand-tabs-1.0.13.tgz";
-        sha512 = "ODpk98FWkGIq2vkwm2NOLt4G6TRgy3M9eTa9SFm06pUyOd0zjjYAwkhsjiCDU42pzKuz0ChiwBO0utuOj3LNOA==";
-      };
-    };
-    "markdown-it-footnote-3.0.3" = {
-      name = "markdown-it-footnote";
-      packageName = "markdown-it-footnote";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz";
-        sha512 = "YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w==";
-      };
-    };
     "markdown-it-github-headings-1.1.2" = {
       name = "markdown-it-github-headings";
       packageName = "markdown-it-github-headings";
@@ -24820,51 +16995,6 @@ let
         sha512 = "8haIwpAx87DQHcEtzkfsWv2hxg4jOvow6/nJKAMQ2wYRMZQTIfJm9VzrDkqw72Bb4YXBmI0u3GA/3MdXVL/x5g==";
       };
     };
-    "markdown-it-ins-4.0.0" = {
-      name = "markdown-it-ins";
-      packageName = "markdown-it-ins";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-4.0.0.tgz";
-        sha512 = "sWbjK2DprrkINE4oYDhHdCijGT+MIDhEupjSHLXe5UXeVr5qmVxs/nTUVtgi0Oh/qtF+QKV0tNWDhQBEPxiMew==";
-      };
-    };
-    "markdown-it-mark-3.0.1" = {
-      name = "markdown-it-mark";
-      packageName = "markdown-it-mark";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz";
-        sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A==";
-      };
-    };
-    "markdown-it-multimd-table-4.2.3" = {
-      name = "markdown-it-multimd-table";
-      packageName = "markdown-it-multimd-table";
-      version = "4.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.2.3.tgz";
-        sha512 = "KepCr2OMJqm7IT6sOIbuqHGe+NERhgy66XMrc5lo6dHW7oaPzMDtYwR1EGwK16/blb6mCSg4jqityOe0o/H7HA==";
-      };
-    };
-    "markdown-it-sub-1.0.0" = {
-      name = "markdown-it-sub";
-      packageName = "markdown-it-sub";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz";
-        sha512 = "z2Rm/LzEE1wzwTSDrI+FlPEveAAbgdAdPhdWarq/ZGJrGW/uCQbKAnhoCsE4hAbc3SEym26+W2z/VQB0cQiA9Q==";
-      };
-    };
-    "markdown-it-sup-2.0.0" = {
-      name = "markdown-it-sup";
-      packageName = "markdown-it-sup";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-2.0.0.tgz";
-        sha512 = "5VgmdKlkBd8sgXuoDoxMpiU+BiEt3I49GItBzzw7Mxq9CxvnhE/k09HFli09zgfFDRixDQDfDxi0mgBCXtaTvA==";
-      };
-    };
     "markdown-it-task-checkbox-1.0.6" = {
       name = "markdown-it-task-checkbox";
       packageName = "markdown-it-task-checkbox";
@@ -24874,15 +17004,6 @@ let
         sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw==";
       };
     };
-    "markdown-it-toc-done-right-4.2.0" = {
-      name = "markdown-it-toc-done-right";
-      packageName = "markdown-it-toc-done-right";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.2.0.tgz";
-        sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ==";
-      };
-    };
     "markdown-table-3.0.4" = {
       name = "markdown-table";
       packageName = "markdown-table";
@@ -24901,15 +17022,6 @@ let
         sha512 = "PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==";
       };
     };
-    "mastodon-api-1.3.0" = {
-      name = "mastodon-api";
-      packageName = "mastodon-api";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mastodon-api/-/mastodon-api-1.3.0.tgz";
-        sha512 = "h1S0f3HzPtaNTaIBXu/3PVsXhKgZGk9DYrqp+bNZwp1wjYhJnEKggossj+DCCQ72+2y3Kcd7fNP2cEkp9jK6Ig==";
-      };
-    };
     "math-intrinsics-1.1.0" = {
       name = "math-intrinsics";
       packageName = "math-intrinsics";
@@ -24928,15 +17040,6 @@ let
         sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==";
       };
     };
-    "mathml-tag-names-2.1.3" = {
-      name = "mathml-tag-names";
-      packageName = "mathml-tag-names";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz";
-        sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==";
-      };
-    };
     "md5-2.3.0" = {
       name = "md5";
       packageName = "md5";
@@ -24946,15 +17049,6 @@ let
         sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==";
       };
     };
-    "md5-file-5.0.0" = {
-      name = "md5-file";
-      packageName = "md5-file";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz";
-        sha512 = "xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==";
-      };
-    };
     "md5.js-1.3.5" = {
       name = "md5.js";
       packageName = "md5.js";
@@ -25000,15 +17094,6 @@ let
         sha512 = "MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw==";
       };
     };
-    "mdast-util-from-markdown-0.8.5" = {
-      name = "mdast-util-from-markdown";
-      packageName = "mdast-util-from-markdown";
-      version = "0.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz";
-        sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==";
-      };
-    };
     "mdast-util-from-markdown-1.3.1" = {
       name = "mdast-util-from-markdown";
       packageName = "mdast-util-from-markdown";
@@ -25198,15 +17283,6 @@ let
         sha512 = "QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==";
       };
     };
-    "mdast-util-to-markdown-0.6.5" = {
-      name = "mdast-util-to-markdown";
-      packageName = "mdast-util-to-markdown";
-      version = "0.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz";
-        sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==";
-      };
-    };
     "mdast-util-to-markdown-1.5.0" = {
       name = "mdast-util-to-markdown";
       packageName = "mdast-util-to-markdown";
@@ -25243,15 +17319,6 @@ let
         sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==";
       };
     };
-    "mdast-util-to-string-2.0.0" = {
-      name = "mdast-util-to-string";
-      packageName = "mdast-util-to-string";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz";
-        sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==";
-      };
-    };
     "mdast-util-to-string-3.2.0" = {
       name = "mdast-util-to-string";
       packageName = "mdast-util-to-string";
@@ -25315,24 +17382,6 @@ let
         sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==";
       };
     };
-    "mediawiki-title-0.6.5" = {
-      name = "mediawiki-title";
-      packageName = "mediawiki-title";
-      version = "0.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mediawiki-title/-/mediawiki-title-0.6.5.tgz";
-        sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g==";
-      };
-    };
-    "mem-4.3.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
-        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
-      };
-    };
     "mem-8.1.1" = {
       name = "mem";
       packageName = "mem";
@@ -25351,24 +17400,6 @@ let
         sha512 = "F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==";
       };
     };
-    "memory-fs-0.3.0" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
-        sha512 = "QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ==";
-      };
-    };
-    "meow-10.1.5" = {
-      name = "meow";
-      packageName = "meow";
-      version = "10.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz";
-        sha512 = "/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==";
-      };
-    };
     "meow-11.0.0" = {
       name = "meow";
       packageName = "meow";
@@ -25423,15 +17454,6 @@ let
         sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==";
       };
     };
-    "merge-options-3.0.4" = {
-      name = "merge-options";
-      packageName = "merge-options";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz";
-        sha512 = "2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==";
-      };
-    };
     "merge-stream-2.0.0" = {
       name = "merge-stream";
       packageName = "merge-stream";
@@ -25459,15 +17481,6 @@ let
         sha512 = "tmj4CKZJVQd/ZuN9hnYD8HBAs/3RdDdqUeJG9RbVYlEZLuPYK4EW+EekMqLsCV4w1HastX+Pk2Ov87OQmeo01A==";
       };
     };
-    "method-override-2.3.10" = {
-      name = "method-override";
-      packageName = "method-override";
-      version = "2.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz";
-        sha512 = "Ks2/7e+3JuwQcpLybc6wTHyqg13HDjOhLcE+YaAEub9DbSxF+ieMvxUlybmWW9luRMh9Cd0rO9aNtzUT51xfNQ==";
-      };
-    };
     "methods-1.1.2" = {
       name = "methods";
       packageName = "methods";
@@ -25486,24 +17499,6 @@ let
         sha512 = "viYIo9PefV+w9dvoIBh1gI44Mvx1BOk67B4BpC2QK77qdY0xZF0Q+vWLt/BII6cLkIc8rLmSIcJaB/OrXXKe1g==";
       };
     };
-    "micro-ftch-0.3.1" = {
-      name = "micro-ftch";
-      packageName = "micro-ftch";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz";
-        sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==";
-      };
-    };
-    "micromark-2.11.4" = {
-      name = "micromark";
-      packageName = "micromark";
-      version = "2.11.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz";
-        sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==";
-      };
-    };
     "micromark-3.2.0" = {
       name = "micromark";
       packageName = "micromark";
@@ -26053,24 +18048,6 @@ let
         sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
       };
     };
-    "milliparsec-4.0.0" = {
-      name = "milliparsec";
-      packageName = "milliparsec";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/milliparsec/-/milliparsec-4.0.0.tgz";
-        sha512 = "/wk9d4Z6/9ZvoEH/6BI4TrTCgmkpZPuSRN/6fI9aUHOfXdNTuj/VhLS7d+NqG26bi6L9YmGXutVYvWC8zQ0qtA==";
-      };
-    };
-    "mime-1.2.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-1.2.4.tgz";
-        sha512 = "u4y8WFj7SnfbHxyzCMSV2nL/GKbfZ+lidPf1V4/XUKCJ49N6ttQWp/xnqpbMQEx3naBSt93i2qtPLFj/mjPDaA==";
-      };
-    };
     "mime-1.6.0" = {
       name = "mime";
       packageName = "mime";
@@ -26089,15 +18066,6 @@ let
         sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==";
       };
     };
-    "mime-4.0.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz";
-        sha512 = "v8yqInVjhXyqP6+Kw4fV3ZzeMRqEW6FotRsKXjRS5VMTNIuXsdRoAvklpoRgSqXm6o9VNH4/C0mgedko9DdLsQ==";
-      };
-    };
     "mime-db-1.33.0" = {
       name = "mime-db";
       packageName = "mime-db";
@@ -26116,15 +18084,6 @@ let
         sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==";
       };
     };
-    "mime-db-1.53.0" = {
-      name = "mime-db";
-      packageName = "mime-db";
-      version = "1.53.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz";
-        sha512 = "oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==";
-      };
-    };
     "mime-types-2.1.18" = {
       name = "mime-types";
       packageName = "mime-types";
@@ -26143,15 +18102,6 @@ let
         sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==";
       };
     };
-    "mimer-2.0.2" = {
-      name = "mimer";
-      packageName = "mimer";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimer/-/mimer-2.0.2.tgz";
-        sha512 = "izxvjsB7Ur5HrTbPu6VKTrzxSMBFBqyZQc6dWlZNQ4/wAvf886fD4lrjtFd8IQ8/WmZKdxKjUtqFFNaj3hQ52g==";
-      };
-    };
     "mimic-fn-1.2.0" = {
       name = "mimic-fn";
       packageName = "mimic-fn";
@@ -26323,15 +18273,6 @@ let
         sha512 = "sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==";
       };
     };
-    "minimatch-9.0.1" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz";
-        sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==";
-      };
-    };
     "minimatch-9.0.5" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -26395,15 +18336,6 @@ let
         sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==";
       };
     };
-    "minipass-collect-1.0.2" = {
-      name = "minipass-collect";
-      packageName = "minipass-collect";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz";
-        sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==";
-      };
-    };
     "minipass-collect-2.0.1" = {
       name = "minipass-collect";
       packageName = "minipass-collect";
@@ -26413,24 +18345,6 @@ let
         sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==";
       };
     };
-    "minipass-fetch-1.4.1" = {
-      name = "minipass-fetch";
-      packageName = "minipass-fetch";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz";
-        sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==";
-      };
-    };
-    "minipass-fetch-2.1.2" = {
-      name = "minipass-fetch";
-      packageName = "minipass-fetch";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz";
-        sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==";
-      };
-    };
     "minipass-fetch-4.0.1" = {
       name = "minipass-fetch";
       packageName = "minipass-fetch";
@@ -26593,15 +18507,6 @@ let
         sha512 = "uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==";
       };
     };
-    "moment-timezone-0.5.47" = {
-      name = "moment-timezone";
-      packageName = "moment-timezone";
-      version = "0.5.47";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz";
-        sha512 = "UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==";
-      };
-    };
     "morgan-1.10.0" = {
       name = "morgan";
       packageName = "morgan";
@@ -26638,24 +18543,6 @@ let
         sha512 = "tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==";
       };
     };
-    "mrmime-2.0.1" = {
-      name = "mrmime";
-      packageName = "mrmime";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz";
-        sha512 = "Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==";
-      };
-    };
-    "ms-0.7.3" = {
-      name = "ms";
-      packageName = "ms";
-      version = "0.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ms/-/ms-0.7.3.tgz";
-        sha512 = "lrKNzMWqQZgwJahtrtrM+9NgOoDUveDrVmm5aGXrf3BdtL0mq7X6IVzoZaw+TfNti29eHd1/8GI+h45K5cQ6/w==";
-      };
-    };
     "ms-2.0.0" = {
       name = "ms";
       packageName = "ms";
@@ -26692,24 +18579,6 @@ let
         sha512 = "6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==";
       };
     };
-    "msgpack5-3.6.1" = {
-      name = "msgpack5";
-      packageName = "msgpack5";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/msgpack5/-/msgpack5-3.6.1.tgz";
-        sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg==";
-      };
-    };
-    "msgpackr-1.11.2" = {
-      name = "msgpackr";
-      packageName = "msgpackr";
-      version = "1.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz";
-        sha512 = "F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==";
-      };
-    };
     "multicast-dns-6.2.3" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
@@ -26746,33 +18615,6 @@ let
         sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==";
       };
     };
-    "multipipe-0.1.2" = {
-      name = "multipipe";
-      packageName = "multipipe";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
-        sha512 = "7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==";
-      };
-    };
-    "multistream-4.1.0" = {
-      name = "multistream";
-      packageName = "multistream";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz";
-        sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==";
-      };
-    };
-    "mustache-4.2.0" = {
-      name = "mustache";
-      packageName = "mustache";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz";
-        sha512 = "71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==";
-      };
-    };
     "mute-stdout-2.0.0" = {
       name = "mute-stdout";
       packageName = "mute-stdout";
@@ -26782,15 +18624,6 @@ let
         sha512 = "32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==";
       };
     };
-    "mute-stream-0.0.5" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
-        sha512 = "EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==";
-      };
-    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -26863,15 +18696,6 @@ let
         sha512 = "DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==";
       };
     };
-    "nanoid-3.3.7" = {
-      name = "nanoid";
-      packageName = "nanoid";
-      version = "3.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz";
-        sha512 = "eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==";
-      };
-    };
     "nanoid-3.3.9" = {
       name = "nanoid";
       packageName = "nanoid";
@@ -26890,15 +18714,6 @@ let
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
-    "napi-build-utils-1.0.2" = {
-      name = "napi-build-utils";
-      packageName = "napi-build-utils";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz";
-        sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==";
-      };
-    };
     "napi-build-utils-2.0.0" = {
       name = "napi-build-utils";
       packageName = "napi-build-utils";
@@ -26962,33 +18777,6 @@ let
         sha512 = "zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==";
       };
     };
-    "ndarray-1.0.19" = {
-      name = "ndarray";
-      packageName = "ndarray";
-      version = "1.0.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ndarray/-/ndarray-1.0.19.tgz";
-        sha512 = "B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==";
-      };
-    };
-    "ndarray-pack-1.2.1" = {
-      name = "ndarray-pack";
-      packageName = "ndarray-pack";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz";
-        sha512 = "51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g==";
-      };
-    };
-    "nedb-1.8.0" = {
-      name = "nedb";
-      packageName = "nedb";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz";
-        sha512 = "ip7BJdyb5m+86ZbSb4y10FCCW9g35+U8bDRrZlAfCI6m4dKwEsQ5M52grcDcVK4Vm/vnPlDLywkyo3GliEkb5A==";
-      };
-    };
     "negotiator-0.5.3" = {
       name = "negotiator";
       packageName = "negotiator";
@@ -27025,16 +18813,6 @@ let
         sha512 = "8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==";
       };
     };
-    "negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" = {
-      name = "negotiator";
-      packageName = "negotiator";
-      version = "0.6.1";
-      src = fetchgit {
-        url = "https://github.com/arlolra/negotiator.git";
-        rev = "0418ab4e9a665772b7e233564a4525c9d9a8ec3a";
-        sha256 = "243e90fbf6616ef39f3c71bbcd027799e35cbf2ef3f25203676f65b20f7f7394";
-      };
-    };
     "nel-1.3.0" = {
       name = "nel";
       packageName = "nel";
@@ -27062,15 +18840,6 @@ let
         sha512 = "9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==";
       };
     };
-    "nested-property-4.0.0" = {
-      name = "nested-property";
-      packageName = "nested-property";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nested-property/-/nested-property-4.0.0.tgz";
-        sha512 = "yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA==";
-      };
-    };
     "netmask-2.0.2" = {
       name = "netmask";
       packageName = "netmask";
@@ -27107,24 +18876,6 @@ let
         sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ==";
       };
     };
-    "next-tick-1.1.0" = {
-      name = "next-tick";
-      packageName = "next-tick";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz";
-        sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==";
-      };
-    };
-    "nextgen-events-1.5.3" = {
-      name = "nextgen-events";
-      packageName = "nextgen-events";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.5.3.tgz";
-        sha512 = "P6qw6kenNXP+J9XlKJNi/MNHUQ+Lx5K8FEcSfX7/w8KJdZan5+BB5MKzuNgL2RTjHG1Svg8SehfseVEp8zAqwA==";
-      };
-    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -27197,15 +18948,6 @@ let
         sha512 = "63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw==";
       };
     };
-    "no-case-2.3.2" = {
-      name = "no-case";
-      packageName = "no-case";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz";
-        sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
-      };
-    };
     "no-case-3.0.4" = {
       name = "no-case";
       packageName = "no-case";
@@ -27233,15 +18975,6 @@ let
         sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==";
       };
     };
-    "node-addon-api-1.7.2" = {
-      name = "node-addon-api";
-      packageName = "node-addon-api";
-      version = "1.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz";
-        sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==";
-      };
-    };
     "node-addon-api-4.3.0" = {
       name = "node-addon-api";
       packageName = "node-addon-api";
@@ -27251,24 +18984,6 @@ let
         sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==";
       };
     };
-    "node-api-version-0.2.0" = {
-      name = "node-api-version";
-      packageName = "node-api-version";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz";
-        sha512 = "fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==";
-      };
-    };
-    "node-bitmap-0.0.1" = {
-      name = "node-bitmap";
-      packageName = "node-bitmap";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz";
-        sha512 = "Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==";
-      };
-    };
     "node-color-readline-1.0.1" = {
       name = "node-color-readline";
       packageName = "node-color-readline";
@@ -27296,24 +19011,6 @@ let
         sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==";
       };
     };
-    "node-environment-flags-1.0.6" = {
-      name = "node-environment-flags";
-      packageName = "node-environment-flags";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz";
-        sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==";
-      };
-    };
-    "node-fetch-2.6.1" = {
-      name = "node-fetch";
-      packageName = "node-fetch";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz";
-        sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==";
-      };
-    };
     "node-fetch-2.6.7" = {
       name = "node-fetch";
       packageName = "node-fetch";
@@ -27368,15 +19065,6 @@ let
         sha512 = "/+7TuHKnBpnMvUQnsYEb0JOozDZqarQbfNuSGLXIjhStMT0fbw7IdSqWgopOP5xhRZE+lsbIvAHcekddruPZgQ==";
       };
     };
-    "node-gyp-8.4.1" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "8.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz";
-        sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==";
-      };
-    };
     "node-gyp-build-4.8.4" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
@@ -27386,42 +19074,6 @@ let
         sha512 = "LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==";
       };
     };
-    "node-gyp-build-optional-packages-5.0.3" = {
-      name = "node-gyp-build-optional-packages";
-      packageName = "node-gyp-build-optional-packages";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz";
-        sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==";
-      };
-    };
-    "node-notifier-10.0.1" = {
-      name = "node-notifier";
-      packageName = "node-notifier";
-      version = "10.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-10.0.1.tgz";
-        sha512 = "YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==";
-      };
-    };
-    "node-object-hash-2.3.10" = {
-      name = "node-object-hash";
-      packageName = "node-object-hash";
-      version = "2.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.10.tgz";
-        sha512 = "jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA==";
-      };
-    };
-    "node-persist-3.1.3" = {
-      name = "node-persist";
-      packageName = "node-persist";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-persist/-/node-persist-3.1.3.tgz";
-        sha512 = "CaFv+kSZtsc+VeDRldK1yR47k1vPLBpzYB9re2z7LIwITxwBtljMq3s8VQnnr+x3E8pQfHbc5r2IyJsBLJhtXg==";
-      };
-    };
     "node-readfiles-0.2.0" = {
       name = "node-readfiles";
       packageName = "node-readfiles";
@@ -27431,33 +19083,6 @@ let
         sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==";
       };
     };
-    "node-releases-2.0.19" = {
-      name = "node-releases";
-      packageName = "node-releases";
-      version = "2.0.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz";
-        sha512 = "xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==";
-      };
-    };
-    "node-rsa-1.1.1" = {
-      name = "node-rsa";
-      packageName = "node-rsa";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-rsa/-/node-rsa-1.1.1.tgz";
-        sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==";
-      };
-    };
-    "node-schedule-2.1.1" = {
-      name = "node-schedule";
-      packageName = "node-schedule";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz";
-        sha512 = "OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==";
-      };
-    };
     "node-static-0.7.11" = {
       name = "node-static";
       packageName = "node-static";
@@ -27467,15 +19092,6 @@ let
         sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ==";
       };
     };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha512 = "1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==";
-      };
-    };
     "node-uuid-1.4.8" = {
       name = "node-uuid";
       packageName = "node-uuid";
@@ -27485,15 +19101,6 @@ let
         sha512 = "TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==";
       };
     };
-    "node.extend-1.0.0" = {
-      name = "node.extend";
-      packageName = "node.extend";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node.extend/-/node.extend-1.0.0.tgz";
-        sha512 = "Jqb2SFiBSqeOUlxHbjpinUo3ZXBkVmCqha8t1REgyo4rYx/cXh+pttzlL2vXIjG63VdklCrwrnqwIXsVBRMrSA==";
-      };
-    };
     "nomnom-1.8.1" = {
       name = "nomnom";
       packageName = "nomnom";
@@ -27539,15 +19146,6 @@ let
         sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==";
       };
     };
-    "nopt-6.0.0" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz";
-        sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==";
-      };
-    };
     "nopt-7.2.1" = {
       name = "nopt";
       packageName = "nopt";
@@ -27620,24 +19218,6 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
-    "normalize-range-0.1.2" = {
-      name = "normalize-range";
-      packageName = "normalize-range";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz";
-        sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==";
-      };
-    };
-    "normalize-selector-0.2.0" = {
-      name = "normalize-selector";
-      packageName = "normalize-selector";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz";
-        sha512 = "dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==";
-      };
-    };
     "normalize-url-4.5.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
@@ -27656,15 +19236,6 @@ let
         sha512 = "K1c7+vaAP+Yh5bOGmA10PGPpp+6h7WZrl7GwqKhUflBc9flU9pzG27DDeB9+iuhZkE3BJZOcgN1P/2sS5pqrWw==";
       };
     };
-    "normalize-url-6.1.0" = {
-      name = "normalize-url";
-      packageName = "normalize-url";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz";
-        sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==";
-      };
-    };
     "normalize-url-8.0.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
@@ -27674,15 +19245,6 @@ let
         sha512 = "IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==";
       };
     };
-    "now-and-later-3.0.0" = {
-      name = "now-and-later";
-      packageName = "now-and-later";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz";
-        sha512 = "pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==";
-      };
-    };
     "npm-bundled-1.1.2" = {
       name = "npm-bundled";
       packageName = "npm-bundled";
@@ -27890,15 +19452,6 @@ let
         sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==";
       };
     };
-    "npmlog-6.0.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz";
-        sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==";
-      };
-    };
     "nssocket-0.6.0" = {
       name = "nssocket";
       packageName = "nssocket";
@@ -27908,15 +19461,6 @@ let
         sha512 = "a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w==";
       };
     };
-    "nth-check-2.1.1" = {
-      name = "nth-check";
-      packageName = "nth-check";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz";
-        sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==";
-      };
-    };
     "num-sort-3.0.0" = {
       name = "num-sort";
       packageName = "num-sort";
@@ -27926,15 +19470,6 @@ let
         sha512 = "N5dLIfqCzlJm7M14KqmX/sl+6Zg5WH0E04HKfuVHbPj9jIaY1T2zuCS+xe0qeT/YN3UpYQ6lIIXcE/3Xbwg3Xw==";
       };
     };
-    "num2fraction-1.2.2" = {
-      name = "num2fraction";
-      packageName = "num2fraction";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
-        sha512 = "Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==";
-      };
-    };
     "number-allocator-1.0.14" = {
       name = "number-allocator";
       packageName = "number-allocator";
@@ -27953,15 +19488,6 @@ let
         sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==";
       };
     };
-    "number-to-bn-1.7.0" = {
-      name = "number-to-bn";
-      packageName = "number-to-bn";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz";
-        sha512 = "wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig==";
-      };
-    };
     "numeral-2.0.6" = {
       name = "numeral";
       packageName = "numeral";
@@ -27971,15 +19497,6 @@ let
         sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==";
       };
     };
-    "nwsapi-2.2.18" = {
-      name = "nwsapi";
-      packageName = "nwsapi";
-      version = "2.2.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz";
-        sha512 = "p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA==";
-      };
-    };
     "oas-kit-common-1.0.8" = {
       name = "oas-kit-common";
       packageName = "oas-kit-common";
@@ -28025,15 +19542,6 @@ let
         sha512 = "cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==";
       };
     };
-    "oauth-0.9.15" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
-        sha512 = "a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==";
-      };
-    };
     "oauth-sign-0.9.0" = {
       name = "oauth-sign";
       packageName = "oauth-sign";
@@ -28043,15 +19551,6 @@ let
         sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
       };
     };
-    "object-assign-3.0.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
-        sha512 = "jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==";
-      };
-    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -28115,15 +19614,6 @@ let
         sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
-    "object-to-arguments-0.0.8" = {
-      name = "object-to-arguments";
-      packageName = "object-to-arguments";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-to-arguments/-/object-to-arguments-0.0.8.tgz";
-        sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w==";
-      };
-    };
     "object-treeify-1.1.33" = {
       name = "object-treeify";
       packageName = "object-treeify";
@@ -28160,15 +19650,6 @@ let
         sha512 = "c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==";
       };
     };
-    "object.getownpropertydescriptors-2.1.8" = {
-      name = "object.getownpropertydescriptors";
-      packageName = "object.getownpropertydescriptors";
-      version = "2.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz";
-        sha512 = "qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==";
-      };
-    };
     "object.map-1.0.1" = {
       name = "object.map";
       packageName = "object.map";
@@ -28277,15 +19758,6 @@ let
         sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
       };
     };
-    "onetime-1.1.0" = {
-      name = "onetime";
-      packageName = "onetime";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz";
-        sha512 = "GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==";
-      };
-    };
     "onetime-2.0.1" = {
       name = "onetime";
       packageName = "onetime";
@@ -28349,15 +19821,6 @@ let
         sha512 = "0YZJaT5UFMnaj8ol0U3gG9pVbS27mG9rq/G+ED44GiFsi/Jb3mOtOXScFJXd7tdkOnXHS7oUCp1m7DUQ1BC6sA==";
       };
     };
-    "open-0.0.2" = {
-      name = "open";
-      packageName = "open";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-0.0.2.tgz";
-        sha512 = "gnt725gcNKTaMSul17WNEz4I3rvgVotCq30TkU9thlEZaRJ7ivOV0vEoRupkGU/NJ2+qxqAmVbSK94rwuOWXnw==";
-      };
-    };
     "open-0.0.5" = {
       name = "open";
       packageName = "open";
@@ -28376,15 +19839,6 @@ let
         sha512 = "mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==";
       };
     };
-    "open-7.4.2" = {
-      name = "open";
-      packageName = "open";
-      version = "7.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz";
-        sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==";
-      };
-    };
     "open-8.4.2" = {
       name = "open";
       packageName = "open";
@@ -28421,24 +19875,6 @@ let
         sha512 = "9asTNB9IkKEzWMcHmVZE7Ts3kC9G7AFHfs8i7caD8HbI76gEjdkId4z/AkP83xdZsH7PLAnnbl47qZkXuxpArw==";
       };
     };
-    "openpgp-5.11.2" = {
-      name = "openpgp";
-      packageName = "openpgp";
-      version = "5.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.2.tgz";
-        sha512 = "f8dJFVLwdkvPvW3VPFs6q9Vs2+HNhdvwls7a/MIFcQUB+XiQzRe7alfa3RtwfGJU7oUDDMAWPZ0nYsHa23Az+A==";
-      };
-    };
-    "opentracing-0.14.7" = {
-      name = "opentracing";
-      packageName = "opentracing";
-      version = "0.14.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.7.tgz";
-        sha512 = "vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q==";
-      };
-    };
     "openurl-1.1.1" = {
       name = "openurl";
       packageName = "openurl";
@@ -28493,15 +19929,6 @@ let
         sha512 = "snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==";
       };
     };
-    "optionator-0.8.3" = {
-      name = "optionator";
-      packageName = "optionator";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz";
-        sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==";
-      };
-    };
     "optionator-0.9.4" = {
       name = "optionator";
       packageName = "optionator";
@@ -28538,15 +19965,6 @@ let
         sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==";
       };
     };
-    "ora-6.3.1" = {
-      name = "ora";
-      packageName = "ora";
-      version = "6.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ora/-/ora-6.3.1.tgz";
-        sha512 = "ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==";
-      };
-    };
     "ora-8.2.0" = {
       name = "ora";
       packageName = "ora";
@@ -28556,15 +19974,6 @@ let
         sha512 = "weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==";
       };
     };
-    "ordered-binary-1.5.3" = {
-      name = "ordered-binary";
-      packageName = "ordered-binary";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz";
-        sha512 = "oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==";
-      };
-    };
     "org-regex-1.0.0" = {
       name = "org-regex";
       packageName = "org-regex";
@@ -28592,15 +20001,6 @@ let
         sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==";
       };
     };
-    "os-locale-1.4.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
-        sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==";
-      };
-    };
     "os-paths-4.4.0" = {
       name = "os-paths";
       packageName = "os-paths";
@@ -28628,15 +20028,6 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "own-keys-1.0.1" = {
-      name = "own-keys";
-      packageName = "own-keys";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz";
-        sha512 = "qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==";
-      };
-    };
     "p-cancelable-1.1.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
@@ -28646,15 +20037,6 @@ let
         sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
       };
     };
-    "p-cancelable-2.1.1" = {
-      name = "p-cancelable";
-      packageName = "p-cancelable";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz";
-        sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==";
-      };
-    };
     "p-cancelable-3.0.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
@@ -28700,33 +20082,6 @@ let
         sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==";
       };
     };
-    "p-is-promise-2.1.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
-      };
-    };
-    "p-is-promise-3.0.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz";
-        sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==";
-      };
-    };
-    "p-limit-1.3.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
-        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
-      };
-    };
     "p-limit-2.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
@@ -28754,24 +20109,6 @@ let
         sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==";
       };
     };
-    "p-locate-2.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
-        sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==";
-      };
-    };
-    "p-locate-3.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz";
-        sha512 = "x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==";
-      };
-    };
     "p-locate-4.1.0" = {
       name = "p-locate";
       packageName = "p-locate";
@@ -28808,15 +20145,6 @@ let
         sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==";
       };
     };
-    "p-map-4.0.0" = {
-      name = "p-map";
-      packageName = "p-map";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz";
-        sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==";
-      };
-    };
     "p-map-5.5.0" = {
       name = "p-map";
       packageName = "p-map";
@@ -28889,15 +20217,6 @@ let
         sha512 = "MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==";
       };
     };
-    "p-try-1.0.0" = {
-      name = "p-try";
-      packageName = "p-try";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
-        sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==";
-      };
-    };
     "p-try-2.2.0" = {
       name = "p-try";
       packageName = "p-try";
@@ -28934,15 +20253,6 @@ let
         sha512 = "ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==";
       };
     };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha512 = "PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg==";
-      };
-    };
     "package-json-6.5.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -28997,15 +20307,6 @@ let
         sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
-    "param-case-2.1.1" = {
-      name = "param-case";
-      packageName = "param-case";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz";
-        sha512 = "eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==";
-      };
-    };
     "parent-module-1.0.1" = {
       name = "parent-module";
       packageName = "parent-module";
@@ -29033,15 +20334,6 @@ let
         sha512 = "CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==";
       };
     };
-    "parse-author-2.0.0" = {
-      name = "parse-author";
-      packageName = "parse-author";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz";
-        sha512 = "yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==";
-      };
-    };
     "parse-bmfont-ascii-1.0.6" = {
       name = "parse-bmfont-ascii";
       packageName = "parse-bmfont-ascii";
@@ -29078,15 +20370,6 @@ let
         sha512 = "sMe/JmsY6g21aJCAm8KgCH90a9zCZ7aGSriSJ5B0CcGEsDN7YmiCk3+1iKPE1heDG6zYY4Xf++V8llWtCvNBSQ==";
       };
     };
-    "parse-entities-2.0.0" = {
-      name = "parse-entities";
-      packageName = "parse-entities";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz";
-        sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==";
-      };
-    };
     "parse-entities-4.0.2" = {
       name = "parse-entities";
       packageName = "parse-entities";
@@ -29213,15 +20496,6 @@ let
         sha512 = "TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==";
       };
     };
-    "parse-node-version-1.0.1" = {
-      name = "parse-node-version";
-      packageName = "parse-node-version";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz";
-        sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==";
-      };
-    };
     "parse-passwd-1.0.0" = {
       name = "parse-passwd";
       packageName = "parse-passwd";
@@ -29267,15 +20541,6 @@ let
         sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==";
       };
     };
-    "parse5-7.2.1" = {
-      name = "parse5";
-      packageName = "parse5";
-      version = "7.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz";
-        sha512 = "BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==";
-      };
-    };
     "parseqs-0.0.6" = {
       name = "parseqs";
       packageName = "parseqs";
@@ -29285,15 +20550,6 @@ let
         sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==";
       };
     };
-    "parserlib-1.1.1" = {
-      name = "parserlib";
-      packageName = "parserlib";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
-        sha512 = "e1HbF3+7ASJ/uOZirg5/8ZfPljTh100auNterbHB8TUs5egciuWQ2eX/2al8ko0RdV9Xh/5jDei3jqJAmbTDcg==";
-      };
-    };
     "parseuri-0.0.6" = {
       name = "parseuri";
       packageName = "parseuri";
@@ -29429,15 +20685,6 @@ let
         sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
       };
     };
-    "path-is-inside-1.0.2" = {
-      name = "path-is-inside";
-      packageName = "path-is-inside";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==";
-      };
-    };
     "path-key-2.0.1" = {
       name = "path-key";
       packageName = "path-key";
@@ -29501,15 +20748,6 @@ let
         sha512 = "Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==";
       };
     };
-    "path-posix-1.0.0" = {
-      name = "path-posix";
-      packageName = "path-posix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
-        sha512 = "1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==";
-      };
-    };
     "path-root-0.1.1" = {
       name = "path-root";
       packageName = "path-root";
@@ -29591,15 +20829,6 @@ let
         sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==";
       };
     };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha512 = "dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==";
-      };
-    };
     "path-type-4.0.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -29636,15 +20865,6 @@ let
         sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==";
       };
     };
-    "pe-library-1.0.1" = {
-      name = "pe-library";
-      packageName = "pe-library";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pe-library/-/pe-library-1.0.1.tgz";
-        sha512 = "nh39Mo1eGWmZS7y+mK/dQIqg7S1lp38DpRxkyoHf0ZcUs/HDc+yyTjuOtTvSMZHmfSLuSQaX945u05Y2Q6UWZg==";
-      };
-    };
     "peek-readable-4.1.0" = {
       name = "peek-readable";
       packageName = "peek-readable";
@@ -29708,15 +20928,6 @@ let
         sha512 = "GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==";
       };
     };
-    "picocolors-0.2.1" = {
-      name = "picocolors";
-      packageName = "picocolors";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz";
-        sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==";
-      };
-    };
     "picocolors-1.0.0" = {
       name = "picocolors";
       packageName = "picocolors";
@@ -29753,15 +20964,6 @@ let
         sha512 = "M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==";
       };
     };
-    "picomatch-browser-2.2.6" = {
-      name = "picomatch-browser";
-      packageName = "picomatch-browser";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch-browser/-/picomatch-browser-2.2.6.tgz";
-        sha512 = "0ypsOQt9D4e3hziV8O4elD9uN0z/jtUEfxVRtNaAAtXIyUx9m/SzlO020i8YNL2aL/E6blOvvHQcin6HZlFy/w==";
-      };
-    };
     "pid-port-1.0.2" = {
       name = "pid-port";
       packageName = "pid-port";
@@ -29834,24 +21036,6 @@ let
         sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==";
       };
     };
-    "pipe-functions-1.3.0" = {
-      name = "pipe-functions";
-      packageName = "pipe-functions";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pipe-functions/-/pipe-functions-1.3.0.tgz";
-        sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg==";
-      };
-    };
-    "pirates-4.0.6" = {
-      name = "pirates";
-      packageName = "pirates";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz";
-        sha512 = "saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==";
-      };
-    };
     "pixelmatch-4.0.2" = {
       name = "pixelmatch";
       packageName = "pixelmatch";
@@ -29861,24 +21045,6 @@ let
         sha512 = "J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==";
       };
     };
-    "pkg-5.8.1" = {
-      name = "pkg";
-      packageName = "pkg";
-      version = "5.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz";
-        sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA==";
-      };
-    };
-    "pkg-dir-3.0.0" = {
-      name = "pkg-dir";
-      packageName = "pkg-dir";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
-        sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
-      };
-    };
     "pkg-dir-4.2.0" = {
       name = "pkg-dir";
       packageName = "pkg-dir";
@@ -29906,15 +21072,6 @@ let
         sha512 = "4peoBq4Wks0riS0z8741NVv+/8IiTvqnZAr8QGgtdifrtpdXbNw/FxRS1l6NFqm4EMzuS0EDqNNx4XGaz8cuyQ==";
       };
     };
-    "pkg-fetch-3.4.2" = {
-      name = "pkg-fetch";
-      packageName = "pkg-fetch";
-      version = "3.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.2.tgz";
-        sha512 = "0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA==";
-      };
-    };
     "pkg-up-3.1.0" = {
       name = "pkg-up";
       packageName = "pkg-up";
@@ -29924,15 +21081,6 @@ let
         sha512 = "nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==";
       };
     };
-    "pkginfo-0.2.3" = {
-      name = "pkginfo";
-      packageName = "pkginfo";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.2.3.tgz";
-        sha512 = "7W7wTrE/NsY8xv/DTGjwNIyNah81EQH0MWcTzrHL6pOpMocOGZc0Mbdz9aXxSrp+U0mSmkU8jrNCDCfUs3sOBg==";
-      };
-    };
     "pkginfo-0.3.1" = {
       name = "pkginfo";
       packageName = "pkginfo";
@@ -29978,24 +21126,6 @@ let
         sha512 = "4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==";
       };
     };
-    "pluralize-1.2.1" = {
-      name = "pluralize";
-      packageName = "pluralize";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
-        sha512 = "TH+BeeL6Ct98C7as35JbZLf8lgsRzlNJb5gklRIGHKaPkGl1esOKBc5ALUMd+q08Sr6tiEKM+Icbsxg5vuhMKQ==";
-      };
-    };
-    "pluralize-3.1.0" = {
-      name = "pluralize";
-      packageName = "pluralize";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz";
-        sha512 = "2wcybwjwXOzGI1rlxWtlcs0/nSYK0OzNPqsg35TKxJFQlGhFu3cZ1x7EHS4r4bubQlhzyF4YxxlJqQnIhkUQCw==";
-      };
-    };
     "pluralize-8.0.0" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -30005,15 +21135,6 @@ let
         sha512 = "Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==";
       };
     };
-    "pn-1.1.0" = {
-      name = "pn";
-      packageName = "pn";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz";
-        sha512 = "2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==";
-      };
-    };
     "pngjs-3.4.0" = {
       name = "pngjs";
       packageName = "pngjs";
@@ -30023,15 +21144,6 @@ let
         sha512 = "NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==";
       };
     };
-    "pngjs-6.0.0" = {
-      name = "pngjs";
-      packageName = "pngjs";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz";
-        sha512 = "TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==";
-      };
-    };
     "pnpm-sync-lib-0.2.9" = {
       name = "pnpm-sync-lib";
       packageName = "pnpm-sync-lib";
@@ -30086,15 +21198,6 @@ let
         sha512 = "/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==";
       };
     };
-    "postcss-7.0.39" = {
-      name = "postcss";
-      packageName = "postcss";
-      version = "7.0.39";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz";
-        sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==";
-      };
-    };
     "postcss-8.5.3" = {
       name = "postcss";
       packageName = "postcss";
@@ -30104,24 +21207,6 @@ let
         sha512 = "dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==";
       };
     };
-    "postcss-html-0.36.0" = {
-      name = "postcss-html";
-      packageName = "postcss-html";
-      version = "0.36.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz";
-        sha512 = "HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==";
-      };
-    };
-    "postcss-less-3.1.4" = {
-      name = "postcss-less";
-      packageName = "postcss-less";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz";
-        sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==";
-      };
-    };
     "postcss-load-config-5.1.0" = {
       name = "postcss-load-config";
       packageName = "postcss-load-config";
@@ -30131,15 +21216,6 @@ let
         sha512 = "G5AJ+IX0aD0dygOE0yFZQ/huFFMSNneyfp0e3/bT05a8OfPC5FUoZRPfGijUdGOJNMewJiwzcHJXFafFzeKFVA==";
       };
     };
-    "postcss-media-query-parser-0.2.3" = {
-      name = "postcss-media-query-parser";
-      packageName = "postcss-media-query-parser";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz";
-        sha512 = "3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==";
-      };
-    };
     "postcss-reporter-7.1.0" = {
       name = "postcss-reporter";
       packageName = "postcss-reporter";
@@ -30149,42 +21225,6 @@ let
         sha512 = "/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==";
       };
     };
-    "postcss-resolve-nested-selector-0.1.6" = {
-      name = "postcss-resolve-nested-selector";
-      packageName = "postcss-resolve-nested-selector";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz";
-        sha512 = "0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==";
-      };
-    };
-    "postcss-safe-parser-4.0.2" = {
-      name = "postcss-safe-parser";
-      packageName = "postcss-safe-parser";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz";
-        sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==";
-      };
-    };
-    "postcss-sass-0.4.4" = {
-      name = "postcss-sass";
-      packageName = "postcss-sass";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz";
-        sha512 = "BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==";
-      };
-    };
-    "postcss-scss-2.1.1" = {
-      name = "postcss-scss";
-      packageName = "postcss-scss";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz";
-        sha512 = "jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==";
-      };
-    };
     "postcss-selector-parser-6.0.10" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
@@ -30194,60 +21234,6 @@ let
         sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==";
       };
     };
-    "postcss-selector-parser-6.1.2" = {
-      name = "postcss-selector-parser";
-      packageName = "postcss-selector-parser";
-      version = "6.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz";
-        sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==";
-      };
-    };
-    "postcss-syntax-0.36.2" = {
-      name = "postcss-syntax";
-      packageName = "postcss-syntax";
-      version = "0.36.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz";
-        sha512 = "nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==";
-      };
-    };
-    "postcss-value-parser-4.2.0" = {
-      name = "postcss-value-parser";
-      packageName = "postcss-value-parser";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz";
-        sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==";
-      };
-    };
-    "postject-1.0.0-alpha.6" = {
-      name = "postject";
-      packageName = "postject";
-      version = "1.0.0-alpha.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz";
-        sha512 = "b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==";
-      };
-    };
-    "prebuild-install-7.1.1" = {
-      name = "prebuild-install";
-      packageName = "prebuild-install";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz";
-        sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==";
-      };
-    };
-    "prebuild-install-7.1.3" = {
-      name = "prebuild-install";
-      packageName = "prebuild-install";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz";
-        sha512 = "8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==";
-      };
-    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -30266,15 +21252,6 @@ let
         sha512 = "lEHd+yEm22jXdCphDrkvIJQU66EuLojPPtvZkpKIkiD+l0DMThF/niqZKJSoU8Vl7iuvtmzyMhir9LdVy5WMnA==";
       };
     };
-    "prelude-ls-1.1.2" = {
-      name = "prelude-ls";
-      packageName = "prelude-ls";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==";
-      };
-    };
     "prelude-ls-1.2.1" = {
       name = "prelude-ls";
       packageName = "prelude-ls";
@@ -30311,15 +21288,6 @@ let
         sha512 = "s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==";
       };
     };
-    "prettier-2.0.5" = {
-      name = "prettier";
-      packageName = "prettier";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz";
-        sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==";
-      };
-    };
     "prettier-2.8.8" = {
       name = "prettier";
       packageName = "prettier";
@@ -30329,24 +21297,6 @@ let
         sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==";
       };
     };
-    "prettier-3.5.3" = {
-      name = "prettier";
-      packageName = "prettier";
-      version = "3.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz";
-        sha512 = "QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==";
-      };
-    };
-    "pretty-error-2.1.2" = {
-      name = "pretty-error";
-      packageName = "pretty-error";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz";
-        sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==";
-      };
-    };
     "pretty-hrtime-1.0.3" = {
       name = "pretty-hrtime";
       packageName = "pretty-hrtime";
@@ -30383,15 +21333,6 @@ let
         sha512 = "rksPWtoZb2ZpT5OVgtmy0KHVM+Dca3iVwWY9ifwhcexfjebtgjg3wmrUt9PvJ59XIYBcknQeYHD8IAnVlh9lAw==";
       };
     };
-    "prfun-2.1.5" = {
-      name = "prfun";
-      packageName = "prfun";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prfun/-/prfun-2.1.5.tgz";
-        sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug==";
-      };
-    };
     "printf-0.2.5" = {
       name = "printf";
       packageName = "printf";
@@ -30401,15 +21342,6 @@ let
         sha512 = "XHV6WP6xUvy42gUxdNyPQKCC9j36VzpVQ8Ztoffq0D6+PugiNsZ0FqBladXXPFQWthDDCA9OvGIsjEigMtznOQ==";
       };
     };
-    "proc-log-2.0.1" = {
-      name = "proc-log";
-      packageName = "proc-log";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz";
-        sha512 = "Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==";
-      };
-    };
     "proc-log-3.0.0" = {
       name = "proc-log";
       packageName = "proc-log";
@@ -30464,15 +21396,6 @@ let
         sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
-    "progress-1.1.8" = {
-      name = "progress";
-      packageName = "progress";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
-        sha512 = "UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==";
-      };
-    };
     "progress-2.0.3" = {
       name = "progress";
       packageName = "progress";
@@ -30482,24 +21405,6 @@ let
         sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==";
       };
     };
-    "prom-client-11.5.3" = {
-      name = "prom-client";
-      packageName = "prom-client";
-      version = "11.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz";
-        sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
-      };
-    };
-    "prom-client-15.1.2" = {
-      name = "prom-client";
-      packageName = "prom-client";
-      version = "15.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz";
-        sha512 = "on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ==";
-      };
-    };
     "promise-8.3.0" = {
       name = "promise";
       packageName = "promise";
@@ -30509,15 +21414,6 @@ let
         sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==";
       };
     };
-    "promise-inflight-1.0.1" = {
-      name = "promise-inflight";
-      packageName = "promise-inflight";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
-        sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==";
-      };
-    };
     "promise-retry-2.0.1" = {
       name = "promise-retry";
       packageName = "promise-retry";
@@ -30545,15 +21441,6 @@ let
         sha512 = "jDK5yEbAakJmNm+260gZG1+PuzX3jT5Jy0VZAUGrrW9RQ1JEWEDEVNnhO70mL3+U5r6bSJo02xsE34wOS/LnrA==";
       };
     };
-    "prompts-2.4.2" = {
-      name = "prompts";
-      packageName = "prompts";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz";
-        sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==";
-      };
-    };
     "proper-lockfile-4.1.2" = {
       name = "proper-lockfile";
       packageName = "proper-lockfile";
@@ -30662,15 +21549,6 @@ let
         sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==";
       };
     };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
-      };
-    };
     "psl-1.15.0" = {
       name = "psl";
       packageName = "psl";
@@ -30797,33 +21675,6 @@ let
         sha512 = "cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==";
       };
     };
-    "pvtsutils-1.3.6" = {
-      name = "pvtsutils";
-      packageName = "pvtsutils";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz";
-        sha512 = "PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==";
-      };
-    };
-    "pvutils-1.1.3" = {
-      name = "pvutils";
-      packageName = "pvutils";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz";
-        sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
-      };
-    };
-    "qs-0.4.2" = {
-      name = "qs";
-      packageName = "qs";
-      version = "0.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-0.4.2.tgz";
-        sha512 = "VAtfWeUtlBOnGiWFok2vOIMmwumiLmpqXDcXQcAEIQmLYgDbjrkHrcFBfth+YVDeRsz7jX44dhJr7IBJR0t/FQ==";
-      };
-    };
     "qs-3.1.0" = {
       name = "qs";
       packageName = "qs";
@@ -30860,24 +21711,6 @@ let
         sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
       };
     };
-    "query-string-6.14.1" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "6.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz";
-        sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==";
-      };
-    };
-    "query-string-7.1.3" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz";
-        sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==";
-      };
-    };
     "querystring-0.2.0" = {
       name = "querystring";
       packageName = "querystring";
@@ -30887,15 +21720,6 @@ let
         sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==";
       };
     };
-    "querystring-0.2.1" = {
-      name = "querystring";
-      packageName = "querystring";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz";
-        sha512 = "wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==";
-      };
-    };
     "querystring-es3-0.2.1" = {
       name = "querystring-es3";
       packageName = "querystring-es3";
@@ -30914,15 +21738,6 @@ let
         sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==";
       };
     };
-    "queue-6.0.2" = {
-      name = "queue";
-      packageName = "queue";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz";
-        sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==";
-      };
-    };
     "queue-microtask-1.2.3" = {
       name = "queue-microtask";
       packageName = "queue-microtask";
@@ -30968,15 +21783,6 @@ let
         sha512 = "AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==";
       };
     };
-    "quicktask-1.1.0" = {
-      name = "quicktask";
-      packageName = "quicktask";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/quicktask/-/quicktask-1.1.0.tgz";
-        sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g==";
-      };
-    };
     "quotation-2.0.3" = {
       name = "quotation";
       packageName = "quotation";
@@ -30986,15 +21792,6 @@ let
         sha512 = "yEc24TEgCFLXx7D4JHJJkK4JFVtatO8fziwUxY4nB/Jbea9o9CVS3gt22mA0W7rPYAGW2fWzYDSOtD94PwOyqA==";
       };
     };
-    "raf-3.3.2" = {
-      name = "raf";
-      packageName = "raf";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz";
-        sha512 = "1s5BQAy643nfjtnZZrH8V2fhj3snKrKkwp8cDaf2KfjW4/auwB+qffSEsvs1/iOuKiOr5vK7R0HQ0dQ1zituiQ==";
-      };
-    };
     "ramda-0.27.2" = {
       name = "ramda";
       packageName = "ramda";
@@ -31085,15 +21882,6 @@ let
         sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
       };
     };
-    "rate-limiter-flexible-4.0.1" = {
-      name = "rate-limiter-flexible";
-      packageName = "rate-limiter-flexible";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-4.0.1.tgz";
-        sha512 = "2/dGHpDFpeA0+755oUkW+EKyklqLS9lu0go9pDsbhqQjZcxfRyJ6LA4JI0+HAdZ2bemD/oOjUeZQB2lCZqXQfQ==";
-      };
-    };
     "raw-body-2.4.1" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -31139,15 +21927,6 @@ let
         sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA==";
       };
     };
-    "re-reselect-4.0.1" = {
-      name = "re-reselect";
-      packageName = "re-reselect";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz";
-        sha512 = "xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA==";
-      };
-    };
     "react-17.0.2" = {
       name = "react";
       packageName = "react";
@@ -31211,24 +21990,6 @@ let
         sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==";
       };
     };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha512 = "DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==";
-      };
-    };
-    "read-binary-file-arch-1.0.6" = {
-      name = "read-binary-file-arch";
-      packageName = "read-binary-file-arch";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz";
-        sha512 = "BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==";
-      };
-    };
     "read-cache-1.0.0" = {
       name = "read-cache";
       packageName = "read-cache";
@@ -31292,15 +22053,6 @@ let
         sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==";
       };
     };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha512 = "eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==";
-      };
-    };
     "read-pkg-5.2.0" = {
       name = "read-pkg";
       packageName = "read-pkg";
@@ -31310,15 +22062,6 @@ let
         sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==";
       };
     };
-    "read-pkg-6.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz";
-        sha512 = "X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==";
-      };
-    };
     "read-pkg-7.1.0" = {
       name = "read-pkg";
       packageName = "read-pkg";
@@ -31346,15 +22089,6 @@ let
         sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==";
       };
     };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha512 = "1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==";
-      };
-    };
     "read-pkg-up-7.0.1" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -31364,15 +22098,6 @@ let
         sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==";
       };
     };
-    "read-pkg-up-8.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz";
-        sha512 = "snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==";
-      };
-    };
     "read-pkg-up-9.1.0" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -31508,24 +22233,6 @@ let
         sha512 = "GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==";
       };
     };
-    "readline-1.3.0" = {
-      name = "readline";
-      packageName = "readline";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz";
-        sha512 = "k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==";
-      };
-    };
-    "readline2-1.0.1" = {
-      name = "readline2";
-      packageName = "readline2";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
-        sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==";
-      };
-    };
     "rechoir-0.6.2" = {
       name = "rechoir";
       packageName = "rechoir";
@@ -31589,33 +22296,6 @@ let
         sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==";
       };
     };
-    "redis-errors-1.2.0" = {
-      name = "redis-errors";
-      packageName = "redis-errors";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
-        sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==";
-      };
-    };
-    "redis-parser-3.0.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
-        sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==";
-      };
-    };
-    "reduce-flatten-1.0.1" = {
-      name = "reduce-flatten";
-      packageName = "reduce-flatten";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
-        sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ==";
-      };
-    };
     "redux-4.2.1" = {
       name = "redux";
       packageName = "redux";
@@ -31625,24 +22305,6 @@ let
         sha512 = "LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==";
       };
     };
-    "reflect-metadata-0.1.14" = {
-      name = "reflect-metadata";
-      packageName = "reflect-metadata";
-      version = "0.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz";
-        sha512 = "ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==";
-      };
-    };
-    "reflect.getprototypeof-1.0.10" = {
-      name = "reflect.getprototypeof";
-      packageName = "reflect.getprototypeof";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz";
-        sha512 = "00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==";
-      };
-    };
     "reftools-1.1.9" = {
       name = "reftools";
       packageName = "reftools";
@@ -31724,15 +22386,6 @@ let
         sha512 = "dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==";
       };
     };
-    "regexparam-2.0.2" = {
-      name = "regexparam";
-      packageName = "regexparam";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexparam/-/regexparam-2.0.2.tgz";
-        sha512 = "A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==";
-      };
-    };
     "registry-auth-token-3.3.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
@@ -31742,15 +22395,6 @@ let
         sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==";
       };
     };
-    "registry-auth-token-3.4.0" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
-        sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
-      };
-    };
     "registry-auth-token-4.2.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
@@ -31769,15 +22413,6 @@ let
         sha512 = "GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==";
       };
     };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==";
-      };
-    };
     "registry-url-5.1.0" = {
       name = "registry-url";
       packageName = "registry-url";
@@ -31823,33 +22458,6 @@ let
         sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==";
       };
     };
-    "relateurl-0.2.7" = {
-      name = "relateurl";
-      packageName = "relateurl";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz";
-        sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==";
-      };
-    };
-    "relative-3.0.2" = {
-      name = "relative";
-      packageName = "relative";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/relative/-/relative-3.0.2.tgz";
-        sha512 = "Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==";
-      };
-    };
-    "remark-13.0.0" = {
-      name = "remark";
-      packageName = "remark";
-      version = "13.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz";
-        sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==";
-      };
-    };
     "remark-15.0.1" = {
       name = "remark";
       packageName = "remark";
@@ -32354,15 +22962,6 @@ let
         sha512 = "FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==";
       };
     };
-    "remark-parse-9.0.0" = {
-      name = "remark-parse";
-      packageName = "remark-parse";
-      version = "9.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz";
-        sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==";
-      };
-    };
     "remark-retext-5.0.1" = {
       name = "remark-retext";
       packageName = "remark-retext";
@@ -32381,15 +22980,6 @@ let
         sha512 = "1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==";
       };
     };
-    "remark-stringify-9.0.1" = {
-      name = "remark-stringify";
-      packageName = "remark-stringify";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz";
-        sha512 = "mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==";
-      };
-    };
     "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
@@ -32399,15 +22989,6 @@ let
         sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==";
       };
     };
-    "renderkid-2.0.7" = {
-      name = "renderkid";
-      packageName = "renderkid";
-      version = "2.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz";
-        sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==";
-      };
-    };
     "repeat-element-1.1.4" = {
       name = "repeat-element";
       packageName = "repeat-element";
@@ -32435,24 +23016,6 @@ let
         sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==";
       };
     };
-    "replace-ext-0.0.1" = {
-      name = "replace-ext";
-      packageName = "replace-ext";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
-        sha512 = "AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==";
-      };
-    };
-    "replace-ext-2.0.0" = {
-      name = "replace-ext";
-      packageName = "replace-ext";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz";
-        sha512 = "UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==";
-      };
-    };
     "replace-homedir-2.0.0" = {
       name = "replace-homedir";
       packageName = "replace-homedir";
@@ -32462,15 +23025,6 @@ let
         sha512 = "bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==";
       };
     };
-    "request-2.88.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.88.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
-      };
-    };
     "request-2.88.2" = {
       name = "request";
       packageName = "request";
@@ -32480,24 +23034,6 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-2.9.203" = {
-      name = "request";
-      packageName = "request";
-      version = "2.9.203";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.9.203.tgz";
-        sha512 = "OWtna9w7yRI/gcfu3VaURgIwE1FHgbz5+fHGQ9GJTHcJ4+uvHnDjXd+N7mVDOv5+1fp1CRPzUSY2wcM345Z2Fw==";
-      };
-    };
-    "request-compose-2.1.7" = {
-      name = "request-compose";
-      packageName = "request-compose";
-      version = "2.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-compose/-/request-compose-2.1.7.tgz";
-        sha512 = "27amNkWTK4Qq25XEwdmrhb4VLMiQzRSKuDfsy1o1griykcyXk5MxMHmJG+OKTRdO9PgsO7Kkn7GrEkq0UAIIMQ==";
-      };
-    };
     "request-light-0.4.0" = {
       name = "request-light";
       packageName = "request-light";
@@ -32507,33 +23043,6 @@ let
         sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA==";
       };
     };
-    "request-oauth-1.0.1" = {
-      name = "request-oauth";
-      packageName = "request-oauth";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-oauth/-/request-oauth-1.0.1.tgz";
-        sha512 = "85THTg1RgOYtqQw42JON6AqvHLptlj1biw265Tsq4fD4cPdUvhDB2Qh9NTv17yCD322ROuO9aOmpc4GyayGVBA==";
-      };
-    };
-    "request-promise-4.2.6" = {
-      name = "request-promise";
-      packageName = "request-promise";
-      version = "4.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz";
-        sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==";
-      };
-    };
-    "request-promise-core-1.1.4" = {
-      name = "request-promise-core";
-      packageName = "request-promise-core";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz";
-        sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==";
-      };
-    };
     "requestretry-7.1.0" = {
       name = "requestretry";
       packageName = "requestretry";
@@ -32561,15 +23070,6 @@ let
         sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==";
-      };
-    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
@@ -32588,15 +23088,6 @@ let
         sha512 = "uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==";
       };
     };
-    "require-uncached-1.0.3" = {
-      name = "require-uncached";
-      packageName = "require-uncached";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
-        sha512 = "Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==";
-      };
-    };
     "requirejs-2.3.7" = {
       name = "requirejs";
       packageName = "requirejs";
@@ -32624,24 +23115,6 @@ let
         sha512 = "JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==";
       };
     };
-    "resedit-2.0.3" = {
-      name = "resedit";
-      packageName = "resedit";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resedit/-/resedit-2.0.3.tgz";
-        sha512 = "oTeemxwoMuxxTYxXUwjkrOPfngTQehlv0/HoYFNkB4uzsP1Un1A9nI8JQKGOFkxpqkC7qkMs0lUsGrvUlbLNUA==";
-      };
-    };
-    "reselect-4.1.8" = {
-      name = "reselect";
-      packageName = "reselect";
-      version = "4.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz";
-        sha512 = "ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==";
-      };
-    };
     "reserved-words-0.1.2" = {
       name = "reserved-words";
       packageName = "reserved-words";
@@ -32687,24 +23160,6 @@ let
         sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==";
       };
     };
-    "resolve-from-1.0.1" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz";
-        sha512 = "kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==";
-      };
-    };
-    "resolve-from-2.0.0" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
-        sha512 = "qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==";
-      };
-    };
     "resolve-from-4.0.0" = {
       name = "resolve-from";
       packageName = "resolve-from";
@@ -32723,15 +23178,6 @@ let
         sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==";
       };
     };
-    "resolve-options-2.0.0" = {
-      name = "resolve-options";
-      packageName = "resolve-options";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz";
-        sha512 = "/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==";
-      };
-    };
     "resolve-pkg-maps-1.0.0" = {
       name = "resolve-pkg-maps";
       packageName = "resolve-pkg-maps";
@@ -32768,15 +23214,6 @@ let
         sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==";
       };
     };
-    "responselike-2.0.1" = {
-      name = "responselike";
-      packageName = "responselike";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz";
-        sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==";
-      };
-    };
     "responselike-3.0.0" = {
       name = "responselike";
       packageName = "responselike";
@@ -32795,15 +23232,6 @@ let
         sha512 = "Wj+p3Y+5KFv+bzb7X+4H+RKaITS7y84xhR8KH1BfytpX6K1mnUVDqq2Kp0/jk/awSDQrWrkLtf0gzWfsmT1zcg==";
       };
     };
-    "restore-cursor-1.0.1" = {
-      name = "restore-cursor";
-      packageName = "restore-cursor";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
-        sha512 = "reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==";
-      };
-    };
     "restore-cursor-2.0.0" = {
       name = "restore-cursor";
       packageName = "restore-cursor";
@@ -33029,42 +23457,6 @@ let
         sha512 = "kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==";
       };
     };
-    "round-to-6.0.0" = {
-      name = "round-to";
-      packageName = "round-to";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/round-to/-/round-to-6.0.0.tgz";
-        sha512 = "jFvBgyRueGU0QVa7EqXZOkarkzrqEnF3VTCzATRcBkzxXJ4/+pzDf1iouqOqGsx6ZpnIIu5gvFDGnyzoX58ldQ==";
-      };
-    };
-    "rrweb-cssom-0.7.1" = {
-      name = "rrweb-cssom";
-      packageName = "rrweb-cssom";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz";
-        sha512 = "TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==";
-      };
-    };
-    "rrweb-cssom-0.8.0" = {
-      name = "rrweb-cssom";
-      packageName = "rrweb-cssom";
-      version = "0.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz";
-        sha512 = "guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==";
-      };
-    };
-    "rss-parser-3.7.1" = {
-      name = "rss-parser";
-      packageName = "rss-parser";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.1.tgz";
-        sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ==";
-      };
-    };
     "run-applescript-7.0.0" = {
       name = "run-applescript";
       packageName = "run-applescript";
@@ -33074,15 +23466,6 @@ let
         sha512 = "9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==";
       };
     };
-    "run-async-0.1.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
-        sha512 = "qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==";
-      };
-    };
     "run-async-2.4.1" = {
       name = "run-async";
       packageName = "run-async";
@@ -33146,33 +23529,6 @@ let
         sha512 = "CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==";
       };
     };
-    "rx-lite-3.1.2" = {
-      name = "rx-lite";
-      packageName = "rx-lite";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
-        sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==";
-      };
-    };
-    "rx-lite-4.0.8" = {
-      name = "rx-lite";
-      packageName = "rx-lite";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz";
-        sha512 = "Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==";
-      };
-    };
-    "rx-lite-aggregates-4.0.8" = {
-      name = "rx-lite-aggregates";
-      packageName = "rx-lite-aggregates";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz";
-        sha512 = "3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==";
-      };
-    };
     "rxjs-5.5.12" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -33245,15 +23601,6 @@ let
         sha512 = "xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==";
       };
     };
-    "safe-array-concat-1.1.3" = {
-      name = "safe-array-concat";
-      packageName = "safe-array-concat";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz";
-        sha512 = "AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==";
-      };
-    };
     "safe-buffer-5.0.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -33263,15 +23610,6 @@ let
         sha512 = "cr7dZWLwOeaFBLTIuZeYdkfO7UzGIKhjYENJFAxUOMKWGaWDm2nJM2rzxNRm5Owu0DH3ApwNo6kx5idXZfb/Iw==";
       };
     };
-    "safe-buffer-5.1.1" = {
-      name = "safe-buffer";
-      packageName = "safe-buffer";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz";
-        sha512 = "kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==";
-      };
-    };
     "safe-buffer-5.1.2" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -33299,15 +23637,6 @@ let
         sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==";
       };
     };
-    "safe-push-apply-1.0.0" = {
-      name = "safe-push-apply";
-      packageName = "safe-push-apply";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz";
-        sha512 = "iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==";
-      };
-    };
     "safe-regex-1.1.0" = {
       name = "safe-regex";
       packageName = "safe-regex";
@@ -33362,42 +23691,6 @@ let
         sha512 = "3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==";
       };
     };
-    "sasl-anonymous-0.1.0" = {
-      name = "sasl-anonymous";
-      packageName = "sasl-anonymous";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz";
-        sha512 = "x+0sdsV0Gie2EexxAUsx6ZoB+X6OCthlNBvAQncQxreEWQJByAPntj0EAgTlJc2kZicoc+yFzeR6cl8VfsQGfA==";
-      };
-    };
-    "sasl-plain-0.1.0" = {
-      name = "sasl-plain";
-      packageName = "sasl-plain";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-plain/-/sasl-plain-0.1.0.tgz";
-        sha512 = "X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==";
-      };
-    };
-    "sasl-scram-sha-1-1.3.0" = {
-      name = "sasl-scram-sha-1";
-      packageName = "sasl-scram-sha-1";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz";
-        sha512 = "hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ==";
-      };
-    };
-    "saslmechanisms-0.1.1" = {
-      name = "saslmechanisms";
-      packageName = "saslmechanisms";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/saslmechanisms/-/saslmechanisms-0.1.1.tgz";
-        sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==";
-      };
-    };
     "sax-1.2.1" = {
       name = "sax";
       packageName = "sax";
@@ -33416,24 +23709,6 @@ let
         sha512 = "+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==";
       };
     };
-    "saxes-5.0.1" = {
-      name = "saxes";
-      packageName = "saxes";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz";
-        sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==";
-      };
-    };
-    "saxes-6.0.0" = {
-      name = "saxes";
-      packageName = "saxes";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz";
-        sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==";
-      };
-    };
     "scheduler-0.20.2" = {
       name = "scheduler";
       packageName = "scheduler";
@@ -33452,15 +23727,6 @@ let
         sha512 = "UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==";
       };
     };
-    "schema-utils-4.3.0" = {
-      name = "schema-utils";
-      packageName = "schema-utils";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz";
-        sha512 = "Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==";
-      };
-    };
     "scoped-regex-3.0.0" = {
       name = "scoped-regex";
       packageName = "scoped-regex";
@@ -33560,15 +23826,6 @@ let
         sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==";
       };
     };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha512 = "gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw==";
-      };
-    };
     "semver-diff-3.1.1" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -33632,33 +23889,6 @@ let
         sha512 = "v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==";
       };
     };
-    "serialize-error-11.0.3" = {
-      name = "serialize-error";
-      packageName = "serialize-error";
-      version = "11.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz";
-        sha512 = "2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==";
-      };
-    };
-    "serialize-javascript-6.0.2" = {
-      name = "serialize-javascript";
-      packageName = "serialize-javascript";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz";
-        sha512 = "Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==";
-      };
-    };
-    "serve-favicon-2.5.0" = {
-      name = "serve-favicon";
-      packageName = "serve-favicon";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz";
-        sha512 = "FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==";
-      };
-    };
     "serve-handler-6.1.6" = {
       name = "serve-handler";
       packageName = "serve-handler";
@@ -33695,15 +23925,6 @@ let
         sha512 = "rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==";
       };
     };
-    "service-runner-2.9.0" = {
-      name = "service-runner";
-      packageName = "service-runner";
-      version = "2.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/service-runner/-/service-runner-2.9.0.tgz";
-        sha512 = "u5yFOwfPAaLo9oqbTWq0F02C3R/sohTbX5zqxWfoYe1bS3OpEyJsTGoRE5CGHum/RZcazxFpaVCrE+fIUvg3qA==";
-      };
-    };
     "set-blocking-2.0.0" = {
       name = "set-blocking";
       packageName = "set-blocking";
@@ -33740,15 +23961,6 @@ let
         sha512 = "Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==";
       };
     };
-    "set-proto-1.0.0" = {
-      name = "set-proto";
-      packageName = "set-proto";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz";
-        sha512 = "RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==";
-      };
-    };
     "set-value-2.0.1" = {
       name = "set-value";
       packageName = "set-value";
@@ -33794,24 +24006,6 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "seventh-0.7.40" = {
-      name = "seventh";
-      packageName = "seventh";
-      version = "0.7.40";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.40.tgz";
-        sha512 = "7sxUydQx4iEh17uJUFjZDAwbffJirldZaNIJvVB/hk9mPEL3J4GpLGSL+mHFH2ydkye46DAsLGqzFJ+/Qj5foQ==";
-      };
-    };
-    "seventh-0.9.2" = {
-      name = "seventh";
-      packageName = "seventh";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.9.2.tgz";
-        sha512 = "C+dnbBXIEycnrN6/CpFt/Rt8ccMzAX3wbwJU61RTfC8lYPMzSkKkAVWnUEMTZDHdvtlrTupZeCUK4G+uP4TmRQ==";
-      };
-    };
     "sha.js-2.4.11" = {
       name = "sha.js";
       packageName = "sha.js";
@@ -33821,24 +24015,6 @@ let
         sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
-    "shallow-clone-3.0.1" = {
-      name = "shallow-clone";
-      packageName = "shallow-clone";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz";
-        sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==";
-      };
-    };
-    "sharp-0.33.4" = {
-      name = "sharp";
-      packageName = "sharp";
-      version = "0.33.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz";
-        sha512 = "7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==";
-      };
-    };
     "shasum-1.0.2" = {
       name = "shasum";
       packageName = "shasum";
@@ -33902,15 +24078,6 @@ let
         sha512 = "AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==";
       };
     };
-    "shelljs-0.7.8" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.7.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz";
-        sha512 = "/YF5Uk8hcwi7ima04ppkbA4RaRMdPMBfwAvAf8sufYOxsJRtbdoBsT8vGvlb+799BrlGdYrd+oczIA2eN2JdWA==";
-      };
-    };
     "shelljs-0.8.5" = {
       name = "shelljs";
       packageName = "shelljs";
@@ -33920,15 +24087,6 @@ let
         sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==";
       };
     };
-    "shellwords-0.1.1" = {
-      name = "shellwords";
-      packageName = "shellwords";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
-        sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
-      };
-    };
     "shiki-1.29.2" = {
       name = "shiki";
       packageName = "shiki";
@@ -34154,15 +24312,6 @@ let
         sha512 = "knEO6ub2Pw00c7ueOV6snKE1hr7jIdY068+239v0I8DVKofyd7IQmYHXrM9pZL1zuI0H7sd+Y5kedndBi5GXIA==";
       };
     };
-    "simplediff-0.1.1" = {
-      name = "simplediff";
-      packageName = "simplediff";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/simplediff/-/simplediff-0.1.1.tgz";
-        sha512 = "Jvtruf4MmFtRS7ICivKX9RzEJuWHp8Hw2jHyAPOEWzMJ4U3u9ykc+N1UD9zMmsW7Hg0BAxYRH2wHxzMsyd4oUw==";
-      };
-    };
     "single-line-log-1.1.2" = {
       name = "single-line-log";
       packageName = "single-line-log";
@@ -34172,24 +24321,6 @@ let
         sha512 = "awzaaIPtYFdexLr6TBpcZSGPB6D1RInNO/qNetgaJloPDF/D0GkVtLvGEp8InfmLV7CyLyQ5fIRP+tVN/JmWQA==";
       };
     };
-    "sirv-2.0.4" = {
-      name = "sirv";
-      packageName = "sirv";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz";
-        sha512 = "94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==";
-      };
-    };
-    "sisteransi-1.0.5" = {
-      name = "sisteransi";
-      packageName = "sisteransi";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz";
-        sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==";
-      };
-    };
     "skin-tone-4.0.0" = {
       name = "skin-tone";
       packageName = "skin-tone";
@@ -34253,15 +24384,6 @@ let
         sha512 = "up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==";
       };
     };
-    "slice-ansi-1.0.0" = {
-      name = "slice-ansi";
-      packageName = "slice-ansi";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz";
-        sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==";
-      };
-    };
     "slice-ansi-3.0.0" = {
       name = "slice-ansi";
       packageName = "slice-ansi";
@@ -34334,24 +24456,6 @@ let
         sha512 = "c3iQfVBeHIqsPW2vD7x3UcYuCl7QDNtQm+HLV3jB434hoi2A/jOOPqi1nLSuWQKX51v4j9+aMA0VN8LIOObTNw==";
       };
     };
-    "snabbdom-0.7.0" = {
-      name = "snabbdom";
-      packageName = "snabbdom";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz";
-        sha512 = "LCg6lH9p2OD5n52SI4LlpYmDW2bscxsyN7rhnGJB/R3LQy/FdJfqNBM5aVST+zOfM4OdKFl8pxVUhjGsPtQA1w==";
-      };
-    };
-    "snabbdom-selector-1.2.1" = {
-      name = "snabbdom-selector";
-      packageName = "snabbdom-selector";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz";
-        sha512 = "g0w2Ft4RJl+F/1/tQvA4BUsH09s+RNd0RRa+So24Inv5yzce5xUnPzxlEWNUBG5TwQjfKDZSFWrf2rXz+e1Q2g==";
-      };
-    };
     "snake-case-3.0.4" = {
       name = "snake-case";
       packageName = "snake-case";
@@ -34478,24 +24582,6 @@ let
         sha512 = "D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==";
       };
     };
-    "socks-proxy-agent-6.2.1" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz";
-        sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==";
-      };
-    };
-    "socks-proxy-agent-7.0.0" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz";
-        sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==";
-      };
-    };
     "socks-proxy-agent-8.0.5" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
@@ -34559,33 +24645,6 @@ let
         sha512 = "aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==";
       };
     };
-    "sort-on-6.1.0" = {
-      name = "sort-on";
-      packageName = "sort-on";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sort-on/-/sort-on-6.1.0.tgz";
-        sha512 = "WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA==";
-      };
-    };
-    "sorted-array-functions-1.3.0" = {
-      name = "sorted-array-functions";
-      packageName = "sorted-array-functions";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz";
-        sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==";
-      };
-    };
-    "sorted-immutable-list-1.1.0" = {
-      name = "sorted-immutable-list";
-      packageName = "sorted-immutable-list";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-immutable-list/-/sorted-immutable-list-1.1.0.tgz";
-        sha512 = "TJBqEU5iFISlA9lfaGKK44sDo7FTLqKvGOIQh8PN/JO1uJQOL3PeAitec2sNTzVe4FiLbBpa3XNlMrd+HglkjA==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -34631,15 +24690,6 @@ let
         sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
       };
     };
-    "source-map-support-0.5.21" = {
-      name = "source-map-support";
-      packageName = "source-map-support";
-      version = "0.5.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz";
-        sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==";
-      };
-    };
     "source-map-url-0.4.1" = {
       name = "source-map-url";
       packageName = "source-map-url";
@@ -34667,15 +24717,6 @@ let
         sha512 = "PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==";
       };
     };
-    "sparkles-1.0.1" = {
-      name = "sparkles";
-      packageName = "sparkles";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz";
-        sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==";
-      };
-    };
     "sparkles-2.1.0" = {
       name = "sparkles";
       packageName = "sparkles";
@@ -34748,15 +24789,6 @@ let
         sha512 = "4bSLdgzl0xcMto0zPmhLRfy7y8ZWSjcv+znurjcUnzW5ZQhhDo+HKIRdAB+n/mTde+KEfoQKYzehc6pUHrRQYw==";
       };
     };
-    "specificity-0.4.1" = {
-      name = "specificity";
-      packageName = "specificity";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz";
-        sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==";
-      };
-    };
     "speedometer-0.1.4" = {
       name = "speedometer";
       packageName = "speedometer";
@@ -34766,15 +24798,6 @@ let
         sha512 = "phdEoDlA6EUIVtzwq1UiNMXDUogczp204aYF/yfOhjNePWFfIpBJ1k5wLMuXQhEOOMjuTJEcc4vdZa+vuP+n/Q==";
       };
     };
-    "speedtest-net-1.6.2" = {
-      name = "speedtest-net";
-      packageName = "speedtest-net";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/speedtest-net/-/speedtest-net-1.6.2.tgz";
-        sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA==";
-      };
-    };
     "split-0.2.10" = {
       name = "split";
       packageName = "split";
@@ -34802,33 +24825,6 @@ let
         sha512 = "Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==";
       };
     };
-    "split-on-first-1.1.0" = {
-      name = "split-on-first";
-      packageName = "split-on-first";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz";
-        sha512 = "43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==";
-      };
-    };
-    "split-skip-0.0.1" = {
-      name = "split-skip";
-      packageName = "split-skip";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split-skip/-/split-skip-0.0.1.tgz";
-        sha512 = "7dkvq+gofI4M8zx4iZnEZ3O1s7FP4Y/iaIDHJh5RyWrs8idcPauFi2OZe3TBi36fLvR2j5z3kSzVtz6IhPdncQ==";
-      };
-    };
-    "split-skip-0.0.2" = {
-      name = "split-skip";
-      packageName = "split-skip";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split-skip/-/split-skip-0.0.2.tgz";
-        sha512 = "weHOi8BolsDnGIwhhWHbA+wKSuSpvWwjRrdj8SdbIIis2vSwOE37CQP8x3EleuzxanUr3AK8BdUy4MkiOULPZg==";
-      };
-    };
     "split-string-3.1.0" = {
       name = "split-string";
       packageName = "split-string";
@@ -34892,15 +24888,6 @@ let
         sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==";
       };
     };
-    "sqlite3-5.1.6" = {
-      name = "sqlite3";
-      packageName = "sqlite3";
-      version = "5.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz";
-        sha512 = "olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==";
-      };
-    };
     "sscaff-1.2.274" = {
       name = "sscaff";
       packageName = "sscaff";
@@ -34973,15 +24960,6 @@ let
         sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==";
       };
     };
-    "ssri-9.0.1" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz";
-        sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==";
-      };
-    };
     "stack-trace-0.0.10" = {
       name = "stack-trace";
       packageName = "stack-trace";
@@ -35009,15 +24987,6 @@ let
         sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==";
       };
     };
-    "standard-as-callback-2.1.0" = {
-      name = "standard-as-callback";
-      packageName = "standard-as-callback";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz";
-        sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==";
-      };
-    };
     "stat-mode-0.3.0" = {
       name = "stat-mode";
       packageName = "stat-mode";
@@ -35063,15 +25032,6 @@ let
         sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==";
       };
     };
-    "stdin-discarder-0.1.0" = {
-      name = "stdin-discarder";
-      packageName = "stdin-discarder";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz";
-        sha512 = "xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==";
-      };
-    };
     "stdin-discarder-0.2.2" = {
       name = "stdin-discarder";
       packageName = "stdin-discarder";
@@ -35081,33 +25041,6 @@ let
         sha512 = "UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==";
       };
     };
-    "stealthy-require-1.1.1" = {
-      name = "stealthy-require";
-      packageName = "stealthy-require";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz";
-        sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==";
-      };
-    };
-    "steno-0.4.4" = {
-      name = "steno";
-      packageName = "steno";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz";
-        sha512 = "EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==";
-      };
-    };
-    "steno-4.0.2" = {
-      name = "steno";
-      packageName = "steno";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/steno/-/steno-4.0.2.tgz";
-        sha512 = "yhPIQXjrlt1xv7dyPQg2P17URmXbuM5pdGkpiMB3RenprfiBlvK415Lctfe0eshk90oA7/tNq7WEiMK8RSP39A==";
-      };
-    };
     "stop-iteration-iterator-1.1.0" = {
       name = "stop-iteration-iterator";
       packageName = "stop-iteration-iterator";
@@ -35189,24 +25122,6 @@ let
         sha512 = "3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==";
       };
     };
-    "stream-composer-1.0.2" = {
-      name = "stream-composer";
-      packageName = "stream-composer";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz";
-        sha512 = "bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==";
-      };
-    };
-    "stream-exhaust-1.0.2" = {
-      name = "stream-exhaust";
-      packageName = "stream-exhaust";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz";
-        sha512 = "b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==";
-      };
-    };
     "stream-http-3.2.0" = {
       name = "stream-http";
       packageName = "stream-http";
@@ -35225,15 +25140,6 @@ let
         sha512 = "uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==";
       };
     };
-    "stream-meter-1.0.4" = {
-      name = "stream-meter";
-      packageName = "stream-meter";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz";
-        sha512 = "4sOEtrbgFotXwnEuzzsQBYEV1elAeFSO8rSGeTwabuX1RRn/kEq9JVH7I0MRBhKVRR0sJkr0M0QCH7yOLf9fhQ==";
-      };
-    };
     "stream-shift-1.0.3" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -35297,15 +25203,6 @@ let
         sha512 = "KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==";
       };
     };
-    "streamsearch-1.1.0" = {
-      name = "streamsearch";
-      packageName = "streamsearch";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz";
-        sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==";
-      };
-    };
     "streamx-2.22.0" = {
       name = "streamx";
       packageName = "streamx";
@@ -35333,42 +25230,6 @@ let
         sha512 = "aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==";
       };
     };
-    "string-kit-0.11.10" = {
-      name = "string-kit";
-      packageName = "string-kit";
-      version = "0.11.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.10.tgz";
-        sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag==";
-      };
-    };
-    "string-kit-0.18.3" = {
-      name = "string-kit";
-      packageName = "string-kit";
-      version = "0.18.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.18.3.tgz";
-        sha512 = "G8cBS7wxxHhwQrKU0Y8SjZJRtCzZ61bMmMCO1bWm6N6y2obT0koGK8uWYloMOaVPPr8zk7Ic995uEd4Jw504AQ==";
-      };
-    };
-    "string-padding-1.0.2" = {
-      name = "string-padding";
-      packageName = "string-padding";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-padding/-/string-padding-1.0.2.tgz";
-        sha512 = "VrG4XqNiKiufIn/F2rivcnrrRazwOQs0o6pGDd8lKSx6pzsxwvi91D3uj00uQ+jh3LEEDvRmEPNbMzZe5L18Kg==";
-      };
-    };
-    "string-to-stream-3.0.1" = {
-      name = "string-to-stream";
-      packageName = "string-to-stream";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-to-stream/-/string-to-stream-3.0.1.tgz";
-        sha512 = "Hl092MV3USJuUCC6mfl9sPzGloA3K5VwdIeJjYIkXY/8K+mUvaeEabWJgArp+xXrsWxCajeT2pc4axbVhIZJyg==";
-      };
-    };
     "string-width-1.0.2" = {
       name = "string-width";
       packageName = "string-width";
@@ -35387,15 +25248,6 @@ let
         sha512 = "nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==";
       };
     };
-    "string-width-3.1.0" = {
-      name = "string-width";
-      packageName = "string-width";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz";
-        sha512 = "vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==";
-      };
-    };
     "string-width-4.2.3" = {
       name = "string-width";
       packageName = "string-width";
@@ -35432,33 +25284,6 @@ let
         sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
       };
     };
-    "string.prototype.trim-1.2.10" = {
-      name = "string.prototype.trim";
-      packageName = "string.prototype.trim";
-      version = "1.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz";
-        sha512 = "Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==";
-      };
-    };
-    "string.prototype.trimend-1.0.9" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz";
-        sha512 = "G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==";
-      };
-    };
-    "string.prototype.trimstart-1.0.8" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz";
-        sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==";
-      };
-    };
     "string2compact-1.3.2" = {
       name = "string2compact";
       packageName = "string2compact";
@@ -35504,15 +25329,6 @@ let
         sha512 = "IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==";
       };
     };
-    "stringify-parameters-0.0.4" = {
-      name = "stringify-parameters";
-      packageName = "stringify-parameters";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringify-parameters/-/stringify-parameters-0.0.4.tgz";
-        sha512 = "H3L90ERn5UPtkpO8eugnKcLgpIVlvTyUTrcLGm607AV5JDH6z0GymtNLr3gjGlP6I6NB/mxNX9QpY6jEQGLPdQ==";
-      };
-    };
     "strip-ansi-0.1.1" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -35648,15 +25464,6 @@ let
         sha512 = "aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==";
       };
     };
-    "strip-hex-prefix-1.0.0" = {
-      name = "strip-hex-prefix";
-      packageName = "strip-hex-prefix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz";
-        sha512 = "q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==";
-      };
-    };
     "strip-indent-1.0.1" = {
       name = "strip-indent";
       packageName = "strip-indent";
@@ -35684,15 +25491,6 @@ let
         sha512 = "mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==";
       };
     };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha512 = "AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==";
-      };
-    };
     "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -35756,24 +25554,6 @@ let
         sha512 = "H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==";
       };
     };
-    "style-search-0.1.0" = {
-      name = "style-search";
-      packageName = "style-search";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz";
-        sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==";
-      };
-    };
-    "stylelint-13.13.1" = {
-      name = "stylelint";
-      packageName = "stylelint";
-      version = "13.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz";
-        sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==";
-      };
-    };
     "subarg-1.0.0" = {
       name = "subarg";
       packageName = "subarg";
@@ -35783,42 +25563,6 @@ let
         sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==";
       };
     };
-    "sudo-prompt-9.2.1" = {
-      name = "sudo-prompt";
-      packageName = "sudo-prompt";
-      version = "9.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz";
-        sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==";
-      };
-    };
-    "sugarss-2.0.0" = {
-      name = "sugarss";
-      packageName = "sugarss";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz";
-        sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==";
-      };
-    };
-    "sumchecker-3.0.1" = {
-      name = "sumchecker";
-      packageName = "sumchecker";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz";
-        sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==";
-      };
-    };
-    "superagent-3.8.3" = {
-      name = "superagent";
-      packageName = "superagent";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
-        sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
-      };
-    };
     "superagent-7.1.6" = {
       name = "superagent";
       packageName = "superagent";
@@ -35909,15 +25653,6 @@ let
         sha512 = "71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==";
       };
     };
-    "svg-tags-1.0.0" = {
-      name = "svg-tags";
-      packageName = "svg-tags";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz";
-        sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==";
-      };
-    };
     "svg2img-1.0.0-beta.2" = {
       name = "svg2img";
       packageName = "svg2img";
@@ -35954,15 +25689,6 @@ let
         sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==";
       };
     };
-    "symbol-observable-2.0.3" = {
-      name = "symbol-observable";
-      packageName = "symbol-observable";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz";
-        sha512 = "sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==";
-      };
-    };
     "symbol-observable-4.0.0" = {
       name = "symbol-observable";
       packageName = "symbol-observable";
@@ -35972,15 +25698,6 @@ let
         sha512 = "b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==";
       };
     };
-    "symbol-tree-3.2.4" = {
-      name = "symbol-tree";
-      packageName = "symbol-tree";
-      version = "3.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz";
-        sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
-      };
-    };
     "syntax-error-1.4.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
@@ -35999,24 +25716,6 @@ let
         sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==";
       };
     };
-    "sywac-1.3.0" = {
-      name = "sywac";
-      packageName = "sywac";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sywac/-/sywac-1.3.0.tgz";
-        sha512 = "LDt2stNTp4bVPMgd70Jj9PWrSa4batl+bv+Ea5NLNGT7ufc4oQPtRfQ73wbddNV6RilaPqnEt6y1Wkm5FVTNEg==";
-      };
-    };
-    "table-3.8.3" = {
-      name = "table";
-      packageName = "table";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
-        sha512 = "RZuzIOtzFbprLCE0AXhkI0Xi42ZJLZhCC+qkwuMLf/Vjz3maWpA8gz1qMdbmNoI9cOROT2Am/DxeRyXenrL11g==";
-      };
-    };
     "table-6.9.0" = {
       name = "table";
       packageName = "table";
@@ -36026,15 +25725,6 @@ let
         sha512 = "9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==";
       };
     };
-    "table-layout-0.4.5" = {
-      name = "table-layout";
-      packageName = "table-layout";
-      version = "0.4.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table-layout/-/table-layout-0.4.5.tgz";
-        sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==";
-      };
-    };
     "tailwindcss-4.0.14" = {
       name = "tailwindcss";
       packageName = "tailwindcss";
@@ -36044,15 +25734,6 @@ let
         sha512 = "92YT2dpt671tFiHH/e1ok9D987N9fHD5VWoly1CdPD/Cd1HMglvZwP3nx2yTj2lbXDAHt8QssZkxTLCCTNL+xw==";
       };
     };
-    "tapable-0.2.9" = {
-      name = "tapable";
-      packageName = "tapable";
-      version = "0.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz";
-        sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==";
-      };
-    };
     "tapable-2.2.1" = {
       name = "tapable";
       packageName = "tapable";
@@ -36152,33 +25833,6 @@ let
         sha512 = "+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ==";
       };
     };
-    "tcp-port-used-1.0.2" = {
-      name = "tcp-port-used";
-      packageName = "tcp-port-used";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz";
-        sha512 = "l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==";
-      };
-    };
-    "tdigest-0.1.2" = {
-      name = "tdigest";
-      packageName = "tdigest";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz";
-        sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==";
-      };
-    };
-    "teex-1.0.1" = {
-      name = "teex";
-      packageName = "teex";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz";
-        sha512 = "eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==";
-      };
-    };
     "temp-0.8.4" = {
       name = "temp";
       packageName = "temp";
@@ -36224,24 +25878,6 @@ let
         sha512 = "7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==";
       };
     };
-    "terminal-kit-1.49.4" = {
-      name = "terminal-kit";
-      packageName = "terminal-kit";
-      version = "1.49.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.4.tgz";
-        sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag==";
-      };
-    };
-    "terminal-kit-3.1.1" = {
-      name = "terminal-kit";
-      packageName = "terminal-kit";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.1.1.tgz";
-        sha512 = "R+R47zBQ14Ax2NZCLeuVl2GwonDwQN4iAsjQZICW8gMzaV+VIJMvL4qhUQtzDOhENADyNPQvY1Vz5G0bHHkLEA==";
-      };
-    };
     "terminal-link-3.0.0" = {
       name = "terminal-link";
       packageName = "terminal-link";
@@ -36251,24 +25887,6 @@ let
         sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==";
       };
     };
-    "terser-5.39.0" = {
-      name = "terser";
-      packageName = "terser";
-      version = "5.39.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz";
-        sha512 = "LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==";
-      };
-    };
-    "terser-webpack-plugin-5.3.14" = {
-      name = "terser-webpack-plugin";
-      packageName = "terser-webpack-plugin";
-      version = "5.3.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz";
-        sha512 = "vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==";
-      };
-    };
     "text-decoder-1.2.3" = {
       name = "text-decoder";
       packageName = "text-decoder";
@@ -36422,24 +26040,6 @@ let
         sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g==";
       };
     };
-    "time-stamp-1.1.0" = {
-      name = "time-stamp";
-      packageName = "time-stamp";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz";
-        sha512 = "gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==";
-      };
-    };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha512 = "3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg==";
-      };
-    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -36485,15 +26085,6 @@ let
         sha512 = "KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==";
       };
     };
-    "tkwidgets-0.5.27" = {
-      name = "tkwidgets";
-      packageName = "tkwidgets";
-      version = "0.5.27";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.27.tgz";
-        sha512 = "748OLoNS77xzyVNDst906EhIX/rRVb8IVM5Cb7hkO5nyrnngx70vHtmeWVUy+e3lz3I0CgRzYSUJIt7bDQ6PAQ==";
-      };
-    };
     "tmp-0.0.33" = {
       name = "tmp";
       packageName = "tmp";
@@ -36503,15 +26094,6 @@ let
         sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     };
-    "tmp-0.2.3" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz";
-        sha512 = "nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==";
-      };
-    };
     "to-array-0.1.4" = {
       name = "to-array";
       packageName = "to-array";
@@ -36530,15 +26112,6 @@ let
         sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==";
       };
     };
-    "to-fast-properties-2.0.0" = {
-      name = "to-fast-properties";
-      packageName = "to-fast-properties";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
-        sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==";
-      };
-    };
     "to-object-path-0.3.0" = {
       name = "to-object-path";
       packageName = "to-object-path";
@@ -36584,15 +26157,6 @@ let
         sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
       };
     };
-    "to-through-3.0.0" = {
-      name = "to-through";
-      packageName = "to-through";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz";
-        sha512 = "y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==";
-      };
-    };
     "to-vfile-7.2.4" = {
       name = "to-vfile";
       packageName = "to-vfile";
@@ -36674,24 +26238,6 @@ let
         sha512 = "F+3tYmXnpO2gyhZQ7o8yakELJH3FtKISI/FU0iWvchOWFUXiFnjbEBoumSzfcK1P71Qxzx2az4lVK4Dkq4KSew==";
       };
     };
-    "totalist-3.0.1" = {
-      name = "totalist";
-      packageName = "totalist";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz";
-        sha512 = "sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==";
-      };
-    };
-    "tough-cookie-2.4.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
-      };
-    };
     "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -36701,15 +26247,6 @@ let
         sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
-    "tough-cookie-4.1.4" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "4.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz";
-        sha512 = "Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==";
-      };
-    };
     "tr46-0.0.3" = {
       name = "tr46";
       packageName = "tr46";
@@ -36719,24 +26256,6 @@ let
         sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==";
       };
     };
-    "tr46-2.1.0" = {
-      name = "tr46";
-      packageName = "tr46";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz";
-        sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==";
-      };
-    };
-    "tr46-5.0.0" = {
-      name = "tr46";
-      packageName = "tr46";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz";
-        sha512 = "tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==";
-      };
-    };
     "tree-kill-1.2.2" = {
       name = "tree-kill";
       packageName = "tree-kill";
@@ -36746,24 +26265,6 @@ let
         sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==";
       };
     };
-    "tree-kit-0.7.5" = {
-      name = "tree-kit";
-      packageName = "tree-kit";
-      version = "0.7.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.5.tgz";
-        sha512 = "CmyY7d0OYE5W6UCmvij+SaocG7z+q4roF+Oj7BtU8B+KlpdiRZRMUwNyqfmWYcpYgsOcY1/dfIx/VsLmbAOLGg==";
-      };
-    };
-    "tree-kit-0.8.8" = {
-      name = "tree-kit";
-      packageName = "tree-kit";
-      version = "0.8.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.8.8.tgz";
-        sha512 = "L7zwpXp0/Nha6mljVcVOnhhxuCkFRWmt26wza3TKnyMBewid4F2vyiVdcSsw41ZoG1Wj+3lM48Er9lhttbxfLA==";
-      };
-    };
     "trim-lines-3.0.1" = {
       name = "trim-lines";
       packageName = "trim-lines";
@@ -36818,15 +26319,6 @@ let
         sha512 = "aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==";
       };
     };
-    "trough-1.0.5" = {
-      name = "trough";
-      packageName = "trough";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz";
-        sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==";
-      };
-    };
     "trough-2.2.0" = {
       name = "trough";
       packageName = "trough";
@@ -36944,15 +26436,6 @@ let
         sha512 = "+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==";
       };
     };
-    "tumblr-0.4.1" = {
-      name = "tumblr";
-      packageName = "tumblr";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tumblr/-/tumblr-0.4.1.tgz";
-        sha512 = "MB/C4h4n43kq8SpHtwIL/DlUXJfTWR7lG9AUJVJsLeW38q0mTXHoHtlnAqt27CsLFZC864i9P508pRXW3fjkJA==";
-      };
-    };
     "tunnel-agent-0.4.3" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -36971,15 +26454,6 @@ let
         sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==";
       };
     };
-    "tus-js-client-4.3.1" = {
-      name = "tus-js-client";
-      packageName = "tus-js-client";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.3.1.tgz";
-        sha512 = "ZLeYmjrkaU1fUsKbIi8JML52uAocjEZtBx4DKjRrqzrZa0O4MYwT6db+oqePlspV+FxXJAyFBc/L5gwUi2OFsg==";
-      };
-    };
     "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
@@ -36989,33 +26463,6 @@ let
         sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==";
       };
     };
-    "twitter-1.7.1" = {
-      name = "twitter";
-      packageName = "twitter";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/twitter/-/twitter-1.7.1.tgz";
-        sha512 = "Do7l/WzFnUZC14ABtZfDiOHKl6M9Ft5tE4YF0ev9XLm4yh7m8R98D82rzeDAMjbjMZk2R/tb6sgXXb3sPKoaVw==";
-      };
-    };
-    "type-2.7.3" = {
-      name = "type";
-      packageName = "type";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-2.7.3.tgz";
-        sha512 = "8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==";
-      };
-    };
-    "type-check-0.3.2" = {
-      name = "type-check";
-      packageName = "type-check";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
-        sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==";
-      };
-    };
     "type-check-0.4.0" = {
       name = "type-check";
       packageName = "type-check";
@@ -37124,42 +26571,6 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "typed-array-buffer-1.0.3" = {
-      name = "typed-array-buffer";
-      packageName = "typed-array-buffer";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz";
-        sha512 = "nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==";
-      };
-    };
-    "typed-array-byte-length-1.0.3" = {
-      name = "typed-array-byte-length";
-      packageName = "typed-array-byte-length";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz";
-        sha512 = "BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==";
-      };
-    };
-    "typed-array-byte-offset-1.0.4" = {
-      name = "typed-array-byte-offset";
-      packageName = "typed-array-byte-offset";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz";
-        sha512 = "bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==";
-      };
-    };
-    "typed-array-length-1.0.7" = {
-      name = "typed-array-length";
-      packageName = "typed-array-length";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz";
-        sha512 = "3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==";
-      };
-    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -37241,15 +26652,6 @@ let
         sha512 = "b9eLo5FjlR0BRMsYIxZYCrtTTUu97N1bh+DpQFCEm5OfRGzUg/Oc09fgct4jA4NF7R5Yg9oxWqVT90uto1TsvA==";
       };
     };
-    "typical-2.6.1" = {
-      name = "typical";
-      packageName = "typical";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
-        sha512 = "ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg==";
-      };
-    };
     "ua-parser-js-1.0.40" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
@@ -37286,15 +26688,6 @@ let
         sha512 = "v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==";
       };
     };
-    "uglifycss-0.0.29" = {
-      name = "uglifycss";
-      packageName = "uglifycss";
-      version = "0.0.29";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz";
-        sha512 = "J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ==";
-      };
-    };
     "uid-number-0.0.5" = {
       name = "uid-number";
       packageName = "uid-number";
@@ -37358,15 +26751,6 @@ let
         sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
-    "unbox-primitive-1.1.0" = {
-      name = "unbox-primitive";
-      packageName = "unbox-primitive";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz";
-        sha512 = "nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==";
-      };
-    };
     "unbzip2-stream-1.4.3" = {
       name = "unbzip2-stream";
       packageName = "unbzip2-stream";
@@ -37403,15 +26787,6 @@ let
         sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==";
       };
     };
-    "underscore-1.4.4" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        sha512 = "ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==";
-      };
-    };
     "underscore-1.6.0" = {
       name = "underscore";
       packageName = "underscore";
@@ -37430,33 +26805,6 @@ let
         sha512 = "5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg==";
       };
     };
-    "underscore-db-0.10.0" = {
-      name = "underscore-db";
-      packageName = "underscore-db";
-      version = "0.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore-db/-/underscore-db-0.10.0.tgz";
-        sha512 = "/Arq1q7vh5kzmw4brlCZQw3jxc3KEGHqaNXCYEvMAg5ZK0iVwK9WsejPuC6YjcF2jpm8PTUtaLUjbziS+ku5sA==";
-      };
-    };
-    "undertaker-2.0.0" = {
-      name = "undertaker";
-      packageName = "undertaker";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz";
-        sha512 = "tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==";
-      };
-    };
-    "undertaker-registry-2.0.0" = {
-      name = "undertaker-registry";
-      packageName = "undertaker-registry";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz";
-        sha512 = "+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==";
-      };
-    };
     "undici-5.28.2" = {
       name = "undici";
       packageName = "undici";
@@ -37565,15 +26913,6 @@ let
         sha512 = "xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==";
       };
     };
-    "unified-9.2.2" = {
-      name = "unified";
-      packageName = "unified";
-      version = "9.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz";
-        sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==";
-      };
-    };
     "unified-diff-4.0.1" = {
       name = "unified-diff";
       packageName = "unified-diff";
@@ -37655,24 +26994,6 @@ let
         sha512 = "Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==";
       };
     };
-    "unique-filename-1.1.1" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz";
-        sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==";
-      };
-    };
-    "unique-filename-2.0.1" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz";
-        sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==";
-      };
-    };
     "unique-filename-4.0.0" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -37682,24 +27003,6 @@ let
         sha512 = "XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==";
       };
     };
-    "unique-slug-2.0.2" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz";
-        sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==";
-      };
-    };
-    "unique-slug-3.0.0" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz";
-        sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==";
-      };
-    };
     "unique-slug-5.0.0" = {
       name = "unique-slug";
       packageName = "unique-slug";
@@ -37754,15 +27057,6 @@ let
         sha512 = "T7ZqS7immLjYyC4FCp2hDo3ksZ1v+qcbb+e5+iWxc2jONgHOLXPCpms1L8VV4hVxCXgWTxmBHDztuEZFVwC+Gg==";
       };
     };
-    "unist-util-find-all-after-3.0.2" = {
-      name = "unist-util-find-all-after";
-      packageName = "unist-util-find-all-after";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz";
-        sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==";
-      };
-    };
     "unist-util-find-all-after-5.0.0" = {
       name = "unist-util-find-all-after";
       packageName = "unist-util-find-all-after";
@@ -37916,15 +27210,6 @@ let
         sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ==";
       };
     };
-    "unist-util-stringify-position-2.0.3" = {
-      name = "unist-util-stringify-position";
-      packageName = "unist-util-stringify-position";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz";
-        sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==";
-      };
-    };
     "unist-util-stringify-position-3.0.3" = {
       name = "unist-util-stringify-position";
       packageName = "unist-util-stringify-position";
@@ -38069,15 +27354,6 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
-    "universalify-0.2.0" = {
-      name = "universalify";
-      packageName = "universalify";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz";
-        sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==";
-      };
-    };
     "universalify-2.0.1" = {
       name = "universalify";
       packageName = "universalify";
@@ -38096,33 +27372,6 @@ let
         sha512 = "8rMeVYWSIyccIJscb9NdCfZKSRBKYTeVnwmiRYT2ulE3qd1RaDQ0xQDP+rI3ccIWbhu/zuo5cgN8z73belNZgw==";
       };
     };
-    "unix-dgram-2.0.6" = {
-      name = "unix-dgram";
-      packageName = "unix-dgram";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unix-dgram/-/unix-dgram-2.0.6.tgz";
-        sha512 = "AURroAsb73BZ6CdAyMrTk/hYKNj3DuYYEuOaB8bYMOHGKupRNScw90Q5C71tWJc3uE7dIeXRyuwN0xLLq3vDTg==";
-      };
-    };
-    "unorm-1.6.0" = {
-      name = "unorm";
-      packageName = "unorm";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
-        sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
-      };
-    };
-    "unpack-string-0.0.2" = {
-      name = "unpack-string";
-      packageName = "unpack-string";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unpack-string/-/unpack-string-0.0.2.tgz";
-        sha512 = "2ZFjp5aY7QwHE6HAp47RnKYfvgAQ5+NwbKq/ZVtty85RDb3/UaTeCfizo5L/fXzM7UkMP/zDtbV+kGW/iJiK6w==";
-      };
-    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -38141,24 +27390,6 @@ let
         sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==";
       };
     };
-    "untildify-4.0.0" = {
-      name = "untildify";
-      packageName = "untildify";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz";
-        sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==";
-      };
-    };
-    "unzip-response-1.0.2" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
-        sha512 = "pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==";
-      };
-    };
     "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -38177,15 +27408,6 @@ let
         sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
       };
     };
-    "update-browserslist-db-1.1.3" = {
-      name = "update-browserslist-db";
-      packageName = "update-browserslist-db";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz";
-        sha512 = "UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==";
-      };
-    };
     "update-check-1.5.4" = {
       name = "update-check";
       packageName = "update-check";
@@ -38195,15 +27417,6 @@ let
         sha512 = "5YHsflzHP4t1G+8WGPlvKbJEbAJGCgw+Em+dGR1KmBUbr1J36SJBqlHLjR7oob7sco5hWHGQVcr9B2poIVDDTQ==";
       };
     };
-    "update-notifier-1.0.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
-        sha512 = "iQSLFuxB2ZFAxXGN28DTxk/GNGlBmtqawvguYDtChAHI9Xjy0z7c7hpw6ywutK34SEDYTpLEsAM1ATMq5pcQsw==";
-      };
-    };
     "update-notifier-5.1.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
@@ -38231,15 +27444,6 @@ let
         sha512 = "+dwUY4L35XFYEzE+OAL3sarJdUioVovq+8f7lcIJ7wnmnYQV5UD1Y/lcwaMSyaQ6Bj3JMj1XSTjZbNLHn/19yA==";
       };
     };
-    "upper-case-1.1.3" = {
-      name = "upper-case";
-      packageName = "upper-case";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz";
-        sha512 = "WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==";
-      };
-    };
     "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
@@ -38285,15 +27489,6 @@ let
         sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==";
       };
     };
-    "url-join-5.0.0" = {
-      name = "url-join";
-      packageName = "url-join";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz";
-        sha512 = "n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==";
-      };
-    };
     "url-parse-1.5.10" = {
       name = "url-parse";
       packageName = "url-parse";
@@ -38330,15 +27525,6 @@ let
         sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==";
       };
     };
-    "url-value-parser-2.2.0" = {
-      name = "url-value-parser";
-      packageName = "url-value-parser";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.2.0.tgz";
-        sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==";
-      };
-    };
     "urlpattern-polyfill-10.0.0" = {
       name = "urlpattern-polyfill";
       packageName = "urlpattern-polyfill";
@@ -38357,24 +27543,6 @@ let
         sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
       };
     };
-    "user-home-2.0.0" = {
-      name = "user-home";
-      packageName = "user-home";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz";
-        sha512 = "KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==";
-      };
-    };
-    "username-5.1.0" = {
-      name = "username";
-      packageName = "username";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/username/-/username-5.1.0.tgz";
-        sha512 = "PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg==";
-      };
-    };
     "utf-8-validate-5.0.10" = {
       name = "utf-8-validate";
       packageName = "utf-8-validate";
@@ -38402,15 +27570,6 @@ let
         sha512 = "qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==";
       };
     };
-    "utf8-3.0.0" = {
-      name = "utf8";
-      packageName = "utf8";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz";
-        sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==";
-      };
-    };
     "utif-2.0.1" = {
       name = "utif";
       packageName = "utif";
@@ -38447,15 +27606,6 @@ let
         sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
       };
     };
-    "utila-0.4.0" = {
-      name = "utila";
-      packageName = "utila";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz";
-        sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==";
-      };
-    };
     "utile-0.2.1" = {
       name = "utile";
       packageName = "utile";
@@ -38501,15 +27651,6 @@ let
         sha512 = "8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==";
       };
     };
-    "uuid-2.0.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
-        sha512 = "FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==";
-      };
-    };
     "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -38564,15 +27705,6 @@ let
         sha512 = "+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==";
       };
     };
-    "v8-compile-cache-2.4.0" = {
-      name = "v8-compile-cache";
-      packageName = "v8-compile-cache";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz";
-        sha512 = "ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==";
-      };
-    };
     "v8-compile-cache-lib-3.0.1" = {
       name = "v8-compile-cache-lib";
       packageName = "v8-compile-cache-lib";
@@ -38582,15 +27714,6 @@ let
         sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==";
       };
     };
-    "v8flags-3.2.0" = {
-      name = "v8flags";
-      packageName = "v8flags";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz";
-        sha512 = "mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==";
-      };
-    };
     "v8flags-4.0.1" = {
       name = "v8flags";
       packageName = "v8flags";
@@ -38600,15 +27723,6 @@ let
         sha512 = "fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==";
       };
     };
-    "valid-url-1.0.9" = {
-      name = "valid-url";
-      packageName = "valid-url";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz";
-        sha512 = "QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==";
-      };
-    };
     "validate-glob-opts-1.0.2" = {
       name = "validate-glob-opts";
       packageName = "validate-glob-opts";
@@ -38654,33 +27768,6 @@ let
         sha512 = "d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==";
       };
     };
-    "validator-13.12.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "13.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz";
-        sha512 = "c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==";
-      };
-    };
-    "value-or-function-4.0.0" = {
-      name = "value-or-function";
-      packageName = "value-or-function";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz";
-        sha512 = "aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==";
-      };
-    };
-    "variable-diff-1.1.0" = {
-      name = "variable-diff";
-      packageName = "variable-diff";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/variable-diff/-/variable-diff-1.1.0.tgz";
-        sha512 = "0Jk/MsCNtL/fCuVIbsLxwXpABGZCzN57btcPbSsjOOAwkdHJ3Y58fo8BoUfG7jghnvglbwo+5Hk1KOJ2W2Ormw==";
-      };
-    };
     "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
@@ -38771,15 +27858,6 @@ let
         sha512 = "K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A==";
       };
     };
-    "vega-expression-5.1.2" = {
-      name = "vega-expression";
-      packageName = "vega-expression";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.1.2.tgz";
-        sha512 = "fFeDTh4UtOxlZWL54jf1ZqJHinyerWq/ROiqrQxqLkNJRJ86RmxYTgXwt65UoZ/l4VUv9eAd2qoJeDEf610Umw==";
-      };
-    };
     "vega-expression-5.2.0" = {
       name = "vega-expression";
       packageName = "vega-expression";
@@ -39041,15 +28119,6 @@ let
         sha512 = "bIOaZx4+Bf6a7sIORfmYnyKLDLk/lhVym6rjYlq+vkitYKnhFmUpmPpDTCltWFrUTlGKs6sCeoDWfMA0oOOneA==";
       };
     };
-    "vfile-4.2.1" = {
-      name = "vfile";
-      packageName = "vfile";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz";
-        sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==";
-      };
-    };
     "vfile-5.3.7" = {
       name = "vfile";
       packageName = "vfile";
@@ -39095,15 +28164,6 @@ let
         sha512 = "5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==";
       };
     };
-    "vfile-message-2.0.4" = {
-      name = "vfile-message";
-      packageName = "vfile-message";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz";
-        sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==";
-      };
-    };
     "vfile-message-3.1.4" = {
       name = "vfile-message";
       packageName = "vfile-message";
@@ -39176,51 +28236,6 @@ let
         sha512 = "BOMkqUnIghW/SZEVOUKC3p5lUZ8QzavLksEEMKR9Yr7jBuu0noiQVfyB7csOStFVFgpWzx+ApcZjkyFHQkJjmQ==";
       };
     };
-    "vinyl-0.5.3" = {
-      name = "vinyl";
-      packageName = "vinyl";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz";
-        sha512 = "P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==";
-      };
-    };
-    "vinyl-3.0.0" = {
-      name = "vinyl";
-      packageName = "vinyl";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz";
-        sha512 = "rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==";
-      };
-    };
-    "vinyl-contents-2.0.0" = {
-      name = "vinyl-contents";
-      packageName = "vinyl-contents";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz";
-        sha512 = "cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==";
-      };
-    };
-    "vinyl-fs-4.0.0" = {
-      name = "vinyl-fs";
-      packageName = "vinyl-fs";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz";
-        sha512 = "7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==";
-      };
-    };
-    "vinyl-sourcemap-2.0.0" = {
-      name = "vinyl-sourcemap";
-      packageName = "vinyl-sourcemap";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz";
-        sha512 = "BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==";
-      };
-    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
@@ -39230,15 +28245,6 @@ let
         sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
-    "vscode-emmet-helper-1.2.17" = {
-      name = "vscode-emmet-helper";
-      packageName = "vscode-emmet-helper";
-      version = "1.2.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.2.17.tgz";
-        sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
-      };
-    };
     "vscode-json-languageservice-4.2.1" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
@@ -39248,15 +28254,6 @@ let
         sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==";
       };
     };
-    "vscode-jsonrpc-5.1.0-next.1" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "5.1.0-next.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz";
-        sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA==";
-      };
-    };
     "vscode-jsonrpc-6.0.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -39275,15 +28272,6 @@ let
         sha512 = "6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==";
       };
     };
-    "vscode-jsonrpc-8.2.0" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "8.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz";
-        sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==";
-      };
-    };
     "vscode-jsonrpc-8.2.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -39293,15 +28281,6 @@ let
         sha512 = "kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==";
       };
     };
-    "vscode-languageserver-6.2.0-next.2" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "6.2.0-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.2.0-next.2.tgz";
-        sha512 = "UCXULa/RmT2zxcb6auNezl9ZIPwYHS15+a0XzybrpT2+xA0RbHEYQCsIQkTRYjGv8cm3yS9iPJMmxLilP+y1Xw==";
-      };
-    };
     "vscode-languageserver-7.0.0" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
@@ -39329,15 +28308,6 @@ let
         sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==";
       };
     };
-    "vscode-languageserver-protocol-3.16.0-next.2" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.16.0-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz";
-        sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA==";
-      };
-    };
     "vscode-languageserver-protocol-3.17.3" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -39347,15 +28317,6 @@ let
         sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==";
       };
     };
-    "vscode-languageserver-protocol-3.17.5" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.17.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz";
-        sha512 = "mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==";
-      };
-    };
     "vscode-languageserver-textdocument-1.0.11" = {
       name = "vscode-languageserver-textdocument";
       packageName = "vscode-languageserver-textdocument";
@@ -39383,15 +28344,6 @@ let
         sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==";
       };
     };
-    "vscode-languageserver-types-3.16.0-next.1" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.16.0-next.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz";
-        sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg==";
-      };
-    };
     "vscode-languageserver-types-3.17.0-next.3" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -39410,15 +28362,6 @@ let
         sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==";
       };
     };
-    "vscode-languageserver-types-3.17.5" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.17.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz";
-        sha512 = "Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==";
-      };
-    };
     "vscode-nls-4.1.2" = {
       name = "vscode-nls";
       packageName = "vscode-nls";
@@ -39455,33 +28398,6 @@ let
         sha512 = "/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==";
       };
     };
-    "w3c-hr-time-1.0.2" = {
-      name = "w3c-hr-time";
-      packageName = "w3c-hr-time";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
-        sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==";
-      };
-    };
-    "w3c-xmlserializer-2.0.0" = {
-      name = "w3c-xmlserializer";
-      packageName = "w3c-xmlserializer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz";
-        sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==";
-      };
-    };
-    "w3c-xmlserializer-5.0.0" = {
-      name = "w3c-xmlserializer";
-      packageName = "w3c-xmlserializer";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz";
-        sha512 = "o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==";
-      };
-    };
     "walk-2.3.15" = {
       name = "walk";
       packageName = "walk";
@@ -39500,15 +28416,6 @@ let
         sha512 = "9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==";
       };
     };
-    "watchpack-2.4.2" = {
-      name = "watchpack";
-      packageName = "watchpack";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz";
-        sha512 = "TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==";
-      };
-    };
     "wavedrom-3.5.0" = {
       name = "wavedrom";
       packageName = "wavedrom";
@@ -39527,15 +28434,6 @@ let
         sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==";
       };
     };
-    "weak-lru-cache-1.2.2" = {
-      name = "weak-lru-cache";
-      packageName = "weak-lru-cache";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz";
-        sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==";
-      };
-    };
     "web-namespaces-2.0.1" = {
       name = "web-namespaces";
       packageName = "web-namespaces";
@@ -39563,42 +28461,6 @@ let
         sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg==";
       };
     };
-    "web3-utils-1.10.4" = {
-      name = "web3-utils";
-      packageName = "web3-utils";
-      version = "1.10.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz";
-        sha512 = "tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A==";
-      };
-    };
-    "webassemblyjs-1.11.1" = {
-      name = "webassemblyjs";
-      packageName = "webassemblyjs";
-      version = "1.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webassemblyjs/-/webassemblyjs-1.11.1.tgz";
-        sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg==";
-      };
-    };
-    "webcrypto-core-1.8.1" = {
-      name = "webcrypto-core";
-      packageName = "webcrypto-core";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.8.1.tgz";
-        sha512 = "P+x1MvlNCXlKbLSOY4cYrdreqPG5hbzkmawbcXLKN/mf6DZW0SdNNkZ+sjwsqVkI4A4Ko2sPZmkZtCKY58w83A==";
-      };
-    };
-    "webdav-5.7.1" = {
-      name = "webdav";
-      packageName = "webdav";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webdav/-/webdav-5.7.1.tgz";
-        sha512 = "JVPn3nLxXJfHSRvennHsOrDYjFLkilZ1Qlw8Ff6hpqp6AvkgF7a//aOh5wA4rMp+sLZ1Km0V+iv0LyO1FIwtXg==";
-      };
-    };
     "webidl-conversions-3.0.1" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -39608,51 +28470,6 @@ let
         sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==";
       };
     };
-    "webidl-conversions-5.0.0" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz";
-        sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==";
-      };
-    };
-    "webidl-conversions-6.1.0" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz";
-        sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==";
-      };
-    };
-    "webidl-conversions-7.0.0" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz";
-        sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==";
-      };
-    };
-    "webpack-5.98.0" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "5.98.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz";
-        sha512 = "UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==";
-      };
-    };
-    "webpack-sources-3.2.3" = {
-      name = "webpack-sources";
-      packageName = "webpack-sources";
-      version = "3.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz";
-        sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==";
-      };
-    };
     "websocket-driver-0.7.4" = {
       name = "websocket-driver";
       packageName = "websocket-driver";
@@ -39671,51 +28488,6 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "whatwg-encoding-1.0.5" = {
-      name = "whatwg-encoding";
-      packageName = "whatwg-encoding";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
-        sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
-      };
-    };
-    "whatwg-encoding-3.1.1" = {
-      name = "whatwg-encoding";
-      packageName = "whatwg-encoding";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz";
-        sha512 = "6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==";
-      };
-    };
-    "whatwg-mimetype-2.3.0" = {
-      name = "whatwg-mimetype";
-      packageName = "whatwg-mimetype";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
-        sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
-      };
-    };
-    "whatwg-mimetype-4.0.0" = {
-      name = "whatwg-mimetype";
-      packageName = "whatwg-mimetype";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz";
-        sha512 = "QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==";
-      };
-    };
-    "whatwg-url-14.1.1" = {
-      name = "whatwg-url";
-      packageName = "whatwg-url";
-      version = "14.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz";
-        sha512 = "mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==";
-      };
-    };
     "whatwg-url-5.0.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
@@ -39725,15 +28497,6 @@ let
         sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==";
       };
     };
-    "whatwg-url-8.7.0" = {
-      name = "whatwg-url";
-      packageName = "whatwg-url";
-      version = "8.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz";
-        sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==";
-      };
-    };
     "when-exit-2.1.4" = {
       name = "when-exit";
       packageName = "when-exit";
@@ -39788,15 +28551,6 @@ let
         sha512 = "TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==";
       };
     };
-    "which-builtin-type-1.2.1" = {
-      name = "which-builtin-type";
-      packageName = "which-builtin-type";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz";
-        sha512 = "6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==";
-      };
-    };
     "which-collection-1.0.2" = {
       name = "which-collection";
       packageName = "which-collection";
@@ -39806,15 +28560,6 @@ let
         sha512 = "K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==";
       };
     };
-    "which-module-1.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha512 = "F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==";
-      };
-    };
     "which-module-2.0.1" = {
       name = "which-module";
       packageName = "which-module";
@@ -39851,15 +28596,6 @@ let
         sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha512 = "r5vvGtqsHUHn98V0jURY4Ts86xJf6+SzK9rpWdV8/73nURB3WFPIHd67aOvPw2fSuunIyHjAUqiJ2TY0x4E5gw==";
-      };
-    };
     "widest-line-3.1.0" = {
       name = "widest-line";
       packageName = "widest-line";
@@ -39887,42 +28623,6 @@ let
         sha512 = "c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==";
       };
     };
-    "wikimedia-kad-fork-1.3.6" = {
-      name = "wikimedia-kad-fork";
-      packageName = "wikimedia-kad-fork";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wikimedia-kad-fork/-/wikimedia-kad-fork-1.3.6.tgz";
-        sha512 = "m+IxFN4JatoQPRo0N46xMh7tR6FSznb/ithIchAy7Wg9mrkc4/bE/3BhlJS410quFJFrJp8lJJp93g4uTbj4lA==";
-      };
-    };
-    "wikimedia-langconv-0.1.0" = {
-      name = "wikimedia-langconv";
-      packageName = "wikimedia-langconv";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wikimedia-langconv/-/wikimedia-langconv-0.1.0.tgz";
-        sha512 = "nSiLDIIMAmnulDIRcophSU4oOLW1AGnQKNim+SI5MtzE5gwlD+VJNTkBbSYq8Nov8WjD9jWobaKxo+5yeiC1vA==";
-      };
-    };
-    "wikipeg-2.0.6" = {
-      name = "wikipeg";
-      packageName = "wikipeg";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wikipeg/-/wikipeg-2.0.6.tgz";
-        sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg==";
-      };
-    };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha512 = "UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw==";
-      };
-    };
     "winreg-1.2.4" = {
       name = "winreg";
       packageName = "winreg";
@@ -39932,15 +28632,6 @@ let
         sha512 = "IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA==";
       };
     };
-    "winston-0.6.2" = {
-      name = "winston";
-      packageName = "winston";
-      version = "0.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-0.6.2.tgz";
-        sha512 = "BzHNq8X415XGFkGPT+ACKTj95ghSAbR4eThAtKg4OC4PYVn5FLIdTETYUv76f4QxUcG1ps6yqnbO1K/81hGIzQ==";
-      };
-    };
     "winston-0.8.0" = {
       name = "winston";
       packageName = "winston";
@@ -40013,24 +28704,6 @@ let
         sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==";
       };
     };
-    "wordwrapjs-3.0.0" = {
-      name = "wordwrapjs";
-      packageName = "wordwrapjs";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz";
-        sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==";
-      };
-    };
-    "worker-farm-1.7.0" = {
-      name = "worker-farm";
-      packageName = "worker-farm";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz";
-        sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
-      };
-    };
     "workerpool-6.5.1" = {
       name = "workerpool";
       packageName = "workerpool";
@@ -40040,15 +28713,6 @@ let
         sha512 = "Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==";
       };
     };
-    "wrap-ansi-2.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==";
-      };
-    };
     "wrap-ansi-3.0.1" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -40058,15 +28722,6 @@ let
         sha512 = "iXR3tDXpbnTpzjKSylUJRkLuOrEC7hwEB221cgn6wtF8wpmz28puFXAEfPT5zrjM3wahygB//VuWEr1vTkDcNQ==";
       };
     };
-    "wrap-ansi-5.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz";
-        sha512 = "QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==";
-      };
-    };
     "wrap-ansi-6.2.0" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -40130,24 +28785,6 @@ let
         sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
       };
     };
-    "write-0.2.1" = {
-      name = "write";
-      packageName = "write";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz";
-        sha512 = "CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==";
-      };
-    };
-    "write-file-atomic-1.3.4" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz";
-        sha512 = "SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw==";
-      };
-    };
     "write-file-atomic-2.4.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -40220,15 +28857,6 @@ let
         sha512 = "RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==";
       };
     };
-    "xcase-2.0.1" = {
-      name = "xcase";
-      packageName = "xcase";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz";
-        sha512 = "UmFXIPU+9Eg3E9m/728Bii0lAIuoc+6nbrNUKaRPJOFp91ih44qqGlWtxMB6kXFrRD6po+86ksHM5XHCfk6iPw==";
-      };
-    };
     "xdg-app-paths-5.1.0" = {
       name = "xdg-app-paths";
       packageName = "xdg-app-paths";
@@ -40238,15 +28866,6 @@ let
         sha512 = "RAQ3WkPf4KTU1A8RtFx3gWywzVKe00tfOPFfl2NDGqbIFENQO4kqAJp7mhQjNj/33W5x5hiWWUdyfPq/5SU3QA==";
       };
     };
-    "xdg-basedir-2.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
-        sha512 = "NF1pPn594TaRSUO/HARoB4jK8I+rWgcpVlpQCK6/6o5PHyLUt2CSiDrpUZbQ6rROck+W2EwF8mBJcTs+W98J9w==";
-      };
-    };
     "xdg-basedir-3.0.0" = {
       name = "xdg-basedir";
       packageName = "xdg-basedir";
@@ -40310,24 +28929,6 @@ let
         sha512 = "7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==";
       };
     };
-    "xml-name-validator-3.0.0" = {
-      name = "xml-name-validator";
-      packageName = "xml-name-validator";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
-        sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
-      };
-    };
-    "xml-name-validator-5.0.0" = {
-      name = "xml-name-validator";
-      packageName = "xml-name-validator";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz";
-        sha512 = "EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==";
-      };
-    };
     "xml-parse-from-string-1.0.1" = {
       name = "xml-parse-from-string";
       packageName = "xml-parse-from-string";
@@ -40337,24 +28938,6 @@ let
         sha512 = "ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==";
       };
     };
-    "xml2js-0.4.19" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.4.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz";
-        sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==";
-      };
-    };
-    "xml2js-0.4.23" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.4.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz";
-        sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==";
-      };
-    };
     "xml2js-0.5.0" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -40391,24 +28974,6 @@ let
         sha512 = "wrG9gc6hCFDd5STt+6fsjP2aGSkjkNSewH+1K6s0KVOd94vXAUyTwlxWVnMFVtLdMf+q0QRZN1z9hTOKgoEdMg==";
       };
     };
-    "xmlbuilder-9.0.7" = {
-      name = "xmlbuilder";
-      packageName = "xmlbuilder";
-      version = "9.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
-        sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==";
-      };
-    };
-    "xmlchars-2.2.0" = {
-      name = "xmlchars";
-      packageName = "xmlchars";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz";
-        sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==";
-      };
-    };
     "xmlcreate-2.0.4" = {
       name = "xmlcreate";
       packageName = "xmlcreate";
@@ -40454,15 +29019,6 @@ let
         sha512 = "SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw==";
       };
     };
-    "xstream-11.14.0" = {
-      name = "xstream";
-      packageName = "xstream";
-      version = "11.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz";
-        sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==";
-      };
-    };
     "xtend-2.1.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -40481,15 +29037,6 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-3.2.2" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz";
-        sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==";
-      };
-    };
     "y18n-4.0.3" = {
       name = "y18n";
       packageName = "y18n";
@@ -40508,24 +29055,6 @@ let
         sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==";
       };
     };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==";
-      };
-    };
-    "yallist-3.1.1" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
-      };
-    };
     "yallist-4.0.0" = {
       name = "yallist";
       packageName = "yallist";
@@ -40571,24 +29100,6 @@ let
         sha512 = "+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==";
       };
     };
-    "yargs-13.3.2" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "13.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz";
-        sha512 = "AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==";
-      };
-    };
-    "yargs-14.2.3" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "14.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz";
-        sha512 = "ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==";
-      };
-    };
     "yargs-15.4.1" = {
       name = "yargs";
       packageName = "yargs";
@@ -40625,33 +29136,6 @@ let
         sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==";
       };
     };
-    "yargs-4.8.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "4.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
-        sha512 = "LqodLrnIDM3IFT+Hf/5sxBnEGECrfdC1uIbgZeJmESCSo4HoCAaKEus8MylXHAkdacGc0ye+Qa+dpkuom8uVYA==";
-      };
-    };
-    "yargs-parser-13.1.2" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "13.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz";
-        sha512 = "3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==";
-      };
-    };
-    "yargs-parser-15.0.3" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "15.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.3.tgz";
-        sha512 = "/MVEVjTXy/cGAjdtQf8dW3V9b97bPN7rNn8ETj6BmAQL7ibC7O1Q9SPJbGjgh3SlwoBNXMzj/ZGIj8mBgl12YA==";
-      };
-    };
     "yargs-parser-18.1.3" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -40661,15 +29145,6 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha512 = "9pIKIJhnI5tonzG6OnCFlz/yln8xHYcGl+pn3xR0Vzff0vzN1PbNRaelgfgRUwZ3s4i3jvxT9WhmUGL4whnasA==";
-      };
-    };
     "yargs-parser-20.2.9" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -40688,24 +29163,6 @@ let
         sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
       };
     };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha512 = "WhzC+xgstid9MbVUktco/bf+KJG+Uu6vMX0LN1sLJvwmbCQVxb4D8LzogobonKycNasCZLdOzTAk1SK7+K7swg==";
-      };
-    };
-    "yargs-unparser-2.0.0" = {
-      name = "yargs-unparser";
-      packageName = "yargs-unparser";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz";
-        sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
-      };
-    };
     "yauzl-2.10.0" = {
       name = "yauzl";
       packageName = "yauzl";
@@ -40796,24 +29253,6 @@ let
         sha512 = "0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ==";
       };
     };
-    "yoga-layout-prebuilt-1.10.0" = {
-      name = "yoga-layout-prebuilt";
-      packageName = "yoga-layout-prebuilt";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.10.0.tgz";
-        sha512 = "YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==";
-      };
-    };
-    "yurnalist-2.1.0" = {
-      name = "yurnalist";
-      packageName = "yurnalist";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yurnalist/-/yurnalist-2.1.0.tgz";
-        sha512 = "PgrBqosQLM3gN2xBFIMDLACRTV9c365VqityKKpSTWpwR+U4LAFR3rSVyEoscWlu3EzX9+Y0I86GXUKxpHFl6w==";
-      };
-    };
     "zeromq-5.3.1" = {
       name = "zeromq";
       packageName = "zeromq";
@@ -40859,15 +29298,6 @@ let
         sha512 = "XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==";
       };
     };
-    "zwitch-1.0.5" = {
-      name = "zwitch";
-      packageName = "zwitch";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz";
-        sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==";
-      };
-    };
     "zwitch-2.0.4" = {
       name = "zwitch";
       packageName = "zwitch";
@@ -41342,95 +29772,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@babel/cli" = nodeEnv.buildNodePackage {
-    name = "_at_babel_slash_cli";
-    packageName = "@babel/cli";
-    version = "7.26.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@babel/cli/-/cli-7.26.4.tgz";
-      sha512 = "+mORf3ezU3p3qr+82WvJSnQNE1GAYeoCfEv4fik6B5/2cvKZ75AX8oawWQdXtM9MmndooQj15Jr9kelRFWsuRw==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."browserslist-4.24.4"
-      sources."caniuse-lite-1.0.30001704"
-      sources."commander-6.2.1"
-      sources."concat-map-0.0.1"
-      sources."convert-source-map-2.0.0"
-      sources."debug-4.4.0"
-      sources."electron-to-chromium-1.5.118"
-      sources."escalade-3.2.0"
-      sources."fs-readdir-recursive-1.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."gensync-1.0.0-beta.2"
-      sources."glob-7.2.3"
-      sources."globals-11.12.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."json5-2.2.3"
-      sources."lru-cache-5.1.1"
-      sources."make-dir-2.1.0"
-      sources."minimatch-3.1.2"
-      sources."ms-2.1.3"
-      sources."node-releases-2.0.19"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."picocolors-1.1.1"
-      sources."pify-4.0.1"
-      sources."semver-5.7.2"
-      sources."slash-2.0.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."wrappy-1.0.2"
-      sources."yallist-3.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Babel command line";
-      homepage = "https://babel.dev/docs/en/next/babel-cli";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@commitlint/cli" = nodeEnv.buildNodePackage {
     name = "_at_commitlint_slash_cli";
     packageName = "@commitlint/cli";
@@ -42602,818 +30943,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@uppy/companion" = nodeEnv.buildNodePackage {
-    name = "_at_uppy_slash_companion";
-    packageName = "@uppy/companion";
-    version = "5.5.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.5.2.tgz";
-      sha512 = "5izGN8U64tdXMdZewoDn+12vtKddzp9X1F7q6yi3vFoWcSO4oTsCQYmpKrU8A1V/5iAsn3g+NALwA9SUpzb7Aw==";
-    };
-    dependencies = [
-      sources."@aws-crypto/crc32-5.2.0"
-      sources."@aws-crypto/crc32c-5.2.0"
-      (
-        sources."@aws-crypto/sha1-browser-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-browser-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      sources."@aws-crypto/sha256-js-5.2.0"
-      sources."@aws-crypto/supports-web-crypto-5.2.0"
-      (
-        sources."@aws-crypto/util-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/client-s3-3.758.0"
-      sources."@aws-sdk/client-sso-3.758.0"
-      sources."@aws-sdk/client-sts-3.758.0"
-      sources."@aws-sdk/core-3.758.0"
-      sources."@aws-sdk/credential-provider-env-3.758.0"
-      sources."@aws-sdk/credential-provider-http-3.758.0"
-      sources."@aws-sdk/credential-provider-ini-3.758.0"
-      sources."@aws-sdk/credential-provider-node-3.758.0"
-      sources."@aws-sdk/credential-provider-process-3.758.0"
-      sources."@aws-sdk/credential-provider-sso-3.758.0"
-      sources."@aws-sdk/credential-provider-web-identity-3.758.0"
-      (
-        sources."@aws-sdk/lib-storage-3.758.0"
-        // {
-          dependencies = [
-            sources."buffer-5.6.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-bucket-endpoint-3.734.0"
-      sources."@aws-sdk/middleware-expect-continue-3.734.0"
-      (
-        sources."@aws-sdk/middleware-flexible-checksums-3.758.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-host-header-3.734.0"
-      sources."@aws-sdk/middleware-location-constraint-3.734.0"
-      sources."@aws-sdk/middleware-logger-3.734.0"
-      sources."@aws-sdk/middleware-recursion-detection-3.734.0"
-      sources."@aws-sdk/middleware-sdk-s3-3.758.0"
-      sources."@aws-sdk/middleware-ssec-3.734.0"
-      sources."@aws-sdk/middleware-user-agent-3.758.0"
-      sources."@aws-sdk/nested-clients-3.758.0"
-      sources."@aws-sdk/region-config-resolver-3.734.0"
-      sources."@aws-sdk/s3-presigned-post-3.758.0"
-      sources."@aws-sdk/s3-request-presigner-3.758.0"
-      sources."@aws-sdk/signature-v4-multi-region-3.758.0"
-      sources."@aws-sdk/token-providers-3.758.0"
-      sources."@aws-sdk/types-3.734.0"
-      sources."@aws-sdk/util-arn-parser-3.723.0"
-      sources."@aws-sdk/util-endpoints-3.743.0"
-      sources."@aws-sdk/util-format-url-3.734.0"
-      sources."@aws-sdk/util-locate-window-3.723.0"
-      sources."@aws-sdk/util-user-agent-browser-3.734.0"
-      sources."@aws-sdk/util-user-agent-node-3.758.0"
-      sources."@aws-sdk/util-utf8-browser-3.259.0"
-      sources."@aws-sdk/xml-builder-3.734.0"
-      sources."@buttercup/fetch-0.2.1"
-      sources."@httptoolkit/websocket-stream-6.0.1"
-      sources."@ioredis/commands-1.2.0"
-      sources."@opentelemetry/api-1.9.0"
-      sources."@sindresorhus/is-5.6.0"
-      sources."@smithy/abort-controller-4.0.1"
-      sources."@smithy/chunked-blob-reader-5.0.0"
-      sources."@smithy/chunked-blob-reader-native-4.0.0"
-      sources."@smithy/config-resolver-4.0.1"
-      sources."@smithy/core-3.1.5"
-      sources."@smithy/credential-provider-imds-4.0.1"
-      sources."@smithy/eventstream-codec-4.0.1"
-      sources."@smithy/eventstream-serde-browser-4.0.1"
-      sources."@smithy/eventstream-serde-config-resolver-4.0.1"
-      sources."@smithy/eventstream-serde-node-4.0.1"
-      sources."@smithy/eventstream-serde-universal-4.0.1"
-      sources."@smithy/fetch-http-handler-5.0.1"
-      sources."@smithy/hash-blob-browser-4.0.1"
-      (
-        sources."@smithy/hash-node-4.0.1"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/hash-stream-node-4.0.1"
-      sources."@smithy/invalid-dependency-4.0.1"
-      sources."@smithy/is-array-buffer-2.2.0"
-      sources."@smithy/md5-js-4.0.1"
-      sources."@smithy/middleware-content-length-4.0.1"
-      sources."@smithy/middleware-endpoint-4.0.6"
-      sources."@smithy/middleware-retry-4.0.7"
-      sources."@smithy/middleware-serde-4.0.2"
-      sources."@smithy/middleware-stack-4.0.1"
-      sources."@smithy/node-config-provider-4.0.1"
-      sources."@smithy/node-http-handler-4.0.3"
-      sources."@smithy/property-provider-4.0.1"
-      sources."@smithy/protocol-http-5.0.1"
-      sources."@smithy/querystring-builder-4.0.1"
-      sources."@smithy/querystring-parser-4.0.1"
-      sources."@smithy/service-error-classification-4.0.1"
-      sources."@smithy/shared-ini-file-loader-4.0.1"
-      (
-        sources."@smithy/signature-v4-5.0.1"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/smithy-client-4.1.6"
-      sources."@smithy/types-4.1.0"
-      sources."@smithy/url-parser-4.0.1"
-      (
-        sources."@smithy/util-base64-4.0.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-body-length-browser-4.0.0"
-      sources."@smithy/util-body-length-node-4.0.0"
-      sources."@smithy/util-buffer-from-2.2.0"
-      sources."@smithy/util-config-provider-4.0.0"
-      sources."@smithy/util-defaults-mode-browser-4.0.7"
-      sources."@smithy/util-defaults-mode-node-4.0.7"
-      sources."@smithy/util-endpoints-3.0.1"
-      sources."@smithy/util-hex-encoding-4.0.0"
-      sources."@smithy/util-middleware-4.0.1"
-      sources."@smithy/util-retry-4.0.1"
-      (
-        sources."@smithy/util-stream-4.1.2"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-uri-escape-4.0.0"
-      (
-        sources."@smithy/util-utf8-4.0.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-waiter-4.0.2"
-      sources."@szmarczak/http-timer-5.0.1"
-      sources."@types/body-parser-1.19.5"
-      sources."@types/connect-3.4.38"
-      sources."@types/express-4.17.21"
-      sources."@types/express-serve-static-core-4.19.6"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/http-errors-2.0.4"
-      sources."@types/mime-1.3.5"
-      sources."@types/node-22.13.10"
-      sources."@types/qs-6.9.18"
-      sources."@types/range-parser-1.2.7"
-      sources."@types/send-0.17.4"
-      sources."@types/serve-static-1.15.7"
-      sources."@types/ws-8.18.0"
-      sources."accepts-1.3.8"
-      sources."array-flatten-1.1.1"
-      sources."asynckit-0.4.0"
-      sources."aws-crt-1.26.2"
-      sources."axios-1.8.3"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      (
-        sources."basic-auth-2.0.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."bintrees-1.0.2"
-      (
-        sources."bl-4.1.0"
-        // {
-          dependencies = [
-            sources."buffer-5.7.1"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."bowser-2.11.0"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-6.0.3"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."byte-length-1.0.2"
-      sources."bytes-3.1.2"
-      sources."cacheable-lookup-7.0.0"
-      sources."cacheable-request-10.2.14"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."charenc-0.0.2"
-      sources."cluster-key-slot-1.1.2"
-      sources."combine-errors-3.0.3"
-      sources."combined-stream-1.0.8"
-      sources."commist-1.1.0"
-      sources."common-tags-1.8.2"
-      sources."concat-map-0.0.1"
-      (
-        sources."concat-stream-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."connect-redis-7.1.1"
-      sources."content-disposition-0.5.4"
-      sources."content-type-1.0.5"
-      sources."cookie-0.4.1"
-      sources."cookie-parser-1.4.6"
-      sources."cookie-signature-1.0.6"
-      sources."core-util-is-1.0.3"
-      sources."cors-2.8.5"
-      sources."cron-parser-4.9.0"
-      sources."crypt-0.0.2"
-      sources."crypto-js-4.2.0"
-      sources."custom-error-instance-2.1.1"
-      sources."data-uri-to-buffer-4.0.1"
-      sources."debug-4.4.0"
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defer-to-connect-2.0.1"
-      sources."delayed-stream-1.0.0"
-      sources."denque-2.1.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexify-3.7.1"
-      sources."ecdsa-sig-formatter-1.0.11"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-2.0.0"
-      sources."end-of-stream-1.4.4"
-      sources."entities-5.0.0"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."escape-goat-3.0.0"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-4.0.0"
-      sources."etag-1.8.1"
-      sources."events-3.3.0"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."cookie-0.7.1"
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      (
-        sources."express-interceptor-1.2.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."express-prom-bundle-7.0.0"
-      (
-        sources."express-session-1.18.1"
-        // {
-          dependencies = [
-            sources."cookie-0.7.2"
-            sources."cookie-signature-1.0.7"
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."fast-safe-stringify-2.1.1"
-      sources."fast-xml-parser-4.4.1"
-      sources."fetch-blob-3.2.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."follow-redirects-1.15.9"
-      sources."form-data-4.0.2"
-      sources."form-data-encoder-2.1.4"
-      sources."formdata-polyfill-4.0.10"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-stream-6.0.1"
-      sources."glob-7.2.3"
-      sources."gopd-1.2.0"
-      sources."got-13.0.0"
-      sources."graceful-fs-4.2.11"
-      sources."grant-5.4.22"
-      sources."has-flag-4.0.0"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."helmet-7.2.0"
-      (
-        sources."help-me-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."hot-patcher-2.0.1"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-errors-2.0.0"
-      sources."http2-wrapper-2.2.1"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ioredis-5.6.0"
-      sources."ipaddr.js-2.2.0"
-      sources."is-buffer-1.1.6"
-      sources."is-stream-2.0.1"
-      sources."isarray-1.0.0"
-      sources."isomorphic-ws-4.0.1"
-      sources."js-base64-3.7.7"
-      sources."js-sdsl-4.3.0"
-      sources."json-buffer-3.0.1"
-      sources."jsonwebtoken-9.0.2"
-      sources."jwa-1.4.1"
-      sources."jws-3.2.2"
-      sources."keyv-4.5.4"
-      sources."layerr-3.0.0"
-      sources."leven-2.1.0"
-      sources."lodash-4.17.21"
-      sources."lodash._baseiteratee-4.7.0"
-      sources."lodash._basetostring-4.12.0"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."lodash._stringtopath-4.8.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.includes-4.3.0"
-      sources."lodash.isarguments-3.1.0"
-      sources."lodash.isboolean-3.0.3"
-      sources."lodash.isinteger-4.0.4"
-      sources."lodash.isnumber-3.0.3"
-      sources."lodash.isplainobject-4.0.6"
-      sources."lodash.isstring-4.0.1"
-      sources."lodash.once-4.1.1"
-      sources."lodash.throttle-4.1.1"
-      sources."lodash.uniqby-4.5.0"
-      sources."long-timeout-0.1.1"
-      sources."lowercase-keys-3.0.0"
-      sources."lru-cache-6.0.0"
-      sources."luxon-3.5.0"
-      sources."math-intrinsics-1.1.0"
-      sources."md5-2.3.0"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-response-4.0.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."moment-2.30.1"
-      sources."moment-timezone-0.5.47"
-      (
-        sources."morgan-1.10.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-            sources."on-finished-2.3.0"
-          ];
-        }
-      )
-      (
-        sources."mqtt-4.3.8"
-        // {
-          dependencies = [
-            sources."duplexify-4.1.3"
-            sources."readable-stream-3.6.2"
-            sources."ws-7.5.10"
-          ];
-        }
-      )
-      sources."mqtt-packet-6.10.0"
-      sources."ms-2.1.3"
-      sources."negotiator-0.6.3"
-      sources."nested-property-4.0.0"
-      sources."node-domexception-1.0.0"
-      sources."node-fetch-3.3.2"
-      sources."node-gyp-build-4.8.4"
-      sources."node-schedule-2.1.1"
-      sources."normalize-url-8.0.1"
-      sources."number-allocator-1.0.14"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."on-finished-2.4.1"
-      sources."on-headers-1.0.2"
-      sources."once-1.4.0"
-      sources."p-cancelable-3.0.0"
-      sources."parseurl-1.3.3"
-      sources."path-is-absolute-1.0.1"
-      sources."path-posix-1.0.0"
-      sources."path-to-regexp-0.1.12"
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."prom-client-15.1.2"
-      sources."proper-lockfile-4.1.2"
-      (
-        sources."proxy-addr-2.0.7"
-        // {
-          dependencies = [
-            sources."ipaddr.js-1.9.1"
-          ];
-        }
-      )
-      sources."proxy-from-env-1.1.0"
-      sources."pump-3.0.2"
-      sources."qs-6.13.0"
-      sources."querystringify-2.2.0"
-      sources."quick-lru-5.1.1"
-      sources."random-bytes-1.0.0"
-      sources."randombytes-2.1.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."redis-errors-1.2.0"
-      sources."redis-parser-3.0.0"
-      sources."reinterval-1.1.0"
-      sources."request-compose-2.1.7"
-      (
-        sources."request-oauth-1.0.1"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."requires-port-1.0.0"
-      sources."resolve-alpn-1.2.1"
-      sources."responselike-3.0.0"
-      sources."retry-0.12.0"
-      sources."rfdc-1.4.1"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            (
-              sources."debug-2.6.9"
-              // {
-                dependencies = [
-                  sources."ms-2.0.0"
-                ];
-              }
-            )
-            sources."encodeurl-1.0.2"
-          ];
-        }
-      )
-      sources."serialize-error-11.0.3"
-      sources."serialize-javascript-6.0.2"
-      sources."serve-static-1.16.2"
-      sources."setprototypeof-1.2.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."sorted-array-functions-1.3.0"
-      (
-        sources."split2-3.2.2"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."standard-as-callback-2.1.0"
-      sources."statuses-2.0.1"
-      (
-        sources."stream-browserify-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."stream-shift-1.0.3"
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strnum-1.1.2"
-      sources."supports-color-8.1.1"
-      sources."tdigest-0.1.2"
-      sources."toidentifier-1.0.1"
-      sources."tslib-2.8.1"
-      sources."tus-js-client-4.3.1"
-      sources."type-fest-2.19.0"
-      sources."type-is-1.6.18"
-      sources."typedarray-0.0.6"
-      sources."uid-safe-2.1.5"
-      sources."undici-types-6.20.0"
-      sources."unpipe-1.0.0"
-      sources."url-join-5.0.0"
-      sources."url-parse-1.5.10"
-      sources."url-value-parser-2.2.0"
-      sources."utf-8-validate-5.0.10"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-9.0.1"
-      sources."validator-13.12.0"
-      sources."vary-1.1.2"
-      sources."web-streams-polyfill-3.3.3"
-      (
-        sources."webdav-5.7.1"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."wrappy-1.0.2"
-      sources."ws-8.17.1"
-      sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:";
-      homepage = "https://github.com/transloadit/uppy#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage {
-    name = "_at_webassemblyjs_slash_cli";
-    packageName = "@webassemblyjs/cli";
-    version = "1.11.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/cli/-/cli-1.11.1.tgz";
-      sha512 = "XLCwWiDYeufpJPb/0H9sx4p07LtwXHRyv137I8peZZmTd4Xrk7KH2qSaDOCkpZX9yItTd8g7MWXNqGh0tT+8eg==";
-    };
-    dependencies = [
-      sources."@webassemblyjs/ast-1.11.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
-      sources."@webassemblyjs/helper-api-error-1.11.1"
-      sources."@webassemblyjs/helper-code-frame-1.11.1"
-      sources."@webassemblyjs/helper-compiler-1.11.1"
-      sources."@webassemblyjs/helper-flatten-ast-1.11.1"
-      sources."@webassemblyjs/helper-fsm-1.11.1"
-      sources."@webassemblyjs/helper-numbers-1.11.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.1"
-      sources."@webassemblyjs/ieee754-1.11.1"
-      sources."@webassemblyjs/leb128-1.11.1"
-      sources."@webassemblyjs/utf8-1.11.1"
-      sources."@webassemblyjs/validation-1.11.1"
-      sources."@webassemblyjs/wasm-parser-1.11.1"
-      sources."@webassemblyjs/wast-parser-1.11.1"
-      sources."@webassemblyjs/wast-printer-1.11.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."webassemblyjs-1.11.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Toolbox for WebAssembly";
-      homepage = "https://github.com/xtuc/webassemblyjs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "@webassemblyjs/repl-1.11.1" = nodeEnv.buildNodePackage {
-    name = "_at_webassemblyjs_slash_repl";
-    packageName = "@webassemblyjs/repl";
-    version = "1.11.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/repl/-/repl-1.11.1.tgz";
-      sha512 = "RDyNwDPb2YmsUYZ4OVCwJQpvxT7Mus4Dy9wNf0remSn7cTltrYGCk/zWe21+AXuNvuhYO0kzeNzswROuyB33cA==";
-    };
-    dependencies = [
-      sources."@webassemblyjs/ast-1.11.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
-      sources."@webassemblyjs/helper-api-error-1.11.1"
-      sources."@webassemblyjs/helper-code-frame-1.11.1"
-      sources."@webassemblyjs/helper-compiler-1.11.1"
-      sources."@webassemblyjs/helper-flatten-ast-1.11.1"
-      sources."@webassemblyjs/helper-fsm-1.11.1"
-      sources."@webassemblyjs/helper-numbers-1.11.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.1"
-      sources."@webassemblyjs/ieee754-1.11.1"
-      sources."@webassemblyjs/leb128-1.11.1"
-      sources."@webassemblyjs/utf8-1.11.1"
-      sources."@webassemblyjs/validation-1.11.1"
-      sources."@webassemblyjs/wasm-parser-1.11.1"
-      sources."@webassemblyjs/wast-parser-1.11.1"
-      sources."@webassemblyjs/wast-printer-1.11.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."webassemblyjs-1.11.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "WebAssembly REPL";
-      homepage = "https://github.com/xtuc/webassemblyjs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "@webassemblyjs/wasm-strip" = nodeEnv.buildNodePackage {
-    name = "_at_webassemblyjs_slash_wasm-strip";
-    packageName = "@webassemblyjs/wasm-strip";
-    version = "1.8.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wasm-strip/-/wasm-strip-1.8.1.tgz";
-      sha512 = "yDFZagGY6+M4EwAvHhZa3AVuz+LLr5iodcIIKk2rY8WT9VI+9rfzHR5aLCpVOkHrdCjBDnxXnnZqDkNbP28UXA==";
-    };
-    dependencies = [
-      sources."@webassemblyjs/ast-1.8.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.8.1"
-      sources."@webassemblyjs/helper-api-error-1.8.1"
-      sources."@webassemblyjs/helper-buffer-1.8.1"
-      sources."@webassemblyjs/helper-code-frame-1.8.1"
-      sources."@webassemblyjs/helper-fsm-1.8.1"
-      sources."@webassemblyjs/helper-module-context-1.8.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.8.1"
-      sources."@webassemblyjs/helper-wasm-section-1.8.1"
-      sources."@webassemblyjs/ieee754-1.8.1"
-      sources."@webassemblyjs/leb128-1.8.1"
-      sources."@webassemblyjs/utf8-1.8.1"
-      sources."@webassemblyjs/wasm-gen-1.8.1"
-      sources."@webassemblyjs/wasm-parser-1.8.1"
-      sources."@webassemblyjs/wast-parser-1.8.1"
-      sources."@webassemblyjs/wast-printer-1.8.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "> Strips custom sections";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "@webassemblyjs/wasm-text-gen-1.11.1" = nodeEnv.buildNodePackage {
-    name = "_at_webassemblyjs_slash_wasm-text-gen";
-    packageName = "@webassemblyjs/wasm-text-gen";
-    version = "1.11.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wasm-text-gen/-/wasm-text-gen-1.11.1.tgz";
-      sha512 = "7SWOLN+1eZ5e9gohQPVdA8XQstGIYei/70T5kmLP6vC41zy8BBYNt35OgLZmbpg3iOQ1vWT17ZMhVikSJySSRg==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/generator-7.26.10"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@webassemblyjs/ast-1.11.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
-      sources."@webassemblyjs/helper-api-error-1.11.1"
-      sources."@webassemblyjs/helper-numbers-1.11.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.1"
-      sources."@webassemblyjs/ieee754-1.11.1"
-      sources."@webassemblyjs/leb128-1.11.1"
-      sources."@webassemblyjs/utf8-1.11.1"
-      sources."@webassemblyjs/wasm-parser-1.11.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."commander-2.20.3"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."picocolors-1.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Emit documentation/code for your WASM binary Edit";
-      homepage = "https://github.com/xtuc/webassemblyjs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "@webassemblyjs/wast-refmt-1.11.1" = nodeEnv.buildNodePackage {
-    name = "_at_webassemblyjs_slash_wast-refmt";
-    packageName = "@webassemblyjs/wast-refmt";
-    version = "1.11.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@webassemblyjs/wast-refmt/-/wast-refmt-1.11.1.tgz";
-      sha512 = "xbYYo9CPjYMz1YHE4xvODqfrREiefWMXPD/rHgqV4rRituNpNRhbWIomwuKBfS5rgBsc0RdoLOmG4UdLbR6SDA==";
-    };
-    dependencies = [
-      sources."@webassemblyjs/ast-1.11.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
-      sources."@webassemblyjs/helper-api-error-1.11.1"
-      sources."@webassemblyjs/helper-code-frame-1.11.1"
-      sources."@webassemblyjs/helper-fsm-1.11.1"
-      sources."@webassemblyjs/helper-numbers-1.11.1"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.11.1"
-      sources."@webassemblyjs/wast-parser-1.11.1"
-      sources."@webassemblyjs/wast-printer-1.11.1"
-      sources."@xtuc/long-4.2.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "WAST refmt";
-      homepage = "https://github.com/xtuc/webassemblyjs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   alex = nodeEnv.buildNodePackage {
     name = "alex";
     packageName = "alex";
@@ -45382,82 +32911,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-cmake = nodeEnv.buildNodePackage {
-    name = "coc-cmake";
-    packageName = "coc-cmake";
-    version = "0.2.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.2.2.tgz";
-      sha512 = "CfZzfacIlFZqG5fjXDHiAu3ucy5YkhuW3+pv5iIGakChSuWoNYenG1LPDG7DEtlLRtFjfAkUbE7StcpMTUiaDw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "coc.nvim extension for cmake language";
-      homepage = "https://github.com/voldikss/coc-cmake#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-emmet = nodeEnv.buildNodePackage {
-    name = "coc-emmet";
-    packageName = "coc-emmet";
-    version = "1.1.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-emmet/-/coc-emmet-1.1.6.tgz";
-      sha512 = "lvHA9iSgU/46Iw7E14tSP+Hh1e6STYUegqTBGDPQ/9L9JOicE2USqwuo2y5cbslc2RQqv3EdUIr9nQf0T725mQ==";
-    };
-    dependencies = [
-      sources."@emmetio/extract-abbreviation-0.1.6"
-      sources."jsonc-parser-1.0.3"
-      sources."vscode-emmet-helper-1.2.17"
-      sources."vscode-languageserver-types-3.17.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "emmet extension for coc";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-eslint = nodeEnv.buildNodePackage {
-    name = "coc-eslint";
-    packageName = "coc-eslint";
-    version = "1.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.7.0.tgz";
-      sha512 = "NCL4qXmj9CClh9E87BagmHx4wLmKL7OzK0eLBZMovXphG5woHKPLwMfDOfoNEthloE4G3bG3TzoMsQIwhKvayA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Eslint extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-eslint#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-flutter = nodeEnv.buildNodePackage {
-    name = "coc-flutter";
-    packageName = "coc-flutter";
-    version = "1.9.10";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-flutter/-/coc-flutter-1.9.10.tgz";
-      sha512 = "Of3V4dn76ZdBp0ZjUq0c600Z1IMzT9k6574a7V/pnxMIb1gYP8+MgDqO1Mw/YzNTU/ovXQLb2zGJm6UnJhgQ3g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "flutter support for (Neo)vim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-go = nodeEnv.buildNodePackage {
     name = "coc-go";
     packageName = "coc-go";
@@ -45483,149 +32936,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-haxe = nodeEnv.buildNodePackage {
-    name = "coc-haxe";
-    packageName = "coc-haxe";
-    version = "0.21.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.21.1.tgz";
-      sha512 = "oz4kKSH/rw3pk/T3Ecro2qDpG4nt64BuyKyJkiETEIf2HMgbmYzFdz6e8TklobclQTbOic903+3azwze95BVsQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Haxe language server extension for coc.nvim";
-      homepage = "https://github.com/vantreeseba/coc-haxe#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-highlight = nodeEnv.buildNodePackage {
-    name = "coc-highlight";
-    packageName = "coc-highlight";
-    version = "2.0.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-2.0.4.tgz";
-      sha512 = "X6VGCqpDML0oRcyH77ANoQ0BAxEsQqVMB9OPbfXB/nSdN3xcO8+M1hNSJm4pBekvywxm6VQUsh/zFD4V55nxLw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Highlight extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-html = nodeEnv.buildNodePackage {
-    name = "coc-html";
-    packageName = "coc-html";
-    version = "1.8.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.8.0.tgz";
-      sha512 = "NXmTfHF/TxysUeSstDyLUcfv6LlK08PnltVZCe1J7XpG/QHRRq0sjhkNqkHJVfFT/Vo2NC4lv5Bc9UIWdjGGuw==";
-    };
-    dependencies = [
-      sources."typescript-4.9.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Html extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-html#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-java = nodeEnv.buildNodePackage {
-    name = "coc-java";
-    packageName = "coc-java";
-    version = "1.26.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.26.1.tgz";
-      sha512 = "1hKYhoTtfhVV+tEo/hdWnDMEMMZxSI++wzku/uVPkdqKa69RPUKpSbytFoNoAJYh+Ad2gPOGJWMF7NDJApbkUA==";
-    };
-    dependencies = [
-      sources."anymatch-3.1.3"
-      sources."binary-extensions-2.3.0"
-      sources."braces-3.0.3"
-      sources."chokidar-3.6.0"
-      sources."fill-range-7.1.1"
-      sources."glob-parent-5.1.2"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."normalize-path-3.0.0"
-      sources."picomatch-2.3.1"
-      sources."readdirp-3.6.0"
-      sources."to-regex-range-5.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Java language extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-java#readme";
-      license = "EPL-1.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-jest = nodeEnv.buildNodePackage {
-    name = "coc-jest";
-    packageName = "coc-jest";
-    version = "1.1.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.5.tgz";
-      sha512 = "H6j4hqmsF2b4hSfGQqaXeCahs3LnyYQc6vbtrSkuMQRdosh0gcZQx186kbxph8/5Mecw22Y9BGcsEaF2/RLEbw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "jest extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-jest#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-json = nodeEnv.buildNodePackage {
-    name = "coc-json";
-    packageName = "coc-json";
-    version = "1.9.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.9.2.tgz";
-      sha512 = "6fflZTS2d8bJFKXGBIb9uGSkB8tRa+VIcSvX6GAxKRyiz4ft4116c6MGG9bPh+qe7Gwe/+FomBMW7gB08GEjTQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Json extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-lists = nodeEnv.buildNodePackage {
-    name = "coc-lists";
-    packageName = "coc-lists";
-    version = "1.5.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.4.tgz";
-      sha512 = "RROel79iUEzY3ICwqLIfWkftdA95mlluSa933CxfxvZxQiPcnlSd9XWGc770RZOEv6R5TCihht2LRt0Lj1PrGQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Basic list sources for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-lists#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-ltex = nodeEnv.buildNodePackage {
     name = "coc-ltex";
     packageName = "coc-ltex";
@@ -45644,601 +32954,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-markdownlint = nodeEnv.buildNodePackage {
-    name = "coc-markdownlint";
-    packageName = "coc-markdownlint";
-    version = "1.36.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.36.0.tgz";
-      sha512 = "tVp32LukGXEFfz3y8H2Pq4fcpoxy9Xptw/jIAZAJz4S/725hCsWLCySwoVE7qhSLOeUHmVMQdoW7A11EHru+lg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Markdownlint extension for coc.nvim";
-      homepage = "https://github.com/fannheyward/coc-markdownlint#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-pairs = nodeEnv.buildNodePackage {
-    name = "coc-pairs";
-    packageName = "coc-pairs";
-    version = "1.5.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.5.1.tgz";
-      sha512 = "/wQOKlptsj2KB4yoIBYN3xtTbCKSsGbRdkNAeYCKCQZX0J5uVMFNgo363+k1BVp9KrkWQDlvVluF3Xf1ei8PfA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Auto pair extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-pairs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-prettier = nodeEnv.buildNodePackage {
-    name = "coc-prettier";
-    packageName = "coc-prettier";
-    version = "11.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-11.0.0.tgz";
-      sha512 = "QksBbo3rpqNdVljuzhnjyJGb6J6O+Q7vKhIqyB7nt4Jz3s9eAPI1NAqMaVhptE+V95D2A6srMl+YiBObZu94Qg==";
-    };
-    dependencies = [
-      sources."prettier-3.5.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Prettier extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-prettier#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-r-lsp = nodeEnv.buildNodePackage {
-    name = "coc-r-lsp";
-    packageName = "coc-r-lsp";
-    version = "1.2.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.1.tgz";
-      sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA==";
-    };
-    dependencies = [
-      sources."vscode-jsonrpc-8.2.0"
-      sources."vscode-languageserver-protocol-3.17.5"
-      sources."vscode-languageserver-textdocument-1.0.12"
-      sources."vscode-languageserver-types-3.17.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "R language server extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-rust-analyzer = nodeEnv.buildNodePackage {
-    name = "coc-rust-analyzer";
-    packageName = "coc-rust-analyzer";
-    version = "0.81.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.81.0.tgz";
-      sha512 = "skbRCe1Yjoa3r/a0dHviJxGMS8s+PFzl7lmimCUxxT3kKxairDeetNfRBw+wsDJmKBzXGhy1KH+6Cmt3WJYz5w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim";
-      homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-smartf = nodeEnv.buildNodePackage {
-    name = "coc-smartf";
-    packageName = "coc-smartf";
-    version = "1.2.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.2.1.tgz";
-      sha512 = "Zlm+lt03V1qmJVvQw81svaWE+jC9e42VTnHBh8qjlUJUMG1GDjuC8cwM1ulamdovSsKdlmtHwVpScdKBgg3/Fg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Smart find extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-smartf#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-snippets = nodeEnv.buildNodePackage {
-    name = "coc-snippets";
-    packageName = "coc-snippets";
-    version = "3.4.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.4.0.tgz";
-      sha512 = "p7nxP/ii+iRADnvFEuHz4iDhuspg3W08hj4J0IFz/OYrzJwEON3c+5i0DJEXyr8qrt0c2Vd+3rekRE8J2AhwGQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Snippets extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-snippets#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-solargraph = nodeEnv.buildNodePackage {
-    name = "coc-solargraph";
-    packageName = "coc-solargraph";
-    version = "1.2.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.4.tgz";
-      sha512 = "Z00v8HmgQyJgv/FKo7FkqWWTPNHeiOgEDqsI4RT9457rEQ8ZF/wLeq38DRihTfIra93GZ3EprVKYCOels6JHgQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Ruby languageserver extension for coc.nvim, using solargraph";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-stylelint = nodeEnv.buildNodePackage {
-    name = "coc-stylelint";
-    packageName = "coc-stylelint";
-    version = "1.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-stylelint/-/coc-stylelint-1.2.0.tgz";
-      sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."lru-cache-5.1.1"
-            sources."semver-6.3.1"
-            sources."yallist-3.1.1"
-          ];
-        }
-      )
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@stylelint/postcss-css-in-js-0.37.3"
-      sources."@stylelint/postcss-markdown-0.36.2"
-      sources."@types/mdast-3.0.15"
-      sources."@types/minimist-1.2.5"
-      sources."@types/normalize-package-data-2.4.4"
-      sources."@types/parse-json-4.0.2"
-      sources."@types/unist-2.0.11"
-      sources."ajv-8.17.1"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."array-union-2.1.0"
-      sources."arrify-1.0.1"
-      sources."astral-regex-2.0.0"
-      (
-        sources."autoprefixer-9.8.8"
-        // {
-          dependencies = [
-            sources."picocolors-0.2.1"
-          ];
-        }
-      )
-      sources."bail-1.0.5"
-      sources."balanced-match-2.0.0"
-      (
-        sources."brace-expansion-1.1.11"
-        // {
-          dependencies = [
-            sources."balanced-match-1.0.2"
-          ];
-        }
-      )
-      sources."braces-3.0.3"
-      sources."browserslist-4.24.4"
-      sources."callsites-3.1.0"
-      sources."camelcase-5.3.1"
-      sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chalk-4.1.2"
-      sources."character-entities-1.2.4"
-      sources."character-entities-legacy-1.1.4"
-      sources."character-reference-invalid-1.1.4"
-      sources."clone-regexp-2.2.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."convert-source-map-2.0.0"
-      sources."cosmiconfig-7.1.0"
-      sources."cssesc-3.0.0"
-      sources."debug-4.4.0"
-      sources."decamelize-1.2.0"
-      (
-        sources."decamelize-keys-1.1.1"
-        // {
-          dependencies = [
-            sources."map-obj-1.0.1"
-          ];
-        }
-      )
-      sources."dir-glob-3.0.1"
-      (
-        sources."dom-serializer-0.2.2"
-        // {
-          dependencies = [
-            sources."domelementtype-2.3.0"
-            sources."entities-2.2.0"
-          ];
-        }
-      )
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.4.2"
-      sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.5.118"
-      sources."emoji-regex-8.0.0"
-      sources."entities-1.1.2"
-      sources."error-ex-1.3.2"
-      sources."escalade-3.2.0"
-      sources."execall-2.0.0"
-      sources."extend-3.0.2"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-diff-1.3.0"
-      sources."fast-glob-3.3.3"
-      sources."fast-uri-3.0.6"
-      sources."fastest-levenshtein-1.0.16"
-      sources."fastq-1.19.1"
-      sources."file-entry-cache-6.0.1"
-      sources."fill-range-7.1.1"
-      sources."find-up-4.1.0"
-      sources."flat-cache-3.2.0"
-      sources."flatted-3.3.3"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."gensync-1.0.0-beta.2"
-      sources."get-stdin-8.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-modules-2.0.0"
-      sources."global-prefix-3.0.0"
-      sources."globals-11.12.0"
-      sources."globby-11.1.0"
-      sources."globjoin-0.1.4"
-      sources."gonzales-pe-4.3.0"
-      sources."hard-rejection-2.1.0"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."html-tags-3.3.1"
-      sources."htmlparser2-3.10.1"
-      sources."ignore-5.3.2"
-      (
-        sources."import-fresh-3.3.1"
-        // {
-          dependencies = [
-            sources."resolve-from-4.0.0"
-          ];
-        }
-      )
-      sources."import-lazy-4.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."is-alphabetical-1.0.4"
-      sources."is-alphanumerical-1.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-2.0.5"
-      sources."is-core-module-2.16.1"
-      sources."is-decimal-1.0.4"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-hexadecimal-1.0.4"
-      sources."is-number-7.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-regexp-2.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."isexe-2.0.0"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."json5-2.2.3"
-      sources."keyv-4.5.4"
-      sources."kind-of-6.0.3"
-      sources."known-css-properties-0.21.0"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.truncate-4.4.2"
-      sources."log-symbols-4.1.0"
-      sources."longest-streak-2.0.4"
-      sources."lru-cache-6.0.0"
-      sources."map-obj-4.3.0"
-      sources."mathml-tag-names-2.1.3"
-      sources."mdast-util-from-markdown-0.8.5"
-      sources."mdast-util-to-markdown-0.6.5"
-      sources."mdast-util-to-string-2.0.0"
-      sources."meow-9.0.0"
-      sources."merge2-1.4.1"
-      sources."micromark-2.11.4"
-      sources."micromatch-4.0.8"
-      sources."min-indent-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minimist-options-4.1.0"
-      sources."ms-2.1.3"
-      sources."node-releases-2.0.19"
-      (
-        sources."normalize-package-data-3.0.3"
-        // {
-          dependencies = [
-            sources."hosted-git-info-4.1.0"
-            sources."semver-7.7.1"
-          ];
-        }
-      )
-      sources."normalize-range-0.1.2"
-      sources."normalize-selector-0.2.0"
-      sources."num2fraction-1.2.2"
-      sources."once-1.4.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."parent-module-1.0.1"
-      sources."parse-entities-2.0.0"
-      sources."parse-json-5.2.0"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-parse-1.0.7"
-      sources."path-type-4.0.0"
-      sources."picocolors-1.1.1"
-      sources."picomatch-2.3.1"
-      (
-        sources."postcss-7.0.39"
-        // {
-          dependencies = [
-            sources."picocolors-0.2.1"
-          ];
-        }
-      )
-      sources."postcss-html-0.36.0"
-      sources."postcss-less-3.1.4"
-      sources."postcss-media-query-parser-0.2.3"
-      sources."postcss-resolve-nested-selector-0.1.6"
-      sources."postcss-safe-parser-4.0.2"
-      sources."postcss-sass-0.4.4"
-      sources."postcss-scss-2.1.1"
-      sources."postcss-selector-parser-6.1.2"
-      sources."postcss-syntax-0.36.2"
-      sources."postcss-value-parser-4.2.0"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-4.0.1"
-      (
-        sources."read-pkg-5.2.0"
-        // {
-          dependencies = [
-            sources."normalize-package-data-2.5.0"
-            sources."type-fest-0.6.0"
-          ];
-        }
-      )
-      (
-        sources."read-pkg-up-7.0.1"
-        // {
-          dependencies = [
-            sources."type-fest-0.8.1"
-          ];
-        }
-      )
-      sources."readable-stream-3.6.2"
-      sources."redent-3.0.0"
-      sources."remark-13.0.0"
-      sources."remark-parse-9.0.0"
-      sources."remark-stringify-9.0.1"
-      sources."repeat-string-1.6.1"
-      sources."require-from-string-2.0.2"
-      sources."resolve-1.22.10"
-      sources."resolve-from-5.0.0"
-      sources."reusify-1.1.0"
-      sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
-      sources."semver-5.7.2"
-      sources."signal-exit-3.0.7"
-      sources."slash-3.0.0"
-      sources."slice-ansi-4.0.0"
-      sources."source-map-0.6.1"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      sources."specificity-0.4.1"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-indent-3.0.0"
-      sources."style-search-0.1.0"
-      sources."stylelint-13.13.1"
-      sources."sugarss-2.0.0"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."svg-tags-1.0.0"
-      sources."table-6.9.0"
-      sources."to-regex-range-5.0.1"
-      sources."trim-newlines-3.0.1"
-      sources."trough-1.0.5"
-      sources."type-fest-0.18.1"
-      sources."typedarray-to-buffer-3.1.5"
-      (
-        sources."unified-9.2.2"
-        // {
-          dependencies = [
-            sources."is-plain-obj-2.1.0"
-          ];
-        }
-      )
-      sources."unist-util-find-all-after-3.0.2"
-      sources."unist-util-is-4.1.0"
-      sources."unist-util-stringify-position-2.0.3"
-      sources."update-browserslist-db-1.1.3"
-      sources."util-deprecate-1.0.2"
-      sources."v8-compile-cache-2.4.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."vfile-4.2.1"
-      sources."vfile-message-2.0.4"
-      sources."vscode-jsonrpc-5.1.0-next.1"
-      sources."vscode-languageserver-6.2.0-next.2"
-      (
-        sources."vscode-languageserver-protocol-3.16.0-next.2"
-        // {
-          dependencies = [
-            sources."vscode-languageserver-types-3.16.0-next.1"
-          ];
-        }
-      )
-      sources."vscode-languageserver-textdocument-1.0.12"
-      sources."vscode-languageserver-types-3.17.5"
-      sources."vscode-uri-2.1.2"
-      sources."which-1.3.1"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
-      sources."yallist-4.0.0"
-      sources."yaml-1.10.2"
-      sources."yargs-parser-20.2.9"
-      sources."zwitch-1.0.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "stylelint extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-sumneko-lua = nodeEnv.buildNodePackage {
-    name = "coc-sumneko-lua";
-    packageName = "coc-sumneko-lua";
-    version = "0.0.42";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.42.tgz";
-      sha512 = "elUmSurb51E17VV/1W/qsAoD5qq6pFsnRK549WFMcG+AThli6nTj2Y6Ta0FA6+zh7QSjbraOlza8gk7C2w3Nfg==";
-    };
-    dependencies = [
-      sources."tslib-2.8.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Lua extension using sumneko lua-language-server for coc.nvim";
-      homepage = "https://github.com/xiyaowong/coc-sumneko-lua#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-sqlfluff = nodeEnv.buildNodePackage {
-    name = "coc-sqlfluff";
-    packageName = "coc-sqlfluff";
-    version = "0.11.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.11.4.tgz";
-      sha512 = "0yKAPkIKoLJWksPefWXVvRcRQ+Ja3kc2Bx/tKL4tQwEOlAwc5qeUU+1FZRw+71Jp8HeC5Wo9YqtlgSIJlyic3g==";
-    };
-    dependencies = [
-      sources."semver-7.7.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "SQLFluff (A SQL linter and auto-formatter for Humans) extension for coc.nvim";
-      homepage = "https://github.com/yaegassy/coc-sqlfluff#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-tabnine = nodeEnv.buildNodePackage {
-    name = "coc-tabnine";
-    packageName = "coc-tabnine";
-    version = "1.3.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz";
-      sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "tabnine extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-texlab = nodeEnv.buildNodePackage {
-    name = "coc-texlab";
-    packageName = "coc-texlab";
-    version = "3.3.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.3.0.tgz";
-      sha512 = "MV/zLxI6jvu/IWS3/dyc8Dsgz9ypO86hSAHwjRbDGTc/V9t8jTPUnI4E1hzmsF8bfIjxnUU/oyITX9tLTOnCOQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "TexLab extension for coc.nvim";
-      homepage = "https://github.com/fannheyward/coc-texlab#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";
@@ -46278,98 +32993,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-vimlsp = nodeEnv.buildNodePackage {
-    name = "coc-vimlsp";
-    packageName = "coc-vimlsp";
-    version = "0.13.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.13.1.tgz";
-      sha512 = "rUXjY022KJHLNrlru1zMvqhF+ikYIjlhULoq2fx8PbsA4uyuWLDXvLfeQxj8e5wVNyfPVtaAz54zChLV4OOHAA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "vim language server extension for coc.nvim";
-      homepage = "https://github.com/iamcco/coc-vim#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-vimtex = nodeEnv.buildNodePackage {
-    name = "coc-vimtex";
-    packageName = "coc-vimtex";
-    version = "1.1.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.5.tgz";
-      sha512 = "3SY6vFcmBO8u6/6zrBzqgwCbus8k7877UCNVEua8lgC+T4tKgB4w9VthikMEcoUDPK17/QbLITSB+yPDNebbHw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "vimtex integration for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-vimtex#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-wxml = nodeEnv.buildNodePackage {
-    name = "coc-wxml";
-    packageName = "coc-wxml";
-    version = "1.0.9";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-wxml/-/coc-wxml-1.0.9.tgz";
-      sha512 = "ExbBjO4/7sbwHVawtK/sDzFwmUTwW9rHgm51sJxqQim+Zjn3vw1x0pNObonVb+r/kX9peLCyE6/nmT2ybfeBPg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "wxml language server extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-yaml = nodeEnv.buildNodePackage {
-    name = "coc-yaml";
-    packageName = "coc-yaml";
-    version = "1.9.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.9.1.tgz";
-      sha512 = "PKDIWjnTF1193m0a5srO8oOLrOv9nKwaqka+a+sdzDjlyPoFipEADFUQVdoHwe1GYlfYe7tmfWOUCbR6ddRLrw==";
-    };
-    dependencies = [
-      sources."prettier-2.0.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "yaml extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-yaml#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  coc-yank = nodeEnv.buildNodePackage {
-    name = "coc-yank";
-    packageName = "coc-yank";
-    version = "1.2.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.2.4.tgz";
-      sha512 = "tNCysSDUKNHAE/cBbfB9kbaSkDbeTleRwfho0vXuaxA6TLAbHqKPA81ecF4pHG4JJm9V156d7uhotYsm4InuyA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Yank extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-yank#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   code-theme-converter = nodeEnv.buildNodePackage {
     name = "code-theme-converter";
     packageName = "code-theme-converter";
@@ -46708,233 +33331,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  create-cycle-app = nodeEnv.buildNodePackage {
-    name = "create-cycle-app";
-    packageName = "create-cycle-app";
-    version = "5.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-5.0.0.tgz";
-      sha512 = "Ic10lxNqRXWtO9CUbvsWcOWEigWuGApKEiRo0DNybhrsCuUQBeGhxfdVRYb3TD+keK+2LVCBFCdVbWb4UqqcdA==";
-    };
-    dependencies = [
-      sources."@cycle/dom-18.3.0"
-      sources."@cycle/http-14.10.0"
-      (
-        sources."@cycle/isolate-3.4.0"
-        // {
-          dependencies = [
-            sources."@cycle/run-4.4.0"
-          ];
-        }
-      )
-      sources."@cycle/run-3.4.0"
-      sources."@cycle/time-0.10.1"
-      sources."@types/cookiejar-2.1.5"
-      sources."@types/node-22.13.10"
-      sources."@types/superagent-3.8.2"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."asynckit-0.4.0"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      (
-        sources."chalk-2.4.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-      sources."chardet-0.4.2"
-      sources."cli-cursor-2.1.0"
-      sources."cli-width-2.2.1"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."combine-errors-3.0.3"
-      sources."combined-stream-1.0.8"
-      sources."component-emitter-1.3.1"
-      sources."cookiejar-2.1.4"
-      sources."core-util-is-1.0.3"
-      sources."cross-spawn-5.1.0"
-      sources."cssauron-1.4.0"
-      sources."custom-error-instance-2.1.1"
-      sources."cycle-onionify-4.0.0"
-      sources."d-1.0.2"
-      sources."debug-3.2.7"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
-      sources."delayed-stream-1.0.0"
-      sources."dunder-proto-1.0.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."es5-ext-0.10.64"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      sources."es6-set-0.1.6"
-      sources."es6-symbol-3.1.4"
-      sources."escape-string-regexp-1.0.5"
-      sources."esniff-2.0.1"
-      sources."event-emitter-0.3.5"
-      sources."ext-1.7.0"
-      sources."extend-3.0.2"
-      sources."external-editor-2.2.0"
-      sources."figures-2.0.0"
-      sources."form-data-2.5.3"
-      sources."formidable-1.2.6"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."globalthis-1.0.4"
-      sources."gopd-1.2.0"
-      sources."has-ansi-2.0.0"
-      sources."has-flag-3.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."iconv-lite-0.4.24"
-      sources."inherits-2.0.4"
-      (
-        sources."inquirer-3.3.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash._baseiteratee-4.7.0"
-      sources."lodash._basetostring-4.12.0"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."lodash._stringtopath-4.8.0"
-      sources."lodash.uniqby-4.5.0"
-      sources."lru-cache-4.1.5"
-      sources."math-intrinsics-1.1.0"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.8"
-      sources."ms-2.1.3"
-      sources."mute-stream-0.0.7"
-      sources."next-tick-1.1.0"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."object-keys-1.1.1"
-      sources."onetime-2.0.1"
-      sources."os-tmpdir-1.0.2"
-      sources."performance-now-2.1.0"
-      sources."process-nextick-args-2.0.1"
-      sources."pseudomap-1.0.2"
-      sources."qs-6.14.0"
-      sources."quicktask-1.1.0"
-      sources."raf-3.3.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."restore-cursor-2.0.0"
-      sources."run-async-2.4.1"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."setimmediate-1.0.5"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."snabbdom-0.7.0"
-      sources."snabbdom-selector-1.2.1"
-      sources."sorted-immutable-list-1.1.0"
-      (
-        sources."string-width-2.1.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strip-ansi-3.0.1"
-      sources."superagent-3.8.3"
-      sources."supports-color-2.0.0"
-      sources."symbol-observable-2.0.3"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."type-2.7.3"
-      sources."undici-types-6.20.0"
-      sources."util-deprecate-1.0.2"
-      (
-        sources."variable-diff-1.1.0"
-        // {
-          dependencies = [
-            sources."chalk-1.1.3"
-          ];
-        }
-      )
-      sources."which-1.3.1"
-      sources."xstream-11.14.0"
-      sources."yallist-2.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Create Cycle.js with no build configuration";
-      homepage = "https://github.com/cyclejs-community/create-cycle-app#readme";
-      license = "ISC";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  csslint = nodeEnv.buildNodePackage {
-    name = "csslint";
-    packageName = "csslint";
-    version = "1.0.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
-      sha512 = "GXGpPqGIuEBKesM4bt2IKFrzDKpemh9wVZRHVuculUErar554QrXHOonhgkBOP3uiZzbAETz0N2A4oWlIoxPuw==";
-    };
-    dependencies = [
-      sources."clone-2.1.2"
-      sources."parserlib-1.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CSSLint";
-      homepage = "http://csslint.net/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
@@ -47538,526 +33934,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@electron-forge/cli" = nodeEnv.buildNodePackage {
-    name = "_at_electron-forge_slash_cli";
-    packageName = "@electron-forge/cli";
-    version = "7.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.7.0.tgz";
-      sha512 = "QfnjghmlHMb7dyArR5cbPA+MP9ff/ulWZi6R/a5MkHlKyhrysRfjzDtZDsmkEv9mGQgRwylssgXrZrKHGlxFkw==";
-    };
-    dependencies = [
-      sources."@electron-forge/core-7.7.0"
-      sources."@electron-forge/core-utils-7.7.0"
-      sources."@electron-forge/maker-base-7.7.0"
-      sources."@electron-forge/plugin-base-7.7.0"
-      sources."@electron-forge/publisher-base-7.7.0"
-      sources."@electron-forge/shared-types-7.7.0"
-      sources."@electron-forge/template-base-7.7.0"
-      sources."@electron-forge/template-vite-7.7.0"
-      sources."@electron-forge/template-vite-typescript-7.7.0"
-      sources."@electron-forge/template-webpack-7.7.0"
-      sources."@electron-forge/template-webpack-typescript-7.7.0"
-      sources."@electron-forge/tracer-7.7.0"
-      (
-        sources."@electron/asar-3.3.1"
-        // {
-          dependencies = [
-            sources."commander-5.1.0"
-          ];
-        }
-      )
-      (
-        sources."@electron/get-3.1.0"
-        // {
-          dependencies = [
-            sources."fs-extra-8.1.0"
-            sources."jsonfile-4.0.0"
-            sources."semver-6.3.1"
-            sources."universalify-0.1.2"
-          ];
-        }
-      )
-      (
-        sources."@electron/node-gyp-git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."glob-8.1.0"
-            sources."minimatch-5.1.6"
-          ];
-        }
-      )
-      (
-        sources."@electron/notarize-2.5.0"
-        // {
-          dependencies = [
-            sources."fs-extra-9.1.0"
-          ];
-        }
-      )
-      sources."@electron/osx-sign-1.3.3"
-      (
-        sources."@electron/packager-18.3.6"
-        // {
-          dependencies = [
-            sources."fs-extra-11.3.0"
-          ];
-        }
-      )
-      sources."@electron/rebuild-3.7.1"
-      (
-        sources."@electron/universal-2.0.2"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."fs-extra-11.3.0"
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      (
-        sources."@electron/windows-sign-1.2.1"
-        // {
-          dependencies = [
-            sources."fs-extra-11.3.0"
-          ];
-        }
-      )
-      sources."@gar/promisify-1.1.3"
-      sources."@malept/cross-spawn-promise-2.0.0"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@npmcli/fs-2.1.2"
-      sources."@npmcli/move-file-2.0.1"
-      sources."@sindresorhus/is-4.6.0"
-      sources."@szmarczak/http-timer-4.0.6"
-      sources."@tootallnate/once-2.0.0"
-      sources."@types/cacheable-request-6.0.3"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/keyv-3.1.4"
-      sources."@types/node-22.13.10"
-      sources."@types/responselike-1.0.3"
-      sources."@types/yauzl-2.10.3"
-      sources."@xmldom/xmldom-0.8.10"
-      sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
-      sources."agentkeepalive-4.6.0"
-      sources."aggregate-error-3.1.0"
-      sources."ansi-escapes-5.0.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."at-least-node-1.0.0"
-      sources."author-regex-1.0.0"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."bluebird-3.7.2"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."buffer-5.7.1"
-      sources."buffer-crc32-0.2.13"
-      sources."buffer-from-1.1.2"
-      (
-        sources."cacache-16.1.3"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."glob-8.1.0"
-            sources."minimatch-5.1.6"
-          ];
-        }
-      )
-      sources."cacheable-lookup-5.0.4"
-      sources."cacheable-request-7.0.4"
-      sources."chalk-4.1.2"
-      sources."chownr-2.0.0"
-      sources."chrome-trace-event-1.0.4"
-      sources."clean-stack-2.2.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-spinners-2.9.2"
-      (
-        sources."cli-truncate-3.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-          ];
-        }
-      )
-      sources."cliui-8.0.1"
-      sources."clone-1.0.4"
-      sources."clone-response-1.0.3"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."colorette-2.0.20"
-      sources."commander-11.1.0"
-      sources."compare-version-0.1.2"
-      sources."concat-map-0.0.1"
-      sources."cross-dirname-0.1.0"
-      sources."cross-spawn-7.0.6"
-      (
-        sources."debug-4.4.0"
-        // {
-          dependencies = [
-            sources."ms-2.1.3"
-          ];
-        }
-      )
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defaults-1.0.4"
-      sources."defer-to-connect-2.0.1"
-      sources."detect-libc-2.0.3"
-      sources."dir-compare-4.2.0"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."end-of-stream-1.4.4"
-      sources."env-paths-2.2.1"
-      sources."err-code-2.0.3"
-      sources."error-ex-1.3.2"
-      sources."escalade-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."eventemitter3-5.0.1"
-      (
-        sources."execa-1.0.0"
-        // {
-          dependencies = [
-            sources."cross-spawn-6.0.6"
-            sources."get-stream-4.1.0"
-            sources."path-key-2.0.1"
-            sources."semver-5.7.2"
-            sources."shebang-command-1.2.0"
-            sources."shebang-regex-1.0.0"
-            sources."which-1.3.1"
-          ];
-        }
-      )
-      sources."exponential-backoff-3.1.2"
-      sources."extract-zip-2.0.1"
-      sources."fast-glob-3.3.3"
-      sources."fastq-1.19.1"
-      sources."fd-slicer-1.1.0"
-      sources."filename-reserved-regex-2.0.0"
-      sources."filenamify-4.3.0"
-      sources."fill-range-7.1.1"
-      (
-        sources."find-up-5.0.0"
-        // {
-          dependencies = [
-            sources."locate-path-6.0.0"
-            sources."p-locate-5.0.0"
-            sources."path-exists-4.0.0"
-          ];
-        }
-      )
-      sources."flora-colossus-2.0.0"
-      sources."fs-extra-10.1.0"
-      sources."fs-minipass-2.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."galactus-1.0.0"
-      sources."get-caller-file-2.0.5"
-      (
-        sources."get-package-info-1.0.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-          ];
-        }
-      )
-      sources."get-stream-5.2.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-dirs-3.0.1"
-      sources."got-11.8.6"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-proxy-agent-5.0.0"
-      sources."http2-wrapper-1.0.3"
-      sources."https-proxy-agent-5.0.1"
-      sources."humanize-ms-1.2.1"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."infer-owner-1.0.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-2.0.0"
-      sources."interpret-3.1.1"
-      sources."ip-address-9.0.5"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.16.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-interactive-1.0.0"
-      sources."is-lambda-1.0.1"
-      sources."is-number-7.0.0"
-      sources."is-stream-1.1.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."isbinaryfile-4.0.10"
-      sources."isexe-2.0.0"
-      sources."jsbn-1.1.0"
-      sources."json-buffer-3.0.1"
-      sources."jsonfile-6.1.0"
-      sources."junk-3.1.0"
-      sources."keyv-4.5.4"
-      (
-        sources."listr2-7.0.2"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."ansi-styles-6.2.1"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-            sources."wrap-ansi-8.1.0"
-          ];
-        }
-      )
-      sources."load-json-file-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.get-4.4.2"
-      sources."log-symbols-4.1.0"
-      (
-        sources."log-update-5.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."ansi-styles-6.2.1"
-            sources."cli-cursor-4.0.0"
-            sources."emoji-regex-9.2.2"
-            sources."restore-cursor-4.0.0"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-            sources."wrap-ansi-8.1.0"
-          ];
-        }
-      )
-      sources."lowercase-keys-2.0.0"
-      sources."lru-cache-7.18.3"
-      sources."make-fetch-happen-10.2.1"
-      sources."map-age-cleaner-0.1.3"
-      sources."mem-4.3.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.8"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-3.3.6"
-      sources."minipass-collect-1.0.2"
-      sources."minipass-fetch-2.1.2"
-      sources."minipass-flush-1.0.5"
-      sources."minipass-pipeline-1.2.4"
-      sources."minipass-sized-1.0.3"
-      sources."minizlib-2.1.2"
-      sources."mkdirp-1.0.4"
-      sources."ms-2.0.0"
-      sources."negotiator-0.6.4"
-      sources."nice-try-1.0.5"
-      sources."node-abi-3.74.0"
-      sources."node-api-version-0.2.0"
-      sources."node-fetch-2.7.0"
-      sources."nopt-6.0.0"
-      (
-        sources."normalize-package-data-2.5.0"
-        // {
-          dependencies = [
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."normalize-url-6.1.0"
-      (
-        sources."npm-run-path-2.0.2"
-        // {
-          dependencies = [
-            sources."path-key-2.0.1"
-          ];
-        }
-      )
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."ora-5.4.1"
-      sources."p-cancelable-2.1.1"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-3.1.0"
-      (
-        sources."p-locate-2.0.0"
-        // {
-          dependencies = [
-            sources."p-limit-1.3.0"
-          ];
-        }
-      )
-      sources."p-map-4.0.0"
-      sources."p-try-1.0.0"
-      sources."parse-author-2.0.0"
-      sources."parse-json-2.2.0"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-parse-1.0.7"
-      sources."path-type-2.0.0"
-      sources."pe-library-1.0.1"
-      sources."pend-1.2.0"
-      sources."picomatch-2.3.1"
-      sources."pify-2.3.0"
-      sources."plist-3.1.0"
-      (
-        sources."postject-1.0.0-alpha.6"
-        // {
-          dependencies = [
-            sources."commander-9.5.0"
-          ];
-        }
-      )
-      sources."proc-log-2.0.1"
-      sources."progress-2.0.3"
-      sources."promise-inflight-1.0.1"
-      sources."promise-retry-2.0.1"
-      sources."pump-3.0.2"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-5.1.1"
-      sources."read-binary-file-arch-1.0.6"
-      sources."read-pkg-2.0.0"
-      (
-        sources."read-pkg-up-2.0.0"
-        // {
-          dependencies = [
-            sources."find-up-2.1.0"
-          ];
-        }
-      )
-      sources."readable-stream-3.6.2"
-      sources."rechoir-0.8.0"
-      sources."require-directory-2.1.1"
-      sources."resedit-2.0.3"
-      sources."resolve-1.22.10"
-      sources."resolve-alpn-1.2.1"
-      sources."responselike-2.0.1"
-      sources."restore-cursor-3.1.0"
-      sources."retry-0.12.0"
-      sources."reusify-1.1.0"
-      sources."rfdc-1.4.1"
-      sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      (
-        sources."slice-ansi-5.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-6.2.1"
-            sources."is-fullwidth-code-point-4.0.0"
-          ];
-        }
-      )
-      sources."smart-buffer-4.2.0"
-      sources."socks-2.8.4"
-      sources."socks-proxy-agent-7.0.0"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      sources."sprintf-js-1.1.3"
-      sources."ssri-9.0.1"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-bom-3.0.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-outer-1.0.1"
-      sources."sudo-prompt-9.2.1"
-      sources."sumchecker-3.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      (
-        sources."tar-6.2.1"
-        // {
-          dependencies = [
-            sources."minipass-5.0.0"
-          ];
-        }
-      )
-      sources."to-regex-range-5.0.1"
-      sources."tr46-0.0.3"
-      sources."trim-repeated-1.0.0"
-      sources."type-fest-1.4.0"
-      sources."undici-types-6.20.0"
-      sources."unique-filename-2.0.1"
-      sources."unique-slug-3.0.0"
-      sources."universalify-2.0.1"
-      sources."username-5.1.0"
-      sources."util-deprecate-1.0.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."xmlbuilder-15.1.1"
-      sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-      sources."yauzl-2.10.0"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A complete tool for building modern Electron applications";
-      homepage = "https://github.com/electron/forge#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  elm-oracle = nodeEnv.buildNodePackage {
-    name = "elm-oracle";
-    packageName = "elm-oracle";
-    version = "1.1.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz";
-      sha512 = "DUtF7aAlrrgijSRB4tGMgx6qp1NAVJpUGL4cjret1f57DEf41s+iPLPHxEkPbLrIdYjtEBzvRP8mMph37quqmQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Query for information about values in elm source files";
-      homepage = "https://github.com/ElmCast/elm-oracle#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";
@@ -48220,23 +34096,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  emojione = nodeEnv.buildNodePackage {
-    name = "emojione";
-    packageName = "emojione";
-    version = "4.5.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-4.5.0.tgz";
-      sha512 = "Tq55Y3UgPOnayFDN+Qd6QMP0rpoH10a1nhSFN27s8gXW3qymgFIHiXys2ECYYAI134BafmI3qP9ni2rZOe9BjA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images";
-      homepage = "https://www.emojione.com";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   esy = nodeEnv.buildNodePackage {
     name = "esy";
     packageName = "esy";
@@ -49067,207 +34926,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  fleek-cli = nodeEnv.buildNodePackage {
-    name = "fleek-cli";
-    packageName = "fleek-cli";
-    version = "0.0.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fleek-cli/-/fleek-cli-0.0.1.tgz";
-      sha512 = "6TL8NcVoGh7q+1qO/uQ4d/YDAG+x8ddQctZILObjdNmztf9Dv8JI9X0l0U+fsDPTcytYjkw910UwW7uzzWGclA==";
-    };
-    dependencies = [
-      sources."@ethereumjs/rlp-4.0.1"
-      sources."@ethereumjs/util-8.1.0"
-      sources."@noble/curves-1.4.2"
-      sources."@noble/hashes-1.4.0"
-      sources."@scure/base-1.1.9"
-      sources."@scure/bip32-1.4.0"
-      sources."@scure/bip39-1.3.0"
-      sources."@types/atob-2.1.4"
-      sources."@types/inquirer-6.5.0"
-      sources."@types/node-22.13.10"
-      sources."@types/through-0.0.33"
-      sources."ajv-6.12.6"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."argparse-1.0.10"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-0.2.10"
-      sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
-      sources."atob-2.1.2"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-search-tree-0.2.5"
-      sources."bluebird-3.7.2"
-      sources."bn.js-5.2.1"
-      sources."camelcase-5.3.1"
-      sources."caseless-0.12.0"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-width-3.0.0"
-      sources."cliui-6.0.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."colors-1.4.0"
-      sources."combined-stream-1.0.8"
-      sources."command-exists-1.2.9"
-      sources."core-util-is-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."decamelize-1.2.0"
-      sources."delayed-stream-1.0.0"
-      sources."dotenv-8.6.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-8.0.0"
-      (
-        sources."encoding-0.1.13"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."ethereum-bloom-filters-1.2.0"
-      sources."ethereum-cryptography-2.2.1"
-      (
-        sources."ethjs-unit-0.1.6"
-        // {
-          dependencies = [
-            sources."bn.js-4.11.6"
-          ];
-        }
-      )
-      sources."extend-3.0.2"
-      sources."external-editor-3.1.0"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."figures-3.2.0"
-      sources."find-up-4.1.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs-extra-9.1.0"
-      sources."get-caller-file-2.0.5"
-      sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-flag-4.0.0"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."immediate-3.0.6"
-      sources."inquirer-7.3.3"
-      sources."inversify-5.1.1"
-      sources."is-docker-2.2.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-hex-prefixed-1.0.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-wsl-2.2.0"
-      sources."isstream-0.1.2"
-      sources."js-yaml-3.14.1"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.1.0"
-      sources."jsprim-1.4.2"
-      sources."jwt-decode-2.2.0"
-      sources."lie-3.1.1"
-      sources."localforage-1.10.0"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."micro-ftch-0.3.1"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-2.1.0"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."mute-stream-0.0.8"
-      sources."nedb-1.8.0"
-      sources."node-fetch-2.7.0"
-      (
-        sources."number-to-bn-1.7.0"
-        // {
-          dependencies = [
-            sources."bn.js-4.11.6"
-          ];
-        }
-      )
-      sources."oauth-sign-0.9.0"
-      sources."onetime-5.1.2"
-      sources."open-7.4.2"
-      sources."os-tmpdir-1.0.2"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-4.0.0"
-      sources."performance-now-2.1.0"
-      sources."psl-1.15.0"
-      sources."punycode-2.3.1"
-      sources."qs-6.5.3"
-      sources."querystring-0.2.1"
-      sources."randombytes-2.1.0"
-      sources."reflect-metadata-0.1.14"
-      sources."request-2.88.2"
-      sources."request-promise-4.2.6"
-      sources."request-promise-core-1.1.4"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."restore-cursor-3.1.0"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.7"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.7"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.18.0"
-      sources."stealthy-require-1.1.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."strip-hex-prefix-1.0.0"
-      sources."supports-color-7.2.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."tough-cookie-2.5.0"
-      sources."tr46-0.0.3"
-      sources."tslib-1.14.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-fest-0.21.3"
-      sources."underscore-1.4.4"
-      sources."undici-types-6.20.0"
-      sources."universalify-2.0.1"
-      sources."untildify-4.0.0"
-      sources."uri-js-4.4.1"
-      sources."utf8-3.0.0"
-      sources."uuid-3.4.0"
-      sources."verror-1.10.0"
-      sources."web3-utils-1.10.4"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-module-2.0.1"
-      sources."wrap-ansi-6.2.0"
-      sources."y18n-4.0.3"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Fleek command line utilities";
-      homepage = "https://github.com/fleekhq/fleek-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   forever = nodeEnv.buildNodePackage {
     name = "forever";
     packageName = "forever";
@@ -49783,495 +35441,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  fx = nodeEnv.buildNodePackage {
-    name = "fx";
-    packageName = "fx";
-    version = "35.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fx/-/fx-35.0.0.tgz";
-      sha512 = "O07q+Lknrom5RUX/u53tjo2KTTLUnL0K703JbqMYb19ORijfJNvijzFqqYXEjdk25T9R14S6t6wHD8fCWXCM0g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Command-line JSON viewer";
-      homepage = "https://fx.wtf";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  gatsby-cli = nodeEnv.buildNodePackage {
-    name = "gatsby-cli";
-    packageName = "gatsby-cli";
-    version = "5.14.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.14.0.tgz";
-      sha512 = "NvsWsuZdpNRStmDsNZaYveifFrFqFNy4rnFCLAWWghyxUks8qhGwy6wrz2kcUK+Y2sRJJn1eIjgwzi1AyFn5fQ==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      sources."@babel/helper-annotate-as-pure-7.25.9"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      (
-        sources."@babel/helper-create-class-features-plugin-7.26.9"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/helper-member-expression-to-functions-7.25.9"
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-optimise-call-expression-7.25.9"
-      sources."@babel/helper-plugin-utils-7.26.5"
-      sources."@babel/helper-replace-supers-7.26.5"
-      sources."@babel/helper-skip-transparent-expression-wrappers-7.25.9"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/plugin-syntax-jsx-7.25.9"
-      sources."@babel/plugin-syntax-typescript-7.25.9"
-      sources."@babel/plugin-transform-modules-commonjs-7.26.3"
-      sources."@babel/plugin-transform-typescript-7.26.8"
-      sources."@babel/preset-typescript-7.26.0"
-      sources."@babel/runtime-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@hapi/hoek-9.3.0"
-      sources."@hapi/topo-5.1.0"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@lmdb/lmdb-darwin-arm64-2.5.3"
-      sources."@lmdb/lmdb-darwin-x64-2.5.3"
-      sources."@lmdb/lmdb-linux-arm-2.5.3"
-      sources."@lmdb/lmdb-linux-arm64-2.5.3"
-      sources."@lmdb/lmdb-linux-x64-2.5.3"
-      sources."@lmdb/lmdb-win32-x64-2.5.3"
-      sources."@sideway/address-4.1.5"
-      sources."@sideway/formula-3.0.1"
-      sources."@sideway/pinpoint-2.0.0"
-      sources."@sindresorhus/is-4.6.0"
-      sources."@szmarczak/http-timer-4.0.6"
-      sources."@tokenizer/token-0.3.0"
-      sources."@types/cacheable-request-6.0.3"
-      sources."@types/common-tags-1.8.4"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/keyv-3.1.4"
-      sources."@types/node-22.13.10"
-      sources."@types/responselike-1.0.3"
-      sources."@types/yoga-layout-1.9.2"
-      sources."abort-controller-3.0.0"
-      sources."ansi-align-3.0.1"
-      (
-        sources."ansi-escapes-4.3.2"
-        // {
-          dependencies = [
-            sources."type-fest-0.21.3"
-          ];
-        }
-      )
-      sources."ansi-regex-4.1.1"
-      sources."ansi-styles-4.3.0"
-      sources."base64-js-1.5.1"
-      sources."better-opn-2.1.1"
-      sources."boolbase-1.0.0"
-      sources."boxen-5.1.2"
-      sources."browserslist-4.24.4"
-      sources."buffer-6.0.3"
-      sources."cacheable-lookup-5.0.4"
-      (
-        sources."cacheable-request-7.0.4"
-        // {
-          dependencies = [
-            sources."get-stream-5.2.0"
-          ];
-        }
-      )
-      sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."ci-info-2.0.0"
-      sources."cli-boxes-2.2.1"
-      sources."cli-cursor-3.1.0"
-      sources."cli-width-3.0.0"
-      (
-        sources."clipboardy-4.0.0"
-        // {
-          dependencies = [
-            sources."execa-8.0.1"
-            sources."get-stream-8.0.1"
-            sources."human-signals-5.0.0"
-            sources."is-stream-3.0.0"
-            sources."is-wsl-3.1.0"
-            sources."mimic-fn-4.0.0"
-            sources."npm-run-path-5.3.0"
-            sources."onetime-6.0.0"
-            sources."path-key-4.0.0"
-            sources."signal-exit-4.1.0"
-            sources."strip-final-newline-3.0.0"
-          ];
-        }
-      )
-      (
-        sources."cliui-6.0.0"
-        // {
-          dependencies = [
-            sources."wrap-ansi-6.2.0"
-          ];
-        }
-      )
-      sources."clone-response-1.0.3"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."common-tags-1.8.2"
-      sources."configstore-5.0.1"
-      sources."convert-hrtime-3.0.0"
-      sources."convert-source-map-2.0.0"
-      sources."create-gatsby-3.14.0"
-      sources."cross-spawn-7.0.6"
-      sources."crypto-random-string-2.0.0"
-      sources."css-select-4.3.0"
-      sources."css-what-6.1.0"
-      sources."debug-4.4.0"
-      sources."decamelize-1.2.0"
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defer-to-connect-2.0.1"
-      sources."dom-converter-0.2.0"
-      sources."dom-serializer-1.4.1"
-      sources."domelementtype-2.3.0"
-      sources."domhandler-4.3.1"
-      sources."domutils-2.8.0"
-      sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.5.118"
-      sources."emoji-regex-8.0.0"
-      (
-        sources."encoding-0.1.13"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."end-of-stream-1.4.4"
-      sources."entities-2.2.0"
-      sources."envinfo-7.14.0"
-      sources."escalade-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."event-target-shim-5.0.1"
-      sources."events-3.3.0"
-      sources."execa-5.1.1"
-      sources."external-editor-3.1.0"
-      sources."fastq-1.19.1"
-      sources."figures-3.2.0"
-      sources."file-type-16.5.4"
-      sources."find-up-4.1.0"
-      sources."fs-exists-cached-1.0.0"
-      sources."fs-extra-11.3.0"
-      (
-        sources."gatsby-core-utils-4.14.0"
-        // {
-          dependencies = [
-            sources."tmp-0.2.3"
-          ];
-        }
-      )
-      sources."gensync-1.0.0-beta.2"
-      sources."get-caller-file-2.0.5"
-      sources."get-stream-6.0.1"
-      sources."globals-11.12.0"
-      sources."got-11.8.6"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."hash-wasm-4.12.0"
-      (
-        sources."hosted-git-info-3.0.8"
-        // {
-          dependencies = [
-            sources."lru-cache-6.0.0"
-            sources."yallist-4.0.0"
-          ];
-        }
-      )
-      sources."htmlparser2-6.1.0"
-      sources."http-cache-semantics-4.1.1"
-      sources."http2-wrapper-1.0.3"
-      sources."human-signals-2.1.0"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."import-from-4.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."inquirer-7.3.3"
-      sources."is-ci-2.0.0"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-1.0.0"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-2.0.1"
-      (
-        sources."is-inside-container-1.0.0"
-        // {
-          dependencies = [
-            sources."is-docker-3.0.0"
-          ];
-        }
-      )
-      sources."is-invalid-path-0.1.0"
-      sources."is-obj-2.0.0"
-      sources."is-stream-2.0.1"
-      sources."is-typedarray-1.0.0"
-      sources."is-valid-path-0.1.1"
-      sources."is-wsl-2.2.0"
-      sources."is64bit-2.0.0"
-      sources."isexe-2.0.0"
-      sources."joi-17.13.3"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json5-2.2.3"
-      sources."jsonfile-6.1.0"
-      sources."keyv-4.5.4"
-      sources."kleur-3.0.3"
-      sources."lmdb-2.5.3"
-      sources."locate-path-5.0.0"
-      sources."lock-1.1.0"
-      sources."lodash-4.17.21"
-      sources."lowercase-keys-2.0.0"
-      sources."lru-cache-5.1.1"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."merge-stream-2.0.0"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-1.0.1"
-      sources."ms-2.1.3"
-      sources."msgpackr-1.11.2"
-      sources."mute-stream-0.0.8"
-      sources."node-addon-api-4.3.0"
-      sources."node-fetch-2.7.0"
-      sources."node-gyp-build-optional-packages-5.0.3"
-      sources."node-object-hash-2.3.10"
-      sources."node-releases-2.0.19"
-      sources."normalize-url-6.1.0"
-      sources."npm-run-path-4.0.1"
-      sources."nth-check-2.1.1"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-7.4.2"
-      sources."opentracing-0.14.7"
-      sources."ordered-binary-1.5.3"
-      sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-2.1.1"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-4.0.0"
-      sources."path-key-3.1.1"
-      sources."peek-readable-4.1.0"
-      sources."picocolors-1.1.1"
-      sources."pretty-error-2.1.2"
-      sources."process-0.11.10"
-      sources."progress-2.0.3"
-      sources."prompts-2.4.2"
-      sources."proper-lockfile-4.1.2"
-      sources."pump-3.0.2"
-      sources."quick-lru-5.1.1"
-      sources."read-1.0.7"
-      sources."readable-stream-4.7.0"
-      sources."readable-web-to-node-stream-3.0.4"
-      sources."redux-4.2.1"
-      sources."regenerator-runtime-0.14.1"
-      (
-        sources."renderkid-2.0.7"
-        // {
-          dependencies = [
-            sources."ansi-regex-2.1.1"
-            sources."strip-ansi-3.0.1"
-          ];
-        }
-      )
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."resolve-alpn-1.2.1"
-      sources."resolve-cwd-3.0.0"
-      sources."resolve-from-5.0.0"
-      sources."responselike-2.0.1"
-      sources."restore-cursor-3.1.0"
-      sources."retry-0.12.0"
-      sources."reusify-1.1.0"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.7"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      sources."sisteransi-1.0.5"
-      sources."stack-trace-0.0.10"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      (
-        sources."strip-ansi-6.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-          ];
-        }
-      )
-      sources."strip-final-newline-2.0.0"
-      sources."strtok3-6.3.0"
-      sources."supports-color-7.2.0"
-      sources."system-architecture-0.1.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."token-types-4.2.1"
-      sources."tr46-0.0.3"
-      sources."tslib-1.14.1"
-      sources."type-fest-0.20.2"
-      sources."typedarray-to-buffer-3.1.5"
-      sources."undici-types-6.20.0"
-      sources."unique-string-2.0.0"
-      sources."universalify-2.0.1"
-      sources."update-browserslist-db-1.1.3"
-      sources."utila-0.4.0"
-      sources."weak-lru-cache-1.2.2"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      sources."which-module-2.0.1"
-      sources."widest-line-3.1.0"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
-      sources."xdg-basedir-4.0.0"
-      sources."y18n-4.0.3"
-      sources."yallist-3.1.1"
-      sources."yargs-15.4.1"
-      (
-        sources."yargs-parser-18.1.3"
-        // {
-          dependencies = [
-            sources."camelcase-5.3.1"
-          ];
-        }
-      )
-      sources."yoga-layout-prebuilt-1.10.0"
-      (
-        sources."yurnalist-2.1.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."chalk-2.4.2"
-            sources."color-convert-1.9.3"
-            sources."color-name-1.1.3"
-            sources."has-flag-3.0.0"
-            sources."strip-ansi-5.2.0"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Gatsby command-line interface for creating new sites and running Gatsby commands";
-      homepage = "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  "@gitbeaker/cli" = nodeEnv.buildNodePackage {
-    name = "_at_gitbeaker_slash_cli";
-    packageName = "@gitbeaker/cli";
-    version = "42.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-42.1.0.tgz";
-      sha512 = "+xKJs03M3Oh6k6mjTXvmyrNumMrOa8OIeJNxHOh8kJpVvmyFSFHVd6fldQhr3/mXDsKYxhPSh3qEhK8iJYej/w==";
-    };
-    dependencies = [
-      sources."@gitbeaker/core-42.1.0"
-      sources."@gitbeaker/requester-utils-42.1.0"
-      sources."@gitbeaker/rest-42.1.0"
-      sources."ansi-styles-4.3.0"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."chalk-4.1.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."dunder-proto-1.0.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."gopd-1.2.0"
-      sources."has-flag-4.0.0"
-      sources."has-symbols-1.1.0"
-      sources."hasown-2.0.2"
-      sources."math-intrinsics-1.1.0"
-      sources."object-inspect-1.13.4"
-      sources."picomatch-browser-2.2.6"
-      sources."qs-6.14.0"
-      sources."rate-limiter-flexible-4.0.1"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."supports-color-7.2.0"
-      sources."sywac-1.3.0"
-      sources."xcase-2.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CLI implementation of the GitLab API";
-      homepage = "https://github.com/jdalrymple/gitbeaker#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";
@@ -50365,172 +35534,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  gulp = nodeEnv.buildNodePackage {
-    name = "gulp";
-    packageName = "gulp";
-    version = "5.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz";
-      sha512 = "S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg==";
-    };
-    dependencies = [
-      sources."@gulpjs/messages-1.1.0"
-      sources."@gulpjs/to-absolute-glob-4.0.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."anymatch-3.1.3"
-      sources."array-each-1.0.1"
-      sources."array-slice-1.1.0"
-      sources."async-done-2.0.0"
-      sources."async-settle-2.0.0"
-      sources."b4a-1.6.7"
-      sources."bach-2.0.1"
-      sources."base64-js-1.5.1"
-      sources."binary-extensions-2.3.0"
-      sources."bl-5.1.0"
-      sources."braces-3.0.3"
-      sources."buffer-6.0.3"
-      sources."chalk-4.1.2"
-      (
-        sources."chokidar-3.6.0"
-        // {
-          dependencies = [
-            sources."glob-parent-5.1.2"
-          ];
-        }
-      )
-      sources."cliui-7.0.4"
-      sources."clone-2.1.2"
-      sources."clone-stats-1.0.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."convert-source-map-2.0.0"
-      sources."copy-props-4.0.0"
-      sources."detect-file-1.0.0"
-      sources."each-props-3.0.0"
-      sources."emoji-regex-8.0.0"
-      sources."end-of-stream-1.4.4"
-      sources."escalade-3.2.0"
-      sources."expand-tilde-2.0.2"
-      sources."extend-3.0.2"
-      sources."fast-fifo-1.3.2"
-      sources."fast-levenshtein-3.0.0"
-      sources."fastest-levenshtein-1.0.16"
-      sources."fastq-1.19.1"
-      sources."fill-range-7.1.1"
-      sources."findup-sync-5.0.0"
-      sources."fined-2.0.0"
-      sources."flagged-respawn-2.0.0"
-      sources."for-in-1.0.2"
-      sources."for-own-1.0.0"
-      sources."fs-mkdirp-stream-2.0.1"
-      sources."function-bind-1.1.2"
-      sources."get-caller-file-2.0.5"
-      sources."glob-parent-6.0.2"
-      sources."glob-stream-8.0.2"
-      sources."glob-watcher-6.0.0"
-      sources."global-modules-1.0.0"
-      sources."global-prefix-1.0.2"
-      sources."glogg-2.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."gulp-cli-3.0.0"
-      sources."gulplog-2.2.0"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."homedir-polyfill-1.0.3"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."interpret-3.1.1"
-      sources."is-absolute-1.0.0"
-      sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.16.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-negated-glob-1.0.0"
-      sources."is-number-7.0.0"
-      sources."is-plain-object-5.0.0"
-      sources."is-relative-1.0.0"
-      sources."is-unc-path-1.0.0"
-      sources."is-valid-glob-1.0.0"
-      sources."is-windows-1.0.2"
-      sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      sources."last-run-2.0.0"
-      sources."lead-4.0.0"
-      sources."liftoff-5.0.0"
-      sources."map-cache-0.2.2"
-      sources."micromatch-4.0.8"
-      sources."mute-stdout-2.0.0"
-      sources."normalize-path-3.0.0"
-      sources."now-and-later-3.0.0"
-      sources."object.defaults-1.1.0"
-      sources."object.pick-1.3.0"
-      sources."once-1.4.0"
-      sources."parse-filepath-1.0.2"
-      sources."parse-passwd-1.0.0"
-      sources."path-parse-1.0.7"
-      sources."path-root-0.1.1"
-      sources."path-root-regex-0.1.2"
-      sources."picomatch-2.3.1"
-      sources."readable-stream-3.6.2"
-      sources."readdirp-3.6.0"
-      sources."rechoir-0.8.0"
-      sources."remove-trailing-separator-1.1.0"
-      sources."replace-ext-2.0.0"
-      sources."replace-homedir-2.0.0"
-      sources."require-directory-2.1.1"
-      sources."resolve-1.22.10"
-      sources."resolve-dir-1.0.1"
-      sources."resolve-options-2.0.0"
-      sources."reusify-1.1.0"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-6.3.1"
-      sources."semver-greatest-satisfied-range-2.0.0"
-      sources."sparkles-2.1.0"
-      sources."stream-composer-1.0.2"
-      sources."stream-exhaust-1.0.2"
-      sources."streamx-2.22.0"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."sver-1.8.4"
-      sources."teex-1.0.1"
-      sources."text-decoder-1.2.3"
-      sources."to-regex-range-5.0.1"
-      sources."to-through-3.0.0"
-      sources."unc-path-regex-0.1.2"
-      sources."undertaker-2.0.0"
-      sources."undertaker-registry-2.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."v8flags-4.0.1"
-      sources."value-or-function-4.0.0"
-      sources."vinyl-3.0.0"
-      sources."vinyl-contents-2.0.0"
-      sources."vinyl-fs-4.0.0"
-      sources."vinyl-sourcemap-2.0.0"
-      sources."which-1.3.1"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."y18n-5.0.8"
-      sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Streaming build system for JavaScript";
-      homepage = "https://gulpjs.com";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   gulp-cli = nodeEnv.buildNodePackage {
     name = "gulp-cli";
     packageName = "gulp-cli";
@@ -50741,1391 +35744,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  joplin = nodeEnv.buildNodePackage {
-    name = "joplin";
-    packageName = "joplin";
-    version = "3.2.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-3.2.3.tgz";
-      sha512 = "oLS5oJasAF7Q1fRBbHjucRlgmKis5RMln/a+vQJlAXjPfXdajN53EPz5Z28Iw+ahZArtMfiy4UKPvftVVqnjnQ==";
-    };
-    dependencies = [
-      sources."@adobe/css-tools-4.4.0"
-      (
-        sources."@asamuzakjp/css-color-3.1.1"
-        // {
-          dependencies = [
-            sources."lru-cache-10.4.3"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/crc32-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/crc32c-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/ie11-detection-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha1-browser-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-browser-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-js-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/supports-web-crypto-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/util-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      sources."@aws-sdk/abort-controller-3.296.0"
-      sources."@aws-sdk/chunked-blob-reader-3.295.0"
-      sources."@aws-sdk/chunked-blob-reader-native-3.295.0"
-      (
-        sources."@aws-sdk/client-s3-3.296.0"
-        // {
-          dependencies = [
-            sources."fast-xml-parser-4.1.2"
-          ];
-        }
-      )
-      sources."@aws-sdk/client-sso-3.296.0"
-      sources."@aws-sdk/client-sso-oidc-3.296.0"
-      (
-        sources."@aws-sdk/client-sts-3.296.0"
-        // {
-          dependencies = [
-            sources."fast-xml-parser-4.1.2"
-          ];
-        }
-      )
-      sources."@aws-sdk/config-resolver-3.296.0"
-      (
-        sources."@aws-sdk/core-3.758.0"
-        // {
-          dependencies = [
-            sources."@aws-sdk/types-3.734.0"
-            sources."fast-xml-parser-4.4.1"
-          ];
-        }
-      )
-      sources."@aws-sdk/credential-provider-env-3.296.0"
-      sources."@aws-sdk/credential-provider-imds-3.296.0"
-      sources."@aws-sdk/credential-provider-ini-3.296.0"
-      sources."@aws-sdk/credential-provider-node-3.296.0"
-      sources."@aws-sdk/credential-provider-process-3.296.0"
-      sources."@aws-sdk/credential-provider-sso-3.296.0"
-      sources."@aws-sdk/credential-provider-web-identity-3.296.0"
-      (
-        sources."@aws-sdk/crt-loader-3.758.0"
-        // {
-          dependencies = [
-            sources."@aws-sdk/middleware-user-agent-3.758.0"
-            sources."@aws-sdk/types-3.734.0"
-            sources."@aws-sdk/util-endpoints-3.743.0"
-            sources."@aws-sdk/util-user-agent-node-3.758.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/eventstream-codec-3.296.0"
-      sources."@aws-sdk/eventstream-serde-browser-3.296.0"
-      sources."@aws-sdk/eventstream-serde-config-resolver-3.296.0"
-      sources."@aws-sdk/eventstream-serde-node-3.296.0"
-      sources."@aws-sdk/eventstream-serde-universal-3.296.0"
-      sources."@aws-sdk/fetch-http-handler-3.296.0"
-      sources."@aws-sdk/hash-blob-browser-3.296.0"
-      sources."@aws-sdk/hash-node-3.296.0"
-      sources."@aws-sdk/hash-stream-node-3.296.0"
-      sources."@aws-sdk/invalid-dependency-3.296.0"
-      sources."@aws-sdk/is-array-buffer-3.295.0"
-      sources."@aws-sdk/md5-js-3.296.0"
-      sources."@aws-sdk/middleware-bucket-endpoint-3.296.0"
-      sources."@aws-sdk/middleware-content-length-3.296.0"
-      sources."@aws-sdk/middleware-endpoint-3.296.0"
-      sources."@aws-sdk/middleware-expect-continue-3.296.0"
-      sources."@aws-sdk/middleware-flexible-checksums-3.296.0"
-      sources."@aws-sdk/middleware-host-header-3.296.0"
-      sources."@aws-sdk/middleware-location-constraint-3.296.0"
-      sources."@aws-sdk/middleware-logger-3.296.0"
-      sources."@aws-sdk/middleware-recursion-detection-3.296.0"
-      (
-        sources."@aws-sdk/middleware-retry-3.296.0"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-sdk-s3-3.296.0"
-      sources."@aws-sdk/middleware-sdk-sts-3.296.0"
-      sources."@aws-sdk/middleware-serde-3.296.0"
-      sources."@aws-sdk/middleware-signing-3.296.0"
-      sources."@aws-sdk/middleware-ssec-3.296.0"
-      sources."@aws-sdk/middleware-stack-3.296.0"
-      sources."@aws-sdk/middleware-user-agent-3.296.0"
-      sources."@aws-sdk/node-config-provider-3.296.0"
-      sources."@aws-sdk/node-http-handler-3.296.0"
-      sources."@aws-sdk/property-provider-3.296.0"
-      sources."@aws-sdk/protocol-http-3.296.0"
-      sources."@aws-sdk/querystring-builder-3.296.0"
-      sources."@aws-sdk/querystring-parser-3.296.0"
-      sources."@aws-sdk/s3-request-presigner-3.296.0"
-      sources."@aws-sdk/service-error-classification-3.296.0"
-      sources."@aws-sdk/shared-ini-file-loader-3.296.0"
-      sources."@aws-sdk/signature-v4-3.296.0"
-      (
-        sources."@aws-sdk/signature-v4-crt-3.758.0"
-        // {
-          dependencies = [
-            sources."@aws-sdk/middleware-sdk-s3-3.758.0"
-            sources."@aws-sdk/signature-v4-multi-region-3.758.0"
-            sources."@aws-sdk/types-3.734.0"
-            sources."@aws-sdk/util-arn-parser-3.723.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/signature-v4-multi-region-3.296.0"
-      sources."@aws-sdk/smithy-client-3.296.0"
-      sources."@aws-sdk/token-providers-3.296.0"
-      sources."@aws-sdk/types-3.296.0"
-      sources."@aws-sdk/url-parser-3.296.0"
-      sources."@aws-sdk/util-arn-parser-3.295.0"
-      sources."@aws-sdk/util-base64-3.295.0"
-      sources."@aws-sdk/util-body-length-browser-3.295.0"
-      sources."@aws-sdk/util-body-length-node-3.295.0"
-      sources."@aws-sdk/util-buffer-from-3.295.0"
-      sources."@aws-sdk/util-config-provider-3.295.0"
-      sources."@aws-sdk/util-create-request-3.296.0"
-      sources."@aws-sdk/util-defaults-mode-browser-3.296.0"
-      sources."@aws-sdk/util-defaults-mode-node-3.296.0"
-      sources."@aws-sdk/util-endpoints-3.296.0"
-      sources."@aws-sdk/util-format-url-3.296.0"
-      sources."@aws-sdk/util-hex-encoding-3.295.0"
-      sources."@aws-sdk/util-locate-window-3.723.0"
-      sources."@aws-sdk/util-middleware-3.296.0"
-      sources."@aws-sdk/util-retry-3.296.0"
-      sources."@aws-sdk/util-stream-browser-3.296.0"
-      sources."@aws-sdk/util-stream-node-3.296.0"
-      sources."@aws-sdk/util-uri-escape-3.295.0"
-      sources."@aws-sdk/util-user-agent-browser-3.296.0"
-      sources."@aws-sdk/util-user-agent-node-3.296.0"
-      sources."@aws-sdk/util-utf8-3.295.0"
-      sources."@aws-sdk/util-utf8-browser-3.259.0"
-      sources."@aws-sdk/util-waiter-3.296.0"
-      sources."@aws-sdk/xml-builder-3.295.0"
-      sources."@babel/runtime-7.26.10"
-      sources."@cronvel/get-pixels-3.4.1"
-      sources."@csstools/color-helpers-5.0.2"
-      sources."@csstools/css-calc-2.1.2"
-      sources."@csstools/css-color-parser-3.0.8"
-      sources."@csstools/css-parser-algorithms-3.0.4"
-      sources."@csstools/css-tokenizer-3.0.3"
-      sources."@gar/promisify-1.1.3"
-      sources."@httptoolkit/websocket-stream-6.0.1"
-      (
-        sources."@isaacs/cliui-8.0.2"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-          ];
-        }
-      )
-      sources."@joplin/fork-htmlparser2-4.1.57"
-      sources."@joplin/fork-sax-1.2.61"
-      sources."@joplin/fork-uslug-1.0.22"
-      sources."@joplin/htmlpack-3.2.5"
-      sources."@joplin/lib-3.2.5"
-      sources."@joplin/onenote-converter-3.2.5"
-      sources."@joplin/renderer-3.2.5"
-      sources."@joplin/turndown-4.0.79"
-      sources."@joplin/turndown-plugin-gfm-1.0.61"
-      (
-        sources."@joplin/utils-3.2.5"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."glob-10.4.5"
-            sources."minimatch-9.0.5"
-            sources."minipass-7.1.2"
-          ];
-        }
-      )
-      (
-        sources."@mapbox/node-pre-gyp-1.0.11"
-        // {
-          dependencies = [
-            sources."agent-base-6.0.2"
-            sources."https-proxy-agent-5.0.1"
-          ];
-        }
-      )
-      sources."@npmcli/fs-1.1.1"
-      sources."@npmcli/move-file-1.1.2"
-      sources."@smithy/abort-controller-4.0.1"
-      sources."@smithy/core-3.1.5"
-      sources."@smithy/fetch-http-handler-5.0.1"
-      sources."@smithy/is-array-buffer-4.0.0"
-      sources."@smithy/middleware-endpoint-4.0.6"
-      sources."@smithy/middleware-serde-4.0.2"
-      sources."@smithy/middleware-stack-4.0.1"
-      sources."@smithy/node-config-provider-4.0.1"
-      sources."@smithy/node-http-handler-4.0.3"
-      sources."@smithy/property-provider-4.0.1"
-      sources."@smithy/protocol-http-5.0.1"
-      sources."@smithy/querystring-builder-4.0.1"
-      sources."@smithy/querystring-parser-4.0.1"
-      sources."@smithy/shared-ini-file-loader-4.0.1"
-      sources."@smithy/signature-v4-5.0.1"
-      sources."@smithy/smithy-client-4.1.6"
-      sources."@smithy/types-4.1.0"
-      sources."@smithy/url-parser-4.0.1"
-      sources."@smithy/util-base64-4.0.0"
-      sources."@smithy/util-body-length-browser-4.0.0"
-      sources."@smithy/util-buffer-from-4.0.0"
-      sources."@smithy/util-config-provider-4.0.0"
-      sources."@smithy/util-endpoints-3.0.1"
-      sources."@smithy/util-hex-encoding-4.0.0"
-      sources."@smithy/util-middleware-4.0.1"
-      sources."@smithy/util-stream-4.1.2"
-      sources."@smithy/util-uri-escape-4.0.0"
-      sources."@smithy/util-utf8-4.0.0"
-      sources."@tokenizer/token-0.3.0"
-      sources."@tootallnate/once-1.1.2"
-      sources."@types/nanoid-3.0.0"
-      sources."@types/node-22.13.10"
-      sources."@types/ws-8.18.0"
-      sources."abbrev-1.1.1"
-      sources."abort-controller-3.0.0"
-      sources."adm-zip-0.5.16"
-      sources."agent-base-7.1.3"
-      sources."agentkeepalive-4.6.0"
-      sources."aggregate-error-3.1.0"
-      sources."ajv-6.12.6"
-      (
-        sources."ansi-escape-sequences-4.1.0"
-        // {
-          dependencies = [
-            sources."array-back-3.1.0"
-          ];
-        }
-      )
-      sources."ansi-regex-3.0.1"
-      sources."ansi-styles-6.2.1"
-      sources."anymatch-3.1.3"
-      sources."aproba-2.0.0"
-      (
-        sources."are-we-there-yet-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."argparse-2.0.1"
-      sources."array-back-2.0.0"
-      sources."asap-2.0.6"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-mutex-0.5.0"
-      sources."asynckit-0.4.0"
-      sources."available-typed-arrays-1.0.7"
-      sources."aws-crt-1.26.2"
-      (
-        sources."aws-sdk-2.1340.0"
-        // {
-          dependencies = [
-            sources."buffer-4.9.2"
-            sources."ieee754-1.1.13"
-            sources."sax-1.2.1"
-            sources."uuid-8.0.0"
-            sources."xml2js-0.4.19"
-            sources."xmlbuilder-9.0.7"
-          ];
-        }
-      )
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."axios-1.8.3"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."base64-stream-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.3.0"
-      (
-        sources."bl-4.1.0"
-        // {
-          dependencies = [
-            sources."buffer-5.7.1"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."bowser-2.11.0"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."buffer-6.0.3"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."builtin-modules-3.3.0"
-      (
-        sources."cacache-15.3.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."camel-case-3.0.0"
-      sources."camelcase-4.1.0"
-      sources."canvas-2.11.2"
-      sources."caseless-0.12.0"
-      (
-        sources."chalk-4.1.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."color-convert-2.0.1"
-          ];
-        }
-      )
-      sources."charenc-0.0.2"
-      sources."chokidar-3.6.0"
-      sources."chownr-2.0.0"
-      sources."chroma-js-2.6.0"
-      sources."clean-css-4.2.4"
-      sources."clean-stack-2.2.0"
-      (
-        sources."cliss-0.0.2"
-        // {
-          dependencies = [
-            sources."strip-ansi-4.0.0"
-            sources."yargs-parser-7.0.0"
-          ];
-        }
-      )
-      sources."color-3.2.1"
-      (
-        sources."color-convert-1.9.3"
-        // {
-          dependencies = [
-            sources."color-name-1.1.3"
-          ];
-        }
-      )
-      sources."color-name-1.1.4"
-      sources."color-string-1.9.1"
-      sources."color-support-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."command-line-usage-4.1.0"
-      sources."commander-2.20.3"
-      sources."commist-1.1.0"
-      sources."compare-version-0.1.2"
-      sources."compare-versions-6.1.1"
-      sources."concat-map-0.0.1"
-      (
-        sources."concat-stream-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."console-control-strings-1.1.0"
-      sources."core-util-is-1.0.3"
-      sources."cross-spawn-7.0.6"
-      sources."crypt-0.0.2"
-      sources."crypto-js-4.2.0"
-      (
-        sources."cssstyle-4.3.0"
-        // {
-          dependencies = [
-            sources."rrweb-cssom-0.8.0"
-          ];
-        }
-      )
-      sources."cwise-compiler-1.1.3"
-      sources."dashdash-1.14.1"
-      sources."data-urls-5.0.0"
-      sources."datauri-4.1.0"
-      sources."dayjs-1.11.12"
-      sources."debug-4.4.0"
-      sources."decimal.js-10.5.0"
-      sources."decode-uri-component-0.2.2"
-      sources."decompress-response-4.2.1"
-      sources."deep-extend-0.6.0"
-      sources."deep-is-0.1.4"
-      sources."deepmerge-2.2.1"
-      sources."define-data-property-1.1.4"
-      sources."define-lazy-prop-2.0.0"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."depd-1.1.2"
-      sources."detect-libc-2.0.3"
-      sources."diff-match-patch-1.0.5"
-      (
-        sources."dom-serializer-2.0.0"
-        // {
-          dependencies = [
-            sources."entities-4.5.0"
-          ];
-        }
-      )
-      sources."domelementtype-2.3.0"
-      sources."domhandler-5.0.3"
-      sources."domutils-3.1.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexify-3.7.1"
-      sources."eastasianwidth-0.2.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-8.0.0"
-      (
-        sources."emphasize-1.5.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-2.1.1"
-            sources."ansi-styles-2.2.1"
-            sources."chalk-1.1.3"
-            sources."highlight.js-9.12.0"
-            sources."strip-ansi-3.0.1"
-            sources."supports-color-2.0.0"
-          ];
-        }
-      )
-      sources."encoding-0.1.13"
-      sources."end-of-stream-1.4.4"
-      sources."entities-2.2.0"
-      sources."env-paths-2.2.1"
-      sources."err-code-2.0.3"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."event-target-shim-5.0.1"
-      sources."events-1.1.1"
-      sources."execa-5.1.1"
-      sources."expand-template-2.0.3"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-xml-parser-3.21.1"
-      sources."fault-1.0.4"
-      sources."file-type-16.5.4"
-      sources."fill-range-7.1.1"
-      sources."filter-obj-1.1.0"
-      sources."find-up-2.1.0"
-      sources."follow-redirects-1.15.6"
-      sources."font-awesome-filetypes-2.1.0"
-      sources."for-each-0.3.5"
-      sources."for-each-property-0.0.4"
-      sources."for-each-property-deep-0.0.3"
-      (
-        sources."foreground-child-3.3.1"
-        // {
-          dependencies = [
-            sources."signal-exit-4.1.0"
-          ];
-        }
-      )
-      sources."forever-agent-0.6.1"
-      sources."form-data-4.0.0"
-      sources."format-0.2.2"
-      sources."fs-constants-1.0.0"
-      (
-        sources."fs-extra-11.2.0"
-        // {
-          dependencies = [
-            sources."jsonfile-6.1.0"
-            sources."universalify-2.0.1"
-          ];
-        }
-      )
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."gauge-3.0.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-prototype-chain-1.0.1"
-      sources."get-stdin-5.0.1"
-      sources."get-stream-6.0.1"
-      sources."getpass-0.1.7"
-      sources."github-from-package-0.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."growly-1.3.0"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      (
-        sources."has-ansi-2.0.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-2.1.1"
-          ];
-        }
-      )
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."has-unicode-2.0.1"
-      sources."hasown-2.0.2"
-      sources."he-1.2.0"
-      (
-        sources."help-me-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."highlight.js-11.10.0"
-      sources."hpagent-1.2.0"
-      sources."html-encoding-sniffer-4.0.0"
-      sources."html-entities-1.4.0"
-      sources."html-minifier-4.0.0"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-errors-1.8.1"
-      sources."http-proxy-agent-7.0.2"
-      sources."http-signature-1.2.0"
-      sources."https-proxy-agent-7.0.6"
-      sources."human-signals-2.1.0"
-      sources."humanize-ms-1.2.1"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      (
-        sources."image-data-uri-2.0.1"
-        // {
-          dependencies = [
-            sources."fs-extra-0.26.7"
-            sources."rimraf-2.7.1"
-          ];
-        }
-      )
-      sources."image-size-1.0.0"
-      sources."immer-7.0.15"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."infer-owner-1.0.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      (
-        sources."inspect-function-0.2.2"
-        // {
-          dependencies = [
-            sources."split-skip-0.0.1"
-          ];
-        }
-      )
-      (
-        sources."inspect-parameters-declaration-0.0.9"
-        // {
-          dependencies = [
-            sources."magicli-0.0.5"
-          ];
-        }
-      )
-      (
-        sources."inspect-property-0.0.6"
-        // {
-          dependencies = [
-            sources."inspect-function-0.3.4"
-            (
-              sources."inspect-parameters-declaration-0.0.8"
-              // {
-                dependencies = [
-                  sources."split-skip-0.0.2"
-                ];
-              }
-            )
-            (
-              sources."magicli-0.0.5"
-              // {
-                dependencies = [
-                  sources."inspect-function-0.2.2"
-                ];
-              }
-            )
-            sources."split-skip-0.0.1"
-          ];
-        }
-      )
-      sources."iota-array-1.0.0"
-      (
-        sources."ip-address-9.0.5"
-        // {
-          dependencies = [
-            sources."jsbn-1.1.0"
-          ];
-        }
-      )
-      sources."ip-regex-4.3.0"
-      sources."is-arguments-1.2.0"
-      sources."is-arrayish-0.3.2"
-      sources."is-binary-path-2.1.0"
-      sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.7"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-generator-function-1.1.0"
-      sources."is-glob-4.0.3"
-      sources."is-lambda-1.0.1"
-      sources."is-number-7.0.0"
-      sources."is-potential-custom-element-name-1.0.1"
-      sources."is-regex-1.2.1"
-      sources."is-stream-2.0.1"
-      sources."is-typed-array-1.1.15"
-      sources."is-typedarray-1.0.0"
-      sources."is-url-1.2.4"
-      sources."is-wsl-2.2.0"
-      sources."is2-2.0.9"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."isobject-2.1.0"
-      sources."isomorphic-ws-4.0.1"
-      sources."isstream-0.1.2"
-      sources."jackspeak-3.4.3"
-      sources."jmespath-0.16.0"
-      sources."jpeg-js-0.4.4"
-      sources."js-sdsl-4.3.0"
-      sources."js-yaml-4.1.0"
-      sources."jsbn-0.1.1"
-      sources."jsdom-24.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-2.4.0"
-      sources."jsprim-1.4.2"
-      (
-        sources."katex-0.16.11"
-        // {
-          dependencies = [
-            sources."commander-8.3.0"
-          ];
-        }
-      )
-      sources."keytar-7.9.0"
-      sources."klaw-1.3.1"
-      sources."lazyness-1.2.0"
-      sources."leven-2.1.0"
-      sources."linkify-it-4.0.1"
-      sources."locate-path-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.padend-4.6.1"
-      sources."lodash.repeat-4.1.0"
-      sources."lower-case-1.1.4"
-      (
-        sources."lowlight-1.9.2"
-        // {
-          dependencies = [
-            sources."highlight.js-9.12.0"
-          ];
-        }
-      )
-      sources."lru-cache-6.0.0"
-      sources."magicli-0.0.8"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      (
-        sources."make-fetch-happen-9.1.0"
-        // {
-          dependencies = [
-            sources."agent-base-6.0.2"
-            sources."http-proxy-agent-4.0.1"
-            sources."https-proxy-agent-5.0.1"
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."markdown-it-13.0.2"
-        // {
-          dependencies = [
-            sources."entities-3.0.1"
-          ];
-        }
-      )
-      sources."markdown-it-abbr-1.0.4"
-      sources."markdown-it-anchor-5.3.0"
-      sources."markdown-it-deflist-2.1.0"
-      sources."markdown-it-emoji-2.0.2"
-      sources."markdown-it-expand-tabs-1.0.13"
-      sources."markdown-it-footnote-3.0.3"
-      sources."markdown-it-ins-4.0.0"
-      sources."markdown-it-mark-3.0.1"
-      sources."markdown-it-multimd-table-4.2.3"
-      sources."markdown-it-sub-1.0.0"
-      sources."markdown-it-sup-2.0.0"
-      sources."markdown-it-toc-done-right-4.2.0"
-      sources."math-intrinsics-1.1.0"
-      sources."md5-2.3.0"
-      sources."md5-file-5.0.0"
-      sources."mdurl-1.0.1"
-      sources."merge-stream-2.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimer-2.0.2"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-2.1.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (
-        sources."minipass-collect-1.0.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-fetch-1.4.1"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-flush-1.0.5"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-pipeline-1.2.4"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-sized-1.0.3"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."mkdirp-classic-0.5.3"
-      sources."moment-2.30.1"
-      (
-        sources."mqtt-4.3.8"
-        // {
-          dependencies = [
-            sources."duplexify-4.1.3"
-            sources."readable-stream-3.6.2"
-            sources."utf-8-validate-5.0.10"
-            sources."ws-7.5.10"
-          ];
-        }
-      )
-      sources."mqtt-packet-6.10.0"
-      sources."ms-2.1.3"
-      sources."multiparty-4.2.3"
-      sources."mustache-4.2.0"
-      sources."nan-2.22.2"
-      sources."nanoid-3.3.7"
-      sources."napi-build-utils-2.0.0"
-      sources."ndarray-1.0.19"
-      sources."ndarray-pack-1.2.1"
-      sources."negotiator-0.6.4"
-      sources."nextgen-events-1.5.3"
-      sources."no-case-2.3.2"
-      sources."node-abi-3.74.0"
-      sources."node-addon-api-4.3.0"
-      sources."node-bitmap-0.0.1"
-      sources."node-emoji-1.11.0"
-      (
-        sources."node-fetch-2.6.7"
-        // {
-          dependencies = [
-            sources."tr46-0.0.3"
-            sources."webidl-conversions-3.0.1"
-            sources."whatwg-url-5.0.0"
-          ];
-        }
-      )
-      (
-        sources."node-gyp-8.4.1"
-        // {
-          dependencies = [
-            sources."are-we-there-yet-3.0.1"
-            sources."gauge-4.0.4"
-            sources."npmlog-6.0.2"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."node-gyp-build-4.8.4"
-      (
-        sources."node-notifier-10.0.1"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."node-persist-3.1.3"
-      sources."node-rsa-1.1.1"
-      sources."nopt-5.0.0"
-      sources."normalize-path-3.0.0"
-      sources."npm-run-path-4.0.1"
-      sources."npmlog-5.0.1"
-      sources."number-allocator-1.0.14"
-      sources."nwsapi-2.2.18"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      (
-        sources."object-to-arguments-0.0.8"
-        // {
-          dependencies = [
-            sources."inspect-parameters-declaration-0.0.10"
-            sources."magicli-0.0.5"
-          ];
-        }
-      )
-      sources."omggif-1.0.10"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-8.4.2"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-map-4.0.0"
-      sources."p-try-1.0.0"
-      sources."package-json-from-dist-1.0.1"
-      sources."param-case-2.1.1"
-      (
-        sources."parse5-7.2.1"
-        // {
-          dependencies = [
-            sources."entities-4.5.0"
-          ];
-        }
-      )
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      (
-        sources."path-scurry-1.11.1"
-        // {
-          dependencies = [
-            sources."lru-cache-10.4.3"
-          ];
-        }
-      )
-      sources."peek-readable-4.1.0"
-      sources."performance-now-2.1.0"
-      sources."picomatch-2.3.1"
-      sources."pipe-functions-1.3.0"
-      sources."pngjs-6.0.0"
-      sources."possible-typed-array-names-1.1.0"
-      (
-        sources."prebuild-install-7.1.3"
-        // {
-          dependencies = [
-            sources."decompress-response-6.0.0"
-            sources."mimic-response-3.1.0"
-            sources."simple-get-4.0.1"
-          ];
-        }
-      )
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."promise-8.3.0"
-      sources."promise-inflight-1.0.1"
-      sources."promise-retry-2.0.1"
-      sources."proper-lockfile-4.1.2"
-      sources."proxy-from-env-1.1.0"
-      sources."psl-1.15.0"
-      sources."pump-3.0.2"
-      sources."punycode-2.3.1"
-      sources."qs-6.5.3"
-      sources."query-string-7.1.3"
-      sources."querystring-0.2.0"
-      sources."querystringify-2.2.0"
-      sources."queue-6.0.2"
-      sources."random-bytes-1.0.0"
-      sources."rc-1.2.8"
-      sources."re-reselect-4.0.1"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      (
-        sources."readable-web-to-node-stream-3.0.4"
-        // {
-          dependencies = [
-            sources."events-3.3.0"
-            sources."readable-stream-4.7.0"
-            sources."string_decoder-1.3.0"
-          ];
-        }
-      )
-      sources."readdirp-3.6.0"
-      sources."reduce-flatten-1.0.1"
-      sources."redux-4.2.1"
-      sources."regenerator-runtime-0.14.1"
-      sources."reinterval-1.1.0"
-      sources."relateurl-0.2.7"
-      sources."relative-3.0.2"
-      (
-        sources."request-2.88.2"
-        // {
-          dependencies = [
-            sources."form-data-2.3.3"
-            sources."tough-cookie-2.5.0"
-            sources."uuid-3.4.0"
-          ];
-        }
-      )
-      sources."requires-port-1.0.0"
-      sources."reselect-4.1.8"
-      sources."retry-0.12.0"
-      sources."rfdc-1.4.1"
-      sources."rimraf-3.0.2"
-      sources."rrweb-cssom-0.7.1"
-      sources."safe-buffer-5.2.1"
-      sources."safe-regex-test-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.4.1"
-      sources."saxes-6.0.0"
-      sources."semver-7.7.1"
-      sources."server-destroy-1.0.1"
-      sources."set-blocking-2.0.0"
-      sources."set-function-length-1.2.2"
-      sources."setimmediate-1.0.5"
-      sources."setprototypeof-1.2.0"
-      sources."seventh-0.9.2"
-      (
-        sources."sharp-0.33.4"
-        // {
-          dependencies = [
-            sources."color-4.2.3"
-            sources."color-convert-2.0.1"
-          ];
-        }
-      )
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."shellwords-0.1.1"
-      sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-3.1.1"
-      sources."simple-swizzle-0.2.2"
-      (
-        sources."slice-ansi-1.0.0"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-2.0.0"
-          ];
-        }
-      )
-      sources."smart-buffer-4.2.0"
-      sources."socks-2.8.4"
-      (
-        sources."socks-proxy-agent-6.2.1"
-        // {
-          dependencies = [
-            sources."agent-base-6.0.2"
-          ];
-        }
-      )
-      sources."source-map-0.6.1"
-      sources."split-on-first-1.1.0"
-      sources."split-skip-0.0.2"
-      (
-        sources."split2-3.2.2"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."sprintf-js-1.1.3"
-      sources."sqlite3-5.1.6"
-      sources."sshpk-1.18.0"
-      (
-        sources."ssri-8.0.1"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."statuses-1.5.0"
-      sources."stream-shift-1.0.3"
-      sources."strict-uri-encode-2.0.0"
-      sources."string-kit-0.18.3"
-      sources."string-padding-1.0.2"
-      (
-        sources."string-to-stream-3.0.1"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."string-width-4.2.3"
-      sources."string-width-cjs-4.2.3"
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      (
-        sources."stringify-parameters-0.0.4"
-        // {
-          dependencies = [
-            sources."magicli-0.0.5"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-6.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-cjs-6.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-          ];
-        }
-      )
-      sources."strip-final-newline-2.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."strnum-1.1.2"
-      sources."strtok3-6.3.0"
-      sources."supports-color-7.2.0"
-      sources."symbol-tree-3.2.4"
-      sources."table-layout-0.4.5"
-      sources."tar-6.2.1"
-      (
-        sources."tar-fs-2.1.2"
-        // {
-          dependencies = [
-            sources."chownr-1.1.4"
-          ];
-        }
-      )
-      (
-        sources."tar-stream-2.2.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      (
-        sources."tcp-port-used-1.0.2"
-        // {
-          dependencies = [
-            sources."debug-4.3.1"
-            sources."ms-2.1.2"
-          ];
-        }
-      )
-      sources."terminal-kit-3.1.1"
-      (
-        sources."tkwidgets-0.5.27"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."chalk-2.4.2"
-            sources."has-flag-3.0.0"
-            sources."is-fullwidth-code-point-2.0.0"
-            sources."seventh-0.7.40"
-            sources."string-kit-0.11.10"
-            sources."string-width-2.1.1"
-            sources."strip-ansi-4.0.0"
-            sources."supports-color-5.5.0"
-            sources."terminal-kit-1.49.4"
-            sources."tree-kit-0.7.5"
-            sources."wrap-ansi-3.0.1"
-          ];
-        }
-      )
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.1"
-      sources."token-types-4.2.1"
-      sources."tough-cookie-4.1.4"
-      sources."tr46-5.0.0"
-      sources."tree-kit-0.8.8"
-      sources."tslib-2.8.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."typedarray-0.0.6"
-      sources."typical-2.6.1"
-      sources."uc.micro-1.0.6"
-      sources."uglify-js-3.19.3"
-      sources."uglifycss-0.0.29"
-      sources."uid-safe-2.1.5"
-      sources."undici-types-6.20.0"
-      sources."uniq-1.0.1"
-      sources."unique-filename-1.1.1"
-      sources."unique-slug-2.0.2"
-      sources."universalify-0.2.0"
-      sources."unorm-1.6.0"
-      sources."unpack-string-0.0.2"
-      sources."upper-case-1.1.3"
-      sources."uri-js-4.4.1"
-      (
-        sources."url-0.10.3"
-        // {
-          dependencies = [
-            sources."punycode-1.3.2"
-          ];
-        }
-      )
-      sources."url-parse-1.5.10"
-      sources."utf-8-validate-6.0.5"
-      sources."util-0.12.5"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-9.0.1"
-      (
-        sources."verror-1.10.0"
-        // {
-          dependencies = [
-            sources."core-util-is-1.0.2"
-          ];
-        }
-      )
-      sources."w3c-xmlserializer-5.0.0"
-      sources."webidl-conversions-7.0.0"
-      sources."whatwg-encoding-3.1.1"
-      sources."whatwg-mimetype-4.0.0"
-      sources."whatwg-url-14.1.1"
-      sources."which-2.0.2"
-      sources."which-typed-array-1.1.19"
-      sources."wide-align-1.1.5"
-      sources."word-wrap-1.2.5"
-      sources."wordwrapjs-3.0.0"
-      (
-        sources."wrap-ansi-8.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-          ];
-        }
-      )
-      (
-        sources."wrap-ansi-cjs-7.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."color-convert-2.0.1"
-          ];
-        }
-      )
-      sources."wrappy-1.0.2"
-      sources."ws-8.18.1"
-      sources."xml-name-validator-5.0.0"
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."xmlchars-2.2.0"
-      sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Joplin CLI Client";
-      homepage = "https://github.com/laurent22/joplin#readme";
-      license = "AGPL-3.0-or-later";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  js-beautify = nodeEnv.buildNodePackage {
-    name = "js-beautify";
-    packageName = "js-beautify";
-    version = "1.15.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz";
-      sha512 = "9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==";
-    };
-    dependencies = [
-      sources."@isaacs/cliui-8.0.2"
-      sources."@one-ini/wasm-0.1.1"
-      sources."abbrev-2.0.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-6.2.1"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-2.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-10.0.1"
-      sources."config-chain-1.1.13"
-      sources."cross-spawn-7.0.6"
-      sources."eastasianwidth-0.2.0"
-      sources."editorconfig-1.0.4"
-      sources."emoji-regex-9.2.2"
-      sources."foreground-child-3.3.1"
-      (
-        sources."glob-10.4.5"
-        // {
-          dependencies = [
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."ini-1.3.8"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."isexe-2.0.0"
-      sources."jackspeak-3.4.3"
-      sources."js-cookie-3.0.5"
-      sources."lru-cache-10.4.3"
-      sources."minimatch-9.0.1"
-      sources."minipass-7.1.2"
-      sources."nopt-7.2.1"
-      sources."package-json-from-dist-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-scurry-1.11.1"
-      sources."proto-list-1.2.4"
-      sources."semver-7.7.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-4.1.0"
-      sources."string-width-5.1.2"
-      (
-        sources."string-width-cjs-4.2.3"
-        // {
-          dependencies = [
-            sources."emoji-regex-8.0.0"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-7.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-          ];
-        }
-      )
-      sources."strip-ansi-cjs-6.0.1"
-      sources."which-2.0.2"
-      sources."wrap-ansi-8.1.0"
-      (
-        sources."wrap-ansi-cjs-7.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "beautifier.io for node";
-      homepage = "https://beautifier.io/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";
@@ -52196,68 +35814,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  jshint = nodeEnv.buildNodePackage {
-    name = "jshint";
-    packageName = "jshint";
-    version = "2.13.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz";
-      sha512 = "IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==";
-    };
-    dependencies = [
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."cli-1.0.1"
-      sources."concat-map-0.0.1"
-      sources."console-browserify-1.1.0"
-      sources."core-util-is-1.0.3"
-      sources."date-now-0.1.4"
-      (
-        sources."dom-serializer-0.2.2"
-        // {
-          dependencies = [
-            sources."domelementtype-2.3.0"
-            sources."entities-2.2.0"
-          ];
-        }
-      )
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."entities-1.0.0"
-      sources."exit-0.1.2"
-      sources."fs.realpath-1.0.0"
-      (
-        sources."glob-7.2.3"
-        // {
-          dependencies = [
-            sources."minimatch-3.1.2"
-          ];
-        }
-      )
-      sources."htmlparser2-3.8.3"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."isarray-0.0.1"
-      sources."lodash-4.17.21"
-      sources."minimatch-3.0.8"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."readable-stream-1.1.14"
-      sources."string_decoder-0.10.31"
-      sources."strip-json-comments-1.0.4"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Static analysis tool for JavaScript";
-      homepage = "http://jshint.com/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   json = nodeEnv.buildNodePackage {
     name = "json";
     packageName = "json";
@@ -52379,70 +35935,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  json-server = nodeEnv.buildNodePackage {
-    name = "json-server";
-    packageName = "json-server";
-    version = "1.0.0-beta.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-1.0.0-beta.3.tgz";
-      sha512 = "DwE69Ep5ccwIJZBUIWEENC30Yj8bwr4Ax9W9VoIWAYnB8Sj4ReptscO8/DRHv/nXwVlmb3Bk73Ls86+VZdYkkA==";
-    };
-    dependencies = [
-      sources."@polka/url-1.0.0-next.28"
-      sources."@tinyhttp/accepts-2.2.3"
-      sources."@tinyhttp/app-2.5.2"
-      sources."@tinyhttp/content-disposition-2.2.2"
-      sources."@tinyhttp/content-type-0.1.4"
-      sources."@tinyhttp/cookie-2.1.1"
-      sources."@tinyhttp/cookie-signature-2.1.1"
-      sources."@tinyhttp/cors-2.0.1"
-      sources."@tinyhttp/encode-url-2.1.1"
-      sources."@tinyhttp/etag-2.1.2"
-      sources."@tinyhttp/forwarded-2.1.2"
-      sources."@tinyhttp/logger-2.1.0"
-      sources."@tinyhttp/proxy-addr-2.2.1"
-      sources."@tinyhttp/req-2.2.5"
-      sources."@tinyhttp/res-2.2.5"
-      sources."@tinyhttp/router-2.2.3"
-      sources."@tinyhttp/send-2.2.3"
-      sources."@tinyhttp/type-is-2.2.4"
-      sources."@tinyhttp/url-2.1.1"
-      sources."@tinyhttp/vary-0.1.3"
-      sources."chalk-5.4.1"
-      sources."chokidar-4.0.3"
-      sources."colorette-2.0.20"
-      sources."dayjs-1.11.13"
-      sources."dot-prop-9.0.0"
-      sources."es-escape-html-0.1.1"
-      sources."eta-3.5.0"
-      sources."header-range-parser-1.1.3"
-      sources."http-status-emojis-2.2.0"
-      sources."inflection-3.0.2"
-      sources."ipaddr.js-2.2.0"
-      sources."json5-2.2.3"
-      sources."lowdb-7.0.1"
-      sources."milliparsec-4.0.0"
-      sources."mime-4.0.4"
-      sources."mrmime-2.0.1"
-      sources."negotiator-0.6.4"
-      sources."readdirp-4.1.2"
-      sources."regexparam-2.0.2"
-      sources."sirv-2.0.4"
-      sources."sort-on-6.1.0"
-      sources."steno-4.0.2"
-      sources."totalist-3.0.1"
-      sources."type-fest-4.37.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "[![Node.js CI](https://github.com/typicode/json-server/actions/workflows/node.js.yml/badge.svg)](https://github.com/typicode/json-server/actions/workflows/node.js.yml)";
-      homepage = "https://github.com/typicode/json-server#readme";
-      license = "SEE LICENSE IN ./LICENSE";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   jsonlint = nodeEnv.buildNodePackage {
     name = "jsonlint";
     packageName = "jsonlint";
@@ -52469,647 +35961,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  jsonplaceholder = nodeEnv.buildNodePackage {
-    name = "jsonplaceholder";
-    packageName = "jsonplaceholder";
-    version = "0.3.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jsonplaceholder/-/jsonplaceholder-0.3.3.tgz";
-      sha512 = "CLM2ccU+FdJPwGpkWv/jgVGNWwJS7iK1gKxNeS6okse4gwWH7+Fz5BzFRJ6G/+6vq+xDklXD+O/xqUTnczil1Q==";
-    };
-    dependencies = [
-      sources."accepts-1.3.8"
-      sources."ajv-6.12.6"
-      sources."ansi-align-1.1.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."anymatch-1.3.2"
-      sources."arr-diff-2.0.0"
-      sources."arr-flatten-1.1.0"
-      sources."arr-union-3.1.0"
-      sources."array-flatten-1.1.1"
-      sources."array-unique-0.2.1"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."assign-symbols-1.0.0"
-      sources."async-each-1.0.6"
-      sources."asynckit-0.4.0"
-      sources."atob-2.1.2"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      (
-        sources."base-0.11.2"
-        // {
-          dependencies = [
-            sources."define-property-1.0.0"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."basic-auth-2.0.1"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-1.13.1"
-      sources."bindings-1.5.0"
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."on-finished-2.4.1"
-          ];
-        }
-      )
-      (
-        sources."boxen-0.6.0"
-        // {
-          dependencies = [
-            sources."camelcase-2.1.1"
-          ];
-        }
-      )
-      sources."braces-1.8.5"
-      sources."bytes-3.1.2"
-      (
-        sources."cache-base-1.0.1"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."camelcase-3.0.0"
-      sources."capture-stack-trace-1.0.2"
-      sources."caseless-0.12.0"
-      sources."chalk-1.1.3"
-      sources."chokidar-1.7.0"
-      (
-        sources."class-utils-0.3.6"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."is-descriptor-0.1.7"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."cli-boxes-1.0.0"
-      sources."cliui-3.2.0"
-      sources."clone-1.0.4"
-      sources."code-point-at-1.1.0"
-      sources."collection-visit-1.0.0"
-      sources."combined-stream-1.0.8"
-      sources."component-emitter-1.3.1"
-      sources."compressible-2.0.18"
-      (
-        sources."compression-1.8.0"
-        // {
-          dependencies = [
-            sources."negotiator-0.6.4"
-            sources."safe-buffer-5.2.1"
-          ];
-        }
-      )
-      (
-        sources."configstore-2.1.0"
-        // {
-          dependencies = [
-            sources."uuid-2.0.3"
-          ];
-        }
-      )
-      sources."connect-pause-0.1.1"
-      (
-        sources."content-disposition-0.5.4"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.2.1"
-          ];
-        }
-      )
-      sources."content-type-1.0.5"
-      sources."cookie-0.7.1"
-      sources."cookie-signature-1.0.6"
-      sources."copy-descriptor-0.1.1"
-      sources."core-util-is-1.0.2"
-      sources."cors-2.8.5"
-      sources."create-error-class-3.0.2"
-      sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."decode-uri-component-0.2.2"
-      sources."deep-extend-0.6.0"
-      (
-        sources."define-property-2.0.2"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."delayed-stream-1.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."dot-prop-3.0.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexer2-0.1.4"
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-2.0.0"
-      sources."error-ex-1.3.2"
-      sources."errorhandler-1.5.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."etag-1.8.1"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."on-finished-2.4.1"
-            sources."safe-buffer-5.2.1"
-          ];
-        }
-      )
-      sources."extend-3.0.2"
-      (
-        sources."extend-shallow-3.0.2"
-        // {
-          dependencies = [
-            sources."is-extendable-1.0.1"
-          ];
-        }
-      )
-      sources."extglob-0.3.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.4"
-      sources."filled-array-1.1.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."on-finished-2.4.1"
-          ];
-        }
-      )
-      sources."find-up-1.1.2"
-      sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."forwarded-0.2.0"
-      sources."fragment-cache-0.2.1"
-      sources."fresh-0.5.2"
-      sources."fsevents-1.2.13"
-      sources."function-bind-1.1.2"
-      sources."get-caller-file-1.0.3"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-value-2.0.6"
-      sources."getpass-0.1.7"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
-      sources."gopd-1.2.0"
-      sources."got-5.7.1"
-      sources."graceful-fs-4.2.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-ansi-2.0.0"
-      sources."has-symbols-1.1.0"
-      (
-        sources."has-value-1.0.0"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      (
-        sources."has-values-1.0.0"
-        // {
-          dependencies = [
-            (
-              sources."is-number-3.0.0"
-              // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              }
-            )
-            sources."kind-of-4.0.0"
-          ];
-        }
-      )
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."http-errors-2.0.0"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."imurmurhash-0.1.4"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."invert-kv-1.0.0"
-      sources."ipaddr.js-1.9.1"
-      sources."is-accessor-descriptor-1.0.1"
-      sources."is-arrayish-0.2.1"
-      sources."is-binary-path-1.0.1"
-      sources."is-buffer-1.1.6"
-      sources."is-core-module-2.16.1"
-      sources."is-data-descriptor-1.0.1"
-      sources."is-descriptor-1.0.3"
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-finite-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-glob-2.0.1"
-      sources."is-npm-1.0.0"
-      sources."is-number-2.1.0"
-      sources."is-obj-1.0.1"
-      (
-        sources."is-plain-object-2.0.4"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
-      sources."is-promise-2.2.2"
-      sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.2.0"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-utf8-0.2.1"
-      sources."is-windows-1.0.2"
-      sources."isarray-1.0.0"
-      sources."isobject-2.1.0"
-      sources."isstream-0.1.2"
-      sources."jju-1.4.0"
-      sources."jsbn-0.1.1"
-      sources."json-parse-helpfulerror-1.0.3"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-server-0.8.23"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."kind-of-3.2.2"
-      sources."latest-version-2.0.0"
-      sources."lazy-req-1.1.0"
-      sources."lcid-1.0.0"
-      sources."load-json-file-1.1.0"
-      sources."lodash-4.17.21"
-      sources."lodash.assign-4.2.0"
-      sources."lowdb-0.13.1"
-      sources."lowercase-keys-1.0.1"
-      sources."map-cache-0.2.2"
-      sources."map-visit-1.0.0"
-      sources."math-intrinsics-1.1.0"
-      sources."math-random-1.0.4"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."method-override-2.3.10"
-      sources."methods-1.1.2"
-      sources."micromatch-2.3.11"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimist-1.2.8"
-      (
-        sources."mixin-deep-1.3.2"
-        // {
-          dependencies = [
-            sources."is-extendable-1.0.1"
-          ];
-        }
-      )
-      sources."mkdirp-0.5.6"
-      sources."morgan-1.10.0"
-      sources."ms-2.0.0"
-      sources."nan-2.22.2"
-      (
-        sources."nanomatch-1.2.13"
-        // {
-          dependencies = [
-            sources."arr-diff-4.0.0"
-            sources."array-unique-0.3.2"
-            sources."kind-of-6.0.3"
-          ];
-        }
-      )
-      sources."negotiator-0.6.3"
-      sources."node-status-codes-1.0.0"
-      sources."node-uuid-1.4.8"
-      sources."normalize-package-data-2.5.0"
-      sources."normalize-path-2.1.1"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      (
-        sources."object-copy-0.1.0"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."is-descriptor-0.1.7"
-          ];
-        }
-      )
-      sources."object-inspect-1.13.4"
-      (
-        sources."object-visit-1.0.1"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."object.omit-2.0.1"
-      (
-        sources."object.pick-1.3.0"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."on-finished-2.3.0"
-      sources."on-headers-1.0.2"
-      sources."os-homedir-1.0.2"
-      sources."os-locale-1.4.0"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."package-json-2.4.0"
-      sources."parse-glob-3.0.4"
-      sources."parse-json-2.2.0"
-      sources."parseurl-1.3.3"
-      sources."pascalcase-0.1.1"
-      sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      sources."path-to-regexp-0.1.12"
-      sources."path-type-1.1.0"
-      sources."performance-now-2.1.0"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."pluralize-3.1.0"
-      sources."posix-character-classes-0.1.1"
-      sources."prepend-http-1.0.4"
-      sources."preserve-0.2.0"
-      sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.7"
-      sources."psl-1.15.0"
-      sources."punycode-2.3.1"
-      sources."qs-6.13.0"
-      (
-        sources."randomatic-3.1.1"
-        // {
-          dependencies = [
-            sources."is-number-4.0.0"
-            sources."kind-of-6.0.3"
-          ];
-        }
-      )
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      sources."rc-1.2.8"
-      sources."read-all-stream-3.1.0"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.8"
-      (
-        sources."readdirp-2.2.1"
-        // {
-          dependencies = [
-            sources."arr-diff-4.0.0"
-            sources."array-unique-0.3.2"
-            (
-              sources."braces-2.3.2"
-              // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            (
-              sources."expand-brackets-2.1.4"
-              // {
-                dependencies = [
-                  sources."define-property-0.2.5"
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            (
-              sources."extglob-2.0.4"
-              // {
-                dependencies = [
-                  sources."define-property-1.0.0"
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            (
-              sources."fill-range-4.0.0"
-              // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            sources."is-descriptor-0.1.7"
-            (
-              sources."is-number-3.0.0"
-              // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              }
-            )
-            sources."isobject-3.0.1"
-            sources."kind-of-6.0.3"
-            sources."micromatch-3.1.10"
-          ];
-        }
-      )
-      sources."regex-cache-0.4.4"
-      sources."regex-not-1.0.2"
-      sources."registry-auth-token-3.4.0"
-      sources."registry-url-3.1.0"
-      sources."remove-trailing-separator-1.1.0"
-      sources."repeat-element-1.1.4"
-      sources."repeat-string-1.6.1"
-      sources."repeating-2.0.1"
-      (
-        sources."request-2.88.2"
-        // {
-          dependencies = [
-            sources."qs-6.5.3"
-          ];
-        }
-      )
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."resolve-1.22.10"
-      sources."resolve-url-0.2.1"
-      sources."ret-0.1.15"
-      sources."safe-buffer-5.1.2"
-      sources."safe-regex-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.7.2"
-      sources."semver-diff-2.1.0"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            sources."encodeurl-1.0.2"
-            sources."ms-2.1.3"
-            sources."on-finished-2.4.1"
-          ];
-        }
-      )
-      sources."serve-static-1.16.2"
-      sources."server-destroy-1.0.1"
-      sources."set-blocking-2.0.0"
-      (
-        sources."set-value-2.0.1"
-        // {
-          dependencies = [
-            sources."extend-shallow-2.0.1"
-          ];
-        }
-      )
-      sources."setprototypeof-1.2.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."slide-1.1.6"
-      (
-        sources."snapdragon-0.8.2"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."extend-shallow-2.0.1"
-            sources."is-descriptor-0.1.7"
-          ];
-        }
-      )
-      (
-        sources."snapdragon-node-2.1.1"
-        // {
-          dependencies = [
-            sources."define-property-1.0.0"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."snapdragon-util-3.0.1"
-      sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.3"
-      sources."source-map-url-0.4.1"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      sources."split-string-3.1.0"
-      sources."sshpk-1.18.0"
-      (
-        sources."static-extend-0.1.2"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."is-descriptor-0.1.7"
-          ];
-        }
-      )
-      sources."statuses-2.0.1"
-      sources."steno-0.4.4"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."timed-out-3.1.3"
-      sources."to-object-path-0.3.0"
-      sources."to-regex-3.0.2"
-      (
-        sources."to-regex-range-2.1.1"
-        // {
-          dependencies = [
-            sources."is-number-3.0.0"
-          ];
-        }
-      )
-      sources."toidentifier-1.0.1"
-      sources."tough-cookie-2.5.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-is-1.6.18"
-      sources."underscore-db-0.10.0"
-      sources."union-value-1.0.1"
-      sources."unpipe-1.0.0"
-      (
-        sources."unset-value-1.0.0"
-        // {
-          dependencies = [
-            (
-              sources."has-value-0.3.1"
-              // {
-                dependencies = [
-                  sources."isobject-2.1.0"
-                ];
-              }
-            )
-            sources."has-values-0.1.4"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."unzip-response-1.0.2"
-      sources."update-notifier-1.0.3"
-      sources."uri-js-4.4.1"
-      sources."urix-0.1.0"
-      sources."url-parse-lax-1.0.0"
-      sources."use-3.1.1"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      sources."which-module-1.0.0"
-      sources."widest-line-1.0.0"
-      sources."window-size-0.2.0"
-      sources."wrap-ansi-2.1.0"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
-      sources."y18n-3.2.2"
-      sources."yargs-4.8.1"
-      sources."yargs-parser-2.4.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Simple fake REST API server for testing and prototyping";
-      homepage = "http://jsonplaceholder.typicode.com";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   katex = nodeEnv.buildNodePackage {
     name = "katex";
     packageName = "katex";
@@ -53131,757 +35982,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  keyoxide = nodeEnv.buildNodePackage {
-    name = "keyoxide";
-    packageName = "keyoxide";
-    version = "0.4.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/keyoxide/-/keyoxide-0.4.4.tgz";
-      sha512 = "RUV9keqP/XK49OiVC4l5N5NxjYDPoDJFkr5OLa7rlFd/6JYah7YkqMfzm7Q9iw2ig9GKiQI9KgtR2IixzwEJnw==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      (
-        sources."@babel/cli-7.26.4"
-        // {
-          dependencies = [
-            sources."make-dir-2.1.0"
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      sources."@babel/helper-annotate-as-pure-7.25.9"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-plugin-utils-7.26.5"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/node-7.26.0"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/plugin-syntax-jsx-7.25.9"
-      sources."@babel/plugin-transform-react-jsx-7.25.9"
-      (
-        sources."@babel/register-7.25.9"
-        // {
-          dependencies = [
-            sources."make-dir-2.1.0"
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@mapbox/node-pre-gyp-1.0.11"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@openpgp/hkp-client-0.0.2"
-      sources."@openpgp/wkd-client-0.0.3"
-      sources."@peculiar/asn1-schema-2.3.15"
-      sources."@peculiar/json-schema-1.1.12"
-      sources."@peculiar/webcrypto-1.5.0"
-      sources."@tootallnate/once-1.1.2"
-      sources."@xmpp/base64-0.13.2"
-      sources."@xmpp/client-0.13.4"
-      sources."@xmpp/client-core-0.13.3"
-      sources."@xmpp/connection-0.13.3"
-      sources."@xmpp/connection-tcp-0.13.3"
-      sources."@xmpp/debug-0.13.3"
-      sources."@xmpp/error-0.13.2"
-      sources."@xmpp/events-0.13.2"
-      sources."@xmpp/id-0.13.2"
-      sources."@xmpp/iq-0.13.3"
-      sources."@xmpp/jid-0.13.2"
-      sources."@xmpp/middleware-0.13.3"
-      sources."@xmpp/reconnect-0.13.2"
-      (
-        sources."@xmpp/resolve-0.13.3"
-        // {
-          dependencies = [
-            sources."node-fetch-3.3.2"
-          ];
-        }
-      )
-      sources."@xmpp/resource-binding-0.13.3"
-      sources."@xmpp/sasl-0.13.4"
-      sources."@xmpp/sasl-anonymous-0.13.2"
-      sources."@xmpp/sasl-plain-0.13.2"
-      sources."@xmpp/sasl-scram-sha-1-0.13.2"
-      sources."@xmpp/session-establishment-0.13.3"
-      sources."@xmpp/starttls-0.13.3"
-      sources."@xmpp/stream-features-0.13.2"
-      sources."@xmpp/stream-management-0.13.3"
-      sources."@xmpp/tcp-0.13.3"
-      sources."@xmpp/tls-0.13.3"
-      (
-        sources."@xmpp/websocket-0.13.3"
-        // {
-          dependencies = [
-            sources."ws-8.18.1"
-          ];
-        }
-      )
-      (
-        sources."@xmpp/xml-0.13.3"
-        // {
-          dependencies = [
-            sources."ltx-3.1.2"
-          ];
-        }
-      )
-      sources."abab-2.0.6"
-      sources."abbrev-1.1.1"
-      sources."accepts-1.3.8"
-      sources."acorn-8.14.1"
-      (
-        sources."acorn-globals-6.0.0"
-        // {
-          dependencies = [
-            sources."acorn-7.4.1"
-          ];
-        }
-      )
-      sources."acorn-walk-7.2.0"
-      sources."agent-base-6.0.2"
-      sources."ansi-colors-4.1.3"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."aproba-2.0.0"
-      sources."are-we-there-yet-2.0.0"
-      sources."array-buffer-byte-length-1.0.2"
-      sources."array-flatten-1.1.1"
-      sources."array-union-2.1.0"
-      sources."array.prototype.reduce-1.0.7"
-      sources."arraybuffer.prototype.slice-1.0.4"
-      sources."asn1.js-5.4.1"
-      sources."asn1js-3.0.5"
-      sources."async-function-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
-      sources."available-typed-arrays-1.0.7"
-      sources."axios-0.25.0"
-      sources."babel-plugin-jsx-pragmatic-1.0.2"
-      sources."babel-plugin-syntax-jsx-6.18.0"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."bn.js-4.12.1"
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."browser-or-node-1.3.0"
-      sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.24.4"
-      sources."buffer-5.7.1"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."bytes-3.1.2"
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."caniuse-lite-1.0.30001704"
-      sources."canvas-2.11.2"
-      sources."chalk-4.1.2"
-      sources."chardet-1.6.1"
-      sources."chownr-2.0.0"
-      sources."cipher-base-1.0.6"
-      sources."cliui-7.0.4"
-      sources."clone-deep-4.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."color-support-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."commander-6.2.1"
-      sources."commondir-1.0.1"
-      sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
-      sources."content-disposition-0.5.4"
-      sources."content-type-1.0.5"
-      sources."convert-source-map-2.0.0"
-      sources."cookie-0.7.1"
-      sources."cookie-signature-1.0.6"
-      sources."core-js-3.41.0"
-      sources."core-util-is-1.0.3"
-      sources."cors-2.8.5"
-      sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
-      sources."cssom-0.4.4"
-      (
-        sources."cssstyle-2.3.0"
-        // {
-          dependencies = [
-            sources."cssom-0.3.8"
-          ];
-        }
-      )
-      sources."data-uri-to-buffer-4.0.1"
-      sources."data-urls-2.0.0"
-      sources."data-view-buffer-1.0.2"
-      sources."data-view-byte-length-1.0.2"
-      sources."data-view-byte-offset-1.0.1"
-      sources."debug-4.4.0"
-      sources."decimal.js-10.5.0"
-      sources."decode-uri-component-0.2.2"
-      sources."decompress-response-4.2.1"
-      sources."deep-extend-0.6.0"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."detect-libc-2.0.3"
-      sources."dir-glob-3.0.1"
-      sources."doipjs-0.15.7"
-      (
-        sources."domexception-2.0.1"
-        // {
-          dependencies = [
-            sources."webidl-conversions-5.0.0"
-          ];
-        }
-      )
-      sources."dotenv-8.6.0"
-      sources."dunder-proto-1.0.1"
-      sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.5.118"
-      sources."emoji-regex-8.0.0"
-      sources."encodeurl-2.0.0"
-      (
-        sources."encoding-0.1.13"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."end-of-stream-1.4.4"
-      sources."enquirer-2.4.1"
-      sources."es-abstract-1.23.9"
-      sources."es-array-method-boxes-properly-1.0.0"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."es-to-primitive-1.3.0"
-      sources."escalade-3.2.0"
-      sources."escape-html-1.0.3"
-      sources."escodegen-2.1.0"
-      sources."esprima-4.0.1"
-      sources."estraverse-5.3.0"
-      sources."esutils-2.0.3"
-      sources."etag-1.8.1"
-      sources."events-3.3.0"
-      sources."expand-template-2.0.3"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."express-validator-6.15.0"
-      sources."fast-glob-3.3.3"
-      sources."fastq-1.19.1"
-      sources."fetch-blob-3.2.0"
-      sources."fill-range-7.1.1"
-      sources."filter-obj-1.1.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      (
-        sources."find-cache-dir-2.1.0"
-        // {
-          dependencies = [
-            sources."make-dir-2.1.0"
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."find-up-3.0.0"
-      sources."follow-redirects-1.15.9"
-      sources."for-each-0.3.5"
-      sources."form-data-3.0.3"
-      sources."formdata-polyfill-4.0.10"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      (
-        sources."from2-2.3.0"
-        // {
-          dependencies = [
-            sources."isarray-1.0.0"
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."fs-constants-1.0.0"
-      (
-        sources."fs-extra-9.1.0"
-        // {
-          dependencies = [
-            sources."universalify-2.0.1"
-          ];
-        }
-      )
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs-readdir-recursive-1.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."function.prototype.name-1.1.8"
-      sources."functions-have-names-1.2.3"
-      sources."gauge-3.0.2"
-      sources."gensync-1.0.0-beta.2"
-      sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-symbol-description-1.1.0"
-      sources."github-from-package-0.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."globals-11.12.0"
-      sources."globalthis-1.0.4"
-      (
-        sources."globby-11.1.0"
-        // {
-          dependencies = [
-            sources."slash-3.0.0"
-          ];
-        }
-      )
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."growly-1.3.0"
-      sources."has-1.0.4"
-      sources."has-bigints-1.1.0"
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.2.0"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."has-unicode-2.0.1"
-      sources."hash-base-3.1.0"
-      sources."hasown-2.0.2"
-      sources."homedir-polyfill-1.0.3"
-      sources."html-encoding-sniffer-2.0.1"
-      sources."http-errors-2.0.0"
-      sources."http-proxy-agent-4.0.1"
-      sources."https-proxy-agent-5.0.1"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."ignore-5.3.2"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."internal-slot-1.1.0"
-      sources."into-stream-6.0.0"
-      sources."ipaddr.js-1.9.1"
-      sources."irc-colors-1.5.0"
-      (
-        sources."irc-upd-0.11.0"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."is-array-buffer-3.0.5"
-      sources."is-async-function-2.1.1"
-      sources."is-bigint-1.1.0"
-      sources."is-boolean-object-1.2.2"
-      sources."is-callable-1.2.7"
-      sources."is-core-module-2.9.0"
-      sources."is-data-view-1.0.2"
-      sources."is-date-object-1.1.0"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-finalizationregistry-1.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-generator-function-1.1.0"
-      sources."is-glob-4.0.3"
-      sources."is-map-2.0.3"
-      sources."is-number-7.0.0"
-      sources."is-number-object-1.1.1"
-      sources."is-plain-obj-2.1.0"
-      sources."is-plain-object-2.0.4"
-      sources."is-potential-custom-element-name-1.0.1"
-      sources."is-regex-1.2.1"
-      sources."is-set-2.0.3"
-      sources."is-shared-array-buffer-1.0.4"
-      sources."is-string-1.1.1"
-      sources."is-symbol-1.1.1"
-      sources."is-typed-array-1.1.15"
-      sources."is-weakmap-2.0.2"
-      sources."is-weakref-1.1.1"
-      sources."is-weakset-2.0.4"
-      sources."is-wsl-2.2.0"
-      sources."isarray-2.0.5"
-      sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      sources."js-tokens-4.0.0"
-      sources."jsdom-16.7.0"
-      sources."jsesc-3.1.0"
-      sources."json5-2.2.3"
-      (
-        sources."jsonfile-6.1.0"
-        // {
-          dependencies = [
-            sources."universalify-2.0.1"
-          ];
-        }
-      )
-      sources."kind-of-6.0.3"
-      sources."koa-compose-4.2.0"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.21"
-      (
-        sources."lru-cache-5.1.1"
-        // {
-          dependencies = [
-            sources."yallist-3.1.1"
-          ];
-        }
-      )
-      sources."ltx-3.0.0"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."math-intrinsics-1.1.0"
-      sources."md5.js-1.3.5"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."merge-options-3.0.4"
-      sources."merge2-1.4.1"
-      sources."methods-1.1.2"
-      sources."micromatch-4.0.8"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-response-2.1.0"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."mkdirp-classic-0.5.3"
-      sources."ms-2.1.3"
-      sources."multistream-4.1.0"
-      sources."nan-2.22.2"
-      sources."napi-build-utils-1.0.2"
-      sources."negotiator-0.6.3"
-      sources."node-abi-3.74.0"
-      sources."node-domexception-1.0.0"
-      (
-        sources."node-environment-flags-1.0.6"
-        // {
-          dependencies = [
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      (
-        sources."node-fetch-2.7.0"
-        // {
-          dependencies = [
-            sources."tr46-0.0.3"
-            sources."webidl-conversions-3.0.1"
-            sources."whatwg-url-5.0.0"
-          ];
-        }
-      )
-      sources."node-gyp-build-4.8.4"
-      sources."node-notifier-10.0.1"
-      sources."node-releases-2.0.19"
-      sources."nopt-5.0.0"
-      sources."npmlog-5.0.1"
-      sources."nwsapi-2.2.18"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.7"
-      sources."object.getownpropertydescriptors-2.1.8"
-      sources."on-finished-2.4.1"
-      sources."once-1.4.0"
-      sources."openpgp-5.11.2"
-      sources."own-keys-1.0.1"
-      sources."p-is-promise-3.0.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."parse-passwd-1.0.0"
-      sources."parse5-6.0.1"
-      sources."parseurl-1.3.3"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      sources."path-to-regexp-0.1.12"
-      sources."path-type-4.0.0"
-      sources."picocolors-1.1.1"
-      sources."picomatch-2.3.1"
-      sources."pify-4.0.1"
-      sources."pirates-4.0.6"
-      (
-        sources."pkg-5.8.1"
-        // {
-          dependencies = [
-            sources."@babel/generator-7.18.2"
-            sources."@babel/parser-7.18.4"
-            sources."@babel/types-7.19.0"
-            sources."jsesc-2.5.2"
-          ];
-        }
-      )
-      sources."pkg-dir-3.0.0"
-      sources."pkg-fetch-3.4.2"
-      sources."possible-typed-array-names-1.1.0"
-      (
-        sources."prebuild-install-7.1.1"
-        // {
-          dependencies = [
-            sources."decompress-response-6.0.0"
-            sources."mimic-response-3.1.0"
-            sources."simple-get-4.0.1"
-          ];
-        }
-      )
-      sources."process-nextick-args-2.0.1"
-      sources."progress-2.0.3"
-      sources."proxy-addr-2.0.7"
-      sources."psl-1.15.0"
-      sources."pump-3.0.2"
-      sources."punycode-2.3.1"
-      sources."pvtsutils-1.3.6"
-      sources."pvutils-1.1.3"
-      sources."qs-6.13.0"
-      sources."query-string-6.14.1"
-      sources."querystringify-2.2.0"
-      sources."queue-microtask-1.2.3"
-      sources."randombytes-2.1.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      sources."rc-1.2.8"
-      sources."readable-stream-3.6.2"
-      sources."reflect.getprototypeof-1.0.10"
-      sources."regenerator-runtime-0.14.1"
-      sources."regexp.prototype.flags-1.5.4"
-      sources."require-directory-2.1.1"
-      sources."requires-port-1.0.0"
-      (
-        sources."resolve-1.22.10"
-        // {
-          dependencies = [
-            sources."is-core-module-2.16.1"
-          ];
-        }
-      )
-      sources."reusify-1.1.0"
-      sources."rimraf-3.0.2"
-      sources."ripemd160-2.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-array-concat-1.1.3"
-      sources."safe-buffer-5.2.1"
-      sources."safe-push-apply-1.0.0"
-      sources."safe-regex-test-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."sasl-anonymous-0.1.0"
-      sources."sasl-plain-0.1.0"
-      sources."sasl-scram-sha-1-1.3.0"
-      sources."saslmechanisms-0.1.1"
-      sources."saxes-5.0.1"
-      sources."semver-7.7.1"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            (
-              sources."debug-2.6.9"
-              // {
-                dependencies = [
-                  sources."ms-2.0.0"
-                ];
-              }
-            )
-            sources."encodeurl-1.0.2"
-          ];
-        }
-      )
-      sources."serve-static-1.16.2"
-      sources."set-blocking-2.0.0"
-      sources."set-function-length-1.2.2"
-      sources."set-function-name-2.0.2"
-      sources."set-proto-1.0.0"
-      sources."setprototypeof-1.2.0"
-      sources."sha.js-2.4.11"
-      sources."shallow-clone-3.0.1"
-      sources."shellwords-0.1.1"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-3.1.1"
-      sources."slash-2.0.0"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."split-on-first-1.1.0"
-      sources."statuses-2.0.1"
-      (
-        sources."stream-meter-1.0.4"
-        // {
-          dependencies = [
-            sources."isarray-1.0.0"
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."strict-uri-encode-2.0.0"
-      sources."string-width-4.2.3"
-      sources."string.prototype.trim-1.2.10"
-      sources."string.prototype.trimend-1.0.9"
-      sources."string.prototype.trimstart-1.0.8"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."symbol-tree-3.2.4"
-      sources."tar-6.2.1"
-      (
-        sources."tar-fs-2.1.2"
-        // {
-          dependencies = [
-            sources."chownr-1.1.4"
-          ];
-        }
-      )
-      sources."tar-stream-2.2.0"
-      sources."to-fast-properties-2.0.0"
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.1"
-      sources."tough-cookie-4.1.4"
-      sources."tr46-2.1.0"
-      sources."tslib-2.8.1"
-      sources."tunnel-agent-0.6.0"
-      sources."type-is-1.6.18"
-      sources."typed-array-buffer-1.0.3"
-      sources."typed-array-byte-length-1.0.3"
-      sources."typed-array-byte-offset-1.0.4"
-      sources."typed-array-length-1.0.7"
-      sources."unbox-primitive-1.1.0"
-      sources."universalify-0.2.0"
-      sources."unpipe-1.0.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."url-parse-1.5.10"
-      sources."utf-8-validate-5.0.10"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-8.3.2"
-      sources."v8flags-3.2.0"
-      sources."valid-url-1.0.9"
-      sources."validator-13.12.0"
-      sources."vary-1.1.2"
-      sources."w3c-hr-time-1.0.2"
-      sources."w3c-xmlserializer-2.0.0"
-      sources."web-streams-polyfill-3.3.3"
-      sources."webcrypto-core-1.8.1"
-      sources."webidl-conversions-6.1.0"
-      sources."whatwg-encoding-1.0.5"
-      sources."whatwg-mimetype-2.3.0"
-      sources."whatwg-url-8.7.0"
-      sources."which-2.0.2"
-      sources."which-boxed-primitive-1.1.1"
-      sources."which-builtin-type-1.2.1"
-      sources."which-collection-1.0.2"
-      sources."which-typed-array-1.1.19"
-      sources."wide-align-1.1.5"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."ws-7.5.10"
-      sources."xml-name-validator-3.0.0"
-      sources."xmlchars-2.2.0"
-      sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
-      sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CLI for Keyoxide";
-      homepage = "https://keyoxide.org";
-      license = "AGPL-3.0-or-later";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   lcov-result-merger = nodeEnv.buildNodePackage {
     name = "lcov-result-merger";
     packageName = "lcov-result-merger";
@@ -54929,35 +37029,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  lua-fmt = nodeEnv.buildNodePackage {
-    name = "lua-fmt";
-    packageName = "lua-fmt";
-    version = "2.6.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lua-fmt/-/lua-fmt-2.6.0.tgz";
-      sha512 = "J4D7TK+BhSJ9ePQPpZPlu/aHE3X9ojN+D7DNv1HXZPryBJ74XWVmXpRX+qceXdE15TUsQRCj9w81waVOOFhfWA==";
-    };
-    dependencies = [
-      sources."@types/commander-2.12.5"
-      sources."@types/diff-3.5.8"
-      sources."@types/get-stdin-5.0.1"
-      sources."@types/node-22.13.10"
-      sources."commander-2.20.3"
-      sources."diff-3.5.0"
-      sources."get-stdin-5.0.1"
-      sources."luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802"
-      sources."undici-types-6.20.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Format Lua code";
-      homepage = "https://github.com/trixnz/lua-fmt";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   madoko = nodeEnv.buildNodePackage {
     name = "madoko";
     packageName = "madoko";
@@ -54992,370 +37063,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  mastodon-bot = nodeEnv.buildNodePackage {
-    name = "mastodon-bot";
-    packageName = "mastodon-bot";
-    version = "1.13.8-20220129172727";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.8-20220129172727.tgz";
-      sha512 = "uBYlTnpHrVQ6+K9qQHaoLfvUKL8W5RLjdPmIzSC48+F0TSwDv+zAq19Sv5kx4Rxv4K+3c9j15xMI+mEs3bD7Lg==";
-    };
-    dependencies = [
-      sources."acorn-5.7.4"
-      (
-        sources."acorn-jsx-3.0.1"
-        // {
-          dependencies = [
-            sources."acorn-3.3.0"
-          ];
-        }
-      )
-      sources."ajv-4.11.8"
-      sources."ajv-keywords-1.5.1"
-      sources."ansi-escapes-1.4.0"
-      sources."ansi-gray-0.1.1"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."ansi-wrap-0.1.0"
-      sources."argparse-1.0.10"
-      sources."array-differ-1.0.0"
-      sources."array-uniq-1.0.3"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."babel-code-frame-6.26.0"
-      sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."beeper-1.1.1"
-      sources."bindings-1.5.0"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.1.2"
-      sources."bufferstreams-1.1.3"
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."caller-path-0.1.0"
-      sources."callsites-0.2.0"
-      sources."caseless-0.12.0"
-      sources."chalk-1.1.3"
-      sources."circular-json-0.3.3"
-      sources."cli-cursor-1.0.2"
-      sources."cli-width-2.2.1"
-      sources."clone-1.0.4"
-      sources."clone-stats-0.0.1"
-      sources."co-4.6.0"
-      sources."code-point-at-1.1.0"
-      sources."color-support-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."core-util-is-1.0.3"
-      sources."d-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."dateformat-2.2.0"
-      sources."deasync-0.1.20"
-      sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
-      sources."deep-is-0.1.4"
-      sources."define-data-property-1.1.4"
-      sources."delayed-stream-1.0.0"
-      sources."doctrine-2.1.0"
-      sources."dunder-proto-1.0.1"
-      (
-        sources."duplexer2-0.0.2"
-        // {
-          dependencies = [
-            sources."isarray-0.0.1"
-            sources."readable-stream-1.1.14"
-            sources."string_decoder-0.10.31"
-          ];
-        }
-      )
-      sources."ecc-jsbn-0.1.2"
-      sources."entities-1.1.2"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es5-ext-0.10.64"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      sources."es6-set-0.1.6"
-      sources."es6-symbol-3.1.4"
-      sources."es6-weak-map-2.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."escope-3.6.0"
-      sources."eslint-3.19.0"
-      sources."esniff-2.0.1"
-      sources."espree-3.5.4"
-      sources."esprima-4.0.1"
-      (
-        sources."esquery-1.6.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      (
-        sources."esrecurse-4.3.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      sources."event-emitter-0.3.5"
-      sources."exit-hook-1.1.1"
-      sources."ext-1.7.0"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fancy-log-1.3.3"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."figures-1.7.0"
-      sources."file-entry-cache-2.0.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."flat-cache-1.3.4"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."generate-function-2.3.1"
-      sources."generate-object-property-1.2.0"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."getpass-0.1.7"
-      sources."glob-7.2.3"
-      sources."globals-9.18.0"
-      sources."glogg-1.0.2"
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."gulp-eslint-3.0.1"
-      (
-        sources."gulp-util-3.0.8"
-        // {
-          dependencies = [
-            sources."object-assign-3.0.0"
-          ];
-        }
-      )
-      sources."gulplog-1.0.0"
-      sources."har-schema-2.0.0"
-      (
-        sources."har-validator-5.1.5"
-        // {
-          dependencies = [
-            sources."ajv-6.12.6"
-          ];
-        }
-      )
-      sources."has-ansi-2.0.0"
-      sources."has-gulplog-0.1.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."hasown-2.0.2"
-      sources."http-signature-1.2.0"
-      sources."ignore-3.3.10"
-      sources."imurmurhash-0.1.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      (
-        sources."inquirer-0.12.0"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-1.0.0"
-            sources."string-width-1.0.2"
-          ];
-        }
-      )
-      sources."interpret-1.4.0"
-      sources."is-core-module-2.16.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-my-ip-valid-1.0.1"
-      sources."is-my-json-valid-2.20.6"
-      sources."is-property-1.0.2"
-      sources."is-resolvable-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."js-tokens-3.0.2"
-      sources."js-yaml-3.14.1"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      (
-        sources."json-stable-stringify-1.2.1"
-        // {
-          dependencies = [
-            sources."isarray-2.0.5"
-          ];
-        }
-      )
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.1"
-      sources."jsonpointer-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."levn-0.3.0"
-      sources."lodash-4.17.21"
-      sources."lodash._basecopy-3.0.1"
-      sources."lodash._basetostring-3.0.1"
-      sources."lodash._basevalues-3.0.0"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash._isiterateecall-3.0.9"
-      sources."lodash._reescape-3.0.0"
-      sources."lodash._reevaluate-3.0.0"
-      sources."lodash._reinterpolate-3.0.0"
-      sources."lodash._root-3.0.1"
-      sources."lodash.escape-3.2.0"
-      sources."lodash.isarguments-3.1.0"
-      sources."lodash.isarray-3.0.4"
-      sources."lodash.keys-3.1.2"
-      sources."lodash.restparam-3.6.1"
-      sources."lodash.template-3.6.2"
-      sources."lodash.templatesettings-3.1.1"
-      sources."mastodon-api-1.3.0"
-      sources."math-intrinsics-1.1.0"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."ms-2.0.0"
-      sources."multipipe-0.1.2"
-      sources."mute-stream-0.0.5"
-      sources."natural-compare-1.4.0"
-      sources."next-tick-1.1.0"
-      sources."node-addon-api-1.7.2"
-      sources."node-fetch-2.6.1"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-0.9.15"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."object-keys-1.1.1"
-      sources."once-1.4.0"
-      sources."onetime-1.1.0"
-      sources."optionator-0.8.3"
-      sources."os-homedir-1.0.2"
-      sources."parse-node-version-1.0.1"
-      sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-parse-1.0.7"
-      sources."performance-now-2.1.0"
-      sources."pluralize-1.2.1"
-      sources."prelude-ls-1.1.2"
-      sources."process-nextick-args-2.0.1"
-      sources."progress-1.1.8"
-      (
-        sources."psl-1.15.0"
-        // {
-          dependencies = [
-            sources."punycode-2.3.1"
-          ];
-        }
-      )
-      sources."punycode-1.4.1"
-      sources."qs-6.5.3"
-      sources."readable-stream-2.3.8"
-      sources."readline-1.3.0"
-      (
-        sources."readline2-1.0.1"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-1.0.0"
-          ];
-        }
-      )
-      sources."rechoir-0.6.2"
-      sources."replace-ext-0.0.1"
-      sources."request-2.88.0"
-      sources."require-uncached-1.0.3"
-      sources."resolve-1.22.10"
-      sources."resolve-from-1.0.1"
-      sources."restore-cursor-1.0.1"
-      sources."rimraf-2.6.3"
-      sources."rss-parser-3.7.1"
-      sources."run-async-0.1.0"
-      sources."rx-lite-3.1.2"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.4.1"
-      sources."set-function-length-1.2.2"
-      sources."shelljs-0.7.8"
-      sources."slice-ansi-0.0.4"
-      sources."sparkles-1.0.1"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.18.0"
-      (
-        sources."string-width-2.1.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-3.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."table-3.8.3"
-      sources."text-table-0.2.0"
-      sources."through-2.3.8"
-      sources."through2-2.0.5"
-      sources."time-stamp-1.1.0"
-      sources."tough-cookie-2.4.3"
-      sources."tumblr-0.4.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."twitter-1.7.1"
-      sources."type-2.7.3"
-      sources."type-check-0.3.2"
-      sources."typedarray-0.0.6"
-      (
-        sources."uri-js-4.4.1"
-        // {
-          dependencies = [
-            sources."punycode-2.3.1"
-          ];
-        }
-      )
-      sources."user-home-2.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.4.0"
-      (
-        sources."verror-1.10.0"
-        // {
-          dependencies = [
-            sources."core-util-is-1.0.2"
-          ];
-        }
-      )
-      sources."vinyl-0.5.3"
-      sources."word-wrap-1.2.5"
-      sources."wrappy-1.0.2"
-      sources."write-0.2.1"
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."xtend-4.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Bot to publish twitter, tumblr or rss posts to an mastodon account";
-      homepage = "https://github.com/yogthos/mastodon-bot";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   mathjax = nodeEnv.buildNodePackage {
     name = "mathjax";
     packageName = "mathjax";
@@ -55374,205 +37081,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  meat = nodeEnv.buildNodePackage {
-    name = "meat";
-    packageName = "meat";
-    version = "0.3.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/meat/-/meat-0.3.4.tgz";
-      sha512 = "qaXHW5HwzV9+J4PgnqQ52i9C6V1fhiwQ4skSn+UCQdyPB4H1XYF+0UKIq1kFHINMFhDZ8Lz0WsQjOV09fiImpQ==";
-    };
-    dependencies = [
-      sources."async-0.1.22"
-      sources."colors-0.6.2"
-      sources."commander-0.6.1"
-      sources."connect-1.9.2"
-      sources."cycle-1.0.3"
-      sources."express-2.5.11"
-      sources."eyes-0.1.8"
-      sources."formidable-1.0.17"
-      sources."jade-0.27.0"
-      sources."mime-1.2.4"
-      sources."mkdirp-0.3.0"
-      sources."node.extend-1.0.0"
-      sources."open-0.0.2"
-      sources."pkginfo-0.2.3"
-      sources."qs-0.4.2"
-      sources."request-2.9.203"
-      sources."stack-trace-0.0.10"
-      sources."winston-0.6.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Meeting room kiosk app for displaying meeting room schedules and booking rooms in your organization. Built against Google Apps, but other sources can be defined";
-      homepage = "https://bitbucket.org/aahmed/meat";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  mocha = nodeEnv.buildNodePackage {
-    name = "mocha";
-    packageName = "mocha";
-    version = "11.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-11.1.0.tgz";
-      sha512 = "8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==";
-    };
-    dependencies = [
-      sources."@isaacs/cliui-8.0.2"
-      sources."ansi-colors-4.1.3"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-6.2.1"
-      sources."anymatch-3.1.3"
-      sources."argparse-2.0.1"
-      sources."balanced-match-1.0.2"
-      sources."binary-extensions-2.3.0"
-      sources."brace-expansion-2.0.1"
-      sources."braces-3.0.3"
-      sources."browser-stdout-1.3.1"
-      sources."camelcase-6.3.0"
-      (
-        sources."chalk-4.1.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."supports-color-7.2.0"
-          ];
-        }
-      )
-      sources."chokidar-3.6.0"
-      (
-        sources."cliui-8.0.1"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-            sources."wrap-ansi-7.0.0"
-          ];
-        }
-      )
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."cross-spawn-7.0.6"
-      sources."debug-4.4.0"
-      sources."decamelize-4.0.0"
-      sources."diff-5.2.0"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-9.2.2"
-      sources."escalade-3.2.0"
-      sources."escape-string-regexp-4.0.0"
-      sources."fill-range-7.1.1"
-      sources."find-up-5.0.0"
-      sources."flat-5.0.2"
-      sources."foreground-child-3.3.1"
-      sources."get-caller-file-2.0.5"
-      (
-        sources."glob-10.4.5"
-        // {
-          dependencies = [
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."glob-parent-5.1.2"
-      sources."has-flag-4.0.0"
-      sources."he-1.2.0"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."is-plain-obj-2.1.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."isexe-2.0.0"
-      sources."jackspeak-3.4.3"
-      sources."js-yaml-4.1.0"
-      sources."locate-path-6.0.0"
-      sources."log-symbols-4.1.0"
-      sources."lru-cache-10.4.3"
-      sources."minimatch-5.1.6"
-      sources."minipass-7.1.2"
-      sources."ms-2.1.3"
-      sources."normalize-path-3.0.0"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."package-json-from-dist-1.0.1"
-      sources."path-exists-4.0.0"
-      sources."path-key-3.1.1"
-      sources."path-scurry-1.11.1"
-      sources."picomatch-2.3.1"
-      sources."randombytes-2.1.0"
-      sources."readdirp-3.6.0"
-      sources."require-directory-2.1.1"
-      sources."safe-buffer-5.2.1"
-      sources."serialize-javascript-6.0.2"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-4.1.0"
-      sources."string-width-5.1.2"
-      (
-        sources."string-width-cjs-4.2.3"
-        // {
-          dependencies = [
-            sources."emoji-regex-8.0.0"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-7.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-          ];
-        }
-      )
-      sources."strip-ansi-cjs-6.0.1"
-      sources."strip-json-comments-3.1.1"
-      sources."supports-color-8.1.1"
-      sources."to-regex-range-5.0.1"
-      sources."which-2.0.2"
-      sources."workerpool-6.5.1"
-      sources."wrap-ansi-8.1.0"
-      (
-        sources."wrap-ansi-cjs-7.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      sources."y18n-5.0.8"
-      (
-        sources."yargs-17.7.2"
-        // {
-          dependencies = [
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      sources."yargs-parser-21.1.1"
-      sources."yargs-unparser-2.0.0"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "simple, flexible, fun test framework";
-      homepage = "https://mochajs.org/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   multi-file-swagger = nodeEnv.buildNodePackage {
     name = "multi-file-swagger";
     packageName = "multi-file-swagger";
@@ -56471,24 +37979,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  npm-merge-driver = nodeEnv.buildNodePackage {
-    name = "npm-merge-driver";
-    packageName = "npm-merge-driver";
-    version = "2.3.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz";
-      sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "git merge driver for automatically merging lockfiles";
-      homepage = "https://github.com/npm/npm-merge-driver#readme";
-      license = "ISC";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   nrm = nodeEnv.buildNodePackage {
     name = "nrm";
     packageName = "nrm";
@@ -56542,361 +38032,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  parsoid = nodeEnv.buildNodePackage {
-    name = "parsoid";
-    packageName = "parsoid";
-    version = "0.11.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/parsoid/-/parsoid-0.11.1.tgz";
-      sha512 = "t29ujC7jgKzuA25yXritkuF/rFGduN08c2CLOeSAjlKAzc/BUamZgvPWFqU/UVSRubnMYawJIQDX3m/RqKz7Xw==";
-    };
-    dependencies = [
-      (
-        sources."accepts-1.3.8"
-        // {
-          dependencies = [
-            sources."negotiator-0.6.3"
-          ];
-        }
-      )
-      sources."ajv-6.12.6"
-      sources."ansi-regex-4.1.1"
-      sources."ansi-styles-3.2.1"
-      sources."argparse-1.0.10"
-      sources."array-flatten-1.1.1"
-      sources."asap-2.0.6"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-0.9.2"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."babybird-0.0.1"
-      sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."bindings-1.5.0"
-      sources."bintrees-1.0.2"
-      sources."bl-1.2.3"
-      sources."bluebird-3.7.2"
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."content-type-1.0.5"
-          ];
-        }
-      )
-      sources."brace-expansion-1.1.11"
-      sources."bunyan-1.8.15"
-      sources."bunyan-syslog-udp-0.2.0"
-      sources."busboy-1.6.0"
-      sources."bytes-3.1.2"
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."camelcase-5.3.1"
-      sources."caseless-0.12.0"
-      sources."clarinet-0.11.0"
-      sources."cliui-5.0.0"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."colors-1.4.0"
-      sources."combined-stream-1.0.8"
-      sources."compressible-2.0.18"
-      (
-        sources."compression-1.8.0"
-        // {
-          dependencies = [
-            sources."negotiator-0.6.4"
-          ];
-        }
-      )
-      sources."concat-map-0.0.1"
-      sources."connect-busboy-0.0.2"
-      sources."content-disposition-0.5.4"
-      sources."content-type-git+https://github.com/wikimedia/content-type.git#master"
-      sources."cookie-0.7.1"
-      sources."cookie-signature-1.0.6"
-      sources."core-js-2.6.12"
-      sources."core-util-is-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
-      sources."delayed-stream-1.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."dnscache-1.0.2"
-      sources."dom-storage-2.1.0"
-      sources."domino-2.1.6"
-      sources."dtrace-provider-0.8.8"
-      sources."dunder-proto-1.0.1"
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."emoji-regex-7.0.3"
-      sources."encodeurl-2.0.0"
-      sources."entities-1.1.2"
-      sources."errno-0.1.8"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."escape-html-1.0.3"
-      sources."esprima-4.0.1"
-      sources."etag-1.8.1"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."content-type-1.0.5"
-          ];
-        }
-      )
-      sources."express-handlebars-3.1.0"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."finalhandler-1.3.1"
-      sources."find-up-3.0.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."gc-stats-1.4.1"
-      sources."gelf-stream-1.1.1"
-      sources."gelfling-0.3.1"
-      sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."getpass-0.1.7"
-      sources."glob-7.2.3"
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."handlebars-4.7.8"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."hat-0.0.3"
-      sources."heapdump-0.3.15"
-      sources."hot-shots-6.8.7"
-      sources."http-errors-2.0.0"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ipaddr.js-1.9.1"
-      sources."is-arguments-1.2.0"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."js-yaml-3.14.1"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."kad-fs-0.0.4"
-      sources."kad-localstorage-0.0.7"
-      sources."kad-memstore-0.0.1"
-      sources."limitation-0.2.3"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.clone-4.5.0"
-      sources."lodash.clonedeep-4.5.0"
-      sources."math-intrinsics-1.1.0"
-      sources."media-typer-0.3.0"
-      sources."mediawiki-title-0.6.5"
-      sources."merge-descriptors-1.0.3"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.53.0"
-      (
-        sources."mime-types-2.1.35"
-        // {
-          dependencies = [
-            sources."mime-db-1.52.0"
-          ];
-        }
-      )
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."moment-2.30.1"
-      sources."ms-2.0.0"
-      sources."msgpack5-3.6.1"
-      sources."mv-2.1.1"
-      sources."nan-2.22.2"
-      sources."ncp-2.0.0"
-      sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access"
-      sources."neo-async-2.6.2"
-      sources."node-gyp-build-4.8.4"
-      sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.13.4"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.7"
-      sources."on-finished-2.4.1"
-      sources."on-headers-1.0.2"
-      sources."once-1.4.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."parseurl-1.3.3"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-to-regexp-0.1.12"
-      sources."performance-now-2.1.0"
-      sources."pn-1.1.0"
-      sources."prfun-2.1.5"
-      sources."process-nextick-args-2.0.1"
-      sources."prom-client-11.5.3"
-      sources."promise-8.3.0"
-      sources."proxy-addr-2.0.7"
-      sources."prr-1.0.1"
-      sources."psl-1.15.0"
-      sources."punycode-2.3.1"
-      sources."qs-6.13.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      (
-        sources."request-2.88.2"
-        // {
-          dependencies = [
-            sources."qs-6.5.3"
-          ];
-        }
-      )
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      (
-        sources."rimraf-2.4.5"
-        // {
-          dependencies = [
-            sources."glob-6.0.4"
-          ];
-        }
-      )
-      sources."safe-buffer-5.2.1"
-      sources."safe-json-stringify-1.2.0"
-      sources."safer-buffer-2.1.2"
-      sources."semver-6.3.1"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            sources."encodeurl-1.0.2"
-            sources."ms-2.1.3"
-          ];
-        }
-      )
-      (
-        sources."serve-favicon-2.5.0"
-        // {
-          dependencies = [
-            sources."ms-2.1.1"
-            sources."safe-buffer-5.1.1"
-          ];
-        }
-      )
-      sources."serve-static-1.16.2"
-      (
-        sources."service-runner-2.9.0"
-        // {
-          dependencies = [
-            sources."semver-7.7.1"
-            sources."yargs-14.2.3"
-          ];
-        }
-      )
-      sources."set-blocking-2.0.0"
-      sources."set-function-length-1.2.2"
-      sources."setprototypeof-1.2.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."simplediff-0.1.1"
-      sources."source-map-0.6.1"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.18.0"
-      sources."statuses-2.0.1"
-      sources."streamsearch-1.1.0"
-      sources."string-width-3.1.0"
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strip-ansi-5.2.0"
-      sources."tdigest-0.1.2"
-      sources."toidentifier-1.0.1"
-      sources."tough-cookie-2.5.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-is-1.6.18"
-      sources."uglify-js-3.19.3"
-      sources."unix-dgram-2.0.6"
-      sources."unpipe-1.0.0"
-      sources."uri-js-4.4.1"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      sources."which-module-2.0.1"
-      (
-        sources."wikimedia-kad-fork-1.3.6"
-        // {
-          dependencies = [
-            sources."ms-0.7.3"
-          ];
-        }
-      )
-      sources."wikimedia-langconv-0.1.0"
-      sources."wikipeg-2.0.6"
-      sources."wordwrap-1.0.0"
-      sources."worker-farm-1.7.0"
-      sources."wrap-ansi-5.1.0"
-      sources."wrappy-1.0.2"
-      sources."y18n-4.0.3"
-      (
-        sources."yargs-13.3.2"
-        // {
-          dependencies = [
-            sources."yargs-parser-13.1.2"
-          ];
-        }
-      )
-      sources."yargs-parser-15.0.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Bidirectional runtime wikitext parser. Converts back and forth between wikitext and HTML/XML DOM with RDFa";
-      homepage = "https://github.com/wikimedia/parsoid#readme";
-      license = "GPL-2.0+";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   peerflix = nodeEnv.buildNodePackage {
     name = "peerflix";
     packageName = "peerflix";
@@ -58642,178 +39777,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  speed-test = nodeEnv.buildNodePackage {
-    name = "speed-test";
-    packageName = "speed-test";
-    version = "3.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/speed-test/-/speed-test-3.0.0.tgz";
-      sha512 = "CIlLQsG8ffQ2B+2A/s3rXiaTXDWlEKBMya64ajzDcpDZ8bpB5dOyznWQJB+lyUn6/lJ8P+5xe4jKO60S6yLoMw==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@types/minimist-1.2.5"
-      sources."@types/normalize-package-data-2.4.4"
-      sources."agent-base-4.3.0"
-      sources."ansi-escapes-5.0.0"
-      sources."ansi-regex-6.1.0"
-      sources."ansi-styles-4.3.0"
-      sources."arrify-1.0.1"
-      sources."base64-js-1.5.1"
-      sources."bl-5.1.0"
-      sources."buffer-6.0.3"
-      sources."camelcase-6.3.0"
-      sources."camelcase-keys-7.0.2"
-      sources."chalk-4.1.2"
-      sources."cli-cursor-4.0.0"
-      sources."cli-spinners-2.9.2"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."debug-3.1.0"
-      sources."decamelize-5.0.1"
-      (
-        sources."decamelize-keys-1.1.1"
-        // {
-          dependencies = [
-            sources."decamelize-1.2.0"
-            sources."map-obj-1.0.1"
-          ];
-        }
-      )
-      sources."defaults-1.0.4"
-      sources."draftlog-1.0.13"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-9.2.2"
-      sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."find-up-5.0.0"
-      sources."function-bind-1.1.2"
-      sources."hard-rejection-2.1.0"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-4.1.0"
-      sources."http-proxy-agent-2.1.0"
-      sources."https-proxy-agent-3.0.1"
-      sources."ieee754-1.2.1"
-      sources."indent-string-5.0.0"
-      sources."inherits-2.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.16.1"
-      sources."is-fullwidth-code-point-4.0.0"
-      sources."is-interactive-2.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-unicode-supported-1.3.0"
-      sources."js-tokens-4.0.0"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."kind-of-6.0.3"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-6.0.0"
-      (
-        sources."log-symbols-5.1.0"
-        // {
-          dependencies = [
-            sources."chalk-5.4.1"
-          ];
-        }
-      )
-      sources."log-update-5.0.1"
-      sources."lru-cache-6.0.0"
-      sources."map-obj-4.3.0"
-      sources."meow-10.1.5"
-      sources."mimic-fn-2.1.0"
-      sources."min-indent-1.0.1"
-      sources."minimist-options-4.1.0"
-      sources."ms-2.0.0"
-      sources."normalize-package-data-3.0.3"
-      sources."onetime-5.1.2"
-      (
-        sources."ora-6.3.1"
-        // {
-          dependencies = [
-            sources."chalk-5.4.1"
-          ];
-        }
-      )
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."parse-json-5.2.0"
-      sources."path-exists-4.0.0"
-      sources."picocolors-1.1.1"
-      sources."quick-lru-5.1.1"
-      sources."read-pkg-6.0.0"
-      sources."read-pkg-up-8.0.0"
-      sources."readable-stream-3.6.2"
-      sources."redent-4.0.0"
-      sources."restore-cursor-4.0.0"
-      sources."round-to-6.0.0"
-      sources."safe-buffer-5.2.1"
-      sources."sax-1.4.1"
-      sources."semver-7.7.1"
-      sources."signal-exit-3.0.7"
-      (
-        sources."slice-ansi-5.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-6.2.1"
-          ];
-        }
-      )
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      (
-        sources."speedtest-net-1.6.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."chalk-2.4.2"
-            sources."color-convert-1.9.3"
-            sources."color-name-1.1.3"
-            sources."has-flag-3.0.0"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-      sources."stdin-discarder-0.1.0"
-      sources."string-width-5.1.2"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-7.1.0"
-      sources."strip-indent-4.0.0"
-      sources."supports-color-7.2.0"
-      sources."trim-newlines-4.1.1"
-      sources."type-fest-1.4.0"
-      sources."util-deprecate-1.0.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."wcwidth-1.0.1"
-      (
-        sources."wrap-ansi-8.1.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-6.2.1"
-          ];
-        }
-      )
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-20.2.9"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Test your internet connection speed and ping using speedtest.net from the CLI";
-      homepage = "https://github.com/sindresorhus/speed-test#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   svelte-check = nodeEnv.buildNodePackage {
     name = "svelte-check";
     packageName = "svelte-check";
@@ -58861,55 +39824,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  tern = nodeEnv.buildNodePackage {
-    name = "tern";
-    packageName = "tern";
-    version = "0.24.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/tern/-/tern-0.24.3.tgz";
-      sha512 = "Z8uvtdWIlFn1GWy0HW5FhZ8VDryZwoJUdnjZU25C7/PBOltLIn1uv+WF3rVq6S1761YbsmbZYRP/l0ZJBCkvrw==";
-    };
-    dependencies = [
-      sources."acorn-6.4.2"
-      sources."acorn-loose-6.1.0"
-      sources."acorn-walk-6.2.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.3"
-      sources."enhanced-resolve-2.3.0"
-      sources."errno-0.1.8"
-      sources."fs.realpath-1.0.0"
-      sources."glob-7.2.3"
-      sources."graceful-fs-4.2.11"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."isarray-1.0.0"
-      sources."memory-fs-0.3.0"
-      sources."minimatch-3.1.2"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."process-nextick-args-2.0.1"
-      sources."prr-1.0.1"
-      sources."readable-stream-2.3.8"
-      sources."resolve-from-2.0.0"
-      sources."safe-buffer-5.1.2"
-      sources."string_decoder-1.1.1"
-      sources."tapable-0.2.9"
-      sources."util-deprecate-1.0.2"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A JavaScript code analyzer for deep, cross-editor language support";
-      homepage = "https://github.com/ternjs/tern#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   tiddlywiki = nodeEnv.buildNodePackage {
     name = "tiddlywiki";
     packageName = "tiddlywiki";
@@ -58978,51 +39892,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  ts-node = nodeEnv.buildNodePackage {
-    name = "ts-node";
-    packageName = "ts-node";
-    version = "10.9.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz";
-      sha512 = "f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==";
-    };
-    dependencies = [
-      sources."@cspotcode/source-map-support-0.8.1"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.9"
-      sources."@swc/core-1.11.9"
-      sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.15"
-      sources."@swc/types-0.1.19"
-      sources."@swc/wasm-1.11.9"
-      sources."@tsconfig/node10-1.0.11"
-      sources."@tsconfig/node12-1.0.11"
-      sources."@tsconfig/node14-1.0.3"
-      sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-22.13.10"
-      sources."acorn-8.14.1"
-      sources."acorn-walk-8.3.4"
-      sources."arg-4.1.3"
-      sources."create-require-1.1.1"
-      sources."diff-4.0.2"
-      sources."make-error-1.3.6"
-      sources."tslib-2.8.1"
-      sources."typescript-5.8.2"
-      sources."undici-types-6.20.0"
-      sources."v8-compile-cache-lib-3.0.1"
-      sources."yn-3.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "TypeScript execution environment and REPL for node.js, with source map support";
-      homepage = "https://typestrong.org/ts-node";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   ttf2eot = nodeEnv.buildNodePackage {
     name = "ttf2eot";
     packageName = "ttf2eot";
@@ -59223,143 +40092,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  vega-lite = nodeEnv.buildNodePackage {
-    name = "vega-lite";
-    packageName = "vega-lite";
-    version = "5.23.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.23.0.tgz";
-      sha512 = "l4J6+AWE3DIjvovEoHl2LdtCUkfm4zs8Xxx7INwZEAv+XVb6kR6vIN1gt3t2gN2gs/y4DYTs/RPoTeYAuEg6mA==";
-    };
-    dependencies = [
-      sources."@types/estree-1.0.6"
-      sources."@types/geojson-7946.0.4"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."cliui-8.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-7.2.0"
-      sources."d3-array-3.2.4"
-      sources."d3-color-3.1.0"
-      sources."d3-delaunay-6.0.4"
-      sources."d3-dispatch-3.0.1"
-      sources."d3-dsv-3.0.1"
-      sources."d3-force-3.0.0"
-      sources."d3-format-3.1.0"
-      sources."d3-geo-3.1.1"
-      sources."d3-geo-projection-4.0.0"
-      sources."d3-hierarchy-3.1.2"
-      sources."d3-interpolate-3.0.1"
-      sources."d3-path-3.1.0"
-      sources."d3-quadtree-3.0.1"
-      sources."d3-scale-4.0.2"
-      sources."d3-scale-chromatic-3.1.0"
-      sources."d3-shape-3.2.0"
-      sources."d3-time-3.1.0"
-      sources."d3-time-format-4.1.0"
-      sources."d3-timer-3.0.1"
-      sources."delaunator-5.0.1"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."escalade-3.2.0"
-      sources."get-caller-file-2.0.5"
-      sources."iconv-lite-0.6.3"
-      sources."internmap-2.0.3"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."json-stringify-pretty-compact-4.0.0"
-      sources."node-fetch-2.7.0"
-      sources."require-directory-2.1.1"
-      sources."robust-predicates-3.0.2"
-      sources."rw-1.3.3"
-      sources."safer-buffer-2.1.2"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      (
-        sources."topojson-client-3.1.0"
-        // {
-          dependencies = [
-            sources."commander-2.20.3"
-          ];
-        }
-      )
-      sources."tr46-0.0.3"
-      sources."tslib-2.8.1"
-      (
-        sources."vega-5.32.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-canvas-1.2.7"
-      sources."vega-crossfilter-4.1.3"
-      sources."vega-dataflow-5.7.7"
-      sources."vega-encode-4.10.2"
-      sources."vega-event-selector-3.0.1"
-      sources."vega-expression-5.1.2"
-      sources."vega-force-4.2.2"
-      sources."vega-format-1.1.3"
-      (
-        sources."vega-functions-5.17.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-geo-4.4.3"
-      sources."vega-hierarchy-4.1.3"
-      sources."vega-label-1.3.1"
-      sources."vega-loader-4.5.3"
-      sources."vega-parser-6.5.0"
-      sources."vega-projection-1.6.2"
-      sources."vega-regression-1.3.1"
-      sources."vega-runtime-6.2.1"
-      sources."vega-scale-7.4.2"
-      sources."vega-scenegraph-4.13.1"
-      (
-        sources."vega-selections-5.6.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-statistics-1.9.0"
-      sources."vega-time-2.1.3"
-      sources."vega-transforms-4.12.1"
-      (
-        sources."vega-typings-1.5.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-util-1.17.3"
-      sources."vega-view-5.15.0"
-      sources."vega-view-transforms-4.6.1"
-      sources."vega-voronoi-4.2.4"
-      sources."vega-wordcloud-4.1.6"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wrap-ansi-7.0.0"
-      sources."y18n-5.0.8"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Vega-Lite is a concise high-level language for interactive visualization";
-      homepage = "https://vega.github.io/vega-lite/";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";
@@ -59903,127 +40635,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  webpack = nodeEnv.buildNodePackage {
-    name = "webpack";
-    packageName = "webpack";
-    version = "5.98.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz";
-      sha512 = "UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==";
-    };
-    dependencies = [
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@types/eslint-9.6.1"
-      sources."@types/eslint-scope-3.7.7"
-      sources."@types/estree-1.0.6"
-      sources."@types/json-schema-7.0.15"
-      sources."@types/node-22.13.10"
-      sources."@webassemblyjs/ast-1.14.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.13.2"
-      sources."@webassemblyjs/helper-api-error-1.13.2"
-      sources."@webassemblyjs/helper-buffer-1.14.1"
-      sources."@webassemblyjs/helper-numbers-1.13.2"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.13.2"
-      sources."@webassemblyjs/helper-wasm-section-1.14.1"
-      sources."@webassemblyjs/ieee754-1.13.2"
-      sources."@webassemblyjs/leb128-1.13.2"
-      sources."@webassemblyjs/utf8-1.13.2"
-      sources."@webassemblyjs/wasm-edit-1.14.1"
-      sources."@webassemblyjs/wasm-gen-1.14.1"
-      sources."@webassemblyjs/wasm-opt-1.14.1"
-      sources."@webassemblyjs/wasm-parser-1.14.1"
-      sources."@webassemblyjs/wast-printer-1.14.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."acorn-8.14.1"
-      sources."ajv-8.17.1"
-      sources."ajv-formats-2.1.1"
-      sources."ajv-keywords-5.1.0"
-      sources."browserslist-4.24.4"
-      sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chrome-trace-event-1.0.4"
-      sources."commander-2.20.3"
-      sources."electron-to-chromium-1.5.118"
-      sources."enhanced-resolve-5.18.1"
-      sources."es-module-lexer-1.6.0"
-      sources."escalade-3.2.0"
-      sources."eslint-scope-5.1.1"
-      (
-        sources."esrecurse-4.3.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      sources."estraverse-4.3.0"
-      sources."events-3.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-uri-3.0.6"
-      sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."jest-worker-27.5.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."loader-runner-4.3.0"
-      sources."merge-stream-2.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."neo-async-2.6.2"
-      sources."node-releases-2.0.19"
-      sources."picocolors-1.1.1"
-      sources."randombytes-2.1.0"
-      sources."require-from-string-2.0.2"
-      sources."safe-buffer-5.2.1"
-      sources."schema-utils-4.3.0"
-      sources."serialize-javascript-6.0.2"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."supports-color-8.1.1"
-      sources."tapable-2.2.1"
-      sources."terser-5.39.0"
-      sources."terser-webpack-plugin-5.3.14"
-      sources."undici-types-6.20.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."watchpack-2.4.2"
-      sources."webpack-5.98.0"
-      sources."webpack-sources-3.2.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff";
-      homepage = "https://github.com/webpack/webpack";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
-  wring = nodeEnv.buildNodePackage {
-    name = "wring";
-    packageName = "wring";
-    version = "1.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz";
-      sha512 = "XoFoUf9gxnQkergF+FK+AuaI/iaSh9P0N1hqIGTTs1V3rjexH1ZZKuxuDUbdVGrwxvoTW4xpeZrNhBw6WJIIag==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Extract content from websites using CSS Selectors and XPath";
-      homepage = "https://github.com/osener/wring#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage {
     name = "_at_yaegassy_slash_coc-nginx";
     packageName = "@yaegassy/coc-nginx";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index dfc2f74ac83e..2e68dbedfa34 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -33,10 +33,6 @@ final: prev: {
     '';
   };
 
-  "@electron-forge/cli" = prev."@electron-forge/cli".override {
-    buildInputs = [ final.node-gyp-build ];
-  };
-
   fast-cli = prev.fast-cli.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     prePatch = ''
@@ -55,71 +51,6 @@ final: prev: {
     '';
   };
 
-  joplin = prev.joplin.override (oldAttrs: {
-    nativeBuildInputs = [
-      pkgs.pkg-config
-      (pkgs.python3.withPackages (ps: [ ps.setuptools ]))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      pkgs.xcbuild
-    ];
-    buildInputs = with pkgs; [
-      # required by sharp
-      # https://sharp.pixelplumbing.com/install
-      vips
-
-      libsecret
-      final.node-gyp-build
-      node-pre-gyp
-
-      pixman
-      cairo
-      pango
-    ];
-
-    # add newer node-addon-api to build sharp
-    # https://github.com/lovell/sharp/issues/3920
-    dependencies = [
-      {
-        name = "node-addon-api";
-        packageName = "node-addon-api";
-        version = "7.1.0";
-        src = fetchurl {
-          url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz";
-          sha512 = "mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==";
-        };
-      }
-    ]
-    ++ oldAttrs.dependencies;
-
-    meta = oldAttrs.meta // {
-      # ModuleNotFoundError: No module named 'distutils'
-      broken = stdenv.hostPlatform.isDarwin; # still broken on darwin
-    };
-  });
-
-  jsonplaceholder = prev.jsonplaceholder.override {
-    buildInputs = [ nodejs ];
-    postInstall = ''
-      exe=$out/bin/jsonplaceholder
-      mkdir -p $out/bin
-      cat >$exe <<EOF
-      #!${pkgs.runtimeShell}
-      exec -a jsonplaceholder ${nodejs}/bin/node $out/lib/node_modules/jsonplaceholder/index.js
-      EOF
-      chmod a+x $exe
-    '';
-  };
-
-  keyoxide = prev.keyoxide.override {
-    nativeBuildInputs = [ pkgs.pkg-config ];
-    buildInputs = with pkgs; [
-      pixman
-      cairo
-      pango
-    ];
-  };
-
   makam = prev.makam.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postFixup = ''
@@ -184,14 +115,6 @@ final: prev: {
     name = "rush";
   };
 
-  ts-node = prev.ts-node.override {
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    postInstall = ''
-      wrapProgram "$out/bin/ts-node" \
-      --prefix NODE_PATH : ${pkgs.typescript}/lib/node_modules
-    '';
-  };
-
   tsun = prev.tsun.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = ''
@@ -200,10 +123,6 @@ final: prev: {
     '';
   };
 
-  uppy-companion = prev."@uppy/companion".override {
-    name = "uppy-companion";
-  };
-
   vega-cli = prev.vega-cli.override {
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = with pkgs; [
@@ -215,22 +134,6 @@ final: prev: {
     ];
   };
 
-  vega-lite = prev.vega-lite.override {
-    postInstall = ''
-      cd node_modules
-      for dep in ${final.vega-cli}/lib/node_modules/vega-cli/node_modules/*; do
-        if [[ ! -d ''${dep##*/} ]]; then
-          ln -s "${final.vega-cli}/lib/node_modules/vega-cli/node_modules/''${dep##*/}"
-        fi
-      done
-    '';
-    passthru.tests = {
-      simple-execution = callPackage ./package-tests/vega-lite.nix {
-        inherit (final) vega-lite;
-      };
-    };
-  };
-
   wavedrom-cli = prev.wavedrom-cli.override {
     nativeBuildInputs = [
       pkgs.pkg-config
diff --git a/pkgs/development/node-packages/package-tests/vega-lite.nix b/pkgs/development/node-packages/package-tests/vega-lite.nix
deleted file mode 100644
index 6326053ef0a9..000000000000
--- a/pkgs/development/node-packages/package-tests/vega-lite.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ runCommand, vega-lite }:
-
-let
-  inherit (vega-lite) packageName version;
-in
-
-runCommand "${packageName}-tests" { meta.timeout = 60; } ''
-  # get version of installed program and compare with package version
-  claimed_version="$(${vega-lite}/bin/vl2vg --version)"
-  if [[ "$claimed_version" != "${version}" ]]; then
-    echo "Error: program version does not match package version ($claimed_version != ${version})"
-    exit 1
-  fi
-
-  # run dummy commands
-  ${vega-lite}/bin/vl2vg --help > /dev/null
-  ${vega-lite}/bin/vl2svg --help > /dev/null
-  ${vega-lite}/bin/vl2png --help > /dev/null
-  ${vega-lite}/bin/vl2pdf --help > /dev/null
-
-  # needed for Nix to register the command as successful
-  touch $out
-''
diff --git a/pkgs/development/ocaml-modules/0install-solver/default.nix b/pkgs/development/ocaml-modules/0install-solver/default.nix
new file mode 100644
index 000000000000..2801fbf47b89
--- /dev/null
+++ b/pkgs/development/ocaml-modules/0install-solver/default.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  ounit2,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "0install-solver";
+  version = "2.18";
+
+  src = fetchFromGitHub {
+    owner = "0install";
+    repo = "0install";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CxADWMYZBPobs65jeyMQjqu3zmm2PgtNgI/jUsYUp8I=";
+  };
+
+  doCheck = true;
+  checkInputs = [
+    ounit2
+  ];
+
+  meta = {
+    description = "Package dependency solver";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.stepbrobd ];
+    homepage = "https://0install.net";
+  };
+})
diff --git a/pkgs/development/ocaml-modules/b0/default.nix b/pkgs/development/ocaml-modules/b0/default.nix
index a6c0bb4327d8..f18002ccfc13 100644
--- a/pkgs/development/ocaml-modules/b0/default.nix
+++ b/pkgs/development/ocaml-modules/b0/default.nix
@@ -9,57 +9,51 @@
   cmdliner,
 }:
 
-let
+stdenv.mkDerivation rec {
 
-in
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "b0 is not available for OCaml ${ocaml.version}"
+  pname = "ocaml${ocaml.version}-b0";
+  version = "0.0.5";
 
-  stdenv.mkDerivation
-  rec {
+  src = fetchurl {
+    url = "${meta.homepage}/releases/b0-${version}.tbz";
+    sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I=";
+  };
 
-    pname = "ocaml${ocaml.version}-b0";
-    version = "0.0.5";
+  strictDeps = true;
 
-    src = fetchurl {
-      url = "${meta.homepage}/releases/b0-${version}.tbz";
-      sha256 = "sha256-ty04JQcP4RCme/VQw0ko2IBebWWX5cBU6nRTTeV1I/I=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [
+    topkg
+    cmdliner
+  ];
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [
-      topkg
-      cmdliner
-    ];
-
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      description = "Software construction and deployment kit";
-      longDescription = ''
-        WARNING this package is unstable and work in progress, do not depend on
-        it.
-        B0 describes software construction and deployments using modular and
-        customizable definitions written in OCaml. B0 describes:
-        * Build environments.
-        * Software configuration, build and testing.
-        * Source and binary deployments.
-        * Software life-cycle procedures.
-        B0 also provides the B00 build library which provides abitrary build
-        abstraction with reliable and efficient incremental rebuilds. The B00
-        library can be – and has been – used on its own to devise domain specific
-        build systems.
-      '';
-      homepage = "https://erratique.ch/software/b0";
-      inherit (ocaml.meta) platforms;
-      license = licenses.isc;
-      maintainers = [ maintainers.Julow ];
-    };
-  }
+  meta = with lib; {
+    description = "Software construction and deployment kit";
+    longDescription = ''
+      WARNING this package is unstable and work in progress, do not depend on
+      it.
+      B0 describes software construction and deployments using modular and
+      customizable definitions written in OCaml. B0 describes:
+      * Build environments.
+      * Software configuration, build and testing.
+      * Source and binary deployments.
+      * Software life-cycle procedures.
+      B0 also provides the B00 build library which provides abitrary build
+      abstraction with reliable and efficient incremental rebuilds. The B00
+      library can be – and has been – used on its own to devise domain specific
+      build systems.
+    '';
+    homepage = "https://erratique.ch/software/b0";
+    inherit (ocaml.meta) platforms;
+    license = licenses.isc;
+    maintainers = [ maintainers.Julow ];
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix
index 4120f81a1a02..57fc0f208589 100644
--- a/pkgs/development/ocaml-modules/bap/default.nix
+++ b/pkgs/development/ocaml-modules/bap/default.nix
@@ -42,111 +42,108 @@
   z3,
 }:
 
-if lib.versionOlder ocaml.version "4.08" then
-  throw "BAP is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-bap";
+  version = "2.5.0+pr1621";
+  src = fetchFromGitHub {
+    owner = "BinaryAnalysisPlatform";
+    repo = "bap";
+    rev = "65c282d94e8b7028e8a986c637db3a2378a753f6";
+    hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0=";
+  };
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-bap";
-    version = "2.5.0+pr1621";
-    src = fetchFromGitHub {
-      owner = "BinaryAnalysisPlatform";
-      repo = "bap";
-      rev = "65c282d94e8b7028e8a986c637db3a2378a753f6";
-      hash = "sha256-LUZZOgG1T8xa5jLA/fDft8ofYb/Yf6QjTrl6AlLY7H0=";
-    };
+  sigs = fetchurl {
+    url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
+    sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk";
+  };
 
-    sigs = fetchurl {
-      url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip";
-      sha256 = "0d69jd28z4g64mglq94kj5imhmk5f6sgcsh9q2nij3b0arpcliwk";
-    };
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  setupHook = writeText "setupHook.sh" ''
+    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/"
+    export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/"
+  '';
 
-    setupHook = writeText "setupHook.sh" ''
-      export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}/"
-      export CAML_LD_LIBRARY_PATH="''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}''$1/lib/ocaml/${ocaml.version}/site-lib/ocaml${ocaml.version}-bap-${version}-llvm-plugins/"
-    '';
+  nativeBuildInputs = [
+    which
+    makeWrapper
+    ocaml
+    findlib
+    ocamlbuild
+    ocaml_oasis
+  ];
 
-    nativeBuildInputs = [
-      which
-      makeWrapper
-      ocaml
-      findlib
-      ocamlbuild
-      ocaml_oasis
-    ];
+  buildInputs = [
+    ocamlbuild
+    linenoise
+    ounit
+    ppx_bitstring
+    z3
+    utop
+    libxml2
+    ncurses
+  ];
 
-    buildInputs = [
-      ocamlbuild
-      linenoise
-      ounit
-      ppx_bitstring
-      z3
-      utop
-      libxml2
-      ncurses
-    ];
+  propagatedBuildInputs = [
+    bitstring
+    camlzip
+    cmdliner
+    ppx_bap
+    core_kernel
+    ezjsonm
+    fileutils
+    jane_rope
+    mmap
+    lwt
+    ocamlgraph
+    ocurl
+    re
+    uri
+    zarith
+    piqi
+    parsexp
+    piqi-ocaml
+    uuidm
+    frontc
+    yojson
+  ];
 
-    propagatedBuildInputs = [
-      bitstring
-      camlzip
-      cmdliner
-      ppx_bap
-      core_kernel
-      ezjsonm
-      fileutils
-      jane_rope
-      mmap
-      lwt
-      ocamlgraph
-      ocurl
-      re
-      uri
-      zarith
-      piqi
-      parsexp
-      piqi-ocaml
-      uuidm
-      frontc
-      yojson
-    ];
+  installPhase = ''
+    runHook preInstall
+    export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
+    export PATH=$PATH:$out/bin
+    export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
+    mkdir -p $out/lib/bap
+    make install
+    rm $out/bin/baptop
+    makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\""
+    wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH
+    ln -s $sigs $out/share/bap/sigs.zip
+    runHook postInstall
+  '';
 
-    installPhase = ''
-      runHook preInstall
-      export OCAMLPATH=$OCAMLPATH:$OCAMLFIND_DESTDIR;
-      export PATH=$PATH:$out/bin
-      export CAML_LD_LIBRARY_PATH=''${CAML_LD_LIBRARY_PATH-}''${CAML_LD_LIBRARY_PATH:+:}$OCAMLFIND_DESTDIR/bap-plugin-llvm/:$OCAMLFIND_DESTDIR/bap/
-      mkdir -p $out/lib/bap
-      make install
-      rm $out/bin/baptop
-      makeWrapper ${utop}/bin/utop $out/bin/baptop --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH --add-flags "-ppx ppx-bap -short-paths -require \"bap.top\""
-      wrapProgram $out/bin/bapbuild --prefix OCAMLPATH : $OCAMLPATH --prefix PATH : $PATH
-      ln -s $sigs $out/share/bap/sigs.zip
-      runHook postInstall
-    '';
+  disableIda = "--disable-ida";
+  disableGhidra = "--disable-ghidra";
 
-    disableIda = "--disable-ida";
-    disableGhidra = "--disable-ghidra";
+  patches = [
+    ./curses_is_ncurses.patch
+  ];
 
-    patches = [
-      ./curses_is_ncurses.patch
-    ];
+  preConfigure = ''
+    substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope
+  '';
 
-    preConfigure = ''
-      substituteInPlace oasis/monads --replace-warn core_kernel.rope jane_rope
-    '';
+  configureFlags = [
+    "--enable-everything ${disableIda} ${disableGhidra}"
+    "--with-llvm-config=${llvm.dev}/bin/llvm-config"
+  ];
 
-    configureFlags = [
-      "--enable-everything ${disableIda} ${disableGhidra}"
-      "--with-llvm-config=${llvm.dev}/bin/llvm-config"
-    ];
-
-    meta = with lib; {
-      description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages";
-      homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
-      license = licenses.mit;
-      maintainers = [ maintainers.maurer ];
-      mainProgram = "bap";
-    };
-  }
+  meta = with lib; {
+    description = "Platform for binary analysis. It is written in OCaml, but can be used from other languages";
+    homepage = "https://github.com/BinaryAnalysisPlatform/bap/";
+    license = licenses.mit;
+    maintainers = [ maintainers.maurer ];
+    mainProgram = "bap";
+    broken = lib.versionOlder ocaml.version "4.08";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix
index 64fcbf8f93a8..08b028c874ee 100644
--- a/pkgs/development/ocaml-modules/base64/default.nix
+++ b/pkgs/development/ocaml-modules/base64/default.nix
@@ -11,14 +11,13 @@
 
 buildDunePackage rec {
   pname = "base64";
-  version = "3.5.1";
+  version = "3.5.2";
 
-  minimalOCamlVersion = "4.03";
-  duneVersion = "3";
+  minimalOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-${version}.tbz";
-    hash = "sha256-2P7apZvRL+rnrMCLWSjdR4qsUj9MqNJARw0lAGUcZe0=";
+    hash = "sha256-s/XOMBqnLHAy75C+IzLXL/OWKSLADuKuxryt4Yei9Zs=";
   };
 
   nativeBuildInputs = [ findlib ];
diff --git a/pkgs/development/ocaml-modules/batteries/default.nix b/pkgs/development/ocaml-modules/batteries/default.nix
index c86ac0591a1b..707c855b4944 100644
--- a/pkgs/development/ocaml-modules/batteries/default.nix
+++ b/pkgs/development/ocaml-modules/batteries/default.nix
@@ -46,8 +46,5 @@ buildDunePackage (finalAttrs: {
       language.
     '';
     license = lib.licenses.lgpl21Plus;
-    maintainers = [
-      lib.maintainers.maggesi
-    ];
   };
 })
diff --git a/pkgs/development/ocaml-modules/bitstring/ppx.nix b/pkgs/development/ocaml-modules/bitstring/ppx.nix
index 18055887c8c6..9215c8293d28 100644
--- a/pkgs/development/ocaml-modules/bitstring/ppx.nix
+++ b/pkgs/development/ocaml-modules/bitstring/ppx.nix
@@ -8,28 +8,25 @@
   ounit,
 }:
 
-if lib.versionOlder ppxlib.version "0.18.0" then
-  throw "ppx_bitstring is not available with ppxlib-${ppxlib.version}"
-else
+buildDunePackage {
+  pname = "ppx_bitstring";
+  inherit (bitstring) version src;
 
-  buildDunePackage {
-    pname = "ppx_bitstring";
-    inherit (bitstring) version src;
+  patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
+    url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch";
+    hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g=";
+  });
 
-    patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch {
-      url = "https://github.com/xguerin/bitstring/commit/b42d4924cbb5ec5fd5309e6807852b63f456f35d.patch";
-      hash = "sha256-wtpSnGOzIUTmB3LhyHGopecy7F/5SYFOwaR6eReV+6g=";
-    });
+  buildInputs = [
+    bitstring
+    ppxlib
+  ];
 
-    buildInputs = [
-      bitstring
-      ppxlib
-    ];
+  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  checkInputs = [ ounit ];
 
-    doCheck = lib.versionAtLeast ocaml.version "4.08";
-    checkInputs = [ ounit ];
-
-    meta = bitstring.meta // {
-      description = "Bitstrings and bitstring matching for OCaml - PPX extension";
-    };
-  }
+  meta = bitstring.meta // {
+    description = "Bitstrings and bitstring matching for OCaml - PPX extension";
+    broken = lib.versionOlder ppxlib.version "0.18.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
index d99e050d7642..aa918ae4d674 100644
--- a/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
+++ b/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
@@ -8,11 +8,7 @@
 }:
 
 let
-  version =
-    if lib.versionAtLeast ocaml.version "5.3" then
-      throw "brisk-reconciler is not available for OCaml ${ocaml.version}"
-    else
-      "1.0.0-alpha1";
+  version = "1.0.0-alpha1";
 in
 
 buildDunePackage {
@@ -42,5 +38,6 @@ buildDunePackage {
     homepage = "https://github.com/briskml/brisk-reconciler";
     maintainers = with lib.maintainers; [ momeemt ];
     license = lib.licenses.mit;
+    broken = lib.versionAtLeast ocaml.version "5.3";
   };
 }
diff --git a/pkgs/development/ocaml-modules/bz2/default.nix b/pkgs/development/ocaml-modules/bz2/default.nix
index 4fabc3418885..3d096571e86e 100644
--- a/pkgs/development/ocaml-modules/bz2/default.nix
+++ b/pkgs/development/ocaml-modules/bz2/default.nix
@@ -8,44 +8,41 @@
   autoreconfHook,
 }:
 
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0" then
-  throw "bz2 is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-bz2";
+  version = "0.7.0";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-bz2";
-    version = "0.7.0";
+  src = fetchFromGitLab {
+    owner = "irill";
+    repo = "camlbz2";
+    rev = version;
+    sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U=";
+  };
 
-    src = fetchFromGitLab {
-      owner = "irill";
-      repo = "camlbz2";
-      rev = version;
-      sha256 = "sha256-jBFEkLN2fbC3LxTu7C0iuhvNg64duuckBHWZoBxrV/U=";
-    };
+  autoreconfFlags = [
+    "-I"
+    "."
+  ];
 
-    autoreconfFlags = [
-      "-I"
-      "."
-    ];
+  nativeBuildInputs = [
+    autoreconfHook
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      autoreconfHook
-      ocaml
-      findlib
-    ];
+  propagatedBuildInputs = [
+    bzip2
+  ];
 
-    propagatedBuildInputs = [
-      bzip2
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
 
-    preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
-
-    meta = with lib; {
-      description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library";
-      downloadPage = "https://gitlab.com/irill/camlbz2";
-      license = licenses.lgpl21;
-      maintainers = [ ];
-    };
-  }
+  meta = with lib; {
+    description = "OCaml bindings for the libbz2 (AKA, bzip2) (de)compression library";
+    downloadPage = "https://gitlab.com/irill/camlbz2";
+    license = licenses.lgpl21;
+    broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
+    maintainers = [ ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix
index 3bd8856bf1ce..65eafc11744d 100644
--- a/pkgs/development/ocaml-modules/camlpdf/default.nix
+++ b/pkgs/development/ocaml-modules/camlpdf/default.nix
@@ -6,36 +6,33 @@
   findlib,
 }:
 
-if lib.versionOlder ocaml.version "4.10" then
-  throw "camlpdf is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  version = "2.8";
+  pname = "ocaml${ocaml.version}-camlpdf";
 
-  stdenv.mkDerivation rec {
-    version = "2.8";
-    pname = "ocaml${ocaml.version}-camlpdf";
+  src = fetchFromGitHub {
+    owner = "johnwhitington";
+    repo = "camlpdf";
+    rev = "v${version}";
+    hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "johnwhitington";
-      repo = "camlpdf";
-      rev = "v${version}";
-      hash = "sha256-+SFuFqlrP0nwm199y0QFWYvlwD+Cbh0PHA5bmXIWdNk=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  preInstall = ''
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
+  '';
 
-    preInstall = ''
-      mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
-    '';
-
-    meta = with lib; {
-      description = "OCaml library for reading, writing and modifying PDF files";
-      homepage = "https://github.com/johnwhitington/camlpdf";
-      license = licenses.lgpl21Plus;
-      maintainers = with maintainers; [ vbgl ];
-    };
-  }
+  meta = with lib; {
+    description = "OCaml library for reading, writing and modifying PDF files";
+    homepage = "https://github.com/johnwhitington/camlpdf";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ vbgl ];
+    broken = lib.versionOlder ocaml.version "4.10";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 89913be9f02e..615be6448431 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -95,6 +95,5 @@ stdenv.mkDerivation {
       ocamlLgplLinkingException
     ];
     inherit (ocaml.meta) platforms;
-    maintainers = with maintainers; [ maggesi ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/camomile/0.8.5.nix b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
index 430991dcad07..ebf33cec061d 100644
--- a/pkgs/development/ocaml-modules/camomile/0.8.5.nix
+++ b/pkgs/development/ocaml-modules/camomile/0.8.5.nix
@@ -39,8 +39,5 @@ stdenv.mkDerivation {
     description = "Comprehensive Unicode library for OCaml";
     license = lib.licenses.lgpl21;
     inherit (ocaml.meta) platforms;
-    maintainers = [
-      lib.maintainers.maggesi
-    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/chacha/default.nix b/pkgs/development/ocaml-modules/chacha/default.nix
deleted file mode 100644
index f5d6c4c1008b..000000000000
--- a/pkgs/development/ocaml-modules/chacha/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  buildDunePackage,
-  fetchFromGitHub,
-  fetchpatch,
-  ocaml,
-
-  alcotest,
-  cstruct,
-  mirage-crypto,
-}:
-
-buildDunePackage rec {
-  pname = "chacha";
-  version = "1.1.0";
-
-  src = fetchFromGitHub {
-    owner = "abeaumont";
-    repo = "ocaml-chacha";
-    rev = version;
-    hash = "sha256-PmeiFloU0k3SqOK1VjaliiCEzDzrzyMSasgnO5fJS1k=";
-  };
-
-  # Ensure compatibility with cstruct ≥ 6.1.0
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/abeaumont/ocaml-chacha/commit/fbe4a0a808226229728a68f278adf370251196fd.patch";
-      sha256 = "sha256-y7X9toFDrgdv3qmFmUs7K7QS+Gy45rRLulKy48m7uqc=";
-    })
-  ];
-
-  propagatedBuildInputs = [
-    cstruct
-    mirage-crypto
-  ];
-
-  # alcotest isn't available for OCaml < 4.05 due to fmt
-  doCheck = lib.versionAtLeast ocaml.version "4.05";
-  checkInputs = [ alcotest ];
-
-  meta = {
-    homepage = "https://github.com/abeaumont/ocaml-chacha";
-    description = "ChaCha20, ChaCha12 and ChaCha8 encryption functions, in OCaml";
-    longDescription = ''
-      An OCaml implementation of ChaCha functions, both ChaCha20 and the reduced
-      ChaCha8 and ChaCha12 functions. The hot loop is implemented in C for efficiency
-      reasons.
-    '';
-    license = lib.licenses.bsd2;
-    maintainers = with lib.maintainers; [ fufexan ];
-    broken = true; # Not compatible with mirage-crypto ≥ 1.0
-  };
-}
diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix
index da1c0aa10c2b..a0b36953bf47 100644
--- a/pkgs/development/ocaml-modules/cil/default.nix
+++ b/pkgs/development/ocaml-modules/cil/default.nix
@@ -8,41 +8,38 @@
   ocamlbuild,
 }:
 
-if lib.versionAtLeast ocaml.version "4.06" then
-  throw "cil is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml-cil";
+  version = "1.7.3";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml-cil";
-    version = "1.7.3";
+  src = fetchurl {
+    url = "mirror://sourceforge/cil/cil-${version}.tar.gz";
+    sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9";
+  };
 
-    src = fetchurl {
-      url = "mirror://sourceforge/cil/cil-${version}.tar.gz";
-      sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9";
-    };
+  nativeBuildInputs = [
+    perl
+    ocaml
+    findlib
+    ocamlbuild
+  ];
 
-    nativeBuildInputs = [
-      perl
-      ocaml
-      findlib
-      ocamlbuild
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  preConfigure = ''
+    substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)'
+    export FORCE_PERL_PREFIX=1
+  '';
+  prefixKey = "-prefix=";
 
-    preConfigure = ''
-      substituteInPlace Makefile.in --replace 'MACHDEPCC=gcc' 'MACHDEPCC=$(CC)'
-      export FORCE_PERL_PREFIX=1
-    '';
-    prefixKey = "-prefix=";
-
-    meta = with lib; {
-      homepage = "https://sourceforge.net/projects/cil/";
-      description = "Front-end for the C programming language that facilitates program analysis and transformation";
-      license = licenses.bsd3;
-      maintainers = [ maintainers.vbgl ];
-      platforms = ocaml.meta.platforms or [ ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://sourceforge.net/projects/cil/";
+    description = "Front-end for the C programming language that facilitates program analysis and transformation";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    broken = lib.versionAtLeast ocaml.version "4.06";
+    platforms = ocaml.meta.platforms or [ ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/cmarkit/default.nix b/pkgs/development/ocaml-modules/cmarkit/default.nix
index 7589b9dd9a7f..b4828756f5cd 100644
--- a/pkgs/development/ocaml-modules/cmarkit/default.nix
+++ b/pkgs/development/ocaml-modules/cmarkit/default.nix
@@ -9,41 +9,38 @@
   topkg,
 }:
 
-if lib.versionOlder ocaml.version "4.14.0" then
-  throw "cmarkit is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "cmarkit";
+  version = "0.3.0";
 
-  stdenv.mkDerivation rec {
-    pname = "cmarkit";
-    version = "0.3.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz";
+    hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c=";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/cmarkit/releases/cmarkit-${version}.tbz";
-      hash = "sha256-RouM5iU7VeTT0+4yhBgdEmxROeP/X31iqDjd1VI7z5c=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
+  buildInputs = [
+    topkg
+    cmdliner
+  ];
 
-    buildInputs = [
-      topkg
-      cmdliner
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      description = "CommonMark parser and renderer for OCaml";
-      homepage = "https://erratique.ch/software/cmarkit";
-      changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md";
-      license = licenses.isc;
-      maintainers = [ ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "CommonMark parser and renderer for OCaml";
+    homepage = "https://erratique.ch/software/cmarkit";
+    changelog = "https://github.com/dbuenzli/cmarkit/blob/v${version}/CHANGES.md";
+    license = licenses.isc;
+    maintainers = [ ];
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.14.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/cmdliner/1_0.nix b/pkgs/development/ocaml-modules/cmdliner/1_0.nix
index ee57846783f9..32dbdff6a8fc 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1_0.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/1_0.nix
@@ -5,8 +5,6 @@
   ocaml,
 }:
 
-assert (lib.versionAtLeast ocaml.version "4.03");
-
 stdenv.mkDerivation rec {
   pname = "cmdliner";
   version = "1.0.4";
@@ -34,5 +32,6 @@ stdenv.mkDerivation rec {
     license = licenses.isc;
     inherit (ocaml.meta) platforms;
     maintainers = [ maintainers.vbgl ];
+    broken = !(lib.versionAtLeast ocaml.version "4.03");
   };
 }
diff --git a/pkgs/development/ocaml-modules/cmdliner/1_1.nix b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
index 31ec0e69ef2f..521b9b53168c 100644
--- a/pkgs/development/ocaml-modules/cmdliner/1_1.nix
+++ b/pkgs/development/ocaml-modules/cmdliner/1_1.nix
@@ -5,36 +5,33 @@
   ocaml,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "cmdliner 1.1 is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "cmdliner";
+  version = "1.3.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "cmdliner";
-    version = "1.3.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
+    sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs=";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz";
-      sha256 = "sha256-joGA9XO0QPanqMII2rLK5KgjhP7HMtInhNG7bmQWjLs=";
-    };
+  nativeBuildInputs = [ ocaml ];
 
-    nativeBuildInputs = [ ocaml ];
+  makeFlags = [ "PREFIX=$(out)" ];
+  installTargets = "install install-doc";
+  installFlags = [
+    "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}"
+    "DOCDIR=$(out)/share/doc/${pname}"
+  ];
+  postInstall = ''
+    mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam}
+  '';
 
-    makeFlags = [ "PREFIX=$(out)" ];
-    installTargets = "install install-doc";
-    installFlags = [
-      "LIBDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/${pname}"
-      "DOCDIR=$(out)/share/doc/${pname}"
-    ];
-    postInstall = ''
-      mv $out/lib/ocaml/${ocaml.version}/site-lib/${pname}/{opam,${pname}.opam}
-    '';
-
-    meta = with lib; {
-      homepage = "https://erratique.ch/software/cmdliner";
-      description = "OCaml module for the declarative definition of command line interfaces";
-      license = licenses.isc;
-      inherit (ocaml.meta) platforms;
-      maintainers = [ maintainers.vbgl ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://erratique.ch/software/cmdliner";
+    description = "OCaml module for the declarative definition of command line interfaces";
+    license = licenses.isc;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ maintainers.vbgl ];
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/config-file/default.nix b/pkgs/development/ocaml-modules/config-file/default.nix
index 4bb913d544bf..149425301a6d 100644
--- a/pkgs/development/ocaml-modules/config-file/default.nix
+++ b/pkgs/development/ocaml-modules/config-file/default.nix
@@ -7,34 +7,31 @@
   camlp4,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "config-file is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml-config-file";
+  version = "1.2";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml-config-file";
-    version = "1.2";
+  src = fetchurl {
+    url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz";
+    sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q";
+  };
 
-    src = fetchurl {
-      url = "https://forge.ocamlcore.org/frs/download.php/1387/config-file-${version}.tar.gz";
-      sha256 = "1b02yxcnsjhr05ssh2br2ka4hxsjpdw34ldl3nk33wfnkwk7g67q";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    camlp4
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      camlp4
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = {
-      homepage = "http://config-file.forge.ocamlcore.org/";
-      platforms = ocaml.meta.platforms or [ ];
-      description = "OCaml library used to manage the configuration file(s) of an application";
-      license = lib.licenses.lgpl2Plus;
-      maintainers = with lib.maintainers; [ vbgl ];
-    };
-  }
+  meta = {
+    homepage = "http://config-file.forge.ocamlcore.org/";
+    platforms = ocaml.meta.platforms or [ ];
+    description = "OCaml library used to manage the configuration file(s) of an application";
+    license = lib.licenses.lgpl2Plus;
+    broken = lib.versionAtLeast ocaml.version "5.0";
+    maintainers = with lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix
index 66823ce21fa1..8dff973a92e1 100644
--- a/pkgs/development/ocaml-modules/cpdf/default.nix
+++ b/pkgs/development/ocaml-modules/cpdf/default.nix
@@ -7,44 +7,41 @@
   camlpdf,
 }:
 
-if lib.versionOlder ocaml.version "4.10" then
-  throw "cpdf is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-cpdf";
+  version = "2.8";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-cpdf";
-    version = "2.8";
+  src = fetchFromGitHub {
+    owner = "johnwhitington";
+    repo = "cpdf-source";
+    rev = "v${version}";
+    hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "johnwhitington";
-      repo = "cpdf-source";
-      rev = "v${version}";
-      hash = "sha256-DvTY5EQcvnL76RlQTcVqBiycqbCdGQCXzarSMH2P/pg=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
+  propagatedBuildInputs = [ camlpdf ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
-    propagatedBuildInputs = [ camlpdf ];
+  strictDeps = true;
 
-    strictDeps = true;
+  preInstall = ''
+    mkdir -p $OCAMLFIND_DESTDIR
+    mkdir -p $out/bin
+    cp cpdf $out/bin
+    mkdir -p $out/share/
+    cp -r doc $out/share
+    cp cpdfmanual.pdf $out/share/doc/cpdf/
+  '';
 
-    preInstall = ''
-      mkdir -p $OCAMLFIND_DESTDIR
-      mkdir -p $out/bin
-      cp cpdf $out/bin
-      mkdir -p $out/share/
-      cp -r doc $out/share
-      cp cpdfmanual.pdf $out/share/doc/cpdf/
-    '';
-
-    meta = with lib; {
-      description = "PDF Command Line Tools";
-      homepage = "https://www.coherentpdf.com/";
-      license = licenses.agpl3Only;
-      maintainers = [ maintainers.vbgl ];
-      mainProgram = "cpdf";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "PDF Command Line Tools";
+    homepage = "https://www.coherentpdf.com/";
+    license = licenses.agpl3Only;
+    maintainers = [ maintainers.vbgl ];
+    mainProgram = "cpdf";
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.10";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/cryptgps/default.nix b/pkgs/development/ocaml-modules/cryptgps/default.nix
index b69342f19add..fe9bb0242645 100644
--- a/pkgs/development/ocaml-modules/cryptgps/default.nix
+++ b/pkgs/development/ocaml-modules/cryptgps/default.nix
@@ -6,43 +6,37 @@
   findlib,
 }:
 
-if lib.versionAtLeast ocaml.version "4.06" then
-  throw "cryptgps is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation {
+  pname = "ocaml-cryptgps";
+  version = "0.2.1";
 
-  stdenv.mkDerivation {
-    pname = "ocaml-cryptgps";
-    version = "0.2.1";
+  src = fetchurl {
+    url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz";
+    sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s";
+  };
 
-    src = fetchurl {
-      url = "http://download.camlcity.org/download/cryptgps-0.2.1.tar.gz";
-      sha256 = "1mp7i42cm9w9grmcsa69m3h1ycpn6a48p43y4xj8rsc12x9nav3s";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  dontConfigure = true; # Skip configure phase
 
-    dontConfigure = true; # Skip configure phase
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = {
-      homepage = "http://projects.camlcity.org/projects/cryptgps.html";
-      description = "Cryptographic functions for OCaml";
-      longDescription = ''
-        This library implements the symmetric cryptographic algorithms
-        Blowfish, DES, and 3DES. The algorithms are written in O'Caml,
-        i.e. this is not a binding to some C library, but the implementation
-        itself.
-      '';
-      license = lib.licenses.mit;
-      inherit (ocaml.meta) platforms;
-      maintainers = [
-        lib.maintainers.maggesi
-      ];
-    };
-  }
+  meta = {
+    homepage = "http://projects.camlcity.org/projects/cryptgps.html";
+    description = "Cryptographic functions for OCaml";
+    longDescription = ''
+      This library implements the symmetric cryptographic algorithms
+      Blowfish, DES, and 3DES. The algorithms are written in O'Caml,
+      i.e. this is not a binding to some C library, but the implementation
+      itself.
+    '';
+    license = lib.licenses.mit;
+    broken = lib.versionAtLeast ocaml.version "4.06";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix
index 1de4fd6c0fd9..33ec440fb5a2 100644
--- a/pkgs/development/ocaml-modules/cryptokit/default.nix
+++ b/pkgs/development/ocaml-modules/cryptokit/default.nix
@@ -38,8 +38,5 @@ buildDunePackage rec {
     homepage = "http://pauillac.inria.fr/~xleroy/software.html";
     description = "Library of cryptographic primitives for OCaml";
     license = lib.licenses.lgpl2Only;
-    maintainers = [
-      lib.maintainers.maggesi
-    ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix
index 158c890aec42..a33e4c17d9c6 100644
--- a/pkgs/development/ocaml-modules/directories/default.nix
+++ b/pkgs/development/ocaml-modules/directories/default.nix
@@ -5,17 +5,17 @@
   fpath,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "directories";
-  version = "0.6";
+  version = "0.7";
 
   minimalOCamlVersion = "4.14";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
-    repo = pname;
-    tag = version;
-    hash = "sha256-c/9ChiSODD1K7YsMj65tjErAwXeWvEQ8BkAcUvsr19c=";
+    repo = "directories";
+    tag = finalAttrs.version;
+    hash = "sha256-6qPdHqkZ0xREOTFOe5sGfz2ysDX+9JZDrEmJvenBcqw=";
   };
 
   propagatedBuildInputs = [
@@ -35,8 +35,11 @@ buildDunePackage rec {
       xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
       macOS.
     '';
-    changelog = "https://raw.githubusercontent.com/OCamlPro/directories/refs/tags/${src.tag}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/OCamlPro/directories/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ bcc32 ];
+    maintainers = with lib.maintainers; [
+      bcc32
+      redianthus
+    ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 7fb990255e8b..539005aac186 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -16,15 +16,15 @@
   ohex,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "dns";
-  version = "10.1.0";
+  version = "10.2.2";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
-    url = "https://github.com/mirage/ocaml-dns/releases/download/v${version}/dns-${version}.tbz";
-    hash = "sha256-XG/qUUzsOccy5xdkZD6PuViN7gOMmRwYSsy+07QeN9I=";
+    url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz";
+    hash = "sha256-USPXFn9fs6WrcM8LPMyWUInsRA3Aft6r+MBWjuc3p/A=";
   };
 
   propagatedBuildInputs = [
@@ -51,4 +51,4 @@ buildDunePackage rec {
     maintainers = [ lib.maintainers.vbgl ];
   };
 
-}
+})
diff --git a/pkgs/development/ocaml-modules/dns/resolver.nix b/pkgs/development/ocaml-modules/dns/resolver.nix
index e687badef235..d4ba0ba198ec 100644
--- a/pkgs/development/ocaml-modules/dns/resolver.nix
+++ b/pkgs/development/ocaml-modules/dns/resolver.nix
@@ -15,6 +15,7 @@
   tls,
   tls-mirage,
   dnssec,
+  ca-certs-nss,
   alcotest,
 }:
 
@@ -39,6 +40,7 @@ buildDunePackage {
     tcpip
     tls
     tls-mirage
+    ca-certs-nss
   ];
 
   doCheck = true;
diff --git a/pkgs/development/ocaml-modules/dockerfile/default.nix b/pkgs/development/ocaml-modules/dockerfile/default.nix
index f052e9be0e40..7b738a49adfd 100644
--- a/pkgs/development/ocaml-modules/dockerfile/default.nix
+++ b/pkgs/development/ocaml-modules/dockerfile/default.nix
@@ -8,15 +8,15 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "dockerfile";
-  version = "8.3.2";
+  version = "8.3.3";
 
   src = fetchFromGitHub {
     owner = "ocurrent";
     repo = "ocaml-dockerfile";
-    tag = version;
-    hash = "sha256-L4TjCf8SaNMxqkrr+AoL/Lx2oWgf2owJFs26lu68ejs=";
+    tag = finalAttrs.version;
+    hash = "sha256-F58KnC4YpsS0ehmi6efFMT+WG5BDuYfQOA1RsFVtO/8=";
   };
 
   propagatedBuildInputs = [
@@ -35,8 +35,8 @@ buildDunePackage rec {
     description = "Interface for creating Dockerfiles";
     homepage = "https://www.ocurrent.org/ocaml-dockerfile/dockerfile/Dockerfile/index.html";
     downloadPage = "https://github.com/ocurrent/ocaml-dockerfile";
-    changelog = "https://github.com/ocurrent/ocaml-dockerfile/blob/v${version}/CHANGES.md";
+    changelog = "https://github.com/ocurrent/ocaml-dockerfile/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/dolmen/model.nix b/pkgs/development/ocaml-modules/dolmen/model.nix
new file mode 100644
index 000000000000..7c299fbc7cfb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/dolmen/model.nix
@@ -0,0 +1,25 @@
+{
+  buildDunePackage,
+  dolmen,
+  dolmen_loop,
+  farith,
+  ppx_deriving,
+  zarith,
+}:
+
+buildDunePackage {
+  pname = "dolmen_model";
+  inherit (dolmen) src version;
+
+  propagatedBuildInputs = [
+    dolmen
+    dolmen_loop
+    farith
+    ppx_deriving
+    zarith
+  ];
+
+  meta = dolmen.meta // {
+    description = "Dolmen library for verifying models generated by automated theorem provers and SMT solvers";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix
index 2e1682076efe..279641b3d67f 100644
--- a/pkgs/development/ocaml-modules/domain-name/default.nix
+++ b/pkgs/development/ocaml-modules/domain-name/default.nix
@@ -1,31 +1,27 @@
 {
   lib,
   buildDunePackage,
-  ocaml,
   fetchurl,
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "domain-name";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchurl {
-    url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-${version}.tbz";
-    sha256 = "sha256-Hboy81p81cyBh9IeLMIaC2Z6ZFRHoO7+V6/jyiW8RWY=";
+    url = "https://github.com/hannesm/domain-name/releases/download/v${finalAttrs.version}/domain-name-${finalAttrs.version}.tbz";
+    hash = "sha256-nseuLCJ3LBULhM+j8h2b8l+uFKeW8x4g31LYb0ZJnYk=";
   };
 
-  minimalOCamlVersion = "4.04";
-  duneVersion = "3";
-
+  doCheck = true;
   checkInputs = [ alcotest ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
-
   meta = {
     homepage = "https://github.com/hannesm/domain-name";
+    changelog = "https://github.com/hannesm/domain-name/blob/v${finalAttrs.version}/CHANGES.md";
     description = "RFC 1035 Internet domain names";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix
index 001656d6c65a..38f02a0be256 100644
--- a/pkgs/development/ocaml-modules/eliom/default.nix
+++ b/pkgs/development/ocaml-modules/eliom/default.nix
@@ -17,63 +17,59 @@
   ocsipersist,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.3")
-  "eliom is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "eliom";
+  version = "11.1.1";
 
-  buildDunePackage
-  rec {
-    pname = "eliom";
-    version = "11.1.1";
+  src = fetchFromGitHub {
+    owner = "ocsigen";
+    repo = "eliom";
+    rev = version;
+    hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "ocsigen";
-      repo = "eliom";
-      rev = version;
-      hash = "sha256-ALuoyO6axNQEeBteBVIFwdoSrbLxxcaSTObAcLPGIvo=";
-    };
+  nativeBuildInputs = [
+    which
+  ];
+  buildInputs = [
+    js_of_ocaml-ocamlbuild
+    js_of_ocaml-ppx_deriving_json
+    ppx_optcomp
+  ];
 
-    nativeBuildInputs = [
-      which
-    ];
-    buildInputs = [
-      js_of_ocaml-ocamlbuild
-      js_of_ocaml-ppx_deriving_json
-      ppx_optcomp
-    ];
+  propagatedBuildInputs = [
+    js_of_ocaml-lwt
+    js_of_ocaml-ppx
+    js_of_ocaml-tyxml
+    lwt_ppx
+    lwt_react
+    ocsigen_server
+    ocsipersist
+    ppx_deriving
+  ];
 
-    propagatedBuildInputs = [
-      js_of_ocaml-lwt
-      js_of_ocaml-ppx
-      js_of_ocaml-tyxml
-      lwt_ppx
-      lwt_react
-      ocsigen_server
-      ocsipersist
-      ppx_deriving
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  setupHook = [ ./setup-hook.sh ];
 
-    setupHook = [ ./setup-hook.sh ];
+  meta = {
+    homepage = "http://ocsigen.org/eliom/";
+    description = "OCaml Framework for programming Web sites and client/server Web applications";
 
-    meta = {
-      homepage = "http://ocsigen.org/eliom/";
-      description = "OCaml Framework for programming Web sites and client/server Web applications";
+    longDescription = ''
+      Eliom is a framework for programming Web sites
+      and client/server Web applications. It introduces new concepts to
+      simplify programming common behaviours and uses advanced static
+      typing features of OCaml to check many properties of the Web site
+      at compile time. If you want to write a Web application, Eliom
+      makes possible to write the whole application as a single program
+      (client and server parts). A syntax extension is used to
+      distinguish both parts and the client side is compiled to JS using
+      Ocsigen Js_of_ocaml.
+    '';
 
-      longDescription = ''
-        Eliom is a framework for programming Web sites
-        and client/server Web applications. It introduces new concepts to
-        simplify programming common behaviours and uses advanced static
-        typing features of OCaml to check many properties of the Web site
-        at compile time. If you want to write a Web application, Eliom
-        makes possible to write the whole application as a single program
-        (client and server parts). A syntax extension is used to
-        distinguish both parts and the client side is compiled to JS using
-        Ocsigen Js_of_ocaml.
-      '';
-
-      license = lib.licenses.lgpl21;
-
-      maintainers = [ lib.maintainers.gal_bolle ];
-    };
-  }
+    license = lib.licenses.lgpl21;
+    broken = lib.versionAtLeast ocaml.version "5.3";
+    maintainers = [ lib.maintainers.gal_bolle ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 8375c0148af0..e14516dbc403 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -18,7 +18,7 @@
   coqPackages,
   version ?
     if lib.versionAtLeast ocaml.version "4.13" then
-      "3.4.1"
+      "3.4.2"
     else if lib.versionAtLeast ocaml.version "4.08" then
       "1.20.0"
     else
@@ -34,6 +34,7 @@ in
 
 let
   fetched = coqPackages.metaFetch {
+    release."3.4.2".sha256 = "sha256-w7GjKYZrVrfezJN0NLmzpVm6CFGVKxXszHADFGCw5cc=";
     release."3.4.1".sha256 = "sha256-3rQPw91dHAqp61KTHk1UOEqh5syWrZZ1V1/1eE8cyI8=";
     release."3.3.0".sha256 = "sha256:963f95eea48b8f853cca9cbe4db49f22343c58e88dc961bc1da303356ef50dcd";
     release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc=";
diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix
index de1e15115e7b..a68c56a495e2 100644
--- a/pkgs/development/ocaml-modules/erm_xml/default.nix
+++ b/pkgs/development/ocaml-modules/erm_xml/default.nix
@@ -7,36 +7,33 @@
   ocamlbuild,
 }:
 
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0" then
-  throw "erm_xml is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation {
+  pname = "ocaml${ocaml.version}-erm_xml";
+  version = "0.3+20180112";
 
-  stdenv.mkDerivation {
-    pname = "ocaml${ocaml.version}-erm_xml";
-    version = "0.3+20180112";
+  src = fetchFromGitHub {
+    owner = "hannesm";
+    repo = "xml";
+    rev = "bbabdade807d8281fc48806da054b70dfe482479";
+    sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "hannesm";
-      repo = "xml";
-      rev = "bbabdade807d8281fc48806da054b70dfe482479";
-      sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = {
-      homepage = "https://github.com/hannesm/xml";
-      description = "XML Parser for discrete data";
-      platforms = ocaml.meta.platforms or [ ];
-      license = lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [ vbgl ];
-    };
-  }
+  meta = {
+    homepage = "https://github.com/hannesm/xml";
+    description = "XML Parser for discrete data";
+    platforms = ocaml.meta.platforms or [ ];
+    license = lib.licenses.bsd3;
+    broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
+    maintainers = with lib.maintainers; [ vbgl ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/expat/default.nix b/pkgs/development/ocaml-modules/expat/default.nix
index 17bc6e628c5d..f62fef29a4e6 100644
--- a/pkgs/development/ocaml-modules/expat/default.nix
+++ b/pkgs/development/ocaml-modules/expat/default.nix
@@ -8,44 +8,41 @@
   ounit,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
-  "ocaml_expat is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-expat";
+  version = "1.3.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-expat";
-    version = "1.3.0";
+  src = fetchFromGitHub {
+    owner = "whitequark";
+    repo = "ocaml-expat";
+    rev = "v${version}";
+    hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "whitequark";
-      repo = "ocaml-expat";
-      rev = "v${version}";
-      hash = "sha256-eDA6MUcztaI+fpunWBdanNnPo9Y5gvbj/ViVcxYYEBg=";
-    };
+  prePatch = ''
+    substituteInPlace Makefile --replace "gcc" "\$(CC)"
+  '';
 
-    prePatch = ''
-      substituteInPlace Makefile --replace "gcc" "\$(CC)"
-    '';
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
+  buildInputs = [ expat ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
-    buildInputs = [ expat ];
+  strictDeps = true;
 
-    strictDeps = true;
+  doCheck = lib.versionAtLeast ocaml.version "4.08";
+  checkTarget = "testall";
+  checkInputs = [ ounit ];
 
-    doCheck = lib.versionAtLeast ocaml.version "4.08";
-    checkTarget = "testall";
-    checkInputs = [ ounit ];
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = {
-      description = "OCaml wrapper for the Expat XML parsing library";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (src.meta) homepage;
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "OCaml wrapper for the Expat XML parsing library";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.02");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/facile/default.nix b/pkgs/development/ocaml-modules/facile/default.nix
index d2ebf8b8805f..2981640c6b19 100644
--- a/pkgs/development/ocaml-modules/facile/default.nix
+++ b/pkgs/development/ocaml-modules/facile/default.nix
@@ -5,26 +5,24 @@
   ocaml,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "facile is not available for OCaml ≥ 5.0"
+buildDunePackage rec {
+  pname = "facile";
+  version = "1.1.4";
 
-  buildDunePackage
-  rec {
-    pname = "facile";
-    version = "1.1.4";
+  src = fetchurl {
+    url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
+    sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/Emmanuel-PLF/facile/releases/download/${version}/facile-${version}.tbz";
-      sha256 = "0jqrwmn6fr2vj2rrbllwxq4cmxykv7zh0y4vnngx29f5084a04jp";
-    };
+  doCheck = true;
 
-    doCheck = true;
+  duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
+  postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
 
-    duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
-    postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
-
-    meta = {
-      homepage = "http://opti.recherche.enac.fr/facile/";
-      license = lib.licenses.lgpl21Plus;
-      description = "Functional Constraint Library";
-    };
-  }
+  meta = {
+    homepage = "http://opti.recherche.enac.fr/facile/";
+    license = lib.licenses.lgpl21Plus;
+    description = "Functional Constraint Library";
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/farfadet/default.nix b/pkgs/development/ocaml-modules/farfadet/default.nix
index ddc73697d8ef..83395d161a7a 100644
--- a/pkgs/development/ocaml-modules/farfadet/default.nix
+++ b/pkgs/development/ocaml-modules/farfadet/default.nix
@@ -9,38 +9,35 @@
   faraday,
 }:
 
-if lib.versionOlder ocaml.version "4.3" then
-  throw "farfadet is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-farfadet";
+  version = "0.3";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-farfadet";
-    version = "0.3";
+  src = fetchurl {
+    url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
+    sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/oklm-wsh/Farfadet/releases/download/v${version}/farfadet-${version}.tbz";
-      sha256 = "0nlafnp0pwx0n4aszpsk6nvcvqi9im306p4jhx70si7k3xprlr2j";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
+  propagatedBuildInputs = [ faraday ];
 
-    propagatedBuildInputs = [ faraday ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = {
-      description = "Printf-like for Faraday library";
-      homepage = "https://github.com/oklm-wsh/Farfadet";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "Printf-like for Faraday library";
+    homepage = "https://github.com/oklm-wsh/Farfadet";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.3";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/farith/default.nix b/pkgs/development/ocaml-modules/farith/default.nix
new file mode 100644
index 000000000000..3840f7881fc1
--- /dev/null
+++ b/pkgs/development/ocaml-modules/farith/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitLab,
+  ppx_deriving,
+  ppx_hash,
+  zarith,
+}:
+
+buildDunePackage rec {
+  pname = "farith";
+  version = "0.1";
+
+  minimalOCamlVersion = "4.10";
+
+  src = fetchFromGitLab {
+    domain = "git.frama-c.com";
+    owner = "pub";
+    repo = "farith";
+    tag = version;
+    hash = "sha256-9TGKeL3DXKEf2RLpkjOTC8aDQeLKSM9QUIiSkFCQW+8=";
+  };
+
+  propagatedBuildInputs = [
+    ppx_deriving
+    ppx_hash
+    zarith
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Modelisation of base 2 floating points with arbitrary exponent and mantisse size.";
+    homepage = "https://git.frama-c.com/pub/farith";
+    license = lib.licenses.lgpl2Only;
+    maintainers = with lib.maintainers; [ ethancedwards8 ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/fmt/default.nix b/pkgs/development/ocaml-modules/fmt/default.nix
index d33e709f731a..254ca3f51c5c 100644
--- a/pkgs/development/ocaml-modules/fmt/default.nix
+++ b/pkgs/development/ocaml-modules/fmt/default.nix
@@ -9,39 +9,36 @@
   cmdliner,
 }:
 
-if lib.versionOlder ocaml.version "4.08" then
-  throw "fmt is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  version = "0.11.0";
+  pname = "ocaml${ocaml.version}-fmt";
 
-  stdenv.mkDerivation rec {
-    version = "0.11.0";
-    pname = "ocaml${ocaml.version}-fmt";
+  src = fetchurl {
+    url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
+    sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs=";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/fmt/releases/fmt-${version}.tbz";
-      sha256 = "sha256-hXz9R6VLUkKc2bPiZl5EFzzRvTtDW+znFy+YStU3ahs=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [
+    cmdliner
+    topkg
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [
-      cmdliner
-      topkg
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      homepage = "https://erratique.ch/software/fmt";
-      license = licenses.isc;
-      description = "OCaml Format pretty-printer combinators";
-      inherit (ocaml.meta) platforms;
-      maintainers = [ maintainers.vbgl ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://erratique.ch/software/fmt";
+    license = licenses.isc;
+    description = "OCaml Format pretty-printer combinators";
+    inherit (ocaml.meta) platforms;
+    maintainers = [ maintainers.vbgl ];
+    broken = lib.versionOlder ocaml.version "4.08";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/fpath/default.nix b/pkgs/development/ocaml-modules/fpath/default.nix
index 861b91901e55..b0bfbe507f6c 100644
--- a/pkgs/development/ocaml-modules/fpath/default.nix
+++ b/pkgs/development/ocaml-modules/fpath/default.nix
@@ -9,38 +9,35 @@
   astring,
 }:
 
-if lib.versionOlder ocaml.version "4.03" then
-  throw "fpath is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-fpath";
+  version = "0.7.3";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-fpath";
-    version = "0.7.3";
+  src = fetchurl {
+    url = "https://erratique.ch/software/fpath/releases/fpath-${version}.tbz";
+    sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/fpath/releases/fpath-${version}.tbz";
-      sha256 = "03z7mj0sqdz465rc4drj1gr88l9q3nfs374yssvdjdyhjbqqzc0j";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
+  propagatedBuildInputs = [ astring ];
 
-    propagatedBuildInputs = [ astring ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = {
-      description = "OCaml module for handling file system paths with POSIX and Windows conventions";
-      homepage = "https://erratique.ch/software/fpath";
-      license = lib.licenses.isc;
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "OCaml module for handling file system paths with POSIX and Windows conventions";
+    homepage = "https://erratique.ch/software/fpath";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.03";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/functory/default.nix b/pkgs/development/ocaml-modules/functory/default.nix
index 84b16d678de8..44b7adfa6fff 100644
--- a/pkgs/development/ocaml-modules/functory/default.nix
+++ b/pkgs/development/ocaml-modules/functory/default.nix
@@ -20,35 +20,32 @@ let
       };
 in
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "functory is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation {
+  pname = "ocaml${ocaml.version}-functory";
+  inherit (param) version;
 
-  stdenv.mkDerivation
-  {
-    pname = "ocaml${ocaml.version}-functory";
-    inherit (param) version;
+  src = fetchurl {
+    url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
+    inherit (param) sha256;
+  };
 
-    src = fetchurl {
-      url = "https://www.lri.fr/~filliatr/functory/download/functory-${param.version}.tar.gz";
-      inherit (param) sha256;
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  installTargets = [ "ocamlfind-install" ];
 
-    installTargets = [ "ocamlfind-install" ];
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = with lib; {
-      homepage = "https://www.lri.fr/~filliatr/functory/";
-      description = "Distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
-      license = licenses.lgpl21;
-      maintainers = [ maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    homepage = "https://www.lri.fr/~filliatr/functory/";
+    description = "Distributed computing library for Objective Caml which facilitates distributed execution of parallelizable computations in a seamless fashion";
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.vbgl ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 040314db9b48..84ffc37a30cd 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -12,7 +12,7 @@
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.4.6";
+  version = "0.4.7";
 
   minimalOCamlVersion = "4.08";
 
@@ -20,7 +20,7 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pMieplqWGjgA6NVK0hEEVTRjggZtiPP/OepRi9SxMok=";
+    hash = "sha256-uQJfrgF0oafURlamHslt9hX9MP4vFeVqDhuX7T/kjiY=";
   };
 
   nativeBuildInputs = [ cppo ];
diff --git a/pkgs/development/ocaml-modules/gg/default.nix b/pkgs/development/ocaml-modules/gg/default.nix
index 7b015cf6840c..8e6c205695e1 100644
--- a/pkgs/development/ocaml-modules/gg/default.nix
+++ b/pkgs/development/ocaml-modules/gg/default.nix
@@ -13,43 +13,40 @@ let
   version = "1.0.0";
 in
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "gg is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation {
 
-  stdenv.mkDerivation
-  {
+  pname = "ocaml${ocaml.version}-gg";
+  inherit version;
 
-    pname = "ocaml${ocaml.version}-gg";
-    inherit version;
+  src = fetchurl {
+    url = "${homepage}/releases/gg-${version}.tbz";
+    sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
+  };
 
-    src = fetchurl {
-      url = "${homepage}/releases/gg-${version}.tbz";
-      sha256 = "sha256:0j7bpj8k17csnz6v6frkz9aycywsb7xmznnb31g8rbfk3626f3ci";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      description = "Basic types for computer graphics in OCaml";
-      longDescription = ''
-        Gg is an OCaml module providing basic types for computer graphics. It
-        defines types and functions for floats, vectors, points, sizes,
-        matrices, quaternions, axis aligned boxes, colors, color spaces, and
-        raster data.
-      '';
-      inherit homepage;
-      inherit (ocaml.meta) platforms;
-      license = licenses.bsd3;
-      maintainers = [ maintainers.jirkamarsik ];
-    };
-  }
+  meta = with lib; {
+    description = "Basic types for computer graphics in OCaml";
+    longDescription = ''
+      Gg is an OCaml module providing basic types for computer graphics. It
+      defines types and functions for floats, vectors, points, sizes,
+      matrices, quaternions, axis aligned boxes, colors, color spaces, and
+      raster data.
+    '';
+    inherit homepage;
+    inherit (ocaml.meta) platforms;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.jirkamarsik ];
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
index 08ae3343d062..5623248589fa 100644
--- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  ocaml,
   buildDunePackage,
   fetchFromGitHub,
   alcotest,
@@ -9,19 +10,15 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "graphql_ppx";
-  version = "1.2.2";
-
-  duneVersion = "3";
-
-  minimalOCamlVersion = "4.08";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "reasonml-community";
     repo = "graphql-ppx";
-    rev = "v${version}";
-    sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-u49JHC8K5iMCOQRPYaMl00npJsIE6ePaeJ2jP/vnuvw=";
   };
 
   nativeBuildInputs = [ reason ];
@@ -42,6 +39,7 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
+    broken = lib.versionAtLeast ocaml.version "5.4";
     homepage = "https://github.com/reasonml-community/graphql_ppx";
     description = "GraphQL PPX rewriter for Bucklescript/ReasonML";
     license = lib.licenses.mit;
@@ -50,4 +48,4 @@ buildDunePackage rec {
       jtcoolen
     ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/hmap/default.nix b/pkgs/development/ocaml-modules/hmap/default.nix
index 61892116d6e9..7021af3b8f3d 100644
--- a/pkgs/development/ocaml-modules/hmap/default.nix
+++ b/pkgs/development/ocaml-modules/hmap/default.nix
@@ -11,8 +11,6 @@
 let
   minimumSupportedOcamlVersion = "4.02.0";
 in
-assert lib.versionOlder minimumSupportedOcamlVersion ocaml.version;
-
 stdenv.mkDerivation rec {
   pname = "hmap";
   version = "0.8.1";
@@ -46,5 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://erratique.ch/software/hmap";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.pmahoney ];
+    broken = !(lib.versionOlder minimumSupportedOcamlVersion ocaml.version);
   };
 }
diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix
index 58f9852e8c86..4689be5ce7f0 100644
--- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix
+++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix
@@ -12,14 +12,16 @@
   mirage-crypto-rng,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "http-mirage-client";
   version = "0.0.10";
 
   minimalOCamlVersion = "4.08";
 
+  __darwinAllowLocalNetworking = true;
+
   src = fetchurl {
-    url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
+    url = "https://github.com/robur-coop/http-mirage-client/releases/download/v${finalAttrs.version}/http-mirage-client-${finalAttrs.version}.tbz";
     hash = "sha256-AXEIH1TIAayD4LkFv0yGD8OYvcdC/AJnGudGlkjcWLY=";
   };
 
@@ -40,9 +42,9 @@ buildDunePackage rec {
 
   meta = {
     description = "HTTP client for MirageOS";
-    homepage = "https://github.com/roburio/http-mirage-client";
+    homepage = "https://github.com/robur-coop/http-mirage-client";
+    changelog = "https://github.com/robur-coop/http-mirage-client/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-
-}
+})
diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 1d3d058695bf..43db542b5a1f 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1217,18 +1217,30 @@ with self;
     ];
   };
 
-  ppx_derive_at_runtime = janePackage {
-    pname = "ppx_derive_at_runtime";
-    hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI=";
-    meta.description = "Define a new ppx deriver by naming a runtime module";
-    propagatedBuildInputs = [
-      base
-      expect_test_helpers_core
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_derive_at_runtime = janePackage (
+    {
+      pname = "ppx_derive_at_runtime";
+      meta.description = "Define a new ppx deriver by naming a runtime module";
+      propagatedBuildInputs = [
+        base
+        expect_test_helpers_core
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-bbUV2t8MhqDCHDJp7fqJTnRrfZdYO8DLnygqQF0+ouY=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI=";
+        }
+    )
+  );
 
   ppx_diff = janePackage (
     {
@@ -1425,29 +1437,53 @@ with self;
     ];
   };
 
-  ppx_jsonaf_conv = janePackage {
-    pname = "ppx_jsonaf_conv";
-    hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM=";
-    meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions";
-    propagatedBuildInputs = [
-      base
-      jsonaf
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_jsonaf_conv = janePackage (
+    {
+      pname = "ppx_jsonaf_conv";
+      meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions";
+      propagatedBuildInputs = [
+        base
+        jsonaf
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-BnkYY+Td9zV++PuPs/gm5U58rCZjew1OJQ2k8KE+dfA=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM=";
+        }
+    )
+  );
 
-  ppx_js_style = janePackage {
-    pname = "ppx_js_style";
-    hash = "sha256-7jRzxe4bLyZ2vnHeqWiLlCUvOlNUAk0dwCfBFhrykUU=";
-    meta.description = "Code style checker for Jane Street Packages";
-    propagatedBuildInputs = [
-      octavius
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_js_style = janePackage (
+    {
+      pname = "ppx_js_style";
+      meta.description = "Code style checker for Jane Street Packages";
+      propagatedBuildInputs = [
+        octavius
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-YGGG468WVZbT5JfCB32FfTV7kdRz14ProDQxkdZuE44=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-7jRzxe4bLyZ2vnHeqWiLlCUvOlNUAk0dwCfBFhrykUU=";
+        }
+    )
+  );
 
   ppx_let = janePackage (
     {
@@ -1531,13 +1567,25 @@ with self;
     ];
   };
 
-  ppx_pattern_bind = janePackage {
-    pname = "ppx_pattern_bind";
-    hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA=";
-    meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
-    propagatedBuildInputs = [ ppx_let ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_pattern_bind = janePackage (
+    {
+      pname = "ppx_pattern_bind";
+      meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
+      propagatedBuildInputs = [ ppx_let ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-O3FtpXrFoyMI3iPL3BUwquREy+8TygOlyaTUGBUPk4Q=$";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA=";
+        }
+    )
+  );
 
   ppx_pipebang = janePackage {
     pname = "ppx_pipebang";
@@ -1558,26 +1606,38 @@ with self;
     doCheck = false; # test rules broken
   };
 
-  ppx_quick_test = janePackage {
-    pname = "ppx_quick_test";
-    hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY=";
-    meta.description = "Spiritual equivalent of let%expect_test, but for property based tests";
-    propagatedBuildInputs = [
-      async
-      async_kernel
-      base
-      base_quickcheck
-      core
-      core_kernel
-      expect_test_helpers_core
-      ppx_expect
-      ppx_here
-      ppx_jane
-      ppx_sexp_conv
-      ppx_sexp_message
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_quick_test = janePackage (
+    {
+      pname = "ppx_quick_test";
+      meta.description = "Spiritual equivalent of let%expect_test, but for property based tests";
+      propagatedBuildInputs = [
+        async
+        async_kernel
+        base
+        base_quickcheck
+        core
+        core_kernel
+        expect_test_helpers_core
+        ppx_expect
+        ppx_here
+        ppx_jane
+        ppx_sexp_conv
+        ppx_sexp_message
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-nSgi0MAmOWhk53x6U5Wmv/5zTxBiErWQqoT6ATBOv3w=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY=";
+        }
+    )
+  );
 
   ppx_sexp_conv = janePackage (
     {
@@ -1699,17 +1759,29 @@ with self;
     )
   );
 
-  ppx_typed_fields = janePackage {
-    pname = "ppx_typed_fields";
-    hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8=";
-    meta.description = "GADT-based field accessors and utilities";
-    propagatedBuildInputs = [
-      core
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_typed_fields = janePackage (
+    {
+      pname = "ppx_typed_fields";
+      meta.description = "GADT-based field accessors and utilities";
+      propagatedBuildInputs = [
+        core
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-M+UhZst98gRg6pVg828UZn8AEFK2a/KAzGkuUkWoBaI=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8=";
+        }
+    )
+  );
 
   ppx_typerep_conv = janePackage (
     {
@@ -2028,21 +2100,33 @@ with self;
     ];
   };
 
-  streamable = janePackage {
-    pname = "streamable";
-    hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg=";
-    meta.description = "Collection of types suitable for incremental serialization";
-    propagatedBuildInputs = [
-      async_kernel
-      async_rpc_kernel
-      base
-      core
-      core_kernel
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  streamable = janePackage (
+    {
+      pname = "streamable";
+      meta.description = "Collection of types suitable for incremental serialization";
+      propagatedBuildInputs = [
+        async_kernel
+        async_rpc_kernel
+        base
+        core
+        core_kernel
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-3d7tByQCOfA44wSBKbHXDvyomenWVaEDMHujlK++n8Y=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg=";
+        }
+    )
+  );
 
   textutils = janePackage {
     pname = "textutils";
diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix
index 43a6424f7c04..7fca71f2035a 100644
--- a/pkgs/development/ocaml-modules/javalib/default.nix
+++ b/pkgs/development/ocaml-modules/javalib/default.nix
@@ -9,51 +9,48 @@
   extlib,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "javalib is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-javalib";
+  version = "3.2.2";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-javalib";
-    version = "3.2.2";
+  src = fetchFromGitHub {
+    owner = "javalib-team";
+    repo = "javalib";
+    rev = version;
+    hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "javalib-team";
-      repo = "javalib";
-      rev = version;
-      hash = "sha256-XaI7GTU/O5UEWuYX4yqaIRmEoH7FuvCg/+gtKbE/P1s=";
-    };
+  nativeBuildInputs = [
+    which
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      which
-      ocaml
-      findlib
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  patches = [
+    ./configure.sh.patch
+    ./Makefile.config.example.patch
+  ];
 
-    patches = [
-      ./configure.sh.patch
-      ./Makefile.config.example.patch
-    ];
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  configureScript = "./configure.sh";
+  dontAddPrefix = "true";
+  dontAddStaticConfigureFlags = true;
+  configurePlatforms = [ ];
 
-    configureScript = "./configure.sh";
-    dontAddPrefix = "true";
-    dontAddStaticConfigureFlags = true;
-    configurePlatforms = [ ];
+  propagatedBuildInputs = [
+    camlzip
+    extlib
+  ];
 
-    propagatedBuildInputs = [
-      camlzip
-      extlib
-    ];
-
-    meta = with lib; {
-      description = "Library that parses Java .class files into OCaml data structures";
-      homepage = "https://javalib-team.github.io/javalib/";
-      license = licenses.lgpl3;
-      maintainers = [ maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "Library that parses Java .class files into OCaml data structures";
+    homepage = "https://javalib-team.github.io/javalib/";
+    license = licenses.lgpl3;
+    maintainers = [ maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/kafka/default.nix b/pkgs/development/ocaml-modules/kafka/default.nix
index 9c0698878a58..f096b7f3190c 100644
--- a/pkgs/development/ocaml-modules/kafka/default.nix
+++ b/pkgs/development/ocaml-modules/kafka/default.nix
@@ -7,28 +7,25 @@
   zlib,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "kafka is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "kafka";
+  version = "0.5";
 
-  buildDunePackage
-  rec {
-    pname = "kafka";
-    version = "0.5";
+  src = fetchurl {
+    url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz";
+    sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/didier-wenzek/ocaml-kafka/releases/download/${version}/kafka-${version}.tbz";
-      sha256 = "0m9212yap0a00hd0f61i4y4fna3141p77qj3mm7jl1h4q60jdhvy";
-    };
+  propagatedBuildInputs = [
+    rdkafka
+    zlib
+  ];
 
-    propagatedBuildInputs = [
-      rdkafka
-      zlib
-    ];
-
-    meta = with lib; {
-      homepage = "https://github.com/didier-wenzek/ocaml-kafka";
-      description = "OCaml bindings for Kafka";
-      license = licenses.mit;
-      maintainers = [ maintainers.vbgl ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/didier-wenzek/ocaml-kafka";
+    description = "OCaml bindings for Kafka";
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/kafka/lwt.nix b/pkgs/development/ocaml-modules/kafka/lwt.nix
index e638fe513f3b..0ee37ea0f657 100644
--- a/pkgs/development/ocaml-modules/kafka/lwt.nix
+++ b/pkgs/development/ocaml-modules/kafka/lwt.nix
@@ -7,23 +7,20 @@
   cmdliner,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "kafka_lwt is not available for OCaml ${ocaml.version}"
+buildDunePackage {
+  pname = "kafka_lwt";
 
-  buildDunePackage
-  {
-    pname = "kafka_lwt";
+  inherit (kafka) version src;
 
-    inherit (kafka) version src;
+  buildInputs = [ cmdliner ];
 
-    buildInputs = [ cmdliner ];
+  propagatedBuildInputs = [
+    kafka
+    lwt
+  ];
 
-    propagatedBuildInputs = [
-      kafka
-      lwt
-    ];
-
-    meta = kafka.meta // {
-      description = "OCaml bindings for Kafka, Lwt bindings";
-    };
-  }
+  meta = kafka.meta // {
+    description = "OCaml bindings for Kafka, Lwt bindings";
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix
index 3736fc84a8d4..06b7f64157d3 100644
--- a/pkgs/development/ocaml-modules/lablgl/default.nix
+++ b/pkgs/development/ocaml-modules/lablgl/default.nix
@@ -9,73 +9,70 @@
   camlp-streams,
 }:
 
-if lib.versionOlder ocaml.version "4.06" then
-  throw "lablgl is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-lablgl";
+  version = "1.07";
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-lablgl";
-    version = "1.07";
+  src = fetchFromGitHub {
+    owner = "garrigue";
+    repo = "lablgl";
+    rev = "v${version}";
+    hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "garrigue";
-      repo = "lablgl";
-      rev = "v${version}";
-      hash = "sha256-GiQKHMn5zHyvDrA2ve12X5YTm3/RZp8tukIqifgVaW4=";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
+  buildInputs = [
+    libglut
+    camlp-streams
+  ];
+  propagatedBuildInputs = [
+    libGLU
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
+  patches = [ ./META.patch ];
+
+  preConfigure = ''
+    mkdir -p $out/bin
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
+    cp \
+      Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \
+      Makefile.config
+  '';
+
+  makeFlags = [
+    "BINDIR=${placeholder "out"}/bin/"
+    "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/"
+    "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/"
+    "XINCLUDES="
+    "TKINCLUDES="
+    "TKLIBS="
+  ];
+
+  buildFlags = [
+    "lib"
+    "libopt"
+    "glut"
+    "glutopt"
+  ];
+
+  postInstall = ''
+    cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
+  '';
+
+  meta = with lib; {
+    description = "OpenGL bindings for ocaml";
+    homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [
+      pSub
+      vbgl
     ];
-    buildInputs = [
-      libglut
-      camlp-streams
-    ];
-    propagatedBuildInputs = [
-      libGLU
-    ];
-
-    patches = [ ./META.patch ];
-
-    preConfigure = ''
-      mkdir -p $out/bin
-      mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs
-      cp \
-        Makefile.config.${if stdenv.hostPlatform.isDarwin then "osx" else "ex"} \
-        Makefile.config
-    '';
-
-    makeFlags = [
-      "BINDIR=${placeholder "out"}/bin/"
-      "INSTALLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/lablgl/"
-      "DLLDIR=${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib/stublibs/"
-      "XINCLUDES="
-      "TKINCLUDES="
-      "TKLIBS="
-    ];
-
-    buildFlags = [
-      "lib"
-      "libopt"
-      "glut"
-      "glutopt"
-    ];
-
-    postInstall = ''
-      cp ./META $out/lib/ocaml/${ocaml.version}/site-lib/lablgl
-    '';
-
-    meta = with lib; {
-      description = "OpenGL bindings for ocaml";
-      homepage = "http://wwwfun.kurims.kyoto-u.ac.jp/soft/lsl/lablgl.html";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [
-        pSub
-        vbgl
-      ];
-      mainProgram = "lablglut";
-    };
-  }
+    mainProgram = "lablglut";
+    broken = lib.versionOlder ocaml.version "4.06";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
index 469c3750cafc..172e1d539e27 100644
--- a/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk-extras/default.nix
@@ -10,41 +10,38 @@
   xmlm,
 }:
 
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.13" then
-  throw "lablgtk-extras is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  version = "1.6";
+  pname = "ocaml${ocaml.version}-lablgtk-extras";
+  src = fetchFromGitLab {
+    domain = "framagit.org";
+    owner = "zoggy";
+    repo = "lablgtk-extras";
+    rev = "release-${version}";
+    sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda";
+  };
 
-  stdenv.mkDerivation rec {
-    version = "1.6";
-    pname = "ocaml${ocaml.version}-lablgtk-extras";
-    src = fetchFromGitLab {
-      domain = "framagit.org";
-      owner = "zoggy";
-      repo = "lablgtk-extras";
-      rev = "release-${version}";
-      sha256 = "1bbdp5j18s582mmyd7qiaq1p08g2ag4gl7x65pmzahbhg719hjda";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    camlp4
+  ];
+  propagatedBuildInputs = [
+    config-file
+    lablgtk
+    xmlm
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      camlp4
-    ];
-    propagatedBuildInputs = [
-      config-file
-      lablgtk
-      xmlm
-    ];
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = {
-      inherit (ocaml.meta) platforms;
-      maintainers = with lib.maintainers; [ vbgl ];
-      homepage = "https://framagit.org/zoggy/lablgtk-extras/";
-      description = "Collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
-      license = lib.licenses.lgpl2Plus;
-    };
-  }
+  meta = {
+    inherit (ocaml.meta) platforms;
+    maintainers = with lib.maintainers; [ vbgl ];
+    homepage = "https://framagit.org/zoggy/lablgtk-extras/";
+    description = "Collection of libraries and modules useful when developing OCaml/LablGtk2 applications";
+    license = lib.licenses.lgpl2Plus;
+    broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.13";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/lablgtk/default.nix b/pkgs/development/ocaml-modules/lablgtk/default.nix
index c9a77e89ea9f..8116c368049a 100644
--- a/pkgs/development/ocaml-modules/lablgtk/default.nix
+++ b/pkgs/development/ocaml-modules/lablgtk/default.nix
@@ -86,7 +86,6 @@ stdenv.mkDerivation {
     homepage = "http://lablgtk.forge.ocamlcore.org/";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [
-      maggesi
       roconnor
       vbgl
     ];
diff --git a/pkgs/development/ocaml-modules/labltk/default.nix b/pkgs/development/ocaml-modules/labltk/default.nix
index 2a15aecfe0c9..0782692d7713 100644
--- a/pkgs/development/ocaml-modules/labltk/default.nix
+++ b/pkgs/development/ocaml-modules/labltk/default.nix
@@ -134,5 +134,6 @@ param.stdenv.mkDerivation {
     license = lib.licenses.lgpl21;
     inherit (ocaml.meta) platforms;
     maintainers = [ lib.maintainers.vbgl ];
+    broken = !(params ? ${lib.versions.majorMinor ocaml.version});
   };
 }
diff --git a/pkgs/development/ocaml-modules/lem/default.nix b/pkgs/development/ocaml-modules/lem/default.nix
index 8a2ac28d8289..150b7a9519ca 100644
--- a/pkgs/development/ocaml-modules/lem/default.nix
+++ b/pkgs/development/ocaml-modules/lem/default.nix
@@ -10,49 +10,46 @@
   zarith,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
-  "lem is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-lem";
+  version = "2025-03-13";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-lem";
-    version = "2025-03-13";
+  src = fetchFromGitHub {
+    owner = "rems-project";
+    repo = "lem";
+    rev = version;
+    hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "rems-project";
-      repo = "lem";
-      rev = version;
-      hash = "sha256-ZV2OiFonMlNzqtsumMQ8jzY9/ATaZxiNHZ7JzOfGluY=";
-    };
+  nativeBuildInputs = [
+    makeWrapper
+    ocamlbuild
+    findlib
+    ocaml
+  ];
+  propagatedBuildInputs = [
+    zarith
+    num
+  ];
 
-    nativeBuildInputs = [
-      makeWrapper
-      ocamlbuild
-      findlib
-      ocaml
+  installFlags = [ "INSTALL_DIR=$(out)" ];
+
+  createFindlibDestdir = true;
+
+  postInstall = ''
+    wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/rems-project/lem";
+    description = "Tool for lightweight executable mathematics";
+    mainProgram = "lem";
+    maintainers = with maintainers; [ genericnerdyusername ];
+    license = with licenses; [
+      bsd3
+      gpl2
     ];
-    propagatedBuildInputs = [
-      zarith
-      num
-    ];
-
-    installFlags = [ "INSTALL_DIR=$(out)" ];
-
-    createFindlibDestdir = true;
-
-    postInstall = ''
-      wrapProgram $out/bin/lem --set LEMLIB $out/share/lem/library
-    '';
-
-    meta = with lib; {
-      homepage = "https://github.com/rems-project/lem";
-      description = "Tool for lightweight executable mathematics";
-      mainProgram = "lem";
-      maintainers = with maintainers; [ genericnerdyusername ];
-      license = with licenses; [
-        bsd3
-        gpl2
-      ];
-      platforms = ocaml.meta.platforms;
-    };
-  }
+    platforms = ocaml.meta.platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.07");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/linksem/default.nix b/pkgs/development/ocaml-modules/linksem/default.nix
index ccefd91c06cf..40930e21f94f 100644
--- a/pkgs/development/ocaml-modules/linksem/default.nix
+++ b/pkgs/development/ocaml-modules/linksem/default.nix
@@ -7,35 +7,32 @@
   lem,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
-  "linksem is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-linksem";
+  version = "0.8";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-linksem";
-    version = "0.8";
+  src = fetchFromGitHub {
+    owner = "rems-project";
+    repo = "linksem";
+    rev = version;
+    hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "rems-project";
-      repo = "linksem";
-      rev = version;
-      hash = "sha256-7/YfDK3TruKCckMzAPLRrwBkHRJcX1S+AzXHWRxkZPA=";
-    };
+  nativeBuildInputs = [
+    findlib
+    ocaml
+  ];
 
-    nativeBuildInputs = [
-      findlib
-      ocaml
-    ];
+  propagatedBuildInputs = [ lem ];
 
-    propagatedBuildInputs = [ lem ];
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
-
-    meta = with lib; {
-      homepage = "https://github.com/rems-project/linksem";
-      description = "Formalisation of substantial parts of ELF linking and DWARF debug information";
-      maintainers = with maintainers; [ genericnerdyusername ];
-      license = licenses.bsd2;
-      platforms = ocaml.meta.platforms;
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/rems-project/linksem";
+    description = "Formalisation of substantial parts of ELF linking and DWARF debug information";
+    maintainers = with maintainers; [ genericnerdyusername ];
+    license = licenses.bsd2;
+    platforms = ocaml.meta.platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.07");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix
index 8bf19a921081..4debd6a5994c 100644
--- a/pkgs/development/ocaml-modules/magic-trace/default.nix
+++ b/pkgs/development/ocaml-modules/magic-trace/default.nix
@@ -18,7 +18,7 @@
   zstandard ? null,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "magic-trace";
   version = "1.2.4";
 
@@ -27,13 +27,14 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = "magic-trace";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LkhnlOd5rI8cbOYbVqrkRJ2qTcRn3Zzl6GjQEdjBjVA=";
   };
 
   nativeBuildInputs = [
     ocaml-crunch
   ];
+
   buildInputs = [
     angstrom
     async
@@ -50,10 +51,12 @@ buildDunePackage rec {
     zstandard
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Collects and displays high-resolution traces of what a process is doing";
-    license = licenses.mit;
-    maintainers = [ maintainers.alizter ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.alizter ];
     homepage = "https://github.com/janestreet/magic-trace";
+    platforms = lib.platforms.linux;
+    mainProgram = "magic-trace";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/mariadb/default.nix b/pkgs/development/ocaml-modules/mariadb/default.nix
index 4fbc81bfc313..a53a996da8a4 100644
--- a/pkgs/development/ocaml-modules/mariadb/default.nix
+++ b/pkgs/development/ocaml-modules/mariadb/default.nix
@@ -12,66 +12,63 @@
   libmysqlclient,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
-  "mariadb is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-mariadb";
+  version = "1.1.6";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-mariadb";
-    version = "1.1.6";
+  src = fetchurl {
+    url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz";
+    sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/andrenth/ocaml-mariadb/releases/download/${version}/ocaml-mariadb-${version}.tar.gz";
-      sha256 = "sha256-3/C1Gz6luUzS7oaudLlDHMT6JB2v5OdbLVzJhtayHGM=";
-    };
+  patches =
+    lib.lists.map
+      (
+        x:
+        fetchpatch {
+          url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch";
+          inherit (x) hash;
+        }
+      )
+      [
+        {
+          path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5";
+          hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE=";
+        }
+        {
+          path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581";
+          hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg=";
+        }
+      ];
 
-    patches =
-      lib.lists.map
-        (
-          x:
-          fetchpatch {
-            url = "https://github.com/andrenth/ocaml-mariadb/commit/${x.path}.patch";
-            inherit (x) hash;
-          }
-        )
-        [
-          {
-            path = "9db2e4d8dec7c584213d0e0f03d079a36a35d9d5";
-            hash = "sha256-heROtU02cYBJ5edIHMdYP1xNXcLv8h79GYGBuudJhgE=";
-          }
-          {
-            path = "40cd3102bc7cce4ed826ed609464daeb1bbb4581";
-            hash = "sha256-YVsAMJiOgWRk9xPaRz2sDihBYLlXv+rhWtQIMOVLtSg=";
-          }
-        ];
+  postPatch = ''
+    substituteInPlace setup.ml --replace '#use "topfind"' \
+      '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"'
+  '';
 
-    postPatch = ''
-      substituteInPlace setup.ml --replace '#use "topfind"' \
-        '#directory "${findlib}/lib/ocaml/${ocaml.version}/site-lib/";; #use "topfind"'
-    '';
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+  ];
+  buildInputs = [
+    mariadb
+    libmysqlclient
+    camlp-streams
+    ocamlbuild
+  ];
+  propagatedBuildInputs = [ ctypes ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-    ];
-    buildInputs = [
-      mariadb
-      libmysqlclient
-      camlp-streams
-      ocamlbuild
-    ];
-    propagatedBuildInputs = [ ctypes ];
+  strictDeps = true;
 
-    strictDeps = true;
+  preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
 
-    preInstall = "mkdir -p $OCAMLFIND_DESTDIR/stublibs";
-
-    meta = {
-      description = "OCaml bindings for MariaDB";
-      license = lib.licenses.mit;
-      maintainers = with lib.maintainers; [ bcc32 ];
-      homepage = "https://github.com/andrenth/ocaml-mariadb";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "OCaml bindings for MariaDB";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcc32 ];
+    homepage = "https://github.com/andrenth/ocaml-mariadb";
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.07");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/memprof-limits/default.nix b/pkgs/development/ocaml-modules/memprof-limits/default.nix
index 32ffbd5f82cf..e469c9daff9d 100644
--- a/pkgs/development/ocaml-modules/memprof-limits/default.nix
+++ b/pkgs/development/ocaml-modules/memprof-limits/default.nix
@@ -5,26 +5,24 @@
   ocaml,
 }:
 
-if !(lib.versionOlder ocaml.version "5.0.0") then
-  throw "memprof-limits is not available for OCaml ${ocaml.version}"
-else
-  buildDunePackage rec {
-    pname = "memprof-limits";
-    version = "0.2.1";
+buildDunePackage rec {
+  pname = "memprof-limits";
+  version = "0.2.1";
 
-    src = fetchFromGitLab {
-      owner = "gadmm";
-      repo = pname;
-      rev = "v${version}";
-      hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
-    };
+  src = fetchFromGitLab {
+    owner = "gadmm";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-Pmuln5TihPoPZuehZlqPfERif6lf7O+0454kW9y3aKc=";
+  };
 
-    minimalOCamlVersion = "4.12";
+  minimalOCamlVersion = "4.12";
 
-    meta = with lib; {
-      homepage = "https://ocaml.org/p/memprof-limits/latest";
-      description = "Memory limits, allocation limits, and thread cancellation for OCaml";
-      license = licenses.lgpl3;
-      maintainers = with maintainers; [ alizter ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://ocaml.org/p/memprof-limits/latest";
+    description = "Memory limits, allocation limits, and thread cancellation for OCaml";
+    license = licenses.lgpl3;
+    maintainers = with maintainers; [ alizter ];
+    broken = !(lib.versionOlder ocaml.version "5.0.0");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/mirage-ptime/default.nix b/pkgs/development/ocaml-modules/mirage-ptime/default.nix
index 8d981684899a..fddd9a832657 100644
--- a/pkgs/development/ocaml-modules/mirage-ptime/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-ptime/default.nix
@@ -3,7 +3,7 @@
   buildDunePackage,
   fetchurl,
   ptime,
-  version ? "5.1.0",
+  version ? "5.2.0",
 }:
 
 buildDunePackage {
@@ -13,7 +13,7 @@ buildDunePackage {
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-ptime/releases/download/v${version}/mirage-ptime-${version}.tbz";
-    hash = "sha256-6bPbMTZeGolRMMN4nmrc+ZZ3HqjnAWtj4V7L4fOKKfY=";
+    hash = "sha256-YOWpJrfQKG9khCwPb5lZXtf+fip4N0B1AAn2Y9zRLyg=";
   };
 
   propagatedBuildInputs = [ ptime ];
diff --git a/pkgs/development/ocaml-modules/monolith/default.nix b/pkgs/development/ocaml-modules/monolith/default.nix
index a5945600d140..0abedd3f39d5 100644
--- a/pkgs/development/ocaml-modules/monolith/default.nix
+++ b/pkgs/development/ocaml-modules/monolith/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   afl-persistent,
   pprint,
-  version ? "20250314",
+  version ? "20250922",
 }:
 
 buildDunePackage {
@@ -18,7 +18,7 @@ buildDunePackage {
     owner = "fpottier";
     repo = "monolith";
     tag = version;
-    hash = "sha256-hIB3QSOLARumRgpUroTFUzSreHw7kMikGde+mB28sGM=";
+    hash = "sha256-uYUbrWSE99556jiCgDUc8xDaob3rFPXLBMPM3lN6Xh8=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix
index bccc33e7085a..3975ee9ec968 100644
--- a/pkgs/development/ocaml-modules/mopsa/default.nix
+++ b/pkgs/development/ocaml-modules/mopsa/default.nix
@@ -39,14 +39,14 @@ buildDunePackage rec {
   buildInputs = [
     arg-complete
     camlidl
-    flint
-    libclang
     mpfr
-    pplite
   ];
 
   propagatedBuildInputs = [
     apron
+    flint
+    libclang
+    pplite
     yojson
     zarith
   ];
diff --git a/pkgs/development/ocaml-modules/mtime/default.nix b/pkgs/development/ocaml-modules/mtime/default.nix
index 4c6677114b09..ff7e19c89ce0 100644
--- a/pkgs/development/ocaml-modules/mtime/default.nix
+++ b/pkgs/development/ocaml-modules/mtime/default.nix
@@ -8,36 +8,33 @@
   topkg,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "mtime is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-mtime";
+  version = "2.1.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-mtime";
-    version = "2.1.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz";
+    sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg=";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/mtime/releases/mtime-${version}.tbz";
-      sha256 = "sha256-CXyygC43AerZVy4bSD1aKMbi8KOUSfqvm0StiomDTYg=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      description = "Monotonic wall-clock time for OCaml";
-      homepage = "https://erratique.ch/software/mtime";
-      inherit (ocaml.meta) platforms;
-      maintainers = [ maintainers.vbgl ];
-      license = licenses.bsd3;
-    };
-  }
+  meta = with lib; {
+    description = "Monotonic wall-clock time for OCaml";
+    homepage = "https://erratique.ch/software/mtime";
+    inherit (ocaml.meta) platforms;
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.bsd3;
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ninja_utils/default.nix b/pkgs/development/ocaml-modules/ninja_utils/default.nix
index 6d92745caacb..9740694f71bf 100644
--- a/pkgs/development/ocaml-modules/ninja_utils/default.nix
+++ b/pkgs/development/ocaml-modules/ninja_utils/default.nix
@@ -1,19 +1,21 @@
 {
   lib,
-  fetchzip,
+  fetchFromGitHub,
   buildDunePackage,
   re,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ninja_utils";
-  version = "0.9.0";
+  version = "1.0.0";
 
   minimalOCamlVersion = "4.12";
 
-  src = fetchzip {
-    url = "https://github.com/CatalaLang/ninja_utils/archive/refs/tags/${version}.tar.gz";
-    hash = "sha256-VSj1IXfczoI3lSAtOqQPIqsxX+HgyxKzlssKd7By/Lo=";
+  src = fetchFromGitHub {
+    owner = "CatalaLang";
+    repo = "ninja_utils";
+    tag = finalAttrs.version;
+    hash = "sha256-2OYsZVk7/KYHXHTqAAEyVEHzcUCC+vBRU1s1XdfnWaE=";
   };
 
   propagatedBuildInputs = [ re ];
@@ -22,6 +24,6 @@ buildDunePackage rec {
     description = "Small library used to generate Ninja build files";
     homepage = "https://github.com/CatalaLang/ninja_utils";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.stepbrobd ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/nonstd/default.nix b/pkgs/development/ocaml-modules/nonstd/default.nix
index 7d547d3818f9..32baf666f8b1 100644
--- a/pkgs/development/ocaml-modules/nonstd/default.nix
+++ b/pkgs/development/ocaml-modules/nonstd/default.nix
@@ -5,28 +5,26 @@
   ocaml,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "nonstd is not available for OCaml ≥ 5.0"
+buildDunePackage rec {
+  pname = "nonstd";
+  version = "0.0.3";
 
-  buildDunePackage
-  rec {
-    pname = "nonstd";
-    version = "0.0.3";
+  minimalOCamlVersion = "4.02";
 
-    minimalOCamlVersion = "4.02";
+  src = fetchzip {
+    url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";
+    sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
+  };
 
-    src = fetchzip {
-      url = "https://bitbucket.org/smondet/${pname}/get/${pname}.${version}.tar.gz";
-      sha256 = "0ccjwcriwm8fv29ij1cnbc9win054kb6pfga3ygzdbjpjb778j46";
-    };
+  duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
+  postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
+  doCheck = true;
 
-    duneVersion = if lib.versionAtLeast ocaml.version "4.12" then "2" else "1";
-    postPatch = lib.optionalString (duneVersion != "1") "dune upgrade";
-    doCheck = true;
-
-    meta = with lib; {
-      homepage = "https://bitbucket.org/smondet/nonstd";
-      description = "Non-standard mini-library";
-      license = licenses.isc;
-      maintainers = [ maintainers.alexfmpe ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://bitbucket.org/smondet/nonstd";
+    description = "Non-standard mini-library";
+    license = licenses.isc;
+    maintainers = [ maintainers.alexfmpe ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/note/default.nix b/pkgs/development/ocaml-modules/note/default.nix
index c5e801456a47..176d6581e82d 100644
--- a/pkgs/development/ocaml-modules/note/default.nix
+++ b/pkgs/development/ocaml-modules/note/default.nix
@@ -9,32 +9,29 @@
   brr,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "note is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-note";
+  version = "0.0.3";
+  src = fetchurl {
+    url = "https://erratique.ch/software/note/releases/note-${version}.tbz";
+    hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k=";
+  };
+  buildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  inherit (topkg) buildPhase installPhase;
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-note";
-    version = "0.0.3";
-    src = fetchurl {
-      url = "https://erratique.ch/software/note/releases/note-${version}.tbz";
-      hash = "sha256-ZZOvCnyz7UWzFtGFI1uC0ZApzyylgZYM/HYIXGVXY2k=";
-    };
-    buildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    inherit (topkg) buildPhase installPhase;
+  propagatedBuildInputs = [ brr ];
 
-    propagatedBuildInputs = [ brr ];
-
-    meta = {
-      homepage = "https://erratique.ch/software/note";
-      description = "OCaml module for functional reactive programming";
-      license = lib.licenses.isc;
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    homepage = "https://erratique.ch/software/note";
+    description = "OCaml module for functional reactive programming";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index c0cfa54ca997..6a5a696aa20e 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -20,63 +20,59 @@
 let
   pname = "ocaml-cairo";
 in
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "1.2.0";
 
-if lib.versionAtLeast ocaml.version "4.06" then
-  throw "${pname} is not available for OCaml ${ocaml.version}"
-else
+  src = fetchurl {
+    url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
+    sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
+  };
 
-  stdenv.mkDerivation rec {
-    name = "${pname}-${version}";
-    version = "1.2.0";
+  patches = [ ./META.patch ];
 
-    src = fetchurl {
-      url = "http://cgit.freedesktop.org/cairo-ocaml/snapshot/cairo-ocaml-${version}.zip";
-      sha256 = "0l4p9bp6kclr570mxma8wafibr1g5fsjj8h10yr4b507g0hmlh0l";
-    };
+  strictDeps = true;
 
-    patches = [ ./META.patch ];
+  nativeBuildInputs = [
+    pkg-config
+    unzip
+    ocaml
+    automake
+    gnum4
+    autoconf
+    findlib
+  ];
+  buildInputs = [
+    freetype
+    lablgtk
+    cairo
+    gdk-pixbuf
+    gtk2
+    pango
+  ];
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    nativeBuildInputs = [
-      pkg-config
-      unzip
-      ocaml
-      automake
-      gnum4
-      autoconf
-      findlib
-    ];
-    buildInputs = [
-      freetype
-      lablgtk
-      cairo
-      gdk-pixbuf
-      gtk2
-      pango
-    ];
+  preConfigure = ''
+    aclocal -I support
+    autoconf
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
+    export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2
+    cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src
+    cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src
+  '';
 
-    createFindlibDestdir = true;
+  postInstall = ''
+    cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/
+  '';
 
-    preConfigure = ''
-      aclocal -I support
-      autoconf
-      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE `pkg-config --cflags cairo gdk-pixbuf glib gtk+ pango`"
-      export LABLGTKDIR=${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2
-      cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/pango.ml ./src
-      cp ${lablgtk}/lib/ocaml/${ocaml.version}/site-lib/lablgtk2/gaux.ml ./src
-    '';
+  makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ];
 
-    postInstall = ''
-      cp META $out/lib/ocaml/${ocaml.version}/site-lib/cairo/
-    '';
-
-    makeFlags = [ "INSTALLDIR=$(out)/lib/ocaml/${ocaml.version}/site-lib/cairo" ];
-
-    meta = {
-      homepage = "http://cairographics.org/cairo-ocaml";
-      description = "Ocaml bindings for cairo library";
-      license = lib.licenses.gpl2;
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    homepage = "http://cairographics.org/cairo-ocaml";
+    description = "Ocaml bindings for cairo library";
+    license = lib.licenses.gpl2;
+    broken = lib.versionAtLeast ocaml.version "4.06";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
index 1b32c0eb997c..93a91be6b7ed 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
@@ -4,27 +4,36 @@
   fetchpatch,
   applyPatches,
   buildDunePackage,
+  ocaml,
   cppo,
   gettext,
   fileutils,
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gettext";
   version = "0.5.0";
 
   src = applyPatches {
     src = fetchurl {
-      url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-${version}.tbz";
+      url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${finalAttrs.version}/gettext-${finalAttrs.version}.tbz";
       hash = "sha256-CN2d9Vsq8YOOIxK+S+lCtDddvBjCrtDKGSRIh1DjT10=";
     };
-    # Disable dune sites
-    # See https://github.com/gildor478/ocaml-gettext/pull/37
-    patches = fetchpatch {
-      url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch";
-      hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ=";
-    };
+    patches = [
+      # Disable dune sites
+      # See https://github.com/gildor478/ocaml-gettext/pull/37
+      (fetchpatch {
+        url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch";
+        hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ=";
+      })
+    ]
+    # Compatibility with OCaml ≥ 5.4
+    # See https://github.com/gildor478/ocaml-gettext/pull/41
+    ++ lib.optional (lib.versionAtLeast ocaml.version "5.4") (fetchpatch {
+      url = "https://github.com/gildor478/ocaml-gettext/commit/5d521981e39dcaeada6bbe7b15c5432d6de5d33c.patch";
+      hash = "sha256-82ajmpyXSd2RdVq/ND4lS8PIugRSkKe5oL8BL9CsLo4=";
+    });
   };
 
   nativeBuildInputs = [ cppo ];
@@ -46,4 +55,4 @@ buildDunePackage rec {
     maintainers = [ ];
     mainProgram = "ocaml-gettext";
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
index 43fead8c172e..584e1b307dda 100644
--- a/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-libvirt/default.nix
@@ -10,49 +10,46 @@
   perl,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.02")
-  "libvirt is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml-libvirt";
+  version = "0.6.1.5";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml-libvirt";
-    version = "0.6.1.5";
+  src = fetchFromGitLab {
+    owner = "libvirt";
+    repo = "libvirt-ocaml";
+    rev = "v${version}";
+    sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
+  };
 
-    src = fetchFromGitLab {
-      owner = "libvirt";
-      repo = "libvirt-ocaml";
-      rev = "v${version}";
-      sha256 = "0xpkdmknk74yqxgw8z2w8b7ss8hpx92xnab5fsqg2byyj55gzf2k";
-    };
+  propagatedBuildInputs = [ libvirt ];
 
-    propagatedBuildInputs = [ libvirt ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    findlib
+    perl
+    ocaml
+  ];
 
-    nativeBuildInputs = [
-      autoreconfHook
-      pkg-config
-      findlib
-      perl
-      ocaml
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  buildFlags = [
+    "all"
+    "opt"
+    "CPPFLAGS=-Wno-error"
+  ];
+  installTargets = "install-opt";
+  preInstall = ''
+    # Fix 'dllmllibvirt.so' install failure into non-existent directory.
+    mkdir -p $OCAMLFIND_DESTDIR/stublibs
+  '';
 
-    buildFlags = [
-      "all"
-      "opt"
-      "CPPFLAGS=-Wno-error"
-    ];
-    installTargets = "install-opt";
-    preInstall = ''
-      # Fix 'dllmllibvirt.so' install failure into non-existent directory.
-      mkdir -p $OCAMLFIND_DESTDIR/stublibs
-    '';
-
-    meta = with lib; {
-      description = "OCaml bindings for libvirt";
-      homepage = "https://libvirt.org/ocaml/";
-      license = licenses.gpl2;
-      maintainers = [ ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "OCaml bindings for libvirt";
+    homepage = "https://libvirt.org/ocaml/";
+    license = licenses.gpl2;
+    maintainers = [ ];
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.02");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
index 6e16fd2f2556..725371018e08 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/1.8.x.nix
@@ -7,30 +7,27 @@
   ppx_derivers,
 }:
 
-if lib.versionOlder "4.13" ocaml.version then
-  throw "ocaml-migrate-parsetree-1.8 is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage rec {
+  pname = "ocaml-migrate-parsetree";
+  version = "1.8.0";
 
-  buildDunePackage rec {
-    pname = "ocaml-migrate-parsetree";
-    version = "1.8.0";
+  src = fetchFromGitHub {
+    owner = "ocaml-ppx";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
+  };
 
-    src = fetchFromGitHub {
-      owner = "ocaml-ppx";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "16x8sxc4ygxrr1868qpzfqyrvjf3hfxvjzmxmf6ibgglq7ixa2nq";
-    };
+  propagatedBuildInputs = [
+    ppx_derivers
+    result
+  ];
 
-    propagatedBuildInputs = [
-      ppx_derivers
-      result
-    ];
-
-    meta = {
-      description = "Convert OCaml parsetrees between different major versions";
-      license = lib.licenses.lgpl21;
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (src.meta) homepage;
-    };
-  }
+  meta = {
+    description = "Convert OCaml parsetrees between different major versions";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (src.meta) homepage;
+    broken = lib.versionOlder "4.13" ocaml.version;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
index 2c66caae99f9..129e2a9be198 100644
--- a/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
+++ b/pkgs/development/ocaml-modules/ocaml-migrate-parsetree/2.x.nix
@@ -5,28 +5,25 @@
   ocaml,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.1")
-  "ocaml-migrate-parsetree is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "ocaml-migrate-parsetree";
+  version = "2.4.0";
 
-  buildDunePackage
-  rec {
-    pname = "ocaml-migrate-parsetree";
-    version = "2.4.0";
+  minimalOCamlVersion = "4.02";
 
-    minimalOCamlVersion = "4.02";
+  src = fetchurl {
+    url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
+    sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ=";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/ocaml-ppx/${pname}/releases/download/${version}/${pname}-${version}.tbz";
-      sha256 = "sha256-7EnEUtwzemIFVqtoK/AZi/UBglULUC2PsjClkSYKpqQ=";
-    };
-
-    meta = {
-      description = "Convert OCaml parsetrees between different major versions";
-      license = lib.licenses.lgpl21;
-      maintainers = with lib.maintainers; [
-        vbgl
-        sternenseemann
-      ];
-      homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree";
-    };
-  }
+  meta = {
+    description = "Convert OCaml parsetrees between different major versions";
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
+      vbgl
+      sternenseemann
+    ];
+    homepage = "https://github.com/ocaml-ppx/ocaml-migrate-parsetree";
+    broken = lib.versionAtLeast ocaml.version "5.1";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 335ad7611030..8c85239ee914 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -7,11 +7,11 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "4.0.1";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
-    hash = "sha256-uZ7c47uaHpTt1XyCcsxo/E7P2grk09UzRTEnUBKYKNA=";
+    hash = "sha256-GM5e7fTKWhx6tSJ9xfNdW2fy8wYWhmbf3uGvqGKQm7M=";
   };
 
   checkInputs = [ alcotest ];
diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
index af78650c146e..d4f2f3336fe8 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchurl,
-  version ? "0.27.0",
+  version ? "0.28.1",
   astring,
   base,
   camlp-streams,
@@ -48,6 +48,7 @@ rec {
         "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc=";
         "0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU=";
         "0.27.0" = "sha256-3b9ITAdtCPmUAO6Et5DsIx9cj8vV0zJKZADVOI6EbRU=";
+        "0.28.1" = "sha256-cL2gN9C+2WHtkb21GYsu7vVCREdQqLAV2AzLlLP/Qfs=";
       }
       ."${version}";
   };
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index 65f9dadbd957..927fcced62f8 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -13,41 +13,36 @@
 let
   inherit (callPackage ./generic.nix args) src version library_deps;
 in
+buildDunePackage {
+  pname = "ocamlformat";
+  inherit src version;
 
-lib.throwIf
-  (
-    lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
-    || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
-    || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
-    || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
-  )
-  "ocamlformat ${version} is not available for OCaml ${ocaml.version}"
+  minimalOCamlVersion = "4.08";
 
-  buildDunePackage
-  {
-    pname = "ocamlformat";
-    inherit src version;
+  nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ];
 
-    minimalOCamlVersion = "4.08";
+  buildInputs = [
+    re
+  ]
+  ++ library_deps
+  ++ lib.optionals (lib.versionAtLeast version "0.25.1") [
+    (ocamlformat-lib.override { inherit version; })
+  ];
 
-    nativeBuildInputs = if lib.versionAtLeast version "0.25.1" then [ ] else [ menhir ];
-
-    buildInputs = [
-      re
-    ]
-    ++ library_deps
-    ++ lib.optionals (lib.versionAtLeast version "0.25.1") [
-      (ocamlformat-lib.override { inherit version; })
+  meta = {
+    homepage = "https://github.com/ocaml-ppx/ocamlformat";
+    description = "Auto-formatter for OCaml code";
+    maintainers = with lib.maintainers; [
+      Zimmi48
+      Julow
     ];
-
-    meta = {
-      homepage = "https://github.com/ocaml-ppx/ocamlformat";
-      description = "Auto-formatter for OCaml code";
-      maintainers = with lib.maintainers; [
-        Zimmi48
-        Julow
-      ];
-      license = lib.licenses.mit;
-      mainProgram = "ocamlformat";
-    };
-  }
+    license = lib.licenses.mit;
+    mainProgram = "ocamlformat";
+    broken =
+      lib.versionAtLeast ocaml.version "5.0" && !lib.versionAtLeast version "0.23"
+      || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
+      || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
+      || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
+      || lib.versionAtLeast ocaml.version "5.4" && !lib.versionAtLeast version "0.28";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocamlnet/default.nix b/pkgs/development/ocaml-modules/ocamlnet/default.nix
index 72ecf9ada9cb..a7d0e734b990 100644
--- a/pkgs/development/ocaml-modules/ocamlnet/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlnet/default.nix
@@ -13,65 +13,59 @@
   nettle,
 }:
 
-lib.throwIf (lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0")
-  "ocamlnet is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-ocamlnet";
+  version = "4.1.9";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-ocamlnet";
-    version = "4.1.9";
+  src = fetchurl {
+    url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
+    sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr";
+  };
 
-    src = fetchurl {
-      url = "http://download.camlcity.org/download/ocamlnet-${version}.tar.gz";
-      sha256 = "1vlwxjxr946gdl61a1d7yk859cijq45f60dhn54ik3w4g6cx33pr";
-    };
+  nativeBuildInputs = [
+    pkg-config
+    which
+    ocaml
+    findlib
+  ];
+  buildInputs = [
+    ncurses
+    ocaml_pcre
+    camlzip
+    gnutls
+    nettle
+  ];
 
-    nativeBuildInputs = [
-      pkg-config
-      which
-      ocaml
-      findlib
-    ];
-    buildInputs = [
-      ncurses
-      ocaml_pcre
-      camlzip
-      gnutls
-      nettle
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  dontAddPrefix = true;
+  dontAddStaticConfigureFlags = true;
+  configurePlatforms = [ ];
 
-    dontAddPrefix = true;
-    dontAddStaticConfigureFlags = true;
-    configurePlatforms = [ ];
+  preConfigure = ''
+    configureFlagsArray=(
+      -bindir $out/bin
+      -enable-gnutls
+      -enable-zip
+      -enable-pcre
+      -disable-gtk2
+      -with-nethttpd
+      -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet
+    )
+  '';
 
-    preConfigure = ''
-      configureFlagsArray=(
-        -bindir $out/bin
-        -enable-gnutls
-        -enable-zip
-        -enable-pcre
-        -disable-gtk2
-        -with-nethttpd
-        -datadir $out/lib/ocaml/${ocaml.version}/ocamlnet
-      )
-    '';
+  buildPhase = ''
+    make all
+    make opt
+  '';
 
-    buildPhase = ''
-      make all
-      make opt
-    '';
-
-    meta = {
-      homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
-      description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
-      license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
-      inherit (ocaml.meta) platforms;
-      maintainers = [
-        lib.maintainers.maggesi
-      ];
-    };
-  }
+  meta = {
+    homepage = "http://projects.camlcity.org/projects/ocamlnet.html";
+    description = "Library implementing Internet protocols (http, cgi, email, etc.) for OCaml";
+    license = "Most Ocamlnet modules are released under the zlib/png license. The HTTP server module Nethttpd is, however, under the GPL.";
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
index 263caad54863..766758489fcc 100644
--- a/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
+++ b/pkgs/development/ocaml-modules/ocp-ocamlres/default.nix
@@ -8,42 +8,39 @@
   pprint,
 }:
 
-if lib.versionOlder ocaml.version "4.02" then
-  throw "ocp-ocamlres is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-ocp-ocamlres";
+  version = "0.4";
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-ocamlres";
+    rev = "v${version}";
+    sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
+  };
 
-  stdenv.mkDerivation rec {
-    pname = "ocaml${ocaml.version}-ocp-ocamlres";
-    version = "0.4";
-    src = fetchFromGitHub {
-      owner = "OCamlPro";
-      repo = "ocp-ocamlres";
-      rev = "v${version}";
-      sha256 = "0smfwrj8qhzknhzawygxi0vgl2af4vyi652fkma59rzjpvscqrnn";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
+  buildInputs = [
+    astring
+    pprint
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
-    buildInputs = [
-      astring
-      pprint
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  installFlags = [ "BINDIR=$(out)/bin" ];
+  preInstall = "mkdir -p $out/bin";
 
-    installFlags = [ "BINDIR=$(out)/bin" ];
-    preInstall = "mkdir -p $out/bin";
-
-    meta = {
-      description = "Simple tool and library to embed files and directories inside OCaml executables";
-      homepage = "https://www.typerex.org/ocp-ocamlres.html";
-      license = lib.licenses.lgpl3Plus;
-      maintainers = [ lib.maintainers.vbgl ];
-      mainProgram = "ocp-ocamlres";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    description = "Simple tool and library to embed files and directories inside OCaml executables";
+    homepage = "https://www.typerex.org/ocp-ocamlres.html";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.vbgl ];
+    mainProgram = "ocp-ocamlres";
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.02";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ocurl/default.nix b/pkgs/development/ocaml-modules/ocurl/default.nix
index 8f30944d3590..625e59ff5bb5 100644
--- a/pkgs/development/ocaml-modules/ocurl/default.nix
+++ b/pkgs/development/ocaml-modules/ocurl/default.nix
@@ -9,40 +9,39 @@
   lwt,
   lwt_ppx,
 }:
-if lib.versionOlder ocaml.version "4.04" then
-  throw "ocurl is not available for OCaml ${ocaml.version}"
-else
-  stdenv.mkDerivation rec {
-    pname = "ocurl";
-    version = "0.9.2";
 
-    src = fetchurl {
-      url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz";
-      sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M=";
-    };
+stdenv.mkDerivation rec {
+  pname = "ocurl";
+  version = "0.9.2";
 
-    nativeBuildInputs = [
-      pkg-config
-      ocaml
-      findlib
+  src = fetchurl {
+    url = "https://github.com/ygrek/ocurl/releases/download/${version}/ocurl-${version}.tar.gz";
+    sha256 = "sha256-4DWXGMh02s1VwLWW5d7h0jtMOUubWmBPGm1hghfWd2M=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    ocaml
+    findlib
+  ];
+  propagatedBuildInputs = [
+    curl
+    lwt
+    lwt_ppx
+  ];
+
+  strictDeps = true;
+
+  createFindlibDestdir = true;
+  meta = {
+    description = "OCaml bindings to libcurl";
+    license = lib.licenses.mit;
+    homepage = "http://ygrek.org.ua/p/ocurl/";
+    maintainers = with lib.maintainers; [
+      dandellion
+      bennofs
     ];
-    propagatedBuildInputs = [
-      curl
-      lwt
-      lwt_ppx
-    ];
-
-    strictDeps = true;
-
-    createFindlibDestdir = true;
-    meta = {
-      description = "OCaml bindings to libcurl";
-      license = lib.licenses.mit;
-      homepage = "http://ygrek.org.ua/p/ocurl/";
-      maintainers = with lib.maintainers; [
-        dandellion
-        bennofs
-      ];
-      platforms = ocaml.meta.platforms or [ ];
-    };
-  }
+    platforms = ocaml.meta.platforms or [ ];
+    broken = lib.versionOlder ocaml.version "4.04";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/opam-0install-cudf/default.nix b/pkgs/development/ocaml-modules/opam-0install-cudf/default.nix
new file mode 100644
index 000000000000..3fc260f43ead
--- /dev/null
+++ b/pkgs/development/ocaml-modules/opam-0install-cudf/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  _0install-solver,
+  alcotest,
+  cudf,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "opam-0install-cudf";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "ocaml-opam";
+    repo = "opam-0install-cudf";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-TETfvR1Di4c8CylsKnMal/GfQcqMSr36o7511u1bYYs=";
+  };
+
+  propagatedBuildInputs = [
+    cudf
+    _0install-solver
+  ];
+
+  doCheck = true;
+  checkInputs = [
+    alcotest
+  ];
+
+  meta = {
+    homepage = "https://github.com/ocaml-opam/opam-0install-cudf";
+    description = "Opam solver using 0install backend using the CUDF interface";
+    longDescription = ''
+      Opam's default solver is designed to maintain a set of packages
+      over time, minimising disruption when installing new programs and
+      finding a compromise solution across all packages.
+
+      In many situations (e.g. CI, local roots or duniverse builds) this
+      is not necessary, and we can get a solution much faster by using
+      a different algorithm.
+
+      This package provides a generic solver library which uses 0install's
+      solver library. The library uses the CUDF library in order to interface
+      with opam as it is the format common used to talk to all the supported solvers.
+    '';
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.stepbrobd ];
+  };
+})
diff --git a/pkgs/development/ocaml-modules/opam-client/default.nix b/pkgs/development/ocaml-modules/opam-client/default.nix
new file mode 100644
index 000000000000..9840c87c2894
--- /dev/null
+++ b/pkgs/development/ocaml-modules/opam-client/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildDunePackage,
+  base64,
+  cmdliner,
+  opam,
+  opam-repository,
+  opam-solver,
+  opam-state,
+  re,
+}:
+
+buildDunePackage {
+  pname = "opam-client";
+
+  inherit (opam) src version;
+
+  configureFlags = [ "--disable-checks" ];
+
+  propagatedBuildInputs = [
+    base64
+    cmdliner
+    opam-repository
+    opam-solver
+    opam-state
+    re
+  ];
+
+  meta = opam.meta // {
+    description = "Actions on the opam root, switches, installations, and front-end";
+    maintainers = with lib.maintainers; [ stepbrobd ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/opam-solver/default.nix b/pkgs/development/ocaml-modules/opam-solver/default.nix
new file mode 100644
index 000000000000..8dd328cda640
--- /dev/null
+++ b/pkgs/development/ocaml-modules/opam-solver/default.nix
@@ -0,0 +1,35 @@
+{
+  lib,
+  buildDunePackage,
+  cudf,
+  dose3,
+  mccs,
+  opam,
+  opam-0install-cudf,
+  opam-format,
+  re,
+  z3,
+}:
+
+buildDunePackage {
+  pname = "opam-solver";
+
+  inherit (opam) src version;
+
+  configureFlags = [ "--disable-checks" ];
+
+  propagatedBuildInputs = [
+    cudf
+    dose3
+    mccs
+    opam-0install-cudf
+    opam-format
+    re
+    z3
+  ];
+
+  meta = opam.meta // {
+    description = "This library is based on the Cudf and Dose libraries, and handles calls to the external solver from opam";
+    maintainers = with lib.maintainers; [ stepbrobd ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/osdp/default.nix b/pkgs/development/ocaml-modules/osdp/default.nix
index 05af890d045a..1f11669e8f39 100644
--- a/pkgs/development/ocaml-modules/osdp/default.nix
+++ b/pkgs/development/ocaml-modules/osdp/default.nix
@@ -10,37 +10,34 @@
   autoconf,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "osdp is not available for OCaml ${ocaml.version}"
+buildDunePackage {
+  pname = "osdp";
+  version = "1.1.1";
 
-  buildDunePackage
-  {
-    pname = "osdp";
-    version = "1.1.1";
+  src = fetchurl {
+    url = "https://github.com/Embedded-SW-VnV/osdp/releases/download/v1.1.1/osdp-1.1.1.tgz";
+    hash = "sha256-X7CS2g+MyQPDjhUCvFS/DoqcCXTEw8SCsSGED64TGKQ=";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/Embedded-SW-VnV/osdp/releases/download/v1.1.1/osdp-1.1.1.tgz";
-      hash = "sha256-X7CS2g+MyQPDjhUCvFS/DoqcCXTEw8SCsSGED64TGKQ=";
-    };
+  preConfigure = ''
+    autoconf
+  '';
 
-    preConfigure = ''
-      autoconf
-    '';
+  nativeBuildInputs = [
+    autoconf
+    findlib
+    csdp
+  ];
+  propagatedBuildInputs = [
+    zarith
+    ocplib-simplex
+    csdp
+  ];
 
-    nativeBuildInputs = [
-      autoconf
-      findlib
-      csdp
-    ];
-    propagatedBuildInputs = [
-      zarith
-      ocplib-simplex
-      csdp
-    ];
-
-    meta = {
-      description = "OCaml Interface to SDP solvers";
-      homepage = "https://github.com/Embedded-SW-VnV/osdp";
-      license = lib.licenses.lgpl3Plus;
-    };
-  }
+  meta = {
+    description = "OCaml Interface to SDP solvers";
+    homepage = "https://github.com/Embedded-SW-VnV/osdp";
+    license = lib.licenses.lgpl3Plus;
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/oui/default.nix b/pkgs/development/ocaml-modules/oui/default.nix
new file mode 100644
index 000000000000..98c9d2e12c73
--- /dev/null
+++ b/pkgs/development/ocaml-modules/oui/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitHub,
+  cmdliner,
+  fmt,
+  markup,
+  ocaml-crunch,
+  opam-client,
+  opam-format,
+  ppx_deriving_yojson,
+  ppx_expect,
+  yojson,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "oui";
+  version = "0-unstable-2025-10-08";
+
+  minimalOCamlVersion = "4.10";
+
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocaml-universal-installer";
+    rev = "2fe2e33c3f8e1744fdd4dab04458043451bf9f62";
+    hash = "sha256-ALQIQ3Ab1Gs2xST9OwsO5IxixzgKlUg7uHZvfHMbv7Q=";
+  };
+
+  nativeBuildInputs = [
+    ocaml-crunch
+  ];
+
+  propagatedBuildInputs = [
+    cmdliner
+    fmt
+    markup
+    opam-client
+    opam-format
+    ppx_deriving_yojson
+    yojson
+  ];
+
+  # upstream tests are matching full library paths
+  doCheck = false;
+  checkInputs = [
+    ppx_expect
+  ];
+
+  meta = {
+    homepage = "https://github.com/OCamlPro/ocaml-universal-installer";
+    description = "A tool that builds standalone installers for your OCaml applications";
+    longDescription = ''
+      oui is a command-line tool that generates standalone installers for
+      Linux, Windows and macOS from your OCaml and non OCaml binaries.
+    '';
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.stepbrobd ];
+    mainProgram = "opam-oui";
+  };
+})
diff --git a/pkgs/development/ocaml-modules/pcre/default.nix b/pkgs/development/ocaml-modules/pcre/default.nix
index ec1527ceb20d..cf0a68ef576a 100644
--- a/pkgs/development/ocaml-modules/pcre/default.nix
+++ b/pkgs/development/ocaml-modules/pcre/default.nix
@@ -28,7 +28,6 @@ buildDunePackage rec {
     description = "Efficient C-library for pattern matching with Perl-style regular expressions in OCaml";
     license = licenses.lgpl21Plus;
     maintainers = with maintainers; [
-      maggesi
       vbmithr
     ];
   };
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 1c45d67324d6..6a60fd9cf176 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -11,54 +11,51 @@
   base64,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "piqi is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  version = "0.6.16";
+  pname = "piqi";
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  stdenv.mkDerivation
-  rec {
-    version = "0.6.16";
-    pname = "piqi";
-    name = "ocaml${ocaml.version}-${pname}-${version}";
+  src = fetchFromGitHub {
+    owner = "alavrik";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "alavrik";
-      repo = pname;
-      rev = "v${version}";
-      sha256 = "sha256-qE+yybTn+kzbY0h8udhZYO+GwQPI/J/6p3LMmF12cFU=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    which
+  ];
+  propagatedBuildInputs = [
+    sedlex
+    xmlm
+    easy-format
+    base64
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      which
-    ];
-    propagatedBuildInputs = [
-      sedlex
-      xmlm
-      easy-format
-      base64
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  patches = [
+    ./no-stream.patch
+    ./no-ocamlpath-override.patch
+  ];
 
-    patches = [
-      ./no-stream.patch
-      ./no-ocamlpath-override.patch
-    ];
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  postBuild = "make -C piqilib piqilib.cma";
 
-    postBuild = "make -C piqilib piqilib.cma";
+  installTargets = [
+    "install"
+    "ocaml-install"
+  ];
 
-    installTargets = [
-      "install"
-      "ocaml-install"
-    ];
-
-    meta = with lib; {
-      homepage = "https://piqi.org";
-      description = "Universal schema language and a collection of tools built around it";
-      license = licenses.asl20;
-      maintainers = [ maintainers.maurer ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://piqi.org";
+    description = "Universal schema language and a collection of tools built around it";
+    license = licenses.asl20;
+    maintainers = [ maintainers.maurer ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
index 75bdee5783a8..e8ed1e4540e2 100644
--- a/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_cstubs/default.nix
@@ -14,46 +14,43 @@
   findlib,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
-  "ppx_cstubs is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "ppx_cstubs";
+  version = "0.7.0";
 
-  buildDunePackage
-  rec {
-    pname = "ppx_cstubs";
-    version = "0.7.0";
+  minimalOCamlVersion = "4.08";
 
-    minimalOCamlVersion = "4.08";
+  src = fetchFromGitHub {
+    owner = "fdopen";
+    repo = "ppx_cstubs";
+    rev = version;
+    hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "fdopen";
-      repo = "ppx_cstubs";
-      rev = version;
-      hash = "sha256-qMmwRWCIfNyhCQYPKLiufnb57sTR3P+WInOqtPDywFs=";
-    };
+  patches = [ ./ppxlib.patch ];
 
-    patches = [ ./ppxlib.patch ];
+  nativeBuildInputs = [ cppo ];
 
-    nativeBuildInputs = [ cppo ];
+  buildInputs = [
+    bigarray-compat
+    containers
+    findlib
+    integers
+    num
+    ppxlib
+    re
+  ];
 
-    buildInputs = [
-      bigarray-compat
-      containers
-      findlib
-      integers
-      num
-      ppxlib
-      re
-    ];
+  propagatedBuildInputs = [
+    ctypes
+  ];
 
-    propagatedBuildInputs = [
-      ctypes
-    ];
-
-    meta = with lib; {
-      homepage = "https://github.com/fdopen/ppx_cstubs";
-      changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
-      description = "Preprocessor for easier stub generation with ocaml-ctypes";
-      license = licenses.lgpl21Plus;
-      maintainers = [ maintainers.osener ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/fdopen/ppx_cstubs";
+    changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md";
+    description = "Preprocessor for easier stub generation with ocaml-ctypes";
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.osener ];
+    broken = lib.versionAtLeast ocaml.version "5.2";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ppx_import/default.nix b/pkgs/development/ocaml-modules/ppx_import/default.nix
index 349bb527b3da..fdd59a094f5e 100644
--- a/pkgs/development/ocaml-modules/ppx_import/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_import/default.nix
@@ -2,54 +2,56 @@
   lib,
   fetchurl,
   buildDunePackage,
-  ocaml,
   ounit,
   ppx_deriving,
   ppx_sexp_conv,
   ppxlib,
-  version ? if lib.versionAtLeast ocaml.version "4.11" then "1.11.0" else "1.9.1",
+  version ?
+    if lib.versionAtLeast ppxlib.version "0.36" then
+      "1.12.0"
+    else if lib.versionAtLeast ppxlib.version "0.26" then
+      "1.11.0"
+    else if lib.versionAtLeast ppxlib.version "0.24.0" then
+      "1.9.1"
+    else
+      throw "ppx_import is not available with ppxlib-${ppxlib.version}",
 }:
 
-lib.throwIfNot (lib.versionAtLeast ppxlib.version "0.24.0")
-  "ppx_import is not available with ppxlib-${ppxlib.version}"
+buildDunePackage {
+  pname = "ppx_import";
+  inherit version;
 
-  buildDunePackage
-  rec {
-    pname = "ppx_import";
-    inherit version;
+  src = fetchurl {
+    url =
+      let
+        dir = if lib.versionAtLeast version "1.11" then "v${version}" else "${version}";
+      in
+      "https://github.com/ocaml-ppx/ppx_import/releases/download/${dir}/ppx_import-${version}.tbz";
 
-    minimalOCamlVersion = "4.05";
+    hash =
+      {
+        "1.9.1" = "sha256-0bSY4u44Ds84XPIbcT5Vt4AG/4PkzFKMl9CDGFZyIdI=";
+        "1.11.0" = "sha256-Jmfv1IkQoaTkyxoxp9FI0ChNESqCaoDsA7D4ZUbOrBo=";
+        "1.12.0" = "sha256-1vpYHFl0rEdG3hE+6BCpWmfLvdLvoEx+Jxq0DFrRdJc=";
+      }
+      ."${version}";
+  };
 
-    src = fetchurl {
-      url =
-        let
-          dir = if lib.versionAtLeast version "1.11" then "v${version}" else "${version}";
-        in
-        "https://github.com/ocaml-ppx/ppx_import/releases/download/${dir}/ppx_import-${version}.tbz";
+  propagatedBuildInputs = [
+    ppxlib
+  ];
 
-      hash =
-        {
-          "1.9.1" = "sha256-0bSY4u44Ds84XPIbcT5Vt4AG/4PkzFKMl9CDGFZyIdI=";
-          "1.11.0" = "sha256-Jmfv1IkQoaTkyxoxp9FI0ChNESqCaoDsA7D4ZUbOrBo=";
-        }
-        ."${version}";
-    };
+  checkInputs = [
+    ounit
+    ppx_deriving
+    ppx_sexp_conv
+  ];
 
-    propagatedBuildInputs = [
-      ppxlib
-    ];
+  doCheck = true;
 
-    checkInputs = [
-      ounit
-      ppx_deriving
-      ppx_sexp_conv
-    ];
-
-    doCheck = true;
-
-    meta = {
-      description = "Syntax extension for importing declarations from interface files";
-      license = lib.licenses.mit;
-      homepage = "https://github.com/ocaml-ppx/ppx_import";
-    };
-  }
+  meta = {
+    description = "Syntax extension for importing declarations from interface files";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/ocaml-ppx/ppx_import";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ppx_tools/default.nix b/pkgs/development/ocaml-modules/ppx_tools/default.nix
index 21d6f116b9e7..086b0da2576f 100644
--- a/pkgs/development/ocaml-modules/ppx_tools/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_tools/default.nix
@@ -8,97 +8,85 @@
   cppo,
 }:
 
-if lib.versionAtLeast ocaml.version "5.2" then
-  throw "ppx_tools is not available for OCaml ${ocaml.version}"
-else
-
-  let
-    param =
-      let
-        v6_6 = {
-          version = "6.6";
-          sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc=";
-          nativeBuildInputs = [ cppo ];
-          buildInputs = [ cppo ];
-        };
-      in
-      {
-        "4.02" = {
-          version = "5.0+4.02.0";
-          sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8";
-        };
-        "4.03" = {
-          version = "5.0+4.03.0";
-          sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg";
-        };
-        "4.04" = {
-          version = "unstable-20161114";
-          rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
-          sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl";
-        };
-        "4.05" = {
-          version = "5.0+4.05.0";
-          sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4";
-        };
-        "4.06" = {
-          version = "5.1+4.06.0";
-          sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
-        };
-        "4.07" = {
-          version = "5.1+4.06.0";
-          sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
-        };
-        "4.08" = v6_6;
-        "4.09" = v6_6;
-        "4.10" = v6_6;
-        "4.11" = v6_6;
-        "4.12" = v6_6;
-        "4.13" = v6_6;
-        "4.14" = v6_6;
-        "5.0" = v6_6;
-        "5.1" = v6_6;
-      }
-      .${ocaml.meta.branch};
-  in
-
-  let
-    src = fetchFromGitHub {
-      owner = "alainfrisch";
-      repo = pname;
-      rev = param.rev or param.version;
-      inherit (param) sha256;
-    };
-    pname = "ppx_tools";
-    meta = with lib; {
-      description = "Tools for authors of ppx rewriters";
-      homepage = "https://www.lexifi.com/ppx_tools";
-      license = licenses.mit;
-      maintainers = with maintainers; [ vbgl ];
-    };
-  in
-  if lib.versionAtLeast param.version "6.0" then
-    buildDunePackage {
-      inherit pname src meta;
-      inherit (param) version buildInputs nativeBuildInputs;
-    }
-  else
-    stdenv.mkDerivation {
-      name = "ocaml${ocaml.version}-${pname}-${param.version}";
-
-      inherit src;
-
-      nativeBuildInputs = [
-        ocaml
-        findlib
-      ];
-
-      strictDeps = true;
-
-      createFindlibDestdir = true;
-
-      dontStrip = true;
-
-      meta = meta // {
-        inherit (ocaml.meta) platforms;
+let
+  param =
+    let
+      v6_6 = {
+        version = "6.6";
+        sha256 = "sha256-QhuaQ9346a3neoRM4GrOVzjR8fg9ysMZR1VzNgyIQtc=";
+        nativeBuildInputs = [ cppo ];
+        buildInputs = [ cppo ];
+      };
+    in
+    {
+      "4.02" = {
+        version = "5.0+4.02.0";
+        sha256 = "16drjk0qafjls8blng69qiv35a84wlafpk16grrg2i3x19p8dlj8";
+      };
+      "4.03" = {
+        version = "5.0+4.03.0";
+        sha256 = "061v1fl5z7z3ywi4ppryrlcywnvnqbsw83ppq72qmkc7ma4603jg";
+      };
+      "4.04" = {
+        version = "unstable-20161114";
+        rev = "49c08e2e4ea8fef88692cd1dcc1b38a9133f17ac";
+        sha256 = "0ywzfkf5brj33nwh49k9if8x8v433ral25f3nbklfc9vqr06zrfl";
+      };
+      "4.05" = {
+        version = "5.0+4.05.0";
+        sha256 = "1jvvhk6wnkvm7b9zph309ihsc0hyxfpahmxxrq19vx8c674jsdm4";
+      };
+      "4.06" = {
+        version = "5.1+4.06.0";
+        sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
+      };
+      "4.07" = {
+        version = "5.1+4.06.0";
+        sha256 = "1ww4cspdpgjjsgiv71s0im5yjkr3544x96wsq1vpdacq7dr7zwiw";
       };
     }
+    .${ocaml.meta.branch} or v6_6;
+in
+
+let
+  src = fetchFromGitHub {
+    owner = "alainfrisch";
+    repo = pname;
+    rev = param.rev or param.version;
+    inherit (param) sha256;
+  };
+  pname = "ppx_tools";
+  meta = with lib; {
+    description = "Tools for authors of ppx rewriters";
+    homepage = "https://www.lexifi.com/ppx_tools";
+    license = licenses.mit;
+    maintainers = with maintainers; [ vbgl ];
+    broken = lib.versionAtLeast ocaml.version "5.2";
+  };
+in
+if lib.versionAtLeast param.version "6.0" then
+  buildDunePackage {
+    inherit pname src meta;
+    inherit (param) version buildInputs nativeBuildInputs;
+  }
+else
+  stdenv.mkDerivation {
+    name = "ocaml${ocaml.version}-${pname}-${param.version}";
+
+    inherit src;
+
+    nativeBuildInputs = [
+      ocaml
+      findlib
+    ];
+
+    strictDeps = true;
+
+    createFindlibDestdir = true;
+
+    dontStrip = true;
+
+    meta = meta // {
+      inherit (ocaml.meta) platforms;
+    };
+  }
diff --git a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
index 11bbb63b59ca..616ecf06f5f3 100644
--- a/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
+++ b/pkgs/development/ocaml-modules/ppx_yojson_conv/default.nix
@@ -5,18 +5,22 @@
   ppx_js_style,
   ppx_yojson_conv_lib,
   ppxlib,
+  version ? if lib.versionAtLeast ppxlib.version "0.36.0" then "0.17.1" else "0.15.1",
 }:
-buildDunePackage rec {
+buildDunePackage {
   pname = "ppx_yojson_conv";
-  version = "0.15.1";
-  duneVersion = "3";
-  minimalOCamlVersion = "4.08.0";
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "janestreet";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-lSOUSMVgsRiArEhFTKpAj2yFBPbtaIc/SxdPA+24xXs=";
+    repo = "ppx_yojson_conv";
+    tag = "v${version}";
+    hash =
+      {
+        "0.15.1" = "sha256-lSOUSMVgsRiArEhFTKpAj2yFBPbtaIc/SxdPA+24xXs=";
+        "0.17.1" = "sha256-QI2uN1/KeyDxdk6oxPt48lDir55Kkgx2BX6wKCY59LI=";
+      }
+      ."${version}";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/ppxlib/default.nix b/pkgs/development/ocaml-modules/ppxlib/default.nix
index 759d92bb4467..76aabf9f8194 100644
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@@ -103,37 +103,32 @@ let
     ."${version}";
 in
 
-if
-  param ? max_version && lib.versionAtLeast ocaml.version param.max_version
-  || param ? min_version && lib.versionOlder ocaml.version param.min_version
-then
-  throw "ppxlib-${version} is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage rec {
+  pname = "ppxlib";
+  inherit version;
 
-  buildDunePackage rec {
-    pname = "ppxlib";
-    inherit version;
+  src = fetchurl {
+    url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
+    inherit (param) sha256;
+  };
 
-    src =
-      param.src or (fetchurl {
-        url = "https://github.com/ocaml-ppx/ppxlib/releases/download/${version}/ppxlib-${version}.tbz";
-        inherit (param) sha256;
-      });
+  propagatedBuildInputs = [
+    ocaml-compiler-libs
+  ]
+  ++ (param.OMP or [ ])
+  ++ [
+    ppx_derivers
+    stdio
+    stdlib-shims
+  ];
 
-    propagatedBuildInputs = [
-      ocaml-compiler-libs
-    ]
-    ++ (param.OMP or [ ])
-    ++ [
-      ppx_derivers
-      stdio
-      stdlib-shims
-    ];
-
-    meta = {
-      description = "Comprehensive ppx tool set";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.vbgl ];
-      homepage = "https://github.com/ocaml-ppx/ppxlib";
-    };
-  }
+  meta = {
+    description = "Comprehensive ppx tool set";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    homepage = "https://github.com/ocaml-ppx/ppxlib";
+    broken =
+      param ? max_version && lib.versionAtLeast ocaml.version param.max_version
+      || param ? min_version && lib.versionOlder ocaml.version param.min_version;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ptime/default.nix b/pkgs/development/ocaml-modules/ptime/default.nix
index 4624e22600a1..a29060b191bb 100644
--- a/pkgs/development/ocaml-modules/ptime/default.nix
+++ b/pkgs/development/ocaml-modules/ptime/default.nix
@@ -8,50 +8,47 @@
   topkg,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "ptime is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.2.0";
+  pname = "ocaml${ocaml.version}-ptime";
 
-  stdenv.mkDerivation
-  (finalAttrs: {
-    version = "1.2.0";
-    pname = "ocaml${ocaml.version}-ptime";
+  src = fetchurl {
+    url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
+    hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA=";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/ptime/releases/ptime-${finalAttrs.version}.tbz";
-      hash = "sha256-lhZ0f99JDsNugCTKsn7gHjoK9XfYojImY4+kA03nOrA=";
-    };
+  nativeBuildInputs = [
+    findlib
+    ocaml
+    ocamlbuild
+    topkg
+  ];
 
-    nativeBuildInputs = [
-      findlib
-      ocaml
-      ocamlbuild
-      topkg
-    ];
+  buildInputs = [
+    topkg
+  ];
 
-    buildInputs = [
-      topkg
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
+  meta = {
+    description = "POSIX time for OCaml";
+    homepage = "https://erratique.ch/software/ptime";
+    license = lib.licenses.isc;
+    longDescription = ''
+      Ptime has platform independent POSIX time support in pure OCaml.
+      It provides a type to represent a well-defined range of POSIX timestamps
+      with picosecond precision, conversion with date-time values, conversion
+      with RFC 3339 timestamps and pretty printing to a human-readable,
+      locale-independent representation.
 
-    meta = {
-      description = "POSIX time for OCaml";
-      homepage = "https://erratique.ch/software/ptime";
-      license = lib.licenses.isc;
-      longDescription = ''
-        Ptime has platform independent POSIX time support in pure OCaml.
-        It provides a type to represent a well-defined range of POSIX timestamps
-        with picosecond precision, conversion with date-time values, conversion
-        with RFC 3339 timestamps and pretty printing to a human-readable,
-        locale-independent representation.
+      The additional Ptime_clock library provides access to a system POSIX clock
+      and to the system's current time zone offset.
 
-        The additional Ptime_clock library provides access to a system POSIX clock
-        and to the system's current time zone offset.
-
-        Ptime is not a calendar library.
-      '';
-      maintainers = with lib.maintainers; [ sternenseemann ];
-    };
-  })
+      Ptime is not a calendar library.
+    '';
+    maintainers = with lib.maintainers; [ sternenseemann ];
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+})
diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
index c80b7484d0c2..f9466470cd3d 100644
--- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
+++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
@@ -7,13 +7,13 @@
 
 buildDunePackage rec {
   pname = "qcheck-multicoretests-util";
-  version = "0.9";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "ocaml-multicore";
     repo = "multicoretests";
     rev = version;
-    hash = "sha256-ekHit4MaDb6lUZzGGZ1bm7brUlUgpfIBSpsOvDSxNhw=";
+    hash = "sha256-QABh33C1k5AAYkOa5zDIExwwJFlhgdvSuxShJt4ESM8=";
   };
 
   propagatedBuildInputs = [ qcheck-core ];
diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix
index a5cd1cb10f04..9ca397aafdd6 100644
--- a/pkgs/development/ocaml-modules/react/default.nix
+++ b/pkgs/development/ocaml-modules/react/default.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     inherit (ocaml.meta) platforms;
     maintainers = with maintainers; [
-      maggesi
       vbmithr
       gal_bolle
     ];
diff --git a/pkgs/development/ocaml-modules/rresult/default.nix b/pkgs/development/ocaml-modules/rresult/default.nix
index cc559c1c1740..43a860367b58 100644
--- a/pkgs/development/ocaml-modules/rresult/default.nix
+++ b/pkgs/development/ocaml-modules/rresult/default.nix
@@ -9,37 +9,34 @@
   result,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.07")
-  "rresult is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-rresult";
+  version = "0.7.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
+    sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA=";
+  };
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-rresult";
-    version = "0.7.0";
-    src = fetchurl {
-      url = "https://erratique.ch/software/rresult/releases/rresult-${version}.tbz";
-      sha256 = "sha256-Eap/W4NGDmBDHjFU4+MsBx1G4VHqV2DPJDd4Bb+XVUA=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
+  propagatedBuildInputs = [ result ];
 
-    propagatedBuildInputs = [ result ];
+  strictDeps = true;
 
-    strictDeps = true;
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = {
-      license = lib.licenses.isc;
-      homepage = "https://erratique.ch/software/rresult";
-      description = "Result value combinators for OCaml";
-      maintainers = [ lib.maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = {
+    license = lib.licenses.isc;
+    homepage = "https://erratique.ch/software/rresult";
+    description = "Result value combinators for OCaml";
+    maintainers = [ lib.maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.07");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sail/default.nix b/pkgs/development/ocaml-modules/sail/default.nix
index cded62a1e5cd..b93d8bdd1954 100644
--- a/pkgs/development/ocaml-modules/sail/default.nix
+++ b/pkgs/development/ocaml-modules/sail/default.nix
@@ -16,7 +16,7 @@
   lem,
   linksem,
   yojson,
-  version ? "0.19.1",
+  version ? "0.20",
 }:
 
 buildDunePackage {
@@ -25,7 +25,7 @@ buildDunePackage {
 
   src = fetchurl {
     url = "https://github.com/rems-project/sail/releases/download/${version}/sail-${version}.tbz";
-    hash = "sha256-Xplpi2NnwBgTPJCq7Szv8XPeINtuYcM+KxlZSh1IKjI=";
+    hash = "sha256-WTmYltCrNkt/OeST79Z1xMC2YDgN2HxLJ3PrE7k+R9M=";
   };
 
   minimalOCamlVersion = "4.08";
diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix
index 57cf08744cb3..5bb16cd6e86b 100644
--- a/pkgs/development/ocaml-modules/sawja/default.nix
+++ b/pkgs/development/ocaml-modules/sawja/default.nix
@@ -12,51 +12,47 @@ let
   pname = "sawja";
   version = "1.5.12";
 in
+stdenv.mkDerivation {
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "${pname} is not available for OCaml ${ocaml.version}"
+  pname = "ocaml${ocaml.version}-${pname}";
 
-  stdenv.mkDerivation
-  {
+  inherit version;
 
-    pname = "ocaml${ocaml.version}-${pname}";
+  src = fetchFromGitHub {
+    owner = "javalib-team";
+    repo = pname;
+    rev = version;
+    hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
+  };
 
-    inherit version;
+  nativeBuildInputs = [
+    which
+    ocaml
+    findlib
+  ];
 
-    src = fetchFromGitHub {
-      owner = "javalib-team";
-      repo = pname;
-      rev = version;
-      hash = "sha256-G1W8/G0TEcldnFnH/NAb9a6ZSGGP2fWTM47lI8bBHnw=";
-    };
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      which
-      ocaml
-      findlib
-    ];
+  patches = [
+    ./configure.sh.patch
+    ./Makefile.config.example.patch
+  ];
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    patches = [
-      ./configure.sh.patch
-      ./Makefile.config.example.patch
-    ];
+  configureScript = "./configure.sh";
+  dontAddPrefix = "true";
+  dontAddStaticConfigureFlags = true;
+  configurePlatforms = [ ];
 
-    createFindlibDestdir = true;
+  propagatedBuildInputs = [ javalib ];
 
-    configureScript = "./configure.sh";
-    dontAddPrefix = "true";
-    dontAddStaticConfigureFlags = true;
-    configurePlatforms = [ ];
-
-    propagatedBuildInputs = [ javalib ];
-
-    meta = with lib; {
-      description = "Library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
-      homepage = "http://sawja.inria.fr/";
-      license = licenses.gpl3Plus;
-      maintainers = [ maintainers.vbgl ];
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "Library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs";
+    homepage = "http://sawja.inria.fr/";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.vbgl ];
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sedlex/default.nix b/pkgs/development/ocaml-modules/sedlex/default.nix
index 2a2235c14a6a..084a5d32b1c5 100644
--- a/pkgs/development/ocaml-modules/sedlex/default.nix
+++ b/pkgs/development/ocaml-modules/sedlex/default.nix
@@ -13,8 +13,8 @@ let
   param =
     if lib.versionAtLeast ppxlib.version "0.26.0" then
       {
-        version = "3.6";
-        sha256 = "sha256-NiNqur7sce6dxictVB+saOC1c4N/EO/3Ici/icsGkIA=";
+        version = "3.7";
+        sha256 = "sha256-ucqrJkzS6cVogGUf1vU8oBpSryneMBqTjzxwsOi6Egs=";
       }
     else
       {
@@ -24,20 +24,20 @@ let
 in
 
 let
-  unicodeVersion = "16.0.0";
+  unicodeVersion = "17.0.0";
   baseUrl = "https://www.unicode.org/Public/${unicodeVersion}";
 
   DerivedCoreProperties = fetchurl {
     url = "${baseUrl}/ucd/DerivedCoreProperties.txt";
-    sha256 = "sha256-OdNRYfKVRJf2ngi9uecBST9Haj0wIi3iACj+2jbB2r0=";
+    hash = "sha256-JMf+0RlcSC+q79XB5+uCHF7h+23gfs26pktWqZ2iLAg=";
   };
   DerivedGeneralCategory = fetchurl {
     url = "${baseUrl}/ucd/extracted/DerivedGeneralCategory.txt";
-    sha256 = "sha256-dnardVpB74IQhGAjhWnmCtZcGR3a/mGzbGdl7BNT8pM=";
+    hash = "sha256-1i5bq3DKdPCZND9xIk+gUcsf3WGhq0XASIxEz8C2EC4=";
   };
   PropList = fetchurl {
     url = "${baseUrl}/ucd/PropList.txt";
-    sha256 = "sha256-U9YUUI4qCyMFqKohzWDZk96TJs32WZNmDfzORQNUhYM=";
+    hash = "sha256-Ew3N3Kra8HEAi9/OHndD4E/fvJEIhvAX2fmskx2MZN0=";
   };
   atLeast31 = lib.versionAtLeast param.version "3.1";
 in
diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index 2ec614fbb543..533eee64483a 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -7,10 +7,12 @@
   menhir,
   bos,
   cmdliner,
+  dolmen_model,
   dolmen_type,
   fpath,
   hc,
   menhirLib,
+  mtime,
   # fix eval on legacy ocaml versions
   ocaml_intrinsics ? null,
   patricia-tree,
@@ -23,15 +25,15 @@
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.10.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
-    tag = "v${version}";
-    hash = "sha256-WXGYk/zJnW6QzHKCHl0lkmYb/pG90/sAOK40wYzK35U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8AAS7C/X9YnkgZORRauKqPgXPyFXOhPvd7/VS693e8Q=";
   };
 
   nativeBuildInputs = [
@@ -41,10 +43,12 @@ buildDunePackage rec {
   propagatedBuildInputs = [
     bos
     cmdliner
+    dolmen_model
     dolmen_type
     fpath
     hc
     menhirLib
+    mtime
     ocaml_intrinsics
     patricia-tree
     prelude
@@ -63,14 +67,19 @@ buildDunePackage rec {
     mdx.bin
   ];
 
-  doCheck = !(lib.versions.majorMinor ocaml.version == "5.0" || stdenv.hostPlatform.isDarwin);
+  doCheck =
+    !(
+      lib.versions.majorMinor ocaml.version == "5.0"
+      || lib.versions.majorMinor ocaml.version == "5.4"
+      || stdenv.hostPlatform.isDarwin
+    );
 
   meta = {
     description = "SMT solver frontend for OCaml";
     homepage = "https://formalsec.github.io/smtml/smtml/";
     downloadPage = "https://github.com/formalsec/smtml";
-    changelog = "https://github.com/formalsec/smtml/releases/tag/v${version}";
+    changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})
diff --git a/pkgs/development/ocaml-modules/sodium/default.nix b/pkgs/development/ocaml-modules/sodium/default.nix
index 7ca2e65935ad..77b91c113790 100644
--- a/pkgs/development/ocaml-modules/sodium/default.nix
+++ b/pkgs/development/ocaml-modules/sodium/default.nix
@@ -9,46 +9,43 @@
   libsodium,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "sodium is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-sodium";
+  version = "0.6.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-sodium";
-    version = "0.6.0";
+  src = fetchFromGitHub {
+    owner = "dsheets";
+    repo = "ocaml-sodium";
+    rev = version;
+    sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
+  };
 
-    src = fetchFromGitHub {
-      owner = "dsheets";
-      repo = "ocaml-sodium";
-      rev = version;
-      sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv";
-    };
+  patches = [
+    # ctypes.stubs no longer pulls in bigarray automatically
+    ./lib-gen-link-bigarray.patch
+  ];
 
-    patches = [
-      # ctypes.stubs no longer pulls in bigarray automatically
-      ./lib-gen-link-bigarray.patch
-    ];
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+  ];
+  propagatedBuildInputs = [
+    ctypes
+    libsodium
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-    ];
-    propagatedBuildInputs = [
-      ctypes
-      libsodium
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow";
 
-    hardeningDisable = lib.optional stdenv.hostPlatform.isDarwin "strictoverflow";
-
-    meta = with lib; {
-      homepage = "https://github.com/dsheets/ocaml-sodium";
-      description = "Binding to libsodium 1.0.9+";
-      inherit (ocaml.meta) platforms;
-      maintainers = [ maintainers.rixed ];
-    };
-  }
+  meta = with lib; {
+    homepage = "https://github.com/dsheets/ocaml-sodium";
+    description = "Binding to libsodium 1.0.9+";
+    inherit (ocaml.meta) platforms;
+    maintainers = [ maintainers.rixed ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sosa/default.nix b/pkgs/development/ocaml-modules/sosa/default.nix
index ded25d88f58e..5659bb4fa380 100644
--- a/pkgs/development/ocaml-modules/sosa/default.nix
+++ b/pkgs/development/ocaml-modules/sosa/default.nix
@@ -7,46 +7,43 @@
   ocamlbuild,
 }:
 
-lib.throwIf (lib.versionOlder ocaml.version "4.02")
-  "sosa is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-sosa";
+  version = "0.3.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-sosa";
-    version = "0.3.0";
+  src = fetchFromGitHub {
+    owner = "hammerlab";
+    repo = "sosa";
+    rev = "sosa.${version}";
+    sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk";
+  };
 
-    src = fetchFromGitHub {
-      owner = "hammerlab";
-      repo = "sosa";
-      rev = "sosa.${version}";
-      sha256 = "053hdv6ww0q4mivajj4iyp7krfvgq8zajq9d8x4mia4lid7j0dyk";
-    };
+  postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") ''
+    for p in functors list_of of_mutable
+    do
+      substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib.
+    done
+  '';
 
-    postPatch = lib.optionalString (lib.versionAtLeast ocaml.version "4.07") ''
-      for p in functors list_of of_mutable
-      do
-        substituteInPlace src/lib/$p.ml --replace Pervasives. Stdlib.
-      done
-    '';
+  nativeBuildInputs = [
+    ocaml
+    ocamlbuild
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      ocamlbuild
-      findlib
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  buildPhase = "make build";
 
-    buildPhase = "make build";
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  doCheck = true;
 
-    doCheck = true;
-
-    meta = with lib; {
-      homepage = "http://www.hammerlab.org/docs/sosa/master/index.html";
-      description = "Sane OCaml String API";
-      license = licenses.isc;
-      maintainers = [ maintainers.alexfmpe ];
-    };
-  }
+  meta = with lib; {
+    homepage = "http://www.hammerlab.org/docs/sosa/master/index.html";
+    description = "Sane OCaml String API";
+    license = licenses.isc;
+    maintainers = [ maintainers.alexfmpe ];
+    broken = !(lib.versionOlder ocaml.version "4.02");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/sqlite3/default.nix b/pkgs/development/ocaml-modules/sqlite3/default.nix
index 4830a9e91607..8ab95ae39f76 100644
--- a/pkgs/development/ocaml-modules/sqlite3/default.nix
+++ b/pkgs/development/ocaml-modules/sqlite3/default.nix
@@ -29,7 +29,6 @@ buildDunePackage rec {
     description = "OCaml bindings to the SQLite 3 database access library";
     license = licenses.mit;
     maintainers = with maintainers; [
-      maggesi
       vbgl
     ];
   };
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index fc0a75ca140f..06fb4e2245c9 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -44,7 +44,6 @@ buildDunePackage rec {
     maintainers = with lib.maintainers; [
       anmonteiro
       dandellion
-      maggesi
     ];
   };
 }
diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix
index dd1a26e1ebac..d75b4839a8b0 100644
--- a/pkgs/development/ocaml-modules/stdcompat/default.nix
+++ b/pkgs/development/ocaml-modules/stdcompat/default.nix
@@ -5,27 +5,24 @@
   fetchurl,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.2")
-  "stdcompat is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "stdcompat";
+  version = "19";
 
-  buildDunePackage
-  rec {
-    pname = "stdcompat";
-    version = "19";
+  minimalOCamlVersion = "4.06";
 
-    minimalOCamlVersion = "4.06";
+  src = fetchurl {
+    url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
+    sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/thierry-martinez/stdcompat/releases/download/v${version}/stdcompat-${version}.tar.gz";
-      sha256 = "sha256-DKQGd4nnIN6SPls6hcA/2Jvc7ivYNpeMU6rYsVc1ClU=";
-    };
+  # Otherwise ./configure script will run and create files conflicting with dune.
+  dontConfigure = true;
 
-    # Otherwise ./configure script will run and create files conflicting with dune.
-    dontConfigure = true;
-
-    meta = {
-      homepage = "https://github.com/thierry-martinez/stdcompat";
-      license = lib.licenses.bsd2;
-      maintainers = [ lib.maintainers.vbgl ];
-    };
-  }
+  meta = {
+    homepage = "https://github.com/thierry-martinez/stdcompat";
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.vbgl ];
+    broken = lib.versionAtLeast ocaml.version "5.2";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix
index 0222690e2d5a..ac9ddd453970 100644
--- a/pkgs/development/ocaml-modules/terminal/default.nix
+++ b/pkgs/development/ocaml-modules/terminal/default.nix
@@ -12,13 +12,13 @@
 
 buildDunePackage rec {
   pname = "terminal";
-  version = "0.4.0";
+  version = "0.5.0";
 
   minimalOCamlVersion = "4.03";
 
   src = fetchurl {
     url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";
-    hash = "sha256-i+RJVTN5uy3F6LeYBcgER2kKA9yj6a7pWf7PRtgnj7c=";
+    hash = "sha256-f4fwWXNjkoxFuoWa5aFDD2qjwp4lH/GlPPeG7Q4EWWE=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/tls/eio.nix b/pkgs/development/ocaml-modules/tls/eio.nix
index ef32131a26b1..f04129b6d26b 100644
--- a/pkgs/development/ocaml-modules/tls/eio.nix
+++ b/pkgs/development/ocaml-modules/tls/eio.nix
@@ -17,6 +17,8 @@ buildDunePackage {
 
   minimalOCamlVersion = "5.0";
 
+  __darwinAllowLocalNetworking = true;
+
   doCheck = true;
   nativeCheckInputs = [
     mdx.bin
diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
index 092d3973db90..d5b5517411f1 100644
--- a/pkgs/development/ocaml-modules/tsdl/default.nix
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -13,56 +13,53 @@
   pkg-config,
 }:
 
-if lib.versionOlder ocaml.version "4.03" then
-  throw "tsdl is not available for OCaml ${ocaml.version}"
-else
+let
+  pname = "tsdl";
+  version = "1.1.0";
+  webpage = "https://erratique.ch/software/${pname}";
+in
 
-  let
-    pname = "tsdl";
-    version = "1.1.0";
-    webpage = "https://erratique.ch/software/${pname}";
-  in
+stdenv.mkDerivation {
+  pname = "ocaml${ocaml.version}-${pname}";
+  inherit version;
 
-  stdenv.mkDerivation {
-    pname = "ocaml${ocaml.version}-${pname}";
-    inherit version;
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs=";
+  };
 
-    src = fetchurl {
-      url = "${webpage}/releases/${pname}-${version}.tbz";
-      hash = "sha256-ZN4+trqesU1IREKcwm1Ro37jszKG8XcVigoE4BdGhzs=";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    pkg-config
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
+  propagatedBuildInputs = [
+    SDL2
+    ctypes
+    ctypes-foreign
+  ];
 
-    nativeBuildInputs = [
-      pkg-config
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
-    propagatedBuildInputs = [
-      SDL2
-      ctypes
-      ctypes-foreign
-    ];
+  preConfigure = ''
+    # The following is done to avoid an additional dependency (ncurses)
+    # due to linking in the custom bytecode runtime. Instead, just
+    # compile directly into a native binary, even if it's just a
+    # temporary build product.
+    substituteInPlace myocamlbuild.ml \
+      --replace ".byte" ".native"
+  '';
 
-    preConfigure = ''
-      # The following is done to avoid an additional dependency (ncurses)
-      # due to linking in the custom bytecode runtime. Instead, just
-      # compile directly into a native binary, even if it's just a
-      # temporary build product.
-      substituteInPlace myocamlbuild.ml \
-        --replace ".byte" ".native"
-    '';
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      homepage = webpage;
-      description = "Thin bindings to the cross-platform SDL library";
-      license = licenses.isc;
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    homepage = webpage;
+    description = "Thin bindings to the cross-platform SDL library";
+    license = licenses.isc;
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.03";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/twt/default.nix b/pkgs/development/ocaml-modules/twt/default.nix
index ef5fae48b37c..eb30e395c749 100644
--- a/pkgs/development/ocaml-modules/twt/default.nix
+++ b/pkgs/development/ocaml-modules/twt/default.nix
@@ -6,45 +6,42 @@
   findlib,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "twt is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-twt";
+  version = "0.94.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-twt";
-    version = "0.94.0";
+  src = fetchFromGitHub {
+    owner = "mlin";
+    repo = "twt";
+    rev = "v${version}";
+    sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "mlin";
-      repo = "twt";
-      rev = "v${version}";
-      sha256 = "sha256-xbjLPd7P1KyuC3i6WHLBcdLwd14atcBsd5ER+l97KAk=";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  preInstall = ''
+    mkdir -p $out/bin
+    mkdir -p $OCAMLFIND_DESTDIR
+  '';
 
-    preInstall = ''
-      mkdir -p $out/bin
-      mkdir -p $OCAMLFIND_DESTDIR
-    '';
+  dontBuild = true;
 
-    dontBuild = true;
+  installFlags = [ "PREFIX=$(out)" ];
 
-    installFlags = [ "PREFIX=$(out)" ];
+  dontStrip = true;
 
-    dontStrip = true;
-
-    meta = with lib; {
-      description = "“The Whitespace Thing” for OCaml";
-      homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
-      license = licenses.mit;
-      maintainers = [ maintainers.vbgl ];
-      mainProgram = "ocaml+twt";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "“The Whitespace Thing” for OCaml";
+    homepage = "http://people.csail.mit.edu/mikelin/ocaml+twt/";
+    license = licenses.mit;
+    maintainers = [ maintainers.vbgl ];
+    mainProgram = "ocaml+twt";
+    broken = lib.versionAtLeast ocaml.version "5.0";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ubase/default.nix b/pkgs/development/ocaml-modules/ubase/default.nix
new file mode 100644
index 000000000000..daa7fc35617d
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ubase/default.nix
@@ -0,0 +1,28 @@
+{
+  buildDunePackage,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildDunePackage rec {
+  pname = "ubase";
+  version = "0.20";
+
+  minimalOCamlVersion = "4.14.0";
+
+  src = fetchFromGitHub {
+    owner = "sanette";
+    repo = "ubase";
+    tag = version;
+    sha256 = "sha256-zmYjWEk0r1h87RczCJu2tYlS79F/pAiBt16BplPmA7c=";
+  };
+
+  doCheck = true;
+
+  meta = {
+    description = "Remove accents from utf8 strings";
+    license = lib.licenses.gpl3;
+    homepage = "https://github.com/sanette/ubase";
+    maintainers = with lib.maintainers; [ mrdev023 ];
+  };
+}
diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix
index ac98285c101f..d6f3781fe588 100644
--- a/pkgs/development/ocaml-modules/ulex/default.nix
+++ b/pkgs/development/ocaml-modules/ulex/default.nix
@@ -22,44 +22,40 @@ let
         sha256 = "0cmscxcmcxhlshh4jd0lzw5ffzns12x3bj7h27smbc8waxkwffhl";
       };
 in
+stdenv.mkDerivation {
+  pname = "ocaml${ocaml.version}-${pname}";
+  inherit (param) version;
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "ulex is not available for OCaml ${ocaml.version}"
+  src = fetchFromGitHub {
+    owner = "ocaml-community";
+    repo = pname;
+    rev = "v${param.version}";
+    inherit (param) sha256;
+  };
 
-  stdenv.mkDerivation
-  rec {
-    name = "ocaml${ocaml.version}-${pname}-${version}";
-    inherit (param) version;
+  createFindlibDestdir = true;
 
-    src = fetchFromGitHub {
-      owner = "whitequark";
-      repo = pname;
-      rev = "v${version}";
-      inherit (param) sha256;
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    camlp4
+  ];
+  propagatedBuildInputs = [ camlp4 ];
 
-    createFindlibDestdir = true;
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      camlp4
-    ];
-    propagatedBuildInputs = [ camlp4 ];
+  buildFlags = [
+    "all"
+    "all.opt"
+  ];
 
-    strictDeps = true;
-
-    buildFlags = [
-      "all"
-      "all.opt"
-    ];
-
-    meta = {
-      inherit (src.meta) homepage;
-      description = "Lexer generator for Unicode and OCaml";
-      license = lib.licenses.mit;
-      inherit (ocaml.meta) platforms;
-      maintainers = [ lib.maintainers.roconnor ];
-    };
-  }
+  meta = {
+    homepage = "https://opam.ocaml.org/packages/ulex/";
+    description = "Lexer generator for Unicode and OCaml";
+    license = lib.licenses.mit;
+    inherit (ocaml.meta) platforms;
+    maintainers = [ lib.maintainers.roconnor ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix
index df40282928bb..e214002f1273 100644
--- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix
+++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix
@@ -6,11 +6,11 @@
 
 buildDunePackage {
   pname = "unisim_archisec";
-  version = "0.0.12";
+  version = "0.0.13";
 
   src = fetchurl {
-    url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.12/unisim_archisec-0.0.12.tbz";
-    sha256 = "sha256-RJKyyrQy4zrI3S9e7q3W5UbwsGnSlItXq6X0n69UsL8=";
+    url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.13/unisim_archisec-0.0.13.tbz";
+    sha256 = "sha256-pDLbsF6n4HSGQyWWEb7/RWK+nCWfS+p6Dy/G5jlnlk0=";
   };
 
   duneVersion = "3";
diff --git a/pkgs/development/ocaml-modules/uri/sexp.nix b/pkgs/development/ocaml-modules/uri/sexp.nix
index df54c7636c73..db31f8d0f037 100644
--- a/pkgs/development/ocaml-modules/uri/sexp.nix
+++ b/pkgs/development/ocaml-modules/uri/sexp.nix
@@ -8,21 +8,21 @@
   sexplib0,
 }:
 
-if lib.versionOlder ocaml.version "4.04" then
-  throw "uri-sexp is not available for OCaml ${ocaml.version}"
-else
+buildDunePackage {
+  pname = "uri-sexp";
+  inherit (uri) version src;
 
-  buildDunePackage {
-    pname = "uri-sexp";
-    inherit (uri) version src meta;
+  duneVersion = "3";
 
-    duneVersion = "3";
+  checkInputs = [ ounit ];
+  propagatedBuildInputs = [
+    ppx_sexp_conv
+    sexplib0
+    uri
+  ];
+  doCheck = lib.versionAtLeast ocaml.version "4.08";
 
-    checkInputs = [ ounit ];
-    propagatedBuildInputs = [
-      ppx_sexp_conv
-      sexplib0
-      uri
-    ];
-    doCheck = lib.versionAtLeast ocaml.version "4.08";
-  }
+  meta = uri.meta // {
+    broken = uri.meta.broken or false || lib.versionOlder ocaml.version "4.04";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index 77ca17170585..6f203bdc5832 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -10,45 +10,42 @@
   version ? if lib.versionAtLeast ocaml.version "4.14" then "0.9.10" else "0.9.8",
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "uuidm is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation {
+  inherit version;
+  pname = "uuidm";
+  src = fetchurl {
+    url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
+    hash =
+      {
+        "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc=";
+        "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM=";
+      }
+      ."${version}";
+  };
 
-  stdenv.mkDerivation
-  {
-    inherit version;
-    pname = "uuidm";
-    src = fetchurl {
-      url = "https://erratique.ch/software/uuidm/releases/uuidm-${version}.tbz";
-      hash =
-        {
-          "0.9.10" = "sha256-kWVZSofWMyky5nAuxoh1xNhwMKZ2qUahL3Dh27J36Vc=";
-          "0.9.8" = "sha256-/GZbkJVDQu1UY8SliK282kUWAVMfOnpQadUlRT/tJrM=";
-        }
-        ."${version}";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  configurePlatforms = [ ];
+  buildInputs = [
+    topkg
+    cmdliner
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    configurePlatforms = [ ];
-    buildInputs = [
-      topkg
-      cmdliner
-    ];
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      description = "OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
-      homepage = "https://erratique.ch/software/uuidm";
-      license = licenses.bsd3;
-      maintainers = [ maintainers.maurer ];
-      mainProgram = "uuidtrip";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
+    homepage = "https://erratique.ch/software/uuidm";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.maurer ];
+    mainProgram = "uuidtrip";
+    inherit (ocaml.meta) platforms;
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix
index 0fc5a247e8e9..522a001f4a4d 100644
--- a/pkgs/development/ocaml-modules/uunf/default.nix
+++ b/pkgs/development/ocaml-modules/uunf/default.nix
@@ -22,52 +22,48 @@ let
     }
     ."${version}";
 in
+stdenv.mkDerivation {
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  inherit version;
 
-if lib.versionOlder ocaml.version "4.03" then
-  throw "${pname} is not available for OCaml ${ocaml.version}"
-else
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    inherit hash;
+  };
 
-  stdenv.mkDerivation {
-    name = "ocaml${ocaml.version}-${pname}-${version}";
-    inherit version;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [
+    topkg
+    uutf
+  ]
+  ++ lib.optional cmdlinerSupport cmdliner;
 
-    src = fetchurl {
-      url = "${webpage}/releases/${pname}-${version}.tbz";
-      inherit hash;
-    };
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [
-      topkg
-      uutf
-    ]
-    ++ lib.optional cmdlinerSupport cmdliner;
+  prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384";
 
-    strictDeps = true;
+  buildPhase = ''
+    runHook preBuild
+    ${topkg.run} build \
+      --with-uutf true \
+      --with-cmdliner ${lib.boolToString cmdlinerSupport}
+    runHook postBuild
+  '';
 
-    prePatch = lib.optionalString stdenv.hostPlatform.isAarch64 "ulimit -s 16384";
+  inherit (topkg) installPhase;
 
-    buildPhase = ''
-      runHook preBuild
-      ${topkg.run} build \
-        --with-uutf true \
-        --with-cmdliner ${lib.boolToString cmdlinerSupport}
-      runHook postBuild
-    '';
-
-    inherit (topkg) installPhase;
-
-    meta = with lib; {
-      description = "OCaml module for normalizing Unicode text";
-      homepage = webpage;
-      license = licenses.bsd3;
-      maintainers = [ maintainers.vbgl ];
-      mainProgram = "unftrip";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "OCaml module for normalizing Unicode text";
+    homepage = webpage;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vbgl ];
+    mainProgram = "unftrip";
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.03";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/vg/default.nix b/pkgs/development/ocaml-modules/vg/default.nix
index 5b99a1b04cf1..b3d47c8b1d60 100644
--- a/pkgs/development/ocaml-modules/vg/default.nix
+++ b/pkgs/development/ocaml-modules/vg/default.nix
@@ -22,64 +22,60 @@ let
   version = "0.9.5";
   webpage = "https://erratique.ch/software/${pname}";
 in
+stdenv.mkDerivation {
 
-if versionOlder ocaml.version "4.14" then
-  throw "vg is not available for OCaml ${ocaml.version}"
-else
+  name = "ocaml${ocaml.version}-${pname}-${version}";
 
-  stdenv.mkDerivation {
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw=";
+  };
 
-    name = "ocaml${ocaml.version}-${pname}-${version}";
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+  ];
+  buildInputs = [ topkg ];
 
-    src = fetchurl {
-      url = "${webpage}/releases/${pname}-${version}.tbz";
-      hash = "sha256-qcTtvIfSUwzpUZDspL+54UTNvWY6u3BTvfGWF6c0Jvw=";
-    };
+  propagatedBuildInputs = [
+    uchar
+    result
+    gg
+  ]
+  ++ optionals pdfBackend [
+    otfm
+  ]
+  ++ optionals htmlcBackend [
+    brr
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-    ];
-    buildInputs = [ topkg ];
+  strictDeps = true;
 
-    propagatedBuildInputs = [
-      uchar
-      result
-      gg
-    ]
-    ++ optionals pdfBackend [
-      otfm
-    ]
-    ++ optionals htmlcBackend [
-      brr
-    ];
+  buildPhase =
+    topkg.buildPhase
+    + " --with-otfm ${lib.boolToString pdfBackend}"
+    + " --with-brr ${lib.boolToString htmlcBackend}"
+    + " --with-cairo2 false";
 
-    strictDeps = true;
+  inherit (topkg) installPhase;
 
-    buildPhase =
-      topkg.buildPhase
-      + " --with-otfm ${lib.boolToString pdfBackend}"
-      + " --with-brr ${lib.boolToString htmlcBackend}"
-      + " --with-cairo2 false";
+  meta = with lib; {
+    description = "Declarative 2D vector graphics for OCaml";
+    longDescription = ''
+      Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
+      are values that denote functions mapping points of the cartesian plane
+      to colors. The module provides combinators to define and compose these
+      values.
 
-    inherit (topkg) installPhase;
-
-    meta = with lib; {
-      description = "Declarative 2D vector graphics for OCaml";
-      longDescription = ''
-        Vg is an OCaml module for declarative 2D vector graphics. In Vg, images
-        are values that denote functions mapping points of the cartesian plane
-        to colors. The module provides combinators to define and compose these
-        values.
-
-        Renderers for PDF, SVG and the HTML canvas are distributed with the
-        module. An API allows to implement new renderers.
-      '';
-      homepage = webpage;
-      license = licenses.isc;
-      maintainers = [ maintainers.jirkamarsik ];
-      mainProgram = "vecho";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+      Renderers for PDF, SVG and the HTML canvas are distributed with the
+      module. An API allows to implement new renderers.
+    '';
+    homepage = webpage;
+    license = licenses.isc;
+    maintainers = [ maintainers.jirkamarsik ];
+    mainProgram = "vecho";
+    inherit (ocaml.meta) platforms;
+    broken = versionOlder ocaml.version "4.14";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/visitors/default.nix b/pkgs/development/ocaml-modules/visitors/default.nix
index b4459cfaae65..5eaf5eb853ee 100644
--- a/pkgs/development/ocaml-modules/visitors/default.nix
+++ b/pkgs/development/ocaml-modules/visitors/default.nix
@@ -5,22 +5,26 @@
   ppxlib,
   ppx_deriving,
   result,
+  version ? if lib.versionAtLeast ppxlib.version "0.36" then "20251010" else "20250212",
 }:
 
-buildDunePackage rec {
+buildDunePackage {
   pname = "visitors";
-  version = "20250212";
-
-  duneVersion = "3";
+  inherit version;
 
   minimalOCamlVersion = "4.08";
 
   src = fetchFromGitLab {
     owner = "fpottier";
-    repo = pname;
-    rev = version;
+    repo = "visitors";
+    tag = version;
     domain = "gitlab.inria.fr";
-    sha256 = "sha256-AFD4+vriwVGt6lzDyIDuIMadakcgB4j235yty5qqFgQ=";
+    hash =
+      {
+        "20250212" = "sha256-AFD4+vriwVGt6lzDyIDuIMadakcgB4j235yty5qqFgQ=";
+        "20251010" = "sha256-3CHXECMHf/UWtLvy7fiOaxx6EizRRtm9HpqRxcRjH3I=";
+      }
+      ."${version}";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/vlq/default.nix b/pkgs/development/ocaml-modules/vlq/default.nix
index e6b8070963df..984c20586737 100644
--- a/pkgs/development/ocaml-modules/vlq/default.nix
+++ b/pkgs/development/ocaml-modules/vlq/default.nix
@@ -6,26 +6,23 @@
   dune-configurator,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "vlq is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "vlq";
+  version = "0.2.1";
 
-  buildDunePackage
-  rec {
-    pname = "vlq";
-    version = "0.2.1";
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz";
+    sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi";
+  };
 
-    src = fetchurl {
-      url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz";
-      sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi";
-    };
+  buildInputs = [ dune-configurator ];
 
-    buildInputs = [ dune-configurator ];
+  meta = {
+    description = "Encoding variable-length quantities, in particular base64";
+    license = lib.licenses.mit;
+    homepage = "https://github.com/flowtype/ocaml-vlq";
+    maintainers = [ lib.maintainers.nomeata ];
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
 
-    meta = {
-      description = "Encoding variable-length quantities, in particular base64";
-      license = lib.licenses.mit;
-      homepage = "https://github.com/flowtype/ocaml-vlq";
-      maintainers = [ lib.maintainers.nomeata ];
-    };
-
-  }
+}
diff --git a/pkgs/development/ocaml-modules/wasm/default.nix b/pkgs/development/ocaml-modules/wasm/default.nix
index 5af0836ed2ca..24fe6fb00061 100644
--- a/pkgs/development/ocaml-modules/wasm/default.nix
+++ b/pkgs/development/ocaml-modules/wasm/default.nix
@@ -24,9 +24,6 @@ buildDunePackage rec {
     export sourceRoot=$PWD
   '';
 
-  # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
-  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
-
   nativeBuildInputs = [
     menhir
     odoc
diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix
index 21d0b28a09b7..3ad17d8aa74f 100644
--- a/pkgs/development/ocaml-modules/xmlm/default.nix
+++ b/pkgs/development/ocaml-modules/xmlm/default.nix
@@ -11,38 +11,34 @@ let
   pname = "xmlm";
   webpage = "https://erratique.ch/software/${pname}";
 in
+stdenv.mkDerivation rec {
+  name = "ocaml${ocaml.version}-${pname}-${version}";
+  version = "1.4.0";
 
-if lib.versionOlder ocaml.version "4.05" then
-  throw "xmlm is not available for OCaml ${ocaml.version}"
-else
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo=";
+  };
 
-  stdenv.mkDerivation rec {
-    name = "ocaml${ocaml.version}-${pname}-${version}";
-    version = "1.4.0";
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    topkg
+  ];
+  buildInputs = [ topkg ];
 
-    src = fetchurl {
-      url = "${webpage}/releases/${pname}-${version}.tbz";
-      sha256 = "sha256-CRJSJY490WMgw85N2yG81X79nIwuv7eZ7mpUPtSS2fo=";
-    };
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      topkg
-    ];
-    buildInputs = [ topkg ];
+  inherit (topkg) buildPhase installPhase;
 
-    strictDeps = true;
-
-    inherit (topkg) buildPhase installPhase;
-
-    meta = with lib; {
-      description = "OCaml streaming codec to decode and encode the XML data format";
-      homepage = webpage;
-      license = licenses.isc;
-      maintainers = [ maintainers.vbgl ];
-      mainProgram = "xmltrip";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "OCaml streaming codec to decode and encode the XML data format";
+    homepage = webpage;
+    license = licenses.isc;
+    maintainers = [ maintainers.vbgl ];
+    mainProgram = "xmltrip";
+    inherit (ocaml.meta) platforms;
+    broken = lib.versionOlder ocaml.version "4.05";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/z3/default.nix b/pkgs/development/ocaml-modules/z3/default.nix
index ddc9e2931015..e0643d5e5e56 100644
--- a/pkgs/development/ocaml-modules/z3/default.nix
+++ b/pkgs/development/ocaml-modules/z3/default.nix
@@ -7,43 +7,40 @@
   z3,
 }:
 
-if lib.versionOlder ocaml.version "4.08" then
-  throw "z3 is not available for OCaml ${ocaml.version}"
-else
+let
+  z3-with-ocaml = (
+    z3.override {
+      ocamlBindings = true;
+      inherit ocaml findlib zarith;
+    }
+  );
+in
 
-  let
-    z3-with-ocaml = (
-      z3.override {
-        ocamlBindings = true;
-        inherit ocaml findlib zarith;
-      }
-    );
-  in
+stdenv.mkDerivation {
 
-  stdenv.mkDerivation {
+  pname = "ocaml${ocaml.version}-z3";
+  inherit (z3-with-ocaml) version;
 
-    pname = "ocaml${ocaml.version}-z3";
-    inherit (z3-with-ocaml) version;
+  dontUnpack = true;
 
-    dontUnpack = true;
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $OCAMLFIND_DESTDIR
+    cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR
+    cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3
+    runHook postInstall
+  '';
 
-    installPhase = ''
-      runHook preInstall
-      mkdir -p $OCAMLFIND_DESTDIR
-      cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/stublibs $OCAMLFIND_DESTDIR
-      cp -r ${z3-with-ocaml.ocaml}/lib/ocaml/${ocaml.version}/site-lib/Z3 $OCAMLFIND_DESTDIR/z3
-      runHook postInstall
-    '';
+  nativeBuildInputs = [ findlib ];
+  propagatedBuildInputs = [
+    z3-with-ocaml.lib
+    zarith
+  ];
 
-    nativeBuildInputs = [ findlib ];
-    propagatedBuildInputs = [
-      z3-with-ocaml.lib
-      zarith
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
-
-    meta = z3.meta // {
-      description = "Z3 Theorem Prover (OCaml API)";
-    };
-  }
+  meta = z3.meta // {
+    description = "Z3 Theorem Prover (OCaml API)";
+    broken = lib.versionOlder ocaml.version "4.08";
+  };
+}
diff --git a/pkgs/development/ocaml-modules/zarith/default.nix b/pkgs/development/ocaml-modules/zarith/default.nix
index 09ef6ced2600..6b0e4ad4074a 100644
--- a/pkgs/development/ocaml-modules/zarith/default.nix
+++ b/pkgs/development/ocaml-modules/zarith/default.nix
@@ -9,49 +9,46 @@
   version ? if lib.versionAtLeast ocaml.version "4.08" then "1.14" else "1.13",
 }:
 
-if lib.versionOlder ocaml.version "4.04" then
-  throw "zarith is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ocaml${ocaml.version}-zarith";
+  inherit version;
+  src = fetchFromGitHub {
+    owner = "ocaml";
+    repo = "Zarith";
+    rev = "release-${version}";
+    hash =
+      {
+        "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg=";
+        "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE=";
+      }
+      ."${finalAttrs.version}";
+  };
 
-  stdenv.mkDerivation (finalAttrs: {
-    pname = "ocaml${ocaml.version}-zarith";
-    inherit version;
-    src = fetchFromGitHub {
-      owner = "ocaml";
-      repo = "Zarith";
-      rev = "release-${version}";
-      hash =
-        {
-          "1.13" = "sha256-CNVKoJeO3fsmWaV/dwnUA8lgI4ZlxR/LKCXpCXUrpSg=";
-          "1.14" = "sha256-xUrBDr+M8uW2KOy7DZieO/vDgsSOnyBnpOzQDlXJ0oE=";
-        }
-        ."${finalAttrs.version}";
-    };
+  nativeBuildInputs = [
+    pkg-config
+    ocaml
+    findlib
+  ];
+  propagatedBuildInputs = [ gmp ];
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      pkg-config
-      ocaml
-      findlib
+  dontAddPrefix = true;
+  dontAddStaticConfigureFlags = true;
+  configurePlatforms = [ ];
+  configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];
+
+  preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
+
+  meta = with lib; {
+    description = "Fast, arbitrary precision OCaml integers";
+    homepage = "https://github.com/ocaml/Zarith";
+    changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes";
+    license = licenses.lgpl2;
+    inherit (ocaml.meta) platforms;
+    maintainers = with maintainers; [
+      thoughtpolice
+      vbgl
     ];
-    propagatedBuildInputs = [ gmp ];
-    strictDeps = true;
-
-    dontAddPrefix = true;
-    dontAddStaticConfigureFlags = true;
-    configurePlatforms = [ ];
-    configureFlags = [ "-installdir ${placeholder "out"}/lib/ocaml/${ocaml.version}/site-lib" ];
-
-    preInstall = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs";
-
-    meta = with lib; {
-      description = "Fast, arbitrary precision OCaml integers";
-      homepage = "https://github.com/ocaml/Zarith";
-      changelog = "https://github.com/ocaml/Zarith/raw/${finalAttrs.src.rev}/Changes";
-      license = licenses.lgpl2;
-      inherit (ocaml.meta) platforms;
-      maintainers = with maintainers; [
-        thoughtpolice
-        vbgl
-      ];
-    };
-  })
+    broken = lib.versionOlder ocaml.version "4.04";
+  };
+})
diff --git a/pkgs/development/ocaml-modules/zipc/default.nix b/pkgs/development/ocaml-modules/zipc/default.nix
index 74717ec79471..7f983a68a022 100644
--- a/pkgs/development/ocaml-modules/zipc/default.nix
+++ b/pkgs/development/ocaml-modules/zipc/default.nix
@@ -9,38 +9,35 @@
   cmdliner,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.14")
-  "zipc is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-zipc";
+  version = "0.2.0";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-zipc";
-    version = "0.2.0";
+  src = fetchurl {
+    url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz";
+    hash = "sha256-YQqkCURwrJgFH0+zgfket25zJQ4w+Tcc1mTSrDuWRt0=";
+  };
 
-    src = fetchurl {
-      url = "https://erratique.ch/software/zipc/releases/zipc-${version}.tbz";
-      hash = "sha256-YQqkCURwrJgFH0+zgfket25zJQ4w+Tcc1mTSrDuWRt0=";
-    };
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-    ];
+  buildInputs = [
+    cmdliner
+    topkg
+  ];
 
-    buildInputs = [
-      cmdliner
-      topkg
-    ];
+  inherit (topkg) buildPhase installPhase;
 
-    inherit (topkg) buildPhase installPhase;
-
-    meta = {
-      description = "ZIP archive and deflate codec for OCaml";
-      homepage = "https://erratique.ch/software/zipc";
-      license = lib.licenses.isc;
-      maintainers = [ lib.maintainers.vbgl ];
-    };
-  }
+  meta = {
+    description = "ZIP archive and deflate codec for OCaml";
+    homepage = "https://erratique.ch/software/zipc";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vbgl ];
+    broken = !(lib.versionAtLeast ocaml.version "4.14");
+  };
+}
diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix
index 073cb0423682..b264606cd05a 100644
--- a/pkgs/development/perl-modules/ImageExifTool/default.nix
+++ b/pkgs/development/perl-modules/ImageExifTool/default.nix
@@ -1,21 +1,22 @@
 {
   buildPerlPackage,
-  exiftool,
-  fetchurl,
+  fetchFromGitHub,
   gitUpdater,
   lib,
   shortenPerlShebang,
   stdenv,
-  testers,
+  versionCheckHook,
 }:
 
 buildPerlPackage rec {
   pname = "Image-ExifTool";
-  version = "13.25";
+  version = "13.39";
 
-  src = fetchurl {
-    url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
-    hash = "sha256-HNVVFEhGooKYeDvr86tFIjUnPHg1hBCBPj1Ok8ZTsfo=";
+  src = fetchFromGitHub {
+    owner = "exiftool";
+    repo = "exiftool";
+    tag = version;
+    hash = "sha256-GPm3HOt7fNMbXRrV5V+ykJAfhww1O6NrD0l/7hA2i28=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
@@ -28,13 +29,12 @@ buildPerlPackage rec {
     shortenPerlShebang $out/bin/exiftool
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-ver";
+
   passthru = {
-    tests.version = testers.testVersion {
-      inherit version;
-      command = "${lib.getExe exiftool} -ver";
-      package = exiftool;
-    };
-    updateScript = gitUpdater { url = "https://github.com/exiftool/exiftool.git"; };
+    updateScript = gitUpdater { };
   };
 
   meta = {
diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix
index 2c998d510279..8d43a6d27127 100644
--- a/pkgs/development/php-packages/box/default.nix
+++ b/pkgs/development/php-packages/box/default.nix
@@ -16,7 +16,7 @@ php82.buildComposerProject2 (finalAttrs: {
     hash = "sha256-giJAcH2R9hAlUTbwRi7rbmUP+WV8Nfb9XmoHHs4RcbI=";
   };
 
-  vendorHash = "sha256-7oZtuQ7PhB7q9vNO2TLI46kg2q9BgdLjGUduGXAHc0E=";
+  vendorHash = "sha256-A/hAw0J4Q3kun6soxI6h7kpyGef9q0EFg8HAQHHZUro=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
index e44f8f9777a6..c36e401e3b15 100644
--- a/pkgs/development/php-packages/composer/default.nix
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -14,6 +14,13 @@
   versionCheckHook,
 }:
 
+/*
+    XXX IMPORTANT
+
+    Make sure to check if the `vendorHash` of `buildComposerProject2` changes when updating!
+    See https://github.com/NixOS/nixpkgs/issues/451395
+*/
+
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "composer";
   version = "2.8.12";
diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 068ccb189d93..d9c42c328551 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.16.0";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YEapyEtvI0N9ey9UNbgRd15NyrCqRYJkmD+RuyysIRw=";
+    hash = "sha256-g2V2clNI0+KzKAPStq1vJZ3gHpBV1EbduWBmzRnuzv8=";
   };
 
-  vendorHash = "sha256-0MH4Q5FY9nu5Jpz/iMIu99P8ptQY07t3qbXMp6J7bt4=";
+  vendorHash = "sha256-wDxrLsBA8TMc6Fk+voeHlxQNfJaaef1ydg0ppuJgO2E=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];
diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix
index f8201fcd2dc9..59132f26cbfb 100644
--- a/pkgs/development/php-packages/memcached/default.nix
+++ b/pkgs/development/php-packages/memcached/default.nix
@@ -11,13 +11,13 @@
 
 buildPecl rec {
   pname = "memcached";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "php-memcached-dev";
     repo = "php-memcached";
     rev = "v${version}";
-    sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs=";
+    sha256 = "sha256-sweEM4TVId+6ySffulmebZpz390dZXb+G3zFZvc45L8=";
   };
 
   internalDeps = [ php.extensions.session ];
diff --git a/pkgs/development/php-packages/phing/default.nix b/pkgs/development/php-packages/phing/default.nix
index 6edfcbe0426a..7d76d08f7753 100644
--- a/pkgs/development/php-packages/phing/default.nix
+++ b/pkgs/development/php-packages/phing/default.nix
@@ -17,7 +17,7 @@
       hash = "sha256-gY6ocmkd7eJIMaBrewfxYL7gTr+1qNHTkuAp+w9ApUU=";
     };
 
-    vendorHash = "sha256-3frpoQzHtJA2/jJpZT+yIRatEwiY6LIUGzEZBa8hXbM=";
+    vendorHash = "sha256-zrHOw7Uyq8H7AyxrfCo5VthX1EeoSB44ynrRt38u3Sk=";
 
     nativeInstallCheckInputs = [
       versionCheckHook
diff --git a/pkgs/development/php-packages/phive/default.nix b/pkgs/development/php-packages/phive/default.nix
index 5d0a9f26b1b3..35c108c5200d 100644
--- a/pkgs/development/php-packages/phive/default.nix
+++ b/pkgs/development/php-packages/phive/default.nix
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
     hash = "sha256-dv9v1KCLNheFmrRQ7cID5WFvoiH0OWVPWSrN023dEqA=";
   };
 
-  vendorHash = "sha256-H1QJ+ML0tbZzEBKknP0GHhUhw+ujiIH/QNmEgA2zSmM=";
+  vendorHash = "sha256-U6BHAd4tWQKm6uCJ5sM51PltXhF3J4ieTnbC060+8Jg=";
 
   meta = {
     changelog = "https://github.com/phar-io/phive/releases/tag/${finalAttrs.version}";
diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix
index bed0420642c7..e7f93224f1ab 100644
--- a/pkgs/development/php-packages/php-parallel-lint/default.nix
+++ b/pkgs/development/php-packages/php-parallel-lint/default.nix
@@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-ySdLlqlGKZ6LgmAOBMkBNoCAqWrgMwE/Cj6ZEPEsCko=";
+  vendorHash = "sha256-AQAASj5vrSE1xkJ/SZHU4GwOWNobe9ES0Yo+YrLH354=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
diff --git a/pkgs/development/php-packages/phpinsights/default.nix b/pkgs/development/php-packages/phpinsights/default.nix
index 5562277b4cd7..13d0ebf7b640 100644
--- a/pkgs/development/php-packages/phpinsights/default.nix
+++ b/pkgs/development/php-packages/phpinsights/default.nix
@@ -17,7 +17,7 @@ php.buildComposerProject2 (finalAttrs: {
   };
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-CwIfRmwJREz24Qj6J2PKQp+ix+/ZXo1oamcHc1fPUoc=";
+  vendorHash = "sha256-uy8/bkgjDXnt544S70IOwX9I8U0lMLAkbiBDYXyJBcY=";
 
   nativeInstallCheckInputs = [
     versionCheckHook
diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix
index c254fe239871..06533e74a241 100644
--- a/pkgs/development/php-packages/phpmd/default.nix
+++ b/pkgs/development/php-packages/phpmd/default.nix
@@ -19,7 +19,7 @@ php.buildComposerProject2 (finalAttrs: {
   # Missing `composer.lock` from the repository.
   # Issue open at https://github.com/phpmd/phpmd/issues/1056
   composerLock = ./composer.lock;
-  vendorHash = "sha256-AahAs3Gq1OQ+CW3+rU8NnWcR3hKzVNq7s3llsO4mQ38=";
+  vendorHash = "sha256-tiL8PL6Muc/i4Il1rCeEKenCmIEVn3rHFZInbUGQW9o=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 85e6dbd38bb9..b4126b588bb6 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpstan";
-  version = "2.1.29";
+  version = "2.1.31";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
     tag = finalAttrs.version;
-    hash = "sha256-8HPMXJ64qkV6fXfdr6fZTp2m1EhcWiq0cE51VQHuyro=";
+    hash = "sha256-vQTZ59qEqZYLoh8eAX+wqBvLTHKTvMIOkFDfuEG9k9M=";
   };
 
-  vendorHash = "sha256-mSlxWkqhniphYUOjE0zucOqN9gKe3Th0GEikB7DyYVY=";
+  vendorHash = "sha256-ysGcIpsYpZSuysG5Fw5IVSyO/GSnAkF79GnPF8Dttpk=";
   composerStrictValidation = false;
 
   doInstallCheck = true;
diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index 104d66bdf3df..605d88b41637 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -15,36 +15,36 @@
 }:
 
 let
-  version = "0.12.0";
+  version = "0.12.1";
   hashes = {
     "aarch64-darwin" = {
       platform = "darwin-arm64";
       hash = {
-        "8.1" = "sha256-AH8FzXjIPojCxTQqDChuZPUTDnVPeOeS5a0wNXjlyEk=";
-        "8.2" = "sha256-SdivilTHbr28fHaYxK7o1QIT+sWZGHQDjWC2EgtkBbM=";
-        "8.3" = "RUnmwI5q4jXHkiRuR/PwqnztEX/7y59DA/L7BelreVk=";
-        "8.4" = "sha256-y76rICDyrA/ogRxK+4C3JvJ4ch1fNLBrY01zMmcldnw=";
-        "8.5" = "W7BwODGEcRc6E7jpX1nojak7jDV5X+0tjgk32F82wvQ=";
+        "8.1" = "sha256-a9FLBAYX3hSHcR0AqScKNlpIK36V3FXK3w8Oq3m+VSQ=";
+        "8.2" = "sha256-1pJI38OKV4ER4m6bGfMjQIXfSjwBgz6+YsBfVlGE3g8=";
+        "8.3" = "G82BIJ5ha5hBq/zlZfxwC2HVgBuih+wvSUe2e3fUqcg=";
+        "8.4" = "sha256-MDn49LuXMR66TjTLdKYodPSya37m7LEZSAJRi6h+fTQ=";
+        "8.5" = "4BihkHnZIJ+lExoYzE/LcMTQp/IQOexzVsUQQkczYOQ=";
       };
     };
     "aarch64-linux" = {
       platform = "debian-aarch64+libssl3";
       hash = {
-        "8.1" = "sha256-Zg1DdzJKfovGwA+cTR5hDQ1Or8oPRrtsyBu3Zt+/6yg=";
-        "8.2" = "sha256-tV7aoi9aiUrpOufmN4pQKi0Q0Ad6wrajq9SnaeZGlKg=";
-        "8.3" = "sha256-zJN+RSzFXjOB3Uajk1Adrphbz7NAbWMcuB88RRK7SlY=";
-        "8.4" = "qvXUg3GqqN3UUtDPQz1H2BiG/b8SomGLyIPR1NIkFUA=";
-        "8.5" = "GZZa4a+MfoQPlpIA6zOEnD4UdErh/9fLhMp20rOmGIE=";
+        "8.1" = "sha256-zYOckcqgarf3a/dbnv6dj3fq8l2eKO08DnkjAqoGUAE=";
+        "8.2" = "sha256-TrObjYHv0n5XjR7y1VnL5ROTZYKd9WKM4Sb0ToMk+qc=";
+        "8.3" = "sha256-m5wJcskJSDn1C+6X2D7wv5qyiq4MDMZgNo6l/w56hUw=";
+        "8.4" = "3dFTZUm9g+kzIcQtbILa+ETnNCEmg/03O7gcIPBpils=";
+        "8.5" = "PFhnzciKFD62y48BY2wOP9aOMQL6JC69qPqZNQpEVDY=";
       };
     };
     "x86_64-linux" = {
       platform = "debian-x86-64+libssl3";
       hash = {
-        "8.1" = "sha256-NTCRrTuiPDbKBauY+9nQm4oJn9TwHQvNfynSKk/bZ7w=";
-        "8.2" = "sha256-9GwMHf0GIErr0vZieCH5D5tvJiekpOdBo/u1P30L9lc=";
-        "8.3" = "sha256-180n5Naz6dQRCQCj7r0CJhRqfmEHjM7jgkmWRAvyFaY=";
-        "8.4" = "nGgvhtuita+rTtns+33xDDEaIXcd3aYiCAClizWtE1E=";
-        "8.5" = "wvxZ7jUrqXImzH1LEUmvxpxKL4NE0tAtu9M25P82d0w=";
+        "8.1" = "sha256-qJcMtjoQ4iej70SjqnSPF2sNbhMDdTQ6ThX/J4bgZuo=";
+        "8.2" = "sha256-/lIDyQue7Azgx12A4nx3baFbOjHV+ubX6u0wELPhPyI=";
+        "8.3" = "sha256-Jh17Gg1r7/yjX7aJxKSRQdptH6Nf1p3rPlIzqhpp7tQ=";
+        "8.4" = "y+KBe+6gCJ9bdkCIgUDeQLsBE/AsydHULBwjEhjdDAk=";
+        "8.5" = "+wTZw3w55viegnGGQWw55gRx2Hv/XsIDlkVVemklpro=";
       };
     };
   };
diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index 2b941d458943..a6fb3c8f3563 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.4.21";
+  version = "0.4.22";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
     rev = "v${version}";
-    hash = "sha256-3rVnKUZZXLxoKCW717pCiPOVWDudQpoN8lC1jQzpwuw=";
+    hash = "sha256-P53g/o4i+QETWdErZaGA3AREvnr8kL9h0B1BMQlKdFA=";
   };
 
   configureFlags = [
diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 56af7dd6bf5a..3f4a75990c44 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "3.4.6";
+  version = "3.4.7";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "xdebug";
     repo = "xdebug";
     rev = version;
-    hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c=";
+    hash = "sha256-TxwEyXyUGq3rUWyLExyDopJZ29eAoh9QG1TC2+hImmc=";
   };
 
   doCheck = true;
diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 3c1ed7d52f8d..b8c2be527e7f 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "accelerate";
-  version = "1.10.1";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     tag = "v${version}";
-    hash = "sha256-guUlgNRSgBmi5HZNnwPA6GQ1vq5LzZEW2J9w4Wmqh6o=";
+    hash = "sha256-RdqApMgf5EoiFjNAUhVNS3xaqszl2myMF9B5HJBfHOA=";
   };
 
   buildInputs = [ llvmPackages.openmp ];
diff --git a/pkgs/development/python-modules/actron-neo-api/default.nix b/pkgs/development/python-modules/actron-neo-api/default.nix
new file mode 100644
index 000000000000..bd64ad0e9547
--- /dev/null
+++ b/pkgs/development/python-modules/actron-neo-api/default.nix
@@ -0,0 +1,58 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "actron-neo-api";
+  version = "0.1.84";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "kclif9";
+    repo = "actronneoapi";
+    tag = "v${version}";
+    hash = "sha256-ihIg264ZX0tCfRwVLkiq62ke2G125ObcrVabPCDrc4c=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+  ];
+
+  pythonImportsCheck = [ "actron_neo_api" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # test hangs
+    "test_poll_for_token_pending"
+    # AttributeError: property 'authorization_header' of 'ActronAirOAuth2DeviceCodeAuth' object has no setter
+    "test_lazy_token_refres"
+    # ActronAirAuthError: Refresh token is required to refresh the access token
+    "test_get_user_info"
+  ];
+
+  meta = {
+    changelog = "https://github.com/kclif9/actronneoapi/releases/tag/${src.tag}";
+    description = "Communicate with Actron Air systems via the Actron Neo API";
+    homepage = "https://github.com/kclif9/actronneoapi";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/add-trailing-comma/default.nix b/pkgs/development/python-modules/add-trailing-comma/default.nix
index 9b0875773dfb..c9c8a9574e83 100644
--- a/pkgs/development/python-modules/add-trailing-comma/default.nix
+++ b/pkgs/development/python-modules/add-trailing-comma/default.nix
@@ -10,16 +10,16 @@
 
 buildPythonPackage rec {
   pname = "add-trailing-comma";
-  version = "3.2.0";
+  version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "asottile";
     repo = "add-trailing-comma";
     tag = "v${version}";
-    hash = "sha256-b9EHlx149NUAo9UHDZLE3BwSJY5WpxsUYi1mqz7rnHA=";
+    hash = "sha256-Ts04kjhGE0lgrHyT+EuJsVLIYU/842azG1ZUHTyFijc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/affine-gaps/default.nix b/pkgs/development/python-modules/affine-gaps/default.nix
index ac5bce042918..a71d94b2ac93 100644
--- a/pkgs/development/python-modules/affine-gaps/default.nix
+++ b/pkgs/development/python-modules/affine-gaps/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "affine-gaps";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gata-bio";
     repo = "affine-gaps";
     tag = "v${version}";
-    hash = "sha256-GP6Ahp1LQYnKp9V7jDEeFsntMC9Qav5kWm+5bSldtyM=";
+    hash = "sha256-WMH2wUqzA196FSe2TpfslQVW0PGwk7lGMRSKyfCG9rg=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/affinegap/default.nix b/pkgs/development/python-modules/affinegap/default.nix
new file mode 100644
index 000000000000..6d315b347729
--- /dev/null
+++ b/pkgs/development/python-modules/affinegap/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "affinegap";
+  version = "1.12";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "affinegap";
+    tag = "v${version}";
+    hash = "sha256-9eX41eoME5Vdtq+c04eQbMYnViy6QKOhKkafrkeMylI=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Prevent importing from source during test collection (only $out has compiled extensions)
+  preCheck = ''
+    rm -rf affinegap
+  '';
+
+  pythonImportsCheck = [
+    "affinegap"
+  ];
+
+  meta = {
+    description = "Cython implementation of the affine gap string distance";
+    homepage = "https://github.com/dedupeio/affinegap";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix
index e8c3b47854db..f60ebfe67ef0 100644
--- a/pkgs/development/python-modules/ahocorasick-rs/default.nix
+++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "ahocorasick-rs";
-  version = "0.22.2";
+  version = "1.0.3";
 
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ahocorasick_rs";
-    hash = "sha256-h/J6ZCLb+U7A+f6ErAGI1KZrXHsvX23rFl8MXj25dpw=";
+    hash = "sha256-V503Bwp8Idqc2ZiLn7RxKXJztgy0EmWG1tzZn6r8XKU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-uB3r6+Ewpi4dVke/TsCZltfc+ZABYLOLKuNxw+Jfu/M=";
+    hash = "sha256-RfgjO0qffiAZynQ/xChd81L8S0sqTGdWvpHPrz3bKlQ=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/aio-ownet/default.nix b/pkgs/development/python-modules/aio-ownet/default.nix
new file mode 100644
index 000000000000..80b3fbbdab26
--- /dev/null
+++ b/pkgs/development/python-modules/aio-ownet/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "aio-ownet";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hacf-fr";
+    repo = "aio-ownet";
+    tag = "v${version}";
+    hash = "sha256-XaulcBrFLu8YsfaYQsZfUBHnw0H5qX6itdgsiW89Ca4=";
+  };
+
+  build-system = [ poetry-core ];
+
+  optional-dependencies = {
+    cli = [ click ];
+  };
+
+  pythonImportsCheck = [ "aio_ownet" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/hacf-fr/aio-ownet/releases/tag/${src.tag}";
+    description = "Asynchronous OWFS (owserver network protocol) client library";
+    homepage = "https://github.com/hacf-fr/aio-ownet";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/aioairq/default.nix b/pkgs/development/python-modules/aioairq/default.nix
index 585f29d14f13..d5c84610f1fc 100644
--- a/pkgs/development/python-modules/aioairq/default.nix
+++ b/pkgs/development/python-modules/aioairq/default.nix
@@ -6,24 +6,23 @@
   pycryptodome,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aioairq";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "CorantGmbH";
     repo = "aioairq";
     tag = "v${version}";
-    hash = "sha256-XlOVCDWbcdh8VjNxlEcVNttRN3mw19AXlIIQJ1II144=";
+    hash = "sha256-CliY2MfkRfpOmWM70vDRxG6tY2eoaPiRFHb0qt2Kmyw=";
   };
 
+  __darwinAllowLocalNetworking = true;
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -31,9 +30,6 @@ buildPythonPackage rec {
     pycryptodome
   ];
 
-  # Module has no tests
-  #doCheck = false;
-
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
@@ -49,6 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to retrieve data from air-Q devices";
     homepage = "https://github.com/CorantGmbH/aioairq";
+    changelog = "https://github.com/CorantGmbH/aioairq/releases/tag/${src.tag}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index 296967728fd0..734ff01b2686 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -3,22 +3,19 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "aioairzone";
     tag = version;
-    hash = "sha256-pFbX92UxhNcbHjU1Leoyr225Q6lCHT3hfv/mLSm7y2c=";
+    hash = "sha256-eNSsBlLn6Go+2gQ8IHEzFOQPRuJM8nLqwIaDvXLgthY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index 98d8c986d519..c6380fc0d7fe 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -10,19 +10,19 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  yarl,
+  python-dateutil,
 }:
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "6.4.0";
+  version = "6.5.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-Lif2WNGdd4zLMzjpkZE0mdntC8sXzO5GF4nDLbjkFjo=";
+    hash = "sha256-OgcOsRKqSU3k4myfHmOYaXW259LDgYWj0gXPLwabVIM=";
   };
 
   build-system = [ poetry-core ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     colorlog
     langcodes
     orjson
-    yarl
+    python-dateutil
   ];
 
   pythonImportsCheck = [ "aioamazondevices" ];
diff --git a/pkgs/development/python-modules/aioasuswrt/default.nix b/pkgs/development/python-modules/aioasuswrt/default.nix
index 2544f86902ee..3ef2f563bd71 100644
--- a/pkgs/development/python-modules/aioasuswrt/default.nix
+++ b/pkgs/development/python-modules/aioasuswrt/default.nix
@@ -4,25 +4,22 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytest-cov-stub,
-  pytest-asyncio_0,
+  pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aioasuswrt";
-  version = "1.4.0";
+  version = "1.5.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "kennedyshead";
     repo = "aioasuswrt";
-    tag = "V${version}";
-    hash = "sha256-RQxIgAU9KsTbcTKc/Zl+aP77lbDSeiYzR48MtIVwacc=";
+    tag = "v${version}";
+    hash = "sha256-4bVDho1JtNoWW3ueDgfu+GfRtrxWP6XxIK5R3BXgqfQ=";
   };
 
   build-system = [ setuptools ];
@@ -30,7 +27,7 @@ buildPythonPackage rec {
   dependencies = [ asyncssh ];
 
   nativeCheckInputs = [
-    pytest-asyncio_0
+    pytest-asyncio
     pytest-cov-stub
     pytest-mock
     pytestCheckHook
@@ -41,8 +38,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module for Asuswrt";
     homepage = "https://github.com/kennedyshead/aioasuswrt";
-    changelog = "https://github.com/kennedyshead/aioasuswrt/releases/tag/V${version}";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/kennedyshead/aioasuswrt/releases/tag/${src.tag}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index b612ede06c2c..63559a874bda 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -7,6 +7,7 @@
   freezegun,
   ical,
   mashumaro,
+  orjson,
   poetry-core,
   poetry-dynamic-versioning,
   pyjwt,
@@ -22,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2.2.2";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -31,7 +32,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     tag = "v${version}";
-    hash = "sha256-ds/wNPaZYQ8Tk/GyqYrWYL99oU73JWc/3KBsMULBass=";
+    hash = "sha256-qhjfnneLJjdDDP4XrecSI/psqEqKGP5ziaPd/iRiZfM=";
   };
 
   postPatch = ''
@@ -49,6 +50,7 @@ buildPythonPackage rec {
     aiohttp
     ical
     mashumaro
+    orjson
     pyjwt
     python-dateutil
     tzlocal
@@ -67,23 +69,17 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aioautomower" ];
 
   disabledTests = [
-    # File is missing
-    "test_standard_mower"
-    # Call no found
-    "test_post_commands"
     # Timezone mismatches
-    "test_full_planner_event"
-    "test_sinlge_planner_event"
     "test_set_datetime"
     "test_message_event"
     "test_async_get_messages"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Module to communicate with the Automower Connect API";
     homepage = "https://github.com/Thomas55555/aioautomower";
     changelog = "https://github.com/Thomas55555/aioautomower/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix
index 49242150d55d..6af43695037d 100644
--- a/pkgs/development/python-modules/aiobtclientapi/default.nix
+++ b/pkgs/development/python-modules/aiobtclientapi/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aiobtclientapi";
-  version = "1.1.3";
+  version = "1.1.4";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "plotski";
     repo = "aiobtclientapi";
     tag = "v${version}";
-    hash = "sha256-ZpUaMsJs1vdVGQOid7aJ+SJKaCbTtHfSw7cOwPTL0ss=";
+    hash = "sha256-ga3EyKhfdEKkjFktUlgLSX54QbTc/a48vmWjmRqa+4w=";
   };
 
   pythonRelaxDeps = [
@@ -48,6 +48,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiobtclientapi" ];
 
+  disabledTests = [
+    # Timing-sensitive, e.g. "AssertionError: assert 9 <= 7"
+    "test_Monitor_block_until_timeout"
+  ];
+
   disabledTestPaths = [
     # AttributeError
     "tests/clients_test/rtorrent_test/rtorrent_api_test.py"
diff --git a/pkgs/development/python-modules/aiocomelit/default.nix b/pkgs/development/python-modules/aiocomelit/default.nix
index 461d28310a6a..58d857f5c346 100644
--- a/pkgs/development/python-modules/aiocomelit/default.nix
+++ b/pkgs/development/python-modules/aiocomelit/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiocomelit";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "chemelli74";
     repo = "aiocomelit";
     tag = "v${version}";
-    hash = "sha256-/loKnKmLF8EDuZVWdSgxQUslrTKU4DxNmJlFZ0Xv9v8=";
+    hash = "sha256-MPX9WXK2Z+QLGfQSJUlPrUhpjI2oNh7T6u6IfaVglO0=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix
index 18845fc8c92a..9311e645ad76 100644
--- a/pkgs/development/python-modules/aiodiscover/default.nix
+++ b/pkgs/development/python-modules/aiodiscover/default.nix
@@ -4,7 +4,6 @@
   async-timeout,
   buildPythonPackage,
   cached-ipaddress,
-  dnspython,
   fetchFromGitHub,
   ifaddr,
   netifaces,
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "2.7.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "bdraco";
     repo = "aiodiscover";
@@ -33,13 +30,14 @@ buildPythonPackage rec {
   build-system = [ poetry-core ];
 
   dependencies = [
-    async-timeout
     aiodns
     cached-ipaddress
-    dnspython
     ifaddr
     netifaces
     pyroute2
+  ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    async-timeout
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index b53ab7818c5c..4a1ab7dfa2d2 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -25,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "41.13.0";
+  version = "42.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-hrGAByVxnGqFk23fTvGRDJipjHglMS35WeJFM7Gk5S4=";
+    hash = "sha256-dMpAlblqkmwYsXdMLkxGxpVxbbS/sBkRJR46BwXs2PM=";
   };
 
   build-system = [
@@ -59,6 +60,10 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  # Lack of network sandboxing leads to conflicting listeners when testing
+  # this package e.g. in nixpkgs-review on the two suppoted python package sets.
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   disabledTestPaths = [
     # benchmarking requires pytest-codespeed
     "tests/benchmarks"
diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index d0c2d1d6243d..30704da5e25b 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-gLyEb4bFSmnl6PVQ+MYhVcSQ77p5w1yi2MaH1u4uoqI=";
+    hash = "sha256-W3m5LMrCLIawleAVQ32SspzkhSdArYvnSyWC1EfEnYI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aiohomematic-test-support/default.nix b/pkgs/development/python-modules/aiohomematic-test-support/default.nix
new file mode 100644
index 000000000000..4121f93725a2
--- /dev/null
+++ b/pkgs/development/python-modules/aiohomematic-test-support/default.nix
@@ -0,0 +1,28 @@
+{
+  aiohomematic,
+  buildPythonPackage,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohomematic-test-support";
+  inherit (aiohomematic) version src;
+  pyproject = true;
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  sourceRoot = "${src.name}/aiohomematic_test_support";
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "aiohomematic_test_support" ];
+
+  meta = {
+    description = "Support-only package for AioHomematic (tests/dev)";
+    homepage = "https://github.com/SukramJ/aiohomematic/tree/devel/aiohomematic_test_support";
+    inherit (aiohomematic.meta) license maintainers;
+  };
+}
diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index 363dbf4fc3ce..a66a6169b327 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -16,21 +16,16 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2025.10.5";
+  version = "2025.11.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-DgLeshxPo2ZwQXe8pSg81kFLviEWKakOY8DtdQH/H58=";
+    hash = "sha256-WKpcySWdw3yJeFgFR9JTv/MEaSGA/u2sENQH/ZXtds4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==80.9.0" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -50,11 +45,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiohomematic" ];
 
-  disabledTests = [
-    # AssertionError: assert 548 == 555
-    "test_central_full"
-  ];
-
   meta = {
     description = "Module to interact with HomeMatic devices";
     homepage = "https://github.com/SukramJ/aiohomematic";
diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix
index d7203d464870..35d176e3f70b 100644
--- a/pkgs/development/python-modules/aiohttp/default.nix
+++ b/pkgs/development/python-modules/aiohttp/default.nix
@@ -6,6 +6,7 @@
   replaceVars,
   isPy310,
   isPyPy,
+  pythonOlder,
 
   # build-system
   cython,
@@ -20,6 +21,7 @@
   aiosignal,
   async-timeout,
   attrs,
+  backports-zstd,
   frozenlist,
   multidict,
   propcache,
@@ -49,20 +51,16 @@
 
 buildPythonPackage rec {
   pname = "aiohttp";
-  version = "3.12.15";
+  version = "3.13.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "aiohttp";
     tag = "v${version}";
-    hash = "sha256-nVDGSbzjCdyJFCsHq8kJigNA4vGs4Pg1Vyyvw+gKg2w=";
+    hash = "sha256-LqYGrrWgSZazk0hjQvTFwqtU/PtMEaPi+m1Ya8Ds+pU=";
   };
 
-  patches = lib.optionals (!lib.meta.availableOn stdenv.hostPlatform isa-l) [
-    ./remove-isal.patch
-  ];
-
   postPatch = ''
     rm -r vendor
     patchShebangs tools
@@ -92,17 +90,20 @@ buildPythonPackage rec {
   dependencies = [
     aiohappyeyeballs
     aiosignal
-    async-timeout
     attrs
     frozenlist
     multidict
     propcache
     yarl
   ]
+  ++ lib.optionals (pythonOlder "3.11") [
+    async-timeout
+  ]
   ++ optional-dependencies.speedups;
 
   optional-dependencies.speedups = [
     aiodns
+    backports-zstd
     (if isPyPy then brotlicffi else brotli)
   ];
 
@@ -130,6 +131,7 @@ buildPythonPackage rec {
     "test_requote_redirect_url_default"
     "test_tcp_connector_ssl_shutdown_timeout_nonzero_passed"
     "test_tcp_connector_ssl_shutdown_timeout_zero_not_passed"
+    "test_invalid_idna"
     # don't run benchmarks
     "test_import_time"
     # racy
diff --git a/pkgs/development/python-modules/aiohttp/remove-isal.patch b/pkgs/development/python-modules/aiohttp/remove-isal.patch
deleted file mode 100644
index 4a91fca368ae..000000000000
--- a/pkgs/development/python-modules/aiohttp/remove-isal.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 62fb04f2e..bb5b279dd 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -12,7 +12,6 @@ from typing import Any, AsyncIterator, Callable, Generator, Iterator
- from unittest import mock
- from uuid import uuid4
- 
--import isal.isal_zlib
- import pytest
- import zlib_ng.zlib_ng
- from blockbuster import blockbuster_ctx
-@@ -333,7 +332,7 @@ def unused_port_socket() -> Generator[socket.socket, None, None]:
-         s.close()
- 
- 
--@pytest.fixture(params=[zlib, zlib_ng.zlib_ng, isal.isal_zlib])
-+@pytest.fixture(params=[zlib, zlib_ng.zlib_ng])
- def parametrize_zlib_backend(
-     request: pytest.FixtureRequest,
- ) -> Generator[None, None, None]:
diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index 3818ad68ef14..d1525f12f6a1 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -4,10 +4,9 @@
   bitstring,
   buildPythonPackage,
   click,
-  fetchPypi,
+  fetchFromGitHub,
   ifaddr,
   inquirerpy,
-  pythonOlder,
   setuptools,
 }:
 
@@ -16,15 +15,17 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-h82KPrHcWUUrQFyMy3fY6BmQFA5a4DFJdhJ6zRnKMsc=";
+  src = fetchFromGitHub {
+    owner = "aiolifx";
+    repo = "aiolifx";
+    tag = version;
+    hash = "sha256-9FTsY/VFfzLlDEjF8ueBQxr30YasdQwei1/KfHiXwMo=";
   };
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [ "click" ];
+
   dependencies = [
     async-timeout
     bitstring
@@ -38,12 +39,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiolifx" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for local communication with LIFX devices over a LAN";
     homepage = "https://github.com/aiolifx/aiolifx";
     changelog = "https://github.com/aiolifx/aiolifx/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ netixx ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ netixx ];
     mainProgram = "aiolifx";
   };
 }
diff --git a/pkgs/development/python-modules/aiolimiter/default.nix b/pkgs/development/python-modules/aiolimiter/default.nix
index a76d3a3ec8d8..9569cfb0d133 100644
--- a/pkgs/development/python-modules/aiolimiter/default.nix
+++ b/pkgs/development/python-modules/aiolimiter/default.nix
@@ -3,20 +3,16 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  importlib-metadata,
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   toml,
 }:
 
 buildPythonPackage rec {
   pname = "aiolimiter";
   version = "1.2.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mjpieters";
@@ -25,9 +21,15 @@ buildPythonPackage rec {
     hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  # ERROR: '"session"' is not a valid asyncio_default_fixture_loop_scope. Valid scopes are: function, class, module, package, session.
+  # Post 1.2.1, the project switched from tox and is no longer affected, hence fixed in nixpkgs only.
+  postPatch = ''
+    substituteInPlace tox.ini --replace-fail \
+      'asyncio_default_fixture_loop_scope = "session"' \
+      'asyncio_default_fixture_loop_scope = session'
+  '';
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -38,11 +40,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiolimiter" ];
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of a rate limiter for asyncio";
     homepage = "https://github.com/mjpieters/aiolimiter";
     changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index 13792ccd42de..30ee6d4f2316 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiomealie";
-  version = "0.10.2";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-mealie";
     tag = "v${version}";
-    hash = "sha256-VOUtSHxixGpfeP4G0puB1RPgaqvell1SBO7akEnLzrg=";
+    hash = "sha256-J0G0vRFkYZDDVBYxd4Dc/tSZJ991H1F2Acsew0zf9Oo=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index b61f558e7146..e6486edd833f 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -12,24 +12,20 @@
   logging-journald,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   raven,
   rich,
   setproctitle,
-  typing-extensions,
   uvloop,
 }:
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.9.4";
+  version = "17.9.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oSwMhomcPIN2JYterJuBUcmJtUx3rayADH1ugah+pI8=";
+    hash = "sha256-qZcoKRXbBbRY2cTY2bTFTk+IpqJ5Pe+szfA76G7kJ+Q=";
   };
 
   build-system = [ poetry-core ];
@@ -37,7 +33,6 @@ buildPythonPackage rec {
   dependencies = [
     colorlog
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index 2c215840e9ad..91e1be9c6464 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.8.2";
+  version = "4.9.0";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     tag = version;
-    hash = "sha256-5g1LdltGw96EZWWj0Fei8i6l5yslQgicI/oI9jr1w0U=";
+    hash = "sha256-okuDbY4Dx57a7zQc+LYCwe+FOjQS+hbAzSAK47uhGFg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index 3ce0aea5b6c0..cc3dd6553951 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "13.12.0";
+  version = "13.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-ajo7Uu9U2Xowncb4hF95Gx6YbVjTxY4a52mlU4yOy/0=";
+    hash = "sha256-1LiBWoZNSvhTAYf5VDo4gmfTz1oiKgrkAseDOm1kYYI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix
index a48d53f8a5b3..579fe33bd1de 100644
--- a/pkgs/development/python-modules/aioshutil/default.nix
+++ b/pkgs/development/python-modules/aioshutil/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aioshutil";
-  version = "1.6.a1";
+  version = "1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "kumaraditya303";
     repo = "aioshutil";
     tag = "v${version}";
-    hash = "sha256-KoKIlliWSbU8KY92SgFm4Wams87O22KVlE41q18Sk3I=";
+    hash = "sha256-+8BpL9CVH0X/9H7vL4xuV5CdA3A10a2A1q4wt1x1sSM=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix
index 43256333cdcb..98ada059e360 100644
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiosomecomfort";
-  version = "0.0.34";
+  version = "0.0.35";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkmer";
     repo = "AIOSomecomfort";
     tag = version;
-    hash = "sha256-aHqroDhMYlBF20JNSMZDkfYvio15XTrG+9NANSTC1Fw=";
+    hash = "sha256-zhCpV11nzRpWiCPNgeBfBzXgLM2NAw1p9R0ACD3u/mk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/aiostream/default.nix b/pkgs/development/python-modules/aiostream/default.nix
index de2b2fec0067..67466c7e685f 100644
--- a/pkgs/development/python-modules/aiostream/default.nix
+++ b/pkgs/development/python-modules/aiostream/default.nix
@@ -5,23 +5,20 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "aiostream";
-  version = "0.7.0";
+  version = "0.7.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "vxgmichel";
     repo = "aiostream";
     tag = "v${version}";
-    hash = "sha256-oOx1LG3UyMJRm/HvmrHT00jTp3+XzmvS2XRH4BJNyPE=";
+    hash = "sha256-AxisfmFZMEFJ/zfYCTfelvUGIoz56w6dKoZAMDKOZzk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix
index f51a899af510..38b2ed9b105c 100644
--- a/pkgs/development/python-modules/aioswitcher/default.nix
+++ b/pkgs/development/python-modules/aioswitcher/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aioswitcher";
-  version = "6.0.2";
+  version = "6.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "TomerFi";
     repo = "aioswitcher";
     tag = version;
-    hash = "sha256-DtTrfwT8Xvw5byWzTGpO/o2PI7/4Zt++xgKVnNMwA1k=";
+    hash = "sha256-6wBeAbBiuAZW9kHq/bKC0FMJxkLxM6RZN7RLwbF1ig4=";
   };
 
   __darwinAllowLocalNetworking = true;
diff --git a/pkgs/development/python-modules/aiotarfile/default.nix b/pkgs/development/python-modules/aiotarfile/default.nix
index fe9cfbd2fb83..84068164ee63 100644
--- a/pkgs/development/python-modules/aiotarfile/default.nix
+++ b/pkgs/development/python-modules/aiotarfile/default.nix
@@ -1,10 +1,8 @@
 {
   lib,
   fetchFromGitHub,
-  nix-update-script,
   buildPythonPackage,
   unittestCheckHook,
-  pythonOlder,
   cargo,
   rustc,
   rustPlatform,
@@ -12,21 +10,19 @@
 
 buildPythonPackage rec {
   pname = "aiotarfile";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "rhelmot";
     repo = "aiotarfile";
     tag = "v${version}";
-    hash = "sha256-DslG+XxIYb04I3B7m0fmRmE3hFCczF039QhSVdHGPL8=";
+    hash = "sha256-V88cvVw6ss7iiojhlqDd2frG/gCEH0YKTP0IpgeFASw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-e3NbFlBQu9QkGnIwqy2OmlQFVHjlfpMVRFWD2ADGGSc=";
+    hash = "sha256-Yf6N615X9ZB+HDp3xehMc3kjKbdsSbIJrqARRXwCRDQ=";
   };
 
   nativeBuildInputs = [
@@ -42,12 +38,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiotarfile" ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Stream-based, asynchronous tarball processing";
     homepage = "https://github.com/rhelmot/aiotarfile";
-    changelog = "https://github.com/rhelmot/aiotarfile/commits/v{version}";
+    changelog = "https://github.com/rhelmot/aiotarfile/commits/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nicoo ];
   };
diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix
index 58544c789d9d..1d804579bae1 100644
--- a/pkgs/development/python-modules/aiovodafone/default.nix
+++ b/pkgs/development/python-modules/aiovodafone/default.nix
@@ -2,9 +2,11 @@
   lib,
   aiohttp,
   beautifulsoup4,
-  colorlog,
   buildPythonPackage,
+  colorlog,
+  cryptography,
   fetchFromGitHub,
+  orjson,
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
@@ -13,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "aiovodafone";
-  version = "1.2.1";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +24,7 @@ buildPythonPackage rec {
     owner = "chemelli74";
     repo = "aiovodafone";
     tag = "v${version}";
-    hash = "sha256-i4zsOHauKPq2b9LfWd4HYe04oOambbibHfNrJLiSSYw=";
+    hash = "sha256-JeMB7K2NURvMPgCZRNAFt9ThIu4LDq3WlmAXsgm1CKs=";
   };
 
   build-system = [ poetry-core ];
@@ -30,7 +32,9 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     beautifulsoup4
+    cryptography
     colorlog
+    orjson
   ];
 
   nativeCheckInputs = [
@@ -40,11 +44,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiovodafone" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to control Vodafon Station";
     homepage = "https://github.com/chemelli74/aiovodafone";
     changelog = "https://github.com/chemelli74/aiovodafone/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix
index 6be789ed2cd2..fccc01f7eb8a 100644
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiowinreg";
-  version = "0.0.12";
+  version = "0.0.13";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "skelsec";
     repo = "aiowinreg";
     tag = version;
-    hash = "sha256-XQDBvBfocz5loUg9eZQz4FKGiCGCaczwhYE/vhy7mC0=";
+    hash = "sha256-vY5SrGTFH/xsv9k2WciE0xNx9r3W53sxxLGXFX34EuE=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/airos/default.nix b/pkgs/development/python-modules/airos/default.nix
index 9a6ccbf5d0fc..7c2ecfab20be 100644
--- a/pkgs/development/python-modules/airos/default.nix
+++ b/pkgs/development/python-modules/airos/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "airos";
-  version = "0.5.5";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "CoMPaTech";
     repo = "python-airos";
     tag = "v${version}";
-    hash = "sha256-AXzqm5UN+Z0nXqdhsmGuVfwGJuyZgR+imUzmiODnZqk=";
+    hash = "sha256-ako/4D1iKoKRcxxNV1CzUEqSwSEyo+Udf0z4j+mpVgA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix
index 480cf805eafe..0e0bb8970d4c 100644
--- a/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/pkgs/development/python-modules/airthings-ble/default.nix
@@ -9,27 +9,30 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "airthings-ble";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vincegio";
     repo = "airthings-ble";
     tag = version;
-    hash = "sha256-fZvmgRQuSrgraj6e3BtsoKyFX38BedqVh6cHsliT9ns=";
+    hash = "sha256-y6vpkq3u5JKImwxevMupUVVAclUcsyrqxoIOYRK0YGQ=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
     async-interrupt
-    bleak
     bleak-retry-connector
     cbor2
+  ]
+  ++ lib.optionals (pythonOlder "3.14") [
+    bleak
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/aligator/default.nix b/pkgs/development/python-modules/aligator/default.nix
new file mode 100644
index 000000000000..6ef954f53a0e
--- /dev/null
+++ b/pkgs/development/python-modules/aligator/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+  stdenv,
+
+  aligator,
+
+  crocoddyl,
+  pinocchio,
+  python,
+  matplotlib,
+  pytest,
+}:
+toPythonModule (
+  aligator.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    # this is used by CMake at configure/build time
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+
+    propagatedBuildInputs = super.propagatedBuildInputs ++ [
+      aligator
+      crocoddyl
+      pinocchio
+    ];
+
+    nativeCheckInputs = [
+      pythonImportsCheckHook
+    ];
+
+    checkInputs = super.checkInputs ++ [
+      matplotlib
+      pytest
+    ];
+
+    disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+      # SIGTRAP
+      "aligator-test-py-rollout"
+    ];
+
+    pythonImportsCheck = [
+      "aligator"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index e10b9c306d17..6ba46d5f90b2 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "amaranth";
-  version = "0.5.7";
+  version = "0.5.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "amaranth-lang";
     repo = "amaranth";
     tag = "v${version}";
-    hash = "sha256-E/PJrvBmlS39KgzDz9sArq4BXwk/JmIMtdxL7MdrWlc=";
+    hash = "sha256-hqMgyQJRz1/5C9KB3nAI2RKPZXZUl3zhfZbk9M1hTxs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix
deleted file mode 100644
index 3c039de4dbab..000000000000
--- a/pkgs/development/python-modules/amazon-kclpy/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  setuptools,
-  mock,
-  boto3,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "amazon-kclpy";
-  version = "3.1.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "awslabs";
-    repo = "amazon-kinesis-client-python";
-    tag = "v${version}";
-    hash = "sha256-nboEZwRlhbr176H4b6ESm3LfVZCoKz3yKrQptERsLgg=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "remove-deprecated-boto.patch";
-      url = "https://github.com/awslabs/amazon-kinesis-client-python/commit/bd2c442cdd1b0e2c99d3471c1d3ffcc9161a7c42.patch";
-      hash = "sha256-5W0qItDGjx1F6IllzLH57XCpToKrAu9mTbzv/1wMXuY=";
-    })
-  ];
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    mock
-    boto3
-  ];
-
-  pythonImportsCheck = [ "amazon_kclpy" ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = with lib; {
-    description = "Amazon Kinesis Client Library for Python";
-    homepage = "https://github.com/awslabs/amazon-kinesis-client-python";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ psyanticy ];
-    broken = true;
-  };
-}
diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix
index f42cbc100c70..ecbe0c49d412 100644
--- a/pkgs/development/python-modules/anndata/default.nix
+++ b/pkgs/development/python-modules/anndata/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "anndata";
-  version = "0.12.2";
+  version = "0.12.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "anndata";
     tag = version;
-    hash = "sha256-uGkeSlYcphRnIFfe9UcLvnupKeMzAIm5wT8fp3gmPKw=";
+    hash = "sha256-8tHM46wRr896JzZcWKBDy1QLrz/iwKE8YKfRby2Fmb8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/annotatedyaml/default.nix b/pkgs/development/python-modules/annotatedyaml/default.nix
index 16d589e587e0..1abd0e5399ee 100644
--- a/pkgs/development/python-modules/annotatedyaml/default.nix
+++ b/pkgs/development/python-modules/annotatedyaml/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "annotatedyaml";
-  version = "1.0.0";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "annotatedyaml";
     tag = "v${version}";
-    hash = "sha256-bVXhKm69A5FIXYY2yq7jXPIK7lSCQD20a3oX1GdqOLY=";
+    hash = "sha256-+4H3StCZ58TDV6LSXyeC6+Vn56W19+bIO4AdsJEfHI0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix
index ff20c5aef2c7..670c182f8efa 100644
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-builder";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ansible_builder";
     inherit version;
-    hash = "sha256-0txXPianvVCV6YrrN+6bALyfUAWr6nFH10IpwPNCb8s=";
+    hash = "sha256-nYi8FazH0xBW0MUZFKYQLayOWtc/ny01upg3jIlxTtI=";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/ansible-runner/default.nix b/pkgs/development/python-modules/ansible-runner/default.nix
index 760a30469aad..6dce6afd2718 100644
--- a/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/pkgs/development/python-modules/ansible-runner/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "ansible-runner";
-  version = "2.4.1";
+  version = "2.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ansible";
     repo = "ansible-runner";
     tag = version;
-    hash = "sha256-Fyavc13TRHbslRVoBawyBgvUKhuIZsxBc7go66axE0Y=";
+    hash = "sha256-aO7AcDtPbbmTsY+39oZYdPABYFy6bK3ZR1jatLTb7O4=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index d295105a6ef5..fd96ee93aaa1 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   python,
   pythonOlder,
   installShellFiles,
@@ -34,15 +34,16 @@ buildPythonPackage rec {
   pname = "ansible-core";
   # IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix
   # There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here
-  version = "2.19.3";
+  version = "2.19.4";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
-  src = fetchPypi {
-    pname = "ansible_core";
-    inherit version;
-    hash = "sha256-JDppZpoAe+B5Q2C8RHf3DgEozgCR3Dr0xcuBxqRm9XM=";
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = "ansible";
+    tag = "v${version}";
+    hash = "sha256-TjafUlPKuxpXrfREK65D88SoGThGBzpbfCHr0ZkviI0=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through
diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index a61d839246b5..11b07f8c2c19 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pythonOlder,
   buildPythonPackage,
   fetchPypi,
   setuptools,
@@ -25,17 +24,15 @@
 
 let
   pname = "ansible";
-  version = "12.1.0";
+  version = "12.2.0";
 in
 buildPythonPackage {
   inherit pname version;
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-It6hk41DP6UVswAc+tZcswjvl8mA8VIBdNBU3TjzLIM=";
+    hash = "sha256-BWPf0z69KMr2zNx6bSKn/a+9nJxC/vyuUXlhalOjUhE=";
   };
 
   # we make ansible-core depend on ansible, not the other way around,
diff --git a/pkgs/development/python-modules/anthropic/default.nix b/pkgs/development/python-modules/anthropic/default.nix
index 6259ce3314c2..696115fc61b9 100644
--- a/pkgs/development/python-modules/anthropic/default.nix
+++ b/pkgs/development/python-modules/anthropic/default.nix
@@ -11,6 +11,7 @@
   # dependencies
   anyio,
   distro,
+  docstring-parser,
   httpx,
   jiter,
   pydantic,
@@ -23,6 +24,7 @@
 
   # test
   dirty-equals,
+  inline-snapshot,
   nest-asyncio,
   pytest-asyncio,
   pytest-xdist,
@@ -32,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "anthropic";
-  version = "0.62.0";
+  version = "0.71.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthropics";
     repo = "anthropic-sdk-python";
     tag = "v${version}";
-    hash = "sha256-EVLSC6ClHnmGqMoefMXj3M4dh812ZN5t9nF3gfCLyCo=";
+    hash = "sha256-n8hu2RFuZN0ojHhhU4qPQaT2DUvqSglFhBo2ORln/mc=";
   };
 
   postPatch = ''
@@ -55,6 +57,7 @@ buildPythonPackage rec {
   dependencies = [
     anyio
     distro
+    docstring-parser
     httpx
     jiter
     pydantic
@@ -69,6 +72,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     dirty-equals
+    inline-snapshot
     nest-asyncio
     pytest-asyncio
     pytest-xdist
diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 2c446ac30517..80da163424a1 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -10,13 +10,11 @@ buildPythonPackage rec {
   pname = "antlr4-python3-runtime";
   inherit (antlr4.runtime.cpp) version src;
 
-  format = "pyproject";
-
-  disabled = python.pythonOlder "3.6";
+  pyproject = true;
 
   sourceRoot = "${src.name}/runtime/Python3";
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   postPatch = ''
     substituteInPlace tests/TestIntervalSet.py \
@@ -36,10 +34,11 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Runtime for ANTLR";
     mainProgram = "pygrun";
     homepage = "https://www.antlr.org/";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sarahec ];
   };
 }
diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 99fd7ff5dcab..2565129d2215 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.10.0";
+  version = "4.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "anyio";
     tag = version;
-    hash = "sha256-9nOGQTqdO3VzA9c97BpZqqwpll5O5+3gRvF/l2Y2ars=";
+    hash = "sha256-TOXg9J/Z2S5/X7OBgU+J0HZNB3BDluaWTqDiqp3O4ek=";
   };
 
   build-system = [ setuptools-scm ];
@@ -95,6 +95,8 @@ buildPythonPackage rec {
     "test_nonexistent_main_module"
     #  3 second timeout expired
     "test_keyboardinterrupt_during_test"
+    # racy with high thread count, see https://github.com/NixOS/nixpkgs/issues/448125
+    "test_multiple_threads"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # PermissionError: [Errno 1] Operation not permitted: '/dev/console'
diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 22ea916e8758..ff12480ceb25 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -19,6 +19,7 @@
   # dependencies
   beartype,
   crcmod,
+  cryptography,
   dill,
   fastavro,
   fasteners,
@@ -63,14 +64,14 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.68.0";
+  version = "2.69.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     tag = "v${version}";
-    hash = "sha256-ENtvgu9qT1OPsDqFJQzKgIATE7F+S5I+AfoBT2iEL8M=";
+    hash = "sha256-7trrdGQ9jkzG+5/PyBMvHXjR0B4HjOxBhUuxXEcKkLg=";
   };
 
   sourceRoot = "${src.name}/sdks/python";
@@ -123,6 +124,7 @@ buildPythonPackage rec {
   dependencies = [
     beartype
     crcmod
+    cryptography
     dill
     fastavro
     fasteners
@@ -254,10 +256,15 @@ buildPythonPackage rec {
     "test_reshuffle_custom_window_preserves_metadata_1"
     "test_reshuffle_default_window_preserves_metadata_1"
 
-    # AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs'
-    # https://github.com/apache/beam/issues/33854
+    # Dill version 0.3.1.1 is required when using pickle_library=dill.
+    # Other versions of dill are untested with Apache Beam.
+    "LocalCombineFnLifecycleTest_0_dill"
+    "LocalCombineFnLifecycleTest_2_dill"
     "test_runner_overrides_default_pickler"
 
+    # Require internet access
+    "test_local_jar_fallback_to_google_maven_mirror"
+
     # AssertionError: Lists differ
     "test_default_resources"
     "test_files_to_stage"
diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix
index d2ebbfafe382..374b35a4065a 100644
--- a/pkgs/development/python-modules/apkinspector/default.nix
+++ b/pkgs/development/python-modules/apkinspector/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "apkinspector";
-  version = "1.3.5";
+  version = "1.3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "erev0s";
     repo = "apkInspector";
     tag = "v${version}";
-    hash = "sha256-haJD5fioXd6KX7x2gNezGj2yUEMi/CFQUkCqa0t5yjA=";
+    hash = "sha256-xL4uUHYAn4V3cxqVb+XrIiOwK9az2VlYYTcJJt+9Cus=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/apple-compress/default.nix b/pkgs/development/python-modules/apple-compress/default.nix
new file mode 100644
index 000000000000..6f1f074a639e
--- /dev/null
+++ b/pkgs/development/python-modules/apple-compress/default.nix
@@ -0,0 +1,43 @@
+{
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  lib,
+  loguru,
+  poetry-core,
+}:
+
+buildPythonPackage rec {
+  pname = "apple-compress";
+  version = "0.2.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "m1stadev";
+    repo = "apple-compress";
+    tag = "v${version}";
+    hash = "sha256-uM5HFkhvzAIfdAglPUvJfckngjUPSZqydyVcPcdtyfs=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    click
+    loguru
+  ];
+
+  pythonImportsCheck = [ "apple_compress" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/m1stadev/apple-compress/releases/tag/${src.tag}";
+    description = "Python bindings for Apple's libcompression";
+    homepage = "https://github.com/m1stadev/apple-compress";
+    license = lib.licenses.mit;
+    mainProgram = "acompress";
+    maintainers = [ lib.maintainers.dotlambda ];
+    platforms = lib.platforms.darwin;
+  };
+}
diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 4bf5cedaa077..3f7d2cf211f0 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     description = "Push Notifications that work with just about every platform";
     homepage = "https://github.com/caronc/apprise";
     changelog = "https://github.com/caronc/apprise/releases/tag/v${version}";
-    license = lib.licenses.bsd3;
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "apprise";
   };
diff --git a/pkgs/development/python-modules/arelle/test-cli.nix b/pkgs/development/python-modules/arelle/test-cli.nix
new file mode 100644
index 000000000000..90b1572015a7
--- /dev/null
+++ b/pkgs/development/python-modules/arelle/test-cli.nix
@@ -0,0 +1,117 @@
+# Run with:
+#   cd nixpkgs
+#   nix-build -A python3Packages.arelle.passthru.tests.cli
+#
+# Note: These are uninteresting generated smoke tests to verify basic functionality
+{
+  lib,
+  runCommand,
+  arelle,
+}:
+
+runCommand "arelle-test-cli${lib.optionalString (!arelle.hasGUI) "-headless"}"
+  {
+    nativeBuildInputs = [ arelle ];
+  }
+  ''
+    # Set up temporary home directory
+    export HOME=$(mktemp -d)
+
+    # Test basic CLI commands work with proper assertions
+    arelleCmdLine --version --disablePersistentConfig 2>&1 | grep "Arelle(r) ${arelle.version}" > /dev/null
+    arelleCmdLine --help --disablePersistentConfig 2>&1 | grep "Usage: arelleCmdLine \[options\]" > /dev/null
+    arelleCmdLine --about --disablePersistentConfig 2>&1 | grep "An open source XBRL platform" > /dev/null
+
+    ${lib.optionalString arelle.hasGUI ''
+      # check if the arelleGUI command is available
+      command -v arelleGUI
+    ''}
+
+    # Create a simple but valid XBRL instance for testing validation functionality
+    cat > test-instance.xbrl << 'EOF'
+    <?xml version="1.0" encoding="UTF-8"?>
+    <xbrl xmlns="http://www.xbrl.org/2003/instance"
+          xmlns:link="http://www.xbrl.org/2003/linkbase"
+          xmlns:xlink="http://www.w3.org/1999/xlink">
+
+      <link:schemaRef xlink:href="http://www.xbrl.org/2003/xbrl-instance-2003-12-31.xsd" xlink:type="simple"/>
+
+      <context id="test_context">
+        <entity>
+          <identifier scheme="http://example.com/entities">TEST_ENTITY</identifier>
+        </entity>
+        <period>
+          <instant>2023-12-31</instant>
+        </period>
+      </context>
+
+    </xbrl>
+    EOF
+
+    # Also create a minimal test schema for more comprehensive testing
+    cat > test-schema.xsd << 'EOF'
+    <?xml version="1.0" encoding="UTF-8"?>
+    <schema xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:xbrli="http://www.xbrl.org/2003/instance"
+            xmlns:link="http://www.xbrl.org/2003/linkbase"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+            xmlns:test="http://example.com/test"
+            targetNamespace="http://example.com/test"
+            elementFormDefault="qualified">
+
+      <import namespace="http://www.xbrl.org/2003/instance"
+              schemaLocation="http://www.xbrl.org/2003/xbrl-instance-2003-12-31.xsd"/>
+
+      <element name="TestElement" type="xbrli:stringItemType"
+                substitutionGroup="xbrli:item" xbrli:periodType="instant"/>
+
+    </schema>
+    EOF
+
+    # Test XBRL validation functionality
+    arelleCmdLine \
+      --file test-instance.xbrl \
+      --validate \
+      --disablePersistentConfig \
+      --internetConnectivity=offline \
+      --logLevel=info 2>&1 | grep "\[info\] validated in .* secs - .*test-instance.xbrl" > /dev/null
+
+    # Test with the built-in empty instance from arelle config
+    arelleCmdLine \
+      --file "${arelle}/lib/python3.13/site-packages/arelle/config/empty-instance.xml" \
+      --validate \
+      --disablePersistentConfig \
+      --internetConnectivity=offline \
+      --logLevel=info 2>&1 | grep "\[info\] validated in .* secs - .*empty-instance.xml" > /dev/null
+
+    # Test formula functionality (without running - just checking it loads)
+    arelleCmdLine \
+      --file test-instance.xbrl \
+      --formula=none \
+      --disablePersistentConfig \
+      --internetConnectivity=offline 2>&1 | grep "\[info\] loaded in .* secs.*test-instance.xbrl" > /dev/null
+
+    # Test facts output functionality
+    TEMP_DIR=$(mktemp -d)
+    arelleCmdLine \
+      --file test-instance.xbrl \
+      --facts="$TEMP_DIR/test-facts.csv" \
+      --disablePersistentConfig \
+      --internetConnectivity=offline 2>&1 | grep "\[info\] loaded in .* secs.*test-instance.xbrl" > /dev/null
+
+    # Test schema validation
+    arelleCmdLine \
+      --file test-schema.xsd \
+      --validate \
+      --disablePersistentConfig \
+      --internetConnectivity=offline \
+      --logLevel=info 2>&1 | grep "\[info\] validated in .* secs - .*test-schema.xsd" > /dev/null
+
+    # Test disclosure system validation option
+    arelleCmdLine \
+      --disclosureSystem=help \
+      --disablePersistentConfig 2>&1 | grep "Disclosure system choices:" > /dev/null
+
+    # Create success marker
+    touch $out
+  ''
diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix
index 095ecc918f5a..9a28f3774870 100644
--- a/pkgs/development/python-modules/art/default.nix
+++ b/pkgs/development/python-modules/art/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sepandhaghighi/art";
     changelog = "https://github.com/sepandhaghighi/art/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix
index ad01b4b3a17e..710e393c071e 100644
--- a/pkgs/development/python-modules/arxiv/default.nix
+++ b/pkgs/development/python-modules/arxiv/default.nix
@@ -16,14 +16,14 @@
 }:
 buildPythonPackage rec {
   pname = "arxiv";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lukasschwab";
     repo = "arxiv.py";
     tag = version;
-    hash = "sha256-/lXUWRJ1lbRPWUC/gMRA0NIcuV0HNzFlUVLyhcPAsCQ=";
+    hash = "sha256-E1Slg7EWSULY68BrevmJO82L47UVFZBreKLVIDko1x0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/asn1/default.nix b/pkgs/development/python-modules/asn1/default.nix
index 5386c2305c51..3e51d566e8b3 100644
--- a/pkgs/development/python-modules/asn1/default.nix
+++ b/pkgs/development/python-modules/asn1/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "asn1";
-  version = "3.1.0";
+  version = "2.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "andrivet";
     repo = "python-asn1";
     tag = "v${version}";
-    hash = "sha256-yDX2TydMtqIE4A4QUmKPJKLM1UdXxp0qFBJx08Ri2YQ=";
+    hash = "sha256-DLKfdQzYLhfaIEPPymTzRqj3+L/fsm5Jh8kqud/ezfw=";
   };
 
   build-system = [ setuptools ];
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python ASN.1 encoder and decoder";
     homepage = "https://github.com/andrivet/python-asn1";
-    changelog = "https://github.com/andrivet/python-asn1/blob/${src.tag}/CHANGELOG.rst";
+    changelog = "https://github.com/andrivet/python-asn1/blob/v${version}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/astropy-extension-helpers/default.nix b/pkgs/development/python-modules/astropy-extension-helpers/default.nix
deleted file mode 100644
index 6cebb395c8c2..000000000000
--- a/pkgs/development/python-modules/astropy-extension-helpers/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  fetchpatch,
-  findutils,
-  pytestCheckHook,
-  pythonOlder,
-  pip,
-  setuptools,
-  setuptools-scm,
-  tomli,
-  wheel,
-}:
-
-buildPythonPackage rec {
-  pname = "extension-helpers";
-  version = "1.1.0";
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-SUYMeKP40fjOwXRHn16FrURZSMzEFgM8WqPm3fLFAik=";
-  };
-
-  patches = [
-    # Not needed to allow this package to build, but meant for it's dependent
-    # packages, like astropy. See explanation at:
-    # https://github.com/astropy/extension-helpers/pull/59
-    (fetchpatch {
-      url = "https://github.com/astropy/extension-helpers/commit/796f3e7831298df2d26b6d994b13fd57061a56d1.patch";
-      hash = "sha256-NnqK9HQq1hQ66RUJf9gTCuLyA0BVqVtL292mSXJ9860=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  propagatedBuildInputs = [ tomli ];
-
-  nativeCheckInputs = [
-    findutils
-    pip
-    pytestCheckHook
-  ];
-
-  # avoid import mismatch errors, as conftest.py is copied to build dir
-  enabledTestPaths = [ "extension_helpers" ];
-
-  disabledTests = [
-    # https://github.com/astropy/extension-helpers/issues/43
-    "test_write_if_different"
-  ];
-
-  pythonImportsCheck = [ "extension_helpers" ];
-
-  meta = with lib; {
-    description = "Utilities for building and installing packages in the Astropy ecosystem";
-    homepage = "https://github.com/astropy/extension-helpers";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ rmcgibbo ];
-  };
-}
diff --git a/pkgs/development/python-modules/astropy-healpix/default.nix b/pkgs/development/python-modules/astropy-healpix/default.nix
index 236050ea25c3..d6fed0f21447 100644
--- a/pkgs/development/python-modules/astropy-healpix/default.nix
+++ b/pkgs/development/python-modules/astropy-healpix/default.nix
@@ -5,7 +5,7 @@
   fetchPypi,
   numpy,
   astropy,
-  astropy-extension-helpers,
+  extension-helpers,
   setuptools,
   setuptools-scm,
   pytestCheckHook,
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   };
 
   nativeBuildInputs = [
-    astropy-extension-helpers
+    extension-helpers
     numpy
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix
index dcc5a4247a6f..ce18fc2268f2 100644
--- a/pkgs/development/python-modules/async-modbus/default.nix
+++ b/pkgs/development/python-modules/async-modbus/default.nix
@@ -7,23 +7,20 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   umodbus,
 }:
 
 buildPythonPackage rec {
   pname = "async-modbus";
-  version = "0.2.2";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "0.2.3";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
     repo = "async_modbus";
     tag = "v${version}";
-    hash = "sha256-xms2OfX5bHPXswwhLhyh6HFsm1YqDwKclUirxrgL4i0=";
+    hash = "sha256-d4TTs3TtD/9eFdzXBaY+QeAMeRWTvsWeaxONeG0AXJU=";
   };
 
   patches = [
@@ -39,9 +36,9 @@ buildPythonPackage rec {
       --replace '"--durations=2", "--verbose"' ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     connio
     umodbus
   ];
@@ -57,7 +54,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for Modbus communication";
     homepage = "https://github.com/tiagocoutinho/async_modbus";
-    license = with licenses; [ gpl3Plus ];
+    changelog = "https://github.com/tiagocoutinho/async_modbus/releases/tag/${src.tag}";
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/async-tkinter-loop/default.nix b/pkgs/development/python-modules/async-tkinter-loop/default.nix
index f284a73a4b58..a0a33bb17154 100644
--- a/pkgs/development/python-modules/async-tkinter-loop/default.nix
+++ b/pkgs/development/python-modules/async-tkinter-loop/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "async-tkinter-loop";
-  version = "0.10.0";
+  version = "0.10.2";
   format = "pyproject";
 
   src = fetchPypi {
     inherit version;
     pname = "async_tkinter_loop";
-    hash = "sha256-+p8KJ8vPsSwpl+YsOIsWfZEeu7+FUiNVbmtMlOvYbHY=";
+    hash = "sha256-2EowLDV3lM8hXo5KufdJ3GoFMjEC9xdsotO1/qR9oPs=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/asyncer/default.nix b/pkgs/development/python-modules/asyncer/default.nix
index daa9524cf7ea..6047204329b7 100644
--- a/pkgs/development/python-modules/asyncer/default.nix
+++ b/pkgs/development/python-modules/asyncer/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "asyncer";
-  version = "0.0.9";
+  version = "0.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "asyncer";
     tag = version;
-    hash = "sha256-1M5MGaxfEfJMCfAoGorNGbRBZdvLue5lHu8DuR96mLo=";
+    hash = "sha256-LjQOhcnCwM4Vcw+lBq6bexPYewRuhkU/R/pkDTEVHWQ=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/asyncpraw/default.nix b/pkgs/development/python-modules/asyncpraw/default.nix
index 0126f99cc91e..299b4a384752 100644
--- a/pkgs/development/python-modules/asyncpraw/default.nix
+++ b/pkgs/development/python-modules/asyncpraw/default.nix
@@ -2,57 +2,52 @@
   lib,
   aiofiles,
   aiohttp,
-  aiosqlite,
   asyncprawcore,
   buildPythonPackage,
+  coverage,
+  defusedxml,
   fetchFromGitHub,
-  flit-core,
-  mock,
+  hatchling,
   pytestCheckHook,
-  pytest-asyncio_0,
+  pytest-asyncio,
   pytest-vcr,
-  pythonOlder,
-  requests-toolbelt,
   update-checker,
   vcrpy,
 }:
 
 buildPythonPackage rec {
   pname = "asyncpraw";
-  version = "7.8.1";
+  version = "7.8.1-unstable-2025-10-08";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "asyncpraw";
-    tag = "v${version}";
-    hash = "sha256-glWAQoUjMFbjU3C4+MGuRGSGJS9mun15+6udMPCf9nU=";
+    rev = "9221cbef5d94fce9ecc92376cbab084f0082502d";
+    hash = "sha256-/7x7XYw1JDVaoc2+wKWW3iUkyfI6MVtBNP9G1AEUp4Y=";
   };
 
-  pythonRelaxDeps = [ "aiosqlite" ];
+  pythonRelaxDeps = [
+    "coverage"
+    "defusedxml"
+  ];
 
-  # 'aiosqlite' is also checked when building the wheel
-  pypaBuildFlags = [ "--skip-dependency-check" ];
-
-  build-system = [ flit-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiofiles
     aiohttp
-    aiosqlite
     asyncprawcore
-    mock
+    coverage
+    defusedxml
     update-checker
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio_0
+    pytest-asyncio
     pytest-vcr
     vcrpy
-    requests-toolbelt
   ];
 
   disabledTestPaths = [
@@ -70,7 +65,7 @@ buildPythonPackage rec {
   meta = {
     description = "Asynchronous Python Reddit API Wrapper";
     homepage = "https://asyncpraw.readthedocs.io/";
-    changelog = "https://github.com/praw-dev/asyncpraw/blob/v${version}/CHANGES.rst";
+    changelog = "https://github.com/praw-dev/asyncpraw/blob/${src.rev}/CHANGES.rst";
     license = lib.licenses.bsd2;
     maintainers = [ lib.maintainers.amadejkastelic ];
   };
diff --git a/pkgs/development/python-modules/asyncprawcore/default.nix b/pkgs/development/python-modules/asyncprawcore/default.nix
index bc8c34f86a01..b6a34a6a2b9a 100644
--- a/pkgs/development/python-modules/asyncprawcore/default.nix
+++ b/pkgs/development/python-modules/asyncprawcore/default.nix
@@ -4,43 +4,35 @@
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
-  mock,
   pytestCheckHook,
-  pytest-asyncio_0,
+  pytest-asyncio,
   pytest-vcr,
-  requests,
-  requests-toolbelt,
-  testfixtures,
   vcrpy,
   yarl,
 }:
 
 buildPythonPackage rec {
   pname = "asyncprawcore";
-  version = "2.4.0";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "praw-dev";
     repo = "asyncprawcore";
     tag = "v${version}";
-    hash = "sha256-FDQdtnNjsbiEp9BUYdQFMC/hkyJDhCh2WHhQWSQwrFY=";
+    hash = "sha256-0FOMY/0LXGcHwDe4t+NMAovMhX83/mMv8sWvIf5gxok=";
   };
 
   build-system = [ flit-core ];
 
   dependencies = [
-    requests
     aiohttp
     yarl
   ];
 
   nativeCheckInputs = [
-    testfixtures
-    mock
-    requests-toolbelt
     pytestCheckHook
-    pytest-asyncio_0
+    pytest-asyncio
     pytest-vcr
     vcrpy
   ];
@@ -51,6 +43,11 @@ buildPythonPackage rec {
     "tests/integration/test_sessions.py"
   ];
 
+  disabledTests = [
+    # Test requires network access
+    "test_initialize"
+  ];
+
   pythonImportsCheck = [ "asyncprawcore" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/asyncua/default.nix b/pkgs/development/python-modules/asyncua/default.nix
index d5d6ecd95907..a02509e9130b 100644
--- a/pkgs/development/python-modules/asyncua/default.nix
+++ b/pkgs/development/python-modules/asyncua/default.nix
@@ -8,7 +8,7 @@
   fetchFromGitHub,
   hatchling,
   pyopenssl,
-  pytest-asyncio_0_21,
+  pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
   python-dateutil,
@@ -56,7 +56,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio_0_21
+    pytest-asyncio
     pytest-mock
   ];
 
diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index c74ba0d38046..c26d3c2f5a78 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "1.1.10";
+  version = "1.1.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pogzyb";
     repo = "asyncwhois";
     tag = "v${version}";
-    hash = "sha256-vNXz8a0tXMxgcJ3xGKyJFgxQuIxpBg/xUeeG1TPXB0E=";
+    hash = "sha256-bi8tBT6htxEgE/qoDID2GykCrHVfpe8EcH/Mbq9B0T4=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix
index f5f812458bc3..0ceac6eae01e 100644
--- a/pkgs/development/python-modules/atproto/default.nix
+++ b/pkgs/development/python-modules/atproto/default.nix
@@ -29,7 +29,6 @@ buildPythonPackage rec {
   pname = "atproto";
   version = "0.0.62";
   format = "pyproject";
-  disabled = pythonOlder "3.8";
 
   # use GitHub, pypi does not include tests
   src = fetchFromGitHub {
@@ -58,6 +57,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "cryptography"
     "websockets"
   ];
 
diff --git a/pkgs/development/python-modules/automower-ble/default.nix b/pkgs/development/python-modules/automower-ble/default.nix
index 4c335e0f52dd..e266da0ae2ed 100644
--- a/pkgs/development/python-modules/automower-ble/default.nix
+++ b/pkgs/development/python-modules/automower-ble/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   bleak,
+  bleak-retry-connector,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "automower-ble";
-  version = "0.2.7";
+  version = "0.2.8";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,12 +20,15 @@ buildPythonPackage rec {
     owner = "alistair23";
     repo = "AutoMower-BLE";
     tag = version;
-    hash = "sha256-oOwSbGzTGXWm3Vmsui4k1lPRnT8+aIs6sk1DK/aRxzs=";
+    hash = "sha256-GawjNtk2mEBo9Xe1k1z0tk1RWU0N0JddeC6NZbnLpxc=";
   };
 
   build-system = [ setuptools ];
 
-  dependencies = [ bleak ];
+  dependencies = [
+    bleak
+    bleak-retry-connector
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
@@ -33,6 +37,7 @@ buildPythonPackage rec {
   meta = {
     description = "Module to connect to Husqvarna Automower Connect";
     homepage = "https://github.com/alistair23/AutoMower-BLE";
+    changelog = "https://github.com/alistair23/AutoMower-BLE/releases/tag/${src.tag}";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index 7a6da605e338..738d75e59b73 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "15.1.0";
+  version = "16.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PyAV-Org";
     repo = "PyAV";
     tag = "v${version}";
-    hash = "sha256-VeF6Sti1Ide2LchiCuPut/bdbJUv+5eTH2q0YMcniyA=";
+    hash = "sha256-iFKDDOJzCynaqwHIjykfh82diGiuOjWytwU3dq1J9PA=";
   };
 
   build-system = [
@@ -63,10 +63,7 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why.
-  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
-    "tests/test_timeout.py"
-  ];
+  __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [
     "av"
diff --git a/pkgs/development/python-modules/av/test-samples.toml b/pkgs/development/python-modules/av/test-samples.toml
index cdc1d93362f1..b20328e97560 100644
--- a/pkgs/development/python-modules/av/test-samples.toml
+++ b/pkgs/development/python-modules/av/test-samples.toml
@@ -1,6 +1,7 @@
 "fate-suite/aac/latm_stereo_to_51.ts" = { url = "http://fate.ffmpeg.org/fate-suite/aac/latm_stereo_to_51.ts", hash = "sha256-lVz0iby2IEUVdwKYamv4HVm8EUGHJS/cWY+QFBMaCBY=" }
 "fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv" = { url = "http://fate.ffmpeg.org/fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv", hash = "sha256-O9YMj0+0bM4YyZNGgkZJL8E2aG+Y3lq8/c+DVht0McI=" }
 "fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav" = { url = "http://fate.ffmpeg.org/fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav", hash = "sha256-KodB5hQkBFtfkI+L7hnkSonPM+IuOCNrTV3Vsy1bvhs=" }
+"fate-suite/h264/extradata-reload-multi-stsd.mov" = { url = "http://fate.ffmpeg.org/fate-suite/h264/extradata-reload-multi-stsd.mov", hash = "sha256-tby9Ttwc4+rVjoaDZ+fqcqCUXSuYjQD/LiLdvhOdlOc=" }
 "fate-suite/h264/interlaced_crop.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/h264/interlaced_crop.mp4", hash = "sha256-SVWWaOcfOp718dvgkpgOWCYoV9Ylomv8MBYzbRqvbBE=" }
 "fate-suite/hap/HAPQA_NoSnappy_127x1.mov" = { url = "http://fate.ffmpeg.org/fate-suite/hap/HAPQA_NoSnappy_127x1.mov", hash = "sha256-WMUqg9o84ki2AIIsGhY8P10KBc3qgCsmljqJXXRHbs8=" }
 "fate-suite/mkv/codec_delay_opus.mkv" = { url = "http://fate.ffmpeg.org/fate-suite/mkv/codec_delay_opus.mkv", hash = "sha256-GanpfRyGKN36NLAa7pZehcM1F2VDCW3g6hhO26vFg1I=" }
@@ -13,5 +14,6 @@
 "fate-suite/qtrle/aletrek-rle.mov" = { url = "http://fate.ffmpeg.org/fate-suite/qtrle/aletrek-rle.mov", hash = "sha256-uXUvVkwuPbfs/rzT896ty3RZfvGoSPj3su+sjLPU09g=" }
 "fate-suite/sub/MovText_capability_tester.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/sub/MovText_capability_tester.mp4", hash = "sha256-Y2uhvfGrZaPebD6ZsJemzpOk+XHX6ukBceVauEit9h8=" }
 "fate-suite/sub/vobsub.sub" = { url = "http://fate.ffmpeg.org/fate-suite/sub/vobsub.sub", hash = "sha256-X2rEMyTlo1xuUlqgx2uvqd2WWhfOCID9fraeGbaFPIs=" }
+"fate-suite/vorbis/vorbis_chapter_extension_demo.ogg" = { url = "http://fate.ffmpeg.org/fate-suite/vorbis/vorbis_chapter_extension_demo.ogg", hash = "sha256-s0kGcghf8Td/bSPy1HOBKaG5bT5zVxFlT1NfQiKHMN8=" }
 "pyav-curated/pexels/time-lapse-video-of-night-sky-857195.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-night-sky-857195.mp4", hash = "sha256-6307VwepfoVNKeGm8WEMZtfowJZ27Hv2fwgp6J/Q0oE=" }
 "pyav-curated/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4", hash = "sha256-2RWphhz5KWPSnJh8ARrC7aPjBa77DJO1Fv0/I4kWxYg=" }
diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index 512377ff053c..80cd0de5213b 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "avro";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ytnFOyPO7Wmceva93O1C4sVy/WtAjCV6fU/E6M8uLWs=";
+    hash = "sha256-xbjdLdTBCBbw3BJ8wpz9Q7XkBc9+aEDolGCgJL89CY0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 16de66d199ef..781362fc6503 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -10,7 +10,6 @@
   pytest-cov-stub,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   rapidfuzz,
   scipy,
   shapely,
@@ -20,16 +19,14 @@
 
 buildPythonPackage rec {
   pname = "avwx-engine";
-  version = "1.9.5";
+  version = "1.9.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "avwx-rest";
     repo = "avwx-engine";
     tag = version;
-    hash = "sha256-zhXUzePbgwmBIP7yMT/FcPYdSZC3qJtwEwkHtlfmv3Q=";
+    hash = "sha256-j+WT0v1h+dOGW90u+LIVQ0xIE4YzsWRo2E0mGOZUU1A=";
   };
 
   build-system = [ hatchling ];
@@ -76,7 +73,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Aviation Weather parsing engine";
     homepage = "https://github.com/avwx-rest/avwx-engine";
-    changelog = "https://github.com/avwx-rest/avwx-engine/blob/${version}/changelog.md";
+    changelog = "https://github.com/avwx-rest/avwx-engine/blob/${src.tag}/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index 38478f56864b..fd56d8742eff 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "awkward-cpp";
-  version = "47";
+  version = "50";
   pyproject = true;
 
   src = fetchPypi {
     pname = "awkward_cpp";
     inherit version;
-    hash = "sha256-Z2z0l2gQ7asyGH7fWopxavlQR7kDjJbSfTvkTxMxlQ8=";
+    hash = "sha256-JktvtOgqzBBXtbL/DTP6vDYQMlKOIzgVzSIkxtvJbY4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 60fffc48ea07..a7b5764ec5db 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "2.8.5";
+  version = "2.8.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "awkward";
     tag = "v${version}";
-    hash = "sha256-vcVJ9dLiZ3wfZU989slefSJoD2hKlRCwxRALvRGLZPA=";
+    hash = "sha256-zECnqZapgvB9ngkoAwEDFMyebFbE0iJ7Yo/5iLcmRXs=";
   };
 
   build-system = [
@@ -62,7 +62,7 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Need to be run on a GPU platform.
-    "tests-cuda"
+    "tests-cuda/*"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index aa24f5a428ce..15c3effda6f2 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.57.0";
+  version = "1.58.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     tag = "v${version}";
-    hash = "sha256-09SWe+uHsSmnxxZMqAeeg7z4MHex7oTgIHWO0jf6FQs=";
+    hash = "sha256-rscE6eiJ2lbI/U20YRmcUj21PdB9nXpjfyBvu+msC/A=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix
index ca6562db40ca..b853ccf3858e 100644
--- a/pkgs/development/python-modules/ax-platform/default.nix
+++ b/pkgs/development/python-modules/ax-platform/default.nix
@@ -86,6 +86,9 @@ buildPythonPackage rec {
     "SQAStoreUtilsTest"
     "SQAStoreTest"
 
+    # ValueError: Expected dim to be an integer greater than or equal to 2. Found dim=1.
+    "test_get_model"
+
     # ValueError: `db_settings` argument should be of type ax.storage.sqa_store
     "test_get_next_trials_with_db"
 
diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 0176d99e4bf2..5c430ada7a18 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-storage";
-  version = "23.1.0";
+  version = "24.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_storage";
     inherit version;
-    hash = "sha256-K92SL5DJL4+QHnMtNGPZDO5mF8f3leDLRyROzQrpiyA=";
+    hash = "sha256-sa4iXvh62oXynALkBhQKtYlShcpk3ivP5QtjHEgYozc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 853b5ae3d2d7..8fc0dad833b6 100644
--- a/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/pkgs/development/python-modules/azure-multiapi-storage/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "azure-multiapi-storage";
-  version = "1.5.0";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_multiapi_storage";
     inherit version;
-    hash = "sha256-g/5BOsU3OzvpxMnySPVNoaXLrmwjb8aq3hetC/jsEWY=";
+    hash = "sha256-iULj9O2+3dI82hms7nlgdvvNGkDkb5qhEQ/9oxTjHFU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 0c9b0fc40afe..35bd0337e11d 100644
--- a/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -5,22 +5,19 @@
   cryptography,
   fetchPypi,
   isodate,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "azure-storage-file-share";
-  version = "12.22.0";
+  version = "12.23.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "azure_storage_file_share";
     inherit version;
-    hash = "sha256-5YPI4IbufW7FDMI9r0KDnBjc4Rs2s9E2TBNxTAi1NFI=";
+    hash = "sha256-naU7VvgJD8U9kz7OWp+yRwEMO0p1/5CKlI4kje+yH64=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix
index 8e0814f06fa5..11aa7ee0506d 100644
--- a/pkgs/development/python-modules/azure-storage-queue/default.nix
+++ b/pkgs/development/python-modules/azure-storage-queue/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-queue";
-  version = "12.13.0";
+  version = "12.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_storage_queue";
     inherit version;
-    hash = "sha256-JWkeeVjSSXA5JFETTfpUdjf9Lfz95bNHai4VLlaXP4w=";
+    hash = "sha256-WIhM62wQqF3NIuOJreMr46bzbsWHxC5O/AZO/D7yV0M=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/backports-zstd/default.nix b/pkgs/development/python-modules/backports-zstd/default.nix
new file mode 100644
index 000000000000..412b35bcb992
--- /dev/null
+++ b/pkgs/development/python-modules/backports-zstd/default.nix
@@ -0,0 +1,61 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  zstd,
+}:
+
+buildPythonPackage rec {
+  pname = "backports-zstd";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rogdham";
+    repo = "backports.zstd";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    postFetch = ''
+      rm -r "$out/src/c/zstd"
+    '';
+    hash = "sha256-5t5ET8b65v4ArV9zrmu+kDXLG3QQRpMMZPSG+RRaCLk=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail 'ROOT_PATH / "src" / "c" / "zstd"' 'Path("${zstd.src}")'
+
+    # need to preserve $PYTHONPATH when calling sys.executable
+    substituteInPlace tests/test/support/script_helper.py \
+      --replace-fail "return __cached_interp_requires_environment" "return True"
+  '';
+
+  build-system = [ setuptools ];
+
+  pypaBuildFlags = [ "--config-setting=--build-option=--system-zstd" ];
+
+  buildInputs = [ zstd ];
+
+  pythonImportsCheck = [ "backports.zstd" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  enabledTestPaths = [ "tests" ];
+
+  disabledTestPaths = [
+    # sandbox doesn't allow setting SUID bit
+    "tests/test/test_tarfile.py::TestExtractionFilters::test_modes"
+  ];
+
+  meta = {
+    changelog = "https://github.com/rogdham/backports.zstd/blob/${src.tag}/CHANGELOG.md";
+    description = "Backport of compression.zstd";
+    homepage = "https://github.com/rogdham/backports.zstd";
+    license = lib.licenses.psfl;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/asyauth-bad/default.nix b/pkgs/development/python-modules/badauth/default.nix
similarity index 54%
rename from pkgs/development/python-modules/asyauth-bad/default.nix
rename to pkgs/development/python-modules/badauth/default.nix
index dae4904fcf81..f0c426687f56 100644
--- a/pkgs/development/python-modules/asyauth-bad/default.nix
+++ b/pkgs/development/python-modules/badauth/default.nix
@@ -4,21 +4,21 @@
   asysocks,
   buildPythonPackage,
   fetchFromGitHub,
-  minikerberos-bad,
+  kerbad,
   setuptools,
   unicrypto,
 }:
 
-buildPythonPackage rec {
-  pname = "asyauth-bad";
-  version = "0.0.20";
+buildPythonPackage {
+  pname = "badauth";
+  version = "0.1.4-unstable-2025-10-09";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
-    repo = "asyauth-bAD";
-    tag = version;
-    hash = "sha256-NX6bvOxA4Y5KRPCIsI+o0cB4dFOXlV89iH7YqNDdaXE=";
+    repo = "badauth";
+    rev = "86d6091470c98e1a5f6dc4b8749053189372bb53"; # no tag available
+    hash = "sha256-p7V5WkQ48b1IqCPwmJfbCiyqekfp9zW41J81JHyZNUQ=";
   };
 
   build-system = [ setuptools ];
@@ -26,19 +26,18 @@ buildPythonPackage rec {
   dependencies = [
     asn1crypto
     asysocks
-    minikerberos-bad
+    kerbad
     unicrypto
   ];
 
   # Module doesn't have tests
   doCheck = false;
 
-  pythonImportsCheck = [ "asyauth" ];
+  pythonImportsCheck = [ "badauth" ];
 
   meta = {
     description = "Unified authentication library";
-    homepage = "https://github.com/CravateRouge/asyauth-bAD";
-    changelog = "https://github.com/CravateRouge/asyauth-bAD/releases/tag/${src.tag}";
+    homepage = "https://github.com/CravateRouge/badauth";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/badldap/default.nix
similarity index 57%
rename from pkgs/development/python-modules/msldap-bad/default.nix
rename to pkgs/development/python-modules/badldap/default.nix
index cda5f09b3190..290c57b6e9e1 100644
--- a/pkgs/development/python-modules/msldap-bad/default.nix
+++ b/pkgs/development/python-modules/badldap/default.nix
@@ -1,43 +1,49 @@
 {
   lib,
-  asn1crypto,
-  asyauth-bad,
-  asysocks,
   buildPythonPackage,
   fetchFromGitHub,
-  minikerberos-bad,
-  prompt-toolkit,
+
+  # build-system
   setuptools,
+
+  # dependencies
+  asn1crypto,
+  asysocks,
+  badauth,
+  kerbad,
+  prompt-toolkit,
   tabulate,
   tqdm,
   unicrypto,
+  unidns,
   wcwidth,
   winacl,
 }:
 
-buildPythonPackage rec {
-  pname = "msldap-bad";
-  version = "0.5.10";
+buildPythonPackage {
+  pname = "badldap";
+  version = "0.7.1-unstable-2025-10-28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
-    repo = "msldap-bAD";
-    tag = version;
-    hash = "sha256-CnHXEE1tdIXv+Qb3pS+cNxVtcTOVaq6mrQxu3wr1Xxo=";
+    repo = "badldap";
+    rev = "65af61fd7daf7dc7bef9c6248553398e6f604d43"; # no tag available
+    hash = "sha256-14mV+EBrpoR9suPmOYdt2ro1Gcrpj3tuVx/meaVKC2c=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
-    asyauth-bad
     asn1crypto
     asysocks
-    minikerberos-bad
+    badauth
+    kerbad
     prompt-toolkit
     tabulate
     tqdm
     unicrypto
+    unidns
     wcwidth
     winacl
   ];
@@ -45,12 +51,11 @@ buildPythonPackage rec {
   # Module doesn't have tests
   doCheck = false;
 
-  pythonImportsCheck = [ "msldap" ];
+  pythonImportsCheck = [ "badldap" ];
 
   meta = {
     description = "LDAP library for auditing MS AD";
-    homepage = "https://github.com/CravateRouge/msldap-bAD";
-    changelog = "https://github.com/CravateRouge/asyauth-bAD/releases/tag/${src.tag}";
+    homepage = "https://github.com/CravateRouge/badldap";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix
index 8c80e22a62ef..905fc1d0b2cf 100644
--- a/pkgs/development/python-modules/bambi/default.nix
+++ b/pkgs/development/python-modules/bambi/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "bambi";
-  version = "0.15.0";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bambinos";
     repo = "bambi";
     tag = version;
-    hash = "sha256-G8RKTccsJRcLgTQPTOXAgK6ViVEwIQydUwdAexEJ2bc=";
+    hash = "sha256-EKcURfC4IpLGzr5ibzVlUnRHIhwPP+kYYusW9Mk8R/s=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index e900f539fc97..b50cb3faef22 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -5,12 +5,9 @@
   rustPlatform,
   rustc,
   setuptools,
-  setuptoolsRustBuildHook,
-  fetchPypi,
-  pythonOlder,
+  setuptools-rust,
+  fetchFromGitHub,
   pytestCheckHook,
-  libiconv,
-  stdenv,
   # for passthru.tests
   asyncssh,
   django_4,
@@ -21,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "bcrypt";
-  version = "4.3.0";
-  format = "pyproject";
+  version = "5.0.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Oj/SIEF4ttKtzwnLT2Qm/+9UdiV3p8m1TBWQCMsojBg=";
+  src = fetchFromGitHub {
+    owner = "pyca";
+    repo = "bcrypt";
+    tag = version;
+    hash = "sha256-7Dp07xoq6h+fiP7d7/TRRoYszWsyQF1c4vuFUpZ7u6U=";
   };
 
   cargoRoot = "src/_bcrypt";
@@ -39,20 +36,20 @@ buildPythonPackage rec {
       src
       cargoRoot
       ;
-    hash = "sha256-HgHvfMBspPsSYhllnKBg5XZB6zxFIqJj+4//xKG8HwA=";
+    hash = "sha256-hYMJlwxnXA0ZOJiyZ8rDp9govVcc1SGkDfqUVngnUPQ=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     setuptools
-    setuptoolsRustBuildHook
+    setuptools-rust
+  ];
+
+  nativeBuildInputs = [
     rustPlatform.cargoSetupHook
     cargo
     rustc
   ];
 
-  # Remove when https://github.com/NixOS/nixpkgs/pull/190093 lands.
-  buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
-
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "bcrypt" ];
@@ -67,10 +64,11 @@ buildPythonPackage rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/pyca/bcrypt/blob/${src.tag}/CHANGELOG.rst";
     description = "Modern password hashing for your software and your servers";
     homepage = "https://github.com/pyca/bcrypt/";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 90b763598e74..91afb6fe23ab 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   bison,
   buildPythonPackage,
   click,
@@ -51,6 +52,12 @@ buildPythonPackage rec {
     mv beancount tests
   '';
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Cannot run the gpg-agent. If needed, implement as passthru tests.
+    "test_read_encrypted_file"
+    "test_include_encrypted"
+  ];
+
   pythonImportsCheck = [ "beancount" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/beangulp/default.nix b/pkgs/development/python-modules/beangulp/default.nix
index 6299ca35159a..d051c0bc622b 100644
--- a/pkgs/development/python-modules/beangulp/default.nix
+++ b/pkgs/development/python-modules/beangulp/default.nix
@@ -6,6 +6,7 @@
   chardet,
   click,
   fetchFromGitHub,
+  fetchpatch2,
   lxml,
   petl,
   python-magic,
@@ -25,6 +26,13 @@ buildPythonPackage rec {
     hash = "sha256-h7xLHwEyS+tOI7v6Erp12VfVnxOf4930++zghhC3in4=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/beancount/beangulp/commit/254bfb38ffed049ef8f3041bfaf01b3f5a8aa771.patch?full_index=1";
+      hash = "sha256-ojysT23K0xmFafzTnRZiHkLS2ioDR/tVK02mfF7N9so=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix
index 245615bd7ccd..199e6bab6ed5 100644
--- a/pkgs/development/python-modules/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@@ -2,58 +2,48 @@
   lib,
   buildPythonPackage,
   colorama,
+  editorconfig,
   fetchFromGitHub,
-  fetchpatch,
-  poetry-core,
-  pytest7CheckHook,
-  setuptools,
+  hatchling,
+  hypothesis,
+  pytestCheckHook,
+  pyyaml,
   types-colorama,
-  types-setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "beautysh";
-  version = "6.2.1";
-  format = "pyproject";
+  version = "6.4.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lovesegfault";
     repo = "beautysh";
-    rev = "v${version}";
-    hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
+    tag = "v${version}";
+    hash = "sha256-B+1qwivb9MZ+W0u7hccDt3aTjDOcbEQ89Alc8mWd2Sg=";
   };
 
-  patches = [
-    # https://github.com/lovesegfault/beautysh/pull/247
-    (fetchpatch {
-      name = "poetry-to-poetry-core.patch";
-      url = "https://github.com/lovesegfault/beautysh/commit/5f4fcac083fa68568a50f3c2bcee3ead0f3ca7c5.patch";
-      hash = "sha256-H/kIJKww5ouWu8rmRkaMOXcsq2daZWDdwxBqbc99x0s=";
-    })
-  ];
+  build-system = [ hatchling ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
-  '';
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     colorama
-    setuptools
+    editorconfig
     types-colorama
-    types-setuptools
   ];
 
-  nativeCheckInputs = [ pytest7CheckHook ];
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+    pyyaml
+  ];
 
   pythonImportsCheck = [ "beautysh" ];
 
   meta = with lib; {
     description = "Tool for beautifying Bash scripts";
     homepage = "https://github.com/lovesegfault/beautysh";
-    license = with licenses; [ asl20 ];
+    changelog = "https://github.com/lovesegfault/beautysh/releases/tag/${src.tag}";
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "beautysh";
   };
diff --git a/pkgs/development/python-modules/beets-alternatives/default.nix b/pkgs/development/python-modules/beets-alternatives/default.nix
new file mode 100644
index 000000000000..29051861646a
--- /dev/null
+++ b/pkgs/development/python-modules/beets-alternatives/default.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  fetchFromGitHub,
+  fetchpatch,
+  buildPythonPackage,
+
+  # build-system
+  poetry-core,
+
+  # nativeBuildInputs
+  beets-minimal,
+
+  # tests
+  pytestCheckHook,
+  pytest-cov-stub,
+  mock,
+  pillow,
+  tomli,
+  typeguard,
+  writableTmpDirAsHomeHook,
+}:
+
+buildPythonPackage rec {
+  pname = "beets-alternatives";
+  version = "0.13.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    repo = "beets-alternatives";
+    owner = "geigerzaehler";
+    tag = "v${version}";
+    hash = "sha256-jGHRoBBXqJq0r/Gbp7gkuaEFPVMGE6cqQRi84AHTXxQ=";
+  };
+
+  patches = [
+    # Fixes build failure by ignoring DeprecationWarning during tests.
+    (fetchpatch {
+      url = "https://github.com/geigerzaehler/beets-alternatives/commit/3c15515edfe62d5d6c8f3fb729bf3dcef41c1ffa.patch";
+      hash = "sha256-gZXftDI5PXJ0c65Z1HLABJ2SlDnXU78xxIEt7IGp8RQ=";
+      excludes = [
+        "poetry.lock"
+      ];
+    })
+  ];
+
+  build-system = [
+    poetry-core
+  ];
+
+  nativeBuildInputs = [
+    beets-minimal
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    mock
+    pillow
+    tomli
+    typeguard
+    writableTmpDirAsHomeHook
+  ];
+
+  meta = {
+    description = "Beets plugin to manage external files";
+    homepage = "https://github.com/geigerzaehler/beets-alternatives";
+    changelog = "https://github.com/geigerzaehler/beets-alternatives/blob/v${version}/CHANGELOG.md";
+    maintainers = with lib.maintainers; [
+      aszlig
+      lovesegfault
+    ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/development/python-modules/beets-audible/default.nix
similarity index 72%
rename from pkgs/tools/audio/beets/plugins/audible.nix
rename to pkgs/development/python-modules/beets-audible/default.nix
index 9bc10074d2f2..92bebc0c3142 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/development/python-modules/beets-audible/default.nix
@@ -1,33 +1,46 @@
 {
-  beets,
-  fetchFromGitHub,
   lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+
+  # build-system
+  hatchling,
+
+  # native
+  beets,
+
+  # dependencies
+  markdownify,
+  natsort,
+  tldextract,
+
+  # passthru
   nix-update-script,
-  python3Packages,
 }:
-python3Packages.buildPythonApplication rec {
+
+buildPythonPackage rec {
   pname = "beets-audible";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
     rev = "v${version}";
-    hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
+    hash = "sha256-Hi/hI+zfAHwRLt8JhzL5RXEIHnSBX8oO/zuuq1HxT2s=";
   };
 
+  build-system = [
+    hatchling
+  ];
+
   nativeBuildInputs = [
     beets
   ];
 
   pythonRelaxDeps = true;
 
-  build-system = with python3Packages; [
-    hatchling
-  ];
-
-  dependencies = with python3Packages; [
+  dependencies = [
     markdownify
     natsort
     tldextract
diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/development/python-modules/beets-copyartifacts/default.nix
similarity index 80%
rename from pkgs/tools/audio/beets/plugins/copyartifacts.nix
rename to pkgs/development/python-modules/beets-copyartifacts/default.nix
index 49bc0dadf797..ed7ab0ba8cfe 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/development/python-modules/beets-copyartifacts/default.nix
@@ -1,12 +1,23 @@
 {
   lib,
-  beets,
   fetchFromGitHub,
-  python3Packages,
+  buildPythonPackage,
+
+  # build-system
+  setuptools,
+
+  # nativeBuildInputs
+  beets-minimal,
+
+  # dependencies
+  six,
+
+  # tests
+  pytestCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beets-copyartifacts";
   version = "0.1.5";
   pyproject = true;
@@ -27,20 +38,20 @@ python3Packages.buildPythonApplication rec {
     sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
   '';
 
-  nativeBuildInputs = [
-    beets
-  ];
-
-  build-system = with python3Packages; [
+  build-system = [
     setuptools
   ];
 
-  dependencies = with python3Packages; [
+  nativeBuildInputs = [
+    beets-minimal
+  ];
+
+  dependencies = [
     six
   ];
 
   nativeCheckInputs = [
-    python3Packages.pytestCheckHook
+    pytestCheckHook
     writableTmpDirAsHomeHook
   ];
 
@@ -55,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/adammillerio/beets-copyartifacts";
     changelog = "https://github.com/adammillerio/beets-copyartifacts/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    inherit (beets.meta) platforms;
+    inherit (beets-minimal.meta) platforms;
     # Isn't compatible with beets >= 2.3
     broken = true;
   };
diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/development/python-modules/beets-filetote/default.nix
similarity index 55%
rename from pkgs/tools/audio/beets/plugins/filetote.nix
rename to pkgs/development/python-modules/beets-filetote/default.nix
index d397658bd8da..9b12b86118de 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/development/python-modules/beets-filetote/default.nix
@@ -1,13 +1,26 @@
 {
   lib,
   fetchFromGitHub,
-  python3Packages,
-  beets,
-  beetsPackages,
+  buildPythonPackage,
+
+  # build-system
+  poetry-core,
+
+  # nativeBuildInputs
+  beets-minimal,
+
+  # tests
+  pytestCheckHook,
+  beets-audible,
+  mediafile,
+  pytest,
+  reflink,
+  toml,
+  typeguard,
   writableTmpDirAsHomeHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beets-filetote";
   version = "1.1.0";
   pyproject = true;
@@ -23,41 +36,30 @@ python3Packages.buildPythonApplication rec {
     substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core"
   '';
 
-  nativeBuildInputs = [
-    beets
+  build-system = [
+    poetry-core
   ];
 
-  build-system = [ python3Packages.poetry-core ];
+  nativeBuildInputs = [
+    beets-minimal
+  ];
 
-  dependencies = with python3Packages; [
+  dependencies = [
     mediafile
     reflink
     toml
     typeguard
   ];
 
-  optional-dependencies = {
-    lint = with python3Packages; [
-      black
-      check-manifest
-      flake8
-      flake8-bugbear
-      flake8-bugbear-pyi
-      isort
-      mypy
-      pylint
-      typing_extensions
-    ];
-    test = with python3Packages; [
-      beetsPackages.audible
-      mediafile
-      pytest
-      reflink
-      toml
-      typeguard
-    ];
-    dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ python3Packages.tox ];
-  };
+  nativeCheckInputs = [
+    pytestCheckHook
+    beets-audible
+    mediafile
+    reflink
+    toml
+    typeguard
+    writableTmpDirAsHomeHook
+  ];
 
   pytestFlags = [
     # This is the same as:
@@ -71,19 +73,13 @@ python3Packages.buildPythonApplication rec {
     "tests/test_version.py"
   ];
 
-  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
-    writableTmpDirAsHomeHook
-  ]
-  ++ optional-dependencies.test;
-
-  meta = with lib; {
+  meta = {
     description = "Beets plugin to move non-music files during the import process";
     homepage = "https://github.com/gtronset/beets-filetote";
     changelog = "https://github.com/gtronset/beets-filetote/blob/${src.tag}/CHANGELOG.md";
-    maintainers = with maintainers; [ dansbandit ];
-    license = licenses.mit;
-    inherit (beets.meta) platforms;
+    maintainers = with lib.maintainers; [ dansbandit ];
+    license = lib.licenses.mit;
+    inherit (beets-minimal.meta) platforms;
     # https://github.com/gtronset/beets-filetote/issues/211
     broken = true;
   };
diff --git a/pkgs/tools/audio/beets/patches/bash-completion-always-print.patch b/pkgs/development/python-modules/beets/bash-completion-always-print.patch
similarity index 100%
rename from pkgs/tools/audio/beets/patches/bash-completion-always-print.patch
rename to pkgs/development/python-modules/beets/bash-completion-always-print.patch
diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
new file mode 100644
index 000000000000..bb6a8822fa56
--- /dev/null
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -0,0 +1,495 @@
+/*
+  ** To customize the enabled beets plugins, use the pluginOverrides input to the
+  ** derivation.
+  ** Examples:
+  **
+  ** Disabling a builtin plugin:
+  ** python3.pkgs.beets.override {
+  **   pluginOverrides = {
+  **     beatport.enable = false;
+  **   };
+  ** }
+  **
+  ** Enabling an external plugin:
+  ** python3.pkgs.beets.override {
+  **   pluginOverrides = {
+  **     alternatives = {
+  **       enable = true;
+  **       propagatedBuildInputs = [ beets-alternatives ];
+  **     };
+  **   };
+  ** }
+*/
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  beets,
+
+  # build-system
+  poetry-core,
+  poetry-dynamic-versioning,
+
+  # dependencies
+  confuse,
+  gst-python,
+  jellyfish,
+  mediafile,
+  munkres,
+  musicbrainzngs,
+  platformdirs,
+  pyyaml,
+  unidecode,
+  reflink,
+  typing-extensions,
+  lap,
+
+  # native
+  gobject-introspection,
+  sphinxHook,
+  sphinx-design,
+  sphinx-copybutton,
+  pydata-sphinx-theme,
+
+  # buildInputs
+  gst_all_1,
+
+  # plugin deps
+  aacgain,
+  beautifulsoup4,
+  chromaprint,
+  discogs-client,
+  ffmpeg,
+  flac,
+  flask,
+  flask-cors,
+  imagemagick,
+  keyfinder-cli,
+  langdetect,
+  librosa,
+  mp3gain,
+  mp3val,
+  mpd2,
+  pyacoustid,
+  pylast,
+  pyxdg,
+  requests,
+  requests-oauthlib,
+  resampy,
+  soco,
+
+  # configurations
+  extraPatches ? [ ],
+  pluginOverrides ? { },
+  disableAllPlugins ? false,
+  extraDisabledTests ? [ ],
+  extraNativeBuildInputs ? [ ],
+
+  # tests
+  pytestCheckHook,
+  pytest-cov-stub,
+  mock,
+  rarfile,
+  responses,
+  requests-mock,
+  pillow,
+  writableTmpDirAsHomeHook,
+
+  # preCheck
+  bashInteractive,
+  diffPlugins,
+  runtimeShell,
+  writeScript,
+
+  # passthru.tests
+  runCommand,
+}:
+
+buildPythonPackage rec {
+  pname = "beets";
+  version = "2.5.1";
+  src = fetchFromGitHub {
+    owner = "beetbox";
+    repo = "beets";
+    tag = "v${version}";
+    hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA=";
+  };
+  pyproject = true;
+
+  patches = [
+    # Bash completion fix for Nix
+    ./bash-completion-always-print.patch
+  ]
+  ++ extraPatches;
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    confuse
+    gst-python
+    jellyfish
+    mediafile
+    munkres
+    musicbrainzngs
+    platformdirs
+    pyyaml
+    unidecode
+    # Can be built without it, but is useful on btrfs systems, and doesn't
+    # add too much to the closure. See:
+    # https://github.com/NixOS/nixpkgs/issues/437308
+    reflink
+    typing-extensions
+    lap
+  ]
+  ++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues passthru.plugins.enabled));
+
+  nativeBuildInputs = [
+    gobject-introspection
+    sphinxHook
+    sphinx-design
+    sphinx-copybutton
+    pydata-sphinx-theme
+  ]
+  ++ extraNativeBuildInputs;
+
+  buildInputs = with gst_all_1; [
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+  ];
+
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+  sphinxBuilders = [
+    "html"
+    "man"
+  ];
+  # Causes an installManPage error. Not clear why this directory gets generated
+  # with the manpages. The same directory is observed correctly in
+  # $doc/share/doc/beets-${version}/html
+  preInstallSphinx = ''
+    rm -r .sphinx/man/man/_sphinx_design_static
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp extra/_beet $out/share/zsh/site-functions/
+  '';
+
+  makeWrapperArgs = [
+    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
+    "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
+    "--prefix PATH : ${lib.makeBinPath passthru.plugins.wrapperBins}"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    mock
+    rarfile
+    responses
+    requests-mock
+    pillow
+    writableTmpDirAsHomeHook
+  ]
+  ++ passthru.plugins.wrapperBins;
+
+  __darwinAllowLocalNetworking = true;
+
+  disabledTestPaths =
+    passthru.plugins.disabledTestPaths
+    ++ [
+      # touches network
+      "test/plugins/test_aura.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Flaky: several tests fail randomly with:
+      # if not self._poll(timeout):
+      #   raise Empty
+      #   _queue.Empty
+      "test/plugins/test_bpd.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      # fail on Hydra with `RuntimeError: image cannot be obtained without artresizer backend`
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio"
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_percent_margin"
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_px_margin"
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_minwidth"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced_and_resized"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_not_resized"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_and_scaled"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_but_not_scaled"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
+    ];
+  disabledTests = extraDisabledTests ++ [
+    # touches network
+    "test_merge_duplicate_album"
+    # The existence of the dependency reflink (see comment above), causes this
+    # test to be run, and it fails in the sandbox.
+    "test_successful_reflink"
+  ];
+
+  # Perform extra "sanity checks", before running pytest tests.
+  preCheck = ''
+    # Check for undefined plugins
+    find beetsplug -mindepth 1 \
+      \! -path 'beetsplug/__init__.py' -a \
+      \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
+      | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
+      | sort -u > plugins_available
+    ${diffPlugins (lib.attrNames passthru.plugins.builtins) "plugins_available"}
+
+    export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc"
+
+    env EDITOR="${writeScript "beetconfig.sh" ''
+      #!${runtimeShell}
+      cat > "$1" <<CFG
+      plugins: ${lib.concatStringsSep " " (lib.attrNames passthru.plugins.enabled)}
+      CFG
+    ''}" "$out/bin/beet" config -e
+    env EDITOR=true "$out/bin/beet" config -e
+  '';
+
+  passthru = {
+    plugins = {
+      builtins = {
+        absubmit = {
+          deprecated = true;
+          testPaths = [ ];
+        };
+        advancedrewrite = {
+          testPaths = [ ];
+        };
+        acousticbrainz = {
+          deprecated = true;
+          propagatedBuildInputs = [ requests ];
+        };
+        albumtypes = { };
+        aura = {
+          propagatedBuildInputs = [
+            flask
+            flask-cors
+            pillow
+          ];
+        };
+        autobpm = {
+          propagatedBuildInputs = [
+            librosa
+            # An optional dependency of librosa, needed for beets' autobpm
+            resampy
+          ];
+        };
+        badfiles = {
+          testPaths = [ ];
+          wrapperBins = [
+            mp3val
+            flac
+          ];
+        };
+        bareasc = { };
+        beatport.propagatedBuildInputs = [ requests-oauthlib ];
+        bench.testPaths = [ ];
+        bpd.testPaths = [ ];
+        bpm.testPaths = [ ];
+        bpsync.testPaths = [ ];
+        bucket = { };
+        chroma = {
+          propagatedBuildInputs = [ pyacoustid ];
+          testPaths = [ ];
+          wrapperBins = [
+            chromaprint
+          ];
+        };
+        convert.wrapperBins = [ ffmpeg ];
+        deezer = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        discogs.propagatedBuildInputs = [
+          discogs-client
+          requests
+        ];
+        duplicates.testPaths = [ ];
+        edit = { };
+        embedart = {
+          propagatedBuildInputs = [ pillow ];
+          wrapperBins = [ imagemagick ];
+        };
+        embyupdate.propagatedBuildInputs = [ requests ];
+        export = { };
+        fetchart = {
+          propagatedBuildInputs = [
+            beautifulsoup4
+            langdetect
+            pillow
+            requests
+          ];
+          wrapperBins = [ imagemagick ];
+        };
+        filefilter = { };
+        fish.testPaths = [ ];
+        freedesktop.testPaths = [ ];
+        fromfilename.testPaths = [ ];
+        ftintitle = { };
+        fuzzy.testPaths = [ ];
+        gmusic.testPaths = [ ];
+        hook = { };
+        ihate = { };
+        importadded = { };
+        importfeeds = { };
+        info = { };
+        inline.testPaths = [ ];
+        ipfs = { };
+        keyfinder.wrapperBins = [ keyfinder-cli ];
+        kodiupdate = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        lastgenre.propagatedBuildInputs = [ pylast ];
+        lastimport = {
+          propagatedBuildInputs = [ pylast ];
+          testPaths = [ ];
+        };
+        limit = { };
+        listenbrainz = {
+          testPaths = [ ];
+        };
+        loadext = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        lyrics.propagatedBuildInputs = [
+          beautifulsoup4
+          langdetect
+          requests
+        ];
+        mbcollection.testPaths = [ ];
+        mbsubmit = { };
+        mbsync = { };
+        metasync.testPaths = [ ];
+        missing.testPaths = [ ];
+        mpdstats.propagatedBuildInputs = [ mpd2 ];
+        mpdupdate = {
+          propagatedBuildInputs = [ mpd2 ];
+          testPaths = [ ];
+        };
+        musicbrainz = { };
+        parentwork = { };
+        permissions = { };
+        play = { };
+        playlist.propagatedBuildInputs = [ requests ];
+        plexupdate = { };
+        random = { };
+        replace = { };
+        replaygain.wrapperBins = [
+          aacgain
+          ffmpeg
+          mp3gain
+        ];
+        rewrite.testPaths = [ ];
+        scrub.testPaths = [ ];
+        smartplaylist = { };
+        sonosupdate = {
+          propagatedBuildInputs = [ soco ];
+          testPaths = [ ];
+        };
+        spotify = { };
+        subsonicplaylist = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        subsonicupdate.propagatedBuildInputs = [ requests ];
+        substitute = {
+          testPaths = [ ];
+        };
+        the = { };
+        thumbnails = {
+          propagatedBuildInputs = [
+            pillow
+            pyxdg
+          ];
+          wrapperBins = [ imagemagick ];
+        };
+        types.testPaths = [ "test/plugins/test_types_plugin.py" ];
+        unimported.testPaths = [ ];
+        web.propagatedBuildInputs = [
+          flask
+          flask-cors
+        ];
+        zero = { };
+        _typing = {
+          testPaths = [ ];
+        };
+        _utils = {
+          testPaths = [ ];
+        };
+      };
+      base = lib.mapAttrs (_: a: { builtin = true; } // a) passthru.plugins.builtins;
+      overrides = lib.mapAttrs (
+        plugName:
+        lib.throwIf (passthru.plugins.builtins.${plugName}.deprecated or false)
+          "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
+      ) pluginOverrides;
+      all = lib.mapAttrs (
+        n: a:
+        {
+          name = n;
+          enable = !disableAllPlugins;
+          builtin = false;
+          propagatedBuildInputs = [ ];
+          testPaths = [ "test/plugins/test_${n}.py" ];
+          wrapperBins = [ ];
+        }
+        // a
+      ) (lib.recursiveUpdate passthru.plugins.base passthru.plugins.overrides);
+      enabled = lib.filterAttrs (_: p: p.enable) passthru.plugins.all;
+      disabled = lib.filterAttrs (_: p: !p.enable) passthru.plugins.all;
+      disabledTestPaths = lib.flatten (
+        lib.attrValues (lib.mapAttrs (_: v: v.testPaths) passthru.plugins.disabled)
+      );
+      wrapperBins = lib.concatMap (p: p.wrapperBins) (lib.attrValues passthru.plugins.enabled);
+    };
+    tests = {
+      gstreamer =
+        runCommand "beets-gstreamer-test"
+          {
+            meta.timeout = 60;
+          }
+          ''
+            set -euo pipefail
+            export HOME=$(mktemp -d)
+            mkdir $out
+
+            cat << EOF > $out/config.yaml
+            replaygain:
+              backend: gstreamer
+            EOF
+
+            ${beets}/bin/beet -c $out/config.yaml > /dev/null
+          '';
+    };
+  };
+
+  meta = {
+    description = "Music tagger and library organizer";
+    homepage = "https://beets.io";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      doronbehar
+      lovesegfault
+      montchr
+      pjones
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    mainProgram = "beet";
+  };
+}
diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 1600e3e0ed57..3e7ff095fe1c 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -2,17 +2,18 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   buildPythonPackage,
   python,
-  pythonOlder,
   pytestCheckHook,
   assertpy,
+  chardet,
+  freezegun,
   mock,
   path,
   pyhamcrest,
   pytest-html,
   colorama,
+  cucumber-expressions,
   cucumber-tag-expressions,
   parse,
   parse-type,
@@ -22,41 +23,34 @@
 
 buildPythonPackage rec {
   pname = "behave";
-  version = "1.2.7.dev5";
+  version = "1.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "behave";
     repo = "behave";
-    rev = "v${version}";
-    hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA=";
+    tag = "v${version}";
+    hash = "sha256-sHsnBeyl0UJ0f7WcTUc+FhUxATh84RPxVE3TqGYosrs=";
   };
 
-  patches = [
-    # fix tests: https://github.com/behave/behave/pull/1214
-    (fetchpatch2 {
-      url = "https://github.com/behave/behave/pull/1214/commits/98b63a2524eff50ce1dc7360a46462a6f673c5ea.patch?full_index=1";
-      hash = "sha256-MwODEm6vhg/H8ksp5XBBP5Uhu2dhB5B1T6Owkxpy3v0=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
     pytestCheckHook
     assertpy
+    chardet
+    freezegun
     mock
     path
     pyhamcrest
     pytest-html
   ];
 
-  doCheck = pythonOlder "3.12";
-
   pythonImportsCheck = [ "behave" ];
 
   dependencies = [
     colorama
+    cucumber-expressions
     cucumber-tag-expressions
     parse
     parse-type
@@ -80,7 +74,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    changelog = "https://github.com/behave/behave/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/behave/behave/blob/${src.tag}/CHANGES.rst";
     homepage = "https://github.com/behave/behave";
     description = "Behaviour-driven development, Python style";
     mainProgram = "behave";
diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 8c91381b52ac..0e405eb970be 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   click,
   click-log,
@@ -16,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "bellows";
-  version = "0.46.1";
+  version = "0.47.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "bellows";
     tag = version;
-    hash = "sha256-YQt9imL9poGLrkVj9LmR+XPUufRMOgVhAr+Bw+/VdI0=";
+    hash = "sha256-1gWmXrRCYmU0VemhW5TCn1/rnOmz07q8bQ6W3a2mXro=";
   };
 
   postPatch = ''
@@ -39,8 +38,7 @@ buildPythonPackage rec {
     click-log
     voluptuous
     zigpy
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/benqprojector/default.nix b/pkgs/development/python-modules/benqprojector/default.nix
index 9097b9312db7..d923e31a0d5c 100644
--- a/pkgs/development/python-modules/benqprojector/default.nix
+++ b/pkgs/development/python-modules/benqprojector/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "benqprojector";
-  version = "0.1.8";
+  version = "0.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rrooggiieerr";
     repo = "benqprojector.py";
     tag = version;
-    hash = "sha256-BttaLpjiybjeoJhOXfo6Qlox4bRqf9auvNg/wtm9gMQ=";
+    hash = "sha256-oG6djfmBnZyb4YpB6zqzHlcmQx+l+LF5xwCdf/NOb1Q=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 7052616eb80a..8aad4cf469d3 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -80,7 +80,7 @@
 }:
 
 let
-  version = "1.4.26";
+  version = "1.4.28";
   aws = [ fs-s3fs ];
   grpc = [
     grpcio
@@ -130,7 +130,7 @@ let
     owner = "bentoml";
     repo = "BentoML";
     tag = "v${version}";
-    hash = "sha256-ORddC+rbK1vWwgY2vGNPoR9ot/a0EhU72HHubYTk+ac=";
+    hash = "sha256-9hxAsTy3e9BDWhJCB5N2RaEFIO0Lc6FK2XKgJC78VUg=";
   };
 in
 buildPythonPackage {
diff --git a/pkgs/development/python-modules/betterproto/default.nix b/pkgs/development/python-modules/betterproto/default.nix
index bf759e8f1f58..ef4839a39ec3 100644
--- a/pkgs/development/python-modules/betterproto/default.nix
+++ b/pkgs/development/python-modules/betterproto/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
-  pythonOlder,
   poetry-core,
   grpclib,
   python-dateutil,
@@ -10,9 +9,10 @@
   jinja2,
   isort,
   python,
+  cachelib,
   pydantic,
-  pytest7CheckHook,
-  pytest-asyncio_0_21,
+  pytestCheckHook,
+  pytest-asyncio,
   pytest-mock,
   typing-extensions,
   tomlkit,
@@ -21,16 +21,14 @@
 
 buildPythonPackage rec {
   pname = "betterproto";
-  version = "2.0.0b6";
+  version = "2.0.0b7";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "danielgtaylor";
     repo = "python-betterproto";
     tag = "v.${version}";
-    hash = "sha256-ZuVq4WERXsRFUPNNTNp/eisWX1MyI7UtwqEI8X93wYI=";
+    hash = "sha256-T7QSPH8MFa1hxJOhXc3ZMM62/FxHWjCJJ59IpeM41rI=";
   };
 
   postPatch = ''
@@ -53,11 +51,12 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    cachelib
     grpcio-tools
     pydantic
-    pytest-asyncio_0_21
+    pytest-asyncio
     pytest-mock
-    pytest7CheckHook
+    pytestCheckHook
     tomlkit
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
@@ -73,13 +72,11 @@ buildPythonPackage rec {
     ${python.interpreter} -m tests.generate
   '';
 
-  disabledTestPaths = [
-    # https://github.com/danielgtaylor/python-betterproto/issues/530
-    "tests/inputs/oneof/test_oneof.py"
-  ];
-
   disabledTests = [
-    "test_pydantic_no_value"
+    # incompatible with pytest 8:
+    #     TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
+    "test_message_with_deprecated_field_not_set"
+    "test_service_with_deprecated_method"
     # Test is flaky
     "test_binary_compatibility"
   ];
diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix
index e4b7642bb168..b9135a7e0e9d 100644
--- a/pkgs/development/python-modules/bidsschematools/default.nix
+++ b/pkgs/development/python-modules/bidsschematools/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   pdm-backend,
   acres,
   click,
@@ -11,17 +10,18 @@
 
 buildPythonPackage rec {
   pname = "bidsschematools";
-  version = "1.1.0";
+  version = "1.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    pname = "bidsschematools";
-    inherit version;
-    hash = "sha256-cVVfI2Sie6ase/+Gm1GB/2SqGAxeVnJRgLQwEmJ8DgY=";
+  src = fetchFromGitHub {
+    owner = "bids-standard";
+    repo = "bids-specification";
+    tag = "schema-${version}";
+    hash = "sha256-b4dRGXkRkV+vmQ91fM8FMQv8iOt35dyf5unOEKNbNPc=";
   };
 
+  sourceRoot = "${src.name}/tools/schemacode";
+
   build-system = [
     pdm-backend
   ];
diff --git a/pkgs/development/python-modules/biliass/default.nix b/pkgs/development/python-modules/biliass/default.nix
index 03a8c74936f5..a3a34d2ca910 100644
--- a/pkgs/development/python-modules/biliass/default.nix
+++ b/pkgs/development/python-modules/biliass/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "biliass";
-  version = "2.2.2";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yutto-dev";
     repo = "yutto";
     tag = "biliass@${version}";
-    hash = "sha256-IQokpJbUhR8FMCJcxPSDD1X1o+Lb2j1G7d/jFEsR/Eg=";
+    hash = "sha256-ZB18BQJRSwA/ERHjqmp+D39UqTvdYpbhwLjaizM5R2I=";
   };
 
   sourceRoot = "${src.name}/packages/biliass";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-tkHl6z0En+od//fCGJXK/p8Dz5KDOXltHrXhxHmHL6U=";
+    hash = "sha256-gOYgYi8RlWBe0astv6D6/J7Ge20TM/19zJHwoCevpIo=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/binsync/default.nix b/pkgs/development/python-modules/binsync/default.nix
index d52a0eac53e5..90d6b92443e7 100644
--- a/pkgs/development/python-modules/binsync/default.nix
+++ b/pkgs/development/python-modules/binsync/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "binsync";
-  version = "5.7.10";
+  version = "5.7.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "binsync";
     repo = "binsync";
     tag = "v${version}";
-    hash = "sha256-QDOfbo2yjfjLsLILMhl/ckKwXDusXfE8+YmFpW5djN0=";
+    hash = "sha256-Rn5ytC7j8HI64NQhvV4QjjBWDeYNkINJGUWDmZ7nQ3w=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index d1767fa005be..16d12a9091b7 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -1,9 +1,10 @@
 {
   lib,
-  torch,
+  stdenv,
   symlinkJoin,
   buildPythonPackage,
   fetchFromGitHub,
+
   cmake,
 
   # build-system
@@ -11,17 +12,32 @@
   setuptools,
 
   # dependencies
+  torch,
   scipy,
+  trove-classifiers,
+
+  cudaSupport ? torch.cudaSupport,
+  cudaPackages ? torch.cudaPackages,
+  rocmSupport ? torch.rocmSupport,
+  rocmPackages ? torch.rocmPackages,
+
+  rocmGpuTargets ? rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets,
 }:
 
 let
   pname = "bitsandbytes";
-  version = "0.47.0";
+  version = "0.48.2";
+
+  brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) {
+    "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport;
+    "CUDA is not targeting Linux" = cudaSupport && !stdenv.hostPlatform.isLinux;
+  };
 
-  inherit (torch) cudaPackages cudaSupport;
   inherit (cudaPackages) cudaMajorMinorVersion;
+  rocmMajorMinorVersion = lib.versions.majorMinor rocmPackages.rocm-core.version;
 
   cudaMajorMinorVersionString = lib.replaceStrings [ "." ] [ "" ] cudaMajorMinorVersion;
+  rocmMajorMinorVersionString = lib.replaceStrings [ "." ] [ "" ] rocmMajorMinorVersion;
 
   # NOTE: torchvision doesn't use cudnn; torch does!
   #   For this reason it is not included.
@@ -29,10 +45,12 @@ let
     (lib.getDev cuda_cccl) # <thrust/*>
     (lib.getDev libcublas) # cublas_v2.h
     (lib.getLib libcublas)
+    (lib.getInclude libcublas) # cublasLt.h
     libcurand
     libcusolver # cusolverDn.h
     (lib.getDev libcusparse) # cusparse.h
     (lib.getLib libcusparse) # cusparse.h
+    (lib.getInclude libcusparse) # cusparse.h
     (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
   ];
 
@@ -62,30 +80,45 @@ buildPythonPackage {
     owner = "bitsandbytes-foundation";
     repo = "bitsandbytes";
     tag = version;
-    hash = "sha256-iUAeiNbPa3Q5jJ4lK2G0WvTKuipb0zO1mNe+wcRdnqs=";
+    hash = "sha256-gtNOMxLeYTCZK5MVdpjOFOw6rxvqS+XJmY1Meiuz0Rw=";
   };
 
+  patches = [
+    ./find-rocm-deps-with-cmake.patch
+  ];
+
   # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.
   # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionally.
   # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not.
   # Also, hardcode the path to the previously built library instead of relying on
   # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too.
   #
-  # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for cuda version `xx.y`.
+  # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for CUDA version `xx.y`
+  # and `libbitsandbytes_rocmxxy` for ROCm version `xx.y`
   # This upstream convention could change at some point and thus break the following patch.
-  postPatch = lib.optionalString cudaSupport ''
-    substituteInPlace bitsandbytes/cextension.py \
-      --replace-fail "if cuda_specs:" "if True:" \
-      --replace-fail \
-        "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \
-        "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaMajorMinorVersionString}.so'"
-  '';
+  postPatch = (
+    let
+      prefix = if cudaSupport then "cuda" else "rocm";
+      majorMinorVersionString =
+        if cudaSupport then cudaMajorMinorVersionString else rocmMajorMinorVersionString;
+    in
+    lib.optionalString (cudaSupport || rocmSupport) ''
+      substituteInPlace bitsandbytes/cextension.py \
+        --replace-fail "if cuda_specs:" "if True:" \
+        --replace-fail \
+          "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \
+          "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_${prefix}${majorMinorVersionString}.so'"
+    ''
+  );
 
   nativeBuildInputs = [
     cmake
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
+  ]
+  ++ lib.optionals rocmSupport [
+    rocmPackages.clr
   ];
 
   build-system = [
@@ -93,10 +126,41 @@ buildPythonPackage {
     setuptools
   ];
 
-  buildInputs = lib.optionals cudaSupport [ cuda-redist ];
+  buildInputs =
+    lib.optional cudaSupport cuda-redist
+    ++ lib.optionals rocmSupport (
+      with rocmPackages;
+      [
+        rocm-device-libs
+        hipblas
+        rocm-comgr
+        rocm-runtime
+        hiprand
+        rocrand
+        hipsparse
+        hipblaslt
+        rocblas
+        hipcub
+        rocprim
+      ]
+    );
 
   cmakeFlags = [
-    (lib.cmakeFeature "COMPUTE_BACKEND" (if cudaSupport then "cuda" else "cpu"))
+    (lib.cmakeFeature "COMPUTE_BACKEND" (
+      if cudaSupport then
+        "cuda"
+      else if rocmSupport then
+        "hip"
+      else
+        "cpu"
+    ))
+  ]
+  ++ lib.optionals rocmSupport [
+    # ends up using g++ to build some files it shouldn't
+    (lib.cmakeFeature "CMAKE_C_COMPILER" "amdclang")
+    (lib.cmakeFeature "CMAKE_CXX_COMPILER" "amdclang++")
+
+    (lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" (builtins.concatStringsSep ";" rocmGpuTargets))
   ];
   CUDA_HOME = lib.optionalString cudaSupport "${cuda-native-redist}";
   NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [
@@ -112,17 +176,31 @@ buildPythonPackage {
   dependencies = [
     scipy
     torch
+    trove-classifiers
   ];
 
   doCheck = false; # tests require CUDA and also GPU access
 
   pythonImportsCheck = [ "bitsandbytes" ];
 
+  passthru = {
+    inherit
+      cudaSupport
+      cudaPackages
+      rocmSupport
+      rocmPackages
+      brokenConditions # To help debug when a package is broken due to CUDA support
+      ;
+  };
+
   meta = {
     description = "8-bit CUDA functions for PyTorch";
     homepage = "https://github.com/bitsandbytes-foundation/bitsandbytes";
     changelog = "https://github.com/bitsandbytes-foundation/bitsandbytes/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ bcdarwin ];
+    maintainers = with lib.maintainers; [
+      bcdarwin
+      jk
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/bitsandbytes/find-rocm-deps-with-cmake.patch b/pkgs/development/python-modules/bitsandbytes/find-rocm-deps-with-cmake.patch
new file mode 100644
index 000000000000..2650cdb8cabf
--- /dev/null
+++ b/pkgs/development/python-modules/bitsandbytes/find-rocm-deps-with-cmake.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c133e0..1aa8a53 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -285,6 +285,9 @@ if(BUILD_HIP)
+     find_package_and_print_version(hipblas REQUIRED)
+     find_package_and_print_version(hiprand REQUIRED)
+     find_package_and_print_version(hipsparse REQUIRED)
++    find_package_and_print_version(rocblas REQUIRED)
++    find_package_and_print_version(hip REQUIRED)
++    find_package_and_print_version(hipcub REQUIRED)
+ 
+     ## hacky way of excluding hip::amdhip64 (with it linked many tests unexpectedly fail e.g. adam8bit because of inaccuracies)
+     set_target_properties(hip::host PROPERTIES INTERFACE_LINK_LIBRARIES "")
+@@ -293,7 +296,7 @@ if(BUILD_HIP)
+ 
+     target_include_directories(bitsandbytes PRIVATE ${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/include ${ROCM_PATH}/include /include)
+     target_link_directories(bitsandbytes PRIVATE ${ROCM_PATH}/lib /lib)
+-    target_link_libraries(bitsandbytes PUBLIC roc::hipblas hip::hiprand roc::hipsparse)
++    target_link_libraries(bitsandbytes PUBLIC roc::hipblas hip::hiprand roc::hipsparse roc::rocblas hip::device hip::hipcub)
+ 
+     target_compile_definitions(bitsandbytes PUBLIC BNB_USE_HIP)
+     set_source_files_properties(${HIP_FILES} PROPERTIES LANGUAGE HIP)
diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock
index 51c44b074a00..2900a83a5108 100644
--- a/pkgs/development/python-modules/blake3/Cargo.lock
+++ b/pkgs/development/python-modules/blake3/Cargo.lock
@@ -22,7 +22,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "blake3"
-version = "1.0.7"
+version = "1.0.8"
 dependencies = [
  "blake3 1.8.2",
  "hex",
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.39"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -57,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "constant_time_eq"
@@ -100,9 +100,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "heck"
@@ -124,9 +124,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memmap2"
diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix
index ff6dfe06ceb3..64e17f626b31 100644
--- a/pkgs/development/python-modules/blake3/default.nix
+++ b/pkgs/development/python-modules/blake3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "blake3";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "blake3-py";
     tag = version;
-    hash = "sha256-km4vN/xKvjNd/bdHEIsUR9+Hmi0K5ju+wlQ2kuuDzzI=";
+    hash = "sha256-gwPGSah9qzApDwsBNABRLPZGrpaO3WArHoK6Jj6WJzo=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index 1c665e12d6e8..5d3578df5ef2 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -9,6 +9,8 @@
   pytestCheckHook,
   pytest-asyncio,
   pytest-cov-stub,
+  pythonOlder,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -25,11 +27,16 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies = [
-    bleak
-    bluetooth-adapters
-    dbus-fast
-  ];
+  dependencies =
+    lib.optionals (pythonOlder "3.14") [
+      bleak
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && pythonOlder "3.14") [
+      bluetooth-adapters
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      dbus-fast
+    ];
 
   nativeCheckInputs = [
     pytest-asyncio
diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix
index 6f42ae55fbf9..f45638c7492f 100644
--- a/pkgs/development/python-modules/blinkpy/default.nix
+++ b/pkgs/development/python-modules/blinkpy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   aiofiles,
   aiohttp,
   pytest-asyncio,
@@ -17,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "blinkpy";
-  version = "0.23.0";
+  version = "0.24.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,21 +25,13 @@ buildPythonPackage rec {
     owner = "fronzbot";
     repo = "blinkpy";
     tag = "v${version}";
-    hash = "sha256-MWXOxE0nxBFhkAWjy7qFPhv4AO6VjGf+fAiyaWXeiX8=";
+    hash = "sha256-UjkVpXqGOOwtpBslQB61osaQvkuvD4A+xeUrMpyWetg=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Fix tests with aiohttp 3.10+
-      url = "https://github.com/fronzbot/blinkpy/commit/e2c747b5ad295424b08ff4fb03204129155666fc.patch";
-      hash = "sha256-FapgAZcKBWqtAPjRl2uOFgnYPoWq6UU88XGLO7oCmDI=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "wheel~=0.40.0"' "" \
-      --replace "setuptools~=68.0" "setuptools"
+      --replace-fail "wheel~=0.40.0" wheel \
+      --replace-fail "setuptools>=68,<81" setuptools
   '';
 
   nativeBuildInputs = [ setuptools ];
@@ -69,11 +60,11 @@ buildPythonPackage rec {
     "blinkpy.sync_module"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library for the Blink Camera system";
     homepage = "https://github.com/fronzbot/blinkpy";
-    changelog = "https://github.com/fronzbot/blinkpy/blob/${src.rev}/CHANGES.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/fronzbot/blinkpy/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 7cba2ac12efb..9302f160aa8f 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -1,49 +1,61 @@
 {
   lib,
-  asn1crypto,
+  stdenv,
   buildPythonPackage,
-  certipy,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  asn1crypto,
+  badldap,
   cryptography,
   dnspython,
-  fetchFromGitHub,
-  hatchling,
-  minikerberos-bad,
-  msldap-bad,
-  pyasn1,
-  pytestCheckHook,
-  pythonOlder,
+  kerbad,
   winacl,
+
+  # test
+  certipy,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "bloodyad";
-  version = "2.1.21";
+  version = "2.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "bloodyAD";
     tag = "v${version}";
-    hash = "sha256-9yzKYSEmaPMv6AWhgr4UPPEx8s75Pg/hwqJnV29WocM=";
+    hash = "sha256-WKD8R1pH1dIAxMIM2SLPV+AoFi3z1O96U8XK2QyVYxQ=";
   };
 
   pythonRelaxDeps = [ "cryptography" ];
 
   pythonRemoveDeps = [
-    "minikerberos-bad"
-    "msldap-bad"
+    "kerbad"
+    "badldap"
   ];
 
   build-system = [ hatchling ];
 
+  # Upstream provides two package scripts: bloodyad and bloodyAD,
+  # but this causes a FileAlreadyExists error during installation
+  # on Darwin (case-insensitive filesystem).
+  # https://github.com/CravateRouge/bloodyAD/issues/99
+  postPatch = lib.optionals stdenv.hostPlatform.isDarwin ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "bloodyAD = \"bloodyAD.main:main\"" ""
+  '';
+
   dependencies = [
     asn1crypto
+    badldap
     cryptography
     dnspython
-    minikerberos-bad
-    msldap-bad
+    kerbad
     winacl
   ];
 
@@ -63,13 +75,20 @@ buildPythonPackage rec {
     "test_04ComputerRbcdGetSetAttribute"
     "test_06AddRemoveGetDnsRecord"
     "test_certificate_authentications"
+    "test_04ComputerRbcdRestoreGetSetAttribute"
   ];
 
-  meta = with lib; {
+  disabledTestPaths = [
+    # TypeError: applyFormatters() takes 1 positional argument but 2 were given
+    # https://github.com/CravateRouge/bloodyAD/issues/98
+    "tests/test_formatters.py"
+  ];
+
+  meta = {
     description = "Module for Active Directory Privilege Escalations";
     homepage = "https://github.com/CravateRouge/bloodyAD";
     changelog = "https://github.com/CravateRouge/bloodyAD/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index d62178ee476b..050e881ea0de 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "blosc2";
-  version = "3.7.1";
+  version = "3.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "python-blosc2";
     tag = "v${version}";
-    hash = "sha256-mA7/8i77wtl9b6IT4Wp/uFDYp/IacnPnAsRoXe64+z4=";
+    hash = "sha256-L4NTURGmRlM2ZY11NvP36EoImPu1ncb+CBFCeuCC+eQ=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix
index 33e250cbe4cd..a92ed1b08aca 100644
--- a/pkgs/development/python-modules/bluecurrent-api/default.nix
+++ b/pkgs/development/python-modules/bluecurrent-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bluecurrent-api";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bluecurrent";
     repo = "HomeAssistantAPI";
     tag = "v${version}";
-    hash = "sha256-PX0pD7X0o7OVtlz4Q5KuDBH83jtTaIdMnuLvAMTP8+U=";
+    hash = "sha256-a0IqtRj761h1P8Q3xrFY1XPFl6J6HaArv6IfO88OJco=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
index 2233fedecc9d..f3479add8be5 100644
--- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix
+++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
@@ -5,26 +5,22 @@
   cryptography,
   cython,
   poetry-core,
-  pytest-benchmark,
   pytest-codspeed,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "bluetooth-data-tools";
-  version = "1.28.3";
+  version = "1.28.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-data-tools";
     tag = "v${version}";
-    hash = "sha256-xeBqxGOyxjR/O593ctyfwASxBZIeRBTdpVI981gOw5o=";
+    hash = "sha256-IAGlM1B/PAPyaBIfHG3RScn8odboZMg3YmQJSfoyKR4=";
   };
 
   # The project can build both an optimized cython version and an unoptimized
@@ -40,15 +36,11 @@ buildPythonPackage rec {
   dependencies = [ cryptography ];
 
   nativeCheckInputs = [
-    pytest-benchmark
     pytest-codspeed
     pytest-cov-stub
-    pytest-codspeed
     pytestCheckHook
   ];
 
-  pytestFlags = [ "--benchmark-disable" ];
-
   pythonImportsCheck = [ "bluetooth_data_tools" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 62f0badbdc7b..73474c854bb0 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -21,7 +21,6 @@
   channels,
   click,
   colorcet,
-  coverage,
   firefox,
   geckodriver,
   isort,
@@ -81,7 +80,6 @@ buildPythonPackage rec {
     channels
     click
     colorcet
-    coverage
     firefox
     geckodriver
     isort
diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index 6ce0e46680ee..791596ce4a34 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -35,6 +35,8 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
+    substituteInPlace external/spglib-1.9.9/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
     substituteInPlace pyproject.toml \
       --replace-fail "numpy>=2.0.0" "numpy"
   '';
diff --git a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
index bbbf81d71d18..f5e833f1f844 100644
--- a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
+++ b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "bosch-alarm-mode2";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mag1024";
     repo = "bosch-alarm-mode2";
     tag = "v${version}";
-    hash = "sha256-oTGkEguN4EFJI5+UhqxKBN1x2Ppf9wQ0AeYbiLi1fhk=";
+    hash = "sha256-3eb9Exhu3ME++m+JRCVNpiUVIE3QSb9NRmvi+wZf/QY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index f15b3968b201..f9f690d775ab 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.52";
+  version = "1.40.64";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-vSCnvJEiuxuTkZVDG50/VAse8FAQO8FyDXhpYJB0ZP0=";
+    hash = "sha256-r0p/tnvaDBJ3r81FolBlYFVn0mCor9NLvfF5nSSSM08=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 0b825f221d5f..24206df5f31c 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -3,22 +3,19 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
-  pythonOlder,
   types-awscrt,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.52";
+  version = "1.40.67";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-npgJ5WPrLJJQUdhJJXvcdgV2C8u2Kz1f4xF/k4U0VIg=";
+    hash = "sha256-hk+f7UJy1+YrSlHaOxRe30J0AsH5l4YSpETtHo/fncc=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index f2b60e3b4a26..5cebb2e1e14e 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -15,7 +15,9 @@
   pyre-extensions,
   pyro-ppl,
   scipy,
+  threadpoolctl,
   torch,
+  typing-extensions,
 
   # optional-dependencies
   pymoo,
@@ -27,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "botorch";
-  version = "0.15.1";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "pytorch";
+    owner = "meta-pytorch";
     repo = "botorch";
     tag = "v${version}";
-    hash = "sha256-6hAsKIlwycZtLZn1vkcu4fR85uACA4FSkT5e/wos17A=";
+    hash = "sha256-XpcmWJcKaIxrM79MgjG7IF/DphTH402iltlh8ISeZ64=";
   };
 
   build-system = [
@@ -49,7 +51,9 @@ buildPythonPackage rec {
     pyre-extensions
     pyro-ppl
     scipy
+    threadpoolctl
     torch
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -62,6 +66,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # Requires unpackaged pfns
+    "test_community/models/test_prior_fitted_network.py"
+  ];
+
   disabledTests = [
     "test_all_cases_covered"
 
@@ -93,7 +102,7 @@ buildPythonPackage rec {
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = {
-    changelog = "https://github.com/pytorch/botorch/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/meta-pytorch/botorch/blob/${src.tag}/CHANGELOG.md";
     description = "Bayesian Optimization in PyTorch";
     homepage = "https://botorch.org";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index fc685f744b68..68798c64e1ed 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "bpython";
-  version = "0.25";
+  version = "0.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bpython";
     repo = "bpython";
     tag = "${version}-release";
-    hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w=";
+    hash = "sha256-NmWM0fdzS9n5FSnNJOCdS1JE5ZHrmJXqCuHa54rT8GU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index 259e835ab7f7..cc646db07a17 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "4.38.0";
+  version = "4.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "braintree";
     repo = "braintree_python";
     rev = version;
-    hash = "sha256-cAzqHMkEWaLXHbPUnkyFF5UD43rPk6txRSB2n9NJLTE=";
+    hash = "sha256-50UKCtZBnuSMhRoh7HAw6WxiN9iSKY2L+61pA0hmCGY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix
index 336d56fc8491..54a0053847b7 100644
--- a/pkgs/development/python-modules/bring-api/default.nix
+++ b/pkgs/development/python-modules/bring-api/default.nix
@@ -9,7 +9,6 @@
   pytest-asyncio,
   pytestCheckHook,
   python-dotenv,
-  pythonOlder,
   setuptools,
   syrupy,
   yarl,
@@ -17,16 +16,14 @@
 
 buildPythonPackage rec {
   pname = "bring-api";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "miaucl";
     repo = "bring-api";
     tag = version;
-    hash = "sha256-OxY9G7zy5VSpTOARoManJNvMg6ghIK0KJunanSgXKm0=";
+    hash = "sha256-BslU1ekbQIZh1f1zRYXbZdbOepB2+NWIuWZI4L/oxSg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix
index 302057470abb..5f96e62edc5a 100644
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@@ -14,7 +14,7 @@
 }:
 let
   pname = "brotli-asgi";
-  version = "1.4.0";
+  version = "1.5.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -26,7 +26,7 @@ buildPythonPackage {
     owner = "fullonic";
     repo = "brotli-asgi";
     rev = "v${version}";
-    hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
+    hash = "sha256-jOow5xrRvuBdg/dVEzAUgs1SxNLZqEItyW9OcvniTSY=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 1ea295a14750..a39d79049575 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bthome-ble";
-  version = "3.14.2";
+  version = "3.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
     tag = "v${version}";
-    hash = "sha256-kxKQnHrRZE7ugrRn7VSwQ99TtEX/DmH5x4Yy22UsXjA=";
+    hash = "sha256-AFALd5owqwaXPiMs0zHkGKpNqcpKG2O/JXXvuEF4d3s=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 2ba7e1e848d4..8e25d0bd94d2 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -7,22 +7,22 @@
   transaction,
   zope-testrunner,
   python,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "btrees";
-  version = "6.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "6.2";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4YdG+GQYaaIPRTKMm1+X3GxxoRlZYDVq72O3X1yNRF8=";
+    hash = "sha256-SnxwN2aEfrD6tYrpudacyAWIy/1uNFcrur1FU+B5/is=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     persistent
     zope-interface
   ];
@@ -34,7 +34,9 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
+
     ${python.interpreter} -m zope.testrunner --test-path=src --auto-color --auto-progress
+
     runHook postCheck
   '';
 
@@ -48,6 +50,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Scalable persistent components";
     homepage = "http://packages.python.org/BTrees";
+    changelog = "https://github.com/zopefoundation/BTrees/blob/${version}/CHANGES.rst";
     license = licenses.zpl21;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/calver/default.nix b/pkgs/development/python-modules/calver/default.nix
index df45ea99e481..46a47d3c4cbd 100644
--- a/pkgs/development/python-modules/calver/default.nix
+++ b/pkgs/development/python-modules/calver/default.nix
@@ -10,14 +10,14 @@
 let
   self = buildPythonPackage rec {
     pname = "calver";
-    version = "2025.04.17";
+    version = "2025.10.20";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "di";
       repo = "calver";
       tag = version;
-      hash = "sha256-C0l/SThDhA1DnOeMJfuh3d8R606nzyQag+cg7QqvYWY=";
+      hash = "sha256-8CfPQ4uMgKDqMMgutLdsjn/MaAVBJQAp1KqUfxzNMQw=";
     };
 
     postPatch = ''
diff --git a/pkgs/development/python-modules/castepxbin/default.nix b/pkgs/development/python-modules/castepxbin/default.nix
index 72c6e4513478..71cc81c5c3bb 100644
--- a/pkgs/development/python-modules/castepxbin/default.nix
+++ b/pkgs/development/python-modules/castepxbin/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   flit-core,
   numpy,
@@ -11,24 +10,18 @@
 
 buildPythonPackage rec {
   pname = "castepxbin";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "zhubonan";
     repo = "castepxbin";
     tag = "v${version}";
-    hash = "sha256-6kumVnm4PLRxuKO6Uz0iHzfYuu21hFC7EPRsc3S1kxE=";
+    hash = "sha256-M+OoKr9ODIp47gt64hf47A1PblyZpBzulKI7nEm8hdo=";
   };
 
   build-system = [ flit-core ];
 
-  pythonRelaxDeps = [
-    "numpy"
-  ];
-
   dependencies = [
     numpy
     scipy
@@ -36,10 +29,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/zhubonan/castepxbin/releases/tag/${src.tag}";
     description = "Collection of readers for CASTEP binary outputs";
     homepage = "https://github.com/zhubonan/castepxbin";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/categorical-distance/default.nix b/pkgs/development/python-modules/categorical-distance/default.nix
new file mode 100644
index 000000000000..451474d2f848
--- /dev/null
+++ b/pkgs/development/python-modules/categorical-distance/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  numpy,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "categorical-distance";
+  version = "1.9-unstable-2020-03-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "categorical-distance";
+    rev = "07d079fd412ccf06cdb200b3cd2cfa4b67f78722";
+    hash = "sha256-zSjSrlFiRus/T2XZdakLQpF1u/LV0VNWwrc8lhss6kU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "categorical"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Compare similarity of categorical variables using Jaccard index";
+    homepage = "https://github.com/dedupeio/categorical-distance";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/cbor2/default.nix b/pkgs/development/python-modules/cbor2/default.nix
index a9fd9152666e..698d88e2c5bf 100644
--- a/pkgs/development/python-modules/cbor2/default.nix
+++ b/pkgs/development/python-modules/cbor2/default.nix
@@ -2,30 +2,23 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
-
-  withCExtensions ? true,
-
-  # build-system
-  setuptools,
-  setuptools-scm,
-
-  # tests
   hypothesis,
   pytest-cov-stub,
   pytestCheckHook,
+  pythonOlder,
+  setuptools-scm,
+  setuptools,
+  withCExtensions ? true,
 }:
 
 buildPythonPackage rec {
   pname = "cbor2";
-  version = "5.6.5";
+  version = "5.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-toKCBnfuHbukX32hGJjScg+S4Gvjas7CkIZ9Xr89fgk=";
+    hash = "sha256-P22EP0200OxQHEZFPCKk++uxq/tbdA4byrNMYVzXQGs=";
   };
 
   build-system = [
@@ -33,8 +26,6 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  pythonImportsCheck = [ "cbor2" ];
-
   nativeCheckInputs = [
     hypothesis
     pytest-cov-stub
@@ -49,12 +40,15 @@ buildPythonPackage rec {
     inherit withCExtensions;
   };
 
-  meta = with lib; {
-    changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
+  pythonImportsCheck = [ "cbor2" ];
+
+  meta = {
     description = "Python CBOR (de)serializer with extensive tag support";
-    mainProgram = "cbor2";
+    changelog = "https://github.com/agronholm/cbor2/releases/tag/${version}";
     homepage = "https://github.com/agronholm/cbor2";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
+    mainProgram = "cbor2";
+
   };
 }
diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 99ff9c25fb95..afd13b3844d2 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -9,6 +9,7 @@
   click-plugins,
   click-repl,
   click,
+  cryptography,
   fetchFromGitHub,
   gevent,
   google-cloud-firestore,
@@ -29,6 +30,9 @@
   pyyaml,
   setuptools,
   vine,
+  # The AMQP REPL depends on click-repl, which is incompatible with our version
+  # of click.
+  withAmqpRepl ? false,
 }:
 
 buildPythonPackage rec {
@@ -43,6 +47,10 @@ buildPythonPackage rec {
     hash = "sha256-+sickqRfSkBxhcO0W9na6Uov4kZ7S5oqpXXKX0iRQ0w=";
   };
 
+  patches = lib.optionals (!withAmqpRepl) [
+    ./remove-amqp-repl.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -50,13 +58,16 @@ buildPythonPackage rec {
     click
     click-didyoumean
     click-plugins
-    click-repl
     kombu
     python-dateutil
     vine
+  ]
+  ++ lib.optionals withAmqpRepl [
+    click-repl
   ];
 
   optional-dependencies = {
+    auth = [ cryptography ];
     azureblockblob = [
       azure-identity
       azure-storage-blob
diff --git a/pkgs/development/python-modules/celery/remove-amqp-repl.patch b/pkgs/development/python-modules/celery/remove-amqp-repl.patch
new file mode 100644
index 000000000000..6a9dcd641bf4
--- /dev/null
+++ b/pkgs/development/python-modules/celery/remove-amqp-repl.patch
@@ -0,0 +1,32 @@
+diff --git a/celery/bin/celery.py b/celery/bin/celery.py
+index e1fae1a77..cf05a927a 100644
+--- a/celery/bin/celery.py
++++ b/celery/bin/celery.py
+@@ -12,7 +12,6 @@ from click_plugins import with_plugins
+ 
+ from celery import VERSION_BANNER
+ from celery.app.utils import find_app
+-from celery.bin.amqp import amqp
+ from celery.bin.base import CeleryCommand, CeleryOption, CLIContext
+ from celery.bin.beat import beat
+ from celery.bin.call import call
+@@ -186,7 +185,6 @@ celery.add_command(control)
+ celery.add_command(graph)
+ celery.add_command(upgrade)
+ celery.add_command(logtool)
+-celery.add_command(amqp)
+ celery.add_command(shell)
+ celery.add_command(multi)
+ 
+diff --git a/requirements/default.txt b/requirements/default.txt
+index 185b6eddd..fbfc59fd7 100644
+--- a/requirements/default.txt
++++ b/requirements/default.txt
+@@ -3,7 +3,6 @@ kombu>=5.6.0rc1,<5.7
+ vine>=5.1.0,<6.0
+ click>=8.1.2,<9.0
+ click-didyoumean>=0.3.0
+-click-repl>=0.2.0
+ click-plugins>=1.1.1
+ backports.zoneinfo[tzdata]>=0.2.1; python_version < '3.9'
+ python-dateutil>=2.8.2
diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix
index a384399b0d9e..671a40ed4ede 100644
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@@ -34,8 +34,9 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "argcomplete"
     "cryptography"
-    "pycryptodome"
+    "dnspython"
     "ldap3"
+    "pycryptodome"
     "pyopenssl"
   ];
 
diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index b7a5c901435a..0c837d51ffce 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,75 +1,46 @@
 {
-  lib,
-  stdenv,
   buildPythonPackage,
-  isPyPy,
-  fetchPypi,
-  setuptools,
-  pytestCheckHook,
+  fetchFromGitHub,
+  lib,
   libffi,
   pkg-config,
   pycparser,
+  pytestCheckHook,
+  setuptools,
+  stdenv,
 }:
 
-let
-  version = "1.17.1";
-in
-if isPyPy then
-  buildPythonPackage {
-    pname = "cffi";
-    inherit version;
-    pyproject = false;
+buildPythonPackage rec {
+  pname = "cffi";
+  version = "2.0.0";
+  pyproject = true;
 
-    # cffi is bundled with PyPy.
-    dontUnpack = true;
+  src = fetchFromGitHub {
+    owner = "python-cffi";
+    repo = "cffi";
+    tag = "v${version}";
+    hash = "sha256-7Mzz3KmmmE2xQru1GA4aY0DZqn6vxykWiExQvnA1bjM=";
+  };
 
-    # Some dependent packages expect to have pycparser available when using cffi.
-    dependencies = [ pycparser ];
+  nativeBuildInputs = [ pkg-config ];
 
-    meta = {
-      description = "Foreign Function Interface for Python calling C code (bundled with PyPy, placeholder package)";
-      homepage = "https://cffi.readthedocs.org/";
-      license = lib.licenses.mit;
-      teams = [ lib.teams.python ];
-    };
-  }
-else
-  buildPythonPackage rec {
-    pname = "cffi";
-    inherit version;
-    pyproject = true;
+  build-system = [ setuptools ];
 
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ=";
-    };
+  buildInputs = [ libffi ];
 
-    nativeBuildInputs = [ pkg-config ];
+  # Some dependent packages expect to have pycparser available when using cffi.
+  dependencies = [ pycparser ];
 
-    build-system = [ setuptools ];
+  doCheck = !(stdenv.hostPlatform.isMusl || stdenv.hostPlatform.useLLVM or false);
 
-    buildInputs = [ libffi ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
-    dependencies = [ pycparser ];
-
-    # The tests use -Werror but with python3.6 clang detects some unreachable code.
-    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing";
-
-    doCheck = !(stdenv.hostPlatform.isMusl || stdenv.hostPlatform.useLLVM or false);
-
-    nativeCheckInputs = [ pytestCheckHook ];
-
-    disabledTests = lib.optionals stdenv.hostPlatform.isFreeBSD [
-      # https://github.com/python-cffi/cffi/pull/144
-      "test_dlopen_handle"
-    ];
-
-    meta = with lib; {
-      changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}";
-      description = "Foreign Function Interface for Python calling C code";
-      downloadPage = "https://github.com/python-cffi/cffi";
-      homepage = "https://cffi.readthedocs.org/";
-      license = licenses.mit;
-      teams = [ teams.python ];
-    };
-  }
+  meta = {
+    changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}";
+    description = "Foreign Function Interface for Python calling C code";
+    downloadPage = "https://github.com/python-cffi/cffi";
+    homepage = "https://cffi.readthedocs.org/";
+    license = lib.licenses.mit0;
+    teams = [ lib.teams.python ];
+  };
+}
diff --git a/pkgs/development/python-modules/changelog-chug/default.nix b/pkgs/development/python-modules/changelog-chug/default.nix
index a13435f0a247..c4ffe1eb7625 100644
--- a/pkgs/development/python-modules/changelog-chug/default.nix
+++ b/pkgs/development/python-modules/changelog-chug/default.nix
@@ -5,7 +5,6 @@
   docutils,
   semver,
   setuptools,
-  coverage,
   testscenarios,
   testtools,
   unittestCheckHook,
@@ -39,7 +38,6 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    coverage
     testscenarios
     testtools
     unittestCheckHook
diff --git a/pkgs/development/python-modules/check-manifest/default.nix b/pkgs/development/python-modules/check-manifest/default.nix
index 53b4f7476401..d8e50380e313 100644
--- a/pkgs/development/python-modules/check-manifest/default.nix
+++ b/pkgs/development/python-modules/check-manifest/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "check-manifest";
-  version = "0.50";
+  version = "0.51";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mgedmin";
     repo = "check-manifest";
     tag = version;
-    hash = "sha256-wZ0mx2b3QkwTOPMLQ03SFVwnbsVO5RezOSX50ZOYvw8=";
+    hash = "sha256-tT6xQZwqJIsyrO9BjWweIeNgYaopziewerVBk0mFVYg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix
index d924a10a2a63..32ad00aaf1e0 100644
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@@ -21,9 +21,7 @@
 buildPythonPackage rec {
   pname = "checkdmarc";
   version = "5.10.12";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "domainaware";
@@ -32,7 +30,10 @@ buildPythonPackage rec {
     hash = "sha256-XbBdBef3+kt26XP5GDH5rgHYGh8xIjHUUVOcdeVICLs=";
   };
 
-  pythonRelaxDeps = [ "xmltodict" ];
+  pythonRelaxDeps = [
+    "cryptography"
+    "xmltodict"
+  ];
 
   build-system = [ hatchling ];
 
@@ -69,10 +70,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Parser for SPF and DMARC DNS records";
-    mainProgram = "checkdmarc";
     homepage = "https://github.com/domainaware/checkdmarc";
     changelog = "https://github.com/domainaware/checkdmarc/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "checkdmarc";
   };
 }
diff --git a/pkgs/development/python-modules/chipwhisperer/default.nix b/pkgs/development/python-modules/chipwhisperer/default.nix
new file mode 100644
index 000000000000..dcc446611b45
--- /dev/null
+++ b/pkgs/development/python-modules/chipwhisperer/default.nix
@@ -0,0 +1,112 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build
+  pythonAtLeast,
+  setuptools,
+  setuptools-scm,
+  cython,
+
+  # dependencies
+  colorama,
+  configobj,
+  ecpy,
+  fastdtw,
+  libusb1,
+  numpy,
+  pyserial,
+  tqdm,
+
+  # install
+  udevCheckHook,
+
+  # check
+  writableTmpDirAsHomeHook,
+  pytestCheckHook,
+}:
+
+# Usage:
+# In NixOS, add the package to services.udev.packages for non-root plugdev
+# users to get device access permission:
+#    services.udev.packages = [ pkgs.python3Packages.chipwhisperer ];
+
+buildPythonPackage rec {
+  pname = "chipwhisperer";
+  version = "5.7.0";
+
+  src = fetchFromGitHub {
+    owner = "newaetech";
+    repo = "chipwhisperer";
+    tag = version;
+    hash = "sha256-C7QP044QEP7vmz1lMseLtMTYoKn5SoFV/q9URY7yQ6I=";
+  };
+
+  pyproject = true;
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeBuildInputs = [
+    cython
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  dependencies = [
+    colorama
+    configobj
+    ecpy
+    fastdtw
+    libusb1
+    pyserial
+    tqdm
+  ];
+
+  nativeInstallCheckInputs = [
+    udevCheckHook
+  ];
+
+  postInstall = ''
+    # Install udev rules
+    # The 50-newae.rules file from the repo isn't directly installed, since it
+    # installs to the chipwhisperer group (and not to uaccess)
+
+    mkdir -p $out/etc/udev/rules.d
+
+    cat <<EOF > $out/etc/udev/rules.d/50-newae.rules
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="2b3e", ATTRS{idProduct}=="*", TAG+="uaccess"
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="2b3e", ATTRS{idProduct}=="*", TAG+="uaccess", SYMLINK+="cw_serial%n"
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", SYMLINK+="cw_bootloader%n"
+    EOF
+  '';
+
+  pythonImportsCheck = [ "chipwhisperer" ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+  ];
+
+  enabledTestPaths = [
+    # All other tests require connected hardware
+    # Error: "Could not find ChipWhisperer. Is it connected?"
+    # See: https://chipwhisperer.readthedocs.io/en/latest/contributing.html#unit-tests
+    "tests/test_api.py"
+  ];
+
+  disabledTests = [ "TestCPA" ]; # Tries to open a tutorial project
+
+  meta = {
+    description = "Toolchain for side-channel power analysis and glitching attacks";
+    homepage = "https://github.com/newaetech/chipwhisperer";
+    changelog = "https://github.com/newaetech/chipwhisperer/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.krishnans2006 ];
+  };
+}
diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 6f7605e74ae5..06c7acde4293 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -67,20 +67,19 @@
 
 buildPythonPackage rec {
   pname = "chromadb";
-  version = "1.1.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = version;
-    hash = "sha256-WFN4z+LQwqy6bd59yWlglpXFqNZPEd3jcgeWhdphxYM=";
+    hash = "sha256-D8vLkV8T1igOoCgJDiccLytxlXdF0oLJZTQpBsLM7Z0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}-vendor";
-    hash = "sha256-LZXtAt4rP0rKaleMht1eFPdqgE8nu5NdLzhWBW69WW8=";
+    inherit pname version src;
+    hash = "sha256-f5lU1ClKEZjzOAkng1B37d4VmHYzLOP2uMvoN1RFFoo=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile
@@ -93,6 +92,11 @@ buildPythonPackage rec {
     # Nixpkgs is taking the version from `chromadb_rust_bindings` which is versioned independently
     substituteInPlace pyproject.toml \
       --replace-fail "dynamic = [\"version\"]" "version = \"${version}\""
+
+    # Flip anonymized telemetry to opt in versus current opt-in out for privacy
+    substituteInPlace chromadb/config.py \
+      --replace-fail "anonymized_telemetry: bool = True" \
+                     "anonymized_telemetry: bool = False"
   '';
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/clarifai-grpc/default.nix b/pkgs/development/python-modules/clarifai-grpc/default.nix
index 4b68e8c734d5..0e33c8e51500 100644
--- a/pkgs/development/python-modules/clarifai-grpc/default.nix
+++ b/pkgs/development/python-modules/clarifai-grpc/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "clarifai-grpc";
-  version = "11.9.3";
+  version = "11.9.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Clarifai";
     repo = "clarifai-python-grpc";
     tag = version;
-    hash = "sha256-kKA+D9mIogSvx5dLqc7WSzMMZWZvSvu+RV0WtxWb2xQ=";
+    hash = "sha256-eLX5wokrLH+YqrRp6Oug82a16w0sFMUClz6tQ8dDc1Q=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix
index 56e2a74ca67f..132a0c0fa52a 100644
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai";
-  version = "11.8.3";
+  version = "11.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -41,13 +41,14 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python";
     tag = version;
-    hash = "sha256-sl9x8VqGGgUfPSRZiMP6edLeUUTpASp8kdRLl0Kxclc=";
+    hash = "sha256-LTBAexfexeZ/Woe2GMaIArGy/ufFkgPdkstzSKCkYIU=";
   };
 
   pythonRelaxDeps = [
     "clarifai-protocol"
     "click"
     "fsspec"
+    "psutil"
     "ruff"
     "schema"
     "uv"
diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index 4f10df8c8159..053167518a8c 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "clevercsv";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
     tag = "v${version}";
-    hash = "sha256-T4eYTr3+MUr1fPWE490v1m8THdZrBUP4wODftjpvnLQ=";
+    hash = "sha256-yp102f0WHu9wdVpXBIXn4lP7fi1UOQdA7M11hyVyRyM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix
index 109fe65523b2..bcdbd26ace7d 100644
--- a/pkgs/development/python-modules/click-odoo-contrib/default.nix
+++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "click-odoo-contrib";
-  version = "1.22";
+  version = "1.23";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "click_odoo_contrib";
     inherit version;
-    hash = "sha256-L0Slv0ExVsnlMH23FX06aAEYMqzQEAc4mrKb96TtjRY=";
+    hash = "sha256-ep4aBJpc94qLIBaGdD0F1fkQmPA4qtG0ql3W+wbPmkE=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix
index 201e0d8d4253..00b8221e3bc9 100644
--- a/pkgs/development/python-modules/click-repl/default.nix
+++ b/pkgs/development/python-modules/click-repl/default.nix
@@ -42,6 +42,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    # https://github.com/click-contrib/click-repl/issues/128
+    broken = lib.versionAtLeast click.version "8.2.0";
     homepage = "https://github.com/click-contrib/click-repl";
     description = "Subcommand REPL for click apps";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index ec105f1ef7d5..368589cac6ef 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+  fetchpatch,
   importlib-metadata,
   pytestCheckHook,
 
@@ -17,24 +17,33 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.1.8";
+  version = "8.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-pAAqf8jZbDfVZUoltwIFpov/1ys6HSYMyw3WV2qcE/M=";
+    hash = "sha256-3FfLKwpfkiGfY2+H2fQoZwLBqfPlV46xw2Bc4YEsyps=";
   };
 
+  patches = [
+    # https://github.com/pallets/click/pull/2940
+    (fetchpatch {
+      name = "fix-SystemExit-when-using-stdin.patch";
+      url = "https://github.com/pallets/click/commit/93c6966eb3a575c2b600434d1cc9f4b3aee505ac.patch";
+      hash = "sha256-DkVF0JnKbcsdAhgVjWJEDZZ8vr2sf6wba8P3SyRUy6o=";
+    })
+  ];
+
   build-system = [ flit-core ];
-  dependencies = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
+    # for some reason the tests fail to execute cat, even though they run with less just fine,
+    # even adding coreutils to nativeCheckInputs explicitly does not change anything
+    "test_echo_via_pager"
     # test fails with filename normalization on zfs
     "test_file_surrogates"
   ];
@@ -49,14 +58,15 @@ buildPythonPackage rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/pallets/click/blob/${src.tag}/CHANGES.rst";
     homepage = "https://click.palletsprojects.com/";
     description = "Create beautiful command line interfaces in Python";
     longDescription = ''
       A Python package for creating beautiful command line interfaces in a
       composable way, with as little code as necessary.
     '';
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }
diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
index 170ffd907128..666755eac583 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -1,19 +1,20 @@
 {
   lib,
   buildPythonPackage,
+  click,
   fetchFromGitea,
   flake8,
-  click,
-  pyyaml,
-  six,
-  pytestCheckHook,
   pytest-cov-stub,
+  pytestCheckHook,
+  pyyaml,
+  setuptools,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "clickclick";
   version = "20.10.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitea {
     domain = "codeberg.org";
@@ -23,23 +24,32 @@ buildPythonPackage rec {
     hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw=";
   };
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-cov-stub
-  ];
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     flake8
     click
     pyyaml
     six
   ];
 
-  # test_cli asserts on exact quoting style of output
-  disabledTests = [ "test_cli" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+  ];
+
+  pythonImportsCheck = [ "clickclick" ];
+
+  disabledTests = [
+    # Tests asserts on exact quoting style of output
+    "test_choice_default"
+    "test_cli"
+  ];
 
   meta = with lib; {
     description = "Click command line utilities";
     homepage = "https://codeberg.org/hjacobs/python-clickclick/";
     license = licenses.asl20;
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/clickgen/default.nix b/pkgs/development/python-modules/clickgen/default.nix
index 73f42d2cc659..4fed05d02c5d 100644
--- a/pkgs/development/python-modules/clickgen/default.nix
+++ b/pkgs/development/python-modules/clickgen/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
       .png files. clickgen is using anicursorgen and xcursorgen under the hood.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ AdsonCicilioti ];
+    maintainers = [ ];
     # fails with:
     # ld: unknown option: -zdefs
     broken = stdenv.hostPlatform.isDarwin;
diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 1dc7cc8de508..93e318059b08 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   colorlog,
   fetchFromGitHub,
-  bibtexparser_2,
+  bibtexparser,
   git,
   lxml,
   markdown,
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   dependencies = [
     attrs
-    bibtexparser_2
+    bibtexparser
     colorlog
     lxml
     markdown
@@ -55,6 +55,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    broken = lib.versionOlder bibtexparser.version "2";
     changelog = "https://github.com/clld/clldutils/blob/${src.tag}/CHANGES.md";
     description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al";
     homepage = "https://github.com/clld/clldutils";
diff --git a/pkgs/development/python-modules/cloudevents/default.nix b/pkgs/development/python-modules/cloudevents/default.nix
index 5324f3ab5ee6..3b5b966475b1 100644
--- a/pkgs/development/python-modules/cloudevents/default.nix
+++ b/pkgs/development/python-modules/cloudevents/default.nix
@@ -28,10 +28,13 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  dependencies = [
+    deprecation
+  ];
+
   pythonImportsCheck = [ "cloudevents" ];
 
   nativeCheckInputs = [
-    deprecation
     flask
     pydantic
     pytestCheckHook
diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index f8f00d04695f..e73068f90685 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -1,15 +1,23 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   flit-core,
+
+  # dependencies
+  pythonOlder,
   typing-extensions,
-  azure-identity,
+
+  # optional-dependencies
   azure-storage-blob,
   azure-storage-file-datalake,
   google-cloud-storage,
   boto3,
+
+  # tests
+  azure-identity,
   psutil,
   pydantic,
   pytestCheckHook,
@@ -23,27 +31,28 @@
 
 buildPythonPackage rec {
   pname = "cloudpathlib";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "drivendataorg";
     repo = "cloudpathlib";
     tag = "v${version}";
-    hash = "sha256-IeNYfYDvCALvK0CV4J6434E3lSz+/JvolQzQXZ8NizQ=";
+    hash = "sha256-lRZYWGX3Yqs1GTIL3ugOiu+K9RF6vJdbKP/SZAStHLc=";
   };
 
-  postPatch = ''
+  postPatch =
     # missing pytest-reportlog test dependency
-    substituteInPlace pyproject.toml \
-      --replace-fail "--report-log reportlog.jsonl" ""
-  '';
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail "--report-log reportlog.jsonl" ""
+    '';
 
   build-system = [ flit-core ];
 
-  dependencies = lib.optional (pythonOlder "3.11") typing-extensions;
+  dependencies = lib.optionals (pythonOlder "3.11") [
+    typing-extensions
+  ];
 
   optional-dependencies = {
     all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3;
@@ -71,10 +80,13 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.all;
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage";
     homepage = "https://github.com/drivendataorg/cloudpathlib";
-    license = licenses.mit;
-    maintainers = with maintainers; [ GaetanLepage ];
+    changelog = "https://github.com/drivendataorg/cloudpathlib/blob/${src.tag}/HISTORY.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }
diff --git a/pkgs/development/python-modules/clx-sdk-xms/default.nix b/pkgs/development/python-modules/clx-sdk-xms/default.nix
index dd5a56dfbca0..b2dcaa54c0d0 100644
--- a/pkgs/development/python-modules/clx-sdk-xms/default.nix
+++ b/pkgs/development/python-modules/clx-sdk-xms/default.nix
@@ -10,12 +10,13 @@
 
 buildPythonPackage {
   pname = "clx-sdk-xms";
-  version = "0-unstable-2017-01-23";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "clxcommunications";
     repo = "sdk-xms-python";
+    # https://github.com/clxcommunications/sdk-xms-python/issues/4
     rev = "8d629cd7bcaf91eaafee265a825e3c52191f1425";
     hash = "sha256-qMR9OT+QAKZGwDuoZVAtfKD3PQB7rEU/iTRjgACVGBs=";
   };
diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix
index 6a9a2df2a11b..2ac12e0e0196 100644
--- a/pkgs/development/python-modules/cmdstanpy/default.nix
+++ b/pkgs/development/python-modules/cmdstanpy/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "cmdstanpy";
-  version = "1.2.5";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstanpy";
     tag = "v${version}";
-    hash = "sha256-/MiWawB1Y4/eMBHXQLjd+P+Pe8EtsLbGFrzQa1RNf6g=";
+    hash = "sha256-XVviGdJ41mcjCscL3jvcpHi6zMREHsuShGHpnMQX6V8=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/coal/default.nix b/pkgs/development/python-modules/coal/default.nix
new file mode 100644
index 000000000000..773de813e0da
--- /dev/null
+++ b/pkgs/development/python-modules/coal/default.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  coal,
+
+  boost,
+  eigenpy,
+  pylatexenc,
+  numpy,
+}:
+toPythonModule (
+  coal.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    # those are used by CMake at configure/build time
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      numpy
+      pylatexenc
+    ];
+
+    propagatedBuildInputs = super.propagatedBuildInputs ++ [
+      boost
+      coal
+      eigenpy
+    ];
+
+    nativeCheckInputs = [
+      pythonImportsCheckHook
+    ];
+
+    pythonImportsCheck = [
+      "coal"
+      "hppfcl"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix
index 6e10559b3510..c817ebc5a3f2 100644
--- a/pkgs/development/python-modules/cocotb-bus/default.nix
+++ b/pkgs/development/python-modules/cocotb-bus/default.nix
@@ -1,24 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "cocotb-bus";
-  version = "0.2.1";
+  version = "unstable-2025-11-03";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a197aa4b0e0ad28469c8877b41b3fb2ec0206da9f491b9276d1578ce6dd8aa8d";
+  src = fetchFromGitHub {
+    owner = "cocotb";
+    repo = "cocotb-bus";
+    rev = "f72b989bde036e677d5e9ebab3a6a21bdfe43d09";
+    hash = "sha256-4j63kOjBd+iLA2EYqLTM0oKzKksOjH2UqNgDNFvWgYw=";
   };
 
-  postPatch = ''
-    # remove circular dependency cocotb from setup.py
-    substituteInPlace setup.py --replace '"cocotb>=1.5.0.dev,<2.0"' ""
-  '';
-
   # tests require cocotb, disable for now to avoid circular dependency
   doCheck = false;
 
@@ -31,6 +28,6 @@ buildPythonPackage rec {
     description = "Pre-packaged testbenching tools and reusable bus interfaces for cocotb";
     homepage = "https://github.com/cocotb/cocotb-bus";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ prusnak ];
+    maintainers = with maintainers; [ oskarwires ];
   };
 }
diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index eddb30de6b93..32524ca40c76 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -16,6 +16,7 @@
   dask,
   dask-awkward,
   dask-histogram,
+  fsspec,
   hist,
   lz4,
   matplotlib,
@@ -41,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "coffea";
-  version = "2025.7.3";
+  version = "2025.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "coffea";
     tag = "v${version}";
-    hash = "sha256-lCrmWcVzu8Ls0a+r2D1DMZ/Ysq3H9bPj13XOmAS1M5I=";
+    hash = "sha256-vTTjdffQHzKnU41rW5XYTD7C4pH2fxhSy8mfKGMZbLc=";
   };
 
   build-system = [
@@ -69,6 +70,7 @@ buildPythonPackage rec {
     dask
     dask-awkward
     dask-histogram
+    fsspec
     hist
     lz4
     matplotlib
diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index afd69944bc71..c7d59b403351 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.18.0";
+  version = "5.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-p0EQZ7C5z9qi62L3KESF/oQf/yWKtnG1fzCAoSatuVU=";
+    hash = "sha256-Y0IxKKq1D7tRzbNSjWDuLYEpRChRA89t91BstvE8Tng=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index 22708d27ec80..88d7381ddfa3 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.126.0";
+  version = "1.128.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-iS6PSxh2yV8QYsKqnxH0cWNkW/U7cxXFI48fWs/1fjU=";
+    hash = "sha256-COG7HEu+6fmbM5LHjHpdVcd5F1BQnyPosabTyJH2GeE=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 752d3d28bc57..61380e80a8ff 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -9,7 +9,6 @@
   pytest-mock,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   pyyaml,
   requests,
   tqdm,
@@ -19,17 +18,15 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2025.9.30.16";
+  version = "2025.10.21.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   __darwinAllowLocalNetworking = true;
 
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-PnFQGfGXwDzSwGuQiEOuFsYVpSQnZE+w+2BWQ2SkxX0=";
+    hash = "sha256-OtC6Sy32faZAZqMVUure4RmPj2LCe4Ifwy+5xmZ0g8U=";
   };
 
   pythonRelaxDeps = [ "typer" ];
diff --git a/pkgs/development/python-modules/color-matcher/default.nix b/pkgs/development/python-modules/color-matcher/default.nix
new file mode 100644
index 000000000000..330c3adba7a7
--- /dev/null
+++ b/pkgs/development/python-modules/color-matcher/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  numpy,
+  imageio,
+  docutils,
+  ddt,
+  matplotlib,
+}:
+let
+  pname = "color-matcher";
+  version = "0.6.0";
+in
+buildPythonPackage {
+  inherit pname version;
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-e6igB4LD5eWTHdp7H7nFcqzoLeDGyXZUQyt8/gqnSEM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    numpy
+    imageio
+    docutils
+    ddt
+    matplotlib
+  ];
+
+  postPatch = ''
+    ln -s */requires.txt requirements.txt
+  '';
+
+  # Some tests are broken and many require internet access
+  doCheck = false;
+
+  meta = {
+    description = "Package enabling color transfer across images";
+    homepage = "https://github.com/hahnec/color-matcher";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ blenderfreaky ];
+    # requires py2app which is not packaged for darwin
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index ab09f5896b4a..83397f73215d 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -1,19 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "6.9.0";
+  version = "6.10.1";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-v7pUobk7lPVOH0/kg5VyWj2S/SpK9wL2vXCUa9wMasI=";
+  src = fetchFromGitHub {
+    owner = "borntyping";
+    repo = "python-colorlog";
+    tag = "v${version}";
+    hash = "sha256-vb7OzIVcEIfnhJGpO0DgeEdhL6NCKlrynoNMxNp8Yg4=";
   };
 
   build-system = [ setuptools ];
@@ -22,10 +24,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/borntyping/python-colorlog/releases/tag/${src.tag}";
     description = "Log formatting with colors";
     homepage = "https://github.com/borntyping/python-colorlog";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/columnize/default.nix b/pkgs/development/python-modules/columnize/default.nix
new file mode 100644
index 000000000000..e33ac648ad68
--- /dev/null
+++ b/pkgs/development/python-modules/columnize/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "columnize";
+  version = "0.3.11";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rocky";
+    repo = "pycolumnize";
+    tag = "3.11";
+    hash = "sha256-YJEIujoRpLvUM4H4CB1nEJaYStFOSVKIGzchnptlt7M=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonImportsCheck = [ "columnize" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python module to align a simple (not nested) list in columns";
+    homepage = "https://github.com/rocky/pycolumnize";
+    changelog = "https://github.com/rocky/pycolumnize/blob/${src.tag}/ChangeLog";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/comet-ml/default.nix b/pkgs/development/python-modules/comet-ml/default.nix
index 372c6040e738..d432b793f639 100644
--- a/pkgs/development/python-modules/comet-ml/default.nix
+++ b/pkgs/development/python-modules/comet-ml/default.nix
@@ -23,12 +23,12 @@
 
 buildPythonPackage rec {
   pname = "comet-ml";
-  version = "3.53.1";
+  version = "3.54.0";
 
   src = fetchPypi {
     pname = "comet_ml";
     inherit version;
-    hash = "sha256-r3abmDqYzJOtdYswe4jK6xkVqGNtzUgSIAMtCLW5rBI=";
+    hash = "sha256-ETcRFf1wPGYrbkjknTt5omqVC4/NhhbFkCpELuY54Y0=";
   };
 
   pyproject = true;
diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix
index a2de9c77036f..c232b0b2c56a 100644
--- a/pkgs/development/python-modules/cometx/default.nix
+++ b/pkgs/development/python-modules/cometx/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "cometx";
-  version = "2.6.1";
+  version = "3.1.0";
 
   pyproject = true;
   build-system = [ setuptools ];
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "comet-ml";
     repo = "cometx";
     tag = version;
-    hash = "sha256-Iax75Gz/gxGavau0wOJyICZYlBOJ3yVc4NXZB/HV4X0=";
+    hash = "sha256-7rxEJNmJsFExfvYCuO/JOgj7yRFBjceE1bhRL1hFoPU=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 5a90c3bd3a4a..a107a6fd888d 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "commoncode";
-  version = "32.2.1";
+  version = "32.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "nexB";
     repo = "commoncode";
     tag = "v${version}";
-    hash = "sha256-dCiERdNVup95UnvmJEzkpQsRvpk2eKqvwD6jkEBrXfE=";
+    hash = "sha256-FL9t8r53AJLR5D2XSEOq7qVHgvvHIbtPW5iVpSQCVsQ=";
   };
 
   dontConfigure = true;
diff --git a/pkgs/development/python-modules/compit-inext-api/default.nix b/pkgs/development/python-modules/compit-inext-api/default.nix
new file mode 100644
index 000000000000..0263ecd56fe4
--- /dev/null
+++ b/pkgs/development/python-modules/compit-inext-api/default.nix
@@ -0,0 +1,40 @@
+{
+  aiofiles,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "compit-inext-api";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Przemko92";
+    repo = "compit-inext-api";
+    tag = version;
+    hash = "sha256-Wx3V0AdxNGLdCIl4G7FlfzeDSirRPnxgQ9Fbp5cRjFw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiofiles
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "compit_inext_api" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python client for the Compit iNext API";
+    homepage = "https://github.com/Przemko92/compit-inext-api";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index e713f0166406..79736bac54f1 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -2,15 +2,21 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  flit-core,
-  pyyaml,
-  pytestCheckHook,
   pythonOlder,
+
+  # build-system
+  flit-core,
+
+  # dependencies
+  pyyaml,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "confuse";
-  version = "1.7.0";
+  version = "2.0.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,21 +25,30 @@ buildPythonPackage rec {
     owner = "beetbox";
     repo = "confuse";
     rev = "v${version}";
-    hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
+    hash = "sha256-TVx0cBXv/fIuli/xrFXBAmwJ1rQr5xJL1Q67FaDr4ow=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [
+    flit-core
+  ];
 
-  propagatedBuildInputs = [ pyyaml ];
+  dependencies = [
+    pyyaml
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "confuse" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python configuration library for Python that uses YAML";
     homepage = "https://github.com/beetbox/confuse";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lovesegfault ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      lovesegfault
+      doronbehar
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/construct-classes/default.nix b/pkgs/development/python-modules/construct-classes/default.nix
index 189729fb9bd7..bcfa798f614d 100644
--- a/pkgs/development/python-modules/construct-classes/default.nix
+++ b/pkgs/development/python-modules/construct-classes/default.nix
@@ -3,6 +3,7 @@
   buildPythonPackage,
   construct,
   fetchFromGitHub,
+  fetchpatch2,
   pytestCheckHook,
   uv-build,
 }:
@@ -19,6 +20,14 @@ buildPythonPackage rec {
     hash = "sha256-goOQMt/nVjWXYltpnKHtJaLOhR+gRTmtoUh7zVb7go4=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/matejcik/construct-classes/commit/d1ecacc0cf5cb332ffe6ed85ce9dfc552f77231f.patch?full_index=1";
+      hash = "sha256-VeifL8bER0mIRNXKTA+/cje8AxWJKg/q8ipmf3gTeiw=";
+    })
+  ];
+
   build-system = [ uv-build ];
 
   dependencies = [ construct ];
diff --git a/pkgs/development/python-modules/construct-typing/default.nix b/pkgs/development/python-modules/construct-typing/default.nix
index d56525e538fa..071d73658370 100644
--- a/pkgs/development/python-modules/construct-typing/default.nix
+++ b/pkgs/development/python-modules/construct-typing/default.nix
@@ -8,6 +8,7 @@
   typing-extensions,
   arrow,
   cloudpickle,
+  cryptography,
   numpy,
   pytestCheckHook,
   ruamel-yaml,
@@ -15,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "construct-typing";
-  version = "0.6.2";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "timrid";
     repo = "construct-typing";
     tag = "v${version}";
-    hash = "sha256-zXpxu+VUcepEoAPLQnSlMCZkt8fDsMCLS0HBKhaYD20=";
+    hash = "sha256-iiMnt/f1ppciL6AVq3q0wOtoARcNYJycQA5Ev+dIow8=";
   };
 
   build-system = [ setuptools ];
@@ -42,22 +43,12 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     arrow
     cloudpickle
+    cryptography
     numpy
     pytestCheckHook
     ruamel-yaml
   ];
 
-  disabledTests = [
-    # tests fail with construct>=2.10.70
-    "test_bitsinteger"
-    "test_bytesinteger"
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [
-    # https://github.com/timrid/construct-typing/issues/31
-    "test_tenum_docstring"
-    "test_tenum_flags_docstring"
-  ];
-
   meta = {
     changelog = "https://github.com/timrid/construct-typing/releases/tag/v${version}";
     description = "Extension for the python package 'construct' that adds typing features";
diff --git a/pkgs/development/python-modules/cookidoo-api/default.nix b/pkgs/development/python-modules/cookidoo-api/default.nix
index 3565c2cfbc83..4c019677f204 100644
--- a/pkgs/development/python-modules/cookidoo-api/default.nix
+++ b/pkgs/development/python-modules/cookidoo-api/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "cookidoo-api";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miaucl";
     repo = "cookidoo-api";
     tag = version;
-    hash = "sha256-EWAD33ZF1k76FujQdgBaIzx06zmqh0CfdpknWrs0YLU=";
+    hash = "sha256-oMosKW6MjeKPqSjF0+dc7CrNp4/5qlRoEY01HZ4sqog=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index af924d10e4ca..bc0e79c3867a 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.10.2";
+  version = "9.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-vO807Jzl04DkiHPBhu3cGK0bhn2Cd2dT1nKznQKP/p0=";
+    hash = "sha256-ZBRJ4FrdhtKr273D2amwA3dJhISZAORqFqoh//963Fg=";
   };
 
   POETRY_DYNAMIC_VERSIONING_BYPASS = version;
@@ -79,7 +79,10 @@ buildPythonPackage rec {
     homepage = "https://copier.readthedocs.io";
     changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ greg ];
+    maintainers = with lib.maintainers; [
+      greg
+      savtrip
+    ];
     mainProgram = "copier";
   };
 }
diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index 957f5da7ed79..96ea87b952fd 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -41,6 +41,10 @@ buildPythonPackage rec {
     hash = "sha256-aLTeyDOo80p8xzl/IPnpT3BOjS2qOYn/Z7pidcLoEY8=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail "-Wall -Wextra -Wpedantic -Werror" ""
+  '';
+
   build-system = [
     pybind11
     scikit-build-core
diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 030d2bad3028..53374790cedd 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.10.6";
+  version = "7.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nedbat";
     repo = "coveragepy";
     tag = version;
-    hash = "sha256-16t29ftyYBkGvzlV6+imjO+HM1UD/Nrhn+n4pK3h5iU=";
+    hash = "sha256-l4JeGgy+WAN6NHz0ZkPYqiNw0k5VxaX32Vcp11sylgU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/crewai/default.nix b/pkgs/development/python-modules/crewai/default.nix
index 2a33fd45a1be..df91398c1121 100644
--- a/pkgs/development/python-modules/crewai/default.nix
+++ b/pkgs/development/python-modules/crewai/default.nix
@@ -16,7 +16,6 @@
   json5,
   jsonref,
   litellm,
-  onnxruntime,
   openai,
   opentelemetry-api,
   opentelemetry-exporter-otlp-proto-http,
@@ -25,6 +24,7 @@
   pdfplumber,
   portalocker,
   pydantic,
+  pydantic-settings,
   pyjwt,
   python-dotenv,
   pyvis,
@@ -44,14 +44,14 @@
 
 buildPythonPackage rec {
   pname = "crewai";
-  version = "0.186.1";
+  version = "0.203.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "crewAIInc";
     repo = "crewAI";
     tag = version;
-    hash = "sha256-rSVIbRATMq0cfMdgR/+/tNjij0Sk/ErWipy0m8hKvr4=";
+    hash = "sha256-vy3JdJjuiFbi66IDNo+dQ7MZqlHqvHt/zUb6eblPT7A=";
   };
 
   build-system = [ hatchling ];
@@ -60,8 +60,8 @@ buildPythonPackage rec {
     "chromadb"
     "json-repair"
     "litellm"
-    "onnxruntime"
     "portalocker"
+    "pydantic"
     "pyvis"
   ];
 
@@ -75,7 +75,6 @@ buildPythonPackage rec {
     json5
     jsonref
     litellm
-    onnxruntime
     openai
     opentelemetry-api
     opentelemetry-exporter-otlp-proto-http
@@ -84,6 +83,7 @@ buildPythonPackage rec {
     pdfplumber
     portalocker
     pydantic
+    pydantic-settings
     pyjwt
     python-dotenv
     pyvis
@@ -108,58 +108,66 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
+    # AssertionError - json-repair behaves differently since 0.52.0
+    "test_safe_repair_json_unrepairable"
+    "test_valid_action_parsing_with_curly_braces"
+
     # Tests parser
     "test_valid_action_parsing_with_special_characters"
 
     # Tests agent - require API keys (OpenAI, Anthropic, etc)
-    "test_agent_execution_with_tools"
-    "test_llm_call"
-    "test_agent_repeated_tool_usage"
-    "test_agent_execute_task_basic"
-    "test_agent_execution"
-    "test_ensure_first_task_allow_crewai_trigger_context_is_false_does_not_inject"
-    "test_agent_use_specific_tasks_output_as_context"
-    "test_task_allow_crewai_trigger_context"
-    "test_agent_with_only_crewai_knowledge"
-    "test_logging_tool_usage"
-    "test_agent_execute_task_with_context"
-    "test_agent_repeated_tool_usage_check_even_with_disabled_cache"
-    "test_agent_step_callback"
-    "test_handle_context_length_exceeds_limit_cli_no"
-    "test_task_without_allow_crewai_trigger_context"
-    "test_cache_hitting"
-    "test_agent_knowledege_with_crewai_knowledge"
-    "test_agent_execute_task_with_tool"
-    "test_agent_moved_on_after_max_iterations"
-    "test_agent_function_calling_llm"
-    "test_task_allow_crewai_trigger_context_no_payload"
-    "test_disabling_cache_for_agent"
-    "test_do_not_allow_crewai_trigger_context_for_first_task_hierarchical"
-    "test_tool_result_as_answer_is_the_final_answer_for_the_agent"
-    "test_agent_execute_task_with_ollama"
-    "test_agent_with_knowledge_sources"
-    "test_agent_respect_the_max_rpm_set"
-    "test_agent_execution_with_specific_tools"
-    "test_llm_call_with_ollama_llama3"
-    "test_first_task_auto_inject_trigger"
-    "test_agent_respect_the_max_rpm_set_over_crew_rpm"
-    "test_agent_powered_by_new_o_model_family_that_allows_skipping_tool"
-    "test_agent_with_knowledge_with_no_crewai_knowledge"
-    "test_tool_usage_information_is_appended_to_agent"
-    "test_agent_without_max_rpm_respects_crew_rpm"
-    "test_agent_powered_by_new_o_model_family_that_uses_tool"
-    "test_agent_error_on_parsing_tool"
     "test_agent_custom_max_iterations"
-    "test_agent_remembers_output_format_after_using_tools_too_many_times"
-    "test_llm_call_with_all_attributes"
+    "test_agent_error_on_parsing_tool"
+    "test_agent_execute_task_basic"
+    "test_agent_execute_task_with_context"
     "test_agent_execute_task_with_custom_llm"
-    "test_agent_with_ollama_llama3"
-    "test_custom_llm_with_langchain"
-    "test_custom_llm_temperature_preservation"
+    "test_agent_execute_task_with_ollama"
+    "test_agent_execute_task_with_tool"
+    "test_agent_execution"
+    "test_agent_execution_with_specific_tools"
+    "test_agent_execution_with_tools"
+    "test_agent_from_repository"
     "test_agent_from_repository_override_attributes"
     "test_agent_from_repository_with_invalid_tools"
+    "test_agent_function_calling_llm"
+    "test_agent_knowledege_with_crewai_knowledge"
+    "test_agent_moved_on_after_max_iterations"
+    "test_agent_powered_by_new_o_model_family_that_allows_skipping_tool"
+    "test_agent_powered_by_new_o_model_family_that_uses_tool"
+    "test_agent_remembers_output_format_after_using_tools_too_many_times"
+    "test_agent_repeated_tool_usage"
+    "test_agent_repeated_tool_usage_check_even_with_disabled_cache"
+    "test_agent_respect_the_max_rpm_set"
+    "test_agent_respect_the_max_rpm_set_over_crew_rpm"
+    "test_agent_step_callback"
+    "test_agent_use_specific_tasks_output_as_context"
+    "test_agent_with_knowledge_sources"
+    "test_agent_with_knowledge_with_no_crewai_knowledge"
+    "test_agent_with_ollama_llama3"
+    "test_agent_with_only_crewai_knowledge"
+    "test_agent_without_max_rpm_respects_crew_rpm"
+    "test_cache_hitting"
+    "test_custom_llm_temperature_preservation"
+    "test_custom_llm_with_langchain"
+    "test_disabling_cache_for_agent"
+    "test_do_not_allow_crewai_trigger_context_for_first_task_hierarchical"
+    "test_ensure_first_task_allow_crewai_trigger_context_is_false_does_not_inject"
+    "test_first_task_auto_inject_trigger"
+    "test_first_time_user_trace_collection_user_accepts"
+    "test_first_time_user_trace_collection_with_timeout"
+    "test_first_time_user_trace_consolidation_logic"
     "test_get_knowledge_search_query"
-    "test_agent_from_repository"
+    "test_handle_context_length_exceeds_limit_cli_no"
+    "test_llm_call"
+    "test_llm_call_with_all_attributes"
+    "test_llm_call_with_ollama_llama3"
+    "test_logging_tool_usage"
+    "test_task_allow_crewai_trigger_context"
+    "test_task_allow_crewai_trigger_context_no_payload"
+    "test_task_without_allow_crewai_trigger_context"
+    "test_tool_result_as_answer_is_the_final_answer_for_the_agent"
+    "test_tool_usage_information_is_appended_to_agent"
+    "test_trace_batch_marked_as_failed_on_finalize_error"
 
     # Tests lite agent - require API keys
     "test_guardrail_is_called_using_callable"
diff --git a/pkgs/development/python-modules/crispy-bootstrap3/default.nix b/pkgs/development/python-modules/crispy-bootstrap3/default.nix
index f7f09e8e6962..e7662f47548c 100644
--- a/pkgs/development/python-modules/crispy-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/crispy-bootstrap3/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "crispy_bootstrap3" ];
 
+  # Tests are broken on Django >= 5.1
+  # https://github.com/django-crispy-forms/crispy-bootstrap3/issues/12
+  doCheck = lib.versionOlder django.version "5.1";
+
   meta = with lib; {
     description = "Bootstrap 3 template pack for django-crispy-forms";
     homepage = "https://github.com/django-crispy-forms/crispy-bootstrap3";
diff --git a/pkgs/development/python-modules/crocoddyl/default.nix b/pkgs/development/python-modules/crocoddyl/default.nix
new file mode 100644
index 000000000000..5e5e449899f0
--- /dev/null
+++ b/pkgs/development/python-modules/crocoddyl/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  crocoddyl,
+
+  example-robot-data,
+  ffmpeg,
+  matplotlib,
+  nbconvert,
+  nbformat,
+  ipykernel,
+  python,
+  scipy,
+}:
+toPythonModule (
+  crocoddyl.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    # those are used by CMake at configure/build time
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+
+    propagatedBuildInputs = super.propagatedBuildInputs ++ [
+      crocoddyl
+      example-robot-data
+    ];
+
+    nativeCheckInputs = [
+      ffmpeg
+      pythonImportsCheckHook
+    ];
+
+    checkInputs = [
+      matplotlib
+      nbconvert
+      nbformat
+      ipykernel
+      scipy
+    ];
+
+    pythonImportsCheck = [
+      "crocoddyl"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 074a18526902..d9b3a68715ae 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "45.0.4"; # Also update the hash in vectors.nix
+  version = "46.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,12 +31,12 @@ buildPythonPackage rec {
     owner = "pyca";
     repo = "cryptography";
     tag = version;
-    hash = "sha256-rKgMUVj5IdeWIdLWQ4E6zhC6dwJMi+BRHCh2JG73Zgc=";
+    hash = "sha256-gsEHKEYiMw2eliEpxwzFGDetOp77PivlMoBD3HBbbFA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-dKwNnWBzBM9QEcRbbvkNhFJnFxFakqZ/MS7rqE8/tNQ=";
+    hash = "sha256-aCQzY2gBjVVwiqlqAxkH4y6yf4lqdQuSEnQSIjLPRJg=";
   };
 
   postPatch = ''
@@ -83,7 +83,7 @@ buildPythonPackage rec {
     vectors = cryptography-vectors;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Package which provides cryptographic recipes and primitives";
     longDescription = ''
       Cryptography includes both high level recipes and low level interfaces to
@@ -91,13 +91,12 @@ buildPythonPackage rec {
       digests, and key derivation functions.
     '';
     homepage = "https://github.com/pyca/cryptography";
-    changelog =
-      "https://cryptography.io/en/latest/changelog/#v" + replaceStrings [ "." ] [ "-" ] version;
-    license = with licenses; [
+    changelog = "https://cryptography.io/en/latest/changelog/#v" + lib.replaceString "." "-" version;
+    license = with lib.licenses; [
       asl20
       bsd3
       psfl
     ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
 }
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 73e4f2c75f70..f8614e08a240 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -1,24 +1,31 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
   cryptography,
-  flit-core,
+  fetchpatch2,
+  uv-build,
 }:
 
 buildPythonPackage rec {
   pname = "cryptography-vectors";
   # The test vectors must have the same version as the cryptography package
-  inherit (cryptography) version;
+  inherit (cryptography) version src;
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "cryptography_vectors";
-    inherit version;
-    hash = "sha256-+7BAjfj/LSs9vSkovFt/7r/dNvsJL6h5DVd4qbmh+e8=";
-  };
+  sourceRoot = "${src.name}/vectors";
 
-  build-system = [ flit-core ];
+  patches = [
+    # https://github.com/NixOS/nixpkgs/pull/449568
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/pyca/cryptography/commit/5f311c1cbe09ddea6136b0bb737fb7df6df1b923.patch?full_index=1";
+      stripLen = 1;
+      includes = [ "pyproject.toml" ];
+      hash = "sha256-OdHK0OGrvOi3mS0q+v8keDLvKxtgQkDkHQSYnmC/vd4=";
+    })
+  ];
+
+  build-system = [ uv-build ];
 
   # No tests included
   doCheck = false;
@@ -33,6 +40,6 @@ buildPythonPackage rec {
       asl20
       bsd3
     ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [ mdaniels5757 ];
   };
 }
diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock
index d3758752bdca..94af65d4e777 100644
--- a/pkgs/development/python-modules/css-inline/Cargo.lock
+++ b/pkgs/development/python-modules/css-inline/Cargo.lock
@@ -2,33 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -38,27 +17,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets",
-]
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -67,9 +37,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "built"
@@ -87,12 +57,6 @@ version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -113,18 +77,19 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.30"
+version = "1.2.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -134,11 +99,10 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "windows-link",
@@ -177,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "css-inline"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cssparser",
  "html5ever",
@@ -193,7 +157,7 @@ dependencies = [
 
 [[package]]
 name = "css-inline-python"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "built",
  "css-inline",
@@ -284,6 +248,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -292,15 +262,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.5"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -365,15 +335,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.16"
@@ -383,35 +344,29 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -477,18 +432,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -513,9 +470,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
  "base64",
  "bytes",
@@ -529,7 +486,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -537,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -561,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -574,9 +531,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -587,11 +544,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -602,42 +558,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -647,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -668,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -678,19 +630,11 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
-
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
 dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
+ "rustversion",
 ]
 
 [[package]]
@@ -701,9 +645,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iri-string"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
 dependencies = [
  "memchr",
  "serde",
@@ -717,9 +661,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -727,37 +671,36 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "lru"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed"
+checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
 dependencies = [
  "hashbrown",
 ]
@@ -798,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -811,24 +754,15 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -846,15 +780,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -863,9 +788,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -873,22 +798,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-link",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "phf"
@@ -962,9 +887,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
  "zerovec",
 ]
@@ -986,18 +911,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
  "indoc",
  "libc",
@@ -1012,11 +937,10 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
@@ -1028,9 +952,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690"
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1038,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1050,9 +974,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1063,9 +987,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -1074,7 +998,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.5.10",
+ "socket2",
  "thiserror",
  "tokio",
  "tracing",
@@ -1083,12 +1007,12 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
  "bytes",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "lru-slab",
  "rand 0.9.2",
  "ring",
@@ -1104,23 +1028,23 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -1172,14 +1096,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -1187,9 +1111,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -1197,18 +1121,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.16"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.22"
+version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
 dependencies = [
  "base64",
  "bytes",
@@ -1258,12 +1182,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -1272,9 +1190,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustls"
-version = "0.23.29"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "once_cell",
  "ring",
@@ -1286,9 +1204,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
 dependencies = [
  "web-time",
  "zeroize",
@@ -1296,9 +1214,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.4"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1307,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -1325,46 +1243,57 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "selectors"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df44ba8a7ca7a4d28c589e04f526266ed76b6cc556e33fe69fa25de31939a65"
+checksum = "09975d3195f34dce9c7b381cb0f00c3c13381d4d3735c0f1a9c894b283b302ab"
 dependencies = [
  "bitflags",
  "cssparser",
  "derive_more",
- "fxhash",
  "log",
  "new_debug_unreachable",
  "phf",
  "phf_codegen",
  "precomputed-hash",
+ "rustc-hash",
  "servo_arc",
  "smallvec",
 ]
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1373,14 +1302,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.141"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1427,9 +1357,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "smallvec"
@@ -1439,29 +1369,19 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.10"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "string_cache"
@@ -1496,9 +1416,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1527,9 +1447,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "tendril"
@@ -1544,18 +1464,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1564,9 +1484,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -1574,9 +1494,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1589,26 +1509,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.47.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
- "slab",
- "socket2 0.6.0",
- "windows-sys 0.59.0",
+ "socket2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -1727,9 +1644,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
@@ -1745,13 +1662,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -1782,45 +1700,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1831,9 +1736,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1841,31 +1746,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1895,18 +1800,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
@@ -1917,9 +1822,9 @@ dependencies = [
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1928,9 +1833,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1939,24 +1844,24 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-result"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
@@ -1967,16 +1872,25 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
 ]
 
 [[package]]
@@ -1985,14 +1899,31 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -2001,42 +1932,84 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -2044,36 +2017,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.7.12"
+name = "windows_x86_64_msvc"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -2081,9 +2056,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2093,18 +2068,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2134,15 +2109,15 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -2151,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -2162,9 +2137,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix
index cb58bb88517a..50ca2b9ed9dc 100644
--- a/pkgs/development/python-modules/css-inline/default.nix
+++ b/pkgs/development/python-modules/css-inline/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "css-inline";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "css-inline";
     rev = "python-v${version}";
-    hash = "sha256-RclMgVJpK2dOtuFKearRMK8rpa6vFTa8T3Z+A7mk7Zs=";
+    hash = "sha256-sJOt7CX02uoECdki0iUZin4sAIgLafBLb5kjXEgYcYg=";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       cd bindings/python
       ln -s ${./Cargo.lock} Cargo.lock
     '';
-    hash = "sha256-WvUlumpXVLiu9htY07wfGyibro2StWgYF7XVW411ePw=";
+    hash = "sha256-LpknrrsIZ38NlQDMGpiA7cftspvCo/mQ8KAwKRkdVEc=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix
index 018490ff8dac..26de059fba7b 100644
--- a/pkgs/development/python-modules/ctranslate2/default.nix
+++ b/pkgs/development/python-modules/ctranslate2/default.nix
@@ -27,6 +27,11 @@ buildPythonPackage rec {
   # https://github.com/OpenNMT/CTranslate2/tree/master/python
   sourceRoot = "${src.name}/python";
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "pybind11==" "pybind11>="
+  '';
+
   build-system = [
     pybind11
     setuptools
diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix
new file mode 100644
index 000000000000..dd0a28ebe6f2
--- /dev/null
+++ b/pkgs/development/python-modules/cucumber-expressions/default.nix
@@ -0,0 +1,40 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytestCheckHook,
+  pyyaml,
+}:
+
+buildPythonPackage rec {
+  pname = "cucumber-expressions";
+  version = "18.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cucumber";
+    repo = "cucumber-expressions";
+    tag = "v${version}";
+    hash = "sha256-Mbf7bG7NvKFdv6kYPkd6UlPDJGjnK2GPl0qnLUhQ3es=";
+  };
+
+  sourceRoot = "${src.name}/python";
+
+  build-system = [ poetry-core ];
+
+  pythonImportsCheck = [ "cucumber_expressions" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyyaml
+  ];
+
+  meta = {
+    changelog = "https://github.com/cucumber/cucumber-expressions/blob/${src.tag}/CHANGELOG.md";
+    description = "Human friendly alternative to Regular Expressions";
+    homepage = "https://github.com/cucumber/cucumber-expressions/tree/main/python";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index f1527a2dd8cf..fbf48fe98d2b 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -17,41 +17,36 @@
 let
   inherit (cudaPackages) cudnn;
 
-  shouldUsePkg =
-    pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
+  shouldUsePkg = lib.mapNullable (pkg: if pkg.meta.available or true then pkg else null);
 
   # some packages are not available on all platforms
   cuda_nvprof = shouldUsePkg (cudaPackages.nvprof or null);
-  cutensor = shouldUsePkg (cudaPackages.cutensor or null);
+  libcutensor = shouldUsePkg (cudaPackages.libcutensor or null);
   nccl = shouldUsePkg (cudaPackages.nccl or null);
 
-  outpaths = with cudaPackages; [
-    cuda_cccl # <nv/target>
-    cuda_cudart
-    cuda_nvcc # <crt/host_defines.h>
-    cuda_nvprof
-    cuda_nvrtc
-    cuda_nvtx
-    cuda_profiler_api
-    libcublas
-    libcufft
-    libcurand
-    libcusolver
-    libcusparse
-
-    # Missing:
-    # cusparselt
-  ];
+  outpaths = lib.filter (outpath: outpath != null) (
+    with cudaPackages;
+    [
+      cuda_cccl # <nv/target>
+      cuda_cudart
+      cuda_nvcc # <crt/host_defines.h>
+      cuda_nvprof
+      cuda_nvrtc
+      cuda_nvtx
+      cuda_profiler_api
+      libcublas
+      libcufft
+      libcurand
+      libcusolver
+      libcusparse
+      # NOTE: libcusparse_lt is too new for CuPy, so we must do without.
+      # libcusparse_lt
+    ]
+  );
   cudatoolkit-joined = symlinkJoin {
     name = "cudatoolkit-joined-${cudaPackages.cudaMajorMinorVersion}";
     paths =
-      outpaths
-      ++ lib.concatMap (f: lib.map f outpaths) [
-        lib.getLib
-        lib.getDev
-        (lib.getOutput "static")
-        (lib.getOutput "stubs")
-      ];
+      outpaths ++ lib.concatMap (outpath: lib.map (output: outpath.${output}) outpath.outputs) outpaths;
   };
 in
 buildPythonPackage rec {
@@ -69,6 +64,11 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
+  env.LDFLAGS = toString [
+    # Fake libcuda.so (the real one is deployed impurely)
+    "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"
+  ];
+
   # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Setting both
   # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in
   # a small amount of thrashing but it turns out there are a large number of
@@ -87,17 +87,17 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     addDriverRunpath
-    cudaPackages.cuda_nvcc
+    cudatoolkit-joined
   ];
 
   buildInputs = [
     cudatoolkit-joined
     cudnn
-    cutensor
+    libcutensor
     nccl
   ];
 
-  NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
+  # NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
   CUDA_PATH = "${cudatoolkit-joined}";
 
   dependencies = [
diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 79db35a65e95..ac1eb455aa11 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  addBinToPathHook,
   curl-impersonate-chrome,
   cffi,
   certifi,
@@ -24,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.12.0";
+  version = "0.14.0b2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     tag = "v${version}";
-    hash = "sha256-VE/b1Cs/wpZlu7lOURT/QfP7DuNudD441zG603LT4LM=";
+    hash = "sha256-JXfqZTf26kl2P0OMAw/aTdjQaGtdyTpNnhRPlwMiZNw=";
   };
 
   patches = [ ./use-system-libs.patch ];
@@ -47,13 +48,10 @@ buildPythonPackage rec {
     certifi
   ];
 
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-  };
-
   pythonImportsCheck = [ "curl_cffi" ];
 
   nativeCheckInputs = [
+    addBinToPathHook
     charset-normalizer
     cryptography
     fastapi
@@ -81,6 +79,8 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # test accesses network
     "tests/unittest/test_smoke.py::test_async"
+    # Runs out of memory while testing
+    "tests/unittest/test_websockets.py"
   ];
 
   disabledTests = [
@@ -97,11 +97,11 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/lexiforest/curl_cffi/releases/tag/${src.tag}";
     description = "Python binding for curl-impersonate via cffi";
     homepage = "https://curl-cffi.readthedocs.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chuangzhu ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ chuangzhu ];
   };
 }
diff --git a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch
index 3dcec2e14c7c..6d30a47f0382 100644
--- a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch
+++ b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch
@@ -1,8 +1,6 @@
-diff --git a/scripts/build.py b/scripts/build.py
-index b705a0d..9bfcaab 100644
 --- a/scripts/build.py
 +++ b/scripts/build.py
-@@ -105,7 +105,6 @@ def get_curl_libraries():
+@@ -141,7 +141,6 @@ def get_curl_libraries():
  ffibuilder = FFI()
  system = platform.system()
  root_dir = Path(__file__).parent.parent
@@ -10,7 +8,7 @@ index b705a0d..9bfcaab 100644
  
  
  ffibuilder.set_source(
-@@ -114,9 +113,7 @@ ffibuilder.set_source(
+@@ -150,9 +149,7 @@ ffibuilder.set_source(
          #include "shim.h"
      """,
      # FIXME from `curl-impersonate`
diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index c75afbef5cfa..769f80d5dd41 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "cwcwidth";
-  version = "0.1.10";
+  version = "0.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sebastinas";
     repo = "cwcwidth";
     tag = "v${version}";
-    hash = "sha256-JrzItV+nCpQCz9MM1pcq5FtGZOsWNbgAra6i5WT4Mcg=";
+    hash = "sha256-mkyBtqAFqu7dxpb46qMOnXmXpUV3qtpknfIgVQQt5nY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 593485dbef97..277f0afd13cb 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -11,7 +11,6 @@
   py-serializable,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   requirements-parser,
   sortedcontainers,
   setuptools,
@@ -23,16 +22,14 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "11.2.0";
+  version = "11.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     tag = "v${version}";
-    hash = "sha256-HfHZKOae83ASym1MSlVb0+aVWpyziDgQEQxLzWMM/MQ=";
+    hash = "sha256-AN3PjJ1HAERDXlmE9K8k2OGLAh5vs1286EhJShH0xE4=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];
diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index f01ac6e888cc..62a88b1521eb 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -4,12 +4,11 @@
   buildPythonPackage,
   docstring-parser,
   fetchFromGitHub,
-  poetry-core,
-  poetry-dynamic-versioning,
+  hatchling,
+  hatch-vcs,
   pydantic,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   rich-rst,
   rich,
@@ -18,21 +17,19 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.24.0";
+  version = "4.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-gJflZBH3xCGKffKGt7y1xGXQR8C1wK19LnbunZ0kbAc=";
+    hash = "sha256-dBI7ax7ljmCrE7ymcMa/B9uMtLyRTC42unrKBJ9QYQg=";
   };
 
   build-system = [
-    poetry-core
-    poetry-dynamic-versioning
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [
@@ -51,15 +48,19 @@ buildPythonPackage rec {
     pydantic
     pytest-mock
     pytestCheckHook
-    pyyaml
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cyclopts" ];
 
   disabledTests = [
-    # Assertion error
-    "test_pydantic_error_msg"
+    # Test requires bash
+    "test_positional_not_treated_as_command"
+  ];
+
+  disabledTestPaths = [
+    # Tests requires sphinx
+    "tests/test_sphinx_ext.py"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 090a8fccd1da..839e3cfd2385 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cysignals";
-  version = "1.12.5";
+  version = "1.12.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "cysignals";
     tag = version;
-    hash = "sha256-y7CA0aih2vATLz0Fhwf19/wRw6GnQvNhGo9lS4+VrgI=";
+    hash = "sha256-uZNKmnn1Jf1pERdG4bywpAUClKMw3og+7Q5B0yPlqEY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index c31044550c72..c7ccfa5295cc 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "cython";
-  version = "3.1.2";
+  version = "3.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cython";
     repo = "cython";
     tag = version;
-    hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y=";
+    hash = "sha256-qFj7w0fQY6X1oADLsAgwFefzx92/Pmgv9j5S6v0sdPg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/dashscope/default.nix b/pkgs/development/python-modules/dashscope/default.nix
index 97a7ae8a5085..eafc7554d17f 100644
--- a/pkgs/development/python-modules/dashscope/default.nix
+++ b/pkgs/development/python-modules/dashscope/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dashscope";
-  version = "1.24.6";
+  version = "1.24.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dashscope";
     repo = "dashscope-sdk-python";
     tag = "v${version}";
-    hash = "sha256-kHvNg8yPlZyAr7Qgncv+axgG9sOKTjvxYnRojO5ih1g=";
+    hash = "sha256-Mb36V0yGYPblNXnAYa24yd7YJXsjWTErl+VVvBTZ1j8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index 929ce2972247..28c9fd9be2de 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "dask-awkward";
-  version = "2025.5.0";
+  version = "2025.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-awkward";
     tag = version;
-    hash = "sha256-TLMT7YxedBUfz05F8wTsS5LQ9LyBbcUhQENM8C7Xric=";
+    hash = "sha256-7z9SkkE4WqULW0m7lk+oohq1uwSO7XLcrnh6U7wqTgo=";
   };
 
   build-system = [
@@ -88,5 +88,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
+    # dask-awkward is incompatible with recent dask versions.
+    # See https://github.com/dask-contrib/dask-awkward/pull/582 for context.
+    broken = lib.versionAtLeast dask.version "2025.4.0";
   };
 }
diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index fd60adb945d1..af46945b5197 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -5,6 +5,7 @@
 
   # build-system
   setuptools,
+  setuptools-scm,
 
   # dependencies
   click,
@@ -38,30 +39,20 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2025.7.0";
+  version = "2025.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask";
     tag = version;
-    hash = "sha256-bwM4Q95YTEp9pDz6LmBLOeYjmi8nH8Cc/srZlXfEIlg=";
+    hash = "sha256-cU4w4dqJQ3ew+fRyD7Lc4URNfW738kKqls6k6j65pIo=";
   };
 
-  postPatch = ''
-    # versioneer hack to set version of GitHub package
-    echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
-
-    substituteInPlace setup.py \
-      --replace-fail "import versioneer" "" \
-      --replace-fail "version=versioneer.get_version()," "version='${version}'," \
-      --replace-fail "cmdclass=versioneer.get_cmdclass()," ""
-
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "versioneer[toml]==0.29"' ""
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     click
@@ -121,11 +112,6 @@ buildPythonPackage rec {
     "network"
   ];
 
-  disabledTests = [
-    # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`.
-    "test_set_index_head_nlargest_string"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/dataclass-factory/default.nix b/pkgs/development/python-modules/dataclass-factory/default.nix
index 83de3f721832..cdb50a5e970b 100644
--- a/pkgs/development/python-modules/dataclass-factory/default.nix
+++ b/pkgs/development/python-modules/dataclass-factory/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/reagento/dataclass-factory";
     changelog = "https://github.com/reagento/dataclass-factory/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index c335d6a75b5e..4eff6daf3a68 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -51,19 +51,17 @@
 
 buildPythonPackage rec {
   pname = "datalad";
-  version = "1.2.1";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datalad";
     tag = version;
-    hash = "sha256-QcKhMiJNlETlxmRoPwKKGYK7zKbJ0pQpbRZDyJ+yrN0=";
+    hash = "sha256-VkHTX0j963N2HMwHoJv8M314SykXFB9u4eqIUDeJ+tw=";
   };
 
   postPatch = ''
-    substituteInPlace datalad/distribution/create_sibling.py \
-      --replace-fail "/bin/ls" "${coreutils}/bin/ls"
     # Remove vendorized versioneer.py
     rm versioneer.py
   '';
@@ -119,9 +117,11 @@ buildPythonPackage rec {
 
   postInstall = ''
     installShellCompletion --cmd datalad \
-         --bash <($out/bin/datalad shell-completion) \
-         --zsh  <($out/bin/datalad shell-completion)
-    wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH"
+      --bash <($out/bin/datalad shell-completion) \
+      --zsh  <($out/bin/datalad shell-completion)
+    wrapProgram $out/bin/datalad \
+      --prefix PATH : "${git-annex}/bin" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
   '';
 
   preCheck = ''
@@ -240,6 +240,9 @@ buildPythonPackage rec {
     description = "Keep code, data, containers under control with git and git-annex";
     homepage = "https://www.datalad.org";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ renesat ];
+    maintainers = with lib.maintainers; [
+      renesat
+      malik
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/ddgs/default.nix b/pkgs/development/python-modules/ddgs/default.nix
index f4381e115d1b..1ea9935b25e0 100644
--- a/pkgs/development/python-modules/ddgs/default.nix
+++ b/pkgs/development/python-modules/ddgs/default.nix
@@ -4,30 +4,48 @@
   fetchFromGitHub,
   setuptools,
   click,
-  primp,
   lxml,
+  httpx,
+  h2,
   versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "ddgs";
-  version = "9.5.5";
+  version = "9.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "deedy5";
     repo = "ddgs";
     tag = "v${version}";
-    hash = "sha256-Pwl6fCEBj+eUXYEf4wCTw1fpKZh3j4IVC6SW0Vqcmf4=";
+    hash = "sha256-NaOwklHea3TUDa2M23X549IiX5zP87N9qWKkr5PObLY=";
   };
 
+  patches = [
+    # We're removing the HTTP client primp below for security reasons,
+    # but can use the already included httpx instead.
+    # Note that while httpx is only used for HTTP/2 by upstream,
+    # it can handle HTTP/1.1 just fine as well.
+    ./replace-primp.patch
+  ];
+
+  pythonRemoveDeps = [
+    # primp requires a very outdated, potentially insecure version of boringssl
+    "primp"
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
     click
-    primp
     lxml
-  ];
+    httpx
+    h2
+  ]
+  ++ httpx.optional-dependencies.http2
+  ++ httpx.optional-dependencies.socks
+  ++ httpx.optional-dependencies.brotli;
 
   nativeCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "version";
diff --git a/pkgs/development/python-modules/ddgs/replace-primp.patch b/pkgs/development/python-modules/ddgs/replace-primp.patch
new file mode 100644
index 000000000000..b7c5ed81da6c
--- /dev/null
+++ b/pkgs/development/python-modules/ddgs/replace-primp.patch
@@ -0,0 +1,39 @@
+diff --git a/ddgs/base.py b/ddgs/base.py
+index e964511..34d1c4f 100644
+--- a/ddgs/base.py
++++ b/ddgs/base.py
+@@ -11,7 +11,7 @@ from typing import Any, Generic, Literal, TypeVar
+ from lxml import html
+ from lxml.etree import HTMLParser as LHTMLParser
+ 
+-from .http_client import HttpClient
++from .http_client2 import HttpClient2 as HttpClient
+ from .results import BooksResult, ImagesResult, NewsResult, TextResult, VideosResult
+ 
+ logger = logging.getLogger(__name__)
+diff --git a/ddgs/cli.py b/ddgs/cli.py
+index d295f77..38adb71 100644
+--- a/ddgs/cli.py
++++ b/ddgs/cli.py
+@@ -12,11 +12,11 @@ from typing import Any
+ from urllib.parse import unquote
+ 
+ import click
+-import primp
+ 
+ from . import __version__
+ from .ddgs import DDGS
+ from .utils import _expand_proxy_tb_alias, json_dumps
++from .http_client2 import HttpClient2
+ 
+ logger = logging.getLogger(__name__)
+ 
+@@ -101,7 +101,7 @@ def _sanitize_query(query: str) -> str:
+ 
+ def _download_file(url: str, dir_path: str, filename: str, proxy: str | None, verify: bool) -> None:
+     try:
+-        resp = primp.Client(proxy=proxy, impersonate="random", impersonate_os="random", timeout=10, verify=verify).get(
++        resp = HttpClient2(proxy=proxy, timeout=10, verify=verify).get(
+             url
+         )
+         if resp.status_code == 200:
diff --git a/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix b/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix
new file mode 100644
index 000000000000..40527a894cd4
--- /dev/null
+++ b/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dedupe-levenshtein-search";
+  version = "1.4.5";
+  pyproject = true;
+
+  # NOTE: This is a fork of mattandahalfew/Levenshtein_search created for MIT licensing.
+  # TODO: Evaluate if upstream version could be used instead.
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "Levenshtein_search";
+    tag = "v${version}";
+    hash = "sha256-YhsZA28H4OUkQEBtJ+9OXJld4Z/PJbOPqAQQ9qaXSjk=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "Levenshtein_search"
+  ];
+
+  meta = {
+    description = "Search through documents for approximately matching strings using Levenshtein distance";
+    homepage = "https://github.com/dedupeio/Levenshtein_search";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix
new file mode 100644
index 000000000000..83b031473cd9
--- /dev/null
+++ b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dedupe-pylbfgs";
+  version = "0.2.0.16";
+  pyproject = true;
+
+  # NOTE: This is a fork of larsmans/pylbfgs maintained by dedupeio
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "pylbfgs";
+    tag = "${version}";
+    hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  # Prevent importing from source during test collection (only $out has compiled extensions)
+  preCheck = ''
+    rm -rf lbfgs
+  '';
+
+  pythonImportsCheck = [
+    "lbfgs"
+  ];
+
+  meta = {
+    description = "Python wrapper for L-BFGS and OWL-QN optimization algorithms";
+    homepage = "https://github.com/dedupeio/pylbfgs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/dedupe/default.nix b/pkgs/development/python-modules/dedupe/default.nix
new file mode 100644
index 000000000000..fd8f38f70d4b
--- /dev/null
+++ b/pkgs/development/python-modules/dedupe/default.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # dependencies
+  affinegap,
+  btrees,
+  categorical-distance,
+  dedupe-levenshtein-search,
+  doublemetaphone,
+  haversine,
+  highered,
+  numpy,
+  scikit-learn,
+  simplecosine,
+  zope-index,
+  dedupe,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+  python,
+  runCommand,
+}:
+
+buildPythonPackage rec {
+  pname = "dedupe";
+  version = "3.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "dedupe";
+    tag = "v${version}";
+    hash = "sha256-tfBJeaeZw5w5OwM+AOfy9H6P2zbShjN/kuzEbpxATHI=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  dependencies = [
+    affinegap
+    btrees
+    categorical-distance
+    dedupe-levenshtein-search
+    doublemetaphone
+    haversine
+    highered
+    numpy
+    scikit-learn
+    simplecosine
+    zope-index
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  # Remove source directory so pytest imports compiled extension from $out
+  preCheck = ''
+    rm -rf dedupe
+  '';
+
+  pythonImportsCheck = [
+    "dedupe"
+  ];
+
+  passthru.tests.benchmarks =
+    runCommand "dedupe-benchmarks-test"
+      {
+        nativeBuildInputs = [ (python.withPackages (ps: [ dedupe ])) ];
+      }
+      ''
+        # Copy benchmarks to writable location
+        cp -r ${src}/benchmarks benchmarks
+        chmod -R +w benchmarks
+        cd benchmarks
+
+        # Run all three canonical benchmarks
+        for benchmark in canonical canonical_gazetteer canonical_matching; do
+          echo "Running $benchmark benchmark..."
+          # Redirect stderr to /dev/null (`2>/dev/null`) to suppress Python 3.13
+          # multiprocessing resource tracker warnings from scikit-learn/joblib subprocesses
+          # `|| exit 1` provides fail-fast behavior: exit immediately if any benchmark fails
+          PYTHONPATH=$PWD python -m benchmarks.$benchmark 2>/dev/null || exit 1
+        done
+
+        touch $out
+      '';
+
+  meta = {
+    description = "Library for accurate and scalable fuzzy matching, deduplication and entity resolution";
+    homepage = "https://github.com/dedupeio/dedupe";
+    changelog = "https://github.com/dedupeio/dedupe/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 13bcf901bdca..72381b0567a4 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -15,13 +15,14 @@
   pytestCheckHook,
   pythonOlder,
   rustPlatform,
+  syrupy,
   testfixtures,
   xz,
 }:
 
 buildPythonPackage rec {
   pname = "deebot-client";
-  version = "15.1.0";
+  version = "16.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -30,12 +31,12 @@ buildPythonPackage rec {
     owner = "DeebotUniverse";
     repo = "client.py";
     tag = version;
-    hash = "sha256-ey7xr9ejDFwfSNwhNBmI2/oJ6zoeAmyTsByxLQ3MQe4=";
+    hash = "sha256-FjUHYG0AkZ/AS1jZhPc28f8rnjuWIyRpumnRnDaoRqY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-28Rkm5doYRtrH+Rc64gYxzNwVjBaGzLTynej8OwBqVg=";
+    hash = "sha256-jAycxAxSSWwDNhtdvSCLujMsa7dMQ1lFLtMtVsKHdvk=";
   };
 
   pythonRelaxDeps = [
@@ -66,6 +67,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-codspeed
     pytestCheckHook
+    syrupy
     testfixtures
   ];
 
diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix
index 13cf85e85ead..d9486df7d5ec 100644
--- a/pkgs/development/python-modules/deepl/default.nix
+++ b/pkgs/development/python-modules/deepl/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "deepl";
-  version = "1.23.0";
+  version = "1.24.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-T1TfU014I91osL6sdPyvYDWiJjLkrJSeasryT9riDuM=";
+    hash = "sha256-oPyCqgnSpqY5H1QrorkDS0FfqjhsCaKXwxclNor3ePs=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 957cce7a860d..b1b338c707c6 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -19,18 +19,16 @@
 
 buildPythonPackage rec {
   pname = "denonavr";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ol-iver";
     repo = "denonavr";
     tag = version;
-    hash = "sha256-r8Gg7mZwEiSq1iFQJXLb9xCb/iYxTbaCKGBH2EDZQqs=";
+    hash = "sha256-/GhlSZhl4VAl0em3QLolSRS0wZQeOhhF+B/91ohqVPw=";
   };
 
-  pythonRelaxDeps = [ "defusedxml" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -52,11 +50,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "denonavr" ];
 
-  meta = with lib; {
+  meta = {
     description = "Automation Library for Denon AVR receivers";
     homepage = "https://github.com/ol-iver/denonavr";
     changelog = "https://github.com/ol-iver/denonavr/releases/tag/${src.tag}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/depyf/default.nix b/pkgs/development/python-modules/depyf/default.nix
index a59dec3ac9ff..dc29c21c2840 100644
--- a/pkgs/development/python-modules/depyf/default.nix
+++ b/pkgs/development/python-modules/depyf/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "depyf";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "thuml";
     repo = "depyf";
     tag = "v${version}";
-    hash = "sha256-AGM5Pm0hhqOX9CY7dFijZLqhWmY7xnmKWakh4MUtOMs=";
+    hash = "sha256-GFNlJeD7Nyxr7Ya3aSA6+0AZJSaeDyqXYPEsvhPN1wg=";
   };
 
   # don't try to read git commit
diff --git a/pkgs/development/python-modules/developer-disk-image/default.nix b/pkgs/development/python-modules/developer-disk-image/default.nix
new file mode 100644
index 000000000000..c9fb5931e337
--- /dev/null
+++ b/pkgs/development/python-modules/developer-disk-image/default.nix
@@ -0,0 +1,45 @@
+{
+  buildPythonPackage,
+  fetchPypi,
+  lib,
+  pytestCheckHook,
+  requests,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "developer-disk-image";
+  version = "0.2.0";
+  pyproject = true;
+
+  # GitHub archive is way too large
+  src = fetchPypi {
+    pname = "developer_disk_image";
+    inherit version;
+    hash = "sha256-21aLIuwznYtWsprptCAjDq4yL+ab50zZn9Dv+w7y4o8=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    requests
+  ];
+
+  pythonImportsCheck = [ "developer_disk_image" ];
+
+  # tests connect to github.com
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/doronz88/DeveloperDiskImage/releases/tag/v${version}";
+    description = "Download DeveloperDiskImage ans Personalized images from GitHub";
+    homepage = "https://github.com/doronz88/DeveloperDiskImage";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "developer_disk_image";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index ecd3ccb2f695..ae8d406c4e2d 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.139";
+  version = "0.0.147";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-9SGzCWRaZaH5FxffpL2eaGHewlEbuyI9yxZs5NRZq9g=";
+    hash = "sha256-sbMQ9izDOzrQOoYKpSLWO/+W2/3bGMhlyFP34oOff5g=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index db117b6a05af..cb0bc96793e1 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -6,7 +6,6 @@
   # build-system
   setuptools,
   setuptools-scm,
-  versioneer,
 
   # dependencies
   click,
@@ -28,28 +27,20 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2025.7.0";
+  version = "2025.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "distributed";
     tag = version;
-    hash = "sha256-np4hCamNTbnmLdfjFeHsxEEm9XI1O0kOczDe1YjSziw=";
+    hash = "sha256-b6kVrRPGbPyss0Wl56qQFjZOznLH9Y3HQlEHo9d6X9I=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "versioneer[toml]==" "versioneer[toml]>=" \
-      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
-  '';
-
   build-system = [
     setuptools
     setuptools-scm
-    versioneer
-  ]
-  ++ versioneer.optional-dependencies.toml;
+  ];
 
   pythonRelaxDeps = [ "dask" ];
 
diff --git a/pkgs/development/python-modules/distro-info/default.nix b/pkgs/development/python-modules/distro-info/default.nix
new file mode 100644
index 000000000000..debef819aef3
--- /dev/null
+++ b/pkgs/development/python-modules/distro-info/default.nix
@@ -0,0 +1,45 @@
+{
+  buildPythonPackage,
+  distro-info-data,
+  fetchurl,
+  lib,
+  setuptools,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "distro-info";
+  version = "1.14";
+  pyproject = true;
+
+  # Not using fetchFromGitLab because it incorrectly sets
+  # SOURCE_DATE_EPOCH=315619200 (1980-01-02) and breaks tests.
+  src = fetchurl {
+    url = "https://salsa.debian.org/debian/distro-info/-/archive/debian/${version}/distro-info-debian-${version}.tar.gz";
+    hash = "sha256-nRLTlDPnll1jvwfg9FSxs9TmImvQkn9DVqSRSOKTAGI=";
+  };
+
+  postPatch = ''
+    substituteInPlace python/distro_info.py \
+      --replace-fail /usr/share/distro-info ${distro-info-data}/share/distro-info
+  '';
+
+  build-system = [ setuptools ];
+  pypaBuildFlags = "python";
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+  preCheck = ''
+    cd python
+    rm distro_info_test/test_flake8.py distro_info_test/test_pylint.py
+  '';
+
+  meta = {
+    description = "Information about Debian and Ubuntu releases";
+    homepage = "https://salsa.debian.org/debian/distro-info";
+    changelog = "https://salsa.debian.org/debian/distro-info/-/blob/debian/${version}/debian/changelog";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ andersk ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/python-modules/django-bootstrap3/default.nix b/pkgs/development/python-modules/django-bootstrap3/default.nix
index 62abd28fde23..cc9d493ad8f0 100644
--- a/pkgs/development/python-modules/django-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap3/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   uv-build,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
     hash = "sha256-TaB2PeBjmCNFuEZ+To2Q3C6zlFCaaTB70LxQWWb5AEo=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/zostera/django-bootstrap3/commit/5e1a86549e9607b8e2a9772a3a839fc81b9ae6c0.patch?full_index=1";
+      hash = "sha256-VcRC7ehyVTl0KuovD8tNCbZnKXKCOGpux1XXUOoDaTw=";
+    })
+  ];
+
   build-system = [ uv-build ];
 
   dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-bootstrap4/default.nix b/pkgs/development/python-modules/django-bootstrap4/default.nix
index 389aaf503a41..151aaea4894d 100644
--- a/pkgs/development/python-modules/django-bootstrap4/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap4/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   uv-build,
@@ -29,6 +30,14 @@ buildPythonPackage rec {
     hash = "sha256-+G9UHW4eUGl00A/kDj+iTP7ehjj/dwUENKffvGxE6/4=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/zostera/django-bootstrap4/commit/09b14bc9b70e7da92200c4bc014e2d3c597f0ea6.patch?full_index=1";
+      hash = "sha256-ZW9y8n0ZCOP37EoP32e7ue6h93KgGw1pW8Q1Q8IuNk8=";
+    })
+  ];
+
   build-system = [ uv-build ];
 
   dependencies = [ beautifulsoup4 ];
diff --git a/pkgs/development/python-modules/django-bootstrap5/default.nix b/pkgs/development/python-modules/django-bootstrap5/default.nix
index a3a67ada4c95..538d2adc202e 100644
--- a/pkgs/development/python-modules/django-bootstrap5/default.nix
+++ b/pkgs/development/python-modules/django-bootstrap5/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   django,
   fetchFromGitHub,
+  fetchpatch2,
   jinja2,
   pillow,
   pytest-django,
@@ -23,6 +24,14 @@ buildPythonPackage rec {
     hash = "sha256-aqP2IkAkZsw5vbQxhiy9L3giSgb0seub9gsxPTajiXo=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/zostera/django-bootstrap5/commit/d1d54f5fc8041d2781189321402b4f3937f77913.patch?full_index=1";
+      hash = "sha256-cFOY+pu2TAZXpAipSIQh1nPPC0ipfncvpObcH667+ac=";
+    })
+  ];
+
   build-system = [ uv-build ];
 
   dependencies = [ django ];
diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix
index 95a359023de2..b002566bfa33 100644
--- a/pkgs/development/python-modules/django-crispy-forms/default.nix
+++ b/pkgs/development/python-modules/django-crispy-forms/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-crispy-forms";
-  version = "2.4";
+  version = "2.5";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "django-crispy-forms";
     tag = version;
-    hash = "sha256-YV7XUv5N2Xcf79/8EdI7XnVtpiX+yQBhQumSUbZmOfc=";
+    hash = "sha256-UZw860dOmQOAHcOPn5JO5OPe0kei4Mivy5FTh25Zo1s=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix
index 84c68dda3a03..d8e2c79568b7 100644
--- a/pkgs/development/python-modules/django-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "django-debug-toolbar";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = "django-debug-toolbar";
     tag = version;
-    hash = "sha256-ZNevSqEpTdk0cZeMzOpbtatEiV9SAsVUlRb9YddcAGY=";
+    hash = "sha256-gDBir6xf4BBo3KwfVGEUo+Ve5vsmuB12cQqy9sdXSUg=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index 15890451fe7a..1985e90bda49 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "django-import-export";
-  version = "4.3.10";
+  version = "4.3.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-import-export";
     repo = "django-import-export";
     tag = version;
-    hash = "sha256-amc5Qp3tdtqUGGN+DMT/r/CKMkMNnx5ryA+HlzQEejk=";
+    hash = "sha256-LE3eNHdPHFH4xVrMzQeOwRlJh4v7rmLTHdNGMQMgo6I=";
   };
 
   pythonRelaxDeps = [ "tablib" ];
diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
index 2f7cfff01122..bace45bf13c9 100644
--- a/pkgs/development/python-modules/django-mfa3/default.nix
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-mfa3";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xi";
     repo = "django-mfa3";
     tag = version;
-    hash = "sha256-bgIzrSM8KP6uQHvn393NWYw9DODdHLMqKn6pgw3EG/w=";
+    hash = "sha256-J31NiqOysOS6FFDCaCiPAJUBvD0Xu99sIykLxfk0M3U=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-postgres-extra/default.nix b/pkgs/development/python-modules/django-postgres-extra/default.nix
new file mode 100644
index 000000000000..2dd99612fe02
--- /dev/null
+++ b/pkgs/development/python-modules/django-postgres-extra/default.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+  python-dateutil,
+  # test dependencies
+  coverage,
+  dj-database-url,
+  freezegun,
+  postgresql,
+  psycopg2,
+  pytest,
+  pytest-benchmark,
+  pytest-cov,
+  pytest-django,
+  pytest-freezegun,
+  pytest-lazy-fixture,
+  pytestCheckHook,
+  syrupy,
+  tox,
+  types-psycopg2,
+}:
+buildPythonPackage rec {
+  pname = "django-postgres-extra";
+  version = "2.0.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SectorLabs";
+    repo = "django-postgres-extra";
+    rev = "v${version}";
+    hash = "sha256-/2qoXZ2f3un2cgJFAGMnQWBraJ7urkb0kHtcKKJsh6w=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    python-dateutil
+  ];
+
+  nativeCheckInputs = [
+    coverage
+    dj-database-url
+    freezegun
+    postgresql
+    psycopg2
+    pytest
+    pytest-benchmark
+    pytest-cov
+    pytest-django
+    pytest-freezegun
+    pytest-lazy-fixture
+    pytestCheckHook
+    syrupy
+    tox
+    types-psycopg2
+  ];
+
+  preCheck = ''
+    # Start Postgres.
+    export PGDATA="$NIX_BUILD_TOP/.postgres"
+    export PGHOST="$PGDATA/run"
+    export DATABASE_URL=postgresql://''${PGHOST//\//%2F}/psqlextra
+    initdb -E UTF8
+    mkdir -p "$PGDATA/run"
+    cat <<EOF >> "$PGDATA/postgresql.conf"
+    unix_socket_directories = '$PGDATA/run'
+    EOF
+    echo "CREATE DATABASE psqlextra" | postgres --single -E postgres
+    echo "Starting Postgres at $PGDATA" >&2
+    pg_ctl start -w
+  '';
+
+  postCheck = ''
+    echo "Stopping Postgres at $PGDATA" >&2
+    pg_ctl stop -w
+  '';
+
+  disabledTests = [
+    "test_management_command_partition_auto_confirm"
+    "test_management_command_partition_confirm_no"
+    "test_management_command_partition_confirm_yes"
+    "test_management_command_partition_dry_run"
+  ]
+  # tests incompatible with django>=5
+  ++ lib.optionals (lib.versionAtLeast django.version "5") [
+    "test_schema_editor_clone_model_to_schema"
+    "test_schema_editor_clone_model_to_schema_custom_constraint_names"
+  ]
+  # tests incompatible with django>=5.2
+  ++ lib.optionals (lib.versionAtLeast django.version "5.2") [
+    "test_query_annotate_rename_chain"
+  ];
+
+  pythonImportsCheck = [ "psqlextra" ];
+
+  meta = with lib; {
+    description = "Bringing all of PostgreSQL's awesomeness to Django";
+    homepage = "https://github.com/SectorLabs/django-postgres-extra";
+    changelog = "https://github.com/SectorLabs/django-postgres-extra/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ b4dm4n ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-tinymce/default.nix b/pkgs/development/python-modules/django-tinymce/default.nix
index a0eb660c1da9..39e7aff4b43d 100644
--- a/pkgs/development/python-modules/django-tinymce/default.nix
+++ b/pkgs/development/python-modules/django-tinymce/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "django-tinymce";
-  version = "4.1.0";
+  version = "5.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "django_tinymce";
-    hash = "sha256-AuO3DpQP0pnw++9DFa7lwYVmTh64zTlrF2ljlU5DV8k=";
+    hash = "sha256-YldmntWWrM9fqWf/MGEnayxTUrqsG7xlj82CUrEso4o=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/django-treenode/default.nix b/pkgs/development/python-modules/django-treenode/default.nix
new file mode 100644
index 000000000000..a445a478121d
--- /dev/null
+++ b/pkgs/development/python-modules/django-treenode/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+}:
+
+buildPythonPackage rec {
+  pname = "django-treenode";
+  version = "0.23.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fabiocaccamo";
+    repo = "django-treenode";
+    tag = version;
+    hash = "sha256-9AG8ntuXHB3jUHRKFDh7OOT5c0Nt8uAZnf5dR7xC/Bc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    django
+  ];
+
+  pythonImportsCheck = [
+    "treenode"
+  ];
+
+  meta = {
+    description = "Deciduous_tree: probably the best abstract model/admin for your tree based stuff";
+    homepage = "https://github.com/fabiocaccamo/django-treenode";
+    changelog = "https://github.com/fabiocaccamo/django-treenode/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ leona ];
+  };
+}
diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index 1d9693514dca..201c5546a2aa 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "django-webpack-loader";
-  version = "3.2.1";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-webpack";
     repo = "django-webpack-loader";
     tag = version;
-    hash = "sha256-2CmIaVDSZlqfSJVPVBmOcT89znjxQhe7ZHhe7i6DCGY=";
+    hash = "sha256-ZT+c6oYpES+3idHO1Dty3r8DHGNtD44ljEbBVOlEmW0=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 6cba9d6d9b65..570ee2e03b8b 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.24";
+  version = "4.2.26";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-zDPK30u2QFbHCqnlTMqF1w9iN2sPDphhyKU1u+Mp5ho=";
+    hash = "sha256-2NkkQcsY+BDvLGtvjYfGwgAK2S6LDbbcl7CwbwuF5a0=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/django/5_1.nix b/pkgs/development/python-modules/django/5_1.nix
index a5e7d9751df5..39f2df19b603 100644
--- a/pkgs/development/python-modules/django/5_1.nix
+++ b/pkgs/development/python-modules/django/5_1.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.13";
+  version = "5.1.14";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-y6wBMQ2BA6UUOJDWGhidCFwthtXZU2r0oGOUUSwKvQE=";
+    hash = "sha256-zRyI1aSRTyOjRogRj2Kgtr1jMPUTvoGHKypK2vQumhw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index bc2e730f56a4..52a828a21e09 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.7";
+  version = "5.2.8";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-rvnKa2+QabRtRfj0sauUsoxp0LJLUCmWrFs6ruVrz4k=";
+    hash = "sha256-ruzQ3CUNqHa0RmxCDBVXbtetkMvz+G/D4/LB/2aBc8I=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix
index 16a0ac09a369..86f0a0a027de 100644
--- a/pkgs/development/python-modules/djangocms-alias/default.nix
+++ b/pkgs/development/python-modules/djangocms-alias/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "djangocms-alias";
-  version = "2.0.5";
+  version = "3.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "djangocms-alias";
     tag = version;
-    hash = "sha256-sMMqX4+R4VZveIEV779WqYnZYH/fqZihyxFDAKwlWn0=";
+    hash = "sha256-70Gs+Ys26ypq5RXkPTxxMDFz/OCBvvAVnSIUQ3P1OV8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/dm-haiku/default.nix b/pkgs/development/python-modules/dm-haiku/default.nix
index 6e39b1e872ff..51745dfdc89a 100644
--- a/pkgs/development/python-modules/dm-haiku/default.nix
+++ b/pkgs/development/python-modules/dm-haiku/default.nix
@@ -36,17 +36,14 @@
 let
   dm-haiku = buildPythonPackage rec {
     pname = "dm-haiku";
-    version = "0.0.13";
+    version = "0.0.15";
     pyproject = true;
 
-    # ImportError: `haiku.experimental.flax` features require `flax` to be installed.
-    disabled = pythonAtLeast "3.13";
-
     src = fetchFromGitHub {
       owner = "deepmind";
       repo = "dm-haiku";
       tag = "v${version}";
-      hash = "sha256-RJpQ9BzlbQ4X31XoJFnsZASiaC9fP2AdyuTAGINhMxs=";
+      hash = "sha256-phJ0f+effHQzuAVtPBR0bY3C0p//LBY7k1ci4mXBGfU=";
     };
 
     patches = [
@@ -58,17 +55,6 @@ let
       })
     ];
 
-    # AttributeError: jax.core.Var was removed in JAX v0.6.0. Use jax.extend.core.Var instead, and
-    # see https://docs.jax.dev/en/latest/jax.extend.html for details.
-    # Already on master: https://github.com/google-deepmind/dm-haiku/commit/cfe8480d253a93100bf5e2d24c40435a95399c96
-    # TODO: remove at the next release
-    postPatch = ''
-      substituteInPlace haiku/_src/jaxpr_info.py \
-        --replace-fail "jax.core.JaxprEqn" "jax.extend.core.JaxprEqn" \
-        --replace-fail "jax.core.Var" "jax.extend.core.Var" \
-        --replace-fail "jax.core.Jaxpr" "jax.extend.core.Jaxpr"
-    '';
-
     build-system = [ setuptools ];
 
     dependencies = [
@@ -97,11 +83,12 @@ let
       dm-env
       dm-haiku
       dm-tree
+      flax
       jaxlib
       optax
       pytest-xdist
       pytestCheckHook
-      rlax
+      # rlax (broken dependency tensorflow-probability)
       tensorflow
     ];
 
@@ -120,11 +107,24 @@ let
       # other tests to fail.
       # https://jax.readthedocs.io/en/latest/notebooks/Common_Gotchas_in_JAX.html#double-64bit-precision
       "test_doctest_haiku.experimental"
+
+      # AssertionError: 1 != 0 : 1 doctests failed
+      "test_doctest_haiku"
+
+      # ValueError: pmap wrapped function must be passed at least one argument containing an array,
+      # got empty *args=() and **kwargs={}
+      "test_equivalent_when_passing_transformed_fn2"
+
+      # AssertionError: ValueError not raised
+      "test_passing_function_to_transform_pmap_transform"
+      "test_passing_function_to_transform_pmap_transform_with_state"
     ];
 
     disabledTestPaths = [
-      # Those tests requires a more recent version of tensorflow. The current one (2.13) is not enough.
-      "haiku/_src/integration/jax2tf_test.py"
+      # Require rlax which is unavailable as its dependency tensorflow-probability is broken
+      "examples/impala/actor_test.py"
+      "examples/impala/learner_test.py"
+      "examples/impala_lite_test.py"
     ];
 
     doCheck = false;
@@ -143,6 +143,7 @@ let
     meta = {
       description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet";
       homepage = "https://github.com/deepmind/dm-haiku";
+      changelog = "https://github.com/google-deepmind/dm-haiku/releases/tag/${src.tag}";
       license = lib.licenses.asl20;
       maintainers = with lib.maintainers; [ ndl ];
     };
diff --git a/pkgs/development/python-modules/dnf4/default.nix b/pkgs/development/python-modules/dnf4/default.nix
index 980e49b917b6..f1670daac402 100644
--- a/pkgs/development/python-modules/dnf4/default.nix
+++ b/pkgs/development/python-modules/dnf4/default.nix
@@ -18,7 +18,7 @@ in
 
 buildPythonPackage rec {
   pname = "dnf4";
-  version = "4.23.0";
+  version = "4.24.0";
   format = "other";
 
   outputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "rpm-software-management";
     repo = "dnf";
     tag = version;
-    hash = "sha256-qlOnFtEURhyxfsprhRaYUj141vZJp8qMjLpP1wGxikw=";
+    hash = "sha256-zzWOc2I9YW5gjsS2Umfx6GGgY4B3pdia0E2KHHtAH2s=";
   };
 
   patches = [ ./fix-python-install-dir.patch ];
diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index 469838fe4f2b..6204b0dd25e3 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "dnspython";
-  version = "2.7.0";
+  version = "2.8.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zpxDLtoNyRz2GKXO3xpOFCZRGWu80sgOie1akH5c+vE=";
+    hash = "sha256-GB08aZZFLLEYnEBGxhWZuEpahuCZVi/9530mmE/ybQ8=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 946c08e01cab..9c5cac247c5f 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.48.4";
+  version = "2.50.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-nGV0/8lL+JCGml8TF8+wBRax4WsAXQ0+f8fzy5k2gZI=";
+    hash = "sha256-pLIWskl5nXdOC5UwvfJ3Yhl8qV6jg42P89gLj7ASpTA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
index 6f4ec7aeeaa1..ab1a5f14f32a 100644
--- a/pkgs/development/python-modules/docling-parse/default.nix
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -102,5 +102,8 @@ buildPythonPackage rec {
     homepage = "https://github.com/DS4SD/docling-parse";
     license = lib.licenses.mit;
     maintainers = [ ];
+    # error: no matching conversion for functional-style cast from 'bool' to 'nlohmann::basic_json<>'
+    # See https://github.com/docling-project/docling-parse/issues/172 for context
+    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix
index 6b61c571a75f..118becabb980 100644
--- a/pkgs/development/python-modules/doorbirdpy/default.nix
+++ b/pkgs/development/python-modules/doorbirdpy/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "doorbirdpy";
-  version = "3.0.9";
+  version = "3.0.10";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "klikini";
     repo = "doorbirdpy";
     tag = version;
-    hash = "sha256-aa7u4x0WAFvCKPPGKJiZA/DYKKCa+xqabHxDMPxEbgo=";
+    hash = "sha256-7mA4yyvNPKOGb6Ap7kjCLhR7G1E1CQqgWCtAhciCnR4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/doublemetaphone/default.nix b/pkgs/development/python-modules/doublemetaphone/default.nix
new file mode 100644
index 000000000000..a5fe45fea786
--- /dev/null
+++ b/pkgs/development/python-modules/doublemetaphone/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "doublemetaphone";
+  version = "1.2i";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "doublemetaphone";
+    tag = "v${version}";
+    hash = "sha256-VPJqHxQHLiLSko+aJYTIgISluHPARgQN5pYWYxP9QKQ=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Prevent importing from source during test collection (only $out has compiled extensions)
+  preCheck = ''
+    rm -rf doublemetaphone
+  '';
+
+  pythonImportsCheck = [
+    "doublemetaphone"
+  ];
+
+  meta = {
+    description = "Python wrapper for Double Metaphone phonetic encoding algorithm";
+    homepage = "https://github.com/dedupeio/doublemetaphone";
+    license = lib.licenses.artistic1;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/dramatiq-abort/default.nix b/pkgs/development/python-modules/dramatiq-abort/default.nix
index b4130f701bfe..655d2da4ec0f 100644
--- a/pkgs/development/python-modules/dramatiq-abort/default.nix
+++ b/pkgs/development/python-modules/dramatiq-abort/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     gevent = [ gevent ];
     redis = [ redis ];
   };
diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix
index dc7fceebc45b..3f84bd653d9a 100644
--- a/pkgs/development/python-modules/dronecan/default.nix
+++ b/pkgs/development/python-modules/dronecan/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "dronecan";
-  version = "1.0.26";
+  version = "1.0.27";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-D2odxa9ADswrg6rgKLTyQulHpGec1r0lWRUZDV5YvyE=";
+    hash = "sha256-m6xfk/2pKfzbr0fu2GUjJnRcicoZDWzhrGJ6DDs2rBw=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/ducc0/default.nix b/pkgs/development/python-modules/ducc0/default.nix
index 34c9442bf4ae..f782562c94a6 100644
--- a/pkgs/development/python-modules/ducc0/default.nix
+++ b/pkgs/development/python-modules/ducc0/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "ducc0";
-  version = "0.39.0";
+  version = "0.39.1";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mtr";
     repo = "ducc";
     tag = "ducc0_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-VF4m0/kna1HEccK5ljFuNwXSYoak9TeFMyhBmUgupf0=";
+    hash = "sha256-8nM7Jnxx1NoQQwL0VyPGLzdq1UW5apjxKa1ksq2Qh6U=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index 38e87cef209a..cc87702bb703 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -2,14 +2,21 @@
   lib,
   stdenv,
   buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  cmake,
+  ninja,
   duckdb,
   fsspec,
   google-cloud-storage,
+  ipython,
   numpy,
   openssl,
   pandas,
   psutil,
+  pyarrow,
   pybind11,
+  scikit-build-core,
   setuptools-scm,
   pytest-reraise,
   pytestCheckHook,
@@ -17,43 +24,79 @@
 
 buildPythonPackage rec {
   inherit (duckdb)
-    patches
     pname
-    rev
-    src
     version
     ;
   pyproject = true;
 
-  postPatch = (duckdb.postPatch or "") + ''
-    # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
-    cd tools/pythonpkg
+  src = fetchFromGitHub {
+    owner = "duckdb";
+    repo = "duckdb-python";
+    tag = "v${version}";
+    hash = "sha256-cZyiTqu5iW/cqEo42b/XnOG7hJqtQs1h2RXXL392ujA=";
+  };
 
-    # 1. let nix control build cores
-    # 2. default to extension autoload & autoinstall disabled
-    substituteInPlace setup.py \
-      --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \
-      --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass"
+  postPatch = ''
+    # patch cmake to ignore absence of git submodule copy of duckdb
+    substituteInPlace cmake/duckdb_loader.cmake \
+      --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/external/duckdb"' \
+                     '"${duckdb.src}"'
 
+    # replace pybind11[global] with pybind11
     substituteInPlace pyproject.toml \
-      --replace-fail 'setuptools_scm>=6.4,<8.0' 'setuptools_scm'
+      --replace-fail "pybind11[global]" "pybind11"
+
+    # replace custom build backend with standard scikit-build-core
+    substituteInPlace pyproject.toml \
+      --replace-fail 'build-backend = "duckdb_packaging.build_backend"' \
+                     'build-backend = "scikit_build_core.build"' \
+      --replace-fail 'backend-path = ["./"]' \
+                     '# backend-path removed'
   '';
 
-  env = {
-    DUCKDB_BUILD_UNITY = 1;
-    OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}";
-  };
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  dontUseCmakeConfigure = true;
 
   build-system = [
     pybind11
+    scikit-build-core
     setuptools-scm
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    duckdb
+    openssl
+  ];
 
-  dependencies = [
-    numpy
-    pandas
+  optional-dependencies = {
+    # Note: ipython and adbc_driver_manager currently excluded despite inclusion in upstream
+    # https://github.com/duckdb/duckdb-python/blob/v1.4.0/pyproject.toml#L44-L52
+    all = [
+      ipython
+      fsspec
+      numpy
+    ]
+    ++ lib.optionals (pythonOlder "3.14") [
+      # https://github.com/duckdb/duckdb-python/blob/0ee500cfa35fc07bf81ed02e8ab6984ea1f665fd/pyproject.toml#L49-L51
+      # adbc_driver_manager noted for migration to duckdb C source
+      pandas
+      pyarrow
+    ];
+  };
+
+  env = {
+    DUCKDB_BUILD_UNITY = 1;
+    # default to disabled extension autoload/autoinstall
+    CMAKE_DEFINE_DUCKDB_EXTENSION_AUTOLOAD_DEFAULT = "0";
+    CMAKE_DEFINE_DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT = "0";
+  };
+
+  cmakeFlags = [
+    (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${version}-0-g${duckdb.rev}")
   ];
 
   nativeCheckInputs = [
@@ -62,7 +105,8 @@ buildPythonPackage rec {
     psutil
     pytest-reraise
     pytestCheckHook
-  ];
+  ]
+  ++ optional-dependencies.all;
 
   pytestFlags = [ "--verbose" ];
 
@@ -71,8 +115,12 @@ buildPythonPackage rec {
   enabledTestPaths = if stdenv.hostPlatform.isDarwin then [ "tests/fast" ] else [ "tests" ];
 
   disabledTestPaths = [
-    # avoid dependency on mypy
-    "tests/stubs/test_stubs.py"
+    # avoid dependency on adbc_driver_manager
+    "tests/fast/adbc"
+    # avoid dependency on pyotp
+    "tests/fast/test_pypi_cleanup.py"
+    # avoid test data download requiring network access
+    "tests/slow/test_h2oai_arrow.py"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/duckduckgo-search/default.nix b/pkgs/development/python-modules/duckduckgo-search/default.nix
deleted file mode 100644
index dadc1e727472..000000000000
--- a/pkgs/development/python-modules/duckduckgo-search/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  click,
-  primp,
-  lxml,
-}:
-
-buildPythonPackage rec {
-  pname = "duckduckgo-search";
-  version = "9.5.5";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "deedy5";
-    repo = "ddgs";
-    tag = "v${version}";
-    hash = "sha256-Pwl6fCEBj+eUXYEf4wCTw1fpKZh3j4IVC6SW0Vqcmf4=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    click
-    primp
-    lxml
-  ];
-
-  doCheck = false; # tests require network access
-
-  pythonImportsCheck = [ "ddgs" ];
-
-  meta = {
-    description = "Python CLI and library for searching for words, documents, images, videos, news, maps and text translation using the DuckDuckGo.com search engine";
-    mainProgram = "ddgs";
-    homepage = "https://github.com/deedy5/ddgs";
-    changelog = "https://github.com/deedy5/ddgs/releases/tag/${src.tag}";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ drawbu ];
-  };
-}
diff --git a/pkgs/development/python-modules/dvc-ssh/default.nix b/pkgs/development/python-modules/dvc-ssh/default.nix
index 5e2206d91342..0ba38995c651 100644
--- a/pkgs/development/python-modules/dvc-ssh/default.nix
+++ b/pkgs/development/python-modules/dvc-ssh/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-ssh";
-  version = "4.2.1";
+  version = "4.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "dvc_ssh";
     inherit version;
-    hash = "sha256-ld6uaAIA+8lHK/TjKtrjtmGKj5847SBMYYvKKN+MkS4=";
+    hash = "sha256-T6yTLF8ivZRE2H1Oez/9bAnMjlbZjrPG1LRDAdNTUBc=";
   };
 
   pythonRemoveDeps = [
diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index e681d16fa3b2..900434d31081 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "3.48.5";
+  version = "3.49.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvclive";
     tag = version;
-    hash = "sha256-ucMtYHDwdpyYnnC7QCn5T6gCS8SarohKh6lxFXtPXgc=";
+    hash = "sha256-jjYglvXPtwPJEp2Qo309QeRLYooUmsDhO1Dc1S3OjQg=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
index 11fb0ac08cc4..8950bd0d9b71 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -1,28 +1,54 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pkgs,
+  fetchFromGitHub,
+  gitUpdater,
+  hypothesis,
+  openssl,
+  pytestCheckHook,
+  setuptools,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "ecdsa";
   version = "0.19.1";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-R4y6e2JVWGb8s7s/6YXgbey9to71VxPE5auYxX1QjmE=";
+  src = fetchFromGitHub {
+    owner = "tlsfuzzer";
+    repo = "python-ecdsa";
+    tag = "python-ecdsa-${version}";
+    hash = "sha256-PjOjHQziQ9ohXH82Ocaowj/AtsXHMHDhatFPQNccyC8=";
   };
 
-  propagatedBuildInputs = [ six ];
-  # Only needed for tests
-  nativeCheckInputs = [ pkgs.openssl ];
+  build-system = [ setuptools ];
 
-  meta = with lib; {
+  dependencies = [ six ];
+
+  pythonImportsCheck = [ "ecdsa" ];
+
+  nativeCheckInputs = [
+    hypothesis
+    openssl # Only needed for tests
+    pytestCheckHook
+  ];
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "python-ecdsa-";
+  };
+
+  meta = {
+    changelog = "https://github.com/tlsfuzzer/python-ecdsa/blob/${src.tag}/NEWS";
     description = "ECDSA cryptographic signature library";
     homepage = "https://github.com/warner/python-ecdsa";
-    license = licenses.mit;
+    license = lib.licenses.mit;
+    knownVulnerabilities = [
+      # "I don't want people to use this library in production environments.
+      # It's a teaching tool, it's a testing tool, it's absolutely not an
+      # production grade implementation."
+      # https://github.com/tlsfuzzer/python-ecdsa/issues/330
+      "CVE-2024-23342"
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index d90b312b155b..a7f996d33900 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.23.8";
+  version = "0.23.10";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     tag = "v${version}";
-    hash = "sha256-JSOijiH/de/bItNt7yNu8+P21rI7YqiTf54zV2Ij5Gs=";
+    hash = "sha256-Q10CjpNd6e5xULziJsBTAcEWMaG68ixBnfHUeOxTyj0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix
index 2267fd230aa4..da38c94c2b32 100644
--- a/pkgs/development/python-modules/eheimdigital/default.nix
+++ b/pkgs/development/python-modules/eheimdigital/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "eheimdigital";
-  version = "1.3.2";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "autinerd";
     repo = "eheimdigital";
     tag = version;
-    hash = "sha256-wFKkfzZ4LLwWhVYigospWYBxTGAJGZWO6Wrj3bvUsc8=";
+    hash = "sha256-skr5KEUQp3fSfTgTHPIxVdT8v9WnPp2NrzA+zhtudlg=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/eigenpy/default.nix b/pkgs/development/python-modules/eigenpy/default.nix
index 6f74e193cfb3..f675729ef502 100644
--- a/pkgs/development/python-modules/eigenpy/default.nix
+++ b/pkgs/development/python-modules/eigenpy/default.nix
@@ -1,14 +1,16 @@
 {
   lib,
+
   buildPythonPackage,
   fetchFromGitHub,
-
+  writableTmpDirAsHomeHook,
   fontconfig,
 
   # nativeBuildInputs
   cmake,
   doxygen,
   graphviz,
+  pkg-config,
   scipy,
 
   # buildInputs
@@ -18,7 +20,6 @@
   eigen,
   jrl-cmakemodules,
   numpy,
-
 }:
 
 buildPythonPackage rec {
@@ -47,9 +48,6 @@ buildPythonPackage rec {
 
   strictDeps = true;
 
-  # Fontconfig error: No writable cache directories
-  preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
-
   # Fontconfig error: Cannot load default config file: No such file: (null)
   env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
 
@@ -57,7 +55,9 @@ buildPythonPackage rec {
     cmake
     doxygen
     graphviz
+    pkg-config
     scipy
+    writableTmpDirAsHomeHook
   ];
 
   buildInputs = [ boost ];
@@ -68,7 +68,9 @@ buildPythonPackage rec {
     numpy
   ];
 
-  preInstallCheck = "make test";
+  preInstallCheck = ''
+    make test
+  '';
 
   pythonImportsCheck = [ "eigenpy" ];
 
diff --git a/pkgs/development/python-modules/elastic-transport/default.nix b/pkgs/development/python-modules/elastic-transport/default.nix
index fe29e2841651..f083603fd0c7 100644
--- a/pkgs/development/python-modules/elastic-transport/default.nix
+++ b/pkgs/development/python-modules/elastic-transport/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   certifi,
   fetchFromGitHub,
+  fetchpatch,
   mock,
   opentelemetry-api,
   opentelemetry-sdk,
@@ -34,6 +35,14 @@ buildPythonPackage rec {
     hash = "sha256-LWSvE88wEwMxRi6IZsMkIRP8UTRfImC9QZnuka1oiso=";
   };
 
+  # FIXME: backport fix for pytest-asyncio 1.2.0, as updating this entire ecosystem is painful
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/elastic/elastic-transport-python/commit/d749d0be54821e81979888ff34b1451354548863.patch";
+      hash = "sha256-FrabqeLn3Sr1sg/lWWYsMPd0CZS/6BZYLnaK66T93BQ=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index 2eabcd7bd1a6..0c2f7dc3a65a 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -7,21 +7,18 @@
   hatchling,
   orjson,
   python-dateutil,
-  pythonOlder,
   requests,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "elasticsearch8";
-  version = "8.19.1";
+  version = "8.19.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/JkH60q7zk792R3IRo/DylOd8xVSqEgH1/KmXFPdy2U=";
+    hash = "sha256-lDfI5RI8JgtZdmGDv9kVIGdyVChJtpf3inlEbsiQqA4=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
deleted file mode 100644
index 08e93d47802d..000000000000
--- a/pkgs/development/python-modules/elegy/default.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  cloudpickle,
-  deepdish,
-  deepmerge,
-  dm-haiku,
-  fetchFromGitHub,
-  fetchpatch,
-  jaxlib,
-  poetry-core,
-  pytestCheckHook,
-  pythonOlder,
-  pyyaml,
-  sh,
-  tables,
-  tabulate,
-  tensorboardx,
-  tensorflow,
-  toolz,
-  torch,
-  treex,
-  typing-extensions,
-}:
-
-buildPythonPackage rec {
-  pname = "elegy";
-  version = "0.8.6";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "poets-ai";
-    repo = "elegy";
-    tag = version;
-    hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "use-poetry-core.patch";
-      url = "https://github.com/poets-ai/elegy/commit/0ed472882f470ed9eb7a63b8a537ffabe7e19aa7.patch";
-      hash = "sha256-nO/imHo7tEsiZh+64CF/M4eXQ1so3IunVhv8CvYP1ks=";
-    })
-  ];
-
-  # The cloudpickle constraint is too strict. wandb is marked as an optional
-  # dependency but `buildPythonPackage` doesn't seem to respect that setting.
-  # Python constraint: https://github.com/poets-ai/elegy/issues/244
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'python = ">=3.7,<3.10"' 'python = ">=3.7"' \
-      --replace 'cloudpickle = "^1.5.0"' 'cloudpickle = "*"' \
-      --replace 'wandb = { version = "^0.12.10", optional = true }' ""
-  '';
-
-  nativeBuildInputs = [ poetry-core ];
-
-  buildInputs = [ jaxlib ];
-
-  propagatedBuildInputs = [
-    cloudpickle
-    deepdish
-    deepmerge
-    dm-haiku
-    pyyaml
-    tables
-    tabulate
-    tensorboardx
-    toolz
-    treex
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [ "elegy" ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    sh
-    tensorflow
-    torch
-  ];
-
-  disabledTests = [
-    # Fails with `Could not find compiler for platform Host: NOT_FOUND: could not find registered compiler for platform Host -- check target linkage`.
-    # Runs fine in docker with Ubuntu 22.04. I suspect the issue is the sandboxing in `nixpkgs` but not sure.
-    "test_saved_model_poly"
-    # AttributeError: module 'jax' has no attribute 'tree_multimap'
-    "DataLoaderTestCase"
-  ];
-
-  meta = with lib; {
-    description = "Neural Networks framework based on Jax inspired by Keras and Haiku";
-    homepage = "https://github.com/poets-ai/elegy";
-    changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ndl ];
-  };
-}
diff --git a/pkgs/development/python-modules/elevenlabs/default.nix b/pkgs/development/python-modules/elevenlabs/default.nix
index a7290769ad12..962e47f0d702 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.17.0";
+  version = "2.22.0";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     inherit tag;
-    hash = "sha256-nIIUMz43o3C7nMMpBnPAPFLTcK3WJyW0v4Vb29yRa88=";
+    hash = "sha256-tSPMHEvce4lRT2weyDl6EFONCT8dRGgLfGptNuTdAPc=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix
index f723438867ad..ee20c43cdff3 100644
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "elkm1-lib";
-  version = "2.2.11";
+  version = "2.2.12";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "gwww";
     repo = "elkm1";
     tag = version;
-    hash = "sha256-wi115LppK628EBw3AFeQHNnLv51dcfaZZi5R6S9+WJE=";
+    hash = "sha256-66Yen8QZAIKzMePFzxOgeprTIMKj3fanicMCBeqhyO4=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/env-canada/default.nix b/pkgs/development/python-modules/env-canada/default.nix
index 217af3e76b97..c053da5a13f5 100644
--- a/pkgs/development/python-modules/env-canada/default.nix
+++ b/pkgs/development/python-modules/env-canada/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "env-canada";
-  version = "0.11.3";
+  version = "0.12.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "michaeldavie";
     repo = "env_canada";
     tag = "v${version}";
-    hash = "sha256-9sgdoHsYklszt1y63WQ4BkIGLxprILx2kh7+BmmUlqE=";
+    hash = "sha256-DTrlis7YDWk8SNmDBnbHk4XEu+SCrXLPLZMb5f+ynY8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index f9d1671f9e26..22a6b0bb9735 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "environs";
-  version = "14.3.0";
+  version = "14.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "sloria";
     repo = "environs";
     tag = version;
-    hash = "sha256-DGcYIir2ckzCJ9423OiFwSi0xMXyox6RNYnhOGQhOuc=";
+    hash = "sha256-g9n4GuVSHB2VourVYlzp3zKO7MnJK4IAakbYV5tM8Uc=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/pkgs/development/python-modules/epson-projector/default.nix b/pkgs/development/python-modules/epson-projector/default.nix
index 93afde3804c5..ba4a526d7e96 100644
--- a/pkgs/development/python-modules/epson-projector/default.nix
+++ b/pkgs/development/python-modules/epson-projector/default.nix
@@ -3,25 +3,26 @@
   buildPythonPackage,
   fetchPypi,
   aiohttp,
-  async-timeout,
-  pyserial-asyncio,
+  pyserial-asyncio-fast,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "epson-projector";
-  version = "0.5.1";
-  format = "setuptools";
+  version = "0.6.0";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "epson_projector";
     inherit version;
-    hash = "sha256-LwsdMuwvLifIP1PRNhfLi4TTZRp/cw9Bcf57vrsNrbI=";
+    hash = "sha256-/9Nc3xOxnXFfTsS8s83MXTkVAhqLwrKnmfR/E87s+Bk=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     aiohttp
-    async-timeout
-    pyserial-asyncio
+    pyserial-asyncio-fast
   ];
 
   # tests need real device
@@ -38,6 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Epson projector support for Python";
     homepage = "https://github.com/pszafer/epson_projector";
+    changelog = "https://github.com/pszafer/epson_projector/releases/tag/v.${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };
diff --git a/pkgs/development/python-modules/equinox/default.nix b/pkgs/development/python-modules/equinox/default.nix
index d21a6774342c..d96939cb3a92 100644
--- a/pkgs/development/python-modules/equinox/default.nix
+++ b/pkgs/development/python-modules/equinox/default.nix
@@ -57,7 +57,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTests = [
+    # Failed: DID NOT WARN. No warnings of type (<class 'Warning'>,) were emitted.
+    "test_jax_transform_warn"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # SystemError: nanobind::detail::nb_func_error_except(): exception could not be translated!
     "test_filter"
   ];
diff --git a/pkgs/development/python-modules/evosax/default.nix b/pkgs/development/python-modules/evosax/default.nix
index c11d37113080..e0de3f633427 100644
--- a/pkgs/development/python-modules/evosax/default.nix
+++ b/pkgs/development/python-modules/evosax/default.nix
@@ -7,14 +7,11 @@
   setuptools,
 
   # dependencies
-  chex,
   dotmap,
   flax,
   jax,
-  jaxlib,
   matplotlib,
   numpy,
-  pyyaml,
 
   # tests
   # brax, (unpackaged)
@@ -62,6 +59,11 @@ buildPythonPackage rec {
     # Requires unpackaged gymnax
     "test_env_ffw_rollout"
 
+    # TypeError: ShapedArray.__init__() got an unexpected keyword argument 'named_shape'
+    "test_base_api"
+    "test_run"
+    "test_run_scan"
+
     # Tries to download a data set from the internet
     "test_brax_problem_eval"
     "test_brax_problem_init"
diff --git a/pkgs/development/python-modules/example-robot-data/default.nix b/pkgs/development/python-modules/example-robot-data/default.nix
new file mode 100644
index 000000000000..3a9bfc18b39d
--- /dev/null
+++ b/pkgs/development/python-modules/example-robot-data/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  example-robot-data,
+
+  python,
+  pinocchio,
+}:
+toPythonModule (
+  example-robot-data.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+
+    propagatedBuildInputs = super.propagatedBuildInputs ++ [
+      example-robot-data
+      pinocchio
+    ];
+
+    nativeCheckInputs = [
+      pythonImportsCheckHook
+    ];
+
+    # The package expect to find an `example-robot-data/robots` folder somewhere
+    # either in install prefix or in the sources
+    # where it can find the meshes for unit tests
+    preCheck = ''
+      ln -s source ../../example-robot-data
+    '';
+
+    pythonImportsCheck = [ "example_robot_data" ];
+  })
+)
diff --git a/pkgs/development/python-modules/extension-helpers/default.nix b/pkgs/development/python-modules/extension-helpers/default.nix
index 6908f66127ef..ba036029682a 100644
--- a/pkgs/development/python-modules/extension-helpers/default.nix
+++ b/pkgs/development/python-modules/extension-helpers/default.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   build,
   cython,
+  findutils,
+  pip,
   pytestCheckHook,
   pythonOlder,
   setuptools-scm,
@@ -17,8 +19,6 @@ buildPythonPackage rec {
   version = "1.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "astropy";
     repo = "extension-helpers";
@@ -36,6 +36,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     build
     cython
+    findutils
+    pip
     pytestCheckHook
     wheel
   ];
@@ -45,10 +47,8 @@ buildPythonPackage rec {
   enabledTestPaths = [ "extension_helpers/tests" ];
 
   disabledTests = [
-    # Test require network access
-    "test_only_pyproject"
-    # ModuleNotFoundError
-    "test_no_setup_py"
+    # https://github.com/astropy/extension-helpers/issues/43
+    "test_write_if_different"
   ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 0a475eccd8ec..99893382c7b9 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -14,11 +14,12 @@
   redis,
   redisTestHook,
   sortedcontainers,
+  valkey,
 }:
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.30.3";
+  version = "2.32.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +28,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     tag = "v${version}";
-    hash = "sha256-SQVLuO5cA+XO7hEBph7XGlnomTcysB3ye9jZ8sy9GAI=";
+    hash = "sha256-esouWM32qe4iO5AcRC0HuUF+lwEDHnyXoknwqsZhr+o=";
   };
 
   build-system = [ hatchling ];
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   dependencies = [
     redis
     sortedcontainers
+    valkey
   ];
 
   optional-dependencies = {
@@ -60,6 +62,14 @@ buildPythonPackage rec {
   disabledTests = [
     "test_init_args" # AttributeError: module 'fakeredis' has no attribute 'FakeValkey'
     "test_async_init_kwargs" # AttributeError: module 'fakeredis' has no attribute 'FakeAsyncValkey'"
+
+    # KeyError: 'tot-mem'
+    "test_acl_log_auth_exist"
+    "test_acl_log_invalid_channel"
+    "test_acl_log_invalid_key"
+    "test_client_id"
+    "test_client_info"
+    "test_client_list"
   ];
 
   preCheck = ''
diff --git a/pkgs/development/python-modules/fast-array-utils/default.nix b/pkgs/development/python-modules/fast-array-utils/default.nix
index 2c6675ac026a..f230b7ba7e4a 100644
--- a/pkgs/development/python-modules/fast-array-utils/default.nix
+++ b/pkgs/development/python-modules/fast-array-utils/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "fast-array-utils";
-  version = "1.2.4";
+  version = "1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "fast-array-utils";
     tag = "v${version}";
-    hash = "sha256-R8pOID9Lws29OCMWb7RZNDsWakEYDf7bya6iSXp8Ips=";
+    hash = "sha256-cU5kBOgjinsievGtnl52RQ39txHuXG5n7YeKGF/9O0Q=";
   };
 
   # hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.
diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix
index 34e9c83e978c..b56aca8ff290 100644
--- a/pkgs/development/python-modules/fastbencode/default.nix
+++ b/pkgs/development/python-modules/fastbencode/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "fastbencode";
-  version = "0.3.6";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "breezy-team";
     repo = "fastbencode";
     tag = "v${version}";
-    hash = "sha256-Vn9NcJQaSF+k2TyRTAA9yMWiV+kYrfw6RIbIe99CCsg=";
+    hash = "sha256-fNvxeAKCHjtD9nl7Jhkzecu2CbTfOyPjdYedCPpqYgc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-r229xfSrkbDEfm/nGFuQshyP4o04US0xJiRK4oXtaYE=";
+    hash = "sha256-e6TaJyHfrUHampTX42rPqdjQu7myj2+zahVJS+7SzIM=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 8b42a9d32ba4..11c6893092ae 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.12";
+  version = "1.8.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-YJONK7WMAQLCkROosGbT5C1G/JtTC7iZs2t+mx03yOo=";
+    hash = "sha256-qMF0PWKtP2EKEUw/9FAOTo3scMYqyNWfydn2yble1jc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix
index 86fd907cc6c8..babb0f44cc68 100644
--- a/pkgs/development/python-modules/faster-whisper/default.nix
+++ b/pkgs/development/python-modules/faster-whisper/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "faster-whisper";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SYSTRAN";
     repo = "faster-whisper";
     tag = "v${version}";
-    hash = "sha256-kv2pLszImGzrPI0q2eglX//BMrj2pF0oMHnZ+7VKrHI=";
+    hash = "sha256-pWVYxC1h0kIhhBxAt9oT2USuvoarlcwwYmaLUJlZZwY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/fastmcp/default.nix b/pkgs/development/python-modules/fastmcp/default.nix
index 17d7cb13353a..14a43b3fa688 100644
--- a/pkgs/development/python-modules/fastmcp/default.nix
+++ b/pkgs/development/python-modules/fastmcp/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "fastmcp";
-  version = "2.12.4";
+  version = "2.12.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jlowin";
     repo = "fastmcp";
     tag = "v${version}";
-    hash = "sha256-d8DOdyoyYDxZOpiUSxsYXnGrgFYN9CjdmAeHmJiDBP0=";
+    hash = "sha256-F8NCp1Ku1EeI/YjbHuHcDYytTgqOFyLp+sZGBqayv6s=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/fb-re2/default.nix b/pkgs/development/python-modules/fb-re2/default.nix
deleted file mode 100644
index 11defafe3953..000000000000
--- a/pkgs/development/python-modules/fb-re2/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchpatch,
-  fetchPypi,
-  re2,
-}:
-
-buildPythonPackage rec {
-  pname = "fb-re2";
-  version = "1.0.7";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "83b2c2cd58d3874e6e3a784cf4cf2f1a57ce1969e50180f92b010eea24ef26cf";
-  };
-
-  patches = [
-    # Bump stdlib to c++17 to fix build with recent re2
-    # https://github.com/facebook/pyre2/issues/24
-    # https://github.com/facebook/pyre2/pull/25
-    (fetchpatch {
-      url = "https://github.com/facebook/pyre2/pull/25/commits/08fb06ec3ccd412ca69483d27234684a04cb91a0.patch";
-      hash = "sha256-kzxE2AxpE1tJJK0dJgoFfVka9zy2u0HEqiHoS7DQDQ0=";
-    })
-  ];
-
-  buildInputs = [ re2 ];
-
-  # no tests in PyPI tarball
-  doCheck = false;
-
-  meta = {
-    description = "Python wrapper for Google's RE2";
-    homepage = "https://github.com/facebook/pyre2";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ ivan ];
-  };
-}
diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix
index 6e2af5d98c43..b6a10c0c5059 100644
--- a/pkgs/development/python-modules/fedora-messaging/default.nix
+++ b/pkgs/development/python-modules/fedora-messaging/default.nix
@@ -1,8 +1,13 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
+
+  # dependencies
   blinker,
   click,
   crochet,
@@ -13,6 +18,8 @@
   service-identity,
   tomli,
   twisted,
+
+  # tests
   pytest-mock,
   pytest-twisted,
   pytestCheckHook,
@@ -55,6 +62,18 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit" ];
 
+  disabledTests = [
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # AssertionError
+    "test_no_conf"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AttributeError: module 'errno' has no attribute 'EREMOTEIO'. Did you mean: 'EREMOTE'?
+    "test_publish_rejected_message"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Library for sending AMQP messages with JSON schema in Fedora infrastructure";
     homepage = "https://github.com/fedora-infra/fedora-messaging";
diff --git a/pkgs/development/python-modules/fenics-basix/default.nix b/pkgs/development/python-modules/fenics-basix/default.nix
index 4d4d10b5c583..35d8b3b3d3c7 100644
--- a/pkgs/development/python-modules/fenics-basix/default.nix
+++ b/pkgs/development/python-modules/fenics-basix/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "fenics-basix";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fenics";
     repo = "basix";
     tag = "v${version}";
-    hash = "sha256-jLQMDt6zdl+oixd5Qevn4bvxBsXpTNcbH2Os6TC9sRQ=";
+    hash = "sha256-atrfIMyLY9EAyw6eiVaC/boG2/a8PCrrv/7J0ntHgSo=";
   };
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix
index 34f1bcd37087..f37135fffab6 100644
--- a/pkgs/development/python-modules/fenics-dolfinx/default.nix
+++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix
@@ -16,6 +16,7 @@
 
   # buildInputs
   dolfinx,
+  darwinMinVersionHook,
 
   # dependency
   numpy,
@@ -63,7 +64,6 @@ buildPythonPackage rec {
   pyproject = true;
 
   pythonRelaxDeps = [
-    "cffi"
     "fenics-ufl"
   ];
 
@@ -87,7 +87,8 @@ buildPythonPackage rec {
 
   buildInputs = [
     fenicsPackages.dolfinx
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3");
 
   dependencies = [
     numpy
@@ -102,8 +103,6 @@ buildPythonPackage rec {
     (mpi4py.override { inherit (fenicsPackages) mpi; })
   ];
 
-  doCheck = true;
-
   nativeCheckInputs = [
     scipy
     matplotlib
@@ -113,21 +112,13 @@ buildPythonPackage rec {
   ];
 
   preCheck = ''
-    rm -rf dolfinx
+    cd test
   '';
 
   pythonImportsCheck = [
     "dolfinx"
   ];
 
-  disabledTests = [
-    # require cffi<1.17
-    "test_cffi_expression"
-    "test_hexahedron_mesh"
-    # https://github.com/FEniCS/dolfinx/issues/1104
-    "test_cube_distance"
-  ];
-
   passthru = {
     tests = {
       complex = fenics-dolfinx.override {
diff --git a/pkgs/development/python-modules/fenics-ffcx/default.nix b/pkgs/development/python-modules/fenics-ffcx/default.nix
index c0b212d7b01d..2ce03df4821e 100644
--- a/pkgs/development/python-modules/fenics-ffcx/default.nix
+++ b/pkgs/development/python-modules/fenics-ffcx/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -16,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "fenics-ffcx";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fenics";
     repo = "ffcx";
     tag = "v${version}";
-    hash = "sha256-eAV//RLbrxyhqgbZ2DiR7qML7xfgPn0/Seh+2no0x8w=";
+    hash = "sha256-i8fawnXWxIHfOvb0nK4/bzhrzfRJJACMCkFZKtdUwkU=";
   };
 
   pythonRelaxDeps = [
@@ -53,8 +52,6 @@ buildPythonPackage rec {
     addBinToPathHook
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
-
   meta = {
     homepage = "https://fenicsproject.org";
     downloadPage = "https://github.com/fenics/ffcx";
diff --git a/pkgs/development/python-modules/ffmpy/default.nix b/pkgs/development/python-modules/ffmpy/default.nix
index 23bc6a0eca9e..9703bc808f45 100644
--- a/pkgs/development/python-modules/ffmpy/default.nix
+++ b/pkgs/development/python-modules/ffmpy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pythonOlder,
   uv-build,
   pytestCheckHook,
diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
index e535f4e96912..e4887b4a2836 100644
--- a/pkgs/development/python-modules/fickling/default.nix
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -5,24 +5,23 @@
   distutils,
   fetchFromGitHub,
   flit-core,
+  numpy,
   pytestCheckHook,
-  pythonOlder,
   torch,
   torchvision,
+  stdlib-list,
 }:
 
 buildPythonPackage rec {
   pname = "fickling";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "fickling";
     tag = "v${version}";
-    hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ=";
+    hash = "sha256-EgVtMYPwSVBlw1bmX3qEeUKvEY7Awv6DOB5tgSLG+xQ=";
   };
 
   build-system = [
@@ -30,10 +29,16 @@ buildPythonPackage rec {
     flit-core
   ];
 
-  dependencies = [ astunparse ];
+  dependencies = [
+    astunparse
+    stdlib-list
+  ];
+
+  pythonRelaxDeps = [ "stdlib_list" ];
 
   optional-dependencies = {
     torch = [
+      numpy
       torch
       torchvision
     ];
@@ -41,13 +46,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
+  disabledTestPaths = [
+    # https://github.com/trailofbits/fickling/issues/162
+    # AttributeError: module 'numpy.lib.format' has no attribute...
+    "test/test_polyglot.py"
+  ];
+
   pythonImportsCheck = [ "fickling" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python pickling decompiler and static analyzer";
     homepage = "https://github.com/trailofbits/fickling";
-    changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}";
-    license = licenses.lgpl3Plus;
+    changelog = "https://github.com/trailofbits/fickling/releases/tag/${src.tag}";
+    license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/filedepot/default.nix b/pkgs/development/python-modules/filedepot/default.nix
index 072e6ea60ef1..f620aac9a360 100644
--- a/pkgs/development/python-modules/filedepot/default.nix
+++ b/pkgs/development/python-modules/filedepot/default.nix
@@ -35,9 +35,9 @@ buildPythonPackage rec {
 
   dependencies = [
     anyascii
+    legacy-cgi
     google-cloud-storage
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ];
 
   nativeCheckInputs = [
     flaky
diff --git a/pkgs/development/python-modules/filelock/default.nix b/pkgs/development/python-modules/filelock/default.nix
index 2b7c7bdfa8ac..bd33052a9c63 100644
--- a/pkgs/development/python-modules/filelock/default.nix
+++ b/pkgs/development/python-modules/filelock/default.nix
@@ -6,20 +6,18 @@
   hatchling,
   pytest-asyncio,
   pytest-mock,
+  pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "filelock";
-  version = "3.18.0";
+  version = "3.20.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-rbyI6ruZ0v7IycGyKbFx8Yr6ZVQAFz3cZT1dAVAfufI=";
+    hash = "sha256-cR6UO07GvkLh1OZpC0jcF1yCKWdGa7McDCk/NDNME/Q=";
   };
 
   build-system = [
@@ -30,6 +28,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytest-asyncio
     pytest-mock
+    pytest-timeout
     pytestCheckHook
   ];
 
diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix
index f4392672429a..29d6fc79c16d 100644
--- a/pkgs/development/python-modules/files-to-prompt/default.nix
+++ b/pkgs/development/python-modules/files-to-prompt/default.nix
@@ -29,6 +29,8 @@ buildPythonPackage rec {
     versionCheckHook
   ];
 
+  disabledTests = [ "test_binary_file_warning" ];
+
   versionCheckProgramArg = "--version";
 
   meta = {
diff --git a/pkgs/development/python-modules/finetuning-scheduler/default.nix b/pkgs/development/python-modules/finetuning-scheduler/default.nix
index f6a282dea80c..113e77b2dca2 100644
--- a/pkgs/development/python-modules/finetuning-scheduler/default.nix
+++ b/pkgs/development/python-modules/finetuning-scheduler/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -13,35 +12,21 @@
   torch,
 
   # tests
-  pythonOlder,
-  pythonAtLeast,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "finetuning-scheduler";
-  version = "2.5.3";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "speediedan";
     repo = "finetuning-scheduler";
     tag = "v${version}";
-    hash = "sha256-6WRKDYug7eVaTSY2R2jBcj9o/984mqKZZi36XRT7KyI=";
+    hash = "sha256-AfkrWuqpFS71Zrh5NsamzxMitKCsqPF50F9zTDdDhRg=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/speediedan/finetuning-scheduler/commit/78e6e225f353d1ba95db05d7fc6ff541859ed6a2.patch";
-      hash = "sha256-7mbtsaHrnHph8lvuwhBGqxPQimbZcbGeyBYXzApFPn4=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools<77.0.0" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   pythonRelaxDeps = [
@@ -58,23 +43,14 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
   enabledTestPaths = [ "tests" ];
-  disabledTests =
-    lib.optionals (pythonOlder "3.12") [
-      # torch._dynamo.exc.BackendCompilerFailed: backend='inductor' raised:
-      # LoweringException: ImportError: cannot import name 'triton_key' from 'triton.compiler.compiler'
-      "test_fts_dynamo_enforce_p0"
-      "test_fts_dynamo_resume"
-      "test_fts_dynamo_intrafit"
-    ]
-    ++ lib.optionals (pythonAtLeast "3.13") [
-      # RuntimeError: Dynamo is not supported on Python 3.13+
-      "test_fts_dynamo_enforce_p0"
-      "test_fts_dynamo_resume"
-    ]
-    ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
-      # slightly exceeds numerical tolerance on aarch64-linux:
-      "test_fts_frozen_bn_track_running_stats"
-    ];
+  disabledTests = [
+    # AssertionError: assert 'lightning @ git+' in 'lightning>=2.5.0,<2.5.6'
+    "test_get_lightning_requirement"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux) [
+    # slightly exceeds numerical tolerance on aarch64-linux:
+    "test_fts_frozen_bn_track_running_stats"
+  ];
 
   pythonImportsCheck = [ "finetuning_scheduler" ];
 
diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 6a7c8b51bee3..04d5d9b8f5f6 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -95,6 +95,64 @@ buildPythonPackage rec {
 
     # see: https://github.com/Toblerity/Fiona/issues/1273
     "test_append_memoryfile_drivers"
+
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_bbox_json_yes"
+    "test_bbox_no"
+    "test_bbox_where"
+    "test_bbox_yes"
+    "test_bbox_yes_two_files"
+    "test_bool_seq"
+    "test_bounds_explode_with_obj"
+    "test_calc_seq"
+    "test_collect_ld"
+    "test_collect_no_rs"
+    "test_collect_noparse"
+    "test_collect_noparse_records"
+    "test_collect_noparse_rs"
+    "test_collect_rec_buffered"
+    "test_collect_rs"
+    "test_creation_options"
+    "test_different_crs"
+    "test_distrib"
+    "test_distrib_no_rs"
+    "test_dst_crs_default_to_src_crs"
+    "test_dst_crs_epsg3857"
+    "test_dst_crs_no_src"
+    "test_existing_property"
+    "test_explode"
+    "test_explode_output_rs"
+    "test_explode_pp"
+    "test_explode_with_id"
+    "test_filter"
+    "test_fio_load_layer"
+    "test_fio_load_layer_append"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_map_count"
+    "test_multi_layer"
+    "test_one"
+    "test_precision"
+    "test_reduce_area"
+    "test_reduce_area"
+    "test_reduce_union"
+    "test_reduce_union_zip_properties"
+    "test_seq"
+    "test_seq"
+    "test_seq_no_rs"
+    "test_seq_rs"
+    "test_seq_rs"
+    "test_two"
+    "test_vfs"
+    "test_where_no"
+    "test_where_yes"
+    "test_where_yes_two_files"
+    "test_with_id"
+    "test_with_obj"
   ];
 
   pythonImportsCheck = [ "fiona" ];
diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix
index 5255fa695da8..015a3fd91b15 100644
--- a/pkgs/development/python-modules/firedrake-fiat/default.nix
+++ b/pkgs/development/python-modules/firedrake-fiat/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "firedrake-fiat";
-  version = "2025.4.2";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "fiat";
     tag = version;
-    hash = "sha256-SIi/4JW9L4kyFxEmbG9pqe0QtY80UMOh7LSFLmrHhZY=";
+    hash = "sha256-kyQe4VFzcK1idMt/NNND2cytGUryyhh5+ZP292zxT7c=";
   };
 
   postPatch =
diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix
index 645bf8ae82ff..4723401106cc 100644
--- a/pkgs/development/python-modules/firedrake/default.nix
+++ b/pkgs/development/python-modules/firedrake/default.nix
@@ -23,6 +23,7 @@
   libsupermesh,
   loopy,
   petsc4py,
+  petsctools,
   numpy,
   packaging,
   pkgconfig,
@@ -35,7 +36,9 @@
   scipy,
   sympy,
   islpy,
+  vtk,
   matplotlib,
+  immutabledict,
 
   # tests
   pytest,
@@ -58,36 +61,31 @@ let
 in
 buildPythonPackage rec {
   pname = "firedrake";
-  version = "2025.4.2";
+  version = "2025.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "firedrake";
     tag = version;
-    hash = "sha256-bAGmXoHPAdMYJMMQYVq98LYro1Vd+o9pfvXC3BsQUf0=";
+    hash = "sha256-paZNs6T9v7TNSdc8YJTjNcQvGrPg/Sy9K27/aUxNu5w=";
   };
 
-  postPatch =
-    # relax build-dependency petsc4py
-    ''
-      substituteInPlace pyproject.toml --replace-fail \
-        "petsc4py==3.23.4" "petsc4py"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace firedrake/petsc.py --replace-fail \
-        'program = ["ldd"]' \
-        'program = ["${lib.getExe' pax-utils "lddtree"}"]'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace firedrake/petsc.py --replace-fail \
-        'program = ["otool"' \
-        'program = ["${lib.getExe' stdenv.cc.bintools.bintools "otool"}"'
-    '';
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/firedrakeproject/firedrake/pull/4632/commits/717ae8a62e19e0cc91419c12ca14170d252b2bb9.patch?full_index=1";
+      hash = "sha256-XHIcXmfh/brlQkrM4FTRvTrOovLvBN5mBrqZpZewTnc=";
+    })
+  ];
+
+  # relax build-dependency petsc4py
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail \
+      "petsc4py==3.24.0" "petsc4py"
+  '';
 
   pythonRelaxDeps = [
     "decorator"
-    "slepc4py"
   ];
 
   build-system = [
@@ -116,6 +114,7 @@ buildPythonPackage rec {
     libsupermesh
     loopy
     petsc4py
+    petsctools
     numpy
     packaging
     pkgconfig
@@ -127,8 +126,11 @@ buildPythonPackage rec {
     rtree
     scipy
     sympy
+    vtk
     # required by script spydump
     matplotlib
+    # required by pyop2
+    immutabledict
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     islpy
@@ -152,20 +154,11 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  # These scripts are used by official sdist/editable_wheel only
-  postInstall = ''
-    rm $out/bin/firedrake-{check,status,run-split-tests}
-  '';
-
-  preCheck = ''
-    rm -rf firedrake pyop2 tinyasm tsfc
-  '';
-
   # run official smoke tests
   checkPhase = ''
     runHook preCheck
 
-    make check
+    $out/bin/firedrake-check
 
     runHook postCheck
   '';
diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix
index 7006fbfddf3f..9fcd5105dfe8 100644
--- a/pkgs/development/python-modules/fireworks-ai/default.nix
+++ b/pkgs/development/python-modules/fireworks-ai/default.nix
@@ -6,11 +6,10 @@
   # build-system
   pdm-backend,
 
-  # local dependencies
-  black,
-  mypy,
-
   # dependencies
+  asyncstdlib-fw,
+  betterproto-fw,
+  googleapis-common-protos,
   grpcio,
   grpclib,
   httpx-sse,
@@ -23,6 +22,7 @@
   pydantic,
   python-dateutil,
   rich,
+  toml,
   typing-extensions,
 
   # optional dependencies
@@ -36,67 +36,16 @@
   tqdm,
 }:
 
-let
-  asyncstdlib-fw = buildPythonPackage rec {
-    pname = "asyncstdlib_fw";
-    version = "3.13.2";
-    pyproject = true;
-
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-Ua0JTCBMWTbDBA84wy/W1UmzkcmA8h8foJW2X7aAah8=";
-    };
-
-    build-system = [
-      pdm-backend
-    ];
-
-    dependencies = [
-      black
-      mypy
-    ];
-
-    pythonImportsCheck = [
-      "asyncstdlib"
-    ];
-  };
-
-  betterproto-fw = buildPythonPackage rec {
-    pname = "betterproto_fw";
-    version = "2.0.3";
-    pyproject = true;
-
-    src = fetchPypi {
-      inherit version pname;
-      hash = "sha256-ut5GchUiTygHhC2hj+gSWKCoVnZrrV8KIKFHTFzba5M=";
-    };
-
-    build-system = [
-      pdm-backend
-    ];
-
-    dependencies = [
-      grpclib
-      python-dateutil
-      typing-extensions
-    ];
-
-    pythonImportsCheck = [
-      "betterproto"
-    ];
-
-  };
-in
 buildPythonPackage rec {
   pname = "fireworks-ai";
-  version = "0.17.16";
+  version = "0.19.20";
   pyproject = true;
 
   # no source available
   src = fetchPypi {
     pname = "fireworks_ai";
     inherit version;
-    hash = "sha256-WblcAaYjnzwPS4n5rixNHbHLNGTE3bTPXvQ9lYZ1f9A=";
+    hash = "sha256-zK8lO+vFnMEPPl79QGfqPdemZT7kQdCqAPiCrcXdqYQ=";
   };
 
   build-system = [
@@ -104,29 +53,28 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "attrs"
     "protobuf"
   ];
 
   dependencies = [
     asyncstdlib-fw
     betterproto-fw
+    googleapis-common-protos
     grpcio
     grpclib
     httpx
     httpx
     httpx-sse
-    httpx-sse
-    httpx-ws
     httpx-ws
     mmh3
     openai
     pillow
-    pillow
     protobuf
     pydantic
-    pydantic
     python-dateutil
     rich
+    toml
     typing-extensions
   ];
 
diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix
index 6f09f07af8f2..265a76820dc5 100644
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@@ -8,23 +8,24 @@
   pythonOlder,
   hypothesis,
   hypothesmith,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "flake8-bugbear";
-  version = "24.12.12";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "25.10.21";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PyCQA";
     repo = "flake8-bugbear";
     tag = version;
-    hash = "sha256-ZMIpQUF+aXiq2NG0v19UwhWszrW/l50aJmG4YDV0+Wg=";
+    hash = "sha256-4ZTi1w+L0M6LCB4G+OxHBnUV0f6s/JPY6tKOt1zh7So=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     attrs
     flake8
   ];
@@ -36,10 +37,12 @@ buildPythonPackage rec {
     hypothesmith
   ];
 
+  pythonImportsCheck = [ "bugbear" ];
+
   meta = with lib; {
     description = "Plugin for Flake8 to find bugs and design problems";
     homepage = "https://github.com/PyCQA/flake8-bugbear";
-    changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log";
+    changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${src.tag}/README.rst#change-log";
     longDescription = ''
       A plugin for flake8 finding likely bugs and design problems in your
       program.
diff --git a/pkgs/development/python-modules/flake8-deprecated/default.nix b/pkgs/development/python-modules/flake8-deprecated/default.nix
index e7601e6190bf..1c7fd6615d48 100644
--- a/pkgs/development/python-modules/flake8-deprecated/default.nix
+++ b/pkgs/development/python-modules/flake8-deprecated/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   hatchling,
   flake8,
@@ -10,15 +9,14 @@
 
 buildPythonPackage rec {
   pname = "flake8-deprecated";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    pname = "flake8_deprecated";
-    inherit version;
-    hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI=";
+  src = fetchFromGitHub {
+    owner = "gforcada";
+    repo = "flake8-deprecated";
+    tag = version;
+    hash = "sha256-KF0hWhMZEWuSPUyfStayNa5Nfss9NpTvMXPeemWbQXU=";
   };
 
   build-system = [ hatchling ];
@@ -31,10 +29,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "flake8_deprecated" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/gforcada/flake8-deprecated/blob/${src.tag}/CHANGES.rst";
     description = "Flake8 plugin that warns about deprecated method calls";
     homepage = "https://github.com/gforcada/flake8-deprecated";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ lopsided98 ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ lopsided98 ];
   };
 }
diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix
index 1cc0d1fb7648..7cd1174589c9 100644
--- a/pkgs/development/python-modules/flasgger/default.nix
+++ b/pkgs/development/python-modules/flasgger/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -31,6 +32,15 @@ buildPythonPackage rec {
     hash = "sha256-ULEf9DJiz/S2wKlb/vjGto8VCI0QDcm0pkU5rlOwtiE=";
   };
 
+  patches = [
+    # https://github.com/flasgger/flasgger/pull/633
+    (fetchpatch {
+      name = "fix-tests-with-click-8.2.patch";
+      url = "https://github.com/flasgger/flasgger/commit/08591b60e988c0002fcf1b1e9f98b78e041d2732.patch";
+      hash = "sha256-DHaaY9W+cta3M2VA8S+ZQWacmgSpeyP03SKTiIlfBRM=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/flax/default.nix b/pkgs/development/python-modules/flax/default.nix
index bab2e95c9a71..5def21410d92 100644
--- a/pkgs/development/python-modules/flax/default.nix
+++ b/pkgs/development/python-modules/flax/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -48,6 +49,17 @@ buildPythonPackage rec {
     hash = "sha256-ioMj8+TuOFX3t9p3oVaywaOQPFBgvNcy7b/2WX/yvXA=";
   };
 
+  patches = [
+    # Fixes TypeError: shard_map() got an unexpected keyword argument 'auto'
+    # TODO: remove when updating to the next release
+    # https://github.com/google/flax/pull/5020
+    (fetchpatch {
+      name = "jax-0.8.0-compat";
+      url = "https://github.com/google/flax/commit/5bf9b35ff03130f440a93a812fd8b47ec6a49add.patch";
+      hash = "sha256-KYpa1wDQMt77XIDGQEg/VuU/OPPNp2enGSA986TZSLQ=";
+    })
+  ];
+
   build-system = [
     setuptools
     setuptools-scm
diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
index 9401238f13c6..e7e77cf891d3 100644
--- a/pkgs/development/python-modules/fmpy/default.nix
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -1,45 +1,47 @@
 {
   lib,
   stdenv,
-  fetchurl,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  cmake,
-  sundials,
-  lapack,
-  attrs,
-  lark,
-  lxml,
-  rpclib,
-  msgpack,
-  numpy,
-  scipy,
-  pytz,
-  dask,
-  requests,
-  matplotlib,
-  pyqtgraph,
-  notebook,
-  plotly,
-  hatchling,
-  pyside6,
-  jinja2,
-  flask,
-  dash,
-  dash-bootstrap-components,
+
+  # patches
   qt6,
   fmpy,
-  runCommand,
-  enableRemoting ? true,
-  versionCheckHook,
-  fmi-reference-fmus,
   replaceVars,
+
+  # nativeBuildInputs
+  cmake,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  attrs,
+  jinja2,
+  lark,
+  lxml,
+  msgpack,
+  nbformat,
+  numpy,
+  pyside6,
+
+  # preBuild
+  rpclib,
+
+  # tests
+  versionCheckHook,
+
+  # passthru
+  sundials,
+  lapack,
+  runCommand,
+  fmi-reference-fmus,
+
+  enableRemoting ? true,
 }:
 buildPythonPackage rec {
   pname = "fmpy";
-  version = "0.3.23";
-  disabled = pythonOlder "3.10";
+  version = "0.3.26";
   pyproject = true;
 
   # Bumping version? Make sure to look through the commit history for
@@ -47,47 +49,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CATIA-Systems";
     repo = "FMPy";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-4jBYOymurGCbjT0WQjIRNsztwOXBYVTGLdc4kNSTOZw=";
+    hash = "sha256-NAaROHrZ8OPmj/3lWFk9hNrrlqsDbscGdDn6G7xfFeQ=";
   };
 
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  build-system = [
-    hatchling
-  ];
-
-  dependencies = [
-    pyqtgraph
-    pyside6
-    attrs
-    lark
-    lxml
-    msgpack
-    numpy
-    scipy
-    pytz
-    dask
-    requests
-    matplotlib
-    pyqtgraph
-    notebook
-    plotly
-    rpclib
-    fmpy.passthru.cvode
-    pyside6
-    jinja2
-    flask
-    dash
-    dash-bootstrap-components
-  ];
-
-  dontUseCmakeConfigure = true;
-  dontUseCmakeBuildDir = true;
-
   patches = [
     (replaceVars ./0001-gui-override-Qt6-libexec-path.patch {
       qt6libexec = "${qt6.qtbase}/libexec/";
@@ -106,9 +72,33 @@ buildPythonPackage rec {
   # Make forced includes of other systems' artifacts optional in order
   # to pass build (otherwise vendored upstream from CI)
   postPatch = ''
-    sed --in-place 's/force-include/source/g' pyproject.toml
+    substituteInPlace pyproject.toml \
+      --replace-fail "force-include" "source"
   '';
 
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    attrs
+    cmake
+    jinja2
+    lark
+    lxml
+    msgpack
+    nbformat
+    numpy
+    pyside6
+  ];
+
+  dontUseCmakeConfigure = true;
+  dontUseCmakeBuildDir = true;
+
   # Don't run upstream build scripts as they are too specialized.
   # cvode is already built, so we only need to build native binaries.
   # We run these cmake builds and then run the standard
@@ -118,9 +108,10 @@ buildPythonPackage rec {
     cmakeConfigurePhase
     cmake --build native/src/build --config Release
   ''
+  # reimplementation of native/build_remoting.py
+  # 2025-10-25: fix cmake 4 compatibility
   + lib.optionalString (enableRemoting && stdenv.hostPlatform.isLinux) ''
-    # reimplementation of native/build_remoting.py
-    cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
+    cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib} -D CMAKE_POLICY_VERSION_MINIMUM=3.10"
     cmakeConfigurePhase
     cmake --build remoting/linux64 --config Release
   ''
@@ -147,22 +138,33 @@ buildPythonPackage rec {
     "fmpy.sundials"
   ];
 
-  nativeInstallCheckInputs = [
+  nativeCheckInputs = [
     versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   passthru = {
     # From sundials, build only the CVODE solver. C.f.
     # src/native/build_cvode.py
     cvode =
-      (sundials.overrideAttrs (prev: {
+      (sundials.overrideAttrs (prev: rec {
         # hash copied from native/build_cvode.py
         version = "5.3.0";
-        src = fetchurl {
-          url = "https://github.com/LLNL/sundials/releases/download/v5.3.0/sundials-5.3.0.tar.gz";
-          sha256 = "88dff7e11a366853d8afd5de05bf197a8129a804d9d4461fb64297f1ef89bca7";
+        src = fetchFromGitHub {
+          owner = "LLNL";
+          repo = "sundials";
+          tag = "v${version}";
+          hash = "sha256-8TvIGhrB9Rq9GgWqeyPTcYFrgn6Q79VkhkLuucNKlg0=";
         };
 
+        # Fix CMake 4 compatibility
+        postPatch = ''
+          substituteInPlace config/SundialsPOSIXTimers.cmake \
+            --replace-fail \
+              "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)" \
+              "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
+        '';
+
         cmakeFlags =
           prev.cmakeFlags
           ++ lib.mapAttrsToList (option: enable: lib.cmakeBool option enable) {
@@ -174,6 +176,8 @@ buildPythonPackage rec {
             BUILD_IDA = false;
             BUILD_IDAS = false;
             BUILD_KINSOL = false;
+
+            BUILD_SHARED_LIBS = true;
           };
 
         # FMPy searches for sundials without the "lib"-prefix; strip it
@@ -205,7 +209,7 @@ buildPythonPackage rec {
       for fmu in $(find ${fmi-reference-fmus}/*.fmu ! -name "Clocks.fmu"); do
         name=$(basename $fmu)
         echo "--- START $name ---"
-        ${fmpy}/bin/fmpy simulate $fmu \
+        ${lib.getExe fmpy} simulate $fmu \
           --fmi-logging \
           --output-file $out/$name.csv \
           | tee $out/$name.out
@@ -227,5 +231,6 @@ buildPythonPackage rec {
     # builds. C.f.
     # <https://github.com/CATIA-Systems/FMPy/blob/v0.3.23/pyproject.toml?plain=1#L71-L112>
     platforms = lib.platforms.x86_64 ++ [ "i686-windows" ];
+    mainProgram = "fmpy";
   };
 }
diff --git a/pkgs/development/python-modules/fontmake/default.nix b/pkgs/development/python-modules/fontmake/default.nix
index 9f651758e3b0..9cbb2ba902c2 100644
--- a/pkgs/development/python-modules/fontmake/default.nix
+++ b/pkgs/development/python-modules/fontmake/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "fontmake";
-  version = "3.10.1";
+  version = "3.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googlefonts";
     repo = "fontmake";
     tag = "v${version}";
-    hash = "sha256-cHFxb7lWUj/7ATynoMGQkhArKWCHHLYvQG5IoaXwVBs=";
+    hash = "sha256-H3r5G+lEoIlS7mmQ1abQeZ1cD/aGskphm5X0rAshX+U=";
   };
 
   build-system = [
@@ -59,6 +59,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/googlefonts/fontmake";
     changelog = "https://github.com/googlefonts/fontmake/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index f776b814e31b..056c4d8df771 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -21,21 +21,19 @@
   xattr,
   skia-pathops,
   uharfbuzz,
-  pytest7CheckHook,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "4.59.0";
+  version = "4.60.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "fonttools";
     repo = "fonttools";
     tag = version;
-    hash = "sha256-f3iedVwwh98XkFzPJ/+XZ2n4pcDXDoPlQki+neGVuXE=";
+    hash = "sha256-h/JRItD5IHlhNSamxRxk/dvyAKUFayzxHvlW7v4N1s8=";
   };
 
   build-system = [
@@ -68,9 +66,7 @@ buildPythonPackage rec {
     extras // { all = lib.concatLists (lib.attrValues extras); };
 
   nativeCheckInputs = [
-    # test suite fails with pytest>=8.0.1
-    # https://github.com/fonttools/fonttools/issues/3458
-    pytest7CheckHook
+    pytestCheckHook
   ]
   ++ lib.concatLists (
     lib.attrVals (
diff --git a/pkgs/development/python-modules/frictionless/default.nix b/pkgs/development/python-modules/frictionless/default.nix
index 95847eab78a1..95962afd69f0 100644
--- a/pkgs/development/python-modules/frictionless/default.nix
+++ b/pkgs/development/python-modules/frictionless/default.nix
@@ -200,6 +200,11 @@ buildPythonPackage rec {
     # The tests of other unavailable formats are auto-skipped
     "frictionless/formats/excel"
     "frictionless/formats/spss"
+    # Console CLI tests fail due to typer/Click CliRunner output capture issues
+    # result.stdout is empty when error messages are expected
+    # All 1690 functional tests pass (including duckdb adapter tests)
+    "frictionless/console/__spec__/test_console.py"
+    "frictionless/console/commands/__spec__/test_summary.py"
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix
index 5ea688a51cf3..841dc3932922 100644
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@@ -5,7 +5,6 @@
   chardet,
   fetchFromGitHub,
   idna,
-  pythonOlder,
   requests,
   setuptools,
   urllib3,
@@ -13,16 +12,14 @@
 
 buildPythonPackage rec {
   pname = "frigidaire";
-  version = "0.18.24";
+  version = "0.18.28";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "bm1549";
     repo = "frigidaire";
     tag = version;
-    hash = "sha256-lpwzXeuFPvWV26AIAfzBHY3IiwEc8vThTXc/F0iyV1o=";
+    hash = "sha256-2VleZyisva2HQPDmPoZbxnYu3t1S/HTuaZtFWFiU1nU=";
   };
 
   postPatch = ''
@@ -49,7 +46,7 @@ buildPythonPackage rec {
     description = "Python API for the Frigidaire devices";
     homepage = "https://github.com/bm1549/frigidaire";
     changelog = "https://github.com/bm1549/frigidaire/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix
index 33446197f52d..8b6a09149f30 100644
--- a/pkgs/development/python-modules/func-timeout/default.nix
+++ b/pkgs/development/python-modules/func-timeout/default.nix
@@ -18,12 +18,21 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # Calculates the amount of time the machine slept but doesn't account for heavy loads
+    "test_retry"
+    "test_funcSetTimeout"
+    "test_funcSetTimeCalculate"
+    "test_funcSetTimeCalculateWithOverride"
+    "test_setFuncTimeoutetry"
+  ];
+
   pythonImportsCheck = [ "func_timeout" ];
 
-  meta = with lib; {
+  meta = {
     description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads";
     homepage = "https://github.com/kata198/func_timeout";
-    license = licenses.lgpl3Only;
+    license = lib.licenses.lgpl3Only;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index c27da986a748..95a97adbf317 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "garminconnect";
-  version = "0.2.30";
+  version = "0.2.31";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "cyberjunky";
     repo = "python-garminconnect";
     tag = version;
-    hash = "sha256-JCcQl7awYUnRWWVoKgirgn494HM9uXqT69f3XauTG5E=";
+    hash = "sha256-yK4p1zb3OLTpDrtVz0bA/jlhDV3AFpltN3CTDBcSTPU=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index 676557ce318a..633956e1d73b 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -6,21 +6,18 @@
   pydantic,
   pytest-vcr,
   pytestCheckHook,
-  pythonOlder,
   requests,
   requests-oauthlib,
 }:
 
 buildPythonPackage rec {
   pname = "garth";
-  version = "0.5.17";
+  version = "0.5.19";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SO3pOMOLL9cHd+VccCVTh3XZPBBH9DzHxEgfKgSxCcs=";
+    hash = "sha256-no9qxDtk6k5YXOEwFfwPJb4EylQRKOGorVIgvhwd4dY=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];
diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix
index 56914ec6fb4f..7e35b8d2decd 100644
--- a/pkgs/development/python-modules/gdsfactory/default.nix
+++ b/pkgs/development/python-modules/gdsfactory/default.nix
@@ -46,14 +46,14 @@
 }:
 buildPythonPackage rec {
   pname = "gdsfactory";
-  version = "9.18.1";
+  version = "9.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "gdsfactory";
     tag = "v${version}";
-    hash = "sha256-PPps3BaQbU7PCq+tlvjlPOurgBYHx/eGDEmlUmaB+O4=";
+    hash = "sha256-TpMi0Rv6sQA8uAPGl6iR1qgTU7havBlWmdz98DROoSk=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/genson/default.nix b/pkgs/development/python-modules/genson/default.nix
index 40643f85e07b..c4febd74c4f3 100644
--- a/pkgs/development/python-modules/genson/default.nix
+++ b/pkgs/development/python-modules/genson/default.nix
@@ -1,6 +1,5 @@
 {
   buildPythonPackage,
-  coverage,
   fetchPypi,
   jsonschema,
   lib,
diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 3c9c36b0311b..a7f5a5012ac7 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   setuptools,
 
@@ -38,6 +39,15 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  patches = [
+    # fix tests for geos 3.14
+    # see https://github.com/geopandas/geopandas/pull/3645
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/geopandas/geopandas/pull/3645.patch";
+      hash = "sha256-TLJixFRR+g739PLgwhTGuwYTVJ4SRr2BMGD14CLgmcY=";
+    })
+  ];
+
   dependencies = [
     packaging
     pandas
diff --git a/pkgs/development/python-modules/gilknocker/default.nix b/pkgs/development/python-modules/gilknocker/default.nix
index fb6b432f3131..337242804af3 100644
--- a/pkgs/development/python-modules/gilknocker/default.nix
+++ b/pkgs/development/python-modules/gilknocker/default.nix
@@ -17,19 +17,19 @@
 
 buildPythonPackage rec {
   pname = "gilknocker";
-  version = "0.4.1.post6";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "milesgranger";
     repo = "gilknocker";
     tag = "v${version}";
-    hash = "sha256-jJOI7hlm6kcqfBbM56y5mKD+lJe0g+qAQpDF7ePM+GM=";
+    hash = "sha256-RFLThZRxAXqF/Yzjpmafn2dVavOGJrM9U258FfLej/I=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-cUv0CT8d6Nxjzh/S/hY9jcpeFX/5KvBxSkqOkt4htyU=";
+    hash = "sha256-C3rxqmZMSc6SC8bU5VB61x8Xk/crD3o7Nr1xvzv7uqI=";
   };
 
   nativeBuildInputs =
diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index ef2f8aa953f5..5c625b117c7b 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -3,6 +3,7 @@
   anyio,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   hishel,
   httpx,
   pydantic,
@@ -26,6 +27,14 @@ buildPythonPackage rec {
     hash = "sha256-67Y0r4Po3z4YmnbWC0HBLmsKD68HMIGvHKo5SLe+KRc=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/yanyongyu/githubkit/commit/2817664d904541242d4cedf7aae85cd4c4b606e2.patch?full_index=1";
+      hash = "sha256-mmtjlebHZpHX457frSOe88tsUo7iNdSIUynGZjcjuw4=";
+    })
+  ];
+
   pythonRelaxDeps = [ "hishel" ];
 
   build-system = [ uv-build ];
diff --git a/pkgs/development/python-modules/giturlparse/default.nix b/pkgs/development/python-modules/giturlparse/default.nix
index 6dfd53352672..011ae2959bc6 100644
--- a/pkgs/development/python-modules/giturlparse/default.nix
+++ b/pkgs/development/python-modules/giturlparse/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "giturlparse";
-  version = "0.12.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nephila";
     repo = "giturlparse";
     tag = version;
-    hash = "sha256-VqlsqMLwOtaciBWXphmFAMwtfkWBBNaL1Sdcc8Ltq7k=";
+    hash = "sha256-KBJVsg3xpy4WkXlkP+eNTJpGIpZhPI4TwD5/0eCbTL0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 536ea42979cc..c5a929139e2e 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "glyphslib";
-  version = "6.11.6";
+  version = "6.12.2";
 
   pyproject = true;
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "googlefonts";
     repo = "glyphsLib";
     tag = "v${version}";
-    hash = "sha256-ZHF+q6L2XcYk5HRuRz1pgvfRAwY2GxLqyjIDY1ocsEQ=";
+    hash = "sha256-w9n9IWd3E9Bd9pggdFe9PZXx235k81oWL9BpdyerShQ=";
   };
 
   build-system = [ setuptools-scm ];
@@ -54,7 +54,8 @@ buildPythonPackage rec {
   meta = {
     description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";
     homepage = "https://github.com/googlefonts/glyphsLib";
+    changelog = "https://github.com/googlefonts/glyphsLib/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index 8bf54bc24bc3..33712b519afc 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   isPyPy,
   setuptools,
   gmp,
@@ -30,6 +31,14 @@ buildPythonPackage rec {
     hash = "sha256-wrMN3kqLnjItoybKYeo4Pp2M0uma7Kg0JEQM8lr6OI0=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-to_bytes-tests.patch";
+      url = "https://github.com/aleaxit/gmpy/commit/1903841667e7a6842bdead90bd7798b99de5b7be.patch?full_index=1";
+      hash = "sha256-rlssUIkQ1RCRSu5eCXKJ2lNa/oIoLzf9sxJuNfDrVmk=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   buildInputs = [
@@ -50,18 +59,6 @@ buildPythonPackage rec {
     mpmath
   ];
 
-  disabledTests =
-    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # issue with some overflow logic
-      "test_mpz_to_bytes"
-      "test_mpz_from_bytes"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # TypeError: mpq() requires numeric or string argument
-      # not sure why it only fails on Darwin
-      "test_mpq_from_Decimal"
-    ];
-
   pythonImportsCheck = [ "gmpy2" ];
 
   passthru.tests = {
diff --git a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
index 4555e9772d1f..307066a46888 100644
--- a/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
+++ b/pkgs/development/python-modules/google-ai-generativelanguage/default.nix
@@ -11,21 +11,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-ai-generativelanguage";
-  version = "0.6.18";
+  version = "0.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_ai_generativelanguage";
     inherit version;
-    hash = "sha256-J0up/PaUZv9k6XHVZYhENDiOUjMAr9Ro/I4wM82OYG4=";
+    hash = "sha256-JSR0j0E5F0Rv68jgh53A1PAmoGT4nxfEK4G+p3q3bIQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-api-core/default.nix b/pkgs/development/python-modules/google-api-core/default.nix
index 1f30f82d7f07..7cb99ac62011 100644
--- a/pkgs/development/python-modules/google-api-core/default.nix
+++ b/pkgs/development/python-modules/google-api-core/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-core";
-  version = "2.25.1";
+  version = "2.26.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-api-core";
     tag = "v${version}";
-    hash = "sha256-lh4t03upQQxY2KGwucXfEeNvqVVXlZ6hjR/e47imetk=";
+    hash = "sha256-BA2OWzr0sH77YUkFqMsGJQppqbG3R4sQ2kepicdzejE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix
index 304595531a24..54360a12fd12 100644
--- a/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/pkgs/development/python-modules/google-api-python-client/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "google-api-python-client";
-  version = "2.177.0";
+  version = "2.185.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-api-python-client";
     tag = "v${version}";
-    hash = "sha256-CEjbUIXtG5z1/28DsNCm/npMSd/+DyY5PMJHm9XDe2M=";
+    hash = "sha256-uItN7P6tZTxEHfma+S0p4grRRnAaIhuTezvJzWjvkfE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index b66e813e9dce..d62b2797bb78 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth-oauthlib";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-auth-library-python-oauthlib";
-    rev = "v${version}";
-    sha256 = "sha256-nkXS1vNsq7k30EmNHclRblsmGTMYuIAaHuaVDORqRmc=";
+    tag = "v${version}";
+    hash = "sha256-1BBtEZfCVTLnbIJQV2o0uXNuAic/ArmgHoAIIJVKRrg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index e0389c8f8f41..d9e435c32486 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.40.3";
+  version = "2.41.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-auth-library-python";
     tag = "v${version}";
-    hash = "sha256-X1HTh24oos2GUxB9DDLtNH7BsBRLD0S/ngjsDAQYvhI=";
+    hash = "sha256-EPiI3cJy+NkT1oyKZJKcvQwAb64UQZDSNfWorZjIew8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 59bdc18cf49c..e9731f1ff1bd 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -25,13 +25,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-bigtable";
     tag = "v${version}";
-    hash = "sha256-32+UMTfnSncDsSnN54MjRE4eL1PXsUdblnxe/rj5Pqc=";
+    hash = "sha256-KPibMigfBJ2sE/QVgTjr7901dzj+/hWbOYz92naUxMw=";
   };
 
   pyproject = true;
diff --git a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
index c6d817c55e2f..beb566975a2f 100644
--- a/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam-logging/default.nix
@@ -9,21 +9,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-iam-logging";
-  version = "1.4.3";
+  version = "1.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_iam_logging";
     inherit version;
-    hash = "sha256-fmS+DTZciJ1BWMk6pxAVe/7Lgt0Xk+uyS5DCRYXAOEA=";
+    hash = "sha256-CmUvHm1DVA/bRejKm+T8VonVlHy6Dmk1uytz3tfAVGk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-iam/default.nix b/pkgs/development/python-modules/google-cloud-iam/default.nix
index a519eee42309..48b80a05fefd 100644
--- a/pkgs/development/python-modules/google-cloud-iam/default.nix
+++ b/pkgs/development/python-modules/google-cloud-iam/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-iam";
-  version = "2.19.0";
+  version = "2.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
     tag = "google-cloud-iam-v${version}";
-    hash = "sha256-E1LISOLQcXqUMTTPLR+lwkR6gF1fuGGB44j38cIK/Z4=";
+    hash = "sha256-ICSBKEqNaXZZopGDwB0pkt06xN0gnsTBUA/HCQVxQTU=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-iam";
diff --git a/pkgs/development/python-modules/google-cloud-kms/default.nix b/pkgs/development/python-modules/google-cloud-kms/default.nix
index 508a28a22356..f0aa00153a76 100644
--- a/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/pkgs/development/python-modules/google-cloud-kms/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-kms";
-  version = "3.4.1";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-cloud-python";
     tag = "google-cloud-kms-v${version}";
-    hash = "sha256-5PzidE1CWN+pt7+gcAtbuXyL/pq6cnn0MCRkBfmeUSw=";
+    hash = "sha256-/ZBpSn6bZpzFgIg3LmfV7xMowh9Gpslw0fcN021jAow=";
   };
 
   sourceRoot = "${src.name}/packages/google-cloud-kms";
diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
index ee8d07c264bb..f56cc87aea13 100644
--- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-network-connectivity";
-  version = "2.10.0";
+  version = "2.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "google_cloud_network_connectivity";
-    hash = "sha256-wbznAUjwh57xuvuLWOrk1eXvxuDE+wWh6Cx3oQI8dqE=";
+    hash = "sha256-PBqFMVGTn7si4UgAc4zk/97M9mWSnVJMX9gZk0eXpSY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 16fa3d531908..3bf88361e6cd 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.21.0";
+  version = "1.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_os_config";
     inherit version;
-    hash = "sha256-NKdb/E9CO1Zp98kHcvqYNIr0L27C+ijQ1ulT3p58qSk=";
+    hash = "sha256-15oxD2+hznRwqqCExw443AXZhTH0aPghs6Um5NM6cOQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 4afe356dd625..5851550c7153 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.31.1";
+  version = "2.33.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-9CFPaS2kNa/N+0HnfPqWIjjbluSkumRjeqpxBELZxTI=";
+    hash = "sha256-g7xQxU9mnvuSStIThbxwkvoR91duq+89C016qO+pCqY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index 8fd3e422f84b..ff87c32cbe2a 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -9,21 +9,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-shell";
-  version = "1.12.1";
+  version = "1.13.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_shell";
     inherit version;
-    hash = "sha256-nRuFxyxtJmKiI0BtV8VEu8mRZ5JU2S0gGU9aef9I6Zg=";
+    hash = "sha256-B6SZJm7rGZDIFbF0kHPcBidBF0d+ONIKtUcpjwslkgE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-storage/default.nix b/pkgs/development/python-modules/google-cloud-storage/default.nix
index 04b83a3d15e6..521c9769bc7d 100644
--- a/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/pkgs/development/python-modules/google-cloud-storage/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-storage";
-  version = "3.3.0";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-storage";
     tag = "v${version}";
-    hash = "sha256-I0wC/BV8fJr3JW1nyq2TPJZlZaT4+h2lJBdGTttSzRo=";
+    hash = "sha256-fLS1rrblNKm8dTG/Srg6IfcEjeZCS2QGNwW6ZXIo7UQ=";
   };
 
   pythonRelaxDeps = [ "google-auth" ];
diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 5341b129dd2d..1286c6facfd3 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -8,21 +8,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-texttospeech";
-  version = "2.31.0";
+  version = "2.33.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "google_cloud_texttospeech";
     inherit version;
-    hash = "sha256-HwwMZEjxdeHi9j2W+xOvXZq+5pcLuyLB5ANvUxNqVYg=";
+    hash = "sha256-MRFXt0IQzEd38UiramK8LMJLP1Kn3BBsCgIjwYMLYY8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index fcab6d14a0fc..c0914efd7b3c 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -11,21 +11,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.21.1";
+  version = "3.22.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_translate";
     inherit version;
-    hash = "sha256-dg8l4bl5/qalncpE/8io3HCGk8UK43o5Vo/xKExTS+I=";
+    hash = "sha256-yaDlK4VG8AlkBiifa+dB+Q6kGhTAWpjpbSkr/vGsfnM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index f7f2a5bd3221..8ec1197ec2e6 100644
--- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-videointelligence";
-  version = "2.16.2";
+  version = "2.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_videointelligence";
     inherit version;
-    hash = "sha256-SFv8MKhswRsxtYqpp6hA46WsW8eLFuhlOYnaV6TWmPk=";
+    hash = "sha256-AAi05hjj6oNYg+Ay2GYMhsa5M8mP4L+t2gNghv8DcoQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index f6aa2a3fae52..5d232589127e 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -8,21 +8,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-vision";
-  version = "3.10.2";
+  version = "3.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_vision";
     inherit version;
-    hash = "sha256-ZJOA+quJM0QLYyv4gHLAw4KgjUmrArwLT7qCGIKuF2U=";
+    hash = "sha256-w8tX3yzxUuvmLrqumx1d7/Wiauxb1uHH9n5Ev29FGPQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
index 30e901e3cbc7..72365208b378 100644
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@@ -9,21 +9,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-vpc-access";
-  version = "1.13.2";
+  version = "1.14.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "google_cloud_vpc_access";
     inherit version;
-    hash = "sha256-bfTho0kyaAQRWjAZJWFd/NFJ+EY7ZEtdOGcbb3MnJ6s=";
+    hash = "sha256-N1CpDs/TgSCjJOnNwOJCaS7MWur95uoztvl+R5DjYC0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index ad6b545c1306..81a1af721fb0 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -9,21 +9,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-webrisk";
-  version = "1.18.1";
+  version = "1.19.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_webrisk";
     inherit version;
-    hash = "sha256-3OUxiDZtRfmipeyCW8in6+GkVnlilWgE8Hzr6G+1KQU=";
+    hash = "sha256-TuWU+3pfwFt8E06zUDAY8+JJb+2j4l/eHP7Y0dgE0gs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 14ba809b0cad..c2b5a2fb06fa 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -8,21 +8,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
-  version = "1.17.3";
+  version = "1.18.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_websecurityscanner";
     inherit version;
-    hash = "sha256-Bmi8LH4HtxlnLsDtpSG1BQYp5yg4gEaKzLxPIUwPemM=";
+    hash = "sha256-JjW9Rifp3BZIjAzs94trQj1RJAHLzll+tDksV/e1rag=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix
index 09c61243b19c..d54d22e75f9f 100644
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-workflows";
-  version = "1.18.2";
+  version = "1.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_workflows";
     inherit version;
-    hash = "sha256-S7k2QZv+EQyfZ6RjG+NA/+a9IBQpnMTE+TIbXlIC1N8=";
+    hash = "sha256-SODiguyX82EPPvm3wvRp7tAcArNINmc9c1+WkkKPNHE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index 8ebd364bb461..435e1af48a26 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -10,21 +10,18 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "google-cloud-workstations";
-  version = "0.5.15";
+  version = "0.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "google_cloud_workstations";
     inherit version;
-    hash = "sha256-/lpcGxxc1razAXmESpn6JfVYkqj5gRoLiyWM3vXlqWk=";
+    hash = "sha256-/CwdmF9fSTDPXbWTq3o+ZaWvgd/F2wVB7zboSOQ7+GY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 3f2cb9c04844..85a752ea301d 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -9,14 +9,14 @@
 }:
 buildPythonPackage rec {
   pname = "gotenberg-client";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "gotenberg-client";
     tag = version;
-    hash = "sha256-a/GXVhZtxGgmx5mb8hozbXAI9ecrl0c6BIz3BNekA8Q=";
+    hash = "sha256-+beO1Pp+ikfk4gqpfvIEHCOPZGLanGX6Kw4mqJglJTI=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index 3413143a8fc2..a2ecfd8064c5 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -8,22 +8,19 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
 buildPythonPackage rec {
   pname = "govee-ble";
-  version = "0.45.0";
+  version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "govee-ble";
     tag = "v${version}";
-    hash = "sha256-SUxK4H0Vo8C4GykIv8duFhhiGBA860QofVQDO37Ubdw=";
+    hash = "sha256-CYxPb5v7T+sp+2HJojGEVPIIaC0ySobiSK8qtHeuv7s=";
   };
 
   build-system = [ poetry-core ];
@@ -42,11 +39,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "govee_ble" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for Govee BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/govee-ble";
     changelog = "https://github.com/bluetooth-devices/govee-ble/blob/${src.tag}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/gpapi/default.nix b/pkgs/development/python-modules/gpapi/default.nix
deleted file mode 100644
index 9399e547a050..000000000000
--- a/pkgs/development/python-modules/gpapi/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  buildPythonPackage,
-  cryptography,
-  fetchPypi,
-  lib,
-  protobuf,
-  pycryptodome,
-  requests,
-  protobuf_27,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  version = "0.4.4";
-  pname = "gpapi";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "sha256-HA06ie25ny7AXI7AvZgezvowfZ3ExalY8HDkk7betyo=";
-  };
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail 'PROTOC_EXEC = "protoc"' 'PROTOC_EXEC = "${lib.getExe protobuf_27}"'
-  '';
-
-  build-system = [ setuptools ];
-
-  buildInputs = [
-    protobuf_27
-  ];
-
-  dependencies = [
-    cryptography
-    protobuf
-    pycryptodome
-    requests
-  ];
-
-  preBuild = ''
-    export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION="python"
-  '';
-
-  # package doesn't contain unit tests
-  # scripts in ./test require networking
-  doCheck = false;
-
-  pythonImportsCheck = [ "gpapi.googleplay" ];
-
-  meta = {
-    homepage = "https://github.com/NoMore201/googleplay-api";
-    license = lib.licenses.gpl3Only;
-    description = "Google Play Unofficial Python API";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index b9475c9dedc8..50ea60c8caa3 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.6.2";
+  version = "2.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jim-easterbrook";
     repo = "python-gphoto2";
     tag = "v${version}";
-    hash = "sha256-Z480HR9AlwJQI1yi8+twzHV9PMcTKWqtvoNw6ohV+6M=";
+    hash = "sha256-inxKfZ/u7b9Kx1ytmEKJsK2PnnrhSI54A2Dm6Mtxnmc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/gplaycli/default.nix b/pkgs/development/python-modules/gplaycli/default.nix
deleted file mode 100644
index 9a726833c0a7..000000000000
--- a/pkgs/development/python-modules/gplaycli/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  lib,
-  args,
-  buildPythonPackage,
-  clint,
-  fetchFromGitHub,
-  libffi,
-  matlink-gpapi,
-  ndg-httpsclient,
-  protobuf,
-  pyasn1,
-  pyaxmlparser,
-  pytestCheckHook,
-  pythonOlder,
-  requests,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "gplaycli";
-  version = "3.29";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.6";
-
-  src = fetchFromGitHub {
-    owner = "matlink";
-    repo = "gplaycli";
-    tag = version;
-    hash = "sha256-uZBrIxnDSaJDOPcD7J4SCPr9nvecDDR9h+WnIjIP7IE=";
-  };
-
-  propagatedBuildInputs = [
-    libffi
-    pyasn1
-    clint
-    ndg-httpsclient
-    protobuf
-    requests
-    args
-    matlink-gpapi
-    pyaxmlparser
-    setuptools
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  pythonImportsCheck = [ "gplaycli" ];
-
-  preCheck = ''
-    export PATH="$PATH:$out/bin";
-  '';
-
-  disabledTests = [
-    "test_alter_token"
-    "test_another_device"
-    "test_connection_credentials"
-    "test_connection_token"
-    "test_download_additional_files"
-    "test_download_focus"
-    "test_download_version"
-    "test_download"
-    "test_search"
-    "test_update"
-  ];
-
-  meta = with lib; {
-    description = "Google Play Downloader via Command line";
-    mainProgram = "gplaycli";
-    homepage = "https://github.com/matlink/gplaycli";
-    changelog = "https://github.com/matlink/gplaycli/releases/tag/${version}";
-    license = licenses.agpl3Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix
index d4669e89e001..1a27da65f4e2 100644
--- a/pkgs/development/python-modules/gpuctypes/default.nix
+++ b/pkgs/development/python-modules/gpuctypes/default.nix
@@ -103,7 +103,7 @@ buildPythonPackage rec {
   };
 
   preCheck = lib.optionalString (cudaSupport && !testCudaRuntime) ''
-    addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs
+    addToSearchPath LD_LIBRARY_PATH ${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs
   '';
 
   # If neither rocmSupport or cudaSupport is enabled, no tests are selected
diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix
index 08db11be0e4f..e6ac8ecadd65 100644
--- a/pkgs/development/python-modules/gpytorch/default.nix
+++ b/pkgs/development/python-modules/gpytorch/default.nix
@@ -2,27 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
   jaxtyping,
   linear-operator,
   mpmath,
   scikit-learn,
   scipy,
-  setuptools,
-  setuptools-scm,
   torch,
+
+  # tests
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "gpytorch";
-  version = "1.14";
+  version = "1.14.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cornellius-gp";
     repo = "gpytorch";
     tag = "v${version}";
-    hash = "sha256-whZjqAs3nyjKMzAGi+OnyBtboq0UuV8m11A4IzkWtec=";
+    hash = "sha256-yDIGiA7q4e6T7SdnO+ALcc3ezmJK964T5Nn48+NGJV8=";
   };
 
   build-system = [
@@ -30,8 +36,6 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  pythonRelaxDeps = [ "jaxtyping" ];
-
   dependencies = [
     jaxtyping
     linear-operator
@@ -56,10 +60,12 @@ buildPythonPackage rec {
     "test_t_matmul_matrix"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Highly efficient and modular implementation of Gaussian Processes, with GPU acceleration";
     homepage = "https://gpytorch.ai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ veprbl ];
+    downloadPage = "https://github.com/cornellius-gp/gpytorch";
+    changelog = "https://github.com/cornellius-gp/gpytorch/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }
diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 554bf9e0d676..5bbceb734299 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "granian";
-  version = "2.5.5";
+  version = "2.5.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
     tag = "v${version}";
-    hash = "sha256-+KHszcVpfa3FiWUlSQxHDqxnd/ezWdWt430ULW2+83g=";
+    hash = "sha256-XSDBSl7QWqIN5u48z4H5yPHR+ltRmmmrP0JSmvcCcsA=";
   };
 
   # Granian forces a custom allocator for all the things it runs,
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-kul1U002f154ghMqeVuuqizVx2LtIyCkmAA08KyjW3U=";
+    hash = "sha256-zQAHJcBWNx5IT/t2wtm7UeOfVNnvfowcp137TePnwiM=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix
index 73aae4900de8..224559694d4f 100644
--- a/pkgs/development/python-modules/great-tables/default.nix
+++ b/pkgs/development/python-modules/great-tables/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "great-tables";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "great-tables";
     tag = "v${version}";
-    hash = "sha256-bxeVVBGLS1yUaEnySCu1Ty1+bmoygMwQzBHMmtzm/+U=";
+    hash = "sha256-3SyY3mI5fd0S5pi1vG+BQaWHv/qB2L6vlIXxjO4UO1E=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix
index 0b9631179569..2ffdbcc4c8de 100644
--- a/pkgs/development/python-modules/greynoise/default.nix
+++ b/pkgs/development/python-modules/greynoise/default.nix
@@ -17,6 +17,9 @@
   pytestCheckHook,
   mock,
   pythonOlder,
+  # The REPL depends on click-repl, which is incompatible with our version of
+  # click.
+  withRepl ? false,
 }:
 
 buildPythonPackage rec {
@@ -33,22 +36,32 @@ buildPythonPackage rec {
     hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s=";
   };
 
+  patches = lib.optionals (!withRepl) [
+    ./remove-repl.patch
+  ];
+
   build-system = [
     hatchling
   ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
+
   dependencies = [
     click
     ansimarkup
     cachetools
     colorama
     click-default-group
-    click-repl
     dict2xml
     jinja2
     more-itertools
     requests
     six
+  ]
+  ++ lib.optionals withRepl [
+    click-repl
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/greynoise/remove-repl.patch b/pkgs/development/python-modules/greynoise/remove-repl.patch
new file mode 100644
index 000000000000..88f46af3bdc3
--- /dev/null
+++ b/pkgs/development/python-modules/greynoise/remove-repl.patch
@@ -0,0 +1,37 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 9c5950e..f19a5db 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -33,7 +33,6 @@ dependencies = [
+     "cachetools",
+     "colorama",
+     "click-default-group",
+-    "click-repl",
+     "dict2xml",
+     "jinja2",
+     "more-itertools>=8.14.0",
+@@ -53,4 +52,4 @@ greynoise = "greynoise.cli:main"
+ packages = ["src/greynoise"]
+ 
+ [tool.hatch.build.targets.wheel.shared-data]
+-"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates" 
+\ No newline at end of file
++"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates"
+diff --git a/src/greynoise/cli/__init__.py b/src/greynoise/cli/__init__.py
+index a7c22ea..9d26d3e 100644
+--- a/src/greynoise/cli/__init__.py
++++ b/src/greynoise/cli/__init__.py
+@@ -2,7 +2,6 @@
+ 
+ import click
+ from click_default_group import DefaultGroup
+-from click_repl import register_repl
+ 
+ from greynoise.cli import subcommand
+ 
+@@ -24,5 +23,3 @@ SUBCOMMAND_FUNCTIONS = [
+ 
+ for subcommand_function in SUBCOMMAND_FUNCTIONS:
+     main.add_command(subcommand_function)
+-
+-register_repl(main)
diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 70db8134153d..f0e60c517667 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "groq";
-  version = "0.32.0";
+  version = "0.33.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "groq";
     repo = "groq-python";
     tag = "v${version}";
-    hash = "sha256-31doHBwdZWlEb1tk0OjfLciPhde0kfiMY6heiXDvnWI=";
+    hash = "sha256-DR5/g/SQZ1445k2nF9cXzyaoGz3QNKvwNPBY5kWngRM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 8503cf2e76ce..04c7b91a6dc3 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-channelz";
-  version = "1.75.0";
+  version = "1.76.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_channelz";
     inherit version;
-    hash = "sha256-1SGXOjQ4Bqg4S/h86uk88unxD4+rAsEr56Lj1dDk5o8=";
+    hash = "sha256-KrFe97IlKpujHfUAu+KVzlMQqLAepvbWehcXLZFKQag=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index 419872582d45..461484ac9645 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -11,13 +11,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-health-checking";
-  version = "1.75.0";
+  version = "1.76.0";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "grpcio_health_checking";
     inherit version;
-    hash = "sha256-TeXrJwlihA9g4Ynr3b/P4jK17Pz2GN1TQRam9mhLQL8=";
+    hash = "sha256-t6mddAlrOrOlmYf8AjdAaOHBgKNS6NH3nxDlojcnCY0=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 3d5886bfc494..5374f5da493d 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-reflection";
-  version = "1.75.0";
+  version = "1.76.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_reflection";
     inherit version;
-    hash = "sha256-YLuYZfVBGtWJQg6tzdfgwzjAqr7fXUzQc2PVv32pyXI=";
+    hash = "sha256-4OfkmSHC7pUeXd/wvbrL0awacIiL62HVZ/PQG3md7LE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 4c26accf3eba..f7d888c7e22d 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -13,7 +13,7 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.75.0";
+  version = "1.76.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_status";
     inherit version;
-    hash = "sha256-adW5G+G4uSbwhsHEg1GalowUZAdzoMzdbAQoJRXb7fc=";
+    hash = "sha256-Jfy/7HTBXRoctdo/q47pZyhS3Balqe61uvfXqZUpQ80=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index 5537e6a1caca..7a5d7e0ef693 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -13,7 +13,7 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-testing";
-  version = "1.75.0";
+  version = "1.76.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_testing";
     inherit version;
-    hash = "sha256-UuDE9gL6rQAK4a/PnZVDdyd+t8lhTMXJ+CspAHbEBbs=";
+    hash = "sha256-loQmPvqyo9xRFBeDOx5qB1hZfic6Ibbb8XwXAizvfCQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index c8af7dfff691..95baa1a69e6e 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.75.0";
+  version = "1.76.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_tools";
     inherit version;
-    hash = "sha256-615AJQNNkto8gf1eNGjDPVrnVxsHpyw4W17BdGZYVz8=";
+    hash = "sha256-zoAWm15q3z6DAvPrtssMOp8ICJEzq8pLdq1n91H1rYg=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 81a5e604af72..e88a79dd7f12 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -19,14 +19,14 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.75.0";
+  version = "1.76.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uYnosJSJR4wtGf7MdEopiTD0DYsnw2OK+/6E0i82zk4=";
+    hash = "sha256-e+eDiNbaGiXA1exQZSPbWLGL4i2cN9jToywIvkmHvXM=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index e1c167319a32..e4964bee1541 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   certifi,
   faker,
   fetchFromGitHub,
+  fetchpatch,
   googleapis-common-protos,
   h2,
   multidict,
@@ -28,6 +28,15 @@ buildPythonPackage rec {
     hash = "sha256-Z+DMwGMUxNTQ7ABd4q/FgMHEZ/NCOtst+6QfQJm3jVU=";
   };
 
+  patches = [
+    # https://github.com/vmagamedov/grpclib/pull/209
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio-timeout-patch";
+      url = "https://github.com/vmagamedov/grpclib/commit/36b23ce3ca3f1742e39b50f939d13cd08b4f28ac.patch";
+      hash = "sha256-3ztLBOFpTK8CFIp8a6suhWXY5kIBCBRWBX/oAyYU4yI=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -38,7 +47,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio_0
-    async-timeout
     faker
     googleapis-common-protos
     certifi
diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 12e20e097e81..1ac7962800a6 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -6,6 +6,9 @@
   fetchpatch,
   meson,
   ninja,
+  # TODO: We can get rid of this once `buildPythonPackage` accepts `finalAttrs`.
+  # See: https://github.com/NixOS/nixpkgs/pull/271387
+  gst-python,
 
   pkg-config,
   python,
@@ -40,14 +43,10 @@ buildPythonPackage rec {
       stripLen = 2;
       hash = "sha256-BfWPc8dsB09KiEm9bNT8e+jH76jiDefQlEhhLJoq7tI=";
     })
-  ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # The analytics tests often timeout under load on Darwin (e.g. on Hydra), so remove them
-    substituteInPlace testsuite/meson.build --replace-fail \
-      "['Test analytics', 'test_analytics.py', ['gst-plugins-bad/gst-libs/gst/analytics', 'gst-plugins-base/gst-libs/gst/video']]," \
-      ""
-  '';
+    # https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4322
+    ./skip-failing-test-not-initialized.patch
+  ];
 
   # Python 2.x is not supported.
   disabled = !isPy3k;
@@ -80,11 +79,24 @@ buildPythonPackage rec {
     "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"
     # Exec format error during configure
     "-Dpython-exe=${python.pythonOnBuildForHost.interpreter}"
+    # This is needed to prevent the project from looking for `gst-rtsp-server`
+    # from `checkInputs`.
+    #
+    # TODO: This should probably be moved at least partially into the Meson hook.
+    #
+    # NB: We need to use `doInstallCheck` here because `buildPythonPackage`
+    # renames `doCheck` to `doInstallCheck`.
+    (lib.mesonEnable "tests" gst-python.doInstallCheck)
   ];
 
-  # TODO: Meson setup hook does not like buildPythonPackage
-  # https://github.com/NixOS/nixpkgs/issues/47390
-  installCheckPhase = "meson test --print-errorlogs";
+  # Tests are very flaky on Darwin.
+  # See: https://github.com/NixOS/nixpkgs/issues/454955
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
+  # `buildPythonPackage` uses `installCheckPhase` and leaves `checkPhase`
+  # empty. It renames `doCheck` from its arguments, but not `checkPhase`.
+  # See: https://github.com/NixOS/nixpkgs/issues/47390
+  installCheckPhase = "mesonCheckPhase";
 
   preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
     export DYLD_LIBRARY_PATH="${gst_all_1.gst-plugins-base}/lib"
diff --git a/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch
new file mode 100644
index 000000000000..169c85a0802c
--- /dev/null
+++ b/pkgs/development/python-modules/gst-python/skip-failing-test-not-initialized.patch
@@ -0,0 +1,50 @@
+diff --git a/testsuite/test_gst.py b/testsuite/test_gst.py
+index 2111b968..fd8a4627 100644
+--- a/testsuite/test_gst.py
++++ b/testsuite/test_gst.py
+@@ -38,45 +38,6 @@ class TimeArgsTest(TestCase):
+         self.assertEqual(Gst.TIME_ARGS(Gst.SECOND), '0:00:01.000000000')
+ 
+ 
+-class TestNotInitialized(TestCase):
+-    def testNotInitialized(self):
+-        if sys.version_info >= (3, 0):
+-            assert_type = Gst.NotInitialized
+-        else:
+-            assert_type = TypeError
+-
+-        with self.assertRaises(assert_type):
+-            Gst.Caps.from_string("audio/x-raw")
+-
+-        with self.assertRaises(assert_type):
+-            Gst.Structure.from_string("audio/x-raw")
+-
+-        with self.assertRaises(assert_type):
+-            Gst.ElementFactory.make("identity", None)
+-
+-    def testNotDeinitialized(self):
+-        Gst.init(None)
+-
+-        assert(Gst.Caps.from_string("audio/x-raw"))
+-        assert(Gst.Structure.from_string("audio/x-raw"))
+-        assert(Gst.ElementFactory.make("identity", None))
+-
+-        Gst.deinit()
+-        if sys.version_info >= (3, 0):
+-            assert_type = Gst.NotInitialized
+-        else:
+-            assert_type = TypeError
+-
+-        with self.assertRaises(assert_type):
+-            Gst.Caps.from_string("audio/x-raw")
+-
+-        with self.assertRaises(assert_type):
+-            Gst.Structure.from_string("audio/x-raw")
+-
+-        with self.assertRaises(assert_type):
+-            Gst.ElementFactory.make("identity", None)
+-
+-
+ class TestStructure(TestCase):
+ 
+     def test_new(self):
diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
index 36b3f6835d75..24bc7eb2ed4f 100644
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -29,6 +29,9 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
   dependencies = [
     beautifulsoup4
     click
@@ -53,12 +56,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gtts" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library and CLI tool to interface with Google Translate text-to-speech API";
     mainProgram = "gtts-cli";
     homepage = "https://gtts.readthedocs.io";
     changelog = "https://gtts.readthedocs.io/en/latest/changelog.html";
-    license = licenses.mit;
-    maintainers = with maintainers; [ unode ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ unode ];
   };
 }
diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 00bf53c9cd2e..ac4854c13f86 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -5,22 +5,18 @@
   poetry-core,
   pytestCheckHook,
   python-gvm,
-  pythonAtLeast,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "gvm-tools";
-  version = "25.4.0";
+  version = "25.4.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "gvm-tools";
     tag = "v${version}";
-    hash = "sha256-d5/oVQxhZGxGXwdGMojGQ4SiMUiQfxgcR2oF5Lq1+RM=";
+    hash = "sha256-mhQX9yBH8mQ+ESZzqM2VC4bfktI677Y/dli/YWTYRhE=";
   };
 
   __darwinAllowLocalNetworking = true;
@@ -34,8 +30,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Don't test sending
     "SendTargetTestCase"
-  ]
-  ++ lib.optionals (pythonAtLeast "3.10") [ "HelpFormattingParserTestCase" ];
+    "HelpFormattingParserTestCase"
+  ];
 
   pythonImportsCheck = [ "gvmtools" ];
 
@@ -43,7 +39,7 @@ buildPythonPackage rec {
     description = "Collection of APIs that help with remote controlling a Greenbone Security Manager";
     homepage = "https://github.com/greenbone/gvm-tools";
     changelog = "https://github.com/greenbone/gvm-tools/releases/tag/${src.tag}";
-    license = with licenses; [ gpl3Plus ];
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 764a9cda9e28..28c3e53d8128 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -100,6 +100,9 @@ buildPythonPackage rec {
     # The requested array has an inhomogeneous shape after 1 dimensions.
     # The detected shape was (2,) + inhomogeneous part
     "test_sample_contains"
+
+    # segfault
+    "test_record_video"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Fatal Python error: Aborted
diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix
index 79fbf315b7e6..8f1e182d4347 100644
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@@ -38,7 +38,7 @@
 
 buildPythonPackage rec {
   pname = "gymnasium";
-  version = "1.2.1";
+  version = "1.2.2";
 
   pyproject = true;
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     owner = "Farama-Foundation";
     repo = "gymnasium";
     tag = "v${version}";
-    hash = "sha256-KevA7AW73ppN6KuE0jAE3xfm/1ZWZxHtHbeNM6RC9yI=";
+    hash = "sha256-GD/ZC6BRcsIiVrvTz3j2hg10tbJMfCou/ydUFbC2fc4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ha-ffmpeg/default.nix b/pkgs/development/python-modules/ha-ffmpeg/default.nix
index 0fb335c14ae7..3908c424f9e5 100644
--- a/pkgs/development/python-modules/ha-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/ha-ffmpeg/default.nix
@@ -12,8 +12,6 @@ buildPythonPackage rec {
   version = "3.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "ha-ffmpeg";
@@ -23,7 +21,13 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  dependencies = [ async-timeout ];
+  pythonRemoveDeps = [
+    "async_timeout"
+  ];
+
+  dependencies = lib.optionals (pythonOlder "3.11") [
+    async-timeout
+  ];
 
   # only manual tests
   doCheck = false;
diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
index 7ec606f2aa9a..3d63444e20e5 100644
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ha-mqtt-discoverable";
-  version = "0.21.0";
+  version = "0.22.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable";
     tag = "v${version}";
-    hash = "sha256-p9qzK2pQDDLB6UVGNWYMd8M5/NicNbM4bnffxen48hQ=";
+    hash = "sha256-6xUfR9LR8xphex6EVX3u9VKjtvHhTX1EkC8KGPFtJzk=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
index dd983d98cdd4..dbe4b27569dd 100644
--- a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
+++ b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ha-silabs-firmware-client";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "ha-silabs-firmware-client";
     tag = "v${version}";
-    hash = "sha256-Kip9JL9tuF7OI22elN0w2Z7Xjdaayboo8LThp4FAets=";
+    hash = "sha256-OCDMJtcgBfVKATJQgqH/YuEU8112tSBjqT81jDUu4b8=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/habiticalib/default.nix b/pkgs/development/python-modules/habiticalib/default.nix
index 420c4b7a5f5f..f4093c11ac3a 100644
--- a/pkgs/development/python-modules/habiticalib/default.nix
+++ b/pkgs/development/python-modules/habiticalib/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "habiticalib";
-  version = "0.4.5";
+  version = "0.4.6";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "tr4nt0r";
     repo = "habiticalib";
     tag = "v${version}";
-    hash = "sha256-9IMC4MkL5hRCDjeuSuLBcn986LmO/zz32NV0RGTEf1M=";
+    hash = "sha256-Z3VJ0AaB4HeCOffV5B2WFIvGJXoCn1isNPMnERoUrp0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix
index 28e59ce21a18..baa1d0d4b343 100644
--- a/pkgs/development/python-modules/harlequin-postgres/default.nix
+++ b/pkgs/development/python-modules/harlequin-postgres/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "harlequin-postgres";
-  version = "1.2.0";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "harlequin_postgres";
     inherit version;
-    hash = "sha256-9US0aaXP2F+UVM9pY43KpnB05KC0/uDxrpZAYOJ+RR0=";
+    hash = "sha256-u/x8Jx1yfUtFSYX6oyvOZJmdPWbaOkFn3OGQdqxyK8A=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index e231e8ab6013..a5480e992abe 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -2,6 +2,7 @@
   lib,
   acme,
   aiohttp,
+  async-timeout,
   atomicwrites-homeassistant,
   attrs,
   buildPythonPackage,
@@ -9,6 +10,7 @@
   cryptography,
   fetchFromGitHub,
   freezegun,
+  josepy,
   pycognito,
   pyjwt,
   pytest-aiohttp,
@@ -20,13 +22,15 @@
   setuptools,
   snitun,
   syrupy,
+  voluptuous,
   webrtc-models,
   xmltodict,
+  yarl,
 }:
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "1.1.1";
+  version = "1.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -35,7 +39,7 @@ buildPythonPackage rec {
     owner = "nabucasa";
     repo = "hass-nabucasa";
     tag = version;
-    hash = "sha256-4wqlV3stqbraiDBp/g5XNMiUR8SsmGggqXlq6MXXgbM=";
+    hash = "sha256-BYRVr8YWYG+6vmCFCEJH0v2s+EpefDxmcBMHkXHRCrA=";
   };
 
   postPatch = ''
@@ -54,15 +58,19 @@ buildPythonPackage rec {
   dependencies = [
     acme
     aiohttp
+    async-timeout
     atomicwrites-homeassistant
     attrs
     ciso8601
     cryptography
+    josepy
     pycognito
     pyjwt
     sentence-stream
     snitun
+    voluptuous
     webrtc-models
+    yarl
   ];
 
   nativeCheckInputs = [
@@ -75,11 +83,6 @@ buildPythonPackage rec {
     xmltodict
   ];
 
-  disabledTests = [
-    # mock time 10800s (3h) vs 43200s (12h)
-    "test_subscription_reconnection_handler_renews_and_starts"
-  ];
-
   pythonImportsCheck = [ "hass_nabucasa" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix
index 7400218e1504..0f20119deaa0 100644
--- a/pkgs/development/python-modules/hassil/default.nix
+++ b/pkgs/development/python-modules/hassil/default.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "hassil";
-  version = "3.2.0";
+  version = "3.4.0";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = "hassil";
     tag = "v${version}";
-    hash = "sha256-X+VOcgOFcdb29VfJCfD1xBEqY/1qbfwViS/N9PsT2y8=";
+    hash = "sha256-rroljEJ0xXW15iKmW6C64+h8epNB6XJzKtylA/wKyWQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/hatch-sphinx/default.nix b/pkgs/development/python-modules/hatch-sphinx/default.nix
new file mode 100644
index 000000000000..a9454511dd6a
--- /dev/null
+++ b/pkgs/development/python-modules/hatch-sphinx/default.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  sphinx,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "hatch-sphinx";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "llimeht";
+    repo = "hatch-sphinx";
+    tag = "v${version}";
+    hash = "sha256-8g0UkDMf05CVd2VbnV30pZpQ9chJhCkKfci7zmcIOoQ=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    hatchling
+    sphinx
+  ];
+
+  pythonImportsCheck = [ "hatch_sphinx" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # /nix/store/62fdlzq1x1ak2lsxp4ij7ip5k9nia3hc-python3-3.13.7/bin/python3.13: No module named build
+    "test_tool_apidoc"
+    "test_tool_build"
+    "test_tool_custom_lists_globs"
+    "test_tool_custom_lists_noglobs"
+    "test_tool_custom_strings"
+  ];
+
+  meta = {
+    description = "Hatchling build plugin for Sphinx documentation";
+    homepage = "https://github.com/llimeht/hatch-sphinx";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix
index 13b1120e82ae..98e8494cd0a2 100644
--- a/pkgs/development/python-modules/hcloud/default.nix
+++ b/pkgs/development/python-modules/hcloud/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "hcloud";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5ehqw5qERzR5+RCetWgu9npjdMFDHRWMO/dEMqCIPSs=";
+    hash = "sha256-MkYvojUd20ehps6whNcMg1hRgiTkS04Bl/LlwPZ62O8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/highered/default.nix b/pkgs/development/python-modules/highered/default.nix
new file mode 100644
index 000000000000..b9025a0c4c67
--- /dev/null
+++ b/pkgs/development/python-modules/highered/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  pyhacrf-datamade,
+  numpy,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "highered";
+  version = "0.2.1-unstable-2020-03-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "highered";
+    rev = "5e6e505e182ff91b1620535a491ad4a3d98ef71e";
+    hash = "sha256-sDOAB0QabJ/WJYSIZ31J12kSDQADQUilE2SmGPjXmZo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pyhacrf-datamade
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # No tests in repository
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "highered"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Learnable edit distance using CRF (Conditional Random Fields)";
+    homepage = "https://github.com/dedupeio/highered";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/hive-metastore-client/default.nix b/pkgs/development/python-modules/hive-metastore-client/default.nix
new file mode 100644
index 000000000000..14f89f05ef4a
--- /dev/null
+++ b/pkgs/development/python-modules/hive-metastore-client/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  thrift,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "hive-metastore-client";
+  version = "1.0.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "quintoandar";
+    repo = "hive-metastore-client";
+    tag = version;
+    hash = "sha256-IejsiC1eDNa6fjpQPhLNkMvZpyr9QsQdGBfhev1jEyg=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "thrift"
+  ];
+  dependencies = [
+    thrift
+  ];
+
+  pythonImportsCheck = [ "hive_metastore_client" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Client for connecting and running DDLs on hive metastore";
+    homepage = "https://github.com/quintoandar/hive-metastore-client";
+    changelog = "https://github.com/quintoandar/hive-metastore-client/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 10e386867eca..fc76273c14c9 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -5,25 +5,24 @@
   fetchFromGitHub,
   importlib-metadata,
   lingva,
+  numpy,
   polib,
+  pytest-cov-stub,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.82";
+  version = "0.84";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-H+qG9GqSPFODn0kWSIY/XJ1wAPI/iArCWR3yG+pFZXE=";
+    hash = "sha256-sqeU9FsIeWy4dHmC3K2ChHhtfSsWGXGWUGV90g7kmvs=";
   };
 
   build-system = [
@@ -47,22 +46,22 @@ buildPythonPackage rec {
 
   dependencies = [ python-dateutil ];
 
-  doCheck = false;
-
   nativeCheckInputs = [
     importlib-metadata
+    numpy
     polib
+    pytest-cov-stub
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "holidays" ];
 
-  meta = with lib; {
+  meta = {
     description = "Generate and work with holidays in Python";
     homepage = "https://github.com/vacanza/python-holidays";
-    changelog = "https://github.com/vacanza/python-holidays/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    changelog = "https://github.com/vacanza/holidays/blob/${src.tag}/CHANGES.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       fab
       jluttine
     ];
diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix
index 1e977ccf99c7..6389d96bec6e 100644
--- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix
+++ b/pkgs/development/python-modules/holistic-trace-analysis/default.nix
@@ -1,15 +1,23 @@
 {
+  lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build system
+  setuptools,
+
+  # dependencies
   jupyterlab,
-  lib,
   numpy,
   pandas,
   plotly,
   pydot,
-  pytestCheckHook,
-  setuptools,
   torch,
+
+  # tests
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -35,7 +43,33 @@ buildPythonPackage rec {
     torch
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Permission denied: '/tmp/my_saved_cp_graph/trace_data.csv'
+    "test_critical_path_breakdown_and_save_restore"
+    # Fails under Python 3.12 on Darwin with I/O errors
+    # Permission denied: '/tmp/path_does_not_exist/...'
+    "test_critical_path_overlaid_trace"
+    # Permission error: [Errno 1] Operation not permitted
+    "test_get_mtia_aten_op_kernels_and_delay_inference_single_rank"
+    # No cuda on Darwin, can cause hangs in nixpkgs-review
+    "test_frequent_cuda_kernel_sequences"
+    "test_get_cuda_kernel_launch_stats_for_h100"
+    "test_get_cuda_kernel_launch_stats_inference_single_rank"
+    "test_get_cuda_kernel_launch_stats_training_multiple_ranks"
+  ];
+
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Makes assumptions about the filesystem layout
+    "tests/test_config.py"
+    # EOFError -- makes assumptions about file I/O under Python 3.12
+    # https://github.com/facebookresearch/HolisticTraceAnalysis/issues/300
+    "tests/test_symbol_table.py"
+  ];
 
   pythonImportsCheck = [ "hta" ];
 
diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
index ce3dd7cba288..fbbc011d0b6a 100644
--- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   aenum,
   home-assistant-chip-wheels,
   coloredlogs,
@@ -9,7 +8,6 @@
   cryptography,
   dacite,
   deprecation,
-  ecdsa,
   ipdb,
   mobly,
   pygobject3,
@@ -22,8 +20,6 @@ buildPythonPackage rec {
   inherit (home-assistant-chip-wheels) version;
   format = "wheel";
 
-  disabled = pythonOlder "3.7";
-
   src = home-assistant-chip-wheels;
 
   # format=wheel needs src to be a wheel not a folder of wheels
@@ -31,13 +27,12 @@ buildPythonPackage rec {
     src=($src/home_assistant_chip_core*.whl)
   '';
 
-  propagatedBuildInputs = [
+  dependencies = [
     aenum
     coloredlogs
     construct
     cryptography
     dacite
-    ecdsa
     rich
     pyyaml
     ipdb
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index ae78ed9cb1d3..957e557edd47 100644
--- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -9,7 +9,6 @@
   click,
   colorama,
   coloredlogs,
-  coverage,
   cryptography,
   debugpy,
   diskcache,
@@ -45,7 +44,6 @@
   pyfakefs,
   pygments,
   pykwalify,
-  pylint,
   pyperclip,
   pyserial,
   python,
@@ -166,6 +164,9 @@ stdenv.mkDerivation rec {
       patch -p1 < $patch
     done
 
+    # ecdsa is insecure and only used in tests
+    patch -p1 < ${./dont-import-ecdsa.patch}
+
     # unpin dependencies
     # there are many files to modify, in different formats
     sed -i 's/==.*$//' third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/virtualenv_setup/python_base_requirements.txt
@@ -214,7 +215,6 @@ stdenv.mkDerivation rec {
         build
         colorama
         coloredlogs
-        coverage
         click
         cryptography
         debugpy
@@ -242,7 +242,6 @@ stdenv.mkDerivation rec {
         pyelftools
         pygments
         pykwalify
-        pylint
         pyperclip
         pyserial
         python-daemon
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch b/pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch
new file mode 100644
index 000000000000..ec1bb87bd8ac
--- /dev/null
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch
@@ -0,0 +1,44 @@
+diff --git a/src/controller/python/chip/crypto/p256keypair.py b/src/controller/python/chip/crypto/p256keypair.py
+index 30198eabee..926f55318e 100644
+--- a/src/controller/python/chip/crypto/p256keypair.py
++++ b/src/controller/python/chip/crypto/p256keypair.py
+@@ -22,7 +22,6 @@ from ctypes import (CFUNCTYPE, POINTER, _Pointer, c_bool, c_char, c_size_t, c_ui
+ from typing import TYPE_CHECKING
+ 
+ from chip import native
+-from ecdsa import ECDH, NIST256p, SigningKey  # type: ignore
+ 
+ # WORKAROUND: Create a subscriptable pointer type (with square brackets) to ensure compliance of type hinting with ctypes
+ if not TYPE_CHECKING:
+@@ -133,31 +132,3 @@ class P256Keypair:
+         format of section 2.3.3 of the SECG SEC 1 standard.
+         '''
+         raise NotImplementedError()
+-
+-
+-class TestP256Keypair(P256Keypair):
+-    ''' The P256Keypair for testing purpose. It is not safe for any productions use
+-    '''
+-
+-    def __init__(self, private_key: SigningKey = None):
+-        super().__init__()
+-
+-        if private_key is None:
+-            self._key = SigningKey.generate(NIST256p)
+-        else:
+-            self._key = private_key
+-
+-        self._pubkey = self._key.verifying_key.to_string(encoding='uncompressed')
+-
+-    @property
+-    def public_key(self) -> bytes:
+-        return self._pubkey
+-
+-    def ECDSA_sign_msg(self, message: bytes) -> bytes:
+-        return self._key.sign_deterministic(message, hashfunc=hashlib.sha256)
+-
+-    def ECDH_derive_secret(self, remote_pubkey: bytes) -> bytes:
+-        ecdh = ECDH(curve=NIST256p)
+-        ecdh.load_private_key(self._key)
+-        ecdh.load_received_public_key_bytes(remote_pubkey[1:])
+-        return ecdh.ecdh1.generate_sharedsecret_bytes()
diff --git a/pkgs/development/python-modules/home-connect-async/default.nix b/pkgs/development/python-modules/home-connect-async/default.nix
index dec2083d0248..283eae7a23a4 100644
--- a/pkgs/development/python-modules/home-connect-async/default.nix
+++ b/pkgs/development/python-modules/home-connect-async/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "home-connect-async";
-  version = "0.8.2";
+  version = "0.8.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "home_connect_async";
     inherit version;
-    hash = "sha256-npVMEiwclKr9HR2M03GNkyJULeLEE9BAnIw8Zoy98nQ=";
+    hash = "sha256-G+mHXNbqU0pgqpvGfKmn6CrwZOhRG76m57eHimgN17s=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix
index f8067d443cb9..650989898d04 100644
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "homematicip";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "hahn-th";
     repo = "homematicip-rest-api";
     tag = version;
-    hash = "sha256-yH9Yis6NyKD+mSjaff0S9J6UtoVceML06ny50/6aG/0=";
+    hash = "sha256-QDqBi2XbMdokUyRNJacDPa/VqESp4NCUHLByBuayd1g=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/httpx-aiohttp/default.nix b/pkgs/development/python-modules/httpx-aiohttp/default.nix
index aee6166157f6..1223fc607040 100644
--- a/pkgs/development/python-modules/httpx-aiohttp/default.nix
+++ b/pkgs/development/python-modules/httpx-aiohttp/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "httpx-aiohttp";
-  version = "0.1.8";
+  version = "0.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "karpetrosyan";
     repo = "httpx-aiohttp";
     tag = version;
-    hash = "sha256-Fdu8aKsXWggRkc/512OBEiEwWNAajrhjfG/+v4+cows=";
+    hash = "sha256-XngJwwolGsiT5AAsDvyQWOi4VEp7ItMdqeoQG6cyDlk=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix
index c91c7ffd8c0b..47dad295c46e 100644
--- a/pkgs/development/python-modules/huey/default.nix
+++ b/pkgs/development/python-modules/huey/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "huey";
-  version = "2.5.3";
+  version = "2.5.4";
 
   format = "pyproject";
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = "huey";
     tag = version;
-    hash = "sha256-Avy5aMYoeIhO7Q83s2W4o6RBMaVFdRBqa7HGNIGNOqE=";
+    hash = "sha256-PIMnPb6QQh20/LPfk8LaidhLHMrL8dHigLigyy2ki4Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/hyperglot/default.nix b/pkgs/development/python-modules/hyperglot/default.nix
new file mode 100644
index 000000000000..1722f06a28ce
--- /dev/null
+++ b/pkgs/development/python-modules/hyperglot/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  nix-update-script,
+  fetchPypi,
+  buildPythonApplication,
+  setuptools,
+  click,
+  fonttools,
+  uharfbuzz,
+  pyyaml,
+  colorlog,
+}:
+buildPythonApplication rec {
+  pname = "hyperglot";
+  version = "0.7.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Pd9Yxmv9a1T2xV03q2U1m1laHE3WifHwmnGBfTTCSxM=";
+  };
+
+  dependencies = [
+    click
+    fonttools
+    uharfbuzz
+    pyyaml
+    colorlog
+  ];
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "hyperglot" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Database and tools for detecting language support in fonts";
+    homepage = "https://hyperglot.rosettatype.com";
+    changelog = "https://github.com/rosettatype/hyperglot/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ imatpot ];
+    mainProgram = "hyperglot";
+  };
+}
diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 5a38fe5c58ca..e6075d20ef78 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -23,21 +23,21 @@ let
 in
 buildPythonPackage rec {
   pname = "hyperscan";
-  version = "0.7.25";
+  version = "0.7.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "darvid";
     repo = "python-hyperscan";
     tag = "v${version}";
-    hash = "sha256-YFT/SPAI/H6D7paWL/9rMyvY1s7ffE9bDHcQ9TbbA6w=";
+    hash = "sha256-U7MGa3xzNzx0TCeSaO1yaDEgOSFwoSm02yqskmOIMiM=";
   };
 
   env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib";
 
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs = [
+  build-system = [
     cmake
     pathspec
     ninja
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CPython extension for the Hyperscan regular expression matching library";
     homepage = "https://github.com/darvid/python-hyperscan";
     changelog = "https://github.com/darvid/python-hyperscan/blob/${src.tag}/CHANGELOG.md";
@@ -61,7 +61,7 @@ buildPythonPackage rec {
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ mbalatsko ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }
diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 319c08577afc..5a12b999a900 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "i-pi";
-  version = "3.1.6";
+  version = "3.1.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "i-pi";
     repo = "i-pi";
     tag = "v${version}";
-    hash = "sha256-S7UagXjltyy2E9s5yoq95KjMfpy/Pb0zoGl6z6yv2sA=";
+    hash = "sha256-AeHZWzgV0pqlKNdDCuAglpTDm3M8PWKDGvPw3lyQdF8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index bbf164c5276e..b553f1be0878 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,16 +8,18 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510151";
+  version = "0.1.202511061";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-lP0l3U1Jdy+wpgyBUqMrd3Cm3/PdQd2WKMdaFClMhws=";
+    hash = "sha256-SEbER6oe5BK/6HpvMh+UD7rvGyPNJ1zxLD9LNis8QJw=";
   };
 
+  __darwinAllowLocalNetworking = true;
+
   build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/ibis-framework/default.nix b/pkgs/development/python-modules/ibis-framework/default.nix
index 2939b7c2ab9c..5832f88e0e6f 100644
--- a/pkgs/development/python-modules/ibis-framework/default.nix
+++ b/pkgs/development/python-modules/ibis-framework/default.nix
@@ -98,14 +98,14 @@ in
 
 buildPythonPackage rec {
   pname = "ibis-framework";
-  version = "10.8.0";
+  version = "11.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ibis-project";
     repo = "ibis";
     tag = version;
-    hash = "sha256-Uuqm9Exu/oK3BGBL4ViUOGArMWhVutUn1gFRj1I4vt4=";
+    hash = "sha256-hf5guWeX9WQbKaNrs7ALwwDxV1Rgeb5Z0PedTQ4P7S0=";
   };
 
   build-system = [
@@ -175,6 +175,9 @@ buildPythonPackage rec {
 
     # duckdb ParserError: syntax error at or near "AT"
     "test_90"
+
+    # assert 0 == 3 (tests edge case behavior of databases)
+    "test_self_join_with_generated_keys"
   ];
 
   # patch out tests that check formatting with black
diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index 88dee1d87ced..3380f34e20ee 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -5,11 +5,9 @@
   fetchFromGitHub,
   freezegun,
   tzdata,
-  pyparsing,
   pydantic,
   pytest-benchmark,
   pytestCheckHook,
-  pythonOlder,
   python-dateutil,
   setuptools,
   syrupy,
@@ -17,16 +15,14 @@
 
 buildPythonPackage rec {
   pname = "ical";
-  version = "11.0.0";
+  version = "11.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "ical";
     tag = version;
-    hash = "sha256-jn4xPwnJ/RQNTItYv4QY54UejayI0MmDhKZtg2lkpr8=";
+    hash = "sha256-NpE+YHVgaUBR9MzC+zXwqalCwSjF/f+NH/k0S/JusiI=";
   };
 
   build-system = [ setuptools ];
@@ -35,7 +31,6 @@ buildPythonPackage rec {
     python-dateutil
     tzdata
     pydantic
-    pyparsing
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index c483932f3d4f..9da87158c5e0 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -9,12 +9,19 @@
   tzdata,
   hypothesis,
   pytestCheckHook,
+  sphinxHook,
+  sphinx-copybutton,
+  pydata-sphinx-theme,
 }:
 
 buildPythonPackage rec {
   version = "6.3.1";
   pname = "icalendar";
   pyproject = true;
+  outputs = [
+    "out"
+    "doc"
+  ];
 
   src = fetchFromGitHub {
     owner = "collective";
@@ -39,6 +46,12 @@ buildPythonPackage rec {
     tzdata
   ];
 
+  nativeBuildInputs = [
+    sphinxHook
+    sphinx-copybutton
+    pydata-sphinx-theme
+  ];
+
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix
index a3fff70db1b4..aefe7334db73 100644
--- a/pkgs/development/python-modules/idna/default.nix
+++ b/pkgs/development/python-modules/idna/default.nix
@@ -1,29 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   flit-core,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "idna";
-  version = "3.10";
+  version = "3.11";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-EvZcm0cKvabcNc+OY8xXSxxSsR3yyGAwrwrAmwGxPqk=";
+  src = fetchFromGitHub {
+    owner = "kjd";
+    repo = "idna";
+    tag = "v${version}";
+    hash = "sha256-4mnWOit+lrZnVslVyfalt6lv7qSYpLlyvET553SplJU=";
   };
 
   build-system = [ flit-core ];
 
+  pythonImportsCheck = [ "idna" ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   meta = {
     homepage = "https://github.com/kjd/idna/";
-    changelog = "https://github.com/kjd/idna/releases/tag/v${version}";
+    changelog = "https://github.com/kjd/idna/releases/tag/${src.tag}";
     description = "Internationalized Domain Names in Applications (IDNA)";
     license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index 1ca2dc1cc08c..59974797d4e5 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "igraph";
-  version = "0.11.9";
+  version = "1.0.0";
 
   pyproject = true;
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
       # export-subst prevents reproducability
       rm $out/.git_archival.json
     '';
-    hash = "sha256-rmIICiIyEr5JCmkDAzcdisVaaKDraTQEquPHjK4d7oU=";
+    hash = "sha256-Y7ZQ1yNoD8A5b6c92OGz9Unietdg1uNt/Za6nxdCSP0=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix
index 6d0411ce16d9..b3e05d9826f0 100644
--- a/pkgs/development/python-modules/imagecodecs/default.nix
+++ b/pkgs/development/python-modules/imagecodecs/default.nix
@@ -2,22 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   cython,
   numpy,
   setuptools,
+
+  # nativeBuildInputs
   pkgs,
-  jxrlib,
   lcms2,
+  openjpeg,
+
+  # buildInputs
+  jxrlib,
   lerc,
   libdeflate,
+  libjpeg,
   libpng,
   libtiff,
   libwebp,
-  openjpeg,
   xz,
   zlib,
-  zstd,
-  pytest,
+
+  # tests
+  pytestCheckHook,
 }:
 
 let
@@ -48,18 +56,19 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [
-    pkgs.lz4
     jxrlib
     lcms2
     lerc
     libdeflate
+    libjpeg
     libpng
     libtiff
     libwebp
+    pkgs.lz4
     openjpeg
     xz # liblzma
     zlib
-    zstd
+    pkgs.zstd
   ];
 
   dependencies = [
@@ -73,7 +82,7 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
-    pytest
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 68dcc85cf483..40e134e303f1 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   isPyPy,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -44,29 +43,16 @@ in
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "2.37.0";
+  version = "2.37.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "imageio";
     repo = "imageio";
     tag = "v${version}";
-    hash = "sha256-/nxJxZrTYX7F2grafIWwx9SyfR47ZXyaUwPHMEOdKkI=";
+    hash = "sha256-8wKTcmnep67zBMYgd6Gpr3wRCIrzYaqfytL1o7iBNAk=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/imageio/imageio/issues/1139
-      # https://github.com/imageio/imageio/pull/1144
-      name = "fix-pyav-13-1-compat";
-      url = "https://github.com/imageio/imageio/commit/eadfc5906f5c2c3731f56a582536dbc763c3a7a9.patch";
-      excludes = [
-        "setup.py"
-      ];
-      hash = "sha256-ycsW1YXtiO3ZecIF1crYaX6vg/nRW4bF4So5uWCVzME=";
-    })
-  ];
-
   postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace tests/test_core.py \
       --replace-fail 'ctypes.util.find_library("GL")' '"${libgl}"'
@@ -112,14 +98,6 @@ buildPythonPackage rec {
 
   pytestFlags = [ "--test-images=file://${test_images}" ];
 
-  disabledTests = [
-    # These should have had `needs_internet` mark applied but don't so far.
-    # See https://github.com/imageio/imageio/pull/1142
-    "test_read_stream"
-    "test_uri_reading"
-    "test_trim_filter"
-  ];
-
   disabledTestMarks = [ "needs_internet" ];
 
   # These tests require the old and vulnerable freeimage binaries; skip.
diff --git a/pkgs/development/python-modules/imeon-inverter-api/default.nix b/pkgs/development/python-modules/imeon-inverter-api/default.nix
index 6eb1bcacc2f3..ccb608ae2186 100644
--- a/pkgs/development/python-modules/imeon-inverter-api/default.nix
+++ b/pkgs/development/python-modules/imeon-inverter-api/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   pdm-pep517,
   aiohttp,
-  async-timeout,
 }:
 
 buildPythonPackage rec {
@@ -21,9 +20,13 @@ buildPythonPackage rec {
 
   build-system = [ pdm-pep517 ];
 
+  pythonRemoveDeps = [
+    # https://github.com/Imeon-Inverters-for-Home-Assistant/inverter-api/pull/1
+    "async-timeout"
+  ];
+
   dependencies = [
     aiohttp
-    async-timeout
   ];
 
   pythonImportsCheck = [ "imeon_inverter_api" ];
diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index 29b055ba916a..09450c1e77db 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -103,6 +103,7 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [
       veprbl
       dotlambda
+      iedame
     ];
   };
 }
diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 5b6239fe5ce4..88f545992b0a 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   cmake,
@@ -21,14 +20,12 @@
 
 buildPythonPackage rec {
   pname = "iminuit";
-  version = "2.31.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.6";
+  version = "2.31.3";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1eAE8f/YPSoHZAn79KeWkeehfJ1zlQu2NGWvMuEE3hg=";
+    hash = "sha256-/7Oust4mxADQr/fit0V/ZM1gmklMRe5Xnv/ugbG8XXg=";
   };
 
   nativeBuildInputs = [
@@ -40,7 +37,7 @@ buildPythonPackage rec {
     pyproject-metadata
   ];
 
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   dontUseCmakeConfigure = true;
 
@@ -48,6 +45,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/scikit-hep/iminuit";
+    changelog = "https://github.com/scikit-hep/iminuit/releases/tag/v{version}";
     description = "Python interface for the Minuit2 C++ library";
     license = with licenses; [
       mit
diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix
index 534aa8ae551d..2a77286bd94d 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -72,6 +72,9 @@ buildPythonPackage {
     "tests/test_inkex_gui_window.py"
     # Failed to find pixmap 'image-missing' in /build/source/tests/data/
     "tests/test_inkex_gui_pixmaps.py"
+    # Fails with libxml2 >= 2.15 with "lxml.etree was compiled without Schematron support"
+    "inkex/tester/test_inx_file.py"
+    "tests/test_inkex_inx.py"
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/inline-snapshot/default.nix b/pkgs/development/python-modules/inline-snapshot/default.nix
index bff769ab1ec5..3e2c78c98cce 100644
--- a/pkgs/development/python-modules/inline-snapshot/default.nix
+++ b/pkgs/development/python-modules/inline-snapshot/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "inline-snapshot";
-  version = "0.24.0";
+  version = "0.28.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "15r10nk";
     repo = "inline-snapshot";
     tag = version;
-    hash = "sha256-UiVxG9W1lwvvoflVey4250iL8gL8Tm41LBo0ab0tTqk=";
+    hash = "sha256-f572H7jeolv9nONuRBtZR/pcVDs5oX/dOiEjXlJyiio=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/inquirer3/default.nix b/pkgs/development/python-modules/inquirer3/default.nix
new file mode 100644
index 000000000000..949c7513141c
--- /dev/null
+++ b/pkgs/development/python-modules/inquirer3/default.nix
@@ -0,0 +1,47 @@
+{
+  blessed,
+  buildPythonPackage,
+  editor,
+  fetchFromGitHub,
+  lib,
+  pexpect,
+  poetry-core,
+  pytestCheckHook,
+  readchar,
+}:
+
+buildPythonPackage rec {
+  pname = "inquirer3";
+  version = "0.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "guysalt";
+    repo = "python-inquirer3";
+    tag = "v${version}";
+    hash = "sha256-IReJlwVgjTlTlD0xTVWrzQ0ITvCQvPJ86zCmffaoPk4=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    blessed
+    editor
+    readchar
+  ];
+
+  pythonImportsCheck = [ "inquirer3" ];
+
+  nativeCheckInputs = [
+    pexpect
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/guysalt/python-inquirer3/releases/tag/${src.tag}";
+    description = "Collection of common interactive command line user interfaces, based on Inquirer.js";
+    homepage = "https://github.com/guysalt/python-inquirer3";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/instructor/default.nix b/pkgs/development/python-modules/instructor/default.nix
index 959449e53e76..993309fd72ad 100644
--- a/pkgs/development/python-modules/instructor/default.nix
+++ b/pkgs/development/python-modules/instructor/default.nix
@@ -33,19 +33,23 @@
 
 buildPythonPackage rec {
   pname = "instructor";
-  version = "1.10.0";
+  version = "1.11.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jxnl";
     repo = "instructor";
-    tag = version;
+    tag = "v${version}";
     hash = "sha256-vknPfRHyLoLo2838p/fbjrqyaBORZzLp9+fN98yVDz0=";
   };
 
   build-system = [ hatchling ];
 
-  pythonRelaxDeps = [ "rich" ];
+  pythonRelaxDeps = [
+    "jiter"
+    "openai"
+    "rich"
+  ];
 
   dependencies = [
     aiohttp
diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index 56bb064cda58..0d5fb116b2a5 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "internetarchive";
-  version = "5.6.0";
+  version = "5.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jjjake";
     repo = "internetarchive";
     tag = "v${version}";
-    hash = "sha256-m3BB3rER3YHC3/Xj9L/zhVkjV0o46d/TCP3Jvw+eDgo=";
+    hash = "sha256-SNzscVFFuvRyG976lWtktPobcIvfQgk4tAQ8+NXu4yw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ipsw-parser/default.nix b/pkgs/development/python-modules/ipsw-parser/default.nix
new file mode 100644
index 000000000000..b88e2e6a04bd
--- /dev/null
+++ b/pkgs/development/python-modules/ipsw-parser/default.nix
@@ -0,0 +1,63 @@
+{
+  buildPythonPackage,
+  cached-property,
+  click,
+  coloredlogs,
+  construct,
+  fetchFromGitHub,
+  lib,
+  plumbum,
+  pyimg4,
+  remotezip2,
+  requests,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "ipsw-parser";
+  version = "1.4.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "ipsw_parser";
+    tag = "v${version}";
+    hash = "sha256-B9T7c2xzUrzh5BxS7b3rpmPcUDT8Qmb4/5XTMfrOcR8=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    cached-property
+    click
+    coloredlogs
+    construct
+    plumbum
+    pyimg4
+    remotezip2
+    requests
+  ];
+
+  pythonImportsCheck = [ "ipsw_parser" ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    "$out"/bin/${meta.mainProgram} --help
+
+    runHook postCheck
+  '';
+
+  meta = {
+    changelog = "https://github.com/doronz88/ipsw_parser/releases/tag/${src.tag}";
+    description = "Python3 utility for parsing and extracting data from IPSW";
+    homepage = "https://github.com/doronz88/ipsw_parser";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "ipsw-parser";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
index 78e0d729842a..10d83e315c42 100644
--- a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
+++ b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
@@ -7,18 +7,18 @@
 
 buildPythonPackage rec {
   pname = "ipv8-rust-tunnels";
-  version = "0.1.34";
+  version = "0.1.44";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ipv8_rust_tunnels";
-    hash = "sha256-YXIfAXwcbWGq/CSMrTslpbkmj8AryzsinWK8kAWF90k=";
+    hash = "sha256-eHk8aCrcnyVGd3JRGQ950Bwryqt+TYx84MHAM2kWTis=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-C2LLiEpD0Gk39XSuwqQJ/l2olFL2HSktdZCJp5WG0pk=";
+    hash = "sha256-axWG5cJtNaoZl7cG+Zyo1k+eA8pXHDWFgHqpTmQNHlo=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/ipython-sql/default.nix b/pkgs/development/python-modules/ipython-sql/default.nix
index a65eac31eb3c..bf4430c3e6ce 100644
--- a/pkgs/development/python-modules/ipython-sql/default.nix
+++ b/pkgs/development/python-modules/ipython-sql/default.nix
@@ -2,11 +2,11 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   setuptools,
   ipython,
   ipython-genutils,
   prettytable,
+  six,
   sqlalchemy,
   sqlparse,
 }:
@@ -15,19 +15,18 @@ buildPythonPackage rec {
   version = "0.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-PbPOf5qV369Dh2+oCxa9u5oE3guhIELKsT6fWW/P/b4=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     ipython
     ipython-genutils
     prettytable
+    six
     sqlalchemy
     sqlparse
   ];
diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix
index bd3f11ac014b..d1344d106f54 100644
--- a/pkgs/development/python-modules/isal/default.nix
+++ b/pkgs/development/python-modules/isal/default.nix
@@ -2,11 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  replaceVars,
 
   # build-system
   setuptools,
-  versioningit,
+  setuptools-scm,
 
   # native dependencies
   isa-l,
@@ -18,25 +17,19 @@
 
 buildPythonPackage rec {
   pname = "isal";
-  version = "1.7.2";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-isal";
-    rev = "v${version}";
-    hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8=";
+    tag = "v${version}";
+    hash = "sha256-703uXty3a0N+yXfv/7nVIAnU7PaqMtNO0ScltNLJq3g=";
   };
 
-  patches = [
-    (replaceVars ./version.patch {
-      inherit version;
-    })
-  ];
-
   build-system = [
     setuptools
-    versioningit
+    setuptools-scm
   ];
 
   buildInputs = [ isa-l ];
diff --git a/pkgs/development/python-modules/isal/version.patch b/pkgs/development/python-modules/isal/version.patch
deleted file mode 100644
index 9a8500a12d46..000000000000
--- a/pkgs/development/python-modules/isal/version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index bf5fe99..b559255 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,9 +2,8 @@
- requires = ["setuptools>=64", "versioningit>=1.1.0"]
- build-backend = "setuptools.build_meta"
- 
--[tool.versioningit.vcs]
--method="git"
--default-tag = "v0.0.0"
-+[tool.versioningit]
-+default-version = "@version@"
- 
- [tool.versioningit.write]
- file = "src/isal/_version.py"
diff --git a/pkgs/development/python-modules/israel-rail-api/default.nix b/pkgs/development/python-modules/israel-rail-api/default.nix
index 2a5c46e00199..4265ecb5d55b 100644
--- a/pkgs/development/python-modules/israel-rail-api/default.nix
+++ b/pkgs/development/python-modules/israel-rail-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "israel-rail-api";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sh0oki";
     repo = "israel-rail-api";
     tag = "v${version}";
-    hash = "sha256-viIETVCW3YSwJOsFxkYoi0Ko9vXQEP9d+fjQAlb142c=";
+    hash = "sha256-vYMqMrvLQsy0MSfYAdlXqV1rF76A/cqkttWh47J8xn8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
index f4baed3c75a7..9b5ce1996105 100644
--- a/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-pjrt/default.nix
@@ -50,8 +50,8 @@ buildPythonPackage rec {
       .${stdenv.hostPlatform.system};
     hash =
       {
-        x86_64-linux = "sha256-OXdyaiozKwvTSDG96ytWUzY0QvMBLCmW/IgICq9rO60=";
-        aarch64-linux = "sha256-2H1mbQxSP62q23GU58J03MWg5/j40dfig1NT7zK+8Bw=";
+        x86_64-linux = "sha256-npnD5Ub2vgD/xqTt0s9bdtTFmqNKjYOW2COauP2Ov9M=";
+        aarch64-linux = "sha256-UAu8W9mrvcyyOP4TgbkAzVdyZFANFHA1H2jl29tSNcI=";
       }
       .${stdenv.hostPlatform.system};
   };
diff --git a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
index a63c9554ce79..705bbea7b075 100644
--- a/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
+++ b/pkgs/development/python-modules/jax-cuda12-plugin/default.nix
@@ -39,32 +39,32 @@ let
     "3.11-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp311";
-      hash = "sha256-rckk68ekXI00AOoBGNxwpwgrKobjVxFzjUA904FdCb8=";
+      hash = "sha256-cL6wFZM7RyEDSBonUh1NtBz1kgCHBfRBLL86HsrzXC4=";
     };
     "3.11-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp311";
-      hash = "sha256-KnJ6ia5prCHB9Qk9jVrviaDmkuZrA0/JNMiszHLkApA=";
+      hash = "sha256-x+pdt1IZS4o/v0xWS7e7wk8k4HEJu1nmWf1LETFLunY=";
     };
     "3.12-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp312";
-      hash = "sha256-goTnz39USQZgTxEXAqbwARqW338BE4eLOBvsCQUXJTY=";
+      hash = "sha256-VVbj9Iy+HfYI2dDTQAMIZJ3eyqjQ4kOUkMb4i0GAMcs=";
     };
     "3.12-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp312";
-      hash = "sha256-mKl1ZVOChY2HTWRxzpcZQxBgnQoqfEKDxuB+N5M7d2g=";
+      hash = "sha256-SdBMFULqpAi3utAXASC82oMqAvuUT8iT3OiCbublpJM=";
     };
     "3.13-x86_64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_x86_64";
       dist = "cp313";
-      hash = "sha256-chLBLXW33FEnXycYJ99KbTeEMMBvZQ5sMcFi/pV5/xI=";
+      hash = "sha256-Rw6W5+pNsPN1jabn0VxF6BAmYpJP46hHIV7mXKySxo0=";
     };
     "3.13-aarch64-linux" = getSrcFromPypi {
       platform = "manylinux_2_27_aarch64";
       dist = "cp313";
-      hash = "sha256-Xj4qpNch+wLdECgmKq6uwpWORbylxNNRKykVG1cMtCU=";
+      hash = "sha256-IGmVNdeaLM+X8SEGC2BAUzhvQRzLMMElxmtqWgJsiSE=";
     };
   };
 in
diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index c742f797d909..4cd12283ab1b 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -6,6 +6,7 @@
   lapack,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   cudaSupport ? config.cudaSupport,
 
   # build-system
@@ -40,7 +41,7 @@ let
 in
 buildPythonPackage rec {
   pname = "jax";
-  version = "0.7.2";
+  version = "0.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -48,9 +49,17 @@ buildPythonPackage rec {
     repo = "jax";
     # google/jax contains tags for jax and jaxlib. Only use jax tags!
     tag = "jax-v${version}";
-    hash = "sha256-GBpHFjvF7SvxJafu7aVlTp0jxSo4jAi9oPeMg2B/P24=";
+    hash = "sha256-Ilcp4WW65SyqrqDGBRdnB25m7OCbrsfdtxWvl0uTjNw=";
   };
 
+  patches = [
+    # https://github.com/jax-ml/jax/pull/32840
+    (fetchpatch2 {
+      url = "https://github.com/Prince213/jax/commit/af5c211d49f3b99447db2252d2cc2b8e0fb54d1c.patch?full_index=1";
+      hash = "sha256-ijEd+MDe91qyYfE+aMzR5rNmTeGadin6Io8PIfJWc3o=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   # The version is automatically set to ".dev" if this variable is not set.
diff --git a/pkgs/development/python-modules/jaxlib/bin.nix b/pkgs/development/python-modules/jaxlib/bin.nix
index 0dadc56757f7..56c5831cfe67 100644
--- a/pkgs/development/python-modules/jaxlib/bin.nix
+++ b/pkgs/development/python-modules/jaxlib/bin.nix
@@ -18,7 +18,7 @@
 }:
 
 let
-  version = "0.7.2";
+  version = "0.8.0";
   inherit (python) pythonVersion;
 
   # As of 2023-06-06, google/jax upstream is no longer publishing CPU-only wheels to their GCS bucket. Instead the
@@ -49,49 +49,49 @@ let
       "3.11-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp311";
-        hash = "sha256-Q4IAYjXM7VnS95WsyYPBvtz7yk/qj5RhMR1hxqeTrmY=";
+        hash = "sha256-/1Pouvl49rfEB2IVr3jwupacrENO0vclZdh+OMI/AOc=";
       };
       "3.11-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp311";
-        hash = "sha256-jKcAM1H76Mz6L6Wkk+wt+/LfkkQTBs9cO5cFCO7bkqs=";
+        hash = "sha256-Qa693vZ6VVpt4XQnpOZs5gpSioFYR+Ldltq85Xn3rPg=";
       };
       "3.11-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp311";
-        hash = "sha256-n7+Qr84w4066LqkppQb1kHvdQGI1gSLeSZzp5nGguh8=";
+        hash = "sha256-u2AqjCTGFMuMpu7tPnCnM9k5nGoviJAKAlJiPNZydrU=";
       };
 
       "3.12-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp312";
-        hash = "sha256-EfMjGeZizP9mhZ6zk3VwUNiXG9iAvE3XDexkNNiQ+1k=";
+        hash = "sha256-LIZ1v4bjka/k+NhjCAvhoCTXNN/T3RN/eqjn8iCRrc0=";
       };
       "3.12-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp312";
-        hash = "sha256-m1oNNXSXYRoRPSB/ssGZfwGrehdYcHAIEiIPC8qjGCI=";
+        hash = "sha256-2D/4zxsHApljnNpPhCdwf2kFHchCHln7tzMFUjk3Vw0=";
       };
       "3.12-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp312";
-        hash = "sha256-vW0cU71HXg52ilSvmLFkL7SdcwTPBVzuux0B6J04ocs=";
+        hash = "sha256-9gqsD2Tp5wpc7zQf4pJoRRhpVRTHGtAANndLvtX3MS4=";
       };
 
       "3.13-x86_64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_x86_64";
         dist = "cp313";
-        hash = "sha256-SdmWIEhu/9qHQAAkcjpFIwZWaZbj3nGe5jPwUiDR7nc=";
+        hash = "sha256-Zsb1dvVKY+0FL1xGm+9NtyP18FC4OewMQpVzARNBvVg=";
       };
       "3.13-aarch64-linux" = getSrcFromPypi {
         platform = "manylinux_2_27_aarch64";
         dist = "cp313";
-        hash = "sha256-l8eT6Xvl3cc7PoXmzorTcJ6AVPdeohnMDLTwgFplrwY=";
+        hash = "sha256-s+rFA7kP/sxo8R+hIhM+7yxixTbbKOgB5DbX56m2e/g=";
       };
       "3.13-aarch64-darwin" = getSrcFromPypi {
         platform = "macosx_11_0_arm64";
         dist = "cp313";
-        hash = "sha256-4bPf6ZFYJfzgBuoJW4U/V2gYRcW/qAl13MN4iTY3H7A=";
+        hash = "sha256-X88zpWOfjxZKRzqceKH6Cy4VrD/L7NbZaqD4i/Jeprs=";
       };
     };
 in
diff --git a/pkgs/development/python-modules/jello/default.nix b/pkgs/development/python-modules/jello/default.nix
index 27f52820f9d6..d5f676dc854a 100644
--- a/pkgs/development/python-modules/jello/default.nix
+++ b/pkgs/development/python-modules/jello/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kellyjonbrazil/jello";
     changelog = "https://github.com/kellyjonbrazil/jello/blob/${src.tag}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jianpu-ly/default.nix b/pkgs/development/python-modules/jianpu-ly/default.nix
index c3b3ec5b1451..2c7d5975aa2f 100644
--- a/pkgs/development/python-modules/jianpu-ly/default.nix
+++ b/pkgs/development/python-modules/jianpu-ly/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "jianpu-ly";
-  version = "1.863";
+  version = "1.864";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "jianpu_ly";
-    hash = "sha256-feSg7kWWBFHqqvyx4O05KtWa9p4JvKwrtyMqbNXwAd0=";
+    hash = "sha256-dYAUpdHvLnN4pE3aBZBK0yLjUQYguqBcAXPq7ep/iNE=";
   };
 
   dependencies = [ lilypond ];
diff --git a/pkgs/development/python-modules/jiter/Cargo.lock b/pkgs/development/python-modules/jiter/Cargo.lock
index 591a3682f576..8d4e23c2c22b 100644
--- a/pkgs/development/python-modules/jiter/Cargo.lock
+++ b/pkgs/development/python-modules/jiter/Cargo.lock
@@ -1,12 +1,12 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "ahash"
-version = "0.8.11"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
  "cfg-if",
  "getrandom",
@@ -16,22 +16,37 @@ dependencies = [
 ]
 
 [[package]]
-name = "arbitrary"
-version = "1.4.1"
+name = "aho-corasick"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dde20b3d026af13f561bdd0f15edf01fc734f0dafcedbaf42bba506a9517f223"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anes"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
+
+[[package]]
+name = "anstyle"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+
+[[package]]
+name = "arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-
-[[package]]
-name = "bencher"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bitvec"
@@ -46,11 +61,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "cc"
-version = "1.2.7"
+name = "bumpalo"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "cast"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
+
+[[package]]
+name = "cc"
+version = "1.2.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
+ "find-msvc-tools",
  "jobserver",
  "libc",
  "shlex",
@@ -58,29 +86,111 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
-name = "codspeed"
-version = "2.7.2"
+name = "ciborium"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450a0e9df9df1c154156f4344f99d8f6f6e69d0fc4de96ef6e2e68b2ec3bce97"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
- "colored",
- "libc",
- "serde_json",
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
 ]
 
 [[package]]
-name = "codspeed-bencher-compat"
-version = "2.7.2"
+name = "ciborium-io"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025afeee31b5b589484a884c7eb92bf80e0a5420bc4cb1f00d3a08c000211558"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "4.5.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2cfd7bf8a6017ddaa4e32ffe7403d547790db06bd171c1c53926faab501623"
+dependencies = [
+ "clap_builder",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.5.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a4c05b9e80c5ccd3a7ef080ad7b6ba7d6fc00a985b8b157197075677c82c7a0"
+dependencies = [
+ "anstyle",
+ "clap_lex",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
+
+[[package]]
+name = "codspeed"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93f4cce9c27c49c4f101fffeebb1826f41a9df2e7498b7cd4d95c0658b796c6c"
+dependencies = [
+ "colored",
+ "libc",
+ "serde",
+ "serde_json",
+ "uuid",
+]
+
+[[package]]
+name = "codspeed-criterion-compat"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c23d880a28a2aab52d38ca8481dd7a3187157d0a952196b6db1db3c8499725"
 dependencies = [
- "bencher",
  "codspeed",
+ "codspeed-criterion-compat-walltime",
+ "colored",
+]
+
+[[package]]
+name = "codspeed-criterion-compat-walltime"
+version = "2.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0a2f7365e347f4f22a67e9ea689bf7bc89900a354e22e26cf8a531a42c8fbb"
+dependencies = [
+ "anes",
+ "cast",
+ "ciborium",
+ "clap",
+ "codspeed",
+ "criterion-plot",
+ "is-terminal",
+ "itertools",
+ "num-traits",
+ "once_cell",
+ "oorandom",
+ "plotters",
+ "rayon",
+ "regex",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "tinytemplate",
+ "walkdir",
 ]
 
 [[package]]
@@ -90,14 +200,67 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
-name = "equivalent"
-version = "1.0.1"
+name = "criterion-plot"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1"
+dependencies = [
+ "cast",
+ "itertools",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "funty"
@@ -107,7 +270,7 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "fuzz"
-version = "0.8.2"
+version = "0.11.1"
 dependencies = [
  "indexmap",
  "jiter",
@@ -120,20 +283,32 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.15"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi",
+ "r-efi",
+ "wasip2",
+]
+
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 
 [[package]]
 name = "heck"
@@ -142,10 +317,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
-name = "indexmap"
-version = "2.7.0"
+name = "hermit-abi"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -153,24 +334,46 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
 
 [[package]]
 name = "itoa"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "jiter"
-version = "0.8.2"
+version = "0.11.1"
 dependencies = [
  "ahash",
- "bencher",
  "bitvec",
- "codspeed-bencher-compat",
+ "codspeed-criterion-compat",
  "lexical-parse-float",
  "num-bigint",
  "num-traits",
@@ -184,7 +387,7 @@ dependencies = [
 
 [[package]]
 name = "jiter-python"
-version = "0.8.2"
+version = "0.11.1"
 dependencies = [
  "jiter",
  "pyo3",
@@ -192,13 +395,24 @@ dependencies = [
 
 [[package]]
 name = "jobserver"
-version = "0.1.32"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
 dependencies = [
+ "getrandom",
  "libc",
 ]
 
+[[package]]
+name = "js-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -207,55 +421,56 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lexical-parse-float"
-version = "0.8.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+checksum = "52a9f232fbd6f550bc0137dcb5f99ab674071ac2d690ac69704593cb4abbea56"
 dependencies = [
  "lexical-parse-integer",
  "lexical-util",
- "static_assertions",
 ]
 
 [[package]]
 name = "lexical-parse-integer"
-version = "0.8.6"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+checksum = "9a7a039f8fb9c19c996cd7b2fcce303c1b2874fe1aca544edc85c4a5f8489b34"
 dependencies = [
  "lexical-util",
- "static_assertions",
 ]
 
 [[package]]
 name = "lexical-util"
-version = "0.8.5"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
-dependencies = [
- "static_assertions",
-]
+checksum = "2604dd126bb14f13fb5d1bd6a66155079cb9fa655b37f875b3a742c705dbed17"
 
 [[package]]
 name = "libc"
-version = "0.2.169"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "libfuzzer-sys"
-version = "0.4.8"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b9569d2f74e257076d8c6bfa73fb505b46b851e51ddaecc825944aa3bed17fa"
+checksum = "5037190e1f70cbeef565bd267599242926f724d3b8a9f510fd7e0b540cfa4404"
 dependencies = [
  "arbitrary",
  "cc",
 ]
 
 [[package]]
-name = "memchr"
-version = "2.7.4"
+name = "log"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -296,9 +511,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.2"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "oorandom"
+version = "11.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e"
 
 [[package]]
 name = "paste"
@@ -307,27 +528,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
-name = "portable-atomic"
-version = "1.10.0"
+name = "plotters"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
+checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747"
+dependencies = [
+ "num-traits",
+ "plotters-backend",
+ "plotters-svg",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "plotters-backend"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a"
+
+[[package]]
+name = "plotters-svg"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670"
+dependencies = [
+ "plotters-backend",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.92"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
+checksum = "8e0f6df8eaa422d97d72edcd152e1451618fed47fabbdbd5a8864167b1d4aff7"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.23.3"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15"
+checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
 dependencies = [
- "cfg-if",
  "indoc",
  "libc",
  "memoffset",
@@ -342,20 +590,19 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.23.3"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b"
+checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
 dependencies = [
- "once_cell",
  "python3-dll-a",
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.23.3"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d"
+checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -363,9 +610,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.23.3"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257"
+checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -375,9 +622,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.23.3"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d"
+checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -388,22 +635,28 @@ dependencies = [
 
 [[package]]
 name = "python3-dll-a"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b66f9171950e674e64bad3456e11bb3cca108e5c34844383cfe277f45c8a7a8"
+checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
 dependencies = [
  "cc",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.38"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "radium"
 version = "0.7.0"
@@ -411,25 +664,99 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
 [[package]]
-name = "ryu"
-version = "1.0.18"
+name = "rayon"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.217"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -438,15 +765,16 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.134"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "indexmap",
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -457,21 +785,15 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "smallvec"
-version = "1.13.2"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-
-[[package]]
-name = "static_assertions"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.94"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "987bc0be1cdea8b10216bd06e2ca407d40b9543468fafd3ddfb02f36e77f71f3"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -486,21 +808,42 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.16"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
+
+[[package]]
+name = "tinytemplate"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc"
+dependencies = [
+ "serde",
+ "serde_json",
+]
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.14"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
+checksum = "462eeb75aeb73aea900253ce739c8e18a67423fadf006037cd3ff27e82748a06"
 
 [[package]]
 name = "unindent"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom",
+ "js-sys",
+ "wasm-bindgen",
+]
 
 [[package]]
 name = "version_check"
@@ -509,10 +852,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+name = "walkdir"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.104"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.81"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9367c417a924a74cae129e6a2ae3b47fabb1f8995595ab474029da749a8be120"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-sys"
@@ -523,6 +963,15 @@ dependencies = [
  "windows-targets",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.52.6"
@@ -587,6 +1036,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -598,18 +1053,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.35"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/jiter/default.nix b/pkgs/development/python-modules/jiter/default.nix
index 7d5cb4c5931c..ce44681e80aa 100644
--- a/pkgs/development/python-modules/jiter/default.nix
+++ b/pkgs/development/python-modules/jiter/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "jiter";
-  version = "0.8.2";
+  version = "0.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "jiter";
     tag = "v${version}";
-    hash = "sha256-6FPwQ6t/zLB86k97S+6z5xWKBPJvjZ5/x3KrxOOT1gk=";
+    hash = "sha256-/OSLwqSy/CkAFv0hn1zED70MRsWV8/NTrSfqP7OSRFc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/jobspy/default.nix b/pkgs/development/python-modules/jobspy/default.nix
index 55b2623a9935..1f7bb1e47613 100644
--- a/pkgs/development/python-modules/jobspy/default.nix
+++ b/pkgs/development/python-modules/jobspy/default.nix
@@ -28,6 +28,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "numpy"
     "markdownify"
+    "regex"
   ];
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index ae05b00f4d08..3b1828f75e73 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.51.0";
+  version = "0.52.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-XXbJwzvt2gQox1+vQsJ3ajVoFlJVG/z2eUECQkWOi64=";
+    hash = "sha256-eO9F2c3hIHhxLC5j2+ZtPaj+zD7Mby44N7ULsxfAQxg=";
   };
 
   build-system = [ setuptools ];
@@ -23,16 +23,18 @@ buildPythonPackage rec {
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTestPaths = [
+    # Disable benchmark tests
     "tests/test_performance.py"
   ];
 
   pythonImportsCheck = [ "json_repair" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module to repair invalid JSON, commonly used to parse the output of LLMs";
     homepage = "https://github.com/mangiucugna/json_repair/";
     changelog = "https://github.com/mangiucugna/json_repair/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ greg ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ greg ];
+    mainProgram = "json_repair";
   };
 }
diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index 4f9f2087118d..559443bba339 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -62,6 +62,10 @@ buildPythonPackage rec {
     "test_references_url"
     # Tests are failing
     "TestMdGenerate"
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # Click 8.2 separates stdout and stderr, but upstream is on click 8.1 (https://github.com/pallets/click/pull/2523)
+    "test_nonexistent_output_path"
+    "test_config_parameters_with_nonexistent_output_path"
   ];
 
   pythonImportsCheck = [ "json_schema_for_humans" ];
diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
index d09ead373c51..0f08c6891bee 100644
--- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
+++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "json-stream-rs-tokenizer";
-  version = "0.4.30";
+  version = "0.4.31";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,12 +26,12 @@ buildPythonPackage rec {
     owner = "smheidrich";
     repo = "py-json-stream-rs-tokenizer";
     tag = "v${version}";
-    hash = "sha256-kzeEG42KcmczIC69aJe1dkqeBpMYn5uBBj1Ni+/+sTM=";
+    hash = "sha256-n+ZPB1BGUHEanpLpe4ZO6LjbxTALJ4Ns9/Hn7nE3mpc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Zvtu7pH50hPPuLKVn7itcuO+BeSJKRQmZCWtQkMIZI8=";
+    hash = "sha256-IPQrqayhyQ/gmT6nK+TgDcUQ4mPrG9yiJJk6enBzybA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix
index c791112357d0..a08869b01070 100644
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@@ -6,7 +6,6 @@
   httpx,
   iconv,
   pytestCheckHook,
-  pythonOlder,
   requests,
   json-stream-rs-tokenizer,
   setuptools,
@@ -14,16 +13,14 @@
 
 buildPythonPackage rec {
   pname = "json-stream";
-  version = "2.3.3";
+  version = "2.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "daggaz";
     repo = "json-stream";
     tag = "v${version}";
-    hash = "sha256-/GDEC/Poy84TGuXM34OW4+K/qMJELFfO+lNQ5M5VsdI=";
+    hash = "sha256-bhyoTvILap0/dKpmob6P1l9st7JwuHaLp7Y8FGfgLZA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix
index 2171f28e2aa7..d0edd890c88f 100644
--- a/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/pkgs/development/python-modules/jsonargparse/default.nix
@@ -10,7 +10,6 @@
   omegaconf,
   pytest-subtests,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   reconplogger,
   requests,
@@ -24,16 +23,14 @@
 
 buildPythonPackage rec {
   pname = "jsonargparse";
-  version = "4.41.0";
+  version = "4.42.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "omni-us";
     repo = "jsonargparse";
     tag = "v${version}";
-    hash = "sha256-uNgtxQuAkOB651lbPPWQg0p4T8G1dgFbx/EyO/sJSjs=";
+    hash = "sha256-M6CEUDf6JcjZWRBoHfVyFmX9ZV8xsB7illoBk0YzZs0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix
index bcc0bb6a7741..f0bfd22a03f7 100644
--- a/pkgs/development/python-modules/jsonconversion/default.nix
+++ b/pkgs/development/python-modules/jsonconversion/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "jsonconversion";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "DLR-RM";
     repo = "python-jsonconversion";
     tag = version;
-    hash = "sha256-FGgvSDweZM1xrdrDLFiGmdAtgxoFjglUlMV+fgo7/ls=";
+    hash = "sha256-OOp5oHAb00AN+5tlLeUzily1MKHDIbn0qg3jzkZ0vAo=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
index 195813ddf7fd..ae7d77d47eda 100644
--- a/pkgs/development/python-modules/jupyter-server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -111,6 +111,8 @@ buildPythonPackage rec {
     "test_delete"
     # Insufficient access privileges for operation
     "test_regression_is_hidden"
+    # Fails under load (which causes failure on Hydra)
+    "test_execution_state"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
@@ -120,7 +122,6 @@ buildPythonPackage rec {
     # TypeError: the JSON object must be str, bytes or bytearray, not NoneType
     "test_terminal_create_with_cwd"
     # Fails under load (which causes failure on Hydra)
-    "test_execution_state"
     "test_cull_connected"
   ];
 
diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 2494b0efb675..b111ab1d01a5 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub";
-  version = "5.4.0";
+  version = "5.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "jupyterhub";
-    rev = "refs/tags/${version}";
-    hash = "sha256-OCrEmNwWhOMJE/uTDUyEZzJlWqyzNp6CnvDsOg5hZkU=";
+    tag = version;
+    hash = "sha256-eSYoLoPWHQ/HHAFW6X262hrIrmUxDxrYEzVFiwGVqCs=";
   };
 
   npmDeps = fetchNpmDeps {
diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index e801f49aca4a..e7a0978bb415 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -6,12 +6,13 @@
   linetable,
   pytestCheckHook,
   pythonOlder,
+  hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "kajiki";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -24,6 +25,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ linetable ];
 
+  build-system = [ hatchling ];
+
   nativeCheckInputs = [
     babel
     pytestCheckHook
diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix
index a155dd55bf2b..fcaf7d5adaac 100644
--- a/pkgs/development/python-modules/kaleido/default.nix
+++ b/pkgs/development/python-modules/kaleido/default.nix
@@ -15,7 +15,6 @@
   makeWrapper,
   nspr,
   nss,
-  sbclPackages,
   sqlite,
 }:
 
@@ -59,7 +58,6 @@ buildPythonPackage rec {
     libGL
     nspr
     nss
-    sbclPackages.cl-dejavu
     sqlite
   ];
 
@@ -82,15 +80,7 @@ buildPythonPackage rec {
     rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts
     mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d
     ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/
-    ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-    ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-
-    # Replace bundled fonts with nixpkgs-packaged fonts
-    # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now.
-    #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts
-    #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato
-    #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
-    #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
+    ln -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
   ''
   + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     # Replace bundled swiftshader with libGL
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 93f8a3a14784..e7543e101649 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -36,16 +36,26 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "3.11.3";
+  version = "3.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${version}";
-    hash = "sha256-J/NPLR9ShKhvHDU0/NpUNp95RViS2KygqvnuDHdwiP0=";
+    hash = "sha256-xuCxeQD8NAn7zlqCG+GyFjL6NlnIkGie+4GxzLGsyUg=";
   };
 
+  # Use a raw string to prevent LaTeX codes from being interpreted as escape sequences.
+  # SyntaxError: invalid escape sequence '\h
+  # Fix submitted upstream: https://github.com/keras-team/keras/pull/21790
+  postPatch = ''
+    substituteInPlace keras/src/quantizers/gptq_test.py \
+      --replace-fail \
+        'CALIBRATION_TEXT = """' \
+        'CALIBRATION_TEXT = r"""'
+  '';
+
   build-system = [
     setuptools
   ];
@@ -87,6 +97,25 @@ buildPythonPackage rec {
     "test_fit_with_data_adapter_grain_dataloader"
     "test_fit_with_data_adapter_grain_datast"
     "test_fit_with_data_adapter_grain_datast_with_len"
+    "test_image_dataset_from_directory_binary_grain"
+    "test_image_dataset_from_directory_color_modes_grain"
+    "test_image_dataset_from_directory_crop_to_aspect_ratio_grain"
+    "test_image_dataset_from_directory_follow_links_grain"
+    "test_image_dataset_from_directory_manual_labels_grain"
+    "test_image_dataset_from_directory_multiclass_grain"
+    "test_image_dataset_from_directory_no_labels_grain"
+    "test_image_dataset_from_directory_not_batched_grain"
+    "test_image_dataset_from_directory_pad_to_aspect_ratio_grain"
+    "test_image_dataset_from_directory_shuffle_grain"
+    "test_image_dataset_from_directory_validation_split_grain"
+    "test_sample_count_grain"
+    "test_text_dataset_from_directory_binary_grain"
+    "test_text_dataset_from_directory_follow_links_grain"
+    "test_text_dataset_from_directory_manual_labels_grain"
+    "test_text_dataset_from_directory_multiclass_grain"
+    "test_text_dataset_from_directory_not_batched_grain"
+    "test_text_dataset_from_directory_standalone_grain"
+    "test_text_dataset_from_directory_validation_split_grain"
 
     # Tries to install the package in the sandbox
     "test_keras_imports"
@@ -179,6 +208,9 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Require unpackaged `grain`
+    "keras/src/layers/preprocessing/data_layer_test.py"
+    "keras/src/layers/preprocessing/image_preprocessing/resizing_test.py"
+    "keras/src/layers/preprocessing/rescaling_test.py"
     "keras/src/trainers/data_adapters/grain_dataset_adapter_test.py"
 
     # These tests succeed when run individually, but crash within the full test suite:
diff --git a/pkgs/development/python-modules/minikerberos-bad/default.nix b/pkgs/development/python-modules/kerbad/default.nix
similarity index 61%
rename from pkgs/development/python-modules/minikerberos-bad/default.nix
rename to pkgs/development/python-modules/kerbad/default.nix
index c018ff09a170..68e87dcd6dff 100644
--- a/pkgs/development/python-modules/minikerberos-bad/default.nix
+++ b/pkgs/development/python-modules/kerbad/default.nix
@@ -1,37 +1,43 @@
 {
   lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   asn1crypto,
   asysocks,
-  buildPythonPackage,
   cryptography,
-  fetchFromGitHub,
-  fetchPypi,
+  dnspython,
+  minikerberos,
   oscrypto,
-  pythonOlder,
-  setuptools,
   six,
   tqdm,
   unicrypto,
 }:
 
-buildPythonPackage rec {
-  pname = "minikerberos-bad";
-  version = "0.4.4";
+buildPythonPackage {
+  pname = "kerbad";
+  version = "0.5.6-unstable-2025-10-07";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
-    repo = "minikerberos-bAD";
-    tag = version;
-    hash = "sha256-pnIn7UOpnCke6voFvOwcONXDd9i/di1lE/57vkg0/0w=";
+    repo = "kerbad";
+    rev = "3c2284de4d2390e22026b550705622ed39e5c05a"; # no tag available
+    hash = "sha256-V4KaF6lsECoLVpGZTZ4p7q9drHSsrsLPI/9zEQpqm3I=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     asn1crypto
-    cryptography
     asysocks
+    cryptography
+    dnspython
+    minikerberos
     oscrypto
     six
     tqdm
@@ -45,8 +51,7 @@ buildPythonPackage rec {
 
   meta = {
     description = "Kerberos manipulation library in pure Python";
-    homepage = "https://github.com/CravateRouge/minikerberos-bAD";
-    changelog = "https://github.com/CravateRouge/minikerberos-bAD/releases/tag/${src.tag}";
+    homepage = "https://github.com/CravateRouge/kerbad";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix
index 73df35cd2b36..d0e007c4b698 100644
--- a/pkgs/development/python-modules/kestra/default.nix
+++ b/pkgs/development/python-modules/kestra/default.nix
@@ -12,14 +12,14 @@
 }:
 buildPythonPackage rec {
   pname = "kestra";
-  version = "0.23.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kestra-io";
     repo = "libs";
     tag = "v${version}";
-    hash = "sha256-WtwvOSgAcN+ly0CnkL0Y7lrO4UhSSiXmoAyGXP/hFtE=";
+    hash = "sha256-cDJ5c4HgwmBnRtAFp8gxCqpo8AYJcuI2tthQOXaSOmU=";
   };
 
   sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/keymap-drawer/default.nix b/pkgs/development/python-modules/keymap-drawer/default.nix
index fb6083a90802..fffc10aa8252 100644
--- a/pkgs/development/python-modules/keymap-drawer/default.nix
+++ b/pkgs/development/python-modules/keymap-drawer/default.nix
@@ -2,9 +2,11 @@
   lib,
 
   buildPythonPackage,
+  callPackages,
   fetchFromGitHub,
   pythonOlder,
 
+  keymap-drawer,
   nix-update-script,
   pcpp,
   platformdirs,
@@ -59,6 +61,12 @@ buildPythonPackage {
   versionCheckProgram = "${placeholder "out"}/bin/keymap";
   versionCheckProgramArg = "--version";
 
+  passthru.tests = callPackages ./tests {
+    # Explicitly pass the correctly scoped package.
+    # The top-level package will still resolve to itself, because the way
+    # `toPythonApplication` interacts with scopes is weird.
+    inherit keymap-drawer;
+  };
   passthru.updateScript = nix-update-script { };
 
   meta = {
diff --git a/pkgs/development/python-modules/keymap-drawer/tests/default.nix b/pkgs/development/python-modules/keymap-drawer/tests/default.nix
new file mode 100644
index 000000000000..7c94185c41f5
--- /dev/null
+++ b/pkgs/development/python-modules/keymap-drawer/tests/default.nix
@@ -0,0 +1,89 @@
+{
+  lib,
+  fetchFromGitHub,
+  runCommand,
+  stdenv,
+  testers,
+
+  keymap-drawer,
+  yamllint,
+}:
+let
+  runKeymapDrawer =
+    name:
+    runCommand "keymap-drawer-${name}" {
+      nativeBuildInputs = [ keymap-drawer ];
+    };
+
+  MattSturgeon-example = fetchFromGitHub {
+    owner = "MattSturgeon";
+    repo = "glove80-config";
+    rev = "d55267dd26593037256b35a5d6ebba0f75541da5";
+    hash = "sha256-MV6cNpgHBuaGvpu2aR1aBNMpwPnDqOSbGf+2ykxocP4=";
+    nonConeMode = true;
+    sparseCheckout = [
+      "config"
+      "img"
+    ];
+  };
+
+  # MattSturgeon's example requires MDI icons
+  mdi = fetchFromGitHub {
+    owner = "Templarian";
+    repo = "MaterialDesign-SVG";
+    tag = "v7.4.47";
+    hash = "sha256-NoSSRT1ID38MT70IZ+7h/gMVCNsjNs3A2RX6ePGwuQ0=";
+  };
+in
+{
+  dump-config = runKeymapDrawer "dump-config" ''
+    keymap dump-config --output "$out"
+
+    if [ ! -s "$out" ]; then
+      >&2 echo 'Expected `dump-config` to have content.'
+      exit 1
+    fi
+
+    ${lib.getExe yamllint} --strict --config-data relaxed "$out"
+  '';
+
+  parse-zmk = testers.testEqualContents {
+    assertion = "keymap parse --zmk-keymap produces expected YAML";
+    expected = "${MattSturgeon-example}/img/glove80.yaml";
+    actual = runKeymapDrawer "parse" ''
+      keymap \
+        --config ${MattSturgeon-example}/config/keymap_drawer.yaml \
+        parse --zmk-keymap ${MattSturgeon-example}/config/glove80.keymap \
+        --output "$out"
+    '';
+    checkMetadata = stdenv.buildPlatform.isLinux;
+  };
+
+  draw = testers.testEqualContents {
+    assertion = "keymap draw produces expected SVG";
+    expected = "${MattSturgeon-example}/img/glove80.svg";
+    actual = runKeymapDrawer "draw" ''
+      ${lib.optionalString stdenv.buildPlatform.isLinux ''
+        export XDG_CACHE_HOME="$PWD/cache"
+        glyphs="$XDG_CACHE_HOME/keymap-drawer/glyphs"
+      ''}
+      ${lib.optionalString stdenv.buildPlatform.isDarwin ''
+        export HOME="$PWD/home"
+        glyphs="$HOME/Library/Caches/keymap-drawer/glyphs"
+      ''}
+      mkdir -p "$glyphs"
+
+      # Unpack MDI icons into the cache
+      for file in ${mdi}/svg/*
+      do
+        ln -s "$file" "$glyphs/mdi:$(basename "$file")"
+      done
+
+      keymap \
+        --config ${MattSturgeon-example}/config/keymap_drawer.yaml \
+        draw ${MattSturgeon-example}/img/glove80.yaml \
+        --output "$out"
+    '';
+    checkMetadata = stdenv.buildPlatform.isLinux;
+  };
+}
diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix
index 0e10841be1d9..5e0c219ee589 100644
--- a/pkgs/development/python-modules/kfactory/default.nix
+++ b/pkgs/development/python-modules/kfactory/default.nix
@@ -12,7 +12,6 @@
   cachetools,
   klayout,
   loguru,
-  numpy,
   pydantic-extra-types,
   pydantic-settings,
   pydantic,
@@ -21,26 +20,32 @@
   rectangle-packer,
   requests,
   ruamel-yaml-string,
-  ruamel-yaml,
   scipy,
   semver,
   toolz,
   typer,
 
   # tests
+  pytest-regressions,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "kfactory";
-  version = "1.14.4";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "kfactory";
     tag = "v${version}";
-    hash = "sha256-el3bGv57mAfxYG9tdLX5N6R76F+9GY9jdZaIUjMqcVU=";
+    # kfactory uses `.git` to infer the project directory.
+    # https://github.com/gdsfactory/kfactory/blob/v2.0.0/src/kfactory/conf.py#L318-L327
+    # Otherwise, tests fail with:
+    # assert kf.config.project_dir is not None
+    # E   AssertionError: assert None is not None
+    leaveDotGit = true;
+    hash = "sha256-eZRNUb2Qw2HcR2W1pf15ulEt7ZCJwi60SuGdte/cG8E=";
   };
 
   build-system = [
@@ -48,12 +53,14 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    "pydantic"
+  ];
   dependencies = [
     aenum
     cachetools
     klayout
     loguru
-    numpy
     pydantic
     pydantic-extra-types
     pydantic-settings
@@ -61,7 +68,6 @@ buildPythonPackage rec {
     rapidfuzz
     rectangle-packer
     requests
-    ruamel-yaml
     ruamel-yaml-string
     scipy
     semver
@@ -71,13 +77,67 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "kfactory" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-regressions
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # AssertionError: Binary files ... and ... differ
+    "test_array"
+    "test_array_indexerror"
+    "test_autorename"
+    "test_cell_default_fallback"
+    "test_cell_in_threads"
+    "test_cell_yaml"
+    "test_circular_snapping"
+    "test_create"
+    "test_enclosure_name"
+    "test_euler_snapping"
+    "test_filter_layer_pt_reg"
+    "test_filter_regex"
+    "test_flatten"
+    "test_info"
+    "test_invalid_array"
+    "test_kcell_attributes"
+    "test_namecollision"
+    "test_nested_dic"
+    "test_nested_dict_list"
+    "test_netlist"
+    "test_netlist_equivalent"
+    "test_no_snap"
+    "test_overwrite"
+    "test_ports_cell"
+    "test_ports_in_cells"
+    "test_ports_instance"
+    "test_rename_clockwise"
+    "test_rename_clockwise_multi"
+    "test_schematic_anchor"
+    "test_schematic_create"
+    "test_schematic_create_cell"
+    "test_schematic_kcl_mix_netlist"
+    "test_schematic_mirror_connection"
+    "test_schematic_route"
+    "test_size_info"
+    "test_to_dtype"
+  ];
 
   disabledTestPaths = [
     # https://github.com/gdsfactory/kfactory/issues/511
     "tests/test_pdk.py"
     # NameError
     "tests/test_session.py"
+
+    # AssertionError: Binary files ... and ... differ
+    "tests/test_all_angle.py"
+    "tests/test_cells.py"
+    "tests/test_grid.py"
+    "tests/test_l2n.py"
+    "tests/test_packing.py"
+    "tests/test_pins.py"
+    "tests/test_rename.py"
+    "tests/test_routing.py"
+    "tests/test_spiral.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/kiss-headers/default.nix b/pkgs/development/python-modules/kiss-headers/default.nix
index 79011b9660bf..8e858c60945a 100644
--- a/pkgs/development/python-modules/kiss-headers/default.nix
+++ b/pkgs/development/python-modules/kiss-headers/default.nix
@@ -29,9 +29,12 @@ buildPythonPackage rec {
     pytest-cov-stub
   ];
 
+  preCheck = ''
+    rm -rf src # cause pycache conflict
+  '';
+
   disabledTestPaths = [
     # Tests require internet access
-    "kiss_headers/__init__.py"
     "tests/test_serializer.py"
     "tests/test_with_http_request.py"
   ];
diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index e93c4487160b..4f02d0a710d1 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.10.9.185845";
+  version = "2025.10.31.195356";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-hy10dfrsttIaIlZRgOgNXwTWtBnV3vOGOmspkDphR4k=";
+    hash = "sha256-m490gincBGm5qN1ndVfw8HZYnIh9RNLHQkW6w4duTTE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/kserve-storage/default.nix b/pkgs/development/python-modules/kserve-storage/default.nix
new file mode 100644
index 000000000000..b56be1c1b275
--- /dev/null
+++ b/pkgs/development/python-modules/kserve-storage/default.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  azure-identity,
+  azure-storage-blob,
+  azure-storage-file-share,
+  boto3,
+  google-cloud-storage,
+  huggingface-hub,
+  requests,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "kserve-storage";
+  version = "0.16.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "kserve_storage";
+    inherit version;
+    hash = "sha256-xgLnWegsPF18RLxwxt0dfnrZwsX7AK3b8AdT594Bac4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "google-cloud-storage"
+  ];
+  dependencies = [
+    azure-identity
+    azure-storage-blob
+    azure-storage-file-share
+    boto3
+    google-cloud-storage
+    huggingface-hub
+    requests
+  ];
+
+  pythonImportsCheck = [ "kserve_storage" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # RuntimeError: Failed to fetch model. No model found in file:///tmp.
+    "test_local_path_with_out_dir_exist"
+  ];
+
+  meta = {
+    description = "KServe Storage Handler. This module is responsible to download the models from the provided source";
+    homepage = "https://pypi.org/project/kserve-storage";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index 10d86bf89974..c547a18e5cff 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -5,35 +5,21 @@
   fetchFromGitHub,
 
   # build-system
-  deprecation,
-  poetry-core,
+  setuptools,
 
   # dependencies
   cloudevents,
   fastapi,
   grpc-interceptor,
   grpcio,
+  grpcio-tools,
   httpx,
   kubernetes,
   numpy,
   orjson,
   pandas,
-  uvicorn,
-
-  # optional-dependencies
-  azure-identity,
-  azure-storage-blob,
-  azure-storage-file-share,
-  boto3,
-  google-cloud-storage,
-  huggingface-hub,
-  asgi-logger,
-  ray,
-  vllm,
-
   prometheus-client,
   protobuf,
-  requests,
   psutil,
   pydantic,
   python-dateutil,
@@ -41,11 +27,24 @@
   six,
   tabulate,
   timing-asgi,
+  uvicorn,
+
+  # optional-dependencies
+  # storage
+  kserve-storage,
+  # logging
+  asgi-logger,
+  # ray
+  ray,
+  # llm
+  vllm,
 
   # tests
   avro,
   grpcio-testing,
+  jinja2,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-httpx,
   pytest-xdist,
   pytestCheckHook,
@@ -54,14 +53,14 @@
 
 buildPythonPackage rec {
   pname = "kserve";
-  version = "0.15.2";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kserve";
     repo = "kserve";
     tag = "v${version}";
-    hash = "sha256-NklR2Aoa5UdWkqNOfX+xl3R158JDSQtStXv9DkklOwM=";
+    hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms=";
   };
 
   sourceRoot = "${src.name}/python/kserve";
@@ -77,8 +76,7 @@ buildPythonPackage rec {
   ];
 
   build-system = [
-    deprecation
-    poetry-core
+    setuptools
   ];
 
   dependencies = [
@@ -86,6 +84,7 @@ buildPythonPackage rec {
     fastapi
     grpc-interceptor
     grpcio
+    grpcio-tools
     httpx
     kubernetes
     numpy
@@ -101,21 +100,20 @@ buildPythonPackage rec {
     tabulate
     timing-asgi
     uvicorn
-  ];
+  ]
+  ++ uvicorn.optional-dependencies.standard;
 
   optional-dependencies = {
     storage = [
-      azure-identity
-      azure-storage-blob
-      azure-storage-file-share
-      boto3
-      huggingface-hub
-      google-cloud-storage
-      requests
+      kserve-storage
+    ];
+    logging = [
+      asgi-logger
+    ];
+    ray = [
+      ray
     ]
-    ++ huggingface-hub.optional-dependencies.hf_transfer;
-    logging = [ asgi-logger ];
-    ray = [ ray ];
+    ++ ray.optional-dependencies.serve;
     llm = [
       vllm
     ];
@@ -124,7 +122,9 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     avro
     grpcio-testing
+    jinja2
     pytest-asyncio
+    pytest-cov-stub
     pytest-httpx
     pytest-xdist
     pytestCheckHook
@@ -140,6 +140,9 @@ buildPythonPackage rec {
 
     # AssertionError
     "test/test_server.py::TestTFHttpServerLoadAndUnLoad::test_unload"
+
+    # Race condition when called concurrently between two instances of the same model (i.e. in nixpkgs-review)
+    "test/test_dataplane.py::TestDataPlane::test_model_metadata[TEST_RAY_SERVE_MODEL]"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # RuntimeError: Failed to start GCS
diff --git a/pkgs/development/python-modules/la-panic/default.nix b/pkgs/development/python-modules/la-panic/default.nix
new file mode 100644
index 000000000000..9d2600623823
--- /dev/null
+++ b/pkgs/development/python-modules/la-panic/default.nix
@@ -0,0 +1,46 @@
+{
+  buildPythonPackage,
+  cached-property,
+  click,
+  coloredlogs,
+  fetchFromGitLab,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "la-panic";
+  version = "0.5.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "yanivhasbanidev";
+    repo = "la_panic";
+    tag = version;
+    hash = "sha256-V9VUSp5uvj4jR3oVHdRjvnNDGB1a5bi8elu/ry4jq00=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cached-property
+    click
+    coloredlogs
+  ];
+
+  pythonImportsCheck = [ "la_panic" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://gitlab.com/yanivhasbanidev/la_panic/-/tags/${src.tag}";
+    description = "AppleOS Kernel Panic Parser";
+    homepage = "https://gitlab.com/yanivhasbanidev/la_panic";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "la_panic";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index da4959bdea4d..0313e19e055e 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.18.0";
+  version = "1.19.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "LacusCore";
     tag = "v${version}";
-    hash = "sha256-+K2zfUGhjQNGIxsh3YHYAH4G3mAoysdpMnscshwl7xI=";
+    hash = "sha256-8cAN560wg2MwZ9EooHVz3dsoNC5WQWhCAGqu48ZeRtY=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
new file mode 100644
index 000000000000..112793ef4722
--- /dev/null
+++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  pydantic,
+  python-dateutil,
+  typing-extensions,
+  urllib3,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "lance-namespace";
+  version = "0.0.20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "lancedb";
+    repo = "lance-namespace";
+    tag = "v${version}";
+    hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4=";
+  };
+
+  sourceRoot = "${src.name}/python/lance_namespace_urllib3_client";
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    pydantic
+    python-dateutil
+    typing-extensions
+    urllib3
+  ];
+
+  pythonImportsCheck = [ "lance_namespace_urllib3_client" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Lance namespace OpenAPI specification";
+    homepage = "https://github.com/lancedb/lance-namespace/tree/main/python/lance_namespace_urllib3_client";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix
new file mode 100644
index 000000000000..f19307f524a3
--- /dev/null
+++ b/pkgs/development/python-modules/lance-namespace/default.nix
@@ -0,0 +1,111 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  lance-namespace-urllib3-client,
+  pyarrow,
+  # pylance,
+  typing-extensions,
+
+  # optional-dependencies
+  # dir
+  opendal,
+  # glue
+  boto3,
+  botocore,
+  # hive2
+  hive-metastore-client,
+  thrift,
+
+  # tests
+  pylance,
+  pytestCheckHook,
+  lance-namespace,
+}:
+
+buildPythonPackage rec {
+  pname = "lance-namespace";
+  version = "0.0.20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "lancedb";
+    repo = "lance-namespace";
+    tag = "v${version}";
+    hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4=";
+  };
+
+  sourceRoot = "${src.name}/python/lance_namespace";
+
+  build-system = [
+    hatchling
+  ];
+
+  pythonRemoveDeps = [
+    "pylance"
+  ];
+  dependencies = [
+    lance-namespace-urllib3-client
+    typing-extensions
+    # pylance
+    pyarrow
+  ];
+
+  optional-dependencies = {
+    dir = [ opendal ];
+    glue = [
+      boto3
+      botocore
+    ];
+    hive2 = [
+      hive-metastore-client
+      thrift
+    ];
+  };
+
+  pythonImportsCheck = [ "lance_namespace" ];
+
+  nativeCheckInputs = [
+    pylance
+    pytestCheckHook
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  # Tests require pylance, which is a circular dependency
+  doCheck = false;
+
+  passthru.tests.pytest = lance-namespace.overridePythonAttrs {
+    disabledTests = [
+      # AttributeError: 'function' object has no attribute 'write_dataset'
+      "test_create_table"
+      "test_describe_table"
+      "test_drop_table"
+      "test_list_tables"
+
+      # RuntimeError: Failed to list tables: Operator.list() got an unexpected keyword argument 'recursive'
+      "test_create_empty_table"
+      "test_empty_list_tables"
+
+      # lance_namespace.unity.LanceNamespaceException: Failed to drop namespace: BehaviorEnum
+      "test_drop_namespace"
+
+      # pydantic_core._pydantic_core.ValidationError: 1 validation error for ListNamespacesResponse namespaces
+      "test_list_namespaces_schemas"
+      "test_list_namespaces_top_level"
+    ];
+
+    doCheck = true;
+  };
+
+  meta = {
+    description = "Open specification on top of the storage-based Lance table and file format to standardize access to a collection of Lance tables";
+    homepage = "https://github.com/lancedb/lance-namespace/tree/main/python/lance_namespace";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/langchain-anthropic/default.nix b/pkgs/development/python-modules/langchain-anthropic/default.nix
index a0d9e62488cc..7c78e8547902 100644
--- a/pkgs/development/python-modules/langchain-anthropic/default.nix
+++ b/pkgs/development/python-modules/langchain-anthropic/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   anthropic,
@@ -12,6 +12,7 @@
   pydantic,
 
   # tests
+  langchain,
   langchain-tests,
   pytest-asyncio,
   pytestCheckHook,
@@ -22,19 +23,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-anthropic";
-  version = "0.3.18";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-anthropic==${version}";
-    hash = "sha256-ZedCz4FyKowhxLVpHrBsmGKHkMCA5yW7ui6LI0QGQ44=";
+    hash = "sha256-3kW5w98t5F199k14MoCY2dZGrC/HdBzKuRpM37EY3LQ=";
   };
 
   sourceRoot = "${src.name}/libs/partners/anthropic";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   dependencies = [
     anthropic
@@ -49,6 +50,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    langchain
     langchain-tests
     pytest-asyncio
     pytestCheckHook
diff --git a/pkgs/development/python-modules/langchain-aws/default.nix b/pkgs/development/python-modules/langchain-aws/default.nix
index 2877c9edfff8..5b29a60e1384 100644
--- a/pkgs/development/python-modules/langchain-aws/default.nix
+++ b/pkgs/development/python-modules/langchain-aws/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  pdm-backend,
 
   # dependencies
   boto3,
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langchain-aws";
-  version = "0.2.33";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-aws";
     tag = "langchain-aws==${version}";
-    hash = "sha256-8VRZhwrR5PdLo9FamQClKbYfuHUGVxamku4osyl8Wl4=";
+    hash = "sha256-Y4r9a7EiyOACcU41+1Lo89jguu1QmijWsNeoNqKF3cY=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/libs/aws";
 
-  build-system = [ poetry-core ];
+  build-system = [ pdm-backend ];
 
   dependencies = [
     boto3
diff --git a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch b/pkgs/development/python-modules/langchain-chroma/001-async-test.patch
deleted file mode 100644
index 178fd37199f8..000000000000
--- a/pkgs/development/python-modules/langchain-chroma/001-async-test.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libs/partners/chroma/tests/integration_tests/test_vectorstores.py b/libs/partners/chroma/tests/integration_tests/test_vectorstores.py
-index 382b24cb5..f99a34112 100644
---- a/tests/integration_tests/test_vectorstores.py
-+++ b/tests/integration_tests/test_vectorstores.py
-@@ -36,7 +36,7 @@ def test_chroma() -> None:
- 
-     assert output == [Document(page_content="foo")]
- 
--
-+@pytest.mark.asyncio
- async def test_chroma_async() -> None:
-     """Test end to end construction and search."""
-     texts = ["foo", "bar", "baz"]
diff --git a/pkgs/development/python-modules/langchain-chroma/default.nix b/pkgs/development/python-modules/langchain-chroma/default.nix
index e412b4e02738..d8ff4c47f065 100644
--- a/pkgs/development/python-modules/langchain-chroma/default.nix
+++ b/pkgs/development/python-modules/langchain-chroma/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   chromadb,
@@ -22,21 +22,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-chroma";
-  version = "0.2.6";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-chroma==${version}";
-    hash = "sha256-HxoxxOgiDC/rf4hCA6uQBPmK11/fqddc5d4nMpIFxEw=";
+    hash = "sha256-fKFcl4NiNaypJGoV8bDrH7MwnsXNtnm7Hkxp/+SLc2c=";
   };
 
   sourceRoot = "${src.name}/libs/partners/chroma";
 
-  patches = [ ./001-async-test.patch ];
-
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
@@ -59,11 +57,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # Bad integration test, not used or vetted by the langchain team
-    "test_chroma_update_document"
-  ];
-
   passthru = {
     # python updater script sets the wrong tag
     skipBulkUpdate = true;
diff --git a/pkgs/development/python-modules/langchain-core/default.nix b/pkgs/development/python-modules/langchain-core/default.nix
index 80ef77828e11..3b103a45a49d 100644
--- a/pkgs/development/python-modules/langchain-core/default.nix
+++ b/pkgs/development/python-modules/langchain-core/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   jsonpatch,
@@ -36,19 +36,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-core";
-  version = "0.3.72";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    hash = "sha256-/V2xwpVIR7AWkN85D51LYokMrTrnJlIkGr0q1ztVh8A=";
   };
 
   sourceRoot = "${src.name}/libs/core";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     "packaging"
diff --git a/pkgs/development/python-modules/langchain-deepseek/default.nix b/pkgs/development/python-modules/langchain-deepseek/default.nix
index e6978addf2e8..cd5683c5007f 100644
--- a/pkgs/development/python-modules/langchain-deepseek/default.nix
+++ b/pkgs/development/python-modules/langchain-deepseek/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
@@ -22,20 +22,20 @@
 
 buildPythonPackage rec {
   pname = "langchain-deepseek";
-  version = "0.1.4";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-deepseek==${version}";
-    hash = "sha256-lIlThVpyZF5osiCyYMO8kQUNtG5eUjXGZLdgRraj4Yc=";
+    hash = "sha256-sOJxtiYL/hgDEeWkCvHP3mfI4tmrBuQp1BYN5WX+npo=";
   };
 
   sourceRoot = "${src.name}/libs/partners/deepseek";
 
   build-system = [
-    pdm-backend
+    hatchling
   ];
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/langchain-fireworks/default.nix b/pkgs/development/python-modules/langchain-fireworks/default.nix
index 3a614511e244..e30ec4de5018 100644
--- a/pkgs/development/python-modules/langchain-fireworks/default.nix
+++ b/pkgs/development/python-modules/langchain-fireworks/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   aiohttp,
@@ -24,19 +24,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-fireworks";
-  version = "0.3.0";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-fireworks==${version}";
-    hash = "sha256-OZou323FAk2I4YuQV7sllbzDwFQWy/90FK3gIHnEBd0=";
+    hash = "sha256-JULxbSSSerM7HifVBRxkv5YgpP5jFdm3XzHIJbM8T1Y=";
   };
 
   sourceRoot = "${src.name}/libs/partners/fireworks";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp
@@ -75,8 +75,8 @@ buildPythonPackage rec {
     description = "Build LangChain applications with Fireworks";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/fireworks";
     license = lib.licenses.mit;
-    maintainers = [
-      lib.maintainers.sarahec
+    maintainers = with lib.maintainers; [
+      sarahec
     ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-google-genai/default.nix b/pkgs/development/python-modules/langchain-google-genai/default.nix
index b28f462f0359..f89cb6787844 100644
--- a/pkgs/development/python-modules/langchain-google-genai/default.nix
+++ b/pkgs/development/python-modules/langchain-google-genai/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  pdm-backend,
 
   # dependencies
   filetype,
@@ -29,19 +29,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-google-genai";
-  version = "2.1.10";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain-google";
     tag = "libs/genai/v${version}";
-    hash = "sha256-kqII8RG1ep+n5CqKLY1v7Mc+zJh6kl1rAjMmkomfeqM=";
+    hash = "sha256-9Z0iRSICApA5/iHB7NTVYGpkktaoynG74W2mvn9zeMg=";
   };
 
   sourceRoot = "${src.name}/libs/genai";
 
-  build-system = [ poetry-core ];
+  build-system = [ pdm-backend ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
@@ -85,9 +85,9 @@ buildPythonPackage rec {
     description = "LangChain integrations for Google Gemini";
     homepage = "https://github.com/langchain-ai/langchain-google/tree/main/libs/genai";
     license = lib.licenses.mit;
-    maintainers = [
-      lib.maintainers.eu90h
-      lib.maintainers.sarahec
+    maintainers = with lib.maintainers; [
+      eu90h
+      sarahec
     ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-groq/default.nix b/pkgs/development/python-modules/langchain-groq/default.nix
index 96478eb5fa85..a70487f2378d 100644
--- a/pkgs/development/python-modules/langchain-groq/default.nix
+++ b/pkgs/development/python-modules/langchain-groq/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
@@ -20,19 +20,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-groq";
-  version = "0.3.8";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-groq==${version}";
-    hash = "sha256-mlkNKzVX4VUQ9+/rB0fD4HfwjbCA9Yp4DJkMT+ExJ1c=";
+    hash = "sha256-OuZEdpPp0mKSejd43RW3bXzCzp3E4Pce7flsSr5JleY=";
   };
 
   sourceRoot = "${src.name}/libs/partners/groq";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
diff --git a/pkgs/development/python-modules/langchain-huggingface/default.nix b/pkgs/development/python-modules/langchain-huggingface/default.nix
index e8a1dd68fc1a..ef4043f16e1c 100644
--- a/pkgs/development/python-modules/langchain-huggingface/default.nix
+++ b/pkgs/development/python-modules/langchain-huggingface/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   huggingface-hub,
@@ -33,19 +33,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-huggingface";
-  version = "0.3.1";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-huggingface==${version}";
-    hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
+    hash = "sha256-5ovHScT4bi4Ix7ejeyTjYxBvraoegtyIBojTdTBH5Js=";
   };
 
   sourceRoot = "${src.name}/libs/partners/huggingface";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
diff --git a/pkgs/development/python-modules/langchain-mistralai/default.nix b/pkgs/development/python-modules/langchain-mistralai/default.nix
index 9b6f5d9abc4c..35ac8078c34e 100644
--- a/pkgs/development/python-modules/langchain-mistralai/default.nix
+++ b/pkgs/development/python-modules/langchain-mistralai/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
@@ -24,19 +24,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-mistralai";
-  version = "0.2.12";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-mistralai==${version}";
-    hash = "sha256-eZyoveKn4S0nkK/2q8+HK0bpFAQEez4PyRETQeZItMo=";
+    hash = "sha256-khpZY6kttbgacnY1EKCyIPBR2ZiZHC3OA+0NpIBXg9s=";
   };
 
   sourceRoot = "${src.name}/libs/partners/mistralai";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   dependencies = [
     langchain-core
diff --git a/pkgs/development/python-modules/langchain-ollama/default.nix b/pkgs/development/python-modules/langchain-ollama/default.nix
index b315678abe78..93072b464538 100644
--- a/pkgs/development/python-modules/langchain-ollama/default.nix
+++ b/pkgs/development/python-modules/langchain-ollama/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
@@ -22,20 +22,20 @@
 
 buildPythonPackage rec {
   pname = "langchain-ollama";
-  version = "0.3.8";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-ollama==${version}";
-    hash = "sha256-r6O06JHJOtMPA/FOmkr6YCT5pUnlcG9wu2Bm3Gae5Mk=";
+    hash = "sha256-BINQYT+tLHAOKU54Cu6KP2vDg02MgkK9+XOYli8AXzs=";
   };
 
   sourceRoot = "${src.name}/libs/partners/ollama";
 
   build-system = [
-    pdm-backend
+    hatchling
   ];
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/langchain-openai/default.nix b/pkgs/development/python-modules/langchain-openai/default.nix
index 2e6bb2ab23fe..8d3d8fe6c6d7 100644
--- a/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/pkgs/development/python-modules/langchain-openai/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
@@ -13,6 +13,7 @@
 
   # tests
   freezegun,
+  langchain,
   langchain-tests,
   lark,
   pandas,
@@ -32,19 +33,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-openai";
-  version = "0.3.28";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-openai==${version}";
-    hash = "sha256-HpAdCHxmfGJcqXArvtlYagNuEBGBjrbICIwh9nI0qMQ=";
+    hash = "sha256-lKZZw9kMV3oM7fNpVvofZJfOcyoUdqByWQmBV5MTFZo=";
   };
 
   sourceRoot = "${src.name}/libs/partners/openai";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
@@ -60,6 +61,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     freezegun
+    langchain
     langchain-tests
     lark
     pandas
@@ -78,26 +80,16 @@ buildPythonPackage rec {
 
   disabledTests = [
     # These tests require network access
-    "test__convert_dict_to_message_tool_call"
     "test__get_encoding_model"
-    "test_azure_openai_api_key_is_secret_string"
-    "test_azure_openai_api_key_masked_when_passed_from_env"
-    "test_azure_openai_api_key_masked_when_passed_via_constructor"
-    "test_azure_openai_secrets"
-    "test_azure_openai_uses_actual_secret_value_from_secretstr"
-    "test_azure_serialized_secrets"
     "test_chat_openai_get_num_tokens"
     "test_embed_documents_with_custom_chunk_size"
     "test_get_num_tokens_from_messages"
     "test_get_token_ids"
     "test_init_o1"
-    "test_openai_get_num_tokens"
-  ];
 
-  disabledTestPaths = [
-    # TODO recheck on next update. Langchain has been working on Pydantic errors.
-    # ValidationError from pydantic
-    "tests/unit_tests/chat_models/test_responses_stream.py"
+    # TypeError: exceptions must be derived from Warning, not <class 'NoneType'>
+    # https://github.com/langchain-ai/langchain/issues/33705
+    "test_init_minimal_reasoning_effort"
   ];
 
   pythonImportsCheck = [ "langchain_openai" ];
diff --git a/pkgs/development/python-modules/langchain-perplexity/default.nix b/pkgs/development/python-modules/langchain-perplexity/default.nix
index 9638e5aa883d..55d0109f1ad5 100644
--- a/pkgs/development/python-modules/langchain-perplexity/default.nix
+++ b/pkgs/development/python-modules/langchain-perplexity/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
@@ -23,19 +23,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-perplexity";
-  version = "0.1.2";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-perplexity==${version}";
-    hash = "sha256-4KYLyhGbG8Y8cDGffE4/8OM61eAKRFTgxKDKMTQExic=";
+    hash = "sha256-RUvzV1DQqg0nK/SABBekXlhuKmMT7vHTlyxb7RVpoiI=";
   };
 
   sourceRoot = "${src.name}/libs/partners/perplexity";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   dependencies = [
     langchain-core
@@ -73,8 +73,8 @@ buildPythonPackage rec {
     description = "Build LangChain applications with Perplexity";
     homepage = "https://github.com/langchain-ai/langchain/tree/master/libs/partners/perplexity";
     license = lib.licenses.mit;
-    maintainers = [
-      lib.maintainers.sarahec
+    maintainers = with lib.maintainers; [
+      sarahec
     ];
   };
 }
diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index 485477679311..84f368fa507d 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   httpx,
@@ -30,25 +30,26 @@
 
 buildPythonPackage rec {
   pname = "langchain-tests";
-  version = "0.3.21";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-tests==${version}";
-    hash = "sha256-CufnUFhYTENuq4/32u0w3UZb7TdZxEpshyQqLH6NEZo=";
+    hash = "sha256-t+3o7XoemvEALVYMx+FpkGQVx2c/npRrK3cNDp3bp9A=";
   };
 
   sourceRoot = "${src.name}/libs/standard-tests";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
     # That prevents us from updating individual components.
     "langchain-core"
     "numpy"
+    "syrupy"
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/langchain-text-splitters/default.nix b/pkgs/development/python-modules/langchain-text-splitters/default.nix
index d331a852ca61..2740e682a1c8 100644
--- a/pkgs/development/python-modules/langchain-text-splitters/default.nix
+++ b/pkgs/development/python-modules/langchain-text-splitters/default.nix
@@ -4,12 +4,13 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   langchain-core,
 
   # tests
+  beautifulsoup4,
   httpx,
   pytest-asyncio,
   pytestCheckHook,
@@ -20,19 +21,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-text-splitters";
-  version = "0.3.11";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-text-splitters==${version}";
-    hash = "sha256-SShVzssXi18j5gcDSwwDT+umObEk7uhaCP2mMolQJxI=";
+    hash = "sha256-DOWd94Vx61OS1OI2uIZVonf6BiXkjbS2pTrzleKvifM=";
   };
 
   sourceRoot = "${src.name}/libs/text-splitters";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
@@ -45,6 +46,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "langchain_text_splitters" ];
 
   nativeCheckInputs = [
+    beautifulsoup4
     httpx
     pytest-asyncio
     pytestCheckHook
diff --git a/pkgs/development/python-modules/langchain-xai/default.nix b/pkgs/development/python-modules/langchain-xai/default.nix
index 6769f74c3440..439645e39337 100644
--- a/pkgs/development/python-modules/langchain-xai/default.nix
+++ b/pkgs/development/python-modules/langchain-xai/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  pdm-backend,
+  hatchling,
 
   # dependencies
   aiohttp,
@@ -25,19 +25,19 @@
 
 buildPythonPackage rec {
   pname = "langchain-xai";
-  version = "0.2.5";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
     tag = "langchain-xai==${version}";
-    hash = "sha256-nae7KwCKjkvenOO8vErxFQStHolc+N8EUuK6U8r48Kc=";
+    hash = "sha256-engdUNTT3KsAGrJ93PiFQoI6jbBFPAqavDsrD073484=";
   };
 
   sourceRoot = "${src.name}/libs/partners/xai";
 
-  build-system = [ pdm-backend ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp
diff --git a/pkgs/development/python-modules/langchain/default.nix b/pkgs/development/python-modules/langchain/default.nix
index 96754ea94d52..77e77ce0e5e7 100644
--- a/pkgs/development/python-modules/langchain/default.nix
+++ b/pkgs/development/python-modules/langchain/default.nix
@@ -5,16 +5,14 @@
   pythonOlder,
 
   # build-system
-  pdm-backend,
-
-  # buildInputs
-  bash,
+  hatchling,
 
   # dependencies
   aiohttp,
   async-timeout,
   langchain-core,
   langchain-text-splitters,
+  langgraph,
   langsmith,
   numpy,
   pydantic,
@@ -44,21 +42,19 @@
 
 buildPythonPackage rec {
   pname = "langchain";
-  version = "0.3.72";
+  version = "1.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langchain";
-    tag = "langchain-core==${version}";
-    hash = "sha256-Q2uGMiODUtwkPdOyuSqp8vqjlLjiXk75QjXp7rr20tc=";
+    tag = "langchain==${version}";
+    hash = "sha256-NQra/L7OfnVyFTbGkSDcG30r8W733eAs9abII53wy4g=";
   };
 
-  sourceRoot = "${src.name}/libs/langchain";
+  sourceRoot = "${src.name}/libs/langchain_v1";
 
-  build-system = [ pdm-backend ];
-
-  buildInputs = [ bash ];
+  build-system = [ hatchling ];
 
   pythonRelaxDeps = [
     # Each component release requests the exact latest core.
@@ -72,6 +68,7 @@ buildPythonPackage rec {
     aiohttp
     langchain-core
     langchain-text-splitters
+    langgraph
     langsmith
     numpy
     pydantic
@@ -111,47 +108,28 @@ buildPythonPackage rec {
     "tests/unit_tests"
   ];
 
+  # All pass with sandbox=false
   disabledTests = [
-    # These tests have database access
-    "test_table_info"
-    "test_sql_database_run"
-    # These tests have network access
-    "test_socket_disabled"
-    "test_openai_agent_with_streaming"
-    "test_openai_agent_tools_agent"
-    # This test may require a specific version of langchain-community
-    "test_compatible_vectorstore_documentation"
-    # AssertionErrors
-    "test_callback_handlers"
-    "test_generic_fake_chat_model"
-    # Test is outdated
-    "test_serializable_mapping"
-    "test_person"
-    "test_aliases_hidden"
-    # AssertionError: (failed string match due to terminal control chars in output)
-    # https://github.com/langchain-ai/langchain/issues/32150
-    "test_filecallback"
+    # Depends on shell's truncation style
+    "test_truncation_indicator_present"
+    # Depends on the sleep shell command
+    "test_timeout_returns_error"
+    # Can't see the shell session results when sandboxed
+    "test_startup_and_shutdown_commands"
   ];
 
   disabledTestPaths = [
-    # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`.
-    "tests/unit_tests/chains/test_conversation.py"
-    # pydantic.errors.PydanticUserError: `ConversationSummaryMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryMemory.model_rebuild()`.
-    "tests/unit_tests/chains/test_memory.py"
-    # pydantic.errors.PydanticUserError: `ConversationSummaryBufferMemory` is not fully defined; you should define `BaseCache`, then call `ConversationSummaryBufferMemory.model_rebuild()`.
-    "tests/unit_tests/chains/test_summary_buffer_memory.py"
-    "tests/unit_tests/output_parsers/test_fix.py"
-    "tests/unit_tests/chains/test_llm_checker.py"
-    # TypeError: Can't instantiate abstract class RunnableSerializable[RetryOutputParserRetryChainInput, str] without an implementation for abstract method 'invoke'
-    "tests/unit_tests/output_parsers/test_retry.py"
-    # pydantic.errors.PydanticUserError: `LLMSummarizationCheckerChain` is not fully defined; you should define `BaseCache`, then call `LLMSummarizationCheckerChain.model_rebuild()`.
-    "tests/unit_tests/chains/test_llm_summarization_checker.py"
+    # Their configuration tests don't place nicely with nixpkgs
+    "tests/unit_tests/test_pytest_config.py"
   ];
 
   pythonImportsCheck = [ "langchain" ];
 
-  passthru.updateScript = gitUpdater {
-    rev-prefix = "langchain==";
+  passthru = {
+    skipBulkUpdate = true;
+    updateScript = gitUpdater {
+      rev-prefix = "langchain==";
+    };
   };
 
   __darwinAllowLocalNetworking = true;
@@ -165,6 +143,5 @@ buildPythonPackage rec {
       natsukium
       sarahec
     ];
-    mainProgram = "langchain-server";
   };
 }
diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index 4ea41ebe695d..8719249383e2 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "langfuse";
-  version = "3.6.2";
+  version = "3.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     tag = "v${version}";
-    hash = "sha256-8aDldPVzTx2A65S8lTqInx2DYj2sTEJE1iNeh7HST3E=";
+    hash = "sha256-HXg7p3yfRXK13FLxkfCaKxZxDkXX8Y274ZVKL17Zj0A=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
index 7040ae313543..b1769bb30750 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-postgres/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-postgres";
-  version = "2.0.23";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpointpostgres==${version}";
-    hash = "sha256-QAzT8T3bf3R3gwI/iWDYYDz0SxgLZsP61oMk72dYz4s=";
+    hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
   };
 
   postgresqlTestSetupPost = ''
@@ -84,6 +84,7 @@ buildPythonPackage rec {
     "test_vector_search_with_filters"
     "test_vector_search_pagination"
     "test_vector_search_edge_cases"
+    "test_non_ascii"
     # Flaky under a parallel build (database in use)
     "test_store_ttl"
   ];
diff --git a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
index 44877b4eadeb..7ffc5b24374d 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint-sqlite/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint-sqlite";
-  version = "2.0.11";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpointsqlite==${version}";
-    hash = "sha256-v/gRYkiS4AR1epWwPdG/QYbnUYte894kHTn5F58pVGI=";
+    hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint-sqlite";
diff --git a/pkgs/development/python-modules/langgraph-checkpoint/default.nix b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
index b0769f2a5306..43e5b68aade2 100644
--- a/pkgs/development/python-modules/langgraph-checkpoint/default.nix
+++ b/pkgs/development/python-modules/langgraph-checkpoint/default.nix
@@ -18,6 +18,7 @@
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
+  redis,
 
   # passthru
   gitUpdater,
@@ -25,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-checkpoint";
-  version = "2.1.1";
+  version = "3.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "checkpoint==${version}";
-    hash = "sha256-UY3AChShKfOrtOQzOm5vi3Yy3rlBc+TAje9L2L6My/U=";
+    hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
   };
 
   sourceRoot = "${src.name}/libs/checkpoint";
@@ -55,12 +56,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-mock
     pytestCheckHook
-  ];
-
-  disabledTests = [
-    # assert 1.0000000000000004 == 1.0000000000000002
-    # https://github.com/langchain-ai/langgraph/issues/5845
-    "test_embed_with_path"
+    redis
   ];
 
   passthru = {
diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 624ce0b49dfb..d3a285ec519a 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.4.3";
+  version = "0.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-ykGc3WovCkq+/UjBC+gnXklTvrDdIRVGE6mOHL2dT6w=";
+    hash = "sha256-VvxY5fXK/f1aCdIB0XPGTsWgEe/cA797kK6eLmb0vtg=";
   };
 
   sourceRoot = "${src.name}/libs/cli";
diff --git a/pkgs/development/python-modules/langgraph-prebuilt/default.nix b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
index 59d69db2ba02..cface66811d5 100644
--- a/pkgs/development/python-modules/langgraph-prebuilt/default.nix
+++ b/pkgs/development/python-modules/langgraph-prebuilt/default.nix
@@ -31,14 +31,14 @@
 # It exists so the langgraph team can iterate on it without having to rebuild langgraph.
 buildPythonPackage rec {
   pname = "langgraph-prebuilt";
-  version = "0.6.4";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "prebuilt==${version}";
-    hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I=";
+    hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
   };
 
   sourceRoot = "${src.name}/libs/prebuilt";
diff --git a/pkgs/development/python-modules/langgraph/default.nix b/pkgs/development/python-modules/langgraph/default.nix
index ef3089303418..8c0ac5e6875a 100644
--- a/pkgs/development/python-modules/langgraph/default.nix
+++ b/pkgs/development/python-modules/langgraph/default.nix
@@ -40,14 +40,14 @@
 }:
 buildPythonPackage rec {
   pname = "langgraph";
-  version = "0.6.4";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = version;
-    hash = "sha256-9jl16cKp3E7j79PXrr/3splrcJtfQQN7yFJ5sfa6c+I=";
+    hash = "sha256-YjO8KfDx7lZOps+dG7CPsY7LOqhKIBdfCXexPsR2pB4=";
   };
 
   postgresqlTestSetupPost = ''
diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 459550e65619..1607f4b261a9 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.34";
+  version = "0.4.41";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-vuet4/Y5MW2Ob4zISl9vf3PD/OlmA/4/v7awVuvhk8E=";
+    hash = "sha256-hZRZ4IAPKxCtvDZfk9D5irkYk0KM6pG2l+HSq742KYw=";
   };
 
   sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/lcgit/default.nix b/pkgs/development/python-modules/lcgit/default.nix
index ae95a334fe19..a732a2cb49f9 100644
--- a/pkgs/development/python-modules/lcgit/default.nix
+++ b/pkgs/development/python-modules/lcgit/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "lcgit";
-  version = "2.0.0";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "cisagov";
     repo = "lcgit";
     tag = "v${version}";
-    hash = "sha256-unw5xY5iZlVrV01hchHS3Ar+zpF7awTAutcqndKH0Ic=";
+    hash = "sha256-s77Pq5VjXFyycVYwaomhdNWXKU4vGRJT6+t89UvGdn4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/legacy-cgi/default.nix b/pkgs/development/python-modules/legacy-cgi/default.nix
index ede0920e3411..b52561050407 100644
--- a/pkgs/development/python-modules/legacy-cgi/default.nix
+++ b/pkgs/development/python-modules/legacy-cgi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "legacy-cgi";
-  version = "2.6.3";
+  version = "2.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jackrosenthal";
     repo = "legacy-cgi";
     tag = "v${version}";
-    hash = "sha256-l2BuSlxAA31VlJ/Fhs4cGbidbXEt/zEH3BiWsuh29GM=";
+    hash = "sha256-2CCYRRWP8FP54AcLnehJ0Kj3F3U4cz8vnesSj5EakdA=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix
index ce95c5bd7f26..85f25ad082f2 100644
--- a/pkgs/development/python-modules/leidenalg/default.nix
+++ b/pkgs/development/python-modules/leidenalg/default.nix
@@ -6,26 +6,23 @@
   igraph,
   igraph-c,
   libleidenalg,
-  pythonOlder,
   setuptools-scm,
   unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "leidenalg";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "leidenalg";
     tag = version;
-    hash = "sha256-oaTV+BIB/YQBWKrVXuiIEMH/1MxPxeHhjUzbmxt6hlw=";
+    hash = "sha256-u4xW1gsWDpbsFVLlOIiPZtpw9t4iFBC7fzwn04flev8=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   buildInputs = [
     igraph-c
@@ -34,18 +31,18 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ igraph ];
 
-  checkInputs = [
+  nativeCheckInputs = [
     ddt
     unittestCheckHook
   ];
 
   pythonImportsCheck = [ "leidenalg" ];
 
-  meta = with lib; {
-    changelog = "https://github.com/vtraag/leidenalg/blob/${version}/CHANGELOG";
+  meta = {
+    changelog = "https://github.com/vtraag/leidenalg/blob/${src.tag}/CHANGELOG";
     description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python";
     homepage = "https://github.com/vtraag/leidenalg";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }
diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix
index 2dbf6c1196ce..6111f49275a0 100644
--- a/pkgs/development/python-modules/lerobot/default.nix
+++ b/pkgs/development/python-modules/lerobot/default.nix
@@ -8,6 +8,7 @@
   setuptools,
 
   # dependencies
+  accelerate,
   av,
   datasets,
   deepdiff,
@@ -26,6 +27,7 @@
   rerun-sdk,
   termcolor,
   torch,
+  torchcodec,
   torchvision,
   wandb,
 
@@ -36,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "lerobot";
-  version = "0.3.3";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "lerobot";
     tag = "v${version}";
-    hash = "sha256-JaspLUuSupmk6QD+mUVLuCSczTNjy0w+nsLBcy7tXnE=";
+    hash = "sha256-RVe1X0qBPm+okO3Gi/UdkuvuX0m4RlbhIs+NJLlC9wU=";
   };
 
   # ValueError: mutable default <class 'lerobot.configs.types.PolicyFeature'> for field value is not allowed: use default_factory
@@ -73,7 +75,9 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    accelerate
     av
+    cmake
     datasets
     deepdiff
     diffusers
@@ -91,9 +95,13 @@ buildPythonPackage rec {
     rerun-sdk
     termcolor
     torch
+    torchcodec
     torchvision
     wandb
-  ];
+  ]
+  ++ imageio.optional-dependencies.ffmpeg
+  ++ huggingface-hub.optional-dependencies.hf_transfer
+  ++ huggingface-hub.optional-dependencies.cli;
 
   pythonImportsCheck = [ "lerobot" ];
 
@@ -105,6 +113,7 @@ buildPythonPackage rec {
   disabledTests = [
     # RuntimeError: OpenCVCamera(/build/source/tests/artifacts/cameras/image_480x270.png) read failed
     "test_async_read"
+    "test_fourcc_with_camer"
     "test_read"
     "test_rotation"
 
@@ -113,6 +122,7 @@ buildPythonPackage rec {
     "test_backward_compatibility"
     "test_dataset_initialization"
     "test_factory"
+    "test_from_pretrained_nonexistent_path"
     "test_policy_defaults"
     "test_save_and_load_pretrained"
 
@@ -133,6 +143,16 @@ buildPythonPackage rec {
     "test_cosine_decay_with_warmup_scheduler"
     "test_diffuser_scheduler"
     "test_vqbet_scheduler"
+
+    # AssertionError: Regex pattern did not match.
+    #  Regex: "Can't instantiate abstract class NonCallableStep with abstract method __call_"
+    #  Input: "Can't instantiate abstract class NonCallableStep without an implementation for abstract method '__call__'"
+    "test_construction_rejects_step_without_call"
+  ];
+
+  disabledTestPaths = [
+    # Sometimes hang forever on some CPU models
+    "tests/policies/test_sac_policy.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix
index d6d2b03d56b5..ccb4949b75d4 100644
--- a/pkgs/development/python-modules/letpot/default.nix
+++ b/pkgs/development/python-modules/letpot/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "letpot";
-  version = "0.6.2";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpelgrom";
     repo = "python-letpot";
     tag = "v${version}";
-    hash = "sha256-aSnh1tCHAa5nLWkt0vmEXE0Dow6A5Zb6AkbTX15F6A0=";
+    hash = "sha256-ULU+KBeE7T7qFQvw4KXz3/o2ZkZZa/C1QGqTPwlK7+c=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix
index da2e50226b23..eba8b9ef9904 100644
--- a/pkgs/development/python-modules/lib4sbom/default.nix
+++ b/pkgs/development/python-modules/lib4sbom/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.8.8";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "lib4sbom";
     tag = "v${version}";
-    hash = "sha256-JfY47bskOnQeh5ueQfBtQz8Hmi9mPjCMoaFrzpxQMhU=";
+    hash = "sha256-AtsoCC/p9onzM2BebFtz2Hwf4bnAYd1tNU+acslqCsM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/libcst/default.nix b/pkgs/development/python-modules/libcst/default.nix
index c89cdb8daba8..7f6e9fc13ef1 100644
--- a/pkgs/development/python-modules/libcst/default.nix
+++ b/pkgs/development/python-modules/libcst/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "libcst";
-  version = "1.8.4";
+  version = "1.8.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Instagram";
     repo = "LibCST";
     tag = "v${version}";
-    hash = "sha256-OSLaEIfFM/uU3GkcVpvbeesqzr+qXa/BgkDEan7Ybkg=";
+    hash = "sha256-4FFkxy8UrLOXuZwvGvGQNZGtY27yLtiTWAzTbxLm3Eo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
       src
       cargoRoot
       ;
-    hash = "sha256-F/TaKZpynaCwXU0YvvuTEh5/pvMOpKur7wMSE7dtgNo=";
+    hash = "sha256-eFdcyqzH7meF4kIVT2qhbKVxEB6KtZVEONMgYw4sBew=";
   };
 
   cargoRoot = "native";
diff --git a/pkgs/development/python-modules/libipld/default.nix b/pkgs/development/python-modules/libipld/default.nix
index 72c18fcb691b..b73571391af7 100644
--- a/pkgs/development/python-modules/libipld/default.nix
+++ b/pkgs/development/python-modules/libipld/default.nix
@@ -18,19 +18,19 @@
 
 buildPythonPackage rec {
   pname = "libipld";
-  version = "3.1.1";
+  version = "3.2.0";
   format = "pyproject";
   disabled = pythonOlder "3.8";
 
   # use pypi, GitHub does not include Cargo.lock
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S5qdoOpdhI6foSxwACdhmh437MHaOdvRQkwOkGLynkQ=";
+    hash = "sha256-ZUIw/9k4Kl7sKKrU4Nzdk/Ed2H2mVpOdvxODB/KGcSA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-LMd1M2gCK0i3TJPnUIY/2pskt9Rm/yki4uDX5uQGi8Q=";
+    hash = "sha256-jVZ3Oml/W6Kb9hYEXazF3/ogFHtl43d1YLd8vZFJDa8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix
index c315fe05b90b..fc29d6ce7d01 100644
--- a/pkgs/development/python-modules/libknot/default.nix
+++ b/pkgs/development/python-modules/libknot/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libknot";
-  version = "3.5.0";
+  version = "3.5.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-8sWO70le3qmhNiU4xEEM3IOrrc20+WT2Y2UBSPBEFkk=";
+    hash = "sha256-O4kMd07Tmiy+q/klMCoeSp23EkZNoKKeuUHMhzn+118=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix
index 624002f4cc33..84eada8537bb 100644
--- a/pkgs/development/python-modules/libmambapy/default.nix
+++ b/pkgs/development/python-modules/libmambapy/default.nix
@@ -6,8 +6,7 @@
   ninja,
   libmamba,
   pybind11,
-  setuptools,
-  scikit-build,
+  scikit-build-core,
   fmt,
   spdlog,
   tl-expected,
@@ -18,25 +17,24 @@
   curl,
   zstd,
   bzip2,
-  wheel,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "libmambapy";
   pyproject = true;
 
   inherit (libmamba) version src;
 
-  nativeBuildInputs = [
+  sourceRoot = "${src.name}/libmambapy";
+
+  build-system = [
     cmake
     ninja
+    pybind11
+    scikit-build-core
   ];
 
-  env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=deprecated-declarations"
-    ];
-  };
+  dontUseCmakeConfigure = true;
 
   buildInputs = [
     (libmamba.override { python3 = python; })
@@ -52,42 +50,13 @@ buildPythonPackage {
     libsolv
   ];
 
-  dependencies = [
-    scikit-build
-    pybind11
-  ];
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  # patch needed to fix setuptools errors
-  # see these for reference
-  # https://stackoverflow.com/questions/72294299/multiple-top-level-packages-discovered-in-a-flat-layout
-  # https://github.com/pypa/setuptools/issues/3197#issuecomment-1078770109
-  postPatch = ''
-    substituteInPlace libmambapy/setup.py --replace-warn  "setuptools.setup()" "setuptools.setup(py_modules=[])"
-  '';
-
-  cmakeFlags = [
-    "-GNinja"
-    (lib.cmakeBool "BUILD_LIBMAMBAPY" true)
-  ];
-
-  buildPhase = ''
-    ninjaBuildPhase
-    cp -r libmambapy ../libmambapy
-    cd ../libmambapy
-    pypaBuildPhase
-  '';
-
   pythonImportsCheck = [
     "libmambapy"
     "libmambapy.bindings"
   ];
 
   meta = {
+    changelog = "https://github.com/mamba-org/mamba/blob/${src.tag}/libmambapy/CHANGELOG.md";
     description = "Python library for the fast Cross-Platform Package Manager";
     homepage = "https://github.com/mamba-org/mamba";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix
index 80480c9e22c8..5f02a27cc3a3 100644
--- a/pkgs/development/python-modules/libpass/default.nix
+++ b/pkgs/development/python-modules/libpass/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "libpass";
-  version = "1.9.1.post0";
+  version = "1.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ThirVondukr";
     repo = "passlib";
     tag = version;
-    hash = "sha256-4J18UktqllRA8DVdHL4AJUuAkjZRdUjiql9a71XXhCA=";
+    hash = "sha256-fzI9HpGE3wNK41ZSOeA5NAr5T4r3Jzdqe5+SHoWVXUs=";
   };
 
   build-system = [ hatchling ];
@@ -41,6 +41,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "passlib" ];
 
+  disabledTestPaths = [
+    # https://github.com/notypecheck/passlib/issues/18
+    "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_70_hashes"
+    "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_77_fuzz_input"
+    "tests/test_handlers_django.py::django_bcrypt_test::test_77_fuzz_input"
+    "tests/test_handlers_bcrypt.py::bcrypt_bcrypt_test::test_secret_w_truncate_size"
+    "tests/test_handlers_django.py::django_bcrypt_test::test_secret_w_truncate_size"
+  ];
+
   disabledTests = [
     # timming sensitive
     "test_dummy_verify"
diff --git a/pkgs/development/python-modules/libpyfoscamcgi/default.nix b/pkgs/development/python-modules/libpyfoscamcgi/default.nix
index d26b01670720..b82df45abe45 100644
--- a/pkgs/development/python-modules/libpyfoscamcgi/default.nix
+++ b/pkgs/development/python-modules/libpyfoscamcgi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "libpyfoscamcgi";
-  version = "0.0.7";
+  version = "0.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Foscam-wangzhengyu";
     repo = "libfoscamcgi";
     tag = "v${version}";
-    hash = "sha256-QthzyMdZ2iberDmbeqf6MaUv8lH5xhlZLL8ZAlapvIk=";
+    hash = "sha256-tKA2UnVHAUjDfvm+t/aCk+3YfWfwjfEWPRgieDAcr7k=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
new file mode 100644
index 000000000000..fb3e23ac8e7d
--- /dev/null
+++ b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
@@ -0,0 +1,40 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "librehardwaremonitor-api";
+  version = "1.5.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Sab44";
+    repo = "librehardwaremonitor-api";
+    tag = "v${version}";
+    hash = "sha256-LWh0kZp+8OUfBohQMLFXI/kkHsVuJt99YqwSGeq4EvA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "librehardwaremonitor_api" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python API client for LibreHardwareMonitor";
+    homepage = "https://github.com/Sab44/librehardwaremonitor-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 588e6af5127d..836447ae1b4c 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.46.2";
+  version = "0.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     tag = "v${version}";
-    hash = "sha256-M3su+bDFuvmNEDVK+poWfxwbpsw/0L1/R6Z4CL0mvZ4=";
+    hash = "sha256-yrz9fMr33yj/u0uGUNHYv0zOTvtfJ2u0TKToBO8ha6U=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix
index e3a096c9163b..7d2bf3cd046a 100644
--- a/pkgs/development/python-modules/lightning/default.nix
+++ b/pkgs/development/python-modules/lightning/default.nix
@@ -1,10 +1,5 @@
 {
-  lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
 
   # dependencies
   pytorch-lightning,
@@ -32,7 +27,7 @@ buildPythonPackage {
     pytestCheckHook
   ];
 
-  # Some packages are not in NixPkgs; other tests try to build distributed
+  # Some packages are not in nixpkgs; other tests try to build distributed
   # models, which doesn't work in the sandbox.
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index 81d65e2e7972..4d345816c264 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "5.37.0";
+  version = "5.38.0";
   pyproject = true;
 
   # Sources from Pypi exclude test fixtures
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "linode";
     repo = "python-linode-api";
     tag = "v${version}";
-    hash = "sha256-fRTTXWkn1YBWW9xrFm3y6o7f8ZdYhObqVLSHAuiNHak=";
+    hash = "sha256-ToM3ur0bqU5xXCtO8ekZwpvM1bRxtwa7CqOzGJEyY7I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix
index 601095a58b82..e7f406ac979f 100644
--- a/pkgs/development/python-modules/livekit-api/default.nix
+++ b/pkgs/development/python-modules/livekit-api/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-api";
-  version = "1.0.6";
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
     tag = "api-v${version}";
-    hash = "sha256-AsTJC0j8dztua7B6JvAYQlHGsE1RCIGoCzfGgbHSnGU=";
+    hash = "sha256-yS7Nzzrgyo3Q/O4z9acIfPXzS/SRv27BEiO4cMP11Z0=";
   };
 
   pypaBuildFlags = [ "livekit-api" ];
diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix
index 744f9fe7dc49..3b2f521e066d 100644
--- a/pkgs/development/python-modules/livekit-protocol/default.nix
+++ b/pkgs/development/python-modules/livekit-protocol/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-protocol";
-  version = "1.0.6";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
     tag = "protocol-v${version}";
-    hash = "sha256-Sl/pAwiCS7sAY8VHJzSqm/Mj92NsO5NLuxQ/Y5GnaAw=";
+    hash = "sha256-3RdUvxGOopgakwkoWc+IMW2QUZuZLF908KtFo1f0Nqo=";
   };
 
   pypaBuildFlags = [ "livekit-protocol" ];
diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix
index 8e89b1f83bb6..bc0c6206b330 100644
--- a/pkgs/development/python-modules/llama-cloud-services/default.nix
+++ b/pkgs/development/python-modules/llama-cloud-services/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud-services";
-  version = "0.6.69";
+  version = "0.6.77";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "run-llama";
     repo = "llama_cloud_services";
-    tag = "v${version}";
-    hash = "sha256-+90b/EwG8OfpjG/MJM5shvQHLsLpLe+TviufwoWI7mg=";
+    tag = "llama-cloud-services-py%40${version}";
+    hash = "sha256-Fl4rmKJ26yeXYjR2qhpusQrRa0sCe6TigWqEyfjA8lQ=";
   };
 
   sourceRoot = "${src.name}/py";
diff --git a/pkgs/development/python-modules/llama-index-instrumentation/default.nix b/pkgs/development/python-modules/llama-index-instrumentation/default.nix
index acc9cdebf04f..61add9889d78 100644
--- a/pkgs/development/python-modules/llama-index-instrumentation/default.nix
+++ b/pkgs/development/python-modules/llama-index-instrumentation/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-instrumentation";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_instrumentation";
     inherit version;
-    hash = "sha256-p50N0rq6NPBf9DVNY6mbISMiY1uK+mzJbtAKfhHr/cM=";
+    hash = "sha256-3ElXtk2gkiBgaQ6Fpr6WmKwI404PaekLATZN3sTz3n8=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];
diff --git a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix
index d1738cbb470b..e29574277fe2 100644
--- a/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix
+++ b/pkgs/development/python-modules/llama-index-vector-stores-milvus/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-vector-stores-milvus";
-  version = "0.9.2";
+  version = "0.9.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_vector_stores_milvus";
     inherit version;
-    hash = "sha256-qIGFmmiet1VXkQLyy72l2ub5ePyYwozTzisVhQkWmoY=";
+    hash = "sha256-JiGsSKKlwV3efEkT5p3lXcEY7hCbVWRdCAX9X539Ke0=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 0038081e5f69..883223793a8f 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.6.54";
+  version = "0.6.77";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-xwezEVIVXJuuhOMW+reQu8jIX02IJc5e44br632yWPE=";
+    hash = "sha256-cxjDJT/ADoPwDmN4Cg06AyQvJcasGZwmw6ctuHVNRLc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix
index ff1f22856ce2..2256fc21346c 100644
--- a/pkgs/development/python-modules/llguidance/default.nix
+++ b/pkgs/development/python-modules/llguidance/default.nix
@@ -22,19 +22,19 @@
 
 buildPythonPackage rec {
   pname = "llguidance";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "llguidance";
     tag = "v${version}";
-    hash = "sha256-Fe7cKZotjRexcSHcoT0Y9I3m+dRarhlBOjYR7rdJBRY=";
+    hash = "sha256-lnQn8587ioMXm1HiY/yBLFdofJldsw0Y6csBJiVnBrs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src pname version;
-    hash = "sha256-//Vjj4QIDcZEPujMfUhZd5nx5pAyF3l3CdNvI/Wi74A=";
+    hash = "sha256-CMRkOeO8JMVatjjDNsaN2CcWGQS/l0onjqrCbp3/49Q=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/llm-anthropic/default.nix b/pkgs/development/python-modules/llm-anthropic/default.nix
index 4a1ddf4a297c..e8592d1bd402 100644
--- a/pkgs/development/python-modules/llm-anthropic/default.nix
+++ b/pkgs/development/python-modules/llm-anthropic/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "llm-anthropic";
-  version = "0.19";
+  version = "0.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "simonw";
     repo = "llm-anthropic";
     tag = version;
-    hash = "sha256-2RGjcbT5Q9kuc89l/hyofg9EkYJUDXQGYbMx1xE/qn4=";
+    hash = "sha256-tZCFbrsACJl1hC5tSbxJzBBLY8mdcCNjshZilSCAslM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/llm-fragments-pypi/default.nix b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
index c07f2cbc4f01..33f78d7a1f93 100644
--- a/pkgs/development/python-modules/llm-fragments-pypi/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "llm-fragments-pypi";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "samueldg";
     repo = "llm-fragments-pypi";
     tag = version;
-    hash = "sha256-1XqAmuZ1WMHD6JbLbLsK9K4Uf3FvvKJD4mn1G2J/3C8=";
+    hash = "sha256-6gG7oPughxbpG0ZgKGniTfS9pJAcmXL7unru5kE2bEY=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/llm-perplexity/default.nix b/pkgs/development/python-modules/llm-perplexity/default.nix
index 6c9f24df3236..6e2cb794220b 100644
--- a/pkgs/development/python-modules/llm-perplexity/default.nix
+++ b/pkgs/development/python-modules/llm-perplexity/default.nix
@@ -19,14 +19,14 @@
 }:
 buildPythonPackage rec {
   pname = "llm-perplexity";
-  version = "2025.6.0";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hex";
     repo = "llm-perplexity";
     tag = version;
-    hash = "sha256-LTf2TY5bjSb7ARXrhWj1ctGuMpnq2Kl/kv/hrgX/m/M=";
+    hash = "sha256-8vgHlua+fPwZf2Accf0/CMFBIFAEZujP4hB3yTbLGG8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 7b8098c86227..a943c405d447 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -228,6 +228,17 @@ let
       "tests/"
     ];
 
+    disabledTests = [
+      # AssertionError: The following responses are mocked but not requested:
+      # - Match POST request on https://api.openai.com/v1/chat/completions
+      # https://github.com/simonw/llm/issues/1292
+      "test_gpt4o_mini_sync_and_async"
+
+      # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr
+      # https://github.com/simonw/llm/issues/1293
+      "test_embed_multi_files_encoding"
+    ];
+
     pythonImportsCheck = [ "llm" ];
 
     passthru = {
diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix
index 5d604682a826..7b55ee73184b 100644
--- a/pkgs/development/python-modules/lmdb/default.nix
+++ b/pkgs/development/python-modules/lmdb/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "lmdb";
-  version = "1.7.3";
+  version = "1.7.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1KJ7evT+OPNAnZ+/v0e2F7PZTe6YoAvIwqgzbM0/mxU=";
+    hash = "sha256-8GBHUXYssJcFnVQSRExAV7lfOGx+2Vg2PPY/RT5RCNo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix
index 4ce88e0a71c3..3839d19b6954 100644
--- a/pkgs/development/python-modules/localzone/default.nix
+++ b/pkgs/development/python-modules/localzone/default.nix
@@ -30,6 +30,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "localzone" ];
 
+  postPatch = ''
+    # Fix tests with dnspython 2.8.0
+    # https://github.com/ags-slc/localzone/pull/6
+    substituteInPlace tests/test_models.py \
+      --replace-fail 'raises((AttributeError, DNSSyntaxError))' 'raises((AttributeError, DNSSyntaxError, ValueError))'
+  '';
+
   meta = with lib; {
     description = "Simple DNS library for managing zone files";
     homepage = "https://localzone.iomaestro.com";
diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix
index ac503a0593c0..726c20a852c2 100644
--- a/pkgs/development/python-modules/locust-cloud/default.nix
+++ b/pkgs/development/python-modules/locust-cloud/default.nix
@@ -1,28 +1,32 @@
 {
+  lib,
   buildPythonPackage,
   configargparse,
   fetchFromGitHub,
   gevent,
   hatch-vcs,
   hatchling,
-  lib,
   platformdirs,
   python-engineio,
   python-socketio,
   requests,
+  gevent-websocket,
   tomli,
+  flask,
+  requests-mock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "locust-cloud";
-  version = "1.27.0";
+  version = "1.27.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "locustcloud";
     repo = "locust-cloud";
     tag = version;
-    hash = "sha256-K69VIyQggwWQQoMld0JpzmtJRQc6HYrKAGA6E9O69MQ=";
+    hash = "sha256-7k1IZNBVkz+E5WW/wZWpB+yl/W7ONuHlUM8wOKvu0ow=";
   };
 
   build-system = [
@@ -40,9 +44,37 @@ buildPythonPackage rec {
     tomli
   ];
 
+  nativeCheckInputs = [
+    flask
+    gevent-websocket
+    pytestCheckHook
+    requests-mock
+  ];
+
+  pythonImportsCheck = [ "locust_cloud" ];
+
+  preCheck = ''
+    export LOCUSTCLOUD_USERNAME=dummy
+    export LOCUSTCLOUD_PASSWORD=dummy
+  '';
+
+  disabledTests = [
+    # AssertionError
+    "test_recursive_imports"
+    "test_from_import_file"
+  ];
+
+  disabledTestPaths = [
+    # Tests require network access
+    "tests/web_login_test.py"
+    "tests/cloud_test.py"
+    "tests/websocket_test.py"
+  ];
+
   meta = {
     description = "Hosted version of Locust to run distributed load tests";
-    homepage = "https://www.locust.cloud/";
+    homepage = "https://github.com/locustcloud/locust-cloud";
+    changelog = "https://github.com/locustcloud/locust-cloud/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ magicquark ];
   };
diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix
index 40b5d08429ec..d59ba37d5ac9 100644
--- a/pkgs/development/python-modules/locust/default.nix
+++ b/pkgs/development/python-modules/locust/default.nix
@@ -18,6 +18,7 @@
   locust-cloud,
   psutil,
   pyquery,
+  pytest,
   pyzmq,
   requests,
   retry,
@@ -27,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "locust";
-  version = "2.37.14";
+  version = "2.42.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "locustio";
     repo = "locust";
     tag = version;
-    hash = "sha256-16pMl72OIZlAi6jNx0qv0TO9RTm6O9CgiE84sndsEhc=";
+    hash = "sha256-yyG4HVti0BAcGWQHID799YfkCEIBmpTkUUm8QzXMivc=";
   };
 
   postPatch = ''
@@ -65,6 +66,7 @@ buildPythonPackage rec {
     "flask-login"
     # version 6.0.1 is listed as 0.0.1 in the dependency check and 0.0.1 is not >= 3.0.10
     "flask-cors"
+    "requests"
   ];
 
   dependencies = [
@@ -81,6 +83,7 @@ buildPythonPackage rec {
     requests
     tomli
     werkzeug
+    pytest
   ];
 
   pythonImportsCheck = [ "locust" ];
diff --git a/pkgs/development/python-modules/locust/webui.nix b/pkgs/development/python-modules/locust/webui.nix
index 964329564533..8905429828ef 100644
--- a/pkgs/development/python-modules/locust/webui.nix
+++ b/pkgs/development/python-modules/locust/webui.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-FbKaU3wezuvcn98FOcUZbmoot/iHtmeStp4n0dNwFYA=";
+    hash = "sha256-dxt7rRA6kh0msjy3DAUvtj7LoE7vEaf4pmP2B95HoeY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/loro/default.nix b/pkgs/development/python-modules/loro/default.nix
index 32d7e528a6f8..706c4b241e1e 100644
--- a/pkgs/development/python-modules/loro/default.nix
+++ b/pkgs/development/python-modules/loro/default.nix
@@ -8,17 +8,17 @@
 
 buildPythonPackage rec {
   pname = "loro";
-  version = "1.8.1";
+  version = "1.8.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Is+xliW9ckXpdH7p1DsQURwWo1d1o4z5FNx0hjxNvog=";
+    hash = "sha256-0i3BfL7GUu2L9if4AaCjLieoe0R2oquW9FoC0WPXM64=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-b1zzDVK/pdxkAUeksmZZ8sbgyrXtJbwAfpNxkH4PevY=";
+    hash = "sha256-pJJiwLHh10G9L+NZhxcCif2OP1cpjyNCaeG28YyYxmM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index 12e1e6f8352d..00bdd5e17fdd 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -6,22 +6,19 @@
   netaddr,
   poetry-core,
   pypykatz,
-  pythonOlder,
   rich,
 }:
 
 buildPythonPackage rec {
   pname = "lsassy";
-  version = "3.1.13";
+  version = "3.1.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Hackndo";
     repo = "lsassy";
     tag = "v${version}";
-    hash = "sha256-DdIEDseGLI+hUIaUNPBqpkGGe+F+Z+jZ0g/JzXB8pf8=";
+    hash = "sha256-cQfyRCZv0ZTaj7Ay7zTzFnU7PQluP3VweeFof8+W70M=";
   };
 
   pythonRelaxDeps = [
@@ -47,8 +44,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)";
     homepage = "https://github.com/Hackndo/lsassy";
-    changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/Hackndo/lsassy/releases/tag/${src.tag}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "lsassy";
   };
diff --git a/pkgs/development/python-modules/lunatone-rest-api-client/default.nix b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix
new file mode 100644
index 000000000000..f80d2d7a20a0
--- /dev/null
+++ b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix
@@ -0,0 +1,47 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitLab,
+  hatchling,
+  lib,
+  pydantic,
+  pytest-aioresponses,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "lunatone-rest-api-client";
+  version = "0.5.3";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "lunatone-public";
+    repo = "lunatone-rest-api-client";
+    tag = "v${version}";
+    hash = "sha256-pxoD4EAyBmNmTXrhXa+zpnkwrsC+9mervbXzgptSFVo=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+  ];
+
+  pythonImportsCheck = [ "lunatone_rest_api_client" ];
+
+  nativeCheckInputs = [
+    pytest-aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://gitlab.com/lunatone-public/lunatone-rest-api-client/-/blob/${src.tag}/CHANGELOG.md";
+    description = "Client library for accessing the Lunatone REST API";
+    homepage = "https://gitlab.com/lunatone-public/lunatone-rest-api-client";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 00971eccd03d..d64b7e6cc0d5 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.8.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "lxmf";
     tag = version;
-    hash = "sha256-toxie5QdrgwyvC9v0G7mvGS6/ZEqA5gpRtEeaHgspD0=";
+    hash = "sha256-5sY6Sf4oRwSXQR0YAfqeSmW1aASTT2iZLd5+BFx+5Mw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix
deleted file mode 100644
index 7562874daaa0..000000000000
--- a/pkgs/development/python-modules/lxml-stubs/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  lxml,
-  pytest-mypy-plugins,
-  pytestCheckHook,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "lxml-stubs";
-  version = "0.5.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "lxml";
-    repo = "lxml-stubs";
-    tag = version;
-    hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ lxml ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-mypy-plugins
-  ];
-
-  disabledTests = [
-    # Output difference, https://github.com/lxml/lxml-stubs/issues/101
-    "etree_element_iterchildren"
-  ];
-
-  meta = with lib; {
-    description = "Type stubs for the lxml package";
-    homepage = "https://github.com/lxml/lxml-stubs";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ doronbehar ];
-  };
-}
diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index fee77d75aa2e..8780137b1c04 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -17,16 +17,21 @@
 
 buildPythonPackage rec {
   pname = "lxml";
-  version = "6.0.1";
+  version = "6.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lxml";
     repo = "lxml";
     tag = "lxml-${version}";
-    hash = "sha256-iY47nhAbA8ScnjmK2/7lVCBP8f65v1zOs3TcgQULlQ0=";
+    hash = "sha256-Ri5SzfQJFghRcMAKHS5QKD365OZlio895fSlumq83vs=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'Cython>=3.1.4' 'Cython'
+  '';
+
   build-system = [
     cython
     setuptools
diff --git a/pkgs/development/python-modules/lzfse/default.nix b/pkgs/development/python-modules/lzfse/default.nix
new file mode 100644
index 000000000000..005f21d591e3
--- /dev/null
+++ b/pkgs/development/python-modules/lzfse/default.nix
@@ -0,0 +1,35 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "lzfse";
+  version = "0.4.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "m1stadev";
+    repo = "lzfse";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-ER+Hr/WrGCB0uYwsSgB4U8sCPeZ4JlOHoeb5YEGUFFM=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "lzfse" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/m1stadev/lzfse/releases/tag/${src.tag}";
+    description = "Python bindings for the LZFSE reference implementation";
+    homepage = "https://github.com/m1stadev/lzfse";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/macfsevents/default.nix b/pkgs/development/python-modules/macfsevents/default.nix
index b8b4a57ca15f..c64b7ed58c69 100644
--- a/pkgs/development/python-modules/macfsevents/default.nix
+++ b/pkgs/development/python-modules/macfsevents/default.nix
@@ -2,12 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "macfsevents";
   version = "0.8.4";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "MacFSEvents";
@@ -17,17 +18,24 @@ buildPythonPackage rec {
 
   patches = [ ./fix-packaging.patch ];
 
+  build-system = [ setuptools ];
+
+  # PyEval_InitThreads is deprecated in Python 3.9, to be removed in Python 3.14
+  # and breaks the build under clang 16.
+  # https://github.com/malthe/macfsevents/issues/49
+  env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
+
   # Some tests fail under nix build directory
   doCheck = false;
 
   pythonImportsCheck = [ "fsevents" ];
 
-  meta = with lib; {
+  meta = {
     description = "Thread-based interface to file system observation primitives";
     homepage = "https://github.com/malthe/macfsevents";
     changelog = "https://github.com/malthe/macfsevents/blob/${version}/CHANGES.rst";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = [ ];
-    platforms = platforms.darwin;
+    platforms = lib.platforms.darwin;
   };
 }
diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 78ddcc7d8d51..de2b186f348c 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -31,16 +31,16 @@
 
 buildPythonPackage rec {
   pname = "maestral";
-  version = "1.9.4";
+  version = "1.9.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral";
     tag = "v${version}";
-    hash = "sha256-akh0COltpUU4Z4kfubg6A7k6W8ICoqVYkmFpMkTC8H8=";
+    hash = "sha256-xFSnJPKTAPXYa4FuqkFF5gLzGZ9TltNVDhyBnswiut4=";
   };
 
   build-system = [ setuptools ];
@@ -51,7 +51,6 @@ buildPythonPackage rec {
     dbus-python
     dropbox
     fasteners
-    importlib-metadata
     keyring
     keyrings-alt
     packaging
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 810a97f6e641..74594ae40a5f 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   installShellFiles,
 
   # build-system
@@ -32,8 +31,9 @@
   # tests
   net-tools,
   unixtools,
-  magic-wormhole-transit-relay,
+  hypothesis,
   magic-wormhole-mailbox-server,
+  magic-wormhole-transit-relay,
   pytestCheckHook,
   pytest-twisted,
 
@@ -42,25 +42,16 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.20.0";
+  version = "0.21.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole";
     tag = version;
-    hash = "sha256-YjzdznZZ/0YTU83f3jlOr6+yOWQ++R1wU9IZDrfAMpo=";
+    hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc=";
   };
 
-  patches = [
-    # TODO: drop when updating beyond version 0.20.0
-    (fetchpatch {
-      name = "SubchannelDemultiplex._pending_opens-fix-type.patch";
-      url = "https://github.com/magic-wormhole/magic-wormhole/commit/6d7f48786b5506df5b6a254bc4e37f6bf5d75593.patch";
-      hash = "sha256-28YH3enyQ9rTT56OU7FfFonb9l8beJ9QRgPoItzrgu4=";
-    })
-  ];
-
   postPatch =
     # enable tests by fixing the location of the wormhole binary
     ''
@@ -106,6 +97,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    hypothesis
     magic-wormhole-mailbox-server
     magic-wormhole-transit-relay
     pytestCheckHook
diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix
index d8de9bfa92b9..769b9ceaa20c 100644
--- a/pkgs/development/python-modules/magika/default.nix
+++ b/pkgs/development/python-modules/magika/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "magika";
-  version = "0.6.2";
+  version = "1.0.1";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-N+tq6AIPbmjyMbwGBSwKDL6Ob6J0kts0Xo3IZ9vOsGc=";
+    hash = "sha256-MT+Mv83Jp+VcJChicyMKJzK4mCXlipPeK1dlMTk7g5g=";
   };
 
   nativeBuildInputs = [ hatchling ];
diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix
index 0b14e1b6686c..92f962a1bc7f 100644
--- a/pkgs/development/python-modules/mailchecker/default.nix
+++ b/pkgs/development/python-modules/mailchecker/default.nix
@@ -2,20 +2,17 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "mailchecker";
-  version = "6.0.18";
+  version = "6.0.19";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xX6Vr7hEi4o1OQjKUUrVEKZIOppbA+4hlN1XrV1vEnk=";
+    hash = "sha256-MuLQdGiFZbhd/1Zc+VnTo3UW3EAyISzz/c1F3D0F2UE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/manim/failing_tests.nix b/pkgs/development/python-modules/manim/failing_tests.nix
index 279950f6cb4f..987b64db26de 100644
--- a/pkgs/development/python-modules/manim/failing_tests.nix
+++ b/pkgs/development/python-modules/manim/failing_tests.nix
@@ -89,4 +89,17 @@
   # This tests checks if the manim executable is a python script. In our case it is not.
   # It is a wrapper shell script instead.
   "test_manim_checkhealth_subcommand"
+
+  # failing with:
+  # E       AssertionError: assert 'Manim Commun...developers.\n' == 'Manim Community v0.19.0\n\n'
+  # E
+  # E           Manim Community v0.19.0
+  # E
+  # E         + Usage: manim cfg [OPTIONS] COMMAND [ARGS]...
+  # E         +
+  # E         +   Manages Manim configuration files.
+  # E         + ...
+  # E
+  # E         ...Full output truncated (9 lines hidden), use '-vv' to show
+  "test_manim_cfg_subcommand"
 ]
diff --git a/pkgs/development/python-modules/marimo/default.nix b/pkgs/development/python-modules/marimo/default.nix
index 3cf144ae9961..24e51364669b 100644
--- a/pkgs/development/python-modules/marimo/default.nix
+++ b/pkgs/development/python-modules/marimo/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   buildPythonPackage,
+  fetchpatch2,
   fetchPypi,
   pythonOlder,
 
@@ -42,6 +43,15 @@ buildPythonPackage rec {
     hash = "sha256-cmkz/ZyVYfpz4yOxghsXPF4PhRluwqSXo1CcwvwkXFg=";
   };
 
+  patches = [
+    # https://github.com/marimo-team/marimo/pull/6714
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/Prince213/marimo/commit/b1c690e82e8117c451a74fdf172eb51a4861853d.patch?full_index=1";
+      hash = "sha256-iFS5NSGjaGdECRk0LCRSA8XzRb1/sVSZCTRLy6taHNU=";
+    })
+  ];
+
   build-system = [ uv-build ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index c7a9c123b044..d7d9fb0a63e1 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "marisa-trie";
-  version = "1.2.1";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytries";
     repo = "marisa-trie";
     tag = version;
-    hash = "sha256-aWfm13nrASAaD+bcMpv85emXnCFyVtZTdhl79yJuOss=";
+    hash = "sha256-7T0V5levh9xjWmjJdFix0p8L3lZhfurikSWMI7Hotbs=";
   };
 
   patches = [
@@ -42,10 +42,6 @@ buildPythonPackage rec {
     hypothesis
   ];
 
-  preBuild = ''
-    ./update_cpp.sh
-  '';
-
   disabledTestPaths = [
     # Don't test packaging
     "tests/test_packaging.py"
diff --git a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
index 26ac8156a06b..69c0ee46678b 100644
--- a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
+++ b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
@@ -1,30 +1,26 @@
 diff --git a/setup.py b/setup.py
-index c0c5c03..6373a2a 100755
+index 133ba37..1026947 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -71,15 +71,6 @@ setup(
-     license=LICENSE,
-     url="https://github.com/pytries/marisa-trie",
-     classifiers=CLASSIFIERS,
+@@ -26,19 +26,11 @@ extensions = [
+         "marisa_trie",
+         sources=["src/*.pyx"],
+         language="c++",
+-        include_dirs=[str(MARISA_INCLUDE_DIR)],
++        include_dirs=["@marisa@/include"],
++        libraries=["marisa"],
+     ),
+ ]
+ 
+ setup(
 -    libraries=[
 -        (
 -            "libmarisa-trie",
 -            {
 -                "sources": MARISA_FILES,
--                "include_dirs": [MARISA_SOURCE_DIR, MARISA_INCLUDE_DIR],
+-                "include_dirs": [str(MARISA_SOURCE_DIR), str(MARISA_INCLUDE_DIR)],
 -            },
 -        )
 -    ],
-     ext_modules=[
-         Extension(
-             "marisa_trie",
-@@ -94,7 +85,8 @@ setup(
-                 "src/std_iostream.cpp",
-                 "src/trie.cpp",
-             ],
--            include_dirs=[MARISA_INCLUDE_DIR],
-+            include_dirs=["@marisa@/include"],
-+            libraries=["marisa"],
-         )
-     ],
-     python_requires=">=3.8",
+     ext_modules=cythonize(extensions, language_level="3"),
+ )
diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index d417fb25ca10..e4a6cfd497a0 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     code_syntax_highlighting = [ pygments ];
     wavedrom = [ wavedrom ];
     latex = [ latex2mathml ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 90b62a28ba0c..38fb386fb8af 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -44,6 +44,9 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
+  pythonRelaxDeps = [
+    "magika"
+  ];
   dependencies = [
     beautifulsoup4
     defusedxml
@@ -85,6 +88,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python tool for converting files and office documents to Markdown";
     homepage = "https://github.com/microsoft/markitdown";
+    changelog = "https://github.com/microsoft/markitdown/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 7e82d24685e4..afc0b824b38d 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "markupsafe";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "pallets";
     repo = "markupsafe";
     tag = version;
-    hash = "sha256-BqCkQqPhjEx3qB/k3d3fSirR/HDBa7e4kpx3/VSwXJM=";
+    hash = "sha256-2d64cItemqVM25WJIKrjExKz6v4UW2wVxM6phH1g1sE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 4b67ac402089..0ab9cf7f5dab 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
@@ -29,6 +30,11 @@ buildPythonPackage rec {
     simplejson
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isx86_32 [
+    # Raises a slightly different error than upstream expects: 'Timestamp is too large' instead of 'out of range'
+    "test_from_timestamp_with_overflow_value"
+  ];
+
   pythonImportsCheck = [ "marshmallow" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index d0acb1d790d8..499193da4cf0 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -18,16 +18,14 @@
 
 buildPythonPackage rec {
   pname = "mashumaro";
-  version = "3.16";
+  version = "3.17";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Fatal1ty";
     repo = "mashumaro";
     tag = "v${version}";
-    hash = "sha256-SAdhBNQx5zWsXFwWxEAozprb2c7eJRdxZQwZMgBj/iA=";
+    hash = "sha256-oQKSIDrIPlY1m63uP9Jxpgf7ruaZpt9uZF4hTso503U=";
   };
 
   build-system = [ setuptools ];
@@ -51,11 +49,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mashumaro" ];
 
-  meta = with lib; {
+  meta = {
     description = "Serialization library on top of dataclasses";
     homepage = "https://github.com/Fatal1ty/mashumaro";
     changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ tjni ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ tjni ];
   };
 }
diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch
deleted file mode 100644
index 2c71930b6df8..000000000000
--- a/pkgs/development/python-modules/mat2/bubblewrap-path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
-index 970d5dd..5d3c0b7 100644
---- a/libmat2/bubblewrap.py
-+++ b/libmat2/bubblewrap.py
-@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError
- 
- 
- def _get_bwrap_path() -> str:
--    which_path = shutil.which('bwrap')
--    if which_path:
--        return which_path
--
--    raise RuntimeError("Unable to find bwrap")  # pragma: no cover
-+    return '@bwrap@'
- 
- 
- def _get_bwrap_args(tempdir: str,
-@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str,
- 
-     # XXX: use --ro-bind-try once all supported platforms
-     # have a bubblewrap recent enough to support it.
--    ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd]
-+    ro_bind_dirs = ['/nix/store', cwd]
-     for bind_dir in ro_bind_dirs:
-         if os.path.isdir(bind_dir):  # pragma: no cover
-             ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir])
- 
--    ro_bind_files = ['/etc/ld.so.cache']
--    for bind_file in ro_bind_files:
--        if os.path.isfile(bind_file):  # pragma: no cover
--            ro_bind_args.extend(['--ro-bind', bind_file, bind_file])
--
-     args = ro_bind_args + \
-         ['--dev', '/dev',
-          '--proc', '/proc',
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 19ec148450c4..f75b9ba52faf 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -3,54 +3,40 @@
   stdenv,
   buildPythonPackage,
   pytestCheckHook,
-  fetchFromGitLab,
+  fetchFromGitHub,
   fetchpatch,
   replaceVars,
-  bubblewrap,
   exiftool,
   ffmpeg,
   setuptools,
   wrapGAppsHook3,
   gdk-pixbuf,
+  gnome,
   gobject-introspection,
   librsvg,
   poppler_gi,
+  webp-pixbuf-loader,
   mutagen,
   pygobject3,
   pycairo,
   dolphinIntegration ? false,
   kdePackages,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mat2";
-  version = "0.13.5";
+  version = "0.14.0";
   pyproject = true;
 
-  src = fetchFromGitLab {
-    domain = "0xacab.org";
+  src = fetchFromGitHub {
     owner = "jvoisin";
     repo = "mat2";
     tag = version;
-    hash = "sha256-ivFgH/88DBucZRaO/OMsLlwJCjv/VQXb6AiKWhZ8XH0=";
+    hash = "sha256-JTt2/PuSxOXXHUuRP42y8jxw09mNMMz1piJM4ldnjq0=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "exiftool-13.25-compat.patch";
-      url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch";
-      hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok=";
-    })
-    (fetchpatch {
-      name = "fix-test-on-python313.patch";
-      url = "https://0xacab.org/jvoisin/mat2/-/commit/f07344444d6d2f04a1f93e2954f4910b194bee0c.patch";
-      hash = "sha256-y756sKkjGO11A2lrRsXAwWgupOZ00u0cDypvkbsiNbY=";
-    })
-    (fetchpatch {
-      name = "fix-test-on-python312.patch";
-      url = "https://0xacab.org/jvoisin/mat2/-/commit/7a8ea224bc327b8ee929379d577c74968ea1c352.patch";
-      hash = "sha256-pPiYhoql5WhjhLKvd6y3OnvxORSbXIGCsZMc7UH3i1Q=";
-    })
     # hardcode paths to some binaries
     (replaceVars ./paths.patch {
       exiftool = lib.getExe exiftool;
@@ -64,10 +50,10 @@ buildPythonPackage rec {
     ./executable-name.patch
     # hardcode path to mat2 executable
     ./tests.patch
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-    (replaceVars ./bubblewrap-path.patch {
-      bwrap = lib.getExe bubblewrap;
+    (fetchpatch {
+      name = "fix-test_html.patch";
+      url = "https://github.com/jvoisin/mat2/commit/00b4f110711754496932c59d5af3c0b2ed694484.patch";
+      hash = "sha256-5h/nM1dK8HmYtoIBVGOvUegMFBpGxcfpn5O6QrjLi9M=";
     })
   ];
 
@@ -86,7 +72,6 @@ buildPythonPackage rec {
 
   buildInputs = [
     gdk-pixbuf
-    librsvg
     poppler_gi
   ];
 
@@ -97,6 +82,15 @@ buildPythonPackage rec {
   ];
 
   postInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
+
     install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
     install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
   ''
@@ -106,12 +100,15 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Handy tool to trash your metadata";
-    homepage = "https://0xacab.org/jvoisin/mat2";
-    changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md";
-    license = licenses.lgpl3Plus;
+    homepage = "https://github.com/jvoisin/mat2";
+    changelog = "https://github.com/jvoisin/mat2/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.lgpl3Plus;
     mainProgram = "mat2";
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/materialx/default.nix b/pkgs/development/python-modules/materialx/default.nix
index 5d9a744079c3..96d3995259cd 100644
--- a/pkgs/development/python-modules/materialx/default.nix
+++ b/pkgs/development/python-modules/materialx/default.nix
@@ -11,7 +11,6 @@
   openimageio,
   imath,
   python,
-  apple-sdk_14,
 }:
 
 buildPythonPackage rec {
@@ -36,9 +35,6 @@ buildPythonPackage rec {
     openimageio
     imath
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_14
-  ]
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libX11
     libXt
@@ -46,6 +42,7 @@ buildPythonPackage rec {
   ];
 
   cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
     (lib.cmakeBool "MATERIALX_BUILD_OIIO" true)
     (lib.cmakeBool "MATERIALX_BUILD_SHARED_LIBS" true)
     (lib.cmakeBool "MATERIALX_BUILD_PYTHON" true)
diff --git a/pkgs/development/python-modules/matlink-gpapi/default.nix b/pkgs/development/python-modules/matlink-gpapi/default.nix
deleted file mode 100644
index 3df24acd72a4..000000000000
--- a/pkgs/development/python-modules/matlink-gpapi/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  buildPythonPackage,
-  cryptography,
-  fetchPypi,
-  lib,
-  protobuf,
-  pycryptodome,
-  requests,
-}:
-
-buildPythonPackage rec {
-  version = "0.4.4.5";
-  format = "setuptools";
-  pname = "matlink-gpapi";
-
-  src = fetchPypi {
-    inherit version pname;
-    sha256 = "0s45yb2xiq3pc1fh4bygfgly0fsjk5fkc4wckbckn3ddl7v7vz8c";
-  };
-
-  # package doesn't contain unit tests
-  # scripts in ./test require networking
-  doCheck = false;
-
-  pythonImportsCheck = [ "gpapi.googleplay" ];
-
-  propagatedBuildInputs = [
-    cryptography
-    protobuf
-    pycryptodome
-    requests
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/NoMore201/googleplay-api";
-    license = licenses.gpl3Only;
-    description = "Google Play Unofficial Python API";
-    maintainers = with maintainers; [ schnusch ];
-  };
-}
diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 926dd2467971..4c23466b9880 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   buildPythonPackage,
   isPyPy,
-  pythonAtLeast,
   pythonOlder,
 
   # build-system
@@ -53,8 +52,7 @@
 
   # Tk
   # Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter
-  # tkinter fails to build on Python 3.11
-  enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy && pythonAtLeast "3.12"),
+  enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy),
   tkinter,
 
   # Qt
diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix
index 47d33a4c6aa5..8fd4a5732aa2 100644
--- a/pkgs/development/python-modules/mayim/default.nix
+++ b/pkgs/development/python-modules/mayim/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "mayim";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ahopkins";
     repo = "mayim";
     tag = "v${version}";
-    hash = "sha256-azAx/+y1wrUsacCmQ1SCSkn4svf6GzSfhEW3WJwjoks=";
+    hash = "sha256-mXGbPPO19H6fsWkvRzYyIVykHRryQo46WtH/XfqSIgY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index 796301df1627..c561b1b914b3 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "mcdreforged";
-  version = "2.15.4";
+  version = "2.15.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
     tag = "v${version}";
-    hash = "sha256-q88jAsgoIFzsOVKeA4fk69wGbnq3HcYJ2YzeZQHmYo4=";
+    hash = "sha256-4zThW18/6aO5gCsxx7TNM+q0Z7/c6G5zUxbCMpwEsEU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index 28c03cb655f2..40f7d8e83db9 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "mcstatus";
-  version = "12.0.5";
+  version = "12.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-mine";
     repo = "mcstatus";
     tag = "v${version}";
-    hash = "sha256-gtLWUIxG40MsmavA4KrHJ3btCR/zKdstwiUiZGsoNcw=";
+    hash = "sha256-lo96dZ7YaqZz/fmhuo8XWm5tSsB6ixtdxkZ3Hd6mq78=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/mdformat-beautysh/default.nix b/pkgs/development/python-modules/mdformat-beautysh/default.nix
index 2b5d8fd23fab..015b26f27b87 100644
--- a/pkgs/development/python-modules/mdformat-beautysh/default.nix
+++ b/pkgs/development/python-modules/mdformat-beautysh/default.nix
@@ -8,26 +8,23 @@
   mdit-py-plugins,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "mdformat-beautysh";
-  version = "0.1.1";
+  version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = "mdformat-beautysh";
     tag = version;
-    hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw=";
+    hash = "sha256-Wzwy2FSknohmgrZ/ACliBDD2lOaQKKHyacAL57Ci3SU=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautysh
     mdformat
     mdformat-gfm
@@ -41,6 +38,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Mdformat plugin to beautify Bash scripts";
     homepage = "https://github.com/hukkin/mdformat-beautysh";
+    changelog = "https://github.com/hukkin/mdformat-beautysh/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ aldoborrero ];
   };
diff --git a/pkgs/development/python-modules/mdformat-footnote/default.nix b/pkgs/development/python-modules/mdformat-footnote/default.nix
index 47f7dfe3e1f7..761d5575af85 100644
--- a/pkgs/development/python-modules/mdformat-footnote/default.nix
+++ b/pkgs/development/python-modules/mdformat-footnote/default.nix
@@ -5,36 +5,34 @@
   flit-core,
   mdformat,
   mdit-py-plugins,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "mdformat-footnote";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "executablebooks";
     repo = "mdformat-footnote";
     tag = "v${version}";
-    hash = "sha256-DUCBWcmB5i6/HkqxjlU3aTRO7i0n2sj+e/doKB8ffeo=";
+    hash = "sha256-QiekcxKfJGWog8rfSL6VIDHdo7rpw8ftl/dDJpVpdUg=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     mdformat
     mdit-py-plugins
   ];
 
   pythonImportsCheck = [ "mdformat_footnote" ];
 
-  meta = with lib; {
+  meta = {
     description = "Footnote format addition for mdformat";
     homepage = "https://github.com/executablebooks/mdformat-footnote";
-    license = licenses.mit;
-    maintainers = with maintainers; [ aldoborrero ];
+    changelog = "https://github.com/executablebooks/mdformat-footnote/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aldoborrero ];
   };
 }
diff --git a/pkgs/development/python-modules/mdformat-wikilink/default.nix b/pkgs/development/python-modules/mdformat-wikilink/default.nix
index 0c3c119a632b..5378eade888e 100644
--- a/pkgs/development/python-modules/mdformat-wikilink/default.nix
+++ b/pkgs/development/python-modules/mdformat-wikilink/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "mdformat-wikilink";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmr232";
     repo = "mdformat-wikilink";
     tag = "v${version}";
-    hash = "sha256-KOPh9iZfb3GCvslQeYBgqNaOyqtWi2llkaiWE7nmcJo=";
+    hash = "sha256-tYUF5gNmXjzlf0jQg0tL2ayFGCSFFeYJHkWA6cYLpvI=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/mdutils/default.nix b/pkgs/development/python-modules/mdutils/default.nix
index 3f82b1eb1c5d..3981a44965c4 100644
--- a/pkgs/development/python-modules/mdutils/default.nix
+++ b/pkgs/development/python-modules/mdutils/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "mdutils";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "didix21";
     repo = "mdutils";
     tag = "v${version}";
-    hash = "sha256-UBq6xSGG49zaRVWe2RmsCDkpa3vZFqKRJZQEVUegTSM=";
+    hash = "sha256-qUCiiFzbOccS7wy0LqgyZH04KlwG/FzE3a+R3z7tPF8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index c51821ed6ec2..352f91bf8914 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -3,23 +3,20 @@
   buildPythonPackage,
   camel-converter,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.37.0";
+  version = "0.37.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch-python";
     tag = "v${version}";
-    hash = "sha256-KKJ93WvkbQEtyRgROT3uGShLSwOaKrOpPDNyMJLqQ4M=";
+    hash = "sha256-yPZs8PIwrb4LhaEGX3vLvTJwo6Rb9zbChtq1Wbgh9cw=";
   };
 
   build-system = [ setuptools ];
@@ -39,7 +36,7 @@ buildPythonPackage rec {
     description = "Client for the Meilisearch API";
     homepage = "https://github.com/meilisearch/meilisearch-python";
     changelog = "https://github.com/meilisearch/meilisearch-python/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 9d8f59cbef96..0c825469ed6e 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -2,35 +2,89 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   click,
-  pytestCheckHook,
+
+  # tests
   hypothesis,
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mercantile";
   version = "1.2.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "mercantile";
-    rev = version;
+    tag = version;
     hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
   };
 
-  propagatedBuildInputs = [ click ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    hypothesis
+  build-system = [
+    setuptools
   ];
 
-  meta = with lib; {
+  dependencies = [
+    click
+  ];
+
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  disabledTests = [
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_cli_bounding_tile"
+    "test_cli_bounding_tile2"
+    "test_cli_bounding_tile_bbox"
+    "test_cli_bounding_tile_geosjon"
+    "test_cli_children"
+    "test_cli_multi_bounding_tile"
+    "test_cli_multi_bounding_tile_seq"
+    "test_cli_neighbors"
+    "test_cli_parent"
+    "test_cli_parent_depth"
+    "test_cli_parent_failure"
+    "test_cli_parent_multidepth"
+    "test_cli_quadkey_from_mixed"
+    "test_cli_quadkey_from_quadkeys"
+    "test_cli_quadkey_from_tiles"
+    "test_cli_shapes"
+    "test_cli_shapes_collect"
+    "test_cli_shapes_compact"
+    "test_cli_shapes_failure"
+    "test_cli_shapes_indentation"
+    "test_cli_strict_overlap_contain"
+    "test_cli_tiles_bad_bounds"
+    "test_cli_tiles_bounding_tiles_seq"
+    "test_cli_tiles_bounding_tiles_z0"
+    "test_cli_tiles_geosjon"
+    "test_cli_tiles_implicit_stdin"
+    "test_cli_tiles_multi_bounds"
+    "test_cli_tiles_multi_bounds_seq"
+    "test_cli_tiles_no_bounds"
+    "test_cli_tiles_point_geojson"
+    "test_cli_tiles_points"
+    "test_cli_tiles_seq"
+  ];
+
+  meta = {
     description = "Spherical mercator tile and coordinate utilities";
     mainProgram = "mercantile";
     homepage = "https://github.com/mapbox/mercantile";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
+    changelog = "https://github.com/mapbox/mercantile/blob/${version}/CHANGES.txt";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }
diff --git a/pkgs/development/python-modules/mesonpep517/default.nix b/pkgs/development/python-modules/mesonpep517/default.nix
deleted file mode 100644
index 4256dbe6ece4..000000000000
--- a/pkgs/development/python-modules/mesonpep517/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  meson,
-  ninja,
-  setuptools,
-  toml,
-  wheel,
-}:
-
-# TODO: offer meson as a Python package so we have dist-info folder.
-
-buildPythonPackage rec {
-  pname = "mesonpep517";
-  version = "0.2";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-Fyo7JfLqHJqbahEjVDt/0xJxOfVLqLn3xNJ4lSB7KIw=";
-  };
-
-  # Applies the following merge request, which doesn't apply cleanly:
-  # https://gitlab.com/thiblahute/mesonpep517/-/merge_requests/25
-  #
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail 'backend-path = "."' 'backend-path = ["."]'
-  '';
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  dependencies = [ toml ];
-
-  propagatedNativeBuildInputs = [
-    meson
-    ninja
-  ];
-
-  meta = {
-    description = "Create pep517 compliant packages from the meson build system";
-    homepage = "https://gitlab.com/thiblahute/mesonpep517";
-    license = lib.licenses.asl20;
-  };
-}
diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix
index 5d832f7820a4..fa6892b17517 100644
--- a/pkgs/development/python-modules/metaflow/default.nix
+++ b/pkgs/development/python-modules/metaflow/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "metaflow";
-  version = "2.18.11";
+  version = "2.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "metaflow";
     tag = version;
-    hash = "sha256-MR/QMweDwfvZiG0WqaP1xELnnpiz3zRBvedOtrQnGZM=";
+    hash = "sha256-MMPkQ1cjl/Sid4RyvP04xIDb6Xtr5S+LdJTOYgo0LFQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/meteo-lt-pkg/default.nix b/pkgs/development/python-modules/meteo-lt-pkg/default.nix
new file mode 100644
index 000000000000..dd1639485fce
--- /dev/null
+++ b/pkgs/development/python-modules/meteo-lt-pkg/default.nix
@@ -0,0 +1,49 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "meteo-lt-pkg";
+  version = "0.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Brunas";
+    repo = "meteo_lt-pkg";
+    tag = "v${version}";
+    hash = "sha256-OjIBgIOSJ65ryIF4D/UUUa1Oq0sPkKnaQEJeviimqhE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "meteo_lt" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # tests contact api.meteo.lt
+    "test_get_forecast"
+    "test_get_nearest_place"
+  ];
+
+  meta = {
+    changelog = "https://github.com/Brunas/meteo_lt-pkg/blob/${src.tag}/CHANGELOG.md";
+    description = "Meteo.Lt weather forecast package";
+    homepage = "https://github.com/Brunas/meteo_lt-pkg";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix
index 3d438efcab5a..68bbab053129 100644
--- a/pkgs/development/python-modules/midea-local/default.nix
+++ b/pkgs/development/python-modules/midea-local/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "midea-local";
-  version = "6.4.0";
+  version = "6.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "midea-lan";
     repo = "midea-local";
     tag = "v${version}";
-    hash = "sha256-jeQ5PXkKxVz041VJ58lJVpqIoj1Y054VADFtnutddg4=";
+    hash = "sha256-l5wV6W0CR3Jlir1DEpuh7/I8hGnH5+yrq0JjKcFh4sk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mim-solvers/default.nix b/pkgs/development/python-modules/mim-solvers/default.nix
new file mode 100644
index 000000000000..ebb18af22dfd
--- /dev/null
+++ b/pkgs/development/python-modules/mim-solvers/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  mim-solvers,
+
+  # nativeBuildInputs
+  python,
+
+  # propagatedBuildInputs
+  boost,
+  crocoddyl,
+  eigenpy,
+  osqp,
+  proxsuite,
+  scipy,
+
+  # nativeCheckInputs
+  pytest,
+}:
+toPythonModule (
+  mim-solvers.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    # this is used by CMake at configure/build time
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+
+    propagatedBuildInputs = [
+      boost
+      crocoddyl
+      eigenpy
+      mim-solvers
+      osqp
+      proxsuite
+      scipy
+    ]
+    ++ super.propagatedBuildInputs;
+
+    nativeCheckInputs = super.nativeCheckInputs ++ [
+      pythonImportsCheckHook
+      pytest
+    ];
+
+    pythonImportsCheck = [
+      "mim_solvers"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
index 2f7b18a34653..e9c11be20c46 100644
--- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix
+++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
@@ -1,34 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   poetry-core,
   dataprep-ml,
   numpy,
   pandas,
   scikit-learn,
   type-infer,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mindsdb-evaluator";
-  version = "0.0.18";
+  version = "0.0.20";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  # using PyPI as git repository does not have release tags or branches
-  src = fetchPypi {
-    pname = "mindsdb_evaluator";
-    inherit version;
-    hash = "sha256-UGg7P/OKmRi70z2roRBsA95FAXm7CG+TdPzTRy7+p4w=";
+  src = fetchFromGitHub {
+    owner = "mindsdb";
+    repo = "mindsdb_evaluator";
+    tag = "v${version}";
+    hash = "sha256-ZeJABMbyRdGrZGkWWXcjleOeDQBSicGR06hZAPUKvgI=";
   };
 
   build-system = [ poetry-core ];
 
   pythonRelaxDeps = [
+    "dataprep-ml"
     "numpy"
+    "scikit-learn"
   ];
 
   dependencies = [
@@ -41,10 +41,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mindsdb_evaluator" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/mindsdb/mindsdb_evaluator/releases/tag/${src.tag}";
     description = "Model evaluation for Machine Learning pipelines";
-    homepage = "https://pypi.org/project/mindsdb-evaluator/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ mbalatsko ];
+    homepage = "https://github.com/mindsdb/mindsdb_evaluator";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }
diff --git a/pkgs/development/python-modules/minify-html/default.nix b/pkgs/development/python-modules/minify-html/default.nix
index e5c1073ebc82..61f81813dc83 100644
--- a/pkgs/development/python-modules/minify-html/default.nix
+++ b/pkgs/development/python-modules/minify-html/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "minify-html";
-  version = "0.16.4";
+  version = "0.18.1";
 
   pyproject = true;
 
@@ -15,12 +15,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "minify_html";
-    hash = "sha256-3UjI/5ZhoQNHYkAqdBGzFohnqXP4/Hiwn2foGCC2TSI=";
+    hash = "sha256-Q5mFMO9TdwHwA6jpCLdW147/MDyGsEGpWFXikFGLp5w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-NLPei6ajR55mLyFhsjzUpXB/TsqqeDvP8yKE74t0ufk=";
+    hash = "sha256-K0m+rM0dcosAOl5jYdh9CSRrL/Vuk1ATWHPQJbLxvRw=";
   };
 
   nativeBuildInputs = with rustPlatform; [
diff --git a/pkgs/development/python-modules/mitmproxy/default.nix b/pkgs/development/python-modules/mitmproxy/default.nix
index b3cf3b85849b..f0ce75afc207 100644
--- a/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/pkgs/development/python-modules/mitmproxy/default.nix
@@ -3,6 +3,7 @@
   aioquic,
   argon2-cffi,
   asgiref,
+  bcrypt,
   brotli,
   buildPythonPackage,
   certifi,
@@ -17,7 +18,6 @@
   ldap3,
   mitmproxy-rs,
   msgpack,
-  passlib,
   publicsuffix2,
   pyopenssl,
   pyparsing,
@@ -38,27 +38,28 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "12.1.2";
+  version = "12.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy";
     tag = "v${version}";
-    hash = "sha256-XYZ14JlVYG/OLlEze+C1L/HP3HD5GEW+jG2YYSXW/8Y=";
+    hash = "sha256-2ldebsgR0xZV4WiCLV7DBUKXZo3oE+M6cmvRbSeCSLQ=";
   };
 
   pythonRelaxDeps = [
+    "bcrypt"
     "cryptography"
     "flask"
     "h2"
     "kaitaistruct"
-    "passlib"
     "pyopenssl"
     "pyperclip"
     "tornado"
     "typing-extensions"
     "urwid"
+    "zstandard"
   ];
 
   build-system = [ setuptools ];
@@ -68,6 +69,7 @@ buildPythonPackage rec {
     argon2-cffi
     asgiref
     brotli
+    bcrypt
     certifi
     cryptography
     flask
@@ -78,7 +80,6 @@ buildPythonPackage rec {
     ldap3
     mitmproxy-rs
     msgpack
-    passlib
     publicsuffix2
     pyopenssl
     pyparsing
diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index eee637d211fb..b11f0420ecfd 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.29";
+  version = "0.3.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${version}";
-    hash = "sha256-j2VT46bYi9lmFKNNCHshs56b2HqqvfpEDBHnaHvfYgY=";
+    hash = "sha256-witxGRPi2TOwLOnsJcxOKLJdZ6ggapANXneFMJdHa98=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix
index adad2c3a3c7b..6035a4a37efd 100644
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "mizani";
-  version = "0.14.2";
+  version = "0.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "mizani";
     tag = "v${version}";
-    hash = "sha256-g7eGajqFLgFWxNKefuYVWF439zVohU8W1j3w91nblEY=";
+    hash = "sha256-LUustvdD+8J6xu4HrvdFlVHlPGnt+h/0ZvGH7ZiVBUY=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index fa299fb8cc2a..47a5a2d005b5 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.6.21";
+  version = "9.6.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "squidfunk";
     repo = "mkdocs-material";
     tag = version;
-    hash = "sha256-zd1KJQOH3uHrePJbBgLuq++GSoM1KYW9VwpYnCrZZQY=";
+    hash = "sha256-k9xoysCbmWqdu1hNUTbWbTvPCuo8gcyvXEDecHiOpEw=";
   };
 
   build-system = [
@@ -89,6 +89,9 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/squidfunk/mkdocs-material";
     homepage = "https://squidfunk.github.io/mkdocs-material/";
     license = licenses.mit;
-    maintainers = with maintainers; [ dandellion ];
+    maintainers = with maintainers; [
+      dandellion
+      jaysa68
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index b35b48626644..c97cd755c8e6 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-mermaid2-plugin";
-  version = "1.2.2";
+  version = "1.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "fralau";
     repo = "mkdocs-mermaid2-plugin";
     tag = "v${version}";
-    hash = "sha256-4WuE9fO4o0uN48W2Rwd4gKa6pK9bqyrcGjFLEkfJ0E4=";
+    hash = "sha256-EsfcOnfjZpAndYccN8WTpfLoUAlc5JQkgoy1ro1hMRo=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix b/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
index 1b121ff00c78..0b0acf41e228 100644
--- a/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlags = [ "-s" ];
+
   meta = with lib; {
     description = "MkDocs plugin supports for add Redoc UI in page";
     homepage = "https://github.com/blueswen/mkdocs-redoc-tag";
diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index d0132580ed36..3287ac61d725 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "mkdocstrings-python";
-  version = "1.16.12";
+  version = "1.18.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkdocstrings";
     repo = "python";
     tag = version;
-    hash = "sha256-NL5gn8HgT0hvIlUDs//sErAaSVXvxLDJGT7nZX65ZVU=";
+    hash = "sha256-BdUNj7EJAbOs8Ff+IGbd7be+lRG6MQCIgNAi5oH9OgA=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 827ac4bc8686..79cee0a8c20e 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -83,6 +83,7 @@ buildPythonPackage rec {
   };
 
   pythonRelaxDeps = [
+    "cryptography"
     "gunicorn"
     "importlib-metadata"
     "packaging"
diff --git a/pkgs/development/python-modules/mlx/default.nix b/pkgs/development/python-modules/mlx/default.nix
index 1816bc34f7ed..9aec1b175c76 100644
--- a/pkgs/development/python-modules/mlx/default.nix
+++ b/pkgs/development/python-modules/mlx/default.nix
@@ -12,7 +12,7 @@
   cmake,
 
   # buildInputs
-  apple-sdk_14,
+  apple-sdk,
   fmt,
   nanobind,
   nlohmann_json,
@@ -48,7 +48,7 @@ let
 
     patches = [
       (replaceVars ./darwin-build-fixes.patch {
-        sdkVersion = apple-sdk_14.version;
+        sdkVersion = apple-sdk.version;
       })
     ];
 
@@ -95,7 +95,6 @@ let
     ];
 
     buildInputs = [
-      apple-sdk_14
       fmt
       gguf-tools
       nanobind
diff --git a/pkgs/development/python-modules/mne/default.nix b/pkgs/development/python-modules/mne/default.nix
index 1e762305baf5..1a55f3a2a85f 100644
--- a/pkgs/development/python-modules/mne/default.nix
+++ b/pkgs/development/python-modules/mne/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "mne";
-  version = "1.10.1";
+  version = "1.10.2";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "mne-tools";
     repo = "mne-python";
     tag = "v${version}";
-    hash = "sha256-xxkv+8RAkpRyMWznUMpwc6E72mb9DUPW6O5hFHiNz98=";
+    hash = "sha256-K99yjWpX7rt6Isp0ao0NJcUu7GBRNKVz2i+xVt2HBNY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/momonga/default.nix b/pkgs/development/python-modules/momonga/default.nix
index d894d4f698e6..6bf9248cb9de 100644
--- a/pkgs/development/python-modules/momonga/default.nix
+++ b/pkgs/development/python-modules/momonga/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "momonga";
-  version = "0.1.5";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nbtk";
     repo = "momonga";
     tag = "v${version}";
-    hash = "sha256-sc81L71DJq+XiIYUSMH6knfaPfV7cng/Sp0ZTY6N7ZI=";
+    hash = "sha256-afPTJH1cVG4Ts6k1GwTJmSZgVZa0ejUERWgNumIUkbs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix
index 3ae67044ff93..f3b5d6657ae2 100644
--- a/pkgs/development/python-modules/monai-deploy/default.nix
+++ b/pkgs/development/python-modules/monai-deploy/default.nix
@@ -9,6 +9,7 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  tritonclient,
   typeguard,
   versioneer,
 }:
@@ -18,8 +19,6 @@ buildPythonPackage rec {
   version = "3.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Project-MONAI";
     repo = "monai-deploy-app-sdk";
@@ -43,6 +42,7 @@ buildPythonPackage rec {
     numpy
     networkx
     colorama
+    tritonclient
     typeguard
   ];
 
@@ -64,12 +64,13 @@ buildPythonPackage rec {
     # like highdicom and pydicom
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Framework and tools to design, develop and verify AI applications in healthcare imaging";
     mainProgram = "monai-deploy";
     homepage = "https://monai.io/deploy.html";
     changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/${src.tag}.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    broken = true; # requires holoscan and holoscan-cli, not in Nixpkgs
   };
 }
diff --git a/pkgs/development/python-modules/monotonic-alignment-search/default.nix b/pkgs/development/python-modules/monotonic-alignment-search/default.nix
index fd4f932dfa09..261a53d33b6c 100644
--- a/pkgs/development/python-modules/monotonic-alignment-search/default.nix
+++ b/pkgs/development/python-modules/monotonic-alignment-search/default.nix
@@ -6,35 +6,41 @@
   # build-system
   setuptools,
   cython,
-  numpy_2,
+  numpy,
 
   # dependencies
   torch,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "monotonic-alignment-search";
-  version = "0.2.0";
+  version = "0.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eginhard";
     repo = "monotonic_alignment_search";
     tag = "v${version}";
-    hash = "sha256-N714DfLyrdhhm2yWlMzUVZkQ5Ys2aOmtEcxACGM665Y=";
+    hash = "sha256-XsQDRsgwwlZAmxpsISgNYbrgnMOQIVNvzJV4ZWxswCY=";
   };
 
   build-system = [
     setuptools
     cython
-    numpy_2
+    numpy
   ];
 
   dependencies = [
+    numpy
     torch
   ];
 
-  enabledTestPaths = [ "tests" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "monotonic_alignment_search" ];
 
diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix
index f45195078d38..0e7e4cbb1b7e 100644
--- a/pkgs/development/python-modules/moonraker-api/default.nix
+++ b/pkgs/development/python-modules/moonraker-api/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   aiohttp,
+  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
   pytest-aiohttp,
@@ -28,7 +29,10 @@ buildPythonPackage rec {
       --replace 'name="moonraker-api",' 'name="moonraker-api",version="${version}",'
   '';
 
-  propagatedBuildInputs = [ aiohttp ];
+  propagatedBuildInputs = [
+    aiohttp
+    async-timeout
+  ];
 
   nativeCheckInputs = [
     pytest-aiohttp
diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index c5e29eecfd02..e9f4650acb18 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -3,23 +3,27 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
 
+  # build-system
+  flit,
+
+  # dependencies
   attrs,
   click,
-  flit,
-  mercantile,
   pydantic,
   pyproj,
+
+  # tests
+  mercantile,
   rasterio,
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "morecantile";
   version = "6.2.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "developmentseed";
@@ -28,9 +32,9 @@ buildPythonPackage rec {
     hash = "sha256-ohTSgkjgaANS/Pli4fao+THA4ltts6svj5CdJEgorz0=";
   };
 
-  nativeBuildInputs = [ flit ];
+  build-system = [ flit ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     click
     pydantic
@@ -41,9 +45,26 @@ buildPythonPackage rec {
     mercantile
     pytestCheckHook
     rasterio
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTests = [
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_cli_shapes"
+    "test_cli_shapesWGS84"
+    "test_cli_strict_overlap_contain"
+    "test_cli_tiles_bad_bounds"
+    "test_cli_tiles_geosjon"
+    "test_cli_tiles_implicit_stdin"
+    "test_cli_tiles_multi_bounds"
+    "test_cli_tiles_multi_bounds_seq"
+    "test_cli_tiles_ok"
+    "test_cli_tiles_points"
+    "test_cli_tiles_seq"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # https://github.com/developmentseed/morecantile/issues/156
     "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian"
   ];
@@ -52,7 +73,9 @@ buildPythonPackage rec {
 
   meta = {
     description = "Construct and use map tile grids in different projection";
-    homepage = "https://developmentseed.org/morecantile/";
+    homepage = "https://developmentseed.org/morecantile";
+    downloadPage = "https://github.com/developmentseed/morecantile";
+    changelog = "https://github.com/developmentseed/morecantile/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
     mainProgram = "morecantile";
diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix
index 60895d011a39..b27d6bb2066d 100644
--- a/pkgs/development/python-modules/moyopy/default.nix
+++ b/pkgs/development/python-modules/moyopy/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "moyopy";
-  version = "0.6.0";
+  version = "0.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spglib";
     repo = "moyo";
     tag = "v${version}";
-    hash = "sha256-4Dete4rtkfs0Ytf0YSdyDNP51C8GlaxKdQlS1l8hj44=";
+    hash = "sha256-XWOFYzDYCICVtaIpo9bH8P1YwV9QmR108DUb0GDMPM4=";
   };
 
   sourceRoot = "${src.name}/moyopy";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-z45jmkPKfX7kYefFaU/F6SopK0dI6xtgrkllaergtwI=";
+    hash = "sha256-LfC0ptYH+wMq9yaS+vkLAoQJiuLONo3Ol1v7eS7gLeI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
new file mode 100644
index 000000000000..2217168cc026
--- /dev/null
+++ b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
@@ -0,0 +1,11 @@
+--- a/tests/test_auth.py
++++ b/tests/test_auth.py
+@@ -1234,7 +1234,7 @@ class OIDCAuthenticationBackendES256WithJwksEndpointTestCase(TestCase):
+         self.backend = OIDCAuthenticationBackend()
+ 
+         # Generate a private key to create a test token with
+-        private_key = ec.generate_private_key(ec.SECP256R1, default_backend())
++        private_key = ec.generate_private_key(ec.SECP256R1(), default_backend())
+         private_key_pem = private_key.private_bytes(
+             serialization.Encoding.PEM,
+             serialization.PrivateFormat.PKCS8,
diff --git a/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
index cd44808efc57..d3eb5ead33d9 100644
--- a/pkgs/development/python-modules/mozilla-django-oidc/default.nix
+++ b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs=";
   };
 
+  # Fix test with latest cryptography
+  # Upstream PR: https://github.com/mozilla/mozilla-django-oidc/pull/556
+  patches = [
+    ./cryptography.patch
+  ];
+
   nativeBuildInputs = [
     setuptools
   ];
diff --git a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
index 51353639a647..e635d760c203 100644
--- a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
+++ b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
@@ -12,7 +12,7 @@
 }:
 buildPythonPackage rec {
   pname = "mozjpeg_lossless_optimization";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "mozjpeg-lossless-optimization";
     # https://github.com/NixOS/nixpkgs/issues/26302
     tag = "v${version}";
-    hash = "sha256-HAOmD87oazwlGx1O+tAV5qzSn4EHbzeYQ5e8kmegwbo=";
+    hash = "sha256-0w0e7QbYi3W6MahY8fnI+dYkQHqheOXQn3mJN/UfHlk=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/mprisify/default.nix b/pkgs/development/python-modules/mprisify/default.nix
new file mode 100644
index 000000000000..bf91f8e449f2
--- /dev/null
+++ b/pkgs/development/python-modules/mprisify/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+  pydbus,
+  pygobject3,
+  setuptools,
+  strenum,
+}:
+buildPythonPackage rec {
+  pname = "mprisify";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "zehkira";
+    repo = "mprisify";
+    tag = "v${version}";
+    hash = "sha256-05i3N61cqRgGaBjYOEhxeCSV2wDh9yMaXTvEZ/JGrZo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pydbus
+    pygobject3
+    strenum
+  ];
+
+  pythonImportsCheck = [ "mprisify" ];
+
+  meta = {
+    description = "Python MPRIS server library for Linux media player apps";
+    homepage = "https://gitlab.com/zehkira/mprisify";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ quadradical ];
+  };
+}
diff --git a/pkgs/development/python-modules/mrsqm/default.nix b/pkgs/development/python-modules/mrsqm/default.nix
index e8a2a0ffea8b..e6828479a5dd 100644
--- a/pkgs/development/python-modules/mrsqm/default.nix
+++ b/pkgs/development/python-modules/mrsqm/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "mrsqm";
-  version = "4";
+  version = "0.0.7";
   pyproject = true;
 
   build-system = [
@@ -28,8 +28,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "mlgig";
     repo = "mrsqm";
-    tag = "r${version}";
-    hash = "sha256-59f18zItV3K6tXcg1v1q2Z8HYrQB8T0ntaaqjxeAEbM=";
+    tag = "v.${version}";
+    hash = "sha256-5K6vCU0HExnmYNThZNDCbEtII9bUGauxDtKkJXe/85Q=";
   };
 
   buildInputs = [ fftw ];
diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index abc8d81b78a5..adcf9271a8ba 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.46.0";
+  version = "1.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${version}";
-    hash = "sha256-PAFRK+PLHG87ilD7Nslmj33bif2vBD6/SWmWMkv8HIY=";
+    hash = "sha256-/S9dJ5eeYG7I+COizOb3TpaYpx7Qu+R5brRxbLuV3F8=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index 44bc828d3625..9ed38523bc29 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -3,7 +3,22 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  attrs,
+  coverage,
+  furo,
+  ipython,
+  msgpack,
+  mypy,
+  pre-commit,
+  pyright,
+  pytest,
+  pyyaml,
   setuptools,
+  sphinx,
+  sphinx-copybutton,
+  sphinx-design,
+  tomli,
+  tomli-w,
 }:
 
 buildPythonPackage rec {
@@ -26,6 +41,36 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  optional-dependencies = {
+    dev = [
+      coverage
+      mypy
+      pre-commit
+      pyright
+    ]
+    ++ optional-dependencies.doc
+    ++ optional-dependencies.test;
+    doc = [
+      furo
+      ipython
+      sphinx
+      sphinx-copybutton
+      sphinx-design
+    ];
+    test = [
+      attrs
+      msgpack
+      pytest
+    ]
+    ++ optional-dependencies.yaml
+    ++ optional-dependencies.toml;
+    toml = [
+      tomli-w
+    ]
+    ++ lib.optional (pythonOlder 3.11) tomli;
+    yaml = [ pyyaml ];
+  };
+
   # Requires libasan to be accessible
   doCheck = false;
 
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index a35bbdbee805..286c7395781e 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "multidict";
-  version = "6.6.4";
+  version = "6.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "multidict";
     tag = "v${version}";
-    hash = "sha256-Ewxwz+0Y8pXJpHobLxrV7cuA9fsAaawWmW9XoEg7dxU=";
+    hash = "sha256-NEiUXHwY7bas7+Ddf9hdR6m/N+wbRG/NguoMROIWjeU=";
   };
 
   postPatch = ''
@@ -37,11 +37,9 @@ buildPythonPackage rec {
     typing-extensions
   ];
 
-  env =
-    { }
-    // lib.optionalAttrs stdenv.cc.isClang {
-      NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
-    };
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-error=unused-command-line-argument";
+  };
 
   nativeCheckInputs = [
     objgraph
@@ -58,11 +56,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "multidict" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/aio-libs/multidict/blob/${src.tag}/CHANGES.rst";
     description = "Multidict implementation";
     homepage = "https://github.com/aio-libs/multidict/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ccdd0c16c049..16cddd338585 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -46,603 +46,603 @@ let
 in
 {
   mypy-boto3-accessanalyzer =
-    buildMypyBoto3Package "accessanalyzer" "1.40.0"
-      "sha256-hY5aShO9E5zMwPSUUucjgG2Bod0lAm51BZyLP/1JLgY=";
+    buildMypyBoto3Package "accessanalyzer" "1.40.60"
+      "sha256-8BzWjJfv/6kEgJYsLmhIs9jgXx32yVW+L+DsTV/FfVA=";
 
   mypy-boto3-account =
-    buildMypyBoto3Package "account" "1.40.0"
-      "sha256-isNBcceGQXkVPZQ9XNVGt9eCHxUidaHVJbuPmSjYOcc=";
+    buildMypyBoto3Package "account" "1.40.58"
+      "sha256-ZZe7b7krR5JrDWUS+YZcZGbFrRemvX7Ohz8xWPtVGDQ=";
 
   mypy-boto3-acm =
-    buildMypyBoto3Package "acm" "1.40.0"
-      "sha256-E2wUtUSMX4Lyj+HioQD6km3sGGETjgzujJbEewOHc5M=";
+    buildMypyBoto3Package "acm" "1.40.59"
+      "sha256-n8PwLnwMQXKZc5+euUBj6CBPO8H5iajC8Y0nQUO100I=";
 
   mypy-boto3-acm-pca =
-    buildMypyBoto3Package "acm-pca" "1.40.1"
-      "sha256-GZMeU5qLmE7eM6zSuS3e63ytY8C1jlnjUVkJmAiAoCo=";
+    buildMypyBoto3Package "acm-pca" "1.40.54"
+      "sha256-MqxsI64KEyipR0iiaifc42HQLHsVIFMmtvN2/Vx1EJU=";
 
   mypy-boto3-amp =
-    buildMypyBoto3Package "amp" "1.40.29"
-      "sha256-LHVI54tJakPFTh0l+YZMJQV9X6+smUNJBee0u8WO5ro=";
+    buildMypyBoto3Package "amp" "1.40.63"
+      "sha256-CWtt4C1qln56Wzu5I9NOaCoJgMwGNX7iZnD5XkZQC34=";
 
   mypy-boto3-amplify =
-    buildMypyBoto3Package "amplify" "1.40.0"
-      "sha256-B9APRl3tgbLaWHsXOdcaYDvkpEdQRO5P1PIbQecR7lo=";
+    buildMypyBoto3Package "amplify" "1.40.54"
+      "sha256-8nNBUlGXVoracAltiBNWohK7yG8z6Q0KGupyOS9/Tpc=";
 
   mypy-boto3-amplifybackend =
-    buildMypyBoto3Package "amplifybackend" "1.40.19"
-      "sha256-XxeDxB9uvOSFDPrnuSGHYhuAY9m9WrGX+j0I2IQ2Cnw=";
+    buildMypyBoto3Package "amplifybackend" "1.40.55"
+      "sha256-m4XafAYt1vUe1nesd5lX2Lrt/6aeXWHTR3DUX0YkvdM=";
 
   mypy-boto3-amplifyuibuilder =
-    buildMypyBoto3Package "amplifyuibuilder" "1.40.0"
-      "sha256-wBdq3kI0El1XZRuGMG2lN0Zjc1GIBOItMBvctF/10Wg=";
+    buildMypyBoto3Package "amplifyuibuilder" "1.40.59"
+      "sha256-ZqZTg/CLPUBTcZ5mbZJsA9f2sdIkgwQDn83xVWLrWpY=";
 
   mypy-boto3-apigateway =
-    buildMypyBoto3Package "apigateway" "1.40.0"
-      "sha256-mfMTQ3XSVHDjTjQEY/EL1xq4t0KRaPwG2Nu0Pwsbk3o=";
+    buildMypyBoto3Package "apigateway" "1.40.63"
+      "sha256-X2wxkeKYvNCGbgFwA2jWSrAdPg5Pc7XCOvTauiZlLaQ=";
 
   mypy-boto3-apigatewaymanagementapi =
-    buildMypyBoto3Package "apigatewaymanagementapi" "1.40.15"
-      "sha256-E7R5SOWEYyulF1Jh17x7iL89ucc0KpmDnOWo4thHFuk=";
+    buildMypyBoto3Package "apigatewaymanagementapi" "1.40.54"
+      "sha256-/818ZgAE2Pqwcr914QvY86R5joOZ8kjM6StO4EpobdM=";
 
   mypy-boto3-apigatewayv2 =
-    buildMypyBoto3Package "apigatewayv2" "1.40.0"
-      "sha256-gfnF5uJodhhdWWdmTcD3N4GEwUZh/LsOZ9C99MPCHWQ=";
+    buildMypyBoto3Package "apigatewayv2" "1.40.61"
+      "sha256-C0MDOmvUXvJN3FuDsDm8fZQZUFFzACdw+0EpWCIpjEc=";
 
   mypy-boto3-appconfig =
-    buildMypyBoto3Package "appconfig" "1.40.0"
-      "sha256-n0P3k9Bs7ckTEim/cHXLQzt5qsjxzq59TYlOair61mU=";
+    buildMypyBoto3Package "appconfig" "1.40.63"
+      "sha256-5mjQ5qZjHW67dP9S34ojNIcwgNN8xbwuVwKo+7PtkeI=";
 
   mypy-boto3-appconfigdata =
-    buildMypyBoto3Package "appconfigdata" "1.40.0"
-      "sha256-/6S/GdXeAYY9wdapWjcrCyaDmeijp6kSy63m0ITW3fs=";
+    buildMypyBoto3Package "appconfigdata" "1.40.55"
+      "sha256-Unxc01GzvKZGiKlW3o3ZrEZXthJPlMY1tu0vnUgYmq4=";
 
   mypy-boto3-appfabric =
-    buildMypyBoto3Package "appfabric" "1.40.15"
-      "sha256-wLCPBODUaTw6VdnbZ0bD9BzIVTPuGpVlZfeGBZY95B8=";
+    buildMypyBoto3Package "appfabric" "1.40.57"
+      "sha256-X7RcwPwiYMSaj7QN8NHekxaLyzG7A+LcvJSElkeKZm0=";
 
   mypy-boto3-appflow =
-    buildMypyBoto3Package "appflow" "1.40.17"
-      "sha256-eBbaAv0NU/VcaZNNPaBvU2pt7rXNm2DwqZ0xtoX2WwU=";
+    buildMypyBoto3Package "appflow" "1.40.63"
+      "sha256-/JAEmxuUuHyGeoehZY6LZjUEk0k0WxuR/48kEc7SmsE=";
 
   mypy-boto3-appintegrations =
-    buildMypyBoto3Package "appintegrations" "1.40.0"
-      "sha256-7su8sPB0QUQi+5ZQd701JYNVqpoIww3q0N4puBcszT4=";
+    buildMypyBoto3Package "appintegrations" "1.40.55"
+      "sha256-JYfNdS/e3ftDshlXoVVTfw2+zQUuGy+rpdM0dIrD7dM=";
 
   mypy-boto3-application-autoscaling =
-    buildMypyBoto3Package "application-autoscaling" "1.40.0"
-      "sha256-XMvGnZjdb8sQ8QES1CkZD7VkditEdudUGPVaYwF25Fk=";
+    buildMypyBoto3Package "application-autoscaling" "1.40.58"
+      "sha256-94en37HywYX3u+7hR13d0wLmtjc1HyHclMMQotzL2dQ=";
 
   mypy-boto3-application-insights =
-    buildMypyBoto3Package "application-insights" "1.40.19"
-      "sha256-UNaLgX1dogngrhDFGhVi4FC4mAhkH2dW+Sk/4sAPh9M=";
+    buildMypyBoto3Package "application-insights" "1.40.55"
+      "sha256-JWzHe+4UxLenKYXdNXhShTGWTGDFgWx6O8TAfxEaWPI=";
 
   mypy-boto3-applicationcostprofiler =
-    buildMypyBoto3Package "applicationcostprofiler" "1.40.20"
-      "sha256-owSt/dJ4jtYwAjvi7/gKHqdn9ZdlXrdVggeqP09/GI8=";
+    buildMypyBoto3Package "applicationcostprofiler" "1.40.63"
+      "sha256-FjGdsXuu/NPABrsl5JK3sPsOHGnAwTvIIv+G3MRxZxg=";
 
   mypy-boto3-appmesh =
-    buildMypyBoto3Package "appmesh" "1.40.0"
-      "sha256-ZMDdjJse4uyAnWIy/cwQQuAemTrUBdm8PYQp0LTuHgE=";
+    buildMypyBoto3Package "appmesh" "1.40.63"
+      "sha256-jGO22gbzqaa9VcBKyyEo8QLVf/Uia6RrQGaHgIApQPQ=";
 
   mypy-boto3-apprunner =
-    buildMypyBoto3Package "apprunner" "1.40.20"
-      "sha256-LNfDzqjQNQkvt61VHFc8aFdEBicRACvSmuM9W/SWQng=";
+    buildMypyBoto3Package "apprunner" "1.40.54"
+      "sha256-t4mGNhPOii3GcMirgyvGZ53XmYf+GpWwMkL0RELswrs=";
 
   mypy-boto3-appstream =
     buildMypyBoto3Package "appstream" "1.40.52"
       "sha256-l1Zrigv4T4W9z+9MrZTTcTeeVISb5wnjepBpfSv554g=";
 
   mypy-boto3-appsync =
-    buildMypyBoto3Package "appsync" "1.40.0"
-      "sha256-NgOa+Na/gU7IrtEJ8bVMJaSCNgTnGreX2TsjsAlIN+Y=";
+    buildMypyBoto3Package "appsync" "1.40.63"
+      "sha256-KRa98jsQ6MPZBWwZbPAmxmSgUvO9Y6XGkWngL1p5L7I=";
 
   mypy-boto3-arc-zonal-shift =
-    buildMypyBoto3Package "arc-zonal-shift" "1.40.18"
-      "sha256-+CR5RYb8rFZxC5Vl208nRf9RT0Dhd7w1s0vdkefAhM4=";
+    buildMypyBoto3Package "arc-zonal-shift" "1.40.55"
+      "sha256-as/i/8ByPLcr91nEwv+Qaq/Y8Rpi1qaVyMyDU7SMbc4=";
 
   mypy-boto3-athena =
-    buildMypyBoto3Package "athena" "1.40.0"
-      "sha256-2oQp9Va82Feyyf7ZEz7wv+y4mOK3TpZ586qvzCZwK/E=";
+    buildMypyBoto3Package "athena" "1.40.60"
+      "sha256-hBkW8prNkpdP+7ZEY5YIs540fPDZX1sqbHzEHDWcZgw=";
 
   mypy-boto3-auditmanager =
-    buildMypyBoto3Package "auditmanager" "1.40.1"
-      "sha256-p8jnTJigD8QuLe3vjZwE7ZyGgBblpSdM0II0Cr/xFS8=";
+    buildMypyBoto3Package "auditmanager" "1.40.63"
+      "sha256-dzUf+/dAnrEsjxTcm2AZOqJeeWmQ8///8ORR8/o52S4=";
 
   mypy-boto3-autoscaling =
-    buildMypyBoto3Package "autoscaling" "1.40.27"
-      "sha256-lnejEICkgHqQWfiN3LyNIHzDjfpgP2GlAr6acRP/wFo=";
+    buildMypyBoto3Package "autoscaling" "1.40.57"
+      "sha256-haVFlPVqDuB6ZjhQ7ZOF57jfC8mNGXStDhzuMnObeiw=";
 
   mypy-boto3-autoscaling-plans =
-    buildMypyBoto3Package "autoscaling-plans" "1.40.20"
-      "sha256-euF2rskAknxAxRrkS7mOXWZkb9NR70kGGRe5kqTcNgs=";
+    buildMypyBoto3Package "autoscaling-plans" "1.40.54"
+      "sha256-pSEyo/Bpim0PgH0tj+MbJUIYwLk23M0mAh3LbTMv8m8=";
 
   mypy-boto3-backup =
     buildMypyBoto3Package "backup" "1.40.52"
       "sha256-bo+tgMbUCf1uL8fNB/5UBgUtIiYMMQpd/uaj/LUuZ6U=";
 
   mypy-boto3-backup-gateway =
-    buildMypyBoto3Package "backup-gateway" "1.40.15"
-      "sha256-BZXrWhqf5gFrTW0fAsiyiydzc0cTv2lPj5DTRLrv+pI=";
+    buildMypyBoto3Package "backup-gateway" "1.40.60"
+      "sha256-VhY/EqSIDSN6u2D87oA8HtTEZqkUzcJPlE+hHIg68Sw=";
 
   mypy-boto3-batch =
-    buildMypyBoto3Package "batch" "1.40.36"
-      "sha256-pi8VVxFJ9z5+4yRP9Tug6nJI5Kj441juIsOKgjT0EQ4=";
+    buildMypyBoto3Package "batch" "1.40.54"
+      "sha256-iIQwIdK4dqKCDwxmeL7mzX/LZFKztIv59LzNuqHc3BU=";
 
   mypy-boto3-billingconductor =
-    buildMypyBoto3Package "billingconductor" "1.40.0"
-      "sha256-XyGkubFi/5yoLG/5CGRNjtB7tKhOqP6PuTvhTsn3pQM=";
+    buildMypyBoto3Package "billingconductor" "1.40.54"
+      "sha256-gikBABSlCcQfBSh8jyIYdN7iyTncBRZoVPQ1UnVbwRU=";
 
   mypy-boto3-braket =
-    buildMypyBoto3Package "braket" "1.40.9"
-      "sha256-IUf8vnKJRqa5BeEIKEfAc09ixEIvVRfKBi6nEP1KjZU=";
+    buildMypyBoto3Package "braket" "1.40.60"
+      "sha256-7jhrDR3DTXGFZhfzmBgpL66+qk/3XtYM7Kdp5KgYzrc=";
 
   mypy-boto3-budgets =
-    buildMypyBoto3Package "budgets" "1.40.34"
-      "sha256-UzM2sg9jxU/kU6kmMizVJwYLqq+nrZi+D6GLHYPdmJQ=";
+    buildMypyBoto3Package "budgets" "1.40.59"
+      "sha256-Kw46Ncpneh+vyM+bFux/04DBDpXQrm0/HDkGjHcAeGU=";
 
   mypy-boto3-ce =
-    buildMypyBoto3Package "ce" "1.40.40"
-      "sha256-ygUnU/oDBQPqmRfZ6jKMnvVXdORQkBuC57UyXjV6Xi0=";
+    buildMypyBoto3Package "ce" "1.40.60"
+      "sha256-vV/nuOJeFelanrZSHeP7m92h1yf4Eg9hlURXzGqZNGA=";
 
   mypy-boto3-chime =
-    buildMypyBoto3Package "chime" "1.40.19"
-      "sha256-j90U6EWrV/zhn0KTitm4/WMV8xh+wm4yjKWFaQ0C4UA=";
+    buildMypyBoto3Package "chime" "1.40.63"
+      "sha256-KpeAk7Kt3wZwgvGv8fOilXyx0FimkX6XFBEqEDvb5Zo=";
 
   mypy-boto3-chime-sdk-identity =
-    buildMypyBoto3Package "chime-sdk-identity" "1.40.19"
-      "sha256-coS/9S9Sa2rAZAQPEMDTrZNNyj66jok08bNHpypO2G0=";
+    buildMypyBoto3Package "chime-sdk-identity" "1.40.60"
+      "sha256-HuG739RucVSvMev7k2WnqoxDHWnK9cT4bMVijcYRRIA=";
 
   mypy-boto3-chime-sdk-media-pipelines =
-    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.17"
-      "sha256-5qaK+piVZhvHqBJgGteNsvmMZG5y6fvLD4W8qASfcL0=";
+    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.60"
+      "sha256-6n8aB49OhrvimPJLxgXuNyn7vCcbm3KgyNg60EUESVI=";
 
   mypy-boto3-chime-sdk-meetings =
-    buildMypyBoto3Package "chime-sdk-meetings" "1.40.43"
-      "sha256-vhWKoKhIJbB9Em7EA1IMdrSUTBFIgkAOxrdAeepCjbg=";
+    buildMypyBoto3Package "chime-sdk-meetings" "1.40.55"
+      "sha256-KMEuqXWo3YwQ3z0zQFZ7ySk3shgXaPE0q2nx9lSP12c=";
 
   mypy-boto3-chime-sdk-messaging =
-    buildMypyBoto3Package "chime-sdk-messaging" "1.40.34"
-      "sha256-knAtab953lppnI8SioY6V3nMN6pt/l5p4XEsE3CpDGc=";
+    buildMypyBoto3Package "chime-sdk-messaging" "1.40.59"
+      "sha256-gsvetyYmOYS5KzGzMN0elAXNDLrwYABwLwLMqS7AHoA=";
 
   mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.40.42"
-      "sha256-axa2niA9HlLpV9Tf01p0fG2GhK2lNlCM/O8LLPHQVRc=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.40.58"
+      "sha256-yJHnaO8KvjYYWiJF8c4lrnf6Px2FyjSsMZsSjVFdkE0=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.40.45"
-      "sha256-a4FbYJ7O9YpOfT90vAZdxmDDdDHsITCwLjNSAeYtrco=";
+    buildMypyBoto3Package "cleanrooms" "1.40.63"
+      "sha256-qmN6w6OGOBjOfEcb7bb24niw4cgot1UPyzFPmZeHgXM=";
 
   mypy-boto3-cloud9 =
-    buildMypyBoto3Package "cloud9" "1.40.20"
-      "sha256-zmouqL+B2KyYC1dgmlJBODK3iOftfvFmKCSTUB+paWU=";
+    buildMypyBoto3Package "cloud9" "1.40.61"
+      "sha256-iS3jyYE2WKaSTegaRLK9jnWd2UxzqPR9F1dpuB2D1mo=";
 
   mypy-boto3-cloudcontrol =
-    buildMypyBoto3Package "cloudcontrol" "1.40.0"
-      "sha256-38IFJI1enFd6XnWe81zuf80N23Orfl1CUCRt57g0zEE=";
+    buildMypyBoto3Package "cloudcontrol" "1.40.63"
+      "sha256-oFy3Q1W7tGdeXbMphjF7pYJjs1WVbKRQok/GQbjwbGs=";
 
   mypy-boto3-clouddirectory =
-    buildMypyBoto3Package "clouddirectory" "1.40.16"
-      "sha256-fFnHwgB8r239cpVnWSfeiGO1MNOxkXn9MNMUA5ohm04=";
+    buildMypyBoto3Package "clouddirectory" "1.40.63"
+      "sha256-icJPjlbaZhbXRImXTU+guTKyEln0Dg/VCbQLOVKhZvw=";
 
   mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.40.44"
-      "sha256-PYL1UEOCyGrRlaG4CiqC9zWHw34bY2hk67hd1DvXmls=";
+    buildMypyBoto3Package "cloudformation" "1.40.57"
+      "sha256-/JUfWJH6NFtSVpc/OKhDbYCkKJxcYh1S/py3v2Q0i34=";
 
   mypy-boto3-cloudfront =
-    buildMypyBoto3Package "cloudfront" "1.40.50"
-      "sha256-jw169fraZHj0tHiu8ZJTqLu/FrBWVBnePNvtp6V3UUs=";
+    buildMypyBoto3Package "cloudfront" "1.40.55"
+      "sha256-3md69cxJv7R4cXqznJtz4+r6MvFw22EckaYzCfBJS28=";
 
   mypy-boto3-cloudhsm =
-    buildMypyBoto3Package "cloudhsm" "1.40.15"
-      "sha256-qr7Okanc/7cgrb31a6mxb23S8nvw3iztCcbGNHcMIhk=";
+    buildMypyBoto3Package "cloudhsm" "1.40.57"
+      "sha256-XlV7rtzGlcL4iTrJmADZQdlvtAJFBDEUlP1kkeI9kQU=";
 
   mypy-boto3-cloudhsmv2 =
-    buildMypyBoto3Package "cloudhsmv2" "1.40.20"
-      "sha256-t5daUK4Nv1R+9uvRYdbOvDWP77A1GhH34w4XkCdIkb0=";
+    buildMypyBoto3Package "cloudhsmv2" "1.40.57"
+      "sha256-T9ek0te0KDC5Z3kdsprbEm9LvmlfbSW7Nnoi5s4hGWg=";
 
   mypy-boto3-cloudsearch =
-    buildMypyBoto3Package "cloudsearch" "1.40.17"
-      "sha256-bnLdoUOM0daHl74qUUfv6RO6Mqkk8Su97RzCjKettQQ=";
+    buildMypyBoto3Package "cloudsearch" "1.40.63"
+      "sha256-EdwdwO83n4Gx3zcDeQtW9vHj0mg/wVXL+/REyWvNjK8=";
 
   mypy-boto3-cloudsearchdomain =
-    buildMypyBoto3Package "cloudsearchdomain" "1.40.20"
-      "sha256-a+XyFwXb5YGI9/Z5+Qh5TOfJssHJR6j8oJNwl47sObA=";
+    buildMypyBoto3Package "cloudsearchdomain" "1.40.61"
+      "sha256-yFnrI6ZpnJG/zBbc+MrlNOXwYTGT3ANOUETi2aC38cM=";
 
   mypy-boto3-cloudtrail =
-    buildMypyBoto3Package "cloudtrail" "1.40.0"
-      "sha256-aV+fpcURVMZv7jOsZ/LF6edo4doNZPtCwdG4YEGKMYc=";
+    buildMypyBoto3Package "cloudtrail" "1.40.59"
+      "sha256-e8ET+aC49Vl4JOIPFlaglzM3e34HmrbvJPyOj4yLQeo=";
 
   mypy-boto3-cloudtrail-data =
-    buildMypyBoto3Package "cloudtrail-data" "1.40.17"
-      "sha256-ghgArlI9Z/rk9kM6k6b+0x/Fugp7q25+uV+Y2dZFtSU=";
+    buildMypyBoto3Package "cloudtrail-data" "1.40.58"
+      "sha256-ywvJwaPTrQIoZ6xrQtK1/7FFVMM59ls1HOCUFSA9Pv0=";
 
   mypy-boto3-cloudwatch =
-    buildMypyBoto3Package "cloudwatch" "1.40.38"
-      "sha256-JCKTfyeEvYsw8b2EOGJVh+Y6lgpzMFecj2y35o3K9Mo=";
+    buildMypyBoto3Package "cloudwatch" "1.40.63"
+      "sha256-rIshJJ2HohBPXYlWF+y3KY7GuS5adzYWrjll0Y7HqZU=";
 
   mypy-boto3-codeartifact =
-    buildMypyBoto3Package "codeartifact" "1.40.17"
-      "sha256-XqaCY0uawL5BKmcTl1D3uz1EgsKn3wtph036TX07/Fg=";
+    buildMypyBoto3Package "codeartifact" "1.40.60"
+      "sha256-mVqTF57DFNmD5JVbc0WUeJMV+rHfQG8uVorQ/vd/RkU=";
 
   mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.40.8"
-      "sha256-D3uNdpK45WYJfwf1mr12+e+7uw0dj7ChCmSDel0cNw4=";
+    buildMypyBoto3Package "codebuild" "1.40.58"
+      "sha256-IluCF13Ch70pP6vikKKgr0eN/SeiFLb8Cnxio6S58AU=";
 
   mypy-boto3-codecatalyst =
-    buildMypyBoto3Package "codecatalyst" "1.40.0"
-      "sha256-cPLylCvda6iHWRcPMVaL/qEkeg7EzBs38G2mX1eP0ZI=";
+    buildMypyBoto3Package "codecatalyst" "1.40.63"
+      "sha256-ecfKyHRa435PMsQppEie2wFYN9CE1HcQUZSd3TLe7z8=";
 
   mypy-boto3-codecommit =
-    buildMypyBoto3Package "codecommit" "1.40.18"
-      "sha256-+T9NGuE7gN1OjOBhIU8QCo09FiAQ1qdiABitoQpDZrk=";
+    buildMypyBoto3Package "codecommit" "1.40.63"
+      "sha256-jKSLa9U393dahneBYIzFpHPa57EtcqJ3rJvB62EsKlU=";
 
   mypy-boto3-codedeploy =
-    buildMypyBoto3Package "codedeploy" "1.40.20"
-      "sha256-1YBZlgDBAmYmkSgI0BGWAlyDGwSEjISd+NDqk2PPlbI=";
+    buildMypyBoto3Package "codedeploy" "1.40.63"
+      "sha256-sD53LSKVeYIipxKLw8SBR2zcxksM01zfVQhHtW5fZkA=";
 
   mypy-boto3-codeguru-reviewer =
-    buildMypyBoto3Package "codeguru-reviewer" "1.40.20"
-      "sha256-ijOEA6FwLfHIUa+Tt6OQek7oJ4bJf4tRG+Q2QeIh1Rk=";
+    buildMypyBoto3Package "codeguru-reviewer" "1.40.57"
+      "sha256-0gWiYnCPGcCc4CWDKOrlQxYjnGzB+rC8bWPBth4W5ZQ=";
 
   mypy-boto3-codeguru-security =
-    buildMypyBoto3Package "codeguru-security" "1.40.17"
-      "sha256-LT2Fi8LHrgRgYz6HnKyRB14Vl+PjCjTx/EF8s5D2hhw=";
+    buildMypyBoto3Package "codeguru-security" "1.40.61"
+      "sha256-NQ5S5zqviRDtAkdYT5yjNikvH1ki7Vqt2+AzAAcHr5A=";
 
   mypy-boto3-codeguruprofiler =
-    buildMypyBoto3Package "codeguruprofiler" "1.40.19"
-      "sha256-hQ2gveiEQoG4pVqOGDs7eOFCuVaPbyACErsmQxfWo3I=";
+    buildMypyBoto3Package "codeguruprofiler" "1.40.60"
+      "sha256-5KmJ2LCWn0Fc7AGfKe4bB60r5Yvlu+aEYLk37kh4xyc=";
 
   mypy-boto3-codepipeline =
-    buildMypyBoto3Package "codepipeline" "1.40.0"
-      "sha256-wWJVXhlaRSBmDs0rA+Uqa36yBShPzUqFYB7qkkTCteg=";
+    buildMypyBoto3Package "codepipeline" "1.40.59"
+      "sha256-2DJafQV9fGFILCPSFZD/oEx3joh1tDOqJLl7KbU4djk=";
 
   mypy-boto3-codestar =
     buildMypyBoto3Package "codestar" "1.35.0"
       "sha256-B9Aq+hh9BOzCIYMkS21IZYb3tNCnKnV2OpSIo48aeJM=";
 
   mypy-boto3-codestar-connections =
-    buildMypyBoto3Package "codestar-connections" "1.40.18"
-      "sha256-NNVGx+fN0apfT84GbtQjK6YX30bIomIPUaK9RFOsrVQ=";
+    buildMypyBoto3Package "codestar-connections" "1.40.58"
+      "sha256-cAx1/vNghHwT3nx9ExfLw9jS/T6TqVkVhmXZrqI+OHQ=";
 
   mypy-boto3-codestar-notifications =
-    buildMypyBoto3Package "codestar-notifications" "1.40.17"
-      "sha256-uzTn5MwCM6dkY5P9/tLfZqOfdKVvBClMxMkG9vgnx/4=";
+    buildMypyBoto3Package "codestar-notifications" "1.40.55"
+      "sha256-MWnreUSpk4QdquRu1X4/HL9imPSYgl4fJz1BxJvcyPk=";
 
   mypy-boto3-cognito-identity =
-    buildMypyBoto3Package "cognito-identity" "1.40.15"
-      "sha256-dcRx6MHTZl2tdroNAqvkTtj74tbMULAlw5pkWs57NOk=";
+    buildMypyBoto3Package "cognito-identity" "1.40.57"
+      "sha256-IvcJJ7cUxoykNC7fryAtZ3w1WMypqj0jgBUoo/rGA7Q=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.40.14"
-      "sha256-g79jptfBbK/WuUeQDMnEogENZ0ysf1UKfMFa1fzlWkU=";
+    buildMypyBoto3Package "cognito-idp" "1.40.60"
+      "sha256-TgZlbzlU4ZPk3/aQQrwhTbXvV167tgahtfy23D1v0y4=";
 
   mypy-boto3-cognito-sync =
-    buildMypyBoto3Package "cognito-sync" "1.40.16"
-      "sha256-NFaYYsnZD0MlDKl7t9FCMLV2eo/WH34ach4o6N/xrm0=";
+    buildMypyBoto3Package "cognito-sync" "1.40.63"
+      "sha256-PzwZSGvdN1+tNmWZPOlZErP5WWk2eE0pE7XCh2/5AJc=";
 
   mypy-boto3-comprehend =
-    buildMypyBoto3Package "comprehend" "1.40.15"
-      "sha256-8lrg38NrNjdyZ/8qKsD1glKqnzrwPvkQ1RAk3qiCi3Q=";
+    buildMypyBoto3Package "comprehend" "1.40.60"
+      "sha256-gQmIff1GMX6A9QYm+CHC6wYIOt8XEGx72xmHmEg4ggA=";
 
   mypy-boto3-comprehendmedical =
-    buildMypyBoto3Package "comprehendmedical" "1.40.18"
-      "sha256-z/pN67x0vam1aGd+24ZJHSdOp04A/Di179ymtUw/61Q=";
+    buildMypyBoto3Package "comprehendmedical" "1.40.57"
+      "sha256-P/frAydh31frX9xNis2vyi2XbswpcA0BJXW8TJKncFg=";
 
   mypy-boto3-compute-optimizer =
-    buildMypyBoto3Package "compute-optimizer" "1.40.0"
-      "sha256-CSfC9Kg73LydRU5aH4kqdc0pJWqEf98ebu6FOBE7oVU=";
+    buildMypyBoto3Package "compute-optimizer" "1.40.63"
+      "sha256-9dwQLNrI8jlK7ay0r8rfNRLIgJhptrtMi94iZW+YzA8=";
 
   mypy-boto3-config =
-    buildMypyBoto3Package "config" "1.40.35"
-      "sha256-MIxmEy+/mlDwWKpHrb0jo8Yu1C7+xP6JRNvUeDmlfZ0=";
+    buildMypyBoto3Package "config" "1.40.58"
+      "sha256-Nan0PBHJ2VtjEhORN0OdUC9TCuCNtOpICQ8WRHn6/YI=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.40.52"
-      "sha256-Y4inB+VA4aWEsef389vf2K0K6uvGxsAugtetxnKCSfU=";
+    buildMypyBoto3Package "connect" "1.40.57"
+      "sha256-bLIiGOeSI9DCIxqUQx6+g5wnidyceT7lxbj5i0rhpdg=";
 
   mypy-boto3-connect-contact-lens =
-    buildMypyBoto3Package "connect-contact-lens" "1.40.0"
-      "sha256-sRuNGX0Xy9sQmHpWZtjbMYTSFgAzTAuNke4uHINz9q8=";
+    buildMypyBoto3Package "connect-contact-lens" "1.40.58"
+      "sha256-yP3OeePZc8Fb257lzsB8rQsahaz5/zqiH+XAQUUf9Ls=";
 
   mypy-boto3-connectcampaigns =
-    buildMypyBoto3Package "connectcampaigns" "1.40.0"
-      "sha256-nAOKVy+aH2gw8NZ8cNSYqQ0kFWV4Gb4oU6y1vHz3fpI=";
+    buildMypyBoto3Package "connectcampaigns" "1.40.60"
+      "sha256-q5aHrusyuFPI1ItuoaFskLoRQmDkBLwjV/Sch+G2l+U=";
 
   mypy-boto3-connectcases =
-    buildMypyBoto3Package "connectcases" "1.40.44"
-      "sha256-T4E5rin+Y0DJWARRqzA7agLwcF11v4CGy/Fe/x/F7vY=";
+    buildMypyBoto3Package "connectcases" "1.40.64"
+      "sha256-qizL2lYo7Un0mJtAdyksYV4dSsk3T4p+9F+9AvQLHmk=";
 
   mypy-boto3-connectparticipant =
-    buildMypyBoto3Package "connectparticipant" "1.40.18"
-      "sha256-FT+D1wlBL1dYus9PuLPxIxhj17WCg1nYqzT3dUn32+g=";
+    buildMypyBoto3Package "connectparticipant" "1.40.57"
+      "sha256-BiKly8tW0MFacKF8mG80xsITdxegCcG3sKal7axoGf0=";
 
   mypy-boto3-controltower =
-    buildMypyBoto3Package "controltower" "1.40.0"
-      "sha256-boRrDWiYtyKWUimJ7yb3uYPGSB/tmI2sEXNFacAPDic=";
+    buildMypyBoto3Package "controltower" "1.40.60"
+      "sha256-1xHVUCYTzIWYU7RLk8MzqF3/5qfItTeIXC7um4ZgIwI=";
 
   mypy-boto3-cur =
-    buildMypyBoto3Package "cur" "1.40.17"
-      "sha256-QRwEUkDj7S0/VuQrcwuPWqKnzXEN6NYUSakhT+9T2wk=";
+    buildMypyBoto3Package "cur" "1.40.58"
+      "sha256-XL3m3E1aFsbSVOvKg6bydMYLWaGRYL0RxcZA04Z9T0A=";
 
   mypy-boto3-customer-profiles =
-    buildMypyBoto3Package "customer-profiles" "1.40.42"
-      "sha256-9zxTdvAc7+MgUM1KZJndXBCc0qL6jp50u7I93zZXrJY=";
+    buildMypyBoto3Package "customer-profiles" "1.40.54"
+      "sha256-mbbRVnRyCe97wfrWg5glIWmxx9czOCmJC4OrUVYRnYI=";
 
   mypy-boto3-databrew =
-    buildMypyBoto3Package "databrew" "1.40.20"
-      "sha256-9JhxzPHEhFmwT8LQTzbwdY7XG8whoIxGKGLLyn09bDM=";
+    buildMypyBoto3Package "databrew" "1.40.54"
+      "sha256-x9YaYbLf/qq9OGLs2jhjap7TbgK8+HmADcnu+szrxvE=";
 
   mypy-boto3-dataexchange =
-    buildMypyBoto3Package "dataexchange" "1.40.0"
-      "sha256-VVmG1myGH8FJpqQ63GDMYH5KVAPsv+Pmnc/WxHpTcHs=";
+    buildMypyBoto3Package "dataexchange" "1.40.54"
+      "sha256-iyXEvp4dra76CPor7FK8xsZ4zVojFv1+IcmAKlXcB7k=";
 
   mypy-boto3-datapipeline =
-    buildMypyBoto3Package "datapipeline" "1.40.19"
-      "sha256-VBJsQqd5m5RfO+tJklYHd+pk2zqpqyDXO4BmRGdFxS4=";
+    buildMypyBoto3Package "datapipeline" "1.40.59"
+      "sha256-X2gx7/NU3S51nHh2nRHeXQzOmnK+kk8DCPhbkFDtVMM=";
 
   mypy-boto3-datasync =
-    buildMypyBoto3Package "datasync" "1.40.42"
-      "sha256-utMenSLve20f+TKyA5xeoAGTEPlizo7uQJSEKt2gq68=";
+    buildMypyBoto3Package "datasync" "1.40.55"
+      "sha256-0PHiMXZVyihKJTXEXP8U1fPt7LLGx+4EsJhXbk6VzTY=";
 
   mypy-boto3-dax =
-    buildMypyBoto3Package "dax" "1.40.38"
-      "sha256-jzNdzI1E16m8/5XdD4nKVfyYFbisU5Kc59+0Ei+cnDo=";
+    buildMypyBoto3Package "dax" "1.40.60"
+      "sha256-7D+DnOkoDtXXrLx9orqg9WXtlnpSyQFAqgBlV3hJu1Q=";
 
   mypy-boto3-detective =
-    buildMypyBoto3Package "detective" "1.40.14"
-      "sha256-QDNLIgNekgueP8XNyBbRpT1NbD+ZwxQ2OzWU4aF9/GM=";
+    buildMypyBoto3Package "detective" "1.40.61"
+      "sha256-jF4evznD25FHYGxNEyS7x4RAbElEWMyv8Fk2uEqRxwg=";
 
   mypy-boto3-devicefarm =
-    buildMypyBoto3Package "devicefarm" "1.40.0"
-      "sha256-6v65flOExW7V8UfoyPaBcUQDYjhJ2jyuQpXMZW+ajCI=";
+    buildMypyBoto3Package "devicefarm" "1.40.57"
+      "sha256-qekCLt6+vbE6AKkuNG6x/0m72NDOK2v8uCAP6gYWHTY=";
 
   mypy-boto3-devops-guru =
-    buildMypyBoto3Package "devops-guru" "1.40.17"
-      "sha256-cDV8kPjBB3Mu5cqsAVsRjTk6KMozwEMHx/Fu0SRp5EQ=";
+    buildMypyBoto3Package "devops-guru" "1.40.63"
+      "sha256-saiHuNzlpD9LKnRpQVRaqIz1KPdWbB0wUm1kchmSqGI=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.40.10"
-      "sha256-ZM9nCSSzMmRjyxnypQcaORwYXiXMXz25Gw2dJlOVcc0=";
+    buildMypyBoto3Package "directconnect" "1.40.57"
+      "sha256-tmPAUD/9Y/HxJHzYyiRd+U/0emjnaz8LGRy4y9VeIpk=";
 
   mypy-boto3-discovery =
-    buildMypyBoto3Package "discovery" "1.40.19"
-      "sha256-dq0rCFW8Cc9nQkRNNYaZs092nOjLqdob7rziv/WDNfo=";
+    buildMypyBoto3Package "discovery" "1.40.58"
+      "sha256-Agrg2tHTdQfvdDeTEE054rMzKKwEiFWdcLjMFrItn9U=";
 
   mypy-boto3-dlm =
-    buildMypyBoto3Package "dlm" "1.40.18"
-      "sha256-Qx3IAePD2OHEnXHG3O2U1aRcH3Tf/6WUrjrn1uZXmwE=";
+    buildMypyBoto3Package "dlm" "1.40.54"
+      "sha256-cCVm6rzKk9TX7/LamWAPgN/nGWzwlbx/e+v/rDeAPRY=";
 
   mypy-boto3-dms =
-    buildMypyBoto3Package "dms" "1.40.43"
-      "sha256-Is9yMouO7WxY/P7ViK+s8Y1q8Y7KvTvY7X/H4ndeG6s=";
+    buildMypyBoto3Package "dms" "1.40.58"
+      "sha256-wGVRK+B6DoxsK++kNZEWQdWozrpPHr7jGOzq3D52xE4=";
 
   mypy-boto3-docdb =
-    buildMypyBoto3Package "docdb" "1.40.16"
-      "sha256-qpxQc8Zq/XAJJBKaAVFnoGlfVL/08lh+HqT2ix/UDOc=";
+    buildMypyBoto3Package "docdb" "1.40.63"
+      "sha256-N0RWxdWolQadRfOC2zoJrixVNjtcZdA6hlmwjbeKUrQ=";
 
   mypy-boto3-docdb-elastic =
-    buildMypyBoto3Package "docdb-elastic" "1.40.0"
-      "sha256-TKVaVd92g+2bV5NNRnLuVZQw0lZycTyeyjB6UgV+iHc=";
+    buildMypyBoto3Package "docdb-elastic" "1.40.58"
+      "sha256-km3Ehr7fWD0uXhLAa/I/5shLYcCFk8zoZLSc6XlTJMs=";
 
   mypy-boto3-drs =
-    buildMypyBoto3Package "drs" "1.40.0"
-      "sha256-dtw54zAzP4HddWx0kZr7SzxmWiKCiiP6g4+aDRRid2k=";
+    buildMypyBoto3Package "drs" "1.40.58"
+      "sha256-tT1e3Z4awdzkq63uP99dhKQruzr6u3gMSRI8xsxxPCY=";
 
   mypy-boto3-ds =
-    buildMypyBoto3Package "ds" "1.40.42"
-      "sha256-gKzshS6Q6O/lTAsrkuXOvKkGz+ECRlmSeb5NxNCBim8=";
+    buildMypyBoto3Package "ds" "1.40.55"
+      "sha256-obbn0FjZQDwFucsnH3N1+zfe1aWFE5PWHUWiLAeupqA=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.40.44"
-      "sha256-WPo6Y4scrvVkS2D1iU4RgqKVH+swo9xt7bNOGwyd7Zk=";
+    buildMypyBoto3Package "dynamodb" "1.40.56"
+      "sha256-V23RL+ESV1QGbn+kgPksEjIglwqdafdmOlbXAfKXisU=";
 
   mypy-boto3-dynamodbstreams =
-    buildMypyBoto3Package "dynamodbstreams" "1.40.40"
-      "sha256-TgENR4bY5AHy0hqJkTq63jApASafB6agMPFPYDlzJ7A=";
+    buildMypyBoto3Package "dynamodbstreams" "1.40.59"
+      "sha256-EjeOxjAJluU8bI7i6TbDpO2Jp5e3xhVS9VKho5SkK6c=";
 
   mypy-boto3-ebs =
-    buildMypyBoto3Package "ebs" "1.40.15"
-      "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA=";
+    buildMypyBoto3Package "ebs" "1.40.58"
+      "sha256-eKwS+FXicnxiHr2aTDG+ih6kDxQ24NLCkI9XPt2LjvQ=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.52"
-      "sha256-5X7I+IrUOxothFVyw3gPP7xCq5gPXTQplA372U6rwRc=";
+    buildMypyBoto3Package "ec2" "1.40.64"
+      "sha256-6+jjuG6iqXLjjuztY1FX/exSl5BjdKsrg1EOQM1w0Io=";
 
   mypy-boto3-ec2-instance-connect =
-    buildMypyBoto3Package "ec2-instance-connect" "1.40.20"
-      "sha256-x5DKz6GllTWBgkzFPnZehs7Fh3YgWGZlnJG/chPqds4=";
+    buildMypyBoto3Package "ec2-instance-connect" "1.40.57"
+      "sha256-NoZvHoanGVZhfvYyVTKcpF8RTd1ZZ2BuYCQ+QG6xPy0=";
 
   mypy-boto3-ecr =
-    buildMypyBoto3Package "ecr" "1.40.0"
-      "sha256-dzPkK8ipL/2Tvr8DQ68TP9UmmP/r0yPYL/3nVc4oaH8=";
+    buildMypyBoto3Package "ecr" "1.40.58"
+      "sha256-MZGkIOxN8ey10r3CpN4ul+mD3/rpxOE4wqpNKDkSqYU=";
 
   mypy-boto3-ecr-public =
-    buildMypyBoto3Package "ecr-public" "1.40.15"
-      "sha256-mkaBmHn3LsOHnH4kTWkGbCsL4w/TrPBt/pBXnj+1Ai8=";
+    buildMypyBoto3Package "ecr-public" "1.40.58"
+      "sha256-gyNKT8yjYFgDgEvBgUIvC0iVKIOLaCbLWcF9eYzQWUQ=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.40.43"
-      "sha256-wVaLCKZXJJG32j2dUjzxj1Q2slgulxZ8xhqKXWenTUc=";
+    buildMypyBoto3Package "ecs" "1.40.63"
+      "sha256-4cZrAPPo9rol9c+KFPYKaZZK1vQB2WYl34TiJfEbWco=";
 
   mypy-boto3-efs =
-    buildMypyBoto3Package "efs" "1.40.0"
-      "sha256-DQZUI72cnRt4YwHMQivMdL4y9B9EN2H7dIMmybcX/Uk=";
+    buildMypyBoto3Package "efs" "1.40.61"
+      "sha256-yS4h39MrC5jCVbAK5YhX7OSzyiG0RTEUPR8e4olV7TE=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.40.36"
-      "sha256-xlT0PW+10gO1jpddeCR82y+4+A9e1SNK756ph8/1Iik=";
+    buildMypyBoto3Package "eks" "1.40.59"
+      "sha256-Nk8AtGt8XKyBvEvQzjvmG0M3lsdqJuwrNvZqqU/t4xM=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.36.0"
       "sha256-duU3LIeW3FNiplVmduZsNXBoDK7vbO6ecrBt1Y7C9rU=";
 
   mypy-boto3-elasticache =
-    buildMypyBoto3Package "elasticache" "1.40.19"
-      "sha256-YaNGVCO/MGDn/9YQBquhqqg1YHmJK3grdk/wVdF4erQ=";
+    buildMypyBoto3Package "elasticache" "1.40.63"
+      "sha256-o4EYOb30TxE+tLIKdEMVSEyyRSJ082ZwkavHHeUDr+0=";
 
   mypy-boto3-elasticbeanstalk =
-    buildMypyBoto3Package "elasticbeanstalk" "1.40.15"
-      "sha256-TMfQt3rK4aT7DnlJCbJj7sFrDL9NqQc4kQS8sdTdDS0=";
+    buildMypyBoto3Package "elasticbeanstalk" "1.40.60"
+      "sha256-V5RG19bh6X/6Q72i5Zk0QO04uxbQdwo7PO6yNL1Stmk=";
 
   mypy-boto3-elastictranscoder =
-    buildMypyBoto3Package "elastictranscoder" "1.40.18"
-      "sha256-ObCzDvt0o59FXWw3bAh67Gh1QJNx7HjDEE0pMCcHkCs=";
+    buildMypyBoto3Package "elastictranscoder" "1.40.61"
+      "sha256-82MHEMIrohyKqBE7o822pDM3xjq3lJGwskyZyFxGNpA=";
 
   mypy-boto3-elb =
-    buildMypyBoto3Package "elb" "1.40.16"
-      "sha256-9LKKt1qGw/gWS+XtNzmnjk0WOFHAmTuzkj9D3tYuMtU=";
+    buildMypyBoto3Package "elb" "1.40.59"
+      "sha256-Qu/jsynDkXXBRBnJGNqKtmr4aSPwiFJvuFxEqZco428=";
 
   mypy-boto3-elbv2 =
-    buildMypyBoto3Package "elbv2" "1.40.0"
-      "sha256-zxpAc7Z4Vm6Bzdq7bhdekg6HAUKe/3PXRviQ0f8p7NE=";
+    buildMypyBoto3Package "elbv2" "1.40.53"
+      "sha256-TGc78KsQ4y8QSFutN+/cj/gr2iJWi7fYh52OYFCFwho=";
 
   mypy-boto3-emr =
-    buildMypyBoto3Package "emr" "1.40.0"
-      "sha256-crNaa6bqSP7fCsFV5CnAHazDpXrFkkb46ria2LWTDvY=";
+    buildMypyBoto3Package "emr" "1.40.64"
+      "sha256-NxYFJHvE3QifWP6csT3Rp/R0Yd2hYXjSjfe6ds3UQz0=";
 
   mypy-boto3-emr-containers =
-    buildMypyBoto3Package "emr-containers" "1.40.29"
-      "sha256-1TDHCMuGVUm8WlKFmIT0fgSv/9Hdyy4qJLAaNcdrMQE=";
+    buildMypyBoto3Package "emr-containers" "1.40.61"
+      "sha256-uIOqO9W5VRFJtm1iZQsVdWIUomuHnbO6imSNBNBosMA=";
 
   mypy-boto3-emr-serverless =
-    buildMypyBoto3Package "emr-serverless" "1.40.0"
-      "sha256-9Iz9FapUQCWa9bjmH0Ar9O1mtTv+ovWlxikddb5+Wlc=";
+    buildMypyBoto3Package "emr-serverless" "1.40.63"
+      "sha256-6UY8UreMCPqP2EA/HJNwXLmVnbtSM1rA/iRm/r/+Ng4=";
 
   mypy-boto3-entityresolution =
-    buildMypyBoto3Package "entityresolution" "1.40.37"
-      "sha256-n5aa7oK/37pT1f+xFXu8Sp3LfO1UAcUljCqdtSZ/fPQ=";
+    buildMypyBoto3Package "entityresolution" "1.40.60"
+      "sha256-/ZqIN1Rrjblo4mhDYVqEoGkQb5TC+A2aKP26ORnB8lw=";
 
   mypy-boto3-es =
-    buildMypyBoto3Package "es" "1.40.15"
-      "sha256-nIRSeL+cX4FVozkogF455I0kGhNJUOMauQPOxCtju50=";
+    buildMypyBoto3Package "es" "1.40.55"
+      "sha256-6APIM38Kf9r2QefCAgXcAc9UPUT6+ymH1nu/WYRHcjU=";
 
   mypy-boto3-events =
-    buildMypyBoto3Package "events" "1.40.0"
-      "sha256-NifbOgZ8Q0oUnKchIt04RgMMDBXMiwJJCKDmax3j4Es=";
+    buildMypyBoto3Package "events" "1.40.55"
+      "sha256-mu4434uXtTV2eq8rymiN7uqLDoncFwmdi0slIucwSjQ=";
 
   mypy-boto3-evidently =
-    buildMypyBoto3Package "evidently" "1.40.19"
-      "sha256-v4FSQ3YR4s9hgu7SBhHWebkgSmDFDN5qf1/XKo2zlvs=";
+    buildMypyBoto3Package "evidently" "1.40.55"
+      "sha256-r71o2OkpgGBxh5gy23+OFHqCU0QI6Z/rQSBjDagMfB0=";
 
   mypy-boto3-finspace =
-    buildMypyBoto3Package "finspace" "1.40.18"
-      "sha256-jB4Yb1hX9P8bhY0cprew6S1VgG4G/IVo3OlGuAojQ38=";
+    buildMypyBoto3Package "finspace" "1.40.55"
+      "sha256-7P/MvdQjYmNgda7EZ8GSI0mLPe3o19ETSspd8wL23Ag=";
 
   mypy-boto3-finspace-data =
-    buildMypyBoto3Package "finspace-data" "1.40.17"
-      "sha256-fePfBO2KWcMACejuSer80O2LCEuwh/pjA6wkEpUL9os=";
+    buildMypyBoto3Package "finspace-data" "1.40.55"
+      "sha256-CQzN5qc5N34JKeF0gKoIzVb5wtdc8r2uar+Q6Y2Gd3g=";
 
   mypy-boto3-firehose =
-    buildMypyBoto3Package "firehose" "1.40.0"
-      "sha256-Zzp7VoPaVIHX3KccxlFILesGNJP7f1p63uXLwN3rLcs=";
+    buildMypyBoto3Package "firehose" "1.40.63"
+      "sha256-IdEuluW+mpjEDeuhptskEGDRoqQjylHCv9B2j8sYtrY=";
 
   mypy-boto3-fis =
-    buildMypyBoto3Package "fis" "1.40.20"
-      "sha256-vQKaLV+lEh4zjYhAn1/8lT9cm2xokMrU2sdsoBmfcjc=";
+    buildMypyBoto3Package "fis" "1.40.59"
+      "sha256-FEBW/Vtx+MooC2lNBh9xFA8mWpbLK7qqBWWAnG80kvg=";
 
   mypy-boto3-fms =
-    buildMypyBoto3Package "fms" "1.40.20"
-      "sha256-yBhVmfeAexcJzkxC3AdtWOC4PjCoTDozxYT6qrgEHJ8=";
+    buildMypyBoto3Package "fms" "1.40.64"
+      "sha256-TxHLddGOy2Pa0bld44WQCnkvhb1Gl6ohckI1TNG56uc=";
 
   mypy-boto3-forecast =
-    buildMypyBoto3Package "forecast" "1.40.17"
-      "sha256-PMEWvzCP8gTKwsV9oIjqIB7jIMDZDjLqdPO/G7nnfDc=";
+    buildMypyBoto3Package "forecast" "1.40.60"
+      "sha256-2Ss/RklPHOle20l+feRjCS+fwgK5G1v2xhQsL20lDkM=";
 
   mypy-boto3-forecastquery =
-    buildMypyBoto3Package "forecastquery" "1.40.15"
-      "sha256-QPQz6ou7edU28tUPuoFq4v3Hnz/uASm46c7TMSOy+WY=";
+    buildMypyBoto3Package "forecastquery" "1.40.57"
+      "sha256-isp1Xxwze6EL2Be4I881yiGnQh9zcXVPXZ768Cz/Y68=";
 
   mypy-boto3-frauddetector =
-    buildMypyBoto3Package "frauddetector" "1.40.19"
-      "sha256-BpY3WWeFvaGfDaGk/dxJijSK3giz7wrgvHk/lKOaxzk=";
+    buildMypyBoto3Package "frauddetector" "1.40.63"
+      "sha256-Qex9NGctqp5L2XkIxw6J9t4C5rqVzDmNCKWzQLI+040=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.40.42"
-      "sha256-phgje7MZt9KoKUb6bQYqZ4/BqjYflEDPJ/uN7J04zuE=";
+    buildMypyBoto3Package "fsx" "1.40.64"
+      "sha256-b3G9urLiNhC/8SnEqRBTlm/ns1vi7KtVqZzZ2U8G6kw=";
 
   mypy-boto3-gamelift =
-    buildMypyBoto3Package "gamelift" "1.40.0"
-      "sha256-KgMMWys21dHhDP9kQjxPeQtJBWfiOeSCtwuE9FIAzk8=";
+    buildMypyBoto3Package "gamelift" "1.40.54"
+      "sha256-p8iNFeQAwp5WdsqHNA8+mMBNvt6y1t6+erP2APopH0Y=";
 
   mypy-boto3-glacier =
-    buildMypyBoto3Package "glacier" "1.40.18"
-      "sha256-lEYmHnV9ADvj1BqZEeEBakiPLkfFNg4eUjx/ByEnrLQ=";
+    buildMypyBoto3Package "glacier" "1.40.61"
+      "sha256-5GWnSiMWIxQbof20i0u12lVpONLUo54NII96puTXdoE=";
 
   mypy-boto3-globalaccelerator =
-    buildMypyBoto3Package "globalaccelerator" "1.40.18"
-      "sha256-DS2Bb39wrP+k2H2oxkm13WzRyF6cX96P0JgF2OXAdMA=";
+    buildMypyBoto3Package "globalaccelerator" "1.40.54"
+      "sha256-NkEe4fOx9ZH6SHfa3A8UHXLyxIgjVGvy4UL+HkUiCDA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.50"
-      "sha256-1LgvvSs/ZFxrCT/7MhZDATFUI6az5yTAhuc41QQ1kGk=";
+    buildMypyBoto3Package "glue" "1.40.63"
+      "sha256-1nuI+XZIfxrcCxdyyK090Gqq6UojBGkkq9TRu1PbJLk=";
   mypy-boto3-grafana =
-    buildMypyBoto3Package "grafana" "1.40.0"
-      "sha256-KQqyk9PFUttzDrZW7viev8xbumdud05EBdNoxz//hEY=";
+    buildMypyBoto3Package "grafana" "1.40.54"
+      "sha256-GeYE+d3wv+KTcS0ve0ftTLXazGS5a5KMQmVMXMl9jtM=";
 
   mypy-boto3-greengrass =
-    buildMypyBoto3Package "greengrass" "1.40.18"
-      "sha256-2LlUVjYGni7omje8tlvAJNkKDVSbVIF4mnUNzb01lUQ=";
+    buildMypyBoto3Package "greengrass" "1.40.60"
+      "sha256-+H/q11j6CwdS40V1BO8890nBwOYKo2JCz/plaemZHJY=";
 
   mypy-boto3-greengrassv2 =
-    buildMypyBoto3Package "greengrassv2" "1.40.15"
-      "sha256-/O+fM3MU2HtFIt1S8+yE3RG59dsHKwJbnINaVmYUnD0=";
+    buildMypyBoto3Package "greengrassv2" "1.40.63"
+      "sha256-Q4Qxdpy59x3JkyJ3I54xRvGk789J6mhWtpLZcSWqr/A=";
 
   mypy-boto3-groundstation =
-    buildMypyBoto3Package "groundstation" "1.40.0"
-      "sha256-/LlMFYC7cJWb9C5JIt0dTEPtl2sPsalSq7mYaFSf3c4=";
+    buildMypyBoto3Package "groundstation" "1.40.61"
+      "sha256-5o+ypZ8WRwWjRIcwVGT3MEkKziqI7/OXKWCULlumfFY=";
 
   mypy-boto3-guardduty =
-    buildMypyBoto3Package "guardduty" "1.40.44"
-      "sha256-vOTVkra2RG5DPgcegpDij+6tjWkY01b6zXoSIze8AZ8=";
+    buildMypyBoto3Package "guardduty" "1.40.53"
+      "sha256-gTfRwvZekeaQ8V7QgepE4S+i134YQiJ1UXDTU+otVZ8=";
 
   mypy-boto3-health =
-    buildMypyBoto3Package "health" "1.40.0"
-      "sha256-c/QCgM8mWIAe76C7e3+g9z3i/ukvOz9QGungofo2hY8=";
+    buildMypyBoto3Package "health" "1.40.64"
+      "sha256-sakRBiIRCBnOmEy171tY5496TT8GpWvw4IH0Su0plXk=";
 
   mypy-boto3-healthlake =
-    buildMypyBoto3Package "healthlake" "1.40.20"
-      "sha256-CzEuUubTbrx+BsfOfRgqjykewZfsnMqRNAqWalAfS9o=";
+    buildMypyBoto3Package "healthlake" "1.40.58"
+      "sha256-7ZJCrUmzKbFx9Aa4liqUCdNlZGS6fv0FHtifdm3vofw=";
 
   mypy-boto3-iam =
-    buildMypyBoto3Package "iam" "1.40.0"
-      "sha256-uQCsVXN1Qo8LvDeqJP3SkB4ttwGK5E4Kr5nsD4SijUQ=";
+    buildMypyBoto3Package "iam" "1.40.60"
+      "sha256-it5eBglvWR52rgxyYV5Y4Q1XeAdnsORpFheZ3ZLfoCo=";
 
   mypy-boto3-identitystore =
-    buildMypyBoto3Package "identitystore" "1.40.18"
-      "sha256-nOj8fkesQ6iVsoLwa/29LYl9X16UUL13k7M2rTEln0U=";
+    buildMypyBoto3Package "identitystore" "1.40.54"
+      "sha256-A9nivPF85KQUnfo2aF6a50NTSxox2OlXXS4MuxNnZ1g=";
 
   mypy-boto3-imagebuilder =
-    buildMypyBoto3Package "imagebuilder" "1.40.41"
-      "sha256-vGem/ZZqqYL3sjrf2gTlMx/YTB+lHcG9lJcJLjGRkOk=";
+    buildMypyBoto3Package "imagebuilder" "1.40.55"
+      "sha256-v56hBI3Gl4FzwyFumRZRZb0Q4LXPjiLAgjZubWl5/aM=";
 
   mypy-boto3-importexport =
     buildMypyBoto3Package "importexport" "1.40.0"
       "sha256-ba01dCNMlcTw/+WrulQkCtDagcPO7FF94cgkY14Pgsg=";
 
   mypy-boto3-inspector =
-    buildMypyBoto3Package "inspector" "1.40.19"
-      "sha256-9+HawjY2kx6JE+UABDKApvTYLzQqx/eBQ3ORQ5M0fq0=";
+    buildMypyBoto3Package "inspector" "1.40.59"
+      "sha256-hICeUgAlM80gO3gA7UO9mk8GaqfS1fMp4Wb+OU67+qg=";
 
   mypy-boto3-inspector2 =
-    buildMypyBoto3Package "inspector2" "1.40.6"
-      "sha256-A8fOl2LR+moh+/OAjPY3iufppLaFSxHlwMjxzZbyfOU=";
+    buildMypyBoto3Package "inspector2" "1.40.57"
+      "sha256-SPXw1zpz4Dug1fcjVUO1Wis20kTAZeEmpyopd2vDGAg=";
 
   mypy-boto3-internetmonitor =
-    buildMypyBoto3Package "internetmonitor" "1.40.0"
-      "sha256-mZfvKN+x91U1yjBwo4pKZN6jCnUMbl8SnwWF3IMx+ko=";
+    buildMypyBoto3Package "internetmonitor" "1.40.58"
+      "sha256-mj2Pf4PNgBS0sBbTkKuszIcaBHf5kTwNzR3BYgoI5JM=";
 
   mypy-boto3-iot =
-    buildMypyBoto3Package "iot" "1.40.0"
-      "sha256-0AUK0HaqmoLVbbLDcsagUZX7KkFF9zU7obO0BmcK8+s=";
+    buildMypyBoto3Package "iot" "1.40.57"
+      "sha256-BZHAr9Qja9pNVrNd7dDmc/+bKfqmzAUJPoPJUMgJLk0=";
 
   mypy-boto3-iot-data =
-    buildMypyBoto3Package "iot-data" "1.40.6"
-      "sha256-fEw3aD8FGyvuQMmr80Fb9pk/IRXa0ZVHXt5Lptahnoc=";
+    buildMypyBoto3Package "iot-data" "1.40.55"
+      "sha256-bMEIZVMtrTmhfJTyVdpeBcGOPbIEwgEWGWYb9coHDPk=";
 
   mypy-boto3-iot-jobs-data =
-    buildMypyBoto3Package "iot-jobs-data" "1.40.0"
-      "sha256-NH8dQFWdA5jiZnCFGcfDV1RI/fULth9kI1kNlmV2z8Y=";
+    buildMypyBoto3Package "iot-jobs-data" "1.40.58"
+      "sha256-Pj9T478mOGNl9aEIa6AtrDpEJe+8Ygkl2oQ/Lr4trEM=";
 
   mypy-boto3-iot1click-devices =
     buildMypyBoto3Package "iot1click-devices" "1.35.93"
@@ -653,328 +653,328 @@ in
       "sha256-LFuz5/nCZGpSfgqyswxn80VzxXsqzZlBFqPtPJ8bzgo=";
 
   mypy-boto3-iotanalytics =
-    buildMypyBoto3Package "iotanalytics" "1.40.16"
-      "sha256-kLN+S5x9XMO8TovR57hwXnqQvC6K+JwHncgmrLFOpFY=";
+    buildMypyBoto3Package "iotanalytics" "1.40.57"
+      "sha256-uMwtG8llpdxfUCF6Lro1Y7MnozX18kXacZJe91i5rjI=";
 
   mypy-boto3-iotdeviceadvisor =
-    buildMypyBoto3Package "iotdeviceadvisor" "1.40.15"
-      "sha256-E6Y+2g7LsW7wbF1t/SAiFN5S9p0+4vwNykkJdl19voA=";
+    buildMypyBoto3Package "iotdeviceadvisor" "1.40.55"
+      "sha256-/W7eNwqtW8gJNJ/Z1W5jDo/wQXcbXOXfJYG+DaMR1QE=";
 
   mypy-boto3-iotevents =
-    buildMypyBoto3Package "iotevents" "1.40.15"
-      "sha256-Q1s5t45DKkIeolXDh6fhoiYVomIdFTTZyhiGkSrlNgo=";
+    buildMypyBoto3Package "iotevents" "1.40.58"
+      "sha256-j/LzJRyYqyThvR4MzPrSVJvlpHDhFkb4Hm5TjXdeWqY=";
 
   mypy-boto3-iotevents-data =
-    buildMypyBoto3Package "iotevents-data" "1.40.15"
-      "sha256-CIr9UTs6qHRvEWrlHLooTOYzFKaWA+BwG/N8Fp+XTJg=";
+    buildMypyBoto3Package "iotevents-data" "1.40.63"
+      "sha256-jhLj/7AWoC9oqprKhm+vCnwFSWU1aMBK8tmL3rX9sSA=";
 
   mypy-boto3-iotfleethub =
     buildMypyBoto3Package "iotfleethub" "1.40.17"
       "sha256-SeJi6Z/TJAiqL6+21CMP6iZF/Skv1hnmldPrJpOHUfo=";
 
   mypy-boto3-iotfleetwise =
-    buildMypyBoto3Package "iotfleetwise" "1.40.0"
-      "sha256-PER1D68w6wBvHUH5CGEn4H1zku92vhcwWDFRpoXZlmg=";
+    buildMypyBoto3Package "iotfleetwise" "1.40.57"
+      "sha256-tjXQosCpHEcQpE/xqOxwTS+phiDyhFJy+54AqOg0L4s=";
 
   mypy-boto3-iotsecuretunneling =
-    buildMypyBoto3Package "iotsecuretunneling" "1.40.18"
-      "sha256-AS7G6I5JR2tkq1m+cx+9PFaIhe7QwWH0DF/7vuIY+zQ=";
+    buildMypyBoto3Package "iotsecuretunneling" "1.40.57"
+      "sha256-Hr1pVnskDI8b7R8mDCATnCS/nnag/Ac6A1tnQvXt/KU=";
 
   mypy-boto3-iotsitewise =
-    buildMypyBoto3Package "iotsitewise" "1.40.26"
-      "sha256-nGCezdRTJ4uq7aSd0mGSOvk+/Rn4KKeCAc++KgPxRAg=";
+    buildMypyBoto3Package "iotsitewise" "1.40.57"
+      "sha256-bPzbWMPCtXFvtOqIUXQkFUIThq9Qy5PPPlLBgz6+VgY=";
 
   mypy-boto3-iotthingsgraph =
-    buildMypyBoto3Package "iotthingsgraph" "1.40.15"
-      "sha256-ZBh/vd5cNWOv0kk30gFXNnDrfCmlSUr8mKypEYucUgc=";
+    buildMypyBoto3Package "iotthingsgraph" "1.40.55"
+      "sha256-xeWpQxCprqde9tjTR+oA3mgbfBPnUDQRwZrab0Edpww=";
 
   mypy-boto3-iottwinmaker =
-    buildMypyBoto3Package "iottwinmaker" "1.40.0"
-      "sha256-UuQ4NUIV3ofY8/+q1dBm3DprGx//lOqngX+zzQIwvn8=";
+    buildMypyBoto3Package "iottwinmaker" "1.40.55"
+      "sha256-tJqYpF3z0HWRTHQmHjRyqnS3hCUxFUqsyScHnsiVnlA=";
 
   mypy-boto3-iotwireless =
-    buildMypyBoto3Package "iotwireless" "1.40.0"
-      "sha256-Kj/g5lCH7AgHRlSU6od3O4j1OilposHoDP1hYX4S+fs=";
+    buildMypyBoto3Package "iotwireless" "1.40.59"
+      "sha256-WRMIR9XalzsmchjDf2eH7tC9NA1Rr9rkAt07MPC+G44=";
 
   mypy-boto3-ivs =
-    buildMypyBoto3Package "ivs" "1.40.0"
-      "sha256-vZM9rXxrSiJ4l2lJ+hcLtYUws+AczRyxncAKv3vIMMo=";
+    buildMypyBoto3Package "ivs" "1.40.54"
+      "sha256-t4l1s2RCkP572kbJLxsbh5EQnKZXk6zPc82PYytFzEQ=";
 
   mypy-boto3-ivs-realtime =
-    buildMypyBoto3Package "ivs-realtime" "1.40.32"
-      "sha256-HkhDjUOPS4Hm7Zvw6SyyadDBbmKf13Yi8g+VF1X/snM=";
+    buildMypyBoto3Package "ivs-realtime" "1.40.54"
+      "sha256-gumv3tmf4bQa6HvlTAYh7yK0cE1jn3Gprt9l1iHgXqo=";
 
   mypy-boto3-ivschat =
-    buildMypyBoto3Package "ivschat" "1.40.0"
-      "sha256-mtWPF8wmFGLC0PqkKX/UiYT6/VG7FfgrbsqTqRIOgsA=";
+    buildMypyBoto3Package "ivschat" "1.40.57"
+      "sha256-DBh1NtsQTcmYUXEGwlHwjIwJt1NMh6+7h46uehwH4Jc=";
 
   mypy-boto3-kafka =
-    buildMypyBoto3Package "kafka" "1.40.18"
-      "sha256-vO3AdbglCEhMr8YfBqcTBMP0hE65wkPnnWlW0C9m0So=";
+    buildMypyBoto3Package "kafka" "1.40.54"
+      "sha256-3hhwZY3Cxc18YpLmXfglgMV8OevwEFJymdVOIcAa/sI=";
 
   mypy-boto3-kafkaconnect =
-    buildMypyBoto3Package "kafkaconnect" "1.40.0"
-      "sha256-4wNbhuNsLwrYemkPuadR6oeaCuSajU5IwCb0En89M3U=";
+    buildMypyBoto3Package "kafkaconnect" "1.40.61"
+      "sha256-n7qtEjUsWbqSzXgwOpAaDM5MJUCsOvMOABnxeT3MZ/M=";
 
   mypy-boto3-kendra =
-    buildMypyBoto3Package "kendra" "1.40.17"
-      "sha256-IOj6WGiMgCtbLlZ+AHvSAYZFYLxBiXWUA1VKDPBBe+Y=";
+    buildMypyBoto3Package "kendra" "1.40.61"
+      "sha256-l7t+FqNlMQA9ZCjf0pypNX7WU3z9khuQ+Q9oOLviyCs=";
 
   mypy-boto3-kendra-ranking =
-    buildMypyBoto3Package "kendra-ranking" "1.40.35"
-      "sha256-k8g4A54sQvehWCgxaV15zE5vVvJLS6hBrLMDEjGlXxs=";
+    buildMypyBoto3Package "kendra-ranking" "1.40.55"
+      "sha256-GEFn9IMnqSQ+J0OP2Vu0zbKbx5/RmKpjO06GK494kI8=";
 
   mypy-boto3-keyspaces =
-    buildMypyBoto3Package "keyspaces" "1.40.0"
-      "sha256-7gN03saDdFpMyDzaipHRXtq2qkrrzDcp7xhEjm019WI=";
+    buildMypyBoto3Package "keyspaces" "1.40.54"
+      "sha256-NLkf8t9W/ZKA7S9qc/qJ1u4bzh87unvsQLUeh92sbvg=";
 
   mypy-boto3-kinesis =
-    buildMypyBoto3Package "kinesis" "1.40.0"
-      "sha256-T3T3FeI6jc4GK0D2pPL/ECPOxvQbRSHwvBVnmIOn5o4=";
+    buildMypyBoto3Package "kinesis" "1.40.64"
+      "sha256-5g/KLB69FD9/lojdZ5S3vWPuHBgdOjyrXxyDh0RZd8k=";
 
   mypy-boto3-kinesis-video-archived-media =
-    buildMypyBoto3Package "kinesis-video-archived-media" "1.40.17"
-      "sha256-wKaV5LpNWviCW+R1kiEEUdi91BE42Q5/fdq7FpqkGaM=";
+    buildMypyBoto3Package "kinesis-video-archived-media" "1.40.58"
+      "sha256-mPmbOx2SZNvglOqTuo/d3F0CMh5Syka/WYpU4Imvbjg=";
 
   mypy-boto3-kinesis-video-media =
-    buildMypyBoto3Package "kinesis-video-media" "1.40.19"
-      "sha256-PrKUrdt2F3QnznSfJjLt+cbMvSd6bhc0qPD0c8OAKn4=";
+    buildMypyBoto3Package "kinesis-video-media" "1.40.55"
+      "sha256-lMj1MhhWJeoSVaUPdELCDIOZCtL2rrgsNerHElczlEk=";
 
   mypy-boto3-kinesis-video-signaling =
-    buildMypyBoto3Package "kinesis-video-signaling" "1.40.15"
-      "sha256-3XwZsjSiQmed7Msz2HHP796iY9x2nSyd6aMglkv3Lfo=";
+    buildMypyBoto3Package "kinesis-video-signaling" "1.40.59"
+      "sha256-PjpVKl3NF44wBSNycabduyNuR1inVbmaj4dUsLnV8hQ=";
 
   mypy-boto3-kinesis-video-webrtc-storage =
-    buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.40.0"
-      "sha256-cnUWkJfPyd7G9ClFFWNXHFwuSqmTcUHwluPBeF4qO8o=";
+    buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.40.58"
+      "sha256-+nZT13/2ejl3kUvOyVdX0CWwxKqkGvhvXBAhhezhmXI=";
 
   mypy-boto3-kinesisanalytics =
-    buildMypyBoto3Package "kinesisanalytics" "1.40.17"
-      "sha256-OU9dcphpwEqoTDleItqOluVxpu73KbWUU3bwflXKO9M=";
+    buildMypyBoto3Package "kinesisanalytics" "1.40.59"
+      "sha256-9S4Y4WY3E03ckKXxq+tOnhyJPa6Msr2oxQo5DqzK78M=";
 
   mypy-boto3-kinesisanalyticsv2 =
-    buildMypyBoto3Package "kinesisanalyticsv2" "1.40.14"
-      "sha256-rb9scmO7uC9WmimwoCkWyM11yfOSZHQgQR2w1PkRRo0=";
+    buildMypyBoto3Package "kinesisanalyticsv2" "1.40.57"
+      "sha256-82KGarHSOh1YMCqtWLoyi/89vYbRoTbcbhvpaSUg4pU=";
 
   mypy-boto3-kinesisvideo =
-    buildMypyBoto3Package "kinesisvideo" "1.40.19"
-      "sha256-ntnY800namdoyhCPe0Pg5573l2J75Wqd+yFat5KEaMc=";
+    buildMypyBoto3Package "kinesisvideo" "1.40.61"
+      "sha256-lViXLfbEMpMenVxZmcp2cfhd0SqH2IiMPOIaOdimU00=";
 
   mypy-boto3-kms =
-    buildMypyBoto3Package "kms" "1.40.38"
-      "sha256-QDYeiQE6F7nC1M1cazbXFmMhK6SCWmjdDWTObja94ws=";
+    buildMypyBoto3Package "kms" "1.40.63"
+      "sha256-TI+hBy1rbDzEaxb4aTQ5PbZyhGNChowdlmjDvVKltIU=";
 
   mypy-boto3-lakeformation =
-    buildMypyBoto3Package "lakeformation" "1.40.19"
-      "sha256-NMF0B6cBjIFJl7CKrwxj89oFJeYnDhpdkmCTJdXa3w0=";
+    buildMypyBoto3Package "lakeformation" "1.40.55"
+      "sha256-IcUBufhnr3GfgJ0FG/JTwo0EgNZBtgKvTd6TtyttWRQ=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.40.50"
-      "sha256-pwngrGlAeDqtCP9c+Yx4miFYQLqxfkaMpeIjBa0K6gU=";
+    buildMypyBoto3Package "lambda" "1.40.64"
+      "sha256-w4xoyD1wEmYcn1V5zjNg2J5Zxe45QffCKsz9qQ0UCR8=";
 
   mypy-boto3-lex-models =
-    buildMypyBoto3Package "lex-models" "1.40.19"
-      "sha256-La8+W6msTRNsxdKGyOU3/jJ+bQYkSXjOfaZ8Aj/PGT8=";
+    buildMypyBoto3Package "lex-models" "1.40.54"
+      "sha256-1154wsf4q7QHWQG3PGo+ukUJY2mk+xfh3/56YKRtXIE=";
 
   mypy-boto3-lex-runtime =
-    buildMypyBoto3Package "lex-runtime" "1.40.17"
-      "sha256-Bt0APaVZxgwASjYTMUctwbsb7u2ZFOf5a3UlComKWxs=";
+    buildMypyBoto3Package "lex-runtime" "1.40.60"
+      "sha256-kkkD8pNK/YYPELzfwvcQVAPb8GPusn7ggmkihp3+0PQ=";
 
   mypy-boto3-lexv2-models =
-    buildMypyBoto3Package "lexv2-models" "1.40.0"
-      "sha256-FgQalWvHO0Zzisw9CLKIKeNchDh5DMHjos2OIyXto40=";
+    buildMypyBoto3Package "lexv2-models" "1.40.57"
+      "sha256-iuyQjOLs2xMNfgdJCkloVdwEsgPe4UaQwAdl5tGs6OY=";
 
   mypy-boto3-lexv2-runtime =
-    buildMypyBoto3Package "lexv2-runtime" "1.40.15"
-      "sha256-75J3DLBsf70P6ur8XyB6iGExyzosrHbb82o7RjE5/3M=";
+    buildMypyBoto3Package "lexv2-runtime" "1.40.54"
+      "sha256-beE9BjjI8wZFwDy0Xzv0/BmRjunfJlJ0qASf4yfpxpE=";
 
   mypy-boto3-license-manager =
-    buildMypyBoto3Package "license-manager" "1.40.0"
-      "sha256-9Afe020suiP14DlvvGETT+3wlUfPWC3qW+47SAxwHuI=";
+    buildMypyBoto3Package "license-manager" "1.40.55"
+      "sha256-d9i0AUux2ChlTnW2UWJ/de9KRYc8HtvLSFENETuy72U=";
 
   mypy-boto3-license-manager-linux-subscriptions =
-    buildMypyBoto3Package "license-manager-linux-subscriptions" "1.40.0"
-      "sha256-pfIQS9as02Gm4mHUc3q3gMKRHz+wT/lRKHWUc2ugt1s=";
+    buildMypyBoto3Package "license-manager-linux-subscriptions" "1.40.63"
+      "sha256-5nHjl/kDJHf0QvaWqQVFSDkYxJpH78sQA+ilMCzu6DQ=";
 
   mypy-boto3-license-manager-user-subscriptions =
-    buildMypyBoto3Package "license-manager-user-subscriptions" "1.40.48"
-      "sha256-hp2jCL1IkXluhEyexdawQvwLfk+9pUVjKlnE9dkVnxc=";
+    buildMypyBoto3Package "license-manager-user-subscriptions" "1.40.55"
+      "sha256-NP3FOwMuz5k0wk+ofCEzyVOKyZSO+TITyb67V82tHgM=";
 
   mypy-boto3-lightsail =
-    buildMypyBoto3Package "lightsail" "1.40.39"
-      "sha256-9FTMfIe6W22GTcULfhDYsYojrXXOq30TQygctO15+24=";
+    buildMypyBoto3Package "lightsail" "1.40.53"
+      "sha256-UzFFqox5VlOBemuJ7oPybKtNx+y9yNlC9wc3r1FidEw=";
 
   mypy-boto3-location =
-    buildMypyBoto3Package "location" "1.40.0"
-      "sha256-hAUULqVRGPw0Ir0XUyhREqT8C8A99lJEGYn4nAxnW7A=";
+    buildMypyBoto3Package "location" "1.40.59"
+      "sha256-mQBymsl2+/hka8QiR+AzxS7gtONHroTgY3qmgt+YKOw=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.40.32"
-      "sha256-udjRe+Pb6Yvbh6OHYs32VCTddkrAo/y1Se32A+FM1/M=";
+    buildMypyBoto3Package "logs" "1.40.64"
+      "sha256-XWGsDqlDWAmh4treGhQDb9t0QF8cAKWRdkJwY62qdOY=";
 
   mypy-boto3-lookoutequipment =
-    buildMypyBoto3Package "lookoutequipment" "1.40.17"
-      "sha256-ttDzy2rDfDeiBre/iuZ4Na9f3UtHb0GZw9ocXSGmEhE=";
+    buildMypyBoto3Package "lookoutequipment" "1.40.54"
+      "sha256-TW5IgaSvPWbBu39VsO+6HMpgzu1TAKZ62RZGUQ3HoFo=";
 
   mypy-boto3-lookoutmetrics =
     buildMypyBoto3Package "lookoutmetrics" "1.40.15"
       "sha256-ZcL1sZGlckqZFhCqTZwMeghP8K9Hee1Zi3N6wZb9hts=";
 
   mypy-boto3-lookoutvision =
-    buildMypyBoto3Package "lookoutvision" "1.40.18"
-      "sha256-DKGXLR3lVek8IHAolI372LKc5YFy1o40DUVxp+xc1ww=";
+    buildMypyBoto3Package "lookoutvision" "1.40.59"
+      "sha256-MlMkIgzc2D3i5xAPdk+th0e9AYrvRxGwzl4zwEwy4xw=";
 
   mypy-boto3-m2 =
-    buildMypyBoto3Package "m2" "1.40.0"
-      "sha256-d7LurkSzbbXqYJXnOsQtxpcSDnY20O5kASOVZJObt+g=";
+    buildMypyBoto3Package "m2" "1.40.54"
+      "sha256-qpYLmQ4CfAG30fnY86vT74B33pmD1cDGLHrKiuDOpN8=";
 
   mypy-boto3-machinelearning =
-    buildMypyBoto3Package "machinelearning" "1.40.20"
-      "sha256-ZrXr4tnJL6e/H1boIqc5i13uxwmGwDHRLIVjHdTxwVs=";
+    buildMypyBoto3Package "machinelearning" "1.40.54"
+      "sha256-3LzaMWu1lPzmKx8+Knc9OdwgElOMumhkt9iEn1gShCY=";
 
   mypy-boto3-macie2 =
-    buildMypyBoto3Package "macie2" "1.40.16"
-      "sha256-JKGY573KRt5XWgLVcNvlNgTdFYHC7Qj/YNcdODmUF00=";
+    buildMypyBoto3Package "macie2" "1.40.58"
+      "sha256-Fp2Uu6kufalQEePs8y5DhIaWhsU/GVa723G5TpFAWIY=";
 
   mypy-boto3-managedblockchain =
-    buildMypyBoto3Package "managedblockchain" "1.40.15"
-      "sha256-YBNBXwG0T7a805OPXYmCvqh8wHubtMG3QW38/eCCuB4=";
+    buildMypyBoto3Package "managedblockchain" "1.40.60"
+      "sha256-iqgdNV7dUDWlDoEZzZiwv+n5hbjscmBc2MrcaYQaCHE=";
 
   mypy-boto3-managedblockchain-query =
-    buildMypyBoto3Package "managedblockchain-query" "1.40.0"
-      "sha256-lw7LeVq/o8RFK9P62vQ7iR+jZfH/OOZY2AirYqDltSw=";
+    buildMypyBoto3Package "managedblockchain-query" "1.40.58"
+      "sha256-YC5sNBnH5wS6JSCfPK7cp08WXgBLaDypDRBALMciLQQ=";
 
   mypy-boto3-marketplace-catalog =
-    buildMypyBoto3Package "marketplace-catalog" "1.40.0"
-      "sha256-C33HMjDet8ZhC2CUlr0xkYlLQpIOMKjhbqKw7CPz+Tg=";
+    buildMypyBoto3Package "marketplace-catalog" "1.40.64"
+      "sha256-Gla00GNkoQ9C/AocSEkHQwTK1JP51F+pnhmRfQRFCpg=";
 
   mypy-boto3-marketplace-entitlement =
-    buildMypyBoto3Package "marketplace-entitlement" "1.40.0"
-      "sha256-tgFgsCuWsIC2AkRcLQ7e4ANb0eTwqfU9N1/XXPReB5I=";
+    buildMypyBoto3Package "marketplace-entitlement" "1.40.54"
+      "sha256-pagUH5QLYtbx88TE9470AJOHxG29ALGxZioROq3rqTE=";
 
   mypy-boto3-marketplacecommerceanalytics =
-    buildMypyBoto3Package "marketplacecommerceanalytics" "1.40.16"
-      "sha256-7gZOd0TBAWyyY7g85UXAjp4miV08qfB20B6YQww360w=";
+    buildMypyBoto3Package "marketplacecommerceanalytics" "1.40.58"
+      "sha256-KPHuiCiseplHyGWKyh3xFSIj+Qet9hsqSva6rmHsFyA=";
 
   mypy-boto3-mediaconnect =
-    buildMypyBoto3Package "mediaconnect" "1.40.46"
-      "sha256-IjfRXktKU9nJlBJhET307e+nvbwqCucIj0E2dpwuZO4=";
+    buildMypyBoto3Package "mediaconnect" "1.40.55"
+      "sha256-18sD6lfs5Y9BBp3j8c/TVjI/3KZbO6pKuYPYKir1NQY=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.40.17"
-      "sha256-L2/TEQbnd60RuCaqpNI/xyQ76AqbIUe5KWwZtSf+2I8=";
+    buildMypyBoto3Package "mediaconvert" "1.40.64"
+      "sha256-TRr19ppRe4jRZNMHPQmXwUXXmtt/vzwLjc5Xq+H/RYw=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.40.45"
-      "sha256-rF8r53gdOYPeFJ5VqUWLiQ9rNaUAIb1tS5E9TSHgrms=";
+    buildMypyBoto3Package "medialive" "1.40.57"
+      "sha256-aKl6hRCX4XskRVgRlzPKmKKMWqXAwGmetvY7z34Iam4=";
 
   mypy-boto3-mediapackage =
-    buildMypyBoto3Package "mediapackage" "1.40.15"
-      "sha256-HMPme3zTPKCGRHUhRXgw83o0UV+Frz25+0eOEB9cDdA=";
+    buildMypyBoto3Package "mediapackage" "1.40.59"
+      "sha256-Bc9v9Tq2eiBAsQeWpK2viHhR/wfP0k48S2dLJqhPjnw=";
 
   mypy-boto3-mediapackage-vod =
-    buildMypyBoto3Package "mediapackage-vod" "1.40.17"
-      "sha256-T3Ba5a0ogaaNqOs93jww/OT2UgHZzy9k6YGpkN9DlYY=";
+    buildMypyBoto3Package "mediapackage-vod" "1.40.61"
+      "sha256-DAuBN6Sqbs27Gg5PW2V3iTMD3vux5soaFoRfqxgdG1A=";
 
   mypy-boto3-mediapackagev2 =
-    buildMypyBoto3Package "mediapackagev2" "1.40.27"
-      "sha256-wJZ7kfDwF+GLMvkLfOHTrW/fIPsMKD2mJJJmirEpApY=";
+    buildMypyBoto3Package "mediapackagev2" "1.40.54"
+      "sha256-JPlD+hxnut6l3LAp5jNfP0LCdPj/wVj7xs/wSP+sy0U=";
 
   mypy-boto3-mediastore =
-    buildMypyBoto3Package "mediastore" "1.40.17"
-      "sha256-YCFhcxgtQvf9MhwzCHqjGPX666dv35lkTLhxp4wGog0=";
+    buildMypyBoto3Package "mediastore" "1.40.59"
+      "sha256-68cwTIm0FqfkWocusBeXbYnLc7tOFwunRSA0SLxWZ+o=";
 
   mypy-boto3-mediastore-data =
-    buildMypyBoto3Package "mediastore-data" "1.40.20"
-      "sha256-hkzc8MTCssJPCjME7CMCVewYgNf9Gz/c68hAC3fuKnE=";
+    buildMypyBoto3Package "mediastore-data" "1.40.59"
+      "sha256-/b7BGjo6OAzVGJa6oBoFfo1Z0KBtx06KssmMpfY8FbA=";
 
   mypy-boto3-mediatailor =
-    buildMypyBoto3Package "mediatailor" "1.40.42"
-      "sha256-wTzLtvXBVTEs1ywAw8sL92Xzyo9TOscaIptPE1oHrUg=";
+    buildMypyBoto3Package "mediatailor" "1.40.58"
+      "sha256-uluvMcbKZz3KA0V7KMEGbRr9CVYIPDhGTTY5oJHjHic=";
 
   mypy-boto3-medical-imaging =
-    buildMypyBoto3Package "medical-imaging" "1.40.31"
-      "sha256-loONT/aOVY0IFNGgP7doBtHPp+U9TEzI4SAmdXvrc2Q=";
+    buildMypyBoto3Package "medical-imaging" "1.40.54"
+      "sha256-pDcksj0s3L+AKKXDe9fmcYxDdQDa5uVdbtJLGSvW0X0=";
 
   mypy-boto3-memorydb =
-    buildMypyBoto3Package "memorydb" "1.40.46"
-      "sha256-3es+4YZbr+k3NgCoBdgrMwXVe/jH6cV7Lo2Fq3MZsJw=";
+    buildMypyBoto3Package "memorydb" "1.40.54"
+      "sha256-f/tGLKRnpzMDLAzQH1W7sUjGljb04Ws5Tidh8lL0pWE=";
 
   mypy-boto3-meteringmarketplace =
-    buildMypyBoto3Package "meteringmarketplace" "1.40.0"
-      "sha256-wbPakhKKDtNY6y84jzqJQlP7IiG5QAKQTRsYP/tndV8=";
+    buildMypyBoto3Package "meteringmarketplace" "1.40.56"
+      "sha256-idAuSb9+u1KVh13BBNSgXYkqKHZHcSfQ3rVxiDBLdVU=";
 
   mypy-boto3-mgh =
-    buildMypyBoto3Package "mgh" "1.40.18"
-      "sha256-6PlBNNCfxt4MLqmDPM6icIyutPGyXd54AWKHxCTQ024=";
+    buildMypyBoto3Package "mgh" "1.40.58"
+      "sha256-xQLJrW35xDhr8leBNsKzqfg4B5DQKH8adV5sjIR63kI=";
 
   mypy-boto3-mgn =
-    buildMypyBoto3Package "mgn" "1.40.0"
-      "sha256-XyB7/8zj4pU/+cxqhEf2WMoBoo/J12lOrlL0WD2Nhic=";
+    buildMypyBoto3Package "mgn" "1.40.58"
+      "sha256-cZzoyjZ3fLtqta684chs4rcACPS19Q1mV1GTaNeRe20=";
 
   mypy-boto3-migration-hub-refactor-spaces =
-    buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.18"
-      "sha256-SVy3+tok3qsJv76TiaOIPVSnJiGxfuPgAYT+bi3Kxss=";
+    buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.55"
+      "sha256-1boWE6O9IJ1UZyV1NGbGQiHeQ1qFhOxFTnHXCM5Jha0=";
 
   mypy-boto3-migrationhub-config =
-    buildMypyBoto3Package "migrationhub-config" "1.40.19"
-      "sha256-uxtinLEnvT6+BS2xAMiD8GsfQOEUTp0pTKQdxBx8yc8=";
+    buildMypyBoto3Package "migrationhub-config" "1.40.54"
+      "sha256-djL6fA1ekMWn1Alc3mchrdydGCkVXsDtKNc/fG4xGL0=";
 
   mypy-boto3-migrationhuborchestrator =
-    buildMypyBoto3Package "migrationhuborchestrator" "1.40.0"
-      "sha256-EtOj4OjZBn5M5Q9pU2MaSNwXAVXbtFEZICRn/r+e9OQ=";
+    buildMypyBoto3Package "migrationhuborchestrator" "1.40.61"
+      "sha256-nEb6Mfn6FVfrnXjW8EAlpOBFtT3SugCkeH4/loTQBXs=";
 
   mypy-boto3-migrationhubstrategy =
-    buildMypyBoto3Package "migrationhubstrategy" "1.40.0"
-      "sha256-G+Kn0K9lI24r/A+KBOE2euh+raKIystZ7uB2k9AD/Zg=";
+    buildMypyBoto3Package "migrationhubstrategy" "1.40.59"
+      "sha256-h1lI/FmzItYTN9lnH/W41v/btpjDdwhEuCnwEHeoxHQ=";
 
   mypy-boto3-mq =
-    buildMypyBoto3Package "mq" "1.40.23"
-      "sha256-1+/fGIJPzPvAThyGy6ZiZAyIfFGtBGiBZ1ORwfTZ2Ww=";
+    buildMypyBoto3Package "mq" "1.40.59"
+      "sha256-P/PcH7FW99E1W5EF6o3e2QamuwcZRcKI6adsbWAmkUk=";
 
   mypy-boto3-mturk =
-    buildMypyBoto3Package "mturk" "1.40.20"
-      "sha256-+VSk5ytyDwIkg8Ur15vjBmURPwXvZkRT5UEKPTWNgO8=";
+    buildMypyBoto3Package "mturk" "1.40.60"
+      "sha256-3usjCs7VRs6e9oRU7O9YAD8XAjeoL5fFeAPAqpRizIU=";
 
   mypy-boto3-mwaa =
-    buildMypyBoto3Package "mwaa" "1.40.0"
-      "sha256-w/km0Eq/rEX182tDtxVsFCm3bK2pUr1Fh6ZnsX6thAI=";
+    buildMypyBoto3Package "mwaa" "1.40.57"
+      "sha256-84N2KuK/XAPJqnmeDuWNpC5X6NRodH0luXfP+ZjH0pQ=";
 
   mypy-boto3-neptune =
-    buildMypyBoto3Package "neptune" "1.40.38"
-      "sha256-3vbUWdYw7jqTM5TPM3btPROlXPW1xR+3cI29ImVrt1w=";
+    buildMypyBoto3Package "neptune" "1.40.63"
+      "sha256-oo88POk9T+Ys/awYIRLRw0JwFfFtyyrKC2t/lclKE2I=";
 
   mypy-boto3-neptunedata =
-    buildMypyBoto3Package "neptunedata" "1.40.0"
-      "sha256-5aD/9ACgD/76bPpbZlqHXn0biTxr9wyiLpTyIdxMKYs=";
+    buildMypyBoto3Package "neptunedata" "1.40.58"
+      "sha256-8Lxw5GiiQYiGZJkitfEnPdRGw4lOSSF88s8y7hBWnF4=";
 
   mypy-boto3-network-firewall =
-    buildMypyBoto3Package "network-firewall" "1.40.39"
-      "sha256-ZJT+qoOmgMRj3f0mIxDJ7wuPhlQykdbXOyeo6YYQmOg=";
+    buildMypyBoto3Package "network-firewall" "1.40.55"
+      "sha256-ldifobuZtba1jApWN5eswPa1dmSvd/a9yAS/wzPxz30=";
 
   mypy-boto3-networkmanager =
-    buildMypyBoto3Package "networkmanager" "1.40.0"
-      "sha256-6lhlo52AWSKFBNXKMr2zEZF+uyvtRCHNcE5/qPR8xGs=";
+    buildMypyBoto3Package "networkmanager" "1.40.55"
+      "sha256-YYoVn8ECRbtJlljdEaVA4X6UgKiBKpnfq4RSkH7StwQ=";
 
   mypy-boto3-nimble =
     buildMypyBoto3Package "nimble" "1.35.0"
       "sha256-gs9eGyRaZN7Fsl0D5fSqtTiYZ+Exp0s8QW/X8ZR7guA=";
 
   mypy-boto3-oam =
-    buildMypyBoto3Package "oam" "1.40.0"
-      "sha256-Db3tb9qhUNtdqKVVgq2Z80wVWCA9g7B8YpqR1FmgleQ=";
+    buildMypyBoto3Package "oam" "1.40.57"
+      "sha256-jobSOTxwJ6mzhr4O+opLrCvGuq4MMRe+zjhHWpq4JsA=";
 
   mypy-boto3-omics =
-    buildMypyBoto3Package "omics" "1.40.20"
-      "sha256-I53YcVk2rMNP+4WrD+6kvo85OhKrvJoE2YR3UBeIgEY=";
+    buildMypyBoto3Package "omics" "1.40.64"
+      "sha256-hjgvlTcA18OeMpJIgpl+ml4zSc73HXrUrM0adOzScl4=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.40.0"
-      "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU=";
+    buildMypyBoto3Package "opensearch" "1.40.61"
+      "sha256-B5yKX/xElj3pjsLItXJNm5eV+KPmU/ivVz6MR6g88s0=";
 
   mypy-boto3-opensearchserverless =
-    buildMypyBoto3Package "opensearchserverless" "1.40.24"
-      "sha256-dWkO3WKxcMFLF4UvFLAgAv1vfJZYqwua6s+CYGhTF0g=";
+    buildMypyBoto3Package "opensearchserverless" "1.40.58"
+      "sha256-jSoHGhya7mWGoyUCTfLRgqyrmG6TIpS4SVUjSAer0eM=";
 
   mypy-boto3-opsworks =
     buildMypyBoto3Package "opsworks" "1.40.0"
@@ -985,76 +985,76 @@ in
       "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.40.27"
-      "sha256-LdBoeGucR8RzewzflvN1dtCtr8+asp3ggmtV6HuUQm8=";
+    buildMypyBoto3Package "organizations" "1.40.61"
+      "sha256-LM0Sm0mUlnh2R1/TMskPwgYc3OdgFpmmI4j3ltJIUlo=";
 
   mypy-boto3-osis =
-    buildMypyBoto3Package "osis" "1.40.32"
-      "sha256-XS7wWZReJC9tVuVCZg91tDj1iWCuUfKUup8Jf4oxS8g=";
+    buildMypyBoto3Package "osis" "1.40.54"
+      "sha256-iuSKo8JCPNNc6FiyKbIpkbVd5rgqRGKOKASwqkCstdw=";
 
   mypy-boto3-outposts =
-    buildMypyBoto3Package "outposts" "1.40.48"
-      "sha256-9N7I4XQQP/vUvGvMYT8SnYRJFWEKm7YMjtTgkTMnY8I=";
+    buildMypyBoto3Package "outposts" "1.40.60"
+      "sha256-I/2vBxmVVqYbiFN/PXCwA/s66oyoG2Q8VS6YTHNrAJo=";
 
   mypy-boto3-panorama =
-    buildMypyBoto3Package "panorama" "1.40.15"
-      "sha256-PgXa3veO1qGxxUBwZe2bxauFNT3nc0j8vEVk0Q4NtVU=";
+    buildMypyBoto3Package "panorama" "1.40.59"
+      "sha256-Rf6XuOTE/09pKpotR/AY6526gfPP+pP2Y9WAfhBSL6E=";
 
   mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.40.30"
-      "sha256-JSLXvrURvUhb83Oeb5b+hlDpOoiFMayDtDXGJsx8Hsw=";
+    buildMypyBoto3Package "payment-cryptography" "1.40.64"
+      "sha256-4jXXEaS2Uy+k+FQScXyaLToUC6E3+poejhOLAOGBFdg=";
 
   mypy-boto3-payment-cryptography-data =
-    buildMypyBoto3Package "payment-cryptography-data" "1.40.45"
-      "sha256-/mlrjDkzD9szPLpV+69UBhYXpzt8vwPXIoAMGt+LZxc=";
+    buildMypyBoto3Package "payment-cryptography-data" "1.40.59"
+      "sha256-llgYHZUfQTOy5E4BmmA3gAvYi4Q3RjrCtfFm68ECEGY=";
 
   mypy-boto3-pca-connector-ad =
-    buildMypyBoto3Package "pca-connector-ad" "1.40.0"
-      "sha256-6kAZW0V/7XXEGCQl24brFhR3utzZ0Ftg8dTUgRN40iU=";
+    buildMypyBoto3Package "pca-connector-ad" "1.40.59"
+      "sha256-f3SQuBhNc2tL3vdqJmoYgnpUICkvJmENShpVbtE7cuM=";
 
   mypy-boto3-personalize =
-    buildMypyBoto3Package "personalize" "1.40.19"
-      "sha256-2oaSBDL5PDpNwT/stf52kpEl23UAZ9Cl0y8jSq40mZI=";
+    buildMypyBoto3Package "personalize" "1.40.54"
+      "sha256-pn+Zpzpa5SBhnzzo1yVcQzFi3u3Wbf93AvOL4Xu+yqQ=";
 
   mypy-boto3-personalize-events =
-    buildMypyBoto3Package "personalize-events" "1.40.18"
-      "sha256-ot000kDzq6Dle+9d9EWXHM7kLIzA4Se7X1w24dEhLVg=";
+    buildMypyBoto3Package "personalize-events" "1.40.58"
+      "sha256-cSxcEUfHRBITijZot4XhvijEAfsPWlPu1ZGf6cF2tbQ=";
 
   mypy-boto3-personalize-runtime =
-    buildMypyBoto3Package "personalize-runtime" "1.40.17"
-      "sha256-If4bUVxIhJNXlW0i3ojv5hVDX5YoCqA0PjzcLbtc1q4=";
+    buildMypyBoto3Package "personalize-runtime" "1.40.54"
+      "sha256-vuOhtYDVqnB4Xn5dzE3N93b7ZWalyvPwTx01CHFzSNo=";
 
   mypy-boto3-pi =
-    buildMypyBoto3Package "pi" "1.40.19"
-      "sha256-kpZHz/E6ES5zUyqhTYN/9OMBEQtrf+uOz85spmIeQEc=";
+    buildMypyBoto3Package "pi" "1.40.55"
+      "sha256-PqK4IfA5JcI5Cg4ymR9uoTF3YLs6vu0l0Gl4e7af2Y8=";
 
   mypy-boto3-pinpoint =
-    buildMypyBoto3Package "pinpoint" "1.40.18"
-      "sha256-zhekW0Dk58LRUfyVd6slsy3tKu31j/cGEYfkvpLrmnA=";
+    buildMypyBoto3Package "pinpoint" "1.40.60"
+      "sha256-BizLajwUZznm+ay5QaW39lf61+SGGeR302r0OAWZD5s=";
 
   mypy-boto3-pinpoint-email =
-    buildMypyBoto3Package "pinpoint-email" "1.40.15"
-      "sha256-MZ3FLJdyo1RoUFj6baYu4dR9T8/0nCilk5RRZ+0wvQQ=";
+    buildMypyBoto3Package "pinpoint-email" "1.40.58"
+      "sha256-SRvim/6rT3H/OHT1FZRx6PyPUV2GGh5nk83EXhVi5gc=";
 
   mypy-boto3-pinpoint-sms-voice =
-    buildMypyBoto3Package "pinpoint-sms-voice" "1.40.35"
-      "sha256-RLcjMVTPCHS+aVAy7dBr3yR+o25oIrz8twVAbaA3I+0=";
+    buildMypyBoto3Package "pinpoint-sms-voice" "1.40.54"
+      "sha256-3c8he41vrrQwW64aGB5ExykWVPqGfj73P0gZBYoqsW0=";
 
   mypy-boto3-pinpoint-sms-voice-v2 =
-    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.40.14"
-      "sha256-Jogfc4bdSgo6ufRjkX+jC6tCcjF2QEF5Wc5a3tZxjPM=";
+    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.40.57"
+      "sha256-n20s8GSpRLcaGXyPJs0KOUwGBOf6a2q22fe1kph/GUk=";
 
   mypy-boto3-pipes =
-    buildMypyBoto3Package "pipes" "1.40.0"
-      "sha256-AY8HH2OrOvscERskVLYOx8c8MQntEEseeVwpN6cJuaY=";
+    buildMypyBoto3Package "pipes" "1.40.61"
+      "sha256-o1FsYBeSdq8hcTyKZiCVOuS4XJYk8/8Jrxd+psm0UpU=";
 
   mypy-boto3-polly =
-    buildMypyBoto3Package "polly" "1.40.13"
-      "sha256-uzrN1a/jHzdN479b3O43trgL1Qay3GQbWWdHTiwI1Rc=";
+    buildMypyBoto3Package "polly" "1.40.54"
+      "sha256-3qic3Zk9WZ1JF570ASGt6X6EBeWO4hGhs4kYQZ3RfQg=";
 
   mypy-boto3-pricing =
-    buildMypyBoto3Package "pricing" "1.40.0"
-      "sha256-ehbxIVTXjEStw0MUiA0Xmk13VhVf07NnUp3hy/PjUEs=";
+    buildMypyBoto3Package "pricing" "1.40.54"
+      "sha256-5XQk+0F6fX80cEOQlHTZOpcbl2qpaAJOgqawem8kMpI=";
 
   mypy-boto3-privatenetworks =
     buildMypyBoto3Package "privatenetworks" "1.38.0"
@@ -1065,208 +1065,208 @@ in
       "sha256-BEHP+U37pdHVP7UABWkS3zUYNg+xE6Z/A8mmmd0/LmE=";
 
   mypy-boto3-qldb =
-    buildMypyBoto3Package "qldb" "1.40.16"
-      "sha256-IaEZm5lbmuWg/Y6BHJ6ABKBPlQsvCCRIBkQk1xbc9PI=";
+    buildMypyBoto3Package "qldb" "1.40.54"
+      "sha256-7h7WswVMGPBf6WsX04+TXA3o8scarCUqnSW3dgUyadw=";
 
   mypy-boto3-qldb-session =
-    buildMypyBoto3Package "qldb-session" "1.40.19"
-      "sha256-g5Mh+Uz/YrF4v7GV3kPUarzTr0miTUioaMaxwYUX4p0=";
+    buildMypyBoto3Package "qldb-session" "1.40.54"
+      "sha256-YrrEKl3aGz//5Z5JGapHhWtk6hBXQ4cuRQmLqGYztzg=";
 
   mypy-boto3-quicksight =
     buildMypyBoto3Package "quicksight" "1.40.49"
       "sha256-skz5HFlXRIhqefMOSN8lvhmAuu+COBC/hl8YGJawXSI=";
 
   mypy-boto3-ram =
-    buildMypyBoto3Package "ram" "1.40.18"
-      "sha256-eguBtTttYrCcdQ1HYyy7zNVXqVkBbG59aHwzgiV1PwY=";
+    buildMypyBoto3Package "ram" "1.40.61"
+      "sha256-AJOmbZZ199Qtgc7s/TN+Mit2/cPM2dDCmgD1Oz24N0A=";
 
   mypy-boto3-rbin =
-    buildMypyBoto3Package "rbin" "1.40.18"
-      "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM=";
+    buildMypyBoto3Package "rbin" "1.40.60"
+      "sha256-8vUsRFYRMImJyNarFTFLdz0fzsQZLnLt/KV4AGaoQg8=";
 
   mypy-boto3-rds =
     buildMypyBoto3Package "rds" "1.40.50"
       "sha256-fVUGv36rK1kmb5MmEEnCrCXEYPfgn1g6u4aYBpnDvtU=";
 
   mypy-boto3-rds-data =
-    buildMypyBoto3Package "rds-data" "1.40.0"
-      "sha256-EjuSI3v4i4PRTmcQtqRTRdgfBXBBzF9ChJV9x6VCdtY=";
+    buildMypyBoto3Package "rds-data" "1.40.60"
+      "sha256-tPhLjs0Gw9CunnNhnWc9UMyOwY7f1B9V/XzEHOOoLg4=";
 
   mypy-boto3-redshift =
-    buildMypyBoto3Package "redshift" "1.40.40"
-      "sha256-S2Kq4+up5zWfLS2rM14qwmzLd1h13hz8YURBq9O715w=";
+    buildMypyBoto3Package "redshift" "1.40.64"
+      "sha256-FyWVufVC/yjEMju/Zdj382CqZgOEGNDCJ64I7jbGu7E=";
 
   mypy-boto3-redshift-data =
-    buildMypyBoto3Package "redshift-data" "1.40.0"
-      "sha256-rJnEK9W8zZ6hxp5YvysRaxk01vaCv3+zpE9GSdRb1jA=";
+    buildMypyBoto3Package "redshift-data" "1.40.57"
+      "sha256-G8yP5UD+srdmTHkuwC5A05L47Piun60kHoPzWG7MvGM=";
 
   mypy-boto3-redshift-serverless =
-    buildMypyBoto3Package "redshift-serverless" "1.40.0"
-      "sha256-iRj6arzq9rBsbuImlWdStHbs5o5D4f9MowdG5M7w6SA=";
+    buildMypyBoto3Package "redshift-serverless" "1.40.60"
+      "sha256-gvWo0ybabdCa9Y16q85MTR3TIF5VvVJQ0zrnCmkyheM=";
 
   mypy-boto3-rekognition =
-    buildMypyBoto3Package "rekognition" "1.40.0"
-      "sha256-uVQIk3XxR7mwd/sY5TQk6jy6m5qzr0pMu/0Q4fItu3U=";
+    buildMypyBoto3Package "rekognition" "1.40.60"
+      "sha256-4kLiWKy5lNB4Ins3UdzdUOb3DWqonLF4HJWN9mNLmRo=";
 
   mypy-boto3-resiliencehub =
-    buildMypyBoto3Package "resiliencehub" "1.40.0"
-      "sha256-PaBrmTZ/EpFDH94bw/zQqRcLiQrOQlKrIHQgXcuR0Qo=";
+    buildMypyBoto3Package "resiliencehub" "1.40.58"
+      "sha256-EHVAJ8ElONBpXvZoXfuL7UbHNOYZyZN6ABHViQg+a5k=";
 
   mypy-boto3-resource-explorer-2 =
     buildMypyBoto3Package "resource-explorer-2" "1.40.46"
       "sha256-x1BJr6TZpO5OlfAG5l9PuAmfTAMtjnRv3SWO6bh2zPc=";
 
   mypy-boto3-resource-groups =
-    buildMypyBoto3Package "resource-groups" "1.40.15"
-      "sha256-q6SqqJEsDrQfjYpiFp1S2+CnAjKUW+wBsLVSjYng9ZE=";
+    buildMypyBoto3Package "resource-groups" "1.40.61"
+      "sha256-ZKa2t6TPCQBID9YGi6vkYnw9icZQinedflGoqFyXqc0=";
 
   mypy-boto3-resourcegroupstaggingapi =
-    buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.17"
-      "sha256-y80XkJoge5ED3oj4562wlG8GaXcCzTI8It58RW+skRQ=";
+    buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.64"
+      "sha256-zcNW4Ll7oTzeZIL+fV7DaP/YYTjmSzvPhnDukyVFGog=";
 
   mypy-boto3-robomaker =
-    buildMypyBoto3Package "robomaker" "1.40.19"
-      "sha256-qPJ/kxKiVat3aj6aVLDgIYpoGlpsrF7kjfxJ9UWbV0o=";
+    buildMypyBoto3Package "robomaker" "1.40.59"
+      "sha256-jYAsZ1lMU9cl4rIvRO1UZLn4nIsuauWrNRwyB0j4HK0=";
 
   mypy-boto3-rolesanywhere =
-    buildMypyBoto3Package "rolesanywhere" "1.40.0"
-      "sha256-9AfMYmfGgFYxbGF1UYLBEtCkmYtlPNtD0q2MHmbJUWw=";
+    buildMypyBoto3Package "rolesanywhere" "1.40.55"
+      "sha256-CoF3Aw759lxUzg9iRCfKofDkbq/idAIy4Eu4L7yrRL0=";
 
   mypy-boto3-route53 =
-    buildMypyBoto3Package "route53" "1.40.23"
-      "sha256-0cvqZsSwlq6o5XE+U9Vh3/+7I4ZhVAtlZ7Qlm5KuI1I=";
+    buildMypyBoto3Package "route53" "1.40.57"
+      "sha256-GcfGVmcrqgC3MAoqJWrzUXFDr6b9QeSTOP8uCBpnzCc=";
 
   mypy-boto3-route53-recovery-cluster =
-    buildMypyBoto3Package "route53-recovery-cluster" "1.40.18"
-      "sha256-2eARoNdjICq+9/NDLcgCikBIQV9WNDb8UUKGtfJA6Yw=";
+    buildMypyBoto3Package "route53-recovery-cluster" "1.40.57"
+      "sha256-EIwRua248SviAlBapRfoxIpCi0ydWw5h5keOZqMA2Zw=";
 
   mypy-boto3-route53-recovery-control-config =
-    buildMypyBoto3Package "route53-recovery-control-config" "1.40.14"
-      "sha256-xHo8vLsSgGMCM3uVYv1ihLAOpkSc3XjuPgKWLFTqDkk=";
+    buildMypyBoto3Package "route53-recovery-control-config" "1.40.54"
+      "sha256-WTZGKD2w3/OW41VKgk/l9KdBnggip8CDTesbtiK/Hic=";
 
   mypy-boto3-route53-recovery-readiness =
-    buildMypyBoto3Package "route53-recovery-readiness" "1.40.16"
-      "sha256-oo6Vpu6SfuJKw1aqX8x6oIlLUJbHa2lNfPx5kfQMo8M=";
+    buildMypyBoto3Package "route53-recovery-readiness" "1.40.55"
+      "sha256-lz/yPloTNQOFgT7+FvkxQFFW1bBG+Ew1VVrd718UPDA=";
 
   mypy-boto3-route53domains =
-    buildMypyBoto3Package "route53domains" "1.40.23"
-      "sha256-Gj2GSKiSAicbxMjN8Gks9joOi4WB37v1xlAnjLRobOY=";
+    buildMypyBoto3Package "route53domains" "1.40.59"
+      "sha256-7PNEZ4QfwF9yAl+Fl1ok3Md5FZa2DLO1RIVqIp5CiPA=";
 
   mypy-boto3-route53resolver =
-    buildMypyBoto3Package "route53resolver" "1.40.0"
-      "sha256-wY1ypBS0J/0JvGJ7rc8HL52onwypC0FgkS4Zz6FKqpg=";
+    buildMypyBoto3Package "route53resolver" "1.40.60"
+      "sha256-BU+oYtrr5kh+36CIFBbbJMaLd2vDufCGdYywlIf4O8Q=";
 
   mypy-boto3-rum =
-    buildMypyBoto3Package "rum" "1.40.0"
-      "sha256-+fgiX8rSj53vuJuuTOX26sipW3xiFDt7ik7r65alHcw=";
+    buildMypyBoto3Package "rum" "1.40.58"
+      "sha256-eZwpjtTCEt+DnFfHxJCVjBKDxA5qQkBS/1gk0zKb9ug=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.40.26"
-      "sha256-jSv9EFKJTQ6EyfuTWNg4ug7tAmUHbH3X9FYix3AnXJk=";
+    buildMypyBoto3Package "s3" "1.40.61"
+      "sha256-JlXbFDyuN/vGi1Oq40+8XJBJJdBLDyY658OPtWC2qF8=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.40.31"
-      "sha256-4D9yv4nmCrc75l/QEqeP5FFNU4JPq5tAPtZi9dikcUY=";
+    buildMypyBoto3Package "s3control" "1.40.61"
+      "sha256-yyzFGMna0sVQnoc/xQSXTMO/RR1RiyQuWHeiVHHk7ZI=";
 
   mypy-boto3-s3outposts =
-    buildMypyBoto3Package "s3outposts" "1.40.15"
-      "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
+    buildMypyBoto3Package "s3outposts" "1.40.63"
+      "sha256-AL/XZLrWVNvZXxHvFXCsR/7L0F+9gCS20AhyJOSk5XE=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.27"
-      "sha256-OlMvXXiV/PGIqL4IRQuyRpm4RboyH+SDnQKJ2HWuqsw=";
+    buildMypyBoto3Package "sagemaker" "1.40.64"
+      "sha256-voJIB6srDcuVmJJ3d+gJrOSC5X/I7FqOmNqiFzhunxM=";
 
   mypy-boto3-sagemaker-a2i-runtime =
-    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.16"
-      "sha256-Mab/cO02qbhVylLWHL4aGfgMArujecXpsOgfMG7OLTk=";
+    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.57"
+      "sha256-hM+OvqETv0u6Kk1ZgfzgNWgBTPamBH0oO+5W4hlUgeM=";
 
   mypy-boto3-sagemaker-edge =
-    buildMypyBoto3Package "sagemaker-edge" "1.40.17"
-      "sha256-ZhD8T6Mp5M3Kofd462vX3HsEbazpYFOf1HJ3L9xUhGU=";
+    buildMypyBoto3Package "sagemaker-edge" "1.40.58"
+      "sha256-jmK+l8D36ydnlSEHYxDO/e9XuMp79P1QLdjjFRcFn6w=";
 
   mypy-boto3-sagemaker-featurestore-runtime =
-    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.17"
-      "sha256-p3zQ7rWP78gg2bBYdpGgVi2f771qZk+jwwxBcoQJwjk=";
+    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.61"
+      "sha256-zlgDGfhQJcdxNYH7FIUpQJMQ9ytqhn0fbxRm6Hq+La4=";
 
   mypy-boto3-sagemaker-geospatial =
-    buildMypyBoto3Package "sagemaker-geospatial" "1.40.18"
-      "sha256-yzqISXyDj1FhqTvct8hc+1L1Iutnq29hSGnPAarBE+M=";
+    buildMypyBoto3Package "sagemaker-geospatial" "1.40.55"
+      "sha256-VtcgEoZH1zACZvNGEfy3gDsNVqa3A8JfwTfbd6agL3E=";
 
   mypy-boto3-sagemaker-metrics =
-    buildMypyBoto3Package "sagemaker-metrics" "1.40.0"
-      "sha256-ad7DooARgF8aOpOkvMnUig/zHHARPZe8Y6fkervBGUU=";
+    buildMypyBoto3Package "sagemaker-metrics" "1.40.59"
+      "sha256-7Z+kgd+6TYaE5cNmcJi2eWeAsCs0kSv+c+CLr3c9FnU=";
 
   mypy-boto3-sagemaker-runtime =
-    buildMypyBoto3Package "sagemaker-runtime" "1.40.17"
-      "sha256-NuIRRV2eq/OSMyeqKuZXGFfjzGQpX41Gx5Tv9l/2jOo=";
+    buildMypyBoto3Package "sagemaker-runtime" "1.40.63"
+      "sha256-QbpaTAAmqvN4Vo6vq3U25bcYLgTGZUTvgaxl6BGbxZQ=";
 
   mypy-boto3-savingsplans =
-    buildMypyBoto3Package "savingsplans" "1.40.20"
-      "sha256-N/xsDqZvv3aARvATVE5QV8yGoj7ubCrgp2TTApcfz1g=";
+    buildMypyBoto3Package "savingsplans" "1.40.64"
+      "sha256-o9l8b3o+Z+ft+t5UBUleHbOfHexY6UBUo10ko6Ru/IA=";
 
   mypy-boto3-scheduler =
-    buildMypyBoto3Package "scheduler" "1.40.20"
-      "sha256-kxBY1JSWS6R+YmXqAZGzqwOLQxBCyTYD3SSXavkmSsc=";
+    buildMypyBoto3Package "scheduler" "1.40.60"
+      "sha256-ckZ45QZgelh3hVVmMrxdFO0I9qRs8f4EmmRizHB8MVk=";
 
   mypy-boto3-schemas =
-    buildMypyBoto3Package "schemas" "1.40.19"
-      "sha256-cNAGZVXZKDxfU1x92cBHYa2MlVFCaFTVENt3pbsYpcY=";
+    buildMypyBoto3Package "schemas" "1.40.63"
+      "sha256-QV0qMR8NdhDx4WR3okTGpYvkosZfD3QslmegvvPyvZQ=";
 
   mypy-boto3-sdb =
     buildMypyBoto3Package "sdb" "1.40.0"
       "sha256-0Ih/hjzLE+pf9dXfTHLli5PYAyRGOTq5ghxNcpMN0RA=";
 
   mypy-boto3-secretsmanager =
-    buildMypyBoto3Package "secretsmanager" "1.40.0"
-      "sha256-9lCTZdXU/jJgcDutzvWhxFRV7UVOXwPzVzpQI8wXZkQ=";
+    buildMypyBoto3Package "secretsmanager" "1.40.60"
+      "sha256-KGx39Si4WoeFHsMTudr3Hmu/eafSsdDXYH2rdUdDbGE=";
 
   mypy-boto3-securityhub =
-    buildMypyBoto3Package "securityhub" "1.40.26"
-      "sha256-0DkWoaAhZ0w3CXYtQgvABDZ+PeCIjB9asQkDGSl1/oU=";
+    buildMypyBoto3Package "securityhub" "1.40.59"
+      "sha256-X3jJvfIkBOC2H85etjD/noBJAuQKuXuH5YHwtQg+0as=";
 
   mypy-boto3-securitylake =
-    buildMypyBoto3Package "securitylake" "1.40.0"
-      "sha256-DrmDjFx8N9pqL2tikWd1PD0qvBX2oI2Y9+WiDvAlOgE=";
+    buildMypyBoto3Package "securitylake" "1.40.58"
+      "sha256-bwX8OJWCayO3dpMuhB9VelSzhl/y+vVch0hY8w2NFm0=";
 
   mypy-boto3-serverlessrepo =
-    buildMypyBoto3Package "serverlessrepo" "1.40.17"
-      "sha256-1YK+zUZhTf37giAyXYuZDJ8Gmg4LUZO1FwaAGViIXos=";
+    buildMypyBoto3Package "serverlessrepo" "1.40.63"
+      "sha256-zj7R0tvQvheGrQIAuXQsHBJrm01lQlkoCxkJLZDJR/8=";
 
   mypy-boto3-service-quotas =
     buildMypyBoto3Package "service-quotas" "1.40.48"
       "sha256-9lvZvist3G5plkmsvZ4iHM2iBim8V3BmCYTbk6xDrmc=";
 
   mypy-boto3-servicecatalog =
-    buildMypyBoto3Package "servicecatalog" "1.40.0"
-      "sha256-NQpBAN1iSAgS0TcKWe8GURwxKVdjmslcfkpF8rEL3G4=";
+    buildMypyBoto3Package "servicecatalog" "1.40.63"
+      "sha256-fKcu/kTLFF/SCXN37pnaKidNi+KxUCnF7FsKTYRucrA=";
 
   mypy-boto3-servicecatalog-appregistry =
-    buildMypyBoto3Package "servicecatalog-appregistry" "1.40.18"
-      "sha256-0UIIVr2CmQYi6QefrbpCvPvBUaw/fIyzZY6RuWWIwn4=";
+    buildMypyBoto3Package "servicecatalog-appregistry" "1.40.61"
+      "sha256-zATKH97rJDBSc14LaphATdXW0S/4peOEJjK3sSwDk5Q=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.40.10"
-      "sha256-/Gyq9dgCjeIrNTxUqE/mvfPr+4c+Ann5+ep3/NJhrW8=";
+    buildMypyBoto3Package "servicediscovery" "1.40.59"
+      "sha256-iJOjHP6nqOp7LtyEQe3ZPPQVX7hwplNk1BRG3RaFQNM=";
 
   mypy-boto3-ses =
-    buildMypyBoto3Package "ses" "1.40.20"
-      "sha256-cmGVTHQ2BGpeKYymXfxMrX+AfuHky6DTNwxL0pK4NEU=";
+    buildMypyBoto3Package "ses" "1.40.60"
+      "sha256-qzGok36eKfk+Wmo1m7NEYVJV9GayCjqBT3P++pMK+Xo=";
 
   mypy-boto3-sesv2 =
-    buildMypyBoto3Package "sesv2" "1.40.0"
-      "sha256-aGK44+fTKwT+5o4bcqz1GvOm/9gpP3oX82Eta/uXc8w=";
+    buildMypyBoto3Package "sesv2" "1.40.58"
+      "sha256-e5n43zgh7Eo0CO6p3m3hC86lk5eAT9gBS8aluLFYORM=";
 
   mypy-boto3-shield =
-    buildMypyBoto3Package "shield" "1.40.17"
-      "sha256-nQ2tvjrYiAvx/NH7u0F+Ys15hYfQz4sVERpw9IH2RQQ=";
+    buildMypyBoto3Package "shield" "1.40.60"
+      "sha256-BHmfR+Kx9ZT/xbcXbBrYcraFKPbhZ+uc/1c+IQBiVLk=";
 
   mypy-boto3-signer =
-    buildMypyBoto3Package "signer" "1.40.18"
-      "sha256-1SQFGuDDU8MkciZtGjkLhY0zFyIPkwvgYXJLoYEK1oI=";
+    buildMypyBoto3Package "signer" "1.40.55"
+      "sha256-B60F/Q2FlLuNCGZuxSZ3A9QSAMFMgFOO0AFLzmTdyoU=";
 
   mypy-boto3-simspaceweaver =
-    buildMypyBoto3Package "simspaceweaver" "1.40.16"
-      "sha256-RfRroS8x3KiY5OvyRpOT8WCi37cI5YUbZj2BEOskgKk=";
+    buildMypyBoto3Package "simspaceweaver" "1.40.60"
+      "sha256-FMOmmPRoZJHz2/U6U5IkMRmDd7XztoqKQKTVm3CAfeE=";
 
   mypy-boto3-sms =
     buildMypyBoto3Package "sms" "1.40.0"
@@ -1277,92 +1277,92 @@ in
       "sha256-qWnTJxM1h3pmY2PnI8PjT7u4+xODrSQM41IK8QsJCfM=";
 
   mypy-boto3-snow-device-management =
-    buildMypyBoto3Package "snow-device-management" "1.40.19"
-      "sha256-zEYw2hrNiXj3tUFOzfLrtewLMCMFuIyXZzdzdcY7nfU=";
+    buildMypyBoto3Package "snow-device-management" "1.40.59"
+      "sha256-n9fTVYvwyPnGIkLjHpALZ1nqZC6XrClJltHicNbgd1k=";
 
   mypy-boto3-snowball =
-    buildMypyBoto3Package "snowball" "1.40.17"
-      "sha256-MVXzb+7NvziTkEQuuo3GQdoHrrnL9859f0i07qQGnYc=";
+    buildMypyBoto3Package "snowball" "1.40.64"
+      "sha256-G4DP0bpdEItLqe8nNyQIrH9YjaLsQulihQh85yT4nt0=";
 
   mypy-boto3-sns =
-    buildMypyBoto3Package "sns" "1.40.1"
-      "sha256-4G2J2xDIM2QJY2XGMKFE1Zyj4P22Y7vWtzvRgW0eU9s=";
+    buildMypyBoto3Package "sns" "1.40.57"
+      "sha256-O+SB0ntnaEzGUHq/GJAE8tCPLcIaTcuWIJ850rv0Vz8=";
 
   mypy-boto3-sqs =
-    buildMypyBoto3Package "sqs" "1.40.35"
-      "sha256-wR+V7nK924T3/s8wADcuAVR/NnNwZLeF8c80GRuH4D8=";
+    buildMypyBoto3Package "sqs" "1.40.61"
+      "sha256-FtNNtlPc8oYYtOQirjLrLTTz+Tfc7l7dTKTePducOFc=";
 
   mypy-boto3-ssm =
-    buildMypyBoto3Package "ssm" "1.40.37"
-      "sha256-2cdpa5i6N2lbul6s/gDxMFaL7zQ0QmJC3y1fpiSGtvM=";
+    buildMypyBoto3Package "ssm" "1.40.54"
+      "sha256-V6L3DNfXgzQIXLp0ahUw+ILAw6QagJVcZdSf07V9Zb0=";
 
   mypy-boto3-ssm-contacts =
-    buildMypyBoto3Package "ssm-contacts" "1.40.15"
-      "sha256-4My0GYzzmWFuuIgKWPxxUaCipvSYj7nsb44b7a1krbU=";
+    buildMypyBoto3Package "ssm-contacts" "1.40.54"
+      "sha256-OUZn5wWVxirqeyEIrPgIbBwG2ikudihKJo/WJItVkLM=";
 
   mypy-boto3-ssm-incidents =
-    buildMypyBoto3Package "ssm-incidents" "1.40.0"
-      "sha256-EX4a0R3N6pWZpybsRofvsZ7Z5eQCu7eczEOHyr2S+h4=";
+    buildMypyBoto3Package "ssm-incidents" "1.40.57"
+      "sha256-qk/18pIl23+NoiPHM39hFIhJx0sTxhR/JJmRf9ePpx4=";
 
   mypy-boto3-ssm-sap =
-    buildMypyBoto3Package "ssm-sap" "1.40.20"
-      "sha256-IHBV71mK16u4EEiQddrEOEWIB4mIAjo6wyZronw8+2w=";
+    buildMypyBoto3Package "ssm-sap" "1.40.60"
+      "sha256-KPj/5+bRGnfGct08/e50UhrR14xm+HDYVxoM+U6ugec=";
 
   mypy-boto3-sso =
-    buildMypyBoto3Package "sso" "1.40.20"
-      "sha256-XlnYeHhZ5IttMBKIa2rsk22QDRp2M72x1nAeJ3CiKa0=";
+    buildMypyBoto3Package "sso" "1.40.63"
+      "sha256-sNbfCSaPWCpF67SQcKcy290OSiMPdHpJsYTUq7uaeyU=";
 
   mypy-boto3-sso-admin =
-    buildMypyBoto3Package "sso-admin" "1.40.37"
-      "sha256-TiCqp80H4oP2DyyMoKUMqndaePtj5AhzhWck/Vm82AA=";
+    buildMypyBoto3Package "sso-admin" "1.40.60"
+      "sha256-TtEJjbTL9jtHQv1GFPCq2Rli0bhmDCR0OGFZyYZjU2U=";
 
   mypy-boto3-sso-oidc =
-    buildMypyBoto3Package "sso-oidc" "1.40.37"
-      "sha256-HWLKg9KykJJiv/eibjEymSRq4pThP30GKL0KwYJTRyc=";
+    buildMypyBoto3Package "sso-oidc" "1.40.59"
+      "sha256-s2zrJxGMHYvWUJCb+4Qn2Ot0qDLBI8wTPpGLy5iUzPw=";
 
   mypy-boto3-stepfunctions =
-    buildMypyBoto3Package "stepfunctions" "1.40.0"
-      "sha256-t+4xYTbTLkXRoDyteBCVljSb3v2P/sBLLEUmpQm6U80=";
+    buildMypyBoto3Package "stepfunctions" "1.40.60"
+      "sha256-zDN+pmptUjq9Cnc6U7mmWqat6PiSWxJibgEuYq1P96Q=";
 
   mypy-boto3-storagegateway =
-    buildMypyBoto3Package "storagegateway" "1.40.0"
-      "sha256-LwQqfbpqRaGyridCiI73LjQjsQn+h6Gc2HDt3AKt8dI=";
+    buildMypyBoto3Package "storagegateway" "1.40.58"
+      "sha256-aRgrg0Mpzc+gk2GIPjofavpf6IkMNW3kB+vU6aNelhk=";
 
   mypy-boto3-sts =
-    buildMypyBoto3Package "sts" "1.40.0"
-      "sha256-61XlCWCuYZTQlIhGTDAhljkt9xKmpfQwi2oOJCRM/Vw=";
+    buildMypyBoto3Package "sts" "1.40.63"
+      "sha256-O3TsxQZwDrBQKZP2JMqqKGVZ417H4FrTjuPxdR4KCiQ=";
 
   mypy-boto3-support =
     buildMypyBoto3Package "support" "1.40.17"
       "sha256-Ngqg/OaZCigXIPORzWl8CMv64KPmu8axXSgnBzBWnII=";
 
   mypy-boto3-support-app =
-    buildMypyBoto3Package "support-app" "1.40.17"
-      "sha256-PKD1uLbQHrySwD8nMt/OHqkGbu1qWyEYM2KzMMM+VR4=";
+    buildMypyBoto3Package "support-app" "1.40.61"
+      "sha256-JRCWcVeatM6XvNH/Rdi4Ny2Clpt5L2aAQjVRRcyT69E=";
 
   mypy-boto3-swf =
-    buildMypyBoto3Package "swf" "1.40.0"
-      "sha256-qkE3rF32WkR56WB5pu3dKJLCLY5e1rvMDPYAruyj9O8=";
+    buildMypyBoto3Package "swf" "1.40.55"
+      "sha256-zer2dqLkBLe1CA5I6+9DavQPvVLtrGFoxi50BRDOI3s=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.40.44"
-      "sha256-777DKmK4DKxIWhXp+Mu7TQ8wNdfnzz4+0fJyPVGx0R0=";
+    buildMypyBoto3Package "synthetics" "1.40.58"
+      "sha256-naC16by9nRoZvRfSIIYJdk4jT/lxqUDeogtGb+q+avk=";
 
   mypy-boto3-textract =
-    buildMypyBoto3Package "textract" "1.40.0"
-      "sha256-hMLxKQ6aMwdquw2oOgeB33OigX25MOQFJhGEBfEyf7U=";
+    buildMypyBoto3Package "textract" "1.40.64"
+      "sha256-KPHmg5J3t6O7SsukkdqnLiNxHpnbS81kPjCD5gxlrzs=";
 
   mypy-boto3-timestream-query =
-    buildMypyBoto3Package "timestream-query" "1.40.20"
-      "sha256-EHQ0m8Pr8I+CxxOolkFP6LtY4V0qGosNQTPukYg8PQ8=";
+    buildMypyBoto3Package "timestream-query" "1.40.54"
+      "sha256-QXykPDFwDXTY44JyYNYRBvG9/rBVmtisFKrmp6UKIQM=";
 
   mypy-boto3-timestream-write =
-    buildMypyBoto3Package "timestream-write" "1.40.19"
-      "sha256-yNvBlR2lXUMJkAUGSncExJqF85Iu9iqQWdDBGAVWgnE=";
+    buildMypyBoto3Package "timestream-write" "1.40.55"
+      "sha256-cdyFlcNg9F5RPYJ8xuLm1G1plHQDhRe2YQZqUv+wk8U=";
 
   mypy-boto3-tnb =
-    buildMypyBoto3Package "tnb" "1.40.0"
-      "sha256-SfZ4sYKJic9iQfWxUQEdV233Y5NbITHWjC3Vt+hFpHA=";
+    buildMypyBoto3Package "tnb" "1.40.55"
+      "sha256-Jzl2BKfgW5EK0GbjUP+BFqNOeEiFvlMMlgzaJxgaFzs=";
 
   mypy-boto3-transcribe =
     buildMypyBoto3Package "transcribe" "1.40.52"
@@ -1373,66 +1373,66 @@ in
       "sha256-Z00yi43t9SMR1hsAG5EkvjaRKLqUU4uYwdn3KVVo+6w=";
 
   mypy-boto3-translate =
-    buildMypyBoto3Package "translate" "1.40.17"
-      "sha256-sc7qt+4ztG8uxTo05AfI47zEbQsA2DjI6vUg4vPHsb8=";
+    buildMypyBoto3Package "translate" "1.40.59"
+      "sha256-JDhOF/W9hClZoQDlnYIfAKsU14jyCEillCfq2kqnhSM=";
 
   mypy-boto3-verifiedpermissions =
-    buildMypyBoto3Package "verifiedpermissions" "1.40.24"
-      "sha256-AhS/FxuTPVNoi6cys6LS9wKqUKlkUZ9G3boVxJPTcNU=";
+    buildMypyBoto3Package "verifiedpermissions" "1.40.59"
+      "sha256-FLFeiaXU/dnFKdoHrgP/ST1zijX8k3Ws/pBU7DMU27M=";
 
   mypy-boto3-voice-id =
-    buildMypyBoto3Package "voice-id" "1.40.19"
-      "sha256-voJSA17LDkjLBNDd7/TPS5tC63BfyEffvp7JUb46trk=";
+    buildMypyBoto3Package "voice-id" "1.40.54"
+      "sha256-6usEXd0rpBSaLBKHawPIiPzqfHoNCGVO8c2p0eBqrvs=";
 
   mypy-boto3-vpc-lattice =
-    buildMypyBoto3Package "vpc-lattice" "1.40.41"
-      "sha256-ULIgKqAo6aDuFZpl/NFS77RrR8yCss7HbRV7E25OcqE=";
+    buildMypyBoto3Package "vpc-lattice" "1.40.59"
+      "sha256-39fPl4F2Xiz6+AN8HeGi33Yjj9mfxvU3ZmklLY0STMk=";
 
   mypy-boto3-waf =
-    buildMypyBoto3Package "waf" "1.40.20"
-      "sha256-ypvb9EgrioTSxnTcoiEO7XV5xACxGhY9HUPbOeWVFBI=";
+    buildMypyBoto3Package "waf" "1.40.64"
+      "sha256-6hFX0XgzB+dMqyaEUJQADjivNJH71oD4KG4KulkqRjE=";
 
   mypy-boto3-waf-regional =
-    buildMypyBoto3Package "waf-regional" "1.40.18"
-      "sha256-r1Z15ZcuHUFEr7yUhnksIfPtxMlCrCiQw4TfRFfSW/U=";
+    buildMypyBoto3Package "waf-regional" "1.40.60"
+      "sha256-bbhNpZd4H36Ai5o0HhLJaVTmteMwswzLGpg4huYXQCQ=";
 
   mypy-boto3-wafv2 =
     buildMypyBoto3Package "wafv2" "1.40.49"
       "sha256-OM6g8hX/ZPIg9cEMmCqEJfCXU/tsNUN2deqEm6HoFd4=";
 
   mypy-boto3-wellarchitected =
-    buildMypyBoto3Package "wellarchitected" "1.40.17"
-      "sha256-YCjVBZlqyrA72U/Y18Wt4j2FRLAi0YnkLYx/i9BAg34=";
+    buildMypyBoto3Package "wellarchitected" "1.40.55"
+      "sha256-oD/sVVMrRUBW5brBaCyNeNfHU4ZAWgfiqcgEwTxN00c=";
 
   mypy-boto3-wisdom =
-    buildMypyBoto3Package "wisdom" "1.40.0"
-      "sha256-B+hgPZPqVl2YpsBxmkVph+L9lMv7PzJAevqMEXHAXSQ=";
+    buildMypyBoto3Package "wisdom" "1.40.59"
+      "sha256-ZNjp4SzprutjypEz2lNfVl26eaQa42M7ihnyoxKjptE=";
 
   mypy-boto3-workdocs =
-    buildMypyBoto3Package "workdocs" "1.40.19"
-      "sha256-4EAAV8OhTKmJV0EbOJvwLUj1sxxuPzZetqt3rJo+ZTA=";
+    buildMypyBoto3Package "workdocs" "1.40.57"
+      "sha256-12d4SbtVxKDSBedA1F2VnopqBKowjuIKboHZpIKEwAc=";
 
   mypy-boto3-worklink =
     buildMypyBoto3Package "worklink" "1.35.0"
       "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ=";
 
   mypy-boto3-workmail =
-    buildMypyBoto3Package "workmail" "1.40.22"
-      "sha256-Qnuq7/wu/rlW3mr4oCJ5isJJd9SHxzZA/cSiayVpTI0=";
+    buildMypyBoto3Package "workmail" "1.40.57"
+      "sha256-S5/42kRGzK1BTxE8Sp6XY93kljykbQK0YYCwQM+sJxY=";
 
   mypy-boto3-workmailmessageflow =
-    buildMypyBoto3Package "workmailmessageflow" "1.40.20"
-      "sha256-wOW0p/aZvOe3zQc9eIAirP4NmiVUUSxIeUwEIWbK4Eo=";
+    buildMypyBoto3Package "workmailmessageflow" "1.40.60"
+      "sha256-tdinxlqaJt7S2m87xb82AlSB+FgrKSuFZKcGIfbNnUs=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.40.10"
-      "sha256-6PTGF3akduOS0VRS43ykcKzK25iyQb+bqvpCe+BM9Qw=";
+    buildMypyBoto3Package "workspaces" "1.40.61"
+      "sha256-/N2wHasgisfb8fVCiKsNecyTZRGF7e111qr95hYEIac=";
 
   mypy-boto3-workspaces-web =
-    buildMypyBoto3Package "workspaces-web" "1.40.0"
-      "sha256-1Nm+3yAqMg/qtpdxae2etPehfszBq454U/U/1ClPeGg=";
+    buildMypyBoto3Package "workspaces-web" "1.40.54"
+      "sha256-WN0pAbfJbsq+1LB1BM/S3goNS2sQlJka0Kn6ZCps2us=";
 
   mypy-boto3-xray =
-    buildMypyBoto3Package "xray" "1.40.21"
-      "sha256-vYgKyQDj823W9FAZST7H3hxCAdqeUM2TRSaDTLMObqs=";
+    buildMypyBoto3Package "xray" "1.40.61"
+      "sha256-FEAlQu+9Ghddr4peEO6zbhHM9LN6/aJZ/+tdMKHH8bM=";
 }
diff --git a/pkgs/development/python-modules/napari-console/default.nix b/pkgs/development/python-modules/napari-console/default.nix
index f69b410f5a62..fcd5b2b2c813 100644
--- a/pkgs/development/python-modules/napari-console/default.nix
+++ b/pkgs/development/python-modules/napari-console/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "napari-console";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "napari";
     repo = "napari-console";
     tag = "v${version}";
-    hash = "sha256-Hvo9YMDf7CjeGn1kT7m9Y5klH0cD/SWxDQOHkYspGpQ=";
+    hash = "sha256-z1pyG31g+fvTNLbWc2W56zDf33HCx8PvPKwIIc/x2VA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index 2006fa640a03..049411653ca0 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   dask,
   duckdb,
@@ -21,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "narwhals";
-  version = "2.6.0";
+  version = "2.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "narwhals-dev";
     repo = "narwhals";
     tag = "v${version}";
-    hash = "sha256-peD5CLp5YCLPrOmXnoezT+gAJLf7zSb0xdhV+PhC/XI=";
+    hash = "sha256-a/X6LVzFxtjyaFcgZapJZ5i9h5LSB39XjGu/HdhPf8k=";
   };
 
   build-system = [ hatchling ];
@@ -73,6 +74,18 @@ buildPythonPackage rec {
     "test_convert_time_zone_to_connection_tz_pyspark"
     "test_replace_time_zone_to_connection_tz_pyspark"
     "test_lazy"
+    # Incompatible with ibis 11
+    "test_unique_3069"
+    # DuckDB 1.4.x compatibility - empty result schema handling with PyArrow
+    "test_skew_expr"
+    # ibis improvements cause strict XPASS failures (tests expected to fail now pass)
+    "test_empty_scalar_reduction_with_columns"
+    "test_collect_empty"
+  ];
+
+  disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Segfault in included polars/lazyframe
+    "tests/tpch_q1_test.py"
   ];
 
   pytestFlags = [
diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 4eb1555f61b2..ea16db8dfc1d 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -8,23 +8,20 @@
   nats-server,
   nkeys,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   uvloop,
 }:
 
 buildPythonPackage rec {
   pname = "nats-py";
-  version = "2.11.0";
+  version = "2.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.py";
     tag = "v${version}";
-    hash = "sha256-wILjBhdlNU8U2lyJm4CmPy4DzOjJ7cBIkawKwW5KVgg=";
+    hash = "sha256-HQtoFyw3Gi/lIQFVrFvRtWWzHTY+TchZYKqTiHfUWFk=";
   };
 
   build-system = [ setuptools ];
@@ -71,7 +68,7 @@ buildPythonPackage rec {
     description = "Python client for NATS.io";
     homepage = "https://github.com/nats-io/nats.py";
     changelog = "https://github.com/nats-io/nats.py/releases/tag/${src.tag}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix
index 55ee21da9349..ca0ba59d3e0d 100644
--- a/pkgs/development/python-modules/nbdev/default.nix
+++ b/pkgs/development/python-modules/nbdev/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "nbdev";
-  version = "2.4.5";
+  version = "2.4.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Evp67exwUVu7Dv3z85AAeTVB4CCcBHzRFXYcq+KEpj0=";
+    hash = "sha256-nr5bHyhyJDFOilNOCW3DH67Q+J2n+jDvXhqPiXchUyQ=";
   };
 
   pythonRelaxDeps = [ "ipywidgets" ];
diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index be51deb7592f..86201dc13f5c 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "6.3.0";
+  version = "6.3.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "gajim";
     repo = "python-nbxmpp";
     rev = "refs/tags/${version}";
-    hash = "sha256-s29d3SqmnFuqnr7B6u7N+kPKfccMlmTIoQGtjOe1ipg=";
+    hash = "sha256-osT6arHZ+ac9NAfyVU/ArT78QCTfq3rPPmwdhvTMg14=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/ndcurves/default.nix b/pkgs/development/python-modules/ndcurves/default.nix
new file mode 100644
index 000000000000..885cfa64a024
--- /dev/null
+++ b/pkgs/development/python-modules/ndcurves/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  ndcurves,
+
+  boost,
+  pinocchio,
+  python,
+}:
+toPythonModule (
+  ndcurves.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+    # those are used by CMake at configure/build time
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+    propagatedBuildInputs = [
+      boost
+      pinocchio
+      ndcurves
+    ]
+    ++ super.propagatedBuildInputs;
+    nativeCheckInputs = [
+      pythonImportsCheckHook
+    ];
+    pythonImportsCheck = [
+      "ndcurves"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/neo/default.nix b/pkgs/development/python-modules/neo/default.nix
index 88336f41fb55..50199c6cfe99 100644
--- a/pkgs/development/python-modules/neo/default.nix
+++ b/pkgs/development/python-modules/neo/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "neo";
-  version = "0.14.2";
+  version = "0.14.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "NeuralEnsemble";
     repo = "python-neo";
     tag = version;
-    hash = "sha256-THAdUFCbteiUdfhjLzl6ocM2I0zFKHfFxJExCnK1z1Y=";
+    hash = "sha256-y2MGzIfF+KrEzdjUxiDaU1ZKBK5FksX1IBJdc9RvLhM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index 48ea82a7a9d6..82ff3aee6f8c 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "neo4j";
-  version = "6.0.2";
+  version = "6.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neo4j";
     repo = "neo4j-python-driver";
     tag = version;
-    hash = "sha256-0Idfa7hFrLSD26PpA/lJcVtYpAPcX+AF3wab092Sbzw=";
+    hash = "sha256-KhPxwj5MmhNpd4d64dN0d1wOP6nAac/DsRQ8zoT03/A=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/netbox-topology-views/default.nix b/pkgs/development/python-modules/netbox-topology-views/default.nix
index 007a94a6225a..5ec93614badc 100644
--- a/pkgs/development/python-modules/netbox-topology-views/default.nix
+++ b/pkgs/development/python-modules/netbox-topology-views/default.nix
@@ -10,7 +10,7 @@
 }:
 buildPythonPackage rec {
   pname = "netbox-topology-views";
-  version = "4.3.0";
+  version = "4.4.0";
   pyproject = true;
 
   disabled = python.pythonVersion != netbox.python.pythonVersion;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "netbox-community";
     repo = "netbox-topology-views";
     tag = "v${version}";
-    hash = "sha256-K8hG2M8uWPk9+7u21z+hmedOovievkMNpn3p7I4+6t4=";
+    hash = "sha256-HsG5joHdqVuL6viBwZ8AyvFBCLmcq0YB+2ehLO5gsFc=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index 87db48b04087..26784e013ca5 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -7,23 +7,20 @@
   napalm,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   toml,
 }:
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.15.0";
+  version = "1.15.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = "netutils";
     tag = "v${version}";
-    hash = "sha256-BdxmzxnuccAb8BiE48KSYLXJzAaz7eSYMJA2bgSbWj4=";
+    hash = "sha256-bT/a6PhjNZ7vYXio7XOKNnzRfh7UqRn3+OYbhlYL3/I=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix
index 45904d90c38f..258faa3462ed 100644
--- a/pkgs/development/python-modules/niworkflows/default.nix
+++ b/pkgs/development/python-modules/niworkflows/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "niworkflows";
-  version = "1.14.2";
+  version = "1.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nipreps";
     repo = "niworkflows";
     tag = version;
-    hash = "sha256-LzzbletoZdI9HuaBWhFB6IGs1nX6ZItNP6cWlw5m5EE=";
+    hash = "sha256-wdPHXVgMvd+Od3M2j7S43gBRSh4yiPeu+HM6EyiakwU=";
   };
 
   pythonRelaxDeps = [ "traits" ];
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix b/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix
new file mode 100644
index 000000000000..ddba0da26cbb
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  uv-build,
+  gitpython,
+  ruff,
+  mypy,
+}:
+
+buildPythonPackage {
+  pname = "nixpkgs-plugin-update";
+  version = "0.1.0";
+  format = "pyproject";
+
+  src = ./nixpkgs-plugin-update;
+
+  build-system = [ uv-build ];
+
+  dependencies = [
+    gitpython
+  ];
+
+  nativeCheckInputs = [
+    ruff
+    mypy
+  ];
+
+  postInstallCheck = ''
+    ruff check
+    mypy
+  '';
+
+  meta = {
+    description = "Library for updating plugin collections in Nixpkgs";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers.teto
+      lib.maintainers.perchun
+      lib.maintainers.khaneliman
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore
new file mode 100644
index 000000000000..688db6151f29
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore
@@ -0,0 +1,14 @@
+uv.lock
+.ruff_cache/
+.mypy_cache/
+
+# Python-generated files
+__pycache__/
+*.py[oc]
+build/
+dist/
+wheels/
+*.egg-info
+
+# Virtual environments
+.venv
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml
new file mode 100644
index 000000000000..4c55bbb015b7
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml
@@ -0,0 +1,20 @@
+[project]
+name = "nixpkgs-plugin-update"
+version = "0.1.0"
+requires-python = ">=3.12"
+dependencies = [
+    "gitpython>=3.1.45",
+]
+
+[build-system]
+requires = ["uv_build>=0.8.19"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "mypy>=1.18.2",
+    "ruff>=0.14.1",
+]
+
+[tool.mypy]
+packages = ["nixpkgs_plugin_update"]
diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
similarity index 97%
rename from maintainers/scripts/pluginupdate-py/pluginupdate.py
rename to pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
index c65a27b16cd7..299d5a056a99 100644
--- a/maintainers/scripts/pluginupdate-py/pluginupdate.py
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
@@ -3,13 +3,6 @@
 # - pkgs/applications/editors/kakoune/plugins/update.py
 # - pkgs/development/lua-modules/updater/updater.py
 
-# format:
-# $ nix run nixpkgs#ruff maintainers/scripts/pluginupdate.py
-# type-check:
-# $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py
-# linted:
-# $ nix run nixpkgs#python3.pkgs.flake8 -- --ignore E501,E265 maintainers/scripts/pluginupdate.py
-
 import argparse
 import csv
 import functools
@@ -104,7 +97,7 @@ class Repo:
         self._branch = branch
         # Redirect is the new Repo to use
         self.redirect: "Repo | None" = None
-        self.token = "dummy_token"
+        self.token: str | None = "dummy_token"
 
     @property
     def name(self):
@@ -141,7 +134,7 @@ class Repo:
         loaded = json.loads(data)
         return loaded
 
-    def prefetch(self, ref: str | None) -> str:
+    def prefetch(self, ref: str) -> str:
         log.info("Prefetching %s", self.uri)
         loaded = self._prefetch(ref)
         return loaded["sha256"]
@@ -202,12 +195,12 @@ class RepoGitHub(Repo):
             latest_entry = root.find(ATOM_ENTRY)
             assert latest_entry is not None, f"No commits found in repository {self}"
             commit_link = latest_entry.find(ATOM_LINK)
-            assert commit_link is not None, f"No link tag found feed entry {xml}"
+            assert commit_link is not None, f"No link tag found feed entry {xml!r}"
             url = urlparse(commit_link.get("href"))
             updated_tag = latest_entry.find(ATOM_UPDATED)
             assert (
                 updated_tag is not None and updated_tag.text is not None
-            ), f"No updated tag found feed entry {xml}"
+            ), f"No updated tag found feed entry {xml!r}"
             updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
             return Path(str(url.path)).name, updated
 
@@ -372,7 +365,7 @@ class Editor:
         self.default_out = default_out or root.joinpath("generated.nix")
         self.deprecated = deprecated or root.joinpath("deprecated.json")
         self.cache_file = cache_file or f"{name}-plugin-cache.json"
-        self.nixpkgs_repo = None
+        self.nixpkgs_repo: git.Repo | None = None
 
     def add(self, args):
         """CSV spec"""
@@ -403,6 +396,7 @@ class Editor:
 
             autocommit = not args.no_commit
             if autocommit:
+                assert editor.nixpkgs_repo is not None
                 commit(
                     editor.nixpkgs_repo,
                     "{drv_name}: init at {version}".format(
@@ -788,11 +782,10 @@ def make_repo(uri: str, branch) -> Repo:
     # dumb check to see if it's of the form owner/repo (=> github) or https://...
     res = urlparse(uri)
     if res.netloc in ["github.com", ""]:
-        res = res.path.strip("/").split("/")
-        repo = RepoGitHub(res[0], res[1], branch)
+        owner, repo = res.path.strip("/").split("/")
+        return RepoGitHub(owner, repo, branch)
     else:
-        repo = Repo(uri.strip(), branch)
-    return repo
+        return Repo(uri.strip(), branch)
 
 
 def get_cache_path(cache_file_name: str) -> Path | None:
@@ -928,7 +921,7 @@ def update_plugins(editor: Editor, args):
     All input arguments are grouped in the `Editor`."""
 
     log.info("Start updating plugins")
-    if args.proc > 1 and args.github_token == None:
+    if args.proc > 1 and args.github_token is None:
         log.warning(
             "You have enabled parallel updates but haven't set a github token.\n"
             "You may be hit with `HTTP Error 429: too many requests` as a consequence."
@@ -966,6 +959,7 @@ def update_plugins(editor: Editor, args):
     if redirects:
         update()
         if autocommit:
+            assert editor.nixpkgs_repo is not None
             commit(
                 editor.nixpkgs_repo,
                 f"{editor.attr_path}: resolve github repository redirects",
diff --git a/maintainers/scripts/pluginupdate-py/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/py.typed
similarity index 100%
rename from maintainers/scripts/pluginupdate-py/__init__.py
rename to pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/py.typed
diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix
index 2a408c9a2572..95288e479324 100644
--- a/pkgs/development/python-modules/nodriver/default.nix
+++ b/pkgs/development/python-modules/nodriver/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "nodriver";
-  version = "0.47.0";
+  version = "0.48.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X8MRgqTbcl6lb8BCJpopoT5Vorr4Pf3XMKqFHdUmlgg=";
+    hash = "sha256-i7HsT9dZH3RFerJ49hFYEiXu0BVi44eRPm2wairAuC8=";
   };
 
   disabled = pythonOlder "3.9";
diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 2959a1f81e38..24c774b8c0db 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "nomadnet";
-  version = "0.8.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "NomadNet";
     tag = version;
-    hash = "sha256-9XuwVz7p05jgFkDMuag07ibXxjM+MhkL4dLdRs/O3NI=";
+    hash = "sha256-Rqs0x5KF3Nb/VMNBr6IriDWX7th4OrBj3x5tQhUIU3U=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/nonestorage/default.nix b/pkgs/development/python-modules/nonestorage/default.nix
new file mode 100644
index 000000000000..3919754935d6
--- /dev/null
+++ b/pkgs/development/python-modules/nonestorage/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+}:
+
+buildPythonPackage rec {
+  pname = "nonestorage";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nonebot";
+    repo = "nonestorage";
+    tag = "v${version}";
+    hash = "sha256-Y8Ywpp5/FRT8jIhSaMtuzMXs3UJROh5SrFdIZD7ysBA=";
+  };
+
+  build-system = [ hatchling ];
+
+  pythonImportsCheck = [ "nonestorage" ];
+
+  # no test
+  doCheck = false;
+
+  meta = {
+    description = "Simple library that provides local storage folder detect";
+    homepage = "https://github.com/nonebot/nonestorage";
+    changelog = "https://github.com/nonebot/nonestorage/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ moraxyc ];
+  };
+}
diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix
index 2463b925176a..cc60507b7515 100644
--- a/pkgs/development/python-modules/notion-client/default.nix
+++ b/pkgs/development/python-modules/notion-client/default.nix
@@ -1,50 +1,44 @@
 {
   lib,
+  anyio,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  pytestCheckHook,
-  setuptools,
-  anyio,
   httpx,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-vcr,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "notion-client";
-  version = "2.5.0";
+  version = "2.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "ramnes";
     repo = "notion-sdk-py";
     tag = version;
-    hash = "sha256-5SuSfjKs5+2lAVyzK3JVk1naiaYYYBF+X2I+k53Fqx4=";
+    hash = "sha256-kUeZhnQwZ+To5NCo7jtQsTfX1kQotbAHDcHf2qwGOIs=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ httpx ];
-
-  # disable coverage options as they don't provide us value, and they break the default pytestCheckHook
-  preCheck = ''
-    sed -i '/addopts/d' ./setup.cfg
-  '';
+  dependencies = [ httpx ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     anyio
     pytest-asyncio
+    pytest-cov-stub
     pytest-vcr
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "notion_client" ];
 
   disabledTests = [
-    # requires network access
+    # Test requires network access
     "test_api_http_response_error"
   ];
 
diff --git a/pkgs/development/python-modules/nox/default.nix b/pkgs/development/python-modules/nox/default.nix
index 7d5dc73a56e5..614c5717a237 100644
--- a/pkgs/development/python-modules/nox/default.nix
+++ b/pkgs/development/python-modules/nox/default.nix
@@ -12,6 +12,7 @@
   argcomplete,
   colorlog,
   dependency-groups,
+  humanize,
   jinja2,
   packaging,
   tomli,
@@ -28,7 +29,7 @@
 
 buildPythonPackage rec {
   pname = "nox";
-  version = "2025.05.01";
+  version = "2025.10.16";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -37,7 +38,7 @@ buildPythonPackage rec {
     owner = "wntrblm";
     repo = "nox";
     tag = version;
-    hash = "sha256-qH8oh7tmiJkXOobyDZMRZ62w2sRHJF8sh4PX+6s7M70=";
+    hash = "sha256-oRVDGHw/0HkHLtzcSZL2Aj1uxuRS/ms66cBPDQjJ17I=";
   };
 
   build-system = [ hatchling ];
@@ -47,6 +48,7 @@ buildPythonPackage rec {
     attrs
     colorlog
     dependency-groups
+    humanize
     packaging
     virtualenv
   ]
@@ -65,7 +67,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     writableTmpDirAsHomeHook
-  ];
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "nox" ];
 
diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix
index 92a669e7571c..cb92ca9806d0 100644
--- a/pkgs/development/python-modules/nsapi/default.nix
+++ b/pkgs/development/python-modules/nsapi/default.nix
@@ -2,23 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pytz,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "nsapi";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "aquatix";
     repo = "ns-api";
     tag = "v${version}";
-    sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w=";
+    hash = "sha256-Buhc0643WeX/4ZU/RkzNWiFjfEAJUtNL6uJ98unTnCg=";
   };
 
   build-system = [ setuptools ];
@@ -30,11 +27,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ns_api" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python module to query routes of the Dutch railways";
     homepage = "https://github.com/aquatix/ns-api/";
-    changelog = "https://github.com/aquatix/ns-api/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/aquatix/ns-api/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/by-name/nt/ntfy/webpush.nix b/pkgs/development/python-modules/ntfy-webpush/default.nix
similarity index 82%
rename from pkgs/by-name/nt/ntfy/webpush.nix
rename to pkgs/development/python-modules/ntfy-webpush/default.nix
index 9c7adcad3981..0aed4f2c10b8 100644
--- a/pkgs/by-name/nt/ntfy/webpush.nix
+++ b/pkgs/development/python-modules/ntfy-webpush/default.nix
@@ -15,8 +15,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy-webpush";
-    rev = "v${version}";
-    sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n";
+    tag = "v${version}";
+    hash = "sha256-VvQ/kCrq7KSMQdYb8p5P0REdek5oNhjslB45+gbetLc=";
   };
 
   postPatch = ''
@@ -35,10 +35,10 @@ buildPythonPackage rec {
   # no tests, just a script
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cloudbell webpush notification support for ntfy";
     homepage = "https://dschep.github.io/ntfy-webpush/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 2c6a4c3de606..48ec1179cc67 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.11.0";
+  version = "2.14.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dbLAGk7aLnw1e8Z6P1w912UGwVtf1NxChF7y4YIYG60=";
+    hash = "sha256-S+ALEIbHt6XDLjFVgSK3uAJD/gmFebFwln2oPzFStIs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/numpy-typing-compat/default.nix b/pkgs/development/python-modules/numpy-typing-compat/default.nix
new file mode 100644
index 000000000000..65be52b9dc8f
--- /dev/null
+++ b/pkgs/development/python-modules/numpy-typing-compat/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  uv-build,
+  numpy,
+}:
+
+buildPythonPackage rec {
+  pname = "numpy-typing-compat";
+  version = "20250818.2.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "numpy_typing_compat";
+    inherit version;
+    hash = "sha256-cug9U1tjXWaLpzFeQ66AvhRppvrqb8ltMSUW85s9j6U=";
+  };
+
+  build-system = [
+    uv-build
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  pythonImportsCheck = [
+    "numpy_typing_compat"
+  ];
+
+  meta = {
+    description = "Static typing compatibility layer for older versions of NumPy";
+    homepage = "https://pypi.org/project/numpy-typing-compat/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ tm-drtina ];
+  };
+}
diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 397b071909e8..7bbd7781cb83 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchPypi,
+  fetchFromGitHub,
   python,
   numpy_2,
   pythonAtLeast,
@@ -19,6 +19,7 @@
 
   # native dependencies
   blas,
+  coreutils,
   lapack,
 
   # Reverse dependency
@@ -59,15 +60,17 @@ let
 in
 buildPythonPackage rec {
   pname = "numpy";
-  version = "2.3.2";
+  version = "2.3.4";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
-  src = fetchPypi {
-    inherit pname version;
-    extension = "tar.gz";
-    hash = "sha256-4EhqEewwzey1PxhNSW0caiB4bIHlXkFkAnATAFb47kg=";
+  src = fetchFromGitHub {
+    owner = "numpy";
+    repo = "numpy";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-MfL7UQeSuxJIEQzY/0LIuScyBCilINt8e+zAeUNPmH0=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [
@@ -81,6 +84,10 @@ buildPythonPackage rec {
     # remove needless reference to full Python path stored in built wheel
     substituteInPlace numpy/meson.build \
       --replace-fail 'py.full_path()' "'python'"
+
+    # Test_POWER_Features::test_features - FileNotFoundError: [Errno 2] No such file or directory: '/bin/true'
+    substituteInPlace numpy/_core/tests/test_cpu_features.py \
+      --replace-fail '/bin/true' '${lib.getExe' coreutils "true"}'
   '';
 
   build-system = [
@@ -159,6 +166,10 @@ buildPythonPackage rec {
     # AssertionError: (np.int64(0), np.longdouble('9.9999999999999994515e-21'), np.longdouble('3.9696755572509052902e+20'), 'arctanh')
     "test_loss_of_precision"
   ]
+  ++ lib.optionals (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian) [
+    # https://github.com/numpy/numpy/issues/29918
+    "test_sq_cases"
+  ]
   ++ lib.optionals (stdenv.hostPlatform ? gcc.arch) [
     # remove if https://github.com/numpy/numpy/issues/27460 is resolved
     "test_validate_transcendentals"
@@ -176,7 +187,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/numpy/numpy/releases/tag/v${version}";
+    changelog = "https://github.com/numpy/numpy/releases/tag/${src.tag}";
     description = "Scientific tools for Python";
     homepage = "https://numpy.org/";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/nxt-python/default.nix b/pkgs/development/python-modules/nxt-python/default.nix
index bbe611db0734..655f9c10e481 100644
--- a/pkgs/development/python-modules/nxt-python/default.nix
+++ b/pkgs/development/python-modules/nxt-python/default.nix
@@ -5,8 +5,8 @@
   poetry-core,
   pybluez,
   pytestCheckHook,
-  pythonOlder,
   pyusb,
+  pillow,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +14,6 @@ buildPythonPackage rec {
   version = "3.5.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "schodet";
     repo = "nxt-python";
@@ -25,7 +23,10 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies = [ pyusb ];
+  dependencies = [
+    pyusb
+    pillow
+  ];
 
   optional-dependencies = {
     bluetooth = [ pybluez ];
@@ -35,11 +36,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "nxt" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python driver/interface for Lego Mindstorms NXT robot";
     homepage = "https://github.com/schodet/nxt-python";
     changelog = "https://github.com/schodet/nxt-python/releases/tag/${src.tag}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ ibizaman ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ibizaman ];
   };
 }
diff --git a/pkgs/development/python-modules/ochre/default.nix b/pkgs/development/python-modules/ochre/default.nix
index 023fb09d1ef4..836ee041fbfb 100644
--- a/pkgs/development/python-modules/ochre/default.nix
+++ b/pkgs/development/python-modules/ochre/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/getcuia/ochre";
     changelog = "https://github.com/getcuia/ochre/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix
index e8ada9f849c4..c984b2213cdb 100644
--- a/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "ocrmypdf";
-  version = "16.11.0";
+  version = "16.11.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-seylNBl29+QxN+3SbgRUdtTo1JwvW1sODpsz7Gwer3E=";
+    hash = "sha256-EPGAM7hRmhKTk4NZz529yC0j5uJjB2Q/00tU1sjx1Zw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/odc-loader/default.nix b/pkgs/development/python-modules/odc-loader/default.nix
index e97bb7e87dc6..6fb6f3422ca8 100644
--- a/pkgs/development/python-modules/odc-loader/default.nix
+++ b/pkgs/development/python-modules/odc-loader/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     botocore = [ botocore ];
     zarr = [ zarr ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index a891acd22764..bc380ff58a21 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.2.0";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-pF7Wg9N/ScmboNcZ97rWFEsoHNlKOazey56jPw70u6Q=";
+    hash = "sha256-R8K0rJoIZz/+cAurb0623MdC3qkV9YBwT5RKiWHDrn0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index baec6952653f..e9e56f98b705 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-parser";
-  version = "8.5.1";
+  version = "8.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = version;
-    hash = "sha256-rgMUn0VtebKtO0EOVv3jtvTZKGESUdLwRSfvtetT9UE=";
+    hash = "sha256-NpaIOJ517L9k2evuM6/mQc6Da2c+veFOAlRyeUHseKY=";
   };
 
   pythonRelaxDeps = [ "regex" ];
diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix
index 4bbf77f2c4a0..c5a59b064598 100644
--- a/pkgs/development/python-modules/okta/default.nix
+++ b/pkgs/development/python-modules/okta/default.nix
@@ -6,7 +6,6 @@
   fetchPypi,
   flatdict,
   jwcrypto,
-  pycryptodome,
   pycryptodomex,
   pydash,
   pyfakefs,
@@ -15,7 +14,6 @@
   pytest-mock,
   pytest-recording,
   pytestCheckHook,
-  python-jose,
   pythonOlder,
   pyyaml,
   setuptools,
@@ -42,11 +40,9 @@ buildPythonPackage rec {
     aiohttp
     flatdict
     jwcrypto
-    pycryptodome
     pycryptodomex
     pydash
     pyjwt
-    python-jose
     pyyaml
     xmltodict
     yarl
diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index 684091aa6049..cee610f3b5ba 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ollama";
-  version = "0.5.3";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama-python";
     tag = "v${version}";
-    hash = "sha256-QpG8bo6tarhW4NpdD4MQ9DWR/w8KjT2zEQyirYtTjJ0=";
+    hash = "sha256-4GvONxyv3/+mago/AHp5zbfoiKskKxiDZR1h+OhVbPU=";
   };
 
   pythonRelaxDeps = [ "httpx" ];
diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
index 73d47cff1c08..6fecc2fdcfba 100644
--- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
+++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "onedrive-personal-sdk";
-  version = "0.0.14";
+  version = "0.0.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "onedrive-personal-sdk";
     tag = "v${version}";
-    hash = "sha256-WdnkIMmTzvid2bl7n9NHMtF153O91hutMib8bs5BgIs=";
+    hash = "sha256-XKFTwaerAtN0GEZGpJ4Uq81cIrENEkNFhqqqM+eNVII=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix
index dbd2db24232b..4d2ed826d456 100644
--- a/pkgs/development/python-modules/onnxruntime/default.nix
+++ b/pkgs/development/python-modules/onnxruntime/default.nix
@@ -68,6 +68,8 @@ buildPythonPackage {
       libcufft # libcufft.so.XX
       cudnn # libcudnn.soXX
       cuda_cudart # libcudart.so.XX
+    ]
+    ++ lib.optionals onnxruntime.passthru.ncclSupport [
       nccl # libnccl.so.XX
     ]
   );
diff --git a/pkgs/development/python-modules/opack2/default.nix b/pkgs/development/python-modules/opack2/default.nix
new file mode 100644
index 000000000000..d2d4830cede0
--- /dev/null
+++ b/pkgs/development/python-modules/opack2/default.nix
@@ -0,0 +1,43 @@
+{
+  arrow,
+  buildPythonPackage,
+  construct,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "opack2";
+  version = "0.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "opack2";
+    tag = "v${version}";
+    hash = "sha256-7kRR4KOR3Wrya2YE8nL5laXrsnI1lSVZMBEij44J+T0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    arrow
+    construct
+  ];
+
+  pythonImportsCheck = [ "opack2" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/doronz88/opack2/releases/tag/${src.tag}";
+    description = "Python library for parsing the opack format";
+    homepage = "https://github.com/doronz88/opack2";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/openai-agents/default.nix b/pkgs/development/python-modules/openai-agents/default.nix
index 0812eb19d871..8ae73edda134 100644
--- a/pkgs/development/python-modules/openai-agents/default.nix
+++ b/pkgs/development/python-modules/openai-agents/default.nix
@@ -14,13 +14,13 @@
 
 buildPythonPackage rec {
   pname = "openai-agents";
-  version = "0.2.9";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "openai_agents";
-    hash = "sha256-YZxRyM5J+EFHSp5hlXPW9/lqRkMpAHUhRa0EMJq3Cuk=";
+    hash = "sha256-KByv+DmzqyzzvFIRCr6TysoASYXEG/B96OYNA8SnUo4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix
index c127e68c1923..c1f9d59eea50 100644
--- a/pkgs/development/python-modules/openai/default.nix
+++ b/pkgs/development/python-modules/openai/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "openai";
-  version = "1.101.0";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "openai-python";
     tag = "v${version}";
-    hash = "sha256-XCstUYM2jiq3PbNiRmLnguzQtvrGk0Ik5K0tk37bq2U=";
+    hash = "sha256-GD9+81r0vw4n5jdpJW72cmtfqfz7zGs01YuwiziC3h4=";
   };
 
   postPatch = ''substituteInPlace pyproject.toml --replace-fail "hatchling==1.26.3" "hatchling"'';
diff --git a/pkgs/development/python-modules/opendal/Cargo.lock b/pkgs/development/python-modules/opendal/Cargo.lock
new file mode 100644
index 000000000000..afbc051f6e56
--- /dev/null
+++ b/pkgs/development/python-modules/opendal/Cargo.lock
@@ -0,0 +1,6324 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.3.4",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix 1.1.2",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-recursion"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-tls"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ae3c9eba89d472a0e4fe1dea433df78fbbe63d2b764addaf2ba3a6bde89a5e"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "webpki-roots 0.22.6",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "awaitable"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70af449c9a763cb655c6a1e5338b42d99c67190824ff90658c1e30be844c0775"
+dependencies = [
+ "awaitable-error",
+ "cfg-if",
+]
+
+[[package]]
+name = "awaitable-error"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5b3469636cdf8543cceab175efca534471f36eee12fb8374aba00eb5e7e7f8a"
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper 0.1.2",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "backon"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "pin-project",
+ "tokio",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+
+[[package]]
+name = "bb8"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8"
+dependencies = [
+ "async-trait",
+ "futures-util",
+ "parking_lot 0.12.5",
+ "tokio",
+]
+
+[[package]]
+name = "bb8-postgres"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ac82c42eb30889b5c4ee4763a24b8c566518171ebea648cd7e3bc532c60680"
+dependencies = [
+ "async-trait",
+ "bb8",
+ "tokio",
+ "tokio-postgres",
+]
+
+[[package]]
+name = "bigdecimal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.65.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 1.1.0",
+ "shlex",
+ "syn 2.0.108",
+ "which",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.10.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 2.1.1",
+ "shlex",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "borsh"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "bson"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969a9ba84b0ff843813e7249eed1678d9b6607ce5a3b8f0a47af3fcf7978e6e"
+dependencies = [
+ "ahash 0.8.12",
+ "base64 0.22.1",
+ "bitvec",
+ "getrandom 0.2.16",
+ "getrandom 0.3.4",
+ "hex",
+ "indexmap 2.12.0",
+ "js-sys",
+ "once_cell",
+ "rand 0.9.2",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bytecount"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.13+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
+[[package]]
+name = "cacache"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b"
+dependencies = [
+ "digest",
+ "either",
+ "futures",
+ "hex",
+ "libc",
+ "memmap2",
+ "miette",
+ "reflink-copy",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "ssri",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-stream",
+ "walkdir",
+]
+
+[[package]]
+name = "camino"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 1.0.27",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "concurrent_arena"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a07f0a549fe58f8477a15f0f1c3aa8ced03a3cdeaa38a661530572f21ea963a0"
+dependencies = [
+ "arc-swap",
+ "parking_lot 0.12.5",
+ "triomphe",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crc16"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
+
+[[package]]
+name = "crc32c"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
+dependencies = [
+ "rustc_version 0.4.1",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+dependencies = [
+ "darling_core 0.13.4",
+ "darling_macro 0.13.4",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+dependencies = [
+ "darling_core 0.13.4",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.12",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive-new"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_destructure2"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64b697ac90ff296f0fc031ee5a61c7ac31fb9fff50e3fb32873b09223613fc0c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version 0.4.1",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "enum-as-inner"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "error-chain"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "etcd-client"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae697f3928e8c89ae6f4dcf788059f49fd01a76dc53e63628f5a33881f5715e"
+dependencies = [
+ "http 0.2.12",
+ "prost 0.12.6",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-build",
+ "tower 0.4.13",
+ "tower-service",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fail"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6"
+dependencies = [
+ "lazy_static",
+ "log",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flagset"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
+
+[[package]]
+name = "flate2"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "foundationdb"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8696fd1be198f101eb58aeecf0f504fc02b28c7afcc008b4e4a998a91b305108"
+dependencies = [
+ "async-recursion 1.1.1",
+ "async-trait",
+ "foundationdb-gen",
+ "foundationdb-macros",
+ "foundationdb-sys",
+ "futures",
+ "memchr",
+ "rand 0.8.5",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "static_assertions",
+ "uuid",
+]
+
+[[package]]
+name = "foundationdb-gen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62239700f01b041b6372aaeb847c52f960e1a69fd2b1025dc995ea3dd90e3308"
+dependencies = [
+ "xml-rs",
+]
+
+[[package]]
+name = "foundationdb-macros"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "try_map",
+]
+
+[[package]]
+name = "foundationdb-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98e49545f5393d276b7b888c77e3f9519fd33727435f8244344be72c3284256f"
+dependencies = [
+ "bindgen 0.65.1",
+]
+
+[[package]]
+name = "frunk"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28aef0f9aa070bce60767c12ba9cb41efeaf1a2bc6427f87b7d83f11239a16d7"
+dependencies = [
+ "frunk_core",
+ "frunk_derives",
+ "frunk_proc_macros",
+ "serde",
+]
+
+[[package]]
+name = "frunk_core"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "476eeaa382e3462b84da5d6ba3da97b5786823c2d0d3a0d04ef088d073da225c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "frunk_derives"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0b4095fc99e1d858e5b8c7125d2638372ec85aa0fe6c807105cf10b0265ca6c"
+dependencies = [
+ "frunk_proc_macro_helpers",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "frunk_proc_macro_helpers"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1952b802269f2db12ab7c0bd328d0ae8feaabf19f352a7b0af7bb0c5693abfce"
+dependencies = [
+ "frunk_core",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "frunk_proc_macros"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3462f590fa236005bd7ca4847f81438bd6fe0febd4d04e11968d4c2e96437e78"
+dependencies = [
+ "frunk_core",
+ "frunk_proc_macro_helpers",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap 2.12.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash 0.8.12",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.12",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "hdfs-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e2d5cefba2d51a26b44d2a493f963a32725a0f6593c91be4a610ad449c49cb"
+dependencies = [
+ "cc",
+ "java-locator",
+]
+
+[[package]]
+name = "hdrs"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c42a693bfe5dc8fcad1f24044c5ec355c5f157b8ce63c7d62f51cecbc7878d"
+dependencies = [
+ "blocking",
+ "errno",
+ "futures",
+ "hdfs-sys",
+ "libc",
+ "log",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "hrana-client-proto"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16b4e41e289da3fd60e64f245246a97e78fab7b3788c6d8147b3ae7d9f5e533"
+dependencies = [
+ "anyhow",
+ "base64 0.21.7",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.3.1",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.5.10",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http 1.3.1",
+ "hyper 1.7.0",
+ "hyper-util",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tower-service",
+ "webpki-roots 1.0.4",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper 0.14.32",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "hyper 1.7.0",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2 0.6.1",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+
+[[package]]
+name = "icu_properties"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
+
+[[package]]
+name = "icu_provider"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[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 = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.0",
+]
+
+[[package]]
+name = "indoc"
+version = "2.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipconfig"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2 0.5.10",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "java-locator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09c46c1fe465c59b1474e665e85e1256c3893dd00927b8d55f63b09044c1e64f"
+dependencies = [
+ "glob",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
+dependencies = [
+ "base64 0.22.1",
+ "js-sys",
+ "pem 3.0.6",
+ "ring 0.17.14",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "lazy-regex"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "191898e17ddee19e60bccb3945aa02339e81edd4a8c50e21fd4d48cdecda7b29"
+dependencies = [
+ "lazy-regex-proc_macros",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "lazy-regex-proc_macros"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35dc8b0da83d1a9507e12122c80dea71a9c7c613014347392483a83ea593e04"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin 0.9.8",
+]
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "lexical"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6"
+dependencies = [
+ "lexical-core",
+]
+
+[[package]]
+name = "lexical-core"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+ "lexical-util",
+ "lexical-write-float",
+ "lexical-write-integer",
+]
+
+[[package]]
+name = "lexical-parse-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-integer"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags 2.10.0",
+ "libc",
+ "redox_syscall 0.5.18",
+]
+
+[[package]]
+name = "librocksdb-sys"
+version = "0.11.0+8.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
+dependencies = [
+ "bindgen 0.65.1",
+ "bzip2-sys",
+ "cc",
+ "glob",
+ "libc",
+ "libz-sys",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litemap"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "lru"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
+[[package]]
+name = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror 1.0.69",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mini-moka"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-utils",
+ "dashmap",
+ "skeptic",
+ "smallvec",
+ "tagptr",
+ "triomphe",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "moka"
+version = "0.12.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077"
+dependencies = [
+ "async-lock",
+ "crossbeam-channel",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "equivalent",
+ "event-listener 5.4.1",
+ "futures-util",
+ "parking_lot 0.12.5",
+ "portable-atomic",
+ "rustc_version 0.4.1",
+ "smallvec",
+ "tagptr",
+ "uuid",
+]
+
+[[package]]
+name = "mongodb"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef206acb1b72389b49bc9985efe7eb1f8a9bb18e5680d262fac26c07f44025f1"
+dependencies = [
+ "async-trait",
+ "base64 0.13.1",
+ "bitflags 1.3.2",
+ "bson",
+ "chrono",
+ "derivative",
+ "derive_more",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hmac",
+ "lazy_static",
+ "md-5",
+ "pbkdf2 0.11.0",
+ "percent-encoding",
+ "rand 0.8.5",
+ "rustc_version_runtime",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "serde",
+ "serde_bytes",
+ "serde_with",
+ "sha-1",
+ "sha2",
+ "socket2 0.4.10",
+ "stringprep",
+ "strsim 0.10.0",
+ "take_mut",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "trust-dns-proto",
+ "trust-dns-resolver",
+ "typed-builder",
+ "uuid",
+ "webpki-roots 0.25.4",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+
+[[package]]
+name = "mysql-common-derive"
+version = "0.30.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f"
+dependencies = [
+ "darling 0.20.11",
+ "heck 0.4.1",
+ "num-bigint",
+ "proc-macro-crate 1.3.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "termcolor",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "mysql_async"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a"
+dependencies = [
+ "bytes",
+ "crossbeam",
+ "flate2",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "lazy_static",
+ "lru",
+ "mio 0.8.11",
+ "mysql_common",
+ "once_cell",
+ "pem 2.0.1",
+ "percent-encoding",
+ "pin-project",
+ "priority-queue",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "socket2 0.5.10",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "twox-hash",
+ "url",
+ "webpki",
+ "webpki-roots 0.23.1",
+]
+
+[[package]]
+name = "mysql_common"
+version = "0.30.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c"
+dependencies = [
+ "base64 0.21.7",
+ "bigdecimal",
+ "bindgen 0.72.1",
+ "bitflags 2.10.0",
+ "bitvec",
+ "byteorder",
+ "bytes",
+ "cc",
+ "cmake",
+ "crc32fast",
+ "flate2",
+ "frunk",
+ "lazy_static",
+ "lexical",
+ "mysql-common-derive",
+ "num-bigint",
+ "num-traits",
+ "rand 0.8.5",
+ "regex",
+ "rust_decimal",
+ "saturating",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "subprocess",
+ "thiserror 1.0.69",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82c79c15c05d4bf82b6f5ef163104cc81a760d8e874d38ac50ab67c8877b647b"
+dependencies = [
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.5",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "opendal"
+version = "0.46.0"
+dependencies = [
+ "anyhow",
+ "async-tls",
+ "async-trait",
+ "backon",
+ "base64 0.22.1",
+ "bb8",
+ "bb8-postgres",
+ "bytes",
+ "cacache",
+ "chrono",
+ "crc32c",
+ "dashmap",
+ "etcd-client",
+ "flagset",
+ "foundationdb",
+ "futures",
+ "getrandom 0.2.16",
+ "hdrs",
+ "hmac",
+ "hrana-client-proto",
+ "http 1.3.1",
+ "log",
+ "md-5",
+ "mini-moka",
+ "moka",
+ "mongodb",
+ "mysql_async",
+ "once_cell",
+ "openssh",
+ "openssh-sftp-client",
+ "percent-encoding",
+ "persy",
+ "prost 0.11.9",
+ "quick-xml",
+ "r2d2",
+ "redb",
+ "redis",
+ "reqsign",
+ "reqwest",
+ "rocksdb",
+ "rusqlite",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "sled",
+ "suppaftp",
+ "tikv-client",
+ "tokio",
+ "tokio-postgres",
+ "uuid",
+]
+
+[[package]]
+name = "opendal-python"
+version = "0.45.2"
+dependencies = [
+ "bytes",
+ "futures",
+ "opendal",
+ "pyo3",
+ "pyo3-asyncio",
+ "tokio",
+]
+
+[[package]]
+name = "openssh"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330f4b61092456dc0aaa0cf9a205d956cae07d8127a69ffeff6760a72549c77f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "shell-escape",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-pipe",
+]
+
+[[package]]
+name = "openssh-sftp-client"
+version = "0.14.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f472c9c38ea60bc161f8b5df4d04c79057003cdc12572eaad7f6dcc74e6fca5"
+dependencies = [
+ "bytes",
+ "derive_destructure2",
+ "futures-core",
+ "once_cell",
+ "openssh",
+ "openssh-sftp-client-lowlevel",
+ "openssh-sftp-error",
+ "pin-project",
+ "scopeguard",
+ "tokio",
+ "tokio-io-utility",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "openssh-sftp-client-lowlevel"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a84f1a52761901fcf5b10885544085348a872e57294531ec9188145d9a83042"
+dependencies = [
+ "awaitable",
+ "bytes",
+ "concurrent_arena",
+ "derive_destructure2",
+ "openssh-sftp-error",
+ "openssh-sftp-protocol",
+ "pin-project",
+ "tokio",
+ "tokio-io-utility",
+]
+
+[[package]]
+name = "openssh-sftp-error"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a5aea093d714df10186f481a6003e3f906f6fc8360c026737a841f4f182996"
+dependencies = [
+ "awaitable-error",
+ "openssh",
+ "openssh-sftp-protocol-error",
+ "ssh_format_error",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "openssh-sftp-protocol"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c862e0c56553146306507f55958c11ff554e02c46de287e6976e50d815b350"
+dependencies = [
+ "bitflags 2.10.0",
+ "num-derive",
+ "num-traits",
+ "openssh-sftp-protocol-error",
+ "serde",
+ "ssh_format",
+ "vec-strings",
+]
+
+[[package]]
+name = "openssh-sftp-protocol-error"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b54df62ccfd9a7708a83a9d60c46293837e478f9f4c0829360dcfa60ede8d2"
+dependencies = [
+ "serde",
+ "thiserror 2.0.17",
+ "vec-strings",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "ordered-multimap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.12",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.18",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "pem"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
+[[package]]
+name = "pem"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
+dependencies = [
+ "base64 0.22.1",
+ "serde_core",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "persy"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bce6ad02b7ddcdd9978d99d17bb2c717c8e15b94801785a262641cbdf10c5a5"
+dependencies = [
+ "crc",
+ "data-encoding",
+ "fs2",
+ "linked-hash-map",
+ "rand 0.9.2",
+ "thiserror 2.0.17",
+ "unsigned-varint",
+ "zigzag",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.12.0",
+]
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_shared",
+ "serde",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs5"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6"
+dependencies = [
+ "aes",
+ "cbc",
+ "der",
+ "pbkdf2 0.12.2",
+ "scrypt",
+ "sha2",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "pkcs5",
+ "rand_core 0.6.4",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "postgres-protocol"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4"
+dependencies = [
+ "base64 0.22.1",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "hmac",
+ "md-5",
+ "memchr",
+ "rand 0.9.2",
+ "sha2",
+ "stringprep",
+]
+
+[[package]]
+name = "postgres-types"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4605b7c057056dd35baeb6ac0c0338e4975b1f2bef0f65da953285eb007095"
+dependencies = [
+ "bytes",
+ "fallible-iterator",
+ "postgres-protocol",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "priority-queue"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785"
+dependencies = [
+ "autocfg",
+ "indexmap 1.9.3",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit 0.23.7",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prometheus"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
+dependencies = [
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "memchr",
+ "parking_lot 0.12.5",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.6",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+dependencies = [
+ "bytes",
+ "heck 0.5.0",
+ "itertools 0.12.1",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost 0.12.6",
+ "prost-types",
+ "regex",
+ "syn 2.0.108",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+dependencies = [
+ "anyhow",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+dependencies = [
+ "prost 0.12.6",
+]
+
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
+dependencies = [
+ "bitflags 2.10.0",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "parking_lot 0.12.5",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-asyncio"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995"
+dependencies = [
+ "futures",
+ "once_cell",
+ "pin-project-lite",
+ "pyo3",
+ "tokio",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.34",
+ "socket2 0.6.1",
+ "thiserror 2.0.17",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring 0.17.14",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.17",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.1",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r2d2"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
+dependencies = [
+ "log",
+ "parking_lot 0.12.5",
+ "scheduled-thread-pool",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
+[[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.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.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.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "redb"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17a0b35b8077c954324cc3504bea8d35e27a2f5d07c0ba41052a35d92f020f84"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "redis"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "bytes",
+ "combine",
+ "crc16",
+ "futures",
+ "futures-util",
+ "itoa",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "rustls 0.21.12",
+ "rustls-native-certs",
+ "ryu",
+ "sha1_smol",
+ "socket2 0.4.10",
+ "tokio",
+ "tokio-retry",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "url",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "reflink-copy"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23bbed272e39c47a095a5242218a67412a220006842558b03fe2935e8f3d7b92"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "rustix 1.1.2",
+ "windows",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rend"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+dependencies = [
+ "bytecheck",
+]
+
+[[package]]
+name = "reqsign"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70fe66d4cd0b5ed9b1abbfe639bf6baeaaf509f7da2d51b31111ba945be59286"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "base64 0.22.1",
+ "chrono",
+ "form_urlencoded",
+ "getrandom 0.2.16",
+ "hex",
+ "hmac",
+ "home",
+ "http 1.3.1",
+ "jsonwebtoken",
+ "log",
+ "once_cell",
+ "percent-encoding",
+ "quick-xml",
+ "rand 0.8.5",
+ "reqwest",
+ "rsa",
+ "rust-ini",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.7.0",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tokio-util",
+ "tower 0.5.2",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots 1.0.4",
+]
+
+[[package]]
+name = "resolv-conf"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799"
+
+[[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 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rkyv"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rocksdb"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
+dependencies = [
+ "libc",
+ "librocksdb-sys",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sha2",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rusqlite"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
+dependencies = [
+ "bitflags 2.10.0",
+ "fallible-iterator",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
+
+[[package]]
+name = "rust_decimal"
+version = "1.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes",
+ "num-traits",
+ "rand 0.8.5",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver 1.0.27",
+]
+
+[[package]]
+name = "rustc_version_runtime"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
+dependencies = [
+ "rustc_version 0.2.3",
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring 0.17.14",
+ "rustls-webpki 0.101.7",
+ "sct",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+dependencies = [
+ "once_cell",
+ "ring 0.17.14",
+ "rustls-pki-types",
+ "rustls-webpki 0.103.8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.100.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3"
+dependencies = [
+ "ring 0.16.20",
+ "untrusted 0.7.1",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+dependencies = [
+ "ring 0.17.14",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "saturating"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
+
+[[package]]
+name = "schannel"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "scheduled-thread-pool"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
+dependencies = [
+ "parking_lot 0.12.5",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "scrypt"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
+dependencies = [
+ "pbkdf2 0.12.2",
+ "salsa20",
+ "sha2",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.10.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+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"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "indexmap 2.12.0",
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+dependencies = [
+ "serde",
+ "serde_with_macros",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+dependencies = [
+ "darling 0.13.4",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shell-escape"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "simple_asn1"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror 2.0.17",
+ "time",
+]
+
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "skeptic"
+version = "0.13.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8"
+dependencies = [
+ "bytecount",
+ "cargo_metadata",
+ "error-chain",
+ "glob",
+ "pulldown-cmark",
+ "tempfile",
+ "walkdir",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "sled"
+version = "0.34.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
+dependencies = [
+ "crc32fast",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "fs2",
+ "fxhash",
+ "libc",
+ "log",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "ssh_format"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ab31081d1c9097c327ec23550858cb5ffb4af6b866c1ef4d728455f01f3304"
+dependencies = [
+ "bytes",
+ "serde",
+ "ssh_format_error",
+]
+
+[[package]]
+name = "ssh_format_error"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be3c6519de7ca611f71ef7e8a56eb57aa1c818fecb5242d0a0f39c83776c210c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "ssri"
+version = "9.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
+dependencies = [
+ "base64 0.21.7",
+ "digest",
+ "hex",
+ "miette",
+ "serde",
+ "sha-1",
+ "sha2",
+ "thiserror 1.0.69",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subprocess"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "suppaftp"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb79a5b76543d896dbec5c0fd9a28c0ca9a0d4e764c438c37f8463c96e4a8bf2"
+dependencies = [
+ "async-std",
+ "async-tls",
+ "async-trait",
+ "chrono",
+ "futures-lite",
+ "lazy-regex",
+ "log",
+ "pin-project",
+ "rustls 0.21.12",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tagptr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
+
+[[package]]
+name = "take_mut"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "tempfile"
+version = "3.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.4",
+ "once_cell",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thin-vec"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl 2.0.17",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tikv-client"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "048968e4e3d04db472346770cc19914c6b5ae206fa44677f6a0874d54cd05940"
+dependencies = [
+ "async-recursion 0.3.2",
+ "async-trait",
+ "derive-new",
+ "either",
+ "fail",
+ "futures",
+ "lazy_static",
+ "log",
+ "pin-project",
+ "prometheus",
+ "prost 0.12.6",
+ "rand 0.8.5",
+ "regex",
+ "semver 1.0.27",
+ "serde",
+ "serde_derive",
+ "thiserror 1.0.69",
+ "tokio",
+ "tonic",
+]
+
+[[package]]
+name = "time"
+version = "0.3.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio 1.1.0",
+ "parking_lot 0.12.5",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.6.1",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-io-utility"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263"
+dependencies = [
+ "bytes",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tokio-pipe"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f213a84bffbd61b8fa0ba8a044b4bbe35d471d0b518867181e82bd5c15542784"
+dependencies = [
+ "libc",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-postgres"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b40d66d9b2cfe04b628173409368e58247e8eddbbd3b0e6c6ba1d09f20f6c9e"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "futures-channel",
+ "futures-util",
+ "log",
+ "parking_lot 0.12.5",
+ "percent-encoding",
+ "phf",
+ "pin-project-lite",
+ "postgres-protocol",
+ "postgres-types",
+ "rand 0.9.2",
+ "socket2 0.6.1",
+ "tokio",
+ "tokio-util",
+ "whoami",
+]
+
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.12",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls 0.23.34",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.12.0",
+ "toml_datetime 0.6.11",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap 2.12.0",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow 0.7.13",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow 0.7.13",
+]
+
+[[package]]
+name = "tonic"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.21.7",
+ "bytes",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost 0.12.6",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
+dependencies = [
+ "prettyplease",
+ "proc-macro2",
+ "prost-build",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags 2.10.0",
+ "bytes",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "iri-string",
+ "pin-project-lite",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "triomphe"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
+dependencies = [
+ "arc-swap",
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.2.3",
+ "ipnet",
+ "lazy_static",
+ "log",
+ "rand 0.8.5",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "ipconfig",
+ "lazy_static",
+ "log",
+ "lru-cache",
+ "parking_lot 0.12.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "trust-dns-proto",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "try_map"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580"
+
+[[package]]
+name = "twox-hash"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+dependencies = [
+ "cfg-if",
+ "rand 0.8.5",
+ "static_assertions",
+]
+
+[[package]]
+name = "typed-builder"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unindent"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "unsigned-varint"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna 1.1.0",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom 0.3.4",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "vec-strings"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8509489e2a7ee219522238ad45fd370bec6808811ac15ac6b07453804e77659"
+dependencies = [
+ "serde",
+ "thin-vec",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
+dependencies = [
+ "rustls-webpki 0.100.3",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.44",
+]
+
+[[package]]
+name = "whoami"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
+dependencies = [
+ "libredox",
+ "wasite",
+ "web-sys",
+]
+
+[[package]]
+name = "widestring"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[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"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core",
+ "windows-link",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xml-rs"
+version = "0.8.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
+
+[[package]]
+name = "xxhash-rust"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+
+[[package]]
+name = "yoke"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "zigzag"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf"
+dependencies = [
+ "num-traits",
+]
diff --git a/pkgs/development/python-modules/opendal/default.nix b/pkgs/development/python-modules/opendal/default.nix
new file mode 100644
index 000000000000..81ea8ccc691a
--- /dev/null
+++ b/pkgs/development/python-modules/opendal/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+
+  # tests
+  pytest-asyncio,
+  pytestCheckHook,
+  python-dotenv,
+}:
+buildPythonPackage rec {
+  pname = "opendal";
+  version = "0.46.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "opendal";
+    tag = "v${version}";
+    hash = "sha256-OQGpz6o4R0Yp+1vAgFtik/l7wvHwJNcB1BhZLk+BFPg=";
+  };
+
+  sourceRoot = "${src.name}/bindings/python";
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+  };
+
+  env = {
+    PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1;
+  };
+
+  build-system = [
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  pythonImportsCheck = [ "opendal" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+    python-dotenv
+  ];
+
+  meta = {
+    description = "native Python binding for Apache OpenDAL";
+    homepage = "https://github.com/apache/opendal/blob/main/bindings/python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix
index c8569e645056..490c63c1c1f9 100644
--- a/pkgs/development/python-modules/openrgb-python/default.nix
+++ b/pkgs/development/python-modules/openrgb-python/default.nix
@@ -2,20 +2,17 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "openrgb-python";
-  version = "0.3.5";
+  version = "0.3.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-06efPdVHkZG9uR1W+bQcZzxqqEYXlKpmuXmiRk36TZA=";
+    hash = "sha256-86jy8hoOgQocdCeapjaRFO9PKx/TW9kcN16UKSWNVps=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/openstep-parser/default.nix b/pkgs/development/python-modules/openstep-parser/default.nix
index dbdbcc081e59..9375a5c16c34 100644
--- a/pkgs/development/python-modules/openstep-parser/default.nix
+++ b/pkgs/development/python-modules/openstep-parser/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "openstep-parser";
-  version = "2.0.1";
+  version = "2.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kronenthaler";
     repo = "openstep-parser";
     tag = version;
-    hash = "sha256-gvfzBLLaal0Vad3C4m4wIKwJpmlhewsK4A5yeN8l6qU=";
+    hash = "sha256-ivPvkvVWXw5ftaGvwBR+JxBIlisI0p6k3i/8V2HlaqQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/openstep-plist/default.nix b/pkgs/development/python-modules/openstep-plist/default.nix
index 7bde570f3d48..3016f05b9db8 100644
--- a/pkgs/development/python-modules/openstep-plist/default.nix
+++ b/pkgs/development/python-modules/openstep-plist/default.nix
@@ -43,6 +43,6 @@ buildPythonPackage rec {
     description = "Parser for the 'old style' OpenStep property list format also known as ASCII plist";
     homepage = "https://github.com/fonttools/openstep-plist";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix
index be51bcb4d607..4418599015e2 100644
--- a/pkgs/development/python-modules/opentsne/default.nix
+++ b/pkgs/development/python-modules/opentsne/default.nix
@@ -14,7 +14,7 @@
 let
   self = buildPythonPackage rec {
     pname = "opentsne";
-    version = "1.0.3";
+    version = "1.0.4";
     pyproject = true;
 
     disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ let
       owner = "pavlin-policar";
       repo = "openTSNE";
       tag = "v${version}";
-      hash = "sha256-dJM8hv85ST5qGo/oZVr/MgIHGPGpZ+ajaUL7pfSJLAg=";
+      hash = "sha256-cGnhdGpDiBlTeeveCtnveslDytpNO8vtYkxQQ7FhsuA=";
     };
 
     build-system = [
diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 49d1f59f78e0..e67ddad254fb 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.15.6";
+  version = "0.15.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-jSokUs3aJJmcsTPkt2OEkCATLekuOVDGBufi8Fb2rtg=";
+    hash = "sha256-Hqn43KFmte3/zn+f35cxNSLjQ3f7ySPQSVWwMCeQ2Go=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/optimistix/default.nix b/pkgs/development/python-modules/optimistix/default.nix
index c46ddfa1daf8..271ab8520c73 100644
--- a/pkgs/development/python-modules/optimistix/default.nix
+++ b/pkgs/development/python-modules/optimistix/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "optimistix";
-  version = "0.0.10";
+  version = "0.0.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "patrick-kidger";
     repo = "optimistix";
     tag = "v${version}";
-    hash = "sha256-stVPHzv0XNd0I31N2Cj0QYrMmhImyx0cablqZfKBFrM=";
+    hash = "sha256-tTE/f1dYDpTmrqL1D7h7UyqT2gN9+Y1mNJZcjmdHtno=";
   };
 
   build-system = [ hatchling ];
@@ -53,18 +53,23 @@ buildPythonPackage rec {
     pytest-xdist
   ];
 
-  pytestFlags = [
-    # Since jax 0.5.3:
-    # DeprecationWarning: shape requires ndarray or scalar arguments, got <class 'jax._src.api.ShapeDtypeStruct'> at position 0. In a future JAX release this will be an error.
-    "-Wignore::DeprecationWarning"
-  ];
-
   disabledTests = [
     # assert Array(False, dtype=bool)
     # +  where Array(False, dtype=bool) = tree_allclose(Array(0.12993518, dtype=float64), Array(0., dtype=float64, weak_type=True), atol=0.0001, rtol=0.0001)
     "test_least_squares"
   ];
 
+  disabledTestPaths = [
+    # Require circular dependency diffrax
+    "tests/test_compat.py"
+    "tests/test_fixed_point.py"
+    "tests/test_lbfgs_linear_operator.py"
+    "tests/test_least_squares.py"
+    "tests/test_minimise.py"
+    "tests/test_misc.py"
+    "tests/test_root_find.py"
+  ];
+
   meta = {
     description = "Nonlinear optimisation (root-finding, least squares, ...) in JAX+Equinox";
     homepage = "https://github.com/patrick-kidger/optimistix";
diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix
index e810b2744f41..acf01ae469ba 100644
--- a/pkgs/development/python-modules/optype/default.nix
+++ b/pkgs/development/python-modules/optype/default.nix
@@ -2,9 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  hatchling,
+  uv-build,
   typing-extensions,
   numpy,
+  numpy-typing-compat,
   beartype,
   pytestCheckHook,
   pythonOlder,
@@ -12,20 +13,20 @@
 
 buildPythonPackage rec {
   pname = "optype";
-  version = "0.13.1";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jorenham";
     repo = "optype";
     tag = "v${version}";
-    hash = "sha256-GhG2TR5FJgEXBXLyGTNQKFYtR2iZ0tLgZ9B0YL8SXu8=";
+    hash = "sha256-0CE6dU4Vt3UP8ZfNcmP2Th7ixceCa0ItYUmNcEU7mgw=";
   };
 
   disabled = pythonOlder "3.11";
 
   build-system = [
-    hatchling
+    uv-build
   ];
 
   dependencies = [
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     numpy = [
       numpy
+      numpy-typing-compat
     ];
   };
 
@@ -45,6 +47,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     numpy
+    numpy-typing-compat
     beartype
   ];
 
diff --git a/pkgs/development/python-modules/orange-canvas-core/default.nix b/pkgs/development/python-modules/orange-canvas-core/default.nix
index 91ad4e2334c1..7b496befe1f4 100644
--- a/pkgs/development/python-modules/orange-canvas-core/default.nix
+++ b/pkgs/development/python-modules/orange-canvas-core/default.nix
@@ -5,6 +5,7 @@
 
   # build-system
   setuptools,
+  trubar,
 
   # dependencies
   anyqt,
@@ -15,10 +16,12 @@
   filelock,
   lockfile,
   numpy,
+  packaging,
   pip,
-  trubar,
   qasync,
+  requests,
   requests-cache,
+  truststore,
   typing-extensions,
 
   # tests
@@ -42,22 +45,26 @@ buildPythonPackage rec {
     hash = "sha256-cEy9ADU/jZoKmGXVlqwG+qWKZ22STjALgCb1IxAwpO0=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    trubar
+  ];
 
   dependencies = [
     anyqt
-    cachecontrol
     commonmark
     dictdiffer
     docutils
     filelock
     lockfile
     numpy
+    packaging
     pip
     qasync
+    requests
     requests-cache
+    truststore
     typing-extensions
-    trubar
   ];
 
   pythonImportsCheck = [ "orangecanvas" ];
@@ -97,7 +104,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/biolab/orange-canvas-core";
     changelog = "https://github.com/biolab/orange-canvas-core/releases/tag/${src.tag}";
     license = [ lib.licenses.gpl3 ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
     # Segmentation fault during tests
     broken = stdenv.hostPlatform.isDarwin;
   };
diff --git a/pkgs/development/python-modules/orange-widget-base/default.nix b/pkgs/development/python-modules/orange-widget-base/default.nix
index 02e7ab81f7b9..f24813598ffa 100644
--- a/pkgs/development/python-modules/orange-widget-base/default.nix
+++ b/pkgs/development/python-modules/orange-widget-base/default.nix
@@ -66,6 +66,6 @@ buildPythonPackage rec {
     description = "Implementation of the base OWBaseWidget class and utilities for use in Orange Canvas workflows";
     homepage = "https://github.com/biolab/orange-widget-base";
     license = [ lib.licenses.gpl3Plus ];
-    maintainers = [ lib.maintainers.lucasew ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/orange3/default.nix b/pkgs/development/python-modules/orange3/default.nix
index 30a49b4edc40..945b5ef986aa 100644
--- a/pkgs/development/python-modules/orange3/default.nix
+++ b/pkgs/development/python-modules/orange3/default.nix
@@ -222,7 +222,7 @@ let
       homepage = "https://orangedatamining.com/";
       changelog = "https://github.com/biolab/orange3/blob/${src.tag}/CHANGELOG.md";
       license = [ lib.licenses.gpl3Plus ];
-      maintainers = [ lib.maintainers.lucasew ];
+      maintainers = [ ];
       mainProgram = "orange-canvas";
     };
   };
diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 1e4b06e2d871..33baac38cd79 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -18,6 +18,7 @@
   nest-asyncio,
   numpy,
   protobuf,
+  psutil,
   pyyaml,
   simplejson,
   tensorstore,
@@ -36,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.25";
+  version = "0.11.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-myhPWKP2uI9NQKZki1Rr+B6Kusn0qNWREKHkiDrSheA=";
+    hash = "sha256-a7E60fZRmEXTA220mwr7EDMUc+zYbW7wG40vY7NeAOM=";
   };
 
   sourceRoot = "${src.name}/checkpoint";
@@ -65,6 +66,7 @@ buildPythonPackage rec {
     nest-asyncio
     numpy
     protobuf
+    psutil
     pyyaml
     simplejson
     tensorstore
@@ -92,6 +94,18 @@ buildPythonPackage rec {
     # AssertionError: 2 not greater than 2.0046136379241943
     "test_async_mkdir_parallel"
     "test_async_mkdir_sequential"
+
+    # AssertionError:
+    # "Handler type string "(?:__main__|orbax.checkpoint._src.handlers.handler_type_registry_test)\.TestHandler" not found in the registry."
+    # does not match
+    # "'Handler type string "handler_type_registry_test.TestHandler" not found in the registry.'"
+    "test_get_handler_type_not_found"
+    "test_no_typestr"
+    "test_register_duplicate_handler_type"
+
+    # AssertionError: False is not true
+    "test_register_and_get"
+    "test_register_different_modules"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Probably failing because of a filesystem impurity
@@ -105,8 +119,20 @@ buildPythonPackage rec {
     # First from multiprocess_test, Second from orbax.checkpoint._src.testing.multiprocess_test.
     # Description from first occurrence: Number of processes to use.
     # https://github.com/google/orbax/issues/1580
+    "orbax/checkpoint/_src/testing/multiprocess_test.py"
     "orbax/checkpoint/experimental/emergency/"
 
+    # ValueError: Distributed system is not available; please initialize it via `jax.distributed.initialize()` at the start of your program.
+    "orbax/checkpoint/_src/handlers/array_checkpoint_handler_test.py"
+
+    # import file mismatch:
+    # imported module 'registry_test' has this __file__ attribute:
+    #   /build/source/checkpoint/orbax/checkpoint/experimental/v1/_src/layout/registry_test.py
+    # which is not the same as the test file we want to collect:
+    #   /build/source/checkpoint/orbax/checkpoint/experimental/v1/_src/serialization/registry_test.py
+    # HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file module
+    "orbax/checkpoint/experimental/v1/_src/serialization/registry_test.py"
+
     # E   FileNotFoundError: [Errno 2] No such file or directory:
     # '/build/absl_testing/DefaultSnapshotTest/runTest/root/path/to/source/data.txt'
     "orbax/checkpoint/_src/path/snapshot/snapshot_test.py"
@@ -119,6 +145,7 @@ buildPythonPackage rec {
     "orbax/checkpoint/_src/tree/parts_of_test.py"
     "orbax/checkpoint/_src/tree/structure_utils_test.py"
     "orbax/checkpoint/_src/tree/utils_test.py"
+    "orbax/checkpoint/checkpoint_manager_test.py"
     "orbax/checkpoint/single_host_test.py"
     "orbax/checkpoint/transform_utils_test.py"
   ];
diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix
index 6368bedb27df..d23a814af3de 100644
--- a/pkgs/development/python-modules/os-service-types/default.nix
+++ b/pkgs/development/python-modules/os-service-types/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "os-service-types";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "os_service_types";
     inherit version;
-    hash = "sha256-iQznTxMsozTCsj8AJRErR8aSbabSjC91vPwKg96jYD4=";
+    hash = "sha256-w9YBNO5QnPVUUsc/+L1BiRvLbPQkIaFZwBOIJOEmQCs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/osqp/default.nix b/pkgs/development/python-modules/osqp/default.nix
index d7ea2d74430c..393da071a313 100644
--- a/pkgs/development/python-modules/osqp/default.nix
+++ b/pkgs/development/python-modules/osqp/default.nix
@@ -49,14 +49,14 @@ in
 
 buildPythonPackage rec {
   pname = "osqp";
-  version = "1.0.4";
+  version = "1.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osqp";
     repo = "osqp-python";
     tag = "v${version}";
-    hash = "sha256-i39tphtGO//MS5sqwn6qx5ORR/A8moi0O8ltGGmkv2w=";
+    hash = "sha256-i05e0GUQm9DbmF4SDZntKIssrYxC755qG3rRZjYEsiw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 6e8fd74abaab..a59de97573a7 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "owslib";
-  version = "0.34.1";
+  version = "0.35.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "geopython";
     repo = "OWSLib";
     tag = version;
-    hash = "sha256-eLSODYal9rcualQrM03/hwLBngty+9fIlPIJh1EZduA=";
+    hash = "sha256-/5FJai6ad4ZQAK/IhiIuGv4yiBcT/iXFYcbZ+jeCoyI=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index d25a209c63b8..012d9f3186bc 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "paddleocr";
-  version = "3.2.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PaddlePaddle";
     repo = "PaddleOCR";
     tag = "v${version}";
-    hash = "sha256-lrFwrbDzOYFzZEz+P0roTtQMxeWBCDZuEVviyUzM3M4=";
+    hash = "sha256-cXxt/SxOVDcI+00WLSySSxMDU6qSHik+MWAZ6y4wRJw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix
index 731d46ce7c02..041c05eb0bed 100644
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -51,21 +51,27 @@ let
 in
 buildPythonPackage rec {
   pname = "paddlex";
-  version = "3.1.4";
+  version = "3.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PaddlePaddle";
     repo = "PaddleX";
     tag = "v${version}";
-    hash = "sha256-Oc8fgAv8T/9PjxW8yU31t3m3CUxFuAXdVS71BGhtlJo=";
+    hash = "sha256-rxVfkvi/uOetMbR3pHN+apjqtvgTq5rwLc0gkhI6OvU=";
   };
 
   build-system = [ setuptools ];
 
+  pythonRemoveDeps = [
+    # unpackaged
+    "aistudio-sdk"
+    "modelscope"
+  ];
   pythonRelaxDeps = [
     "numpy"
     "pandas"
+    "pyyaml"
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix
index 17a4955eccb3..b6937f9258da 100644
--- a/pkgs/development/python-modules/palace/default.nix
+++ b/pkgs/development/python-modules/palace/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   # Nix uses Release CMake configuration instead of what is assumed by palace.
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE
+      --replace-fail IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/pandera/default.nix b/pkgs/development/python-modules/pandera/default.nix
index c42958c57fa9..d1ac3c140a51 100644
--- a/pkgs/development/python-modules/pandera/default.nix
+++ b/pkgs/development/python-modules/pandera/default.nix
@@ -133,6 +133,10 @@ buildPythonPackage rec {
     # KeyError: 'dask'
     "tests/dask/test_dask.py::test_series_schema"
     "tests/dask/test_dask_accessor.py::test_dataframe_series_add_schema"
+
+    # TypeError: memtable() got an unexpected keyword argument 'name'
+    # https://github.com/unionai-oss/pandera/issues/2154
+    "tests/ibis/test_ibis_container.py"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/panzi-json-logic/default.nix b/pkgs/development/python-modules/panzi-json-logic/default.nix
new file mode 100644
index 000000000000..292c42f14a1d
--- /dev/null
+++ b/pkgs/development/python-modules/panzi-json-logic/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unittestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "panzi-json-logic";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "panzi";
+    repo = "panzi-json-logic";
+    tag = "v${version}";
+    hash = "sha256-P34+7SckMtiCTZbdKsjztNam+/HWtcVQEnGPMoPBw3g=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  pythonImportsCheck = [ "json_logic" ];
+
+  meta = {
+    description = "Pure Python 3 JsonLogic and CertLogic implementation.";
+    homepage = "https://github.com/panzi/panzi-json-logic";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ thanegill ];
+  };
+}
diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index 101f5fe21732..111bf954bef4 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   hatchling,
@@ -123,6 +124,14 @@ buildPythonPackage rec {
     "test_yaml_unicode_dump"
   ];
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-support-new-click-in-papisrunner.patch";
+      url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1";
+      hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU=";
+    })
+  ];
+
   meta = {
     description = "Powerful command-line document and bibliography manager";
     mainProgram = "papis";
diff --git a/pkgs/development/python-modules/parameter-decorators/default.nix b/pkgs/development/python-modules/parameter-decorators/default.nix
new file mode 100644
index 000000000000..4a12cf046bc6
--- /dev/null
+++ b/pkgs/development/python-modules/parameter-decorators/default.nix
@@ -0,0 +1,36 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "parameter-decorators";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "matan1008";
+    repo = "parameter-decorators";
+    tag = "v${version}";
+    hash = "sha256-ZTgUsBc2ArnRPR4k0Od2A571iFfu+oupCxEqzk2cTUQ=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "parameter_decorators" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/matan1008/parameter-decorators/releases/tag/${src.tag}";
+    description = "Handy decorators for converting parameters";
+    homepage = "https://github.com/matan1008/parameter-decorators";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix
index 750b61b13d48..e78c495f90c5 100644
--- a/pkgs/development/python-modules/parsel/default.nix
+++ b/pkgs/development/python-modules/parsel/default.nix
@@ -42,6 +42,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "parsel" ];
 
+  disabledTests = [
+    # asserts on the exact output format of an error message
+    "test_set_xpathfunc"
+  ];
+
   meta = with lib; {
     description = "Python library to extract data from HTML and XML using XPath and CSS selectors";
     homepage = "https://github.com/scrapy/parsel";
diff --git a/pkgs/development/python-modules/partftpy/default.nix b/pkgs/development/python-modules/partftpy/default.nix
new file mode 100644
index 000000000000..8a0df4e5f57a
--- /dev/null
+++ b/pkgs/development/python-modules/partftpy/default.nix
@@ -0,0 +1,38 @@
+# mostly copied from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/partftpy/default.nix
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+buildPythonPackage rec {
+  pname = "partftpy";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "9001";
+    repo = "partftpy";
+    tag = "v${version}";
+    hash = "sha256-9+zY9OpGQ3LbORwtjEYZF1lRaQCLmSyQ9KQdxaOzMuM=";
+  };
+
+  postPatch = ''
+    # poor setuptools gets confused by this dir
+    rm -r t
+  '';
+
+  pyproject = true;
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "partftpy.TftpServer" ];
+
+  meta = {
+    description = "Pure Python TFTP library (copyparty fork of tftpy)";
+    homepage = "https://github.com/9001/partftpy";
+    changelog = "https://github.com/9001/partftpy/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.shelvacu ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index ce050e44956a..e484b08a59e4 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pdm-backend,
   httpx,
   zstandard,
@@ -10,16 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pbs-installer";
-  version = "2025.10.10";
+  version = "2025.10.31";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "frostming";
     repo = "pbs-installer";
     tag = version;
-    hash = "sha256-YqZPCzmmvcsP4tnYZS+nFZ9p+lnLtz/ivGhp2+4X3vU=";
+    hash = "sha256-LVDrUUWxX7APjDJG+Nzij15aeDjDBpz8jj01DQLOL8U=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/pbxproj/default.nix b/pkgs/development/python-modules/pbxproj/default.nix
index 74906b1414c7..38e8011b3690 100644
--- a/pkgs/development/python-modules/pbxproj/default.nix
+++ b/pkgs/development/python-modules/pbxproj/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pbxproj";
-  version = "4.3.0";
+  version = "4.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kronenthaler";
     repo = "mod-pbxproj";
     tag = version;
-    hash = "sha256-A7kYjlMr0PDZHdZLhs7Mn2Ihx0XKQUbVaRgWcMoWM7E=";
+    hash = "sha256-Kwt/ellGOZBenYBCCW13pSMsPVdJyiEklIPMtw/UDvI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix
index c1bc8b0480b8..bb36f4c92053 100644
--- a/pkgs/development/python-modules/pcodec/default.nix
+++ b/pkgs/development/python-modules/pcodec/default.nix
@@ -10,19 +10,19 @@
 
 buildPythonPackage rec {
   pname = "pcodec";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pcodec";
     repo = "pcodec";
     tag = "v${version}";
-    hash = "sha256-5NB+PoCS6yGT8N+MD4mdMRRMKCmlQcqdFPTW924UVgU=";
+    hash = "sha256-B96kMozVXLoLv0xP2o5IkI+d+4j0wIy4G4VruFS9b6M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-vHADxRV9DOYhUg3IOm1HNk3RHB0/WKluD2PH3Hg8k7s=";
+    hash = "sha256-N1KOCZKpz+7yzCefv8AUk1kEmpct//mVCp7a8EW02oA=";
   };
 
   buildAndTestSubdir = "pco_python";
diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix
index 1409b29e3633..e8fa3a1ed962 100644
--- a/pkgs/development/python-modules/pettingzoo/default.nix
+++ b/pkgs/development/python-modules/pettingzoo/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     atari = [
       # multi-agent-ale-py
       pygame
diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index 5bcd04876042..86e0f9d81c94 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pglast";
-  version = "7.7";
+  version = "7.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Xfv8H6OYGWQ6O5FaE2aOQ7vWwLAUqt9dC0MJ6GC6y7A=";
+    hash = "sha256-AHJauP7dc0MEfhK8ZimUHKE5V/TC8t88XSri2gUnlsk=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/phart/default.nix b/pkgs/development/python-modules/phart/default.nix
new file mode 100644
index 000000000000..44b60a3f7680
--- /dev/null
+++ b/pkgs/development/python-modules/phart/default.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  hatchling,
+  networkx,
+  pytestCheckHook,
+  pytest-cov-stub,
+  pydot,
+}:
+
+buildPythonPackage rec {
+  pname = "phart";
+  version = "1.1.4";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-JpHjEVKpOPSNUdUjZxWBHt6AFCpci1nSRWhDXxG6nyw=";
+  };
+
+  pyproject = true;
+
+  build-system = [
+    hatchling
+  ];
+
+  preCheck = ''
+    export PATH=$out/bin:$PATH
+  '';
+
+  postPatch = ''
+    # pythonRelaxDeps = true; didn't work
+    substituteInPlace pyproject.toml \
+      --replace-fail 'hatchling==1.26.3' 'hatchling'
+
+    # This line makes the cli tool not work, removing it fixes it
+    substituteInPlace src/phart/cli.py \
+      --replace-fail "renderer.options.use_ascii = args.ascii" ""
+  '';
+
+  dependencies = [
+    networkx
+  ];
+
+  disabledTestPaths = [
+    # Many of the tests are stale
+    "tests/test_cli.py"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    pydot
+  ];
+
+  pythonImportsCheck = [
+    "phart"
+  ];
+
+  meta = {
+    description = "Python Hierarchical ASCII Representation Tool";
+    homepage = "https://github.com/scottvr/phart";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ b-rodrigues ];
+  };
+}
diff --git a/pkgs/development/python-modules/piccolo/default.nix b/pkgs/development/python-modules/piccolo/default.nix
index 378fe162d64b..714116e2d0f0 100644
--- a/pkgs/development/python-modules/piccolo/default.nix
+++ b/pkgs/development/python-modules/piccolo/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "piccolo";
-  version = "1.29.0";
+  version = "1.30.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "piccolo-orm";
     repo = "piccolo";
     tag = version;
-    hash = "sha256-CVN3aT1Xa7qKztEh1+jP9mlIu7Nw4EbjRYxzthycd4k=";
+    hash = "sha256-CR6zdaWFwhCGQsSxxUU9f3+A3RcuksG0+EUN2IotovA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix
index 6f92156c4ae9..8227e6c2e080 100644
--- a/pkgs/development/python-modules/pikepdf/default.nix
+++ b/pkgs/development/python-modules/pikepdf/default.nix
@@ -25,7 +25,7 @@
 
 buildPythonPackage rec {
   pname = "pikepdf";
-  version = "9.11.0";
+  version = "10.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm "$out/.git_archival.txt"
     '';
-    hash = "sha256-mdH7bFfUzjSOOIhRK4GpizohFB82s8v9N2yEX2X/dms=";
+    hash = "sha256-DiNRjN4tnADaFOxLV9wdvJe9KEOb+h9IOSzaPGtGuk0=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix
index 153192fb6dbf..a2cfc6de6be0 100644
--- a/pkgs/development/python-modules/pillow/default.nix
+++ b/pkgs/development/python-modules/pillow/default.nix
@@ -8,6 +8,7 @@
   # build-system
   setuptools,
   pkg-config,
+  pybind11,
 
   # native dependencies
   freetype,
@@ -43,17 +44,20 @@
 
 buildPythonPackage rec {
   pname = "pillow";
-  version = "11.3.0";
+  version = "12.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-pillow";
     repo = "pillow";
     tag = version;
-    hash = "sha256-VOOIxzTyERI85CvA2oIutybiivU14kIko8ysXpmwUN8=";
+    hash = "sha256-58mjwHErEZPkkGBVZznkkMQN5Zo4ZBBiXnhqVp1F81g=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    pybind11
+  ];
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/development/python-modules/pinocchio/default.nix b/pkgs/development/python-modules/pinocchio/default.nix
new file mode 100644
index 000000000000..d2f722d9ee5c
--- /dev/null
+++ b/pkgs/development/python-modules/pinocchio/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  pinocchio,
+
+  coal,
+  casadi,
+  matplotlib,
+  python,
+}:
+toPythonModule (
+  pinocchio.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+
+    propagatedBuildInputs = super.propagatedBuildInputs ++ [
+      casadi
+      coal
+      pinocchio
+    ];
+
+    checkInputs = super.checkInputs ++ [
+      matplotlib
+    ];
+
+    nativeCheckInputs = super.nativeCheckInputs ++ [
+      pythonImportsCheckHook
+    ];
+
+    pythonImportsCheck = [
+      "pinocchio"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/pip-system-certs/default.nix b/pkgs/development/python-modules/pip-system-certs/default.nix
index 3503ba4d8405..aeb92eb61f01 100644
--- a/pkgs/development/python-modules/pip-system-certs/default.nix
+++ b/pkgs/development/python-modules/pip-system-certs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pip-system-certs";
-  version = "5.2";
+  version = "5.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "pip_system_certs";
-    hash = "sha256-gLd2tc8XGRv5nTE2mbf84v24Tre7siX9E0EJqCcGQG8=";
+    hash = "sha256-Gci/mVe8zn1pxNvC0LLvE94ZhNU/UKWQEubbutCvZ8Y=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a5a04a886480..594d00194db2 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -5,6 +5,7 @@
   build,
   click,
   fetchPypi,
+  fetchpatch,
   pep517,
   pip,
   pytest-xdist,
@@ -29,7 +30,22 @@ buildPythonPackage rec {
     hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk=";
   };
 
-  patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
+  patches = [
+    ./fix-setup-py-bad-syntax-detection.patch
+
+    # Backport click 8.2 + 8.3 compatibility from 7.5.1
+    # We can't update to 7.5.1 because of https://github.com/jazzband/pip-tools/issues/2231,
+    # which breaks home-assisstant-chip-wheels.
+    (fetchpatch {
+      url = "https://github.com/jazzband/pip-tools/commit/c7f128e7c533033c2436b52c972eee521fe3890c.diff";
+      excludes = [ "pyproject.toml" ];
+      hash = "sha256-cIFAE/VKyyDWVQktPtPPuxY85DtTvH6pK539WD2cDn4=";
+    })
+    (fetchpatch {
+      url = "https://github.com/jazzband/pip-tools/commit/816ee196c543be53ddba0ea33fb4c7e84217b3b3.diff";
+      hash = "sha256-3GTUNWoy/AmpWv7NUCWIZ+coxb1vUgg6CZhwh6FehZo=";
+    })
+  ];
 
   build-system = [ setuptools-scm ];
 
diff --git a/pkgs/development/python-modules/planetary-computer/default.nix b/pkgs/development/python-modules/planetary-computer/default.nix
index 7014512b6e4c..7bc6d0d61641 100644
--- a/pkgs/development/python-modules/planetary-computer/default.nix
+++ b/pkgs/development/python-modules/planetary-computer/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     adlfs = [ adlfs ];
     azure = [ azure-storage-blob ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/platformdirs/default.nix b/pkgs/development/python-modules/platformdirs/default.nix
index 80d109154203..6ea5d6b7361e 100644
--- a/pkgs/development/python-modules/platformdirs/default.nix
+++ b/pkgs/development/python-modules/platformdirs/default.nix
@@ -12,16 +12,14 @@
 
 buildPythonPackage rec {
   pname = "platformdirs";
-  version = "4.3.8";
+  version = "4.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
-    owner = "platformdirs";
+    owner = "tox-dev";
     repo = "platformdirs";
     tag = version;
-    hash = "sha256-ePaEpsBkTomRX+RJsed8aJtefl5WCW/N9IT8ae4+ln4=";
+    hash = "sha256-ESXp9I6SL13BdsQLCUcfS8kwqayURCEguhINnK6Dd6k=";
   };
 
   build-system = [
@@ -37,11 +35,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "platformdirs" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for determining appropriate platform-specific directories";
     homepage = "https://platformdirs.readthedocs.io/";
-    changelog = "https://github.com/platformdirs/platformdirs/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/tox-dev/platformdirs/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/playwrightcapture/default.nix b/pkgs/development/python-modules/playwrightcapture/default.nix
index 95bc2323e4c7..b72fd95de37c 100644
--- a/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.34.0";
+  version = "1.34.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     tag = "v${version}";
-    hash = "sha256-3O46iBYoPYPvCLRlQhGesD+VJR1y4LnwPk3zIZ/OetA=";
+    hash = "sha256-cywGV1hlxdZ9xU5adHKiZr2npdUpNkdF9sk9pykPFE8=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ed023d9f8389..72713af57622 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "6.3.0";
+  version = "6.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     tag = "v${version}";
-    hash = "sha256-s+kWJy/dOqlNqRD/Ytxy/SSRsFJvp13jSvPMd0LQliQ=";
+    hash = "sha256-zwJTesrtLreu7To795wJmowgZ3c4d0mHUaLt3C9Fqd8=";
   };
 
   postPatch = ''
@@ -102,6 +102,8 @@ buildPythonPackage rec {
     "test_lazy_imports"
     # [0.0, 'rgb(252, 255, 164)'] != [0.0, '#fcffa4']
     "test_acceptance_named"
+    # AssertionError: assert '' == 'browser'
+    "test_default_renderer"
   ];
 
   __darwinAllowLocalNetworking = true;
@@ -115,6 +117,8 @@ buildPythonPackage rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # fails to launch kaleido subprocess
     "tests/test_optional/test_kaleido"
+    # requiress access to osascript, which is not available while building
+    "tests/test_plot.py::test_plot[plotly-psnr-rgb]"
     # numpy2 related error, RecursionError
     # See: https://github.com/plotly/plotly.py/issues/4852
     "tests/test_plotly_utils/validators/test_angle_validator.py"
diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index d74db8313c2e..18111cc80ac7 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools-scm,
@@ -24,26 +23,18 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.15.0";
+  version = "0.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     tag = "v${version}";
-    hash = "sha256-HhsJE5XoQjkIVExsfikTBArh9uq8ob4g2O0byYOsOh8=";
+    hash = "sha256-vYrfA7x/64VHHbcgpvQZ1kyHM0jTS9Cx9a8NzVgs4og=";
   };
 
   build-system = [ setuptools-scm ];
 
-  patches = [
-    (fetchpatch {
-      name = "fix-composition-error-messages.patch";
-      url = "https://github.com/has2k1/plotnine/commit/097192de42d690c227b26ae7638accac0db14589.patch";
-      hash = "sha256-wxfJ36QH0PYdotgqrdE9sKAzKpcIYw7I8uNGhC6J0Gg=";
-    })
-  ];
-
   dependencies = [
     matplotlib
     mizani
diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix
index de9c7beb41cc..9e139df6a276 100644
--- a/pkgs/development/python-modules/plugp100/default.nix
+++ b/pkgs/development/python-modules/plugp100/default.nix
@@ -9,11 +9,10 @@
   aiohttp,
   jsons,
   requests,
+  cryptography,
   # Test inputs
   pytestCheckHook,
-  pyyaml,
   pytest-asyncio,
-  async-timeout,
 }:
 
 buildPythonPackage rec {
@@ -34,15 +33,14 @@ buildPythonPackage rec {
     requests
     aiohttp
     semantic-version
+    cryptography
     scapy
     urllib3
-    pyyaml
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
-    async-timeout
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 1b65249cfbe6..f12df2f1e998 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.7.8";
+  version = "1.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${version}";
-    hash = "sha256-hGXjwEOvcSIvfw3xeIUVF59bSXjVXL7CMUncHqeVZ1Y=";
+    hash = "sha256-E5SJhhvT6KdkMvGo1mxrsSVRixdMjCl0ED/A6ozqn9o=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index fdd6b39f655c..64750378f233 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.9.0";
+  version = "1.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tomerfiliba";
     repo = "plumbum";
     tag = "v${version}";
-    hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU=";
+    hash = "sha256-ca9avbBJnMecuKljIrx3mYIGA50QXmhC/LP3hM9Uvcs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/plumlightpad/default.nix b/pkgs/development/python-modules/plumlightpad/default.nix
deleted file mode 100644
index b6d40f5f007b..000000000000
--- a/pkgs/development/python-modules/plumlightpad/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  requests,
-  standard-telnetlib,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "plumlightpad";
-  version = "0.0.11";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-5J+kk/fn45v/1WIsBuq6o7hivXkCaJ1Of7BLRf10rCk=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    requests
-    standard-telnetlib
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  # Package has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "plumlightpad" ];
-
-  meta = {
-    description = "A python package that interacts with the Plum Lightpad";
-    homepage = "https://github.com/heathbar/plum-lightpad-python";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.jamiemagee ];
-  };
-}
diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix
index 5c1241343d5e..6711140e148a 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/pkgs/development/python-modules/plyfile/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "plyfile";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dranjan";
     repo = "python-plyfile";
     tag = "v${version}";
-    hash = "sha256-J72aoXEMcuHtYaLtzWJ5UGN9HdJTnQ1/8KgdMLtwyr0=";
+    hash = "sha256-bSevEk8ZtJybv6FYsUYKdDJJWyPK7Kstc4NNISdHV2o=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index c26bd164c72c..3cc932fa292f 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry-core";
     tag = version;
-    hash = "sha256-WLPG8BiM+927qSC+ly5H2IAE2Htm8+wLEjK2AFnMJ58=";
+    hash = "sha256-l5WTjKa+A66QfWLmrjCQq7ZrSaeuylGIRZr8jsiYq+A=";
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix
index e19dc798fd69..b994f1b4803c 100644
--- a/pkgs/development/python-modules/policy-sentry/default.nix
+++ b/pkgs/development/python-modules/policy-sentry/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   orjson,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   requests,
   schema,
@@ -15,16 +14,14 @@
 
 buildPythonPackage rec {
   pname = "policy-sentry";
-  version = "0.14.0";
+  version = "0.14.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "salesforce";
     repo = "policy_sentry";
     tag = version;
-    hash = "sha256-zfqQLABn//qktrFSCm42WClRYAe3yWZoxnWjI9n1jWQ=";
+    hash = "sha256-o4l4jkh9ZNqc3Jovd10KUQLDBLn0sPWdgScq5Q2qd14=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix
index 2b7d81d99777..3e0d3b275268 100644
--- a/pkgs/development/python-modules/polyfactory/default.nix
+++ b/pkgs/development/python-modules/polyfactory/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "polyfactory";
-  version = "2.22.2";
+  version = "2.22.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "litestar-org";
     repo = "polyfactory";
     tag = "v${version}";
-    hash = "sha256-Mm9Yj8yBaH1KQJxQJY/sbrkfL/eDpMyWd/9ThQfmzx8=";
+    hash = "sha256-/LHGUQsYwEPBHWSyzaX0gUrqNm2cvWGraxMhWWvMkBc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/posix-ipc/default.nix b/pkgs/development/python-modules/posix-ipc/default.nix
index 3612880c2103..18f418eadaa0 100644
--- a/pkgs/development/python-modules/posix-ipc/default.nix
+++ b/pkgs/development/python-modules/posix-ipc/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "posix-ipc";
-  version = "1.3.0";
+  version = "1.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "osvenskan";
     repo = "posix_ipc";
     rev = "rel${version}";
-    hash = "sha256-icytv2Cv7rVmlSARtx9ld5Kgo+Xba5fHUUjeKAUnGDM=";
+    hash = "sha256-Ehhk+IM3gTW6t6Cvc9AVAB9bscC0CMc6wQFgrZuCPz0=";
   };
 
   pythonImportsCheck = [ "posix_ipc" ];
diff --git a/pkgs/development/python-modules/pproxy/default.nix b/pkgs/development/python-modules/pproxy/default.nix
index 8d355218a0cc..f652fa2b13ac 100644
--- a/pkgs/development/python-modules/pproxy/default.nix
+++ b/pkgs/development/python-modules/pproxy/default.nix
@@ -4,6 +4,9 @@
   fetchFromGitHub,
   pycryptodome,
   uvloop,
+  asyncssh,
+  aioquic,
+  python-daemon,
   setuptools,
   pythonOlder,
 }:
@@ -24,10 +27,17 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [ setuptools ];
 
-  propagatedBuildInputs = [
-    pycryptodome
-    uvloop
-  ];
+  optional-dependencies = {
+    accelerated = [
+      pycryptodome
+      uvloop
+    ];
+    sshtunnel = [ asyncssh ];
+    quic = [ aioquic ];
+    daemon = [ python-daemon ];
+  };
+
+  nativeCheckInputs = lib.flatten (lib.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "pproxy" ];
 
diff --git a/pkgs/development/python-modules/precis-i18n/default.nix b/pkgs/development/python-modules/precis-i18n/default.nix
index 0f86be974e55..7bc8741fa8c5 100644
--- a/pkgs/development/python-modules/precis-i18n/default.nix
+++ b/pkgs/development/python-modules/precis-i18n/default.nix
@@ -2,29 +2,29 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "precis-i18n";
-  version = "1.1.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  version = "1.1.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "byllyfish";
     repo = "precis_i18n";
     tag = "v${version}";
-    hash = "sha256-rtg3u8lnnmQFPsNC52LNVoEVu6CeHzAWvOjWBlzLKC4=";
+    hash = "sha256-ZMj9KqiPVrpmq4/FweLMDxWQVQEtykimNhMTS9Mh5QY=";
   };
 
+  build-system = [ setuptools ];
+
   pythonImportsCheck = [ "precis_i18n" ];
 
   meta = with lib; {
     description = "Internationalized usernames and passwords";
     homepage = "https://github.com/byllyfish/precis_i18n";
-    changelog = "https://github.com/byllyfish/precis_i18n/blob/v${version}/CHANGELOG.rst";
+    changelog = "https://github.com/byllyfish/precis_i18n/blob/${src.tag}/CHANGELOG.rst";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix
new file mode 100644
index 000000000000..c2baaced3afb
--- /dev/null
+++ b/pkgs/development/python-modules/price-parser/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  pytest-cov,
+  attrs,
+}:
+
+buildPythonPackage rec {
+  pname = "price-parser";
+  version = "0.4.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "scrapinghub";
+    repo = "price-parser";
+    tag = version;
+    hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0=";
+  };
+
+  dependencies = [ attrs ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pythonImportsCheck = [ "price_parser" ];
+
+  meta = {
+    description = "Extract price amount and currency symbol from a raw text string";
+    homepage = "https://github.com/scrapinghub/price-parser";
+    changelog = "https://github.com/scrapinghub/price-parser/blob/${version}/CHANGES.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ thanegill ];
+  };
+}
diff --git a/pkgs/development/python-modules/primp/default.nix b/pkgs/development/python-modules/primp/default.nix
deleted file mode 100644
index 4dee6ca54c99..000000000000
--- a/pkgs/development/python-modules/primp/default.nix
+++ /dev/null
@@ -1,132 +0,0 @@
-{
-  lib,
-  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  rustPlatform,
-  pytest,
-  runCommand,
-  boringssl,
-  libiconv,
-  gcc-unwrapped,
-  python,
-  fetchpatch,
-}:
-
-let
-  boringsslPatched = boringssl.overrideAttrs (oa: {
-    # boringssl source obtained from https://github.com/0x676e67/boring2/tree/1a0f1cd24e728aac100df68027c820f858199224/boring-sys/deps
-    src = fetchFromGitHub {
-      owner = "google";
-      repo = "boringssl";
-      rev = "44b3df6f03d85c901767250329c571db405122d5";
-      hash = "sha256-REELo7X9aFy2OHjubYLO1UQXLTgekD4QFd2vyFthIrg=";
-    };
-    modRoot = "./src";
-    patches = [
-      # A patch required to build boringssl compatible with `boring-sys2`.
-      # See https://github.com/0x676e67/boring2/blob/refs/tags/v4.15.11/boring-sys/build/main.rs#L486-L489
-      (fetchpatch {
-        name = "boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
-        url = "https://raw.githubusercontent.com/0x676e67/boring2/refs/tags/v4.15.11/boring-sys/patches/boringssl-44b3df6f03d85c901767250329c571db405122d5.patch";
-        hash = "sha256-JRRATcCXo0HBQTzgCAuLpxC3NEGrTw1cEmC0VHOgO2M=";
-      })
-    ];
-
-    # Remove bazel specific build file to make way for build directory
-    # This is a problem on Darwin because of case-insensitive filesystem
-    preBuild =
-      (lib.optionalString stdenv.hostPlatform.isDarwin ''
-        rm ../BUILD
-      '')
-      + oa.preBuild;
-
-    env.NIX_CFLAGS_COMPILE =
-      oa.env.NIX_CFLAGS_COMPILE
-      + " "
-      + toString (
-        lib.optionals stdenv.cc.isClang [
-          "-Wno-error=reorder-ctor"
-        ]
-        ++ lib.optionals stdenv.cc.isGNU [
-          "-Wno-error=reorder"
-          "-Wno-error=ignored-attributes"
-        ]
-      );
-
-    vendorHash = "sha256-06MkjXl0DKFzIH/H+uT9kXsQdPq7qdZh2dlLW/YhJuk=";
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $bin/bin $dev $out/lib
-
-      install -Dm755 tool/bssl -t $bin/bin
-      install -Dm644 ssl/libssl.a -t $out/lib
-      install -Dm644 crypto/libcrypto.a -t $out/lib
-      install -Dm644 decrepit/libdecrepit.a -t $out/lib
-
-      cp -r ../include $dev
-
-      runHook postInstall
-    '';
-  });
-  # boring-sys expects the static libraries in build/ instead of lib/
-  boringssl-wrapper = runCommand "boringssl-wrapper" { } ''
-    mkdir $out
-    ln -s ${boringsslPatched.out}/lib $out/build
-    ln -s ${boringsslPatched.dev}/include $out/include
-  '';
-in
-buildPythonPackage rec {
-  pname = "primp";
-  version = "0.15.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "deedy5";
-    repo = "primp";
-    tag = "v${version}";
-    hash = "sha256-13o0Ni0dvZaoKgYy2cFQhebwKAJGm5Z2s+gVAddxYxU=";
-  };
-
-  cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit pname version src;
-    hash = "sha256-UBpf9f3wJgbizHERsm83cuKHiMixj/8JX/IGvteySIo=";
-  };
-
-  nativeBuildInputs = [
-    rustPlatform.bindgenHook
-    rustPlatform.cargoSetupHook
-    rustPlatform.maturinBuildHook
-  ];
-
-  # TODO: Can we improve this?
-  postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
-    patchelf --add-rpath ${lib.getLib gcc-unwrapped.lib} --add-needed libstdc++.so.6 $out/${python.sitePackages}/primp/primp.abi3.so
-  '';
-
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    libiconv
-  ];
-
-  env.BORING_BSSL_PATH = boringssl-wrapper;
-  env.BORING_BSSL_ASSUME_PATCHED = true;
-
-  optional-dependencies = {
-    dev = [ pytest ];
-  };
-
-  # Test use network
-  doCheck = false;
-
-  pythonImportsCheck = [ "primp" ];
-
-  meta = {
-    changelog = "https://github.com/deedy5/primp/releases/tag/${version}";
-    description = "Python Requests IMPersonate, the fastest Python HTTP client that can impersonate web browsers";
-    homepage = "https://github.com/deedy5/primp";
-    license = lib.licenses.mit;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index cd49cb2a0442..e9fdf7136f6b 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "prophet";
-  version = "1.1.7";
+  version = "1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "facebook";
     repo = "prophet";
     tag = "v${version}";
-    hash = "sha256-94hxpfpZN3yvDUu+kM7Oc2Yu8+z0Gv6zqYRAwKXgHk4=";
+    hash = "sha256-rG21Q4V0XQjReIHd7vV/aFOUvnLEw/dm8AobXRDUfuA=";
   };
 
   sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix
index 030a989f9573..4586fb355b1a 100644
--- a/pkgs/development/python-modules/prosemirror/default.nix
+++ b/pkgs/development/python-modules/prosemirror/default.nix
@@ -1,7 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  setuptools-scm,
+  hatchling,
+  hatch-vcs,
   pytestCheckHook,
   fetchPypi,
   lxml,
@@ -18,7 +19,10 @@ buildPythonPackage rec {
     hash = "sha256-cZwqoKQ+B7d07R20dXTiDsiBIYYTyaWa2SnGs8o8Hl8=";
   };
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
 
   dependencies = [
     lxml
diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix
index 88b571b65a3b..f5ce6a82e716 100644
--- a/pkgs/development/python-modules/protobuf/6.nix
+++ b/pkgs/development/python-modules/protobuf/6.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "6.32.1";
+  version = "6.33.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7iRp5KAhR0q5uq/qbNBw5b8nx9KUM1BN3qGk7lhQ9o0=";
+    hash = "sha256-FAMD1cjSA3cwxUj4x7k7ILsdwwG+KAw3i4K4iUWJyVQ=";
   };
 
   build-system = [ setuptools ];
@@ -23,8 +23,12 @@ buildPythonPackage rec {
     protobuf
   ];
 
-  # the pypi source archive does not ship tests
-  doCheck = false;
+  doCheck =
+    # https://protobuf.dev/support/cross-version-runtime-guarantee/#backwards
+    # The non-python protobuf provides the protoc binary which must not be newer.
+    assert lib.versionAtLeast version ("6." + protobuf.version);
+    # the pypi source archive does not ship tests
+    false;
 
   pythonImportsCheck = [
     "google.protobuf"
@@ -45,7 +49,9 @@ buildPythonPackage rec {
   meta = {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
-    changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}";
+    changelog = "https://github.com/protocolbuffers/protobuf/releases/v${
+      builtins.substring 2 (-1) version
+    }";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch
deleted file mode 100644
index bb34dff0b5a6..000000000000
--- a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2867f022aad754fe54d95222b3ae52f6e7f14c2f Mon Sep 17 00:00:00 2001
-From: "P. R. d. O" <d.ol.rod@tutanota.com>
-Date: Wed, 27 Apr 2022 21:49:12 -0600
-Subject: [PATCH] Patching GIRepository
-
----
- protonvpn_nm_lib/__init__.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/protonvpn_nm_lib/__init__.py b/protonvpn_nm_lib/__init__.py
-index e69de29..00b95f4 100644
---- a/protonvpn_nm_lib/__init__.py
-+++ b/protonvpn_nm_lib/__init__.py
-@@ -0,0 +1,5 @@
-+import gi
-+gi.require_version('GIRepository', '2.0')
-+from gi.repository import GIRepository
-+repo = GIRepository.Repository.get_default()
-+repo.prepend_search_path('@networkmanager_path@')
--- 
-2.35.1
-
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
deleted file mode 100644
index 43784048fdd3..000000000000
--- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  replaceVars,
-  dbus-python,
-  distro,
-  jinja2,
-  keyring,
-  proton-client,
-  pygobject3,
-  pyxdg,
-  systemd,
-  ncurses,
-  networkmanager,
-  pkgs-systemd,
-  python,
-  xdg-utils,
-}:
-
-buildPythonPackage rec {
-  pname = "protonvpn-nm-lib";
-  version = "3.16.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "ProtonVPN";
-    repo = "protonvpn-nm-lib";
-    tag = version;
-    hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA=";
-  };
-
-  propagatedBuildInputs = [
-    dbus-python
-    distro
-    jinja2
-    keyring
-    proton-client
-    pygobject3
-    pyxdg
-    systemd
-    ncurses
-    networkmanager
-    pkgs-systemd
-    xdg-utils
-  ];
-
-  patches = [
-    (replaceVars ./0001-Patching-GIRepository.patch {
-      networkmanager_path = "${networkmanager}/lib/girepository-1.0";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace protonvpn_nm_lib/core/dbus/dbus_reconnect.py \
-      --replace "exec_start = python_interpreter_path + \" \" + python_service_path" "exec_start = \"$out/bin/protonvpn_reconnector.py\""
-  '';
-
-  postInstall = ''
-    makeWrapper ${python.interpreter} $out/bin/protonvpn_reconnector.py \
-      --add-flags $out/${python.sitePackages}/protonvpn_nm_lib/daemon/dbus_daemon_reconnector.py \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  # Checks cannot be run in the sandbox
-  # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
-  doCheck = false;
-
-  pythonImportsCheck = [ "protonvpn_nm_lib" ];
-
-  meta = with lib; {
-    description = "ProtonVPN NetworkManager Library intended for every ProtonVPN service user";
-    mainProgram = "protonvpn_reconnector.py";
-    homepage = "https://github.com/ProtonVPN/protonvpn-nm-lib";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 76f178a3d65f..dac2afcd346f 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -2,25 +2,25 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
   python,
-  pythonOlder,
+  gitUpdater,
 }:
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "7.0.0";
+  version = "7.1.2";
   pyproject = true;
 
   inherit stdenv;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-e+nD66OL7Mtkleozr9mCpEB0t48oxDSh9RzAf9MVxFY=";
+  src = fetchFromGitHub {
+    owner = "giampaolo";
+    repo = "psutil";
+    tag = "release-${version}";
+    hash = "sha256-LyGnLrq+SzCQmz8/P5DOugoNEyuH0IC7uIp8UAPwH0U=";
   };
 
   postPatch = ''
@@ -63,11 +63,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "psutil" ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "release-";
+  };
+
+  meta = {
     description = "Process and system utilization information interface";
     homepage = "https://github.com/giampaolo/psutil";
-    changelog = "https://github.com/giampaolo/psutil/blob/release-${version}/HISTORY.rst";
-    license = licenses.bsd3;
+    changelog = "https://github.com/giampaolo/psutil/blob/${src.tag}/HISTORY.rst";
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index 264b6ecef85d..b6558b5ff693 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -34,13 +34,13 @@
 
 let
   pname = "psycopg";
-  version = "3.2.10";
+  version = "3.2.12";
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = "psycopg";
     tag = version;
-    hash = "sha256-ZvqhvjDhrZ7uKi9fE/UYRaJblmfXXH6pYoUZ5u7cOu0=";
+    hash = "sha256-g1mms12EqRiln5dK/BmBa9dd9duSPRgRIiZkVmSRaYI=";
   };
 
   patches = [
@@ -199,6 +199,8 @@ buildPythonPackage rec {
     "test_connect_error_multi_hosts_each_message_preserved"
     # Flaky, fails intermittently
     "test_break_attempts"
+    # ConnectionResetError: [Errno 104] Connection reset by peer
+    "test_wait_r"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/psycopg2/default.nix b/pkgs/development/python-modules/psycopg2/default.nix
index cbc3923dd126..026ddf281e48 100644
--- a/pkgs/development/python-modules/psycopg2/default.nix
+++ b/pkgs/development/python-modules/psycopg2/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   buildPythonPackage,
-  pythonOlder,
   isPyPy,
   fetchPypi,
   libpq,
@@ -12,16 +11,17 @@
   sphinxHook,
   sphinx-better-theme,
   buildPackages,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "psycopg2";
-  version = "2.9.10";
-  format = "setuptools";
+  version = "2.9.11";
+  pyproject = true;
 
   # Extension modules don't work well with PyPy. Use psycopg2cffi instead.
   # c.f. https://github.com/NixOS/nixpkgs/pull/104151#issuecomment-729750892
-  disabled = pythonOlder "3.6" || isPyPy;
+  disabled = isPyPy;
 
   outputs = [
     "out"
@@ -30,7 +30,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-EuwLQLAnP5UpYjPodQRBM5KY5qVy9wOdpbJg48i2DhE=";
+    hash = "sha256-lk0xyvco4hfGl/936mnCughl+kHsILsA8Jd+Yv3MUuM=";
   };
 
   postPatch = ''
@@ -46,6 +46,10 @@ buildPythonPackage rec {
     sphinx-better-theme
   ];
 
+  build-system = [
+    setuptools
+  ];
+
   buildInputs = [ libpq ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ openssl ];
 
   sphinxRoot = "doc/src";
diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 1a93ca841fd9..11a48fa548b6 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -4,21 +4,18 @@
   fetchPypi,
   pandoc,
   pytestCheckHook,
-  pythonOlder,
   requests,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20251014";
+  version = "1.0.2.20251031";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-y9Fnq+B+dcHyJGPiy5gE/BzrEguZ9aTy4CqfT0IFCXE=";
+    hash = "sha256-pMZj8al1ps6NMzOcBJK5eO3ckNnYX0dFYKQ/3stVmmQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pudb/default.nix b/pkgs/development/python-modules/pudb/default.nix
index f0ddee2357f5..b993346b8860 100644
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pudb";
-  version = "2025.1.1";
+  version = "2025.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-t8JFx1MceSZDYSYgqoErleyAoi/Q5nveTYRzRpLcS3I=";
+    hash = "sha256-Wd/8WjVaNM1IzrzjO/ChZ9aOpoEP/EwWHcOKcD1HnYY=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix
index 3c9b5303ad7d..2919a84f8e79 100644
--- a/pkgs/development/python-modules/pulsar-client/default.nix
+++ b/pkgs/development/python-modules/pulsar-client/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
       ratelimit
     ];
     avro = [ fastavro ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/pwdlib/default.nix b/pkgs/development/python-modules/pwdlib/default.nix
index d698cd66401c..f2b9c98227c7 100644
--- a/pkgs/development/python-modules/pwdlib/default.nix
+++ b/pkgs/development/python-modules/pwdlib/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pwdlib";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "frankie567";
     repo = "pwdlib";
     tag = "v${version}";
-    hash = "sha256-aPrgn5zfKk72QslGzb0acCNnZ7m3lyIBjvu4yhfZhSQ=";
+    hash = "sha256-0ye/CYlDW73Y2HGKjSdk7LniVkQ6OznoO/qnypRCmBQ=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix
index e4277c5281dd..916634dbe2d9 100644
--- a/pkgs/development/python-modules/py-aosmith/default.nix
+++ b/pkgs/development/python-modules/py-aosmith/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "py-aosmith";
-  version = "1.0.14";
+  version = "1.0.15";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "bdr99";
     repo = "py-aosmith";
     tag = version;
-    hash = "sha256-73kiSrjPDuvSMK8pZMCPns6vm2NhE+9F7GpWEPKR7Ec=";
+    hash = "sha256-sh0UYa4POpcwRKBNAliidFzMUI4VxektT27YLXmTwfY=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/py-melissa-climate/default.nix b/pkgs/development/python-modules/py-melissa-climate/default.nix
index dc66538400e2..f1167d2b04a4 100644
--- a/pkgs/development/python-modules/py-melissa-climate/default.nix
+++ b/pkgs/development/python-modules/py-melissa-climate/default.nix
@@ -4,52 +4,37 @@
   fetchFromGitHub,
   setuptools,
   aiohttp,
-  requests,
-  requests-futures,
+  pytest-asyncio,
   pytestCheckHook,
-  mock,
 }:
 
 buildPythonPackage rec {
   pname = "py-melissa-climate";
-  version = "2.1.4";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kennedyshead";
     repo = "py-melissa-climate";
-    tag = version;
-    hash = "sha256-zYr+nKdO+lCLLYGSvY16MUs8TxbWcyaoQk9cwNQ704Y=";
+    tag = "v${version}";
+    hash = "sha256-VSKSa7K2fF6NMLN39HzkqK7/9vGHmmmPFw6mIiJNZ84=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "setup_requires=['setuptools-markdown']," ""
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
     aiohttp
-    requests
-    requests-futures
   ];
 
   nativeCheckInputs = [
-    mock
+    pytest-asyncio
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # Disable failing tests due to upstream bugs
-    "test_have_connection"
-    "test_send"
-    "test_send_ok"
-  ];
-
   pythonImportsCheck = [ "melissa" ];
 
   meta = {
+    changelog = "https://github.com/kennedyshead/py-melissa-climate/releases/tag/${src.tag}";
     description = "API wrapper for Melissa Climate";
     homepage = "https://github.com/kennedyshead/py-melissa-climate";
     license = lib.licenses.mit;
diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix
index 4ec1fe9cfad0..e1b4f98718d7 100644
--- a/pkgs/development/python-modules/py-stringmatching/default.nix
+++ b/pkgs/development/python-modules/py-stringmatching/default.nix
@@ -8,7 +8,7 @@
   setuptools,
 
   # dependencies
-  numpy_1,
+  numpy,
   six,
 
   # tests
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    numpy_1
+    numpy
     six
   ];
 
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "py_stringmatching" ];
 
   meta = with lib; {
+    broken = lib.versionAtLeast numpy.version "2";
     description = "Python string matching library including string tokenizers and string similarity measures";
     homepage = "https://github.com/anhaidgroup/py_stringmatching";
     changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt";
diff --git a/pkgs/development/python-modules/py-vapid/cryptography.patch b/pkgs/development/python-modules/py-vapid/cryptography.patch
new file mode 100644
index 000000000000..d38088931b44
--- /dev/null
+++ b/pkgs/development/python-modules/py-vapid/cryptography.patch
@@ -0,0 +1,270 @@
+--- a/py_vapid/__init__.py
++++ b/py_vapid/__init__.py
+@@ -25,6 +25,7 @@
+ 
+ class VapidException(Exception):
+     """An exception wrapper for Vapid."""
++
+     pass
+ 
+ 
+@@ -34,6 +35,7 @@ class Vapid01(object):
+     https://tools.ietf.org/html/draft-ietf-webpush-vapid-01
+ 
+     """
++
+     _private_key = None
+     _public_key = None
+     _schema = "WebPush"
+@@ -65,14 +67,14 @@ def from_raw(cls, private_raw):
+         key = ec.derive_private_key(
+             int(binascii.hexlify(b64urldecode(private_raw)), 16),
+             curve=ec.SECP256R1(),
+-            backend=default_backend())
++            backend=default_backend(),
++        )
+         return cls(key)
+ 
+     @classmethod
+     def from_raw_public(cls, public_raw):
+         key = ec.EllipticCurvePublicKey.from_encoded_point(
+-            curve=ec.SECP256R1(),
+-            data=b64urldecode(public_raw)
++            curve=ec.SECP256R1(), data=b64urldecode(public_raw)
+         )
+         ss = cls()
+         ss._public_key = key
+@@ -87,8 +89,7 @@ def from_pem(cls, private_key):
+ 
+         """
+         # not sure why, but load_pem_private_key fails to deserialize
+-        return cls.from_der(
+-            b''.join(private_key.splitlines()[1:-1]))
++        return cls.from_der(b"".join(private_key.splitlines()[1:-1]))
+ 
+     @classmethod
+     def from_der(cls, private_key):
+@@ -98,9 +99,9 @@ def from_der(cls, private_key):
+         :type private_key: bytes
+ 
+         """
+-        key = serialization.load_der_private_key(b64urldecode(private_key),
+-                                                 password=None,
+-                                                 backend=default_backend())
++        key = serialization.load_der_private_key(
++            b64urldecode(private_key), password=None, backend=default_backend()
++        )
+         return cls(key)
+ 
+     @classmethod
+@@ -118,13 +119,13 @@ def from_file(cls, private_key_file=None):
+             vapid.generate_keys()
+             vapid.save_key(private_key_file)
+             return vapid
+-        with open(private_key_file, 'r') as file:
++        with open(private_key_file, "r") as file:
+             private_key = file.read()
+         try:
+             if "-----BEGIN" in private_key:
+-                vapid = cls.from_pem(private_key.encode('utf8'))
++                vapid = cls.from_pem(private_key.encode("utf8"))
+             else:
+-                vapid = cls.from_der(private_key.encode('utf8'))
++                vapid = cls.from_der(private_key.encode("utf8"))
+             return vapid
+         except Exception as exc:
+             logging.error("Could not open private key file: %s", repr(exc))
+@@ -156,11 +157,10 @@ def verify(cls, key, auth):
+         type key: str
+ 
+         """
+-        tokens = auth.rsplit(' ', 1)[1].rsplit('.', 1)
++        tokens = auth.rsplit(" ", 1)[1].rsplit(".", 1)
+         kp = cls().from_raw_public(key.encode())
+         return kp.verify_token(
+-            validation_token=tokens[0].encode(),
+-            verification_token=tokens[1]
++            validation_token=tokens[0].encode(), verification_token=tokens[1]
+         )
+ 
+     @property
+@@ -197,20 +197,19 @@ def public_key(self):
+ 
+     def generate_keys(self):
+         """Generate a valid ECDSA Key Pair."""
+-        self.private_key = ec.generate_private_key(ec.SECP256R1,
+-                                                   default_backend())
++        self.private_key = ec.generate_private_key(curve=ec.SECP256R1(), backend=default_backend())
+ 
+     def private_pem(self):
+         return self.private_key.private_bytes(
+             encoding=serialization.Encoding.PEM,
+             format=serialization.PrivateFormat.PKCS8,
+-            encryption_algorithm=serialization.NoEncryption()
++            encryption_algorithm=serialization.NoEncryption(),
+         )
+ 
+     def public_pem(self):
+         return self.public_key.public_bytes(
+             encoding=serialization.Encoding.PEM,
+-            format=serialization.PublicFormat.SubjectPublicKeyInfo
++            format=serialization.PublicFormat.SubjectPublicKeyInfo,
+         )
+ 
+     def save_key(self, key_file):
+@@ -245,14 +244,14 @@ def verify_token(self, validation_token, verification_token):
+         :rtype: boolean
+ 
+         """
+-        hsig = b64urldecode(verification_token.encode('utf8'))
++        hsig = b64urldecode(verification_token.encode("utf8"))
+         r = int(binascii.hexlify(hsig[:32]), 16)
+         s = int(binascii.hexlify(hsig[32:]), 16)
+         try:
+             self.public_key.verify(
+                 ecutils.encode_dss_signature(r, s),
+                 validation_token,
+-                signature_algorithm=ec.ECDSA(hashes.SHA256())
++                signature_algorithm=ec.ECDSA(hashes.SHA256()),
+             )
+             return True
+         except InvalidSignature:
+@@ -260,23 +259,25 @@ def verify_token(self, validation_token, verification_token):
+ 
+     def _base_sign(self, claims):
+         cclaims = copy.deepcopy(claims)
+-        if not cclaims.get('exp'):
+-            cclaims['exp'] = int(time.time()) + 86400
+-        if not self.conf.get('no-strict', False):
+-            valid = _check_sub(cclaims.get('sub', ''))
++        if not cclaims.get("exp"):
++            cclaims["exp"] = int(time.time()) + 86400
++        if not self.conf.get("no-strict", False):
++            valid = _check_sub(cclaims.get("sub", ""))
+         else:
+-            valid = cclaims.get('sub') is not None
++            valid = cclaims.get("sub") is not None
+         if not valid:
+             raise VapidException(
+                 "Missing 'sub' from claims. "
+-                "'sub' is your admin email as a mailto: link.")
+-        if not re.match(r"^https?://[^/:]+(:\d+)?$",
+-                        cclaims.get("aud", ""),
+-                        re.IGNORECASE):
++                "'sub' is your admin email as a mailto: link."
++            )
++        if not re.match(
++            r"^https?://[^/:]+(:\d+)?$", cclaims.get("aud", ""), re.IGNORECASE
++        ):
+             raise VapidException(
+                 "Missing 'aud' from claims. "
+                 "'aud' is the scheme, host and optional port for this "
+-                "transaction e.g. https://example.com:8080")
++                "transaction e.g. https://example.com:8080"
++            )
+         return cclaims
+ 
+     def sign(self, claims, crypto_key=None):
+@@ -292,19 +293,22 @@ def sign(self, claims, crypto_key=None):
+ 
+         """
+         sig = sign(self._base_sign(claims), self.private_key)
+-        pkey = 'p256ecdsa='
++        pkey = "p256ecdsa="
+         pkey += b64urlencode(
+             self.public_key.public_bytes(
+                 serialization.Encoding.X962,
+-                serialization.PublicFormat.UncompressedPoint
+-            ))
++                serialization.PublicFormat.UncompressedPoint,
++            )
++        )
+         if crypto_key:
+-            crypto_key = crypto_key + ';' + pkey
++            crypto_key = crypto_key + ";" + pkey
+         else:
+             crypto_key = pkey
+ 
+-        return {"Authorization": "{} {}".format(self._schema, sig.strip('=')),
+-                "Crypto-Key": crypto_key}
++        return {
++            "Authorization": "{} {}".format(self._schema, sig.strip("=")),
++            "Crypto-Key": crypto_key,
++        }
+ 
+ 
+ class Vapid02(Vapid01):
+@@ -313,6 +317,7 @@ class Vapid02(Vapid01):
+     https://tools.ietf.org/html/rfc8292
+ 
+     """
++
+     _schema = "vapid"
+ 
+     def sign(self, claims, crypto_key=None):
+@@ -329,14 +334,11 @@ def sign(self, claims, crypto_key=None):
+         """
+         sig = sign(self._base_sign(claims), self.private_key)
+         pkey = self.public_key.public_bytes(
+-                serialization.Encoding.X962,
+-                serialization.PublicFormat.UncompressedPoint
+-            )
+-        return{
++            serialization.Encoding.X962, serialization.PublicFormat.UncompressedPoint
++        )
++        return {
+             "Authorization": "{schema} t={t},k={k}".format(
+-                schema=self._schema,
+-                t=sig,
+-                k=b64urlencode(pkey)
++                schema=self._schema, t=sig, k=b64urlencode(pkey)
+             )
+         }
+ 
+@@ -349,27 +351,23 @@ def verify(cls, auth):
+         :rtype: bool
+ 
+         """
+-        pref_tok = auth.rsplit(' ', 1)
+-        assert pref_tok[0].lower() == cls._schema, (
+-                "Incorrect schema specified")
++        pref_tok = auth.rsplit(" ", 1)
++        assert pref_tok[0].lower() == cls._schema, "Incorrect schema specified"
+         parts = {}
+-        for tok in pref_tok[1].split(','):
+-            kv = tok.split('=', 1)
++        for tok in pref_tok[1].split(","):
++            kv = tok.split("=", 1)
+             parts[kv[0]] = kv[1]
+-        assert 'k' in parts.keys(), (
+-                "Auth missing public key 'k' value")
+-        assert 't' in parts.keys(), (
+-                "Auth missing token set 't' value")
+-        kp = cls().from_raw_public(parts['k'].encode())
+-        tokens = parts['t'].rsplit('.', 1)
++        assert "k" in parts.keys(), "Auth missing public key 'k' value"
++        assert "t" in parts.keys(), "Auth missing token set 't' value"
++        kp = cls().from_raw_public(parts["k"].encode())
++        tokens = parts["t"].rsplit(".", 1)
+         return kp.verify_token(
+-            validation_token=tokens[0].encode(),
+-            verification_token=tokens[1]
++            validation_token=tokens[0].encode(), verification_token=tokens[1]
+         )
+ 
+ 
+ def _check_sub(sub):
+-    """ Check to see if the `sub` is a properly formatted `mailto:`
++    """Check to see if the `sub` is a properly formatted `mailto:`
+ 
+     a `mailto:` should be a SMTP mail address. Mind you, since I run
+     YouFailAtEmail.com, you have every right to yell about how terrible
+@@ -382,9 +380,7 @@ def _check_sub(sub):
+     :rtype: bool
+ 
+     """
+-    pattern = (
+-        r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$" # noqa
+-        )
++    pattern = r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$"  # noqa
+     return re.match(pattern, sub, re.IGNORECASE) is not None
diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix
index 494afb7008d3..83042bf54525 100644
--- a/pkgs/development/python-modules/py-vapid/default.nix
+++ b/pkgs/development/python-modules/py-vapid/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-PIlzts+DhK0MmuZNYnDMxIDguSxwLY9eoswD5rUSR/k=";
   };
 
+  patches = [
+    # Fix tests with latest cryptography
+    # Upstream PR: https://github.com/web-push-libs/vapid/pull/110
+    ./cryptography.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ cryptography ];
diff --git a/pkgs/development/python-modules/pyadjoint-ad/default.nix b/pkgs/development/python-modules/pyadjoint-ad/default.nix
index 5b91b9dcb6aa..6a6ad8d50eab 100644
--- a/pkgs/development/python-modules/pyadjoint-ad/default.nix
+++ b/pkgs/development/python-modules/pyadjoint-ad/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyadjoint-ad";
-  version = "2025.04.1";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dolfin-adjoint";
     repo = "pyadjoint";
     tag = version;
-    hash = "sha256-S9A0qCatnnLuOkqWsEC4tjVY1HZqqi2T5iXu+WUoN24=";
+    hash = "sha256-caW2X4q0mHnD8CEh5jjelD4xBth/R/8/P3m0tTeO/LQ=";
   };
 
   build-system = [
@@ -30,8 +30,6 @@ buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [
-    # The firedrake_adjoint module is deprecated and requires a cyclic dependency of firedrake
-    # "firedrake_adjoint"
     "numpy_adjoint"
     "pyadjoint"
     "pyadjoint.optimization"
diff --git a/pkgs/development/python-modules/pyairtable/default.nix b/pkgs/development/python-modules/pyairtable/default.nix
index e3ece5ad3233..75a314bb50ed 100644
--- a/pkgs/development/python-modules/pyairtable/default.nix
+++ b/pkgs/development/python-modules/pyairtable/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "pyairtable";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9v0eOr3CgBTb7N6FkcgmVgxctaLTieUYZHwuXsuIR40=";
+    hash = "sha256-1tO3f2/regKoR3nCI103pGYF82AwzyDtmbCLq3MQiow=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index cb84291abbc4..ea4a25888d37 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -1,84 +1,92 @@
 {
   lib,
-  asteroid-filterbanks,
+  stdenv,
   buildPythonPackage,
-  einops,
   fetchFromGitHub,
+
+  # build-system
+  hatchling,
+  hatch-vcs,
+
+  # dependencies
+  asteroid-filterbanks,
+  einops,
   huggingface-hub,
-  hydra-core,
-  numpy,
-  omegaconf,
+  lightning,
+  matplotlib,
+  opentelemetry-api,
+  opentelemetry-exporter-otlp,
+  opentelemetry-sdk,
   pyannote-core,
   pyannote-database,
   pyannote-metrics,
   pyannote-pipeline,
-  pyscaffold,
-  pythonOlder,
-  pytorch-lightning,
+  pyannoteai-sdk,
   pytorch-metric-learning,
-  rich,
-  semver,
-  setuptools,
+  safetensors,
   soundfile,
   speechbrain,
   tensorboardx,
-  torch-audiomentations,
   torch,
+  torch-audiomentations,
   torchaudio,
+  torchcodec,
   torchmetrics,
+
+  # optional-dependencies
+  hydra-core,
   typer,
+
+  # tests
+  papermill,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-audio";
-  version = "3.4.0";
+  version = "4.0.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-audio";
     tag = version;
-    hash = "sha256-NnwJJasObePBYWBnuVzOLFz2eqOHoOA6W5CzAEpkDV4=";
     fetchSubmodules = true;
+    hash = "sha256-hYrwpph+Powt+AuQjKo0kkBW+5jJGfzGTILzL9j22YI=";
   };
 
-  pythonRelaxDeps = [ "torchaudio" ];
-
   build-system = [
-    pyscaffold
-    setuptools
+    hatchling
+    hatch-vcs
   ];
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace-fail "pyscaffold>=3.2a0,<3.3a0" "pyscaffold"
-    substituteInPlace requirements.txt \
-      --replace-fail "lightning" "pytorch-lightning"
-  '';
-
+  pythonRelaxDeps = [
+    "torchaudio"
+  ];
   dependencies = [
     asteroid-filterbanks
     einops
     huggingface-hub
-    omegaconf
+    lightning
+    matplotlib
+    opentelemetry-api
+    opentelemetry-exporter-otlp
+    opentelemetry-sdk
     pyannote-core
     pyannote-database
     pyannote-metrics
     pyannote-pipeline
+    pyannoteai-sdk
     pytorch-metric-learning
-    rich
-    semver
+    safetensors
     soundfile
     speechbrain
     tensorboardx
     torch
     torch-audiomentations
     torchaudio
+    torchcodec
     torchmetrics
-    numpy
-    pytorch-lightning
   ];
 
   optional-dependencies = {
@@ -90,11 +98,44 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyannote.audio" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    papermill
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    $out/bin/pyannote-audio --help
+  '';
+
+  disabledTests = [
+    # Require internet access
+    "test_hf_download_inference"
+    "test_hf_download_model"
+    "test_import_speechbrain_encoder_classifier"
+    "test_skip_aggregation"
+    "test_unknown_specifications_error_raised_on_non_setup_model_task"
+
+    # AttributeError: module 'torchaudio' has no attribute 'info'
+    # Removed in torchaudio v2.9.0
+    # See https://github.com/pytorch/audio/issues/3902 for context
+    "test_audio_resample"
+  ];
+
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Crashes the interpreter
+    # - On aarch64-darwin: Trace/BPT trap: 5
+    # - On x86_64-darwin: Fatal Python error: Illegal instruction
+    "tests/inference_test.py"
+    "tests/test_train.py"
+  ];
+
+  meta = {
     description = "Neural building blocks for speaker diarization: speech activity detection, speaker change detection, overlapped speech detection, speaker embedding";
     homepage = "https://github.com/pyannote/pyannote-audio";
-    changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = [ ];
+    changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix
index 8dd3885a3742..6081244212fb 100644
--- a/pkgs/development/python-modules/pyannote-core/default.nix
+++ b/pkgs/development/python-modules/pyannote-core/default.nix
@@ -2,57 +2,53 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   numpy,
   pandas,
-  pytestCheckHook,
-  scipy,
-  setuptools,
   sortedcontainers,
-  typing-extensions,
-  versioneer,
+
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-core";
-  version = "5.0.1";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-core";
     tag = version;
-    hash = "sha256-28LVgI5bDFv71co/JsSrPrAcdugXiMRe6T1Jp0CO0XY=";
+    hash = "sha256-r5NkOAzrQGcb6LPi4/DA0uT9R0ELiYuwQkbT1l6R8Mw=";
   };
 
-  postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
-  '';
-
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
-    sortedcontainers
     numpy
-    scipy
-    typing-extensions
+    pandas
+    sortedcontainers
   ];
 
   nativeCheckInputs = [
-    pandas
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "pyannote.core" ];
 
-  meta = with lib; {
+  meta = {
     description = "Advanced data structures for handling temporal segments with attached labels";
     homepage = "https://github.com/pyannote/pyannote-core";
     changelog = "https://github.com/pyannote/pyannote-core/releases/tag/${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix
index ddd3ec0ac1d1..8b060139d4a5 100644
--- a/pkgs/development/python-modules/pyannote-database/default.nix
+++ b/pkgs/development/python-modules/pyannote-database/default.nix
@@ -2,53 +2,61 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   pandas,
   pyannote-core,
-  pythonOlder,
   pyyaml,
-  setuptools,
   typer,
-  versioneer,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-database";
-  version = "5.0.1";
+  version = "6.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-database";
     tag = version;
-    hash = "sha256-A7Xr24O8OvVAlURrR+SDCh8Uv9Yz3AUJSFDyDShVVjA=";
+    hash = "sha256-WDAkxoSI/IW2nIXCDoKa+p2ep1xcWW6WGNHCCZT51tY=";
   };
 
-  postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
-  '';
-
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
+    pandas
     pyannote-core
     pyyaml
-    pandas
+    # Imported in pyannote/database/cli.py
     typer
   ];
 
   pythonImportsCheck = [ "pyannote.database" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    $out/bin/pyannote-database --help
+  '';
+
+  meta = {
     description = "Reproducible experimental protocols for multimedia (audio, video, text) database";
     homepage = "https://github.com/pyannote/pyannote-database";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthewcroughan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
     mainProgram = "pyannote-database";
   };
 }
diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix
index ca463bb216cd..717811aa2a10 100644
--- a/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/pkgs/development/python-modules/pyannote-metrics/default.nix
@@ -1,66 +1,77 @@
 {
   lib,
   buildPythonPackage,
-  docopt,
   fetchFromGitHub,
-  matplotlib,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   numpy,
   pandas,
   pyannote-core,
   pyannote-database,
-  pythonOlder,
   scikit-learn,
   scipy,
-  setuptools,
-  sympy,
+  # undeclared cli dependencies
+  docopt,
   tabulate,
-  versioneer,
+
+  # tests
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-metrics";
-  version = "3.3.0";
+  version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-metrics";
     tag = version;
-    hash = "sha256-tinNdFiUISnzUDnzM8wT3+0W8Dlc9gbCiNoIMo9xNKY=";
+    hash = "sha256-Ga5oSRkVdeQkDnjFcFebdZnFljjyn/TrtV8Y6UJxT2c=";
   };
 
   postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
+    substituteInPlace src/pyannote/metrics/cli.py \
+      --replace-fail \
+        'version="Evaluation"' \
+        'version="${version}"'
   '';
 
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
+    numpy
+    pandas
     pyannote-core
     pyannote-database
-    pandas
-    scipy
     scikit-learn
+    scipy
+    # Imported in pyannote/metrics/cli.py
     docopt
     tabulate
-    matplotlib
-    sympy
-    numpy
   ];
 
   pythonImportsCheck = [ "pyannote.metrics" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems";
     homepage = "https://github.com/pyannote/pyannote-metrics";
     changelog = "http://pyannote.github.io/pyannote-metrics/changelog.html";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "pyannote-metrics";
   };
diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix
index f4fef29d0d6a..ecd4c17af84e 100644
--- a/pkgs/development/python-modules/pyannote-pipeline/default.nix
+++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix
@@ -1,58 +1,74 @@
 {
   lib,
   buildPythonPackage,
-  docopt,
   fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  docopt,
   filelock,
   optuna,
   pyannote-core,
   pyannote-database,
   pyyaml,
-  scikit-learn,
-  setuptools,
+  scipy,
   tqdm,
-  versioneer,
+
+  # tests
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-pipeline";
-  version = "3.1.2";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-pipeline";
     tag = version;
-    hash = "sha256-MMMwZMxu8viUt2DgCgymbz2vEMM9TT0ySKL2KPzAPLA=";
+    hash = "sha256-H2yIeCKhZFUkZXww+eaRKMzJrbALdARady02fq/pJrU=";
   };
 
   postPatch = ''
-    # Remove vendorized versioeer.py
-    rm versioneer.py
+    substituteInPlace src/pyannote/pipeline/experiment.py \
+      --replace-fail \
+        'version="Tunable pipelines"' \
+        'version="${version}"'
   '';
 
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
+    docopt # imported in pyannote/pipeline/experiment.py
+    filelock
+    optuna
     pyannote-core
     pyannote-database
     pyyaml
-    optuna
+    scipy # imported in pyannote/pipeline/optimizer.py
     tqdm
-    docopt
-    filelock
-    scikit-learn
   ];
 
   pythonImportsCheck = [ "pyannote.pipeline" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Tunable pipelines";
     homepage = "https://github.com/pyannote/pyannote-pipeline";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "pyannote-pipeline";
   };
diff --git a/pkgs/development/python-modules/pyannoteai-sdk/default.nix b/pkgs/development/python-modules/pyannoteai-sdk/default.nix
new file mode 100644
index 000000000000..129e5c212f76
--- /dev/null
+++ b/pkgs/development/python-modules/pyannoteai-sdk/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "pyannoteai-sdk";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "pyannoteai_sdk";
+    inherit version;
+    hash = "sha256-QOA1ABzi3rNR/aDFNXxZhNzBrYL+JEexpi1fTOZYCa0=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    requests
+  ];
+
+  pythonImportsCheck = [ "pyannoteai.sdk" ];
+
+  # No tests (at least in the Pypi archive)
+  doCheck = false;
+
+  meta = {
+    description = "Official pyannoteAI Python SDK";
+    homepage = "https://pypi.org/project/pyannoteai-sdk";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/pybids/default.nix b/pkgs/development/python-modules/pybids/default.nix
index a9ad750c9a51..f885c209492a 100644
--- a/pkgs/development/python-modules/pybids/default.nix
+++ b/pkgs/development/python-modules/pybids/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "pybids";
-  version = "0.20.0";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bids-standard";
     repo = "pybids";
     tag = version;
-    hash = "sha256-e1uD9rNs50GP8myNY+5VbcdRKlLykSTd9ESKrhSW+r8=";
+    hash = "sha256-yCfEE142OQCfgKVJB2lw1Rweax1gakHPoD91SUtZpUs=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pycangjie/default.nix b/pkgs/development/python-modules/pycangjie/default.nix
index 80a992b14e46..dbac3797e77a 100644
--- a/pkgs/development/python-modules/pycangjie/default.nix
+++ b/pkgs/development/python-modules/pycangjie/default.nix
@@ -56,7 +56,7 @@ buildPythonPackage rec {
     description = "Python wrapper to libcangjie";
     homepage = "https://cangjians.github.io/projects/pycangjie/";
     license = licenses.lgpl3Plus;
-    maintainers = [ maintainers.linquize ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/python-modules/pycategories/default.nix b/pkgs/development/python-modules/pycategories/default.nix
deleted file mode 100644
index 98a8e360d157..000000000000
--- a/pkgs/development/python-modules/pycategories/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  callPackage,
-  fetchPypi,
-  pytestCheckHook,
-  pythonOlder,
-}:
-
-buildPythonPackage rec {
-  pname = "pycategories";
-  version = "1.2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-vXDstelOdlnlZOoVPwx2cykdw3xSbCRoAPwI1sU3gJk=";
-  };
-
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "'pytest-runner'," ""
-    substituteInPlace setup.cfg \
-      --replace "--cov-report term --cov=categories" ""
-  '';
-
-  # Is private because the author states it's unmaintained
-  # and shouldn't be used in production code
-  propagatedBuildInputs = [ (callPackage ./infix.nix { }) ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = with lib; {
-    description = "Implementation of some concepts from category theory";
-    homepage = "https://gitlab.com/danielhones/pycategories";
-    changelog = "https://gitlab.com/danielhones/pycategories/-/blob/v${version}/CHANGELOG.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dmvianna ];
-  };
-}
diff --git a/pkgs/development/python-modules/pycategories/infix.nix b/pkgs/development/python-modules/pycategories/infix.nix
deleted file mode 100644
index d5959c1a0ec1..000000000000
--- a/pkgs/development/python-modules/pycategories/infix.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  buildPythonPackage,
-  lib,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "infix";
-  version = "1.2";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a1bfdcf875bc072f41e426d0673f2e3017750743bb90cc725fffb292eb09648c";
-  };
-
-  # No tests
-  doCheck = false;
-
-  meta = {
-    homepage = "https://github.com/borntyping/python-infix";
-    description = "Decorator that allows functions to be used as infix functions";
-    license = lib.licenses.mit;
-  };
-}
diff --git a/pkgs/development/python-modules/pycm/default.nix b/pkgs/development/python-modules/pycm/default.nix
index 1153f19f25cf..7f8c3b35f8f5 100644
--- a/pkgs/development/python-modules/pycm/default.nix
+++ b/pkgs/development/python-modules/pycm/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pycm";
-  version = "4.4";
+  version = "4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sepandhaghighi";
     repo = "pycm";
     tag = "v${version}";
-    hash = "sha256-CKvNnpZBT6CV71887jd+V4plBBdWQhMqAhO38APUg20=";
+    hash = "sha256-qskLY0Ru0Ex7RfbsgXSTsi/UekvDyAKdJEBH6XakQp8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index fb2e5cbda0e0..9f2068a0e72f 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -1,36 +1,44 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  gitUpdater,
   setuptools,
   unittestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pycparser";
-  version = "2.22";
+  version = "2.23";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY=";
+  src = fetchFromGitHub {
+    owner = "eliben";
+    repo = "pycparser";
+    tag = "release_v${version}";
+    hash = "sha256-dkteM8VizYf9ZLPOe8od5CZgg7a3fs4Hy+t8bGLV/GI=";
   };
 
   build-system = [ setuptools ];
 
+  pythonImportsCheck = [ "pycparser" ];
+
   nativeCheckInputs = [ unittestCheckHook ];
-  disabled = pythonOlder "3.8";
 
   unittestFlagsArray = [
     "-s"
     "tests"
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "release_v";
+  };
+
+  meta = {
+    changelog = "https://github.com/eliben/pycparser/releases/tag/${src.tag}";
     description = "C parser in Python";
     homepage = "https://github.com/eliben/pycparser";
-    license = licenses.bsd3;
-    maintainers = [ ];
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/pycrashreport/default.nix b/pkgs/development/python-modules/pycrashreport/default.nix
new file mode 100644
index 000000000000..05f5cf24022f
--- /dev/null
+++ b/pkgs/development/python-modules/pycrashreport/default.nix
@@ -0,0 +1,50 @@
+{
+  buildPythonPackage,
+  cached-property,
+  click,
+  fetchFromGitHub,
+  la-panic,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "pycrashreport";
+  version = "1.2.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "pycrashreport";
+    tag = "v${version}";
+    hash = "sha256-QhHjQO/swoFYKlHaqpaU1qIGwHIK5Eq3ZHrFJEHZbWs=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    cached-property
+    click
+    la-panic
+  ];
+
+  pythonImportsCheck = [ "pycrashreport" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/doronz88/pycrashreport/releases/tag/${src.tag}";
+    description = "Python3 parser for Apple's crash reports";
+    homepage = "https://github.com/doronz88/pycrashreport";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "pycrashreport";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix
index 573c4917bbc5..7a3a2362de00 100644
--- a/pkgs/development/python-modules/pycrdt-websocket/default.nix
+++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt-websocket";
-  version = "0.16.0";
+  version = "0.15.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter-server";
     repo = "pycrdt-websocket";
-    tag = version;
-    hash = "sha256-Qux8IxJR1nGbdpGz7RZBKJjYN0qfwfEpd2UDlduOna0=";
+    tag = "v${version}";
+    hash = "sha256-piNd85X5YsTAOC9frYQRDyb/DPfzZicIPJ+bEVzgOsU=";
   };
 
   build-system = [ hatchling ];
@@ -77,7 +77,7 @@ buildPythonPackage rec {
   meta = {
     description = "WebSocket Connector for pycrdt";
     homepage = "https://github.com/jupyter-server/pycrdt-websocket";
-    changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = [ lib.teams.jupyter ];
   };
diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index d73808d037f5..50cef0f46620 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -38,9 +38,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bumpalo"
@@ -50,9 +50,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "concurrent-queue"
@@ -140,9 +140,12 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "itoa"
@@ -152,9 +155,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -162,9 +165,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "lock_api"
@@ -175,12 +178,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
-
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -235,16 +232,16 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pycrdt"
-version = "0.12.40"
+version = "0.12.43"
 dependencies = [
  "pyo3",
  "serde_json",
@@ -253,9 +250,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
  "indoc",
  "libc",
@@ -270,18 +267,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -289,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -301,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -408,9 +405,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -445,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
@@ -463,9 +460,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -474,25 +471,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -500,22 +483,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 495037a80899..dc805a7304f8 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt";
-  version = "0.12.40";
+  version = "0.12.43";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = version;
-    hash = "sha256-4aKR/mTpuPKv3zq00PI40vbWUNBNQbVRyH39AtADb0Y=";
+    hash = "sha256-yMl+bLnREvuyVhMvR0TM+IKTPpJlgBCgE4M4NJp9k/M=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix
index a3280adc4726..e7450bb287b6 100644
--- a/pkgs/development/python-modules/pyctr/default.nix
+++ b/pkgs/development/python-modules/pyctr/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ihaveamac/pyctr";
     changelog = "https://github.com/ihaveamac/pyctr/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ rileyinman ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pycync/default.nix b/pkgs/development/python-modules/pycync/default.nix
new file mode 100644
index 000000000000..199e7ae69e44
--- /dev/null
+++ b/pkgs/development/python-modules/pycync/default.nix
@@ -0,0 +1,52 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "pycync";
+  version = "0.4.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.13";
+
+  src = fetchFromGitHub {
+    owner = "Kinachi249";
+    repo = "pycync";
+    tag = "v${version}";
+    hash = "sha256-UjodZbgicTiJV4T5yqWy5J4oAeZGbggVfaPMoDmL74M=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pycync" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    cd tests
+  '';
+
+  meta = {
+    changelog = "https://github.com/Kinachi249/pycync/releases/tag/${src.tag}";
+    description = "Python API library for Cync smart devices";
+    homepage = "https://github.com/Kinachi249/pycync";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index 67b2a862a6a2..fe850650f330 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
-  pythonAtLeast,
   pythonOlder,
   setuptools,
   legacy-cgi,
@@ -12,21 +11,21 @@
 
 buildPythonPackage rec {
   pname = "pydal";
-  version = "20250922.1";
+  version = "20251018.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uIoPrUMP9i+EDTJXboGdaSVBvZ7aqgVXixNLss0lFyc=";
+    hash = "sha256-WGMcxDY2SA9LYgqSUEf6rsBTBnXpYgqTuRGYBpA/hgk=";
   };
 
   build-system = [ setuptools ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  checkInputs = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  checkInputs = [ legacy-cgi ];
 
   enabledTestPaths = [
     "tests/*.py"
diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index fe473e4f0c57..0a8ca2dcf87c 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -10,7 +10,9 @@
   # optional/test dependencies
   gdcm,
   pillow,
+  pydicom,
   pyjpegls,
+  pylibjpeg,
   pylibjpeg-libjpeg,
   writableTmpDirAsHomeHook,
 }:
@@ -46,11 +48,12 @@ buildPythonPackage rec {
     pixeldata = [
       pillow
       pyjpegls
-      #pylibjpeg.optional-dependencies.openjpeg # infinite recursion
-      #pylibjpeg.optional-dependencies.rle # infinite recursion
+      pylibjpeg
       pylibjpeg-libjpeg
       gdcm
-    ];
+    ]
+    ++ pylibjpeg.optional-dependencies.openjpeg
+    ++ pylibjpeg.optional-dependencies.rle;
   };
 
   nativeCheckInputs = [
@@ -61,6 +64,12 @@ buildPythonPackage rec {
 
   passthru.pydicom-data = test_data;
 
+  doCheck = false; # circular dependency
+
+  passthru.tests.pytest = pydicom.overridePythonAttrs {
+    doCheck = true;
+  };
+
   # Setting $HOME to prevent pytest to try to create a folder inside
   # /homeless-shelter which is read-only.
   # Linking pydicom-data dicom files to $HOME/.pydicom/data
diff --git a/pkgs/development/python-modules/pydo/default.nix b/pkgs/development/python-modules/pydo/default.nix
index e578191af04c..f551688e2ecf 100644
--- a/pkgs/development/python-modules/pydo/default.nix
+++ b/pkgs/development/python-modules/pydo/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pydo";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "pydo";
     tag = "v${version}";
-    hash = "sha256-Tge8geMR0aP/tUmsrGWdCUvA5tu6Y7KgZv4r5iRtRz8=";
+    hash = "sha256-7DcsznR2XgFVFwgm6jAh13dG19YovFuTvicYkFGVEUg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pydroplet/default.nix b/pkgs/development/python-modules/pydroplet/default.nix
new file mode 100644
index 000000000000..e31c9ab1f77e
--- /dev/null
+++ b/pkgs/development/python-modules/pydroplet/default.nix
@@ -0,0 +1,43 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pydroplet";
+  version = "2.3.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Hydrific";
+    repo = "pydroplet";
+    tag = "v${version}";
+    hash = "sha256-cVftXG7sKDpGRRb2jLlFxgCH2+rA6hLYTUqWL1kvh+E=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pydroplet" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/Hydrific/pydroplet/releases/tag/${src.tag}";
+    description = "Package to connect to a Droplet device";
+    homepage = "https://github.com/Hydrific/pydroplet";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyecharts/default.nix b/pkgs/development/python-modules/pyecharts/default.nix
index 22a55c389e53..06f7db4eb268 100644
--- a/pkgs/development/python-modules/pyecharts/default.nix
+++ b/pkgs/development/python-modules/pyecharts/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyecharts";
-  version = "2.0.8";
+  version = "2.0.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "pyecharts";
     repo = "pyecharts";
     tag = "v${version}";
-    hash = "sha256-Aax/HpYJRrfituiAIT7Y6F9v9tX9EmVXtr+4R98tces=";
+    hash = "sha256-AMdPsTQsndc0fr4NF2AnJy98k4I2832/GNWeY4IWSRA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index a75dac805a92..f3fe876b808d 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -14,7 +14,7 @@
   pytest-cov-stub,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
+  python-jsonpath,
   respx,
   syrupy,
   tenacity,
@@ -22,16 +22,14 @@
 
 buildPythonPackage rec {
   pname = "pyenphase";
-  version = "2.3.1";
+  version = "2.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "pyenphase";
     repo = "pyenphase";
     tag = "v${version}";
-    hash = "sha256-Z6txaTkIkUTYWVWbsmvoI/huDTZKX5DxePqM5rsmIWY=";
+    hash = "sha256-KgkXOWnKjnG3qHJN+NxHxeqEo+zVrWtWP0l3Lmn+NtI=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];
@@ -54,6 +52,7 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-timeout
     pytestCheckHook
+    python-jsonpath
     respx
     syrupy
   ];
diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
index e08dd1241f98..68cbb55daa19 100644
--- a/pkgs/development/python-modules/pyexcel/default.nix
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pyexcel";
-  version = "0.7.3";
+  version = "0.7.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V7PD+1XdCaYsu/Kunx54qhG2J8K/xgcv8tlYfAIrBtQ=";
+    hash = "sha256-y73GBTK7sqIv5DA+gkqqOG7PbcUU0fh9GtA6E4X+5L0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyexploitdb/default.nix b/pkgs/development/python-modules/pyexploitdb/default.nix
index ad1678c41c1d..f742fa99ab3c 100644
--- a/pkgs/development/python-modules/pyexploitdb/default.nix
+++ b/pkgs/development/python-modules/pyexploitdb/default.nix
@@ -9,13 +9,12 @@
 
 buildPythonPackage rec {
   pname = "pyexploitdb";
-  version = "0.2.102";
+  version = "0.2.103";
   pyproject = true;
 
   src = fetchPypi {
-    pname = "pyExploitDb";
-    inherit version;
-    hash = "sha256-vkqKouvVu+qDcFGODvZuPzhcRVEQRsCa6lqRLekZThw=";
+    inherit pname version;
+    hash = "sha256-UAR3S0Tpo1C6a8YcNjoncPWEklwCsSC+T8E5s5rgaw8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix
index 82095b71ee38..ff720b3aeb2a 100644
--- a/pkgs/development/python-modules/pyezvizapi/default.nix
+++ b/pkgs/development/python-modules/pyezvizapi/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  aiohttp,
   paho-mqtt,
   pandas,
   pycryptodome,
@@ -12,19 +13,20 @@
 
 buildPythonPackage rec {
   pname = "pyezvizapi";
-  version = "1.0.3.6";
+  version = "1.0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RenierM26";
     repo = "pyEzvizApi";
     tag = version;
-    hash = "sha256-vuMgTPOzNsfeMhqeDa03AwCL+jUO+COGJFjvfsUMLIY=";
+    hash = "sha256-WZtXxkdUB7Rp4I2Hn4nzMv9GGnPWyXqPZuJClK/5eaU=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
+    aiohttp
     paho-mqtt
     pandas
     pycryptodome
diff --git a/pkgs/development/python-modules/pyfirefly/default.nix b/pkgs/development/python-modules/pyfirefly/default.nix
new file mode 100644
index 000000000000..241af69a8e9b
--- /dev/null
+++ b/pkgs/development/python-modules/pyfirefly/default.nix
@@ -0,0 +1,53 @@
+{
+  aiohttp,
+  aresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  mashumaro,
+  orjson,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  syrupy,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "pyfirefly";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "erwindouna";
+    repo = "pyfirefly";
+    tag = "v${version}";
+    hash = "sha256-b4np7JlDCbrrMo6TGE5yL6Xg41ocGoJQY8BMH/hZ9Ls=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    mashumaro
+    orjson
+    yarl
+  ];
+
+  pythonImportsCheck = [ "pyfirefly" ];
+
+  nativeCheckInputs = [
+    aresponses
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/erwindouna/pyfirefly/releases/tag/${src.tag}";
+    description = "Asynchronous Python client for the Firefly III API";
+    homepage = "https://github.com/erwindouna/pyfirefly";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix
index 2fb94c1b28df..f9f19b7680ee 100644
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   pdm-backend,
   pytz,
@@ -12,11 +11,9 @@
 
 buildPythonPackage rec {
   pname = "pyfireservicerota";
-  version = "0.0.46";
+  version = "0.0.47";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-fireservicerota";
diff --git a/pkgs/development/python-modules/pyfluidsynth/default.nix b/pkgs/development/python-modules/pyfluidsynth/default.nix
index de35f66d2a60..5e915c911435 100644
--- a/pkgs/development/python-modules/pyfluidsynth/default.nix
+++ b/pkgs/development/python-modules/pyfluidsynth/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Python bindings for FluidSynth, a MIDI synthesizer that uses SoundFont instruments";
     homepage = "https://github.com/nwhitehead/pyfluidsynth";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyghmi/default.nix b/pkgs/development/python-modules/pyghmi/default.nix
index 4aa4c116c2c4..7b50d4d495a2 100644
--- a/pkgs/development/python-modules/pyghmi/default.nix
+++ b/pkgs/development/python-modules/pyghmi/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyghmi";
-  version = "1.6.5";
+  version = "1.6.6";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-g7QJFreMmO5NWvFmSQWFrHjPHpP6Gy4o31JDHSF2ob8=";
+    hash = "sha256-JTVBce+B/6N/opmUBqXUAADCwr5hE+4T8dNG/xAbtuo=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index ecf741205aea..8cd0c81b9280 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -2,9 +2,8 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
-  unzip,
-  pythonOlder,
+  fetchFromGitHub,
+  flit-core,
   libGL,
   libGLU,
   xorg,
@@ -22,15 +21,15 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.10";
-  format = "setuptools";
+  version = "2.1.9";
   pname = "pyglet";
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-JCvrGzvWfFvr3+W6EexWtpathrUMbn8qMX+NeDJWuck=";
-    extension = "zip";
+  src = fetchFromGitHub {
+    owner = "pyglet";
+    repo = "pyglet";
+    tag = "v${version}";
+    hash = "sha256-hdLqtSvtsj6dcpTxFAs2UO27gkUAlsdjsi624ucpGU8=";
   };
 
   # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307).
@@ -77,6 +76,10 @@ buildPythonPackage rec {
                   path = '${xorg.libXi}/lib/libXi${ext}'
               elif name == 'Xinerama':
                   path = '${xorg.libXinerama}/lib/libXinerama${ext}'
+              elif name == 'Xrandr':
+                  path = '${lib.getLib xorg.libXrandr}/lib/libXrandr${ext}'
+              elif name == 'Xrender':
+                  path = '${lib.getLib xorg.libXrender}/lib/libXrender${ext}'
               elif name == 'Xxf86vm':
                   path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}'
               elif name == 'harfbuzz':
@@ -115,7 +118,7 @@ buildPythonPackage rec {
       EOF
     '';
 
-  nativeBuildInputs = [ unzip ];
+  build-system = [ flit-core ];
 
   # needs GL set up which isn't really possible in a build environment even in headless mode.
   # tests do run and pass in nix-shell, however.
@@ -140,6 +143,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "http://www.pyglet.org/";
+    changelog = "https://github.com/pyglet/pyglet/blob/${src.tag}/RELEASE_NOTES";
     description = "Cross-platform windowing and multimedia library";
     license = lib.licenses.bsd3;
     # The patch needs adjusting for other platforms.
diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix
new file mode 100644
index 000000000000..9f9012c06d4a
--- /dev/null
+++ b/pkgs/development/python-modules/pyglossary/default.nix
@@ -0,0 +1,91 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  setuptools,
+
+  # tests
+  versionCheckHook,
+
+  # nativeBuildInputs for GUI
+  gobject-introspection,
+  wrapGAppsHook3,
+
+  # dependencies (required for most functionality)
+  pyicu,
+  lxml,
+  enableGui ? false,
+  # for GUI only
+  pygobject3,
+  gtk3,
+}:
+
+buildPythonPackage rec {
+  pname = "pyglossary";
+  version = "5.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ilius";
+    repo = "pyglossary";
+    tag = version;
+    hash = "sha256-OrySbbStVSz+WF8D+ODK++lKfYJOm9KCfOxDP3snuKY=";
+  };
+
+  patches = [
+    # Fixes a few install issues, can be removed in the next release. See:
+    # https://github.com/ilius/pyglossary/pull/684
+    (fetchpatch {
+      url = "https://github.com/ilius/pyglossary/commit/f86c91ed987579cd8a1c7f7f278452901ce725ac.patch";
+      hash = "sha256-ewYeNwD3/aSsNbMazgW/3tBpYAPBZdnVu9LCh7tQZjg=";
+    })
+  ];
+
+  build-system = [
+    setuptools
+  ]
+  ++ lib.optionals enableGui [
+    gobject-introspection
+    wrapGAppsHook3
+  ];
+
+  dependencies = [
+    pyicu
+    lxml
+  ]
+  ++ lib.optionals enableGui [
+    pygobject3
+  ];
+
+  buildInputs = lib.optionals enableGui [
+    gtk3
+  ];
+
+  # Many issues with the tests: They require `cd tests` in `preCheck`; Some of
+  # them depend upon files in `tests/deprecated`; Even with workarounds to
+  # these 2 issues, many tests require network access. We don't enable the
+  # tests by not adding pytestCheckHook to this list.
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  env = {
+    # The default --help creates permission errors that may be confusing when
+    # observed in the build log.
+    versionCheckProgramArg = "--version";
+  };
+
+  pythonImportsCheck = [
+    "pyglossary"
+  ];
+
+  meta = {
+    description = "Tool for converting dictionary files aka glossaries. Mainly to help use our offline glossaries in any Open Source dictionary we like on any operating system / device";
+    homepage = "https://github.com/ilius/pyglossary";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    mainProgram = "pyglossary";
+  };
+}
diff --git a/pkgs/development/python-modules/pyglossary/fix-install-issues.patch b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch
new file mode 100644
index 000000000000..d9e5db1a8111
--- /dev/null
+++ b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch
@@ -0,0 +1,93 @@
+diff --git c/pyproject.toml w/pyproject.toml
+index abfb59ac..8f9c2121 100644
+--- c/pyproject.toml
++++ w/pyproject.toml
+@@ -416,11 +416,10 @@ version = "5.1.1"
+ description = "A tool for converting dictionary files aka glossaries."
+ readme = "README.md"
+ authors = [{ name = "Saeed Rasooli", email = "saeed.gnu@gmail.com" }]
+-license = { text = "GPLv3+" }
++license = "GPL-3.0-or-later"
+ keywords = ["dictionary", "glossary"]
+ classifiers = [
+ 	"Development Status :: 5 - Production/Stable",
+-	"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+ 	"Operating System :: OS Independent",
+ 	"Typing :: Typed",
+ 	"Programming Language :: Python :: 3.11",
+@@ -430,6 +429,9 @@ classifiers = [
+ requires-python = ">= 3.11"
+ dependencies = []
+ 
++[project.scripts]
++pyglossary = "pyglossary.ui.main:main"
++
+ [project.optional-dependencies]
+ all = ["PyICU", "lxml", "beautifulsoup4"]
+ 
+diff --git c/setup.py w/setup.py
+index fd38a060..19df9ee3 100755
+--- c/setup.py
++++ w/setup.py
+@@ -8,8 +8,7 @@ import sys
+ from glob import glob
+ from os.path import dirname, exists, isdir, join
+ 
+-from setuptools import setup
+-from setuptools.command.install import install
++from setuptools import setup, find_packages
+ 
+ VERSION = "5.1.1"
+ log = logging.getLogger("root")
+@@ -46,29 +45,6 @@ def getPipSafeVersion() -> str:
+ 	return VERSION
+ 
+ 
+-class my_install(install):
+-	def run(self) -> None:
+-		install.run(self)
+-		if os.sep == "/":
+-			binPath = join(self.install_scripts, "pyglossary")
+-			log.info(f"creating script file {binPath!r}")
+-			if not exists(self.install_scripts):
+-				os.makedirs(self.install_scripts)
+-				# let it fail on wrong permissions.
+-			elif not isdir(self.install_scripts):
+-				raise OSError(
+-					"installation path already exists "
+-					f"but is not a directory: {self.install_scripts}",
+-				)
+-			open(binPath, "w", encoding="ascii").write("""#!/usr/bin/env -S python3 -O
+-import sys
+-from os.path import dirname
+-sys.path.insert(0, dirname(__file__))
+-from pyglossary.ui.main import main
+-main()""")
+-			os.chmod(binPath, 0o755)
+-
+-
+ root_data_file_names = [
+ 	"about",
+ 	"LICENSE",
+@@ -146,19 +122,14 @@ setup(
+ 	name="pyglossary",
+ 	version=getPipSafeVersion(),
+ 	python_requires=">=3.10.0",
+-	cmdclass={
+-		"install": my_install,
+-	},
+ 	description="A tool for converting dictionary files aka glossaries.",
+ 	long_description_content_type="text/markdown",
+ 	long_description=long_description,
+ 	author="Saeed Rasooli",
+ 	author_email="saeed.gnu@gmail.com",
+-	license="GPLv3+",
++	license="GPL-3.0-or-later",
+ 	url="https://github.com/ilius/pyglossary",
+-	packages=[
+-		"pyglossary",
+-	],
++	packages=find_packages(),
+ 	entry_points={
+ 		"console_scripts": [
+ 			"pyglossary = pyglossary.ui.main:main",
diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/1.nix
similarity index 82%
rename from pkgs/development/python-modules/pygls/default.nix
rename to pkgs/development/python-modules/pygls/1.nix
index 935a373cd9b5..830f177f81f1 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/1.nix
@@ -10,7 +10,6 @@
   pythonOlder,
   typeguard,
   websockets,
-  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -60,19 +59,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pygls" ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      # Skips pre-releases
-      "--version-regex"
-      "^v([0-9.]+)$"
-    ];
-  };
+  passthru.skipBulkUpdate = true;
 
-  meta = with lib; {
+  meta = {
     description = "Pythonic generic implementation of the Language Server Protocol";
     homepage = "https://github.com/openlawlibrary/pygls";
     changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kira-bruneau ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kira-bruneau ];
   };
 }
diff --git a/pkgs/development/python-modules/pygls/2.nix b/pkgs/development/python-modules/pygls/2.nix
new file mode 100644
index 000000000000..7cde9005c746
--- /dev/null
+++ b/pkgs/development/python-modules/pygls/2.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  attrs,
+  cattrs,
+  lsprotocol,
+  websockets,
+  pytest-asyncio,
+  pytestCheckHook,
+  nix-update-script,
+}:
+
+buildPythonPackage rec {
+  pname = "pygls";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openlawlibrary";
+    repo = "pygls";
+    tag = "v${version}";
+    hash = "sha256-dQLK18EACiN+DpWp81Vgaan0mwtifhrmH4xwkqttKvg=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    attrs
+    cattrs
+    lsprotocol
+  ];
+
+  optional-dependencies = {
+    ws = [ websockets ];
+  };
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # Fixes hanging tests on Darwin
+  __darwinAllowLocalNetworking = true;
+
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Darwin issue: OSError: [Errno 24] Too many open files
+    ulimit -n 1024
+  '';
+
+  pythonImportsCheck = [ "pygls" ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      # Skips pre-releases
+      "--version-regex"
+      "^v([0-9.]+)$"
+    ];
+  };
+
+  meta = {
+    description = "Pythonic generic implementation of the Language Server Protocol";
+    homepage = "https://github.com/openlawlibrary/pygls";
+    changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kira-bruneau ];
+  };
+}
diff --git a/pkgs/development/python-modules/pygnuutils/default.nix b/pkgs/development/python-modules/pygnuutils/default.nix
new file mode 100644
index 000000000000..fe57938210e5
--- /dev/null
+++ b/pkgs/development/python-modules/pygnuutils/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pygnuutils";
+  version = "0.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "matan1008";
+    repo = "pygnuutils";
+    tag = "v${version}";
+    hash = "sha256-RySqq1V6ad3W53Rp/ZweMPnbM7C3RDm3b6KV/FKQyW0=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+  ];
+
+  pythonImportsCheck = [ "pygnuutils" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/matan1008/pygnuutils/releases/tag/${src.tag}";
+    description = "Pure python implementation for GNU utils";
+    homepage = "https://github.com/matan1008/pygnuutils";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 18c6690e60f6..9825af96472e 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pygobject";
-  version = "3.50.0";
+  version = "3.54.3";
 
   outputs = [
     "out"
@@ -30,8 +30,8 @@ buildPythonPackage rec {
   format = "other";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-jYNudbWogdRX7hYiyuSjK826KKC6ViGTrbO7tHJHIhI=";
+    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
+    hash = "sha256-qNoJE0oPfVZJHPJBIUXjWqdOkddg6PM3CWoc2guSuuc=";
   };
 
   depsBuildBuild = [ pkg-config ];
@@ -73,7 +73,7 @@ buildPythonPackage rec {
     homepage = "https://pygobject.readthedocs.io/";
     description = "Python bindings for Glib";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ jtojnar ];
+    teams = [ teams.gnome ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/development/python-modules/pyhacrf-datamade/default.nix b/pkgs/development/python-modules/pyhacrf-datamade/default.nix
new file mode 100644
index 000000000000..db850e5809ff
--- /dev/null
+++ b/pkgs/development/python-modules/pyhacrf-datamade/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # dependencies
+  dedupe-pylbfgs,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "pyhacrf-datamade";
+  # Tagged release requested upstream in https://github.com/dedupeio/pyhacrf/issues/57
+  version = "0.2.8-unstable-2025-05-16";
+  pyproject = true;
+
+  # NOTE: This is a fork of dirko/pyhacrf maintained by dedupeio
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "pyhacrf";
+    rev = "899aa6c2c48e5afe8fb40727ffd6070e4ba71c31";
+    hash = "sha256-MVkOChDblu7A/ve51SYqO7lNoTXwh37bHjnZd+NvzK0=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  dependencies = [
+    dedupe-pylbfgs
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Change to temp directory so pytest imports from installed package in $out, not source
+  preCheck = ''
+    export TEST_DIR=$(mktemp -d)
+    cp -r pyhacrf/tests $TEST_DIR/
+    pushd $TEST_DIR
+  '';
+
+  postCheck = ''
+    popd
+  '';
+
+  pythonImportsCheck = [
+    "pyhacrf"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Hidden alignment conditional random field for classifying string pairs";
+    homepage = "https://github.com/dedupeio/pyhacrf";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyhcl/default.nix b/pkgs/development/python-modules/pyhcl/default.nix
index d947eb84944d..101e639cbde7 100644
--- a/pkgs/development/python-modules/pyhcl/default.nix
+++ b/pkgs/development/python-modules/pyhcl/default.nix
@@ -1,25 +1,23 @@
 {
   buildPythonPackage,
   fetchFromGitHub,
-  isPy3k,
   lib,
 
   # pythonPackages
-  coverage,
-  pytest,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pyhcl";
   version = "0.4.5";
-  format = "setuptools";
-  disabled = !isPy3k;
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "virtuald";
     repo = "pyhcl";
-    rev = version;
-    sha256 = "sha256-vF40xEahs98G0lIC6XIl3eJHIuai2xTAeshUjiKN/BY=";
+    tag = version;
+    hash = "sha256-vF40xEahs98G0lIC6XIl3eJHIuai2xTAeshUjiKN/BY=";
   };
 
   # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/setup.py#L64
@@ -27,15 +25,11 @@ buildPythonPackage rec {
     echo '__version__ = "${version}"' > ./src/hcl/version.py
   '';
 
-  nativeCheckInputs = [
-    coverage
-    pytest
-  ];
+  build-system = [ setuptools ];
 
-  # https://github.com/virtuald/pyhcl/blob/51a7524b68fe21e175e157b8af931016d7a357ad/tests/run_tests.sh#L4
-  checkPhase = ''
-    coverage run --source hcl -m pytest tests
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   meta = with lib; {
     description = "HCL is a configuration language. pyhcl is a python parser for it";
diff --git a/pkgs/development/python-modules/pyheos/default.nix b/pkgs/development/python-modules/pyheos/default.nix
index da1f9fefc08c..ff7bb86ceae7 100644
--- a/pkgs/development/python-modules/pyheos/default.nix
+++ b/pkgs/development/python-modules/pyheos/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pyheos";
-  version = "1.0.5";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "andrewsayre";
     repo = "pyheos";
     tag = version;
-    hash = "sha256-waOeUAvQtx8klFVGnMHi6/OI2s6fxgVjB8aBlaKtklQ=";
+    hash = "sha256-CqUeDIHRD+stIVr9nMqfKUExVHPq8gbIzsZg8U36E7I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyimg4/default.nix b/pkgs/development/python-modules/pyimg4/default.nix
new file mode 100644
index 000000000000..eced828111dc
--- /dev/null
+++ b/pkgs/development/python-modules/pyimg4/default.nix
@@ -0,0 +1,76 @@
+{
+  apple-compress,
+  asn1,
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  lzfse,
+  pycryptodome,
+  pylzss,
+  pytestCheckHook,
+  remotezip,
+  stdenv,
+  uv-dynamic-versioning,
+}:
+
+buildPythonPackage rec {
+  pname = "pyimg4";
+  version = "0.8.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "m1stadev";
+    repo = "PyIMG4";
+    tag = "v${version}";
+    hash = "sha256-rGFHd4MAJrbKhtX+Ey/zqQ/12wWxDyBBy1xPGDFQjao=";
+  };
+
+  build-system = [
+    hatchling
+    uv-dynamic-versioning
+  ];
+
+  pythonRelaxDeps = [
+    "pylzss"
+  ];
+
+  dependencies = [
+    asn1
+    click
+    pycryptodome
+    pylzss
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    apple-compress
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    lzfse
+  ];
+
+  pythonImportsCheck = [ "pyimg4" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    remotezip
+  ];
+
+  disabledTests = [
+    # tests take forever
+    "test_read_lzss_dec"
+    "test_read_lzss_enc"
+    "test_read_lzfse_dec"
+    "test_read_lzfse_enc"
+    "test_read_payp"
+  ];
+
+  meta = {
+    changelog = "https://github.com/m1stadev/PyIMG4/releases/tag/${src.tag}";
+    description = "Python library/CLI tool for parsing Apple's Image4 format";
+    homepage = "https://github.com/m1stadev/PyIMG4";
+    license = lib.licenses.mit;
+    mainProgram = "pyimg4";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix
index b9c4b2fc6b62..5465c546cbad 100644
--- a/pkgs/development/python-modules/pyipv8/default.nix
+++ b/pkgs/development/python-modules/pyipv8/default.nix
@@ -1,33 +1,37 @@
 {
   lib,
   fetchPypi,
-  buildPythonPackage,
-  fetchFromGitHub,
-  cryptography,
-  libnacl,
   aiohttp,
   aiohttp-apispec,
-  pyopenssl,
-  pyasn1,
-  marshmallow,
-  typing-extensions,
-  packaging,
   apispec,
+  buildPythonPackage,
+  cryptography,
+  fetchFromGitHub,
+  libnacl,
+  marshmallow,
+  packaging,
+  pyasn1,
+  pyopenssl,
+  setuptools,
+  pytestCheckHook,
+  typing-extensions,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "pyipv8";
-  version = "3.0.2197-unstable-2025-07-29";
-  format = "setuptools";
+  version = "3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tribler";
     repo = "py-ipv8";
-    rev = "db39b85f4c28880dee24d1b59d8eae8ca8b9c03d";
-    hash = "sha256-VIcBPzpK8Cdaz/dRp9QK/MtK41jm8rs/pxnLS716FNM=";
+    tag = version;
+    hash = "sha256-HamjKVuBPSicoP/GldO5kg2Eay50ti03wzeNaPAl0qI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cryptography
     libnacl
     aiohttp
@@ -40,7 +44,11 @@ buildPythonPackage {
     apispec
   ];
 
-  doCheck = false;
+  doCheck = true;
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Python implementation of Tribler's IPv8 p2p-networking layer";
diff --git a/pkgs/development/python-modules/pykalman/default.nix b/pkgs/development/python-modules/pykalman/default.nix
index 4d8b902b46b7..1be45692ea17 100644
--- a/pkgs/development/python-modules/pykalman/default.nix
+++ b/pkgs/development/python-modules/pykalman/default.nix
@@ -29,6 +29,8 @@ buildPythonPackage rec {
     scikit-base
   ];
 
+  pythonRelaxDeps = [ "scikit-base" ];
+
   nativeCheckInputs = [ pytestCheckHook ];
   pythonImportsCheck = [ "pykalman" ];
 
diff --git a/pkgs/development/python-modules/pykdebugparser/default.nix b/pkgs/development/python-modules/pykdebugparser/default.nix
new file mode 100644
index 000000000000..d4bf97311283
--- /dev/null
+++ b/pkgs/development/python-modules/pykdebugparser/default.nix
@@ -0,0 +1,48 @@
+{
+  buildPythonPackage,
+  click,
+  construct,
+  fetchFromGitHub,
+  lib,
+  pygments,
+  pytestCheckHook,
+  setuptools,
+  termcolor,
+}:
+
+buildPythonPackage rec {
+  pname = "pykdebugparser";
+  version = "1.2.7";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "matan1008";
+    repo = "pykdebugparser";
+    tag = "v${version}";
+    hash = "sha256-V6WyFsPcjiBUJ+Amc3xk0GwdHzwakRizB/dPnSXT6vo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    click
+    construct
+    pygments
+    termcolor
+  ];
+
+  pythonImportsCheck = [ "pykdebugparser" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/matan1008/pykdebugparser/releases/tag/${src.tag}";
+    description = "Kdebug events and ktraces parser";
+    homepage = "https://github.com/matan1008/pykdebugparser";
+    license = lib.licenses.mit;
+    mainProgram = "pykdebugparser";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix
index 6670f6d145d0..49409e6bb131 100644
--- a/pkgs/development/python-modules/pykdl/default.nix
+++ b/pkgs/development/python-modules/pykdl/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   toPythonModule,
-  fetchpatch,
   cmake,
   pybind11,
   orocos-kdl,
@@ -17,15 +16,6 @@ toPythonModule (
 
     sourceRoot = "${orocos-kdl.src.name}/python_orocos_kdl";
 
-    patches = [
-      # Support system pybind11; the vendored copy doesn't support Python 3.11
-      (fetchpatch {
-        url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/e25a13fc5820dbca6b23d10506407bca9bcdd25f.patch";
-        hash = "sha256-NGMVGEYsa7hVX+SgRZgeSm93BqxFR1uiyFvzyF5H0Y4=";
-        stripLen = 1;
-      })
-    ];
-
     # Fix hardcoded installation path
     postPatch = ''
       substituteInPlace CMakeLists.txt \
diff --git a/pkgs/development/python-modules/pylacus/default.nix b/pkgs/development/python-modules/pylacus/default.nix
index e75298bb7a8c..10551ce6489e 100644
--- a/pkgs/development/python-modules/pylacus/default.nix
+++ b/pkgs/development/python-modules/pylacus/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pylacus";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "PyLacus";
     tag = "v${version}";
-    hash = "sha256-N0FGjT/Jq5n2J2omk/W1tsjiAZY4WlsEs33ErKOuCl4=";
+    hash = "sha256-Ezp/aFTETvU1bOZZvMlZn0XmaLWoOd6l8s0n5lIqV2w=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 1d27aa6a034b..08d47fda0d57 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -13,6 +13,7 @@
   protobuf,
 
   # dependencies
+  lance-namespace,
   numpy,
   pyarrow,
 
@@ -32,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.38.2";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-H4HQzLmQdDS8aS/OMsIHjWEogmctkF+5N5ClozeuITU=";
+    hash = "sha256-e0ZpuC0ezk+ZwmCrWkdD2MnCvnjHVVPsN01JWUNyPf4=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -51,7 +52,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-A4qZERrYm8FELuJNqy/fhbJxLxTp73oY7jc5bZavFFI=";
+    hash = "sha256-bvnmlUSnZolwesGtIrWve0a8yQXeYDuaP7mCh3KDd5U=";
   };
 
   nativeBuildInputs = [
@@ -73,6 +74,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "pyarrow" ];
 
   dependencies = [
+    lance-namespace
     numpy
     pyarrow
   ];
diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix
index c9a6d80ed969..6e67fa12b5ea 100644
--- a/pkgs/development/python-modules/pylint-odoo/default.nix
+++ b/pkgs/development/python-modules/pylint-odoo/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "pylint-odoo";
-  version = "9.3.21";
+  version = "9.3.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OCA";
     repo = "pylint-odoo";
     tag = "v${version}";
-    hash = "sha256-qNZHk8bl1mxaLzS55oV29iKGDfIKumQgME1V9PIx4vQ=";
+    hash = "sha256-qSeDnfZCdEtXAXeAJ+mEbDH5Fbxj9ghiucwlz1mIMnI=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index ceef62732855..db243048c9f7 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -12,25 +12,20 @@
   pytest-aiohttp,
   pytest-freezegun,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2024.2.4";
+  version = "2025.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = "v${version}";
-    hash = "sha256-/GN2b4rlE6j60O5ZxH8I58qwcZewAYJu0EHwQ7mrdBY=";
+    hash = "sha256-Rr7QseViy6i13QbZVb8BxMWDsE9meG4NqT5B1Z+TZbc=";
   };
 
-  pythonRelaxDeps = [ "deepdiff" ];
-
   build-system = [
     poetry-core
     poetry-dynamic-versioning
@@ -52,11 +47,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pylitterbot" ];
 
-  meta = with lib; {
+  meta = {
     description = "Modulefor controlling a Litter-Robot";
     homepage = "https://github.com/natekspencer/pylitterbot";
     changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pylzss/default.nix b/pkgs/development/python-modules/pylzss/default.nix
new file mode 100644
index 000000000000..19d9f14f21c4
--- /dev/null
+++ b/pkgs/development/python-modules/pylzss/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pylzss";
+  version = "0.3.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "m1stadev";
+    repo = "pylzss";
+    tag = "v${version}";
+    hash = "sha256-Y0u9rFJWYWyJUVEgpLtQHsXu0JpTgRKxFJHB+B3EFyU=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "lzss" ];
+
+  # upstream's test.py is dysfunctional
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/m1stadev/pylzss/releases/tag/${src.tag}";
+    description = "Python library for decoding/encoding LZSS-compressed data";
+    homepage = "https://github.com/m1stadev/pylzss";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pymatting/default.nix b/pkgs/development/python-modules/pymatting/default.nix
index bef86bb4b0e9..855f4682ca15 100644
--- a/pkgs/development/python-modules/pymatting/default.nix
+++ b/pkgs/development/python-modules/pymatting/default.nix
@@ -52,6 +52,9 @@ buildPythonPackage rec {
     "test_lkm"
   ];
 
+  # pyopencl._cl.LogicError: clGetPlatformIDs failed: PLATFORM_NOT_FOUND_KHR
+  disabledTestPaths = lib.optional cudaSupport "tests/test_foreground.py";
+
   meta = with lib; {
     description = "Python library for alpha matting";
     homepage = "https://github.com/pymatting/pymatting";
diff --git a/pkgs/development/python-modules/pymbolic/default.nix b/pkgs/development/python-modules/pymbolic/default.nix
index a74f61195b14..8be9ffbd8c0e 100644
--- a/pkgs/development/python-modules/pymbolic/default.nix
+++ b/pkgs/development/python-modules/pymbolic/default.nix
@@ -7,8 +7,9 @@
   hatchling,
 
   # dependencies
-  immutabledict,
+  constantdict,
   pytools,
+  typing-extensions,
 
   # optional-dependencies
   matchpy,
@@ -20,21 +21,22 @@
 
 buildPythonPackage rec {
   pname = "pymbolic";
-  version = "2024.2.2";
+  version = "2025.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "inducer";
     repo = "pymbolic";
     tag = "v${version}";
-    hash = "sha256-07RWdEPhO+n9/FOvIWe4nm9fGekut9X6Tz4HlIkBSpo=";
+    hash = "sha256-cn2EdhMn5qjK854AF5AY4Hv4M5Ib6gPRJk+kQvsFWRk=";
   };
 
   build-system = [ hatchling ];
 
   dependencies = [
-    immutabledict
+    constantdict
     pytools
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -51,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://documen.tician.de/pymbolic/";
     changelog = "https://github.com/inducer/pymbolic/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ qbisi ];
   };
 }
diff --git a/pkgs/development/python-modules/pymc/default.nix b/pkgs/development/python-modules/pymc/default.nix
index 836ee2f3f183..519b7fe40d5e 100644
--- a/pkgs/development/python-modules/pymc/default.nix
+++ b/pkgs/development/python-modules/pymc/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
 
   # build-system
   setuptools,
@@ -23,26 +22,16 @@
 
 buildPythonPackage rec {
   pname = "pymc";
-  version = "5.25.1";
+  version = "5.26.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymc-devs";
     repo = "pymc";
     tag = "v${version}";
-    hash = "sha256-zh6FsCEviuyqapguTrUDsWKq70ef0IKRhnn2dkgQ/KA=";
+    hash = "sha256-j1v8MzAFfOmkN7pDcF91dS5Xprls8qfTQHWdaFUO4GU=";
   };
 
-  patches = [
-    # TODO: remove at next release
-    # https://github.com/pymc-devs/pytensor/pull/1471
-    (fetchpatch2 {
-      name = "pytensor-2-32-compat";
-      url = "https://github.com/pymc-devs/pymc/commit/59176b6adda88971e546a0cf93ca04424af5197f.patch";
-      hash = "sha256-jkDwlKwxbn9DwpkxEbSXk/kbGjT/Xu8bsZHFBWYpMgA=";
-    })
-  ];
-
   build-system = [
     setuptools
     versioneer
diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix
index bd9db22d7a2d..03144e04bb96 100644
--- a/pkgs/development/python-modules/pymiele/default.nix
+++ b/pkgs/development/python-modules/pymiele/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pymiele";
-  version = "0.5.5";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-C1E5z/h4XCDhUP07EL8s6Xv++M03vx8KZOMjWySyUMw=";
+    hash = "sha256-X2nATBOOq+N4ptF2NCNbZLi2KweoMzw0ixwP5mXm9SI=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix
index 241556be6829..25e4253730c1 100644
--- a/pkgs/development/python-modules/pymitsubishi/default.nix
+++ b/pkgs/development/python-modules/pymitsubishi/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pymitsubishi";
-  version = "0.3.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "pymitsubishi";
     tag = "v${version}";
-    hash = "sha256-cfLKFvhzLN9dM0cMogCL93LVfRd8jDFo9x+nnEWInSc=";
+    hash = "sha256-Uh3hlgXYgGDZDpEJInLX323fftVciwh9fLEKF2Kozq0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix
new file mode 100644
index 000000000000..5812bdbff51c
--- /dev/null
+++ b/pkgs/development/python-modules/pymobiledevice3/default.nix
@@ -0,0 +1,125 @@
+{
+  bpylist2,
+  buildPythonPackage,
+  click,
+  coloredlogs,
+  construct,
+  cryptography,
+  daemonize,
+  developer-disk-image,
+  fastapi,
+  fetchFromGitHub,
+  gpxpy,
+  hexdump,
+  hyperframe,
+  ifaddr,
+  inquirer3,
+  ipsw-parser,
+  ipython,
+  lib,
+  nest-asyncio,
+  opack2,
+  packaging,
+  parameter-decorators,
+  pillow,
+  plumbum,
+  psutil,
+  pycrashreport,
+  pygments,
+  pygnuutils,
+  pykdebugparser,
+  pytest-asyncio,
+  pytestCheckHook,
+  python-pcapng,
+  pytun-pmd3,
+  pyusb,
+  qh3,
+  requests,
+  setuptools,
+  setuptools-scm,
+  srptools,
+  sslpsk-pmd3,
+  tqdm,
+  uvicorn,
+  wsproto,
+  xonsh,
+}:
+
+buildPythonPackage rec {
+  pname = "pymobiledevice3";
+  version = "5.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "pymobiledevice3";
+    tag = "v${version}";
+    hash = "sha256-fw7KGijIgIXXFbtNpq1QBrxUP4F6ivLQXQn94YZnQL4=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    bpylist2
+    click
+    coloredlogs
+    construct
+    cryptography
+    daemonize
+    developer-disk-image
+    fastapi
+    gpxpy
+    hexdump
+    hyperframe
+    ifaddr
+    inquirer3
+    ipsw-parser
+    ipython
+    nest-asyncio
+    opack2
+    packaging
+    parameter-decorators
+    pillow
+    plumbum
+    psutil
+    pycrashreport
+    pygments
+    pygnuutils
+    pykdebugparser
+    python-pcapng
+    pytun-pmd3
+    pyusb
+    qh3
+    requests
+    srptools
+    sslpsk-pmd3
+    tqdm
+    uvicorn
+    wsproto
+    xonsh
+  ]
+  ++ fastapi.optional-dependencies.all;
+
+  pythonImportsCheck = [ "pymobiledevice3" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # Upstream only runs tests marked with 'cli' in CI:
+  # https://github.com/doronz88/pymobiledevice3/blob/v4.27.1/.github/workflows/python-app.yml#L45
+  enabledTestMarks = [ "cli" ];
+
+  meta = {
+    changelog = "https://github.com/doronz88/pymobiledevice3/releases/tag/${src.tag}";
+    description = "Pure python3 implementation for working with iDevices (iPhone, etc.)";
+    homepage = "https://github.com/doronz88/pymobiledevice3";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "pymobiledevice3";
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pynacl/default.nix b/pkgs/development/python-modules/pynacl/default.nix
index 5f5b26a17acb..11a60e232336 100644
--- a/pkgs/development/python-modules/pynacl/default.nix
+++ b/pkgs/development/python-modules/pynacl/default.nix
@@ -1,62 +1,64 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  fetchpatch2,
-  pytestCheckHook,
-  sphinxHook,
-  pythonOlder,
-  libsodium,
   cffi,
+  fetchFromGitHub,
   hypothesis,
+  libsodium,
+  pytestCheckHook,
+  pytest-xdist,
+  pythonOlder,
+  setuptools,
+  sphinxHook,
 }:
 
 buildPythonPackage rec {
   pname = "pynacl";
-  version = "1.5.0";
+  version = "1.6.0";
   outputs = [
     "out"
     "doc"
   ];
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit version;
-    pname = "PyNaCl";
-    sha256 = "8ac7448f09ab85811607bdd21ec2464495ac8b7c66d146bf545b0f08fb9220ba";
+  src = fetchFromGitHub {
+    owner = "pyca";
+    repo = "pynacl";
+    tag = version;
+    hash = "sha256-7SDJB2bXn0IGJQi597yehs9epdfmS7slbQ97vFVUkEA=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # sphinx 8 compat
-      url = "https://github.com/pyca/pynacl/commit/81943b3c61b9cc731ae0f2e87b7a91e42fbc8fa1.patch";
-      hash = "sha256-iO3pBqGW2zZE8lG8khpPjqJso9/rmFbdnwCcBs8iFeI=";
-    })
+  build-system = [
+    cffi
+    setuptools
   ];
 
+  # cffi is listed in both build-system.requires and project.dependencies,
+  # and is indeed needed in both when cross-compiling
+  dependencies = [ cffi ];
+
   nativeBuildInputs = [ sphinxHook ];
 
   buildInputs = [ libsodium ];
 
   propagatedNativeBuildInputs = [ cffi ];
 
-  propagatedBuildInputs = [ cffi ];
-
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook
+    pytest-xdist
   ];
 
-  SODIUM_INSTALL = "system";
+  env.SODIUM_INSTALL = "system";
 
   pythonImportsCheck = [ "nacl" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python binding to the Networking and Cryptography (NaCl) library";
     homepage = "https://github.com/pyca/pynacl/";
-    license = licenses.asl20;
-    maintainers = [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
 }
diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index 9006101f4278..f08e4fe6a250 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   setuptools,
   pyyaml,
@@ -9,14 +8,12 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "7.4.0";
+  version = "7.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H3hv7Y0Va5m//XEwlqfsjIEYH5Scj1ySD2gg6S1rmHY=";
+    hash = "sha256-rYY3c4ztW9uIwosIf+o5ylUoYMLTAASsAQM8D460824=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
new file mode 100644
index 000000000000..a3c81a46cfdf
--- /dev/null
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -0,0 +1,40 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  python-dotenv,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pynintendoparental";
+  version = "1.1.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pantherale0";
+    repo = "pynintendoparental";
+    tag = version;
+    hash = "sha256-mH34BcbK3qyB2sAmVyAQz6GhI+xWAdRHagZzLVI9gr8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pynintendoparental" ];
+
+  # test.py connects to the actual API
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/pantherale0/pynintendoparental/releases/tag/${src.tag}";
+    description = "Python module to interact with Nintendo Parental Controls";
+    homepage = "https://github.com/pantherale0/pynintendoparental";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix
index 1ce0824e3d39..637fdab9c909 100644
--- a/pkgs/development/python-modules/pynitrokey/default.nix
+++ b/pkgs/development/python-modules/pynitrokey/default.nix
@@ -25,7 +25,7 @@
 
 let
   pname = "pynitrokey";
-  version = "0.10.0";
+  version = "0.11.1";
   mainProgram = "nitropy";
 in
 
@@ -35,7 +35,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Kr6VtBADLvXUva7csbsHujGzBfRG1atJLF7qbIWmToM=";
+    hash = "sha256-TUc8ZDQ0MHyEtrsudqGxTXmwNIio4UcNcjwsOtaK0Ww=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix
index 605a6fc7c18a..e1899f3cb4dd 100644
--- a/pkgs/development/python-modules/pynordpool/default.nix
+++ b/pkgs/development/python-modules/pynordpool/default.nix
@@ -4,21 +4,18 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pynordpool";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pynordpool";
     tag = "v${version}";
-    hash = "sha256-4s43E3VUO0EOTte4c2ZnWY2fccyVAgqSOVPpxz0+L5s=";
+    hash = "sha256-3yMVhdfjl2l56WzI+uRMUwFuYafSH3YfabYqKSK25Y4=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/pynut2/default.nix b/pkgs/development/python-modules/pynut2/default.nix
index 44c687f12592..a00f3d32dcfb 100644
--- a/pkgs/development/python-modules/pynut2/default.nix
+++ b/pkgs/development/python-modules/pynut2/default.nix
@@ -3,12 +3,14 @@
   buildPythonPackage,
   fetchFromGitHub,
   requests,
+  standard-telnetlib,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pynut2";
   version = "2.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mezz64";
@@ -17,7 +19,12 @@ buildPythonPackage rec {
     sha256 = "1lg7n1frndfgw73s0ssl1h7kc6zxm7fpiwlc6v6d60kxzaj1dphx";
   };
 
-  propagatedBuildInputs = [ requests ];
+  build-system = [ setuptools ];
+
+  dependencies = [
+    requests
+    standard-telnetlib
+  ];
 
   pythonImportsCheck = [ "pynut2.nut2" ];
 
diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
index f4e972e0bf41..dbbcfb6ece8e 100644
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/neovim/pynvim";
     changelog = "https://github.com/neovim/pynvim/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix
index 76415696d58d..50d26bb5e8d8 100644
--- a/pkgs/development/python-modules/pyocd/default.nix
+++ b/pkgs/development/python-modules/pyocd/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "pyocd";
-  version = "0.39.0";
+  version = "0.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyocd";
     repo = "pyOCD";
     tag = "v${version}";
-    hash = "sha256-/jFH6h8RmLupSyzf4mXNzhfbuAAfqkfWFSfQmGMVDRE=";
+    hash = "sha256-rF2sr7aL2kceo1zBwBZcOYpAc0CTohF/1TbGF95iyIk=";
   };
 
   pythonRelaxDeps = [ "capstone" ];
diff --git a/pkgs/development/python-modules/pyopen-wakeword/default.nix b/pkgs/development/python-modules/pyopen-wakeword/default.nix
new file mode 100644
index 000000000000..2f5255d364c5
--- /dev/null
+++ b/pkgs/development/python-modules/pyopen-wakeword/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  autoPatchelfHook,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pyopen-wakeword";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rhasspy";
+    repo = "pyopen-wakeword";
+    tag = "v${version}";
+    hash = "sha256-LJ0pHP4nsTx3GPuWUwOwNuXR9tUKABqSHnLSvMlfm1Y=";
+  };
+
+  postPatch = ''
+    python ./script/copy_lib
+  '';
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+  ];
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "pyopen_wakeword"
+  ];
+
+  meta = {
+    # elftools.common.exceptions.ELFError: Magic number does not match
+    broken = stdenv.hostPlatform.isDarwin;
+    description = "Alternative Python library for openWakeWord";
+    homepage = "https://github.com/rhasspy/pyopen-wakeword";
+    changelog = "https://github.com/rhasspy/pyopen-wakeword/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+    # vendors prebuilt libtensorflowlite_c.{so,dll,dylib}
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index a2d58cb0b51e..6ce8be2b6c75 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2025.2.6";
+  version = "2025.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     repo = "pyopencl";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-ofAyBaD/iMm2+2PFGVTEzg/kaPmcwlvLPAihRE+JlJg=";
+    hash = "sha256-LrV4NHn4I2kaZvXuWs706fvHUOR4sc+Pv8wVHPVKpPo=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index ebbfcaff6c1f..aab03cea1990 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -64,6 +64,8 @@ buildPythonPackage rec {
     "test_wantWriteError"
     # https://github.com/pyca/pyopenssl/issues/1043
     "test_alpn_call_failure"
+    # https://github.com/pyca/pyopenssl/issues/1455
+    "test_client_receives_servers_data"
   ]
   ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [
     # https://github.com/pyca/pyopenssl/issues/791
diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix
deleted file mode 100644
index 2542877ef0e5..000000000000
--- a/pkgs/development/python-modules/pyownet/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "pyownet";
-  version = "0.10.0.post1";
-
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62";
-  };
-
-  postPatch = ''
-    sed -i '/use_2to3/d' setup.py
-  '';
-
-  # tests access network
-  doCheck = false;
-
-  pythonImportsCheck = [ "pyownet.protocol" ];
-
-  meta = with lib; {
-    description = "Python OWFS client library (owserver protocol)";
-    homepage = "https://github.com/miccoli/pyownet";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/development/python-modules/pyoxigraph/default.nix b/pkgs/development/python-modules/pyoxigraph/default.nix
index f312cc84afad..84b42ace2a53 100644
--- a/pkgs/development/python-modules/pyoxigraph/default.nix
+++ b/pkgs/development/python-modules/pyoxigraph/default.nix
@@ -12,19 +12,19 @@
 buildPythonPackage rec {
   pname = "pyoxigraph";
   pyproject = true;
-  version = "0.5.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "oxigraph";
     repo = "oxigraph";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-Q/wMRDTlz7xH59Mc+G+DOH0GYzE3KYPFvBZtVYVOeQI=";
+    hash = "sha256-ptTrJbLGS7GkLGO40mbpdPkrcspaUE33kRZ8g9Qtb0o=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-qk4NloQU0am8yqoViXZy9TmGvQ6RJt3otzaVugoF4mc=";
+    hash = "sha256-AuUGra9ejPRKWWpXWLmcwGuZRKIuCYTdifpnwuuHnnQ=";
   };
 
   buildAndTestSubdir = "python";
diff --git a/pkgs/development/python-modules/pypaperless/default.nix b/pkgs/development/python-modules/pypaperless/default.nix
index ffbc40c6d872..b6ce03d6b228 100644
--- a/pkgs/development/python-modules/pypaperless/default.nix
+++ b/pkgs/development/python-modules/pypaperless/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pypaperless";
-  version = "5.0.0";
+  version = "5.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tb1337";
     repo = "paperless-api";
     tag = "v${version}";
-    hash = "sha256-ItaHtAhLrrrLrem6gW5oRUqYIJAdhBJH+aig2cWN1a4=";
+    hash = "sha256-J2YAUVgiXcb9jM0yDkBkg3X7k8B7hT3dxeEI5Tn2QLY=";
   };
 
   postPatch = ''
@@ -30,11 +30,6 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
-  pythonRelaxDeps = [
-    "aiohttp"
-    "yarl"
-  ];
-
   dependencies = [
     aiohttp
     yarl
diff --git a/pkgs/development/python-modules/pyperclip/default.nix b/pkgs/development/python-modules/pyperclip/default.nix
index 2fe17a982550..6ae8a535b2d2 100644
--- a/pkgs/development/python-modules/pyperclip/default.nix
+++ b/pkgs/development/python-modules/pyperclip/default.nix
@@ -7,13 +7,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.10.0";
+  version = "1.11.0";
   pname = "pyperclip";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-GAyDRrEYaSHHXf0U2QSKa11Gv8SZd4gRlSxt1uscpr4=";
+    hash = "sha256-JEA1lj5EKFMNnjphAaHvlyCcaCXtqxVnvqwUjMwdsbY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
index 145ad7676d87..e1f6d3bc459c 100644
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -3,6 +3,7 @@
   aresponses,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   mashumaro,
   orjson,
@@ -15,16 +16,24 @@
 
 buildPythonPackage rec {
   pname = "pyportainer";
-  version = "1.0.3";
+  version = "1.0.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "pyportainer";
     tag = "v${version}";
-    hash = "sha256-Y/O2lhsjkSEKQL7HhdmlzMjY1597uuUOFfI05aLiBXg=";
+    hash = "sha256-goTYZhv/+4o2/SMOqANMnR3u4YxwDJVcvT0pz8MT7M8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "remove-mkdocs-from-dependencies.patch";
+      url = "https://github.com/erwindouna/pyportainer/commit/8ed65c3870ff368465267e9bf2cda441b7b28994.patch";
+      hash = "sha256-3FE8NngAajIt8lDjG//sDPULq8mZ0f53iVemJ2xJ4MQ=";
+    })
+  ];
+
   build-system = [ poetry-core ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix
new file mode 100644
index 000000000000..b4674d023e26
--- /dev/null
+++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix
@@ -0,0 +1,160 @@
+{
+  lib,
+  aenum,
+  aiohttp,
+  appdirs,
+  buildPythonPackage,
+  certifi,
+  diff-match-patch,
+  fetchFromGitHub,
+  flake8,
+  importlib-metadata,
+  livereload,
+  mypy,
+  networkx,
+  ordered-set,
+  pillow,
+  pixelmatch,
+  poetry-core,
+  pre-commit,
+  pydocstyle,
+  pyee,
+  pylint,
+  pytest,
+  pytest-cov,
+  pytest-timeout,
+  pytest-xdist,
+  pytestCheckHook,
+  pythonOlder,
+  readme-renderer,
+  sphinx,
+  sphinxcontrib-asyncio,
+  syncer,
+  tox,
+  tqdm,
+  typing-extensions,
+  typing-inspect,
+  urllib3,
+  websockets,
+}:
+
+buildPythonPackage rec {
+  pname = "pyppeteer-ng";
+  version = "2.0.0rc10";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "dgtlmoon";
+    repo = "pyppeteer-ng";
+    tag = version;
+    hash = "sha256-NpxjKsh12pr/MCZ4gfoaa+3jTYyvQzHgSno1+rw2Wk0=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'aenum = "^2.2.3"' 'aenum = "*"' \
+      --replace-fail 'typing_inspect = { version ="^0.5.0"' 'typing_inspect = { version ="*"' \
+      --replace-fail 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \
+      --replace-fail 'websockets = "^10.1"' 'websockets = "*"' \
+      --replace-fail 'requires = ["poetry>=0.12"]' 'requires = ["poetry-core"]' \
+      --replace-fail 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"'
+
+    substituteInPlace tests/conftest.py \
+      --replace-fail '_port = get_free_port()' ""
+
+    substituteInPlace tests/utils/server.py \
+      --replace-fail '_Middleware' '_Middlewares' \
+  '';
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [
+    aenum
+    appdirs
+    certifi
+    ordered-set
+    pillow
+    pyee
+    tqdm
+    typing-inspect
+    typing-extensions
+    urllib3
+    websockets
+  ];
+
+  nativeCheckInputs = [
+    aiohttp
+    diff-match-patch
+    flake8
+    livereload
+    mypy
+    networkx
+    pixelmatch
+    pre-commit
+    pydocstyle
+    pylint
+    pytest
+    pytest-cov
+    pytest-timeout
+    pytest-xdist
+    readme-renderer
+    sphinx
+    sphinxcontrib-asyncio
+    syncer
+    tox
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # Requires network access
+    "tests/test_abnormal_crash.py"
+    "tests/test_accessibility.py"
+    "tests/test_browser.py"
+    "tests/test_browser_context.py"
+    "tests/test_browser_fetcher.py"
+    "tests/test_click.py"
+    "tests/test_connection.py"
+    "tests/test_coverage.py"
+    "tests/test_dialog.py"
+    "tests/test_element_handle.py"
+    "tests/test_emulation.py"
+    "tests/test_execution_context.py"
+    "tests/test_frame.py"
+    "tests/test_input.py"
+    "tests/test_jshandle.py"
+    "tests/test_keyboard.py"
+    "tests/test_launcher.py"
+    "tests/test_mouse.py"
+    "tests/test_navigation.py"
+    "tests/test_page.py"
+    "tests/test_pyppeteer.py"
+    "tests/test_queryselector.py"
+    "tests/test_requestinterception.py"
+    "tests/test_screenshot.py"
+    "tests/test_target.py"
+    "tests/test_touchscreen.py"
+    "tests/test_tracing.py"
+    "tests/test_worker.py"
+
+    # Failing
+    "pyee12-compat/connection_stability_test.py"
+    "pyee12-compat/pyee_compatibility_test.py"
+    "pyee12-compat/real_websocket_test.py"
+    "pyee12-compat/simple_connection_test.py"
+    "pyee12-compat/simplified_test.py"
+    "tests/test_misc.py"
+  ];
+
+  pythonImportsCheck = [ "pyppeteer" ];
+
+  meta = with lib; {
+    description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
+    mainProgram = "pyppeteer-install";
+    homepage = "https://github.com/dgtlmoon/pyppeteer-ng";
+    changelog = "https://github.com/dgtlmoon/pyppeteer-ng/blob/${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thanegill ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index 01b60f0e6ceb..574a91cc8e6e 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -5,9 +5,9 @@
 
   # build-system
   cython,
-  pip,
   pkgconfig,
   setuptools,
+  setuptools-git-versioning,
 
   # dependencies
   mpi4py,
@@ -17,38 +17,38 @@
 
 buildPythonPackage rec {
   pname = "pyprecice";
-  version = "3.2.1";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "python-bindings";
     tag = "v${version}";
-    hash = "sha256-8AM2wbPX54UaMO4MzLOV0TljLTAPOqR9gUbtT2McNjs=";
+    hash = "sha256-NkTrMZ7UKB5O2jIlhLhgkOm8ZeWJA1FoursA1df7XOk=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=61,<72" "setuptools"
-  '';
-
   build-system = [
     cython
-    pip
     pkgconfig
     setuptools
+    setuptools-git-versioning
   ];
 
   dependencies = [
     numpy
     mpi4py
+  ];
+
+  buildInputs = [
     precice
   ];
 
-  # Disable Test because everything depends on open mpi which requires network
+  # no official test instruction
   doCheck = false;
 
-  # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
+  pythonImportsCheck = [
+    "precice"
+  ];
 
   meta = {
     description = "Python language bindings for preCICE";
diff --git a/pkgs/development/python-modules/pyprobeplus/default.nix b/pkgs/development/python-modules/pyprobeplus/default.nix
index 2f1be9b8f442..2e95175f44a3 100644
--- a/pkgs/development/python-modules/pyprobeplus/default.nix
+++ b/pkgs/development/python-modules/pyprobeplus/default.nix
@@ -1,5 +1,6 @@
 {
   bleak,
+  bleak-retry-connector,
   buildPythonPackage,
   fetchFromGitHub,
   lib,
@@ -8,20 +9,21 @@
 
 buildPythonPackage rec {
   pname = "pyprobeplus";
-  version = "1.0.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pyprobeplus";
     tag = version;
-    hash = "sha256-ixrkwnvqjHwqnKG3Xo4qJP/FcP7fuAOPKpar13e8U1w=";
+    hash = "sha256-CJbQs0xZHdXNPX71G1KrrHHV58gXaQsUHGcX9P8E+iY=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
     bleak
+    bleak-retry-connector
   ];
 
   pythonImportsCheck = [ "pyprobeplus" ];
diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix
index f3108c431c3f..95a7a7e4c2c6 100644
--- a/pkgs/development/python-modules/pyproject-parser/default.nix
+++ b/pkgs/development/python-modules/pyproject-parser/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     cli = [
       click
       consolekit
diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index 46a40dfe6673..bacf8cf34bd0 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pypugjs";
-  version = "5.12.0";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kakulukia";
     repo = "pypugjs";
     tag = "v${version}";
-    hash = "sha256-JHZzyEilCjpZFIrl5kk1oJ4C/vgQTfVoRRGBK+DuHAE=";
+    hash = "sha256-aHTWRlRrUh4LCsNUcszce4g8C4O0A/aPZKTz6Zl0UYg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 7e4ba8303c7e..fcc6e51f8bbf 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -3,15 +3,24 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   scipy,
   numpy,
-  pyqt6,
   pyopengl,
+
+  # buildInputs
+  pyqt6,
+
+  # tests
   qt6,
   pytestCheckHook,
   freefont_ttf,
   makeFontsConf,
-  setuptools,
 }:
 
 let
@@ -20,7 +29,7 @@ in
 buildPythonPackage rec {
   pname = "pyqtgraph";
   version = "0.13.7";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyqtgraph";
@@ -29,9 +38,22 @@ buildPythonPackage rec {
     hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  patches = [
+    # Fixes a segmentation fault in tests with Qt 6.10. See:
+    # https://github.com/pyqtgraph/pyqtgraph/issues/3390
+    # The patch is the merge commit of:
+    # https://github.com/pyqtgraph/pyqtgraph/pull/3370
+    (fetchpatch {
+      url = "https://github.com/pyqtgraph/pyqtgraph/commit/bf38b8527e778c9c0bb653bc0df7bb36018dcbae.patch";
+      hash = "sha256-Tv4QK/OZvmDO3MOjswjch7DpF96U1uRN0dr8NIQ7+LY=";
+    })
+  ];
 
-  propagatedBuildInputs = [
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
     numpy
     scipy
     pyopengl
@@ -72,7 +94,7 @@ buildPythonPackage rec {
   meta = {
     description = "Scientific Graphics and GUI Library for Python";
     homepage = "https://www.pyqtgraph.org/";
-    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
+    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/${src.tag}/CHANGELOG";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index 3d15ac47bd26..95261eed47c2 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -2,14 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  filelock,
+
+  # build-system
   poetry-core,
+
+  # optional dependencies
+  filelock,
   psycopg,
   psycopg-pool,
+  redis,
+
+  # test
   pytestCheckHook,
   pytest-asyncio,
   pytest-xdist,
-  redis,
   redisTestHook,
 }:
 
@@ -41,6 +47,14 @@ buildPythonPackage rec {
     ];
   };
 
+  # Show each test name and track the slowest
+  # This helps with identifying bottlenecks in the test suite
+  # that are causing the build to time out on Hydra.
+  pytestFlags = [
+    "--durations=10"
+    "-vv"
+  ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
@@ -49,18 +63,25 @@ buildPythonPackage rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests = [
-    # hangs
-    "test_limiter_01"
+  disabledTestPaths = [
+    # Slow: > 1.5 seconds/test run standalone on a fast machine
+    # (Apple M3 Max with highest performance settings and 36GB RAM)
+    # and/or hang under load
+    # https://github.com/vutran1710/PyrateLimiter/issues/245
+    # https://github.com/vutran1710/PyrateLimiter/issues/247
+    "tests/test_bucket_all.py"
+    "tests/test_bucket_factory.py"
+    "tests/test_limiter.py"
+    "tests/test_multiprocessing.py"
   ];
 
   pythonImportsCheck = [ "pyrate_limiter" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family";
     homepage = "https://github.com/vutran1710/PyrateLimiter";
     changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kranzes ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kranzes ];
   };
 }
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 7f19bfb0c4c1..8ad883cdd919 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyscard";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pyscard";
     tag = version;
-    hash = "sha256-rz3m8eVbmJUMcQFuEMZwF3k/ES75KcNA8R+xix+Mgq8=";
+    hash = "sha256-MW/Cg7Ta/LdY/pOomsEecVIt62rc5qSAGjpJl4m+ruM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index eb107f072c5c..509a758d8340 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "pyscf";
-  version = "2.10.0";
+  version = "2.11.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pyscf";
     repo = "pyscf";
     tag = "v${version}";
-    hash = "sha256-lFYSWCe5THlivpBB6nFBR2zfCIKJ0YJeuY2rCKoXUq8=";
+    hash = "sha256-JqjZn4EL6P7qS9PJ/wV6+FniEUeCB/f271nczVH5VuQ=";
   };
 
   # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.
diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 3df8c781aaa2..e2cb49c23797 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -35,6 +35,12 @@ buildPythonPackage rec {
       url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch";
       hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g=";
     })
+    # fixes tests that failed related to elastic-mapping
+    # remove fix if this is ever merged upstream
+    (fetchpatch {
+      url = "https://github.com/KimiNewt/pyshark/commit/0e1d8d0e06108f2887c3147c93049de63b475f8a.patch";
+      hash = "sha256-fpgiBHcfS/TGYIB65ioZJrWUuDIrLxxXqGVJ9y18b2w=";
+    })
     (replaceVars ./hardcode-tshark-path.patch {
       tshark = lib.getExe' wireshark-cli "tshark";
     })
diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index bcd90f6b0475..0a9621aaa2d2 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -10,6 +10,7 @@
   shiboken6,
   llvmPackages,
   symlinkJoin,
+  fetchpatch,
 }:
 let
   packages = with python.pkgs.qt6; [
@@ -56,7 +57,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit (shiboken6) version src;
 
-  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
+  sourceRoot = "${finalAttrs.src.name}/sources/pyside6";
+
+  patches = [
+    # revert commit that breaks generated cmake files
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=05e328476f2d6ef8a0f3f44aca1e5b1cdb7499fc";
+      revert = true;
+      stripLen = 2;
+      hash = "sha256-PPLV5K+xp7ZdG0Tah1wpBdNWN7fsXvZh14eBzO0R55c=";
+    })
+  ];
 
   # Qt Designer plugin moved to a separate output to reduce closure size
   # for downstream things
@@ -115,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     cd ../../..
+    chmod +w .
     ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside6
     cp -r PySide6.egg-info $out/${python.sitePackages}/
 
diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 4361c2fbc223..552548c0840c 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "24.11.0";
+  version = "25.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     repo = "pyslurm";
     owner = "PySlurm";
     tag = "v${version}";
-    hash = "sha256-Uko4fgi080XWSseOBijzvzi0YtjuRIvH8qSKEWrpFG0=";
+    hash = "sha256-2FEBOKMN3IhJZu+QQ3nWQfxom6wpZUuQouF7TRYndTs=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index 17d120b65e74..45265af0fc3b 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -1,40 +1,56 @@
 {
   lib,
   aiohttp,
+  aioresponses,
   attrs,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   jmespath,
-  pythonOlder,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  uv-build,
 }:
 
 buildPythonPackage rec {
   pname = "pysma";
-  version = "0.7.5";
-  format = "setuptools";
+  version = "1.0.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-zlCGEcG5tmgEXhSMDLKj0/imT1iHBqlp1O1QhmPrJcA=";
+  src = fetchFromGitHub {
+    owner = "kellerza";
+    repo = "pysma";
+    tag = "v${version}";
+    hash = "sha256-T9QBIuKgbKmMUN2G+sZRW4DtgIk3H9rYMTxLtkXfEBI=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv-build>=0.9,<0.10" uv-build
+  '';
+
+  build-system = [ uv-build ];
+
+  dependencies = [
     aiohttp
     attrs
     jmespath
   ];
 
-  # pypi does not contain tests and GitHub archive not available
-  doCheck = false;
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "pysma" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/kellerza/pysma/blob/${src.tag}/CHANGELOG.md";
     description = "Python library for interacting with SMA Solar's WebConnect";
     homepage = "https://github.com/kellerza/pysma";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix
index a9f460678924..b558d274f0e7 100644
--- a/pkgs/development/python-modules/pysmart/default.nix
+++ b/pkgs/development/python-modules/pysmart/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pysmart";
-  version = "1.4.1";
+  version = "1.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "truenas";
     repo = "py-SMART";
     tag = "v${version}";
-    hash = "sha256-eVrJ83MTIlu7sDrOoaXwiWqxYmDJFU8tf+pb3ui9N5w=";
+    hash = "sha256-h9FBAoNYLs5XvLxSajyktCCcNgiT7mIp472C+fbqZFA=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix
index 067c290f0d3f..9427b8ca00a8 100644
--- a/pkgs/development/python-modules/pysmhi/default.nix
+++ b/pkgs/development/python-modules/pysmhi/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pysmhi";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pysmhi";
     tag = "v${version}";
-    hash = "sha256-9jsSvitxcjH2oFCdSm1203UwG5xjOwQDTaU4Z9Cqs+A=";
+    hash = "sha256-n2eDQ9fbELGvO/SYqdrwT+lZNIZs5GgihmrimvI3a1w=";
   };
 
   build-system = [ poetry-core ];
@@ -39,6 +39,8 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/gjohansson-ST/pysmhi/releases/tag/${src.tag}";
     description = "Retrieve open data from SMHI api";
diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index e979bc82acf0..46b25ee5c45c 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pysnmp";
-  version = "7.1.21";
+  version = "7.1.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysnmp";
     tag = "v${version}";
-    hash = "sha256-IbVs/fjNRDhp4a78ZbgqUOxyrlZjEwsKSlQV3+mmCjo=";
+    hash = "sha256-uEOhOVXaz4g1Ciun8x2AT8pRBkKR6uEfu4KJ1XSwouY=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/pyspelling/default.nix b/pkgs/development/python-modules/pyspelling/default.nix
index f5674995960f..b441e1893743 100644
--- a/pkgs/development/python-modules/pyspelling/default.nix
+++ b/pkgs/development/python-modules/pyspelling/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyspelling";
-  version = "2.11";
+  version = "2.12";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lMxu+pecJneWAa1mb42Yat9S0kezEzN61nqscWN0nQ4=";
+    hash = "sha256-ezl5EeRrf6fBBWsoZ8AugVR/yNALvNhEZWVd8j5J26o=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pysqueezebox/default.nix b/pkgs/development/python-modules/pysqueezebox/default.nix
index 6a0828f0a6b3..80e02eb3d5b8 100644
--- a/pkgs/development/python-modules/pysqueezebox/default.nix
+++ b/pkgs/development/python-modules/pysqueezebox/default.nix
@@ -1,34 +1,28 @@
 {
   lib,
   aiohttp,
-  async-timeout,
   buildPythonPackage,
   fetchFromGitHub,
   pytest-asyncio,
   pytestCheckHook,
-  pythonAtLeast,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "pysqueezebox";
-  version = "0.12.1";
+  version = "0.13.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "rajlaud";
     repo = "pysqueezebox";
     tag = "v${version}";
-    hash = "sha256-Bi809OzIoQ2TJH77kZlsSSPEmDNgz6hAybmOXbFn3LM=";
+    hash = "sha256-1kkvqmmO197IjIcUlnmnKoeOq+0njbrgwogDU+ivIqw=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
-    async-timeout
     aiohttp
   ];
 
@@ -39,9 +33,9 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pysqueezebox" ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.12") [
-    # AttributeError: 'has_calls' is not a valid assertion. Use a spec for the mock if 'has_calls' is meant to be an attribute.
-    "test_verified_pause"
+  disabledTests = [
+    # Test contacts 192.168.1.1
+    "test_bad_response"
   ];
 
   disabledTestPaths = [
@@ -49,11 +43,11 @@ buildPythonPackage rec {
     "tests/test_integration.py"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Asynchronous library to control Logitech Media Server";
     homepage = "https://github.com/rajlaud/pysqueezebox";
     changelog = "https://github.com/rajlaud/pysqueezebox/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ nyanloutre ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ nyanloutre ];
   };
 }
diff --git a/pkgs/development/python-modules/pysrdaligateway/default.nix b/pkgs/development/python-modules/pysrdaligateway/default.nix
new file mode 100644
index 000000000000..addd6a2cb38f
--- /dev/null
+++ b/pkgs/development/python-modules/pysrdaligateway/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  wheel,
+  cryptography,
+  paho-mqtt,
+  psutil,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-cov,
+}:
+
+buildPythonPackage rec {
+  pname = "pysrdaligateway";
+  version = "0.15.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "maginawin";
+    repo = "PySrDaliGateway";
+    tag = "v${version}";
+    hash = "sha256-qPZxcGDSToFkkXBJKxo9OkcTBr4TZ9cFrcQwBTwKfy8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+    paho-mqtt
+    psutil
+  ];
+
+  pythonImportsCheck = [ "PySrDaliGateway" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/maginawin/PySrDaliGateway/releases/tag/${src.tag}";
+    description = "Python library for Sunricher DALI Gateway (EDA)";
+    homepage = "https://github.com/maginawin/PySrDaliGateway";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pystiebeleltron/default.nix b/pkgs/development/python-modules/pystiebeleltron/default.nix
index e8f5af98d316..de0c3d509770 100644
--- a/pkgs/development/python-modules/pystiebeleltron/default.nix
+++ b/pkgs/development/python-modules/pystiebeleltron/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pystiebeleltron";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ThyMYthOS";
     repo = "python-stiebel-eltron";
     tag = "v${version}";
-    hash = "sha256-36KEE1GvdXUjF6V3V5d+0hvUb4/cVKNfTI6xyc4/aLM=";
+    hash = "sha256-irZmtsGcbmr5+aniBofDg0fhkP646h3mpRyTdWndOyY=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index d574d63d4daf..fbbd3e713495 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -7,7 +7,6 @@
   cryptography,
   fetchFromGitHub,
   pyopenssl,
-  pythonOlder,
   pytest-asyncio,
   pytestCheckHook,
   requests,
@@ -16,16 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.71.0";
+  version = "0.72.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-MFWeU3KaCtEEvsNuSlLrWxZTYgER+/A6nF2yCvmGgTk=";
+    hash = "sha256-QwCeq9EnE7oKqTtb6lmMcEw37dOK7WYbDEC984NujzY=";
   };
 
   build-system = [ setuptools ];
@@ -46,12 +43,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "switchbot" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library to control Switchbot IoT devices";
     homepage = "https://github.com/Danielhiversen/pySwitchbot";
     changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 852802ede046..88945a91ea02 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.49";
+  version = "3.3.51";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-urAGAcSoJ8AkHHIPEBEfk08Y34URVN/sX0N4WkIcUR4=";
+    hash = "sha256-Pog5q/tXNz+RRZXJdb2/qG3BeaHUTYtlzOkM5Twr6js=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index 3cc0c7d45daf..d49dcbc7f087 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.33.0";
+  version = "2.35.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-ngdjFqUJnJU+krNJwAwOpz1hJzDYvyKjuR/Ti/V+B3w=";
+    hash = "sha256-5+yMZysK69g+3uYrP12WK3ngpAYn8XrHoVjLqjvbobg=";
   };
 
   build-system = [
@@ -173,7 +173,7 @@ buildPythonPackage rec {
     description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
     mainProgram = "pytensor-cache";
     homepage = "https://github.com/pymc-devs/pytensor";
-    changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${src.tag}";
+    changelog = "https://github.com/pymc-devs/pytensor/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bcdarwin
diff --git a/pkgs/development/python-modules/pytest-aioresponses/default.nix b/pkgs/development/python-modules/pytest-aioresponses/default.nix
new file mode 100644
index 000000000000..4f0a60fa3912
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-aioresponses/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchpatch,
+  fetchPypi,
+  poetry-core,
+  aioresponses,
+  pytest,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-aioresponses";
+  version = "0.3.0";
+  pyproject = true;
+
+  # no tags on GitHub
+  src = fetchPypi {
+    pname = "pytest_aioresponses";
+    inherit version;
+    hash = "sha256-VnezLfoaNpCLNHUktYZ6qzWsHFzh1JcCRNb2YAm8p7Y=";
+  };
+
+  patches = [
+    # https://github.com/pheanex/pytest-aioresponses/pull/5
+    (fetchpatch {
+      name = "use-poetry-core.patch";
+      url = "https://github.com/pheanex/pytest-aioresponses/commit/05595c1b73a9d9b01179bd434fb7cc57230c9251.patch";
+      hash = "sha256-CejYyzAYwsueI0k9O4fcTGC0O8dz0vgE057IrvC5YRo=";
+    })
+  ];
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aioresponses
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  pythonImportsCheck = [ "pytest_aioresponses" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # test_pytest_aioresponses.py isn't distributed on PyPI
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/pheanex/pytest-aioresponses/blob/main/Changelog";
+    description = "Py.test integration for aioresponses";
+    homepage = "https://github.com/pheanex/pytest-aioresponses";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pytest-archon/default.nix b/pkgs/development/python-modules/pytest-archon/default.nix
index 643d1ae988c7..9a5637f6bbc6 100644
--- a/pkgs/development/python-modules/pytest-archon/default.nix
+++ b/pkgs/development/python-modules/pytest-archon/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-archon";
-  version = "0.0.6";
+  version = "0.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jwbargsten";
     repo = "pytest-archon";
     tag = "v${version}";
-    hash = "sha256-ZKs7ifqgazEywszPGxkcPCf2WD2tEpEsbh8kHN/PL7s=";
+    hash = "sha256-0YBujBUBpW/FSIlJDRjL5mvYZfirHW07bRyygyoapw8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index a251f89fc5de..6d1d22738532 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -7,18 +7,19 @@
   pytest,
   setuptools-scm,
   backports-asyncio-runner,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "1.1.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  version = "1.2.0"; # N.B.: when updating, tests bleak and aioesphomeapi tests
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
     tag = "v${version}";
-    hash = "sha256-+dLOzMPKI3nawfyZVZZ6hg6OkaEGZBp8oC5VIr7y0es=";
+    hash = "sha256-27FCV7zgFGe/Q0fkYyh5Z05foVGhbKBRPTH4UK/tW5A=";
   };
 
   outputs = [
@@ -29,8 +30,12 @@ buildPythonPackage rec {
   build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
-  dependencies = lib.optionals (pythonOlder "3.11") [
+
+  dependencies = [
     backports-asyncio-runner
+  ]
+  ++ lib.optionals (pythonOlder "3.13") [
+    typing-extensions
   ];
 
   postInstall = ''
diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 568159010c9d..524388907301 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -11,7 +11,6 @@
   pytest-docker-tools,
   pytest,
   pythonOlder,
-  setuptools,
   tenacity,
 }:
 
@@ -37,21 +36,23 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     "debugpy"
-    "setuptools"
+  ];
+
+  pythonRemoveDeps = [
+    "celery" # cyclic dependency
+    "setuptools" # https://github.com/celery/pytest-celery/pull/464
   ];
 
   build-system = [ poetry-core ];
 
-  buildInput = [ pytest ];
+  buildInputs = [ pytest ];
 
   dependencies = [
-    (celery.overridePythonAttrs { doCheck = false; })
     debugpy
     docker
     kombu
     psutil
     pytest-docker-tools
-    setuptools
     tenacity
   ];
 
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 1dc9f25ea63f..3c03379fceb4 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-mock";
-  version = "3.15.0";
+  version = "3.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytest-dev";
     repo = "pytest-mock";
     tag = "v${version}";
-    hash = "sha256-a9Mu0FfU8rTbMeA1YoM/Kb5R2IUO8FyzQfscBVuBFfo=";
+    hash = "sha256-9h5/cssWs4F0LKnFLjWDsEjB2AYczLvnSjiUdsaEcBQ=";
   };
 
   build-system = [
@@ -35,11 +35,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pytest_mock" ];
 
-  meta = with lib; {
+  meta = {
     description = "Thin wrapper around the mock package for easier use with pytest";
     homepage = "https://github.com/pytest-dev/pytest-mock";
     changelog = "https://github.com/pytest-dev/pytest-mock/blob/${src.tag}/CHANGELOG.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest-regressions/default.nix b/pkgs/development/python-modules/pytest-regressions/default.nix
index 18286d14fcd9..ac36a4ae5657 100644
--- a/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
@@ -63,6 +64,13 @@ buildPythonPackage rec {
     "-Wignore::DeprecationWarning"
   ];
 
+  disabledTests = lib.optionals (stdenv.hostPlatform.isi686 || stdenv.hostPlatform.isBigEndian) [
+    # https://github.com/ESSS/pytest-regressions/issues/156
+    # i686-linux not listed in the report, but seems to have this issue as well
+    "test_different_data_types"
+    "test_common_case" # not listed in the issue, but fails after the above is skipped
+  ];
+
   pythonImportsCheck = [
     "pytest_regressions"
     "pytest_regressions.plugin"
diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index a219cb3752f4..afd0505c9dee 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
-  version = "15.1";
+  version = "16.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = "pytest-rerunfailures";
     tag = version;
-    hash = "sha256-ab3n61zCf9ok2PWvKTwmaeoeGuMxl0sYE25djk/NDLk=";
+    hash = "sha256-4/BgvfVcs7MdULlhafZypNzzag4ITALStHI1tIoAPL4=";
   };
 
   build-system = [ setuptools ];
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pytest plugin to re-run tests to eliminate flaky failures";
     homepage = "https://github.com/pytest-dev/pytest-rerunfailures";
+    changelog = "https://github.com/pytest-dev/pytest-rerunfailures/blob/${src.tag}/CHANGES.rst";
     license = licenses.mpl20;
     maintainers = with maintainers; [ das-g ];
   };
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 3fd5f57fc93c..55fcd3b06162 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   setuptools,
   setuptools-scm,
   pytestCheckHook,
@@ -16,14 +15,13 @@
 buildPythonPackage rec {
   pname = "pytest-xdist";
   version = "3.8.0";
-  disabled = pythonOlder "3.7";
-
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "pytest_xdist";
-    inherit version;
-    hash = "sha256-fleBJeybxgUIYaqT8tWfHY0IVZXWVRwskLb0+tjTqfE=";
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-xdist";
+    tag = "v${version}";
+    hash = "sha256-2x3znm92wo8DCshf5sYK0stnESg0oVXbxsWRAaTj6oQ=";
   };
 
   build-system = [
@@ -66,11 +64,11 @@ buildPythonPackage rec {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
-    changelog = "https://github.com/pytest-dev/pytest-xdist/blob/v${version}/CHANGELOG.rst";
-    description = "Pytest xdist plugin for distributed testing and loop-on-failing modes";
+  meta = {
+    changelog = "https://github.com/pytest-dev/pytest-xdist/blob/${src.tag}/CHANGELOG.rst";
+    description = "Pytest plugin for distributed testing";
     homepage = "https://github.com/pytest-dev/pytest-xdist";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 81599579f703..edd68ff232b8 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,12 +29,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "8.4.1";
+  version = "8.4.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fGf9aRdIdzWe2Tcew6+KPSsEdBgYxR5emcwXQiUfqTw=";
+    hash = "sha256-hsDQuTMGuWHVjWKk20h58n/iVRPUuWnfNRq93bPDDgE=";
   };
 
   outputs = [
@@ -76,9 +76,6 @@ buildPythonPackage rec {
   '';
 
   doCheck = false;
-  # FIXME(jade): perhaps this should be the default?
-  # https://github.com/NixOS/nixpkgs/issues/435069
-  dontWrapPythonPrograms = true;
   passthru.tests.pytest = callPackage ./tests.nix { };
 
   # Remove .pytest_cache when using py.test in a Nix build
diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix
index 5a859674e62d..e707b6c4ee18 100644
--- a/pkgs/development/python-modules/python-arango/default.nix
+++ b/pkgs/development/python-modules/python-arango/default.nix
@@ -32,7 +32,7 @@ in
 
 buildPythonPackage rec {
   pname = "python-arango";
-  version = "8.2.2";
+  version = "8.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "arangodb";
     repo = "python-arango";
     tag = version;
-    hash = "sha256-qcG1q85q3hhkcYSGcWp5I1spwvf+yPg6TZbAnc0/iYw=";
+    hash = "sha256-cc8VxaNVOydsuhnNa8Qo8xfhIUIkuNZUWBZNqu6xEwg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/python-bring-api/default.nix b/pkgs/development/python-modules/python-bring-api/default.nix
deleted file mode 100644
index 5c42edbea208..000000000000
--- a/pkgs/development/python-modules/python-bring-api/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  aiohttp,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-}:
-
-buildPythonPackage {
-  pname = "python-bring-api";
-  version = "3.0.0-unstable-2024-02-03";
-  pyproject = true;
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchFromGitHub {
-    owner = "eliasball";
-    repo = "python-bring-api";
-    # https://github.com/eliasball/python-bring-api/issues/16
-    rev = "8043562b22be1f6421a8771774868b105b6ca375";
-    hash = "sha256-VCGCm9N6pMhEYT9WuWh7qKacZEf6bcIpEsILfCC6his=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ aiohttp ];
-
-  # Module has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "python_bring_api" ];
-
-  meta = with lib; {
-    description = "Module to access the Bring! shopping lists API";
-    homepage = "https://github.com/eliasball/python-bring-api";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 4e654bbbc2c4..575c4be9b22a 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -14,37 +14,32 @@
   pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
 buildPythonPackage rec {
   pname = "python-bsblan";
-  version = "2.2.5";
+  version = "3.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
     tag = "v${version}";
-    hash = "sha256-kPkKgjze3ohaIaDax3h66JWw5tY+3S0N+lPqXSFFcRY=";
+    hash = "sha256-OIaUfrQMdFvDnONjpLRigzbHw6ZS3MA05BGatv63td4=";
   };
 
   postPatch = ''
-    sed -i "/ruff/d" pyproject.toml
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
   '';
 
-  env.PACKAGE_VERSION = version;
-
   build-system = [ hatchling ];
 
   pythonRelaxDeps = [ "async-timeout" ];
 
   dependencies = [
     aiohttp
-    async-timeout
     backoff
     mashumaro
     orjson
@@ -60,6 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   pythonImportsCheck = [ "bsblan" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/python-citybikes/default.nix b/pkgs/development/python-modules/python-citybikes/default.nix
new file mode 100644
index 000000000000..dcba98e7295f
--- /dev/null
+++ b/pkgs/development/python-modules/python-citybikes/default.nix
@@ -0,0 +1,50 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-aiohttp,
+  pytest-asyncio,
+  pytestCheckHook,
+  requests,
+  responses,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-citybikes";
+  version = "0.3.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "eskerda";
+    repo = "python-citybikes";
+    tag = version;
+    hash = "sha256-it/QCUwNc6g88IrtMTS8wr/t4Apb2ovSheufOnu4fCM=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    aiohttp
+    requests
+  ];
+
+  pythonImportsCheck = [ "citybikes" ];
+
+  nativeCheckInputs = [
+    pytest-aiohttp
+    pytest-asyncio
+    pytestCheckHook
+    responses
+  ];
+
+  meta = {
+    description = "Client interface for the Citybikes API";
+    homepage = "https://github.com/eskerda/python-citybikes";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix
index 81e9744b25e6..6c8e0daf0b38 100644
--- a/pkgs/development/python-modules/python-docs-theme/default.nix
+++ b/pkgs/development/python-modules/python-docs-theme/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "python-docs-theme";
-  version = "2025.9.2";
+  version = "2025.10";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "python";
     repo = "python-docs-theme";
     tag = version;
-    hash = "sha256-G9QhrNqwSonyCQXxBv1GkUx39GyOQs+0gciJDQwWvVQ=";
+    hash = "sha256-vuQsGHj39znL3RvSvnc9ET1g30/FcSnDnFby2bm84hY=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix
index 3ccbd71be866..81cd2477e97e 100644
--- a/pkgs/development/python-modules/python-ecobee-api/default.nix
+++ b/pkgs/development/python-modules/python-ecobee-api/default.nix
@@ -2,23 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   requests,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-ecobee-api";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "nkgilley";
     repo = "python-ecobee-api";
     tag = version;
-    hash = "sha256-7AFt5WHtAr1DRG1kjmUwYMHVwbonltNvzgewDuFa6Tk=";
+    hash = "sha256-6uZc022C3EgEgsPGD302qAtFqubwQSETQr3SQSYXeb8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 470337705c89..539d1e5644bb 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -2,13 +2,11 @@
   lib,
   buildPythonPackage,
   cryptography,
-  ecdsa,
   fetchFromGitHub,
-  pyasn1,
+  fetchpatch,
   pycrypto,
   pycryptodome,
   pytestCheckHook,
-  rsa,
   setuptools,
 }:
 
@@ -24,17 +22,27 @@ buildPythonPackage rec {
     hash = "sha256-8DQ0RBQ4ZgEIwcosgX3dzr928cYIQoH0obIOgk0+Ozs=";
   };
 
-  pythonRelaxDeps = [
-    # https://github.com/mpdavis/python-jose/pull/376
+  patches = [
+    # https://github.com/mpdavis/python-jose/pull/393
+    (fetchpatch {
+      name = "fix-test_incorrect_public_key_hmac_signing.patch";
+      url = "https://github.com/mpdavis/python-jose/commit/7c0e4c6640bdc9cd60ac66d96d5d90f4377873db.patch";
+      hash = "sha256-bCzxZEWKYD20TLqzVv6neZlpU41otbVqaXc7C0Ky9BQ=";
+    })
+  ];
+
+  pythonRemoveDeps = [
+    # These aren't needed if the cryptography backend is used:
+    # https://github.com/mpdavis/python-jose/blob/3.5.0/README.rst#cryptographic-backends
+    "ecdsa"
     "pyasn1"
+    "rsa"
   ];
 
   build-system = [ setuptools ];
 
   dependencies = [
-    ecdsa
-    pyasn1
-    rsa
+    cryptography
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/python-jsonpath/default.nix b/pkgs/development/python-modules/python-jsonpath/default.nix
new file mode 100644
index 000000000000..fbc94587688a
--- /dev/null
+++ b/pkgs/development/python-modules/python-jsonpath/default.nix
@@ -0,0 +1,53 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytestCheckHook,
+  regex,
+}:
+
+buildPythonPackage rec {
+  pname = "python-jsonpath";
+  version = "2.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jg-rp";
+    repo = "python-jsonpath";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    preFetch = ''
+      # can't clone using ssh
+      # https://github.com/jg-rp/python-jsonpath/pull/122
+      export GIT_CONFIG_COUNT=1
+      export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
+      export GIT_CONFIG_VALUE_0=git@github.com:
+    '';
+    hash = "sha256-DiXBIo/I36rrn+RCQda+khfViCnzHwiGzK2X9ACF3io=";
+  };
+
+  build-system = [ hatchling ];
+
+  optional-dependencies = {
+    strict = [
+      # FIXME package iregexp-check
+      regex
+    ];
+  };
+
+  pythonImportsCheck = [ "jsonpath" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.strict;
+
+  meta = {
+    changelog = "https://github.com/jg-rp/python-jsonpath/blob/${src.tag}/CHANGELOG.md";
+    description = "Flexible JSONPath engine for Python with JSON Pointer and JSON Patch";
+    homepage = "https://github.com/jg-rp/python-jsonpath";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix
index 6a7e0ca388a3..cd72b8277920 100644
--- a/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/pkgs/development/python-modules/python-matter-server/default.nix
@@ -5,6 +5,8 @@
   pythonOlder,
   stdenvNoCC,
   replaceVars,
+  buildNpmPackage,
+  python,
 
   # build
   setuptools,
@@ -24,14 +26,25 @@
 
   # tests
   aioresponses,
-  python,
   pytest,
   pytest-aiohttp,
   pytest-cov-stub,
   pytestCheckHook,
+
+  # build options
+  withDashboard ? true,
 }:
 
 let
+  version = "8.1.1";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "python-matter-server";
+    tag = version;
+    hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA=";
+  };
+
   paaCerts = stdenvNoCC.mkDerivation rec {
     pname = "matter-server-paa-certificates";
     version = "1.4.0.0";
@@ -52,22 +65,63 @@ let
       runHook postInstall
     '';
   };
-in
 
+  # Maintainer note: building the dashboard requires a python environment with a
+  # built version of python-matter-server. To support bundling the dashboard
+  # with the python-matter-server, the build is parameterized to build without
+  # a dependency on the dashboard, breaking a cyclical dependency. First,
+  # python-matter-server is built without the dashboard, then the dashboard is
+  # built, then python-matter-server is built again with the dashboard.
+  matterServerDashboard =
+    let
+      pythonWithChip = python.withPackages (ps: [
+        ps.home-assistant-chip-clusters
+        (ps.python-matter-server.override { withDashboard = false; })
+      ]);
+    in
+    buildNpmPackage {
+      pname = "python-matter-server-dashboard";
+      inherit src version;
+
+      npmDepsHash = "sha256-IgI1H3VlTq66duplVQqL67SpgxPF2MOowDn+ICMXCik=";
+
+      prePatch = ''
+        ${pythonWithChip.interpreter} scripts/generate_descriptions.py
+
+        # cd before the patch phase sets up the npm install hook to find the
+        # package.json. The script would need to be patched in order to be used
+        # with sourceRoot.
+        cd "dashboard"
+      '';
+
+      # This package does not contain a normal `npm build` step.
+      buildPhase = ''
+        env NODE_ENV=production npm exec -- tsc
+        env NODE_ENV=production npm exec -- rollup -c
+      '';
+
+      installPhase = ''
+        runHook preInstall
+
+        install -Dt "$out/" public/*
+        # Copy recursive directory structure, which install does not do.
+        cp -r dist/web/* "$out/"
+
+        runHook postInstall
+      '';
+    };
+in
 buildPythonPackage rec {
-  pname = "python-matter-server";
-  version = "8.1.1";
+  pname = if withDashboard then "python-matter-server" else "python-matter-server-without-dashboard";
+  inherit
+    src
+    version
+    ;
+
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
-  src = fetchFromGitHub {
-    owner = "home-assistant-libs";
-    repo = "python-matter-server";
-    tag = version;
-    hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA=";
-  };
-
   patches = [
     (replaceVars ./link-paa-root-certs.patch {
       paacerts = paaCerts;
@@ -77,6 +131,10 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  ''
+  + lib.optionalString withDashboard ''
+    substituteInPlace "matter_server/server/server.py" \
+      --replace-fail 'Path(__file__).parent.joinpath("../dashboard/")' 'Path("${matterServerDashboard}")'
   '';
 
   build-system = [
diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix
index f7634cad9267..4fbee3742271 100644
--- a/pkgs/development/python-modules/python-on-whales/default.nix
+++ b/pkgs/development/python-modules/python-on-whales/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-on-whales";
-  version = "0.78.0";
+  version = "0.79.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gabrieldemarmiesse";
     repo = "python-on-whales";
     tag = "v${version}";
-    hash = "sha256-mpCBqFxxFxljhoTveLmk4XfqngiQPsufqr927hSwNfA=";
+    hash = "sha256-MvuTItl3OhYybg36Zizt96FqdY0oh0bfqqMd4mssLGA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-open-router/default.nix b/pkgs/development/python-modules/python-open-router/default.nix
index 76abdf1da097..72f389d779e3 100644
--- a/pkgs/development/python-modules/python-open-router/default.nix
+++ b/pkgs/development/python-modules/python-open-router/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "python-open-router";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-open-router";
     tag = "v${version}";
-    hash = "sha256-EoLBlgXKrAo2DKOuLGvN3MbWIJIG+Ehtznegnq3VX44=";
+    hash = "sha256-SSpSoo82FD1KUwbZpeHpl9I4A50yuJmdTVaHDxLZXso=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/python-pcapng/default.nix b/pkgs/development/python-modules/python-pcapng/default.nix
new file mode 100644
index 000000000000..ffcf10c16f05
--- /dev/null
+++ b/pkgs/development/python-modules/python-pcapng/default.nix
@@ -0,0 +1,40 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "python-pcapng";
+  version = "2.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "rshk";
+    repo = "python-pcapng";
+    tag = version;
+    hash = "sha256-uyoutb4Hk2Wd3z7UopNxauMLGdYVOAhDNzRKclSr7No=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonImportsCheck = [ "pcapng" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/rshk/python-pcapng/blob/${src.tag}/CHANGELOG.rst";
+    description = "Library to read/write the pcap-ng format used by various packet sniffers";
+    homepage = "https://github.com/rshk/python-pcapng";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/python-picnic-api2/default.nix b/pkgs/development/python-modules/python-picnic-api2/default.nix
index 246a2ce8bb54..83bd486ef516 100644
--- a/pkgs/development/python-modules/python-picnic-api2/default.nix
+++ b/pkgs/development/python-modules/python-picnic-api2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-picnic-api2";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "codesalatdev";
     repo = "python-picnic-api";
     tag = "v${version}";
-    hash = "sha256-xa3Ir3OcePFwXemHSR78HhebtCVPObo9oM0h9K1DIQk=";
+    hash = "sha256-GFxs2ZjyGADMG8YWtpy+sAZClLOYt70KtEp5MCgY+7I=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix
index 637d30e005a7..a91945b27487 100644
--- a/pkgs/development/python-modules/python-pooldose/default.nix
+++ b/pkgs/development/python-modules/python-pooldose/default.nix
@@ -3,6 +3,7 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
+  getmac,
   lib,
   pytest-asyncio,
   pytestCheckHook,
@@ -11,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-pooldose";
-  version = "0.6.0";
+  version = "0.7.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lmaertin";
     repo = "python-pooldose";
     tag = version;
-    hash = "sha256-hKZOOeTigK8E+MAq5+zUmdWwGrAn+0ZGmOn66QTU1RM=";
+    hash = "sha256-TOwogNRWmdbzEjvjSUYw9+5CXHfF2OXq8Jxaj3KsQ+A=";
   };
 
   build-system = [ setuptools ];
@@ -26,6 +27,7 @@ buildPythonPackage rec {
   dependencies = [
     aiofiles
     aiohttp
+    getmac
   ];
 
   pythonImportsCheck = [ "pooldose" ];
diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index 7d5e92b9407b..e60e070c8614 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.21";
+  version = "1.22";
   pname = "python-rapidjson";
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "python-rapidjson";
     repo = "python-rapidjson";
     tag = "v${version}";
-    hash = "sha256-qpq7gNdWDSNTVTqV1rnRffap0VrlHOr4soAY/SXqd1k=";
+    hash = "sha256-q+qIuFD3TboevD88iaBQxwOoOdb6I+yyCsNXIqMcR3g=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index fd7e9c688a4c..075331cdd475 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -7,70 +7,45 @@
   buildPythonPackage,
   click,
   construct,
-  dacite,
   fetchFromGitHub,
-  fetchpatch,
   freezegun,
+  hatchling,
   paho-mqtt,
-  poetry-core,
   pycryptodome,
   pycryptodomex,
   pyrate-limiter,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   vacuum-map-parser-roborock,
-  pyshark,
-  pyyaml,
   click-shell,
   syrupy,
 }:
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.50.2";
+  version = "3.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-66kSNkivq6BHnqIqx1INtdoysBJfCqV76yIAJiHmfxQ=";
+    hash = "sha256-KgrpfcGaq84VWlcGvKMjJfz4bEkC9l1waj1ZucQa7DA=";
   };
 
-  patches = [
-    # https://github.com/Python-roborock/python-roborock/pull/527
-    (fetchpatch {
-      name = "replace async-timeout with asyncio.timeout.patch";
-      url = "https://github.com/Python-roborock/python-roborock/commit/f376027f5933e163441cf1815b820056731a3632.patch";
-      excludes = [ "poetry.lock" ];
-      hash = "sha256-53xsQ3yxh9CilC9hNS31rDXZVFG+mMhe7ffOb4L6bUE=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "poetry-core==1.8.0" "poetry-core"
-  '';
-
   pythonRelaxDeps = [ "pycryptodome" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp
     aiomqtt
     click
     construct
-    dacite
     paho-mqtt
     pycryptodome
     pyrate-limiter
     vacuum-map-parser-roborock
-    pyyaml
-    pyshark
     click-shell
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
@@ -85,12 +60,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "roborock" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library & console tool for controlling Roborock vacuum";
     homepage = "https://github.com/Python-roborock/python-roborock";
     changelog = "https://github.com/Python-roborock/python-roborock/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "roborock";
   };
 }
diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 8b6e8716a56b..4624eb5cb6ef 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -1,30 +1,27 @@
 {
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
   lib,
+  setuptools,
   six,
   pypblib,
   pytestCheckHook,
 }:
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "python-sat";
-  version = "0.1.8.dev20";
-  format = "setuptools";
+  version = "1.8.dev24";
+  pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "pysathq";
-    repo = "pysat";
-    rev = "d94f51e5eff2feef35abbc25480659eafa615cc0"; # upstream does not tag releases
-    hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI=";
+  build-system = [ setuptools ];
+
+  src = fetchPypi {
+    inherit version;
+    pname = "python_sat";
+    hash = "sha256-f9NnaPcHdNNInWTvpkg91ieaYejJ29kAAOLcbnbDmM0=";
   };
 
-  # Build SAT solver backends in parallel and fix hard-coded g++ reference for
-  # darwin, where stdenv uses clang
-  postPatch = ''
-    substituteInPlace solvers/prepare.py \
-      --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&"
-    substituteInPlace solvers/patches/glucose421.patch \
-      --replace-fail "+CXX      := g++" "+CXX      := c++"
+  preBuild = ''
+    export MAKEFLAGS="-j$NIX_BUILD_CORES"
   '';
 
   propagatedBuildInputs = [
@@ -32,12 +29,25 @@ buildPythonPackage {
     pypblib
   ];
 
+  pythonImportsCheck = [
+    "pysat"
+    "pysat.examples"
+    "pysat.allies"
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTestPaths = [ "tests/test_unique_mus.py" ];
+  # Due to `python -m pytest` appending the local directory to `PYTHONPATH`,
+  # importing `pysat.examples` in the tests fails. Removing the `pysat`
+  # directory fixes since then only the installed version in `$out` is
+  # imported, which has `pysat.examples` correctly installed.
+  # See https://github.com/NixOS/nixpkgs/issues/255262
+  preCheck = ''
+    rm -r pysat
+  '';
 
   meta = with lib; {
-    description = "Toolkit to provide interface for various SAT (without optional dependancy py-aiger-cnf)";
+    description = "Toolkit for SAT-based prototyping in Python (without optional dependencies)";
     homepage = "https://github.com/pysathq/pysat";
     changelog = "https://pysathq.github.io/updates/";
     license = licenses.mit;
diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix
index ec3f38b0638d..f865d3d28184 100644
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-smarttub";
-  version = "0.0.44";
+  version = "0.0.45";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mdz";
     repo = "python-smarttub";
     tag = "v${version}";
-    hash = "sha256-ozOnCJXv99gne59HQEdQfCKZe8HhK2q9vShMuBlSWE8=";
+    hash = "sha256-r9Ww3isCbgKSWkQPKWzLagPK8+OFeb+zr8Wydft0jJU=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix
index 05239538a597..044b5491edab 100644
--- a/pkgs/development/python-modules/python-snoo/default.nix
+++ b/pkgs/development/python-modules/python-snoo/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-snoo";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lash-L";
     repo = "python-snoo";
     tag = "v${version}";
-    hash = "sha256-HLX8eVhAZbydZNbBAwi7F4qloZImPZlts4CDyFLIeGE=";
+    hash = "sha256-p0cKIDdSQwryagvHGjydSTR4O5lAPO7UMhw+tSIxZrY=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index cd621b30166d..ca137a296fec 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -18,22 +18,25 @@
 
   # tests
   msgpack,
-  pytest7CheckHook,
+  pytestCheckHook,
   simple-websocket,
   uvicorn,
+  redis,
+  valkey,
+  pytest-asyncio,
 
 }:
 
 buildPythonPackage rec {
   pname = "python-socketio";
-  version = "5.13.0";
+  version = "5.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-socketio";
     tag = "v${version}";
-    hash = "sha256-iOipxGALYOXLvUwn6OSjLCMZoUl7u4S5eCktUgcs/X0=";
+    hash = "sha256-2zts0gkwAoUCC8S1UDg0PlBaFH23jTv04hgGblHSX7c=";
   };
 
   build-system = [ setuptools ];
@@ -53,9 +56,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     msgpack
-    pytest7CheckHook
+    pytestCheckHook
     uvicorn
     simple-websocket
+    redis
+    valkey
+    pytest-asyncio
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix
index f4a6e1ba8edf..d9c9f9ec2b66 100644
--- a/pkgs/development/python-modules/python-toolbox/default.nix
+++ b/pkgs/development/python-modules/python-toolbox/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "python-toolbox";
-  version = "1.0.11";
+  version = "1.2.10";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "cool-RR";
     repo = "python_toolbox";
     tag = version;
-    hash = "sha256-Y9RmVndgsBESrUCEORUwAdaFYBiunY3kWArhB9d7bw4=";
+    hash = "sha256-+Q7r4nbubp2xzkBgEyTuA0EeIvpT4bW+2NnckVkEKcY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/python-u2flib-server/default.nix b/pkgs/development/python-modules/python-u2flib-server/default.nix
deleted file mode 100644
index fa93cb83fce8..000000000000
--- a/pkgs/development/python-modules/python-u2flib-server/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-
-  # propagates
-  cryptography,
-  six,
-
-  # optional
-  webob,
-
-  # tests
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "python-u2flib-server";
-  version = "5.0.1";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "Yubico";
-    repo = "python-u2flib-server";
-    rev = version;
-    hash = "sha256-ginP9u+aHcdaWpwcFYJWu0Ghf7+nDZq9i3TVAacIPhg=";
-  };
-
-  patches = [ ./cryptography-37-compat.patch ];
-
-  propagatedBuildInputs = [
-    cryptography
-    six
-  ];
-
-  optional-dependencies = {
-    u2f_server = [ webob ];
-  };
-
-  pythonImportsCheck = [
-    "u2flib_server"
-    "u2flib_server.u2f"
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.u2f_server;
-
-  meta = with lib; {
-    description = "Python based U2F server library";
-    homepage = "https://github.com/Yubico/python-u2flib-server";
-    changelog = "https://github.com/Yubico/python-u2flib-server/blob/${src.rev}/NEWS";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ hexa ];
-  };
-}
diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix
index ebc7969b5c48..95bf6e16fab8 100644
--- a/pkgs/development/python-modules/pythonqwt/default.nix
+++ b/pkgs/development/python-modules/pythonqwt/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pythonqwt";
-  version = "0.14.6";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "PythonQwt";
     tag = "v${version}";
-    hash = "sha256-D7iZ/737x+f63clnH41S8DtmBXDMf01A04UBKsHTJwA=";
+    hash = "sha256-S67k5kfGqB6Ezr2XMlW3x/ya6MW6df2cFrGEqlsLOhk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix
index 47c3a7233882..0a6c9873dc10 100644
--- a/pkgs/development/python-modules/pytraccar/default.nix
+++ b/pkgs/development/python-modules/pytraccar/default.nix
@@ -6,7 +6,6 @@
   poetry-core,
   pytestCheckHook,
   pytest-asyncio,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "3.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pytraccar";
@@ -23,12 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-DtxZCvLuvQpbu/1lIXz2BVbACt5Q1N2txVMyqwd4d9A=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ aiohttp ];
-
-  # https://github.com/ludeeus/pytraccar/issues/31
-  doCheck = lib.versionOlder aiohttp.version "3.9.0";
+  dependencies = [ aiohttp ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/pytransportnswv2/default.nix b/pkgs/development/python-modules/pytransportnswv2/default.nix
index 4cb73305c023..c5c4f4d922fb 100644
--- a/pkgs/development/python-modules/pytransportnswv2/default.nix
+++ b/pkgs/development/python-modules/pytransportnswv2/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "pytransportnswv2";
-  version = "2.0.7";
+  version = "2.0.8";
   pyproject = true;
 
   src = fetchPypi {
     pname = "PyTransportNSWv2";
     inherit version;
-    hash = "sha256-TuLcOjP8ij9+FsaGqeukPFQDS2QRRxFMsXPfrqaq+ec=";
+    hash = "sha256-+hE5onXQ/Isv+U7y9+CphpYTOW7CsMxR7M8jZS1djSs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pytun-pmd3/default.nix b/pkgs/development/python-modules/pytun-pmd3/default.nix
new file mode 100644
index 000000000000..14dc2052fa59
--- /dev/null
+++ b/pkgs/development/python-modules/pytun-pmd3/default.nix
@@ -0,0 +1,38 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "pytun-pmd3";
+  version = "3.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "pytun-pmd3";
+    tag = "v${version}";
+    hash = "sha256-3x+z+O6isgVRbPK+INfG5nG/+Tb2CWvPHg4TosH91so=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonImportsCheck = [ "pytun_pmd3" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/doronz88/pytun-pmd3/releases/tag/${src.tag}";
+    description = "TUN/TAP wrapper for Python with Darwin support";
+    homepage = "https://github.com/doronz88/pytun-pmd3";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index 3b1094388f60..540d2ef158e3 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "3.1.0";
+  version = "3.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "webdjoe";
     repo = "pyvesync";
     tag = version;
-    hash = "sha256-ZoEQbMV3ofE5pV7nbYOqzXq3/7a2pkDKx88894kzU7Y=";
+    hash = "sha256-l+b53B8Bdd/WnM2Oe9srST2T2KXaQfXtfc5+BwNte90=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index af6f7942ea0c..e9368b223391 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -6,7 +6,6 @@
   numpy,
   pillow,
   pooch,
-  pythonAtLeast,
   scooby,
   setuptools,
   typing-extensions,
@@ -15,19 +14,16 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.46.3";
+  version = "0.46.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-RpgrsNMZmIfx3bb7W9xU6u4gJoAuDQ8Xx9C25TLp6PI=";
+    hash = "sha256-FFrnLiGiP6LSwaoEHx4tih6XPdKCZ/9tjvz00NQDU0Q=";
   };
 
-  # remove this line once pyvista 0.46 is released
-  pythonRelaxDeps = [ "vtk" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/pyvo/default.nix b/pkgs/development/python-modules/pyvo/default.nix
index ebcff43ae6af..0014a6df1fe1 100644
--- a/pkgs/development/python-modules/pyvo/default.nix
+++ b/pkgs/development/python-modules/pyvo/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyvo";
-  version = "1.7";
+  version = "1.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8"; # according to setup.cfg
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-pvrZ79QQcy0RPlXfQ7AgHJrLLinydTLHG9pW84zmIyA=";
+    hash = "sha256-Qd2PEZHdC9rTw1t25twOUDGYIcv3CQBThiZffxnfIf8=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix
deleted file mode 100644
index 403f61571b46..000000000000
--- a/pkgs/development/python-modules/pyvoro/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  version = "1.3.2";
-  format = "setuptools";
-  pname = "pyvoro";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc";
-  };
-
-  # No tests in package
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/joe-jordan/pyvoro";
-    description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library";
-    license = licenses.mit;
-    maintainers = [ ];
-
-    # Cython generated code is vendored directly and no longer compatible with
-    # newer versions of the CPython C API.
-    #
-    # Upstream explicitly removed the Cython source files from the source
-    # distribution, making it impossible for us to force-compile them:
-    # https://github.com/joe-jordan/pyvoro/commit/922bba6db32d44c2e1825228627a25aa891f9bc1
-    #
-    # No upstream activity since 2014.
-    broken = true;
-  };
-}
diff --git a/pkgs/development/python-modules/pywebcopy/default.nix b/pkgs/development/python-modules/pywebcopy/default.nix
index ebdda05aeead..028a78177ea9 100644
--- a/pkgs/development/python-modules/pywebcopy/default.nix
+++ b/pkgs/development/python-modules/pywebcopy/default.nix
@@ -6,7 +6,6 @@
   legacy-cgi,
   lxml-html-clean,
   pytestCheckHook,
-  pythonAtLeast,
   requests,
   setuptools,
   six,
@@ -28,11 +27,11 @@ buildPythonPackage rec {
 
   dependencies = [
     cachecontrol
+    legacy-cgi
     lxml-html-clean
     requests
     six
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index 141fe5570f5b..51c2eecdacb8 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyyaml";
-  version = "6.0.2";
+  version = "6.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "yaml";
     repo = "pyyaml";
     tag = version;
-    hash = "sha256-IQoZd9Lp0ZHLAQN3PFwMsZVTsIVJyIaT9D6fpkzA8IA=";
+    hash = "sha256-jUooIBp80cLxvdU/zLF0X8Yjrf0Yp9peYeiFjuV8AHA=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/qcs-sdk-python/default.nix b/pkgs/development/python-modules/qcs-sdk-python/default.nix
index 208ee5f1fa7b..2a1e4251581b 100644
--- a/pkgs/development/python-modules/qcs-sdk-python/default.nix
+++ b/pkgs/development/python-modules/qcs-sdk-python/default.nix
@@ -16,19 +16,19 @@
 
 buildPythonPackage rec {
   pname = "qcs-sdk-python";
-  version = "0.21.19";
+  version = "0.21.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rigetti";
     repo = "qcs-sdk-rust";
     tag = "python/v${version}";
-    hash = "sha256-116+DbsvLBNWjyeGcm3+zrmY9HKWONii2Me0XjEGACo=";
+    hash = "sha256-B0wMOMbsoqkaJ61ula/9w6EBta13UKf5APyOD6NDle4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-+F7PRBg73GFSeUCmt5NWa+gBhuZU5J7F5TGqRJKqwGc=";
+    hash = "sha256-cbcSwjeIU/Unm4Y48h3AWTz/f3McyXs9/BhXWDZnL9Q=";
   };
 
   buildAndTestSubdir = "crates/python";
diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 8abe78c1ac54..c2635f27e993 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "radish-bdd";
-  version = "0.18.2";
+  version = "0.18.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "radish";
     tag = "v${version}";
-    hash = "sha256-SSrEKGs4q4rcnQM03/gc0/vEb7gmTmpfgeNp3e+Hyvg=";
+    hash = "sha256-UjJz9ysejz5DBewMwoVof1+JU8tbGbBa3z1quuN1TWg=";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/random-user-agent/default.nix b/pkgs/development/python-modules/random-user-agent/default.nix
deleted file mode 100644
index ea7ce11de50b..000000000000
--- a/pkgs/development/python-modules/random-user-agent/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  setuptools,
-  pythonOlder,
-}:
-
-buildPythonPackage {
-  pname = "random-user-agent";
-  version = "1.0.1-unstable-2018-12-26";
-  pyproject = true;
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "Luqman-Ud-Din";
-    repo = "random_user_agent";
-    rev = "9547a1d93558c5838f734357c695fee92be905f7";
-    hash = "sha256-BkMx7N8O9I4rD8lvpoyXTZbZDsoozIpYUQh+zkLQ7Uc=";
-  };
-
-  build-system = [ setuptools ];
-
-  # Module has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "random_user_agent" ];
-
-  meta = with lib; {
-    description = "Module to get list of user agents based on filters";
-    homepage = "https://github.com/Luqman-Ud-Din/random_user_agent";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/development/python-modules/raspyrfm-client/default.nix b/pkgs/development/python-modules/raspyrfm-client/default.nix
index 25bd389e83f7..5d5a20ff9589 100644
--- a/pkgs/development/python-modules/raspyrfm-client/default.nix
+++ b/pkgs/development/python-modules/raspyrfm-client/default.nix
@@ -2,51 +2,36 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
-  rstr,
-  python,
+  poetry-core,
+  pytestCheckHook,
+  xeger,
 }:
 
 buildPythonPackage rec {
   pname = "raspyrfm-client";
-  version = "1.2.8";
+  version = "1.2.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markusressel";
     repo = "raspyrfm-client";
-    tag = "v${version}";
-    hash = "sha256-WiL69bb4h8xVdMYxAVU0NHEfTWyW2NVR86zigsr5dmk=";
+    tag = version;
+    hash = "sha256-+TraMrVoR8GXrjfjJnu1uyyW6KTnu8KrRqAHYU8thFw=";
   };
 
-  # while we may not actually be on master, the script needs a git branch to function
-  # and master here is better than beta or pre-alpha
-  postPatch = ''
-    substituteInPlace ./setup.py \
-      --replace-fail 'subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])' '"master"' \
-      --replace-fail 'GIT_BRANCH.decode()' '"master"' \
-      --replace-fail 'GIT_BRANCH.rstrip()' '"master"'
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [ poetry-core ];
 
   pythonImportsCheck = [ "raspyrfm_client" ];
 
-  nativeCheckInputs = [ rstr ];
-
-  # pytestCheckHook does not auto detect the only test, run manually
-  checkPhase = ''
-    runHook preCheck
-
-    ${python.interpreter} tests/automatic_tests.py
-
-    runHook postCheck
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    xeger
+  ];
 
   meta = {
     description = "Send rc signals with the RaspyRFM module";
     homepage = "https://github.com/markusressel/raspyrfm-client";
-    changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/v${version}";
+    changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/${src.tag}";
     maintainers = with lib.maintainers; [ ethancedwards8 ];
   };
 }
diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 9fc55c214146..53c1513e2c9d 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -1,42 +1,43 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  stdenv,
-  testers,
 
+  # build-system
+  cython,
+  gdal,
+  numpy,
+  setuptools,
+
+  # dependencies
   affine,
   attrs,
-  boto3,
   certifi,
   click,
   click-plugins,
   cligj,
-  cython,
-  fsspec,
-  gdal,
-  hypothesis,
+  snuggs,
+
+  # optional-dependencies
   ipython,
   matplotlib,
-  numpy,
-  packaging,
-  pytest-randomly,
-  setuptools,
-  shapely,
-  snuggs,
-  wheel,
+  boto3,
 
-  rasterio, # required to run version test
+  # tests
+  fsspec,
+  hypothesis,
+  packaging,
+  pytestCheckHook,
+  pytest-randomly,
+  shapely,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "rasterio";
   version = "1.4.3";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rasterio";
@@ -50,15 +51,14 @@ buildPythonPackage rec {
       --replace-fail "cython~=3.0.2" cython
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     gdal
     numpy
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     affine
     attrs
     certifi
@@ -83,7 +83,9 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-randomly
     shapely
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   preCheck = ''
     rm -r rasterio # prevent importing local rasterio
@@ -102,23 +104,26 @@ buildPythonPackage rec {
     "test_warp"
     "test_warpedvrt"
     "test_rio_warp"
+
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_sample_stdin"
+    "test_transform"
+    "test_transform_point"
+    "test_transform_point_dst_file"
+    "test_transform_point_multi"
+    "test_transform_point_src_file"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ];
 
   pythonImportsCheck = [ "rasterio" ];
 
-  passthru.tests.version = testers.testVersion {
-    package = rasterio;
-    version = version;
-    command = "${rasterio}/bin/rio --version";
-  };
-
-  meta = with lib; {
+  meta = {
     description = "Python package to read and write geospatial raster data";
     mainProgram = "rio";
     homepage = "https://rasterio.readthedocs.io/";
     changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt";
-    license = licenses.bsd3;
-    teams = [ teams.geospatial ];
+    license = lib.licenses.bsd3;
+    teams = [ lib.teams.geospatial ];
   };
 }
diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index f8d0544838ae..5264772df53f 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -64,7 +64,7 @@
 
 let
   pname = "ray";
-  version = "2.50.0";
+  version = "2.51.1";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -84,22 +84,22 @@ buildPythonPackage rec {
       # Results are in ./ray-hashes.nix
       hashes = {
         x86_64-linux = {
-          cp310 = "sha256-yDG/+6D28N+iW2XFuAACLHI0y+wbmKjt4X+XzIJfcA0=";
-          cp311 = "sha256-A7Zfzo7eJuKlI2XyCWfAmzo16dfSuFZkXcxoBDWkfkM=";
-          cp312 = "sha256-IUoAZIlBnHhnFcsqgbPFLIjgjqMpX0i6l6tpuIjY+Bg=";
-          cp313 = "sha256-g40spgZcElW2xw8dIEHKC2qzq6uQgzA7ZdezE4wCLeI=";
+          cp310 = "sha256-iiH1kUuqPe78tPpfOHjgO1icGQuGT+G4Dm3Ay/uiYAQ=";
+          cp311 = "sha256-3TUwENJUi8NF5GxFeV9wKRu0YMI2qmozk7UanNhhtW8=";
+          cp312 = "sha256-Tnhtp4Ys9zZkl30CEqUF1tWlhb6t9j59weHBKSWb7iA=";
+          cp313 = "sha256-Jl7Nb9bUppWwnGhuF9WPygwJ5xmMBzYornv0l0sD6co=";
         };
         aarch64-linux = {
-          cp310 = "sha256-AGKn+lY/QkZlsc3sD+6ccHCNqAfsxZFsSZJaIUOIl9A=";
-          cp311 = "sha256-sTkjnzAUDpgve8X7HMJpSKCnbJgOujce/d4/sEXQp+Q=";
-          cp312 = "sha256-z94CocsRRIF1ir/kC0uMMa/hmRUIhzciUUZiVnVpEcs=";
-          cp313 = "sha256-E1xwySvTwwUEQckFV26HG4edykhmSSGMRSQaPsRXI5k=";
+          cp310 = "sha256-Nv61GfMcUtO0281o/7K6+TGVzuwG6nEeIVWQlrq5X+0=";
+          cp311 = "sha256-0tfIr0VEH/ULwAI1LTHgr+xchd1Qdb9ScCcXiTFJe84=";
+          cp312 = "sha256-C+2UCHErrRUR5laDpFUwL4jZTl5ctqWMxKFUth2KC0o=";
+          cp313 = "sha256-PyvSrPm39HOMF9CFksqq0m6vt6T8OArZq0LV8KePc60=";
         };
         aarch64-darwin = {
-          cp310 = "sha256-sWTWr0IMejioMj+P83iLjFfO9GebNIg1ShI3GqwBh04=";
-          cp311 = "sha256-YZsua4gNWvEm3x382qJzFO3UPSxtYxXgHR4xGDmr/+Q=";
-          cp312 = "sha256-5oOYG1H/U0wJpIs6W2X8YYht49qKroc4I5WR2rK2fOU=";
-          cp313 = "sha256-w9qWaV4/Y70O7K1tMOx89tAwmoc44xrCcJV4ErzBzYs=";
+          cp310 = "sha256-6M4hjIXp9AQ8NxNvyQtBNDvbhE/NyVIPIcAA0djUn4k=";
+          cp311 = "sha256-vYIR/AM74bzpwDnkdOl6kHe+WTAgl4/c+6HXcL3EC6U=";
+          cp312 = "sha256-74R7AlynWLruRXGhygAdlziXytdy+OldfzA9JMOLZJ4=";
+          cp313 = "sha256-2BVHiGQ1FC29eb/x1OTt9Xil8g47EbvUztSc+vvTfSc=";
         };
       };
     in
@@ -207,6 +207,10 @@ buildPythonPackage rec {
       pyarrow
       requests
       tensorboardx
+
+      # `import ray.tune` fails without pydantic
+      # Reported upstream: https://github.com/ray-project/ray/issues/58280
+      pydantic
     ];
   });
 
diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 2aecf3ac308d..7c0884f08dd5 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pythonOlder,
 
   # builds
@@ -27,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "rdflib";
-  version = "7.1.4";
+  version = "7.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,8 +37,14 @@ buildPythonPackage rec {
     owner = "RDFLib";
     repo = "rdflib";
     tag = version;
-    hash = "sha256-u9hdwxAJIuTQ3zKstbwn88u1opzWXc8otJKbtIl4Li4=";
+    hash = "sha256-FisMiBTiL6emJS0d7UmlwGUzayA+CME5GGWgw/owfhc=";
   };
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/RDFLib/rdflib/commit/0ab817f86b5733c9a3b4ede7ef065b8d79e53fc5.diff";
+      hash = "sha256-+yWzQ3MyH0wihgiQRMMXV/FpG8WlXaIBhpsDF4e3rbY=";
+    })
+  ];
 
   build-system = [ poetry-core ];
 
diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
index 5eaebbeb793b..1201883e23fc 100644
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "reflex-hosting-cli";
-  version = "0.1.56";
+  version = "0.1.58";
   pyproject = true;
 
   # source is not published https://github.com/reflex-dev/reflex/issues/3762
   src = fetchPypi {
     pname = "reflex_hosting_cli";
     inherit version;
-    hash = "sha256-spuwor7g7lmsTxx77sxyfpFMPAq3P8SlNqWzPCN/QLc=";
+    hash = "sha256-yQOqRJRKck+90KbMZr0XT5vjKWfar2CStyBKGrOpJy8=";
   };
 
   pythonRelaxDeps = [
diff --git a/pkgs/development/python-modules/reflink-copy/default.nix b/pkgs/development/python-modules/reflink-copy/default.nix
new file mode 100644
index 000000000000..6c55782c880c
--- /dev/null
+++ b/pkgs/development/python-modules/reflink-copy/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "reflink-copy";
+  version = "0.3.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "iterative";
+    repo = "reflink-copy";
+    tag = version;
+    hash = "sha256-HxUAsqV5kjstfBfY/nEGJ3epUVT5WXoTqKerUggKDyo=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-TBKVf0kRRYn+1aYvhQHCHmJEsT0khFxp8iuyEWX9xyI=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "reflink_copy" ];
+
+  meta = with lib; {
+    description = "Python wrapper for reflink_copy Rust library";
+    homepage = "https://github.com/iterative/reflink-copy";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ambroisie ];
+  };
+}
diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix
index 4de467cc8a8d..7a581c682ceb 100644
--- a/pkgs/development/python-modules/regex/default.nix
+++ b/pkgs/development/python-modules/regex/default.nix
@@ -1,19 +1,24 @@
 {
-  lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  lib,
   python,
   setuptools,
 }:
 
-buildPythonPackage rec {
+let
+  version = "2025.9.18";
+in
+buildPythonPackage {
   pname = "regex";
-  version = "2025.7.34";
+  inherit version;
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-nq2XZSF6/QSoaCLfzU7SdH3+Qm6IfaQTsV/wrCRX4ho=";
+  src = fetchFromGitHub {
+    owner = "mrabarnett";
+    repo = "mrab-regex";
+    tag = version;
+    hash = "sha256-s/jaRbQffd1DmGribk8gwTraKEhWfvFZboWXUduhM8A=";
   };
 
   build-system = [ setuptools ];
@@ -24,13 +29,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "regex" ];
 
-  meta = with lib; {
+  meta = {
     description = "Alternative regular expression module, to replace re";
     homepage = "https://github.com/mrabarnett/mrab-regex";
     license = [
-      licenses.asl20
-      licenses.cnri-python
+      lib.licenses.asl20
+      lib.licenses.cnri-python
     ];
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.dwoffinden ];
   };
 }
diff --git a/pkgs/development/python-modules/regress/default.nix b/pkgs/development/python-modules/regress/default.nix
index b65164c0b9b4..481b9f41b39d 100644
--- a/pkgs/development/python-modules/regress/default.nix
+++ b/pkgs/development/python-modules/regress/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "regress";
-  version = "2025.5.1";
+  version = "2025.10.1";
 
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uzcrdupqUJNRKPBl7KT+ZknsRG8Oz51zrAzRm2isrcc=";
+    hash = "sha256-3MCorwzbw9bg1HJfETM10KX/u6hq48oY0rWzUsXyyO0=";
   };
 
   nativeBuildInputs = with rustPlatform; [
@@ -27,7 +27,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-zl4iyJqmXHpc+1A4xYd8qSbE81OFxq46ECl6xJ/yD+4=";
+    hash = "sha256-DOnKFVg+5cIv0T3mKzF8O9jj5+ZenQrLjTltfd+Tm9U=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/remi/default.nix b/pkgs/development/python-modules/remi/default.nix
index 1e55434b8f9d..0db323c1c46a 100644
--- a/pkgs/development/python-modules/remi/default.nix
+++ b/pkgs/development/python-modules/remi/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   pytestCheckHook,
   matplotlib,
@@ -47,8 +46,6 @@ buildPythonPackage rec {
 
   dependencies = [
     setuptools # pkg_resources is referenced at runtime
-  ]
-  ++ lib.optionals (!pythonOlder "3.13") [
     legacy-cgi
   ];
 
diff --git a/pkgs/development/python-modules/remotezip2/default.nix b/pkgs/development/python-modules/remotezip2/default.nix
new file mode 100644
index 000000000000..64fd89f042e9
--- /dev/null
+++ b/pkgs/development/python-modules/remotezip2/default.nix
@@ -0,0 +1,49 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  python,
+  requests-mock,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "remotezip2";
+  version = "0.0.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "python-remotezip2";
+    tag = "v${version}";
+    hash = "sha256-UyfAoe9pXCGLGPIE2LSLvnIaju+nXt3s7ddGlpmJGUg=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonImportsCheck = [ "remotezip2" ];
+
+  nativeCheckInputs = [
+    requests-mock
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    ${python.interpreter} test_remotezip2.py
+
+    runHook postCheck
+  '';
+
+  meta = {
+    changelog = "https://github.com/doronz88/python-remotezip2/releases/tag/${src.tag}";
+    description = "Access zip file content hosted remotely without downloading the full file";
+    homepage = "https://github.com/doronz88/python-remotezip2";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 3326317152b9..1aa56d1a50bf 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "renault-api";
-  version = "0.4.1";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "hacf-fr";
     repo = "renault-api";
     tag = "v${version}";
-    hash = "sha256-jnmfCYFtlfnFRMrNHfoiXgL8bael7IKmhuZCj+AOuz8=";
+    hash = "sha256-0fV7nPerG2b37KmLaDlsBnmZSHBItQbx++nxobvLCRg=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/rendercanvas/default.nix b/pkgs/development/python-modules/rendercanvas/default.nix
new file mode 100644
index 000000000000..bea026401316
--- /dev/null
+++ b/pkgs/development/python-modules/rendercanvas/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+
+  # build-system
+  flit-core,
+
+  # dependencies
+  sniffio,
+
+  # nativeCheckInputs
+  pytestCheckHook,
+  imageio,
+  glfw,
+  numpy,
+  trio,
+  wgpu-py,
+
+  nix-update-script,
+}:
+buildPythonPackage rec {
+  pname = "rendercanvas";
+  version = "2.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pygfx";
+    repo = "rendercanvas";
+    tag = "v${version}";
+    hash = "sha256-Zk27gcUf4qHsIaL0TJJyB3dCej5xQnlKvHP9AfBPPiI=";
+  };
+
+  postPatch = ''
+    rm -r rendercanvas/__pyinstaller
+  '';
+
+  build-system = [ flit-core ];
+
+  dependencies = [ sniffio ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    glfw
+    imageio
+    numpy
+    trio
+    # break circular dependency cycle
+    (wgpu-py.overrideAttrs { doInstallCheck = false; })
+  ];
+
+  # flaky timing and / or interrupt based tests
+  disabledTests = [ "test_offscreen_event_loop" ];
+  disabledTestPaths = [
+    "tests/test_loop.py"
+    "tests/test_scheduling.py"
+  ];
+
+  pythonImportsCheck = [ "rendercanvas" ];
+
+  meta = {
+    description = "One canvas API, multiple backends";
+    homepage = "https://github.com/pygfx/rendercanvas";
+    changelog = "https://github.com/pygfx/rendercanvas/releases/tag/${src.tag}";
+
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.bengsparks ];
+  };
+}
diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 710461a1ae02..672408051747 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -6,23 +6,20 @@
   fetchFromGitHub,
   orjson,
   pycryptodomex,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.16.2";
+  version = "0.16.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-Vkjt+/dG9m3sf9sQM++I+IgWdsBe338VjqoVr2pD3C0=";
+    hash = "sha256-YRawVisHVDW4hm/oqxVNscC/99v02+mTqvmBwLC4l40=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/rerun-sdk/default.nix b/pkgs/development/python-modules/rerun-sdk/default.nix
index c0b2e143a8fb..3251c3adf049 100644
--- a/pkgs/development/python-modules/rerun-sdk/default.nix
+++ b/pkgs/development/python-modules/rerun-sdk/default.nix
@@ -20,6 +20,7 @@
   # tests
   datafusion,
   pytestCheckHook,
+  tomli,
   torch,
 }:
 
@@ -67,6 +68,7 @@ buildPythonPackage {
   nativeCheckInputs = [
     datafusion
     pytestCheckHook
+    tomli
     torch
   ];
 
diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix
index f34684b9ca4e..d62e05e93b86 100644
--- a/pkgs/development/python-modules/resend/default.nix
+++ b/pkgs/development/python-modules/resend/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "resend";
-  version = "2.16.0";
+  version = "2.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "resend";
     repo = "resend-python";
     tag = "v${version}";
-    hash = "sha256-BXvy/6LaCQ+fyL6ubWZqIXn/IueE3IEhP07n2oT4cZQ=";
+    hash = "sha256-CqwyCTqLt16fTzN5s/X200AJKTR2Ei9Vfk2wCGdJ+I8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix
index 5cf21f66d6f2..043c8047a3dc 100644
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/pkgs/development/python-modules/restrictedpython/default.nix
@@ -1,29 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytest-mock,
   pytestCheckHook,
-  pythonAtLeast,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "restrictedpython";
-  version = "8.0";
+  version = "8.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-OvIxK8Z+X87Yh/uFsAbImGHackiBKLFVvuqB62oKmyQ=";
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "RestrictedPython";
+    tag = version;
+    hash = "sha256-UcmH1I2p+XmQm4Y5M+Ms/LMSchor6GD6V9dxippa4HI=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools >= 78.1.1,< 81" setuptools
   '';
 
   build-system = [ setuptools ];
@@ -33,15 +31,13 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.11") [ "test_compile__compile_restricted_exec__5" ];
-
   pythonImportsCheck = [ "RestrictedPython" ];
 
-  meta = with lib; {
+  meta = {
     description = "Restricted execution environment for Python to run untrusted code";
     homepage = "https://github.com/zopefoundation/RestrictedPython";
-    changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst";
-    license = licenses.zpl21;
-    maintainers = with maintainers; [ juaningan ];
+    changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ juaningan ];
   };
 }
diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix
index 1d1bcb8be32a..88457b0cd273 100644
--- a/pkgs/development/python-modules/reuse/default.nix
+++ b/pkgs/development/python-modules/reuse/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "reuse";
-  version = "6.1.2";
+  version = "6.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsfe";
     repo = "reuse-tool";
     tag = "v${version}";
-    hash = "sha256-vWBM8bvzsMAT8ONmdx3qy00SPySLsBBXPOd3sgQs/ig=";
+    hash = "sha256-J49RIt7MxnsMJqJAaGvYgUzXMHAT9/frMmrkhWXe5tQ=";
   };
 
   outputs = [
diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix
index 12c85e474af0..35f9b8ab7960 100644
--- a/pkgs/development/python-modules/rich-pixels/default.nix
+++ b/pkgs/development/python-modules/rich-pixels/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/darrenburns/rich-pixels";
     changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix
index e9ab5a9c3685..d70d39d7b379 100644
--- a/pkgs/development/python-modules/rigour/default.nix
+++ b/pkgs/development/python-modules/rigour/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "rigour";
-  version = "1.3.11";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opensanctions";
     repo = "rigour";
     tag = "v${version}";
-    hash = "sha256-ahHrNky8dGcH8UmpnZ8avfzyrz5RIvsL9YOe4V8EeE4=";
+    hash = "sha256-PxlYJQN2y+mqS48Cbd3/dCubzNzMVL+Q+MR5YJmAVtI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix
index 6623edcdb7ae..5bdd716bd6f9 100644
--- a/pkgs/development/python-modules/rioxarray/default.nix
+++ b/pkgs/development/python-modules/rioxarray/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "rioxarray";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corteva";
     repo = "rioxarray";
     tag = version;
-    hash = "sha256-tNcBuMyBVDVPbmujfn4WauquutOEn727lxcR19hfyuE=";
+    hash = "sha256-yLWCDaAcwQT2C0Nt1GaIA3NWXe6k2CDkBAr3rsm8eQs=";
   };
 
   build-system = [ setuptools ];
@@ -56,8 +56,6 @@ buildPythonPackage rec {
     # Fails with small numerical errors on GDAL 3.11
     "test_rasterio_vrt_gcps"
     "test_reproject__gcps"
-    # https://github.com/corteva/rioxarray/issues/862
-    "test_merge_datasets__mask_and_scale"
   ]
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [
     # numerical errors
diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 9e41698053a2..c0bea018a117 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = version;
-    hash = "sha256-d227mAVJKcm3Dx2HS7CvVsyWyLl7GoPSA/YrWjs7jm0=";
+    hash = "sha256-fbUoZSJtg5RFyZOC4I0d7wbPNcZ1RwmrD/1lHUoNos8=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix
index 3eb00bdd7ec2..81e137aae936 100644
--- a/pkgs/development/python-modules/roadrecon/default.nix
+++ b/pkgs/development/python-modules/roadrecon/default.nix
@@ -10,7 +10,6 @@
   marshmallow,
   marshmallow-sqlalchemy,
   openpyxl,
-  pythonOlder,
   roadlib,
   setuptools,
   sqlalchemy,
@@ -18,23 +17,19 @@
 
 buildPythonPackage rec {
   pname = "roadrecon";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JJJPQcgZOdqyAXYgLmCQuNBhSGwg8WIDW8+2jfVyvyc=";
+    hash = "sha256-v8IUnJlREtKMnhJtdKtChcxM/IKNKRuHA79V38zxLGY=";
   };
 
   pythonRelaxDeps = [ "flask" ];
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     flask
     flask-cors
@@ -47,6 +42,9 @@ buildPythonPackage rec {
     sqlalchemy
   ];
 
+  # Module has no tests
+  doCheck = false;
+
   pythonImportsCheck = [ "roadtools.roadrecon" ];
 
   meta = with lib; {
diff --git a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
index 9e588405e84d..38dc53c3229b 100644
--- a/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
+++ b/pkgs/development/python-modules/robotframework-seleniumlibrary/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "robotframework-seleniumlibrary";
-  version = "6.7.1";
+  version = "6.8.0";
   pyproject = true;
 
   # no tests included in PyPI tarball
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "robotframework";
     repo = "SeleniumLibrary";
     tag = "v${version}";
-    hash = "sha256-pKAOVycckUCe93wMk9kql1lY6WeUTiS4lk/skDAfKCY=";
+    hash = "sha256-TyYlcmoV5q3mfV4II/7P/SApfSNd3yC1EFYcuHllcyQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/rocketchat-api/default.nix b/pkgs/development/python-modules/rocketchat-api/default.nix
index 2fd6b8dd5cc1..7fe4081fa446 100644
--- a/pkgs/development/python-modules/rocketchat-api/default.nix
+++ b/pkgs/development/python-modules/rocketchat-api/default.nix
@@ -3,23 +3,27 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  setuptools-scm,
   packaging,
   requests,
 }:
 
 buildPythonPackage rec {
   pname = "rocketchat-api";
-  version = "1.35.2";
+  version = "1.36.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jadolg";
     repo = "rocketchat_API";
     tag = version;
-    hash = "sha256-U5r7SKCKneBgCSwCJRm+Tl/wPmMOrj93K5VVCO/OPCk=";
+    hash = "sha256-+usTi2GCf3ewtX8BvetKjsV9hwULHtRrxqJU/shCqt4=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     packaging
diff --git a/pkgs/development/python-modules/rosbags/default.nix b/pkgs/development/python-modules/rosbags/default.nix
index 7c2a97aeb49f..d6c533212ac6 100644
--- a/pkgs/development/python-modules/rosbags/default.nix
+++ b/pkgs/development/python-modules/rosbags/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "rosbags";
-  version = "0.10.11";
+  version = "0.11.0";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "ternaris";
     repo = "rosbags";
     tag = "v${version}";
-    hash = "sha256-uHRmeHwNswZt5q+RSlzjqZiXhH6qYAkf8AufrRNbBtY=";
+    hash = "sha256-CSRJIGLhQwuaGatfWIbnYNdjUva+klBYPyDbjHfUNlM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/rospkg/default.nix b/pkgs/development/python-modules/rospkg/default.nix
new file mode 100644
index 000000000000..5445aa1023dc
--- /dev/null
+++ b/pkgs/development/python-modules/rospkg/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  catkin-pkg,
+  distro,
+  distutils,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pyyaml,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "rospkg";
+  version = "1.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ros-infrastructure";
+    repo = "rospkg";
+    tag = version;
+    hash = "sha256-6nfdY+p3P3iGuj+7Lo7ybsZ+1x104m7WzGgxr8dDDuw=";
+  };
+
+  build-system = [ setuptools ];
+
+  setupHook = ./setup-hook.sh;
+
+  dependencies = [
+    catkin-pkg
+    distro
+    distutils
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportCheck = [ "rospkg" ];
+
+  meta = {
+    description = "ROS package library for Python";
+    homepage = "http://wiki.ros.org/rospkg";
+    changelog = "https://github.com/ros-infrastructure/rospkg/blob/${version}/CHANGELOG.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ guelakais ];
+  };
+}
diff --git a/pkgs/development/python-modules/rospkg/setup-hook.sh b/pkgs/development/python-modules/rospkg/setup-hook.sh
new file mode 100644
index 000000000000..cb4a79899a71
--- /dev/null
+++ b/pkgs/development/python-modules/rospkg/setup-hook.sh
@@ -0,0 +1 @@
+export ROS_OS_OVERRIDE=nixos
diff --git a/pkgs/development/python-modules/rpy2-rinterface/default.nix b/pkgs/development/python-modules/rpy2-rinterface/default.nix
index 13b20da717c8..cdc47e8e4df4 100644
--- a/pkgs/development/python-modules/rpy2-rinterface/default.nix
+++ b/pkgs/development/python-modules/rpy2-rinterface/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     description = "Python interface to R";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib; [ teams.sage ];
+    teams = with lib.teams; [ sage ];
   };
 }
diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
index 70eb5045bc8e..91c865f96e77 100644
--- a/pkgs/development/python-modules/rucio/default.nix
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -40,13 +40,13 @@
 }:
 
 let
-  version = "38.3.0";
+  version = "38.5.0";
 
   src = fetchFromGitHub {
     owner = "rucio";
     repo = "rucio";
     tag = version;
-    hash = "sha256-hMFWydOWfpRooOVd1wJ5jDWsdvF2oT1n/SlLj3CM9Qs=";
+    hash = "sha256-j+VFPS4obKdbbFPj3HZnpe5bzIMgOGaCeaKAiRuc0Gk=";
   };
 in
 buildPythonPackage {
diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix
index 12077d4878e7..22d199c71f94 100644
--- a/pkgs/development/python-modules/ruuvitag-ble/default.nix
+++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix
@@ -8,22 +8,19 @@
   home-assistant-bluetooth,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
 buildPythonPackage rec {
   pname = "ruuvitag-ble";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "ruuvitag-ble";
     tag = "v${version}";
-    hash = "sha256-9aaAKb5Av2OMDGaSM9+tT0s++YYE0g1D01Le6RrMoMk=";
+    hash = "sha256-5hlO2/YCTc65ImwjJVyWhFe2PTPlQ33aNdqEIxH/lms=";
   };
 
   build-system = [ hatchling ];
@@ -42,10 +39,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ruuvitag_ble" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/${src.tag}";
     description = "Library for Ruuvitag BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/safehttpx/default.nix b/pkgs/development/python-modules/safehttpx/default.nix
index d7a9fd27b514..95614467399f 100644
--- a/pkgs/development/python-modules/safehttpx/default.nix
+++ b/pkgs/development/python-modules/safehttpx/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "safehttpx";
-  version = "0.1.6";
+  version = "0.1.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-s1a/yCzuOiTDlblKLb6rvtYK/xql+jtf6XxPJFbrzkI=";
+    hash = "sha256-2yAcCXjEHt24u0gPPu5Z3WcwT92RZGA16dmnIASanSM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index 6a4d9e61249c..e28902e92a67 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.6.2";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyupio";
     repo = "safety";
     tag = version;
-    hash = "sha256-oGz2ZHGYaHi4RusNbZ5iqxuz2JBbchP5ip+uHHV10U0=";
+    hash = "sha256-BPLK/V7YQBCGopfRFAWdra8ve8Ww5KN1+oZKyoEPiFc=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 9ca4fbc2431a..2b40a66c31bc 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.59";
+  version = "1.0.62";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${version}";
-    hash = "sha256-h+59FAadpOX9BFl3bnGTDmNOn3oQuPvKyxgfTQ+62g4=";
+    hash = "sha256-1fFgR7BeMmt3SYYiHQ3yR2pK1eTKtosH3vTwna9mOCs=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 2b9d695e0098..6776c46246d9 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.253.0";
+  version = "2.254.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-OtTKgxXFPjyat2rKV64SS9/gQZTXBjzjNBxlG2zAtMc=";
+    hash = "sha256-tE8AD/nVrlP96ihVjzpos1IUGPR2T47HAMczCGP3S9M=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/salib/default.nix b/pkgs/development/python-modules/salib/default.nix
index 9b1f1ccd799b..6f5c1052725f 100644
--- a/pkgs/development/python-modules/salib/default.nix
+++ b/pkgs/development/python-modules/salib/default.nix
@@ -14,12 +14,12 @@
 let
   finalAttrs = {
     pname = "salib";
-    version = "1.5.1";
+    version = "1.5.2";
     pyproject = true;
 
     src = fetchPypi {
       inherit (finalAttrs) pname version;
-      hash = "sha256-5KnDGbjdAplajcmD9XxFLLflttvUPnt4VskMtqMyu18=";
+      hash = "sha256-qO7txOh88HD370ULds3s0SDR5cYCqcNYVex3d1kflJ8=";
     };
 
     build-system = [
diff --git a/pkgs/development/python-modules/sanic/default.nix b/pkgs/development/python-modules/sanic/default.nix
index 3c79d8a8785f..27b0137014c8 100644
--- a/pkgs/development/python-modules/sanic/default.nix
+++ b/pkgs/development/python-modules/sanic/default.nix
@@ -95,7 +95,15 @@ buildPythonPackage rec {
     # Racy, e.g. Address already in use
     "test_logger_vhosts"
     # Event loop is closed
+    "test_asyncio_server_no_start_serving"
+    "test_asyncio_server_start_serving"
+    "test_create_asyncio_server"
+    "test_create_server_main_convenience"
+    "test_create_server_main"
+    "test_create_server_no_startup"
     "test_create_server_trigger_events"
+    "test_multiple_uvloop_configs_display_warning"
+    "test_uvloop_cannot_never_called_with_create_server"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/sasmodels/default.nix b/pkgs/development/python-modules/sasmodels/default.nix
index 73a4b92b4092..c9c0478a405d 100644
--- a/pkgs/development/python-modules/sasmodels/default.nix
+++ b/pkgs/development/python-modules/sasmodels/default.nix
@@ -2,8 +2,16 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  setuptools,
-  pytestCheckHook,
+
+  # build-system
+  columnize,
+  hatch-requirements-txt,
+  hatch-sphinx,
+  hatch-vcs,
+  hatchling,
+  siphash24,
+  sphinx,
+
   numpy,
   scipy,
   bumps,
@@ -12,27 +20,46 @@
   opencl-headers,
   pycuda,
   pyopencl,
-  pythonOlder,
+
+  # optional-dependencies
+
+  # tests
+  pytestCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "sasmodels";
-  version = "1.0.10";
+  version = "1.0.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "SasView";
     repo = "sasmodels";
     tag = "v${version}";
-    hash = "sha256-cTXFlTCm521+xhcggFvDqVZrTJuDiVZ8PazBwA3mKJU=";
+    hash = "sha256-AtFkcW7h2hMnQAeAk0fGsARXwpuaSb7ERBhdnAH4pCY=";
   };
 
-  build-system = [ setuptools ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail '"tccbox",' ""
+  '';
+
+  build-system = [
+    columnize
+    hatch-requirements-txt
+    hatch-sphinx
+    hatch-vcs
+    hatchling
+    siphash24
+    sphinx
+  ];
 
   buildInputs = [ opencl-headers ];
 
+  pythonRemoveDeps = [
+    "tccbox" # unpackaged
+  ];
   dependencies = [
     numpy
     scipy
@@ -43,25 +70,26 @@ buildPythonPackage rec {
       docutils
       bumps
       matplotlib
-      # columnize
+      columnize
     ];
     server = [ bumps ];
     opencl = [ pyopencl ];
     cuda = [ pycuda ];
   };
 
-  nativeCheckInputs = [ pytestCheckHook ] ++ optional-dependencies.full;
-
-  preCheck = ''
-    export HOME=$TMPDIR
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ optional-dependencies.full;
 
   pythonImportsCheck = [ "sasmodels" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library of small angle scattering models";
     homepage = "https://github.com/SasView/sasmodels";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ rprospero ];
+    changelog = "https://github.com/SasView/sasmodels/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ rprospero ];
   };
 }
diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index b33764932a98..a97bc531585e 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -38,7 +38,7 @@ in
 
 buildPythonPackage rec {
   pname = "scalene";
-  version = "1.5.52";
+  version = "1.5.55";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     owner = "plasma-umass";
     repo = "scalene";
     tag = "v${version}";
-    hash = "sha256-8WE/tR0tGwdNSPtieS90QAOFlS66h/JxaV2LvpZjx2E=";
+    hash = "sha256-aO7l/paYqbneDArAbXxptIlMGfvc1dAaFLucEj/7xbk=";
   };
 
   patches = [
@@ -95,6 +95,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Flaky -- socket collision
     "test_show_browser"
+    # File not found
+    "test_nested_package_relative_import"
   ];
 
   # remove scalene directory to prevent pytest import confusion
diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix
index 095f5bbf08df..133513e646ad 100644
--- a/pkgs/development/python-modules/scanpy/default.nix
+++ b/pkgs/development/python-modules/scanpy/default.nix
@@ -44,14 +44,14 @@
 
 buildPythonPackage rec {
   pname = "scanpy";
-  version = "1.11.4";
+  version = "1.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "scanpy";
     tag = version;
-    hash = "sha256-EvNelorfLOpYLGGZ1RSq4+jk6emuCWCKBdUop24iLf4=";
+    hash = "sha256-GnZ1qJ4SaTLDzfLAH6IHrYeuMBo8PglKUlj4f3ljeR0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 5c457b80a29c..e554dd9df25a 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -4,25 +4,15 @@
   stdenv,
   lib,
   isPyPy,
-  pycrypto,
-  ecdsa, # TODO
   mock,
   python-can,
   brotli,
-  withOptionalDeps ? true,
-  tcpdump,
   ipython,
-  withCryptography ? true,
   cryptography,
   withVoipSupport ? true,
   sox,
-  withPlottingSupport ? true,
   matplotlib,
-  withGraphicsSupport ? false,
   pyx,
-  texliveBasic,
-  graphviz,
-  imagemagick,
   withManufDb ? false,
   wireshark,
   libpcap,
@@ -63,22 +53,15 @@ buildPythonPackage rec {
 
   buildInputs = lib.optional withVoipSupport sox;
 
-  propagatedBuildInputs = [
-    pycrypto
-    ecdsa
-  ]
-  ++ lib.optionals withOptionalDeps [
-    tcpdump
-    ipython
-  ]
-  ++ lib.optional withCryptography cryptography
-  ++ lib.optional withPlottingSupport matplotlib
-  ++ lib.optionals withGraphicsSupport [
-    pyx
-    texliveBasic
-    graphviz
-    imagemagick
-  ];
+  optional-dependencies = {
+    all = [
+      cryptography
+      ipython
+      matplotlib
+      pyx
+    ];
+    cli = [ ipython ];
+  };
 
   # Running the tests seems too complicated:
   doCheck = false;
diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix
index 0f47dfd8d2fa..395a46fe100a 100644
--- a/pkgs/development/python-modules/schedula/default.nix
+++ b/pkgs/development/python-modules/schedula/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "schedula";
-  version = "1.5.64";
+  version = "1.5.69";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vinci1it2000";
     repo = "schedula";
     tag = "v${version}";
-    hash = "sha256-huMhJTMiTVrKyZ5z0dFfw61GHyLbpHNtZGXP4gmUdTs=";
+    hash = "sha256-4TIppCYfCIf5mEqBeuX/pP27RyAI40es1ULidb+i+o8=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix
deleted file mode 100644
index 7a3c322168f0..000000000000
--- a/pkgs/development/python-modules/schemainspect/default.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  pythonOlder,
-  sqlalchemy,
-  sqlbag,
-  setuptools,
-  poetry-core,
-  pytestCheckHook,
-  pytest-xdist,
-  pytest-sugar,
-  postgresql,
-  postgresqlTestHook,
-}:
-buildPythonPackage {
-  pname = "schemainspect";
-  version = "3.1.1663587362";
-  format = "pyproject";
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "djrobstep";
-    repo = "schemainspect";
-    # no tags on github, version patch number is unix time.
-    rev = "066262d6fb4668f874925305a0b7dbb3ac866882";
-    hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk=";
-  };
-
-  patches = [
-    # https://github.com/djrobstep/schemainspect/pull/87
-    (fetchpatch {
-      name = "specify_poetry.patch";
-      url = "https://github.com/djrobstep/schemainspect/commit/bdcd001ef7798236fe0ff35cef52f34f388bfe68.patch";
-      hash = "sha256-/SEmcV9GjjvzfbszeGPkfd2DvYenl7bZyWdC0aI3M4M=";
-    })
-  ];
-
-  nativeBuildInputs = [ poetry-core ];
-  propagatedBuildInputs = [
-    setuptools # needed for 'pkg_resources'
-    sqlalchemy
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-xdist
-    pytest-sugar
-
-    postgresql
-    postgresqlTestHook
-
-    sqlbag
-  ];
-
-  preCheck = ''
-    export PGUSER="nixbld";
-    export postgresqlEnableTCP=1;
-  '';
-  disabledTests = [
-    # These all fail with "List argument must consist only of tuples or dictionaries":
-    # Related issue: https://github.com/djrobstep/schemainspect/issues/88
-    "test_can_replace"
-    "test_collations"
-    "test_constraints"
-    "test_dep_order"
-    "test_enum_deps"
-    "test_exclusion_constraint"
-    "test_fk_col_order"
-    "test_fk_info"
-    "test_generated_columns"
-    "test_identity_columns"
-    "test_indexes"
-    "test_inherit"
-    "test_kinds"
-    "test_lineendings"
-    "test_long_identifiers"
-    "test_partitions"
-    "test_postgres_inspect"
-    "test_postgres_inspect_excludeschema"
-    "test_postgres_inspect_sigleschema"
-    "test_raw_connection"
-    "test_relationship"
-    "test_replica_trigger"
-    "test_rls"
-    "test_separate_validate"
-    "test_sequences"
-    "test_table_dependency_order"
-    "test_types_and_domains"
-    "test_view_trigger"
-    "test_weird_names"
-  ];
-
-  pytestFlags = [
-    "-x"
-    "-svv"
-  ];
-
-  enabledTestPaths = [
-    "tests"
-  ];
-
-  pythonImportsCheck = [ "schemainspect" ];
-
-  postUnpack = ''
-    # this dir is used to bump the version number, having it here fails the build
-    rm -r ./source/deploy
-  '';
-
-  meta = with lib; {
-    description = "Schema inspection for PostgreSQL, and potentially others";
-    homepage = "https://github.com/djrobstep/schemainspect";
-    license = with licenses; [ unlicense ];
-    maintainers = with maintainers; [ bpeetz ];
-  };
-}
diff --git a/pkgs/development/python-modules/scikit-base/default.nix b/pkgs/development/python-modules/scikit-base/default.nix
index 899224d58602..8afe652ec3f4 100644
--- a/pkgs/development/python-modules/scikit-base/default.nix
+++ b/pkgs/development/python-modules/scikit-base/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-base";
-  version = "0.12.6";
+  version = "0.13.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sktime";
     repo = "skbase";
     tag = "v${version}";
-    hash = "sha256-c9hQBZV+PWI6ZViocUYqryhvDg0nJ6Qxdx6zwIV0fes=";
+    hash = "sha256-fZytQprnp4WAxTJxXp+AAe7xDRfcxaCAELPS6eAfK4g=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index ef4e4ed9719b..151ae1f21f42 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -1,26 +1,30 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
+  # build-system
   setuptools,
   cython,
   oldest-supported-numpy,
 
-  requests,
+  # dependencies
+  array-api-compat,
+  biom-format,
   decorator,
+  h5py,
   natsort,
   numpy,
   pandas,
-  scipy,
-  h5py,
-  biom-format,
-  statsmodels,
   patsy,
-  array-api-compat,
+  requests,
+  scipy,
+  statsmodels,
 
-  python,
+  # tests
   pytestCheckHook,
+  python,
 }:
 
 buildPythonPackage rec {
@@ -42,29 +46,37 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    requests
+    array-api-compat
+    biom-format
     decorator
+    h5py
     natsort
     numpy
     pandas
-    scipy
-    h5py
-    biom-format
-    statsmodels
     patsy
-    array-api-compat
+    requests
+    scipy
+    statsmodels
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   # only the $out dir contains the built cython extensions, so we run the tests inside there
   enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}/skbio" ];
 
+  # The trick above makes test collection fail on darwin:
+  # PermissionError: [Errno 1] Operation not permitted: '/nix/.Trashes'
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   pythonImportsCheck = [ "skbio" ];
 
   meta = {
-    homepage = "http://scikit-bio.org/";
     description = "Data structures, algorithms and educational resources for bioinformatics";
+    homepage = "http://scikit-bio.org/";
+    downloadPage = "https://github.com/scikit-bio/scikit-bio";
+    changelog = "https://github.com/scikit-bio/scikit-bio/blob/${version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ tomasajt ];
   };
diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix
index bb834dac7c77..fc400697a2d0 100644
--- a/pkgs/development/python-modules/scikit-misc/default.nix
+++ b/pkgs/development/python-modules/scikit-misc/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-misc";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "scikit-misc";
     tag = "v${version}";
-    hash = "sha256-w6RHmVxJjLx9ov2LxXvicxmY8jixfkIRfbfVnV2yhOU=";
+    hash = "sha256-G0zK13upo0tPd8x87X8cTBKWK63E5JPmAr1IVEijtaw=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix
index 984c29e674e4..9c5d7f197456 100644
--- a/pkgs/development/python-modules/scipy-stubs/default.nix
+++ b/pkgs/development/python-modules/scipy-stubs/default.nix
@@ -3,27 +3,32 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  hatchling,
+  uv-build,
   optype,
   scipy,
 }:
 
 buildPythonPackage rec {
   pname = "scipy-stubs";
-  version = "1.16.1.0";
+  version = "1.16.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scipy";
     repo = "scipy-stubs";
     tag = "v${version}";
-    hash = "sha256-KRwFQG1Nb+Kh9OpQCGtvUzQA0MHNEZnRlzSkpZCNxuw=";
+    hash = "sha256-TLqLJirbOGIm718cLhWcEi4VHms9imIJZadGfYphXBk=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build"
+  '';
+
   disabled = pythonOlder "3.11";
 
   build-system = [
-    hatchling
+    uv-build
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 92151e468259..16ae631686e4 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -50,8 +50,8 @@ let
   #     nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy
   #
   # The update script uses sed regexes to replace them with the updated hashes.
-  version = "1.16.1";
-  srcHash = "sha256-/LgYQUMGoQjSWMCWBgnekNGzEc0LVg2qiN2tV399rQU=";
+  version = "1.16.3";
+  srcHash = "sha256-2NVmsJqsUjWSD7oEJhRkRjbKvqwikBJenAhBio/+IuU=";
   datasetsHashes = {
     ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3";
     ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj";
diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index e3285ca6ddac..0649f928efd0 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "scooby";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "banesullivan";
     repo = "scooby";
     tag = "v${version}";
-    hash = "sha256-vOcCs8U8HeBgO86bgS/kqYrNai1IsQ0upQveV06YfoE=";
+    hash = "sha256-krExDVT9evG9ODZjTGpX+S1ygh7lMob06fzOwhh/hzA=";
   };
 
   build-system = [ setuptools-scm ];
diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index 03220410191c..976382e408b9 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "seabreeze";
-  version = "2.10.1";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ap--";
     repo = "python-seabreeze";
     tag = "v${version}";
-    hash = "sha256-q4qBblebCb5z67KgWBIzsvCWNZf146I7LHPCyAabDUM=";
+    hash = "sha256-PplymlXZlRt+BzhCzIYRMjr+rMFf+XfSq846QAlbRi0=";
     leaveDotGit = true;
   };
 
diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 94063cfdcaf9..58c6d711cbba 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -6,7 +6,6 @@
   setuptools,
   regex,
   csvw,
-  clldutils,
   pytestCheckHook,
   pytest-cov-stub,
   pytest-mock,
@@ -30,7 +29,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     regex
     csvw
-    clldutils
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/segyio/add_missing_cstdint.patch b/pkgs/development/python-modules/segyio/add_missing_cstdint.patch
deleted file mode 100644
index 2c26d6e454b1..000000000000
--- a/pkgs/development/python-modules/segyio/add_missing_cstdint.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 64f06c0643f1f8691a8f2757496b60f1ab98c866 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Sa=C3=AFd=20Benaissa?= <sbenaissa@shearwatergeo.com>
-Date: Fri, 8 Dec 2023 21:51:32 +0100
-Subject: [PATCH] Add include for cstdint, fix segyio build on fedora
-
----
- lib/experimental/segyio/segyio.hpp | 1 +
- python/segyio/segyio.cpp           | 1 +
- python/setup.py                    | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/lib/experimental/segyio/segyio.hpp b/lib/experimental/segyio/segyio.hpp
-index 706f07ff5..7ba3ffb99 100644
---- a/lib/experimental/segyio/segyio.hpp
-+++ b/lib/experimental/segyio/segyio.hpp
-@@ -13,6 +13,7 @@
- #include <vector>
- 
- #include <segyio/segy.h>
-+#include <cstdint>
- 
- /*
-  * KNOWN ISSUES AND TODOs:
-diff --git a/python/segyio/segyio.cpp b/python/segyio/segyio.cpp
-index 76da965c3..bd8a8622e 100644
---- a/python/segyio/segyio.cpp
-+++ b/python/segyio/segyio.cpp
-@@ -16,6 +16,7 @@
- #include <cstring>
- #include <sstream>
- #include <stdexcept>
-+#include <cstdint>
- 
- #if PY_MAJOR_VERSION >= 3
- #define IS_PY3K
-diff --git a/python/setup.py b/python/setup.py
-index 6c6553bc7..654075be9 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -1,6 +1,6 @@
- import os
- import sys
--import skbuild
-+import skbuild  # pip install scikit-build
- import setuptools
- 
- long_description = """
diff --git a/pkgs/development/python-modules/segyio/default.nix b/pkgs/development/python-modules/segyio/default.nix
index 1346623c9807..ed8276efe92f 100644
--- a/pkgs/development/python-modules/segyio/default.nix
+++ b/pkgs/development/python-modules/segyio/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   ninja,
   scikit-build,
@@ -15,12 +16,11 @@ buildPythonPackage rec {
   pyproject = false; # Built with cmake
 
   patches = [
-    # https://github.com/equinor/segyio/pull/570
-    ./add_missing_cstdint.patch
-    # https://github.com/equinor/segyio/pull/576/
-    ./fix-setuptools.patch
-    ./explicitly-cast.patch
-    ./numpy-2.patch
+    # Bump minimum CMake version to 3.11
+    (fetchpatch {
+      url = "https://github.com/equinor/segyio/commit/3e2cbe6ca6d4bc7d4f4d95666f5d2983836e8461.patch?full_index=1";
+      hash = "sha256-sOBHi8meMSkxEZy0AXwebAnIVPatpwQHd+4Co5zIhLQ=";
+    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/segyio/explicitly-cast.patch b/pkgs/development/python-modules/segyio/explicitly-cast.patch
deleted file mode 100644
index 7030f07e5f72..000000000000
--- a/pkgs/development/python-modules/segyio/explicitly-cast.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eafe8476566e1d8e8b9a486ca808685cb439a767 Mon Sep 17 00:00:00 2001
-From: Sveinung Rundhovde <ssru@equinor.com>
-Date: Mon, 29 Jul 2024 10:46:35 +0200
-Subject: [PATCH] Explicitly cast from BinField to int
-
-Parsing segyio.BinField type as int in PyArg_ParseTuple is no longer
-possible.
----
- python/segyio/open.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/python/segyio/open.py b/python/segyio/open.py
-index cd902c15..80bc3a5b 100644
---- a/python/segyio/open.py
-+++ b/python/segyio/open.py
-@@ -166,8 +166,8 @@ def open(filename, mode="r", iline = 189,
-     f = segyio.SegyFile(fd,
-             filename = str(filename),
-             mode = mode,
--            iline = iline,
--            xline = xline,
-+            iline = int(iline),
-+            xline = int(xline),
-             endian = endian,
-     )
- 
-@@ -189,4 +189,4 @@ def open(filename, mode="r", iline = 189,
-     if ignore_geometry:
-         return f
- 
--    return infer_geometry(f, metrics, iline, xline, strict)
-+    return infer_geometry(f, metrics, int(iline), int(xline), strict)
diff --git a/pkgs/development/python-modules/segyio/fix-setuptools.patch b/pkgs/development/python-modules/segyio/fix-setuptools.patch
deleted file mode 100644
index 42b4260434ad..000000000000
--- a/pkgs/development/python-modules/segyio/fix-setuptools.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 6df089258c2ef4356427263f652cff0c053c6173 Mon Sep 17 00:00:00 2001
-From: Sveinung Rundhovde <ssru@equinor.com>
-Date: Fri, 26 Jul 2024 15:03:33 +0200
-Subject: [PATCH] Fix attribute error in setup.py
-
-This line was causing a  error due to an update to scikit-build.  The
-issue was that the setuptools.command.test module is not put into the
-symbol table by the setuptools import, but it was put there during the
-skbuild import causing it to be available. Due to changes in
-scikit-build this is no longer the case and the line gives an
-AttributError.
-
-The rationale for this line was that scikit-builds test command implied
-develop (this was obnoxious), something that is no longer true. There is
-thus no longer any reason to keep this line, so we can fix this issue by
-simply removing it.
----
- python/setup.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 6c6553bc..6bae62f0 100644
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -95,7 +95,6 @@ def src(x):
-         # supported OS X release 10.9
-         '-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9',
-     ],
--    cmdclass = { 'test': setuptools.command.test.test },
-     classifiers = [
-         'Development Status :: 5 - Production/Stable',
-         'Environment :: Other Environment',
diff --git a/pkgs/development/python-modules/segyio/numpy-2.patch b/pkgs/development/python-modules/segyio/numpy-2.patch
deleted file mode 100644
index fa8b1d41002c..000000000000
--- a/pkgs/development/python-modules/segyio/numpy-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 75b2156a6414e2464eb15663004b8ab928374135 Mon Sep 17 00:00:00 2001
-From: Sveinung Rundhovde <ssru@equinor.com>
-Date: Tue, 30 Jul 2024 08:32:56 +0200
-Subject: [PATCH] Fix test failing due to Numpy 2.0 promotion rules
-
-From Numpy 2.0 adding a numpy.float32 and a Python numeric type returns
-a numy.float32 when it previously returned a numpy.float64. This changes
-the behavior when using the Python builtin sum function on a
-numpy.float32 array as the internal computations now will be performed
-as numpy.float32 additions when it used to be numpy.float64.
-
-Passing a numpy.double(0) as a start value to the innermost sum forces
-the old behavior and provides consistent results for Numpy 1 and 2.
----
- python/test/segyio_c.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/python/test/segyio_c.py b/python/test/segyio_c.py
-index 45fe95d89..b1e144d9d 100644
---- a/python/test/segyio_c.py
-+++ b/python/test/segyio_c.py
-@@ -540,10 +540,10 @@ def read_line(f, metrics, iline_idx, xline_idx):
-     buf = numpy.zeros((len(iline_idx), samples), dtype=numpy.single)
- 
-     f.getline(xline_trace0, len(iline_idx), xline_stride, offsets, buf)
--    assert sum(sum(buf)) == approx(800.061169624, abs=1e-6)
-+    assert sum(sum(buf), numpy.double(0)) == approx(800.061169624, abs=1e-6)
- 
-     f.getline(iline_trace0, len(xline_idx), iline_stride, offsets, buf)
--    assert sum(sum(buf)) == approx(305.061146736, abs=1e-6)
-+    assert sum(sum(buf), numpy.double(0)) == approx(305.061146736, abs=1e-6)
- 
-     f.close()
- 
diff --git a/pkgs/development/python-modules/semchunk/default.nix b/pkgs/development/python-modules/semchunk/default.nix
index 21fff736d36e..988fd74b2d26 100644
--- a/pkgs/development/python-modules/semchunk/default.nix
+++ b/pkgs/development/python-modules/semchunk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "semchunk";
-  version = "3.2.2";
+  version = "3.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "isaacus-dev";
     repo = "semchunk";
     tag = "v${version}";
-    hash = "sha256-bZe5QOFYY0LUUhv2T8B5xuzpCQ0XHtgS3ef12ZhxKvw=";
+    hash = "sha256-LUMpERJ8bZkpRn0Tay0BoDXmRgPaV7z0LulpTILHgjk=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/semgrep/common.nix b/pkgs/development/python-modules/semgrep/common.nix
index 6c687b88db1e..55ffe9b74ff8 100644
--- a/pkgs/development/python-modules/semgrep/common.nix
+++ b/pkgs/development/python-modules/semgrep/common.nix
@@ -1,9 +1,9 @@
 { lib }:
 
 rec {
-  version = "1.104.0";
+  version = "1.140.0";
 
-  srcHash = "sha256-rVBnjG+g7OaOQ8LYCurqNC2dYY/Dm4hdocgotc4lADg=";
+  srcHash = "sha256-RLcES0kamYMlLo1L4Y+mSJDB91SP84h75oLQxX9eCjQ=";
 
   # submodule dependencies
   # these are fetched so we:
@@ -13,8 +13,8 @@ rec {
     "cli/src/semgrep/semgrep_interfaces" = {
       owner = "semgrep";
       repo = "semgrep-interfaces";
-      rev = "5e0c767ec323f3f2356d3bf8dbdf7c7836497d8a";
-      hash = "sha256-RvkUbS+q/UqkKLDBCvDWkuRYDzWXp+JonFE7qVkEsY8=";
+      rev = "8baadf6b8604b59c9a660dbb371726c12a3666b8";
+      hash = "sha256-37sEprdR8I45tRYsXNNFz0okoTH32MJU9EvMogEMtMw=";
     };
   };
 
@@ -25,19 +25,19 @@ rec {
   core = {
     x86_64-linux = {
       platform = "musllinux_1_0_x86_64.manylinux2014_x86_64";
-      hash = "sha256-Qn97ZJI1//n47z/qX87AuIWRvvXurwH26C/vBrZ12gc=";
+      hash = "sha256-/aZnv5a7ifSk1l98Qf+HKQhnrHKi88SKTuJZwQ7Ons4=";
     };
     aarch64-linux = {
       platform = "musllinux_1_0_aarch64.manylinux2014_aarch64";
-      hash = "sha256-vuLuxsqnaPSbcVuwyhRRTTTwDVCZvOkRJURZUKnh/9I=";
+      hash = "sha256-f0k/sNME/0JGrvV7/H47jWLY3OadslzljfA7Kpp0STo=";
     };
     x86_64-darwin = {
       platform = "macosx_10_14_x86_64";
-      hash = "sha256-QWESQQyBzyupzC1V5zs1GgZBtHEUgayvcKwDn+5pXUc=";
+      hash = "sha256-HldS8Rcx+OkFYfBr/5+rMXVg8prrAuBCDTbkgb8DVsQ=";
     };
     aarch64-darwin = {
       platform = "macosx_11_0_arm64";
-      hash = "sha256-gkX82X79L+v5A1Mby6sCqXcx79fgJGIfmRdARtULmUc=";
+      hash = "sha256-LiIO4Smomx6tHTtg8ewwXaKXdJDpcmE+auJ5FjWi990=";
     };
   };
 
diff --git a/pkgs/development/python-modules/semgrep/default.nix b/pkgs/development/python-modules/semgrep/default.nix
index ee915a30945c..c86bbe502701 100644
--- a/pkgs/development/python-modules/semgrep/default.nix
+++ b/pkgs/development/python-modules/semgrep/default.nix
@@ -22,6 +22,7 @@
   opentelemetry-exporter-otlp-proto-http,
   opentelemetry-instrumentation-requests,
   opentelemetry-sdk,
+  mcp,
   packaging,
   peewee,
   pytest-freezegun,
@@ -97,6 +98,7 @@ buildPythonPackage rec {
     packaging
     jsonschema
     wcmatch
+    mcp
     peewee
     defusedxml
     urllib3
@@ -125,6 +127,7 @@ buildPythonPackage rec {
     "tests/default/e2e"
     "tests/default/e2e-pysemgrep"
     "tests/default/e2e-other"
+    "tests/default/mcp"
   ];
 
   disabledTests = [
diff --git a/pkgs/development/python-modules/semgrep/semgrep-core.nix b/pkgs/development/python-modules/semgrep/semgrep-core.nix
index 5a598631ceae..ea6f1f58eaba 100644
--- a/pkgs/development/python-modules/semgrep/semgrep-core.nix
+++ b/pkgs/development/python-modules/semgrep/semgrep-core.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
       inherit version;
       format = "wheel";
       dist = python;
-      python = "cp39.cp310.cp311.py39.py310.py311";
+      python = "cp310.cp311.cp312.cp313.cp314.py310.py311.py312.py313.py314";
       inherit (data) platform hash;
     };
 
diff --git a/pkgs/development/python-modules/semgrep/update.sh b/pkgs/development/python-modules/semgrep/update.sh
index 914de6c9331f..f4f847f1113f 100755
--- a/pkgs/development/python-modules/semgrep/update.sh
+++ b/pkgs/development/python-modules/semgrep/update.sh
@@ -34,11 +34,6 @@ NEW_VERSION=$(
 NEW_VERSION="${NEW_VERSION:1}"
 OLD_VERSION="$(instantiateClean semgrep.passthru.common.version)"
 
-if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then
-    echo "Already up to date"
-    exit
-fi
-
 replace() {
     sed -i "s@$1@$2@g" "$3"
 }
@@ -48,22 +43,6 @@ fetchgithub() {
     nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g'
     set -eo pipefail
 }
-
-fetch_arch() {
-  VERSION=$1
-  PLATFORM=$2
-  nix-prefetch "{ fetchPypi }:
-fetchPypi rec {
-  pname = \"semgrep\";
-  version = \"$VERSION\";
-  format = \"wheel\";
-  dist = python;
-  python = \"cp38.cp39.cp310.cp311.py37.py38.py39.py310.py311\";
-  platform = \"$PLATFORM\";
-}
-"
-}
-
 replace "$OLD_VERSION" "$NEW_VERSION" "$COMMON_FILE"
 
 echo "Updating src"
@@ -86,8 +65,9 @@ update_core_platform() {
     PLATFORM="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.platform")"
 
     OLD_HASH="$(instantiateClean "semgrep.passthru.common.core.$SYSTEM.hash")"
+    URL="$(nix-instantiate -A "semgrep.passthru.semgrep-core.src.url" --raw --eval --strict --argstr system "$SYSTEM")"
     echo "Old core hash $OLD_HASH"
-    NEW_HASH="$(fetch_arch "$NEW_VERSION" "$PLATFORM")"
+    NEW_HASH="$(nix hash convert --hash-algo sha256 --to sri $(nix-prefetch-url $URL))"
     echo "New core hash $NEW_HASH"
     replace "$OLD_HASH" "$NEW_HASH" "$COMMON_FILE"
 
@@ -144,4 +124,3 @@ done
 rm -rf "$TMPDIR"
 
 echo "Finished"
-
diff --git a/pkgs/development/python-modules/sensai-utils/default.nix b/pkgs/development/python-modules/sensai-utils/default.nix
index 34860d2885b4..fce62362d9c9 100644
--- a/pkgs/development/python-modules/sensai-utils/default.nix
+++ b/pkgs/development/python-modules/sensai-utils/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "sensai-utils";
-  version = "1.5.0";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "opcode81";
     repo = "sensAI-utils";
     tag = "v${version}";
-    hash = "sha256-bAbgamJjB+NpPnZHqYOrOhatGGgjzy558BrF3GwHOHE=";
+    hash = "sha256-E/9pCkSvKeGW1wlO6+YD0glbPrt4aJ7NZ0Kss2VbGdE=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index 12a40c0af256..3576f71ef934 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -5,24 +5,21 @@
   poetry-core,
   pytestCheckHook,
   pytest-cov-stub,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "sensor-state-data";
-  version = "2.19.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.9";
+  version = "2.20.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "sensor-state-data";
     tag = "v${version}";
-    hash = "sha256-Jl+kyr9WhYEzvsnSdqfeDDWgcEU9Yi6Snd67YQ+1MqQ=";
+    hash = "sha256-ONAM1WxKnzRCJsuJa+4zDaOXPkTj+zcTH54SgktpMR8=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/sentence-stream/default.nix b/pkgs/development/python-modules/sentence-stream/default.nix
index 76d9d6bd2e49..0695dd4d9e6f 100644
--- a/pkgs/development/python-modules/sentence-stream/default.nix
+++ b/pkgs/development/python-modules/sentence-stream/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "sentence-stream";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OHF-Voice";
     repo = "sentence-stream";
     tag = "v${version}";
-    hash = "sha256-xGxgGOl8PM5Nc7ApeiRKdaKeoxsc/a7oBF+Ld+vtYDo=";
+    hash = "sha256-KCKOiY2x+gj02PR0ps2e5Ei6o17tk5ujgCTr3/fkV0Y=";
   };
 
   build-system = [
@@ -28,10 +28,6 @@ buildPythonPackage rec {
     regex
   ];
 
-  pythonRelaxDeps = [
-    "regex"
-  ];
-
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
@@ -42,7 +38,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "A small sentence splitter for text streams";
+    description = "Small sentence splitter for text streams";
     homepage = "https://github.com/OHF-Voice/sentence-stream";
     changelog = "https://github.com/OHF-Voice/sentence-stream/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;
diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 456a2f3f2c81..0e63b52faee1 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "sentence-transformers";
-  version = "5.1.1";
+  version = "5.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "UKPLab";
+    owner = "huggingface";
     repo = "sentence-transformers";
     tag = "v${version}";
-    hash = "sha256-n0ZP01BU/s9iJ+RP7rNlBjD11jNDj8A8Q/seekh56nA=";
+    hash = "sha256-FNJ4mWBcgy3J8ZJtHt+uBgNmvMnqphj+sLMmBvgdB1k=";
   };
 
   build-system = [ setuptools ];
@@ -74,6 +74,11 @@ buildPythonPackage rec {
     "test_ParaphraseMiningEvaluator"
     "test_TripletEvaluator"
     "test_cmnrl_same_grad"
+    "test_default_weights_when_none"
+    "test_dense_load_and_save_in_other_precisions"
+    "test_dimension_exceeds_model_dimension_raises_error"
+    "test_dimensions_sorted_descending"
+    "test_empty_matryoshka_dims_raises_error"
     "test_forward"
     "test_initialization_with_embedding_dim"
     "test_initialization_with_embedding_weights"
@@ -81,7 +86,10 @@ buildPythonPackage rec {
     "test_mine_hard_negatives_with_prompt"
     "test_model_card_base"
     "test_model_card_reuse"
+    "test_model_dimension_not_in_dims_warns"
+    "test_mse_loss_matryoshka"
     "test_nanobeir_evaluator"
+    "test_negative_dimension_raises_error"
     "test_paraphrase_mining"
     "test_pretrained_model"
     "test_router_as_middle_module"
@@ -101,6 +109,10 @@ buildPythonPackage rec {
     "test_trainer"
     "test_trainer_invalid_column_names"
     "test_trainer_multi_dataset_errors"
+    "test_valid_initialization_no_warnings"
+    "test_valid_initialization_with_weights"
+    "test_weights_length_mismatch_raises_error"
+    "test_zero_dimension_raises_error"
 
     # Assertion error: Sparse operations take too long
     # (namely, load-sensitive test)
@@ -141,8 +153,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Multilingual Sentence & Image Embeddings with BERT";
-    homepage = "https://github.com/UKPLab/sentence-transformers";
-    changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${src.tag}";
+    homepage = "https://github.com/huggingface/sentence-transformers";
+    changelog = "https://github.com/huggingface/sentence-transformers/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dit7ya ];
   };
diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 736cc627d4b6..0745d055e92a 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -67,14 +67,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.39.0";
+  version = "2.43.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = version;
-    hash = "sha256-2M5Uvo8dl6hOqY13Eqjo4aKFySdlqEO8BHrPxZ/l+fw=";
+    hash = "sha256-ua/ojnyKZXnc1li65EMmPzhmY2Pu8B7A/NXlBzzPyRQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/servefile/default.nix b/pkgs/development/python-modules/servefile/default.nix
index 1d1c0c175bac..67cd43a9094e 100644
--- a/pkgs/development/python-modules/servefile/default.nix
+++ b/pkgs/development/python-modules/servefile/default.nix
@@ -5,7 +5,6 @@
   lib,
   pyopenssl,
   pytestCheckHook,
-  pythonAtLeast,
   requests,
 }:
 
@@ -22,9 +21,9 @@ buildPythonPackage rec {
   };
 
   dependencies = [
+    legacy-cgi
     pyopenssl
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index e9aeda152d3e..aa1211029abb 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -1,35 +1,42 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
+  procps,
+  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "setproctitle";
-  version = "1.3.6";
+  version = "1.3.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-yfMrlscAuzhPM/fPB5VLtgnTXdgnUs71f7LuCWhAkWk=";
+  src = fetchFromGitHub {
+    owner = "dvarrazzo";
+    repo = "py-setproctitle";
+    tag = "version-${version}";
+    hash = "sha256-dfOdtfOXRAoCQLW307+YMsFIWRv4CupbKUxckev1oUw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    procps
+  ];
 
-  # tries to compile programs with dependencies that aren't available
-  disabledTestPaths = [ "tests/setproctitle_test.py" ];
+  # Setting the process title fails on macOS in the Nix builder environment (regardless of sandboxing)
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_setproctitle_darwin" ];
 
-  meta = with lib; {
+  pythonImportsCheck = [ "setproctitle" ];
+
+  meta = {
     description = "Allows a process to change its title (as displayed by system tools such as ps and top)";
     homepage = "https://github.com/dvarrazzo/py-setproctitle";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ exi ];
+    changelog = "https://github.com/dvarrazzo/py-setproctitle/blob/${src.tag}/HISTORY.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ exi ];
   };
 }
diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix
index 62244825237e..5c33d1fd89b8 100644
--- a/pkgs/development/python-modules/setuptools-dso/default.nix
+++ b/pkgs/development/python-modules/setuptools-dso/default.nix
@@ -1,10 +1,15 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # tests
   nose2,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -12,10 +17,11 @@ buildPythonPackage rec {
   version = "2.12.2";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "setuptools_dso";
-    inherit version;
-    hash = "sha256-evt2+T0Tzp2iRQJnbY8tTbw9o1xiRflfJ9+fp0RQeaQ=";
+  src = fetchFromGitHub {
+    owner = "epics-base";
+    repo = "setuptools_dso";
+    tag = version;
+    hash = "sha256-YYm3mTA443vcD/4vHa7EgPzvDDzBic64NWWJDQYQHKs=";
   };
 
   build-system = [ setuptools ];
@@ -25,10 +31,16 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # distutils.compilers.C.errors.CompileError: command '/nix/store/...-clang-wrapper-21.1.2/bin/clang' failed with exit code 1
+    # fatal error: 'string' file not found
+    "test_cxx"
+  ];
+
+  meta = {
     description = "Setuptools extension for building non-Python Dynamic Shared Objects";
     homepage = "https://github.com/mdavidsaver/setuptools_dso";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ marius851000 ];
   };
 }
diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix
index dcffe7e23817..c65e60a4edc9 100644
--- a/pkgs/development/python-modules/sfrbox-api/default.nix
+++ b/pkgs/development/python-modules/sfrbox-api/default.nix
@@ -1,42 +1,35 @@
 {
   lib,
+  aiohttp,
+  aioresponses,
   buildPythonPackage,
   click,
   defusedxml,
   fetchFromGitHub,
-  httpx,
   mashumaro,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
-  respx,
 }:
 
 buildPythonPackage rec {
   pname = "sfrbox-api";
-  version = "0.0.12";
+  version = "0.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "hacf-fr";
     repo = "sfrbox-api";
     tag = "v${version}";
-    hash = "sha256-LUQwBzNNuH+hBAGAF7Qcc22I6u53rh+RDRrUuy9xhu8=";
+    hash = "sha256-B29wpOr8yClAuA0KfWTCs4nRLOm2gMU8ayyr5VbF+qQ=";
   };
 
-  pythonRelaxDeps = [
-    "defusedxml"
-  ];
-
   build-system = [ poetry-core ];
 
   dependencies = [
+    aiohttp
     defusedxml
     mashumaro
-    httpx
   ];
 
   optional-dependencies = {
@@ -44,20 +37,20 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    aioresponses
     pytest-asyncio
     pytestCheckHook
-    respx
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "sfrbox_api" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for the SFR Box API";
     homepage = "https://github.com/hacf-fr/sfrbox-api";
     changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sfrbox-api";
   };
 }
diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index ccad45bbac48..ecfe86b2e352 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   pythonOlder,
 
@@ -27,6 +28,18 @@ buildPythonPackage rec {
     hash = "sha256-qIITlPym92wfq0byqjRxofpmYYg7vohbi1qPVEu6hRg=";
   };
 
+  patches = [
+    # Fix tests for GEOS 3.14
+    (fetchpatch {
+      url = "https://github.com/shapely/shapely/commit/a561132c4e13c1fde597f56a8a7133c3c09b9928.patch";
+      hash = "sha256-a9gDfw2Dw+fd82T9f0BufYd/+gxE+ALvWyLm4vHygzU=";
+    })
+    (fetchpatch {
+      url = "https://github.com/shapely/shapely/commit/56e16e6eb27c54c6c24b9a251c12414e289fb7d0.patch";
+      hash = "sha256-JyjPVcJswEozF4C73QotKsPou55H41Ct9oVgkxhDhbk=";
+    })
+  ];
+
   nativeBuildInputs = [
     cython
     geos # for geos-config
diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix
index d46ea0258aa1..0a4234db5b3e 100644
--- a/pkgs/development/python-modules/shazamio/default.nix
+++ b/pkgs/development/python-modules/shazamio/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/dotX12/ShazamIO";
     changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     # https://github.com/shazamio/ShazamIO/issues/80
     broken = versionAtLeast pydantic.version "2";
   };
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index b55f3aa58c36..0267a3ad2974 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchurl,
+  fetchgit,
   llvmPackages,
   python,
   cmake,
@@ -13,14 +13,15 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.9.2";
+  version = "6.10.0";
 
-  src = fetchurl {
-    url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nsCHRlNCvcnb5JKjDlj9u8VEhlXerPWYKg/nEj9ZIi0=";
+  src = fetchgit {
+    url = "https://code.qt.io/pyside/pyside-setup.git";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-zJV4rrqr2bzWFEG1CWOI+y6wbfQDvWAst6T3aSssj6M=";
   };
 
-  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
+  sourceRoot = "${finalAttrs.src.name}/sources/shiboken6";
 
   patches = [ ./fix-include-qt-headers.patch ];
 
@@ -48,10 +49,17 @@ stdenv'.mkDerivation (finalAttrs: {
   # variable available in this file.
   postPatch = ''
     substituteInPlace cmake/ShibokenHelpers.cmake --replace-fail '#!/bin/bash' '#!''${BASH}'
+
+    # raise ValueError('ZIP does not support timestamps before 1980')
+    find \
+      shibokenmodule/files.dir/shibokensupport/ \
+      libshiboken/embed/signature_bootstrap.py \
+      -exec touch -d "1980-01-01T00:00Z" {} \;
   '';
 
   postInstall = ''
     cd ../../..
+    chmod +w .
     ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6
     cp -r shiboken6.egg-info $out/${python.sitePackages}/
   '';
diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
index bfa035b92b52..c9b2d51a94df 100644
--- a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
+++ b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
@@ -1,14 +1,14 @@
 --- a/ApiExtractor/clangparser/compilersupport.cpp
 +++ b/ApiExtractor/clangparser/compilersupport.cpp
-@@ -16,6 +16,7 @@
+@@ -18,6 +18,7 @@
+ #include <QtCore/qprocess.h>
  #include <QtCore/qstandardpaths.h>
  #include <QtCore/qstringlist.h>
- #include <QtCore/qversionnumber.h>
 +#include <QtCore/qregularexpression.h>
  
  #include <clang-c/Index.h>
  
-@@ -341,6 +342,13 @@ QByteArrayList emulatedCompilerOptions()
+@@ -638,6 +639,13 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
  {
      QByteArrayList result;
      HeaderPaths headerPaths;
@@ -21,20 +21,18 @@
 +
      switch (compiler()) {
      case Compiler::Msvc:
-         result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806"));
-@@ -352,9 +360,30 @@ QByteArrayList emulatedCompilerOptions()
+         result.append("-fms-compatibility-version="_ba + msvcCompatVersion());
+@@ -651,10 +659,27 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
              appendClangBuiltinIncludes(&headerPaths);
          break;
      case Compiler::Clang:
--        headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s)));
-+    // fix: error: cannot jump from switch statement to this case label: case Compiler::Gpp
-+    // note: jump bypasses variable initialization: const HeaderPaths clangPaths =
+-        headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s),
+-                                                   _compilerArguments));
 +    {
-+        //headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s)));
 +        // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.
 +        // PySide requires that Qt headers are not -isystem
 +        // https://bugreports.qt.io/browse/PYSIDE-787
-+        const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_qs));
++        const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_s), _compilerArguments);
 +        for (const HeaderPath &h : clangPaths) {
 +            auto match = qtHeaderRegex.match(QString::fromUtf8(h.path));
 +            if (!match.hasMatch()) {
@@ -54,9 +52,9 @@
      case Compiler::Gpp:
          if (needsClangBuiltinIncludes())
              appendClangBuiltinIncludes(&headerPaths);
-@@ -363,8 +392,20 @@ QByteArrayList emulatedCompilerOptions()
-         // <type_traits> etc (g++ 11.3).
-         const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_qs));
+@@ -664,8 +689,20 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
+         const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_s),
+                                                              _compilerArguments);
          for (const HeaderPath &h : gppPaths) {
 -            if (h.path.contains("c++") || h.path.contains("sysroot"))
 +            // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.
@@ -76,5 +74,3 @@
          }
          break;
      }
--- 
-2.39.0
diff --git a/pkgs/development/python-modules/sigstore-models/default.nix b/pkgs/development/python-modules/sigstore-models/default.nix
index 2a45c9cdef5a..5bda1519e17d 100644
--- a/pkgs/development/python-modules/sigstore-models/default.nix
+++ b/pkgs/development/python-modules/sigstore-models/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   pydantic,
   typing-extensions,
   uv-build,
@@ -20,6 +21,15 @@ buildPythonPackage rec {
     hash = "sha256-zlIZzfgHZPEuiZu3JNX74Cg1jPNaO1HUhMtpxoyOoqk=";
   };
 
+  patches = [
+    # https://github.com/astral-sh/sigstore-models/pull/4
+    (fetchpatch2 {
+      name = "uv-build.patch";
+      url = "https://github.com/Prince213/sigstore-models/commit/0cbd46ce7ebc8a5d2825b8fc98147a9ba4b3be70.patch?full_index=1";
+      hash = "sha256-6DLhhHkGW2Ok9xwKx6YT5BkCqQNH/Ja/KEO9FHl4NXo=";
+    })
+  ];
+
   build-system = [ uv-build ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
index 9e65def1d162..f7f99b05e8bc 100644
--- a/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
+++ b/pkgs/development/python-modules/sigstore-protobuf-specs/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pythonOlder,
   flit-core,
   fetchPypi,
   buildPythonPackage,
@@ -10,15 +9,13 @@
 
 buildPythonPackage rec {
   pname = "sigstore-protobuf-specs";
-  version = "0.3.2";
+  version = "0.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "sigstore_protobuf_specs";
     inherit version;
-    hash = "sha256-yuBBtAUCYAuKYz9DwldpXQIiqU76HlEQp+x62njDnZk=";
+    hash = "sha256-zvnrMrLGwlHeNuIoWkCq8glIJ+rhifXngE10jMw9W4E=";
   };
 
   nativeBuildInputs = [ flit-core ];
@@ -35,10 +32,10 @@ buildPythonPackage rec {
 
   passthru.skipBulkUpdate = true;
 
-  meta = with lib; {
+  meta = {
     description = "Library for serializing and deserializing Sigstore messages";
-    homepage = "https://pypi.org/project/sigstore-protobuf-specs/";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    homepage = "https://github.com/sigstore/protobuf-specs/tree/main/gen/pb-python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }
diff --git a/pkgs/development/python-modules/simplecosine/default.nix b/pkgs/development/python-modules/simplecosine/default.nix
new file mode 100644
index 000000000000..0709c1325387
--- /dev/null
+++ b/pkgs/development/python-modules/simplecosine/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  numpy,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "simplecosine";
+  version = "1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "simplecosine";
+    tag = "v${version}";
+    hash = "sha256-TNQnSbCh7o5JsxvfljRGSNwptwpLHmVw9gyk0TELDek=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "simplecosine"
+  ];
+
+  meta = {
+    description = "Simple cosine distance calculation for string comparison";
+    homepage = "https://github.com/dedupeio/simplecosine";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 31e38d275587..3a360da09b07 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.20.1";
+  version = "3.20.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "simplejson";
     repo = "simplejson";
     tag = "v${version}";
-    hash = "sha256-wE/jqBMXVtmbc/78X4lgfvuj074CrzfLJL1CM6LCfas=";
+    hash = "sha256-err3NWljoC6MxJoFSYuqLHGKfDcst6ya7myP9XIRbFc=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix
index 43ea46749d15..87e0ba56d192 100644
--- a/pkgs/development/python-modules/simsimd/default.nix
+++ b/pkgs/development/python-modules/simsimd/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "simsimd";
-  version = "6.5.3";
+  version = "6.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "SimSIMD";
     tag = "v${version}";
-    hash = "sha256-vEtMBpBoPbnBjGaxGw7ApGTJ8RFJ7vQcAH0DF4AOIEE=";
+    hash = "sha256-q+URgLfsc40OgZkqYj8yiBzpB33aksWsn4K0f5V0HSg=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/skia-pathops/default.nix b/pkgs/development/python-modules/skia-pathops/default.nix
index 6ee73cd23293..265fc0144153 100644
--- a/pkgs/development/python-modules/skia-pathops/default.nix
+++ b/pkgs/development/python-modules/skia-pathops/default.nix
@@ -73,7 +73,7 @@ buildPythonPackage rec {
     description = "Python access to operations on paths using the Skia library";
     homepage = "https://github.com/fonttools/skia-pathops";
     license = lib.licenses.bsd3;
-    maintainers = [ lib.maintainers.BarinovMaxim ];
+    maintainers = [ ];
     # "The Skia team is not endian-savvy enough to support big-endian CPUs."
     badPlatforms = lib.platforms.bigEndian;
     # ERROR at //gn/BUILDCONFIG.gn:87:14: Script returned non-zero exit code.
diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 60809522f772..ca5e3d9402f1 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -13,7 +13,6 @@
   sqlalchemy,
   websocket-client,
   websockets,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -52,8 +51,12 @@ buildPythonPackage rec {
   disabledTests = [
     # Requires internet access (to slack API)
     "test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
-    # Requires network access: [Errno 111] Connection refused
     "test_send_message_while_disconnection"
+    "TestWebClient_HttpRetry"
+    "test_issue_690_oauth_access"
+    "test_issue_690_oauth_v2_access"
+    "test_error_response"
+    "test_issue_1441_mixing_user_and_bot_installations"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index f297951a08b1..ee478927da57 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -13,19 +13,16 @@
   pytestCheckHook,
   replaceVars,
   rustPlatform,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "slixmpp";
-  version = "1.11.0";
+  version = "1.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hQxfOxlkpQdCWlGSdotZY6eHkJr6M3xkkRv4bR0urPM=";
+    hash = "sha256-dGn23K9XQv1i4OZu5EfFM4p0UgwZgqcHhOe3kN7y/dU=";
   };
 
   patches = [
@@ -41,7 +38,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src;
-    hash = "sha256-z0X9s36n1p31boxoe6Er0Ieirinaehoucsi89oDAS0c=";
+    hash = "sha256-eKXQeZ2RLHsTZmYszws4fCHgeiSO9wsrRbPkVV1gqZY=";
   };
 
   dependencies = [
diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 86e6a46ea26a..651f53a55a50 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -62,15 +62,6 @@ buildPythonPackage rec {
     hash = "sha256-X9tJfNxF2icULyma0dWIQEllY9oKaCB+MQ4JJTdzhz4=";
   };
 
-  # TODO: remove at the next release
-  # ImportError: cannot import name 'require_soundfile' from 'transformers.testing_utils'
-  # Caused by: https://github.com/huggingface/transformers/commit/1ecd52e50a31e7c344c32564e0484d7e9a0f2256
-  # Fixed in: https://github.com/huggingface/smolagents/pull/1625
-  postPatch = ''
-    substituteInPlace tests/test_types.py \
-      --replace-fail "require_soundfile" "require_torchcodec"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/smp/default.nix b/pkgs/development/python-modules/smp/default.nix
index 37eb2452d93f..6f91918ec1b9 100644
--- a/pkgs/development/python-modules/smp/default.nix
+++ b/pkgs/development/python-modules/smp/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "smp";
-  version = "3.3.2";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "JPHutchins";
     repo = "smp";
     tag = version;
-    hash = "sha256-klMFJOKGSy6s16M+9wQhSvLSWdNPO/IMNdY5RW+wyFc=";
+    hash = "sha256-V6TGDG05sebn0IF3j0EbkozfO4X1DL3nnwrGOSh+Wuc=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
index 6e6be26ae102..ea74d2b18d18 100644
--- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-report-plugins";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-report-plugins";
     tag = "v${version}";
-    hash = "sha256-wyDJa8Pahe+ANSNqZ1BZRmljpabyXhLodMJhupjd3pY=";
+    hash = "sha256-3ugEmdO1dcusKXXBZBRszlZXX5fhJyYSSF5Uj5CKJkQ=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
index ccad1ca6f6a2..bbceb3a22c30 100644
--- a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-scheduler-plugins";
     tag = "v${version}";
-    hash = "sha256-Z/rJGkby9AcYB+Gil00xhbrySChqEIEOtzLyzQPhObk=";
+    hash = "sha256-BowMwZllFR9IKYUMhISAbf606awTxfmS/nQxkGgb4y8=";
   };
 in
 buildPythonPackage {
diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
index 2bc8ba095c2b..97c0bf3576ab 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-storage-plugin-fs";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-storage-plugin-fs";
     tag = "v${version}";
-    hash = "sha256-bTkT1D2GJGS+zWvK/BUGLGE8ArZQikHHcdQjREJhldg=";
+    hash = "sha256-UdK0yhl7ljLh57CXAvH/OYiVyw+BjhPwGjSBXX8sbZk=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index c0f0b7773b8b..19e472e14af2 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -72,6 +72,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "cffi"
     "pyopenssl"
   ];
 
diff --git a/pkgs/development/python-modules/snowflake-core/default.nix b/pkgs/development/python-modules/snowflake-core/default.nix
index 98a78511d16f..18698d5b0ca7 100644
--- a/pkgs/development/python-modules/snowflake-core/default.nix
+++ b/pkgs/development/python-modules/snowflake-core/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "snowflake-core";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "snowflake_core";
     inherit version;
-    hash = "sha256-hlWpTCEa4E0dgD28h2JJ3m0/gCHMVzjWia6oQtG2an8=";
+    hash = "sha256-ltbyxhpEvHLvoinDqM7y9KXU4sdWsA4BggyBR1M6i+w=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/solaredge-web/default.nix b/pkgs/development/python-modules/solaredge-web/default.nix
new file mode 100644
index 000000000000..32be69fb465a
--- /dev/null
+++ b/pkgs/development/python-modules/solaredge-web/default.nix
@@ -0,0 +1,41 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "solaredge-web";
+  version = "0.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Solarlibs";
+    repo = "solaredge-web";
+    tag = "v${version}";
+    hash = "sha256-Vf/f5NDmjsKY8F5//8uAk+dJEaku94yjNaD2XyX7Vuk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "solaredge_web" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/Solarlibs/solaredge-web/releases/tag/${src.tag}";
+    description = "Library for fetching SolarEdge energy data for each inverter/string/module via the web API";
+    homepage = "https://github.com/Solarlibs/solaredge-web";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix
index d9fabf1dc0de..cd49c5dee1d6 100644
--- a/pkgs/development/python-modules/speechbrain/default.nix
+++ b/pkgs/development/python-modules/speechbrain/default.nix
@@ -2,6 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  setuptools,
 
   # dependencies
   huggingface-hub,
@@ -28,6 +32,18 @@ buildPythonPackage rec {
     hash = "sha256-H45kTOIO6frbrRu+TP+udn1z60ZEcrShNB9iTCLInQs=";
   };
 
+  patches = [
+    # https://github.com/speechbrain/speechbrain/pull/2988
+    (fetchpatch {
+      name = "torchaudio-2.9-compat.patch";
+      url = "https://github.com/speechbrain/speechbrain/commit/927530fa95e238fbc396000618e839a4a986dd7d.patch";
+      excludes = [ "pyproject.toml" ];
+      hash = "sha256-TJxBQLggX2ZHppUJwMcg9+A9r0r+D20XUfivBFW7y/U=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
   dependencies = [
     huggingface-hub
     hyperpyyaml
diff --git a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
index 200af582e86b..f06e3580fddc 100644
--- a/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
+++ b/pkgs/development/python-modules/sphinx-autodoc-typehints/default.nix
@@ -4,26 +4,23 @@
   fetchPypi,
   hatch-vcs,
   hatchling,
-  pythonOlder,
   sphinx,
   pytestCheckHook,
 }:
 
 let
   pname = "sphinx-autodoc-typehints";
-  version = "3.2.0";
+  version = "3.4.0";
 in
 
 buildPythonPackage {
   inherit pname version;
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "sphinx_autodoc_typehints";
     inherit version;
-    hash = "sha256-EHrJi8i0g3ICyIwHNtWdbaRAduZaDX19VDp4Yx9mKps=";
+    hash = "sha256-oknrcmSdBbS4fUKgykIln1UEmg/xVTk0FGP1nkslasU=";
   };
 
   pythonRelaxDeps = [ "sphinx" ];
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 5d4b4d581fa4..36d8c62176e8 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -118,6 +118,7 @@ buildPythonPackage rec {
     "test_class_alias_having_doccomment"
     "test_class_alias_for_imported_object_having_doccomment"
     "test_decorators"
+    "test_xml_warnings"
     # racy with too many threads
     # https://github.com/NixOS/nixpkgs/issues/353176
     "test_document_toc_only"
@@ -135,6 +136,7 @@ buildPythonPackage rec {
     # Racy local networking
     "test_load_mappings_cache"
     "test_load_mappings_cache_update"
+    "test_load_mappings_cache_revert_update"
   ]
   ++ lib.optionals (pythonAtLeast "3.12") [
     # https://github.com/sphinx-doc/sphinx/issues/12430
diff --git a/pkgs/development/python-modules/spyder-kernels/default.nix b/pkgs/development/python-modules/spyder-kernels/default.nix
index 1a38657d5a1d..61afb9b050c1 100644
--- a/pkgs/development/python-modules/spyder-kernels/default.nix
+++ b/pkgs/development/python-modules/spyder-kernels/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "spyder-kernels";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spyder-ide";
     repo = "spyder-kernels";
     tag = "v${version}";
-    hash = "sha256-FH4n1FsVN3D9WdDvxsrD6FBJiZl+ec/CJFOhs9IjUwI=";
+    hash = "sha256-XN0K0c0S8buoyFhh+/AIaWyhuGLQsstvTTqjTl0Mbxo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a784a3f7a542..41b2294acfe1 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "2.0.43";
+  version = "2.0.44";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-yZIYcJ6gI1oUsQ/vRd5yz6Tgcl7ARpjxnjZNsfeXinM=";
+    hash = "sha256-XjmSMgFOMYzJ5IR7tDImj37mM7qhiesKsaBerfzxL4g=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/sqlbag/default.nix b/pkgs/development/python-modules/sqlbag/default.nix
deleted file mode 100644
index f3cf77bbb993..000000000000
--- a/pkgs/development/python-modules/sqlbag/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  psycopg2,
-  pymysql,
-  sqlalchemy,
-  six,
-  flask,
-  pendulum,
-  packaging,
-  setuptools,
-  poetry-core,
-  pytestCheckHook,
-  pytest-xdist,
-  pytest-sugar,
-  postgresql,
-  postgresqlTestHook,
-}:
-buildPythonPackage {
-  pname = "sqlbag";
-  version = "0.1.1617247075";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "djrobstep";
-    repo = "sqlbag";
-    # no tags on github, version patch number is unix time.
-    rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120";
-    hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs=";
-  };
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
-    sqlalchemy
-    six
-    packaging
-
-    psycopg2
-    pymysql
-
-    setuptools # needed for 'pkg_resources'
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-xdist
-    pytest-sugar
-
-    postgresql
-    postgresqlTestHook
-
-    flask
-    pendulum
-  ];
-
-  preCheck = ''
-    export PGUSER="nixbld";
-  '';
-
-  enabledTestPaths = [
-    "tests"
-  ];
-
-  disabledTests = [
-    # These all fail with "List argument must consist only of tuples or dictionaries":
-    # Related issue: https://github.com/djrobstep/sqlbag/issues/14
-    "test_basic"
-    "test_createdrop"
-    "test_errors_and_messages"
-    "test_flask_integration"
-    "test_orm_stuff"
-    "test_pendulum_for_time_types"
-    "test_transaction_separation"
-  ];
-
-  pytestFlags = [
-    "-x"
-    "-svv"
-  ];
-
-  pythonImportsCheck = [ "sqlbag" ];
-
-  meta = with lib; {
-    description = "Handy python code for doing database things";
-    homepage = "https://github.com/djrobstep/sqlbag";
-    license = with licenses; [ unlicense ];
-    maintainers = with maintainers; [ bpeetz ];
-    broken = true; # Fails to build against the current flask version
-  };
-}
diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 2f1dff47901a..da67f58c661d 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -1,23 +1,33 @@
 {
   lib,
-  black,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
-  gitpython,
+  pythonOlder,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  click,
   jinja2,
   platformdirs,
-  poetry-core,
+  tqdm,
+
+  # optional-dependencies
+  black,
+  gitpython,
+
+  # tests
+  addBinToPathHook,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
-  tqdm,
+  versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "sqlfmt";
-  version = "0.27.0";
+  version = "0.28.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,11 +36,14 @@ buildPythonPackage rec {
     owner = "tconbeer";
     repo = "sqlfmt";
     tag = "v${version}";
-    hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU=";
+    hash = "sha256-9SO3G8SQOkxxSyro9dwSI6oH6BT8Rd66WqM5bvdVQkg=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
   dependencies = [
     click
     jinja2
@@ -43,18 +56,23 @@ buildPythonPackage rec {
     sqlfmt_primer = [ gitpython ];
   };
 
+  pythonImportsCheck = [ "sqlfmt" ];
+
   nativeCheckInputs = [
+    addBinToPathHook
     pytest-asyncio
     pytestCheckHook
+    versionCheckHook
     writableTmpDirAsHomeHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
+  versionCheckProgramArg = "--version";
 
-  preCheck = ''
-    export PATH="$PATH:$out/bin";
-  '';
-
-  pythonImportsCheck = [ "sqlfmt" ];
+  disabledTestPaths = [
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    "tests/functional_tests/test_end_to_end.py"
+    "tests/unit_tests/test_cli.py"
+  ];
 
   meta = {
     description = "Sqlfmt formats your dbt SQL files so you don't have to";
diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix
index e5d4dca2f152..07c5ae20ed3e 100644
--- a/pkgs/development/python-modules/sqlframe/default.nix
+++ b/pkgs/development/python-modules/sqlframe/default.nix
@@ -7,16 +7,30 @@
   setuptools-scm,
 
   # dependencies
+  more-itertools,
   prettytable,
   sqlglot,
   typing-extensions,
 
-  # tests
-  databricks-sql-connector,
-  duckdb,
-  findspark,
+  # optional-dependencies
+  # bigquery
   google-cloud-bigquery,
+  google-cloud-bigquery-storage,
+  # duckdb
+  duckdb,
+  pandas,
+  # openai
+  openai,
+  # postgres
+  psycopg2,
+  # spark
   pyspark,
+  # databricks-sql-connector
+  databricks-sql-connector,
+
+  # tests
+  findspark,
+  pytest-forked,
   pytest-postgresql,
   pytest-xdist,
   pytestCheckHook,
@@ -24,43 +38,59 @@
 
 buildPythonPackage rec {
   pname = "sqlframe";
-  version = "3.38.2";
+  version = "3.43.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eakmanrq";
     repo = "sqlframe";
     tag = "v${version}";
-    hash = "sha256-ekDt9vsHdHhUNaQghG3EaM82FRZYdw+gaxENcurSayk=";
+    hash = "sha256-qrKNn13wFEqvMQYzHH8T1pga1EUaVIt701p0k4eXw9c=";
   };
 
-  build-system = [
-    setuptools-scm
-  ];
+  build-system = [ setuptools-scm ];
 
   dependencies = [
+    more-itertools
     prettytable
     sqlglot
     typing-extensions
   ];
 
+  optional-dependencies = {
+    bigquery = [
+      google-cloud-bigquery
+      google-cloud-bigquery-storage
+    ]
+    ++ google-cloud-bigquery.optional-dependencies.pandas;
+    duckdb = [
+      duckdb
+      pandas
+    ];
+    openai = [ openai ];
+    pandas = [ pandas ];
+    postgres = [ psycopg2 ];
+    spark = [ pyspark ];
+    databricks = [ databricks-sql-connector ];
+  };
+
   pythonImportsCheck = [ "sqlframe" ];
 
   nativeCheckInputs = [
-    databricks-sql-connector
-    duckdb
     findspark
-    google-cloud-bigquery
-    pyspark
+    pytest-forked
     pytest-postgresql
     pytest-xdist
     pytestCheckHook
-  ];
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # Requires google-cloud credentials
     # google.auth.exceptions.DefaultCredentialsErro
     "test_activate_bigquery_default_dataset"
+    # AttributeError: module 'sqlglot.expressions' has no attribute 'Acos'
+    "test_unquoted_identifiers"
   ];
 
   disabledTestPaths = [
diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix
index 5b6bb1ceec67..35e507549ccf 100644
--- a/pkgs/development/python-modules/sqlglot/default.nix
+++ b/pkgs/development/python-modules/sqlglot/default.nix
@@ -13,18 +13,20 @@
   # tests
   pytestCheckHook,
   duckdb,
+  numpy,
+  pandas,
 }:
 
 buildPythonPackage rec {
   pname = "sqlglot";
-  version = "27.6.0";
+  version = "27.28.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "sqlglot";
     owner = "tobymao";
     tag = "v${version}";
-    hash = "sha256-/+hrbyAQJHbKzjaBr9ssuXuKpbCSWAarLa5oX5NqfOc=";
+    hash = "sha256-DGpxKIlSRwKKXhZGDTTQb8a3iAzy8a7h9/PKHPCuq+g=";
   };
 
   build-system = [
@@ -40,6 +42,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     duckdb
+    numpy
+    pandas
   ];
 
   pythonImportsCheck = [ "sqlglot" ];
diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 91da430181fb..5ddbc22fd78d 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.9.10";
+  version = "1.9.11";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S5A/zjf5PpauzIU3BGiijgGEq7OrFoj13xkYAJgdnOA=";
+    hash = "sha256-On76bRCiC7GEh5sdtTQnmohzkn7lvr4f1o9C25y/VJM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/ssh-python/default.nix b/pkgs/development/python-modules/ssh-python/default.nix
index 2704600d0900..02c957dd2f54 100644
--- a/pkgs/development/python-modules/ssh-python/default.nix
+++ b/pkgs/development/python-modules/ssh-python/default.nix
@@ -11,20 +11,20 @@
 
 buildPythonPackage rec {
   pname = "ssh-python";
-  version = "1.1.1";
-  format = "setuptools";
+  version = "1.2.0.post1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ParallelSSH";
     repo = "ssh-python";
     tag = version;
-    hash = "sha256-kidz4uHT5C8TUROLGQUHihemYtwOoWZQNw7ElbwYKLM=";
+    hash = "sha256-ix6UzyC/mFDVOvfJujwppijmsTrwNtuDAkmikrKKc2o=";
   };
 
   build-system = [ setuptools ];
-  nativeBuildInputs = [
-    cython
-  ];
+
+  nativeBuildInputs = [ cython ];
+
   buildInputs = [
     openssl
     zlib
diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix
index c8b72c32eb32..eab87385b4ba 100644
--- a/pkgs/development/python-modules/sshfs/default.nix
+++ b/pkgs/development/python-modules/sshfs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "sshfs";
-  version = "2025.2.0";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "sshfs";
     tag = version;
-    hash = "sha256-O9Va3dLfTko9AfyK4iJa8U6xrtJsNNEeBn9UeRAgmVc=";
+    hash = "sha256-IG+/aXM6F+sNtxmhgiaD6OXhRpbiCm0zW2ki0y8nuLE=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix
index 0f2fc24474a1..28480e772d2f 100644
--- a/pkgs/development/python-modules/sshpubkeys/default.nix
+++ b/pkgs/development/python-modules/sshpubkeys/default.nix
@@ -2,31 +2,36 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   cryptography,
-  ecdsa,
 }:
 
 buildPythonPackage rec {
   version = "3.3.1";
-  format = "setuptools";
   pname = "sshpubkeys";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ojarva";
-    repo = "python-${pname}";
-    rev = version;
-    sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4";
+    repo = "python-sshpubkeys";
+    # https://github.com/ojarva/python-sshpubkeys/issues/94
+    tag = "v3.2.0";
+    hash = "sha256-2OJatnQuCt9XQ797F5nEmgEZl5/tu9lrAry5yBGW61g=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cryptography
-    ecdsa
   ];
 
-  meta = with lib; {
+  pythonImportsCheck = [ "sshpubkeys" ];
+
+  meta = {
+    changelog = "https://github.com/ojarva/python-sshpubkeys/releases/tag/${src.tag}";
     description = "OpenSSH Public Key Parser for Python";
     homepage = "https://github.com/ojarva/python-sshpubkeys";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/sslpsk-pmd3/default.nix b/pkgs/development/python-modules/sslpsk-pmd3/default.nix
new file mode 100644
index 000000000000..e65aca82a7f9
--- /dev/null
+++ b/pkgs/development/python-modules/sslpsk-pmd3/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  openssl,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "sslpsk-pmd3";
+  version = "1.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "doronz88";
+    repo = "sslpsk-pmd3";
+    tag = "v${version}";
+    hash = "sha256-ZOPrMZhtHIpE7QMEYGti+ZjqVv93jzb74rG5Fwhjgyw=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  buildInputs = [
+    openssl
+  ];
+
+  pythonImportsCheck = [ "sslpsk_pmd3" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    # import from $out
+    mv sslpsk_pmd3 src
+  '';
+
+  # tests are dysfunctional
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/doronz88/sslpsk-pmd3/releases/tag/${src.tag}";
+    description = "Adds TLS-PSK support to the Python ssl package";
+    homepage = "https://github.com/doronz88/sslpsk-pmd3";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/standard-sndhdr/default.nix b/pkgs/development/python-modules/standard-sndhdr/default.nix
new file mode 100644
index 000000000000..6fefd2146c00
--- /dev/null
+++ b/pkgs/development/python-modules/standard-sndhdr/default.nix
@@ -0,0 +1,42 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  standard-aifc,
+}:
+
+buildPythonPackage rec {
+  pname = "standard-sndhdr";
+  version = "3.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "youknowone";
+    repo = "python-deadlib";
+    tag = "v${version}";
+    hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg=";
+  };
+
+  sourceRoot = "${src.name}/sndhdr";
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    standard-aifc
+  ];
+
+  pythonImportsCheck = [ "sndhdr" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Standard library sndhdr redistribution";
+    homepage = "https://github.com/youknowone/python-deadlib/tree/main/sndhdr";
+    license = lib.licenses.psfl;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/std-uritemplate/default.nix b/pkgs/development/python-modules/std-uritemplate/default.nix
index 552dd798a71f..c64c2aca88e2 100644
--- a/pkgs/development/python-modules/std-uritemplate/default.nix
+++ b/pkgs/development/python-modules/std-uritemplate/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "std-uritemplate";
-  version = "2.0.6";
+  version = "2.0.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "std_uritemplate";
     inherit version;
-    hash = "sha256-czU9og88fXOk57wOwKzb1ReHl4BIYyKAoaM3MZFvuUc=";
+    hash = "sha256-E4zv8sW/7ximUDcqXoyC/n94DIcjVRPebDQvtffhg0c=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix
index ea81c10bf39d..a5eaf80e0220 100644
--- a/pkgs/development/python-modules/stdlib-list/default.nix
+++ b/pkgs/development/python-modules/stdlib-list/default.nix
@@ -2,23 +2,21 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-
-  # build-system
   flit-core,
 }:
 
 buildPythonPackage rec {
   pname = "stdlib-list";
-  version = "0.11.1";
-  format = "pyproject";
+  version = "0.12.0";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "stdlib_list";
     inherit version;
-    hash = "sha256-levR1z2pMzu6A8zAl/W6wF46oD5oIqDAKQ+H4QR/GFc=";
+    hash = "sha256-UXgk8n7onlkdiufB3Z/zT2curlDuiG6jG7iBbXdTVnU=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
   pythonImportsCheck = [ "stdlib_list" ];
 
@@ -26,9 +24,9 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    changelog = "https://github.com/pypi/stdlib-list/releases/tag/v${version}";
     description = "List of Python Standard Libraries";
     homepage = "https://github.com/jackmaney/python-stdlib-list";
+    changelog = "https://github.com/pypi/stdlib-list/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix
index 7a6b4a145468..6cd8f8bdfd60 100644
--- a/pkgs/development/python-modules/stdlibs/default.nix
+++ b/pkgs/development/python-modules/stdlibs/default.nix
@@ -3,21 +3,18 @@
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "stdlibs";
-  version = "2025.5.10";
+  version = "2025.10.28";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "stdlibs";
     tag = "v${version}";
-    hash = "sha256-pvQZ+sRmad5m274wbIulHh5Tifim35uH7mz69jopVRw=";
+    hash = "sha256-1xdwYwkQqkPsa5yjrTUM0HxRVLJ+ZQvYwFpjIlW7jaY=";
   };
 
   build-system = [ flit-core ];
@@ -30,7 +27,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Overview of the Python stdlib";
     homepage = "https://github.com/omnilib/stdlibs";
-    changelog = "https://github.com/omnilib/stdlibs/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/omnilib/stdlibs/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/stransi/default.nix b/pkgs/development/python-modules/stransi/default.nix
index 52e6ee474549..784a5e70ab4a 100644
--- a/pkgs/development/python-modules/stransi/default.nix
+++ b/pkgs/development/python-modules/stransi/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/getcuia/stransi";
     changelog = "https://github.com/getcuia/stransi/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index fd34995f750e..fc155688f46a 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "streamlit";
-  version = "1.50.0";
+  version = "1.51.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hyIdVoqsWFJ0oF7xijeLA98zK5PggQP//PPNhNhSr0Y=";
+    hash = "sha256-HnQqnAtpj0Zsb1v1jTM77aWh++jeZgdDl2eRtcFEbvY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index ca028101df23..6cdac52a6c74 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -6,27 +6,20 @@
   pytest-repeat,
   pytestCheckHook,
   setuptools,
-  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "stringzilla";
-  version = "4.2.0";
+  version = "4.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
     tag = "v${version}";
-    hash = "sha256-YREm8VAO+oD/NV+vgnZo39vcPdaxY9wWwWgoOTG03QA=";
+    hash = "sha256-QxdiGqVz/3dNHlkilbf/CZ/QB2iPEBYS4hkrQusad2c=";
   };
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # error: unsupported option '-mfloat-abi=' for target 'aarch64-apple-darwin'
-    substituteInPlace setup.py \
-      --replace-fail '"-mfloat-abi=hard",' ""
-  '';
-
   build-system = [
     setuptools
   ];
@@ -46,6 +39,9 @@ buildPythonPackage rec {
     description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances";
     homepage = "https://github.com/ashvardanian/stringzilla";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ dotlambda ];
+    maintainers = with lib.maintainers; [
+      aciceri
+      dotlambda
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/strpdatetime/default.nix b/pkgs/development/python-modules/strpdatetime/default.nix
index 4980f4e1cb61..39322938e73f 100644
--- a/pkgs/development/python-modules/strpdatetime/default.nix
+++ b/pkgs/development/python-modules/strpdatetime/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "strpdatetime";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RhetTbull";
     repo = "strpdatetime";
     tag = "v${version}";
-    hash = "sha256-a+KUM9gQAcNg3ju+YyQXafDlADYCV6B+Wy7EBtcO3S4=";
+    hash = "sha256-p/iLq+x+dRW2QPva/VEA9emtxb0k3hnL91l1itTsYSc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index d7df69bc30a1..10c60fc80aff 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -1,31 +1,25 @@
 {
   lib,
-  better-exceptions,
   buildPythonPackage,
   fetchFromGitHub,
-  freezegun,
-  greenlet,
   hatch-fancy-pypi-readme,
   hatch-vcs,
   hatchling,
-  pretend,
   pytest-asyncio,
   pytestCheckHook,
-  rich,
-  simplejson,
-  twisted,
+  time-machine,
 }:
 
 buildPythonPackage rec {
   pname = "structlog";
-  version = "25.4.0";
+  version = "25.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "structlog";
     tag = version;
-    hash = "sha256-iNnUogcICQJvHBZO2J8uk4NleQY/ra3ZzxQgnSRKr30=";
+    hash = "sha256-dY18eZ7IEzP/eKR7d2CjpTRr2KfXy+YmeZMueHkLSQY=";
   };
 
   build-system = [
@@ -35,15 +29,9 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    better-exceptions
-    freezegun
-    greenlet
-    pretend
     pytest-asyncio
     pytestCheckHook
-    rich
-    simplejson
-    twisted
+    time-machine
   ];
 
   pythonImportsCheck = [ "structlog" ];
diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index 9ad9a47f2d80..5e717b742eac 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "subarulink";
-  version = "0.7.14";
+  version = "0.7.16";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "G-Two";
     repo = "subarulink";
     tag = "v${version}";
-    hash = "sha256-iZWDi7vT1AQI7WbGOQZw2gE+3ht4YKnHO58ALrUGfIg=";
+    hash = "sha256-IrQlqvYZwQ9o7eBgmjOTA9leETgvC2Ek6ccsul2CTX0=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index baa8e0c68ee3..caaac271ac45 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -7,34 +7,33 @@
   flit-core,
   typing-extensions,
   pytestCheckHook,
-  pytest-asyncio,
+  pytest-asyncio_0,
 }:
 
 buildPythonPackage rec {
   pname = "submitit";
-  version = "1.5.2";
+  version = "1.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "submitit";
     tag = version;
-    hash = "sha256-PDQLzqQjoBAZM9FKsoRby26Pbh4nik3SltIHUw/xWcY=";
+    hash = "sha256-uBlKbg1oKeUPcWzM9WxisGtpBu69eZyTetaANYpTG5E=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ flit-core ];
 
   dependencies = [
     cloudpickle
-    flit-core
+    setuptools
     typing-extensions
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio
+    # event_loop was removed in pytest-asyncio 1.x
+    pytest-asyncio_0
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix
index e09eae34658e..e991d99cbab8 100644
--- a/pkgs/development/python-modules/sunpy/default.nix
+++ b/pkgs/development/python-modules/sunpy/default.nix
@@ -1,67 +1,103 @@
 {
   lib,
-  stdenv,
   asdf,
+  asdf-astropy,
   astropy,
-  astropy-extension-helpers,
-  astropy-helpers,
   beautifulsoup4,
   buildPythonPackage,
+  contourpy,
+  dask,
   drms,
-  fetchPypi,
+  extension-helpers,
+  fetchFromGitHub,
+  fsspec,
   glymur,
   h5netcdf,
+  h5py,
   hypothesis,
   lxml,
   matplotlib,
   numpy,
+  opencv-python,
+  packaging,
   pandas,
   parfive,
+  pyerfa,
   pytest-astropy,
   pytestCheckHook,
   pytest-mock,
   python-dateutil,
   pythonOlder,
+  reproject,
+  requests,
   scikit-image,
   scipy,
+  setuptools,
   setuptools-scm,
-  sqlalchemy,
   tqdm,
+  writableTmpDirAsHomeHook,
   zeep,
 }:
 
 buildPythonPackage rec {
   pname = "sunpy";
-  version = "7.0.1";
-  format = "setuptools";
+  version = "7.0.2";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.11";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-9ZCG9CtTpgGGlqtXcl2epRBzFcbVvIMzZcXk5CQ5/+A=";
+  src = fetchFromGitHub {
+    owner = "sunpy";
+    repo = "sunpy";
+    tag = "v${version}";
+    hash = "sha256-1LT6Dr9OZYIZkOICSYD8lt5v3Gn1gZGN4GWeJL6IH5w=";
   };
 
-  nativeBuildInputs = [
-    astropy-extension-helpers
-    setuptools-scm
+  # As of 2025-10-15, this requires numpy >=1.25.0,<2.3.
+  # (The >=1.25.0 constraint is in dependencies, the <2.3 in build-system)
+  # We can't use 1.x because it's not supported on Python 3.13+.
+  # And since numpy 2.x is at 2.3.2, it's not supported.
+  # However, the upper bound is "for matching the numpy deprecation policy",
+  # so relaxing it should be OK. (It silently was overridden previously,
+  # due to the use of `format = "setuptools"` instead of `pyproject = true`)
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail "numpy>=2.0.0rc1,<2.3" "numpy"
+  '';
+
+  build-system = [
+    extension-helpers
+    setuptools
+    setuptools-scm # Technically needs setuptools-scm[toml], but that's our default.
+    numpy
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     astropy
-    astropy-helpers
+    fsspec
     numpy
+    packaging
     parfive
-  ];
+    pyerfa
+    requests
+  ]
+  ++ parfive.optional-dependencies.ftp;
 
   optional-dependencies = {
     asdf = [
       asdf
-      # asdf-astropy
+      asdf-astropy
     ];
-    database = [ sqlalchemy ];
-    image = [
-      scikit-image
+    dask = [ dask ] ++ dask.optional-dependencies.array;
+    image = [ scipy ];
+    jpeg2000 = [
+      glymur
+      lxml
+    ];
+    map = [
+      contourpy
+      matplotlib
+      # mpl-animators
+      reproject
       scipy
     ];
     net = [
@@ -71,93 +107,103 @@ buildPythonPackage rec {
       tqdm
       zeep
     ];
-    jpeg2000 = [
-      glymur
-      lxml
-    ];
+    opencv = [ opencv-python ];
+    scikit-image = [ scikit-image ];
+    # spice = [ spiceypy ];
     timeseries = [
       # cdflib
       h5netcdf
-      # h5py
+      h5py
       matplotlib
       pandas
     ];
+    visualization = [
+      matplotlib
+      # mpl-animators
+    ];
+
+    # We can't use `with` here because "map" would still be the builtin, and
+    # we can't below because scikit-image would still be this package's argument.
+    core = lib.concatLists [
+      optional-dependencies.image
+      optional-dependencies.map
+      optional-dependencies.net
+      optional-dependencies.timeseries
+      optional-dependencies.visualization
+    ];
+    all = lib.concatLists [
+      optional-dependencies.core
+      optional-dependencies.asdf
+      optional-dependencies.jpeg2000
+      optional-dependencies.opencv
+      # optional-dependencies.spice
+      optional-dependencies.scikit-image
+    ];
   };
 
   nativeCheckInputs = [
     hypothesis
     pytest-astropy
-    pytest-mock
     pytestCheckHook
+    pytest-mock
+    writableTmpDirAsHomeHook
   ]
-  ++ optional-dependencies.asdf
-  ++ optional-dependencies.database
-  ++ optional-dependencies.image
-  ++ optional-dependencies.net
-  ++ optional-dependencies.timeseries;
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace " --dist no" ""
-  '';
-
-  # darwin has write permission issues
-  doCheck = stdenv.hostPlatform.isLinux;
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
+  ++ optional-dependencies.all;
 
   disabledTests = [
-    "rst"
-    "test_sunpy_warnings_logging"
+    "rst" # Docs
+    "test_print_params" # Needs to be online
+    "test_find_dependencies" # Needs cdflib
+    # Needs mpl-animators
+    "sunpy.coordinates.utils.GreatArc"
+    "test_expand_list_generator_map"
+    "test_great_arc_different_observer"
+    "test_great_arc_points_differentiates"
+    "test_great_arc_wrongly_formatted_points"
+    "test_main_exclude_remote_data"
+    "test_main_include_remote_data"
     "test_main_nonexisting_module"
+    "test_main_only_remote_data"
     "test_main_stdlib_module"
-    "test_find_dependencies"
+    "test_main_submodule_map"
+    "test_tai_seconds"
+    "test_utime"
   ];
 
   disabledTestPaths = [
     # Tests are very slow
     "sunpy/net/tests/test_fido.py"
+    "sunpy/net/tests/test_scraper.py"
     # asdf.extensions plugin issue
+    "sunpy/io/special/asdf/resources/manifests/*.yaml"
     "sunpy/io/special/asdf/resources/schemas/"
-    "sunpy/io/special/asdf/resources/manifests/sunpy-1.0.0.yaml"
-    # Requires mpl-animators package
-    "sunpy/map/tests/test_compositemap.py"
-    "sunpy/map/tests/test_mapbase.py"
-    "sunpy/map/tests/test_mapsequence.py"
-    "sunpy/map/tests/test_plotting.py"
-    "sunpy/map/tests/test_reproject_to.py"
-    "sunpy/net/tests/test_helioviewer.py"
-    "sunpy/timeseries/tests/test_timeseriesbase.py"
-    "sunpy/visualization/animator/tests/test_basefuncanimator.py"
-    "sunpy/visualization/animator/tests/test_mapsequenceanimator.py"
-    "sunpy/visualization/animator/tests/test_wcs.py"
-    "sunpy/visualization/colormaps/tests/test_cm.py"
-    # Requires cdflib package
-    "sunpy/timeseries/tests/test_timeseries_factory.py"
-    # Requires jplephem
+    # Requires mpl-animators
+    "sunpy/coordinates/tests/test_wcs_utils.py"
+    "sunpy/image/tests/test_resample.py"
     "sunpy/image/tests/test_transform.py"
-    "sunpy/io/special/asdf/tests/test_coordinate_frames.py"
     "sunpy/io/special/asdf/tests/test_genericmap.py"
-    # distutils is deprecated
-    "sunpy/io/setup_package.py"
+    "sunpy/map"
+    "sunpy/net/jsoc/tests/test_jsoc.py"
+    "sunpy/physics/differential_rotation.py"
+    "sunpy/physics/tests/test_differential_rotation.py"
+    "sunpy/visualization"
+    # Requires cdflib
+    "sunpy/io/tests/test_cdf.py"
+    "sunpy/timeseries"
+    # Requires jplephem
+    "sunpy/io/special/asdf/tests/test_coordinate_frames.py"
+    # Requires spiceypy
+    "sunpy/coordinates/tests/test_spice.py"
   ];
 
-  pytestFlags = [
-    "-Wignore::DeprecationWarning"
-  ];
+  pytestFlags = [ "-Wignore::DeprecationWarning" ];
 
-  # Wants a configuration file
-  # pythonImportsCheck = [
-  #   "sunpy"
-  # ];
+  pythonImportsCheck = [ "sunpy" ];
 
   meta = with lib; {
     description = "Python for Solar Physics";
     homepage = "https://sunpy.org";
     license = licenses.bsd2;
     maintainers = [ ];
-    broken = true;
   };
 }
diff --git a/pkgs/development/python-modules/super-collections/default.nix b/pkgs/development/python-modules/super-collections/default.nix
index edd693d512ad..b33a228292f3 100644
--- a/pkgs/development/python-modules/super-collections/default.nix
+++ b/pkgs/development/python-modules/super-collections/default.nix
@@ -6,18 +6,19 @@
   hjson,
   pytestCheckHook,
   rich,
+  pyyaml,
 }:
 
 buildPythonPackage rec {
   pname = "super-collections";
-  version = "0.5.4";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fralau";
     repo = "super-collections";
     tag = "v${version}";
-    hash = "sha256-gp5BREoa1oHGm1ymDlIdlLTqyIvB0RmkNLYDJssI3VE=";
+    hash = "sha256-7QW5cL+TZlPX8ZMNNH+xZSGNIGr8Cy2jP1oSWy5tKaY=";
   };
 
   build-system = [
@@ -31,6 +32,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     rich
+    pyyaml
   ];
 
   pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix
index 154e80a938fd..2f09280b27b0 100644
--- a/pkgs/development/python-modules/surepy/default.nix
+++ b/pkgs/development/python-modules/surepy/default.nix
@@ -61,7 +61,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library to interact with the Sure Petcare API";
     homepage = "https://github.com/benleb/surepy";
-    changelog = "https://github.com/benleb/surepy/releases/tag/v${src.tag}";
+    changelog = "https://github.com/benleb/surepy/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "surepy";
diff --git a/pkgs/development/python-modules/svg-py/default.nix b/pkgs/development/python-modules/svg-py/default.nix
index f596899bdf75..cf0eb5e1d005 100644
--- a/pkgs/development/python-modules/svg-py/default.nix
+++ b/pkgs/development/python-modules/svg-py/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "svg-py";
-  version = "1.9.1";
+  version = "1.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "orsinium-labs";
     repo = "svg.py";
     tag = version;
-    hash = "sha256-ILnPviXUHJrdeT6VTUYAZog3zY0tVA+13ddf8yVRYqE=";
+    hash = "sha256-m/ZiEMwoopQiiHeOT27pM9sx4BCVWSK0VV792YGjDlE=";
   };
 
   build-system = [ flit-core ];
diff --git a/pkgs/development/python-modules/swagger-ui-py/default.nix b/pkgs/development/python-modules/swagger-ui-py/default.nix
new file mode 100644
index 000000000000..248cd4cc08ed
--- /dev/null
+++ b/pkgs/development/python-modules/swagger-ui-py/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  jinja2,
+  packaging,
+  pyyaml,
+}:
+
+buildPythonPackage rec {
+  pname = "swagger-ui-py";
+  version = "25.7.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "PWZER";
+    repo = "swagger-ui-py";
+    tag = "v${version}";
+    hash = "sha256-yPGt7EG8KvGoI7Unz0E7fn7nG9Ei/h8Q3TDKnuVVRkQ=";
+  };
+
+  env.VERSION = version;
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    jinja2
+    packaging
+    pyyaml
+  ];
+
+  doCheck = false; # huge dependency closure on all sorts of web frameworks, http clients, etc.
+
+  pythonImportsCheck = [
+    "swagger_ui"
+  ];
+
+  meta = {
+    changelog = "https://github.com/PWZER/swagger-ui-py/releases/tag/${src.tag}";
+    description = "Swagger UI for Python web framework, such Tornado, Flask and Sanic. https://pwzer.github.io/swagger-ui-py";
+    homepage = "https://github.com/PWZER/swagger-ui-py";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ hexa ];
+  };
+}
diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix
index a2654535d466..a3f309080f49 100644
--- a/pkgs/development/python-modules/swcgeom/default.nix
+++ b/pkgs/development/python-modules/swcgeom/default.nix
@@ -26,7 +26,7 @@
 }:
 
 let
-  version = "0.19.4";
+  version = "0.20.0";
 in
 buildPythonPackage rec {
   pname = "swcgeom";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "yzx9";
     repo = "swcgeom";
     tag = "v${version}";
-    hash = "sha256-emffSI4LO+5UU267d+qj/NCVvHmRpzikJ7jdCOtPFNo=";
+    hash = "sha256-XMpDzjKwj9DQTT/LC0tcBcqO5yetP5JNQbTOGkHv9TM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/swh-core/default.nix b/pkgs/development/python-modules/swh-core/default.nix
index abe4979eb1f1..3697adfb5894 100644
--- a/pkgs/development/python-modules/swh-core/default.nix
+++ b/pkgs/development/python-modules/swh-core/default.nix
@@ -18,6 +18,7 @@
   hypothesis,
   iso8601,
   lzip,
+  moto,
   msgpack,
   postgresql,
   postgresqlTestHook,
@@ -29,7 +30,9 @@
   pytest-postgresql,
   pytz,
   requests-mock,
+  swh-model,
   systemd,
+  tqdm,
   types-deprecated,
   types-psycopg2,
   types-pytz,
@@ -41,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "swh-core";
-  version = "4.5.2";
+  version = "4.6.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -50,7 +53,7 @@ buildPythonPackage rec {
     owner = "devel";
     repo = "swh-core";
     tag = "v${version}";
-    hash = "sha256-yNWij9GclQCysQe9Bukr4cHlZgSQqLAuX1KwGWzAK+0=";
+    hash = "sha256-dI+xfj0DnUbBdYIVycyJQg3B/jnH/eg/Ju8YX2k8Qkc=";
   };
 
   build-system = [
@@ -58,6 +61,11 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    # we patched click 8.2.1
+    "click"
+  ];
+
   dependencies = [
     backports-entry-points-selectable
     click
@@ -79,6 +87,7 @@ buildPythonPackage rec {
     hypothesis
     iso8601
     lzip
+    moto
     msgpack
     postgresql
     postgresqlTestHook
@@ -90,7 +99,9 @@ buildPythonPackage rec {
     pytest-postgresql
     pytz
     requests-mock
+    swh-model
     systemd
+    tqdm
     types-deprecated
     types-psycopg2
     types-pytz
@@ -111,6 +122,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-core/-/tags/${src.tag}";
     description = "Low-level utilities and helpers used by almost all other modules in the stack";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-core";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/development/python-modules/swh-objstorage/default.nix b/pkgs/development/python-modules/swh-objstorage/default.nix
index 5dda6b224fa5..aac86b8de896 100644
--- a/pkgs/development/python-modules/swh-objstorage/default.nix
+++ b/pkgs/development/python-modules/swh-objstorage/default.nix
@@ -18,7 +18,7 @@
   tenacity,
   swh-core,
   swh-model,
-  swh-perfecthash,
+  swh-shard,
   aiohttp,
   azure-core,
   azure-storage-blob,
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "swh-objstorage";
-  version = "4.0.0";
+  version = "5.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "devel";
     repo = "swh-objstorage";
     tag = "v${version}";
-    hash = "sha256-c0ZH2PMT9DVnpTV5PDyX0Yw4iHiJSolEgq/bMXEwXG8=";
+    hash = "sha256-NnNT9Lt/LGDIJpUmfkfPn6JnF3k8Usf2UVa88zHPKlg=";
   };
 
   build-system = [
@@ -71,7 +71,7 @@ buildPythonPackage rec {
     tenacity
     swh-core
     swh-model
-    swh-perfecthash
+    swh-shard
   ];
 
   preCheck = ''
@@ -110,6 +110,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage/-/tags/${src.tag}";
     description = "Content-addressable object storage for the Software Heritage project";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-objstorage";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/development/python-modules/swh-scanner/default.nix b/pkgs/development/python-modules/swh-scanner/default.nix
index 03fef49e9878..5dca94bb53d2 100644
--- a/pkgs/development/python-modules/swh-scanner/default.nix
+++ b/pkgs/development/python-modules/swh-scanner/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitLab,
-  fetchpatch,
   setuptools,
   setuptools-scm,
   requests,
@@ -36,15 +35,6 @@ buildPythonPackage rec {
     hash = "sha256-baUUuYFapBD7iuDaDP8CSR9f4glVZcS5qBpZddVf7z8=";
   };
 
-  patches = [
-    # To be removed at the next release
-    # See https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/merge_requests/160
-    (fetchpatch {
-      url = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/commit/0eb273475826b0074844c7619b767c052562cfe4.patch";
-      hash = "sha256-i3hpaQJmHpIYgix+/npICQGtJ/IKVRXcCTm2O1VsR9M=";
-    })
-  ];
-
   build-system = [
     setuptools
     setuptools-scm
@@ -78,11 +68,14 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # pytestRemoveBytecodePhase fails with: "error (ignored): error: opening directory "/tmp/nix-build-python3.12-swh-scanner-0.8.3.drv-5/build/pytest-of-nixbld/pytest-0/test_randomdir_policy_info_cal0/big-directory/dir/dir/dir/ ......"
     "swh/scanner/tests/test_policy.py"
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    "swh/scanner/tests/test_cli.py"
   ];
 
   meta = {
-    description = "Implementation of the Data model of the Software Heritage project, used to archive source code artifacts";
-    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-model";
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner/-/tags/${src.tag}";
+    description = "Source code scanner to analyze code bases and compare them with source code artifacts archived by Software Heritage";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scanner";
     license = lib.licenses.gpl3Only;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/swh-scheduler/default.nix b/pkgs/development/python-modules/swh-scheduler/default.nix
index ba2f4e10d1b3..7bb37313ed3c 100644
--- a/pkgs/development/python-modules/swh-scheduler/default.nix
+++ b/pkgs/development/python-modules/swh-scheduler/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "swh-scheduler";
-  version = "3.1.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "devel";
     repo = "swh-scheduler";
     tag = "v${version}";
-    hash = "sha256-YpMHeZVHK8IPIiuBaPNR0D/yB9lIQ3DK7NEAiBmjWpA=";
+    hash = "sha256-Kv5QH3sj/InKOSjxGtwVxtoAluHx5eIxO5GqcbOs0NY=";
   };
 
   build-system = [
@@ -47,6 +47,11 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    # we patched click 8.2.1
+    "click"
+  ];
+
   dependencies = [
     celery
     flask
@@ -80,6 +85,7 @@ buildPythonPackage rec {
   disabledTests = [ "test_setup_log_handler_with_env_configuration" ];
 
   meta = {
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler/-/tags/${src.tag}";
     description = "Job scheduler for the Software Heritage project";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-scheduler";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/development/python-modules/swh-shard/default.nix b/pkgs/development/python-modules/swh-shard/default.nix
new file mode 100644
index 000000000000..a07c344b04a2
--- /dev/null
+++ b/pkgs/development/python-modules/swh-shard/default.nix
@@ -0,0 +1,72 @@
+{
+  buildPythonPackage,
+  click,
+  cmake,
+  cmph,
+  fetchFromGitLab,
+  lib,
+  ninja,
+  pkg-config,
+  pybind11,
+  pytest-mock,
+  pytestCheckHook,
+  scikit-build-core,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "swh-shard";
+  version = "2.2.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    domain = "gitlab.softwareheritage.org";
+    group = "swh";
+    owner = "devel";
+    repo = "swh-shard";
+    tag = "v${version}";
+    hash = "sha256-97oZ+Wa8GmyL2V4CnlSvaTbQZJ+mPbg6uVmWd0oxv1Q=";
+  };
+
+  build-system = [
+    cmake
+    ninja
+    pybind11
+    scikit-build-core
+    setuptools-scm
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  dontUseCmakeConfigure = true;
+
+  buildInputs = [
+    cmph
+  ];
+
+  dependencies = [
+    click
+  ];
+
+  pythonImportsCheck = [ "swh.shard" ];
+
+  nativeCheckInputs = [
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    # import from $out
+    rm src/swh/shard/*.py
+  '';
+
+  meta = {
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-shard/-/tags/v2.2.0";
+    description = "Shard File Format for the Software Heritage Object Storage";
+    homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-shard";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/swh-storage/default.nix b/pkgs/development/python-modules/swh-storage/default.nix
index 74e312d07606..dcf09bf27cf4 100644
--- a/pkgs/development/python-modules/swh-storage/default.nix
+++ b/pkgs/development/python-modules/swh-storage/default.nix
@@ -12,6 +12,8 @@
   iso8601,
   mypy-extensions,
   psycopg,
+  psycopg-pool,
+  pyasyncore,
   redis,
   tenacity,
   swh-core,
@@ -30,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "swh-storage";
-  version = "3.1.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitLab {
@@ -39,7 +41,7 @@ buildPythonPackage rec {
     owner = "devel";
     repo = "swh-storage";
     tag = "v${version}";
-    hash = "sha256-Bxwc8OccmqadLjHtmhToHBYHGkD7Fw3Cl3go9VLV/Bs=";
+    hash = "sha256-JXeHE/wZ3Wcf1I1eGyCNlCGsreiQH6kCYZoDXV1h0A0=";
   };
 
   build-system = [
@@ -47,6 +49,11 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    # we patched click 8.2.1
+    "click"
+  ];
+
   dependencies = [
     backports-entry-points-selectable
     cassandra-driver
@@ -56,13 +63,14 @@ buildPythonPackage rec {
     iso8601
     mypy-extensions
     psycopg
+    psycopg-pool
+    pyasyncore
     redis
     tenacity
     swh-core
     swh-model
     swh-objstorage
-  ]
-  ++ psycopg.optional-dependencies.pool;
+  ];
 
   pythonImportsCheck = [ "swh.storage" ];
 
@@ -88,11 +96,13 @@ buildPythonPackage rec {
     "swh/storage/tests/test_cassandra_migration.py"
     "swh/storage/tests/test_cassandra_ttl.py"
     "swh/storage/tests/test_cli_cassandra.py"
+    "swh/storage/tests/test_cli_object_references_cassandra.py"
     # Failing tests
     "swh/storage/tests/test_cli_object_references.py"
   ];
 
   meta = {
+    changelog = "https://gitlab.softwareheritage.org/swh/devel/swh-storage/-/tags/${src.tag}";
     description = "Abstraction layer over the archive, allowing to access all stored source code artifacts as well as their metadata";
     homepage = "https://gitlab.softwareheritage.org/swh/devel/swh-storage";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/development/python-modules/swh-web-client/default.nix b/pkgs/development/python-modules/swh-web-client/default.nix
index b7ec8be2d090..deeba3f3a3b1 100644
--- a/pkgs/development/python-modules/swh-web-client/default.nix
+++ b/pkgs/development/python-modules/swh-web-client/default.nix
@@ -37,6 +37,11 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    # we patched click 8.2.1
+    "click"
+  ];
+
   dependencies = [
     click
     dateutils
diff --git a/pkgs/development/python-modules/symbex/default.nix b/pkgs/development/python-modules/symbex/default.nix
index 47405f4b8223..94cb8baf6d0b 100644
--- a/pkgs/development/python-modules/symbex/default.nix
+++ b/pkgs/development/python-modules/symbex/default.nix
@@ -35,6 +35,15 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
+  disabledTests = [
+    # Broken due to click 8.2.0 update
+    # https://github.com/simonw/symbex/issues/48
+    "test_output"
+    "test_replace"
+    "test_replace_errors"
+    "test_errors"
+  ];
+
   meta = {
     description = "Find the Python code for specified symbols";
     homepage = "https://github.com/simonw/symbex";
diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index 36f4c0b81a71..a213f3a3f547 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "syrupy";
-  version = "4.9.1";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "syrupy-project";
     repo = "syrupy";
     tag = "v${version}";
-    hash = "sha256-AK4cB7MiL52oRUV6ArNj94srMsEpk/YQdjJ5tnjrAYM=";
+    hash = "sha256-TRwU9+2RvZB2gbVm82DzLge8QoDflxjavcRdYZUgVfs=";
   };
 
   build-system = [ poetry-core ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/syrupy-project/syrupy/blob/${src.tag}/CHANGELOG.md";
     description = "Pytest Snapshot Test Utility";
     homepage = "https://github.com/syrupy-project/syrupy";
-    license = lib.licenses.asl20;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/tabcmd/default.nix b/pkgs/development/python-modules/tabcmd/default.nix
index 12911b3552fc..dc3d592cd3cf 100644
--- a/pkgs/development/python-modules/tabcmd/default.nix
+++ b/pkgs/development/python-modules/tabcmd/default.nix
@@ -1,13 +1,11 @@
 {
   lib,
   appdirs,
-  argparse,
   buildPythonPackage,
   doit,
-  fetchPypi,
+  fetchFromGitHub,
   ftfy,
   mock,
-  pyinstaller-versionfile,
   pytest-order,
   pytestCheckHook,
   python,
@@ -28,17 +26,19 @@ buildPythonPackage rec {
   version = "2.0.18";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-erGngJ3CW+c3PuVq4BTrPGSZ2L/M0EykSoZocku0lOE=";
+  src = fetchFromGitHub {
+    owner = "tableau";
+    repo = "tabcmd";
+    tag = "v${version}";
+    hash = "sha256-Eb9ZboYdco6opKW3Tz0+U9VREWdEyt2xuG62n9WIXPk=";
   };
 
   prePatch = ''
     # Remove an unneeded dependency that can't be resolved
     # https://github.com/tableau/tabcmd/pull/282
     sed -i "/'argparse',/d" pyproject.toml
+    # Uses setuptools-scm instead
+    sed -i "/'pyinstaller_versionfile',/d" pyproject.toml
   '';
 
   pythonRelaxDeps = [
@@ -46,14 +46,19 @@ buildPythonPackage rec {
     "urllib3"
   ];
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  pythonRemoveDeps = [
+    "pyinstaller_versionfile"
+  ];
 
   dependencies = [
     appdirs
-    argparse
     doit
     ftfy
-    pyinstaller-versionfile
     requests
     setuptools-scm
     tableauserverclient
diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 0357ae53d639..62321f1d9385 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchPypi,
+  fetchpatch,
   buildPythonPackage,
   pythonOlder,
   blosc2,
@@ -34,6 +35,15 @@ buildPythonPackage rec {
     hash = "sha256-JUSBKnGG+tuoMdbdNOtJzNeI1qg/TkwrQxuDW2eWyRA=";
   };
 
+  patches = [
+    # should be included in next release
+    (fetchpatch {
+      name = "numexpr-2.13.0-compat.patch";
+      url = "https://github.com/PyTables/PyTables/commit/41270019ce1ffd97ce8f23b21d635e00e12b0ccb.patch";
+      hash = "sha256-CaDBYKiABVtlM5e9ChCsf8dWOwEnMPOIXQ100JTnlnE=";
+    })
+  ];
+
   build-system = [
     blosc2
     cython
diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index deda5f3bdc1b..f2d6a29d4be9 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "temporalio";
-  version = "1.18.1";
+  version = "1.18.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "temporalio";
     repo = "sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-53UDG6eN7Jv8nUUh84I1SX9Gc+gZK66o6e4pqe9aWq4=";
+    hash = "sha256-EUys/UMblFVzICvMZmcGUXAqmtjPOdJKgtIx5TFB/9U=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 0a322569d152..e639430287ce 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1475";
+  version = "3.0.1483";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-jKJwIgczHwGiE32YwiwK2Xu1nOdAatP799NNlWn92p0=";
+    hash = "sha256-yidKh50qnikyhBeuMKxiVD4xdqRO2ReJp1SuD266lHM=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index ddbdedd266e1..f15160a2c31c 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -205,7 +205,12 @@ buildPythonPackage rec {
           ''}
         done
       ''
-    );
+    )
+    # Symlink nvcc besides TensorFlow so that routines that require JIT can work
+    # properly.
+    + lib.optionalString cudaSupport ''
+      ln -s ${cudaPackages.cuda_nvcc} "$out/${python.sitePackages}/tensorflow/cuda"
+    '';
 
   # Upstream has a pip hack that results in bin/tensorboard being in both tensorflow
   # and the propagated input tensorboard, which causes environment collisions.
diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix
index 94a3504b95fa..86580550c7af 100644
--- a/pkgs/development/python-modules/tensorrt/default.nix
+++ b/pkgs/development/python-modules/tensorrt/default.nix
@@ -1,41 +1,35 @@
 {
+  autoPatchelfHook,
+  buildPythonPackage,
+  cudaPackages,
   lib,
   python,
-  autoAddDriverRunpath,
-  buildPythonPackage,
-  autoPatchelfHook,
-  unzip,
-  cudaPackages,
+  stdenv,
 }:
-
 let
-  pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}";
-  buildVersion = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version;
+  inherit (cudaPackages.tensorrt) src pname version;
+  inherit (lib.versions) major minor;
+  inherit (stdenv.hostPlatform) parsed;
 in
 buildPythonPackage {
-  pname = "tensorrt";
-  version = buildVersion;
+  inherit pname version;
 
-  src = cudaPackages.tensorrt.src;
+  src =
+    let
+      # https://peps.python.org/pep-0427/#file-name-convention
+      distribution = pname;
+      pythonTag = "cp${major python.version}${minor python.version}";
+      abiTag = "none";
+      platformTag = "${parsed.kernel.name}_${parsed.cpu.name}";
+    in
+    src + "/python/${distribution}-${version}-${pythonTag}-${abiTag}-${platformTag}.whl";
 
   format = "wheel";
-  # We unpack the wheel ourselves because of the odd packaging.
-  dontUseWheelUnpack = true;
 
   nativeBuildInputs = [
-    unzip
     autoPatchelfHook
-    autoAddDriverRunpath
   ];
 
-  preUnpack = ''
-    mkdir -p dist
-    tar --strip-components=2 -xf "$src" --directory=dist \
-      "TensorRT-${buildVersion}/python/tensorrt-${buildVersion}-cp${pyVersion}-none-linux_x86_64.whl"
-  '';
-
-  sourceRoot = ".";
-
   buildInputs = [
     cudaPackages.cudnn
     cudaPackages.tensorrt
diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 202e9a2f2917..bc1bddb0e021 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -9,22 +9,19 @@
   cryptography,
   fetchFromGitHub,
   protobuf,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "1.2.4";
+  version = "1.2.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-h6MGYzDNzEss5FIf+2J5oROQw/7OVLpkXuheYKd4BrQ=";
+    hash = "sha256-7Diq7xT8tPO4fXp7qsFXWtWExqm2vctoOtPvlCuWOKg=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix
index 2b8d9a907534..73468408f8c9 100644
--- a/pkgs/development/python-modules/teslemetry-stream/default.nix
+++ b/pkgs/development/python-modules/teslemetry-stream/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "teslemetry-stream";
-  version = "0.7.9";
+  version = "0.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-teslemetry-stream";
     tag = "v${version}";
-    hash = "sha256-qfe73wLj4CGfHU4MyQfUfM/P+R52Hd6FLr39wbIGg9Y=";
+    hash = "sha256-2ZKoDb5ZKo27qHTyUmyDa2LlhcyJTkQByrJotY/qw4o=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix
index 3456f1b11050..62c29071e33e 100644
--- a/pkgs/development/python-modules/textnets/default.nix
+++ b/pkgs/development/python-modules/textnets/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  cython_0,
+  cython,
   pdm-backend,
   setuptools,
 
@@ -29,24 +29,23 @@
 
 buildPythonPackage rec {
   pname = "textnets";
-  version = "0.10.3";
+  version = "0.10.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jboynyc";
     repo = "textnets";
     tag = "v${version}";
-    hash = "sha256-BK0bBoe6GrZpVL4HvTwzRlXRWXfKdYJDhLD2UQctTjc=";
+    hash = "sha256-GbJH+6EqfP+miqpYitnBwNDO6uQQq3h9Fy58nVaF1vw=";
   };
 
   build-system = [
-    cython_0
+    cython
     pdm-backend
     setuptools
   ];
 
   pythonRelaxDeps = [
-    "pyarrow"
     "toolz"
   ];
 
@@ -69,6 +68,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # https://github.com/jboynyc/textnets/issues/66
+    "test_textnet_save_and_load"
+  ];
+
   pythonImportsCheck = [ "textnets" ];
 
   # Enable the package to find the cythonized .so files during testing. See #255262
diff --git a/pkgs/development/python-modules/textual-autocomplete/default.nix b/pkgs/development/python-modules/textual-autocomplete/default.nix
index 5b2768f33090..e4f2195ba502 100644
--- a/pkgs/development/python-modules/textual-autocomplete/default.nix
+++ b/pkgs/development/python-modules/textual-autocomplete/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "textual-autocomplete";
-  version = "4.0.5";
+  version = "4.0.6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "textual_autocomplete";
     inherit version;
-    hash = "sha256-24Bm/H2Hx0r9CDZ/j8IUS87F3b3qY6Y3JJdU6dH9h1U=";
+    hash = "sha256-K6Lw12e+RIDsrLPksTDPBzQOAzw1APxCT+2RJdJ6RYY=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/textual-dev/default.nix b/pkgs/development/python-modules/textual-dev/default.nix
index 45952a87842c..729c91feceb1 100644
--- a/pkgs/development/python-modules/textual-dev/default.nix
+++ b/pkgs/development/python-modules/textual-dev/default.nix
@@ -13,19 +13,18 @@
   textual,
   textual-serve,
   typing-extensions,
-  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "textual-dev";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual-dev";
     tag = "v${version}";
-    hash = "sha256-f/tceRELDLONzOVVpbbqa5eiXJ1QzYw3A47R/9EqEU4=";
+    hash = "sha256-0NOFc0FKbVEeZ6rNZGX8lo5W8RU3lKJlH+AqRCifuOE=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/textual-serve/default.nix b/pkgs/development/python-modules/textual-serve/default.nix
index 947bb63bdb26..87de708b2192 100644
--- a/pkgs/development/python-modules/textual-serve/default.nix
+++ b/pkgs/development/python-modules/textual-serve/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "textual-serve";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "textual_serve";
     inherit version;
-    hash = "sha256-DMr5ud+cCNSy16CIfK0yciQ7qH9oGSw2T0vtW2g+S9Q=";
+    hash = "sha256-+PY2ri9f1lG3nZZUc8PpOD01Ic34lvm8KJcJGF2j9oM=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index c2edc1e9fbd5..c01efb0342a7 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -4,63 +4,57 @@
   fetchFromGitHub,
 
   # build-system
-  poetry-core,
+  hatchling,
 
   # dependencies
   pyperclip,
   textual,
-
-  # tests
-  pytestCheckHook,
-  pytest-asyncio,
+  tree-sitter,
   tree-sitter-python,
   tree-sitter-sql,
+
+  # tests
+  pytest-asyncio,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "textual-textarea";
-  version = "0.15.0";
+  version = "0.17.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "textual-textarea";
     tag = "v${version}";
-    hash = "sha256-aaeXgD6RMQ3tlK5H/2lk3ueTyA3yYjHrYL51w/1tvSI=";
+    hash = "sha256-y+2WvqD96eYkDEJn5qCGfGFNiJFAcF4KWWNgAIZUqJo=";
   };
 
-  patches = [
-    # https://github.com/tconbeer/textual-textarea/issues/296
-    ./textual-2.0.0.diff
-  ];
-
-  pythonRelaxDeps = [
-    "textual"
-  ];
-
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     pyperclip
     textual
+    tree-sitter
+    tree-sitter-python
+    tree-sitter-sql
   ]
   ++ textual.optional-dependencies.syntax;
 
   nativeCheckInputs = [
-    pytestCheckHook
     pytest-asyncio
-    tree-sitter-python
-    tree-sitter-sql
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # AssertionError: assert None == 'word'
+    # https://github.com/tconbeer/textual-textarea/issues/312
+    "test_autocomplete"
+    "test_autocomplete_with_types"
   ];
 
   pythonImportsCheck = [ "textual_textarea" ];
 
-  disabledTests = [
-    # AssertionError: assert Selection(sta...), end=(0, 6)) == Selection(sta...), end=(1, 0))
-    # https://github.com/tconbeer/textual-textarea/issues/296
-    "test_keys"
-  ];
-
   meta = {
     description = "Text area (multi-line input) with syntax highlighting for Textual";
     homepage = "https://github.com/tconbeer/textual-textarea";
diff --git a/pkgs/development/python-modules/textual-textarea/textual-2.0.0.diff b/pkgs/development/python-modules/textual-textarea/textual-2.0.0.diff
deleted file mode 100644
index 205ce76033cb..000000000000
--- a/pkgs/development/python-modules/textual-textarea/textual-2.0.0.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/src/textual_textarea/autocomplete.py b/src/textual_textarea/autocomplete.py
-index 51fa81d..a64f9ab 100644
---- a/src/textual_textarea/autocomplete.py
-+++ b/src/textual_textarea/autocomplete.py
-@@ -13,7 +13,7 @@ from textual.message import Message
- from textual.reactive import Reactive, reactive
- from textual.widget import Widget
- from textual.widgets import OptionList
--from textual.widgets._option_list import NewOptionListContent
-+from textual.widgets._option_list import OptionListContent
- from textual.widgets.option_list import Option
- 
- from textual_textarea.messages import TextAreaHideCompletionList
-@@ -44,6 +44,8 @@ class CompletionList(OptionList, can_focus=False, inherit_bindings=False):
-         width: 40;
-         max-height: 8;
-         display: none;
-+        text-wrap: nowrap;
-+        text-overflow: ellipsis;
-     }
-     CompletionList.open {
-         display: block;
-@@ -71,14 +73,14 @@ class CompletionList(OptionList, can_focus=False, inherit_bindings=False):
- 
-     def __init__(
-         self,
--        *content: NewOptionListContent,
-+        *content: OptionListContent,
-         name: str | None = None,
-         id: str | None = None,  # noqa: A002
-         classes: str | None = None,
-         disabled: bool = False,
-     ):
-         super().__init__(
--            *content, name=name, id=id, classes=classes, disabled=disabled, wrap=False
-+            *content, name=name, id=id, classes=classes, disabled=disabled
-         )
- 
-     def set_offset(self, x_offset: int, y_offset: int) -> None:
-@@ -187,7 +189,7 @@ class CompletionList(OptionList, can_focus=False, inherit_bindings=False):
-                 self.y_offset,
-             )
- 
--        self.add_options(items=items)
-+        self.add_options(new_options=items)
-         self.action_first()
-         self.additional_x_offset = additional_x_offset
-         self.is_open = True
diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
index f4e69131d21f..bf2fa499974a 100644
--- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix
+++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/juftin/textual-universal-directorytree";
     changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 4dfe95cadb03..76856cedeb58 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -11,6 +11,7 @@
   platformdirs,
   rich,
   typing-extensions,
+  mdit-py-plugins,
 
   # optional-dependencies
   tree-sitter,
@@ -29,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "6.3.0";
+  version = "6.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-3KxSuyfczyulbpysAO8mF7wvzd+807Lj6l6g0TygBnI=";
+    hash = "sha256-Z9KevcicU+mt1XglYOdGWnMbRa1zpbts+0D2nwtgAac=";
   };
 
   build-system = [ poetry-core ];
@@ -46,6 +47,7 @@ buildPythonPackage rec {
   ];
   dependencies = [
     markdown-it-py
+    mdit-py-plugins
     platformdirs
     rich
     typing-extensions
diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix
index 7cb9052c2d02..2012e3f360a9 100644
--- a/pkgs/development/python-modules/tianshou/default.nix
+++ b/pkgs/development/python-modules/tianshou/default.nix
@@ -92,7 +92,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
 
     argparse = [
       docstring-parser
diff --git a/pkgs/development/python-modules/tidalapi/default.nix b/pkgs/development/python-modules/tidalapi/default.nix
index 1170912f82a1..f46ecc016488 100644
--- a/pkgs/development/python-modules/tidalapi/default.nix
+++ b/pkgs/development/python-modules/tidalapi/default.nix
@@ -9,17 +9,18 @@
   ratelimit,
   typing-extensions,
   mpegdash,
+  pyaes,
 }:
 buildPythonPackage rec {
   pname = "tidalapi";
-  version = "0.8.6";
+  version = "0.8.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EbbLabs";
     repo = "python-tidal";
     tag = "v${version}";
-    hash = "sha256-SsyO0bh2ayHfGzINBW1BTTPS/ICvIymIhQ1HUPRFOwU=";
+    hash = "sha256-+O+U8QZhaOdUgPONv1tb5ctiK8NmD2NJK0hokmNtUZM=";
   };
 
   build-system = [
@@ -33,6 +34,7 @@ buildPythonPackage rec {
     isodate
     ratelimit
     typing-extensions
+    pyaes
   ];
 
   doCheck = false; # tests require internet access
@@ -47,6 +49,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/tamland/python-tidal";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [
+      drafolin
       drawbu
       ryand56
     ];
diff --git a/pkgs/development/python-modules/tiledb/default.nix b/pkgs/development/python-modules/tiledb/default.nix
index 1f54da95db81..59998c238a29 100644
--- a/pkgs/development/python-modules/tiledb/default.nix
+++ b/pkgs/development/python-modules/tiledb/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "tiledb";
-  version = "0.35.0";
+  version = "0.35.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "TileDB-Inc";
     repo = "TileDB-Py";
     tag = version;
-    hash = "sha256-uxfF2uyGlO1Dfsrw0hxuU6LmymWXmuvOe+9DEY8BEdQ=";
+    hash = "sha256-X2hXm7aRICFoa2cjT0bvke+i9m5nSL+jX+aAUfiaP04=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix
index 0d5816150f96..15e879c0f5f4 100644
--- a/pkgs/development/python-modules/tilequant/default.nix
+++ b/pkgs/development/python-modules/tilequant/default.nix
@@ -1,13 +1,16 @@
 {
   lib,
   buildPythonPackage,
-  click,
-  fetchPypi,
-  ordered-set,
-  pillow,
-  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
   setuptools-dso,
+
+  # dependencies
+  click,
+  ordered-set,
+  pillow,
   sortedcollections,
 }:
 
@@ -16,19 +19,23 @@ buildPythonPackage rec {
   version = "1.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-0i7brL/hn8SOj3q/rpOcOQ9QW/4Mew2fr0Y42k4K9UI=";
+  src = fetchFromGitHub {
+    owner = "SkyTemple";
+    repo = "tilequant";
+    tag = version;
+    # Fetch tilequant source files
+    fetchSubmodules = true;
+    hash = "sha256-MgyKLwVdL2DRR8J88q7Q57rQiX4FTOlQ5rTY3UuhaJM=";
   };
 
-  pythonRelaxDeps = [ "pillow" ];
-
   build-system = [
     setuptools
+    setuptools-dso
   ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
   dependencies = [
     click
     ordered-set
@@ -41,12 +48,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "tilequant" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for quantizing image colors using tile-based palette restrictions";
     homepage = "https://github.com/SkyTemple/tilequant";
     changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ marius851000 ];
     mainProgram = "tilequant";
   };
 }
diff --git a/pkgs/development/python-modules/time-machine/default.nix b/pkgs/development/python-modules/time-machine/default.nix
index b7d5585e8617..0ac251fe8020 100644
--- a/pkgs/development/python-modules/time-machine/default.nix
+++ b/pkgs/development/python-modules/time-machine/default.nix
@@ -2,25 +2,22 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
-  pythonOlder,
   setuptools,
   python-dateutil,
+  tokenize-rt,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "time-machine";
-  version = "2.16.0";
+  version = "2.19.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "time-machine";
     tag = version;
-    hash = "sha256-xNoLtgON1dfKAgK0XhSMLHLsUr/nST3lepy15YWDEcE=";
+    hash = "sha256-bPpn+RNlvy/tkFrxDY4Q13fNlNuMFj1+br8M2uU3t9A=";
   };
 
   build-system = [ setuptools ];
@@ -29,9 +26,16 @@ buildPythonPackage rec {
     python-dateutil
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  optional-dependencies.cli = [
+    tokenize-rt
+  ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.9") [
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.cli;
+
+  disabledTests = [
     # https://github.com/adamchainz/time-machine/issues/405
     "test_destination_string_naive"
     # Assertion Errors related to Africa/Addis_Ababa
diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index a6d4f8636326..a820c4871d02 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "timm";
-  version = "1.0.20";
+  version = "1.0.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "pytorch-image-models";
     tag = "v${version}";
-    hash = "sha256-OdbhL7vDeNMCEROfEI37T162k5iQ02Qdcwr3aObVqPQ=";
+    hash = "sha256-ilOnC1tqSb4TuSGRafMNl8hi9P2qdsBWbv3G9azy6Gs=";
   };
 
   build-system = [ pdm-backend ];
diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix
index d666ea8b71e9..32e7e4b6ede1 100644
--- a/pkgs/development/python-modules/tinytuya/default.nix
+++ b/pkgs/development/python-modules/tinytuya/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "tinytuya";
-  version = "1.17.2";
+  version = "1.17.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "jasonacox";
     repo = "tinytuya";
     tag = "v${version}";
-    hash = "sha256-x6ZfpT3ucby95uthHX4KLLZNLWxyh6+ERDd5jb7p09g=";
+    hash = "sha256-ojwopholSQPND246PJMmEFSdzyXEZjAIgzpIRfS3VBw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 7933c994356a..233b2b2b0e4a 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   replaceVars,
   setuptools,
@@ -8,7 +9,6 @@
   tcl,
   tclPackages,
   tk,
-  tkinter,
   xvfb-run,
 }:
 
@@ -27,23 +27,28 @@ buildPythonPackage {
     cp -rv Modules/clinic ../tkinter/
     cp -rv Lib/tkinter ../tkinter/
 
-    pushd $NIX_BUILD_TOP/tkinter
-
     # install our custom pyproject.toml
     cp ${
       replaceVars ./pyproject.toml {
         python_version = python.version;
         python_internal_dir = "${python}/include/${python.libPrefix}/internal";
       }
-    } ./pyproject.toml
+    } $NIX_BUILD_TOP/tkinter/pyproject.toml
 
   ''
   + lib.optionalString (pythonOlder "3.13") ''
-    substituteInPlace "tkinter/tix.py" --replace-fail \
+    substituteInPlace "$NIX_BUILD_TOP/tkinter/tkinter/tix.py" --replace-fail \
       "os.environ.get('TIX_LIBRARY')" \
       "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
   '';
 
+  # Adapted from https://github.com/python/cpython/pull/124542
+  patches = lib.optional (pythonOlder "3.12") ./fix-ttk-notebook-test.patch;
+
+  preConfigure = ''
+    pushd $NIX_BUILD_TOP/tkinter
+  '';
+
   build-system = [ setuptools ];
 
   buildInputs = [
@@ -64,29 +69,46 @@ buildPythonPackage {
     ];
   };
 
-  doCheck = false;
-
-  nativeCheckInputs = [ xvfb-run ];
+  nativeCheckInputs = lib.optional stdenv.hostPlatform.isLinux xvfb-run;
 
   preCheck = ''
     cd $NIX_BUILD_TOP/Python-*/Lib
     export HOME=$TMPDIR
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
-      python -m unittest test.test_tkinter
-
-    runHook postCheck
-  '';
-
-  passthru.tests.unittests = tkinter.overridePythonAttrs { doCheck = true; };
+  checkPhase =
+    let
+      testsNoGui = [
+        "test.test_tcl"
+        "test.test_ttk_textonly"
+      ];
+      testsGui =
+        if pythonOlder "3.12" then
+          [
+            "test.test_tk"
+            "test.test_ttk_guionly"
+          ]
+        else
+          [
+            "test.test_tkinter"
+            "test.test_ttk"
+          ];
+    in
+    ''
+      runHook preCheck
+      ${python.interpreter} -m unittest ${lib.concatStringsSep " " testsNoGui}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
+        ${python.interpreter} -m unittest ${lib.concatStringsSep " " testsGui}
+    ''
+    + ''
+      runHook postCheck
+    '';
 
   pythonImportsCheck = [ "tkinter" ];
 
   meta = {
-    broken = pythonOlder "3.12"; # tommath.h: No such file or directory
     # Based on first sentence from https://docs.python.org/3/library/tkinter.html
     description = "Standard Python interface to the Tcl/Tk GUI toolkit";
     longDescription = ''
diff --git a/pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch b/pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch
new file mode 100644
index 000000000000..cf2ca0f7acdf
--- /dev/null
+++ b/pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch
@@ -0,0 +1,24 @@
+--- a/Lib/tkinter/test/test_ttk/test_widgets.py
++++ b/Lib/tkinter/test/test_ttk/test_widgets.py
+@@ -911,12 +911,20 @@ class ScrollbarTest(AbstractWidgetTest, unittest.TestCase):
+         return ttk.Scrollbar(self.root, **kwargs)
+ 
+ 
+-@add_standard_options(IntegerSizeTests, StandardTtkOptionsTests)
++@add_standard_options(StandardTtkOptionsTests)
+ class NotebookTest(AbstractWidgetTest, unittest.TestCase):
+     OPTIONS = (
+         'class', 'cursor', 'height', 'padding', 'style', 'takefocus', 'width',
+     )
+ 
++    def test_configure_height(self):
++        widget = self.create()
++        self.checkPixelsParam(widget, 'height', '10c', 402, -402, 0, conv=False)
++
++    def test_configure_width(self):
++        widget = self.create()
++        self.checkPixelsParam(widget, 'width', '10c', 402, -402, 0, conv=False)
++
+     def setUp(self):
+         super().setUp()
+         self.nb = self.create(padding=0)
diff --git a/pkgs/development/python-modules/tkinter/pyproject.toml b/pkgs/development/python-modules/tkinter/pyproject.toml
index 770331a7ef4f..a53ccd8c72a2 100644
--- a/pkgs/development/python-modules/tkinter/pyproject.toml
+++ b/pkgs/development/python-modules/tkinter/pyproject.toml
@@ -11,6 +11,5 @@ requires-python = ">=@python_version@"
 [tool.setuptools]
 packages = ["tkinter"]
 ext-modules = [
-  { name = "_tkinter", sources = ["_tkinter.c"], libraries = ["tcl9.0", "tcl9tk9.0"], include-dirs = ["@python_internal_dir@/"] }
+  { name = "_tkinter", sources = ["_tkinter.c"], libraries = ["tcl", "tk"], include-dirs = ["@python_internal_dir@/"] }
 ]
-
diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index c07b7d8d6a91..51e7cfc95063 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2025082700";
+  version = "2025102200";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     tag = version;
-    hash = "sha256-sMK+jglwhF8FX8yLDHBtheudfg20MOJhk+zHznQ0hbk=";
+    hash = "sha256-rulYXgVjzPcb5cBi57u4uzR6KDCp+NUaUMzi1o/SrN4=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 7d1b79bb12d5..47b4c3e35439 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "toggl-cli";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AuHau";
     repo = "toggl-cli";
     tag = "v${version}";
-    hash = "sha256-d/0w6VCth1TszolqkaWxHs6SLNiRg3sZj3H4CY+yPdw=";
+    hash = "sha256-f3s0XlhQZH9xC5xyM+e2VG9j1GK0qqWFm4Xy08Iwj/Q=";
   };
 
   env.PBR_VERSION = version;
diff --git a/pkgs/development/python-modules/torch-audiomentations/default.nix b/pkgs/development/python-modules/torch-audiomentations/default.nix
index cee42c5024a6..280b632821fc 100644
--- a/pkgs/development/python-modules/torch-audiomentations/default.nix
+++ b/pkgs/development/python-modules/torch-audiomentations/default.nix
@@ -2,15 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   julius,
   librosa,
+  torch,
+  torch-pitch-shift,
+  torchaudio,
+
+  # tests
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
-  setuptools,
-  torch-pitch-shift,
-  torch,
-  torchaudio,
 }:
 
 buildPythonPackage rec {
@@ -18,8 +23,6 @@ buildPythonPackage rec {
   version = "0.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "asteroid-team";
     repo = "torch-audiomentations";
@@ -35,8 +38,8 @@ buildPythonPackage rec {
     julius
     librosa
     torch
-    torchaudio
     torch-pitch-shift
+    torchaudio
   ];
 
   nativeCheckInputs = [
@@ -54,13 +57,25 @@ buildPythonPackage rec {
     "tests/test_background_noise.py"
   ];
 
-  disabledTests = [ "test_transform_is_differentiable" ];
+  disabledTests = [
+    # AttributeError: module 'torchaudio' has no attribute 'info'
+    # Removed in torchaudio v2.9.0
+    # See https://github.com/pytorch/audio/issues/3902 for context
+    # Reported to torch-audiomentations: https://github.com/iver56/torch-audiomentations/issues/184
+    "test_background_noise_no_guarantee_with_empty_tensor"
+    "test_colored_noise_guaranteed_with_batched_tensor"
+    "test_colored_noise_guaranteed_with_single_tensor"
+    "test_colored_noise_guaranteed_with_zero_length_samples"
+    "test_colored_noise_no_guarantee_with_single_tensor"
+    "test_same_min_max_f_decay"
+    "test_transform_is_differentiable"
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Fast audio data augmentation in PyTorch";
     homepage = "https://github.com/asteroid-team/torch-audiomentations";
     changelog = "https://github.com/asteroid-team/torch-audiomentations/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthewcroughan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
   };
 }
diff --git a/pkgs/development/python-modules/torch-geometric/default.nix b/pkgs/development/python-modules/torch-geometric/default.nix
index 35e96a4ca46d..18800e8304b9 100644
--- a/pkgs/development/python-modules/torch-geometric/default.nix
+++ b/pkgs/development/python-modules/torch-geometric/default.nix
@@ -246,6 +246,10 @@ buildPythonPackage rec {
 
     # RuntimeError: Boolean value of Tensor with more than one value is ambiguous
     "test_feature_store"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # NotImplementedError: The operator 'aten::logspace.out' is not currently implemented for the MPS device.
+    "test_positional_encoding"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
index 8001f6822c03..7004610a6ce2 100644
--- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.8.0" = {
-    x86_64-linux-39 = {
-      name = "torch-2.8.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-uTV6h1laPXsqVlumArlzkqN8VvC4VpjwzPCixY++9ew=";
-    };
+  "2.9.0" = {
     x86_64-linux-310 = {
-      name = "torch-2.8.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-DJaZnRXPHxPdfJE+CyGpo1VTjmz8EIYaFxWDICkvWVQ=";
+      name = "torch-2.9.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-gWVAKG/OJFqK85BKGUqDr5ySkq10Uut5Fgt6Oxzvt+M=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.8.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-A5udzda9uqEKilzWviLEyz41iaNB5fkEy7Vxyij1W+0=";
+      name = "torch-2.9.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-6XwmRHjJ/Ej5GDJ0nZYPHjSa6yFCJOvmX7CUNd1kxZo=";
     };
     x86_64-linux-312 = {
-      name = "torch-2.8.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-Q1T8Bbt5sgjWmVoEyhzu9qlUexxDNENVdDU9OBxVCHw=";
+      name = "torch-2.9.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-h8YtO5XxoicL0Rbb1H3FFcCyA1B2+7SgO0Nl6iieicQ=";
     };
     x86_64-linux-313 = {
-      name = "torch-2.8.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-OoUjaaON7DQ9RezQvDZg95uIoj4Mh40YcH98E79JU48=";
+      name = "torch-2.9.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-l97wCH+O8XG5AC6lALr/3UQMe91VnCPDi7+HgbZ+k2Q=";
     };
-    aarch64-darwin-39 = {
-      name = "torch-2.8.0-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-a+wfJAlodJ4ju7fqj2YXoI/D2xtMdmtczq34ootBl9k=";
+    x86_64-linux-314 = {
+      name = "torch-2.9.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-VaIYTtifISC8HiyIfumOUoDe5IvDMOnf4paqE1o3D30=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.8.0-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-pGe0n+iTpqbM6J467lVu39xkpyLXGV/f3XXOyd6hN3k=";
+      name = "torch-2.9.0-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp310-none-macosx_11_0_arm64.whl";
+      hash = "sha256-WUhBk7ASmb9mlSBQWnKynVmgAorkxtlfSSk48YZZIgg=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.8.0-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-PQUBfRm8mXQSiORYiIKDpEsO6IHVPwX3L4sc/qiZgSI=";
+      name = "torch-2.9.0-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp311-none-macosx_11_0_arm64.whl";
+      hash = "sha256-qkSDYCWGzJo10c8zdxqZd/BfZCuRYVGKKJ42VIoLd8I=";
     };
     aarch64-darwin-312 = {
-      name = "torch-2.8.0-cp312-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp312-none-macosx_11_0_arm64.whl";
-      hash = "sha256-pHt5hr7j9hrSF9ioziRgWAmrQluvNJ+X3nWIFe3S71Q=";
+      name = "torch-2.9.0-cp312-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp312-none-macosx_11_0_arm64.whl";
+      hash = "sha256-TeDtjLxFelBtvKQDduIGop7+4QdWoA8fNAS/Z61zfQQ=";
     };
     aarch64-darwin-313 = {
-      name = "torch-2.8.0-cp313-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp313-none-macosx_11_0_arm64.whl";
-      hash = "sha256-BX79MKZ3jS7l4jdM1jpj9jMRqm8zMh5ifGVd9gq905A=";
+      name = "torch-2.9.0-cp313-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp313-none-macosx_11_0_arm64.whl";
+      hash = "sha256-4kg22Wi1TvTfsFWUABphlYcRrJIkAmKR5OP5L4Om/X8=";
     };
-    aarch64-linux-39 = {
-      name = "torch-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-6si371x8oQba7F6CnfqMpWykdgHbE7QC0mCIYa06uSY=";
+    aarch64-darwin-314 = {
+      name = "torch-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-2OKrf4YBAzC9zDnIsseVWQzHXjffSCPNruLJjW4/9KM=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-shSYWLg0Cu6x8wVuC/9bgrluQ7WW/kmp26MYRSImEhM=";
+      name = "torch-2.9.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-siR5LqVntSx/HOHXiVZ/aSDgb9OzOfoeGwWUiEX3g60=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-aAEp797uw9tdo/iO5dKMGx4QO3dK70D51jjizOj42Ng=";
+      name = "torch-2.9.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-2nc0HMq6MXYtkjiwlCwWXEWComgY8wRbBSs5zr3XrZ0=";
     };
     aarch64-linux-312 = {
-      name = "torch-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-YQ9gDBAjhuWBMn1e/BjA1u3suYILQUDSYWM1SpnNgA0=";
+      name = "torch-2.9.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-OmUUNK4SSLBWjBK1+eOsyJQusoN42dBKeTApOLaMbyQ=";
     };
     aarch64-linux-313 = {
-      name = "torch-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-pQZLXiN3LI0WQGjMfBLgGnX697lI7NlaDUAH10h+XyU=";
+      name = "torch-2.9.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-vkQ42NrX8NWl5U8P7viok0RolOyH8QK7HYLcxFGFQuQ=";
+    };
+    aarch64-linux-314 = {
+      name = "torch-2.9.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-RKrbc1d01KmVJdLsKRJrIwFsRKB7As5sI336YaIj3VI=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index eb03276cf909..ace16c5c8c5d 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -34,7 +34,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.8.0";
+  version = "2.9.0";
 in
 buildPythonPackage {
   inherit version;
@@ -44,7 +44,7 @@ buildPythonPackage {
 
   format = "wheel";
 
-  disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
+  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
@@ -65,13 +65,14 @@ buildPythonPackage {
       cuda_cupti
       cuda_nvrtc
       cudnn
-      cusparselt
       libcublas
       libcufft
       libcufile
       libcurand
       libcusolver
       libcusparse
+      libcusparse_lt
+      libnvshmem
       nccl
     ]
   );
diff --git a/pkgs/development/python-modules/torch/bin/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh
index bfb942c2cad2..354d28362a90 100755
--- a/pkgs/development/python-modules/torch/bin/prefetch.sh
+++ b/pkgs/development/python-modules/torch/bin/prefetch.sh
@@ -11,21 +11,21 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-    "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-manylinux_2_28_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
     "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
     "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl"
     "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl"
     "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl"
-    "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
+    "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl"
     "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
     "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
     "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl"
     "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl"
-    "aarch64-linux-39 $linux_cpu_bucket/torch-${version}%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_28_aarch64.whl"
+    "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_11_0_arm64.whl torch-${version}-cp314-cp314-macosx_11_0_arm64.whl"
     "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl"
     "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl"
     "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl"
     "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl"
+    "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 61caaf420b57..ca68bef65045 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -24,7 +24,7 @@
   magma-hip,
   magma-cuda-static,
   # Use the system NCCL as long as we're targeting CUDA on a supported platform.
-  useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported || rocmSupport),
+  useSystemNccl ? (cudaSupport && cudaPackages.nccl.meta.available || rocmSupport),
   MPISupport ? false,
   mpi,
   buildDocs ? false,
@@ -42,7 +42,6 @@
   removeReferencesTo,
 
   # Build inputs
-  apple-sdk_13,
   openssl,
   numactl,
   llvmPackages,
@@ -275,14 +274,16 @@ let
 
   stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
 in
-buildPythonPackage rec {
+let
+  # From here on, `stdenv` shall be `stdenv'`.
+  stdenv = stdenv';
+in
+buildPythonPackage.override { inherit stdenv; } rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
-  stdenv = stdenv';
-
   outputs = [
     "out" # output standard python package
     "dev" # output libtorch headers
@@ -302,19 +303,6 @@ buildPythonPackage rec {
 
   patches = [
     ./clang19-template-warning.patch
-
-    # Do not override PYTHONPATH, otherwise, the build fails with:
-    # ModuleNotFoundError: No module named 'typing_extensions'
-    (fetchpatch {
-      name = "cmake-build-preserve-PYTHONPATH";
-      url = "https://github.com/pytorch/pytorch/commit/231c72240d80091f099c95e326d3600cba866eee.patch";
-      hash = "sha256-BBCjxzz2TUkx4nXRyRILA82kMwyb/4+C3eOtYqf5dhk=";
-    })
-
-    # Fixes GCC-14 compatibility on ARM
-    # Adapted from https://github.com/pytorch/pytorch/pull/157867
-    # TODO: remove at the next release
-    ./gcc-14-arm-compat.path
   ]
   ++ lib.optionals cudaSupport [
     ./fix-cmake-cuda-toolkit.patch
@@ -334,7 +322,7 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=62.3.0,<80.0" "setuptools"
+      --replace-fail "setuptools>=70.1.0,<80.0" "setuptools"
   ''
   # Provide path to openssl binary for inductor code cache hash
   # InductorError: FileNotFoundError: [Errno 2] No such file or directory: 'openssl'
@@ -532,6 +520,9 @@ buildPythonPackage rec {
   }
   // lib.optionalAttrs rocmSupport {
     AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
+    # Broken HIP flag setup, fails to compile due to not finding rocthrust
+    # Only supports gfx942 so let's turn it off for now
+    USE_FBGEMM_GENAI = setBool false;
   };
 
   nativeBuildInputs = [
@@ -569,18 +560,19 @@ buildPythonPackage rec {
       cuda_nvml_dev # <nvml.h>
       cuda_nvrtc
       cuda_nvtx # -llibNVToolsExt
-      cusparselt
       libcublas
       libcufft
       libcufile
       libcurand
       libcusolver
       libcusparse
+      libcusparse_lt
     ]
     ++ lists.optionals (cudaPackages ? cudnn) [ cudnn ]
     ++ lists.optionals useSystemNccl [
       # Some platforms do not support NCCL (i.e., Jetson)
-      nccl # Provides nccl.h AND a static copy of NCCL!
+      (lib.getDev nccl) # Provides nccl.h
+      (lib.getOutput "static" nccl) # Provides static library
     ]
     ++ [
       cuda_profiler_api # <cuda_profiler_api.h>
@@ -589,9 +581,6 @@ buildPythonPackage rec {
   ++ lib.optionals rocmSupport [ rocmPackages.llvm.openmp ]
   ++ lib.optionals (cudaSupport || rocmSupport) [ effectiveMagma ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ numactl ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_13
-  ]
   ++ lib.optionals tritonSupport [ _tritonEffective ]
   ++ lib.optionals MPISupport [ mpi ]
   ++ lib.optionals rocmSupport [
@@ -770,6 +759,7 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       GaetanLepage
+      LunNova # esp. for ROCm
       teh
       thoughtpolice
       tscholak
diff --git a/pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path b/pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path
deleted file mode 100644
index 4b411e83a9d1..000000000000
--- a/pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h b/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
-index 7f05c2ad166..1632b595c4c 100644
---- a/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
-+++ b/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
-@@ -220,8 +220,12 @@ class Vectorized<BFloat16> {
-   Vectorized<BFloat16> le(const Vectorized<BFloat16>& other) const;
- };
-
--inline std::tuple<Vectorized<float>, Vectorized<float>> convert_bfloat16_float(
--    const Vectorized<c10::BFloat16>& a) {
-+#if defined(__GNUC__) && __GNUC__ == 14
-+// Workaround for gcc-14.2.0 ICE during RTL pass: vregs when compiling for SVE
-+__attribute__((optimize("no-tree-vectorize")))
-+#endif
-+inline std::tuple<Vectorized<float>, Vectorized<float>>
-+convert_bfloat16_float(const Vectorized<c10::BFloat16>& a) {
-   static_assert(
-       Vectorized<c10::BFloat16>::size() == 2 * Vectorized<float>::size());
-   auto zero = svreinterpret_bf16_f32(svdup_n_f32(0.0f));
-diff --git a/aten/src/ATen/native/cpu/Activation.cpp b/aten/src/ATen/native/cpu/Activation.cpp
-index 52d5383e60f..00c9f4eb253 100644
---- a/aten/src/ATen/native/cpu/Activation.cpp
-+++ b/aten/src/ATen/native/cpu/Activation.cpp
-@@ -26,6 +26,10 @@ namespace at::native {
-
- namespace {
-
-+#if defined(__GNUC__) && __GNUC__ == 14 && defined(__aarch64__) && !defined(__ARM_FEATURE_SVE)
-+// Workaround for gcc-14.2.0 ICE during RTL pass: expand when compiling for NEON
-+__attribute__((optimize("no-tree-vectorize")))
-+#endif
- static void log_sigmoid_cpu_kernel(TensorBase &output, TensorBase &buffer, const TensorBase &input) {
-   if (at::isReducedFloatingType(input.scalar_type())) {
-     AT_DISPATCH_REDUCED_FLOATING_TYPES(input.scalar_type(), "log_sigmoid_cpu", [&]() {
-diff --git a/aten/src/ATen/native/cpu/Unfold2d.cpp b/aten/src/ATen/native/cpu/Unfold2d.cpp
-index 8ef0741e77a..8c94decfff0 100644
---- a/aten/src/ATen/native/cpu/Unfold2d.cpp
-+++ b/aten/src/ATen/native/cpu/Unfold2d.cpp
-@@ -169,6 +169,10 @@ static void unfolded2d_acc_channels_last(
-
- /* note: due to write issues, this one cannot be parallelized as well as
-  * unfolded2d_copy */
-+#if defined(__GNUC__) && __GNUC__ == 14 && defined(__ARM_FEATURE_SVE) && !defined(__ARM_FEATURE_BF16)
-+// Workaround for gcc-14.2.0 ICE during RTL pass: vregs when compiling for SVE without BF16
-+__attribute__((optimize("no-tree-vectorize")))
-+#endif
- void unfolded2d_acc_kernel(
-     ScalarType dtype,
-     void *finput_data,
diff --git a/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch b/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch
index cabbc484ac76..185f4c6b529f 100644
--- a/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch
+++ b/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch
@@ -1,26 +1,23 @@
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index a93386c27f8..7c6b98006bf 100644
+index ef5c2fd4e97..6591296b704 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
-@@ -967,7 +967,7 @@ endif()
-
+@@ -952,15 +952,16 @@ endif()
+ 
  # ---[ nvtx
  if(USE_SYSTEM_NVTX)
 -  find_path(nvtx3_dir NAMES nvtx3 PATHS ${CUDA_INCLUDE_DIRS})
 +  find_path(nvtx3_dir NAMES nvtx3/nvtx3.hpp PATHS ${CUDA_INCLUDE_DIRS})
-   find_package_handle_standard_args(nvtx3 DEFAULT_MSG nvtx3_dir)
-   if(NOT nvtx3_FOUND)
-     message(WARNING "Cannot find system NVTX3, find shipped NVTX3 instead")
-@@ -977,9 +977,10 @@ if(NOT TARGET CUDA::nvtx3)
-   add_library(CUDA::nvtx3 INTERFACE IMPORTED)
- endif()
- if(NOT nvtx3_dir)
+ else()
 -  find_path(nvtx3_dir NAMES nvtx3 PATHS "${PROJECT_SOURCE_DIR}/third_party/NVTX/c/include" NO_DEFAULT_PATH)
--  target_include_directories(CUDA::nvtx3 INTERFACE "${nvtx3_dir}")
 +  find_path(nvtx3_dir NAMES nvtx3/nvtx3.hpp PATHS "${PROJECT_SOURCE_DIR}/third_party/NVTX/c/include" NO_DEFAULT_PATH)
  endif()
-+target_include_directories(CUDA::nvtx3 INTERFACE "${nvtx3_dir}")
-+message(STATUS "Using NVTX3 include directory: ${nvtx3_dir}")
-
-
- # ---[ HIP
+ find_package_handle_standard_args(nvtx3 DEFAULT_MSG nvtx3_dir)
+ if(nvtx3_FOUND)
+   add_library(torch::nvtx3 INTERFACE IMPORTED)
+   target_include_directories(torch::nvtx3 INTERFACE "${nvtx3_dir}")
+   target_compile_definitions(torch::nvtx3 INTERFACE TORCH_CUDA_USE_NVTX3)
++  message(STATUS "Using NVTX3 include directory: ${nvtx3_dir}")
+ else()
+   message(WARNING "Cannot find NVTX3, find old NVTX instead")
+   add_library(torch::nvtoolsext INTERFACE IMPORTED)
diff --git a/pkgs/development/python-modules/torch/source/src.nix b/pkgs/development/python-modules/torch/source/src.nix
index 99d3d5561004..3bae6c20b22b 100644
--- a/pkgs/development/python-modules/torch/source/src.nix
+++ b/pkgs/development/python-modules/torch/source/src.nix
@@ -4,13 +4,19 @@
   fetchFromGitHub,
   runCommand,
 }:
-assert version == "2.8.0";
+assert version == "2.9.0";
 rec {
+  src_aiter = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "aiter";
+    rev = "01aae101b9e5e94d6c16a9514c9fb8df99c93150";
+    hash = "sha256-rJwKTzUi066ZRroK7eFsOPmNRRRq7VMQz0Xw7qcgtNo=";
+  };
   src_asmjit = fetchFromGitHub {
     owner = "asmjit";
     repo = "asmjit";
-    rev = "e5d7c0bd5d9aec44d68830187138149e6a8c4e32";
-    hash = "sha256-sI0/9szBMvopQAmVcZSU4D/oaZYdb08AHDSZKy/Qz1g=";
+    rev = "a3199e8857792cd10b7589ff5d58343d2c9008ea";
+    hash = "sha256-qb0lM1N1FIvoADNsZZdlg8HAheePv/LvSDvRhOAqZc0=";
   };
   src_benchmark = fetchFromGitHub {
     owner = "google";
@@ -45,14 +51,20 @@ rec {
   src_composable_kernel = fetchFromGitHub {
     owner = "ROCm";
     repo = "composable_kernel";
-    rev = "8086bbe3a78d931eb96fe12fdc014082e18d18d3";
-    hash = "sha256-fyL1SzRs5CXW5CWy6kCN1y1xX6cG+ur7iQlbKX2zbCM=";
+    rev = "7fe50dc3da2069d6645d9deb8c017a876472a977";
+    hash = "sha256-OxA0ekcaRxAmBFlXkvS7XAX40kcWCwyytHWV6vROWjo=";
+  };
+  src_composable_kernel_aiter = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "composable_kernel";
+    rev = "cffe8fa2a442ac8e80dd236a1a5d24fe3d7e0cbf";
+    hash = "sha256-KDmSs9NDFYbyE4wzBedVDBZGhI1BAoJHWOStFkuEk9U=";
   };
   src_composable_kernel_fbgemm = fetchFromGitHub {
     owner = "jwfromm";
     repo = "composable_kernel";
-    rev = "4a61bdd4bd4ed730e078aebc7c0fcf046ff29406";
-    hash = "sha256-CxcpvW4QxkUDB2zMz7NB6Rt9jXjJeGVExfrYbn9ef5I=";
+    rev = "b1281b8b08d973a7064f864f47eeb30f3e2596e9";
+    hash = "sha256-ZWfTZ9UxnIpkoRnTmB5e3H/LY5a2HixkCCIMcnpc+Gw=";
   };
   src_composable_kernel_flash-attention = fetchFromGitHub {
     owner = "ROCm";
@@ -63,8 +75,8 @@ rec {
   src_cpp-httplib = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
-    rev = "3af7f2c16147f3fbc6e4d717032daf505dc1652c";
-    hash = "sha256-t/ddZjKelnXQdXQvZgv9pQcJt3M2rwgbtTQNW/T6Gpk=";
+    rev = "89c932f313c6437c38f2982869beacc89c2f2246";
+    hash = "sha256-+VPebnFMGNyChM20q4Z+kVOyI/qDLQjRsaGS0vo8kDM=";
   };
   src_cpr = fetchFromGitHub {
     owner = "libcpr";
@@ -87,20 +99,20 @@ rec {
   src_cudnn-frontend = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cudnn-frontend";
-    rev = "666996fe3960f27170d1527e5579ba24c8d3380a";
-    hash = "sha256-/ae5dNjqkn5dGciGSO+Pn9pzJg+hHWqqQCPcqggWezo=";
+    rev = "f937055efc6d414d11f4c6577e3977fe74f35fb6";
+    hash = "sha256-LiTajW2hrDth8wEC4Vp2lZO+CeMqK+tEKPLok7gXB/s=";
   };
   src_cutlass = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
-    rev = "ad7b2f5e84fcfa124cb02b91d5bd26d238c0459e";
-    hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
+    rev = "e51efbfe18fe4f4cbb66ab814c55bf4aa0185491";
+    hash = "sha256-ZY+6Tg/CC6fqvU764k6QNudYDpY+s8OQklG+1aXQuns=";
   };
   src_cutlass_fbgemm = fetchFromGitHub {
     owner = "jwfromm";
     repo = "cutlass";
-    rev = "3ed8d2ec4ba35ef5d9d8353826209b6f868f63d3";
-    hash = "sha256-NntohGvqs6fbWusi2Qv5uzCJhMAfBv8qYoFi38D+mzk=";
+    rev = "311f3c8e51dc0eb56310cfc6980bf63d0fbd7917";
+    hash = "sha256-JSr48FkrYE9mvm1+ikrqUxrYuV4Bok2EOdcyeTsMdiA=";
   };
   src_cutlass_flash-attention = fetchFromGitHub {
     owner = "NVIDIA";
@@ -123,8 +135,8 @@ rec {
   src_fbgemm = fetchFromGitHub {
     owner = "pytorch";
     repo = "fbgemm";
-    rev = "157e88b750c452bef2ab4653fe9d1eeb151ce4c3";
-    hash = "sha256-Ka8/4gBsbtKNhKM/cWg1NmlKjVeBZvS+yS9SQQxb34A=";
+    rev = "4b39c551efe15e6bbade20565b0ceb2d8ce3352d";
+    hash = "sha256-a7oNR2RMQWiaX9jLAy5Y4aniByqj7f9g65snOjPPwK0=";
   };
   src_fbjni = fetchFromGitHub {
     owner = "facebookincubator";
@@ -201,8 +213,8 @@ rec {
   src_gloo = fetchFromGitHub {
     owner = "pytorch";
     repo = "gloo";
-    rev = "c7b7b022c124d9643957d9bd55f57ac59fce8fa2";
-    hash = "sha256-pZ08gs6wQTZNVDX9uuaQZvw5JKCps8EALegNF0UVV3c=";
+    rev = "54cbae0d3a67fa890b4c3d9ee162b7860315e341";
+    hash = "sha256-4g/AffVyU7iEHJI0KRkvJqeHSBMRB89V4/cfVf3yPf4=";
   };
   src_googletest = fetchFromGitHub {
     owner = "google";
@@ -216,12 +228,6 @@ rec {
     rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850";
     hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM=";
   };
-  src_googletest_fbgemm = fetchFromGitHub {
-    owner = "google";
-    repo = "googletest";
-    rev = "f8d7d77c06936315286eb55f8de22cd23c188571";
-    hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U=";
-  };
   src_googletest_kineto = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
@@ -261,8 +267,8 @@ rec {
   src_hipify_torch = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
     repo = "hipify_torch";
-    rev = "a4337c69fe0e2552a7b7b0669178926beeed828c";
-    hash = "sha256-B0+tDjSlZ9C5IAAgteRIgwaJNnptpp1jOP3hTF5AdOw=";
+    rev = "63b6a7b541fa7f08f8475ca7d74054db36ff2691";
+    hash = "sha256-TH9fyprP21sRsxGs4VrahhFSIXDhnLvV09c+ZCE27u0=";
   };
   src_ideep = fetchFromGitHub {
     owner = "intel";
@@ -321,14 +327,14 @@ rec {
   src_libuv = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
-    rev = "1dff88e5161cba5c59276d2070d2e304e4dcb242";
-    hash = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI=";
+    rev = "5152db2cbfeb5582e9c27c5ea1dba2cd9e10759b";
+    hash = "sha256-ayTk3qkeeAjrGj5ab7wF7vpWI8XWS1EeKKUqzaD/LY0=";
   };
   src_mimalloc = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
-    rev = "94036de6fe20bfd8a73d4a6d142fcf532ea604d9";
-    hash = "sha256-B0gngv16WFLBtrtG5NqA2m5e95bYVcQraeITcOX9A74=";
+    rev = "fbd8b99c2b828428947d70fdc046bb55609be93e";
+    hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
   };
   src_mkl-dnn = fetchFromGitHub {
     owner = "intel";
@@ -415,6 +421,12 @@ rec {
     hash = "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=";
   };
   src_pybind11 = fetchFromGitHub {
+    owner = "pybind";
+    repo = "pybind11";
+    rev = "f5fbe867d2d26e4a0a9177a51f6e568868ad3dc8";
+    hash = "sha256-ZiwNGsE1FOkhnWv/1ib1akhQ4FZvrXRCDnnBZoPp6r4=";
+  };
+  src_pybind11_onnx = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
     rev = "a2e59f0e7065404b44dfe92a28aca47ba1378dc4";
@@ -429,8 +441,8 @@ rec {
   src_pytorch = fetchFromGitHub {
     owner = "pytorch";
     repo = "pytorch";
-    rev = "v2.8.0";
-    hash = "sha256-tFEpcgj0HiJcyBiZMtIrBrnmiCJApfTC1BgOXEGvqCo=";
+    rev = "v2.9.0";
+    hash = "sha256-0NdREKn9h3FtHKVe1Z3QtSOVdEcfgLlWXG/OiI+QrwA=";
   };
   src_sleef = fetchFromGitHub {
     owner = "shibatch";
@@ -441,8 +453,8 @@ rec {
   src_tensorpipe = fetchFromGitHub {
     owner = "pytorch";
     repo = "tensorpipe";
-    rev = "52791a2fd214b2a9dc5759d36725909c1daa7f2e";
-    hash = "sha256-i+CtjNFPDUzFCPxP0//jMLJDrQoorg0On9NfoVaMUxI=";
+    rev = "af0118d13e52f5a08841464a768e01a0bf3e3075";
+    hash = "sha256-X2YfYfDKxG0i2K8Uf7gpSb+LU2y0d4VBZM3lTa/ff1w=";
   };
   src_vcpkg = fetchFromGitHub {
     owner = "Microsoft";
@@ -462,6 +474,11 @@ rec {
     rev = "51a0103656eff6fc9bfd39a4597923c4b542c883";
     hash = "sha256-nhowllqv/hBs7xHdTwbWtiKJ1mvAYsVIyIZ35ZGsmkg=";
   };
+  src_aiter_recursive = runCommand "aiter" { } ''
+    cp -r ${src_aiter} $out
+    chmod u+w $out/3rdparty/composable_kernel
+    cp -r ${src_composable_kernel_aiter_recursive}/* $out/3rdparty/composable_kernel
+  '';
   src_asmjit_recursive = src_asmjit;
   src_benchmark_recursive = src_benchmark;
   src_benchmark_opentelemetry-cpp_recursive = src_benchmark_opentelemetry-cpp;
@@ -469,6 +486,7 @@ rec {
   src_civetweb_recursive = src_civetweb;
   src_clang-cindex-python3_recursive = src_clang-cindex-python3;
   src_composable_kernel_recursive = src_composable_kernel;
+  src_composable_kernel_aiter_recursive = src_composable_kernel_aiter;
   src_composable_kernel_fbgemm_recursive = src_composable_kernel_fbgemm;
   src_composable_kernel_flash-attention_recursive = src_composable_kernel_flash-attention;
   src_cpp-httplib_recursive = src_cpp-httplib;
@@ -510,7 +528,7 @@ rec {
     chmod u+w $out/external/cutlass
     cp -r ${src_cutlass_fbgemm_recursive}/* $out/external/cutlass
     chmod u+w $out/external/googletest
-    cp -r ${src_googletest_fbgemm_recursive}/* $out/external/googletest
+    cp -r ${src_googletest_recursive}/* $out/external/googletest
     chmod u+w $out/external/hipify_torch
     cp -r ${src_hipify_torch_recursive}/* $out/external/hipify_torch
     chmod u+w $out/external/json
@@ -541,7 +559,6 @@ rec {
   src_gloo_recursive = src_gloo;
   src_googletest_recursive = src_googletest;
   src_googletest_dynolog_recursive = src_googletest_dynolog;
-  src_googletest_fbgemm_recursive = src_googletest_fbgemm;
   src_googletest_kineto_recursive = src_googletest_kineto;
   src_googletest_opentelemetry-cpp_recursive = src_googletest_opentelemetry-cpp;
   src_googletest_prometheus-cpp_recursive = src_googletest_prometheus-cpp;
@@ -578,7 +595,7 @@ rec {
   src_onnx_recursive = runCommand "onnx" { } ''
     cp -r ${src_onnx} $out
     chmod u+w $out/third_party/pybind11
-    cp -r ${src_pybind11_recursive}/* $out/third_party/pybind11
+    cp -r ${src_pybind11_onnx_recursive}/* $out/third_party/pybind11
   '';
   src_opentelemetry-cpp_recursive = runCommand "opentelemetry-cpp" { } ''
     cp -r ${src_opentelemetry-cpp} $out
@@ -621,6 +638,7 @@ rec {
   src_psimd_recursive = src_psimd;
   src_pthreadpool_recursive = src_pthreadpool;
   src_pybind11_recursive = src_pybind11;
+  src_pybind11_onnx_recursive = src_pybind11_onnx;
   src_pybind11_tensorpipe_recursive = runCommand "pybind11_tensorpipe" { } ''
     cp -r ${src_pybind11_tensorpipe} $out
     chmod u+w $out/tools/clang
@@ -630,6 +648,8 @@ rec {
     cp -r ${src_pytorch} $out
     chmod u+w $out/android/libs/fbjni
     cp -r ${src_fbjni_recursive}/* $out/android/libs/fbjni
+    chmod u+w $out/third_party/aiter
+    cp -r ${src_aiter_recursive}/* $out/third_party/aiter
     chmod u+w $out/third_party/benchmark
     cp -r ${src_benchmark_recursive}/* $out/third_party/benchmark
     chmod u+w $out/third_party/composable_kernel
diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix
index 5c301da0ffba..e2a21306f432 100644
--- a/pkgs/development/python-modules/torchao/default.nix
+++ b/pkgs/development/python-modules/torchao/default.nix
@@ -3,10 +3,18 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  replaceVars,
 
   # build-system
   setuptools,
 
+  # nativeBuildInputs
+  cmake,
+
+  # buildInputs
+  cpuinfo,
+  llvmPackages,
+
   # dependencies
   torch,
 
@@ -24,20 +32,43 @@
 
 buildPythonPackage rec {
   pname = "ao";
-  version = "0.13.0";
+  version = "0.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "ao";
     tag = "v${version}";
-    hash = "sha256-R9H4+KkKuOzsunM3A5LT8upH1TfkHrD+BZerToCHwjo=";
+    hash = "sha256-L9Eoul7Nar/+gS44+hA8JbfxCgkMH5xAMCleggAZn7c=";
   };
 
+  patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    ./use-system-cpuinfo.patch
+    (replaceVars ./use-llvm-openmp.patch {
+      inherit (llvmPackages) openmp;
+    })
+  ];
+
   build-system = [
     setuptools
   ];
 
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    cmake
+  ];
+  dontUseCmakeConfigure = true;
+
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    cpuinfo
+  ];
+
+  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Otherwise, torch will fail to include `omp.h`:
+    # torch._inductor.exc.InductorError: CppCompileError: C++ compile error
+    # OpenMP support not found.
+    llvmPackages.openmp
+  ];
+
   dependencies = [
     torch
   ];
@@ -73,6 +104,52 @@ buildPythonPackage rec {
 
     # FileNotFoundError: [Errno 2] No such file or directory: 'checkpoints/meta-llama/Llama-2-7b-chat-hf/model.pth'
     "test_gptq_mt"
+
+    # KeyError: '_guards_fn
+    "test_add"
+    "test_add_relu"
+    "test_allow_exported_model_train_eval"
+    "test_allow_exported_model_train_eval_idempotent"
+    "test_conv2d"
+    "test_disallow_eval_train"
+    "test_dynamic_linear"
+    "test_fold_bn_erases_bn_node"
+    "test_fold_bn_erases_bn_node"
+    "test_maxpool2d"
+    "test_move_exported_model_bn_device_cpu"
+    "test_move_exported_model_dropout"
+    "test_move_exported_model_dropout_inplace"
+    "test_preserve_nn_module_stack"
+    "test_qat_bn_conv2d"
+    "test_qat_conv2d"
+    "test_qat_conv2d_binary"
+    "test_qat_conv2d_binary2"
+    "test_qat_conv2d_binary_unary"
+    "test_qat_conv2d_unary"
+    "test_qat_conv_bn_bias_derived_qspec"
+    "test_qat_conv_bn_fusion"
+    "test_qat_conv_bn_fusion_literal_args"
+    "test_qat_conv_bn_fusion_no_conv_bias"
+    "test_qat_conv_bn_per_channel_weight_bias"
+    "test_qat_conv_bn_relu_fusion"
+    "test_qat_conv_bn_relu_fusion_no_conv_bias"
+    "test_qat_conv_transpose_bn"
+    "test_qat_conv_transpose_bn_relu"
+    "test_qat_per_channel_weight_custom_dtype"
+    "test_qat_preserve_source_fn_stack"
+    "test_qat_qconv2d"
+    "test_qat_qconv2d_add"
+    "test_qat_qconv2d_add_relu"
+    "test_qat_qconv2d_hardswish"
+    "test_qat_qconv2d_hardtanh"
+    "test_qat_qconv2d_relu"
+    "test_qat_qconv2d_relu6"
+    "test_qat_qconv2d_silu"
+    "test_qat_update_shared_qspec"
+    "test_qdq"
+    "test_qdq_per_channel"
+    "test_reentrant"
+    "test_static_linear"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # AssertionError: tensor(False) is not true
@@ -90,6 +167,40 @@ buildPythonPackage rec {
     "test_save_load_int4woqtensors_2_cpu"
     "test_save_load_int8woqtensors_0_cpu"
     "test_save_load_int8woqtensors_1_cpu"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # AssertionError: Scalars are not equal!
+    "test_comm"
+    "test_fsdp2"
+    "test_fsdp2_correctness"
+    "test_precompute_bitnet_scale"
+    "test_qlora_fsdp2"
+    "test_uneven_shard"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # RuntimeError: No packed_weights_format was selected
+    "TestIntxOpaqueTensor"
+    "test_accuracy_kleidiai"
+
+    # RuntimeError: quantized engine NoQEngine is not supported
+    "test_smooth_linear_cpu"
+    "test_smooth_linear_edge_cases"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Flaky: [gw0] node down: keyboard-interrupt
+    "test_int8_weight_only_quant_with_freeze_0_cpu"
+    "test_int8_weight_only_quant_with_freeze_1_cpu"
+    "test_int8_weight_only_quant_with_freeze_2_cpu"
+  ];
+
+  disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Require unpackaged 'coremltools'
+    "test/prototype/test_groupwise_lowbit_weight_lut_quantizer.py"
+
+    # AttributeError: '_OpNamespace' 'mkldnn' object has no attribute '_is_mkldnn_acl_supported'
+    "test/quantization/pt2e/test_arm_inductor_quantizer.py"
+    "test/quantization/pt2e/test_x86inductor_fusion.py"
+    "test/quantization/pt2e/test_x86inductor_quantizer.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/torchao/use-llvm-openmp.patch b/pkgs/development/python-modules/torchao/use-llvm-openmp.patch
new file mode 100644
index 000000000000..b399b347da39
--- /dev/null
+++ b/pkgs/development/python-modules/torchao/use-llvm-openmp.patch
@@ -0,0 +1,13 @@
+diff --git a/torchao/csrc/cpu/shared_kernels/Utils.cmake b/torchao/csrc/cpu/shared_kernels/Utils.cmake
+index be7004784..0e1a2ed0e 100644
+--- a/torchao/csrc/cpu/shared_kernels/Utils.cmake
++++ b/torchao/csrc/cpu/shared_kernels/Utils.cmake
+@@ -21,7 +21,7 @@ function(target_link_torchao_parallel_backend target_name torchao_parallel_backe
+         target_link_libraries(${target_name} PRIVATE "${TORCH_LIBRARIES}")
+ 
+         target_compile_definitions(${target_name} PRIVATE TORCHAO_PARALLEL_ATEN=1 AT_PARALLEL_OPENMP=1 INTRA_OP_PARALLEL=1)
+-        target_link_libraries(${target_name} PRIVATE ${TORCH_INSTALL_PREFIX}/lib/libomp${CMAKE_SHARED_LIBRARY_SUFFIX})
++        target_link_libraries(${target_name} PRIVATE @openmp@/lib/libomp${CMAKE_SHARED_LIBRARY_SUFFIX})
+ 
+     elseif(TORCHAO_PARALLEL_BACKEND_TOUPPER STREQUAL "EXECUTORCH")
+         message(STATUS "Building with TORCHAO_PARALLEL_BACKEND=TORCHAO_PARALLEL_EXECUTORCH")
diff --git a/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch b/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch
new file mode 100644
index 000000000000..25b08a6dcde9
--- /dev/null
+++ b/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch
@@ -0,0 +1,22 @@
+diff --git a/torchao/csrc/cpu/CMakeLists.txt b/torchao/csrc/cpu/CMakeLists.txt
+index aaea27ec7..53dee80fd 100644
+--- a/torchao/csrc/cpu/CMakeLists.txt
++++ b/torchao/csrc/cpu/CMakeLists.txt
+@@ -49,16 +49,7 @@ if (NOT TARGET cpuinfo)
+     add_compile_options(-Wno-unused-function -Wno-unused-variable)
+ 
+     # set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+-    include(FetchContent)
+-    set(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
+-    set(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "" FORCE)
+-    set(CPUINFO_BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
+-    FetchContent_Declare(cpuinfo
+-        GIT_REPOSITORY https://github.com/pytorch/cpuinfo.git
+-        GIT_TAG c61fe919607bbc534d7a5a5707bdd7041e72c5ff
+-    )
+-    FetchContent_MakeAvailable(
+-        cpuinfo)
++    find_package(cpuinfo REQUIRED)
+ 
+     cmake_policy(POP)
+ endif()
diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 5334f94ffd81..015521331382 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.8.0";
+  version = "2.9.0";
   format = "wheel";
 
   src =
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     in
     fetchurl srcs;
 
-  disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
+  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
 
   buildInputs = [
     # We need to patch lib/torio/_torio_ffmpeg6
@@ -64,12 +64,6 @@ buildPythonPackage rec {
     addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
   '';
 
-  preFixup = ''
-    # TorchAudio loads the newest FFmpeg that works, so get rid of the
-    # old ones.
-    rm $out/${python.sitePackages}/torio/lib/{lib,_}torio_ffmpeg{4,5}.*
-  '';
-
   # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
   dontStrip = true;
 
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index f0bb5feaa82b..c17b723dbd6d 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.8.0" = {
-    x86_64-linux-39 = {
-      name = "torchaudio-2.8.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-2QZsae7B8pPC/wqAW/UEc3OQzL9rd8jmfa+DTbhv2kU=";
-    };
+  "2.9.0" = {
     x86_64-linux-310 = {
-      name = "torchaudio-2.8.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-oBYelShaC3Ft4hD+4DkhUdYB59o8yGWVAI2Car/0iow=";
+      name = "torchaudio-2.9.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-LZJPa5GaJYQe7bo6eSGzjjuri4ayzyOEHjMGM9wuxN8=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.8.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-9ECd9WfQcjp6OonTLHVSoX4P9vE36iag0mjGZSWbKZU=";
+      name = "torchaudio-2.9.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-sPBN7JEXd5pjd8VQHIb8BppCevACyF8IRpQ9aEu6LyM=";
     };
     x86_64-linux-312 = {
-      name = "torchaudio-2.8.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-FFuKDCHPyqFwXGcXPF1DkIfg4SDV2pvDRHRvk3kB0kM=";
+      name = "torchaudio-2.9.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-/4OLMXG+bvTkVk4oFFM4FiQqbb6khRezcieFaHFpN2s=";
     };
     x86_64-linux-313 = {
-      name = "torchaudio-2.8.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-QQu46kYiXv5ljl0no4AsGBoiVZEwA2IaXSWlGsqAGNk=";
+      name = "torchaudio-2.9.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-6nanCKWpSlxsu/MinlhIMCaLR2X7Aa6CMPG2dEJTog8=";
     };
-    aarch64-darwin-39 = {
-      name = "torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-UiKJ4s1X55QB/VzK6bG8D/LkfzUpCSrfWs9XQn6gxqk=";
+    x86_64-linux-314 = {
+      name = "torchaudio-2.9.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-NnfCCwl7w1/DLspPPwon5rTT7nyKYuuiaj51SaOofWw=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-wvRM8nn2c8/N2PV2w0nu6L7fjKqzUaXdeLMpcMw0ohI=";
+      name = "torchaudio-2.9.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-IU0ui+wrIErD9VLz3OrlFVDgapHFhj1dw0HYFpHvZV4=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-ySdoV9JBxt4levdlwPUfwBGvOMtyVAFJUSGygJEwB88=";
+      name = "torchaudio-2.9.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-Zi60mrJeGitzZ7sHKorQXIpLZQ675wkKWvGh6x1Adnw=";
     };
     aarch64-darwin-312 = {
-      name = "torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-3e+UvxgeZEfLsF84vqyo9sW7jSud3O0ao0UgJbn8cNM=";
+      name = "torchaudio-2.9.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-q0y8zP2HOw+0H8s5yYaeWe+Eu5Wwk/b1ji0FFyp1ANI=";
     };
     aarch64-darwin-313 = {
-      name = "torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-+FHTLpTKBeRw8MYOJXJuweDrccsspaAga3/QMnLMw8g=";
+      name = "torchaudio-2.9.0-cp313-cp313-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp313-cp313-macosx_12_0_arm64.whl";
+      hash = "sha256-VUnCXbTC2jBuF56aqZmA5/WxgmqNLX3ggSXzlDpWILI=";
     };
-    aarch64-linux-39 = {
-      name = "torchaudio-2.8.0-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-739/+oKLjYul06VpuCX8BGlojh6JYr9ld9U4vYrxOH0=";
+    aarch64-darwin-314 = {
+      name = "torchaudio-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-P6QUR6IRA/zekwtK0r0mNFZaC+z/GlQlU1tPARbA1d8=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.8.0-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-08G4WyagmDLROfbW2mtmyutR0uFuCPhYdmXESp4aqPk=";
+      name = "torchaudio-2.9.0-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-HoTkX3S/WyCLXOWbNvJuweX2NZZULD6+5u3q34XnNWM=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.8.0-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-RXPGBClQwgJ442CKmjgFC6C8cuAEnhu/0knK+FmoAps=";
+      name = "torchaudio-2.9.0-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-kU8UCBQr3tocqfg03QSWdiX8zHWJO9FQSgGKE6BPG2Y=";
     };
     aarch64-linux-312 = {
-      name = "torchaudio-2.8.0-cp312-cp312-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-hi4uQL8J2GXl3wgKhMGjm7zvQOQxQPSxc36zo4nTs48=";
+      name = "torchaudio-2.9.0-cp312-cp312-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-f5M4i25TbBTWAVtvdSd6i0XvxTL2GzWtwe0GyYqGAD4=";
     };
     aarch64-linux-313 = {
-      name = "torchaudio-2.8.0-cp313-cp313-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-CVNam3J8B5PNB8Gs6Z8/NTYmKBvMPjDC8jFOPrydP5Y=";
+      name = "torchaudio-2.9.0-cp313-cp313-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-HrDR2sjO+8SlSvshqscqHCWpH3Ppw72F9mhJMKShvl0=";
+    };
+    aarch64-linux-314 = {
+      name = "torchaudio-2.9.0-cp314-cp314-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-afRvIb1n6QreM6fQ8M+YJwzWG5j1+CSdOJO+Chaz4x8=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index 77d8aeeb21c5..6240d8b948ab 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -77,7 +77,7 @@ let
 in
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
   stdenv = torch.stdenv;
@@ -86,7 +86,7 @@ buildPythonPackage rec {
     owner = "pytorch";
     repo = "audio";
     tag = "v${version}";
-    hash = "sha256-SPa6ZWA2AWawfL4Z4mb1nddGaAsGEl/0dwweBpex2Wo=";
+    hash = "sha256-oZTe0LWqOJ0NUxmmUKZN3GhMgloOMCYMicbYoaW2pTw=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh
index b3c22e498664..4b289f99bb31 100755
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@@ -11,21 +11,21 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-    "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-manylinux_2_28_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
     "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
     "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl"
     "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl"
     "x86_64-linux-313 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchaudio-${version}-cp313-cp313-linux_x86_64.whl"
-    "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
+    "x86_64-linux-314 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchaudio-${version}-cp314-cp314-linux_x86_64.whl"
     "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
     "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
     "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl"
-    "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_11_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_11_0_arm64.whl"
-    "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux_2_28_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl"
+    "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl"
+    "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl"
     "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
     "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
     "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl"
     "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl"
+    "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl"
 )
 
 hashfile=binary-hashes-"$version".nix
diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix
new file mode 100644
index 000000000000..fe26127cef26
--- /dev/null
+++ b/pkgs/development/python-modules/torchcodec/default.nix
@@ -0,0 +1,171 @@
+{
+  lib,
+  stdenv,
+  config,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  pkg-config,
+
+  # buildInputs
+  ffmpeg,
+  cudaPackages,
+
+  # build-system
+  cmake,
+  setuptools,
+  torch,
+
+  # tests
+  pytestCheckHook,
+  torchvision,
+
+  cudaSupport ? config.cudaSupport,
+}:
+
+buildPythonPackage rec {
+  pname = "torchcodec";
+  version = "0.8.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "meta-pytorch";
+    repo = "torchcodec";
+    tag = "v${version}";
+    hash = "sha256-trYS4sRPSNmQLHZZS174zxbu74LT+39N23zOJdWwN6Q=";
+  };
+
+  postPatch = ''
+    substituteInPlace \
+      test/utils.py \
+      test/test_encoders.py \
+      --replace-fail \
+        '"ffprobe"' \
+        '"${lib.getExe' ffmpeg "ffprobe"}"'
+
+    substituteInPlace \
+      test/test_ops.py \
+      test/test_encoders.py \
+      --replace-fail \
+        '"ffmpeg"' \
+        '"${lib.getExe ffmpeg}"'
+
+    substituteInPlace test/test_transform_ops.py \
+      --replace-fail \
+        'ffmpeg_cli = "ffmpeg"' \
+        'ffmpeg_cli = "${lib.getExe ffmpeg}"'
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
+
+  buildInputs = [
+    ffmpeg
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cudart
+      cuda_nvrtc
+      libcublas # cublas_v2.h
+      libcusolver # cusolverDn.h
+      libcusparse # cusparse.h
+      libnpp # nppicc
+    ]
+  );
+
+  build-system = [
+    cmake
+    setuptools
+    torch
+  ];
+  dontUseCmakeConfigure = true;
+
+  dependencies = [
+    torch
+  ];
+
+  env = {
+    # Upstream (Meta) is cautious with linking against GPL ffmpeg
+    # We explicitly want to link against our packages ffmpeg
+    I_CONFIRM_THIS_IS_NOT_A_LICENSE_VIOLATION = true;
+
+    ENABLE_CUDA = cudaSupport;
+  };
+
+  pythonImportsCheck = [ "torchcodec" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    torchvision
+  ];
+
+  disabledTests =
+    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # AssertionError: index 0
+      "test_get_frames_played_at"
+
+      # AssertionError: Tensor-likes are not equal!
+      "test_against_cli"
+      "test_against_ref"
+      "test_color_conversion_library"
+      "test_color_conversion_library_with_dimension_order"
+      "test_compile"
+      "test_compile_seek_and_next"
+      "test_create_decoder"
+      "test_crop_transform"
+      "test_custom_frame_mappings_json_and_bytes"
+      "test_file_like_decoding"
+      "test_get_frame_at"
+      "test_get_frame_at_av1"
+      "test_get_frame_at_index"
+      "test_get_frame_at_pts"
+      "test_get_frame_played_at"
+      "test_get_frame_played_at_h265"
+      "test_get_frame_with_info_at_index"
+      "test_get_frames_at"
+      "test_get_frames_at_indices"
+      "test_get_frames_at_indices_negative_indices"
+      "test_get_frames_by_pts_in_range"
+      "test_get_frames_in_range"
+      "test_get_frames_in_range_slice_indices_syntax"
+      "test_get_frames_with_missing_num_frames_metadata"
+      "test_getitem_int"
+      "test_getitem_numpy_int"
+      "test_getitem_slice"
+      "test_iteration"
+      "test_seek_and_next"
+      "test_seek_mode_custom_frame_mappings"
+      "test_seek_to_negative_pts"
+      "test_throws_exception_at_eof"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      # RuntimeError: Invalid AVIO context holder
+      "test_1d_samples"
+      "test_against_cli"
+      "test_against_to_file"
+      "test_against_to_file"
+      "test_contiguit"
+      "test_encode_to_tensor_long_outpu"
+      "test_round_trip"
+      "test_video_encoder_round_trip"
+
+      # RuntimeError: Requested next frame while there are no more frames left to decode
+      "test_next"
+      "test_throws_exception_at_eof"
+      "test_throws_exception_if_seek_too_far"
+    ];
+
+  meta = {
+    description = "PyTorch media decoding and encoding";
+    homepage = "https://github.com/meta-pytorch/torchcodec";
+    changelog = "https://github.com/meta-pytorch/torchcodec/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/development/python-modules/torchcrepe/default.nix b/pkgs/development/python-modules/torchcrepe/default.nix
index 86fb24eb3875..7872ba143028 100644
--- a/pkgs/development/python-modules/torchcrepe/default.nix
+++ b/pkgs/development/python-modules/torchcrepe/default.nix
@@ -2,24 +2,27 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   librosa,
-  pytestCheckHook,
-  pythonOlder,
   resampy,
   scipy,
-  setuptools,
   torch,
   torchaudio,
+  torchcodec,
   tqdm,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage {
   pname = "torchcrepe";
   version = "0.0.24";
   pyproject = true;
-  build-system = [ setuptools ];
-
-  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "maxrmorrison";
@@ -29,12 +32,15 @@ buildPythonPackage {
     hash = "sha256-w2T8D3ATCHVBCBhMdLSYdV0yb9vUYwZLz+B2X2gteEU=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [
     librosa
     resampy
     scipy
     torch
     torchaudio
+    torchcodec
     tqdm
   ];
 
diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix
index d3ffd678a761..8dcc5f6bbe2f 100644
--- a/pkgs/development/python-modules/torcheval/default.nix
+++ b/pkgs/development/python-modules/torcheval/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -9,17 +8,6 @@
 
   # dependencies
   typing-extensions,
-
-  # tests
-  cython,
-  numpy,
-  pytest-timeout,
-  pytest-xdist,
-  pytestCheckHook,
-  scikit-image,
-  scikit-learn,
-  torchtnt-nightly,
-  torchvision,
 }:
 let
   pname = "torcheval";
@@ -30,7 +18,7 @@ buildPythonPackage {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "pytorch";
+    owner = "meta-pytorch";
     repo = "torcheval";
     # Upstream has not created a tag for this version
     # https://github.com/pytorch/torcheval/issues/215
@@ -38,158 +26,19 @@ buildPythonPackage {
     hash = "sha256-aVr4qKKE+dpBcJEi1qZJBljFLUl8d7D306Dy8uOojJE=";
   };
 
-  # Patches are only applied to usages of numpy within tests,
-  # which are only used for testing purposes (see dev-requirements.txt)
-  postPatch =
-    # numpy's `np.NAN` was changed to `np.nan` when numpy 2 was released
-    ''
-      substituteInPlace tests/metrics/classification/test_accuracy.py tests/metrics/functional/classification/test_accuracy.py \
-        --replace-fail "np.NAN" "np.nan"
-    ''
-
-    # `unittest.TestCase.assertEquals` does not exist;
-    # the correct symbol is `unittest.TestCase.assertEqual`
-    + ''
-      substituteInPlace tests/metrics/test_synclib.py \
-        --replace-fail "tc.assertEquals" "tc.assertEqual"
-    '';
-
   build-system = [ setuptools ];
 
   dependencies = [ typing-extensions ];
 
   pythonImportsCheck = [ "torcheval" ];
 
-  nativeCheckInputs = [
-    cython
-    numpy
-    pytest-timeout
-    pytest-xdist
-    pytestCheckHook
-    scikit-image
-    scikit-learn
-    torchtnt-nightly
-    torchvision
-  ];
-
-  pytestFlags = [
-    "-v"
-  ];
-
-  enabledTestPaths = [
-    "tests/"
-  ];
-
-  disabledTestPaths = [
-    # -- tests/metrics/audio/test_fad.py --
-    # Touch filesystem and require network access.
-    # torchaudio.utils.download_asset("models/vggish.pt") -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
-    "tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad"
-    "tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad_merge"
-
-    # -- tests/metrics/image/test_fid.py --
-    # Touch filesystem and require network access.
-    # models.inception_v3(weights=weights) -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_invalid_input"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_custom_model"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_default_model"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_dissimilar_inputs"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_similar_inputs"
-
-    # -- tests/metrics/functional/text/test_perplexity.py --
-    # AssertionError: Scalars are not close!
-    # Expected 3.537154912949 but got 3.53715443611145
-    "tests/metrics/functional/text/test_perplexity.py::Perplexity::test_perplexity_with_ignore_index"
-
-    # -- tests/metrics/image/test_psnr.py --
-    # AssertionError: Scalars are not close!
-    # Expected 7.781850814819336 but got 7.781772613525391
-    "tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data"
-
-    # -- tests/metrics/regression/test_mean_squared_error.py --
-    # AssertionError: Scalars are not close!
-    # Expected -640.4547729492188 but got -640.4707641601562
-    "tests/metrics/regression/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
-
-    # -- tests/metrics/window/test_mean_squared_error.py --
-    # AssertionError: Scalars are not close!
-    # Expected 0.0009198983898386359 but got 0.0009198188781738281
-    "tests/metrics/window/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
-  ]
-
-  # These tests error on darwin platforms.
-  # NotImplementedError: The operator 'c10d::allgather_' is not currently implemented for the mps device
-  #
-  # Applying the suggested environment variable `PYTORCH_ENABLE_MPS_FALLBACK=1;` causes the tests to fail,
-  # as using the CPU instead of the MPS causes the tensors to be on the wrong device:
-  # RuntimeError: ProcessGroupGloo::allgather: invalid tensor type at index 0;
-  # Expected TensorOptions(dtype=float, device=cpu, ...), got TensorOptions(dtype=float, device=mps:0, ...)
-  ++ lib.optional stdenv.hostPlatform.isDarwin [
-    # -- tests/metrics/test_synclib.py --
-    "tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
-    "tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
-    "tests/metrics/test_synclib.py::SynclibTest::test_empty_tensor_list_sync_state"
-    "tests/metrics/test_synclib.py::SynclibTest::test_sync_dtype_and_shape"
-    "tests/metrics/test_synclib.py::SynclibTest::test_tensor_list_sync_states"
-    "tests/metrics/test_synclib.py::SynclibTest::test_tensor_dict_sync_states"
-    "tests/metrics/test_synclib.py::SynclibTest::test_tensor_sync_states"
-    # -- tests/metrics/test_toolkit.py --
-    "tests/metrics/test_toolkit.py::MetricToolkitTest::test_metric_sync"
-    "tests/metrics/test_toolkit.py::MetricCollectionToolkitTest::test_metric_collection_sync"
-
-    # Cannot access local process over IPv6 (nodename nor servname provided) even with __darwinAllowLocalNetworking
-    # Will hang, or appear to hang, with an 5 minute (default) timeout per test
-    "tests/metrics/aggregation/test_auc.py"
-    "tests/metrics/aggregation/test_cat.py"
-    "tests/metrics/aggregation/test_max.py"
-    "tests/metrics/aggregation/test_mean.py"
-    "tests/metrics/aggregation/test_min.py"
-    "tests/metrics/aggregation/test_sum.py"
-    "tests/metrics/aggregation/test_throughput.py"
-    "tests/metrics/classification/test_accuracy.py"
-    "tests/metrics/classification/test_auprc.py"
-    "tests/metrics/classification/test_auroc.py"
-    "tests/metrics/classification/test_binned_auprc.py"
-    "tests/metrics/classification/test_binned_auroc.py"
-    "tests/metrics/classification/test_binned_precision_recall_curve.py"
-    "tests/metrics/classification/test_confusion_matrix.py"
-    "tests/metrics/classification/test_f1_score.py"
-    "tests/metrics/classification/test_normalized_entropy.py"
-    "tests/metrics/classification/test_precision_recall_curve.py"
-    "tests/metrics/classification/test_precision.py"
-    "tests/metrics/classification/test_recall_at_fixed_precision.py"
-    "tests/metrics/classification/test_recall.py"
-    "tests/metrics/functional/classification/test_auroc.py"
-    "tests/metrics/ranking/test_click_through_rate.py::TestClickThroughRate::test_ctr_with_valid_input"
-    "tests/metrics/ranking/test_hit_rate.py::TestHitRate::test_hitrate_with_valid_input"
-    "tests/metrics/ranking/test_reciprocal_rank.py::TestReciprocalRank::test_mrr_with_valid_input"
-    "tests/metrics/ranking/test_retrieval_precision.py::TestRetrievalPrecision::test_retrieval_precision_multiple_updates_1_query"
-    "tests/metrics/ranking/test_retrieval_precision.py::TestRetrievalPrecision::test_retrieval_precision_multiple_updates_n_queries_without_nan"
-    "tests/metrics/ranking/test_weighted_calibration.py::TestWeightedCalibration::test_weighted_calibration_with_valid_input"
-    "tests/metrics/regression/test_mean_squared_error.py"
-    "tests/metrics/regression/test_r2_score.py"
-    "tests/metrics/test_synclib.py::SynclibTest::test_gather_uneven_multidim"
-    "tests/metrics/test_synclib.py::SynclibTest::test_gather_uneven"
-    "tests/metrics/test_synclib.py::SynclibTest::test_numeric_sync_state"
-    "tests/metrics/test_synclib.py::SynclibTest::test_sync_list_length"
-    "tests/metrics/text/test_bleu.py::TestBleu::test_bleu_multiple_examples_per_update"
-    "tests/metrics/text/test_bleu.py::TestBleu::test_bleu_multiple_updates"
-    "tests/metrics/text/test_perplexity.py::TestPerplexity::test_perplexity_with_ignore_index"
-    "tests/metrics/text/test_perplexity.py::TestPerplexity::test_perplexity"
-    "tests/metrics/text/test_word_error_rate.py::TestWordErrorRate::test_word_error_rate_with_valid_input"
-    "tests/metrics/text/test_word_information_lost.py::TestWordInformationLost::test_word_information_lost"
-    "tests/metrics/text/test_word_information_preserved.py::TestWordInformationPreserved::test_word_information_preserved_with_valid_input"
-    "tests/metrics/window/test_auroc.py"
-    "tests/metrics/window/test_click_through_rate.py::TestClickThroughRate::test_ctr_with_valid_input"
-    "tests/metrics/window/test_mean_squared_error.py"
-    "tests/metrics/window/test_normalized_entropy.py::TestWindowedBinaryNormalizedEntropy::test_ne_with_valid_input"
-    "tests/metrics/window/test_weighted_calibration.py::TestWindowedWeightedCalibration::test_weighted_calibration_with_valid_input"
-  ];
+  # Tests are very flaky and computationally intensive
+  doCheck = false;
 
   meta = {
     description = "Rich collection of performant PyTorch model metrics and tools for PyTorch model evaluations";
     homepage = "https://pytorch.org/torcheval";
-    changelog = "https://github.com/pytorch/torcheval/releases/tag/${version}";
+    changelog = "https://github.com/meta-pytorch/torcheval/releases/tag/${version}";
 
     platforms = lib.platforms.unix;
     license = [ lib.licenses.bsd3 ];
diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index fd08e25f76a1..8411f4438727 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "torchio";
-  version = "0.20.23";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TorchIO-project";
     repo = "torchio";
     tag = "v${version}";
-    hash = "sha256-OSqXV8aINqi7MstUy4RfIWLH4NxJB+r1tdzMrSgo7pg=";
+    hash = "sha256-y3p5LdBC/O82GVroA5B0PNC5qRwVjNbiNroJrV1iU/A=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index 891d98f35a3c..a5db6383c25e 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -73,14 +73,14 @@
 
 buildPythonPackage rec {
   pname = "torchrl";
-  version = "0.10.0";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "rl";
     tag = "v${version}";
-    hash = "sha256-DqLB1JnQ96cxVEzcXra1hFVfrN7eXTlTwPtlPClnaBA=";
+    hash = "sha256-Vd/w11P4NVrx2xki+VYlXQaM8F+vpdokke8ZAHg6h0Q=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index 8626ead3ac02..f4318c9d92b5 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -23,7 +23,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.23.0";
+  version = "0.24.0";
 in
 buildPythonPackage {
   inherit version;
@@ -34,7 +34,7 @@ buildPythonPackage {
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
-  disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
+  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
 
   # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support.
   buildInputs =
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 545ff5bac535..df73d27331d1 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "0.23.0" = {
-    x86_64-linux-39 = {
-      name = "torchvision-0.23.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-eE/JDLlw5aKbJLZEHkYfW/YWhGMFuXk/o4cKnyltTA4=";
-    };
+  "0.24.0" = {
     x86_64-linux-310 = {
-      name = "torchvision-0.23.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-RgvI1w9jvbQzpzUd7MLBrhkD9/N45KdhT8joyXpcNqo=";
+      name = "torchvision-0.24.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DZ17Fyc69ZN0A/pTqlmIbNHa9b1q6kLkw8u6RU+i6+0=";
     };
     x86_64-linux-311 = {
-      name = "torchvision-0.23.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-k/G19WsgzWhpvKQJQ95P08qczFbhtX9HxnHeHNqznNs=";
+      name = "torchvision-0.24.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-ivmUrFaGj5OfsTFOuZ9SgpUcmhKq40ud3gCnjkLlnSE=";
     };
     x86_64-linux-312 = {
-      name = "torchvision-0.23.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-nLPBOZevy0QFfKENlDxsTLowaK/eDzcJZavOnIn8/6k=";
+      name = "torchvision-0.24.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-5QW9g+4Q7blFI9C4BaCPULiGK1jSzG8C0UzU5++TArw=";
     };
     x86_64-linux-313 = {
-      name = "torchvision-0.23.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-xjmC8Zc7pnezfmZj3w4Hy1OBRZtvBXLCypXuvY3+t0I=";
+      name = "torchvision-0.24.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-1ZT2EmnKsFJKHm9fnn5csm5OC+2LoFn2T9Ss33zXbVM=";
     };
-    aarch64-darwin-39 = {
-      name = "torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-sZDbIF+QIGwjD8L5HL39VzMzS6vA4NGb3bkKQLjPJsI=";
+    x86_64-linux-314 = {
+      name = "torchvision-0.24.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DkhdmHoWBslCo+SoZ83T93mR3bW1Ybrgj3AxS3CTozE=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-cmaHHaygCtRtHAc+VdlyF50SpY+lya3smj25u+1xKEo=";
+      name = "torchvision-0.24.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-Xo1eZn3v+HvWbSbfbSJfRiJLsHgtTz+PXS8waLX9RJI=";
     };
     aarch64-darwin-311 = {
-      name = "torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-Saog4h8MK9RYxx17RJd2y9XxZpPdWAcZWoIGEriiKbc=";
+      name = "torchvision-0.24.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-93HPkYNRrVCaKEiL5HXz6cxxp1DWsUZ4Qr+2SGOl6YY=";
     };
     aarch64-darwin-312 = {
-      name = "torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-4OLASpFAPo3Tr5dWxqAkodnA7ZwNWSqDFN7Y9P4w1EA=";
+      name = "torchvision-0.24.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-xh1AvNLiRR6TKQKnAq1JW6HsbyeekLHhXO8rtV3JEeI=";
     };
     aarch64-darwin-313 = {
-      name = "torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-HDfjJeCaGEtzDD71FCTzg+xXRTeNwOyiRFIKyilyJgA=";
+      name = "torchvision-0.24.0-cp313-cp313-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp313-cp313-macosx_12_0_arm64.whl";
+      hash = "sha256-hNec/GRXMQEHzk1xLeej04iyRIS8mu3tSnbY+OOigT0=";
     };
-    aarch64-linux-39 = {
-      name = "torchvision-0.23.0-cp39-cp39-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-bHTLwcvuJt1PNfmJzYDczEBBHyWN7kdrKYcd7ktIOvA=";
+    aarch64-darwin-314 = {
+      name = "torchvision-0.24.0-cp314-cp314-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-S9/IWl7XBkIVVfMs3F49221Av2XvA6J0zjwXY5PikEs=";
     };
     aarch64-linux-310 = {
-      name = "torchvision-0.23.0-cp310-cp310-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-McWDuidCajoE7KjAVFBSQQXBVk20G+ZjL3U270BabeI=";
+      name = "torchvision-0.24.0-cp310-cp310-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-oRClHHXomAeoOCsNgDT14YD7kxlXC+M4n/09SsT9V6k=";
     };
     aarch64-linux-311 = {
-      name = "torchvision-0.23.0-cp311-cp311-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-Adwz7iTHkUiu582880roo8naFnSlkeeBV3txbSM7H6Y=";
+      name = "torchvision-0.24.0-cp311-cp311-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-u9Y79Ov/hMSMUBI+upBSbMn3lP5FvJ9d0HzsGejGK84=";
     };
     aarch64-linux-312 = {
-      name = "torchvision-0.23.0-cp312-cp312-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-bdfE0ymg4DFXgDAxvIViIMYVXvCMJtT1u6yTis7PCUg=";
+      name = "torchvision-0.24.0-cp312-cp312-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-sFMdFIP8Mi19oNg75S8N+GCnURSrh9vuud52X+rtqEM=";
     };
     aarch64-linux-313 = {
-      name = "torchvision-0.23.0-cp313-cp313-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-L3/WwV82l+gGJ7d5NPd3BfO8Dpgni5ibJlXeAfaQPh0=";
+      name = "torchvision-0.24.0-cp313-cp313-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-/sEqJpz4D2sLcUccjUmM073Z2OiSxCW/Of7LYEhSw7A=";
+    };
+    aarch64-linux-314 = {
+      name = "torchvision-0.24.0-cp314-cp314-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-c1dqnEpZMiP7roWmTou9dwSavREBiT7PPF6YEoT9WLQ=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index bec58361183e..be337533b977 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   torch,
-  apple-sdk_13,
   buildPythonPackage,
   darwinMinVersionHook,
   fetchFromGitHub,
@@ -29,7 +28,7 @@ let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
 
   pname = "torchvision";
-  version = "0.23.0";
+  version = "0.24.0";
 in
 buildPythonPackage {
   format = "setuptools";
@@ -41,7 +40,7 @@ buildPythonPackage {
     owner = "pytorch";
     repo = "vision";
     tag = "v${version}";
-    hash = "sha256-BfGTq9BsmO5TtQrDED35aaT9quleZ9rcr/81ShfvCbQ=";
+    hash = "sha256-EyA/d2fAdK2arMBqNtDwKtpaKb171zqEnYFrqAFQr+g=";
   };
 
   nativeBuildInputs = [
@@ -55,14 +54,6 @@ buildPythonPackage {
     libjpeg_turbo
     libpng
     torch.cxxdev
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    # This should match the SDK used by `torch` above
-    apple-sdk_13
-
-    # error: unknown type name 'MPSGraphCompilationDescriptor'; did you mean 'MPSGraphExecutionDescriptor'?
-    # https://developer.apple.com/documentation/metalperformanceshadersgraph/mpsgraphcompilationdescriptor/
-    (darwinMinVersionHook "12.0")
   ];
 
   dependencies = [
diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh
index d4d631cc96b5..d3e2b8f0362f 100755
--- a/pkgs/development/python-modules/torchvision/prefetch.sh
+++ b/pkgs/development/python-modules/torchvision/prefetch.sh
@@ -10,21 +10,21 @@ linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-    "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-manylinux_2_28_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
     "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"
     "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl"
     "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl"
     "x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl"
-    "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
+    "x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl"
     "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
     "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
     "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl"
-    "aarch64-darwin-313 $darwin_bucket/torchvision-${version}-cp313-cp313-macosx_11_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_11_0_arm64.whl"
-    "aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-manylinux_2_28_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl"
+    "aarch64-darwin-313 $darwin_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl"
+    "aarch64-darwin-314 $darwin_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl"
     "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl"
     "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl"
     "aarch64-linux-312 $darwin_bucket/torchvision-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl"
     "aarch64-linux-313 $darwin_bucket/torchvision-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchvision-${version}-cp313-cp313-linux_aarch64.whl"
+    "aarch64-linux-314 $darwin_bucket/torchvision-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchvision-${version}-cp314-cp314-linux_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"
diff --git a/pkgs/development/python-modules/torf/default.nix b/pkgs/development/python-modules/torf/default.nix
index 6d4a9c159201..c467e3b373de 100644
--- a/pkgs/development/python-modules/torf/default.nix
+++ b/pkgs/development/python-modules/torf/default.nix
@@ -2,13 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   flatbencode,
+
+  # test
   pytest-cov-stub,
   pytest-httpserver,
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -44,14 +50,21 @@ buildPythonPackage rec {
     "test_getting_info__xs_fails__as_fails"
     "test_getting_info__xs_returns_invalid_bytes"
     "test_getting_info__as_returns_invalid_bytes"
+    "test_file_in_singlefile_torrent_has_wrong_size"
+    "test_file_in_singlefile_torrent_doesnt_exist"
+    # Broken assertion
+    # AssertionError: assert 1000 < 1000
+    "test_callback_raises_exception"
   ];
 
   pythonImportsCheck = [ "torf" ];
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Create, parse and edit torrent files and magnet links";
     homepage = "https://github.com/rndusr/torf";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ambroisie ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }
diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 35899915eb67..3f62db31b9db 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -107,6 +107,9 @@ buildPythonPackage rec {
     changelog = "https://github.com/tpm2-software/tpm2-pytss/blob/${version}/CHANGELOG.md";
     description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ baloo ];
+    maintainers = with maintainers; [
+      baloo
+      scottstephens
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
index 89e27908b5e2..2ba55fd2e30e 100644
--- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-language-pack";
-  version = "0.9.1";
+  version = "0.10.0";
   pyproject = true;
 
   # Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script.
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "tree_sitter_language_pack";
     inherit version;
-    hash = "sha256-LaU5dR7MULnmu/yji1dQGjxV5nGGqTnVvxSdnLciCXQ=";
+    hash = "sha256-oWGLKYKLZEIu1rKhEYdZnFUheBNI/t2EIPAfb1A5ofw=";
   };
 
   # Upstream bumped dependencies aggressively, but we can still use older
diff --git a/pkgs/development/python-modules/tree-sitter-yaml/default.nix b/pkgs/development/python-modules/tree-sitter-yaml/default.nix
index 261118b68894..cc48a319bb92 100644
--- a/pkgs/development/python-modules/tree-sitter-yaml/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-yaml/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-yaml";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter-grammars";
     repo = "tree-sitter-yaml";
     tag = "v${version}";
-    hash = "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g=";
+    hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-QvqvyjnCgSuSiiY4SB5nB9S7LnGP1F+tySxue359SWY=";
+    hash = "sha256-mrLuGmauboKHHk0zADPXpwgZfc83syXk0jmD93Y9Jq4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/tree-sitter-zeek/default.nix b/pkgs/development/python-modules/tree-sitter-zeek/default.nix
new file mode 100644
index 000000000000..6cf9524de186
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-zeek/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  tree-sitter,
+}:
+
+buildPythonPackage rec {
+  pname = "tree-sitter-zeek";
+  version = "0.2.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "tree-sitter-zeek";
+    tag = "v${version}";
+    hash = "sha256-0ixZAJ940mYIPD//RJVJ3PAVdY/jtYNJ5+WIlq+zfnY=";
+  };
+
+  build-system = [ setuptools ];
+
+  optional-dependencies = {
+    core = [ tree-sitter ];
+  };
+
+  pythonImportsCheck = [ "tree_sitter_zeek" ];
+
+  meta = {
+    description = "Tree-sitter grammar for the Zeek scripting language";
+    homepage = "https://github.com/zeek/tree-sitter-zeek";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      mdaniels5757
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
deleted file mode 100644
index 27716b9fd31e..000000000000
--- a/pkgs/development/python-modules/treeo/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  jax,
-  jaxlib,
-  lib,
-  poetry-core,
-}:
-
-buildPythonPackage rec {
-  pname = "treeo";
-  # Note that there is a version 0.4.0, but it was released in error. At the
-  # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub
-  # and PyPI.
-  version = "0.4.0";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "cgarciae";
-    repo = "treeo";
-    tag = version;
-    hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw=";
-  };
-
-  # See https://github.com/cgarciae/treex/issues/68.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/cgarciae/treeo/pull/14/commits/022915da2b3bf76406a7c79d1b4593bee7956f16.patch";
-      hash = "sha256-WGxJqqrf2g0yZe30RyG1xxbloiqj1awuf1Y4eh5y+z0=";
-    })
-    (fetchpatch {
-      url = "https://github.com/cgarciae/treeo/pull/14/commits/99f9488bd0c977780844fd79743167b0010d359b.patch";
-      hash = "sha256-oKDYs+Ah0QXkhiJysIudQ6VLIiUiIcnQisxYp6GJuTc=";
-    })
-  ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  # jax is not declared in the dependencies, but is necessary.
-  propagatedBuildInputs = [ jax ];
-
-  nativeCheckInputs = [ jaxlib ];
-  pythonImportsCheck = [ "treeo" ];
-
-  meta = with lib; {
-    description = "Small library for creating and manipulating custom JAX Pytree classes";
-    homepage = "https://github.com/cgarciae/treeo";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ndl ];
-    # obsolete as of 2023-02-27 and not updated for more than a year as of 2023-08
-    broken = true;
-  };
-}
diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
deleted file mode 100644
index 3f76b078f17f..000000000000
--- a/pkgs/development/python-modules/treex/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  buildPythonPackage,
-  cloudpickle,
-  dm-haiku,
-  einops,
-  fetchFromGitHub,
-  flax,
-  hypothesis,
-  jaxlib,
-  keras,
-  lib,
-  poetry-core,
-  pytestCheckHook,
-  pyyaml,
-  rich,
-  tensorflow,
-  treeo,
-  torchmetrics,
-  torch,
-}:
-
-buildPythonPackage rec {
-  pname = "treex";
-  version = "0.6.11";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "cgarciae";
-    repo = "treex";
-    tag = version;
-    hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ=";
-  };
-
-  # At the time of writing (2022-03-29), rich is currently at version 11.0.0.
-  # The treeo dependency is compatible with a patch, but not marked as such in
-  # treex. See https://github.com/cgarciae/treex/issues/68.
-  pythonRelaxDeps = [
-    "certifi"
-    "flax"
-    "rich"
-    "treeo"
-  ];
-
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  buildInputs = [ jaxlib ];
-
-  propagatedBuildInputs = [
-    einops
-    flax
-    pyyaml
-    rich
-    treeo
-    torch
-  ];
-
-  nativeCheckInputs = [
-    cloudpickle
-    dm-haiku
-    hypothesis
-    keras
-    pytestCheckHook
-    tensorflow
-    torchmetrics
-  ];
-
-  pythonImportsCheck = [ "treex" ];
-
-  meta = with lib; {
-    description = "Pytree Module system for Deep Learning in JAX";
-    homepage = "https://github.com/cgarciae/treex";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ndl ];
-  };
-}
diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index d28bb529c52c..3e2f8906e855 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.8.3";
+  version = "4.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "mikedh";
     repo = "trimesh";
     tag = version;
-    hash = "sha256-ywLbXOE3qO3+hrqy/+cVGZA4V202eHaMUnn3Wz1iNLI=";
+    hash = "sha256-HOSmV55RRZkIk1YppWfYvSm0hURSKUsDeeWtVBrH7Rs=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 0dc38d643bf3..99a6a5e5d221 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -21,6 +21,7 @@
   pyopenssl,
   pytestCheckHook,
   pytest-trio,
+  pyyaml,
   trustme,
 }:
 
@@ -35,7 +36,7 @@ let
 in
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.30.0";
+  version = "0.31.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -44,7 +45,7 @@ buildPythonPackage rec {
     owner = "python-trio";
     repo = "trio";
     tag = "v${version}";
-    hash = "sha256-spYHwVq3iNhnZQf2z7aTyDuSCiSl3X5PD6siXqLC4EA=";
+    hash = "sha256-cl1GstWVHDD3nWx835k2hnswt/+AnoTLXjxVIfLP6Es=";
   };
 
   build-system = [ setuptools ];
@@ -66,6 +67,7 @@ buildPythonPackage rec {
     pyopenssl
     pytestCheckHook
     pytest-trio'
+    pyyaml
     trustme
   ];
 
diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
index 7edc81d576a6..74755a13b2fe 100644
--- a/pkgs/development/python-modules/triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "triton";
-  version = "3.4.0";
+  version = "3.5.0";
   format = "wheel";
 
   src =
@@ -63,6 +63,9 @@ buildPythonPackage rec {
       mit
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ junjihashimoto ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      junjihashimoto
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix
index 54eda3494663..39976f373656 100644
--- a/pkgs/development/python-modules/triton/binary-hashes.nix
+++ b/pkgs/development/python-modules/triton/binary-hashes.nix
@@ -7,46 +7,56 @@
 
 version:
 builtins.getAttr version {
-  "3.4.0" = {
+  "3.5.0" = {
     aarch64-linux-310 = {
-      name = "triton-3.4.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-husMt2NDKM1Xf6UbWTOPGvQZnPmrYjhaxCqCeD2RFqQ=";
+      name = "triton-3.5.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-JTyIky/VWN9S+GxmNynofNOKGacVFYG+W9X0v9WPhpo=";
     };
     x86_64-linux-310 = {
-      name = "triton-3.4.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-axdYjFnL4dmHEz6nzRzC5SKeBUSgapkIv69oxh9WSVo=";
+      name = "triton-3.5.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-u6PqGcwYGVNIOVmYj0/Xk6dZg+v+z2VH1YOogGq43Pw=";
     };
     aarch64-linux-311 = {
-      name = "triton-3.4.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-3Y0y0zf1gST+JUBD0oKkvBM8Ksp5ibxjWLLFRtISFRM=";
+      name = "triton-3.5.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-SYEl6jXOSJaaRvp5OdfmgCVAoTlXomIw1mo4t6zn32g=";
     };
     x86_64-linux-311 = {
-      name = "triton-3.4.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-4rCv5CDSAtlvULhH10Skh7eAVnl1RV5W9ksGEVLulVQ=";
+      name = "triton-3.5.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-JjiByshHffhNOWS+dlt/rBfdP/oK1vywMLhBvXT5QIs=";
     };
     aarch64-linux-312 = {
-      name = "triton-3.4.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-AOpKHBXwebv0n/AsMSIQ/bj/BbFQPqMIEmEOKjsXHzs=";
+      name = "triton-3.5.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-m4K0bfNa6eC4WjgtmaB25uvqI6Ol26yn3CSnVx5r660=";
     };
     x86_64-linux-312 = {
-      name = "triton-3.4.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-hVBnKxGE8FGH9BQNsy4z5htZIEb9Ph65B+O321Mht1A=";
+      name = "triton-3.5.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-dvhlGl44wqfab6Ky5By8AKWjLLUr8/UgET/pC3I6MQ0=";
     };
     aarch64-linux-313 = {
-      name = "triton-3.4.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-WstSjwHcFDYsSoj6Tc+iJ9Ey9uYfJypodOhNZIUDfKQ=";
+      name = "triton-3.5.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-BeFFtRpTVzv/JgQx/0D63OCDitmSjF7hiDtT1ZiE4Zg=";
     };
     x86_64-linux-313 = {
-      name = "triton-3.4.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-Dlgr/YFHr9Dhf0ELOe4WHfkzoqyp9lPhF42q6Y+H9gE=";
+      name = "triton-3.5.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-tvbbiVAabcSkkv8oFGDBsVVjQgvJCTR3CqanuA/VHJU=";
+    };
+    aarch64-linux-314 = {
+      name = "triton-3.5.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-ThqFbR1zFzTuntYt3lSPNC00yYi41+I1vyA35CjeIlg=";
+    };
+    x86_64-linux-314 = {
+      name = "triton-3.5.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-jZi3ioPpECVuxwNIa4wnXsU5deWsSoy3zgfGluCPa1o=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/trl/default.nix b/pkgs/development/python-modules/trl/default.nix
index 186d5ea4eb66..a5008a8efb88 100644
--- a/pkgs/development/python-modules/trl/default.nix
+++ b/pkgs/development/python-modules/trl/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "trl";
-  version = "0.23.1";
+  version = "0.24.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "trl";
     tag = "v${version}";
-    hash = "sha256-Zqc9hdi0r4F5/e5SV8ZiY8/x/xHOEQDZ/Rv9G/Dh1zM=";
+    hash = "sha256-t0wOuEKlcZzFlQeS4PYHykFsz+43hYc0gJ9u4emr8HI=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index 5cea96d34d29..2b5ec73544c3 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -10,13 +10,13 @@
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2025.8.26.11";
+    version = "2025.9.11.17";
     pyproject = true;
 
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-5z7/8xfEkqeZAJL5wSZ2xwW/bP5AolipP2P0tMmUFDI=";
+      hash = "sha256-kxyphBpenJQIvCrme1DSis+FvvViGbVoYIdt0fLQJN0=";
     };
 
     postPatch = ''
diff --git a/pkgs/development/python-modules/tsid/default.nix b/pkgs/development/python-modules/tsid/default.nix
new file mode 100644
index 000000000000..3894c80d2854
--- /dev/null
+++ b/pkgs/development/python-modules/tsid/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+
+  toPythonModule,
+  pythonImportsCheckHook,
+
+  tsid,
+
+  pinocchio,
+  python,
+}:
+toPythonModule (
+  tsid.overrideAttrs (super: {
+    pname = "py-${super.pname}";
+
+    cmakeFlags = super.cmakeFlags ++ [
+      (lib.cmakeBool "BUILD_PYTHON_INTERFACE" true)
+      (lib.cmakeBool "BUILD_STANDALONE_PYTHON_INTERFACE" true)
+    ];
+
+    # those are used by CMake at configure/build time
+    nativeBuildInputs = super.nativeBuildInputs ++ [
+      python
+    ];
+
+    propagatedBuildInputs = super.propagatedBuildInputs ++ [
+      pinocchio
+      tsid
+    ];
+
+    nativeCheckInputs = [
+      pythonImportsCheckHook
+    ];
+
+    pythonImportsCheck = [
+      "tsid"
+    ];
+  })
+)
diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix
index a6aecc553194..a23d6b02e47c 100644
--- a/pkgs/development/python-modules/ttn-client/default.nix
+++ b/pkgs/development/python-modules/ttn-client/default.nix
@@ -6,21 +6,18 @@
   hatchling,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "ttn-client";
-  version = "1.2.1";
+  version = "1.2.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "angelnu";
     repo = "thethingsnetwork_python_client";
     tag = "v${version}";
-    hash = "sha256-dWEXoqW4JyYeLFLS3J4CaRJ45wjdVf8wrtMGCKgBds8=";
+    hash = "sha256-PEkxEKet0nrowWJ4J3AqqqdecO4zSbTampz/Dx0QD2s=";
   };
 
   build-system = [ hatchling ];
@@ -42,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to fetch/receive and parse uplink messages from The Thinks Network";
     homepage = "https://github.com/angelnu/thethingsnetwork_python_client";
-    changelog = "https://github.com/angelnu/thethingsnetwork_python_client/releases/tag/v${version}";
+    changelog = "https://github.com/angelnu/thethingsnetwork_python_client/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 6eef16930505..f2144153303b 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "9.8.4";
+  version = "9.8.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     tag = version;
-    hash = "sha256-vkRGSFWCOHcGUC5oBmgvCi1mNFp/SsHv5/bhceYVlY0=";
+    hash = "sha256-krEhiuE3Yd4w9zGpCzvR8X2w6M0dvPRZsavrtTNhKDA=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index c79a1a6fc36f..0139a000f1ff 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -93,7 +93,7 @@
   pytestCheckHook,
 }:
 let
-  version = "9.0.1";
+  version = "9.1.0";
   agent = [
     mcpadapt
     smolagents
@@ -241,7 +241,7 @@ let
     owner = "neuml";
     repo = "txtai";
     tag = "v${version}";
-    hash = "sha256-ciQDKpqTdgYe4oIgd2uxY7491SMr9Snha9XyTpxgXyY=";
+    hash = "sha256-5wr9fTfLVwGksD/+wbw4CktSznDi/xI/WfZBG3+BNYc=";
   };
 in
 buildPythonPackage {
diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index 5bc50ccf9e45..a59301e884ec 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -1,9 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  pythonAtLeast,
   fetchFromGitHub,
+  fetchpatch,
   poetry-core,
   colorlog,
   dataclasses-json,
@@ -14,6 +13,8 @@
   py3langid,
   pytestCheckHook,
   python-dateutil,
+  standard-imghdr,
+  standard-sndhdr,
   scipy,
   toml,
 }:
@@ -24,7 +25,7 @@ let
     d.stopwords
   ]);
 
-  version = "0.0.23";
+  version = "0.0.25";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -32,15 +33,21 @@ buildPythonPackage {
   inherit version;
   pyproject = true;
 
-  disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
-
   src = fetchFromGitHub {
     owner = "mindsdb";
     repo = "type_infer";
     inherit tag;
-    hash = "sha256-tqT/MTcSHcKGoPUUzjPLFpOTchannFsCd2VMC+8kVZ8=";
+    hash = "sha256-WL/2WSy3e2Mg/jNS8afUEnCt10wpXho4uOPAkVdzHWA=";
   };
 
+  patches = [
+    # https://github.com/mindsdb/type_infer/pull/83
+    (fetchpatch {
+      url = "https://github.com/mindsdb/type_infer/commit/d09f88d5ddbe55125b1fff4506b03165d019d88b.patch";
+      hash = "sha256-wNBzb+RxoZC8zn5gdOrtJeXJIIH3DTt1gTZfgN/WnQQ=";
+    })
+  ];
+
   pythonRelaxDeps = [
     "psutil"
     "py3langid"
@@ -59,6 +66,8 @@ buildPythonPackage {
     py3langid
     python-dateutil
     scipy
+    standard-imghdr
+    standard-sndhdr
     toml
   ];
 
diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 7b8d2a1b2289..e8f4a22ca4fd 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -16,7 +16,6 @@
   shellingham,
 
   # tests
-  coverage,
   pytest-xdist,
   pytestCheckHook,
   writableTmpDirAsHomeHook,
@@ -28,16 +27,23 @@
 
 buildPythonPackage rec {
   pname = package;
-  version = "0.17.4";
+  version = "0.19.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "typer";
     tag = version;
-    hash = "sha256-gd4GgoRnQVVmwmW5DprmNRxgjFiRRa8HB6xO9U9wHI8=";
+    hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44=";
   };
 
+  postPatch = ''
+    for f in $(find tests -type f -print); do
+      # replace `sys.executable -m coverage run` with `sys.executable`
+      sed -z -i 's/"-m",\n\?\s*"coverage",\n\?\s*"run",//g' "$f"
+    done
+  '';
+
   env.TIANGOLO_BUILD_PACKAGE = package;
 
   build-system = [ pdm-backend ];
@@ -60,7 +66,6 @@ buildPythonPackage rec {
   doCheck = package == "typer"; # tests expect standard dependencies
 
   nativeCheckInputs = [
-    coverage # execs coverage in tests
     pytest-xdist
     pytestCheckHook
     writableTmpDirAsHomeHook
@@ -80,12 +85,6 @@ buildPythonPackage rec {
     "test_install_completion"
   ];
 
-  disabledTestPaths = [
-    # likely click 8.2 compat issue
-    "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002_an.py"
-    "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002.py"
-  ];
-
   pythonImportsCheck = [ "typer" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix
index 82b27593cd0a..25eab703270c 100644
--- a/pkgs/development/python-modules/types-aiobotocore/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore/default.nix
@@ -364,13 +364,13 @@
 
 buildPythonPackage rec {
   pname = "types-aiobotocore";
-  version = "2.25.0";
+  version = "2.25.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_aiobotocore";
     inherit version;
-    hash = "sha256-fl6WVok11SVQlbX4qu3AwbJldwomCiq27X1Mfqf+gig=";
+    hash = "sha256-Ez09uRNW5T5LIs33RaOS2MBSc4MnPwTUxr0LCkQyDMo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index d26d86687dc0..22f329b3afac 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.27.6";
+  version = "0.28.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-nT8YZak7iywy8TdRSsiMsEi1vEOHOZRboZ2XJpiZW/s=";
+    hash = "sha256-Q0m2/Hsc2cnreCcB+yE4dduJqxeBIZwOlH3XxNnc1l4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix
index e732c6ad25d1..f322c2778a06 100644
--- a/pkgs/development/python-modules/types-decorator/default.nix
+++ b/pkgs/development/python-modules/types-decorator/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-decorator";
-  version = "5.2.0.20250324";
+  version = "5.2.0.20251101";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_decorator";
     inherit version;
-    hash = "sha256-j71ysNrcVhduSOUYfedE52/kW8yRolh0uqdWYkEhVdM=";
+    hash = "sha256-Eg4r9HkuyKR2U9scs4DHqstoYqeXwUkKkQqswhVIKGw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix
index e6cde7039037..1c9e55b09afb 100644
--- a/pkgs/development/python-modules/types-deprecated/default.nix
+++ b/pkgs/development/python-modules/types-deprecated/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-deprecated";
-  version = "1.2.15.20250304";
+  version = "1.3.1.20251101";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_deprecated";
     inherit version;
-    hash = "sha256-wykDBVMCneXMbLMPJpwR9OAOWYxCQSkBefY82n0z9xk=";
+    hash = "sha256-8ALSZrcyAfRuxvxxLB8BYGfsbLRDV1Wc21DIawEJUac=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-html5lib/default.nix b/pkgs/development/python-modules/types-html5lib/default.nix
index 9864c76c1c41..fe97669f03fd 100644
--- a/pkgs/development/python-modules/types-html5lib/default.nix
+++ b/pkgs/development/python-modules/types-html5lib/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-html5lib";
-  version = "1.1.11.20250917";
+  version = "1.1.11.20251014";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_html5lib";
     inherit version;
-    hash = "sha256-e1J0M3fzP5tP1zha+9LUV7iGTuUfkP8qeVrZ6MBTNzo=";
+    hash = "sha256-zGKNYm4BEaJCamT18GHs/RE5WLaf9rPcDqrtI0e6lFU=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-psutil/default.nix b/pkgs/development/python-modules/types-psutil/default.nix
index 008396640946..32336993ace8 100644
--- a/pkgs/development/python-modules/types-psutil/default.nix
+++ b/pkgs/development/python-modules/types-psutil/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "types-psutil";
-  version = "7.0.0.20250801";
+  version = "7.0.0.20250822";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "types_psutil";
     inherit version;
-    hash = "sha256-AjC1YjQlLMb1nDYdzLqqCPMIjqNWk2er5pAEhdOIyX0=";
+    hash = "sha256-Imy8DA6pzApQuKvMHZGibIdty0C+I4Ex9peINpBBlpg=";
   };
 
   # Module doesn't have tests
diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix
index 669d7361fca4..13c18db616f3 100644
--- a/pkgs/development/python-modules/types-regex/default.nix
+++ b/pkgs/development/python-modules/types-regex/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-regex";
-  version = "2025.9.18.20250921";
+  version = "2025.10.23.20251023";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_regex";
     inherit version;
-    hash = "sha256-4XAMIbHDEpDkpt1iWE7R8dadcE7RZ2toqO2i0dJCDD8=";
+    hash = "sha256-dfAjvwrwV+AVennpnmZpBTe+uzXZA9uPKbTlwtO+54I=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/types-requests/default.nix b/pkgs/development/python-modules/types-requests/default.nix
index 24a44fe5db08..3c202ae9f13b 100644
--- a/pkgs/development/python-modules/types-requests/default.nix
+++ b/pkgs/development/python-modules/types-requests/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "types-requests";
-  version = "2.32.4.20250611";
+  version = "2.32.4.20250913";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_requests";
     inherit version;
-    hash = "sha256-dByHd+1kJYML9R5U1qviRfebTcuQGfFiK3c0Y5Rr+CY=";
+    hash = "sha256-q9bU+c46k4PyaXdamDWkwk5c1rn2R9ZPiKpGE8M9710=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-s3transfer/default.nix b/pkgs/development/python-modules/types-s3transfer/default.nix
index 63c845a74e55..3a0b55d4cd7f 100644
--- a/pkgs/development/python-modules/types-s3transfer/default.nix
+++ b/pkgs/development/python-modules/types-s3transfer/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-s3transfer";
-  version = "0.13.1";
+  version = "0.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_s3transfer";
     inherit version;
-    hash = "sha256-zkiNef3X07nTkHGTkSHsqBTsZd46o2vc4fkYnAphzIA=";
+    hash = "sha256-F/gAqHx+r6sENOnYdFLICcKQrpBsICTCQmHFZEeenJU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix
index 8fdcc17567d7..9aa1f469cf14 100644
--- a/pkgs/development/python-modules/types-setuptools/default.nix
+++ b/pkgs/development/python-modules/types-setuptools/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-setuptools";
-  version = "80.9.0.20250801";
+  version = "80.9.0.20250822";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_setuptools";
     inherit version;
-    hash = "sha256-4ekmgvoHImQVOWu04tMfEWoW/75YOwWwH5kQ/N6jt+g=";
+    hash = "sha256-Bw6ncWlo7GeoTH93aNmVL/JNKLZbZZR5ekZPGzBm+WU=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index 662ad9c5eb9a..a85bb0348976 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -11,17 +11,17 @@
 
 buildPythonPackage rec {
   pname = "typing-extensions";
-  version = "4.14.1";
+  version = "4.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "typing_extensions";
     tag = version;
-    hash = "sha256-KzfxVUgPN1cLg73A3TC2zQjYfeLc8x9TtbLmOfmlOkY=";
+    hash = "sha256-3oAlwvNSJ7NhPiHekh4SJI99cPFh29KCCR9314QzsvQ=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
   pythonImportsCheck = [ "typing_extensions" ];
 
diff --git a/pkgs/development/python-modules/typing-inspection/default.nix b/pkgs/development/python-modules/typing-inspection/default.nix
index 9c09a8fdcfec..ce85c5b0d5b6 100644
--- a/pkgs/development/python-modules/typing-inspection/default.nix
+++ b/pkgs/development/python-modules/typing-inspection/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "typing-inspection";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "typing-inspection";
     tag = "v${version}";
-    hash = "sha256-MzOXl1i+rmr08TSH3Nxc0fFkcjATY6i9dFRLsYp+5m0=";
+    hash = "sha256-aGScO+FLEJ5IyI6hBqdsiKJRN7vEG36V5131nhVZEbc=";
   };
 
   build-system = [ hatchling ];
diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index bbeed6182aea..88cf0d02f89f 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -6,28 +6,25 @@
   fetchFromGitHub,
   openssl,
   pkg-config,
-  pythonOlder,
   rustc,
   rustPlatform,
 }:
 
 buildPythonPackage rec {
   pname = "typst";
-  version = "0.13.7";
+  version = "0.14.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "messense";
     repo = "typst-py";
     tag = "v${version}";
-    hash = "sha256-kbdYiWix1gDZPTkmjtrSRV/g60bLKxGbv776ezPaSCA=";
+    hash = "sha256-O6pjw0rVdpVn4PooKjI0deQ+upzL0E7uHTA6wUz40UY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-IhTrGAgGgSPCD1d3pblCOME0AHv5GMV9xRUNSGTXEws=";
+    hash = "sha256-LHaAHoF/7znQ6WFJyxEFo7TRBtqAlPBuSCfOe6GhjQ0=";
   };
 
   build-system = [
@@ -52,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python binding to typst";
     homepage = "https://github.com/messense/typst-py";
-    changelog = "https://github.com/messense/typst-py/releases/tag/v${version}";
+    changelog = "https://github.com/messense/typst-py/releases/tag/v${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/uarray/default.nix b/pkgs/development/python-modules/uarray/default.nix
index 1c222d6ddce5..a9c408e13bac 100644
--- a/pkgs/development/python-modules/uarray/default.nix
+++ b/pkgs/development/python-modules/uarray/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "uarray";
-  version = "0.9.2";
+  version = "0.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Quansight-Labs";
     repo = "uarray";
     tag = version;
-    hash = "sha256-eCrmmP+9TI+T8Km8MOz0EqseneFwPizlnZloK5yNLcM=";
+    hash = "sha256-Nog7jvRG/EFf3n3W2DWC7UML5NyrlaaS0ECis5rtCSk=";
   };
 
   build-system = [
@@ -67,6 +67,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Universal array library";
     homepage = "https://github.com/Quansight-Labs/uarray";
+    changelog = "https://github.com/Quansight-Labs/uarray/releases/tag/${src.tag}";
     license = licenses.bsd0;
     maintainers = [ lib.maintainers.pbsds ];
   };
diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix
index a0ec0df2277b..3e983d5dacfb 100644
--- a/pkgs/development/python-modules/ucsmsdk/default.nix
+++ b/pkgs/development/python-modules/ucsmsdk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ucsmsdk";
-  version = "0.9.23";
+  version = "0.9.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CiscoUcs";
     repo = "ucsmsdk";
     tag = "v${version}";
-    hash = "sha256-UVOEJl+oSjf6gaVaa6QWBfEViUPmhgUiSm6rerkZ+EM=";
+    hash = "sha256-c2Tvm4xMyda9PoL7VWMCo7/RjSVcHBJQMh4GeTzgz5I=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 7f55664ad786..7537b44f8d60 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -1,20 +1,29 @@
 {
   lib,
-  black,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
+  fetchpatch2,
+
+  # build-system
   flit-core,
+
+  # dependencies
+  black,
+  click,
   libcst,
   moreorless,
-  pygls,
-  pythonOlder,
   tomlkit,
   trailrunner,
-  ruff-api,
   typing-extensions,
-  unittestCheckHook,
   usort,
+
+  # optional-dependencies
+  pygls,
+  ruff-api,
+
+  # tests
+  unittestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -22,8 +31,6 @@ buildPythonPackage rec {
   version = "2.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "ufmt";
@@ -31,6 +38,17 @@ buildPythonPackage rec {
     hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
   };
 
+  patches = [
+    # Fix click 8.2.x incompatibility
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    # https://github.com/omnilib/ufmt/pull/260
+    (fetchpatch2 {
+      name = "fix-click-incompatibility.patch";
+      url = "https://github.com/omnilib/ufmt/pull/260/commits/7980d7cd0a29fbd287e10d939248ef7c9d38a660.patch";
+      hash = "sha256-97/jQVGCC+PXk8uxyF/M7XlLuVqJ5SgQZd/MXkaiO70=";
+    })
+  ];
+
   build-system = [ flit-core ];
 
   dependencies = [
@@ -51,17 +69,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     unittestCheckHook
+    versionCheckHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
+  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "ufmt" ];
 
-  meta = with lib; {
+  meta = {
     description = "Safe, atomic formatting with black and usort";
     homepage = "https://github.com/omnilib/ufmt";
     changelog = "https://github.com/omnilib/ufmt/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ufmt";
   };
 }
diff --git a/pkgs/development/python-modules/ufo2ft/default.nix b/pkgs/development/python-modules/ufo2ft/default.nix
index 871fb640c09f..5e443864e609 100644
--- a/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/pkgs/development/python-modules/ufo2ft/default.nix
@@ -6,11 +6,10 @@
   compreffor,
   cu2qu,
   defcon,
-  fetchPypi,
+  fetchFromGitHub,
   fontmath,
   fonttools,
   pytestCheckHook,
-  pythonOlder,
   setuptools-scm,
   skia-pathops,
   syrupy,
@@ -19,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "ufo2ft";
-  version = "3.6.0";
+  version = "3.6.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-hKqTjD8cTgyxHZnaojPAT5JY11okvLiNOnemoULnpmw=";
+  src = fetchFromGitHub {
+    owner = "googlefonts";
+    repo = "ufo2ft";
+    tag = "v${version}";
+    hash = "sha256-TIeq4As5nThYck5jQLTdZySfOg51DtkiiYiiWEVSzxo=";
   };
 
   build-system = [
@@ -69,11 +68,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ufo2ft" ];
 
-  meta = with lib; {
+  meta = {
     description = "Bridge from UFOs to FontTools objects";
     homepage = "https://github.com/googlefonts/ufo2ft";
-    changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/v${version}";
-    license = licenses.mit;
+    changelog = "https://github.com/googlefonts/ufo2ft/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/uhashring/default.nix b/pkgs/development/python-modules/uhashring/default.nix
new file mode 100644
index 000000000000..513dd2ddab72
--- /dev/null
+++ b/pkgs/development/python-modules/uhashring/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  pytestCheckHook,
+  fetchFromGitHub,
+  hatchling,
+  python-memcached,
+}:
+buildPythonPackage rec {
+  pname = "uhashring";
+  version = "2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ultrabug";
+    repo = "uhashring";
+    tag = version;
+    hash = "sha256-6zNPExbcwTUne0lT8V6xp2Gf6J1VgG7Q93qizVOAc+k=";
+  };
+
+  build-system = [
+    hatchling
+  ];
+
+  pythonImportsCheck = [
+    "uhashring"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    python-memcached
+  ];
+
+  meta = {
+    description = "Full featured consistent hashing python library compatible with ketama";
+    homepage = "https://github.com/ultrabug/uhashring";
+    changelog = "https://github.com/ultrabug/uhashring/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ typedrat ];
+  };
+}
diff --git a/pkgs/development/python-modules/uiprotect/default.nix b/pkgs/development/python-modules/uiprotect/default.nix
index c460122575f6..54a9c6d68609 100644
--- a/pkgs/development/python-modules/uiprotect/default.nix
+++ b/pkgs/development/python-modules/uiprotect/default.nix
@@ -40,7 +40,7 @@
 
 buildPythonPackage rec {
   pname = "uiprotect";
-  version = "7.21.1";
+  version = "7.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -49,7 +49,7 @@ buildPythonPackage rec {
     owner = "uilibs";
     repo = "uiprotect";
     tag = "v${version}";
-    hash = "sha256-8OxEEQuCMKHTYIpa9pfgyAhgkCMy6wpvJDMcckbV8wY=";
+    hash = "sha256-UScv0RAIgkFYl3yJZDuSzXXV3iI/3maV42hN4EtfUio=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/ultralytics-thop/default.nix b/pkgs/development/python-modules/ultralytics-thop/default.nix
index adf61bf830bb..cff90dd11b3f 100644
--- a/pkgs/development/python-modules/ultralytics-thop/default.nix
+++ b/pkgs/development/python-modules/ultralytics-thop/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics-thop";
-  version = "2.0.17";
+  version = "2.0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "thop";
     tag = "v${version}";
-    hash = "sha256-7bNwSbazDlxsaDbyqx2DVhiQ8JgFF3Z+olNLa91jDb4=";
+    hash = "sha256-Vi3QURIEZaOk/PJFRB+GEFmksvo2ZSkhXe+HQE6yWcU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index 3bba38a94899..4ae7aecd7d08 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics";
-  version = "8.3.213";
+  version = "8.3.221";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${version}";
-    hash = "sha256-xlsC+sENv4xhKf0H+h1Kd9AyRE2KEVCRL91BMhH1wA4=";
+    hash = "sha256-oQuiAq1QJlgrEDk26/+pcIifFBO/ckH1qG7niEXbMIo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/uncertainties/default.nix b/pkgs/development/python-modules/uncertainties/default.nix
index a54accfa3516..5b130b5ffea9 100644
--- a/pkgs/development/python-modules/uncertainties/default.nix
+++ b/pkgs/development/python-modules/uncertainties/default.nix
@@ -38,6 +38,11 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.arrays;
 
+  disabledTests = [
+    # Flaky tests, see: https://github.com/lmfit/uncertainties/issues/343
+    "test_repeated_summation_complexity"
+  ];
+
   pythonImportsCheck = [ "uncertainties" ];
 
   meta = {
diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix
index 5aa7c84604de..ed03f3a89ace 100644
--- a/pkgs/development/python-modules/unicode-rbnf/default.nix
+++ b/pkgs/development/python-modules/unicode-rbnf/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "unicode-rbnf";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "unicode-rbnf";
     tag = "v${version}";
-    hash = "sha256-RRPQHU8UMVspbhqKVR165czbYY42JopF6Nrhm0up3hw=";
+    hash = "sha256-t5QHZVBIRVyhqmgVno3Nql6W0Q91DZ8sJA+nFBdKkj4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix
index b2ef805de809..7b60c65ef0b3 100644
--- a/pkgs/development/python-modules/unicodedata2/default.nix
+++ b/pkgs/development/python-modules/unicodedata2/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "unicodedata2";
-  version = "16.0.0";
+  version = "17.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "05488d6592b59cd78b61ec37d38725416b2df62efafa6a0d63a631b27aa474fc";
+    sha256 = "sha256-/6Lw1oNGQv6ZbTVuco2ohyAVM7tUCXSuesl15m7MDjo=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/unidns/default.nix b/pkgs/development/python-modules/unidns/default.nix
new file mode 100644
index 000000000000..4655b929538d
--- /dev/null
+++ b/pkgs/development/python-modules/unidns/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  asysocks,
+}:
+
+buildPythonPackage rec {
+  pname = "unidns";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "skelsec";
+    repo = "unidns";
+    tag = version;
+    hash = "sha256-uhTb27HeBaoI4yURpNf1+D6bWIXSsmYzUyk0RJmgbjQ=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "asysocks"
+  ];
+
+  dependencies = [
+    asysocks
+  ];
+
+  # No tests provided
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "unidns"
+  ];
+
+  meta = {
+    description = "Basic async DNS library";
+    homepage = "https://github.com/skelsec/unidns";
+    changelog = "https://github.com/skelsec/unidns/releases/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}
diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix
index 7878aa3b956b..d5acaff2b326 100644
--- a/pkgs/development/python-modules/universal-pathlib/default.nix
+++ b/pkgs/development/python-modules/universal-pathlib/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fsspec/universal_pathlib";
     changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index 797f9b71a849..222ef7b64123 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "universal-silabs-flasher";
-  version = "0.0.35";
+  version = "0.0.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "universal-silabs-flasher";
     tag = "v${version}";
-    hash = "sha256-6NOcEH1UUicZHKOQ91o4l7JiC1Qwpc8vWyRR7TRENqs=";
+    hash = "sha256-XvDzv39at+6h1Q2tmiYiNsLpcMTx+sOd958K+PB0WSc=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 190b3ed4bd9a..a00d974ce26a 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "5.6.6";
+  version = "5.6.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
     tag = "v${version}";
-    hash = "sha256-1zZr+SrGRNBz/Wd1cT2aYOH/MzSZTCuqxYIlA+NXqLk=";
+    hash = "sha256-Kk8Paa6vx364BBfzfxh8f3muevwNg0I7n5CszjiWUo0=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/urllib3-future/default.nix b/pkgs/development/python-modules/urllib3-future/default.nix
index 04c3e720ee80..28c9687c9ba5 100644
--- a/pkgs/development/python-modules/urllib3-future/default.nix
+++ b/pkgs/development/python-modules/urllib3-future/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "urllib3-future";
-  version = "2.14.902";
+  version = "2.14.905";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jawah";
     repo = "urllib3.future";
     tag = version;
-    hash = "sha256-DOrc5QHxwF8QokHm9Hg5IfqmODxD/bTA2UuOpgvNMx0=";
+    hash = "sha256-PAGp43gdzMRQpiErqgPTIJ0ctmr1t5Q9oZDcVQNnoKQ=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix
index 3c522d4f7f8f..2420884befc2 100644
--- a/pkgs/development/python-modules/usort/default.nix
+++ b/pkgs/development/python-modules/usort/default.nix
@@ -8,7 +8,6 @@
   hatchling,
   libcst,
   moreorless,
-  pythonOlder,
   stdlibs,
   toml,
   trailrunner,
@@ -18,24 +17,22 @@
 
 buildPythonPackage rec {
   pname = "usort";
-  version = "1.0.8";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  version = "1.1.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "usort";
     tag = "v${version}";
-    hash = "sha256-iezq2K+Rw0djyOoFm7tguw/vkkDSyrPZIfZPmaZvFpM=";
+    hash = "sha256-QnhpnuEt6j/QPmX29A0523QDh4o2QfaCoDI0YJpTc8Y=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     click
     libcst
@@ -54,10 +51,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Safe, minimal import sorting for Python projects";
-    mainProgram = "usort";
     homepage = "https://github.com/facebook/usort";
-    changelog = "https://github.com/facebook/usort/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/facebook/usort/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "usort";
   };
 }
diff --git a/pkgs/development/python-modules/uv-build/default.nix b/pkgs/development/python-modules/uv-build/default.nix
index 84840a3df9e1..e9111bd69b13 100644
--- a/pkgs/development/python-modules/uv-build/default.nix
+++ b/pkgs/development/python-modules/uv-build/default.nix
@@ -1,26 +1,34 @@
 {
   lib,
   pkgs,
+  fetchFromGitHub,
   buildPythonPackage,
   rustPlatform,
   callPackage,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "uv-build";
+  version = "0.9.7";
   pyproject = true;
 
-  inherit (pkgs.uv)
-    version
-    src
-    cargoDeps
-    ;
+  src = fetchFromGitHub {
+    owner = "astral-sh";
+    repo = "uv";
+    tag = version;
+    hash = "sha256-I0Oe6vaH7iQh+Ubp5RIk8Ol6Ni7OPu8HKX0fqLdewyk=";
+  };
 
   nativeBuildInputs = [
     rustPlatform.cargoSetupHook
     rustPlatform.maturinBuildHook
   ];
 
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-K/RP7EA0VAAI8TGx+VwfKPmyT6+x4p3kekuoMZ0/egc=";
+  };
+
   buildAndTestSubdir = "crates/uv-build";
 
   # $src/.github/workflows/build-binaries.yml#L139
@@ -32,7 +40,11 @@ buildPythonPackage {
   doCheck = false;
 
   # Run the tests of a package built by `uv_build`.
-  passthru.tests.built-by-uv = callPackage ./built-by-uv.nix { inherit (pkgs) uv; };
+  passthru = {
+    tests.built-by-uv = callPackage ./built-by-uv.nix { inherit (pkgs) uv; };
+
+    # updateScript is not needed here, as updating is done on staging
+  };
 
   meta = {
     description = "Minimal build backend for uv";
diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index bde90d49d258..63251d02f9cf 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   buildPythonPackage,
   pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   fetchpatch,
 
   # build-system
@@ -21,30 +21,16 @@
 
 buildPythonPackage rec {
   pname = "uvloop";
-  version = "0.21.0";
+  version = "0.22.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-O/ErD9poRHgGp62Ee/pZFhMXcnXTW2ckse5XP6o3BOM=";
+  src = fetchFromGitHub {
+    owner = "MagicStack";
+    repo = "uvloop";
+    tag = "v${version}";
+    hash = "sha256-LAOa+Oshssy4ZHl4eE6dn2DeZQ9d5tRDV5Hv9BCJJ3c=";
   };
 
-  patches = [
-    # fix test failures on Python 3.13
-    # (remove on next update)
-    (fetchpatch {
-      url = "https://github.com/MagicStack/uvloop/commit/96b7ed31afaf02800d779a395591da6a2c8c50e1.patch";
-      hash = "sha256-Nbe3BuIuwlylll5fIYij+OiP90ZeFNI0GKHK9SwWRk8=";
-      excludes = [ ".github/workflows/tests.yml" ];
-    })
-    (fetchpatch {
-      url = "https://github.com/MagicStack/uvloop/commit/56807922f847ddac231a53d5b03eef70092b987c.patch";
-      hash = "sha256-X5Ob1t/CRy9csw2JrWvwS55G6qTqZhIuGLTy83O03GU=";
-    })
-  ];
-
   postPatch = ''
     rm -rf vendor
 
@@ -80,6 +66,10 @@ buildPythonPackage rec {
     "tests/test_base.py::TestBaseUV.test_call_at"
     # Pointless and flaky (at least on darwin, depending on the sandbox perhaps)
     "tests/test_dns.py"
+    # Asserts on exact wording of error message
+    "tests/test_tcp.py::Test_AIO_TCP::test_create_connection_open_con_addr"
+    # ConnectionAbortedError: SSL handshake is taking longer than 15.0 seconds
+    "tests/test_tcp.py::Test_AIO_TCPSSL::test_create_connection_ssl_1"
   ]
   ++ lib.optionals (pythonOlder "3.11") [
     "tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"
diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index e728ce1b5120..3ee7edd3fd3c 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -18,14 +18,14 @@
 }:
 buildPythonPackage rec {
   pname = "uxsim";
-  version = "1.10.0";
+  version = "1.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
     tag = "v${version}";
-    hash = "sha256-4ZN52atcAbT6z9GzV4tOA3IiDYu+v4i3NHfauMPwMJ0=";
+    hash = "sha256-GK1tD0STBCR0Z/JHdhrgLun6t2snJqi/oFGUOeiXk6c=";
   };
 
   patches = [ ./add-qt-plugin-path-to-env.patch ];
diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index 0a92d42fa9c4..62d734364025 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "vector";
-  version = "1.6.3";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "vector";
     tag = "v${version}";
-    hash = "sha256-KwxQ2sA8cdHmTRbh23H5iTexMlWK2MxdA8XWpXscpfU=";
+    hash = "sha256-U1ttxt7Ba+NrcbslmkZT/d+ZdXrmk0teT5vGAcfLqF4=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/vegehub/default.nix b/pkgs/development/python-modules/vegehub/default.nix
index ae7b272fb8bf..5ec7c0d89948 100644
--- a/pkgs/development/python-modules/vegehub/default.nix
+++ b/pkgs/development/python-modules/vegehub/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "vegehub";
-  version = "0.1.24";
+  version = "0.1.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Thulrus";
     repo = "VegeHubPyPiLib";
     tag = "V${version}";
-    hash = "sha256-W/5kvertNC7w2IS/N5k06cDyNFgel2s4/znR+Lz5RJU=";
+    hash = "sha256-OrHUT1WchsaoPNFBZn74jpihd8I/R1RB0+KZRKg9Zrs=";
   };
 
   postPatch = ''
@@ -40,6 +40,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/Thulrus/VegeHubPyPiLib/releases/tag/${src.tag}";
     description = "Basic package for simplifying interactions with the Vegetronix VegeHub";
     homepage = "https://github.com/Thulrus/VegeHubPyPiLib";
     license = lib.licenses.gpl3Plus;
diff --git a/pkgs/development/python-modules/versioningit/default.nix b/pkgs/development/python-modules/versioningit/default.nix
index 42cf3a141c0d..802614d21df8 100644
--- a/pkgs/development/python-modules/versioningit/default.nix
+++ b/pkgs/development/python-modules/versioningit/default.nix
@@ -5,7 +5,6 @@
   fetchPypi,
   packaging,
   tomli,
-  coverage,
   pytestCheckHook,
   build,
   hatchling,
@@ -27,6 +26,11 @@ buildPythonPackage rec {
     hash = "sha256-uRrX1z5z0hIg5pVA8gIT8rcpofmzXATp4Tfq8o0iFNo=";
   };
 
+  postPatch = ''
+    substituteInPlace tox.ini \
+      --replace-fail "ignore:.*No source for code:coverage.exceptions.CoverageWarning" ""
+  '';
+
   build-system = [ hatchling ];
 
   dependencies = [
@@ -35,7 +39,6 @@ buildPythonPackage rec {
   ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
   nativeCheckInputs = [
-    coverage
     pytestCheckHook
     build
     hatchling
diff --git a/pkgs/development/python-modules/victron-vrm/default.nix b/pkgs/development/python-modules/victron-vrm/default.nix
new file mode 100644
index 000000000000..fdb916295599
--- /dev/null
+++ b/pkgs/development/python-modules/victron-vrm/default.nix
@@ -0,0 +1,50 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  pytz,
+}:
+
+buildPythonPackage rec {
+  pname = "victron-vrm";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KSoft-Si";
+    repo = "vrm-client";
+    tag = "v${version}";
+    hash = "sha256-NxkMUwiFD8C7Nrtd7cjoFvdkbAOJkIIt+TPtkous8Nc=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+    pytz
+  ];
+
+  pythonImportsCheck = [ "victron_vrm" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # tests connect to vrmapi.victronenergy.com
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/KSoft-Si/vrm-client/releases/tag/${src.tag}";
+    description = "Async Python client for the Victron Energy VRM API";
+    homepage = "https://github.com/KSoft-Si/vrm-client";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index 131138132608..ca759392b585 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -104,6 +104,20 @@ let
     hash = "sha256-HJY+Go1viPkSVZPEs/NyMtYJzas4mMLiIZF3kNX+WgA=";
   };
 
+  # FlashMLA's Blackwell (SM100) kernels were developed against CUTLASS v3.9.0
+  # (since https://github.com/vllm-project/FlashMLA/commit/9c5dfab6d1746b4a27af14f440e7afd5c01ece68)
+  # and are currently incompatible with CUTLASS v4.x APIs. The rest of the vLLM
+  # build uses a newer CUTLASS, so we package both versions.
+  # See upstream issue: https://github.com/vllm-project/vllm/issues/27425
+  # See git submodule commit at:
+  # https://github.com/vllm-project/FlashMLA/tree/${flashmla.src.rev}/csrc
+  cutlass-flashmla = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    tag = "v3.9.0";
+    hash = "sha256-Q6y/Z6vahASeSsfxvZDwbMFHGx8CnsF90IlveeVLO9g=";
+  };
+
   flashmla = stdenv.mkDerivation {
     pname = "flashmla";
     # https://github.com/vllm-project/FlashMLA/blob/${src.rev}/setup.py
@@ -123,7 +137,7 @@ let
     # flashmla normally relies on `git submodule update` to fetch cutlass
     buildPhase = ''
       rm -rf csrc/cutlass
-      ln -sf ${cutlass} csrc/cutlass
+      ln -sf ${cutlass-flashmla} csrc/cutlass
     '';
 
     installPhase = ''
@@ -199,19 +213,16 @@ let
         "8.9"
         "9.0"
         "9.0a"
-        # Blackwell (SM100+) capabilities temporarily disabled due to CUTLASS API incompatibility
-        # FlashMLA kernels require CUTLASS v4.2.1+ APIs not available in bundled v4.0.0
-        # TODO: Re-enable when vLLM upgrades CUTLASS (see https://github.com/vllm-project/vllm/pull/24673)
-        # "10.0"
-        # "10.0a"
-        # "10.1"
-        # "10.1a"
-        # "10.3"
-        # "10.3a"
-        # "12.0"
-        # "12.0a"
-        # "12.1"
-        # "12.1a"
+        "10.0"
+        "10.0a"
+        "10.1"
+        "10.1a"
+        "10.3"
+        "10.3a"
+        "12.0"
+        "12.0a"
+        "12.1"
+        "12.1a"
       ];
       ptx = lists.map (x: "${x}+PTX") real;
     in
@@ -282,7 +293,7 @@ buildPythonPackage rec {
     owner = "vllm-project";
     repo = "vllm";
     tag = "v${version}";
-    hash = "sha256-uYK/e9McEyrDTACMk5S0cGCjai9rf6HMR9dpPL7ISYc=";
+    hash = "sha256-47TPvvPQvVbh6Gm2yvi+xhWZ8tSma91rp9hp/SBrEY8=";
   };
 
   patches = [
diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix
index 98d29e05eece..215c495de805 100644
--- a/pkgs/development/python-modules/voluptuous-openapi/default.nix
+++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "voluptuous-openapi";
-  version = "0.1.0";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "voluptuous-openapi";
-    tag = "v${version}";
-    hash = "sha256-cfunRVEFz8gMLEtZ6nhH7w/rW5ea0JaaV+W/4gm4mwo=";
+    tag = version;
+    hash = "sha256-uIW+WyfSNdGxD7tA6ERf3nTp1tFhWd+lxFUNQM0O3nU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index a7556309236e..431813221fe8 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "vt-py";
-  version = "0.21.0";
+  version = "0.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "vt-py";
     tag = version;
-    hash = "sha256-hp9MjFSakFezlT/rTHa70KrL3VShhpayXaK88LxY7I4=";
+    hash = "sha256-CReFwX/7UCyFWVG/3hXwTVt92x+n+eu3FhvrKtDrgNU=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index d673a96face7..9e81d3601b94 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -44,7 +44,6 @@
   bokeh,
   boto3,
   cloudpickle,
-  coverage,
   flask,
   google-cloud-artifact-registry,
   google-cloud-compute,
@@ -228,7 +227,6 @@ buildPythonPackage rec {
     bokeh
     boto3
     cloudpickle
-    coverage
     flask
     google-cloud-artifact-registry
     google-cloud-compute
diff --git a/pkgs/development/python-modules/warp-lang/clang-libs.patch b/pkgs/development/python-modules/warp-lang/clang-libs.patch
new file mode 100644
index 000000000000..3c8a5b87a0b8
--- /dev/null
+++ b/pkgs/development/python-modules/warp-lang/clang-libs.patch
@@ -0,0 +1,15 @@
+diff --git a/warp/build_dll.py b/warp/build_dll.py
+index 2218ff13..3fcf5796 100644
+--- a/warp/build_dll.py
++++ b/warp/build_dll.py
+@@ -404,8 +404,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
+         cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
+         cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
+ 
+-        cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
+-        cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
++        cpp_includes = ' -I"@LLVM_DEV@/include"'
++        cpp_includes += ' -I"@LIBCLANG_DEV@/include"'
+         cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
+         includes = cpp_includes + cuda_includes
+
diff --git a/pkgs/development/python-modules/warp-lang/clang-path.patch b/pkgs/development/python-modules/warp-lang/clang-path.patch
new file mode 100644
index 000000000000..ad87f9b3ab15
--- /dev/null
+++ b/pkgs/development/python-modules/warp-lang/clang-path.patch
@@ -0,0 +1,28 @@
+diff --git a/warp/build_dll.py b/warp/build_dll.py
+index 11d2a898..33fb2a76 100644
+--- a/warp/build_dll.py
++++ b/warp/build_dll.py
+@@ -636,8 +636,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str]
+ 
+     else:
+         # Unix compilation
+-        cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
+-        cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
++        cuda_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "nvcc"
++        cpp_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "g++"
+ 
+         cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
+         cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
+@@ -687,9 +687,9 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str]
+             else:
+                 # Use Clang compiler
+                 if mode == "debug":
+-                    cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
++                    cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
+                 elif mode == "release":
+-                    cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
++                    cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
+ 
+             with ScopedTimer("build_cuda", active=args.verbose):
+                 run_cmd(cuda_cmd)
+
diff --git a/pkgs/development/python-modules/warp-lang/standalone-cxx11-abi.patch b/pkgs/development/python-modules/warp-lang/cxx11-abi.patch
similarity index 100%
rename from pkgs/development/python-modules/warp-lang/standalone-cxx11-abi.patch
rename to pkgs/development/python-modules/warp-lang/cxx11-abi.patch
diff --git a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
index 64bc5c58c7e5..beda9f58e6de 100644
--- a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
+++ b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
@@ -18,20 +18,3 @@ index 2218ff13..53786017 100644
          if cu_path:
              cu_out = cu_path + ".o"
  
-diff --git a/warp/native/crt.h b/warp/native/crt.h
-index 47ef9983..89ae289b 100644
---- a/warp/native/crt.h
-+++ b/warp/native/crt.h
-@@ -65,6 +65,12 @@ extern "C" WP_API int _wp_isinf(double);
- #include <float.h>
- #include <string.h>
- 
-+#undef isfinite
-+#undef isinf
-+#undef isnan
-+
-+#include <cmath>
-+
- #else
- 
- // These definitions are taken from Jitify: https://github.com/NVIDIA/jitify
diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index cd521021b7f8..0f90b01b2801 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -3,11 +3,11 @@
   buildPythonPackage,
   config,
   cudaPackages,
+  callPackage,
   fetchFromGitHub,
-  fetchurl,
   jax,
   lib,
-  llvmPackages,
+  llvmPackages, # TODO: use llvm 21 in 1.10, see python-packages.nix
   numpy,
   pkgsBuildHost,
   python,
@@ -32,105 +32,16 @@
   # libmathdxSupport ? cudaSupport && stdenv.hostPlatform.isLinux,
   libmathdxSupport ? cudaSupport,
 }@args:
+
 assert libmathdxSupport -> cudaSupport;
+
 let
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
   stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
 
-  version = "1.9.0";
+  version = "1.9.1";
 
-  libmathdx = effectiveStdenv.mkDerivation (finalAttrs: {
-    # NOTE: The version used should match the version Warp requires:
-    # https://github.com/NVIDIA/warp/blob/${version}/deps/libmathdx-deps.packman.xml
-    pname = "libmathdx";
-    version = "0.2.3";
-
-    outputs = [
-      "out"
-      "static"
-    ];
-
-    src =
-      let
-        baseURL = "https://developer.nvidia.com/downloads/compute/cublasdx/redist/cublasdx";
-        cudaMajorVersion = cudaPackages.cudaMajorVersion; # only 12, 13 supported
-        cudaVersion = "${cudaMajorVersion}.0"; # URL example: ${baseURL}/cuda12/${name}-${version}-cuda12.0.zip
-        name = lib.concatStringsSep "-" [
-          finalAttrs.pname
-          "Linux"
-          effectiveStdenv.hostPlatform.parsed.cpu.name
-          finalAttrs.version
-          "cuda${cudaVersion}"
-        ];
-
-        # nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")
-        hashes = {
-          "12" = {
-            aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";
-            x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";
-          };
-          "13" = {
-            aarch64-linux = "sha256-TetJbMts8tpmj5PV4+jpnUHMcooDrXUEKL3aGWqilKI=";
-            x86_64-linux = "sha256-wLJLbRpQWa6QEm8ibm1gxt3mXvkWvu0vEzpnqTIvE1M=";
-          };
-        };
-      in
-      lib.mapNullable (
-        hash:
-        fetchurl {
-          inherit hash name;
-          url = "${baseURL}/cuda${cudaMajorVersion}/${name}.tar.gz";
-        }
-      ) (hashes.${cudaMajorVersion}.${effectiveStdenv.hostPlatform.system} or null);
-
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p "$out"
-      tar -xzf "$src" -C "$out"
-
-      mkdir -p "$static"
-      moveToOutput "lib/libmathdx_static.a" "$static"
-
-      runHook postInstall
-    '';
-
-    meta = {
-      description = "Library used to integrate cuBLASDx and cuFFTDx into Warp";
-      homepage = "https://developer.nvidia.com/cublasdx-downloads";
-      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-      license = with lib.licenses; [
-        # By downloading and using the software, you agree to fully
-        # comply with the terms and conditions of the NVIDIA Software
-        # License Agreement.
-        (
-          nvidiaCudaRedist
-          // {
-            url = "https://developer.download.nvidia.cn/compute/mathdx/License.txt";
-          }
-        )
-
-        # Some of the libmathdx routines were written by or derived
-        # from code written by Meta Platforms, Inc. and affiliates and
-        # are subject to the BSD License.
-        bsd3
-
-        # Some of the libmathdx routines were written by or derived from
-        # code written by Victor Zverovich and are subject to the following
-        # license:
-        mit
-      ];
-      platforms = [
-        "aarch64-linux"
-        "x86_64-linux"
-      ];
-      maintainers = with lib.maintainers; [ yzx9 ];
-    };
-  });
+  libmathdx = callPackage ./libmathdx.nix { };
 in
 buildPythonPackage {
   pname = "warp-lang";
@@ -148,44 +59,54 @@ buildPythonPackage {
     owner = "NVIDIA";
     repo = "warp";
     tag = "v${version}";
-    hash = "sha256-OEg2mUsEdRKhgx0fIraqme4moKNh1RSdN7/yCT1V5+g=";
+    hash = "sha256-Atp3WyxQ7GYwWLmQIUgoPULyVlNjduh4/9CBixNWFwc=";
   };
 
-  patches =
-    lib.optionals effectiveStdenv.hostPlatform.isDarwin [
-      (replaceVars ./darwin-libcxx.patch {
-        LIBCXX_DEV = llvmPackages.libcxx.dev;
-        LIBCXX_LIB = llvmPackages.libcxx;
-      })
-      ./darwin-single-target.patch
-    ]
-    ++ lib.optionals standaloneSupport [
-      (replaceVars ./standalone-llvm.patch {
-        LLVM_DEV = llvmPackages.llvm.dev;
-        LLVM_LIB = llvmPackages.llvm.lib;
-        LIBCLANG_DEV = llvmPackages.libclang.dev;
-        LIBCLANG_LIB = llvmPackages.libclang.lib;
-      })
-      ./standalone-cxx11-abi.patch
-    ];
+  patches = [
+    ./cxx11-abi.patch
+  ]
+  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
+    (replaceVars ./darwin-libcxx.patch {
+      LIBCXX_DEV = llvmPackages.libcxx.dev;
+      LIBCXX_LIB = llvmPackages.libcxx;
+    })
+
+    ./darwin-single-target.patch
+  ]
+  ++ lib.optionals (effectiveStdenv.cc.isClang || standaloneSupport) [
+    (replaceVars ./clang-path.patch {
+      CLANG = "${effectiveStdenv.cc}/bin/cc";
+    })
+
+    (replaceVars ./clang-libs.patch {
+      LLVM_DEV = llvmPackages.llvm.dev;
+      LIBCLANG_DEV = llvmPackages.libclang.dev;
+    })
+  ]
+  ++ lib.optionals standaloneSupport [
+    (replaceVars ./llvm-libs.patch {
+      LLVM_LIB = llvmPackages.llvm.lib;
+      LIBCLANG_LIB = llvmPackages.libclang.lib;
+    })
+  ];
 
   postPatch =
     # Patch build_dll.py to use our gencode flags rather than NVIDIA's very broad defaults.
     lib.optionalString cudaSupport ''
       nixLog "patching $PWD/warp/build_dll.py to use our gencode flags"
       substituteInPlace "$PWD/warp/build_dll.py" \
-          --replace-fail \
-            '*gencode_opts,' \
-            '${
-              lib.concatMapStringsSep ", " (gencodeString: ''"${gencodeString}"'') cudaPackages.flags.gencode
-            },' \
-          --replace-fail \
-            '*clang_arch_flags,' \
-            '${
-              lib.concatMapStringsSep ", " (
-                realArch: ''"--cuda-gpu-arch=${realArch}"''
-              ) cudaPackages.flags.realArches
-            },'
+        --replace-fail \
+          '*gencode_opts,' \
+          '${
+            lib.concatMapStringsSep ", " (gencodeString: ''"${gencodeString}"'') cudaPackages.flags.gencode
+          },' \
+        --replace-fail \
+          '*clang_arch_flags,' \
+          '${
+            lib.concatMapStringsSep ", " (
+              realArch: ''"--cuda-gpu-arch=${realArch}"''
+            ) cudaPackages.flags.realArches
+          },'
     ''
     # Patch build_dll.py to use dynamic libraries rather than static ones.
     # NOTE: We do not patch the `nvptxcompiler_static` path because it is not available as a dynamic library.
@@ -236,11 +157,10 @@ buildPythonPackage {
     numpy
   ];
 
-  # NOTE: While normally we wouldn't include autoAddDriverRunpath for packages built from source, since Warp
-  # will be loading GPU drivers at runtime, we need to inject the path to our video drivers.
   nativeBuildInputs = lib.optionals cudaSupport [
+    # NOTE: While normally we wouldn't include autoAddDriverRunpath for packages built from source, since Warp
+    # will be loading GPU drivers at runtime, we need to inject the path to our video drivers.
     autoAddDriverRunpath
-    cudaPackages.cuda_nvcc
   ];
 
   buildInputs =
@@ -250,7 +170,7 @@ buildPythonPackage {
       llvmPackages.libcxx
     ]
     ++ lib.optionals cudaSupport [
-      (lib.getOutput "static" cudaPackages.cuda_nvcc) # dependency on nvptxcompiler_static; no dynamic version available
+      (lib.getStatic cudaPackages.cuda_nvcc) # dependency on nvptxcompiler_static; no dynamic version available
       cudaPackages.cuda_cccl
       cudaPackages.cuda_cudart
       cudaPackages.cuda_nvcc
diff --git a/pkgs/development/python-modules/warp-lang/libmathdx.nix b/pkgs/development/python-modules/warp-lang/libmathdx.nix
new file mode 100644
index 000000000000..1de70997fd66
--- /dev/null
+++ b/pkgs/development/python-modules/warp-lang/libmathdx.nix
@@ -0,0 +1,95 @@
+{
+  _cuda,
+  cudaPackages,
+  fetchurl,
+  lib,
+  stdenvNoCC,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  # NOTE: The version used should match the version Warp requires:
+  # https://github.com/NVIDIA/warp/blob/${version}/deps/libmathdx-deps.packman.xml
+  pname = "libmathdx";
+  version = "0.2.3";
+
+  outputs = [
+    "out"
+    "static"
+  ];
+
+  src =
+    let
+      baseURL = "https://developer.nvidia.com/downloads/compute/cublasdx/redist/cublasdx";
+      cudaMajorVersion = cudaPackages.cudaMajorVersion; # only 12, 13 supported
+      cudaVersion = "${cudaMajorVersion}.0"; # URL example: ${baseURL}/cuda12/${name}-${version}-cuda12.0.zip
+      name = lib.concatStringsSep "-" [
+        finalAttrs.pname
+        "Linux"
+        stdenvNoCC.hostPlatform.parsed.cpu.name
+        finalAttrs.version
+        "cuda${cudaVersion}"
+      ];
+
+      # nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")
+      hashes = {
+        "12" = {
+          aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";
+          x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";
+        };
+        "13" = {
+          aarch64-linux = "sha256-TetJbMts8tpmj5PV4+jpnUHMcooDrXUEKL3aGWqilKI=";
+          x86_64-linux = "sha256-wLJLbRpQWa6QEm8ibm1gxt3mXvkWvu0vEzpnqTIvE1M=";
+        };
+      };
+    in
+    lib.mapNullable (
+      hash:
+      fetchurl {
+        inherit hash name;
+        url = "${baseURL}/cuda${cudaMajorVersion}/${name}.tar.gz";
+      }
+    ) (hashes.${cudaMajorVersion}.${stdenvNoCC.hostPlatform.system} or null);
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"
+    tar -xzf "$src" -C "$out"
+
+    mkdir -p "$static"
+    moveToOutput "lib/libmathdx_static.a" "$static"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Library used to integrate cuBLASDx and cuFFTDx into Warp";
+    homepage = "https://developer.nvidia.com/cublasdx-downloads";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = with lib.licenses; [
+      # By downloading and using the software, you agree to fully
+      # comply with the terms and conditions of the NVIDIA Software
+      # License Agreement.
+      _cuda.lib.licenses.math_sdk_sla
+
+      # Some of the libmathdx routines were written by or derived
+      # from code written by Meta Platforms, Inc. and affiliates and
+      # are subject to the BSD License.
+      bsd3
+
+      # Some of the libmathdx routines were written by or derived from
+      # code written by Victor Zverovich and are subject to the following
+      # license:
+      mit
+    ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+})
diff --git a/pkgs/development/python-modules/warp-lang/standalone-llvm.patch b/pkgs/development/python-modules/warp-lang/llvm-libs.patch
similarity index 53%
rename from pkgs/development/python-modules/warp-lang/standalone-llvm.patch
rename to pkgs/development/python-modules/warp-lang/llvm-libs.patch
index 83860f49fbba..60c967004001 100644
--- a/pkgs/development/python-modules/warp-lang/standalone-llvm.patch
+++ b/pkgs/development/python-modules/warp-lang/llvm-libs.patch
@@ -1,8 +1,8 @@
 diff --git a/build_llvm.py b/build_llvm.py
-index aee0a9f1..6b9806c9 100644
+index aee0a9f1..20cfe8f3 100644
 --- a/build_llvm.py
 +++ b/build_llvm.py
-@@ -350,25 +350,19 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None:
+@@ -350,33 +350,23 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None:
  
          clang_dll_path = os.path.join(build_path, f"bin/{lib_name}")
  
@@ -15,18 +15,14 @@ index aee0a9f1..6b9806c9 100644
 -            fetch_prebuilt_libraries(arch)
 -            libpath = os.path.join(base_path, f"_build/host-deps/llvm-project/release-{arch}/lib")
 -
-+        # obtain Clang and LLVM libraries from the local build
-         libs = []
+-        libs = []
 -
 -        for _, _, libraries in os.walk(libpath):
 -            libs.extend(libraries)
 -            break  # just the top level contains library files
++        libs = ["LLVM", "clang-cpp"]
 +        install_paths = ["@LLVM_LIB@", "@LIBCLANG_LIB@"]
 +        libpaths = [os.path.join(install_path, "lib") for install_path in install_paths]
-+        for libpath in libpaths:
-+            for _, _, libraries in os.walk(libpath):
-+                libs.extend(libraries)
-+                break  # just the top level contains library files
  
          if os.name == "nt":
              libs.append("Version.lib")
@@ -34,9 +30,10 @@ index aee0a9f1..6b9806c9 100644
 -            libs.append(f'/LIBPATH:"{libpath}"')
 +            libs.extend(f'/LIBPATH:"{libpath}"' for libpath in libpaths)
          else:
-             libs = [f"-l{lib[3:-2]}" for lib in libs if os.path.splitext(lib)[1] == ".a"]
+-            libs = [f"-l{lib[3:-2]}" for lib in libs if os.path.splitext(lib)[1] == ".a"]
++            libs = [f"-l{lib}" for lib in libs]
              if sys.platform == "darwin":
-@@ -376,7 +370,8 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None:
+                 libs += libs  # prevents unresolved symbols due to link order
              else:
                  libs.insert(0, "-Wl,--start-group")
                  libs.append("-Wl,--end-group")
@@ -46,17 +43,4 @@ index aee0a9f1..6b9806c9 100644
              libs.append("-lpthread")
              libs.append("-ldl")
              if sys.platform != "darwin":
-diff --git a/warp/build_dll.py b/warp/build_dll.py
-index 2218ff13..3fcf5796 100644
---- a/warp/build_dll.py
-+++ b/warp/build_dll.py
-@@ -404,8 +404,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
-         cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
-         cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
- 
--        cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
--        cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
-+        cpp_includes = ' -I"@LLVM_DEV@/include"'
-+        cpp_includes += ' -I"@LIBCLANG_DEV@/include"'
-         cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
-         includes = cpp_includes + cuda_includes
+
diff --git a/pkgs/development/python-modules/watergate-local-api/default.nix b/pkgs/development/python-modules/watergate-local-api/default.nix
index d8d2d4a2e2bd..ac7435549ac3 100644
--- a/pkgs/development/python-modules/watergate-local-api/default.nix
+++ b/pkgs/development/python-modules/watergate-local-api/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "watergate-local-api";
-  version = "2024.4.1";
+  version = "2025.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "watergate-ai";
     repo = "watergate-local-api-python";
     tag = version;
-    hash = "sha256-zEbujtXTXjRRzpNdowh7xjBvCxwp7Z1QYRm6ZM8rFR8=";
+    hash = "sha256-px1vtWGW9JlU9ZXvmTq9YXZDmWIU0xYy3KOyamGyY74=";
   };
 
   build-system = [ setuptools ];
@@ -36,6 +36,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/watergate-ai/watergate-local-api-python/releases/tag/${src.tag}";
     description = "Python package to interact with the Watergate Local API";
     homepage = "https://github.com/watergate-ai/watergate-local-api-python";
     license = lib.licenses.gpl3Only;
diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix
index b79a399aea5d..7cedc0a391c0 100644
--- a/pkgs/development/python-modules/web/default.nix
+++ b/pkgs/development/python-modules/web/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonAtLeast,
   pytestCheckHook,
   cheroot,
   legacy-cgi,
@@ -25,8 +24,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cheroot
-  ]
-  ++ lib.optional (pythonAtLeast "3.13") legacy-cgi;
+    legacy-cgi
+  ];
 
   # requires multiple running databases
   doCheck = false;
diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix
index 4be5d827d9e9..fa594f39b8d0 100644
--- a/pkgs/development/python-modules/web3/default.nix
+++ b/pkgs/development/python-modules/web3/default.nix
@@ -30,7 +30,7 @@
   flaky,
   hypothesis,
   py-evm,
-  pytest-asyncio_0_21,
+  pytest-asyncio,
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
@@ -39,14 +39,14 @@
 
 buildPythonPackage rec {
   pname = "web3";
-  version = "7.13.0";
+  version = "7.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "web3.py";
     tag = "v${version}";
-    hash = "sha256-cG4P/mrvQ3GlGT17o5yVGZtIM5Vgi2+iojUsYSBbhFA=";
+    hash = "sha256-jcRbyYbbqcY7WYIO8wiqLWYnS73NRDfMIpxDFT8ulSY=";
   };
 
   build-system = [ setuptools ];
@@ -85,7 +85,7 @@ buildPythonPackage rec {
     flaky
     hypothesis
     py-evm
-    pytest-asyncio_0_21
+    pytest-asyncio
     pytest-mock
     pytest-xdist
     pytestCheckHook
diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix
index de9f99097797..e9f957ebfe89 100644
--- a/pkgs/development/python-modules/weblate-language-data/default.nix
+++ b/pkgs/development/python-modules/weblate-language-data/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "weblate-language-data";
-  version = "2025.8";
+  version = "2025.9";
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_language_data";
     inherit version;
-    hash = "sha256-buZNp7iWF7Ppx5RcTRs2kawwmzCPmwXSqarRbmgP0i8=";
+    hash = "sha256-sk53eGLPSfYoe4+BExIxINkFt/vcvkIIO5611hwx9uU=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix
index 4563d1ee40ac..f3310a3b5094 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.5";
+  version = "2025.6";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_schemas";
     inherit version;
-    hash = "sha256-ZhFF3UD7lX/KXVDZFOn+Gc1w/cpzzVYVrbpVeJ9/wiE=";
+    hash = "sha256-Kxu+8CiJ343PmCdY5rSbTqsWmVMLnz9inAH726g5TQQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/webob/default.nix b/pkgs/development/python-modules/webob/default.nix
index 34425a936f34..d45c06105875 100644
--- a/pkgs/development/python-modules/webob/default.nix
+++ b/pkgs/development/python-modules/webob/default.nix
@@ -5,7 +5,6 @@
   setuptools,
   legacy-cgi,
   pytestCheckHook,
-  pythonAtLeast,
   pythonOlder,
 
   # for passthru.tests
@@ -31,7 +30,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   # https://github.com/Pylons/webob/issues/437
-  dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  dependencies = [ legacy-cgi ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/pkgs/development/python-modules/wfuzz/default.nix b/pkgs/development/python-modules/wfuzz/default.nix
index 2277341460be..9d00d2a3a5c0 100644
--- a/pkgs/development/python-modules/wfuzz/default.nix
+++ b/pkgs/development/python-modules/wfuzz/default.nix
@@ -14,7 +14,6 @@
   setuptools,
   six,
   fetchpatch2,
-  pythonAtLeast,
   legacy-cgi,
 }:
 
@@ -51,13 +50,13 @@ buildPythonPackage rec {
   dependencies = [
     chardet
     distutils # src/wfuzz/plugin_api/base.py
+    legacy-cgi
     pycurl
     six
     setuptools
     pyparsing
   ]
-  ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
-  ++ lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+  ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ];
 
   nativeCheckInputs = [
     netaddr
diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index 0760ef3f2270..93b55c8d8f69 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -29,6 +29,7 @@
   psutil,
   pypng,
   pytest,
+  rendercanvas,
   ruff,
   trio,
 
@@ -38,14 +39,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.23.0";
+  version = "0.27.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc=";
+    hash = "sha256-PCZaPG2e6KpV6NDYrnsZIb/rO0/su/dA65s85+/V0HY=";
   };
 
   postPatch =
@@ -63,11 +64,6 @@ buildPythonPackage rec {
     + ''
       substituteInPlace examples/compute_textures.py \
         --replace-fail 'import wgpu' 'import wgpu # run_example = false'
-    ''
-    # Tweak tests that fail due to a dependency of `wgpu-native`, `naga`, adding an `ir` module
-    + ''
-      substituteInPlace tests/test_wgpu_native_errors.py \
-        --replace-fail 'naga::' 'naga::ir::'
     '';
 
   # wgpu-py expects to have an appropriately named wgpu-native library in wgpu/resources
@@ -111,6 +107,8 @@ buildPythonPackage rec {
     psutil
     pypng
     pytest
+    # break circular dependency cycle
+    (rendercanvas.overrideAttrs { doInstallCheck = false; })
     ruff
     trio
   ];
diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix
index ace0f3fbad75..e07c68a3a423 100644
--- a/pkgs/development/python-modules/whey/default.nix
+++ b/pkgs/development/python-modules/whey/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "whey" ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     editable = [
       editables
     ];
diff --git a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
index 08630cb90c67..41501959d4fa 100644
--- a/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
+++ b/pkgs/development/python-modules/whirlpool-sixth-sense/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "whirlpool-sixth-sense";
-  version = "0.21.3";
+  version = "1.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "abmantis";
     repo = "whirlpool-sixth-sense";
     tag = version;
-    hash = "sha256-ZZrLqHn/O+Z2XtiCIco5PMEprbi9XeJOBXcEdjTDPDc=";
+    hash = "sha256-Xgz9SqH++pWZb7r1qxOrEEfC7I80qhrqcI0Zlduxlq4=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
index 335ad245075e..5d6455de1321 100644
--- a/pkgs/development/python-modules/whisperx/default.nix
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -8,14 +8,17 @@
   setuptools,
 
   # dependencies
+  av,
   ctranslate2,
   faster-whisper,
   nltk,
+  numpy,
   pandas,
   pyannote-audio,
   torch,
   torchaudio,
   transformers,
+  triton,
 
   # native packages
   ffmpeg,
@@ -35,29 +38,16 @@ let
 in
 buildPythonPackage rec {
   pname = "whisperx";
-  version = "3.4.3";
+  version = "3.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-bain";
     repo = "whisperX";
     tag = "v${version}";
-    hash = "sha256-zx77Fx8KYTWCFcC6Uy6pbe8LJtXP3b6lkwuOSEEYJfU=";
+    hash = "sha256-wmCGHRx1JaOs5+7fp2jeh8PIR5dlmOl8hKrIw2550Bk=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [
-    ctranslate
-    faster-whisper
-    nltk
-    pandas
-    pyannote-audio # Missing from pyproject.toml, but used in `whisperx/vad.py`
-    torch
-    torchaudio
-    transformers
-  ];
-
   # As `makeWrapperArgs` does not apply to the module, and whisperx depends on `ffmpeg`,
   # we replace the `"ffmpeg"` string in `subprocess.run` with the full path to the binary.
   # This works for both the program and the module.
@@ -67,13 +57,29 @@ buildPythonPackage rec {
       '"ffmpeg"' '"${lib.getExe ffmpeg}"'
   '';
 
-  pythonRelaxDeps = [
-    # > Checking runtime dependencies for whisperx-3.3.2-py3-none-any.whl
-    # >   - faster-whisper==1.1.0 not satisfied by version 1.1.1
-    # This has been updated on main, so we expect this clause to be removed upon the next update.
-    "faster-whisper"
+  build-system = [ setuptools ];
 
-    "ctranslate2"
+  pythonRelaxDeps = [
+    "numpy"
+    "pandas"
+    "pyannote-audio"
+    "torch"
+    "torchaudio"
+  ];
+  dependencies = [
+    av
+    ctranslate
+    faster-whisper
+    nltk
+    numpy
+    pandas
+    pyannote-audio
+    torch
+    torchaudio
+    transformers
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    triton
   ];
 
   # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime
diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix
deleted file mode 100644
index f1d47ef83cb8..000000000000
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  gdal,
-  h5py,
-  noise,
-  numpy,
-  protobuf,
-  purepng,
-  pyplatec,
-  six,
-  isPy27,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "worldengine";
-  version = "0.19.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "Mindwerks";
-    repo = "worldengine";
-    rev = "v${version}";
-    sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry";
-  };
-
-  src-data = fetchFromGitHub {
-    owner = "Mindwerks";
-    repo = "worldengine-data";
-    rev = "029051e707f4702cb2af1a23b8222cca7dc88930";
-    sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm";
-  };
-
-  postUnpack = ''
-    ln -s ${src-data} worldengine-data
-  '';
-
-  propagatedBuildInputs = [
-    gdal
-    h5py
-    noise
-    numpy
-    protobuf
-    purepng
-    pyplatec
-    six
-  ];
-
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace pypng>=0.0.18 purepng \
-      --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \
-      --replace 'argparse==1.2.1' "" \
-      --replace 'protobuf==3.0.0a3' 'protobuf' \
-      --replace 'noise==1.2.2' 'noise' \
-      --replace 'PyPlatec==1.4.0' 'PyPlatec' \
-
-    substituteInPlace \
-      worldengine/{draw.py,hdf5_serialization.py} \
-      --replace numpy.float float
-  '';
-
-  doCheck = !isPy27; # google namespace clash
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTests = [ "TestSerialization" ];
-
-  meta = with lib; {
-    broken = true;
-    homepage = "https://github.com/mindwerks/worldengine";
-    description = "World generator using simulation of plates, rain shadow, erosion, etc";
-    license = licenses.mit;
-    maintainers = with maintainers; [ rardiol ];
-  };
-}
diff --git a/pkgs/development/python-modules/wslink/default.nix b/pkgs/development/python-modules/wslink/default.nix
index c58032bcc291..e09cacf22404 100644
--- a/pkgs/development/python-modules/wslink/default.nix
+++ b/pkgs/development/python-modules/wslink/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "wslink";
-  version = "2.4.0";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kitware";
     repo = "wslink";
     tag = "v${version}";
-    hash = "sha256-IFXxMN+OXJ/J2BSegxOBjE4iSA27pLyCpyyx4hmo9NU=";
+    hash = "sha256-g1I8qCuqfv+pA3IP7b57PZ7vCsykpfJNG97NgJ+N5lE=";
   };
 
   sourceRoot = "${src.name}/python";
diff --git a/pkgs/development/python-modules/wyoming/default.nix b/pkgs/development/python-modules/wyoming/default.nix
index 56af4b52e6df..763157aabb28 100644
--- a/pkgs/development/python-modules/wyoming/default.nix
+++ b/pkgs/development/python-modules/wyoming/default.nix
@@ -7,9 +7,13 @@
   setuptools,
 
   # optional-dependencies
+  flask,
+  swagger-ui-py,
   zeroconf,
 
   # tests
+  pytest-asyncio,
+  pytestCheckHook,
   wyoming-faster-whisper,
   wyoming-openwakeword,
   wyoming-piper,
@@ -17,35 +21,42 @@
 
 buildPythonPackage rec {
   pname = "wyoming";
-  version = "1.7.2";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "rhasspy";
+    owner = "OHF-Voice";
     repo = "wyoming";
-    tag = version;
-    hash = "sha256-tLwMysBxNPk5ztkwuuOhChhGgY+uEE9uA4S5ZVlVtY0=";
+    tag = "v${version}";
+    hash = "sha256-s1wYGqoTIsKj3u99/9KdKZmzUGzGeYq1TJHOkOVwkHQ=";
   };
 
   build-system = [ setuptools ];
 
   optional-dependencies = {
+    http = [
+      flask
+      swagger-ui-py
+    ];
     zeroconf = [ zeroconf ];
   };
 
   pythonImportsCheck = [ "wyoming" ];
 
-  # no tests
-  doCheck = false;
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
 
   passthru.tests = {
     inherit wyoming-faster-whisper wyoming-openwakeword wyoming-piper;
   };
 
   meta = with lib; {
-    changelog = "https://github.com/rhasspy/wyoming/releases/tag/${src.tag}";
+    changelog = "https://github.com/OHF-Voice/wyoming/releases/tag/${src.tag}";
     description = "Protocol for Rhasspy Voice Assistant";
-    homepage = "https://github.com/rhasspy/wyoming";
+    homepage = "https://github.com/OHF-Voice/wyoming";
     license = licenses.mit;
     maintainers = with maintainers; [ hexa ];
   };
diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix
index e77bdded50d5..ded96ac0ba22 100644
--- a/pkgs/development/python-modules/x-transformers/default.nix
+++ b/pkgs/development/python-modules/x-transformers/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "x-transformers";
-  version = "2.8.4";
+  version = "2.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "x-transformers";
     tag = version;
-    hash = "sha256-EmZW57xWt62RTOGZ7vYE2YcyUqx1vldsb2874XR9UOo=";
+    hash = "sha256-7tlaq1/2S1uVlhZud/6Nnuf/oopHe88HHq69TUuKITo=";
   };
 
   build-system = [ hatchling ];
@@ -46,9 +46,10 @@ buildPythonPackage rec {
   meta = {
     description = "Concise but fully-featured transformer";
     longDescription = ''
-      A simple but complete full-attention transformer with a set of promising experimental features from various papers
+      A simple but complete full-attention transformer with a set of promising experimental features from various papers.
     '';
     homepage = "https://github.com/lucidrains/x-transformers";
+    changelog = "https://github.com/lucidrains/x-transformers/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ ByteSudoer ];
   };
diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix
index c467361a643a..d6608505d172 100644
--- a/pkgs/development/python-modules/xdg-base-dirs/default.nix
+++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/srstevenson/xdg-base-dirs";
     changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${version}";
     license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xdis/default.nix b/pkgs/development/python-modules/xdis/default.nix
index a2fcbc5ebebe..ba7c9fa0f6b5 100644
--- a/pkgs/development/python-modules/xdis/default.nix
+++ b/pkgs/development/python-modules/xdis/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "xdis";
-  version = "6.1.6";
+  version = "6.1.8";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rocky";
     repo = "python-xdis";
     tag = version;
-    hash = "sha256-G4BpvMYjBUBfStP1csfFaFCin0eYEnXwsztCS4amvdY=";
+    hash = "sha256-sAL2D7Rg/iyob2nawXX/b5F/uOGCMsb1q0ZnPLIfh6o=";
   };
 
   build-system = [
diff --git a/pkgs/development/python-modules/xeger/default.nix b/pkgs/development/python-modules/xeger/default.nix
new file mode 100644
index 000000000000..0dc10b852e91
--- /dev/null
+++ b/pkgs/development/python-modules/xeger/default.nix
@@ -0,0 +1,35 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "xeger";
+  version = "0.3.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "crdoconnor";
+    repo = "xeger";
+    tag = version;
+    hash = "sha256-XujytGzBwJ59C5VihuFUJUxqhyjOIU4sI60hXUqLQvM=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "xeger" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Library to generate random strings from regular expressions";
+    homepage = "https://github.com/crdoconnor/xeger";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 6a1a1549293f..a84c28aeec4b 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -12,15 +12,16 @@
 
   # dependencies
   mlx-lm,
+  numpy,
   pydantic,
-  sentencepiece,
-  tiktoken,
   torch,
   transformers,
   triton,
 
   # tests
   pytestCheckHook,
+  sentencepiece,
+  tiktoken,
   writableTmpDirAsHomeHook,
 }:
 
@@ -50,9 +51,8 @@ buildPythonPackage rec {
   dontUseCmakeConfigure = true;
 
   dependencies = [
+    numpy
     pydantic
-    sentencepiece
-    tiktoken
     torch
     transformers
   ]
@@ -65,6 +65,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    sentencepiece
+    tiktoken
     writableTmpDirAsHomeHook
   ];
 
diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix
index 67a6df8c1844..e7e06f673eb8 100644
--- a/pkgs/development/python-modules/xknx/default.nix
+++ b/pkgs/development/python-modules/xknx/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "xknx";
-  version = "3.9.1";
+  version = "3.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "XKNX";
     repo = "xknx";
     tag = version;
-    hash = "sha256-BcUZ2wNrWFapYNbvDXQgKQvXEEx/+z79AaPZHsdPRpo=";
+    hash = "sha256-tkZ0Hltpd5DARxYc05LjDTlB62jsJJJ8v/oUuVPT/uo=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/xmltodict/default.nix b/pkgs/development/python-modules/xmltodict/default.nix
index 166f53fd3d1a..9d1c01842a42 100644
--- a/pkgs/development/python-modules/xmltodict/default.nix
+++ b/pkgs/development/python-modules/xmltodict/default.nix
@@ -1,22 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "xmltodict";
-  version = "0.14.2";
+  version = "1.0.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-IB58KLshDjdJmdHd5jgpI6sO0ail+u7OSKtSW3gQpVM=";
+  src = fetchFromGitHub {
+    owner = "martinblech";
+    repo = "xmltodict";
+    tag = "v${version}";
+    hash = "sha256-gnTNkh0GLfRmjMsLhfvpNrewfinNOhem0i3wzIZvKpA=";
   };
 
   build-system = [ setuptools ];
@@ -25,11 +24,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "xmltodict" ];
 
-  meta = with lib; {
+  meta = {
     description = "Makes working with XML feel like you are working with JSON";
     homepage = "https://github.com/martinblech/xmltodict";
-    changelog = "https://github.com/martinblech/xmltodict/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
+    changelog = "https://github.com/martinblech/xmltodict/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
index dbea89615cc7..4701ab0cd557 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "xvfbwrapper";
-  version = "0.2.14";
+  version = "0.2.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cgoldberg";
     repo = "xvfbwrapper";
     tag = version;
-    sha256 = "sha256-SLf9ytogbIXPM/Nf5h6akKhU3UnAAspJc5f9/bL5YNk=";
+    sha256 = "sha256-9PDLR8oz6VcRfqWOrLCw08wCqJeNCI5leiE6+QZi7xY=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index 1c1cda272d74..fca0c12f9ad0 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -1,34 +1,41 @@
 {
   lib,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
-  maison,
+
+  # build-system
   pdm-backend,
+  setuptools,
+
+  # dependencies
+  click,
+  maison,
   pydantic,
+  ruyaml,
+
+  # tests
   pytest-freezegun,
   pytest-xdist,
   pytestCheckHook,
-  ruyaml,
-  setuptools,
+  versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "yamlfix";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lyz-code";
     repo = "yamlfix";
     tag = version;
-    hash = "sha256-g2X9fBUS5wbQJbP29V5pWwrQ1+P/Y8euK4Rv7C6r3WM=";
+    hash = "sha256-c8vspcouS3r0S/4S210QGYT2XdU3aR0FvUoKaC2WLUM=";
   };
 
   build-system = [
-    setuptools
     pdm-backend
+    setuptools
   ];
 
   dependencies = [
@@ -43,7 +50,9 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     writableTmpDirAsHomeHook
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "yamlfix" ];
 
@@ -52,6 +61,12 @@ buildPythonPackage rec {
     "-Wignore::ResourceWarning"
   ];
 
+  disabledTestPaths = [
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    "tests/e2e/test_cli.py"
+  ];
+
   meta = {
     description = "Python YAML formatter that keeps your comments";
     homepage = "https://github.com/lyz-code/yamlfix";
diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 0add590d5bfb..d2e79d4d1bf0 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -1,13 +1,12 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   hatch-vcs,
   hatchling,
   pytestCheckHook,
   pyyaml,
   hypothesis,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,11 +14,11 @@ buildPythonPackage rec {
   version = "1.5.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
+  src = fetchFromGitHub {
+    owner = "Phynix";
+    repo = "yamlloader";
+    tag = version;
+    hash = "sha256-SNb1iXao+TNW872qDtEldZj6S+yJxRlsnw6ye92RFSk=";
   };
 
   build-system = [
@@ -34,16 +33,25 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # TypeError: cannot pickle '_thread.RLock' object
+    # https://github.com/Phynix/yamlloader/issues/64
+    "tests/test_ordereddict.py"
+  ];
+
   pythonImportsCheck = [
     "yaml"
     "yamlloader"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Case-insensitive list for Python";
     homepage = "https://github.com/Phynix/yamlloader";
     changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      freezeboy
+      sarahec
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 36184650fcb9..8e7387921a2d 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "yarl";
-  version = "1.21.1";
+  version = "1.22.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aio-libs";
     repo = "yarl";
     tag = "v${version}";
-    hash = "sha256-YN2Gn/wokwbBbVcKvqNNJZ8eZKxwwdKbA84kPsx1Dg0=";
+    hash = "sha256-IkP6AxLT260NN2X2bd7b5LGVGFUjo7eQiuWxvMtcb8g=";
   };
 
   build-system = [
@@ -58,11 +58,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "yarl" ];
 
-  meta = with lib; {
-    changelog = "https://github.com/aio-libs/yarl/blob/v${version}/CHANGES.rst";
+  meta = {
+    changelog = "https://github.com/aio-libs/yarl/blob/${src.tag}/CHANGES.rst";
     description = "Yet another URL library";
     homepage = "https://github.com/aio-libs/yarl";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }
diff --git a/pkgs/development/python-modules/yaxmldiff/default.nix b/pkgs/development/python-modules/yaxmldiff/default.nix
new file mode 100644
index 000000000000..f018e3785189
--- /dev/null
+++ b/pkgs/development/python-modules/yaxmldiff/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # build-system
+  hatchling,
+  hatch-fancy-pypi-readme,
+  # dependencies
+  lxml,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "yaxmldiff";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "latk";
+    repo = "yaxmldiff.py";
+    tag = "v${version}";
+    hash = "sha256-AOXnK1d+b/ae50ofBfgxiDS6Dj6TIeHMrE9ME95Yj1Q=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-fancy-pypi-readme
+  ];
+
+  dependencies = [ lxml ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Yet Another XML Differ";
+    homepage = "https://github.com/latk/yaxmldiff.py";
+    changelog = "https://https://github.com/latk/yaxmldiff.py/blob/v${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/pkgs/development/python-modules/yoto-api/default.nix b/pkgs/development/python-modules/yoto-api/default.nix
index e44dd9e98b41..71d39460a52c 100644
--- a/pkgs/development/python-modules/yoto-api/default.nix
+++ b/pkgs/development/python-modules/yoto-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "yoto-api";
-  version = "1.26.5";
+  version = "2.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cdnninja";
     repo = "yoto_api";
     tag = "v${version}";
-    hash = "sha256-QlcZZjyMPIPGG5zHTFM9E2Y8sa/etbvMmxRp15NzKEo=";
+    hash = "sha256-bRJjDgmMLJcmWyyxTg0BLjBukGi8JX9WWz9IoUl9Fcw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/python-modules/youtube-transcript-api/default.nix b/pkgs/development/python-modules/youtube-transcript-api/default.nix
index fe35393e7f92..e10a3d00ec9a 100644
--- a/pkgs/development/python-modules/youtube-transcript-api/default.nix
+++ b/pkgs/development/python-modules/youtube-transcript-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "youtube-transcript-api";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "jdepoix";
     repo = "youtube-transcript-api";
     tag = "v${version}";
-    hash = "sha256-nr8WeegMv7zSqlzcLSG224O9fRXA6jIlYQN4vV6lW24=";
+    hash = "sha256-UtKAT7BTWmG2wWnpK5OT/NeVksz6N8sLnRq9IpAm7D4=";
   };
 
   build-system = [ poetry-core ];
diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 51bc73a53586..f4a8808bc500 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.146";
+  version = "0.0.148";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha-device-handlers";
     tag = version;
-    hash = "sha256-eXT0intSWAYQ/DlIEIZDbv805aQCLXYXpvhWjnd3EVA=";
+    hash = "sha256-A2+pBLPexQLMDE/feQ7mQ1bbzGBAXs/5GktOVn2D2JM=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 73c8a0382729..23a02f7dab2c 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -1,22 +1,17 @@
 {
   lib,
-  awesomeversion,
   bellows,
   buildPythonPackage,
   fetchFromGitHub,
   freezegun,
   pyserial,
-  pyserial-asyncio,
   pyserial-asyncio-fast,
   pytest-asyncio_0,
   pytest-timeout,
   pytest-xdist,
   pytestCheckHook,
-  python-slugify,
   pythonOlder,
   setuptools,
-  universal-silabs-flasher,
-  wheel,
   zha-quirks,
   zigpy,
   zigpy-deconz,
@@ -27,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.73";
+  version = "0.0.77";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +31,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     tag = version;
-    hash = "sha256-ryriM4bVML81xJQYlL46rhlsc/WQh0T5LC+WB28T6AU=";
+    hash = "sha256-OtwfSt9KUs4oOCwnKygq/hDOXOhzhT3+KxxY/M9KAdU=";
   };
 
   postPatch = ''
@@ -47,17 +42,12 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
-    wheel
   ];
 
   dependencies = [
-    awesomeversion
     bellows
     pyserial
-    pyserial-asyncio
     pyserial-asyncio-fast
-    python-slugify
-    universal-silabs-flasher
     zha-quirks
     zigpy
     zigpy-deconz
diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index e340705e0280..17adcdbee8a1 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -2,24 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pyserial,
-  pyserial-asyncio,
   pytest-asyncio,
   pytestCheckHook,
   setuptools,
+  voluptuous,
   zigpy,
 }:
 
 buildPythonPackage rec {
   pname = "zigpy-deconz";
-  version = "0.25.2";
+  version = "0.25.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-deconz";
     tag = version;
-    hash = "sha256-9wsdL2mtT6Q6+4Z6f+Aoae7d0x7EDqkZ5n2O3Ml4PbA=";
+    hash = "sha256-kwQF6RY6Fxba44wa3q4Hx4MRAbWl3Ho7WYvR7jRfrW8=";
   };
 
   postPatch = ''
@@ -28,11 +27,10 @@ buildPythonPackage rec {
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    pyserial
-    pyserial-asyncio
+  dependencies = [
+    voluptuous
     zigpy
   ];
 
diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 409a9fa1bd11..a144dbc63a97 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -2,40 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pyserial,
-  pyserial-asyncio,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   zigpy,
 }:
 
 buildPythonPackage rec {
   pname = "zigpy-xbee";
-  version = "0.21.0";
+  version = "0.21.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-xbee";
     tag = version;
-    hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ=";
+    hash = "sha256-ALwhl9WUDkv0POufF/G/rZrn+ITbMdh6y86lShy6ZTg=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "setuptools-git-versioning<2"' "" \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    pyserial
-    pyserial-asyncio
+  dependencies = [
     zigpy
   ];
 
@@ -44,11 +37,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # fixed in https://github.com/zigpy/zigpy-xbee/commit/f85233fc28ae01c08267965e99a29e43b00e1561
-    "test_shutdown"
-  ];
-
   meta = with lib; {
     changelog = "https://github.com/zigpy/zigpy-xbee/releases/tag/${version}";
     description = "Library which communicates with XBee radios for zigpy";
diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix
index 6345cc2de86b..0bb39d5ccc2e 100644
--- a/pkgs/development/python-modules/zigpy-zboss/default.nix
+++ b/pkgs/development/python-modules/zigpy-zboss/default.nix
@@ -1,8 +1,8 @@
 {
-  async-timeout,
   buildPythonPackage,
   coloredlogs,
   fetchFromGitHub,
+  fetchpatch,
   jsonschema,
   lib,
   pytest-asyncio_0,
@@ -25,10 +25,27 @@ buildPythonPackage rec {
     hash = "sha256-T2R291GeFIsnDRI1tAydTlLamA3LF5tKxKFhPtcEUus=";
   };
 
+  patches = [
+    # https://github.com/kardia-as/zigpy-zboss/pull/66
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio-timeout.patch";
+      url = "https://github.com/kardia-as/zigpy-zboss/commit/91688873ddbcd0c2196f0da69a857b2e2bec75a6.patch";
+      excludes = [ "setup.cfg" ];
+      hash = "sha256-aC0+FbbtuHDW3ApJDnTG3TUeNWhzecEYVuiSOik03uU=";
+    })
+    (fetchpatch {
+      # https://github.com/kardia-as/zigpy-zboss/pull/67
+      name = "replace-pyserial-asyncio-with-pyserial-asyncio-fast.patch";
+      url = "https://github.com/kardia-as/zigpy-zboss/commit/d44ceb537dc16ce020f8c60a0ff35e88672f3455.patch";
+      hash = "sha256-aXWRtBLDr9NLIMNK/xtsYuy/hEB2zHU3YYcRKbguTTo=";
+    })
+  ];
+
+  pythonRemoveDeps = [ "async_timeout" ];
+
   build-system = [ setuptools ];
 
   dependencies = [
-    async-timeout
     coloredlogs
     jsonschema
     voluptuous
diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 9cb5c4f4b1ab..2651f7a1bc86 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -4,59 +4,48 @@
   fetchFromGitHub,
   gpiozero,
   mock,
-  pyserial,
-  pyserial-asyncio,
   pyusb,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
+  voluptuous,
   zigpy,
 }:
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.13.3";
+  version = "0.13.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
     tag = version;
-    hash = "sha256-reOt0bPPkKDKeu8CESJtLDEmpkOmgopXk65BqBlBIhY=";
+    hash = "sha256-pVDqb2/7Pe9zvhNNTVQfl5EphEjOPdJwvCIoTdZm7S0=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "setuptools-git-versioning<2"' "" \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     gpiozero
-    pyserial
-    pyserial-asyncio
     pyusb
+    voluptuous
     zigpy
   ];
 
   nativeCheckInputs = [
-    mock
     pytest-asyncio
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "zigpy_zigate" ];
 
-  disabledTestPaths = [
-    # Fails in sandbox
-    "tests/test_application.py "
-  ];
-
   meta = with lib; {
     description = "Library which communicates with ZiGate radios for zigpy";
     homepage = "https://github.com/zigpy/zigpy-zigate";
diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 7efb2dbcdce9..cbc45c200bab 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "zigpy-znp";
-  version = "0.14.1";
+  version = "0.14.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-znp";
     tag = "v${version}";
-    hash = "sha256-V662zDUBMbr+cARxrwt8196Ml4zlGEAudR3BtvY96HM=";
+    hash = "sha256-B4AyCLuhKUdQ0nzwFy5xWXpzR31R50lcC5EJMIJfDKE=";
   };
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 6cbe00e62e68..c82046c81f4e 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -13,7 +13,7 @@
   freezegun,
   frozendict,
   jsonschema,
-  pyserial-asyncio,
+  pyserial-asyncio-fast,
   pytest-asyncio_0,
   pytest-timeout,
   pytestCheckHook,
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.83.0";
+  version = "0.86.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy";
     tag = version;
-    hash = "sha256-rgri4aga8qTlcURypCHY1YjClz5lpQpwxd3cAG2VoOo=";
+    hash = "sha256-PROJKC8ZxAZ8zZR4if33553qtp7i9y58LPr1d1gCXVQ=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     cryptography
     frozendict
     jsonschema
-    pyserial-asyncio
+    pyserial-asyncio-fast
     typing-extensions
     voluptuous
   ]
diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix
index 15380edc65fa..f17959460b61 100644
--- a/pkgs/development/python-modules/zlib-ng/default.nix
+++ b/pkgs/development/python-modules/zlib-ng/default.nix
@@ -2,12 +2,11 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  replaceVars,
 
   # build-system
   cmake,
   setuptools,
-  versioningit,
+  setuptools-scm,
 
   # native dependencies
   zlib-ng,
@@ -18,26 +17,20 @@
 
 buildPythonPackage rec {
   pname = "zlib-ng";
-  version = "0.5.1";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-zlib-ng";
     rev = "v${version}";
-    hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4=";
+    hash = "sha256-t/PSby1LUTyp+7XXKZTWjRrPvAei1ZrGSGU2CIcAQBc=";
   };
 
-  patches = [
-    (replaceVars ./version.patch {
-      inherit version;
-    })
-  ];
-
   build-system = [
     cmake
     setuptools
-    versioningit
+    setuptools-scm
   ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/zlib-ng/version.patch b/pkgs/development/python-modules/zlib-ng/version.patch
deleted file mode 100644
index e1f335525646..000000000000
--- a/pkgs/development/python-modules/zlib-ng/version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 28ae41d..05ad409 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,9 +2,8 @@
- requires = ["setuptools>=64", "versioningit>=1.1.0"]
- build-backend = "setuptools.build_meta"
- 
--[tool.versioningit.vcs]
--method="git"
--default-tag = "v0.0.0"
-+[tool.versioningit]
-+default-version = "@version@"
- 
- [tool.versioningit.write]
- file = "src/zlib_ng/_version.py"
diff --git a/pkgs/development/python-modules/zope-index/default.nix b/pkgs/development/python-modules/zope-index/default.nix
new file mode 100644
index 000000000000..93c2cf8d90ff
--- /dev/null
+++ b/pkgs/development/python-modules/zope-index/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  btrees,
+  persistent,
+  zope-interface,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "zope-index";
+  version = "8.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "zope.index";
+    tag = "${version}";
+    hash = "sha256-dHapd/+pJh6qzVx9FGSMmPsGbz8NhAoPqufXm3FOuM8=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    btrees
+    persistent
+    zope-interface
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "zope.index"
+  ];
+
+  pythonNamespaces = [
+    "zope"
+  ];
+
+  meta = {
+    description = "Full-text indexing and searching for Zope";
+    homepage = "https://github.com/zopefoundation/zope.index";
+    changelog = "https://github.com/zopefoundation/zope.index/blob/${version}/CHANGES.rst";
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch b/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch
deleted file mode 100644
index 0a09a8845c13..000000000000
--- a/pkgs/development/rocm-modules/6/0001-Compile-transupp.c-as-part-of-the-library.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 4a0584f7c05641143151ebdc1be1163bebf9d35d Mon Sep 17 00:00:00 2001
-From: Las <las@protonmail.ch>
-Date: Sun, 3 Jan 2021 18:35:37 +0000
-Subject: [PATCH] Compile transupp.c as part of the library
-
-The exported symbols are made weak to not conflict with users
-of the library that already vendor this functionality.
----
- CMakeLists.txt |  4 ++--
- transupp.c     | 14 +++++++-------
- 2 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0ca6f98..a9a0fae 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -533,7 +533,7 @@ set(JPEG_SOURCES jcapimin.c jcapistd.c jccoefct.c jccolor.c jcdctmgr.c jchuff.c
-   jdatasrc.c jdcoefct.c jdcolor.c jddctmgr.c jdhuff.c jdicc.c jdinput.c
-   jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c jdpostct.c jdsample.c
-   jdtrans.c jerror.c jfdctflt.c jfdctfst.c jfdctint.c jidctflt.c jidctfst.c
--  jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c)
-+  jidctint.c jidctred.c jquant1.c jquant2.c jutils.c jmemmgr.c jmemnobs.c transupp.c)
- 
- if(WITH_ARITH_ENC OR WITH_ARITH_DEC)
-   set(JPEG_SOURCES ${JPEG_SOURCES} jaricom.c)
-@@ -1489,7 +1489,7 @@ install(EXPORT ${CMAKE_PROJECT_NAME}Targets
- 
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/jconfig.h
-   ${CMAKE_CURRENT_SOURCE_DIR}/jerror.h ${CMAKE_CURRENT_SOURCE_DIR}/jmorecfg.h
--  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h
-+  ${CMAKE_CURRENT_SOURCE_DIR}/jpeglib.h ${CMAKE_CURRENT_SOURCE_DIR}/transupp.h
-   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
- 
- include(cmakescripts/BuildPackages.cmake)
-diff --git a/transupp.c b/transupp.c
-index 6e86077..2da49a7 100644
---- a/transupp.c
-+++ b/transupp.c
-@@ -1386,7 +1386,7 @@ jt_read_integer(const char **strptr, JDIMENSION *result)
-  * This code is loosely based on XParseGeometry from the X11 distribution.
-  */
- 
--GLOBAL(boolean)
-+GLOBAL(boolean) __attribute__((weak))
- jtransform_parse_crop_spec(jpeg_transform_info *info, const char *spec)
- {
-   info->crop = FALSE;
-@@ -1486,7 +1486,7 @@ trim_bottom_edge(jpeg_transform_info *info, JDIMENSION full_height)
-  * and transformation is not perfect.  Otherwise returns TRUE.
-  */
- 
--GLOBAL(boolean)
-+GLOBAL(boolean) __attribute__((weak))
- jtransform_request_workspace(j_decompress_ptr srcinfo,
-                              jpeg_transform_info *info)
- {
-@@ -2033,7 +2033,7 @@ adjust_exif_parameters(JOCTET *data, unsigned int length, JDIMENSION new_width,
-  * to jpeg_write_coefficients().
-  */
- 
--GLOBAL(jvirt_barray_ptr *)
-+GLOBAL(jvirt_barray_ptr *) __attribute__((weak))
- jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-                              jvirt_barray_ptr *src_coef_arrays,
-                              jpeg_transform_info *info)
-@@ -2152,7 +2152,7 @@ jtransform_adjust_parameters(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-  * Note that some transformations will modify the source data arrays!
-  */
- 
--GLOBAL(void)
-+GLOBAL(void) __attribute__((weak))
- jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-                              jvirt_barray_ptr *src_coef_arrays,
-                              jpeg_transform_info *info)
-@@ -2264,7 +2264,7 @@ jtransform_execute_transform(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-  *           (may use custom action then)
-  */
- 
--GLOBAL(boolean)
-+GLOBAL(boolean) __attribute__((weak))
- jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
-                              int MCU_width, int MCU_height,
-                              JXFORM_CODE transform)
-@@ -2303,7 +2303,7 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height,
-  * This must be called before jpeg_read_header() to have the desired effect.
-  */
- 
--GLOBAL(void)
-+GLOBAL(void) __attribute__((weak))
- jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option)
- {
- #ifdef SAVE_MARKERS_SUPPORTED
-@@ -2331,7 +2331,7 @@ jcopy_markers_setup(j_decompress_ptr srcinfo, JCOPY_OPTION option)
-  * JFIF APP0 or Adobe APP14 markers if selected.
-  */
- 
--GLOBAL(void)
-+GLOBAL(void) __attribute__((weak))
- jcopy_markers_execute(j_decompress_ptr srcinfo, j_compress_ptr dstinfo,
-                       JCOPY_OPTION option)
- {
--- 
-2.29.2
-
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index c57c0dbbea2d..44454b36958a 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -3,12 +3,10 @@
   config,
   callPackage,
   newScope,
-  recurseIntoAttrs,
   symlinkJoin,
   fetchFromGitHub,
   boost179,
   opencv,
-  libjpeg_turbo,
   python3Packages,
   openmpi,
   stdenv,
@@ -28,13 +26,11 @@ let
     {
       inherit rocmClangStdenv;
       stdenv = rocmClangStdenv;
-      buildTests = false;
-      buildBenchmarks = false;
 
       rocmUpdateScript = self.callPackage ./update.nix { };
 
       ## ROCm ##
-      llvm = recurseIntoAttrs (
+      llvm = lib.recurseIntoAttrs (
         callPackage ./llvm/default.nix {
           # rocm-device-libs is used for .src only
           # otherwise would cause infinite recursion
@@ -135,10 +131,7 @@ let
           ;
       };
 
-      rocblas = self.callPackage ./rocblas {
-        buildTests = true;
-        buildBenchmarks = true;
-      };
+      rocblas = self.callPackage ./rocblas { };
 
       rocsolver = self.callPackage ./rocsolver { };
 
@@ -198,19 +191,6 @@ let
       mivisionx = self.callPackage ./mivisionx {
         stdenv = origStdenv;
         opencv = opencv.override { enablePython = true; };
-        # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice
-        # See: https://github.com/ROCm/MIVisionX/issues/1051
-        libjpeg_turbo = libjpeg_turbo.overrideAttrs {
-          version = "2.0.6.1";
-          src = fetchFromGitHub {
-            owner = "rrawther";
-            repo = "libjpeg-turbo";
-            rev = "640d7ee1917fcd3b6a5271aa6cf4576bccc7c5fb";
-            sha256 = "sha256-T52whJ7nZi8jerJaZtYInC2YDN0QM+9tUDqiNr6IsNY=";
-          };
-          # overwrite all patches, since patches for newer version do not apply
-          patches = [ ./0001-Compile-transupp.c-as-part-of-the-library.patch ];
-        };
       };
 
       mivisionx-hip = self.mivisionx.override {
@@ -245,21 +225,15 @@ let
       );
       mpi = self.openmpi;
 
-      ## Meta ##
-      # Emulate common ROCm meta layout
-      # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations
-      # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues!
-      # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png
-      # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html
-      meta = with self; rec {
+      meta = {
         # eval all pkgsRocm release attrs with
         # nix-eval-jobs --force-recurse pkgs/top-level/release.nix -I . --select "p: p.pkgsRocm" --no-instantiate
-        release-attrPaths = (builtins.fromJSON (builtins.readFile ./release-attrPaths.json)).attrPaths;
         release-packagePlatforms =
           let
             platforms = [
               "x86_64-linux"
             ];
+            attrPaths = (builtins.fromJSON (builtins.readFile ./release-attrPaths.json)).attrPaths;
           in
           lib.foldl' (
             acc: path:
@@ -267,162 +241,7 @@ let
               lib.recursiveUpdate acc (lib.setAttrByPath (lib.splitString "." path) platforms)
             else
               acc
-          ) { } self.meta.release-attrPaths;
-
-        rocm-developer-tools = symlinkJoin {
-          name = "rocm-developer-tools-meta";
-          paths = [
-            aqlprofile
-            rocm-core
-            rocr-debug-agent
-            roctracer
-            rocdbgapi
-            rocprofiler
-            rocgdb
-            rocm-language-runtime
-          ];
-        };
-        rocm-ml-sdk = symlinkJoin {
-          name = "rocm-ml-sdk-meta";
-          paths = [
-            rocm-core
-            miopen-hip
-            rocm-hip-sdk
-            rocm-ml-libraries
-          ];
-        };
-        rocm-ml-libraries = symlinkJoin {
-          name = "rocm-ml-libraries-meta";
-          paths = [
-            llvm.clang
-            llvm.openmp
-            rocm-core
-            miopen-hip
-            rocm-hip-libraries
-          ];
-        };
-        rocm-hip-sdk = symlinkJoin {
-          name = "rocm-hip-sdk-meta";
-          paths = [
-            rocprim
-            rocalution
-            hipfft
-            hiprt
-            rocm-core
-            hipcub
-            hipblas
-            hipblaslt
-            rocrand
-            rocfft
-            rocsparse
-            rccl
-            rocthrust
-            rocblas
-            hipsparse
-            hipfort
-            rocwmma
-            hipsolver
-            rocsolver
-            rocm-hip-libraries
-            rocm-hip-runtime-devel
-          ];
-        };
-        rocm-hip-libraries = symlinkJoin {
-          name = "rocm-hip-libraries-meta";
-          paths = [
-            rocblas
-            hipfort
-            rocm-core
-            rocsolver
-            rocalution
-            rocrand
-            hipblas
-            hipblaslt
-            rocfft
-            hipfft
-            hiprt
-            rccl
-            rocsparse
-            hipsparse
-            hipsolver
-            rocm-hip-runtime
-          ];
-        };
-        rocm-openmp-sdk = symlinkJoin {
-          name = "rocm-openmp-sdk-meta";
-          paths = [
-            rocm-core
-            llvm.clang
-            llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp)
-            rocm-language-runtime
-          ];
-        };
-        rocm-opencl-sdk = symlinkJoin {
-          name = "rocm-opencl-sdk-meta";
-          paths = [
-            rocm-core
-            rocm-runtime
-            clr
-            clr.icd
-            rocm-opencl-runtime
-          ];
-        };
-        rocm-opencl-runtime = symlinkJoin {
-          name = "rocm-opencl-runtime-meta";
-          paths = [
-            rocm-core
-            clr
-            clr.icd
-            rocm-language-runtime
-          ];
-        };
-        rocm-hip-runtime-devel = symlinkJoin {
-          name = "rocm-hip-runtime-devel-meta";
-          paths = [
-            clr
-            rocm-core
-            hipify
-            rocm-cmake
-            llvm.clang
-            llvm.openmp
-            rocm-runtime
-            rocm-hip-runtime
-          ];
-        };
-        rocm-hip-runtime = symlinkJoin {
-          name = "rocm-hip-runtime-meta";
-          paths = [
-            rocm-core
-            rocminfo
-            clr
-            rocm-language-runtime
-          ];
-        };
-        rocm-language-runtime = symlinkJoin {
-          name = "rocm-language-runtime-meta";
-          paths = [
-            rocm-runtime
-            rocm-core
-            rocm-comgr
-            llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp)
-          ];
-        };
-        rocm-all = symlinkJoin {
-          name = "rocm-all-meta";
-          paths = [
-            rocm-developer-tools
-            rocm-ml-sdk
-            rocm-ml-libraries
-            rocm-hip-sdk
-            rocm-hip-libraries
-            rocm-openmp-sdk
-            rocm-opencl-sdk
-            rocm-opencl-runtime
-            rocm-hip-runtime-devel
-            rocm-hip-runtime
-            rocm-language-runtime
-          ];
-        };
+          ) { } attrPaths;
       };
 
       rocm-bandwidth-test = self.callPackage ./rocm-bandwidth-test {
diff --git a/pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch b/pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch
new file mode 100644
index 000000000000..acf44437520d
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/hipblaslt/Tensile-interning.patch
@@ -0,0 +1,181 @@
+diff --git a/tensilelite/Tensile/Common/Utilities.py b/tensilelite/Tensile/Common/Utilities.py
+index 0a9d9db5b3..cb9779eaac 100644
+--- a/tensilelite/Tensile/Common/Utilities.py
++++ b/tensilelite/Tensile/Common/Utilities.py
+@@ -24,6 +24,7 @@
+ 
+ import functools
+ import math
++import operator
+ import os
+ import sys
+ import time
+@@ -269,8 +270,20 @@ def state(obj):
+ 
+ 
+ def state_key_ordering(cls):
+-    def tup(obj):
+-        return tuple([getattr(obj, k) for k in cls.StateKeys])
++    # Use operator.attrgetter for efficiency if __slots__ is defined
++    if hasattr(cls, '__slots__'):
++        # attrgetter is faster for slotted classes
++        getter = operator.attrgetter(*cls.StateKeys)
++        if len(cls.StateKeys) == 1:
++            # attrgetter returns scalar for single key, we need tuple
++            def tup(obj):
++                return (getter(obj),)
++        else:
++            tup = getter
++    else:
++        # Fallback for regular classes
++        def tup(obj):
++            return tuple([getattr(obj, k) for k in cls.StateKeys])
+ 
+     def lt(a, b):
+         return tup(a) < tup(b)
+diff --git a/tensilelite/Tensile/Contractions.py b/tensilelite/Tensile/Contractions.py
+index c0d4e851b1..3f2c2e98c6 100644
+--- a/tensilelite/Tensile/Contractions.py
++++ b/tensilelite/Tensile/Contractions.py
+@@ -37,9 +37,60 @@ from Tensile.Toolchain.Component import Assembler
+ from math import ceil
+ 
+ MIN_K_FOR_GSU = 32
++
++# Interning helpers to reduce memory usage by reusing identical objects
++_free_index_cache = {}
++def intern_free_index(isA, i=None, c=None, d=None, a=None, b=None):
++    key = (isA, i, c, d, a, b)
++    if key not in _free_index_cache:
++        obj = FreeIndex(isA, i, c, d)
++        obj.a = a
++        if b is not None:
++            obj.b = b
++        _free_index_cache[key] = obj
++    return _free_index_cache[key]
++
++_batch_index_cache = {}
++def intern_batch_index(a=None, b=None, c=None, d=None):
++    key = (a, b, c, d)
++    if key not in _batch_index_cache:
++        obj = BatchIndex(c=c, d=d)
++        obj.a = a
++        obj.b = b
++        _batch_index_cache[key] = obj
++    return _batch_index_cache[key]
++
++_bound_index_cache = {}
++def intern_bound_index(a=None, b=None, aMirror=False, bMirror=False):
++    key = (a, b, aMirror, bMirror)
++    if key not in _bound_index_cache:
++        obj = BoundIndex(aMirror=aMirror, bMirror=bMirror)
++        obj.a = a
++        obj.b = b
++        _bound_index_cache[key] = obj
++    return _bound_index_cache[key]
++
++_size_mapping_cache = {}
++def intern_size_mapping(size_mapping):
++    """Intern a SizeMapping instance to reduce redundancy."""
++    # Build hashable key from StateKeys, converting lists to tuples
++    key_parts = []
++    for attr in size_mapping.StateKeys:
++        val = getattr(size_mapping, attr)
++        # Convert lists to tuples for hashing
++        if isinstance(val, list):
++            val = tuple(val)
++        key_parts.append(val)
++    key = tuple(key_parts)
++
++    if key not in _size_mapping_cache:
++        _size_mapping_cache[key] = size_mapping
++    return _size_mapping_cache[key]
++
+ @state_key_ordering
+ class FreeIndex:
+     StateKeys = ['isA', 'i', 'c', 'd']
++    __slots__ = ['isA', 'i', 'c', 'd', 'a', 'b']
+ 
+     def __init__(self, isA, i=None, c=None, d=None):
+         self.isA = isA
+@@ -50,6 +101,7 @@ class FreeIndex:
+ @state_key_ordering
+ class BatchIndex:
+     StateKeys = ['a', 'b', 'c', 'd']
++    __slots__ = ['a', 'b', 'c', 'd']
+     def __init__(self, a=None, b=None, c=None, d=None):
+         self.a = a
+         self.b = b
+@@ -59,6 +111,7 @@ class BatchIndex:
+ @state_key_ordering
+ class BoundIndex:
+     StateKeys = ['a', 'b', 'aMirror', 'bMirror']
++    __slots__ = ['a', 'b', 'aMirror', 'bMirror']
+     def __init__(self, a=None, b=None, aMirror=False, bMirror=False):
+         self.a = a
+         self.b = b
+@@ -107,6 +160,23 @@ class ProblemType:
+         for ib, ic in enumerate(d['IndexAssignmentsB']):
+             indices[ic].b = ib
+ 
++        # Now intern all indices with their final state (including .a and .b)
++        for i, idx in enumerate(indices):
++            if isinstance(idx, FreeIndex):
++                indices[i] = intern_free_index(idx.isA, idx.i, idx.c, idx.d,
++                                              getattr(idx, 'a', None), getattr(idx, 'b', None))
++            elif isinstance(idx, BatchIndex):
++                indices[i] = intern_batch_index(getattr(idx, 'a', None), getattr(idx, 'b', None),
++                                               idx.c, idx.d)
++            elif isinstance(idx, BoundIndex):
++                indices[i] = intern_bound_index(getattr(idx, 'a', None), getattr(idx, 'b', None),
++                                               idx.aMirror, idx.bMirror)
++
++        # Update the lists with interned versions
++        freeIndices = [idx for idx in indices if isinstance(idx, FreeIndex)]
++        batchIndices = [idx for idx in indices if isinstance(idx, BatchIndex)]
++        boundIndices = [idx for idx in indices if isinstance(idx, BoundIndex)]
++
+         for idx in indices:
+             assert idx is not None
+             idxState = state(idx)
+@@ -596,6 +666,7 @@ class SizeMapping:
+                  'nonTemporalA',
+                  'nonTemporalB',
+                  ]
++    __slots__ = StateKeys
+ 
+     @classmethod
+     def FromOriginalState(cls, d):
+@@ -751,7 +822,7 @@ class Solution:
+         info = cls.ReadOriginalInfo(d)
+         rv.libraryLogicIndex = int(info.get("SolutionIndex", -1))
+ 
+-        rv.sizeMapping = SizeMapping.FromOriginalState(d)
++        rv.sizeMapping = intern_size_mapping(SizeMapping.FromOriginalState(d))
+ 
+         rv.internalArgsSupport = InternalArgsSupport.FromOriginalState(d)
+ 
+diff --git a/tensilelite/Tensile/TensileCreateLibrary/Run.py b/tensilelite/Tensile/TensileCreateLibrary/Run.py
+index 730b6b1fff..b0068563a0 100644
+--- a/tensilelite/Tensile/TensileCreateLibrary/Run.py
++++ b/tensilelite/Tensile/TensileCreateLibrary/Run.py
+@@ -104,7 +104,6 @@ class KernelCodeGenResult(NamedTuple):
+     src: str
+     header: Optional[str]
+     name: str
+-    targetObjFilename: str
+     isa: IsaVersion
+     wavefrontSize: int
+     cuoccupancy: int
+@@ -127,10 +126,9 @@ def processKernelSource(kernelWriterAssembly, data, splitGSU, kernel) -> KernelC
+     asmFilename = getKernelFileBase(splitGSU, kernel)
+     err, src = kernelWriter.getSourceFileString(kernel)
+     header = kernelWriter.getHeaderFileString(kernel)
+-    objFilename = kernel._state.get("codeObjectFile", None)
+     pgr = int(kernel["PrefetchGlobalRead"])
+     return KernelCodeGenResult(
+-        err, src, header, asmFilename, objFilename, tuple(kernel["ISA"]), \
++        err, src, header, asmFilename, tuple(kernel["ISA"]), \
+         kernel["WavefrontSize"], kernel["CUOccupancy"], \
+         pgr, kernel["MathClocksUnrolledLoop"]
+     )
diff --git a/pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch b/pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch
new file mode 100644
index 000000000000..eb50942a095d
--- /dev/null
+++ b/pkgs/development/rocm-modules/6/hipblaslt/TensileCreateLibrary-refactor.patch
@@ -0,0 +1,868 @@
+diff --git a/tensilelite/Tensile/SolutionStructs/Naming.py b/tensilelite/Tensile/SolutionStructs/Naming.py
+index 4f220960db1d..99535e246650 100644
+--- a/tensilelite/Tensile/SolutionStructs/Naming.py
++++ b/tensilelite/Tensile/SolutionStructs/Naming.py
+@@ -105,7 +105,6 @@ def _getName(state, requiredParameters: frozenset, splitGSU: bool, ignoreInterna
+     if splitGSU:
+       state["GlobalSplitU"] = "M" if (state["GlobalSplitU"] > 1 or state["GlobalSplitU"] == -1) else state["GlobalSplitU"]
+ 
+-
+   requiredParametersTemp = set(requiredParameters.union(["GlobalSplitU"]))
+ 
+   if ignoreInternalArgs:
+diff --git a/tensilelite/Tensile/CustomYamlLoader.py b/tensilelite/Tensile/CustomYamlLoader.py
+index bab8c687509..e03f456fbec 100644
+--- a/tensilelite/Tensile/CustomYamlLoader.py
++++ b/tensilelite/Tensile/CustomYamlLoader.py
+@@ -1,3 +1,6 @@
++# Copyright © Advanced Micro Devices, Inc., or its affiliates.
++# SPDX-License-Identifier: MIT
++
+ import yaml
+ from pathlib import Path
+ 
+Author: Luna Nova <git@lunnova.dev>
+Date:   Sun Oct 12 11:52:10 2025 -0700
+
+    [hipblaslt] intern strings to reduce duplicate memory for solution keys
+
+diff --git a/tensilelite/Tensile/CustomYamlLoader.py b/tensilelite/Tensile/CustomYamlLoader.py
+index 685e69220c..9fdf38d8e5 100644
+--- a/tensilelite/Tensile/CustomYamlLoader.py
++++ b/tensilelite/Tensile/CustomYamlLoader.py
+@@ -1,6 +1,7 @@
+ # Copyright © Advanced Micro Devices, Inc., or its affiliates.
+ # SPDX-License-Identifier: MIT
+ 
++import sys
+ import yaml
+ from pathlib import Path
+ 
+@@ -85,7 +86,7 @@ def parse_scalar(loader: yaml.Loader):
+         if not evt.style:
+             return None
+ 
+-    return value
++    return sys.intern(value)
+ 
+ def load_yaml_stream(yaml_path: Path, loader_type: yaml.Loader):
+     with open(yaml_path, 'r') as f:
+
+diff --git a/tensilelite/Tensile/Common/Parallel.py b/tensilelite/Tensile/Common/Parallel.py
+index 1a2bf9e119..f46100c7b8 100644
+--- a/tensilelite/Tensile/Common/Parallel.py
++++ b/tensilelite/Tensile/Common/Parallel.py
+@@ -22,43 +22,58 @@
+ #
+ ################################################################################
+ 
+-import concurrent.futures
+-import itertools
++import multiprocessing
+ import os
++import re
+ import sys
+ import time
+-
+-from joblib import Parallel, delayed
++from functools import partial
++from typing import Any, Callable
+ 
+ from .Utilities import tqdm
+ 
+ 
+-def joblibParallelSupportsGenerator():
+-    import joblib
+-    from packaging.version import Version
++def get_inherited_job_limit() -> int:
++    # 1. Check CMAKE_BUILD_PARALLEL_LEVEL (CMake 3.12+)
++    if 'CMAKE_BUILD_PARALLEL_LEVEL' in os.environ:
++        try:
++            return int(os.environ['CMAKE_BUILD_PARALLEL_LEVEL'])
++        except ValueError:
++            pass
+ 
+-    joblibVer = joblib.__version__
+-    return Version(joblibVer) >= Version("1.4.0")
++    # 2. Parse MAKEFLAGS for -jN
++    makeflags = os.environ.get('MAKEFLAGS', '')
++    match = re.search(r'-j\s*(\d+)', makeflags)
++    if match:
++        return int(match.group(1))
+ 
++    return -1
+ 
+-def CPUThreadCount(enable=True):
+-    from .GlobalParameters import globalParameters
+ 
++def CPUThreadCount(enable=True):
+     if not enable:
+         return 1
+-    else:
++    from .GlobalParameters import globalParameters
++
++    # Priority order:
++    # 1. Inherited from build system (CMAKE_BUILD_PARALLEL_LEVEL or MAKEFLAGS)
++    # 2. Explicit --jobs flag
++    # 3. Auto-detect
++    inherited_limit = get_inherited_job_limit()
++    cpuThreads = inherited_limit if inherited_limit > 0 else globalParameters["CpuThreads"]
++
++    if cpuThreads < 1:
+         if os.name == "nt":
+-            # Windows supports at most 61 workers because the scheduler uses
+-            # WaitForMultipleObjects directly, which has the limit (the limit
+-            # is actually 64, but some handles are needed for accounting).
+-            cpu_count = min(os.cpu_count(), 61)
++            cpuThreads = os.cpu_count()
+         else:
+-            cpu_count = len(os.sched_getaffinity(0))
+-        cpuThreads = globalParameters["CpuThreads"]
+-        if cpuThreads == -1:
+-            return cpu_count
++            cpuThreads = len(os.sched_getaffinity(0))
+ 
+-        return min(cpu_count, cpuThreads)
++    if os.name == "nt":
++        # Windows supports at most 61 workers because the scheduler uses
++        # WaitForMultipleObjects directly, which has the limit (the limit
++        # is actually 64, but some handles are needed for accounting).
++        cpuThreads = min(cpuThreads, 61)
++    return max(1, cpuThreads)
+ 
+ 
+ def pcallWithGlobalParamsMultiArg(f, args, newGlobalParameters):
+@@ -71,19 +86,22 @@ def pcallWithGlobalParamsSingleArg(f, arg, newGlobalParameters):
+     return f(arg)
+ 
+ 
+-def apply_print_exception(item, *args):
+-    # print(item, args)
++def OverwriteGlobalParameters(newGlobalParameters):
++    from . import GlobalParameters
++
++    GlobalParameters.globalParameters.clear()
++    GlobalParameters.globalParameters.update(newGlobalParameters)
++
++
++def worker_function(args, function, multiArg):
++    """Worker function that executes in the pool process."""
+     try:
+-        if len(args) > 0:
+-            func = item
+-            args = args[0]
+-            return func(*args)
++        if multiArg:
++            return function(*args)
+         else:
+-            func, item = item
+-            return func(item)
++            return function(args)
+     except Exception:
+         import traceback
+-
+         traceback.print_exc()
+         raise
+     finally:
+@@ -98,154 +116,121 @@ def OverwriteGlobalParameters(newGlobalParameters):
+     GlobalParameters.globalParameters.update(newGlobalParameters)
+ 
+ 
+-def ProcessingPool(enable=True, maxTasksPerChild=None):
+-    import multiprocessing
+-    import multiprocessing.dummy
+-
+-    threadCount = CPUThreadCount()
+-
+-    if (not enable) or threadCount <= 1:
+-        return multiprocessing.dummy.Pool(1)
+-
+-    if multiprocessing.get_start_method() == "spawn":
+-        from . import GlobalParameters
+-
+-        return multiprocessing.Pool(
+-            threadCount,
+-            initializer=OverwriteGlobalParameters,
+-            maxtasksperchild=maxTasksPerChild,
+-            initargs=(GlobalParameters.globalParameters,),
+-        )
+-    else:
+-        return multiprocessing.Pool(threadCount, maxtasksperchild=maxTasksPerChild)
++def progress_logger(iterable, total, message, min_log_interval=5.0):
++    """
++    Generator that wraps an iterable and logs progress with time-based throttling.
+ 
++    Only logs progress if at least min_log_interval seconds have passed since last log.
++    Only prints completion message if task took >= min_log_interval seconds.
+ 
+-def ParallelMap(function, objects, message="", enable=True, method=None, maxTasksPerChild=None):
++    Yields (index, item) tuples.
+     """
+-    Generally equivalent to list(map(function, objects)), possibly executing in parallel.
+-
+-      message: A message describing the operation to be performed.
+-      enable: May be set to false to disable parallelism.
+-      method: A function which can fetch the mapping function from a processing pool object.
+-          Leave blank to use .map(), other possiblities:
+-             - `lambda x: x.starmap` - useful if `function` takes multiple parameters.
+-             - `lambda x: x.imap` - lazy evaluation
+-             - `lambda x: x.imap_unordered` - lazy evaluation, does not preserve order of return value.
+-    """
+-    from .GlobalParameters import globalParameters
++    start_time = time.time()
++    last_log_time = start_time
++    log_interval = 1 + (total // 100)
+ 
+-    threadCount = CPUThreadCount(enable)
+-    pool = ProcessingPool(enable, maxTasksPerChild)
+-
+-    if threadCount <= 1 and globalParameters["ShowProgressBar"]:
+-        # Provide a progress bar for single-threaded operation.
+-        # This works for method=None, and for starmap.
+-        mapFunc = map
+-        if method is not None:
+-            # itertools provides starmap which can fill in for pool.starmap.  It provides imap on Python 2.7.
+-            # If this works, we will use it, otherwise we will fallback to the "dummy" pool for single threaded
+-            # operation.
+-            try:
+-                mapFunc = method(itertools)
+-            except NameError:
+-                mapFunc = None
+-
+-        if mapFunc is not None:
+-            return list(mapFunc(function, tqdm(objects, message)))
+-
+-    mapFunc = pool.map
+-    if method:
+-        mapFunc = method(pool)
+-
+-    objects = zip(itertools.repeat(function), objects)
+-    function = apply_print_exception
+-
+-    countMessage = ""
+-    try:
+-        countMessage = " for {} tasks".format(len(objects))
+-    except TypeError:
+-        pass
++    for idx, item in enumerate(iterable):
++        if idx % log_interval == 0:
++            current_time = time.time()
++            if (current_time - last_log_time) >= min_log_interval:
++                print(f"{message}\t{idx+1: 5d}/{total: 5d}")
++                last_log_time = current_time
++        yield idx, item
+ 
+-    if message != "":
+-        message += ": "
++    elapsed = time.time() - start_time
++    final_idx = idx + 1 if 'idx' in locals() else 0
+ 
+-    print("{0}Launching {1} threads{2}...".format(message, threadCount, countMessage))
+-    sys.stdout.flush()
+-    currentTime = time.time()
+-    rv = mapFunc(function, objects)
+-    totalTime = time.time() - currentTime
+-    print("{0}Done. ({1:.1f} secs elapsed)".format(message, totalTime))
+-    sys.stdout.flush()
+-    pool.close()
+-    return rv
++    if elapsed >= min_log_interval or last_log_time > start_time:
++        print(f"{message} done in {elapsed:.1f}s!\t{final_idx: 5d}/{total: 5d}")
+ 
+ 
+-def ParallelMapReturnAsGenerator(function, objects, message="", enable=True, multiArg=True):
+-    from .GlobalParameters import globalParameters
++def imap_with_progress(pool, func, iterable, total, message, chunksize):
++    results = []
++    for _, result in progress_logger(pool.imap(func, iterable, chunksize=chunksize), total, message):
++        results.append(result)
++    return results
+ 
+-    threadCount = CPUThreadCount(enable)
+-    print("{0}Launching {1} threads...".format(message, threadCount))
+ 
+-    if threadCount <= 1 and globalParameters["ShowProgressBar"]:
+-        # Provide a progress bar for single-threaded operation.
+-        callFunc = lambda args: function(*args) if multiArg else lambda args: function(args)
+-        return [callFunc(args) for args in tqdm(objects, message)]
++def _ParallelMap_generator(worker, objects, objLen, message, chunksize, threadCount, globalParameters, maxtasksperchild):
++    # separate fn because yield makes the entire fn a generator even if unreachable
++    ctx = multiprocessing.get_context('forkserver' if os.name != 'nt' else 'spawn')
+ 
+-    with concurrent.futures.ProcessPoolExecutor(max_workers=threadCount) as executor:
+-        resultFutures = (executor.submit(function, *arg if multiArg else arg) for arg in objects)
+-        for result in concurrent.futures.as_completed(resultFutures):
+-            yield result.result()
++    with ctx.Pool(processes=threadCount, maxtasksperchild=maxtasksperchild,
++                  initializer=OverwriteGlobalParameters, initargs=(globalParameters,)) as pool:
++        for _, result in progress_logger(pool.imap_unordered(worker, objects, chunksize=chunksize), objLen, message):
++            yield result
+ 
+ 
+ def ParallelMap2(
+-    function, objects, message="", enable=True, multiArg=True, return_as="list", procs=None
++    function: Callable,
++    objects: Any,
++    message: str = "",
++    enable: bool = True,
++    multiArg: bool = True,
++    minChunkSize: int = 1,
++    maxWorkers: int = -1,
++    maxtasksperchild: int = 1024,
++    return_as: str = "list"
+ ):
++    """Executes a function over a list of objects in parallel or sequentially.
++
++    This function is generally equivalent to ``list(map(function, objects))``. However, it provides
++    additional functionality to run in parallel, depending on the 'enable' flag and available CPU
++    threads.
++
++    Args:
++        function: The function to apply to each item in 'objects'. If 'multiArg' is True, 'function'
++                  should accept multiple arguments.
++        objects: An iterable of objects to be processed by 'function'. If 'multiArg' is True, each
++                 item in 'objects' should be an iterable of arguments for 'function'.
++        message: Optional; a message describing the operation. Default is an empty string.
++        enable: Optional; if False, disables parallel execution and runs sequentially. Default is True.
++        multiArg: Optional; if True, treats each item in 'objects' as multiple arguments for
++                  'function'. Default is True.
++        return_as: Optional; "list" (default) or "generator_unordered" for streaming results
++
++    Returns:
++        A list or generator containing the results of applying **function** to each item in **objects**.
+     """
+-    Generally equivalent to list(map(function, objects)), possibly executing in parallel.
++    from .GlobalParameters import globalParameters
+ 
+-      message: A message describing the operation to be performed.
+-      enable: May be set to false to disable parallelism.
+-      multiArg: True if objects represent multiple arguments
+-                  (differentiates multi args vs single collection arg)
+-    """
+-    if return_as in ("generator", "generator_unordered") and not joblibParallelSupportsGenerator():
+-        return ParallelMapReturnAsGenerator(function, objects, message, enable, multiArg)
++    threadCount = CPUThreadCount(enable)
+ 
+-    from .GlobalParameters import globalParameters
++    if not hasattr(objects, "__len__"):
++        objects = list(objects)
+ 
+-    threadCount = procs if procs else CPUThreadCount(enable)
++    objLen = len(objects)
++    if objLen == 0:
++        return [] if return_as == "list" else iter([])
+ 
+-    threadCount = CPUThreadCount(enable)
++    f = (lambda x: function(*x)) if multiArg else function
++    if objLen == 1:
++        print(f"{message}: (1 task)")
++        result = [f(x) for x in objects]
++        return result if return_as == "list" else iter(result)
+ 
+-    if threadCount <= 1 and globalParameters["ShowProgressBar"]:
+-        # Provide a progress bar for single-threaded operation.
+-        return [function(*args) if multiArg else function(args) for args in tqdm(objects, message)]
++    extra_message = (
++        f": {threadCount} thread(s)" + f", {objLen} tasks"
++        if objLen
++        else ""
++    )
+ 
+-    countMessage = ""
+-    try:
+-        countMessage = " for {} tasks".format(len(objects))
+-    except TypeError:
+-        pass
+-
+-    if message != "":
+-        message += ": "
+-    print("{0}Launching {1} threads{2}...".format(message, threadCount, countMessage))
+-    sys.stdout.flush()
+-    currentTime = time.time()
+-
+-    pcall = pcallWithGlobalParamsMultiArg if multiArg else pcallWithGlobalParamsSingleArg
+-    pargs = zip(objects, itertools.repeat(globalParameters))
+-
+-    if joblibParallelSupportsGenerator():
+-        rv = Parallel(n_jobs=threadCount, timeout=99999, return_as=return_as)(
+-            delayed(pcall)(function, a, params) for a, params in pargs
+-        )
++    print(f"ParallelMap {message}{extra_message}")
++
++    if threadCount <= 1:
++        result = [f(x) for x in objects]
++        return result if return_as == "list" else iter(result)
++
++    if maxWorkers > 0:
++        threadCount = min(maxWorkers, threadCount)
++
++    chunksize = max(minChunkSize, objLen // 2000)
++    worker = partial(worker_function, function=function, multiArg=multiArg)
++    if return_as == "generator_unordered":
++        # yield results as they complete without buffering
++        return _ParallelMap_generator(worker, objects, objLen, message, chunksize, threadCount, globalParameters, maxtasksperchild)
+     else:
+-        rv = Parallel(n_jobs=threadCount, timeout=99999)(
+-            delayed(pcall)(function, a, params) for a, params in pargs
+-        )
+-
+-    totalTime = time.time() - currentTime
+-    print("{0}Done. ({1:.1f} secs elapsed)".format(message, totalTime))
+-    sys.stdout.flush()
+-    return rv
++        ctx = multiprocessing.get_context('forkserver' if os.name != 'nt' else 'spawn')
++        with ctx.Pool(processes=threadCount, maxtasksperchild=maxtasksperchild,
++                      initializer=OverwriteGlobalParameters, initargs=(globalParameters,)) as pool:
++            return list(imap_with_progress(pool, worker, objects, objLen, message, chunksize))
+diff --git a/tensilelite/Tensile/CustomKernels.py b/tensilelite/Tensile/CustomKernels.py
+index ffceb636f5..127b3386a1 100644
+--- a/tensilelite/Tensile/CustomKernels.py
++++ b/tensilelite/Tensile/CustomKernels.py
+@@ -24,7 +24,9 @@
+ 
+ from . import CUSTOM_KERNEL_PATH
+ from Tensile.Common.ValidParameters import checkParametersAreValid, validParameters, newMIValidParameters
++from Tensile.CustomYamlLoader import DEFAULT_YAML_LOADER
+ 
++from functools import lru_cache
+ import yaml
+ 
+ import os
+@@ -58,10 +60,13 @@ def getCustomKernelConfigAndAssembly(name, directory=CUSTOM_KERNEL_PATH):
+ 
+     return (config, assembly)
+ 
++# getCustomKernelConfig will get called repeatedly on the same file
++# 20x logic loading speedup for aquavanjaram_Cijk_Ailk_Bljk_F8NH_HHS_BH_Bias_HAS_SAB_SAV_freesize_custom_GSUs
++@lru_cache
+ def readCustomKernelConfig(name, directory=CUSTOM_KERNEL_PATH):
+     rawConfig, _ = getCustomKernelConfigAndAssembly(name, directory)
+     try:
+-        return yaml.safe_load(rawConfig)["custom.config"]
++        return yaml.load(rawConfig, Loader=DEFAULT_YAML_LOADER)["custom.config"]
+     except yaml.scanner.ScannerError as e:
+         raise RuntimeError("Failed to read configuration for custom kernel: {0}\nDetails:\n{1}".format(name, e))
+ 
+diff --git a/tensilelite/Tensile/TensileCreateLibrary/Run.py b/tensilelite/Tensile/TensileCreateLibrary/Run.py
+index 835ed9c019..024c6c49c1 100644
+--- a/tensilelite/Tensile/TensileCreateLibrary/Run.py
++++ b/tensilelite/Tensile/TensileCreateLibrary/Run.py
+@@ -26,8 +26,10 @@ import rocisa
+ 
+ import functools
+ import glob
++import gc
+ import itertools
+ import os
++import resource
+ import shutil
+ from pathlib import Path
+ from timeit import default_timer as timer
+@@ -78,6 +80,25 @@ from Tensile.Utilities.Decorators.Timing import timing
+ from .ParseArguments import parseArguments
+ 
+ 
++def getMemoryUsage():
++    """Get peak and current memory usage in MB."""
++    rusage = resource.getrusage(resource.RUSAGE_SELF)
++    peak_memory_mb = rusage.ru_maxrss / 1024  # KB to MB on Linux
++
++    # Get current memory from /proc/self/status
++    current_memory_mb = 0
++    try:
++        with open('/proc/self/status') as f:
++            for line in f:
++                if line.startswith('VmRSS:'):
++                    current_memory_mb = int(line.split()[1]) / 1024  # KB to MB
++                    break
++    except:
++        current_memory_mb = peak_memory_mb  # Fallback
++
++    return (peak_memory_mb, current_memory_mb)
++
++
+ class KernelCodeGenResult(NamedTuple):
+     err: int
+     src: str
+@@ -115,6 +136,29 @@ def processKernelSource(kernelWriterAssembly, data, splitGSU, kernel) -> KernelC
+     )
+ 
+ 
++def processAndAssembleKernelTCL(kernelWriterAssembly, rocisa_data, splitGSU, kernel, assemblyTmpPath, assembler):
++    """
++    Pipeline function for TCL mode that:
++    1. Generates kernel source
++    2. Writes .s file to disk
++    3. Assembles to .o file
++    4. Deletes .s file
++    """
++    result = processKernelSource(kernelWriterAssembly, rocisa_data, splitGSU, kernel)
++    return writeAndAssembleKernel(result, assemblyTmpPath, assembler)
++
++
++def writeMasterSolutionLibrary(name_lib_tuple, newLibraryDir, splitGSU, libraryFormat):
++    """
++    Write a master solution library to disk.
++    Module-level function to support multiprocessing.
++    """
++    name, lib = name_lib_tuple
++    filename = os.path.join(newLibraryDir, name)
++    lib.applyNaming(splitGSU)
++    LibraryIO.write(filename, state(lib), libraryFormat)
++
++
+ def removeInvalidSolutionsAndKernels(results, kernels, solutions, errorTolerant, printLevel: bool, splitGSU: bool):
+     removeKernels = []
+     removeKernelNames = []
+@@ -189,6 +233,24 @@ def writeAssembly(asmPath: Union[Path, str], result: KernelCodeGenResult):
+     return path, isa, wfsize, minResult
+ 
+ 
++def writeAndAssembleKernel(result: KernelCodeGenResult, asmPath: Union[Path, str], assembler):
++    """Write assembly file and immediately assemble it to .o file"""
++    if result.err:
++        printExit(f"Failed to build kernel {result.name} because it has error code {result.err}")
++
++    path = Path(asmPath) / f"{result.name}.s"
++    with open(path, "w", encoding="utf-8") as f:
++        f.write(result.src)
++
++    # Assemble .s -> .o
++    assembler(isaToGfx(result.isa), result.wavefrontSize, str(path), str(path.with_suffix(".o")))
++
++    # Delete assembly file immediately to save disk space
++    path.unlink()
++
++    return KernelMinResult(result.err, result.cuoccupancy, result.pgr, result.mathclk)
++
++
+ def writeHelpers(
+     outputPath, kernelHelperObjs, KERNEL_HELPER_FILENAME_CPP, KERNEL_HELPER_FILENAME_H
+ ):
+@@ -268,13 +330,14 @@ def writeSolutionsAndKernels(
+     numAsmKernels = len(asmKernels)
+     numKernels = len(asmKernels)
+     assert numKernels == numAsmKernels, "Only assembly kernels are supported in TensileLite"
+-    asmIter = zip(
+-        itertools.repeat(kernelWriterAssembly),
+-        itertools.repeat(rocisa.rocIsa.getInstance().getData()),
+-        itertools.repeat(splitGSU),
+-        asmKernels
++
++    processKernelFn = functools.partial(
++        processKernelSource,
++        kernelWriterAssembly=kernelWriterAssembly,
++        data=rocisa.rocIsa.getInstance().getData(),
++        splitGSU=splitGSU
+     )
+-    asmResults = ParallelMap2(processKernelSource, asmIter, "Generating assembly kernels", return_as="list")
++    asmResults = ParallelMap2(processKernelFn, asmKernels, "Generating assembly kernels", return_as="list", multiArg=False)
+     removeInvalidSolutionsAndKernels(
+         asmResults, asmKernels, solutions, errorTolerant, getVerbosity(), splitGSU
+     )
+@@ -282,19 +345,21 @@ def writeSolutionsAndKernels(
+         asmResults, asmKernels, solutions, splitGSU
+     )
+ 
+-    def assemble(ret):
+-        p, isa, wavefrontsize, result = ret
+-        asmToolchain.assembler(isaToGfx(isa), wavefrontsize, str(p), str(p.with_suffix(".o")))
+-
+-    unaryWriteAssembly = functools.partial(writeAssembly, assemblyTmpPath)
+-    compose = lambda *F: functools.reduce(lambda f, g: lambda x: f(g(x)), F)
++    # Use functools.partial to bind assemblyTmpPath and assembler
++    writeAndAssembleFn = functools.partial(
++        writeAndAssembleKernel,
++        asmPath=assemblyTmpPath,
++        assembler=asmToolchain.assembler
++    )
+     ret = ParallelMap2(
+-        compose(assemble, unaryWriteAssembly),
++        writeAndAssembleFn,
+         asmResults,
+         "Writing assembly kernels",
+         return_as="list",
+         multiArg=False,
+     )
++    del asmResults
++    gc.collect()
+ 
+     writeHelpers(outputPath, kernelHelperObjs, KERNEL_HELPER_FILENAME_CPP, KERNEL_HELPER_FILENAME_H)
+     srcKernelFile = Path(outputPath) / "Kernels.cpp"
+@@ -369,32 +434,31 @@ def writeSolutionsAndKernelsTCL(
+ 
+     uniqueAsmKernels = [k for k in asmKernels if not k.duplicate]
+ 
+-    def assemble(ret):
+-        p, isa, wavefrontsize, result = ret
+-        asmToolchain.assembler(isaToGfx(isa), wavefrontsize, str(p), str(p.with_suffix(".o")))
+-        return result
+-
+-    unaryProcessKernelSource = functools.partial(
+-        processKernelSource,
++    processKernelFn = functools.partial(
++        processAndAssembleKernelTCL,
+         kernelWriterAssembly,
+         rocisa.rocIsa.getInstance().getData(),
+         splitGSU,
++        assemblyTmpPath=assemblyTmpPath,
++        assembler=asmToolchain.assembler
+     )
+ 
+-    unaryWriteAssembly = functools.partial(writeAssembly, assemblyTmpPath)
+-    compose = lambda *F: functools.reduce(lambda f, g: lambda x: f(g(x)), F)
+-    ret = ParallelMap2(
+-        compose(assemble, unaryWriteAssembly, unaryProcessKernelSource),
++    results = ParallelMap2(
++        processKernelFn,
+         uniqueAsmKernels,
+         "Generating assembly kernels",
+         multiArg=False,
+         return_as="list"
+     )
++    del processKernelFn
++    gc.collect()
++
+     passPostKernelInfoToSolution(
+-        ret, uniqueAsmKernels, solutions, splitGSU
++        results, uniqueAsmKernels, solutions, splitGSU
+     )
+-    # result.src is very large so let garbage collector know to clean up
+-    del ret
++    del results
++    gc.collect()
++
+     buildAssemblyCodeObjectFiles(
+         asmToolchain.linker,
+         asmToolchain.bundler,
+@@ -493,6 +557,15 @@ def generateKernelHelperObjects(solutions: List[Solution], cxxCompiler: str, isa
+     return sorted(khos, key=sortByEnum, reverse=True) # Ensure that we write Enum kernel helpers are first in list
+ 
+ 
++def libraryIter(lib: MasterSolutionLibrary):
++    if len(lib.solutions):
++        for i, s in enumerate(lib.solutions.items()):
++            yield (i, *s)
++    else:
++        for _, lazyLib in lib.lazyLibraries.items():
++            yield from libraryIter(lazyLib)
++
++
+ @timing
+ def generateLogicDataAndSolutions(logicFiles, args, assembler: Assembler, isaInfoMap):
+ 
+@@ -508,26 +581,23 @@ def generateLogicDataAndSolutions(logicFiles, args, assembler: Assembler, isaInf
+     printSolutionRejectionReason = True
+     printIndexAssignmentInfo = False
+ 
+-    fIter = zip(
+-        logicFiles,
+-        itertools.repeat(assembler),
+-        itertools.repeat(splitGSU),
+-        itertools.repeat(printSolutionRejectionReason),
+-        itertools.repeat(printIndexAssignmentInfo),
+-        itertools.repeat(isaInfoMap),
+-        itertools.repeat(args["LazyLibraryLoading"]),
++    parseLogicFn = functools.partial(
++        LibraryIO.parseLibraryLogicFile,
++        assembler=assembler,
++        splitGSU=splitGSU,
++        printSolutionRejectionReason=printSolutionRejectionReason,
++        printIndexAssignmentInfo=printIndexAssignmentInfo,
++        isaInfoMap=isaInfoMap,
++        lazyLibraryLoading=args["LazyLibraryLoading"]
+     )
+ 
+-    def libraryIter(lib: MasterSolutionLibrary):
+-        if len(lib.solutions):
+-            for i, s in enumerate(lib.solutions.items()):
+-                yield (i, *s)
+-        else:
+-            for _, lazyLib in lib.lazyLibraries.items():
+-                yield from libraryIter(lazyLib)
+-
+     for library in ParallelMap2(
+-        LibraryIO.parseLibraryLogicFile, fIter, "Loading Logics...", return_as="generator_unordered"
++        parseLogicFn, logicFiles, "Loading Logics...",
++        return_as="generator_unordered",
++        minChunkSize=24,
++        maxWorkers=32,
++        maxtasksperchild=1,
++        multiArg=False,
+     ):
+         _, architectureName, _, _, _, newLibrary = library
+ 
+@@ -539,6 +609,9 @@ def generateLogicDataAndSolutions(logicFiles, args, assembler: Assembler, isaInf
+         else:
+             masterLibraries[architectureName] = newLibrary
+             masterLibraries[architectureName].version = args["CodeObjectVersion"]
++        del library, newLibrary
++
++    gc.collect()
+ 
+     # Sort masterLibraries to make global soln index values deterministic
+     solnReIndex = 0
+@@ -734,6 +807,9 @@ def run():
+     )
+     stop_wsk = timer()
+     print(f"Time to generate kernels (s): {(stop_wsk-start_wsk):3.2f}")
++    numKernelHelperObjs = len(kernelHelperObjs)
++    del kernelWriterAssembly, kernelHelperObjs
++    gc.collect()
+ 
+     archs = [ # is this really different than the other archs above?
+         isaToGfx(arch)
+@@ -751,13 +827,10 @@ def run():
+             if kName not in solDict:
+                 solDict["%s"%kName] = kernel
+ 
+-    def writeMsl(name, lib):
+-        filename = os.path.join(newLibraryDir, name)
+-        lib.applyNaming(splitGSU)
+-        LibraryIO.write(filename, state(lib), arguments["LibraryFormat"])
+-
+     filename = os.path.join(newLibraryDir, "TensileLiteLibrary_lazy_Mapping")
+     LibraryIO.write(filename, libraryMapping, "msgpack")
++    del libraryMapping
++    gc.collect()
+ 
+     start_msl = timer()
+     for archName, newMasterLibrary in masterLibraries.items():
+@@ -774,12 +847,22 @@ def run():
+                     kName = getKeyNoInternalArgs(s.originalSolution, splitGSU)
+                     s.sizeMapping.CUOccupancy = solDict["%s"%kName]["CUOccupancy"]
+ 
+-            ParallelMap2(writeMsl,
++            writeFn = functools.partial(
++                writeMasterSolutionLibrary,
++                newLibraryDir=newLibraryDir,
++                splitGSU=splitGSU,
++                libraryFormat=arguments["LibraryFormat"]
++            )
++
++            ParallelMap2(writeFn,
+                          newMasterLibrary.lazyLibraries.items(),
+                          "Writing master solution libraries",
++                         multiArg=False,
+                          return_as="list")
+     stop_msl = timer()
+     print(f"Time to write master solution libraries (s): {(stop_msl-start_msl):3.2f}")
++    del masterLibraries, solutions, kernels, solDict
++    gc.collect()
+ 
+     if not arguments["KeepBuildTmp"]:
+         buildTmp = Path(arguments["OutputPath"]).parent / "library" / "build_tmp"
+@@ -796,8 +879,11 @@ def run():
+     print("")
+ 
+     stop = timer()
++    peak_memory_mb, current_memory_mb = getMemoryUsage()
+ 
+     print(f"Total time (s): {(stop-start):3.2f}")
+     print(f"Total kernels processed: {numKernels}")
+     print(f"Kernels processed per second: {(numKernels/(stop-start)):3.2f}")
+-    print(f"KernelHelperObjs: {len(kernelHelperObjs)}")
++    print(f"KernelHelperObjs: {numKernelHelperObjs}")
++    print(f"Peak memory usage (MB): {peak_memory_mb:,.1f}")
++    print(f"Current memory usage (MB): {current_memory_mb:,.1f}")
+diff --git a/tensilelite/Tensile/TensileMergeLibrary.py b/tensilelite/Tensile/TensileMergeLibrary.py
+index e33c617b6f..ba163e9918 100644
+--- a/tensilelite/Tensile/TensileMergeLibrary.py
++++ b/tensilelite/Tensile/TensileMergeLibrary.py
+@@ -303,8 +303,7 @@ def avoidRegressions(originalDir, incrementalDir, outputPath, forceMerge, noEff=
+         logicsFiles[origFile] = origFile
+         logicsFiles[incFile] = incFile
+ 
+-    iters = zip(logicsFiles.keys())
+-    logicsList = ParallelMap2(loadData, iters, "Loading Logics...", return_as="list")
++    logicsList = ParallelMap2(loadData, logicsFiles.keys(), "Loading Logics...", return_as="list", multiArg=False)
+     logicsDict = {}
+     for i, _ in enumerate(logicsList):
+         logicsDict[logicsList[i][0]] = logicsList[i][1]
+diff --git a/tensilelite/Tensile/TensileUpdateLibrary.py b/tensilelite/Tensile/TensileUpdateLibrary.py
+index 5ff265d0ed..c1803a6349 100644
+--- a/tensilelite/Tensile/TensileUpdateLibrary.py
++++ b/tensilelite/Tensile/TensileUpdateLibrary.py
+@@ -26,7 +26,7 @@ from . import LibraryIO
+ from .Tensile import addCommonArguments, argUpdatedGlobalParameters
+ 
+ from .Common import assignGlobalParameters, print1, restoreDefaultGlobalParameters, HR, \
+-                    globalParameters, architectureMap, ensurePath, ParallelMap, __version__
++                    globalParameters, architectureMap, ensurePath, ParallelMap2, __version__
+ 
+ import argparse
+ import copy
+@@ -149,7 +149,7 @@ def TensileUpdateLibrary(userArgs):
+     for logicFile in logicFiles:
+         print("#   %s" % logicFile)
+     fIter = zip(logicFiles, itertools.repeat(args.logic_path), itertools.repeat(outputPath))
+-    libraries = ParallelMap(UpdateLogic, fIter, "Updating logic files", method=lambda x: x.starmap)
++    libraries = ParallelMap2(UpdateLogic, fIter, "Updating logic files", multiArg=True, return_as="list")
+ 
+ 
+ def main():
+diff --git a/tensilelite/Tensile/Toolchain/Assembly.py b/tensilelite/Tensile/Toolchain/Assembly.py
+index a8b91e8d62..265e1d532c 100644
+--- a/tensilelite/Tensile/Toolchain/Assembly.py
++++ b/tensilelite/Tensile/Toolchain/Assembly.py
+@@ -30,7 +30,7 @@ import subprocess
+ from pathlib import Path
+ from typing import List, Union, NamedTuple
+ 
+-from Tensile.Common import print2
++from Tensile.Common import print1, print2
+ from Tensile.Common.Architectures import isaToGfx
+ from ..SolutionStructs import Solution
+ 
+@@ -92,8 +92,26 @@ def buildAssemblyCodeObjectFiles(
+         if coName:
+           coFileMap[asmDir / (coName + extCoRaw)].add(str(asmDir / (kernel["BaseName"] + extObj)))
+ 
++      # Build reference count map for .o files to handle shared object files
++      # (.o files from kernels marked .duplicate in TensileCreateLibrary)
++      objFileRefCount = collections.Counter()
++      for coFileRaw, objFiles in coFileMap.items():
++        for objFile in objFiles:
++          objFileRefCount[objFile] += 1
++
++      sharedObjFiles = {objFile: count for objFile, count in objFileRefCount.items() if count > 1}
++      if sharedObjFiles:
++        print1(f"Found {len(sharedObjFiles)} .o files shared across multiple code objects:")
++
+       for coFileRaw, objFiles in coFileMap.items():
+         linker(objFiles, str(coFileRaw))
++
++        # Delete .o files after linking once usage count reaches 0
++        for objFile in objFiles:
++          objFileRefCount[objFile] -= 1
++          if objFileRefCount[objFile] == 0:
++            Path(objFile).unlink()
++
+         coFile = destDir / coFileRaw.name.replace(extCoRaw, extCo)
+         if compress:
+           bundler.compress(str(coFileRaw), str(coFile), gfx)
+diff --git a/tensilelite/Tensile/Toolchain/Component.py b/tensilelite/Tensile/Toolchain/Component.py
+index 67fa35e2d8..dde83af4c3 100644
+--- a/tensilelite/Tensile/Toolchain/Component.py
++++ b/tensilelite/Tensile/Toolchain/Component.py
+@@ -355,6 +355,7 @@ class Linker(Component):
+         when invoking the linker, LLVM allows the provision of arguments via a "response file"
+         Reference: https://llvm.org/docs/CommandLine.html#response-files
+         """
++        # FIXME: this prevents threading as clang_args.txt is overwritten
+         with open(Path.cwd() / "clang_args.txt", "wt") as file:
+             file.write(" ".join(srcPaths).replace('\\', '\\\\') if os_name == "nt" else " ".join(srcPaths))
+         return [*(self.default_args), "-o", destPath, "@clang_args.txt"]
+diff --git a/tensilelite/requirements.txt b/tensilelite/requirements.txt
+index 60c4c11445..5c8fd66a88 100644
+--- a/tensilelite/requirements.txt
++++ b/tensilelite/requirements.txt
+@@ -2,8 +2,6 @@ dataclasses; python_version == '3.6'
+ packaging
+ pyyaml
+ msgpack
+-joblib>=1.4.0; python_version >= '3.8'
+-joblib>=1.1.1; python_version < '3.8'
+ simplejson
+ ujson
+ orjson
diff --git a/pkgs/development/rocm-modules/6/hipblaslt/default.nix b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
index 8e68e0f9e623..fe395d874d15 100644
--- a/pkgs/development/rocm-modules/6/hipblaslt/default.nix
+++ b/pkgs/development/rocm-modules/6/hipblaslt/default.nix
@@ -22,6 +22,7 @@
   ncurses,
   ninja,
   libffi,
+  jemalloc,
   zlib,
   zstd,
   rocmUpdateScript,
@@ -54,7 +55,6 @@ let
     ps.setuptools
     ps.packaging
     ps.nanobind
-    ps.joblib
     ps.msgpack
   ]);
   # workaround: build for one working target if no targets are supported
@@ -86,6 +86,8 @@ stdenv.mkDerivation (finalAttrs: {
   env.ROCM_PATH = "${clr}";
   env.TENSILE_ROCM_ASSEMBLER_PATH = lib.getExe' clr "amdclang++";
   env.TENSILE_GEN_ASSEMBLY_TOOLCHAIN = lib.getExe' clr "amdclang++";
+  env.LD_PRELOAD = "${jemalloc}/lib/libjemalloc.so";
+  env.MALLOC_CONF = "background_thread:true,metadata_thp:auto,dirty_decay_ms:10000,muzzy_decay_ms:10000";
   requiredSystemFeatures = [ "big-parallel" ];
 
   __structuredAttrs = true;
@@ -111,9 +113,10 @@ stdenv.mkDerivation (finalAttrs: {
     # Support loading zstd compressed .dat files, required to keep output under
     # hydra size limit
     ./messagepack-compression-support.patch
-    # excessive comments are written to temporary asm files in build dir
-    # TODO: report upstream, find a better solution
-    ./reduce-comment-spam.patch
+    # [hipblaslt] Refactor Parallel.py to drop joblib, massively reduce peak disk space usage
+    # https://github.com/ROCm/rocm-libraries/pull/2073
+    ./TensileCreateLibrary-refactor.patch
+    ./Tensile-interning.patch
   ];
 
   postPatch = ''
@@ -125,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   doCheck = false;
-  doInstallCheck = false;
+  doInstallCheck = true;
 
   nativeBuildInputs = [
     cmake
@@ -136,6 +139,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     ninja
     rocm-smi
+    zstd
   ];
 
   buildInputs = [
@@ -154,7 +158,6 @@ stdenv.mkDerivation (finalAttrs: {
     msgpack-cxx
     libxml2
     python3Packages.msgpack
-    python3Packages.joblib
     zlib
     zstd
   ]
@@ -212,6 +215,18 @@ stdenv.mkDerivation (finalAttrs: {
       rmdir $out/bin
     '';
 
+  installCheckPhase =
+    # Verify compression worked and .dat files aren't huge
+    ''
+      runHook preInstallCheck
+      find "$out" -type f -name "*.dat" -size "+2M" -exec sh -c '
+          echo "ERROR: oversized .dat file, check for issues with install compression: {}" >&2
+          exit 1
+      ' {} \;
+      echo "Verified .dat files in $out are not huge"
+      runHook postInstallCheck
+    '';
+
   # If this is false there are no kernels in the output lib
   # supporting the target device
   # so if it's an optional dep it's best to not depend on it
diff --git a/pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch b/pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch
deleted file mode 100644
index 32969c517781..000000000000
--- a/pkgs/development/rocm-modules/6/hipblaslt/reduce-comment-spam.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/projects/hipblaslt/tensilelite/rocisa/rocisa/include/format.hpp b/projects/hipblaslt/tensilelite/rocisa/rocisa/include/format.hpp
-index b7dcb6f59a..b0625ba769 100644
---- a/tensilelite/rocisa/rocisa/include/format.hpp
-+++ b/tensilelite/rocisa/rocisa/include/format.hpp
-@@ -8,11 +8,13 @@ namespace rocisa
-     // Text format functions
-     inline std::string slash(const std::string& comment)
-     {
-+        return "";
-         return "// " + comment + "\n";
-     }
- 
-     inline std::string slash50(const std::string& comment)
-     {
-+        return "";
-         std::ostringstream oss;
-         oss << std::setw(50) << ""
-             << " // " << comment << "\n";
-@@ -21,16 +23,19 @@ namespace rocisa
- 
-     inline std::string block(const std::string& comment)
-     {
-+        return "";
-         return "/* " + comment + " */\n";
-     }
- 
-     inline std::string blockNewLine(const std::string& comment)
-     {
-+        return "";
-         return "\n/* " + comment + " */\n";
-     }
- 
-     inline std::string block3Line(const std::string& comment)
-     {
-+        return "";
-         std::ostringstream oss;
-         oss << "\n/******************************************/\n";
-         std::istringstream iss(comment);
-@@ -52,7 +57,7 @@ namespace rocisa
-         {
-             formattedStr = "\"" + formattedStr + "\\n\\t\"";
-         }
--        if(!comment.empty())
-+        if(false)
-         {
-             std::string buffer = formattedStr
-                                  + std::string(std::max(0, 50 - int(formattedStr.length())), ' ')
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index e545c23c1da3..3b03a66574c2 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -10,7 +10,6 @@
   runCommand,
   symlinkJoin,
   rdfind,
-  wrapBintoolsWith,
   zstd,
   zlib,
   gcc-unwrapped,
@@ -32,7 +31,7 @@
   withLto ? true,
   # whether rocm stdenv uses libcxx (clang c++ stdlib) instead of gcc stdlibc++
   withLibcxx ? false,
-}@args:
+}:
 
 let
   version = "6.4.3";
@@ -142,6 +141,28 @@ let
     stdenv.cc.cc
     stdenv.cc.bintools
   ];
+  # Hacky way to avoid nixfmt indenting the entire scope body suggested by @emilazy
+  overrideLlvmPackagesRocm =
+    f:
+    let
+      overridenScope = llvmPackagesRocm.overrideScope (final: prev: f { inherit final prev; });
+    in
+    {
+      inherit (overridenScope)
+        # Expose only a limited set of packages that we care about for ROCm
+        bintools
+        compiler-rt
+        compiler-rt-libc
+        clang
+        clang-unwrapped
+        libcxx
+        lld
+        llvm
+        rocm-toolchain
+        rocmClangStdenv
+        openmp
+        ;
+    };
   sysrootCompiler =
     {
       cc,
@@ -258,13 +279,8 @@ let
     ]
   );
 in
-rec {
-  inherit (llvmPackagesRocm) libcxx;
-  inherit args;
-  # Pass through original attrs for debugging where non-overridden llvm/clang is getting used
-  # llvm-orig = llvmPackagesRocm.llvm; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.llvm-orig
-  # clang-orig = llvmPackagesRocm.clang; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.clang-orig
-  llvm = llvmPackagesRocm.llvm.overrideAttrs (old: {
+overrideLlvmPackagesRocm (s: {
+  libllvm = (s.prev.libllvm.override { }).overrideAttrs (old: {
     patches = old.patches ++ [
       (fetchpatch {
         # fix compile error in tools/gold/gold-plugin.cpp
@@ -310,8 +326,7 @@ rec {
     meta = old.meta // llvmMeta;
   });
   lld =
-    (llvmPackagesRocm.lld.override {
-      libllvm = llvm;
+    (s.prev.lld.override {
     }).overrideAttrs
       (old: {
         dontStrip = profilableStdenv;
@@ -336,8 +351,7 @@ rec {
         meta = old.meta // llvmMeta;
       });
   clang-unwrapped = (
-    (llvmPackagesRocm.clang-unwrapped.override {
-      libllvm = llvm;
+    (s.prev.clang-unwrapped.override {
       enableClangToolsExtra = false;
     }).overrideAttrs
       (
@@ -373,10 +387,10 @@ rec {
               url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/6d296f879b0fed830c54b2a9d26240da86c8bb3a.patch";
               relative = "clang";
             })
-            # FIXME: Needed due to https://github.com/NixOS/nixpkgs/issues/375431
-            # Once we can switch to overrideScope this can be removed
+            # FIXME: Temporarily kept for rebuild avoidance
+            # Should be dropped in followup and we no longer need to filter out the original application
             (replaceVars ./../../../compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch {
-              libllvmLibdir = "${llvm.lib}/lib";
+              libllvmLibdir = "${s.final.libllvm.lib}/lib";
             })
           ];
           hardeningDisable = [ "all" ];
@@ -397,6 +411,7 @@ rec {
           __structuredAttrs = true;
           # https://github.com/llvm/llvm-project/blob/6976deebafa8e7de993ce159aa6b82c0e7089313/clang/cmake/caches/DistributionExample-stage2.cmake#L9-L11
           cmakeFlags =
+            # TODO: Remove in followup, tblgen now works correctly but would rebuild
             (builtins.filter tablegenUsage old.cmakeFlags)
             ++ commonCmakeFlags
             ++ lib.optionals (!withLibcxx) [
@@ -426,6 +441,7 @@ rec {
   # in the right order
   # and expects its libc to be in the sysroot
   rocm-toolchain =
+    with s.final;
     (sysrootCompiler {
       cc = clang-unwrapped;
       name = "rocm-toolchain";
@@ -458,45 +474,33 @@ rec {
       isClang = true;
       isGNU = false;
     };
-  compiler-rt-libc =
-    (llvmPackagesRocm.compiler-rt-libc.override {
-      libllvm = llvm;
-    }).overrideAttrs
-      (old: {
-        patches = old.patches ++ [
-          (fetchpatch {
-            name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
-            url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
-            hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
-            relative = "compiler-rt";
-          })
-          (fetchpatch {
-            # Fixes fortify hardening compile error related to openat usage
-            hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
-            url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
-            relative = "compiler-rt";
-          })
-        ];
-        meta = old.meta // llvmMeta;
-      });
-  compiler-rt = compiler-rt-libc;
-  bintools = wrapBintoolsWith {
-    bintools = llvmPackagesRocm.bintools-unwrapped.override {
-      inherit lld llvm;
-    };
-  };
+  compiler-rt-libc = s.prev.compiler-rt-libc.overrideAttrs (old: {
+    patches = old.patches ++ [
+      (fetchpatch {
+        name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
+        url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
+        hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
+        relative = "compiler-rt";
+      })
+      (fetchpatch {
+        # Fixes fortify hardening compile error related to openat usage
+        hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
+        url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
+        relative = "compiler-rt";
+      })
+    ];
+    meta = old.meta // llvmMeta;
+  });
+  compiler-rt = s.final.compiler-rt-libc;
+  clang = s.final.rocm-toolchain;
 
-  clang = rocm-toolchain;
-
-  rocmClangStdenv = overrideCC (
-    if withLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv
-  ) clang;
+  rocmClangStdenv = with s.final; overrideCC (if withLibcxx then libcxxStdenv else stdenv) clang;
 
   # Projects
   openmp =
+    with s.final;
     (llvmPackagesRocm.openmp.override {
       llvm = llvm;
-      targetLlvm = llvm;
       clang-unwrapped = clang-unwrapped;
     }).overrideAttrs
       (old: {
@@ -521,4 +525,7 @@ rec {
           libffi
         ];
       });
-}
+  # AMD has a separate MLIR impl which we package under rocmPackages.rocmlir
+  # It would be an error to rely on the original mlir package from this scope
+  mlir = null;
+})
diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
index 36cadd774a65..7f82083d2349 100644
--- a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
+++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Test that frugally-deep can load MIOpen model files";
-    maintainers = with lib.teams; [ rocm ];
+    teams = with lib.teams; [ rocm ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/development/rocm-modules/6/mivisionx/default.nix b/pkgs/development/rocm-modules/6/mivisionx/default.nix
index 324f8d884acf..b502511c140f 100644
--- a/pkgs/development/rocm-modules/6/mivisionx/default.nix
+++ b/pkgs/development/rocm-modules/6/mivisionx/default.nix
@@ -17,7 +17,6 @@
   opencv,
   ffmpeg,
   boost,
-  libjpeg_turbo,
   half,
   lmdb,
   rapidjson,
@@ -76,7 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
     opencv
     ffmpeg
     boost
-    libjpeg_turbo
     lmdb
     rapidjson
     python3Packages.pybind11
@@ -115,11 +113,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
-    # Properly find turbojpeg
-    substituteInPlace cmake/FindTurboJpeg.cmake \
-      --replace-fail "\''${TURBO_JPEG_PATH}/include" "${libjpeg_turbo.dev}/include" \
-      --replace-fail "\''${TURBO_JPEG_PATH}/lib" "${libjpeg_turbo.out}/lib"
-
     ${lib.optionalString (!useOpenCL && !useCPU) ''
       # Properly find miopen
       substituteInPlace amd_openvx_extensions/CMakeLists.txt \
diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/6/release-attrPaths.json
index 20e3a90e7450..82c540a1e17a 100644
--- a/pkgs/development/rocm-modules/6/release-attrPaths.json
+++ b/pkgs/development/rocm-modules/6/release-attrPaths.json
@@ -3,25 +3,20 @@
   "attrPaths": [
     "adaptivecpp",
     "adios2",
+    "adoptopenjdk-icedtea-web",
     "aider-chat-full",
     "aider-chat-with-help",
-    "aligator",
+    "aitrack",
     "alpaca",
     "ants",
     "appcsxcad",
     "arpack-mpi",
     "backgroundremover",
     "beets",
-    "beets-unstable",
-    "beetsPackages.beets",
-    "beetsPackages.beets-stable",
-    "beetsPackages.beets-unstable",
-    "bonmin",
     "btop",
     "btop-cuda",
     "c3d",
     "calibre",
-    "casadi",
     "catalyst",
     "chatd",
     "cloudcompare",
@@ -29,26 +24,32 @@
     "costa",
     "cp2k",
     "crewai",
-    "crocoddyl",
+    "crow-translate",
     "csxcad",
-    "dartsim",
     "dbcsr",
+    "deface",
     "dl-poly-classic-mpi",
-    "docling",
-    "docling-serve",
     "dolfinx",
     "dtcmp",
     "easyocr",
     "elastix",
     "elmerfem",
     "elpa",
+    "envision",
     "exhibit",
     "exo",
-    "expliot",
     "ezminc",
     "f3d",
     "ffmpeg_8-full",
     "fftwMpi",
+    "firefox",
+    "firefox-beta",
+    "firefox-beta-unwrapped",
+    "firefox-devedition",
+    "firefox-devedition-unwrapped",
+    "firefox-mobile",
+    "firefox-unwrapped",
+    "firefoxpwa",
     "freecad",
     "frigate",
     "galene-stt",
@@ -58,7 +59,6 @@
     "gromacsDoubleMpi",
     "gromacsMpi",
     "hashcat",
-    "haskellPackages.casadi-bindings-internal",
     "haskellPackages.mpi-hs",
     "haskellPackages.mpi-hs-binary",
     "haskellPackages.mpi-hs-cereal",
@@ -72,10 +72,9 @@
     "hpl",
     "hypre",
     "hyprpanel",
+    "ieda",
     "immich-machine-learning",
-    "intensity-normalization",
     "ior",
-    "ipopt",
     "itk",
     "itk_5",
     "itk_5_2",
@@ -87,43 +86,50 @@
     "libcircle",
     "libmbd",
     "libretranslate",
+    "librewolf",
+    "librewolf-unwrapped",
     "libsupermesh",
     "libvdwxc",
+    "livecaptions",
     "llama-cpp",
     "llama-cpp-vulkan",
     "lwgrp",
+    "maa-assistant-arknights",
+    "maa-cli",
+    "magika",
     "migrate",
-    "mim-solvers",
+    "minari",
     "mirtk",
     "mlflow-server",
     "mokuro",
+    "monado",
     "mpi",
     "mpifileutils",
     "mrtrix",
-    "mumps",
     "mumps-mpi",
-    "ndcurves",
     "nest-mpi",
     "netcdf-mpi",
     "netgen",
     "neuron-mpi",
     "newelle",
     "nwchem",
+    "obs-studio-plugins.obs-backgroundremoval",
     "octavePackages.dicom",
     "octopus",
     "ollama",
+    "onnxruntime",
     "openai-whisper",
     "openems",
     "openmpi",
+    "openseeface",
     "opensplat",
-    "openturns",
+    "opentrack",
     "otb",
     "owocr",
     "p4est",
     "p4est-dbg",
     "p4est-sc",
     "p4est-sc-dbg",
-    "pagmo2",
     "paraview",
     "parmmg",
     "pcl",
@@ -131,18 +137,16 @@
     "petsc",
     "pfft",
     "pianotrans",
-    "pinocchio",
+    "piper-phonemize",
     "piper-tts",
     "pitivi",
     "pnetcdf",
     "pnfft",
     "precice",
-    "proxsuite-nlp",
     "python3Packages.accelerate",
     "python3Packages.adios2",
-    "python3Packages.aerosandbox",
     "python3Packages.albumentations",
-    "python3Packages.aligator",
+    "python3Packages.ale-py",
     "python3Packages.anndata",
     "python3Packages.apptools",
     "python3Packages.apricot-select",
@@ -156,13 +160,15 @@
     "python3Packages.baselines",
     "python3Packages.beetcamp",
     "python3Packages.beets",
+    "python3Packages.beets-audible",
     "python3Packages.bitsandbytes",
     "python3Packages.blackjax",
     "python3Packages.blosc2",
     "python3Packages.botorch",
+    "python3Packages.brax",
     "python3Packages.captum",
-    "python3Packages.casadi",
     "python3Packages.catalyst",
+    "python3Packages.chromadb",
     "python3Packages.clean-fid",
     "python3Packages.cleanvision",
     "python3Packages.clip",
@@ -173,40 +179,31 @@
     "python3Packages.compressed-tensors",
     "python3Packages.conduit-mpi",
     "python3Packages.crewai",
-    "python3Packages.crocoddyl",
     "python3Packages.ctranslate2",
     "python3Packages.curated-transformers",
     "python3Packages.cut-cross-entropy",
     "python3Packages.cvxpy",
-    "python3Packages.cyipopt",
-    "python3Packages.dartsim",
+    "python3Packages.dalle-mini",
     "python3Packages.dask-mpi",
-    "python3Packages.dcmstack",
     "python3Packages.dctorch",
     "python3Packages.deepdish",
+    "python3Packages.deepface",
     "python3Packages.deepsearch-toolkit",
     "python3Packages.deepwave",
-    "python3Packages.deid",
     "python3Packages.depyf",
     "python3Packages.detectron2",
-    "python3Packages.dicom-numpy",
     "python3Packages.dicom2nifti",
-    "python3Packages.dicomweb-client",
     "python3Packages.diffusers",
-    "python3Packages.dipy",
-    "python3Packages.docling",
+    "python3Packages.dm-sonnet",
     "python3Packages.docling-core",
     "python3Packages.docling-ibm-models",
-    "python3Packages.docling-jobkit",
-    "python3Packages.docling-mcp",
-    "python3Packages.docling-parse",
-    "python3Packages.docling-serve",
     "python3Packages.easyocr",
+    "python3Packages.edward",
     "python3Packages.effdet",
     "python3Packages.einops",
     "python3Packages.encodec",
     "python3Packages.envisage",
-    "python3Packages.example-robot-data",
+    "python3Packages.evosax",
     "python3Packages.experiment-utilities",
     "python3Packages.ezyrb",
     "python3Packages.f3d",
@@ -214,6 +211,7 @@
     "python3Packages.fairscale",
     "python3Packages.fast-simplification",
     "python3Packages.fastai",
+    "python3Packages.fastembed",
     "python3Packages.faster-whisper",
     "python3Packages.fastmri",
     "python3Packages.fenics-dolfinx",
@@ -221,8 +219,8 @@
     "python3Packages.finetuning-scheduler",
     "python3Packages.firedrake",
     "python3Packages.flammkuchen",
+    "python3Packages.flax",
     "python3Packages.flyingsquid",
-    "python3Packages.fslpy",
     "python3Packages.funsor",
     "python3Packages.fvcore",
     "python3Packages.gdcm",
@@ -239,17 +237,15 @@
     "python3Packages.graphtage",
     "python3Packages.gstools",
     "python3Packages.guidance",
+    "python3Packages.gymnasium",
     "python3Packages.h5io",
     "python3Packages.h5py-mpi",
-    "python3Packages.heudiconv",
-    "python3Packages.highdicom",
     "python3Packages.holistic-trace-analysis",
     "python3Packages.hyper-connections",
     "python3Packages.ignite",
     "python3Packages.imagededup",
     "python3Packages.imgcat",
     "python3Packages.insightface",
-    "python3Packages.intensity-normalization",
     "python3Packages.invisible-watermark",
     "python3Packages.iopath",
     "python3Packages.itk",
@@ -257,14 +253,16 @@
     "python3Packages.julius",
     "python3Packages.k-diffusion",
     "python3Packages.kahip",
-    "python3Packages.kokoro",
+    "python3Packages.keras",
     "python3Packages.kornia",
     "python3Packages.kornia-rs",
     "python3Packages.kserve",
     "python3Packages.lacuscore",
     "python3Packages.lancedb",
+    "python3Packages.langchain-chroma",
     "python3Packages.langchain-huggingface",
     "python3Packages.layoutparser",
+    "python3Packages.lerobot",
     "python3Packages.libretranslate",
     "python3Packages.librosa",
     "python3Packages.libsupermesh",
@@ -291,7 +289,6 @@
     "python3Packages.llama-index-multi-modal-llms-openai",
     "python3Packages.llama-index-node-parser-docling",
     "python3Packages.llama-index-readers-database",
-    "python3Packages.llama-index-readers-docling",
     "python3Packages.llama-index-readers-file",
     "python3Packages.llama-index-readers-json",
     "python3Packages.llama-index-readers-llama-parse",
@@ -309,6 +306,7 @@
     "python3Packages.llm-sentence-transformers",
     "python3Packages.lm-eval",
     "python3Packages.local-attention",
+    "python3Packages.magika",
     "python3Packages.manga-ocr",
     "python3Packages.manifest-ml",
     "python3Packages.markitdown",
@@ -318,7 +316,9 @@
     "python3Packages.medvol",
     "python3Packages.meep",
     "python3Packages.meshtastic",
+    "python3Packages.mhcflurry",
     "python3Packages.mim-solvers",
+    "python3Packages.minari",
     "python3Packages.mlcroissant",
     "python3Packages.mlflow",
     "python3Packages.mmcv",
@@ -329,25 +329,18 @@
     "python3Packages.monty",
     "python3Packages.mpi-pytest",
     "python3Packages.mpi4py",
+    "python3Packages.mtcnn",
     "python3Packages.napari-nifti",
-    "python3Packages.ndcurves",
     "python3Packages.nest",
     "python3Packages.netgen-mesher",
-    "python3Packages.neuralfoil",
     "python3Packages.neuronpy",
     "python3Packages.nianet",
-    "python3Packages.nibabel",
     "python3Packages.nifty8",
-    "python3Packages.nilearn",
-    "python3Packages.nipy",
-    "python3Packages.nipype",
-    "python3Packages.nitime",
-    "python3Packages.nitransforms",
-    "python3Packages.niworkflows",
     "python3Packages.noisereduce",
+    "python3Packages.onnxruntime",
     "python3Packages.open-clip-torch",
     "python3Packages.openai-whisper",
-    "python3Packages.openturns",
+    "python3Packages.opencv4Full",
     "python3Packages.optimum",
     "python3Packages.optuna",
     "python3Packages.optuna-dashboard",
@@ -363,33 +356,27 @@
     "python3Packages.peft",
     "python3Packages.pepit",
     "python3Packages.petsc4py",
+    "python3Packages.petsctools",
+    "python3Packages.pettingzoo",
     "python3Packages.pgmpy",
     "python3Packages.piano-transcription-inference",
-    "python3Packages.pinocchio",
+    "python3Packages.piper-phonemize",
     "python3Packages.pomegranate",
-    "python3Packages.proxsuite-nlp",
     "python3Packages.pyannote-audio",
     "python3Packages.pyannote-pipeline",
-    "python3Packages.pybids",
-    "python3Packages.pydicom",
     "python3Packages.pydmd",
-    "python3Packages.pygmo",
     "python3Packages.pykrige",
     "python3Packages.pylance",
-    "python3Packages.pylibjpeg",
-    "python3Packages.pylibjpeg-openjpeg",
-    "python3Packages.pylibjpeg-rle",
     "python3Packages.pymanopt",
     "python3Packages.pymatgen",
     "python3Packages.pymedio",
-    "python3Packages.pynetdicom",
-    "python3Packages.pyorthanc",
     "python3Packages.pyotb",
     "python3Packages.pypasser",
     "python3Packages.pyprecice",
     "python3Packages.pyradiomics",
     "python3Packages.pyro-ppl",
     "python3Packages.pyseries",
+    "python3Packages.pysilero-vad",
     "python3Packages.python-csxcad",
     "python3Packages.python-openems",
     "python3Packages.pytorch-bench",
@@ -404,9 +391,13 @@
     "python3Packages.pyvista",
     "python3Packages.qpsolvers",
     "python3Packages.qutip",
+    "python3Packages.rapidocr",
+    "python3Packages.rapidocr-onnxruntime",
+    "python3Packages.rembg",
     "python3Packages.rerun-sdk",
     "python3Packages.resampy",
     "python3Packages.resize-right",
+    "python3Packages.retinaface",
     "python3Packages.rlcard",
     "python3Packages.roma",
     "python3Packages.rotary-embedding-torch",
@@ -418,9 +409,11 @@
     "python3Packages.sentence-transformers",
     "python3Packages.sfepy",
     "python3Packages.shap",
+    "python3Packages.shimmy",
     "python3Packages.simpleitk",
     "python3Packages.sirius",
     "python3Packages.skorch",
+    "python3Packages.skrl",
     "python3Packages.slepc4py",
     "python3Packages.slicer",
     "python3Packages.smolagents",
@@ -432,7 +425,7 @@
     "python3Packages.spacy-transformers",
     "python3Packages.speechbrain",
     "python3Packages.speechrecognition",
-    "python3Packages.spyder-kernels",
+    "python3Packages.stable-baselines3",
     "python3Packages.stanza",
     "python3Packages.staticvectors",
     "python3Packages.stytra",
@@ -440,13 +433,14 @@
     "python3Packages.syne-tune",
     "python3Packages.tables",
     "python3Packages.tami4edgeapi",
-    "python3Packages.templateflow",
     "python3Packages.tensorboardx",
     "python3Packages.tensordict",
     "python3Packages.tensorflow-datasets",
     "python3Packages.test-tube",
     "python3Packages.textacy",
     "python3Packages.textnets",
+    "python3Packages.tf2onnx",
+    "python3Packages.tianshou",
     "python3Packages.timm",
     "python3Packages.tinygrad",
     "python3Packages.torch",
@@ -460,14 +454,15 @@
     "python3Packages.torchao",
     "python3Packages.torchaudio",
     "python3Packages.torchbench",
+    "python3Packages.torchcodec",
     "python3Packages.torchcrepe",
     "python3Packages.torchdiffeq",
-    "python3Packages.torcheval",
     "python3Packages.torchinfo",
     "python3Packages.torchio",
     "python3Packages.torchlibrosa",
     "python3Packages.torchmetrics",
     "python3Packages.torchprofile",
+    "python3Packages.torchrl",
     "python3Packages.torchsde",
     "python3Packages.torchsnapshot",
     "python3Packages.torchsummary",
@@ -479,40 +474,41 @@
     "python3Packages.translatehtml",
     "python3Packages.treescope",
     "python3Packages.trl",
-    "python3Packages.trx-python",
-    "python3Packages.tsid",
     "python3Packages.ttach",
     "python3Packages.txtai",
+    "python3Packages.tyro",
     "python3Packages.ultralytics",
     "python3Packages.ultralytics-thop",
+    "python3Packages.unsloth",
+    "python3Packages.unsloth-zoo",
     "python3Packages.unstructured-inference",
     "python3Packages.vllm",
     "python3Packages.vtk",
     "python3Packages.wandb",
+    "python3Packages.waymax",
     "python3Packages.webdataset",
     "python3Packages.whisperx",
     "python3Packages.x-transformers",
     "python3Packages.xarray-einstats",
     "python3Packages.xformers",
     "python3Packages.xgrammar",
-    "python3Packages.xnatpy",
     "qcsxcad",
     "quantum-espresso",
     "ramalama",
+    "rapidraw",
     "raxml-mpi",
     "rclip",
     "rembg",
     "rlama",
     "rtabmap",
     "scalapack",
-    "scipopt-gcg",
-    "scipopt-scip",
     "scipopt-ug",
-    "scotch",
+    "seagoat",
     "siesta",
     "siesta-mpi",
     "simpleitk",
     "sirius",
+    "sitespeed-io",
     "slepc",
     "spfft",
     "spla",
@@ -528,10 +524,15 @@
     "tests.testers.hasCmakeConfigModules.boost-has-boost_mpi",
     "tests.testers.hasCmakeConfigModules.boost_mpi-does-not-have-mpi",
     "therion",
+    "thunderbird",
+    "thunderbird-latest",
+    "thunderbird-latest-unwrapped",
+    "thunderbird-unwrapped",
+    "thunderbirdPackages.thunderbird",
+    "thunderbirdPackages.thunderbird-latest",
     "tmpi",
     "tocpdf",
     "trilinos-mpi",
-    "tsid",
     "tt-metal",
     "tts",
     "ucc",
@@ -553,6 +554,7 @@
     "whisperx",
     "wifite2",
     "witnessme",
+    "wivrn",
     "wyoming-faster-whisper",
     "wyoming-piper",
     "xyce-parallel"
diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 33d707747056..c6bce658f6cc 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -7,6 +7,7 @@
   cmake,
   rocm-cmake,
   clr,
+  diffutils,
   python3,
   tensile,
   boost,
@@ -24,6 +25,7 @@
   python3Packages,
   rocm-smi,
   pkg-config,
+  removeReferencesTo,
   buildTensile ? true,
   buildTests ? true,
   buildBenchmarks ? true,
@@ -47,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FCzo/BOk4xLEFkdOdqcCXh4a9t3/OIIBEy8oz6oOMWg=";
   };
 
+  outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test";
+
   nativeBuildInputs = [
     cmake
     # no ninja, it buffers console output and nix times out long periods of no output
@@ -54,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     clr
     gitMinimal
     pkg-config
+    removeReferencesTo
   ]
   ++ lib.optionals buildTensile [
     tensile
@@ -76,10 +81,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.msgpack
     python3Packages.zstandard
   ]
-  ++ lib.optionals buildTests [
-    gtest
-  ]
   ++ lib.optionals (buildTests || buildBenchmarks) [
+    gtest
     gfortran
     rocm-smi
   ]
@@ -130,8 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib)
   ];
 
-  passthru.amdgpu_targets = gpuTargets';
-
   patches = [
     (fetchpatch {
       name = "Extend-rocBLAS-HIP-ISA-compatibility.patch";
@@ -148,12 +149,44 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail "4.43.0" "4.44.0" \
       --replace-fail '0.10' '1.0'
+  ''
+  # Fixes sh: line 1: /usr/bin/diff: No such file or directory
+  # /build/source/clients/gtest/../include/testing_logging.hpp:1117: Failure
+  + lib.optionals buildTests ''
+    substituteInPlace clients/include/testing_logging.hpp \
+      --replace-fail "/usr/bin/diff" "${lib.getExe' diffutils "diff"}"
   '';
 
-  passthru.updateScript = rocmUpdateScript {
-    name = finalAttrs.pname;
-    inherit (finalAttrs.src) owner;
-    inherit (finalAttrs.src) repo;
+  postInstall =
+    # tensile isn't needed at runtime and pulls in ~400MB of python deps
+    ''
+      remove-references-to -t ${tensile} \
+        "$out/lib/librocblas.so."*
+    ''
+    + lib.optionalString buildBenchmarks ''
+      moveToOutput "bin/*-tune" "$benchmark"
+      moveToOutput "bin/*-bench" "$benchmark"
+      moveToOutput "bin/*example*" "$benchmark"
+      cp "$out/bin/"*.{yaml,txt} "$benchmark/bin"
+    ''
+    + lib.optionalString buildTests ''
+      moveToOutput "bin/*test*" "$test"
+      cp "$out/bin/"*.{yaml,txt} "$test/bin"
+    ''
+    + ''
+      if [ -d $out/bin ]; then
+        rm $out/bin/*.{yaml,txt} || true
+        rmdir $out/bin
+      fi
+    '';
+
+  passthru = {
+    amdgpu_targets = gpuTargets';
+    updateScript = rocmUpdateScript {
+      name = finalAttrs.pname;
+      inherit (finalAttrs.src) owner;
+      inherit (finalAttrs.src) repo;
+    };
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/rocm-modules/6/rocm-tests/default.nix b/pkgs/development/rocm-modules/6/rocm-tests/default.nix
index 84762ff70e73..794915893917 100644
--- a/pkgs/development/rocm-modules/6/rocm-tests/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-tests/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  linkFarm,
   clr,
   ollama,
   python3Packages,
@@ -8,6 +10,22 @@
   stdenv,
 }:
 # This package exists purely to have a bunch of passthru.tests attrs
+let
+  availableRocmDrvs = lib.pipe rocmPackages [
+    (lib.mapAttrsToList (
+      name: value: {
+        inherit name;
+        evaluated = builtins.tryEval value;
+      }
+    ))
+    (builtins.filter (x: x.evaluated.success))
+    (map (x: {
+      inherit (x) name;
+      value = x.evaluated.value;
+    }))
+    (builtins.filter (x: lib.isDerivation x.value && (x.value.meta.available or true)))
+  ];
+in
 stdenv.mkDerivation {
   name = "rocm-tests";
   nativeBuildInputs = [
@@ -20,6 +38,12 @@ stdenv.mkDerivation {
       inherit rocmPackages;
       acceleration = "rocm";
     };
+    rocmPackagesDerivations = linkFarm "rocmPackagesDerivations" (
+      map (x: {
+        name = x.name;
+        path = x.value;
+      }) availableRocmDrvs
+    );
     torch = python3Packages.torch.override {
       inherit rocmPackages;
       rocmSupport = true;
diff --git a/pkgs/development/rocq-modules/rocq-elpi/default.nix b/pkgs/development/rocq-modules/rocq-elpi/default.nix
index 487d89931196..890395f7af27 100644
--- a/pkgs/development/rocq-modules/rocq-elpi/default.nix
+++ b/pkgs/development/rocq-modules/rocq-elpi/default.nix
@@ -17,7 +17,7 @@ let
       in
       with lib.versions;
       lib.switch rocq-core.rocq-version [
-        (case (range "9.0" "9.1") "3.4.1")
+        (case (range "9.0" "9.1") "3.4.2")
         (case (range "9.0" "9.1") "2.0.7")
       ] { };
   elpi = rocq-core.ocamlPackages.elpi.override { version = default-elpi-version; };
diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix
index b0258988888f..614dcd822f4a 100644
--- a/pkgs/development/ruby-modules/testing/stubs.nix
+++ b/pkgs/development/ruby-modules/testing/stubs.nix
@@ -14,7 +14,7 @@ let
         builtins.toJSON (
           lib.filterAttrs (
             n: v:
-            builtins.any (x: x == n) [
+            builtins.elem n [
               "name"
               "system"
             ]
diff --git a/pkgs/development/ruby-modules/with-packages/default.nix b/pkgs/development/ruby-modules/with-packages/default.nix
index 96bb7018cc29..8e63fa12edaa 100644
--- a/pkgs/development/ruby-modules/with-packages/default.nix
+++ b/pkgs/development/ruby-modules/with-packages/default.nix
@@ -96,6 +96,8 @@ let
         inherit wrappedRuby;
         gems = selected;
       };
+
+      meta.mainProgram = "ruby";
     };
 
 in
diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 10f0843577e3..4130e343146e 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flow";
-  version = "0.281.0";
+  version = "0.288.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     tag = "v${version}";
-    hash = "sha256-YttdOu5zJo/I0e2hV5vrBSWvUMOZgfhf3RmEC8fRWlI=";
+    hash = "sha256-9KApZvjOSwR9wcO7nRmpPf2M5SzmV0Z0bM7O8StqZK0=";
   };
 
   makeFlags = [ "FLOW_RELEASE=1" ];
diff --git a/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch
new file mode 100644
index 000000000000..0f7d6e87b040
--- /dev/null
+++ b/pkgs/development/tools/analysis/massif-visualizer/cmake-minimum-required.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d7067dc..337c4ea 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.10)
+ project(massif-visualizer)
+ 
+ set(QT_MIN_VERSION "5.2.0")
diff --git a/pkgs/development/tools/analysis/massif-visualizer/default.nix b/pkgs/development/tools/analysis/massif-visualizer/default.nix
index d459bd320ac1..e20b252ae02d 100644
--- a/pkgs/development/tools/analysis/massif-visualizer/default.nix
+++ b/pkgs/development/tools/analysis/massif-visualizer/default.nix
@@ -25,6 +25,8 @@ mkDerivation rec {
     sha256 = "0v8z6r9gngzckvqyxjm9kp7hilwfqibyk2f9vag9l98ar0iwr97q";
   };
 
+  patches = [ ./cmake-minimum-required.patch ];
+
   nativeBuildInputs = [
     extra-cmake-modules
     shared-mime-info
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 082b55c4c698..2d340c9bca3c 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -3,6 +3,7 @@
   jdk11,
   jdk17,
   jdk21,
+  nix-update-script,
 }:
 
 let
@@ -15,97 +16,79 @@ let
       symlinkJoin,
       concatTextFile,
       makeSetupHook,
-      nix-update-script,
-
-      # This is the "current" version of gradle in nixpkgs.
-      # Used to define the update script.
       gradle-unwrapped,
-
       runCommand,
-    }:
-    this-gradle-unwrapped:
-    lib.makeOverridable (
-      args:
-      let
-        gradle = this-gradle-unwrapped.override args;
-      in
-      symlinkJoin {
-        pname = "gradle";
-        inherit (gradle) version;
+      ...
+    }@args:
+    let
+      gradle = gradle-unwrapped.override args;
+    in
+    symlinkJoin {
+      pname = "gradle";
+      inherit (gradle) version;
 
-        paths = [
-          (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
-            name = "setup-hook.sh";
-            files = [
-              (mitm-cache.setupHook)
-              (replaceVars ./setup-hook.sh {
-                # jdk used for keytool
-                inherit (gradle) jdk;
-                init_script = "${./init-build.gradle}";
-              })
-            ];
-          }))
-          gradle
-          mitm-cache
-        ];
+      paths = [
+        (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
+          name = "setup-hook.sh";
+          files = [
+            (mitm-cache.setupHook)
+            (replaceVars ./setup-hook.sh {
+              # jdk used for keytool
+              inherit (gradle) jdk;
+              init_script = "${./init-build.gradle}";
+            })
+          ];
+        }))
+        gradle
+        mitm-cache
+      ];
 
-        passthru = {
-          fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
-          inherit (gradle) jdk;
-          unwrapped = gradle;
-          tests = {
-            toolchains =
-              let
-                javaVersion = lib.getVersion jdk11;
-                javaMajorVersion = lib.versions.major javaVersion;
-              in
-              runCommand "detects-toolchains-from-nix-env"
-                {
-                  # Use JDKs that are not the default for any of the gradle versions
-                  nativeBuildInputs = [
-                    (gradle.override {
-                      javaToolchains = [
-                        jdk11
-                      ];
-                    })
-                  ];
-                  src = ./tests/toolchains;
-                }
-                ''
-                  cp -a $src/* .
-                  substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
-                  env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
-                  gradle run --no-daemon --quiet --console plain > $out
-                  actual="$(<$out)"
-                  if [[ "${javaVersion}" != "$actual"* ]]; then
-                    echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
-                    exit 1
-                  fi
-                '';
-          }
-          // gradle.tests;
+      passthru = {
+        fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
+        inherit (gradle) jdk;
+        unwrapped = gradle;
+        tests = {
+          toolchains =
+            let
+              javaVersion = lib.getVersion jdk11;
+              javaMajorVersion = lib.versions.major javaVersion;
+            in
+            runCommand "detects-toolchains-from-nix-env"
+              {
+                # Use JDKs that are not the default for any of the gradle versions
+                nativeBuildInputs = [
+                  (gradle.override {
+                    javaToolchains = [
+                      jdk11
+                    ];
+                  })
+                ];
+                src = ./tests/toolchains;
+              }
+              ''
+                cp -a $src/* .
+                substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
+                env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
+                gradle run --no-daemon --quiet --console plain > $out
+                actual="$(<$out)"
+                if [[ "${javaVersion}" != "$actual"* ]]; then
+                  echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                  exit 1
+                fi
+              '';
         }
-        // lib.optionalAttrs (this-gradle-unwrapped == gradle-unwrapped) {
-          updateScript = nix-update-script {
-            extraArgs = [
-              "--url=https://github.com/gradle/gradle"
-              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
-              # release version omits the `.0`, so we’ll wanto to only capture
-              # the version up but not including the the trailing `.0`.
-              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
-            ];
-          };
-        };
+        // gradle.tests;
+      };
 
-        meta = gradle.meta // {
-          # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
-          # and passthru
-          priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
-        };
-      }
-    ) { };
+      meta = gradle.meta // {
+        # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
+        # and passthru
+        priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
+      };
+    };
 
-  gen =
+  # Creates a Gradle without calling the package.
+  mkGradle' =
     {
       version,
       hash,
@@ -133,6 +116,10 @@ let
       # Extra attributes to be merged into the resulting derivation's
       # meta attribute.
       meta ? { },
+
+      # Put the update script in passthru. Should only be on a single attrpath
+      # so that nixpkgs-update doesn't create duplicate PRs.
+      enableUpdateScript ? false,
     }@genArgs:
 
     {
@@ -157,8 +144,10 @@ let
       # Additional JDK/JREs to be registered as toolchains.
       # See https://docs.gradle.org/current/userguide/toolchains.html
       javaToolchains ? [ ],
-    }:
 
+      # Ignored arguments from calling .override on the wrapper.
+      ...
+    }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "gradle";
       inherit version;
@@ -286,7 +275,22 @@ let
         };
       };
       passthru.jdk = defaultJava;
-      passthru.wrapped = callPackage wrapGradle { } (gen' genArgs);
+      passthru.wrapped = callPackage wrapGradle {
+        gradle-unwrapped = mkGradle genArgs;
+      };
+      passthru.updateScript =
+        if enableUpdateScript then
+          nix-update-script {
+            extraArgs = [
+              "--url=https://github.com/gradle/gradle"
+              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
+              # release version omits the `.0`, so we’ll wanto to only capture
+              # the version up but not including the the trailing `.0`.
+              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
+            ];
+          }
+        else
+          null;
 
       meta =
         with lib;
@@ -321,27 +325,37 @@ let
     });
 
   # Calls the generated Gradle package with default arguments.
-  gen' = args: callPackage (gen args) { };
+  mkGradle = args: callPackage (mkGradle' args) { };
 in
 rec {
+  # Keep these exposed (but not at toplevel) so users can call
+  # `gradle-packages.mkGradle` as we do below,
+  # and still have wrapGradle available if necessary.
+  inherit mkGradle wrapGradle;
+
   # NOTE: Default JDKs that are hardcoded below must be LTS versions
   # and respect the compatibility matrix at
   # https://docs.gradle.org/current/userguide/compatibility.html
 
-  gradle_9 = gen' {
+  gradle_9 = mkGradle {
     version = "9.1.0";
     hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY=";
     defaultJava = jdk21;
   };
-  gradle_8 = gen' {
+  gradle_8 = mkGradle {
     version = "8.14.3";
     hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
     defaultJava = jdk21;
+    # Only enable this on *one* version to avoid duplicate PRs.
+    enableUpdateScript = true;
   };
-  gradle_7 = gen' {
+  gradle_7 = mkGradle {
     version = "7.6.6";
     hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A=";
     defaultJava = jdk17;
+    meta.knownVulnerabilities = [
+      "Gradle 7 no longer receives security updates with the release of Gradle 9 on 31 July 2025. https://endoflife.date/gradle"
+    ];
   };
 
   # Default version of Gradle in nixpkgs.
diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 836faaa40936..117f8fc9c3ab 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -35,9 +35,6 @@ buildGoModule (finalAttrs: {
 
   doCheck = false;
 
-  # /nix/store/.../bin/ld: internal/mkcw/embed/entrypoint_amd64.o: relocation R_X86_64_32S against `.rodata.1' can not be used when making a PIE object; recompile with -fPIE
-  hardeningDisable = [ "pie" ];
-
   nativeBuildInputs = [
     go-md2man
     installShellFiles
diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix
index 6a5da56092d8..580948eea030 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix
@@ -2,7 +2,6 @@
   lib,
   newScope,
   python3,
-  recurseIntoAttrs,
 }:
 # Take packages from self first, then python.pkgs (and secondarily pkgs)
 lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
@@ -14,7 +13,7 @@ lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
 
   buildbot = self.callPackage ./master.nix { };
 
-  buildbot-plugins = recurseIntoAttrs (self.callPackage ./plugins.nix { });
+  buildbot-plugins = lib.recurseIntoAttrs (self.callPackage ./plugins.nix { });
 
   buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
 
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index 265ce7bf2275..aaae68d75956 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -1,9 +1,8 @@
 { lib, fetchzip }:
 let
-  version = "3.10.0";
-  srcHash = "sha256-Z9EGm14q9DySZ0lgw/wwam3NjvicltWBkVJ3cwi/eds=";
-  # The tarball contains vendored dependencies
-  vendorHash = null;
+  version = "3.11.0";
+  srcHash = "sha256-mLyEHNMePVZI6MOSyeD9NMp9QXRXQ7h3LFSxHxpf878=";
+  vendorHash = null; # The tarball contains vendored dependencies
 in
 {
   inherit version vendorHash;
@@ -38,11 +37,11 @@ in
     "-X go.woodpecker-ci.org/woodpecker/v3/version.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://woodpecker-ci.org/";
     changelog = "https://github.com/woodpecker-ci/woodpecker/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       ambroisie
       marcusramberg
       techknowlogick
diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh
index 98c2888c27de..10b16d9f5062 100755
--- a/pkgs/development/tools/continuous-integration/woodpecker/update.sh
+++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh
@@ -28,5 +28,5 @@ sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
 
 # Woodpecker repository
 src_hash=$(nix-prefetch-url --type sha256 --unpack "https://github.com/woodpecker-ci/woodpecker/releases/download/v$version/woodpecker-src.tar.gz")
-src_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$src_hash")
+src_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$src_hash")
 sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix
diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index f96af31e73b6..bd844c1b73af 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -5,21 +5,21 @@
   lib,
   stdenv,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "devbox";
   version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "jetify-com";
-    repo = pname;
-    rev = version;
+    repo = "devbox";
+    tag = finalAttrs.version;
     hash = "sha256-+OsFKBtc4UkkI37YJM9uKIJZC1+KkuDJJKjipRzyF7k=";
   };
 
   ldflags = [
     "-s"
     "-w"
-    "-X go.jetify.com/devbox/internal/build.Version=${version}"
+    "-X go.jetify.com/devbox/internal/build.Version=${finalAttrs.version}"
   ];
 
   subPackages = [ "cmd/devbox" ];
@@ -38,14 +38,14 @@ buildGoModule rec {
       --zsh <($out/bin/devbox completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Instant, easy, predictable shells and containers";
     homepage = "https://www.jetify.com/devbox";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       urandom
       lagoja
       madeddie
     ];
   };
-}
+})
diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index 550e1f8e33c4..752d7425467b 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -40,10 +40,7 @@ let
     mainProgram = "devpod";
     homepage = "https://devpod.sh";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [
-      maxbrunet
-      tomasajt
-    ];
+    maintainers = [ lib.maintainers.tomasajt ];
   };
 
   devpod = buildGoModule (finalAttrs: {
diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 801e6592d030..bd70e8d59490 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -6,7 +6,7 @@
   python3,
   flex,
   bison,
-  qt5,
+  qt6,
   libiconv,
   spdlog,
   fmt,
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doxygen";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "doxygen";
     repo = "doxygen";
     tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-d90fIP8rDQ30fY1vF3wAPlIa8xrSEOdHTpPjYnduZdI=";
+    hash = "sha256-HbUAIfkfP0Tvb2NLSerTSL8A+8Ox2thgGL2/zGLkZdc=";
   };
 
   # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509
@@ -30,6 +30,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'JAVACC_CHAR_TYPE=\"unsigned char\"' \
                      'JAVACC_CHAR_TYPE=\"char8_t\"' \
       --replace-fail "CMAKE_CXX_STANDARD 17" "CMAKE_CXX_STANDARD 20"
+  ''
+  # otherwise getting linker errors for deps
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)' \
+                     'set(CMAKE_INTERPROCEDURAL_OPTIMIZATION FALSE)'
   '';
 
   nativeBuildInputs = [
@@ -45,20 +51,18 @@ stdenv.mkDerivation (finalAttrs: {
     fmt
     sqlite
   ]
-  ++ lib.optionals (qt5 != null) (
-    with qt5;
-    [
-      qtbase
-      wrapQtAppsHook
-    ]
-  );
+  ++ lib.optionals (qt6 != null) [
+    qt6.qtbase
+    qt6.wrapQtAppsHook
+    qt6.qtsvg
+  ];
 
   cmakeFlags = [
     "-Duse_sys_spdlog=ON"
     "-Duse_sys_fmt=ON"
     "-Duse_sys_sqlite3=ON"
   ]
-  ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
+  ++ lib.optional (qt6 != null) "-Dbuild_wizard=YES";
 
   # put examples in an output so people/tools can test against them
   outputs = [
@@ -85,6 +89,6 @@ stdenv.mkDerivation (finalAttrs: {
       off-line reference manual (in LaTeX) from a set of documented source
       files.
     '';
-    platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix;
+    platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix;
   };
 })
diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 7de6c458757f..72c6fdc6f4ab 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -44,11 +44,7 @@ let
     homepage = "https://github.com/electron/electron";
     license = licenses.mit;
     mainProgram = "electron";
-    maintainers = with maintainers; [
-      yayayayaka
-      teutat3s
-      tomasajt
-    ];
+    teams = [ teams.electron ];
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
@@ -58,7 +54,7 @@ let
     ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = optional (versionOlder version "36.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "37.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher =
diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 831ecfe99323..3a8bb1719453 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -1,46 +1,46 @@
 {
-    "35": {
-        "hashes": {
-            "aarch64-darwin": "2fe3a3cfad607a8c1627f6f2bb9834f959c665ef575b663206db11929634b92f",
-            "aarch64-linux": "35c4c30aed2639a38fafa6bd1a6a97b3af89a681afbd5c7a0f40673859040ea3",
-            "armv7l-linux": "350e80638b5ba8a1b56e2463fa55de25f8ee595c0496ef833b07fb4dc65e0c22",
-            "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "48a426bb5df999dd46c0700261a1a7f572b17581c4c0d1c28afade5ae600cdc9",
-            "x86_64-linux": "368d155a2189e1056d111d334b712779e77066fce1f5ab935b22c4ef544eaa29"
-        },
-        "version": "35.7.5"
-    },
     "36": {
         "hashes": {
-            "aarch64-darwin": "4b6e5402936969a2988d3151483ac9693d92b52d44121ff7539de34c277527cb",
-            "aarch64-linux": "423d042d719c74b8199324fac0c551143168eb8dcb876032541f5f6970b0216a",
-            "armv7l-linux": "9ad5aecb5c61f8509afb26f7c07c8a985b753da0be531a85b6982ccf572dcd74",
-            "headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p",
-            "x86_64-darwin": "a0fa047f4eb4671d5787d96f45587c7d11a9e81c953c8e3e347b6fcd51b26938",
-            "x86_64-linux": "1912195a813a8e112ce51b6778919d09d2c40bd9b3d22095d97cbebb27a491ba"
+            "aarch64-darwin": "73eb08fd541e6105d448735f2f820a7e0f63ff07e836ca05462dc2c01028e7df",
+            "aarch64-linux": "f7e9a3079f2276b907c39e0bad0ded08d6846274823d4371256a82e7a47fab27",
+            "armv7l-linux": "4ec9c4ec03f17b9cb2ac6a2eca7d2bef3e0ab3b70b73ba1a3b9a12baef350e5c",
+            "headers": "06na5h0bx4nbb2hv867warr19dgk7ilz0w8j4mmkxmv33x7w65bd",
+            "x86_64-darwin": "fce84ddaba4999b83c0501f9e4bbbf811965b76b67ad81452bc918db88c09c61",
+            "x86_64-linux": "52d6364aeed68116320f8cd6f7d7b6ad185da011ff212755f18c604696628616"
         },
-        "version": "36.9.4"
+        "version": "36.9.5"
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "90283ffbf443f3675deaad5b5c8011e04418d87215a0788e74056d5613e6dc84",
-            "aarch64-linux": "0e6a05cc3cdb2b2434b83284a33f50c448b15c85d762595770daf8eddd6d76ba",
-            "armv7l-linux": "de9a357d441af534c8f6e865e766ff625dc3cf0059be18283769424f7b853e11",
-            "headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6",
-            "x86_64-darwin": "c6840760d48163badc3f253a4a6d6c432ab582b4df304389a1123f90d8313ed4",
-            "x86_64-linux": "d2bf4fe94de47fb28d45911fbbadb91acf42ee64dc96033797a80515dbec3965"
+            "aarch64-darwin": "20cf3973cfab6cde93904209845d620d3221fd49bbf39918ed28fb140d0a8e6a",
+            "aarch64-linux": "15e237fb17f7d6bfefabee229d1585204db0d7e230c118a3d5ce8fd49af7405d",
+            "armv7l-linux": "14278dd5061358521133addd0e025e466f8012640e390753df2fa92f13eae451",
+            "headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w",
+            "x86_64-darwin": "ca911295a582114438f9977e4aef18a42782da0b1fd5627cc1bf7744b2548a88",
+            "x86_64-linux": "aebb0b0d7c1cb7673753766219cd828cbf6c2e86e8b29a9571284d0f7cbc963d"
         },
-        "version": "37.6.1"
+        "version": "37.7.1"
     },
     "38": {
         "hashes": {
-            "aarch64-darwin": "323d805132db09f92b9766ff5f6845ce106c22a543b0f7a4a663d5270a76db22",
-            "aarch64-linux": "ab46f8f2b137ec1774d9a9b949697a84212cf8b4d13c67b32d8d41b0c03e5ca0",
-            "armv7l-linux": "5b9ba133ec784f7e7d14f0ec7ab867edd31c053c5f95ec188bd77895132ed192",
-            "headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783",
-            "x86_64-darwin": "55fef7f835d471973627c511965ef090e097e07eb7a5292b3ff52a81595ea8c8",
-            "x86_64-linux": "84855f9262b6b5a2cd9944795bf5c7e11b301cb53bdd586d0912e310feec0674"
+            "aarch64-darwin": "0895d02b29b26f33fc984aa0fc06005093f6128343ecce42da89855c14c22aac",
+            "aarch64-linux": "e4567921b645c8c396835b5ba2144bd104d04a7be1582bb937c53fed21170a0d",
+            "armv7l-linux": "c485210cb616057d04ee8537308c2aec76581554e793d4f5e8da0e04a1b6105c",
+            "headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95",
+            "x86_64-darwin": "483b6185c9a0e24eed8a8d5dfcc6fdfb22790f21dc84434083fd75f998f361f3",
+            "x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2"
         },
-        "version": "38.2.2"
+        "version": "38.4.0"
+    },
+    "39": {
+        "hashes": {
+            "aarch64-darwin": "678e51190e5b29af4eb5842d4724db35409efb706ce17b1a40faf823720a9c70",
+            "aarch64-linux": "8985a9b2055c17f2bdae4418af140d6accd12b28f929319f5a918ca79b0a3d43",
+            "armv7l-linux": "54ea84c5e3b7139a24cae32ee4bb5b73eccb517174430a02da1a91aa5335759e",
+            "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59",
+            "x86_64-darwin": "49f6cfe1d35b8f363f62bce73925dae3b8ff44b0201d9f7095592e7275e920d5",
+            "x86_64-linux": "4520cbd92eeed370d7cfd2b1c60135647c02b8f634d6179d8a9a3f64b64baf2f"
+        },
+        "version": "39.0.0"
     }
 }
diff --git a/pkgs/development/tools/electron/chromedriver/generic.nix b/pkgs/development/tools/electron/chromedriver/generic.nix
index f04e1a91ce82..9eaa0470ab3d 100644
--- a/pkgs/development/tools/electron/chromedriver/generic.nix
+++ b/pkgs/development/tools/electron/chromedriver/generic.nix
@@ -29,8 +29,8 @@ let
     license = licenses.mit;
     maintainers = with maintainers; [
       liammurphy14
-      yayayayaka
     ];
+    teams = [ teams.electron ];
     platforms = [
       "x86_64-darwin"
       "x86_64-linux"
diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index b82d9158fb5f..35116c365d38 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,35 +12,46 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "cb8f83dc0d17d42d9e7691e27c78cc7a09aa94723b5b6989fd0dbc5f15c8aacf",
-            "aarch64-linux": "1dfb29c36d2e35ed8b02153d196c002c88cf0383b2e77ca4b7f4c4f9cac04a7e",
-            "armv7l-linux": "cab78070335eee86a80e0205759ed197a7cce9503118ecab91a9823774748c52",
-            "headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p",
-            "x86_64-darwin": "b4fefa2bf0b081cbe5c5d3a28ae3337878157702160d4181adfdcd1cb58b871e",
-            "x86_64-linux": "6a41bb459459f9280eac7d8775a53ad2b3dddb2556b2f7fa9b3458041ac9ef90"
+            "aarch64-darwin": "ad47b3386cf39ed2dfc830d4806850b784a4939a9ca132055a5b1a11f8a88835",
+            "aarch64-linux": "9b5765533abb3efc4860ea567f4f84a2ffa904d93ea19acdc118d8d4087e82b1",
+            "armv7l-linux": "9ea179c3d0c74fd51cff21d9be9bb91e11fb71f33688903574e3cc939ef8cb1a",
+            "headers": "06na5h0bx4nbb2hv867warr19dgk7ilz0w8j4mmkxmv33x7w65bd",
+            "x86_64-darwin": "f61eb6e6c9259a495e872113c5e18f9b6b3a49b658a9dd1035945aadcb40cf38",
+            "x86_64-linux": "ea24ba5853422fd1b555087aea0be59ee8bbfa98c48d65291aaee4006ceea180"
         },
-        "version": "36.9.4"
+        "version": "36.9.5"
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "9a4e31dfd00edabd2cbbf109954a022e1b078e13fd5409beb3a97b6cbca54b31",
-            "aarch64-linux": "5b5ba468654a3755c9e22f9314317dca9fc8c1233c2d7ceba0fd503a9298b30b",
-            "armv7l-linux": "6f9033d862f953c95f383a6e857bae4c168cfd010f28938e5633ef8825f56014",
-            "headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6",
-            "x86_64-darwin": "15b8a79ea7f4b7c8c62332f259d02f866e95dc7e6e08d795c249c93bc354dc9e",
-            "x86_64-linux": "4790138a0815e9bf12b4f1405a806fa6ec658b9ab834166272f9eba785970353"
+            "aarch64-darwin": "fba6e9342f6414f08bb49466a8cb7028b44042342a64b55a212565af3b674bfb",
+            "aarch64-linux": "c4ee6ff8d3a3a96217557360bda4271fb49ab2383b8962f458fa0b6dc77ff8e2",
+            "armv7l-linux": "1c9d6799f14c14699fee37af08af515777f4da436b9998ba74a69613e7e957da",
+            "headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w",
+            "x86_64-darwin": "066d453bd62f02ecb1ddf10cfb064e6200c2af1842bd5963546f37c03eebd426",
+            "x86_64-linux": "2ce28af3e7481126d5dd9dcacdeeed39778a28892e5c594b10c0cfba06400ddb"
         },
-        "version": "37.6.1"
+        "version": "37.7.1"
     },
     "38": {
         "hashes": {
-            "aarch64-darwin": "5e353ab266b42c80145ce4d39f359016bfff58f534032e565f16f3d0be7bb726",
-            "aarch64-linux": "8ac413b566389f0c4daa1c94fc595248a59da6587c4db4e9e0693c4a2caf37fa",
-            "armv7l-linux": "d1abf283b0af0d1c6daba8eca1668378ed29ab68d1493a370337b99652eb7466",
-            "headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783",
-            "x86_64-darwin": "964260edb04cd53b8448daa5a6392ff78d5123c56368c3f8708a431cac03c619",
-            "x86_64-linux": "f6bbb6ca7b5a1033576c8634e98a2538ae4fc085e5caccc03d7c036b45f030ac"
+            "aarch64-darwin": "7249795788e05d625944f0c0234928eb8176ff0ac03177628d06606975bcfbbe",
+            "aarch64-linux": "f47d45fb8c153fee979564bca8491e2588f0848f03087bb38573ebfbe62e63aa",
+            "armv7l-linux": "36c65512c5eec0ab9741a06e91b38a503de00c1e39cf177db676f5c665f357f4",
+            "headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95",
+            "x86_64-darwin": "e3a3dfc38b5f45ad884d2ac8eb165331247c5dbed030f925508fc8ff95a53f1e",
+            "x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892"
         },
-        "version": "38.2.2"
+        "version": "38.4.0"
+    },
+    "39": {
+        "hashes": {
+            "aarch64-darwin": "86718e1f93188928d9daf239e55ad07d08b3601bbe603a87a9524fa70fc5414c",
+            "aarch64-linux": "e42b6a850426d1f74305543caf688a71f41f9e4c7dcdec9d3a4522a059f2af36",
+            "armv7l-linux": "64295d9b93c4c67386b8de714d124046e311ed87828394c897592afa51285f74",
+            "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59",
+            "x86_64-darwin": "46467a2331a8da420e3e23d46d2a3f968d12fed2e863f1029dd4f94e35198943",
+            "x86_64-linux": "904052986ae1e1b42f92b2b29cf15dbd642eaf4ed4a0dcd1d4ff7cf609b8a3de"
+        },
+        "version": "39.0.0"
     }
 }
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index bedef826ea5e..1cc57988ff23 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -65,83 +65,31 @@ in
   unpackPhase = null; # prevent chromium's unpackPhase from being used
   sourceRoot = "src";
 
-  env =
-    base.env
-    // {
-      # Hydra can fail to build electron due to clang spamming deprecation
-      # warnings mid-build, causing the build log to grow beyond the limit
-      # of 64mb and then getting killed by Hydra.
-      # For some reason, the log size limit appears to only be enforced on
-      # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To
-      # unbreak the build on h.n.o, we simply disable those warnings for now.
-      # https://hydra.nixos.org/build/283952243
-      NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated";
-    }
-    // lib.optionalAttrs (lib.versionAtLeast info.version "35") {
-      # Needed for header generation in electron 35 and above
-      ELECTRON_OUT_DIR = "Release";
-    };
+  env = base.env // {
+    # Hydra can fail to build electron due to clang spamming deprecation
+    # warnings mid-build, causing the build log to grow beyond the limit
+    # of 64mb and then getting killed by Hydra.
+    # For some reason, the log size limit appears to only be enforced on
+    # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To
+    # unbreak the build on h.n.o, we simply disable those warnings for now.
+    # https://hydra.nixos.org/build/283952243
+    NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated";
+    # Needed for header generation in electron 35 and above
+    ELECTRON_OUT_DIR = "Release";
+  };
 
   src = null;
 
   patches =
     base.patches
-    # Fix building with Rust 1.87+
-    # https://issues.chromium.org/issues/407024458
-    ++ lib.optionals (lib.versionOlder info.version "37") [
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6432410
-      # Not using fetchpatch here because it ignores file renames: https://github.com/nixos/nixpkgs/issues/32084
-      ./Reland-Use-global_allocator-to-provide-Rust-allocator-implementation.patch
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6434355
-      (fetchpatch {
-        name = "Call-Rust-default-allocator-directly-from-Rust.patch";
-        url = "https://github.com/chromium/chromium/commit/73eef8797a8138f5c26f52a1372644b20613f5ee.patch";
-        hash = "sha256-IcSjPv21xT+l9BwJuzeW2AfwBdKI0dQb3nskk6yeKHU=";
-      })
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6439711
-      (fetchpatch {
-        name = "Roll-rust.patch";
-        url = "https://github.com/chromium/chromium/commit/a6c30520486be844735dc646cd5b9b434afa0c6b.patch";
-        includes = [ "build/rust/allocator/*" ];
-        hash = "sha256-MFdR75oSAdFW6telEZt/s0qdUvq/BiYFEHW0vk+RgDk=";
-      })
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6456604
-      (fetchpatch {
-        name = "Drop-remap_alloc-dep.patch";
-        url = "https://github.com/chromium/chromium/commit/87d5ad2f621e0d5c81849dde24f3a5347efcb167.patch";
-        hash = "sha256-bEoR6jxEyw6Fzm4Zv4US54Cxa0li/0UTZTU2WUf0Rgo=";
-      })
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6454872
-      (fetchpatch {
-        name = "rust-Clean-up-build-rust-allocator-after-a-Rust-tool.patch";
-        url = "https://github.com/chromium/chromium/commit/5c74fcf6fd14491f33dd820022a9ca045f492f68.patch";
-        hash = "sha256-vcD0Zfo4Io/FVpupWOdgurFEqwFCv+oDOtSmHbm+ons=";
-      })
-    ]
-    # Fix building with gperf 3.2+
-    # https://issues.chromium.org/issues/40209959
-    ++ lib.optionals (lib.versionOlder info.version "37") [
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
-      (fetchpatch {
-        name = "Dont-apply-FALLTHROUGH-edit-to-gperf-3-2-output.patch";
-        url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch";
-        hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA=";
-      })
-    ]
-    # Fix build with Rust 1.89.0
     ++ lib.optionals (lib.versionOlder info.version "38") [
+      # Fix build with Rust 1.89.0
       # https://chromium-review.googlesource.com/c/chromium/src/+/6624733
       (fetchpatch {
         name = "Define-rust-no-alloc-shim-is-unstable-v2.patch";
         url = "https://github.com/chromium/chromium/commit/6aae0e2353c857d98980ff677bf304288d7c58de.patch";
         hash = "sha256-Dd38c/0hiH+PbGPJhhEFuW6kUR45A36XZqOVExoxlhM=";
       })
-    ]
-    ++ lib.optionals (lib.versionOlder info.version "38") [
       # Fix build with LLVM 21+
       # https://chromium-review.googlesource.com/c/chromium/src/+/6633292
       (fetchpatch {
@@ -149,6 +97,15 @@ in
         url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch";
         hash = "sha256-YIWcsCj5w0jUd7D67hsuk0ljTA/IbHwA6db3eK4ggUY=";
       })
+    ]
+    ++ lib.optionals (lib.versionOlder info.version "39") [
+      # Fix build with Rust 1.90.0
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6875644
+      (fetchpatch {
+        name = "Define-rust-alloc-error-handler-should-panic-v2.patch";
+        url = "https://github.com/chromium/chromium/commit/23d818d3c7fba4658248f17fd7b8993199242aa9.patch";
+        hash = "sha256-JVv36PgU/rr34jrhgCyf4Pp8o5j2T8fD1xBVH1avT48=";
+      })
     ];
 
   npmRoot = "third_party/node";
@@ -190,6 +147,17 @@ in
     EOF
 
     echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION
+  ''
+  + lib.optionalString (lib.versionAtLeast info.version "39") ''
+    cat << EOF > gpu/webgpu/dawn_commit_hash.h
+    /* Generated by lastchange.py, do not edit.*/
+    #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+    #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+    #define DAWN_COMMIT_HASH "${info.deps."src/third_party/dawn".args.rev}"
+    #endif  // GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+    EOF
+  ''
+  + ''
 
     (
       cd electron
@@ -222,8 +190,6 @@ in
         done
       done
     )
-  ''
-  + lib.optionalString (lib.versionAtLeast info.version "36") ''
     echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
     echo 'checkout_mutter = false' >> build/config/gclient_args.gni
   ''
@@ -273,6 +239,12 @@ in
     enable_dangling_raw_ptr_feature_flag = false;
     clang_unsafe_buffers_paths = "";
     enterprise_cloud_content_analysis = false;
+  }
+  // lib.optionalAttrs (lib.versionAtLeast info.version "39") {
+    enable_linux_installer = false;
+    enable_pdf_save_to_drive = false;
+  }
+  // {
 
     # other
     enable_widevine = false;
@@ -323,11 +295,7 @@ in
     homepage = "https://github.com/electron/electron";
     platforms = lib.platforms.linux;
     license = licenses.mit;
-    maintainers = with maintainers; [
-      yayayayaka
-      teutat3s
-      tomasajt
-    ];
+    teams = [ teams.electron ];
     mainProgram = "electron";
     hydraPlatforms =
       lib.optionals (!(hasInfix "alpha" info.version) && !(hasInfix "beta" info.version))
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 3cce8d230af4..e14995245470 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1,1328 +1,4 @@
 {
-    "36": {
-        "chrome": "136.0.7103.177",
-        "chromium": {
-            "deps": {
-                "gn": {
-                    "hash": "sha256-MnGl+D9ahQibUHCtyOUf1snvmeupUn4D2yrDj55JTe4=",
-                    "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444",
-                    "version": "0-unstable-2025-03-24"
-                }
-            },
-            "version": "136.0.7103.177"
-        },
-        "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
-        "deps": {
-            "src": {
-                "args": {
-                    "hash": "sha256-KrRUazCSb+X51EeffwoZ4Iniok1CMpAu2hP7IzgwX7U=",
-                    "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "136.0.7103.177",
-                    "url": "https://chromium.googlesource.com/chromium/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/canvas_bench": {
-                "args": {
-                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/frame_rate/content": {
-                "args": {
-                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
-                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
-                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/xr/webvr_info": {
-                "args": {
-                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
-                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
-                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/docs/website": {
-                "args": {
-                    "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=",
-                    "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb",
-                    "url": "https://chromium.googlesource.com/website.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/electron": {
-                "args": {
-                    "hash": "sha256-7+WcLF6RjoN+MZyo4nVr8n/PpJHbzn12VSXsv6LfwH0=",
-                    "owner": "electron",
-                    "repo": "electron",
-                    "tag": "v36.9.4"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/media/cdm/api": {
-                "args": {
-                    "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=",
-                    "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
-                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/net/third_party/quiche/src": {
-                "args": {
-                    "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=",
-                    "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85",
-                    "url": "https://quiche.googlesource.com/quiche.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "args": {
-                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
-                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
-                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/accessibility_test_framework/src": {
-                "args": {
-                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
-                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle": {
-                "args": {
-                    "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=",
-                    "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
-                    "url": "https://chromium.googlesource.com/angle/angle.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "args": {
-                    "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=",
-                    "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/glmark2/src": {
-                "args": {
-                    "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=",
-                    "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/rapidjson/src": {
-                "args": {
-                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
-                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
-                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/anonymous_tokens/src": {
-                "args": {
-                    "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=",
-                    "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/beto-core/src": {
-                "args": {
-                    "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
-                    "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-                    "url": "https://beto-core.googlesource.com/beto-core.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/boringssl/src": {
-                "args": {
-                    "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=",
-                    "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48",
-                    "url": "https://boringssl.googlesource.com/boringssl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/breakpad/breakpad": {
-                "args": {
-                    "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=",
-                    "rev": "657a441e5c1a818d4c10b7bafd431454e6614901",
-                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cast_core/public/src": {
-                "args": {
-                    "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=",
-                    "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942",
-                    "url": "https://chromium.googlesource.com/cast_core/public"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/catapult": {
-                "args": {
-                    "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=",
-                    "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4",
-                    "url": "https://chromium.googlesource.com/catapult.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ced/src": {
-                "args": {
-                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
-                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/clang-format/script": {
-                "args": {
-                    "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
-                    "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cld_3/src": {
-                "args": {
-                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
-                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/colorama/src": {
-                "args": {
-                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                    "url": "https://chromium.googlesource.com/external/colorama.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/compiler-rt/src": {
-                "args": {
-                    "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=",
-                    "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/content_analysis_sdk/src": {
-                "args": {
-                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
-                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
-                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpu_features/src": {
-                "args": {
-                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
-                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpuinfo/src": {
-                "args": {
-                    "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=",
-                    "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea",
-                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crabbyavif/src": {
-                "args": {
-                    "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A=",
-                    "rev": "02d0fad2c512380b7270d6e704c86521075d7d54",
-                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crc32c/src": {
-                "args": {
-                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
-                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros-components/src": {
-                "args": {
-                    "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=",
-                    "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
-                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros_system_api": {
-                "args": {
-                    "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=",
-                    "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crossbench": {
-                "args": {
-                    "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=",
-                    "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122",
-                    "url": "https://chromium.googlesource.com/crossbench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dav1d/libdav1d": {
-                "args": {
-                    "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
-                    "rev": "8d956180934f16244bdb58b39175824775125e55",
-                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn": {
-                "args": {
-                    "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=",
-                    "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb",
-                    "url": "https://dawn.googlesource.com/dawn.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxc": {
-                "args": {
-                    "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=",
-                    "rev": "206b77577d15fc5798eb7ad52290388539b7146d",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxheaders": {
-                "args": {
-                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
-                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/glfw": {
-                "args": {
-                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
-                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
-                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
-                "args": {
-                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
-                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
-                "args": {
-                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
-                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/webgpu-cts": {
-                "args": {
-                    "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=",
-                    "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/depot_tools": {
-                "args": {
-                    "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=",
-                    "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
-                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/devtools-frontend/src": {
-                "args": {
-                    "hash": "sha256-5gbDmUfJI6kGKGxcbDp0CbmLr8ppvz63Nk5HV0XmMBo=",
-                    "rev": "cb82c1525a5b3d277d427b908a21a87489bec532",
-                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dom_distiller_js/dist": {
-                "args": {
-                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
-                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
-                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/domato/src": {
-                "args": {
-                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
-                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
-                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/eigen3/src": {
-                "args": {
-                    "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=",
-                    "rev": "464c1d097891a1462ab28bf8bb763c1683883892",
-                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/electron_node": {
-                "args": {
-                    "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=",
-                    "owner": "nodejs",
-                    "repo": "node",
-                    "tag": "v22.19.0"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/emoji-segmenter/src": {
-                "args": {
-                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
-                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/engflow-reclient-configs": {
-                "args": {
-                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                    "owner": "EngFlow",
-                    "repo": "reclient-configs",
-                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/expat/src": {
-                "args": {
-                    "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
-                    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
-                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/farmhash/src": {
-                "args": {
-                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
-                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fast_float/src": {
-                "args": {
-                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
-                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
-                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ffmpeg": {
-                "args": {
-                    "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=",
-                    "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flac": {
-                "args": {
-                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flatbuffers/src": {
-                "args": {
-                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fontconfig/src": {
-                "args": {
-                    "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                    "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fp16/src": {
-                "args": {
-                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype-testing/src": {
-                "args": {
-                    "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=",
-                    "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
-                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype/src": {
-                "args": {
-                    "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=",
-                    "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca",
-                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fuzztest/src": {
-                "args": {
-                    "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=",
-                    "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fxdiv/src": {
-                "args": {
-                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/gemmlowp/src": {
-                "args": {
-                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/glslang/src": {
-                "args": {
-                    "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=",
-                    "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/google_benchmark/src": {
-                "args": {
-                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
-                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/googletest/src": {
-                "args": {
-                    "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=",
-                    "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/harfbuzz-ng/src": {
-                "args": {
-                    "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=",
-                    "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
-                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/highway/src": {
-                "args": {
-                    "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
-                    "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/hunspell_dictionaries": {
-                "args": {
-                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/icu": {
-                "args": {
-                    "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
-                    "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
-                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink/src": {
-                "args": {
-                    "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=",
-                    "rev": "c542d619a8959415beda5a76fe89ffa2f83df886",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink_stroke_modeler/src": {
-                "args": {
-                    "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=",
-                    "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/instrumented_libs": {
-                "args": {
-                    "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
-                    "rev": "69015643b3f68dbd438c010439c59adc52cac808",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jetstream/main": {
-                "args": {
-                    "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=",
-                    "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jetstream/v2.2": {
-                "args": {
-                    "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=",
-                    "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jsoncpp/source": {
-                "args": {
-                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
-                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
-                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/leveldatabase/src": {
-                "args": {
-                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
-                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
-                    "url": "https://chromium.googlesource.com/external/leveldb.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libFuzzer/src": {
-                "args": {
-                    "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
-                    "rev": "e31b99917861f891308269c36a32363b120126bb",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaddressinput/src": {
-                "args": {
-                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
-                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
-                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaom/source/libaom": {
-                "args": {
-                    "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=",
-                    "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be",
-                    "url": "https://aomedia.googlesource.com/aom.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++/src": {
-                "args": {
-                    "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=",
-                    "rev": "449310fe2e37834a7e62972d2a690cade2ef596b",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++abi/src": {
-                "args": {
-                    "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=",
-                    "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libdrm/src": {
-                "args": {
-                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libgav1/src": {
-                "args": {
-                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
-                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
-                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libipp/libipp": {
-                "args": {
-                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libjpeg_turbo": {
-                "args": {
-                    "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
-                    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/liblouis/src": {
-                "args": {
-                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libphonenumber/dist": {
-                "args": {
-                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
-                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
-                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libprotobuf-mutator/src": {
-                "args": {
-                    "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=",
-                    "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsrtp": {
-                "args": {
-                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
-                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsync/src": {
-                "args": {
-                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libunwind/src": {
-                "args": {
-                    "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=",
-                    "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libva-fake-driver/src": {
-                "args": {
-                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
-                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libvpx/source/libvpx": {
-                "args": {
-                    "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=",
-                    "rev": "027bbee30a0103b99d86327b48d29567fed11688",
-                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebm/source": {
-                "args": {
-                    "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ=",
-                    "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268",
-                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebp/src": {
-                "args": {
-                    "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=",
-                    "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
-                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libyuv": {
-                "args": {
-                    "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=",
-                    "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
-                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/llvm-libc/src": {
-                "args": {
-                    "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=",
-                    "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/lss": {
-                "args": {
-                    "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
-                    "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
-                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/material_color_utilities/src": {
-                "args": {
-                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
-                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
-                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/minigbm/src": {
-                "args": {
-                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nan": {
-                "args": {
-                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                    "owner": "nodejs",
-                    "repo": "nan",
-                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/nasm": {
-                "args": {
-                    "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=",
-                    "rev": "767a169c8811b090df222a458b25dfa137fc637e",
-                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nearby/src": {
-                "args": {
-                    "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=",
-                    "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/neon_2_sse/src": {
-                "args": {
-                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
-                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openh264/src": {
-                "args": {
-                    "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
-                    "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
-                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src": {
-                "args": {
-                    "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=",
-                    "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8",
-                    "url": "https://chromium.googlesource.com/openscreen"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/buildtools": {
-                "args": {
-                    "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o=",
-                    "rev": "00459762409cb29cecf398a23cdb0cae918b7515",
-                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/third_party/tinycbor/src": {
-                "args": {
-                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
-                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ots/src": {
-                "args": {
-                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pdfium": {
-                "args": {
-                    "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=",
-                    "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5",
-                    "url": "https://pdfium.googlesource.com/pdfium.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/perfetto": {
-                "args": {
-                    "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=",
-                    "rev": "054635b91453895720951f7329619d003a98b3e4",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/protobuf-javascript/src": {
-                "args": {
-                    "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=",
-                    "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8",
-                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pthreadpool/src": {
-                "args": {
-                    "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=",
-                    "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pyelftools": {
-                "args": {
-                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pywebsocket3/src": {
-                "args": {
-                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
-                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/quic_trace/src": {
-                "args": {
-                    "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=",
-                    "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/re2/src": {
-                "args": {
-                    "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
-                    "rev": "c84a140c93352cdabbfb547c531be34515b12228",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ruy/src": {
-                "args": {
-                    "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=",
-                    "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/search_engines_data/resources": {
-                "args": {
-                    "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=",
-                    "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455",
-                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/securemessage/src": {
-                "args": {
-                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/skia": {
-                "args": {
-                    "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=",
-                    "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73",
-                    "url": "https://skia.googlesource.com/skia.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/smhasher/src": {
-                "args": {
-                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
-                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
-                    "url": "https://chromium.googlesource.com/external/smhasher.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/snappy/src": {
-                "args": {
-                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
-                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/main": {
-                "args": {
-                    "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=",
-                    "rev": "c760d160caa05792d3ed7650e85861c9f9462506",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v2.0": {
-                "args": {
-                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
-                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v2.1": {
-                "args": {
-                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
-                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.0": {
-                "args": {
-                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
-                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.1": {
-                "args": {
-                    "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=",
-                    "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-cross/src": {
-                "args": {
-                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-headers/src": {
-                "args": {
-                    "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=",
-                    "rev": "8c88e0c4c94a21de825efccba5f99a862b049825",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-tools/src": {
-                "args": {
-                    "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=",
-                    "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/sqlite/src": {
-                "args": {
-                    "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=",
-                    "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9",
-                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/squirrel.mac": {
-                "args": {
-                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                    "owner": "Squirrel",
-                    "repo": "Squirrel.Mac",
-                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/Mantle": {
-                "args": {
-                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                    "owner": "Mantle",
-                    "repo": "Mantle",
-                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "args": {
-                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                    "owner": "ReactiveCocoa",
-                    "repo": "ReactiveObjC",
-                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/swiftshader": {
-                "args": {
-                    "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=",
-                    "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde",
-                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/text-fragments-polyfill/src": {
-                "args": {
-                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
-                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/tflite/src": {
-                "args": {
-                    "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=",
-                    "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430",
-                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ukey2/src": {
-                "args": {
-                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-deps": {
-                "args": {
-                    "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=",
-                    "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995",
-                    "url": "https://chromium.googlesource.com/vulkan-deps"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-headers/src": {
-                "args": {
-                    "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=",
-                    "rev": "78c359741d855213e8685278eb81bb62599f8e56",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-loader/src": {
-                "args": {
-                    "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=",
-                    "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-tools/src": {
-                "args": {
-                    "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=",
-                    "rev": "289efccc7560f2b970e2b4e0f50349da87669311",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-utility-libraries/src": {
-                "args": {
-                    "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=",
-                    "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-validation-layers/src": {
-                "args": {
-                    "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=",
-                    "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan_memory_allocator": {
-                "args": {
-                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
-                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wasm_tts_engine/src": {
-                "args": {
-                    "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=",
-                    "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125",
-                    "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/gtk": {
-                "args": {
-                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
-                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/kde": {
-                "args": {
-                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
-                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
-                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/src": {
-                "args": {
-                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
-                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland/src": {
-                "args": {
-                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
-                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webdriver/pylib": {
-                "args": {
-                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgl/src": {
-                "args": {
-                    "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=",
-                    "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0",
-                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgpu-cts/src": {
-                "args": {
-                    "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=",
-                    "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webpagereplay": {
-                "args": {
-                    "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro=",
-                    "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7",
-                    "url": "https://chromium.googlesource.com/webpagereplay.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webrtc": {
-                "args": {
-                    "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=",
-                    "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21",
-                    "url": "https://webrtc.googlesource.com/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/weston/src": {
-                "args": {
-                    "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
-                    "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wuffs/src": {
-                "args": {
-                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
-                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
-                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xdg-utils": {
-                "args": {
-                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xnnpack/src": {
-                "args": {
-                    "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=",
-                    "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/zstd/src": {
-                "args": {
-                    "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=",
-                    "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f",
-                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/v8": {
-                "args": {
-                    "hash": "sha256-lvrFWpivbaiuv6VKCX0ZGw/PurFcZjKelcnHVNS4FsQ=",
-                    "rev": "b0a55a7dad7f536cce1f9aaddba89894c8533946",
-                    "url": "https://chromium.googlesource.com/v8/v8.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            }
-        },
-        "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
-        "modules": "135",
-        "node": "22.19.0",
-        "version": "36.9.4"
-    },
     "37": {
         "chrome": "138.0.7204.251",
         "chromium": {
@@ -1380,10 +56,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-7b9JFee1fNw23ufv5oEHKuP/JQFDFdfryD74n2maKRY=",
+                    "hash": "sha256-gq7gu3ZhV2W02oQUtRFSAJfcCchB8zflqexllmg9GCU=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.6.1"
+                    "tag": "v37.7.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1717,10 +393,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=",
+                    "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.19.0"
+                    "tag": "v22.20.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2652,11 +1328,11 @@
         },
         "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
         "modules": "136",
-        "node": "22.19.0",
-        "version": "37.6.1"
+        "node": "22.20.0",
+        "version": "37.7.1"
     },
     "38": {
-        "chrome": "140.0.7339.133",
+        "chrome": "140.0.7339.240",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2665,15 +1341,15 @@
                     "version": "0-unstable-2025-07-29"
                 }
             },
-            "version": "140.0.7339.133"
+            "version": "140.0.7339.240"
         },
         "chromium_npm_hash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-POp5cNxLJqEgGvTCpbZhurSnAmGrIg+LeKRG6iy626Y=",
+                    "hash": "sha256-lO84baZNQgchjmLnSUQ4y2Yi1MEH8d0omB612F4vCxM=",
                     "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "140.0.7339.133",
+                    "tag": "140.0.7339.240",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2712,10 +1388,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-OuBvNX/Nw/9Zg+xirSEo43eIiypBkZmw9DbJe6CFA6k=",
+                    "hash": "sha256-HKUJyRtN5I/xOKyTfP3bHTwZ6AmpbWVzfT4BR3t9SOQ=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v38.2.2"
+                    "tag": "v38.4.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2937,8 +1613,8 @@
             },
             "src/third_party/dawn": {
                 "args": {
-                    "hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU=",
-                    "rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
+                    "hash": "sha256-ulw+gDGpUn8uWuNedlfQADwnSYYbPWpHN5Q+pJbwKGc=",
+                    "rev": "67be7fddacc4f4bcb21d0cf7bf8bb18752d8fb08",
                     "url": "https://dawn.googlesource.com/dawn.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3009,8 +1685,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-tA+6iKBfJVrlT+1UH55vqa5JCONweZeD/zWfNHHD+Kw=",
-                    "rev": "5dbb6f71a9bd613c0403242c7c021652fbf155fd",
+                    "hash": "sha256-7YwrN+MizCnfcwDHWsYkZaTbN2qmCHcixX6KHhCPrXs=",
+                    "rev": "725edaaf06b966e670194d0376d50be0c25deb13",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3049,10 +1725,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=",
+                    "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.19.0"
+                    "tag": "v22.20.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3644,8 +2320,8 @@
             },
             "src/third_party/skia": {
                 "args": {
-                    "hash": "sha256-YiGzqaht1r8/dDz0C4fpKsPEIplm33dPce2UpLkYTZ0=",
-                    "rev": "1fdbea293a53b270e3f5e74c92cc6670d68412ff",
+                    "hash": "sha256-88ezOArtEdPJZACmgyjJ2Jf5biSlyoDYMJBZ7wwPt7Q=",
+                    "rev": "f3ff281f2330f2948888a9cc0ba921bbdc107da8",
                     "url": "https://skia.googlesource.com/skia.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3967,8 +2643,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg=",
-                    "rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
+                    "hash": "sha256-/XuTD8ENQutrbBt5sJYHuG/87q00J2fACSBBkeEHTYs=",
+                    "rev": "b7ed978e41b4bac7802b206404d0e2f3d09f31ac",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3976,7 +2652,1355 @@
         },
         "electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z",
         "modules": "139",
-        "node": "22.19.0",
-        "version": "38.2.2"
+        "node": "22.20.0",
+        "version": "38.4.0"
+    },
+    "39": {
+        "chrome": "142.0.7444.52",
+        "chromium": {
+            "deps": {
+                "gn": {
+                    "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=",
+                    "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+                    "version": "0-unstable-2025-09-18"
+                }
+            },
+            "version": "142.0.7444.52"
+        },
+        "chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=",
+        "deps": {
+            "src": {
+                "args": {
+                    "hash": "sha256-/gjznJOMyWs7kaUquYf4c1peCi3P6LQXnHUGdLROtz4=",
+                    "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
+                    "tag": "142.0.7444.52",
+                    "url": "https://chromium.googlesource.com/chromium/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/perf/canvas_bench": {
+                "args": {
+                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/perf/frame_rate/content": {
+                "args": {
+                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/xr/webvr_info": {
+                "args": {
+                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/docs/website": {
+                "args": {
+                    "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo=",
+                    "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
+                    "url": "https://chromium.googlesource.com/website.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/electron": {
+                "args": {
+                    "hash": "sha256-yAV/co8euqwTeUg43nnKwYF0/NQIm2WVh7CWOeP8vyE=",
+                    "owner": "electron",
+                    "repo": "electron",
+                    "tag": "v39.0.0"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/media/cdm/api": {
+                "args": {
+                    "hash": "sha256-voZaq/OiP5/QSSZmBx1ifriBc6HQ9+m4pUz0o9+O9x8=",
+                    "rev": "a4cbc4325e6de42ead733f2af43c08292d0e65a8",
+                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/net/third_party/quiche/src": {
+                "args": {
+                    "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs=",
+                    "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
+                    "url": "https://quiche.googlesource.com/quiche.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
+                "args": {
+                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
+                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
+                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle": {
+                "args": {
+                    "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0=",
+                    "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7",
+                    "url": "https://chromium.googlesource.com/angle/angle.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/VK-GL-CTS/src": {
+                "args": {
+                    "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg=",
+                    "rev": "c67cffddd65aba724950e062343fa1cc89560b33",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/glmark2/src": {
+                "args": {
+                    "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=",
+                    "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/rapidjson/src": {
+                "args": {
+                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/anonymous_tokens/src": {
+                "args": {
+                    "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY=",
+                    "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/boringssl/src": {
+                "args": {
+                    "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270=",
+                    "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
+                    "url": "https://boringssl.googlesource.com/boringssl.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/breakpad/breakpad": {
+                "args": {
+                    "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM=",
+                    "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
+                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cast_core/public/src": {
+                "args": {
+                    "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=",
+                    "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942",
+                    "url": "https://chromium.googlesource.com/cast_core/public"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/catapult": {
+                "args": {
+                    "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0=",
+                    "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
+                    "url": "https://chromium.googlesource.com/catapult.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ced/src": {
+                "args": {
+                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/clang-format/script": {
+                "args": {
+                    "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
+                    "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cld_3/src": {
+                "args": {
+                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/colorama/src": {
+                "args": {
+                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                    "url": "https://chromium.googlesource.com/external/colorama.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/compiler-rt/src": {
+                "args": {
+                    "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ=",
+                    "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/content_analysis_sdk/src": {
+                "args": {
+                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cpu_features/src": {
+                "args": {
+                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cpuinfo/src": {
+                "args": {
+                    "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=",
+                    "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crabbyavif/src": {
+                "args": {
+                    "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM=",
+                    "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55",
+                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crc32c/src": {
+                "args": {
+                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cros-components/src": {
+                "args": {
+                    "hash": "sha256-g7LzBd2V21AaLdSdCw65WGYvKfrbtpRXsYc+3ILdiKs=",
+                    "rev": "7ccdbf60606671c2c057628125908fbfef9bd0c8",
+                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cros_system_api": {
+                "args": {
+                    "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU=",
+                    "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crossbench": {
+                "args": {
+                    "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI=",
+                    "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
+                    "url": "https://chromium.googlesource.com/crossbench.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crossbench-web-tests": {
+                "args": {
+                    "hash": "sha256-yJmi1IpUiKhdoHAXyazkpm+Ezuc4Hp8pOIBntG5hN+U=",
+                    "rev": "3c76c8201f0732fe9781742229ab8ac43bf90cbf",
+                    "url": "https://chromium.googlesource.com/chromium/web-tests.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dav1d/libdav1d": {
+                "args": {
+                    "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=",
+                    "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d",
+                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn": {
+                "args": {
+                    "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo=",
+                    "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
+                    "url": "https://dawn.googlesource.com/dawn.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/dxc": {
+                "args": {
+                    "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo=",
+                    "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/dxheaders": {
+                "args": {
+                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/glfw": {
+                "args": {
+                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
+                "args": {
+                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
+                "args": {
+                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/webgpu-cts": {
+                "args": {
+                    "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs=",
+                    "rev": "18f1cc77dea7254258eeee21839d1c249b506576",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/webgpu-headers/src": {
+                "args": {
+                    "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis=",
+                    "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
+                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/depot_tools": {
+                "args": {
+                    "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=",
+                    "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/devtools-frontend/src": {
+                "args": {
+                    "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg=",
+                    "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
+                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dom_distiller_js/dist": {
+                "args": {
+                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/domato/src": {
+                "args": {
+                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dragonbox/src": {
+                "args": {
+                    "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc=",
+                    "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda",
+                    "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/eigen3/src": {
+                "args": {
+                    "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE=",
+                    "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/electron_node": {
+                "args": {
+                    "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
+                    "owner": "nodejs",
+                    "repo": "node",
+                    "tag": "v22.20.0"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/emoji-segmenter/src": {
+                "args": {
+                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
+                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/engflow-reclient-configs": {
+                "args": {
+                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                    "owner": "EngFlow",
+                    "repo": "reclient-configs",
+                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/expat/src": {
+                "args": {
+                    "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk=",
+                    "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2",
+                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/farmhash/src": {
+                "args": {
+                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fast_float/src": {
+                "args": {
+                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
+                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
+                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/federated_compute/src": {
+                "args": {
+                    "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk=",
+                    "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ffmpeg": {
+                "args": {
+                    "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=",
+                    "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/flac": {
+                "args": {
+                    "hash": "sha256-Y5TXyJ8lVh8TaVC5S4BVxOmFxySBzPbJYEe8YJS6ZR4=",
+                    "rev": "807e251d9f8c5dd6059e547931e9c6a4251967af",
+                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/flatbuffers/src": {
+                "args": {
+                    "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=",
+                    "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fontconfig/src": {
+                "args": {
+                    "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8=",
+                    "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
+                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fp16/src": {
+                "args": {
+                    "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=",
+                    "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/freetype/src": {
+                "args": {
+                    "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98=",
+                    "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
+                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fuzztest/src": {
+                "args": {
+                    "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k=",
+                    "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fxdiv/src": {
+                "args": {
+                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/gemmlowp/src": {
+                "args": {
+                    "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs=",
+                    "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/glslang/src": {
+                "args": {
+                    "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY=",
+                    "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/google_benchmark/src": {
+                "args": {
+                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/googletest/src": {
+                "args": {
+                    "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=",
+                    "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/harfbuzz-ng/src": {
+                "args": {
+                    "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=",
+                    "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843",
+                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/highway/src": {
+                "args": {
+                    "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI=",
+                    "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/hunspell_dictionaries": {
+                "args": {
+                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/icu": {
+                "args": {
+                    "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=",
+                    "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
+                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ink/src": {
+                "args": {
+                    "hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA=",
+                    "rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ink_stroke_modeler/src": {
+                "args": {
+                    "hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY=",
+                    "rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/instrumented_libs": {
+                "args": {
+                    "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
+                    "rev": "69015643b3f68dbd438c010439c59adc52cac808",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jetstream/main": {
+                "args": {
+                    "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0=",
+                    "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jetstream/v2.2": {
+                "args": {
+                    "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=",
+                    "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jsoncpp/source": {
+                "args": {
+                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/leveldatabase/src": {
+                "args": {
+                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
+                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
+                    "url": "https://chromium.googlesource.com/external/leveldb.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libFuzzer/src": {
+                "args": {
+                    "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=",
+                    "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libaddressinput/src": {
+                "args": {
+                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
+                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
+                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libaom/source/libaom": {
+                "args": {
+                    "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU=",
+                    "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
+                    "url": "https://aomedia.googlesource.com/aom.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libc++/src": {
+                "args": {
+                    "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs=",
+                    "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libc++abi/src": {
+                "args": {
+                    "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ=",
+                    "rev": "864f61dc9253d56586ada34c388278565ef513f6",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libdrm/src": {
+                "args": {
+                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libgav1/src": {
+                "args": {
+                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
+                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libipp/libipp": {
+                "args": {
+                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libjpeg_turbo": {
+                "args": {
+                    "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
+                    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/liblouis/src": {
+                "args": {
+                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libpfm4/src": {
+                "args": {
+                    "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=",
+                    "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+                    "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libphonenumber/dist": {
+                "args": {
+                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
+                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
+                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libprotobuf-mutator/src": {
+                "args": {
+                    "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=",
+                    "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libsrtp": {
+                "args": {
+                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
+                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libsync/src": {
+                "args": {
+                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libunwind/src": {
+                "args": {
+                    "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30=",
+                    "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libva-fake-driver/src": {
+                "args": {
+                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
+                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libvpx/source/libvpx": {
+                "args": {
+                    "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c=",
+                    "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
+                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libwebm/source": {
+                "args": {
+                    "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4=",
+                    "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c",
+                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libwebp/src": {
+                "args": {
+                    "hash": "sha256-yKVLUxzIK5ybYM/22fVaQlqSCG5Hx4Notxj+3kI2LCg=",
+                    "rev": "b0e8039062eedbcb20ebb1bad62bfeaee2b94ec6",
+                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libyuv": {
+                "args": {
+                    "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY=",
+                    "rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
+                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/llvm-libc/src": {
+                "args": {
+                    "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg=",
+                    "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/lss": {
+                "args": {
+                    "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
+                    "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
+                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/material_color_utilities/src": {
+                "args": {
+                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/minigbm/src": {
+                "args": {
+                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/nan": {
+                "args": {
+                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                    "owner": "nodejs",
+                    "repo": "nan",
+                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/nasm": {
+                "args": {
+                    "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=",
+                    "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
+                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/nearby/src": {
+                "args": {
+                    "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA=",
+                    "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/neon_2_sse/src": {
+                "args": {
+                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
+                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/oak/src": {
+                "args": {
+                    "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8=",
+                    "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
+                    "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openh264/src": {
+                "args": {
+                    "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
+                    "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
+                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src": {
+                "args": {
+                    "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA=",
+                    "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
+                    "url": "https://chromium.googlesource.com/openscreen"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src/buildtools": {
+                "args": {
+                    "hash": "sha256-WnbgaCzZ/BJli6M60kP9e4mVPFDx0yu3eCac5wmQ7iM=",
+                    "rev": "077a66f30fcf281b066fafb6dfc60818c238efb6",
+                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src/third_party/tinycbor/src": {
+                "args": {
+                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ots/src": {
+                "args": {
+                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pdfium": {
+                "args": {
+                    "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk=",
+                    "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
+                    "url": "https://pdfium.googlesource.com/pdfium.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/perfetto": {
+                "args": {
+                    "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs=",
+                    "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/protobuf-javascript/src": {
+                "args": {
+                    "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=",
+                    "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024",
+                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pthreadpool/src": {
+                "args": {
+                    "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0=",
+                    "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pyelftools": {
+                "args": {
+                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pywebsocket3/src": {
+                "args": {
+                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/quic_trace/src": {
+                "args": {
+                    "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=",
+                    "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/re2/src": {
+                "args": {
+                    "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ=",
+                    "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/readability/src": {
+                "args": {
+                    "hash": "sha256-liNoIZreSx/RgL5/oSKyzOuqChAgDwTtViNq0KiY0R0=",
+                    "rev": "1f0ec42686c89a4a1c71789849f7ffde349ab197",
+                    "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ruy/src": {
+                "args": {
+                    "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk=",
+                    "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/search_engines_data/resources": {
+                "args": {
+                    "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI=",
+                    "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a",
+                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/securemessage/src": {
+                "args": {
+                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/skia": {
+                "args": {
+                    "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64=",
+                    "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
+                    "url": "https://skia.googlesource.com/skia.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/smhasher/src": {
+                "args": {
+                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
+                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
+                    "url": "https://chromium.googlesource.com/external/smhasher.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/snappy/src": {
+                "args": {
+                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
+                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/main": {
+                "args": {
+                    "hash": "sha256-3TlVewJ9C3MXvlIudzLHshQZOCAmUkMYsZzAazSbMLY=",
+                    "rev": "06449bdc34789a7459393405dd777e02d78a3743",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v2.0": {
+                "args": {
+                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
+                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v2.1": {
+                "args": {
+                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
+                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v3.0": {
+                "args": {
+                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v3.1": {
+                "args": {
+                    "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=",
+                    "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-cross/src": {
+                "args": {
+                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-headers/src": {
+                "args": {
+                    "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08=",
+                    "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-tools/src": {
+                "args": {
+                    "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc=",
+                    "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/sqlite/src": {
+                "args": {
+                    "hash": "sha256-13HMEpzzcFx/UKqt4V68619R+0j4B/GOl6NYlhpBk0c=",
+                    "rev": "7d348fc79216a09b864ff881d8561a6222301666",
+                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/squirrel.mac": {
+                "args": {
+                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                    "owner": "Squirrel",
+                    "repo": "Squirrel.Mac",
+                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/squirrel.mac/vendor/Mantle": {
+                "args": {
+                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                    "owner": "Mantle",
+                    "repo": "Mantle",
+                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
+                "args": {
+                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                    "owner": "ReactiveCocoa",
+                    "repo": "ReactiveObjC",
+                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/swiftshader": {
+                "args": {
+                    "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk=",
+                    "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
+                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/text-fragments-polyfill/src": {
+                "args": {
+                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/tflite/src": {
+                "args": {
+                    "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY=",
+                    "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ukey2/src": {
+                "args": {
+                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-deps": {
+                "args": {
+                    "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E=",
+                    "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
+                    "url": "https://chromium.googlesource.com/vulkan-deps"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-headers/src": {
+                "args": {
+                    "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU=",
+                    "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-loader/src": {
+                "args": {
+                    "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y=",
+                    "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-tools/src": {
+                "args": {
+                    "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU=",
+                    "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-utility-libraries/src": {
+                "args": {
+                    "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg=",
+                    "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-validation-layers/src": {
+                "args": {
+                    "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M=",
+                    "rev": "83d96b88de7b85c3f29545170857e54e348421b2",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan_memory_allocator": {
+                "args": {
+                    "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=",
+                    "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
+                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/gtk": {
+                "args": {
+                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/kde": {
+                "args": {
+                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/src": {
+                "args": {
+                    "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY=",
+                    "rev": "efbc060534be948b63e1f395d69b583eebba3235",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland/src": {
+                "args": {
+                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webdriver/pylib": {
+                "args": {
+                    "hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo=",
+                    "rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1",
+                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webgl/src": {
+                "args": {
+                    "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=",
+                    "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0",
+                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webgpu-cts/src": {
+                "args": {
+                    "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A=",
+                    "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webpagereplay": {
+                "args": {
+                    "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw=",
+                    "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
+                    "url": "https://chromium.googlesource.com/webpagereplay.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webrtc": {
+                "args": {
+                    "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w=",
+                    "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
+                    "url": "https://webrtc.googlesource.com/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/weston/src": {
+                "args": {
+                    "hash": "sha256-o49a3sp+D9FycxeB+uMcKouVvlKWoWpfws7FLEGJ/V8=",
+                    "rev": "bdba2f9adaca673fd58339d8140bc04727ee279d",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wuffs/src": {
+                "args": {
+                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/xdg-utils": {
+                "args": {
+                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/xnnpack/src": {
+                "args": {
+                    "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw=",
+                    "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/zstd/src": {
+                "args": {
+                    "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4=",
+                    "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96",
+                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/v8": {
+                "args": {
+                    "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs=",
+                    "rev": "bb294624702efbb17691b642333f06bf5108e600",
+                    "url": "https://chromium.googlesource.com/v8/v8.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            }
+        },
+        "electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f",
+        "modules": "140",
+        "node": "22.20.0",
+        "version": "39.0.0"
     }
 }
diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 94ba8eca4fa7..2ae0c2e4664d 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -17,7 +17,8 @@ to specify the major release to be updated.
 The `update-all command updates all non-eol major releases.
 
 The `update` and `update-all` commands accept an optional `--commit`
-flag to automatically commit the changes for you.
+flag to automatically commit the changes for you, and `--force` to
+skip the up-to-date version check.
 """
 import base64
 import json
@@ -178,12 +179,13 @@ def non_eol_releases(releases: Iterable[int]) -> Iterable[int]:
     return tuple(filter(lambda x: x in supported_version_range(), releases))
 
 
-def update_source(version: str, commit: bool) -> None:
+def update_source(version: str, commit: bool, force: bool) -> None:
     """Update a given electron-source release
 
     Args:
         version: The major version number, e.g. '27'
         commit: Whether the updater should commit the result
+        force: Whether to fetch even when the version is already up-to-date
     """
     major_version = version
 
@@ -198,7 +200,7 @@ def update_source(version: str, commit: bool) -> None:
     )
 
     m, rev = get_latest_version(major_version)
-    if old_version == m["version"]:
+    if old_version == m["version"] and not force:
         print(f"{package_name} is up-to-date")
         return
 
@@ -222,13 +224,15 @@ def cli() -> None:
 @cli.command("update", help="Update a single major release")
 @click.option("-v", "--version", required=True, type=str, help="The major version, e.g. '23'")
 @click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update(version: str, commit: bool) -> None:
-    update_source(version, commit)
+@click.option("-f", "--force", is_flag=True, default=False, help="Skip up-to-date version check")
+def update(version: str, commit: bool, force: bool) -> None:
+    update_source(version, commit, force)
 
 
 @cli.command("update-all", help="Update all releases at once")
 @click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update_all(commit: bool) -> None:
+@click.option("-f", "--force", is_flag=True, default=False, help="Skip up-to-date version check")
+def update_all(commit: bool, force: bool) -> None:
     """Update all eletron-source releases at once
 
     Args:
@@ -239,7 +243,7 @@ def update_all(commit: bool) -> None:
     filtered_releases = non_eol_releases(tuple(map(lambda x: int(x), old_info.keys())))
 
     for major_version in filtered_releases:
-        update_source(str(major_version), commit)
+        update_source(str(major_version), commit, force)
 
 
 if __name__ == "__main__":
diff --git a/pkgs/development/tools/godot/4.5/default.nix b/pkgs/development/tools/godot/4.5/default.nix
index 0db38e4de8b3..ef4e38e5d920 100644
--- a/pkgs/development/tools/godot/4.5/default.nix
+++ b/pkgs/development/tools/godot/4.5/default.nix
@@ -1,11 +1,11 @@
 {
-  version = "4.5-stable";
-  hash = "sha256-ENDgZBM/bgL+Wlvy6GhE8a5Lyj44OqH7nOF3y74Bf/8=";
+  version = "4.5.1-stable";
+  hash = "sha256-8iMhn40y7aVL6Xjvo34ZtfygJYWwDmCnTxUJcV3AQCI=";
   default = {
-    exportTemplatesHash = "sha256-N12DtmF5T5F0bS3sm1aamdTST4WnDE7ABoqvsYtVHVM=";
+    exportTemplatesHash = "sha256-GZivN/E4doTiwhHNtIPa9JL8ZNxrEglr3c3KJbaRDIY=";
   };
   mono = {
-    exportTemplatesHash = "sha256-rRGCBdiuMEurhPqTdZC9G0OpVnu3+CvneGeMiRzoWLs=";
+    exportTemplatesHash = "sha256-xCVjMGG7SfQ5C9zs4rnOaLOwvjxxCVtAZE2PbxexFG4=";
     nugetDeps = ./deps.json;
   };
 }
diff --git a/pkgs/development/tools/godot/common.nix b/pkgs/development/tools/godot/common.nix
index bdd87b4a96b5..a50cf1bb6c1a 100644
--- a/pkgs/development/tools/godot/common.nix
+++ b/pkgs/development/tools/godot/common.nix
@@ -426,8 +426,7 @@ let
           # Fix a crash in the mono test project build. It no longer seems to
           # happen in 4.4, but an existing fix couldn't be identified.
           ./CSharpLanguage-fix-crash-in-reload_assemblies-after-.patch
-        ]
-        ++ lib.optional (lib.versionAtLeast version "4.5") ./fix-freetype-link-error.patch;
+        ];
 
         postPatch = ''
           # this stops scons from hiding e.g. NIX_CFLAGS_COMPILE
diff --git a/pkgs/development/tools/godot/fix-freetype-link-error.patch b/pkgs/development/tools/godot/fix-freetype-link-error.patch
deleted file mode 100644
index 6ae73c6aa68b..000000000000
--- a/pkgs/development/tools/godot/fix-freetype-link-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/modules/freetype/SCsub b/modules/freetype/SCsub
-index 0a52ef46c5..c932900037 100644
---- a/modules/freetype/SCsub
-+++ b/modules/freetype/SCsub
-@@ -62,9 +62,9 @@ if env["builtin_freetype"]:
-     if env["brotli"]:
-         env_freetype.Append(CPPDEFINES=["FT_CONFIG_OPTION_USE_BROTLI"])
- 
--    env_freetype.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
-+    env_freetype.Prepend(CPPPATH=[thirdparty_dir + "/include"])
-     # Also needed in main env for scene/
--    env.Prepend(CPPEXTPATH=[thirdparty_dir + "/include"])
-+    env.Prepend(CPPPATH=[thirdparty_dir + "/include"])
- 
-     env_freetype.Append(CPPDEFINES=["FT2_BUILD_LIBRARY", "FT_CONFIG_OPTION_USE_PNG", "FT_CONFIG_OPTION_SYSTEM_ZLIB"])
- 
\ No newline at end of file
diff --git a/pkgs/development/tools/godot/update.sh b/pkgs/development/tools/godot/update.sh
index 1cf654b70d87..ac2606c39c12 100755
--- a/pkgs/development/tools/godot/update.sh
+++ b/pkgs/development/tools/godot/update.sh
@@ -14,7 +14,7 @@ nix-update "$attr".godot \
 [[ $(nix eval --raw -f. "$attr".godot) != "$prev_version" ]] || exit 0
 
 fetch_deps=$(nix build -f. "$attr".godot-mono.fetch-deps --print-out-paths --no-link)
-"$fetch_deps"
+"$fetch_deps" >&2
 
 update-source-version "$attr".godot.export-templates-bin --ignore-same-version --file="$file"
 update-source-version "$attr".godot-mono.export-templates-bin --ignore-same-version --file="$file"
diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
index 2beaa3ed8e45..600a1acd6de6 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@@ -99,7 +99,7 @@ let
     let
       # only formatters that were not requested
       unwanted = lib.pipe knownFormatters [
-        (lib.filterAttrs (fmt: _: !(lib.elem fmt supportedFormatters)))
+        (fmts: lib.removeAttrs fmts supportedFormatters)
         lib.attrsToList
       ];
       # all flags to disable
diff --git a/pkgs/development/tools/haskell/vaultenv/default.nix b/pkgs/development/tools/haskell/vaultenv/default.nix
index ee9d867c128d..ad645ef016ec 100644
--- a/pkgs/development/tools/haskell/vaultenv/default.nix
+++ b/pkgs/development/tools/haskell/vaultenv/default.nix
@@ -46,6 +46,7 @@ mkDerivation rec {
   prePatch = ''
     substituteInPlace package.yaml \
         --replace -Werror ""
+    hpack
   '';
 
   isLibrary = false;
@@ -82,7 +83,6 @@ mkDerivation rec {
     hspec-expectations
     quickcheck-instances
   ];
-  preConfigure = "hpack";
   homepage = "https://github.com/channable/vaultenv#readme";
   description = "Runs processes with secrets from HashiCorp Vault";
   license = lib.licenses.bsd3;
diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix
index 505182bc06aa..b6ee390228d9 100644
--- a/pkgs/development/tools/hotdoc/default.nix
+++ b/pkgs/development/tools/hotdoc/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   buildPythonApplication,
+  fetchpatch,
   fetchPypi,
   replaceVars,
   clang,
@@ -45,6 +46,13 @@ buildPythonApplication rec {
       clang = lib.getExe clang;
       libclang = "${lib.getLib libclang}/lib/libclang${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
+
+    # Fix build with gcc15
+    (fetchpatch {
+      name = "hotdoc-fix-c_comment_scanner-function-prototypes-gcc15.patch";
+      url = "https://github.com/hotdoc/hotdoc/commit/adf8518431fafb78c9b47862a0a9a58824b6a421.patch";
+      hash = "sha256-5y50Yk+AjV3aSk8H3k9od/Yvy09FyQQOcVOAcstQnw8=";
+    })
   ];
 
   build-system = [ setuptools ];
diff --git a/pkgs/development/tools/misc/binutils/2.38/default.nix b/pkgs/development/tools/misc/binutils/2.38/default.nix
index 4b3c8443dbbc..80a34de000ea 100644
--- a/pkgs/development/tools/misc/binutils/2.38/default.nix
+++ b/pkgs/development/tools/misc/binutils/2.38/default.nix
@@ -179,7 +179,6 @@ stdenv.mkDerivation {
 
   hardeningDisable = [
     "format"
-    "pie"
   ];
 
   configurePlatforms = [
diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff
new file mode 100644
index 000000000000..947172f2866a
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff
@@ -0,0 +1,13 @@
+Backported patch originally targeted against 2.45.
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -14356,5 +14356,6 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info)
+	  if (o->flags & SEC_GROUP)
+	    {
+	      asection *first = elf_next_in_group (o);
+-	      o->gc_mark = first->gc_mark;
++	      if (first != NULL)
++	        o->gc_mark = first->gc_mark;
+	    }
+
+	  if (o->gc_mark)
diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff
new file mode 100644
index 000000000000..27592a8d0e87
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff
@@ -0,0 +1,26 @@
+Backported patch originally targeted against 2.45.
+--- a/binutils/debug.c
++++ b/binutils/debug.c
+@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info,
+     case DEBUG_KIND_UNION_CLASS:
+       return debug_write_class_type (info, fns, fhandle, type, tag);
+     case DEBUG_KIND_ENUM:
+-      if (type->u.kenum == NULL)
+-	return (*fns->enum_type) (fhandle, tag, (const char **) NULL,
+-				  (bfd_signed_vma *) NULL);
+       return (*fns->enum_type) (fhandle, tag, type->u.kenum->names,
+ 				type->u.kenum->values);
+     case DEBUG_KIND_POINTER:
+@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
+       break;
+
+     case DEBUG_KIND_ENUM:
+-      if (t1->u.kenum == NULL)
+-	ret = t2->u.kenum == NULL;
+-      else if (t2->u.kenum == NULL)
++      if (t1->u.kenum->names == NULL)
++	ret = t2->u.kenum->names == NULL;
++      else if (t2->u.kenum->names == NULL)
+ 	ret = false;
+       else
+ 	{
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 04e311bf38a1..706489915c3f 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -118,6 +118,14 @@ stdenv.mkDerivation (finalAttrs: {
     ./avr-size.patch
 
     ./windres-locate-gcc.patch
+
+    # Backported against CVE patched in the 2.45 series. See:
+    # https://nvd.nist.gov/vuln/detail/CVE-2025-5244
+    ./CVE-2025-5244.diff
+
+    # Backported against CVE patched in the 2.45 series. See:
+    # https://nvd.nist.gov/vuln/detail/CVE-2025-5245
+    ./CVE-2025-5245.diff
   ];
 
   outputs = [
@@ -201,7 +209,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [
     "format"
-    "pie"
   ];
 
   configurePlatforms = [
diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 3061968e2b71..abd83ca195a5 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -23,12 +23,16 @@ stdenv.mkDerivation {
     hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA=";
   };
 
-  postPatch =
+  postPatch = ''
+    substituteInPlace {clex,clang_delta,delta,unifdef,creduce,.}/CMakeLists.txt --replace-fail \
+    "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+  ''
+  +
     # On Linux, c-reduce's preferred way to reason about
     # the cpu architecture/topology is to use 'lscpu',
     # so let's make sure it knows where to find it:
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace creduce/creduce_utils.pm --replace \
+      substituteInPlace creduce/creduce_utils.pm --replace-fail \
         lscpu ${util-linux}/bin/lscpu
     '';
 
diff --git a/pkgs/development/tools/misc/cvise/default.nix b/pkgs/development/tools/misc/cvise/default.nix
index 332cf7aea9ec..bddf56345a9c 100644
--- a/pkgs/development/tools/misc/cvise/default.nix
+++ b/pkgs/development/tools/misc/cvise/default.nix
@@ -13,6 +13,8 @@
   pebble,
   psutil,
   pytestCheckHook,
+  testers,
+  cvise,
 }:
 
 buildPythonApplication rec {
@@ -78,6 +80,16 @@ buildPythonApplication rec {
     "test_simple_reduction"
   ];
 
+  passthru = {
+    tests = {
+      # basic syntax check
+      help-output = testers.testVersion {
+        package = cvise;
+        command = "cvise --version";
+      };
+    };
+  };
+
   meta = with lib; {
     homepage = "https://github.com/marxin/cvise";
     description = "Super-parallel Python port of C-Reduce";
diff --git a/pkgs/development/tools/misc/cvise/unifdef.patch b/pkgs/development/tools/misc/cvise/unifdef.patch
index d15ca6dce0bd..e584730d6146 100644
--- a/pkgs/development/tools/misc/cvise/unifdef.patch
+++ b/pkgs/development/tools/misc/cvise/unifdef.patch
@@ -1,6 +1,7 @@
---- a/cvise.py
-+++ b/cvise.py
-@@ -93,4 +93,5 @@ def find_external_programs():
+--- a/cvise/utils/externalprograms.py
++++ b/cvise/utils/externalprograms.py
+@@ -43,5 +43,6 @@ def find_external_programs():
+ 
      # Special case for clang-format
      programs['clang-format'] = '@CLANG_FORMAT_PATH@'
 +    programs['unifdef'] = '@UNIFDEF@'
diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix
index 786209cb74f4..f41b4324d6e9 100644
--- a/pkgs/development/tools/misc/edb/default.nix
+++ b/pkgs/development/tools/misc/edb/default.nix
@@ -53,6 +53,18 @@ stdenv.mkDerivation (finalAttrs: {
     # submodules were fetched and will throw an error if it's not there.
     # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic.
     mkdir -p src/qhexview/.git lib/gdtoa-desktop/.git
+
+    # CMake 3.1 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt src/CMakeLists.txt src/test/CMakeLists.txt plugins/CMakeLists.txt plugins/*/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.1)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/CMakeLists.txt lib/libELF/CMakeLists.txt lib/libPE/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.1)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/gdtoa-desktop/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
   '';
 
   passthru = {
diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix
index 0e707e4fdaee..4897a9b597cd 100644
--- a/pkgs/development/tools/ocaml/camlidl/default.nix
+++ b/pkgs/development/tools/ocaml/camlidl/default.nix
@@ -6,58 +6,55 @@
   writeText,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.03")
-  "camlidl is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-camlidl";
+  version = "1.12";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-camlidl";
-    version = "1.12";
+  src = fetchFromGitHub {
+    owner = "xavierleroy";
+    repo = "camlidl";
+    rev = "camlidl112";
+    hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "xavierleroy";
-      repo = "camlidl";
-      rev = "camlidl112";
-      hash = "sha256-ONPQMDFaU2OzFa5jgMVKx+ZRKk8ZgBZyk42vDvbM7E0=";
-    };
+  nativeBuildInputs = [ ocaml ];
 
-    nativeBuildInputs = [ ocaml ];
+  # build fails otherwise
+  enableParallelBuilding = false;
 
-    # build fails otherwise
-    enableParallelBuilding = false;
+  preBuild = ''
+    mv config/Makefile.unix config/Makefile
+    substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
+    substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl
+    substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp
+    substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config"
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml
+    mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs
+  '';
 
-    preBuild = ''
-      mv config/Makefile.unix config/Makefile
-      substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out
-      substituteInPlace config/Makefile --replace 'OCAMLLIB=$(shell $(OCAMLC) -where)' OCAMLLIB=$out/lib/ocaml/${ocaml.version}/site-lib/camlidl
-      substituteInPlace config/Makefile --replace CPP=cpp CPP=${stdenv.cc}/bin/cpp
-      substituteInPlace lib/Makefile --replace '$(OCAMLLIB)/Makefile.config' "${ocaml}/lib/ocaml/Makefile.config"
-      mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/caml
-      mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/camlidl/stublibs
-    '';
+  postInstall = ''
+    cat >$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <<EOF
+    # Courtesy of GODI
+    description = "Stub generator"
+    version = "${version}"
+    archive(byte) = "com.cma"
+    archive(native) = "com.cmxa"
+    EOF
+    mkdir -p $out/bin
+    ln -s $out/camlidl $out/bin
+  '';
 
-    postInstall = ''
-      cat >$out/lib/ocaml/${ocaml.version}/site-lib/camlidl/META <<EOF
-      # Courtesy of GODI
-      description = "Stub generator"
-      version = "${version}"
-      archive(byte) = "com.cma"
-      archive(native) = "com.cmxa"
-      EOF
-      mkdir -p $out/bin
-      ln -s $out/camlidl $out/bin
-    '';
+  setupHook = writeText "setupHook.sh" ''
+    export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
+    export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
+  '';
 
-    setupHook = writeText "setupHook.sh" ''
-      export NIX_CFLAGS_COMPILE+=" -isystem $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
-      export NIX_LDFLAGS+=" -L $1/lib/ocaml/${ocaml.version}/site-lib/camlidl"
-    '';
-
-    meta = {
-      description = "Stub code generator and COM binding for Objective Caml";
-      mainProgram = "camlidl";
-      homepage = "https://xavierleroy.org/camlidl/";
-      license = lib.licenses.lgpl21;
-      maintainers = [ lib.maintainers.roconnor ];
-    };
-  }
+  meta = {
+    description = "Stub code generator and COM binding for Objective Caml";
+    mainProgram = "camlidl";
+    homepage = "https://xavierleroy.org/camlidl/";
+    license = lib.licenses.lgpl21;
+    maintainers = [ lib.maintainers.roconnor ];
+    broken = !(lib.versionAtLeast ocaml.version "4.03");
+  };
+}
diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 4f6f0463e23f..38fd24135427 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -14,93 +14,83 @@
   legacy ? false,
 }:
 
-if lib.versionOlder ocaml.version "4.02" then
-  throw "camlp5 is not available for OCaml ${ocaml.version}"
-else
-
+stdenv.mkDerivation (
+  finalAttrs:
   let
-    params =
-      if lib.versionAtLeast ocaml.version "4.12" && !legacy then
-        rec {
-          version = "8.03.02";
-
-          src = fetchFromGitHub {
-            owner = "camlp5";
-            repo = "camlp5";
-            rev = version;
-            hash = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
-          };
-
-          nativeBuildInputs = [
-            makeWrapper
-            ocaml
-            findlib
-            perl
-          ];
-          buildInputs = [
-            bos
-            pcre2
-            re
-            rresult
-          ];
-          propagatedBuildInputs = [ camlp-streams ];
-          postInstall = ''
-            for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
-            do
-              wrapProgram $out/bin/$prog \
-                --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH"
-            done
-          '';
-
-        }
-      else
-        rec {
-          version = "7.14";
-          src = fetchFromGitHub {
-            owner = "camlp5";
-            repo = "camlp5";
-            rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
-            sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
-          };
-          nativeBuildInputs = [
-            ocaml
-            perl
-          ];
-        };
+    recent = lib.versionAtLeast (lib.versions.major finalAttrs.version) "8";
   in
+  {
 
-  stdenv.mkDerivation (
-    params
-    // {
+    version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.04.00" else "7.14";
 
-      pname = "ocaml${ocaml.version}-camlp5";
+    pname = "ocaml${ocaml.version}-camlp5";
 
-      strictDeps = true;
+    src = fetchFromGitHub {
+      owner = "camlp5";
+      repo = "camlp5";
+      tag =
+        if recent then
+          finalAttrs.version
+        else
+          "rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
+      hash =
+        {
+          "8.04.00" = "sha256-5IQVGm/tqEzXmZmSYGbGqX+KN9nQLQgw+sBP+F2keXo=";
+          "8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
+          "7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU=";
+        }
+        ."${finalAttrs.version}";
+    };
+    nativeBuildInputs = [
+      ocaml
+      perl
+    ]
+    ++ lib.optionals recent [
+      makeWrapper
+      findlib
+    ];
 
-      prefixKey = "-prefix ";
+    buildInputs = lib.optionals recent [
+      bos
+      pcre2
+      re
+      rresult
+    ];
 
-      preConfigure = ''
-        configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
-        patchShebangs ./config/find_stuffversion.pl etc/META.pl
+    propagatedBuildInputs = lib.optional recent camlp-streams;
+
+    strictDeps = true;
+
+    prefixKey = "-prefix ";
+
+    preConfigure = ''
+      configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
+      patchShebangs ./config/find_stuffversion.pl etc/META.pl tools/ ocaml_src/tools/
+    '';
+
+    buildFlags = [ "world.opt" ];
+
+    postInstall = lib.optionalString recent ''
+      for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
+      do
+        wrapProgram $out/bin/$prog \
+          --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH"
+      done
+    '';
+    dontStrip = true;
+
+    meta = {
+      broken =
+        lib.versionAtLeast ocaml.version "5.04" && !lib.versionAtLeast finalAttrs.version "8.04.00";
+      description = "Preprocessor-pretty-printer for OCaml";
+      longDescription = ''
+        Camlp5 is a preprocessor and pretty-printer for OCaml programs.
+        It also provides parsing and printing tools.
       '';
-
-      buildFlags = [ "world.opt" ];
-
-      dontStrip = true;
-
-      meta = with lib; {
-        description = "Preprocessor-pretty-printer for OCaml";
-        longDescription = ''
-          Camlp5 is a preprocessor and pretty-printer for OCaml programs.
-          It also provides parsing and printing tools.
-        '';
-        homepage = "https://camlp5.github.io/";
-        license = licenses.bsd3;
-        platforms = ocaml.meta.platforms or [ ];
-        maintainers = with maintainers; [
-          maggesi
-          vbgl
-        ];
-      };
-    }
-  )
+      homepage = "https://camlp5.github.io/";
+      license = lib.licenses.bsd3;
+      platforms = ocaml.meta.platforms or [ ];
+      maintainers = [ lib.maintainers.vbgl ];
+    };
+  }
+)
diff --git a/pkgs/development/tools/ocaml/dune/1.nix b/pkgs/development/tools/ocaml/dune/1.nix
index c05a03f2700d..112a78c2509a 100644
--- a/pkgs/development/tools/ocaml/dune/1.nix
+++ b/pkgs/development/tools/ocaml/dune/1.nix
@@ -7,40 +7,37 @@
   ncurses,
 }:
 
-if lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12" then
-  throw "dune 1 is not available for OCaml ${ocaml.version}"
-else
+stdenv.mkDerivation rec {
+  pname = "dune";
+  version = "1.11.4";
+  src = fetchurl {
+    url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
+    sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp";
+  };
 
-  stdenv.mkDerivation rec {
-    pname = "dune";
-    version = "1.11.4";
-    src = fetchurl {
-      url = "https://github.com/ocaml/dune/releases/download/${version}/dune-build-info-${version}.tbz";
-      sha256 = "1rkc8lqw30ifjaz8d81la6i8j05ffd0whpxqsbg6dci16945zjvp";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
+  buildInputs = [ ncurses ];
+  strictDeps = true;
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
-    buildInputs = [ ncurses ];
-    strictDeps = true;
+  buildFlags = [ "release" ];
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "LIBDIR=$(OCAMLFIND_DESTDIR)"
+  ];
 
-    buildFlags = [ "release" ];
-    makeFlags = [
-      "PREFIX=${placeholder "out"}"
-      "LIBDIR=$(OCAMLFIND_DESTDIR)"
-    ];
+  dontAddPrefix = true;
+  dontAddStaticConfigureFlags = true;
+  configurePlatforms = [ ];
 
-    dontAddPrefix = true;
-    dontAddStaticConfigureFlags = true;
-    configurePlatforms = [ ];
-
-    meta = with lib; {
-      homepage = "https://dune.build/";
-      description = "Composable build system";
-      maintainers = [ maintainers.vbgl ];
-      license = licenses.mit;
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    homepage = "https://dune.build/";
+    description = "Composable build system";
+    maintainers = [ maintainers.vbgl ];
+    license = licenses.mit;
+    broken = lib.versionOlder ocaml.version "4.02" || lib.versionAtLeast ocaml.version "4.12";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index 4efd7cba37ee..160ac54df903 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -91,7 +91,6 @@ stdenv.mkDerivation rec {
     homepage = "http://projects.camlcity.org/projects/findlib.html";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      maggesi
       vbmithr
     ];
     mainProgram = "ocamlfind";
diff --git a/pkgs/development/tools/ocaml/oasis/default.nix b/pkgs/development/tools/ocaml/oasis/default.nix
index 38a11db77626..9d42c8a36451 100644
--- a/pkgs/development/tools/ocaml/oasis/default.nix
+++ b/pkgs/development/tools/ocaml/oasis/default.nix
@@ -9,57 +9,52 @@
   ocamlify,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0") "oasis is not available for OCaml ≥ 5.0"
+stdenv.mkDerivation {
+  version = "0.4.11";
+  pname = "ocaml-oasis";
 
-  stdenv.mkDerivation
-  {
-    version = "0.4.11";
-    pname = "ocaml-oasis";
+  src = fetchurl {
+    url = "https://download.ocamlcore.org/oasis/oasis/0.4.11/oasis-0.4.11.tar.gz";
+    hash = "sha256-GLc97vTtbpqDM38ks7vi3tZSaLP/cwn8wA0l5X4dwS4=";
+  };
 
-    src = fetchurl {
-      url = "https://download.ocamlcore.org/oasis/oasis/0.4.11/oasis-0.4.11.tar.gz";
-      hash = "sha256-GLc97vTtbpqDM38ks7vi3tZSaLP/cwn8wA0l5X4dwS4=";
-    };
+  createFindlibDestdir = true;
 
-    createFindlibDestdir = true;
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+    ocamlbuild
+    ocamlmod
+    ocamlify
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-      ocamlbuild
-      ocamlmod
-      ocamlify
-    ];
+  buildInputs = [ ocamlbuild ];
 
-    buildInputs = [ ocamlbuild ];
+  configurePhase = ''
+    runHook preConfigure
+    ocaml setup.ml -configure --prefix $out
+    runHook postConfigure
+  '';
+  buildPhase = ''
+    runHook preBuild
+    ocaml setup.ml -build
+    runHook postBuild
+  '';
+  installPhase = ''
+    runHook preInstall
+    ocaml setup.ml -install
+    runHook postInstall
+  '';
 
-    configurePhase = ''
-      runHook preConfigure
-      ocaml setup.ml -configure --prefix $out
-      runHook postConfigure
-    '';
-    buildPhase = ''
-      runHook preBuild
-      ocaml setup.ml -build
-      runHook postBuild
-    '';
-    installPhase = ''
-      runHook preInstall
-      ocaml setup.ml -install
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "Configure, build and install system for OCaml projects";
-      homepage = "https://github.com/ocaml/oasis";
-      license = licenses.lgpl21;
-      maintainers = with maintainers; [
-        vbgl
-        maggesi
-      ];
-      mainProgram = "oasis";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "Configure, build and install system for OCaml projects";
+    homepage = "https://github.com/ocaml/oasis";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ vbgl ];
+    mainProgram = "oasis";
+    broken = lib.versionAtLeast ocaml.version "5.0";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
index 2057bb0c8f3e..1d91614bfb9b 100644
--- a/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-recovery-parser/default.nix
@@ -9,41 +9,38 @@
   gitUpdater,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "ocaml-recovery-parser is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "ocaml-recovery-parser";
+  version = "0.2.4";
 
-  buildDunePackage
-  rec {
-    pname = "ocaml-recovery-parser";
-    version = "0.2.4";
+  minimalOCamlVersion = "4.08";
+  duneVersion = "3";
 
-    minimalOCamlVersion = "4.08";
-    duneVersion = "3";
+  src = fetchFromGitHub {
+    owner = "serokell";
+    repo = pname;
+    rev = version;
+    sha256 = "gOKvjmlcHDOgsTllj2sPL/qNtW/rlNlEVIrosahNsAQ=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "serokell";
-      repo = pname;
-      rev = version;
-      sha256 = "gOKvjmlcHDOgsTllj2sPL/qNtW/rlNlEVIrosahNsAQ=";
-    };
+  propagatedBuildInputs = [
+    fix
+    menhirLib
+    menhirSdk
+  ];
 
-    propagatedBuildInputs = [
-      fix
-      menhirLib
-      menhirSdk
+  passthru.updateScript = gitUpdater { };
+
+  meta = with lib; {
+    description = "Simple fork of OCaml parser with support for error recovery";
+    homepage = "https://github.com/serokell/ocaml-recovery-parser";
+    license = with licenses; [
+      lgpl2Only
+      mit
+      mpl20
     ];
-
-    passthru.updateScript = gitUpdater { };
-
-    meta = with lib; {
-      description = "Simple fork of OCaml parser with support for error recovery";
-      homepage = "https://github.com/serokell/ocaml-recovery-parser";
-      license = with licenses; [
-        lgpl2Only
-        mit
-        mpl20
-      ];
-      maintainers = with maintainers; [ romildo ];
-      mainProgram = "menhir-recover";
-    };
-  }
+    maintainers = with maintainers; [ romildo ];
+    mainProgram = "menhir-recover";
+    broken = lib.versionAtLeast ocaml.version "5.0";
+  };
+}
diff --git a/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
index 03460b3b5548..5458c9bfbf9c 100644
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@@ -31,9 +31,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   strictDeps = true;
 
-  # x86_64-unknown-linux-musl-ld: -r and -pie may not be used together
-  hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
-
   configurePhase = ''
     runHook preConfigure
 
diff --git a/pkgs/development/tools/ocaml/ocamlify/default.nix b/pkgs/development/tools/ocaml/ocamlify/default.nix
index 08a301080554..b5a8987f5663 100644
--- a/pkgs/development/tools/ocaml/ocamlify/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlify/default.nix
@@ -25,9 +25,6 @@ buildDunePackage (finalAttrs: {
     homepage = "https://github.com/gildor478/ocamlify";
     description = "Include files in OCaml code";
     license = lib.licenses.lgpl21;
-    maintainers = with lib.maintainers; [
-      maggesi
-    ];
     mainProgram = "ocamlify";
   };
 })
diff --git a/pkgs/development/tools/ocaml/ocamlmod/default.nix b/pkgs/development/tools/ocaml/ocamlmod/default.nix
index 3f3f6bbe7f8b..f4b614db8db5 100644
--- a/pkgs/development/tools/ocaml/ocamlmod/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlmod/default.nix
@@ -25,9 +25,6 @@ buildDunePackage (finalAttrs: {
   meta = {
     homepage = "https://github.com/gildor478/ocamlmod";
     description = "Generate OCaml modules from source files";
-    maintainers = with lib.maintainers; [
-      maggesi
-    ];
     mainProgram = "ocamlmod";
   };
 })
diff --git a/pkgs/development/tools/ocaml/ocamlscript/default.nix b/pkgs/development/tools/ocaml/ocamlscript/default.nix
index fee5a45b3f5d..0527e70c16cc 100644
--- a/pkgs/development/tools/ocaml/ocamlscript/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlscript/default.nix
@@ -6,39 +6,36 @@
   findlib,
 }:
 
-lib.throwIfNot (lib.versionAtLeast ocaml.version "4.08")
-  "ocamlscript is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-ocamlscript";
+  version = "3.0.0";
+  src = fetchFromGitHub {
+    owner = "mjambon";
+    repo = "ocamlscript";
+    rev = "v${version}";
+    sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql";
+  };
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-ocamlscript";
-    version = "3.0.0";
-    src = fetchFromGitHub {
-      owner = "mjambon";
-      repo = "ocamlscript";
-      rev = "v${version}";
-      sha256 = "sha256:10xz8jknlmcgnf233nahd04q98ijnxpijhpvb8hl7sv94dgkvpql";
-    };
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
+  patches = [ ./Makefile.patch ];
 
-    patches = [ ./Makefile.patch ];
+  buildFlags = [ "PREFIX=$(out)" ];
+  installFlags = [ "PREFIX=$(out)" ];
 
-    buildFlags = [ "PREFIX=$(out)" ];
-    installFlags = [ "PREFIX=$(out)" ];
+  preInstall = "mkdir -p $out/bin";
+  createFindlibDestdir = true;
 
-    preInstall = "mkdir -p $out/bin";
-    createFindlibDestdir = true;
-
-    meta = with lib; {
-      inherit (src.meta) homepage;
-      license = licenses.boost;
-      inherit (ocaml.meta) platforms;
-      description = "Natively-compiled OCaml scripts";
-      maintainers = [ maintainers.vbgl ];
-      mainProgram = "ocamlscript";
-    };
-  }
+  meta = with lib; {
+    inherit (src.meta) homepage;
+    license = licenses.boost;
+    inherit (ocaml.meta) platforms;
+    description = "Natively-compiled OCaml scripts";
+    maintainers = [ maintainers.vbgl ];
+    mainProgram = "ocamlscript";
+    broken = !(lib.versionAtLeast ocaml.version "4.08");
+  };
+}
diff --git a/pkgs/development/tools/ocaml/ocp-browser/default.nix b/pkgs/development/tools/ocaml/ocp-browser/default.nix
new file mode 100644
index 000000000000..f9b737814193
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocp-browser/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  cppo,
+  ocp-index,
+  cmdliner,
+  re,
+  lambda-term,
+  zed,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "ocp-browser";
+  version = "1.4.0";
+
+  minimalOCamlVersion = "4.08";
+
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-index";
+    tag = finalAttrs.version;
+    hash = "sha256-pv6aBJjRkibISpZEnlfyn72smcYEbZoPQoQH2p/JwH0=";
+  };
+
+  nativeBuildInputs = [ cppo ];
+  propagatedBuildInputs = [
+    cmdliner
+    lambda-term
+    ocp-index
+    re
+    zed
+  ];
+
+  meta = {
+    homepage = "https://github.com/OCamlPro/ocp-index";
+    description = "Console browser for the documentation of installed OCaml libraries";
+    changelog = "https://github.com/OCamlPro/ocp-index/raw/${finalAttrs.version}/CHANGES.md";
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ redianthus ];
+    mainProgram = "ocp-browser";
+  };
+})
diff --git a/pkgs/development/tools/ocaml/ocp-build/default.nix b/pkgs/development/tools/ocaml/ocp-build/default.nix
index d7d780d1a6d5..ddca215607cf 100644
--- a/pkgs/development/tools/ocaml/ocp-build/default.nix
+++ b/pkgs/development/tools/ocaml/ocp-build/default.nix
@@ -10,55 +10,52 @@
   re,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.0")
-  "ocp-build is not available for OCaml ${ocaml.version}"
+stdenv.mkDerivation rec {
+  pname = "ocaml${ocaml.version}-ocp-build";
+  version = "1.99.21";
 
-  stdenv.mkDerivation
-  rec {
-    pname = "ocaml${ocaml.version}-ocp-build";
-    version = "1.99.21";
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-build";
+    rev = "v${version}";
+    sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9";
+  };
 
-    src = fetchFromGitHub {
-      owner = "OCamlPro";
-      repo = "ocp-build";
-      rev = "v${version}";
-      sha256 = "1641xzik98c7xnjwxpacijd6d9jzx340fmdn6i372z8h554jjlg9";
-    };
+  patches = [
+    # Fix compilation with OCaml 4.12
+    (fetchpatch {
+      url = "https://github.com/OCamlPro/ocp-build/commit/104e4656ca6dba9edb03b62539c9f1e10abcaae8.patch";
+      sha256 = "0sbyi4acig9q8x1ky4hckfg5pm2nad6zasi51ravaf1spgl148c2";
+    })
+  ];
 
-    patches = [
-      # Fix compilation with OCaml 4.12
-      (fetchpatch {
-        url = "https://github.com/OCamlPro/ocp-build/commit/104e4656ca6dba9edb03b62539c9f1e10abcaae8.patch";
-        sha256 = "0sbyi4acig9q8x1ky4hckfg5pm2nad6zasi51ravaf1spgl148c2";
-      })
-    ];
+  strictDeps = true;
 
-    strictDeps = true;
+  nativeBuildInputs = [
+    ocaml
+    findlib
+  ];
+  buildInputs = [
+    cmdliner_1_0
+    re
+  ];
+  propagatedBuildInputs = [ ncurses ];
+  preInstall = "mkdir -p $out/bin";
 
-    nativeBuildInputs = [
-      ocaml
-      findlib
-    ];
-    buildInputs = [
-      cmdliner_1_0
-      re
-    ];
-    propagatedBuildInputs = [ ncurses ];
-    preInstall = "mkdir -p $out/bin";
-
-    meta = with lib; {
-      description = "Build tool for OCaml";
-      longDescription = ''
-        ocp-build is a build system for OCaml application, based on simple
-        descriptions of packages. ocp-build combines the descriptions of
-        packages, and optimize the parallel compilation of files depending on
-        the number of cores and the automatically-inferred dependencies
-        between source files.
-      '';
-      homepage = "https://www.typerex.org/ocp-build.html";
-      license = licenses.gpl3;
-      maintainers = [ maintainers.jirkamarsik ];
-      mainProgram = "ocp-build";
-      inherit (ocaml.meta) platforms;
-    };
-  }
+  meta = with lib; {
+    description = "Build tool for OCaml";
+    longDescription = ''
+      ocp-build is a build system for OCaml application, based on simple
+      descriptions of packages. ocp-build combines the descriptions of
+      packages, and optimize the parallel compilation of files depending on
+      the number of cores and the automatically-inferred dependencies
+      between source files.
+    '';
+    homepage = "https://www.typerex.org/ocp-build.html";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.jirkamarsik ];
+    mainProgram = "ocp-build";
+    broken = lib.versionAtLeast ocaml.version "5.0";
+    inherit (ocaml.meta) platforms;
+  };
+}
diff --git a/pkgs/development/tools/ocaml/reanalyze/default.nix b/pkgs/development/tools/ocaml/reanalyze/default.nix
index 1882e15a084a..c2e145cfc1f8 100644
--- a/pkgs/development/tools/ocaml/reanalyze/default.nix
+++ b/pkgs/development/tools/ocaml/reanalyze/default.nix
@@ -6,30 +6,27 @@
   cppo,
 }:
 
-lib.throwIf (lib.versionAtLeast ocaml.version "5.3")
-  "reanalyze is not available for OCaml ${ocaml.version}"
+buildDunePackage rec {
+  pname = "reanalyze";
+  version = "2.25.1";
 
-  buildDunePackage
-  rec {
-    pname = "reanalyze";
-    version = "2.25.1";
+  minimalOCamlVersion = "4.08";
 
-    minimalOCamlVersion = "4.08";
+  src = fetchFromGitHub {
+    owner = "rescript-lang";
+    repo = "reanalyze";
+    tag = "v${version}";
+    hash = "sha256-cM39Gk4Ko7o/DyhrzgEHilobaB3h91Knltkcv2sglFw=";
+  };
 
-    src = fetchFromGitHub {
-      owner = "rescript-lang";
-      repo = "reanalyze";
-      tag = "v${version}";
-      hash = "sha256-cM39Gk4Ko7o/DyhrzgEHilobaB3h91Knltkcv2sglFw=";
-    };
+  nativeBuildInputs = [ cppo ];
 
-    nativeBuildInputs = [ cppo ];
-
-    meta = {
-      description = "Program analysis for ReScript and OCaml projects";
-      homepage = "https://github.com/rescript-lang/reanalyze/";
-      changelog = "https://github.com/rescript-lang/reanalyze/blob/v${version}/Changes.md";
-      license = lib.licenses.mit;
-      maintainers = [ lib.maintainers.vbgl ];
-    };
-  }
+  meta = {
+    description = "Program analysis for ReScript and OCaml projects";
+    homepage = "https://github.com/rescript-lang/reanalyze/";
+    changelog = "https://github.com/rescript-lang/reanalyze/blob/v${version}/Changes.md";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.vbgl ];
+    broken = lib.versionAtLeast ocaml.version "5.3";
+  };
+}
diff --git a/pkgs/development/tools/parsing/antlr/4.10.runtime.cpp.cmake.patch b/pkgs/development/tools/parsing/antlr/4.10.runtime.cpp.cmake.patch
new file mode 100644
index 000000000000..9dcb2aeb7833
--- /dev/null
+++ b/pkgs/development/tools/parsing/antlr/4.10.runtime.cpp.cmake.patch
@@ -0,0 +1,20 @@
+diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt
+index 302cd4a78..336a37bf0 100644
+--- a/runtime/Cpp/CMakeLists.txt
++++ b/runtime/Cpp/CMakeLists.txt
+@@ -30,15 +30,10 @@ project(LIBANTLR4)
+ if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
+    CMAKE_VERSION VERSION_GREATER "3.0.0")
+   CMAKE_POLICY(SET CMP0026 NEW)
+-  CMAKE_POLICY(SET CMP0054 OLD)
+-  CMAKE_POLICY(SET CMP0045 OLD)
+-  CMAKE_POLICY(SET CMP0042 OLD)
+ endif()
+ 
+ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR
+    CMAKE_VERSION VERSION_GREATER "3.3.0")
+-  CMAKE_POLICY(SET CMP0059 OLD)
+-  CMAKE_POLICY(SET CMP0054 OLD)
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/pkgs/development/tools/parsing/antlr/4.11.runtime.cpp.cmake.patch b/pkgs/development/tools/parsing/antlr/4.11.runtime.cpp.cmake.patch
new file mode 100644
index 000000000000..6c40a1bf9633
--- /dev/null
+++ b/pkgs/development/tools/parsing/antlr/4.11.runtime.cpp.cmake.patch
@@ -0,0 +1,20 @@
+diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt
+index df621b11d..c20b92170 100644
+--- a/runtime/Cpp/CMakeLists.txt
++++ b/runtime/Cpp/CMakeLists.txt
+@@ -39,15 +39,10 @@ project(LIBANTLR4)
+ if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
+    CMAKE_VERSION VERSION_GREATER "3.0.0")
+   CMAKE_POLICY(SET CMP0026 NEW)
+-  CMAKE_POLICY(SET CMP0054 OLD)
+-  CMAKE_POLICY(SET CMP0045 OLD)
+-  CMAKE_POLICY(SET CMP0042 OLD)
+ endif()
+ 
+ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR
+    CMAKE_VERSION VERSION_GREATER "3.3.0")
+-  CMAKE_POLICY(SET CMP0059 OLD)
+-  CMAKE_POLICY(SET CMP0054 OLD)
+ endif()
+ 
+ if(APPLE)
diff --git a/pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch b/pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch
new file mode 100644
index 000000000000..979e224756e6
--- /dev/null
+++ b/pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch
@@ -0,0 +1,20 @@
+diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt
+index e549f113f..c84f591c2 100644
+--- a/runtime/Cpp/CMakeLists.txt
++++ b/runtime/Cpp/CMakeLists.txt
+@@ -28,15 +28,10 @@ project(LIBANTLR4)
+ if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
+    CMAKE_VERSION VERSION_GREATER "3.0.0")
+   CMAKE_POLICY(SET CMP0026 NEW)
+-  CMAKE_POLICY(SET CMP0054 OLD)
+-  CMAKE_POLICY(SET CMP0045 OLD)
+-  CMAKE_POLICY(SET CMP0042 OLD)
+ endif()
+ 
+ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR
+    CMAKE_VERSION VERSION_GREATER "3.3.0")
+-  CMAKE_POLICY(SET CMP0059 OLD)
+-  CMAKE_POLICY(SET CMP0054 OLD)
+ endif()
+ 
+ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix
index c30d235c4f8e..0352698f42f4 100644
--- a/pkgs/development/tools/parsing/antlr/4.nix
+++ b/pkgs/development/tools/parsing/antlr/4.nix
@@ -86,6 +86,7 @@ let
           sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
           license = lib.licenses.bsd3;
           platforms = lib.platforms.unix;
+          maintainers = with lib.maintainers; [ sarahec ];
         };
       };
 
@@ -119,6 +120,7 @@ let
             homepage = "https://www.antlr.org/";
             license = lib.licenses.bsd3;
             platforms = lib.platforms.unix;
+            maintainers = with lib.maintainers; [ sarahec ];
           };
         };
       };
@@ -172,6 +174,9 @@ in
         # not available in a sandboxed build.
         (lib.cmakeBool "ANTLR_BUILD_CPP_TESTS" false)
       ];
+      extraPatches = [
+        ./4.11.runtime.cpp.cmake.patch
+      ];
     }).antlr;
 
   antlr4_10 =
@@ -184,6 +189,9 @@ in
         (lib.cmakeBool "ANTLR4_INSTALL" true)
         (lib.cmakeBool "ANTLR_BUILD_CPP_TESTS" false)
       ];
+      extraPatches = [
+        ./4.10.runtime.cpp.cmake.patch
+      ];
     }).antlr;
 
   antlr4_9 =
@@ -194,20 +202,11 @@ in
       extraCppBuildInputs = [ utf8cpp ] ++ lib.optional stdenv.hostPlatform.isLinux libuuid;
       extraCppCmakeFlags = [
         (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev utf8cpp}/include/utf8cpp")
+        (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
       ];
       extraPatches = [
         ./utf8cpp.patch
-      ];
-    }).antlr;
-
-  antlr4_8 =
-    (mkAntlr {
-      version = "4.8";
-      sourceSha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m";
-      jarSha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k";
-      extraCppBuildInputs = lib.optional stdenv.hostPlatform.isLinux libuuid;
-      extraCppCmakeFlags = [
-        (lib.cmakeBool "ANTLR4_INSTALL" true)
+        ./4.9.runtime.cpp.cmake.patch
       ];
     }).antlr;
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 542d0ac8be25..69f72f57d4e2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -30,8 +30,8 @@ let
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
   # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
   # 4) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.25.6";
-  hash = "sha256-2/DF2xyiKi5HAqqeGt1TIMvAWFfZgcfVccK4zrTqq88=";
+  version = "0.25.10";
+  hash = "sha256-aHszbvLCLqCwAS4F4UmM3wbSb81QuG9FM7BDHTu1ZvM=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -171,7 +171,7 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  cargoHash = "sha256-sGh16M7cbT5ct1sT2FcUUoIQFcoOftTuQ0aSCjtkTEs=";
+  cargoHash = "sha256-4R5Y9yancbg/w3PhACtsWq0+gieUd2j8YnmEj/5eqkg=";
 
   buildInputs = [
     installShellFiles
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index b16e98289a50..ed605f2436b2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -109,6 +109,7 @@
   tree-sitter-tera = lib.importJSON ./tree-sitter-tera.json;
   tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
   tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
+  tree-sitter-todotxt = lib.importJSON ./tree-sitter-todotxt.json;
   tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json;
   tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;
   tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
index 36bccb90e009..2e65733a096f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/polarmutex/tree-sitter-beancount",
-  "rev": "321b12d0b02923c36e8cd9768afe6db5ced98e33",
-  "date": "2024-07-19T21:09:17-04:00",
-  "path": "/nix/store/v8yv84fm0n134mr5vmwbpr4cpyl71vxz-tree-sitter-beancount",
-  "sha256": "1milrdb8ka5vkypl0b44xgfdn0haydg2fz7489djcwpjkx7gfrsg",
-  "hash": "sha256-T2f3Tp/yciZbQuR8J17zCgLb3OuELECvn7uoiVbLNNY=",
+  "rev": "07bfb0ec6d9e255d776cdd3362128364d2b0bb2f",
+  "date": "2025-07-20T21:33:46-04:00",
+  "path": "/nix/store/7q88wczdhi0ralm2fzdz7y42mxnsc34c-tree-sitter-beancount",
+  "sha256": "0r2ql0n4wkwbcdjpklxhsk91xm8q8dl9n9rdlqk585xagmxf1w4b",
+  "hash": "sha256-i/Dgen2qF1Qmpi0nm2hDGNUe0tSw03llY4tPTiygWGQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
index 582ed02c1412..cb8c9dbc93db 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
index 65414bf90a02..13bb6ec8a2e4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index b29372cbc061..9d898a553715 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
index e38432e27045..47467756a54b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-clojure",
-  "rev": "40c5fc2e2a0f511a802a82002553c5de00feeaf4",
-  "date": "2025-05-26T17:10:02+09:00",
-  "path": "/nix/store/lkzsixjxwr6b2gwxsba0qah3k121axgi-tree-sitter-clojure",
-  "sha256": "163jm1qgrh9ha1xbjlbkcffcxkdbhsvj5kplknq4gcb080wlp6dp",
-  "hash": "sha256-t5lLOUBgsUewnfTOIreGq83OnGNzUbl6UDDB/HCocpg=",
+  "rev": "e43eff80d17cf34852dcd92ca5e6986d23a7040f",
+  "date": "2025-08-26T15:59:05+09:00",
+  "path": "/nix/store/gpvw9wn3mg5j7mzj91qvkxm8l5rlgid6-tree-sitter-clojure",
+  "sha256": "0bmclmbjk58w8092q52yra5axrr3q22v73yva9wvqh5fif81x2cf",
+  "hash": "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index 07b7b433cd5a..419cfe5c0ca4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
index a13d53821c8c..3b056e466f03 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index b62ff93df2c3..ddee6bf64d8d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
index eb5e7cb50ed3..0085e157c80f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
@@ -1,12 +1,14 @@
 {
   "url": "https://github.com/crystal-lang-tools/tree-sitter-crystal",
-  "rev": "cf69a6504a82fecc55ee1680983744a94a9edfaa",
-  "date": "2025-03-28T11:48:18-04:00",
-  "path": "/nix/store/c20hqk12him4k0675y3l5f53lfnaa37d-tree-sitter-crystal",
-  "sha256": "0jzmkjfhrz1f5pw274dj0f7avazsyhx0h6vbg4p5xxzkqch19wah",
-  "hash": "sha256-UPEUIMPz914ueWsbCDr0+qutjgOykSP4LS78DJ2c9Us=",
+  "rev": "f0ada43161f77d5bad18c4ce0b21d1dc9310e408",
+  "date": "2025-09-08T23:42:35-04:00",
+  "path": "/nix/store/q97l67605207fyavx1kdsnfylf49aj44-tree-sitter-crystal",
+  "sha256": "0j3xb6j67v4i4wdn14y1ac2004r71v4m0r01qfzhfv4cqwad3lz4",
+  "hash": "sha256-5NPRFMeMbAe/wwFkUMkOJxMABFPBk2AbJ5HsY6RZfUg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "fetchTags": false,
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index e9e4a52ddf0c..4054f5f8b63a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
index 36413eb77f40..753f05604b87 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-cuda",
-  "rev": "014628ae8d2df391b88ddb9fa0260fd97f770829",
-  "date": "2025-03-16T17:20:16+01:00",
-  "path": "/nix/store/w0cl4ga4bis992vyfmj8l0pq385z0cka-tree-sitter-cuda",
-  "sha256": "1qyh00rapch29czvnqs3364bx0bi4gyapfxb0v8m4r2m8kybnlff",
-  "hash": "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM=",
+  "rev": "48b066f334f4cf2174e05a50218ce2ed98b6fd01",
+  "date": "2025-09-18T22:53:12+02:00",
+  "path": "/nix/store/01cw4243h6xyhg6nn8fgz7gjajkh0hjg-tree-sitter-cuda",
+  "sha256": "116fa26bjh6a88kdshqq5hp6fq4ik95dpaiidw8rn90xxwwl0zxi",
+  "hash": "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
index f98691b115b0..96ddd49800cf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index d3424c21a17a..f65fae97f629 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
index 069c8263f262..fe826138a3e0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
index 045280a60371..def7d28b4a6b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
index 10d9408ec72d..96e220464cd5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
index 945336f543ac..9117f8c0ae71 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
index 799c8f70ca52..0e7efcc84c04 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
index 0a784c3ab43b..b8eb1a40bfe2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
index ea4fd28a9576..5af61d399026 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
index a0163c06c5fb..4ff1421304f5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index c60ca6e00877..6c6e366f9c6c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "332262529bc51abf5746317b2255ccc2fff778f8",
-  "date": "2024-11-11T01:51:07-05:00",
-  "path": "/nix/store/qfrdm02qnlllw3ric8pyv5gs0ahwnlbl-tree-sitter-embedded-template",
-  "sha256": "1vq9dywd9vcy59f6i5mk5n7vwk67g8j5x77czg7avpznskgfhqhb",
-  "hash": "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8=",
+  "rev": "c70c1de07dedd532089c0c90835c8ed9fa694f5c",
+  "date": "2025-08-28T20:40:04-04:00",
+  "path": "/nix/store/l73zsvkpnrjpzncpwb4qcvhgqvx5zd35-tree-sitter-embedded-template",
+  "sha256": "0w1vkk1m2a52nqqx7agwcik7kbdb6bwpw18479inswqbgn51l54w",
+  "hash": "sha256-nBQain0Lc21jOgQFfvkyq615ZmT8qdMxtqIoUcOcO3A=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
index 72ac83411a6e..1aac15dac9f8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
index 5d8bd9e2b65d..c7cde5b69b2d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
index 5364cadfcc4c..bc474c396b55 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/travonted/tree-sitter-fennel",
-  "rev": "15e4f8c417281768db17080c4447297f8ff5343a",
-  "date": "2024-02-02T09:37:06-05:00",
-  "path": "/nix/store/cjqnj1i2z7s3xwivba9vgpqrs0lcinil-tree-sitter-fennel",
-  "sha256": "059avw3yhadqbfallflc5xxfzla81d5mc9wrc3ag09xj5w6n1n05",
-  "hash": "sha256-BdhgDS+yJ/DUYJknVksLSNHvei+MOkqVW7gp6AffKhU=",
+  "rev": "36eb796a84b4f57bdf159d0a99267260d4960c89",
+  "date": "2025-09-06T23:17:11-04:00",
+  "path": "/nix/store/jz4l1j6yy6ly6pgjhmjrqq0lhab1gb8l-tree-sitter-fennel",
+  "sha256": "0pg76nby16i7wvvhc9n7ahbg4l4rlldzw7ggm8szlxx40lz16mv8",
+  "hash": "sha256-aFcTPgWkd/o1qu8d/hulmVDyFlTHJgb35iea4Jc1510=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
index 907447c4ab30..a6744378376d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/ram02z/tree-sitter-fish",
-  "rev": "70640c0696abde32622afc43291a385681afbd32",
-  "date": "2025-01-18T10:06:56Z",
-  "path": "/nix/store/f3yngwj4xrr9v6nchnl9sj3q7bx2463y-tree-sitter-fish",
-  "sha256": "12gga8gm7dyfa6srvi5sympszy647qcw7a9warrld5z71vgziv3p",
-  "hash": "sha256-d+z43w7nl0ZzVjypwxk+xPivb/W6xJ21Uc63Ux9S74k=",
+  "rev": "aa074a0bacde8b5823c592574d7138f156a95776",
+  "date": "2025-06-13T20:17:14+01:00",
+  "path": "/nix/store/8z4vmmfhxbc529rkjs84aij12xa8ag1w-tree-sitter-fish",
+  "sha256": "1l8qmmligfcpf4amqghdv9c4nvs5wbhiifhl7016l7793rfzl235",
+  "hash": "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
index 5091a489397e..45f484e3fa86 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/prestonknopp/tree-sitter-gdscript",
-  "rev": "e964ce912b5b835f1caedb600df9d5be77e803a8",
-  "date": "2025-05-14T11:22:28-07:00",
-  "path": "/nix/store/ab2prhn6ckp7kyfnxnymx8zvbna4jda2-tree-sitter-gdscript",
-  "sha256": "19rdpyd05x29b7isv8jnc8jlawlpzh91b11yggiqgjz6il0vkdww",
-  "hash": "sha256-nLe5AY3my4fjez6EFRL8l3JFJWJWoq3jWUn0Apq/Lac=",
+  "rev": "c370d711dc9ead679d40bb7e9364ceed0b3bfc28",
+  "date": "2025-07-17T11:29:39-07:00",
+  "path": "/nix/store/yzmn7h0mqpphjnwmrnnrijz6dmhl2rmq-tree-sitter-gdscript",
+  "sha256": "0qma5ffmfwh81dk4wafz9qqkqw6pyk18bg20sg70v7s3r7m0bq2b",
+  "hash": "sha256-S+AF6slDnw3O00C8hcL013A8MU7fKU5mCwhyV50rqmI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
index e63a56c69a16..f4206540b737 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
index 1f4c1e5ab620..c8455e82214d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/gleam-lang/tree-sitter-gleam",
-  "rev": "6ece453acf8b14568c10f629f8cd25d3dde3794f",
-  "date": "2025-05-17T12:51:15Z",
-  "path": "/nix/store/aahaa06y7w5in76pfp787k5gyamx7599-tree-sitter-gleam",
-  "sha256": "00f481cjn1mz0319jq89775a81nlmqnkc6fvv3qblpiq37fplzcz",
-  "hash": "sha256-n3163Rk4Xrrw2NsZNi2u1AakyjkJYZnCAL8GK1lAxAE=",
+  "rev": "dae1551a9911b24f41d876c23f2ab05ece0a9d4c",
+  "date": "2025-07-21T17:56:49Z",
+  "path": "/nix/store/v0dwdaqlr17b6jry9ysd15m342ha8hxb-tree-sitter-gleam",
+  "sha256": "0d7z5bk6x0qi3wy4d8174a69wxsc4287c7fcdfabkn8dixpa920q",
+  "hash": "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
index 83e5e7b9c1c4..2c04f80d2f1e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
index adb5bb72ba90..2263a37af864 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
index 4032f124945d..1ea8ff82bfa9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/ngalaiko/tree-sitter-go-template",
-  "rev": "5f19a36bb1eebb30454e277b222b278ceafed0dd",
-  "date": "2025-01-29T18:19:22Z",
-  "path": "/nix/store/lcgn1hzzsf5jhliy7454lxx7phkmrjfb-tree-sitter-go-template",
-  "sha256": "1nm9ybwb4if6g7cs911i6msb3q2f1plbl70k2y4icbxk2p57k5ka",
-  "hash": "sha256-apZ5yhWzLxaJFxMcuugNTuCxdDUxhKTZecZFsvjyqdo=",
+  "rev": "65f4f86c3aaa9dabab36e3482584e8a111cf7db1",
+  "date": "2025-08-23T12:29:37Z",
+  "path": "/nix/store/f5palcms6bafi6yc77z2yqa3yhb0pbhz-tree-sitter-go-template",
+  "sha256": "1wf0fswkd1fd2f0x6xz2qqvr7sdyz3h93vac9z6jad41sqx4w9md",
+  "hash": "sha256-rSZOOtaBNCXNT0ztkeD4vumTN8bid9OBE82FNrl2wPE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index db3cc5ace052..bff23a280218 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "3c3775faa968158a8b4ac190a7fda867fd5fb748",
-  "date": "2024-11-24T14:34:38-05:00",
-  "path": "/nix/store/zqi5mm5lx2jq40650gljdvn3sq0y34c1-tree-sitter-go",
-  "sha256": "0yi8if9mqzzcs4qflflz90hhaxkzlq54wia3s0iiqzfqxk24a61g",
-  "hash": "sha256-LxhFxOzYfRwj0ENFTgqmf3YFIUifOuow0ex/XJOLKHo=",
+  "rev": "1547678a9da59885853f5f5cc8a99cc203fa2e2c",
+  "date": "2025-08-29T02:17:40-04:00",
+  "path": "/nix/store/nb47mmxl1lwd2bgnv8w1m7zr04rpp326-tree-sitter-go",
+  "sha256": "0ag5cksnvrb8fg7b05pg1rq31sv6l8k985bk7qrzg91j7w8x7dnb",
+  "hash": "sha256-y7bTET8ypPczPnMVlCaiZuswcA7vFrDOc2jlbfVk5Sk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
index dded3a02e446..cb0e4e446359 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
index fdb0a4efeb8c..e03e7b89f738 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
index 92cff1e75067..4e5d2de4853c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
index 55c44102e945..f90c78ea33f1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 15f39a70a440..a78b0c4fe7e1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
index af406a845f16..9ac36a85bcb3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
index e4c8d8263c4e..80b0b2a1f471 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
index 23a679566782..57e69ad93101 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
index 2e05e32a1b6d..66a8fdf28dfa 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
index 0687cb404e24..99fa73b63fb5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
index b7aed2572e37..adad6e67b406 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index a0290d215193..964acc360643 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "3a837b6f3658ca3618f2022f8707e29739c91364",
-  "date": "2024-11-10T00:38:27-05:00",
-  "path": "/nix/store/hpvzw8l06lbvxsh0szkj44gshiqrjb02-tree-sitter-javascript",
-  "sha256": "03v1gpr5lnifrk4lns690fviid8p02wn7hfdwp3ynp7lh1cid63a",
-  "hash": "sha256-apgWWYD0XOvH5c3BY7kAF7UYtwPJaEvJzC5aWvJ9YQ8=",
+  "rev": "44c892e0be055ac465d5eeddae6d3e194424e7de",
+  "date": "2025-09-01T03:10:57-04:00",
+  "path": "/nix/store/l0h8gv70fj33dqcpkpclbv0khjgnhk8z-tree-sitter-javascript",
+  "sha256": "1qdjpfxw9z1icx3jc3k006yj76lcqydkvbk4ji3wk4xy854zz66q",
+  "hash": "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index 5153927b22df..a3d1f78d20cd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
-  "rev": "b253abf68a73217b7a52c0ec254f4b6a7bb86665",
-  "date": "2024-11-11T01:54:33-05:00",
-  "path": "/nix/store/w2hks666pc8yb031ydclz0qn7k0qsfa1-tree-sitter-jsdoc",
-  "sha256": "0vpvy5hnnr9l4ggii6fp6svv35l659b3n13028dzq0b363dxng03",
-  "hash": "sha256-Azzb2zBjAfwbEmAEO1YqhpaxtzbXmRjfIzRla2Hx+24=",
+  "rev": "658d18dcdddb75c760363faa4963427a7c6b52db",
+  "date": "2025-09-13T00:24:14-04:00",
+  "path": "/nix/store/l7zh6vli87n3bj7cq9lnfklkcwsay1am-tree-sitter-jsdoc",
+  "sha256": "1qrgan1xpj717qmwdbgb3lqjgffyhsw0qxhjwhdhqfv2lgkw4cn6",
+  "hash": "sha256-xjLC56NiOwwb5BJ2DLiG3rknMR3rrcYrPuHI24NVL+M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 10187c1f9699..ea3673775726 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
index 28f4996486d0..5c8bcfa51b89 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/joakker/tree-sitter-json5",
-  "rev": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd",
-  "date": "2024-04-30T19:40:01-04:00",
-  "path": "/nix/store/3ag1lv1h8wg3cvbjbigyqmvqr0jy1i48-tree-sitter-json5",
-  "sha256": "0n33v04d5q79j1qp1l26ygfqywl7vxfam38dap78g6i7ys78581d",
-  "hash": "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g=",
+  "rev": "8cb4114a4d7e5bab75d74466422e032de31d83df",
+  "date": "2025-09-20T19:19:04-03:00",
+  "path": "/nix/store/gmjjsjdj4xrkw89zq1asva5pdw455dnd-tree-sitter-json5",
+  "sha256": "0ckxr80dbzaxkasn9dldwcl0klkyxs8kiiqibk82y9mx8x2ymz21",
+  "hash": "sha256-QfzqRUe9Ji/QXBHHOJHuftIJKOONtmS1ml391QDKfTI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
index a8bd511ad98b..5194ddd86da7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index 2d0e55210dca..c38a9d18fead 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 961b173484ff..b84d6322d66f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
index e218e748c0ad..78b834fb5824 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
index ce53103c667c..7a61e28411f1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/mtoohey31/tree-sitter-koka",
-  "rev": "33c333f7ff4cac4138c0786198481b33d2880656",
-  "date": "2025-01-26T11:30:06-05:00",
-  "path": "/nix/store/dh0v9y2qc9dz8lqqpspnwbxvpikfjzpv-tree-sitter-koka",
-  "sha256": "12vr8xdsy8gpgwzcnvc2p5mzd4fsgv0lgqdwmzhs1b9hy7bvdkd6",
-  "hash": "sha256-ps221/EwraDhr7zhR8F+2pH2a7mCbcs+f/chr1tHeYs=",
+  "rev": "6dce132911ac375ac1a3591c868c47a2a84b30aa",
+  "date": "2025-07-26T15:26:41-04:00",
+  "path": "/nix/store/xvk32hz6j2yidxq4sj78phs4i1mqlwv8-tree-sitter-koka",
+  "sha256": "1l50l8m3ql2j6q772pgb8x3v1awvng12fd9rpv6p3cva1mg9ywj1",
+  "hash": "sha256-QXKfXg1qs3HNvjk1J8Kzm6uwR0frXXEONlJQPCqioNA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
index 8b67459fe23d..304b38c8f162 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
index 810b0acc9964..87bac66f83d0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/latex-lsp/tree-sitter-latex",
-  "rev": "a834712c5e04029a451a262456bf6290b8ef6f37",
-  "date": "2024-04-01T14:31:04+02:00",
-  "path": "/nix/store/kn3vkfnysm170wc1dbjmb5y69hdlmyb4-tree-sitter-latex",
-  "sha256": "18dyda7299imb6i2jnjpr7z2jdrjn804c3958nkkpxzzfhbq39h7",
-  "hash": "sha256-B6aBF3T/9zunRSUNRgCyMjcp/slXWimiWTWmJI5qvqE=",
+  "rev": "7e0ecdc02926c7b9b2e0c76003d4fe7b0944f957",
+  "date": "2025-09-19T09:03:38+02:00",
+  "path": "/nix/store/jn7pw9992kbriq3z7nv27jh9yknqjsfq-tree-sitter-latex",
+  "sha256": "0sxxydq0lmfybvwfkzkvy5mp8hyqmadpl6pqxwqb5h6s44wnkgcx",
+  "hash": "sha256-nb1pOSHawLIw7/gaepuq2EN0a/F7/un4Xt5VCnDzvWs=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
index 24ea0a0a6df7..840281cc9ac5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index 6b29c432c482..443c60090119 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
index 5fa65cec3ea8..46a604c4a472 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
index fc5819800286..c9793de08e6c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
index 13d0c4d6e287..4e96fa190a1e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 3db68fc6a0a6..7c69366c118c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/nix-community/tree-sitter-nix",
-  "rev": "ea1d87f7996be1329ef6555dcacfa63a69bd55c6",
-  "date": "2025-07-18T19:46:47+02:00",
-  "path": "/nix/store/mvq8m0v2cr2xns4807cby54h3wc7xjxr-tree-sitter-nix",
-  "sha256": "1aaq5yv1s8qq3abm0jm884hi4k6n2w0nzd1j3wizv1x1xk6qzlsl",
-  "hash": "sha256-VNOPzeyhh/0jHzK0bwEX1kwSIUGoSlCXGhgjHbYvWKk=",
+  "rev": "ff4e2b4c5a3598e8be3edf16bc69f6677af32145",
+  "date": "2025-08-11T14:30:35Z",
+  "path": "/nix/store/pv5yjrasf1k8pigwl0gnvbm7bwsg205q-tree-sitter-nix",
+  "sha256": "0bv38na2i53229lzkndbvchfgg8gmwdgpcw1ajq9rcqar8m1gyal",
+  "hash": "sha256-VPkXKsoKs5ywVIGz+xqvD73nINur2flpEmKUKJRFYy8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
index 93a878458f14..6c96638394e3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index b81123a662d8..d4cb96ea314e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index a455eaf1e630..b07ea1915d63 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "100d06e29d13a8ebfc3f29173c07a5c4f2050586",
-  "date": "2025-06-03T11:43:38Z",
-  "path": "/nix/store/3a41rx3rs29c625ywqv0pw7s7am4gwn5-tree-sitter-nu",
-  "sha256": "07aa73flw0z56fqgqv4y7xyf0akh50ydavjyzyczwc7hyl15mak4",
-  "hash": "sha256-ZKpaAvXwMP6Z/15u1TwocCrgfD+ebPywM+UDTt04Sh0=",
+  "rev": "0e6c59c46db3c246eaf86ce5b325da1247e971a5",
+  "date": "2025-09-19T12:13:52-05:00",
+  "path": "/nix/store/hzys3qbx0162dma003g6n4wzl5j8b4d1-tree-sitter-nu",
+  "sha256": "1l6l4s6w5dc1yrdwz9k1l4xzdzbkch8q4fr69461piibsd6r0qm8",
+  "hash": "sha256-qGKQTdMrxhsMSSY7ghFkc/32O6Fhps9b9oG1wo0m1NA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
index a7d178462936..fe29aa1e29cc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
index 0dba72be49a3..792216e7f848 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
index 35b384620faf..cdaf509a9ca8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
index 7255f39b0e4a..56a78fac161a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/rolandwalker/tree-sitter-pgn",
-  "rev": "f86a119d21d01f6bf0dcd3247a366554e98dbbe5",
-  "date": "2024-09-14T21:47:45Z",
-  "path": "/nix/store/09rxvhnmdq63n4ghk00ngbdgnmqqs1k4-tree-sitter-pgn",
-  "sha256": "1ahl979ika0pyq4glz6am71hq6y360hcmwhxikn2l2gl8415701k",
-  "hash": "sha256-M4BTAkH0CSrsjB3yyiAwwxsMw6nKfPoI9heoGdNJFKo=",
+  "rev": "c5de0ccc528e1c36d354c00df422ed39fc582073",
+  "date": "2025-07-29T11:58:18-04:00",
+  "path": "/nix/store/laqz0v4pk90hqiy6apbxjf2lhbrf9n2h-tree-sitter-pgn",
+  "sha256": "0mazy9y80pd20a3a76b0nfxswh7xxdsnya0y0lzl86sh4w95f52p",
+  "hash": "sha256-VxRXEidQG0Q/BR4ob3Xr/UCuu7NgmaOGAqJdgHzyX1U=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index c64e2aedce34..86b2f91a6705 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "f7cf7348737d8cff1b13407a0bfedce02ee7b046",
-  "date": "2025-02-27T03:54:39-06:00",
-  "path": "/nix/store/6hwqa10mfcs32cqq5ab48c444yihm106-tree-sitter-php",
-  "sha256": "05qhz14vvqgwpxgdfr1skwgrv041zwc3wxjyx6y679965nn0lrji",
-  "hash": "sha256-UWYKrC0mpWO86V52Phj/gYCdH586ZNdev/zhvUn4EBc=",
+  "rev": "5b5627faaa290d89eb3d01b9bf47c3bb9e797dea",
+  "date": "2025-08-18T00:11:55-05:00",
+  "path": "/nix/store/sxyqch4xwnm2a1g5r7h9drp4x9bszzi8-tree-sitter-php",
+  "sha256": "1zf98g6zn29xci37scp3bmjl9dynhf3272aaqm6znjq7rb6z53lc",
+  "hash": "sha256-jI7yzcoHS/tNxUqJI4aD1rdEZV3jMn1GZD0J+81Dyf0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
index f9e43499a03a..040c110a9b17 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
index bbdf72a731cc..e5229a3327c3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
index 7d14348180b8..98175e48e9d3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
index e69c0abcd1c3..eccf11601570 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 208f595116b1..91102dc7402b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11",
-  "date": "2024-12-22T18:06:13-05:00",
-  "path": "/nix/store/qr60c80rwd98hzbhlsfjbk0fninvbjr4-tree-sitter-python",
-  "sha256": "0a108sfqcsxrp54lapk7k3kq6fmz8745z5q99wpn3i1cqpi9slzg",
-  "hash": "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=",
+  "rev": "293fdc02038ee2bf0e2e206711b69c90ac0d413f",
+  "date": "2025-09-11T02:45:17-04:00",
+  "path": "/nix/store/zka1fqm6l03k2z4ghiffkcisvcw96d5m-tree-sitter-python",
+  "sha256": "05kk1wlm5fgpgwqxw3m68sipkinw0gf2jq19cgq9cgp3agdwg58p",
+  "hash": "sha256-F5XH21PjPpbwYylgKdwD3MZ5o0amDt4xf/e5UikPcxY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
index 68fa4bd7f0da..6a433a1b517f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index f00559186659..2741011aa215 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index f7dda61658e5..76b2d4f83d4a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "ac939363ced63a5fd39a8bd5e7891bbe06b5738d",
-  "date": "2024-09-06T16:53:09-04:00",
-  "path": "/nix/store/qj9nyda5grkjqkh23m9a3q3sgkmkgcdh-tree-sitter-r",
-  "sha256": "1jf14nvrfcznsnmxmlkbnn59bdykpsawxm5grph65p8vghi4fik7",
-  "hash": "sha256-Z0ZHInwb3WLgza/UzpW+07eVirVr0tqr1fYzl7clwck=",
+  "rev": "e9944e9801595ad484f49be492daf0c4c81547ef",
+  "date": "2025-06-05T15:17:25-04:00",
+  "path": "/nix/store/qdqwb87naqr211y5zps16abnv97a3430-tree-sitter-r",
+  "sha256": "15g5bkndhqv8vbiakl1vvsarl4kcqz3k9fc9hgnn899ghla8nh2a",
+  "hash": "sha256-SkCLFIUvJWTtg4m5NMfHbBKald470Kni2mhj2Oxc5ZU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index 0ddb5f97a963..27aca2758514 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-regex",
-  "rev": "4470c59041416e8a2a9fa343595ca28ed91f38b8",
-  "date": "2024-11-11T00:48:15-05:00",
-  "path": "/nix/store/2iwwqdj0zjxxqqc6aw2hwqi55aczbf5x-tree-sitter-regex",
-  "sha256": "098pkjicnw3a8bypb7f2xqwhqjlfvicibcmgx5nsb0icdyvagm8q",
-  "hash": "sha256-GNWntm8sgqVt6a+yFVncjkoMOe7CnXX9Qmpwy6KcFyU=",
+  "rev": "b2ac15e27fce703d2f37a79ccd94a5c0cbe9720b",
+  "date": "2025-09-13T00:57:50-04:00",
+  "path": "/nix/store/wx4xlyvffsgkvjy88r955f5lrps9r1iz-tree-sitter-regex",
+  "sha256": "0nhn94skvac3wid2xbxa456m1mgbi7h768imq280pxbm4klhl7bd",
+  "hash": "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
index 962eac562dad..df313c6d6f4c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
index d58e72454870..87bf364f26d7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
index c2db9a7aedcc..bf815e548d2a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index 6f6d6eb72802..b39f33c3a159 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index c4e47bf15191..1b06a4e99317 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-scala",
-  "rev": "d3b9553b47d7ab413a146c4b6498e527265b966e",
-  "date": "2024-12-26T23:42:00-05:00",
-  "path": "/nix/store/qzbrl51l89izishri72bjc59al88dy0a-tree-sitter-scala",
-  "sha256": "02awiraj5mmgyi31yzxyxarkkl41qksm3lm41pq9c6bmyqpir2y6",
-  "hash": "sha256-xoscL/Z1GZbwDaTSUfXEgdA5s+q+fx9G9K/WIlWOXAk=",
+  "rev": "2d55e74b0485fe05058ffe5e8155506c9710c767",
+  "date": "2025-06-08T14:05:03-04:00",
+  "path": "/nix/store/0ns5c1i34vlyrbvyajclw5dc0qyqmx0c-tree-sitter-scala",
+  "sha256": "16674bmcwp0r8y9xgfc0n5jmgk9bb0975kcqhkg1pnprjs7b6kv4",
+  "hash": "sha256-ZE+zjpb52hvehJjNchJYK81XZbGAudeTRxlczuoix5g=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
index d03302900db6..c85551d0a92b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "e35b41a183164f4a12e10da3d0c430e837c3d75a",
-  "date": "2025-05-25T19:18:44+08:00",
-  "path": "/nix/store/lg0zvr4w9pryyz725vd5hdf7gvg7idx1-tree-sitter-scheme",
-  "sha256": "12dclaaj4snar68hcwfc1kmnbww4ykf1ab2q81r3k9989m7f1ckn",
-  "hash": "sha256-drLgTk0opTlyQFgsFdz0hPNl6wzMcQaRycpqIpWirIk=",
+  "rev": "67b5c8d6ce19fd5265f13204fec0a3efa9e095d9",
+  "date": "2025-09-17T19:40:43+08:00",
+  "path": "/nix/store/019pq24f1wpqi9n9z5h3ih4w83am5sp4-tree-sitter-scheme",
+  "sha256": "12z3grdc92cvdvkcbk981nn976fscmdbc4fhrsrq2q0h03wfqcwy",
+  "hash": "sha256-njPs+AAQYIGzztARtlpl2pmTrA0ozcXmbpuJxFp+44s=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
index f25d2196fb47..512d80fbbb50 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
index f63a144843fd..787003e93392 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
index 80e7839df85f..b0e2dea9eacb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
index a4d4f7bfe956..b9ad674d5f66 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index 9c3c7898b0cf..10de150ee9a7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/derekstride/tree-sitter-sql",
-  "rev": "8a4578bd200fd1ed73e8cbecbe3c5053a4bcf2f8",
-  "date": "2025-02-13T11:02:24-05:00",
-  "path": "/nix/store/jd7y0qspfvy7sc01i7awjwkr8dl3cnj0-tree-sitter-sql",
-  "sha256": "0cp0iaryxmshqdc4x8xg98ck096bqpk1xjg34dycbvkw7mpmn1zj",
-  "hash": "sha256-8gdbbz187sV8I+PJHubFyyQwGUqvo05Yw1DX7rOK4DI=",
+  "rev": "64d6707541898bf17a306033050b1932524e215f",
+  "date": "2025-09-23T13:22:41-04:00",
+  "path": "/nix/store/hgby3annavhkca58d82ixd1i0dgb4a3g-tree-sitter-sql",
+  "sha256": "0qv5pyz7yzy8bnvs8sc1wdp6wgl1wq4imynzwsihjg8yrxkdqbhc",
+  "hash": "sha256-DC7cZs8ePQmj5t/6GgnmgT5ubuOBaaS3Xch/f76/ZWM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
index 7f47d64fd963..646b61115996 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-  "rev": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7",
-  "date": "2024-09-21T12:39:28+02:00",
-  "path": "/nix/store/c94cwr855ai3b48ajw7nkxgrk6bs2n88-tree-sitter-supercollider",
-  "sha256": "051m7anq0w14qaj271x5ic4ilamrijx5f8np2g8kpgbkxmjc0v8v",
-  "hash": "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ=",
+  "rev": "76b3cab1773f08bb7d3a185420b0a44c6da8c294",
+  "date": "2025-09-17T20:52:30+02:00",
+  "path": "/nix/store/hmc2f1w3xzdhas9gf0m6yz9bbp6ivpqa-tree-sitter-supercollider",
+  "sha256": "1lb8fbx0hhd6lmhjvszm96hrd802mgq6phj4977ag6qdi15zbfbn",
+  "hash": "sha256-drn1S4gNm6fOSUTCa/CrAqCWoUn16y1hpaZBCPpyaNE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
index 4e693c88f96c..9e8861cc1f7d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
index d7e1dce60b16..46825eab17b4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
index 967abcd46f39..826b26d04e41 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index 634c62d4e732..6ac7d582118c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "de35706f89beed5087670a9c4421b7794ef02411",
-  "date": "2025-06-01T21:02:54+02:00",
-  "path": "/nix/store/9m1jydr3j1m876dmazg9kzvs7878a7ly-tree-sitter-templ",
-  "sha256": "0vbhks5879b7bpygxr9zba142zsb760j4im1gzbgcl6yj6q59j30",
-  "hash": "sha256-YMhUsJHeUPbWf6FGIoE5S39Bglo/5f78XWelg4qecG0=",
+  "rev": "27a1fc62c8dd4c49669e03629491f66449c6c435",
+  "date": "2025-09-14T18:21:44+02:00",
+  "path": "/nix/store/zvhrnj22cjvykp2xpgs3dill5mb2p13x-tree-sitter-templ",
+  "sha256": "1lwvyvvdkyy2anckz284fqkl5w26v6ppdwm8ajfkkdbf1cyls7fs",
+  "hash": "sha256-2h1NPQtutTmdVKjydq/ZRvBCJ3YEiT+ZVcL72fb2m9M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
index eaa3810597b8..35a64f282e31 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/uncenter/tree-sitter-tera",
-  "rev": "d006172998fa8b81f96b0f2fc7fa2bf25207c46b",
-  "date": "2025-04-16T08:51:56-04:00",
-  "path": "/nix/store/364masbjrvf29v30h4hbzwds1j438k7a-tree-sitter-tera",
-  "sha256": "0cwihdzlm8jk8g006j234pjnw0apv3l8ixn4kmdc60hzh3bb9ypr",
-  "hash": "sha256-+fq01oAfAsNancT2iOjYVwFu5SVDSAPAQ1OiSn+DkTM=",
+  "rev": "692937d52c8dfd91ce0dde722b9b4febbc9bc712",
+  "date": "2025-07-22T07:31:49-04:00",
+  "path": "/nix/store/yk1s71npnbz0vvfkpl4q6gs26xbcfjh3-tree-sitter-tera",
+  "sha256": "0zqkxiybrqrkj55cnpp5xbpw82c99zr752qb4wk7yj159yp1m5fx",
+  "hash": "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
index f8c71de32cc2..624aeb633dd3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index 31f805c26b87..d37e5a6b9f41 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json
new file mode 100644
index 000000000000..39541800305f
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/arnarg/tree-sitter-todotxt",
+  "rev": "3937c5cd105ec4127448651a21aef45f52d19609",
+  "date": "2024-01-15T09:45:57+01:00",
+  "path": "/nix/store/37nxnr79ylm1g1myx2zvhzrymy5z0pw4-tree-sitter-todotxt",
+  "sha256": "0551fdv77bdrxsc04gsi3zrc07si34r4gnhaqjg3h5fwbbkj3q1r",
+  "hash": "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
index 46c62e91c5ae..9e9bc79672da 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
index b38bdb4efa69..7076b788e36a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
index cf7e1a6389c6..48be60fc7096 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
index d832cc784436..8bfe5d5eeafc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 1dedf08f9884..d0a0ed3fcea5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
index ff9c3b0644a2..5ad8f460b6db 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
index a6e730e442ed..1af3e2b44c60 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
index ee51cfb86568..e2327dcd4a51 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
index fced9927e7c0..28989fd89ea5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
index e54a956a0316..4241e897b642 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
index 5aaece48adf5..e01d33e4fc00 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index 55c6653c18da..f0ad17112a21 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
index e9f5b2ba1e62..82e6259a3fe3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
index 8363525841c7..52cd35bef573 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 0f443d89bca2..50d3e1634f9e 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -15,8 +15,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.18.3";
-      hash = "sha256-eX0AWbxfwzVtecaBYVoTfHs15O/AOkRJqKGr/LzEvcc=";
+      version = "10.20.0";
+      hash = "sha256-R6M1KAhQG40e8gESJztqXc+lPSilW8zjbSaOh4vWv+k=";
     };
   };
 
diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix
index 1b3d449a3d20..0aae2741885f 100644
--- a/pkgs/development/tools/profiling/sysprof/default.nix
+++ b/pkgs/development/tools/profiling/sysprof/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sysprof";
-  version = "48.0";
+  version = "49.0";
 
   outputs = [
     "out"
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/sysprof/${lib.versions.major finalAttrs.version}/sysprof-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Gw8DgPLzBwi6h4KTIaBv7h2zbfqHeXu/B/CnrPRJjRg=";
+    hash = "sha256-/wQTljd4XIQZSIYgh6QyO5gWgNlCKWQJMhtXT8soKHg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
index 61e9c252c12c..357d1d9a7272 100644
--- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix
+++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=$(out)"
-    "STATIC=${if isStatic then "yes" else "no"}"
+    "STATIC=${lib.boolToYesNo isStatic}"
   ];
 
   doCheck = true;
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 603c69a4fc9f..98ab72525ac1 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   cmake,
   pkg-config,
   ninja,
@@ -27,6 +28,7 @@
   rustc-demangle,
   elfutils,
   perf,
+  callPackage,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-sOEY+fuJvnF2KLP5JRwpX6bfQfqLfYEhbi6tg1XlWhM=";
   };
 
+  patches = [
+    # QmlDesigner: Compile fixes for Qt 6.10 private API changes
+    (fetchpatch {
+      url = "https://github.com/qt-creator/qt-creator/commit/5a4c700ccefc76c7c531c834734e6fefa14b5364.patch";
+      hash = "sha256-BnS0HOqP5b7ZsVtuRpCK+TtoJj0yhodDuVtp+C3btIA=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -104,6 +114,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace ''${!outputDev}/lib/cmake/QtCreator/QtCreatorConfig.cmake --replace "$out/" ""
   '';
 
+  passthru = {
+    withPackages = callPackage ./with-plugins.nix { };
+  };
+
   meta = {
     description = "Cross-platform IDE tailored to the needs of Qt developers";
     longDescription = ''
diff --git a/pkgs/development/tools/qtcreator/with-plugins.nix b/pkgs/development/tools/qtcreator/with-plugins.nix
new file mode 100644
index 000000000000..6aa7b5f7d76b
--- /dev/null
+++ b/pkgs/development/tools/qtcreator/with-plugins.nix
@@ -0,0 +1,23 @@
+{
+  pkgs,
+  lib,
+  qtcreator,
+  ...
+}:
+f:
+let
+  plugins_arg = builtins.foldl' (
+    acc: val: acc + "-pluginpath ${val.outPath}/lib/qtcreator/plugins/"
+  ) "" f;
+  qtcreator_runner = pkgs.writeShellScriptBin "qtcreator" ''
+    exec ${lib.getExe qtcreator} ${plugins_arg} "$@"
+  '';
+in
+pkgs.symlinkJoin {
+  inherit (qtcreator) version meta;
+  name = "qtcreator-with-plugins";
+  paths = [
+    qtcreator_runner
+    qtcreator
+  ];
+}
diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index 39b4de40b83b..c78eeb55be78 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -11,15 +11,15 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen-unwrapped";
-  version = "0.72.0";
+  version = "0.72.1";
 
   src = fetchCrate {
     pname = "bindgen-cli";
     inherit version;
-    hash = "sha256-0hIxXKq7zu/gq0QAs2Ffuq584a9w1RWctPs9SBfc0/I=";
+    hash = "sha256-rhdQZcnlqVSUqvFDg0Scs1+DHGcKyazeS5H9HH7u8Fk=";
   };
 
-  cargoHash = "sha256-K/iM79RfNU+3f2ae6wy/FMFAD68vfqzSUebqALPJpJY=";
+  cargoHash = "sha256-YNpqVB+zdZ76Av2L+yQuBrxKvNML9+3H7ES4+7mED0E=";
 
   preConfigure = ''
     export LIBCLANG_PATH="${lib.getLib clang.cc}/lib"
diff --git a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
index 4277e2835aa7..8e33f655528c 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
@@ -12,15 +12,15 @@
     cargoHash = "sha256-pnMxWWfvr1/AEp8DvG4awig8zjdHizJHoZ5RJA8CL08=";
   };
 
-  cargo-pgrx_0_14_1 = {
-    version = "0.14.1";
-    hash = "sha256-oMToAhKkRiCyC8JYS0gmo/XX3QVcVtF5mUV0aQjd+p8=";
-    cargoHash = "sha256-RawGAQGtG2QVDCMbwjmUEaH6rDeRiBvvJsGCY8wySw0=";
-  };
-
   cargo-pgrx_0_16_0 = {
     version = "0.16.0";
     hash = "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=";
     cargoHash = "sha256-3eyBDWDoCzSU0tbab8qbjSnBkkN0oOgd7YbuyHLEHYw=";
   };
+
+  cargo-pgrx_0_16_1 = {
+    version = "0.16.1";
+    hash = "sha256-AjoBr+/sEPdzbD0wLUNVm2syCySkGaFOFQ70TST1U9w=";
+    cargoHash = "sha256-95DHq5GLnAqb3bbKwwaeBeKEmkfRh81ZTRaJ7L59DAg=";
+  };
 }
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 88482eb91e3c..fdf4002975b7 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -74,11 +74,18 @@ mkDerivation {
     ''--prefix PATH : ${lib.getBin graphviz}/bin''
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Tora SQL tool";
     mainProgram = "tora";
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.linux;
     license = licenses.asl20;
+    # fails to build on hydra since 2024
+    broken = true;
   };
 }
diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix
index 235375a22599..a729dfa8108c 100644
--- a/pkgs/development/tools/zls/default.nix
+++ b/pkgs/development/tools/zls/default.nix
@@ -18,7 +18,6 @@ let
       homepage = "https://github.com/zigtools/zls";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
-        figsoda
         moni
         _0x5a4
         jmbaur
diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index fad46782599c..a81592ee05d8 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -380,6 +380,10 @@ let
               "test-runner-run"
               "test-runner-watch-mode"
               "test-watch-mode-files_watcher"
+
+              # fail on openssl 3.6.0
+              "test-http2-server-unknown-protocol"
+              "test-tls-ocsp-callback"
             ]
             ++ lib.optionals (!lib.versionAtLeast version "22") [
               "test-tls-multi-key"
@@ -402,6 +406,9 @@ let
 
               # Those are annoyingly flaky, but not enough to be marked as such upstream.
               "test-wasi"
+
+              # This is failing on newer macOS versions, no fix has yet been provided upstream:
+              "test-cluster-dgram-1"
             ]
             ++ lib.optionals stdenv.hostPlatform.isMusl [
               # Doesn't work in sandbox on x86_64.
@@ -420,6 +427,9 @@ let
             ]
             # Those are annoyingly flaky, but not enough to be marked as such upstream.
             ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
+            ++ lib.optional (
+              majorVersion == "22" && stdenv.buildPlatform.isDarwin
+            ) "test/sequential/test-http-server-request-timeouts-mixed.js"
           )
         }"
       ];
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 0a794f6e3e41..a9be2fdad4b3 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -15,12 +15,16 @@ let
     python = python3;
   };
 
-  gypPatches = if stdenv.buildPlatform.isDarwin then callPackage ./gyp-patches.nix { } else [ ];
+  gypPatches =
+    if stdenv.buildPlatform.isDarwin then
+      callPackage ./gyp-patches.nix { patch_tools = false; }
+    else
+      [ ];
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.19.0";
-  sha256 = "0272acfce50ce9ad060288321b1092719a7f19966f81419835410c59c09daa46";
+  version = "22.21.1";
+  sha256 = "487d73fd4db00dc2420d659a8221b181a7937fbc5bc73f31c30b1680ad6ded6a";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -53,11 +57,5 @@ buildNodejs {
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
       ./use-nix-codesign.patch
-
-      # TODO: remove when included in a release
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
-        hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
-      })
     ];
 }
diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index a4a22e4a2188..add4d163d32f 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -25,8 +25,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "24.10.0";
-  sha256 = "f17e36cb2cc8c34a9215ba57b55ce791b102e293432ed47ad63cbaf15f78678f";
+  version = "24.11.0";
+  sha256 = "cf9c906d46446471f955b1f2c6ace8a461501d82d27e1ae8595dcb3b0e2c312a";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
diff --git a/pkgs/games/anki/patches/fix-compilation-under-rust-1.89.patch b/pkgs/games/anki/patches/fix-compilation-under-rust-1.89.patch
deleted file mode 100644
index 1f71dc5898e4..000000000000
--- a/pkgs/games/anki/patches/fix-compilation-under-rust-1.89.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From d8843c5fcaef79d209803849070e1a79ab380903 Mon Sep 17 00:00:00 2001
-From: Euan Kemp <euank@euank.com>
-Date: Sun, 24 Aug 2025 20:24:34 +0900
-Subject: [PATCH] Fix compilation under rust 1.89
-
-Rust 1.89 produces the following output:
-
-```
-error: unicode codepoint changing visible direction of text present in literal
-...
-warning: allow(text_direction_codepoint_in_literal) is ignored unless specified at crate level
- --> rslib/i18n/src/generated.rs:7:10
-  |
-7 | #![allow(text_direction_codepoint_in_literal)]
-  |          ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-```
-
-This change fixes it.
-
-This ensures that some third-party crate that pulls in this code as
-library code (and thus isn't subject to the rust-toolchain file in this
-repo) doesn't hit this compilation error.
----
- rslib/i18n/src/generated.rs | 1 -
- rslib/i18n/src/lib.rs       | 1 +
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rslib/i18n/src/generated.rs b/rslib/i18n/src/generated.rs
-index f3526f79f..f3fa71ce8 100644
---- a/rslib/i18n/src/generated.rs
-+++ b/rslib/i18n/src/generated.rs
-@@ -4,6 +4,5 @@
- // Include auto-generated content
- 
- #![allow(clippy::all)]
--#![allow(text_direction_codepoint_in_literal)]
- 
- include!(concat!(env!("OUT_DIR"), "/strings.rs"));
-diff --git a/rslib/i18n/src/lib.rs b/rslib/i18n/src/lib.rs
-index bfd6f5ba2..f9dbb1948 100644
---- a/rslib/i18n/src/lib.rs
-+++ b/rslib/i18n/src/lib.rs
-@@ -1,6 +1,7 @@
- // Copyright: Ankitects Pty Ltd and contributors
- // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
- 
-+#![allow(text_direction_codepoint_in_literal)]
- mod generated;
- 
- use std::borrow::Cow;
--- 
-2.50.1
-
diff --git a/pkgs/games/doom-ports/zandronum/add_gitinfo.patch b/pkgs/games/doom-ports/zandronum/add_gitinfo.patch
deleted file mode 100644
index 33f51ecb125d..000000000000
--- a/pkgs/games/doom-ports/zandronum/add_gitinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 4178904d7698 src/gitinfo.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/gitinfo.h	Fri Dec 01 13:02:42 2023 -0300
-@@ -0,0 +1,11 @@
-+// 4178904d769879e6c2919fb647ee6dd2736399e9
-+//
-+// This file was automatically generated by the
-+// updaterevision tool. Do not edit by hand.
-+
-+#define GIT_DESCRIPTION "ZA_3.0.1-572-4178904d7698"
-+#define GIT_HASH "4178904d769879e6c2919fb647ee6dd2736399e9"
-+#define GIT_TIME "2021-12-11 16:35:55 -0500"
-+#define HG_REVISION_NUMBER 1639258555
-+#define HG_REVISION_HASH_STRING "4178904d7698"
-+#define HG_TIME "211211-2135"
diff --git a/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch b/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch
deleted file mode 100644
index fdf8e2e1a957..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 89bccf7127ba src/gitinfo.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/gitinfo.h	Fri Dec 01 10:18:23 2023 -0300
-@@ -0,0 +1,11 @@
-+// 89bccf7127ba1ebe92558f674be69549bf2c4bd4
-+//
-+// This file was automatically generated by the
-+// updaterevision tool. Do not edit by hand.
-+
-+#define GIT_DESCRIPTION "ZA_3.1-404-89bccf7127ba"
-+#define GIT_HASH "89bccf7127ba1ebe92558f674be69549bf2c4bd4"
-+#define GIT_TIME "2023-07-09 15:14:38 -0400"
-+#define HG_REVISION_NUMBER 1688930078
-+#define HG_REVISION_HASH_STRING "89bccf7127ba"
-+#define HG_TIME "230709-1914"
diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix
deleted file mode 100644
index 5298485df6b6..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/default.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchhg,
-  cmake,
-  pkg-config,
-  makeWrapper,
-  callPackage,
-  soundfont-fluid,
-  SDL_compat,
-  libGL,
-  glew,
-  bzip2,
-  zlib,
-  libjpeg,
-  fluidsynth,
-  fmodex,
-  openssl,
-  gtk2,
-  python3,
-  game-music-emu,
-  serverOnly ? false,
-}:
-
-let
-  suffix = lib.optionalString serverOnly "-server";
-  fmod = fmodex; # fmodex is on nixpkgs now
-  sqlite = callPackage ../sqlite.nix { };
-  clientLibPath = lib.makeLibraryPath [ fluidsynth ];
-
-in
-stdenv.mkDerivation {
-  pname = "zandronum-alpha${suffix}";
-  version = "3.2-230709-1914";
-
-  src = fetchhg {
-    # expired ssl certificate
-    url = "http://hg.osdn.net/view/zandronum/zandronum-stable";
-    rev = "89bccf7127ba";
-    hash = "sha256-waD9hKk0A0zMPyqEvAKxaz2e2TBG2G0MJRrzjx1LyB0=";
-  };
-
-  # zandronum tries to download sqlite now when running cmake, don't let it
-  # it also needs the current mercurial revision info embedded in gitinfo.h
-  # otherwise, the client will fail to connect to servers because the
-  # protocol version doesn't match.
-  patches = [
-    ./zan_configure_impurity.patch
-    ./dont_update_gitinfo.patch
-    ./add_gitinfo.patch
-  ];
-
-  # I have no idea why would SDL and libjpeg be needed for the server part!
-  # But they are.
-  buildInputs = [
-    openssl
-    bzip2
-    zlib
-    SDL_compat
-    libjpeg
-    sqlite
-    game-music-emu
-  ]
-  ++ lib.optionals (!serverOnly) [
-    libGL
-    glew
-    fmod
-    fluidsynth
-    gtk2
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    makeWrapper
-    python3
-  ];
-
-  preConfigure = ''
-    ln -s ${sqlite}/* sqlite/
-    sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
-                                       dumb/src/it/*.c
-  ''
-  + lib.optionalString (!serverOnly) ''
-    sed -i \
-      -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-      -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
-      src/sound/music_fluidsynth_mididevice.cpp
-  '';
-
-  cmakeFlags = [
-    "-DFORCE_INTERNAL_GME=OFF"
-  ]
-  ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
-
-  hardeningDisable = [ "format" ];
-
-  # Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/lib/zandronum
-    cp zandronum${suffix} \
-       *.pk3 \
-       ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \
-       $out/lib/zandronum
-    makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum-alpha${suffix}
-    wrapProgram $out/bin/zandronum-alpha${suffix} \
-      --set LC_ALL="C"
-  '';
-
-  postFixup = lib.optionalString (!serverOnly) ''
-    patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \
-      $out/lib/zandronum/zandronum
-  '';
-
-  passthru = {
-    inherit fmod sqlite;
-  };
-
-  meta = with lib; {
-    homepage = "https://zandronum.com/";
-    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
-    maintainers = with maintainers; [ lassulus ];
-    license = licenses.sleepycat;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch b/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch
deleted file mode 100644
index 8d639c646738..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r 89bccf7127ba src/CMakeLists.txt
---- a/src/CMakeLists.txt	Sun Jul 09 15:14:38 2023 -0400
-+++ b/src/CMakeLists.txt	Fri Dec 01 10:16:26 2023 -0300
-@@ -642,15 +642,6 @@
- 	add_definitions( -DBACKPATCH )
- endif( BACKPATCH )
- 
--# Update gitinfo.h
--
--get_target_property( UPDATEREVISION_EXE updaterevision LOCATION )
--
--add_custom_target( revision_check ALL
--	COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h
--	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--	DEPENDS updaterevision )
--
- # Libraries ZDoom needs
- 
- message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
diff --git a/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch b/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch
deleted file mode 100644
index 4a85de520ac1..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -r 89bccf7127ba sqlite/CMakeLists.txt
---- a/sqlite/CMakeLists.txt	Sun Jul 09 15:14:38 2023 -0400
-+++ b/sqlite/CMakeLists.txt	Fri Dec 01 10:10:35 2023 -0300
-@@ -1,65 +1,5 @@
- cmake_minimum_required( VERSION 2.4 )
- 
--# [BB/EP] Download SQLite archive and extract the sources if necessary.
--set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0
--set( ZAN_SQLITE_YEAR 2021 )
--set( ZAN_SQLITE_SHA1 "a4bcf9e951bfb9745214241ba08476299fc2dc1e" )
--set( ZAN_SQLITE_DOWNLOAD_NAME "sqlite-autoconf-${ZAN_SQLITE_VERSION}" )
--set( ZAN_SQLITE_TEMP_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz" )
--set( ZAN_SQLITE_HASHED_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/sqlite-${ZAN_SQLITE_SHA1}.tar.gz" )
--
--if( IS_DIRECTORY ${ZAN_SQLITE_HASHED_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_HASHED_ARCHIVE} )
--	message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_HASHED_ARCHIVE} must be a valid file.\n"
--				"SQLite: Please remove it and try again." )
--elseif( ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.c ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.h ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3ext.h ) )
--
--	if( NOT EXISTS ${ZAN_SQLITE_HASHED_ARCHIVE} )
--		if( IS_DIRECTORY ${ZAN_SQLITE_TEMP_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_TEMP_ARCHIVE} )
--			message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_TEMP_ARCHIVE} must be a valid file.\n"
--					"SQLite: Please remove it and try again." )
--		endif()
--
--		message( STATUS "SQLite: downloading the archive..." )
--
--		file( DOWNLOAD https://www.sqlite.org/${ZAN_SQLITE_YEAR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz ${ZAN_SQLITE_TEMP_ARCHIVE}
--				SHOW_PROGRESS
--				STATUS ZAN_SQLITE_DOWNLOAD_STATUS )
--
--		# Report any problem if present and abort immediately.
--		list( GET ZAN_SQLITE_DOWNLOAD_STATUS 0 ZAN_SQLITE_DOWNLOAD_ERROR_CODE )
--		if( ZAN_SQLITE_DOWNLOAD_ERROR_CODE )
--			list( GET ZAN_SQLITE_DOWNLOAD_STATUS 1 ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE )
--			message( FATAL_ERROR "SQLite: download failed. Reason: ${ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE}" )
--		endif()
--
--		# Check the hash. Abort immediately if it's not valid (something is wrong with the download)
--		file( SHA1 ${ZAN_SQLITE_TEMP_ARCHIVE} ZAN_SQLITE_CURRENT_SHA1 )
--		if( NOT ZAN_SQLITE_CURRENT_SHA1 STREQUAL ZAN_SQLITE_SHA1 )
--			message( FATAL_ERROR "SQLite: download failed. The downloaded file has a different hash:\n"
--						"SQLite:    valid:      ${ZAN_SQLITE_SHA1}\n"
--						"SQLite:    downloaded: ${ZAN_SQLITE_CURRENT_SHA1}" )
--		endif()
--
--		# Rename the archive.
--		execute_process( COMMAND ${CMAKE_COMMAND} -E rename ${ZAN_SQLITE_TEMP_ARCHIVE} ${ZAN_SQLITE_HASHED_ARCHIVE} )
--	endif()
--
--	message( STATUS "SQLite: saving the source files into the 'sqlite' directory." )
--
--	# Extract the archive.
--	execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ZAN_SQLITE_HASHED_ARCHIVE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
--
--	# Copy the required files.
--	execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.c ${CMAKE_CURRENT_SOURCE_DIR} )
--	execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.h ${CMAKE_CURRENT_SOURCE_DIR} )
--	execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3ext.h ${CMAKE_CURRENT_SOURCE_DIR} )
--
--	# Remove the extracted folder.
--	execute_process( COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME} )
--
--	message( STATUS "SQLite: done." )
--endif()
--
- # [BB] Silence all GCC warnings
- IF ( CMAKE_COMPILER_IS_GNUCXX )
- 	ADD_DEFINITIONS ( -w )
diff --git a/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch b/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch
deleted file mode 100644
index d1cf831819c3..000000000000
--- a/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r 4178904d7698 src/CMakeLists.txt
---- a/src/CMakeLists.txt	Sat Dec 11 16:35:55 2021 -0500
-+++ b/src/CMakeLists.txt	Fri Dec 01 13:00:32 2023 -0300
-@@ -642,15 +642,6 @@
- 	add_definitions( -DBACKPATCH )
- endif( BACKPATCH )
- 
--# Update gitinfo.h
--
--get_target_property( UPDATEREVISION_EXE updaterevision LOCATION )
--
--add_custom_target( revision_check ALL
--	COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h
--	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--	DEPENDS updaterevision )
--
- # Libraries ZDoom needs
- 
- message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index bc28480a125c..36975a26bcf7 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -3,7 +3,6 @@
   stdenvNoCC,
   gccStdenv,
   lib,
-  recurseIntoAttrs,
   libsForQt5,
   newScope,
   perlPackages,
diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index 4e4c5f3e8bc8..a31c7c48efde 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -1,28 +1,48 @@
 {
   "game": {
     "latest": {
-      "linux": "52.04",
+      "linux": "53.02",
       "darwin": "0.47.05"
     },
     "versions": {
-      "52.04": {
+      "53.02": {
         "df": {
-          "version": "52.04",
+          "version": "53.02",
           "urls": {
             "linux": {
-              "url": "https://www.bay12games.com/dwarves/df_52_04_linux.tar.bz2",
-              "outputHash": "sha256-x/v4yWuojnbea0N7KUAINBdhPBjl0DoWy8Pi/eDCpec="
+              "url": "https://www.bay12games.com/dwarves/df_53_02_linux.tar.bz2",
+              "outputHash": "sha256-SprD05MMynNCBr2oKnBYvimm+RmOoceEC2MF9IhCc5Q="
             }
           }
         },
         "hack": {
-          "version": "52.04-r1",
+          "version": "53.02-r1",
           "git": {
             "url": "https://github.com/DFHack/dfhack.git",
-            "revision": "52.04-r1",
-            "outputHash": "sha256-DPW+fvurUYnwfGrEqV3JEN1TfllOJPHqGIlNJ3Wha90="
+            "revision": "53.02-r1",
+            "outputHash": "sha256-ybDaFYNVhNS1xJU/dD8KBzNu3ceetFbvX7xNp5DLzyU="
           },
-          "xmlRev": "7b691d256f9427036e7ff24fa795a0f9334739e7"
+          "xmlRev": "99cb51ac849a17652dbb74efa757df5b5716a9ba"
+        }
+      },
+      "52.05": {
+        "df": {
+          "version": "52.05",
+          "urls": {
+            "linux": {
+              "url": "https://www.bay12games.com/dwarves/df_52_05_linux.tar.bz2",
+              "outputHash": "sha256-LPbkt9s/Lx/0tvN5bac6d0r7+nr4P+u3xmDNo+EXHkw="
+            }
+          }
+        },
+        "hack": {
+          "version": "52.05-r2",
+          "git": {
+            "url": "https://github.com/DFHack/dfhack.git",
+            "revision": "52.05-r2",
+            "outputHash": "sha256-wv/4sRAIkb90uStGJ6eMdd/cAMVX5Uqtoe0BR+CDy7s="
+          },
+          "xmlRev": "df0ec27701a2aeaa1ccfb81323f4be55b78e1c10"
         }
       },
       "51.13": {
@@ -116,12 +136,12 @@
     }
   },
   "therapist": {
-    "version": "42.1.18",
-    "maxDfVersion": "52.03",
+    "version": "42.1.20",
+    "maxDfVersion": "52.05",
     "git": {
       "url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git",
-      "revision": "v42.1.18",
-      "outputHash": "sha256-RdBUpVkjvsNjTowHpQ2FQUCtJiwfqls4dnoUIwKoXGg="
+      "revision": "v42.1.20",
+      "outputHash": "sha256-nKMQSDrxhqRRaCDUK7GbexFHdxeD/P9c2UDkiMdWsyU="
     }
   }
 }
diff --git a/pkgs/games/minecraft-servers/versions.json b/pkgs/games/minecraft-servers/versions.json
index 1999edadd99f..62fb430f46ab 100644
--- a/pkgs/games/minecraft-servers/versions.json
+++ b/pkgs/games/minecraft-servers/versions.json
@@ -1,8 +1,8 @@
 {
   "1.21": {
-    "sha1": "11e54c2081420a4d49db3007e66c80a22579ff2a",
-    "url": "https://piston-data.mojang.com/v1/objects/11e54c2081420a4d49db3007e66c80a22579ff2a/server.jar",
-    "version": "1.21.9",
+    "sha1": "95495a7f485eedd84ce928cef5e223b757d2f764",
+    "url": "https://piston-data.mojang.com/v1/objects/95495a7f485eedd84ce928cef5e223b757d2f764/server.jar",
+    "version": "1.21.10",
     "javaVersion": 21
   },
   "1.20": {
diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix
index e2e8c2eac202..4dc2b194966c 100644
--- a/pkgs/games/openra_2019/default.nix
+++ b/pkgs/games/openra_2019/default.nix
@@ -49,7 +49,7 @@ let
   callWithName = name: value: if lib.isFunction value then value name else value;
   buildOpenRASet =
     f: args:
-    pkgs.recurseIntoAttrs (
+    lib.recurseIntoAttrs (
       lib.mapAttrs callWithName (
         f (
           {
@@ -65,7 +65,7 @@ let
     );
 
 in
-pkgs.recurseIntoAttrs rec {
+lib.recurseIntoAttrs rec {
   # The whole attribute set is destructered to ensure those (and only those) attributes are given
   # and to provide defaults for those that are optional.
   buildOpenRAEngine =
@@ -76,6 +76,7 @@ pkgs.recurseIntoAttrs rec {
       homepage,
       mods,
       src,
+      pos,
     }@engine:
     # Allow specifying the name at a later point if no name has been given.
     let
@@ -101,6 +102,7 @@ pkgs.recurseIntoAttrs rec {
       description,
       homepage,
       src,
+      pos,
       engine,
       assetsError ? "",
     }@mod:
diff --git a/pkgs/games/openra_2019/engine.nix b/pkgs/games/openra_2019/engine.nix
index ae207f24729c..ed6342ca0f92 100644
--- a/pkgs/games/openra_2019/engine.nix
+++ b/pkgs/games/openra_2019/engine.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation (
       )}
     '';
 
+    inherit (engine) pos;
     meta = {
       inherit (engine) description homepage;
     };
diff --git a/pkgs/games/openra_2019/engines.nix b/pkgs/games/openra_2019/engines.nix
index 3bbce300cfa5..b3eae5a67322 100644
--- a/pkgs/games/openra_2019/engines.nix
+++ b/pkgs/games/openra_2019/engines.nix
@@ -27,6 +27,7 @@ let
         repo = "OpenRA";
         inherit rev sha256 postFetch;
       };
+      pos = __curPos;
     } name).overrideAttrs
       (origAttrs: {
         postInstall = ''
diff --git a/pkgs/games/openra_2019/mod.nix b/pkgs/games/openra_2019/mod.nix
index 13152e7caa81..d174778608dd 100644
--- a/pkgs/games/openra_2019/mod.nix
+++ b/pkgs/games/openra_2019/mod.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation (
       runHook postInstall
     '';
 
+    inherit (mod) pos;
     meta = {
       inherit (mod) description homepage;
     };
diff --git a/pkgs/games/openra_2019/mods.nix b/pkgs/games/openra_2019/mods.nix
index a9f95d0f25c8..cd983b85b201 100644
--- a/pkgs/games/openra_2019/mods.nix
+++ b/pkgs/games/openra_2019/mods.nix
@@ -24,6 +24,7 @@ in
       rev = "fc3cf0baf2b827650eaae9e1d2335a3eed24bac9";
       sha256 = "15w91xs253gyrlzsgid6ixxjazx0fbzick6vlkiay0znb58n883m";
     };
+    pos = __curPos;
     engine = {
       version = "b8a7dd5";
       src = fetchFromGitHub {
@@ -48,6 +49,7 @@ in
       rev = "69a4aa708e2c26376469c0048fac13592aa452ca";
       sha256 = "1mfch4s6c05slyqvxllklbxpqq8dqcbx3515n3gyylyq43gq481r";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20181215";
       mods = [
@@ -81,6 +83,7 @@ in
       rev = "ffcd6ba72979e5f77508136ed7b0efc13e4b100e";
       sha256 = "07g4qw909649s3i1yhw75613mpwfka05jana5mpp5smhnf0pkack";
     };
+    pos = __curPos;
     engine = {
       version = "DarkReign";
       src = fetchFromGitHub {
@@ -105,6 +108,7 @@ in
       rev = "4f5e11d916e4a03d8cf1c97eef484ce2d77d7df2";
       sha256 = "1wnl4qrlhynnlahgdlxwhgsdba5wgdg9yrv9f8hkgi69j60szypd";
     };
+    pos = __curPos;
     engine = rec {
       version = "gen-20190128_3";
       src = fetchFromGitHub {
@@ -134,6 +138,7 @@ in
         rev = "5530babcb05170e0959e4cf2b079161e9fedde4f";
         sha256 = "07jczrarmgm6zdk0myzwgq200x19yvpjyxrnhdac08mjgyz75zk1";
       };
+      pos = __curPos;
       engine = {
         version = "4e8eab4ca00d1910203c8a103dfd2c002714daa8";
         src = fetchFromGitHub {
@@ -165,6 +170,7 @@ in
       rev = "c9be8f2a6f1dd710b1aedd9d5b00b4cf5020e2fe";
       sha256 = "09fp7k95jd6hjqdasbspbd43z5670wkyzbbgqkll9dfsrv0sky0v";
     };
+    pos = __curPos;
     engine = {
       version = "MedievalWarfareEngine";
       src = fetchFromGitHub {
@@ -189,6 +195,7 @@ in
       rev = "2f7c700d6d63c0625e7158ef3098221fa6741569";
       sha256 = "11vnzwczn47wjfrq6y7z9q234p27ihdrcl5p87i6h2xnrpwi8b6m";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20180923";
       src = fetchFromGitHub {
@@ -217,6 +224,7 @@ in
       rev = "c76c13e9f0912a66ddebae8d05573632b19736b2";
       sha256 = "1cnr3ccvrkjlv8kkdcglcfh133yy0fkva9agwgvc7wlj9n5ydl4g";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20190314";
       src = fetchFromGitHub {
@@ -241,6 +249,7 @@ in
       rev = "9230e6f1dd9758467832aee4eda115e18f0e635f";
       sha256 = "0bwbmmlhp1kh8rgk2nx1ca9vqssj849amndacf318d61gksc1w9n";
     };
+    pos = __curPos;
     engine = {
       version = "f3873ae";
       mods = [ "as" ];
@@ -270,6 +279,7 @@ in
       rev = "ac000cc15377cdf6d3c2b72c737d692aa0ed8bcd";
       sha256 = "16mzs5wcxj9nlpcyx2c87idsqpbm40lx0rznsccclnlb3hiwqas9";
     };
+    pos = __curPos;
     engine = {
       version = "SP-22-04-19";
       mods = [
@@ -298,6 +308,7 @@ in
       rev = "23e1f3e5d8b98c936797b6680d95d56a69a9e2ab";
       sha256 = "104clmxphchs7r8y7hpmw103bychayz80bqj98bp89i64nv9d89x";
     };
+    pos = __curPos;
     engine = {
       version = "6de92de";
       src = fetchFromGitHub {
@@ -322,6 +333,7 @@ in
       rev = "128dc53741fae923f4af556f2293ceaa0cf571f0";
       sha256 = "1mhr8kyh313z52gdrqv31d6z7jvdldiajalca5mcr8gzg6mph66p";
     };
+    pos = __curPos;
     engine = rec {
       version = "unplugged-cd82382";
       src = fetchFromGitHub {
@@ -346,6 +358,7 @@ in
       rev = "5b8b952dbe21f194a6d00485f20e215ce8362712";
       sha256 = "0hxzrqnz5d7qj1jjr20imiyih62x1cnmndf75nnil4c4sj82f9a6";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20190314";
       src = fetchFromGitHub {
diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix
index 4363e21b2eac..e875fcf8956b 100644
--- a/pkgs/games/openttd/jgrpp.nix
+++ b/pkgs/games/openttd/jgrpp.nix
@@ -7,13 +7,13 @@
 
 openttd.overrideAttrs (oldAttrs: rec {
   pname = "openttd-jgrpp";
-  version = "0.66.1";
+  version = "0.67.1";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-Bw5/fy3duMQDCDfAF6hGE7eQiNo0d9Ag/afG9zM+d30=";
+    hash = "sha256-GMkcf3XBotPXjZC4TdtOXzutyyIiW4haE+jNIfgozbg=";
   };
   patches = [ ];
 
diff --git a/pkgs/games/papermc/update.py b/pkgs/games/papermc/update.py
index 2eb4e7c2790e..7bfc8ee3a0b7 100755
--- a/pkgs/games/papermc/update.py
+++ b/pkgs/games/papermc/update.py
@@ -47,7 +47,7 @@ class VersionManager:
 
         # we only want versions that are no pre-releases
         release_versions = filter(
-            lambda v_name: 'pre' not in v_name, response.json()["versions"])
+            lambda v_name: all(s not in v_name for s in ["pre", "rc"]), response.json()["versions"])
 
         for version_name in release_versions:
 
diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 9f9530e39f20..81377f8dccd0 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -86,5 +86,13 @@
     "1.21.8": {
         "hash": "sha256-jefFLDsCQDUD0W+sWAA/Hv733XoCVnhoQ5J/qS7lfx4=",
         "version": "1.21.8-60"
+    },
+    "1.21.9": {
+        "hash": "sha256-rsAC53x1ZuSUlP3wVDC5YHj/0ddDDmUtTzOP75UeehA=",
+        "version": "1.21.9-59"
+    },
+    "1.21.10": {
+        "hash": "sha256-9tjYDSWmh8xSoCodBMsl8We7OoqCgnGiY74vRK2pEsw=",
+        "version": "1.21.10-91"
     }
 }
diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix
deleted file mode 100644
index ad44114be3a7..000000000000
--- a/pkgs/games/path-of-building/default.nix
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  unzip,
-  meson,
-  ninja,
-  pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
-  icoutils,
-  copyDesktopItems,
-  makeDesktopItem,
-  luajit,
-}:
-let
-  data = stdenv.mkDerivation (finalAttrs: {
-    pname = "path-of-building-data";
-    version = "2.56.0";
-
-    src = fetchFromGitHub {
-      owner = "PathOfBuildingCommunity";
-      repo = "PathOfBuilding";
-      rev = "v${finalAttrs.version}";
-      hash = "sha256-vzTMkrZgXtsCtEyxaDkea/MRj8tZDzDV3JAc440xrM8=";
-    };
-
-    nativeBuildInputs = [ unzip ];
-
-    buildCommand = ''
-      # I have absolutely no idea how this file is generated
-      # and I don't think I want to know. The Flatpak also does this.
-      unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua
-
-      # Install the actual data
-      cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out
-
-      # Pretend this is an official build so we don't get the ugly "dev mode" warning
-      substituteInPlace $out/manifest.xml --replace '<Version' '<Version platform="nixos"'
-      touch $out/installed.cfg
-
-      # Completely stub out the update check
-      chmod +w $out/src/UpdateCheck.lua
-      echo 'return "none"' > $out/src/UpdateCheck.lua
-    '';
-  });
-in
-stdenv.mkDerivation {
-  pname = "path-of-building";
-  version = "${data.version}-unstable-2023-04-09";
-
-  src = fetchFromGitHub {
-    owner = "ernstp";
-    repo = "pobfrontend";
-    rev = "9faa19aa362f975737169824c1578d5011487c18";
-    hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    qttools
-    wrapQtAppsHook
-    icoutils
-  ]
-  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
-
-  buildInputs = [
-    qtbase
-    luajit
-    luajit.pkgs.lua-curl
-    luajit.pkgs.luautf8
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm555 pobfrontend $out/bin/pobfrontend
-
-    wrestool -x -t 14 ${data.src}/runtime/Path{space}of{space}Building.exe -o pathofbuilding.ico
-    icotool -x pathofbuilding.ico
-
-    for size in 16 32 48 256; do
-      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      install -Dm 644 pathofbuilding*"$size"x"$size"*.png \
-        $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png
-    done
-    rm pathofbuilding.ico
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    qtWrapperArgs+=(
-      --set LUA_PATH "$LUA_PATH"
-      --set LUA_CPATH "$LUA_CPATH"
-      --chdir "${data}"
-    )
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "path-of-building";
-      desktopName = "Path of Building";
-      comment = "Offline build planner for Path of Exile";
-      exec = "pobfrontend %U";
-      terminal = false;
-      type = "Application";
-      icon = "pathofbuilding";
-      categories = [ "Game" ];
-      keywords = [
-        "poe"
-        "pob"
-        "pobc"
-        "path"
-        "exile"
-      ];
-      mimeTypes = [ "x-scheme-handler/pob" ];
-    })
-  ];
-
-  passthru.data = data;
-
-  meta = {
-    description = "Offline build planner for Path of Exile";
-    homepage = "https://pathofbuilding.community/";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.k900 ];
-    mainProgram = "pobfrontend";
-    broken = stdenv.hostPlatform.isDarwin; # doesn't find uic6 for some reason
-  };
-}
diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/games/pro-office-calculator/default.nix
deleted file mode 100644
index 88894e2fb99d..000000000000
--- a/pkgs/games/pro-office-calculator/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  mkDerivation,
-  lib,
-  fetchFromGitHub,
-  tinyxml-2,
-  cmake,
-  qtbase,
-  qtmultimedia,
-}:
-mkDerivation rec {
-  version = "1.0.13";
-  pname = "pro-office-calculator";
-
-  src = fetchFromGitHub {
-    owner = "RobJinman";
-    repo = "pro_office_calc";
-    rev = "v${version}";
-    sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd";
-  };
-
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    tinyxml-2
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = with lib; {
-    description = "Completely normal office calculator";
-    mainProgram = "procalc";
-    homepage = "https://proofficecalculator.com/";
-    maintainers = [ maintainers.pmiddend ];
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-  };
-}
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 749147859273..1646cb3163c3 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -14,8 +14,6 @@
 }:
 
 let
-  mkFlag = b: if b then "yes" else "no";
-
   games = import ./games.nix { inherit stdenv lib fetchFromGitHub; };
 
   wrapper = import ./wrapper.nix {
@@ -58,7 +56,7 @@ let
     ++ lib.optional openalSupport openal;
 
     makeFlags = [
-      "WITH_OPENAL=${mkFlag openalSupport}"
+      "WITH_OPENAL=${lib.boolToYesNo openalSupport}"
       "WITH_SYSTEMWIDE=yes"
       "WITH_SYSTEMDIR=$\{out}/share/games/quake2"
     ];
diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix
index e67c67e8b8da..2c242faa2194 100644
--- a/pkgs/games/the-butterfly-effect/default.nix
+++ b/pkgs/games/the-butterfly-effect/default.nix
@@ -25,6 +25,11 @@ mkDerivation rec {
 
     # fix translations not building: https://gitlab.kitware.com/cmake/cmake/-/issues/21931
     substituteInPlace i18n/CMakeLists.txt --replace qt5_create_translation qt_add_translation
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/Box2D/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
deleted file mode 100644
index 453f12074d5b..000000000000
--- a/pkgs/games/warsow/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  warsow-engine,
-  makeWrapper,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "warsow";
-  version = "2.1.2";
-
-  src = fetchurl {
-    url = "http://warsow.net/${pname}-${version}.tar.gz";
-    sha256 = "07y2airw5qg3s1bf1c63a6snjj22riz0mqhk62jmfm9nrarhavrc";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  installPhase = ''
-    mkdir -p $out/share/warsow
-    cp -r basewsw $out/share/warsow
-    ln -s ${warsow-engine}/lib/warsow $out/share/warsow/libs
-
-    mkdir -p $out/bin
-    for i in ${warsow-engine}/bin/*; do
-      makeWrapper "$i" "$out/bin/$(basename "$i")" --chdir "$out/share/warsow"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Multiplayer FPS game designed for competitive gaming";
-    longDescription = ''
-      Set in a futuristic cartoon-like world where rocketlauncher-wielding
-      pigs and lasergun-carrying cyberpunks roam the streets, Warsow is a
-      completely free fast-paced first-person shooter (FPS) for Windows, Linux
-      and macOS.
-    '';
-    homepage = "http://www.warsow.net";
-    license = licenses.unfreeRedistributable;
-    maintainers = [
-    ];
-    platforms = warsow-engine.meta.platforms;
-  };
-}
diff --git a/pkgs/games/warsow/engine.nix b/pkgs/games/warsow/engine.nix
deleted file mode 100644
index 9a759d58986c..000000000000
--- a/pkgs/games/warsow/engine.nix
+++ /dev/null
@@ -1,94 +0,0 @@
-{
-  stdenv,
-  lib,
-  replaceVars,
-  fetchurl,
-  cmake,
-  libogg,
-  libvorbis,
-  libtheora,
-  curl,
-  freetype,
-  libjpeg,
-  libpng,
-  SDL2,
-  libGL,
-  libX11,
-  openal,
-  zlib,
-}:
-
-stdenv.mkDerivation {
-  pname = "warsow-engine";
-  version = "2.1.0";
-
-  src = fetchurl {
-    url = "http://slice.sh/warsow/warsow_21_sdk.tar.gz";
-    sha256 = "0fj5k7qpf6far8i1xhqxlpfjch10zj26xpilhp95aq2yiz08pj4r";
-  };
-
-  patches = [
-    (replaceVars ./libpath.patch {
-      inherit
-        zlib
-        curl
-        libpng
-        libjpeg
-        libogg
-        libvorbis
-        libtheora
-        freetype
-        ;
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    libogg
-    libvorbis
-    libtheora
-    curl
-    freetype
-    libjpeg
-    SDL2
-    libGL
-    libX11
-    openal
-    zlib
-    libpng
-  ];
-
-  # Workaround build failure on -fno-common toolchains:
-  #   ld: CMakeFiles/wswtv_server.dir/__/unix/unix_time.c.o:(.bss+0x8): multiple definition of
-  #     `c_pointcontents'; CMakeFiles/wswtv_server.dir/__/null/ascript_null.c.o:(.bss+0x8): first defined here
-  env.NIX_CFLAGS_COMPILE = "-fcommon";
-
-  cmakeFlags = [ "-DQFUSION_GAME=Warsow" ];
-
-  preConfigure = ''
-    cd source/source
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/lib
-    cp -r libs $out/lib/warsow
-    for i in warsow.* wsw_server.* wswtv_server.*; do
-      install -Dm755 "$i" "$out/bin/''${i%.*}"
-    done
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Multiplayer FPS game designed for competitive gaming (engine only)";
-    homepage = "http://www.warsow.net";
-    license = licenses.gpl2Plus;
-    maintainers = [
-    ];
-    platforms = platforms.linux;
-    broken = stdenv.hostPlatform.isAarch64;
-  };
-}
diff --git a/pkgs/games/warsow/libpath.patch b/pkgs/games/warsow/libpath.patch
deleted file mode 100644
index ad2487102379..000000000000
--- a/pkgs/games/warsow/libpath.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ru3 warsow_21_sdk_old/source/source/gameshared/q_arch.h warsow_21_sdk_new/source/source/gameshared/q_arch.h
---- warsow_21_sdk_old/source/source/gameshared/q_arch.h	2016-03-26 22:22:10.000000000 +0300
-+++ warsow_21_sdk_new/source/source/gameshared/q_arch.h	2018-03-13 00:37:29.907019953 +0300
-@@ -206,15 +206,15 @@
- #endif
- 
- // FIXME: move these to CMakeLists.txt
--#define LIBZ_LIBNAME "libz.so.1|libz.so"
--#define LIBCURL_LIBNAME "libcurl.so.4|libcurl.so.3|libcurl.so"
--#define LIBPNG_LIBNAME "libpng16.so.16|libpng15.so.15|libpng14.so.14|libpng12.so.0|libpng.so"
--#define LIBJPEG_LIBNAME "libjpeg.so.8|libjpeg.so"
--#define LIBOGG_LIBNAME "libogg.so.0|libogg.so"
--#define LIBVORBIS_LIBNAME "libvorbis.so.0|libvorbis.so"
--#define LIBVORBISFILE_LIBNAME "libvorbisfile.so.3|libvorbisfile.so"
--#define LIBTHEORA_LIBNAME "libtheora.so.0|libtheora.so"
--#define LIBFREETYPE_LIBNAME "libfreetype.so.6|libfreetype.so"
-+#define LIBZ_LIBNAME "@zlib@/lib/libz.so"
-+#define LIBCURL_LIBNAME "@curl@/lib/libcurl.so"
-+#define LIBPNG_LIBNAME "@libpng@/lib/libpng.so"
-+#define LIBJPEG_LIBNAME "@libjpeg@/lib/libjpeg.so"
-+#define LIBOGG_LIBNAME "@libogg@/lib/libogg.so"
-+#define LIBVORBIS_LIBNAME "@libvorbis@/lib/libvorbis.so"
-+#define LIBVORBISFILE_LIBNAME "@libvorbis@/lib/libvorbisfile.so"
-+#define LIBTHEORA_LIBNAME "@libtheora@/lib/libtheora.so"
-+#define LIBFREETYPE_LIBNAME "@freetype@/lib/libfreetype.so"
- 
- #if defined ( __FreeBSD__ )
- #define BUILDSTRING "FreeBSD"
diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix
index 3e6e6ab0ec74..f2ee6fb684e3 100644
--- a/pkgs/kde/frameworks/kio/default.nix
+++ b/pkgs/kde/frameworks/kio/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   qt5compat,
   qttools,
+  kauth,
   acl,
   attr,
 }:
@@ -16,6 +17,7 @@ mkKdeDerivation {
   extraBuildInputs = [
     qt5compat
     qttools
+    kauth
     acl
     attr
   ];
diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix
index 3ba43cd40e3e..6f78a1b9d4fe 100644
--- a/pkgs/kde/frameworks/kwallet/default.nix
+++ b/pkgs/kde/frameworks/kwallet/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
+  gpgme,
   libgcrypt,
   libsecret,
   kdoctools,
@@ -13,6 +14,7 @@ mkKdeDerivation {
   ];
 
   extraBuildInputs = [
+    gpgme
     libgcrypt
     libsecret
     kdoctools
diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix
index 42fe1f1753c7..e59a1c956451 100644
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@@ -31,4 +31,7 @@ mkKdeDerivation rec {
     corrosion
     qcoro
   ];
+
+  # FIXME: work around Qt 6.10 cmake API changes
+  cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ];
 }
diff --git a/pkgs/kde/gear/calligra/default.nix b/pkgs/kde/gear/calligra/default.nix
index 6cbdeb223aa4..b0d1e99c9b0c 100644
--- a/pkgs/kde/gear/calligra/default.nix
+++ b/pkgs/kde/gear/calligra/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   lib,
+  fetchpatch,
   boost,
   eigen,
   gsl,
@@ -26,6 +27,14 @@
 mkKdeDerivation {
   pname = "calligra";
 
+  patches = [
+    # Fix build with Poppler 25.10
+    (fetchpatch {
+      url = "https://invent.kde.org/office/calligra/-/commit/45e8b302bce1d318f310ea13599d7ce84acc477e.patch";
+      hash = "sha256-TECB3eo24+gI8TXL8gw9BIdFWqw0JBKCWpoNVqBSan8=";
+    })
+  ];
+
   extraBuildInputs = [
     boost
     eigen
diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix
index d81c487e452f..a9c95f7b6fb5 100644
--- a/pkgs/kde/gear/kdeconnect-kde/default.nix
+++ b/pkgs/kde/gear/kdeconnect-kde/default.nix
@@ -3,9 +3,9 @@
   mkKdeDerivation,
   replaceVars,
   sshfs,
+  qtbase,
   qtconnectivity,
   qtmultimedia,
-  qtwayland,
   pkg-config,
   wayland,
   wayland-protocols,
@@ -30,13 +30,12 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtconnectivity
     qtmultimedia
-    qtwayland
     wayland
     wayland-protocols
     libfakekey
   ];
 
   extraCmakeFlags = [
-    "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
+    "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner"
   ];
 }
diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix
index 597cb8cc80de..b72f4af7b955 100644
--- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix
+++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix
@@ -2,9 +2,10 @@
   lib,
   mkKdeDerivation,
   replaceVars,
+  qtdeclarative,
+  kauth,
   samba,
   shadow,
-  qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kdenetwork-filesharing";
@@ -19,7 +20,10 @@ mkKdeDerivation {
     ./samba-hint.patch
   ];
 
-  extraBuildInputs = [ qtdeclarative ];
+  extraBuildInputs = [
+    qtdeclarative
+    kauth
+  ];
 
   # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to
   extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ];
diff --git a/pkgs/kde/gear/kirigami-gallery/default.nix b/pkgs/kde/gear/kirigami-gallery/default.nix
index bb739046baca..6be7d3fcdd89 100644
--- a/pkgs/kde/gear/kirigami-gallery/default.nix
+++ b/pkgs/kde/gear/kirigami-gallery/default.nix
@@ -10,4 +10,6 @@ mkKdeDerivation {
     qtsvg
     qttools
   ];
+
+  meta.mainProgram = "kirigami2gallery";
 }
diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix
index 6d3ef5d3adb9..4ef2889cc1a0 100644
--- a/pkgs/kde/gear/kontrast/default.nix
+++ b/pkgs/kde/gear/kontrast/default.nix
@@ -1,14 +1,12 @@
 {
   mkKdeDerivation,
   qtsvg,
-  qcoro,
 }:
 mkKdeDerivation {
   pname = "kontrast";
 
   extraBuildInputs = [
     qtsvg
-    qcoro
   ];
   meta.mainProgram = "kontrast";
 }
diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix
index 808067fb0000..d2be34808082 100644
--- a/pkgs/kde/gear/krfb/default.nix
+++ b/pkgs/kde/gear/krfb/default.nix
@@ -1,7 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
-  qtwayland,
+  qtbase,
   libvncserver,
   pipewire,
   xorg,
@@ -10,12 +10,11 @@ mkKdeDerivation {
   pname = "krfb";
 
   extraCmakeFlags = [
-    "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
+    "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner"
   ];
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
-    qtwayland
     libvncserver
     pipewire
     xorg.libXdamage
diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix
index b6048d9611d4..d55b5cd4bb0b 100644
--- a/pkgs/kde/gear/okular/default.nix
+++ b/pkgs/kde/gear/okular/default.nix
@@ -3,6 +3,7 @@
   pkg-config,
   qtspeech,
   qtsvg,
+  plasma-activities,
   poppler,
   libtiff,
   libspectre,
@@ -19,6 +20,8 @@ mkKdeDerivation {
     qtspeech
     qtsvg
 
+    plasma-activities
+
     poppler
     libtiff
     libspectre
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index 58f03bb030f1..bf2aada9b34b 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -18,6 +18,8 @@
       "kcrash",
       "ki18n",
       "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
       "kitemmodels",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -366,6 +368,7 @@
       "extra-cmake-modules",
       "karchive",
       "kcmutils",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kconfigwidgets",
@@ -379,14 +382,14 @@
       "ki18n",
       "kiconthemes",
       "kio",
+      "kjobwidgets",
       "knotifications",
       "kparts",
       "kservice",
       "ktextwidgets",
       "kwidgetsaddons",
       "kwindowsystem",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "blinken": [
       "extra-cmake-modules",
@@ -570,6 +573,9 @@
     ],
     "cervisia": [
       "extra-cmake-modules",
+      "kcompletion",
+      "kcoreaddons",
+      "kdbusaddons",
       "kdesu",
       "kdoctools",
       "ki18n",
@@ -949,6 +955,13 @@
       "wayland",
       "wayland-protocols"
     ],
+    "hana": [
+      "extra-cmake-modules",
+      "kconfig",
+      "ki18n",
+      "kio",
+      "kirigami"
+    ],
     "haruna": [
       "extra-cmake-modules",
       "kconfig",
@@ -971,6 +984,7 @@
       "kdbusaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
       "kwindowsystem",
       "libkleo",
       "qqc2-desktop-style"
@@ -1077,6 +1091,7 @@
     "k3b": [
       "extra-cmake-modules",
       "karchive",
+      "kauth",
       "kcmutils",
       "kconfig",
       "kcoreaddons",
@@ -1128,7 +1143,6 @@
       "kio",
       "kservice",
       "kwidgetsaddons",
-      "kwindowsystem",
       "kxmlgui"
     ],
     "kaddressbook": [
@@ -1158,7 +1172,6 @@
     ],
     "kaichat": [
       "extra-cmake-modules",
-      "kcompletion",
       "kconfig",
       "kcoreaddons",
       "kcrash",
@@ -1167,12 +1180,14 @@
       "ki18n",
       "kiconthemes",
       "kio",
-      "kitemviews",
+      "knotifications",
+      "knotifyconfig",
       "kstatusnotifieritem",
       "ktextaddons",
       "kwidgetsaddons",
       "kxmlgui",
-      "purpose"
+      "purpose",
+      "sonnet"
     ],
     "kaidan": [
       "extra-cmake-modules",
@@ -1738,6 +1753,7 @@
       "kiconthemes",
       "kitemviews",
       "kwidgetsaddons",
+      "kwindowsystem",
       "kxmlgui"
     ],
     "kdeclarative": [
@@ -1953,9 +1969,7 @@
     ],
     "kdesdk-thumbnailers": [
       "extra-cmake-modules",
-      "kconfig",
       "kcoreaddons",
-      "ki18n",
       "kio"
     ],
     "kdesu": [
@@ -2180,6 +2194,20 @@
       "kwidgetsaddons",
       "kwindowsystem"
     ],
+    "keepsecret": [
+      "extra-cmake-modules",
+      "kcolorscheme",
+      "kconfig",
+      "kcoreaddons",
+      "kcrash",
+      "kdbusaddons",
+      "ki18n",
+      "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
+      "kitemmodels",
+      "qqc2-desktop-style"
+    ],
     "keurocalc": [
       "extra-cmake-modules",
       "kconfig",
@@ -2591,7 +2619,6 @@
     "kio": [
       "extra-cmake-modules",
       "karchive",
-      "kauth",
       "kbookmarks",
       "kcolorscheme",
       "kcompletion",
@@ -2688,11 +2715,14 @@
     ],
     "kirigami-addons": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kglobalaccel",
       "kguiaddons",
       "ki18n",
+      "kiconthemes",
       "kirigami"
     ],
     "kirigami-gallery": [
@@ -2731,7 +2761,8 @@
       "ki18n",
       "kpackage",
       "libkscreen",
-      "plasma-desktop"
+      "plasma-desktop",
+      "plasma-workspace"
     ],
     "kitemmodels": [
       "extra-cmake-modules"
@@ -3040,8 +3071,7 @@
       "kstatusnotifieritem",
       "kwidgetsaddons",
       "kwindowsystem",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "kmouth": [
       "extra-cmake-modules",
@@ -3084,6 +3114,7 @@
       "kxmlgui"
     ],
     "kmymoney": [
+      "akonadi",
       "alkimia",
       "extra-cmake-modules",
       "kcmutils",
@@ -3097,6 +3128,7 @@
       "kholidays",
       "ki18n",
       "kiconthemes",
+      "kidentitymanagement",
       "kio",
       "kitemmodels",
       "kitemviews",
@@ -3277,6 +3309,7 @@
       "kconfig",
       "kcoreaddons",
       "kdbusaddons",
+      "kdoctools",
       "kguiaddons",
       "ki18n",
       "kiconthemes",
@@ -3398,7 +3431,8 @@
       "kdoctools",
       "ki18n",
       "kirigami",
-      "kirigami-addons"
+      "kirigami-addons",
+      "qcoro"
     ],
     "konversation": [
       "extra-cmake-modules",
@@ -3490,6 +3524,7 @@
     ],
     "kosmindoormap": [
       "extra-cmake-modules",
+      "kcontacts",
       "ki18n",
       "kirigami",
       "kirigami-addons",
@@ -3596,6 +3631,8 @@
       "kguiaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
+      "kitemmodels",
       "knotifications",
       "kunifiedpush",
       "kweathercore"
@@ -3614,7 +3651,8 @@
       "extra-cmake-modules"
     ],
     "kquickimageeditor": [
-      "extra-cmake-modules"
+      "extra-cmake-modules",
+      "kconfig"
     ],
     "krdc": [
       "extra-cmake-modules",
@@ -3801,6 +3839,8 @@
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
+      "kimageformats",
+      "kirigami",
       "kpackage",
       "kservice",
       "ksvg",
@@ -3939,7 +3979,6 @@
       "extra-cmake-modules",
       "kconfig",
       "kcrash",
-      "kdoctools",
       "kguiaddons",
       "ki18n",
       "knewstuff",
@@ -4027,6 +4066,7 @@
       "kcoreaddons",
       "ki18n",
       "kio",
+      "kitemviews",
       "ktextwidgets",
       "qtkeychain",
       "sonnet",
@@ -4231,7 +4271,6 @@
     ],
     "kwallet": [
       "extra-cmake-modules",
-      "gpgme",
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
@@ -4312,12 +4351,13 @@
       "extra-cmake-modules"
     ],
     "kwin": [
+      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
       "kdeclarative",
@@ -4329,6 +4369,7 @@
       "kidletime",
       "kirigami",
       "knewstuff",
+      "knighttime",
       "knotifications",
       "kpackage",
       "kpipewire",
@@ -4347,6 +4388,7 @@
       "wayland-protocols"
     ],
     "kwin-x11": [
+      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
@@ -4364,9 +4406,9 @@
       "kidletime",
       "kirigami",
       "knewstuff",
+      "knighttime",
       "knotifications",
       "kpackage",
-      "kpipewire",
       "kscreenlocker",
       "kservice",
       "ksvg",
@@ -4616,7 +4658,6 @@
     "libplasma": [
       "extra-cmake-modules",
       "karchive",
-      "kcmutils",
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
@@ -4872,6 +4913,7 @@
     "mimetreeparser": [
       "extra-cmake-modules",
       "kcalendarcore",
+      "kirigami",
       "kmbox",
       "kmime",
       "kwidgetsaddons",
@@ -4970,7 +5012,6 @@
       "kxmlgui",
       "libkexiv2",
       "phonon",
-      "plasma-activities",
       "purpose",
       "threadweaver"
     ],
@@ -5244,7 +5285,6 @@
       "baloo",
       "breeze",
       "extra-cmake-modules",
-      "kaccounts-integration",
       "kactivitymanagerd",
       "kauth",
       "kcmutils",
@@ -5379,6 +5419,7 @@
       "bluedevil",
       "bluez-qt",
       "extra-cmake-modules",
+      "kauth",
       "kconfig",
       "kcoreaddons",
       "ki18n",
@@ -5424,11 +5465,13 @@
       "kconfigwidgets",
       "kcoreaddons",
       "kdbusaddons",
+      "kdeclarative",
       "ki18n",
       "kio",
       "kjobwidgets",
       "knotifications",
       "kpackage",
+      "kquickcharts",
       "kservice",
       "ksvg",
       "kwallet",
@@ -5437,6 +5480,7 @@
       "libplasma",
       "modemmanager-qt",
       "networkmanager-qt",
+      "prison",
       "qcoro",
       "solid"
     ],
@@ -5449,6 +5493,7 @@
       "kglobalaccel",
       "ki18n",
       "kirigami-addons",
+      "kitemmodels",
       "kpackage",
       "kstatusnotifieritem",
       "ksvg",
@@ -5503,6 +5548,7 @@
       "kcompletion",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -5591,6 +5637,7 @@
     ],
     "plasma-welcome": [
       "extra-cmake-modules",
+      "kcmutils",
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
@@ -5616,6 +5663,7 @@
       "kbookmarks",
       "kcmutils",
       "kcodecs",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kconfigwidgets",
@@ -5624,7 +5672,6 @@
       "kdbusaddons",
       "kdeclarative",
       "kded",
-      "kdesu",
       "kfilemetadata",
       "kglobalaccel",
       "kglobalacceld",
@@ -5639,6 +5686,7 @@
       "kitemviews",
       "kjobwidgets",
       "knewstuff",
+      "knighttime",
       "knotifications",
       "knotifyconfig",
       "kpackage",
@@ -5686,10 +5734,12 @@
       "kconfig",
       "kcoreaddons",
       "kguiaddons",
+      "kholidays",
       "ki18n",
       "kidletime",
       "kio",
       "knotifications",
+      "kunitconversion",
       "libksysguard",
       "networkmanager-qt",
       "plasma-activities",
@@ -5730,6 +5780,7 @@
       "kcrash",
       "kdbusaddons",
       "ki18n",
+      "knotifications",
       "kwindowsystem",
       "polkit-qt-1"
     ],
@@ -5784,7 +5835,6 @@
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
-      "kiconthemes",
       "kio",
       "kirigami",
       "knotifications",
@@ -5806,6 +5856,7 @@
       "ki18n",
       "kio",
       "kirigami",
+      "kitemmodels",
       "kservice"
     ],
     "pvfviewer": [
@@ -5831,7 +5882,6 @@
       "kcodecs",
       "kcolorscheme",
       "kconfig",
-      "kcoreaddons",
       "kguiaddons",
       "kiconthemes",
       "kirigami"
@@ -5910,6 +5960,7 @@
       "ki18n",
       "kitemviews",
       "ktexteditor",
+      "ktexttemplate",
       "kxmlgui"
     ],
     "rolisteam": [
@@ -6219,6 +6270,7 @@
     "systemsettings": [
       "extra-cmake-modules",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
       "kcrash",
       "kdbusaddons",
@@ -6241,6 +6293,7 @@
     ],
     "tellico": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcrash",
@@ -6249,6 +6302,7 @@
       "ki18n",
       "kiconthemes",
       "kio",
+      "kio-extras",
       "kitemmodels",
       "knewstuff",
       "kwidgetsaddons",
@@ -6317,9 +6371,6 @@
       "kconfig",
       "kcoreaddons",
       "kcrash",
-      "kdev-php",
-      "kdevelop",
-      "kdevelop-pg-qt",
       "kdoctools",
       "ki18n",
       "kiconthemes",
@@ -6405,6 +6456,7 @@
       "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
+      "kdeclarative",
       "ki18n",
       "kiconthemes",
       "kio",
@@ -6418,6 +6470,7 @@
       "kwidgetsaddons",
       "kwindowsystem",
       "kxmlgui",
+      "plasma-workspace",
       "solid",
       "wayland",
       "wayland-protocols"
@@ -6462,5 +6515,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "723afe12"
+  "version": "4fa0d47e"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index d474fff199eb..b218ff318e9d 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -350,7 +350,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",
@@ -452,6 +451,7 @@
   "flatpak-kcm": [
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -638,7 +638,9 @@
     "LicenseRef-KDE-Accepted-GPL"
   ],
   "karchive": [
+    "Apache-2.0",
     "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "LGPL-2.0-or-later"
   ],
@@ -761,6 +763,9 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kcodecs": [
+    "Apache-2.0",
+    "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
@@ -1004,6 +1009,7 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kdeplasma-addons": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -1170,10 +1176,7 @@
   ],
   "kglobalacceld": [
     "CC0-1.0",
-    "LGPL-2.0-or-later",
-    "LGPL-2.1-only",
-    "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LGPL-2.0-or-later"
   ],
   "kgoldrunner": [
     "BSD-3-Clause",
@@ -1296,6 +1299,7 @@
     "GPL-2.0-or-later"
   ],
   "kimageformats": [
+    "Apache-2.0",
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
@@ -1437,6 +1441,7 @@
     "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-LGPL"
   ],
@@ -1597,6 +1602,17 @@
     "GPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL"
   ],
+  "knighttime": [
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-3.0-only",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
+  ],
   "knotifications": [
     "BSD-2-Clause",
     "BSD-3-Clause",
@@ -1850,6 +1866,7 @@
   ],
   "krdp": [
     "BSD-2-Clause",
+    "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
@@ -2342,6 +2359,7 @@
     "MIT"
   ],
   "libplasma": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -2457,7 +2475,6 @@
     "Qt-Commercial-exception-1.0"
   ],
   "milou": [
-    "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-3.0-only",
@@ -2701,6 +2718,8 @@
   ],
   "plasma-mobile": [
     "Apache-2.0",
+    "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2720,7 +2739,7 @@
     "LGPL-2.0-or-later"
   ],
   "plasma-nm": [
-    "BSD-2-Clauses",
+    "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2868,9 +2887,11 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
+    "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "prison": [
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 2125ea7bc26c..ec7937b31351 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -1265,6 +1265,12 @@
     "project_path": "unmaintained/jovie",
     "repo_path": "unmaintained/jovie"
   },
+  "jp-archives": {
+    "description": "Patches for KDE and Qt created by the members of Japan KDE Users Group (JKUG)",
+    "name": "jp-archives",
+    "project_path": "unmaintained/jp-archives",
+    "repo_path": "unmaintained/jp-archives"
+  },
   "jsmoke": {
     "description": "Smoke bindings for QtScript.",
     "name": "jsmoke",
@@ -2477,6 +2483,12 @@
     "project_path": "applications/keditbookmarks",
     "repo_path": "utilities/keditbookmarks"
   },
+  "keepsecret": {
+    "description": "Password manager",
+    "name": "keepsecret",
+    "project_path": "utilities/keepsecret",
+    "repo_path": "utilities/keepsecret"
+  },
   "kemoticons": {
     "description": "KEmoticons",
     "name": "kemoticons",
@@ -2864,8 +2876,8 @@
   "kiss": {
     "description": "KDE Initial System Setup",
     "name": "kiss",
-    "project_path": "system/kiss",
-    "repo_path": "system/kiss"
+    "project_path": "plasma/kiss",
+    "repo_path": "plasma/kiss"
   },
   "kitemmodels": {
     "description": "KItemModels",
@@ -6875,6 +6887,12 @@
     "project_path": "sysadmin/sentry-bugzilla-bridge",
     "repo_path": "sysadmin/sentry-bugzilla-bridge"
   },
+  "sysadmin-token-service": {
+    "description": "Service for issuing short lived access tokens for those presenting valid credentials",
+    "name": "sysadmin-token-service",
+    "project_path": "sysadmin/token-service",
+    "repo_path": "sysadmin/token-service"
+  },
   "sysadmin-webstats": {
     "description": "Scripts and templates used to manage web statistics on KDE servers",
     "name": "sysadmin-webstats",
diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json
index 4b0d09e80eea..8afd6118bb0b 100644
--- a/pkgs/kde/generated/sources/frameworks.json
+++ b/pkgs/kde/generated/sources/frameworks.json
@@ -175,9 +175,9 @@
     "hash": "sha256-/IJTJqprjBMhlH/1I9PQBu70xl/eQPN5xpANBpZ/rhw="
   },
   "kio": {
-    "version": "6.19.0",
-    "url": "mirror://kde/stable/frameworks/6.19/kio-6.19.0.tar.xz",
-    "hash": "sha256-Bt5M5ckarJGhJ8UL2cqtb73vJsbIYWTtKKVGqOTPBWc="
+    "version": "6.19.1",
+    "url": "mirror://kde/stable/frameworks/6.19/kio-6.19.1.tar.xz",
+    "hash": "sha256-Lw6nr0yiJwMfDwNBojLRhtQNsAHVu2KH75+kvKEn7j8="
   },
   "kirigami": {
     "version": "6.19.0",
diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 7c8a66002ab9..98fd3024c74e 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1247 +1,1247 @@
 {
   "accessibility-inspector": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/accessibility-inspector-25.08.2.tar.xz",
-    "hash": "sha256-Z8RYiX+GK+aoQ0zI5x5By5974VtHT0t7a0TwC6+2UmE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/accessibility-inspector-25.08.3.tar.xz",
+    "hash": "sha256-qu5u3kDAOYIAffLouVLn/mxTFOFBhFCU4ox1U3NEeQA="
   },
   "akonadi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-25.08.2.tar.xz",
-    "hash": "sha256-Qc/q3+h7Ao1yAGjAReuebLId+p7bJHpUiNmz/GExww4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-25.08.3.tar.xz",
+    "hash": "sha256-+Gf9HhbZ1jepLaszTcQXDyD1i+EzZzkglOxTnj7uAXo="
   },
   "akonadi-calendar": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-calendar-25.08.2.tar.xz",
-    "hash": "sha256-wnrtySzylXBjazodxARKvuKaajbTU23usy1VjXmzVGE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-calendar-25.08.3.tar.xz",
+    "hash": "sha256-vuMRKJCiHyq2AFholD0lbHnFGPwbWyR/AUy4vazdQMI="
   },
   "akonadi-calendar-tools": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-calendar-tools-25.08.2.tar.xz",
-    "hash": "sha256-nIS+nz+VDOV1oyjUrKia/3v8f5CijPRCNqgzUoTmOog="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-calendar-tools-25.08.3.tar.xz",
+    "hash": "sha256-jHkM7gF8fMMx97aQqCe9MsW0kmB5Z47CS7gA0mxPHqY="
   },
   "akonadi-contacts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-contacts-25.08.2.tar.xz",
-    "hash": "sha256-ZQwDTN8qq15TqL5XnK1nep2PzDXttwTncgLpBbD44gI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-contacts-25.08.3.tar.xz",
+    "hash": "sha256-OEAOvm4cudm/U2vNwym9ZI0r2HviMn0EtJNhxmzz0k0="
   },
   "akonadi-import-wizard": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-import-wizard-25.08.2.tar.xz",
-    "hash": "sha256-ORQ1Jp8sBhoJ6KcnpbpuOdPFkItpF6EYRthEbkmgO9U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-import-wizard-25.08.3.tar.xz",
+    "hash": "sha256-X9O1offbeIUoyXR/70tz8KjKfHvCzw41uC3ODK/tE5k="
   },
   "akonadi-mime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-mime-25.08.2.tar.xz",
-    "hash": "sha256-AAdRMbRrwa/L6qP86IUvdr7W8FMVeY6GEY4PyuDE3ks="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-mime-25.08.3.tar.xz",
+    "hash": "sha256-ciKSy8ewUeaLC3wFo3H6VarzHqi8Z/LdHOcz4O2xImY="
   },
   "akonadi-search": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-search-25.08.2.tar.xz",
-    "hash": "sha256-K+VinvzH8BNP22Gp+QYrxZsAq1XoG478dq8Yy11mpYg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-search-25.08.3.tar.xz",
+    "hash": "sha256-PI19LYADtJYBgxaA/BG6kNp5xRaYbMJscWALud5531E="
   },
   "akonadiconsole": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadiconsole-25.08.2.tar.xz",
-    "hash": "sha256-OFPxGuQUZSF2SolzPnCJxmfpyntD/ckTsmTKWTdVIpE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadiconsole-25.08.3.tar.xz",
+    "hash": "sha256-CJAdImBZ5k6kcUXw/g6XEEqf7no9SbHWnOeVxGnvRNo="
   },
   "akregator": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akregator-25.08.2.tar.xz",
-    "hash": "sha256-0KZvccUVnLv+N+B2LRVXBRVpL4ZG+1WhkYDW1Sms/O4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akregator-25.08.3.tar.xz",
+    "hash": "sha256-HGe7qUnvN2xwfUOV5qo3mNFy67cwOuNHIt/m1cCbD4M="
   },
   "alligator": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/alligator-25.08.2.tar.xz",
-    "hash": "sha256-QIZjRzpKuUJWnSeo1SfkroUrK8vDyhpHQcY+HX64P2Y="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/alligator-25.08.3.tar.xz",
+    "hash": "sha256-OAbXqoE/jrw061PPelDgaXObSbaR1Yt8kGOAXDTcuPo="
   },
   "analitza": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/analitza-25.08.2.tar.xz",
-    "hash": "sha256-124Mohk8mQPyBUYStMz2tPPU4VxeV37/M+9UV/arcGk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/analitza-25.08.3.tar.xz",
+    "hash": "sha256-Gr50HD8Ymz2MuM80tRaJD9ZM8hunXQ9VizcRlWuD5NE="
   },
   "angelfish": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/angelfish-25.08.2.tar.xz",
-    "hash": "sha256-NWH87SN49oIUteK8qAEXpgosCPpdUiOoHwzIN4mr28Q="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/angelfish-25.08.3.tar.xz",
+    "hash": "sha256-ccSns9ZlDrW9mn0ILOA++s4LtegG2POZ561nW7BkN2w="
   },
   "arianna": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/arianna-25.08.2.tar.xz",
-    "hash": "sha256-DsL4hIjZhP+cy7pDEfffP7SI+L3HRIAJwctGrSbAdCg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/arianna-25.08.3.tar.xz",
+    "hash": "sha256-Ou6H67yjIW6oZ2A2JmMSpeekrzQGwg3soS76n4tb2rQ="
   },
   "ark": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ark-25.08.2.tar.xz",
-    "hash": "sha256-dj6r7B6ABQ80Q7t6C8Ntd3soqwcgDvsWYwvzP32wy8o="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ark-25.08.3.tar.xz",
+    "hash": "sha256-yk+3KV8JAoDfAtJLZPET4QxvYYE4s4e8H9eixWHeVU8="
   },
   "artikulate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/artikulate-25.08.2.tar.xz",
-    "hash": "sha256-y6ybg9tGEp5egY+CYTdRcyxuMuenWWd8S5F8cWSgX1M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/artikulate-25.08.3.tar.xz",
+    "hash": "sha256-B8BF81lWTN5ri6U4xtDCq72pKDQekypFy0CBxMFdqOU="
   },
   "audex": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/audex-25.08.2.tar.xz",
-    "hash": "sha256-n4N+u12L0E8Jr5uyKIGfWl/ismllto5tcm5vJDJvPGM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/audex-25.08.3.tar.xz",
+    "hash": "sha256-eaECo9FOa12Sa+DQpmNF/VtYHDwCHlqbZSCBfugT7I4="
   },
   "audiocd-kio": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/audiocd-kio-25.08.2.tar.xz",
-    "hash": "sha256-rnWN3W+r6i2Af0qLcbmLGtLwtTCu6+O1eUtRhxYvkL8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/audiocd-kio-25.08.3.tar.xz",
+    "hash": "sha256-buOBRu17YVBH2wPhQgXqkiEknm64RyS9ZgmvmC9X7qw="
   },
   "audiotube": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/audiotube-25.08.2.tar.xz",
-    "hash": "sha256-PmPdKaJwsP95Xk9QeoMlYa5XKinYomjVubBV4B4PSlA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/audiotube-25.08.3.tar.xz",
+    "hash": "sha256-7g7PpDufa5qrtYPe4OIB8paScfp3ua28HauzSsFJte4="
   },
   "baloo-widgets": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/baloo-widgets-25.08.2.tar.xz",
-    "hash": "sha256-XGzTy29NC2ifxCNnxUGKxr8XiXhxQ5T/tbzV86c0G80="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/baloo-widgets-25.08.3.tar.xz",
+    "hash": "sha256-/AqOxTIbP0uw4fFlzY51dwGbkNV1UXCAJjSmjfw858s="
   },
   "blinken": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/blinken-25.08.2.tar.xz",
-    "hash": "sha256-AsermlIShX8/KOoR4BPs7kf6vYbQ3o9yCi8HTqNzq8w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/blinken-25.08.3.tar.xz",
+    "hash": "sha256-dwWY8ifoy7abSw3eTjum3qEHTj4Kin8H5CQ6GL+HbW0="
   },
   "bomber": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/bomber-25.08.2.tar.xz",
-    "hash": "sha256-VOdFXk4nte9CtcFL1H0jmvZGP7z6eTrp7VlWT6xqibY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/bomber-25.08.3.tar.xz",
+    "hash": "sha256-eMHM10FRXCpUIJATB7hz/FLIb0xaHlGHBHIhX4zpzJs="
   },
   "bovo": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/bovo-25.08.2.tar.xz",
-    "hash": "sha256-dOqMcZHDqZtkkOxQmMqzrVFrxE7h59673zfK4a7t2/s="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/bovo-25.08.3.tar.xz",
+    "hash": "sha256-3+YkhXzh3seAlgygDr7mFe5rULouf6DBSF7NGFVxzeY="
   },
   "calendarsupport": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/calendarsupport-25.08.2.tar.xz",
-    "hash": "sha256-Lzw9pv9gDFccli4YyrfSpseA154oK5TextcKbwhNbUY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/calendarsupport-25.08.3.tar.xz",
+    "hash": "sha256-g0NzWYHoxBRm1w06SOcOHOIyipKO3QvtLa6QOaPPna0="
   },
   "calindori": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/calindori-25.08.2.tar.xz",
-    "hash": "sha256-9eH0pexsT220s+BRUgNKetlffanC4IvCsnrMjMI+aok="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/calindori-25.08.3.tar.xz",
+    "hash": "sha256-t7ylpu88XTa6qK6cVg+/V9mlPmkl1qJIYa7MKn3mzLw="
   },
   "calligra": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/calligra-25.08.2.tar.xz",
-    "hash": "sha256-319aPsI+evmPOAW0vYQmlH4AyNdeP0QU1dpYDgdwCUg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/calligra-25.08.3.tar.xz",
+    "hash": "sha256-dPrHglPEKYU+mfrgC88rhDMtvDqPU4zPcGdCWSZrklE="
   },
   "cantor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/cantor-25.08.2.tar.xz",
-    "hash": "sha256-JZxEFr/CtgzpSZodoP70jVNpsLY+/nW8sNDIkGovIAA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/cantor-25.08.3.tar.xz",
+    "hash": "sha256-VjUAf7nFDYLojez5Jk/0D7n07mWydHTFkwsbUZ6yS3I="
   },
   "colord-kde": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/colord-kde-25.08.2.tar.xz",
-    "hash": "sha256-Sks0OGQoIidW6TM+EobQA6+syy/szKkmhffRQruatgk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/colord-kde-25.08.3.tar.xz",
+    "hash": "sha256-KaawondaAKO9WxsTjHc3LlOviARYDB5BK4edSOXQrt8="
   },
   "dolphin": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/dolphin-25.08.2.tar.xz",
-    "hash": "sha256-BvTxaY9kB/00uMmyED2RohzKtkZ0hbtfoj4jc26mZ5E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/dolphin-25.08.3.tar.xz",
+    "hash": "sha256-Gr1jLr44N99WFiFvacPKn2JAFl+fhFAkIiAydeqo7gk="
   },
   "dolphin-plugins": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/dolphin-plugins-25.08.2.tar.xz",
-    "hash": "sha256-QxHdWblKASYl5/tlh9Tw7AENslccsrUIevAZCc8VD8g="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/dolphin-plugins-25.08.3.tar.xz",
+    "hash": "sha256-KESdFeCqzndWPztvE/R7oGhUFgoHXfQjh/wD9nCousU="
   },
   "dragon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/dragon-25.08.2.tar.xz",
-    "hash": "sha256-AUNDWenG/kqX8fkgPlF7OCqpI3RrR85rJSs23wuBiug="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/dragon-25.08.3.tar.xz",
+    "hash": "sha256-nh0v6TAYFmQYy/yC/C+ThNHFyZvBtQDGkHLI/iz50Dg="
   },
   "elisa": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/elisa-25.08.2.tar.xz",
-    "hash": "sha256-4HUIsISk9d8bzqdYynBailPJDcAfb1Q1qe84eF0bEcE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/elisa-25.08.3.tar.xz",
+    "hash": "sha256-Y2dLvQWKUY10C9mIDWWpr2qBb8M/uQTMHwwMJIRH3RM="
   },
   "eventviews": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/eventviews-25.08.2.tar.xz",
-    "hash": "sha256-bcE4iCT+WrVtG+FbOX6IhKvo4dujel19PGsXQ8TXYjU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/eventviews-25.08.3.tar.xz",
+    "hash": "sha256-6hbNGZOcfU9bna+575N2PosvJsLfIsZw9qV4LdEOOD4="
   },
   "falkon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/falkon-25.08.2.tar.xz",
-    "hash": "sha256-+39ozZTvJPdq86HkoHEZV+7nqVI5ubnEIjZ2maPMEVM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/falkon-25.08.3.tar.xz",
+    "hash": "sha256-FiUtikICi/VLiOHkpa+5WHUwneRPIDFWyZxKZDcg4Sk="
   },
   "ffmpegthumbs": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ffmpegthumbs-25.08.2.tar.xz",
-    "hash": "sha256-0vF4G82w8cov5qu83pPA2EUH8M7iNlDf2U64obfpTIw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ffmpegthumbs-25.08.3.tar.xz",
+    "hash": "sha256-hOzRMaUHmYFfQUUi/BJwxW4O5Fu/r5b54dLJJ43ISWI="
   },
   "filelight": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/filelight-25.08.2.tar.xz",
-    "hash": "sha256-nKR/6/reraoRurzmXBngNaW8dmYA0JeM5JRNnkFmFVU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/filelight-25.08.3.tar.xz",
+    "hash": "sha256-ijqCXFocTzZi17eG91v4+u9qyfZyPI6M0p5s8VvagIA="
   },
   "francis": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/francis-25.08.2.tar.xz",
-    "hash": "sha256-PBqs9qoCAlgigzMMtuih1OHlfvyc/JpUkqoGBlePKxM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/francis-25.08.3.tar.xz",
+    "hash": "sha256-o71EolKHj7XhRRZYBqG6pxt+QL6T7ZTVvYd3GHWV/jE="
   },
   "ghostwriter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ghostwriter-25.08.2.tar.xz",
-    "hash": "sha256-Xw0aUeB8pYZbM1I5qiDeV15M1XpJMpZtWpbY3/Pb1nY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ghostwriter-25.08.3.tar.xz",
+    "hash": "sha256-OZlp7wcHz0iD/OFy1qIt+vKSlKmw+tLnFq1oBFICsAY="
   },
   "granatier": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/granatier-25.08.2.tar.xz",
-    "hash": "sha256-UjN/T3EdDkojbKyL2njB4JUjTEZfQdQL+SaF9dMfl4Q="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/granatier-25.08.3.tar.xz",
+    "hash": "sha256-9JMa+NH6DVZaEsPsiANiSih1cWxalCsWzIgZOuEBYm8="
   },
   "grantlee-editor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/grantlee-editor-25.08.2.tar.xz",
-    "hash": "sha256-+02OZHw2YaMGQ80yrUb1PJcuxvyAN2xNxRSx9lyj8M4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/grantlee-editor-25.08.3.tar.xz",
+    "hash": "sha256-atnws3Sd5VfsR8SdqRR1Q5JIWmZGHA1o9R/XcYhaVbU="
   },
   "grantleetheme": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/grantleetheme-25.08.2.tar.xz",
-    "hash": "sha256-xdtSGNuv2SXkaScoRYFBt6cbnpZ0usEchcho15LCTFQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/grantleetheme-25.08.3.tar.xz",
+    "hash": "sha256-ZJ3pmbthKI/JtK7T6+Ix5FIBzWz9TyR2Nqf9Jw74euA="
   },
   "gwenview": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/gwenview-25.08.2.tar.xz",
-    "hash": "sha256-wYmWeg4h8HU1YOjYc4HoiPPZQ3AdtMHyG+2LW7ivHlo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/gwenview-25.08.3.tar.xz",
+    "hash": "sha256-IADELUDuPpLONV+C0v3dB9J/YT9xzy5laZz+eUp27KE="
   },
   "incidenceeditor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/incidenceeditor-25.08.2.tar.xz",
-    "hash": "sha256-CWWB/XaMWwcaxK/mfJ6zdB4wm2AKcku6wSr2l0bGgJg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/incidenceeditor-25.08.3.tar.xz",
+    "hash": "sha256-0MFcN1FyOrzxAaI6axYtMp4IkknpS9/UKD1o3s8hGpg="
   },
   "isoimagewriter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/isoimagewriter-25.08.2.tar.xz",
-    "hash": "sha256-wfRRmrvrqtUlGa+V6Zr3jN4ZNv4Zl3BJWkY2hxpaLWA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/isoimagewriter-25.08.3.tar.xz",
+    "hash": "sha256-hhC0t4mo11DG9PKOHStfmE7/1+uCKDJeZzrU9CJRLi4="
   },
   "itinerary": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/itinerary-25.08.2.tar.xz",
-    "hash": "sha256-VXA9YIjiWgrbgiSYJYnUl4TpIL6MDnnl9QwTzDKu1z4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/itinerary-25.08.3.tar.xz",
+    "hash": "sha256-KPjO9H+UnOSDJvbSiC1YwceXpuMkxR9dNRDn2yIWH4c="
   },
   "juk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/juk-25.08.2.tar.xz",
-    "hash": "sha256-KzlqgDeK5ygT0CmGtqNQLJdQZbSan+rzgkJsepZaSKA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/juk-25.08.3.tar.xz",
+    "hash": "sha256-uVwfu1rgZ0U7KrUrnA6MCNW7V+4+Xtyx0fsMcC+P/ok="
   },
   "k3b": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/k3b-25.08.2.tar.xz",
-    "hash": "sha256-tOsu4GmpaPfcPsSCU5Wvdea/tInZaiiUjyLuUaNq+jU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/k3b-25.08.3.tar.xz",
+    "hash": "sha256-Vx4fWYGeYwv/2pbJbGMm1fEoqkVW4oK+UZ9MhAkQXSU="
   },
   "kaccounts-integration": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kaccounts-integration-25.08.2.tar.xz",
-    "hash": "sha256-peBuAWaUm/LemVdTUX7bVT+iXu3Z7uWsMJ8vOsHZiO4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kaccounts-integration-25.08.3.tar.xz",
+    "hash": "sha256-f6A0Pww/WTdcSBfL0psP7X5Fy7MfSVbm0/YsCr4qHIs="
   },
   "kaccounts-providers": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kaccounts-providers-25.08.2.tar.xz",
-    "hash": "sha256-+XmuS9Ih7rybPEnNRmIE+R7xjBkVpNzoMgbzhK3Rr9M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kaccounts-providers-25.08.3.tar.xz",
+    "hash": "sha256-EipO8htZau91+iu0HM2XxzMt/NYjSiYCrubBPFhFEG8="
   },
   "kaddressbook": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kaddressbook-25.08.2.tar.xz",
-    "hash": "sha256-RbP8niU57R/LvM1FzkXpw2t1AQiSZZmCCRVfvOcaWNU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kaddressbook-25.08.3.tar.xz",
+    "hash": "sha256-hTXzTM0UKGKQcq/V4uc5xZ4p5KDGfkRPCZF8pDAXqlc="
   },
   "kajongg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kajongg-25.08.2.tar.xz",
-    "hash": "sha256-vYNzVfQl5SDcST64u8YpC134OIQPiCuLou9dHHucHBQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kajongg-25.08.3.tar.xz",
+    "hash": "sha256-R9WGyP0U6ZG/snih9ahTOH681PEhgdLVyc3rQ9+udXg="
   },
   "kalarm": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalarm-25.08.2.tar.xz",
-    "hash": "sha256-f/WKJYoX31DqPaetfc3O4VBySBEU4+uxuFXrhcBl1nc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalarm-25.08.3.tar.xz",
+    "hash": "sha256-NHufVkcecLTDNe6WvHan1cFIut/RRgzQDoi9s/9sZ1k="
   },
   "kalgebra": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalgebra-25.08.2.tar.xz",
-    "hash": "sha256-Igi0+WWHbrSz9C6q4GxvNn/wc1skXZq6zy8sl1pxTxA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalgebra-25.08.3.tar.xz",
+    "hash": "sha256-PcUwwsjUpIuhwtcRfS3hxH4GVCVfo8jUX2xtqs+bHUE="
   },
   "kalk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalk-25.08.2.tar.xz",
-    "hash": "sha256-9DlieqCYApCiu/eLYbGgPTi33hwaqnFwiGe7Xt190IM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalk-25.08.3.tar.xz",
+    "hash": "sha256-8hip+c2oPhJECwgyxb7V18VNgLM1vHeFpjT4eSm53NA="
   },
   "kalm": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalm-25.08.2.tar.xz",
-    "hash": "sha256-0u6i7yr7oRkUpb3WPOBfePV7bsE8ShfJpVbEIkilb64="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalm-25.08.3.tar.xz",
+    "hash": "sha256-z9QK5UcuKGaN295py/dxCV6eKP/oDPMHxDl1MiSnT2k="
   },
   "kalzium": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalzium-25.08.2.tar.xz",
-    "hash": "sha256-mfHaPrBK7jG0XZKLXdMKFnXcIEGUumQ/iXP0rm/bz+0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalzium-25.08.3.tar.xz",
+    "hash": "sha256-NubE9G4aXaqs4U67Wx9trDQprV3z1PwfCt6uw+KOQgs="
   },
   "kamera": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kamera-25.08.2.tar.xz",
-    "hash": "sha256-/wOWIlPyoQjrDh9STSrPLZzJNFYUafuY9sgOkDKUoPQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kamera-25.08.3.tar.xz",
+    "hash": "sha256-Tca4sPtHkoi2V3tEbEVDF14hM2THkb1lC2HsevhV7RI="
   },
   "kamoso": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kamoso-25.08.2.tar.xz",
-    "hash": "sha256-Ry/NTfUXrzf5g+8RaJYcJzk8JeTFPwTkGibgfPRQTV8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kamoso-25.08.3.tar.xz",
+    "hash": "sha256-QhlpQxS3w15yyFAI++GFmuKLuAIHsdI/tHf5v8LzGLc="
   },
   "kanagram": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kanagram-25.08.2.tar.xz",
-    "hash": "sha256-57vmAV82DPVzR/pSaAa5QewDQ3AYGD1EizRk++34apc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kanagram-25.08.3.tar.xz",
+    "hash": "sha256-wVoqCywIzvdFUiDu3fzDCV027qFNaE/F+5/y8dCly7w="
   },
   "kapman": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kapman-25.08.2.tar.xz",
-    "hash": "sha256-uz9Imc5G1AScr2Kr0aEOQl7xVsdLFncVhFjlHFmz0pQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kapman-25.08.3.tar.xz",
+    "hash": "sha256-m2RJ6npbJ9Ih50cU3aLyd2Rcz0MJFVJGhD6lv/9FKXM="
   },
   "kapptemplate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kapptemplate-25.08.2.tar.xz",
-    "hash": "sha256-qbfvgHc8d+nIHI9Rl5Cr2kD2rKF93sJA6cL0zcp8+UI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kapptemplate-25.08.3.tar.xz",
+    "hash": "sha256-NQbkTNMLdIgsoQgkqsUsXOJqs5axBSqOVSQcU20MXno="
   },
   "kasts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kasts-25.08.2.tar.xz",
-    "hash": "sha256-sNpJl2/RJszypKty9VDIs079tYgwwMHvRDcaaFt9O5k="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kasts-25.08.3.tar.xz",
+    "hash": "sha256-zMyOMsnPIG8t/J2zYZaGQ5w+BbnTUr6KyVHJnJrYYnM="
   },
   "kate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kate-25.08.2.tar.xz",
-    "hash": "sha256-te76UZaQmD75K+jMMOr6zh/IyfIl2dhRpcGBmlJjR3A="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kate-25.08.3.tar.xz",
+    "hash": "sha256-yS64tbgcm13JG1xG0gtPOuC3gREUd5/Y+S8VMjP8qQs="
   },
   "katomic": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/katomic-25.08.2.tar.xz",
-    "hash": "sha256-JborSTaM/p0tQTlvB9A3M0g57rZQLnHi+o+bpld9PWs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/katomic-25.08.3.tar.xz",
+    "hash": "sha256-kCG+G+/Nog0lOCy1xiDNZsu/DqOqYhsKrkCpBVOrQsw="
   },
   "kbackup": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbackup-25.08.2.tar.xz",
-    "hash": "sha256-VMeu3w0exMzduCL4MwM10Mv07ED2RJmRXwD+8MAwuLE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbackup-25.08.3.tar.xz",
+    "hash": "sha256-/4keGs/pu0IApPaBZUAlWbsAzs2HkTQc1NQClpVf/CQ="
   },
   "kblackbox": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kblackbox-25.08.2.tar.xz",
-    "hash": "sha256-fh+GT6gzJpOlE3WiDvxX1Nk94rRLhj/vi2ApFChZNiQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kblackbox-25.08.3.tar.xz",
+    "hash": "sha256-7wCVZaokDWZI4FF7vp7Sh7wfWkpEBdbyHT7t4+2/oV8="
   },
   "kblocks": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kblocks-25.08.2.tar.xz",
-    "hash": "sha256-VGwjpKn5b7PLTGjFvZlosuDdwX37vRjeHDPvM2YOnv0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kblocks-25.08.3.tar.xz",
+    "hash": "sha256-CRr+lf/Wh/tIU1d1X3QbRKQYCZOhZpUvtbopUO7OBK0="
   },
   "kbounce": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbounce-25.08.2.tar.xz",
-    "hash": "sha256-4PVacun5C/s3yq6n08UTxbj/U/c51P4D//X17As6rbg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbounce-25.08.3.tar.xz",
+    "hash": "sha256-8UGeSUSGMiO1ontayzIo61giS26vTwyUFkwEYaw9kBo="
   },
   "kbreakout": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbreakout-25.08.2.tar.xz",
-    "hash": "sha256-R8dSNSna4mN2vizPmOteMW7oVqrFLjamurUepf0+7gA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbreakout-25.08.3.tar.xz",
+    "hash": "sha256-BYvwHpN/rc0ykS6ARVh1ZulPfAXQrXE/TmXW01GwT0A="
   },
   "kbruch": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbruch-25.08.2.tar.xz",
-    "hash": "sha256-sLTn/am2A7rMLGKau82RQGnGxkonQX+tIjzYMl2j0Sw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbruch-25.08.3.tar.xz",
+    "hash": "sha256-j9VTZXEbvtWe285Mg5fqPoMWyASGYnyiky095Eg7s1w="
   },
   "kcachegrind": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcachegrind-25.08.2.tar.xz",
-    "hash": "sha256-jVDAcaI9tirOzfItbpQ5aqA+TV/5esx9K+hIY7NPv8g="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcachegrind-25.08.3.tar.xz",
+    "hash": "sha256-rsg436gGtDjRmPW7ZqKpkl7NuG0J2obFk6ITAgUrC74="
   },
   "kcalc": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcalc-25.08.2.tar.xz",
-    "hash": "sha256-kn1cs9Z+MS8UeAWYhvsXqH9iGKArOFlN8WQ/fFi/B4E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcalc-25.08.3.tar.xz",
+    "hash": "sha256-DoQslASW5H9avR7GCB9cbPKIvh3XPttQcdhPBOyhg4o="
   },
   "kcalutils": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcalutils-25.08.2.tar.xz",
-    "hash": "sha256-t7YK2AjaF3f2+QWzPodNp3oG4L0jVb9XejDpTjDGCKM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcalutils-25.08.3.tar.xz",
+    "hash": "sha256-zqA3tnpRC6TjwJE6kLor/3JAcLKSUSSN8jr1+wuxii0="
   },
   "kcharselect": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcharselect-25.08.2.tar.xz",
-    "hash": "sha256-3RUCQnrobAS5PVPUwrqQaaYMtSZ21CAQtAMdGQghjlA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcharselect-25.08.3.tar.xz",
+    "hash": "sha256-r+4jbl4Dda7gOO1CkqOhiPpRJR2Sq46HLNn+cTzeOuM="
   },
   "kclock": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kclock-25.08.2.tar.xz",
-    "hash": "sha256-4u4DWOAWgHim49h2bntnOyLFvHhkASoFt5Je3bnpGtw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kclock-25.08.3.tar.xz",
+    "hash": "sha256-2Kz8qjb/jdQk3oKuFja63Zqi9QpsTj41eI7VzDliduI="
   },
   "kcolorchooser": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcolorchooser-25.08.2.tar.xz",
-    "hash": "sha256-tj/Nphft9sIOA6Qqh8zKB+C5pSKslGBV4/mPVjlDcxU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcolorchooser-25.08.3.tar.xz",
+    "hash": "sha256-as7OA7OASmEIItBY+7vNq+w/4a2mqL/+1tNpUmkwvmc="
   },
   "kcron": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcron-25.08.2.tar.xz",
-    "hash": "sha256-8Ity7bspzLYaizfEPC8lMDovNo38HT+cZfdDTpzRloM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcron-25.08.3.tar.xz",
+    "hash": "sha256-UqVAID6bKN6+UkBefDEpzia1OvHdwXFlt7UlVcx1e2c="
   },
   "kde-dev-scripts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kde-dev-scripts-25.08.2.tar.xz",
-    "hash": "sha256-4dcrwyEPtWjy7/2xuz+aWMTad4rxuksAXhOOmqF6Nek="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kde-dev-scripts-25.08.3.tar.xz",
+    "hash": "sha256-8J52s97VzHa5nCa8sCdVONWQJn8IySG1JAwISjy75H0="
   },
   "kde-dev-utils": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kde-dev-utils-25.08.2.tar.xz",
-    "hash": "sha256-JobJjo+CfOM3Rjp0ZVQ1djK/6aXfo6hOXFX273stMkc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kde-dev-utils-25.08.3.tar.xz",
+    "hash": "sha256-6BlfM4lgpNXvJHxmDkYrntQFPGB40jrtN8AptiWBKkM="
   },
   "kde-inotify-survey": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kde-inotify-survey-25.08.2.tar.xz",
-    "hash": "sha256-R75EgYmcWinoSEm5/1ZLQyBBhvwGnekCXqCUiY+8n2w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kde-inotify-survey-25.08.3.tar.xz",
+    "hash": "sha256-s5wSm5a4CQT0p7X4KOzZiJHDK2G5SW6NYxBYnakeuVs="
   },
   "kdebugsettings": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdebugsettings-25.08.2.tar.xz",
-    "hash": "sha256-Brt+QdxF28yKOBwxbSPw+yAKnMbH8Zrrm021dg4e8+0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdebugsettings-25.08.3.tar.xz",
+    "hash": "sha256-dpkOq4FsRfEWyCMdsz8Wr5VezHM8TrfIn+g5d/MpPaA="
   },
   "kdeconnect-kde": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdeconnect-kde-25.08.2.tar.xz",
-    "hash": "sha256-5CRbagY9bfDhI/1nwGX1wkmU4hs0lYnNplleSAuRawk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdeconnect-kde-25.08.3.tar.xz",
+    "hash": "sha256-bkHx8i6F9ecKkt1so+aWg2SJbeN6/l2ut82lmfA+Xis="
   },
   "kdeedu-data": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdeedu-data-25.08.2.tar.xz",
-    "hash": "sha256-sTjppV2QE87JhoPVml0BD50xk9jOFj9Z1aYSa58B+m8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdeedu-data-25.08.3.tar.xz",
+    "hash": "sha256-cfhXK1fQ7bBzQp4vOUFFkRwINosgyqNoXPZMrbxvoqo="
   },
   "kdegraphics-mobipocket": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdegraphics-mobipocket-25.08.2.tar.xz",
-    "hash": "sha256-eZrzukGQMTOXOJMwZFw/oA9CkBf3M4QzyNSr7lWtZNI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdegraphics-mobipocket-25.08.3.tar.xz",
+    "hash": "sha256-pPj/FjInDBFpUJVzJmGZXZY5+DM8jWNzBlTXh9zDtVQ="
   },
   "kdegraphics-thumbnailers": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdegraphics-thumbnailers-25.08.2.tar.xz",
-    "hash": "sha256-AuH8XSp3rZxXFz3q4jM6Cj8ERG58z2gvH2awmQLwGt8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdegraphics-thumbnailers-25.08.3.tar.xz",
+    "hash": "sha256-FfwrsleMfFhGNTPr1tjU6j7D2er0fgT3TpMiwTXJfoQ="
   },
   "kdenetwork-filesharing": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdenetwork-filesharing-25.08.2.tar.xz",
-    "hash": "sha256-km5A7fwYnOWlBDwyO4NqzOoPXU+RFwj/QUWYQLmWYO4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdenetwork-filesharing-25.08.3.tar.xz",
+    "hash": "sha256-0s71ZEOEO4KlwhDsWm5MKh7RoqhtUX5Xc4VZU7qWpI8="
   },
   "kdenlive": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdenlive-25.08.2.tar.xz",
-    "hash": "sha256-RkUpuuXF++dHPb0DCPqMNYj2jye1yZZErRgynaVXuNk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdenlive-25.08.3.tar.xz",
+    "hash": "sha256-gbpOkRFH1dvTO89GSy8K6fV7iCTb/H+rIfPBG7ZDN4M="
   },
   "kdepim-addons": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdepim-addons-25.08.2.tar.xz",
-    "hash": "sha256-0UWCSIgZZTZgMFE+DheJzTiqB62Zfua3vB18Y42Wz4c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdepim-addons-25.08.3.tar.xz",
+    "hash": "sha256-uqhcF0fJ54ly0aVNe7ezAN2/VAc0UsM4g1a8V21HnNc="
   },
   "kdepim-runtime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdepim-runtime-25.08.2.tar.xz",
-    "hash": "sha256-wDD5iFTjHZJwcc1LS7wtl3ktTO+6xUiqbNddsGAlEso="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdepim-runtime-25.08.3.tar.xz",
+    "hash": "sha256-mLes8HJxZY09kWmlEWdlE74GWbc/XLH7RjCutU+mX4U="
   },
   "kdesdk-kio": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdesdk-kio-25.08.2.tar.xz",
-    "hash": "sha256-C5y8kWb0mC4JsQmNvLEB0xl5/08HLQ1kqepj9SwmSXU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdesdk-kio-25.08.3.tar.xz",
+    "hash": "sha256-QKNbsC0nMV0BKbgYHnpvy47k9MDMa4T4GMEPo/i31nE="
   },
   "kdesdk-thumbnailers": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdesdk-thumbnailers-25.08.2.tar.xz",
-    "hash": "sha256-WL9S2IGmTuQosO6dAo7f8G6+h9kiWE4m13r86B7Aw7M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdesdk-thumbnailers-25.08.3.tar.xz",
+    "hash": "sha256-QWKweV1VrfvJ98G6jpZaYYqleygFiPQ9CkrbRc4I6HQ="
   },
   "kdev-php": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdev-php-25.08.2.tar.xz",
-    "hash": "sha256-7m4IJU6vEeZ97LsY5sFyxQMELahAOAmTgryhJm47mQ0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdev-php-25.08.3.tar.xz",
+    "hash": "sha256-9S7yko0u+dyyHzGtKNuc5DCcatT0+8ap0J6gc3KG1MY="
   },
   "kdev-python": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdev-python-25.08.2.tar.xz",
-    "hash": "sha256-ESl9BcQX+ecQjtOh8gVDbnWbqUWcPG9PlHNZ1nZRQsU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdev-python-25.08.3.tar.xz",
+    "hash": "sha256-VroTp+FyGuF6AVE4ZJ7270lw6Z1/9HMi8pamnxc0+z4="
   },
   "kdevelop": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdevelop-25.08.2.tar.xz",
-    "hash": "sha256-uHkj1tN95TiPNsLprmbhsJa59CW/n6D7+WNo9q9GWyk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdevelop-25.08.3.tar.xz",
+    "hash": "sha256-TSuSzzepozJN2RNwdcX1UgR72IpnNCCqFIT83nm6zpI="
   },
   "kdf": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdf-25.08.2.tar.xz",
-    "hash": "sha256-fFri8/WEG706a2XjBN+QUjAcY+Bj6dFeyf+oW34bAds="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdf-25.08.3.tar.xz",
+    "hash": "sha256-fldlaE/uQm/eytp6lJoXF/maikdnsv1mnJoDZrFF+mU="
   },
   "kdialog": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdialog-25.08.2.tar.xz",
-    "hash": "sha256-+cJGtN4tfkBqHJk2G41/qaOm1uzewuVVhmceq0zmQqY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdialog-25.08.3.tar.xz",
+    "hash": "sha256-0sn8M+y0ii0TVkO4PnALkhLR6A/WUZccA1v68yjfurQ="
   },
   "kdiamond": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdiamond-25.08.2.tar.xz",
-    "hash": "sha256-ZpqXyFs43+4gmu2zWEP1oiDw8zPRZIp15mm7jLsb7e0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdiamond-25.08.3.tar.xz",
+    "hash": "sha256-6iRNvZWgW+NJLqNH2wOFeAAuYCRa4EsJBt4MErgrN1U="
   },
   "keditbookmarks": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/keditbookmarks-25.08.2.tar.xz",
-    "hash": "sha256-wwkul/fh0cKxEUJvgT4frYjqc/zbn4vO/lRBj6LyLf8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/keditbookmarks-25.08.3.tar.xz",
+    "hash": "sha256-T1ehKu1z/OzDBZoGRZMdG4NrRCZxlClHY3QhMbIdOvo="
   },
   "keysmith": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/keysmith-25.08.2.tar.xz",
-    "hash": "sha256-ZiiqtMwrtCeLdNAeffv0KV113Ve10gqvPvCOWmDx4vM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/keysmith-25.08.3.tar.xz",
+    "hash": "sha256-wYi87L4GV7fNU6bcZKLyyvveFH58m9LJC1hFr9CMFSU="
   },
   "kfind": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kfind-25.08.2.tar.xz",
-    "hash": "sha256-HvgdtBOG/MaAXz/zf1AqY42kEJVNBQ+v40y3bCDu1QE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kfind-25.08.3.tar.xz",
+    "hash": "sha256-dW1PmJOSCGzSEVU9WGE9X+tBMQczuOo1xQxYaTgMlRg="
   },
   "kfourinline": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kfourinline-25.08.2.tar.xz",
-    "hash": "sha256-7I6wYJoswqS7FKz4MjTdNsRgYOHoi04VtfVnr/+VIss="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kfourinline-25.08.3.tar.xz",
+    "hash": "sha256-xVivDA8SiiV0wTNwsLIiWJ4tTKV4pUE6qDWmENyplxI="
   },
   "kgeography": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgeography-25.08.2.tar.xz",
-    "hash": "sha256-V7sE53RPoB4rO5sqMy9DTHkgOUbg4yaNt5oC8intIj0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgeography-25.08.3.tar.xz",
+    "hash": "sha256-jIBortFwkZanbey9t33GHyq/U5vzwrJgcCR1vy4sZ7I="
   },
   "kget": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kget-25.08.2.tar.xz",
-    "hash": "sha256-YhTVgBrOpaen8eh8JoxhdjchMpe9OqgXCKbpfDs3ch8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kget-25.08.3.tar.xz",
+    "hash": "sha256-veDkZTVSqOs5qNMiCs214QQsdv7XcbgWJ4lTPwOn440="
   },
   "kgoldrunner": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgoldrunner-25.08.2.tar.xz",
-    "hash": "sha256-ePuHxhhHeX79SfLh0QeEu+ez/+TBiU6GXXwhjQcLERY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgoldrunner-25.08.3.tar.xz",
+    "hash": "sha256-7l+twe+Oytb2acTGLnZ6NwrzQPDAkoL/m/V6gL+Jtcw="
   },
   "kgpg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgpg-25.08.2.tar.xz",
-    "hash": "sha256-OZTEwUaMAoaLWLImYLuqyEX9QgNIjWj2rJFcBKYWfEo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgpg-25.08.3.tar.xz",
+    "hash": "sha256-5B6fbhRohlNM2G8UnlgWyiz2bavHuCTw81AGkxhC+K8="
   },
   "kgraphviewer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgraphviewer-25.08.2.tar.xz",
-    "hash": "sha256-bqzj6xA9HmILLYMuU5CTIwHc/aKgwUSdWyw2oVY3Kyc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgraphviewer-25.08.3.tar.xz",
+    "hash": "sha256-jyT6eUpePzAig6CHv2y81QqYxAI646ol4ve0lx6oZgU="
   },
   "khangman": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/khangman-25.08.2.tar.xz",
-    "hash": "sha256-rIodkzSHyWdcaQp5NW2/BXXIjTSmWzby5vzGqgIMF/0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/khangman-25.08.3.tar.xz",
+    "hash": "sha256-tF9Vxx+l4tBbyPmM/anQduONRlwyXLQ9OZQu62dBr3I="
   },
   "khealthcertificate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/khealthcertificate-25.08.2.tar.xz",
-    "hash": "sha256-bngpKnIR2pcd/jazEd9RcwDRvibhavaehlCUA9UPJ6U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/khealthcertificate-25.08.3.tar.xz",
+    "hash": "sha256-bO0XoVXevMHhn0DO4sccX0g882bUgx3rxewyI/slbdo="
   },
   "khelpcenter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/khelpcenter-25.08.2.tar.xz",
-    "hash": "sha256-63nlRUk3t7r0REJKwCqXV5q4B1OQjbvrVR7dcfZ4sNo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/khelpcenter-25.08.3.tar.xz",
+    "hash": "sha256-T7S7Qk2u8xUxtR0fr5NZTIdvMBwP0gsIzXiFwT1Jm6A="
   },
   "kidentitymanagement": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kidentitymanagement-25.08.2.tar.xz",
-    "hash": "sha256-15I5E6TYsNn+7L4th4Pd4PcRcLNRIzzkfdrL3bC965E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kidentitymanagement-25.08.3.tar.xz",
+    "hash": "sha256-+7Ie/0TQAgZuOsSmkFrZFeetNVqn00+OYwcwizhP99s="
   },
   "kig": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kig-25.08.2.tar.xz",
-    "hash": "sha256-YNOAQBVvOwEmOI2UBegNRrUu/E+4lUMuTmGHnQuz+fM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kig-25.08.3.tar.xz",
+    "hash": "sha256-ETHgBXmdAOo0/q2zlMaPj7hrvbwBuYLNKjD3BsV1ToY="
   },
   "kigo": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kigo-25.08.2.tar.xz",
-    "hash": "sha256-lyv55XsYItZ2YmFl+/E7pBhidSe82VxgtbrI5M/3Jp8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kigo-25.08.3.tar.xz",
+    "hash": "sha256-BTrTCeGvGk9rQVOv7D/qqUhm+x6V08ag/FLH9jV/OTs="
   },
   "killbots": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/killbots-25.08.2.tar.xz",
-    "hash": "sha256-PhdZcV0F3Fz3OnJ646bEeqPZ0RI0fMehXk5ZelHgzPA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/killbots-25.08.3.tar.xz",
+    "hash": "sha256-yqVxIJ52AmiLaAS3o44ET9IkVhaOYdwXWFqBFWSqOqs="
   },
   "kimagemapeditor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kimagemapeditor-25.08.2.tar.xz",
-    "hash": "sha256-+DnGsk2X0PDdqP4btWB9h+ya7kddRD8Fuj0e7J9dY1M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kimagemapeditor-25.08.3.tar.xz",
+    "hash": "sha256-tmqzf7iiIBTjkxCY9fRU/TDJHHcr94sV1Hqm0BlMVpI="
   },
   "kimap": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kimap-25.08.2.tar.xz",
-    "hash": "sha256-/9Sud0FwN/NldnKqLKFBXQr1V64pwad6hJbmFqYw6Gc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kimap-25.08.3.tar.xz",
+    "hash": "sha256-1rgwfLK4gzqN9IW4d4PVgVGiiQW3tueQgnxSQzSJqz0="
   },
   "kio-admin": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-admin-25.08.2.tar.xz",
-    "hash": "sha256-tY42MP0RT5pEPXKcJjdAIT8QiAL2E2S5yVlZ0zi7n+c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-admin-25.08.3.tar.xz",
+    "hash": "sha256-WrOsvyja0G9myC+mhqVaFKAT9cXFbsFgfKhHp/RtIU0="
   },
   "kio-extras": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-extras-25.08.2.tar.xz",
-    "hash": "sha256-ho+fLg9XJyU4fqMR8ZnS+gRKzANlbzdR58omQAhhN18="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-extras-25.08.3.tar.xz",
+    "hash": "sha256-mflm3MZjvoyzyQZ3jIKzLaSxeL0pbYzYW54/VujpwtI="
   },
   "kio-gdrive": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-gdrive-25.08.2.tar.xz",
-    "hash": "sha256-5sNxWCRU9TqbgH8ODDQMFV1h+so88aJHwY+g5PDRYyU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-gdrive-25.08.3.tar.xz",
+    "hash": "sha256-LA8ct2X1wA3B6f77GEnscJ4zTi9WGO3k3UqGzeLkS5M="
   },
   "kio-zeroconf": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-zeroconf-25.08.2.tar.xz",
-    "hash": "sha256-eD33N5dHimorDVSrxm27wZeKqKnaSCWxw8h+TYHrCrI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-zeroconf-25.08.3.tar.xz",
+    "hash": "sha256-3nuyMp3bkMBKjBt6t+EiXico7Yu3VUAp5LS0HkS1c+A="
   },
   "kirigami-gallery": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kirigami-gallery-25.08.2.tar.xz",
-    "hash": "sha256-t6orBu29tawT/o0ogVd4S0BlLEaResFP1ryMYosqEug="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kirigami-gallery-25.08.3.tar.xz",
+    "hash": "sha256-3+flmIXsSBpn6IeivvGgkSj8OoYuALRKTJYv2HJmFoY="
   },
   "kiriki": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kiriki-25.08.2.tar.xz",
-    "hash": "sha256-/F7pUItS+uwL8dzbRhcMCy7+erPzm3vfY3T7XOQIS0Y="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kiriki-25.08.3.tar.xz",
+    "hash": "sha256-gmEkYfdbe/aT9Vf5PbxsAncG+8Kv5mpcqSUWmWchYxU="
   },
   "kiten": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kiten-25.08.2.tar.xz",
-    "hash": "sha256-YeytqWt3xmvWJQBiIomo13Aaho73170w+mIIH7iDZXI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kiten-25.08.3.tar.xz",
+    "hash": "sha256-7pUwcbfbzCkMg32KHlF3ZCELpdWJim8VcAgTF28LvFQ="
   },
   "kitinerary": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kitinerary-25.08.2.tar.xz",
-    "hash": "sha256-4P2xwp88du5RlyeOVbasLB7AuB6Awmhb3TSzDLWSWG0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kitinerary-25.08.3.tar.xz",
+    "hash": "sha256-s3QG/balE1+8F8iMy38tCIjm1T4W9C2BlOphiRH0ciA="
   },
   "kjournald": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kjournald-25.08.2.tar.xz",
-    "hash": "sha256-JJU+F9pt+tjGN8ScimR7xim8aM9h8lDcEDbReJuXM50="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kjournald-25.08.3.tar.xz",
+    "hash": "sha256-Ce6AgQJxJgc/jP6/v7+Jh+PQsGEsHnxSXa3Tt8w6X24="
   },
   "kjumpingcube": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kjumpingcube-25.08.2.tar.xz",
-    "hash": "sha256-kf+2hyOpB2BJ2yyunbHBMBwSR/BMnfcPPdtNeoUI1aU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kjumpingcube-25.08.3.tar.xz",
+    "hash": "sha256-oAWb720t3hH0WNbd9NXqnoCfcyPC9nsEG9tByJr0QOM="
   },
   "kldap": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kldap-25.08.2.tar.xz",
-    "hash": "sha256-kgZ7nNBjw/2X9nBheHgZUbmmKGG/MWBK+/P9BMS35Uk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kldap-25.08.3.tar.xz",
+    "hash": "sha256-YheAQ/cjuVme+G1EZmJ9VTeAd4LJzu/kq3lZGxr3wDI="
   },
   "kleopatra": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kleopatra-25.08.2.tar.xz",
-    "hash": "sha256-FoNYJnSLT/+cuube0YGbGMNCL/YNohxqat3Sff7rT8w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kleopatra-25.08.3.tar.xz",
+    "hash": "sha256-PC9lIH7KzW9yYx6DKpM0KmxDJg6JevzChdGAO1HMZ2Y="
   },
   "klettres": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/klettres-25.08.2.tar.xz",
-    "hash": "sha256-p7VvRvkeAnJGQrkys1AgubxlL+ARJuHwEfz55sxEkMM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/klettres-25.08.3.tar.xz",
+    "hash": "sha256-cGUurM+AAXa6P1Ep/ROoKSuXF8MISYgBtV5VOk8XmHM="
   },
   "klickety": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/klickety-25.08.2.tar.xz",
-    "hash": "sha256-JmhLJpoHKmdssz6KwkkCcoCvBvaEyilYq4b/8Zzn0lo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/klickety-25.08.3.tar.xz",
+    "hash": "sha256-/GWRi1rRBOVXLmG/xa+kbWi6MU0V8gjukGBEPJEv7Jg="
   },
   "klines": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/klines-25.08.2.tar.xz",
-    "hash": "sha256-CXCgFkpD0ydEF+IRKbqTQI29A8sizHeOEersrmeY7l0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/klines-25.08.3.tar.xz",
+    "hash": "sha256-CRE1uZF2YFpBpHI3L0umm8vqLzYFMTEEmu2ecYfJmnc="
   },
   "kmag": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmag-25.08.2.tar.xz",
-    "hash": "sha256-8zQ5mKa4hEU/yXOOek9WD3FuNKUyj58N8SXutTJ0wIE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmag-25.08.3.tar.xz",
+    "hash": "sha256-xDB5Dlk7g0ZXFyuUq9oP8MElv2rESUayR8c32yGqtGg="
   },
   "kmahjongg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmahjongg-25.08.2.tar.xz",
-    "hash": "sha256-7ER5SNKpmgc5pjjpJIVi5FRQOXgFElXTMlCOnoTh3wY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmahjongg-25.08.3.tar.xz",
+    "hash": "sha256-KWpQulk5yUiDSoUU8u9rr7E3auUFpc+CmO7sMRnp8SM="
   },
   "kmail": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmail-25.08.2.tar.xz",
-    "hash": "sha256-I+Z9+IMbvLKh9SZA51CQBFW1FFl3VjwCFJWmL/MdH/8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmail-25.08.3.tar.xz",
+    "hash": "sha256-pUTofOL63026oJnAGKGeWTu7gC4KmTAWvD6RTt1qkfQ="
   },
   "kmail-account-wizard": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmail-account-wizard-25.08.2.tar.xz",
-    "hash": "sha256-dQeRJ0qN3JkUL0vd5lMixbmL7IY0puRxk5yVlI3lM7c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmail-account-wizard-25.08.3.tar.xz",
+    "hash": "sha256-M2XxYVMgGinDF5mxCPwI4/aUwjOuFwQmiJ+BUcSYw0Q="
   },
   "kmailtransport": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmailtransport-25.08.2.tar.xz",
-    "hash": "sha256-9vnYr/JlTGqjE1gFlom5sQhGz+BeU0Rfy5WLKw/lt5Q="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmailtransport-25.08.3.tar.xz",
+    "hash": "sha256-IfuF62TtJcrtJx0plwDxBmqTQxKYZH9drDbotvMlN64="
   },
   "kmbox": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmbox-25.08.2.tar.xz",
-    "hash": "sha256-KImwM4BLm7vEzonJEmPx1mHmUZX9PnywKcza6vLhuSs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmbox-25.08.3.tar.xz",
+    "hash": "sha256-MWGF+jh+OFYb3S4KC5hKP8AIMqYicdBtz+vOHcfwVYw="
   },
   "kmime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmime-25.08.2.tar.xz",
-    "hash": "sha256-99K6VbOqEukEiSIJrZ/icc1aOljCnDiibdIQA6pVDq8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmime-25.08.3.tar.xz",
+    "hash": "sha256-H0/KO/+Zn9hNnPPYBz3308FpOthVS1YAF05KmqGDfwE="
   },
   "kmines": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmines-25.08.2.tar.xz",
-    "hash": "sha256-FWhc4f+cJOm+6U3rnDnTXyfnVh/LDdjN5W9xnqjw+sU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmines-25.08.3.tar.xz",
+    "hash": "sha256-mfDaPNivn6Y0qPfTTkM77bxL+9okiGzV4L3eSOCtSj8="
   },
   "kmix": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmix-25.08.2.tar.xz",
-    "hash": "sha256-YPjTZTDBdqImDq5nSqwuckFQjcrWKH/7v6r6V5QqZec="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmix-25.08.3.tar.xz",
+    "hash": "sha256-+EKMFgrbaM2foA026VQ65PRPNk/VmTJ+dpSrYzEI95w="
   },
   "kmousetool": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmousetool-25.08.2.tar.xz",
-    "hash": "sha256-5GBrMRCNh7v6c1oJ3P0AWEI3of+NcIxSN91mLQFK6r8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmousetool-25.08.3.tar.xz",
+    "hash": "sha256-edPgAyHPZPEONVe1MdELxYc11r6qI3JDv3mG43Ak4I8="
   },
   "kmouth": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmouth-25.08.2.tar.xz",
-    "hash": "sha256-FC72jT0PxfKA0geHYZVdBaa7tZ6yxZrX0wwAk/JTaw4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmouth-25.08.3.tar.xz",
+    "hash": "sha256-L+9tjvkyAqLaysO7l/AtN3kMxiFMxtlJY7G7M7Hu034="
   },
   "kmplot": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmplot-25.08.2.tar.xz",
-    "hash": "sha256-Anyx9LAOPTpQYseR7pEIul6DcX/iMQ1vM9j87uoNkeI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmplot-25.08.3.tar.xz",
+    "hash": "sha256-JCNo7aVqMy9SmVKvC2JYw67GpZuQNQzfb+/OoNpnuIM="
   },
   "knavalbattle": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/knavalbattle-25.08.2.tar.xz",
-    "hash": "sha256-An4NjaYLt44qC7j3tBAwtWxd6jxHtJOUyD6QTgtfdso="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/knavalbattle-25.08.3.tar.xz",
+    "hash": "sha256-DYbxF2HZhYrbqgFua+uGfibr+f9SsxLXnNIm/xi+1i8="
   },
   "knetwalk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/knetwalk-25.08.2.tar.xz",
-    "hash": "sha256-v8GAwbqLVEzPC16JS9uyN5VAp3YxFrxWDiuaUgVBBPM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/knetwalk-25.08.3.tar.xz",
+    "hash": "sha256-z62yo0fxZqLOPpG2InFkXj7FSQb99tgCaS2aLhSjoW8="
   },
   "knights": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/knights-25.08.2.tar.xz",
-    "hash": "sha256-S3SYsOFeGYRiLK6tFiKZEbAyIVZawc35XCmWm5BK+g4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/knights-25.08.3.tar.xz",
+    "hash": "sha256-ygibJTDdrR6CVpWgVwnGi6pwO5lu61hjrSabY30RKD0="
   },
   "koko": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/koko-25.08.2.tar.xz",
-    "hash": "sha256-xhtQqEo94Iph7je7fmIER5X57EyGXrNXqFSSvRRSGn4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/koko-25.08.3.tar.xz",
+    "hash": "sha256-zWcEO5aclGnZ6cEGfPQsLqPiLgInq+86d2INj80ll1c="
   },
   "kolf": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kolf-25.08.2.tar.xz",
-    "hash": "sha256-0fLsgPZaEWVCtBECQfGdKT8Qhb+jV//OeglYp6TIx6s="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kolf-25.08.3.tar.xz",
+    "hash": "sha256-PZStjMm19A8cMJj7UPm1ZPbVlwhDaqo8G6ouXpR0UJ0="
   },
   "kollision": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kollision-25.08.2.tar.xz",
-    "hash": "sha256-WPQsUDkCUE5NhULz4i2dU7d/b4FEuVqlZxnG+E4/70o="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kollision-25.08.3.tar.xz",
+    "hash": "sha256-nfXBZsVK6K14Y8fxV06df7C2V8HfXNzuTk/1Dtyilzo="
   },
   "kolourpaint": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kolourpaint-25.08.2.tar.xz",
-    "hash": "sha256-Ltr6ld26OUX1TzTlxhgnLsrNTGDV9avnCBnM8Gz2Sc0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kolourpaint-25.08.3.tar.xz",
+    "hash": "sha256-7ffBmyNhxQ2VVknbE8/JOVIwi1mpQKCUWO2JjE6xtAw="
   },
   "kompare": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kompare-25.08.2.tar.xz",
-    "hash": "sha256-B46EKx+MKyfJwZUvoTRo4Luxa3cPy0KG6C/IkTlWk7I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kompare-25.08.3.tar.xz",
+    "hash": "sha256-zkMG4+6PIQ0f64h+SZgVcCt9OMT9OioKp1BJWc1BT+I="
   },
   "kongress": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kongress-25.08.2.tar.xz",
-    "hash": "sha256-HCo0kD444lchYnb0vDhzL50Wvd0Lqk7G3vT5kEE1ttc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kongress-25.08.3.tar.xz",
+    "hash": "sha256-nX9eeJU1U6Z/GAPe57DG4xgmhtwXPHZU8j86wtxVVds="
   },
   "konqueror": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konqueror-25.08.2.tar.xz",
-    "hash": "sha256-M29xFdQPIevLT/De9T6428ZRVEpbN9OE7F5xSuFfqKA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konqueror-25.08.3.tar.xz",
+    "hash": "sha256-PPJVeXyJh2kuq+/pS4bibpSurJB/ZZMISOB/YQRMQmQ="
   },
   "konquest": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konquest-25.08.2.tar.xz",
-    "hash": "sha256-0noUGcNQNv/pyzTzooafXo7PV40Bq7A9DVrRWiE93A8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konquest-25.08.3.tar.xz",
+    "hash": "sha256-CpDVgw6MY22JJWByJS453CkPZ81ZC1yDv0W+RO/DXvk="
   },
   "konsole": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konsole-25.08.2.tar.xz",
-    "hash": "sha256-Ig+0SgLl3TEQvH2KBPTXyRC8mbWxh3o2vv0G0eZf43c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konsole-25.08.3.tar.xz",
+    "hash": "sha256-CVp/8Q3zxwd5s1b7O1mEBiu8aYu+2WYjDj28z2rzZhU="
   },
   "kontact": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kontact-25.08.2.tar.xz",
-    "hash": "sha256-G31bfbQu2P8D3eWnpUm8/ni5o9t792zn7Tl+ZJrAeRI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kontact-25.08.3.tar.xz",
+    "hash": "sha256-qEEb6WO4KCFWcStbsgs93mo743dpg3VY5ZCm1e0Fsvo="
   },
   "kontactinterface": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kontactinterface-25.08.2.tar.xz",
-    "hash": "sha256-6l6yL+uHVMUO1KGn4WWYZ2wGtS15/mMln+/iHlLJcyk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kontactinterface-25.08.3.tar.xz",
+    "hash": "sha256-e1nQOAevvoku0A58Im/Yft6Mp+Ond6EcIoaYs9gFl4g="
   },
   "kontrast": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kontrast-25.08.2.tar.xz",
-    "hash": "sha256-tuyd5u/iPFvgx9lFqeLgq4bgP3+WQPwe+YFc+FZOBa0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kontrast-25.08.3.tar.xz",
+    "hash": "sha256-UgvgiPpNWS34GYRybm5Ti3hvOx7MYoE/soArpzh1nGo="
   },
   "konversation": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konversation-25.08.2.tar.xz",
-    "hash": "sha256-Sg5j1we9Of9uqRXXVMvKKvEcqNapO7atEGrFbiK086k="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konversation-25.08.3.tar.xz",
+    "hash": "sha256-XkW3jDLY9ydczcUNl4DFrpA0GO2MeXTV2Ylo3DaFgI0="
   },
   "kopeninghours": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kopeninghours-25.08.2.tar.xz",
-    "hash": "sha256-D605x3tytxSpxbax4qsP2NI+8Uib/PvfG0ff6pmMcUM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kopeninghours-25.08.3.tar.xz",
+    "hash": "sha256-DmCIXSzbiP4L9C/jnwHJ4oTddVcnxYVxSDLrqYwRy3M="
   },
   "korganizer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/korganizer-25.08.2.tar.xz",
-    "hash": "sha256-kGDTsN99L6BpkaPh6z+q6lYRj7kZ3L4wTFWh3zNNTEU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/korganizer-25.08.3.tar.xz",
+    "hash": "sha256-YqGg0VhbkthlL/GU/Mlrsog7zAGOy9T16u9ukPawuXU="
   },
   "kosmindoormap": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kosmindoormap-25.08.2.tar.xz",
-    "hash": "sha256-Oaf0CUc1Kj5EnO+ARfeAqU1a9NleGAD2pjGaZSkoMZs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kosmindoormap-25.08.3.tar.xz",
+    "hash": "sha256-Giziw+UUv+Aeex/elDvwmRIcrYKoj0RL2sA7V1Cb498="
   },
   "kpat": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpat-25.08.2.tar.xz",
-    "hash": "sha256-esAFdA2SXLEsrCrb/k8YwFLuE/V+C8y5gm7RijH2DZY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpat-25.08.3.tar.xz",
+    "hash": "sha256-ZeAz17mquql1cBLUtQurzJG1wslBdMM05wQ7Z4WDJu4="
   },
   "kpimtextedit": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpimtextedit-25.08.2.tar.xz",
-    "hash": "sha256-jZVgQsnSVZoOFpU6OAtD+QdqTAnueYofNcCL2h2lx7E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpimtextedit-25.08.3.tar.xz",
+    "hash": "sha256-Qpv/phStKz6nQkcCwcSBL4zC5C7iEM1av3yd1//kbUY="
   },
   "kpkpass": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpkpass-25.08.2.tar.xz",
-    "hash": "sha256-RZnluLHbBHxHTMTPWiO/fUloCCdCmGJEoTh1q+hjQfM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpkpass-25.08.3.tar.xz",
+    "hash": "sha256-OAKm8j7dkBvpdcA7PrY+R46ThDhtiDsiiftZjt8+dYs="
   },
   "kpmcore": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpmcore-25.08.2.tar.xz",
-    "hash": "sha256-OQJDaeAQARGaX+ylwjD39y6ktiX08nZ8SPbjPAepVVU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpmcore-25.08.3.tar.xz",
+    "hash": "sha256-QwIiSYs6DdS7YdryYfBkg4+NHoNzMGOk9je1knHtaOM="
   },
   "kpublictransport": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpublictransport-25.08.2.tar.xz",
-    "hash": "sha256-st7J5F/WMcjW34HAjUufRwbuPUeBFlQxoEpLTAyMLtM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpublictransport-25.08.3.tar.xz",
+    "hash": "sha256-7Yh98j0EoevRcbWcmd+uwm1iJU6aesT4pwhLowFYbBc="
   },
   "kqtquickcharts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kqtquickcharts-25.08.2.tar.xz",
-    "hash": "sha256-hpkzB8squHs1bX51SuAvSuBJ8ekigMcrzOEoexJmthI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kqtquickcharts-25.08.3.tar.xz",
+    "hash": "sha256-jympyxr341HoW7d+ZtCC0wToWdJbtVDnTWX3WfARDBE="
   },
   "krdc": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/krdc-25.08.2.tar.xz",
-    "hash": "sha256-4y1lDpMyV1ZuDBuErgz87W3WpN/zOgR5Wk43W/hwXno="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/krdc-25.08.3.tar.xz",
+    "hash": "sha256-qjF7iiHANitt3WnxIsoX9ETt/uui9CK3XOUcZmlQkGo="
   },
   "krecorder": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/krecorder-25.08.2.tar.xz",
-    "hash": "sha256-BZWm2fMYmGn6sVtu3zyOlAL9oEA1hdXXfKO5zo6yCNE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/krecorder-25.08.3.tar.xz",
+    "hash": "sha256-Mnj73af7xEC2+SK2RKyNMtzGPU1EO3ecwssIMXomM2E="
   },
   "kreversi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kreversi-25.08.2.tar.xz",
-    "hash": "sha256-NCj2A/q58mHBwbn5J5ZpB7Pkrx1fuz5002ecbiBiLSk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kreversi-25.08.3.tar.xz",
+    "hash": "sha256-gf/rj2ABjRLqKCvgKhd0Xkv2ofFsBnWulyG9+cNSlSQ="
   },
   "krfb": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/krfb-25.08.2.tar.xz",
-    "hash": "sha256-iBuKQpM+LVfMGZ1jq59KuQ9WeqX6Kn9JzV4RQ64rKNo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/krfb-25.08.3.tar.xz",
+    "hash": "sha256-4S+HkIm2qdS4/HK4IB5SIj6kUGZNKLo6Qxk6Yeud/0I="
   },
   "kruler": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kruler-25.08.2.tar.xz",
-    "hash": "sha256-m/X4uMG0zOER3PHys7I8EJUYcGuglewKAyoeHI7SSCE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kruler-25.08.3.tar.xz",
+    "hash": "sha256-lrIrTlkMtnaGcfEZlOENqUL4JS+sYvq57/0VYR0seaw="
   },
   "ksanecore": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksanecore-25.08.2.tar.xz",
-    "hash": "sha256-i62zyKTV1GapIpvEbrH0+woW84IAjmOZkDQT2PoKmLE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksanecore-25.08.3.tar.xz",
+    "hash": "sha256-4VZZmUGT7mDSn64J4n0uRT/DLkSfr4gIpXysip6rqZc="
   },
   "kshisen": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kshisen-25.08.2.tar.xz",
-    "hash": "sha256-pTDUxgJmT8AoSA/M+7zzzjACMWNS2r7SkAJUkRPoGqU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kshisen-25.08.3.tar.xz",
+    "hash": "sha256-0P9OhTLCd7Mptkd25Ye/dacIbX20RkL3cCve7GcIHqg="
   },
   "ksirk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksirk-25.08.2.tar.xz",
-    "hash": "sha256-ZxJoE+D01cb91gDyJxsPSJmfm9LQwj0Xpugtrd7VgZ8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksirk-25.08.3.tar.xz",
+    "hash": "sha256-mSoRZ1ldy2px3lORdTFeQ0W3mSYu6Wa3UYv3c21N58Y="
   },
   "ksmtp": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksmtp-25.08.2.tar.xz",
-    "hash": "sha256-iF+C0SgxTPThJouZd0bDXExHspJmMkbNjKP7+Eqm2fA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksmtp-25.08.3.tar.xz",
+    "hash": "sha256-FQdBgHcj8c7ka8HoY5TXhf79ffgiUj1f5TgyouQVzOY="
   },
   "ksnakeduel": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksnakeduel-25.08.2.tar.xz",
-    "hash": "sha256-LyFMQpXR5o+bufyNNaIjVzHPbAmUBBYr82xU1Ugsy1I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksnakeduel-25.08.3.tar.xz",
+    "hash": "sha256-G/5kAJ9iPfUDr1cZxzquUJNO31jBl3RjGGp8/8mjxsY="
   },
   "kspaceduel": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kspaceduel-25.08.2.tar.xz",
-    "hash": "sha256-9vEntOUi6jJ4v3r8WNYmmxSVWMowt8SZ2/sii97d8Ug="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kspaceduel-25.08.3.tar.xz",
+    "hash": "sha256-txLcpESv/zejpFdAwDcJSHwjaj+cjb4NiaezzFPz1P4="
   },
   "ksquares": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksquares-25.08.2.tar.xz",
-    "hash": "sha256-l1VFaidEq1YNqI10vawKQa7QuDMJCDLyz7LklL2ojdE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksquares-25.08.3.tar.xz",
+    "hash": "sha256-Wnc8jDtRj6LMXYzfvlBe6C1sDCvSeCiTeyKXcwrdtc8="
   },
   "ksudoku": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksudoku-25.08.2.tar.xz",
-    "hash": "sha256-PTSj/+mLMgaieN/dz7QQw6pH18s9xLF3oT2/OtQixRc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksudoku-25.08.3.tar.xz",
+    "hash": "sha256-1XexTOqFRtyLdIC1K5PT4LV+coySYjfVxoQQ7Ll9vdQ="
   },
   "ksystemlog": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksystemlog-25.08.2.tar.xz",
-    "hash": "sha256-ou6JXgOweo/vK4iIaWo34nv9ItDZ1vQkj024B0ED7zw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksystemlog-25.08.3.tar.xz",
+    "hash": "sha256-41APVe04Ju1RhPzzd6R2ISHTbTBIso9DfVLeZZKzPnE="
   },
   "kteatime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kteatime-25.08.2.tar.xz",
-    "hash": "sha256-sk+Wq6kwX/yEqt9BKsj4O5ehPMySTMrfc4srd6Dotjw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kteatime-25.08.3.tar.xz",
+    "hash": "sha256-aKghjWcg/U4zlTJwdZbX0e7l7xizFE448nZW8Ntqp80="
   },
   "ktimer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktimer-25.08.2.tar.xz",
-    "hash": "sha256-stCkPaE7XECnso9xa/7wTC+hM9Vl1ng8d6dbAv39i68="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktimer-25.08.3.tar.xz",
+    "hash": "sha256-pLQm1jQcE9i0yYO2JBjK2npmA8c4E1chOgPIXfmF4hg="
   },
   "ktnef": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktnef-25.08.2.tar.xz",
-    "hash": "sha256-v+lFg1qWMJSghJJ9xkcO878j3dsbRJC+ZB2pwrAyeMc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktnef-25.08.3.tar.xz",
+    "hash": "sha256-cBVHeVARnN252bTmuUMGsbaHb0YE9Jb+voJMpicF4hM="
   },
   "ktorrent": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktorrent-25.08.2.tar.xz",
-    "hash": "sha256-m6Ku92a7EnBcHNEnHaK2NZpxslo396QxQHti+OsV4r0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktorrent-25.08.3.tar.xz",
+    "hash": "sha256-YsslNCYnT3YZYCgn0d4kaf/+2kN+9dlNyqTXyi3/TT4="
   },
   "ktouch": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktouch-25.08.2.tar.xz",
-    "hash": "sha256-DgY7FX5goroYjH6oWB+zx6J85fqg2nxtZjPknke9p4U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktouch-25.08.3.tar.xz",
+    "hash": "sha256-RxvGm+NjhpVzekatA4FHHVLy/desOfZIaxgIChqZ+Bw="
   },
   "ktrip": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktrip-25.08.2.tar.xz",
-    "hash": "sha256-DwQm3LD8tQa5BakTSzY6X1f9esKzscVNBB5YGYAclX4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktrip-25.08.3.tar.xz",
+    "hash": "sha256-67XWgzjhKR80NFaRfB0nfelXJWRjv390MAXUUnUCIL8="
   },
   "ktuberling": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktuberling-25.08.2.tar.xz",
-    "hash": "sha256-54aMMBo2G8NG5wxpJUnYdFJFmU7ZNAl5CB9BvwtpLlE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktuberling-25.08.3.tar.xz",
+    "hash": "sha256-kn2uK63lPdEODGRlKSX34qr94ELSTuc8McfguntAYU0="
   },
   "kturtle": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kturtle-25.08.2.tar.xz",
-    "hash": "sha256-Ye/bDT78I8F8YlcSeNLc6LEANOMg/aKdTn9pmzN4u9k="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kturtle-25.08.3.tar.xz",
+    "hash": "sha256-niNZcCEncHPReW2prJ7ejD2G+huipyN+NyvBGuJrDgs="
   },
   "kubrick": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kubrick-25.08.2.tar.xz",
-    "hash": "sha256-SmMwjK7l9kxcpFe2vKi/8wnu5d8/MLoJ2hNqGNBNhUY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kubrick-25.08.3.tar.xz",
+    "hash": "sha256-wv90F0c7FKK17TONQ5AnsHGdM8CNnflPOa0SGfLsmRI="
   },
   "kunifiedpush": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kunifiedpush-25.08.2.tar.xz",
-    "hash": "sha256-KlxqGjB0dMqVAreaZf0c9GYhguCDGkfQOLBkDCBXiDI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kunifiedpush-25.08.3.tar.xz",
+    "hash": "sha256-6MkkQ41TWfD6CTCrNREQEgduOg/06VnWkpWVVxODMgo="
   },
   "kwalletmanager": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kwalletmanager-25.08.2.tar.xz",
-    "hash": "sha256-uqll+OnUbp5MKwzPqxn0KvAVaDJGNkrbstYzSffW+3I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kwalletmanager-25.08.3.tar.xz",
+    "hash": "sha256-VLa2PrVf1VTTEhUxnCC7r9Lhv5SKtrT6TYS1YUttxS0="
   },
   "kwave": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kwave-25.08.2.tar.xz",
-    "hash": "sha256-4A4alB1WAj1QPt7G0nRozvLcF5T3IQKACiRJ3U8Mlwo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kwave-25.08.3.tar.xz",
+    "hash": "sha256-SNx4aADdyclG/OxxJY8896Ot7pHBMEuF2gVtJs6MolQ="
   },
   "kweather": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kweather-25.08.2.tar.xz",
-    "hash": "sha256-aB1RpiWotF09h+QnYZpeGMteME6Ky/esKHcH2Rtyw+s="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kweather-25.08.3.tar.xz",
+    "hash": "sha256-KNoeLq1scm5iMiMOqo8eDluaa5C3VgMOx/kVHRkNcy0="
   },
   "kweathercore": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kweathercore-25.08.2.tar.xz",
-    "hash": "sha256-DRSR2AEa6T1iku6bjie5YTiVM7K+/cVIIZ9fQtHsDRU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kweathercore-25.08.3.tar.xz",
+    "hash": "sha256-aTVzoCRb9l2s6rEnrEXJrPuznmt8UW2BevVBzTElsls="
   },
   "kwordquiz": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kwordquiz-25.08.2.tar.xz",
-    "hash": "sha256-vvWWexyIiySBx36rX1HxBiOEvIYiirtBmF9TnoUl0j8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kwordquiz-25.08.3.tar.xz",
+    "hash": "sha256-FD3tCu6gIDbeeq29O2zoENAGanPcyC02excZYqgSFoQ="
   },
   "libgravatar": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libgravatar-25.08.2.tar.xz",
-    "hash": "sha256-K9uwLdAQIwdbkDJBFCTUFazYsiolpKLgSs51khJrweY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libgravatar-25.08.3.tar.xz",
+    "hash": "sha256-lMd3JgKzraqLTUSiJ2mdlDCXAFrr/u9WPK6tt15vI/s="
   },
   "libkcddb": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkcddb-25.08.2.tar.xz",
-    "hash": "sha256-lgI1UJaRwh39juHFSTru5YWRK98YBqa0tZuPafmVqnE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkcddb-25.08.3.tar.xz",
+    "hash": "sha256-HYXr8890TjVv8g/fADgyeUT+pDN4Yo2jvYuZDmXTdpc="
   },
   "libkcompactdisc": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkcompactdisc-25.08.2.tar.xz",
-    "hash": "sha256-dq+OIjKMN5hFpLxS1csdH2Bllz8stTGDUwK8pSjMZyg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkcompactdisc-25.08.3.tar.xz",
+    "hash": "sha256-PXqeirTcFJcIukWb7gumW+hU6ux4yX97p/j2YyrjhnA="
   },
   "libkdcraw": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkdcraw-25.08.2.tar.xz",
-    "hash": "sha256-CuQpKsI3YpMXGSUubaHgRDkNTwuJtOaBsSuH5q9EnSA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkdcraw-25.08.3.tar.xz",
+    "hash": "sha256-Uvp40BPhPHLGL7TWho7xCowR2JlIptJEFWR+kXqnLN8="
   },
   "libkdegames": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkdegames-25.08.2.tar.xz",
-    "hash": "sha256-Q/PP34LkbAdkrHeb/L48eHKOyfiA5x/PWH+zwFGV9Oc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkdegames-25.08.3.tar.xz",
+    "hash": "sha256-RvMFZ3+zeXjGtHvRerZVO1chUaYymbt7jccY03+0SKQ="
   },
   "libkdepim": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkdepim-25.08.2.tar.xz",
-    "hash": "sha256-k2tPCnF3aFQttGnj1Z/x5FB1XSTaNBWaPQFtu6JcvSg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkdepim-25.08.3.tar.xz",
+    "hash": "sha256-OspVtxvjWrNpkwXy9/x2bUvQDETrt2Mb/WQcEkzQsek="
   },
   "libkeduvocdocument": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkeduvocdocument-25.08.2.tar.xz",
-    "hash": "sha256-1lHduat2IaOR2pW8YvnR1zVOIcbaVius51z20lJcCt4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkeduvocdocument-25.08.3.tar.xz",
+    "hash": "sha256-tNzEPB2PcR1bmsCinXji7HcQtbzYDx7GJTTosbDr3cU="
   },
   "libkexiv2": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkexiv2-25.08.2.tar.xz",
-    "hash": "sha256-G4rqeHNmYq8X1q4DkTRZM3VPmM/8oVNSBIE+sn7/YiI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkexiv2-25.08.3.tar.xz",
+    "hash": "sha256-CAaJhVS2Km+DTTO7SBkj2CvekbFpK6exRv7JS5pQPQM="
   },
   "libkgapi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkgapi-25.08.2.tar.xz",
-    "hash": "sha256-hQrGcoBVEPy7aKg4SiEsOMP/7COOWIebxVt0keLpAac="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkgapi-25.08.3.tar.xz",
+    "hash": "sha256-WmWQ2gTPSgw7U/Kgx9fJfN9X9jhUoKSXjAhZJDv70V4="
   },
   "libkleo": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkleo-25.08.2.tar.xz",
-    "hash": "sha256-vGuWNkTUx8AAAtoN8UPIze2k0/EusUCbZyEvq93g17g="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkleo-25.08.3.tar.xz",
+    "hash": "sha256-BVOxiilctfv/X66ZA0p4KuTQfUPSwWN+r2ejHKZQuBY="
   },
   "libkmahjongg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkmahjongg-25.08.2.tar.xz",
-    "hash": "sha256-yZl1Nl3DRkvO16RnBW3KQ9XxdHAXgz0/Vq0RXKGoBww="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkmahjongg-25.08.3.tar.xz",
+    "hash": "sha256-SC+c76Nbpi0ScbOpsvC+zPDpVOt/2ECmHeTMSxi9xlc="
   },
   "libkomparediff2": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkomparediff2-25.08.2.tar.xz",
-    "hash": "sha256-TVM+fXS+K2EnvZBvpNff4ejrRZ6QhnfmQS6L0LShwac="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkomparediff2-25.08.3.tar.xz",
+    "hash": "sha256-bpNvhmHzNsuaz/eeJG4d+yhPnNVmoBxlq1oliec2yew="
   },
   "libksane": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libksane-25.08.2.tar.xz",
-    "hash": "sha256-2mtzd2CfB4lgB9sF4zIykbsW/NLWzZwsG1jg+Zn/ujM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libksane-25.08.3.tar.xz",
+    "hash": "sha256-cwv078ybgjupjGgUkuQTk3mrDD5gLh5u/ynATxdtb2g="
   },
   "libksieve": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libksieve-25.08.2.tar.xz",
-    "hash": "sha256-nw7m3ljGe4FYhz6X6GmUojjLYrkeW5HQK0BB6WbOJHg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libksieve-25.08.3.tar.xz",
+    "hash": "sha256-bgZj63oMQAfFZE+rg8Q2cTO7YbeuO3J4vINpcXdf/5k="
   },
   "libktorrent": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libktorrent-25.08.2.tar.xz",
-    "hash": "sha256-RdgIjGzXU3iDZn4Ry/6Tf5ZMvYBw196l05vZOhG1WDY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libktorrent-25.08.3.tar.xz",
+    "hash": "sha256-z6TZb062gnpK1mzAr3JNF3PLUW3uKYgjIEzEXgrRzWk="
   },
   "lokalize": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/lokalize-25.08.2.tar.xz",
-    "hash": "sha256-DjrFQUgDyJAe9KSOivqT4qWHNtX9OxTFEdbZ0gGNMNo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/lokalize-25.08.3.tar.xz",
+    "hash": "sha256-B54/zaOnTvessbMGPu6xAjfnNkZr1JlTdipl0I7xFIM="
   },
   "lskat": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/lskat-25.08.2.tar.xz",
-    "hash": "sha256-8qz6IhIZWoZj+btqE1H9RTeQ9er+dOm0VnHrYfI8IoA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/lskat-25.08.3.tar.xz",
+    "hash": "sha256-lTKIRVfvJGj4K2WmzlT9y8DfPKGS/njKy44k97coKb0="
   },
   "mailcommon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mailcommon-25.08.2.tar.xz",
-    "hash": "sha256-6miyUOO6PjsiwhvEDOTtQBUC0eWejtz3DFsfydSzTcc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mailcommon-25.08.3.tar.xz",
+    "hash": "sha256-PEaG+HOUDgC3UlmT+s1aU+LH8tlECMb2inaqE7EXQ/o="
   },
   "mailimporter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mailimporter-25.08.2.tar.xz",
-    "hash": "sha256-z++flxJoJFGItEFfjn0boPfvqPmSXHpNsIhzZ/IPuEg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mailimporter-25.08.3.tar.xz",
+    "hash": "sha256-8MsBq+JLOlMydW3tUZMSgT/w43lx1r+xk3wLe8xv2qk="
   },
   "marble": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/marble-25.08.2.tar.xz",
-    "hash": "sha256-ZV1wp2j/xn1dPy2CAAXepX/5r10Jg346urz/Evy3df8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/marble-25.08.3.tar.xz",
+    "hash": "sha256-ZcA02sx6LVu/U0/KZXQonosdvyvVDk9j/00atk/wcZg="
   },
   "markdownpart": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/markdownpart-25.08.2.tar.xz",
-    "hash": "sha256-8I1iQ2m+EP2VY6Ofatb88gDgmfD4Ov45AKhPeE7k50I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/markdownpart-25.08.3.tar.xz",
+    "hash": "sha256-WVJLI3e+0JYjSotHHzwXVFU9HT8SI53rN3ycAtVDZT0="
   },
   "massif-visualizer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/massif-visualizer-25.08.2.tar.xz",
-    "hash": "sha256-88nqICyX5ajDQ1pc0op5blDT9Fo7GNzJXwWQy8uSmhQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/massif-visualizer-25.08.3.tar.xz",
+    "hash": "sha256-Bx3Rj+LLsJIkmDpmByXVlvCbauZwM+7ATilZQbQAZ3U="
   },
   "mbox-importer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mbox-importer-25.08.2.tar.xz",
-    "hash": "sha256-J58Kp9PpK8qtVym/UP728LQ9WOMhwoJ96y/Lnm9vz2A="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mbox-importer-25.08.3.tar.xz",
+    "hash": "sha256-vULK64dpOrPKzHxC2flA4iyHWvTU0wSyZWCT3kjZuCI="
   },
   "merkuro": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/merkuro-25.08.2.tar.xz",
-    "hash": "sha256-6n6ZhJO8a0bnNyMXO1882rOclclcrpA8sXz+KoeOs0U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/merkuro-25.08.3.tar.xz",
+    "hash": "sha256-oCHLfVogUZN1pWv/hUH8Kzvd1evkhaub0l4wayETEq0="
   },
   "messagelib": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/messagelib-25.08.2.tar.xz",
-    "hash": "sha256-RkVrc9bN0QxdHduP5T/A/2HhzjjJXC/CEpnb6eSmR+4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/messagelib-25.08.3.tar.xz",
+    "hash": "sha256-p8h4gwpdeQdSyYs9lWPHbhowtqKM7FPL1Ka2ATL1Z/g="
   },
   "mimetreeparser": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mimetreeparser-25.08.2.tar.xz",
-    "hash": "sha256-+jLUHCaEdMDkUk9WXEgyXl0dkIJ5bdZ2CKm+pRRr7bI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mimetreeparser-25.08.3.tar.xz",
+    "hash": "sha256-6hbPP8h+HKlQpBSUvRbvoHBdAGG1W1RaiZeYQ8g1uXc="
   },
   "minuet": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/minuet-25.08.2.tar.xz",
-    "hash": "sha256-qV49m/Of++FJ5vy5pk5Cv1+7V/FyPriSGKDlaoB0iEo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/minuet-25.08.3.tar.xz",
+    "hash": "sha256-ECs5JaDltDem8+Ezq8roZ2I4lyqdaMRmbBqnblG5ukQ="
   },
   "neochat": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/neochat-25.08.2.tar.xz",
-    "hash": "sha256-VDkkfJtnT2/U9yQOlJitwhlyxvw1BCrrs0K8/K84Q/U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/neochat-25.08.3.tar.xz",
+    "hash": "sha256-X62WRyoLV3qfK9fMVe1/b0gcRIv3duPVlsoJV6/MjDU="
   },
   "okular": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/okular-25.08.2.tar.xz",
-    "hash": "sha256-3kAc00N21nihajYUc1FIRPeIALOY47Dba96FoJ5jU5I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/okular-25.08.3.tar.xz",
+    "hash": "sha256-Ay496PxUZ5YUGFlpEYjm+ALG3kmLZczLzmCqYNhlcU8="
   },
   "palapeli": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/palapeli-25.08.2.tar.xz",
-    "hash": "sha256-EF2bCUncy3yN8hbvoyMgHlfLKfoY70sE5kjC6yZn1zk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/palapeli-25.08.3.tar.xz",
+    "hash": "sha256-j8fuZ+QiXLEvFh4ePo3evMLuH1Bo/eEM/QbuWkFgiUU="
   },
   "parley": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/parley-25.08.2.tar.xz",
-    "hash": "sha256-WUmrWVoRgeYYheHfCkOIzpq5FrRh6a55w+cCjFIxjhQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/parley-25.08.3.tar.xz",
+    "hash": "sha256-BMtueE6ChA1sp3mvriE+baW/7k3Kgrl3Er+4/RrFBWQ="
   },
   "partitionmanager": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/partitionmanager-25.08.2.tar.xz",
-    "hash": "sha256-gRfiToA45dMk7pNCnxeslklg40aFTCYut4MNhWrZBHs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/partitionmanager-25.08.3.tar.xz",
+    "hash": "sha256-19HbCJIZgzqVzt0yp3hZxziuzqh6smc6ym5oCaH3sXE="
   },
   "picmi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/picmi-25.08.2.tar.xz",
-    "hash": "sha256-GIqd3LbO/COPRpafbTQiHOLXUJVb2oFynhsBITY+sh8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/picmi-25.08.3.tar.xz",
+    "hash": "sha256-3VzAh7jTcPHiWpNvsKjqzupoel/UnzDQASNItedoqXA="
   },
   "pim-data-exporter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/pim-data-exporter-25.08.2.tar.xz",
-    "hash": "sha256-m45H9SxFMmLJOaT6pKP4zEmd2RgFZMBHdRtsWp3wTyc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/pim-data-exporter-25.08.3.tar.xz",
+    "hash": "sha256-dHbHp7hZT53QhllmCh7zBCDIDUiWFIkjDMhQVosjags="
   },
   "pim-sieve-editor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/pim-sieve-editor-25.08.2.tar.xz",
-    "hash": "sha256-+6zJfq56Br9N8Rqc3rvJ+lainoz8zABylY6OJKN0YnU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/pim-sieve-editor-25.08.3.tar.xz",
+    "hash": "sha256-nqMohVofxgLs4gvODqLJ4zHzvkFsbmro+YUYsCkqJoQ="
   },
   "pimcommon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/pimcommon-25.08.2.tar.xz",
-    "hash": "sha256-3jQUmUBvMX2v6fo+XutgC70Oxp804o6OC7j/2r6OlQs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/pimcommon-25.08.3.tar.xz",
+    "hash": "sha256-/oIGtot4tVXO7YPPLmjlNIQGxZrBW8Qzkotlv56He4g="
   },
   "plasmatube": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/plasmatube-25.08.2.tar.xz",
-    "hash": "sha256-TE8PZNcu4YvsAzNvs5G9uX54AKKqgLcZXmjnsNYlAlQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/plasmatube-25.08.3.tar.xz",
+    "hash": "sha256-qJ4ZBtN7Fvp2+ACWQO69jj29hzp+tjly594Jhj6MO1g="
   },
   "poxml": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/poxml-25.08.2.tar.xz",
-    "hash": "sha256-tCJsUSeByP5roUMZHzS0lUeuXysB1ISBqrqYQpi3ftU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/poxml-25.08.3.tar.xz",
+    "hash": "sha256-EpZ7UxNgVADo3jzzlHgTb1tmFrK0V3TcGFu2tcuue30="
   },
   "qmlkonsole": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/qmlkonsole-25.08.2.tar.xz",
-    "hash": "sha256-vskxw9ASMG/BaH8BBjF+jrnl+d9TeLUGiJVYmqyGjbI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/qmlkonsole-25.08.3.tar.xz",
+    "hash": "sha256-SFD6lJeC2zMctKqFz2fXJ+3YBrd3Gr6C1KfVag6+/E0="
   },
   "qrca": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/qrca-25.08.2.tar.xz",
-    "hash": "sha256-A2VLarfZSiSj9ysHaUwpHHjpguo49WNY1aSJ4dwuFwU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/qrca-25.08.3.tar.xz",
+    "hash": "sha256-6lwXkYjD2pI5o1Ayw2USltVXtT2r5RNNpMFNi+qCMtc="
   },
   "rocs": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/rocs-25.08.2.tar.xz",
-    "hash": "sha256-BL+zxhB4ZTvHiZTSNiK6Qt08sDUJoMIhhXg5UfH6blU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/rocs-25.08.3.tar.xz",
+    "hash": "sha256-R6dDofPt1J2LZwKjXyoOBV0E4FB7/wCf/dteQmEySss="
   },
   "signon-kwallet-extension": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/signon-kwallet-extension-25.08.2.tar.xz",
-    "hash": "sha256-amAuEs3fuSZqOLVID6yo5LeJkrhASqLIspsGl5qm51w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/signon-kwallet-extension-25.08.3.tar.xz",
+    "hash": "sha256-R+ee39uX2SQOIu2fpiTrrDzSGeSi7ncMaGm4abU7mv8="
   },
   "skanlite": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/skanlite-25.08.2.tar.xz",
-    "hash": "sha256-YIJ16zKwEcfdNAARieNLADr+iblM3d8Uq5m4Dw2ICKg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/skanlite-25.08.3.tar.xz",
+    "hash": "sha256-ga/hMhLF7a7sSlfBChBdMdwg2jteCO9l+/P3Q8CPAnY="
   },
   "skanpage": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/skanpage-25.08.2.tar.xz",
-    "hash": "sha256-G93TK6+yj1zKatkBBFUrdCmnxN1DBI7IH7PPU/LyBHk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/skanpage-25.08.3.tar.xz",
+    "hash": "sha256-6EMcc/YpAduT5HAM7LdieZq94Far+P2Ar4cH0SnG1Fg="
   },
   "skladnik": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/skladnik-25.08.2.tar.xz",
-    "hash": "sha256-AmxD4/iLvoz6Ue9wOHlbWwclocI0RAymqoqyBKrFJ6c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/skladnik-25.08.3.tar.xz",
+    "hash": "sha256-5NjDXHJpOcnaeX4c1F1W0KDQSnnasfwtp6ztZqMPzo8="
   },
   "step": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/step-25.08.2.tar.xz",
-    "hash": "sha256-wA0k//FkXrJJamFejkc2VE7jX9OMwbhLc15aJRrILDM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/step-25.08.3.tar.xz",
+    "hash": "sha256-sd3OT1Kgt1GIYWwGK+T6etXT13JcIR7AEXGamtJ+hvk="
   },
   "svgpart": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/svgpart-25.08.2.tar.xz",
-    "hash": "sha256-T8+uQ8Q/RfnUS2VSM550FI8sXAd6jUh9H/9Oo+9tvKY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/svgpart-25.08.3.tar.xz",
+    "hash": "sha256-l/b9tP8xEOQdjfayXw0YT1I12InYx8FcfGu7Gi8G3hc="
   },
   "sweeper": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/sweeper-25.08.2.tar.xz",
-    "hash": "sha256-4KCSw/g0cVCHo4knw8J/Thz/xZYkBNjj/vacO6bto60="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/sweeper-25.08.3.tar.xz",
+    "hash": "sha256-brC3wxqfvh+Q5NRyVIj4KFStA4lPnp/rVvYdOdBFZZ0="
   },
   "telly-skout": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/telly-skout-25.08.2.tar.xz",
-    "hash": "sha256-nf76OvOoHAUrpFlTlKKgnKb/MYYCL8oBeqj4ATwFQMA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/telly-skout-25.08.3.tar.xz",
+    "hash": "sha256-RP12+uGbvD+ApoylGFN7n3B7SIQDBWSmmGYYM7RvYXA="
   },
   "tokodon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/tokodon-25.08.2.tar.xz",
-    "hash": "sha256-8yYWdcDGq0IbSwGk/1WesUw+40xsxx5uoj77EQY7ojQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/tokodon-25.08.3.tar.xz",
+    "hash": "sha256-MyaPh3sIWJ6QF2UwsVr6u9V6uuZodPSQc+3zcGreoiE="
   },
   "umbrello": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/umbrello-25.08.2.tar.xz",
-    "hash": "sha256-7BQbgzSFFKXxRZbtV9Kt5J9ze07a/Y6G8Cv1FU55TH4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/umbrello-25.08.3.tar.xz",
+    "hash": "sha256-kEimFZyEhiSKlblW7QjBlUrCFwi4moH+ajsKp6Ugeiw="
   },
   "yakuake": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/yakuake-25.08.2.tar.xz",
-    "hash": "sha256-cL7+ptmgaPbc67q/HrBYR4+dAEgDHdT4DPjcCH8MRRw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/yakuake-25.08.3.tar.xz",
+    "hash": "sha256-2NPw/+z9mPAMhhin3PXPhe90X3BHF9+BmPYyHYNFHuw="
   },
   "zanshin": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/zanshin-25.08.2.tar.xz",
-    "hash": "sha256-S5Ind8wxaE/NsKD3+seQ8g7k3iKSe8GQn/7TpCqpE5A="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/zanshin-25.08.3.tar.xz",
+    "hash": "sha256-3A0QGC8qE1f+8jlbXo79rsTsTl9hZVEKNRKDjAspbYE="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 876d9609b9bc..582b4288f10b 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,347 +1,352 @@
 {
   "aurorae": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/aurorae-6.4.5.tar.xz",
-    "hash": "sha256-MYPuvEdtZ2N0FUnGvQB8ZQZJkT1kjMr6MDZpCC2L83g="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/aurorae-6.5.2.tar.xz",
+    "hash": "sha256-841YVc/6nXop+oA5NLunyKaEckPvdztV8iPoZLedmNM="
   },
   "bluedevil": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/bluedevil-6.4.5.tar.xz",
-    "hash": "sha256-+zoHx56pgM1V+SrQO4zrJZX9ehjXD2/SxNnjU4qE1x4="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/bluedevil-6.5.2.tar.xz",
+    "hash": "sha256-SMO0a3mQpM+F+p0HAx5uZkIZA4hml3ki7khkt+fcQ7A="
   },
   "breeze": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-6.4.5.tar.xz",
-    "hash": "sha256-3LhDPTmVEVRpWPTIwaj65e0i8qaY8FOWjUEO51vW2LQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-6.5.2.tar.xz",
+    "hash": "sha256-kHtfBYrKkT7INTeZ332c4MiNzaLRvLv0pTn4iGzweos="
   },
   "breeze-grub": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-grub-6.4.5.tar.xz",
-    "hash": "sha256-ToJe6Vg3k/11W0E6R8QTpfnNFBKBL3tGrO7t5TgwZGs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-grub-6.5.2.tar.xz",
+    "hash": "sha256-cPqZ3+g1S8xo9Jdy/Yp2HEU8L444vocqSrxc0IQM6GA="
   },
   "breeze-gtk": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-gtk-6.4.5.tar.xz",
-    "hash": "sha256-dx6IyhlCGkcvX0I1+ye6JYi36iZ+jyZH5eIxw1HwOpg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-gtk-6.5.2.tar.xz",
+    "hash": "sha256-xoLa9fYW0D24VleXiSeKocNjLy1U+xCPBOLMgamu/bk="
   },
   "breeze-plymouth": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-plymouth-6.4.5.tar.xz",
-    "hash": "sha256-DhuDkj8JOCHd72/VsRtW2wVxtBCfTyYCFIAfscbfcAQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-plymouth-6.5.2.tar.xz",
+    "hash": "sha256-l8x40alOENpET+Ne04RBucOIdER6RNy5z1NbQveJo3A="
   },
   "discover": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/discover-6.4.5.tar.xz",
-    "hash": "sha256-kgjU43rSrkzR2nzTsB7eYQcaE4mOxMFO3/6YO5cvhXY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/discover-6.5.2.tar.xz",
+    "hash": "sha256-GYgdD1yXUdlZ8uzvS09opwswSmyXy1V5+kqsl8uvJEo="
   },
   "drkonqi": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/drkonqi-6.4.5.tar.xz",
-    "hash": "sha256-63ydNHXvQpiiotmKivIysvtw7kqnHE9R3RYVMXC7E7I="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/drkonqi-6.5.2.tar.xz",
+    "hash": "sha256-G5Gd4KutbzSMKCB6qfpGy6WZL1Gx00lNke6WukdVT+g="
   },
   "flatpak-kcm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/flatpak-kcm-6.4.5.tar.xz",
-    "hash": "sha256-PxhYcHEkMFvCMYbzNLuvY8WivC2Jder/EnTUAuYRuLE="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/flatpak-kcm-6.5.2.tar.xz",
+    "hash": "sha256-HwsfFZ0kD1Cq+hs3xnZ4ukSrMI1gJAhKUEswyGIMrIU="
   },
   "kactivitymanagerd": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kactivitymanagerd-6.4.5.tar.xz",
-    "hash": "sha256-3lJRi5Ab7rWKYycxb82jRbNVIwVVbIWhxLETP5q3pCQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kactivitymanagerd-6.5.2.tar.xz",
+    "hash": "sha256-kzK18PyG+AakgLtFESaTqD35BtuOrdwkF0Wemm18320="
   },
   "kde-cli-tools": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kde-cli-tools-6.4.5.tar.xz",
-    "hash": "sha256-PMMnRw79Y85nmPMQACNGdNaUmHLIVxwHLcsjlWoneyY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kde-cli-tools-6.5.2.tar.xz",
+    "hash": "sha256-g08dpx7G+estBWAhgICg8CoAzWYJye1UZAEXAMKKChw="
   },
   "kde-gtk-config": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kde-gtk-config-6.4.5.tar.xz",
-    "hash": "sha256-96gcHv1Tm2CMxkCpmf2xhLu4PPyWANQH0aTzMsOIDsI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kde-gtk-config-6.5.2.tar.xz",
+    "hash": "sha256-zDfNNAG+DOZ2ZjyLohQT96P7Msc7aE8i0XKmKt5OjSk="
   },
   "kdecoration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kdecoration-6.4.5.tar.xz",
-    "hash": "sha256-+dPsQlbPcSWjsLwIx3N69xUjXVwitpuil5e7BsXvSkw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kdecoration-6.5.2.tar.xz",
+    "hash": "sha256-KWPcRP8rHMfqRMuzgA01xNC86teDcoF5r9pQTMBhFXY="
   },
   "kdeplasma-addons": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kdeplasma-addons-6.4.5.tar.xz",
-    "hash": "sha256-S9vcKJK79iEcO+bAIXf3/9zhCrFUbYEaS1kCQZK3e84="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kdeplasma-addons-6.5.2.tar.xz",
+    "hash": "sha256-k1scookMqwPvm/DKzI+1pgRPpohIfUtg+XqyOaO5VoQ="
   },
   "kgamma": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kgamma-6.4.5.tar.xz",
-    "hash": "sha256-mW69YL9QgkjtwpPZ7J2kybg4s/sbzNgqTbMFnvJ6uxY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kgamma-6.5.2.tar.xz",
+    "hash": "sha256-U4NT/837fm1m4WsaP6//pHiyk8fVdlbKcQFvKut4Lu4="
   },
   "kglobalacceld": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kglobalacceld-6.4.5.tar.xz",
-    "hash": "sha256-pxLR96hpYCkv62l5/iyS8ufVz7zRB/Tv45eeGkwyzXM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kglobalacceld-6.5.2.tar.xz",
+    "hash": "sha256-iVTHt1TiKv/X9570Bh9a4McXmPe8VTHqyMd4k2uk9fY="
   },
   "kinfocenter": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kinfocenter-6.4.5.tar.xz",
-    "hash": "sha256-bCeofeJPbF6dvYDNemGLVMHSiRRmWBz8CZoCP9BxZgs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kinfocenter-6.5.2.tar.xz",
+    "hash": "sha256-/+CaFpx2x5zlUe8rTu6XpuHYcm0LGi/CR/eNoYhgRkk="
   },
   "kmenuedit": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kmenuedit-6.4.5.tar.xz",
-    "hash": "sha256-YQ8HzTomwWGOKnwxzpARsos68N9dpl6wEAp+jwjIlC8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kmenuedit-6.5.2.tar.xz",
+    "hash": "sha256-jmHvx08nPw2UwejXgN/kqi9Qpr6a3qaJpDZ+DyLMy1U="
+  },
+  "knighttime": {
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/knighttime-6.5.2.tar.xz",
+    "hash": "sha256-z/zPpFuzAU5eAn3aqflUnIhAhHoGU5Qs7EIRS8XPnw0="
   },
   "kpipewire": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kpipewire-6.4.5.tar.xz",
-    "hash": "sha256-0KcEpqAw7bW09da5nDK8TkbhpqtSff3pCJ4RCUtrGpI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kpipewire-6.5.2.tar.xz",
+    "hash": "sha256-Wq9FfQj8Ut6iVOqlt+Bc8OkVABQR9P3W8vSqCxKQ/ok="
   },
   "krdp": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/krdp-6.4.5.tar.xz",
-    "hash": "sha256-OBwsAl22ti0tcWVVgsTJJyrgTUIlrqX4oDB2Gb+ZCkU="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/krdp-6.5.2.tar.xz",
+    "hash": "sha256-IKsnIvIpcQZpIAw9/DWIjOxuKzw43OEguwW5nKN9WP8="
   },
   "kscreen": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kscreen-6.4.5.tar.xz",
-    "hash": "sha256-uSvegjix5/PWUhzEsbqLumAEemT/8SmyAR3/X/NDEDc="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kscreen-6.5.2.tar.xz",
+    "hash": "sha256-nIFP1C+XMBlvwMnmIwqFv8gATA5XMrBIedNdtNe5xGg="
   },
   "kscreenlocker": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kscreenlocker-6.4.5.tar.xz",
-    "hash": "sha256-+sT51T1jy5sG6Q/rgsKPRxlx0V3v1KBoux59KIa3CQ0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kscreenlocker-6.5.2.tar.xz",
+    "hash": "sha256-0AmJSoiWSgxENw3dWoO3qV5k9qrS9Hsm/vfMiB0NBLY="
   },
   "ksshaskpass": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/ksshaskpass-6.4.5.tar.xz",
-    "hash": "sha256-Wy2hGTcHnGGRl1XD1V/5v8W/l+0dvwgLQ8DCr1DjVNo="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/ksshaskpass-6.5.2.tar.xz",
+    "hash": "sha256-4c2svd5GS3crwpvVIN3iUDtU9+JPasnKPv1+ycqdjGI="
   },
   "ksystemstats": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/ksystemstats-6.4.5.tar.xz",
-    "hash": "sha256-cVsojzmr/ZDKgltPo8OHRenuHLvH9JW6FH1+++BKSdI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/ksystemstats-6.5.2.tar.xz",
+    "hash": "sha256-2MJyoyQv5dCTe54wUbMCM1sw68MijoLWVJwSpOWIb8o="
   },
   "kwallet-pam": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwallet-pam-6.4.5.tar.xz",
-    "hash": "sha256-j/vxzELemqMq/JncxdwEgvGWcUVBbwVEmx5ye1WxNz4="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwallet-pam-6.5.2.tar.xz",
+    "hash": "sha256-X8P6pZQR7tdCg9aqVMLev8fmorMIjXBRrmL99iaK6HY="
   },
   "kwayland": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwayland-6.4.5.tar.xz",
-    "hash": "sha256-C4ddnnzFusTZfTRD/0MRUz4Nja1AGvEkTUdYpfpUKPM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwayland-6.5.2.tar.xz",
+    "hash": "sha256-qmPjdT4kHzlV64Bq6Rrx85Y+QuxzHyuKIzARm2XLVXo="
   },
   "kwayland-integration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwayland-integration-6.4.5.tar.xz",
-    "hash": "sha256-/SvWMFN2O703DJ5XggWDMK1zoUJBt6bj4bjSQwPe1QM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwayland-integration-6.5.2.tar.xz",
+    "hash": "sha256-TRCULpmoY3aEoT4b5HIeIFdEgrUr8b6yXRf99QG9XQY="
   },
   "kwin": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwin-6.4.5.tar.xz",
-    "hash": "sha256-3s8ct5EnwoXH7ado5/9Pl8cvMUc1yCaFdY8LlWrBUfc="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwin-6.5.2.tar.xz",
+    "hash": "sha256-O+DVaf40La3e6Fm6tq79oy1wVrYB6EA46K+SWT8UB3Q="
   },
   "kwin-x11": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwin-x11-6.4.5.tar.xz",
-    "hash": "sha256-zqkYeUZ6/fosrw7G3XJW6ueN76lwzcmpR/79hdQXrLE="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwin-x11-6.5.2.tar.xz",
+    "hash": "sha256-Yy5rFMfTArbv7GKrCEJqkkynIMtvsgfw+SLln39oklY="
   },
   "kwrited": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwrited-6.4.5.tar.xz",
-    "hash": "sha256-Q0uDsRWkgPVCyX1RnCfy613U0zPPvdoo7ZlIE4kqANE="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwrited-6.5.2.tar.xz",
+    "hash": "sha256-AJVfKaxwbM6qYDhz80NHQ5VtrERNHJDYUnqj87MrCYk="
   },
   "layer-shell-qt": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/layer-shell-qt-6.4.5.tar.xz",
-    "hash": "sha256-72uq4iEU8DiviQKfPwB17inDuR/UkQCCjEw6MuFJbpU="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/layer-shell-qt-6.5.2.tar.xz",
+    "hash": "sha256-RTC7iOP7K2NYuoFpoMg5ItnbwzIQ+NjSt9BHndRJYz0="
   },
   "libkscreen": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/libkscreen-6.4.5.tar.xz",
-    "hash": "sha256-aNJuJ2VrRQ8Vp49EeExQoiA05XwU+WpAIBnVK8Wz4rQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/libkscreen-6.5.2.tar.xz",
+    "hash": "sha256-KAmXVDSKfTr3TXm0Q9f96OaisyxuVJG1IBgNZdHhumE="
   },
   "libksysguard": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/libksysguard-6.4.5.tar.xz",
-    "hash": "sha256-x8+M0vCh5RkgHcYoifETWWeoUPkywlL9Juo9iMZWSg8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/libksysguard-6.5.2.tar.xz",
+    "hash": "sha256-TSOiKHHKlHz2/Loh47xNGr0WqrsvchGZ36NP0z+JRfs="
   },
   "libplasma": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/libplasma-6.4.5.tar.xz",
-    "hash": "sha256-lFtsVM/sVggPa1WGToKncCCW1oK+zx/Ul513pACcQSQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/libplasma-6.5.2.tar.xz",
+    "hash": "sha256-GU/P2XK3wIguiFKGA9iu9pqgpe8ZlzC/Wx4zAi8h5uE="
   },
   "milou": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/milou-6.4.5.tar.xz",
-    "hash": "sha256-Dq7sigWvw6lvag7vyaBF9JrOi+IBvI9X4e2BM82qEA0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/milou-6.5.2.tar.xz",
+    "hash": "sha256-hLN5xBoVTqJMAiPEbLf5HqVBDyejz/AStK7cOEHnm70="
   },
   "ocean-sound-theme": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/ocean-sound-theme-6.4.5.tar.xz",
-    "hash": "sha256-X140kY7Gn0TBAh2lJg4aXWVkNkYMn+AaXUiEkTAW+iU="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/ocean-sound-theme-6.5.2.tar.xz",
+    "hash": "sha256-fju1kwnlT4qj5jA6cNrA66kWYuCgcJ0EH9Bzci8G7pE="
   },
   "oxygen": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/oxygen-6.4.5.tar.xz",
-    "hash": "sha256-nBijOiJWC9xQS9HN1t054JGDjGC1R6zsAMUb2KEz62M="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/oxygen-6.5.2.tar.xz",
+    "hash": "sha256-00nHko8GiYIze7RUgewZ2UKmj0fg8KJeuDnqL/NYVWo="
   },
   "oxygen-sounds": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/oxygen-sounds-6.4.5.tar.xz",
-    "hash": "sha256-HQ+p+HIgXsjSvv5bwCnIsaDQ5UyLOhkHZTItiXeFIis="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/oxygen-sounds-6.5.2.tar.xz",
+    "hash": "sha256-EPWqgfxNIUhCKu6OBpKI1SJnISPjEId90hBUN7ai5hc="
   },
   "plasma-activities": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-6.4.5.tar.xz",
-    "hash": "sha256-MK0jhG6Xvzwu1tOvJd4K4dmB6ocWCEkvzBYVXv0MgWk="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-activities-6.5.2.tar.xz",
+    "hash": "sha256-OXg9Mk88A0BFIbSSZNNBNXVtALzq1GF3pLmJ+L6nRJo="
   },
   "plasma-activities-stats": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-stats-6.4.5.tar.xz",
-    "hash": "sha256-NcZPckwFUPmWd/YTSEnez3a+R5cSEMqUGFguo4tIDDA="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-activities-stats-6.5.2.tar.xz",
+    "hash": "sha256-uaZbFk7XowEhGOCJFnDKXoKHssuPQvVi3H9kmFL0kAA="
   },
   "plasma-browser-integration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-browser-integration-6.4.5.tar.xz",
-    "hash": "sha256-rZL07B4x2f3Fe1F73C5awQfGLAIJCtN1Ke7N7myvnYs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-browser-integration-6.5.2.tar.xz",
+    "hash": "sha256-gVtIMUrwSqvnghJe+eut59UIedqe471+2yOEnNpmAqs="
   },
   "plasma-desktop": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-desktop-6.4.5.tar.xz",
-    "hash": "sha256-dVLkx8fMv1t3VnJruaqr00RjCXeq8T9fMFtEd8qhe7c="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-desktop-6.5.2.tar.xz",
+    "hash": "sha256-sLKzNR/I5vU/BnPnu04HctnfYg6dPeZeZR09cDBselg="
   },
   "plasma-dialer": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-dialer-6.4.5.tar.xz",
-    "hash": "sha256-o5sUqDi+BNZeVOuD31hAPhj8EVBjeTXTdGZX4nyY/qg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-dialer-6.5.2.tar.xz",
+    "hash": "sha256-Sr/LxXutBI5pAv6s2uDtCGnLBr6fkgTQ89Mq4TrWeHg="
   },
   "plasma-disks": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-disks-6.4.5.tar.xz",
-    "hash": "sha256-gBfHSfvIUKE9EdWzU0P4UZStQnagHMBTEd1pgo9R/vM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-disks-6.5.2.tar.xz",
+    "hash": "sha256-msmFPznZ1Npyt/sP2FimSvmSuWprwl6BtVEZiN31HXs="
   },
   "plasma-firewall": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-firewall-6.4.5.tar.xz",
-    "hash": "sha256-hcjyic4DkNVgyZ/Z9KXFC8n6tvfQQ/WqMQuFIpsdg0w="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-firewall-6.5.2.tar.xz",
+    "hash": "sha256-2hMkTe+ntKtu+1kHIQmo0zJ6fshR0V5Ho7wauhVaQd8="
   },
   "plasma-integration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-integration-6.4.5.tar.xz",
-    "hash": "sha256-w+Jx3h+ibIgzRAtpzKxejAlKheR0K/Jvl7y3yqjBeyw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-integration-6.5.2.tar.xz",
+    "hash": "sha256-ihP8/Vphz5/2g3VP5wE+JPIoW4859nmbod97ye5ffuQ="
   },
   "plasma-mobile": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-mobile-6.4.5.tar.xz",
-    "hash": "sha256-pzz42tiaKEPfQS85X6HcaU4AHM4tZxrsJufoIXT7i+U="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-mobile-6.5.2.tar.xz",
+    "hash": "sha256-bspdBG7Uas2u3GShUIwG6BzJogWgyhYJ6IqU6QeLgGc="
   },
   "plasma-nano": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-nano-6.4.5.tar.xz",
-    "hash": "sha256-xPMVP0/ao++XwXX+qW6RRyjqNr8ron5ojZkMCA+2wmE="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-nano-6.5.2.tar.xz",
+    "hash": "sha256-wjzWhBCqU7CAmWhPDCg4RH24FhX79o2pN95uW4VUsgM="
   },
   "plasma-nm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-nm-6.4.5.tar.xz",
-    "hash": "sha256-Sn0ilmiOlZfu3kRN5v5lSBMe1pE2puHEqt76D0oBXRY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-nm-6.5.2.tar.xz",
+    "hash": "sha256-58Ppw4m45tjerF2eOhA74JIRH8/o3sVxg1agf7p4f9w="
   },
   "plasma-pa": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-pa-6.4.5.tar.xz",
-    "hash": "sha256-FMK6z/DwHAtSjXtxtQYsaLKXK7QVtcJzh901zuREGxo="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-pa-6.5.2.tar.xz",
+    "hash": "sha256-hReGSd+zf2XYON5UFRsT8KFFxBesyHm1P2L0ptLwQaE="
   },
   "plasma-sdk": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-sdk-6.4.5.tar.xz",
-    "hash": "sha256-VjLavtw/dRBtFdPW+lBmpb6drPh6IkxH+v6CrBHP278="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-sdk-6.5.2.tar.xz",
+    "hash": "sha256-EgWo57nBxQ7LKjBWLEU6Mge9e/rmhufrzyCrkZOvIj0="
   },
   "plasma-systemmonitor": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-systemmonitor-6.4.5.tar.xz",
-    "hash": "sha256-MXtlI0eq6PmNSWF4GSv93FEn3mariLUa1yyK8flqTD0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-systemmonitor-6.5.2.tar.xz",
+    "hash": "sha256-CjMpu9ex9MunQ000eJXH7hgUuwZD0SALv+D/HPi8yiE="
   },
   "plasma-thunderbolt": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-thunderbolt-6.4.5.tar.xz",
-    "hash": "sha256-fB0EOVuEo2h8Q9lASlfaidZNahNmcQe7wkOmHZ8GXzU="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-thunderbolt-6.5.2.tar.xz",
+    "hash": "sha256-V23b746OP6RNCQwj3DvT5eclgkr5Ih/dU1rUj6J/l7A="
   },
   "plasma-vault": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-vault-6.4.5.tar.xz",
-    "hash": "sha256-OlEFvplfCSMUUDiGfqb8/kWoLpU37vWoVkPbJP/vcPU="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-vault-6.5.2.tar.xz",
+    "hash": "sha256-wFX4WGh+tvYibTjPhFW99VEG6e+mvbPXsDuQqf+mzmk="
   },
   "plasma-welcome": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-welcome-6.4.5.tar.xz",
-    "hash": "sha256-V867V7XVKCY6nZBtsljjaNzNhCUa6SRKwHviC1n+1gk="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-welcome-6.5.2.tar.xz",
+    "hash": "sha256-gJhnSo+0yycl3DwHDol9hHBHaVk2FZsASNXV0aA2lWM="
   },
   "plasma-workspace": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-6.4.5.tar.xz",
-    "hash": "sha256-GZmevzV09TkUW6cHQBm4jVHyypUtEhOU2vavLmMpEPs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-workspace-6.5.2.tar.xz",
+    "hash": "sha256-i/f6U7M+J0SOKxUfX8CGzsxdf1FjxKnY8Th15WduC6Y="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-wallpapers-6.4.5.tar.xz",
-    "hash": "sha256-tDs9MXcS0MTruegAFiRON4LlsHlXV21qAwSQegfAj78="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-workspace-wallpapers-6.5.2.tar.xz",
+    "hash": "sha256-BawdOsYHVjvxjeXOxJ9sClv1HILmuL9EZohuDRnTWTs="
   },
   "plasma5support": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma5support-6.4.5.tar.xz",
-    "hash": "sha256-rP37yC+OOve9NdUUsePLtdq6jae6eQzsto+SWg9N+UI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma5support-6.5.2.tar.xz",
+    "hash": "sha256-gRVRyYxL8EK3keJjWpAP52qvKw3HG1TeyA+cOH90uO8="
   },
   "plymouth-kcm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plymouth-kcm-6.4.5.tar.xz",
-    "hash": "sha256-K1fR9OJddp7ycA4427pV/np4xuyhP+6SWHWxoo4R5Hs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plymouth-kcm-6.5.2.tar.xz",
+    "hash": "sha256-CdRfq03ykcO/58b8FC4uomReON/UWZZ1zRpOzBRmOPA="
   },
   "polkit-kde-agent-1": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/polkit-kde-agent-1-6.4.5.tar.xz",
-    "hash": "sha256-W113FmD1IJKVplr9yz4RfBzJzXwYk9DJtorQxTEwgwE="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/polkit-kde-agent-1-6.5.2.tar.xz",
+    "hash": "sha256-NRzNYj/uhzwdenD0DgoFv5hOrRR5HNkleyt73S3cBMw="
   },
   "powerdevil": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/powerdevil-6.4.5.tar.xz",
-    "hash": "sha256-qo6cbzO4rtTtrpycQ4MJZu1O7C+0N88hAjFQvfvYLkg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/powerdevil-6.5.2.tar.xz",
+    "hash": "sha256-fP6wi+s8xErGrlJWE830CFXdETcIOwUNxeZdN2TL9Ms="
   },
   "print-manager": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/print-manager-6.4.5.tar.xz",
-    "hash": "sha256-4jj9ApLRCsi1xRS9LOC5GNXVsZZsZpUyhb62bhOiQso="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/print-manager-6.5.2.tar.xz",
+    "hash": "sha256-Ti90yOpXgYRlJqQOwyE0UvRq+S0vsrL1vYel0OR/Eu0="
   },
   "qqc2-breeze-style": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/qqc2-breeze-style-6.4.5.tar.xz",
-    "hash": "sha256-3zV16UPdGEbAeOSnDkV7CHeCDlqpn/XyeEMw8MlwN/8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/qqc2-breeze-style-6.5.2.tar.xz",
+    "hash": "sha256-1Ug9q2fFeCMMfnjJ+lS7kA2eGTVvkVBY5IKoTZGVbIE="
   },
   "sddm-kcm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/sddm-kcm-6.4.5.tar.xz",
-    "hash": "sha256-BFI/OCv86SWcRzxX2kRyvk+vkvmLbtQKskq2Y6M3ya0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/sddm-kcm-6.5.2.tar.xz",
+    "hash": "sha256-w5E/2Z+vRLwdKKDmQxbHvfwBmzjNfrgIABRuDH811yk="
   },
   "spacebar": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/spacebar-6.4.5.tar.xz",
-    "hash": "sha256-y9Kj7g9wXxP4tC3HcA+5K++4jQT37jZ57qJNwWxPieA="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/spacebar-6.5.2.tar.xz",
+    "hash": "sha256-IxRtwvvg2AVzsVilWZOKiObVpEBdOVgrM2V6guMnUso="
   },
   "spectacle": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/spectacle-6.4.5.tar.xz",
-    "hash": "sha256-QqVvBZPAxce2YQiO9ubjKg6iSDVPu/20og86IbpVQOc="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/spectacle-6.5.2.tar.xz",
+    "hash": "sha256-RkH7Fk3bPP3vd1l9jbdSGODIt6tjwL38IMoMeiQgmS4="
   },
   "systemsettings": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/systemsettings-6.4.5.tar.xz",
-    "hash": "sha256-kNfwl/GnekAAdiJM26RblMcdD+xD79Ltc3BH8v8quo8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/systemsettings-6.5.2.tar.xz",
+    "hash": "sha256-9vOyGSFg8IyCnAD+TAMV+cBiiNTE2vKHFB4R6D2KS84="
   },
   "wacomtablet": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/wacomtablet-6.4.5.tar.xz",
-    "hash": "sha256-4MdcwKW9KTQfcFzFA/eP3Ul2yxWolBvrt3RIs2iCZyg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/wacomtablet-6.5.2.tar.xz",
+    "hash": "sha256-wA1Zo3rYbWim9fESCwm02Ub6HNjEjFddZnH4VmR5vGM="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/xdg-desktop-portal-kde-6.4.5.tar.xz",
-    "hash": "sha256-n+BPBIK78yYIg2nANde29APbDAaupZNEQqd4h5ntzuI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/xdg-desktop-portal-kde-6.5.2.tar.xz",
+    "hash": "sha256-ai6dwu0QV9+DaAI+o2mKzzCS5N7jHf/zC5X6gb16skk="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix
index 88babf67ee16..8e4cf7571853 100644
--- a/pkgs/kde/misc/kirigami-addons/default.nix
+++ b/pkgs/kde/misc/kirigami-addons/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "kirigami-addons";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
-    hash = "sha256-ITFKkfJrHJYt7z/X/y52LTNYsHX2P01+AUT7LGO368c=";
+    hash = "sha256-yY+Sv3xFLhL23EA0BCFUE9s5Wf6QStgw6tDba7CbPRE=";
   };
 
   extraNativeBuildInputs = [ qttools ];
diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix
index 865d667f33af..b51adab7631f 100644
--- a/pkgs/kde/plasma/default.nix
+++ b/pkgs/kde/plasma/default.nix
@@ -18,6 +18,7 @@
   kglobalacceld = callPackage ./kglobalacceld { };
   kinfocenter = callPackage ./kinfocenter { };
   kmenuedit = callPackage ./kmenuedit { };
+  knighttime = callPackage ./knighttime { };
   kpipewire = callPackage ./kpipewire { };
   krdp = callPackage ./krdp { };
   kscreen = callPackage ./kscreen { };
diff --git a/pkgs/kde/plasma/knighttime/default.nix b/pkgs/kde/plasma/knighttime/default.nix
new file mode 100644
index 000000000000..e2604cae53c2
--- /dev/null
+++ b/pkgs/kde/plasma/knighttime/default.nix
@@ -0,0 +1,9 @@
+{
+  mkKdeDerivation,
+  qtpositioning,
+}:
+mkKdeDerivation {
+  pname = "knighttime";
+
+  extraBuildInputs = [ qtpositioning ];
+}
diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 7f1d1bd89a69..197f01162a8c 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -3,6 +3,7 @@
   mkKdeDerivation,
   replaceVars,
   openssl,
+  pam,
   pkg-config,
   qtwayland,
   freerdp,
@@ -19,6 +20,8 @@ mkKdeDerivation {
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwayland
+
     freerdp
+    pam
   ];
 }
diff --git a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch
index 8ef18364b72c..21d9db7c0c82 100644
--- a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch
+++ b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch
@@ -1,13 +1,13 @@
 diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp
-index 3af527c..3433a84 100644
+index 2d2c5e8..289c6f1 100644
 --- a/src/kcm/kcmkrdpserver.cpp
 +++ b/src/kcm/kcmkrdpserver.cpp
-@@ -218,7 +218,7 @@ void KRDPServerConfig::generateCertificate()
-     QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdpserver/krdp.key"));
+@@ -293,7 +293,7 @@ void KRDPServerConfig::generateCertificate()
+     QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + u"/krdpserver/krdp.key"_s);
      qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath;
      QProcess sslProcess;
--    sslProcess.start(u"openssl"_qs,
-+    sslProcess.start(u"@openssl@"_qs,
+-    sslProcess.start(u"openssl"_s,
++    sslProcess.start(u"@openssl@"_s,
                       {
-                          u"req"_qs,
-                          u"-nodes"_qs,
+                          u"req"_s,
+                          u"-nodes"_s,
diff --git a/pkgs/kde/plasma/plasma-dialer/default.nix b/pkgs/kde/plasma/plasma-dialer/default.nix
index ca5a7cc22182..8a595c98a8f8 100644
--- a/pkgs/kde/plasma/plasma-dialer/default.nix
+++ b/pkgs/kde/plasma/plasma-dialer/default.nix
@@ -1,7 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
-  qtwayland,
+  qtbase,
   callaudiod,
   libphonenumber,
   protobuf,
@@ -11,13 +11,12 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
-    qtwayland
     callaudiod
     libphonenumber
     protobuf
   ];
 
   extraCmakeFlags = [
-    "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
+    "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner"
   ];
 }
diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix
index 18de7ba8e59a..f0af2072c00a 100644
--- a/pkgs/kde/plasma/plasma-mobile/default.nix
+++ b/pkgs/kde/plasma/plasma-mobile/default.nix
@@ -13,6 +13,10 @@ mkKdeDerivation {
     qtsensors
     qtwayland
   ];
+
+  # FIXME: work around Qt 6.10 cmake API changes
+  cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ];
+
   postFixup = ''
     substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \
       --replace-fail \
diff --git a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch
index 0d4481c70541..365ac8e3e160 100644
--- a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch
+++ b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch
@@ -1,25 +1,13 @@
-From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 2 Nov 2021 06:00:32 -0500
-Subject: [PATCH 3/3] fusermount path
-
----
- kded/engine/fusebackend_p.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
-index 91f3523..1c19d88 100644
+index 714b660..cb384fc 100644
 --- a/kded/engine/fusebackend_p.cpp
 +++ b/kded/engine/fusebackend_p.cpp
-@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
+@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
  
  QProcess *FuseBackend::fusermount(const QStringList &arguments) const
  {
--    return process("fusermount", arguments, {});
+-    return process(fusermountExecutable, arguments, {});
 +    return process(NIXPKGS_FUSERMOUNT, arguments, {});
  }
  
  FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
--- 
-2.33.1
-
diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix
index f933687143a8..c66377c87069 100644
--- a/pkgs/kde/plasma/plasma-vault/default.nix
+++ b/pkgs/kde/plasma/plasma-vault/default.nix
@@ -21,7 +21,7 @@ mkKdeDerivation {
     ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
     ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''
     ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''
-    ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''
+    ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount3\"''
     ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''
   ];
 
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index a7cd8fc5388f..ebfa90da040d 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -2,8 +2,6 @@
   lib,
   mkKdeDerivation,
   replaceVars,
-  fetchpatch,
-  dbus,
   fontconfig,
   xorg,
   lsof,
@@ -25,7 +23,6 @@ mkKdeDerivation {
 
   patches = [
     (replaceVars ./dependency-paths.patch {
-      dbusSend = lib.getExe' dbus "dbus-send";
       fcMatch = lib.getExe' fontconfig "fc-match";
       lsof = lib.getExe lsof;
       qdbus = lib.getExe' qttools "qdbus";
@@ -34,12 +31,6 @@ mkKdeDerivation {
       # @QtBinariesDir@ only appears in the *removed* lines of the diff
       QtBinariesDir = null;
     })
-    # Fixes https://github.com/NixOS/nixpkgs/issues/442630, next upstream release should already contain this patch
-    (fetchpatch {
-      name = "fix-media-applet-crash.diff";
-      url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/30273fb2afcc6e304951c8895bb17d38255fed39.diff";
-      sha256 = "sha256-1p1CjxRioCDm5ugoI8l6kDlOse5FbDJ71tTAY9LPvRc=";
-    })
   ];
 
   postInstall = ''
diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
index b4d46cd869bb..df8c5981dcfb 100644
--- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
+++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
-index ba214a555d..421d940738 100644
---- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
-+++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
-@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath)
+diff --git a/applets/devicenotifier/devicemessagemonitor_p.cpp b/applets/devicenotifier/devicemessagemonitor_p.cpp
+index 173fec78c1..0519424f71 100644
+--- a/applets/devicenotifier/devicemessagemonitor_p.cpp
++++ b/applets/devicenotifier/devicemessagemonitor_p.cpp
+@@ -118,7 +118,7 @@ void DeviceMessageMonitor::queryBlockingApps(const QString &devicePath)
          Q_EMIT blockingAppsReady(blockApps);
          p->deleteLater();
      });
@@ -25,7 +25,7 @@ index e27e21a7bd..abbf7f32e1 100644
      p.write(input);
      p.closeWriteChannel();
 diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index 96417c440a..8c9bc2e9ab 100644
+index da28f13837..4af78b7850 100644
 --- a/kcms/fonts/fonts.cpp
 +++ b/kcms/fonts/fonts.cpp
 @@ -137,7 +137,7 @@ void KFonts::save()
@@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644
  
  void CFcQuery::procExited()
 diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
-index f3c9956921..09c818739d 100644
+index 53f77d0a18..680e81b6e4 100644
 --- a/kcms/krdb/krdb.cpp
 +++ b/kcms/krdb/krdb.cpp
 @@ -425,7 +425,7 @@ void runRdb(unsigned int flags)
@@ -107,7 +107,7 @@ index 7218628ce9..9126475ea4 100644
 +ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
  Slice=session.slice
 diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index 4d31c6f408..17418b1ff7 100644
+index b8474dd34f..7d0616e116 100644
 --- a/startkde/startplasma.cpp
 +++ b/startkde/startplasma.cpp
 @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
@@ -119,7 +119,7 @@ index 4d31c6f408..17418b1ff7 100644
  }
  
  QStringList allServices(const QLatin1String &prefix)
-@@ -512,7 +512,7 @@ QProcess *setupKSplash()
+@@ -508,7 +508,7 @@ QProcess *setupKSplash()
          if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
              p = new QProcess;
              p->setProcessChannelMode(QProcess::ForwardedChannels);
@@ -128,14 +128,3 @@ index 4d31c6f408..17418b1ff7 100644
          }
      }
      return p;
-diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in
-index 1e903130a9..0861c3d136 100644
---- a/startkde/systemd/plasma-ksplash-ready.service.in
-+++ b/startkde/systemd/plasma-ksplash-ready.service.in
-@@ -6,5 +6,5 @@ PartOf=graphical-session.target
- 
- [Service]
- Type=oneshot
--ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
-+ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
- Slice=session.slice
diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
index 26e9f16d477c..f87d21cd21b8 100644
--- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
+++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   qtdeclarative,
   kirigami,
-  knotifications,
 }:
 mkKdeDerivation {
   pname = "polkit-kde-agent-1";
@@ -10,6 +9,5 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtdeclarative
     kirigami
-    knotifications
   ];
 }
diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix
index 7902e83710ff..0773a7f7d428 100644
--- a/pkgs/kde/plasma/systemsettings/default.nix
+++ b/pkgs/kde/plasma/systemsettings/default.nix
@@ -1,5 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kauth,
+}:
 mkKdeDerivation {
   pname = "systemsettings";
+
+  extraBuildInputs = [ kauth ];
+
   meta.mainProgram = "systemsettings";
 }
diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix
index 33ab54b180cf..da2401736690 100644
--- a/pkgs/kde/third-party/applet-window-buttons6/default.nix
+++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   extra-cmake-modules,
+  kcmutils,
   kcoreaddons,
   kdeclarative,
   kdecoration,
@@ -23,12 +24,16 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  # kdecoration headers include C++20 spaceship operator
+  env.NIX_CFLAGS_COMPILE = "-std=c++20";
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
   ];
 
   buildInputs = [
+    kcmutils
     kcoreaddons
     kdeclarative
     kdecoration
diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix
index 2cc012ab5a2d..529e98c53668 100644
--- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix
+++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix
@@ -27,7 +27,10 @@ mkKdeDerivation {
     fetchSubmodules = true;
   };
 
-  patches = [ ./nix-plugin.patch ];
+  patches = [
+    ./nix-plugin.patch
+    ./qt-6.10-fix.patch
+  ];
 
   extraNativeBuildInputs = [
     kpackage
@@ -52,6 +55,7 @@ mkKdeDerivation {
       ]
     ))
     (lib.cmakeFeature "Qt6_DIR" "${qtbase}/lib/cmake/Qt6")
+    "-DCMAKE_CXX_FLAGS=-Wno-error=stringop-overflow"
   ];
 
   postInstall = ''
diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch b/pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch
new file mode 100644
index 000000000000..fb9d15f02baa
--- /dev/null
+++ b/pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch
@@ -0,0 +1,42 @@
+--- a/src/backend_mpv/MpvBackend.cpp
++++ b/src/backend_mpv/MpvBackend.cpp
+@@ -37,7 +37,9 @@
+ #    include <QX11Info> // IWYU pragma: keep
+ #endif
+ //#endif
++#if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0))
+ #    include <qpa/qplatformnativeinterface.h> // IWYU pragma: keep
++#endif
+ #endif
+ 
+ Q_LOGGING_CATEGORY(wekdeMpv, "wekde.mpv")
+@@ -85,8 +87,13 @@ int CreateMpvContex(mpv_handle* mpv, mpv_render_context** mpv_gl) {
+     if (QGuiApplication::platformName().contains("xcb")) {
+         params[2].type = MPV_RENDER_PARAM_X11_DISPLAY;
+ #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+-        // TODO: QGuiApplication::nativeInterface<QNativeInterface::QX11Application>()::display();
+-        // same for wayland
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        if (auto x11App = qApp->nativeInterface<QNativeInterface::QX11Application>()) {
++            params[2].data = x11App->display();
++        }
++#else
++        // Fallback for Qt 6.0-6.9
+         auto* native   = QGuiApplication::platformNativeInterface();
+         params[2].data = native->nativeResourceForWindow("display", nullptr);
++#endif
+ #else
+@@ -95,6 +102,12 @@ int CreateMpvContex(mpv_handle* mpv, mpv_render_context** mpv_gl) {
+     }
+     if (QGuiApplication::platformName().contains("wayland")) {
+         params[2].type = MPV_RENDER_PARAM_WL_DISPLAY;
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        if (auto waylandApp = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()) {
++            params[2].data = waylandApp->display();
++        }
++#else
+         auto* native   = QGuiApplication::platformNativeInterface();
+         params[2].data = native->nativeResourceForWindow("display", nullptr);
++#endif
+     }
+ #endif
diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index b3b43b9a78c8..c813e6e94b10 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -98,8 +98,19 @@ let
         hardeningDisable = [ "all" ];
         dontStrip = true;
 
-        # breaks secondary CPU bringup on at least RK3588, maybe others
-        env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
+        env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
+          # breaks secondary CPU bringup on at least RK3588, maybe others
+          "-fomit-frame-pointer"
+
+          # Breaks compilation of armTrustedFirmwareRK3399:
+          # /nix/store/hash-arm-none-eabi-binutils-2.44/bin/arm-none-eabi-ld: /build/source/build/rk3399/release/m0/rk3399m0.elf: error: PHDR segment not covered by LOAD segment
+          #
+          # This was caused by ccc56d1a79ff2a0f528cecf5e36eb76beaacc8c0 adding the flag `--enable-default-pie`.
+          # According to https://trustedfirmware-a.readthedocs.io/en/v2.2/getting_started/user-guide.html,
+          # Trusted Firmware-A has an option called ENABLE_PIE, which is turned off by default.
+          # Someone with more knowledge of the implications can try using that option instead.
+          "-no-pie"
+        ];
 
         meta =
           with lib;
diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index 748b3fd81e76..f8e7c2ecc1d7 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -5,10 +5,10 @@
 }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.27";
+  version = "2.25.29";
   src = fetchzip {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-cZ6XZt1y646Kke3wdJ5Jo9ieOejbojsEBSkAvLDXNPw=";
+    hash = "sha256-t6EnGCD0QMARK1/yJBjtLFzVaBWiiut8KWrtzmzHgCM=";
   };
 
   passthru.updateScript = {
diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index 660349b1ac00..13c7ce8e3979 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -42,8 +42,12 @@ let
     );
 in
 rec {
-  auditbeat7 = beat "auditbeat" { meta.description = "Lightweight shipper for audit data"; };
+  auditbeat7 = beat "auditbeat" {
+    pos = __curPos;
+    meta.description = "Lightweight shipper for audit data";
+  };
   filebeat7 = beat "filebeat" {
+    pos = __curPos;
     meta.description = "Lightweight shipper for logfiles";
     buildInputs = [ systemd ];
     tags = [ "withjournald" ];
@@ -51,8 +55,12 @@ rec {
       patchelf --set-rpath ${lib.makeLibraryPath [ (lib.getLib systemd) ]} "$out/bin/filebeat"
     '';
   };
-  heartbeat7 = beat "heartbeat" { meta.description = "Lightweight shipper for uptime monitoring"; };
+  heartbeat7 = beat "heartbeat" {
+    pos = __curPos;
+    meta.description = "Lightweight shipper for uptime monitoring";
+  };
   metricbeat7 = beat "metricbeat" {
+    pos = __curPos;
     meta.description = "Lightweight shipper for metrics";
     passthru.tests = lib.optionalAttrs config.allowUnfree (
       assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath;
@@ -63,6 +71,7 @@ rec {
   };
   packetbeat7 = beat "packetbeat" {
     buildInputs = [ libpcap ];
+    pos = __curPos;
     meta.description = "Network packet analyzer that ships data to Elasticsearch";
     meta.longDescription = ''
       Packetbeat is an open source network packet analyzer that ships the
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 559da3d2c48d..7a8811a5492c 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -34,10 +34,10 @@
 }@pkgs:
 
 let
-  defaultVersion = "2025.07";
+  defaultVersion = "2025.10";
   defaultSrc = fetchurl {
     url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
-    hash = "sha256-D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc=";
+    hash = "sha256-tPAyhI5WzI8hOtWfkTLAhNu7YyvCkXbQJOWCIODv30o=";
   };
 
   # Dependencies for the tools need to be included as either native or cross,
@@ -313,9 +313,6 @@ in
     '';
   };
 
-  # Flashing instructions:
-  # dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=512 skip=1 seek=1
-  # dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=1 count=444
   ubootLibreTechCC =
     let
       firmwareImagePkg = fetchFromGitHub {
@@ -330,6 +327,15 @@ in
       defconfig = "libretech-cc_defconfig";
       extraMeta = {
         broken = stdenv.buildPlatform.system != "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary
+        longDescription = ''
+          Boot loader for the Libre Computer AML-S905X-CC.
+
+          Flashing instructions:
+          ```sh
+          dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=512 skip=1 seek=1
+          dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=1 count=444
+          ```
+        '';
         platforms = [ "aarch64-linux" ];
       };
       filesToInstall = [ "u-boot.bin" ];
@@ -395,6 +401,17 @@ in
     ];
   };
 
+  ubootNanoPiR5S = buildUBoot {
+    defconfig = "nanopi-r5s-rk3568_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    BL31 = rkbin.BL31_RK3568;
+    ROCKCHIP_TPL = rkbin.TPL_RK3568;
+    filesToInstall = [
+      "idbloader.img"
+      "u-boot.itb"
+    ];
+  };
+
   ubootNovena = buildUBoot {
     defconfig = "novena_defconfig";
     extraMeta.platforms = [ "armv7l-linux" ];
@@ -404,10 +421,6 @@ in
     ];
   };
 
-  # Flashing instructions:
-  # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=1 count=442
-  # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=512 skip=1 seek=1
-  # dd if=u-boot.gxbb of=<device> conv=fsync bs=512 seek=97
   ubootOdroidC2 =
     let
       firmwareBlobs = fetchFromGitHub {
@@ -420,7 +433,19 @@ in
     in
     buildUBoot {
       defconfig = "odroid-c2_defconfig";
-      extraMeta.platforms = [ "aarch64-linux" ];
+      extraMeta = {
+        longDescription = ''
+          Boot loader for the Hardkernel ODROID-C2.
+
+          Flashing instructions:
+          ```sh
+          dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=1 count=442
+          dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=512 skip=1 seek=1
+          dd if=u-boot.gxbb of=<device> conv=fsync bs=512 seek=97
+          ```
+        '';
+        platforms = [ "aarch64-linux" ];
+      };
       filesToInstall = [
         "u-boot.bin"
         "u-boot.gxbb"
@@ -763,13 +788,17 @@ in
     ];
   };
 
-  # A special build with much lower memory frequency (666 vs 1600 MT/s) which
-  # makes ROCK64 V2 boards stable. This is necessary because the DDR3 routing
-  # on that revision is marginal and not unconditionally stable at the specified
-  # frequency. If your ROCK64 is unstable you can try this u-boot variant to
-  # see if it works better for you. The only disadvantage is lowered memory
-  # bandwidth.
   ubootRock64v2 = buildUBoot {
+    extraMeta.longDescription = ''
+      Boot loader for the Pine64 Rock64 V2.
+
+      A special build with much lower memory frequency (666 vs 1600 MT/s) which
+      makes ROCK64 V2 boards stable. This is necessary because the DDR3 routing
+      on that revision is marginal and not unconditionally stable at the specified
+      frequency. If your ROCK64 is unstable you can try this u-boot variant to
+      see if it works better for you. The only disadvantage is lowered memory
+      bandwidth.
+    '';
     prePatch = ''
       substituteInPlace arch/arm/dts/rk3328-rock64-u-boot.dtsi \
         --replace rk3328-sdram-lpddr3-1600.dtsi rk3328-sdram-lpddr3-666.dtsi
@@ -853,8 +882,15 @@ in
     extraConfig = ''
       CONFIG_CMD_SETEXPR=y
     '';
-    # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx
-    # sf probe; sf update $loadaddr 0 80000
+    extraMeta.longDescription = ''
+      Boot loader for the CompuLab CM-FX6.
+
+      Flashing instructions:
+      ```
+      sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx
+      sf probe; sf update $loadaddr 0 80000
+      ```
+    '';
   };
 
   ubootVisionFive2 = buildUBoot {
diff --git a/pkgs/misc/uboot/python.nix b/pkgs/misc/uboot/python.nix
index 0e1bb72b657f..dc81ec04f37f 100644
--- a/pkgs/misc/uboot/python.nix
+++ b/pkgs/misc/uboot/python.nix
@@ -12,7 +12,7 @@
   lzop,
   openssl,
   ubootTools,
-  vboot_reference,
+  vboot-utils,
   xilinx-bootgen,
   xz,
   zstd,
@@ -85,7 +85,7 @@ rec {
         lzop
         openssl
         ubootTools
-        vboot_reference
+        vboot-utils
         xilinx-bootgen
         xz
         zstd
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
index f8b4859a68eb..0aed42cbaa40 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
@@ -18,7 +18,7 @@ mkDerivation {
   alwaysKeepStatic = true;
 
   meta = with lib; {
-    platform = platforms.freebsd;
+    platforms = platforms.freebsd;
     license = licenses.cddl;
   };
 }
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
index bd33c4121f7c..d60de4758af2 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   mkDerivation,
   libcMinimal,
   include,
@@ -32,6 +33,19 @@ mkDerivation {
     libgcc
   ];
 
+  patches = [
+    # https://github.com/freebsd/freebsd-src/pull/1882
+    (fetchpatch {
+      name = "freebsd-libthr-use-nonstring-attribute.patch";
+      url = "https://github.com/freebsd/freebsd-src/pull/1882/commits/650800993deb513dc31e99ef5cdecd50ee70bb04.diff";
+      hash = "sha256-WKN7dfGAs1+XADT4aLUkkKmQQ4n7gsyFUTCeo6mcuMY=";
+      includes = [ "lib/libthr/thread/thr_printf.c" ];
+    })
+  ];
+
+  # Presumably newer Clang has gotten more strict.
+  CWARNEXTRA = "-Wno-cast-function-type-mismatch";
+
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
   '';
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index 27f90f4cf05c..f9ecef321bc4 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -1,5 +1,6 @@
 {
   mkDerivation,
+  fetchpatch,
   include,
   rpcgen,
   flex,
@@ -30,6 +31,16 @@ mkDerivation {
   ]
   ++ extraSrc;
 
+  patches = [
+    # https://github.com/freebsd/freebsd-src/pull/1882
+    (fetchpatch {
+      name = "freebsd-rtld-use-nonstring-attribute.patch";
+      url = "https://github.com/freebsd/freebsd-src/pull/1882/commits/650800993deb513dc31e99ef5cdecd50ee70bb04.diff";
+      hash = "sha256-V9jDE/5Fu6hLIzlG1e6AqLnGwlzW2OjonyUgvSVtm58=";
+      includes = [ "libexec/rtld-elf/rtld.c" ];
+    })
+  ];
+
   outputs = [
     "out"
     "man"
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index 9c93d416f6c0..3dbfe3d9c284 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -70,7 +70,7 @@ let
   // (lib.flip lib.mapAttrs' extraFlags (
     name: value: {
       name = "MK_${lib.toUpper name}";
-      value = if value then "yes" else "no";
+      value = lib.boolToYesNo value;
     }
   ));
 in
diff --git a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix
index 8852075d14fd..c0fd72318bd9 100644
--- a/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix
+++ b/pkgs/os-specific/bsd/netbsd/pkgs/sys/base.nix
@@ -81,6 +81,13 @@
     cp arch/$MACHINE/compile/$CONFIG/netbsd $out
   '';
 
+  postIncludes = ''
+    install $BSDSRCDIR/lib/libossaudio/soundcard.h $out/include/soundcard.h
+  '';
+
   meta.platforms = lib.platforms.netbsd;
-  extraPaths = [ "common" ];
+  extraPaths = [
+    "common"
+    "lib/libossaudio"
+  ];
 }
diff --git a/pkgs/os-specific/cygwin/w32api/default.nix b/pkgs/os-specific/cygwin/w32api/default.nix
index 4950da53116d..1fcb6d607066 100644
--- a/pkgs/os-specific/cygwin/w32api/default.nix
+++ b/pkgs/os-specific/cygwin/w32api/default.nix
@@ -39,7 +39,7 @@
         license
         ;
       platforms = lib.platforms.unix ++ lib.platforms.windows;
-      teams = [ lib.maintainers.corngood ];
+      maintainers = [ lib.maintainers.corngood ];
     };
   }
   // (
diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
index 2625f276923e..8cd1ee632f2b 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
@@ -4,6 +4,7 @@
   buildPackages,
   mkAppleDerivation,
   unifdef,
+  bashNonInteractive,
 }:
 
 let
@@ -19,8 +20,7 @@ mkAppleDerivation (finalAttrs: {
     ./patches/0001-Support-setting-an-upper-bound-on-versions.patch
   ];
 
-  noCC = true;
-
+  buildInputs = [ bashNonInteractive ];
   nativeBuildInputs = [ unifdef ];
 
   buildPhase = ''
@@ -65,6 +65,7 @@ mkAppleDerivation (finalAttrs: {
       Availability.h
       AvailabilityInternal.h
       AvailabilityInternalLegacy.h
+      AvailabilityInternalPrivate.h
       AvailabilityMacros.h
       AvailabilityVersions.h
       os/availability.h
diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch
index 6dcf8eef3619..d1d4673e2d72 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch
+++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/patches/0001-Support-setting-an-upper-bound-on-versions.patch
@@ -189,10 +189,10 @@ index 8ebd250..5bb9edb 100755
              if platform.bleached:
                  output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
              writeDefines(platformString, platformString, platform.versioned)
-@@ -326,9 +351,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
-         output.write(f" #endif /* __has_attribute(availability) */\n")
+@@ -327,9 +352,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
          output.write(f"#endif /* defined(__has_feature) && defined(__has_attribute) */\n")
      def AVAILABILITY_MACRO_IMPL(self, output, prefix, dispatcher, **optionals):
+         av_version_hash = zlib.adler32(avVersion.encode()) # This does not need to cryptographically secure as it is meant to detect accidental failures
 -        count = len(versions.platforms())
 -        for platformString in versions.platforms():
 -            platform = versions.platforms()[platformString]
@@ -241,4 +241,3 @@ index 8ebd250..5bb9edb 100755
          if getattr(args, platform, None):
 -- 
 2.45.2
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
index 9a7ec4561355..27d7af4b0b95 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/package.nix
@@ -3,8 +3,10 @@
   bootstrapStdenv,
   buildPackages,
   fetchpatch2,
+  icu76, # The ICU version should correspond to the same one used by Apple’s ICU package
   mkAppleDerivation,
   python3,
+  stdenvNoCC,
   testers,
 }:
 
@@ -12,6 +14,19 @@
 # - ../../../development/libraries/icu/make-icu.nix
 # - https://github.com/apple-oss-distributions/ICU/blob/main/makefile
 let
+  privateHeaders = stdenvNoCC.mkDerivation {
+    name = "ICU-deps-private-headers";
+
+    buildCommand = ''
+      mkdir -p "$out/include/os"
+      cat <<EOF > "$out/include/os/feature_private.h"
+      #pragma once
+      extern "C" bool _os_feature_enabled_impl(const char*, const char*);
+      #define os_feature_enabled(a, b) _os_feature_enabled_impl(#a, #b)
+      EOF
+    '';
+  };
+
   stdenv = bootstrapStdenv;
   withStatic = stdenv.hostPlatform.isStatic;
 
@@ -26,13 +41,6 @@ let
     patches = [
       # Skip MessageFormatTest test, which is known to crash sometimes and should be suppressed if it does.
       ./patches/suppress-icu-check-crash.patch
-
-      # Python 3.13 compatibility
-      (fetchpatch2 {
-        url = "https://github.com/unicode-org/icu/commit/60d6bd71efc0cde8f861b109ff87dbbf9fc96586.patch?full_index=1";
-        hash = "sha256-aJBSVvKidPUjD956jLjyRk8fewUZ9f+Ip4ka6rjevzU=";
-        stripLen = 2;
-      })
     ];
 
     preConfigure = ''
@@ -67,6 +75,7 @@ let
     env.NIX_CFLAGS_COMPILE = toString [
       "-DU_SHOW_CPLUSPLUS_API=1"
       "-DU_SHOW_INTERNAL_API=1"
+      "-I${privateHeaders}/include"
     ];
 
     passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
@@ -93,24 +102,38 @@ let
     ++ lib.optional withStatic "static";
     outputBin = "dev";
 
-    postPatch = lib.optionalString self.finalPackage.doCheck ''
-      # Skip test for missing encodingSamples data.
-      substituteInPlace test/cintltst/ucsdetst.c \
-        --replace-fail "&TestMailFilterCSS" "NULL"
+    postPatch =
+      lib.optionalString self.finalPackage.doCheck (
+        ''
+          # Skip test for missing encodingSamples data.
+          substituteInPlace test/cintltst/ucsdetst.c \
+            --replace-fail "&TestMailFilterCSS" "NULL"
 
-      # Disable failing tests
-      substituteInPlace test/cintltst/cloctst.c \
-        --replace-fail 'TESTCASE(TestCanonicalForm);' ""
+          # Disable failing tests
+          substituteInPlace test/cintltst/cloctst.c \
+            --replace-fail 'TESTCASE(TestCanonicalForm);' ""
 
-      substituteInPlace test/intltest/rbbitst.cpp \
-        --replace-fail 'TESTCASE_AUTO(TestExternalBreakEngineWithFakeYue);' ""
+          substituteInPlace test/intltest/rbbitst.cpp \
+            --replace-fail 'TESTCASE_AUTO(TestExternalBreakEngineWithFakeYue);' ""
 
-      # Otherwise `make install` is broken.
-      substituteInPlace Makefile.in \
-        --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE"
-      substituteInPlace config/dist-data.sh \
-        --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE"
-    '';
+          # Add missing test data. It’s not included in the source release.
+          chmod u+w "$NIX_BUILD_TOP/source/icu"
+          tar -C "$NIX_BUILD_TOP/source" -axf ${lib.escapeShellArg icu76.src} icu/testdata
+        ''
+        + lib.optionalString stdenv.hostPlatform.isx86_64 ''
+          # These tests fail under Rosetta 2 with a floating-point exception.
+          substituteInPlace test/intltest/caltest.cpp \
+            --replace-fail 'TESTCASE_AUTO(Test22633RollTwiceGetTimeOverflow);' "" \
+            --replace-fail 'TESTCASE_AUTO(Test22750Roll);' ""
+        ''
+      )
+      + ''
+        # Otherwise `make install` is broken.
+        substituteInPlace Makefile.in \
+          --replace-fail '$(top_srcdir)/../LICENSE' "$NIX_BUILD_TOP/source/icu/LICENSE"
+        substituteInPlace config/dist-data.sh \
+          --replace-fail "\''${top_srcdir}/../LICENSE" "$NIX_BUILD_TOP/source/icu/LICENSE"
+      '';
 
     # remove dependency on bootstrap-tools in early stdenv build
     postInstall =
diff --git a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix
index 231d0ffb562f..f846f1aebc27 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/PowerManagement/package.nix
@@ -13,14 +13,15 @@ let
 
     buildCommand = ''
       install -D -t "$out/include/IOKit/pwr_mgt" \
-        '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h'
+        '${iokitUser}/pwr_mgt.subproj/IOPMLibPrivate.h' \
+        '${iokitUser}/pwr_mgt.subproj/IOPMAssertionCategories.h'
     '';
   };
 in
 mkAppleDerivation {
   releaseName = "PowerManagement";
 
-  xcodeHash = "sha256-l6lm8aaiJg4H2BQVCjlFldpfhnmPAlsiMK7Cghzuh1E=";
+  xcodeHash = "sha256-cjTF4dR6S55mLwp4GkQhkkNk9sMMKDc/5JTm46Z7/KE=";
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
index f994ab88d029..ba19dccc1284 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/package.nix
@@ -38,7 +38,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-2p/JyMPw6acHphvzkaJXPXGwxCUEoxryCejww5kPHvQ=";
+  xcodeHash = "sha256-QhkylTnnCy4qG8fpUMlKqDGKz58jysL0YF4lFGJzPzE=";
 
   postPatch = ''
     # Meson generators require using @BASENAME@ in the output.
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix
index 0f5e1f77dd1a..ca416bc65934 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   apple-sdk,
-  apple-sdk_12,
   bison,
   buildPackages,
   flex,
@@ -14,10 +13,7 @@
 
 let
   Libc = apple-sdk.sourceRelease "Libc";
-
-  # Older versions of xnu are missing required headers. The one for the 11.3 SDK doesn’t define a needed function
-  # that was added in 11.3. This version of xnu has everything that’s needed.
-  xnu = apple-sdk_12.sourceRelease "xnu";
+  xnu = apple-sdk.sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "adv_cmds-deps-private-headers";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
index b2c02c05e624..413e6532b3a6 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/copyfile/package.nix
@@ -71,15 +71,6 @@ mkAppleDerivation {
 
   xcodeHash = "sha256-SYW6pBlCQkcbkBqCq+W/mDYZZ7/co2HlPZwXzgh/LnI=";
 
-  postPatch = ''
-    # Disable experimental bounds safety stuff that’s not available in LLVM 16.
-    for header in copyfile.h xattr_flags.h; do
-      substituteInPlace "$header" \
-        --replace-fail '__ptrcheck_abi_assume_single()' "" \
-        --replace-fail '__unsafe_indexable' ""
-    done
-  '';
-
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
 
   meta.description = "Darwin file copying library";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix
index ec022deebdf2..493fabf82baf 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/doc_cmds/package.nix
@@ -1,11 +1,28 @@
 {
   lib,
+  apple-sdk,
   mkAppleDerivation,
   pkg-config,
   shell_cmds,
+  stdenvNoCC,
   zlib,
 }:
 
+let
+  xnu = apple-sdk.sourceRelease "xnu";
+
+  privateHeaders = stdenvNoCC.mkDerivation {
+    name = "doc_cmds-deps-private-headers";
+
+    buildCommand = ''
+      install -D -m644 -t "$out/include/System/sys" \
+        '${xnu}/bsd/sys/codesign.h'
+
+      install -D -m644 -t "$out/include/kern" \
+        '${xnu}/osfmk/kern/cs_blobs.h'
+    '';
+  };
+in
 mkAppleDerivation {
   releaseName = "doc_cmds";
 
@@ -14,11 +31,13 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-7/ADsfXTKqQhgratg2Twj7JgfFV0/U9rEvtsnX+NFPw=";
+  xcodeHash = "sha256-Nt6yHx3K8OkrdSWuX9s+JJIkeA5S6HDBAtTtrEjbk4w=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ zlib ];
 
+  env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
+
   postInstall = ''
     HOST_PATH='${lib.getBin shell_cmds}/bin' patchShebangs --host "$out/libexec"
   '';
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in
index 71b4ec7dc606..b3c095cc5499 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/meson.build.in
@@ -40,6 +40,7 @@ common_inc = [
     'dyld',
     'include',
     'mach_o',
+    'include/mach-o',
 ]
 
 
@@ -86,6 +87,79 @@ lsl_dep = declare_dependency(
     link_with : lsl,
 )
 
+libmach_o = static_library(
+    'mach_o',
+    dependencies : [ lsl_dep ],
+    include_directories : [
+        common_inc,
+        'mach_o',
+    ],
+    sources : [
+        'mach_o/Architecture.cpp',
+        'mach_o/Archive.cpp',
+        'mach_o/BindOpcodes.cpp',
+        'mach_o/ChainedFixups.cpp',
+        'mach_o/CompactUnwind.cpp',
+        'mach_o/DataInCode.cpp',
+        'mach_o/DwarfDebug.cpp',
+        'mach_o/Error.cpp',
+        'mach_o/ExportsTrie.cpp',
+        'mach_o/Fixups.cpp',
+        'mach_o/FunctionStarts.cpp',
+        'mach_o/FunctionVariants.cpp',
+        'mach_o/GradedArchitectures.cpp',
+        'mach_o/Header.cpp',
+        'mach_o/Image.cpp',
+        'mach_o/Instructions.cpp',
+        # 'mach_o/LinkerOptimizationHints.cpp',
+        'mach_o/LoggingStub.cpp',
+        'mach_o/Misc.cpp',
+        'mach_o/NListSymbolTable.cpp',
+        'mach_o/ObjC.cpp',
+        'mach_o/Platform.cpp',
+        'mach_o/Policy.cpp',
+        'mach_o/RebaseOpcodes.cpp',
+        'mach_o/SplitSeg.cpp',
+        'mach_o/Symbol.cpp',
+        'mach_o/Universal.cpp',
+        'mach_o/Version32.cpp',
+        'mach_o/Version64.cpp',
+    ],
+)
+libmach_o_dep = declare_dependency(
+    include_directories : [ 'mach_o' ],
+    link_with : libmach_o,
+)
+
+libmach_o_writer = static_library(
+    'mach_o_writer',
+    dependencies : [ lsl_dep ],
+    include_directories : [
+        common_inc,
+        'mach_o_writer',
+    ],
+    sources : [
+        'mach_o_writer/ArchiveWriter.cpp',
+        'mach_o_writer/BindOpcodesWriter.cpp',
+        'mach_o_writer/ChainedFixupsWriter.cpp',
+        'mach_o_writer/ChunkBumpAllocator.cpp',
+        'mach_o_writer/CompactUnwindWriter.cpp',
+        'mach_o_writer/DataInCodeWriter.cpp',
+        'mach_o_writer/ExportsTrieWriter.cpp',
+        'mach_o_writer/FunctionStartsWriter.cpp',
+        'mach_o_writer/FunctionVariantsWriter.cpp',
+        'mach_o_writer/HeaderWriter.cpp',
+        'mach_o_writer/LinkerOptimizationHintsWriter.cpp',
+        'mach_o_writer/NListSymbolTableWriter.cpp',
+        'mach_o_writer/RebaseOpcodesWriter.cpp',
+        'mach_o_writer/SplitSegWriter.cpp',
+        'mach_o_writer/UniversalWriter.cpp',
+    ],
+)
+libmach_o_writer_dep = declare_dependency(
+    include_directories : [ 'mach_o_writer' ],
+    link_with : libmach_o_writer,
+)
 
 # These files need to be built with `BUILDING_LIBDYLD` not `BUILDING_DYLDINFO`.
 # `dyld_info` can’t just link against `libdyld` because the symbols it needs are not publicly exported.
@@ -110,15 +184,17 @@ libminidyld = static_library(
         'common/MachOLayout.cpp',
         'common/MachOLoaded.cpp',
         'libdyld/CrashReporterAnnotations.c',
-        'mach_o/ChainedFixups.cpp',
-        'mach_o/GradedArchitectures.cpp',
     ],
 )
 
 libdsc_extractor = shared_library(
     'dsc_extractor',
     cpp_args : [ '-DBUILDING_SHARED_CACHE_EXTRACTOR=1' ],
-    dependencies : [ corecrypto_dep, lsl_dep ],
+    dependencies : [
+        corecrypto_dep,
+        libmach_o_dep,
+        lsl_dep
+    ],
     include_directories : [
         common_inc,
         'cache-builder',
@@ -132,6 +208,7 @@ libdsc_extractor = shared_library(
     sources : [
         'common/DyldSharedCache.cpp',
         'common/MachOFile.cpp',
+        'common/TargetPolicy.cpp',
         'other-tools/dsc_extractor.cpp',
         'other-tools/dsc_iterator.cpp',
         'common/MachOLayout.cpp',
@@ -156,6 +233,7 @@ executable(
     ],
     dependencies : [
         corecrypto_dep,
+        libmach_o_dep,
         llvm_dep,
         lsl_dep,
     ],
@@ -175,31 +253,10 @@ executable(
         'common/MachOFile.cpp',
         'common/MetadataVisitor.cpp',
         'common/SwiftVisitor.cpp',
-        'mach_o/Architecture.cpp',
-        'mach_o/Archive.cpp',
-        'mach_o/BindOpcodes.cpp',
-        'mach_o/ChainedFixups.cpp',
-        'mach_o/CompactUnwind.cpp',
-        'mach_o/Error.cpp',
-        'mach_o/ExportsTrie.cpp',
-        'mach_o/Fixups.cpp',
-        'mach_o/FunctionStarts.cpp',
-        'mach_o/Header.cpp',
-        'mach_o/Image.cpp',
-        'mach_o/Instructions.cpp',
-        'mach_o/LoggingStub.cpp',
-        'mach_o/Misc.cpp',
-        'mach_o/NListSymbolTable.cpp',
-        'mach_o/ObjC.cpp',
-        'mach_o/Platform.cpp',
-        'mach_o/Policy.cpp',
-        'mach_o/RebaseOpcodes.cpp',
-        'mach_o/SplitSeg.cpp',
-        'mach_o/Symbol.cpp',
-        'mach_o/Universal.cpp',
-        'mach_o/Version32.cpp',
-        'mach_o/Version64.cpp',
+        'common/TargetPolicy.cpp',
         'other-tools/dyld_info.cpp',
+        'other-tools/MiscFileUtils.cpp',
+        'other-tools/SymbolicatedImage.cpp',
     ],
 )
 install_man('doc/man/man1/dyld_info.1')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix
index 869d4b3ea9da..8cc3eaa2071a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
-  apple-sdk_12,
+  apple-sdk,
   ld64,
   mkAppleDerivation,
   cmake,
-  llvmPackages,
+  llvm,
   openssl,
+  pkgsBuildHost,
   pkg-config,
   stdenvNoCC,
   fetchurl,
@@ -19,11 +20,11 @@ let
     hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk=";
   };
 
-  launchd = apple-sdk_12.sourceRelease "launchd";
-  Libc = apple-sdk_12.sourceRelease "Libc";
-  libplatform = apple-sdk_12.sourceRelease "libplatform";
-  libpthread = apple-sdk_12.sourceRelease "libpthread";
-  xnu = apple-sdk_12.sourceRelease "xnu";
+  launchd = apple-sdk.sourceRelease "launchd";
+  Libc = apple-sdk.sourceRelease "Libc";
+  libplatform = apple-sdk.sourceRelease "libplatform";
+  libpthread = apple-sdk.sourceRelease "libpthread";
+  xnu = apple-sdk.sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "dyld-deps-private-headers";
@@ -43,7 +44,8 @@ let
       install -D -m644 -t "$out/include/System" \
         '${Libc}/stdlib/FreeBSD/atexit.h'
 
-      mkdir -p "$out/include/System/sys"
+      install -D -m644 -t "$out/include/System/sys" \
+        '${xnu}/bsd/sys/csr.h'
       substitute '${xnu}/bsd/sys/fsgetpath.h' "$out/include/System/sys/fsgetpath.h" \
         --replace-fail '#ifdef __APPLE_API_PRIVATE' '#if 1'
 
@@ -91,13 +93,11 @@ mkAppleDerivation {
 
   propagatedBuildOutputs = [ ];
 
-  xcodeHash = "sha256-NfaENSF699xjc+eKtOm1RyXUCMD6xTaJ5+9arLllqyw=";
+  xcodeHash = "sha256-4yOJouk9AjEt7W3+0cQRMUDDqBhU+J9c16ZQSzUF5go=";
 
   patches = [
     # Disable use of private kdebug API
     ./patches/0001-Disable-kdebug-trace.patch
-    # dyld_info requires `startsWith`, but it’s not normally built for `dyld_info`.
-    ./patches/0002-Provide-startsWith-for-dyld_info.patch
     # dyld_info tries to weakly link against libLTO using this macro.
     ./patches/0003-Add-weaklinking_h.patch
     # The LLVMOpInfoCallback args comment out one of the args. Fix that for compatibility with nixpkgs LLVM.
@@ -108,6 +108,9 @@ mkAppleDerivation {
     # `dsc_extractor` builds a dylib, but it includes a program that can perform cache extraction.
     # This extracts just the driver into a file to make building the actual program easier.
     ./patches/0006-Add-dsc_extractor_bin_cpp.patch
+    # Fix missing symbol for `mach_o::ChainedFixups::PointerFormat::writeChainEntry`,
+    # which isn’t actually needed by `dyld_info` or `dsc_extractor`.
+    ./patches/0007-Fix-missing-writeChainEntry.patch
   ];
 
   postPatch = ''
@@ -143,6 +146,9 @@ mkAppleDerivation {
     substituteInPlace dyld/Loader.h \
       --replace-fail 'dyld_priv.h' 'mach-o/dyld_priv.h'
 
+    substituteInPlace common/DyldSharedCache.h \
+      --replace-fail 'dyld_cache_format.h' 'mach-o/dyld_cache_format.h'
+
     # Remove unused header include (since the compat shims don’t provide it).
     substituteInPlace other-tools/dsc_extractor.cpp \
       --replace-fail '#include <CommonCrypto/CommonHMAC.h>' ""
@@ -155,13 +161,13 @@ mkAppleDerivation {
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
 
   buildInputs = [
-    apple-sdk_12 # Needed for `PLATFORM_FIRMWARE` and `PLATFORM_SEPOS` defines in `mach-o/loader.h`.
-    llvmPackages.llvm
+    llvm
     openssl
   ];
 
   nativeBuildInputs = [
     cmake # CMake is required for Meson to find LLVM as a dependency.
+    (lib.getDev pkgsBuildHost.llvm) # Workaround Meson limitations with LLVM 21.
     pkg-config
   ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch
deleted file mode 100644
index 746f21cc23ae..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0002-Provide-startsWith-for-dyld_info.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/common/MachOFile.cpp b/common/MachOFile.cpp
-index 3e7b95bcfe..265ae7c475 100644
---- a/common/MachOFile.cpp
-+++ b/common/MachOFile.cpp
-@@ -2493,7 +2493,14 @@
- }
- #endif // BUILDING_APP_CACHE_UTIL || BUILDING_DYLDINFO
- 
--#if BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-+#if BUILDING_DYLDINFO || BUILDING_CACHE_BUILDER || BUILDING_CACHE_BUILDER_UNIT_TESTS
-+
-+#if BUILDING_DYLDINFO
-+static bool startsWith(const char* buffer, const char* valueToFind) {
-+    return strncmp(buffer, valueToFind, strlen(valueToFind)) == 0;
-+}
-+#endif
-+
- static bool platformExcludesPrebuiltClosure_macOS(const char* path) {
-     // We no longer support ROSP, so skip all paths which start with the special prefix
-     if ( startsWith(path, "/System/Library/Templates/Data/") )
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
index cc3e0c8729ff..ea18669b09f1 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0004-Fix-llvm-op-info-callback-args.patch
@@ -1,7 +1,7 @@
 diff --git a/other-tools/dyld_info.cpp b/other-tools/dyld_info.cpp
 index 2de4978ba5..2ce27257d9 100644
---- a/other-tools/dyld_info.cpp
-+++ b/other-tools/dyld_info.cpp
+--- a/other-tools/SymbolicatedImage.cpp
++++ b/other-tools/SymbolicatedImage.cpp
 @@ -991,7 +991,7 @@
      return ((SymbolicatedImage*)di)->lookupSymbol(referencePC, referenceValue, *referenceType, *referenceName);
  }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch
new file mode 100644
index 000000000000..5590f8f5861a
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/dyld/patches/0007-Fix-missing-writeChainEntry.patch
@@ -0,0 +1,13 @@
+diff --git a/mach_o/ChainedFixups.h b/mach_o/ChainedFixups.h
+index 10ff8847e0..336f80dd81 100644
+--- a/mach_o/ChainedFixups.h
++++ b/mach_o/ChainedFixups.h
+@@ -78,7 +78,7 @@
+                                                              std::span<const uint64_t> segOffsetTable, uint32_t pageIndex, uint32_t pageSize,
+                                                              void (^callback)(const Fixup& f, bool& stop)) const;
+         virtual Fixup            parseChainEntry(const void* loc, const MappedSegment* seg, uint64_t preferedLoadAddress=0, std::span<const uint64_t> segOffsetTable={}) const = 0;
+-        virtual void             writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span<const MappedSegment*>) const;
++        virtual void             writeChainEntry(const Fixup& fixup, const void* nextLoc, uint64_t preferedLoadAddress, std::span<const MappedSegment*>) const = 0;
+ 
+     protected:
+         constexpr                PointerFormat() { }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
index 638742f978c2..9919a3d90b3a 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/meson.build.in
@@ -4,7 +4,10 @@
 # Project settings
 project('file_cmds', 'c', version : '@version@')
 add_global_arguments(
+    # These are not defined automatically by Clang. Not having them defined causes compilation failures.
     '-DTARGET_OS_BRIDGE=0',
+    '-DTARGET_OS_EXCLAVECORE=0',
+    '-DTARGET_OS_EXCLAVEKIT=0',
     language : 'c',
 )
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
index 584d2a312a60..160a394b4ba7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/file_cmds/package.nix
@@ -53,6 +53,8 @@ let
         uint64_t xdi_xdtream_obj_id;
       };
       #define APFS_CLEAR_PURGEABLE 0
+      #define APFS_PURGEABLE_FLAGS_MASK 0xFFFF
+      #define APFSIOC_GET_PURGEABLE_FILE_FLAGS _IOR('J', 71, uint64_t)
       #define APFSIOC_MARK_PURGEABLE _IOWR('J', 68, uint64_t)
       #define APFSIOC_XDSTREAM_OBJ_ID _IOWR('J', 53, struct xdstream_obj_id)
       EOF
@@ -89,7 +91,7 @@ mkAppleDerivation {
     "xattr"
   ];
 
-  xcodeHash = "sha256-u23AoLa7J0eFtf4dXKkVO59eYL2I3kRsHcWPfT03MCU=";
+  xcodeHash = "sha256-KEZYuaDxLdprF+wGiszUdTXPQBfLNj0xP9Y0uarNjSs=";
 
   patches = [
     # Fixes build of ls
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
index 942f0a26da43..7aefb636900e 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libffi/package.nix
@@ -23,8 +23,6 @@ mkAppleDerivation (finalAttrs: {
   ];
 
   patches = [
-    # Clang 18 requires that no non-private symbols by defined after cfi_startproc. Apply the upstream libffi fix.
-    ./patches/llvm-18-compatibility.patch
     # Fix a memory leak when using the trampoline dylib. See https://github.com/libffi/libffi/pull/621#discussion_r955298301.
     ./patches/fix-tramponline-memory-leak.patch
     # Fix automake-18.18 compatibility, https://github.com/libffi/libffi/issues/853#issuecomment-2909994482
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch b/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch
deleted file mode 100644
index a264d7b76d1b..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/libffi/patches/llvm-18-compatibility.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/aarch64/sysv.S b/src/aarch64/sysv.S
-index eeaf3f8..329889c 100644
---- a/src/aarch64/sysv.S
-+++ b/src/aarch64/sysv.S
-@@ -76,8 +76,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.  */
-    x5 closure
- */
- 
--	cfi_startproc
- CNAME(ffi_call_SYSV):
-+	cfi_startproc
- 	/* Sign the lr with x1 since that is where it will be stored */
- 	SIGN_LR_WITH_REG(x1)
- 
-@@ -268,8 +268,8 @@ CNAME(ffi_closure_SYSV_V):
- #endif
- 
- 	.align	4
--	cfi_startproc
- CNAME(ffi_closure_SYSV):
-+	cfi_startproc
- 	SIGN_LR
- 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
- 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
-@@ -500,8 +500,8 @@ CNAME(ffi_go_closure_SYSV_V):
- #endif
- 
- 	.align	4
--	cfi_startproc
- CNAME(ffi_go_closure_SYSV):
-+	cfi_startproc
- 	stp     x29, x30, [sp, #-ffi_closure_SYSV_FS]!
- 	cfi_adjust_cfa_offset (ffi_closure_SYSV_FS)
- 	cfi_rel_offset (x29, 0)
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
index 6a7c523a164c..0c1adce503a5 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/meson.build.in
@@ -3,6 +3,12 @@
 
 # Project settings
 project('libresolv', 'c', version : '@version@')
+add_project_arguments(
+    '-DCOMMON_DIGEST_FOR_RFC_1321', # To enable legacy `MD5` APIs in CommonCrypto.
+    # This is not defined automatically by Clang. Not having them defined causes compilation failures.
+    '-DTARGET_OS_BRIDGE=0',
+    language : 'c',
+)
 
 
 # Dependencies
@@ -20,8 +26,8 @@ libresolv = library(
         'dns_async.c',
         'dns_util.c',
         'dst_api.c',
-        'dst_hmac_link.c',
-        'dst_support.c',
+        'hmac_link.c',
+        'mtctxres.c',
         'ns_date.c',
         'ns_name.c',
         'ns_netint.c',
@@ -41,15 +47,19 @@ libresolv = library(
         'res_query.c',
         'res_send.c',
         'res_sendsigned.c',
+        'res_state.c',
         'res_update.c',
+        'support.c',
     ],
     soversion : '9'
 )
 install_headers(
+    'arpa/nameser_compat.h',
     'dns.h',
     'dns_util.h',
     'nameser.h',
     'resolv.h',
+    preserve_path : true,
 )
 install_man(
     'resolver.3',
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
index 158317c22c80..56c38bcece53 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libresolv/package.nix
@@ -2,14 +2,31 @@
   lib,
   apple-sdk,
   mkAppleDerivation,
+  stdenvNoCC,
 }:
 
 let
   configd = apple-sdk.sourceRelease "configd";
+  dyld = apple-sdk.sourceRelease "dyld";
   Libinfo = apple-sdk.sourceRelease "Libinfo";
+  Libnotify = apple-sdk.sourceRelease "Libnotify";
+  xnu = apple-sdk.sourceRelease "xnu";
 
   # `arpa/nameser_compat.h` is included in the Libc source release instead of libresolv.
   Libc = apple-sdk.sourceRelease "Libc";
+
+  privateHeaders = stdenvNoCC.mkDerivation {
+    name = "libresolv-deps-private-headers";
+
+    buildCommand = ''
+      install -D -t "$out/include/mach-o" \
+        '${dyld}/include/mach-o/dyld_priv.h'
+
+      substituteInPlace "$out/include/mach-o/dyld_priv.h" \
+        --replace-fail ', bridgeos(3.0)' "" \
+        --replace-fail '//@VERSION_DEFS@' 'const dyld_build_version_t dyld_2024_SU_E_os_versions = { 1 /* macOS */, 150400 };'
+    '';
+  };
 in
 mkAppleDerivation {
   releaseName = "libresolv";
@@ -20,19 +37,20 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-yHNa6cpI3T4R/iakeHmL6S/c9p+VpYR4fudv2UXUpnY=";
+  postPatch = ''
+    cp ${Libc}/include/arpa/nameser_compat.h arpa/nameser_compat.h
 
-  postUnpack = ''
-    mkdir -p "$sourceRoot/arpa"
-    ln -s "$NIX_BUILD_TOP/$sourceRoot/nameser.h" "$sourceRoot/arpa/nameser.h"
+    # Use CommonCrypto’s implementation of MD5. The upstream build appears to use corecrypto, which we can’t use.
+    substituteInPlace hmac_link.c \
+      --replace-fail '<md5.h>' '<CommonCrypto/CommonDigest.h>'
   '';
 
-  env.NIX_CFLAGS_COMPILE = "-I${configd}/dnsinfo -I${Libinfo}/lookup.subproj";
+  xcodeHash = "sha256-Q5jHee9rxge6HJtf9/sFK15FsS02GQmx7L0BBDiyGIs=";
+
+  env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include -I${configd}/dnsinfo -I${Libinfo}/lookup.subproj -I${Libnotify}";
 
   postInstall = ''
-    mkdir -p "$out/include/arpa"
-    ln -s ../nameser.h "$out/include/arpa"
-    cp ${Libc}/include/arpa/nameser_compat.h "$out/include/arpa"
+    ln -s ../nameser.h "''${!outputDev}/include/arpa"
   '';
 
   meta = {
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix
index 95f35054e026..a0afe4511d53 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/libutil/package.nix
@@ -1,5 +1,4 @@
 {
-  apple-sdk_14,
   copyfile,
   mkAppleDerivation,
 }:
@@ -15,13 +14,7 @@ mkAppleDerivation {
 
   xcodeHash = "sha256-LwR9fmvcdJ/QYlOx+7ffhV4mKvjkwN3rX3+yHSCovKQ=";
 
-  patches = [
-    # The only change from macOS 13 to 14 was setting this flag. Check at runtime and only set if supported.
-    ./patches/0001-Conditionally-pre-condition.patch
-  ];
-
   buildInputs = [
-    (apple-sdk_14.override { enableBootstrap = true; })
     copyfile
   ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch b/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch
deleted file mode 100644
index 27f5faee7cda..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/libutil/patches/0001-Conditionally-pre-condition.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ca796729722da704e8a9c64c7a201cbe0a9cb9be Mon Sep 17 00:00:00 2001
-From: Randy Eckenrode <randy@largeandhighquality.com>
-Date: Mon, 5 Aug 2024 22:21:47 -0400
-Subject: [PATCH] Conditionally pre-condition
-
----
- wipefs.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/wipefs.cpp b/wipefs.cpp
-index d8e6339..6cb7963 100644
---- a/wipefs.cpp
-+++ b/wipefs.cpp
-@@ -391,7 +391,9 @@ wipefs_wipe(wipefs_ctx handle)
-     // Since we always issue a a single extent, set the kIOStorageUnmapOptionWhole
-     // option flag for drive pre-conditioning.
-     //
--    unmap.options = kIOStorageUnmapOptionWhole;
-+    if (__builtin_available(macOS 14.0, *)) {
-+        unmap.options = kIOStorageUnmapOptionWhole;
-+    }
- 
- 	//
- 	// Don't bother to check the return value since this is mostly
--- 
-2.44.1
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
index d42357f6b245..9feabef5265d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
@@ -8,83 +8,67 @@ in
   fetchFromGitHub,
   meson,
   ninja,
-  stdenv,
-  stdenvNoCC,
   xcodeProjectCheckHook,
 }:
 
 let
   hasBasenamePrefix = prefix: file: lib.hasPrefix prefix (baseNameOf file);
 in
-lib.makeOverridable (
-  attrs:
-  let
-    attrs' = if lib.isFunction attrs then attrs else _: attrs;
-    attrsFixed = lib.fix attrs';
-    stdenv' =
-      if attrsFixed.noCC or false then
-        stdenvNoCC
-      else if attrsFixed.noBootstrap or false then
-        stdenv
-      else
-        bootstrapStdenv;
-  in
-  stdenv'.mkDerivation (
-    lib.extends (
-      self: super:
-      assert super ? releaseName;
-      let
-        inherit (super) releaseName;
-        info = versions.${releaseName};
-        files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
-        mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
-      in
-      # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
-      # build support in `mkAppleDerivation`.
-      assert super ? xcodeHash -> lib.length mesonFiles > 0;
-      {
-        pname = super.pname or releaseName;
-        inherit (info) version;
+lib.extendMkDerivation {
+  constructDrv = bootstrapStdenv.mkDerivation;
+  extendDrvArgs =
+    finalAttrs: args:
+    assert args ? releaseName;
+    let
+      inherit (args) releaseName;
+      info = versions.${releaseName};
+      files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
+      mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
+    in
+    # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
+    # build support in `mkAppleDerivation`.
+    assert args ? xcodeHash -> lib.length mesonFiles > 0;
+    {
+      pname = args.pname or releaseName;
+      inherit (info) version;
 
-        src = super.src or fetchFromGitHub {
-          owner = "apple-oss-distributions";
-          repo = releaseName;
-          rev = info.rev or "${releaseName}-${info.version}";
-          inherit (info) hash;
-        };
+      src = args.src or fetchFromGitHub {
+        owner = "apple-oss-distributions";
+        repo = releaseName;
+        rev = info.rev or "${releaseName}-${info.version}";
+        inherit (info) hash;
+      };
 
-        strictDeps = true;
-        __structuredAttrs = true;
+      strictDeps = true;
+      __structuredAttrs = true;
 
-        meta = {
-          homepage = "https://opensource.apple.com/releases/";
-          license = lib.licenses.apple-psl20;
-          teams = [ lib.teams.darwin ];
-          platforms = lib.platforms.darwin;
-        }
-        // super.meta or { };
+      meta = {
+        homepage = "https://opensource.apple.com/releases/";
+        license = lib.licenses.apple-psl20;
+        teams = [ lib.teams.darwin ];
+        platforms = lib.platforms.darwin;
       }
-      // lib.optionalAttrs (super ? xcodeHash) {
-        postUnpack =
-          super.postUnpack or ""
-          + lib.concatMapStrings (
-            file:
-            if baseNameOf file == "meson.build.in" then
-              "substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
-            else
-              "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
-          ) mesonFiles;
+      // args.meta or { };
+    }
+    // lib.optionalAttrs (args ? xcodeHash) {
+      postUnpack =
+        args.postUnpack or ""
+        + lib.concatMapStrings (
+          file:
+          if baseNameOf file == "meson.build.in" then
+            "substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
+          else
+            "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
+        ) mesonFiles;
 
-        xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj";
+      xcodeProject = args.xcodeProject or "${releaseName}.xcodeproj";
 
-        nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [
-          meson
-          ninja
-          xcodeProjectCheckHook
-        ];
+      nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
+        meson
+        ninja
+        xcodeProjectCheckHook
+      ];
 
-        mesonBuildType = "release";
-      }
-    ) attrs'
-  )
-)
+      mesonBuildType = "release";
+    };
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in
index f0dc469eb142..926175715775 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/meson.build.in
@@ -14,6 +14,10 @@ add_global_arguments(
     '-DUSE_RFC2292BIS=1',
     '-D__APPLE_USE_RFC_3542=1',
     '-D__APPLE_API_OBSOLETE=1',
+    # Define flexible array member attribute macros as nothing. Unfortunately, Apple’s usage does not work with
+    # the C23 attributes supported by Clang.
+    '-D__counted_by_or_null(N)=',
+    '-D__sized_by_or_null(N)=',
     language : 'c',
 )
 
@@ -23,6 +27,8 @@ cc = meson.get_compiler('c')
 
 libipsec = cc.find_library('ipsec')
 libresolv = cc.find_library('resolv')
+libutil = cc.find_library('util')
+
 libpcap = dependency('pcap')
 openssl = dependency('openssl')
 
@@ -200,7 +206,7 @@ executable(
     dependencies : [ libnetwork_cmds ],
     install : true,
     sources : [
-        # 'netstat.tproj/bpf.c',
+        'netstat.tproj/bpf.c',
         'netstat.tproj/data.c',
         'netstat.tproj/if.c',
         'netstat.tproj/inet.c',
@@ -276,29 +282,31 @@ executable(
 )
 install_man('route.tproj/route.8')
 
-# Depends on a bunch of IPv6 stuff from later SDKs (>11.3). Package once those become the default.
-# executable(
-#     'rtadvd',
-#     c_args : [
-#        '-DINET6',
-#        '-DHAVE_GETIFADDRS',
-#     ],
-#     install : true,
-#     sources : [
-#         'rtadvd.tproj/advcap.c',
-#         'rtadvd.tproj/config.c',
-#         'rtadvd.tproj/dump.c',
-#         'rtadvd.tproj/if.c',
-#         'rtadvd.tproj/rrenum.c',
-#         'rtadvd.tproj/rtadvd.c',
-#         'rtadvd.tproj/rtadvd_logging.c',
-#         'rtadvd.tproj/timer.c',
-#     ],
-# )
-# install_man(
-#   'rtadvd.tproj/rtadvd.8',
-#   'rtadvd.tproj/rtadvd.conf.5',
-# )
+executable(
+    'rtadvd',
+    c_args : [
+       '-DINET6',
+       '-DHAVE_GETIFADDRS',
+        # Required for `_COMM_PAGE_CPU_CAPABILITIES` in <machine/cpu_capabilities.h>
+       '-DPRIVATE',
+    ],
+    dependencies : libutil,
+    install : true,
+    sources : [
+        'rtadvd.tproj/advcap.c',
+        'rtadvd.tproj/config.c',
+        'rtadvd.tproj/dump.c',
+        'rtadvd.tproj/if.c',
+        'rtadvd.tproj/rrenum.c',
+        'rtadvd.tproj/rtadvd.c',
+        'rtadvd.tproj/rtadvd_logging.c',
+        'rtadvd.tproj/timer.c',
+    ],
+)
+install_man(
+  'rtadvd.tproj/rtadvd.8',
+  'rtadvd.tproj/rtadvd.conf.5',
+)
 
 executable(
     'rtsol',
diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
index f6bb8f551c9b..ec9d4c32ca1f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/package.nix
@@ -1,9 +1,10 @@
 {
   lib,
-  apple-sdk,
+  apple-sdk_15,
   fetchurl,
   libpcap,
   libresolv,
+  libutil,
   mkAppleDerivation,
   openssl,
   pkg-config,
@@ -12,61 +13,7 @@
 }:
 
 let
-  # Newer releases of ifconfig use `ioctls` and undocumented APIs newer than 11.x.
-  # Use files from an older release for now.
-  old_ifconfig = {
-    ifconfig = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/ifconfig.c";
-      hash = "sha256-yuUpdRHRwYLnivuaQuh8HJdLj/8ppq+K1NFqA8Bg+1k=";
-    };
-    af_inet = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet.c";
-      hash = "sha256-sqcCEzhTur43DG6Ac/1Rt8Kx0umWhDzlV58t+6FlzNU=";
-    };
-    af_inet6 = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_inet6.c";
-      hash = "sha256-jp0R0Ncwvp9G/lIzKW6wBTAiO8yNyII5c49feTanbIo=";
-    };
-    af_link = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/ifconfig.tproj/af_link.c";
-      hash = "sha256-5rXJg5azy9SjK675Djt4K1PaczsoVjQ/Lls/u5Kk1+A=";
-    };
-  };
-
-  # Newer releases of netstat use struct members that aren’t present with the 11.x headers.
-  # Use files from an older release for now.
-  old_netstat = {
-    "if.c" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/if.c";
-      hash = "sha256-P87rexLkoV1BCyUghVrkGoG6r9rAoWynfpvlwIj7A40=";
-    };
-    "main.c" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/main.c";
-      hash = "sha256-e3n54l6Wo+G5koMhGMfOTo8+QIkJRurr2fBOjg/nFgI=";
-    };
-    "inet.c" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet.c";
-      hash = "sha256-X1+dz+D6xR2Xqoxypjmy65pKBCh4iGVfByJGI0wVGO0=";
-    };
-    "inet6.c" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/inet6.c";
-      hash = "sha256-av5K1UQE3edUbzKN9FIn/DOeibsJaTZc0xJzDu9VZ5Q=";
-    };
-    "netstat.h" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/netstat.h";
-      hash = "sha256-UYi3lmA8G0wRJqVA2NYyMj0yCBUlxu0gMoMYW7NauJg=";
-    };
-    "unix.c" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/unix.c";
-      hash = "sha256-txs/mnR4WK8JAUN3PtqZsp6q2h+nx5VFKxI/itCTBNo=";
-    };
-    "systm.c" = fetchurl {
-      url = "https://github.com/apple-oss-distributions/network_cmds/raw/2e18102a14ab72b25caf3a5007c92b9f23e723fc/netstat.tproj/systm.c";
-      hash = "sha256-bISSIsA6OYfkHNOKB4dj9KNLBHfcelGVzwGiYiVqnRM=";
-    };
-  };
-
-  xnu = apple-sdk.sourceRelease "xnu";
+  xnu = apple-sdk_15.sourceRelease "xnu";
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "network_cmds-deps-private-headers";
@@ -84,27 +31,51 @@ let
       install -D -t "$out/include" \
         '${xnu}/osfmk/kern/cs_blobs.h'
 
-      install -D -t "$out/firehose" \
+      install -D -t "$out/include/firehose" \
+        '${xnu}/libkern/firehose/firehose_types_private.h' \
         '${xnu}/libkern/firehose/tracepoint_private.h'
 
+      for dir in arm i386 machine; do
+        mkdir -p "$out/include/$dir"
+        for file in '${xnu}/osfmk/'$dir/*; do
+          name=$(basename "$file")
+          # Skip copying `endian.h` because it conflicts with the SDK, breaking the build on x86_64-darwin.
+          test "$name" != endian.h && cp -r "$file" "$out/include/$dir/$name"
+        done
+      done
+
       install -D -t "$out/include/net" \
+        '${xnu}/bsd/net/droptap.h' \
         '${xnu}/bsd/net/if_bond_internal.h' \
         '${xnu}/bsd/net/if_bond_var.h' \
         '${xnu}/bsd/net/if_fake_var.h' \
+        '${xnu}/bsd/net/if_mib_private.h' \
+        '${xnu}/bsd/net/if_var_private.h' \
         '${xnu}/bsd/net/if_vlan_var.h' \
         '${xnu}/bsd/net/lacp.h' \
         '${xnu}/bsd/net/net_perf.h'
       mkdir -p "$out/include/net/classq" "$out/include/net/pktsched"
 
+      cat <<EOF > "$out/include/net/bpf.h"
+      #pragma once
+      #include_next <net/bpf.h>
+      #include <net/if.h>
+      $(sed -n \
+        -e '/^#define BPF_D_/p' \
+        -e '/^struct xbpf_d\s*{/,/^};/p' \
+        '${xnu}/bsd/net/bpf.h')
+      EOF
+
       # IFNET constants are defined as enums, so they have to be pre-processed and grepped from the file.
       cat <<EOF > "$out/include/net/if.h"
       #pragma once
       #include <uuid/uuid.h>
       $(sed \
         -e 's/^\s*\(IFNET_[^=]*\)=\s*\([^,]*\),*/#define \1\2/' \
-        '${xnu}/bsd/net/if.h' | grep '^#define IFNET_')
+        '${xnu}/bsd/net/if_private.h' | grep '^#define IFNET_')
       #include_next <net/if.h>
       #include <netinet/in.h>
+      typedef void* ifnet_t;
       #define ifreq ifreq_private
       $(sed -n \
         -e '/^#define IFEF_TXSTART/p' \
@@ -130,10 +101,9 @@ let
         -e '/^struct if_throttlereq\s*{/,/^};/p' \
         -e '/^struct ipv6_prefix\s*{/,/^};/p' \
         -e '/^struct  ifreq\s*{/,/^};/p' \
-        '${xnu}/bsd/net/if.h')
+        '${xnu}/bsd/net/if_private.h')
       #undef ifreq
       EOF
-      unifdef -x 1 -DPRIVATE -m "$out/include/net/if.h"
 
       cat <<EOF > "$out/include/net/content_filter.h"
       #pragma once
@@ -143,34 +113,26 @@ let
 
       cat <<EOF > "$out/include/net/if_var.h"
       #pragma once
+      #include <net/if_var_private.h>
+      #define IF_NETEM_MODEL_IOD 2
+      #define IF_NETEM_MODEL_FPD 3
       #include_next <net/if_var.h>
-      $(sed -n \
-        -e '/^#define IFNAMSIZ\s/p' \
-        -e '/^#define IF_NETEM/p' \
-        -e '/^struct if_bandwidths\s*{/,/^};/p' \
-        -e '/^struct if_data_extended\s*{/,/^};/p' \
-        -e '/^struct if_interface_state\s*{/,/^};/p' \
-        -e '/^struct if_latencies\s*{/,/^};/p' \
-        -e '/^struct if_linkparamsreq\s*{/,/^};/p' \
-        -e '/^struct if_netem_params\s*{/,/^};/p' \
-        -e '/^struct if_netif_stats\s*{/,/^};/p' \
-        -e '/^struct if_packet_stats\s*{/,/^};/p' \
-        -e '/^struct if_rxpoll_stats\s*{/,/^};/p' \
-        -e '/^struct if_traffic_class\s*{/,/^};/p' \
-        '${xnu}/bsd/net/if_var.h')
       EOF
 
       cat <<EOF > "$out/include/net/route.h"
       #pragma once
       #include_next <net/route.h>
       $(sed -n \
+        -e '/^#define RTM_/p' \
         -e '/^struct rt_msghdr_ext\s*{/,/^};/p' \
         -e '/^struct rt_reach_info\s*{/,/^};/p' \
-        '${xnu}/bsd/net/route.h')
+        -e '/^struct rtstat_64\s*{/,/^};/p' \
+        '${xnu}/bsd/net/route_private.h')
       EOF
       ln -s "$out/include/net/route.h" "$out/include/net/route_private.h"
 
       install -D -t "$out/include/netinet" \
+        '${xnu}/bsd/netinet/icmp6.h' \
         '${xnu}/bsd/netinet/ip_flowid.h'
 
       cat <<EOF > "$out/include/netinet/in.h"
@@ -180,7 +142,7 @@ let
         -e '/^#define _DSCP/p' \
         -e '/^#define IP_NO/p' \
         -e '/^union sockaddr_in_4_6\s*{/,/^};/p' \
-        '${xnu}/bsd/netinet/in.h')
+        '${xnu}/bsd/netinet/in_private.h')
       #include <uuid/uuid.h>
       EOF
 
@@ -190,7 +152,7 @@ let
         -e '/^struct tcp_info\s*{/,/^};/p' \
         -e '/^struct tcp_conn_status\s*{/,/^};/p' \
         -e '/^typedef struct conninfo_tcp\s*{/,/} conninfo_tcp_t;/p' \
-        '${xnu}/bsd/netinet/tcp.h')
+        '${xnu}/bsd/netinet/tcp_private.h')
       #include_next <netinet/tcp.h>
       EOF
 
@@ -202,7 +164,7 @@ let
       #pragma once
       $(sed -n \
         -e '/^#define IPV6_/p' \
-        '${xnu}/bsd/netinet6/in6.h')
+        '${xnu}/bsd/netinet6/in6_private.h')
       #include_next <netinet6/in6.h>
       EOF
 
@@ -228,6 +190,9 @@ let
       EOF
 
       install -D -t "$out/include/os" \
+        '${xnu}/libkern/os/atomic_private.h' \
+        '${xnu}/libkern/os/atomic_private_arch.h' \
+        '${xnu}/libkern/os/atomic_private_impl.h' \
         '${xnu}/libkern/os/log_private.h'
 
       declare -a privateHeaders=(
@@ -286,25 +251,28 @@ let
       #pragma once
       #include <sys/param.h>
       #include <sys/_types/_socklen_t.h>
+      $(sed -n \
+        -e '/^typedef.*sae_associd_t/p' \
+        -e '/^typedef.*sae_connid_t/p' \
+        '${xnu}/bsd/sys/socket.h')
       $(sed -n \
         -e '/^#define AF_MULTIPATH\s/p' \
         -e '/^#define CIAUX_TCP\s/p' \
         -e '/^#define NET_RT_/p' \
         -e '/^#define SO_RECV/p' \
         -e '/^#define SO_TRAFFIC_CLASS\s/,/^#define SO_TC_MAX/p' \
-        -e '/^typedef.*sae_associd_t/p' \
-        -e '/^typedef.*sae_connid_t/p' \
         -e '/^struct so_aidreq\s*{/,/^};/p' \
         -e '/^struct so_cidreq\s*{/,/^};/p' \
         -e '/^struct so_cinforeq\s*{/,/^};/p' \
         -e '/^struct so_cordreq\s*{/,/^};/p' \
-        '${xnu}/bsd/sys/socket.h')
+        '${xnu}/bsd/sys/socket_private.h')
       #include_next <sys/socket.h>
       EOF
 
       cat <<EOF > "$out/include/sys/socketvar.h"
       #pragma once
       $(sed -n \
+        -e '/^#define SO_STATS_/p' \
         -e '/^#define SO_TC_STATS_MAX\s/p' \
         -e '/^#define XSO_/p' \
         -e '/^struct data_stats\s*{/,/^};/p' \
@@ -312,6 +280,7 @@ let
         -e '/^struct  xsocket_n\s*{/,/^};/p' \
         -e '/^struct xsockbuf_n\s*{/,/^};/p' \
         -e '/^struct xsockstat_n\s*{/,/^};/p' \
+        -e '/^typedef.*so_gen_t;/p' \
         '${xnu}/bsd/sys/socketvar.h')
       #include_next <sys/socketvar.h>
       EOF
@@ -326,9 +295,11 @@ let
         -e '/^#define SIOCGIFAGENTDATA\s/p' \
         -e '/^#define SIOCGIFAGENTIDS\s/p' \
         -e '/^#define SIOCGIFCLAT46ADDR\s/p' \
+        -e '/^#define SIOCGIFCONSTRAINED\s/p' \
         -e '/^#define SIOCGIFDELEGATE\s/p' \
         -e '/^#define SIOCGIFDESC\s/p' \
         -e '/^#define SIOCGIFEFLAGS\s/p' \
+        -e '/^#define SIOCGIFGENERATIONID\s/p' \
         -e '/^#define SIOCGIFGETRTREFCNT\s/p' \
         -e '/^#define SIOCGIFINTERFACESTATE\s/p' \
         -e '/^#define SIOCGIFLINKPARAMS\s/p' \
@@ -343,20 +314,27 @@ let
         -e '/^#define SIOCGIFTIMESTAMPENABLED\s/p' \
         -e '/^#define SIOCGIFTYPE\s/p' \
         -e '/^#define SIOCGIFXFLAGS\s/p' \
+        -e '/^#define SIOCGQOSMARKINGENABLED\s/p' \
+        -e '/^#define SIOCGQOSMARKINGMODE\s/p' \
         -e '/^#define SIOCGSTARTDELAY\s/p' \
         -e '/^#define SIOCSECNMODE\s/p' \
         -e '/^#define SIOCSETROUTERMODE\s/p' \
         -e '/^#define SIOCSFASTLANECAPABLE\s/p' \
         -e '/^#define SIOCSFASTLEENABLED\s/p' \
         -e '/^#define SIOCSIF2KCL\s/p' \
+        -e '/^#define SIOCSIFCONSTRAINED\s/p' \
         -e '/^#define SIOCSIFDESC\s/p' \
+        -e '/^#define SIOCSIFDISABLEINPUT\s/p' \
         -e '/^#define SIOCSIFDISABLEOUTPUT\s/p' \
         -e '/^#define SIOCSIFEXPENSIVE\s/p' \
         -e '/^#define SIOCSIFINTERFACESTATE\s/p' \
         -e '/^#define SIOCSIFLINKPARAMS\s/p' \
         -e '/^#define SIOCSIFLOG\s/p' \
         -e '/^#define SIOCSIFLOWPOWER\s/p' \
+        -e '/^#define SIOCSIFMARKWAKEPKT\s/p' \
         -e '/^#define SIOCSIFMPKLOG\s/p' \
+        -e '/^#define SIOCSIFNOACKPRIO\s/p' \
+        -e '/^#define SIOCSIFNOTRAFFICSHAPING\s/p' \
         -e '/^#define SIOCSIFPROBECONNECTIVITY\s/p' \
         -e '/^#define SIOCSIFSUBFAMILY\s/p' \
         -e '/^#define SIOCSIFTHROTTLE\s/p' \
@@ -364,10 +342,11 @@ let
         -e '/^#define SIOCSIFTIMESTAMPENABLE\s/p' \
         -e '/^#define SIOCSQOSMARKINGENABLED\s/p' \
         -e '/^#define SIOCSQOSMARKINGMODE\s/p' \
-        '${xnu}/bsd/sys/sockio.h')
+        '${xnu}/bsd/sys/sockio_private.h')
       #undef ifreq
       #include_next <sys/sockio.h>
       EOF
+      ln -s "$out/include/sys/sockio.h" "$out/include/sys/sockio_private.h"
 
       cat <<EOF > "$out/include/sys/sys_domain.h"
       #pragma once
@@ -388,10 +367,16 @@ let
       cat <<EOF > "$out/include/sys/unpcb.h"
       #pragma once
       #include_next <sys/unpcb.h>
+      #define KERNEL
+      #ifdef KERNEL
+      $(sed -n \
+        -e '/^struct  unpcb_compat\s*{/,/^};/p' \
+        '${xnu}/bsd/sys/unpcb.h')
+      #undef KERNEL
       $(sed -n \
         -e '/^#define xu_addr/p' \
-        -e '/^struct xunpcb64_list_entry\s*{/,/^};/p' \
-        -e '/^struct xunpcb64\s*{/,/^};/p' \
+        -e '/^struct  *xunpcb\(64\|_n\)_list_entry\s*{/,/^};/p' \
+        -e '/^struct  *xunpcb\(64\|_n\)\s*{/,/^};/p' \
         '${xnu}/bsd/sys/unpcb.h')
     '';
   };
@@ -404,7 +389,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-HkcIvKB4ektuk+3J/Sque8Pr5dMeNFZRlENuiu3KdsA=";
+  xcodeHash = "sha256-1RJ/s9vnfCGY2Vc2XH8dg8rB+0lwK2IBC7zIx4PuXWQ=";
 
   patches = [
     # Some private headers depend on corecrypto, which we can’t use.
@@ -416,15 +401,6 @@ mkAppleDerivation {
     # Fix invalid pointer conversion error from trying to pass `NULL` to a `size_t`.
     substituteInPlace ndp.tproj/ndp.c --replace-fail 'NULL, NULL);' 'NULL, 0);'
 
-    # Copy older files that are more compatible with the current SDK.
-    ${lib.concatLines (
-      lib.mapAttrsToList (name: path: "cp '${path}' 'ifconfig.tproj/${name}.c'") old_ifconfig
-    )}
-
-    ${lib.concatLines (
-      lib.mapAttrsToList (name: path: "cp '${path}' 'netstat.tproj/${name}'") old_netstat
-    )}
-
     # Use private struct ifreq instead of the one defined in the system header.
     substituteInPlace ifconfig.tproj/ifconfig.c \
       --replace-fail $'struct\tifreq' 'struct ifreq' \
@@ -449,6 +425,7 @@ mkAppleDerivation {
   buildInputs = [
     libpcap
     libresolv
+    libutil
     openssl
   ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
index 86eaba2136e5..30f1eef87c27 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/patch_cmds/package.nix
@@ -14,7 +14,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-FLCJY40l74ExO0WTaA8hb9guhOBXeui2GqWL/7QeJJk=";
+  xcodeHash = "sha256-Ox8Ii2sUuledUttZ64DaHC0iFlUybs3lNZ23IDeziPM=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
index ab9f28605b5a..2ece68a526a2 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/removefile/package.nix
@@ -37,14 +37,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-pE92mVI0KTHOVKBA4T5R1rHy5//uipOimas7DaTVe0U=";
-
-  postPatch = ''
-    # Disable experimental bounds safety stuff that’s not available in LLVM 16.
-    substituteInPlace removefile.h \
-      --replace-fail '__ptrcheck_abi_assume_single()' "" \
-      --replace-fail '__unsafe_indexable' ""
-  '';
+  xcodeHash = "sha256-7dNq0nE2MmFM9U+epTrkCoM1lrswm98m3RWuLDsAuDk=";
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
 
diff --git a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
index f12c88ef2a64..c8a305b61baa 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/shell_cmds/package.nix
@@ -24,7 +24,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-26N7AZV/G+ryc2Nu1v91rEdb1a6jDpnj6t5rzEG2YA4=";
+  xcodeHash = "sha256-fY8k7qzqqiv/KvGIB4a82qbNsm23QPnGOadrZmNoi54=";
 
   postPatch = ''
     # Fix `mktemp` templates
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
index f12b3fe41b92..3263cdb2837c 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.build.in
@@ -15,9 +15,11 @@ add_project_arguments(
     '-DPRIVATE=1',
     # From bsd/sys/private_event.h in xnu
     '-Dkqueue_id_t=uint64_t',
+    # These are not defined automatically by Clang. Not having them defined causes compilation failures.
+    '-DTARGET_OS_EXCLAVECORE=0',
+    '-DTARGET_OS_EXCLAVEKIT=0',
     language : 'c',
 )
-sdk_version = get_option('sdk_version')
 
 
 # Dependencies
@@ -39,15 +41,7 @@ dbm = cc.find_library('dbm')
 ncurses = dependency('ncurses')
 openbsm = cc.find_library('bsm')
 pam = cc.find_library('pam')
-
-# Feature Tests
-if sdk_version.version_compare('<12')
-    add_project_arguments(
-        '-DIOMainPort=IOMasterPort',
-        '-DkIOMainPortDefault=kIOMasterPortDefault',
-        language : 'c'
-    )
-endif
+util = cc.find_library('util')
 
 
 # Generators
@@ -278,14 +272,11 @@ executable(
 
 executable(
     'latency',
-    build_by_default : sdk_version.version_compare('>=12'),
-    dependencies : [ ncurses ],
-    install : sdk_version.version_compare('>=12'),
+    dependencies : [ util, ncurses ],
+    install : true,
     sources : 'latency/latency.c',
 )
-if sdk_version.version_compare('>=12')
-    install_man('latency/latency.1')
-endif
+install_man('latency/latency.1')
 
 executable(
     'login',
@@ -303,27 +294,21 @@ executable(
 
 executable(
     'lskq',
-    build_by_default : sdk_version.version_compare('>=12'),
-    install : sdk_version.version_compare('>=12'),
+    install : true,
     sources : 'lskq/lskq.c',
 )
-if sdk_version.version_compare('>=12')
-    install_man('lskq/lskq.1')
-endif
+install_man('lskq/lskq.1')
 
 executable(
     'lsmp',
-    build_by_default : sdk_version.version_compare('>=12'),
-    install : sdk_version.version_compare('>=12'),
+    install : true,
     sources : [
         'lsmp/lsmp.c',
         'lsmp/port_details.c',
         'lsmp/task_details.c'
     ]
 )
-if sdk_version.version_compare('>=12')
-    install_man('lsmp/lsmp.1')
-endif
+install_man('lsmp/lsmp.1')
 
 executable(
     'ltop',
@@ -469,14 +454,11 @@ install_man('sa/sa.8')
 
 executable(
     'sc_usage',
-    build_by_default : sdk_version.version_compare('>=12'),
-    dependencies : ncurses,
-    install : sdk_version.version_compare('>=12'),
+    dependencies : [ncurses, util],
+    install : true,
     sources : 'sc_usage/sc_usage.c',
 )
-if sdk_version.version_compare('>=12')
-    install_man('sc_usage/sc_usage.1')
-endif
+install_man('sc_usage/sc_usage.1')
 
 executable('shutdown',
     # Requires IOKitUser kext APIs
@@ -599,4 +581,3 @@ executable(
     sources : 'zprint/zprint.c',
 )
 # install_man('zprint/zprint.1')
-
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options
deleted file mode 100644
index 8c4ce874c64c..000000000000
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/meson.options
+++ /dev/null
@@ -1 +0,0 @@
-option('sdk_version', type : 'string')
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
index 5e2b5ea0f834..934213c73bd0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/package.nix
@@ -1,7 +1,9 @@
 {
   lib,
+  AvailabilityVersions,
   apple-sdk,
-  apple-sdk_12,
+  apple-sdk_15,
+  libutil,
   mkAppleDerivation,
   ncurses,
   openpam,
@@ -13,17 +15,20 @@
 let
   libdispatch = apple-sdk.sourceRelease "libdispatch"; # Has to match the version of the SDK
 
-  Libc = apple-sdk_12.sourceRelease "Libc";
-  libmalloc = apple-sdk_12.sourceRelease "libmalloc";
-  OpenDirectory = apple-sdk_12.sourceRelease "OpenDirectory";
+  Libc = apple-sdk.sourceRelease "Libc";
+  libmalloc = apple-sdk.sourceRelease "libmalloc";
+  OpenDirectory = apple-sdk.sourceRelease "OpenDirectory";
 
-  libplatform = apple-sdk_12.sourceRelease "libplatform";
-  xnu = apple-sdk_12.sourceRelease "xnu";
+  libplatform = apple-sdk.sourceRelease "libplatform";
+  xnu = apple-sdk_15.sourceRelease "xnu"; # Needed for `posix_spawn_secflag_options`
 
   privateHeaders = stdenvNoCC.mkDerivation {
     name = "system_cmds-deps-private-headers";
 
     buildCommand = ''
+      mkdir -p "$out/include/sys"
+      '${lib.getExe AvailabilityVersions}' ${lib.getVersion apple-sdk} "$out"
+
       install -D -t "$out/include/CFOpenDirectory" \
         '${OpenDirectory}/Core/CFOpenDirectoryPriv.h' \
         '${OpenDirectory}/Core/CFODTrigger.h'
@@ -43,6 +48,7 @@ let
       install -D -t "$out/include" \
         '${libmalloc}/private/stack_logging.h' \
         '${libplatform}/private/_simple.h' \
+        '${xnu}/libsyscall/wrappers/libproc/libproc_private.h' \
         '${xnu}/libsyscall/wrappers/spawn/spawn_private.h'
       touch "$out/include/btm.h"
 
@@ -71,13 +77,29 @@ let
 
       install -D -t "$out/include/sys" \
         '${xnu}/bsd/sys/csr.h' \
+        '${xnu}/bsd/sys/event_private.h' \
         '${xnu}/bsd/sys/pgo.h' \
+        '${xnu}/bsd/sys/kdebug_private.h' \
         '${xnu}/bsd/sys/kern_memorystatus.h' \
+        '${xnu}/bsd/sys/proc_info_private.h' \
         '${xnu}/bsd/sys/reason.h' \
         '${xnu}/bsd/sys/resource.h' \
+        '${xnu}/bsd/sys/resource_private.h' \
         '${xnu}/bsd/sys/spawn_internal.h' \
         '${xnu}/bsd/sys/stackshot.h'
 
+      cat <<EOF > "$out/include/sys/kdebug.h"
+      #pragma once
+      #include_next <sys/kdebug.h>
+      #include <sys/kdebug_private.h>
+      EOF
+
+      cat <<EOF > "$out/include/sys/proc_info.h"
+      #pragma once
+      #include_next <sys/proc_info.h>
+      #include <sys/proc_info_private.h>
+      EOF
+
       # Older source releases depend on CrashReporterClient.h, but it’s not publicly available.
       touch "$out/include/CrashReporterClient.h"
     '';
@@ -88,12 +110,24 @@ mkAppleDerivation {
 
   xcodeHash = "sha256-gdtn3zNIneZKy6+X0mQ51CFVLNM6JQYLbd/lotG5/Tw=";
 
+  patches = [
+    # `posix_spawnattr_set_use_sec_transition_shims_np` is only available on macOS 15.2 or newer.
+    # Disable the feature that requires it when running on older systems.
+    ./patches/conditionalize-security-transition-shims.patch
+  ];
+
   postPatch = ''
     # Replace hard-coded, impure system paths with the output path in the store.
     sed -e "s|PATH=[^;]*|PATH='$out/bin'|" -i "pagesize/pagesize.sh"
 
     # Requires BackgroundTaskManagement.framework headers.
     sed -e '/    if (os_feature_enabled(cronBTMToggle, cronBTMCheck))/,/    }/d' -i atrun/atrun.c
+
+    # Fix format security errors
+    for src in latency/latency.c sc_usage/sc_usage.c; do
+      substituteInPlace $src \
+        --replace-fail 'printw(tbuf)' 'printw("%s", tbuf);'
+    done
   '';
 
   preConfigure = ''
@@ -104,13 +138,12 @@ mkAppleDerivation {
 
   buildInputs = [
     apple-sdk.privateFrameworksHook
+    libutil
     ncurses
     openpam
   ];
 
   nativeBuildInputs = [ pkg-config ];
 
-  mesonFlags = [ (lib.mesonOption "sdk_version" stdenv.hostPlatform.darwinSdkVersion) ];
-
   meta.description = "System commands for Darwin";
 }
diff --git a/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch
new file mode 100644
index 000000000000..b51f97e2dfc0
--- /dev/null
+++ b/pkgs/os-specific/darwin/apple-source-releases/system_cmds/patches/conditionalize-security-transition-shims.patch
@@ -0,0 +1,33 @@
+diff --git a/taskpolicy/taskpolicy.c b/taskpolicy/taskpolicy.c
+index b031f944b2..4ad82018ed 100644
+--- a/taskpolicy/taskpolicy.c
++++ b/taskpolicy/taskpolicy.c
+@@ -126,7 +126,12 @@
+ 				flag_s = true;
+ 				break;
+ 			case 'S':
+-				sec_transition_shims = parse_sec_transition_shims(optarg);
++				if (__builtin_available(macOS 15.2, *)) {
++					sec_transition_shims = parse_sec_transition_shims(optarg);
++				} else {
++					fprintf(stderr, "Running with security transition shims is only supported on macOS 15.2 and newer.\n");
++					exit(EX_USAGE);
++				}
+ 				break;
+ 			case '?':
+ 			default:
+@@ -246,9 +251,11 @@
+ 		if (ret != 0) errc(EX_NOINPUT, ret, "posix_spawnattr_set_darwin_role_np");
+ 	}
+
+-	if (sec_transition_shims) {
+-		ret = posix_spawnattr_set_use_sec_transition_shims_np(&attr, sec_transition_shims);
+-		if (ret != 0) errc(EX_NOINPUT, ret, "setting security transition shims");
++	if (__builtin_available(macOS 15.2, *)) {
++		if (sec_transition_shims) {
++			ret = posix_spawnattr_set_use_sec_transition_shims_np(&attr, sec_transition_shims);
++			if (ret != 0) errc(EX_NOINPUT, ret, "setting security transition shims");
++		}
+ 	}
+
+ 	ret = posix_spawnp(&pid, argv[0], NULL, &attr, argv, environ);
diff --git a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
index b640edb096b8..6c71c21c1ee7 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/text_cmds/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   apple-sdk,
-  apple-sdk_13,
   bzip2,
   libmd,
   libresolv,
@@ -18,7 +17,6 @@
 
 let
   Libc = apple-sdk.sourceRelease "Libc";
-  Libc_13 = apple-sdk_13.sourceRelease "Libc";
 
   CommonCrypto = apple-sdk.sourceRelease "CommonCrypto";
   libplatform = apple-sdk.sourceRelease "libplatform";
@@ -30,7 +28,7 @@ let
     buildCommand = ''
       install -D -t "$out/include" \
         '${libplatform}/private/_simple.h' \
-        '${Libc_13}/include/vis.h'
+        '${Libc}/include/vis.h'
       install -D -t "$out/include/os" \
         '${Libc}/os/assumes.h' \
         '${xnu}/libkern/os/base_private.h'
@@ -47,7 +45,7 @@ mkAppleDerivation {
     "man"
   ];
 
-  xcodeHash = "sha256-dZ+yJyfflhmUyx3gitRXC115QxS87SGC4/HjMa199Ts=";
+  xcodeHash = "sha256-4nwDGUBSx5jjeLQ3EGQFdPZE2MfNGcBvlTU/Sye6OIk=";
 
   postPatch = ''
     # Improve compatiblity with libmd in nixpkgs.
@@ -60,18 +58,6 @@ mkAppleDerivation {
       --replace-fail SHA224_CTX SHA2_CTX \
       --replace-fail '<sha384.h>' '<sha512.h>' \
       --replace-fail 'const void *, unsigned int, char *' 'const uint8_t *, size_t, char *'
-  ''
-  + lib.optionalString (lib.versionOlder (lib.getVersion apple-sdk) "13.0") ''
-    # Backport vis APIs from the 13.3 SDK (needed by vis).
-    cp '${Libc_13}/gen/FreeBSD/vis.c' vis/vis-libc.c
-    # Backport errx APIs from the 13.3 SDK (needed by lots of things).
-    mkdir sys
-    cp '${Libc_13}/gen/FreeBSD/err.c' err-libc.c
-    cp '${Libc_13}/include/err.h' err.h
-    cp '${Libc_13}/fbsdcompat/sys/cdefs.h' sys/cdefs.h
-    substituteInPlace err.h \
-      --replace-fail '__cold' ""
-    touch namespace.h un-namespace.h libc_private.h
   '';
 
   env.NIX_CFLAGS_COMPILE = "-I${privateHeaders}/include";
diff --git a/pkgs/os-specific/darwin/apple-source-releases/versions.json b/pkgs/os-specific/darwin/apple-source-releases/versions.json
index 4081232cd0fb..a80d604e2b83 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/versions.json
+++ b/pkgs/os-specific/darwin/apple-source-releases/versions.json
@@ -1,27 +1,27 @@
 {
   "AvailabilityVersions": {
-    "hash": "sha256-PT54BPSRkQiIHrpxZCdjo6XvNuWxESabLndCBYjulfs=",
-    "version": "143.6"
+    "hash": "sha256-eQ46qHk4AuHA+hRZq1IG2UtvZr/X2vtlOvi6hnG+FyA=",
+    "version": "151"
   },
   "Csu": {
     "hash": "sha256-l8RI8aiin7ovZuoDh54thDmd/b502w+dtjN5ZoISZBg=",
     "version": "88"
   },
   "ICU": {
-    "hash": "sha256-7ImBX4SlrFaLnHdQ4bm4F8q9IpHhQMaeVOO6pnnhyzQ=",
-    "version": "74222.203"
+    "hash": "sha256-dIgrTjHcQm8dy2Ku5wNIHuPjHfoV+48TM0PNDDn6ZPk=",
+    "version": "76104.4"
   },
   "IOKitTools": {
     "hash": "sha256-Oknsvzn4nv77WU7f0WPS446iwR2BM2q4iw46r/qctAE=",
     "version": "125"
   },
   "PowerManagement": {
-    "hash": "sha256-APkvbp0FhNrypQcDUuREUYOnNLOZGOKhsj5JLcDgvAU=",
-    "version": "1740.60.27"
+    "hash": "sha256-ssg655SPT7gWnJWDaxambMKCopr+vLPYERW0IMKT0T8=",
+    "version": "1754.140.4"
   },
   "adv_cmds": {
-    "hash": "sha256-alJOcKeHmIh67ZmN7/YdIouCP/qzakkhimsuZaOkr+c=",
-    "version": "231"
+    "hash": "sha256-O+SB8sj3yqPv7GEBQQgvq+Y7kQRZI/i/UVa17J/OhZM=",
+    "version": "235"
   },
   "basic_cmds": {
     "hash": "sha256-RQve2GqS9ke9hd8kupRMgoOKalTS229asi5tBGrBmS8=",
@@ -29,47 +29,47 @@
   },
   "bootstrap_cmds": {
     "hash": "sha256-6JG0sysgqLlgcpIOXfN+F0/gxpIIHZZ5et3gmDBoBGQ=",
-    "version": "136"
+    "version": "138"
   },
   "copyfile": {
-    "hash": "sha256-Vz1fo4p2b6S8xfyDPu1FNgMkH1aX0tkpXCZkdzkRdq0=",
-    "version": "213.40.2"
+    "hash": "sha256-hIHlY0prIFY0j8z0Hvlv2psrwLj41jYfKBM0KutLxew=",
+    "version": "224"
   },
   "developer_cmds": {
     "hash": "sha256-jgQUjN9zmqi0/7XpqzbRsJjZIYeMrxXT1Zf3qi7+o+8=",
     "version": "83"
   },
   "diskdev_cmds": {
-    "hash": "sha256-v3TFHLUlumt/sHxkOTyxDA4iG8ci5ZmMn7HCb4+9Uo0=",
-    "version": "737.60.1"
+    "hash": "sha256-TD/sJkzIquTgq1zP/B7eBArxeTcp1Lqa8e8cJ1jnkHU=",
+    "version": "737.140.4"
   },
   "doc_cmds": {
-    "hash": "sha256-/Mf+RhaTU9O5i95gddZ2h9eDjLezwj3nP6FvryMF54E=",
-    "version": "66"
+    "hash": "sha256-nnwKXKKjgJXcLCArD38Dme2L1WyR1U0rwn7zI+NCftw=",
+    "version": "69"
   },
   "dyld": {
-    "hash": "sha256-DDhV7X81nhd3oeJuICEvF8FU43yE/afQ/LYgDNtXswA=",
-    "version": "1241.17"
+    "hash": "sha256-pbpSD5OeSMOcMJFAd7kyLINPROjqsafsCSphVGyIPyg=",
+    "version": "1286.10"
   },
   "file_cmds": {
-    "hash": "sha256-/79jS//IBZiQBumGA60lKDmddQCzl/r8QnviD6lGXNg=",
-    "version": "448.0.3"
+    "hash": "sha256-Rf/XA6uEaj7Wps2s8Oc/OhQVBjz8XiqJlj+cxjiQfQU=",
+    "version": "457.140.3"
   },
   "libffi": {
-    "hash": "sha256-YjRMS3H3hIEfQm5MVSxGNTBtFc/9al7iQGDeZy6m/0U=",
-    "version": "39"
+    "hash": "sha256-xHefZVsZg9kUXV0t/HLdjPkkD/hn/4bvdRVJ4PsQLeM=",
+    "version": "40"
   },
   "libiconv": {
-    "hash": "sha256-eaUp0z7HqX0AW2C90gDVFeiJnmGRxPDuzyb1Jlm1pNc=",
-    "version": "109"
+    "hash": "sha256-50DC6LePtvdAh9FLa/esiwCUmYDxKofN6hCiv9+dmgQ=",
+    "version": "109.100.2"
   },
   "libpcap": {
-    "hash": "sha256-RViIXv5zP2Bcive5qrcfb9vNWwhSe6fGCaToSgDYNxU=",
-    "version": "137"
+    "hash": "sha256-DqINoombdui5N6lNHcZ07c7LrVum4f8fFK89ymdCd0c=",
+    "version": "140"
   },
   "libresolv": {
-    "hash": "sha256-ndGcicbHizPazTCB0P3aioDOv7IJPmTOgLnioFHH2+o=",
-    "version": "83"
+    "hash": "sha256-GtPVlL1mD58um5hOFd3HQKQ7pqutBe9jZKgQw8pOkPE=",
+    "version": "91"
   },
   "libutil": {
     "hash": "sha256-tUsl22Z0HUVSkSoohFXkhicNFCW+RARvpTS0q6yaQFk=",
@@ -80,36 +80,36 @@
     "version": "38.0.1"
   },
   "misc_cmds": {
-    "hash": "sha256-qPqcV9d4mKeu9ZD3rt3p5m1p/NyLy6np19ULC6FmnMI=",
-    "version": "44"
+    "hash": "sha256-04uBS16nNrg73Fqh4Obev7nQDjTTlY4f5+pEv3i0FIU=",
+    "version": "45"
   },
   "network_cmds": {
-    "hash": "sha256-aGBsxdYW21QjTILxcR8tHufQKvkvmai9MKOCxBNZvmI=",
-    "version": "698.60.4"
+    "hash": "sha256-sfZX6aA8mspfRKARIYFXX+bmlLHDoi485HQOvbRNP1Y=",
+    "version": "705.100.5"
   },
   "patch_cmds": {
-    "hash": "sha256-foIoIMe+zgPISFmE10q4cwEUBhiah4nbD7UtjBumZYU=",
-    "version": "66"
+    "hash": "sha256-fDY2NOT3DnU5pm06cHSs+JJcA/EFP8Lxjg7sErUerJ0=",
+    "version": "72"
   },
   "remote_cmds": {
-    "hash": "sha256-a5ELSGJSTlyCb3bPdJqYSX320UzIkS2FiHxSpELIgls=",
-    "version": "303.0.2"
+    "hash": "sha256-8c/NgQZ+K6jJ3aoYK78/BsEkM1gmRS+9z0437+SvcCw=",
+    "version": "306"
   },
   "removefile": {
-    "hash": "sha256-h1jb4DcgDHwi9eiUguc2e5OLP8ZHxCN3B4Myp/DFDBg=",
-    "version": "75"
+    "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
+    "version": "81"
   },
   "shell_cmds": {
-    "hash": "sha256-bcu9NNS7NW5oc5yrOk+GxZcQo0AP0+mOnph9HhLdRts=",
-    "version": "319.0.1"
+    "hash": "sha256-hoMssbZCrmzyJTgEAzOS4L7DhY9z/yXIcvHRhL6W5qc=",
+    "version": "326"
   },
   "system_cmds": {
-    "hash": "sha256-9nNJeVJo4XwGSHh+SJydhVt+I8+Rb5hCsPiFYKQ8/28=",
-    "version": "1012.60.2"
+    "hash": "sha256-mEo+v0m+aP42XHHwibGKPkT55JFYLTOD5YT5IYQ8Hr0=",
+    "version": "1026.140.2"
   },
   "text_cmds": {
-    "hash": "sha256-76dagwRcAf5fpoyH5FDR5kdCldv6Mgre6aFBzxaCRkg=",
-    "version": "190.0.1"
+    "hash": "sha256-5BBH/v1mJpExz65VDX6oh3dFCz49E+JMqJxkO96Y/xo=",
+    "version": "195"
   },
   "top": {
     "hash": "sha256-e+k/jE49BMZZ24ge9JCa2ct5f1og6ewWb6U5ZMWdIEc=",
diff --git a/pkgs/os-specific/darwin/impure-cmds/default.nix b/pkgs/os-specific/darwin/impure-cmds/default.nix
deleted file mode 100644
index eac4f6b97fd2..000000000000
--- a/pkgs/os-specific/darwin/impure-cmds/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, runCommandLocal }:
-
-# On darwin, there are some commands neither opensource nor able to build in nixpkgs.
-# We have no choice but to use those system-shipped impure ones.
-
-let
-  commands = {
-    ditto = "/usr/bin/ditto"; # ditto is not opensource
-    sudo = "/usr/bin/sudo"; # sudo must be owned by uid 0 and have the setuid bit set
-  };
-
-  mkImpureDrv =
-    name: path:
-    runCommandLocal "${name}-impure-darwin"
-      {
-        __impureHostDeps = [ path ];
-
-        meta = {
-          platforms = lib.platforms.darwin;
-        };
-      }
-      ''
-        if ! [ -x ${path} ]; then
-          echo Cannot find command ${path}
-          exit 1
-        fi
-
-        mkdir -p $out/bin
-        ln -s ${path} $out/bin
-
-        manpage="/usr/share/man/man1/${name}.1"
-        if [ -f $manpage ]; then
-          mkdir -p $out/share/man/man1
-          ln -s $manpage $out/share/man/man1
-        fi
-      '';
-in
-lib.mapAttrs mkImpureDrv commands
diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 06b2ebd39234..1145498aa904 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -109,6 +109,8 @@ lib.makeExtensible (self: {
   xcode_16_4 = requireXcode "16.4" "sha256-voCEZlKrp9NYGmXAsf1FHxO69EgWZHDIWtQZ2qEzElA=";
   xcode_26 = requireXcode "26_Universal" "sha256-p4INqf85CSIzd7xHRCS9tCigQkOQPKnS/+D5nue3PsY=";
   xcode_26_Apple_silicon = requireXcode "26_Apple_silicon" "sha256-dlfZ2sM6a9pUPdukoMoqvQAj7EEUyj0a/VkXKwkkFT8=";
+  xcode_26_0_1 = requireXcode "26.0.1" "sha256-PsEIjrzxgXFqCWeHs/bsvrlxy8aN899jMhesczMbPfE=";
+  xcode_26_0_1_Apple_silicon = requireXcode "26.0.1_Apple_silicon" "sha256-UBDey19uBljjRw84bY4rzxetFEkHiXLEj39Q578jYL8=";
   xcode =
     self."xcode_${
       lib.replaceStrings [ "." ] [ "_" ] (
diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix
index e973e5ebcbc6..19cfc7938799 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.15";
+  tag = "0.3.16";
 in
 stdenv.mkDerivation {
   pname = "apfs";
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "linux-apfs";
     repo = "linux-apfs-rw";
-    rev = "v${tag}";
-    hash = "sha256-/qJ8QvnVhVXvuxeZ/UYLTXGMPPVnC7fHOSWI1B15r/M=";
+    tag = "v${tag}";
+    hash = "sha256-11ypevJwxNKAmJbl2t+nGXq40hjWbLIdltLqSeTVdHc=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "APFS module for linux";
     longDescription = ''
       The Apple File System (APFS) is the copy-on-write filesystem currently
@@ -49,8 +49,8 @@ stdenv.mkDerivation {
       Encryption is still not in the works though.
     '';
     homepage = "https://github.com/linux-apfs/linux-apfs-rw";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ Luflosi ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
 }
diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix
index 43e854979fff..9b2d7f98cf68 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/pkgs/os-specific/linux/batman-adv/version.nix
@@ -1,14 +1,14 @@
 {
-  version = "2025.3";
+  version = "2025.4";
 
   # To get these, run:
   #
   # ```
-  # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.3/$tool-2025.3.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done
+  # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.4/$tool-2025.4.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done
   # ```
   sha256 = {
-    alfred = "sha256-+wTI22Y6bh0dyeRnEvyr6Ctz0MC0fkC00WEAAu9RCXU=";
-    batctl = "sha256-cERLGCyF0MJxTZFFdBJJgIAbt0PRYm7iehefoiBm/cI=";
-    batman-adv = "sha256-vggjoJNr9Z4q8tEVp+JjF/giC5mPSDMldGWvK2/+HOg=";
+    alfred = "sha256-g3VHVHjtHNQTnJAAF1p9FAfujdkZoLfJ2/fRUJWIBIU=";
+    batctl = "sha256-Vmqk/XQ1Xo1d0r0hwl6YzAaOd/0I4Z+AuOK17d58jmU=";
+    batman-adv = "sha256-YkkKj4tYwC6Bkhbz6WMkmYRkXT5GAVagQ7c/xT4k+G0=";
   };
 }
diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index b2ca5dca7cf9..54b0c8de54a9 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -11,7 +11,7 @@ let
   # Patchset release number from rpmfusion, to more easily differentiate
   # versions and updates. See `wl-kmod.spec` file:
   # https://github.com/rpmfusion/wl-kmod/blob/master/wl-kmod.spec#L19
-  release = "57";
+  release = "59";
   hashes = {
     i686-linux = "sha256-T4twspOsjMXHDlca1dGHjQ8p0TOkb+eGmGjZwZtQWM0=";
     x86_64-linux = "sha256-X3l3TVvuyPdja1nA+wegMQju8eP9MkVjiyCFjHFBRL4=";
@@ -24,8 +24,8 @@ let
   rpmFusionPatches = fetchFromGitHub {
     owner = "rpmfusion";
     repo = "wl-kmod";
-    rev = "b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957";
-    hash = "sha256-v7mZ2S/eVfGTEXrxpdiemHhrC+P3/sPOZqTBhRtins4=";
+    rev = "7786b3a3e54962124d24b4b61a6472bb0c4bbd94";
+    hash = "sha256-yEMsFaGBVs/rtDZLG8j8ZW1CV9SDtt00avoWxkJdLAU=";
   };
   patchset = [
     "wl-kmod-001_wext_workaround.patch"
@@ -62,6 +62,7 @@ let
     "wl-kmod-032_add_MODULE_DESCRIPTION_macro.patch"
     "wl-kmod-033_disable_objtool_add_warning_unmaintained.patch"
     "wl-kmod-034_kernel_6.15_adaptation_replace_del_timer_with_timer_delete.patch"
+    "wl-kmod-035_kernel_6.17_adaptation_fix_functions_prototypes.patch"
   ];
 in
 stdenv.mkDerivation {
diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index ed1f723d5ee2..06e713a9dacd 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [
     "format"
-    "pie"
   ]
   ++ lib.optionals enableStatic [ "fortify" ];
 
diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 8f32a4310e89..7c6524367e1a 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -9,6 +9,7 @@
 
   # dependencies
   glib,
+  libxfixes,
   libXinerama,
   catch2,
   gperf,
@@ -129,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional ncursesSupport ncurses
   ++ lib.optionals x11Support [
     freetype
+    libxfixes
     xorg.libICE
     xorg.libX11
     xorg.libXext
diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix
index dadfeb107d0d..cb0d86eda25e 100644
--- a/pkgs/os-specific/linux/drbd/driver.nix
+++ b/pkgs/os-specific/linux/drbd/driver.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "drbd";
-  version = "9.2.14";
+  version = "9.2.15";
 
   src = fetchurl {
     url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${finalAttrs.version}.tar.gz";
-    hash = "sha256-x8onWPTyBnKt17xofivVlU+42nq1XtCo9i14kSOSd98=";
+    hash = "sha256-bKaL7wtjlSbUkLRlMSrGYjab0jdS8lu5bgScTbfpllE=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
       DRBD is a software-based, shared-nothing, replicated storage solution
       mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts.
     '';
-    broken = kernel.kernelAtLeast "6.16"; # several build errors with 6.16.x kernel versions
+    broken = kernel.kernelOlder "5.11" || kernel.kernelAtLeast "6.17";
   };
 })
diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 5c9660968579..08569929b794 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs target_firmware/firmware-crc.pl
+    substituteInPlace target_firmware/CMakeLists.txt \
+    --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" \
+                   "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -186,5 +189,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw";
     downloadPage = "https://github.com/qca/open-ath9k-htc-firmware";
     changelog = "https://github.com/qca/open-ath9k-htc-firmware/tags";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 6fd7dc8e99d1..13560cd6a965 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -16,16 +16,18 @@
   libbsd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fwts";
-  version = "24.09.00";
+  version = "25.09.00";
 
   src = fetchzip {
-    url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
-    hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
+    url = "https://fwts.ubuntu.com/release/fwts-V${finalAttrs.version}.tar.gz";
+    hash = "sha256-OJI2O9MptckmGj4rTrh9haIGaXJOO3er59yIorbgSVw=";
     stripRoot = false;
   };
 
+  sourceRoot = "${finalAttrs.src.name}/fwts-${finalAttrs.version}";
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -64,4 +66,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ tadfisher ];
   };
-}
+})
diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix
index 76326198b8be..922abd9019ec 100644
--- a/pkgs/os-specific/linux/fwts/module.nix
+++ b/pkgs/os-specific/linux/fwts/module.nix
@@ -6,13 +6,13 @@
   kernelModuleMakeFlags,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fwts-efi-runtime";
   version = "${fwts.version}-${kernel.version}";
 
   inherit (fwts) src;
 
-  sourceRoot = "${src.name}/efi_runtime";
+  sourceRoot = "${fwts.sourceRoot}/efi_runtime";
 
   postPatch = ''
     substituteInPlace Makefile --replace \
@@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ dtzWill ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix
new file mode 100644
index 000000000000..b52959f681a2
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/build.nix
@@ -0,0 +1,591 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  bc,
+  bison,
+  flex,
+  perl,
+  rsync,
+  gmp,
+  libmpc,
+  mpfr,
+  openssl,
+  cpio,
+  elfutils,
+  hexdump,
+  zstd,
+  python3Minimal,
+  zlib,
+  pahole,
+  kmod,
+  ubootTools,
+  fetchpatch,
+  rustc-unwrapped,
+  rust-bindgen-unwrapped,
+  rustPlatform,
+}:
+
+let
+  lib_ = lib;
+  stdenv_ = stdenv;
+
+  readConfig =
+    configfile:
+    let
+      matchLine =
+        line:
+        let
+          match = lib.match "(CONFIG_[^=]+)=([ym])" line;
+        in
+        lib.optional (match != null) {
+          name = lib.elemAt match 0;
+          value = lib.elemAt match 1;
+        };
+    in
+    lib.listToAttrs (lib.concatMap matchLine (lib.splitString "\n" (builtins.readFile configfile)));
+in
+lib.makeOverridable (
+  {
+    # The kernel version
+    version,
+    # The kernel pname (should be set for variants)
+    pname ? "linux",
+    # Position of the Linux build expression
+    pos ? null,
+    # Additional kernel make flags
+    extraMakeFlags ? [ ],
+    # The name of the kernel module directory
+    # Needs to be X.Y.Z[-extra], so pad with zeros if needed.
+    modDirVersion ? null, # derive from version
+    # The kernel source (tarball, git checkout, etc.)
+    src,
+    # a list of { name=..., patch=..., extraConfig=...} patches
+    kernelPatches ? [ ],
+    # The kernel .config file
+    configfile,
+    # Manually specified nixexpr representing the config
+    # If unspecified, this will be autodetected from the .config
+    config ? lib.optionalAttrs (builtins.isPath configfile || allowImportFromDerivation) (
+      readConfig configfile
+    ),
+    # Custom seed used for CONFIG_GCC_PLUGIN_RANDSTRUCT if enabled. This is
+    # automatically extended with extra per-version and per-config values.
+    randstructSeed ? "",
+    # Extra meta attributes
+    extraMeta ? { },
+
+    # for module compatibility
+    isZen ? false,
+    isLibre ? false,
+    isHardened ? false,
+
+    # Whether to utilize the controversial import-from-derivation feature to parse the config
+    allowImportFromDerivation ? false,
+    # ignored
+    features ? null,
+    lib ? lib_,
+    stdenv ? stdenv_,
+  }:
+
+  let
+    # Provide defaults. Note that we support `null` so that callers don't need to use optionalAttrs,
+    # which can lead to unnecessary strictness and infinite recursions.
+    modDirVersion_ = if modDirVersion == null then lib.versions.pad 3 version else modDirVersion;
+
+    config_ = config;
+  in
+  let
+    # Shadow the un-defaulted parameter; don't want null.
+    modDirVersion = modDirVersion_;
+    inherit (lib)
+      hasAttr
+      getAttr
+      optional
+      optionals
+      optionalString
+      maintainers
+      teams
+      platforms
+      ;
+
+    commonMakeFlags = import ./common-flags.nix {
+      inherit
+        lib
+        stdenv
+        buildPackages
+        extraMakeFlags
+        ;
+    };
+
+    # Folding in `ubootTools` in the default nativeBuildInputs is problematic, as
+    # it makes updating U-Boot cumbersome, since it will go above the current
+    # threshold of rebuilds
+    #
+    # To prevent these needless rounds of staging for U-Boot builds, we can
+    # limit the inclusion of ubootTools to target platforms where uImage *may*
+    # be produced.
+    #
+    # This command lists those (kernel-named) platforms:
+    #     .../linux $ grep -l uImage ./arch/*/Makefile | cut -d'/' -f3 | sort
+    #
+    # This is still a guesstimation, but since none of our cached platforms
+    # coincide in that list, this gives us "perfect" decoupling here.
+    linuxPlatformsUsingUImage = [
+      "arc"
+      "arm"
+      "csky"
+      "mips"
+      "powerpc"
+      "sh"
+      "sparc"
+      "xtensa"
+    ];
+    needsUbootTools = lib.elem stdenv.hostPlatform.linuxArch linuxPlatformsUsingUImage;
+
+    config =
+      let
+        attrName = attr: "CONFIG_" + attr;
+      in
+      {
+        isSet = attr: hasAttr (attrName attr) config;
+
+        getValue = attr: if config.isSet attr then getAttr (attrName attr) config else null;
+
+        isYes = attr: (config.getValue attr) == "y";
+
+        isNo = attr: (config.getValue attr) == "n";
+
+        isModule = attr: (config.getValue attr) == "m";
+
+        isEnabled = attr: (config.isModule attr) || (config.isYes attr);
+
+        isDisabled = attr: (!(config.isSet attr)) || (config.isNo attr);
+      }
+      // config_;
+
+    isModular = config.isYes "MODULES";
+    withRust = config.isYes "RUST";
+
+    target = stdenv.hostPlatform.linux-kernel.target or "vmlinux";
+
+    buildDTBs = stdenv.hostPlatform.linux-kernel.DTB or false;
+
+    # Dependencies that are required to build kernel modules
+    moduleBuildDependencies = [
+      pahole
+      perl
+      elfutils
+      # module makefiles often run uname commands to find out the kernel version
+      (buildPackages.deterministic-uname.override { inherit modDirVersion; })
+    ]
+    ++ optional (lib.versionAtLeast version "5.13") zstd
+    ++ optionals withRust [
+      rustc-unwrapped
+      rust-bindgen-unwrapped
+    ];
+  in
+
+  stdenv.mkDerivation {
+    inherit pname version src;
+
+    __structuredAttrs = true;
+
+    enableParallelBuilding = true;
+
+    hardeningDisable = [
+      "bindnow"
+      "format"
+      "fortify"
+      "stackprotector"
+      "pic"
+    ];
+
+    ${if isModular then "outputs" else null} = [
+      "out"
+      "dev"
+      "modules"
+    ];
+
+    # We remove a bunch of stuff that is symlinked from other places to save space,
+    # which trips the broken symlink check. So, just skip it. We'll know if it explodes.
+    dontCheckForBrokenSymlinks = true;
+
+    patches =
+      # kernelPatches can contain config changes and no actual patch
+      lib.filter (p: p != null) (map (p: p.patch) kernelPatches)
+      # Required for deterministic builds along with some postPatch magic.
+      ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
+      ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
+      # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
+      # OpenZFS; this was fixed in Linux 5.19 so we backport the fix
+      # https://github.com/openzfs/zfs/pull/13367
+      ++
+        optional
+          (
+            lib.versionAtLeast version "5.12" && lib.versionOlder version "5.19" && stdenv.hostPlatform.isPower
+          )
+          (fetchpatch {
+            url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";
+            hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
+          });
+
+    buildFlags = [
+      "KBUILD_BUILD_VERSION=1-NixOS"
+      stdenv.hostPlatform.linux-kernel.target
+      "vmlinux" # for "perf" and things like that
+      "scripts_gdb"
+    ]
+    ++ optional isModular "modules"
+    ++ optionals buildDTBs [
+      "dtbs"
+      "DTC_FLAGS=-@"
+    ]
+    ++ extraMakeFlags;
+
+    installFlags = [
+      "INSTALL_PATH=${placeholder "out"}"
+    ]
+    ++ (optional isModular "INSTALL_MOD_PATH=${placeholder "modules"}")
+    ++ optionals buildDTBs [
+      "dtbs_install"
+      "INSTALL_DTBS_PATH=${placeholder "out"}/dtbs"
+    ];
+
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    nativeBuildInputs = [
+      bison
+      flex
+      perl
+      bc
+      openssl
+      rsync
+      gmp
+      libmpc
+      mpfr
+      elfutils
+      zstd
+      python3Minimal
+      kmod
+      hexdump
+    ]
+    ++ optional needsUbootTools ubootTools
+    ++ optionals (lib.versionAtLeast version "5.2") [
+      cpio
+      pahole
+      zlib
+    ]
+    ++ optionals withRust [
+      rustc-unwrapped
+      rust-bindgen-unwrapped
+    ];
+
+    env = {
+      RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
+
+      # avoid leaking Rust source file names into the final binary, which adds
+      # a false dependency on rust-lib-src on targets with uncompressed kernels
+      KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
+    };
+
+    makeFlags = [
+      "O=$(buildRoot)"
+
+      # We have a `modules` variable in the environment for our
+      # split output, but the kernel Makefiles also define their
+      # own `modules` variable. Their definition wins, but Make
+      # remembers that the variable was originally from the
+      # environment and exports it to all the build recipes. This
+      # breaks the build with an “Argument list too long” error due
+      # to passing the huge list of every module object file in the
+      # environment of every process invoked by every build recipe.
+      #
+      # We use `--eval` here to undefine the inherited environment
+      # variable before any Makefiles are read, ensuring that the
+      # kernel’s definition creates a new, unexported variable.
+      "--eval=undefine modules"
+    ]
+    ++ commonMakeFlags;
+
+    postPatch = ''
+      # Ensure that depmod gets resolved through PATH
+      sed -i Makefile -e 's|= /sbin/depmod|= depmod|'
+
+      # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist.
+      [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh
+
+      # Set randstruct seed to a deterministic but diversified value. Note:
+      # we could have instead patched gen-random-seed.sh to take input from
+      # the buildFlags, but that would require also patching the kernel's
+      # toplevel Makefile to add a variable export. This would be likely to
+      # cause future patch conflicts.
+      for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do
+        if [ -f "$file" ]; then
+          substituteInPlace "$file" \
+            --replace NIXOS_RANDSTRUCT_SEED \
+            $(echo ${randstructSeed}${src} ${placeholder "configfile"} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
+          break
+        fi
+      done
+
+      patchShebangs scripts
+
+      # also patch arch-specific install scripts
+      for i in $(find arch -name install.sh); do
+          patchShebangs "$i"
+      done
+
+      # unset $src because the build system tries to use it and spams a bunch of warnings
+      # see: https://github.com/torvalds/linux/commit/b1992c3772e69a6fd0e3fc81cd4d2820c8b6eca0
+      unset src
+    '';
+
+    configurePhase = ''
+      runHook preConfigure
+
+      mkdir build
+      export buildRoot="$(pwd)/build"
+
+      echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
+
+      if [ -f "$buildRoot/.config" ]; then
+        echo "Could not link $buildRoot/.config : file exists"
+        exit 1
+      fi
+      ln -sv ${configfile} $buildRoot/.config
+
+      # reads the existing .config file and prompts the user for options in
+      # the current kernel source that are not found in the file.
+      make "''${makeFlags[@]}" oldconfig
+      runHook postConfigure
+
+      make "''${makeFlags[@]}" prepare
+      actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
+      if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
+        echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
+        exit 1
+      fi
+
+      buildFlags+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
+
+      cd $buildRoot
+    '';
+
+    postInstall = optionalString isModular ''
+      mkdir -p $dev
+      cp vmlinux $dev/
+
+      mkdir -p $dev/lib/modules/${modDirVersion}/build/scripts
+      cp -rL ../scripts/gdb/ $dev/lib/modules/${modDirVersion}/build/scripts
+
+      if [ -z "''${dontStrip-}" ]; then
+        installFlags+=("INSTALL_MOD_STRIP=1")
+      fi
+      make modules_install "''${makeFlags[@]}" "''${installFlags[@]}"
+      unlink $modules/lib/modules/${modDirVersion}/build
+
+      mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
+
+      # To save space, exclude a bunch of unneeded stuff when copying.
+      (cd .. && rsync --archive --prune-empty-dirs \
+          --exclude='/build/' \
+          * $dev/lib/modules/${modDirVersion}/source/)
+
+      cd $dev/lib/modules/${modDirVersion}/source
+
+      cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
+      make modules_prepare "''${makeFlags[@]}" O=$dev/lib/modules/${modDirVersion}/build
+
+      # For reproducibility, removes accidental leftovers from a `cc1` call
+      # from a `try-run` call from the Makefile
+      rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d
+
+      # Keep some extra files on some arches (powerpc, aarch64)
+      for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do
+        if [ -f "$buildRoot/$f" ]; then
+          mkdir -p "$(dirname $dev/lib/modules/${modDirVersion}/build/$f)"
+          cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
+        fi
+      done
+
+      # !!! No documentation on how much of the source tree must be kept
+      # If/when kernel builds fail due to missing files, you can add
+      # them here. Note that we may see packages requiring headers
+      # from drivers/ in the future; it adds 50M to keep all of its
+      # headers on 3.10 though.
+
+      chmod u+w -R ..
+      buildArchDir="$dev/lib/modules/${modDirVersion}/build/arch"
+
+      # Remove unused arches
+      for d in $(cd arch/; ls); do
+        if [ -d "$buildArchDir/$d" ]; then continue; fi
+        if [ -d "$buildArchDir/arm64" ] && [ "$d" = arm ]; then continue; fi
+        rm -rf arch/$d
+      done
+
+      # Remove all driver-specific code (50M of which is headers)
+      rm -fR drivers
+
+      # Keep all headers
+      find .  -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
+
+      # Keep linker scripts (they are required for out-of-tree modules on aarch64)
+      find .  -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
+
+      # Keep root and arch-specific Makefiles
+      chmod u-w Makefile arch/*/Makefile*
+
+      # Keep whole scripts dir
+      chmod u-w -R scripts
+
+      # Delete everything not kept
+      find . -type f -perm -u=w -print0 | xargs -0 -r rm
+
+      # Delete empty directories
+      find -empty -type d -delete
+    '';
+
+    preInstall =
+      let
+        # All we really need to do here is copy the final image and System.map to $out,
+        # and use the kernel's modules_install, firmware_install, dtbs_install, etc. targets
+        # for the rest. Easy, right?
+        #
+        # Unfortunately for us, the obvious way of getting the built image path,
+        # make -s image_name, does not work correctly, because some architectures
+        # (*cough* aarch64 *cough*) change KBUILD_IMAGE on the fly in their install targets,
+        # so we end up attempting to install the thing we didn't actually build.
+        #
+        # Thankfully, there's a way out that doesn't involve just hardcoding everything.
+        #
+        # The kernel has an install target, which runs a pretty simple shell script
+        # (located at scripts/install.sh or arch/$arch/boot/install.sh, depending on
+        # which kernel version you're looking at) that tries to do something sensible.
+        #
+        # (it would be great to hijack this script immediately, as it has all the
+        #   information we need passed to it and we don't need it to try and be smart,
+        #   but unfortunately, the exact location of the scripts differs between kernel
+        #   versions, and they're seemingly not considered to be public API at all)
+        #
+        # One of the ways it tries to discover what "something sensible" actually is
+        # is by delegating to what's supposed to be a user-provided install script
+        # located at ~/bin/installkernel.
+        #
+        # (the other options are:
+        #   - a distribution-specific script at /sbin/installkernel,
+        #        which we can't really create in the sandbox easily
+        #   - an architecture-specific script at arch/$arch/boot/install.sh,
+        #        which attempts to guess _something_ and usually guesses very wrong)
+        #
+        # More specifically, the install script exec's into ~/bin/installkernel, if one
+        # exists, with the following arguments:
+        #
+        # $1: $KERNELRELEASE - full kernel version string
+        # $2: $KBUILD_IMAGE - the final image path
+        # $3: System.map - path to System.map file, seemingly hardcoded everywhere
+        # $4: $INSTALL_PATH - path to the destination directory as specified in installFlags
+        #
+        # $2 is exactly what we want, so hijack the script and use the knowledge given to it
+        # by the makefile overlords for our own nefarious ends.
+        #
+        # Note that the makefiles specifically look in ~/bin/installkernel, and
+        # writeShellScriptBin writes the script to <store path>/bin/installkernel,
+        # so HOME needs to be set to just the store path.
+        #
+        # FIXME: figure out a less roundabout way of doing this.
+        installkernel = buildPackages.writeShellScriptBin "installkernel" ''
+          cp -av $2 $4
+          cp -av $3 $4
+        '';
+      in
+      ''
+        installFlags+=("-j$NIX_BUILD_CORES")
+        export HOME=${installkernel}
+      '';
+
+    requiredSystemFeatures = [ "big-parallel" ];
+
+    passthru = rec {
+      inherit
+        version
+        modDirVersion
+        config
+        kernelPatches
+        configfile
+        moduleBuildDependencies
+        stdenv
+        commonMakeFlags
+        ;
+      inherit
+        isZen
+        isHardened
+        isLibre
+        withRust
+        ;
+      isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
+      baseVersion = lib.head (lib.splitString "-rc" version);
+      kernelOlder = lib.versionOlder baseVersion;
+      kernelAtLeast = lib.versionAtLeast baseVersion;
+    };
+
+    # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
+    installTargets = [
+      (stdenv.hostPlatform.linux-kernel.installTarget or (
+        if target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
+          "uinstall"
+        else if
+          (target == "zImage" || target == "Image.gz" || target == "vmlinuz.efi")
+          && builtins.elem stdenv.hostPlatform.linuxArch [
+            "arm"
+            "arm64"
+            "parisc"
+            "riscv"
+          ]
+        then
+          "zinstall"
+        else
+          "install"
+      )
+      )
+    ];
+
+    karch = stdenv.hostPlatform.linuxArch;
+
+    pos = lib.optionalDrvAttr (pos != null) pos;
+
+    meta = {
+      # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
+      broken = withRust && lib.versionOlder version "6.12";
+
+      description =
+        "The Linux kernel"
+        + (
+          if kernelPatches == [ ] then
+            ""
+          else
+            " (with patches: " + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"
+        );
+      license = lib.licenses.gpl2Only;
+      homepage = "https://www.kernel.org/";
+      maintainers = [ maintainers.thoughtpolice ];
+      teams = [ teams.linux-kernel ];
+      platforms = platforms.linux;
+      badPlatforms =
+        lib.optionals (lib.versionOlder version "4.15") [
+          "riscv32-linux"
+          "riscv64-linux"
+        ]
+        ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
+      timeout = 14400; # 4 hours
+      identifiers.cpeParts = {
+        part = "o";
+        vendor = "linux";
+        product = "linux_kernel";
+        inherit version;
+        update = "*";
+      };
+    }
+    // extraMeta;
+  }
+)
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index fdb300836d80..d286bb524968 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -77,7 +77,7 @@ let
       # FIXME: figure out how to actually make BTFs reproducible instead
       # See https://github.com/NixOS/nixpkgs/pull/181456 for details.
       MODULE_ALLOW_BTF_MISMATCH = whenAtLeast "5.18" (option yes);
-      BPF_LSM = whenAtLeast "5.7" (option yes);
+      BPF_LSM = option yes;
       DEBUG_KERNEL = yes;
       DEBUG_DEVRES = no;
       DYNAMIC_DEBUG = yes;
@@ -154,10 +154,10 @@ let
       CPU_FREQ_STAT = yes;
 
       # Enable CPU energy model for scheduling
-      ENERGY_MODEL = whenAtLeast "5.0" yes;
+      ENERGY_MODEL = yes;
 
       # Enable thermal interface netlink API
-      THERMAL_NETLINK = whenAtLeast "5.9" yes;
+      THERMAL_NETLINK = yes;
 
       # Prefer power-efficient workqueue implementation to per-CPU workqueues,
       # which is slightly slower, but improves battery life.
@@ -182,24 +182,24 @@ let
       X86_INTEL_PSTATE = yes;
       X86_AMD_PSTATE = whenAtLeast "5.17" yes;
       # Intel DPTF (Dynamic Platform and Thermal Framework) Support
-      ACPI_DPTF = whenAtLeast "5.10" yes;
+      ACPI_DPTF = yes;
 
       # Required to bring up some Bay Trail devices properly
       I2C = yes;
       I2C_DESIGNWARE_CORE = yes;
       I2C_DESIGNWARE_PLATFORM = yes;
-      PMIC_OPREGION = whenAtLeast "5.10" yes;
-      INTEL_SOC_PMIC = whenAtLeast "5.10" yes;
-      BYTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      CHTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      XPOWER_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      BXT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      INTEL_SOC_PMIC_CHTWC = whenAtLeast "5.10" yes;
-      CHT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      INTEL_SOC_PMIC_CHTDC_TI = whenAtLeast "5.10" yes;
-      CHT_DC_TI_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      MFD_TPS68470 = whenBetween "5.10" "5.13" yes;
-      TPS68470_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      PMIC_OPREGION = yes;
+      INTEL_SOC_PMIC = yes;
+      BYTCRC_PMIC_OPREGION = yes;
+      CHTCRC_PMIC_OPREGION = yes;
+      XPOWER_PMIC_OPREGION = yes;
+      BXT_WC_PMIC_OPREGION = yes;
+      INTEL_SOC_PMIC_CHTWC = yes;
+      CHT_WC_PMIC_OPREGION = yes;
+      INTEL_SOC_PMIC_CHTDC_TI = yes;
+      CHT_DC_TI_PMIC_OPREGION = yes;
+      MFD_TPS68470 = whenOlder "5.13" yes;
+      TPS68470_PMIC_OPREGION = yes;
 
       # Enable Intel thermal hardware feedback
       INTEL_HFI_THERMAL = whenAtLeast "5.18" yes;
@@ -251,11 +251,9 @@ let
     # Include the CFQ I/O scheduler in the kernel, rather than as a
     # module, so that the initrd gets a good I/O scheduler.
     scheduler = {
-      IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1
       BLK_CGROUP = yes; # required by CFQ"
       BLK_CGROUP_IOLATENCY = yes;
       BLK_CGROUP_IOCOST = yes;
-      IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
       MQ_IOSCHED_DEADLINE = yes;
       BFQ_GROUP_IOSCHED = yes;
       MQ_IOSCHED_KYBER = yes;
@@ -320,6 +318,7 @@ let
       IPV6_SEG6_LWTUNNEL = yes;
       IPV6_SEG6_HMAC = yes;
       IPV6_SEG6_BPF = yes;
+      NET_CLS_ACT = yes;
       NET_CLS_BPF = module;
       NET_ACT_BPF = module;
       NET_SCHED = yes;
@@ -378,13 +377,13 @@ let
       INET_DIAG_DESTROY = lib.mkDefault yes;
 
       # IPsec over TCP
-      INET_ESPINTCP = whenAtLeast "5.8" yes;
-      INET6_ESPINTCP = whenAtLeast "5.8" yes;
+      INET_ESPINTCP = yes;
+      INET6_ESPINTCP = yes;
 
       # enable multipath-tcp
-      MPTCP = whenAtLeast "5.6" yes;
-      MPTCP_IPV6 = whenAtLeast "5.6" yes;
-      INET_MPTCP_DIAG = whenAtLeast "5.9" (lib.mkDefault module);
+      MPTCP = yes;
+      MPTCP_IPV6 = yes;
+      INET_MPTCP_DIAG = lib.mkDefault module;
 
       # Kernel TLS
       TLS = module;
@@ -443,14 +442,8 @@ let
       RTL8XXXU_UNTESTED = option yes;
 
       RTW88 = module;
-      RTW88_8822BE = lib.mkMerge [
-        (whenOlder "5.8" yes)
-        (whenAtLeast "5.8" module)
-      ];
-      RTW88_8822CE = lib.mkMerge [
-        (whenOlder "5.8" yes)
-        (whenAtLeast "5.8" module)
-      ];
+      RTW88_8822BE = module;
+      RTW88_8822CE = module;
     };
 
     fb = {
@@ -482,12 +475,20 @@ let
       FONT_8x8 = yes;
       FONT_8x16 = yes;
       # High DPI font
-      FONT_TER16x32 = whenAtLeast "5.0" yes;
+      FONT_TER16x32 = yes;
     };
 
     video =
       let
-        whenHasDevicePrivate = lib.mkIf (!stdenv.hostPlatform.isx86_32);
+        whenHasDevicePrivate = lib.mkIf (
+          with stdenv.hostPlatform;
+          isLoongArch64
+          || isPower64
+          || isS390x
+          || isx86_64
+          || isAarch64
+          || (lib.versionAtLeast version "6.11" && isRiscV64)
+        );
       in
       {
         # compile in DRM so simpledrm can load before initrd if necessary
@@ -521,18 +522,15 @@ let
         DRM_DP_AUX_CHARDEV = whenOlder "6.10" yes;
         DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes;
         # amdgpu display core (DC) support
-        DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes;
-        DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes;
-        DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes;
-        DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenBetween "5.9" "5.11" yes);
+        DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenOlder "5.11" yes);
         DRM_AMD_DC_DCN = lib.mkIf (with stdenv.hostPlatform; isx86 || isPower64) (
           whenBetween "5.11" "6.4" yes
         );
         # Not available when using clang
         # See: https://github.com/torvalds/linux/blob/172a9d94339cea832d89630b89d314e41d622bd8/drivers/gpu/drm/amd/display/Kconfig#L14
         DRM_AMD_DC_FP = lib.mkIf (!stdenv.cc.isClang) (whenAtLeast "6.4" yes);
-        DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;
-        DRM_AMD_DC_SI = whenAtLeast "5.10" yes;
+        DRM_AMD_DC_HDCP = whenOlder "6.4" yes;
+        DRM_AMD_DC_SI = yes;
 
         # Enable AMD Audio Coprocessor support for HDMI outputs
         DRM_AMD_ACP = yes;
@@ -558,7 +556,7 @@ let
 
         # Enable HDMI-CEC receiver support
         RC_CORE = yes;
-        MEDIA_CEC_RC = whenAtLeast "5.10" yes;
+        MEDIA_CEC_RC = yes;
 
         # Enable CEC over DisplayPort
         DRM_DP_CEC = whenOlder "6.10" yes;
@@ -610,48 +608,43 @@ let
       SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions
       # Support configuring jack functions via fw mechanism at boot
       SND_HDA_PATCH_LOADER = yes;
-      SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
       SND_HDA_CODEC_CS8409 = whenAtLeast "6.6" module; # Cirrus Logic HDA Bridge CS8409
       SND_OSSEMUL = yes;
       SND_USB_CAIAQ_INPUT = yes;
       SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;
       # Enable Sound Open Firmware support
     }
-    //
-      lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && lib.versionAtLeast version "5.5")
-        {
-          SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = whenAtLeast "5.10" module;
-          SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = whenAtLeast "5.10" yes; # dep of SOF_MACH
-          SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenBetween "5.10" "5.11" yes; # dep of SOF_MACH
-          SND_SOC_SOF_TOPLEVEL = yes;
-          SND_SOC_SOF_ACPI = module;
-          SND_SOC_SOF_PCI = module;
-          SND_SOC_SOF_APOLLOLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_APOLLOLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_CANNONLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_CANNONLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_COFFEELAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_COFFEELAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_COMETLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_COMETLAKE_H_SUPPORT = whenOlder "5.8" yes;
-          SND_SOC_SOF_COMETLAKE_LP_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_ELKHARTLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_ELKHARTLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_GEMINILAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_GEMINILAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
-          SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = whenOlder "5.7" yes;
-          SND_SOC_SOF_HDA_LINK = yes;
-          SND_SOC_SOF_ICELAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_ICELAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_INTEL_TOPLEVEL = yes;
-          SND_SOC_SOF_JASPERLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_JASPERLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_MERRIFIELD = whenAtLeast "5.12" module;
-          SND_SOC_SOF_MERRIFIELD_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_TIGERLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_TIGERLAKE_SUPPORT = whenOlder "5.12" yes;
-        };
+    // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
+      SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = module;
+      SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = yes; # dep of SOF_MACH
+      SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenOlder "5.11" yes; # dep of SOF_MACH
+      SND_SOC_SOF_TOPLEVEL = yes;
+      SND_SOC_SOF_ACPI = module;
+      SND_SOC_SOF_PCI = module;
+      SND_SOC_SOF_APOLLOLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_APOLLOLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_CANNONLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_CANNONLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_COFFEELAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_COFFEELAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_COMETLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_COMETLAKE_LP_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_ELKHARTLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_ELKHARTLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_GEMINILAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_GEMINILAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
+      SND_SOC_SOF_HDA_LINK = yes;
+      SND_SOC_SOF_ICELAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_ICELAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_INTEL_TOPLEVEL = yes;
+      SND_SOC_SOF_JASPERLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_JASPERLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_MERRIFIELD = whenAtLeast "5.12" module;
+      SND_SOC_SOF_MERRIFIELD_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_TIGERLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_TIGERLAKE_SUPPORT = whenOlder "5.12" yes;
+    };
 
     usb = {
       USB = yes; # compile USB core into kernel, so we can use USB_SERIAL_CONSOLE before modules
@@ -671,7 +664,7 @@ let
       USB_SERIAL = yes;
       USB_SERIAL_GENERIC = yes; # USB Generic Serial Driver
       USB_SERIAL_CONSOLE = yes; # Allow using USB serial adapter as console
-      U_SERIAL_CONSOLE = whenAtLeast "5.10" yes; # Allow using USB gadget as console
+      U_SERIAL_CONSOLE = yes; # Allow using USB gadget as console
     };
 
     # Filesystem options - in particular, enable extended attributes and
@@ -714,18 +707,16 @@ let
 
       BTRFS_FS_POSIX_ACL = yes;
 
-      BCACHEFS_QUOTA = whenBetween "6.7" "6.18" (option yes);
-      BCACHEFS_POSIX_ACL = whenBetween "6.7" "6.18" (option yes);
+      # Provided by external module
+      BCACHEFS_FS = whenBetween "6.7" "6.18" no;
 
       UBIFS_FS_ADVANCED_COMPR = option yes;
 
       F2FS_FS = module;
       F2FS_FS_SECURITY = option yes;
-      F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
+      F2FS_FS_COMPRESSION = yes;
       UDF_FS = module;
 
-      NFSD_V2_ACL = whenOlder "5.10" yes;
-      NFSD_V3 = whenOlder "5.10" yes;
       NFSD_V3_ACL = yes;
       NFSD_V4 = yes;
       NFSD_V4_SECURITY_LABEL = yes;
@@ -806,7 +797,9 @@ let
 
       SECURITY_DMESG_RESTRICT = yes;
 
-      RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG
+      RANDOM_TRUST_CPU = lib.mkIf (with stdenv.hostPlatform; isPower64 || isS390 || isx86 || isAarch64) (
+        whenOlder "6.2" yes
+      ); # allow RDRAND to seed the RNG
       RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG
 
       MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
@@ -929,7 +922,7 @@ let
       STACK_TRACER = yes;
       UPROBE_EVENTS = option yes;
       BPF_SYSCALL = yes;
-      BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.16" yes;
+      BPF_UNPRIV_DEFAULT_OFF = whenOlder "5.16" yes;
       BPF_EVENTS = yes;
       FUNCTION_PROFILER = yes;
       RING_BUFFER_BENCHMARK = no;
@@ -963,12 +956,6 @@ let
 
       UDMABUF = yes;
 
-      # VirtualBox guest drivers in the kernel conflict with the ones in the
-      # official additions package and prevent the vboxsf module from loading,
-      # so disable them for now.
-      VBOXGUEST = option no;
-      DRM_VBOXVIDEO = option no;
-
       XEN = option yes;
       XEN_DOM0 = option yes;
       PCI_XEN = option yes;
@@ -988,6 +975,11 @@ let
 
       # Enable device detection on virtio-mmio hypervisors
       VIRTIO_MMIO_CMDLINE_DEVICES = yes;
+
+      # Enable CDEV and NOIOMMU support for VFIO, which is useful for
+      # passthrough.
+      VFIO_DEVICE_CDEV = whenAtLeast "6.6" yes;
+      VFIO_NOIOMMU = whenAtLeast "6.6" yes;
     };
 
     media = {
@@ -1024,7 +1016,7 @@ let
       ZRAM_BACKEND_ZSTD = whenAtLeast "6.12" yes;
       ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes;
       ZSWAP = option yes;
-      ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes);
+      ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkOptionDefault yes;
       ZPOOL = whenOlder "6.18" yes;
       ZSMALLOC = option yes;
     };
@@ -1054,8 +1046,7 @@ let
       LOCK_TORTURE_TEST = option no;
       MTD_TESTS = option no;
       NOTIFIER_ERROR_INJECTION = option no;
-      RCU_PERF_TEST = whenOlder "5.9" no;
-      RCU_SCALE_TEST = whenAtLeast "5.10" no;
+      RCU_SCALE_TEST = no;
       TEST_ASYNC_DRIVER_PROBE = option no;
       WW_MUTEX_SELFTEST = option no;
       XZ_DEC_TEST = option no;
@@ -1075,12 +1066,16 @@ let
       let
         # Use zstd for kernel compression if 64-bit and newer than 5.9, otherwise xz.
         # i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375
-        useZstd = stdenv.buildPlatform.is64bit && lib.versionAtLeast version "5.9";
+        useZstd = stdenv.buildPlatform.is64bit;
       in
       {
         # stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V.
         KERNEL_UNCOMPRESSED = lib.mkIf stdenv.hostPlatform.isRiscV yes;
-        KERNEL_XZ = lib.mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes;
+
+        KERNEL_XZ = lib.mkIf (
+          with stdenv.hostPlatform; (isAarch32 || isMips || isPower || isS390 || isx86) && !useZstd
+        ) yes;
+
         KERNEL_ZSTD = lib.mkIf (
           with stdenv.hostPlatform;
           (isMips || isS390 || isx86 || (lib.versionAtLeast version "6.1" && isAarch64 || isLoongArch64))
@@ -1166,9 +1161,9 @@ let
         BLK_SED_OPAL = yes;
 
         # Enable support for block layer inline encryption
-        BLK_INLINE_ENCRYPTION = whenAtLeast "5.8" yes;
+        BLK_INLINE_ENCRYPTION = yes;
         # ...but fall back to CPU encryption if unavailable
-        BLK_INLINE_ENCRYPTION_FALLBACK = whenAtLeast "5.8" yes;
+        BLK_INLINE_ENCRYPTION_FALLBACK = yes;
 
         BSD_PROCESS_ACCT_V3 = yes;
 
@@ -1198,7 +1193,7 @@ let
 
         EFI = lib.mkIf stdenv.hostPlatform.isEfi yes;
         EFI_STUB = yes; # EFI bootloader in the bzImage itself
-        EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
+        EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = whenOlder "6.2" yes; # initrd kernel parameter for EFI
 
         # Generic compression support for EFI payloads
         # Add new platforms only after they have been verified to build and boot.
@@ -1246,11 +1241,19 @@ let
         NVME_TCP_TLS = whenAtLeast "6.7" yes;
 
         NVME_TARGET = module;
-        NVME_TARGET_PASSTHRU = whenAtLeast "5.9" yes;
+        NVME_TARGET_PASSTHRU = yes;
         NVME_TARGET_AUTH = whenAtLeast "6.0" yes;
         NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes;
 
-        PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit) yes;
+        PCI_P2PDMA = lib.mkIf (
+          with stdenv.hostPlatform;
+          isLoongArch64
+          || isPower64
+          || isS390x
+          || isx86_64
+          || isAarch64
+          || (lib.versionAtLeast version "6.11" && isRiscV64)
+        ) yes;
 
         PSI = yes;
 
@@ -1290,7 +1293,7 @@ let
 
         HWMON = yes;
         THERMAL_HWMON = yes; # Hardware monitoring support
-        NVME_HWMON = whenAtLeast "5.5" yes; # NVMe drives temperature reporting
+        NVME_HWMON = yes; # NVMe drives temperature reporting
         UEVENT_HELPER = no;
 
         USERFAULTFD = yes;
@@ -1317,12 +1320,21 @@ let
 
         # Enable AMD's ROCm GPU compute stack
         HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit yes;
+        ZONE_DEVICE = lib.mkIf (
+          with stdenv.hostPlatform;
+          isLoongArch64
+          || isPower64
+          || isS390x
+          || isx86_64
+          || isAarch64
+          || (lib.versionAtLeast version "6.11" && isRiscV64)
+        ) yes;
+
         # required for P2P DMABUF
         DMABUF_MOVE_NOTIFY = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);
         # required for P2P transfers between accelerators
         HSA_AMD_P2P = lib.mkIf stdenv.hostPlatform.is64bit (whenAtLeast "6.6" yes);
 
-        ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit yes;
         HMM_MIRROR = yes;
         DRM_AMDGPU_USERPTR = yes;
 
@@ -1355,15 +1367,15 @@ let
         };
         ANDROID_BINDER_IPC = {
           optional = true;
-          tristate = whenAtLeast "5.0" "y";
+          tristate = "y";
         };
         ANDROID_BINDERFS = {
           optional = true;
-          tristate = whenAtLeast "5.0" "y";
+          tristate = "y";
         };
         ANDROID_BINDER_DEVICES = {
           optional = true;
-          freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";
+          freeform = "binder,hwbinder,vndbinder";
         };
 
         TASKSTATS = yes;
@@ -1371,12 +1383,14 @@ let
         TASK_XACCT = yes;
         TASK_IO_ACCOUNTING = yes;
 
+        LEGACY_TIOCSTI = whenAtLeast "6.2" no;
+
         # Fresh toolchains frequently break -Werror build for minor issues.
         WERROR = whenAtLeast "5.15" no;
 
         # > CONFIG_KUNIT should not be enabled in a production environment. Enabling KUnit disables Kernel Address-Space Layout Randomization (KASLR), and tests may affect the state of the kernel in ways not suitable for production.
         # https://www.kernel.org/doc/html/latest/dev-tools/kunit/start.html
-        KUNIT = whenAtLeast "5.5" no;
+        KUNIT = no;
 
         # Set system time from RTC on startup and resume
         RTC_HCTOSYS = option yes;
@@ -1386,7 +1400,7 @@ let
 
         # Enable generic kernel watch queues
         # See https://docs.kernel.org/core-api/watch_queue.html
-        WATCH_QUEUE = whenAtLeast "5.8" yes;
+        WATCH_QUEUE = yes;
       }
       //
         lib.optionalAttrs
@@ -1399,7 +1413,15 @@ let
             MEMORY_HOTPLUG = yes;
             MEMORY_HOTPLUG_DEFAULT_ONLINE = whenOlder "6.14" yes;
             MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO = whenAtLeast "6.14" yes;
-            MEMORY_HOTREMOVE = yes;
+            MEMORY_HOTREMOVE = lib.mkIf (
+              with stdenv.hostPlatform;
+              isLoongArch64
+              || isPower
+              || isS390
+              || isx86
+              || isAarch64
+              || (lib.versionAtLeast version "6.11" && isRiscV)
+            ) yes;
             HOTPLUG_CPU = yes;
             MIGRATION = yes;
             SPARSEMEM = yes;
@@ -1418,7 +1440,7 @@ let
             CROS_EC_I2C = module;
             CROS_EC_SPI = module;
             CROS_KBD_LED_BACKLIGHT = module;
-            TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
+            TCG_TIS_SPI_CR50 = yes;
           }
       //
         lib.optionalAttrs
@@ -1480,7 +1502,7 @@ let
         CHROMEOS_PSTORE = module;
 
         # Enable x86 resource control
-        X86_CPU_RESCTRL = whenAtLeast "5.0" yes;
+        X86_CPU_RESCTRL = yes;
 
         # Enable TSX on CPUs where it's not vulnerable
         X86_INTEL_TSX_MODE_AUTO = yes;
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index a16ef1cccabe..456e9052d5c2 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -24,6 +24,8 @@ let
   overridableKernel = lib.makeOverridable (
     # The kernel source tarball.
     {
+      pname ? "linux",
+
       src,
 
       # The kernel version.
@@ -65,7 +67,7 @@ let
       # optionally be compressed with gzip or bzip2.
       kernelPatches ? [ ],
       ignoreConfigErrors ?
-        !lib.elem stdenv.hostPlatform.linux-kernel.name [
+        !lib.elem stdenv.hostPlatform.linux-kernel.name or "" [
           "aarch64-multiplatform"
           "pc"
         ],
@@ -78,7 +80,7 @@ let
       isHardened ? false,
 
       # easy overrides to stdenv.hostPlatform.linux-kernel members
-      autoModules ? stdenv.hostPlatform.linux-kernel.autoModules,
+      autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true,
       preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false,
       kernelArch ? stdenv.hostPlatform.linuxArch,
       kernelTests ? { },
@@ -96,25 +98,6 @@ let
     # files.
 
     let
-      # Dirty hack to make sure that `version` & `src` have
-      # `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position
-      # when using `builtins.unsafeGetAttrPos`.
-      #
-      # This is to make sure that ofborg actually detects changes in the kernel derivation
-      # and pings all maintainers.
-      #
-      # For further context, see https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957
-      basicArgs = removeAttrs args (
-        lib.filter (
-          x:
-          !(builtins.elem x [
-            "version"
-            "pname"
-            "src"
-          ])
-        ) (lib.attrNames args)
-      );
-
       # Combine the `features' attribute sets of all the kernel patches.
       kernelFeatures = lib.foldr (x: y: (x.features or { }) // y) (
         {
@@ -205,10 +188,9 @@ let
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
 
-        platformName = stdenv.hostPlatform.linux-kernel.name;
         # e.g. "defconfig"
         kernelBaseConfig =
-          if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
+          if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
 
         makeFlags = import ./common-flags.nix {
           inherit
@@ -299,26 +281,26 @@ let
         };
       }; # end of configfile derivation
 
-      kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) (
-        basicArgs
-        // {
-          inherit
-            kernelPatches
-            randstructSeed
-            extraMakeFlags
-            extraMeta
-            configfile
-            modDirVersion
-            ;
-          pos = builtins.unsafeGetAttrPos "version" args;
+      kernel = (callPackage ./build.nix { inherit lib stdenv buildPackages; }) {
+        inherit
+          pname
+          version
+          src
+          kernelPatches
+          randstructSeed
+          extraMakeFlags
+          extraMeta
+          configfile
+          modDirVersion
+          ;
+        pos = builtins.unsafeGetAttrPos "version" args;
 
-          config = {
-            CONFIG_MODULES = "y";
-            CONFIG_FW_LOADER = "y";
-            CONFIG_RUST = if withRust then "y" else "n";
-          };
-        }
-      );
+        config = {
+          CONFIG_MODULES = "y";
+          CONFIG_FW_LOADER = "y";
+          CONFIG_RUST = if withRust then "y" else "n";
+        };
+      };
 
     in
     kernel.overrideAttrs (
@@ -327,7 +309,6 @@ let
         passthru =
           previousAttrs.passthru or { }
           // extraPassthru
-          // basicArgs
           // {
             features = kernelFeatures;
             inherit
diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f9138a4b60ed..cc9aa8113806 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,11 +2,11 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.43-hardened1.patch",
-            "sha256": "10hp4718agz7bj4wnis7g1c8ahnwn5917a5v88y9iwawrjm9148v",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.43-hardened1/linux-hardened-v6.12.43-hardened1.patch"
+            "name": "linux-hardened-v6.12.56-hardened1.patch",
+            "sha256": "1s6z7ypkrvd0da5k8wjyidbsi33mgsrj7813nsblrfcs50f65wi4",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.56-hardened1/linux-hardened-v6.12.56-hardened1.patch"
         },
-        "sha256": "1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg",
-        "version": "6.12.43"
+        "sha256": "15pclwn3nbwccdfwcqd3lkmdxwpjkmadhj63acqbzxsjycm2nhsm",
+        "version": "6.12.56"
     }
 }
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index e40d19fac90b..bcbd01d44244 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,47 +1,37 @@
 {
     "testing": {
-        "version": "6.18-rc1",
-        "hash": "sha256:1warfcvr86as1rcls3g5f9i4az6xqabjwmf6jxlx9dk2l523sl1l",
+        "version": "6.18-rc3",
+        "hash": "sha256:01cjjg23av5p8hxbqwfz4jbl0rzm3d1ldibapqcbkkxfcjri612n",
         "lts": false
     },
     "6.1": {
-        "version": "6.1.156",
-        "hash": "sha256:13i2l04pmba7dksz2p5kwxgr5bydc5lp7284d4wfsnjf425i9fyl",
+        "version": "6.1.158",
+        "hash": "sha256:1nmz4rknw82k9ylyrbm4g2m0hh4lmgkwi1g3gm7hzv04nvyqn1md",
         "lts": true
     },
     "5.15": {
-        "version": "5.15.194",
-        "hash": "sha256:0zi6ihvjmaf940arnc7jjvdqrjf3cvkc9mqc8n24dz85vam6z39l",
+        "version": "5.15.196",
+        "hash": "sha256:018ffzi91xh46l7r3fgc4mpri3pxzl6wc1n946vny0lbb59pj5c3",
         "lts": true
     },
     "5.10": {
-        "version": "5.10.245",
-        "hash": "sha256:17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk",
-        "lts": true
-    },
-    "5.4": {
-        "version": "5.4.300",
-        "hash": "sha256:0nl1l689d4jq2l39v816yy7z5lzc5dvv8aqn85xlv4najc022jcr",
+        "version": "5.10.246",
+        "hash": "sha256:0xd8r8qqgxh3zhqkl4a5plmgsycxrffhpc9q2rwhkp6jd717cszb",
         "lts": true
     },
     "6.6": {
-        "version": "6.6.112",
-        "hash": "sha256:08la2f8w5w2x0l9nmvzsmbwa951xyshhvdhwwhfyjmka66zr4zbc",
+        "version": "6.6.116",
+        "hash": "sha256:07d5629579apc1d8yb0ki226iyb5n3lwp1yw0p189qlvq919g9d9",
         "lts": true
     },
     "6.12": {
-        "version": "6.12.53",
-        "hash": "sha256:1df0sahirxsby2imsbi04vcn2bimskl4l2r19v7sywz6ran0fdb6",
+        "version": "6.12.57",
+        "hash": "sha256:06jlsawz1wgk13gyxphkglb8a4iiwg0vg5hrfc7bj1s6gk1s2p0n",
         "lts": true
     },
-    "6.16": {
-        "version": "6.16.12",
-        "hash": "sha256:0vm257d76hmimnac8hzg66gd1mdg330sai39lywfn4m9bjydx93w",
-        "lts": false
-    },
     "6.17": {
-        "version": "6.17.3",
-        "hash": "sha256:16cld01iwn6hhayxh6f0z71rph0z3p3m4bsd49szddd5v0cqdk1y",
+        "version": "6.17.7",
+        "hash": "sha256:03lxl2p8hvi4hdzbf72v3xh8yigr58826dmy6rqxbq9r8h6ymwnx",
         "lts": false
     }
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index a4019bd33645..85fb35f38dbf 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.10.240-rt134"; # updated by ./update-rt.sh
+  version = "5.10.245-rt139"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -25,7 +25,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d";
+      hash = "sha256-Ex516xTab9aDs4grzYVghc/KR8waqJzS3rG0jSLSnZ8=";
     };
 
     kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0f2wq6w0707qn798a9lk7r31mfmdll6xwnxq8fy86574gl08ah79";
+            hash = "sha256-0/8We7wtj6Y3oMDdkLzmpuOz0kiY4RlWZeUcxy7UDds=";
           };
         };
       in
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index c930d86de797..a694cf30d818 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.15.189-rt87"; # updated by ./update-rt.sh
+  version = "5.15.195-rt90"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73";
+      hash = "sha256-I9CA3DL5nTk5w9G9ZaaO2FuPk0+SzBhBpj+Jjc25pEE=";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "151vznvdcdmjsjsz3b4hfxw1v2jyigrh34k2qyxk3fkqg999fx9w";
+            hash = "sha256-RdymUTnItL0Vi8Vt5j1lAlX/hxp6+Ka+oPBgD9agwZY=";
           };
         };
       in
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
deleted file mode 100644
index e855b51903ee..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  buildLinux,
-  fetchurl,
-  kernelPatches ? [ ],
-  structuredExtraConfig ? { },
-  extraMeta ? { },
-  argsOverride ? { },
-  ...
-}@args:
-
-let
-  version = "5.4.296-rt100"; # updated by ./update-rt.sh
-  branch = lib.versions.majorMinor version;
-  kversion = builtins.elemAt (lib.splitString "-" version) 0;
-in
-buildLinux (
-  args
-  // {
-    inherit version;
-    pname = "linux-rt";
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx";
-    };
-
-    kernelPatches =
-      let
-        rt-patch = {
-          name = "rt";
-          patch = fetchurl {
-            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0ggmgkhmnvx4xxb3smfdcafqr9m3qdyc40xp3h7586p4n3wwpw9d";
-          };
-        };
-      in
-      [ rt-patch ] ++ kernelPatches;
-
-    structuredExtraConfig =
-      with lib.kernel;
-      {
-        PREEMPT_RT = yes;
-        # Fix error: unused option: PREEMPT_RT.
-        EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
-        # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
-        PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
-        # Fix error: unused option: RT_GROUP_SCHED.
-        RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
-      }
-      // structuredExtraConfig;
-
-    isLTS = true;
-
-    extraMeta = extraMeta // {
-      inherit branch;
-    };
-  }
-  // argsOverride
-)
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index 355a3a106199..25ee763a96b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "6.1.146-rt53"; # updated by ./update-rt.sh
+  version = "6.1.156-rt56"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv";
+      hash = "sha256-1LsUiyBOWu04aQSJc2lhza+SX+ezXPH1bEetegmgIo4=";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1kz416nc8hd2pi87l9k496r2lig07dbapyh701lq81rilbzx9nmc";
+            hash = "sha256-kyTBYH+sQ55AJOzUER7xqnuA5KVFgEhHWC9ToniBquo=";
           };
         };
       in
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index 5df3a1097066..d6783e3f3fe4 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "6.6.101-rt59"; # updated by ./update-rt.sh
+  version = "6.6.112-rt63"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc";
+      hash = "sha256-bH2SvzFqVukd5By2DaH2PZSk+Kr672oTBV3wwpETiiI=";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0w71nl8s0npcz6x3qavl5j3vcqwd5wcqx4dj5ck2qs7bzv9kbrwb";
+            hash = "sha256-bv3jejZ2fitvGLzlpmUpWojC1TSf1o6Yd9hBUihv4gc=";
           };
         };
       in
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 36a70941f046..a41ae39b7eac 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -160,6 +160,8 @@ lib.makeOverridable (
         isModular = config.isYes "MODULES";
         withRust = config.isYes "RUST";
 
+        target = kernelConf.target or "vmlinux";
+
         buildDTBs = kernelConf.DTB or false;
 
         # Dependencies that are required to build kernel modules
@@ -332,7 +334,7 @@ lib.makeOverridable (
 
         buildFlags = [
           "KBUILD_BUILD_VERSION=1-NixOS"
-          kernelConf.target
+          target
           "vmlinux" # for "perf" and things like that
           "scripts_gdb"
         ]
@@ -413,14 +415,10 @@ lib.makeOverridable (
         # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
         installTargets = [
           (kernelConf.installTarget or (
-            if kernelConf.target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
+            if target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
               "uinstall"
             else if
-              (
-                kernelConf.target == "zImage"
-                || kernelConf.target == "Image.gz"
-                || kernelConf.target == "vmlinuz.efi"
-              )
+              (target == "zImage" || target == "Image.gz" || target == "vmlinuz.efi")
               && builtins.elem stdenv.hostPlatform.linuxArch [
                 "arm"
                 "arm64"
@@ -575,7 +573,6 @@ lib.makeOverridable (
           "fortify"
           "stackprotector"
           "pic"
-          "pie"
         ];
 
         makeFlags = [
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ddda525e70b0..6719de2e3468 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -57,7 +57,7 @@
         in
         {
           name = lib.removeSuffix ".patch" src.name;
-          patch = fetchurl (lib.filterAttrs (k: v: k != "extra") src);
+          patch = fetchurl (lib.removeAttrs src [ "extra" ]);
           extra = src.extra;
           inherit version sha256;
         };
diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh
index a9e0577fae92..38221e97716f 100755
--- a/pkgs/os-specific/linux/kernel/update-rt.sh
+++ b/pkgs/os-specific/linux/kernel/update-rt.sh
@@ -55,8 +55,8 @@ update-if-needed() {
         echo "$nixattr: $cur (up-to-date)"
         return
     fi
-    khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz")
-    phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz")
+    khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz" | nix-hash --type sha256 --to-sri)
+    phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz" | nix-hash --type sha256 --to-sri)
     if [ "$cur" ]; then
         msg="$nixattr: $cur -> $new"
     else
@@ -69,8 +69,8 @@ update-if-needed() {
     sed -i "$file" \
         -e "s/$cur/$new/" \
         -e "s|kernel/v[0-9]*|kernel/v$major|" \
-        -e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \
-        -e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/"
+        -e "1,/.patch.xz/ s|hash = .*|hash = \"$khash\";|" \
+        -e "1,/.patch.xz/! s|hash = .*|hash = \"$phash\";|"
     if [ "${COMMIT:-}" ]; then
         git add "$file"
         git commit -m "$msg"
diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 6ccf978c9517..31efe591f324 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,14 +15,14 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.51";
-      hash = "sha256-7fIOQ7VctDhueoOnZA8/7Dc7gxAl+vKgO/X5Oa4Z8kE=";
+      version = "6.12.57";
+      hash = "sha256-4TEz29I/GEvDXJd8WEMZAiPyKYbVl7gB8OCYr+bJm0Q=";
       isLTS = true;
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.16.11";
-      hash = "sha256-EZjH22q8JvlbFpab4rdrA24kf+r9heneiwy5YM4WfYk=";
+      version = "6.17.7";
+      hash = "sha256-MEAKPUcUmWJCvEf5DNG8JA4jJfQtitMVv/Fc/KNEz2Y=";
     };
   };
 
@@ -47,32 +47,52 @@ let
           inherit hash;
         };
 
-        structuredExtraConfig = with lib.kernel; {
-          # CPUFreq governor Performance
-          CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
-          CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
+        structuredExtraConfig =
+          with lib.kernel;
+          {
+            # CPUFreq governor Performance
+            CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
+            CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
 
-          # Full preemption
-          PREEMPT = lib.mkOverride 60 yes;
-          PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
+            # Preemption
+            PREEMPT = lib.mkOverride 60 yes;
+            PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
 
-          # Google's BBRv3 TCP congestion Control
-          TCP_CONG_BBR = yes;
-          DEFAULT_BBR = yes;
+            # Google's BBRv3 TCP congestion Control
+            TCP_CONG_BBR = yes;
+            DEFAULT_BBR = yes;
 
-          # Preemptive Full Tickless Kernel at 250Hz
-          HZ = freeform "250";
-          HZ_250 = yes;
-          HZ_1000 = no;
+            # Preemptive tickless idle kernel
+            HZ = freeform "250";
+            HZ_250 = yes;
+            NO_HZ = no;
+            NO_HZ_FULL = lib.mkOverride 60 no;
+            NO_HZ_IDLE = yes;
 
-          # RCU_BOOST and RCU_EXP_KTHREAD
-          RCU_EXPERT = yes;
-          RCU_FANOUT = freeform "64";
-          RCU_FANOUT_LEAF = freeform "16";
-          RCU_BOOST = yes;
-          RCU_BOOST_DELAY = freeform "0";
-          RCU_EXP_KTHREAD = yes;
-        };
+            # CPU idle governors favored
+            CPU_IDLE_GOV_HALTPOLL = yes; # Already enabled
+            CPU_IDLE_GOV_LADDER = yes;
+            CPU_IDLE_GOV_TEO = yes;
+
+            # RCU_BOOST and RCU_EXP_KTHREAD
+            RCU_EXPERT = yes;
+            RCU_FANOUT = freeform "64";
+            RCU_FANOUT_LEAF = freeform "16";
+            RCU_BOOST = yes;
+            RCU_BOOST_DELAY = freeform "0";
+            RCU_EXP_KTHREAD = yes;
+            RCU_NOCB_CPU = yes;
+            RCU_DOUBLE_CHECK_CB_TIME = yes;
+
+            # x86 features
+            X86_FRED = yes;
+            X86_POSTED_MSI = yes;
+          }
+          // lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor version) "6.13") {
+            # Lazy preemption
+            PREEMPT = lib.mkOverride 70 no;
+            PREEMPT_LAZY = yes;
+          };
 
         extraPassthru.updateScript = {
           command = [
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 8c8b0afeeacd..1c0435d1306f 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,16 +16,16 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.17.2"; # zen
+      version = "6.17.7"; # zen
       suffix = "zen1"; # zen
-      sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen
+      sha256 = "01dh7cdqa4rx0fmr22yyn8d6qb8ns7v0x53k2ij3vrp9pz6p5cs4"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.16.11"; # lqx
+      version = "6.17.7"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "12azycvaj300gll8adrqcln6qngfx3kr0dz7g91zr40ldf3s4nvg"; # lqx
+      sha256 = "0cp625hcli2grmmkxfrja71slfl2j1pqds74a56sbx7irk82zwdh"; # lqx
       isLqx = true;
     };
   };
diff --git a/pkgs/os-specific/linux/lenovo-legion/app.nix b/pkgs/os-specific/linux/lenovo-legion/app.nix
index afc1e5c3760e..472947f1b0dd 100644
--- a/pkgs/os-specific/linux/lenovo-legion/app.nix
+++ b/pkgs/os-specific/linux/lenovo-legion/app.nix
@@ -4,12 +4,14 @@
   xorg,
   wrapQtAppsHook,
   python3,
+  nix-update-script,
+  qtbase,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "lenovo-legion-app";
-  version = "0.0.21-unstable-2025-07-11";
-  format = "setuptools";
+  version = "0.0.20-unstable-2025-07-11";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "johnfanv2";
@@ -20,10 +22,14 @@ python3.pkgs.buildPythonApplication rec {
 
   sourceRoot = "${src.name}/python/legion_linux";
 
-  nativeBuildInputs = [ wrapQtAppsHook ];
+  build-system = with python3.pkgs; [
+    setuptools
+    wrapQtAppsHook
+  ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
     pyqt6
+    qtbase
     argcomplete
     pillow
     pyyaml
@@ -52,11 +58,13 @@ python3.pkgs.buildPythonApplication rec {
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
 
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
   meta = {
     description = "Utility to control Lenovo Legion laptop";
     homepage = "https://github.com/johnfanv2/LenovoLegionLinux";
     license = lib.licenses.gpl2Only;
-    platforms = lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = with lib.maintainers; [
       ulrikstrid
       logger
diff --git a/pkgs/os-specific/linux/lenovo-legion/default.nix b/pkgs/os-specific/linux/lenovo-legion/default.nix
index 006d929bd8a3..22a33305043c 100644
--- a/pkgs/os-specific/linux/lenovo-legion/default.nix
+++ b/pkgs/os-specific/linux/lenovo-legion/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     description = "Linux kernel module for controlling fan and power in Lenovo Legion laptops";
     homepage = "https://github.com/johnfanv2/LenovoLegionLinux";
     license = lib.licenses.gpl2Only;
-    platforms = lib.platforms.linux;
+    platforms = [ "x86_64-linux" ];
     maintainers = [ lib.maintainers.ulrikstrid ];
     broken = kernel.kernelOlder "5.15";
   };
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index e5c480935230..c357a3e7ebdc 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -28,7 +28,6 @@
   multipath-tools,
   nixosTests,
   buildFHSEnv,
-  recurseIntoAttrs,
 }:
 
 # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well
@@ -224,7 +223,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     installer = nixosTests.installer.lvm;
-    lvm2 = recurseIntoAttrs nixosTests.lvm2;
+    lvm2 = lib.recurseIntoAttrs nixosTests.lvm2;
 
     # https://github.com/NixOS/nixpkgs/issues/369732
     lvm2-fhs-env = buildFHSEnv {
diff --git a/pkgs/os-specific/linux/mdio-netlink/default.nix b/pkgs/os-specific/linux/mdio-netlink/default.nix
new file mode 100644
index 000000000000..3e63364f5b8e
--- /dev/null
+++ b/pkgs/os-specific/linux/mdio-netlink/default.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  stdenv,
+  kernel,
+  mdio-tools,
+}:
+
+stdenv.mkDerivation {
+  pname = "mdio-netlink";
+  version = "${mdio-tools.version}-${kernel.version}";
+
+  inherit (mdio-tools) src;
+  sourceRoot = "source/kernel";
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = kernel.commonMakeFlags ++ [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "INSTALL_MOD_PATH=${placeholder "out"}"
+  ];
+
+  meta = {
+    description = "Netlink support for MDIO devices";
+    homepage = "https://github.com/wkz/mdio-tools";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.jmbaur ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix
index 9056e6132a92..81d2930a622d 100644
--- a/pkgs/os-specific/linux/msi-ec/default.nix
+++ b/pkgs/os-specific/linux/msi-ec/default.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation {
   pname = "msi-ec-kmods";
-  version = "0-unstable-2025-05-17";
+  version = "0-unstable-2025-09-17";
 
   src = fetchFromGitHub {
     owner = "BeardOverflow";
     repo = "msi-ec";
-    rev = "796be9047b13c311ac4cdec33913775f4057f600";
-    hash = "sha256-npJbnWFBVb8TK9ynVD/kXWq2iqO0ACKF4UYsu5mQuok=";
+    rev = "ed92e2eb0005ab815f5492c8cb02495289263738";
+    hash = "sha256-9jynXUvSZT2smyciK8GqojC/4MtxtqfQvJcf5RgPXKY=";
   };
 
   dontMakeSourcesWritable = false;
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Plus;
     maintainers = [ lib.maintainers.m1dugh ];
     platforms = lib.platforms.linux;
-    broken = kernel.kernelOlder "5.5";
+    broken = kernel.kernelOlder "6.5";
   };
 }
diff --git a/pkgs/os-specific/linux/msi-ec/patches/makefile.patch b/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
index 0ed29887b3d4..c54a649efe27 100644
--- a/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
+++ b/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
@@ -1,12 +1,12 @@
 diff --git a/Makefile b/Makefile
-index bffcbd4..fd1d8a3 100644
+index 9e598ea..0776132 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,6 +1,7 @@
- VERSION         := 0.08
+ VERSION         := 0.12
  DKMS_ROOT_PATH  := /usr/src/msi_ec-$(VERSION)
- TARGET ?= $(shell uname -r)
-+KERNELDIR ?= /lib/modules/$(TARGET)/build/
+ KERNELRELEASE ?= $(shell uname -r)
++KERNELDIR ?= /lib/modules/$(KERNELRELEASE)/build/
  
  ccflags-y := -std=gnu11 -Wno-declaration-after-statement
  
@@ -14,11 +14,11 @@ index bffcbd4..fd1d8a3 100644
  all: modules
  
  modules:
--	@$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) modules
+-	@$(MAKE) -C /lib/modules/$(KERNELRELEASE)/build M=$(CURDIR) modules
 +	@$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
  
  clean:
- 	@$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) clean
+ 	@$(MAKE) -C /lib/modules/$(KERNELRELEASE)/build M=$(CURDIR) clean
  
 +modules_install:
 +	@$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules_install
diff --git a/pkgs/os-specific/linux/nullfs/default.nix b/pkgs/os-specific/linux/nullfs/default.nix
index ea67b3a31e09..b8c373e67207 100644
--- a/pkgs/os-specific/linux/nullfs/default.nix
+++ b/pkgs/os-specific/linux/nullfs/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "nullfs";
-  version = "0.20";
+  version = "0.21";
 
   src = fetchFromGitHub {
     owner = "abbbi";
     repo = "nullfsvfs";
     rev = "v${version}";
-    sha256 = "sha256-JFqZHS1SR4vf724UWYtNZLhSsl6+/5MBkI/PgrLzSLA=";
+    sha256 = "sha256-csEfgXOXrFgWcyKmxEPKi33M7nVVI2hE+YGXMe4vdFE=";
   };
 
   hardeningDisable = [ "pic" ];
diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 7c58fb9fee8a..a2251de32197 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -50,8 +50,8 @@ let
   # Source corresponding to https://aur.archlinux.org/packages/nvidia-390xx-dkms
   aurPatches = fetchgit {
     url = "https://aur.archlinux.org/nvidia-390xx-utils.git";
-    rev = "94dffc01e23a93c354a765ea7ac64484a3ef96c1";
-    hash = "sha256-c94qXNZyMrSf7Dik7jvz2ECaGELqN7WEYNpnbUkzeeU=";
+    rev = "cf1a1c571c425b4b66d12e468fc4ce45a397c583";
+    hash = "sha256-SERB5ihOroagJn7apAiqjUckbrfP2FZPCuTLWcBccoM=";
   };
 
   # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/840
@@ -101,11 +101,11 @@ rec {
   # Vulkan developer beta driver
   # See here for more information: https://developer.nvidia.com/vulkan-driver
   vulkan_beta = generic rec {
-    version = "580.94.03";
+    version = "580.94.06";
     persistencedVersion = "580.95.05";
     settingsVersion = "580.95.05";
-    sha256_64bit = "sha256-RYU50xfIyrvk57o7/SIsVr34nkLaMm5WZPXQfWTreIE=";
-    openSha256 = "sha256-PEHr6heOBP+0JjcmUpDv6JlT0aAvzoWijsEsm/DD3rs=";
+    sha256_64bit = "sha256-UtOthZ5h/UN5dMSrO2MFwWktLRiW6LE5VR1yg04D/bE=";
+    openSha256 = "sha256-mti+bJ1EyZnjAxdJtJQuyLWNKs7R+NJiBy1y+c2cqBQ=";
     settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=";
     persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=";
     url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";
@@ -166,26 +166,39 @@ rec {
   };
 
   # Last one supporting Kepler architecture
-  legacy_470 = generic {
-    version = "470.256.02";
-    sha256_64bit = "sha256-1kUYYt62lbsER/O3zWJo9z6BFowQ4sEFl/8/oBNJsd4=";
-    sha256_aarch64 = "sha256-e+QvE+S3Fv3JRqC9ZyxTSiCu8gJdZXSz10gF/EN6DY0=";
-    settingsSha256 = "sha256-kftQ4JB0iSlE8r/Ze/+UMnwLzn0nfQtqYXBj+t6Aguk=";
-    persistencedSha256 = "sha256-iYoSib9VEdwjOPBP1+Hx5wCIMhW8q8cCHu9PULWfnyQ=";
+  legacy_470 =
+    let
+      # Source corresponding to https://aur.archlinux.org/packages/nvidia-470xx-dkms
+      aurPatches = fetchgit {
+        url = "https://aur.archlinux.org/nvidia-470xx-utils.git";
+        rev = "7c1c2c124147d960a6c7114eb26a4eadae9b9f3d";
+        hash = "sha256-sNW+I4dkPSudfORLEp1RNGHyQKWBYnBEeGrfJU7SYTs=";
+      };
+    in
+    generic {
+      version = "470.256.02";
+      sha256_64bit = "sha256-1kUYYt62lbsER/O3zWJo9z6BFowQ4sEFl/8/oBNJsd4=";
+      sha256_aarch64 = "sha256-e+QvE+S3Fv3JRqC9ZyxTSiCu8gJdZXSz10gF/EN6DY0=";
+      settingsSha256 = "sha256-kftQ4JB0iSlE8r/Ze/+UMnwLzn0nfQtqYXBj+t6Aguk=";
+      persistencedSha256 = "sha256-iYoSib9VEdwjOPBP1+Hx5wCIMhW8q8cCHu9PULWfnyQ=";
 
-    patches = [
-      "${aurPatches}/gcc-14.patch"
-      # fixes 6.10 follow_pfn
-      ./follow_pfn.patch
-      # https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e
-      (fetchpatch {
-        url = "https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e/raw/6bae5606c033b6c6c08233523091992370e357b7/nvidia-470xx-fix-linux-6.12.patch";
-        hash = "sha256-6nbzcRTRCxW8GDAhB8Zwx9rVcCzwPtVYlqoUhL9gxlY=";
-        stripLen = 1;
-        extraPrefix = "kernel/";
-      })
-    ];
-  };
+      patches = map (patch: "${aurPatches}/${patch}") [
+        "0001-Fix-conftest-to-ignore-implicit-function-declaration.patch"
+        "0002-Fix-conftest-to-use-a-short-wchar_t.patch"
+        "0003-Fix-conftest-to-use-nv_drm_gem_vmap-which-has-the-se.patch"
+        "nvidia-470xx-fix-gcc-15.patch"
+        "kernel-6.10.patch"
+        "kernel-6.12.patch"
+        "nvidia-470xx-fix-linux-6.13.patch"
+        "nvidia-470xx-fix-linux-6.14.patch"
+        "nvidia-470xx-fix-linux-6.15.patch"
+        "nvidia-470xx-fix-linux-6.17.patch"
+      ];
+      patchFlags = [
+        "-p1"
+        "--directory=kernel"
+      ];
+    };
 
   # Last one supporting x86
   legacy_390 = generic {
@@ -206,8 +219,13 @@ rec {
       "gcc-14.patch"
       "kernel-6.10.patch"
       "kernel-6.12.patch"
+      "kernel-6.13.patch"
+      "kernel-6.14.patch"
+      "gcc-15.patch"
+      "kernel-6.15.patch"
+      "kernel-6.17.patch"
     ];
-    broken = kernel.kernelAtLeast "6.13";
+    broken = kernel.kernelAtLeast "6.18";
 
     # fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
     # see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
index 9880425393dd..4d4e61a5942f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
@@ -26,11 +26,6 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
   installPhase = ''
     mkdir -p $out/{bin,share/nvidia-fabricmanager}
     for bin in nv{-fabricmanager,switch-audit};do
diff --git a/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch b/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch
deleted file mode 100644
index 19026229bd1d..000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ruNb a/kernel/conftest.sh b/kernel/conftest.sh
---- a/kernel/conftest.sh        2024-07-19 04:36:26.183701185 -0500
-+++ b/kernel/conftest.sh        2024-07-19 04:36:26.230366381 -0500
-@@ -4464,20 +4464,22 @@
-             compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types"
-         ;;
-
--        unsafe_follow_pfn)
-+        follow_pfn)
-             #
--            # Determine if unsafe_follow_pfn() is present.
-+            # Determine if follow_pfn() is present.
-             #
--            # unsafe_follow_pfn() was added by commit 69bacee7f9ad
--            # ("mm: Add unsafe_follow_pfn") in v5.13-rc1.
-+            # follow_pfn() was added by commit 3b6748e2dd69
-+            # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed
-+            # by commit 233eb0bf3b94 ("mm: remove follow_pfn")
-+            # from linux-next 233eb0bf3b94.
-             #
-             CODE="
-             #include <linux/mm.h>
--            void conftest_unsafe_follow_pfn(void) {
--                unsafe_follow_pfn();
-+            void conftest_follow_pfn(void) {
-+                follow_pfn();
-             }"
-
--            compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions"
-+            compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
-         ;;
-
-         drm_plane_atomic_check_has_atomic_state_arg)
-diff -ruNb a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild
---- a/kernel/nvidia/nvidia.Kbuild       2022-10-12 04:29:57.000000000 -0500
-+++ b/kernel/nvidia/nvidia.Kbuild       2024-07-19 05:17:39.148448922 -0500
-@@ -164,7 +164,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += iterate_fd
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += sg_page_iter_page
--NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_close_on_exec
-diff -ruNb a/kernel/nvidia/os-mlock.c b/kernel/nvidia/os-mlock.c
---- a/kernel/nvidia/os-mlock.c  2022-10-12 04:30:26.000000000 -0500
-+++ b/kernel/nvidia/os-mlock.c  2024-07-19 04:36:26.230366381 -0500
-@@ -18,10 +18,10 @@
-                                 unsigned long address,
-                                 unsigned long *pfn)
- {
--#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
--    return unsafe_follow_pfn(vma, address, pfn);
--#else
-+#if defined(NV_FOLLOW_PFN_PRESENT)
-     return follow_pfn(vma, address, pfn);
-+#else
-+    return -1;
- #endif
- }
\ No newline at end of file
diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index 1ee127f15b80..30ae0ba4543d 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -8,24 +8,21 @@
   qtgraphicaleffects,
   wrapQtAppsHook,
   udevCheckHook,
+  versionCheckHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "projecteur";
   version = "0.10";
 
   src = fetchFromGitHub {
     owner = "jahnf";
     repo = "Projecteur";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = false;
     hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
   };
 
-  postPatch = ''
-    sed '1i#include <array>' -i src/device.h # gcc12
-  '';
-
   buildInputs = [
     qtbase
     qtgraphicaleffects
@@ -38,14 +35,16 @@ mkDerivation rec {
     udevCheckHook
   ];
 
-  doInstallCheck = true;
-
   cmakeFlags = [
     "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}"
     "-DPACKAGE_TARGETS=OFF"
     "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d"
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)";
     homepage = "https://github.com/jahnf/Projecteur";
@@ -56,4 +55,4 @@ mkDerivation rec {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index 12b10c58c598..f12a7636ffbd 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-09-05";
+  version = "0-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "bb0ed9d5709afd30e928d2d11f7b650e03c8c72b";
-    hash = "sha256-ySIj9ZSIwdsn3WDFZ48xUGTFLA1BMU+hjvpDwifq4k4=";
+    rev = "9bc8fecb61d4ad59e46b4dbd003d60ef2d8437a8";
+    hash = "sha256-/nA0U1Ry+xt4F4GC9ymMDFhkiHAqeodv7uUXAaALmdg=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix
index f8d0dbf72f53..2383882a226e 100644
--- a/pkgs/os-specific/linux/scx/default.nix
+++ b/pkgs/os-specific/linux/scx/default.nix
@@ -1,41 +1,10 @@
 {
   lib,
   callPackage,
-  fetchFromGitHub,
 }:
-let
-  scx-common = rec {
-    versionInfo = lib.importJSON ./version.json;
 
-    inherit (versionInfo.scx) version;
-
-    src = fetchFromGitHub {
-      owner = "sched-ext";
-      repo = "scx";
-      tag = "v${versionInfo.scx.version}";
-      inherit (versionInfo.scx) hash;
-    };
-
-    meta = {
-      homepage = "https://github.com/sched-ext/scx";
-      changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}";
-      license = lib.licenses.gpl2Only;
-      platforms = lib.platforms.linux;
-      badPlatforms = [ "aarch64-linux" ];
-      maintainers = with lib.maintainers; [
-        johnrtitor
-        Gliczy
-      ];
-    };
-  };
-
-  schedulers = lib.mergeAttrsList [
-    { cscheds = import ./scx_cscheds.nix; }
-    { rustscheds = import ./scx_rustscheds.nix; }
-    { full = import ./scx_full.nix; }
-  ];
-in
-(lib.mapAttrs (name: scheduler: callPackage scheduler { inherit scx-common; }) schedulers)
-// {
-  inherit scx-common;
+lib.mapAttrs (name: scheduler: callPackage scheduler { }) {
+  cscheds = import ./scx_cscheds.nix;
+  rustscheds = import ./scx_rustscheds.nix;
+  full = import ./scx_full.nix;
 }
diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index a487493bad5b..c9f419c59b3c 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -1,76 +1,30 @@
 {
-  lib,
   llvmPackages,
-  fetchFromGitHub,
-  writeShellScript,
-  bash,
-  meson,
-  ninja,
-  jq,
+  libbpf,
   pkg-config,
   bpftools,
   elfutils,
   zlib,
   zstd,
-  scx-common,
-  protobuf,
+  scx,
   libseccomp,
 }:
 
-llvmPackages.stdenv.mkDerivation (finalAttrs: {
+llvmPackages.stdenv.mkDerivation {
   pname = "scx_cscheds";
-  inherit (scx-common) version src;
-
-  # scx needs specific commits of bpftool and libbpf
-  # can be found in meson.build of scx src
-  # grep 'bpftool_commit =' ./meson.build
-  bpftools_src = fetchFromGitHub {
-    owner = "libbpf";
-    repo = "bpftool";
-    inherit (scx-common.versionInfo.bpftool) rev hash;
-    fetchSubmodules = true;
-  };
-  # grep 'libbpf_commit = ' ./meson.build
-  libbpf_src = fetchFromGitHub {
-    owner = "libbpf";
-    repo = "libbpf";
-    inherit (scx-common.versionInfo.libbpf) rev hash;
-    fetchSubmodules = true;
-  };
-
-  # this imitates the fetch_bpftool and fetch_libbpf script in src/meson-scripts
-  fetchBpftool = writeShellScript "fetch_bpftool" ''
-    [ "$2" == '${finalAttrs.bpftools_src.rev}' ] || exit 1
-    cd "$1"
-    cp --no-preserve=mode,owner -r "${finalAttrs.bpftools_src}/" ./bpftool
-  '';
-  fetchLibbpf = writeShellScript "fetch_libbpf" ''
-    [ "$2" == '${finalAttrs.libbpf_src.rev}' ] || exit 1
-    cd "$1"
-    cp --no-preserve=mode,owner -r "${finalAttrs.libbpf_src}/" ./libbpf
-    mkdir -p ./libbpf/src/usr/include
-  '';
+  inherit (scx.rustscheds) version src;
 
   postPatch = ''
-    rm meson-scripts/fetch_bpftool meson-scripts/fetch_libbpf
-    patchShebangs ./meson-scripts
-    cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool
-    cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
-    substituteInPlace ./meson-scripts/build_bpftool \
-      --replace-fail '/bin/bash' '${lib.getExe bash}'
+    substituteInPlace ./scheds/c/Makefile \
+      --replace-fail '/usr/local' '${placeholder "out"}'
   '';
 
   nativeBuildInputs = [
-    meson
-    ninja
-    jq
     pkg-config
     zstd
-    protobuf
-    llvmPackages.libllvm
-  ]
-  ++ bpftools.buildInputs
-  ++ bpftools.nativeBuildInputs;
+    bpftools
+    libbpf
+  ];
 
   buildInputs = [
     elfutils
@@ -78,37 +32,21 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     libseccomp
   ];
 
-  mesonFlags = [
-    (lib.mapAttrsToList lib.mesonEnable {
-      # systemd unit is implemented in the nixos module
-      # upstream systemd files are a hassle to patch
-      "systemd" = false;
-      # not for nix
-      "openrc" = false;
-    })
-    (lib.mapAttrsToList lib.mesonBool {
-      # needed libs are already fetched as FOD
-      "offline" = true;
-      # rust based schedulers are built separately
-      "enable_rust" = false;
-    })
-    # Clang to use when compiling .bpf.c
-    (lib.mesonOption "bpf_clang" (lib.getExe llvmPackages.clang))
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
   ];
 
   hardeningDisable = [
-    "stackprotector"
     "zerocallusedregs"
   ];
 
-  outputs = [
-    "bin"
-    "out"
-  ];
-
   doCheck = true;
 
-  meta = scx-common.meta // {
+  passthru = {
+    inherit (scx.rustscheds.passthru) tests;
+  };
+
+  meta = scx.rustscheds.meta // {
     description = "Sched-ext C userspace schedulers";
     longDescription = ''
       This includes C based schedulers such as scx_central, scx_flatcg,
@@ -119,5 +57,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       It is recommended to use the latest kernel for the best compatibility.
       :::
     '';
+    homepage = "https://github.com/sched-ext/scx/tree/main/scheds/c";
   };
-})
+}
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
index f47e92e8b96e..8edcfbee8c70 100644
--- a/pkgs/os-specific/linux/scx/scx_full.nix
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -1,20 +1,13 @@
 {
   lib,
-  stdenv,
-  scx-common,
   scx,
-  nixosTests,
 }:
 scx.cscheds.overrideAttrs (oldAttrs: {
   pname = "scx_full";
   postInstall = (oldAttrs.postInstall or "") + ''
-    cp ${scx.rustscheds}/bin/* ${placeholder "bin"}/bin/
+    cp ${lib.getBin scx.rustscheds}/bin/* ${placeholder "out"}/bin/
   '';
 
-  passthru.tests.basic = nixosTests.scx;
-
-  passthru.updateScript.command = ./update.sh;
-
   meta = oldAttrs.meta // {
     description = "Sched-ext C and Rust userspace schedulers";
     longDescription = ''
@@ -27,5 +20,6 @@ scx.cscheds.overrideAttrs (oldAttrs: {
       It is recommended to use the latest kernel for the best compatibility.
       :::
     '';
+    homepage = "https://github.com/sched-ext/scx";
   };
 })
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index c43bfee59861..87665e5a1c78 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -6,15 +6,24 @@
   elfutils,
   zlib,
   zstd,
-  scx-common,
+  fetchFromGitHub,
   protobuf,
   libseccomp,
+  nix-update-script,
+  nixosTests,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scx_rustscheds";
-  inherit (scx-common) version src;
+  version = "1.0.17";
 
-  inherit (scx-common.versionInfo.scx) cargoHash;
+  src = fetchFromGitHub {
+    owner = "sched-ext";
+    repo = "scx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=";
+  };
+
+  cargoHash = "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE=";
 
   nativeBuildInputs = [
     pkg-config
@@ -39,7 +48,6 @@ rustPlatform.buildRustPackage {
   };
 
   hardeningDisable = [
-    "stackprotector"
     "zerocallusedregs"
   ];
 
@@ -53,7 +61,10 @@ rustPlatform.buildRustPackage {
     "--skip=proc_data::tests::test_thread_operations"
   ];
 
-  meta = scx-common.meta // {
+  passthru.tests.basic = nixosTests.scx;
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Sched-ext Rust userspace schedulers";
     longDescription = ''
       This includes Rust based schedulers such as
@@ -64,5 +75,15 @@ rustPlatform.buildRustPackage {
       It is recommended to use the latest kernel for the best compatibility.
       :::
     '';
+
+    homepage = "https://github.com/sched-ext/scx/tree/main/scheds/rust";
+    changelog = "https://github.com/sched-ext/scx/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    badPlatforms = [ "aarch64-linux" ];
+    maintainers = with lib.maintainers; [
+      johnrtitor
+      Gliczy
+    ];
   };
-}
+})
diff --git a/pkgs/os-specific/linux/scx/update.sh b/pkgs/os-specific/linux/scx/update.sh
deleted file mode 100755
index dd516aebaefd..000000000000
--- a/pkgs/os-specific/linux/scx/update.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils moreutils curl jq nix-prefetch-git cargo gnugrep gawk nix
-# shellcheck shell=bash
-
-# You must run it from the root directory of a nixpkgs repo checkout
-
-set -euo pipefail
-
-versionJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")"
-nixFolder="$(dirname "$versionJson")"
-
-localVer=$(jq -r .scx.version <$versionJson)
-latestVer=$(curl -s https://api.github.com/repos/sched-ext/scx/releases/latest | jq -r .tag_name | sed 's/v//g')
-
-if [ "$localVer" == "$latestVer" ]; then
-  exit 0
-fi
-
-latestHash=$(nix-prefetch-git https://github.com/sched-ext/scx.git --rev refs/tags/v$latestVer --quiet | jq -r .hash)
-
-tmp=$(mktemp -d)
-trap 'rm -rf -- "${tmp}"' EXIT
-
-git clone --depth 1 --branch "v$latestVer" https://github.com/sched-ext/scx.git "$tmp/scx"
-
-pushd "$tmp/scx"
-
-bpftoolRev=$(grep 'bpftool_commit =' ./meson.build | awk -F"'" '{print $2}')
-bpftoolHash=$(nix-prefetch-git https://github.com/libbpf/bpftool.git --rev $bpftoolRev --fetch-submodules --quiet | jq -r .hash)
-
-libbpfRev=$(grep 'libbpf_commit =' ./meson.build | awk -F"'" '{print $2}')
-libbpfHash=$(nix-prefetch-git https://github.com/libbpf/libbpf.git --rev $libbpfRev --fetch-submodules --quiet | jq -r .hash)
-
-jq \
-  --arg latestVer "$latestVer" --arg latestHash "$latestHash" \
-  --arg bpftoolRev "$bpftoolRev" --arg bpftoolHash "$bpftoolHash" \
-  --arg libbpfRev "$libbpfRev" --arg libbpfHash "$libbpfHash" \
-  ".scx.version = \$latestVer | .scx.hash = \$latestHash |\
-  .bpftool.rev = \$bpftoolRev | .bpftool.hash = \$bpftoolHash |\
-  .libbpf.rev = \$libbpfRev | .libbpf.hash = \$libbpfHash" \
-  "$versionJson" | sponge $versionJson
-
-echo "scx: $localVer -> $latestVer"
-
-echo "Updating cargoHash. This may take a while..."
-popd
-cargoHash=$((nix-build --attr scx.rustscheds 2>&1 || true) | awk '/got/{print $2}')
-
-if [ -z "$cargoHash" ]; then
-  echo "Failed to get cargoHash, please update it manually"
-  exit 0
-fi
-
-jq \
-  --arg cargoHash "$cargoHash" \
-  ".scx.cargoHash = \$cargoHash" \
-  "$versionJson" | sponge $versionJson
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
deleted file mode 100644
index f655beec2bb9..000000000000
--- a/pkgs/os-specific/linux/scx/version.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "scx": {
-    "version": "1.0.17",
-    "hash": "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=",
-    "cargoHash": "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE="
-  },
-  "bpftool": {
-    "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
-    "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
-  },
-  "libbpf": {
-    "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",
-    "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="
-  }
-}
diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index 6871364183b5..c087b0c55382 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -9,13 +9,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   name = "shufflecake";
-  version = "0.5.2";
+  version = "0.5.5";
+
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "shufflecake";
     repo = "shufflecake-c";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s=";
+    hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -23,12 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     lvm2
   ];
-  makeFlags = kernelModuleMakeFlags ++ [
-    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  # GCC 14 makes this an error by default, remove when fixed upstream
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  makeFlags =
+    kernelModuleMakeFlags
+    ++ [
+      "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ]
+    # Use wrapped gcc compiler since the unwrapped one fails to find the
+    # headers.
+    ++ lib.optionals stdenv.cc.isGNU [
+      "CC=${stdenv.cc.targetPrefix}cc"
+    ];
 
   outputs = [
     "out"
@@ -40,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm555 shufflecake $bin/shufflecake
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Plausible deniability (hidden storage) layer for Linux";
     homepage = "https://shufflecake.net";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ oluceps ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ oluceps ];
     outputsToInstall = [ "bin" ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     broken = kernel.kernelOlder "6.1" || kernel.meta.name == "linux-lqx-6.12.1";
   };
 })
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 1072c9aa148f..af643a8b6a67 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      inherit (nixosTests) sssd sssd-ldap;
+      inherit (nixosTests) sssd-ldap sssd-legacy-config;
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
     updateScript = nix-update-script { };
diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index d242ff7c9287..02845eb126f6 100644
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -13,7 +13,7 @@ unit.  (However, this ignores the fsck unit, so it's not perfect...)
  1 file changed, 4 deletions(-)
 
 diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index 882cda0dcd..8e8d1f04ce 100644
+index bebc4d7d09..60278a0da7 100644
 --- a/rules.d/99-systemd.rules.in
 +++ b/rules.d/99-systemd.rules.in
 @@ -30,10 +30,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE
@@ -24,6 +24,6 @@ index 882cda0dcd..8e8d1f04ce 100644
 -# we are probably still calling mke2fs or mkswap on it.
 -SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
 -
- # add symlink to GPT root disk
- SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
- SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
+ # Ignore raid devices that are not yet assembled and started
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index 9e3496986859..d1dcbfd37a0f 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -14,10 +14,10 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index d6a256c4a7..f74d5198f1 100644
+index 57ab68deb6..8e281b8f2c 100644
 --- a/src/shared/fstab-util.c
 +++ b/src/shared/fstab-util.c
-@@ -66,6 +66,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
+@@ -72,6 +72,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
          /* Don't bother with the OS data itself */
          if (PATH_IN_SET(mount,
                          "/",
@@ -27,10 +27,10 @@ index d6a256c4a7..f74d5198f1 100644
                          "/etc"))
                  return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 84da5eed63..d6e2f36d52 100644
+index 45c6db9245..d7283b7fa6 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
-@@ -175,8 +175,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
+@@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) {
  static bool nonunmountable_path(const char *path) {
          assert(path);
  
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 7cc2804a05bb..3815c140d495 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 6f90f2f418..74b2a237d3 100644
+index ab8746c442..480a9c55c6 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -6189,6 +6189,7 @@ static int run(int argc, char *argv[]) {
+@@ -6165,6 +6165,7 @@ static int run(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -21,11 +21,11 @@ index 6f90f2f418..74b2a237d3 100644
                          _cleanup_free_ char *p = NULL;
  
                          if (arg_pivot_root_new)
-@@ -6208,6 +6209,7 @@ static int run(int argc, char *argv[]) {
+@@ -6184,6 +6185,7 @@ static int run(int argc, char *argv[]) {
                                  log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
                                  goto finish;
                          }
 +#endif
                  }
  
-         } else {
+                 if (arg_userns_mode == USER_NAMESPACE_MANAGED) {
diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
index 2657eb9089d1..81d17a57fb2f 100644
--- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
@@ -16,10 +16,10 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
  2 files changed, 7 insertions(+), 21 deletions(-)
 
 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index f3b85b0190..f7aa5fca50 100644
+index 58f2463104..0c263430a7 100644
 --- a/src/core/systemd.pc.in
 +++ b/src/core/systemd.pc.in
-@@ -43,10 +43,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
+@@ -46,10 +46,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
  systemd_user_conf_dir=${sysconfdir}/systemd/user
  systemduserconfdir=${systemd_user_conf_dir}
  
@@ -32,7 +32,7 @@ index f3b85b0190..f7aa5fca50 100644
  systemduserunitpath=${systemd_user_unit_path}
  
  systemd_system_generator_dir=${prefix}/lib/systemd/system-generators
-@@ -55,10 +55,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
+@@ -58,10 +58,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
  systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
  systemdusergeneratordir=${systemd_user_generator_dir}
  
@@ -46,10 +46,10 @@ index f3b85b0190..f7aa5fca50 100644
  
  systemd_sleep_dir=${prefix}/lib/systemd/system-sleep
 diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
-index a3b09208cb..91a085c6bc 100644
+index 3ddbda0e9f..3eddc80c90 100644
 --- a/src/libsystemd/sd-path/path-lookup.c
 +++ b/src/libsystemd/sd-path/path-lookup.c
-@@ -69,11 +69,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) {
+@@ -64,11 +64,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) {
  }
  
  static const char* const user_data_unit_paths[] = {
@@ -61,7 +61,7 @@ index a3b09208cb..91a085c6bc 100644
          NULL
  };
  
-@@ -481,16 +477,13 @@ int lookup_paths_init(
+@@ -476,16 +472,13 @@ int lookup_paths_init(
                                         persistent_config,
                                         SYSTEM_CONFIG_UNIT_DIR,
                                         "/etc/systemd/system",
@@ -79,7 +79,7 @@ index a3b09208cb..91a085c6bc 100644
                                         STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -508,13 +501,10 @@ int lookup_paths_init(
+@@ -503,13 +496,10 @@ int lookup_paths_init(
                          add = strv_new(persistent_config,
                                         USER_CONFIG_UNIT_DIR,
                                         "/etc/systemd/user",
@@ -95,7 +95,7 @@ index a3b09208cb..91a085c6bc 100644
                          break;
  
                  case RUNTIME_SCOPE_USER:
-@@ -653,7 +643,6 @@ void lookup_paths_log(LookupPaths *lp) {
+@@ -648,7 +638,6 @@ void lookup_paths_log(LookupPaths *lp) {
  static const char* const system_generator_paths[] = {
          "/run/systemd/system-generators",
          "/etc/systemd/system-generators",
@@ -103,7 +103,7 @@ index a3b09208cb..91a085c6bc 100644
          SYSTEM_GENERATOR_DIR,
          NULL,
  };
-@@ -661,7 +650,6 @@ static const char* const system_generator_paths[] = {
+@@ -656,7 +645,6 @@ static const char* const system_generator_paths[] = {
  static const char* const user_generator_paths[] = {
          "/run/systemd/user-generators",
          "/etc/systemd/user-generators",
@@ -111,7 +111,7 @@ index a3b09208cb..91a085c6bc 100644
          USER_GENERATOR_DIR,
          NULL,
  };
-@@ -669,7 +657,6 @@ static const char* const user_generator_paths[] = {
+@@ -664,7 +652,6 @@ static const char* const user_generator_paths[] = {
  static const char* const system_env_generator_paths[] = {
          "/run/systemd/system-environment-generators",
          "/etc/systemd/system-environment-generators",
@@ -119,7 +119,7 @@ index a3b09208cb..91a085c6bc 100644
          SYSTEM_ENV_GENERATOR_DIR,
          NULL,
  };
-@@ -677,7 +664,6 @@ static const char* const system_env_generator_paths[] = {
+@@ -672,7 +659,6 @@ static const char* const system_env_generator_paths[] = {
  static const char* const user_env_generator_paths[] = {
          "/run/systemd/user-environment-generators",
          "/etc/systemd/user-environment-generators",
diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
index 6c4a41ab0609..2f7139911220 100644
--- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -13,10 +13,10 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 4ccaba9054..9577b89783 100644
+index d85896577f..2a4782a55e 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -1672,7 +1672,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
+@@ -1575,7 +1575,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
                  if (!unit_is_bound_by_inactive(u, &culprit))
                          continue;
  
diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
index 44bd2263ddf0..b43dddb3d420 100644
--- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
  3 files changed, 25 insertions(+)
 
 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index ba50b59f92..9827487453 100644
+index 06fb3f2878..b656e511b7 100644
 --- a/src/hostname/hostnamed.c
 +++ b/src/hostname/hostnamed.c
-@@ -1115,6 +1115,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -1388,6 +1388,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
          if (r < 0)
                  return r;
  
@@ -24,7 +24,7 @@ index ba50b59f92..9827487453 100644
          name = empty_to_null(name);
  
          context_read_etc_hostname(c);
-@@ -1177,6 +1180,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+@@ -1454,6 +1457,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
          if (r < 0)
                  return r;
  
@@ -35,10 +35,10 @@ index ba50b59f92..9827487453 100644
  
          context_read_machine_info(c);
 diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 062744519d..95bde4b1c3 100644
+index 11d9130bbc..dd4d9e59ea 100644
 --- a/src/locale/localed.c
 +++ b/src/locale/localed.c
-@@ -226,6 +226,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
+@@ -221,6 +221,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
  
          use_localegen = locale_gen_check_available();
  
@@ -48,7 +48,7 @@ index 062744519d..95bde4b1c3 100644
          /* If single locale without variable name is provided, then we assume it is LANG=. */
          if (strv_length(l) == 1 && !strchr(l[0], '=')) {
                  if (!locale_is_valid(l[0]))
-@@ -343,6 +346,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
+@@ -338,6 +341,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
          if (r < 0)
                  return bus_log_parse_error(r);
  
@@ -58,7 +58,7 @@ index 062744519d..95bde4b1c3 100644
          vc_context_empty_to_null(&in);
  
          r = vc_context_verify_and_warn(&in, LOG_ERR, error);
-@@ -460,6 +466,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
+@@ -455,6 +461,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
          if (r < 0)
                  return bus_log_parse_error(r);
  
@@ -69,10 +69,10 @@ index 062744519d..95bde4b1c3 100644
  
          r = x11_context_verify_and_warn(&in, LOG_ERR, error);
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index c79bb864df..cbd30214b7 100644
+index 662cc29ac5..57f3413dc6 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -676,6 +676,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
+@@ -678,6 +678,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
          if (r < 0)
                  return r;
  
@@ -83,7 +83,7 @@ index c79bb864df..cbd30214b7 100644
          if (!timezone_is_valid(z, LOG_DEBUG))
                  return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
  
-@@ -754,6 +758,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
+@@ -756,6 +760,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
          if (r < 0)
                  return r;
  
@@ -93,7 +93,7 @@ index c79bb864df..cbd30214b7 100644
          if (lrtc == c->local_rtc && !fix_system)
                  return sd_bus_reply_method_return(m, NULL);
  
-@@ -948,6 +955,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
+@@ -954,6 +961,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
          if (r < 0)
                  return r;
  
diff --git a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 1f4184e92836..21589efdd849 100644
--- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -7,10 +7,10 @@ NixOS uses this path.
 ---
  man/localtime.xml         | 4 ++--
  src/basic/time-util.c     | 8 ++++----
- src/firstboot/firstboot.c | 2 +-
+ src/firstboot/firstboot.c | 9 +++------
  src/nspawn/nspawn.c       | 4 ++--
  src/timedate/timedated.c  | 8 ++++----
- 5 files changed, 13 insertions(+), 13 deletions(-)
+ 5 files changed, 15 insertions(+), 18 deletions(-)
 
 diff --git a/man/localtime.xml b/man/localtime.xml
 index 3a13e04a27..4fd58068a1 100644
@@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644
      <literal>Etc/UTC</literal>. The resulting link should lead to the
      corresponding binary
 diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 29afb08ebc..398ff340cd 100644
+index 55931a2546..2e00bd7539 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
-@@ -1418,7 +1418,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
+@@ -1410,7 +1410,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
  
          assert(ret);
  
@@ -47,7 +47,7 @@ index 29afb08ebc..398ff340cd 100644
          if (!f)
                  return -errno;
  
-@@ -1459,7 +1459,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
+@@ -1451,7 +1451,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
  
          assert(ret);
  
@@ -56,7 +56,7 @@ index 29afb08ebc..398ff340cd 100644
          if (!f)
                  return -errno;
  
-@@ -1570,7 +1570,7 @@ int verify_timezone(const char *name, int log_level) {
+@@ -1562,7 +1562,7 @@ int verify_timezone(const char *name, int log_level) {
          if (p - name >= PATH_MAX)
                  return -ENAMETOOLONG;
  
@@ -65,7 +65,7 @@ index 29afb08ebc..398ff340cd 100644
  
          fd = open(t, O_RDONLY|O_CLOEXEC);
          if (fd < 0)
-@@ -1622,7 +1622,7 @@ int get_timezone(char **ret) {
+@@ -1614,7 +1614,7 @@ int get_timezone(char **ret) {
          if (r < 0)
                  return r; /* Return EINVAL if not a symlink */
  
@@ -75,23 +75,38 @@ index 29afb08ebc..398ff340cd 100644
                  return -EINVAL;
          if (!timezone_is_valid(e, LOG_DEBUG))
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a389eeae10..c817e91991 100644
+index 5ed6d3a9d2..f922d91a9d 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -598,7 +598,7 @@ static int process_timezone(int rfd) {
+@@ -618,7 +618,7 @@ static int prompt_timezone(int rfd) {
+ 
+ static int process_timezone(int rfd) {
+         _cleanup_close_ int pfd = -EBADF;
+-        _cleanup_free_ char *f = NULL, *relpath = NULL;
++        _cleanup_free_ char *f = NULL;
+         const char *e;
+         int r;
+ 
+@@ -664,12 +664,9 @@ static int process_timezone(int rfd) {
          if (isempty(arg_timezone))
                  return 0;
  
--        e = strjoina("../usr/share/zoneinfo/", arg_timezone);
+-        e = strjoina("/usr/share/zoneinfo/", arg_timezone);
+-        r = path_make_relative_parent(etc_localtime(), e, &relpath);
+-        if (r < 0)
+-                return r;
 +        e = strjoina("zoneinfo/", arg_timezone);
  
-         r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false);
+-        r = symlinkat_atomic_full(relpath, pfd, f, SYMLINK_LABEL);
++        r = symlinkat_atomic_full(e, pfd, f, SYMLINK_LABEL);
          if (r < 0)
+                 return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
+ 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 74b2a237d3..cf9eabf0f2 100644
+index 480a9c55c6..02c9ae6608 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -1851,8 +1851,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
+@@ -1821,8 +1821,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
  static const char *timezone_from_path(const char *path) {
          return PATH_STARTSWITH_SET(
                          path,
@@ -103,10 +118,10 @@ index 74b2a237d3..cf9eabf0f2 100644
  
  static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index cbd30214b7..b9b2f533a4 100644
+index 57f3413dc6..6a456fe601 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -280,7 +280,7 @@ static int context_read_data(Context *c) {
+@@ -266,7 +266,7 @@ static int context_read_data(Context *c) {
  
          r = get_timezone(&t);
          if (r == -EINVAL)
@@ -115,24 +130,24 @@ index cbd30214b7..b9b2f533a4 100644
          else if (r < 0)
                  log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
  
-@@ -304,7 +304,7 @@ static int context_write_data_timezone(Context *c) {
+@@ -290,7 +290,7 @@ static int context_write_data_timezone(Context *c) {
  
          if (isempty(c->zone) || streq(c->zone, "UTC")) {
  
 -                if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) {
 +                if (access("/etc/zoneinfo/UTC", F_OK) < 0) {
  
-                         if (unlink("/etc/localtime") < 0 && errno != ENOENT)
+                         if (unlink(etc_localtime()) < 0 && errno != ENOENT)
                                  return -errno;
-@@ -312,9 +312,9 @@ static int context_write_data_timezone(Context *c) {
+@@ -298,9 +298,9 @@ static int context_write_data_timezone(Context *c) {
                          return 0;
                  }
  
--                source = "../usr/share/zoneinfo/UTC";
-+                source = "../etc/zoneinfo/UTC";
+-                source = "/usr/share/zoneinfo/UTC";
++                source = "/etc/zoneinfo/UTC";
          } else {
--                p = path_join("../usr/share/zoneinfo", c->zone);
-+                p = path_join("../etc/zoneinfo", c->zone);
+-                p = path_join("/usr/share/zoneinfo", c->zone);
++                p = path_join("/etc/zoneinfo", c->zone);
                  if (!p)
                          return -ENOMEM;
  
diff --git a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
index c670f076c34a..6c348219872f 100644
--- a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -10,15 +10,15 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 36dbeb9daa..265eda2751 100644
+index c595f81b40..90033f6566 100644
 --- a/src/locale/localectl.c
 +++ b/src/locale/localectl.c
-@@ -301,7 +301,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
+@@ -302,7 +302,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
          } state = NONE, look_for;
          int r;
  
 -        f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
 +        f = fopen("/etc/X11/xkb/rules/base.lst", "re");
          if (!f)
-                 return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
+                 return log_error_errno(errno, "Failed to open keyboard mapping list: %m");
  
diff --git a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
index bf9f028d6300..beb8acc61732 100644
--- a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
@@ -12,10 +12,10 @@ files that I might have missed.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/constants.h b/src/basic/constants.h
-index 5aaf8f535c..934175fb51 100644
+index 7a09fbf878..ee3378f109 100644
 --- a/src/basic/constants.h
 +++ b/src/basic/constants.h
-@@ -62,13 +62,15 @@
+@@ -40,13 +40,15 @@
          "/etc/" n "\0"                          \
          "/run/" n "\0"                          \
          "/usr/local/lib/" n "\0"                \
diff --git a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 20b4641ac000..b05fc609d6ed 100644
--- a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index e26a8579c5..af814cd551 100644
+index 3317068e47..021a3c0699 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
 @@ -358,6 +358,7 @@ static void notify_supervisor(void) {
diff --git a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index 13578115a014..bfded1bba554 100644
--- a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 181bb4ccef..2b1410d8a1 100644
+index 3390ebe0c0..affc823bc4 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
-@@ -218,6 +218,7 @@ static int execute(
+@@ -248,6 +248,7 @@ static int execute(
          };
          static const char* const dirs[] = {
                  SYSTEM_SLEEP_PATH,
diff --git a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 9e29c34efcd7..1168d1249858 100644
--- a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -10,10 +10,10 @@ systemd itself uses extensively.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index dff5a3a549..01344e5cf6 100644
+index 45518c07e5..94bef2f4b4 100644
 --- a/src/basic/path-util.h
 +++ b/src/basic/path-util.h
-@@ -17,10 +17,10 @@
+@@ -9,10 +9,10 @@
  #define PATH_MERGED_BIN(x) x "bin"
  #define PATH_MERGED_BIN_NULSTR(x) x "bin\0"
  
diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
index 856fdee93475..1c4ce37dde34 100644
--- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 8 insertions(+)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 9577b89783..9cfd2798b9 100644
+index 2a4782a55e..8dfdc227a1 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -4158,9 +4158,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
+@@ -3977,9 +3977,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
           * adjust generated units to that. Let's pass down some bits of information that are easy for us to
           * determine (but a bit harder for generator scripts to determine), as environment variables. */
  
diff --git a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
index fbaaed99cb61..445b08d2289f 100644
--- a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
+++ b/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
@@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191
  1 file changed, 8 deletions(-)
 
 diff --git a/src/core/taint.c b/src/core/taint.c
-index b7a1c647a2..c04864c478 100644
+index 8872a224b2..bc736e2ef8 100644
 --- a/src/core/taint.c
 +++ b/src/core/taint.c
-@@ -41,14 +41,6 @@ char** taint_strv(void) {
+@@ -42,14 +42,6 @@ char** taint_strv(void) {
  
          _cleanup_free_ char *bin = NULL, *usr_sbin = NULL, *var_run = NULL;
  
diff --git a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
index fe8ac0ddd913..9f73ff0de547 100644
--- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
+++ b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
@@ -27,10 +27,10 @@ filename_is_valid with path_is_valid.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index 5b6b3ea93c..8ab04241b6 100644
+index 57e7a91f93..faf45e4807 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
-@@ -721,7 +721,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
+@@ -724,7 +724,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
                  fn = strjoina("libtss2-tcti-", driver, ".so.0");
  
                  /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
diff --git a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
index 50dd842cc221..de846e9410b3 100644
--- a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
+++ b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
@@ -30,10 +30,10 @@ are written into `$XDG_CONFIG_HOME/systemd/user`.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
-index 7165fa1cf7..7498cf9f4c 100644
+index 53bc57186a..0ed12ce931 100644
 --- a/src/systemctl/systemctl-edit.c
 +++ b/src/systemctl/systemctl-edit.c
-@@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
+@@ -330,6 +330,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
          sd_bus *bus;
          int r;
  
diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
index 65cd257a8a41..2e3ada02a901 100644
--- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
+++ b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
  1 file changed, 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index a4730f0570..b5aaecd669 100644
+index 238b935372..b0b67c9b99 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2815,7 +2815,6 @@ install_data('LICENSE.GPL2',
+@@ -2791,7 +2791,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  
diff --git a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
index da170d869ad7..472bd260caf3 100644
--- a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
+++ b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index b5aaecd669..91b23f2d72 100644
+index b0b67c9b99..4721b7482b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')
+@@ -219,13 +219,13 @@ sshconfdir = get_option('sshconfdir')
  if sshconfdir == ''
          sshconfdir = sysconfdir / 'ssh/ssh_config.d'
  endif
diff --git a/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
index 4d7ceedcbab0..7372b5214e59 100644
--- a/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
+++ b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] install: unit_file_exists_full: follow symlinks
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/install.c b/src/shared/install.c
-index 6d87858a3c..8da022eb64 100644
+index 8195436564..dfbc35f357 100644
 --- a/src/shared/install.c
 +++ b/src/shared/install.c
-@@ -3226,7 +3226,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char
+@@ -3227,7 +3227,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char
                          &c,
                          lp,
                          name,
diff --git a/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
index a1b1575a51d2..be03316306b6 100644
--- a/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+++ b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
@@ -13,10 +13,10 @@ directly.
  1 file changed, 11 insertions(+)
 
 diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
-index d002501d29..9b835dc031 100644
+index 40305c046b..c3ed57c54e 100644
 --- a/src/timesync/timesyncd.c
 +++ b/src/timesync/timesyncd.c
-@@ -23,6 +23,11 @@
+@@ -25,6 +25,11 @@
  #include "timesyncd-conf.h"
  #include "timesyncd-manager.h"
  #include "user-util.h"
@@ -28,7 +28,7 @@ index d002501d29..9b835dc031 100644
  
  static int advance_tstamp(int fd, usec_t epoch) {
          assert(fd >= 0);
-@@ -201,6 +206,12 @@ static int run(int argc, char *argv[]) {
+@@ -203,6 +208,12 @@ static int run(int argc, char *argv[]) {
          if (r < 0)
                  return log_error_errno(r, "Failed to parse fallback server strings: %m");
  
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ca3d876d33fe..4cea0b294495 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -56,7 +56,6 @@
   elfutils,
   linuxHeaders ? stdenv.cc.libc.linuxHeaders,
   gnutls,
-  iptables,
   withSelinux ? false,
   libselinux,
   withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
@@ -164,6 +163,7 @@
   # on their live NixOS system, we disable it by default.
   withKernelInstall ? false,
   withLibarchive ? true,
+  withVConsole ? true,
   # tests assume too much system access for them to be feasible for us right now
   withTests ? false,
   # build only libudev and libsystemd
@@ -200,20 +200,16 @@ let
   #  $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
   #     jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
   releaseTimestamp = "1734643670";
-
-  kbd' = if withPam then kbd else kbd.override { withVlock = false; };
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "257.9";
+  version = "258.1";
 
-  # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
-  # This has proven to be less error-prone than the previous systemd fork.
   src = fetchFromGitHub {
     owner = "systemd";
     repo = "systemd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3Ig5TXhK99iOu41k4c5CgC4R3HhBftSAb9UbXvFY6lo=";
+    hash = "sha256-LA+6/d9W3CxK0G2sXsPHM4BVLf8IzsWW6IxJFby6/JU=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -225,6 +221,16 @@ stdenv.mkDerivation (finalAttrs: {
   # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all
   # patches
   patches = [
+    # https://github.com/systemd/systemd/pull/39094
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/commit/8b4ee3d68d2e70d9a396b74d155eab3b11763311.patch";
+      hash = "sha256-JJDaSHQjd1QZ18CQHq40viB0AF/0MiescmZUcc/6LDg=";
+    })
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/commit/13b0e7fc6d2623800ba04b104f3b628388c9f5e6.patch";
+      hash = "sha256-X+tY3NjfRJpF6wvd++xEps0DIFTbX/6Zw9oO4Y9FmNI=";
+    })
+
     ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
     ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
     ./0003-Fix-NixOS-containers.patch
@@ -253,55 +259,39 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ]
-  ++ lib.optionals stdenv.hostPlatform.isMusl (
-    let
-      # NOTE: the master-next branch does not have stable URLs.
-      # If we need patches that aren't in master yet, they'll have to be
-      # vendored.
-      oe-core = fetchzip {
-        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-4891f47cdaf919033bf1c02cc12e4805e5db99a0.tar.gz";
-        hash = "sha256-YKL/oC+rPZ2EEVNidEV+pJihZgUv7vLb0OASplgktn4=";
-      };
-    in
-    map (patch: "${oe-core}/meta/recipes-core/systemd/systemd/${patch}") [
-      "0003-missing_type.h-add-comparison_fn_t.patch"
-      "0004-add-fallback-parse_printf_format-implementation.patch"
-      "0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch"
-      "0006-add-missing-FTW_-macros-for-musl.patch"
-      "0007-Use-uintmax_t-for-handling-rlim_t.patch"
-      "0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch"
-      "0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch"
-      "0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch"
-      "0011-avoid-redefinition-of-prctl_mm_map-structure.patch"
-      "0012-do-not-disable-buffer-in-writing-files.patch"
-      "0013-Handle-__cpu_mask-usage.patch"
-      "0014-Handle-missing-gshadow.patch"
-      "0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch"
-      "0016-pass-correct-parameters-to-getdents64.patch"
-      "0017-Adjust-for-musl-headers.patch"
-      "0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch"
-      "0019-errno-util-Make-STRERROR-portable-for-musl.patch"
-      "0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch"
-      "0021-shared-Do-not-use-malloc_info-on-musl.patch"
-      "0022-avoid-missing-LOCK_EX-declaration.patch"
-      "0023-include-signal.h-to-avoid-the-undeclared-error.patch"
-      "0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch"
-      "0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch"
-      "0026-build-path.c-avoid-boot-time-segfault-for-musl.patch"
-    ]
-    ++ [
-      # add a missing include
-      (fetchpatch {
-        url = "https://github.com/systemd/systemd/commit/34fcd3638817060c79e1186b370e46d9b3a7409f.patch";
-        hash = "sha256-Uaewo3jPrZGJttlLcqO6cCj1w3IGZmvbur4+TBdIPxc=";
-        excludes = [ "src/udev/udevd.c" ];
-      })
-      (fetchpatch {
-        url = "https://gitlab.postmarketos.org/postmarketOS/systemd/-/commit/5760be33bd26d7e7c66a7294c5f6fd6c7044683f.patch";
-        hash = "sha256-Om+OhGyZJfZNpbtMInm3vGagLbbtOY71fDMZXj6pbPY=";
-      })
-    ]
-  );
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    # Patchset to build with musl by an upstream systemd contributor:
+    # https://github.com/systemd/systemd/pull/37788
+    # This is vendored here because of the lack of permanent patch urls for the unmerged PR
+    ./musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
+    ./musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
+    ./musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
+    ./musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
+    ./musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
+    ./musl/0006-musl-meson-check-existence-of-renameat2.patch
+    ./musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
+    ./musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
+    ./musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
+    ./musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
+    ./musl/0011-musl-make-strptime-accept-z.patch
+    ./musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
+    ./musl/0013-musl-introduce-strerrorname_np.patch
+    ./musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
+    ./musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
+    ./musl/0016-musl-define-__THROW-when-not-defined.patch
+    ./musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
+    ./musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
+    ./musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
+    ./musl/0020-musl-add-several-missing-statx-macros.patch
+    ./musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
+    ./musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
+    ./musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
+    ./musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
+    ./musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
+    ./musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
+    ./musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
+    ./musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
+  ];
 
   postPatch = ''
     substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
@@ -335,17 +325,13 @@ stdenv.mkDerivation (finalAttrs: {
   separateDebugInfo = true;
   __structuredAttrs = true;
 
-  hardeningDisable = [
-    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
-    "trivialautovarinit"
-  ]
-  ++ (lib.optionals withLibBPF [
+  hardeningDisable = lib.optionals withLibBPF [
     # breaks clang -target bpf; should be fixed to not use
     # a wrapped clang?
     "zerocallusedregs"
     "shadowstack"
     "pacret"
-  ]);
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -373,6 +359,7 @@ stdenv.mkDerivation (finalAttrs: {
         jinja2
       ]
       ++ lib.optional withEfi ps.pyelftools
+      ++ lib.optional (withUkify && finalAttrs.finalPackage.doCheck) ps.pefile
     ))
   ]
   ++ lib.optionals withLibBPF [
@@ -453,12 +440,15 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
     (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
     (lib.mesonOption "shellprofiledir" "${placeholder "out"}/etc/profile.d")
-    (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
 
     # /bin/sh is also the upstream default. Explicitly set this so that we're
     # independent of upstream changes to the default.
     (lib.mesonOption "debug-shell" "/bin/sh")
 
+    # Use the correct path for Bash for user shells (e.g. used in nspawn and
+    # homed), which otherwise defaults to /bin/bash.
+    (lib.mesonOption "default-user-shell" "/run/current-system/sw/bin/bash")
+
     # Attempts to check /usr/sbin and that fails in macOS sandbox because
     # permission is denied. If /usr/sbin is not a symlink, it defaults to true.
     # We set it to false since stdenv moves sbin/* to bin and creates a symlink,
@@ -474,10 +464,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "pkgconfiglibdir" "${placeholder "dev"}/lib/pkgconfig")
     (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig")
 
-    # Keyboard
-    (lib.mesonOption "loadkeys-path" "${kbd'}/bin/loadkeys")
-    (lib.mesonOption "setfont-path" "${kbd'}/bin/setfont")
-
     # SBAT
     (lib.mesonOption "sbat-distro" "nixos")
     (lib.mesonOption "sbat-distro-summary" "NixOS")
@@ -494,8 +480,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "sysvrcnd-path" "")
 
     # Login
-    (lib.mesonOption "sulogin-path" "${util-linux.login}/bin/sulogin")
-    (lib.mesonOption "nologin-path" "${util-linux.login}/bin/nologin")
+    (lib.mesonOption "sulogin-path" "${lib.getOutput "login" util-linux}/bin/sulogin")
+    (lib.mesonOption "nologin-path" "${lib.getOutput "login" util-linux}/bin/nologin")
 
     # Mount
     (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount")
@@ -577,8 +563,9 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "gnutls" false)
     (lib.mesonEnable "xkbcommon" false)
     (lib.mesonEnable "man" true)
-    # (lib.mesonEnable "nspawn" withNspawn) # nspawn build can be turned off on systemd 258, on 257.x it will just not be installed in systemdLibs but the build is unconditional
+    (lib.mesonEnable "nspawn" withNspawn)
 
+    (lib.mesonBool "vconsole" withVConsole)
     (lib.mesonBool "analyze" withAnalyze)
     (lib.mesonBool "logind" withLogind)
     (lib.mesonBool "localed" withLocaled)
@@ -605,13 +592,20 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonBool "create-log-dirs" false)
     (lib.mesonBool "smack" true)
     (lib.mesonBool "b_pie" true)
-
+  ]
+  ++ lib.optionals withVConsole [
+    (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
+    (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
+  ]
+  ++ lib.optionals withKmod [
+    (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
   ]
   ++ lib.optionals (withShellCompletions == false) [
     (lib.mesonOption "bashcompletiondir" "no")
     (lib.mesonOption "zshcompletiondir" "no")
   ]
   ++ lib.optionals stdenv.hostPlatform.isMusl [
+    (lib.mesonOption "libc" "musl")
     (lib.mesonBool "gshadow" false)
     (lib.mesonBool "idn" false)
   ];
@@ -854,7 +848,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     ${lib.optionalString (
       !buildLibsOnly
-    ) "$out/bin/udevadm verify --resolve-names=never --no-style $out/lib/udev/rules.d"}
+    ) "$out/bin/udevadm verify --resolve-names=late --no-style $out/lib/udev/rules.d"}
 
     runHook postInstallCheck
   '';
@@ -862,11 +856,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Avoid *.EFI binary stripping.
   # At least on aarch64-linux strip removes too much from PE32+ files:
   #   https://github.com/NixOS/nixpkgs/issues/169693
-  # The hack is to move EFI file out of lib/ before doStrip run and return it
-  # after doStrip run.
-  preFixup = lib.optionalString withBootloader ''
-    mv $out/lib/systemd/boot/efi $out/dont-strip-me
-  '';
+  stripExclude = [ "lib/systemd/boot/efi/*" ];
 
   # Wrap in the correct path for LUKS2 tokens.
   postFixup =
@@ -876,9 +866,6 @@ stdenv.mkDerivation (finalAttrs: {
         wrapProgram $out/$f --prefix LD_LIBRARY_PATH : ${placeholder "out"}/lib/cryptsetup
       done
     ''
-    + lib.optionalString withBootloader ''
-      mv $out/dont-strip-me $out/lib/systemd/boot/efi
-    ''
     + lib.optionalString withUkify ''
       # To cross compile a derivation that builds a UKI with ukify, we need to wrap
       # ukify with the correct binutils. When wrapping, no splicing happens so we
@@ -924,10 +911,9 @@ stdenv.mkDerivation (finalAttrs: {
       withUtmp
       util-linux
       kmod
+      kbd
       ;
 
-    kbd = kbd';
-
     # Many TPM2-related units are only installed if this trio of features are
     # enabled. See https://github.com/systemd/systemd/blob/876ee10e0eb4bbb0920bdab7817a9f06cc34910f/units/meson.build#L521
     withTpm2Units = withTpm2Tss && withBootloader && withOpenSSL;
@@ -988,7 +974,6 @@ stdenv.mkDerivation (finalAttrs: {
             systemd-journal
             systemd-journal-gateway
             systemd-journal-upload
-            systemd-lock-handler
             systemd-machinectl
             systemd-networkd
             systemd-networkd-bridge
diff --git a/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
new file mode 100644
index 000000000000..a40515f9ec29
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
@@ -0,0 +1,96 @@
+From 0e2b9909fed24a682c8566f9df8bbac4e9347186 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 7 Jul 2025 14:11:19 +0900
+Subject: [PATCH 01/30] musl: meson: allow to choose libc implementation
+
+This also introduces skelton directories for storing musl specific code.
+---
+ meson.build               | 17 +++++++++++++++--
+ meson_options.txt         |  2 ++
+ src/libc/meson.build      |  2 ++
+ src/libc/musl/meson.build |  5 +++++
+ 4 files changed, 24 insertions(+), 2 deletions(-)
+ create mode 100644 src/libc/musl/meson.build
+
+diff --git a/meson.build b/meson.build
+index 238b935372..bea62f0eb6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -72,7 +72,10 @@ conf.set10('SD_BOOT', false)
+ 
+ # Create a title-less summary section early, so it ends up first in the output.
+ # More items are added later after they have been detected.
+-summary({'build mode' : get_option('mode')})
++summary({
++        'libc'       : get_option('libc'),
++        'build mode' : get_option('mode'),
++})
+ 
+ #####################################################################
+ 
+@@ -2042,7 +2045,14 @@ dbus_programs = []
+ boot_stubs = []
+ 
+ # This is similar to system_includes below, but for passing custom_target().
+-system_include_args = [
++system_include_args = []
++if get_option('libc') == 'musl'
++        system_include_args += [
++                '-isystem', meson.project_build_root()  / 'src/include/musl',
++                '-isystem', meson.project_source_root() / 'src/include/musl',
++        ]
++endif
++system_include_args += [
+         '-isystem', meson.project_build_root()  / 'src/include/override',
+         '-isystem', meson.project_source_root() / 'src/include/override',
+         '-isystem', meson.project_build_root()  / 'src/include/uapi',
+@@ -2060,6 +2070,9 @@ system_includes = [
+                 is_system : true,
+         ),
+ ]
++if get_option('libc') == 'musl'
++        system_includes += include_directories('src/include/musl', is_system : true)
++endif
+ 
+ basic_includes = [
+         include_directories(
+diff --git a/meson_options.txt b/meson_options.txt
+index d8dec33ec4..ad203ba301 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -397,6 +397,8 @@ option('ima', type : 'boolean',
+ option('ipe', type : 'boolean',
+        description : 'IPE support')
+ 
++option('libc', type : 'combo', choices : ['glibc', 'musl'],
++       description : 'libc implementation to be used')
+ option('acl', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
+        description : 'libacl support')
+ option('audit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
+diff --git a/src/libc/meson.build b/src/libc/meson.build
+index eeee98c9d6..306512ffd7 100644
+--- a/src/libc/meson.build
++++ b/src/libc/meson.build
+@@ -16,6 +16,8 @@ libc_wrapper_sources = files(
+         'xattr.c',
+ )
+ 
++subdir('musl')
++
+ sources += libc_wrapper_sources
+ 
+ libc_wrapper_static = static_library(
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+new file mode 100644
+index 0000000000..a876230c67
+--- /dev/null
++++ b/src/libc/musl/meson.build
+@@ -0,0 +1,5 @@
++# SPDX-License-Identifier: LGPL-2.1-or-later
++
++if get_option('libc') != 'musl'
++        subdir_done()
++endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch b/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
new file mode 100644
index 000000000000..b59b77dd7712
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
@@ -0,0 +1,38 @@
+From 03010a0716f509b448c84a35bc2723a6f08e0c09 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Wed, 23 Jul 2025 10:24:14 +0900
+Subject: [PATCH 02/30] musl: meson: do not use libcrypt/libxcrypt
+
+Otherwise, when both glibc and musl are installed, libxcrypt or glibc's
+libcrypt may be picked even when we are building systemd with musl.
+Let's not use libcrypt/libxcrypt in that case.
+---
+ meson.build | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index bea62f0eb6..06be36409f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1013,10 +1013,14 @@ else
+         libatomic = []
+ endif
+ 
+-libcrypt = dependency('libcrypt', 'libxcrypt', required : false)
+-if not libcrypt.found()
+-        # fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC.
+-        libcrypt = cc.find_library('crypt')
++if get_option('libc') == 'musl'
++        libcrypt = []
++else
++        libcrypt = dependency('libcrypt', 'libxcrypt', required : false)
++        if not libcrypt.found()
++                # fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC.
++                libcrypt = cc.find_library('crypt')
++        endif
+ endif
+ 
+ foreach func : [
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch b/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
new file mode 100644
index 000000000000..000c6c65d6f6
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
@@ -0,0 +1,56 @@
+From bf4cb5aeeef23c5f12e6d2258bb8f3d12059f59f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 6 Sep 2025 16:25:41 +0900
+Subject: [PATCH 03/30] musl: meson: explicitly link with libintl when
+ necessary
+
+On some musl based distributions provides dgettext() by libintl.so.
+Hence, we need to add dependency in that case.
+---
+ meson.build          | 17 +++++++++++++++++
+ src/home/meson.build |  1 +
+ 2 files changed, 18 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 06be36409f..054752c339 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1002,6 +1002,23 @@ libm = cc.find_library('m')
+ libdl = cc.find_library('dl')
+ libcap = dependency('libcap')
+ 
++# On some distributions that uses musl (e.g. Alpine), libintl.h may be provided by gettext rather than musl.
++# In that case, we need to explicitly link with libintl.so.
++if get_option('libc') == 'musl'
++        if cc.has_function('dgettext', prefix : '''#include <libintl.h>''', args : '-D_GNU_SOURCE')
++                libintl = []
++        else
++                libintl = cc.find_library('intl')
++                if not cc.has_function('dgettext', prefix : '''#include <libintl.h>''', args : '-D_GNU_SOURCE',
++                                       dependencies : libintl)
++                        error('dgettext() not found.')
++                endif
++        endif
++else
++        # When building with glibc, we assume that libintl.h is provided by glibc.
++        libintl = []
++endif
++
+ # On some architectures, libatomic is required. But on some installations,
+ # it is found, but actual linking fails. So let's try to use it opportunistically.
+ # If it is installed, but not needed, it will be dropped because of --as-needed.
+diff --git a/src/home/meson.build b/src/home/meson.build
+index 1937e6f56c..3305334707 100644
+--- a/src/home/meson.build
++++ b/src/home/meson.build
+@@ -115,6 +115,7 @@ modules += [
+                 'sources' : pam_systemd_home_sources,
+                 'dependencies' : [
+                         libcrypt,
++                        libintl,
+                         libpam_misc,
+                         libpam,
+                         threads,
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch b/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
new file mode 100644
index 000000000000..17de4bd3b5dd
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
@@ -0,0 +1,32 @@
+From 59f993d1acb069f3f2b7d6c71b91696388692702 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 10 Jun 2025 00:29:46 +0900
+Subject: [PATCH 04/30] musl: meson: explicitly set _LARGEFILE64_SOURCE
+
+glibc sets it when _GNU_SOURCE is defined, however, musl does not.
+Let's explicitly define it to make getdents64() and struct dirent64
+available even when building with musl.
+---
+ meson.build | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 054752c339..37fb1c2765 100644
+--- a/meson.build
++++ b/meson.build
+@@ -560,6 +560,12 @@ conf.set10('HAVE_WARNING_ZERO_AS_NULL_POINTER_CONSTANT', have)
+ conf.set('_GNU_SOURCE', 1)
+ conf.set('__SANE_USERSPACE_TYPES__', true)
+ 
++if get_option('libc') == 'musl'
++        # glibc always defines _LARGEFILE64_SOURCE when _GNU_SOURCE is set, but musl does not do that,
++        # and it is necessary for making getdents64() and struct dirent64 exist.
++        conf.set('_LARGEFILE64_SOURCE', 1)
++endif
++
+ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
+ conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
+ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch b/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
new file mode 100644
index 000000000000..faab7be7ca92
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
@@ -0,0 +1,31 @@
+From a8cc582e42dd9fd6b2304003f3e5ab7637c21b73 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 13:37:38 +0900
+Subject: [PATCH 05/30] musl: meson: make musl not define wchar_t in their
+ header
+
+Otherwise, musl defines wchar_t as int, which conflicts with the
+assumption by sd-boot, i.e. wchar_t is 2 bytes.
+---
+ src/boot/meson.build | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/boot/meson.build b/src/boot/meson.build
+index ba0b309acf..bea96bb2e3 100644
+--- a/src/boot/meson.build
++++ b/src/boot/meson.build
+@@ -179,6 +179,11 @@ if get_option('mode') == 'developer' and get_option('debug')
+         efi_c_args += '-DEFI_DEBUG'
+ endif
+ 
++if get_option('libc') == 'musl'
++        # To make musl not define wchar_t as int, rather than short.
++        efi_c_args += '-D__DEFINED_wchar_t'
++endif
++
+ efi_c_ld_args = [
+         '-nostdlib',
+         '-static-pie',
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch b/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch
new file mode 100644
index 000000000000..9109275b4eb8
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch
@@ -0,0 +1,91 @@
+From b9904ed6818232d9ad9bb496747b79a6c9606819 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 13:00:37 +0900
+Subject: [PATCH 06/30] musl: meson: check existence of renameat2()
+
+musl-1.2.5 does not provide renameat2(). Note, it is added by
+https://github.com/kraj/musl/commit/05ce67fea99ca09cd4b6625cff7aec9cc222dd5a,
+hence hopefully it will be provided by musl-1.2.6 or newer.
+---
+ meson.build               |  5 +++++
+ src/include/musl/stdio.h  | 13 +++++++++++++
+ src/libc/musl/meson.build |  4 ++++
+ src/libc/musl/stdio.c     | 11 +++++++++++
+ 4 files changed, 33 insertions(+)
+ create mode 100644 src/include/musl/stdio.h
+ create mode 100644 src/libc/musl/stdio.c
+
+diff --git a/meson.build b/meson.build
+index 37fb1c2765..71e422f545 100644
+--- a/meson.build
++++ b/meson.build
+@@ -581,6 +581,7 @@ assert(long_max > 100000)
+ conf.set_quoted('LONG_MAX_STR', '@0@'.format(long_max))
+ 
+ foreach ident : [
++        ['renameat2',         '''#include <stdio.h>''',         get_option('libc') == 'musl'], # since musl-1.2.6
+         ['set_mempolicy',     '''#include <sys/syscall.h>'''],  # declared at numaif.h provided by libnuma, which we do not use
+         ['get_mempolicy',     '''#include <sys/syscall.h>'''],  # declared at numaif.h provided by libnuma, which we do not use
+         ['strerrorname_np',   '''#include <string.h>'''],       # since glibc-2.32
+@@ -614,6 +615,10 @@ foreach ident : [
+         ['pivot_root',        '''#include <unistd.h>'''],       # no known header declares pivot_root
+ ]
+ 
++        if ident.length() >= 3 and not ident[2]
++                continue
++        endif
++
+         have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
+         conf.set10('HAVE_' + ident[0].to_upper(), have)
+ endforeach
+diff --git a/src/include/musl/stdio.h b/src/include/musl/stdio.h
+new file mode 100644
+index 0000000000..d677201f45
+--- /dev/null
++++ b/src/include/musl/stdio.h
+@@ -0,0 +1,13 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <stdio.h>
++
++#if !HAVE_RENAMEAT2
++#  define RENAME_NOREPLACE (1 << 0)
++#  define RENAME_EXCHANGE  (1 << 1)
++#  define RENAME_WHITEOUT  (1 << 2)
++
++int missing_renameat2(int __oldfd, const char *__old, int __newfd, const char *__new, unsigned __flags);
++#  define renameat2 missing_renameat2
++#endif
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index a876230c67..8d06d919ef 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -3,3 +3,7 @@
+ if get_option('libc') != 'musl'
+         subdir_done()
+ endif
++
++libc_wrapper_sources += files(
++        'stdio.c',
++)
+diff --git a/src/libc/musl/stdio.c b/src/libc/musl/stdio.c
+new file mode 100644
+index 0000000000..102a22cd5c
+--- /dev/null
++++ b/src/libc/musl/stdio.c
+@@ -0,0 +1,11 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <stdio.h>
++#include <sys/syscall.h>
++#include <unistd.h>
++
++#if !HAVE_RENAMEAT2
++int missing_renameat2(int __oldfd, const char *__old, int __newfd, const char *__new, unsigned __flags) {
++        return syscall(__NR_renameat2, __oldfd, __old, __newfd, __new, __flags);
++}
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch b/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
new file mode 100644
index 000000000000..8f3d16510d20
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
@@ -0,0 +1,91 @@
+From 1a5f752e2a80e206474f04fe5c1990fdb08742bd Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 22 Jun 2025 02:16:25 +0900
+Subject: [PATCH 07/30] musl: meson: gracefully disable gshadow, idn, nss, and
+ utmp support
+
+- musl does not support gshadow, and does not provide gshadow.h,
+- musl does not provide NI_IDN flag,
+- musl does not support nss, and does not provide nss.h which is necessary
+  for each nss modules,
+- musl does not support utmp, and all utmp related functions do nothing,
+  see https://github.com/kraj/musl/blob/v1.2.5/src/legacy/utmpx.c
+---
+ meson.build | 33 ++++++++++++++++++++++++---------
+ 1 file changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 71e422f545..5f235d5113 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1638,11 +1638,9 @@ foreach term : ['analyze',
+                 'efi',
+                 'environment-d',
+                 'firstboot',
+-                'gshadow',
+                 'hibernate',
+                 'hostnamed',
+                 'hwdb',
+-                'idn',
+                 'ima',
+                 'ipe',
+                 'initrd',
+@@ -1654,8 +1652,6 @@ foreach term : ['analyze',
+                 'mountfsd',
+                 'networkd',
+                 'nsresourced',
+-                'nss-myhostname',
+-                'nss-systemd',
+                 'oomd',
+                 'portabled',
+                 'pstore',
+@@ -1671,7 +1667,6 @@ foreach term : ['analyze',
+                 'tmpfiles',
+                 'tpm',
+                 'userdb',
+-                'utmp',
+                 'vconsole',
+                 'xdg-autostart']
+         have = get_option(term)
+@@ -1681,14 +1676,34 @@ endforeach
+ 
+ enable_sysusers = conf.get('ENABLE_SYSUSERS') == 1
+ 
++foreach term : ['gshadow',
++                'idn',
++                'nss-myhostname',
++                'nss-systemd',
++                'utmp']
++
++        have = get_option(term)
++        if have and get_option('libc') == 'musl'
++                warning('@0@ support is requested but it is not supported when building with musl, disabling it.'.format(term))
++                have = false
++        endif
++        name = 'ENABLE_' + term.underscorify().to_upper()
++        conf.set10(name, have)
++endforeach
++
+ foreach tuple : [['nss-mymachines', 'machined'],
+                  ['nss-resolve',    'resolve']]
+         want = get_option(tuple[0])
+-        if want.allowed()
+-                have = get_option(tuple[1])
+-                if want.enabled() and not have
+-                        error('@0@ is requested but @1@ is disabled'.format(tuple[0], tuple[1]))
++        if want.enabled()
++                if get_option('libc') == 'musl'
++                        error('@0@ is requested but it is not supported when building with musl.'.format(tuple[0]))
+                 endif
++                if not get_option(tuple[1])
++                        error('@0@ is requested but @1@ is disabled.'.format(tuple[0], tuple[1]))
++                endif
++                have = true
++        elif want.allowed()
++                have = get_option(tuple[1]) and get_option('libc') != 'musl'
+         else
+                 have = false
+         endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch b/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
new file mode 100644
index 000000000000..50bc22cfe678
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
@@ -0,0 +1,44 @@
+From 7e023763fb7f56b7c1ea6fa139d79ec2c3e0164f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 21 Sep 2025 15:24:06 +0900
+Subject: [PATCH 08/30] musl: introduce dummy gshadow header file for userdb
+
+Even 'gshadow' meson option is disabled, src/shared/userdb.c and
+src/shared/user-record-nss.c include gshadow.h unconditionally.
+Let's introduce dummy header to make them compiled gracefully.
+---
+ src/include/musl/gshadow.h | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+ create mode 100644 src/include/musl/gshadow.h
+
+diff --git a/src/include/musl/gshadow.h b/src/include/musl/gshadow.h
+new file mode 100644
+index 0000000000..b57c74ca83
+--- /dev/null
++++ b/src/include/musl/gshadow.h
+@@ -0,0 +1,22 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include <errno.h>
++#include <stddef.h>
++
++struct sgrp {
++        char *sg_namp;
++        char *sg_passwd;
++        char **sg_adm;
++        char **sg_mem;
++};
++
++static inline int getsgnam_r(
++                const char *__name,
++                struct sgrp *__result_buf,
++                char *__buffer,
++                size_t __buflen,
++                struct sgrp **__result) {
++
++        return EOPNOTSUPP; /* this function returns positive errno in case of error. */
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
new file mode 100644
index 000000000000..d4347746067e
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
@@ -0,0 +1,447 @@
+From 444acef17881cbc27057bd85b7dc07b332c03d67 Mon Sep 17 00:00:00 2001
+From: Emil Renner Berthing <systemd@esmil.dk>
+Date: Sat, 22 May 2021 20:26:24 +0200
+Subject: [PATCH 09/30] musl: add fallback parse_printf_format() implementation
+
+musl does not provide parse_printf_format(). Let's introduce a fallback
+method.
+
+Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
+---
+ src/include/musl/printf.h |  35 +++++
+ src/libc/musl/meson.build |   1 +
+ src/libc/musl/printf.c    | 276 ++++++++++++++++++++++++++++++++++++++
+ src/test/meson.build      |   6 +
+ src/test/test-printf.c    |  67 +++++++++
+ 5 files changed, 385 insertions(+)
+ create mode 100644 src/include/musl/printf.h
+ create mode 100644 src/libc/musl/printf.c
+ create mode 100644 src/test/test-printf.c
+
+diff --git a/src/include/musl/printf.h b/src/include/musl/printf.h
+new file mode 100644
+index 0000000000..4242392c89
+--- /dev/null
++++ b/src/include/musl/printf.h
+@@ -0,0 +1,35 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++/* Copyright 2014 Emil Renner Berthing <systemd@esmil.dk> */
++#pragma once
++
++#include <features.h>
++#include <stddef.h>
++
++#ifdef __GLIBC__
++#include_next <printf.h>
++#else
++
++enum {              /* C type: */
++        PA_INT,     /* int */
++        PA_CHAR,    /* int, cast to char */
++        PA_WCHAR,   /* wide char */
++        PA_STRING,  /* const char *, a '\0'-terminated string */
++        PA_WSTRING, /* const wchar_t *, wide character string */
++        PA_POINTER, /* void * */
++        PA_FLOAT,   /* float */
++        PA_DOUBLE,  /* double */
++        PA_LAST,
++};
++
++/* Flag bits that can be set in a type returned by `parse_printf_format'.  */
++#  define PA_FLAG_MASK        0xff00
++#  define PA_FLAG_LONG_LONG   (1 << 8)
++#  define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG
++#  define PA_FLAG_LONG        (1 << 9)
++#  define PA_FLAG_SHORT       (1 << 10)
++#  define PA_FLAG_PTR         (1 << 11)
++
++#  define parse_printf_format missing_parse_printf_format
++#endif
++
++size_t missing_parse_printf_format(const char *fmt, size_t n, int *types);
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index 8d06d919ef..3e205e1eb1 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -5,5 +5,6 @@ if get_option('libc') != 'musl'
+ endif
+ 
+ libc_wrapper_sources += files(
++        'printf.c',
+         'stdio.c',
+ )
+diff --git a/src/libc/musl/printf.c b/src/libc/musl/printf.c
+new file mode 100644
+index 0000000000..33c4acd27f
+--- /dev/null
++++ b/src/libc/musl/printf.c
+@@ -0,0 +1,276 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++/* Copyright 2014 Emil Renner Berthing <systemd@esmil.dk> */
++
++#include <limits.h>
++#include <../musl/printf.h> /* This file is also compiled when built with glibc. */
++#include <stdint.h>
++#include <string.h>
++
++static const char* consume_nonarg(const char *fmt) {
++        do {
++                if (*fmt == '\0')
++                        return fmt;
++        } while (*fmt++ != '%');
++        return fmt;
++}
++
++static const char* consume_num(const char *fmt) {
++        for (;*fmt >= '0' && *fmt <= '9'; fmt++)
++                /* do nothing */;
++        return fmt;
++}
++
++static const char* consume_argn(const char *fmt, size_t *arg) {
++        const char *p = fmt;
++        size_t val = 0;
++
++        if (*p < '1' || *p > '9')
++                return fmt;
++        do {
++                val = 10*val + (*p++ - '0');
++        } while (*p >= '0' && *p <= '9');
++
++        if (*p != '$')
++                return fmt;
++        *arg = val;
++        return p+1;
++}
++
++static const char* consume_flags(const char *fmt) {
++        for (;;)
++                switch (*fmt) {
++                case '#':
++                case '0':
++                case '-':
++                case ' ':
++                case '+':
++                case '\'':
++                case 'I':
++                        fmt++;
++                        continue;
++                default:
++                        return fmt;
++                }
++}
++
++enum state {
++        BARE,
++        LPRE,
++        LLPRE,
++        HPRE,
++        HHPRE,
++        BIGLPRE,
++        ZTPRE,
++        JPRE,
++        STOP,
++};
++
++enum type {
++        NONE,
++        PTR,
++        STR,
++        WSTR,
++        INT,
++        LONG,
++        LLONG,
++        SHORT,
++        IMAX,
++        SIZET,
++        CHAR,
++        WCHAR,
++        PDIFF,
++        DBL,
++        LDBL,
++        NPTR,
++        MAXTYPE,
++};
++
++static const short pa_types[MAXTYPE] = {
++        [NONE]   = PA_INT,
++        [PTR]    = PA_POINTER,
++        [STR]    = PA_STRING,
++        [WSTR]   = PA_WSTRING,
++        [INT]    = PA_INT,
++        [SHORT]  = PA_INT | PA_FLAG_SHORT,
++        [LONG]   = PA_INT | PA_FLAG_LONG,
++        [CHAR]   = PA_CHAR,
++        [WCHAR]  = PA_WCHAR,
++        [DBL]    = PA_DOUBLE,
++        [LDBL]   = PA_DOUBLE | PA_FLAG_LONG_DOUBLE,
++        [NPTR]   = PA_FLAG_PTR,
++};
++
++static int state_to_pa_type(unsigned state) {
++        switch (state) {
++        case LLONG:
++#if LONG_MAX != LLONG_MAX
++                return PA_INT | PA_FLAG_LONG_LONG;
++#else
++                return PA_INT | PA_FLAG_LONG;
++#endif
++
++        case IMAX:
++#if LONG_MAX != LLONG_MAX
++                if (sizeof(intmax_t) > sizeof(long))
++                        return PA_INT | PA_FLAG_LONG_LONG;
++#endif
++                if (sizeof(intmax_t) > sizeof(int))
++                        return PA_INT | PA_FLAG_LONG;
++                return PA_INT;
++
++        case SIZET:
++#if LONG_MAX != LLONG_MAX
++                if (sizeof(size_t) > sizeof(long))
++                        return PA_INT | PA_FLAG_LONG_LONG;
++#endif
++                if (sizeof(size_t) > sizeof(int))
++                        return PA_INT | PA_FLAG_LONG;
++                return PA_INT;
++        default:
++                return pa_types[state];
++        }
++}
++
++#define S(x) [(x)-'A']
++#define E(x) (STOP + (x))
++
++static const unsigned char states[]['z'-'A'+1] = {
++        { /* 0: bare types */
++                S('d') = E(INT),    S('i') = E(INT),
++                S('o') = E(INT),    S('u') = E(INT),    S('x') = E(INT),    S('X') = E(INT),
++                S('e') = E(DBL),    S('f') = E(DBL),    S('g') = E(DBL),    S('a') = E(DBL),
++                S('E') = E(DBL),    S('F') = E(DBL),    S('G') = E(DBL),    S('A') = E(DBL),
++                S('c') = E(CHAR),   S('C') = E(WCHAR),
++                S('s') = E(STR),    S('S') = E(WSTR),   S('p') = E(PTR),
++                S('n') = E(NPTR),
++                S('m') = E(NONE),
++                S('l') = LPRE,      S('q') = LLPRE,     S('h') = HPRE,      S('L') = BIGLPRE,
++                S('z') = ZTPRE,     S('Z') = ZTPRE,     S('j') = JPRE,      S('t') = ZTPRE,
++        },
++        { /* 1: l-prefixed */
++                S('d') = E(LONG),   S('i') = E(LONG),
++                S('o') = E(LONG),   S('u') = E(LONG),   S('x') = E(LONG),   S('X') = E(LONG),
++                S('e') = E(DBL),    S('f') = E(DBL),    S('g') = E(DBL),    S('a') = E(DBL),
++                S('E') = E(DBL),    S('F') = E(DBL),    S('G') = E(DBL),    S('A') = E(DBL),
++                S('c') = E(CHAR),   S('s') = E(STR),
++                S('n') = E(NPTR),
++                S('l') = LLPRE,
++        },
++        { /* 2: ll-prefixed */
++                S('d') = E(LLONG),  S('i') = E(LLONG),
++                S('o') = E(LLONG),  S('u') = E(LLONG),  S('x') = E(LLONG),  S('X') = E(LLONG),
++                S('n') = E(NPTR),
++        },
++        { /* 3: h-prefixed */
++                S('d') = E(SHORT),  S('i') = E(SHORT),
++                S('o') = E(SHORT),  S('u') = E(SHORT),  S('x') = E(SHORT),  S('X') = E(SHORT),
++                S('n') = E(NPTR),
++                S('h') = HHPRE,
++        },
++        { /* 4: hh-prefixed */
++                S('d') = E(CHAR),   S('i') = E(CHAR),
++                S('o') = E(CHAR),   S('u') = E(CHAR),   S('x') = E(CHAR),   S('X') = E(CHAR),
++                S('n') = E(NPTR),
++        },
++        { /* 5: L-prefixed */
++                S('e') = E(LDBL),   S('f') = E(LDBL),   S('g') = E(LDBL),   S('a') = E(LDBL),
++                S('E') = E(LDBL),   S('F') = E(LDBL),   S('G') = E(LDBL),   S('A') = E(LDBL),
++        },
++        { /* 6: z- or t-prefixed (assumed to be same size) */
++                S('d') = E(SIZET),  S('i') = E(SIZET),
++                S('o') = E(SIZET),  S('u') = E(SIZET),  S('x') = E(SIZET),  S('X') = E(SIZET),
++                S('n') = E(NPTR),
++        },
++        { /* 7: j-prefixed */
++                S('d') = E(IMAX),   S('i') = E(IMAX),
++                S('o') = E(IMAX),   S('u') = E(IMAX),   S('x') = E(IMAX),   S('X') = E(IMAX),
++                S('n') = E(NPTR),
++        },
++};
++
++size_t missing_parse_printf_format(const char *fmt, size_t n, int *types) {
++        size_t i = 0;
++        size_t last = 0;
++
++        memset(types, 0, n);
++
++        for (;;) {
++                size_t arg;
++
++                fmt = consume_nonarg(fmt);
++                if (*fmt == '\0')
++                        break;
++                if (*fmt == '%') {
++                        fmt++;
++                        continue;
++                }
++                arg = 0;
++                fmt = consume_argn(fmt, &arg);
++                /* flags */
++                fmt = consume_flags(fmt);
++                /* width */
++                if (*fmt == '*') {
++                        size_t warg = 0;
++                        fmt = consume_argn(fmt+1, &warg);
++                        if (warg == 0)
++                                warg = ++i;
++                        if (warg > last)
++                                last = warg;
++                        if (warg <= n && types[warg-1] == NONE)
++                                types[warg-1] = INT;
++                } else
++                        fmt = consume_num(fmt);
++                /* precision */
++                if (*fmt == '.') {
++                        fmt++;
++                        if (*fmt == '*') {
++                                size_t parg = 0;
++                                fmt = consume_argn(fmt+1, &parg);
++                                if (parg == 0)
++                                        parg = ++i;
++                                if (parg > last)
++                                        last = parg;
++                                if (parg <= n && types[parg-1] == NONE)
++                                        types[parg-1] = INT;
++                        } else {
++                                if (*fmt == '-')
++                                        fmt++;
++                                fmt = consume_num(fmt);
++                        }
++                }
++                /* length modifier and conversion specifier */
++                unsigned state = BARE;
++                for (;;) {
++                        unsigned char c = *fmt;
++
++                        if (c == '\0')
++                                break;
++
++                        fmt++;
++
++                        if (c < 'A' || c > 'z')
++                                break;
++
++                        state = states[state]S(c);
++                        if (state == 0 || state >= STOP)
++                                break;
++                }
++
++                if (state <= STOP) /* %m or invalid format */
++                        continue;
++
++                if (arg == 0)
++                        arg = ++i;
++                if (arg > last)
++                        last = arg;
++                if (arg <= n)
++                        types[arg-1] = state - STOP;
++        }
++
++        if (last > n)
++                last = n;
++        for (i = 0; i < last; i++)
++                types[i] = state_to_pa_type(types[i]);
++
++        return last;
++}
+diff --git a/src/test/meson.build b/src/test/meson.build
+index da04b82d47..1dd61effc0 100644
+--- a/src/test/meson.build
++++ b/src/test/meson.build
+@@ -403,6 +403,12 @@ executables += [
+                 'dependencies' : libacl,
+                 'type' : 'manual',
+         },
++        test_template + {
++                'sources' : files(
++                        'test-printf.c',
++                        '../libc/musl/printf.c'
++                ),
++        },
+         test_template + {
+                 'sources' : files('test-process-util.c'),
+                 'dependencies' : threads,
+diff --git a/src/test/test-printf.c b/src/test/test-printf.c
+new file mode 100644
+index 0000000000..28497e902d
+--- /dev/null
++++ b/src/test/test-printf.c
+@@ -0,0 +1,67 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <../musl/printf.h>
++
++#include "memory-util.h"
++#include "strv.h"
++#include "tests.h"
++
++static void test_parse_printf_format_one(const char *fmt) {
++        int arg_types_x[128] = {}, arg_types_y[128] = {};
++        size_t x, y;
++
++        log_debug("/* %s(%s) */", __func__, fmt);
++
++        x = parse_printf_format(fmt, ELEMENTSOF(arg_types_x), arg_types_x);
++        y = missing_parse_printf_format(fmt, ELEMENTSOF(arg_types_y), arg_types_y);
++
++        for (size_t i = 0; i < x; i++)
++                log_debug("x[%zu]=%i", i, arg_types_x[i]);
++        for (size_t i = 0; i < y; i++)
++                log_debug("y[%zu]=%i", i, arg_types_y[i]);
++
++        ASSERT_EQ(memcmp_nn(arg_types_x, x * sizeof(int), arg_types_y, y * sizeof(int)), 0);
++}
++
++TEST(parse_printf_format) {
++        FOREACH_STRING(s, "d", "i", "o", "u", "x", "X", "n")
++                FOREACH_STRING(p, "", "hh", "h", "l", "ll", "j", "z", "Z", "t") {
++                        _cleanup_free_ char *fmt = NULL;
++
++                        ASSERT_NOT_NULL(fmt = strjoin("%", p, s));
++                        test_parse_printf_format_one(fmt);
++                }
++
++        FOREACH_STRING(s, "e", "E", "f", "F", "g", "G", "a", "A")
++                FOREACH_STRING(p, "", "L") {
++                        _cleanup_free_ char *fmt = NULL;
++
++                        ASSERT_NOT_NULL(fmt = strjoin("%", p, s));
++                        test_parse_printf_format_one(fmt);
++                }
++
++        FOREACH_STRING(s, "c", "s")
++                FOREACH_STRING(p, "", "l") {
++                        _cleanup_free_ char *fmt = NULL;
++
++                        ASSERT_NOT_NULL(fmt = strjoin("%", p, s));
++                        test_parse_printf_format_one(fmt);
++                }
++
++        FOREACH_STRING(s, "C", "S", "p", "m", "%") {
++                _cleanup_free_ char *fmt = NULL;
++
++                ASSERT_NOT_NULL(fmt = strjoin("%", s));
++                test_parse_printf_format_one(fmt);
++        }
++
++        test_parse_printf_format_one("asfhghejmlahpgakdmsalc");
++        test_parse_printf_format_one("%d%i%o%u%x%X");
++        test_parse_printf_format_one("%e%E%f%F%g%G%a%A");
++        test_parse_printf_format_one("%c%s%C%S%p%n%m%%");
++        test_parse_printf_format_one("%03d%-05d%+i%hhu%hu%hx%lx");
++        test_parse_printf_format_one("%llx%x%LE%ji%zi%zu%zi%zu%Zi%Zu%tu");
++        test_parse_printf_format_one("%l");
++}
++
++DEFINE_TEST_MAIN(LOG_DEBUG);
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch b/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
new file mode 100644
index 000000000000..dd09c69ce95f
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
@@ -0,0 +1,74 @@
+From 8fd471ff028cd3d5df5ee944fdbcefc7e77abc3d Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 23 Jan 2023 23:39:46 -0800
+Subject: [PATCH 10/30] musl: introduce GNU specific version of strerror_r()
+
+musl provides XSI compliant strerror_r(), and it is slightly different
+from the one by glibc.
+Let's introduce a tiny wrapper to convert XSI strerror_r() to GNU one.
+---
+ src/include/musl/string.h |  7 +++++++
+ src/libc/musl/meson.build |  1 +
+ src/libc/musl/string.c    | 26 ++++++++++++++++++++++++++
+ 3 files changed, 34 insertions(+)
+ create mode 100644 src/include/musl/string.h
+ create mode 100644 src/libc/musl/string.c
+
+diff --git a/src/include/musl/string.h b/src/include/musl/string.h
+new file mode 100644
+index 0000000000..cc3da63012
+--- /dev/null
++++ b/src/include/musl/string.h
+@@ -0,0 +1,7 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <string.h>
++
++char* strerror_r_gnu(int errnum, char *buf, size_t buflen);
++#define strerror_r strerror_r_gnu
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index 3e205e1eb1..a64f292081 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -7,4 +7,5 @@ endif
+ libc_wrapper_sources += files(
+         'printf.c',
+         'stdio.c',
++        'string.c',
+ )
+diff --git a/src/libc/musl/string.c b/src/libc/musl/string.c
+new file mode 100644
+index 0000000000..c2a9f4a169
+--- /dev/null
++++ b/src/libc/musl/string.c
+@@ -0,0 +1,26 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <errno.h>
++#include <stdio.h>
++#include <string.h>
++
++/* The header errno.h overrides strerror_r with strerror_r_gnu, hence we need to undef it here. */
++#undef strerror_r
++
++char* strerror_r_gnu(int errnum, char *buf, size_t buflen) {
++        int saved_errno = errno;
++        const char *msg = strerror(errnum);
++        size_t l = strlen(msg);
++        if (l >= buflen) {
++                if (buflen > 0) {
++                        if (buflen > 1)
++                                memcpy(buf, msg, buflen - 1);
++                        buf[buflen - 1] = '\0';
++                }
++                errno = ERANGE;
++        } else {
++                memcpy(buf, msg, l + 1);
++                errno = saved_errno;
++        }
++        return buf;
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch b/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch
new file mode 100644
index 000000000000..bbffbc8c8a53
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch
@@ -0,0 +1,137 @@
+From bf670a5af2a78f81ee9396b5b5da49b2df07fcfd Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 08:31:22 +0900
+Subject: [PATCH 11/30] musl: make strptime() accept "%z"
+
+musl v1.2.5 does not support %z specifier in strptime(). Since
+https://github.com/kraj/musl/commit/fced99e93daeefb0192fd16304f978d4401d1d77
+%z is supported, but it only supports strict RFC-822/ISO 8601 format,
+that is, 4 digits with sign (e.g. +0900 or -1400), but does not support
+extended format: 2 digits or colon separated 4 digits (e.g. +09 or -14:00).
+Let's add fallback logic to make it support the extended timezone spec.
+---
+ src/include/musl/time.h   |  7 ++++
+ src/libc/musl/meson.build |  1 +
+ src/libc/musl/time.c      | 86 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 94 insertions(+)
+ create mode 100644 src/include/musl/time.h
+ create mode 100644 src/libc/musl/time.c
+
+diff --git a/src/include/musl/time.h b/src/include/musl/time.h
+new file mode 100644
+index 0000000000..349f9a3577
+--- /dev/null
++++ b/src/include/musl/time.h
+@@ -0,0 +1,7 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <time.h>
++
++char* strptime_fallback(const char *s, const char *format, struct tm *tm);
++#define strptime strptime_fallback
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index a64f292081..5fb590e868 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -8,4 +8,5 @@ libc_wrapper_sources += files(
+         'printf.c',
+         'stdio.c',
+         'string.c',
++        'time.c',
+ )
+diff --git a/src/libc/musl/time.c b/src/libc/musl/time.c
+new file mode 100644
+index 0000000000..12108166b2
+--- /dev/null
++++ b/src/libc/musl/time.c
+@@ -0,0 +1,86 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <stdbool.h>
++#include <string.h>
++#include <time.h>
++
++/* The header time.h overrides strptime with strerror_fallback, hence we need to undef it here. */
++#undef strptime
++
++char* strptime_fallback(const char *s, const char *format, struct tm *tm) {
++        /* First try native strptime() as is, and if it succeeds, return the resuit as is. */
++        char *k = strptime(s, format, tm);
++        if (k)
++                return k;
++
++        /* Check inputs for safety. */
++        if (!s || !format || !tm)
++                return NULL;
++
++        /* We only fallback if the format is exactly "%z". */
++        if (strcmp(format, "%z") != 0)
++                return NULL;
++
++        /* In the below, we parse timezone specifiction compatible with RFC-822/ISO 8601 and its extensions
++         * (e.g. +06, +0900, or -03:00). */
++
++        bool positive;
++        switch (*s) {
++        case '+':
++                positive = true;
++                break;
++        case '-':
++                positive = false;
++                break;
++        default:
++                return NULL;
++        }
++
++        s++;
++
++        if (*s < '0' || *s > '9')
++                return NULL;
++        long t = (*s - '0') * 10 * 60 * 60;
++
++        s++;
++
++        if (*s < '0' || *s > '9')
++                return NULL;
++        t += (*s - '0') * 60 * 60;
++
++        s++;
++
++        if (*s == '\0') /* 2 digits case */
++                goto finalize;
++
++        if (*s == ':') /* skip colon */
++                s++;
++
++        if (*s < '0' || *s >= '6') /* refuse minutes equal to or larger than 60 */
++                return NULL;
++        t += (*s - '0') * 10 * 60;
++
++        s++;
++
++        if (*s < '0' || *s > '9')
++                return NULL;
++        t += (*s - '0') * 60;
++
++        s++;
++
++        if (*s != '\0')
++                return NULL;
++
++finalize:
++        if (t > 24 * 60 * 60) /* refuse larger than 24 hours */
++                return NULL;
++
++        if (!positive)
++                t = -t;
++
++        *tm = (struct tm) {
++                .tm_gmtoff = t,
++        };
++
++        return (char*) s;
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch b/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
new file mode 100644
index 000000000000..2833a951a3d2
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
@@ -0,0 +1,69 @@
+From d97f38a2ffd0aca2a1d7b8a5bbbd1994e786c7bc Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 09:10:44 +0900
+Subject: [PATCH 12/30] musl: make strtoll() accept strings start with dot
+
+glibc accepts strings start with '.' and returns 0, but musl refuses
+them. Let's accept them, as our code assumes the function accept such
+strings.
+---
+ src/include/musl/stdlib.h |  7 +++++++
+ src/libc/musl/meson.build |  1 +
+ src/libc/musl/stdlib.c    | 19 +++++++++++++++++++
+ 3 files changed, 27 insertions(+)
+ create mode 100644 src/include/musl/stdlib.h
+ create mode 100644 src/libc/musl/stdlib.c
+
+diff --git a/src/include/musl/stdlib.h b/src/include/musl/stdlib.h
+new file mode 100644
+index 0000000000..ecfd6ccb43
+--- /dev/null
++++ b/src/include/musl/stdlib.h
+@@ -0,0 +1,7 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <stdlib.h>
++
++long long strtoll_fallback(const char *nptr, char **endptr, int base);
++#define strtoll strtoll_fallback
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index 5fb590e868..ea09af9fa5 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -7,6 +7,7 @@ endif
+ libc_wrapper_sources += files(
+         'printf.c',
+         'stdio.c',
++        'stdlib.c',
+         'string.c',
+         'time.c',
+ )
+diff --git a/src/libc/musl/stdlib.c b/src/libc/musl/stdlib.c
+new file mode 100644
+index 0000000000..d4e2714217
+--- /dev/null
++++ b/src/libc/musl/stdlib.c
+@@ -0,0 +1,19 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <stdlib.h>
++
++/* The header stdlib.h overrides strtoll with strtoll_fallback, hence we need to undef it here. */
++#undef strtoll
++
++long long strtoll_fallback(const char *nptr, char **endptr, int base) {
++        /* glibc returns 0 if the first character is '.' without error, but musl returns as an error.
++         * As our code assumes the glibc behavior, let's accept string starts with '.'. */
++        if (nptr && *nptr == '.') {
++                if (endptr)
++                        *endptr = (char*) nptr;
++                return 0;
++        }
++
++        /* Otherwise, use the native strtoll(). */
++        return strtoll(nptr, endptr, base);
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch b/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch
new file mode 100644
index 000000000000..5203caf09f3d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch
@@ -0,0 +1,86 @@
+From 96b9f85d08be6f60768d1ebcdaf77e8e5dafebf6 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Fri, 5 Sep 2025 09:20:50 +0900
+Subject: [PATCH 13/30] musl: introduce strerrorname_np()
+
+musl does not provide strerrorname_np(). Thus, we need to implement it.
+---
+ src/include/musl/string.h                 |  2 ++
+ src/libc/musl/generate-strerrorname_np.sh | 39 +++++++++++++++++++++++
+ src/libc/musl/meson.build                 |  7 ++++
+ 3 files changed, 48 insertions(+)
+ create mode 100755 src/libc/musl/generate-strerrorname_np.sh
+
+diff --git a/src/include/musl/string.h b/src/include/musl/string.h
+index cc3da63012..7317c8dea0 100644
+--- a/src/include/musl/string.h
++++ b/src/include/musl/string.h
+@@ -5,3 +5,5 @@
+ 
+ char* strerror_r_gnu(int errnum, char *buf, size_t buflen);
+ #define strerror_r strerror_r_gnu
++
++const char* strerrorname_np(int errnum);
+diff --git a/src/libc/musl/generate-strerrorname_np.sh b/src/libc/musl/generate-strerrorname_np.sh
+new file mode 100755
+index 0000000000..0e0fb8b187
+--- /dev/null
++++ b/src/libc/musl/generate-strerrorname_np.sh
+@@ -0,0 +1,39 @@
++#!/usr/bin/env bash
++# SPDX-License-Identifier: LGPL-2.1-or-later
++set -eu
++set -o pipefail
++
++# This is based on src/basic/generate-errno-list.sh.
++
++# ECANCELLED, EDEADLOCK, ENOTSUP, EREFUSED, and EWOULDBLOCK are defined as aliases of
++# ECANCELED, EDEADLK, EOPNOTSUPP, ECONNREFUSED, and EAGAIN, respectively. Let's drop them.
++
++CC=${1:?}
++shift
++
++cat <<'EOF'
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <errno.h>
++#include <stddef.h>
++#include <string.h>
++
++static const char * const errno_table[] = {
++EOF
++
++$CC -dM -include errno.h - </dev/null | \
++    grep -Ev '^#define[[:space:]]+(ECANCELLED|EDEADLOCK|ENOTSUP|EREFUSED|EWOULDBLOCK)' | \
++    awk '/^#define[ \t]+E[^ _]+[ \t]+/ { printf "        [%s] = \"%s\",\n", $2, $2; }' | \
++    sort
++
++cat <<'EOF'
++};
++
++const char* strerrorname_np(int errnum) {
++        if (errnum < 0)
++                errnum = -errnum;
++        if ((size_t) errnum >= sizeof(errno_table) / sizeof(errno_table[0]))
++                return NULL;
++        return errno_table[errnum];
++}
++EOF
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index ea09af9fa5..1cb6bf28c1 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -11,3 +11,10 @@ libc_wrapper_sources += files(
+         'string.c',
+         'time.c',
+ )
++
++generator= files('generate-strerrorname_np.sh')
++libc_wrapper_sources += custom_target(
++        input : generator,
++        output : 'strerrorname_np.c',
++        command : [env, 'bash', generator, cpp],
++        capture : true)
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch b/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
new file mode 100644
index 000000000000..41a8c6b4e2aa
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
@@ -0,0 +1,60 @@
+From 331e8b9158f1bb3b4ff5db2c17a16a60640e0c12 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 10 Jun 2025 00:40:59 +0900
+Subject: [PATCH 14/30] musl: introduce dummy functions for mallinfo(),
+ malloc_info(), and malloc_trim()
+
+These functions are not provided by musl.
+---
+ src/include/musl/malloc.h | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+ create mode 100644 src/include/musl/malloc.h
+
+diff --git a/src/include/musl/malloc.h b/src/include/musl/malloc.h
+new file mode 100644
+index 0000000000..9d15d4bf91
+--- /dev/null
++++ b/src/include/musl/malloc.h
+@@ -0,0 +1,39 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include <errno.h>
++#include <stdio.h>
++
++/* struct mallinfo2 will be defined and struct mallinfo is converted to struct mallinfo2 in
++ * override/malloc.h. Hence, here we define struct mallinfo. */
++
++struct mallinfo {
++        int arena;    /* non-mmapped space allocated from system */
++        int ordblks;  /* number of free chunks */
++        int smblks;   /* number of fastbin blocks */
++        int hblks;    /* number of mmapped regions */
++        int hblkhd;   /* space in mmapped regions */
++        int usmblks;  /* always 0, preserved for backwards compatibility */
++        int fsmblks;  /* space available in freed fastbin blocks */
++        int uordblks; /* total allocated space */
++        int fordblks; /* total free space */
++        int keepcost; /* top-most, releasable (via malloc_trim) space */
++};
++
++static inline struct mallinfo mallinfo(void) {
++        return (struct mallinfo) {};
++}
++
++static inline int malloc_info(int options, FILE *stream) {
++        if (options != 0)
++                errno = EINVAL;
++        else
++                errno = EOPNOTSUPP;
++        return -1;
++}
++
++static inline int malloc_trim(size_t pad) {
++        return 0;
++}
++
++#include_next <malloc.h>
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch b/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
new file mode 100644
index 000000000000..4ec71eb7e25a
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
@@ -0,0 +1,86 @@
+From 5067b1cfac07dbb50d7813b2a900b1b6f8e6e4bd Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 8 Jun 2025 10:07:54 +0900
+Subject: [PATCH 15/30] musl: introduce dummy function for
+ gnu_get_libc_version()
+
+As the header gnu/libc-version.h and gnu_get_libc_version() function
+are glibc specific, and musl does not provide them.
+---
+ src/include/musl/gnu/libc-version.h | 8 ++++++++
+ src/shared/condition.c              | 9 +++++++--
+ src/test/test-condition.c           | 8 +++++---
+ 3 files changed, 20 insertions(+), 5 deletions(-)
+ create mode 100644 src/include/musl/gnu/libc-version.h
+
+diff --git a/src/include/musl/gnu/libc-version.h b/src/include/musl/gnu/libc-version.h
+new file mode 100644
+index 0000000000..8ad0ed16b8
+--- /dev/null
++++ b/src/include/musl/gnu/libc-version.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include <stddef.h>
++
++static inline const char* gnu_get_libc_version(void) {
++        return NULL;
++}
+diff --git a/src/shared/condition.c b/src/shared/condition.c
+index b09eff1bfb..b27b24aba7 100644
+--- a/src/shared/condition.c
++++ b/src/shared/condition.c
+@@ -255,8 +255,13 @@ static int condition_test_version(Condition *c, char **env) {
+         if (streq(word, "systemd"))
+                 return condition_test_version_cmp(p, STRINGIFY(PROJECT_VERSION));
+ 
+-        if (streq(word, "glibc"))
+-                return condition_test_version_cmp(p, gnu_get_libc_version());
++        if (streq(word, "glibc")) {
++                const char *v = gnu_get_libc_version();
++                if (!v)
++                        return false; /* built with musl */
++
++                return condition_test_version_cmp(p, v);
++        }
+ 
+         /* if no predicate has been set, default to "kernel" and use the whole parameter as condition */
+         if (!streq(word, "kernel"))
+diff --git a/src/test/test-condition.c b/src/test/test-condition.c
+index 11b3a42418..898c111ffe 100644
+--- a/src/test/test-condition.c
++++ b/src/test/test-condition.c
+@@ -669,8 +669,10 @@ TEST(condition_test_version) {
+         condition_free(condition);
+ 
+         /* Test glibc version */
++        bool expected = !!gnu_get_libc_version();
++
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 1", false, false)));
+-        ASSERT_OK_POSITIVE(condition_test(condition, environ));
++        ASSERT_OK_EQ(condition_test(condition, environ), expected);
+         condition_free(condition);
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 2", false, false)));
+@@ -678,7 +680,7 @@ TEST(condition_test_version) {
+         condition_free(condition);
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 9999", false, false)));
+-        ASSERT_OK_POSITIVE(condition_test(condition, environ));
++        ASSERT_OK_EQ(condition_test(condition, environ), expected);
+         condition_free(condition);
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 9999", false, false)));
+@@ -688,7 +690,7 @@ TEST(condition_test_version) {
+         v = strjoina("glibc = ", gnu_get_libc_version());
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, v, false, false)));
+-        ASSERT_OK_POSITIVE(condition_test(condition, environ));
++        ASSERT_OK_EQ(condition_test(condition, environ), expected);
+         condition_free(condition);
+ 
+         v = strjoina("glibc != ", gnu_get_libc_version());
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch b/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch
new file mode 100644
index 000000000000..16fc6570320a
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch
@@ -0,0 +1,30 @@
+From 65a6110f75e3bcf980aa4138ad18c06f351b78f5 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 14:00:55 +0900
+Subject: [PATCH 16/30] musl: define __THROW when not defined
+
+__THROW is internally used by glibc headers, hence our implementation of
+net/if.h and sys/mount.h also use it. However, musl does not provide
+the macro. Let's define it when not defined.
+---
+ src/include/musl/features.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 src/include/musl/features.h
+
+diff --git a/src/include/musl/features.h b/src/include/musl/features.h
+new file mode 100644
+index 0000000000..bd6d00a9d4
+--- /dev/null
++++ b/src/include/musl/features.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <features.h>
++
++#ifndef __THROW
++#define __THROW
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
new file mode 100644
index 000000000000..4d733f000d47
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
@@ -0,0 +1,29 @@
+From 75aa46c9399664d2a1cdabefcad2899ebfabc741 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 23 Jun 2025 16:00:21 +0900
+Subject: [PATCH 17/30] musl: replace sys/prctl.h with our own implementation
+
+To avoid conflicts between musl's sys/prctl.h and linux/prctl.h.
+---
+ src/include/musl/sys/prctl.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 src/include/musl/sys/prctl.h
+
+diff --git a/src/include/musl/sys/prctl.h b/src/include/musl/sys/prctl.h
+new file mode 100644
+index 0000000000..2c830d2649
+--- /dev/null
++++ b/src/include/musl/sys/prctl.h
+@@ -0,0 +1,9 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++/* This is for avoiding conflicts between musl's sys/prctl.h and linux/prctl.h. */
++
++#include <features.h>
++#include <linux/prctl.h>        /* IWYU pragma: export */
++
++int prctl(int, ...);
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch b/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
new file mode 100644
index 000000000000..c0044956ad0f
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
@@ -0,0 +1,72 @@
+From 6e77a74ca91e689a43651d9eeb5f8f40893eed76 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 23 Jun 2025 16:08:37 +0900
+Subject: [PATCH 18/30] musl: replace netinet/if_ether.h with our own
+ implementation
+
+musl's netinet/if_ether.h conflicts with linux/if_ether.h.
+The reimplementation is mostly equivalent with what glibc does.
+
+This also unset __UAPI_DEF_ETHHDR before including linux/if_ether.h,
+otherwise struct ethhdr may not be defined by the header when it is
+defined.
+---
+ src/include/musl/linux/if_ether.h   |  5 +++++
+ src/include/musl/netinet/if_ether.h | 33 +++++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+)
+ create mode 100644 src/include/musl/linux/if_ether.h
+ create mode 100644 src/include/musl/netinet/if_ether.h
+
+diff --git a/src/include/musl/linux/if_ether.h b/src/include/musl/linux/if_ether.h
+new file mode 100644
+index 0000000000..e28cd4a014
+--- /dev/null
++++ b/src/include/musl/linux/if_ether.h
+@@ -0,0 +1,5 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#undef __UAPI_DEF_ETHHDR
++#include_next <linux/if_ether.h>
+diff --git a/src/include/musl/netinet/if_ether.h b/src/include/musl/netinet/if_ether.h
+new file mode 100644
+index 0000000000..62f4ac03b3
+--- /dev/null
++++ b/src/include/musl/netinet/if_ether.h
+@@ -0,0 +1,33 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++/* glibc's netinet/if_ether.h does the following:
++ * - include linux/if_ether.h, net/ethernet.h, and net/if_arp.h,
++ * - define struct ether_arp, and relevant macros,
++ * - define ETHER_MAP_IP_MULTICAST() macro (currently we do not use it).
++ * However, musl's netinet/if_ether.h conflicts with linux/if_ether.h.
++ * Let's use the same way that glibc uses. */
++
++#include <linux/if_ether.h>     /* IWYU pragma: export */
++#include <net/ethernet.h>       /* IWYU pragma: export */
++#include <net/if_arp.h>         /* IWYU pragma: export */
++
++/*
++ * Ethernet Address Resolution Protocol.
++ *
++ * See RFC 826 for protocol description.  Structure below is adapted
++ * to resolving internet addresses.  Field names used correspond to
++ * RFC 826.
++ */
++struct  ether_arp {
++        struct  arphdr ea_hdr;          /* fixed-size header */
++        uint8_t arp_sha[ETH_ALEN];      /* sender hardware address */
++        uint8_t arp_spa[4];             /* sender protocol address */
++        uint8_t arp_tha[ETH_ALEN];      /* target hardware address */
++        uint8_t arp_tpa[4];             /* target protocol address */
++};
++#define arp_hrd ea_hdr.ar_hrd
++#define arp_pro ea_hdr.ar_pro
++#define arp_hln ea_hdr.ar_hln
++#define arp_pln ea_hdr.ar_pln
++#define arp_op  ea_hdr.ar_op
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch b/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
new file mode 100644
index 000000000000..24855be78c21
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
@@ -0,0 +1,35 @@
+From 7d4b4e49729f7c7d5164ba2c5040ed522d68ee7a Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Mon, 25 Feb 2019 15:00:06 +0800
+Subject: [PATCH 19/30] musl: add missing FTW_CONTINUE macro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is to avoid build failures like below for musl.
+
+  test-recurse-dir.c:23:24: error: ‘FTW_CONTINUE’ undeclared
+
+Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
+---
+ src/include/musl/ftw.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 src/include/musl/ftw.h
+
+diff --git a/src/include/musl/ftw.h b/src/include/musl/ftw.h
+new file mode 100644
+index 0000000000..fd153734d0
+--- /dev/null
++++ b/src/include/musl/ftw.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <ftw.h>
++
++#ifndef FTW_CONTINUE
++#define FTW_CONTINUE 0
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch b/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch
new file mode 100644
index 000000000000..6dd1589019b0
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch
@@ -0,0 +1,90 @@
+From c306693ac26aef3d5fb06fa0981d911bda9b93d7 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 22 Jun 2025 00:38:58 +0900
+Subject: [PATCH 20/30] musl: add several missing statx macros
+
+glibc's sys/stat.h includes linux/stat.h, and we have copy of it from
+the latest kernel, hence all new flags are always defined.
+However, musl's sys/stat.h does not include linux/stat.h, and moreover,
+they conflict with each other, hence we cannot include both header
+simultaneously. Let's define missing macros to support musl.
+---
+ src/include/musl/sys/stat.h | 66 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 insertions(+)
+ create mode 100644 src/include/musl/sys/stat.h
+
+diff --git a/src/include/musl/sys/stat.h b/src/include/musl/sys/stat.h
+new file mode 100644
+index 0000000000..610dd3e699
+--- /dev/null
++++ b/src/include/musl/sys/stat.h
+@@ -0,0 +1,66 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <sys/stat.h>
++
++#include <assert.h>
++#include <stddef.h>
++
++/* musl's sys/stat.h does not include linux/stat.h, and unfortunately they conflict with each other.
++ * Hence, some relatively new macros need to be explicitly defined here. */
++
++/* Before 23ab04a8630225371455d5f4538fd078665bb646, statx.stx_mnt_id is not defined. */
++#ifndef STATX_MNT_ID
++static_assert(offsetof(struct statx, __pad1) == offsetof(struct statx, stx_dev_minor) + sizeof(uint32_t), "");
++#define stx_mnt_id __pad1[0]
++#endif
++
++#ifndef STATX_MNT_ID
++#define STATX_MNT_ID            0x00001000U
++#endif
++#ifndef STATX_DIOALIGN
++#define STATX_DIOALIGN          0x00002000U
++#endif
++#ifndef STATX_MNT_ID_UNIQUE
++#define STATX_MNT_ID_UNIQUE     0x00004000U
++#endif
++#ifndef STATX_SUBVOL
++#define STATX_SUBVOL            0x00008000U
++#endif
++#ifndef STATX_WRITE_ATOMIC
++#define STATX_WRITE_ATOMIC      0x00010000U
++#endif
++#ifndef STATX_DIO_READ_ALIGN
++#define STATX_DIO_READ_ALIGN    0x00020000U
++#endif
++
++#ifndef STATX_ATTR_COMPRESSED
++#define STATX_ATTR_COMPRESSED   0x00000004
++#endif
++#ifndef STATX_ATTR_IMMUTABLE
++#define STATX_ATTR_IMMUTABLE    0x00000010
++#endif
++#ifndef STATX_ATTR_APPEND
++#define STATX_ATTR_APPEND       0x00000020
++#endif
++#ifndef STATX_ATTR_NODUMP
++#define STATX_ATTR_NODUMP       0x00000040
++#endif
++#ifndef STATX_ATTR_ENCRYPTED
++#define STATX_ATTR_ENCRYPTED    0x00000800
++#endif
++#ifndef STATX_ATTR_AUTOMOUNT
++#define STATX_ATTR_AUTOMOUNT    0x00001000
++#endif
++#ifndef STATX_ATTR_MOUNT_ROOT
++#define STATX_ATTR_MOUNT_ROOT   0x00002000
++#endif
++#ifndef STATX_ATTR_VERITY
++#define STATX_ATTR_VERITY       0x00100000
++#endif
++#ifndef STATX_ATTR_DAX
++#define STATX_ATTR_DAX          0x00200000
++#endif
++#ifndef STATX_ATTR_WRITE_ATOMIC
++#define STATX_ATTR_WRITE_ATOMIC 0x00400000
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch b/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
new file mode 100644
index 000000000000..a024e58f2d25
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
@@ -0,0 +1,36 @@
+From a8209a45e73f4c8b1f4e4e174d2d5fbc8a9ac4df Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 22 Jul 2025 03:37:37 +0900
+Subject: [PATCH 21/30] musl: avoid conflict between fcntl.h and our forward.h
+
+glibc defines AT_FDCWD as -100, but musl defines it as (-100).
+In forward.h, we also define AT_FDCWD as -100, hence musl's fcntl.h
+conflicts with forward.h. This is for avoiding the conflict.
+---
+ src/include/musl/fcntl.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 src/include/musl/fcntl.h
+
+diff --git a/src/include/musl/fcntl.h b/src/include/musl/fcntl.h
+new file mode 100644
+index 0000000000..e69f13087d
+--- /dev/null
++++ b/src/include/musl/fcntl.h
+@@ -0,0 +1,14 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++/* glibc defines AT_FDCWD as -100, but musl defines it as (-100). Hence, musl's fcntl.h conflicts with
++ * forward.h. To avoid the conflict, here temporary undef AT_FDCWD before including fcntl.h. */
++#ifdef AT_FDCWD
++#undef AT_FDCWD
++#endif
++
++#include_next <fcntl.h>
++
++/* Then, undef AT_FDCWD by fcntl.h and redefine it as consistent with forward.h */
++#undef AT_FDCWD
++#define AT_FDCWD -100
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch b/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
new file mode 100644
index 000000000000..4e47c4c14e1d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
@@ -0,0 +1,29 @@
+From 4a06464ea72d06859c54fca4d7bc361e2f4b069c Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 7 Sep 2025 06:16:02 +0900
+Subject: [PATCH 22/30] musl: redefine HOST_NAME_MAX as 64
+
+glibc defines HOST_NAME_MAX as 64 and our code rely on that, but musl
+defines the constant as 255. Let's redefine it.
+---
+ src/include/musl/limits.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 src/include/musl/limits.h
+
+diff --git a/src/include/musl/limits.h b/src/include/musl/limits.h
+new file mode 100644
+index 0000000000..fadf71d66f
+--- /dev/null
++++ b/src/include/musl/limits.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <limits.h>
++
++/* HOST_NAME_MAX should be 64 on linux, but musl uses the one by POSIX (255). */
++#undef HOST_NAME_MAX
++#define HOST_NAME_MAX 64
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch b/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
new file mode 100644
index 000000000000..a397f554fb89
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
@@ -0,0 +1,62 @@
+From 1aecd86536aef53e92a4903794259300815a9e62 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 1 Jul 2025 12:53:14 +0900
+Subject: [PATCH 23/30] musl: avoid multiple evaluations in CPU_ISSET_S() macro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+musl's CPU_ISSET_S() macro does not avoid multiple evaluations, and it
+only accepts simple variable or constant.
+
+Fixes the following error.
+```
+../src/shared/cpu-set-util.c: In function ‘cpu_set_to_mask_string’:
+../src/shared/cpu-set-util.c:101:41: warning: operation on ‘i’ may be undefined [-Werror=sequence-point]
+  101 |                         if (CPU_ISSET_S(--i, c->allocated, c->set))
+      |                                         ^
+```
+---
+ src/include/musl/sched.h | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+ create mode 100644 src/include/musl/sched.h
+
+diff --git a/src/include/musl/sched.h b/src/include/musl/sched.h
+new file mode 100644
+index 0000000000..d6e7100ee4
+--- /dev/null
++++ b/src/include/musl/sched.h
+@@ -0,0 +1,30 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <sched.h>
++
++/* This is for avoiding multiple evaluations in musl's __CPU_op_S() macro. */
++
++#undef __CPU_op_S
++#undef CPU_SET_S
++#undef CPU_CLR_S
++#undef CPU_ISSET_S
++#undef CPU_SET
++#undef CPU_CLR
++#undef CPU_ISSET
++
++#define __CPU_op_S(i, size, set, op) \
++        ({                           \
++                typeof(i) _i = (i);                                     \
++                                                                        \
++                _i / 8U >= (size) ? 0 :                                 \
++                        (((unsigned long*) (set))[_i / 8 / sizeof(long)] op (1UL << (_i % (8 * sizeof(long))))); \
++        })
++
++#define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=)
++#define CPU_CLR_S(i, size, set) __CPU_op_S(i, size, set, &=~)
++#define CPU_ISSET_S(i, size, set) __CPU_op_S(i, size, set, &)
++
++#define CPU_SET(i, set) CPU_SET_S(i, sizeof(cpu_set_t), set)
++#define CPU_CLR(i, set) CPU_CLR_S(i, sizeof(cpu_set_t), set)
++#define CPU_ISSET(i, set) CPU_ISSET_S(i, sizeof(cpu_set_t), set)
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch b/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
new file mode 100644
index 000000000000..5a173be962be
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
@@ -0,0 +1,57 @@
+From c00d31373a8f5b922dd947a6d6d6098df0429762 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 7 Sep 2025 08:53:07 +0900
+Subject: [PATCH 24/30] musl: core: there is one less usable signal when built
+ with musl
+
+musl internally reserves one more signal, hence we can only use 29
+signals.
+---
+ src/core/manager.c          | 4 ++--
+ src/test/test-signal-util.c | 7 ++++++-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index d85896577f..86cb11905f 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -526,7 +526,7 @@ static int manager_setup_signals(Manager *m) {
+         assert_se(sigaction(SIGCHLD, &sa, NULL) == 0);
+ 
+         /* We make liberal use of realtime signals here. On Linux/glibc we have 30 of them, between
+-         * SIGRTMIN+0 ... SIGRTMIN+30 (aka SIGRTMAX). */
++         * SIGRTMIN+0 ... SIGRTMIN+30 (aka SIGRTMAX). When musl is used SIGRTMAX is SIGRTMIN+29. */
+ 
+         assert_se(sigemptyset(&mask) == 0);
+         sigset_add_many(&mask,
+@@ -571,7 +571,7 @@ static int manager_setup_signals(Manager *m) {
+                         SIGRTMIN+28, /* systemd: set log target to kmsg */
+                         SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete) */
+ 
+-                        /* ... one free signal here SIGRTMIN+30 ... */
++                        /* ... one free signal here SIGRTMIN+30 (glibc only) ... */
+                         -1);
+         assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+ 
+diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
+index 7d069a7fb2..f26b48f3f2 100644
+--- a/src/test/test-signal-util.c
++++ b/src/test/test-signal-util.c
+@@ -13,8 +13,13 @@ TEST(rt_signals) {
+         info(SIGRTMIN);
+         info(SIGRTMAX);
+ 
+-        /* We use signals SIGRTMIN+0 to SIGRTMIN+30 unconditionally */
++        /* We use signals SIGRTMIN+0 to SIGRTMIN+29 unconditionally. SIGRTMIN+30 can be used only when
++         * built with glibc. */
++#ifdef __GLIBC__
+         assert_se(SIGRTMAX - SIGRTMIN >= 30);
++#else
++        assert_se(SIGRTMAX - SIGRTMIN >= 29);
++#endif
+ }
+ 
+ static void test_signal_to_string_one(int val) {
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch b/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
new file mode 100644
index 000000000000..4a78440837ed
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
@@ -0,0 +1,33 @@
+From 7cade54777e9b715ca5b1023dd8fead64d1f4b3e Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 6 Sep 2025 12:06:06 +0900
+Subject: [PATCH 25/30] musl: build-path: fix reading DT_RUNPATH or DT_RPATH
+
+musl records DT_STRTAB as offset, rather than address. So, need to add
+obtained bias to read runpath or rpath.
+---
+ src/basic/build-path.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/basic/build-path.c b/src/basic/build-path.c
+index 577ff72bce..3212089379 100644
+--- a/src/basic/build-path.c
++++ b/src/basic/build-path.c
+@@ -34,11 +34,11 @@ static int get_runpath_from_dynamic(const ElfW(Dyn) *d, ElfW(Addr) bias, const c
+                         break;
+ 
+                 case DT_STRTAB:
+-                        /* On MIPS and RISC-V DT_STRTAB records an offset, not a valid address, so it has to be adjusted
+-                         * using the bias calculated earlier. */
++                        /* On MIPS, RISC-V, or with musl, DT_STRTAB records an offset, not a valid address,
++                         * so it has to be adjusted using the bias calculated earlier. */
+                         if (d->d_un.d_val != 0)
+                                 strtab = (const char *) ((uintptr_t) d->d_un.d_val
+-#if defined(__mips__) || defined(__riscv)
++#if defined(__mips__) || defined(__riscv) || !defined(__GLIBC__)
+                                          + bias
+ #endif
+                                 );
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch b/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
new file mode 100644
index 000000000000..e59e6aeae62c
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
@@ -0,0 +1,57 @@
+From 65cd003563fe1b8f1f1b3e1c1198b3d63f993820 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 12:00:01 +0900
+Subject: [PATCH 26/30] musl: format-util: use %llu for formatting rlim_t
+
+glibc uses uint32_t or uint64_t for rlim_t, while musl uses unsigned long long.
+---
+ meson.build             |  7 +++++++
+ src/basic/format-util.h | 14 ++++++++------
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5f235d5113..66579b9182 100644
+--- a/meson.build
++++ b/meson.build
+@@ -572,6 +572,13 @@ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h
+ conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
+ conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
+ 
++if get_option('libc') == 'musl'
++        if conf.get('SIZEOF_RLIM_T') != 8
++                error('Unexpected size of rlim_t: @0@'.format(conf.get('SIZEOF_RLIM_T')))
++        endif
++        conf.set_quoted('RLIM_FMT', '%llu')
++endif
++
+ long_max = cc.compute_int(
+         'LONG_MAX',
+         prefix : '#include <limits.h>',
+diff --git a/src/basic/format-util.h b/src/basic/format-util.h
+index e42f788ce6..d40ca5818a 100644
+--- a/src/basic/format-util.h
++++ b/src/basic/format-util.h
+@@ -39,12 +39,14 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
+ #  error Unknown timex member size
+ #endif
+ 
+-#if SIZEOF_RLIM_T == 8
+-#  define RLIM_FMT "%" PRIu64
+-#elif SIZEOF_RLIM_T == 4
+-#  define RLIM_FMT "%" PRIu32
+-#else
+-#  error Unknown rlim_t size
++#ifndef RLIM_FMT
++#  if SIZEOF_RLIM_T == 8
++#    define RLIM_FMT "%" PRIu64
++#  elif SIZEOF_RLIM_T == 4
++#    define RLIM_FMT "%" PRIu32
++#  else
++#    error Unknown rlim_t size
++#  endif
+ #endif
+ 
+ #if SIZEOF_DEV_T == 8
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch b/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
new file mode 100644
index 000000000000..fd9a00fb3b5d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
@@ -0,0 +1,47 @@
+From 524396a3058a08955683038dae86cf5aaaf10847 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 8 Sep 2025 15:08:49 +0900
+Subject: [PATCH 27/30] musl: time-util: skip tm.tm_wday check
+
+musl does not set tm_wday when it is explicitly requested.
+The check is not necessary at all, it is just for safety.
+Let's skip it when built with musl.
+---
+ src/basic/time-util.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index 38591b0604..c890141a99 100644
+--- a/src/basic/time-util.c
++++ b/src/basic/time-util.c
+@@ -668,10 +668,14 @@ static int parse_timestamp_impl(
+         _cleanup_free_ char *t_alloc = NULL;
+         usec_t usec, plus = 0, minus = 0;
+         bool with_tz = false;
+-        int r, weekday = -1;
+         unsigned fractional = 0;
+         const char *k;
+         struct tm tm, copy;
++        int r;
++#ifndef __GLIBC__
++        _unused_
++#endif
++        int weekday = -1;
+ 
+         /* Allowed syntaxes:
+          *
+@@ -921,8 +925,11 @@ from_tm:
+         assert(plus == 0);
+         assert(minus == 0);
+ 
++#ifdef __GLIBC__
++        /* musl does not set tm_wday field and set 0 unless it is explicitly requested by %w or so. */
+         if (weekday >= 0 && tm.tm_wday != weekday)
+                 return -EINVAL;
++#endif
+ 
+         if (gmtoff < 0) {
+                 plus = -gmtoff * USEC_PER_SEC;
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch b/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
new file mode 100644
index 000000000000..de2b0a251f02
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
@@ -0,0 +1,205 @@
+From d59cd7edd78901db8fd88c86258f6830e35e91df Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 25 Feb 2019 14:56:21 +0800
+Subject: [PATCH 28/30] musl: glob-util: filter out . and .. even if
+ GLOB_ALTDIRFUNC is not supported
+
+musl neither support GLOB_ALTDIRFUNC nor GLOB_BRACE.
+Let's make safe_glob() work even when GLOB_ALTDIRFUNC is not supported.
+Currently, GLOB_BRACE is simply ignored when it is not supported.
+---
+ src/basic/glob-util.c     | 75 +++++++++++++++++++++++++++++++++++++--
+ src/basic/glob-util.h     |  9 ++++-
+ src/include/musl/glob.h   | 21 +++++++++++
+ src/test/test-glob-util.c | 10 ++++++
+ 4 files changed, 112 insertions(+), 3 deletions(-)
+ create mode 100644 src/include/musl/glob.h
+
+diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
+index 5843ef088f..84b369be87 100644
+--- a/src/basic/glob-util.c
++++ b/src/basic/glob-util.c
+@@ -9,9 +9,42 @@
+ #include "string-util.h"
+ #include "strv.h"
+ 
++static bool safe_glob_verify(const char *p, const char *prefix) {
++        if (isempty(p))
++                return false; /* should not happen, but for safey. */
++
++        if (prefix) {
++                /* Skip the prefix, as we allow dots in prefix.
++                 * Note, glob() does not normalize paths, hence do not use path_startswith(). */
++                p = startswith(p, prefix);
++                if (!p)
++                        return false; /* should not happen, but for safety. */
++        }
++
++        for (;;) {
++                p += strspn(p, "/");
++                if (*p == '\0')
++                        return true;
++                if (*p == '.') {
++                        p++;
++                        if (IN_SET(*p, '/', '\0'))
++                                return false; /* refuse dot */
++                        if (*p == '.') {
++                                p++;
++                                if (IN_SET(*p, '/', '\0'))
++                                        return false; /* refuse dot dot */
++                        }
++                }
++
++                p += strcspn(p, "/");
++                if (*p == '\0')
++                        return true;
++        }
++}
++
+ DEFINE_TRIVIAL_DESTRUCTOR(closedir_wrapper, void, closedir);
+ 
+-int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret) {
++int safe_glob_internal(const char *path, int flags, bool use_gnu_extension, opendir_t opendir_func, char ***ret) {
+         _cleanup_(globfree) glob_t g = {
+                 .gl_closedir = closedir_wrapper,
+                 .gl_readdir = (struct dirent* (*)(void *)) readdir_no_dot,
+@@ -23,8 +56,16 @@ int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***
+ 
+         assert(path);
+ 
++        // TODO: expand braces if GLOB_BRACE is specified but not supported.
++
++#if GLOB_ALTDIRFUNC == 0
++        use_gnu_extension = false;
++#else
++        SET_FLAG(flags, GLOB_ALTDIRFUNC, use_gnu_extension);
++#endif
++
+         errno = 0;
+-        r = glob(path, flags | GLOB_ALTDIRFUNC, NULL, &g);
++        r = glob(path, flags, NULL, &g);
+         if (r == GLOB_NOMATCH)
+                 return -ENOENT;
+         if (r == GLOB_NOSPACE)
+@@ -32,6 +73,36 @@ int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***
+         if (r != 0)
+                 return errno_or_else(EIO);
+ 
++        if (!use_gnu_extension) {
++                _cleanup_free_ char *prefix = NULL;
++                r = glob_non_glob_prefix(path, &prefix);
++                if (r < 0 && r != -ENOENT)
++                        return r;
++
++                _cleanup_strv_free_ char **filtered = NULL;
++                size_t n_filtered = 0;
++                STRV_FOREACH(p, g.gl_pathv) {
++                        if (!safe_glob_verify(*p, prefix))
++                                continue;
++
++                        if (!ret)
++                                return 0; /* Found at least one entry, let's return earlier. */
++
++                        /* When musl is used, each entry is not a head of allocated memory. Hence, it is
++                         * necessary to copy the string. */
++                        r = strv_extend_with_size(&filtered, &n_filtered, *p);
++                        if (r < 0)
++                                return r;
++                }
++
++                if (n_filtered == 0)
++                        return -ENOENT;
++
++                assert(ret);
++                *ret = TAKE_PTR(filtered);
++                return 0;
++        }
++
+         if (strv_isempty(g.gl_pathv))
+                 return -ENOENT;
+ 
+diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h
+index ea3e869319..36bfd6716c 100644
+--- a/src/basic/glob-util.h
++++ b/src/basic/glob-util.h
+@@ -7,7 +7,14 @@
+ 
+ typedef DIR* (*opendir_t)(const char *);
+ 
+-int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret);
++int safe_glob_internal(const char *path, int flags, bool use_gnu_extension, opendir_t opendir_func, char ***ret);
++static inline int safe_glob_test(const char *path, int flags, char ***ret) {
++        /* This is for testing the fallback logic for the case GLOB_ALTDIRFUNC is not supported. */
++        return safe_glob_internal(path, flags, false, NULL, ret);
++}
++static inline int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret) {
++        return safe_glob_internal(path, flags, true, opendir_func, ret);
++}
+ static inline int safe_glob(const char *path, int flags, char ***ret) {
+         return safe_glob_full(path, flags, NULL, ret);
+ }
+diff --git a/src/include/musl/glob.h b/src/include/musl/glob.h
+new file mode 100644
+index 0000000000..58e6c50678
+--- /dev/null
++++ b/src/include/musl/glob.h
+@@ -0,0 +1,21 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <glob.h>
++
++/* Here, we set 0 to GLOB_ALTDIRFUNC and GLOB_BRACE, rather than the values used by glibc,
++ * to indicate that glob() does not support these flags. */
++
++#ifndef GLOB_ALTDIRFUNC
++#define GLOB_ALTDIRFUNC 0
++#define gl_flags    __dummy1
++#define gl_closedir __dummy2[0]
++#define gl_readdir  __dummy2[1]
++#define gl_opendir  __dummy2[2]
++#define gl_lstat    __dummy2[3]
++#define gl_stat     __dummy2[4]
++#endif
++
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
+diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
+index a9880f15c8..730961d172 100644
+--- a/src/test/test-glob-util.c
++++ b/src/test/test-glob-util.c
+@@ -61,20 +61,30 @@ TEST(safe_glob) {
+ 
+         fn = strjoina(template, "/*");
+         ASSERT_ERROR(safe_glob(fn, /* flags = */ 0, &v), ENOENT);
++        ASSERT_ERROR(safe_glob_test(fn, /* flags = */ 0, &v), ENOENT);
+ 
+         fn2 = strjoina(template, "/.*");
+         ASSERT_ERROR(safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &v), ENOENT);
++        ASSERT_ERROR(safe_glob_test(fn2, GLOB_NOSORT|GLOB_BRACE, &v), ENOENT);
+ 
+         fname = strjoina(template, "/.foobar");
+         ASSERT_OK(touch(fname));
+ 
+         ASSERT_ERROR(safe_glob(fn, /* flags = */ 0, &v), ENOENT);
++        ASSERT_ERROR(safe_glob_test(fn, /* flags = */ 0, &v), ENOENT);
+ 
+         ASSERT_OK(safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &v));
+         ASSERT_EQ(strv_length(v), 1u);
+         ASSERT_STREQ(v[0], fname);
+         ASSERT_NULL(v[1]);
+ 
++        v = strv_free(v);
++
++        ASSERT_OK(safe_glob_test(fn2, GLOB_NOSORT|GLOB_BRACE, &v));
++        ASSERT_EQ(strv_length(v), 1u);
++        ASSERT_STREQ(v[0], fname);
++        ASSERT_NULL(v[1]);
++
+         (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
+ }
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch b/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch
new file mode 100644
index 000000000000..4e8fa289dd41
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch
@@ -0,0 +1,380 @@
+From 2c3c84939b930986b31bc0f28e9a08bf43786255 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 13:34:31 +0900
+Subject: [PATCH 29/30] musl: test: several random fixlets for unit tests
+
+---
+ src/boot/test-efi-string.c             | 36 ++++++++++++++++++++------
+ src/libsystemd/sd-bus/test-bus-error.c |  6 +++++
+ src/test/meson.build                   |  1 +
+ src/test/test-errno-util.c             | 12 ++++++++-
+ src/test/test-fileio.c                 | 10 ++++++-
+ src/test/test-locale-util.c            |  7 ++++-
+ src/test/test-os-util.c                |  6 ++++-
+ src/test/test-seccomp.c                |  8 ++++--
+ src/test/test-time-util.c              | 24 +++++++++++++++++
+ test/meson.build                       |  2 ++
+ test/test-sysusers.sh.in               | 22 +++++++++++++++-
+ 11 files changed, 119 insertions(+), 15 deletions(-)
+
+diff --git a/src/boot/test-efi-string.c b/src/boot/test-efi-string.c
+index e0d3bd9b71..af6dd1fb64 100644
+--- a/src/boot/test-efi-string.c
++++ b/src/boot/test-efi-string.c
+@@ -410,13 +410,27 @@ TEST(startswith8) {
+         ASSERT_NULL(startswith8(NULL, ""));
+ }
+ 
+-#define TEST_FNMATCH_ONE(pattern, haystack, expect)                                     \
+-        ({                                                                              \
+-                ASSERT_EQ(fnmatch(pattern, haystack, 0), expect ? 0 : FNM_NOMATCH);     \
+-                ASSERT_EQ(efi_fnmatch(u##pattern, u##haystack), expect);                \
++#define TEST_FNMATCH_ONE_FULL(pattern, haystack, expect, skip_libc)     \
++        ({                                                              \
++                if (!skip_libc)                                         \
++                        ASSERT_EQ(fnmatch(pattern, haystack, 0), expect ? 0 : FNM_NOMATCH); \
++                ASSERT_EQ(efi_fnmatch(u##pattern, u##haystack), expect); \
+         })
+ 
++#define TEST_FNMATCH_ONE(pattern, haystack, expect)             \
++        TEST_FNMATCH_ONE_FULL(pattern, haystack, expect, false)
++
+ TEST(efi_fnmatch) {
++        bool skip_libc;
++
++#ifdef __GLIBC__
++        skip_libc = false;
++#else
++        /* It seems musl is too strict in handling "[]" (or has a bug?). Anyway, let's skip some test cases
++         * when built with musl. The behavior of efi_fnmatch() does not need to match musl's fnmatch(). */
++        skip_libc = true;
++#endif
++
+         TEST_FNMATCH_ONE("", "", true);
+         TEST_FNMATCH_ONE("abc", "abc", true);
+         TEST_FNMATCH_ONE("aBc", "abc", false);
+@@ -447,18 +461,18 @@ TEST(efi_fnmatch) {
+         TEST_FNMATCH_ONE("[abc", "a", false);
+         TEST_FNMATCH_ONE("[][!] [][!] [][!]", "[ ] !", true);
+         TEST_FNMATCH_ONE("[]-] []-]", "] -", true);
+-        TEST_FNMATCH_ONE("[1\\]] [1\\]]", "1 ]", true);
++        TEST_FNMATCH_ONE_FULL("[1\\]] [1\\]]", "1 ]", true, skip_libc);
+         TEST_FNMATCH_ONE("[$-\\+]", "&", true);
+         TEST_FNMATCH_ONE("[1-3A-C] [1-3A-C]", "2 B", true);
+         TEST_FNMATCH_ONE("[3-5] [3-5] [3-5]", "3 4 5", true);
+         TEST_FNMATCH_ONE("[f-h] [f-h] [f-h]", "f g h", true);
+-        TEST_FNMATCH_ONE("[a-c-f] [a-c-f] [a-c-f] [a-c-f] [a-c-f]", "a b c - f", true);
+-        TEST_FNMATCH_ONE("[a-c-f]", "e", false);
++        TEST_FNMATCH_ONE_FULL("[a-c-f] [a-c-f] [a-c-f] [a-c-f] [a-c-f]", "a b c - f", true, skip_libc);
++        TEST_FNMATCH_ONE_FULL("[a-c-f]", "e", false, skip_libc);
+         TEST_FNMATCH_ONE("[--0] [--0] [--0]", "- . 0", true);
+         TEST_FNMATCH_ONE("[+--] [+--] [+--]", "+ , -", true);
+         TEST_FNMATCH_ONE("[f-l]", "m", false);
+         TEST_FNMATCH_ONE("[b]", "z-a", false);
+-        TEST_FNMATCH_ONE("[a\\-z]", "b", false);
++        TEST_FNMATCH_ONE_FULL("[a\\-z]", "b", false, skip_libc);
+         TEST_FNMATCH_ONE("?a*b[.-0]c", "/a/b/c", true);
+         TEST_FNMATCH_ONE("debian-*-*-*.*", "debian-jessie-2018-06-17-kernel-image-5.10.0-16-amd64.efi", true);
+ 
+@@ -674,8 +688,14 @@ TEST(xvasprintf_status) {
+         test_printf_one("string");
+         test_printf_one("%%-%%%%");
+ 
++#ifdef __GLIBC__
+         test_printf_one("%p %p %32p %*p %*p", NULL, (void *) 0xF, &errno, 0, &saved_argc, 20, &saved_argv);
+         test_printf_one("%-10p %-32p %-*p %-*p", NULL, &errno, 0, &saved_argc, 20, &saved_argv);
++#else
++        /* musl prints NULL as 0, while glibc and our implementation print it as (nil). */
++        test_printf_one("%p %32p %*p %*p", (void *) 0xF, &errno, 0, &saved_argc, 20, &saved_argv);
++        test_printf_one("%-32p %-*p %-*p", &errno, 0, &saved_argc, 20, &saved_argv);
++#endif
+ 
+         test_printf_one("%c %3c %*c %*c %-8c", '1', '!', 0, 'a', 9, '_', '>');
+ 
+diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
+index c6b86be621..d69eb984dc 100644
+--- a/src/libsystemd/sd-bus/test-bus-error.c
++++ b/src/libsystemd/sd-bus/test-bus-error.c
+@@ -232,7 +232,13 @@ TEST(sd_bus_error_set_errnof) {
+         errno = EACCES;
+         assert_se(asprintf(&str, "%m") >= 0);
+         assert_se(streq(error.message, str));
++#ifdef __GLIBC__
+         assert_se(error._need_free == 0);
++#else
++        /* musl's strerror_l() always writes error message in the given buffer, hence the we need to
++         * free it. */
++        assert_se(error._need_free == 1);
++#endif
+ 
+         str = mfree(str);
+         sd_bus_error_free(&error);
+diff --git a/src/test/meson.build b/src/test/meson.build
+index 1dd61effc0..4bdfc65f04 100644
+--- a/src/test/meson.build
++++ b/src/test/meson.build
+@@ -16,6 +16,7 @@ test_env = {
+         'PROJECT_BUILD_ROOT' : meson.project_build_root(),
+         'SYSTEMD_SLOW_TESTS' : want_slow_tests ? '1' : '0',
+         'PYTHONDONTWRITEBYTECODE' : '1',
++        'SYSTEMD_LIBC' : get_option('libc'),
+ }
+ if conf.get('ENABLE_LOCALED') == 1
+         test_env += {'SYSTEMD_LANGUAGE_FALLBACK_MAP' : language_fallback_map}
+diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c
+index 1a0154fb05..1ad067b2c7 100644
+--- a/src/test/test-errno-util.c
++++ b/src/test/test-errno-util.c
+@@ -26,18 +26,28 @@ TEST(STRERROR) {
+         log_info("STRERROR(%d), STRERROR(%d) → %s, %s", 200, 201, STRERROR(200), STRERROR(201));
+ 
+         const char *a = STRERROR(200), *b = STRERROR(201);
++#ifdef __GLIBC__
+         ASSERT_NOT_NULL(strstr(a, "200"));
+         ASSERT_NOT_NULL(strstr(b, "201"));
++#else
++        /* musl provides catch all error message for unknown error number. */
++        ASSERT_STREQ(a, "No error information");
++        ASSERT_STREQ(b, "No error information");
++#endif
+ 
+         /* Check with negative values */
+         ASSERT_STREQ(a, STRERROR(-200));
+         ASSERT_STREQ(b, STRERROR(-201));
+ 
+         const char *c = STRERROR(INT_MAX);
++        log_info("STRERROR(%d) → %s", INT_MAX, c);
++#ifdef __GLIBC__
+         char buf[DECIMAL_STR_MAX(int)];
+         xsprintf(buf, "%d", INT_MAX);  /* INT_MAX is hexadecimal, use printf to convert to decimal */
+-        log_info("STRERROR(%d) → %s", INT_MAX, c);
+         ASSERT_NOT_NULL(strstr(c, buf));
++#else
++        ASSERT_STREQ(c, "No error information");
++#endif
+ }
+ 
+ TEST(STRERROR_OR_ELSE) {
+diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
+index e0ae30bbb9..ad572056c2 100644
+--- a/src/test/test-fileio.c
++++ b/src/test/test-fileio.c
+@@ -400,7 +400,15 @@ TEST(write_string_stream) {
+ 
+         f = fdopen(fd, "r");
+         assert_se(f);
+-        assert_se(write_string_stream(f, "boohoo", 0) < 0);
++#ifdef __GLIBC__
++        ASSERT_ERROR(write_string_stream(f, "boohoo", 0), EBADF);
++#else
++        /* Even the file is opened with the read-only mode, fputs() and fputc() by musl succeed but nothing
++         * actually written, thus write_string_stream() also succeeds. */
++        ASSERT_OK(write_string_stream(f, "boohoo", 0));
++        rewind(f);
++        ASSERT_NULL(fgets(buf, sizeof(buf), f));
++#endif
+         f = safe_fclose(f);
+ 
+         f = fopen(fn, "r+");
+diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
+index e264cff5dd..faa7ac4211 100644
+--- a/src/test/test-locale-util.c
++++ b/src/test/test-locale-util.c
+@@ -50,7 +50,12 @@ TEST(locale_is_installed) {
+         assert_se(locale_is_installed("\x01gar\x02 bage\x03") == 0);
+ 
+         /* Definitely not installed */
+-        assert_se(locale_is_installed("zz_ZZ") == 0);
++#ifdef __GLIBC__
++        ASSERT_OK_ZERO(locale_is_installed("zz_ZZ"));
++#else
++        /* musl seems to return a non-null locale object even if it is not installed. */
++        ASSERT_OK_POSITIVE(locale_is_installed("zz_ZZ"));
++#endif
+ }
+ 
+ TEST(keymaps) {
+diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c
+index fcab1139c2..902062560f 100644
+--- a/src/test/test-os-util.c
++++ b/src/test/test-os-util.c
+@@ -127,7 +127,11 @@ TEST(os_release_support_ended) {
+ 
+         ASSERT_TRUE(os_release_support_ended("1999-01-01", false, NULL));
+         ASSERT_FALSE(os_release_support_ended("2037-12-31", false, NULL));
+-        assert_se(os_release_support_ended("-1-1-1", true, NULL) == -EINVAL);
++#ifdef __GLIBC__
++        ASSERT_ERROR(os_release_support_ended("-1-1-1", true, NULL), EINVAL);
++#else
++        ASSERT_ERROR(os_release_support_ended("-1-1-1", true, NULL), ERANGE);
++#endif
+ 
+         r = os_release_support_ended(NULL, false, NULL);
+         if (r < 0)
+diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
+index 13c65a93cd..a9953b2c98 100644
+--- a/src/test/test-seccomp.c
++++ b/src/test/test-seccomp.c
+@@ -553,9 +553,13 @@ TEST(memory_deny_write_execute_mmap) {
+                 assert_se(seccomp_memory_deny_write_execute() >= 0);
+ 
+                 p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+-#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64)
++#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) || !defined(__GLIBC__)
+                 assert_se(p == MAP_FAILED);
+-                assert_se(errno == EPERM);
++#  ifdef __GLIBC__
++                ASSERT_EQ(errno, EPERM);
++#  else
++                ASSERT_EQ(errno, ENOMEM);
++#  endif
+ #endif
+                 /* Depending on kernel, libseccomp, and glibc versions, other architectures
+                  * might fail or not. Let's not assert success. */
+diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
+index 7569f89ca0..203f8a148d 100644
+--- a/src/test/test-time-util.c
++++ b/src/test/test-time-util.c
+@@ -406,6 +406,25 @@ static void test_format_timestamp_impl(usec_t x) {
+         const char *xx = FORMAT_TIMESTAMP(x);
+         ASSERT_NOT_NULL(xx);
+ 
++#ifndef __GLIBC__
++        /* Because of the timezone change, format_timestamp() may set timezone that is currently unused.
++         * E.g. Africa/Juba may set EAT, but currently it uses CAT/CAST. */
++        const char *space;
++        ASSERT_NOT_NULL(space = strrchr(xx, ' '));
++        const char *tz = space + 1;
++        if (!streq_ptr(tz, tzname[0]) &&
++            !streq_ptr(tz, tzname[1]) &&
++            parse_gmtoff(tz, NULL) < 0) {
++
++                log_warning("@" USEC_FMT " → %s, timezone '%s' is currently unused, ignoring.", x, xx, tz);
++
++                /* Verify the generated string except for the timezone part. Of course, in most cases, parsed
++                 * time does not match with the input, hence only check if it is parsable. */
++                ASSERT_OK(parse_timestamp(strndupa_safe(xx, space - xx), NULL));
++                return;
++        }
++#endif
++
+         usec_t y;
+         ASSERT_OK(parse_timestamp(xx, &y));
+         const char *yy = FORMAT_TIMESTAMP(y);
+@@ -1116,7 +1135,12 @@ TEST(in_utc_timezone) {
+         assert_se(setenv("TZ", ":UTC", 1) >= 0);
+         assert_se(in_utc_timezone());
+         ASSERT_STREQ(tzname[0], "UTC");
++#ifdef __GLIBC__
+         ASSERT_STREQ(tzname[1], "UTC");
++#else
++        /* musl sets an empty string to tzname[1] when DST is not used by the timezone. */
++        ASSERT_STREQ(tzname[1], "");
++#endif
+         assert_se(timezone == 0);
+         assert_se(daylight == 0);
+ 
+diff --git a/test/meson.build b/test/meson.build
+index 505a14aa81..1f1ec0a0e1 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -13,6 +13,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
+                      # https://github.com/mesonbuild/meson/issues/2681
+                      args : exe.full_path(),
+                      depends : exe,
++                     env : test_env,
+                      suite : 'sysusers')
+ 
+                 if have_standalone_binaries
+@@ -22,6 +23,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
+                              # https://github.com/mesonbuild/meson/issues/2681
+                              args : exe.full_path(),
+                              depends : exe,
++                             env : test_env,
+                              suite : 'sysusers')
+                 endif
+         endif
+diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in
+index 3218923590..ae7bfee2fe 100755
+--- a/test/test-sysusers.sh.in
++++ b/test/test-sysusers.sh.in
+@@ -13,6 +13,12 @@ TESTDIR=$(mktemp --tmpdir --directory "test-sysusers.XXXXXXXXXX")
+ # shellcheck disable=SC2064
+ trap "rm -rf '$TESTDIR'" EXIT INT QUIT PIPE
+ 
++skip_nis() {
++    # musl seems to not support NIS entries. Let's skip the test case for NIS entries.
++    local path=${1:?}
++    [[ "${SYSTEMD_LIBC:-}" == musl && "${path##*/}" == "test-11.input" ]]
++}
++
+ prepare_testdir() {
+     mkdir -p "$TESTDIR/etc/sysusers.d/"
+     mkdir -p "$TESTDIR/usr/lib/sysusers.d/"
+@@ -50,6 +56,7 @@ rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/*
+ 
+ # happy tests
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+@@ -59,6 +66,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
+ done
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f on stdin"
+     prepare_testdir "${f%.input}"
+     touch "$TESTDIR/etc/sysusers.d/test.conf"
+@@ -68,6 +76,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
+ done
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f on stdin with --replace"
+     prepare_testdir "${f%.input}"
+     touch "$TESTDIR/etc/sysusers.d/test.conf"
+@@ -133,6 +142,7 @@ SYS_GID_MAX999
+ EOF
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f (with login.defs)"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+@@ -149,6 +159,7 @@ mv "$TESTDIR/etc/login.defs" "$TESTDIR/etc/login.defs.moved"
+ ln -s ../../../../../etc/login.defs.moved "$TESTDIR/etc/login.defs"
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f (with login.defs symlinked)"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+@@ -161,13 +172,22 @@ done
+ 
+ rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/*
+ 
++preprocess_error() {
++    # Convert error message for ERANGE from glibc to musl.
++    if [[ "${SYSTEMD_LIBC:-}" == musl ]]; then
++        sed -e 's/Numerical result out of range/Result not representable/' "${1:?}"
++    else
++        cat "${1:?}"
++    fi
++}
++
+ # tests for error conditions
+ for f in $(find "$SOURCE"/unhappy-*.input | sort -V); do
+     echo "*** Running test $f"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+     SYSTEMD_LOG_LEVEL=info "$SYSUSERS" --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err"
+-    if ! diff -u "$TESTDIR/err"  "${f%.*}.expected-err" >&2; then
++    if ! diff -u "$TESTDIR/err"  <(preprocess_error "${f%.*}.expected-err") >&2; then
+         echo >&2 "**** Unexpected error output for $f"
+         cat >&2 "$TESTDIR/err"
+         exit 1
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch b/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch
new file mode 100644
index 000000000000..51eec7e78ac3
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch
@@ -0,0 +1,352 @@
+From b9a6cd49a4d4c6a40968224f5aac20586273b171 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 13:42:24 +0900
+Subject: [PATCH 30/30] musl: ci: add build test and unit tests
+
+---
+ .github/workflows/build-test-musl.sh  | 125 ++++++++++++++++++++++++++
+ .github/workflows/linter.yml          |   9 ++
+ .github/workflows/unit-tests-musl.sh  |  55 ++++++++++++
+ .github/workflows/unit-tests-musl.yml | 112 +++++++++++++++++++++++
+ 4 files changed, 301 insertions(+)
+ create mode 100755 .github/workflows/build-test-musl.sh
+ create mode 100755 .github/workflows/unit-tests-musl.sh
+ create mode 100644 .github/workflows/unit-tests-musl.yml
+
+diff --git a/.github/workflows/build-test-musl.sh b/.github/workflows/build-test-musl.sh
+new file mode 100755
+index 0000000000..bc38924666
+--- /dev/null
++++ b/.github/workflows/build-test-musl.sh
+@@ -0,0 +1,125 @@
++#!/bin/bash
++# SPDX-License-Identifier: LGPL-2.1-or-later
++
++set -eux
++
++if ! command -v musl-gcc 2>/dev/null; then
++    echo "musl-gcc is not installed, skipping the test."
++    exit 0
++fi
++
++. /etc/os-release
++
++TMPDIR=$(mktemp -d)
++
++cleanup() (
++    set +e
++
++    if [[ -d "$TMPDIR" ]]; then
++        rm -rf "$TMPDIR"
++    fi
++)
++
++trap cleanup EXIT ERR INT TERM
++
++mkdir -p "${TMPDIR}/build"
++mkdir -p "${TMPDIR}/include"
++
++CFLAGS="-idirafter ${TMPDIR}/include"
++
++LINKS=(
++    acl
++    archive.h
++    archive_entry.h
++    asm-generic
++    audit-records.h
++    audit_logging.h
++    bpf
++    bzlib.h
++    dwarf.h
++    elfutils
++    fido.h
++    gcrypt.h
++    gelf.h
++    gnutls
++    idn2.h
++    libaudit.h
++    libcryptsetup.h
++    libelf.h
++    libkmod.h
++    lz4.h
++    lz4frame.h
++    lz4hc.h
++    lzma
++    lzma.h
++    microhttpd.h
++    mtd
++    openssl
++    pcre2.h
++    pwquality.h
++    qrencode.h
++    seccomp-syscalls.h
++    seccomp.h
++    security
++    sys/acl.h
++    sys/capability.h
++    tss2
++    xen
++    xkbcommon
++    zconf.h
++    zlib.h
++    zstd.h
++    zstd_errors.h
++)
++
++if [[ "$ID" == arch ]]; then
++    LINKS+=(
++        asm
++        curl
++        gpg-error.h
++        libiptc
++        linux
++    )
++elif [[ "$ID" == centos ]]; then
++    LINKS+=(
++        asm
++        curl
++        gpg-error.h
++        linux
++        selinux
++    )
++elif [[ "$ID" == fedora ]]; then
++    LINKS+=(
++        asm
++        curl
++        gpg-error.h
++        libiptc
++        linux
++        selinux
++    )
++elif [[ "$ID" == debian ]] || [[ "$ID" == ubuntu ]]; then
++    # Currently, debian/ubuntu does not provide crypt.h for musl. Hence, this does not work.
++
++    CFLAGS="$CFLAGS -idirafter /usr/include/$(uname -m)-linux-gnu"
++
++    LINKS+=(
++        linux
++        selinux
++        sys/apparmor.h
++    )
++fi
++
++for t in "${LINKS[@]}"; do
++    [[ -e "/usr/include/$t" ]]
++    link="${TMPDIR}/include/${t}"
++    mkdir -p "${link%/*}"
++    ln -s "/usr/include/$t" "$link"
++done
++
++env CC=musl-gcc \
++    CXX=musl-gcc \
++    CFLAGS="$CFLAGS" \
++    CXXFLAGS="$CFLAGS" \
++    meson setup --werror -Ddbus-interfaces-dir=no -Dlibc=musl "${TMPDIR}/build"
++
++ninja -v -C "${TMPDIR}/build"
+diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
+index c107b2da1e..b92a00478c 100644
+--- a/.github/workflows/linter.yml
++++ b/.github/workflows/linter.yml
+@@ -49,6 +49,12 @@ jobs:
+           [Build]
+           ToolsTreeDistribution=fedora
+           ToolsTreeRelease=rawhide
++
++          [Content]
++          Packages=
++                libgcrypt-devel
++                libgpg-error-devel
++                musl-gcc
+           EOF
+ 
+           mkosi -f box -- true
+@@ -77,3 +83,6 @@ jobs:
+ 
+       - name: Run clang-tidy
+         run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit
++
++      - name: Build with musl
++        run: mkosi box -- .github/workflows/build-test-musl.sh
+diff --git a/.github/workflows/unit-tests-musl.sh b/.github/workflows/unit-tests-musl.sh
+new file mode 100755
+index 0000000000..f6e2b2f536
+--- /dev/null
++++ b/.github/workflows/unit-tests-musl.sh
+@@ -0,0 +1,55 @@
++#!/usr/bin/env bash
++# SPDX-License-Identifier: LGPL-2.1-or-later
++
++# shellcheck disable=SC2206
++PHASES=(${@:-SETUP BUILD RUN CLEANUP})
++
++function info() {
++    echo -e "\033[33;1m$1\033[0m"
++}
++function run_meson() {
++    if ! meson "$@"; then
++        find . -type f -name meson-log.txt -exec cat '{}' +
++        return 1
++    fi
++}
++
++set -ex
++
++for phase in "${PHASES[@]}"; do
++    case $phase in
++        SETUP)
++            info "Setup phase"
++            # Alpine still uses split-usr.
++            for i in /bin/* /sbin/*; do
++                ln -rs "$i" "/usr/$i";
++            done
++            ;;
++        BUILD)
++            info "Build phase"
++            run_meson setup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dlibc=musl build
++            ninja -C build -v
++            ;;
++        RUN)
++            info "Run phase"
++            # Create dummy machine ID.
++            echo '052e58f661f94bd080e258b96aea3f7b' > /etc/machine-id
++
++            # Start dbus for several unit tests.
++            mkdir -p /var/run/dbus
++            /usr/bin/dbus-daemon --system || :
++
++            # Here, we explicitly set SYSTEMD_IN_CHROOT=yes as unfortunately runnin_in_chroot() does not
++            # correctly detect the environment.
++            env \
++                SYSTEMD_IN_CHROOT=yes \
++                meson test -C build -v
++            ;;
++        CLEANUP)
++            info "Cleanup phase"
++            ;;
++        *)
++            echo >&2 "Unknown phase '$phase'"
++            exit 1
++    esac
++done
+diff --git a/.github/workflows/unit-tests-musl.yml b/.github/workflows/unit-tests-musl.yml
+new file mode 100644
+index 0000000000..e30974254c
+--- /dev/null
++++ b/.github/workflows/unit-tests-musl.yml
+@@ -0,0 +1,112 @@
++---
++# vi: ts=2 sw=2 et:
++# SPDX-License-Identifier: LGPL-2.1-or-later
++#
++name: Unit tests (musl)
++on:
++  pull_request:
++    paths:
++      - '**/meson.build'
++      - '.github/workflows/**'
++      - 'meson_options.txt'
++      - 'src/**'
++      - 'test/fuzz/**'
++
++permissions:
++  contents: read
++
++jobs:
++  build:
++    runs-on: ubuntu-latest
++    steps:
++      - name: Repository checkout
++        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
++
++      - name: Install build dependencies
++        uses: jirutka/setup-alpine@v1
++        with:
++          arch: x86_64
++          branch: edge
++          packages: >
++            acl
++            acl-dev
++            audit-dev
++            bash
++            bash-completion-dev
++            bpftool
++            build-base
++            bzip2-dev
++            coreutils
++            cryptsetup-dev
++            curl-dev
++            dbus
++            dbus-dev
++            elfutils-dev
++            gettext-dev
++            git
++            glib-dev
++            gnutls-dev
++            gperf
++            grep
++            iproute2
++            iptables-dev
++            kbd
++            kexec-tools
++            kmod
++            kmod-dev
++            libapparmor-dev
++            libarchive-dev
++            libbpf-dev
++            libcap-dev
++            libcap-utils
++            libfido2-dev
++            libgcrypt-dev
++            libidn2-dev
++            libmicrohttpd-dev
++            libpwquality-dev
++            libqrencode-dev
++            libseccomp-dev
++            libselinux-dev
++            libxkbcommon-dev
++            linux-pam-dev
++            lz4-dev
++            meson
++            openssl
++            openssl-dev
++            p11-kit-dev
++            pcre2-dev
++            pkgconf
++            polkit-dev
++            py3-elftools
++            py3-jinja2
++            py3-pefile
++            py3-pytest
++            py3-lxml
++            quota-tools
++            rsync
++            sfdisk
++            tpm2-tss-dev
++            tpm2-tss-esys
++            tpm2-tss-rc
++            tpm2-tss-tcti-device
++            tzdata
++            util-linux-dev
++            util-linux-login
++            util-linux-misc
++            valgrind-dev
++            xen-dev
++            zlib-dev
++            zstd-dev
++
++      - name: Setup
++        run: .github/workflows/unit-tests-musl.sh SETUP
++        shell: alpine.sh --root {0}
++      - name: Build
++        run: .github/workflows/unit-tests-musl.sh BUILD
++        shell: alpine.sh {0}
++      - name: Run
++        run: .github/workflows/unit-tests-musl.sh RUN
++        shell: alpine.sh --root {0}
++      - name: Cleanup
++        run: .github/workflows/unit-tests-musl.sh CLEANUP
++        shell: alpine.sh --root {0}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index b04d64ed63f7..68381cf302d7 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tt-kmd";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-kmd";
     tag = "ttkmd-${finalAttrs.version}";
-    hash = "sha256-m4XZdgOHQOWNoZlV2VqN6yhLcQuZxam22JKpOGXbjwI=";
+    hash = "sha256-edpBUXhWAtcmHAgNPMAomexXfuIIqRvGipnr30VvsPE=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
index 2023553cd3db..e8ce6ff5198e 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
@@ -13,17 +13,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tuxedo-drivers-${kernel.version}";
-  version = "4.15.4";
+  version = "4.18.0";
 
   src = fetchFromGitLab {
     group = "tuxedocomputers";
     owner = "development/packages";
     repo = "tuxedo-drivers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY=";
+    hash = "sha256-9XtogovzAWaMkJI5CxszY5qO3q6NOACZ7pnejyobJlY=";
   };
 
-  patches = [ ./no-cp-etc-usr.patch ];
+  patches = [ ./no-cp-usr.patch ];
 
   postInstall = ''
     echo "Running postInstallhook"
@@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
       keksgesicht
       xaverdh
       XBagon
+      wetisobe
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch
similarity index 93%
rename from pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch
rename to pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch
index 9e94a43d60c5..124b79c98a17 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch
+++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch
@@ -6,7 +6,7 @@ index 75a6bc1..6021d42 100644
  
  install: all
  	make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install
--	cp -r etc usr /
+-	cp -r usr /
  
  clean:
  	make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean
diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 457d4cb144e6..dde56cb2684f 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -57,7 +57,7 @@ let
 
     let
       inherit (lib)
-        any
+        elem
         optionalString
         optionals
         optional
@@ -66,11 +66,11 @@ let
 
       smartmon = smartmontools.override { inherit enableMail; };
 
-      buildKernel = any (n: n == configFile) [
+      buildKernel = elem configFile [
         "kernel"
         "all"
       ];
-      buildUser = any (n: n == configFile) [
+      buildUser = elem configFile [
         "user"
         "all"
       ];
@@ -152,6 +152,11 @@ let
                ]
              }"
 
+          # substitute path that ZFS will pass on when calling external helper scripts (/etc/zfs/zpool.d/*, zfs_prepare_disk)
+          substituteInPlace ./lib/libzfs/libzfs_util.c \
+            --replace-fail \"PATH=/bin:/sbin:/usr/bin:/usr/sbin\" \
+            \"PATH=/run/wrappers/bin:/run/current-system/sw/bin:/run/current-system/sw/sbin\"
+
           substituteInPlace ./config/zfs-build.m4 \
             --replace-fail "bashcompletiondir=/etc/bash_completion.d" \
               "bashcompletiondir=$out/share/bash-completion/completions"
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 8c9b35be6056..d54f41119b36 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -16,14 +16,14 @@ callPackage ./generic.nix args {
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.4.0-rc2";
+  version = "2.4.0-rc3";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-NoY8lXQ/qxO0cQLmU0tIjqqWUThfWzVioigpS2crbeE=";
+  hash = "sha256-VfCeQqgahNNQA4jsiFHTdUjgXIH26k5r3q/Rpo2JrCc=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 98f438554ac0..e0f7e5b5f79e 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -27,9 +27,13 @@ lib.makeScope newScope (
       else
         buildPackages.gccWithoutTargetLibc.override (old: {
           bintools = old.bintools.override {
-            libc = pkgs.libc;
+            libc = pkgs.pkgsHostTarget.libc;
+            noLibc = pkgs.libc == null;
+            nativeLibc = false;
           };
-          libc = pkgs.libc;
+          libc = pkgs.pkgsHostTarget.libc;
+          noLibc = pkgs.libc == null;
+          nativeLibc = false;
         })
     );
 
diff --git a/pkgs/os-specific/windows/msvcSdk/default.nix b/pkgs/os-specific/windows/msvcSdk/default.nix
index f57d2bf90de9..05a728dee6e7 100644
--- a/pkgs/os-specific/windows/msvcSdk/default.nix
+++ b/pkgs/os-specific/windows/msvcSdk/default.nix
@@ -1,71 +1,54 @@
 {
   lib,
-  config,
   stdenvNoCC,
   xwin,
   testers,
   llvmPackages,
+  callPackage,
 }:
 let
   version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.buildVersion;
 
   hashes = (builtins.fromJSON (builtins.readFile ./hashes.json));
 
-  host = stdenvNoCC.hostPlatform;
-  arch =
-    if host.isx86_64 then
-      "x86_64"
-    else if host.isAarch64 then
-      "aarch64"
-    else if host.isx86_32 then
-      "x86"
-    else if host.isAarch32 then
-      "aarch"
-    else
-      throw "Unsupported system";
+  fetchWinSdk = callPackage ./fetchWinSdk.nix { };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   inherit version;
-  pname = "msvc-sdk";
-  dontUnpack = true;
+  pname = "win-sdk";
+
+  src = fetchWinSdk {
+    manifest = ./manifest.json;
+    hash = hashes.${finalAttrs.src.arch};
+  };
 
   strictDeps = true;
-  nativeBuildInputs = [ xwin ];
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash =
-    if !config.microsoftVisualStudioLicenseAccepted then
-      throw ''
-        Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.
-        Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your
-        config to indicate so.
-      ''
-    else
-      hashes.${arch};
+  nativeBuildInputs = [
+    xwin
+  ];
 
   __structuredAttrs = true;
   xwinArgs = [
     "--accept-license"
-    "--cache-dir=xwin-out"
+    "--cache-dir=."
     "--manifest=${./manifest.json}"
-    "--arch=${arch}"
+    "--arch=${finalAttrs.src.arch}"
     "splat"
     "--preserve-ms-arch-notation"
   ];
 
-  buildPhase = ''
-    runHook preBuild
+  installPhase = ''
+    runHook preInstall
 
     xwin "''${xwinArgs[@]}"
-    mkdir "$out"
-    mv xwin-out/splat/* "$out"
 
-    runHook postBuild
+    mkdir -p "$out"
+    cp -r splat/* "$out"
+
+    runHook postInstall
   '';
 
   dontFixup = true;
-  dontInstall = true;
 
   passthru = {
     updateScript = ./update.nu;
diff --git a/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix b/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix
new file mode 100644
index 000000000000..3c498df81b74
--- /dev/null
+++ b/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix
@@ -0,0 +1,91 @@
+{
+  lib,
+  config,
+  stdenvNoCC,
+  xwin,
+}:
+let
+  host = stdenvNoCC.hostPlatform;
+
+  hostArch =
+    if host.isx86_64 then
+      "x86_64"
+    else if host.isAarch64 then
+      "aarch64"
+    else if host.isx86_32 then
+      "x86"
+    else if host.isAarch32 then
+      "aarch"
+    else
+      throw "Unsupported system";
+in
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+
+  excludeDrvArgNames = [
+    "manifest"
+    "arch"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      name ? "xwin-fetch-msvc",
+      hash ? lib.fakeHash,
+      manifest ? null,
+      arch ? hostArch,
+      ...
+    }@args:
+    {
+      inherit name;
+      __structuredAttrs = true;
+      dontUnpack = true;
+      dontFixup = true;
+      dontInstall = true;
+
+      strictDeps = true;
+
+      nativeBuildInputs = [ xwin ];
+
+      outputHashAlgo = "sha256";
+      outputHashMode = "recursive";
+      outputHash =
+        if !config.microsoftVisualStudioLicenseAccepted then
+          throw ''
+            Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.
+            Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your
+            config to indicate so.
+          ''
+        else
+          hash;
+
+      xwinArgs = lib.optionals (manifest != null) [ "--manifest=${manifest}" ] ++ [
+        "--accept-license"
+        "--cache-dir=${placeholder "out"}"
+        "--arch=${arch}"
+        "download"
+      ];
+
+      buildPhase =
+        args.buildPhase or ''
+          runHook preBuild
+
+          xwin "''${xwinArgs[@]}"
+
+          runHook postBuild
+        '';
+
+      passthru = {
+        inherit arch;
+      };
+
+      meta.license = {
+        deprecated = false;
+        fullName = "Microsoft Software License Terms";
+        shortName = "msvc";
+        spdxId = "unknown";
+        free = false;
+        url = "https://www.visualstudio.com/license-terms/mt644918/";
+      };
+    };
+}
diff --git a/pkgs/os-specific/windows/msvcSdk/hashes.json b/pkgs/os-specific/windows/msvcSdk/hashes.json
index 6df8b21c9516..02bd7c5ca0de 100644
--- a/pkgs/os-specific/windows/msvcSdk/hashes.json
+++ b/pkgs/os-specific/windows/msvcSdk/hashes.json
@@ -1,5 +1,5 @@
 {
-  "x86_64": "sha256-kp+xePTRZgqdAV3/BYhqKke3dXIkLWLM+IWFXtN2rHM=",
-  "x86": "sha256-xEXV+XBNoXpAO8R/oDj8gfGb5tICr9ps4DN8Q4lqK2k=",
-  "aarch64": "sha256-r0tTQUq3CePJ/7Vuzf4Zsy3Ebu0KiXNBwRHmrO3d15E="
+  "x86_64": "sha256-rEHwc09hLh3dKvA2TYHJKeFDycajPe8Ewfcdw85QY48=",
+  "x86": "sha256-yibiyIwGe9kSJzTFpDc8ilF65aKQ9qMLrx2k14uM4Zk=",
+  "aarch64": "sha256-RB/Hubhm+73kPUiKOKtm6vwf2ldm1raezNmmGEdQf9w="
 }
diff --git a/pkgs/os-specific/windows/msvcSdk/manifest.json b/pkgs/os-specific/windows/msvcSdk/manifest.json
index bb4ee81c35f2..4abcbbffa00f 100644
--- a/pkgs/os-specific/windows/msvcSdk/manifest.json
+++ b/pkgs/os-specific/windows/msvcSdk/manifest.json
@@ -1,51 +1,50 @@
 {
   "manifestVersion": "1.1",
   "info": {
-    "id": "VisualStudio.17.Release/17.14.13+36414.22.-august.2025-",
+    "id": "VisualStudio.17.Release/17.14.19+36623.8",
     "buildBranch": "d17.14",
-    "buildVersion": "17.14.36414.22",
-    "commitId": "1481a1f5e0b5858ec46c868f91b27039ed0d233d",
-    "communityOrLowerFlightId": "1f9f81a7bb554db",
+    "buildVersion": "17.14.36623.8",
+    "commitId": "8a9fda4969482fc6fc5ced0d2d47b928d1b82678",
+    "communityOrLowerFlightId": "4e87ee4468fd451",
     "localBuild": "build-lab",
     "manifestName": "VisualStudio.17.Release",
     "manifestType": "channel",
-    "productDisplayVersion": "17.14.13 (August 2025)",
+    "productDisplayVersion": "17.14.19",
     "productLine": "Dev17",
     "productLineVersion": "2022",
     "productMilestone": "RTW",
     "productMilestoneIsPreRelease": "False",
     "productName": "Visual Studio",
-    "productPatchVersion": "13",
+    "productPatchVersion": "19",
     "productPreReleaseMilestoneSuffix": "1.0",
-    "productReleaseNameSuffix": "(August 2025)",
-    "productSemanticVersion": "17.14.13+36414.22.-august.2025-",
-    "professionalOrGreaterFlightId": "39d353be42bf474",
-    "qBuildSessionId": "e533c3b6-eb6e-a0b2-8734-a13c66345cb8"
+    "productSemanticVersion": "17.14.19+36623.8",
+    "professionalOrGreaterFlightId": "4bb63b1960eb466",
+    "qBuildSessionId": "32622f7c-25ab-329b-fa1e-eebd68dbf0a2"
   },
   "channelItems": [
     {
       "id": "Microsoft.VisualStudio.Manifests.VisualStudio",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "Manifest",
       "payloads": [
         {
           "fileName": "VisualStudio.vsman",
-          "sha256": "0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46",
-          "size": 30484157,
-          "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46/VisualStudio.vsman"
+          "sha256": "b674dd46f83a684142689b3a86c73ba5f2e2477018087e4df218516214bbad58",
+          "size": 30425509,
+          "url": "https://download.visualstudio.microsoft.com/download/pr/5011a9cc-e8ef-42cb-ad72-87de1031accc/b674dd46f83a684142689b3a86c73ba5f2e2477018087e4df218516214bbad58/VisualStudio.vsman"
         }
       ]
     },
     {
       "id": "Microsoft.VisualStudio.Product.BuildTools",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -135,7 +134,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Community",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -143,7 +142,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -240,7 +239,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Community",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -248,7 +247,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -356,7 +355,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Enterprise",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -364,7 +363,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -461,7 +460,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Enterprise",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -469,7 +468,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -577,7 +576,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Professional",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -585,7 +584,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -682,7 +681,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Professional",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -690,7 +689,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -798,7 +797,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TeamExplorer",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -807,7 +806,7 @@
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -914,14 +913,14 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TestAgent",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+"
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -1011,14 +1010,14 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TestController",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+"
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -1108,7 +1107,7 @@
     },
     {
       "id": "VisualStudio.17.Release",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "Channel",
       "localizedResources": [
         {
@@ -1120,61 +1119,61 @@
         {
           "language": "zh-cn",
           "title": "Current",
-          "description": "当前频道包括已可供生产使用的最新功能和修补程序。",
+          "description": "Current 频道包括已可供生产使用的最新功能和修补程序。",
           "channelSuffix": ""
         },
         {
           "language": "zh-tw",
           "title": "Current",
-          "description": "目前通道包含可供生產環境使用的最新功能和修正程式。",
+          "description": "Current 通道包含可供生產環境使用的最新功能和修正程式。",
           "channelSuffix": ""
         },
         {
           "language": "cs-cz",
           "title": "Current",
-          "description": "Aktuální kanál zahrnuje nejnovější funkce a opravy, které jsou připravené k použití v produkčním prostředí.",
+          "description": "Kanál Current zahrnuje nejnovější funkce a opravy, které jsou připravené k použití v produkčním prostředí.",
           "channelSuffix": ""
         },
         {
           "language": "de-de",
           "title": "Current",
-          "description": "Der aktuelle Kanal enthält die neuesten Features und Fixes, die für die Produktion bereit sind.",
+          "description": "Der Current-Kanal enthält die neuesten Features und Fixes, die zur Nutzung in der Produktion bereit sind.",
           "channelSuffix": ""
         },
         {
           "language": "es-es",
           "title": "Current",
-          "description": "El canal actual incluye las características y correcciones más recientes que están listas para el uso de producción.",
+          "description": "El canal Current incluye las características y correcciones más recientes que están listas para el uso de producción.",
           "channelSuffix": ""
         },
         {
           "language": "fr-fr",
           "title": "Current",
-          "description": "Le canal actuel inclut les dernières fonctionnalités et correctifs prêts pour une utilisation en production.",
+          "description": "Le canal Current inclut les dernières fonctionnalités et correctifs prêts pour une utilisation en production.",
           "channelSuffix": ""
         },
         {
           "language": "it-it",
           "title": "Current",
-          "description": "Il Canale corrente include le funzionalità e le correzioni più recenti pronte per l'uso in produzione.",
+          "description": "Il canale Current include le funzionalità e le correzioni più recenti pronte per l'uso in produzione.",
           "channelSuffix": ""
         },
         {
           "language": "ja-jp",
           "title": "Current",
-          "description": "現在のチャネルには、運用環境で使用する準備が整っている最新の機能と修正が含まれています。",
+          "description": "Current チャネルには、運用環境で使用する準備が整っている最新の機能と修正が含まれています。",
           "channelSuffix": ""
         },
         {
           "language": "ko-kr",
           "title": "Current",
-          "description": "현재 채널에는 프로덕션용으로 사용할 준비가 된 최신 기능과 수정 사항이 포함되어 있습니다.",
+          "description": "Current 채널에는 프로덕션용으로 사용할 준비가 된 최신 기능과 수정 사항이 포함되어 있습니다.",
           "channelSuffix": ""
         },
         {
           "language": "pl-pl",
           "title": "Current",
-          "description": "Bieżący kanał obejmuje najnowsze funkcje i poprawki, które są gotowe do użycia w środowisku produkcyjnym.",
+          "description": "Kanał Current obejmuje najnowsze funkcje i poprawki, które są gotowe do użycia w środowisku produkcyjnym.",
           "channelSuffix": ""
         },
         {
@@ -1186,28 +1185,28 @@
         {
           "language": "ru-ru",
           "title": "Current",
-          "description": "Актуальный канал включает последние функции и исправления, готовые к использованию в рабочей среде.",
+          "description": "Канал Current включает последние функции и исправления, готовые к использованию в рабочей среде.",
           "channelSuffix": ""
         },
         {
           "language": "tr-tr",
           "title": "Current",
-          "description": "Geçerli kanal, üretim kullanımı için hazır olan en son özellikleri ve düzeltmeleri içerir.",
+          "description": "Güncel kanal, üretim kullanımı için hazır olan en son özellikleri ve düzeltmeleri içerir.",
           "channelSuffix": ""
         }
       ]
     },
     {
       "id": "VisualStudio.17.Release.Bootstrappers.Setup",
-      "version": "3.14.2084.286130193",
+      "version": "3.14.2086.286130193",
       "type": "Bootstrapper",
-      "installerVersion": "3.14.2084.208",
+      "installerVersion": "3.14.2086.54749",
       "payloads": [
         {
           "fileName": "vs_Setup.exe",
-          "sha256": "1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db",
-          "size": 4464984,
-          "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db/vs_Setup.exe"
+          "sha256": "bf287d4f6e9ac7c97ec40c7a145d17da9c0af8c6178066205302e56d1840da66",
+          "size": 4459056,
+          "url": "https://download.visualstudio.microsoft.com/download/pr/5011a9cc-e8ef-42cb-ad72-87de1031accc/bf287d4f6e9ac7c97ec40c7a145d17da9c0af8c6178066205302e56d1840da66/vs_Setup.exe"
         }
       ]
     }
@@ -1216,32 +1215,32 @@
     "signInfo": {
       "signatureMethod": "sha256RSA_cng",
       "digestMethod": "sha256",
-      "digestValue": "lbYNxXS9fhWwdYlTA8367Q14VLuZk7VWROdUyhPwraI=",
+      "digestValue": "83F1SIxSq6LnHvmLy16/R1NTdTwucODN4ozLAdpmnZs=",
       "canonicalization": ""
     },
-    "signatureValue": "Y5Ni1cH09prdAaftGTIdPVSXAEUfVJILWtNJJbdM59Y33c9uGb+jU9JTQA1dl4Fj4ubmYO+6uxp4wYkNMb8eJY3ZAu76PzabU3duyLe8bsBHAW+3t8qi4raMUP4UXfzawIBKnO0GLAcGLka4NcjNq3vA57pdN5e98TsUZKCwgezqBMEkCjOeBkl26uedWjlrv+HCqTYxFarFargd+elD3IPIB/9RhPwwkyJ+divdoUgqclcoNWV7dC9+TWkJrInCBGVAudOpJEBbotu/nyWYN6AFoB90TuhXpV+LLidY1/i5iA8w0V6y61TsK2ERhJNZoIMFqdYLNeqDEWg7eto0MQ==",
+    "signatureValue": "SNXykEZvJLICsFwUje0R3Z9HJ/jDRP1fO6f6OqiV0cBh5Jh3cM+cRXA1vlUaTT7h7Dfu7Dn2Xe5qUNHcgQZdnStSRWvOPnALj/OfTO8IkNgF3IFpkGadHINv9Gf2XPCjof6yn85bjVfniHNoLkQ8DB4pPOwi82cFL5Fo8bbiEe5IbGIjy3l7T3wLMTbj9PGsyBzKZSzg9Bzl2Xj2Yim9sIyDx5n7qHp9Cg+pcMig8hSJs7NzmhtralBABCUJCweB9gdHJSmhvwP8+sFu9++9Fhsrjqwa2sQdAhXhF+gPHM3wmQJFLrOvMRVIfN2ypCFrG9LwvERzVbbYIRlGJvajCw==",
     "keyInfo": {
       "keyValue": {
         "rsaKeyValue": {
-          "modulus": "7XpKjCg5837MnNU9UKR3xba/q5Iq/JXcyzypjF20Q6LlVwLLwX3ehPNrT4+GM2kpbhg0KF9zaTCqKCnlRY4zUat+8sk/4dUEyzAfHaZrGf+9FDPlP7GMb7dT1lsS4zDSF6swfD4xuoux9mBYJOGDoXxknpL581td3SwLX4w9MIsERD7wjZYpUc+16BXXuSjtNXhYlnrXoePKlDqlGgJCM5wuFwd7BXdS1lJrqVxytOUHyUpp3ovamSQWE7fGYQKxg4e50J/mNYzgN6AYglCeJ9QjGlnQ4a4HTLrtNuqFgG3wt6a6pFJ/C1qdvB/tki3rTRuSkGWcL8t2XJ+/j0BpeQ==",
+          "modulus": "wEpIdXKb7lKn26sXpXuywkhxGplTQXxROLmNRZBrAHVBf7546RNXZwA/bzDqsuWTuPSC4T+I4j/z9j5/WqPuUw7SpnEPqWXc2xu7eN8kVyQt5170xkK6KHT4vVEkIvayPtIMLl0SgSCOy/pN5DJCi5ha7FlI84F1Qi2GumR+wQgCwHCVmU8Fj6Ik+B6akISXGCwe6X3rQFQngRFWQ/IrSkOkAOfy0EfvV+nZUo+FcbWuCZ6cb4Eq5I1ws/rZSeuwAWeedZcNt0VlNbsn4AnxBYQX4sj0dlko7JD5fWqeqq3/HzUNbBmLp9qeCXV8XlACn9YVWv900F47z04kVwpyTw==",
           "exponent": "AQAB"
         }
       },
       "x509Data": [
-        "MIIGAzCCA+ugAwIBAgITMwAABISY4hLgeKMxXQAAAAAEhDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMB4XDTI1MDYxOTE4MjEzNVoXDTI2MDYxNzE4MjEzNVowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEeMBwGA1UEAxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7XpKjCg5837MnNU9UKR3xba/q5Iq/JXcyzypjF20Q6LlVwLLwX3ehPNrT4+GM2kpbhg0KF9zaTCqKCnlRY4zUat+8sk/4dUEyzAfHaZrGf+9FDPlP7GMb7dT1lsS4zDSF6swfD4xuoux9mBYJOGDoXxknpL581td3SwLX4w9MIsERD7wjZYpUc+16BXXuSjtNXhYlnrXoePKlDqlGgJCM5wuFwd7BXdS1lJrqVxytOUHyUpp3ovamSQWE7fGYQKxg4e50J/mNYzgN6AYglCeJ9QjGlnQ4a4HTLrtNuqFgG3wt6a6pFJ/C1qdvB/tki3rTRuSkGWcL8t2XJ+/j0BpeQIDAQABo4IBgjCCAX4wHwYDVR0lBBgwFgYKKwYBBAGCN0wIAQYIKwYBBQUHAwMwHQYDVR0OBBYEFATf9G+hYepzHROBQMWBvZFgqW2FMFQGA1UdEQRNMEukSTBHMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxFjAUBgNVBAUTDTIzMDAxMis1MDUzNjIwHwYDVR0jBBgwFoAUSG5k5VAF04KqFzc3IrVtqMp1ApUwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNybDBhBggrBgEFBQcBAQRVMFMwUQYIKwYBBQUHMAKGRWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQBi0KbNV1OEU3KAyAyz+kBtzZ0RN6f1kjKetQrPGfiVL98SVhrQc2JgiDZh1Rb+ovKWBf3u/RTSuj9aCo3bsah0onAXYPDI9JPJAxQP9HlNumzwUUFCGolq4bAzq11nS5u2ZrudeqEKFFnCDbOIwX4wxFVeG5oEGH3vuPzFCcECfYepnxPpHAj+B5T+AoSEAVB6EspmpHEwb2cPkLLe7G3beSp0CpEhDdNQszxtWsApQiOsyyn/7yiMJ6h8P/lr3AK+4MCpVjZi8EzYvNO6/a1rF0HqdUPGDJCLhpmdGtagndxrjpEkc589v9KI3mVWIWcqIQkItQbPsX0ZL/38tB31d5jcjttnRVLx8wWYKhORWxo5lJ60q9cfJQqyvrOAPmzhqdiHozqYVqGRDxjnKPxxM52eS5OsOlvhNictzx6BRNGPE7ZEhOP/NGNpQSYS49u3fLnifCHUIUqS/1s04457mB+w8eaPaVnSBkmhTWLkqjmMa1VuzeABEFUQ2Xqg3H6jxtzuq+UjbMV23e9QwiEFEbVCrLOdzjfr65VdK44igSHcLzDS0PcytI8u+6MA8l16GJEMWpDdrhSATtVDQLwmF47OK8N0kZgV/aomeRDcXJ/6SzJIsm+vEHcB1F8/tXyOnmt/446TT8+g5XP0THFyFnjDJIbqf1xG8Lu91Prs/w==",
+        "MIIF9DCCA9ygAwIBAgITMwAABIVemewOWS/N1wAAAAAEhTANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMB4XDTI1MDYxOTE4MjEzN1oXDTI2MDYxNzE4MjEzN1owdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEeMBwGA1UEAxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwEpIdXKb7lKn26sXpXuywkhxGplTQXxROLmNRZBrAHVBf7546RNXZwA/bzDqsuWTuPSC4T+I4j/z9j5/WqPuUw7SpnEPqWXc2xu7eN8kVyQt5170xkK6KHT4vVEkIvayPtIMLl0SgSCOy/pN5DJCi5ha7FlI84F1Qi2GumR+wQgCwHCVmU8Fj6Ik+B6akISXGCwe6X3rQFQngRFWQ/IrSkOkAOfy0EfvV+nZUo+FcbWuCZ6cb4Eq5I1ws/rZSeuwAWeedZcNt0VlNbsn4AnxBYQX4sj0dlko7JD5fWqeqq3/HzUNbBmLp9qeCXV8XlACn9YVWv900F47z04kVwpyTwIDAQABo4IBczCCAW8wHwYDVR0lBBgwFgYKKwYBBAGCN0wIAQYIKwYBBQUHAwMwHQYDVR0OBBYEFLgmchogri2BNGlO4+UxamNOZJKNMEUGA1UdEQQ+MDykOjA4MR4wHAYDVQQLExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xFjAUBgNVBAUTDTIzMDAxMis1MDUzNTkwHwYDVR0jBBgwFoAUSG5k5VAF04KqFzc3IrVtqMp1ApUwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNybDBhBggrBgEFBQcBAQRVMFMwUQYIKwYBBQUHMAKGRWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAo5qgKdgouLEx2XIvqpLRACrBZORzVRislkdqxRl7He3IIGdOB+VOEldHwC+nzhPXS77eCOxwRy4aRnROVIy8uDcS0xtmwwJHgFZsZndrillRisptWmqw8V379xgjeJkV/j5+HPqct0v+ipLeXkgwCCLK8ysNyodkltYQsF1/5Nb+G/jR9RY5fov8TybKVwhbmQeGguRS0+X4G0Sqp7FngHZ/A7K2EIU90Fy7ejb9/3TM7+xvwnaW3XKLpfBWJfrd3ZlzPkiApQt5dmntMDpTa0ONskBMnLj1OTqKi0/OY7Ge/uAmknHxSDZTu5e2O6/8Wrqh20j0Na96CAvnu9ebNhtwpWWt8vfWmMdpZ12HtbK3KyMfDQF01YosqV1Z/WRphJHzXHw4qhkMJJpec/Z5t6VogWevWnWgQWwBRI8iRuMtGu+m3pf+LAwlb2mcyzN0xW8VTvQUK42UbWyWW5At1wK6S6mUn8ed0rmHXXcT1/Kb3KhbhLvMHFHg9ObfcTWyeE7XQBAiZRItL7wcZZjObcxV8tqmXqjzFx0kGKj4GfY70nGejcM5xQ9Pt95G88oTks/1rhmwLuHB2RvICp5UFU+LgNg4nsfQzLNlh4qJDZJ2JS6FHll1tUKyS6ajvNky8ik2wTP6GRwHSHNJM6Ek66PW9/r459vNPQ9PkjjglWQ==",
         "MIIHejCCBWKgAwIBAgIKYQ6Q0gAAAAAAAzANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEwOTA5WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+laUKq4BjgaBEm6f8MMHt03a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc6Whe0t+bU7IKLMOv2akrrnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4Ddato88tt8zpcoRb0RrrgOGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+lD3v++MrWhAfTVYoonpy4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nkkDstrjNYxbc+/jLTswM9sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6A4aN91/w0FK/jJSHvMAhdCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmdX4jiJV3TIUs+UsS1Vz8kA/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL5zmhD+kjSbwYuER8ReTBw3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zdsGbiwZeBe+3W7UvnSSmnEyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3T8HhhUSJxAlMxdSlQy90lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS4NaIjAsCAwEAAaOCAe0wggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRIbmTlUAXTgqoXNzcitW2oynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBDuRQFTuHqp8cx0SOJNDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3JsMF4GCCsGAQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3J0MIGfBgNVHSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1hcnljcHMuaHRtMEAGCCsGAQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkAYwB5AF8AcwB0AGEAdABlAG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn8oalmOBUeRou09h0ZyKbC5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7v0epo/Np22O/IjWll11lhJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0bpdS1HXeUOeLpZMlEPXh6I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/KmtYSWMfCWluWpiW5IP0wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvyCInWH8MyGOLwxS3OW560STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBpmLJZiWhub6e3dMNABQamASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJihsMdYzaXht/a8/jyFqGaJ+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYbBL7fQccOKO7eZS/sl/ahXJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbSoqKfenoi+kiVH6v7RyOA9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sLgOppO6/8MO0ETI7f33VtY5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtXcVZOSEXAQsmbdlsKgEhr/Xmfwb1tbWrJUnMTDXpQzQ==",
         "MIIF7TCCA9WgAwIBAgIQP4vItfyfspZDtWnWbELhRDANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwMzIyMjIwNTI4WhcNMzYwMzIyMjIxMzA0WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCygEGqNThNE3IyaCJNuLLx/9VSvGzH9dJKjDbu0cJcfoyKrq8TKG/Ac+M6ztAlqFo6be+ouFmrEyNozQwph9FvgFyPRH9dkAFSWKxRxV8qh9zc2AodwQO5e7BW6KPeZGHCnvjzfLnsDbVU/ky2ZU+I8JxImQxCCwl8MVkXeQZ4KI2JOkwDJb5xalwL54RgpJki49KvhKSn+9GY7Qyp3pSJ4Q6g3MDOmT3qCFK7VnnkH4S6Hri0xElcTzFLh93dBWcmmYDgcRGjuKVB4qRTufcyKYMME782XgSzS0NHL2vikR7TmE/dQgfI6B0S/Jmpaz6SfsjWaTr8ZL22CZ3K/QwLopt3YEsDlKQwaRLWQi3BQUzK3Kr9j1uDRprZ/LHR47PJf0h6zSTwQY9cdNCssBAgBkm3xy0hyFfj0IbzA2j70M5xwYmZSmQBbP3sMJHPQTySx+W6hh1hhMdfgzlirrSSL0fzC/hV66AfWdC7dJse0Hbm8ukG1xDo+mTeacY1logC8Ea4PyeZb8txiSk190gWAjWP1Xl8TQLPX+uKg09FcYj5qQ1OcunCnAfPSRtOBA5jUYxe2ADBVSy2xuDCZU7JNDn1nLPEfuhhbhNfFcRf2X7tHc7uROzLLoax7Dj2cO2rXBPB2Q8Nx4CyVe0096yb5MPa50c8prWPMd/FS6/r8QIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUci06AjGQQ7kUBU7h6qfHMdEjiTQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggIBAH9yzw+3xRXbm8BJyiZb/p4T5tPw0tuXX/JLP02zrhmu7deXoKzvqTqjwkGw5biRnhOBJAPmCf0/V0A5ISRW0RAvS0CpNoZLtFNXmvvxfomPEf4YbFGq6O0JlbXlccmh6Yd1phV/yX43VF50k8XDZ8wNT2uoFwxtCJJ+i92Bqi1wIcM9BhS7vyRep4TXPw8hIr1LAAbblxzYXtTFC1yHblCk6MM4pPvLLMWSZpuFXst6bJN8gClYW1e1QGm6CHmmZGIVnYeWRbVmIyADixxzoNOieTPgUFmG2y/lAiXqcyqfABTINseSO+lOAOzYVgm5M0kS0lQLAausR7aRKX1MtHWAUgHoyoL2n8ysnI8X6i8msKtyrAv+nlEex0NVZ09Rs1fWtuzuUrc66U7h14GIvE+OdbtLqPA1qibUZ2dJsnBMO5PcHd94kIZysjik0dySTclY6ysSXNQ7roxrsIPlAT/4CTL2kzU0Iq/dNw13CYArzUgA8YyZGUcFAenRv9FO0OYoQzeZpApKCNmacXPSqs0xE2N2oTdvkjgefRI8ZjLny23h/FKJ3crWZgWalmG+oijHHKOnNlA8OqTfSm7mhzvO6/DggTedEzxSjr25HTTGHdUKaj2YKXCMiSrRq4IQSB/c9O+lxbtVGjhjhE63bK2VVOxlIhBJF7jAHscPrFRH"
       ]
     },
     "counterSign": {
       "x509Data": [
-        "MIIHKDCCBRCgAwIBAgITMwAAAf8SOHz3wWXWoQABAAAB/zANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAeFw0yNDA3MjUxODMxMTlaFw0yNTEwMjIxODMxMTlaMIHTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo0QzFBLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMnoldKQe24PP6nP5pIg3SV58yVj2IJPZkxniN6c0KbMq0SURFnCmB3f/XW/oN8+HVOFQpAGRF6r5MT+UDU7QRuSKXsaaYeD4W4iSsL1/lEuCpEhYX9cH5QwGNbbvQkKoYcXxxVe74bZqhywgpg8YWT5ggYff13xSUCFMFWUfEbVJIM5jfW5lomIH19EfmwwJ53FHbadcYxpgqXQTMoJPytId21E1M0B2+JD39spZCj6FhWJ9hjWIFsPDxgVDtL0zCo2A+qS3gT9IWQ4eT93+MYRi5usffMbiEKf0RZ8wW4LYcklxpfjU9XGQKhshIU+y9EnUe6kJb+acAzXq2yt2EhAypN7A4fUutISyTaj+9YhypBte+RwMoOs5hOad3zja/f3yBKTwJQvGIrMV2hl+EaQwWFSqRo9BQmcIrImbMZtF/cOmUpPDjl3/CcU2FiKn0bls3VIq9Gd44jjrWg6u13cqQeIGa4a/dCnD0w0cL8utM60HGv9Q9Sez0CQCTm24mm6ItdrrFfGsbZU/3QnjwuJ3XBXGq9b/n5wpYbPbtxZ+i5Bw0WXzc4V4CwxMG+nQOMt7OhvoEN+aPdI9oumpmmvCbFf3Ahfog0hswMWWNbENZq3TJs8X1s1zerDyTMuPbXbFkyIGVlTkkvblB4UmJG4DMZy3oil3geTAfUDHDknAgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQUw/qV5P60/3exP9EBO4R9MM/ulGEwHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBADkjTeTKS4srp5vOun61iItIXWsyjS4Ead1mT34WIDwtyvwzTMy5YmEFAKelrYKJSK2rYr14zhtZSI2shva+nsOB9Z+V2XQ3yddgy46KWqeXtYlP2JNHrrT8nzonr327CM05PxudfrolCZO+9p1c2ruoSNihshgSTrwGwFRUdIPKaWcC4IU+M95pBmY6vzuGfz3JlRrYxqbNkwrSOK2YzzVvDuHP+GiUZmEPzXVvdSUazl0acl60ylD3t5DfDeeo6ZfZKLS4Xb3fPUWzrCTX9l86mwFe141eHGgoJQNm7cw8XMn38F4S7vRzFN3S2EwCPdYEzVBewQPatRL0pQiipTfDddGOIlNJ8iJH6UcWMgG0cquUD2DyRxgNE8tDw/N2gre/UWtCHQyDErsF5aVJ8iMscKw8pYHzhssrFgcEP47NuPW6kDmD3acjnYEXvLV3Rq4A6AXrlTivnEQpV6YpjWMK+taGdv5DzM1a80VGDJAV3vVqnUns4fLcrbrpWGHESveaooRdIq0LOv1jkCZbUF+/ZcxVxPRRZZ/TIsdGrPguBz83fktGwTdwN10UTsAL9NeiArk/IWNSJ8lu48FZjfjpENc3ouui61OUbQM9J08ceTnj8o502iLU0mODhrhlNUl2h+PSUj97fMhmAP76K21uFZ3ng+9tRYMGiU6BxZDi",
+        "MIIHIDCCBQigAwIBAgITMwAAAgcsETmJzYX7xQABAAACBzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAeFw0yNTAxMzAxOTQyNTJaFw0yNjA0MjIxOTQyNTJaMIHLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSUwIwYDVQQLExxNaWNyb3NvZnQgQW1lcmljYSBPcGVyYXRpb25zMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046ODYwMy0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFP/96dPmcfgODe3/nuFveuBst/JmSxSkOn89ZFytHQm344iLoPqkVws+CiUejQabKf+/c7KU1nqwAmmtiPnG8zm4Sl9+RJZaQ4Dx3qtA9mdQdS7Chf6YUbP4Z++8laNbTQigJoXCmzlV34vmC4zpFrET4KAATjXSPK0sQuFhKr7ltNaMFGclXSnIhcnScj9QUDVLQpAsJtsKHyHN7cN74aEXLpFGc1I+WYFRxaTgqSPqGRfEfuQ2yGrAbWjJYOXueeTA1MVKhW8zzSEpfjKeK/t2XuKykpCUaKn5s8sqNbI3bHt/rE/pNzwWnAKz+POBRbJxIkmL+n/EMVir5u8uyWPl1t88MK551AGVh+2H4ziR14YDxzyCG924gaonKjicYnWUBOtXrnPK6AS/LN6Y+8Kxh26a6vKbFbzaqWXAjzEiQ8EY9K9pYI/KCygixjDwHfUgVSWCyT8Kw7mGByUZmRPPxXONluMe/P8CtBJMpuh8CBWyjvFfFmOSNRK8ETkUmlTUAR1CIOaeBqLGwscShFfyvDQrbChmhXib4nRMX5U9Yr9d7VcYHn6eZJsgyzh5QKlIbCQC/YvhFK42ceCBDMbc+Ot5R6T/Mwce5jVyVCmqXVxWOaQc4rA2nV7onMOZC6UvCG8LGFSZBnj1loDDLWo/I+RuRok2j/Q4zcMnwkQIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFHK1UmLCvXrQCvR98JBq18/4zo0eMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQDju0quPbnix0slEjD7j2224pYOPGTmdDvO0+bNRCNkZqUv07P04nf1If3Y/iJEmUaU7w12Fm582ImpD/Kw2ClXrNKLPTBO6nfxvOPGtalpAl4wqoGgZxvpxb2yEunG4yZQ6EQOpg1dE9uOXoze3gD4Hjtcc75kca8yivowEI+rhXuVUWB7vog4TGUxKdnDvpk5GSGXnOhPDhdId+g6hRyXdZiwgEa+q9M9Xctz4TGhDgOKFsYxFhXNJZo9KRuGq6evhtyNduYrkzjDtWS6gW8akR59UhuLGsVq+4AgqEY8WlXjQGM2OTkyBnlQLpB8qD7x9jRpY2Cq0OWWlK0wfH/1zefrWN5+be87Sw2TPcIudIJn39bbDG7awKMVYDHfsPJ8ZvxgWkZuf6ZZAkph0eYGh3IV845taLkdLOCvw49Wxqha5Dmi2Ojh8Gja5v9kyY3KTFyX3T4C2scxfgp/6xRd+DGOhNVPvVPa/3yRUqY5s5UYpy8DnbppV7nQO2se3HvCSbrb+yPyeob1kUfMYa9fE2bEsoMbOaHRgGji8ZPt/Jd2bPfdQoBHcUOqPwjHBUIcSc7xdJZYjRb4m81qxjma3DLjuOFljMZTYovRiGvEML9xZj2pHRUyv+s5v7VGwcM6rjNYM4qzZQM6A2RGYJGU780GQG0QO98w+sucuTVrfQ==",
         "MIIHcTCCBVmgAwIBAgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZnhUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxqD89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmPfrVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSWrAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zbr17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYctenIPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17aj54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3hLB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74py27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1AoL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNtyo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lwY1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8g==",
         "MIIF7TCCA9WgAwIBAgIQKMw6Jb+6RKxEmptYa0M5qjANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMTAwNjIzMjE1NzI0WhcNMzUwNjIzMjIwNDAxWjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5CJ4o5OTsBk5QaLNBxXvrrraOr4G6IkQfZTRpTL5wQBfyFnvief2G7Q059BuorZKQHss9do9a2bWREC48BY2KbSRU5x/tVq2DtFCcFaUXdIhZIPwIxYR202jUbyh4zly481CQRP/jY1++oZoslhUE1gf+HoQh4EIxEcQoNpTPUKRinsnWq3EAslsM5pbUCiSW9f/G1bcb18u3IWKvEtyhXTfjGvsaRpjAm8DnYx8qCJMCfh5qjvKfGInkIoWisYRXQP/1DthvnO3iRTEBzRfpf7CBReOqIUAmoXKqp088AQV+7oNYsV4GY5likXiCtw2TDCRqtBvbJ+xflQQ/k0ow9ZcYs6f5GaeTMx0ByNsiUlzXJclG+aL7h1lDvptisY0thkQaRqx4YX4wCfquicRBKiJmA5E5RZzHiwyoyg0v+1LqDPdjMyOd/rAfrWfWp1ADxgRwY7UssYZaQ7f7rvluKW4hIUEmBozJw+6wwoWTobmF2eYybEtMP9Zdo+W1nXfDnMBVt3QA47g4q4OXUOGaQiQdxsCjMNEaWshSNPdz8ccYHzOteuzLQWDzI5QgwkhFrFxRxi6AwuJ3Fb2Fh+02nZaR7gC1o3Dsn+ONgGiDdrqvXXBSIhbiZvu6s8XC9z4vd6bK3sGmxkhMwzdRI9Mn17hOcJbwoUR2r3jPmuFmEwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU1fZWy4/oolxiaNE9lJBb186aGMQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggIBAKylloy/u66m9tdxh0MxVoj9HDJxWzW31PCR8q834hTx8wImBT4WFH8UurhP+4mysufUCcxtuVs7ZGVwZrfysVrfGgLz9VG4Z215879We+SEuSsem0CcJjT5RxiYadgc17bRv49hwmfEte9gQ44QGzZJ5CDKrafBsSdlCfjN9Vsq0IQz8+8f8vWcC1iTN6B1oN5y3mx1KmYi9YwGMFafQLkwqkB3FYLXi+zA07K9g8V3DB6urxlToE15cZ8PrzDOZ/nWLMwiQXoH8pdCGM5ZeRBV3m8Q5Ljag2ZAFgloI1uXLiaaArtXjMW4umliMoCJnqH9wJJ8eyszGYQqY8UAaGL6n0eNmXpFOqfp7e5pQrXzgZtHVhB7/HA2hBhz6u/5l02eMyPdJgu6Krc/RNyDJ/+9YVkrEbfKT9vFiwwcMa4y+Pi5Qvd/3GGadrFaBOERPWZFtxhxvskkhdbz1LpBNF0SLSW5jaYTSG1LsAd9mZMJYYF0VyaKq2nj5NnHiMwk2OxSJFwevJEU4pbe6wrant1fs1vb1ILsxiBQhyVAOvvH7s3+M+Vuw4QJVQMlOcDpNV1lMaj2v6AJzSnHszYyLtyV84PBWs+LjfbqsyH4pO0eMQ62TBGrYAukEiMiF6M2ZIKRBBLgq28ey1AFYbRA/1mGcdHVM2l8qXOKONdkDPFp"
       ],
-      "timestamp": "2025-08-14-07:37:33",
+      "timestamp": "2025-10-23-07:30:29",
       "counterSignatureMethod": "timeStamp",
-      "counterSignature": "MIIXmAYJKoZIhvcNAQcCoIIXiTCCF4UCAQMxDzANBglghkgBZQMEAgEFADCCAV0GCyqGSIb3DQEJEAEEoIIBTASCAUgwggFEAgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEIPIVdDv5yLUBRQZGsZ7lC10/RB9UrYCBWuetUfd6yLdRAgZok+pHITYYEzIwMjUwODE1MDIzNzMzLjA1M1owBIACAfQCAUyggdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloIIR+zCCBygwggUQoAMCAQICEzMAAAH/Ejh898Fl1qEAAQAAAf8wDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcNMjQwNzI1MTgzMTE5WhcNMjUxMDIyMTgzMTE5WjCB0zELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9ucyBMaW1pdGVkMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046NEMxQS0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ6JXSkHtuDz+pz+aSIN0lefMlY9iCT2ZMZ4jenNCmzKtElERZwpgd3/11v6DfPh1ThUKQBkReq+TE/lA1O0Ebkil7GmmHg+FuIkrC9f5RLgqRIWF/XB+UMBjW270JCqGHF8cVXu+G2aocsIKYPGFk+YIGH39d8UlAhTBVlHxG1SSDOY31uZaJiB9fRH5sMCedxR22nXGMaYKl0EzKCT8rSHdtRNTNAdviQ9/bKWQo+hYVifYY1iBbDw8YFQ7S9MwqNgPqkt4E/SFkOHk/d/jGEYubrH3zG4hCn9EWfMFuC2HJJcaX41PVxkCobISFPsvRJ1HupCW/mnAM16tsrdhIQMqTewOH1LrSEsk2o/vWIcqQbXvkcDKDrOYTmnd842v398gSk8CULxiKzFdoZfhGkMFhUqkaPQUJnCKyJmzGbRf3DplKTw45d/wnFNhYip9G5bN1SKvRneOI461oOrtd3KkHiBmuGv3Qpw9MNHC/LrTOtBxr/UPUns9AkAk5tuJpuiLXa6xXxrG2VP90J48Lid1wVxqvW/5+cKWGz27cWfouQcNFl83OFeAsMTBvp0DjLezob6BDfmj3SPaLpqZprwmxX9wIX6INIbMDFljWxDWat0ybPF9bNc3qw8kzLj212xZMiBlZU5JL25QeFJiRuAzGct6Ipd4HkwH1Axw5JwIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFMP6leT+tP93sT/RATuEfTDP7pRhMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQA5I03kykuLK6ebzrp+tYiLSF1rMo0uBGndZk9+FiA8Lcr8M0zMuWJhBQCnpa2CiUitq2K9eM4bWUiNrIb2vp7DgfWfldl0N8nXYMuOilqnl7WJT9iTR660/J86J699uwjNOT8bnX66JQmTvvadXNq7qEjYobIYEk68BsBUVHSDymlnAuCFPjPeaQZmOr87hn89yZUa2MamzZMK0jitmM81bw7hz/holGZhD811b3UlGs5dGnJetMpQ97eQ3w3nqOmX2Si0uF293z1Fs6wk1/ZfOpsBXteNXhxoKCUDZu3MPFzJ9/BeEu70cxTd0thMAj3WBM1QXsED2rUS9KUIoqU3w3XRjiJTSfIiR+lHFjIBtHKrlA9g8kcYDRPLQ8PzdoK3v1FrQh0MgxK7BeWlSfIjLHCsPKWB84bLKxYHBD+Ozbj1upA5g92nI52BF7y1d0auAOgF65U4r5xEKVemKY1jCvrWhnb+Q8zNWvNFRgyQFd71ap1J7OHy3K266VhhxEr3mqKEXSKtCzr9Y5AmW1Bfv2XMVcT0UWWf0yLHRqz4Lgc/N35LRsE3cDddFE7AC/TXogK5PyFjUifJbuPBWY346RDXN6LroutTlG0DPSdPHHk54/KOdNoi1NJjg4a4ZTVJdofj0lI/e3zIZgD++ittbhWd54PvbUWDBolOgcWQ4jCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aORmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqEUUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTEmr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwGA1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNVHSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5jcmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDANBgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th542DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRXud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBewVIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+CljdQDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFrDZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFhbHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7ntdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6FwZvKhggNWMIICPgIBATCCAQGhgdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloiMKAQEwBwYFKw4DAhoDFQCpE4xsxLwlxSVyc+TBEsVE9cWymaCBgzCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMA0GCSqGSIb3DQEBCwUAAgUA7Ej0AzAiGA8yMDI1MDgxNDIzNDcxNVoYDzIwMjUwODE1MjM0NzE1WjB0MDoGCisGAQQBhFkKBAExLDAqMAoCBQDsSPQDAgEAMAcCAQACAhv6MAcCAQACAhKpMAoCBQDsSkWDAgEAMDYGCisGAQQBhFkKBAIxKDAmMAwGCisGAQQBhFkKAwKgCjAIAgEAAgMHoSChCjAIAgEAAgMBhqAwDQYJKoZIhvcNAQELBQADggEBAK9fpi47WvMujqooPn8AldaYVVTd/MknJtSAfWHf4talrClHZ/GY3RO9tO0acKtSswr3jH2AMF6lAZj+839y/4N0s+bSGllnh9ivYTHw4LeEd3G0PNmbM3aNMKpdlHkXtK4N/6cRwFlkt5zCZvLGaXbkkqrKGqh2Q9X90yxbgbs1H69TAR4/HWcjHTmz0iM093b/w/oJS4LQMciF6g0gpzWVktLVtwfQkzUt16J57c1Z2ipgHojIkeKh09jVPGONJWvABMLmhuahJTDwud4UoHtqrict23MAqaLXzamFbp+98co3t0PCBnJUmpz4VLPQqjp7hZXJOsQK+G64hGxjzcoxggQNMIIECQIBATCBkzB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAf8SOHz3wWXWoQABAAAB/zANBglghkgBZQMEAgEFAKCCAUowGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMC8GCSqGSIb3DQEJBDEiBCDXBkeR4xTPjhDrPRQ1qvy98Ybi5Vhtp3ov4Z2GiCR/MDCB+gYLKoZIhvcNAQkQAi8xgeowgecwgeQwgb0EIOQy777JAndprJwi4xPq8Dsk24xpU4jeoONIRXy6nKf9MIGYMIGApH4wfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAH/Ejh898Fl1qEAAQAAAf8wIgQg54faFq0iHrgxPYuiO0j9wz5AMnXH4ONR1azCBODS3e8wDQYJKoZIhvcNAQELBQAEggIAogObF40R8uk/BOJK2PFjNq2yumWOFcywt0eqZP3QDfy46ul9no0QPjJw+Xgd0Xil5KQiclWmVAE8AUaLXO8dohdf9uuNDgIF3gqEDbug6NPIhJAqEW5AQuSkC+kSqr5K//StsjQEO86OBZRDjqwF2hPAcKUi6yM0vM1EUXBM0wzdsBjKYBmcXSU027HNmawtlj1jJdBdOq8beqVm5G0b2WAVwvdp9kSE0KjslsDNQYMpZjM10AyiGocjb2sgASk5FP8dMzd21mUMDg5OBREXmJIObMQa91ppJLwtgC9jMXOgK4kG1nq4CfSUu4q74+hvc7woNYZx61KAZjA7TdRkv9Vta68JDE+FePNORKXc8NJ+uOqNV8OVzdBLP1++G6yzT+4azot71gvl8V0e+06B43Q9jEkSdX3tOZ6+kUZ9pox1PJ0dAGfs1gcbjH16IdA2ZSktuOkzWxwXs1K9zCyPdmK017dwXQwz2IEY9noycI4L/Id+tXBUKvnHDxzZsz/snNWJPpiyA3mhEXrSAo6nrlCXrHCp5TT0CX8aPjuwuJz1pQG5pF4f1m1mNh2tW4L/D9ZXOql5S3/o3hm8ovjJGTaUTrIG/oBw9OB+1qzBnA07YJ0uSKpEJSFTD3fMUYAUtHq8YzYi4TQjStgddA0h8Q0LWaE2nwEUkVgXGTDt+3wA"
+      "counterSignature": "MIIXfwYJKoZIhvcNAQcCoIIXcDCCF2wCAQMxDzANBglghkgBZQMEAgEFADCCAVUGCyqGSIb3DQEJEAEEoIIBRASCAUAwggE8AgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEIK4oF3FRZnonOkP77IO4n16Qc/WvCwE0UvhkCmG226NBAgZo8BpWavAYEzIwMjUxMDI0MDIzMDI4LjkwOFowBIACAfQCAfOggdGkgc4wgcsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJTAjBgNVBAsTHE1pY3Jvc29mdCBBbWVyaWNhIE9wZXJhdGlvbnMxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo4NjAzLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZaCCEeowggcgMIIFCKADAgECAhMzAAACBywROYnNhfvFAAEAAAIHMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMB4XDTI1MDEzMDE5NDI1MloXDTI2MDQyMjE5NDI1MlowgcsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJTAjBgNVBAsTHE1pY3Jvc29mdCBBbWVyaWNhIE9wZXJhdGlvbnMxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo4NjAzLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMU//3p0+Zx+A4N7f+e4W964Gy38mZLFKQ6fz1kXK0dCbfjiIug+qRXCz4KJR6NBpsp/79zspTWerACaa2I+cbzObhKX35EllpDgPHeq0D2Z1B1LsKF/phRs/hn77yVo1tNCKAmhcKbOVXfi+YLjOkWsRPgoABONdI8rSxC4WEqvuW01owUZyVdKciFydJyP1BQNUtCkCwm2wofIc3tw3vhoRcukUZzUj5ZgVHFpOCpI+oZF8R+5DbIasBtaMlg5e555MDUxUqFbzPNISl+Mp4r+3Ze4rKSkJRoqfmzyyo1sjdse3+sT+k3PBacArP484FFsnEiSYv6f8QxWKvm7y7JY+XW3zwwrnnUAZWH7YfjOJHXhgPHPIIb3biBqicqOJxidZQE61euc8roBL8s3pj7wrGHbprq8psVvNqpZcCPMSJDwRj0r2lgj8oLKCLGMPAd9SBVJYLJPwrDuYYHJRmZE8/Fc42W4x78/wK0Ekym6HwIFbKO8V8WY5I1ErwRORSaVNQBHUIg5p4GosbCxxKEV/K8NCtsKGaFeJvidExflT1iv13tVxgefp5kmyDLOHlAqUhsJAL9i+EUrjZx4IEMxtz463lHpP8zBx7mNXJUKapdXFY5pBzisDadXuicw5kLpS8IbwsYVJkGePWWgMMtaj8j5G5GiTaP9DjNwyfCRAgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQUcrVSYsK9etAK9H3wkGrXz/jOjR4wHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBAOO7Sq49ueLHSyUSMPuPbbbilg48ZOZ0O87T5s1EI2RmpS/Ts/Tid/Uh/dj+IkSZRpTvDXYWbnzYiakP8rDYKVes0os9ME7qd/G848a1qWkCXjCqgaBnG+nFvbIS6cbjJlDoRA6mDV0T245ejN7eAPgeO1xzvmRxrzKK+jAQj6uFe5VRYHu+iDhMZTEp2cO+mTkZIZec6E8OF0h36DqFHJd1mLCARr6r0z1dy3PhMaEOA4oWxjEWFc0lmj0pG4arp6+G3I125iuTOMO1ZLqBbxqRHn1SG4saxWr7gCCoRjxaVeNAYzY5OTIGeVAukHyoPvH2NGljYKrQ5ZaUrTB8f/XN5+tY3n5t7ztLDZM9wi50gmff1tsMbtrAoxVgMd+w8nxm/GBaRm5/plkCSmHR5gaHchXzjm1ouR0s4K/Dj1bGqFrkOaLY6OHwaNrm/2TJjcpMXJfdPgLaxzF+Cn/rFF34MY6E1U+9U9r/fJFSpjmzlRinLwOdumlXudA7ax7ce8JJutv7I/J6hvWRR8xhr18TZsSygxs5odGAaOLxk+38l3Zs991CgEdxQ6o/CMcFQhxJzvF0lliNFvibzWrGOZrcMuO44WWMxlNii9GIa8Qwv3FmPakdFTK/6zm/tUbBwzquM1gzirNlAzoDZEZgkZTvzQZAbRA73zD6y5y5NWt9MIIHcTCCBVmgAwIBAgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZnhUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxqD89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmPfrVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSWrAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zbr17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYctenIPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17aj54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3hLB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74py27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1AoL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNtyo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lwY1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8qGCA00wggI1AgEBMIH5oYHRpIHOMIHLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSUwIwYDVQQLExxNaWNyb3NvZnQgQW1lcmljYSBPcGVyYXRpb25zMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046ODYwMy0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoBATAHBgUrDgMCGgMVANO9VT9iP2VRLJ4MJqInYNrmFSJLoIGDMIGApH4wfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQELBQACBQDspSPlMCIYDzIwMjUxMDIzMjIwMDA1WhgPMjAyNTEwMjQyMjAwMDVaMHQwOgYKKwYBBAGEWQoEATEsMCowCgIFAOylI+UCAQAwBwIBAAICDIAwBwIBAAICE+EwCgIFAOymdWUCAQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgCAQACAwGGoDANBgkqhkiG9w0BAQsFAAOCAQEAye6HL3JOOUTky9aJIDuhkkTjGnjQPRuKZaYGIAlCNQOhO3x2dnN6hr/QbEMWcBjYsDgGS53NFEghq7JuYhpFLdYeyuQ2iRYgKaHIlwtMm6820NpKwX8XUXY66bodX3q1VFYK05r7czu77T0XXKYaFwk4XokcJQEpnBtAExVzTAHqZTjqXFeP0+gak+/DJp3dh4SKjg2gOAaD8vUrSACj/NeGtiWp7Ir+l6e+rKTCYKRieopd8bX0W5wyLBVPryRuoUKcFMfKHNNwps07R/tcPi7RS3OUggFhsrEmGuMoZbIUCAl2/qYegY2Qa0/ldDr/qM8dDhURXzsTztDlHmhQ6zGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwAhMzAAACBywROYnNhfvFAAEAAAIHMA0GCWCGSAFlAwQCAQUAoIIBSjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIBjnMfOWDqIDZJW2SPZFayuz8o4hCjjigQEODZyAULIYMIH6BgsqhkiG9w0BCRACLzGB6jCB5zCB5DCBvQQgL/fU0dB2zUhnmw+e/n2n6/oGMEOCgM8jCICafQ8ep7MwgZgwgYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAgcsETmJzYX7xQABAAACBzAiBCBOzXy++iBlQ/6F8GM/DefasEvwxo+NeER+lUeJUsI9XjANBgkqhkiG9w0BAQsFAASCAgCbuAm03ToxRPdheyBPnwcj/g7nliEJWPRpJnAClqqRhkei0Zyy4P3PLOsGtkuWSBUAlRorfd7BCs2T0hVmk5kBzDyD7I+b/dU9LOwFzpOGRJ1KYdd26NmSyqvUJAnQke9JW2ftpJI2zSkl54dmJHwcefNxG82kBQKFpQ7fPct1kTIc2TiIlKnZ71uKUZC0rpCQ0Oc3eTCeSAOM9V9CBI67a8oKmzwIL9G3BoeTayVMRmir6bgGQYu0HmMw/rjaLWWZkpRYBP0VGMRGhyraqCIdQIzH6UmeCKnbgwrNNfZLO3wIGxqbxujiKgFStq426mCryG+0fY9XTiWLZ5MZa9bJCR/NCdn3MFuZGEg4Tdu8XuoKvwh+3bNcssDZODulU76NfQ38GXsFHio+e3f1jkwVjciHfa4HbKHiwIUwaHn6bYGNIOcxa92IzDlG0CjK0EIhI4h6izwD8xp/ZJPSKe1fmGhhLa2VypgPZ3kvvIxTSSYPYlIZB/Yx01hDyoNMbXoNY3HYZVLlxgZ5TOy0rm9ZhUBZgAXzUSjh/edRz2ElCAvsX4YXdtCJhbh2tdtOQoygWjVbmJgqZ+zyF9O2+aQvRKuz+T/5ojh05xoa/3sBH4R6VtgCRlhekxHON94EEjTcJze0TtsnRE8fZewAywORhlkK90D80OJUyzTqYJ2TZQA="
     }
   }
 }
diff --git a/pkgs/os-specific/windows/msvcSdk/update.nu b/pkgs/os-specific/windows/msvcSdk/update.nu
index 7c6ce40880e8..a2f8b7b8a4f8 100755
--- a/pkgs/os-specific/windows/msvcSdk/update.nu
+++ b/pkgs/os-specific/windows/msvcSdk/update.nu
@@ -36,9 +36,9 @@ def main [] {
     |arch|
     let dir = mktemp -d
 
-    xwin --accept-license --cache-dir $dir --manifest $"($PATH | path join manifest.json)" --arch $arch splat --preserve-ms-arch-notation
+    xwin --accept-license --cache-dir $dir --manifest $"($PATH | path join manifest.json)" --arch $arch download
 
-    let hash = nix hash path ($dir | path join splat)
+    let hash = nix hash path $dir
 
     {arch: $arch, hash: $hash}
   } | transpose -r -d
diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 92f27267b609..4a81c1319463 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -58,6 +58,38 @@ let
     submodule
     ;
 
+  /*
+    Creates a structured value type suitable for serialization formats.
+
+    Parameters:
+    - typeName: String describing the format (e.g. "JSON", "YAML", "XML")
+    - nullable: Whether the structured value type allows `null` values.
+
+    Returns a type suitable for structured data formats that supports:
+    - Basic types: boolean, integer, float, string, path
+    - Complex types: attribute sets and lists
+  */
+  mkStructuredType =
+    {
+      typeName,
+      nullable ? true,
+    }:
+    let
+      baseType = oneOf [
+        bool
+        int
+        float
+        str
+        path
+        (attrsOf valueType)
+        (listOf valueType)
+      ];
+      valueType = (if nullable then nullOr baseType else baseType) // {
+        description = "${typeName} value";
+      };
+    in
+    valueType;
+
   # Attributes added accidentally in https://github.com/NixOS/nixpkgs/pull/335232 (2024-08-18)
   # Deprecated in https://github.com/NixOS/nixpkgs/pull/415666 (2025-06)
   allowAliases = pkgs.config.allowAliases or false;
@@ -130,23 +162,7 @@ optionalAttrs allowAliases aliases
     { }:
     {
 
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "JSON value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "JSON"; };
 
       generate =
         name: value:
@@ -160,7 +176,7 @@ optionalAttrs allowAliases aliases
               preferLocalBuild = true;
             }
             ''
-              jq . "$valuePath"> $out
+              jq . "$valuePath" > $out
             ''
         ) { };
 
@@ -187,23 +203,7 @@ optionalAttrs allowAliases aliases
             ''
         ) { };
 
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "YAML 1.1 value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "YAML 1.1"; };
 
     };
 
@@ -226,23 +226,7 @@ optionalAttrs allowAliases aliases
             ''
         ) { };
 
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "YAML 1.2 value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "YAML 1.2"; };
 
     };
 
@@ -503,23 +487,7 @@ optionalAttrs allowAliases aliases
     { }:
     json { }
     // {
-      type =
-        let
-          valueType =
-            oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ]
-            // {
-              description = "TOML value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "TOML"; };
 
       generate =
         name: value:
@@ -552,23 +520,7 @@ optionalAttrs allowAliases aliases
     { }:
     json { }
     // {
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "CDN value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "CDN"; };
 
       generate =
         name: value:
@@ -983,23 +935,9 @@ optionalAttrs allowAliases aliases
   pythonVars =
     { }:
     {
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              float
-              int
-              path
-              str
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "Python value";
-            };
-        in
-        attrsOf valueType;
+      type = attrsOf (mkStructuredType {
+        typeName = "Python";
+      });
 
       lib = {
         mkRaw = value: {
@@ -1079,23 +1017,7 @@ optionalAttrs allowAliases aliases
     }:
     if format == "badgerfish" then
       {
-        type =
-          let
-            valueType =
-              nullOr (oneOf [
-                bool
-                int
-                float
-                str
-                path
-                (attrsOf valueType)
-                (listOf valueType)
-              ])
-              // {
-                description = "XML value";
-              };
-          in
-          valueType;
+        type = mkStructuredType { typeName = "XML"; };
 
         generate =
           name: value:
@@ -1137,4 +1059,29 @@ optionalAttrs allowAliases aliases
     else
       throw "pkgs.formats.xml: Unknown format: ${format}";
 
+  plist =
+    {
+      escape ? true,
+    }:
+    {
+      type =
+        let
+          valueType =
+            nullOr (oneOf [
+              bool
+              int
+              float
+              str
+              path
+              (attrsOf valueType)
+              (listOf valueType)
+            ])
+            // {
+              description = "Property list (plist) value";
+            };
+        in
+        valueType;
+
+      generate = name: value: pkgs.writeText name (lib.generators.toPlist { inherit escape; } value);
+    };
 }
diff --git a/pkgs/pkgs-lib/tests/formats.nix b/pkgs/pkgs-lib/tests/formats.nix
index 9afd9d783b65..ccbda6b7086e 100644
--- a/pkgs/pkgs-lib/tests/formats.nix
+++ b/pkgs/pkgs-lib/tests/formats.nix
@@ -1005,4 +1005,79 @@ runBuildTests {
       </root>
     '';
   };
+
+  PlistGenerate = shouldPass {
+    format = formats.plist { };
+    input = {
+      null = null;
+      false = false;
+      true = true;
+      int = 10;
+      float = 3.141;
+      str = "foo";
+      attrs.foo = 0;
+      list = [
+        1
+        "hello"
+        {
+          attrs = {
+            key = {
+              value = [
+                [
+                  1
+                  2
+                  3
+                ]
+                "test"
+              ];
+            };
+          };
+        }
+      ];
+    };
+    expected = ''
+      <?xml version="1.0" encoding="UTF-8"?>
+      <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+      <plist version="1.0">
+      <dict>
+      ''\t<key>attrs</key>
+      ''\t<dict>
+      ''\t''\t<key>foo</key>
+      ''\t''\t<integer>0</integer>
+      ''\t</dict>
+      ''\t<key>false</key>
+      ''\t<false/>
+      ''\t<key>float</key>
+      ''\t<real>3.141000</real>
+      ''\t<key>int</key>
+      ''\t<integer>10</integer>
+      ''\t<key>list</key>
+      ''\t<array>
+      ''\t''\t<integer>1</integer>
+      ''\t''\t<string>hello</string>
+      ''\t''\t<dict>
+      ''\t''\t''\t<key>attrs</key>
+      ''\t''\t''\t<dict>
+      ''\t''\t''\t''\t<key>key</key>
+      ''\t''\t''\t''\t<dict>
+      ''\t''\t''\t''\t''\t<key>value</key>
+      ''\t''\t''\t''\t''\t<array>
+      ''\t''\t''\t''\t''\t''\t<array>
+      ''\t''\t''\t''\t''\t''\t''\t<integer>1</integer>
+      ''\t''\t''\t''\t''\t''\t''\t<integer>2</integer>
+      ''\t''\t''\t''\t''\t''\t''\t<integer>3</integer>
+      ''\t''\t''\t''\t''\t''\t</array>
+      ''\t''\t''\t''\t''\t''\t<string>test</string>
+      ''\t''\t''\t''\t''\t</array>
+      ''\t''\t''\t''\t</dict>
+      ''\t''\t''\t</dict>
+      ''\t''\t</dict>
+      ''\t</array>
+      ''\t<key>str</key>
+      ''\t<string>foo</string>
+      ''\t<key>true</key>
+      ''\t<true/>
+      </dict>
+      </plist>'';
+  };
 }
diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 024646625193..fdda9d510d90 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -22,9 +22,9 @@ let
       nixosTest = nixosTests.kafka.base.kafka_4_1;
     };
     "4_0" = {
-      kafkaVersion = "4.0.0";
+      kafkaVersion = "4.0.1";
       scalaVersion = "2.13";
-      sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo=";
+      sha256 = "sha256-M8xc04WE6w9yYWxMLwX7SINKVvoKnNn+AKxzIMNM9SQ=";
       jre = jdk17_headless;
       nixosTest = nixosTests.kafka.base.kafka_4_0;
     };
diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index bf048d5f4bda..9187ddc4a6b4 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -209,20 +209,20 @@ let
 
 in
 {
-  # Supported releases (as of 2023-04-19).
-  # v16 and v19 have been dropped because they go EOL before the NixOS 23.11 release.
+  # Supported releases (as of 2025-10-19).
   # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
   # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
   #
   # Series  Type       Rel. Date   Sec. Fixes  EOL
-  # 16.x    LTS        2018-10-09  2022-10-09  2023-10-09 (dropped)
-  # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20
+  # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20 (dropped)
   # 19.x    Standard   2021-11-02  2022-11-02  2023-11-02 (dropped)
   # 20.x    LTS        2022-11-02  2026-10-19  2027-10-19
-  # 21.x    Standard   2023-10-18  2025-10-18  2026-10-18 (unreleased)
-  asterisk-lts = versions.asterisk_18;
+  # 21.x    Standard   2023-10-18  2025-10-18  2026-10-18
+  # 22.x    LTS        2024-10-16  2028-10-16  2029-10-16
+  # 23.x    Standard   2025-10-15  2026-10-15  2027-10-15
+  asterisk-lts = versions.asterisk_22;
   asterisk-stable = versions.asterisk_20;
-  asterisk = versions.asterisk_20.overrideAttrs (o: {
+  asterisk = versions.asterisk_22.overrideAttrs (o: {
     passthru = (o.passthru or { }) // {
       inherit updateScript;
     };
diff --git a/pkgs/servers/asterisk/versions.json b/pkgs/servers/asterisk/versions.json
index 853dfcb4dec4..7dbf80c20b12 100644
--- a/pkgs/servers/asterisk/versions.json
+++ b/pkgs/servers/asterisk/versions.json
@@ -4,15 +4,19 @@
     "version": "18.26.4"
   },
   "asterisk_20": {
-    "sha256": "4bbe0aaecc0e7294780269a5dc7ff78a85c58cf26ffc63dd63be5406eef0b687",
-    "version": "20.15.2"
+    "sha256": "30945737855f47200b6986d917377989fd284fab50bf4d7646c63bda50bbf7b7",
+    "version": "20.16.0"
   },
   "asterisk_21": {
-    "sha256": "9624e807a1138cabed14431a326c9870e53fc132738dbbd61314abc027785d94",
-    "version": "21.10.2"
+    "sha256": "9187aea454a54065cfa632023730737aa89ba7efe65e450ce2f6ce787238b48f",
+    "version": "21.11.0"
   },
   "asterisk_22": {
-    "sha256": "5061c852fd850b17e6be9d866c8e73298471883fc5e3ccd5a24b3e1364e24218",
-    "version": "22.5.2"
+    "sha256": "e5b33b9b6fd6fb2bbbe748bd34f517d9c634afbbd6c53bbbdd3214ec8a6a7749",
+    "version": "22.6.0"
+  },
+  "asterisk_23": {
+    "sha256": "30f012e5c7b4a20b149bf33c9150ae7a0f33b1a801655df65fc8a837138cac15",
+    "version": "23.0.0"
   }
 }
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index d3c74dfab9be..0deed5dcc609 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -8,6 +8,7 @@
   libmaa,
   zlib,
   libtool,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
@@ -47,6 +48,8 @@ stdenv.mkDerivation rec {
     install -Dm444 -t $out/share/doc/${pname} NEWS README
   '';
 
+  passthru.tests.nixos = nixosTests.dictd;
+
   meta = {
     description = "Dict protocol server and client";
     homepage = "http://www.dict.org";
diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix
index 58d1cc369bc2..9a49355b2320 100644
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@@ -22,10 +22,6 @@ home-assistant.python.pkgs.buildPythonPackage (
     pname = "${owner}/${domain}";
     inherit version format;
 
-    buildPhase = ''
-      true
-    '';
-
     installPhase = ''
       runHook preInstall
 
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index aa0f36aeb8c9..17bbdd7bf250 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.10.2";
+  version = "2025.11.0";
   components = {
     "3_day_blinds" =
       ps: with ps; [
@@ -56,6 +56,10 @@
     "actiontec" =
       ps: with ps; [
       ];
+    "actron_air" =
+      ps: with ps; [
+        actron-neo-api
+      ];
     "adax" =
       ps: with ps; [
         adax
@@ -907,6 +911,7 @@
       ];
     "citybikes" =
       ps: with ps; [
+        python-citybikes
       ];
     "clementine" =
       ps: with ps; [
@@ -986,7 +991,8 @@
       ];
     "compit" =
       ps: with ps; [
-      ]; # missing inputs: compit-inext-api
+        compit-inext-api
+      ];
     "concord232" =
       ps: with ps; [
         concord232
@@ -1057,7 +1063,8 @@
       ];
     "cync" =
       ps: with ps; [
-      ]; # missing inputs: pycync
+        pycync
+      ];
     "dacia" =
       ps: with ps; [
       ];
@@ -1329,7 +1336,8 @@
       ];
     "droplet" =
       ps: with ps; [
-      ]; # missing inputs: pydroplet
+        pydroplet
+      ];
     "dsmr" =
       ps: with ps; [
         dsmr-parser
@@ -1461,6 +1469,7 @@
     "elevenlabs" =
       ps: with ps; [
         elevenlabs
+        sentence-stream
       ];
     "elgato" =
       ps: with ps; [
@@ -1540,9 +1549,6 @@
       ps: with ps; [
         openwebifpy
       ];
-    "enmax" =
-      ps: with ps; [
-      ];
     "enocean" =
       ps: with ps; [
         enocean
@@ -1756,6 +1762,9 @@
         psutil-home-assistant
         sqlalchemy
       ];
+    "fing" =
+      ps: with ps; [
+      ]; # missing inputs: fing_agent_api
     "fints" =
       ps: with ps; [
         fints
@@ -1763,6 +1772,10 @@
     "fire_tv" =
       ps: with ps; [
       ];
+    "firefly_iii" =
+      ps: with ps; [
+        pyfirefly
+      ];
     "fireservicerota" =
       ps: with ps; [
         pyfireservicerota
@@ -2373,14 +2386,18 @@
     "homeassistant_green" =
       ps: with ps; [
         aiohasupervisor
+        aiousbwatcher
         ha-silabs-firmware-client
         psutil-home-assistant
+        pyserial
         universal-silabs-flasher
       ];
     "homeassistant_hardware" =
       ps: with ps; [
         aiohasupervisor
+        aiousbwatcher
         ha-silabs-firmware-client
+        pyserial
         universal-silabs-flasher
       ];
     "homeassistant_sky_connect" =
@@ -2395,8 +2412,10 @@
     "homeassistant_yellow" =
       ps: with ps; [
         aiohasupervisor
+        aiousbwatcher
         ha-silabs-firmware-client
         psutil-home-assistant
+        pyserial
         universal-silabs-flasher
       ];
     "homee" =
@@ -2707,6 +2726,11 @@
     "indianamichiganpower" =
       ps: with ps; [
       ];
+    "inels" =
+      ps: with ps; [
+        aiohasupervisor
+        paho-mqtt
+      ]; # missing inputs: elkoep-aio-mqtt
     "influxdb" =
       ps: with ps; [
         influxdb
@@ -3280,7 +3304,8 @@
       ];
     "libre_hardware_monitor" =
       ps: with ps; [
-      ]; # missing inputs: librehardwaremonitor-api
+        librehardwaremonitor-api
+      ];
     "lidarr" =
       ps: with ps; [
         aiopyarr
@@ -3423,6 +3448,10 @@
       ps: with ps; [
         luftdaten
       ];
+    "lunatone" =
+      ps: with ps; [
+        lunatone-rest-api-client
+      ];
     "lupusec" =
       ps: with ps; [
         lupupy
@@ -3617,6 +3646,10 @@
       ps: with ps; [
         meteofrance-api
       ];
+    "meteo_lt" =
+      ps: with ps; [
+        meteo-lt-pkg
+      ];
     "meteoalarm" =
       ps: with ps; [
         meteoalertapi
@@ -4049,6 +4082,10 @@
       ps: with ps; [
         pynina
       ];
+    "nintendo_parental_controls" =
+      ps: with ps; [
+        pynintendoparental
+      ];
     "nissan_leaf" =
       ps: with ps; [
         pycarwings2
@@ -4220,7 +4257,7 @@
       ];
     "onewire" =
       ps: with ps; [
-        pyownet
+        aio-ownet
       ];
     "onkyo" =
       ps: with ps; [
@@ -4284,6 +4321,10 @@
       ps: with ps; [
         openhomedevice
       ];
+    "openrgb" =
+      ps: with ps; [
+        openrgb-python
+      ];
     "opensensemap" =
       ps: with ps; [
         opensensemap-api
@@ -4579,7 +4620,6 @@
       ];
     "plum_lightpad" =
       ps: with ps; [
-        plumlightpad
       ];
     "pocketcasts" =
       ps: with ps; [
@@ -5629,6 +5669,10 @@
     "solaredge" =
       ps: with ps; [
         aiosolaredge
+        fnv-hash-fast
+        psutil-home-assistant
+        solaredge-web
+        sqlalchemy
         stringcase
       ];
     "solaredge_local" =
@@ -5795,6 +5839,10 @@
     "sun" =
       ps: with ps; [
       ];
+    "sunricher_dali" =
+      ps: with ps; [
+        pysrdaligateway
+      ];
     "sunweg" =
       ps: with ps; [
       ];
@@ -6525,7 +6573,8 @@
       ];
     "victron_remote_monitoring" =
       ps: with ps; [
-      ]; # missing inputs: victron-vrm
+        victron-vrm
+      ];
     "vilfo" =
       ps: with ps; [
         vilfo-api-client
@@ -6579,10 +6628,6 @@
     "volvooncall" =
       ps: with ps; [
       ];
-    "vultr" =
-      ps: with ps; [
-        vultr
-      ];
     "w800rf32" =
       ps: with ps; [
         pyw800rf32
@@ -6613,10 +6658,6 @@
       ps: with ps; [
         watergate-local-api
       ];
-    "watson_iot" =
-      ps: with ps; [
-        ibmiotf
-      ];
     "watttime" =
       ps: with ps; [
         aiowatttime
@@ -7003,6 +7044,7 @@
     "acaia"
     "accuweather"
     "acmeda"
+    "actron_air"
     "adax"
     "adguard"
     "advantage_air"
@@ -7127,6 +7169,7 @@
     "comfoconnect"
     "command_line"
     "compensation"
+    "compit"
     "config"
     "configurator"
     "control4"
@@ -7138,6 +7181,7 @@
     "cpuspeed"
     "crownstone"
     "cups"
+    "cync"
     "daikin"
     "datadog"
     "date"
@@ -7174,6 +7218,7 @@
     "downloader"
     "dremel_3d_printer"
     "drop_connect"
+    "droplet"
     "dsmr"
     "dsmr_reader"
     "duckdns"
@@ -7240,6 +7285,7 @@
     "filesize"
     "filter"
     "fints"
+    "firefly_iii"
     "fireservicerota"
     "firmata"
     "fitbit"
@@ -7445,6 +7491,7 @@
     "lg_netcast"
     "lg_soundbar"
     "lg_thinq"
+    "libre_hardware_monitor"
     "lidarr"
     "life360"
     "lifx"
@@ -7468,6 +7515,7 @@
     "loqed"
     "lovelace"
     "luftdaten"
+    "lunatone"
     "lupusec"
     "lutron"
     "lutron_caseta"
@@ -7497,6 +7545,7 @@
     "met"
     "met_eireann"
     "meteo_france"
+    "meteo_lt"
     "meteoclimatic"
     "metoffice"
     "mfi"
@@ -7566,6 +7615,7 @@
     "nightscout"
     "niko_home_control"
     "nina"
+    "nintendo_parental_controls"
     "nmap_tracker"
     "nmbs"
     "no_ip"
@@ -7607,6 +7657,7 @@
     "opengarage"
     "openhardwaremonitor"
     "openhome"
+    "openrgb"
     "opensky"
     "opentherm_gw"
     "openuv"
@@ -7824,6 +7875,7 @@
     "subaru"
     "suez_water"
     "sun"
+    "sunricher_dali"
     "sunweg"
     "surepetcare"
     "swiss_public_transport"
@@ -7933,6 +7985,7 @@
     "version"
     "vesync"
     "vicare"
+    "victron_remote_monitoring"
     "vilfo"
     "vizio"
     "vlc_telnet"
@@ -7942,7 +7995,6 @@
     "volumio"
     "volvo"
     "volvooncall"
-    "vultr"
     "wake_on_lan"
     "wake_word"
     "wallbox"
diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/package.nix b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix
deleted file mode 100644
index cf158a2231a5..000000000000
--- a/pkgs/servers/home-assistant/custom-components/auth-header/package.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  buildHomeAssistantComponent,
-  fetchFromGitHub,
-}:
-
-buildHomeAssistantComponent rec {
-  owner = "BeryJu";
-  domain = "auth_header";
-  version = "1.12";
-
-  src = fetchFromGitHub {
-    inherit owner;
-    repo = "hass-auth-header";
-    tag = "v${version}";
-    hash = "sha256-BPG/G6IM95g9ip2OsPmcAebi2ZvKHUpFzV4oquOFLPM=";
-  };
-
-  meta = with lib; {
-    changelog = "https://github.com/BeryJu/hass-auth-header/releases/tag/v${version}";
-    description = "Home Assistant custom component which allows you to delegate authentication to a reverse proxy";
-    homepage = "https://github.com/BeryJu/hass-auth-header";
-    maintainers = with maintainers; [ mjm ];
-    license = licenses.gpl3;
-  };
-}
diff --git a/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix
index 2ae968131d14..380d18832233 100644
--- a/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "rrooggiieerr";
   domain = "benqprojector";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-benqprojector";
     tag = version;
-    hash = "sha256-iAFmXL10QqudECsS9u9w7KBETzu9aWCg1EBbFR1ff+o=";
+    hash = "sha256-BiAqEVZSbroxw46thsU1psjP9JEEZaGRLWgpT/lQTHI=";
   };
 
   dependencies = [ benqprojector ];
diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
index 6f0f97508687..7698754f5ac2 100644
--- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "jwillemsen";
   domain = "daikin_onecta";
-  version = "4.2.8";
+  version = "4.2.9";
 
   src = fetchFromGitHub {
     owner = "jwillemsen";
     repo = "daikin_onecta";
     tag = "v${version}";
-    hash = "sha256-ozOJQDoE/t2FhnsVCnP+WCrFr/l19+onr488JN2fSE0=";
+    hash = "sha256-bV+4nTRhtqSVBdaG3rCtIdTYhM4pqcQCtUQwsUhgcq0=";
   };
 
   meta = {
diff --git a/pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix b/pkgs/servers/home-assistant/custom-components/ecoflow_cloud/package.nix
similarity index 100%
rename from pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix
rename to pkgs/servers/home-assistant/custom-components/ecoflow_cloud/package.nix
diff --git a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
new file mode 100644
index 000000000000..cd074d391502
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+
+  # dependencies
+  aiomqtt,
+  colorlog,
+  loguru,
+  websocket-client,
+  websockets,
+
+  # tests
+  pytestCheckHook,
+  aiohttp,
+  home-assistant,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "danielcherubini";
+  domain = "elegoo_printer";
+  version = "2.4.2";
+
+  src = fetchFromGitHub {
+    owner = "danielcherubini";
+    repo = "elegoo-homeassistant";
+    tag = "v${version}";
+    hash = "sha256-z55599eTJy5oQeE+BD0AYXtLTKoeKZzvNDurE0/oPYQ=";
+  };
+
+  dependencies = [
+    aiomqtt
+    colorlog
+    loguru
+    websocket-client
+    websockets
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    aiohttp
+    home-assistant
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/danielcherubini/elegoo-homeassistant/releases/tag/v${version}";
+    description = "Home Assistant integration for Elegoo 3D printers using the SDCP protocol";
+    homepage = "https://github.com/danielcherubini/elegoo-homeassistant";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      typedrat
+    ];
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
index ba184bd05e9c..a4ec793a3f31 100644
--- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent {
   owner = "NewsGuyTor";
   domain = "fellow";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "NewsGuyTor";
     repo = "FellowAiden-HomeAssistant";
-    rev = "c0b724e2ac3174b99fcb7d05a9c63a3ac6ce03b4";
-    hash = "sha256-gK9lVFehqRWq7HQd+VPJB/iaIvLdHu51XxyfM14aY0s=";
+    rev = "c801347b9654dc469fa6b446a4e7fd88071d318e";
+    hash = "sha256-UZgNJGI3em5PluL5u7k0pEH8fGUYinoWSJjVAhuulSo=";
   };
 
   passthru.updateScript = unstableGitUpdater { };
diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix
index 4dba06a69378..9025606067e0 100644
--- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix
@@ -18,13 +18,13 @@
 buildHomeAssistantComponent rec {
   owner = "blakeblackshear";
   domain = "frigate";
-  version = "5.10.0";
+  version = "5.11.0";
 
   src = fetchFromGitHub {
     owner = "blakeblackshear";
     repo = "frigate-hass-integration";
     tag = "v${version}";
-    hash = "sha256-rhYShAb251LfcrBjarcle041AWVSEi0wqc9/W1SlgUo=";
+    hash = "sha256-cXjf5e4gbkvRS43xnpmL1lSaSvhts4eMetEqTP/RCOo=";
   };
 
   dependencies = [ hass-web-proxy-lib ];
diff --git a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
index aa1d8c201d45..36639b8bdd23 100644
--- a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "bm1549";
   domain = "frigidaire";
-  version = "0.1.2";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "home-assistant-frigidaire";
     tag = version;
-    hash = "sha256-7SyOsB16P0O0RHEUXy79cqil+QFO2PilyWWlpv428g0=";
+    hash = "sha256-b8/szaZGiM1/LZFJK0gi6oStCzXcH1BN5FqjRJBY7cA=";
   };
 
   dependencies = [ frigidaire ];
diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
index 6bcc8c0e76f1..df8f306173e5 100644
--- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "cyberjunky";
   domain = "garmin_connect";
-  version = "0.2.30";
+  version = "0.2.37";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "home-assistant-garmin_connect";
     tag = version;
-    hash = "sha256-Gxz0mKVgs2o7IlhGJkz4JlKRb448IRFqK87Kn+Gebkk=";
+    hash = "sha256-d6RbDplrdqvFGSDcTgoYzYLSHDYdXG3/XvFxj8IfSbY=";
   };
 
   dependencies = [
@@ -24,6 +24,7 @@ buildHomeAssistantComponent rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/cyberjunky/home-assistant-garmin_connect/releases/tag/${src.tag}";
     description = "Garmin Connect integration allows you to expose data from Garmin Connect to Home Assistant";
     homepage = "https://github.com/cyberjunky/home-assistant-garmin_connect";
     maintainers = with maintainers; [
diff --git a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
index 437966685e95..ad47b44e5655 100644
--- a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
@@ -8,18 +8,19 @@
 buildHomeAssistantComponent rec {
   owner = "ekutner";
   domain = "home_connect_alt";
-  version = "1.3.0-b1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "ekutner";
     repo = "home-connect-hass";
     tag = version;
-    hash = "sha256-jWrVHwMdzjG0gHWl1NS6WAzdmlmS20BUmh6HzplsGgw=";
+    hash = "sha256-t5Af58HgYVMZki/93t63X2JPXDJm7PPt84yGj7MJKkE=";
   };
 
   dependencies = [ home-connect-async ];
 
   meta = with lib; {
+    changelog = "https://github.com/ekutner/home-connect-hass/releases/tag/${src.tag}";
     description = "Alternative (and improved) Home Connect integration for Home Assistant";
     homepage = "https://github.com/ekutner/home-connect-hass";
     maintainers = with maintainers; [ kranzes ];
diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 27863dcaf353..76568f9a7d73 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -1,21 +1,25 @@
 {
   lib,
+  async-upnp-client,
   buildHomeAssistantComponent,
   fetchFromGitHub,
   aiohomematic,
+  aiohomematic-test-support,
   home-assistant,
+  pytest-homeassistant-custom-component,
+  pytestCheckHook,
 }:
 
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.89.1";
+  version = "1.90.2";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-40t64RAJy/isLfcP71pKiqh3cFXy/s1Mv35NosPnh48=";
+    hash = "sha256-ARBCwwvGFODMBNf0Ds4DL65V8LKm9nfiKaPUn0c6kYE=";
   };
 
   postPatch = ''
@@ -29,6 +33,18 @@ buildHomeAssistantComponent rec {
     aiohomematic
   ];
 
+  nativeCheckInputs = [
+    aiohomematic-test-support
+    async-upnp-client
+    pytest-homeassistant-custom-component
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # custom_components.homematicip_local.support.InvalidConfig: C
+    "test_async_validate_config_and_get_system_information"
+  ];
+
   meta = {
     changelog = "https://github.com/SukramJ/custom_homematic/blob/${src.tag}/changelog.md";
     description = "Custom Home Assistant Component for HomeMatic";
diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch b/pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch
new file mode 100644
index 000000000000..7872436b96dc
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch
@@ -0,0 +1,31 @@
+From 06a6b3ff1ae181f9972b47838569d658ba4b3d9c Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Sat, 4 Oct 2025 14:45:02 +0200
+Subject: [PATCH] Use the python native asyncio timeout function
+
+instead of depending on the undeclared async-timeout package.
+---
+ custom_components/local_luftdaten/sensor.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/custom_components/local_luftdaten/sensor.py b/custom_components/local_luftdaten/sensor.py
+index 4f4f5b4..82ea041 100644
+--- a/custom_components/local_luftdaten/sensor.py
++++ b/custom_components/local_luftdaten/sensor.py
+@@ -12,7 +12,6 @@
+ import asyncio
+ from typing import Optional
+ import aiohttp
+-import async_timeout
+ import datetime
+ 
+ import json
+@@ -170,7 +169,7 @@ async def async_update(self):
+             responseData = None
+             try:
+                 _LOGGER.debug("Get data from %s", str(self._resource))
+-                with async_timeout.timeout(30):
++                async with asyncio.timeout(30):
+                     response = await self._session.get(self._resource)
+                 responseData = await response.text()
+                 _LOGGER.debug("Received data: %s", str(self.data))
diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
index 19c5cc3d4d0e..34139c980a59 100644
--- a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
@@ -16,6 +16,10 @@ buildHomeAssistantComponent rec {
     hash = "sha256-68clZgS7Qo62srcZWD3Un9BnNSwQUBr4Z5oBMTC9m8o=";
   };
 
+  # https://github.com/lichtteil/local_luftdaten/pull/70
+  # Replace undeclared async-timeout dependency with native asyncio.timeout
+  patches = [ ./async-timeout.patch ];
+
   meta = with lib; {
     changelog = "https://github.com/lichtteil/local_luftdaten/releases/tag/${version}";
     description = "Custom component for Home Assistant that integrates your (own) local Luftdaten sensor (air quality/particle sensor) without using the cloud";
diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
index d2fa3dc53326..c8ba6fe59fef 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wuwentao";
   domain = "midea_ac_lan";
-  version = "0.6.9";
+  version = "0.6.10";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     tag = "v${version}";
-    hash = "sha256-pPPJFs4earRbh6ovR57k9xgZtrYN0L26eupOoFuBVz8=";
+    hash = "sha256-xpa5xxqVEWxO4xa7ppFig09nDGfOoXpS9DDmjGU/zbc=";
   };
 
   dependencies = [ midea-local ];
diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
index 67d80f81a247..8fd8dcde5d3c 100644
--- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
@@ -11,19 +11,21 @@
 buildHomeAssistantComponent rec {
   owner = "pymitsubishi";
   domain = "mitsubishi";
-  version = "0.2.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "homeassistant-mitsubishi";
     tag = "v${version}";
-    hash = "sha256-V8fT/w7a/uUN4yKJ+jB6UUQDP6dif80MvlqV9n4KENc=";
+    hash = "sha256-VEV+HOzXrxX2rsStjwXD4ZWclP2oF6zZHv0MuzL8DE4=";
   };
 
   dependencies = [
     pymitsubishi
   ];
 
+  doCheck = false; # TODO: remove in the next release after 0.4.0
+
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook
diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
index 1b4cba4f28bb..05cbc40897c3 100644
--- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "marcolivierarsenault";
   domain = "moonraker";
-  version = "1.10.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "marcolivierarsenault";
     repo = "moonraker-home-assistant";
     tag = version;
-    hash = "sha256-U4vjWFUZlxRPIrK9YXuYzPCMAjdQGoPXewmDessWh+c=";
+    hash = "sha256-3qxTigKBZ7maUylx0NCf70tURNUWFpo2TzgxnxqjUpA=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
index 4119266bff5b..83ac738cb0c4 100644
--- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "BottlecapDave";
   domain = "octopus_energy";
-  version = "17.0.0";
+  version = "17.1.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HomeAssistant-OctopusEnergy";
     tag = "v${version}";
-    hash = "sha256-6+uDv3tLm5Lcq0D2rYwEH9ggvAK6y0O+l5IRHafHsyQ=";
+    hash = "sha256-L1LqH9QMasVCZdsnHpKdxYGpsc/2vaIPAbiYc6vVshM=";
   };
 
   dependencies = [ pydantic ];
diff --git a/pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix b/pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix
similarity index 100%
rename from pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix
rename to pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix
diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
index 7bd737681d52..909e5c4e1129 100644
--- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "amitfin";
   domain = "oref_alert";
-  version = "4.0.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "amitfin";
     repo = "oref_alert";
     tag = "v${version}";
-    hash = "sha256-WMWt2QjwWDIfNbD6/YGc91GASmjNhzfLREMHvc2eOdE=";
+    hash = "sha256-nWp8cG0lFYUEO11lcZGkqx5QvOSfSVnqIqpHA8YAN30=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
index fcac276d5358..f2d15104a5b8 100644
--- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "samoswall";
   domain = "polaris";
-  version = "1.0.10";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "samoswall";
     repo = "polaris-mqtt";
     tag = "v${version}";
-    hash = "sha256-GxNGZISV/YjMLH2hpoyuyKGvRDiZ3ejI2eJ7o00dqK8=";
+    hash = "sha256-ei0O+PTi/nV8Jb3ul+52vsmQxC3irYu0YjBotqYoipc=";
   };
 
   meta = {
diff --git a/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
new file mode 100644
index 000000000000..96a63b8ddb50
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  fetchNpmDeps,
+  nix-update-script,
+  nodejs,
+  npmHooks,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "Hypfer";
+  domain = "scene_presets";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "Hypfer";
+    repo = "hass-scene_presets";
+    tag = version;
+    hash = "sha256-ESu7+65IeXYZLLqlkRlJA7+Ggo+X+YoWcpmMQiNzOTM=";
+  };
+
+  npmDeps = fetchNpmDeps {
+    inherit src;
+    hash = "sha256-whBM/Z6ib8YNP3BgpJgU2O9ruxovUI84E5/ZbpHK26Y=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+    npmHooks.npmBuildHook
+  ];
+
+  npmBuildScript = "build";
+
+  postInstall = ''
+    # Create custom presets directory to satisfy Python set-up code
+    mkdir -p "$out/custom_components/scene_presets/userdata/custom/assets"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/Hypfer/hass-scene_presets/releases/tag/${src.tag}";
+    description = "Hue-like scene presets for lights in Home Assistant";
+    homepage = "https://github.com/Hypfer/hass-scene_presets";
+    maintainers = with lib.maintainers; [ jpds ];
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix b/pkgs/servers/home-assistant/custom-components/sleep_as_android_mqtt/package.nix
similarity index 83%
rename from pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix
rename to pkgs/servers/home-assistant/custom-components/sleep_as_android_mqtt/package.nix
index 373923e17a3d..f461f86da1ee 100644
--- a/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sleep_as_android_mqtt/package.nix
@@ -11,20 +11,26 @@
   paho-mqtt,
 }:
 let
-  version = "2.3.2";
+  version = "3.0.2";
 in
 buildHomeAssistantComponent {
   owner = "IATkachenko";
-  domain = "sleep_as_android";
+  domain = "sleep_as_android_mqtt";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "IATkachenko";
     repo = "HA-SleepAsAndroid";
     tag = "v${version}";
-    hash = "sha256-aJKjHZcRdmiXJdtWRY4fv5oxCHTDIVpvZEwhIE9ISv8=";
+    hash = "sha256-vJAi63RMF7jdmLUZNmnSqNxbiJi52/PgmTQm0KB3ZP8=";
   };
 
+  postPatch = ''
+    # Fix incomplete rename of package name
+    substituteInPlace tests/unit/test_instance.py \
+      --replace-fail "sleep_as_android." "sleep_as_android_mqtt."
+  '';
+
   dependencies = [
     pyhaversion
   ];
diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 1cf93d2e3a0f..9fae6a33098b 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2025.10.2";
+  version = "2025.11.1";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-ZwhzvxjzFqB/ENamT2jBUsm/i6dfcKv2YTnuJMCaQNI=";
+    hash = "sha256-uzwXJ9GJuzp7IVpdM6r7+ZU2KF7jORpqIwqKTc8Iuok=";
   };
 
   dependencies = [ pymodbus ];
diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
index f5ed377c6951..a937e624407c 100644
--- a/pkgs/servers/home-assistant/custom-components/sun2/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "pnbruckner";
   domain = "sun2";
-  version = "3.4.1";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-sun2";
     tag = version;
-    hash = "sha256-VzlwmAzebxykE9rIhAiAFkEOvbh2UkgNMGQaysDA9D4=";
+    hash = "sha256-UATxuKTusDkKLWwJq2CupPcF/TIKAmE5VPo3054cwKc=";
   };
 
   meta = rec {
diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index e55bb645fa56..9fd91c02a641 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -1,25 +1,39 @@
 {
   lib,
+  pymodbus,
   buildHomeAssistantComponent,
   fetchFromGitHub,
+  async-timeout,
+  aiohttp,
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "tesharp";
+  owner = "AN3Orik";
   domain = "systemair";
-  version = "0.2.0";
+  version = "1.0.17";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-lzFnKPkBOt2fkVGWCj1M/skSr8V39GgDHS+0HD4ACAw=";
+    hash = "sha256-R5Q6BbvcAqFNldOqfG1TDoM1gbsYrS3OClHlAdfQG6o=";
   };
 
+  postPatch = ''
+    substituteInPlace custom_components/systemair/manifest.json \
+      --replace-fail "pymodbus==" "pymodbus>=" \
+  '';
+
+  dependencies = [
+    pymodbus
+    async-timeout
+    aiohttp
+  ];
+
   meta = with lib; {
-    changelog = "https://github.com/tesharp/systemair/releases/tag/v${version}";
-    description = "Home Assistant component for Systemair SAVE Connect 2";
-    homepage = "https://github.com/tesharp/systemair";
+    changelog = "https://github.com/AN3Orik/systemair/releases/tag/v${version}";
+    description = "Home Assistant component for Systemair SAVE ventilation units";
+    homepage = "https://github.com/AN3Orik/systemair";
     maintainers = with maintainers; [ uvnikita ];
     license = licenses.mit;
   };
diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
index bdc71a79fbbc..a06fb92710f8 100644
--- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "make-all";
   domain = "tuya_local";
-  version = "2025.7.1";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "tuya-local";
     tag = version;
-    hash = "sha256-RIvtz6f3Jj4INvL0JdL+EsFUoLoG9vQNn5iPq2nF26I=";
+    hash = "sha256-Sqk6FBaEDp9KdcpKzWMeF6baqk7atbCtSRKTsQogwfo=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
index 72989c472b1d..fda6c22cee4c 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "xiaomi_gateway3";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
     rev = "v${version}";
-    hash = "sha256-CcJoXD60z91Gahv5pVrWaIpUNhetW0BN1Nd4DAVRPJs=";
+    hash = "sha256-pa9B2c1QeQ3DR2qjttP0c/44pERGtune+4nlnzPBSYo=";
   };
 
   dependencies = [ zigpy ];
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix
index ab8f04fcf308..550928be1124 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_home/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "XiaoMi";
   domain = "xiaomi_home";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "XiaoMi";
     repo = "ha_xiaomi_home";
     rev = "v${version}";
-    hash = "sha256-X8AP2pFGhkh4f72+pORXBB8yOqgIqJ+SLrQx5gwKxEg=";
+    hash = "sha256-L5rFnbaggJbwLNo9a6ZpbPF58Ip8QSpHIiCGdjYxVqI=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 3752430c2334..1bf1381bc89e 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "al-one";
   domain = "xiaomi_miot";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "al-one";
     repo = "hass-xiaomi-miot";
     rev = "v${version}";
-    hash = "sha256-nTxi8bKelHbhs1ivmr+LGHLMrnlRUQYfy+ARHdeVM0Q=";
+    hash = "sha256-0B+rG2h2OMb363t0529/XjqZ9ORaT7XXk4qVyEAfNx8=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
index e920794c99e8..bff0bd6f61ff 100644
--- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "cdnninja";
   domain = "yoto";
-  version = "1.24.5";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "cdnninja";
     repo = "yoto_ha";
     tag = "v${version}";
-    hash = "sha256-z9BrZAjjtt9EC84CzDe3AzmJHQtCBLgEoWrCJpOPBK0=";
+    hash = "sha256-2h9lrs6vl4JVYbwaMkQKq2Sq/Iu1Sn1HmMJuso46SSE=";
   };
 
   dependencies = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
index 71ae421cb9cf..d1e1c6fb5641 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "advanced-camera-card";
-  version = "7.18.3";
+  version = "7.19.1";
 
   src = fetchzip {
     url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-eNyfXRSF2nSct4+iQoOCkbcN3vmzmIenlO/ng7ThPzM=";
+    hash = "sha256-NkVgzmWnh+rB5joBA4RcGnrdLCZJ0n5aeDwv0rDsfYI=";
   };
 
   # TODO: build from source once yarn berry support lands in nixpkgs
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
index 3b1780f31fcb..e2be1e62ee51 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "bubble-card";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "Clooos";
     repo = "Bubble-Card";
     rev = "v${version}";
-    hash = "sha256-soLeHWDp72C5KzjnkdPVneJrShFVcOHvvVyLPMVpJM0=";
+    hash = "sha256-444QWl3i1kYkdkUrhDi+BxN9IB6JttHtX8fn23uPcBE=";
   };
 
   npmDepsHash = "sha256-NSHsw/+dmdc2+yo4/NgT0YMMrCuL8JjRR6MSJ5xQTiE=";
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
index 2aa1a3ab3ab7..d11aa9a3adf9 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "lovelace-card-mod";
-  version = "3.4.5";
+  version = "3.4.6";
 
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-card-mod";
     rev = "v${version}";
-    hash = "sha256-yd07C3/tpnoclrztWBAVwU6Ic2a4hY45xcjmgSp/uZA=";
+    hash = "sha256-eQwJOVpRy9MTILWrKSru90p+kKgRlIUBFhpeHrYX3X0=";
   };
 
-  npmDepsHash = "sha256-IjN0sBWa6y/j0x5XRvDU0F6kA9RTfKFlVsnqwBkgx2Q=";
+  npmDepsHash = "sha256-3KXu/RhDt0jzO9UJKRN3nOc/mm9tCOeQYGRGaCUv2wM=";
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
index 226a91bcf4bc..fd34753ff48f 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
@@ -9,18 +9,18 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "clock-weather-card";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "pkissling";
     repo = "clock-weather-card";
     tag = "v${version}";
-    hash = "sha256-cLqHVBjsSq3t7ft9Ap6kjNSgM87+ftqlF5ZfcJKAAzQ=";
+    hash = "sha256-5FHGFuvMYi40+6C9NDzrOsp2gIrIgtaA8qHM+oNIilg=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
-    hash = "sha256-zaKrvsT1Lgcyk4a9vO97j9yHkaD+5zbnsM5+GHxb4uk=";
+    hash = "sha256-DhOQG9+0YOOVv3Y1qnZPuR4ZQEdT9NLIcdiBnplSBvg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
index e4c888ab6c60..91d365b514d5 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -8,19 +8,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "custom-sidebar";
-  version = "10.5.2";
+  version = "10.7.0";
 
   src = fetchFromGitHub {
     owner = "elchininet";
     repo = "custom-sidebar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C3zjl4KP2l56Hn7MJjoB8D6KkJ3Ef6KpVZWWdDS5Hds=";
+    hash = "sha256-aV4dMt79t9ZZm+Z08odSONf/ghow4U+/aryk2+GJZvw=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-FOaR+B8UammcStvNFo7PR++VCPzY+aXvWeSRXnoPkWM=";
+    hash = "sha256-gfjRgq75hKxgfOn0wnWIzcFcdWVe7PZ4z8YHxLTCsjo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
index 21ce5b746df2..f1ce637f5048 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "hourly-weather";
-  version = "6.7.1";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
     rev = version;
-    hash = "sha256-o2whcxLcPQcSvv9aMpZxAk7iqGez2yqhwdB+zU7OwMY=";
+    hash = "sha256-vpV4BQVSaHm06fjSMzsN2IGeaK9ygV3/E0QvCko0Drc=";
   };
 
-  npmDepsHash = "sha256-C4ca6bTXzNmmzA5yK825JwdOYa3KKtGK+eYuKxgspUY=";
+  npmDepsHash = "sha256-J089Schvtdv1xJTY0XAwe2QU/SeM/yoWplKq799xFMg=";
 
   env.CYPRESS_INSTALL_BINARY = "0";
 
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
index b6a42f8e0b7e..bcd442717ed1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "material-you-utilities";
-  version = "2.0.16";
+  version = "2.0.22";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "material-you-utilities";
     tag = version;
-    hash = "sha256-VHOH1DHVTksMJCBb/8wiFXm+7zXZaxrCl3CylqA8K5M=";
+    hash = "sha256-wsNAW+0px4WhaMGSE4T0k5R4E+7c594AiwKYU+5V7rw=";
   };
 
-  npmDepsHash = "sha256-5aYD8r6KjgDtxnjDbEwXH5Mlp2kaeCYtXYZ7oY9n6J0=";
+  npmDepsHash = "sha256-Gnr5C2VsGUtcfsRo0w8TB/NUxCK5Y20qfvYSBzL4UQ8=";
 
   postPatch = ''
     # Remove git dependency from rspack config
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
index 0dd65f13f9e4..a9b289c51094 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "swipe-navigation";
-  version = "1.15.6";
+  version = "1.15.7";
 
   src = fetchFromGitHub {
     owner = "zanna-37";
     repo = "hass-swipe-navigation";
     tag = "v${version}";
-    hash = "sha256-4DiZ52YFgyddD299rAMzBbmFNyv0SHEFK5H7kWRdWlw=";
+    hash = "sha256-43Vns6RcN+QhJn5vFXtmtl0jkKqyFb0wuAZJbdg3VEo=";
   };
 
   npmDepsHash = "sha256-uRH3OcPK0iWru4ULZq2NwzbWNsGl8+wFP3ZxeFzr2BM=";
diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
index 9c8aae3b318a..36a77659ef08 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "versatile-thermostat-ui-card";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "jmcollin78";
     repo = "versatile-thermostat-ui-card";
     rev = "${version}";
-    hash = "sha256-yPp478uXiRWDH4DP/d0Mloie7nPY1hWLt8X1vLhysvA=";
+    hash = "sha256-4v1Tl3GQagQd1H+CFBG+OuRl2zfz5vvyWRy7oBSpxfM=";
   };
 
   npmFlags = [ "--legacy-peer-deps" ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 876bd80e051a..d04c43fcb734 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -7,6 +7,7 @@
   python313,
   replaceVars,
   ffmpeg-headless,
+  ffmpeg_7-headless,
   inetutils,
   nixosTests,
   home-assistant,
@@ -85,7 +86,7 @@ let
         ];
       });
 
-      av = super.av.overridePythonAttrs rec {
+      av = (super.av.override { ffmpeg-headless = ffmpeg_7-headless; }).overridePythonAttrs rec {
         version = "13.1.0";
         src = fetchFromGitHub {
           owner = "PyAV-Org";
@@ -259,37 +260,6 @@ let
         doCheck = false;
       });
 
-      python-telegram-bot = super.python-telegram-bot.overridePythonAttrs (oldAttrs: rec {
-        version = "21.5";
-
-        src = fetchFromGitHub {
-          inherit (oldAttrs.src) owner repo;
-          tag = version;
-          hash = "sha256-i1YEcN615xeI4HcygXV9kzuXpT2yDSnlNU6bZqu1dPM=";
-        };
-      });
-
-      pytraccar = super.pytraccar.overridePythonAttrs (oldAttrs: rec {
-        version = "2.1.1";
-
-        src = fetchFromGitHub {
-          inherit (oldAttrs.src) owner repo;
-          tag = version;
-          hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE=";
-        };
-      });
-
-      # Pinned due to API changes ~1.0
-      vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
-        version = "0.1.2";
-        src = fetchFromGitHub {
-          owner = "spry-group";
-          repo = "python-vultr";
-          rev = version;
-          hash = "sha256-sHCZ8Csxs5rwg1ZG++hP3MfK7ldeAdqm5ta9tEXeW+I=";
-        };
-      });
-
       wolf-comm = super.wolf-comm.overridePythonAttrs rec {
         version = "0.0.23";
         src = fetchFromGitHub {
@@ -330,7 +300,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.10.2";
+  hassVersion = "2025.11.0";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -351,13 +321,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-Y9StuiDaICKgqRrYc8d0i/Ey6R78J/5tvk/0qGVeZPQ=";
+    hash = "sha256-+syn/y2ukZKsnCniZxodRWVcCE3AcvUKt80L2XslKKI=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-tIUImUHGh8nrf0IuSOjSuV718B0SIS/oL6yLnyu8gOE=";
+    hash = "sha256-JSWr+yGvpXYc6Bw3B+xVLpYokVM11dsJZBWYy+W4bH4=";
   };
 
   build-system = with python.pkgs; [
@@ -471,7 +441,6 @@ python.pkgs.buildPythonApplication rec {
       pytest-asyncio
       pytest-aiohttp
       pytest-freezer
-      pytest-mock
       pytest-socket
       pytest-timeout
       pytest-unordered
@@ -480,11 +449,10 @@ python.pkgs.buildPythonApplication rec {
       requests-mock
       respx
       syrupy
-      tomli
-      # Sneakily imported in tests/conftest.py
-      paho-mqtt
       # Used in tests/non_packaged_scripts/test_alexa_locales.py
       beautifulsoup4
+      # Used in tests/scripts/test_check_config.py
+      colorlog
     ]
     ++ lib.concatMap (component: getPackages component python.pkgs) [
       # some components are needed even if tests in tests/components are disabled
@@ -521,12 +489,6 @@ python.pkgs.buildPythonApplication rec {
     "tests/test_bootstrap.py::test_setup_hass_takes_longer_than_log_slow_startup"
     "tests/test_test_fixtures.py::test_evict_faked_translations"
     "tests/helpers/test_backup.py::test_async_get_manager"
-    # (2025.9.0) Extra argument (demo platform) in list that is expected to be empty
-    "tests/scripts/test_check_config.py::test_config_platform_valid"
-    # (2025.9.0) Schema mismatch, diff shows a required field that needs to be removed
-    "tests/test_data_entry_flow.py::test_section_in_serializer"
-    # (2025.9.0) unique id collision in async_update_entry
-    "tests/test_config_entries.py::test_async_update_entry_unique_id_collision"
   ];
 
   preCheck = ''
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index e7e6ff98d0d3..b5b26971c652 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20251001.2";
+  version = "20251105.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-VDfj1dshILdTD/r6tuiImzYFMO3suytMQoFQzJfIeBQ=";
+    hash = "sha256-sQp23ibdVQHEuP016pA1E1xxXB275YNPvDqEFfI15nk=";
   };
 
   # there is nothing to strip in this package
diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index 12be866ba2e5..9c13d0fa3359 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2025.10.1";
+  version = "2025.10.28";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     repo = "intents-package";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-xYmPbiDDnznm9fl8rtnkMAswGAX+3iWwticqaOzF9Jk=";
+    hash = "sha256-Svnw9Jd0E4pMFfa/Do7YsFzdXLzsGmhu8amo+zYDvus=";
   };
 
   build-system = [
diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 771bd9b3981e..ebeca4ab7b43 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.10.2";
+  version = "2025.11.0";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-iLQm7ERY5S9rMuk0RCLmGNxHiwIAAckuUvAjeKPvu1Q=";
+    hash = "sha256-/A/25x0FMu4MXMHhOZ1MF9Qpw+UgA2OUc/HZaJm9bsQ=";
   };
 
   build-system = [
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 9dcbdb0cfe95..19d31b0c774a 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -18,14 +18,9 @@ let
     homeassistant_hardware = getComponentDeps "otbr" ++ getComponentDeps "zha";
     homeassistant_sky_connect = getComponentDeps "zha";
     homeassistant_yellow = getComponentDeps "zha";
-    husqvarna_automower_ble = getComponentDeps "gardena_bluetooth";
     lovelace = [
       pychromecast
     ];
-    matrix = [
-      pydantic
-    ];
-    mopeka = getComponentDeps "switchbot";
     onboarding = [
       pymetno
       radios
@@ -44,7 +39,6 @@ let
     system_log = [
       isal
     ];
-    tesla_fleet = getComponentDeps "teslemetry";
     xiaomi_miio = [
       arrow
     ];
@@ -57,34 +51,12 @@ let
   };
 
   extraDisabledTestPaths = {
-    backup = [
-      # outdated snapshot
-      "tests/components/backup/test_sensors.py::test_sensors"
-    ];
-    bosch_alarm = [
-      # outdated snapshots
-      "tests/components/bosch_alarm/test_binary_sensor.py::test_binary_sensor[None-solution_3000]"
-      "tests/components/bosch_alarm/test_binary_sensor.py::test_binary_sensor[None-amax_3000]"
-      "tests/components/bosch_alarm/test_binary_sensor.py::test_binary_sensor[None-b5512]"
-    ];
-    bmw_connected_drive = [
-      # outdated snapshot
-      "tests/components/bmw_connected_drive/test_binary_sensor.py::test_entity_state_attrs"
-    ];
-    dnsip = [
-      # Tries to resolve DNS entries
-      "tests/components/dnsip/test_config_flow.py::test_options_flow"
-    ];
     jellyfin = [
       # AssertionError: assert 'audio/x-flac' == 'audio/flac'
       "tests/components/jellyfin/test_media_source.py::test_resolve"
       "tests/components/jellyfin/test_media_source.py::test_audio_codec_resolve"
       "tests/components/jellyfin/test_media_source.py::test_music_library"
     ];
-    matter = [
-      # outdated snapshot in eve_weather_sensor variant
-      "tests/components/matter/test_number.py::test_numbers"
-    ];
     minecraft_server = [
       # FileNotFoundError: [Errno 2] No such file or directory: '/etc/resolv.conf'
       "tests/components/minecraft_server/test_binary_sensor.py"
@@ -104,22 +76,17 @@ let
       "tests/components/nzbget/test_init.py::test_async_setup_raises_entry_not_ready"
     ];
     openai_conversation = [
-      # outdated snapshot
-      "tests/components/openai_conversation/test_conversation.py::test_function_call"
       # Pydantic validation error
       "tests/components/openai_conversation/test_conversation.py"
       "tests/components/openai_conversation/test_ai_task.py"
-      # TypeError: object ImagesResponse can't be used in 'await' expression
-      "tests/components/openai_conversation/test_init.py::test_generate_image_service"
-      "tests/components/openai_conversation/test_init.py::test_generate_image_service_error"
     ];
     overseerr = [
       # imports broken future module
       "tests/components/overseerr/test_event.py"
     ];
-    technove = [
+    youtube = [
       # outdated snapshot
-      "tests/components/technove/test_switch.py::test_switches"
+      "tests/components/youtube/test_sensor.py::test_sensor"
     ];
   };
 
@@ -128,10 +95,6 @@ let
       # intent fixture mismatch
       "test_error_no_device_on_floor"
     ];
-    forecast_solar = [
-      # language fixture mismatch
-      "test_enabling_disable_by_default"
-    ];
     sensor = [
       # Failed: Translation not found for sensor
       "test_validate_unit_change_convertible"
@@ -147,14 +110,6 @@ let
       # tries to retrieve file from github
       "test_non_text_stdout_capture"
     ];
-    smartthings = [
-      # outdated snapshots
-      "test_all_entities"
-    ];
-    websocket_api = [
-      # AssertionError: assert 'unknown_error' == 'template_error'
-      "test_render_template_with_timeout"
-    ];
     zeroconf = [
       # multicast socket bind, not possible in the sandbox
       "test_subscribe_discovery"
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 69b76f17421b..a4f12d7b676b 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -57,7 +57,7 @@ in
   };
 
   jetty_12 = common {
-    version = "12.1.2";
-    hash = "sha256-GtaEIXqOSutgrSJJ/+oFuGSe7y8omVX7sBgcG3GJzvs=";
+    version = "12.1.3";
+    hash = "sha256-+DCfP0tFBouTZqOEzCFaQ4dl78xPFudUzS9hAzUkc7Y=";
   };
 }
diff --git a/pkgs/servers/http/nginx/generic.nix b/pkgs/servers/http/nginx/generic.nix
index 9e3eaa8548cd..e3964c40f03d 100644
--- a/pkgs/servers/http/nginx/generic.nix
+++ b/pkgs/servers/http/nginx/generic.nix
@@ -254,8 +254,6 @@ stdenv.mkDerivation {
       --replace-fail '@nixStoreDirLen@' "''${#NIX_STORE}"
   '' postPatch;
 
-  hardeningEnable = lib.optional (!stdenv.hostPlatform.isDarwin) "pie";
-
   enableParallelBuilding = true;
 
   preInstall = ''
diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 45e7740ad8de..b7b8c50e7a21 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -28,7 +28,6 @@
   luajit_openresty,
   msgpuck,
   openssl,
-  opentracing-cpp,
   pam,
   psol,
   which,
@@ -385,14 +384,14 @@ let
 
     lua = rec {
       name = "lua";
-      version = "0.10.26";
+      version = "0.10.28";
 
       src = fetchFromGitHub {
         name = "lua";
         owner = "openresty";
         repo = "lua-nginx-module";
         rev = "v${version}";
-        hash = "sha256-007up/XncaSBimBumHpbwgB1WnkXgBe8e/q/yT6vthI=";
+        hash = "sha256-GT1PpJWpEu5EciK4n9ZDz1gIU/ZdC/SAsIdu0niQy8o=";
       };
 
       inputs = [ luajit_openresty ];
@@ -559,30 +558,6 @@ let
       };
     };
 
-    opentracing = {
-      name = "opentracing";
-      src =
-        let
-          src' = fetchFromGitHub {
-            name = "opentracing";
-            owner = "opentracing-contrib";
-            repo = "nginx-opentracing";
-            rev = "v0.10.0";
-            sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb";
-          };
-        in
-        "${src'}/opentracing";
-
-      inputs = [ opentracing-cpp ];
-
-      meta = with lib; {
-        description = "Enable requests served by nginx for distributed tracing via The OpenTracing Project";
-        homepage = "https://github.com/opentracing-contrib/nginx-opentracing";
-        license = with licenses; [ asl20 ];
-        maintainers = [ ];
-      };
-    };
-
     pagespeed = {
       name = "pagespeed";
       src =
@@ -1115,4 +1090,5 @@ self
   modsecurity-nginx = self.modsecurity;
   fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge";
   ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth";
+  opentracing = throw "opentracing-cpp was removed because opentracing as been archived upstream"; # Added 2025-10-19
 }
diff --git a/pkgs/servers/http/tengine/default.nix b/pkgs/servers/http/tengine/default.nix
index 5a856b21c541..f949284f808d 100644
--- a/pkgs/servers/http/tengine/default.nix
+++ b/pkgs/servers/http/tengine/default.nix
@@ -137,8 +137,6 @@ stdenv.mkDerivation rec {
 
   preConfigure = (lib.concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
 
-  hardeningEnable = optional (!stdenv.hostPlatform.isDarwin) "pie";
-
   enableParallelBuilding = true;
 
   postInstall = ''
diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 3877e627adcf..6b0d084db368 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -60,17 +60,17 @@ let
 in
 {
   tomcat9 = common {
-    version = "9.0.110";
-    hash = "sha256-lDk+uSjtAdWACK9pJWYNen03JmHeXO+NY8ZqGqoolhg=";
+    version = "9.0.111";
+    hash = "sha256-6pZLufCeo6mqD1JZJOjCfvryd6cI9p6B99Ct9YWlw3M=";
   };
 
   tomcat10 = common {
-    version = "10.1.47";
-    hash = "sha256-pqPfam1tuW5J4gxZc6WyNKEYW88cGn7zo2yuTDaM+FI=";
+    version = "10.1.48";
+    hash = "sha256-bAAMIBNs8q7QRhQpl4GEFqFgwOUWwfuiRUS00J26lRM=";
   };
 
   tomcat11 = common {
-    version = "11.0.12";
-    hash = "sha256-GmW8ga7V1ME60iUlj110bC1jaZ3JagT/4z4W4y9CDFU=";
+    version = "11.0.13";
+    hash = "sha256-8XTIrrttJ4ZLpAgjzrBZGR0nzA7iSii2kczUFoObjs8=";
   };
 }
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index acd755224619..8b0215338abb 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.13.0-unstable-2025-09-26";
+  version = "0.13.0-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "af17c8c238ba8cdeaaabb87b25a3ca2375b47c11";
-    sha256 = "sha256-n3t58gsPXxlf2DnrofI28/0ZRC4EwnZvoFKxgxZ9vYA=";
+    rev = "99c0bfca4f4875e8a602c9b4ffc698d9e5cc59a0";
+    sha256 = "sha256-U+oDa8g5o8F5i2A81/glOPaTTrBv6dBEHdYht2jrVu4=";
   };
 
   sourceRoot = "${src.name}/klippy";
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index 7614aae7bc6c..48e0e7155f6f 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -80,9 +80,11 @@ stdenv.mkDerivation rec {
       find public/assets -type f -regextype posix-extended -iregex '.*\.(css|html|js|json|svg)' \
         -exec gzip --best --keep --force {} ';' \
         -exec brotli --best --keep {} ';'
-
+      find public/packs -type f -regextype posix-extended -iregex '.*\.(css|js|json|svg)' \
+        -exec brotli --best --keep {} ';'
+      find public/packs/emoji -maxdepth 1 -type f -name '*.json' \
+        -exec gzip --best --keep --force {} ';'
       gzip --best --keep public/packs/sw.js
-      brotli --best --keep public/packs/sw.js
 
       runHook postBuild
     '';
@@ -124,6 +126,8 @@ stdenv.mkDerivation rec {
     # Remove execute permissions
     find public/emoji -type f ! -perm 0555 \
       -exec chmod 0444 {} ';'
+    find public -maxdepth 1 -type f ! -perm 0555 \
+      -exec chmod 0444 {} ';'
 
     # Create missing static gzip and brotli files
     find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(js|txt)' \
diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index 9760b1b16a54..a45fb51ba0bd 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -11,10 +11,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18nn95z23m7cpfsypfnlvpblj9rbnkddbs396nljiflznc6v473g";
+      sha256 = "14vlhzrgfgmz0fvrvd81j9xfw8ig091yiwq496firapgxffd7jpq";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionmailbox = {
     dependencies = [
@@ -29,10 +29,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bbc1a2m8zp0ci2js8wz00fgyamkflkjimn1dz0632a43viwda4f";
+      sha256 = "0bxxqqflmczwl4ivcqjwwsnrhljcalk1i2hj02qisr3wjgw4811a";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionmailer = {
     dependencies = [
@@ -50,10 +50,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "176vgl9rhy9xqi5i1qdgw4ny8sr6jw32zjsq109sn7jl0j6lvq8d";
+      sha256 = "08y7ihafq71879ncq963rwi541b0gafqx8h5ba26zab521qc7h3d";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionpack = {
     dependencies = [
@@ -77,10 +77,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02ibk3ldqs1xk74b8lycqh1g6bm4vj5ph8bjlln1brfv64df3rv1";
+      sha256 = "1lsspr8nffzn8qpfmj654w1qja1915x6bnzzhpbjj1cy235j2g6n";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actiontext = {
     dependencies = [
@@ -95,10 +95,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f6n43v5r9d0nq09g66rfkqfmx6pv89v01bvd731bndrrysv7i0c";
+      sha256 = "1x4xd8h5sdwdm3rc8h2pxxmq4a0i0wa0gk6c56zq58pzc3xgsihw";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionview = {
     dependencies = [
@@ -118,10 +118,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0izkrdg7r7432mw99d7cwhsr5s9whl3aqh5946i88yqbrc6d59if";
+      sha256 = "0rnfn44g217n9hgvn4ga7l0hl149b91djnl07nzra7kxy1pr8wai";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   active_model_serializers = {
     dependencies = [
@@ -151,10 +151,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "129bldx70vahaargg0spx5sdqw378591gbrq7b0zm3pc0zdg5rfn";
+      sha256 = "1dm1vc5vvk5pwq4x7sfh3g6qzzwbyac37ggh1mm1rzraharxv7j6";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -166,10 +166,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1i3y0ynf16cgc9p28603pxva528a91jgh8nz2d0q8cb5p36vdfhp";
+      sha256 = "0z565q17fmhj4b9j689r0xx1s26w1xcw8z0qyb6h8v0wb8j0fsa0";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activerecord = {
     dependencies = [
@@ -185,10 +185,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wbdijshd3dqgzwhdpb32ig6rz8my5zkmanj32fqiwskvmxnwmd6";
+      sha256 = "1a6fng58lria02wlwiqjgqway0nx1wq31dsxn5xvbk7958xwd5cv";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activestorage = {
     dependencies = [
@@ -202,10 +202,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y3nmzzr17fzxxi9vwi1lc3vc58x1j0i6s56wq0y4wal26g3vfs3";
+      sha256 = "0plck0b57b9ni8n52hj5slv5n8i7w3nfwq6r47nkb2hjbpmsskjg";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activesupport = {
     dependencies = [
@@ -232,10 +232,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184";
+      sha256 = "08vqq5y6vniz30p747xa8yfqb3cz8scqd8r65wij62v661gcw4d7";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -281,10 +281,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g6ahzpdbybryzlfrbb18pybr4230hw1n6g475hh61mk4nlqgl1y";
+      sha256 = "1xwbz5zk37f7p3g6ypxzamisay06hidjmdsrvhxw4q0xin4jw6w7";
       type = "gem";
     };
-    version = "4.16.0";
+    version = "4.20.0";
   };
   ast = {
     groups = [
@@ -314,20 +314,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y";
+      sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   aws-partitions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y34xkflb4fd54k1cbrd9xw6ff2znwn1drbnvy9ywngiyynwff1i";
+      sha256 = "0ys6h3hhhv2w9j9d2ls8d3aaqywdcbipiqnqwr09c6gmqv6fgvv5";
       type = "gem";
     };
-    version = "1.1103.0";
+    version = "1.1168.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -380,10 +380,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
+      sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.12.1";
   };
   azure-blob = {
     dependencies = [ "rexml" ];
@@ -391,10 +391,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zfl00vwx28a8s38spfxinicic1nd7q1phd3cmjxj8mwlfswc3j4";
+      sha256 = "198ndg8m0w54csxb3fidzpjp491ak9jcrmjc8zmp7axi0ncvbsmx";
       type = "gem";
     };
-    version = "0.5.8";
+    version = "0.5.9.1";
   };
   base64 = {
     groups = [
@@ -446,10 +446,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
+      sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.5.0";
   };
   better_errors = {
     dependencies = [
@@ -478,10 +478,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
+      sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.3.1";
   };
   bindata = {
     groups = [ "default" ];
@@ -531,10 +531,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11ip6dgi7147wp8jgwk9g95k07323zh83q699d6wxif6rqdxj0mn";
+      sha256 = "164l8dh3c22c8448hgd0zqhsffxvn4d9wad2zzipav29sssjd532";
       type = "gem";
     };
-    version = "7.0.2";
+    version = "7.1.1";
   };
   browser = {
     groups = [ "default" ];
@@ -603,10 +603,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09jyhmyngwbw2apc77z80kw4d4kd0wdvn46xxks7vjlzgywilipg";
+      sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.5.7";
   };
   case_transform = {
     dependencies = [ "activesupport" ];
@@ -624,10 +624,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
+      sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr";
       type = "gem";
     };
-    version = "0.5.9.8";
+    version = "0.5.10.1";
   };
   cgi = {
     groups = [ "default" ];
@@ -746,10 +746,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "2.5.4";
   };
   cose = {
     dependencies = [
@@ -777,10 +777,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jaa7is4fw1cxigm8vlyhg05bw4nqy4f91zjqxk7pp4c8bdyyfn8";
+      sha256 = "0zjcdl5i6lw508r01dym05ibhkc784cfn93m1d26c7fk1hwi0jpz";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   crass = {
     groups = [
@@ -828,10 +828,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy";
+      sha256 = "1203q6zdw14vwmnr2hw0d6b1rdz4d07w3kjg1my1zhw862gnnac8";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   database_cleaner-core = {
     groups = [
@@ -923,10 +923,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "041c6zrwm3za1scr07kdgmnlxj7lnrr1jcb832grkavf1sh9wf4h";
+      sha256 = "19j0vs9y0zixzvp14i7xkvk907q60w7q6d0bi91lbzf6km8zax4a";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "6.2.0";
   };
   devise_pam_authenticatable2 = {
     dependencies = [
@@ -1032,10 +1032,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nyrgj4a0ppk0qfp8cny4wb3hsr2cw55ynh2w973brhf54xxz5wc";
+      sha256 = "113f4b01pf6igzmb7zkbcd3zgp118gfsqc35ggw9p3bzkmgp2jlq";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   elasticsearch = {
     dependencies = [
@@ -1124,10 +1124,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08rc8pzri3g7c85c76x84j05hkk12jvalrm2m3n97k1n7f03j13n";
+      sha256 = "0rqfmrgp4ihwmnpi9ah0y6pah7rr7d3pid94z2cqd93bgc2m6vjn";
       type = "gem";
     };
-    version = "5.0.1";
+    version = "5.1.3";
   };
   erubi = {
     groups = [
@@ -1151,10 +1151,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj";
+      sha256 = "1g785lz4z2k7jrdl7bnnjllzfrwpv9pyki94ngizj8cqfy83qzkc";
       type = "gem";
     };
-    version = "1.2.11";
+    version = "1.4.0";
   };
   excon = {
     dependencies = [ "logger" ];
@@ -1162,10 +1162,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a";
+      sha256 = "1gj6h2r9ylkmz9wjlf6p04d3hw99qfnf0wb081lzjx3alk13ngfq";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.3.0";
   };
   fabrication = {
     groups = [
@@ -1189,10 +1189,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z4vhl6lbd0la2j0ab05sz8wq5mqvpikzhjrc142z24x4zmgpl8s";
+      sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.5.2";
   };
   faraday = {
     dependencies = [
@@ -1204,10 +1204,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
+      sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
       type = "gem";
     };
-    version = "2.13.1";
+    version = "2.14.0";
   };
   faraday-follow_redirects = {
     dependencies = [ "faraday" ];
@@ -1215,10 +1215,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
+      sha256 = "1nfmmnmqgbxci7dlca0qnwxn8j29yv7v8wm26m0f4l0kmcc13ynk";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.4.0";
   };
   faraday-httpclient = {
     dependencies = [ "httpclient" ];
@@ -1237,10 +1237,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.1";
   };
   fast_blank = {
     groups = [ "default" ];
@@ -1362,14 +1362,15 @@
     version = "1.1.5";
   };
   formatador = {
+    dependencies = [ "reline" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl";
+      sha256 = "18jdg7y4746pfisvab6i3j1vl61bzhiap52dv8sf2i5g0kybian8";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.1";
   };
   forwardable = {
     groups = [ "default" ];
@@ -1390,10 +1391,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578";
+      sha256 = "00v5zy1s7cl4hbaaz2sqp02g6kaajn1yslvfpqcra55hndvdyg83";
       type = "gem";
     };
-    version = "1.11.1";
+    version = "1.12.0";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -1404,10 +1405,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh";
+      sha256 = "04gzhqvsm4z4l12r9dkac9a75ah45w186ydhl0i4andldsnkkih5";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
   google-protobuf = {
     dependencies = [
@@ -1421,10 +1422,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14a8pv6npmv3ppp5097rladsynk8fs4w6chlcylkls6xj9ngxdjd";
+      sha256 = "1rqmj1sl0bs42jjxdfpcqs8sgq6zvhjdixbsciaj1043l993zv6r";
       type = "gem";
     };
-    version = "4.31.0";
+    version = "4.32.1";
   };
   googleapis-common-protos-types = {
     dependencies = [ "google-protobuf" ];
@@ -1435,10 +1436,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zyh9pxsw4zwv3iissirwqnx98qzkywqf3bwdrai6zpwph34ndsy";
+      sha256 = "1iy4pxpsbxjdiyd03mslalbcvrrga57h1mb0r0c01nnngfvr4x7r";
       type = "gem";
     };
-    version = "1.20.0";
+    version = "1.22.0";
   };
   haml = {
     dependencies = [
@@ -1469,10 +1470,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sjrdwc4azzfpsp2xk0365z031482gcrs0c54d5wx0igkqca0fr7";
+      sha256 = "0psqln0xs2hkcziag6m9fiwsaxyg3q7vazy8rbcj39awm2bf87q9";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "3.0.0";
   };
   haml_lint = {
     dependencies = [
@@ -1486,10 +1487,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb";
+      sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab";
       type = "gem";
     };
-    version = "0.64.0";
+    version = "0.66.0";
   };
   hashdiff = {
     groups = [
@@ -1499,10 +1500,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c";
+      sha256 = "1lbw8lqzjv17vnwb9vy5ki4jiyihybcc5h2rmcrqiz1xa6y9s1ww";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.2.1";
   };
   hashie = {
     groups = [ "default" ];
@@ -1555,10 +1556,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07sm9gp4l2khw8m259paw1xcy9yd1jabqnyjzsrgl3ndgqgrj6f8";
+      sha256 = "0nsw7h1hab5f4hy778kd21y8q4hfiy0j9yxa5pjp3g49a9jl9jh6";
       type = "gem";
     };
-    version = "0.24.0";
+    version = "0.26.1";
   };
   hkdf = {
     groups = [ "default" ];
@@ -1605,10 +1606,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
+      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.1.0";
   };
   http-form_data = {
     groups = [ "default" ];
@@ -1650,10 +1651,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "098n4dfmiydbm9if52h17kxglbli9gihjgzhcghv274ni2c9ab49";
+      sha256 = "04d75idhzybfr1zn0n8c6mk3ssgl3vh6cqkgcwc5rr0csh0sf3gb";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.7.3";
   };
   i18n = {
     dependencies = [ "concurrent-ruby" ];
@@ -1729,10 +1730,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
+      sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
   };
   irb = {
     dependencies = [
@@ -1750,10 +1751,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2";
+      sha256 = "1aja320qnimlnfc80wf2i2x8i99kl5sdzfacsfzzfzzs3vzysja3";
       type = "gem";
     };
-    version = "1.15.2";
+    version = "1.15.3";
   };
   jd-paperclip-azure = {
     dependencies = [
@@ -1784,14 +1785,15 @@
     groups = [
       "default"
       "development"
+      "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
+      sha256 = "128bp3mihh175l9wm7hgg9sdisp6hd3kf36fw01iksqnq7kv5hdi";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.15.1";
   };
   json-canonicalization = {
     groups = [ "default" ];
@@ -1816,10 +1818,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19bjs404inbydn40nampk5ij7vqkwpmqp3hp4dmjf50sdm6gzayc";
+      sha256 = "1k64mp59jlbqd5hyy46pf93s3yl1xdngfy8i8flq2hn5nhk91ybg";
       type = "gem";
     };
-    version = "1.16.7";
+    version = "1.17.0";
   };
   json-ld = {
     dependencies = [
@@ -1849,10 +1851,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l32rjawsxhgi59y7lmjwgmnk32585gih1ylvy08m3vx7cdbzmdg";
+      sha256 = "1q8y2f9c9940sgqdb57zmlbhjx3rvmq2l8kpi3a9bgzkx8kl6aa6";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.3.2";
   };
   json-schema = {
     dependencies = [
@@ -1863,10 +1865,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzrf6q4d9kbixj6bpi2bp8dizmqxcmlq30ni86h3ifzpkcrm0mk";
+      sha256 = "0gv3b0nry1sn1n7imfs2drqyfp4g8b2zcrizjc98j04pl7xszv3r";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "6.0.0";
   };
   jsonapi-renderer = {
     groups = [ "default" ];
@@ -1884,10 +1886,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
+      sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
       type = "gem";
     };
-    version = "2.10.1";
+    version = "2.10.2";
   };
   kaminari = {
     dependencies = [
@@ -2058,10 +2060,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v2dxpc7g2b0b300mpx2janhzph3j8vrjxj5k42bidla7j74kbl7";
+      sha256 = "09rjxsmmnahxsaw0hc4f0ffw4rcncjxa01xd9v5z4q9radfidr5j";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.7.7";
   };
   llhttp-ffi = {
     dependencies = [
@@ -2131,6 +2133,7 @@
   };
   mail = {
     dependencies = [
+      "logger"
       "mini_mime"
       "net-imap"
       "net-pop"
@@ -2144,10 +2147,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
+      sha256 = "0ha9sgkfqna62c1basc17dkx91yk7ppgjq32k4nhrikirlz6g9kg";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "2.9.0";
   };
   marcel = {
     groups = [ "default" ];
@@ -2178,10 +2181,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+      sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "0.4.3";
   };
   memory_profiler = {
     groups = [
@@ -2221,10 +2224,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lnkfxcayx682rjjxmkjaaxq605akfka90m5rliw897sli6nprcj";
+      sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
       type = "gem";
     };
-    version = "3.2025.0514";
+    version = "3.2025.0924";
   };
   mini_mime = {
     groups = [
@@ -2267,10 +2270,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm";
       type = "gem";
     };
-    version = "5.25.5";
+    version = "5.26.0";
   };
   msgpack = {
     groups = [ "default" ];
@@ -2287,10 +2290,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "1.17.0";
   };
   mutex_m = {
     groups = [ "default" ];
@@ -2326,20 +2329,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14zmzjy2sp87ac6iygkk3pz9snjvx4ks681vg4gxz8x8q7gmzajj";
+      sha256 = "0i24prs7yy1p1zdps2x1ksb7lmvbn2f0llxwdjdw3z2ksddx136b";
       type = "gem";
     };
-    version = "0.5.8";
+    version = "0.5.12";
   };
   net-ldap = {
+    dependencies = [
+      "base64"
+      "ostruct"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g9gz39bs2iy4ky4fhjphimqd9m9wdsaz50anxgwg3yjrff3famy";
+      sha256 = "0wjkrvcwnxa6ggq0nfz004f1blm1c67fv7c6614sraak0wshn25j";
       type = "gem";
     };
-    version = "0.19.0";
+    version = "0.20.0";
   };
   net-pop = {
     dependencies = [ "net-protocol" ];
@@ -2411,10 +2418,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
+      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
       type = "gem";
     };
-    version = "1.18.9";
+    version = "1.18.10";
   };
   oj = {
     dependencies = [
@@ -2433,6 +2440,7 @@
   omniauth = {
     dependencies = [
       "hashie"
+      "logger"
       "rack"
       "rack-protection"
     ];
@@ -2440,10 +2448,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
+      sha256 = "0g3n12k5npmmgai2cs3snimy6r7h0bvalhjxv0fjxlphjq25p822";
       type = "gem";
     };
-    version = "2.1.3";
+    version = "2.1.4";
   };
   omniauth-cas = {
     dependencies = [
@@ -2455,10 +2463,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yynk95xhccvkb1j7rcb834ch80y85n2bhyimq946ib487z8wcx1";
+      sha256 = "03b034imgj5jwflc4db7hsp0n5ivqyqkmsfhc5drlidrcdfv2f0q";
       type = "gem";
     };
-    version = "3.0.1";
+    version = "3.0.2";
   };
   omniauth-rails_csrf_protection = {
     dependencies = [
@@ -2531,10 +2539,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n";
+      sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.3.2";
   };
   openssl-signature_algorithm = {
     dependencies = [ "openssl" ];
@@ -2555,10 +2563,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15x9bq13k53k14r3h5r0pn7cnl3g7pdy0p0662k1s2x7mgkk7k4d";
+      sha256 = "0kr1jyk67zn4axafcb2fji5b8xvr56hhfg2y33s5pnzjlr72dzfc";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.7.0";
   };
   opentelemetry-common = {
     dependencies = [ "opentelemetry-api" ];
@@ -2569,10 +2577,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13c7qnqai6djfd6rjwdwcwbz9f77vcmy0chx1avpxmiqz2h9cpnf";
+      sha256 = "0b5k7qc81ln96ayba90hm6ww7qpk8y7lc1r2mphblmwx8y812wns";
       type = "gem";
     };
-    version = "0.22.0";
+    version = "0.23.0";
   };
   opentelemetry-exporter-otlp = {
     dependencies = [
@@ -2587,10 +2595,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15xssmviwsi7wqmrbx5khm2imvwsrzmxdli7rkvzqbbqpd309jq7";
+      sha256 = "0jj78y79mawj86v5g3kcz6k81izd0m0w47wyyk2br744swbvwn2k";
       type = "gem";
     };
-    version = "0.30.0";
+    version = "0.31.1";
   };
   opentelemetry-helpers-sql = {
     dependencies = [ "opentelemetry-api" ];
@@ -2601,10 +2609,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13fvxvia6qxrdz06s5g4bs4fc1hdgkps7yz45s2n26wxqv163s0r";
+      sha256 = "0kc8pdlm2avyvahg40bfbrimxmvmra0i30m4ha3pzvn6r9xrf8wz";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.2.0";
   };
   opentelemetry-helpers-sql-obfuscation = {
     dependencies = [ "opentelemetry-common" ];
@@ -2615,35 +2623,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jwyx8jk1faszd20s0qrvgvxs9ddvnfrqixy099pn9lqizandn7m";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  opentelemetry-instrumentation-action_mailer = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [
-      "default"
-      "opentelemetry"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "18p9dvq4mb8s5f1ndabjng07yabv5xgl5d80fcvc1383faarbdg8";
+      sha256 = "0h935j5ah9s2v9qm61ddp62kaffk1rn8assgljqap3fz2fgijlkj";
       type = "gem";
     };
     version = "0.4.0";
   };
-  opentelemetry-instrumentation-action_pack = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-      "opentelemetry-instrumentation-rack"
-    ];
+  opentelemetry-instrumentation-action_mailer = {
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2651,17 +2637,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k09hr93fib38i6ajh0abkfvpvng6k2qsvds4jd08znfzyjs17jf";
+      sha256 = "0mqh8z6myff0j11zcnm34s1lc8qzmzzqdrhzk95y2sh6vdmqd143";
       type = "gem";
     };
-    version = "0.12.1";
+    version = "0.6.1";
+  };
+  opentelemetry-instrumentation-action_pack = {
+    dependencies = [ "opentelemetry-instrumentation-rack" ];
+    groups = [
+      "default"
+      "opentelemetry"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wzj0xmivyx243slz526z54lqyhsiyzzrbha4szyxjl30xsdxyl4";
+      type = "gem";
+    };
+    version = "0.15.1";
   };
   opentelemetry-instrumentation-action_view = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2669,45 +2665,35 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qf5pklfyxrn2pskhmhd1gnp9i72yaqw114rmc5nrxhbcm24chsb";
+      sha256 = "16gmwl1v4jnz1x670qprkbc35phnbpbljsp2mcr71dq4fvfk8qa2";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.11.1";
   };
   opentelemetry-instrumentation-active_job = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gb1snnd087nh8r5vvnl8ahg3k3bi2b9rb1m8r2aj7220m78hpcx";
+      sha256 = "129ajjrxigl4pag1nlzbdv1js5bij4ll92i1ix50c3f24h9338df";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.10.1";
   };
   opentelemetry-instrumentation-active_model_serializers = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gjbdkamj147vd1hcjyyqir8z4nwmd05a8ac3h94y3n9n6phzzgx";
+      sha256 = "05ff7yxy2v96kslsqn1y68669is00798i9fgk9fy85vx2r21xs4g";
       type = "gem";
     };
-    version = "0.22.0";
+    version = "0.24.0";
   };
   opentelemetry-instrumentation-active_record = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2715,17 +2701,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h01lq8xjjdaprprqzj6alq7gw9lwdkkakjjyyxsg3ylpwnvkg4w";
+      sha256 = "14kwks0130mrggk3irg4qvx5fmwk9gxv6w23dy6ryi50xqs3y20v";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.11.1";
   };
   opentelemetry-instrumentation-active_storage = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2733,16 +2715,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00x7yjzflxmqiywczlih6vi301b1xm6rwbwlzv0hx87cpdm94m56";
+      sha256 = "17p8zmfyigdqvgy3d1691ayzm6nj4q4nx2n3qk01f7wjakphz6zq";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.3.1";
   };
   opentelemetry-instrumentation-active_support = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2750,10 +2729,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16frcxhnb5vjihkff3wl6pnq0m4wkpii7la1d25d03j29qsh5qcv";
+      sha256 = "0zf5kg2h9zgmrwnq7v7by2nyhkxa20gmi5nyqqrpwyaqf4v9isl2";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.10.1";
   };
   opentelemetry-instrumentation-base = {
     dependencies = [
@@ -2768,98 +2747,79 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l0w7iya56y458mzws9q246whff2bf597553d5i3xkrcxb707qdk";
-      type = "gem";
-    };
-    version = "0.23.0";
-  };
-  opentelemetry-instrumentation-concurrent_ruby = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "15v8khcyg9wz5v7kysagkbmdv895qahb0b6q7ajk2qznniaix9pv";
-      type = "gem";
-    };
-    version = "0.22.0";
-  };
-  opentelemetry-instrumentation-excon = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01rzi9d1hi402a8vdr439by4zy8x4rfq3vwnlzz3nzs50mxcbr9s";
-      type = "gem";
-    };
-    version = "0.23.0";
-  };
-  opentelemetry-instrumentation-faraday = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0r25vvkxawngzm7an652npawjhir6zwics8635k5z7d60hfb2xi3";
-      type = "gem";
-    };
-    version = "0.27.0";
-  };
-  opentelemetry-instrumentation-http = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0p9z9nwrf71inh7n84i37x156da1vm7mqnfp3jh6faqiar65icl1";
+      sha256 = "09ysfv2x25svwl4yxrbgmjkwrlkylr7plci3jjb6wkim11zklak4";
       type = "gem";
     };
     version = "0.25.0";
   };
-  opentelemetry-instrumentation-http_client = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+  opentelemetry-instrumentation-concurrent_ruby = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p4w5zd2b0ndzwwfc8np1xyp4kzd59k7hpcwpkk0ghlmbnsmbkwh";
+      sha256 = "1lniyy8yzmvz1mrh7az0yn94j4d9p0vvd6v0jgk9vi8042vxi6r2";
       type = "gem";
     };
-    version = "0.23.0";
+    version = "0.24.0";
+  };
+  opentelemetry-instrumentation-excon = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01rwnxml7h9vcwfdf2n1zr6kfxfcplr1i00aga8xd76wmbvld8fg";
+      type = "gem";
+    };
+    version = "0.26.0";
+  };
+  opentelemetry-instrumentation-faraday = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0n32aqsqj9lf46mvm1pr5f2j386aq1jia00aajp4qpb9vgf0jnq1";
+      type = "gem";
+    };
+    version = "0.30.0";
+  };
+  opentelemetry-instrumentation-http = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ad0rrw0a74dzlhpcyccas54cl9zggfvdjxs6hdklhwkdla0vmr7";
+      type = "gem";
+    };
+    version = "0.27.0";
+  };
+  opentelemetry-instrumentation-http_client = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1mfa0ma9kl5yjzm1kph01y7cwk99nib4vibwz7d76rrk7qmiisx8";
+      type = "gem";
+    };
+    version = "0.26.0";
   };
   opentelemetry-instrumentation-net_http = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "100a3kzk8ckifxaw0n6xpg6hxxw0yrqmfwjp47khgy2831r3n4li";
+      sha256 = "14hx651frq9hncd14vi3yh5isrjsj2nalziy68k5j8afh4ydrhaf";
       type = "gem";
     };
-    version = "0.23.0";
+    version = "0.26.0";
   };
   opentelemetry-instrumentation-pg = {
     dependencies = [
-      "opentelemetry-api"
       "opentelemetry-helpers-sql"
       "opentelemetry-helpers-sql-obfuscation"
       "opentelemetry-instrumentation-base"
@@ -2868,28 +2828,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09sgqwxavzgd7gsgr5w909p794g75602qsn6jvhs5qqj03bkldc5";
+      sha256 = "02pvkv1f374ibvpnha8y64zdjdyav7rk77rz9bkxnn61gcnvip56";
       type = "gem";
     };
-    version = "0.30.1";
+    version = "0.32.0";
   };
   opentelemetry-instrumentation-rack = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bbvp2mnbcrldcp3hzm2fv52zdsqf0i9kz4r12msq24f6l5r2mca";
+      sha256 = "0xzk88iiiggx3kdfy5y75cb79cc5gn8jsl1vwg5n8w086s1vnb4y";
       type = "gem";
     };
-    version = "0.26.0";
+    version = "0.29.0";
   };
   opentelemetry-instrumentation-rails = {
     dependencies = [
-      "opentelemetry-api"
       "opentelemetry-instrumentation-action_mailer"
       "opentelemetry-instrumentation-action_pack"
       "opentelemetry-instrumentation-action_view"
@@ -2897,45 +2853,38 @@
       "opentelemetry-instrumentation-active_record"
       "opentelemetry-instrumentation-active_storage"
       "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
       "opentelemetry-instrumentation-concurrent_ruby"
     ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xpiq4j17vcjnrxxb0zkb67c4y2b7q1g4qvf6ln83b6svx2c7pj";
+      sha256 = "0vy93a3hpi8l8crljxwxzxwmvyf9gg1pff6dnpxl0c2ljmwdynbr";
       type = "gem";
     };
-    version = "0.36.0";
+    version = "0.39.1";
   };
   opentelemetry-instrumentation-redis = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "183v8q8a74fc9dnb6ny44dsgq6142smic6x4ivz3v50casjznpii";
+      sha256 = "001rd4ix10hja64y2arhpcd0hlmjilx7zlb4slmx4zaj3iyra8c7";
       type = "gem";
     };
-    version = "0.26.1";
+    version = "0.28.0";
   };
   opentelemetry-instrumentation-sidekiq = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lpkc1ihifbjns2wf17kf9pmhx73j3i1in4fkar469k4i2fylfl5";
+      sha256 = "0vi2ac1l66vsflslxv6ay4ml95svcq53v8rdmwf2c3vl94f6b3bl";
       type = "gem";
     };
-    version = "0.26.1";
+    version = "0.28.0";
   };
   opentelemetry-registry = {
     dependencies = [ "opentelemetry-api" ];
@@ -2962,10 +2911,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xqx6zxf6msrryz5hr2s3nwakin0nmxfgz9bkwpmpbf7lss7kngs";
+      sha256 = "06jjh25s94lv94ljgbq13baqgnkccdsvzsw6xg54vwldpr4rjwa3";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.10.0";
   };
   opentelemetry-semantic_conventions = {
     dependencies = [ "opentelemetry-api" ];
@@ -2976,10 +2925,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jzx18lmcv27pma1hbrccb9g6daadd6c4192r8w8x2nli3shkwl9";
+      sha256 = "05znn2iijg1qli52m09bgyq4b74nfs5nwgz2z73sllvqpiyn1cf1";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.36.0";
   };
   orm_adapter = {
     groups = [
@@ -2999,10 +2948,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.3";
   };
   ox = {
     dependencies = [ "bigdecimal" ];
@@ -3040,10 +2989,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.8.0";
+    version = "3.3.9.0";
   };
   parslet = {
     groups = [ "default" ];
@@ -3071,10 +3020,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
+      sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq";
       type = "gem";
     };
-    version = "1.5.9";
+    version = "1.6.2";
   };
   pghero = {
     dependencies = [ "activerecord" ];
@@ -3092,17 +3041,14 @@
       "concurrent-ruby"
       "mime-types"
     ];
-    groups = [
-      "default"
-      "test"
-    ];
+    groups = [ "test" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "114wkr2hj55c7n4xq30nb4g7kcm9a1mhsy0934jr9mzwfr0kyhaa";
+      sha256 = "02ivcflls7fy5axsqk602rqgfq9r6p8pmqkcxp9sdpgvvf8hflb0";
       type = "gem";
     };
-    version = "1.52.0";
+    version = "1.55.0";
   };
   pp = {
     dependencies = [ "prettyprint" ];
@@ -3116,10 +3062,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll";
+      sha256 = "1xlxmg86k5kifci1xvlmgw56x88dmqf04zfzn7zcr4qb8ladal99";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.3";
   };
   premailer = {
     dependencies = [
@@ -3175,10 +3121,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
+      sha256 = "07fz0p6nlifm983cac3ayi7nwrpb5l4s3jl7p70imbsm79k429qr";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.2";
   };
   prometheus_exporter = {
     dependencies = [ "webrick" ];
@@ -3186,26 +3132,25 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15vl8fw8vjnaj9g129dzrwk9nlrdqgffaj3rys4ba9ns2bqim9rq";
+      sha256 = "0x98zrcd83dq1y9qhshx8hqvlvy81wlns6k15hq1xr3lrsdxvrdz";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   propshaft = {
     dependencies = [
       "actionpack"
       "activesupport"
       "rack"
-      "railties"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sqg0xf46xd47zdpm8d12kfnwl0y5jb2hj10imzb3bk6mwgkd2fk";
+      sha256 = "14n3fhz5hzpsczp4spqc26csfgk2qga7mgcm7px9z0byyr76dk4s";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.3.1";
   };
   psych = {
     dependencies = [
@@ -3247,10 +3192,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
+      sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74";
       type = "gem";
     };
-    version = "6.6.0";
+    version = "7.1.0";
   };
   pundit = {
     dependencies = [ "activesupport" ];
@@ -3258,10 +3203,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmy0nkgayjifi2j38fn55nb7z1xq3ma2wp19d7c7rmz7ynvidjg";
+      sha256 = "1gcb23749jwggmgic4607ky6hm2c9fpkya980iihpy94m8miax73";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.5.2";
   };
   raabro = {
     groups = [ "default" ];
@@ -3300,10 +3245,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i44156w3k6c88nv72wskizpyq3nwysisnj9qi9vkxwffrzp17b6";
+      sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
       type = "gem";
     };
-    version = "3.1.18";
+    version = "3.2.4";
   };
   rack-attack = {
     dependencies = [ "rack" ];
@@ -3311,10 +3256,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w";
+      sha256 = "1wpcxspprm187k6mch9fxhaaq1a3s9bzybd2fdaw1g45pzg9yjgj";
       type = "gem";
     };
-    version = "6.7.0";
+    version = "6.8.0";
   };
   rack-cors = {
     dependencies = [
@@ -3447,10 +3392,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b5k9608wxp8hksyvnc3vvdrairyv2qldcw48cv4xrv9amhrbaqk";
+      sha256 = "0igxnfy4xckvk2b6x17zrwa8xwnkxnpv36ca4wma7bhs5n1c10sx";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   rails-dom-testing = {
     dependencies = [
@@ -3468,10 +3413,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
+      sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails-html-sanitizer = {
     dependencies = [
@@ -3505,10 +3450,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03dy8nmq2gxvkg8zqq6c0wwz98mdwp3i9krn0slcknhb8nak2c0m";
+      sha256 = "1brqyx0cn46lwgxni943ri9lcg12hskzw8d54j0d4pzqabv32kv2";
       type = "gem";
     };
-    version = "8.0.1";
+    version = "8.0.2";
   };
   railties = {
     dependencies = [
@@ -3518,6 +3463,7 @@
       "rackup"
       "rake"
       "thor"
+      "tsort"
       "zeitwerk"
     ];
     groups = [
@@ -3530,10 +3476,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k0x630ipimzv6vzhwflsjl7n1fvrmvf196mfbspha7wf4bhxr2l";
+      sha256 = "1lpiazaaq8di4lz9iqjqdrsnha6kfq6k35kd9nk9jhhksz51vqxc";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   rainbow = {
     groups = [
@@ -3570,15 +3516,18 @@
       "bcp47_spec"
       "bigdecimal"
       "link_header"
+      "logger"
+      "ostruct"
+      "readline"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mlalmbj1wkwvjha92f7v91v0pbjar9gdb2ddxdyqd24zcifn3ln";
+      sha256 = "1har1346p7jwrs89d5w1gv98jk2nh3cwkdyvkzm2nkjv3s1a0zx7";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.3.4";
   };
   rdf-normalize = {
     dependencies = [ "rdf" ];
@@ -3595,6 +3544,7 @@
     dependencies = [
       "erb"
       "psych"
+      "tsort"
     ];
     groups = [
       "default"
@@ -3606,10 +3556,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ssi6b33bwr1b1qsssnyjkldwwy087z33yzl58jyz5njdiwzlplh";
+      sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8";
       type = "gem";
     };
-    version = "6.14.1";
+    version = "6.15.1";
+  };
+  readline = {
+    dependencies = [ "reline" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0shxkj3kbwl43rpg490k826ibdcwpxiymhvjnsc85fg2ggqywf31";
+      type = "gem";
+    };
+    version = "0.0.4";
   };
   redcarpet = {
     groups = [ "default" ];
@@ -3640,21 +3601,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fsx10xg4n18w9sr1xa128y4yf0jv5zicrj5ff5n0f1crcwywrgf";
+      sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y";
       type = "gem";
     };
-    version = "0.24.0";
-  };
-  redlock = {
-    dependencies = [ "redis" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0xvjwfzq7rqj4k311kidwmv5app3i7glz4miys6ixqy6c8yylz3c";
-      type = "gem";
-    };
-    version = "1.3.2";
+    version = "0.26.1";
   };
   regexp_parser = {
     groups = [
@@ -3665,10 +3615,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
+      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.11.3";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -3682,10 +3632,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s";
+      sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.2";
   };
   request_store = {
     dependencies = [ "rack" ];
@@ -3713,10 +3663,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06ilkbbwvc8d0vppf8ywn1f79ypyymlb9krrhqv4g0q215zaiwlj";
+      sha256 = "0npm7nyld47f516idsmslfhypp7gm3jcl90ml5c68vz11anddhl9";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.2.0";
   };
   rexml = {
     groups = [
@@ -3750,10 +3700,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3";
+      sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
       type = "gem";
     };
-    version = "4.5.2";
+    version = "4.6.1";
   };
   rpam2 = {
     groups = [
@@ -3805,10 +3755,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
+      sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr";
       type = "gem";
     };
-    version = "3.13.0";
+    version = "3.13.1";
   };
   rspec-core = {
     dependencies = [ "rspec-support" ];
@@ -3820,10 +3770,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0n1rlagplpcgp41s3r68z01539aivwj0cn3v19hq4p3pgdmibnpr";
+      sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb";
       type = "gem";
     };
-    version = "3.13.4";
+    version = "3.13.5";
   };
   rspec-expectations = {
     dependencies = [
@@ -3889,10 +3839,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01b5d37i3igh11v5y801gxzb1df2v0il0mfdqi4cdmxn1aqh0dqc";
+      sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i";
       type = "gem";
     };
-    version = "8.0.1";
+    version = "8.0.2";
   };
   rspec-sidekiq = {
     dependencies = [
@@ -3905,10 +3855,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rr8229zd5ylwn78dxr4w43a07k58v4chr5lblws53llm7j1qrzd";
+      sha256 = "0rn2yzkn3ywryvrigmsr1902zd14kx5ya8n41jd1zc1szxkgbpvv";
       type = "gem";
     };
-    version = "5.1.0";
+    version = "5.2.0";
   };
   rspec-support = {
     groups = [
@@ -3919,10 +3869,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xx3f4mgr84jz07fifd3r68hm6giqy91hqyzawmi0s59yqa1hjqq";
+      sha256 = "1cmgz34hwj5s3jwxhyl8mszs24nci12ffbrmr5jb1si74iqf739f";
       type = "gem";
     };
-    version = "3.13.4";
+    version = "3.13.6";
   };
   rubocop = {
     dependencies = [
@@ -3941,10 +3891,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h48rhmp178ppzc4ybfj42a2savs4bxgy3bvw95i4ypgfm2hndhz";
+      sha256 = "0hpgpyzpzgmp28pirlyrif3albsk5kni2k67h5yvxfvr3g55w2d7";
       type = "gem";
     };
-    version = "1.77.0";
+    version = "1.81.6";
   };
   rubocop-ast = {
     dependencies = [
@@ -3958,10 +3908,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gis8w51k5dsmzzlppvwwznqyfd73fa3zcrpl1xihzy1mm4jw14l";
+      sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr";
       type = "gem";
     };
-    version = "1.45.1";
+    version = "1.47.1";
   };
   rubocop-capybara = {
     dependencies = [
@@ -4001,10 +3951,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h9flnqk2f3llwf8g0mk0fvzzznfj7hsil3qg88m803pi9b06zbg";
+      sha256 = "0d0qyyw1332afi9glwfjkb4bd62gzlibar6j55cghv8rzwvbj6fd";
       type = "gem";
     };
-    version = "1.25.0";
+    version = "1.26.1";
   };
   rubocop-rails = {
     dependencies = [
@@ -4018,10 +3968,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1404nfa0gw3p0xzmv4b9zg9v1da0nwc4m7796pl73zi2hwy65k4z";
+      sha256 = "1danlfzfqx3x1kna248sm2b1br5ki369r51x90jc4vbh6xk8zv1l";
       type = "gem";
     };
-    version = "2.32.0";
+    version = "2.33.4";
   };
   rubocop-rspec = {
     dependencies = [
@@ -4032,10 +3982,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ya4815sp8g13w7a86sm0605fx7xyldck77f9pjjfrvpf5c21r60";
+      sha256 = "13q588yrqr195d4d4vkv1y3px12llc8xiwh0dnfdnd1027d19cmp";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rubocop-rspec_rails = {
     dependencies = [
@@ -4102,20 +4052,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0j8wxbkl261nwg7jr6kdz0zlyim4zcnnb72ynky97grqid6d61d3";
+      sha256 = "0n3pgw1jkkivgkn08qpc4fb1kiivhbshkj0lhrms4sy3fahlgigk";
       type = "gem";
     };
-    version = "2.2.4";
+    version = "2.2.5";
   };
   rubyzip = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
+      sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "3.2.2";
   };
   rufus-scheduler = {
     dependencies = [ "fugit" ];
@@ -4134,10 +4084,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln";
+      sha256 = "1apjjd99bqsc22bfq66j27dp4im0amisy619hr9qbghdapfh3kf8";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.0";
   };
   sanitize = {
     dependencies = [
@@ -4162,10 +4112,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0w0dafg0gz3snm30247wwai0cy3j235ynwx2karyh05ayfqhm4ii";
+      sha256 = "1nb3an8af7f08jnhhbn8bxvgfxqb43qc9d5hgrz16ams96h3mv3f";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.9.0";
   };
   securerandom = {
     groups = [
@@ -4196,8 +4146,8 @@
   };
   sidekiq = {
     dependencies = [
-      "base64"
       "connection_pool"
+      "json"
       "logger"
       "rack"
       "redis-client"
@@ -4209,10 +4159,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
+      sha256 = "1vpj4jqcvnybc6h6hxpvgq36h311jqz3myax36z9ls8ilnw2y3ns";
       type = "gem";
     };
-    version = "7.3.9";
+    version = "8.0.9";
   };
   sidekiq-bulk = {
     dependencies = [ "sidekiq" ];
@@ -4229,16 +4179,15 @@
     dependencies = [
       "rufus-scheduler"
       "sidekiq"
-      "tilt"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gnm98hdw1ndw0sryjimp4a0805yhwhjxg6njhz8xmdh5ycgljda";
+      sha256 = "0qj0lfy0860lbdg92mmv4f4yy3vr7pq01ay6df4xkqm3a7l09z71";
       type = "gem";
     };
-    version = "5.0.6";
+    version = "6.0.1";
   };
   sidekiq-unique-jobs = {
     dependencies = [
@@ -4275,10 +4224,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q3lwin7pk5rsxy2a663x6lph5arax9lqqk12fgwdy57i5ma749q";
+      sha256 = "1vhh91l7pjx7fpvs62kmz99ypsnkk93yq1ra5qgigbinxjqfa77b";
       type = "gem";
     };
-    version = "5.3.1";
+    version = "5.4.0";
   };
   simplecov = {
     dependencies = [
@@ -4303,20 +4252,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
+      sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.13.2";
   };
   simplecov-lcov = {
     groups = [ "test" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h8kswnshgb9zidvc88f4zjy4gflgz3854sx9wrw8ppgnwfg6581";
+      sha256 = "1ka6cdwywd6a6pqjwggm0439437xdq2r7514n3a5wn8a40ga6xvs";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.9.0";
   };
   simplecov_json_formatter = {
     groups = [
@@ -4356,15 +4305,15 @@
     version = "0.2.0";
   };
   stoplight = {
-    dependencies = [ "redlock" ];
+    dependencies = [ "zeitwerk" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16j5w162pv45gjm0jah9hhy8q5fjplbka913c0qwxx209lbmsizd";
+      sha256 = "1mxy9x9zpi1grx24lds1kkipmh0rgcwsi74c7pbm1dza39m6p7nh";
       type = "gem";
     };
-    version = "4.1.1";
+    version = "5.4.0";
   };
   stringio = {
     groups = [
@@ -4388,10 +4337,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mg8z7ikc7rj53hy3c5n7pqdwd4m4h22k8ig36057nnchqa34d6v";
+      sha256 = "09llhlw9ddsjyv6c59z3yjwdhrxc2q60a60wjvqhrhhy96dkmjlb";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.1";
   };
   swd = {
     dependencies = [
@@ -4430,10 +4379,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz";
+      sha256 = "0b7pzx45f1vg6f53midy70ndlmb0k4k03zp4nsq8l0q9dx5yk8dp";
       type = "gem";
     };
-    version = "0.10.3";
+    version = "0.10.4";
   };
   terminal-table = {
     dependencies = [ "unicode-display_width" ];
@@ -4455,10 +4404,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mkmbw5z2ma4hkrg3i697bx0j8w7ggpxyj1d7kv7fgya8cdr15lx";
+      sha256 = "0aakswgqk6cfamq3h6fxdls81ia7v3fi1v825i5pdrgzbh293blw";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   test-prof = {
     groups = [
@@ -4497,10 +4446,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96";
+      sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "2.6.1";
   };
   timeout = {
     groups = [
@@ -4531,6 +4480,22 @@
     };
     version = "0.14.1";
   };
+  tsort = {
+    groups = [
+      "default"
+      "development"
+      "pam_authentication"
+      "production"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   tty-color = {
     groups = [ "default" ];
     platforms = [ ];
@@ -4662,10 +4627,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc";
+      sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c";
       type = "gem";
     };
-    version = "3.1.4";
+    version = "3.2.0";
   };
   unicode-emoji = {
     groups = [
@@ -4675,10 +4640,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
+      sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9";
       type = "gem";
     };
-    version = "4.0.4";
+    version = "4.1.0";
   };
   uri = {
     groups = [
@@ -4785,10 +4750,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sn399i804pg87b1j30x8lv2602qcndhvg0k0g4xqdfxg28zdipp";
+      sha256 = "1z710ndfr9yajywhji8mr5gc3j3wnr0alq754q15nh7k73wgbrlv";
       type = "gem";
     };
-    version = "3.4.1";
+    version = "3.4.3";
   };
   webfinger = {
     dependencies = [
@@ -4815,10 +4780,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db";
+      sha256 = "0w1x1k3bkkvi1438kx9qa1b9hn6zff1ykh55278fjrax1nycsa6d";
       type = "gem";
     };
-    version = "3.25.1";
+    version = "3.26.0";
   };
   webpush = {
     dependencies = [
diff --git a/pkgs/servers/mastodon/missing-hashes.json b/pkgs/servers/mastodon/missing-hashes.json
index af1b796f0a53..a1e246d54bbe 100644
--- a/pkgs/servers/mastodon/missing-hashes.json
+++ b/pkgs/servers/mastodon/missing-hashes.json
@@ -37,39 +37,43 @@
   "@parcel/watcher-win32-arm64@npm:2.5.0": "cff6516b1dad597ca1ec8c385cf8251f5050b32ab46fc15360f2eff3a40b61b7107eee56df73764007d9bd6b826960d2f3589c8e0ce270bb5b2a292313bd7a1b",
   "@parcel/watcher-win32-ia32@npm:2.5.0": "ad9d2c9ae3a7031105fc90418050a910d4b679ead36e5fdcbb1b3e4afbaf56aec6566863e3a374c645c82f57073d8f643183f19c67c8c48b0aa62224c05fdb9d",
   "@parcel/watcher-win32-x64@npm:2.5.0": "aa9660bdb2fe70de5163f9f8419e263711fd30612244fb7feb58fce49a653b88ac0e1e29646fb1fc76b86fd8215e62eea5ded0616725987dfca5372041925bd2",
-  "@rollup/rollup-android-arm-eabi@npm:4.40.2": "cb502d6933de94860f9d49a4b4e849a206d10d9b1a424847cb2545667f8937ac891a37854e2934992b39521dc8b8daa2ec6b683da6bb47ef893ab24f9424c887",
-  "@rollup/rollup-android-arm64@npm:4.40.2": "42e04ae6605f8a31cc7daf484f9104e6d2174a99e39d829c24d77780cd257a6dab67f5c6a38e84e5a967ad4a64a042f1e6dfbe75444aa03517e83d8436179726",
-  "@rollup/rollup-darwin-arm64@npm:4.40.2": "8e641fd8a888504c516e76e525a7fcc099d363a82ce8569a1a5bb2fdcf632fa262e1a73b47932a922d132e0c46fab6ba04490053f63e6e4fb30c313a499b139f",
-  "@rollup/rollup-darwin-x64@npm:4.40.2": "9dca62986fa2afef8c5addcb1eb4ee08afbd3aa03ece3c5372a82a785af67ae441b9782dd542018fa5bb39a6de34ea53f10795d6f6f801a0469ce7979c52c729",
-  "@rollup/rollup-freebsd-arm64@npm:4.40.2": "f21c73712c4cb74a797998e8adfa83bb7ff0d6cc3e7353eae5b213b4bb3f9f481e025d37dd67aeee7488b9fc9ecd0bc8f85a61469cfa6592ed9292d14ba868d0",
-  "@rollup/rollup-freebsd-x64@npm:4.40.2": "9f8b6abb5be2527e6cffdaf0dd95a8bbb6f4aa5599be2bfe919e8252f57558f0a06b66748d29cb1e42d0b65e1d2ef0ec2d6a429d3c8a1a85352269d88ffbda17",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.2": "fc205b61c54ddaac7bb45768c3b4bbd79632df3f7bbe65532f5453d54e1a31c1d3f1e4508a00323cf0656d6c5a69f0793989d11fd0805dc2621053c8c6fbcaa3",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.2": "14fde6bac72d734462b9c2fa3594934454069d01422fe12e650ae6fc9e998daac3d43d1726a0aa040cac9d4de43cf75ca34d82932e0a2c3f564f49f0b6fba4af",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.40.2": "1a7c361022d74025076d322cdeb741923f1d3e0d5e1a12fd4dcc678a7c3dc8a07002f6ec4d537b6f089c75b90273cd700580b9ac1b1d45fa68908eadb524f1c7",
-  "@rollup/rollup-linux-arm64-musl@npm:4.40.2": "2fbf7f6f28bfe5148b1a82b04569574bc865b65f6e8f874aa8b175ad3c3ee9197a9a22bc3693153f0d55ff2bd78938b15e162cafa4b77756d1933036b0520bf0",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.2": "ae77d9e7a797868fbd6887b8b4a8a26bcd96ea632022ddc47c570d90ad6e47b2ac0b3a933885c06a0af5ad57b5f818f4531ff6961b351e9705f5af6dd26b2427",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.2": "867b6bc576e07110181f41c588b1a7ee22a6571bf5a3ceff0527c1e7c4540b5122d34b99f0c56c00d5c33a2e517fbb16c3e269cc4c08110e69dc0f0e4b2fbf26",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.2": "52f07f3e5e008cd0d277d5290524682c8ec5c03e08659b07a800fddc00b450dbf8df08612921b9fe6e4e16d60d5e282027d9b260ff520c40bf3e7c5e1efabb60",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.40.2": "6483ab13ac5626c5b94d72aad3ffafe63a3572899824b1d37e59bc071b147f3d498864a0e19942e013a4488aa9262a92817232ca6c38339e3de62c3c4aca87e3",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.40.2": "842ad92a20ff994091d4ba4c16f87e2f8a57e1eb9e3004c20aaeeb692bc2061619dd43ba4dd246712f8904fe1480e6211b43e9fd2e11a5faebbeebea0c79da63",
-  "@rollup/rollup-linux-x64-gnu@npm:4.40.2": "c440df4beca32d238b0a0f0b1017fb30da52c0f705946177c01a08d7d214ae190b2070885d93e15ff5fb5741e0964e1370bdd45f8a94e9a4689816f06f18c5a0",
-  "@rollup/rollup-linux-x64-musl@npm:4.40.2": "9874b4cce42573d460634443ddb730d348360089bf93667309e660301e4e389d8ae80abe7f33fa9a20db5e67984e107e17d1479bdfee278d74bc60dde6ab5f83",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.40.2": "b61552ab831efde1ca4823cab1982d3d681e1be269d67d60558cd2ac86fe3802f6d569300d9ada084acebae27257b00c68f9d858261a579b5d8686956aa92ba0",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.40.2": "13ad059483b26bbf12af5108207d66a98ae2aef7599f27a506b998c781921b653dacc63ee0db57bb6f37c920163fd8bc40072e0be0ec6b1e5f52eb3f1455efeb",
-  "@rollup/rollup-win32-x64-msvc@npm:4.40.2": "98ab8600ecbeab358c53ed563a7b586da0c5cdf26c03456a982a016b2f8eff6e2ec07055d15fe039b982a18a970744390d85a05970c9a8b1533c54702026f8df",
-  "@unrs/resolver-binding-darwin-arm64@npm:1.3.2": "c8c61120e2bead2e0fec054399107e1ebd39455a2b7d59a5446cafad86cca376e0010e65644c41da0958a065869dcbe0509a29394b52a469a48990d32bf7a6e8",
-  "@unrs/resolver-binding-darwin-x64@npm:1.3.2": "ee67a4043d2e297cb1362b7aa25be3f5defef9eb13f4e80358c3f22ffdef043ef905ac661fc9e70359383bafed5837a52bd001b49a8ea4f70372051d89ee6eff",
-  "@unrs/resolver-binding-freebsd-x64@npm:1.3.2": "5f19ef3991435a96e682d427a8d9b28886b4afc9ea5b723e51c4bca51f25bb24add8819ed91c9f228bd39e139d51625cc127ddd35efd6c3f6e1d88106808fad1",
-  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.3.2": "f77b2345c2b572b569089092fa6c08b5a55fdb08d26e1db3cdfa0d195511a0efbe109c558e77bfd78d7aed4ffe47b6542890c9cad032cc00bb0fcd5f373f5090",
-  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.3.2": "8b7156d8c641994c39626522ba42e69eef8d868a69b319c9ea5f7584ef0c4ea98bc698c1a4417d209dd3a786630be404d459680cf5b5b2500d3c4b0eb1be894f",
-  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.3.2": "93b28c2ea0dae2d452659e0afde6099107b70362043e19800e35b7ae86350856dfa0a4d6ba2be566c225965b458b5fba78a10219cf78e6fc0c581373cd2e2a52",
-  "@unrs/resolver-binding-linux-arm64-musl@npm:1.3.2": "49ed9f24838e876eb1bba9b5f3e283af0716ee23f7d11a799a6376a47fa59a2e28b724431ca165a3874d60b1ed5a6b6c7650fe207f0610a788c88baa7862688f",
-  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.3.2": "9fad22ffbf7aadf471a6d054c833a9b4cea74e2c38be40d546e6ba71058a6be10fa4e28947425ef33d42dc77de1c81b631fbff5a96a637c3a7652910f3e27d76",
-  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.3.2": "dd28e351f19268c4735da984e96301d8433603cf109b2b6880aab9bb8f448242699b7f84c36c536ca4a9443f944153098a3d3e78fce26d0c56fe3406d73d4b55",
-  "@unrs/resolver-binding-linux-x64-gnu@npm:1.3.2": "e1cc70d8e012bc61bf5af85c2e9905aa1953c06daaab9b3857d780424c62807ccd0c5a20acb919e3accec7152badee426b1514ab9a4256b77945c3e7c8df3496",
-  "@unrs/resolver-binding-linux-x64-musl@npm:1.3.2": "e97b95e53d029e4ccaf7cf32072e644c495d8e1f097b6fdeb417860db4db4b752d84f5fa6310b9f170a1fbf0562696f0145005dda4a95d658ea0857fac6c51dd",
-  "@unrs/resolver-binding-wasm32-wasi@npm:1.3.2": "d3f16f36ba5dd714ef3eaf7bc57597e9f9a1fab7c6b5fb5dc5bf688d81a1bd4a574da16bd3e2b383181032a71001583b6534c21e5ffde1ee43fcfa95bc292f3b",
-  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.3.2": "de65010d133e99a062827f698a7e50c30db15d9f6b9011d351762cc8809497e97c4617b7d6ca3052583ca3f6b8c3cb1f2857fd0c9afd944c7ebb65d5e1da74f6",
-  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.3.2": "f214a8950e823c60656d2d113584c3cd20c6e92668f43f73c13c3ddfe38a7063615e42537645e2aa52a0652ace9c82e8fd5d9411043a6985ccb49d8dc8bb2595",
-  "@unrs/resolver-binding-win32-x64-msvc@npm:1.3.2": "38ca5f5912d7cddd3f3e1983ad8e79d084ab3f5990189ce8cdfcfc3b58d97cc0dd7b543cc78ff43eb1769d15a8c235339a5942c688ab680192caa4c97116a511"
+  "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8",
+  "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be",
+  "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019",
+  "@rollup/rollup-darwin-x64@npm:4.46.2": "c53e31df756cb8d44e179c167db1ec5d321225561a1aff2b320091c226c2dfafd080a98a1466f2dc697ff0173b52c41d89c60cae97f73b41fbd128d4c87fde66",
+  "@rollup/rollup-freebsd-arm64@npm:4.46.2": "9495d87e670bbea87e43d06df53ae83fcd46e2c82a80927556f3516ac76613b8b7739bbd4b43c3f264bbab57a50a3b6cd2dfa6c1b2741bd3acdeba8af7c47018",
+  "@rollup/rollup-freebsd-x64@npm:4.46.2": "890a965b45f4c4b9beb4696912ee30472180a040dafb24ce32f8811aed4d0d0ee90bf675d234abc6d8e66266d2966a72483fff7e6f1dbd116424b23e18fe38a9",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2": "ce9720f61b4f7d9a791ba78e13cbbea67ef5f46c465e054c08f009cd06de8c1e4518df8e8578366a27cc9ae4280d37528dd0762906a19e820ca1a95158b47090",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.46.2": "b884f568a681d8c13ffdfa77ad6183ed6f7f9fe5bc952b1c82dc21e36b4bc8eb7ee292168929a2575ff5ff14582060d7d73c583aef7edf04fd0bddd67140f4b0",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.46.2": "519477372d8358a4d3f1f1245bc2b5b57b65960f9a7d02bc5795ba68aed471fe87b20391a63c334bf0abb94085ad8c89d8d3b2e4d79ca0fed702537e9a0949eb",
+  "@rollup/rollup-linux-arm64-musl@npm:4.46.2": "a5dec7799dd832b5374171a73a6b57cffef8be317482dd9ea4e6554db6fc8afb4bdb91ec725502f1b378aa9cb9a1333684056d55c9120262cb7744a33b961a76",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2": "76ebbf40535f68c6922edf7d866dad00608cd475c8436d199653341ea09124cb4478f67c12d32b5363634f3f811926acb14a086eb146a1fe6b310fdbde01f2c8",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.46.2": "31b62a51393e0f2608e1133701523e894ff5d04038e3d9af95abf595ab7fbe827167a651b200e9975d0e76904699cde3428aa1afbf46bf939f836f8ef90b1d88",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.46.2": "4f22bc5fe58730026085d1a5372b51d9ed933b314cde2d3dec1d73ad76106406915c313d331f094176ed917863c0041667e63184d9730da7107b11266dad477f",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.46.2": "1bc37b77ac38d7e82e7d661b67fc043a1db01272a0566e5432c61e3c7a5e6c11b5ecb4a49547da2de33a8e0a7b0d685f3c7341572fa77c90e9b71e515f753e86",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.46.2": "1b1821a848d8bf86fa5e01ae57f60ebe5566cbcb0c605b5d05050821e94b8b45a72515ef302a3021196018b289aaffade5c41a5f89b3f8324d509a25d28dcfc4",
+  "@rollup/rollup-linux-x64-gnu@npm:4.46.2": "66231802689c1ac1d6ecec6fd65d14c01c900537e588808e0a2c92ba34e322665bb6df3853500717cf600f40a93de4c490838290e21bb10eed4249f587a08109",
+  "@rollup/rollup-linux-x64-musl@npm:4.46.2": "064ed54e9ddb05eec1b5da5ac8366f3290b7b65e63959a76a26d6940ce44d741c30488e39ce94c51a2679b2c56217c2e0aaf74e123a1c0928503712c115d6047",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7",
+  "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
 }
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 8f28667c1604..a57f431d4789 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,17 +5,17 @@
   patches ? [ ],
 }:
 let
-  version = "4.4.7";
+  version = "4.5.0";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-jm8qqgYEQMDB/5p/iQecFAGIIazPuv4ruoVgy9YSlVU=";
+    hash = "sha256-06OXK4lscmEX6qDy2GRnO2plZW2ngQoqS/9FiVgsgeM=";
     passthru = {
       inherit version;
-      yarnHash = "sha256-K1EqeLi4dWnaLIaUU5apxE5ZOM98XBn6KTHWTkPLWE0=";
+      yarnHash = "sha256-FxJe18DBfdEhbuWoFem/ozbbiUD9R/+BjHuwNGK+jRY=";
       yarnMissingHashes = ./missing-hashes.json;
     };
   };
diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh
index 6874b8223c3b..75d7e9b74540 100755
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@@ -113,6 +113,6 @@ echo "" >> gemset.nix  # Create trailing newline to please EditorConfig checks
 
 echo "Updating yarnHash"
 yarn-berry-fetcher missing-hashes "$SOURCE_DIR/yarn.lock" > missing-hashes.json
-YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" 2>/dev/null)"
+YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" ./missing-hashes.json 2>/dev/null)"
 sed -i "s;sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=;$YARN_HASH;g" source.nix
 
diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index 64ae1151400e..48b422fd72c7 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -30,16 +30,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2025-09-07T16-13-09Z";
+  version = "2025-10-15T17-29-55Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    hash = "sha256-0IVxxeM+h3josP+wnS3q4Nrmd3fT9V+KlHxlwz3QyIQ=";
+    hash = "sha256-HbjmCJYkWyRRHKriLP6QohaXYLk3QEVfi32Krq3ujjo=";
   };
 
-  vendorHash = "sha256-JrDLUVGtwYqwwB+Suutewi6snHyIpG3DOnDn5O0C+L0=";
+  vendorHash = "sha256-BFnTJE9QFWmPsx90hDTG8MusdnwaBPYJxM5bCFk3hew=";
 
   doCheck = false;
 
diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index ce14d98b2c8d..f28c27aded5b 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -149,6 +149,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (lib.strings.versionAtLeast version "2.22.0") [
     mesa.llvmpipeHook
+  ]
+  ++ lib.optionals (lib.strings.versionAtLeast version "2.23.0") [
+    xwayland
   ];
 
   checkInputs = [
@@ -235,7 +238,9 @@ stdenv.mkDerivation (finalAttrs: {
       onny
       OPNA2608
     ];
-    platforms = lib.platforms.linux;
+    # Onle LE has valid graphics buffer formats
+    # https://github.com/canonical/mir/blob/ba8e83f75084379dec8e23131fdf04fa4a4567ac/src/platforms/common/server/shm_buffer.cpp#L61-L65
+    platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.littleEndian;
     pkgConfigModules = [
       "miral"
       "mircommon"
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index afbe51c40186..bf354a75dd68 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,8 +5,8 @@ let
 in
 {
   mir = common {
-    version = "2.22.2";
-    hash = "sha256-AZUdj/ctBeBa3BUnmaC6NdyCO0XXBx5xMG7zPoh6ARc=";
+    version = "2.23.0";
+    hash = "sha256-Sib2dxNDxyJCJwxuP8TVphdZvnkrn+8/t7cnEjfXIsw=";
   };
 
   mir_2_15 = common {
diff --git a/pkgs/servers/mobilizon/common.nix b/pkgs/servers/mobilizon/common.nix
index 15dd8337a01c..54f59210b2a6 100644
--- a/pkgs/servers/mobilizon/common.nix
+++ b/pkgs/servers/mobilizon/common.nix
@@ -2,13 +2,13 @@
 rec {
 
   pname = "mobilizon";
-  version = "5.1.5";
+  version = "5.2.0";
 
   src = fetchFromGitLab {
     domain = "framagit.org";
     owner = "kaihuri";
     repo = pname;
     tag = version;
-    hash = "sha256-nwEmW43GO0Ta7O7mUSJaEtm4hBfXInPqatBRdaWrhBU=";
+    hash = "sha256-wsiu0f0M0SMjgskMJuA/wUx6IxT7bTzHrOnxX8eFq9g=";
   };
 }
diff --git a/pkgs/servers/mobilizon/default.nix b/pkgs/servers/mobilizon/default.nix
index 2d0de84a77cf..22dc3be2c832 100644
--- a/pkgs/servers/mobilizon/default.nix
+++ b/pkgs/servers/mobilizon/default.nix
@@ -75,12 +75,12 @@ mixRelease rec {
         };
         icalendar = buildMix rec {
           name = "icalendar";
-          version = "unstable-2022-04-10";
+          version = "1.1.2";
           src = fetchFromGitHub {
-            owner = "tcitworld";
+            owner = "mobilizon-tools";
             repo = name;
-            rev = "1033d922c82a7223db0ec138e2316557b70ff49f";
-            hash = "sha256-N3bJZznNazLewHS4c2B7LP1lgxd1wev+EWVlQ7rOwfU=";
+            rev = "b8fc5360b1755f60f2768d40f6aca949ef598a00";
+            hash = "sha256-UAdlYTRt1itkR/dmC2/AM89MlJIABJw9N0XfYR6IcVI=";
           };
           beamDeps = with final; [
             mix_test_watch
diff --git a/pkgs/servers/mobilizon/frontend.nix b/pkgs/servers/mobilizon/frontend.nix
index 8a5ca34f9a1f..4feda08bda9e 100644
--- a/pkgs/servers/mobilizon/frontend.nix
+++ b/pkgs/servers/mobilizon/frontend.nix
@@ -11,7 +11,7 @@ in
 buildNpmPackage {
   inherit (common) pname version src;
 
-  npmDepsHash = "sha256-5ilhuFaIvksXsJmNu20m8MV3hYtyPUz4zp8NIvhR5Nw=";
+  npmDepsHash = "sha256-0eemOn96ciiqdNBZC+cFbcaEvZ5nkV9IndsXOzIgelQ=";
 
   nativeBuildInputs = [ imagemagick ];
 
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 524ba2fa4c0e..eac1cb5e7ec6 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -19,7 +19,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana";
-  version = "12.2.0";
+  version = "12.2.1";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
     owner = "grafana";
     repo = "grafana";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EFqR+du+ZeWih7+s4iVVAiwOvTwbF1pNg1TntkoGCEQ=";
+    hash = "sha256-fOlf+NTV1DIotC0JyG+PCMe8uPr+mfe/CLQP7dmRtkg=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -46,12 +46,12 @@ buildGoModule (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-BqlkFgWiU5gruDHjkazNy6GKL2KgpcrwaHXDYNBF9EY=";
+    hash = "sha256-aXWi2hriPHm1Gsmd6Zg8eTR//KuI6SrvJAYhTeRZTug=";
   };
 
   disallowedRequisites = [ finalAttrs.offlineCache ];
 
-  vendorHash = "sha256-yoOs9MngUCfvvK9rPUsXCoSc5LiRs0g66KdINLQzO8Q=";
+  vendorHash = "sha256-TvKG/fUBure2wiZDVFD7dHGVDBl8gqWRkv2YBYNcIDQ=";
 
   # Grafana seems to just set it to the latest version available
   # nowadays.
@@ -64,7 +64,7 @@ buildGoModule (finalAttrs: {
   # This is still better than maintaining some list of go.mod files (or exclusions of that)
   # where to patch the go version (and where to not do that).
   postPatch = ''
-    find . -name go.mod -or -name "go.work" -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \;
+    find . \( -name go.mod -or -name "go.work" \) -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \;
   '';
 
   proxyVendor = true;
diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
index c8dc591c7e2a..fc797bcd6ee5 100644
--- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "frser-sqlite-datasource";
-  version = "3.8.0";
-  zipHash = "sha256-wk0zEGQjDdz8bIc7e5aiaqg7AaTS6u8zp+WJy5YlWlQ=";
+  version = "3.8.2";
+  zipHash = "sha256-TJMKHB1loDiBrTWKpIUNfcMTBXhorxqvLrdBEuUspto=";
   meta = with lib; {
     description = "Use a SQLite database as a data source in Grafana";
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
index f4719d630acb..aba6765ee233 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-exploretraces-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-exploretraces-app";
-  version = "1.1.3";
-  zipHash = "sha256-0i9ndLOUXisJJk2sV0Xt0NC8KNn2k5/cIRS/G0jS8Ks=";
+  version = "1.2.0";
+  zipHash = "sha256-QXBOODMgFJvPLgr1Gr6mkpW2YJwYlDO/ZXL3BlEhEJ0=";
   meta = with lib; {
     description = "Opinionated traces app";
     license = licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index 321fe4e51cd4..d7edfda21e87 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "1.0.26";
-  zipHash = "sha256-7EztpeZIpDu/ner9EOiOjoh3J/GBgYWpZoh3usXyPqo=";
+  version = "1.0.30";
+  zipHash = "sha256-K22UgO5wdZk6G4zgJk84+sanj2GVoroJdooLNLu40ts=";
   meta = with lib; {
     description = "Browse Loki logs without the need for writing complex queries";
     license = licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index 82cef311a141..6cc805a77800 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "1.0.15";
-  zipHash = "sha256-E6D/FIegif6nkuKh8IL5ZADZB+KXHTSDLO4jmPejpmc=";
+  version = "1.0.20";
+  zipHash = "sha256-dRIUWFmQ3r39nMHJ9pnCgjrOENQhuoKKSoZeFKNW0YM=";
   meta = with lib; {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
index fd2ec7dbff1e..30f779b77fd9 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-pyroscope-app";
-  version = "1.8.1";
-  zipHash = "sha256-dAjvcWUtk518lx4eHalJJxUVSna9+A/Ow9mmsrBX+nQ=";
+  version = "1.11.0";
+  zipHash = "sha256-FaojRLlE+fv5hPE45wW9Id/21icrus3bDSCLs3xsmm4=";
   meta = with lib; {
     description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data";
     license = licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
index e18ded79c605..48b6ab5607f8 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-calendar-panel";
-  version = "4.1.0";
-  zipHash = "sha256-SQIzKCfBo0UDqwrl7ZkbHq2F+ddwviLYVQbgi+zsT20=";
+  version = "4.2.0";
+  zipHash = "sha256-GQcLaeTvbHTdbH5NWa0SL5rUP9WTQOqy38ndZb4/rA8=";
   meta = with lib; {
     description = "Calendar Panel is a Grafana plugin that displays events from various data sources";
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
index 579088e408eb..8dea64d08d3d 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-dynamictext-panel";
-  version = "6.0.0";
-  zipHash = "sha256-OfQWEwEu+c0DvuACddBM5wjXZWxr6D3QP/N4KUQfQ+k=";
+  version = "6.2.0";
+  zipHash = "sha256-pxTmylBvI73csDM6rMoUjGN9EM5zR/PfH1ZE1XKW94c=";
   meta = with lib; {
     description = "Dynamic, data-driven text panel for Grafana";
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
index 0290ba43d438..650816940857 100644
--- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "ventura-psychrometric-panel";
-  version = "5.0.3";
-  zipHash = "sha256-uGrLxbGNQa82dDhImZHaPAv0GbgV1SwgCHq6q4BjTUs=";
+  version = "5.0.4";
+  zipHash = "sha256-bBPESByCux0X711UjmT5bQrJDz1BC9+9EGOOJ4jqcj0=";
   meta = with lib; {
     description = "Grafana plugin to display air conditions on a psychrometric chart";
     license = licenses.bsd3Lbnl;
diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
index a6e0f428b585..bf240083f806 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-logs-datasource";
-  version = "0.21.0";
-  zipHash = "sha256-KesSzORt243WS9sR+iinq+wRI6q+8MPn8o9Bj2ic6E0=";
+  version = "0.21.1";
+  zipHash = "sha256-mhGxUt+JWX4i/CYcJOAYpCszF4F2ieaosERVoFUg/mU=";
   meta = {
     description = "Grafana datasource for VictoriaLogs";
     license = lib.licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
index 7159eb0747d2..fb1eb86c3063 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-metrics-datasource";
-  version = "0.19.4";
-  zipHash = "sha256-gpbBPyzWWiz9cENBWEHyDqBRMXypiEDDgdYFuQnsD5o=";
+  version = "0.19.5";
+  zipHash = "sha256-wKLtfCI/onYPFrtP1EUrCbZ+OCHicshRZkZtltH6LzI=";
   meta = {
     description = "VictoriaMetrics metrics datasource for Grafana";
     license = lib.licenses.agpl3Only;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
index ef4dc23cd78f..39e53f921201 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-echarts-panel";
-  version = "7.1.0";
-  zipHash = "sha256-J4FhMh50+zcBpURQgIoVZQxQaNy0oYk/7SbIqQjkEyA=";
+  version = "7.2.2";
+  zipHash = "sha256-4y7L8SSqjtQ2bk+v8FeZsZ8gTd9qnBvi2F9cNLPjKGE=";
   meta = with lib; {
     description = "Visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard";
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
index 0e684bba8b5d..e514350b0431 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-form-panel";
-  version = "6.2.0";
-  zipHash = "sha256-o7P2hQBHsSd9qZh1QMlzkJtwo8ug+3E0aEofJf1wukk=";
+  version = "6.3.1";
+  zipHash = "sha256-HuzhTWey/6xLu6GPXGnN4/D3rs7yJ2sPGzO8PPuZmNA=";
   meta = with lib; {
     description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard";
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index dbfb4c90a859..c018e0503c2b 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "4.1.0";
-  zipHash = "sha256-3AkCebT9KcQdsi+T3+0XMhwZaEmqlOmY90RidcVqUb4=";
+  version = "5.1.1";
+  zipHash = "sha256-lLzOCgOh4a/Ee6QO5gJkJkHoPzylk9Y3vilXBtvn5G8=";
   meta = with lib; {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = licenses.asl20;
diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 23eeb36baadf..18b4dc52e323 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "alertmanager";
-  version = "0.28.1";
+  version = "0.29.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    hash = "sha256-2HHQ7S1J/X4PVFnPbi8Oapsqf1MyNnsqfMMBJRItWf0=";
+    hash = "sha256-2uP4JCbQEe7/en5sBq/k73kqK6YVmuLvfiUy1fqPitw=";
   };
 
-  vendorHash = "sha256-4XWHe32UZ+1HOQzQdZX4leoPD6pfJZwyjDQV3dv164s=";
+  vendorHash = "sha256-bN1iV2JrrjwiiIXr5lp389HvEoQGteJQD94cug0/048=";
 
   subPackages = [
     "cmd/alertmanager"
diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
index 308f1af399ff..ac91d6fda6dc 100644
--- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
@@ -7,13 +7,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.5.0";
+  version = "3.5.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-uFCIM+pZiJ6nvapEKjgHRrIuc5p5uq5q1ToD36e19zk=";
+    hash = "sha256-BsNjzqGSH5Pn+deL2rM0XMVvpGdRfzuo4vzbG4I5Mtw=";
   };
 
   build-system = [
diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
index 051c26dce25c..357e056dafc1 100644
--- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nut-exporter";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "DRuggeri";
     repo = "nut_exporter";
     rev = "v${version}";
-    sha256 = "sha256-TqBwvOuhcnQbJBfzJ8nc3EYVo8fyCPwne+vEYZeX9/I=";
+    sha256 = "sha256-p1IUJOSY7dXAzSPBpKvDKvy4etM3q3oI5OXg6l+3KLw=";
   };
 
   vendorHash = "sha256-cMZ4GSal03LIZi7ESr/sQx8zLHNepOTZGEEsdvsNhec=";
diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix
index 72aa74ae48f4..5a5420149c4d 100644
--- a/pkgs/servers/monitoring/prometheus/prom2json.nix
+++ b/pkgs/servers/monitoring/prometheus/prom2json.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "prom2json";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "prometheus";
     repo = "prom2json";
-    sha256 = "sha256-3A26xMXJv2MMpFoc0zKZdSLg9WCueIsKdRdyM2NsUJw=";
+    sha256 = "sha256-Zd3p1anHleKAkFcHEx7tgpxjTlb5OvdWXFNNyfJ63+w=";
   };
 
-  vendorHash = "sha256-2XZYc6byupFTR2HCAVSL3wLYWwuzkkhqegzZRTakcgI=";
+  vendorHash = "sha256-PZXuhPpO02ix88RtBpsGaQxgQNVn+LW09rrN66+mCpw=";
 
   meta = with lib; {
     description = "Tool to scrape a Prometheus client and dump the result as JSON";
diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 449d57588efe..628171355276 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.78.0";
+  version = "1.80.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-Nj2SvnKk04kTVm4O1v809WslW/egKVsZO0b9zTKIoWQ=";
+    sha256 = "sha256-52MOgevF5UtyP6c+lsStNeF7/Z1H2jcIYqSzq5mhdpA=";
   };
 
-  vendorHash = "sha256-7/7O61tOEUsRVkFVkmOiHqgxmFDmwaw8s97aOQr89Mg=";
+  vendorHash = "sha256-MkwkwfH7/hqJ89soHOGeR8iznXoNb/5Rbyg6tqcEhOg=";
 
   ldflags = [
     "-X main.BuildVersion=${version}"
diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix
index 34ee532cc939..8c5ca2884e30 100644
--- a/pkgs/servers/monitoring/prometheus/script-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix
@@ -11,13 +11,13 @@ buildGoModule rec {
   '';
 
   pname = "script_exporter";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "ricoberger";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-09WpxXPNk2Pza9RrD3OLru4aY0LR98KgsHK7It/qRgs=";
+    hash = "sha256-fewhI47nfO95PXYUndaPFAXVyfQPWsoYy1J1pwd4SNs=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildGoModule rec {
     sed -i '/func TestHandler/a\\    t.Skip("skipped in Nix build")' prober/handler_test.go
   '';
 
-  vendorHash = "sha256-Rs7P7uVvfhWteiR10LeG4fWZqbNqDf3QQotgNvTMTX4=";
+  vendorHash = "sha256-kzt84Zu24HJNaQeerx8M1YpMF4808K+/K6kVw5AbqVY=";
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) script; };
 
diff --git a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
index 7173b606e2f1..53a8de613d2d 100644
--- a/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/snmp-exporter.nix
@@ -30,7 +30,6 @@ buildGoModule rec {
     homepage = "https://github.com/prometheus/snmp_exporter";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      oida
       Frostman
     ];
   };
diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 2332e8dbfb2f..0930b0e983f2 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -12,7 +12,7 @@ generic: {
     hash = "sha256-ML7wFzSTsZk3fJBhs06KLhaijrDW9+nHuUJDPkt1Nn8=";
   };
   v60 = generic {
-    version = "6.0.41";
-    hash = "sha256-E5dtwTdSMV4RIR90eEqh+2keDYmeKWeEDRM0PuA4dxM=";
+    version = "6.0.42";
+    hash = "sha256-Ale517dbuqzjmBMYqJlAtY01F9Bd+W7spegjTHyTJWA=";
   };
 }
diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 51c0d542a9f6..af9700088145 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,14 +59,14 @@ let
 in
 {
   nextcloud31 = generic {
-    version = "31.0.9";
-    hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g=";
+    version = "31.0.10";
+    hash = "sha256-6FZxPwIo8+Ju6F72+ZFetNBYwNIYML1Y7l10K+3wpmk=";
     packages = nextcloud31Packages;
   };
 
   nextcloud32 = generic {
-    version = "32.0.0";
-    hash = "sha256-V0SNVdm4cQLxfDY0cyA0ahslj2AXxjuVjHie/ULjRaM=";
+    version = "32.0.1";
+    hash = "sha256-WBCwbnVng4SXPY2GOH7jn0wIbXnfqS8V/LdDqro26qk=";
     packages = nextcloud32Packages;
   };
 
diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index bcd148dce727..55f39fe8aba3 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec {
   # in nixpkgs!
   # For that, check the `<dependencies>` section of `appinfo/info.xml`
   # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "notify_push";
     tag = "v${version}";
-    hash = "sha256-zefoazreNUc3agbdeQRusYWwGNDZnC375ZlLlG+SPeg=";
+    hash = "sha256-yEls1s7tD/fcqul/BmEsRf2g5mqD74M8TKG+Na3jlcM=";
   };
 
   cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     app = fetchNextcloudApp {
       appName = "notify_push";
       appVersion = version;
-      hash = "sha256-KIgXruwYPTLmpO3bMbEcm9jlRYjqX8JgTJt5hd7QugM=";
+      hash = "sha256-Yad1+kc0uCHRV4q7IDbQT8Ea2423YWGy9k42DHB0R1Q=";
       license = "agpl3Plus";
       homepage = "https://github.com/nextcloud/notify_push";
       url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";
diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 7e09c6e53010..0c4a2d4ba82d 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -20,19 +20,19 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-G/cGq9rxdP9bJEMXSf2Vc+cECDPAS4Gbg/YPGiD4xAY=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.6/calendar-v5.5.6.tar.gz",
-    "version": "5.5.6",
-    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
+    "hash": "sha256-mbv/3DkjDmnKAaz9ZeV2qSEC2DVu+PAg/XQI0qDRjfs=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v5.5.7/calendar-v5.5.7.tar.gz",
+    "version": "5.5.7",
+    "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
       "agpl"
     ]
   },
   "collectives": {
-    "hash": "sha256-VQawIQzg8+/W1NsKtnFY7noIQuYJXZV84S7NkOPb3xQ=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.0/collectives-3.2.0.tar.gz",
-    "version": "3.2.0",
+    "hash": "sha256-ezFo8Vv8qFNzW9ZevcOmZdKBtmpDY6SpRqX4R/2UT1E=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.4/collectives-3.2.4.tar.gz",
+    "version": "3.2.4",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-E9CV7fJzIFmSyfdUxQrol9mr/VJKxEJTqsaSWbHw3yg=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.3/contacts-v7.3.3.tar.gz",
-    "version": "7.3.3",
+    "hash": "sha256-aViRCE48yy52yz7xSVlNKR6yFCVdu9hfjysL81QjazU=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.5/contacts-v7.3.5.tar.gz",
+    "version": "7.3.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -50,9 +50,9 @@
     ]
   },
   "cookbook": {
-    "hash": "sha256-pdmltxubvC2+h5U5edTB8X5M8WW+wBShIEpkbR0yaQ0=",
-    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.4/cookbook-0.11.4.tar.gz",
-    "version": "0.11.4",
+    "hash": "sha256-Bw5Oga5zawiicIR9tOLSflK0258Uy7q/9zJsXS5Ggd4=",
+    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.5/cookbook-0.11.5.tar.gz",
+    "version": "0.11.5",
     "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
     "homepage": "https://github.com/nextcloud/cookbook/",
     "licenses": [
@@ -60,9 +60,9 @@
     ]
   },
   "cospend": {
-    "hash": "sha256-20k/ZoJ7OTDKW8RF0Nv/1wDVO7GtX2lZk5EUv173HuM=",
-    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.3/cospend-3.1.3.tar.gz",
-    "version": "3.1.3",
+    "hash": "sha256-KD2l6qakEgPrnogJcLNZfO+/OUYnVI7Jn8NtWOweWHc=",
+    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.6/cospend-3.1.6.tar.gz",
+    "version": "3.1.6",
     "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)",
     "homepage": "https://github.com/julien-nc/cospend-nc",
     "licenses": [
@@ -93,7 +93,7 @@
     "hash": "sha256-Wojv/UzDT9v9bVaC8K7GqaQYVTE4GoRG2ztHALZktLk=",
     "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.17.0/end_to_end_encryption-v1.17.0.tar.gz",
     "version": "1.17.0",
-    "description": "Provides the necessary endpoint to enable end-to-end encryption.\n\n**Notice:** E2EE is currently not compatible to be used together with server-side encryption",
+    "description": "This app provides all the necessary APIs to implement End-to-End encryption on the client side.\nAdditionally it implements Secure FileDrop and makes sure that End-to-End encrypted files are neither accessible via the web interface nor other WebDAV clients.",
     "homepage": "https://github.com/nextcloud/end_to_end_encryption",
     "licenses": [
       "agpl"
@@ -130,9 +130,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-P2QfOnJ5xbAaIIRNHyd8T4BZipyOAPO7W+hm7Dq+9pE=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.1/forms-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "hash": "sha256-gUFrPO3Dxxhx0qvXNML7EeNOtiz0UaC2Xegk78+BZj8=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.2/forms-v5.2.2.tar.gz",
+    "version": "5.2.2",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -140,9 +140,9 @@
     ]
   },
   "gpoddersync": {
-    "hash": "sha256-anBa8RiQ4oEM95fp08elIMu3jO0pIelRp35JxK7UflQ=",
-    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.1/gpoddersync.tar.gz",
-    "version": "3.13.1",
+    "hash": "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=",
+    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz",
+    "version": "3.13.2",
     "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod",
     "homepage": "https://github.com/thrillfall/nextcloud-gpodder",
     "licenses": [
@@ -150,10 +150,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-4q/7Hyy66bdpRG7iYHsrJaGle6+eCRkGihGnl4EQ2mA=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.7/groupfolders-v19.1.7.tar.gz",
-    "version": "19.1.7",
-    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.",
+    "hash": "sha256-eng9qg6yZsRj1N+ycl2l2AjFwbLrdGGMcUjiP4bqA3E=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v19.1.8/groupfolders-v19.1.8.tar.gz",
+    "version": "19.1.8",
+    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-8/J1oQ7aVaroYYy2HtQyDpDw7vTtgkE+Rzzy6ySC2Tg=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.7/mail-v5.5.7.tar.gz",
-    "version": "5.5.7",
+    "hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
+    "version": "5.5.11",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -220,9 +220,9 @@
     ]
   },
   "music": {
-    "hash": "sha256-iVti/js0+7iuBkIFvlvKWwRLBSroFJbGTBRQZ5cvxH8=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.4.0/music_2.4.0_for_nextcloud.tar.gz",
-    "version": "2.4.0",
+    "hash": "sha256-dFY3/jlZc0uuE3d26A/kBjZ7FtM1BJdc1Wq8SrlsnME=",
+    "url": "https://github.com/owncloud/music/releases/download/v2.4.1/music_2.4.1_for_nextcloud.tar.gz",
+    "version": "2.4.1",
     "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
     "homepage": "https://github.com/owncloud/music",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
-    "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
-    "version": "27.0.0",
+    "hash": "sha256-bKIEeRVmDoDjab8dusdG+q7Ms/gaOUFUyCH1C1pKJ04=",
+    "url": "https://github.com/nextcloud/news/releases/download/27.1.0/news.tar.gz",
+    "version": "27.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -350,9 +350,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-jXYNk3adLm+Umxx/pCrKeNidq6M9ayTquJFMU3eM8Rw=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.5/richdocuments-v8.7.5.tar.gz",
-    "version": "8.7.5",
+    "hash": "sha256-W6P+2T2QDWI3/jsAHoPMfAaY7l3N8IyF7G/FwVNKeXg=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v8.7.6/richdocuments-v8.7.6.tar.gz",
+    "version": "8.7.6",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -360,9 +360,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz",
-    "version": "6.2.2",
+    "hash": "sha256-/vYEBgrlTImksgNfJafTvIiBxAZ8obwou8YjDM2P+aw=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.3/release.tar.gz",
+    "version": "6.2.3",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -380,25 +380,35 @@
     ]
   },
   "tables": {
-    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
-    "version": "0.9.5",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
+    "version": "1.0.0",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
     "homepage": "https://github.com/nextcloud/tables",
     "licenses": [
       "agpl"
     ]
   },
   "tasks": {
-    "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
-    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
-    "version": "0.16.1",
+    "hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
+    "url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
+    "version": "0.17.0",
     "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
     "homepage": "https://github.com/nextcloud/tasks/",
     "licenses": [
       "agpl"
     ]
   },
+  "theming_customcss": {
+    "hash": "sha256-tDU6GIGX5PFr6+iBYjUl4iGcZKUmc/3MUBt5xD561uw=",
+    "url": "https://github.com/nextcloud-releases/theming_customcss/releases/download/v1.19.0/theming_customcss.tar.gz",
+    "version": "1.19.0",
+    "description": "Adjust the Nextcloud theme with custom CSS",
+    "homepage": "",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "twofactor_admin": {
     "hash": "sha256-zZvH7xfSooKBG4CKvSuf8D/6KnKEunLa+DRLAkWGoow=",
     "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.8.0/twofactor_admin.tar.gz",
@@ -450,9 +460,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-F92W+jiK8OJ7o/Q4tVsbAfxOSH3uhxkvjomm1ZkTZXM=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.0.0/user_oidc-v8.0.0.tar.gz",
-    "version": "8.0.0",
+    "hash": "sha256-e4RnB1CQkQRv4Nl/9oHg0XBhuhrSzqGGsnXSsd0HwbY=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.1.0/user_oidc-v8.1.0.tar.gz",
+    "version": "8.1.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -470,9 +480,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-2CSc9gRXAHaKiq4KfVl+44eWhtBFgjHYbMeTwE18xuA=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.3.0/whiteboard-v1.3.0.tar.gz",
-    "version": "1.3.0",
+    "hash": "sha256-i8qk1RZrLbF0Mex4lgVZp092ZrsUvosYeiLcJ4WMosQ=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.4.0/whiteboard-v1.4.0.tar.gz",
+    "version": "1.4.0",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index f8a338b81268..f0eaf8531e14 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -10,19 +10,19 @@
     ]
   },
   "calendar": {
-    "hash": "sha256-z1O9J5R5QSisgpce7SudzOYkSvsn/zjbXCWN3Toxpo4=",
-    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.0.1/calendar-v6.0.1.tar.gz",
-    "version": "6.0.1",
-    "description": "The Calendar app is a user interface for Nextcloud's CalDAV server. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Contacts - more to come.\n* 🌐 **WebCal Support!** Want to see your favorite team’s matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚️ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 Search! Find your events at ease\n* ☑️ Tasks! See tasks with a due date directly in the calendar\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
+    "hash": "sha256-t94XXn0KKe3262Xb0kSu5MU1KymHrO22epOhn2bAlOw=",
+    "url": "https://github.com/nextcloud-releases/calendar/releases/download/v6.0.2/calendar-v6.0.2.tar.gz",
+    "version": "6.0.2",
+    "description": "A Calendar app for Nextcloud. Easily sync events from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Like Contacts, Talk, Tasks, Deck and Circles\n* 🌐 **WebCal Support!** Want to see your favorite team's matchdays in your calendar? No problem!\n* 🙋 **Attendees!** Invite people to your events\n* ⌚ **Free/Busy!** See when your attendees are available to meet\n* ⏰ **Reminders!** Get alarms for events inside your browser and via email\n* 🔍 **Search!** Find your events at ease\n* ☑️ **Tasks!** See tasks or Deck cards with a due date directly in the calendar\n* 🔈 **Talk rooms!** Create an associated Talk room when booking a meeting with just one click\n* 📆 **Appointment booking** Send people a link so they can book an appointment with you [using this app](https://apps.nextcloud.com/apps/appointments)\n* 📎 **Attachments!** Add, upload and view event attachments\n* 🙈 **We’re not reinventing the wheel!** Based on the great [c-dav library](https://github.com/nextcloud/cdav-library), [ical.js](https://github.com/mozilla-comm/ical.js) and [fullcalendar](https://github.com/fullcalendar/fullcalendar) libraries.",
     "homepage": "https://github.com/nextcloud/calendar/",
     "licenses": [
       "agpl"
     ]
   },
   "collectives": {
-    "hash": "sha256-VQawIQzg8+/W1NsKtnFY7noIQuYJXZV84S7NkOPb3xQ=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.0/collectives-3.2.0.tar.gz",
-    "version": "3.2.0",
+    "hash": "sha256-ezFo8Vv8qFNzW9ZevcOmZdKBtmpDY6SpRqX4R/2UT1E=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.4/collectives-3.2.4.tar.gz",
+    "version": "3.2.4",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-5ngZ2RHJxy0ZMFtj1PbnifMuAT828UYhfi7ofdu0M9Y=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.0.3/contacts-v8.0.3.tar.gz",
-    "version": "8.0.3",
+    "hash": "sha256-DKCZD5wMZu2yWy6Wjv2/L8ZQG1nBgtXJmUEsAVICFjo=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.0.5/contacts-v8.0.5.tar.gz",
+    "version": "8.0.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "cookbook": {
-    "hash": "sha256-pdmltxubvC2+h5U5edTB8X5M8WW+wBShIEpkbR0yaQ0=",
-    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.4/cookbook-0.11.4.tar.gz",
-    "version": "0.11.4",
+    "hash": "sha256-Bw5Oga5zawiicIR9tOLSflK0258Uy7q/9zJsXS5Ggd4=",
+    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.5/cookbook-0.11.5.tar.gz",
+    "version": "0.11.5",
     "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
     "homepage": "https://github.com/nextcloud/cookbook/",
     "licenses": [
@@ -50,9 +50,9 @@
     ]
   },
   "cospend": {
-    "hash": "sha256-20k/ZoJ7OTDKW8RF0Nv/1wDVO7GtX2lZk5EUv173HuM=",
-    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.3/cospend-3.1.3.tar.gz",
-    "version": "3.1.3",
+    "hash": "sha256-KD2l6qakEgPrnogJcLNZfO+/OUYnVI7Jn8NtWOweWHc=",
+    "url": "https://github.com/julien-nc/cospend-nc/releases/download/v3.1.6/cospend-3.1.6.tar.gz",
+    "version": "3.1.6",
     "description": "# Nextcloud Cospend 💰\n\nNextcloud Cospend is a group/shared budget manager. It was inspired by the great [IHateMoney](https://github.com/spiral-project/ihatemoney/).\n\nYou can use it when you share a house, when you go on vacation with friends, whenever you share expenses with a group of people.\n\nIt lets you create projects with members and bills. Each member has a balance computed from the project bills. Balances are not an absolute amount of money at members disposal but rather a relative information showing if a member has spent more for the group than the group has spent for her/him, independently of exactly who spent money for whom. This way you can see who owes the group and who the group owes. Ultimately you can ask for a settlement plan telling you which payments to make to reset members balances.\n\nProject members are independent from Nextcloud users. Projects can be shared with other Nextcloud users or via public links.\n\n[MoneyBuster](https://gitlab.com/eneiluj/moneybuster) Android client is [available in F-Droid](https://f-droid.org/packages/net.eneiluj.moneybuster/) and on the [Play store](https://play.google.com/store/apps/details?id=net.eneiluj.moneybuster).\n\n[PayForMe](https://github.com/mayflower/PayForMe) iOS client is currently under developpement!\n\nThe private and public APIs are documented using [the Nextcloud OpenAPI extractor](https://github.com/nextcloud/openapi-extractor/). This documentation can be accessed directly in Nextcloud. All you need is to install Cospend (>= v1.6.0) and use the [the OCS API Viewer app](https://apps.nextcloud.com/apps/ocs_api_viewer) to browse the OpenAPI documentation.\n\n## Features\n\n* ✎ Create/edit/delete projects, members, bills, bill categories, currencies\n* ⚖ Check member balances\n* 🗠 Display project statistics\n* ♻ Display settlement plan\n* Move bills from one project to another\n* Move bills to trash before actually deleting them\n* Archive old projects before deleting them\n* 🎇 Automatically create reimbursement bills from settlement plan\n* 🗓 Create recurring bills (day/week/month/year)\n* 📊 Optionally provide custom amount for each member in new bills\n* 🔗 Link personal files to bills (picture of physical receipt for example)\n* 👩 Public links for people outside Nextcloud (can be password protected)\n* 👫 Share projects with Nextcloud users/groups/circles\n* 🖫 Import/export projects as csv (compatible with csv files from IHateMoney and SplitWise)\n* 🔗 Generate link/QRCode to easily add projects in MoneyBuster\n* 🗲 Implement Nextcloud notifications and activity stream\n\nThis app usually support the 2 or 3 last major versions of Nextcloud.\n\nThis app is under development.\n\n🌍 Help us to translate this app on [Nextcloud-Cospend/MoneyBuster Crowdin project](https://crowdin.com/project/moneybuster).\n\n⚒ Check out other ways to help in the [contribution guidelines](https://github.com/julien-nc/cospend-nc/blob/master/CONTRIBUTING.md).\n\n## Documentation\n\n* [User documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/user.md)\n* [Admin documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/admin.md)\n* [Developer documentation](https://github.com/julien-nc/cospend-nc/blob/master/docs/dev.md)\n* [CHANGELOG](https://github.com/julien-nc/cospend-nc/blob/master/CHANGELOG.md#change-log)\n* [AUTHORS](https://github.com/julien-nc/cospend-nc/blob/master/AUTHORS.md#authors)\n\n## Known issues\n\n* It does not make you rich\n\nAny feedback will be appreciated.\n\n\n\n## Donation\n\nI develop this app during my free time.\n\n* [Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=66PALMY8SF5JE) (you don't need a paypal account)\n* [Donate with Liberapay : ![Donate using Liberapay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/eneiluj/donate)",
     "homepage": "https://github.com/julien-nc/cospend-nc",
     "licenses": [
@@ -79,6 +79,16 @@
       "agpl"
     ]
   },
+  "end_to_end_encryption": {
+    "hash": "sha256-NCa5t+ksbHeBhL0YpEjD4m5dj0wAQIkc6YrepAn08TM=",
+    "url": "https://github.com/nextcloud-releases/end_to_end_encryption/releases/download/v1.18.0/end_to_end_encryption-v1.18.0.tar.gz",
+    "version": "1.18.0",
+    "description": "This app provides all the necessary APIs to implement End-to-End encryption on the client side.\nAdditionally it implements Secure FileDrop and makes sure that End-to-End encrypted files are neither accessible via the web interface nor other WebDAV clients.",
+    "homepage": "https://github.com/nextcloud/end_to_end_encryption",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "files_automatedtagging": {
     "hash": "sha256-D4WHfQLtSYr0WCxOSfAzmoMn9ti/i3EahgNDD4xGzkU=",
     "url": "https://github.com/nextcloud-releases/files_automatedtagging/releases/download/v3.0.0/files_automatedtagging-v3.0.0.tar.gz",
@@ -100,9 +110,9 @@
     ]
   },
   "forms": {
-    "hash": "sha256-P2QfOnJ5xbAaIIRNHyd8T4BZipyOAPO7W+hm7Dq+9pE=",
-    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.1/forms-v5.2.1.tar.gz",
-    "version": "5.2.1",
+    "hash": "sha256-gUFrPO3Dxxhx0qvXNML7EeNOtiz0UaC2Xegk78+BZj8=",
+    "url": "https://github.com/nextcloud-releases/forms/releases/download/v5.2.2/forms-v5.2.2.tar.gz",
+    "version": "5.2.2",
     "description": "**Simple surveys and questionnaires, self-hosted!**\n\n- **📝 Simple design:** No mass of options, only the essentials. Works well on mobile of course.\n- **📊 View & export results:** Results are visualized and can also be exported as CSV in the same format used by Google Forms.\n- **🔒 Data under your control!** Unlike in Google Forms, Typeform, Doodle and others, the survey info and responses are kept private on your instance.\n- **🧑‍💻 Connect to your software:** Easily integrate Forms into your service with our full-fledged [REST-API](https://github.com/nextcloud/forms/blob/main/docs/API.md).\n- **🙋 Get involved!** We have lots of stuff planned like more question types, collaboration on forms, [and much more](https://github.com/nextcloud/forms/milestones)!",
     "homepage": "https://github.com/nextcloud/forms",
     "licenses": [
@@ -110,9 +120,9 @@
     ]
   },
   "gpoddersync": {
-    "hash": "sha256-anBa8RiQ4oEM95fp08elIMu3jO0pIelRp35JxK7UflQ=",
-    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.1/gpoddersync.tar.gz",
-    "version": "3.13.1",
+    "hash": "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=",
+    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz",
+    "version": "3.13.2",
     "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod",
     "homepage": "https://github.com/thrillfall/nextcloud-gpodder",
     "licenses": [
@@ -120,10 +130,10 @@
     ]
   },
   "groupfolders": {
-    "hash": "sha256-v9EMLcD2gVlyBKrDiORK/VGeNvI4aKCXonunRxwqnuQ=",
-    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.1/groupfolders-v20.1.1.tar.gz",
-    "version": "20.1.1",
-    "description": "Admin configured folders shared with everyone in a team.\n\nFolders can be configured from *Team folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more teams, control their write/sharing permissions and assign a quota for the folder.\nAs of Hub 10/Nextcloud 31, the admin needs to be a part of the team to be able to assign it a Teamfolder.",
+    "hash": "sha256-aGE2bwq5phZHThYxErqV/8wYGAmtVVT1/4Rmo8zcIUY=",
+    "url": "https://github.com/nextcloud-releases/groupfolders/releases/download/v20.1.2/groupfolders-v20.1.2.tar.gz",
+    "version": "20.1.2",
+    "description": "Admin configured folders shared with everyone in a group.\n\nFolders can be configured from *Group folders* in the admin settings.\n\nAfter a folder is created, the admin can give access to the folder to one or more groups, control their write/sharing permissions and assign a quota for the folder.\n\nNote: Encrypting the contents of group folders is currently not supported.",
     "homepage": "https://github.com/nextcloud/groupfolders",
     "licenses": [
       "agpl"
@@ -170,9 +180,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-8/J1oQ7aVaroYYy2HtQyDpDw7vTtgkE+Rzzy6ySC2Tg=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.7/mail-v5.5.7.tar.gz",
-    "version": "5.5.7",
+    "hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
+    "version": "5.5.11",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -180,9 +190,9 @@
     ]
   },
   "music": {
-    "hash": "sha256-iVti/js0+7iuBkIFvlvKWwRLBSroFJbGTBRQZ5cvxH8=",
-    "url": "https://github.com/owncloud/music/releases/download/v2.4.0/music_2.4.0_for_nextcloud.tar.gz",
-    "version": "2.4.0",
+    "hash": "sha256-dFY3/jlZc0uuE3d26A/kBjZ7FtM1BJdc1Wq8SrlsnME=",
+    "url": "https://github.com/owncloud/music/releases/download/v2.4.1/music_2.4.1_for_nextcloud.tar.gz",
+    "version": "2.4.1",
     "description": "A stand-alone music player app and a \"lite\" player for the Files app\n\n- On modern browsers, supports audio types .mp3, .ogg, .m4a, .m4b, .flac, .wav, and more\n- Playlist support with import from .m3u, .m3u8, .pls, and .wpl files\n- Show lyrics from the file metadata or .lrc files\n- Browse by artists, albums, genres, or folders\n- Gapless play\n- Filter the shown content with the search function\n- Advanced search to freely use and combine dozens of search criteria\n- Play internet radio and podcast channels\n- Setup Last.fm connection to see background information on artists, albums, and songs\n- Control with media control keys on the keyboard or OS\n- The app can handle libraries consisting of thousands of albums and tens of thousands of songs\n- Includes a server backend compatible with the Subsonic and Ampache protocols, allowing playback and browsing of your library on dozens of external apps on Android, iOS, Windows, Linux, etc.\n- Widget for the Nextcloud Dashboard",
     "homepage": "https://github.com/owncloud/music",
     "licenses": [
@@ -190,9 +200,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
-    "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
-    "version": "27.0.0",
+    "hash": "sha256-bKIEeRVmDoDjab8dusdG+q7Ms/gaOUFUyCH1C1pKJ04=",
+    "url": "https://github.com/nextcloud/news/releases/download/27.1.0/news.tar.gz",
+    "version": "27.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -300,9 +310,9 @@
     ]
   },
   "richdocuments": {
-    "hash": "sha256-7cLCcb18m3Of0BovTucR37zckdon6LyjiXg5OwKmWHU=",
-    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.0.0/richdocuments-v9.0.0.tar.gz",
-    "version": "9.0.0",
+    "hash": "sha256-tODtwJNNCxdHvAOfi1tXFwFcfeQL5RGBad+ZcXqBNiU=",
+    "url": "https://github.com/nextcloud-releases/richdocuments/releases/download/v9.0.1/richdocuments-v9.0.1.tar.gz",
+    "version": "9.0.1",
     "description": "This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.\n\nYou can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.",
     "homepage": "https://collaboraoffice.com/",
     "licenses": [
@@ -310,9 +320,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz",
-    "version": "6.2.2",
+    "hash": "sha256-/vYEBgrlTImksgNfJafTvIiBxAZ8obwou8YjDM2P+aw=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.3/release.tar.gz",
+    "version": "6.2.3",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -320,9 +330,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-tWWFUrJ5XQdXYb8BfoxHCFrMCKj+cwLit1zkoJtWfwk=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.0/spreed-v22.0.0.tar.gz",
-    "version": "22.0.0",
+    "hash": "sha256-w1rNmKWWhPbwhcc6F8WX5ouW8zsrl6vqpHQZGlHdSJM=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.2/spreed-v22.0.2.tar.gz",
+    "version": "22.0.2",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -330,15 +340,45 @@
     ]
   },
   "tables": {
-    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
-    "version": "0.9.5",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
+    "version": "1.0.0",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
     "homepage": "https://github.com/nextcloud/tables",
     "licenses": [
       "agpl"
     ]
   },
+  "tasks": {
+    "hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
+    "url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
+    "version": "0.17.0",
+    "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
+    "homepage": "https://github.com/nextcloud/tasks/",
+    "licenses": [
+      "agpl"
+    ]
+  },
+  "theming_customcss": {
+    "hash": "sha256-tDU6GIGX5PFr6+iBYjUl4iGcZKUmc/3MUBt5xD561uw=",
+    "url": "https://github.com/nextcloud-releases/theming_customcss/releases/download/v1.19.0/theming_customcss.tar.gz",
+    "version": "1.19.0",
+    "description": "Adjust the Nextcloud theme with custom CSS",
+    "homepage": "",
+    "licenses": [
+      "agpl"
+    ]
+  },
+  "twofactor_admin": {
+    "hash": "sha256-zZvH7xfSooKBG4CKvSuf8D/6KnKEunLa+DRLAkWGoow=",
+    "url": "https://github.com/nextcloud-releases/twofactor_admin/releases/download/v4.8.0/twofactor_admin.tar.gz",
+    "version": "4.8.0",
+    "description": "This two-factor auth (2FA) provider for Nextcloud allows admins to generate a one-time\n\t\tcode for users to log into a 2FA protected account. This is helpful in situations where\n\t\tusers have lost access to their other 2FA methods or mandatory 2FA without any previously\n\t\tenabled 2FA provider.",
+    "homepage": "",
+    "licenses": [
+      "agpl"
+    ]
+  },
   "twofactor_webauthn": {
     "hash": "sha256-B1Oje5oX68i9Q/IGFvxjN9Q+78Snq3yusgkgd8Mh3LQ=",
     "url": "https://github.com/nextcloud-releases/twofactor_webauthn/releases/download/v2.4.1/twofactor_webauthn-v2.4.1.tar.gz",
@@ -370,9 +410,9 @@
     ]
   },
   "user_oidc": {
-    "hash": "sha256-F92W+jiK8OJ7o/Q4tVsbAfxOSH3uhxkvjomm1ZkTZXM=",
-    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.0.0/user_oidc-v8.0.0.tar.gz",
-    "version": "8.0.0",
+    "hash": "sha256-e4RnB1CQkQRv4Nl/9oHg0XBhuhrSzqGGsnXSsd0HwbY=",
+    "url": "https://github.com/nextcloud-releases/user_oidc/releases/download/v8.1.0/user_oidc-v8.1.0.tar.gz",
+    "version": "8.1.0",
     "description": "Allows flexible configuration of an OIDC server as Nextcloud login user backend.",
     "homepage": "https://github.com/nextcloud/user_oidc",
     "licenses": [
@@ -390,9 +430,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-2CSc9gRXAHaKiq4KfVl+44eWhtBFgjHYbMeTwE18xuA=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.3.0/whiteboard-v1.3.0.tar.gz",
-    "version": "1.3.0",
+    "hash": "sha256-i8qk1RZrLbF0Mex4lgVZp092ZrsUvosYeiLcJ4WMosQ=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.4.0/whiteboard-v1.4.0.tar.gz",
+    "version": "1.4.0",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/nextcloud-apps.json b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
index 09f5f318e4ea..9fd9ccfe2f75 100644
--- a/pkgs/servers/nextcloud/packages/nextcloud-apps.json
+++ b/pkgs/servers/nextcloud/packages/nextcloud-apps.json
@@ -18,8 +18,8 @@
 , "gpoddersync": "agpl3Only"
 , "groupfolders": "agpl3Plus"
 , "impersonate": "agpl3Plus"
-, "integration_openai": "agpl3Only"
 , "integration_deepl": "agpl3Plus"
+, "integration_openai": "agpl3Only"
 , "integration_paperless": "agpl3Plus"
 , "mail": "agpl3Plus"
 , "maps": "agpl3Plus"
@@ -32,8 +32,8 @@
 , "phonetrack": "agpl3Plus"
 , "polls": "agpl3Plus"
 , "previewgenerator": "agpl3Plus"
-, "quota_warning": "agpl3Plus"
 , "qownnotesapi": "agpl3Plus"
+, "quota_warning": "agpl3Plus"
 , "registration": "agpl3Plus"
 , "repod": "agpl3Plus"
 , "richdocuments": "agpl3Only"
@@ -41,6 +41,7 @@
 , "spreed": "agpl3Plus"
 , "tables": "agpl3Only"
 , "tasks": "agpl3Plus"
+, "theming_customcss": "agpl3Plus"
 , "twofactor_admin": "agpl3Plus"
 , "twofactor_nextcloud_notification": "agpl3Only"
 , "twofactor_totp": "agpl3Plus"
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index df62ae38885a..670a974307b6 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -8,10 +8,10 @@
 
 stdenv.mkDerivation rec {
   pname = "apache-jena";
-  version = "5.5.0";
+  version = "5.6.0";
   src = fetchurl {
     url = "mirror://apache/jena/binaries/apache-jena-${version}.tar.gz";
-    hash = "sha256-atRcW9U3PjX/E3QhTa6dBfvb19Rb3n6ROpLeGinGD1U=";
+    hash = "sha256-s5qmzKBrED7U1Qm0Lu5RI5QIiFnfK1NnqFiSe/H85yg=";
   };
   nativeBuildInputs = [
     makeWrapper
diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix
index 2009607e8421..17f3be0cd410 100644
--- a/pkgs/servers/nosql/mongodb/7.0.nix
+++ b/pkgs/servers/nosql/mongodb/7.0.nix
@@ -21,8 +21,8 @@ let
 in
 buildMongoDB {
   inherit avxSupport;
-  version = "7.0.24";
-  sha256 = "sha256-ANPg60OAxwwq1FhRTMOQ0dHBOuKpob1sXnAZMJWhtds=";
+  version = "7.0.25";
+  sha256 = "sha256-RAJg1uXGZKi9qOPvW9UK/j0JFTftL8YwGcE7YnZ4Tks=";
   patches = [
     # ModuleNotFoundError: No module named 'mongo_tooling_metrics':
     # NameError: name 'SConsToolingMetrics' is not defined:
diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix
index 985dbda33bdf..f532e9b09322 100644
--- a/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -169,8 +169,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  hardeningEnable = [ "pie" ];
-
   meta = with lib; {
     description = "Scalable, high-performance, open source NoSQL database";
     homepage = "http://www.mongodb.org";
diff --git a/pkgs/servers/openafs/1.8/default.nix b/pkgs/servers/openafs/1.8/default.nix
index d5c5645e95bb..51e1981d509f 100644
--- a/pkgs/servers/openafs/1.8/default.nix
+++ b/pkgs/servers/openafs/1.8/default.nix
@@ -154,7 +154,6 @@ stdenv.mkDerivation {
     license = licenses.ipl10;
     platforms = platforms.linux;
     maintainers = [
-      maintainers.maggesi
       maintainers.spacefrogg
     ];
   };
diff --git a/pkgs/servers/openafs/1.8/module.nix b/pkgs/servers/openafs/1.8/module.nix
index 93987d4d2023..566437fe7319 100644
--- a/pkgs/servers/openafs/1.8/module.nix
+++ b/pkgs/servers/openafs/1.8/module.nix
@@ -162,7 +162,6 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [
       andersk
-      maggesi
       spacefrogg
     ];
     broken = kernel.isHardened;
diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index a66ab9b3a9e9..4a84ca165693 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -79,11 +79,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "samba";
-  version = "4.22.3";
+  version = "4.22.5";
 
   src = fetchurl {
     url = "https://download.samba.org/pub/samba/stable/samba-${finalAttrs.version}.tar.gz";
-    hash = "sha256-j9cJJimjWW2TXNdWfZNJeflCcpGOw6/9DMgHk07PIro=";
+    hash = "sha256-2FZqFdPb/At3fR6Puy7umIoCTKnHhtysZd0QNHMHQA0=";
   };
 
   outputs = [
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index e93d3e4cd950..7042b1d6c015 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -6,6 +6,7 @@
   perl,
   zlib,
   db,
+  nixosTests,
 }:
 
 let
@@ -69,6 +70,8 @@ stdenv.mkDerivation rec {
   # Copy the web examples for the NixOS module
   postInstall = "cp -R sampleWeb $webSamples";
 
+  passthru.tests.nixos = nixosTests.sks;
+
   meta = with lib; {
     description = "Easily deployable & decentralized OpenPGP keyserver";
     longDescription = ''
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 752e9d0440ca..2ffe92954ffb 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -116,10 +116,15 @@ let
         prePatch = ''
           sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
         '';
-        env = lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isGnu) {
-          # MariaDB uses non-POSIX fopen64, which musl only conditionally defines.
-          NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
-        };
+        env =
+          lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isGnu) {
+            # MariaDB uses non-POSIX fopen64, which musl only conditionally defines.
+            NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
+          }
+          // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
+            # Detection of netdb.h doesnt work for some reason on x86_64-darwin
+            NIX_CFLAGS_COMPILE = "-DHAVE_NETDB_H";
+          };
 
         patches = [
           ./patch/cmake-includedir.patch
diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix
index 548630c1f9c0..b3cee0fa68a2 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/pkgs/servers/sql/mssql/jdbc/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mssql-jdbc";
-  version = "13.2.0";
+  version = "13.2.1";
 
   src = fetchurl {
     url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
-    sha256 = "sha256-zC6aTII/79PMJvLY9wEw7EhaUwhZ4F6H2N7zcr7mzKc=";
+    sha256 = "sha256-dgOW6pYXDM7p60FoQjFBdbZUoUhDmjSmH+0Ud2SFsBk=";
   };
 
   dontUnpack = true;
diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index 3345c368a6da..9b158fad46d6 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.0.43";
+  version = "8.0.44";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-diUKgQFch49iUhz68w3/DqmyUJeNKx3/AHQIo5jV25M=";
+    hash = "sha256-YJUi7R/vzlqziN7CXg0bzhMjgtom4rd7aPB0HApkE1Y=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 8cdca01efb1e..ff1f517af0e8 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.0.42-33";
+  version = "8.0.43-34";
 
   src = fetchurl {
-    url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-UDdmBz1RVjX/kRivvk69GPdtjLjWTglKxteiLxXKQGc=";
+    url = "https://downloads.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
+    hash = "sha256-RGm144c1WfNm62MsfCMeAapwDBucE8zoaQhdvh7JID4=";
   };
 
   nativeBuildInputs = [
@@ -63,8 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
-    # adapted from mysql80's llvm 19 fixes
-    ./libcpp-fixes.patch
     # fixes using -DWITH_SSL=system with CMAKE_PREFIX_PATH on darwin
     # https://github.com/Homebrew/homebrew-core/pull/204799
     (fetchpatch {
diff --git a/pkgs/servers/sql/percona-server/libcpp-fixes.patch b/pkgs/servers/sql/percona-server/libcpp-fixes.patch
deleted file mode 100644
index 7e8de096415e..000000000000
--- a/pkgs/servers/sql/percona-server/libcpp-fixes.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git a/include/my_char_traits.h b/include/my_char_traits.h
-new file mode 100644
-index 00000000000..6336bc039c8
---- /dev/null
-+++ b/include/my_char_traits.h
-@@ -0,0 +1,65 @@
-+/* Copyright (c) 2024, Oracle and/or its affiliates.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License, version 2.0,
-+   as published by the Free Software Foundation.
-+
-+   This program is designed to work with certain software (including
-+   but not limited to OpenSSL) that is licensed under separate terms,
-+   as designated in a particular file or component or in included license
-+   documentation.  The authors of MySQL hereby grant you an additional
-+   permission to link the program and your derivative works with the
-+   separately licensed software that they have either included with
-+   the program or referenced in the documentation.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License, version 2.0, for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-+
-+#ifndef MY_CHAR_TRAITS_INCLUDED
-+#define MY_CHAR_TRAITS_INCLUDED
-+
-+#include <cstring>
-+
-+template <class CharT>
-+struct my_char_traits;
-+
-+/*
-+  This is a standards-compliant, drop-in replacement for
-+    std::char_traits<unsigned char>
-+  We need this because clang libc++ is removing support for it in clang 19.
-+  It is not a complete implementation. Rather we implement just enough to
-+  compile any usage of char_traits<uchar> we have in our codebase.
-+ */
-+template <>
-+struct my_char_traits<unsigned char> {
-+  using char_type = unsigned char;
-+  using int_type = unsigned int;
-+
-+  static void assign(char_type &c1, const char_type &c2) { c1 = c2; }
-+
-+  static char_type *assign(char_type *s, std::size_t n, char_type a) {
-+    return static_cast<char_type *>(memset(s, a, n));
-+  }
-+
-+  static int compare(const char_type *s1, const char_type *s2, std::size_t n) {
-+    return memcmp(s1, s2, n);
-+  }
-+
-+  static char_type *move(char_type *s1, const char_type *s2, std::size_t n) {
-+    if (n == 0) return s1;
-+    return static_cast<char_type *>(memmove(s1, s2, n));
-+  }
-+
-+  static char_type *copy(char_type *s1, const char_type *s2, std::size_t n) {
-+    if (n == 0) return s1;
-+    return static_cast<char_type *>(memcpy(s1, s2, n));
-+  }
-+};
-+
-+#endif  // MY_CHAR_TRAITS_INCLUDED
-diff --git a/sql/mdl_context_backup.h b/sql/mdl_context_backup.h
-index 89e7e23df34..cf9c307ec2d 100644
---- a/sql/mdl_context_backup.h
-+++ b/sql/mdl_context_backup.h
-@@ -28,6 +28,7 @@
- #include <map>
- #include <memory>
- 
-+#include "my_char_traits.h"
- #include "sql/malloc_allocator.h"
- #include "sql/mdl.h"
- 
-@@ -47,7 +48,8 @@ class MDL_context_backup_manager {
-   /**
-     Key for uniquely identifying MDL_context in the MDL_context_backup map.
-   */
--  typedef std::basic_string<uchar> MDL_context_backup_key;
-+  using MDL_context_backup_key =
-+      std::basic_string<uchar, my_char_traits<uchar>>;
- 
-   class MDL_context_backup;
- 
-diff --git a/sql/range_optimizer/index_range_scan_plan.cc b/sql/range_optimizer/index_range_scan_plan.cc
-index 74fbb100397..8ed1f50da33 100644
---- a/sql/range_optimizer/index_range_scan_plan.cc
-+++ b/sql/range_optimizer/index_range_scan_plan.cc
-@@ -54,6 +54,8 @@
- #include "sql/thr_malloc.h"
- #include "sql_string.h"
- 
-+#include "my_char_traits.h"
-+
- using opt_range::null_element;
- using std::max;
- using std::min;
-@@ -1025,8 +1027,8 @@ static bool null_part_in_key(KEY_PART *key_part, const uchar *key,
- 
- // TODO(sgunders): This becomes a bit simpler with C++20's string_view
- // constructors.
--static inline std::basic_string_view<uchar> make_string_view(const uchar *start,
--                                                             const uchar *end) {
-+static inline std::basic_string_view<uchar, my_char_traits<uchar>>
-+make_string_view(const uchar *start, const uchar *end) {
-   return {start, static_cast<size_t>(end - start)};
- }
- 
-diff --git a/sql/stream_cipher.h b/sql/stream_cipher.h
-index 606d40645c6..358fbb41959 100644
---- a/sql/stream_cipher.h
-+++ b/sql/stream_cipher.h
-@@ -28,6 +28,8 @@
- #include <memory>
- #include <string>
- 
-+#include "my_char_traits.h"
-+
- /**
-   @file stream_cipher.h
- 
-@@ -35,7 +37,8 @@
-          binary log files.
- */
- 
--typedef std::basic_string<unsigned char> Key_string;
-+using Key_string =
-+    std::basic_string<unsigned char, my_char_traits<unsigned char>>;
- 
- /**
-   @class Stream_cipher
-diff --git a/unittest/gunit/binlogevents/transaction_compression-t.cc b/unittest/gunit/binlogevents/transaction_compression-t.cc
-index ba13f979aa3..01af0e3a360 100644
---- a/unittest/gunit/binlogevents/transaction_compression-t.cc
-+++ b/unittest/gunit/binlogevents/transaction_compression-t.cc
-@@ -23,6 +23,7 @@
- */
- 
- #include <array>
-+#include <string>
- 
- #include <gtest/gtest.h>
- #include "libbinlogevents/include/binary_log.h"
-@@ -51,14 +52,13 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
-   using Managed_buffer_t = Decompressor_t::Managed_buffer_t;
-   using Size_t = Decompressor_t::Size_t;
-   using Char_t = Decompressor_t::Char_t;
--  using String_t = std::basic_string<Char_t>;
-   using Decompress_status_t =
-       binary_log::transaction::compression::Decompress_status;
-   using Compress_status_t =
-       binary_log::transaction::compression::Compress_status;
- 
--  static String_t constant_data(Size_t size) {
--    return String_t(size, (Char_t)'a');
-+  static std::string constant_data(Size_t size) {
-+    return std::string(size, (Char_t)'a');
-   }
- 
-  protected:
-@@ -69,7 +69,7 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
-   void TearDown() override {}
- 
-   static void compression_idempotency_test(Compressor_t &c, Decompressor_t &d,
--                                           String_t data) {
-+                                           const std::string &data) {
-     auto debug_string = concat(
-         binary_log::transaction::compression::type_to_string(c.get_type_code()),
-         " ", data.size());
-@@ -104,8 +104,8 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
- 
-     // Check decompressed data
-     ASSERT_EQ(managed_buffer.read_part().size(), data.size()) << debug_string;
--    ASSERT_EQ(data, String_t(managed_buffer.read_part().begin(),
--                             managed_buffer.read_part().end()))
-+    ASSERT_EQ(data, std::string(managed_buffer.read_part().begin(),
-+                                managed_buffer.read_part().end()))
-         << debug_string;
- 
-     // Check that we reached EOF
-@@ -118,7 +118,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressZstdTest) {
-   for (auto size : buffer_sizes) {
-     binary_log::transaction::compression::Zstd_dec d;
-     binary_log::transaction::compression::Zstd_comp c;
--    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
-+    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-     c.set_compression_level(22);
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-@@ -129,7 +129,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressNoneTest) {
-   for (auto size : buffer_sizes) {
-     binary_log::transaction::compression::None_dec d;
-     binary_log::transaction::compression::None_comp c;
--    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
-+    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-   }
- }
diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix
index 0fe5c4b5e734..1be386255117 100644
--- a/pkgs/servers/sql/postgresql/ext.nix
+++ b/pkgs/servers/sql/postgresql/ext.nix
@@ -7,6 +7,8 @@ in
   directory = ./ext;
 })
 // {
+  inherit (super) callPackage;
+
   timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
 }
 // lib.optionalAttrs (!self.perlSupport) {
diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index 410bcd6966f8..23958e28a7cc 100644
--- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -23,7 +23,8 @@ buildPgrxExtension {
 
   passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql;
 
-  meta = lib.getAttrs [ "homepage" "teams" "license" ] pg-dump-anon.meta // {
+  meta = {
+    inherit (pg-dump-anon.meta) homepage teams license;
     description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database";
   };
 }
diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
index 449be22a31ec..f4cb17b0d4c7 100644
--- a/pkgs/servers/sql/postgresql/ext/lantern.nix
+++ b/pkgs/servers/sql/postgresql/ext/lantern.nix
@@ -21,6 +21,9 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   postPatch = ''
+    substituteInPlace lantern_hnsw/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+
     patchShebangs --build lantern_hnsw/scripts/link_llvm_objects.sh
   '';
 
diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index fa58af91cb6c..1d9bd45d3680 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_ivm";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchFromGitHub {
     owner = "sraoss";
     repo = "pg_ivm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UeRcxoUkpPw4EcQXKUxHamjczOaE59d00kSrYsijnH8=";
+    hash = "sha256-DKU5jwnRo/kMycnq4nAdQTiZwv/wXybyjXLtz4xdaBo=";
   };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 0fee40dfa741..cba7355f595b 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_partman";
-  version = "5.3.0";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "pgpartman";
     repo = "pg_partman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Lib7UY06qjv95ndwx3sjPBcL5MtsLNx8IVOpZ1CgDG8=";
+    hash = "sha256-LK+z/0puUuNLz2ah/SDaxxyLS/On/cmCBhKNwTLa7Pk=";
   };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 8131f5d49ed8..d56ef90deba4 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -10,7 +10,7 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_repack";
-  version = "1.5.2";
+  version = "1.5.3";
 
   buildInputs = postgresql.buildInputs;
 
@@ -18,7 +18,7 @@ postgresqlBuildExtension (finalAttrs: {
     owner = "reorg";
     repo = "pg_repack";
     tag = "ver_${finalAttrs.version}";
-    hash = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA=";
+    hash = "sha256-Ufh/dKrKumRKeQ/CpwvxbjAmgILAn04BduPZMRvS+nU=";
   };
 
   passthru.updateScript = gitUpdater {
diff --git a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
index 3eef7dbefa06..af53308f0613 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_uuidv7.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_uuidv7";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "fboulnois";
     repo = "pg_uuidv7";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lG6dCnbLALnfQc4uclqXXXfYjK/WXLV0lo5I8l1E5p4=";
+    hash = "sha256-1zZT3HqRnVw2pIkxFmXqYwYenXGbM91JB0jTwsdtgnw=";
   };
 
   meta = {
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch b/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch
index e022abb63205..82d7b83680bc 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch
@@ -1,27 +1,12 @@
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..f654689
+index 0000000..09ad763
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,2806 @@
+@@ -0,0 +1,2765 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
-+version = 3
-+
-+[[package]]
-+name = "addr2line"
-+version = "0.24.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-+dependencies = [
-+ "gimli",
-+]
-+
-+[[package]]
-+name = "adler2"
-+version = "2.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
++version = 4
 +
 +[[package]]
 +name = "ahash"
@@ -29,21 +14,27 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 +dependencies = [
-+ "getrandom 0.2.15",
++ "getrandom 0.2.16",
 + "once_cell",
 + "version_check",
 +]
 +
 +[[package]]
 +name = "aho-corasick"
-+version = "1.1.3"
++version = "1.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
++checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 +dependencies = [
 + "memchr",
 +]
 +
 +[[package]]
++name = "allocator-api2"
++version = "0.2.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
++
++[[package]]
 +name = "anes"
 +version = "0.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -51,67 +42,42 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "annotate-snippets"
-+version = "0.9.2"
++version = "0.11.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
++checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
 +dependencies = [
++ "anstyle",
 + "unicode-width",
-+ "yansi-term",
 +]
 +
 +[[package]]
 +name = "anstyle"
-+version = "1.0.10"
++version = "1.0.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
++checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 +
 +[[package]]
 +name = "anyhow"
-+version = "1.0.97"
++version = "1.0.100"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
++checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 +
 +[[package]]
 +name = "async-trait"
-+version = "0.1.88"
++version = "0.1.89"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
++checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
-+name = "atomic-traits"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f"
-+dependencies = [
-+ "cfg-if 1.0.0",
-+ "rustc_version",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "autocfg"
-+version = "1.4.0"
++version = "1.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-+
-+[[package]]
-+name = "backtrace"
-+version = "0.3.74"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
-+dependencies = [
-+ "addr2line",
-+ "cfg-if 1.0.0",
-+ "libc",
-+ "miniz_oxide",
-+ "object",
-+ "rustc-demangle",
-+ "windows-targets",
-+]
++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 +
 +[[package]]
 +name = "base64"
@@ -121,9 +87,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "bindgen"
-+version = "0.70.1"
++version = "0.71.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
++checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 +dependencies = [
 + "annotate-snippets",
 + "bitflags",
@@ -135,7 +101,7 @@ index 0000000..f654689
 + "regex",
 + "rustc-hash",
 + "shlex",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -155,9 +121,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "bitflags"
-+version = "2.9.0"
++version = "2.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
++checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 +
 +[[package]]
 +name = "bitvec"
@@ -182,9 +148,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "bumpalo"
-+version = "3.17.0"
++version = "3.19.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 +
 +[[package]]
 +name = "bytecheck"
@@ -222,11 +188,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "camino"
-+version = "1.1.9"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
++checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 +dependencies = [
-+ "serde",
++ "serde_core",
 +]
 +
 +[[package]]
@@ -246,7 +212,7 @@ index 0000000..f654689
 +dependencies = [
 + "camino",
 + "cargo-platform",
-+ "semver 1.0.26",
++ "semver",
 + "serde",
 + "serde_json",
 + "thiserror 1.0.69",
@@ -254,9 +220,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "cargo_toml"
-+version = "0.19.2"
++version = "0.22.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be"
++checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
 +dependencies = [
 + "serde",
 + "toml",
@@ -270,10 +236,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "cc"
-+version = "1.2.17"
++version = "1.2.44"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
++checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 +dependencies = [
++ "find-msvc-tools",
 + "shlex",
 +]
 +
@@ -304,9 +271,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "cfg-if"
-+version = "1.0.0"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 +
 +[[package]]
 +name = "ciborium"
@@ -332,7 +299,7 @@ index 0000000..f654689
 +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 +dependencies = [
 + "ciborium-io",
-+ "half 2.5.0",
++ "half 2.7.1",
 +]
 +
 +[[package]]
@@ -348,9 +315,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "clap"
-+version = "4.5.32"
++version = "4.5.51"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
++checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 +dependencies = [
 + "clap_builder",
 + "clap_derive",
@@ -369,9 +336,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "clap_builder"
-+version = "4.5.32"
++version = "4.5.51"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
++checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 +dependencies = [
 + "anstyle",
 + "clap_lex",
@@ -379,36 +346,39 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "clap_derive"
-+version = "4.5.32"
++version = "4.5.49"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
++checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 +dependencies = [
 + "heck",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "clap_lex"
-+version = "0.7.4"
++version = "0.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
++checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 +
 +[[package]]
-+name = "convert_case"
-+version = "0.6.0"
++name = "codepage"
++version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
++checksum = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4"
 +dependencies = [
-+ "unicode-segmentation",
++ "encoding_rs",
 +]
 +
 +[[package]]
-+name = "core-foundation-sys"
-+version = "0.8.7"
++name = "convert_case"
++version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
++checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
++dependencies = [
++ "unicode-segmentation",
++]
 +
 +[[package]]
 +name = "cpufeatures"
@@ -482,9 +452,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "crunchy"
-+version = "0.2.3"
++version = "0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
++checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 +
 +[[package]]
 +name = "crypto-common"
@@ -515,7 +485,7 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -525,6 +495,15 @@ index 0000000..f654689
 +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 +
 +[[package]]
++name = "encoding_rs"
++version = "0.8.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
++dependencies = [
++ "cfg-if 1.0.4",
++]
++
++[[package]]
 +name = "enum-map"
 +version = "2.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -541,7 +520,7 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -552,12 +531,12 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "errno"
-+version = "0.3.10"
++version = "0.3.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
++checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 +dependencies = [
 + "libc",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -583,10 +562,16 @@ index 0000000..f654689
 +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 +
 +[[package]]
-+name = "fixedbitset"
-+version = "0.4.2"
++name = "find-msvc-tools"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
++checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
++
++[[package]]
++name = "fixedbitset"
++version = "0.5.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 +
 +[[package]]
 +name = "fnv"
@@ -595,10 +580,16 @@ index 0000000..f654689
 +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 +
 +[[package]]
-+name = "form_urlencoded"
-+version = "1.2.1"
++name = "foldhash"
++version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
++
++[[package]]
++name = "form_urlencoded"
++version = "1.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 +dependencies = [
 + "percent-encoding",
 +]
@@ -658,17 +649,6 @@ index 0000000..f654689
 +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 +
 +[[package]]
-+name = "futures-macro"
-+version = "0.3.31"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
 +name = "futures-sink"
 +version = "0.3.31"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -689,7 +669,6 @@ index 0000000..f654689
 + "futures-channel",
 + "futures-core",
 + "futures-io",
-+ "futures-macro",
 + "futures-sink",
 + "futures-task",
 + "memchr",
@@ -700,9 +679,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "generic-array"
-+version = "0.14.7"
++version = "0.14.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
++checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 +dependencies = [
 + "typenum",
 + "version_check",
@@ -710,38 +689,32 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.2.15"
++version = "0.2.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
++checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "libc",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
++ "wasi",
 +]
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.3.2"
++version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "libc",
 + "r-efi",
-+ "wasi 0.14.2+wasi-0.2.4",
++ "wasip2",
 +]
 +
 +[[package]]
-+name = "gimli"
-+version = "0.31.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-+
-+[[package]]
 +name = "glob"
-+version = "0.3.2"
++version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
++checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 +
 +[[package]]
 +name = "half"
@@ -751,21 +724,13 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "half"
-+version = "2.5.0"
++version = "2.7.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
++checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "crunchy",
-+]
-+
-+[[package]]
-+name = "hash32"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
-+dependencies = [
-+ "byteorder",
++ "zerocopy",
 +]
 +
 +[[package]]
@@ -779,19 +744,20 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "hashbrown"
-+version = "0.15.2"
++version = "0.15.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
++checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
++dependencies = [
++ "allocator-api2",
++ "equivalent",
++ "foldhash",
++]
 +
 +[[package]]
-+name = "heapless"
-+version = "0.8.0"
++name = "hashbrown"
++version = "0.16.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
-+dependencies = [
-+ "hash32",
-+ "stable_deref_trait",
-+]
++checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 +
 +[[package]]
 +name = "heck"
@@ -801,9 +767,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "hermit-abi"
-+version = "0.5.0"
++version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
++checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 +
 +[[package]]
 +name = "hmac"
@@ -815,31 +781,23 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "home"
-+version = "0.5.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-+dependencies = [
-+ "windows-sys 0.59.0",
-+]
-+
-+[[package]]
 +name = "icu_collections"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
++checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 +dependencies = [
 + "displaydoc",
++ "potential_utf",
 + "yoke",
 + "zerofrom",
 + "zerovec",
 +]
 +
 +[[package]]
-+name = "icu_locid"
-+version = "1.5.0"
++name = "icu_locale_core"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
++checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 +dependencies = [
 + "displaydoc",
 + "litemap",
@@ -849,103 +807,65 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "icu_locid_transform"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-+dependencies = [
-+ "displaydoc",
-+ "icu_locid",
-+ "icu_locid_transform_data",
-+ "icu_provider",
-+ "tinystr",
-+ "zerovec",
-+]
-+
-+[[package]]
-+name = "icu_locid_transform_data"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-+
-+[[package]]
 +name = "icu_normalizer"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
++checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 +dependencies = [
-+ "displaydoc",
 + "icu_collections",
 + "icu_normalizer_data",
 + "icu_properties",
 + "icu_provider",
 + "smallvec",
-+ "utf16_iter",
-+ "utf8_iter",
-+ "write16",
 + "zerovec",
 +]
 +
 +[[package]]
 +name = "icu_normalizer_data"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
++checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 +
 +[[package]]
 +name = "icu_properties"
-+version = "1.5.1"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
++checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 +dependencies = [
-+ "displaydoc",
 + "icu_collections",
-+ "icu_locid_transform",
++ "icu_locale_core",
 + "icu_properties_data",
 + "icu_provider",
-+ "tinystr",
++ "zerotrie",
 + "zerovec",
 +]
 +
 +[[package]]
 +name = "icu_properties_data"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
++checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 +
 +[[package]]
 +name = "icu_provider"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
++checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 +dependencies = [
 + "displaydoc",
-+ "icu_locid",
-+ "icu_provider_macros",
-+ "stable_deref_trait",
-+ "tinystr",
++ "icu_locale_core",
 + "writeable",
 + "yoke",
 + "zerofrom",
++ "zerotrie",
 + "zerovec",
 +]
 +
 +[[package]]
-+name = "icu_provider_macros"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
 +name = "idna"
-+version = "1.0.3"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
++checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 +dependencies = [
 + "idna_adapter",
 + "smallvec",
@@ -954,9 +874,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "idna_adapter"
-+version = "1.2.0"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
++checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 +dependencies = [
 + "icu_normalizer",
 + "icu_properties",
@@ -964,29 +884,29 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "indenter"
-+version = "0.3.3"
++version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
++checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5"
 +
 +[[package]]
 +name = "indexmap"
-+version = "2.8.0"
++version = "2.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
++checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 +dependencies = [
 + "equivalent",
-+ "hashbrown 0.15.2",
++ "hashbrown 0.16.0",
 +]
 +
 +[[package]]
 +name = "is-terminal"
-+version = "0.4.16"
++version = "0.4.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
++checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 +dependencies = [
 + "hermit-abi",
 + "libc",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -1021,63 +941,76 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "js-sys"
-+version = "0.3.77"
++version = "0.3.82"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
++checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 +dependencies = [
 + "once_cell",
 + "wasm-bindgen",
 +]
 +
 +[[package]]
-+name = "lazy_static"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-+
-+[[package]]
 +name = "libc"
-+version = "0.2.171"
++version = "0.2.177"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 +
 +[[package]]
 +name = "libloading"
-+version = "0.8.6"
++version = "0.8.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
++checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 +dependencies = [
-+ "cfg-if 1.0.0",
-+ "windows-targets",
++ "cfg-if 1.0.4",
++ "windows-link",
++]
++
++[[package]]
++name = "libredox"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
++dependencies = [
++ "bitflags",
++ "libc",
++ "redox_syscall",
 +]
 +
 +[[package]]
 +name = "linux-raw-sys"
-+version = "0.9.3"
++version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
++checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 +
 +[[package]]
 +name = "litemap"
-+version = "0.7.5"
++version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
++checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 +
 +[[package]]
 +name = "lock_api"
-+version = "0.4.12"
++version = "0.4.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
++checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 +dependencies = [
-+ "autocfg",
 + "scopeguard",
 +]
 +
 +[[package]]
 +name = "log"
-+version = "0.4.27"
++version = "0.4.28"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
++checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
++
++[[package]]
++name = "lru"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198"
++dependencies = [
++ "hashbrown 0.15.5",
++]
 +
 +[[package]]
 +name = "md-5"
@@ -1085,15 +1018,15 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "digest",
 +]
 +
 +[[package]]
 +name = "memchr"
-+version = "2.7.4"
++version = "2.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 +
 +[[package]]
 +name = "memoffset"
@@ -1111,23 +1044,14 @@ index 0000000..f654689
 +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 +
 +[[package]]
-+name = "miniz_oxide"
-+version = "0.8.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
-+dependencies = [
-+ "adler2",
-+]
-+
-+[[package]]
 +name = "mio"
-+version = "1.0.3"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
++checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 +dependencies = [
 + "libc",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
-+ "windows-sys 0.52.0",
++ "wasi",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -1159,19 +1083,19 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "object"
-+version = "0.36.7"
++name = "objc2-core-foundation"
++version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
++checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 +dependencies = [
-+ "memchr",
++ "bitflags",
 +]
 +
 +[[package]]
 +name = "once_cell"
-+version = "1.21.1"
++version = "1.21.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 +
 +[[package]]
 +name = "oorandom"
@@ -1181,19 +1105,18 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "owo-colors"
-+version = "4.2.0"
++version = "4.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
++checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
 +dependencies = [
-+ "supports-color 2.1.0",
-+ "supports-color 3.0.2",
++ "supports-color",
 +]
 +
 +[[package]]
 +name = "parking_lot"
-+version = "0.12.3"
++version = "0.12.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
++checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 +dependencies = [
 + "lock_api",
 + "parking_lot_core",
@@ -1201,15 +1124,15 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "parking_lot_core"
-+version = "0.9.10"
++version = "0.9.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
++checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "libc",
 + "redox_syscall",
 + "smallvec",
-+ "windows-targets",
++ "windows-link",
 +]
 +
 +[[package]]
@@ -1249,44 +1172,32 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "percent-encoding"
-+version = "2.3.1"
++version = "2.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-+
-+[[package]]
-+name = "pest"
-+version = "2.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
-+dependencies = [
-+ "memchr",
-+ "thiserror 2.0.12",
-+ "ucd-trie",
-+]
++checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 +
 +[[package]]
 +name = "petgraph"
-+version = "0.6.5"
++version = "0.8.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
++checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 +dependencies = [
 + "fixedbitset",
++ "hashbrown 0.15.5",
 + "indexmap",
++ "serde",
 +]
 +
 +[[package]]
 +name = "pgrx"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "227bf7e162ce710994306a97bc56bb3fe305f21120ab6692e2151c48416f5c0d"
++checksum = "fdcfb88f7fa9ba42b4ea9d1f85a1d968bbb407cc30308b35f73bdfe6c966f64b"
 +dependencies = [
-+ "atomic-traits",
 + "bitflags",
 + "bitvec",
 + "enum-map",
-+ "heapless",
 + "libc",
-+ "once_cell",
 + "pgrx-macros",
 + "pgrx-pg-sys",
 + "pgrx-sql-entity-graph",
@@ -1294,15 +1205,15 @@ index 0000000..f654689
 + "serde",
 + "serde_cbor",
 + "serde_json",
-+ "thiserror 1.0.69",
++ "thiserror 2.0.17",
 + "uuid",
 +]
 +
 +[[package]]
 +name = "pgrx-bindgen"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "81cbcd956c2da35baaf0a116e6f6a49a6c2fbc8f6b332f66d6fd060bfd00615f"
++checksum = "00e35193b7e71e2f612d336cecd00db0f049f4cc609f2b1c9a34755b5ec559d7"
 +dependencies = [
 + "bindgen",
 + "cc",
@@ -1311,46 +1222,49 @@ index 0000000..f654689
 + "pgrx-pg-config",
 + "proc-macro2",
 + "quote",
++ "regex",
 + "shlex",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 + "walkdir",
 +]
 +
 +[[package]]
 +name = "pgrx-macros"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e2f4291450d65e4deb770ce57ea93e22353d97950566222429cd166ebdf6f938"
++checksum = "dab542dd4041773874f90cd8e3448195749548dc3fb1daf501e7e11ebfb1dd22"
 +dependencies = [
 + "pgrx-sql-entity-graph",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "pgrx-pg-config"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "86a64a4c6e4e43e73cf8d3379d9533df98ded45c920e1ba8131c979633d74132"
++checksum = "eff9b29df94c3f9fcb0cde220f92eea6975ed05962784a98fb557754ad663501"
 +dependencies = [
 + "cargo_toml",
++ "codepage",
++ "encoding_rs",
 + "eyre",
-+ "home",
 + "owo-colors",
 + "pathsearch",
 + "serde",
 + "serde_json",
-+ "thiserror 1.0.69",
++ "thiserror 2.0.17",
 + "toml",
 + "url",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "pgrx-pg-sys"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "63a5dc64f2a8226434118aa2c4700450fa42b04f29488ad98268848b21c1a4ec"
++checksum = "934f2536953ccb6722bef2cfdfb1f8d6d3cd4a4f2c508d56ec85b649c5680c2b"
 +dependencies = [
 + "cee-scape",
 + "libc",
@@ -1358,30 +1272,29 @@ index 0000000..f654689
 + "pgrx-macros",
 + "pgrx-sql-entity-graph",
 + "serde",
-+ "sptr",
 +]
 +
 +[[package]]
 +name = "pgrx-sql-entity-graph"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d81cc2e851c7e36b2f47c03e22d64d56c1d0e762fbde0039ba2cd490cfef3615"
++checksum = "07a767cb9faa612f1ba7f13718136d4006950d6f253b414ef487a03e85c47a94"
 +dependencies = [
 + "convert_case",
 + "eyre",
 + "petgraph",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+ "thiserror 1.0.69",
++ "syn 2.0.108",
++ "thiserror 2.0.17",
 + "unescape",
 +]
 +
 +[[package]]
 +name = "pgrx-tests"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0c2dd5d674cb7d92024709543da06d26723a2f7450c02083116b232587160929"
++checksum = "e0d5d5f614a32310af2cc1b9587c69e041d97e8ab812d8d31fdcd3d33d27325c"
 +dependencies = [
 + "clap-cargo",
 + "eyre",
@@ -1393,12 +1306,15 @@ index 0000000..f654689
 + "pgrx-pg-config",
 + "postgres",
 + "proptest",
-+ "rand 0.8.5",
++ "rand 0.9.2",
 + "regex",
 + "serde",
 + "serde_json",
++ "shlex",
 + "sysinfo",
-+ "thiserror 1.0.69",
++ "tempfile",
++ "thiserror 2.0.17",
++ "winapi",
 +]
 +
 +[[package]]
@@ -1411,18 +1327,19 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "phf"
-+version = "0.11.3"
++version = "0.13.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
++checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 +dependencies = [
 + "phf_shared",
++ "serde",
 +]
 +
 +[[package]]
 +name = "phf_shared"
-+version = "0.11.3"
++version = "0.13.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
++checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 +dependencies = [
 + "siphasher",
 +]
@@ -1469,9 +1386,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "postgres"
-+version = "0.19.10"
++version = "0.19.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "363e6dfbdd780d3aa3597b6eb430db76bb315fa9bad7fae595bb8def808b8470"
++checksum = "e7c48ece1c6cda0db61b058c1721378da76855140e9214339fa1317decacb176"
 +dependencies = [
 + "bytes",
 + "fallible-iterator",
@@ -1483,9 +1400,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "postgres-protocol"
-+version = "0.6.8"
++version = "0.6.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "76ff0abab4a9b844b93ef7b81f1efc0a366062aaef2cd702c76256b5dc075c54"
++checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4"
 +dependencies = [
 + "base64",
 + "byteorder",
@@ -1494,16 +1411,16 @@ index 0000000..f654689
 + "hmac",
 + "md-5",
 + "memchr",
-+ "rand 0.9.0",
++ "rand 0.9.2",
 + "sha2",
 + "stringprep",
 +]
 +
 +[[package]]
 +name = "postgres-types"
-+version = "0.2.9"
++version = "0.2.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "613283563cd90e1dfc3518d548caee47e0e725455ed619881f5cf21f36de4b48"
++checksum = "ef4605b7c057056dd35baeb6ac0c0338e4975b1f2bef0f65da953285eb007095"
 +dependencies = [
 + "bytes",
 + "fallible-iterator",
@@ -1511,6 +1428,15 @@ index 0000000..f654689
 +]
 +
 +[[package]]
++name = "potential_utf"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
++dependencies = [
++ "zerovec",
++]
++
++[[package]]
 +name = "ppv-lite86"
 +version = "0.2.21"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1527,26 +1453,25 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "proc-macro2"
-+version = "1.0.94"
++version = "1.0.103"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
++checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 +dependencies = [
 + "unicode-ident",
 +]
 +
 +[[package]]
 +name = "proptest"
-+version = "1.6.0"
++version = "1.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
++checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
 +dependencies = [
 + "bit-set",
 + "bit-vec",
 + "bitflags",
-+ "lazy_static",
 + "num-traits",
-+ "rand 0.8.5",
-+ "rand_chacha 0.3.1",
++ "rand 0.9.2",
++ "rand_chacha 0.9.0",
 + "rand_xorshift",
 + "regex-syntax",
 + "rusty-fork",
@@ -1582,18 +1507,18 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "quote"
-+version = "1.0.40"
++version = "1.0.41"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
++checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 +dependencies = [
 + "proc-macro2",
 +]
 +
 +[[package]]
 +name = "r-efi"
-+version = "5.2.0"
++version = "5.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 +
 +[[package]]
 +name = "radium"
@@ -1614,13 +1539,12 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "rand"
-+version = "0.9.0"
++version = "0.9.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 +dependencies = [
 + "rand_chacha 0.9.0",
 + "rand_core 0.9.3",
-+ "zerocopy",
 +]
 +
 +[[package]]
@@ -1649,7 +1573,7 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 +dependencies = [
-+ "getrandom 0.2.15",
++ "getrandom 0.2.16",
 +]
 +
 +[[package]]
@@ -1658,23 +1582,23 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 +dependencies = [
-+ "getrandom 0.3.2",
++ "getrandom 0.3.4",
 +]
 +
 +[[package]]
 +name = "rand_xorshift"
-+version = "0.3.0"
++version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
++checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
 +dependencies = [
-+ "rand_core 0.6.4",
++ "rand_core 0.9.3",
 +]
 +
 +[[package]]
 +name = "rayon"
-+version = "1.10.0"
++version = "1.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
++checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 +dependencies = [
 + "either",
 + "rayon-core",
@@ -1682,9 +1606,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "rayon-core"
-+version = "1.12.1"
++version = "1.13.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
++checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 +dependencies = [
 + "crossbeam-deque",
 + "crossbeam-utils",
@@ -1692,18 +1616,18 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "redox_syscall"
-+version = "0.5.10"
++version = "0.5.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
++checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 +dependencies = [
 + "bitflags",
 +]
 +
 +[[package]]
 +name = "regex"
-+version = "1.11.1"
++version = "1.12.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
++checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 +dependencies = [
 + "aho-corasick",
 + "memchr",
@@ -1713,9 +1637,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "regex-automata"
-+version = "0.4.9"
++version = "0.4.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
++checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 +dependencies = [
 + "aho-corasick",
 + "memchr",
@@ -1724,9 +1648,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.8.5"
++version = "0.8.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
++checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 +
 +[[package]]
 +name = "rend"
@@ -1767,50 +1691,35 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "rustc-demangle"
-+version = "0.1.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-+
-+[[package]]
 +name = "rustc-hash"
-+version = "1.1.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-+
-+[[package]]
-+name = "rustc_version"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-+dependencies = [
-+ "semver 0.11.0",
-+]
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 +
 +[[package]]
 +name = "rustix"
-+version = "1.0.3"
++version = "1.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
++checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 +dependencies = [
 + "bitflags",
 + "errno",
 + "libc",
 + "linux-raw-sys",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
 +name = "rustversion"
-+version = "1.0.20"
++version = "1.0.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 +
 +[[package]]
 +name = "rusty-fork"
-+version = "0.3.0"
++version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
++checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
 +dependencies = [
 + "fnv",
 + "quick-error",
@@ -1835,9 +1744,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "scc"
-+version = "2.3.3"
++version = "2.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
++checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
 +dependencies = [
 + "sdd",
 +]
@@ -1850,9 +1759,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "sdd"
-+version = "3.0.8"
++version = "3.0.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21"
++checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
 +
 +[[package]]
 +name = "seahash"
@@ -1862,37 +1771,21 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "semver"
-+version = "0.11.0"
++version = "1.0.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-+dependencies = [
-+ "semver-parser",
-+]
-+
-+[[package]]
-+name = "semver"
-+version = "1.0.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
++checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 +dependencies = [
 + "serde",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.10.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2"
-+dependencies = [
-+ "pest",
++ "serde_core",
 +]
 +
 +[[package]]
 +name = "serde"
-+version = "1.0.219"
++version = "1.0.228"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
++checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 +dependencies = [
++ "serde_core",
 + "serde_derive",
 +]
 +
@@ -1907,35 +1800,45 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "serde_derive"
-+version = "1.0.219"
++name = "serde_core"
++version = "1.0.228"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
++checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.228"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "serde_json"
-+version = "1.0.140"
++version = "1.0.145"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
++checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 +dependencies = [
 + "itoa",
 + "memchr",
 + "ryu",
 + "serde",
++ "serde_core",
 +]
 +
 +[[package]]
 +name = "serde_spanned"
-+version = "0.6.8"
++version = "1.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
++checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
 +dependencies = [
-+ "serde",
++ "serde_core",
 +]
 +
 +[[package]]
@@ -1960,16 +1863,16 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "sha2"
-+version = "0.10.8"
++version = "0.10.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
++checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "cpufeatures",
 + "digest",
 +]
@@ -2004,40 +1907,31 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "slab"
-+version = "0.4.9"
++version = "0.4.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-+dependencies = [
-+ "autocfg",
-+]
++checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 +
 +[[package]]
 +name = "smallvec"
-+version = "1.14.0"
++version = "1.15.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 +
 +[[package]]
 +name = "socket2"
-+version = "0.5.8"
++version = "0.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
++checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 +dependencies = [
 + "libc",
-+ "windows-sys 0.52.0",
++ "windows-sys 0.60.2",
 +]
 +
 +[[package]]
-+name = "sptr"
-+version = "0.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
-+
-+[[package]]
 +name = "stable_deref_trait"
-+version = "1.2.0"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
++checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 +
 +[[package]]
 +name = "stringprep"
@@ -2058,16 +1952,6 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "supports-color"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89"
-+dependencies = [
-+ "is-terminal",
-+ "is_ci",
-+]
-+
-+[[package]]
-+name = "supports-color"
 +version = "3.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6"
@@ -2088,9 +1972,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "syn"
-+version = "2.0.100"
++version = "2.0.108"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
++checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -2099,27 +1983,25 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "synstructure"
-+version = "0.13.1"
++version = "0.13.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
++checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "sysinfo"
-+version = "0.30.13"
++version = "0.34.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
++checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
 +dependencies = [
-+ "cfg-if 1.0.0",
-+ "core-foundation-sys",
 + "libc",
++ "memchr",
 + "ntapi",
-+ "once_cell",
-+ "rayon",
++ "objc2-core-foundation",
 + "windows",
 +]
 +
@@ -2131,15 +2013,15 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tempfile"
-+version = "3.19.1"
++version = "3.23.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
++checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 +dependencies = [
 + "fastrand",
-+ "getrandom 0.3.2",
++ "getrandom 0.3.4",
 + "once_cell",
 + "rustix",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -2153,11 +2035,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "thiserror"
-+version = "2.0.12"
++version = "2.0.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 +dependencies = [
-+ "thiserror-impl 2.0.12",
++ "thiserror-impl 2.0.17",
 +]
 +
 +[[package]]
@@ -2168,25 +2050,25 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "thiserror-impl"
-+version = "2.0.12"
++version = "2.0.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "tinystr"
-+version = "0.7.6"
++version = "0.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
++checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 +dependencies = [
 + "displaydoc",
 + "zerovec",
@@ -2204,9 +2086,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tinyvec"
-+version = "1.9.0"
++version = "1.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
++checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 +dependencies = [
 + "tinyvec_macros",
 +]
@@ -2219,24 +2101,23 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tokio"
-+version = "1.44.1"
++version = "1.48.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
++checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 +dependencies = [
-+ "backtrace",
 + "bytes",
 + "libc",
 + "mio",
 + "pin-project-lite",
 + "socket2",
-+ "windows-sys 0.52.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
 +name = "tokio-postgres"
-+version = "0.7.13"
++version = "0.7.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c95d533c83082bb6490e0189acaa0bbeef9084e60471b696ca6988cd0541fb0"
++checksum = "2b40d66d9b2cfe04b628173409368e58247e8eddbbd3b0e6c6ba1d09f20f6c9e"
 +dependencies = [
 + "async-trait",
 + "byteorder",
@@ -2251,7 +2132,7 @@ index 0000000..f654689
 + "pin-project-lite",
 + "postgres-protocol",
 + "postgres-types",
-+ "rand 0.9.0",
++ "rand 0.9.2",
 + "socket2",
 + "tokio",
 + "tokio-util",
@@ -2260,9 +2141,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tokio-util"
-+version = "0.7.14"
++version = "0.7.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
++checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 +dependencies = [
 + "bytes",
 + "futures-core",
@@ -2273,49 +2154,48 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "toml"
-+version = "0.8.20"
++version = "0.9.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
-+dependencies = [
-+ "serde",
-+ "serde_spanned",
-+ "toml_datetime",
-+ "toml_edit",
-+]
-+
-+[[package]]
-+name = "toml_datetime"
-+version = "0.6.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "toml_edit"
-+version = "0.22.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
++checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 +dependencies = [
 + "indexmap",
-+ "serde",
++ "serde_core",
 + "serde_spanned",
 + "toml_datetime",
++ "toml_parser",
++ "toml_writer",
 + "winnow",
 +]
 +
 +[[package]]
-+name = "typenum"
-+version = "1.18.0"
++name = "toml_datetime"
++version = "0.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
++checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
++dependencies = [
++ "serde_core",
++]
 +
 +[[package]]
-+name = "ucd-trie"
-+version = "0.1.7"
++name = "toml_parser"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
++checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
++dependencies = [
++ "winnow",
++]
++
++[[package]]
++name = "toml_writer"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
++
++[[package]]
++name = "typenum"
++version = "1.19.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 +
 +[[package]]
 +name = "unarray"
@@ -2337,24 +2217,24 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "unicode-ident"
-+version = "1.0.18"
++version = "1.0.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
++checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 +
 +[[package]]
 +name = "unicode-normalization"
-+version = "0.1.24"
++version = "0.1.25"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
++checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
 +dependencies = [
 + "tinyvec",
 +]
 +
 +[[package]]
 +name = "unicode-properties"
-+version = "0.1.3"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
++checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 +
 +[[package]]
 +name = "unicode-segmentation"
@@ -2364,28 +2244,23 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "unicode-width"
-+version = "0.1.14"
++version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
++checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 +
 +[[package]]
 +name = "url"
-+version = "2.5.4"
++version = "2.5.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
++checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 +dependencies = [
 + "form_urlencoded",
 + "idna",
 + "percent-encoding",
++ "serde",
 +]
 +
 +[[package]]
-+name = "utf16_iter"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-+
-+[[package]]
 +name = "utf8_iter"
 +version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2393,18 +2268,21 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "uuid"
-+version = "1.16.0"
++version = "1.18.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
++checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 +dependencies = [
-+ "getrandom 0.3.2",
++ "getrandom 0.3.4",
++ "js-sys",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "vectorscale"
-+version = "0.7.0"
++version = "0.9.0"
 +dependencies = [
 + "criterion",
++ "lru",
 + "memoffset",
 + "once_cell",
 + "pgrx",
@@ -2413,7 +2291,7 @@ index 0000000..f654689
 + "pgvectorscale_derive",
 + "rand 0.8.5",
 + "rkyv",
-+ "semver 1.0.26",
++ "semver",
 + "serial_test",
 + "simdeez",
 + "tempfile",
@@ -2446,17 +2324,17 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "wasi"
-+version = "0.11.0+wasi-snapshot-preview1"
++version = "0.11.1+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 +
 +[[package]]
-+name = "wasi"
-+version = "0.14.2+wasi-0.2.4"
++name = "wasip2"
++version = "1.0.1+wasi-0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 +dependencies = [
-+ "wit-bindgen-rt",
++ "wit-bindgen",
 +]
 +
 +[[package]]
@@ -2467,35 +2345,22 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "wasm-bindgen"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
++checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "once_cell",
 + "rustversion",
 + "wasm-bindgen-macro",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-backend"
-+version = "0.2.100"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-+dependencies = [
-+ "bumpalo",
-+ "log",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
 + "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-macro"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
++checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 +dependencies = [
 + "quote",
 + "wasm-bindgen-macro-support",
@@ -2503,31 +2368,31 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "wasm-bindgen-macro-support"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
++checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 +dependencies = [
++ "bumpalo",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+ "wasm-bindgen-backend",
++ "syn 2.0.108",
 + "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-shared"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
++checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 +dependencies = [
 + "unicode-ident",
 +]
 +
 +[[package]]
 +name = "web-sys"
-+version = "0.3.77"
++version = "0.3.82"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
++checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 +dependencies = [
 + "js-sys",
 + "wasm-bindgen",
@@ -2535,11 +2400,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "whoami"
-+version = "1.6.0"
++version = "1.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
++checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
 +dependencies = [
-+ "redox_syscall",
++ "libredox",
 + "wasite",
 + "web-sys",
 +]
@@ -2562,11 +2427,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "winapi-util"
-+version = "0.1.9"
++version = "0.1.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
++checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 +dependencies = [
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -2577,39 +2442,79 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "windows"
-+version = "0.52.0"
++version = "0.57.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
++checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 +dependencies = [
 + "windows-core",
-+ "windows-targets",
++ "windows-targets 0.52.6",
 +]
 +
 +[[package]]
 +name = "windows-core"
-+version = "0.52.0"
++version = "0.57.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
++checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 +dependencies = [
-+ "windows-targets",
++ "windows-implement",
++ "windows-interface",
++ "windows-result",
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "windows-implement"
++version = "0.57.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "windows-interface"
++version = "0.57.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "windows-link"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
++
++[[package]]
++name = "windows-result"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
++dependencies = [
++ "windows-targets 0.52.6",
 +]
 +
 +[[package]]
 +name = "windows-sys"
-+version = "0.52.0"
++version = "0.60.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
++checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 +dependencies = [
-+ "windows-targets",
++ "windows-targets 0.53.5",
 +]
 +
 +[[package]]
 +name = "windows-sys"
-+version = "0.59.0"
++version = "0.61.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
++checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 +dependencies = [
-+ "windows-targets",
++ "windows-link",
 +]
 +
 +[[package]]
@@ -2618,14 +2523,31 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 +dependencies = [
-+ "windows_aarch64_gnullvm",
-+ "windows_aarch64_msvc",
-+ "windows_i686_gnu",
-+ "windows_i686_gnullvm",
-+ "windows_i686_msvc",
-+ "windows_x86_64_gnu",
-+ "windows_x86_64_gnullvm",
-+ "windows_x86_64_msvc",
++ "windows_aarch64_gnullvm 0.52.6",
++ "windows_aarch64_msvc 0.52.6",
++ "windows_i686_gnu 0.52.6",
++ "windows_i686_gnullvm 0.52.6",
++ "windows_i686_msvc 0.52.6",
++ "windows_x86_64_gnu 0.52.6",
++ "windows_x86_64_gnullvm 0.52.6",
++ "windows_x86_64_msvc 0.52.6",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.53.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
++dependencies = [
++ "windows-link",
++ "windows_aarch64_gnullvm 0.53.1",
++ "windows_aarch64_msvc 0.53.1",
++ "windows_i686_gnu 0.53.1",
++ "windows_i686_gnullvm 0.53.1",
++ "windows_i686_msvc 0.53.1",
++ "windows_x86_64_gnu 0.53.1",
++ "windows_x86_64_gnullvm 0.53.1",
++ "windows_x86_64_msvc 0.53.1",
 +]
 +
 +[[package]]
@@ -2635,76 +2557,112 @@ index 0000000..f654689
 +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 +
 +[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
++
++[[package]]
 +name = "windows_aarch64_msvc"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 +
 +[[package]]
++name = "windows_aarch64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
++
++[[package]]
 +name = "windows_i686_gnu"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 +
 +[[package]]
++name = "windows_i686_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
++
++[[package]]
 +name = "windows_i686_gnullvm"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 +
 +[[package]]
++name = "windows_i686_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
++
++[[package]]
 +name = "windows_i686_msvc"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 +
 +[[package]]
++name = "windows_i686_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
++
++[[package]]
 +name = "windows_x86_64_gnu"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 +
 +[[package]]
++name = "windows_x86_64_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
++
++[[package]]
 +name = "windows_x86_64_gnullvm"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 +
 +[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
++
++[[package]]
 +name = "windows_x86_64_msvc"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 +
 +[[package]]
++name = "windows_x86_64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
++
++[[package]]
 +name = "winnow"
-+version = "0.7.4"
++version = "0.7.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
-+dependencies = [
-+ "memchr",
-+]
++checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 +
 +[[package]]
-+name = "wit-bindgen-rt"
-+version = "0.39.0"
++name = "wit-bindgen"
++version = "0.46.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-+dependencies = [
-+ "bitflags",
-+]
-+
-+[[package]]
-+name = "write16"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 +
 +[[package]]
 +name = "writeable"
-+version = "0.5.5"
++version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
++checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 +
 +[[package]]
 +name = "wyz"
@@ -2716,21 +2674,11 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "yansi-term"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-+dependencies = [
-+ "winapi",
-+]
-+
-+[[package]]
 +name = "yoke"
-+version = "0.7.5"
++version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
++checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 +dependencies = [
-+ "serde",
 + "stable_deref_trait",
 + "yoke-derive",
 + "zerofrom",
@@ -2738,34 +2686,34 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "yoke-derive"
-+version = "0.7.5"
++version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
++checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 + "synstructure",
 +]
 +
 +[[package]]
 +name = "zerocopy"
-+version = "0.8.24"
++version = "0.8.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
++checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 +dependencies = [
 + "zerocopy-derive",
 +]
 +
 +[[package]]
 +name = "zerocopy-derive"
-+version = "0.8.24"
++version = "0.8.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
++checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -2785,15 +2733,26 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 + "synstructure",
 +]
 +
 +[[package]]
-+name = "zerovec"
-+version = "0.10.4"
++name = "zerotrie"
++version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
++checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
++dependencies = [
++ "displaydoc",
++ "yoke",
++ "zerofrom",
++]
++
++[[package]]
++name = "zerovec"
++version = "0.11.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 +dependencies = [
 + "yoke",
 + "zerofrom",
@@ -2802,11 +2761,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "zerovec-derive"
-+version = "0.10.3"
++version = "0.11.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
++checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
index 8da7420f3bea..a5411e49746e 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
@@ -1,6 +1,6 @@
 {
   buildPgrxExtension,
-  cargo-pgrx_0_12_6,
+  cargo-pgrx_0_16_1,
   postgresql,
   fetchFromGitHub,
   lib,
@@ -9,18 +9,18 @@
 
 buildPgrxExtension (finalAttrs: {
   pname = "pgvectorscale";
-  version = "0.7.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "pgvectorscale";
     tag = finalAttrs.version;
-    hash = "sha256-dy481k2SvyYXwwcsyLZSl3XlhSk9C5+4LfEfciB1DK4=";
+    hash = "sha256-whGTJI73wifYkleC+aAbDV4nhwls3uFs1xKcB0zLDRo=";
   };
 
   doCheck = false;
 
-  cargoHash = "sha256-CeRyDn9VhxfjWFJ1/Z/XvOUQOSnDoHHZAqgfYTeKU0o=";
+  cargoHash = "sha256-uaRKUtsUdZPcrQLAixCiEphXQqdsRhi8nSfh9b3w0ao=";
   cargoPatches = [
     ./add-Cargo.lock.patch
   ];
@@ -31,7 +31,7 @@ buildPgrxExtension (finalAttrs: {
   ];
 
   inherit postgresql;
-  cargo-pgrx = cargo-pgrx_0_12_6;
+  cargo-pgrx = cargo-pgrx_0_16_1;
 
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
@@ -65,11 +65,8 @@ buildPgrxExtension (finalAttrs: {
   };
 
   meta = {
-    # PostgreSQL 18 support issue upstream: https://github.com/timescale/pgvectorscale/issues/249
-    # Check after next package update.
-    broken =
-      lib.warnIf (finalAttrs.version != "0.7.0") "Is postgresql18Packages.pgvectorscale still broken?"
-        (lib.versionAtLeast postgresql.version "18");
+    # Upstream removed support for PostgreSQL 13 on 0.9.0: https://github.com/timescale/pgvectorscale/releases/tag/0.9.0
+    broken = lib.versionOlder postgresql.version "14";
     homepage = "https://github.com/timescale/pgvectorscale";
     teams = [ lib.teams.flyingcircus ];
     description = "Complement to pgvector for high performance, cost efficient vector search on large workloads";
diff --git a/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix b/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
new file mode 100644
index 000000000000..0a6849652b5e
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
@@ -0,0 +1,124 @@
+{
+  autoconf,
+  automake,
+  cunit,
+  fetchFromGitHub,
+  fetchpatch,
+  installShellFiles,
+  lib,
+  libtool,
+  libxml2,
+  perl,
+  postgresql,
+  postgresqlBuildExtension,
+  postgresqlTestExtension,
+  postgresqlTestHook,
+  sphinx,
+  which,
+  zlib,
+}:
+postgresqlBuildExtension (finalAttrs: {
+  pname = "pointcloud";
+  version = "1.2.5";
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "pgpointcloud";
+    repo = "pointcloud";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-uFbScxq21kt0jOjjyfMeO3i+bG2/kWS/Rrt3ZpOqEns=";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    installShellFiles
+    libtool
+    perl
+    # for doc
+    sphinx
+    # needed by the configure phase
+    which
+  ];
+
+  buildInputs = [
+    zlib
+  ];
+
+  doCheck = !(postgresqlTestHook.meta.broken);
+
+  checkInputs = [
+    cunit
+  ];
+
+  nativeCheckInputs = [
+    postgresql
+    postgresqlTestHook
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = [
+    (lib.withFeatureAs true "xml2config" (lib.getExe' (lib.getDev libxml2) "xml2-config"))
+  ];
+
+  postInstall = ''
+    cd doc
+    make man
+    installManPage build/man/pgpointcloud.1
+  '';
+
+  passthru.tests = {
+    extension = postgresqlTestExtension {
+      inherit (finalAttrs) finalPackage;
+      # see https://pgpointcloud.github.io/pointcloud/concepts/schemas.html
+      withPackages = [ "postgis" ];
+      sql = builtins.readFile ./tests.sql;
+      asserts = [
+        {
+          query = "pc_version()";
+          expected = "'${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version}.${lib.versions.patch finalAttrs.version}'";
+          description = "pc_version() returns correct values.";
+        }
+        {
+          query = "pc_postgis_version()";
+          expected = "'${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version}.${lib.versions.patch finalAttrs.version}'";
+          description = "pc_postgis_version() returns correct values.";
+        }
+        # these tests are taken from the documentation of respective methods
+        {
+          query = "SELECT PC_AsText('010100000064CEFFFF94110000703000000400'::pcpoint)";
+          expected = "'{\"pcid\":1,\"pt\":[-127,45,124,4]}'";
+          description = "Creating a point and displaying as text returns correct string";
+        }
+        {
+          query = "SELECT ST_AsText(PC_MakePoint(1, ARRAY[-127, 45, 124.0, 4.0])::geometry)";
+          expected = "'POINT Z (-127 45 124)'";
+          description = "Casting a pcpoint to a postgis geometry works";
+        }
+      ];
+    };
+  };
+
+  meta = {
+    description = "PostgreSQL extension for storing point cloud (LIDAR) data";
+    longDescription = ''
+      # pgPointcloud - A PostgreSQL extension for storing point cloud (LIDAR) data.
+
+      LIDAR point cloud are becoming more and more available. Devices are easy to get, not too expensive, and provide very accurate 3D points. pgPointCLoud is an open source PostgreSQL extension for storing point cloud data and use it with PostGIS. It is very easy to use, robust and efficient.
+
+      By storing LIDAR points in a PostgreSQL database, pgPointcloud eases many problems and allows a good integration with other geo-spatial data (vector, raster) into one common framework : PostGIS.
+    '';
+    homepage = "https://pgpointcloud.github.io/pointcloud/";
+    changelog = "https://github.com/pgpointcloud/pointcloud/blob/v${finalAttrs.version}/NEWS";
+    license = lib.licenses.bsd3;
+    teams = [ lib.teams.geospatial ];
+    inherit (postgresql.meta) platforms;
+  };
+})
diff --git a/pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql b/pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql
new file mode 100644
index 000000000000..270172c42611
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql
@@ -0,0 +1,55 @@
+CREATE EXTENSION pointcloud;
+CREATE EXTENSION pointcloud_postgis CASCADE;
+INSERT INTO pointcloud_formats
+(pcid, srid, schema) VALUES (
+    1,
+    4326,
+    '<?xml version="1.0" encoding="UTF-8"?>
+    <pc:PointCloudSchema xmlns:pc="http://pointcloud.org/schemas/PC/1.1"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <pc:dimension>
+        <pc:position>1</pc:position>
+        <pc:size>4</pc:size>
+        <pc:description>X coordinate as a long integer. You must use the
+                        scale and offset information of the header to
+                        determine the double value.</pc:description>
+        <pc:name>X</pc:name>
+        <pc:interpretation>int32_t</pc:interpretation>
+        <pc:scale>0.01</pc:scale>
+      </pc:dimension>
+      <pc:dimension>
+        <pc:position>2</pc:position>
+        <pc:size>4</pc:size>
+        <pc:description>Y coordinate as a long integer. You must use the
+                        scale and offset information of the header to
+                        determine the double value.</pc:description>
+        <pc:name>Y</pc:name>
+        <pc:interpretation>int32_t</pc:interpretation>
+        <pc:scale>0.01</pc:scale>
+      </pc:dimension>
+      <pc:dimension>
+        <pc:position>3</pc:position>
+        <pc:size>4</pc:size>
+        <pc:description>Z coordinate as a long integer. You must use the
+                        scale and offset information of the header to
+                        determine the double value.</pc:description>
+        <pc:name>Z</pc:name>
+        <pc:interpretation>int32_t</pc:interpretation>
+        <pc:scale>0.01</pc:scale>
+      </pc:dimension>
+      <pc:dimension>
+        <pc:position>4</pc:position>
+        <pc:size>2</pc:size>
+        <pc:description>The intensity value is the integer representation
+                        of the pulse return magnitude. This value is optional
+                        and system specific. However, it should always be
+                        included if available.</pc:description>
+        <pc:name>Intensity</pc:name>
+        <pc:interpretation>uint16_t</pc:interpretation>
+        <pc:scale>1</pc:scale>
+      </pc:dimension>
+      <pc:metadata>
+        <Metadata name="compression">dimensional</Metadata>
+      </pc:metadata>
+    </pc:PointCloudSchema>'
+);
diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix
index 99f0d336d525..ef2df4c7f458 100644
--- a/pkgs/servers/sql/postgresql/ext/rum.nix
+++ b/pkgs/servers/sql/postgresql/ext/rum.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "rum";
-  version = "1.3.14";
+  version = "1.3.15";
 
   src = fetchFromGitHub {
     owner = "postgrespro";
     repo = "rum";
     tag = finalAttrs.version;
-    hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8=";
+    hash = "sha256-iOx7u0JURBUUFerRlg3DuidFeBmGFOXz8mu20mQeopo=";
   };
 
   makeFlags = [ "USE_PGXS=1" ];
@@ -29,11 +29,6 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
-    # PostgreSQL 18 support issue upstream: https://github.com/postgrespro/rum/issues/156
-    # Check after next package update.
-    broken = lib.warnIf (finalAttrs.version != "1.3.14") "Is postgresql18Packages.rum still broken?" (
-      lib.versionAtLeast postgresql.version "18"
-    );
     description = "Full text search index method for PostgreSQL";
     homepage = "https://github.com/postgrespro/rum";
     license = lib.licenses.postgresql;
diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 207e1577328c..4b81f42b68ba 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,13 +13,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.22.1";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb";
     tag = finalAttrs.version;
-    hash = "sha256-SEuxHbSxgTC4Uk6nnznVzUqvoZMGgF+KSMNzkYfgfpI=";
+    hash = "sha256-wgRaWxGr48p8xMc+yOQEN196KAKyptMCk/UFKn23cos=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -101,13 +101,6 @@ postgresqlBuildExtension (finalAttrs: {
     maintainers = with lib.maintainers; [ kirillrdy ];
     platforms = postgresql.meta.platforms;
     license = with lib.licenses; if enableUnfree then tsl else asl20;
-    broken =
-      lib.versionOlder postgresql.version "15"
-      ||
-        # PostgreSQL 18 support issue upstream: https://github.com/timescale/timescaledb/issues/8233
-        # Check after next package update.
-        lib.warnIf (finalAttrs.version != "2.22.1") "Is postgresql18Packages.timescaledb still broken?" (
-          lib.versionAtLeast postgresql.version "18"
-        );
+    broken = lib.versionOlder postgresql.version "15";
   };
 })
diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index d07f97e9840c..836b48664aa5 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -6,6 +6,7 @@ let
       stdenv,
       fetchFromGitHub,
       fetchurl,
+      fetchpatch2,
       lib,
       replaceVars,
       writeShellScriptBin,
@@ -424,6 +425,12 @@ let
       ]
       ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
         ./patches/export-dynamic-darwin-15-.patch
+      ]
+      ++ lib.optionals (atLeast "17") [
+        (fetchpatch2 {
+          url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch";
+          hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus=";
+        })
       ];
 
       installTargets = [ "install-world" ];
diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index f71d254ae7b6..79cb7e76360f 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -20,6 +20,15 @@
   postgresql,
   buildPackages,
 
+  # Curl
+  curlSupport ?
+    lib.meta.availableOn stdenv.hostPlatform curl
+    # Building statically fails with:
+    # configure: error: library 'curl' does not provide curl_multi_init
+    # https://www.postgresql.org/message-id/487dacec-6d8d-46c0-a36f-d5b8c81a56f1%40technowledgy.de
+    && !stdenv.hostPlatform.isStatic,
+  curl,
+
   # GSSAPI
   gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic,
   libkrb5,
@@ -31,20 +40,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpq";
-  version = "17.6";
+  version = "18.0";
 
   src = fetchFromGitHub {
     owner = "postgres";
     repo = "postgres";
     # rev, not tag, on purpose: see generic.nix.
-    rev = "refs/tags/REL_17_6";
-    hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
+    rev = "refs/tags/REL_18_0";
+    hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
   };
 
   __structuredAttrs = true;
 
-  hardeningEnable = lib.optionals (!stdenv.cc.isClang) [ "pie" ];
-
   outputs = [
     "out"
     "dev"
@@ -61,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     openssl
   ]
+  ++ lib.optionals curlSupport [ curl ]
   ++ lib.optionals gssSupport [ libkrb5 ]
   ++ lib.optionals nlsSupport [ gettext ];
 
@@ -109,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-perl"
     "--without-readline"
   ]
+  ++ lib.optionals curlSupport [ "--with-libcurl" ]
   ++ lib.optionals gssSupport [ "--with-gssapi" ]
   ++ lib.optionals nlsSupport [ "--enable-nls" ];
 
@@ -134,6 +143,11 @@ stdenv.mkDerivation (finalAttrs: {
     make -C src/common install pg_config.env
     make -C src/include install
     make -C src/interfaces/libpq install
+  ''
+  + lib.optionalString curlSupport ''
+    make -C src/interfaces/libpq-oauth install
+  ''
+  + ''
     make -C src/port install
 
     substituteInPlace src/common/pg_config.env \
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index a16f259a5c37..1d44b19da0df 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -10,6 +10,7 @@
   callPackage,
   nixosTests,
 
+  defaultGemConfig,
   ruby_3_3,
   gzip,
   gnutar,
@@ -34,6 +35,10 @@
   procps,
   rsync,
   icu,
+  rustPlatform,
+  buildRubyGem,
+  rustc,
+  cargo,
   pnpm_9,
   svgo,
   nodejs,
@@ -46,13 +51,13 @@
 }:
 
 let
-  version = "3.4.7";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-vidv5aa2r1YOcnvkqrk7ttuIk1bN5Ct7kMANl8kpEm0=";
+    sha256 = "sha256-8Uzb0cjC3PUrh6Nlu6OJ09GKD+8KZq/IUba2NXLm1JI=";
   };
 
   ruby = ruby_3_3;
@@ -117,9 +122,12 @@ let
       );
     in
     stdenv.mkDerivation (
-      removeAttrs args [ "bundlerEnvArgs" ]
-      // {
+      # Allow overriding the plugin name
+      {
         pluginName = if name != null then name else "${pname}-${version}";
+      }
+      // removeAttrs args [ "bundlerEnvArgs" ]
+      // {
         dontConfigure = true;
         dontBuild = true;
         installPhase = ''
@@ -168,54 +176,116 @@ let
     name = "discourse-ruby-env-${version}";
     inherit version ruby;
     gemdir = ./rubyEnv;
-    gemset =
-      let
-        gems = import ./rubyEnv/gemset.nix;
-      in
-      gems
-      // {
-        mini_racer = gems.mini_racer // {
-          buildInputs = [ icu ];
+    gemset = import ./rubyEnv/gemset.nix;
+    gemConfig = defaultGemConfig // {
+      mini_racer = attrs: {
+        buildInputs = [ icu ];
+        dontBuild = false;
+        NIX_LDFLAGS = "-licui18n";
+      };
+      libv8-node =
+        attrs:
+        let
+          noopScript = writeShellScript "noop" "exit 0";
+          linkFiles = writeShellScript "link-files" ''
+            cd ../..
+
+            mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
+            ln -s "${nodejs.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
+
+            ln -s ${nodejs.libv8}/include vendor/v8/include
+
+            mkdir -p ext/libv8-node
+            echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
+          '';
+        in
+        {
           dontBuild = false;
-          NIX_LDFLAGS = "-licui18n";
-        };
-        libv8-node =
-          let
-            noopScript = writeShellScript "noop" "exit 0";
-            linkFiles = writeShellScript "link-files" ''
-              cd ../..
-
-              mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
-              ln -s "${nodejs.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
-
-              ln -s ${nodejs.libv8}/include vendor/v8/include
-
-              mkdir -p ext/libv8-node
-              echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
-            '';
-          in
-          gems.libv8-node
-          // {
-            dontBuild = false;
-            postPatch = ''
-              cp ${noopScript} libexec/build-libv8
-              cp ${noopScript} libexec/build-monolith
-              cp ${noopScript} libexec/download-node
-              cp ${noopScript} libexec/extract-node
-              cp ${linkFiles} libexec/inject-libv8
-            '';
-          };
-        mini_suffix = gems.mini_suffix // {
-          propagatedBuildInputs = [ libpsl ];
-          dontBuild = false;
-          # Use our libpsl instead of the vendored one, which isn't
-          # available for aarch64. It has to be called
-          # libpsl.x86_64.so or it isn't found.
           postPatch = ''
-            cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
+            cp ${noopScript} libexec/build-libv8
+            cp ${noopScript} libexec/build-monolith
+            cp ${noopScript} libexec/download-node
+            cp ${noopScript} libexec/extract-node
+            cp ${linkFiles} libexec/inject-libv8
           '';
         };
+      mini_suffix = attrs: {
+        propagatedBuildInputs = [ libpsl ];
+        dontBuild = false;
+        # Use our libpsl instead of the vendored one, which isn't
+        # available for aarch64. It has to be called
+        # libpsl.x86_64.so or it isn't found.
+        postPatch = ''
+          cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
+        '';
       };
+      tokenizers = attrs: {
+        cargoDeps = rustPlatform.fetchCargoVendor {
+          inherit (buildRubyGem { inherit (attrs) gemName version source; })
+            name
+            src
+            unpackPhase
+            nativeBuildInputs
+            ;
+          hash = "sha256-ydSXo3wp13/mPgJv1HbavNurkd2KxuKzuJNHliPpn2I=";
+        };
+
+        dontBuild = false;
+
+        nativeBuildInputs = [
+          cargo
+          rustc
+          rustPlatform.cargoSetupHook
+          rustPlatform.bindgenHook
+        ];
+
+        disallowedReferences = [
+          rustc.unwrapped
+        ];
+
+        preInstall = ''
+          export CARGO_HOME="$PWD/../.cargo/"
+        '';
+
+        postInstall = ''
+          find $out -type f -name .rustc_info.json -delete
+        '';
+      };
+      tiktoken_ruby = attrs: {
+        cargoDeps = rustPlatform.fetchCargoVendor {
+          inherit (buildRubyGem { inherit (attrs) gemName version source; })
+            name
+            src
+            unpackPhase
+            nativeBuildInputs
+            ;
+          hash = "sha256-IABOxUymtFkF9sl1kRWAS5hM6GNJI6Y4VFICXdX7zF0=";
+        };
+
+        dontBuild = false;
+
+        nativeBuildInputs = [
+          cargo
+          rustc
+          rustPlatform.cargoSetupHook
+          rustPlatform.bindgenHook
+        ];
+
+        disallowedReferences = [
+          rustc.unwrapped
+        ];
+
+        preInstall = ''
+          export CARGO_HOME="$PWD/../.cargo/"
+        '';
+
+        postInstall = ''
+          #ls $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib
+          #mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,}
+          find $out -type f -name .rustc_info.json -delete
+        '';
+      };
+    };
 
     groups = [
       "default"
@@ -233,11 +303,13 @@ let
       pname = "discourse-assets";
       inherit version src;
       fetcherVersion = 1;
-      hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y=";
+      hash = "sha256-npRKX5Lr2QrPD8OFBysDl30exP+FTnjMxFeR/Gv0Z0I=";
     };
 
     nativeBuildInputs = runtimeDeps ++ [
-      postgresql
+      (postgresql.withPackages (ps: [
+        ps.pgvector
+      ]))
       redis
       uglify-js
       terser
@@ -251,6 +323,7 @@ let
       "out"
       "javascripts"
       "node_modules"
+      "generated"
     ];
 
     patches = [
@@ -274,6 +347,14 @@ let
     ];
 
     env.RAILS_ENV = "production";
+    env.DISCOURSE_DOWNLOAD_PRE_BUILT_ASSETS = "0";
+    # Allow to use different bundler version than the lockfile has
+    env.BUNDLER_VERSION = pkgs.bundler.version;
+
+    # requires full git and repository, even a src `leaveDotGit` is not enough. So patch this function to return the version
+    postPatch = ''
+      substituteInPlace script/assemble_ember_build.rb --replace-fail "def core_tree_hash" "def core_tree_hash; return \"v${version}\""
+    '';
 
     # We have to set up an environment that is close enough to
     # production ready or the assets:precompile task refuses to
@@ -300,6 +381,7 @@ let
       psql -d postgres -tAc 'CREATE DATABASE "discourse" OWNER "discourse"'
       psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
       psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS hstore"
+      psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS vector"
 
       ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} plugins/${p.pluginName or ""}") plugins}
 
@@ -310,6 +392,7 @@ let
     buildPhase = ''
       runHook preBuild
 
+      patchShebangs script/
       bundle exec rake assets:precompile
 
       runHook postBuild
@@ -322,9 +405,10 @@ let
 
       mv node_modules $node_modules
 
-      rm -r app/assets/javascripts/plugins
+      rm -rf app/assets/javascripts/plugins
       mv app/assets/javascripts $javascripts
       ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins
+      mv app/assets/generated $generated
 
       runHook postInstall
     '';
@@ -374,6 +458,10 @@ let
       # theme-transpiler over and over again. Which at the same time allows the removal
       # of javascript devDependencies from the runtime environment.
       ./prebuild-theme-transpiler.patch
+
+      # Our app/assets/generated folder is a symlink, but the ruby File.mkdir_p doesn't allow
+      # a symlink in the way to the last directory. This patch explicitly resolves the symlink.
+      ./resolve_generated_assets_symlink.patch
     ];
 
     postPatch = ''
@@ -406,6 +494,7 @@ let
       ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp
       ln -sf /run/discourse/config $out/share/discourse/config
       ln -sf /run/discourse/public $out/share/discourse/public
+      ln -sf /run/discourse/assets-generated $out/share/discourse/app/assets/generated
       ln -sf ${assets.node_modules} $out/share/discourse/node_modules
       ln -sf ${assets} $out/share/discourse/public.dist/assets
       rm -r $out/share/discourse/app/assets/javascripts
diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
index 864bdb978d4f..df908dcb6b6d 100644
--- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
@@ -3,25 +3,10 @@ let
   callPackage = newScope args;
 in
 {
-  discourse-assign = callPackage ./discourse-assign { };
   discourse-bbcode-color = callPackage ./discourse-bbcode-color { };
-  discourse-calendar = callPackage ./discourse-calendar { };
-  discourse-canned-replies = callPackage ./discourse-canned-replies { };
-  discourse-chat-integration = callPackage ./discourse-chat-integration { };
-  discourse-checklist = callPackage ./discourse-checklist { };
-  discourse-data-explorer = callPackage ./discourse-data-explorer { };
   discourse-docs = callPackage ./discourse-docs { };
-  discourse-github = callPackage ./discourse-github { };
   discourse-ldap-auth = callPackage ./discourse-ldap-auth { };
-  discourse-math = callPackage ./discourse-math { };
-  discourse-migratepassword = callPackage ./discourse-migratepassword { };
-  discourse-oauth2-basic = callPackage ./discourse-oauth2-basic { };
-  discourse-openid-connect = callPackage ./discourse-openid-connect { };
   discourse-prometheus = callPackage ./discourse-prometheus { };
-  discourse-reactions = callPackage ./discourse-reactions { };
   discourse-saved-searches = callPackage ./discourse-saved-searches { };
-  discourse-solved = callPackage ./discourse-solved { };
-  discourse-spoiler-alert = callPackage ./discourse-spoiler-alert { };
-  discourse-voting = callPackage ./discourse-voting { };
   discourse-yearly-review = callPackage ./discourse-yearly-review { };
 }
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
deleted file mode 100644
index 610d60a3b915..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-assign";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-assign";
-    rev = "261a47d119d200a8d922d008ad3d1667df869435";
-    sha256 = "sha256-0OClWO70btM7EN7Vir1LIhCTeO5+2jtkP4RozoKzp+0=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-docs";
-    maintainers = with maintainers; [ dpausp ];
-    license = licenses.mit;
-    description = "Discourse Plugin for assigning users to a topic";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
index d1a09684cea5..0acecf9b617b 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-bbcode-color";
-    rev = "ecd4befeb4eae48aa0a37a88e5aca60e59730411";
-    sha256 = "sha256-enpeXc6pE9+5EdbMIFsnWd++ixlHBKFRxbXmvJYJftg=";
+    rev = "14b8370160cda35568470a36a25e508eb8364609";
+    sha256 = "sha256-3yIV5LKsYSDrhBwsalKZo9jY6j8kNzz99x/AJ95kPuk=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-bbcode-color";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile
deleted file mode 100644
index 76faf85df5e2..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"
-gem "rrule", "0.4.4", require: false
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
deleted file mode 100644
index 15aafaf94c9c..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
+++ /dev/null
@@ -1,35 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.1.3.3)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    drb (2.2.1)
-    i18n (1.14.5)
-      concurrent-ruby (~> 1.0)
-    minitest (5.23.1)
-    mutex_m (0.2.0)
-    rrule (0.4.4)
-      activesupport (>= 2.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rrule (= 0.4.4)
-
-BUNDLED WITH
-   2.5.9
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
deleted file mode 100644
index ddde5a700a26..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-calendar";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-calendar";
-    rev = "8d09cf8503b78f4c72b47a7319c0f4b9ad0247e7";
-    sha256 = "sha256-ES0/f/sv4Doao/MOdHYMwadRIVXb1I7FgSsl7790tio=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-calendar";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.mit;
-    description = "Adds the ability to create a dynamic calendar in the first post of a topic";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
deleted file mode 100644
index 8fdcbcd0fa35..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  activesupport = {
-    dependencies = [
-      "base64"
-      "bigdecimal"
-      "concurrent-ruby"
-      "connection_pool"
-      "drb"
-      "i18n"
-      "minitest"
-      "mutex_m"
-      "tzinfo"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i";
-      type = "gem";
-    };
-    version = "7.1.3.3";
-  };
-  base64 = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  bigdecimal = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
-      type = "gem";
-    };
-    version = "3.1.8";
-  };
-  concurrent-ruby = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
-      type = "gem";
-    };
-    version = "1.2.3";
-  };
-  connection_pool = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  drb = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  i18n = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
-      type = "gem";
-    };
-    version = "1.14.5";
-  };
-  minitest = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i";
-      type = "gem";
-    };
-    version = "5.23.1";
-  };
-  mutex_m = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  rrule = {
-    dependencies = [ "activesupport" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04h3q0ws0wswqj3mwjyv44yx59d9ima9a820ay9w5bwnlb73syj2";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
-  tzinfo = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
deleted file mode 100644
index b6f6c113ea24..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-canned-replies";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-canned-replies";
-    rev = "732598b6cdc86c74622bb15bfeaebb05611bbc25";
-    sha256 = "sha256-t0emNsPT8o0ralUedt33ufH0VLl4/12lVBBCnzfdRxE=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-canned-replies";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.gpl2Only;
-    description = "Adds support for inserting a canned reply into the composer window via a UI";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
deleted file mode 100644
index d64aea099066..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-chat-integration";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-chat-integration";
-    rev = "29ad813cd04812786780e1706cbc043810dea7d8";
-    sha256 = "sha256-5mGnHLlw3qIGi8et3WV1RXnrPB+bySi3wQryKTa5wNg=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-chat-integration";
-    maintainers = with maintainers; [ dpausp ];
-    license = licenses.mit;
-    description = "This plugin integrates Discourse with a number of external chatroom systems";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
deleted file mode 100644
index d9934bc3d872..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-checklist";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-checklist";
-    rev = "6fcf9fed5c3ae3baf9ddd1cca9cef4dc089996c1";
-    sha256 = "sha256-RIuoqZo7dW1DXbfbWhyyhCOGe4R5sLerzFW2TT0zO6U=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-checklist";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.gpl2Only;
-    description = "Simple checklist rendering plugin for discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
deleted file mode 100644
index d5b4a95b5c66..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-data-explorer";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-data-explorer";
-    rev = "2ba204a1de2638a7959e588b88f3b6c7fcf7a70f";
-    sha256 = "sha256-u8yGKANEyqm63/ZnJLe3u1nkNGZyX0wFUBIKU5GgjzY=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-data-explorer";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.mit;
-    description = "SQL Queries for admins in Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
index 573bffa7808a..617da737f0af 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-docs";
-    rev = "4e42539cda9a54d7827bcdf51b6dfbcf56d24cc9";
-    sha256 = "sha256-sv9Q0qEQVncQw3QLiro5YfVcHJAG8sJ0GTjduCZ0iP4=";
+    rev = "ff5d738a9f9d85847e6fc226f8324ad9cf466007";
+    sha256 = "sha256-p5QYM6jbsqe9a3UouHdVimSxZeBvsoM/hb0UQ7iV1IM=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-docs";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
deleted file mode 100644
index c24a3e860d7c..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"
-gem "sawyer", "0.9.2"
-gem "octokit", "5.6.1"
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
deleted file mode 100644
index f2931a5d4ad1..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
+++ /dev/null
@@ -1,33 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    faraday (2.12.3)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
-    json (2.10.2)
-    logger (1.7.0)
-    net-http (0.6.0)
-      uri
-    octokit (5.6.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    public_suffix (6.0.1)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    uri (1.0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  octokit (= 5.6.1)
-  sawyer (= 0.9.2)
-
-BUNDLED WITH
-   2.5.22
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
deleted file mode 100644
index 972a06f778c0..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-github";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-github";
-    rev = "59e5fc5692959c6c564ab0e09de364ccfedd6702";
-    sha256 = "sha256-b+8eSw8Kbz2CZN16Rd7c8uyH5P1iYhOJmdXu1C5UclU=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-github";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Adds GitHub badges and linkback functionality";
-  };
-
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
deleted file mode 100644
index 36d463ebb5c5..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  addressable = {
-    dependencies = [ "public_suffix" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
-      type = "gem";
-    };
-    version = "2.8.7";
-  };
-  faraday = {
-    dependencies = [
-      "faraday-net_http"
-      "json"
-      "logger"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0dxalpc0ldvjjmd7z95na9lm99d2baz48sf9axk3a6x3pn50ibdi";
-      type = "gem";
-    };
-    version = "2.12.3";
-  };
-  faraday-net_http = {
-    dependencies = [ "net-http" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
-      type = "gem";
-    };
-    version = "3.4.0";
-  };
-  json = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
-      type = "gem";
-    };
-    version = "2.10.2";
-  };
-  logger = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  net-http = {
-    dependencies = [ "uri" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  octokit = {
-    dependencies = [
-      "faraday"
-      "sawyer"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8";
-      type = "gem";
-    };
-    version = "5.6.1";
-  };
-  public_suffix = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
-      type = "gem";
-    };
-    version = "6.0.1";
-  };
-  sawyer = {
-    dependencies = [
-      "addressable"
-      "faraday"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
-  uri = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix
index 898806d4b8f0..c93a3e115878 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix
@@ -7,6 +7,7 @@
 mkDiscoursePlugin {
   name = "discourse-ldap-auth";
   bundlerEnvArgs.gemdir = ./.;
+  pluginName = "ldap";
   src = fetchFromGitHub {
     owner = "jonmbake";
     repo = "discourse-ldap-auth";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
deleted file mode 100644
index db65b1d07a59..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-math";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-math";
-    rev = "90a56a5b463546cba5017cf25168bae759bcbf77";
-    sha256 = "sha256-q8cNRIHYEkaE6QkdsHu4tPwSw3LnCNgKjbyESBXheE0=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-math";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Official MathJax support for Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile
deleted file mode 100644
index ba35ee28efa9..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"
-gem 'bcrypt', '3.1.13'
-gem 'unix-crypt', '1.3.0'
-gem 'ffi-compiler', '1.0.1', require: false
-gem 'argon2', '2.2.0'
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
deleted file mode 100644
index e806952546ee..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
+++ /dev/null
@@ -1,25 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    argon2 (2.2.0)
-      ffi (~> 1.15)
-      ffi-compiler (~> 1.0)
-    bcrypt (3.1.13)
-    ffi (1.17.0)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    rake (13.2.1)
-    unix-crypt (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  argon2 (= 2.2.0)
-  bcrypt (= 3.1.13)
-  ffi-compiler (= 1.0.1)
-  unix-crypt (= 1.3.0)
-
-BUNDLED WITH
-   2.5.11
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix
deleted file mode 100644
index 862e53fa4433..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-migratepassword";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "communiteq";
-    repo = "discourse-migratepassword";
-    rev = "a732ae244cd4125561fd225a67bae95ef5f738d0";
-    sha256 = "sha256-EO+QnFTy3PgxZ92DZBm9sP8sFAny3ZpFw+faTX32j7Q=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/communiteq/discourse-migratepassword";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.gpl2Only;
-    description = "Support migrated password hashes";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix
deleted file mode 100644
index d1c88454e8bc..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  argon2 = {
-    dependencies = [
-      "ffi"
-      "ffi-compiler"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  bcrypt = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ai0m15jg3n0b22mimk09ppnga316dc7dyvz06w8rrqh5gy1lslp";
-      type = "gem";
-    };
-    version = "3.1.13";
-  };
-  ffi = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
-      type = "gem";
-    };
-    version = "1.17.0";
-  };
-  ffi-compiler = {
-    dependencies = [
-      "ffi"
-      "rake"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  rake = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
-      type = "gem";
-    };
-    version = "13.2.1";
-  };
-  unix-crypt = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
deleted file mode 100644
index 7da32ec03949..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-group :development do
-  gem 'rubocop-discourse'
-end
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
deleted file mode 100644
index 6a91a08c0e86..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
+++ /dev/null
@@ -1,37 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    parallel (1.22.1)
-    parser (3.1.1.0)
-      ast (~> 2.4.1)
-    rainbow (3.1.1)
-    regexp_parser (2.2.1)
-    rexml (3.2.5)
-    rubocop (1.26.1)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
-    rubocop-discourse (2.5.0)
-      rubocop (>= 1.1.0)
-      rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.9.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rubocop-discourse
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
deleted file mode 100644
index 9cad18c9eb5b..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin rec {
-  name = "discourse-oauth2-basic";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = name;
-    rev = "06ba5daa9aabd0487f2f30b944b6500f1f481308";
-    sha256 = "sha256-T08Q36k2hb9wVimKIa4O5mWcrr6VBTfHvhRJiLBiRPY=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/${name}";
-    license = licenses.mit;
-    description = "Basic OAuth2 plugin for use with Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
deleted file mode 100644
index 8bbea6576bf1..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  ast = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
-      type = "gem";
-    };
-    version = "2.4.2";
-  };
-  parallel = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
-      type = "gem";
-    };
-    version = "1.22.1";
-  };
-  parser = {
-    dependencies = [ "ast" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
-      type = "gem";
-    };
-    version = "3.1.1.0";
-  };
-  rainbow = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
-      type = "gem";
-    };
-    version = "3.1.1";
-  };
-  regexp_parser = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  rexml = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
-      type = "gem";
-    };
-    version = "3.2.5";
-  };
-  rubocop = {
-    dependencies = [
-      "parallel"
-      "parser"
-      "rainbow"
-      "regexp_parser"
-      "rexml"
-      "rubocop-ast"
-      "ruby-progressbar"
-      "unicode-display_width"
-    ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
-      type = "gem";
-    };
-    version = "1.26.1";
-  };
-  rubocop-ast = {
-    dependencies = [ "parser" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
-      type = "gem";
-    };
-    version = "1.16.0";
-  };
-  rubocop-discourse = {
-    dependencies = [
-      "rubocop"
-      "rubocop-rspec"
-    ];
-    groups = [ "development" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g";
-      type = "gem";
-    };
-    version = "2.5.0";
-  };
-  rubocop-rspec = {
-    dependencies = [ "rubocop" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6";
-      type = "gem";
-    };
-    version = "2.9.0";
-  };
-  ruby-progressbar = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
-      type = "gem";
-    };
-    version = "1.11.0";
-  };
-  unicode-display_width = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile
deleted file mode 100644
index 7da32ec03949..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-group :development do
-  gem 'rubocop-discourse'
-end
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock
deleted file mode 100644
index 0987b206fa66..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock
+++ /dev/null
@@ -1,37 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.1)
-    parallel (1.19.2)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    regexp_parser (1.8.1)
-    rexml (3.2.5)
-    rubocop (0.93.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
-      parser (>= 2.7.1.5)
-    rubocop-discourse (2.3.2)
-      rubocop (>= 0.69.0)
-      rubocop-rspec (>= 1.39.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rubocop-discourse
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
deleted file mode 100644
index df9095c817d6..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-openid-connect";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-openid-connect";
-    rev = "e08efecc012a5ab8fa95084be93d4fd07ccebab9";
-    sha256 = "sha256-v4UWFDdOFON+nHkH490kBQ4sXX7Mrp7KVhN1x9HML7w=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-openid-connect";
-    maintainers = with maintainers; [ mkg20001 ];
-    license = licenses.mit;
-    description = "Discourse plugin to integrate Discourse with an openid-connect login provider";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix
deleted file mode 100644
index 37d643eb7d03..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  ast = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  parallel = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
-      type = "gem";
-    };
-    version = "1.19.2";
-  };
-  parser = {
-    dependencies = [ "ast" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
-      type = "gem";
-    };
-    version = "2.7.2.0";
-  };
-  rainbow = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  regexp_parser = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
-      type = "gem";
-    };
-    version = "1.8.1";
-  };
-  rexml = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
-      type = "gem";
-    };
-    version = "3.2.5";
-  };
-  rubocop = {
-    dependencies = [
-      "parallel"
-      "parser"
-      "rainbow"
-      "regexp_parser"
-      "rexml"
-      "rubocop-ast"
-      "ruby-progressbar"
-      "unicode-display_width"
-    ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1nrv7i81549addig09grw17qkab3l4319dcsf9y7psl7aa76ng3a";
-      type = "gem";
-    };
-    version = "0.93.0";
-  };
-  rubocop-ast = {
-    dependencies = [ "parser" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "129hgz4swc8n0g01715v7y00k0h4mlzkxh63q7z27q7mjp54rl74";
-      type = "gem";
-    };
-    version = "0.7.1";
-  };
-  rubocop-discourse = {
-    dependencies = [
-      "rubocop"
-      "rubocop-rspec"
-    ];
-    groups = [ "development" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "10l2wwnvd4xccgqsyhxrhc5bw10b7an4awl0v90fw5xf2qdjiflw";
-      type = "gem";
-    };
-    version = "2.3.2";
-  };
-  rubocop-rspec = {
-    dependencies = [ "rubocop" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1sc0bwdxzfr8byxzwvfyf22lwzqcaa6ca7wzxx31mk7vvy7r7dhl";
-      type = "gem";
-    };
-    version = "1.43.2";
-  };
-  ruby-progressbar = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
-      type = "gem";
-    };
-    version = "1.10.1";
-  };
-  unicode-display_width = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
index 349057769dd8..db3f2d84b027 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
@@ -10,8 +10,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-prometheus";
-    rev = "f46906e1d555f6838d74ea38d5037264cc1020b0";
-    sha256 = "sha256-czrxhH0L+vCZA8DKN6acW///iWJs9GIppEeaP2MOJBQ=";
+    rev = "a1e0ba671e13ceb9541a4d62d3ff7d206393d438";
+    sha256 = "sha256-tZdRbLxUs4qPbN39g/y1dVCa0b+6Pk8uvCvsKVbUkMk=";
   };
 
   patches = [
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
deleted file mode 100644
index 6733d343c1d0..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-reactions";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-reactions";
-    rev = "f87583d9054421869ba0de16c24ad15e32bbebe7";
-    sha256 = "sha256-v2AkpSTF3VNgBUfvRMQ3BCw0nClWjcVTdKNn9yiByBM=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-reactions";
-    maintainers = with maintainers; [ bbenno ];
-    license = licenses.mit;
-    description = "Allows users to react to a post from a choice of emojis, rather than only the like heart";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
index 3c69b86189e0..0fe4190d41d6 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-saved-searches";
-    rev = "b78aae086e95255b1a1e91a01e2d56b45b7aead2";
-    sha256 = "sha256-Wai+oZR+Pzjre6Th0kQDgvFOwfPRHlZkpKYYOUKNlx4=";
+    rev = "e9afd599d95fa79ba8a37316290c1a059e995e04";
+    sha256 = "sha256-UtXDY3IxxM+JFOGZlN9mgiwrDImOAzJJuHNlhIdnotM=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-saved-searches";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
deleted file mode 100644
index 9c919190dad6..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-solved";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-solved";
-    rev = "e82c6ae1ca38ccebb34669148f8de93a3028906e";
-    sha256 = "sha256-KwpBCk4fjkZlSzgtc0OXvQupPd+aPb9nONyyALpEZhg=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-solved";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Allow accepted answers on topics";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
deleted file mode 100644
index 75f78b9d6b70..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-spoiler-alert";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-spoiler-alert";
-    rev = "42b77ec048b9b386a8b25a22bfec6472817da465";
-    sha256 = "sha256-BQeID+y9RvmcnuNsodOMXseVvre5QYxv+E/ul8bucUI=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-spoiler-alert";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Hide spoilers behind the spoiler-alert jQuery plugin";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
deleted file mode 100644
index ba4344edae74..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-voting";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-topic-voting";
-    rev = "d779202749e56aaee2d548b538796fb5db1b9b7c";
-    sha256 = "sha256-8YF7W5SXhI7TGJNZkx5or7bxI0MKiDtx10TE2ekBMuM=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-voting";
-    maintainers = with maintainers; [ dpausp ];
-    license = licenses.gpl2Only;
-    description = "Adds the ability for voting on a topic within a specified category in Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
index 2d9c8240f0bd..8043d24ad70f 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-yearly-review";
-    rev = "439e0d78f1d8a0f387c0ec26f233a090ce82ef72";
-    sha256 = "sha256-DXA5P7XnItBjP4H1J/G1cGbFddSDZh0wjMZiJ5JA9s8=";
+    rev = "a6baf4a5998a616091d94c31c23b9930409cd3e2";
+    sha256 = "sha256-KP/lQqS47oGTz4Rw/+0p2LZVQEWdUtx0sRPxh3/Ua8A=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-yearly-review";
diff --git a/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch b/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch
new file mode 100644
index 000000000000..895696d3c6e5
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
+index a5a5b8f943..30faee615d 100644
+--- a/lib/plugin/instance.rb
++++ b/lib/plugin/instance.rb
+@@ -1383,7 +1383,7 @@ class Plugin::Instance
+     contents = javascript_includes.map { |js| File.read(js) }
+ 
+     if contents.present?
+-      ensure_directory(extra_js_file_path)
++      ensure_directory(File.realpath(extra_js_file_path))
+       Discourse::Utils.atomic_write_file(extra_js_file_path, contents.join("\n;\n"))
+     else
+       begin
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
index 869b2d548b3d..1f4e17fe1622 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
@@ -1,26 +1,24 @@
 # frozen_string_literal: true
 
+ruby "~> 3.3"
+
 source "https://rubygems.org"
 # if there is a super emergency and rubygems is playing up, try
 #source 'http://production.cf.rubygems.org'
 
 gem "bootsnap", require: false, platform: :mri
 
-gem "actionmailer", "~> 7.2.0"
-gem "actionpack", "~> 7.2.0"
-gem "actionview", "~> 7.2.0"
-gem "activemodel", "~> 7.2.0"
-gem "activerecord", "~> 7.2.0"
-gem "activesupport", "~> 7.2.0"
-gem "railties", "~> 7.2.0"
-gem "sprockets-rails"
+gem "actionmailer", "~> 8.0.0"
+gem "actionpack", "~> 8.0.0"
+gem "actionview", "~> 8.0.0"
+gem "activemodel", "~> 8.0.0"
+gem "activerecord", "~> 8.0.0"
+gem "activesupport", "~> 8.0.0"
+gem "railties", "~> 8.0.0"
 
+gem "propshaft"
 gem "json"
 
-# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
-# We intend to drop sprockets rather than upgrade to 4.x
-gem "sprockets", "~> 3.7.3"
-
 # this will eventually be added to rails,
 # allows us to precompile all our templates in the unicorn master
 gem "actionview_precompiler", require: false
@@ -31,9 +29,11 @@ gem "mail"
 gem "mini_mime"
 gem "mini_suffix"
 
-# config/initializers/006-mini_profiler.rb depends upon the RedisClient#call.
-# Rework this when upgrading to redis client 5.0 and above.
-gem "redis", "< 5.0"
+# NOTE: hiredis-client is recommended for high performance use of Redis
+# however a recent attempt at an upgrade lead to https://meta.discourse.org/t/rebuild-error/375387
+# for now we are sticking with the socked based implementation that is not sensitive to this issue
+# gem "hiredis-client"
+gem "redis"
 
 # This is explicitly used by Sidekiq and is an optional dependency.
 # We tell Sidekiq to use the namespace "sidekiq" which triggers this
@@ -52,6 +52,7 @@ gem "active_model_serializers", "~> 0.8.3"
 gem "http_accept_language", require: false
 
 gem "discourse-fonts", require: "discourse_fonts"
+gem "discourse-emojis", require: "discourse_emojis"
 
 gem "message_bus"
 
@@ -61,6 +62,7 @@ gem "fastimage"
 
 gem "aws-sdk-s3", require: false
 gem "aws-sdk-sns", require: false
+gem "aws-sdk-mediaconvert", require: false
 gem "excon", require: false
 gem "unf", require: false
 
@@ -98,12 +100,12 @@ gem "rinku"
 gem "sidekiq"
 gem "mini_scheduler"
 
-gem "execjs", require: false
-gem "mini_racer", "0.17.pre13"
+gem "mini_racer"
 
 gem "highline", require: false
 
-gem "rack"
+# When unicorn is not used anymore, we can use Rack 3
+gem "rack", "< 3"
 
 gem "rack-protection" # security
 gem "cbor", require: false
@@ -116,22 +118,16 @@ gem "net-imap", require: false
 gem "net-pop", require: false
 gem "digest", require: false
 
-# Gems used only for assets and not required in production environments by default.
-# Allow everywhere for now cause we are allowing asset debugging in production
-group :assets do
-  gem "uglifier"
-end
+gem "goldiloader", require: false
 
 group :test do
   gem "capybara", require: false
   gem "webmock", require: false
-  gem "fakeweb", require: false
   gem "simplecov", require: false
-  gem "selenium-webdriver", "~> 4.14", require: false
-  gem "selenium-devtools", require: false
   gem "test-prof"
   gem "rails-dom-testing", require: false
   gem "minio_runner", require: false
+  gem "capybara-playwright-driver"
 end
 
 group :test, :development do
@@ -154,10 +150,9 @@ group :test, :development do
 
   gem "rswag-specs"
 
-  gem "annotate"
+  gem "annotaterb"
 
   gem "syntax_tree"
-  gem "syntax_tree-disable_ternary"
 
   gem "rspec-multi-mock"
 end
@@ -173,11 +168,11 @@ end
 
 if ENV["ALLOW_DEV_POPULATE"] == "1"
   gem "discourse_dev_assets"
-  gem "faker", "~> 2.16"
+  gem "faker"
 else
   group :development, :test do
     gem "discourse_dev_assets"
-    gem "faker", "~> 2.16"
+    gem "faker"
   end
 end
 
@@ -292,3 +287,28 @@ end
 gem "dry-initializer", "~> 3.1"
 
 gem "parallel"
+
+# for discourse-zendesk-plugin
+gem "inflection", require: false
+gem "multipart-post", require: false
+gem "faraday-multipart", require: false
+gem "zendesk_api", require: false
+
+# for discourse-subscriptions
+gem "stripe", require: false
+
+# for discourse-github
+gem "sawyer", require: false
+gem "octokit", require: false
+
+# for discourse-ai
+gem "tokenizers", require: false
+gem "tiktoken_ruby", require: false
+gem "discourse_ai-tokenizers", require: false
+gem "ed25519" # TODO: remove this as existing ssl gem should handle this
+gem "Ascii85", require: false
+gem "ruby-rc4", require: false
+gem "hashery", require: false
+gem "ttfunk", require: false
+gem "afm", require: false
+gem "pdf-reader", require: false
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
index c05f581c03f3..5958232a8a70 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
@@ -1,26 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    Ascii85 (2.0.1)
+    actionmailer (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      actionview (= 8.0.2.1)
+      activejob (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (8.0.2.1)
+      actionview (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (8.0.2.1)
+      activesupport (= 8.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -29,16 +29,16 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (8.0.2.1)
+      activesupport (= 8.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (8.0.2.1)
+      activesupport (= 8.0.2.1)
+    activerecord (8.0.2.1)
+      activemodel (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.2.1)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -50,47 +50,54 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    annotate (3.2.0)
-      activerecord (>= 3.2, < 8.0)
-      rake (>= 10.4, < 14.0)
-    ast (2.4.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.894.0)
-    aws-sdk-core (3.191.3)
+    afm (1.0.0)
+    annotaterb (4.18.0)
+      activerecord (>= 6.0.0)
+      activesupport (>= 6.0.0)
+    ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1134.0)
+    aws-sdk-core (3.227.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.143.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+      logger
+    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-mediaconvert (1.165.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.182.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sdk-sns (1.72.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-sns (1.96.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
     builder (3.3.0)
-    bullet (8.0.0)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (11.1.3)
+    byebug (12.0.0)
     capybara (3.40.0)
       addressable
       matrix
@@ -100,14 +107,18 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cbor (0.5.9.8)
+    capybara-playwright-driver (0.5.7)
+      addressable
+      capybara
+      playwright-ruby-client (>= 1.16.0)
+    cbor (0.5.10.1)
     certified (1.0.0)
-    cgi (0.4.1)
+    cgi (0.5.0)
     chunky_png (1.4.0)
     coderay (1.1.3)
     colored2 (4.0.3)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.3)
     cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -116,63 +127,93 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.21.0)
+    css_parser (1.21.1)
       addressable
-    csv (3.3.2)
+    csv (3.3.5)
     date (3.4.1)
     debug_inspector (1.2.0)
-    diff-lcs (1.5.1)
-    diffy (3.4.3)
+    diff-lcs (1.6.2)
+    diffy (3.4.4)
     digest (3.2.0)
     digest-xxhash (0.2.9)
-    discourse-fonts (0.0.18)
+    discourse-emojis (1.0.41)
+    discourse-fonts (0.0.19)
     discourse-seed-fu (2.3.12)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    discourse_dev_assets (0.0.4)
-      faker (~> 2.16)
+    discourse_ai-tokenizers (0.3.1)
+      activesupport (>= 6.0)
+      tiktoken_ruby (~> 0.0.11.1)
+      tokenizers (~> 0.5.4)
+    discourse_dev_assets (0.0.5)
+      faker (~> 3.5.1)
       literate_randomizer
     docile (1.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
     dry-initializer (3.2.0)
+    ed25519 (1.4.0)
     email_reply_trimmer (0.2.0)
+    erb (5.0.2)
     erubi (1.13.1)
-    excon (1.2.3)
-    execjs (2.10.0)
+    excon (1.2.5)
+      logger
     exifr (1.4.1)
-    extralite-bundle (2.8.2)
-    fabrication (2.31.0)
-    faker (2.23.0)
+    extralite-bundle (2.13)
+    fabrication (3.0.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    fakeweb (1.3.0)
-    faraday (2.12.2)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
-    faraday-retry (2.2.1)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
     fast_blank (1.0.1)
     fastimage (2.3.1)
-    ffi (1.17.1)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     fspath (3.1.2)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (4.29.3)
+    goldiloader (5.4.0)
+      activerecord (>= 6.1, < 8.1)
+      activesupport (>= 6.1, < 8.1)
+    google-protobuf (4.32.0)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.29.3-arm64-darwin)
+    google-protobuf (4.32.0-aarch64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.29.3-x86_64-darwin)
+    google-protobuf (4.32.0-aarch64-linux-musl)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-linux-musl)
       bigdecimal
       rake (>= 13)
     guess_html_encoding (0.0.11)
     hana (1.3.7)
-    hashdiff (1.1.2)
+    hashdiff (1.2.0)
+    hashery (2.1.2)
     hashie (5.0.0)
     highline (3.1.2)
       reline
@@ -188,15 +229,16 @@ GEM
       progress (~> 3.0, >= 3.0.1)
     image_size (3.4.0)
     in_threads (1.6.0)
-    io-console (0.8.0)
-    irb (1.15.1)
+    inflection (1.0.0)
+    io-console (0.8.1)
+    irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso8601 (0.13.0)
     jmespath (1.6.2)
-    json (2.9.1)
-    json-schema (5.1.1)
+    json (2.13.2)
+    json-schema (5.2.2)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     json_schemer (2.4.0)
@@ -207,10 +249,14 @@ GEM
     jwt (2.10.1)
       base64
     kgio (2.11.4)
-    language_server-protocol (3.17.0.4)
-    libv8-node (22.7.0.4)
-    libv8-node (22.7.0.4-arm64-darwin)
-    libv8-node (22.7.0.4-x86_64-darwin)
+    language_server-protocol (3.17.0.5)
+    libv8-node (24.1.0.0)
+    libv8-node (24.1.0.0-aarch64-linux)
+    libv8-node (24.1.0.0-arm64-darwin)
+    libv8-node (24.1.0.0-x86_64-darwin)
+    libv8-node (24.1.0.0-x86_64-linux)
+    libv8-node (24.1.0.0-x86_64-linux-musl)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -222,8 +268,8 @@ GEM
       railties (>= 4)
       request_store (~> 1.0)
     logstash-event (1.2.02)
-    logster (2.20.0)
-    loofah (2.24.0)
+    logster (2.20.1)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lru_redux (1.1.0)
@@ -233,50 +279,67 @@ GEM
       net-imap
       net-pop
       net-smtp
-    matrix (0.4.2)
+    matrix (0.4.3)
     maxminddb (0.1.22)
     memory_profiler (1.1.0)
-    message_bus (4.3.8)
+    message_bus (4.4.1)
       rack (>= 1.1.3)
     messageformat-wrapper (1.1.0)
       mini_racer (>= 0.6.3)
     method_source (1.1.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0812)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    mini_racer (0.17.0.pre13)
-      libv8-node (~> 22.7.0.4)
+    mini_racer (0.19.0)
+      libv8-node (~> 24.1.0.0)
     mini_scheduler (0.18.0)
       sidekiq (>= 6.5, < 8.0)
     mini_sql (1.6.0)
     mini_suffix (0.3.3)
       ffi (~> 1.9)
-    minio_runner (0.1.2)
-    minitest (5.25.4)
+    minio_runner (1.0.0)
+    minitest (5.25.5)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
-    msgpack (1.7.5)
-    multi_json (1.15.0)
-    multi_xml (0.7.1)
+    msgpack (1.8.0)
+    multi_json (1.17.0)
+    multi_xml (0.7.2)
       bigdecimal (~> 3.1)
+    multipart-post (2.4.1)
     mustache (1.1.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.2)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.2-arm64-darwin)
+    nokogiri (1.18.9-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-darwin)
+    nokogiri (1.18.9-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -290,22 +353,26 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    oj (3.16.9)
+    octokit (5.6.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (1.9.2)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
+      rack-protection
     omniauth-facebook (9.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.8.2)
+    omniauth-github (2.0.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
+    omniauth-google-oauth2 (1.0.1)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
-      omniauth (~> 1.1)
-      omniauth-oauth2 (>= 1.6)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
     omniauth-oauth (1.2.1)
       oauth
       omniauth (>= 1.0, < 3)
@@ -319,40 +386,60 @@ GEM
     openssl (3.3.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    optimist (3.2.0)
-    ostruct (0.6.1)
-    parallel (1.26.3)
-    parallel_tests (4.9.0)
+    optimist (3.2.1)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parallel_tests (5.4.0)
       parallel
-    parser (3.3.7.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.9)
+    pdf-reader (2.15.0)
+      Ascii85 (>= 1.0, < 3.0, != 2.0.0)
+      afm (>= 0.2.1, < 2)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
+    pg (1.6.1)
+    pg (1.6.1-aarch64-linux)
+    pg (1.6.1-aarch64-linux-musl)
+    pg (1.6.1-arm64-darwin)
+    pg (1.6.1-x86_64-darwin)
+    pg (1.6.1-x86_64-linux)
+    pg (1.6.1-x86_64-linux-musl)
+    playwright-ruby-client (1.54.1)
+      concurrent-ruby (>= 1.1.6)
+      mime-types (>= 3.0)
     pp (0.6.2)
       prettyprint
     prettier_print (1.2.1)
     prettyprint (0.2.0)
+    prism (1.4.0)
     progress (3.6.0)
-    pry (0.14.2)
+    propshaft (1.2.1)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.10)
-    rack-mini-profiler (3.3.1)
+    rack (2.2.17)
+    rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
@@ -364,23 +451,23 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails_failover (2.2.0)
-      activerecord (>= 6.1, < 8.0)
+    rails_failover (2.3.0)
+      activerecord (>= 6.1, < 9.0)
       concurrent-ruby
-      railties (>= 6.1, < 8.0)
-    rails_multisite (6.1.0)
-      activerecord (>= 6.0)
-      railties (>= 6.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+      railties (>= 6.1, < 9.0)
+    rails_multisite (7.0.0)
+      activerecord (>= 7.1)
+      railties (>= 7.1)
+    railties (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -388,62 +475,67 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbtrace (0.5.1)
+    rb_sys (0.9.106)
+    rbtrace (0.5.2)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.9.0)
-    rdoc (6.11.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    redcarpet (3.6.0)
-    redis (4.8.1)
+    redcarpet (3.6.1)
+    redis (5.4.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.25.2)
+      connection_pool
     redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.10.0)
-    reline (0.6.0)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
     rexml (3.4.1)
     rinku (2.0.6)
     rotp (6.3.0)
-    rouge (4.5.1)
-    rqrcode (2.2.0)
+    rouge (4.6.0)
+    rqrcode (3.1.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 1.0)
-    rqrcode_core (1.2.0)
+      rqrcode_core (~> 2.0)
+    rqrcode_core (2.0.0)
     rrule (0.6.0)
       activesupport (>= 2.3)
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-multi-mock (0.3.1)
       rspec (>= 3.7.0)
-    rspec-rails (7.1.0)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.2)
+    rspec-support (3.13.4)
     rss (0.3.1)
       rexml
     rswag-specs (2.16.0)
@@ -453,42 +545,52 @@ GEM
       rspec-core (>= 2.14)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.71.1)
+    rubocop (1.79.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-discourse (3.9.3)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-discourse (3.12.1)
       activesupport (>= 6.1)
-      rubocop (>= 1.59.0)
-      rubocop-capybara (>= 2.0.0)
-      rubocop-factory_bot (>= 2.0.0)
-      rubocop-rails (>= 2.25.0)
+      lint_roller (>= 1.1.0)
+      rubocop (>= 1.73.2)
+      rubocop-capybara (>= 2.22.0)
+      rubocop-factory_bot (>= 2.27.0)
+      rubocop-rails (>= 2.30.3)
       rubocop-rspec (>= 3.0.1)
-      rubocop-rspec_rails (>= 2.30.0)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-rails (2.29.1)
+      rubocop-rspec_rails (>= 2.31.0)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.4.0)
-      rubocop (~> 1.61)
-    rubocop-rspec_rails (2.30.0)
-      rubocop (~> 1.61)
-      rubocop-rspec (~> 3, >= 3.0.1)
-    ruby-prof (1.7.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    ruby-prof (1.7.2)
+      base64
     ruby-progressbar (1.13.0)
+    ruby-rc4 (0.1.5)
     ruby-readability (0.7.2)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
@@ -497,115 +599,151 @@ GEM
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
-    sass-embedded (1.77.5)
-      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.90.0)
+      google-protobuf (~> 4.31)
       rake (>= 13)
-    sass-embedded (1.77.5-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.5-x86_64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-    sassc-embedded (1.77.7)
-      sass-embedded (~> 1.77)
+    sass-embedded (1.90.0-aarch64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-aarch64-linux-musl)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-arm-linux-gnueabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-arm-linux-musleabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-arm64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-x86_64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-x86_64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-x86_64-linux-musl)
+      google-protobuf (~> 4.31)
+    sassc-embedded (1.80.5)
+      sass-embedded (~> 1.80)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
-    selenium-devtools (0.135.0)
-      selenium-webdriver (~> 4.2)
-    selenium-webdriver (4.31.0)
-      base64 (~> 0.2)
-      logger (~> 1.4)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    shoulda-matchers (6.4.0)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.5.12)
-      connection_pool (>= 2.2.5, < 3)
-      rack (~> 2.0)
-      redis (>= 4.5.0, < 5)
+    sidekiq (7.3.9)
+      base64
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.3)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    sprockets (3.7.5)
-      base64
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
-    sqlite3 (2.5.0)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
+    sqlite3 (2.7.3)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.5.0-arm64-darwin)
-    sqlite3 (2.5.0-x86_64-darwin)
+    sqlite3 (2.7.3-aarch64-linux-gnu)
+    sqlite3 (2.7.3-aarch64-linux-musl)
+    sqlite3 (2.7.3-arm-linux-gnu)
+    sqlite3 (2.7.3-arm-linux-musl)
+    sqlite3 (2.7.3-arm64-darwin)
+    sqlite3 (2.7.3-x86_64-darwin)
+    sqlite3 (2.7.3-x86_64-linux-gnu)
+    sqlite3 (2.7.3-x86_64-linux-musl)
     sshkey (3.0.0)
     stackprof (0.2.27)
-    stringio (3.1.2)
-    syntax_tree (6.2.0)
+    stringio (3.1.7)
+    stripe (11.1.0)
+    syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
-    syntax_tree-disable_ternary (1.0.0)
     test-prof (1.4.4)
-    thor (1.3.2)
+    thor (1.4.0)
+    tiktoken_ruby (0.0.11.1)
+      rb_sys (= 0.9.106)
+    tiktoken_ruby (0.0.11.1-aarch64-linux)
+    tiktoken_ruby (0.0.11.1-arm-linux)
+    tiktoken_ruby (0.0.11.1-arm64-darwin)
+    tiktoken_ruby (0.0.11.1-x86_64-darwin)
+    tiktoken_ruby (0.0.11.1-x86_64-linux)
+    tiktoken_ruby (0.0.11.1-x86_64-linux-musl)
     timeout (0.4.3)
+    tokenizers (0.5.5)
+      rb_sys
+    tokenizers (0.5.5-aarch64-linux)
+    tokenizers (0.5.5-aarch64-linux-musl)
+    tokenizers (0.5.5-arm64-darwin)
+    tokenizers (0.5.5-x86_64-darwin)
+    tokenizers (0.5.5-x86_64-linux)
+    tokenizers (0.5.5-x86_64-linux-musl)
     trilogy (2.9.0)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2025.1)
+    tzinfo-data (1.2025.2)
       tzinfo (>= 1.0.0)
-    uglifier (4.2.1)
-      execjs (>= 0.3.0, < 3)
     unf (0.2.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.16.0)
-    uri (1.0.2)
+    uniform_notifier (1.17.0)
+    uri (1.0.3)
     useragent (0.16.11)
-    version_gem (1.1.4)
+    version_gem (1.1.8)
     web-push (3.0.1)
       jwt (~> 2.0)
       openssl (~> 3.0)
-    webmock (3.24.0)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket (1.2.11)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yaml-lint (0.1.2)
     yard (0.9.37)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.3)
+    zendesk_api (1.38.0.rc1)
+      faraday (> 2.0.0)
+      faraday-multipart
+      hashie (>= 3.5.2, < 6.0.0)
+      inflection
+      mini_mime
+      multipart-post (~> 2.0)
 
 PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
-  arm64-darwin-24
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-gnueabihf
+  arm-linux-musl
+  arm-linux-musleabihf
+  arm64-darwin
   ruby
-  x86_64-darwin-22
-  x86_64-darwin-23
-  x86_64-darwin-24
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  actionmailer (~> 7.2.0)
-  actionpack (~> 7.2.0)
-  actionview (~> 7.2.0)
+  Ascii85
+  actionmailer (~> 8.0.0)
+  actionpack (~> 8.0.0)
+  actionview (~> 8.0.0)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (~> 7.2.0)
-  activerecord (~> 7.2.0)
-  activesupport (~> 7.2.0)
+  activemodel (~> 8.0.0)
+  activerecord (~> 8.0.0)
+  activesupport (~> 8.0.0)
   addressable
-  annotate
+  afm
+  annotaterb
+  aws-sdk-mediaconvert
   aws-sdk-s3
   aws-sdk-sns
   better_errors
@@ -614,6 +752,7 @@ DEPENDENCIES
   bullet
   byebug
   capybara
+  capybara-playwright-driver
   cbor
   certified
   cgi (>= 0.3.6)
@@ -625,25 +764,30 @@ DEPENDENCIES
   diffy
   digest
   digest-xxhash
+  discourse-emojis
   discourse-fonts
   discourse-seed-fu
+  discourse_ai-tokenizers
   discourse_dev_assets
   dry-initializer (~> 3.1)
+  ed25519
   email_reply_trimmer
   excon
-  execjs
   extralite-bundle
   fabrication
-  faker (~> 2.16)
-  fakeweb
+  faker
   faraday
+  faraday-multipart
   faraday-retry
   fast_blank
   fastimage
+  goldiloader
+  hashery
   highline
   htmlentities
   http_accept_language
   image_optim
+  inflection
   iso8601
   json
   json_schemer
@@ -660,19 +804,21 @@ DEPENDENCIES
   message_bus
   messageformat-wrapper
   mini_mime
-  mini_racer (= 0.17.pre13)
+  mini_racer
   mini_scheduler
   mini_sql
   mini_suffix
   minio_runner
   mocha
   multi_json
+  multipart-post
   mustache
   net-http
   net-imap
   net-pop
   net-smtp
   nokogiri
+  octokit
   oj
   omniauth
   omniauth-facebook
@@ -682,24 +828,26 @@ DEPENDENCIES
   omniauth-twitter
   parallel
   parallel_tests
+  pdf-reader
   pg
+  propshaft
   pry-byebug
   pry-rails
   pry-stack_explorer
   puma
-  rack
+  rack (< 3)
   rack-mini-profiler
   rack-protection
   rails-dom-testing
   rails_failover
   rails_multisite
-  railties (~> 7.2.0)
+  railties (~> 8.0.0)
   rake
   rb-fsevent
   rbtrace
   rchardet
   redcarpet
-  redis (< 5.0)
+  redis
   redis-namespace
   rinku
   rotp
@@ -715,27 +863,27 @@ DEPENDENCIES
   rubocop-discourse
   ruby-prof
   ruby-progressbar
+  ruby-rc4
   ruby-readability
   rubyzip
   sanitize
   sassc-embedded
-  selenium-devtools
-  selenium-webdriver (~> 4.14)
+  sawyer
   shoulda-matchers
   sidekiq
   simplecov
-  sprockets (~> 3.7.3)
-  sprockets-rails
   sqlite3
   sshkey
   stackprof
+  stripe
   syntax_tree
-  syntax_tree-disable_ternary
   test-prof
   thor
+  tiktoken_ruby
+  tokenizers
   trilogy
+  ttfunk
   tzinfo-data
-  uglifier
   unf
   unicorn
   web-push
@@ -743,6 +891,356 @@ DEPENDENCIES
   yaml-lint
   yard
   zeitwerk
+  zendesk_api
+
+CHECKSUMS
+  Ascii85 (2.0.1) sha256=15cb5d941808543cbb9e7e6aea3c8ec3877f154c3461e8b3673e97f7ecedbe5a
+  actionmailer (8.0.2.1) sha256=0de14d8d04541eab130858cb2f0697266be42de1afe1104bc43d7998137ddb9c
+  actionpack (8.0.2.1) sha256=61e7e11a31dbe5152ca57221788bdca42ef302c4cc53b4c8993d68dce8982b0a
+  actionview (8.0.2.1) sha256=2ea6d20ccb0b7b84a221a940ac06853ce99235e4ecb4947815839c7c5ecbf347
+  actionview_precompiler (0.4.0) sha256=33b6bd6ec4c1b856e02fdf5f6512c9eb4a92ac1c0545e941b3e354b7d540ed1c
+  active_model_serializers (0.8.4) sha256=7350e3d3b6a5946bbec033241d908013cc85ff4d584230e6aa074225547c754c
+  activejob (8.0.2.1) sha256=d6e5f2da07ec8efac13a38af1752416770dc74e95783f7b252506d707aa32b89
+  activemodel (8.0.2.1) sha256=17bab6cdb86531844113df22f864480a89a276bf0318246e628f99e0ac077ec4
+  activerecord (8.0.2.1) sha256=a6556e7bdd53f3889d18d2aa3a7ff115fd6c5e1463dd06f97fb88d06b58c6df1
+  activesupport (8.0.2.1) sha256=0405a76fd1ca989975d9ae00d46a4d3979bdf3817482d846b63affa84bd561c6
+  addressable (2.8.7) sha256=462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232
+  afm (1.0.0) sha256=5bd4d6f6241e7014ef090985ec6f4c3e9745f6de0828ddd58bc1efdd138f4545
+  annotaterb (4.18.0) sha256=a07ec5d3e8f063308dbbf17970a74155434504a3c3887511cd94fbc83c4f4294
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
+  aws-partitions (1.1134.0) sha256=28f5f6156777ac346904a79ce6cb3b14a521e3866fee12a0da86d7b500266d3e
+  aws-sdk-core (3.227.0) sha256=99071fc5e3ca9347873fd114574319740c3041745df3c74e27875bd912dfc79e
+  aws-sdk-kms (1.99.0) sha256=ba292fc3ffd672532aae2601fe55ff424eee78da8e23c23ba6ce4037138275a8
+  aws-sdk-mediaconvert (1.165.0) sha256=d955a571cd8b0407c0778e1d0f2333a70bf9ab48e36c81da8c5b317db24001e4
+  aws-sdk-s3 (1.182.0) sha256=d0fc3579395cb6cb69bf6e975240ce031fc673190e74c8dddbdd6c18572b450d
+  aws-sdk-sns (1.96.0) sha256=f92b3c7203c53181b1cafb3dbbea85f330002ad696175bda829cfef359fa6dd4
+  aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
+  better_errors (2.10.1) sha256=f798f1bac93f3e775925b7fcb24cffbcf0bb62ee2210f5350f161a6b75fc0a73
+  bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
+  binding_of_caller (1.0.1) sha256=2b2902abff4246ddcfbc4da9b69bc4a019e22aeb300c2ff6289a173d4b90b29a
+  bootsnap (1.18.6) sha256=0ae2393c1e911e38be0f24e9173e7be570c3650128251bf06240046f84a07d00
+  builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
+  bullet (8.0.8) sha256=b4b9905eb6b803d9a0ba620944ed79c8bb27ff3ca90ef8f8e39ff21db5b7c542
+  byebug (12.0.0) sha256=d4a150d291cca40b66ec9ca31f754e93fed8aa266a17335f71bb0afa7fca1a1e
+  capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef
+  capybara-playwright-driver (0.5.7) sha256=875a1928077d56be8b484f84674901a2374752d7842d93de2045bbede1aad242
+  cbor (0.5.10.1) sha256=79cdf79f18dcd9ee97e0b849c6d573e5a2e3ddc1954d180f384d6ed2612b6df0
+  certified (1.0.0) sha256=aa4cdf0e90e7ee96f6e0ce3daae39eaa8f0486124e0d92daf64d2105aeb9069c
+  cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da
+  chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe
+  coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
+  colored2 (4.0.3) sha256=63e1038183976287efc43034f5cca17fb180b4deef207da8ba78d051cbce2b37
+  concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
+  connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b
+  cose (1.3.1) sha256=d5d4dbcd6b035d513edc4e1ab9bc10e9ce13b4011c96e3d1b8fe5e6413fd6de5
+  cppjieba_rb (0.4.4) sha256=319a7ab57b6ec28a8d1b223487ecd114432f1930d7740db2f99c1991e6c8faaf
+  crack (1.0.0) sha256=c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49
+  crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
+  css_parser (1.21.1) sha256=6cfd3ffc0a97333b39d2b1b49c95397b05e0e3b684d68f77ec471ba4ec2ef7c7
+  csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
+  date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f
+  debug_inspector (1.2.0) sha256=9bdfa02eebc3da163833e6a89b154084232f5766087e59573b70521c77ea68a2
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3
+  digest (3.2.0) sha256=fa2e7092ec683f65d82fadde5ff4ca3b32e23ee0b19f1fc1a5e09993ad2d3991
+  digest-xxhash (0.2.9) sha256=a989d8309c03c4136a4bea9981ec0a146a2750de7f3dfb7b5624a3038aa598d7
+  discourse-emojis (1.0.41) sha256=b322e1de3849ae437152e267ab35101b57f27303ac7136af482962e48c63cc2a
+  discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033
+  discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4
+  discourse_ai-tokenizers (0.3.1) sha256=a7752f2f7b4b29fea148e2c893b287a1478c4dc8828f684c09e51d5a33bbc373
+  discourse_dev_assets (0.0.5) sha256=a09a801a210aa3f7247dd382dfd73b389d4bd02be86be675eca2d451f9898285
+  docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
+  drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
+  dry-initializer (3.2.0) sha256=37d59798f912dc0a1efe14a4db4a9306989007b302dcd5f25d0a2a20c166c4e3
+  ed25519 (1.4.0) sha256=16e97f5198689a154247169f3453ef4cfd3f7a47481fde0ae33206cdfdcac506
+  email_reply_trimmer (0.2.0) sha256=05843fa5ee1a2037235f1f3c876e922f613e2b4406fea5bb14212d1708d6c525
+  erb (5.0.2) sha256=d30f258143d4300fb4ecf430042ac12970c9bb4b33c974a545b8f58c1ec26c0f
+  erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9
+  excon (1.2.5) sha256=ca040bb61bc0059968f34a17115a00d2db8562e3c0c5c5c7432072b551c85a9d
+  exifr (1.4.1) sha256=768374cc6b6ff3743acba57c1c35229bdd8c6b9fbc1285952047fc1215c4b894
+  extralite-bundle (2.13) sha256=0d00338dd3b348f44a02bb9e93db3714231e7240a48320f1ee3a1db5197db3cc
+  fabrication (3.0.0) sha256=a6a0bfad9071348ad3cb1701df788524b888c0cdd044b988893e7509f7463be3
+  faker (3.5.2) sha256=f9a80291b2e3f259801d1dd552f0732fe04dce5d1f74e798365bc0413789c473
+  faraday (2.13.4) sha256=c719ff52cfd0dbaeca79dd83ed3aeea3f621032abf8bc959d1c05666157cac26
+  faraday-multipart (1.1.1) sha256=77a18ff40149030fd1aef55bb4fc7a67ce46419a8a3fcd010e28c2526e8d8903
+  faraday-net_http (3.4.1) sha256=095757fae7872b94eac839c08a1a4b8d84fd91d6886cfbe75caa2143de64ab3b
+  faraday-retry (2.3.2) sha256=2402d2029032ebd238a2046221e67f6ef0da78c5a8ce8cd4f8b9c62e4d6451d1
+  fast_blank (1.0.1) sha256=269fc30414fed4e6403bc4a49081e1ea539f8b9226e59276ed1efaefabaa17ea
+  fastimage (2.3.1) sha256=23c629f1f3e7d61bcfcc06c25b3d2418bc6bf41d2e615dbf5132c0e3b63ecce9
+  ffi (1.17.2) sha256=297235842e5947cc3036ebe64077584bff583cd7a4e94e9a02fdec399ef46da6
+  ffi (1.17.2-aarch64-linux-gnu) sha256=c910bd3cae70b76690418cce4572b7f6c208d271f323d692a067d59116211a1a
+  ffi (1.17.2-aarch64-linux-musl) sha256=69e6556b091d45df83e6c3b19d3c54177c206910965155a6ec98de5e893c7b7c
+  ffi (1.17.2-arm-linux-gnu) sha256=d4a438f2b40224ae42ec72f293b3ebe0ba2159f7d1bd47f8417e6af2f68dbaa5
+  ffi (1.17.2-arm-linux-musl) sha256=977dfb7f3a6381206dbda9bc441d9e1f9366bf189a634559c3b7c182c497aaa3
+  ffi (1.17.2-arm64-darwin) sha256=54dd9789be1d30157782b8de42d8f887a3c3c345293b57ffb6b45b4d1165f813
+  ffi (1.17.2-x86_64-darwin) sha256=981f2d4e32ea03712beb26e55e972797c2c5a7b0257955d8667ba58f2da6440e
+  ffi (1.17.2-x86_64-linux-gnu) sha256=05d2026fc9dbb7cfd21a5934559f16293815b7ce0314846fee2ac8efbdb823ea
+  ffi (1.17.2-x86_64-linux-musl) sha256=97c0eb3981414309285a64dc4d466bd149e981c279a56371ef811395d68cb95c
+  fspath (3.1.2) sha256=b5ac9bafb97e2c8f8f9e303cd98ebd484be76fe9aa588bc4d01c6d99e78c9d75
+  globalid (1.2.1) sha256=70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9
+  goldiloader (5.4.0) sha256=277a86ff424b963bc9d98d8f4d10bb7eea0eb010d3209893dea7092302350b73
+  google-protobuf (4.32.0) sha256=e64bdc0280e9bb9233fa3f62b72a5c4d1522679c5cb4485b0fec726d0b6b96ab
+  google-protobuf (4.32.0-aarch64-linux-gnu) sha256=764c3e3e4e4952f798746e5933375f50609572aa964b767d7ab0f96a57fca788
+  google-protobuf (4.32.0-aarch64-linux-musl) sha256=17d1442d5e266b96362c35fde23722797344083eddef459fe58731babcc7f52e
+  google-protobuf (4.32.0-arm64-darwin) sha256=c2a3508af783e0b72171a400c54040be7f65523126cb83f1686d521ef20f5b9b
+  google-protobuf (4.32.0-x86_64-darwin) sha256=60098f391bbb47c31df8f8fb7f86f307606bf560877f6253f9f142f024d86895
+  google-protobuf (4.32.0-x86_64-linux-gnu) sha256=0813ffbb2cade07e757be35a32036455d52cb18856e34666b508c492925d747b
+  google-protobuf (4.32.0-x86_64-linux-musl) sha256=d26307111f43a27065f38128d744b6e3fcebfb6c6c1595d3755787cda6eebced
+  guess_html_encoding (0.0.11) sha256=cab6468b945f38673fc41ad147fbbc89693b3c6c34b03b071e2ed669a603e098
+  hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d
+  hashdiff (1.2.0) sha256=c984f13e115bfc9953332e8e83bd9d769cfde9944e2d54e07eb9df7b76e140b5
+  hashery (2.1.2) sha256=d239cc2310401903f6b79d458c2bbef5bf74c46f3f974ae9c1061fb74a404862
+  hashie (5.0.0) sha256=9d6c4e51f2a36d4616cbc8a322d619a162d8f42815a792596039fc95595603da
+  highline (3.1.2) sha256=67cbd34d19f6ef11a7ee1d82ffab5d36dfd5b3be861f450fc1716c7125f4bb4a
+  htmlentities (4.3.4) sha256=125a73c6c9f2d1b62100b7c3c401e3624441b663762afa7fe428476435a673da
+  http_accept_language (2.1.1) sha256=0043f0d55a148cf45b604dbdd197cb36437133e990016c68c892d49dbea31634
+  i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f
+  image_optim (0.31.4) sha256=5bffd0891268e8d189d46ee4b8599918581bba1032d244e6ace4779a434776c0
+  image_size (3.4.0) sha256=c6a580513fe74947e25e5d3f0aea1e33add6c20f7d0007efa65504317b7f029a
+  in_threads (1.6.0) sha256=91a7e6138d279dc632f59b8a9a409e47148948e297c0f69c92f9a2479a182149
+  inflection (1.0.0) sha256=ceba9b26fc28b9af82e33e822d28f78a4312af75687efec81d5ef1062498d355
+  io-console (0.8.1) sha256=1e15440a6b2f67b6ea496df7c474ed62c860ad11237f29b3bd187f054b925fcb
+  irb (1.15.2) sha256=222f32952e278da34b58ffe45e8634bf4afc2dc7aa9da23fed67e581aa50fdba
+  iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
+  jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
+  json (2.13.2) sha256=02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68
+  json-schema (5.2.2) sha256=60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5
+  json_schemer (2.4.0) sha256=56cb6117bb5748d925b33ad3f415b513d41d25d0bbf57fe63c0a78ff05597c24
+  jwt (2.10.1) sha256=e6424ae1d813f63e761a04d6284e10e7ec531d6f701917fadcd0d9b2deaf1cc5
+  kgio (2.11.4) sha256=bda7a2146115998a5b07154e708e0ac02c38dcee7e793c33e2e14f600fdfffc6
+  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  libv8-node (24.1.0.0) sha256=2f0e9ac629c4c5753eaf7001952bb6dce4eb596f3dc0df3049ee7d9cfb9471cd
+  libv8-node (24.1.0.0-aarch64-linux) sha256=fe7787bdb082d1101f65d8f42572ec6c634776a334d82b9fedded152e1d4f358
+  libv8-node (24.1.0.0-arm64-darwin) sha256=f34bdd85787a32a16db137ffbe83feb1cd09f4d69ff3c43cd2f0a675656ee16b
+  libv8-node (24.1.0.0-x86_64-darwin) sha256=243cfae376d7d54b02fb9e8cfd2a2a08e791d066fb78252925a825f05805083b
+  libv8-node (24.1.0.0-x86_64-linux) sha256=0857486e64f7bd4133d4aa607c42d0abade1ab53dffcbfd30f12e0b7dba8f157
+  libv8-node (24.1.0.0-x86_64-linux-musl) sha256=080a243ac014054780cc0d0be2c18b93642a139d09622c0cfd1ebc8614d24437
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67
+  literate_randomizer (0.4.0) sha256=05073c9b383983b1ed7e26c40b963468e91bc86e663b3eeff3a4af91b84217b1
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  lograge (0.14.0) sha256=42371a75823775f166f727639f5ddce73dd149452a55fc94b90c303213dc9ae1
+  logstash-event (1.2.02) sha256=89a7dc60fac67070a5f60ba07409e541b09cb58906c391e90cb74b9f217467ae
+  logster (2.20.1) sha256=a84bbe58e7f99c4eb0246ea3a952ed87950f63aeea3cdbe7147018d10cc9a2a8
+  loofah (2.24.1) sha256=655a30842b70ec476410b347ab1cd2a5b92da46a19044357bbd9f401b009a337
+  lru_redux (1.1.0) sha256=ee71d0ccab164c51de146c27b480a68b3631d5b4297b8ffe8eda1c72de87affb
+  lz4-ruby (0.3.3) sha256=011be5ee230cfddc8308d4e2e0b05300c7bc755a887de799377ca6c5b6aede89
+  mail (2.8.1) sha256=ec3b9fadcf2b3755c78785cb17bc9a0ca9ee9857108a64b6f5cfc9c0b5bfc9ad
+  matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b
+  maxminddb (0.1.22) sha256=50933be438fbed9dceabef4163eab41884bd8830d171fdb8f739bee769c4907e
+  memory_profiler (1.1.0) sha256=79a17df7980a140c83c469785905409d3027ca614c42c086089d128b805aa8f8
+  message_bus (4.4.1) sha256=719ec5c3167e6571030dee0f43eafa99dbf68ae67fca6fd63c265ff55c0c2adb
+  messageformat-wrapper (1.1.0) sha256=ecea879626e412d1bc841c457dacfcbb1a62cf88ca83573e4ea34bb371f160bc
+  method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
+  mime-types (3.7.0) sha256=dcebf61c246f08e15a4de34e386ebe8233791e868564a470c3fe77c00eed5e56
+  mime-types-data (3.2025.0812) sha256=3b94426896fa1390304fb8c6fe23b69c2c6f471aa2bb0b59bd2ddc532bea0538
+  mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
+  mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289
+  mini_racer (0.19.0) sha256=9152694738db8b145ced843126e2a391f908732c069cb97bbc909c2bac16bbc1
+  mini_scheduler (0.18.0) sha256=d2f084f38da8d76c5844a92f0d6bd01fc9982a8b5e6c7679b6cf44c82da33503
+  mini_sql (1.6.0) sha256=5296637f6a4af5bb43e06788037e9a2968ff9c8eb65928befcba8cb41f42d6ee
+  mini_suffix (0.3.3) sha256=8d1d33f92f69a2247c9b7d27173235da90479d955cdb863b63a7f53843b722e7
+  minio_runner (1.0.0) sha256=ca0fc56a90c63b65a26cda632938c9075046835d41f4b9d1e165b0550eae0538
+  minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
+  mocha (2.7.1) sha256=8f7d538d5d3ebc75fc788b3d92fbab913a93a78462d2a3ce99d1bdde7af7f851
+  msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732
+  multi_json (1.17.0) sha256=76581f6c96aebf2e85f8a8b9854829e0988f335e8671cd1a56a1036eb75e4a1b
+  multi_xml (0.7.2) sha256=307a96dc48613badb7b2fc174fd4e62d7c7b619bc36ea33bfd0c49f64f5787ce
+  multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8
+  mustache (1.1.1) sha256=90891fdd50b53919ca334c8c1031eada1215e78d226d5795e523d6123a2717d0
+  net-http (0.6.0) sha256=9621b20c137898af9d890556848c93603716cab516dc2c89b01a38b894e259fb
+  net-imap (0.5.9) sha256=d95905321e1bd9f294ffc7ff8697be218eee1ec96c8504c0960964d0a0be33fc
+  net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3
+  net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
+  net-smtp (0.5.1) sha256=ed96a0af63c524fceb4b29b0d352195c30d82dd916a42f03c62a3a70e5b70736
+  nio4r (2.7.4) sha256=d95dee68e0bb251b8ff90ac3423a511e3b784124e5db7ff5f4813a220ae73ca9
+  nokogiri (1.18.9) sha256=ac5a7d93fd0e3cef388800b037407890882413feccca79eb0272a2715a82fa33
+  nokogiri (1.18.9-aarch64-linux-gnu) sha256=5bcfdf7aa8d1056a7ad5e52e1adffc64ef53d12d0724fbc6f458a3af1a4b9e32
+  nokogiri (1.18.9-aarch64-linux-musl) sha256=55e9e6ca46c4ad1715e313f407d8481d15be1e3b65d9f8e52ba1c124d01676a7
+  nokogiri (1.18.9-arm-linux-gnu) sha256=fe611ae65880e445a9c0f650d52327db239f3488626df4173c05beafd161d46e
+  nokogiri (1.18.9-arm-linux-musl) sha256=935605e14c0ba17da18d203922440bf6c0676c602659278d855d4622d756a324
+  nokogiri (1.18.9-arm64-darwin) sha256=eea3f1f06463ff6309d3ff5b88033c4948d0da1ab3cc0a3a24f63c4d4a763979
+  nokogiri (1.18.9-x86_64-darwin) sha256=e0d2deb03d3d7af8016e8c9df5ff4a7d692159cefb135cbb6a4109f265652348
+  nokogiri (1.18.9-x86_64-linux-gnu) sha256=b52f5defedc53d14f71eeaaf990da66b077e1918a2e13088b6a96d0230f44360
+  nokogiri (1.18.9-x86_64-linux-musl) sha256=e69359d6240c17e64cc9f43970d54f13bfc7b8cc516b819228f687e953425e69
+  oauth (1.1.0) sha256=38902b7f0f5ed91e858d6353f5e1e06b2c16a8aa0fd91984671eab1a1d1cddeb
+  oauth-tty (1.0.5) sha256=34e25c307da4509d4deec266ff3690bbf42e391355f496201c029268862d8b17
+  oauth2 (1.4.11) sha256=6739fcc8872bc94f476b0cae3e8bd78a56d8364b1b79b0757794c25e152d5c10
+  octokit (5.6.1) sha256=48efb2c2aa83c2c394358f073d35ad71d4ac0f14870cd00ceebd3ef3949fe495
+  oj (3.16.11) sha256=2aab609d2bc896529bd3c70d737f591c13932a640ba6164a0f7e414efdb052b1
+  omniauth (2.1.2) sha256=def03277298b8f8a5d3ff16cdb2eb5edb9bffed60ee7dda24cc0c89b3ae6a0ce
+  omniauth-facebook (9.0.0) sha256=440ad8dd9edc9ebec1fd6607b787667c8ce70d2969c2030d7e9ca42a271af854
+  omniauth-github (2.0.0) sha256=1ca26576125a97e27d3f8dc39cd98853d7382dd0fc04a40d3b9ec345ee378649
+  omniauth-google-oauth2 (1.0.1) sha256=2ed7a4ac8d98ab824c95e0d6760784abf1248262b3ba2ab56ec7ebd7074d12a6
+  omniauth-oauth (1.2.1) sha256=25bf22c90234280fa825200490f03ff1ce7d76f1a4fbd6c882c6c5b169c58da8
+  omniauth-oauth2 (1.7.3) sha256=3f5a8f99fa72e0f91d2abd7475ceb972a4ae67ed59e049f314c0c1bad81f4745
+  omniauth-twitter (1.4.0) sha256=c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264
+  openssl (3.3.0) sha256=ff3a573fc97ab30f69483fddc80029f91669bf36532859bd182d1836f45aee79
+  openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80
+  optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
+  ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
+  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
+  parallel_tests (5.4.0) sha256=89413fc46e8f6d8e309b0cb1162287ead1c7e9d41a1fee344a73fab4dc14a248
+  parser (3.3.9.0) sha256=94d6929354b1a6e3e1f89d79d4d302cc8f5aa814431a6c9c7e0623335d7687f2
+  pdf-reader (2.15.0) sha256=c5025750bec8de7b11cfd1d1ccc2b944d2782c3638cd15b5ee1531d1206c0886
+  pg (1.6.1) sha256=e210a75e5f702954537e73bb82f90dfbe0c6d9273c018cd0e93e779181028e6b
+  pg (1.6.1-aarch64-linux) sha256=2dc057589c4df67240bd52c68303a00a91299329bc7573b7447faee42331e214
+  pg (1.6.1-aarch64-linux-musl) sha256=24e0c42594601c5021d3243e0e5e6e74d70de83b152d5bcb616ae49d6cac84c0
+  pg (1.6.1-arm64-darwin) sha256=3b502915de30cf5983d62aabae927cb7c3628b0ca46cdf3a6b888af4ff7f42b3
+  pg (1.6.1-x86_64-darwin) sha256=c8930170622c39ee24b318a2265655b5f8f34628444ee00e4ae44068865309f7
+  pg (1.6.1-x86_64-linux) sha256=6ac0d5c8efafc3f22a7eca2a264300037598fabe27a88e5029bc0e6d90caeb1f
+  pg (1.6.1-x86_64-linux-musl) sha256=419a8e971ef122fb758a296424cb245a369c05a797b6c4787902d7d30eefa494
+  playwright-ruby-client (1.54.1) sha256=c097731a9c027ed5a54adaac61ad9e62a318c2ace86fce7c3f85bbd7767682e2
+  pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff
+  prettier_print (1.2.1) sha256=a72838b5f23facff21f90a5423cdcdda19e4271092b41f4ea7f50b83929e6ff9
+  prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
+  prism (1.4.0) sha256=dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e
+  progress (3.6.0) sha256=360ed306dfa43d6174e847d563c70736dca249e2333cfec4b0387306c86cd573
+  propshaft (1.2.1) sha256=e9b91daf52f21152f851a59f8621af53ffb4dc4401f9b5f8fe16065190b98654
+  pry (0.15.2) sha256=12d54b8640d3fa29c9211dd4ffb08f3fd8bf7a4fd9b5a73ce5b59c8709385b6b
+  pry-byebug (3.11.0) sha256=0b0abb7d309bc7f00044d512a3c8567274f7012b944b38becc8440439a1cea72
+  pry-rails (0.3.11) sha256=a69e28e24a34d75d1f60bcf241192a54253f8f7ef8a62cba1e75750a9653593d
+  pry-stack_explorer (0.6.1) sha256=a2dbea9b47c4ad00cf5c1ce21499f8128b915089e90015f7bafb6e9453baf340
+  psych (5.2.6) sha256=814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e
+  public_suffix (6.0.2) sha256=bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394
+  puma (6.6.0) sha256=f25c06873eb3d5de5f0a4ebc783acc81a4ccfe580c760cfe323497798018ad87
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rack (2.2.17) sha256=5fe02a1ca80d6fb2271dba00985ee2962d6f5620b6f46dfed89f5301ac4699dd
+  rack-mini-profiler (4.0.1) sha256=485810c23211f908196c896ea10cad72ed68780ee2998bec1f1dfd7558263d78
+  rack-protection (3.2.0) sha256=3c74ba7fc59066453d61af9bcba5b6fe7a9b3dab6f445418d3b391d5ea8efbff
+  rack-session (1.0.2) sha256=a02115e5420b4de036839b9811e3f7967d73446a554b42aa45106af335851d76
+  rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
+  rackup (1.0.1) sha256=ba86604a28989fe1043bff20d819b360944ca08156406812dca6742b24b3c249
+  rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d
+  rails-html-sanitizer (1.6.2) sha256=35fce2ca8242da8775c83b6ba9c1bcaad6751d9eb73c1abaa8403475ab89a560
+  rails_failover (2.3.0) sha256=eed6ea0674fd6f9f6b070ad297ad2ead121ecf9202920f6068b6a4f29d9491c9
+  rails_multisite (7.0.0) sha256=7aacf364ed86d2bee73fb679cbfe6c343ce89067b9746b3d5857fffc57f036f2
+  railties (8.0.2.1) sha256=54e40e1771fc2878f572d5a4e076cddb057ba8d4d471f8b7d9bfc61bc1301d4c
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  raindrops (0.20.1) sha256=aa0eb9ff6834f2d9e232ba688bd49cb30be893bc5a3452e74722c94c1fab4730
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
+  rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe
+  rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e
+  rb_sys (0.9.106) sha256=b64d5e4bb33aefa0acec5d829162f211a8f9e5bfe08780ed298c637c7229527c
+  rbtrace (0.5.2) sha256=a2d7d222ab81363aaa0e91337ddbf70df834885d401a80ea0339d86c71f31895
+  rchardet (1.9.0) sha256=26889486cdd83b378652baf7603f71d93e431bb11bc237b4cd8c65151af4a590
+  rdoc (6.14.2) sha256=9fdd44df130f856ae70cc9a264dfd659b9b40de369b16581f4ab746e42439226
+  redcarpet (3.6.1) sha256=d444910e6aa55480c6bcdc0cdb057626e8a32c054c29e793fa642ba2f155f445
+  redis (5.4.0) sha256=798900d869418a9fc3977f916578375b45c38247a556b61d58cba6bb02f7d06b
+  redis-client (0.25.2) sha256=aa37e34c29da39fdb0b8663e7a649adb0923959cd4a9351befe2cd19e6f8d6f0
+  redis-namespace (1.11.0) sha256=e91a1aa2b2d888b6dea1d4ab8d39e1ae6fac3426161feb9d91dd5cca598a2239
+  regexp_parser (2.11.2) sha256=5e5e9c1485ffd8de53ab1d2807affd81f617f72967dfc64fc75a69e2cbf0ff98
+  reline (0.6.2) sha256=1dad26a6008872d59c8e05244b119347c9f2ddaf4a53dce97856cd5f30a02846
+  request_store (1.7.0) sha256=e1b75d5346a315f452242a68c937ef8e48b215b9453a77a6c0acdca2934c88cb
+  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
+  rinku (2.0.6) sha256=8b60670e3143f3db2b37efa262971ce3619ec23092045498ef9f077d82828d7d
+  rotp (6.3.0) sha256=75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854
+  rouge (4.6.0) sha256=10198622df0ef919796da5686a9cc116a49280805e1ed4b851c97ef677eddd7a
+  rqrcode (3.1.0) sha256=e2d5996375f6e9a013823c289ed575dbea678b8e0388574302c1fac563f098af
+  rqrcode_core (2.0.0) sha256=1e40b823ab57a96482a417fff5dd5c33645a00cea6ef5d9e342fecc5ef91d9ab
+  rrule (0.6.0) sha256=bd123b4df7eb086a6388d9c47e8ecaad3708433d11c57a195a50d4d0dd4e9616
+  rspec (3.13.1) sha256=b9f9a58fa915b8d94a1d6b3195fe6dd28c4c34836a6097015142c4a9ace72140
+  rspec-core (3.13.5) sha256=ab3f682897c6131c67f9a17cfee5022a597f283aebe654d329a565f9937a4fa3
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-html-matchers (0.10.0) sha256=d424bfeb0104884478be299b6695b56c2d0432bb77dc9cedecb5138e91c0e9ae
+  rspec-mocks (3.13.5) sha256=e4338a6f285ada9fe56f5893f5457783af8194f5d08884d17a87321d5195ea81
+  rspec-multi-mock (0.3.1) sha256=289470f28d1d9dcdecabf70e9a14f97b0dc7e3dba090dfbe4c98c64ebd53794c
+  rspec-rails (8.0.2) sha256=113139a53f5d068d4f48d1c29ad5f982013ed9b0daa69d7f7b266eda5d433ace
+  rspec-support (3.13.4) sha256=184b1814f6a968102b57df631892c7f1990a91c9a3b9e80ef892a0fc2a71a3f7
+  rss (0.3.1) sha256=b46234c04551b925180f8bedfc6f6045bf2d9998417feda72f300e7980226737
+  rswag-specs (2.16.0) sha256=8ba26085c408b0bd2ed21dc8015c80f417c7d34c63720ab7133c2549b5bd2a91
+  rtlcss (0.2.1) sha256=213d5a00bf61267f93a7a516d699d77e1cc5f396743abb33c01e3f3243a7bf60
+  rubocop (1.79.2) sha256=d3f42a7d197952c2a163719c5462fea827710a435b18bfb7070c6eedd2e90391
+  rubocop-ast (1.46.0) sha256=0da7f6ad5b98614f89b74f11873c191059c823eae07d6ffd40a42a3338f2232b
+  rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
+  rubocop-discourse (3.12.1) sha256=ebf7e2224f053047372071419052828c3e3a01bccb14ea1f282ac143547df9bc
+  rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe
+  rubocop-rails (2.33.3) sha256=848c011b58c1292f3066246c9eb18abf6ffcfbce28bc57c4ab888bbec79af74b
+  rubocop-rspec (3.6.0) sha256=c0e4205871776727e54dee9cc91af5fd74578001551ba40e1fe1a1ab4b404479
+  rubocop-rspec_rails (2.31.0) sha256=775375e18a26a1184a812ef3054b79d218e85601b9ae897f38f8be24dddf1f45
+  ruby-prof (1.7.2) sha256=270424fcac37e611f2d15a55226c4628e234f8434e1d7c25ca8a2155b9fc4340
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  ruby-rc4 (0.1.5) sha256=00cc40a39d20b53f5459e7ea006a92cf584e9bc275e2a6f7aa1515510e896c03
+  ruby-readability (0.7.2) sha256=7351ddc89ac62ecdd35336acb1313ac29dc1dad9745d59f25109ec2215c6580c
+  ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
+  rubyzip (2.4.1) sha256=8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615
+  sanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984
+  sass-embedded (1.90.0) sha256=e1ebd6dcc2c94f30bab081e9b35a7a0579abdff51fee7032bef68298ae6c44d5
+  sass-embedded (1.90.0-aarch64-linux-gnu) sha256=e8ce5d2b026a63564a07691b50f1481849ed46afa3e92c3b760150efb6aebab8
+  sass-embedded (1.90.0-aarch64-linux-musl) sha256=8df2c75b68ca0c55e3d0ad910c647d34ac8b0fd2869128864c370cde0170efe8
+  sass-embedded (1.90.0-arm-linux-gnueabihf) sha256=a150421af6900fce707edcde12b4d5f6c9b85f11256ec26383363ce6611244a2
+  sass-embedded (1.90.0-arm-linux-musleabihf) sha256=4e125094f86cc3d7577f7fef67ece0e874d4ea790467e698e7ce169d1a518dd9
+  sass-embedded (1.90.0-arm64-darwin) sha256=c3ff4f4b3cb692a16b31b1a678deb6ffb2704f6aee6a8552fa63153f2f9c9c8d
+  sass-embedded (1.90.0-x86_64-darwin) sha256=cc7770bfbc34bc0c4ad7740523c5ed63500fda44b1c088ec9bc1a53206bdb52c
+  sass-embedded (1.90.0-x86_64-linux-gnu) sha256=cfcead0b72810818186459b14e587a94aa8bb15a167185898154f7b9d5a63036
+  sass-embedded (1.90.0-x86_64-linux-musl) sha256=fffd0ee0dff16fa2ce572228fa7d4f5ed1f9aff6b2b6a79af92cb2000a7b5a71
+  sassc-embedded (1.80.5) sha256=b2720c938de54e9798bea17bc044ea0df05f552acec30b8e9a79060cceb9cb3e
+  sawyer (0.9.2) sha256=fa3a72d62a4525517b18857ddb78926aab3424de0129be6772a8e2ba240e7aca
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
+  shoulda-matchers (6.5.0) sha256=ef6b572b2bed1ac4aba6ab2c5ff345a24b6d055a93a3d1c3bfc86d9d499e3f44
+  sidekiq (7.3.9) sha256=1108712e1def89002b28e3545d5ae15d4a57ffd4d2c25d97bb1360988826b5a7
+  simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
+  simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
+  simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
+  simpleidn (0.2.3) sha256=08ce96f03fa1605286be22651ba0fc9c0b2d6272c9b27a260bc88be05b0d2c29
+  snaky_hash (2.0.3) sha256=25a3d299566e8153fb02fa23fd9a9358845950f7a523ddbbe1fa1e0d79a6d456
+  sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57
+  sqlite3 (2.7.3-aarch64-linux-gnu) sha256=00bab7e2ceb7e911b0a2c516bcb9ec0aa7ee57b9b231419e1788515319ac4317
+  sqlite3 (2.7.3-aarch64-linux-musl) sha256=035dca6c5bc0f45bb059f33cf774e96462563e460a2d5bd48972562bf3a78c8b
+  sqlite3 (2.7.3-arm-linux-gnu) sha256=c22a2593a8274cba5fc55be415cfddab3ff5d3275b5a78878daf214bf2a60db1
+  sqlite3 (2.7.3-arm-linux-musl) sha256=e735bea1c81eceff2e1b3388e6bccbcbf5c81405f7dbd69b5c80b3b4c4a92c89
+  sqlite3 (2.7.3-arm64-darwin) sha256=133772f4312a9d0fa0c16aab7c2abdda2ee93f47dded0f353a2981f7b9d2b9b4
+  sqlite3 (2.7.3-x86_64-darwin) sha256=a857e364e858d79e634c66c02c130f79c633f0035d422b3381be9958859771f4
+  sqlite3 (2.7.3-x86_64-linux-gnu) sha256=11b2612fddf56602d238be7a984fa0633e591edd034f7520747bc0927b7fa865
+  sqlite3 (2.7.3-x86_64-linux-musl) sha256=4307278661bbe0a619da7a5da25f4417f6826246ee7b4a56a5c10c3731d5256a
+  sshkey (3.0.0) sha256=655ba351d6e01a48dfe59d65530af8975c777b8cc57a061770de3228ff2d11cd
+  stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c
+  stringio (3.1.7) sha256=5b78b7cb242a315fb4fca61a8255d62ec438f58da2b90be66048546ade4507fa
+  stripe (11.1.0) sha256=a76e82cc7e4d2433803ca5fbe9453d019df376236f0b9fbcb7f36e6dd327f98d
+  syntax_tree (6.3.0) sha256=56e25a9692c798ec94c5442fe94c5e94af76bef91edc8bb02052cbdecf35f13d
+  test-prof (1.4.4) sha256=1a59513ed9d33a1f5ca17c0b89da4e70f60a91c83ec62e9a873dbb99141353ef
+  thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d
+  tiktoken_ruby (0.0.11.1) sha256=adffa735711bf1b19554423c82ba2e2be4a77d7776186cbaf19f837680f8cb8b
+  tiktoken_ruby (0.0.11.1-aarch64-linux) sha256=1ffcfcf1a7ac561e2e08996a60b3ee4213923b02184d29da2eb76c3be0c54001
+  tiktoken_ruby (0.0.11.1-arm-linux) sha256=2f1b79eadf62c2ea2691821f1d1c008b402e0e48d9baef2fc52d648b0744b7a5
+  tiktoken_ruby (0.0.11.1-arm64-darwin) sha256=9b0f2a863bf6dbad2c78f95d8566e39fbb2293be552a7cc16a93e638a0b823e1
+  tiktoken_ruby (0.0.11.1-x86_64-darwin) sha256=554c84d14e66a7cef277b00ec26ce6c201d6b94d223f8d71397b1287cda11d78
+  tiktoken_ruby (0.0.11.1-x86_64-linux) sha256=ab56c936876c2ccba41fd8dc6588097e6555345ad0bdf5f4204be771a3637618
+  tiktoken_ruby (0.0.11.1-x86_64-linux-musl) sha256=fd52104cbeb14471136f8519a07eef457ca84d01693bfb9b92b150a1fb3f42f6
+  timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e
+  tokenizers (0.5.5) sha256=7bf1600567a3f253ec3f24da51af338437ecd1c638874122a9c57ea1724f4d92
+  tokenizers (0.5.5-aarch64-linux) sha256=55ac300cdcefcb4dccbe5b1577920d3ab47dab404c4e70a442aa5c97f084790d
+  tokenizers (0.5.5-aarch64-linux-musl) sha256=ddd23414ef60e15860a1ec804496ff053aa817956036594923a086c2897c492a
+  tokenizers (0.5.5-arm64-darwin) sha256=3a1606ce6aa918d89eea816b2de4cba9a7b5ad76ba1b42ad3ff44f6ff6208a85
+  tokenizers (0.5.5-x86_64-darwin) sha256=892594b0406c9890d45b4a2fbf16d75e7075472029a48fd84b776d5ee9863e17
+  tokenizers (0.5.5-x86_64-linux) sha256=e9681afe50dc74beed880bed08d385ebb1d22d51831d9169e285f3836306730c
+  tokenizers (0.5.5-x86_64-linux-musl) sha256=f5ccc321a58b58b45ee85042ea384fb0f99600361ecd1260f77bfd020b8bdb0a
+  trilogy (2.9.0) sha256=a2d63b663ba68a4758e15d1f9afb228f5d16efc7fe7cea68699e1c106ef6067f
+  ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca
+  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
+  tzinfo-data (1.2025.2) sha256=a92375a1fbb47d38fe88fd514c40a38cc8f97d168da2a6479f15185e86470939
+  unf (0.2.0) sha256=e6bcc2e101d80e3f9459753db747d5926aada1aaaf61e629e93359da9a5b04ab
+  unicode-display_width (3.1.5) sha256=bf566817855ee7ee3adcf7bace0d5906cb14401417db59193f8a5fcedf02dd4e
+  unicode-emoji (4.0.4) sha256=2c2c4ef7f353e5809497126285a50b23056cc6e61b64433764a35eff6c36532a
+  unicorn (6.1.0) sha256=45dd987add4c2b084c1880a68373af42797a704ad7441faff9b14b4982aa0fc0
+  uniform_notifier (1.17.0) sha256=db4787ed2ad168ccb0ad4027a45811e1c9e2f8275682fee72697e6ce1c6d6ca7
+  uri (1.0.3) sha256=e9f2244608eea2f7bc357d954c65c910ce0399ca5e18a7a29207ac22d8767011
+  useragent (0.16.11) sha256=700e6413ad4bb954bb63547fa098dddf7b0ebe75b40cc6f93b8d54255b173844
+  version_gem (1.1.8) sha256=a964767ecbe36551b9ff2e59099548c27569f2f7f94bdb09f609d76393a8e008
+  web-push (3.0.1) sha256=5b4dd2f2bba3bd8951da6416492fe920a6f203d14d3080f943c5d01c0cc4b18d
+  webmock (3.25.1) sha256=ab9d5d9353bcbe6322c83e1c60a7103988efc7b67cd72ffb9012629c3d396323
+  webrick (1.9.1) sha256=b42d3c94f166f3fb73d87e9b359def9b5836c426fc8beacf38f2184a21b2a989
+  xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e
+  yaml-lint (0.1.2) sha256=e3960b171766ae187338a169815e99fe10fcb0d9c22b1c539e8d57e114324c8a
+  yard (0.9.37) sha256=a6e910399e78e613f80ba9add9ba7c394b1a935f083cccbef82903a3d2a26992
+  zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
+  zendesk_api (1.38.0.rc1) sha256=9ebe2575d223ed1c0651b2d10df6c010141cda49d524c38532b472f7e8bb3f7a
+
+RUBY VERSION
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.6.9
+   2.5.22
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
index 81bfd5bf56dd..248c7b7f5dcc 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
@@ -12,17 +12,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh";
+      sha256 = "176vgl9rhy9xqi5i1qdgw4ny8sr6jw32zjsq109sn7jl0j6lvq8d";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   actionpack = {
     dependencies = [
       "actionview"
       "activesupport"
       "nokogiri"
-      "racc"
       "rack"
       "rack-session"
       "rack-test"
@@ -38,10 +37,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp";
+      sha256 = "02ibk3ldqs1xk74b8lycqh1g6bm4vj5ph8bjlln1brfv64df3rv1";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   actionview = {
     dependencies = [
@@ -59,10 +58,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39";
+      sha256 = "0izkrdg7r7432mw99d7cwhsr5s9whl3aqh5946i88yqbrc6d59if";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   actionview_precompiler = {
     dependencies = [ "actionview" ];
@@ -95,10 +94,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj";
+      sha256 = "129bldx70vahaargg0spx5sdqw378591gbrq7b0zm3pc0zdg5rfn";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -110,10 +109,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643";
+      sha256 = "1i3y0ynf16cgc9p28603pxva528a91jgh8nz2d0q8cb5p36vdfhp";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   activerecord = {
     dependencies = [
@@ -129,10 +128,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr";
+      sha256 = "1wbdijshd3dqgzwhdpb32ig6rz8my5zkmanj32fqiwskvmxnwmd6";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   activesupport = {
     dependencies = [
@@ -147,6 +146,7 @@
       "minitest"
       "securerandom"
       "tzinfo"
+      "uri"
     ];
     groups = [
       "default"
@@ -156,10 +156,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
+      sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -176,10 +176,20 @@
     };
     version = "2.8.7";
   };
-  annotate = {
+  afm = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ia5iw9xvvy1igaxsa08vvv4b5ry9ipyr18917pi8w0y4kvddm2v";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  annotaterb = {
     dependencies = [
       "activerecord"
-      "rake"
+      "activesupport"
     ];
     groups = [
       "development"
@@ -188,10 +198,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lw0fxb5mirsdp3bp20gjyvs7clvi19jbxnrm2ihm20kzfhvlqcs";
+      sha256 = "15229wyciywlrl8pb263lc24ahsm86kp0ygipf6k0qzhx39wazm0";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.18.0";
+  };
+  Ascii85 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0nmyxpngg5rycyryhq9l9hapz1y3iqyflskyksxkqm0832a5vjqm";
+      type = "gem";
+    };
+    version = "2.0.1";
   };
   ast = {
     groups = [
@@ -202,46 +222,48 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+      sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm";
       type = "gem";
     };
-    version = "2.4.2";
+    version = "2.4.3";
   };
   aws-eventstream = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
+      sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   aws-partitions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fhym2gsm9kzl74nvzk3hhw288n1l77kxinhik43p37ayranzcv5";
+      sha256 = "0gkd4q0bbmw6vah15vkghvij398l7g5yd7570ilk9b3pcwazdx98";
       type = "gem";
     };
-    version = "1.894.0";
+    version = "1.1134.0";
   };
   aws-sdk-core = {
     dependencies = [
       "aws-eventstream"
       "aws-partitions"
       "aws-sigv4"
+      "base64"
       "jmespath"
+      "logger"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns";
+      sha256 = "17n7vw9djnw74x7cgwsxfi0k033l351mf56i7y3lg4yawg2iy1wr";
       type = "gem";
     };
-    version = "3.191.3";
+    version = "3.227.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -252,10 +274,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gbxms3daszl4mk89swjrpq3fqgm9lg0wl65yjfp0nfz8jm4jyqf";
+      sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
       type = "gem";
     };
-    version = "1.77.0";
+    version = "1.99.0";
+  };
+  aws-sdk-mediaconvert = {
+    dependencies = [
+      "aws-sdk-core"
+      "aws-sigv4"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1r0182r7scavikd82v7392mzj2x76cihy7cffz00f14brmqsamfr";
+      type = "gem";
+    };
+    version = "1.165.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -267,10 +303,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s";
+      sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
       type = "gem";
     };
-    version = "1.143.0";
+    version = "1.182.0";
   };
   aws-sdk-sns = {
     dependencies = [
@@ -281,10 +317,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ql1y276lfk27dyisk8ak1wdnysklw2dcir3kgy05glzzc9j4z1w";
+      sha256 = "1m3dz9cz7zlwhbd5n5wnsqm00c7khpmbnggvraqq2cf50dr3qazr";
       type = "gem";
     };
-    version = "1.72.0";
+    version = "1.96.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -292,23 +328,31 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
+      sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.12.1";
   };
   base64 = {
     groups = [
       "default"
+      "development"
       "test"
     ];
-    platforms = [ ];
+    platforms = [
+      {
+        engine = "maglev";
+      }
+      {
+        engine = "ruby";
+      }
+    ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.3.0";
   };
   benchmark = {
     groups = [
@@ -319,10 +363,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   better_errors = {
     dependencies = [
@@ -355,10 +399,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.2.2";
   };
   binding_of_caller = {
     dependencies = [ "debug_inspector" ];
@@ -387,10 +431,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c";
+      sha256 = "003xl226y120cbq1n99805jw6w75gcz1gs941yz3h7li3qy3kqha";
       type = "gem";
     };
-    version = "1.18.4";
+    version = "1.18.6";
   };
   builder = {
     groups = [
@@ -415,10 +459,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kfyg2j6a4sg94sajnmy0scv9dxjh7jka9dlil1fzpx137g2zw3p";
+      sha256 = "0hn5nysivwlzwgwgh3m97kzjgfy8g7nl82b2pahdj0xqnrg91fdl";
       type = "gem";
     };
-    version = "8.0.0";
+    version = "8.0.8";
   };
   byebug = {
     groups = [
@@ -435,10 +479,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194";
+      sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl";
       type = "gem";
     };
-    version = "11.1.3";
+    version = "12.0.0";
   };
   capybara = {
     dependencies = [
@@ -460,15 +504,30 @@
     };
     version = "3.40.0";
   };
+  capybara-playwright-driver = {
+    dependencies = [
+      "addressable"
+      "capybara"
+      "playwright-ruby-client"
+    ];
+    groups = [ "test" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7";
+      type = "gem";
+    };
+    version = "0.5.7";
+  };
   cbor = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
+      sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr";
       type = "gem";
     };
-    version = "0.5.9.8";
+    version = "0.5.10.1";
   };
   certified = {
     groups = [
@@ -488,10 +547,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3";
+      sha256 = "1njrjznc2j5xqqw71sp9130b9hyv59h2gfrf6yaf4in1n9dzd6gy";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.5.0";
   };
   chunky_png = {
     groups = [ "default" ];
@@ -556,10 +615,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
+      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.5.3";
   };
   cose = {
     dependencies = [
@@ -622,20 +681,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0625073hwx41c246v9dvkp0rk0xgh9d0sc0gm73dbmlxnjwgalv7";
+      sha256 = "1izp5vna86s7xivqzml4nviy01bv76arrd5is8wkncwp1by3zzbc";
       type = "gem";
     };
-    version = "1.21.0";
+    version = "1.21.1";
   };
   csv = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g";
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.3.5";
   };
   date = {
     groups = [
@@ -673,20 +732,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
+      sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.6.2";
   };
   diffy = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22";
+      sha256 = "1qs7drxvyzk3dg22xgblc12lq5kww9hhj7vpn8ay3l42rasllf3r";
       type = "gem";
     };
-    version = "3.4.3";
+    version = "3.4.4";
   };
   digest = {
     groups = [ "default" ];
@@ -708,15 +767,25 @@
     };
     version = "0.2.9";
   };
+  discourse-emojis = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0anccf6f8qi992pkcwdc0drz4mqv20ssnrz2a9ql7bj973gf28mk";
+      type = "gem";
+    };
+    version = "1.0.41";
+  };
   discourse-fonts = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18bj5d0hf7bwy0pppah55aawg7yn61sjgjhh03j5lcnkxl9mrlm7";
+      sha256 = "0cq0ds6c2hz1qs2f3skdbs9pqy4dkl1jfm3778q0hnb1f7bdvm3q";
       type = "gem";
     };
-    version = "0.0.18";
+    version = "0.0.19";
   };
   discourse-seed-fu = {
     dependencies = [
@@ -732,6 +801,21 @@
     };
     version = "2.3.12";
   };
+  discourse_ai-tokenizers = {
+    dependencies = [
+      "activesupport"
+      "tiktoken_ruby"
+      "tokenizers"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wy3pcrml7g51566i3w2r16qqix1hyr97j7292hzwaabgcpjyxd7";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
   discourse_dev_assets = {
     dependencies = [
       "faker"
@@ -744,10 +828,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ncd6n34vm7qd5mpza8wrqfkgfc6xbd5rxjcbdnvsv94zxr75rm1";
+      sha256 = "11c2i7wm3m52xisycsz85g84p79q7gbxz0nkgljgg8qa44d816m0";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "0.0.5";
   };
   docile = {
     groups = [
@@ -763,14 +847,18 @@
     version = "1.4.1";
   };
   drb = {
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.3";
   };
   dry-initializer = {
     groups = [ "default" ];
@@ -782,6 +870,16 @@
     };
     version = "3.2.0";
   };
+  ed25519 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   email_reply_trimmer = {
     groups = [ "default" ];
     platforms = [ ];
@@ -792,6 +890,20 @@
     };
     version = "0.2.0";
   };
+  erb = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "03vcq8g8rxdq8njp9j9k9fxwjw19q4m08c7lxjs0yc6l8f0ja3yk";
+      type = "gem";
+    };
+    version = "5.0.2";
+  };
   erubi = {
     groups = [
       "default"
@@ -814,27 +926,15 @@
     version = "1.13.1";
   };
   excon = {
+    dependencies = [ "logger" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1am69fn9nzj2pa05fd02q4zbzn1g7c9w5g52yjzdsbhm1x9n9g95";
+      sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a";
       type = "gem";
     };
-    version = "1.2.3";
-  };
-  execjs = {
-    groups = [
-      "assets"
-      "default"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb";
-      type = "gem";
-    };
-    version = "2.10.0";
+    version = "1.2.5";
   };
   exifr = {
     groups = [ "default" ];
@@ -851,10 +951,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x73a43hjw7f9vwlhfax4rmp7hpwaadvcamnbw31hh94bx3i71lv";
+      sha256 = "1k5kglcva79sxvqj10x481r1w8ql6zdr77mv095g8j5ksf6k600d";
       type = "gem";
     };
-    version = "2.8.2";
+    version = "2.13";
   };
   fabrication = {
     groups = [
@@ -864,10 +964,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1al5iv3as21l5clci0b5cg27z136pan7gkj7plp4l0w83c6z2y9c";
+      sha256 = "1qrv8vvhjx9yi64bji6hrp08if14hmwdy08prg9qld3ij2nvz856";
       type = "gem";
     };
-    version = "2.31.0";
+    version = "3.0.0";
   };
   faker = {
     dependencies = [ "i18n" ];
@@ -878,20 +978,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47";
+      sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r";
       type = "gem";
     };
-    version = "2.23.0";
-  };
-  fakeweb = {
-    groups = [ "test" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1a09z9nb369bvwpghncgd5y4f95lh28w0q258srh02h22fz9dj8y";
-      type = "gem";
-    };
-    version = "1.3.0";
+    version = "3.5.2";
   };
   faraday = {
     dependencies = [
@@ -903,10 +993,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
+      sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.13.4";
+  };
+  faraday-multipart = {
+    dependencies = [ "multipart-post" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp";
+      type = "gem";
+    };
+    version = "1.1.1";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -914,10 +1015,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.1";
   };
   faraday-retry = {
     dependencies = [ "faraday" ];
@@ -925,10 +1026,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1";
+      sha256 = "1laici6jximrz3a8rkm8qmwdmw3fgzk22qh4l8wd5srjj01d40i4";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.3.2";
   };
   fast_blank = {
     groups = [ "default" ];
@@ -976,10 +1077,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
+      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
       type = "gem";
     };
-    version = "1.17.1";
+    version = "1.17.2";
   };
   fspath = {
     groups = [ "default" ];
@@ -1002,6 +1103,20 @@
     };
     version = "1.2.1";
   };
+  goldiloader = {
+    dependencies = [
+      "activerecord"
+      "activesupport"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wqb6l1262d7vs9rh86k22q0xskypc84v3wdv74kp5jb8bzqcyi7";
+      type = "gem";
+    };
+    version = "5.4.0";
+  };
   google-protobuf = {
     dependencies = [
       "bigdecimal"
@@ -1011,10 +1126,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rmmp533ypc5c2r3ks8zqxchqkf1g8laig87f7hdfmwz0p07cmcs";
+      sha256 = "1awndc5nswpc1xdlid2wkikj45adbhmbfqizz8rr5fz9h01dqjz6";
       type = "gem";
     };
-    version = "4.29.3";
+    version = "4.32.0";
   };
   guess_html_encoding = {
     groups = [ "default" ];
@@ -1044,10 +1159,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c";
+      sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.2.0";
+  };
+  hashery = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj";
+      type = "gem";
+    };
+    version = "2.1.2";
   };
   hashie = {
     groups = [ "default" ];
@@ -1142,6 +1267,16 @@
     };
     version = "1.6.0";
   };
+  inflection = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mfkk0j0dway3p4gwzk8fnpi4hwaywl2v0iywf1azf98zhk9pfnf";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   io-console = {
     groups = [
       "default"
@@ -1151,10 +1286,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
+      sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
   };
   irb = {
     dependencies = [
@@ -1170,10 +1305,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
+      sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2";
       type = "gem";
     };
-    version = "1.15.1";
+    version = "1.15.2";
   };
   iso8601 = {
     groups = [ "default" ];
@@ -1204,10 +1339,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj";
+      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
       type = "gem";
     };
-    version = "2.9.1";
+    version = "2.13.2";
   };
   json-schema = {
     dependencies = [
@@ -1222,10 +1357,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzrf6q4d9kbixj6bpi2bp8dizmqxcmlq30ni86h3ifzpkcrm0mk";
+      sha256 = "1ma0k5889hzydba2ci8lqg87pxsh9zabz7jchm9cbacwsw7axgk0";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "5.2.2";
   };
   json_schemer = {
     dependencies = [
@@ -1283,20 +1418,34 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.4";
+    version = "3.17.0.5";
   };
   libv8-node = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ki1vjkq8nhmlz7rqi1ic0mjmbjsa7d1bgcvkzdl4q9vhaa5dzvn";
+      sha256 = "1kbijkxrqzgf94qdzh1xdxcypr6wnqmra0bhmwz7bif45739l3ig";
       type = "gem";
     };
-    version = "22.7.0.4";
+    version = "24.1.0.0";
+  };
+  lint_roller = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   listen = {
     dependencies = [
@@ -1373,10 +1522,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bmvpa5mk779rgl4s4qy8nyhjh1lpf5gn4pmv40xyalnv2whryf3";
+      sha256 = "1a52r46d263h2kkxng7amrihz5c7xm9ak8vf4jq4x77rwxcbwjx8";
       type = "gem";
     };
-    version = "2.20.0";
+    version = "2.20.1";
   };
   loofah = {
     dependencies = [
@@ -1391,10 +1540,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
+      sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
       type = "gem";
     };
-    version = "2.24.0";
+    version = "2.24.1";
   };
   lru_redux = {
     groups = [ "default" ];
@@ -1450,10 +1599,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+      sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "0.4.3";
   };
   maxminddb = {
     groups = [ "default" ];
@@ -1488,10 +1637,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15xqp7pnicjh2868fsc6fmxw8cw32bpiaqpc5bz8cwdib09ns3qk";
+      sha256 = "1nra1ifgapr67kb6zjkzws5gdnwrzbm463zf1l1p2rby2v1wb7ki";
       type = "gem";
     };
-    version = "4.3.8";
+    version = "4.4.1";
   };
   messageformat-wrapper = {
     dependencies = [ "mini_racer" ];
@@ -1518,6 +1667,36 @@
     };
     version = "1.1.0";
   };
+  mime-types = {
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
+      type = "gem";
+    };
+    version = "3.7.0";
+  };
+  mime-types-data = {
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0f05x8mm7p1dpmchpfx2393nyb4wnqizximq9wq904zsjrl4551v";
+      type = "gem";
+    };
+    version = "3.2025.0812";
+  };
   mini_mime = {
     groups = [
       "default"
@@ -1552,10 +1731,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "168a3crdgakm9mk5yrqlqsrx587rm7sk1f2l7sfs9cg87f7xb7ji";
+      sha256 = "1hdv2sn2p74hpixvk7065irhiycilgi2ccc4xmf192yv713njlli";
       type = "gem";
     };
-    version = "0.17.0.pre13";
+    version = "0.19.0";
   };
   mini_scheduler = {
     dependencies = [ "sidekiq" ];
@@ -1594,10 +1773,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c0bld2bpnfrld7g0pli3pp3b1z3a21cgahhw70i5cjr33sx88pi";
+      sha256 = "0f05mq75bc35w78vkx21bn1lcl07r4w2jqysdji6afy6j1mca3ya";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "1.0.0";
   };
   minitest = {
     groups = [
@@ -1608,10 +1787,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
       type = "gem";
     };
-    version = "5.25.4";
+    version = "5.25.5";
   };
   mocha = {
     dependencies = [ "ruby2_keywords" ];
@@ -1639,20 +1818,20 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a5fsgchkpcca4wf3pipbb2jbj523l7fbaq37j10cr0yymwlkc7z";
+      sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.0";
   };
   multi_json = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "1.17.0";
   };
   multi_xml = {
     dependencies = [ "bigdecimal" ];
@@ -1660,10 +1839,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg";
+      sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih";
       type = "gem";
     };
-    version = "0.7.1";
+    version = "0.7.2";
+  };
+  multipart-post = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq";
+      type = "gem";
+    };
+    version = "2.4.1";
   };
   mustache = {
     groups = [ "default" ];
@@ -1695,10 +1884,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ak8w6ypw4lba1y1mdmqwvkrh84ps6h9kd7hn029h9k85j9sirmb";
+      sha256 = "1z1kpshd0r09jv0091bcr4gfx3i1psbqdzy7zyag5n8v3qr0anfr";
       type = "gem";
     };
-    version = "0.5.5";
+    version = "0.5.9";
   };
   net-pop = {
     dependencies = [ "net-protocol" ];
@@ -1728,10 +1917,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z";
+      sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.5.1";
   };
   nio4r = {
     groups = [ "default" ];
@@ -1756,10 +1945,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzqcs1kkykj8lrnbxc1iwr1wqmmaml8l6wyxdvy0vqq6gxiqyck";
+      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
       type = "gem";
     };
-    version = "1.18.2";
+    version = "1.18.9";
   };
   oauth = {
     dependencies = [
@@ -1804,6 +1993,20 @@
     };
     version = "1.4.11";
   };
+  octokit = {
+    dependencies = [
+      "faraday"
+      "sawyer"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8";
+      type = "gem";
+    };
+    version = "5.6.1";
+  };
   oj = {
     dependencies = [
       "bigdecimal"
@@ -1813,24 +2016,25 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "091kbavd1rfiwr6kn1laladspyk67y6hdlsdilz752nqxm9w3ibg";
+      sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara";
       type = "gem";
     };
-    version = "3.16.9";
+    version = "3.16.11";
   };
   omniauth = {
     dependencies = [
       "hashie"
       "rack"
+      "rack-protection"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502";
+      sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y";
       type = "gem";
     };
-    version = "1.9.2";
+    version = "2.1.2";
   };
   omniauth-facebook = {
     dependencies = [ "omniauth-oauth2" ];
@@ -1852,10 +2056,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb";
+      sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "2.0.0";
   };
   omniauth-google-oauth2 = {
     dependencies = [
@@ -1868,10 +2072,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10pnxvb6wpnf58dja3yz4ja527443x3q13hzhcbays4amnnp8i4a";
+      sha256 = "19hj9l3xgsy7dssjmfmkca129wdbhh3pdmp0jm685awqinna9mrf";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "1.0.1";
   };
   omniauth-oauth = {
     dependencies = [
@@ -1949,20 +2153,20 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "073pk2rhyjq2vhdiz3xh2s884r15cvprw1yfjs7h9bmwdf1f9j81";
+      sha256 = "0kp3f8g7g7cbw5vfkmpdv71pphhpcxk3lpc892mj9apkd7ys1y4c";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.1";
   };
   ostruct = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.3";
   };
   parallel = {
     groups = [
@@ -1973,10 +2177,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
+    version = "1.27.0";
   };
   parallel_tests = {
     dependencies = [ "parallel" ];
@@ -1987,10 +2191,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nikqa0h9znbg31p3hl4y3280sqggjd7m47gmjydxw6iasm66l09";
+      sha256 = "0j522kfb9ykk98sfw7qssklwglgahwi1dc8ckcq8wvcgdv23yhc9";
       type = "gem";
     };
-    version = "4.9.0";
+    version = "5.4.0";
   };
   parser = {
     dependencies = [
@@ -2005,20 +2209,54 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16qi2qhpszm842awxghmsp64yvvawafq96w5jw98irz3f4bh2jbl";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.7.0";
+    version = "3.3.9.0";
+  };
+  pdf-reader = {
+    dependencies = [
+      "Ascii85"
+      "afm"
+      "hashery"
+      "ruby-rc4"
+      "ttfunk"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11h8dhhd2c8mxssibk9q6qn7ilj4p71crlfirw8pppn8pr85f0n5";
+      type = "gem";
+    };
+    version = "2.15.0";
   };
   pg = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
+      sha256 = "0swf0a0r2xryx788q09w4zcwdq7v1pwq5fvkgr9m8abhbxgaf472";
       type = "gem";
     };
-    version = "1.5.9";
+    version = "1.6.1";
+  };
+  playwright-ruby-client = {
+    dependencies = [
+      "concurrent-ruby"
+      "mime-types"
+    ];
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ql2frvdgfw57xycwvz8mk11i8v2ksnn3b6s9ajxazh2khd775y0";
+      type = "gem";
+    };
+    version = "1.54.1";
   };
   pp = {
     dependencies = [ "prettyprint" ];
@@ -2063,6 +2301,20 @@
     };
     version = "0.2.0";
   };
+  prism = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   progress = {
     groups = [ "default" ];
     platforms = [ ];
@@ -2073,19 +2325,38 @@
     };
     version = "3.6.0";
   };
-  pry = {
+  propshaft = {
     dependencies = [
-      "coderay"
-      "method_source"
+      "actionpack"
+      "activesupport"
+      "rack"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4";
+      sha256 = "0m46p68521hnzvwbby818kfb9zskmwhqd7x5a7w544gjaapivfg9";
       type = "gem";
     };
-    version = "0.14.2";
+    version = "1.2.1";
+  };
+  pry = {
+    dependencies = [
+      "coderay"
+      "method_source"
+    ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j";
+      type = "gem";
+    };
+    version = "0.15.2";
   };
   pry-byebug = {
     dependencies = [
@@ -2096,10 +2367,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8";
+      sha256 = "0wpa3jd46h44rjz3hjwl5c0zfx3jav4a64nm8h0g1iwv61yvn2hb";
       type = "gem";
     };
-    version = "3.10.1";
+    version = "3.11.0";
   };
   pry-rails = {
     dependencies = [ "pry" ];
@@ -2142,10 +2413,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
+      sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "5.2.6";
   };
   public_suffix = {
     groups = [
@@ -2156,10 +2427,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -2202,10 +2473,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
+      sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
       type = "gem";
     };
-    version = "2.2.10";
+    version = "2.2.17";
   };
   rack-mini-profiler = {
     dependencies = [ "rack" ];
@@ -2213,10 +2484,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00d80wjavaakhs177b7g542qs3n55kj4icjkwj0lbxcmaxyxxw1b";
+      sha256 = "0y1x4rc7bz8x3zn8p6g21rw6ivbjml6a2vl9dhchiy8i6b110n28";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "4.0.1";
   };
   rack-protection = {
     dependencies = [
@@ -2294,10 +2565,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
+      sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails-html-sanitizer = {
     dependencies = [
@@ -2327,10 +2598,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pvwgm413fza8q1zc3mmzx504wiljm9d7b9qrkzfzsb2yzpidxs2";
+      sha256 = "1jcijjfz595nd1h0z4h2jb7iw4md5snrglha0xmryvzxfh3fmmpf";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails_multisite = {
     dependencies = [
@@ -2341,10 +2612,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1al624kvcxa5ijprali9gxp0bqv1w1573iswb5fkg4p2i4xvimvv";
+      sha256 = "1winy1bzrzspb0ynnx5rcy8fhg1ldkzcnydn7zkvxll6xmjg7b3s";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "7.0.0";
   };
   railties = {
     dependencies = [
@@ -2364,10 +2635,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3";
+      sha256 = "0k0x630ipimzv6vzhwflsjl7n1fvrmvf196mfbspha7wf4bhxr2l";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   rainbow = {
     groups = [
@@ -2412,10 +2683,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      sha256 = "14s4jdcs1a4saam9qmzbsa2bsh85rj9zfxny5z315x3gg0nhkxcn";
       type = "gem";
     };
-    version = "13.2.1";
+    version = "13.3.0";
   };
   rb-fsevent = {
     groups = [
@@ -2445,6 +2716,16 @@
     };
     version = "0.11.1";
   };
+  rb_sys = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0z2j55r7qqwc57nq11z0pzjzka0iy9i930jxxjna1vrsnd5mwkdn";
+      type = "gem";
+    };
+    version = "0.9.106";
+  };
   rbtrace = {
     dependencies = [
       "ffi"
@@ -2462,10 +2743,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8";
+      sha256 = "158qydqnrn1r0gm806j0bn439y0dyzdpscwi1sm3ldl1mcid5mx2";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.2";
   };
   rchardet = {
     groups = [ "default" ];
@@ -2478,7 +2759,10 @@
     version = "1.9.0";
   };
   rdoc = {
-    dependencies = [ "psych" ];
+    dependencies = [
+      "erb"
+      "psych"
+    ];
     groups = [
       "default"
       "development"
@@ -2487,30 +2771,42 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy";
+      sha256 = "09lj8d16wx5byj0nbcb9wc6v9farsvgn98n91kknm18g2ggl9pcz";
       type = "gem";
     };
-    version = "6.11.0";
+    version = "6.14.2";
   };
   redcarpet = {
     groups = [ "generic_import" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca";
+      sha256 = "0iglapqs4av4za9yfaac0lna7s16fq2xn36wpk380m55d8792i6l";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.6.1";
   };
   redis = {
+    dependencies = [ "redis-client" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq";
+      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
       type = "gem";
     };
-    version = "4.8.1";
+    version = "5.4.0";
+  };
+  redis-client = {
+    dependencies = [ "connection_pool" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1w6nz3k1kkg2xwdkbaflkjaj62fvk9j7lgk6p2qgsffs556f6dxa";
+      type = "gem";
+    };
+    version = "0.25.2";
   };
   redis-namespace = {
     dependencies = [ "redis" ];
@@ -2532,10 +2828,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
+      sha256 = "167zy35y4sasqx7wdpv757vigxl1znphfa0xmd9xxn7zhla9qpjy";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.11.2";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -2547,10 +2843,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
+      sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.2";
   };
   request_store = {
     dependencies = [ "rack" ];
@@ -2611,10 +2907,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a";
+      sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h";
       type = "gem";
     };
-    version = "4.5.1";
+    version = "4.6.0";
   };
   rqrcode = {
     dependencies = [
@@ -2625,20 +2921,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3";
+      sha256 = "1bwqy1iwbyn1091mg203is5ngsnvfparwa1wh89s1sgnfmirkmg2";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "3.1.0";
   };
   rqrcode_core = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg";
+      sha256 = "1ayrj7pwbv1g6jg5vvx6rq05lr1kbkfzbzqplj169aapmcivhh0y";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "2.0.0";
   };
   rrule = {
     dependencies = [ "activesupport" ];
@@ -2664,10 +2960,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
+      sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr";
       type = "gem";
     };
-    version = "3.13.0";
+    version = "3.13.1";
   };
   rspec-core = {
     dependencies = [ "rspec-support" ];
@@ -2679,10 +2975,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl";
+      sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb";
       type = "gem";
     };
-    version = "3.13.2";
+    version = "3.13.5";
   };
   rspec-expectations = {
     dependencies = [
@@ -2697,10 +2993,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
+      sha256 = "0dl8npj0jfpy31bxi6syc7jymyd861q277sfr6jawq2hv6hx791k";
       type = "gem";
     };
-    version = "3.13.3";
+    version = "3.13.5";
   };
   rspec-html-matchers = {
     dependencies = [
@@ -2732,10 +3028,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
+      sha256 = "10gajm8iscl7gb8q926hyna83bw3fx2zb4sqdzjrznjs51pqlcz4";
       type = "gem";
     };
-    version = "3.13.2";
+    version = "3.13.5";
   };
   rspec-multi-mock = {
     dependencies = [ "rspec" ];
@@ -2768,10 +3064,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0izfwfb9bfb5q3wjgjc85b9nlkribqn8vk75zadafv08qilmnn4l";
+      sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i";
       type = "gem";
     };
-    version = "7.1.0";
+    version = "8.0.2";
   };
   rspec-support = {
     groups = [
@@ -2782,10 +3078,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf";
+      sha256 = "1xx3f4mgr84jz07fifd3r68hm6giqy91hqyzawmi0s59yqa1hjqq";
       type = "gem";
     };
-    version = "3.13.2";
+    version = "3.13.4";
   };
   rss = {
     dependencies = [ "rexml" ];
@@ -2832,6 +3128,7 @@
     dependencies = [
       "json"
       "language_server-protocol"
+      "lint_roller"
       "parallel"
       "parser"
       "rainbow"
@@ -2848,13 +3145,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ypwxjy2cp44278m9ljg3s937n2cd6x4yskcyzf1k9m3hkjd3pyk";
+      sha256 = "1483x79fsvhc0yvvy62v8c5729x8zri5973icfhw4lkr35yjmx6k";
       type = "gem";
     };
-    version = "1.71.1";
+    version = "1.79.2";
   };
   rubocop-ast = {
-    dependencies = [ "parser" ];
+    dependencies = [
+      "parser"
+      "prism"
+    ];
     groups = [
       "default"
       "development"
@@ -2863,13 +3163,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg";
+      sha256 = "0ar3y8w36am483ynyzg0x8iwhn8h34y8f4agny4lyqcqbfnzd9qd";
       type = "gem";
     };
-    version = "1.38.0";
+    version = "1.46.0";
   };
   rubocop-capybara = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "default"
       "development"
@@ -2878,14 +3181,15 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx";
+      sha256 = "030wymq0jrblrdswl1lncj60dhcg5wszz6708qzsbziyyap8rn6f";
       type = "gem";
     };
-    version = "2.21.0";
+    version = "2.22.1";
   };
   rubocop-discourse = {
     dependencies = [
       "activesupport"
+      "lint_roller"
       "rubocop"
       "rubocop-capybara"
       "rubocop-factory_bot"
@@ -2900,13 +3204,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13n46107615lc8lkx4dh38hpzv4qxx4a0m6dvf0r21zxnvz7ysyl";
+      sha256 = "1g7rgma47h9a50gyl56bph0klglch9990hbi40vlfc059wif5xzb";
       type = "gem";
     };
-    version = "3.9.3";
+    version = "3.12.1";
   };
   rubocop-factory_bot = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "default"
       "development"
@@ -2915,14 +3222,15 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd";
+      sha256 = "1zkkhldrdacv4gn58dc591jxjnw5d767frzywm41i33p2rclnx4x";
       type = "gem";
     };
-    version = "2.26.1";
+    version = "2.27.1";
   };
   rubocop-rails = {
     dependencies = [
       "activesupport"
+      "lint_roller"
       "rack"
       "rubocop"
       "rubocop-ast"
@@ -2935,13 +3243,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ahpgc22shmkk1n96rz3islcpx5sgg4z3mblynjz8qjxipsgrhj1";
+      sha256 = "0jzpkb3vx2w8mg25gg18rvxzqvxziaqrwv14cqq2yaf1b0dh3344";
       type = "gem";
     };
-    version = "2.29.1";
+    version = "2.33.3";
   };
   rubocop-rspec = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "default"
       "development"
@@ -2950,13 +3261,14 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11a89mzbby49hbd8nhkjrxpr8bq24fafl728mjkk15ccd8xw28c7";
+      sha256 = "0ya4815sp8g13w7a86sm0605fx7xyldck77f9pjjfrvpf5c21r60";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.6.0";
   };
   rubocop-rspec_rails = {
     dependencies = [
+      "lint_roller"
       "rubocop"
       "rubocop-rspec"
     ];
@@ -2968,12 +3280,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8";
+      sha256 = "0i8zvzfj9gpq71zqkbmr05bfh66jg55hbwrfh551i896ibhpalvp";
       type = "gem";
     };
-    version = "2.30.0";
+    version = "2.31.0";
   };
   ruby-prof = {
+    dependencies = [ "base64" ];
     groups = [ "development" ];
     platforms = [
       {
@@ -2985,10 +3298,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "097ac9ns2j29zj5fw08libz8izibrlfgg6vkj55d4bzrii296qq2";
+      sha256 = "0h23zjwma8car8jpq7af8gw39qi88rn24mass7r13ripmky28117";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   ruby-progressbar = {
     groups = [
@@ -3004,6 +3317,16 @@
     };
     version = "1.13.0";
   };
+  ruby-rc4 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
   ruby-readability = {
     dependencies = [
       "guess_html_encoding"
@@ -3068,10 +3391,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
+      sha256 = "1ma4djp9i0pnpqr71vhzypgsny85g9db7sc1n2x30ky9qbfddsz1";
       type = "gem";
     };
-    version = "1.77.5";
+    version = "1.90.0";
   };
   sassc-embedded = {
     dependencies = [ "sass-embedded" ];
@@ -3079,10 +3402,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pddxi18asxzkn652kvgh43dl1b0nf5p8ha62yhg2r0vzapzzvv";
+      sha256 = "0gnbp770q1krka70phyf59amzw0dx92c0yx1psc9fkp5in9hqwmj";
       type = "gem";
     };
-    version = "1.77.7";
+    version = "1.80.5";
+  };
+  sawyer = {
+    dependencies = [
+      "addressable"
+      "faraday"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
+      type = "gem";
+    };
+    version = "0.9.2";
   };
   securerandom = {
     groups = [
@@ -3098,34 +3435,6 @@
     };
     version = "0.4.1";
   };
-  selenium-devtools = {
-    dependencies = [ "selenium-webdriver" ];
-    groups = [ "test" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1v2i8bmf92fb6c3cs7wnkxw48mgk3b8r2dib947h62ll7qgyqqiq";
-      type = "gem";
-    };
-    version = "0.135.0";
-  };
-  selenium-webdriver = {
-    dependencies = [
-      "base64"
-      "logger"
-      "rexml"
-      "rubyzip"
-      "websocket"
-    ];
-    groups = [ "test" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1s80s7mgpwpfj4df2f43f5im37ks884xkbcxd9fxpk93xs7dicnx";
-      type = "gem";
-    };
-    version = "4.31.0";
-  };
   shoulda-matchers = {
     dependencies = [ "activesupport" ];
     groups = [
@@ -3135,25 +3444,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch";
+      sha256 = "0i1zkr4rsvf8pz1x38wkb82nsjx28prmyb5blsmw86pd5cmmfszg";
       type = "gem";
     };
-    version = "6.4.0";
+    version = "6.5.0";
   };
   sidekiq = {
     dependencies = [
+      "base64"
       "connection_pool"
+      "logger"
       "rack"
-      "redis"
+      "redis-client"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zqr9is8y7mg5dfs1q8w5jl9spwvqkhbi9r6np8208n40hi3pydl";
+      sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
       type = "gem";
     };
-    version = "6.5.12";
+    version = "7.3.9";
   };
   simplecov = {
     dependencies = [
@@ -3178,10 +3489,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
+      sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.13.2";
   };
   simplecov_json_formatter = {
     groups = [
@@ -3215,40 +3526,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s";
+      sha256 = "0mnllrwhs7psw6xxs8x5yx85k12qjfdgs8zs0bxm70bfascx58r5";
       type = "gem";
     };
-    version = "2.0.1";
-  };
-  sprockets = {
-    dependencies = [
-      "base64"
-      "concurrent-ruby"
-      "rack"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "10ykzsa76cf8kvbfkszlvbyn4ckcx1mxjhfvwxzs7y28cljhzhkj";
-      type = "gem";
-    };
-    version = "3.7.5";
-  };
-  sprockets-rails = {
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59";
-      type = "gem";
-    };
-    version = "3.5.2";
+    version = "2.0.3";
   };
   sqlite3 = {
     dependencies = [ "mini_portile2" ];
@@ -3256,10 +3537,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sqshkafxa1r34yj4yxisd4kddmjq9jrhx6azqy3z71nwqv01yl7";
+      sha256 = "0mxz46b3vrjgmg7wr3iaaffrraqgxrhr1pizx8n2y4s1jg6zxcnj";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.7.3";
   };
   sshkey = {
     groups = [ "default" ];
@@ -3297,10 +3578,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0";
+      sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "3.1.7";
+  };
+  stripe = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "13gr4z9nsvpknyy9y2vg4dvg77817m2ykyx57j03692dgv684vm7";
+      type = "gem";
+    };
+    version = "11.1.0";
   };
   syntax_tree = {
     dependencies = [ "prettier_print" ];
@@ -3311,23 +3602,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g9l9acknjr2yz8ynfxbcrwx2ws3wh96pfzdb31g66k08v1022m5";
+      sha256 = "0ggi6p7xxjsj42q8pp0yz6z7dbwlbr6fjbs4qnafr667jab5mqjn";
       type = "gem";
     };
-    version = "6.2.0";
-  };
-  syntax_tree-disable_ternary = {
-    groups = [
-      "development"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gdi6zx4hqpxd81zas3dlw1jrdp98fvsqj4p7f42x5lhpfzz04zc";
-      type = "gem";
-    };
-    version = "1.0.0";
+    version = "6.3.0";
   };
   test-prof = {
     groups = [ "test" ];
@@ -3348,10 +3626,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
+  };
+  tiktoken_ruby = {
+    dependencies = [ "rb_sys" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "12ybz207d0wzy6x6q63nfxysgr1b5sx84g22ajav3w8vf4ssgzxd";
+      type = "gem";
+    };
+    version = "0.0.11.1";
   };
   timeout = {
     groups = [
@@ -3367,6 +3656,17 @@
     };
     version = "0.4.3";
   };
+  tokenizers = {
+    dependencies = [ "rb_sys" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14jd9xra2zn5m4i431rqqv8yqdw46fpm3ni47zn57wm3cw2n1wbv";
+      type = "gem";
+    };
+    version = "0.5.5";
+  };
   trilogy = {
     groups = [ "migrations" ];
     platforms = [ ];
@@ -3377,6 +3677,17 @@
     };
     version = "2.9.0";
   };
+  ttfunk = {
+    dependencies = [ "bigdecimal" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ji0kn8jkf1rpskv3ijzxvqwixg4p6sk8kg0vmwyjinci7jcgjx7";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
     groups = [
@@ -3398,21 +3709,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02yz3x0qxnnwbf7k18yck5pggbnyy43rq0d5w2r6rwlk3981m31d";
+      sha256 = "0f898y35w60mkx3sd8ld2ryzkj4cld04qlgxi3z3hzdlzfhpa8x9";
       type = "gem";
     };
-    version = "1.2025.1";
-  };
-  uglifier = {
-    dependencies = [ "execjs" ];
-    groups = [ "assets" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1apmqsad2y1avffh79f4lfysfppz94fvpyi7lkkj3z8bn60jpm3m";
-      type = "gem";
-    };
-    version = "4.2.1";
+    version = "1.2025.2";
   };
   unf = {
     groups = [ "default" ];
@@ -3434,10 +3734,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc";
+      sha256 = "0knx0bgwwpwa7wcmknqp2i019jq6b46wxfppvhxfxrsyhlbnhmmz";
       type = "gem";
     };
-    version = "3.1.4";
+    version = "3.1.5";
   };
   unicode-emoji = {
     groups = [
@@ -3485,20 +3785,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr";
+      sha256 = "19vcdlfcxrlp4vkzx0jn4zwf5jg125ca89s0mnqcqs6i5bnqfiyv";
       type = "gem";
     };
-    version = "1.16.0";
+    version = "1.17.0";
   };
   uri = {
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk";
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   useragent = {
     groups = [
@@ -3519,10 +3823,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6";
+      sha256 = "0270m29n7mq9yq4xnjzryzr6jxf292ahjn9fzywm2rg3rdz7cr59";
       type = "gem";
     };
-    version = "1.1.4";
+    version = "1.1.8";
   };
   web-push = {
     dependencies = [
@@ -3548,10 +3852,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy";
+      sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db";
       type = "gem";
     };
-    version = "3.24.0";
+    version = "3.25.1";
   };
   webrick = {
     groups = [
@@ -3567,19 +3871,6 @@
     };
     version = "1.9.1";
   };
-  websocket = {
-    groups = [
-      "default"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp";
-      type = "gem";
-    };
-    version = "1.2.11";
-  };
   xpath = {
     dependencies = [ "nokogiri" ];
     groups = [
@@ -3624,9 +3915,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89";
+      sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.7.3";
+  };
+  zendesk_api = {
+    dependencies = [
+      "faraday"
+      "faraday-multipart"
+      "hashie"
+      "inflection"
+      "mini_mime"
+      "multipart-post"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yizpglgfwml6a2w696m97d1q50hq3v0vldja431rv93s9sjbgly";
+      type = "gem";
+    };
+    version = "1.38.0.rc1";
   };
 }
diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py
index 13dbf283c881..c859394bf11f 100755
--- a/pkgs/servers/web-apps/discourse/update.py
+++ b/pkgs/servers/web-apps/discourse/update.py
@@ -280,25 +280,11 @@ def update_mail_receiver(rev):
 def update_plugins():
     """Update plugins to their latest revision."""
     plugins = [
-        {'name': 'discourse-assign'},
         {'name': 'discourse-bbcode-color'},
-        {'name': 'discourse-calendar'},
-        {'name': 'discourse-canned-replies'},
-        {'name': 'discourse-chat-integration'},
-        {'name': 'discourse-checklist'},
-        {'name': 'discourse-data-explorer'},
         {'name': 'discourse-docs'},
-        {'name': 'discourse-github'},
         {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'},
-        {'name': 'discourse-math'},
-        {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'},
-        {'name': 'discourse-openid-connect'},
         {'name': 'discourse-prometheus'},
-        {'name': 'discourse-reactions'},
         {'name': 'discourse-saved-searches'},
-        {'name': 'discourse-solved'},
-        {'name': 'discourse-spoiler-alert'},
-        {'name': 'discourse-voting', 'repo_name': "discourse-topic-voting"},
         {'name': 'discourse-yearly-review'},
     ]
 
diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index a2f9025ba9d3..5beaebc8e937 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.87.4";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    hash = "sha256-gsQPDbKTzsXV8y8/xMxmhJM6pI+zDkx/r1Zk83ixb7k=";
+    hash = "sha256-2EKI1Zp4bx3SFTxyBm/RtqIbFk1Lv4bkM0on+7xCuso=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-/bWDFIGElBc1lMODKTxmSkal9c4L1iTPd521/DVYyxo=";
+    hash = "sha256-QhwNC+a33WKxSUbv8o/9yMIeGMgjVE+6hKOj4VCoiWo=";
   };
 
   configurePhase = ''
diff --git a/pkgs/servers/web-apps/pingvin-share/default.nix b/pkgs/servers/web-apps/pingvin-share/default.nix
index 08a1907646b7..6a607d957902 100644
--- a/pkgs/servers/web-apps/pingvin-share/default.nix
+++ b/pkgs/servers/web-apps/pingvin-share/default.nix
@@ -1,7 +1,7 @@
 {
+  lib,
   callPackage,
   fetchFromGitHub,
-  recurseIntoAttrs,
 }:
 
 let
@@ -14,7 +14,7 @@ let
   };
 in
 
-recurseIntoAttrs {
+lib.recurseIntoAttrs {
   backend = callPackage ./backend.nix { inherit src version; };
 
   frontend = callPackage ./frontend.nix { inherit src version; };
diff --git a/pkgs/servers/web-apps/szurubooru/default.nix b/pkgs/servers/web-apps/szurubooru/default.nix
index d2c5339b245f..22da5573b36c 100644
--- a/pkgs/servers/web-apps/szurubooru/default.nix
+++ b/pkgs/servers/web-apps/szurubooru/default.nix
@@ -1,7 +1,7 @@
 {
   callPackage,
   fetchFromGitHub,
-  recurseIntoAttrs,
+  lib,
 }:
 
 let
@@ -14,7 +14,7 @@ let
   };
 in
 
-recurseIntoAttrs {
+lib.recurseIntoAttrs {
   client = callPackage ./client.nix { inherit src version; };
   server = callPackage ./server.nix { inherit src version; };
 }
diff --git a/pkgs/servers/web-apps/wordpress/packages/default.nix b/pkgs/servers/web-apps/wordpress/packages/default.nix
index 5fafdd153413..c7630cbeb1a5 100644
--- a/pkgs/servers/web-apps/wordpress/packages/default.nix
+++ b/pkgs/servers/web-apps/wordpress/packages/default.nix
@@ -43,7 +43,7 @@ let
           license,
           ...
         }@args:
-        assert lib.any (x: x == type) [
+        assert lib.elem type [
           "plugin"
           "theme"
           "language"
diff --git a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
index 62b2cf19103a..9ae93f6a4691 100644
--- a/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
+++ b/pkgs/servers/web-apps/wordpress/packages/thirdparty.nix
@@ -21,17 +21,6 @@
     meta.license = lib.licenses.agpl3Only;
   };
   themes = {
-    geist = stdenv.mkDerivation rec {
-      pname = "geist";
-      version = "2.0.3";
-      src = fetchzip {
-        inherit version;
-        name = pname;
-        url = "https://github.com/christophery/geist/archive/refs/tags/${version}.zip";
-        hash = "sha256-c85oRhqu5E5IJlpgqKJRQITur1W7x40obOvHZbPevzU=";
-      };
-      meta.license = lib.licenses.gpl2Only;
-    };
     proton = stdenv.mkDerivation rec {
       pname = "proton";
       version = "1.0.1";
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3e348cfcef79..61db87acd555 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1,6 +1,7 @@
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
 {
   lib,
+  appres,
   bdftopcf,
   font-adobe-100dpi,
   font-adobe-75dpi,
@@ -8,11 +9,29 @@
   font-adobe-utopia-75dpi,
   font-adobe-utopia-type1,
   font-alias,
+  font-bh-100dpi,
+  font-bh-75dpi,
+  font-bh-lucidatypewriter-100dpi,
+  font-bh-lucidatypewriter-75dpi,
   font-bh-ttf,
   font-bh-type1,
+  font-bitstream-100dpi,
+  font-bitstream-75dpi,
+  font-bitstream-type1,
+  font-cronyx-cyrillic,
   font-encodings,
+  font-isas-misc,
+  font-micro-misc,
+  font-misc-cyrillic,
+  font-misc-ethiopic,
   font-mutt-misc,
+  font-schumacher-misc,
+  font-screen-cyrillic,
+  font-sony-misc,
+  font-sun-misc,
   font-util,
+  font-winitzki-cyrillic,
+  font-xfree86-type1,
   gccmakedep,
   ico,
   imake,
@@ -24,6 +43,7 @@
   libpciaccess,
   libpthread-stubs,
   libsm,
+  libwindowswm,
   libx11,
   libxau,
   libxaw,
@@ -35,16 +55,30 @@
   libxcb-render-util,
   libxcb-util,
   libxcb-wm,
-  libxcvt,
+  libxcomposite,
   libxcursor,
+  libxcvt,
+  libxdamage,
   libxdmcp,
   libxext,
   libxfixes,
+  libxfont_1,
+  libxfont_2,
+  libxft,
+  libxi,
+  libxinerama,
+  libxkbfile,
   libxmu,
+  libxp,
   libxpm,
+  libxpresent,
   libxrandr,
   libxrender,
+  libxres,
+  libxscrnsaver,
+  libxshmfence,
   libxt,
+  libxtst,
   libxv,
   libxvmc,
   libxxf86dga,
@@ -62,16 +96,20 @@
   transset,
   util-macros,
   viewres,
+  x11perf,
   xauth,
   xbacklight,
   xbitmaps,
+  xcalc,
   xcb-proto,
   xcmsdb,
+  xcompmgr,
   xconsole,
   xcursorgen,
   xcursor-themes,
   xdriinfo,
   xev,
+  xeyes,
   xfontsel,
   xfsinfo,
   xgamma,
@@ -107,6 +145,7 @@
 self: with self; {
 
   inherit
+    appres
     bdftopcf
     gccmakedep
     ico
@@ -116,6 +155,8 @@ self: with self; {
     libpciaccess
     libxcb
     libxcvt
+    libxkbfile
+    libxshmfence
     listres
     lndir
     luit
@@ -126,14 +167,18 @@ self: with self; {
     smproxy
     transset
     viewres
+    x11perf
     xauth
     xbacklight
     xbitmaps
+    xcalc
     xcmsdb
+    xcompmgr
     xconsole
     xcursorgen
     xdriinfo
     xev
+    xeyes
     xfontsel
     xfsinfo
     xgamma
@@ -168,27 +213,58 @@ self: with self; {
   fontadobeutopia75dpi = font-adobe-utopia-75dpi;
   fontadobeutopiatype1 = font-adobe-utopia-type1;
   fontalias = font-alias;
+  fontbh100dpi = font-bh-100dpi;
+  fontbh75dpi = font-bh-75dpi;
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
+  fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontbitstream100dpi = font-bitstream-100dpi;
+  fontbitstream75dpi = font-bitstream-75dpi;
+  fontbitstreamtype1 = font-bitstream-type1;
+  fontcronyxcyrillic = font-cronyx-cyrillic;
+  fontisasmisc = font-isas-misc;
+  fontmicromisc = font-micro-misc;
+  fontmisccyrillic = font-misc-cyrillic;
+  fontmiscethiopic = font-misc-ethiopic;
   fontmuttmisc = font-mutt-misc;
+  fontschumachermisc = font-schumacher-misc;
+  fontscreencyrillic = font-screen-cyrillic;
+  fontsonymisc = font-sony-misc;
+  fontsunmisc = font-sun-misc;
   fontutil = font-util;
+  fontwinitzkicyrillic = font-winitzki-cyrillic;
+  fontxfree86type1 = font-xfree86-type1;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libSM = libsm;
+  libWindowsWM = libwindowswm;
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
+  libXcomposite = libxcomposite;
   libXcursor = libxcursor;
+  libXdamage = libxdamage;
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXfont2 = libxfont_2;
+  libXfont = libxfont_1;
+  libXft = libxft;
+  libXi = libxi;
+  libXinerama = libxinerama;
   libXmu = libxmu;
+  libXp = libxp;
   libXpm = libxpm;
+  libXpresent = libxpresent;
   libXrandr = libxrandr;
   libXrender = libxrender;
+  libXres = libxres;
+  libXScrnSaver = libxscrnsaver;
   libXt = libxt;
+  libXtst = libxtst;
   libXv = libxv;
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
@@ -210,44 +286,6 @@ self: with self; {
   xorgdocs = xorg-docs;
   xorgsgmldoctools = xorg-sgml-doctools;
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  appres = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "appres";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/appres-1.0.7.tar.xz";
-        sha256 = "17w17gqnfmpfmqgbjci1j4lnsd468k5yscxl3n6pmn4z4f4v250i";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   bitmap = callPackage (
     {
@@ -384,366 +422,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbh100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz";
-        sha256 = "07mb9781c9yxzp3ifw317v4fbnmg9qyqv0244zfspylihkz5x3zx";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbh75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz";
-        sha256 = "1nkwkqdl946xc4xknhi1pnxdww6rxrv013c7nk5x6ganfg0dh9k0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbhlucidatypewriter100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-lucidatypewriter-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz";
-        sha256 = "1wp87pijbydkpcmawsyas7vwhad2xg1mkkwigga2jjh9lknhkv3n";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbhlucidatypewriter75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-lucidatypewriter-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz";
-        sha256 = "1xg86mb9qigf5v0wx0q2shn8qaabsapamj627xllzw31mhwjqkl6";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstream100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz";
-        sha256 = "19y1j1v65890x8yn6a47jqljfax3ihfrd25xbzgypxz4xy1cc71d";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstream75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz";
-        sha256 = "09pq7dvyyxj6kvps1dm3qr15pjwh9iq9118fryqc5a94fkc39sxa";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstreamspeedo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-speedo";
-      version = "1.0.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz";
-        sha256 = "0wmy58cd3k7w2j4v20icnfs8z3b61qj3vqdx958z18w00h9mzsmf";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstreamtype1 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-type1";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz";
-        sha256 = "0a669193ivi2lxk3v692kq1pqavaswlpi9hbi8ib8bfp9j5j6byy";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontcronyxcyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-cronyx-cyrillic";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz";
-        sha256 = "12dpsvif85z1m6jvq9g91lmzj0rll5rh3871mbvdpzyb1p7821yw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontcursormisc = callPackage (
     {
@@ -902,46 +580,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontisasmisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-isas-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz";
-        sha256 = "1z1qqi64hbp297f6ryiswa4ikfn7mcwnb8nadyglni6swsxrbra7";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontjismisc = callPackage (
     {
@@ -982,124 +620,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmicromisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-micro-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz";
-        sha256 = "0hzryqyml0bzzw91vqdmzdlb7dm18jmyz0mxy6plks3sppbbkq1f";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmisccyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-misc-cyrillic";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz";
-        sha256 = "14z9x174fidjn65clkd2y1l6pxspmvphizap9a8h2h06adzil0kn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmiscethiopic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-misc-ethiopic";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz";
-        sha256 = "04mnd620s9wkdid9wnf181yh5vf0n7l096nc3z4zdvm1w7kafja7";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontmiscmeltho = callPackage (
     {
@@ -1179,167 +699,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontschumachermisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-schumacher-misc";
-      version = "1.1.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz";
-        sha256 = "0w40lr214n39al449fnm4k1bpyj3fjrhz2yxqd6a6m8yvc69z14b";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontscreencyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-screen-cyrillic";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz";
-        sha256 = "1h75zn1rp7bdv6av4cnrajpaq6fkd7dx1lc7aijpw32qrnw8nxcg";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontsonymisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-sony-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz";
-        sha256 = "0swlhjmmagrfkip4i9yq7cr56hains1j41mjs05nxc6c7y19zc76";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontsunmisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-sun-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz";
-        sha256 = "17yvhk1hlajm3q57r09q8830zz7cnckrg8hgzajgyyljdl8xv16x";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fonttosfnt = callPackage (
     {
@@ -1378,84 +737,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontwinitzkicyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-winitzki-cyrillic";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz";
-        sha256 = "1a4pz8f7hz6nn9xirz2k1j81ykl3lwrpi1ydmzipciy15l984v9v";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontxfree86type1 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-xfree86-type1";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz";
-        sha256 = "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   iceauth = callPackage (
     {
@@ -1492,82 +773,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libWindowsWM = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libWindowsWM";
-      version = "1.0.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2";
-        sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "windowswm" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXScrnSaver = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXScrnSaver";
-      version = "1.2.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz";
-        sha256 = "004drphnsckx30g8xn554a1nr17p1zhl2547fpif0lvjhigkcmsh";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xscrnsaver" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXTrap = callPackage (
     {
@@ -1608,514 +813,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXcomposite = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXfixes,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXcomposite";
-      version = "0.4.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz";
-        sha256 = "11rcvk380l5540gfqy9p8mbzw3l1p5g8l214p870f28smvqbqh7y";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXfixes
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcomposite" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXdamage = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXfixes,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXdamage";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz";
-        sha256 = "04axzdx75w0wcb4na7lfpa0ai0fddw60dmg7cigs7z32a8gkqwsj";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXfixes
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xdamage" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXfont = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libfontenc,
-      xorgproto,
-      freetype,
-      xtrans,
-      zlib,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXfont";
-      version = "1.5.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2";
-        sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libfontenc
-        xorgproto
-        freetype
-        xtrans
-        zlib
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xfont" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXfont2 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libfontenc,
-      xorgproto,
-      freetype,
-      xtrans,
-      zlib,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXfont2";
-      version = "2.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz";
-        sha256 = "1ywfwpirvi7fmd3my3cb6szzd9c4p7xy7s1kjjv6k1x4xgyq4ywb";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libfontenc
-        xorgproto
-        freetype
-        xtrans
-        zlib
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xfont2" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXft = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontconfig,
-      freetype,
-      libX11,
-      xorgproto,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXft";
-      version = "2.3.9";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXft-2.3.9.tar.xz";
-        sha256 = "1xbn77zqjzx2zdzqcsbf8pvivlqplnciifxk6lk97mjyjiw5p8k0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        fontconfig
-        freetype
-        libX11
-        xorgproto
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xft" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXfixes,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXi";
-      version = "1.8.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXi-1.8.2.tar.xz";
-        sha256 = "0161qsac0dgvkkcihpm2062p1lk2l5mj4i7smd713qnnadg5bq6h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXfixes
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xi" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXinerama = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXinerama";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz";
-        sha256 = "0p08q8q1wg0sixhizl2l1i935bk6x3ckj3bdd6qqr0n1zkqd352h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xinerama" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXp = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXau,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXp";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXp-1.0.4.tar.xz";
-        sha256 = "197iklxwyd4naryc6mzv0g5qi1dy1apxk9w9k3yshd1ax2wf668z";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXau
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xp" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXpresent = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXfixes,
-      libXrandr,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXpresent";
-      version = "1.0.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz";
-        sha256 = "00knsc4hrxzq3rx7ff1h0k0h418p66p0cdh14fra81i2h6s22nsf";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXfixes
-        libXrandr
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xpresent" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXres = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXres";
-      version = "1.2.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXres-1.2.3.tar.xz";
-        sha256 = "1p39xfpgckp22v60h36wvy2zbpmqgra585krja4nmj6n05a8zpnj";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xres" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXtst = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXi,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXtst";
-      version = "1.2.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz";
-        sha256 = "0hljblisw72fk60y7zf9214ydn7lk32kj43cf12af2bhp4jlq3dm";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXi
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xtst" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libxkbfile = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libxkbfile";
-      version = "1.1.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz";
-        sha256 = "1v2bhw1q1cj3wjfs0igq393iz10whcavbyxlm3k9xfvsk7m3xdm9";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xkbfile" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libxshmfence = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libxshmfence";
-      version = "1.3.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz";
-        sha256 = "046y7zn8agp8kdr1lg11yyvpx90i9sjf77h25jhgx5msd84xz96l";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ xorgproto ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xshmfence" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   oclock = callPackage (
     {
@@ -2200,94 +897,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  x11perf = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      libXft,
-      libXmu,
-      xorgproto,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "x11perf";
-      version = "1.6.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2";
-        sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        libXft
-        libXmu
-        xorgproto
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcalc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXaw,
-      xorgproto,
-      libXt,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcalc";
-      version = "1.1.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xcalc-1.1.2.tar.xz";
-        sha256 = "1m0wzhjvc88kmx12ykdml5rqlz9h2iki9mkfdngji53y8nhxyy45";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libX11
-        libXaw
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xclock = callPackage (
     {
@@ -2340,50 +949,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcompmgr = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libXcomposite,
-      libXdamage,
-      libXext,
-      libXfixes,
-      xorgproto,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcompmgr";
-      version = "1.1.10";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz";
-        sha256 = "13xrn0ii8widz0pw31fbdy7x8paf729yqhkmxbm3497jqh4zf93q";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libXcomposite
-        libXdamage
-        libXext
-        libXfixes
-        xorgproto
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xdm = callPackage (
     {
@@ -2502,54 +1067,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xeyes = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libxcb,
-      libXext,
-      libXi,
-      libXmu,
-      xorgproto,
-      libXrender,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xeyes";
-      version = "1.3.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xeyes-1.3.0.tar.xz";
-        sha256 = "08rhfp5xlmdbyxkvxhgjxdn6vwzrbrjyd7jkk8b7wi1kpw0ccl09";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libxcb
-        libXext
-        libXi
-        libXmu
-        xorgproto
-        libXrender
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputevdev = callPackage (
     {
@@ -4835,11 +3352,11 @@ self: with self; {
     }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "xorg-server";
-      version = "21.1.18";
+      version = "21.1.20";
       builder = ./builder.sh;
       src = fetchurl {
-        url = "mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz";
-        sha256 = "0lk3268gzpll547zvaa64rdhs4z89d7w567lbd55swl71n9x2y68";
+        url = "mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz";
+        sha256 = "sha256-dpW8YYJLOoG2utL3iwVADKAVAD3kAtGzIhFxBbcC6Tc=";
       };
       hardeningDisable = [
         "bindnow"
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 87ce0a89df21..d87b1ad6879d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -62,17 +62,31 @@ $pcMap{"xcb-cursor"} = "xcbutilcursor";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xcb-renderutil"} = "xcbutilrenderutil";
 $pcMap{"xcb-util"} = "xcbutil";
+$pcMap{"xcomposite"} = "libXcomposite";
 $pcMap{"xcursor"} = "libXcursor";
+$pcMap{"xdamage"} = "libXdamage";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
+$pcMap{"xfont"} = "libXfont";
+$pcMap{"xfont2"} = "libXfont2";
+$pcMap{"xft"} = "libXft";
+$pcMap{"xi"} = "libXi";
+$pcMap{"xinerama"} = "libXinerama";
+$pcMap{"xkbfile"} = "libxkbfile";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
+$pcMap{"xp"} = "libXp";
 $pcMap{"xpm"} = "libXpm";
+$pcMap{"xpresent"} = "libXpresent";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
+$pcMap{"xres"} = "libXres";
+$pcMap{"xscrnsaver"} = "libXScrnSaver";
+$pcMap{"xshmfence"} = "libxshmfence";
 $pcMap{"xt"} = "libXt";
 $pcMap{"xtrans"} = "xtrans";
+$pcMap{"xtst"} = "libXtst";
 $pcMap{"xv"} = "libXv";
 $pcMap{"xvmc"} = "libXvMC";
 $pcMap{"xvmc-wrapper"} = "libXvMC";
@@ -318,6 +332,7 @@ print OUT <<EOF;
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
 {
   lib,
+  appres,
   bdftopcf,
   font-adobe-100dpi,
   font-adobe-75dpi,
@@ -325,11 +340,29 @@ print OUT <<EOF;
   font-adobe-utopia-75dpi,
   font-adobe-utopia-type1,
   font-alias,
+  font-bh-100dpi,
+  font-bh-75dpi,
+  font-bh-lucidatypewriter-100dpi,
+  font-bh-lucidatypewriter-75dpi,
   font-bh-ttf,
   font-bh-type1,
+  font-bitstream-100dpi,
+  font-bitstream-75dpi,
+  font-bitstream-type1,
+  font-cronyx-cyrillic,
   font-encodings,
+  font-isas-misc,
+  font-micro-misc,
+  font-misc-cyrillic,
+  font-misc-ethiopic,
   font-mutt-misc,
+  font-schumacher-misc,
+  font-screen-cyrillic,
+  font-sony-misc,
+  font-sun-misc,
   font-util,
+  font-winitzki-cyrillic,
+  font-xfree86-type1,
   gccmakedep,
   ico,
   imake,
@@ -341,6 +374,7 @@ print OUT <<EOF;
   libpciaccess,
   libpthread-stubs,
   libsm,
+  libwindowswm,
   libx11,
   libxau,
   libxaw,
@@ -352,16 +386,30 @@ print OUT <<EOF;
   libxcb-render-util,
   libxcb-util,
   libxcb-wm,
-  libxcvt,
+  libxcomposite,
   libxcursor,
+  libxcvt,
+  libxdamage,
   libxdmcp,
   libxext,
   libxfixes,
+  libxfont_1,
+  libxfont_2,
+  libxft,
+  libxi,
+  libxinerama,
+  libxkbfile,
   libxmu,
+  libxp,
   libxpm,
+  libxpresent,
   libxrandr,
   libxrender,
+  libxres,
+  libxscrnsaver,
+  libxshmfence,
   libxt,
+  libxtst,
   libxv,
   libxvmc,
   libxxf86dga,
@@ -379,16 +427,20 @@ print OUT <<EOF;
   transset,
   util-macros,
   viewres,
+  x11perf,
   xauth,
   xbacklight,
   xbitmaps,
+  xcalc,
   xcb-proto,
   xcmsdb,
+  xcompmgr,
   xconsole,
   xcursorgen,
   xcursor-themes,
   xdriinfo,
   xev,
+  xeyes,
   xfontsel,
   xfsinfo,
   xgamma,
@@ -424,6 +476,7 @@ print OUT <<EOF;
 self: with self; {
 
   inherit
+    appres
     bdftopcf
     gccmakedep
     ico
@@ -433,6 +486,8 @@ self: with self; {
     libpciaccess
     libxcb
     libxcvt
+    libxkbfile
+    libxshmfence
     listres
     lndir
     luit
@@ -443,14 +498,18 @@ self: with self; {
     smproxy
     transset
     viewres
+    x11perf
     xauth
     xbacklight
     xbitmaps
+    xcalc
     xcmsdb
+    xcompmgr
     xconsole
     xcursorgen
     xdriinfo
     xev
+    xeyes
     xfontsel
     xfsinfo
     xgamma
@@ -485,27 +544,58 @@ self: with self; {
   fontadobeutopia75dpi = font-adobe-utopia-75dpi;
   fontadobeutopiatype1 = font-adobe-utopia-type1;
   fontalias = font-alias;
+  fontbh100dpi = font-bh-100dpi;
+  fontbh75dpi = font-bh-75dpi;
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
+  fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontbitstream100dpi = font-bitstream-100dpi;
+  fontbitstream75dpi = font-bitstream-75dpi;
+  fontbitstreamtype1 = font-bitstream-type1;
+  fontcronyxcyrillic = font-cronyx-cyrillic;
+  fontisasmisc = font-isas-misc;
+  fontmicromisc = font-micro-misc;
+  fontmisccyrillic = font-misc-cyrillic;
+  fontmiscethiopic = font-misc-ethiopic;
   fontmuttmisc = font-mutt-misc;
+  fontschumachermisc = font-schumacher-misc;
+  fontscreencyrillic = font-screen-cyrillic;
+  fontsonymisc = font-sony-misc;
+  fontsunmisc = font-sun-misc;
   fontutil = font-util;
+  fontwinitzkicyrillic = font-winitzki-cyrillic;
+  fontxfree86type1 = font-xfree86-type1;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libSM = libsm;
+  libWindowsWM = libwindowswm;
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
+  libXcomposite = libxcomposite;
   libXcursor = libxcursor;
+  libXdamage = libxdamage;
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXfont2 = libxfont_2;
+  libXfont = libxfont_1;
+  libXft = libxft;
+  libXi = libxi;
+  libXinerama = libxinerama;
   libXmu = libxmu;
+  libXp = libxp;
   libXpm = libxpm;
+  libXpresent = libxpresent;
   libXrandr = libxrandr;
   libXrender = libxrender;
+  libXres = libxres;
+  libXScrnSaver = libxscrnsaver;
   libXt = libxt;
+  libXtst = libxtst;
   libXv = libxv;
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7ebd6f9ed6e8..3150f98fe76a 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,6 +1,7 @@
 {
   callPackage,
   lib,
+  config,
   stdenv,
   makeWrapper,
   fetchurl,
@@ -112,16 +113,6 @@ self: super:
       )
   ) { };
 
-  appres = super.appres.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [
-      meson
-      ninja
-    ];
-    meta = attrs.meta // {
-      mainProgram = "appres";
-    };
-  });
-
   bitmap = addMainProgram super.bitmap { };
 
   editres = super.editres.overrideAttrs (attrs: {
@@ -150,26 +141,6 @@ self: super:
 
   mkfontdir = xorg.mkfontscale;
 
-  libXtst = super.libXtst.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      pkgConfigModules = [ "xtst" ];
-    };
-  });
-
-  libXfont = super.libXfont.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ freetype ]; # propagate link reqs. like bzip2
-    # prevents "misaligned_stack_error_entering_dyld_stub_binder"
-    configureFlags = lib.optional isDarwin "CFLAGS=-O0";
-  });
-
-  libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
     preConfigure =
@@ -202,113 +173,6 @@ self: super:
     };
   });
 
-  libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXfixes ];
-  });
-
-  libXdamage = super.libXdamage.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
-  libXft = super.libXft.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
-      xorg.libXrender
-      freetype
-      fontconfig
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-
-    # the include files need ft2build.h, and Requires.private isn't enough for us
-    postInstall = ''
-      sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
-    '';
-    passthru = attrs.passthru // {
-      inherit freetype fontconfig;
-    };
-  });
-
-  libXi = super.libXi.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "man"
-      "doc"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
-      xorg.libXfixes
-      xorg.libXext
-    ];
-    configureFlags =
-      lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        "xorg_cv_malloc0_returns_null=no"
-      ]
-      ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
-  });
-
-  libXinerama = super.libXinerama.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
-  libXres = super.libXres.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "devdoc"
-    ];
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
-  libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
-  libXp = super.libXp.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
-  libXpresent = super.libXpresent.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXrandr
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXfixes ];
-  });
-
-  libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to avoid propagation
-  });
-
-  libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to avoid propagation
-  });
-
   setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
     postInstall = ''
       mkdir -p $out/share/man/man7
@@ -322,18 +186,6 @@ self: super:
 
   oclock = addMainProgram super.oclock { };
 
-  x11perf = super.x11perf.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [
-      freetype
-      fontconfig
-    ];
-    meta = attrs.meta // {
-      mainProgram = "x11perf";
-    };
-  });
-
-  xcalc = addMainProgram super.xcalc { };
-
   xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
     outputs = [
       "out"
@@ -528,8 +380,6 @@ self: super:
     };
   });
 
-  xeyes = addMainProgram super.xeyes { };
-
   xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
     configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ];
     meta = attrs.meta // {
@@ -837,7 +687,6 @@ self: super:
   });
 
   xclock = addMainProgram super.xclock { };
-  xcompmgr = addMainProgram super.xcompmgr { };
 
   xinit =
     (super.xinit.override {
@@ -939,27 +788,6 @@ self: super:
   });
 
   xwd = addMainProgram super.xwd { };
-
-  # convert Type1 vector fonts to OpenType fonts
-  fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ];
-
-    postBuild = ''
-      # convert Postscript (Type 1) font to otf
-      for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do
-          name=$(basename $i | cut -d. -f1)
-          fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")"
-      done
-    '';
-
-    postInstall = ''
-      # install the otf fonts
-      fontDir="$out/lib/X11/fonts/misc/"
-      install -D -m 644 -t "$fontDir" *.otf
-      mkfontscale "$fontDir"
-    '';
-  });
-
 }
 
 # mark some packages as unfree
@@ -968,13 +796,6 @@ self: super:
     # unfree but redistributable
     redist = [
       "fontibmtype1"
-      "fontbh100dpi"
-      "fontbh75dpi"
-
-      # Bigelow & Holmes fonts
-      # https://www.x.org/releases/current/doc/xorg-docs/License.html#Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license
-      "fontbhlucidatypewriter100dpi"
-      "fontbhlucidatypewriter75dpi"
     ];
 
     # unfree, possibly not redistributable
@@ -1000,3 +821,8 @@ self: super:
   mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist
   // mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
 )
+
+# deprecate some packages
+// lib.optionalAttrs config.allowAliases {
+  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24
+}
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index fc60f6a79529..33aa31bf7c8d 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,17 +1,12 @@
-mirror://xorg/individual/app/appres-1.0.7.tar.xz
 mirror://xorg/individual/app/bitmap-1.1.1.tar.xz
 mirror://xorg/individual/app/editres-1.0.9.tar.xz
 mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz
 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
-mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
-mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
-mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz
 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
-mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz
@@ -74,46 +69,12 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz
-mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
-mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
-mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
-mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
-mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
-mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
-mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
-mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
-mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
-mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz
-mirror://xorg/individual/lib/libXft-2.3.9.tar.xz
-mirror://xorg/individual/lib/libXi-1.8.2.tar.xz
-mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
-mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXp-1.0.4.tar.xz
-mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz
-mirror://xorg/individual/lib/libXres-1.2.3.tar.xz
-mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz
-mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
-mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz
+mirror://xorg/individual/xserver/xorg-server-21.1.20.tar.xz
diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 5b24b53185fa..78c624811784 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.8";
+  version = "24.1.9";
 
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    hash = "sha256-yJCNV8jtnOuCk8Frp61a9SLvrxun5R+eTPPAd00ZmQc=";
+    hash = "sha256-8pevJ6hFCNubgNHLvMacOAHaOOtkxy87W1D1gkWa/dA=";
   };
 
   postPatch = ''
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 08b4e4bff2fc..017edfe2613e 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -103,7 +103,7 @@ lib.warnIf (withDocs != null)
       # default is fine for static linking on Linux (weak symbols?) but
       # not with BSDs, when it does clash with the regular `getenv`.
       "bash_cv_getenv_redef=${
-        if !(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)) then "yes" else "no"
+        lib.boolToYesNo (!(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)))
       }"
     ]
     ++ lib.optionals stdenv.hostPlatform.isCygwin [
@@ -278,7 +278,7 @@ lib.warnIf (withDocs != null)
       mainProgram = "bash";
       identifiers.cpeParts =
         let
-          versionSplit = lib.split "p" version;
+          versionSplit = lib.split "p" fa.version;
         in
         {
           vendor = "gnu";
diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix
index 2f25dcf87060..93c880ffb77f 100644
--- a/pkgs/shells/fish/plugins/async-prompt.nix
+++ b/pkgs/shells/fish/plugins/async-prompt.nix
@@ -19,6 +19,6 @@ buildFishPlugin rec {
     description = "Make your prompt asynchronous to improve the reactivity";
     homepage = "https://github.com/acomagu/fish-async-prompt";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix
index 6832c0bf746b..d555d4ab8785 100644
--- a/pkgs/shells/fish/plugins/autopair.nix
+++ b/pkgs/shells/fish/plugins/autopair.nix
@@ -20,7 +20,6 @@ buildFishPlugin rec {
     homepage = "https://github.com/jorgebucaran/autopair.fish";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       kidonng
       pyrox0
     ];
diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index f6d0fc894f44..e4ce0bba041c 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -8,13 +8,13 @@
 
 buildFishPlugin rec {
   pname = "pure";
-  version = "4.11.3";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
     rev = "v${version}";
-    hash = "sha256-mMUFR/n4aLsmZNbVAYmx57AMXT6U2P+wTuuN3opCeqs=";
+    hash = "sha256-QG/saZReqpYiSXTG+nPmkJ5ETAAdo0mVrUqyepu7Pvs=";
   };
 
   nativeCheckInputs = [ git ];
diff --git a/pkgs/shells/nushell/default.nix b/pkgs/shells/nushell/default.nix
index f17d4dbfe750..d1b5547e59ab 100644
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@@ -23,7 +23,7 @@ let
   # NOTE: when updating this to a new non-patch version, please also try to
   # update the plugins. Plugins only work if they are compiled for the same
   # major/minor version.
-  version = "0.107.0";
+  version = "0.108.0";
 in
 rustPlatform.buildRustPackage {
   pname = "nushell";
@@ -33,10 +33,10 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     tag = version;
-    hash = "sha256-ghBuqkiVHvPxD4zBpvL6NG+qL54SD/aLZNZqWUK4a28=";
+    hash = "sha256-8OMTscMObV+IOSgOoTSzJvZTz6q/l2AjrOb9y3p2tZY=";
   };
 
-  cargoHash = "sha256-HQy6maPKxreYPLni0/XETF/EEJqGGcpAurzf+QTVX18=";
+  cargoHash = "sha256-M2wkhhaS3bVhwaa3O0CUK5hL757qFObr7EDtBFXXwxg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/shells/nushell/plugins/desktop_notifications.nix b/pkgs/shells/nushell/plugins/desktop_notifications.nix
index 1a87a0af4543..6886e659903f 100644
--- a/pkgs/shells/nushell/plugins/desktop_notifications.nix
+++ b/pkgs/shells/nushell/plugins/desktop_notifications.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_desktop_notifications";
-  version = "0.106.1";
+  version = "0.108.0";
 
   src = fetchFromGitHub {
     owner = "FMotalleb";
     repo = "nu_plugin_desktop_notifications";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FuiXHl7O6/DN7kENrVxOys8mJAGbpb11w9iJ+mqQ/ds=";
+    hash = "sha256-9NkWPoTdMxFlI/BkP8w0ltC6UVh3/tg9gjwBuS3k/Cg=";
   };
 
-  cargoHash = "sha256-yFkiRGrg8eGGap5vyZVRMpddsoTYNrwSC94uLYufmdc=";
+  cargoHash = "sha256-GK6ytH/SDHh6GlLrSA2oJLza1tvYOUp4cR5CM6bloz8=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/pkgs/shells/nushell/plugins/hcl.nix b/pkgs/shells/nushell/plugins/hcl.nix
index ee2d5d59f46f..8576fe1cfb26 100644
--- a/pkgs/shells/nushell/plugins/hcl.nix
+++ b/pkgs/shells/nushell/plugins/hcl.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_hcl";
-  version = "0.107.0";
+  version = "0.108.0";
 
   src = fetchFromGitHub {
     owner = "Yethal";
     repo = "nu_plugin_hcl";
     tag = finalAttrs.version;
-    hash = "sha256-KtX1i3iAZcEHnDdceV4JyildA//y/pnIxK/U/NbSw5w=";
+    hash = "sha256-WyZ8uSYWNzurqpE+BP0hKsknurP7Iyf5L8Y5DjVQZsA=";
   };
 
-  cargoHash = "sha256-CaPyAQgUpGBZx65j7ih4NOBR34rDpE0HQ425freGEOk=";
+  cargoHash = "sha256-2b/0B9W01gGuGc482DYQSbRR2LLZXQxUG2fYB5TklPQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
diff --git a/pkgs/shells/nushell/plugins/highlight.nix b/pkgs/shells/nushell/plugins/highlight.nix
index 9c166c97a772..2c119c71a676 100644
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@@ -9,17 +9,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_highlight";
-  version = "1.4.8+0.106.0";
+  version = "1.4.10+0.108.0";
 
   src = fetchFromGitHub {
     owner = "cptpiepmatz";
     repo = "nu-plugin-highlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-H7bCX13miQECEPCOT2eF+TBkUU3qff+LhOiA008GLdI=";
+    hash = "sha256-ynvLvGMxFiYOYGPDdlv1509lWU5DpfBK9Mwa9gLeHsI=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-Qf6qEY6imcI0rfktGl5ErsbT+HCDgTohl+NKFsrQbzA=";
+  cargoHash = "sha256-Xq7ctnzcrSPzo3M3p3Vxtj0U0U9Miw+2VuyYs6P3GlQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
@@ -34,6 +34,5 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/cptpiepmatz/nu-plugin-highlight";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ mgttlinger ];
-    broken = true;
   };
 })
diff --git a/pkgs/shells/nushell/plugins/semver.nix b/pkgs/shells/nushell/plugins/semver.nix
index c969b47ba2b3..a02cad83c534 100644
--- a/pkgs/shells/nushell/plugins/semver.nix
+++ b/pkgs/shells/nushell/plugins/semver.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_semver";
-  version = "0.11.7";
+  version = "0.11.8";
 
   src = fetchFromGitHub {
     owner = "abusch";
     repo = "nu_plugin_semver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RrkOVo5MTLtVAp6d+Y1oP3jwImXeofXRdGXRFlwYA9I=";
+    hash = "sha256-ui9zyE5g4LiU2+Csv4p0D61fmPXaDMhnpQ34ggEg3eA=";
   };
 
-  cargoHash = "sha256-vKrwoPn8MLjzTrR7p3SH7I2LKKieJCm4tuarp4hktKA=";
+  cargoHash = "sha256-5W0GbKz18rQ+3TjNanzV4H4LE/7TLZ+8/FbGHffE2RY=";
 
   passthru.update-script = nix-update-script { };
 
diff --git a/pkgs/shells/nushell/plugins/skim.nix b/pkgs/shells/nushell/plugins/skim.nix
index cf6ad165372b..80060c2ea7a4 100644
--- a/pkgs/shells/nushell/plugins/skim.nix
+++ b/pkgs/shells/nushell/plugins/skim.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nu_plugin_skim";
-  version = "0.19.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "idanarye";
     repo = "nu_plugin_skim";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7yG1/HdapH/Jf6I/cw/1dCjVSwqMPd7XMAK9tG7IqRg=";
+    hash = "sha256-2CqgtV2DnBd8HqnRdZRiT14aw+meaX4A3ndTGvbsMfo=";
   };
 
-  cargoHash = "sha256-FqB4EaHQYSOyT1Oda1FHSbmL4Wrza/9m3nkI01GowUE=";
+  cargoHash = "sha256-3Kua+gZl4Ff6jfSNyEVDbPVH4YfGXhwtuEjcUADecQE=";
 
   nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
 
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 4ef0e31896df..d7360aa3360f 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -335,6 +335,22 @@ rec {
             }
       );
 
+  useWildLinker =
+    stdenv:
+    if !stdenv.targetPlatform.isLinux then
+      throw "Wild only supports building Linux ELF files from Linux hosts."
+    else
+      stdenv.override (prev: {
+        allowedRequisites = null;
+        cc = prev.cc.override {
+          bintools = prev.cc.bintools.override {
+            extraBuildCommands = ''
+              ln -fs ${pkgs.buildPackages.wild-wrapped}/bin/* "$out/bin"
+            '';
+          };
+        };
+      });
+
   /*
     Modify a stdenv so that it builds binaries optimized specifically
     for the machine they are built on.
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 1954e861eae1..934e7b87d14d 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -162,5 +162,9 @@ let
         buildPackages.stdenv.cc;
   };
 
+  pkgs = dfold folder postStage (_: { }) withAllowCustomOverrides;
+
 in
-dfold folder postStage (_: { }) withAllowCustomOverrides
+# Return the spliced package set, so that consumers of the nixpkgs top-level
+# attributes, like NixOS, don't break when cross-compiling.
+pkgs.__splicedPackages
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 1a91fda9a536..a63e0c9b074b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -467,97 +467,90 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
         );
 
         llvmPackages =
-          super.llvmPackages
-          // (
-            let
-              tools = super.llvmPackages.tools.extend (
-                selfTools: _: {
-                  libclang = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-clang";
-                    version = "boot";
-                    outputs = [
-                      "out"
-                      "lib"
-                    ];
-                    buildCommand = ''
-                      mkdir -p $out/lib
-                      ln -s $out $lib
-                      ln -s ${bootstrapTools}/bin       $out/bin
-                      ln -s ${bootstrapTools}/lib/clang $out/lib
-                      ln -s ${bootstrapTools}/include   $out
-                    '';
-                    passthru = {
-                      isFromBootstrapFiles = true;
-                      hardeningUnsupportedFlags = [
-                        "fortify3"
-                        "pacret"
-                        "shadowstack"
-                        "stackclashprotection"
-                        "zerocallusedregs"
-                      ];
-                    };
-                  };
-                  libllvm = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-llvm";
-                    outputs = [
-                      "out"
-                      "lib"
-                    ];
-                    buildCommand = ''
-                      mkdir -p $out/bin $out/lib
-                      ln -s $out $lib
-                      for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
-                        cctoolsTool=''${tool//-/_}
-                        toolsrc="${bootstrapTools}/bin/$cctoolsTool"
-                        if [ -e "$toolsrc" ]; then
-                          ln -s "$toolsrc" $out/bin/llvm-$tool
-                        fi
-                      done
-                      ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
-                      ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi
-                      ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
-                    '';
-                    passthru.isFromBootstrapFiles = true;
-                  };
-                  llvm-manpages = self.llvmPackages.libllvm;
-                  lld = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-lld";
-                    buildCommand = "";
-                    passthru = {
-                      isLLVM = true;
-                      isFromBootstrapFiles = true;
-                    };
-                  };
-                }
-              );
-              libraries = super.llvmPackages.libraries.extend (
-                _: _: {
-                  compiler-rt = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-compiler-rt";
-                    buildCommand = ''
-                      mkdir -p $out/lib $out/share
-                      ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
-                      ln -s ${bootstrapTools}/lib/darwin       $out/lib
-                    '';
-                    passthru.isFromBootstrapFiles = true;
-                  };
-                  libcxx = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-libcxx";
-                    buildCommand = ''
-                      mkdir -p $out/lib $out/include
-                      ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
-                      ln -s ${bootstrapTools}/include/c++      $out/include
-                    '';
-                    passthru = {
-                      isLLVM = true;
-                      isFromBootstrapFiles = true;
-                    };
-                  };
-                }
-              );
-            in
-            { inherit tools libraries; } // tools // libraries
-          );
+          (super.llvmPackages.overrideScope (
+            selfLlvmPackages: _: {
+              libclang = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-clang";
+                version = "boot";
+                outputs = [
+                  "out"
+                  "lib"
+                ];
+                buildCommand = ''
+                  mkdir -p $out/lib
+                  ln -s $out $lib
+                  ln -s ${bootstrapTools}/bin       $out/bin
+                  ln -s ${bootstrapTools}/lib/clang $out/lib
+                  ln -s ${bootstrapTools}/include   $out
+                '';
+                passthru = {
+                  isFromBootstrapFiles = true;
+                  hardeningUnsupportedFlags = [
+                    "fortify3"
+                    "pacret"
+                    "shadowstack"
+                    "stackclashprotection"
+                    "zerocallusedregs"
+                  ];
+                };
+              };
+              libllvm = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-llvm";
+                outputs = [
+                  "out"
+                  "lib"
+                ];
+                buildCommand = ''
+                  mkdir -p $out/bin $out/lib
+                  ln -s $out $lib
+                  for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
+                    cctoolsTool=''${tool//-/_}
+                    toolsrc="${bootstrapTools}/bin/$cctoolsTool"
+                    if [ -e "$toolsrc" ]; then
+                      ln -s "$toolsrc" $out/bin/llvm-$tool
+                    fi
+                  done
+                  ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
+                  ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi
+                  ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
+                '';
+                passthru.isFromBootstrapFiles = true;
+              };
+              llvm-manpages = self.llvmPackages.libllvm;
+              lld = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-lld";
+                buildCommand = "";
+                passthru = {
+                  isLLVM = true;
+                  isFromBootstrapFiles = true;
+                };
+              };
+              compiler-rt = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-compiler-rt";
+                buildCommand = ''
+                  mkdir -p $out/lib $out/share
+                  ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
+                  ln -s ${bootstrapTools}/lib/darwin       $out/lib
+                '';
+                passthru.isFromBootstrapFiles = true;
+              };
+              libcxx = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-libcxx";
+                buildCommand = ''
+                  mkdir -p $out/lib $out/include
+                  ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
+                  ln -s ${bootstrapTools}/include/c++      $out/include
+                '';
+                passthru = {
+                  isLLVM = true;
+                  isFromBootstrapFiles = true;
+                };
+              };
+            }
+          ))
+          // {
+            inherit (super.llvmPackages) override;
+          };
       };
 
       extraPreHook = ''
@@ -683,11 +676,12 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
         );
 
         llvmPackages =
-          let
-            tools = super.llvmPackages.tools.extend (_: _: llvmToolsPackages prevStage);
-            libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-          in
-          super.llvmPackages // { inherit tools libraries; } // tools // libraries;
+          (super.llvmPackages.overrideScope (
+            _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage
+          ))
+          // {
+            inherit (super.llvmPackages) override;
+          };
       };
 
       extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
@@ -737,7 +731,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           (disallowedPackages prevStage)
           # Only cctools and ld64 are rebuilt from `bintoolsPackages` to avoid rebuilding their dependencies
           # again in this stage after building them in stage 1.
-          (lib.filterAttrs (name: _: name != "ld64" && name != "cctools") (bintoolsPackages prevStage))
+          (lib.removeAttrs (bintoolsPackages prevStage) [
+            "ld64"
+            "cctools"
+          ])
           (llvmToolsDeps prevStage)
           (sdkPackages prevStage)
           (sdkPackagesNoCC prevStage)
@@ -834,13 +831,17 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
             );
 
             llvmPackages =
-              let
-                tools = super.llvmPackages.tools.extend (
-                  _: _: llvmToolsPackages prevStage // { inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc; }
-                );
-                libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-              in
-              super.llvmPackages // { inherit tools libraries; } // tools // libraries;
+              (super.llvmPackages.overrideScope (
+                _: _:
+                llvmToolsPackages prevStage
+                // llvmLibrariesPackages prevStage
+                // {
+                  inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc;
+                }
+              ))
+              // {
+                inherit (super.llvmPackages) override;
+              };
           }
         ];
 
@@ -915,11 +916,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages =
-              let
-                libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-              in
-              super.llvmPackages // { inherit libraries; } // libraries;
+            llvmPackages = (super.llvmPackages.overrideScope (_: _: llvmLibrariesPackages prevStage)) // {
+              inherit (super.llvmPackages) override;
+            };
           }
         ];
 
@@ -990,48 +989,48 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
             );
 
             llvmPackages =
-              let
-                tools = super.llvmPackages.tools.extend (
-                  _: _:
-                  llvmToolsPackages prevStage
-                  // {
-                    systemLibcxxClang = super.wrapCCWith rec {
-                      nativeTools = false;
-                      nativeLibc = false;
+              (super.llvmPackages.overrideScope (
+                _: _:
+                llvmToolsPackages prevStage
+                // llvmLibrariesPackages prevStage
+                // {
+                  systemLibcxxClang = super.wrapCCWith rec {
+                    nativeTools = false;
+                    nativeLibc = false;
 
-                      inherit (prevStage) expand-response-params;
+                    inherit (prevStage) expand-response-params;
 
-                      extraPackages = [ self.llvmPackages.compiler-rt ];
+                    extraPackages = [ self.llvmPackages.compiler-rt ];
 
-                      extraBuildCommands = ''
-                        rsrc="$out/resource-root"
-                        mkdir "$rsrc"
-                        ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
-                        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-                        ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
-                        ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
-                      '';
+                    extraBuildCommands = ''
+                      rsrc="$out/resource-root"
+                      mkdir "$rsrc"
+                      ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
+                      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+                      ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
+                      ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
+                    '';
 
-                      cc = self.llvmPackages.clang-unwrapped;
-                      bintools = self.darwin.binutils;
+                    cc = self.llvmPackages.clang-unwrapped;
+                    bintools = self.darwin.binutils;
 
-                      isClang = true;
-                      libc = self.darwin.libSystem;
-                      inherit (self.darwin) libcxx;
+                    isClang = true;
+                    libc = self.darwin.libSystem;
+                    inherit (self.darwin) libcxx;
 
-                      inherit lib;
-                      inherit (self)
-                        stdenvNoCC
-                        coreutils
-                        gnugrep
-                        runtimeShell
-                        ;
-                    };
-                  }
-                );
-                libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-              in
-              super.llvmPackages // { inherit tools libraries; } // tools // libraries;
+                    inherit lib;
+                    inherit (self)
+                      stdenvNoCC
+                      coreutils
+                      gnugrep
+                      runtimeShell
+                      ;
+                  };
+                }
+              ))
+              // {
+                inherit (super.llvmPackages) override;
+              };
           }
         ];
 
@@ -1121,6 +1120,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
             with prevStage;
             [
               apple-sdk
+              apple-sdk.cups-headers
               bashNonInteractive
               bzip2.bin
               bzip2.out
@@ -1240,22 +1240,19 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               "llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" =
                 let
                   llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
-                  tools = super."llvmPackages_${llvmVersion}".tools.extend (_: _: llvmToolsPackages prevStage);
-                  libraries = super."llvmPackages_${llvmVersion}".libraries.extend (
-                    _: _:
-                    llvmLibrariesPackages prevStage
-                    # Avoid depending on llvm-manpages from the bootstrap, which brings a bunch of Python dependencies
-                    # into the bootstrap. This means that there are no man pages in darwin.binutils, but they are still
-                    # available from llvm-manpages, ld64, and cctools.
-                    // {
-                      inherit (super."llvmPackages_${llvmVersion}") llvm-manpages;
-                    }
-                    // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-                      inherit (prevStage.llvmPackages) clang;
-                    }
-                  );
                 in
-                super."llvmPackages_${llvmVersion}" // { inherit tools libraries; } // tools // libraries;
+                (super."llvmPackages_${llvmVersion}".overrideScope (
+                  _: _:
+                  llvmToolsPackages prevStage
+                  // llvmLibrariesPackages prevStage
+                  // {
+                    inherit (super."llvmPackages_${llvmVersion}") llvm-manpages;
+                  }
+                ))
+                // {
+                  inherit (super."llvmPackages_${llvmVersion}") override;
+                  recurseForDerivations = true;
+                };
             }
           ];
       };
@@ -1287,7 +1284,24 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     assert prevStage.libiconv == prevStage.darwin.libiconv;
 
     {
-      inherit (prevStage) config overlays stdenv;
+      inherit (prevStage) config overlays;
+      # This should be done in the `overrideScope` above, but it causes rebuilds.
+      # TODO: Move it there once https://github.com/NixOS/nixpkgs/pull/445668 is merged.
+      stdenv = prevStage.stdenv // {
+        overrides =
+          self: super:
+          (prevStage.stdenv.overrides self super)
+          // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (
+            let
+              llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
+            in
+            {
+              "llvmPackages_${llvmVersion}" = prevStage."llvmPackages_${llvmVersion}" // {
+                inherit (prevStage) clang;
+              };
+            }
+          );
+      };
     }
   )
 ]
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 1a3e65ea650d..b99f2531831c 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -34,6 +34,7 @@ let
     toList
     isList
     elem
+    unique
     ;
 
   inherit (lib.meta)
@@ -667,8 +668,9 @@ let
       # Maintainers should be inclusive of teams.
       # Note that there may be external consumers of this API (repology, for instance) -
       # if you add a new maintainer or team attribute please ensure that this expectation is still met.
-      maintainers =
-        attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
+      maintainers = unique (
+        attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ]
+      );
 
       identifiers =
         let
@@ -677,7 +679,7 @@ let
           defaultCPEParts = {
             part = "a";
             #vendor = null;
-            ${if attrs ? pname then "product" else null} = attrs.pname;
+            ${if attrs.pname or null != null then "product" else null} = attrs.pname;
             #version = null;
             #update = null;
             edition = "*";
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 07c50a683d3f..24c1287b8744 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -151,10 +151,11 @@ let
     "nostrictaliasing"
     "pacret"
     "pic"
-    "pie"
     "relro"
     "stackprotector"
     "glibcxxassertions"
+    "libcxxhardeningfast"
+    "libcxxhardeningextensive"
     "stackclashprotection"
     "strictoverflow"
     "trivialautovarinit"
@@ -227,14 +228,7 @@ let
 
   canExecuteHostOnBuild = buildPlatform.canExecute hostPlatform;
   defaultHardeningFlags =
-    (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or
-    # fallback safe-ish set of flags
-    (
-      if isOpenBSD && isStatic then
-        knownHardeningFlags # Need pie, in fact
-      else
-        remove "pie" knownHardeningFlags
-    );
+    (if stdenvHasCC then stdenv.cc else { }).defaultHardeningFlags or knownHardeningFlags;
   stdenvHostSuffix = optionalString (hostPlatform != buildPlatform) "-${hostPlatform.config}";
   stdenvStaticMarker = optionalString isStatic "-static";
   userHook = config.stdenv.userHook or null;
@@ -426,7 +420,7 @@ let
 
       concretizeFlagImplications =
         flag: impliesFlags: list:
-        if any (x: x == flag) list then (list ++ impliesFlags) else list;
+        if builtins.elem flag list then (list ++ impliesFlags) else list;
 
       hardeningDisable' = unique (
         pipe hardeningDisable [
@@ -434,6 +428,8 @@ let
           (concretizeFlagImplications "fortify" [ "fortify3" ])
           # disabling strictflexarrays1 implies strictflexarrays3 should also be disabled
           (concretizeFlagImplications "strictflexarrays1" [ "strictflexarrays3" ])
+          # disabling libcxxhardeningfast implies libcxxhardeningextensive should also be disabled
+          (concretizeFlagImplications "libcxxhardeningfast" [ "libcxxhardeningextensive" ])
         ]
       );
       enabledHardeningOptions =
@@ -442,7 +438,7 @@ let
         else
           subtractLists hardeningDisable' (defaultHardeningFlags ++ hardeningEnable);
       # hardeningDisable additionally supports "all".
-      erroneousHardeningFlags = subtractLists knownHardeningFlags (
+      erroneousHardeningFlags = subtractLists (knownHardeningFlags ++ [ "pie" ]) (
         hardeningEnable ++ remove "all" hardeningDisable
       );
 
@@ -640,7 +636,9 @@ let
               else
                 null
             } =
-              builtins.concatStringsSep " " enabledHardeningOptions;
+              lib.warnIf ((builtins.elem "pie" hardeningEnable) || (builtins.elem "pie" hardeningDisable))
+                "The 'pie' hardening flag has been removed in favor of enabling PIE by default in compilers and should no longer be used. PIE can be disabled with the -no-pie compiler flag, but this is usually not necessary as most build systems pass this if needed. Usage of the 'pie' hardening flag will become an error in future."
+                (builtins.concatStringsSep " " enabledHardeningOptions);
 
             # TODO: remove platform condition
             # Enabling this check could be a breaking change as it requires to edit nix.conf
@@ -706,19 +704,14 @@ let
               __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
             }
           )
-          // optionalAttrs (isWindows || isCygwin) (
-            let
-              dlls =
-                allowedImpureDLLs
-                ++ lib.optionals isCygwin [
-                  "KERNEL32.dll"
-                  "cygwin1.dll"
-                ];
-            in
-            {
-              allowedImpureDLLs = if dlls != [ ] then dlls else null;
-            }
-          )
+          // optionalAttrs (isWindows || isCygwin) {
+            allowedImpureDLLs =
+              allowedImpureDLLs
+              ++ lib.optionals isCygwin [
+                "KERNEL32.dll"
+                "cygwin1.dll"
+              ];
+          }
           // (
             if !__structuredAttrs then
               makeOutputChecks attrs
diff --git a/pkgs/test/cc-wrapper/default.nix b/pkgs/test/cc-wrapper/default.nix
index 8d1bdbf3fed1..9dc3413f0e04 100644
--- a/pkgs/test/cc-wrapper/default.nix
+++ b/pkgs/test/cc-wrapper/default.nix
@@ -116,6 +116,16 @@ stdenv.mkDerivation {
       ''
     }
 
+    ${
+      # Check whether fuse-ld=gold works on our GNU toolchain
+      # Regression test for https://github.com/NixOS/nixpkgs/issues/49071
+      lib.optionalString stdenv.cc.isGNU ''
+        echo "checking whether compiler builds valid C binaries... " >&2
+        CFLAGS="-fuse-ld=gold" ${CC} -o cc-check ${./cc-main.c}
+        ${emulator} ./cc-check
+      ''
+    }
+
     echo "checking whether compiler uses NIX_CFLAGS_COMPILE... " >&2
     mkdir -p foo/include
     cp ${./foo.c} foo/include/foo.h
diff --git a/pkgs/test/cc-wrapper/hardening.nix b/pkgs/test/cc-wrapper/hardening.nix
index f3e8d38d0ee8..fae8d72c2989 100644
--- a/pkgs/test/cc-wrapper/hardening.nix
+++ b/pkgs/test/cc-wrapper/hardening.nix
@@ -31,8 +31,8 @@ let
         [ -n "$preBuild" ] && eval "$preBuild"
         n=$out/bin/test-bin
         mkdir -p "$(dirname "$n")"
-        cp "$codePath" code.c
-        NIX_DEBUG=1 $CC -x c code.c -O1 $TEST_EXTRA_FLAGS -o "$n"
+        cp "$codePath" .
+        NIX_DEBUG=1 $CC -x ''${TEST_SOURCE_LANG:-c} "$(basename $codePath)" -O1 $TEST_EXTRA_FLAGS -o "$n"
       '';
 
   f1exampleWithStdEnv = writeCBinWithStdenv ./fortify1-example.c;
@@ -41,15 +41,60 @@ let
 
   flexArrF2ExampleWithStdEnv = writeCBinWithStdenv ./flex-arrays-fortify-example.c;
 
+  # we don't really have a reliable property for testing for
+  # libstdc++ we'll just have to check for the absence of libcxx
   checkGlibcxxassertionsWithStdEnv =
-    expectDefined:
-    writeCBinWithStdenv (
-      writeText "main.cpp" ''
-        #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS
-        #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined"
-        #endif
-        int main() {}
-      ''
+    expectDefined: stdenv': derivationArgs:
+    brokenIf (stdenv.cc.libcxx != null) (
+      writeCBinWithStdenv
+        (writeText "main.cpp" ''
+          #if${if expectDefined then "n" else ""}def _GLIBCXX_ASSERTIONS
+          #error "Expected _GLIBCXX_ASSERTIONS to be ${if expectDefined then "" else "un"}defined"
+          #endif
+          int main() {}
+        '')
+        stdenv'
+        (
+          derivationArgs
+          // {
+            env = (derivationArgs.env or { }) // {
+              TEST_SOURCE_LANG = derivationArgs.env.TEST_SOURCE_LANG or "c++";
+            };
+          }
+        )
+    );
+
+  checkLibcxxHardeningWithStdEnv =
+    expectValue: stdenv': env:
+    brokenIf (stdenv.cc.libcxx == null) (
+      writeCBinWithStdenv
+        (writeText "main.cpp" (
+          ''
+            #include <limits>
+            #ifndef _LIBCPP_HARDENING_MODE
+            #error "Expected _LIBCPP_HARDENING_MODE to be defined"
+            #endif
+            #ifndef ${expectValue}
+            #error "Expected ${expectValue} to be defined"
+            #endif
+
+            #if _LIBCPP_HARDENING_MODE != ${expectValue}
+            #error "Expected _LIBCPP_HARDENING_MODE to equal ${expectValue}"
+            #endif
+          ''
+          + ''
+            int main() {}
+          ''
+        ))
+        stdenv'
+        (
+          env
+          // {
+            env = (env.env or { }) // {
+              TEST_SOURCE_LANG = env.env.TEST_SOURCE_LANG or "c++";
+            };
+          }
+        )
     );
 
   # for when we need a slightly more complicated program
@@ -455,25 +500,10 @@ nameDrvAfterAttrName (
       )
     );
 
-    pieExplicitEnabled = brokenIf stdenv.hostPlatform.isStatic (
-      checkTestBin
-        (f2exampleWithStdEnv stdenv {
-          hardeningEnable = [ "pie" ];
-        })
-        {
-          ignorePie = false;
-        }
-    );
-
-    pieExplicitEnabledStructuredAttrs = brokenIf stdenv.hostPlatform.isStatic (
-      checkTestBin
-        (f2exampleWithStdEnv stdenv {
-          hardeningEnable = [ "pie" ];
-          __structuredAttrs = true;
-        })
-        {
-          ignorePie = false;
-        }
+    pieAlwaysEnabled = brokenIf stdenv.hostPlatform.isStatic (
+      checkTestBin (f2exampleWithStdEnv stdenv { }) {
+        ignorePie = false;
+      }
     );
 
     relROExplicitEnabled =
@@ -662,22 +692,10 @@ nameDrvAfterAttrName (
       )
     );
 
-    pieExplicitDisabled = brokenIf (stdenv.hostPlatform.isMusl && stdenv.cc.isClang) (
-      checkTestBin
-        (f2exampleWithStdEnv stdenv {
-          hardeningDisable = [ "pie" ];
-        })
-        {
-          ignorePie = false;
-          expectFailure = true;
-        }
-    );
-
     # can't force-disable ("partial"?) relro
     relROExplicitDisabled = brokenIf true (
       checkTestBin
         (f2exampleWithStdEnv stdenv {
-          hardeningDisable = [ "pie" ];
         })
         {
           ignoreRelRO = false;
@@ -717,6 +735,48 @@ nameDrvAfterAttrName (
       hardeningDisable = [ "glibcxxassertions" ];
     };
 
+    lchFastExplicitDisabled = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv {
+      hardeningDisable = [ "libcxxhardeningfast" ];
+    };
+
+    lchExtensiveExplicitEnabled =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv
+        {
+          hardeningEnable = [ "libcxxhardeningextensive" ];
+        };
+
+    lchExtensiveExplicitDisabledDoesntDisableLchFast =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" stdenv
+        {
+          hardeningEnable = [ "libcxxhardeningfast" ];
+          hardeningDisable = [ "libcxxhardeningextensive" ];
+        };
+
+    lchFastExplicitDisabledDisablesLchExtensive =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv
+        {
+          hardeningEnable = [ "libcxxhardeningextensive" ];
+          hardeningDisable = [ "libcxxhardeningfast" ];
+        };
+
+    lchFastExtensiveExplicitEnabledResultsInLchExtensive =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv
+        {
+          hardeningEnable = [
+            "libcxxhardeningfast"
+            "libcxxhardeningextensive"
+          ];
+        };
+
+    lchFastExtensiveExplicitDisabledDisablesBoth =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv
+        {
+          hardeningDisable = [
+            "libcxxhardeningfast"
+            "libcxxhardeningextensive"
+          ];
+        };
+
     # most flags can't be "unsupported" by compiler alone and
     # binutils doesn't have an accessible hardeningUnsupportedFlags
     # mechanism, so can only test a couple of flags through altered
@@ -923,6 +983,30 @@ nameDrvAfterAttrName (
           hardeningEnable = [ "glibcxxassertions" ];
         };
 
+    lchFastStdenvUnsupp =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE"
+        (stdenvUnsupport [ "libcxxhardeningfast" ])
+        {
+          hardeningEnable = [ "libcxxhardeningfast" ];
+        };
+
+    lchFastStdenvUnsuppUnsupportsLchExtensive =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE"
+        (stdenvUnsupport [ "libcxxhardeningfast" ])
+        {
+          hardeningEnable = [ "libcxxhardeningextensive" ];
+        };
+
+    lchExtensiveStdenvUnsuppDoesntUnsupportLchFast =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST"
+        (stdenvUnsupport [ "libcxxhardeningextensive" ])
+        {
+          hardeningEnable = [
+            "libcxxhardeningfast"
+            "libcxxhardeningextensive"
+          ];
+        };
+
     fortify3EnabledEnvEnablesFortify1 =
       checkTestBin
         (f1exampleWithStdEnv stdenv {
@@ -1018,6 +1102,38 @@ nameDrvAfterAttrName (
           expectFailure = true;
         };
 
+    lchFastEnabledEnv = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_FAST" stdenv {
+      hardeningDisable = [
+        "libcxxhardeningfast"
+        "libcxxhardeningextensive"
+      ];
+      postConfigure = ''
+        export NIX_HARDENING_ENABLE="libcxxhardeningfast"
+      '';
+    };
+
+    lchExtensiveEnabledEnv = checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv {
+      hardeningDisable = [
+        "libcxxhardeningfast"
+        "libcxxhardeningextensive"
+      ];
+      postConfigure = ''
+        export NIX_HARDENING_ENABLE="libcxxhardeningextensive"
+      '';
+    };
+
+    lchFastExtensiveEnabledEnvResultsInLchExtensive =
+      checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_EXTENSIVE" stdenv
+        {
+          hardeningDisable = [
+            "libcxxhardeningfast"
+            "libcxxhardeningextensive"
+          ];
+          postConfigure = ''
+            export NIX_HARDENING_ENABLE="libcxxhardeningextensive libcxxhardeningfast"
+          '';
+        };
+
     # NIX_HARDENING_ENABLE can't enable an unsupported feature
     stackProtectorUnsupportedEnabledEnv =
       checkTestBin
@@ -1085,7 +1201,6 @@ nameDrvAfterAttrName (
         hardeningDisable = [ "all" ];
         hardeningEnable = [
           "fortify"
-          "pie"
         ];
       };
     in
@@ -1101,13 +1216,6 @@ nameDrvAfterAttrName (
         expectFailure = true;
       };
 
-      allExplicitDisabledPie = brokenIf (stdenv.hostPlatform.isMusl && stdenv.cc.isClang) (
-        checkTestBin tb {
-          ignorePie = false;
-          expectFailure = true;
-        }
-      );
-
       # can't force-disable ("partial"?) relro
       allExplicitDisabledRelRO = brokenIf true (
         checkTestBin tb {
@@ -1134,9 +1242,15 @@ nameDrvAfterAttrName (
         hardeningDisable = [ "all" ];
       }) true;
 
-      glibcxxassertionsExplicitDisabled = checkGlibcxxassertionsWithStdEnv false stdenv {
+      allExplicitDisabledGlibcxxAssertions = checkGlibcxxassertionsWithStdEnv false stdenv {
         hardeningDisable = [ "all" ];
       };
+
+      allExplicitDisabledLibcxxHardening =
+        checkLibcxxHardeningWithStdEnv "_LIBCPP_HARDENING_MODE_NONE" stdenv
+          {
+            hardeningDisable = [ "all" ];
+          };
     }
   )
 )
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index 242d3c71b273..633bacc8f7a5 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -1,31 +1,27 @@
 {
   lib,
-  recurseIntoAttrs,
-
-  cudaPackages,
-
-  cudaPackages_12_6,
-  cudaPackages_12_8,
-  cudaPackages_12_9,
-  cudaPackages_12,
-}@args:
-
+  pkgs,
+}:
 let
-  isTest =
-    name: package:
-    builtins.elem (package.pname or null) [
-      "cuda-library-samples"
-      "saxpy"
-    ];
+  getTests =
+    cps:
+    lib.recurseIntoAttrs {
+      inherit (cps) saxpy;
+      inherit (cps.tests) cuda-library-samples;
+    };
 in
-(lib.trivial.pipe args [
-  (lib.filterAttrs (name: _: lib.hasPrefix "cudaPackages" name))
-  (lib.mapAttrs (
-    _: ps:
-    lib.pipe ps [
-      (lib.filterAttrs isTest)
-      recurseIntoAttrs
-    ]
-  ))
-  recurseIntoAttrs
-])
+lib.recurseIntoAttrs (
+  lib.mapAttrs (_: getTests) {
+    inherit (pkgs)
+      cudaPackages
+
+      cudaPackages_12
+      cudaPackages_12_6
+      cudaPackages_12_8
+      cudaPackages_12_9
+
+      cudaPackages_13
+      cudaPackages_13_0
+      ;
+  }
+)
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 62e29d24ce0b..8864de64dc76 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -1,16 +1,30 @@
-{ pkgs, callPackage }:
-
-with pkgs;
-
+{ pkgs }:
+let
+  inherit (pkgs) callPackages callPackage stdenv;
+  inherit (pkgs.lib)
+    recurseIntoAttrs
+    attrNames
+    pipe
+    hasPrefix
+    hasSuffix
+    filter
+    genAttrs
+    optionals
+    filterAttrs
+    meta
+    concatMapAttrs
+    optionalAttrs
+    ;
+  inherit (pkgs.lib.strings) toJSON;
+in
 {
   cc-wrapper =
-    with builtins;
     let
       pkgNames = (attrNames pkgs);
       llvmTests =
         let
-          pkgSets = lib.pipe pkgNames [
-            (filter (lib.hasPrefix "llvmPackages"))
+          pkgSets = pipe pkgNames [
+            (filter (hasPrefix "llvmPackages"))
             # Are aliases.
             (filter (n: n != "llvmPackages_latest"))
             (filter (n: n != "llvmPackages_9"))
@@ -23,7 +37,7 @@ with pkgs;
             (filter (n: n != "llvmPackages_16"))
             (filter (n: n != "llvmPackages_17"))
           ];
-          tests = lib.genAttrs pkgSets (
+          tests = genAttrs pkgSets (
             name:
             recurseIntoAttrs {
               clang = callPackage ./cc-wrapper { stdenv = pkgs.${name}.stdenv; };
@@ -34,10 +48,10 @@ with pkgs;
         tests;
       gccTests =
         let
-          pkgSets = lib.pipe (attrNames pkgs) (
+          pkgSets = pipe (attrNames pkgs) (
             [
-              (filter (lib.hasPrefix "gcc"))
-              (filter (lib.hasSuffix "Stdenv"))
+              (filter (hasPrefix "gcc"))
+              (filter (hasSuffix "Stdenv"))
               (filter (n: n != "gccCrossLibcStdenv"))
               (filter (n: n != "gcc49Stdenv"))
               (filter (n: n != "gcc6Stdenv"))
@@ -49,7 +63,7 @@ with pkgs;
               (filter (n: n != "gcc12Stdenv"))
             ]
             ++
-              lib.optionals
+              optionals
                 (
                   !(
                     (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64)
@@ -57,11 +71,11 @@ with pkgs;
                   )
                 )
                 [
-                  (filter (n: !lib.hasSuffix "MultiStdenv" n))
+                  (filter (n: !hasSuffix "MultiStdenv" n))
                 ]
           );
         in
-        lib.genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; });
+        genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; });
     in
     recurseIntoAttrs {
       default = callPackage ./cc-wrapper { };
@@ -70,9 +84,8 @@ with pkgs;
         name = "cc-wrapper-supported";
         builtGCC =
           let
-            inherit (lib) filterAttrs;
-            sets = lib.pipe gccTests [
-              (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc))
+            sets = pipe gccTests [
+              (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.stdenv.cc))
               # Broken
               (filterAttrs (n: _: n != "gccMultiStdenv"))
             ];
@@ -81,10 +94,9 @@ with pkgs;
 
         builtLLVM =
           let
-            inherit (lib) filterAttrs;
-            sets = lib.pipe llvmTests [
-              (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc))
-              (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc))
+            sets = pipe llvmTests [
+              (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc))
+              (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc))
             ];
           in
           toJSON sets;
@@ -105,12 +117,12 @@ with pkgs;
   hardeningFlags = recurseIntoAttrs (callPackage ./cc-wrapper/hardening.nix { });
   hardeningFlags-gcc = recurseIntoAttrs (
     callPackage ./cc-wrapper/hardening.nix {
-      stdenv = gccStdenv;
+      stdenv = pkgs.gccStdenv;
     }
   );
   hardeningFlags-clang = recurseIntoAttrs (
     callPackage ./cc-wrapper/hardening.nix {
-      stdenv = llvmPackages.stdenv;
+      stdenv = pkgs.llvmPackages.stdenv;
     }
   );
 
@@ -122,8 +134,8 @@ with pkgs;
 
   hooks = recurseIntoAttrs (callPackage ./hooks { });
 
-  cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
-  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
+  cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = pkgs.gccMultiStdenv; };
+  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = pkgs.clangMultiStdenv; };
 
   compress-drv = callPackage ../build-support/compress-drv/test.nix { };
 
@@ -131,7 +143,7 @@ with pkgs;
   fetchtorrent = recurseIntoAttrs (callPackages ../build-support/fetchtorrent/tests.nix { });
   fetchpatch = recurseIntoAttrs (callPackages ../build-support/fetchpatch/tests.nix { });
   fetchpatch2 = recurseIntoAttrs (
-    callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }
+    callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = pkgs.fetchpatch2; }
   );
   fetchDebianPatch = recurseIntoAttrs (callPackages ../build-support/fetchdebianpatch/tests.nix { });
   fetchzip = recurseIntoAttrs (callPackages ../build-support/fetchzip/tests.nix { });
@@ -199,7 +211,7 @@ with pkgs;
       # Enable sanitizers in the tests only, to avoid the performance cost in regular usage.
       # The sanitizers cause errors on aarch64-darwin, see https://github.com/NixOS/nixpkgs/pull/150079#issuecomment-994132734
       sanitizers =
-        pkgs.lib.optionals (!(pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64))
+        optionals (!(pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64))
           [
             "undefined"
             "address"
@@ -215,12 +227,12 @@ with pkgs;
 
   # Accumulate all passthru.tests from arrayUtilities into a single attribute set.
   arrayUtilities = recurseIntoAttrs (
-    lib.concatMapAttrs (
+    concatMapAttrs (
       name: value:
-      lib.optionalAttrs (value ? passthru.tests) {
+      optionalAttrs (value ? passthru.tests) {
         ${name} = value.passthru.tests;
       }
-    ) arrayUtilities
+    ) pkgs.arrayUtilities
   );
 
   srcOnly = callPackage ../build-support/src-only/tests.nix { };
diff --git a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
index 5092bb473049..5b7a7ff724b5 100644
--- a/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
+++ b/pkgs/test/haskell/upstreamStackHpackVersion/default.nix
@@ -5,7 +5,8 @@
 # matches with the version of hpack used by the upstream stack release.  This
 # is because hpack works slightly differently based on the version, and it can
 # be frustrating to use hpack in a team setting when members are using different
-# versions. See for more info: https://github.com/NixOS/nixpkgs/issues/223390
+# versions. See for more info:
+# https://github.com/NixOS/nixpkgs/issues/223390 krank:ignore-line
 #
 # This test is written as a fixed-output derivation, because we need to access
 # accesses the internet to download the upstream stack release.
diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix
index 4cc738cfaebe..33d3342f3854 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/pkgs/test/nixos-functions/default.nix
@@ -22,7 +22,7 @@ let
   };
 in
 lib.optionalAttrs (stdenv.hostPlatform.isLinux) (
-  pkgs.recurseIntoAttrs {
+  lib.recurseIntoAttrs {
     nixos-test =
       (pkgs.nixos {
         system.nixos = dummyVersioning;
diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 67ed3bd90f9a..a2221183a8a6 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -43,24 +43,24 @@ let
     in
     {
       repeatedOverrides-pname = {
-        expr = repeatedOverrides.pname == "a-better-hello-with-blackjack";
-        expected = true;
+        expr = repeatedOverrides.pname;
+        expected = "a-better-hello-with-blackjack";
       };
       repeatedOverrides-entangled-pname = {
-        expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack";
-        expected = true;
+        expr = repeatedOverrides.entangled.pname;
+        expected = "a-better-figlet-with-blackjack";
       };
       overriding-using-only-attrset = {
-        expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden";
-        expected = true;
+        expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname;
+        expected = "hello-overriden";
       };
       overriding-using-only-attrset-no-final-attrs = {
         name = "overriding-using-only-attrset-no-final-attrs";
         expr =
           ((stdenvNoCC.mkDerivation { pname = "hello-no-final-attrs"; }).overrideAttrs {
             pname = "hello-no-final-attrs-overridden";
-          }).pname == "hello-no-final-attrs-overridden";
-        expected = true;
+          }).pname;
+        expected = "hello-no-final-attrs-overridden";
       };
     };
 
@@ -118,16 +118,16 @@ let
         expected = true;
       };
       extendMkDerivation-helloLocal-plain-equivalence = {
-        expr = helloLocal.drvPath == helloLocalPlain.drvPath;
-        expected = true;
+        expr = helloLocal.drvPath;
+        expected = helloLocalPlain.drvPath;
       };
       extendMkDerivation-helloLocal-finalAttrs = {
-        expr = helloLocal.bar == "ab";
-        expected = true;
+        expr = helloLocal.bar;
+        expected = "ab";
       };
       extendMkDerivation-helloLocal-specialArg = {
-        expr = hiLocal.greeting == "Hi!";
-        expected = true;
+        expr = hiLocal.greeting;
+        expected = "Hi!";
       };
     };
 
@@ -152,27 +152,35 @@ let
     in
     {
       hash-outputHash-equivalence = {
-        expr = ruamel_0_17_21-src.outputHash == ruamel_0_17_21-hash;
-        expected = true;
+        expr = ruamel_0_17_21-src.outputHash;
+        expected = ruamel_0_17_21-hash;
       };
 
       hash-overridability-outputHash = {
-        expr = ruamel_0_17_21-src-by-overriding.outputHash == ruamel_0_17_21-hash;
-        expected = true;
+        expr = ruamel_0_17_21-src-by-overriding.outputHash;
+        expected = ruamel_0_17_21-hash;
       };
 
       hash-overridability-drvPath = {
-        expr =
-          lib.isString ruamel_0_17_21-src-by-overriding.drvPath
-          && ruamel_0_17_21-src-by-overriding.drvPath == ruamel_0_17_21-src.drvPath;
-        expected = true;
+        expr = [
+          (lib.isString ruamel_0_17_21-src-by-overriding.drvPath)
+          ruamel_0_17_21-src-by-overriding.drvPath
+        ];
+        expected = [
+          true
+          ruamel_0_17_21-src.drvPath
+        ];
       };
 
       hash-overridability-outPath = {
-        expr =
-          lib.isString ruamel_0_17_21-src-by-overriding.outPath
-          && ruamel_0_17_21-src-by-overriding.outPath == ruamel_0_17_21-src.outPath;
-        expected = true;
+        expr = [
+          (lib.isString ruamel_0_17_21-src-by-overriding.outPath)
+          ruamel_0_17_21-src-by-overriding.outPath
+        ];
+        expected = [
+          true
+          ruamel_0_17_21-src.outPath
+        ];
       };
     };
 
@@ -249,44 +257,32 @@ let
       pet-vendored = pet-foo.overrideAttrs { vendorHash = null; };
     in
     {
-      buildGoModule-overrideAttrs = {
-        expr =
-          lib.all
-            (
-              attrPath:
-              let
-                attrPathPretty = lib.concatStringsSep "." attrPath;
-                valueNative = lib.getAttrFromPath attrPath pet_0_4_0;
-                valueOverridden = lib.getAttrFromPath attrPath pet_0_4_0-overridden;
-              in
-              lib.warnIfNot (valueNative == valueOverridden)
-                "pet_0_4_0.${attrPathPretty} (${valueNative}) does not equal pet_0_4_0-overridden.${attrPathPretty} (${valueOverridden})"
-                true
-            )
-            [
-              [ "drvPath" ]
-              [ "name" ]
-              [ "pname" ]
-              [ "version" ]
-              [ "vendorHash" ]
-              [
-                "goModules"
-                "drvPath"
-              ]
-              [
-                "goModules"
-                "name"
-              ]
-              [
-                "goModules"
-                "outputHash"
-              ]
-            ];
-        expected = true;
-      };
+      buildGoModule-overrideAttrs =
+        let
+          getComparingAttrs = p: {
+            inherit (p)
+              drvPath
+              name
+              pname
+              version
+              vendorHash
+              ;
+            goModules = {
+              inherit (p.goModules)
+                drvPath
+                name
+                outPath
+                ;
+            };
+          };
+        in
+        {
+          expr = getComparingAttrs pet_0_4_0-overridden;
+          expected = getComparingAttrs pet_0_4_0;
+        };
       buildGoModule-goModules-overrideAttrs = {
-        expr = pet-foo.goModules.FOO == "foo";
-        expected = true;
+        expr = pet-foo.goModules.FOO;
+        expected = "foo";
       };
       buildGoModule-goModules-overrideAttrs-vendored = {
         expr = lib.isString pet-vendored.drvPath;
@@ -309,14 +305,35 @@ let
 
 in
 
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
   name = "test-overriding";
-  passthru = { inherit tests; };
+  passthru = {
+    inherit tests;
+    failures = lib.runTests (finalAttrs.passthru.tests // { tests = lib.attrNames tests; });
+  };
+  testResults = lib.mapAttrs (testName: test: test.expr == test.expected) finalAttrs.passthru.tests;
   buildCommand = ''
     touch $out
+    for testName in "''${!testResults[@]}"; do
+      if [[ -n "''${testResults[$testName]}" ]]; then
+        echo "$testName success"
+      else
+        echo "$testName fail"
+      fi
+    done
   ''
-  + lib.concatMapAttrsStringSep "\n" (
-    name: t:
-    "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)"
-  ) tests;
-}
+  + lib.optionalString (lib.any (v: !v) (lib.attrValues finalAttrs.testResults)) ''
+    {
+      echo "ERROR: tests.overriding: Encountering failed tests."
+      for testName in "''${!testResults[@]}"; do
+        if [[ -z "''${testResults[$testName]}" ]]; then
+          echo "- $testName"
+        fi
+      done
+      echo "To inspect the expected and actual result, "
+      echo '  evaluate `tests.overriding.tests.''${testName}`.'
+    } >&2
+    exit 1
+  '';
+})
diff --git a/pkgs/test/top-level/default.nix b/pkgs/test/top-level/default.nix
index a5b44afb8522..e713b617f8dd 100644
--- a/pkgs/test/top-level/default.nix
+++ b/pkgs/test/top-level/default.nix
@@ -61,7 +61,7 @@ lib.recurseIntoAttrs {
       pkgsLocal = map nixpkgsFun configsLocal;
       pkgsCross = map nixpkgsFun configsCross;
     in
-    assert lib.all (p: p.buildPlatform == p.hostPlatform) pkgsLocal;
-    assert lib.all (p: p.buildPlatform != p.hostPlatform) pkgsCross;
+    assert lib.all (p: p.stdenv.buildPlatform == p.stdenv.hostPlatform) pkgsLocal;
+    assert lib.all (p: p.stdenv.buildPlatform != p.stdenv.hostPlatform) pkgsCross;
     pkgs.emptyFile;
 }
diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix
index a6f52963cd8a..75e8ee2c2af4 100644
--- a/pkgs/test/vim/default.nix
+++ b/pkgs/test/vim/default.nix
@@ -1,8 +1,8 @@
 {
+  lib,
   vimUtils,
   vim-full,
   vimPlugins,
-  pkgs,
 }:
 let
   inherit (vimUtils) buildVimPlugin;
@@ -10,7 +10,7 @@ let
   packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
 
 in
-pkgs.recurseIntoAttrs {
+lib.recurseIntoAttrs {
   vim_empty_config = vimUtils.vimrcFile {
     beforePlugins = "";
     customRC = "";
diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix
index c5777c1c999a..6527ce2cd014 100644
--- a/pkgs/tools/admin/ibmcloud-cli/default.nix
+++ b/pkgs/tools/admin/ibmcloud-cli/default.nix
@@ -30,19 +30,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ibmcloud-cli";
-  version = "2.36.0";
+  version = "2.37.1";
 
   src = fetchurl {
     url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
     hash =
       {
-        "x86_64-darwin" = "sha256-hIHFfUxAhpA+YIN7Bq65khFFj+3BCuYRtMq2WjQwqYQ=";
-        "aarch64-darwin" = "sha256-ZZ500RWagqhf63zwiQpV8y+gtCxGfbA36F97x67coUE=";
-        "x86_64-linux" = "sha256-+ZKlFvrDPm3ERq8/r7cjgsJWjUr8+sGFqYXdiSUPeXo=";
-        "aarch64-linux" = "sha256-ER/Ey3Jux3i8tC30/65awHdEd6efscUVjX/bFAk1b7c=";
-        "i686-linux" = "sha256-5A0kUegKVHSTZ+jRg5+07wvV4PkCvOPddvyC1ZLCbmI=";
-        "powerpc64le-linux" = "sha256-XcHrdA9i3Euc0yIjUtFrmIFMJi+onXRK+tHzNxmQwHg=";
-        "s390x-linux" = "sha256-loGQxvUqp9ngieVOVuZ6IhOKgyrVGBd+y9LdZtKEPwc=";
+        "x86_64-darwin" = "sha256-NqohbUj+FcReQr3ouq7QNdZOREk0nyCTug2bC4G2kOw=";
+        "aarch64-darwin" = "sha256-SYGela1vfxohcqPzk2DtqBNGaubHFoIgK14L/jwX0gc=";
+        "x86_64-linux" = "sha256-8W3QMLNcDDgb0V8j2HH0iNO+XqVHUsFw7Mmw7WCHsVY=";
+        "aarch64-linux" = "sha256-VtXLIPqDDovptQ83fjxQ4Ggk6WjTN18Z4hWwPuaY/dU=";
+        "i686-linux" = "sha256-qqlumSDuhD9G7dpVx9BCrA1wK96tqGvxDAvgtb4fW1o=";
+        "powerpc64le-linux" = "sha256-oyX2j55ywJdR4lOGSjfI/OcISGJXO7g2t1LI5/89y9w=";
+        "s390x-linux" = "sha256-XC8bMrDlR3dFFpMx/zjjMZz3d37jr9sNRWJEe56IqjE=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 1e8aa27a4b52..c61f2af145f4 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.51";
+  version = "1.1.53";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.51.tgz";
-    sha256 = "1l3x1rhcw38pg0rh27qyfg2dm5biwnyzicdd6l07c3km4x6xi5pr";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.53.tgz";
+    sha256 = "1wjmvw7cymyjx0hii7kzmmrn7lmc3lj0hsll1nz32z11gnixdvbq";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-jmsRlHJgSrUtXwRcfX+tMH4SmrKVtD7gEK1+oW5mYIs=";
+    hash = "sha256-jrBRexn5xc0OiBDf9fFDe2ZB3PcFVSuOChGCUWU4hcs=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 89bea4a15907..d244d8ed06c4 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -37,7 +37,7 @@
     "sample-config-advanced.json"
   ],
   "dependencies": {
-    "@seald-io/nedb": "4.0.4",
+    "@seald-io/nedb": "4.1.2",
     "archiver": "7.0.1",
     "body-parser": "1.20.3",
     "cbor": "5.2.0",
@@ -50,9 +50,10 @@
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
     "node-forge": "1.3.1",
+    "otplib": "12.0.1",
     "ua-client-hints-js": "0.1.2",
     "ua-parser-js": "1.0.40",
-    "ws": "8.18.0",
+    "ws": "8.18.3",
     "yauzl": "2.10.0"
   },
   "engines": {
@@ -85,55 +86,56 @@
     "ipcheck": "0.1.0",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
-    "@seald-io/nedb": "*",
+    "@seald-io/nedb": "4.1.2",
     "node-forge": "1.3.1",
     "ua-parser-js": "1.0.40",
     "ua-client-hints-js": "0.1.2",
-    "ws": "8.18.0",
+    "ws": "8.18.3",
     "yauzl": "2.10.0",
     "node-windows": "0.1.14",
     "loadavg-windows": "1.1.1",
     "node-sspi": "0.2.10",
     "ldapauth-fork": "5.0.5",
-    "ssh2": "1.16.0",
+    "ssh2": "1.17.0",
     "svg-captcha": "1.4.0",
     "image-size": "2.0.2",
     "acme-client": "4.2.5",
-    "aedes": "0.39.0",
-    "mysql2": "3.11.4",
+    "aedes": "0.51.3",
+    "mysql2": "3.15.1",
     "@mysql/xdevapi": "8.0.33",
     "mongodb": "4.17.2",
-    "pg": "8.14.1",
-    "mariadb": "3.4.0",
+    "@mongodb-js/saslprep": "1.3.1",
+    "pg": "8.16.3",
+    "mariadb": "3.4.5",
     "acebase": "1.29.5",
     "sqlite3": "5.1.7",
-    "node-vault": "0.10.2",
-    "https-proxy-agent": "7.0.2",
+    "node-vault": "0.10.5",
+    "https-proxy-agent": "7.0.6",
     "mongojs": "3.1.0",
     "nodemailer": "6.10.1",
-    "@sendgrid/mail": "*",
+    "@sendgrid/mail": "8.1.6",
     "jsdom": "22.1.0",
     "esprima": "4.0.1",
     "html-minifier-terser": "7.2.0",
     "@crowdsec/express-bouncer": "0.1.0",
-    "prom-client": "*",
+    "prom-client": "15.1.3",
     "archiver-zip-encrypted": "2.0.0",
     "googleapis": "128.0.0",
     "webdav": "5.8.0",
-    "minio": "8.0.2",
+    "minio": "8.0.6",
     "wildleek": "2.0.0",
     "yub": "0.11.1",
     "otplib": "12.0.1",
-    "twilio": "4.19.0",
-    "plivo": "4.58.0",
+    "twilio": "4.23.0",
+    "plivo": "4.75.1",
     "telnyx": "1.25.5",
-    "telegram": "2.19.8",
+    "telegram": "2.26.22",
     "input": "1.0.1",
     "discord.js": "14.6.0",
-    "@xmpp/client": "0.13.1",
+    "@xmpp/client": "0.13.6",
     "node-pushover": "1.0.0",
     "zulip": "0.1.0",
-    "web-push": "3.6.6",
+    "web-push": "3.6.7",
     "firebase-admin": "12.7.0",
     "modern-syslog": "1.2.0",
     "syslog": "0.1.1-1",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index c30057e2dbb8..40d2650403fd 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -40,383 +40,380 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.895.0.tgz#7d0a49eb8587ba8629a9c27dcb7dc931a9618636"
-  integrity sha512-IwU2LiIqDSq4wj8WtDkWAkKbjnV24EOufqXzcLQfr/QJKd0qkGKeVImOVPXPT8wtksEpB0ViVOpIEyML3BqvAg==
+"@aws-sdk/client-cognito-identity@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.916.0.tgz#acebab71db8c58fd73cf384e6bf1b5ed0c0ac360"
+  integrity sha512-MGpWcn350e/liZrsh8gdJMcBKwE4/pcNvSr3Dw+tB+ZVZlVFdHGFyeQVaknz8UWZXrfUK5KCbvahotmaQOs1pg==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/credential-provider-node" "3.895.0"
-    "@aws-sdk/middleware-host-header" "3.893.0"
-    "@aws-sdk/middleware-logger" "3.893.0"
-    "@aws-sdk/middleware-recursion-detection" "3.893.0"
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/region-config-resolver" "3.893.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@aws-sdk/util-user-agent-browser" "3.893.0"
-    "@aws-sdk/util-user-agent-node" "3.895.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/hash-node" "^4.1.1"
-    "@smithy/invalid-dependency" "^4.1.1"
-    "@smithy/middleware-content-length" "^4.1.1"
-    "@smithy/middleware-endpoint" "^4.2.3"
-    "@smithy/middleware-retry" "^4.2.4"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-body-length-node" "^4.1.0"
-    "@smithy/util-defaults-mode-browser" "^4.1.3"
-    "@smithy/util-defaults-mode-node" "^4.1.3"
-    "@smithy/util-endpoints" "^3.1.2"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/credential-provider-node" "3.916.0"
+    "@aws-sdk/middleware-host-header" "3.914.0"
+    "@aws-sdk/middleware-logger" "3.914.0"
+    "@aws-sdk/middleware-recursion-detection" "3.914.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/region-config-resolver" "3.914.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@aws-sdk/util-user-agent-browser" "3.914.0"
+    "@aws-sdk/util-user-agent-node" "3.916.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/hash-node" "^4.2.3"
+    "@smithy/invalid-dependency" "^4.2.3"
+    "@smithy/middleware-content-length" "^4.2.3"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-retry" "^4.4.5"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.4"
+    "@smithy/util-defaults-mode-node" "^4.2.6"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.895.0.tgz#a371d996f301b50c789b6a75167951263e402541"
-  integrity sha512-AQHk6iJrwce/NwZa5/Njy0ZGoHdxWCajkgufhXk53L0kRiC3vUPPWEV1m1F3etQWhaUsatcO2xtRuKvLpe4zgA==
+"@aws-sdk/client-sso@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.916.0.tgz#627792ab588a004fc0874a060b3466e21328b5b6"
+  integrity sha512-Eu4PtEUL1MyRvboQnoq5YKg0Z9vAni3ccebykJy615xokVZUdA3di2YxHM/hykDQX7lcUC62q9fVIvh0+UNk/w==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/middleware-host-header" "3.893.0"
-    "@aws-sdk/middleware-logger" "3.893.0"
-    "@aws-sdk/middleware-recursion-detection" "3.893.0"
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/region-config-resolver" "3.893.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@aws-sdk/util-user-agent-browser" "3.893.0"
-    "@aws-sdk/util-user-agent-node" "3.895.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/hash-node" "^4.1.1"
-    "@smithy/invalid-dependency" "^4.1.1"
-    "@smithy/middleware-content-length" "^4.1.1"
-    "@smithy/middleware-endpoint" "^4.2.3"
-    "@smithy/middleware-retry" "^4.2.4"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-body-length-node" "^4.1.0"
-    "@smithy/util-defaults-mode-browser" "^4.1.3"
-    "@smithy/util-defaults-mode-node" "^4.1.3"
-    "@smithy/util-endpoints" "^3.1.2"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/middleware-host-header" "3.914.0"
+    "@aws-sdk/middleware-logger" "3.914.0"
+    "@aws-sdk/middleware-recursion-detection" "3.914.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/region-config-resolver" "3.914.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@aws-sdk/util-user-agent-browser" "3.914.0"
+    "@aws-sdk/util-user-agent-node" "3.916.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/hash-node" "^4.2.3"
+    "@smithy/invalid-dependency" "^4.2.3"
+    "@smithy/middleware-content-length" "^4.2.3"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-retry" "^4.4.5"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.4"
+    "@smithy/util-defaults-mode-node" "^4.2.6"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.894.0.tgz#e926a2ce0d925d03353bd0b643852960ecb1a6ff"
-  integrity sha512-7zbO31NV2FaocmMtWOg/fuTk3PC2Ji2AC0Fi2KqrppEDIcwLlTTuT9w/rdu/93Pz+wyUhCxWnDc0tPbwtCLs+A==
+"@aws-sdk/core@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.916.0.tgz#ea11b485f837f1773e174f8a4ed82ecce9f163f7"
+  integrity sha512-1JHE5s6MD5PKGovmx/F1e01hUbds/1y3X8rD+Gvi/gWVfdg5noO7ZCerpRsWgfzgvCMZC9VicopBqNHCKLykZA==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/xml-builder" "3.894.0"
-    "@smithy/core" "^3.11.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/signature-v4" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/xml-builder" "3.914.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/signature-v4" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.895.0.tgz#2266eea0e82576604e88ce5db281a98eaaabd69f"
-  integrity sha512-MxKRfRBM+5yRoAWmF9icfP4NrRYyD5BaQRl+uR5EhT8mxuImMj0tyY9g/fUwKjxNPJ2LKFtrgadZSXUOB+OkNg==
+"@aws-sdk/credential-provider-cognito-identity@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.916.0.tgz#a036c86e148bf709248d4d297d7e683d1a04a84a"
+  integrity sha512-B0KoCIzEb5e98qaIF6PyXVBEvbi7yyInSoSSpP7ZmlRxanB4an/h54q5QwHPN+zGBqrGBiXbz9HvOLP2c29yww==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/client-cognito-identity" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.894.0.tgz#2f3a9a9efb9c9405c6a3e5acaf51afdc13d0fde9"
-  integrity sha512-2aiQJIRWOuROPPISKgzQnH/HqSfucdk5z5VMemVH3Mm2EYOrzBwmmiiFpmSMN3ST+sE8c7gusqycUchP+KfALQ==
+"@aws-sdk/credential-provider-env@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.916.0.tgz#c76861ec87f9edf227af62474411bf54ca04805d"
+  integrity sha512-3gDeqOXcBRXGHScc6xb7358Lyf64NRG2P08g6Bu5mv1Vbg9PKDyCAZvhKLkG7hkdfAM8Yc6UJNhbFxr1ud/tCQ==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.894.0.tgz#7f1126d7e6d5f48f12d2ca67b7de07759631549b"
-  integrity sha512-Z5QQpqFRflszrT+lUq6+ORuu4jRDcpgCUSoTtlhczidMqfdOSckKmK3chZEfmUUJPSwoFQZ7EiVTsX3c886fBg==
+"@aws-sdk/credential-provider-http@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.916.0.tgz#b46e51c5cc65364c5fde752b4d016b5b747c6d89"
+  integrity sha512-NmooA5Z4/kPFJdsyoJgDxuqXC1C6oPMmreJjbOPqcwo6E/h2jxaG8utlQFgXe5F9FeJsMx668dtxVxSYnAAqHQ==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-stream" "^4.3.2"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-stream" "^4.5.4"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.895.0.tgz#27f0265c1e2b2aeae10b020de048a065ac9840e1"
-  integrity sha512-uIh7N4IN/yIk+qYMAkVpVkjhB90SGKSfaXEVcnmxzBDG6e5304HKT0esqoCVZvtFfLKasjm2TOpalM5l3fi/dA==
+"@aws-sdk/credential-provider-ini@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.916.0.tgz#53ecde76adaf2d0dcec195801053347a47e20a87"
+  integrity sha512-iR0FofvdPs87o6MhfNPv0F6WzB4VZ9kx1hbvmR7bSFCk7l0gc7G4fHJOg4xg2lsCptuETboX3O/78OQ2Djeakw==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/credential-provider-env" "3.894.0"
-    "@aws-sdk/credential-provider-http" "3.894.0"
-    "@aws-sdk/credential-provider-process" "3.894.0"
-    "@aws-sdk/credential-provider-sso" "3.895.0"
-    "@aws-sdk/credential-provider-web-identity" "3.895.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/credential-provider-env" "3.916.0"
+    "@aws-sdk/credential-provider-http" "3.916.0"
+    "@aws-sdk/credential-provider-process" "3.916.0"
+    "@aws-sdk/credential-provider-sso" "3.916.0"
+    "@aws-sdk/credential-provider-web-identity" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.895.0.tgz#76dca377418447714544eeceb7423a693ce6c14a"
-  integrity sha512-7xsBCmkBUz+2sNqNsDJ1uyQsBvwhNFzwFt8wX39WrFJTpTQh3uNQ5g8QH21BbkKqIFKCLdvgHgwt3Ub5RGVuPA==
+"@aws-sdk/credential-provider-node@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.916.0.tgz#a95b85ae40d10aef45c821b19f5b0f7929af46ee"
+  integrity sha512-8TrMpHqct0zTalf2CP2uODiN/PH9LPdBC6JDgPVK0POELTT4ITHerMxIhYGEiKN+6E4oRwSjM/xVTHCD4nMcrQ==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.894.0"
-    "@aws-sdk/credential-provider-http" "3.894.0"
-    "@aws-sdk/credential-provider-ini" "3.895.0"
-    "@aws-sdk/credential-provider-process" "3.894.0"
-    "@aws-sdk/credential-provider-sso" "3.895.0"
-    "@aws-sdk/credential-provider-web-identity" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/credential-provider-env" "3.916.0"
+    "@aws-sdk/credential-provider-http" "3.916.0"
+    "@aws-sdk/credential-provider-ini" "3.916.0"
+    "@aws-sdk/credential-provider-process" "3.916.0"
+    "@aws-sdk/credential-provider-sso" "3.916.0"
+    "@aws-sdk/credential-provider-web-identity" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.894.0.tgz#bf779c4d3e6e21e6fb0b6ebbb79a135b4b9341bb"
-  integrity sha512-VU74GNsj+SsO+pl4d+JimlQ7+AcderZaC6bFndQssQdFZ5NRad8yFNz5Xbec8CPJr+z/VAwHib6431F5nYF46g==
+"@aws-sdk/credential-provider-process@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.916.0.tgz#7c5aa9642a0e1c2a2791d85fe1bedfecae73672e"
+  integrity sha512-SXDyDvpJ1+WbotZDLJW1lqP6gYGaXfZJrgFSXIuZjHb75fKeNRgPkQX/wZDdUvCwdrscvxmtyJorp2sVYkMcvA==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.895.0.tgz#e24ecfe1a9194ff87a51c89bbe00df1cd339bcf7"
-  integrity sha512-bZCcHUZGz+XlCaK0KEOHGHkMtlwIvnpxJvlZtSCVaBdX/IgouxaB42fxChflxSMRWF45ygdezfky4i17f6vC4w==
+"@aws-sdk/credential-provider-sso@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.916.0.tgz#b99ff591e758a56eefe7b05f1e77efe8f28f8c16"
+  integrity sha512-gu9D+c+U/Dp1AKBcVxYHNNoZF9uD4wjAKYCjgSN37j4tDsazwMEylbbZLuRNuxfbXtizbo4/TiaxBXDbWM7AkQ==
   dependencies:
-    "@aws-sdk/client-sso" "3.895.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/token-providers" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/client-sso" "3.916.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/token-providers" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.895.0.tgz#ae98946cd639258b912eea90a6c82e8dc89a88b8"
-  integrity sha512-tKbXbOp2xrL02fxKvB7ko1E4Uvyy5TF9qi5pT2MVWNnfSsBlUM80aJ6tyUPKWXdUTdAlPrU3XcwgQl/DnnRa9A==
+"@aws-sdk/credential-provider-web-identity@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.916.0.tgz#8c5f6cf52cd9e091b020f46ebdaa7f52a6834ba9"
+  integrity sha512-VFnL1EjHiwqi2kR19MLXjEgYBuWViCuAKLGSFGSzfFF/+kSpamVrOSFbqsTk8xwHan8PyNnQg4BNuusXwwLoIw==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.895.0.tgz#fa7b3e3ce1bb76b8b2fd058380a5ad91effe29d4"
-  integrity sha512-YAOjBCHKOqWIn1nFOMd1q3Za0h3wzTmcEpZdplhOq7EDlWEOTPGu+NuX2sdZx6fsMWCMzogFJdvV/p8lUXtHcg==
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.916.0.tgz#4456bd310ca92ebcd71285aa61e758550ab4b133"
+  integrity sha512-wazu2awF69ohF3AaDlYkD+tanaqwJ309o9GawNg3o1oW7orhdcvh6P8BftSjuIzuAMiauvQquxcUrNTLxHtvOA==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.895.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.895.0"
-    "@aws-sdk/credential-provider-env" "3.894.0"
-    "@aws-sdk/credential-provider-http" "3.894.0"
-    "@aws-sdk/credential-provider-ini" "3.895.0"
-    "@aws-sdk/credential-provider-node" "3.895.0"
-    "@aws-sdk/credential-provider-process" "3.894.0"
-    "@aws-sdk/credential-provider-sso" "3.895.0"
-    "@aws-sdk/credential-provider-web-identity" "3.895.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/client-cognito-identity" "3.916.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.916.0"
+    "@aws-sdk/credential-provider-env" "3.916.0"
+    "@aws-sdk/credential-provider-http" "3.916.0"
+    "@aws-sdk/credential-provider-ini" "3.916.0"
+    "@aws-sdk/credential-provider-node" "3.916.0"
+    "@aws-sdk/credential-provider-process" "3.916.0"
+    "@aws-sdk/credential-provider-sso" "3.916.0"
+    "@aws-sdk/credential-provider-web-identity" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.893.0.tgz#1a4b14c11cff158b383e2b859be5c468d2c2c162"
-  integrity sha512-qL5xYRt80ahDfj9nDYLhpCNkDinEXvjLe/Qen/Y/u12+djrR2MB4DRa6mzBCkLkdXDtf0WAoW2EZsNCfGrmOEQ==
+"@aws-sdk/middleware-host-header@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.914.0.tgz#7e962c3d18c1ecc98606eab09a98dcf1b3402835"
+  integrity sha512-7r9ToySQ15+iIgXMF/h616PcQStByylVkCshmQqcdeynD/lCn2l667ynckxW4+ql0Q+Bo/URljuhJRxVJzydNA==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.893.0.tgz#4ecb20ee0771a2f3afdc07c1310b97251d3854e2"
-  integrity sha512-ZqzMecjju5zkBquSIfVfCORI/3Mge21nUY4nWaGQy+NUXehqCGG4W7AiVpiHGOcY2cGJa7xeEkYcr2E2U9U0AA==
+"@aws-sdk/middleware-logger@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.914.0.tgz#222d50ec69447715d6954eb6db0029f11576227b"
+  integrity sha512-/gaW2VENS5vKvJbcE1umV4Ag3NuiVzpsANxtrqISxT3ovyro29o1RezW/Avz/6oJqjnmgz8soe9J1t65jJdiNg==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.893.0.tgz#9fde6f10e72fcbd8ce4f0eea629c07ca64ce86ba"
-  integrity sha512-H7Zotd9zUHQAr/wr3bcWHULYhEeoQrF54artgsoUGIf/9emv6LzY89QUccKIxYd6oHKNTrTyXm9F0ZZrzXNxlg==
+"@aws-sdk/middleware-recursion-detection@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.914.0.tgz#bf65759cf303f271b22770e7f9675034b4ced946"
+  integrity sha512-yiAjQKs5S2JKYc+GrkvGMwkUvhepXDigEXpSJqUseR/IrqHhvGNuOxDxq+8LbDhM4ajEW81wkiBbU+Jl9G82yQ==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
+    "@aws-sdk/types" "3.914.0"
     "@aws/lambda-invoke-store" "^0.0.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.895.0.tgz#bf1276999ff84a3d53f9f80397033fc1b4bd8f05"
-  integrity sha512-JUqQW2RPp4I95wZ/Im9fTiaX3DF55oJgeoiNlLdHkQZPSNNS/pT1WMWMReSvJdcfSNU3xSUaLtI+h4mQjQUDbQ==
+"@aws-sdk/middleware-user-agent@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.916.0.tgz#a0894ae6d70d7a81b2572ee69ed0d3049d39dfce"
+  integrity sha512-mzF5AdrpQXc2SOmAoaQeHpDFsK2GE6EGcEACeNuoESluPI2uYMpuuNMYrUufdnIAIyqgKlis0NVxiahA5jG42w==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@smithy/core" "^3.11.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.895.0.tgz#b11c26eb5d2b09a2f6c1901bc73084e76ff8d849"
-  integrity sha512-8w1ihfYgvds6kfal/qJXQQrHRsKYh2nujSyzWMo2TMKMze9WPZA93G4mRbRtKtbSuQ66mVWePH8Cksq35ABu2Q==
+"@aws-sdk/nested-clients@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.916.0.tgz#2f79b924dd6c25cc3c40f6a0453097ae7a512702"
+  integrity sha512-tgg8e8AnVAer0rcgeWucFJ/uNN67TbTiDHfD+zIOPKep0Z61mrHEoeT/X8WxGIOkEn4W6nMpmS4ii8P42rNtnA==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/middleware-host-header" "3.893.0"
-    "@aws-sdk/middleware-logger" "3.893.0"
-    "@aws-sdk/middleware-recursion-detection" "3.893.0"
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/region-config-resolver" "3.893.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@aws-sdk/util-user-agent-browser" "3.893.0"
-    "@aws-sdk/util-user-agent-node" "3.895.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/hash-node" "^4.1.1"
-    "@smithy/invalid-dependency" "^4.1.1"
-    "@smithy/middleware-content-length" "^4.1.1"
-    "@smithy/middleware-endpoint" "^4.2.3"
-    "@smithy/middleware-retry" "^4.2.4"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-body-length-node" "^4.1.0"
-    "@smithy/util-defaults-mode-browser" "^4.1.3"
-    "@smithy/util-defaults-mode-node" "^4.1.3"
-    "@smithy/util-endpoints" "^3.1.2"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/middleware-host-header" "3.914.0"
+    "@aws-sdk/middleware-logger" "3.914.0"
+    "@aws-sdk/middleware-recursion-detection" "3.914.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/region-config-resolver" "3.914.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@aws-sdk/util-user-agent-browser" "3.914.0"
+    "@aws-sdk/util-user-agent-node" "3.916.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/hash-node" "^4.2.3"
+    "@smithy/invalid-dependency" "^4.2.3"
+    "@smithy/middleware-content-length" "^4.2.3"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-retry" "^4.4.5"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.4"
+    "@smithy/util-defaults-mode-node" "^4.2.6"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz#570dfd2314b3f71eb263557bb06fea36b5188cd6"
-  integrity sha512-/cJvh3Zsa+Of0Zbg7vl9wp/kZtdb40yk/2+XcroAMVPO9hPvmS9r/UOm6tO7FeX4TtkRFwWaQJiTZTgSdsPY+Q==
+"@aws-sdk/region-config-resolver@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.914.0.tgz#b6d2825081195ce1c634b8c92b1e19b08f140008"
+  integrity sha512-KlmHhRbn1qdwXUdsdrJ7S/MAkkC1jLpQ11n+XvxUUUCGAJd1gjC7AjxPZUM7ieQ2zcb8bfEzIU7al+Q3ZT0u7Q==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-config-provider" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.895.0.tgz#6fc09c3aee81fb6c4430724ded1dda88d57775ac"
-  integrity sha512-vJqrEHFFGRZ3ok5T+jII00sa2DQ3HdVkTBIfM0DcrcPssqDV18VKdA767qiBdIEN/cygjdBg8Ri/cuq6ER9BeQ==
+"@aws-sdk/token-providers@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.916.0.tgz#e824fd44a553c4047b769caf22a94fd2705c9f1d"
+  integrity sha512-13GGOEgq5etbXulFCmYqhWtpcEQ6WI6U53dvXbheW0guut8fDFJZmEv7tKMTJgiybxh7JHd0rWcL9JQND8DwoQ==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.893.0", "@aws-sdk/types@^3.222.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.893.0.tgz#1afbdb9d62bf86caeac380e3cac11a051076400a"
-  integrity sha512-Aht1nn5SnA0N+Tjv0dzhAY7CQbxVtmq1bBR6xI0MhG7p2XYVh1wXuKTzrldEvQWwA3odOYunAfT9aBiKZx9qIg==
+"@aws-sdk/types@3.914.0", "@aws-sdk/types@^3.222.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.914.0.tgz#175cf9a4b2267aafbb110fe1316e6827de951fdb"
+  integrity sha512-kQWPsRDmom4yvAfyG6L1lMmlwnTzm1XwMHOU+G5IFlsP4YEaMtXidDzW/wiivY0QFrhfCz/4TVmu0a2aPU57ug==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.895.0.tgz#d3881250cecc40fa9d721a33661c1aaa64aba643"
-  integrity sha512-MhxBvWbwxmKknuggO2NeMwOVkHOYL98pZ+1ZRI5YwckoCL3AvISMnPJgfN60ww6AIXHGpkp+HhpFdKOe8RHSEg==
+"@aws-sdk/util-endpoints@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.916.0.tgz#ab54249b8090cd66fe14aa8518097107a2595196"
+  integrity sha512-bAgUQwvixdsiGNcuZSDAOWbyHlnPtg8G8TyHD6DTfTmKTHUW6tAn+af/ZYJPXEzXhhpwgJqi58vWnsiDhmr7NQ==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-endpoints" "^3.1.2"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-endpoints" "^3.2.3"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
@@ -426,33 +423,33 @@
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.893.0.tgz#be0aac5c73a30c2a03aedb2e3501bb277bad79a1"
-  integrity sha512-PE9NtbDBW6Kgl1bG6A5fF3EPo168tnkj8TgMcT0sg4xYBWsBpq0bpJZRh+Jm5Bkwiw9IgTCLjEU7mR6xWaMB9w==
+"@aws-sdk/util-user-agent-browser@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.914.0.tgz#ed29fd87f6ffba6f53615894a5e969cb9013af59"
+  integrity sha512-rMQUrM1ECH4kmIwlGl9UB0BtbHy6ZuKdWFrIknu8yGTRI/saAucqNTh5EI1vWBxZ0ElhK5+g7zOnUuhSmVQYUA==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/types" "^4.8.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.895.0.tgz#f8bcfff850f2685d10099a7496dc70d6c6525356"
-  integrity sha512-lLRC7BAFOPtJk4cZC0Q0MZBMCGF109QpGnug3L3n/2TJW02Sinz9lzA0ykBpYXe9j60LjIYSENCg+F4DZE5vxg==
+"@aws-sdk/util-user-agent-node@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.916.0.tgz#3ab5fdb9f45345f19f426941ece71988b31bf58d"
+  integrity sha512-CwfWV2ch6UdjuSV75ZU99N03seEUb31FIUrXBnwa6oONqj/xqXwrxtlUMLx6WH3OJEE4zI3zt5PjlTdGcVwf4g==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/xml-builder@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.894.0.tgz#7110e86622345d3da220a2ed5259a30a91dec4bc"
-  integrity sha512-E6EAMc9dT1a2DOdo4zyOf3fp5+NJ2wI+mcm7RaW1baFIWDwcb99PpvWoV7YEiK7oaBDshuOEGWKUSYXdW+JYgA==
+"@aws-sdk/xml-builder@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.914.0.tgz#4e98b479856113db877d055e7b008065c50266d4"
+  integrity sha512-k75evsBD5TcIjedycYS7QXQ98AmOtbnxRJOPtCo0IwYRmy7UvqgS/gBL5SmrIqeV6FDSYRQMgdBxSMp6MLmdew==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     fast-xml-parser "5.2.5"
     tslib "^2.6.2"
 
@@ -461,7 +458,7 @@
   resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz#92d792a7dda250dfcb902e13228f37a81be57c8f"
   integrity sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw==
 
-"@babel/cli@^7.16.0":
+"@babel/cli@^7.26.4":
   version "7.28.3"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.3.tgz#f33693753bc103ab0084a5776ccf8ab8a140038b"
   integrity sha512-n1RU5vuCX0CsaqaXm9I0KUCNKNQMy5epmzl/xdSSm70bSqhg9GWhgeosypyQLc0bK24+Xpk1WGzZlI9pJtkZdg==
@@ -487,24 +484,24 @@
     picocolors "^1.1.1"
 
 "@babel/compat-data@^7.27.2":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.4.tgz#96fdf1af1b8859c8474ab39c295312bfb7c24b04"
-  integrity sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
+  integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
 
-"@babel/core@^7.16.5":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.4.tgz#12a550b8794452df4c8b084f95003bce1742d496"
-  integrity sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==
+"@babel/core@^7.26.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
+  integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.3"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-module-transforms" "^7.28.3"
     "@babel/helpers" "^7.28.4"
-    "@babel/parser" "^7.28.4"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.28.4"
-    "@babel/types" "^7.28.4"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
     "@jridgewell/remapping" "^2.3.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
@@ -512,13 +509,13 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.28.3", "@babel/generator@^7.4.0":
-  version "7.28.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.3.tgz#9626c1741c650cbac39121694a0f2d7451b8ef3e"
-  integrity sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==
+"@babel/generator@^7.28.5", "@babel/generator@^7.4.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
+  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
   dependencies:
-    "@babel/parser" "^7.28.3"
-    "@babel/types" "^7.28.2"
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
     "@jridgewell/gen-mapping" "^0.3.12"
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
@@ -573,10 +570,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
   integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
-  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
+"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
 
 "@babel/helper-validator-option@^7.27.1":
   version "7.27.1"
@@ -591,7 +588,7 @@
     "@babel/template" "^7.27.2"
     "@babel/types" "^7.28.4"
 
-"@babel/node@^7.16.5":
+"@babel/node@^7.26.0":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.28.0.tgz#fe52d05121ca064e6919215ffe54fea480a8746f"
   integrity sha512-6u1Mmn3SIMUH8uwTq543L062X3JDgms9HPf06o/pIGdDjeD/zNQ+dfZPQD27sCyvtP0ZOlJtwnl2RIdPe9bHeQ==
@@ -603,12 +600,12 @@
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.27.2", "@babel/parser@^7.28.3", "@babel/parser@^7.28.4", "@babel/parser@^7.4.3":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8"
-  integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
+"@babel/parser@^7.27.2", "@babel/parser@^7.28.5", "@babel/parser@^7.4.3":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
+  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
   dependencies:
-    "@babel/types" "^7.28.4"
+    "@babel/types" "^7.28.5"
 
 "@babel/plugin-syntax-jsx@^7.27.1":
   version "7.27.1"
@@ -617,7 +614,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-react-jsx@^7.16.5":
+"@babel/plugin-transform-react-jsx@^7.25.9":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0"
   integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==
@@ -639,6 +636,11 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
+"@babel/runtime@^7.23.8", "@babel/runtime@^7.24.5":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
+  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
+
 "@babel/template@^7.27.2", "@babel/template@^7.4.0":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
@@ -648,26 +650,26 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.4.3":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.4.tgz#8d456101b96ab175d487249f60680221692b958b"
-  integrity sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.5", "@babel/traverse@^7.4.3":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.3"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.28.4"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.4"
+    "@babel/types" "^7.28.5"
     debug "^4.3.1"
 
-"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.4", "@babel/types@^7.4.0":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.4.tgz#0a4e618f4c60a7cd6c11cb2d48060e4dbe38ac3a"
-  integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.4", "@babel/types@^7.28.5", "@babel/types@^7.4.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
+  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
 
 "@buttercup/fetch@^0.2.1":
   version "0.2.1"
@@ -697,24 +699,24 @@
   resolved "https://registry.yarnpkg.com/@cryptography/aes/-/aes-0.1.1.tgz#0096726a6a2a2cfc2e8bddf3997e98e49f1a224d"
   integrity sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==
 
-"@dabh/diagnostics@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a"
-  integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==
+"@dabh/diagnostics@^2.0.8":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.8.tgz#ead97e72ca312cf0e6dd7af0d300b58993a31a5e"
+  integrity sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==
   dependencies:
-    colorspace "1.1.x"
+    "@so-ric/colorspace" "^1.1.6"
     enabled "2.0.x"
     kuler "^2.0.0"
 
 "@discordjs/builders@^1.3.0":
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.11.3.tgz#14b8b027e16b73136924faecaf1819b94711647c"
-  integrity sha512-p3kf5eV49CJiRTfhtutUCeivSyQ/l2JlKodW1ZquRwwvlOWmG9+6jFShX6x8rUiYhnP6wKI96rgN/SXMy5e5aw==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.12.2.tgz#d49c3796e75a6e6533e6bd4ca0de0b3716725a5a"
+  integrity sha512-AugKmrgRJOHXEyMkABH/hXpAmIBKbYokCEl9VAM4Kh6FvkdobQ+Zhv7AR6K+y5hS7+VQ7gKXPYCe1JQmV07H1g==
   dependencies:
     "@discordjs/formatters" "^0.6.1"
     "@discordjs/util" "^1.1.1"
     "@sapphire/shapeshift" "^4.0.0"
-    discord-api-types "^0.38.16"
+    discord-api-types "^0.38.26"
     fast-deep-equal "^3.1.3"
     ts-mixer "^6.0.4"
     tslib "^2.6.3"
@@ -854,9 +856,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@google-cloud/firestore@^7.7.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.5.tgz#7932e07a79ab2488e707de3494acb6216377fa03"
-  integrity sha512-61xGOvRPi6Zg7b9JslD844dXRatwk+RtnXs4c4KtCdg30TkExRHx9QfJgnoIMvuffYBgDtzOdhvecUgTPboi/A==
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.6.tgz#0a2b26e215aa4f903267f82370450753b84db16a"
+  integrity sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
     fast-deep-equal "^3.1.1"
@@ -883,9 +885,9 @@
   integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
 
 "@google-cloud/storage@^7.7.0":
-  version "7.17.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.17.1.tgz#4f998c4b63e0537272ac44f5e7751e046ecaca1d"
-  integrity sha512-2FMQbpU7qK+OtBPaegC6n+XevgZksobUGo6mGKnXNmeZpvLiAo1gTAE3oTKsrMGDV4VtL8Zzpono0YsK/Q7Iqg==
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.17.2.tgz#dd6ed7a60c5f917612dd665f292541cb2624b243"
+  integrity sha512-6xN0KNO8L/LIA5zu3CJwHkJiB6n65eykBLOb0E+RooiHYgX8CSao6lvQiKT9TBk2gL5g33LL3fmhDodZnt56rw==
   dependencies:
     "@google-cloud/paginator" "^5.0.0"
     "@google-cloud/projectify" "^4.0.0"
@@ -1002,10 +1004,17 @@
   resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
   integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
 
+"@mongodb-js/saslprep@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.1.tgz#a7d6cfc085f801e51ba5cbec6aa84cad858e1d2d"
+  integrity sha512-6nZrq5kfAz0POWyhljnbWQQJQ5uT8oE2ddX303q1uY0tWsivWKgBDXBBvuFPwOqRRalXJuVO9EjOdVtuhLX0zg==
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 "@mongodb-js/saslprep@^1.1.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz#75bb770b4b0908047b6c6ac2ec841047660e1c82"
-  integrity sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.2.tgz#51e5cad2f24b8759702d9cc185da0a3ef3784bad"
+  integrity sha512-QgA5AySqB27cGTXBFmnpifAi7HxoGUeezwo6p9dI03MuDB6Pp33zgclqVb6oVK3j6I9Vesg0+oojW2XxB59SGg==
   dependencies:
     sparse-bitfield "^3.0.3"
 
@@ -1189,14 +1198,14 @@
   resolved "https://registry.yarnpkg.com/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz#165a9a456eaa30d15885b25db83861bcce2c6a74"
   integrity sha512-qv3jnwoakeax2razYaMsGI/luWdliBLHTdC6jU55hQt1hcFqzauH/HsBollQ7IR4ySTtYhT+xyHoijpA16C+tA==
 
-"@seald-io/nedb@4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@seald-io/nedb/-/nedb-4.0.4.tgz#a6f5dd63a2dde0e141f1862da1e0806141791732"
-  integrity sha512-CUNcMio7QUHTA+sIJ/DC5JzVNNsHe743TPmC4H5Gij9zDLMbmrCT2li3eVB72/gF63BPS8pWEZrjlAMRKA8FDw==
+"@seald-io/nedb@4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@seald-io/nedb/-/nedb-4.1.2.tgz#cacd7253d9826b51495d024ca768dea3fe63e853"
+  integrity sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==
   dependencies:
     "@seald-io/binary-search-tree" "^1.0.3"
-    localforage "^1.9.0"
-    util "^0.12.4"
+    localforage "^1.10.0"
+    util "^0.12.5"
 
 "@sendgrid/client@^8.1.5":
   version "8.1.6"
@@ -1213,7 +1222,7 @@
   dependencies:
     deepmerge "^4.2.2"
 
-"@sendgrid/mail@*":
+"@sendgrid/mail@8.1.6":
   version "8.1.6"
   resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.6.tgz#9c253c13d49867fdb6f7df1360643825236eef22"
   integrity sha512-/ZqxUvKeEztU9drOoPC/8opEPOk+jLlB2q4+xpx6HVLq6aFu3pMpalkTpAQz8XfRfpLp8O25bh6pGPcHDCYpqg==
@@ -1238,79 +1247,80 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.1.1.tgz#9b3872ab6b2c061486175c281dadc0a853260533"
-  integrity sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg==
+"@smithy/abort-controller@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.3.tgz#4615da3012b580ac3d1f0ee7b57ed7d7880bb29b"
+  integrity sha512-xWL9Mf8b7tIFuAlpjKtRPnHrR8XVrwTj5NPYO/QwZPtc0SDLsPxb56V5tzi5yspSMytISHybifez+4jlrx0vkQ==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.2.2.tgz#3f6a3c163f9b5b7f852d7d1817bc9e3b2136fa5f"
-  integrity sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ==
+"@smithy/config-resolver@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.0.tgz#9a33b7dd9b7e0475802acef53f41555257e104cd"
+  integrity sha512-Kkmz3Mup2PGp/HNJxhCWkLNdlajJORLSjwkcfrj0E7nu6STAEdcMR1ir5P9/xOmncx8xXfru0fbUYLlZog/cFg==
   dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-config-provider" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-config-provider" "^4.2.0"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
     tslib "^2.6.2"
 
-"@smithy/core@^3.11.1", "@smithy/core@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.12.0.tgz#81bb6a2a113e334ddaede9d502ff17ce4d8a2cc6"
-  integrity sha512-zJeAgogZfbwlPGL93y4Z/XNeIN37YCreRUd6YMIRvaq+6RnBK8PPYYIQ85Is/GglPh3kNImD5riDCXbVSDpCiQ==
+"@smithy/core@^3.17.1":
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.17.1.tgz#644aa4046b31c82d2c17276bcef2c6b78245dfeb"
+  integrity sha512-V4Qc2CIb5McABYfaGiIYLTmo/vwNIK7WXI5aGveBd9UcdhbOMwcvIMxIw/DJj1S9QgOMa/7FBkarMdIC0EOTEQ==
   dependencies:
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-stream" "^4.3.2"
-    "@smithy/util-utf8" "^4.1.0"
-    "@smithy/uuid" "^1.0.0"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-stream" "^4.5.4"
+    "@smithy/util-utf8" "^4.2.0"
+    "@smithy/uuid" "^1.1.0"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz#68662c873dbe812c13159cb2be3c4ba8aeb52149"
-  integrity sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg==
+"@smithy/credential-provider-imds@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.3.tgz#b35d0d1f1b28f415e06282999eba2d53eb10a1c5"
+  integrity sha512-hA1MQ/WAHly4SYltJKitEsIDVsNmXcQfYBRv2e+q04fnqtAX5qXaybxy/fhUeAMCnQIdAjaGDb04fMHQefWRhw==
   dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz#fe284a00f1b3a35edf9fba454d287b7f74ef20af"
-  integrity sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng==
+"@smithy/fetch-http-handler@^5.3.4":
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.4.tgz#af6dd2f63550494c84ef029a5ceda81ef46965d3"
+  integrity sha512-bwigPylvivpRLCm+YK9I5wRIYjFESSVwl8JQ1vVx/XhCw0PtCi558NwTnT2DaVCl5pYlImGuQTSwMsZ+pIavRw==
   dependencies:
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/querystring-builder" "^4.1.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/querystring-builder" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/hash-node@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.1.1.tgz#86ceca92487492267e944e4f4507106b731e7971"
-  integrity sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA==
+"@smithy/hash-node@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.3.tgz#c85711fca84e022f05c71b921f98cb6a0f48e5ca"
+  integrity sha512-6+NOdZDbfuU6s1ISp3UOk5Rg953RJ2aBLNLLBEcamLjHAg1Po9Ha7QIB5ZWhdRUVuOUrT8BVFR+O2KIPmw027g==
   dependencies:
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-buffer-from" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/invalid-dependency@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz#2511335ff889944701c7d2a3b1e4a4d6fe9ddfab"
-  integrity sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg==
+"@smithy/invalid-dependency@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.3.tgz#4f126ddde90fe3d69d522fc37256ee853246c1ec"
+  integrity sha512-Cc9W5DwDuebXEDMpOpl4iERo8I0KFjTnomK2RMdhhR87GwrSmUmwMxS4P5JdRf+LsjOdIqumcerwRgYMr/tZ9Q==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^2.2.0":
@@ -1320,200 +1330,200 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/is-array-buffer@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz#d18a2f22280e7173633cb91a9bdb6f3d8a6560b8"
-  integrity sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/middleware-content-length@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz#eaea7bd14c7a0b64aef87b8c372c2a04d7b9cb72"
-  integrity sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w==
-  dependencies:
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-endpoint@^4.2.3", "@smithy/middleware-endpoint@^4.2.4":
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.4.tgz#d815d27b7869a66ee97b41932053ca5d5ec6315e"
-  integrity sha512-FZ4hzupOmthm8Q8ujYrd0I+/MHwVMuSTdkDtIQE0xVuvJt9pLT6Q+b0p4/t+slDyrpcf+Wj7SN+ZqT5OryaaZg==
-  dependencies:
-    "@smithy/core" "^3.12.0"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-middleware" "^4.1.1"
-    tslib "^2.6.2"
-
-"@smithy/middleware-retry@^4.2.4":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.3.0.tgz#453c9668b013fbfa900957857f74f3b15936b384"
-  integrity sha512-qhEX9745fAxZvtLM4bQJAVC98elWjiMO2OiHl1s6p7hUzS4QfZO1gXUYNwEK8m0J6NoCD5W52ggWxbIDHI0XSg==
-  dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/service-error-classification" "^4.1.2"
-    "@smithy/smithy-client" "^4.6.4"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/uuid" "^1.0.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-serde@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz#cfb99f53c744d7730928235cbe66cc7ff8a8a9b2"
-  integrity sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg==
-  dependencies:
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-stack@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz#1d533fde4ccbb62d7fc0f0b8ac518b7e4791e311"
-  integrity sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/node-config-provider@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz#ede9ac2f689cfdf26815a53fadf139e6aa77bdbb"
-  integrity sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A==
-  dependencies:
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/node-http-handler@^4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz#d7ab8e31659030d3d5a68f0982f15c00b1e67a0c"
-  integrity sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw==
-  dependencies:
-    "@smithy/abort-controller" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/querystring-builder" "^4.1.1"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/property-provider@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.1.1.tgz#6e11ae6729840314afed05fd6ab48f62c654116b"
-  integrity sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/protocol-http@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.2.1.tgz#33f2b8e4e1082c3ae0372d1322577e6fa71d7824"
-  integrity sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz#4d35c1735de8214055424045a117fa5d1d5cdec1"
-  integrity sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-uri-escape" "^4.1.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-parser@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz#21b861439b2db16abeb0a6789b126705fa25eea1"
-  integrity sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/service-error-classification@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.1.2.tgz#06839c332f4620a4b80c78a0c32377732dc6697a"
-  integrity sha512-Kqd8wyfmBWHZNppZSMfrQFpc3M9Y/kjyN8n8P4DqJJtuwgK1H914R471HTw7+RL+T7+kI1f1gOnL7Vb5z9+NgQ==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-
-"@smithy/shared-ini-file-loader@^4.2.0":
+"@smithy/is-array-buffer@^4.2.0":
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz#e4717242686bf611bd1a5d6f79870abe480c1c99"
-  integrity sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/signature-v4@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.2.1.tgz#0048489d2f1b3c888382595a085edd31967498f8"
-  integrity sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA==
-  dependencies:
-    "@smithy/is-array-buffer" "^4.1.0"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-hex-encoding" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-uri-escape" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
-    tslib "^2.6.2"
-
-"@smithy/smithy-client@^4.6.3", "@smithy/smithy-client@^4.6.4":
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.6.4.tgz#3a66bb71c91dadf1806adab664ba2e164a1139ab"
-  integrity sha512-qL7O3VDyfzCSN9r+sdbQXGhaHtrfSJL30En6Jboj0I3bobf2g1/T0eP2L4qxqrEW26gWhJ4THI4ElVVLjYyBHg==
-  dependencies:
-    "@smithy/core" "^3.12.0"
-    "@smithy/middleware-endpoint" "^4.2.4"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-stream" "^4.3.2"
-    tslib "^2.6.2"
-
-"@smithy/types@^4.5.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.5.0.tgz#850e334662a1ef1286c35814940c80880400a370"
-  integrity sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg==
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz#b0f874c43887d3ad44f472a0f3f961bcce0550c2"
+  integrity sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.1.1.tgz#0e9a5e72b3cf9d7ab7305f9093af5528d9debaf6"
-  integrity sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg==
+"@smithy/middleware-content-length@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.3.tgz#b7d1d79ae674dad17e35e3518db4b1f0adc08964"
+  integrity sha512-/atXLsT88GwKtfp5Jr0Ks1CSa4+lB+IgRnkNrrYP0h1wL4swHNb0YONEvTceNKNdZGJsye+W2HH8W7olbcPUeA==
   dependencies:
-    "@smithy/querystring-parser" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-base64@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.1.0.tgz#5965026081d9aef4a8246f5702807570abe538b2"
-  integrity sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ==
+"@smithy/middleware-endpoint@^4.3.5":
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.5.tgz#c22f82f83f0b5cc6c0866a2a87b65bc2e79af352"
+  integrity sha512-SIzKVTvEudFWJbxAaq7f2GvP3jh2FHDpIFI6/VAf4FOWGFZy0vnYMPSRj8PGYI8Hjt29mvmwSRgKuO3bK4ixDw==
   dependencies:
-    "@smithy/util-buffer-from" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-middleware" "^4.2.3"
     tslib "^2.6.2"
 
-"@smithy/util-body-length-browser@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz#636bdf4bc878c546627dab4b9b0e4db31b475be7"
-  integrity sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ==
+"@smithy/middleware-retry@^4.4.5":
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.5.tgz#5bdb6ba1be6a97272b79fdac99db40c5e7ab81e0"
+  integrity sha512-DCaXbQqcZ4tONMvvdz+zccDE21sLcbwWoNqzPLFlZaxt1lDtOE2tlVpRSwcTOJrjJSUThdgEYn7HrX5oLGlK9A==
+  dependencies:
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/service-error-classification" "^4.2.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/uuid" "^1.1.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-serde@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.3.tgz#a827e9c4ea9e51c79cca4d6741d582026a8b53eb"
+  integrity sha512-8g4NuUINpYccxiCXM5s1/V+uLtts8NcX4+sPEbvYQDZk4XoJfDpq5y2FQxfmUL89syoldpzNzA0R9nhzdtdKnQ==
+  dependencies:
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.3.tgz#5a315aa9d0fd4faaa248780297c8cbacc31c2eba"
+  integrity sha512-iGuOJkH71faPNgOj/gWuEGS6xvQashpLwWB1HjHq1lNNiVfbiJLpZVbhddPuDbx9l4Cgl0vPLq5ltRfSaHfspA==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/node-config-provider@^4.3.3":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.3.tgz#44140a1e6bc666bcf16faf68c35d3dae4ba8cad5"
+  integrity sha512-NzI1eBpBSViOav8NVy1fqOlSfkLgkUjUTlohUSgAEhHaFWA3XJiLditvavIP7OpvTjDp5u2LhtlBhkBlEisMwA==
+  dependencies:
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/node-http-handler@^4.4.3":
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.3.tgz#fb2d16719cb4e8df0c189e8bde60e837df5c0c5b"
+  integrity sha512-MAwltrDB0lZB/H6/2M5PIsISSwdI5yIh6DaBB9r0Flo9nx3y0dzl/qTMJPd7tJvPdsx6Ks/cwVzheGNYzXyNbQ==
+  dependencies:
+    "@smithy/abort-controller" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/querystring-builder" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/property-provider@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.3.tgz#a6c82ca0aa1c57f697464bee496f3fec58660864"
+  integrity sha512-+1EZ+Y+njiefCohjlhyOcy1UNYjT+1PwGFHCxA/gYctjg3DQWAU19WigOXAco/Ql8hZokNehpzLd0/+3uCreqQ==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/protocol-http@^5.3.3":
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.3.tgz#55b35c18bdc0f6d86e78f63961e50ba4ff1c5d73"
+  integrity sha512-Mn7f/1aN2/jecywDcRDvWWWJF4uwg/A0XjFMJtj72DsgHTByfjRltSqcT9NyE9RTdBSN6X1RSXrhn/YWQl8xlw==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-builder@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.3.tgz#ca273ae8c21fce01a52632202679c0f9e2acf41a"
+  integrity sha512-LOVCGCmwMahYUM/P0YnU/AlDQFjcu+gWbFJooC417QRB/lDJlWSn8qmPSDp+s4YVAHOgtgbNG4sR+SxF/VOcJQ==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-uri-escape" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-parser@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.3.tgz#b6d7d5cd300b4083c62d9bd30915f782d01f503e"
+  integrity sha512-cYlSNHcTAX/wc1rpblli3aUlLMGgKZ/Oqn8hhjFASXMCXjIqeuQBei0cnq2JR8t4RtU9FpG6uyl6PxyArTiwKA==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/service-error-classification@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.3.tgz#ecb41dd514841eebb93e91012ae5e343040f6828"
+  integrity sha512-NkxsAxFWwsPsQiwFG2MzJ/T7uIR6AQNh1SzcxSUnmmIqIQMlLRQDKhc17M7IYjiuBXhrQRjQTo3CxX+DobS93g==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+
+"@smithy/shared-ini-file-loader@^4.3.3":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.3.3.tgz#1d5162cd3a14f57e4fde56f65aa188e8138c1248"
+  integrity sha512-9f9Ixej0hFhroOK2TxZfUUDR13WVa8tQzhSzPDgXe5jGL3KmaM9s8XN7RQwqtEypI82q9KHnKS71CJ+q/1xLtQ==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/signature-v4@^5.3.3":
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.3.tgz#5ff13cfaa29cb531061c2582cb599b39e040e52e"
+  integrity sha512-CmSlUy+eEYbIEYN5N3vvQTRfqt0lJlQkaQUIf+oizu7BbDut0pozfDjBGecfcfWf7c62Yis4JIEgqQ/TCfodaA==
+  dependencies:
+    "@smithy/is-array-buffer" "^4.2.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-hex-encoding" "^4.2.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-uri-escape" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/smithy-client@^4.9.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.1.tgz#a36e456e837121b2ded6f7d5f1f30b205c446e20"
+  integrity sha512-Ngb95ryR5A9xqvQFT5mAmYkCwbXvoLavLFwmi7zVg/IowFPCfiqRfkOKnbc/ZRL8ZKJ4f+Tp6kSu6wjDQb8L/g==
+  dependencies:
+    "@smithy/core" "^3.17.1"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-stream" "^4.5.4"
+    tslib "^2.6.2"
+
+"@smithy/types@^4.8.0":
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.8.0.tgz#e6f65e712478910b74747081e6046e68159f767d"
+  integrity sha512-QpELEHLO8SsQVtqP+MkEgCYTFW0pleGozfs3cZ183ZBj9z3VC1CX1/wtFMK64p+5bhtZo41SeLK1rBRtd25nHQ==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-body-length-node@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz#646750e4af58f97254a5d5cfeaba7d992f0152ec"
-  integrity sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ==
+"@smithy/url-parser@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.3.tgz#82508f273a3f074d47d0919f7ce08028c6575c2f"
+  integrity sha512-I066AigYvY3d9VlU3zG9XzZg1yT10aNqvCaBTw9EPgu5GrsEl1aUkcMvhkIXascYH1A8W0LQo3B1Kr1cJNcQEw==
+  dependencies:
+    "@smithy/querystring-parser" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/util-base64@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.3.0.tgz#5e287b528793aa7363877c1a02cd880d2e76241d"
+  integrity sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==
+  dependencies:
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-body-length-browser@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz#04e9fc51ee7a3e7f648a4b4bcdf96c350cfa4d61"
+  integrity sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-body-length-node@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz#79c8a5d18e010cce6c42d5cbaf6c1958523e6fec"
+  integrity sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==
   dependencies:
     tslib "^2.6.2"
 
@@ -1525,96 +1535,95 @@
     "@smithy/is-array-buffer" "^2.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-buffer-from@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz#21f9e644a0eb41226d92e4eff763f76a7db7e9cc"
-  integrity sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw==
+"@smithy/util-buffer-from@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz#7abd12c4991b546e7cee24d1e8b4bfaa35c68a9d"
+  integrity sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==
   dependencies:
-    "@smithy/is-array-buffer" "^4.1.0"
+    "@smithy/is-array-buffer" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-config-provider@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz#6a07d73446c1e9a46d7a3c125f2a9301060bc957"
-  integrity sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ==
+"@smithy/util-config-provider@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz#2e4722937f8feda4dcb09672c59925a4e6286cfc"
+  integrity sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.1.3":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.4.tgz#a967e994d4581682891f7252c7a42a2d6c1841e4"
-  integrity sha512-mLDJ1s4eA3vwOGaQOEPlg5LB4LdZUUMpB5UMOMofeGhWqiS7WR7dTpLiNi9zVn+YziKUd3Af5NLfxDs7NJqmIw==
+"@smithy/util-defaults-mode-browser@^4.3.4":
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.4.tgz#ed96651c32ac0de55b066fcb07a296837373212f"
+  integrity sha512-qI5PJSW52rnutos8Bln8nwQZRpyoSRN6k2ajyoUHNMUzmWqHnOJCnDELJuV6m5PML0VkHI+XcXzdB+6awiqYUw==
   dependencies:
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/smithy-client" "^4.6.4"
-    "@smithy/types" "^4.5.0"
-    bowser "^2.11.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.1.3":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.4.tgz#ce6b88431db4c5b42933904fd0051c91415c41ab"
-  integrity sha512-pjX2iMTcOASaSanAd7bu6i3fcMMezr3NTr8Rh64etB0uHRZi+Aw86DoCxPESjY4UTIuA06hhqtTtw95o//imYA==
+"@smithy/util-defaults-mode-node@^4.2.6":
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.6.tgz#01b7ff4605f6f981972083fee22d036e5dc4be38"
+  integrity sha512-c6M/ceBTm31YdcFpgfgQAJaw3KbaLuRKnAz91iMWFLSrgxRpYm03c3bu5cpYojNMfkV9arCUelelKA7XQT36SQ==
   dependencies:
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/smithy-client" "^4.6.4"
-    "@smithy/types" "^4.5.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz#be4005c8616923d453347048ef26a439267b2782"
-  integrity sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q==
+"@smithy/util-endpoints@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.3.tgz#8bbb80f1ad5769d9f73992c5979eea3b74d7baa9"
+  integrity sha512-aCfxUOVv0CzBIkU10TubdgKSx5uRvzH064kaiPEWfNIvKOtNpu642P4FP1hgOFkjQIkDObrfIDnKMKkeyrejvQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-hex-encoding@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz#9b27cf0c25d0de2c8ebfe75cc20df84e5014ccc9"
-  integrity sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w==
+"@smithy/util-hex-encoding@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz#1c22ea3d1e2c3a81ff81c0a4f9c056a175068a7b"
+  integrity sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.1.1.tgz#e19749a127499c9bdada713a8afd807d92d846e2"
-  integrity sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg==
+"@smithy/util-middleware@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.3.tgz#7c73416a6e3d3207a2d34a1eadd9f2b6a9811bd6"
+  integrity sha512-v5ObKlSe8PWUHCqEiX2fy1gNv6goiw6E5I/PN2aXg3Fb/hse0xeaAnSpXDiWl7x6LamVKq7senB+m5LOYHUAHw==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-retry@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.1.2.tgz#8d28c27cf69643e173c75cc18ff0186deb7cefed"
-  integrity sha512-NCgr1d0/EdeP6U5PSZ9Uv5SMR5XRRYoVr1kRVtKZxWL3tixEL3UatrPIMFZSKwHlCcp2zPLDvMubVDULRqeunA==
+"@smithy/util-retry@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.3.tgz#b1e5c96d96aaf971b68323ff8ba8754f914f22a0"
+  integrity sha512-lLPWnakjC0q9z+OtiXk+9RPQiYPNAovt2IXD3CP4LkOnd9NpUsxOjMx1SnoUVB7Orb7fZp67cQMtTBKMFDvOGg==
   dependencies:
-    "@smithy/service-error-classification" "^4.1.2"
-    "@smithy/types" "^4.5.0"
+    "@smithy/service-error-classification" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.3.2":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.3.2.tgz#7ce40c266b1e828d73c27e545959cda4f42fd61f"
-  integrity sha512-Ka+FA2UCC/Q1dEqUanCdpqwxOFdf5Dg2VXtPtB1qxLcSGh5C1HdzklIt18xL504Wiy9nNUKwDMRTVCbKGoK69g==
+"@smithy/util-stream@^4.5.4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.4.tgz#bfc60e2714c2065b8e7e91ca921cc31c73efdbd4"
+  integrity sha512-+qDxSkiErejw1BAIXUFBSfM5xh3arbz1MmxlbMCKanDDZtVEQ7PSKW9FQS0Vud1eI/kYn0oCTVKyNzRlq+9MUw==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-buffer-from" "^4.1.0"
-    "@smithy/util-hex-encoding" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-hex-encoding" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-uri-escape@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz#ed4a5c498f1da07122ca1e3df4ca3e2c67c6c18a"
-  integrity sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg==
+"@smithy/util-uri-escape@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz#096a4cec537d108ac24a68a9c60bee73fc7e3a9e"
+  integrity sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==
   dependencies:
     tslib "^2.6.2"
 
@@ -1626,21 +1635,29 @@
     "@smithy/util-buffer-from" "^2.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-utf8@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.1.0.tgz#912c33c1a06913f39daa53da79cb8f7ab740d97b"
-  integrity sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ==
+"@smithy/util-utf8@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz#8b19d1514f621c44a3a68151f3d43e51087fed9d"
+  integrity sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==
   dependencies:
-    "@smithy/util-buffer-from" "^4.1.0"
+    "@smithy/util-buffer-from" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/uuid@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.0.0.tgz#a0fd3aa879d57e2f2fd6a7308deee864a412e1cf"
-  integrity sha512-OlA/yZHh0ekYFnbUkmYBDQPE6fGfdrvgz39ktp8Xf+FA6BfxLejPTMDOG0Nfk5/rDySAz1dRbFf24zaAFYVXlQ==
+"@smithy/uuid@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.1.0.tgz#9fd09d3f91375eab94f478858123387df1cda987"
+  integrity sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==
   dependencies:
     tslib "^2.6.2"
 
+"@so-ric/colorspace@^1.1.6":
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@so-ric/colorspace/-/colorspace-1.1.6.tgz#62515d8b9f27746b76950a83bde1af812d91923b"
+  integrity sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==
+  dependencies:
+    color "^5.0.2"
+    text-hex "1.0.x"
+
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
@@ -1677,9 +1694,9 @@
     "@types/node" "*"
 
 "@types/express-serve-static-core@^4.17.33":
-  version "4.19.6"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
-  integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==
+  version "4.19.7"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz#f1d306dcc03b1aafbfb6b4fe684cce8a31cffc10"
+  integrity sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -1687,16 +1704,16 @@
     "@types/send" "*"
 
 "@types/express@^4.17.20":
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.23.tgz#35af3193c640bfd4d7fe77191cd0ed411a433bef"
-  integrity sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==
+  version "4.17.24"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.24.tgz#7d4be463143e9f2f146ef805a619076ce4aaec26"
+  integrity sha512-Mbrt4SRlXSTWryOnHAh2d4UQ/E7n9lZyGSi6KgX+4hkuL9soYbLOVXVhnk/ODp12YsGc95f4pOvqywJ6kngUwg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/geojson@^7946.0.14":
+"@types/geojson@^7946.0.16":
   version "7946.0.16"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.16.tgz#8ebe53d69efada7044454e3305c19017d97ced2a"
   integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
@@ -1736,22 +1753,22 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "24.5.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446"
-  integrity sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@^24.0.13":
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.9.1.tgz#b7360b3c789089e57e192695a855aa4f6981a53c"
+  integrity sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==
   dependencies:
-    undici-types "~7.12.0"
+    undici-types "~7.16.0"
 
 "@types/node@^14.14.14":
   version "14.18.63"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
-"@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.18.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.6.tgz#38172ef0b65e09d1a4fc715eb09a7d5decfdc748"
-  integrity sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==
+"@types/node@^22.0.1":
+  version "22.18.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.12.tgz#e165d87bc25d7bf6d3657035c914db7485de84fb"
+  integrity sha512-BICHQ67iqxQGFSzfCFTT7MRQ5XcBjG5aeKh5Ok38UBbPe5fxTyE+aHFxwVrGyr8GNlqFMLKD1D3P2K/1ks8tog==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1765,6 +1782,13 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
+"@types/readable-stream@^4.0.0":
+  version "4.0.22"
+  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.22.tgz#882fda4f17b6580acb257df3f22ca69c05470b29"
+  integrity sha512-/FFhJpfCLAPwAcN3mFycNUa77ddnr8jTgF5VmSNetaemWB2cIlfCA9t0YTM3JAT0wOcv8D4tjPo7pkDhK3EJIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/request@^2.48.8":
   version "2.48.13"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.13.tgz#abdf4256524e801ea8fdda54320f083edb5a6b80"
@@ -1776,21 +1800,28 @@
     form-data "^2.5.5"
 
 "@types/send@*":
-  version "0.17.5"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.5.tgz#d991d4f2b16f2b1ef497131f00a9114290791e74"
-  integrity sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-1.2.1.tgz#6a784e45543c18c774c049bff6d3dbaf045c9c74"
+  integrity sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/send@<1":
+  version "0.17.6"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.6.tgz#aeb5385be62ff58a52cd5459daa509ae91651d25"
+  integrity sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
 
 "@types/serve-static@*":
-  version "1.15.8"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.8.tgz#8180c3fbe4a70e8f00b9f70b9ba7f08f35987877"
-  integrity sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==
+  version "1.15.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.10.tgz#768169145a778f8f5dfcb6360aead414a3994fee"
+  integrity sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==
   dependencies:
     "@types/http-errors" "*"
     "@types/node" "*"
-    "@types/send" "*"
+    "@types/send" "<1"
 
 "@types/tough-cookie@*":
   version "4.0.5"
@@ -1834,7 +1865,7 @@
   dependencies:
     base-64 "^1.0.0"
 
-"@xmpp/client-core@^0.13.1":
+"@xmpp/client-core@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.13.3.tgz#88f4eaac9cf10a218d7891212c9b031c4946101f"
   integrity sha512-pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA==
@@ -1843,32 +1874,32 @@
     "@xmpp/jid" "^0.13.2"
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/client@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.13.1.tgz#6c8db3cd308479ef17b8f78e2eda9a68b4ebd2d6"
-  integrity sha512-DA+pOkWliTKN5C0Bod4rqlZ4hj/CiqQDHRhQgpx7Y/69qsUwK8M/9C02qylpyZSL2TFGzOM6ZMhr/jlMCsL9jQ==
+"@xmpp/client@0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.13.6.tgz#852b9c2b4d255831e031cb3f4e9d480867349990"
+  integrity sha512-e4JTcJQ20HEE1VfO2Wrq/y8ujlNZ8L4jmctX/9uhsZ/46GrNFh8uQJUSRMvaf4LV+T9xV55yu1yGDxjZYjwLsg==
   dependencies:
-    "@babel/cli" "^7.16.0"
-    "@babel/core" "^7.16.5"
-    "@babel/node" "^7.16.5"
-    "@babel/plugin-transform-react-jsx" "^7.16.5"
-    "@xmpp/client-core" "^0.13.1"
-    "@xmpp/iq" "^0.13.1"
-    "@xmpp/middleware" "^0.13.1"
-    "@xmpp/reconnect" "^0.13.1"
-    "@xmpp/resolve" "^0.13.1"
-    "@xmpp/resource-binding" "^0.13.1"
-    "@xmpp/sasl" "^0.13.1"
-    "@xmpp/sasl-anonymous" "^0.13.1"
-    "@xmpp/sasl-plain" "^0.13.1"
-    "@xmpp/sasl-scram-sha-1" "^0.13.1"
-    "@xmpp/session-establishment" "^0.13.1"
-    "@xmpp/starttls" "^0.13.1"
-    "@xmpp/stream-features" "^0.13.1"
-    "@xmpp/stream-management" "^0.13.1"
-    "@xmpp/tcp" "^0.13.1"
-    "@xmpp/tls" "^0.13.1"
-    "@xmpp/websocket" "^0.13.1"
+    "@babel/cli" "^7.26.4"
+    "@babel/core" "^7.26.0"
+    "@babel/node" "^7.26.0"
+    "@babel/plugin-transform-react-jsx" "^7.25.9"
+    "@xmpp/client-core" "^0.13.3"
+    "@xmpp/iq" "^0.13.3"
+    "@xmpp/middleware" "^0.13.3"
+    "@xmpp/reconnect" "^0.13.2"
+    "@xmpp/resolve" "^0.13.3"
+    "@xmpp/resource-binding" "^0.13.3"
+    "@xmpp/sasl" "^0.13.6"
+    "@xmpp/sasl-anonymous" "^0.13.2"
+    "@xmpp/sasl-plain" "^0.13.2"
+    "@xmpp/sasl-scram-sha-1" "^0.13.2"
+    "@xmpp/session-establishment" "^0.13.3"
+    "@xmpp/starttls" "^0.13.3"
+    "@xmpp/stream-features" "^0.13.2"
+    "@xmpp/stream-management" "^0.13.3"
+    "@xmpp/tcp" "^0.13.3"
+    "@xmpp/tls" "^0.13.3"
+    "@xmpp/websocket" "^0.13.3"
     babel-plugin-jsx-pragmatic "^1.0.2"
 
 "@xmpp/connection-tcp@^0.13.3":
@@ -1906,7 +1937,7 @@
   resolved "https://registry.yarnpkg.com/@xmpp/id/-/id-0.13.2.tgz#f10e014374300b465c0263346d909d8301b54519"
   integrity sha512-LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w==
 
-"@xmpp/iq@^0.13.1":
+"@xmpp/iq@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.13.3.tgz#c9761fb754cc119b2f7b08e996d9fea266db6336"
   integrity sha512-sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw==
@@ -1921,7 +1952,7 @@
   resolved "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.13.2.tgz#117d69b455f607735ad569e23ff40529a6681f16"
   integrity sha512-OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ==
 
-"@xmpp/middleware@^0.13.1", "@xmpp/middleware@^0.13.3":
+"@xmpp/middleware@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.13.3.tgz#aec98c9afd80b74a3c8f1d91defc3a9f5da4a6d1"
   integrity sha512-zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA==
@@ -1931,14 +1962,14 @@
     "@xmpp/xml" "^0.13.3"
     koa-compose "^4.1.0"
 
-"@xmpp/reconnect@^0.13.1":
+"@xmpp/reconnect@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.13.2.tgz#0ba0230807d5ea4f147e0eaf7b4562225a7306aa"
   integrity sha512-FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow==
   dependencies:
     "@xmpp/events" "^0.13.2"
 
-"@xmpp/resolve@^0.13.1":
+"@xmpp/resolve@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.13.3.tgz#0e965032e00631ed9c78e9861fdac51e536ab19a"
   integrity sha512-HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ==
@@ -1947,35 +1978,35 @@
     "@xmpp/xml" "^0.13.3"
     node-fetch "^3.3.2"
 
-"@xmpp/resource-binding@^0.13.1":
+"@xmpp/resource-binding@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz#15e67c76acf39c902364408691d057c8f1ef4064"
   integrity sha512-cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ==
   dependencies:
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/sasl-anonymous@^0.13.1":
+"@xmpp/sasl-anonymous@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz#d6ea4eb6febe8a8c1a7c0578d5798f930b4778ef"
   integrity sha512-0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q==
   dependencies:
     sasl-anonymous "^0.1.0"
 
-"@xmpp/sasl-plain@^0.13.1":
+"@xmpp/sasl-plain@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz#e4ce2dba38d1960a4dbe70ffea8cada2e69eadef"
   integrity sha512-zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg==
   dependencies:
     sasl-plain "^0.1.0"
 
-"@xmpp/sasl-scram-sha-1@^0.13.1":
+"@xmpp/sasl-scram-sha-1@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz#47f240ce25a200004696f76dde5e376db86f04b7"
   integrity sha512-qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ==
   dependencies:
     sasl-scram-sha-1 "^1.3.0"
 
-"@xmpp/sasl@^0.13.1":
+"@xmpp/sasl@^0.13.6":
   version "0.13.6"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.6.tgz#b6a1948ae56db5cea6aee362c6ddd63d5d6ea6e1"
   integrity sha512-0WueO7QlHK1F0K7iaC/zW60Y6NIjOccHZlb1WRS1jdHmHqwTLWM8AQTAZMvtxWLDz8oUDiVUKEOJTdIvy9bXow==
@@ -1985,14 +2016,14 @@
     "@xmpp/xml" "^0.13.3"
     saslmechanisms "^0.1.1"
 
-"@xmpp/session-establishment@^0.13.1":
+"@xmpp/session-establishment@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz#2ab32981292b4c747ce54753d22925d1678c6415"
   integrity sha512-dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA==
   dependencies:
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/starttls@^0.13.1":
+"@xmpp/starttls@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.13.3.tgz#2e5202e2877e7b277597c79f186987a0c3b7689e"
   integrity sha512-FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ==
@@ -2001,26 +2032,26 @@
     "@xmpp/tls" "^0.13.3"
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/stream-features@^0.13.1":
+"@xmpp/stream-features@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.13.2.tgz#3554050b38b708289c85254b4fe4fcb52086e26b"
   integrity sha512-eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg==
 
-"@xmpp/stream-management@^0.13.1":
+"@xmpp/stream-management@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/stream-management/-/stream-management-0.13.3.tgz#e6119c3711e2c6f5ffb348471cddc640b6ff266f"
   integrity sha512-hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg==
   dependencies:
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/tcp@^0.13.1":
+"@xmpp/tcp@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.13.3.tgz#7dad798e71e875fffb5794816b11eba1f6379196"
   integrity sha512-WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ==
   dependencies:
     "@xmpp/connection-tcp" "^0.13.3"
 
-"@xmpp/tls@^0.13.1", "@xmpp/tls@^0.13.3":
+"@xmpp/tls@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.13.3.tgz#e978a3de0bbb717655cda0563ebab5bef8ca5148"
   integrity sha512-oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg==
@@ -2028,7 +2059,7 @@
     "@xmpp/connection" "^0.13.3"
     "@xmpp/connection-tcp" "^0.13.3"
 
-"@xmpp/websocket@^0.13.1":
+"@xmpp/websocket@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.13.3.tgz#0418d1ab276b73a198876a8fcbdf773f3bad5b26"
   integrity sha512-RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw==
@@ -2110,41 +2141,38 @@ acorn@^8.15.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
-aedes-packet@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-1.0.0.tgz#2eea46f97c925b0a1f4d03f4f1fe5ef887b100f1"
-  integrity sha512-zGcB+O60jjgSo5dGZd9wnSfQWi0oqBFQDe9Br0vqWaSVtkOc0zkLg0xRKSppbly56J6q9EHSteHdrHjW90+h4A==
-
-aedes-persistence@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-6.0.0.tgz#e9eb15288a3be1a8e9fc7f231df2237ca0978eb1"
-  integrity sha512-LVk80Mg6bCfQgbcyo16ipuFo5KdORVxtzFAMmaisE3Hkydwt5H9I02gmF5IPADF5zPk0RfYxumQ4IIV1+jEp7Q==
+aedes-packet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-3.0.0.tgz#402868a6768dfaf1221a743a0a521244fbc7416b"
+  integrity sha512-swASey0BxGs4/npZGWoiVDmnEyPvVFIRY6l2LVKL4rbiW8IhcIGDLfnb20Qo8U20itXlitAKPQ3MVTEbOGG5ZA==
   dependencies:
-    aedes-packet "^1.0.0"
-    from2 "^2.1.0"
-    qlobber "^3.0.2"
+    mqtt-packet "^7.0.0"
 
-aedes@0.39.0:
-  version "0.39.0"
-  resolved "https://registry.yarnpkg.com/aedes/-/aedes-0.39.0.tgz#125e2f1e53a600f3a0bfde26431997deed27f117"
-  integrity sha512-AV7pN4Ogt4tNNgNNabKjsC7Cw7bMMNjQH1hua4zQV0TFf/QEBPVu1YDZMH3Lrrt2XziydQzmBrBc5aAQvAq5FQ==
+aedes-persistence@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-9.1.2.tgz#9fb4ab373a96ed17bce62414721b1b3843dc5685"
+  integrity sha512-2Wlr5pwIK0eQOkiTwb8ZF6C20s8UPUlnsJ4kXYePZ3JlQl0NbBA176mzM8wY294BJ5wybpNc9P5XEQxqadRNcQ==
   dependencies:
-    aedes-packet "^1.0.0"
-    aedes-persistence "^6.0.0"
-    bulk-write-stream "^2.0.0"
-    end-of-stream "^1.4.1"
+    aedes-packet "^3.0.0"
+    qlobber "^7.0.0"
+
+aedes@0.51.3:
+  version "0.51.3"
+  resolved "https://registry.yarnpkg.com/aedes/-/aedes-0.51.3.tgz#cd393d6e427ada6f6ae2fcd2df53a2744c86cad8"
+  integrity sha512-aQfiI9w3RbqnowNCdcGMmCtxBFXN9bhJFcuZm24U5/NU06V3MCl42jWK2GUnu8rOypR2Ahi/aEcgq3w7CMcycg==
+  dependencies:
+    aedes-packet "^3.0.0"
+    aedes-persistence "^9.1.2"
+    end-of-stream "^1.4.4"
     fastfall "^1.5.1"
-    fastparallel "^2.3.0"
-    fastseries "^1.7.2"
-    from2 "^2.3.0"
-    mqemitter "^3.0.0"
-    mqtt-packet "^6.1.2"
-    pump "^3.0.0"
-    retimer "^2.0.0"
+    fastparallel "^2.4.1"
+    fastseries "^2.0.0"
+    hyperid "^3.2.0"
+    mqemitter "^6.0.0"
+    mqtt-packet "^9.0.0"
+    retimer "^4.0.0"
     reusify "^1.0.4"
-    shortid "^2.2.14"
-    through2 "^3.0.1"
-    uuid "^3.3.2"
+    uuid "^10.0.0"
 
 aes-js@^3.1.2:
   version "3.1.2"
@@ -2158,7 +2186,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agent-base@^7.0.2, agent-base@^7.1.2:
+agent-base@^7.1.2:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
   integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
@@ -2444,21 +2472,14 @@ aws4@^1.12.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
   integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
-axios@0.26.1, axios@^0.26.1:
+axios@0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
   integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
   dependencies:
     follow-redirects "^1.14.8"
 
-axios@^0.21.1:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^1.12.0, axios@^1.2.2:
+axios@^1.12.0, axios@^1.2.2, axios@^1.6.0, axios@^1.8.3:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.2.tgz#6c307390136cf7a2278d09cec63b136dfc6e6da7"
   integrity sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==
@@ -2468,9 +2489,9 @@ axios@^1.12.0, axios@^1.2.2:
     proxy-from-env "^1.1.0"
 
 b4a@^1.6.4:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.2.tgz#aefbe7aaf52fe53c3270f87cf72c33c61bc3174b"
-  integrity sha512-DyUOdz+E8R6+sruDpQNOaV0y/dBbV6X/8ZkxrDcR0Ifc3BgKlpgG0VAtfOozA0eMtJO5GGe9FsZhueLs00pTww==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.3.tgz#24cf7ccda28f5465b66aec2bac69e32809bf112f"
+  integrity sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==
 
 babel-plugin-jsx-pragmatic@^1.0.2:
   version "1.0.2"
@@ -2510,9 +2531,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.7.0.tgz#46596dae9c819c5891eb2dcc8186326ed5a6da54"
-  integrity sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.1.tgz#121afaeee9e9a8eb92e71d125bc85753d39913d0"
+  integrity sha512-oxSAxTS1hRfnyit2CL5QpAOS5ixfBjj6ex3yTNvXyY/kE719jQ/IjuESJBK2w5v4wwQRAHGseVJXx9QBYOtFGQ==
 
 base-64@^0.1.0:
   version "0.1.0"
@@ -2534,10 +2555,10 @@ base64url@3.x.x:
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
   integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
 
-baseline-browser-mapping@^2.8.3:
-  version "2.8.6"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz#c37dea4291ed8d01682f85661dbe87967028642e"
-  integrity sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==
+baseline-browser-mapping@^2.8.19:
+  version "2.8.20"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.20.tgz#6766cf270f3668d20b6712b9c54cc911b87da714"
+  integrity sha512-JMWsdF+O8Orq3EMukbUN1QfbLK9mX2CkUmQBcW2T0s8OmdAUL5LLM/6wFwSrqXzlXB13yhyK9gTKS1rIizOduQ==
 
 bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   version "1.0.2"
@@ -2600,6 +2621,16 @@ bl@^4.0.2, bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+bl@^6.0.8:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-6.1.4.tgz#107fb9c9a4d0507d8c064b50ba7036deee9fcfa6"
+  integrity sha512-ZV/9asSuknOExbM/zPPA8z00lc1ihPKWaStHkkQrxHNeYx+yY+TmF+v80dpv2G0mv3HVXBu7ryoAsxbFFhf4eg==
+  dependencies:
+    "@types/readable-stream" "^4.0.0"
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^4.2.0"
+
 block-stream2@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.1.0.tgz#ac0c5ef4298b3857796e05be8ebed72196fa054b"
@@ -2680,15 +2711,15 @@ browser-or-node@^2.1.1:
   integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browserslist@^4.24.0:
-  version "4.26.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.26.2.tgz#7db3b3577ec97f1140a52db4936654911078cef3"
-  integrity sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==
+  version "4.27.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.27.0.tgz#755654744feae978fbb123718b2f139bc0fa6697"
+  integrity sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==
   dependencies:
-    baseline-browser-mapping "^2.8.3"
-    caniuse-lite "^1.0.30001741"
-    electron-to-chromium "^1.5.218"
-    node-releases "^2.0.21"
-    update-browserslist-db "^1.1.3"
+    baseline-browser-mapping "^2.8.19"
+    caniuse-lite "^1.0.30001751"
+    electron-to-chromium "^1.5.238"
+    node-releases "^2.0.26"
+    update-browserslist-db "^1.1.4"
 
 bson@^1.1.4:
   version "1.1.6"
@@ -2722,7 +2753,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2755,14 +2786,6 @@ buildcheck@~0.0.6:
   resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
   integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
 
-bulk-write-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz#085bdc65caf19ceece4ff365fdb951ef0c6e3db8"
-  integrity sha512-XWOLjgHtpDasHfwM8oO4df1JoZwa7/OwTsXDzh4rUTo+9CowzeOFBZz43w+H14h1fyq+xl28tVIBrdjcjj4Gug==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
 byte-length@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/byte-length/-/byte-length-1.0.2.tgz#ba5a5909240b0121c079b7f7b15248d6f08223cc"
@@ -2846,10 +2869,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001741:
-  version "1.0.30001743"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz#50ff91a991220a1ee2df5af00650dd5c308ea7cd"
-  integrity sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==
+caniuse-lite@^1.0.30001751:
+  version "1.0.30001751"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz#dacd5d9f4baeea841641640139d2b2a4df4226ad"
+  integrity sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -2906,12 +2929,13 @@ chownr@^2.0.0:
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.6.tgz#8fe672437d01cd6c4561af5334e0cc50ff1955f7"
-  integrity sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.7.tgz#bd094bfef42634ccfd9e13b9fc73274997111e39"
+  integrity sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==
   dependencies:
     inherits "^2.0.4"
     safe-buffer "^5.2.1"
+    to-buffer "^1.2.2"
 
 clean-css@~5.3.2:
   version "5.3.3"
@@ -2969,7 +2993,7 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -2983,44 +3007,47 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
+color-convert@^3.0.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-3.1.2.tgz#cef9e0fd4cb90b07c14697b3fa70af9d7f4870f1"
+  integrity sha512-UNqkvCDXstVck3kdowtOTWROIJQwafjOfXSmddoDrXo4cewMKmusCeF22Q24zvjR8nwWib/3S/dfyzPItPEiJg==
+  dependencies:
+    color-name "^2.0.0"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-2.0.2.tgz#85054825a23e6d6f81d3503f660c4c4a2a15f04f"
+  integrity sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==
+
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.6.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
+color-string@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-2.1.2.tgz#db1dd52414cc9037ada8fa7d936b8e9f6c3366c9"
+  integrity sha512-RxmjYxbWemV9gKu4zPgiZagUxbH3RQpEIO77XoSSX0ivgABDZ+h8Zuash/EMFLTI4N9QgFPOJ6JQpPZKFxa+dA==
   dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
+    color-name "^2.0.0"
 
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^3.1.3:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
-  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
+color@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/color/-/color-5.0.2.tgz#712ec894007ab27b37207732d182784e001b4a3d"
+  integrity sha512-e2hz5BzbUPcYlIRHo8ieAhYgoajrJr+hWoceg6E345TPsATMUKqDgzt8fSXZJJbxfpiPzkWyphz8yn8At7q3fA==
   dependencies:
-    color-convert "^1.9.3"
-    color-string "^1.6.0"
-
-colorspace@1.1.x:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243"
-  integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==
-  dependencies:
-    color "^3.1.3"
-    text-hex "1.0.x"
+    color-convert "^3.0.1"
+    color-string "^2.0.0"
 
 combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
@@ -3163,9 +3190,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.45.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.45.1.tgz#5810e04a1b4e9bc5ddaa4dd12e702ff67300634d"
-  integrity sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==
+  version "3.46.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.46.0.tgz#323a092b96381a9184d0cd49ee9083b2f93373bb"
+  integrity sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3453,19 +3480,19 @@ destroy@1.2.0:
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-libc@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.1.tgz#9f1e511ace6bb525efea4651345beac424dac7b9"
-  integrity sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
 discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   version "0.37.120"
   resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34"
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
-discord-api-types@^0.38.1, discord-api-types@^0.38.16:
-  version "0.38.26"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.26.tgz#d30f6bf0a4725b0a5ea46e0a12cef0b8880bbc9a"
-  integrity sha512-xpmPviHjIJ6dFu1eNwNDIGQ3N6qmPUUYFVAx/YZ64h7ZgPkTcKjnciD8bZe8Vbeji7yS5uYljyciunpq0J5NSw==
+discord-api-types@^0.38.1, discord-api-types@^0.38.26:
+  version "0.38.31"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.31.tgz#023c7f18662dc4a44a22798300f44e4b148cafb1"
+  integrity sha512-kC94ANsk8ackj8ENTuO8joTNEL0KtymVhHy9dyEC/s4QAZ7GCx40dYEzQaadyo8w+oP0X8QydE/nzAWRylTGtQ==
 
 discord.js@14.6.0:
   version "14.6.0"
@@ -3579,10 +3606,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.218:
-  version "1.5.223"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.223.tgz#cf9b1aebba1c8ee5e50d1c9e198229e15bc87b28"
-  integrity sha512-qKm55ic6nbEmagFlTFczML33rF90aU+WtrJ9MdTCThrcvDNdUHN4p6QfVN78U06ZmguqXIyMPyYhw2TrbDUwPQ==
+electron-to-chromium@^1.5.238:
+  version "1.5.240"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.240.tgz#bfd946570a723aa3754370065d02e23e30824774"
+  integrity sha512-OBwbZjWgrCOH+g6uJsA2/7Twpas2OlepS9uvByJjR2datRDuKGYeD+nP8lBBks2qnB7bGJNHDUx7c/YLaT3QMQ==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3621,7 +3648,7 @@ encoding@^0.1.12:
   dependencies:
     iconv-lite "^0.6.2"
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
   integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
@@ -3958,6 +3985,14 @@ fast-fifo@^1.2.0, fast-fifo@^1.3.2:
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
   integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
+fast-unique-numbers@^8.0.13:
+  version "8.0.13"
+  resolved "https://registry.yarnpkg.com/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz#3c87232061ff5f408a216e1f0121232f76f695d7"
+  integrity sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==
+  dependencies:
+    "@babel/runtime" "^7.23.8"
+    tslib "^2.6.2"
+
 fast-xml-parser@5.2.5:
   version "5.2.5"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a"
@@ -3979,7 +4014,7 @@ fastfall@^1.5.1:
   dependencies:
     reusify "^1.0.0"
 
-fastparallel@^2.3.0:
+fastparallel@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.1.tgz#0d984a5813ffa67f30b4a5cb4cb8cbe61c7ee5a5"
   integrity sha512-qUmhxPgNHmvRjZKBFUNI0oZuuH9OlSIOXmJ98lhKPxMZZ7zS/Fi0wRHOihDSz0R1YiIOjxzOY4bq65YTcdBi2Q==
@@ -3987,13 +4022,10 @@ fastparallel@^2.3.0:
     reusify "^1.0.4"
     xtend "^4.0.2"
 
-fastseries@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/fastseries/-/fastseries-1.7.2.tgz#d22ce13b9433dff3388d91dbd6b8bda9b21a0f4b"
-  integrity sha512-dTPFrPGS8SNSzAt7u/CbMKCJ3s01N04s4JFbORHcmyvVfVKmbhMD1VtRbh5enGHxkaQDqWyLefiKOGGmohGDDQ==
-  dependencies:
-    reusify "^1.0.0"
-    xtend "^4.0.0"
+fastseries@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fastseries/-/fastseries-2.0.0.tgz#d43eb975f6175dd83457d1d68fbd30f936ec7f2b"
+  integrity sha512-XBU9RXeoYc2/VnvMhplAxEmZLfIk7cvTBu+xwoBuTI8pL19E03cmca17QQycKIdxgwCeFA/a4u27gv1h3ya5LQ==
 
 faye-websocket@0.11.4:
   version "0.11.4"
@@ -4108,7 +4140,7 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.15.6:
+follow-redirects@^1.14.8, follow-redirects@^1.15.6:
   version "1.15.11"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
   integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
@@ -4195,14 +4227,6 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-from2@^2.1.0, from2@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -4298,6 +4322,11 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
+generator-function@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
+  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4324,7 +4353,7 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
-get-proto@^1.0.0, get-proto@^1.0.1:
+get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
   integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
@@ -4701,24 +4730,22 @@ http-signature@~1.4.0:
     jsprim "^2.0.2"
     sshpk "^1.18.0"
 
-http_ece@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/http_ece/-/http_ece-1.1.0.tgz#74780c6eb32d8ddfe9e36a83abcd81fe0cd4fb75"
-  integrity sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==
-  dependencies:
-    urlsafe-base64 "~1.0.0"
+http_ece@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http_ece/-/http_ece-1.2.0.tgz#84d5885f052eae8c9b075eee4d2eb5105f114479"
+  integrity sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==
 
 httpreq@*:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-1.1.1.tgz#b8818316cdfd6b1bfb0f68b822fa1306cd24be68"
   integrity sha512-uhSZLPPD2VXXOSN8Cni3kIsoFHaU2pT/nySEU/fHr/ePbqHYr0jeiQRmUKLEirC09SFPsdMoA7LU7UXMd/w0Kw==
 
-https-proxy-agent@7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
-  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
+https-proxy-agent@7.0.6, https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
   dependencies:
-    agent-base "^7.0.2"
+    agent-base "^7.1.2"
     debug "4"
 
 https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
@@ -4729,14 +4756,6 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
-  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
-  dependencies:
-    agent-base "^7.1.2"
-    debug "4"
-
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -4744,6 +4763,15 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+hyperid@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hyperid/-/hyperid-3.3.0.tgz#2042bb296b7f1d5ba0797a5705469af0899c8556"
+  integrity sha512-7qhCVT4MJIoEsNcbhglhdmBKb09QtcmJNiIQGq7js/Khf5FtQQ9bzcAuloeqBeee7XD7JqDeve9KNlQya5tSGQ==
+  dependencies:
+    buffer "^5.2.1"
+    uuid "^8.3.2"
+    uuid-parse "^1.1.0"
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4758,6 +4786,13 @@ iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+iconv-lite@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.0.tgz#c50cd80e6746ca8115eb98743afa81aa0e147a3e"
+  integrity sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -4894,11 +4929,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-arrayish@^0.3.1:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.4.tgz#1ee5553818511915685d33bb13d31bf854e5059d"
-  integrity sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==
-
 is-async-function@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
@@ -4942,7 +4972,7 @@ is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.16.0:
+is-core-module@^2.16.1:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
   integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
@@ -4996,12 +5026,13 @@ is-fullwidth-code-point@^3.0.0:
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-function@^1.0.10, is-generator-function@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
-  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
+  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
   dependencies:
-    call-bound "^1.0.3"
-    get-proto "^1.0.0"
+    call-bound "^1.0.4"
+    generator-function "^2.0.0"
+    get-proto "^1.0.1"
     has-tostringtag "^1.0.2"
     safe-regex-test "^1.1.0"
 
@@ -5503,7 +5534,7 @@ loadavg-windows@1.1.1:
   dependencies:
     weak-daemon "1.0.3"
 
-localforage@^1.9.0:
+localforage@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
   integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
@@ -5614,7 +5645,7 @@ lru-cache@6.0.0, lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^10.2.0, lru-cache@^10.3.0:
+lru-cache@^10.2.0, lru-cache@^10.4.3:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
@@ -5687,16 +5718,16 @@ make-fetch-happen@^9.1.0:
     socks-proxy-agent "^6.0.0"
     ssri "^8.0.0"
 
-mariadb@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.4.0.tgz#3dc2e918f000b39df9e1c2139604a4b2ebaa8d1c"
-  integrity sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==
+mariadb@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.4.5.tgz#27ccfcb4fab3d7805ec4e365ff61f76fe7bd8c70"
+  integrity sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==
   dependencies:
-    "@types/geojson" "^7946.0.14"
-    "@types/node" "^22.5.4"
+    "@types/geojson" "^7946.0.16"
+    "@types/node" "^24.0.13"
     denque "^2.1.0"
     iconv-lite "^0.6.3"
-    lru-cache "^10.3.0"
+    lru-cache "^10.4.3"
 
 math-intrinsics@^1.1.0:
   version "1.1.0"
@@ -5821,10 +5852,10 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==
 
-minio@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.2.tgz#ea1703ff52dcf610ba6d4e2ece8c5627f664d581"
-  integrity sha512-7ipWbtgzzboctf+McK+2cXwCrNOhuboTA/O1g9iWa0gH8R4GkeyFWwk12aVDEHdzjPiG8wxnjwfHS7pgraKuHw==
+minio@8.0.6:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.6.tgz#ec736e3e3ead1f450af5b9b28256c28e52a83dd0"
+  integrity sha512-sOeh2/b/XprRmEtYsnNRFtOqNRTPDvYtMWh+spWlfsuCV/+IdxNeKVUMKLqI7b5Dr07ZqCPuaRGU/rB9pZYVdQ==
   dependencies:
     async "^3.2.4"
     block-stream2 "^2.1.0"
@@ -5976,23 +6007,32 @@ mongojs@3.1.0:
     thunky "^1.1.0"
     to-mongodb-core "^2.0.0"
 
-mqemitter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mqemitter/-/mqemitter-3.0.0.tgz#427733ce397be39304c2279bd84358d5525cf577"
-  integrity sha512-1HduoiTFngBGFEKCGvfCpGfPM/3g58xtDW9fmuHpbnRieC01uAi3yJE/F1YsUrzH8p441l10kosYzi3HhJYnrQ==
+mqemitter@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/mqemitter/-/mqemitter-6.0.2.tgz#f99ab435de886082e005e1577d1070cecc63f695"
+  integrity sha512-8RGlznQx/Nb1xC3xKUFXHWov7pn7JdH++YVwlr6SLT6k3ft1h+ImGqZdVudbdKruFckIq9wheq9s4hgCivJDow==
   dependencies:
-    fastparallel "^2.3.0"
-    qlobber "^3.1.0"
+    fastparallel "^2.4.1"
+    qlobber "^8.0.1"
 
-mqtt-packet@^6.1.2:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-6.10.0.tgz#c8b507832c4152e3e511c0efa104ae4a64cd418f"
-  integrity sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==
+mqtt-packet@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-7.1.2.tgz#80364910a99de5d127d0b0c9a915cfb6111790bf"
+  integrity sha512-FFZbcZ2omsf4c5TxEQfcX9hI+JzDpDKPT46OmeIBpVA7+t32ey25UNqlqNXTmeZOr5BLsSIERpQQLsFWJS94SQ==
   dependencies:
     bl "^4.0.2"
     debug "^4.1.1"
     process-nextick-args "^2.0.1"
 
+mqtt-packet@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-9.0.2.tgz#fe6ae2c36fe3f269d11b3fe663b53648f3b3700a"
+  integrity sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==
+  dependencies:
+    bl "^6.0.8"
+    debug "^4.3.4"
+    process-nextick-args "^2.0.1"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6022,15 +6062,15 @@ mute-stream@0.0.5:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
   integrity sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==
 
-mysql2@3.11.4:
-  version "3.11.4"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.11.4.tgz#08658b6285adbace7d43b2eaa18efddb85f99501"
-  integrity sha512-Z2o3tY4Z8EvSRDwknaC40MdZ3+m0sKbpnXrShQLdxPrAvcNli7jLrD2Zd2IzsRMw4eK9Yle500FDmlkIqp+krg==
+mysql2@3.15.1:
+  version "3.15.1"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.15.1.tgz#c04e3b944768132618bded85b7cf2fa8397033e0"
+  integrity sha512-WZMIRZstT2MFfouEaDz/AGFnGi1A2GwaDe7XvKTdRJEYiAHbOrh4S3d8KFmQeh11U85G+BFjIvS1Di5alusZsw==
   dependencies:
     aws-ssl-profiles "^1.1.1"
     denque "^2.1.0"
     generate-function "^2.3.1"
-    iconv-lite "^0.6.3"
+    iconv-lite "^0.7.0"
     long "^5.2.1"
     lru.min "^1.0.0"
     named-placeholders "^1.1.3"
@@ -6044,16 +6084,11 @@ named-placeholders@^1.1.3:
   dependencies:
     lru-cache "^7.14.1"
 
-nan@^2.13.2, nan@^2.19.0, nan@^2.20.0:
+nan@^2.13.2, nan@^2.19.0, nan@^2.23.0:
   version "2.23.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.23.0.tgz#24aa4ddffcc37613a2d2935b97683c1ec96093c6"
   integrity sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==
 
-nanoid@^3.3.8:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
-
 napi-build-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e"
@@ -6098,9 +6133,9 @@ no-case@^3.0.4:
     tslib "^2.0.3"
 
 node-abi@^3.3.0:
-  version "3.77.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.77.0.tgz#3ad90d5c9d45663420e5aa4ff58dbf4e3625419a"
-  integrity sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==
+  version "3.78.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.78.0.tgz#fd0ecbd0aa89857b98da06bd3909194abb0821ba"
+  integrity sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==
   dependencies:
     semver "^7.3.5"
 
@@ -6183,10 +6218,10 @@ node-pushover@1.0.0:
   dependencies:
     httpreq "*"
 
-node-releases@^2.0.21:
-  version "2.0.21"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.21.tgz#f59b018bc0048044be2d4c4c04e4c8b18160894c"
-  integrity sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==
+node-releases@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.26.tgz#fdfa272f2718a1309489d18aef4ef5ba7f5dfb52"
+  integrity sha512-S2M9YimhSjBSvYnlr5/+umAnPHE++ODwt5e2Ij6FoX45HA/s4vHdkDx1eax2pAPeAOqu4s9b7ppahsyEFdVqQA==
 
 node-sspi@0.2.10:
   version "0.2.10"
@@ -6201,14 +6236,14 @@ node-uuid@~1.4.0:
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
   integrity sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==
 
-node-vault@0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/node-vault/-/node-vault-0.10.2.tgz#d5629c2e88744183474bba2ce54e1e08c4d15e8e"
-  integrity sha512-//uc9/YImE7Dx0QHdwMiAzLaOumiKUnOUP8DymgtkZ8nsq6/V2LKvEu6kw91Lcruw8lWUfj4DO7CIXNPRWBuuA==
+node-vault@0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/node-vault/-/node-vault-0.10.5.tgz#f86818435387ddb4508875120c06096ec09cdaa3"
+  integrity sha512-sIyB/5296U2tMT7hH1nrkoYUXkRxuLsG40fgUHaBhzM+G/uyBKBo+QNsvKqE5FNq24QJM+tr97N+knLQiEEcSg==
   dependencies:
     debug "^4.3.4"
     mustache "^4.2.0"
-    postman-request "^2.88.1-postman.33"
+    postman-request "^2.88.1-postman.42"
     tv4 "^1.3.0"
 
 node-windows@0.1.14:
@@ -6716,12 +6751,12 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-pg-cloudflare@^1.1.1:
+pg-cloudflare@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef"
   integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==
 
-pg-connection-string@^2.7.0:
+pg-connection-string@^2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.1.tgz#bb1fd0011e2eb76ac17360dc8fa183b2d3465238"
   integrity sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==
@@ -6731,17 +6766,17 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^3.8.0:
+pg-pool@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.1.tgz#481047c720be2d624792100cac1816f8850d31b2"
   integrity sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==
 
-pg-protocol@^1.8.0:
+pg-protocol@^1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.3.tgz#ac9e4778ad3f84d0c5670583bab976ea0a34f69f"
   integrity sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==
 
-pg-types@^2.1.0:
+pg-types@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
   integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
@@ -6752,20 +6787,20 @@ pg-types@^2.1.0:
     postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@8.14.1:
-  version "8.14.1"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.14.1.tgz#2e3d1f287b64797cdfc8d1ba000f61a7ff8d66ed"
-  integrity sha512-0TdbqfjwIun9Fm/r89oB7RFQ0bLgduAhiIqIXOsyKoiC/L54DbuAAzIEN/9Op0f1Po9X7iCPXGoa/Ah+2aI8Xw==
+pg@8.16.3:
+  version "8.16.3"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.16.3.tgz#160741d0b44fdf64680e45374b06d632e86c99fd"
+  integrity sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==
   dependencies:
-    pg-connection-string "^2.7.0"
-    pg-pool "^3.8.0"
-    pg-protocol "^1.8.0"
-    pg-types "^2.1.0"
-    pgpass "1.x"
+    pg-connection-string "^2.9.1"
+    pg-pool "^3.10.1"
+    pg-protocol "^1.10.3"
+    pg-types "2.2.0"
+    pgpass "1.0.5"
   optionalDependencies:
-    pg-cloudflare "^1.1.1"
+    pg-cloudflare "^1.2.7"
 
-pgpass@1.x:
+pgpass@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
   integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
@@ -6804,13 +6839,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-plivo@4.58.0:
-  version "4.58.0"
-  resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.58.0.tgz#bd6b2ded17319049f6a1d2dde7985b2ff7ae93db"
-  integrity sha512-AFxxxYgVaqx+09aDZoLeg5Tv7xPI7CBU/f3DOtvOVbFnqZZZByPTkuGzUZ3oeit7+yTklzQt4o5DfpNDB9LgNA==
+plivo@4.75.1:
+  version "4.75.1"
+  resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.75.1.tgz#c9d0e8fdb47f4072edc989e139140e687bac5fd8"
+  integrity sha512-u6SOF1s3ccdp5v7yl8RYmZUHmnUfsNHsE5DRe4XLozaJlObsKG45kEYliMNTHTHZ6GEdc6Wm8hsD0ZcfIhkn7g==
   dependencies:
     "@types/node" "^14.14.14"
-    axios "^0.21.1"
+    axios "^1.8.3"
     base-64 "^0.1.0"
     build-url "^1.0.10"
     form-data "^4.0.0"
@@ -6851,10 +6886,10 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-postman-request@^2.88.1-postman.33:
-  version "2.88.1-postman.43"
-  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.43.tgz#98aef15a01003d86cd943f844fa2bf6b11434fed"
-  integrity sha512-5ivoZnMvnX47/HA7mk2GQubZsnXptlJGVyO0hLV3MTK/MDgJVnB/q3bUgzU4KhwG8OBxe2L8uqv3ZpK6mp+RdA==
+postman-request@^2.88.1-postman.42:
+  version "2.88.1-postman.45"
+  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.45.tgz#c91b071acf260d682040a2e4b337166e8a3395bc"
+  integrity sha512-Fn4Lh1sgA1IUQz4W64dXEaU/kLmB5LbTLOycR567i9BStpn5/0j5PJTwURAfQ0XPpEKAPDfrz5PzBud1TJ1XGg==
   dependencies:
     "@postman/form-data" "~3.1.1"
     "@postman/tough-cookie" "~4.1.3-postman.1"
@@ -6910,7 +6945,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-prom-client@*:
+prom-client@15.1.3:
   version "15.1.3"
   resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.3.tgz#69fa8de93a88bc9783173db5f758dc1c69fa8fc2"
   integrity sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==
@@ -6994,10 +7029,15 @@ punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qlobber@^3.0.2, qlobber@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211"
-  integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug==
+qlobber@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-7.0.1.tgz#2346664844d35cb99b8d80c8dc8a74264c078c69"
+  integrity sha512-FsFg9lMuMEFNKmTO9nV7tlyPhx8BmskPPjH2akWycuYVTtWaVwhW5yCHLJQ6Q+3mvw5cFX2vMfW2l9z2SiYAbg==
+
+qlobber@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-8.0.1.tgz#8a8ef18401ca451c9ebc2afe58a1b04c38f476ca"
+  integrity sha512-O+Wd1chXj5YE1DwmD+ae0bXiSLehmnS3czlC1R9FL/Nt/3q8uMS1bIHmg2lJfCoiimCxClWM8AAuJrF0EvNiog==
 
 qs@6.13.0:
   version "6.13.0"
@@ -7097,7 +7137,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
+readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -7106,7 +7146,7 @@ read-pkg@^3.0.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.8:
+readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -7119,7 +7159,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^4.0.0, readable-stream@^4.7.0:
+readable-stream@^4.0.0, readable-stream@^4.2.0, readable-stream@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.7.0.tgz#cedbd8a1146c13dfff8dab14068028d58c15ac91"
   integrity sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==
@@ -7257,11 +7297,11 @@ resolve-from@^4.0.0:
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve@^1.10.0:
-  version "1.22.10"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
-  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
+  version "1.22.11"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
+  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
   dependencies:
-    is-core-module "^2.16.0"
+    is-core-module "^2.16.1"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -7273,10 +7313,12 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
-retimer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz#e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca"
-  integrity sha512-KLXY85WkEq2V2bKex/LOO1ViXVn2KGYe4PYysAdYdjmraYIUsVkXu8O4am+8+5UbaaGl1qho4aqAAPHNQ4GSbg==
+retimer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/retimer/-/retimer-4.0.0.tgz#41a8c09710281013ee83ef3a5f8279c02b5a4a8e"
+  integrity sha512-fZIVtvbOsQsxNSDhpdPOX4lx5Ss2ni+S72AUBitARpFhtA3UzrAjQ6gDtypB2/+l7L+1VQgAgpvAKY66mElH0w==
+  dependencies:
+    worker-timers "^7.0.75"
 
 retry-request@^7.0.0:
   version "7.0.2"
@@ -7455,9 +7497,9 @@ semver@^6.0.0, semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.5, semver@^7.5.4:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
-  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
 send@0.19.0:
   version "0.19.0"
@@ -7562,13 +7604,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shortid@^2.2.14:
-  version "2.2.17"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.17.tgz#ea87297a36b7edd10a57818fbac5be798e0994bb"
-  integrity sha512-GpbM3gLF1UUXZvQw6MCyulHkWbRseNO4cyBEZresZRorwl1+SLu1ZdqgVtuwqz8mB6RpwPkm541mYSqrKyJSaA==
-  dependencies:
-    nanoid "^3.3.8"
-
 side-channel-list@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
@@ -7633,13 +7668,6 @@ simple-get@^4.0.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-swizzle@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.4.tgz#a8d11a45a11600d6a1ecdff6363329e3648c3667"
-  integrity sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==
-  dependencies:
-    is-arrayish "^0.3.1"
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -7783,16 +7811,16 @@ sqlstring@^2.3.2:
   resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
   integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
 
-ssh2@1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.16.0.tgz#79221d40cbf4d03d07fe881149de0a9de928c9f0"
-  integrity sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==
+ssh2@1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.17.0.tgz#dc686e8e3abdbd4ad95d46fa139615903c12258c"
+  integrity sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==
   dependencies:
     asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
     cpu-features "~0.0.10"
-    nan "^2.20.0"
+    nan "^2.23.0"
 
 sshpk@^1.18.0:
   version "1.18.0"
@@ -8142,10 +8170,10 @@ teeny-request@^9.0.0:
     stream-events "^1.0.5"
     uuid "^9.0.0"
 
-telegram@2.19.8:
-  version "2.19.8"
-  resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.19.8.tgz#d6c0217e67e2cc9513e4904c033ecd4b296293f7"
-  integrity sha512-yaBRPILM0FSEbKKcnMR4Q463DpasAGOvUEcGrlW7xmYMAEntxIdoFLXrZnpNDaubncx6lc1M9cecMvlTkg6taQ==
+telegram@2.26.22:
+  version "2.26.22"
+  resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.26.22.tgz#16beb73e52403b5d5bcc4602226e39dc24217333"
+  integrity sha512-EIj7Yrjiu0Yosa3FZ/7EyPg9s6UiTi/zDQrFmR/2Mg7pIUU+XjAit1n1u9OU9h2oRnRM5M+67/fxzQluZpaJJg==
   dependencies:
     "@cryptography/aes" "^0.1.1"
     async-mutex "^0.3.0"
@@ -8213,14 +8241,6 @@ thirty-two@^1.0.2:
   resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a"
   integrity sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==
 
-through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
 through2@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -8243,10 +8263,10 @@ tiny-inflate@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
   integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
 
-to-buffer@^1.2.0, to-buffer@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
-  integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
+to-buffer@^1.2.0, to-buffer@^1.2.1, to-buffer@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133"
+  integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==
   dependencies:
     isarray "^2.0.5"
     safe-buffer "^5.2.1"
@@ -8358,12 +8378,12 @@ tweetnacl@^1.0.1:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
-twilio@4.19.0:
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.19.0.tgz#b0cc25eb397490ed3e41f031ab5c79697a9065ee"
-  integrity sha512-4tM1LNM5LeUvnko4kIqIreY6vmjIo5Ag5jMEhjTDPj+GES82MnkfSkJv8N1k5/ZmeSvIdk5hjI87GB/DpDDePQ==
+twilio@4.23.0:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.23.0.tgz#46b69c231fc7aa9488a7bde09b8659da8c459a56"
+  integrity sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==
   dependencies:
-    axios "^0.26.1"
+    axios "^1.6.0"
     dayjs "^1.11.9"
     https-proxy-agent "^5.0.0"
     jsonwebtoken "^9.0.0"
@@ -8479,10 +8499,10 @@ undici-types@~6.21.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
   integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
 
-undici-types@~7.12.0:
-  version "7.12.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.12.0.tgz#15c5c7475c2a3ba30659529f5cdb4674b622fafb"
-  integrity sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==
+undici-types@~7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
+  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
 
 undici@^5.11.0, undici@^5.22.0:
   version "5.29.0"
@@ -8520,10 +8540,10 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
-  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
+update-browserslist-db@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz#7802aa2ae91477f255b86e0e46dbc787a206ad4a"
+  integrity sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==
   dependencies:
     escalade "^3.2.0"
     picocolors "^1.1.1"
@@ -8551,11 +8571,6 @@ url-template@^2.0.8:
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
   integrity sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==
 
-urlsafe-base64@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz#23f89069a6c62f46cf3a1d3b00169cefb90be0c6"
-  integrity sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==
-
 utf-8-validate@^5.0.2, utf-8-validate@^5.0.5:
   version "5.0.10"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
@@ -8573,7 +8588,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util@^0.12.3, util@^0.12.4:
+util@^0.12.3, util@^0.12.5:
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
   integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
@@ -8589,6 +8604,11 @@ utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+uuid-parse@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
+  integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
+
 uuid@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
@@ -8675,13 +8695,13 @@ web-encoding@^1.1.5:
   optionalDependencies:
     "@zxing/text-encoding" "0.9.0"
 
-web-push@3.6.6:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.6.6.tgz#592facb26116187136b0d543768ef85675791ac8"
-  integrity sha512-SyteEck9fiCskNmPxs/GFhJsZrIyLfRvjWNmcUwULLJyCU0f1oxo2sWTokXA1mDAq9vxk4e4gVcb/8agq73NkQ==
+web-push@3.6.7:
+  version "3.6.7"
+  resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.6.7.tgz#5f5e645951153e37ef90a6ddea5c150ea0f709e1"
+  integrity sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==
   dependencies:
     asn1.js "^5.3.0"
-    http_ece "1.1.0"
+    http_ece "1.2.0"
     https-proxy-agent "^7.0.0"
     jws "^4.0.0"
     minimist "^1.2.5"
@@ -8884,12 +8904,12 @@ winston-transport@^4.9.0:
     triple-beam "^1.3.0"
 
 winston@^3.3.3:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.17.0.tgz#74b8665ce9b4ea7b29d0922cfccf852a08a11423"
-  integrity sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==
+  version "3.18.3"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.18.3.tgz#93ac10808c8e1081d723bc8811cd2f445ddfdcd1"
+  integrity sha512-NoBZauFNNWENgsnC9YpgyYwOVrl2m58PpQ8lNHjV3kosGs7KJ7Npk9pCUE+WJlawVSe8mykWDKWFSVfs3QO9ww==
   dependencies:
     "@colors/colors" "^1.6.0"
-    "@dabh/diagnostics" "^2.0.2"
+    "@dabh/diagnostics" "^2.0.8"
     async "^3.2.3"
     is-stream "^2.0.0"
     logform "^2.7.0"
@@ -8910,6 +8930,34 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==
 
+worker-timers-broker@^6.1.8:
+  version "6.1.8"
+  resolved "https://registry.yarnpkg.com/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz#08f64e5931b77fadc55f0c7388c077a7dd17e4c7"
+  integrity sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==
+  dependencies:
+    "@babel/runtime" "^7.24.5"
+    fast-unique-numbers "^8.0.13"
+    tslib "^2.6.2"
+    worker-timers-worker "^7.0.71"
+
+worker-timers-worker@^7.0.71:
+  version "7.0.71"
+  resolved "https://registry.yarnpkg.com/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz#f96138bafbcfaabea116603ce23956e05e76db6a"
+  integrity sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==
+  dependencies:
+    "@babel/runtime" "^7.24.5"
+    tslib "^2.6.2"
+
+worker-timers@^7.0.75:
+  version "7.1.8"
+  resolved "https://registry.yarnpkg.com/worker-timers/-/worker-timers-7.1.8.tgz#f53072c396ac4264fd3027914f4ab793c92d90be"
+  integrity sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==
+  dependencies:
+    "@babel/runtime" "^7.24.5"
+    tslib "^2.6.2"
+    worker-timers-broker "^6.1.8"
+    worker-timers-worker "^7.0.71"
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -8969,21 +9017,16 @@ write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-ws@8.18.0:
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
-  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
+ws@8.18.3, ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
 
 ws@^7.4.6:
   version "7.5.10"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
-  version "8.18.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
-  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
-
 xml-crypto@^2.1.3:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.6.tgz#c51a016cc8391fc1d9ebd9abc589e4c08b62d652"
diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 679ef32cef10..3971df2f37c6 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,64 +1,64 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.202.0";
+  version = "3.206.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-linux-x64.tar.gz";
-        sha256 = "118nzhyb6xh6x2qpqjvbdc9p7r2a84r52g69n8pfqik5y1fh0lnk";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-linux-x64.tar.gz";
+        sha256 = "1q6yrcq2cy81daknhqhx7kagg4wcrj057jgdnzssmhpazl5bnl79";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-amd64.tar.gz";
-        sha256 = "0ch4bwh7vmgswkspcg3bdvvz5n72swgnfpq9hnr06ac40r7mw264";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-linux-amd64.tar.gz";
+        sha256 = "1q7lny807ns4i6wzx9zybsnnkjr5k9hb6igzf3cmw6cg48qf1nqy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-linux-amd64.tar.gz";
-        sha256 = "0r7hc0vvf95a87pk6v4sm7m1i9li9ymhijvwsxzjdbpmjcp65ywg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-linux-amd64.tar.gz";
+        sha256 = "02c2i4kbbv24i6a3srsgzaxly0f6kkij2d58k61frsljffjmvkb9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-amd64.tar.gz";
-        sha256 = "10mz7gv2bm93hvkvqvhsvqhkcziyci2wbxmqj9ggplgv44k49w68";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-linux-amd64.tar.gz";
+        sha256 = "0z6rzkqk55870mqjnn6dx0l1lbxzs7jyp726ilb6vgcpzbgsl81y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-amd64.tar.gz";
         sha256 = "02pgy8m9f32ky69vs7kw7fn8b41l0y4w2gg7s15nw5c069vvnpy4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-amd64.tar.gz";
-        sha256 = "0032ax8kazj8gxmxz6sgffv5r7y67vp92xwzlfpq4y6jlqiapwi9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-linux-amd64.tar.gz";
+        sha256 = "0ck5gh2xjqm7dkjvvhcx58nrgd7ik9max9y1vv0kr6m7cr646p58";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-amd64.tar.gz";
-        sha256 = "1f1zj1m3alz9zvdab9fvqrlzjafzwx21wpnifi7fs3sf27p1vs2l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-linux-amd64.tar.gz";
+        sha256 = "0zc5rmi24k3h0xii26pxh76n9g3jljrnhav5hxhbxakw1819ww5m";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz";
-        sha256 = "1kvcw8163ghfnrdgc2rzvhfc9npfql7c2d6y6p32j6arwf7h2k4m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-linux-amd64.tar.gz";
+        sha256 = "162a1c80f3a20naljsz7v57npv96gzx84p7xspvpl2cydgn14ac8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-amd64.tar.gz";
-        sha256 = "0r0s72v99wx2ggb45ifs0hjy76nq8aa6z66zlxjb8wgda3yrsldz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-amd64.tar.gz";
+        sha256 = "0i952s6ib6k21fzwwa5cb5xrb280an4lyfk26szm4nvmyy623jf7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-amd64.tar.gz";
         sha256 = "0agh234zr757kx6b41k1q7p9rpzb3jv30nkyzs5xqhjnv44lky97";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-amd64.tar.gz";
-        sha256 = "0gjhdf6ai64k3kkdfvprpszc93b6yim622kk4m76s15kpcnnlnzz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-linux-amd64.tar.gz";
+        sha256 = "0wjn3qrpzr2irfz50vy9nh5jpn14rc6ddv1bx6byj5q14ldapw8w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-amd64.tar.gz";
-        sha256 = "00gkdgb6s0wqjl6m69sc8dz320aiy2s751qqn73894jyaqa8v9zk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-amd64.tar.gz";
+        sha256 = "1r0yrm3x1762ysbb3cm78avs8cjmsaqgknyypn7zmq1fr1hs6n22";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-linux-amd64.tar.gz";
-        sha256 = "1bgbnmkc0g4yqspv9bfn7zmyf0rykibyshmjrjmhr3q32jz9ffyg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-linux-amd64.tar.gz";
+        sha256 = "0y6s7hyj6zlnpjbahgm4zcb6iknhy2q6mamq639n214a22s1a1mp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-amd64.tar.gz";
-        sha256 = "1vd4wcpkwb01wb3916nna3wwqhbym234jj6ggyayw0mawhrx52rm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-linux-amd64.tar.gz";
+        sha256 = "1623gjdclwyvgavcmksjyb76k8a3arzdwsi8336san9dg3jxsdhq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-amd64.tar.gz";
@@ -69,44 +69,44 @@
         sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-linux-amd64.tar.gz";
-        sha256 = "0sm8gqay51g12l20n08pih9vhpm2b95aj71zj6nmqiq5gym89v6z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-linux-amd64.tar.gz";
+        sha256 = "1db5ji7dg3q2n5pmf0vaxj68p019q0j4whks827k6ph0q075r4xk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-linux-amd64.tar.gz";
-        sha256 = "04m8b9d1dsfm3kw3n214g46i946fgn56j0k10dzfa2l023y491gc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-linux-amd64.tar.gz";
+        sha256 = "1zw9qrx4byrxh12hpkyr2hjlg9q410h2s2c7yxdykxn0q29p3l1a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-amd64.tar.gz";
-        sha256 = "192bz3xl0hiy3k68fgcb9mw6j1hb6ngrahf53h8zb7agikzwiy3m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-linux-amd64.tar.gz";
+        sha256 = "19kw4m7nmwzs7722mb59hjis2mvrmzp8w64nf44l96n1vml4hcm2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-linux-amd64.tar.gz";
-        sha256 = "0bl8r0d2zyd2yfx1wv84gxjjq5mp2kw52sv4vqpqihmzvcwr0rcv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-amd64.tar.gz";
+        sha256 = "1ayscjrlsib4lgh86kp5c4acccqfm1wcv8d6p34rhd12xj1zw72h";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz";
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-amd64.tar.gz";
-        sha256 = "02dwixm2islad74jm7d3b7n1a9lsrm028np4j47s0959hmkqq7c1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-linux-amd64.tar.gz";
+        sha256 = "0gwaaszwbpvfrk67xxd7jck3h3nmh7y89h4vgfpc4d94jb68s1cd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-amd64.tar.gz";
-        sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-amd64.tar.gz";
+        sha256 = "12b143kpb54nc543gdazpbl4bnslamsvz60iby03g0fsxjwhswpr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-amd64.tar.gz";
         sha256 = "11zb5z8yzb87irf7sqc8b664wibicwk6vnmbshsrf41nv4lrys1r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-amd64.tar.gz";
-        sha256 = "1vvdn7p0m9kyb62r0g52ypidbm7060mhaz1iy0zd7915whxk900p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-linux-amd64.tar.gz";
+        sha256 = "123bfr7ydz560dzj49kjmrilc4n0r9ndq2lskx839m4vly8qwqzs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-amd64.tar.gz";
-        sha256 = "0sawhhcmnhgwdv3wl05z65parmrc74mgk2cpyhgp0hcvbpgagknj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-amd64.tar.gz";
+        sha256 = "05h57r3r5cwdb9pb4nh9k4y2rfww2csarqaydayi4qr2xwgq09p3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-amd64.tar.gz";
@@ -117,16 +117,16 @@
         sha256 = "1wyl8xr07b8gj933w7lxip36mc7xxqwb9i46826il7w67gb2vfb4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-amd64.tar.gz";
-        sha256 = "1n3ndir2n1pq4mmnbkiqvv0rf3w4dgz3a9b221vimsi2lks212kw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-linux-amd64.tar.gz";
+        sha256 = "12xw7fc5xsdbjlwbxwp0jdyv89l2af0hh6b2890fh1g83jp80rxs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-amd64.tar.gz";
-        sha256 = "18iaybm8sqg468a8fan2dm1lsyybch3l1wiawvz5qyh6ap5x2fv7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-linux-amd64.tar.gz";
+        sha256 = "1shl25vl3q8myzjjxnvcsq7jyd1l7w6gqy7fj83gahxbc3nlhab3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-amd64.tar.gz";
-        sha256 = "06znwpzjl5gxbsy55qvjz4g75ji90rljp5afmm5wsglcr2qi4ai6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-amd64.tar.gz";
+        sha256 = "05vxzsg0869rg0ap36pasxxwbslndns6jss9d0cydf8v0kna30hx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz";
@@ -141,20 +141,20 @@
         sha256 = "1vh28r2gk85a82c7jsa95n21my19hzavkyc9pjdpw517r63gvyjw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-amd64.tar.gz";
-        sha256 = "0vdrh5ss7vlmyv0a0mvrj2w9mrsazqrl7hcvwn5riym4ba0daq03";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-linux-amd64.tar.gz";
+        sha256 = "1wrsz1s727jhxwlympxqd0fdm93scl132lv8d5j0wd4z81lq67dx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-amd64.tar.gz";
         sha256 = "070kb73yix9aha55x9n4h6f4khp9a8wylqgvzdhsa7c7k35fx6q5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-amd64.tar.gz";
-        sha256 = "0p3rjsppf2zl7xwcs9qr2s262bxkilvzy8yi7nybydhfscl1rmrr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-linux-amd64.tar.gz";
+        sha256 = "1yr8pi9w343h555l6bxfzxrf04y7s4lxqnvjw89594nl30ldz866";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-amd64.tar.gz";
-        sha256 = "0pbf995jvp3fkvnqdv2ds0zf3yr88rh61i9q4ab7b3141hsghvha";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-linux-amd64.tar.gz";
+        sha256 = "0x71yr3hvpwhnvrj51fzvbyw9sbdzkb8l58a4xn2rg6xw1sbx23r";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz";
@@ -163,60 +163,60 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-darwin-x64.tar.gz";
-        sha256 = "0qrz36gn6rszklz2i4rshhzsfqiz3kndfmzmiqba764hanfddj77";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-darwin-x64.tar.gz";
+        sha256 = "057qfllfbwlga1g5w517rpl7nw6ngcsqn6azgy4r51vrfc01a9j8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-amd64.tar.gz";
-        sha256 = "095n5p8i3cgjma90930dhfj9bxqsydci1qyjh9fnsd6lk3sdqx02";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-darwin-amd64.tar.gz";
+        sha256 = "155q33fcnafhqygr0big2rk52rlc9a4zx1whlrlfpw1g1l8jsbdg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-darwin-amd64.tar.gz";
-        sha256 = "0mw37ncmm78j9gx7nw3400jrmzirqkwqhp957p36q193gnsd4747";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-darwin-amd64.tar.gz";
+        sha256 = "1xhsxzcjy689bg0zsbcv120j8a0bfn99vnfwid1y14yp5jc3f2gp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-amd64.tar.gz";
-        sha256 = "1b8lwjbvppj7ssncfwqync169ydz7m8wx3zkxdvc8yw4ggcl2kxs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-darwin-amd64.tar.gz";
+        sha256 = "0rcxnrwfyr38g9z611m4bpmdhbak1c82afarkax9yhyw20lbk6ma";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-amd64.tar.gz";
         sha256 = "09c2kdhad10c6g1j955dxkvvfapk6qqc8wdd69qcl85lkpgzn3cz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-amd64.tar.gz";
-        sha256 = "0xy3z460nw89i0zjj5bn0qwpqc18xcas4zk3wgvvrsk7v0jj1cin";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-darwin-amd64.tar.gz";
+        sha256 = "0dwplcrwadwxslwl944nfaz52d6d5l9gw2vh6wnqh27m72d84bkx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-amd64.tar.gz";
-        sha256 = "0iq60sxszffaqv6anh4hi2bx963k462g6y0ylpwx0662wi7d6m5w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-darwin-amd64.tar.gz";
+        sha256 = "1q1xdm0qbcbksr8v6azs8kfa7hv3qni8391i23lmx0653vfwcqya";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz";
-        sha256 = "1cdpx3540y3kp76ml1qi0awfzvm3172bzc76khdbsdcz9b8f3kb7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-darwin-amd64.tar.gz";
+        sha256 = "0z6d8a71k5r6vka7f446ik1xj6nxg1ibx76i0wslzh5lwq2ybsmh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-amd64.tar.gz";
-        sha256 = "124fk2mxxzc06dav25kk1wn8gqrys6607gg3nm53fk813wx76zg6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-amd64.tar.gz";
+        sha256 = "0a7lrp0xrpcd4hsnwcjzfbxihl0hcw39c6bhprpa4f1lzi4fdgv5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-amd64.tar.gz";
         sha256 = "0b7ryynm4np70d4si2i9jwjjqd1nd3b6m23fgv9c2cwwnrg2xmiz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-amd64.tar.gz";
-        sha256 = "0l1r3qdmf90g0fpi0jvac0v4phksnwqjhihx6rcnrcpc9ihfr2pa";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-darwin-amd64.tar.gz";
+        sha256 = "1m9mfb64b49q6a1z8dbyk8idd3zacnlrly8bsh4lpm0abjp2ms76";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-amd64.tar.gz";
-        sha256 = "1n3afyncwk16cbkc8wch3370z08b2vabpvpp8g55xarhqvqk1qpz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-amd64.tar.gz";
+        sha256 = "1p435crgs1cgqn9z7rplrdac60rwizk2ifxg2r9vpvcmv36z1c04";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-darwin-amd64.tar.gz";
-        sha256 = "1wgcbn02r9xv9lanfssm85ac9y1p712ba2jg2jh0hb9mmx7dvhrl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-darwin-amd64.tar.gz";
+        sha256 = "15jjn9hs0g63g484skwavyc7p9yi4z81qs3bfb2bmarnzmw21amc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-amd64.tar.gz";
-        sha256 = "1vpp01zh6g2p3s1x061hrkzl83qcahf5mw6cdhl0m0h425mbzvam";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-darwin-amd64.tar.gz";
+        sha256 = "1w7rbyh800vx13j05d3gkbqccl5ib64lczywvbz541ra03gnrcss";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-amd64.tar.gz";
@@ -227,44 +227,44 @@
         sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-darwin-amd64.tar.gz";
-        sha256 = "12yzgpz05pf1y401p94p063c2yj8i5mlmy5bxdd69n4537z17z02";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-darwin-amd64.tar.gz";
+        sha256 = "0l11xyy8ajxr8l7iyp2il3nahgidqydkg6qw20yqligppx75v59g";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-darwin-amd64.tar.gz";
-        sha256 = "1hphg8mhpgzmm9hz12fdpzjgrx35b4bhxinm74slw8fki3vpgqdl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-darwin-amd64.tar.gz";
+        sha256 = "16af5bj7i8pkz8idjgw0q876k22834icn3p6565jv1gbvxipsk3q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-amd64.tar.gz";
-        sha256 = "0bsfi36kihw2334gs39z9gwm6gwr0bypbcx7wfckj5zzml94jg6y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-darwin-amd64.tar.gz";
+        sha256 = "0hykd3azxymnriv7vlz57ckhycn5j1xnv4g56813bqi027iys158";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-darwin-amd64.tar.gz";
-        sha256 = "01kncjmknz9ynhjyp06gn5n1d8010k4riz2zzh2sgsq9icvphh3b";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-amd64.tar.gz";
+        sha256 = "0bwar26bw474k216659gqzc5ghk7pmww9s1pn24d230zp19g17ps";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-amd64.tar.gz";
-        sha256 = "1q3nhm48rdxh2br72l8lgdks5m869v2ia67gwchkzsjjrjiysbqh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-darwin-amd64.tar.gz";
+        sha256 = "0fxii20q2hwgwpbwchws91hq75lhhq4rgymwy0ik0a0xirn8xqha";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-amd64.tar.gz";
-        sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-amd64.tar.gz";
+        sha256 = "11ra4b2jd2gkd5fhfhaxkyxgg8hwlmzhh036fr8l69l93nawi8c7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-amd64.tar.gz";
         sha256 = "1v309axkjh9gv8cy3y7wpdq7b88129b5p5q030qdrk2hzalxvvrh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-amd64.tar.gz";
-        sha256 = "0pzc0girgfy3p03rxzwm6n9g72x2qinn4g151dmwl0mdgn0bh8rh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-darwin-amd64.tar.gz";
+        sha256 = "1lyz86zwhnhasxhccx229fppwgz1wrjmk7b24cx3mg92craazypc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-amd64.tar.gz";
-        sha256 = "18hxq1kmaxb6xjajcm84zjc3crpaqh412mkrs0xai97p3pbdfkzn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-amd64.tar.gz";
+        sha256 = "0sw0382d4inkbgah62b8s7wszjd2lj39ybq96skl72vsizkp0njw";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-amd64.tar.gz";
@@ -275,16 +275,16 @@
         sha256 = "0vjjki7lzx4kxi91qfsm07vs2jz4nl3l816hcn3kkj22ypnx11w2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-amd64.tar.gz";
-        sha256 = "1b3znzx5m20xlvmgj9njmip7q32fs6hm62zfckra73bqh2mc9492";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-darwin-amd64.tar.gz";
+        sha256 = "0zbmrhh5f19r9rg3pcmry325l2lfpam9j6krqdbcwsals971qvw6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-amd64.tar.gz";
-        sha256 = "1cyh4zlaayyg4x6qzgc8pxm7kvc6b2xjm93v9rb25vbxb4yjv1nw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-darwin-amd64.tar.gz";
+        sha256 = "1m6gfvnfa0r5k777ccskgkdi6kic69jk74liklrh6mnn9isbp1by";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-amd64.tar.gz";
-        sha256 = "0h62401y99hhqs32y8blx1p0cd87ssd2zi6fzakv72ry4v2xhcnj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-amd64.tar.gz";
+        sha256 = "0b62i9bmqdqjw0qk3m97x9274vn3ib8xwc6lxsshywkakf1zw0cg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz";
@@ -299,20 +299,20 @@
         sha256 = "1ji9zz1r7rj57w7spf6mwa9fxl1jgiy0qmxvlia21hpj60b536f5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-amd64.tar.gz";
-        sha256 = "097kjmmyqdwaa9ghn228d52sjj2ypr3kqbgkfxvjmq494b5mf74s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-darwin-amd64.tar.gz";
+        sha256 = "1zzqfx6qyah32lvj82jm31cbygpf1ss58jmig8ckn5scpjjifd7g";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-amd64.tar.gz";
         sha256 = "1c38gqm2vk9fwxyqmzzf27p8xdis9pa8ikj9pgwyjaf208b63gir";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-amd64.tar.gz";
-        sha256 = "0jrzy2dm6wnkxwk97njhvyw36gy9l1axcw2962drilc60zdc82mb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-darwin-amd64.tar.gz";
+        sha256 = "0yph0sjsyicb3z2bhw1xw1rn7v930vygsgwww4n1zmy6p8059z4a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-amd64.tar.gz";
-        sha256 = "1h43zanz810i2p0x12hp60r6k5rfkr5lvh49l32090xj1v6cr8la";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-darwin-amd64.tar.gz";
+        sha256 = "115g6sn2sxd9vpzv1a01hah91cnd1irfzif7k8xj5aisixdmfyhh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
@@ -321,60 +321,60 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-linux-arm64.tar.gz";
-        sha256 = "0jv19av1060gh0q8hlllbqlg4m8lzkpassajhjh1r5ncqf27y5hy";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-linux-arm64.tar.gz";
+        sha256 = "11lwmmdwv5jag1n283hl4psvdg7766qx15pynpjfvhvdmwaviagj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-arm64.tar.gz";
-        sha256 = "071cy9b0n7h8x3m0lnw8yywpjj2q9pzp5svh0cfqz7c43ssamkqk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-linux-arm64.tar.gz";
+        sha256 = "1b6sbhbbcymrs6g62pr7pbd6zx3zvwypzbl9xi5252f1y6ap2hqx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-linux-arm64.tar.gz";
-        sha256 = "16jd9hrv60jy6qzl57h9fmk955ll05ng7cfmn4af1vjsyay6knjl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-linux-arm64.tar.gz";
+        sha256 = "11cvffvjgwc1b1v30ivkmw7lva6qzhkm5r4m0y4lc9sh0mjfvgsb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-arm64.tar.gz";
-        sha256 = "11hbjq49a1znx38xk81q2gp2pdq99c8sz166xxb2cmrv84bm2xfi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-linux-arm64.tar.gz";
+        sha256 = "1pj3hj3yqmpjsz4lsbvswymf4sv6ylrpx6c2lcgyvdvsg0l5nfxp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-arm64.tar.gz";
         sha256 = "03as3y5bflq1m8qfcx7h916vlxa7qn5xla2d1gi2q87gz4giki24";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-arm64.tar.gz";
-        sha256 = "0v9a59cbzs5s9vylmbwfb5chydccdy1xkhp90ci2lz52yik45lg5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-linux-arm64.tar.gz";
+        sha256 = "1qikx8r384r49c4b3wqhhzdglkdsji2z2zrakbk73ir006q1s6a4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-arm64.tar.gz";
-        sha256 = "1lwr5cbf3g3zkk8mvdd17b8bmsjkxbzjg15y2lzsxb294r677b3l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-linux-arm64.tar.gz";
+        sha256 = "19gv23rqd94p9jhfcq7j44n2prlxm9k9y0s0gs2bfq89s2s7a9w3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz";
-        sha256 = "17lndnmwmxshxz7n2zhgc07gr8cqfd06b1mgblyzbx8n2lc0x0sv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-linux-arm64.tar.gz";
+        sha256 = "1zapqg7ggkz9q2sh1jkp9p5670hpa5nhvmjvq50pwx0i2xnfpvsl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-arm64.tar.gz";
-        sha256 = "0mmkjim8q5wh0mikwjw3qzg87hm845777jyisz7256p211nrsmyx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-arm64.tar.gz";
+        sha256 = "15p2gh2cqkz5rxnq5b5bx30mha02hcd3df44lwh9qb4lbjlfdzfv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-arm64.tar.gz";
         sha256 = "0hg628ik9vvadxs249v4z53y36nzrw3bgjdh1fgjahx875z23m06";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-arm64.tar.gz";
-        sha256 = "1l2a54qjgh5blwx8mw2i52m5yhff3izqirlh17ws3l04xcldd4d9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-linux-arm64.tar.gz";
+        sha256 = "1cdjz021bc1r5bqsnm114acmyc7ikmyxp08pmnndrmm9mmf5xr96";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-arm64.tar.gz";
-        sha256 = "15n44dya58sqpirhpiicp1x6w9x15qf94a6vamk2h6jbzpfi7c03";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-arm64.tar.gz";
+        sha256 = "06y78vlb3s36n900v44l0av126xr0gaf192ciq6435cr0b4v80h3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-linux-arm64.tar.gz";
-        sha256 = "0d02sl9l4mqhm6mb9rxdc0pc6dr7qkd6zzm4y3ff8dv84qn8sy9n";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-linux-arm64.tar.gz";
+        sha256 = "14hgjf71j5fsxzfibb6gv7adn0cap9lsz44xdcczgs1xc206ng6k";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-arm64.tar.gz";
-        sha256 = "033lry88mpn9vfqim26hkjg13dc0jl9sqn28zhld1asx7sqbck3y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-linux-arm64.tar.gz";
+        sha256 = "1zs5ar106zxv8np22n5c1kph65z35pbwgd32wn1vx5lgkz0jry7x";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-arm64.tar.gz";
@@ -385,44 +385,44 @@
         sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-linux-arm64.tar.gz";
-        sha256 = "0f4bxwj7liyijbsqh0r43s823n02gvpkk0rdxwhg1li4d1mpsqxp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-linux-arm64.tar.gz";
+        sha256 = "0pqkh6i3pigw5ab83bxnq5wccn8jmavj8g445ywd65rf3cgqnbns";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-linux-arm64.tar.gz";
-        sha256 = "111rblka8wz87pqd9v27gmv4lz5048kwdj9i252r7bnd1gw92i4x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-linux-arm64.tar.gz";
+        sha256 = "1nlxqvicd266xvb2rwqspcmkm9z6fhjvm7vswy3c7a7sjhscvz3j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-arm64.tar.gz";
-        sha256 = "1nfsgjfas5md9k67n90hcvcza7gg2iwp9wivmfzf49vz2k25iz44";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-linux-arm64.tar.gz";
+        sha256 = "1xq1p9mwazy00c45g92if1hiy8iclsrh7x25fxs29zayp0lcf3s5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-linux-arm64.tar.gz";
-        sha256 = "0jynj7qz66jl47982gvg47fkdbgifb4030225vxz85a705ingjdl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-arm64.tar.gz";
+        sha256 = "01w6y0pmpc9c81hpck2nqin0hk9s3ijdcg1a4jicaw9g6j716gsp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz";
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-arm64.tar.gz";
-        sha256 = "0lxxdqx9g9zd0m3zzpgfcwv3h51sigzldh5fzrn2m6pnqniamqbw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-linux-arm64.tar.gz";
+        sha256 = "0arbz7simas9a4bg0mm00gw89z6dzjykbf198zf8k0vbx47h6m2h";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-arm64.tar.gz";
-        sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-arm64.tar.gz";
+        sha256 = "12xf6nbvv4r5q93495cddfbyj0rg5slpbcqaykk5jydr45arms2y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-arm64.tar.gz";
         sha256 = "0l33hzkgcm9lr39k7dndga36k3f0agbsj7q4wx0rwhfabz1fgcd1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-arm64.tar.gz";
-        sha256 = "0by18hd8zyfl0xac4wanz5lq6sw6wmkclvy0va9cjpfgns916qsk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-linux-arm64.tar.gz";
+        sha256 = "09jdr8pr7pb8ixjvlvggnxq7ccp94nx6mfq0m6rlkmsh3dk46v68";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-arm64.tar.gz";
-        sha256 = "1gd9l1zdkg5faqlfvc5rl9gqchndxhxp742mx21hizhmp4rsv577";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-arm64.tar.gz";
+        sha256 = "1y2a451m6qhb0z1g304axwm4hcbdwba3rl8pdfj4c4ifkiaxm0mr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-arm64.tar.gz";
@@ -433,16 +433,16 @@
         sha256 = "0arnnishqszj7s9a2azjk0a61n2sp3wb97snj9xpj9bp243w5lmf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-arm64.tar.gz";
-        sha256 = "02jix4w49n9mal8wg6ixgxvnd865ml7zx0lnz6prckfrzgrj36ih";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-linux-arm64.tar.gz";
+        sha256 = "0a5gl6fpl6w8bcy1bl1z7dynrpm42kg0hq45hzhs7h667bgaqkzs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-arm64.tar.gz";
-        sha256 = "05fwkafsjv5gd23fzkb2hv3xah9vvqr4w2sc9sjrzcwzghiw0pbh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-linux-arm64.tar.gz";
+        sha256 = "10ix183lkl96n3iclvbnj09snz7h423fi1paja286fqgg7yv8p5w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-arm64.tar.gz";
-        sha256 = "07n3q2bm44acikvjnz7mgpg0mxycs1qwc1bxmr2gibnz9n9x1f5k";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-arm64.tar.gz";
+        sha256 = "1f983sfqqab9zfn30ypzmzixh65fjgpqd4v8id3zrh74k5mjil50";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz";
@@ -457,20 +457,20 @@
         sha256 = "1zbm7ql3rqypqmckbmlzbiy4akmqjkbzfkl7788q6sm7xh6bm8q1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-arm64.tar.gz";
-        sha256 = "1csiv24nmg1c8vb0ay36lsw7dpfim5hr9b3rhdawpsyjdi5s4hsd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-linux-arm64.tar.gz";
+        sha256 = "07aai8ssmm3vvydmr6nwf32s64mz6xjqlb6cp3l0j13g34wpva4m";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-arm64.tar.gz";
         sha256 = "1rfzj89s7avim702aqvkrmsg4d1qzajw1k5pr24jzrs4xiyarkzb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-arm64.tar.gz";
-        sha256 = "1sbxv37pi1yy6dvjz0yifj44l68mscxaf033a7nbgb3281r15lq1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-linux-arm64.tar.gz";
+        sha256 = "0gc31g4wmv9h5ygaiykas0kjrk3dfmdpzabs5k493d8zcqyk2219";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-arm64.tar.gz";
-        sha256 = "113czcq1fm2dywn8q5v1z5lyz4l30b1433hrdjnfkr8qwzxncr48";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-linux-arm64.tar.gz";
+        sha256 = "1pqwam73vz01zvr569643918n4vfvlnaqx0ljc8wvij42fvbdfgs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz";
@@ -479,60 +479,60 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-darwin-arm64.tar.gz";
-        sha256 = "1nb7g3dyv4a2fgr738a6mpf88n7pfmbbggq5l746kgg1jpzd2ald";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-darwin-arm64.tar.gz";
+        sha256 = "0yizh6hy9xq2gmshbln21fq7az7k5j3fisyj12a2q2frh8fv03dx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-arm64.tar.gz";
-        sha256 = "18j48pfmrr6m1qna8ac95l1i6pg4gf7g887yc68h0gxdx2q2xbr2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-darwin-arm64.tar.gz";
+        sha256 = "0fcl1445yaywqbsl16ipydfg2z0j15bsdsppdr3vfzgiyimrn321";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-darwin-arm64.tar.gz";
-        sha256 = "1fig9bn080dbnibm0dp76ygyg1g2sv2295kyyknx3wlap0nrj2w3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-darwin-arm64.tar.gz";
+        sha256 = "09baqy0kl8p4ij3c7yhwq4dlgbh4fkp4dpq59xfmi90l4r4j6623";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-arm64.tar.gz";
-        sha256 = "1cglc5a507fy973wkk062wd22yn1pwn1pdn2laqqlk0n6y1hp33y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-darwin-arm64.tar.gz";
+        sha256 = "0v6w6n85iaynsjv7hz7f1syvy8z473cfj62vhwidq4bivbiad0i1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-arm64.tar.gz";
         sha256 = "0sqmpk1n98vs079qrs1nf9ifjmjz4s9s0f406c8r0cxpn3l08zvp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-arm64.tar.gz";
-        sha256 = "1a13wviv678k1ls57vwvffkk6qa5fdc55zw2byid910m2bjs7bz0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-darwin-arm64.tar.gz";
+        sha256 = "1hl90018i53qx3mhy1acnq61nmbai2shv80pv5aigg1y7mg9p54b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-arm64.tar.gz";
-        sha256 = "0k0kmjqc5iq3dhcvrxkz6d7kbj2q1s0cigqjqp7qpj5ppyss901g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-darwin-arm64.tar.gz";
+        sha256 = "12w7kjk2a4vhn3kcn6mwdblflpagd3br06hk196k0pkj46l04rlk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz";
-        sha256 = "0b4srhyq2adbpzh74s0kcmfflayrk6c7jbq63s2l3zfq2zln4sbm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-darwin-arm64.tar.gz";
+        sha256 = "061xs9y8wdaa61zzhaprwnmn78bcgycnhsfd19dihv94qnbzpn79";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-arm64.tar.gz";
-        sha256 = "00gahf4jlihzywbsd7rmw73jrnjfdsqxhag4qm7ms90gwl5qspa4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-arm64.tar.gz";
+        sha256 = "0pqyd2qgng49g0cvmn5nvcqsymwgakyc75p6swb2c94h6pp4x4bc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-arm64.tar.gz";
         sha256 = "0jidnrvvk2d6jdfx795yrnkpwmw1843nfylchhynlidf279z21vm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-arm64.tar.gz";
-        sha256 = "1cr924w029hah14j9cq0rsy2k0arph8r7dcmhi6zimw3wm0168dd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-darwin-arm64.tar.gz";
+        sha256 = "1qmgsji9aa7plbv06k1l0a10fvazcjybrcr5l276wz650c412g6d";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-arm64.tar.gz";
-        sha256 = "1lva9jp2fbz58gfgsdbwlyrdd60wpy1xy55af7f8dmabgcc8j391";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-arm64.tar.gz";
+        sha256 = "1dwncdxq6rxi1ip9vv52amdmh78wgynymn5sc6b3dh8q1sx6ghdq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-darwin-arm64.tar.gz";
-        sha256 = "06gdvb7d5mj7ggnjifi86nb2n7hyzv79rq5wh2dfl0fkf19qam69";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-darwin-arm64.tar.gz";
+        sha256 = "0ys4nb53gbddv8rgb8daz5qbw2gigk90gl9g5iqyrdjlsv7cv4w8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-arm64.tar.gz";
-        sha256 = "0v50vs1d1cm6dgfjz9adzka34hbws3j6hwr1s3vxk6f6apx9p3x0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-darwin-arm64.tar.gz";
+        sha256 = "048paqhq05a74rrp1rcsx1kaxsszhpb4shxgb5l74xii9fdklwm2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-arm64.tar.gz";
@@ -543,44 +543,44 @@
         sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-darwin-arm64.tar.gz";
-        sha256 = "0a1fy15bf66gvy7jvimbnycxb51z85svrpa9flly1ch3g7276w60";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-darwin-arm64.tar.gz";
+        sha256 = "0rfdmixsr8q93r25k736mr3gngf4xz5k88394frpywc0sbkmckzv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-darwin-arm64.tar.gz";
-        sha256 = "0nd7hv0yf40xc566wg76k8h91ig88lvd6y0f0ffsjfyb40kgm7sc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-darwin-arm64.tar.gz";
+        sha256 = "1y1mb41flv2f64wy5vmfcf9hxqskjcnmdwgh10mn6nb3nsq1l4b1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-arm64.tar.gz";
-        sha256 = "13il7mq0g853x1nllvxnhbhflrlqx8i11p4xkg46bvshay15xh9x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-darwin-arm64.tar.gz";
+        sha256 = "092zvhh96cpgkfq14lp4pahd8nz6x5bd0dcvs5cx7xpdl745bzs9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-darwin-arm64.tar.gz";
-        sha256 = "0mf0pxpxjb2fpz4px3dg4b699fqvzf56crvrj00vyc6ld5hmmnpm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-arm64.tar.gz";
+        sha256 = "06g373h6i1ps7sd0nclcgvaparg4bv94s5c9ps5izxvhl87bcbf6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz";
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-arm64.tar.gz";
-        sha256 = "17dr3i20y5f120mq4b8j85jwb5xwid3bbpw2vdfc1qgs1ib17yav";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-darwin-arm64.tar.gz";
+        sha256 = "1r1wbw7fi3ivd225p6pyd8gsbycx0qjlicfaabjlg7lqlakv8cfp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-arm64.tar.gz";
-        sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-arm64.tar.gz";
+        sha256 = "0z66mps5rm42ga6c9n59zahkj3pg78583p4cmf73fap3y8gpfmd2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-arm64.tar.gz";
         sha256 = "0fjlp0afa5z6x85ldw8bwl4zgxz2rmwinihw1vbqa33pyjrk08xn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-arm64.tar.gz";
-        sha256 = "1kkbgmhgp02qzxsh37m9x3jahwjnq5ls9dhjhgbxjjq6xalcqf79";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-darwin-arm64.tar.gz";
+        sha256 = "03rg7hgxxkkx10kba2kgr25kxs48wq2fcrsv7j9v5w6sddaqf7w3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-arm64.tar.gz";
-        sha256 = "0n1wmplyj2c5qhaq0gplphi8p2i7g4jwrnlwzkv0m1wixrlx3fw5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-arm64.tar.gz";
+        sha256 = "034pw70i8n12gr69ng5xj2cci11v1d47fsw6j5mgmck5mrsjjr0i";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-arm64.tar.gz";
@@ -591,16 +591,16 @@
         sha256 = "0k7w2a1zppw1pgy077iidvnlic21ynw4w7f15z3hw793inzj2wm3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-arm64.tar.gz";
-        sha256 = "1bb3bzybmfi5blagh13bm6q1avjbp80lmjdv4q5yc2dbfbs653xi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-darwin-arm64.tar.gz";
+        sha256 = "0vygxiqrx70i03d3p1mmc26zkai4cxzwjzjf6bszz6cmqvnc5pnr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-arm64.tar.gz";
-        sha256 = "1f409m7ls96vvx6x6lsfydp2vn809wy58s5cbh5p8s390s30q2zf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-darwin-arm64.tar.gz";
+        sha256 = "16x1apq9chj090a9zwzk3247500fsbzz5gz3v2rz8cmiy4n0is46";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-arm64.tar.gz";
-        sha256 = "0mznjz1m1l6qcgb3x9h4q7r5msffla1s6x0j9k5jr5izm50z4wxb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-arm64.tar.gz";
+        sha256 = "09xwsyjlrrci8gn0zg97jlx0fa9mnzbz0v42myzzdrq6vvidss9y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz";
@@ -615,20 +615,20 @@
         sha256 = "1qih4kprfaa82p7mg4zg8amy8vp4c76vqkmwf3df2x8bn69jdrc0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-arm64.tar.gz";
-        sha256 = "1p3nb3aazr47kiprq7k3js6x8jk87dsql6d4qkn6c60mbrm9mlal";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-darwin-arm64.tar.gz";
+        sha256 = "0mwc3z11zjx4sy9a1iclxj2ymabcbg2abzpk93khrqqsa7943h1r";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-arm64.tar.gz";
         sha256 = "03qhd6p77d40dbcvr6ifw6ii37303jmcqhns63r8gmpbfkdg52a2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-arm64.tar.gz";
-        sha256 = "1x3g6j9adkc1k937s271zqwk82w9w07fkm4d8dwcv85sf1m1phhj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-darwin-arm64.tar.gz";
+        sha256 = "1q3qqlyzfc77ybp2q5mspyrh9c1h1m4p9mzq0l1z6hzn6r41z4n5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-arm64.tar.gz";
-        sha256 = "1ga7zvw6przmkbcpi3vq081g4bh8p4bzrfhi3jyxd6kh4slb3g9d";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-darwin-arm64.tar.gz";
+        sha256 = "0mnya4lc1aabxwzm44k5k72xlz0ng0aiy3rkikvcdk0c3mmckyrk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz";
diff --git a/pkgs/tools/admin/pulumi-bin/update.sh b/pkgs/tools/admin/pulumi-bin/update.sh
index fb583e5ad18e..16385373a272 100755
--- a/pkgs/tools/admin/pulumi-bin/update.sh
+++ b/pkgs/tools/admin/pulumi-bin/update.sh
@@ -3,9 +3,12 @@
 # shellcheck shell=bash
 # Bash 3 compatible for Darwin
 
-if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then
-  echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version"
-  exit 1
+if ! gh auth status --hostname github.com >/dev/null 2>&1; then
+  if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then
+    echo >&2 "Login to github.com with gh or provide GITHUB_TOKEN env"
+    echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version"
+    exit 1
+  fi
 fi
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
deleted file mode 100644
index 21b949affbb4..000000000000
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-  aacgain,
-  chromaprint,
-  ffmpeg,
-  flac,
-  imagemagick,
-  keyfinder-cli,
-  mp3gain,
-  mp3val,
-  python3Packages,
-  version,
-  lib,
-  ...
-}:
-{
-  absubmit = {
-    deprecated = true;
-    testPaths = [ ];
-  };
-  advancedrewrite = {
-    testPaths = [ ];
-  };
-  acousticbrainz = {
-    deprecated = true;
-    propagatedBuildInputs = [ python3Packages.requests ];
-  };
-  albumtypes = { };
-  aura = {
-    propagatedBuildInputs = with python3Packages; [
-      flask
-      flask-cors
-      pillow
-    ];
-  };
-  autobpm = {
-    propagatedBuildInputs = with python3Packages; [
-      librosa
-      # An optional dependency of librosa, needed for beets' autobpm
-      resampy
-    ];
-  };
-  badfiles = {
-    testPaths = [ ];
-    wrapperBins = [
-      mp3val
-      flac
-    ];
-  };
-  bareasc = { };
-  beatport.propagatedBuildInputs = [ python3Packages.requests-oauthlib ];
-  bench.testPaths = [ ];
-  bpd.testPaths = [ ];
-  bpm.testPaths = [ ];
-  bpsync.testPaths = [ ];
-  bucket = { };
-  chroma = {
-    propagatedBuildInputs = [ python3Packages.pyacoustid ];
-    testPaths = [ ];
-    wrapperBins = [
-      chromaprint
-    ];
-  };
-  convert.wrapperBins = [ ffmpeg ];
-  deezer = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  discogs.propagatedBuildInputs = with python3Packages; [
-    discogs-client
-    requests
-  ];
-  duplicates.testPaths = [ ];
-  edit = { };
-  embedart = {
-    propagatedBuildInputs = with python3Packages; [ pillow ];
-    wrapperBins = [ imagemagick ];
-  };
-  embyupdate.propagatedBuildInputs = [ python3Packages.requests ];
-  export = { };
-  fetchart = {
-    propagatedBuildInputs = with python3Packages; [
-      beautifulsoup4
-      langdetect
-      pillow
-      requests
-    ];
-    wrapperBins = [ imagemagick ];
-  };
-  filefilter = { };
-  fish.testPaths = [ ];
-  freedesktop.testPaths = [ ];
-  fromfilename.testPaths = [ ];
-  ftintitle = { };
-  fuzzy.testPaths = [ ];
-  gmusic.testPaths = [ ];
-  hook = { };
-  ihate = { };
-  importadded = { };
-  importfeeds = { };
-  info = { };
-  inline.testPaths = [ ];
-  ipfs = { };
-  keyfinder.wrapperBins = [ keyfinder-cli ];
-  kodiupdate = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  lastgenre.propagatedBuildInputs = [ python3Packages.pylast ];
-  lastimport = {
-    propagatedBuildInputs = [ python3Packages.pylast ];
-    testPaths = [ ];
-  };
-  limit = { };
-  listenbrainz = {
-    testPaths = [ ];
-  };
-  loadext = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  lyrics.propagatedBuildInputs = with python3Packages; [
-    beautifulsoup4
-    langdetect
-    requests
-  ];
-  mbcollection.testPaths = [ ];
-  mbsubmit = { };
-  mbsync = { };
-  metasync.testPaths = [ ];
-  missing.testPaths = [ ];
-  mpdstats.propagatedBuildInputs = [ python3Packages.mpd2 ];
-  mpdupdate = {
-    propagatedBuildInputs = [ python3Packages.mpd2 ];
-    testPaths = [ ];
-  };
-  musicbrainz = { };
-  parentwork = { };
-  permissions = { };
-  play = { };
-  playlist.propagatedBuildInputs = [ python3Packages.requests ];
-  plexupdate = { };
-  random = { };
-  replace = { };
-  replaygain.wrapperBins = [
-    aacgain
-    ffmpeg
-    mp3gain
-  ];
-  rewrite.testPaths = [ ];
-  scrub.testPaths = [ ];
-  smartplaylist = { };
-  sonosupdate = {
-    propagatedBuildInputs = [ python3Packages.soco ];
-    testPaths = [ ];
-  };
-  spotify = { };
-  subsonicplaylist = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  subsonicupdate.propagatedBuildInputs = [ python3Packages.requests ];
-  substitute = {
-    testPaths = [ ];
-  };
-  the = { };
-  thumbnails = {
-    propagatedBuildInputs = with python3Packages; [
-      pillow
-      pyxdg
-    ];
-    wrapperBins = [ imagemagick ];
-  };
-  types.testPaths = [ "test/plugins/test_types_plugin.py" ];
-  unimported.testPaths = [ ];
-  web.propagatedBuildInputs = with python3Packages; [
-    flask
-    flask-cors
-  ];
-  zero = { };
-  _typing = {
-    testPaths = [ ];
-  };
-  _utils = { };
-}
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
deleted file mode 100644
index 29fdaa91ebcb..000000000000
--- a/pkgs/tools/audio/beets/common.nix
+++ /dev/null
@@ -1,254 +0,0 @@
-{
-  lib,
-  stdenv,
-  src,
-  version,
-  fetchpatch,
-  bashInteractive,
-  diffPlugins,
-  gobject-introspection,
-  gst_all_1,
-  python3Packages,
-  sphinxHook,
-  writableTmpDirAsHomeHook,
-  runtimeShell,
-  writeScript,
-
-  # plugin deps, used indirectly by the @inputs when we `import ./builtin-plugins.nix`
-  aacgain,
-  chromaprint,
-  essentia-extractor,
-  ffmpeg,
-  flac,
-  imagemagick,
-  keyfinder-cli,
-  mp3gain,
-  mp3val,
-
-  extraPatches ? [ ],
-  pluginOverrides ? { },
-  disableAllPlugins ? false,
-  disabledTests ? [ ],
-  extraNativeBuildInputs ? [ ],
-
-  # tests
-  runCommand,
-  beets,
-}@inputs:
-let
-  inherit (lib) attrNames attrValues concatMap;
-
-  mkPlugin =
-    {
-      name,
-      enable ? !disableAllPlugins,
-      builtin ? false,
-      propagatedBuildInputs ? [ ],
-      testPaths ? [
-        "test/plugins/test_${name}.py"
-      ],
-      wrapperBins ? [ ],
-    }:
-    {
-      inherit
-        name
-        enable
-        builtin
-        propagatedBuildInputs
-        testPaths
-        wrapperBins
-        ;
-    };
-
-  basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
-  pluginOverrides' = lib.mapAttrs (
-    plugName:
-    lib.throwIf (basePlugins.${plugName}.deprecated or false)
-      "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
-  ) pluginOverrides;
-
-  allPlugins = lib.mapAttrs (n: a: mkPlugin { name = n; } // a) (
-    lib.recursiveUpdate basePlugins pluginOverrides'
-  );
-  builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
-  enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
-  disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;
-  disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins));
-
-  pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins);
-in
-python3Packages.buildPythonApplication {
-  pname = "beets";
-  inherit src version;
-  pyproject = true;
-
-  patches = [
-  ]
-  ++ extraPatches;
-
-  build-system = [
-    python3Packages.poetry-core
-    python3Packages.poetry-dynamic-versioning
-  ];
-
-  dependencies =
-    with python3Packages;
-    [
-      confuse
-      gst-python
-      jellyfish
-      mediafile
-      munkres
-      musicbrainzngs
-      platformdirs
-      pyyaml
-      unidecode
-      typing-extensions
-      lap
-    ]
-    ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
-
-  nativeBuildInputs = [
-    gobject-introspection
-    sphinxHook
-    python3Packages.pydata-sphinx-theme
-  ]
-  ++ extraNativeBuildInputs;
-
-  buildInputs = [
-  ]
-  ++ (with gst_all_1; [
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-  ]);
-
-  outputs = [
-    "out"
-    "doc"
-    "man"
-  ];
-  sphinxBuilders = [
-    "html"
-    "man"
-  ];
-
-  postInstall = ''
-    mkdir -p $out/share/zsh/site-functions
-    cp extra/_beet $out/share/zsh/site-functions/
-  '';
-
-  makeWrapperArgs = [
-    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
-    "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
-    "--prefix PATH : ${lib.makeBinPath pluginWrapperBins}"
-  ];
-
-  nativeCheckInputs =
-    with python3Packages;
-    [
-      pytestCheckHook
-      pytest-cov-stub
-      mock
-      rarfile
-      responses
-      requests-mock
-      pillow
-    ]
-    ++ [
-      writableTmpDirAsHomeHook
-    ]
-    ++ pluginWrapperBins;
-
-  __darwinAllowLocalNetworking = true;
-
-  disabledTestPaths =
-    disabledTestPaths
-    ++ [
-      # touches network
-      "test/plugins/test_aura.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky: several tests fail randomly with:
-      # if not self._poll(timeout):
-      #   raise Empty
-      #   _queue.Empty
-      "test/plugins/test_bpd.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # fail on Hydra with `RuntimeError: image cannot be obtained without artresizer backend`
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio"
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_percent_margin"
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_px_margin"
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_minwidth"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced_and_resized"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_not_resized"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_and_scaled"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_but_not_scaled"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
-    ];
-  disabledTests = disabledTests ++ [
-    # https://github.com/beetbox/beets/issues/5880
-    "test_reject_different_art"
-    # touches network
-    "test_merge_duplicate_album"
-  ];
-
-  # Perform extra "sanity checks", before running pytest tests.
-  preCheck = ''
-    # Check for undefined plugins
-    find beetsplug -mindepth 1 \
-      \! -path 'beetsplug/__init__.py' -a \
-      \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
-      | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
-      | sort -u > plugins_available
-    ${diffPlugins (attrNames builtinPlugins) "plugins_available"}
-
-    export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc"
-
-    env EDITOR="${writeScript "beetconfig.sh" ''
-      #!${runtimeShell}
-      cat > "$1" <<CFG
-      plugins: ${lib.concatStringsSep " " (attrNames enabledPlugins)}
-      CFG
-    ''}" "$out/bin/beet" config -e
-    env EDITOR=true "$out/bin/beet" config -e
-  '';
-
-  passthru.plugins = allPlugins;
-
-  passthru.tests.gstreamer =
-    runCommand "beets-gstreamer-test"
-      {
-        meta.timeout = 60;
-      }
-      ''
-            set -euo pipefail
-            export HOME=$(mktemp -d)
-            mkdir $out
-
-            cat << EOF > $out/config.yaml
-        replaygain:
-          backend: gstreamer
-        EOF
-
-            ${beets}/bin/beet -c $out/config.yaml > /dev/null
-      '';
-
-  meta = {
-    description = "Music tagger and library organizer";
-    homepage = "https://beets.io";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      aszlig
-      doronbehar
-      lovesegfault
-      montchr
-      pjones
-    ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    mainProgram = "beet";
-  };
-}
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
deleted file mode 100644
index f08a874426cf..000000000000
--- a/pkgs/tools/audio/beets/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  callPackage,
-  config,
-  fetchFromGitHub,
-  python3Packages,
-}:
-/*
-  ** To customize the enabled beets plugins, use the pluginOverrides input to the
-  ** derivation.
-  ** Examples:
-  **
-  ** Disabling a builtin plugin:
-  ** beets.override { pluginOverrides = { beatport.enable = false; }; }
-  **
-  ** Enabling an external plugin:
-  ** beets.override { pluginOverrides = {
-  **   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
-  ** }; }
-*/
-let
-  extraPatches = [
-    # Bash completion fix for Nix
-    ./patches/bash-completion-always-print.patch
-  ];
-in
-lib.makeExtensible (
-  self:
-  {
-    beets = self.beets-stable;
-
-    beets-stable = callPackage ./common.nix rec {
-      inherit python3Packages extraPatches;
-      version = "2.5.0";
-      src = fetchFromGitHub {
-        owner = "beetbox";
-        repo = "beets";
-        tag = "v${version}";
-        hash = "sha256-YZvS9oB+v+48i1avQcs6ClnYz4aMqJQ2e6cBiZ4ULb0=";
-      };
-    };
-
-    beets-minimal = self.beets.override { disableAllPlugins = true; };
-
-    alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
-    audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
-    copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
-    filetote = callPackage ./plugins/filetote.nix { beets = self.beets-minimal; };
-  }
-  // lib.optionalAttrs config.allowAliases {
-    beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets;
-
-    extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
-  }
-)
diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix
deleted file mode 100644
index 9e5a8182e47b..000000000000
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  beets,
-  python3Packages,
-  writableTmpDirAsHomeHook,
-}:
-
-python3Packages.buildPythonApplication rec {
-  pname = "beets-alternatives";
-  version = "0.13.4";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    repo = "beets-alternatives";
-    owner = "geigerzaehler";
-    tag = "v${version}";
-    hash = "sha256-jGHRoBBXqJq0r/Gbp7gkuaEFPVMGE6cqQRi84AHTXxQ=";
-  };
-
-  nativeBuildInputs = [
-    beets
-  ];
-
-  dependencies = [
-    python3Packages.poetry-core
-  ];
-
-  nativeCheckInputs =
-    with python3Packages;
-    [
-      pytestCheckHook
-      pytest-cov-stub
-      mock
-      pillow
-      tomli
-      typeguard
-    ]
-    ++ [
-      writableTmpDirAsHomeHook
-    ];
-
-  meta = {
-    description = "Beets plugin to manage external files";
-    homepage = "https://github.com/geigerzaehler/beets-alternatives";
-    changelog = "https://github.com/geigerzaehler/beets-alternatives/blob/v${version}/CHANGELOG.md";
-    maintainers = with lib.maintainers; [
-      aszlig
-      lovesegfault
-    ];
-    license = lib.licenses.mit;
-  };
-}
diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix
index 8c0ce9eabfee..63af82790a03 100644
--- a/pkgs/tools/audio/opl3bankeditor/common.nix
+++ b/pkgs/tools/audio/opl3bankeditor/common.nix
@@ -55,6 +55,11 @@ mkDerivation rec {
     rtmidi
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/{bin,Applications}
     mv "${binname}.app" $out/Applications/
diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
index bc9eba0b923b..389ef9ad734d 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -33,6 +33,12 @@ mkDerivation rec {
   ];
 
   prePatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)" \
+        "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" \
+      --replace-fail "CMAKE_POLICY(SET CMP0003 OLD)" "" \
+      --replace-fail "CMAKE_POLICY(SET CMP0015 OLD)" ""
+
     substituteInPlace cmake/HTTRAQTFindHttrack.cmake \
       --replace /usr/include/httrack/ ${httrack}/include/httrack/
 
diff --git a/pkgs/tools/backup/percona-xtrabackup/8_0.nix b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
index fe335b852064..5136aed309df 100644
--- a/pkgs/tools/backup/percona-xtrabackup/8_0.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/8_0.nix
@@ -3,8 +3,8 @@
 callPackage ./generic.nix (
   args
   // {
-    version = "8.0.35-32";
-    hash = "sha256-aNnAlhhzZ6636dzOz4FFDEE4Mb450HGU42cJrM21GdQ=";
+    version = "8.0.35-34";
+    hash = "sha256-DqjDBLSQqlWazWJjdb+n7RwqSe/OMlZI2ca/JNTX2W8=";
 
     # includes https://github.com/Percona-Lab/libkmip.git
     fetchSubmodules = true;
@@ -12,9 +12,5 @@ callPackage ./generic.nix (
     extraPatches = [
       ./abi-check.patch
     ];
-
-    extraPostInstall = ''
-      rm -r "$out"/docs
-    '';
   }
 )
diff --git a/pkgs/tools/backup/percona-xtrabackup/8_4.nix b/pkgs/tools/backup/percona-xtrabackup/8_4.nix
index 82f2ab5ea95d..dbbe364f802c 100644
--- a/pkgs/tools/backup/percona-xtrabackup/8_4.nix
+++ b/pkgs/tools/backup/percona-xtrabackup/8_4.nix
@@ -3,8 +3,8 @@
 callPackage ./generic.nix (
   args
   // {
-    version = "8.4.0-2";
-    hash = "sha256-ClW/B175z/sxF/MT9iHW1Wtr0ere63tIgUpcMp1IfTs=";
+    version = "8.4.0-4";
+    hash = "sha256-ws+si8bpalL8y7l9W+R4B02GnnGOou50txtS6ktntP4=";
 
     # includes https://github.com/Percona-Lab/libkmip.git
     fetchSubmodules = true;
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
deleted file mode 100644
index 11e7fff175a6..000000000000
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ /dev/null
@@ -1,621 +0,0 @@
-{
-  lib,
-  stdenv,
-  runCommand,
-  fetchurl,
-  fetchFromGitHub,
-  fetchPypi,
-  fetchpatch2,
-
-  # Build time
-  autoconf,
-  automake,
-  cmake,
-  ensureNewerSourcesHook,
-  fmt,
-  git,
-  libtool,
-  makeWrapper,
-  nasm,
-  pkg-config,
-  which,
-  openssl,
-
-  # Tests
-  nixosTests,
-
-  # Runtime dependencies
-  arrow-cpp,
-  babeltrace,
-  # Note when trying to upgrade boost:
-  # * When upgrading Ceph, it's recommended to check which boost version Ceph uses on Fedora,
-  #   and default to that.
-  # * The version that Ceph downloads if `-DWITH_SYSTEM_BOOST:BOOL=ON` is not given
-  #   is declared in `cmake/modules/BuildBoost.cmake` line `set(boost_version ...)`.
-  #
-  # If you want to upgrade to boost >= 1.86, you need a Ceph version that
-  # has this PR in:
-  #     https://github.com/ceph/ceph/pull/61312
-  boost183,
-  bzip2,
-  cryptsetup,
-  cunit,
-  e2fsprogs,
-  doxygen,
-  gperf,
-  graphviz,
-  gnugrep,
-  gtest,
-  icu,
-  kmod,
-  libcap,
-  libcap_ng,
-  libnbd,
-  libnl,
-  libxml2,
-  lmdb,
-  lttng-ust,
-  lua,
-  lvm2,
-  lz4,
-  oath-toolkit,
-  openldap,
-  parted,
-  python311, # to get an idea which Python versions are supported by Ceph, see upstream `do_cmake.sh` (see `PYBUILD=` variable)
-  rdkafka,
-  rocksdb,
-  snappy,
-  openssh,
-  sqlite,
-  utf8proc,
-  xfsprogs,
-  zlib,
-  zstd,
-
-  # Dependencies of overridden Python dependencies, hopefully we can remove these soon.
-  rustPlatform,
-
-  # Optional Dependencies
-  curl ? null,
-  expat ? null,
-  fuse ? null,
-  libatomic_ops ? null,
-  libedit ? null,
-  libs3 ? null,
-  yasm ? null,
-
-  # Mallocs
-  gperftools ? null,
-  jemalloc ? null,
-
-  # Crypto Dependencies
-  cryptopp ? null,
-  nspr ? null,
-  nss ? null,
-
-  # Linux Only Dependencies
-  linuxHeaders,
-  util-linux,
-  libuuid,
-  udev,
-  keyutils,
-  rdma-core,
-  rabbitmq-c,
-  libaio ? null,
-  libxfs ? null,
-  liburing ? null,
-  zfs ? null,
-  ...
-}:
-
-# We must have one crypto library
-assert cryptopp != null || (nss != null && nspr != null);
-
-let
-  shouldUsePkg =
-    pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
-
-  optYasm = shouldUsePkg yasm;
-  optExpat = shouldUsePkg expat;
-  optCurl = shouldUsePkg curl;
-  optFuse = shouldUsePkg fuse;
-  optLibedit = shouldUsePkg libedit;
-  optLibatomic_ops = shouldUsePkg libatomic_ops;
-  optLibs3 = shouldUsePkg libs3;
-
-  optJemalloc = shouldUsePkg jemalloc;
-  optGperftools = shouldUsePkg gperftools;
-
-  optCryptopp = shouldUsePkg cryptopp;
-  optNss = shouldUsePkg nss;
-  optNspr = shouldUsePkg nspr;
-
-  optLibaio = shouldUsePkg libaio;
-  optLibxfs = shouldUsePkg libxfs;
-  optZfs = shouldUsePkg zfs;
-
-  # Downgrade rocksdb, 7.10 breaks ceph
-  rocksdb' = rocksdb.overrideAttrs {
-    version = "7.9.2";
-    src = fetchFromGitHub {
-      owner = "facebook";
-      repo = "rocksdb";
-      rev = "refs/tags/v7.9.2";
-      hash = "sha256-5P7IqJ14EZzDkbjaBvbix04ceGGdlWBuVFH/5dpD5VM=";
-    };
-  };
-
-  hasRadosgw = optExpat != null && optCurl != null && optLibedit != null;
-
-  # Malloc implementation (can be jemalloc, tcmalloc or null)
-  malloc = if optJemalloc != null then optJemalloc else optGperftools;
-
-  # We prefer nss over cryptopp
-  cryptoStr =
-    if optNss != null && optNspr != null then
-      "nss"
-    else if optCryptopp != null then
-      "cryptopp"
-    else
-      "none";
-
-  cryptoLibsMap = {
-    nss = [
-      optNss
-      optNspr
-    ];
-    cryptopp = [ optCryptopp ];
-    none = [ ];
-  };
-
-  getMeta = description: {
-    homepage = "https://ceph.io/en/";
-    inherit description;
-    license = with lib.licenses; [
-      lgpl21
-      gpl2Only
-      bsd3
-      mit
-      publicDomain
-    ];
-    maintainers = with lib.maintainers; [
-      adev
-      ak
-      johanot
-      krav
-      nh2
-      benaryorg
-    ];
-    platforms = [
-      "x86_64-linux"
-      "aarch64-linux"
-    ];
-  };
-
-  ceph-common =
-    with python.pkgs;
-    buildPythonPackage {
-      pname = "ceph-common";
-      format = "setuptools";
-      inherit src version;
-
-      sourceRoot = "ceph-${version}/src/python-common";
-
-      propagatedBuildInputs = [
-        pyyaml
-      ];
-
-      nativeCheckInputs = [
-        pytestCheckHook
-      ];
-
-      disabledTests = [
-        # requires network access
-        "test_valid_addr"
-      ];
-
-      meta = getMeta "Ceph common module for code shared by manager modules";
-    };
-
-  # Watch out for python <> boost compatibility
-  python = python311.override {
-    self = python;
-    packageOverrides =
-      self: super:
-      let
-        bcryptOverrideVersion = "4.0.1";
-      in
-      {
-        # Ceph does not support the following yet:
-        # * `bcrypt` > 4.0
-        # * `cryptography` > 40
-        # See:
-        # * https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602
-        # * Upstream issue: https://tracker.ceph.com/issues/63529
-        #   > Python Sub-Interpreter Model Used by ceph-mgr Incompatible With Python Modules Based on PyO3
-        # * Moved to issue: https://tracker.ceph.com/issues/64213
-        #   > MGR modules incompatible with later PyO3 versions - PyO3 modules may only be initialized once per interpreter process
-
-        bcrypt = super.bcrypt.overridePythonAttrs (old: rec {
-          pname = "bcrypt";
-          version = bcryptOverrideVersion;
-          src = fetchPypi {
-            inherit pname version;
-            hash = "sha256-J9N1kDrIJhz+QEf2cJ0W99GNObHskqr3KvmJVSplDr0=";
-          };
-          cargoRoot = "src/_bcrypt";
-          cargoDeps = rustPlatform.fetchCargoVendor {
-            inherit
-              pname
-              version
-              src
-              cargoRoot
-              ;
-            hash = "sha256-8PyCgh/rUO8uynzGdgylAsb5k55dP9fCnf40UOTCR/M=";
-          };
-        });
-
-        # We pin the older `cryptography` 40 here;
-        # this also forces us to pin other packages, see below
-        cryptography = self.callPackage ./old-python-packages/cryptography.nix { };
-
-        # This is the most recent version of `pyopenssl` that's still compatible with `cryptography` 40.
-        # See https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899358602
-        # and https://github.com/pyca/pyopenssl/blob/d9752e44127ba36041b045417af8a0bf16ec4f1e/CHANGELOG.rst#2320-2023-05-30
-        pyopenssl = super.pyopenssl.overridePythonAttrs (old: rec {
-          version = "23.1.1";
-          src = fetchPypi {
-            pname = "pyOpenSSL";
-            inherit version;
-            hash = "sha256-hBSYub7GFiOxtsR+u8AjZ8B9YODhlfGXkIF/EMyNsLc=";
-          };
-          disabledTests = old.disabledTests or [ ] ++ [
-            "test_export_md5_digest"
-          ];
-          disabledTestPaths = old.disabledTestPaths or [ ] ++ [
-            "tests/test_ssl.py"
-          ];
-          propagatedBuildInputs = old.propagatedBuildInputs or [ ] ++ [
-            self.flaky
-          ];
-          # hack: avoid building docs due to incompatibility with current sphinx
-          nativeBuildInputs = [ openssl ]; # old.nativeBuildInputs but without sphinx*
-          outputs = lib.filter (o: o != "doc") old.outputs;
-        });
-
-        # This is the most recent version of `trustme` that's still compatible with `cryptography` 40.
-        # See https://github.com/NixOS/nixpkgs/issues/359723
-        # and https://github.com/python-trio/trustme/commit/586f7759d5c27beb44da60615a71848eb2a5a490
-        trustme = self.callPackage ./old-python-packages/trustme.nix { };
-
-        fastapi = super.fastapi.overridePythonAttrs (old: {
-          # Flaky test:
-          #     ResourceWarning: Unclosed <MemoryObjectSendStream>
-          # Unclear whether it's flaky in general or only in this overridden package set.
-          doCheck = false;
-        });
-
-        # Ceph does not support `kubernetes` >= 19, see:
-        #     https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1900324090
-        kubernetes = super.kubernetes.overridePythonAttrs (old: rec {
-          version = "18.20.0";
-          src = fetchFromGitHub {
-            owner = "kubernetes-client";
-            repo = "python";
-            rev = "v${version}";
-            sha256 = "1sawp62j7h0yksmg9jlv4ik9b9i1a1w9syywc9mv8x89wibf5ql1";
-            fetchSubmodules = true;
-          };
-        });
-
-      };
-  };
-
-  boost' = boost183.override {
-    enablePython = true;
-    inherit python;
-  };
-
-  # TODO: split this off in build and runtime environment
-  ceph-python-env = python.withPackages (
-    ps: with ps; [
-      ceph-common
-
-      # build time
-      cython_0
-
-      # debian/control
-      bcrypt
-      cherrypy
-      influxdb
-      jinja2
-      kubernetes
-      natsort
-      numpy
-      pecan
-      prettytable
-      pyjwt
-      pyopenssl
-      python-dateutil
-      pyyaml
-      requests
-      routes
-      scikit-learn
-      scipy
-      setuptools
-      sphinx
-      virtualenv
-      werkzeug
-
-      # src/cephadm/zipapp-reqs.txt
-      markupsafe
-
-      # src/pybind/mgr/requirements-required.txt
-      cryptography
-      jsonpatch
-
-      # src/tools/cephfs/shell/setup.py
-      cmd2
-      colorama
-    ]
-  );
-  inherit (ceph-python-env.python) sitePackages;
-
-  version = "19.2.3";
-  src = fetchurl {
-    url = "https://download.ceph.com/tarballs/ceph-${version}.tar.gz";
-    hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";
-  };
-in
-rec {
-  ceph = stdenv.mkDerivation {
-    pname = "ceph";
-    inherit src version;
-
-    patches = [
-      ./boost-1.85.patch
-
-      (fetchpatch2 {
-        name = "ceph-boost-1.86-uuid.patch";
-        url = "https://github.com/ceph/ceph/commit/01306208eac492ee0e67bff143fc32d0551a2a6f.patch?full_index=1";
-        hash = "sha256-OnDrr72inzGXXYxPFQevsRZImSvI0uuqFHqtFU2dPQE=";
-      })
-
-      # See:
-      # * <https://github.com/boostorg/python/issues/394>
-      # * <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>
-      # * <https://github.com/ceph/ceph/pull/60999>
-      ./boost-1.86-PyModule.patch
-    ];
-
-    nativeBuildInputs = [
-      autoconf # `autoreconf` is called, e.g. for `qatlib_ext`
-      automake # `aclocal` is called, e.g. for `qatlib_ext`
-      cmake
-      fmt
-      git
-      makeWrapper
-      libtool # used e.g. for `qatlib_ext`
-      nasm
-      pkg-config
-      python
-      python.pkgs.python # for the toPythonPath function
-      python.pkgs.wrapPython
-      which
-      (ensureNewerSourcesHook { year = "1980"; })
-      # for building docs/man-pages presumably
-      doxygen
-      graphviz
-    ];
-
-    buildInputs =
-      cryptoLibsMap.${cryptoStr}
-      ++ [
-        arrow-cpp
-        babeltrace
-        boost'
-        bzip2
-        # Adding `ceph-python-env` here adds the env's `site-packages` to `PYTHONPATH` during the build.
-        # This is important, otherwise the build system may not find the Python deps and then
-        # silently skip installing ceph-volume and other Ceph python tools.
-        ceph-python-env
-        cryptsetup
-        cunit
-        e2fsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
-        gperf
-        gtest
-        icu
-        libcap
-        libnbd
-        libnl
-        libxml2
-        lmdb
-        lttng-ust
-        lua
-        lvm2 # according to `debian/control` file, e.g. `pvs` command used by `src/ceph-volume/ceph_volume/api/lvm.py`
-        lz4
-        malloc
-        oath-toolkit
-        openldap
-        optLibatomic_ops
-        optLibs3
-        optYasm
-        parted # according to `debian/control` file, used by `src/ceph-volume/ceph_volume/util/disk.py`
-        rdkafka
-        rocksdb'
-        snappy
-        openssh # according to `debian/control` file, `ssh` command used by `cephadm`
-        sqlite
-        utf8proc
-        xfsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
-        zlib
-        zstd
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        keyutils
-        libcap_ng
-        liburing
-        libuuid
-        linuxHeaders
-        optLibaio
-        optLibxfs
-        optZfs
-        rabbitmq-c
-        rdma-core
-        udev
-        util-linux
-      ]
-      ++ lib.optionals hasRadosgw [
-        optCurl
-        optExpat
-        optFuse
-        optLibedit
-      ];
-
-    # Picked up, amongst others, by `wrapPythonPrograms`.
-    pythonPath = [
-      ceph-python-env
-      "${placeholder "out"}/${ceph-python-env.sitePackages}"
-    ];
-
-    # * `unset AS` because otherwise the Ceph CMake build errors with
-    #       configure: error: No modern nasm or yasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512) and yasm should be 1.2.0 or later.
-    #   because the code at
-    #       https://github.com/intel/isa-l/blob/633add1b569fe927bace3960d7c84ed9c1b38bb9/configure.ac#L99-L191
-    #   doesn't even consider using `nasm` or `yasm` but instead uses `$AS`
-    #   from `gcc-wrapper`.
-    #   (Ceph's error message is extra confusing, because it says
-    #   `No modern nasm or yasm found` when in fact it found e.g. `nasm`
-    #   but then uses `$AS` instead.
-    # * replace /sbin and /bin based paths with direct nix store paths
-    # * increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters
-    preConfigure = ''
-      unset AS
-
-      substituteInPlace src/common/module.c \
-        --replace "char command[128];" "char command[256];" \
-        --replace "/sbin/modinfo"  "${kmod}/bin/modinfo" \
-        --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \
-        --replace "/bin/grep" "${gnugrep}/bin/grep"
-
-      # Patch remount to use full path to mount(8), otherwise ceph-fuse fails when run
-      # from a systemd unit for example.
-      substituteInPlace src/client/fuse_ll.cc \
-        --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
-
-      # The install target needs to be in PYTHONPATH for "*.pth support" check to succeed
-      export PYTHONPATH=$PYTHONPATH:$lib/${sitePackages}:$out/${sitePackages}
-      patchShebangs src/
-    '';
-
-    cmakeFlags = [
-      "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
-
-      "-DWITH_CEPHFS_SHELL:BOOL=ON"
-      "-DWITH_SYSTEMD:BOOL=OFF"
-      # `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
-      #     CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
-      #     Command failed: 2
-      #
-      #        'make' 'opentelemetry_trace' 'opentelemetry_exporter_jaeger_trace'
-      #
-      #     See also
-      #
-      #        /build/ceph-18.2.0/build/src/opentelemetry-cpp/src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-*.log
-      # and that file contains:
-      #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc: In member function 'virtual void opentelemetry::v1::exporter::jaeger::TUDPTransport::close()':
-      #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc:71:7: error: '::close' has not been declared; did you mean 'pclose'?
-      #       71 |     ::THRIFT_CLOSESOCKET(socket_);
-      #          |       ^~~~~~~~~~~~~~~~~~
-      # Looks like `close()` is somehow not included.
-      # But the relevant code is already removed in `open-telemetry` 1.10: https://github.com/open-telemetry/opentelemetry-cpp/pull/2031
-      # So it's probably not worth trying to fix that for this Ceph version,
-      # and instead just disable Ceph's Jaeger support.
-      "-DWITH_JAEGER:BOOL=OFF"
-      "-DWITH_TESTS:BOOL=OFF"
-
-      # Use our own libraries, where possible
-      "-DWITH_SYSTEM_ARROW:BOOL=ON" # Only used if other options enable Arrow support.
-      "-DWITH_SYSTEM_BOOST:BOOL=ON"
-      "-DWITH_SYSTEM_GTEST:BOOL=ON"
-      "-DWITH_SYSTEM_ROCKSDB:BOOL=ON"
-      "-DWITH_SYSTEM_UTF8PROC:BOOL=ON"
-      "-DWITH_SYSTEM_ZSTD:BOOL=ON"
-
-      # Use our own python libraries too, see:
-      #     https://github.com/NixOS/nixpkgs/pull/344993#issuecomment-2391046329
-      "-DCEPHADM_BUNDLED_DEPENDENCIES=none"
-
-      # TODO breaks with sandbox, tries to download stuff with npm
-      "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF"
-      # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
-      ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
-    ]
-    ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON";
-
-    preBuild =
-      # The legacy-option-headers target is not correctly empbedded in the build graph.
-      # It also contains some internal race conditions that we work around by building with `-j 1`.
-      # Upstream discussion for additional context at https://tracker.ceph.com/issues/63402.
-      ''
-        cmake --build . --target legacy-option-headers -j 1
-      '';
-
-    postFixup = ''
-      wrapPythonPrograms
-      wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"
-
-      # Test that ceph-volume exists since the build system has a tendency to
-      # silently drop it with misconfigurations.
-      test -f $out/bin/ceph-volume
-    '';
-
-    outputs = [
-      "out"
-      "lib"
-      "dev"
-      "doc"
-      "man"
-    ];
-
-    doCheck = false; # uses pip to install things from the internet
-
-    # Takes 7+h to build with 2 cores.
-    requiredSystemFeatures = [ "big-parallel" ];
-
-    meta = getMeta "Distributed storage system";
-
-    passthru = {
-      inherit version;
-      inherit python; # to be able to test our overridden packages above individually with `nix-build -A`
-      tests = {
-        inherit (nixosTests)
-          ceph-multi-node
-          ceph-single-node
-          ceph-single-node-bluestore
-          ceph-single-node-bluestore-dmcrypt
-          ;
-      };
-    };
-  };
-
-  ceph-client =
-    runCommand "ceph-client-${version}"
-      {
-        meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs";
-      }
-      ''
-        mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions}
-        cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
-        cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
-        cp -r ${ceph}/bin/rbd-replay* $out/bin
-        cp -r ${ceph}/sbin/mount.ceph $out/bin
-        cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin
-        ln -s bin $out/sbin
-        cp -r ${ceph}/${sitePackages}/* $out/${sitePackages}
-        cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions
-        # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
-        substituteInPlace $out/bin/ceph          --replace ${ceph} $out
-        substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out
-      '';
-}
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 08e14c7624d6..abd5279b69d6 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -67,5 +67,7 @@ stdenv.mkDerivation rec {
       lgpl3Plus
     ];
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/tools/games/minecraft/optifine/default.nix
index 7eefb18fcc60..8f2512a1c229 100644
--- a/pkgs/tools/games/minecraft/optifine/default.nix
+++ b/pkgs/tools/games/minecraft/optifine/default.nix
@@ -1,5 +1,4 @@
 {
-  recurseIntoAttrs,
   callPackage,
   lib,
 }:
@@ -11,6 +10,6 @@
 # To do so, change directory to nixpkgs root, and do:
 # $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --argstr commit true
 
-recurseIntoAttrs (
+lib.recurseIntoAttrs (
   lib.mapAttrs (name: value: callPackage ./generic.nix value) (lib.importJSON ./versions.json)
 )
diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 368991fa39e2..8397e5ea71fc 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -123,15 +123,7 @@ in
     homepage = "http://www.gnuplot.info/";
     description = "Portable command-line driven graphing utility for many platforms";
     platforms = platforms.linux ++ platforms.darwin;
-    license = {
-      # Essentially a BSD license with one modification:
-      # Permission to modify the software is granted, but not the right to
-      # distribute the complete modified source code.  Modifications are to
-      # be distributed as patches to the released version.  Permission to
-      # distribute binaries produced by compiling modified sources is granted,
-      # provided you: ...
-      url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright";
-    };
+    license = lib.licenses.gnuplot;
     maintainers = with maintainers; [ lovek323 ];
     mainProgram = "gnuplot";
   };
diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index c55b7275388a..29478c872a2f 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-caps-viewer";
-  version = "4.02";
+  version = "4.03";
 
   src = fetchFromGitHub {
     owner = "SaschaWillems";
     repo = "VulkanCapsViewer";
     rev = version;
-    hash = "sha256-89W/1E9IJaPUzeki0vegXzprGFAFIgb1mRx0OMC4+ec=";
+    hash = "sha256-LaZdQ5w7QYaD3Nxl9ML30kGws8Yyr3c0jzO3ElUvJ/I=";
     # Note: this derivation strictly requires vulkan-header to be the same it was developed against.
     # To help us, they've put it in a git-submodule.
     # The result will work with any vulkan-loader version.
diff --git a/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch b/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch
new file mode 100644
index 000000000000..ebf38552cbde
--- /dev/null
+++ b/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch
@@ -0,0 +1,47 @@
+From 3fa414aa82375648635281924904557cbe4d2d83 Mon Sep 17 00:00:00 2001
+From: sasdf <asdf79852@gmail.com>
+Date: Fri, 18 Oct 2024 00:22:36 +0800
+Subject: [PATCH] Fix pointer wrap around undefined behavior
+
+---
+ zbar/img_scanner.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
+index d1bf8a3c..58436f16 100644
+--- a/zbar/img_scanner.c
++++ b/zbar/img_scanner.c
+@@ -33,6 +33,7 @@
+ #endif
+ 
+ #include <assert.h>
++#include <stddef.h>
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memcmp, memset, memcpy */
+ 
+@@ -50,7 +51,7 @@
+ #include "svg.h"
+ 
+ #if 1
+-#define ASSERT_POS assert(p == data + x + y * (intptr_t)w)
++#define ASSERT_POS assert(p == data + x + y * (ptrdiff_t)w)
+ #else
+ #define ASSERT_POS
+ #endif
+@@ -858,11 +859,11 @@ static void zbar_send_code_via_dbus(zbar_image_scanner_t *iscn,
+ }
+ #endif
+ 
+-#define movedelta(dx, dy)                \
+-    do {                                 \
+-	x += (dx);                       \
+-	y += (dy);                       \
+-	p += (dx) + ((uintptr_t)(dy)*w); \
++#define movedelta(dx, dy)                  \
++    do {                                   \
++        x += (dx);                         \
++        y += (dy);                         \
++        p += (dx) + ((dy)*(ptrdiff_t)(w)); \
+     } while (0);
+ 
+ static void *_zbar_scan_image(zbar_image_scanner_t *iscn, zbar_image_t *img)
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 08cf27e3f0a0..58b64c4fd1a1 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -9,6 +9,7 @@
   libX11,
   libv4l,
   qtbase,
+  qtwayland,
   qtx11extras,
   wrapQtAppsHook,
   wrapGAppsHook3,
@@ -61,6 +62,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/mchehab/zbar/commit/a549566ea11eb03622bd4458a1728ffe3f589163.patch";
       hash = "sha256-NY3bAElwNvGP9IR6JxUf62vbjx3hONrqu9pMSqaZcLY=";
     })
+    # PR from fork not yet merged into upstream
+    # See PR: https://github.com/mchehab/zbar/pull/299
+    # Remove this patch if the PR is merged or if the issue is solved another way.
+    # See https://github.com/NixOS/nixpkgs/issues/456461 for discussion of the root issue
+    ./darwin-segfault-optimized-pointer-assignment.patch
   ];
 
   nativeBuildInputs = [
@@ -92,6 +98,7 @@ stdenv.mkDerivation rec {
     libv4l
     gtk3
     qtbase
+    qtwayland
     qtx11extras
   ];
 
diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 2430a7eb7f68..ea67b9f186e6 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.1.14";
+  version = "5.1.16";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-wLJZyoWjf02+m8Kw+IcfbZY2NnjMGtCWur2+w141eS4=";
+    hash = "sha256-aedYDpxYeUXadJnV+u1cQrNGoiW8WZKAgP4eNcvkScI=";
   };
 
   prePatch = ''
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
index 40fca5e8278a..609f75a25ee9 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-anthy";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";
-    hash = "sha256-lY5GFbeIee7u1NsLbkYt6BvST9lidvZLpaylL0wE2+0=";
+    hash = "sha256-O/fpLWh5eE22lZEz4cyI60Xf/rTWpTCWjAib3y0Yac8=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
index f85e9a498004..a15ebdff93d2 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fcitx5-bamboo";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-bamboo";
     rev = finalAttrs.version;
-    hash = "sha256-cnrW25M9nluBLa+9Mynzkn/6AiGccSbtjS8p+L4ZDKM=";
+    hash = "sha256-xZzIpJQMyifu4GqAwiXgwGP4wO2j4Au5qEr49Ko2FjA=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
index fec6db51d888..37dc4795f020 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chewing";
-  version = "5.1.8";
+  version = "5.1.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-On8lbZL7hyY399a/q6iCNkDvRljv3zirzEO1wIG+MNE=";
+    hash = "sha256-xl6jNC1tud121rnUFsphF0A739W16Vb9Qx4v1+vu99U=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 90919a8c05b6..8a5d88de0cb0 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chinese-addons";
-  version = "5.1.9";
+  version = "5.1.10";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-xHLd7X9IdYTsVyqbghVzdC2i9AVipFHKRxP2Zqq7zGw=";
+    hash = "sha256-kVBDfr8NKsQQQX69N3/fVqJgObRNSX2p0GNSUjbZvcg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index f0e1482b8579..42624da68c7c 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -15,6 +15,7 @@
   kitemviews,
   kwidgetsaddons,
   qtquickcontrols2 ? null,
+  kcmutils,
   kcoreaddons,
   kdeclarative,
   kirigami ? null,
@@ -30,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-configtool";
-  version = "5.1.10";
+  version = "5.1.11";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-Py2UDBQRqvT7kwZeQIXKrIjGAbOjjxEyEfO5tdtizW4=";
+    hash = "sha256-SEQelUMigcqs0C+jY+A/dfncEogzU1e5tjP+wK+MylM=";
   };
 
   cmakeFlags = [
@@ -78,6 +79,7 @@ stdenv.mkDerivation rec {
       kirigami2
     ]
     ++ lib.optionals (lib.versions.major qtbase.version == "6") [
+      kcmutils
       libplasma
       kirigami
     ]
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
index 71c46f893bc0..2f36dd961401 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-hangul";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-66VW/hzKMVwXd7ktPQHrVbsWazKedS+/giTLIh5fkwo=";
+    hash = "sha256-6aBn0muWbmdxqUCrrXDRd4MZP7QUMX1ZHcAUdTF9Kys=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
index 5b67a02e4689..76c76e229c80 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-m17n";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-TJMJGjO9V6EOzxt6Z7rwOfIQWK38XolDhUKbjbNUGhA=";
+    hash = "sha256-gvR//H+Kf/pYv6Avr0No8PZO7hAnOHj16v6n+tDXgkU=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index 0a7564adfbfc..60de5a67b019 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5-qt${majorVersion}";
-  version = "5.1.10";
+  version = "5.1.11";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
     rev = version;
-    hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4=";
+    hash = "sha256-Nr8WnEm6z16NrXxuGEP4uQ6mxe8sUYtOxVgWMmFrWVE=";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index 43872c8b4f67..166940e436c4 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-rime";
-  version = "5.1.11";
+  version = "5.1.12";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst";
-    hash = "sha256-cc/B99tdVVWnvdl7dYYQlIvk8F2xXUOr6sF36yxQZfY=";
+    hash = "sha256-A7x7PQiyPAprJRg1tdk1Amq7pAhe8ney2KX9+9F0mK4=";
   };
 
   cmakeFlags = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index e85712781d50..46abbdf069bf 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-skk";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-WMkcZSocanhWMn9kiWyB07jEW4x84G07kAYvn5heenc=";
+    hash = "sha256-1omxT31hKe7gQ5BARJ+0tIp4RT5eM+Tjufd6s/PxBoY=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
index 5b4b1ce3a263..ad4b33829f81 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-table-extra";
-  version = "5.1.8";
+  version = "5.1.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-FrVkSDLH6lYQbhvcxtX/IQpRC3dphsHu7xVdgnDNcgg=";
+    hash = "sha256-ISfpS48J9gfnYTKCgfV0XQ30J/yYoX+HbyNQDIEHVdw=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
index f1d4f6523e43..991536fe2146 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-unikey";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-unikey";
     rev = version;
-    hash = "sha256-ve+vu/bK3GYgjn9KxuOsFZFi9eymi1TFlzUHu4fJAkk=";
+    hash = "sha256-Yeyk6c4bjsxTi8DvRBGip/gayKaOvO6R5PGYkc0uUdk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index 3341b2ff2ed5..df9a14bddd2c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/BambooEngine/ibus-bamboo";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ astronaut0212 ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
deleted file mode 100644
index 93cc1b9daa4a..000000000000
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  vala,
-  intltool,
-  pkg-config,
-  libkkc,
-  ibus,
-  skkDictionaries,
-  gtk3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ibus-kkc";
-  version = "1.5.22";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
-  };
-
-  nativeBuildInputs = [
-    vala
-    intltool
-    pkg-config
-  ];
-
-  buildInputs = [
-    libkkc
-    ibus
-    gtk3
-  ];
-
-  postInstall = ''
-    ln -s ${skkDictionaries.l}/share/skk $out/share/skk
-  '';
-
-  meta = with lib; {
-    isIbusEngine = true;
-    description = "Libkkc (Japanese Kana Kanji input method) engine for ibus";
-    homepage = "https://github.com/ueno/ibus-kkc";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index c87a32d9715d..da38f195e10d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -10,26 +10,16 @@
   writableTmpDirAsHomeHook,
 }:
 
-let
+stdenv.mkDerivation {
+  pname = "ibus-table-chinese";
+  version = "1.8.14";
+
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-table-chinese";
-    rev = "3a416012f3b898fe17225925f59d0672a8a0c0db";
-    sha256 = "sha256-KA4jRSlQ78IeP7od3VtgdR58Z/6psNkMCVwvg3vhFIM=";
+    rev = "44301450e681c23d60301747856c74b5b9d1312e";
+    sha256 = "sha256-CvODJhQTzqR58IlaL8cIP9Z1gcC8PfkfU0HWdq0Jjms=";
   };
-in
-stdenv.mkDerivation {
-  pname = "ibus-table-chinese";
-  version = "1.8.12";
-
-  inherit src;
-
-  postConfigure = ''
-    substituteInPlace cmake_install.cmake --replace-fail /var/empty $out
-    substituteInPlace CMakeLists.txt --replace-fail /var/empty $out
-  '';
-  # Fails otherwise with "no such file or directory: <table>.txt"
-  dontUseCmakeBuildDir = true;
 
   nativeBuildInputs = [
     cmake
@@ -46,7 +36,7 @@ stdenv.mkDerivation {
   meta = {
     isIbusEngine = true;
     description = "Chinese tables for IBus-Table";
-    homepage = "https://github.com/definite/ibus-table-chinese";
+    homepage = "https://github.com/mike-fabian/ibus-table-chinese";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pneumaticat ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index ea4bcda399b1..ed9198747ce8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table";
-  version = "1.17.15";
+  version = "1.17.16";
 
   src = fetchFromGitHub {
     owner = "kaio";
     repo = "ibus-table";
     rev = version;
-    sha256 = "sha256-g3UyGbS/gtUQ54PQ0u7xRfInG+T5dkv4vF79bhXoQdY=";
+    sha256 = "sha256-QGuzEQxP9RSO0Ch+tTvC6cchH+jtilujxScYTb900BY=";
   };
 
   postPatch = ''
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 1302ad7b7476..85ef39776850 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.27.74";
+  version = "2.28.1";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    hash = "sha256-yAa/U1pL7KnJAuxaQkzbtOvdVhIgQiYCMlPnjHmoFEM=";
+    hash = "sha256-2gt3cEn+THr2hYv6XpEBcetMZmiBQlMEa9X64UglaQo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
index a75cb754f201..00e7c8416ecc 100644
--- a/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
+++ b/pkgs/tools/inputmethods/interception-tools/caps2esc.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Transforming the most useless key ever into the most useful one";
     mainProgram = "caps2esc";
     license = licenses.mit;
-    maintainers = [ maintainers.vyp ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/inputmethods/interception-tools/default.nix b/pkgs/tools/inputmethods/interception-tools/default.nix
index 6c5ee3a9ce93..d8545c391284 100644
--- a/pkgs/tools/inputmethods/interception-tools/default.nix
+++ b/pkgs/tools/inputmethods/interception-tools/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/interception/linux/tools";
     changelog = "https://gitlab.com/interception/linux/tools/-/tags/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = [ lib.maintainers.vyp ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
index 7c7d36d397d0..e4aaeedbd12b 100644
--- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -8,10 +8,12 @@
   fish,
   getconf,
   makeWrapper,
+  nushell,
   zsh,
 }:
 let
   cleanArgs = lib.flip removeAttrs [
+    "name"
     "dependencies"
     "meta"
   ];
@@ -26,6 +28,7 @@ stdenv.mkDerivation (
   finalAttrs:
   cleanArgs args
   // {
+    pname = name;
     inherit (core) version;
 
     src = core;
@@ -35,24 +38,25 @@ stdenv.mkDerivation (
     buildInputs = dependencies;
 
     # Patch shebangs now because our tests rely on them
-    postPatch = ''
+    postPatch = (args.postPatch or "") + ''
       patchShebangs --host bin/${name}
     '';
 
     dontConfigure = true;
-    dontBuild = true; # we've already built
+    dontBuild = true; # we've already built it
 
-    doCheck = true;
+    doCheck = args.doCheck or true;
     nativeCheckInputs = [
       bat
       bash
       fish
+      nushell
       zsh
     ]
     ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
     checkPhase = ''
       runHook preCheck
-      bash ./test.sh --compiled --suite ${name}
+      bash ./test.sh --compiled --suite ${name} --verbose --snapshot:show
       runHook postCheck
     '';
 
@@ -69,7 +73,7 @@ stdenv.mkDerivation (
       runHook postInstall
     '';
 
-    # We already patched
+    # We have already patched
     dontPatchShebangs = true;
 
     meta = core.meta // { mainProgram = name; } // meta;
diff --git a/pkgs/tools/misc/bat-extras/modules/batgrep.nix b/pkgs/tools/misc/bat-extras/modules/batgrep.nix
index 8ce898761c5b..72fc2ee8c076 100644
--- a/pkgs/tools/misc/bat-extras/modules/batgrep.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batgrep.nix
@@ -11,5 +11,8 @@ buildBatExtrasPkg {
     coreutils
     ripgrep
   ];
+  # The tests are broken with the new bat 0.26.0
+  # https://github.com/eth-p/bat-extras/issues/143
+  doCheck = false;
   meta.description = "Quickly search through and highlight files using ripgrep";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
index 2740444bb26d..c8c9a754923d 100644
--- a/pkgs/tools/misc/bat-extras/modules/batpipe.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
@@ -1,9 +1,23 @@
 {
+  lib,
+  stdenv,
   buildBatExtrasPkg,
   less,
+  procps,
 }:
 buildBatExtrasPkg {
   name = "batpipe";
-  dependencies = [ less ];
+  dependencies = [
+    less
+    procps
+  ];
+
+  patches = [
+    ../patches/batpipe-skip-outdated-test.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ../patches/batpipe-skip-detection-tests.patch
+  ];
+
   meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
index b27f8be6e3e1..f145b666d21d 100644
--- a/pkgs/tools/misc/bat-extras/modules/core.nix
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -7,17 +7,18 @@
   fish,
   getconf,
   nix-update-script,
+  nushell,
   zsh,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bat-extras";
-  version = "2024.08.24";
+  version = "2024.08.24-unstable-2025-02-22";
 
   src = fetchFromGitHub {
     owner = "eth-p";
     repo = "bat-extras";
-    tag = "v${version}";
-    hash = "sha256-xkND/w6UNC58dC8WrsifwjqU9ZI4yUUq+ZljkhhUNT8=";
+    rev = "3860f0f1481f1d0e117392030f55ef19cc018ee4";
+    hash = "sha256-9TEq/LzE1Pty1Z3WFWR/TaNNKPp2LGBr0jzGBkOEGQo=";
     fetchSubmodules = true;
   };
 
@@ -26,8 +27,6 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;
 
-  patches = [ ../patches/disable-theme-tests.patch ];
-
   postPatch = ''
     patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
   '';
@@ -43,6 +42,7 @@ stdenv.mkDerivation rec {
   nativeCheckInputs = [
     bash
     fish
+    nushell
     zsh
   ]
   ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
   # The per-script derivations will go ahead and patch the files they actually install.
   dontPatchShebangs = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     description = "Bash scripts that integrate bat with various command line tools";
diff --git a/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch
new file mode 100644
index 000000000000..b051545647a8
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
+index e834f6e..da87411 100644
+--- a/test/suite/batpipe.sh
++++ b/test/suite/batpipe.sh
+@@ -12,6 +12,7 @@ test:detected_bash_shell() {
+ 
+ test:detected_fish_shell() {
+ 	description "Test it can detect a fish shell."
++	skip "This test fails in the Nix sandbox"
+ 
+ 	# Note: We don't use bash's `-c` option when testing with a fake fish shell.
+ 	# Bash `-c` will automatically exec() into the last process, which loses the
+@@ -28,6 +29,7 @@ test:detected_fish_shell() {
+ 
+ test:detected_nu_shell() {
+ 	description "Test it can detect a nushell shell."
++	skip "This test fails in the Nix sandbox"
+ 
+ 	# Note: We don't use bash's `-c` option when testing with a fake nu shell.
+ 	# Bash `-c` will automatically exec() into the last process, which loses the
diff --git a/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch
new file mode 100644
index 000000000000..6ca368863d6c
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
+index e834f6e..2d9354d 100644
+--- a/test/suite/batpipe.sh
++++ b/test/suite/batpipe.sh
+@@ -51,6 +51,7 @@ test:viewer_gzip() {
+ 
+ test:batpipe_term_width() {
+ 	description "Test support for BATPIPE_TERM_WIDTH"
++	skip "Fails on a newer version of bat"
+ 	snapshot STDOUT
+ 
+ 	export BATPIPE=color
diff --git a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
deleted file mode 100644
index 695d350a2a30..000000000000
--- a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: [PATCH] skip tests depending on color theme
-===================================================================
-diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
---- a/test/suite/batpipe.sh	(revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)
-+++ b/test/suite/batpipe.sh	(date 1736621098865)
-@@ -29,6 +29,7 @@
- test:batpipe_term_width() {
- 	description "Test support for BATPIPE_TERM_WIDTH"
- 	snapshot STDOUT
-+	skip "bat-extras does not support `--theme` flag"
-
- 	export BATPIPE=color
- 	export BATPIPE_DEBUG_PARENT_EXECUTABLE=less
-Index: test/suite/batgrep.sh
-===================================================================
-diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh
---- a/test/suite/batgrep.sh	(revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)
-+++ b/test/suite/batgrep.sh	(date 1736621086239)
-@@ -58,6 +58,7 @@
- 	description "Snapshot test for colored output."
- 	snapshot stdout
- 	snapshot stderr
-+	skip "bat-extras does not support `--theme` flag"
-
- 	require_rg
-
-@@ -118,6 +119,7 @@
- 	description "Should respect the BAT_STYLE variable."
- 	snapshot stdout
- 	snapshot stderr
-+	skip "bat-extras does not support `--theme` flag"
-
- 	require_rg
-
-@@ -128,6 +130,7 @@
- 	description "Snapshot test for output without separator"
- 	snapshot stdout
- 	snapshot stderr
-+	skip "bat-extras does not support `--theme` flag"
-
- 	require_rg
-
diff --git a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch b/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
deleted file mode 100644
index 197a77020fe2..000000000000
--- a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8c9602e3a145e9596dc1a63c6ed67865814b6633 Mon Sep 17 00:00:00 2001
-From: Pádraig Brady <P@draigBrady.com>
-Date: Tue, 20 May 2025 16:03:44 +0100
-Subject: sort: fix buffer under-read (CWE-127)
-
-* src/sort.c (begfield): Check pointer adjustment
-to avoid Out-of-range pointer offset (CWE-823).
-(limfield): Likewise.
-* tests/sort/sort-field-limit.sh: Add a new test,
-which triggers with ASAN or Valgrind.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention bug fix introduced in v7.2 (2009).
-Fixes https://bugs.gnu.org/78507
----
- NEWS                           |  5 +++++
- src/sort.c                     | 12 ++++++++++--
- tests/local.mk                 |  1 +
- tests/sort/sort-field-limit.sh | 35 +++++++++++++++++++++++++++++++++++
- 4 files changed, 51 insertions(+), 2 deletions(-)
- create mode 100755 tests/sort/sort-field-limit.sh
-
-The new tests is NOT added in NixOS.
-
-diff --git a/NEWS b/NEWS
-index 6ff403206..923aa72f8 100644
---- a/NEWS
-+++ b/NEWS
-@@ -8,6 +8,11 @@ GNU coreutils NEWS                                    -*- outline -*-
-   copying to non-NFS files from NFSv4 files with trivial ACLs.
-   [bug introduced in coreutils-9.6]
- 
-+  sort with key character offsets of SIZE_MAX, could induce
-+  a read of 1 byte before an allocated heap buffer. For example:
-+  'sort +0.18446744073709551615R input' on 64 bit systems.
-+  [bug introduced in coreutils-7.2]
-+
- 
- * Noteworthy changes in release 9.7 (2025-04-09) [stable]
- 
-diff --git a/src/sort.c b/src/sort.c
-index b10183b6f..7af1a2512 100644
---- a/src/sort.c
-+++ b/src/sort.c
-@@ -1644,7 +1644,11 @@ begfield (struct line const *line, struct keyfield const *key)
-       ++ptr;
- 
-   /* Advance PTR by SCHAR (if possible), but no further than LIM.  */
--  ptr = MIN (lim, ptr + schar);
-+  size_t remaining_bytes = lim - ptr;
-+  if (schar < remaining_bytes)
-+    ptr += schar;
-+  else
-+    ptr = lim;
- 
-   return ptr;
- }
-@@ -1746,7 +1750,11 @@ limfield (struct line const *line, struct keyfield const *key)
-           ++ptr;
- 
-       /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
--      ptr = MIN (lim, ptr + echar);
-+      size_t remaining_bytes = lim - ptr;
-+      if (echar < remaining_bytes)
-+        ptr += echar;
-+      else
-+        ptr = lim;
-     }
- 
-   return ptr;
diff --git a/pkgs/tools/misc/coreutils/cp-1.patch b/pkgs/tools/misc/coreutils/cp-1.patch
new file mode 100644
index 000000000000..f40fdbbead79
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/cp-1.patch
@@ -0,0 +1,32 @@
+From 231cc20195294c9774ab68f523dd06059f4b0a5c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Wed, 29 Oct 2025 23:41:55 +0000
+Subject: [PATCH] copy: avoid posix_fadvise bypassing copy offload behavior
+
+* src/copy-file-data.c (): pass 0 to posix_fadvise to indicate to EOF.
+coreutils 9.8 used OFF_T_MAX instead, which triggered OpenZFS 2.2.2
+at least to synchronously (decompress and) populate the page cache.
+Addresses https://github.com/coreutils/coreutils/issues/122
+---
+ src/copy-file-data.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/copy-file-data.c b/src/copy-file-data.c
+index 1eefd3071f58a54f725c96dfcd2fd352012398c5..9eb6f47244f0a62c2f4934c7663794fd4dcf21bf 100644
+--- a/src/copy-file-data.c
++++ b/src/copy-file-data.c
+@@ -536,9 +536,12 @@ copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname,
+                && scantype != PLAIN_SCANTYPE)));
+ 
+   /* Don't bother calling fadvise for small copies, as it is not
+-     likely to help performance and might even hurt it.  */
++     likely to help performance and might even hurt it.
++     Note it's important to use a 0 length to indicate the whole file
++     as OpenZFS 2.2.2 at least will otherwise synchronously
++     (decompress and) populate the cache when given a specific length.  */
+   if (IO_BUFSIZE < ibytes)
+-    fdadvise (ifd, ipos, ibytes <= OFF_T_MAX - ipos ? ibytes : 0,
++    fdadvise (ifd, ipos, ibytes < OFF_T_MAX - ipos ? ibytes : 0,
+               FADVISE_SEQUENTIAL);
+ 
+   /* If not making a sparse file, try to use a more-efficient
diff --git a/pkgs/tools/misc/coreutils/cp-2.patch b/pkgs/tools/misc/coreutils/cp-2.patch
new file mode 100644
index 000000000000..197269e78768
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/cp-2.patch
@@ -0,0 +1,68 @@
+(NB: we drop the NEWS change to avoid conflicts)
+
+From 64b8fdb5b4767e0f833486507c3eae46ed1b40f8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Thu, 30 Oct 2025 13:02:48 +0000
+Subject: [PATCH] copy: don't avoid copy-offload upon SEEK_HOLE indicating
+ non-sparse
+
+* src/copy-file-data.c (infer_scantype): Fall back to a plain copy
+if SEEK_HOLE indicates non-sparse, as zero copy avoids copy offload.
+This was seen with transparently compressed files on OpenZFS.
+* tests/cp/sparse-perf.sh: Add a test case even though it might
+only trigger on compressed file systems that don't support reflink.
+* NEWS: Mention the bug fix.
+Addresses https://github.com/coreutils/coreutils/issues/122
+---
+ NEWS                    |  8 ++++++++
+ src/copy-file-data.c    | 11 +++++++++--
+ tests/cp/sparse-perf.sh | 10 ++++++++++
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+diff --git a/src/copy-file-data.c b/src/copy-file-data.c
+index 9eb6f47244f0a62c2f4934c7663794fd4dcf21bf..8fd25fee9201eda7bd0a8caf01f02821a3390448 100644
+--- a/src/copy-file-data.c
++++ b/src/copy-file-data.c
+@@ -481,12 +481,19 @@ infer_scantype (int fd, struct stat const *sb, off_t pos,
+           if (scan_inference->hole_start < sb->st_size)
+             return LSEEK_SCANTYPE;
+ 
+-          /* Though the file likely has holes, SEEK_DATA and SEEK_HOLE
++          /* Though the file may have holes, SEEK_DATA and SEEK_HOLE
+              didn't find any.  This can happen with file systems like
+              circa-2025 squashfs that support SEEK_HOLE only trivially.
+-             Fall back on ZERO_SCANTYPE.  */
++             This can also happen due to transparent file compression,
++             which can also indicate fewer than the usual number of blocks.  */
++
+           if (lseek (fd, pos, SEEK_SET) < 0)
+             return ERROR_SCANTYPE;
++
++          /* we prefer to return PLAIN_SCANTYPE here so that copy offload
++             continues to be used.  Falling through to ZERO_SCANTYPE would be
++             less performant in the compressed file case.  */
++          return PLAIN_SCANTYPE;
+         }
+     }
+   else if (pos < scan_inference->ext_start || errno == ENXIO)
+diff --git a/tests/cp/sparse-perf.sh b/tests/cp/sparse-perf.sh
+index 5a283c1fe65816a36342d9f583c1ed787947bf10..5ee984c527d7d8b6395d4193fcf81804b1135b8a 100755
+--- a/tests/cp/sparse-perf.sh
++++ b/tests/cp/sparse-perf.sh
+@@ -35,6 +35,16 @@ cmp $other_partition_sparse k2 || fail=1
+ grep ': avoided' cp.out && { cat cp.out; fail=1; }
+ 
+ 
++# Create a large-non-sparse-but-compressible file
++# Ensure we don't avoid copy offload which we saw with
++# transparent compression on OpenZFS at least
++# (as that triggers our sparse heuristic).
++mls='might-look-sparse'
++yes | head -n1M > "$mls" || framework_failure_
++cp --debug "$mls" "$mls.cp" >cp.out || fail=1
++cmp "$mls" "$mls.cp" || fail=1
++grep ': avoided' cp.out && { cat cp.out; fail=1; }
++
+ 
+ # Create a large-but-sparse file on the current partition.
+ # We disable relinking below, thus verifying SEEK_HOLE support
diff --git a/pkgs/tools/misc/coreutils/cp-3.patch b/pkgs/tools/misc/coreutils/cp-3.patch
new file mode 100644
index 000000000000..0c662e042e45
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/cp-3.patch
@@ -0,0 +1,52 @@
+From 2c5754649e08a664f3d43f7bc1df08f498bc1554 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
+Date: Fri, 31 Oct 2025 15:37:55 +0000
+Subject: [PATCH] copy: be more defensive/restrictive with posix_fadvise
+
+* src/copy-file-data.c (copy_file_data): Only give the
+POSIX_FADV_SEQUENTIAL hint when we _know_ we'll definitely
+use a read/write loop to copy the data.  Also only apply
+the hint to the whole file, as we've seen OpenZFS at least
+special case that.
+(sparse_copy): Update stale comment.
+---
+ src/copy-file-data.c | 17 +++++++++--------
+ 1 file changed, 9 insertions(+), 8 deletions(-)
+
+diff --git a/src/copy-file-data.c b/src/copy-file-data.c
+index 8fd25fee9201eda7bd0a8caf01f02821a3390448..c46b7edc5228f5f1e9c398d8ad7ff20b6fa60fb6 100644
+--- a/src/copy-file-data.c
++++ b/src/copy-file-data.c
+@@ -105,8 +105,6 @@ is_CLONENOTSUP (int err)
+    If HOLE_SIZE, look for holes in the input; *HOLE_SIZE contains
+    the size of the current hole so far, and update *HOLE_SIZE
+    at end to be the size of the hole at the end of the copy.
+-   Set *TOTAL_N_READ to the number of bytes read; this counts
+-   the trailing hole, which has not yet been output.
+    Read and update *DEBUG as needed.
+    If successful, return the number of bytes copied,
+    otherwise diagnose the failure and return -1.  */
+@@ -542,14 +540,17 @@ copy_file_data (int ifd, struct stat const *ist, off_t ipos, char const *iname,
+            || (x->sparse_mode == SPARSE_AUTO
+                && scantype != PLAIN_SCANTYPE)));
+ 
+-  /* Don't bother calling fadvise for small copies, as it is not
+-     likely to help performance and might even hurt it.
+-     Note it's important to use a 0 length to indicate the whole file
++  /* If we _know_ we're going to read data sequentially into the process,
++     i.e., --reflink or --sparse are not in auto mode,
++     give that hint to the kernel so it can tune caching behavior.
++     Also we don't bother calling fadvise for small copies,
++     as it is not likely to help performance and might even hurt it.
++     Also we only apply this hint for the whole file (0 length)
+      as OpenZFS 2.2.2 at least will otherwise synchronously
+      (decompress and) populate the cache when given a specific length.  */
+-  if (IO_BUFSIZE < ibytes)
+-    fdadvise (ifd, ipos, ibytes < OFF_T_MAX - ipos ? ibytes : 0,
+-              FADVISE_SEQUENTIAL);
++  if (ipos == 0 && ibytes == COUNT_MAX
++      && (x->reflink_mode != REFLINK_AUTO || x->sparse_mode != SPARSE_AUTO))
++    fdadvise (ifd, 0, 0, FADVISE_SEQUENTIAL);
+ 
+   /* If not making a sparse file, try to use a more-efficient
+      buffer size.  */
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index ee01ad87f88f..221f9853f6af 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -48,22 +48,24 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "coreutils" + (optionalString (!minimal) "-full");
-  version = "9.7";
+  version = "9.8";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
-    hash = "sha256-6LsmrQKT+bWh/EP7QrqXDjEsZs6SwbCxZxPXUA2yUb8=";
+    hash = "sha256-5tT9LYUskUGhwqGKE9FGoM1+RRlfcik6TkwETsbMyhU=";
   };
 
   patches = [
-    # Heap buffer overflow that's been here since coreutils 7.2 in 2009:
-    # https://www.openwall.com/lists/oss-security/2025/05/27/2
-    ./CVE-2025-5278.patch
-
-    # Fixes test-float-h failure on ppc64 with C23
-    # https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html
-    # Multiple upstream commits squashed with adjustments, see header
-    ./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
+    # Extremely bad bug where `tail` prints fewer lines than it should.
+    # https://github.com/coreutils/coreutils/commit/914972e80dbf82aac9ffe3ff1f67f1028e1a788b
+    ./tail.patch
+    # Fix performance regression in cp.
+    # https://github.com/coreutils/coreutils/commit/231cc20195294c9774ab68f523dd06059f4b0a5c
+    # https://github.com/coreutils/coreutils/commit/64b8fdb5b4767e0f833486507c3eae46ed1b40f8
+    # https://github.com/coreutils/coreutils/commit/2c5754649e08a664f3d43f7bc1df08f498bc1554
+    ./cp-1.patch
+    ./cp-2.patch
+    ./cp-3.patch
   ];
 
   postPatch = ''
@@ -218,6 +220,9 @@ stdenv.mkDerivation rec {
     # Work around a bogus warning in conjunction with musl.
     ++ optional stdenv.hostPlatform.isMusl "-Wno-error"
     ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"
+    # gnulib does not consider Clang-specific warnings to be bugs:
+    # https://lists.gnu.org/r/bug-gnulib/2025-06/msg00325.html
+    ++ optional stdenv.cc.isClang "-Wno-error=format-security"
   );
 
   # Works around a bug with 8.26:
diff --git a/pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
deleted file mode 100644
index 1b1e210efadd..000000000000
--- a/pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Applies the following incremental gnulib commits:
-
-- 55a366a06fbd98bf13adc531579e3513cee97a32
-- 65ed9d3b24ad09fd61d326c83e7f1b05f6e9d65f
-- ce8e9de0bf34bc63dffc67ab384334c509175f64
-- 6164b4cb0887b5331a4e64449107decd37d32735
-
-With adjustments specific to the structure & differences in coreutils:
-
-- gnulib code is split across lib and gnulib-tests
-- A Makefile.in is used for the test flags instead of the fancy automake modules
-  in the upstream gnulib project, so we add -lm to the float test there.
-  Surrounding texts in this file are slightly different in every project.
----
-diff '--color=auto' -ruN a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
---- a/gnulib-tests/Makefile.in	2025-04-09 10:05:54.000000000 +0000
-+++ b/gnulib-tests/Makefile.in	2025-07-09 10:00:23.767927263 +0000
-@@ -1496,7 +1496,7 @@
- 	$(am__DEPENDENCIES_1)
- test_float_h_SOURCES = test-float-h.c
- test_float_h_OBJECTS = test-float-h.$(OBJEXT)
--test_float_h_LDADD = $(LDADD)
-+test_float_h_LDADD = $(LDADD) -lm
- test_float_h_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
- 	libtests.a ../lib/libcoreutils.a libtests.a \
- 	$(am__DEPENDENCIES_1)
-diff '--color=auto' -ruN a/gnulib-tests/test-float-h.c b/gnulib-tests/test-float-h.c
---- a/gnulib-tests/test-float-h.c	2025-01-01 09:32:30.000000000 +0000
-+++ b/gnulib-tests/test-float-h.c	2025-07-09 10:00:13.837937094 +0000
-@@ -101,6 +101,8 @@
- 
- /* ------------------------------------------------------------------------- */
- 
-+#include <math.h>
-+
- #include "fpucw.h"
- #include "isnanf-nolibm.h"
- #include "isnand-nolibm.h"
-@@ -396,6 +398,44 @@
- 
- /* -------------------- Check macros for 'long double' -------------------- */
- 
-+static int
-+test_isfinitel (long double volatile x)
-+{
-+  if (x != x)
-+    return 0;
-+  long double volatile zero = x * 0;
-+  return zero == 0;
-+}
-+
-+/* Return X after normalization.  This makes a difference on platforms
-+   where long double can represent unnormalized values.  For example,
-+   suppose x = 1 + 2**-106 on PowerPC with IBM long double where
-+   FLT_RADIX = 2, LDBL_MANT_DIG = 106, and LDBL_EPSILON = 2**-105.
-+   Then 1 < x < 1 + LDBL_EPSILON, and normalize_long_double (x) returns 1.  */
-+static long double
-+normalize_long_double (long double volatile x)
-+{
-+  if (FLT_RADIX == 2 && test_isfinitel (x))
-+    {
-+      int xexp;
-+      long double volatile
-+        frac = frexpl (x, &xexp),
-+        significand = frac * pow2l (LDBL_MANT_DIG),
-+        normalized_significand = truncl (significand),
-+        normalized_x = normalized_significand * pow2l (xexp - LDBL_MANT_DIG);
-+
-+      /* The test_isfinitel defends against PowerPC with IBM long double,
-+         which fritzes out near LDBL_MAX.  */
-+      if (test_isfinitel (normalized_x))
-+        x = normalized_x;
-+    }
-+  else
-+    {
-+      /* Hope that X is already normalized.  */
-+    }
-+  return x;
-+}
-+
- static void
- test_long_double (void)
- {
-@@ -455,7 +495,7 @@
-     for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
-       {
-         volatile long double half_n = pow2l (- n); /* 2^-n */
--        volatile long double x = me - half_n;
-+        volatile long double x = normalize_long_double (me - half_n);
-         if (x < me)
-           ASSERT (x <= 1.0L);
-       }
-@@ -483,8 +523,12 @@
-   ASSERT (!LDBL_IS_IEC_60559);
- #endif
- 
-+  printf("LDBL_NORM_MAX: %LF\n", LDBL_NORM_MAX);
-+  printf("LDBL_MAX: %LF\n", LDBL_MAX);
-+  printf("normalize_long_double(LDBL_MAX): %LF\n", normalize_long_double(LDBL_MAX));
-+
-   /* Check the value of LDBL_NORM_MAX.  */
--  ASSERT (LDBL_NORM_MAX == LDBL_MAX);
-+  ASSERT (LDBL_NORM_MAX == normalize_long_double (LDBL_MAX));
- 
-   /* Check the value of LDBL_SNAN.  */
-   ASSERT (isnanl (LDBL_SNAN));
-diff '--color=auto' -ruN a/lib/float.c b/lib/float.c
---- a/lib/float.c	2025-01-01 09:32:29.000000000 +0000
-+++ b/lib/float.c	2025-07-09 10:00:13.837937094 +0000
-@@ -23,7 +23,7 @@
- #if GNULIB_defined_long_double_union
- # if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- const union gl_long_double_union gl_LDBL_MAX =
--  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-+  { { DBL_MAX, DBL_MAX / 0x1p53 } };
- # elif defined __i386__
- const union gl_long_double_union gl_LDBL_MAX =
-   { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-diff '--color=auto' -ruN a/lib/float.in.h b/lib/float.in.h
---- a/lib/float.in.h	2025-01-01 09:32:29.000000000 +0000
-+++ b/lib/float.in.h	2025-07-09 10:00:13.837937094 +0000
-@@ -113,44 +113,38 @@
- # define LDBL_MAX_10_EXP 4932
- #endif
- 
--/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
--   wrong.
--   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
--#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
-+/* On PowerPC with gcc 15 when using __ibm128 long double, the value of
-+   LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX, and LDBL_NORM_MAX are wrong.  */
-+#if ((defined _ARCH_PPC || defined _POWER) && LDBL_MANT_DIG == 106 \
-+     && defined __GNUC__)
- # undef LDBL_MIN_EXP
- # define LDBL_MIN_EXP DBL_MIN_EXP
- # undef LDBL_MIN_10_EXP
- # define LDBL_MIN_10_EXP DBL_MIN_10_EXP
- # undef LDBL_MIN
- # define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
--#endif
--#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- # undef LDBL_MAX
--/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
--   It is not easy to define:
--     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
--   is too small, whereas
--     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
--   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
--   Also, I can't get values larger than
--     #define LDBL63 ((long double) (1ULL << 63))
--     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
--   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
--   So, define it like this through a reference to an external variable
-+/* LDBL_MAX is 2**1024 - 2**918, represented as: { 0x7FEFFFFF, 0xFFFFFFFF,
-+                                                   0x7C9FFFFF, 0xFFFFFFFF }.
-+
-+   Do not write it as a constant expression, as GCC would likely treat
-+   that as infinity due to the vagaries of this platform's funky arithmetic.
-+   Instead, define it through a reference to an external variable.
-+   Like the following, but using a union to avoid type mismatches:
- 
--     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
-+     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / 0x1p53 };
-      extern const long double LDBL_MAX;
- 
--   or through a pointer cast
-+   The following alternative would not work as well when GCC is optimizing:
-+
-+     #define LDBL_MAX (*(long double const *) (double[])
-+                       { DBL_MAX, DBL_MAX / 0x1p53 })
- 
--     #define LDBL_MAX \
--       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
-+   The following alternative would require GCC 6 or later:
- 
--   Unfortunately, this is not a constant expression, and the latter expression
--   does not work well when GCC is optimizing..  */
-+     #define LDBL_MAX __builtin_pack_longdouble (DBL_MAX, DBL_MAX / 0x1p53)
-+
-+   Unfortunately none of the alternatives are constant expressions.  */
- # if !GNULIB_defined_long_double_union
- union gl_long_double_union
-   {
-@@ -161,6 +155,8 @@
- # endif
- extern const union gl_long_double_union gl_LDBL_MAX;
- # define LDBL_MAX (gl_LDBL_MAX.ld)
-+# undef LDBL_NORM_MAX
-+# define LDBL_NORM_MAX LDBL_MAX
- #endif
- 
- /* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
-@@ -181,6 +177,21 @@
- # endif
- #endif
- 
-+/* On PowerPC platforms, 'long double' has a double-double representation.
-+   Up to ISO C 17, this was outside the scope of ISO C because it can represent
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits>, such as
-+   1.0L + 4.94065645841246544176568792868221e-324L = 1 + 2^-1074; see
-+   ISO C 17 § 5.2.4.2.2.(3).
-+   In ISO C 23, wording has been included that makes this 'long double'
-+   representation compliant; see ISO C 23 § 5.2.5.3.3.(8)-(9).  In this setting,
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits> are
-+   called "unnormalized".  And since LDBL_EPSILON must be normalized (per
-+   ISO C 23 § 5.2.5.3.3.(33)), it must be 2^-105.  */
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+# undef LDBL_EPSILON
-+# define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
-+#endif
-+
- /* ============================ ISO C11 support ============================ */
- 
- /* 'float' properties */
-@@ -309,7 +320,11 @@
- # endif
- #endif
- #ifndef LDBL_NORM_MAX
--# define LDBL_NORM_MAX LDBL_MAX
-+# ifdef __LDBL_NORM_MAX__
-+#  define LDBL_NORM_MAX __LDBL_NORM_MAX__
-+# else
-+#  define LDBL_NORM_MAX LDBL_MAX
-+# endif
- #endif
- #ifndef LDBL_SNAN
- /* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */
diff --git a/pkgs/tools/misc/coreutils/tail.patch b/pkgs/tools/misc/coreutils/tail.patch
new file mode 100644
index 000000000000..40336daae137
--- /dev/null
+++ b/pkgs/tools/misc/coreutils/tail.patch
@@ -0,0 +1,50 @@
+(NB: we omit the new test, in order to avoid rerunning autoconf.)
+
+From 914972e80dbf82aac9ffe3ff1f67f1028e1a788b Mon Sep 17 00:00:00 2001
+From: Hannes Braun <hannes@hannesbraun.net>
+Date: Wed, 24 Sep 2025 21:20:49 +0200
+Subject: [PATCH] tail: fix tailing larger number of lines in regular files
+
+* src/tail.c (file_lines): Seek to the previous block instead of the
+beginning (or a little before) of the block that was just scanned.
+Otherwise, the same block is read and scanned (at least partially)
+again. This bug was introduced by commit v9.7-219-g976f8abc1.
+* tests/tail/basic-seek.sh: Add a new test.
+* tests/local.mk: Reference the new test.
+* NEWS: mention the bug fix.
+---
+ NEWS                     |  4 ++++
+ src/tail.c               |  2 +-
+ tests/local.mk           |  1 +
+ tests/tail/basic-seek.sh | 28 ++++++++++++++++++++++++++++
+ 4 files changed, 34 insertions(+), 1 deletion(-)
+ create mode 100755 tests/tail/basic-seek.sh
+
+diff --git a/NEWS b/NEWS
+index 7a1a73113e839f010aa6c734e6f07da68827b953..dc1d26879327761d35499815776477771758edd4 100644
+--- a/NEWS
++++ b/NEWS
+@@ -7,6 +7,10 @@ GNU coreutils NEWS                                    -*- outline -*-
+   `basenc --base58` would not operate correctly with input > 15561475 bytes.
+   [bug introduced with --base58 in coreutils-9.8]
+ 
++  'tail' outputs the correct number of lines again for non-small -n values.
++  Previously it may have output too few lines.
++  [bug introduced in coreutils-9.8]
++
+ 
+ * Noteworthy changes in release 9.8 (2025-09-22) [stable]
+ 
+diff --git a/src/tail.c b/src/tail.c
+index b8bef1d91cdb6cde2b666b6c1575376e075eaeb8..c7779c77dfe4cf5a672a265b6e796c7153590170 100644
+--- a/src/tail.c
++++ b/src/tail.c
+@@ -596,7 +596,7 @@ file_lines (char const *prettyname, int fd, struct stat const *sb,
+           goto free_buffer;
+         }
+ 
+-      pos = xlseek (fd, -bufsize, SEEK_CUR, prettyname);
++      pos = xlseek (fd, -(bufsize + bytes_read), SEEK_CUR, prettyname);
+       bytes_read = read (fd, buffer, bufsize);
+       if (bytes_read < 0)
+         {
diff --git a/pkgs/tools/misc/fffuu/default.nix b/pkgs/tools/misc/fffuu/default.nix
index 2b6172d852fc..9a9d57f15425 100644
--- a/pkgs/tools/misc/fffuu/default.nix
+++ b/pkgs/tools/misc/fffuu/default.nix
@@ -16,17 +16,17 @@ mkDerivation {
     sha256 = "1qc7p44dqja6qrjbjdc2xn7n9v41j5v59sgjnxjj5k0mxp58y1ch";
   };
 
+  postUnpack = ''
+    sourceRoot="$sourceRoot/haskell_tool"
+  '';
+
   postPatch = ''
-    substituteInPlace haskell_tool/fffuu.cabal \
+    substituteInPlace fffuu.cabal \
       --replace "containers >=0.5 && <0.6" "containers >= 0.6" \
       --replace "optparse-generic >= 1.2.3 && < 1.3" "optparse-generic >= 1.2.3" \
       --replace "split >= 0.2.3 && <= 0.2.4" "split >= 0.2.3"
   '';
 
-  preCompileBuildDriver = ''
-    cd haskell_tool
-  '';
-
   isLibrary = false;
 
   isExecutable = true;
diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 66f7c981fff4..4980c1db61a9 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "23_prerequisite_1_key_protector_add_key_protectors_framework.patch";
       url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5d260302da672258444b01239803c8f4d753e3f3";
-      hash = "sha256-9WnFN6xMiv+1XMhNHgVEegkhwzp9KpRZI6MIZY/Ih3Q=";
+      hash = "sha256-5aFHzc5qXBNLEc6yzI17AH6J7EYogcXdLxk//1QgumY=";
     })
     (fetchpatch {
       name = "23_prerequisite_2_disk_cryptodisk_allow_user_to_retry_failed_passphrase.patch";
@@ -249,7 +249,7 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "23_CVE-2024-49504.patch";
       url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13febd78db3cd85dcba67d8ad03ad4d42815f11e";
-      hash = "sha256-U7lNUb4iVAyQ1yEg5ECHCQGE51tKvY13T9Ji09Q1W9Y=";
+      hash = "sha256-GejDL9IKbmbSUmp8F1NuvBcFAp2/W04jxmOatI5dKn8=";
     })
     (fetchpatch {
       name = "24_disk_loopback_reference_tracking_for_the_loopback.patch";
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index f8442ecd6c46..a3c5818a4933 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation,
   fetchurl,
+  fetchpatch,
   lib,
   extra-cmake-modules,
   kdoctools,
@@ -18,6 +19,13 @@ mkDerivation rec {
     sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://invent.kde.org/utilities/kronometer/-/commit/949f1dccd48f4a1e3068e24d241c5ce73fe2ab8f.patch";
+      hash = "sha256-zv9ty25vQXr3xB1S7QmXx3YIouOVUoMpdZ9gHBD1gMQ=";
+    })
+  ];
+
   meta = with lib; {
     homepage = "https://kde.org/applications/utilities/kronometer/";
     description = "Stopwatch application";
diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 7c16bd121bec..5059fb58bfea 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -21,6 +21,11 @@ mkDerivation rec {
     hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.11)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     cmake
diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix
index b2ffaac64abe..0bcd31da1850 100644
--- a/pkgs/tools/misc/qt6gtk2/default.nix
+++ b/pkgs/tools/misc/qt6gtk2/default.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qt6gtk2";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitLab {
     domain = "opencode.net";
     owner = "trialuser";
     repo = "qt6gtk2";
     tag = finalAttrs.version;
-    hash = "sha256-G2TQ4LU8Cmvd+u6/s1ugbUkZcRXHTBm3+ISY0g/5/60=";
+    hash = "sha256-RJybIm0HllnYaPfsnci+9ZCGvvL9F2MC7dDbiK+L7bU=";
   };
 
   buildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "GTK+2.0 integration plugins for Qt6";
     license = lib.licenses.gpl2Plus;
-    homepage = "https://github.com/trialuser02/qt6gtk2";
+    homepage = "https://www.opencode.net/trialuser/qt6gtk2";
     maintainers = [ lib.maintainers.misterio77 ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
index 85d48ce5fdd4..f03db018f9d6 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-azure/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-azure";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-azure";
     tag = "v${version}";
-    hash = "sha256-LMX+2aNX+0vYcAKVakMrdyHavaFlUoSVQ7DIg1kXqGU=";
+    hash = "sha256-CcXcJzcIcxF3pAEgiO/tIyc6SqUw+J8IEtvql7IpWvs=";
   };
 
-  vendorHash = "sha256-yBOja0QmpVBaXbXQ2AVsO4uYLalzYyghSwyEh9s2ZGA=";
+  vendorHash = "sha256-UUsqmdilq9+nVgruL89SQIkZNE5Y+BbQcU+0+yi9BnA=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
index 94f474597ba1..c61c89f0bed9 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-github";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-github";
     tag = "v${version}";
-    hash = "sha256-A9dmn6a6K86EMxEUUyMj5OH3bhvaOFaX+xMMtwQuilo=";
+    hash = "sha256-S0MJONrJnsLj9MikwcO/GAL3m2xTwiEFSNPVJhhqzTI=";
   };
 
-  vendorHash = "sha256-wBzD/D4FDtfOTmbgbrbu54aDrKFE0bbmMehTB0cF0tE=";
+  vendorHash = "sha256-atrctIm5m0OzeiIjs7ypYKflSgO+t0iWclwOM+oZGzM=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index edd4ed74468f..94261b7be1ce 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -23,12 +23,12 @@ let
   owner = "DataDog";
   repo = "datadog-agent";
   goPackagePath = "github.com/${owner}/${repo}";
-  version = "7.70.2";
+  version = "7.71.2";
 
   src = fetchFromGitHub {
     inherit owner repo;
     tag = version;
-    hash = "sha256-yXtybHWrm+6kWW396FLlRZI0YVuThGuLfSYzoNXAEBU=";
+    hash = "sha256-WERO2vs0x5w+9L68BucvcuBWF2qoYU6qP7FvCYrnfrc=";
   };
   rtloader = stdenv.mkDerivation {
     pname = "datadog-agent-rtloader";
@@ -49,7 +49,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  vendorHash = "sha256-iWOwhfSI7mLmDy6yewV0h9Y4pjYAV6Tz6TxsINOxYMg=";
+  vendorHash = "sha256-lL31RZqSQy3iqdJ/07pxjeMMFCK9HOX2TI7xvIa2Z3s=";
 
   subPackages = [
     "cmd/agent"
diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index f43f4bbf474e..3ef641264350 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.27.3";
+  version = "0.27.4";
   rev = "v${version}";
 
   vendorHash = "sha256-JchHjQh1ZP6wdpgUwfNyhD93Wlf4FvCD0h4Tte47z3U=";
@@ -16,7 +16,7 @@ buildGoModule rec {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-r+9pII4zlPJ7UNdE0sR6Aul7p0sK+BRHq71S+NEekvM=";
+    sha256 = "sha256-wsblDh/xAXycq85spBezGZU1vikQD5wDhtFQSrCm4SI=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];
diff --git a/pkgs/tools/networking/maubot/plugins/generated.nix b/pkgs/tools/networking/maubot/plugins/generated.nix
index dbaee26f8853..9e7bf10ac8c3 100644
--- a/pkgs/tools/networking/maubot/plugins/generated.nix
+++ b/pkgs/tools/networking/maubot/plugins/generated.nix
@@ -69,7 +69,7 @@ lib.flip builtins.mapAttrs json (
             );
           in
           spdxLicenses.${spdx};
-        broken = builtins.any (x: x == null) reqDeps;
+        broken = builtins.elem null reqDeps;
       };
     }
     // lib.optionalAttrs (entry.isPoetry or false) {
diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 19b9dbc95e14..c78d310d2781 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -4,6 +4,7 @@
   fetchurl,
   iptables-legacy,
   libuuid,
+  linuxHeaders,
   openssl,
   pkg-config,
   which,
@@ -71,7 +72,12 @@ stdenv.mkDerivation rec {
   # ./configure is not a standard configure file, errors with:
   # Option not recognized : --prefix=
   dontAddPrefix = true;
+  # Similar for cross flags --host/--build
+  configurePlatforms = [ ];
   configureFlags = [
+    "--host-os=${stdenv.hostPlatform.uname.system}"
+    "--host-os-version=${linuxHeaders.version}"
+    "--host-machine=${stdenv.hostPlatform.uname.processor}"
     "--firewall=${firewall}"
     # allow using various config options
     "--ipv6"
diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 5b672b6d6b7a..26999bd53ed5 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -18,6 +18,7 @@
   fetchurl,
   fetchpatch,
   autoreconfHook,
+  audit,
   zlib,
   openssl,
   softhsm,
@@ -36,7 +37,7 @@
   nixosTests,
   withSecurityKey ? !stdenv.hostPlatform.isStatic,
   withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey,
-  withPAM ? stdenv.hostPlatform.isLinux,
+  withPAM ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
   # Attempts to mlock the entire sshd process on startup to prevent swapping.
   # Currently disabled when PAM support is enabled due to crashes
   # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103418
@@ -51,6 +52,12 @@ assert withFIDO -> withSecurityKey;
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version src;
 
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
   patches = [
     # Making openssh pass the LOCALE_ARCHIVE variable to the forked session processes,
     # so the session 'bash' will receive the proper locale archive, and thus process
@@ -59,6 +66,10 @@ stdenv.mkDerivation (finalAttrs: {
 
     # See discussion in https://github.com/NixOS/nixpkgs/pull/16966
     ./dont_create_privsep_path.patch
+
+    # See discussion in https://github.com/NixOS/nixpkgs/issues/453782 and
+    # https://github.com/openssh/openssh-portable/pull/602
+    ./fix_pkcs11_tests.patch
   ]
   ++ extraPatches;
 
@@ -66,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: {
     # On Hydra this makes installation fail (sometimes?),
     # and nix store doesn't allow such fancy permission bits anyway.
     ''
-      substituteInPlace Makefile.in --replace '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
+      substituteInPlace Makefile.in --replace-fail '$(INSTALL) -m 4711' '$(INSTALL) -m 0711'
     '';
 
   strictDeps = true;
@@ -87,7 +98,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional withFIDO libfido2
   ++ lib.optional withKerberos krb5
   ++ lib.optional withLdns ldns
-  ++ lib.optional withPAM pam;
+  ++ lib.optional withPAM pam
+  ++ lib.optional stdenv.hostPlatform.isStatic audit;
 
   preConfigure = ''
     # Setting LD causes `configure' and `make' to disagree about which linker
@@ -136,8 +148,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
-  hardeningEnable = [ "pie" ];
-
   doCheck = false;
   enableParallelChecking = false;
   nativeCheckInputs = [
@@ -163,9 +173,7 @@ stdenv.mkDerivation (finalAttrs: {
       # invoked directly and those invoked by the "remote" session
       cat > ~/.ssh/environment.base <<EOF
       NIX_REDIRECTS=/etc/passwd=$DUMMY_PASSWD
-      ${lib.optionalString (
-        !stdenv.buildPlatform.isStatic
-      ) "LD_PRELOAD=${libredirect}/lib/libredirect.so"}
+      ${lib.optionalString (!stdenv.hostPlatform.isStatic) "LD_PRELOAD=${libredirect}/lib/libredirect.so"}
       EOF
 
       # use an ssh environment file to ensure environment is set
@@ -181,13 +189,13 @@ stdenv.mkDerivation (finalAttrs: {
 
       # explicitly enable the PermitUserEnvironment feature
       substituteInPlace regress/test-exec.sh \
-        --replace \
+        --replace-fail \
           'cat << EOF > $OBJ/sshd_config' \
           $'cat << EOF > $OBJ/sshd_config\n\tPermitUserEnvironment yes'
 
       # some tests want to use files under /bin as example files
       for f in regress/sftp-cmds.sh regress/forwarding.sh; do
-        substituteInPlace $f --replace '/bin' "$(dirname $(type -p ls))"
+        substituteInPlace $f --replace-fail '/bin' "$(dirname $(type -p ls))"
       done
 
       # set up NIX_REDIRECTS for direct invocations
@@ -196,7 +204,7 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) ''
       # The extra tests check PKCS#11 interactions, which softhsm emulates with software only
       substituteInPlace regress/test-exec.sh \
-        --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
+        --replace-fail /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
     ''
   );
   # integration tests hard to get working on darwin with its shaky
@@ -218,7 +226,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Install ssh-copy-id, it's very useful.
     cp contrib/ssh-copy-id $out/bin/
     chmod +x $out/bin/ssh-copy-id
-    cp contrib/ssh-copy-id.1 $out/share/man/man1/
+    cp contrib/ssh-copy-id.1 $man/share/man/man1/
   '';
 
   installTargets = [ "install-nokeys" ];
diff --git a/pkgs/tools/networking/openssh/copyid.nix b/pkgs/tools/networking/openssh/copyid.nix
index 55da4a5c701c..e8d6f4b3f388 100644
--- a/pkgs/tools/networking/openssh/copyid.nix
+++ b/pkgs/tools/networking/openssh/copyid.nix
@@ -6,6 +6,10 @@
 
 runCommand "ssh-copy-id-${openssh.version}"
   {
+    outputs = [
+      "out"
+      "man"
+    ];
     meta = openssh.meta // {
       description = "Tool to copy SSH public keys to a remote machine";
       priority = (openssh.meta.priority or lib.meta.defaultPriority) - 1;
@@ -13,5 +17,5 @@ runCommand "ssh-copy-id-${openssh.version}"
   }
   ''
     install -Dm 755 {${openssh},$out}/bin/ssh-copy-id
-    install -Dm 644 {${openssh},$out}/share/man/man1/ssh-copy-id.1.gz
+    install -Dm 644 {${openssh.man},$man}/share/man/man1/ssh-copy-id.1.gz
   ''
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 690794bf5ec6..6e95321b3de1 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -8,28 +8,17 @@
 let
   common = opts: callPackage (import ./common.nix opts) { };
 
-  # Gets the correct OpenSSH URL for a given version.
-  urlFor =
-    version:
-    let
-      urlVersion =
-        {
-          # 10.0p1 was accidentally released as 10.0p2:
-          # https://www.openwall.com/lists/oss-security/2025/04/09/6
-          "10.0p2" = "10.0p1";
-        }
-        .${version} or version;
-    in
-    "mirror://openbsd/OpenSSH/portable/openssh-${urlVersion}.tar.gz";
+  # Gets the OpenSSH mirror URL.
+  urlFor = version: "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
 in
 {
   openssh = common rec {
     pname = "openssh";
-    version = "10.0p2";
+    version = "10.2p1";
 
     src = fetchurl {
       url = urlFor version;
-      hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw=";
+      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
     };
 
     extraPatches = [
diff --git a/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch
new file mode 100644
index 000000000000..c4459c8ee0e1
--- /dev/null
+++ b/pkgs/tools/networking/openssh/fix_pkcs11_tests.patch
@@ -0,0 +1,51 @@
+From 642218d8dd1ec79fa0c8db491fd46faa3ab026f7 Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Tue, 21 Oct 2025 01:15:55 -0700
+Subject: [PATCH 1/2] test-exec: use -P for allowed PKCS#11 library when
+ starting agent
+
+If we just loaded a PKCS#11 library, we should allow it so the
+regression test can run.
+
+Fixes: https://github.com/NixOS/nixpkgs/issues/453782
+---
+ regress/test-exec.sh | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/regress/test-exec.sh b/regress/test-exec.sh
+index 5b0c91f3faa..30b3da8709d 100644
+--- a/regress/test-exec.sh
++++ b/regress/test-exec.sh
+@@ -1023,6 +1023,9 @@ p11_ssh_add() {
+ 
+ start_ssh_agent() {
+ 	EXTRA_AGENT_ARGS="$1"
++	if [ "$PKCS11_OK" = "yes" ]; then
++		EXTRA_AGENT_ARGS="${EXTRA_AGENT_ARGS} -P${TEST_SSH_PKCS11}"
++	fi
+ 	SSH_AUTH_SOCK="$OBJ/agent.sock"
+ 	export SSH_AUTH_SOCK
+ 	rm -f $SSH_AUTH_SOCK $OBJ/agent.log
+
+From 5ae735db7d81b38ee059d63a4011291cb4456aef Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Tue, 21 Oct 2025 01:50:23 -0700
+Subject: [PATCH 2/2] test-exec: give more time for ssh-agent to start
+
+---
+ regress/test-exec.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/regress/test-exec.sh b/regress/test-exec.sh
+index 30b3da8709d..56a7653b386 100644
+--- a/regress/test-exec.sh
++++ b/regress/test-exec.sh
+@@ -1034,7 +1034,7 @@ start_ssh_agent() {
+ 	    > $OBJ/agent.log 2>&1 &
+ 	AGENT_PID=$!
+ 	trap "kill $AGENT_PID" EXIT
+-	for x in 0 1 2 3 4 ; do
++	for x in $(seq 15); do
+ 		# Give it a chance to start
+ 		${SSHADD} -l > /dev/null 2>&1
+ 		r=$?
diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 5d70b379e6ef..b55637e6649c 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  hardeningEnable = [ "pie" ];
-
   nativeBuildInputs = [
     autoreconfHook
     w3m
diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix
index be5b75282101..00e6821ce7bd 100644
--- a/pkgs/tools/nix/info/default.nix
+++ b/pkgs/tools/nix/info/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     ]
     ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ])
   );
-  is_darwin = if stdenv.hostPlatform.isDarwin then "yes" else "no";
+  is_darwin = lib.boolToYesNo stdenv.hostPlatform.isDarwin;
 
   sandboxtest = ./sandbox.nix;
   relaxedsandboxtest = ./relaxedsandbox.nix;
diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix
index 882db169d2bf..724d1dfd92a9 100644
--- a/pkgs/tools/package-management/akku/default.nix
+++ b/pkgs/tools/package-management/akku/default.nix
@@ -20,8 +20,8 @@ lib.makeScope newScope (self: rec {
           url,
           sha256,
           source,
-          synopsis ? "",
-          homepage ? "",
+          synopsis ? null,
+          homepage ? null,
           ...
         }:
         (akkuDerivation {
@@ -35,50 +35,56 @@ lib.makeScope newScope (self: rec {
           nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies;
           unpackPhase = "tar xf $src";
 
-          meta.homepage = homepage;
-          meta.description = synopsis;
-          meta.license =
-            let
-              stringToLicense =
-                s:
-                (
-                  lib.licenses
-                  // (with lib.licenses; {
-                    "0bsd" = bsd0;
-                    "agpl" = agpl3Only;
-                    "apache-2.0" = asl20;
-                    "artistic" = artistic2;
-                    "bsd" = bsd3;
-                    "bsd-1-clause" = bsd1;
-                    "bsd-2-clause" = bsd2;
-                    "bsd-3-clause" = bsd3;
-                    "cc0-1.0" = cc0;
-                    "gpl" = gpl3Only;
-                    "gpl-2" = gpl2Only;
-                    "gpl-2.0-or-later" = gpl2Plus;
-                    "gplv2" = gpl2Only;
-                    "gpl-3" = gpl3Only;
-                    "gpl-3.0" = gpl3Only;
-                    "gpl-3.0-or-later" = gpl3Plus;
-                    "gplv3" = gpl3Only;
-                    "lgpl" = lgpl3Only;
-                    "lgpl-2" = lgpl2Only;
-                    "lgpl-2.0+" = lgpl2Plus;
-                    "lgpl-2.1" = lgpl21Only;
-                    "lgpl-2.1-or-later" = lgpl21Plus;
-                    "lgpl-3.0-or-later" = lgpl3Plus;
-                    "lgpl-3" = lgpl3Only;
-                    "lgplv3" = lgpl3Only;
-                    "public-domain" = publicDomain;
-                    "srfi" = bsd3;
-                    "unicode" = ucd;
-                    "xerox" = xerox;
-                    "zlib-acknowledgement" = zlib;
-                    "noassertion" = free;
-                  })
-                ).${s} or s;
-            in
-            if builtins.isList license then map stringToLicense license else stringToLicense license;
+          meta = {
+            license =
+              let
+                stringToLicense =
+                  s:
+                  (
+                    lib.licenses
+                    // (with lib.licenses; {
+                      "0bsd" = bsd0;
+                      "agpl" = agpl3Only;
+                      "apache-2.0" = asl20;
+                      "artistic" = artistic2;
+                      "bsd" = bsd3;
+                      "bsd-1-clause" = bsd1;
+                      "bsd-2-clause" = bsd2;
+                      "bsd-3-clause" = bsd3;
+                      "cc0-1.0" = cc0;
+                      "gpl" = gpl3Only;
+                      "gpl-2" = gpl2Only;
+                      "gpl-2.0-or-later" = gpl2Plus;
+                      "gplv2" = gpl2Only;
+                      "gpl-3" = gpl3Only;
+                      "gpl-3.0" = gpl3Only;
+                      "gpl-3.0-or-later" = gpl3Plus;
+                      "gplv3" = gpl3Only;
+                      "lgpl" = lgpl3Only;
+                      "lgpl-2" = lgpl2Only;
+                      "lgpl-2.0+" = lgpl2Plus;
+                      "lgpl-2.1" = lgpl21Only;
+                      "lgpl-2.1-or-later" = lgpl21Plus;
+                      "lgpl-3.0-or-later" = lgpl3Plus;
+                      "lgpl-3" = lgpl3Only;
+                      "lgplv3" = lgpl3Only;
+                      "public-domain" = publicDomain;
+                      "srfi" = bsd3;
+                      "unicode" = ucd;
+                      "xerox" = xerox;
+                      "zlib-acknowledgement" = zlib;
+                      "noassertion" = free;
+                    })
+                  ).${s} or s;
+              in
+              if builtins.isList license then map stringToLicense license else stringToLicense license;
+          }
+          // lib.optionalAttrs (homepage != null) {
+            inherit homepage;
+          }
+          // lib.optionalAttrs (synopsis != null) {
+            description = synopsis;
+          };
         }).overrideAttrs
           ({ "${pname}" = lib.id; } // overrides)."${pname}";
       deps = lib.importTOML ./deps.toml;
diff --git a/pkgs/tools/package-management/lix/common-lix.nix b/pkgs/tools/package-management/lix/common-lix.nix
index a777fa228986..d34a4590823a 100644
--- a/pkgs/tools/package-management/lix/common-lix.nix
+++ b/pkgs/tools/package-management/lix/common-lix.nix
@@ -373,7 +373,6 @@ stdenv.mkDerivation (finalAttrs: {
   # fortify breaks the build with lto and musl for some reason
   ++ lib.optional stdenv.hostPlatform.isMusl "fortify";
 
-  # hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
   separateDebugInfo = stdenv.hostPlatform.isLinux && !enableStatic;
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/package-management/lix/default.nix b/pkgs/tools/package-management/lix/default.nix
index c3cc1f9afc2d..7f4fd1a3ee8d 100644
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@@ -217,14 +217,14 @@ lib.makeExtensible (
       attrName = "git";
 
       lix-args = rec {
-        version = "2.94.0-pre-20251010_${builtins.substring 0 12 src.rev}";
+        version = "2.94.0-pre-20251018_${builtins.substring 0 12 src.rev}";
 
         src = fetchFromGitea {
           domain = "git.lix.systems";
           owner = "lix-project";
           repo = "lix";
-          rev = "53d172a3083840846043f7579936e0a3e86737e5";
-          hash = "sha256-PPDHXtv6U5oIj8utzIqcH+ZSjMy4vXpv/y8c2I7dZ+g=";
+          rev = "6e2edbff930dbf5b17a23e23f0b563e1db201f5b";
+          hash = "sha256-t2f3YDiRTi6GTHc940lwozaxY7RFE1CW7EeNtVYG+FE=";
         };
 
         cargoDeps = rustPlatform.fetchCargoVendor {
diff --git a/pkgs/tools/package-management/nix/common-meson.nix b/pkgs/tools/package-management/nix/common-meson.nix
index 66a221c55521..40094ecac21b 100644
--- a/pkgs/tools/package-management/nix/common-meson.nix
+++ b/pkgs/tools/package-management/nix/common-meson.nix
@@ -101,8 +101,6 @@ stdenv.mkDerivation (finalAttrs: {
     "doc"
   ];
 
-  hardeningEnable = lib.optionals (!stdenv.hostPlatform.isDarwin) [ "pie" ];
-
   hardeningDisable = [
     "shadowstack"
   ]
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index ee010b6a3e04..b5d0314bd2d7 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -180,28 +180,28 @@ lib.makeExtensible (
       nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;
 
       nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.32.0";
+        version = "2.32.3";
         inherit (self.nix_2_31.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_32";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
           tag = version;
-          hash = "sha256-OOd7dFe0tX0CVPygR7U6cqs5fiJAvFO1el1QmjDG1GM=";
+          hash = "sha256-DrYVpBbff2zwtyrhll3fAHUYplJ8AEnd0aZa2VAY88I=";
         };
       };
 
       nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything;
 
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.32pre20250919_${lib.substring 0 8 src.rev}";
+        version = "2.33pre20251107_${lib.substring 0 8 src.rev}";
         inherit maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_git";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "07b96c1d14ab8695e5071fb73e19049fce8f3b6b";
-          hash = "sha256-9tR08zFwQ9JNohdfeb40wcLfRnicXpKrHF+FHFva/WA=";
+          rev = "479b6b73a9576452c14ca66b7f3cd4873969077e";
+          hash = "sha256-eBjgsauQXFz2yeiNoPEzgkf7uyV+S8HYCQgZhPVx/9I=";
         };
       };
 
diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
index 75ca70ae8fbd..b6f58434bd8b 100644
--- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
+++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
@@ -10,6 +10,7 @@
   jq,
   python3,
   rsync,
+  json-schema-for-humans,
   nix-cli,
 
   # Configuration Options
@@ -39,6 +40,9 @@ mkMesonDerivation (finalAttrs: {
     jq
     python3
     rsync
+  ]
+  ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [
+    json-schema-for-humans
   ];
 
   nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
diff --git a/pkgs/tools/package-management/nix/modular/packaging/components.nix b/pkgs/tools/package-management/nix/modular/packaging/components.nix
index 2a8b5e12a4c4..df8ee0671382 100644
--- a/pkgs/tools/package-management/nix/modular/packaging/components.nix
+++ b/pkgs/tools/package-management/nix/modular/packaging/components.nix
@@ -150,7 +150,6 @@ let
       pkg-config
     ];
     separateDebugInfo = !stdenv.hostPlatform.isStatic;
-    hardeningDisable = lib.optional stdenv.hostPlatform.isStatic "pie";
   };
 
   mesonLibraryLayer = finalAttrs: prevAttrs: {
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 988ed8d23370..fc24d6bccf59 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
@@ -9,6 +9,7 @@
   boost,
   curl,
   aws-sdk-cpp,
+  aws-crt-cpp,
   libseccomp,
   nlohmann_json,
   sqlite,
@@ -37,9 +38,10 @@ mkMesonLibrary (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
   # There have been issues building these dependencies
-  ++ lib.optional (
-    stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)
-  ) aws-sdk-cpp;
+  ++
+    lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+      # Nix >=2.33 doesn't depend on aws-sdk-cpp and only requires aws-crt-cpp for authenticated s3:// requests.
+      (if lib.versionAtLeast (lib.versions.majorMinor version) "2.33" then aws-crt-cpp else aws-sdk-cpp);
 
   propagatedBuildInputs = [
     nix-util
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 379ca62ac758..e96438dd4f23 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit";
-  version = "1.3.1";
+  version = "1.3.2";
 
   outputs = [
     "out"
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "PackageKit";
     repo = "PackageKit";
     rev = "v${version}";
-    hash = "sha256-8sgvD6pZ2n4Du44kTPsvYtSYpkMKCpfxeSrGjWeSw50=";
+    hash = "sha256-oQuJpn9G/V8CrrEs2agbKVS9xZnS1MgHa8B8P1nFmiw=";
   };
 
   buildInputs = [
diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index ff156cf8559b..59e81df66a30 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit-qt";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit-Qt";
     tag = "v${version}";
-    hash = "sha256-ZHkOFPaOMLCectYKzQs9oQ70kv8APOdkjDRimHgld+c=";
+    hash = "sha256-D1LsEaxc6lA0ULmYQ9n2KEs6NpoHeTgOJsKzdEnImUM=";
   };
 
   buildInputs = [ packagekit ];
diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix
index 49f144d390ba..343004ddc324 100644
--- a/pkgs/tools/package-management/rpm/default.nix
+++ b/pkgs/tools/package-management/rpm/default.nix
@@ -19,7 +19,6 @@
   sqlite,
   zstd,
   libcap,
-  apple-sdk_13,
   darwinMinVersionHook,
   openssl,
   #, libselinux
@@ -90,10 +89,6 @@ stdenv.mkDerivation rec {
     libcap
     audit
     systemd
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    apple-sdk_13
-    (darwinMinVersionHook "13.0")
   ];
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix
index 77b03e236090..a5680ad34a8c 100644
--- a/pkgs/tools/security/bitwarden-directory-connector/default.nix
+++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix
@@ -19,14 +19,14 @@ let
     }:
     buildNpmPackage rec {
       pname = name;
-      version = "2025.9.0";
+      version = "2025.10.0";
       nodejs = nodejs_22;
 
       src = fetchFromGitHub {
         owner = "bitwarden";
         repo = "directory-connector";
         rev = "v${version}";
-        hash = "sha256-owzOgaYSbtsnZ0AvSWWFdSx96agJyBUM2steGIeg2E4=";
+        hash = "sha256-QzXZN1YWpWCila2wuSyzzuugW4W6UVkJNQM9xQr1Og0=";
       };
 
       postPatch = ''
@@ -38,7 +38,7 @@ let
           --replace-fail "AppImage" "dir"
       '';
 
-      npmDepsHash = "sha256-brO+GGwdZyCDYycur5QnLKCcFZc1J2pM+vQPLtjUD/I=";
+      npmDepsHash = "sha256-VgzQGfP13n9Zl/7V5g2KWFLa9J15rUhY3wx5E5CWMi0=";
 
       env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix
index 5028d1096e32..c10aabed38aa 100644
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -10,7 +10,6 @@
   xclip,
   wl-clipboard,
   passAlias ? false,
-  apple-sdk_14,
   nix-update-script,
   versionCheckHook,
 }:
@@ -36,11 +35,6 @@ buildGoModule (finalAttrs: {
     makeBinaryWrapper
   ];
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    # For ScreenCaptureKit.h, see https://github.com/NixOS/nixpkgs/pull/358760#discussion_r1858327365
-    apple-sdk_14
-  ];
-
   src = fetchFromGitHub {
     owner = "gopasspw";
     repo = "gopass";
diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 7ec4a4577ebb..cdb837262499 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -38,6 +38,17 @@ stdenv.mkDerivation rec {
     cppcodec
   ];
 
+  # CMake 3.1 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)" \
+      "cmake_minimum_required(VERSION 3.10  FATAL_ERROR)" \
+    --replace-fail \
+      "cmake_policy(SET CMP0043 OLD)" \
+      "cmake_policy(SET CMP0043 NEW)"
+  '';
+
   meta = with lib; {
     description = "Provides extra functionality for the Nitrokey Pro and Storage";
     mainProgram = "nitrokey-app";
diff --git a/pkgs/tools/system/nvtop/build-nvtop.nix b/pkgs/tools/system/nvtop/build-nvtop.nix
index 79721da656b4..df66ef58e24a 100644
--- a/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -9,7 +9,6 @@
   ncurses,
   testers,
   udev,
-  apple-sdk_12,
   addDriverRunpath,
   amd ? false,
   intel ? false,
@@ -77,7 +76,6 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux udev
-  ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_12
   ++ lib.optional nvidia cudatoolkit
   ++ lib.optional needDrm libdrm;
 
diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 92bfd09fef2a..d5e18a1a8c2a 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -62,11 +62,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rsyslog";
-  version = "8.2508.0";
+  version = "8.2510.0";
 
   src = fetchurl {
     url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
-    hash = "sha256-yJsedNNtDKSpW3Shq+Nu0LH6rIt8i+RxqEFc+ndiBv0=";
+    hash = "sha256-pwqYNBhoWVOaak0cez9owjiX6AWCm3ZKRekssMyV5mo=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/tools/system/stacer/default.nix b/pkgs/tools/system/stacer/default.nix
deleted file mode 100644
index 05303b472ac9..000000000000
--- a/pkgs/tools/system/stacer/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  qtcharts,
-  qttools,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "stacer";
-  version = "1.1.0";
-
-  src = fetchFromGitHub {
-    owner = "oguzhaninan";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd";
-  };
-
-  postPatch = ''
-    substituteInPlace stacer/Managers/app_manager.cpp \
-      --replace 'qApp->applicationDirPath() + "/translations"' \
-                'QStandardPaths::locate(QStandardPaths::AppDataLocation, "translations", QStandardPaths::LocateDirectory)'
-  '';
-
-  buildInputs = [
-    qtcharts
-    qttools
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    wrapQtAppsHook
-  ];
-
-  preConfigure = ''
-    lrelease stacer/stacer.pro
-  '';
-
-  postInstall = ''
-    install -Dm644 ../translations/*.qm -t $out/share/stacer/translations
-  '';
-
-  meta = with lib; {
-    description = "Linux System Optimizer and Monitoring";
-    homepage = "https://github.com/oguzhaninan/stacer";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dit7ya ];
-    platforms = platforms.linux;
-    mainProgram = "stacer";
-  };
-}
diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index d82686d98c3e..aa42eeaf0b9f 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
     # https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html
     # Multiple upstream commits squashed with adjustments, see header
     ./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
-  ]
-  ++ lib.optionals stdenv.hostPlatform.useLLVM [
+
     ./musl-llvm.patch
   ];
 
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index 6bc745fe88b7..015b2409e115 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -32,12 +32,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-+MNIZQnecFGSE4sA7ywAu73Q6Eww1cB9I/xzqdxMycw=";
   };
 
-  # PIE is incompatible with the "persistent malloc" ("pma") feature.
-  # While build system attempts to pass -no-pie to gcc. nixpkgs' `ld`
-  # wrapped still passes `-pie` flag to linker and breaks linkage.
-  # Let's disable "pie" until `ld` is fixed to do the right thing.
-  hardeningDisable = [ "pie" ];
-
   # When we do build separate interactive version, it makes sense to always include man.
   outputs = [
     "out"
diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix
index abea3e32a139..7fc2b6177fc7 100644
--- a/pkgs/tools/text/gawk/gawkextlib.nix
+++ b/pkgs/tools/text/gawk/gawkextlib.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  recurseIntoAttrs,
   fetchgit,
   pkg-config,
   autoreconfHook,
@@ -212,7 +211,7 @@ let
     };
   };
 in
-recurseIntoAttrs (
+lib.recurseIntoAttrs (
   libs
   // {
     inherit gawkextlib buildExtension;
diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index e63584274cff..4cd623c77118 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -15,13 +15,13 @@
 let
   self = stdenv.mkDerivation rec {
     pname = "highlight";
-    version = "4.16";
+    version = "4.17";
 
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
       rev = "v${version}";
-      hash = "sha256-SAOlW2IaYY2GzQ+1FClqm62pcxdtf1cow2R4MRS/2Vg=";
+      hash = "sha256-XSfiQGMd7GtewyZ72VK/0D9Z9sYzVBWeO1CQXVk63Zc=";
     };
 
     enableParallelBuilding = true;
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index ade00aa8a608..f23fcc28b61e 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -42,7 +42,6 @@
   makeFontsConf,
   useFixedHashes ? true,
   extraMirrors ? [ ],
-  recurseIntoAttrs,
   nixfmt,
   luajit,
 }:
@@ -543,7 +542,7 @@ let
     license = licenses.scheme-infraonly;
   };
 
-  combined = recurseIntoAttrs (
+  combined = lib.recurseIntoAttrs (
     lib.genAttrs
       [
         "scheme-basic"
diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix
deleted file mode 100644
index fcc46987c74a..000000000000
--- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  qtbase,
-  qtdeclarative,
-  qtx11extras ? null, # qt5 only
-  kcoreaddons,
-  ki18n,
-  knotifications,
-  kpipewire,
-  kstatusnotifieritem ? null, # qt6 only
-  kwindowsystem,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xwaylandvideobridge";
-  version = "0.4.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qtbase
-    qtdeclarative
-    qtx11extras
-    kcoreaddons
-    ki18n
-    knotifications
-    kpipewire
-    kstatusnotifieritem
-    kwindowsystem
-  ];
-
-  cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ];
-
-  meta = {
-    description = "Utility to allow streaming Wayland windows to X applications";
-    homepage = "https://invent.kde.org/system/xwaylandvideobridge";
-    license = with lib.licenses; [
-      bsd3
-      cc0
-      gpl2Plus
-    ];
-    maintainers = with lib.maintainers; [ stepbrobd ];
-    platforms = lib.platforms.linux;
-    mainProgram = "xwaylandvideobridge";
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 100178208b70..121d30687ffb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -29,21 +29,8 @@ let
     else
       alias;
 
-  transmission3Warning =
-    {
-      prefix ? "",
-      suffix ? "",
-    }:
-    let
-      p = "${prefix}transmission${suffix}";
-      p3 = "${prefix}transmission_3${suffix}";
-      p4 = "${prefix}transmission_4${suffix}";
-    in
-    "${p} has been renamed to ${p3} since ${p4} is also available. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)";
-
   deprecatedPlasma5Packages = {
     inherit (plasma5Packages)
-      akonadi
       akonadi-calendar
       akonadi-calendar-tools
       akonadi-contacts
@@ -52,75 +39,40 @@ let
       akonadi-notes
       akonadi-search
       akonadiconsole
-      akregator
       alligator
       analitza
       angelfish
       applet-window-appmenu
       applet-window-buttons
-      arianna
-      ark
       audiotube
       aura-browser
       baloo-widgets
       bismuth
-      bluedevil
-      bomber
       booth
-      bovo
-      breeze-grub
-      breeze-gtk
-      breeze-plymouth
-      breeze-qt5
       buho
       calendarsupport
       calindori
       cantor
       clip
-      colord-kde
       communicator
-      dolphin
       dolphin-plugins
-      dragon
-      elisa
       eventviews
-      falkon
-      ffmpegthumbs
-      filelight
       flatpak-kcm
       ghostwriter
-      granatier
       grantleetheme
-      gwenview
       incidenceeditor
       index
       juk
       kaccounts-integration
       kaccounts-providers
-      kactivitymanagerd
-      kaddressbook
       kalarm
       kalgebra
       kalk
-      kalzium
       kamoso
-      kapman
-      kapptemplate
       kasts
-      kate
-      katomic
-      kblackbox
-      kblocks
-      kbounce
       kbreakout
-      kcachegrind
-      kcalc
       kcalutils
-      kcharselect
       kclock
-      kcolorchooser
-      kde-cli-tools
-      kde-gtk-config
       kde-inotify-survey
       kde2-decoration
       kdebugsettings
@@ -129,107 +81,50 @@ let
       kdegraphics-mobipocket
       kdegraphics-thumbnailers
       kdenetwork-filesharing
-      kdenlive
       kdepim-runtime
-      kdeplasma-addons
-      kdev-php
-      kdev-python
-      kdevelop
-      kdevelop-pg-qt
-      kdevelop-unwrapped
-      kdf
-      kdialog
-      kdiamond
-      keditbookmarks
       keysmith
-      kfind
-      kgamma5
       kgeography
-      kget
-      kgpg
-      khelpcenter
       khotkeys
       kidentitymanagement
-      kig
-      kigo
-      killbots
       kimap
-      kinfocenter
       kio-admin
       kio-extras
       kio-gdrive
       kipi-plugins
       kirigami-gallery
       kldap
-      kleopatra
-      klettres
-      klines
-      kmag
       kmahjongg
       kmail-account-wizard
       kmailtransport
       kmbox
-      kmenuedit
       kmime
-      kmines
-      kmix
       kmousetool
-      kmplot
-      knavalbattle
-      knetwalk
-      knights
       knotes
       koko
       kolf
-      kollision
-      kolourpaint
-      kompare
       kongress
       konqueror
       konquest
-      konsole
       kontactinterface
-      konversation
       kopeninghours
-      korganizer
       kosmindoormap
       kpat
       kpimtextedit
       kpipewire
-      kpkpass
       kpmcore
       kpublictransport
       kqtquickcharts
-      krdc
       krecorder
       kreport
-      kreversi
-      krfb
       kruler
       ksanecore
-      kscreen
-      kscreenlocker
-      kshisen
       ksmtp
       kspaceduel
-      ksquares
-      ksshaskpass
       ksudoku
-      ksystemlog
       ksystemstats
-      kteatime
-      ktimer
       ktnef
-      ktorrent
       ktrip
-      kturtle
-      kwallet-pam
-      kwalletmanager
-      kwave
-      kwayland-integration
       kweather
-      kwin
-      kwrited
       kzones
       layer-shell-qt
       libgravatar
@@ -251,7 +146,6 @@ let
       lightly
       mailcommon
       mailimporter
-      marble
       mauikit
       mauikit-accounts
       mauikit-calendar
@@ -262,84 +156,47 @@ let
       mauikit-texteditor
       mauiman
       mbox-importer
-      merkuro
       messagelib
-      milou
-      minuet
-      okular
-      oxygen
       oxygen-sounds
       palapeli
       parachute
       partitionmanager
-      picmi
       pim-data-exporter
       pim-sieve-editor
       pimcommon
       plank-player
       plasma-bigscreen
-      plasma-browser-integration
-      plasma-desktop
       plasma-dialer
       plasma-disks
       plasma-firewall
-      plasma-integration
-      plasma-mobile
-      plasma-nano
-      plasma-nm
-      plasma-pa
       plasma-phonebook
       plasma-remotecontrollers
       plasma-sdk
       plasma-settings
-      plasma-systemmonitor
-      plasma-thunderbolt
-      plasma-vault
       plasma-welcome
-      plasma-workspace
-      plasma-workspace-wallpapers
       plasmatube
       polkit-kde-agent
-      powerdevil
       print-manager
       qmlkonsole
-      qqc2-breeze-style
       rocs
-      sddm-kcm
       shelf
       sierra-breeze-enhanced
-      skanlite
-      skanpage
       soundkonverter
-      spectacle
       station
-      systemsettings
       telly-skout
       tokodon
       umbrello
       vvave
-      xdg-desktop-portal-kde
       xwaylandvideobridge
-      yakuake
-      zanshin
-      ;
-
-    inherit (plasma5Packages.thirdParty)
-      krohnkite
-      krunner-ssh
-      krunner-symbols
-      kwin-dynamic-workspaces
-      kwin-tiling
-      plasma-applet-caffeine-plus
-      plasma-applet-virtual-desktop-bar
       ;
 
     inherit (libsForQt5)
-      sddm
       neochat # added 2025-07-04
       itinerary # added 2025-07-04
       libquotient # added 2025-07-04
       ;
+
+    kexi = throw ""; # Added 2025-08-21
   };
 
   makePlasma5Throw =
@@ -362,351 +219,247 @@ let
     aliases: lib.mapAttrs (n: alias: removeRecurseForDerivations (checkInPkgs n alias)) aliases;
 
   plasma5Throws = mapAliases (lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages);
+
+  warnAlias =
+    msg: v:
+    if lib.isDerivation v then
+      lib.warnOnInstantiate msg v
+    else if lib.isAttrs v then
+      lib.mapAttrs (_: lib.warn msg) v
+    else if lib.isFunction v then
+      arg: lib.warn msg (v arg)
+    else if lib.isList v then
+      map (lib.warn msg) v
+    else
+      # Can’t do better than this, and a `throw` would be more
+      # disruptive for users…
+      #
+      # `nix search` flags up warnings already, so hopefully this won’t
+      # make things much worse until we have proper CI for aliases,
+      # especially since aliases of paths and numbers are presumably
+      # not common.
+      lib.warn msg v;
 in
 
 mapAliases {
-  # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
-  forceSystem = system: _: (import self.path { localSystem = { inherit system; }; });
+  # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
+  llvmPackages_latest = llvmPackages_21;
+  llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
+  # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.
+  clang18Stdenv = lib.lowPrio llvmPackages_18.stdenv;
+  clang19Stdenv = lib.lowPrio llvmPackages_19.stdenv;
+
+  # Various to preserve
+  autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo
+  elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8
+  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
+  fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
+  uclibc = uclibc-ng; # preserve, because uclibc-ng can't be used in config string
+  wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
+  wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
+
+  # keep-sorted start case=no numeric=yes block=yes
 
-  ### _ ###
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
-  _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
+  _1password = throw "'_1password' has been renamed to/replaced by '_1password-cli'"; # Converted to throw 2025-10-27
   _2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
-  _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05
-  "7z2hashcat" =
-    throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
-
-  ### A ###
-
-  AusweisApp2 = ausweisapp; # Added 2023-11-08
-  a4term = a4; # Added 2023-10-06
+  a4term = throw "'a4term' has been renamed to/replaced by 'a4'"; # Converted to throw 2025-10-27
   abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09
   abseil-cpp_202501 = throw "abseil-cpp_202501 has been removed as it was unused in tree"; # Added 2025-09-15
   abseil-cpp_202505 = throw "abseil-cpp_202505 has been removed as it was unused in tree"; # Added 2025-09-15
-  acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27
-  acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
-  adminer-pematon = adminneo; # Added 2025-02-20
-  adminerneo = adminneo; # Added 2025-02-27
-  adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; # Added 2024-02-14
+  adminer-pematon = throw "'adminer-pematon' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27
+  adminerneo = throw "'adminerneo' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27
   adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31
-  adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
-  adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09
-  adoptopenjdk-bin-17-packages-darwin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-bin-17-packages-linux = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-jre-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
-  addOpenGLRunpath = throw "addOpenGLRunpath has been removed. Use addDriverRunpath instead."; # Converted to throw 2024-11-17
-  aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
-  afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
   afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
-  agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10
-  ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12
-  akkoma-emoji = recurseIntoAttrs {
-    blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
-  };
-  akkoma-frontends = recurseIntoAttrs {
-    admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
-    akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
-  };
-  alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
-  alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
-  alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
-  alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17
-  alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17
-  alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17
-  alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
+  akkoma-emoji = throw "'akkoma-emoji' has been renamed to/replaced by 'blobs_gg'"; # Converted to throw 2025-10-27
+  akkoma-frontends.admin-fe = throw "'akkoma-frontends.admin-fe' has been renamed to/replaced by 'akkoma-admin-fe'"; # Converted to throw 2025-10-27
+  akkoma-frontends.akkoma-fe = throw "'akkoma-frontends.akkoma-fe' has been renamed to/replaced by 'akkoma-fe'"; # Converted to throw 2025-10-27
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
-  angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
-  animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
-  ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
-  ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
-  ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24
-  ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
-  antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
+  ams-lv2 = throw "'ams-lv2' has been removed due to being archived upstream."; # Added 2025-10-26
+  android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
   androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23b = throw "androidndkPkgs_23b has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_24 = throw "androidndkPkgs_24 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_25 = throw "androidndkPkgs_25 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_26 = throw "androidndkPkgs_26 has been removed, as it is EOL"; # Added 2025-08-09
-  ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
-  ao = libfive; # Added 2024-10-11
-  anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04
-  antic = throw "'antic' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
-  anevicon = throw "'anevicon' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
-  apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2024-06-13
-  apacheKafka_3_6 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2024-11-27
+  animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
+  ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24
+  ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
+  antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
+  ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27
+  apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27
   apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
-  antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
-  apacheAnt = ant; # Added 2024-11-28
-  apparmor-kernel-patches = throw "'apparmor-kernel-patches' has been removed as they were unmaintained, irrelevant and effectively broken"; # Added 2025-04-20
-  appimagekit = throw "'appimagekit' has been removed as it was broken in nixpkgs and archived upstream"; # Added 2025-04-19
-  apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
-  apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27
-  apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27
-  apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27
-  appthreat-depscan = dep-scan; # Added 2024-04-10
+  apple-sdk_11 = throw "apple-sdk_11 was removed as Nixpkgs no longer supports macOS 11; see the 25.11 release notes"; # Added 2025-05-10
+  apple-sdk_12 = throw "apple-sdk_12 was removed as Nixpkgs no longer supports macOS 12; see the 25.11 release notes"; # Added 2025-05-10
+  apple-sdk_13 = throw "apple-sdk_13 was removed as Nixpkgs no longer supports macOS 13; see the 25.11 release notes"; # Added 2025-05-10
+  appthreat-depscan = throw "'appthreat-depscan' has been renamed to/replaced by 'dep-scan'"; # Converted to throw 2025-10-27
   arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12
-  arb = throw "'arb' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03
-  arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07
   archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15
   archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01
   ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Aded 2025-10-04
-  argo = argo-workflows; # Added 2025-02-01
-  aria = aria2; # Added 2024-03-26
+  argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27
+  aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27
+  arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   artim-dark = aritim-dark; # Added 2025-07-27
-  armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
-  aseprite-unfree = aseprite; # Added 2023-08-26
-  asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
-  async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  atlassian-crowd = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  atlassian-jira = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
+  aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27
+  asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27
+  asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
+  atlassian-cli = appfire-cli; # Added 2025-09-29
   ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
-  audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
-  auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
+  AusweisApp2 = throw "'AusweisApp2' has been renamed to/replaced by 'ausweisapp'"; # Converted to throw 2025-10-27
   autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21
   autopanosiftc = throw "'autopanosiftc' has been removed, as it is unmaintained upstream"; # Added 2025-10-07
-  autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo
   autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21
-  aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
-  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
-  autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   av-98 = throw "'av-98' has been removed because it has been broken since at least November 2024."; # Added 2025-10-03
-  avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17
   avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
+  awesome-4-0 = throw "'awesome-4-0' has been renamed to/replaced by 'awesome'"; # Converted to throw 2025-10-27
+  awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
   axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
-  awesome-4-0 = awesome; # Added 2022-05-05
-  aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
-  aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
-
-  ### B ###
-
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
-  badtouch = authoscope; # Project was renamed, added 20210626
-  badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
-  baget = throw "'baget' has been removed due to being unmaintained"; # Added 2023-03-19
+  badtouch = throw "'badtouch' has been renamed to/replaced by 'authoscope'"; # Converted to throw 2025-10-27
   bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
   banking = saldo; # added 2025-08-29
+  barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
   base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
   baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02
-  bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
-  bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
-  barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
-  bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
   bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
   bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20
   bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20
   bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20
   bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20
-  BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
-  beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
-  beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
-  inherit (beetsPackages) beets-unstable;
+  beets-unstable = throw "beets-unstable has been removed in favor of beets since upstream is releasing versions frequently nowadays"; # Added 2025-10-16
+  beetsPackages = throw "beetsPackages were replaced with python3.pkgs.beets- prefixed attributes, and top-level beets* attributes"; # Added 2025-10-16
   belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
   belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
-  betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
-  betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
+  bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
   bitbucket-server-cli = throw "bitbucket-server-cli has been removed due to lack of maintenance upstream."; # Added 2025-05-27
   bitcoin-abc = throw "bitcoin-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
-  bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
   bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
-  bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
-  bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11
-  bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
-  bitwarden = bitwarden-desktop; # Added 2024-02-25
-  blender-with-packages =
-    args:
-    lib.warnOnInstantiate
-      "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"
-      (blender.withPackages (_: args.packages)).overrideAttrs
-      (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
-  bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15
-  blockbench-electron = blockbench; # Added 2024-03-16
-  bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02
+  bitwarden = throw "'bitwarden' has been renamed to/replaced by 'bitwarden-desktop'"; # Converted to throw 2025-10-27
+  bitwarden_rs = throw "'bitwarden_rs' has been renamed to/replaced by 'vaultwarden'"; # Converted to throw 2025-10-27
+  bitwarden_rs-mysql = throw "'bitwarden_rs-mysql' has been renamed to/replaced by 'vaultwarden-mysql'"; # Converted to throw 2025-10-27
+  bitwarden_rs-postgresql = throw "'bitwarden_rs-postgresql' has been renamed to/replaced by 'vaultwarden-postgresql'"; # Converted to throw 2025-10-27
+  bitwarden_rs-sqlite = throw "'bitwarden_rs-sqlite' has been renamed to/replaced by 'vaultwarden-sqlite'"; # Converted to throw 2025-10-27
+  bitwarden_rs-vault = throw "'bitwarden_rs-vault' has been renamed to/replaced by 'vaultwarden-vault'"; # Converted to throw 2025-10-27
+  blas-reference = throw "blas-reference has been removed since it has been discontinued as free-standing package. It is now contained within lapack-reference."; # Added 2025-10-21
+  blender-with-packages = throw "blender-with-packages is deprecated in in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"; # Converted to throw 2025-10-26
+  blockbench-electron = throw "'blockbench-electron' has been renamed to/replaced by 'blockbench'"; # Converted to throw 2025-10-27
   bloomeetunes = throw "bloomeetunes is unmaintained and has been removed"; # Added 2025-08-26
-  bmap-tools = bmaptool; # Added 2024-08-05
-  boost175 = throw "Boost 1.75 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
-  boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
-  boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
-  boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01
+  bmap-tools = throw "'bmap-tools' has been renamed to/replaced by 'bmaptool'"; # Converted to throw 2025-10-27
+  botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
-  bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17
-  brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29
+  brasero-original = throw "'brasero-original' has been renamed to/replaced by 'brasero-unwrapped'"; # Converted to throw 2025-10-27
   breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  bridgand = throw "'brigand' has been removed due to being unmaintained"; # Added 2025-04-30
-  brogue = lib.warnOnInstantiate "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
-  bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
-  buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15
-
-  budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
-  budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
-  buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
+  brogue = warnAlias "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
-  buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18
+  buildPlatform = warnAlias "'buildPlatform' has been renamed to/replaced by 'stdenv.buildPlatform'" stdenv.buildPlatform; # Converted to warning 2025-10-28
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
-
-  bwidget = tclPackages.bwidget; # Added 2024-10-02
-  buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11"; # Converted to throw 2025-06-01
-
-  bitwarden_rs = vaultwarden; # Added 2021-07-01
-  bitwarden_rs-mysql = vaultwarden-mysql; # Added 2021-07-01
-  bitwarden_rs-postgresql = vaultwarden-postgresql; # Added 2021-07-01
-  bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01
-  bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01
-
+  bwidget = throw "'bwidget' has been renamed to/replaced by 'tclPackages.bwidget'"; # Converted to throw 2025-10-27
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
-
-  ### C ###
-
-  caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
-  calcium = throw "'calcium' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
-  calculix = calculix-ccx; # Added 2024-12-18
-  calligra = kdePackages.calligra; # Added 2024-09-27
-  callPackage_i686 = pkgsi686Linux.callPackage;
-  cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29
-  cask = emacs.pkgs.cask; # Added 2022-11-12
-  catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
-  catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19
-  canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
+  calculix = throw "'calculix' has been renamed to/replaced by 'calculix-ccx'"; # Converted to throw 2025-10-27
+  calligra = throw "'calligra' has been renamed to/replaced by 'kdePackages.calligra'"; # Converted to throw 2025-10-27
+  callPackage_i686 = throw "'callPackage_i686' has been renamed to/replaced by 'pkgsi686Linux.callPackage'"; # Converted to throw 2025-10-27
+  canonicalize-jars-hook = throw "'canonicalize-jars-hook' has been renamed to/replaced by 'stripJavaArchivesHook'"; # Converted to throw 2025-10-27
   cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09
-  cargo-espflash = espflash; # Added 2024-02-09
-  cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  cargo-information = throw "'cargo-information' has been removed due to being merged upstream into 'cargo'"; # Added 2025-03-09
-  cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26
-  cargo-web = throw "'cargo-web' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
+  cargo-espflash = throw "'cargo-espflash' has been renamed to/replaced by 'espflash'"; # Converted to throw 2025-10-27
   cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18
-  cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23
-  cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23
-  cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; # Added 2023-09-05
+  cask = throw "'cask' has been renamed to/replaced by 'emacs.pkgs.cask'"; # Converted to throw 2025-10-27
   catalyst-browser = throw "'catalyst-browser' has been removed due to a lack of maintenance and not satisfying our security criteria for browsers."; # Added 2025-06-25
   cataract = throw "'cataract' has been removed due to a lack of maintenace"; # Added 2025-08-25
   cataract-unstable = throw "'cataract-unstable' has been removed due to a lack of maintenace"; # Added 2025-08-25
-  cde = throw "'cde' has been removed as it is unmaintained and broken"; # Added 2025-05-17
-  centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
+  catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
   cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12
   cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12
-  certmgr-selfsigned = certmgr; # Added 2023-11-30
-  cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
-
-  challenger = taler-challenger; # Added 2024-09-04
+  certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27
+  challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27
   charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
-  check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
-  check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03
-  check-esxi-hardware = nagiosPlugins.check_esxi_hardware; # Added 2024-05-03
-  check-mssql-health = nagiosPlugins.check_mssql_health; # Added 2024-05-03
-  check-nwc-health = nagiosPlugins.check_nwc_health; # Added 2024-05-03
-  check-openvpn = nagiosPlugins.check_openvpn; # Added 2024-05-03
-  check-ups-health = nagiosPlugins.check_ups_health; # Added 2024-05-03
-  check-uptime = nagiosPlugins.check_uptime; # Added 2024-05-03
-  check-wmiplus = nagiosPlugins.check_wmi_plus; # Added 2024-05-03
-  checkSSLCert = nagiosPlugins.check_ssl_cert; # Added 2024-05-03
-  chiaki4deck = chiaki-ng; # Added 2024-08-04
-  chocolateDoom = chocolate-doom; # Added 2023-05-01
-  ChowCentaur = chow-centaur; # Added 2024-06-12
-  ChowPhaser = chow-phaser; # Added 2024-06-12
-  ChowKick = chow-kick; # Added 2024-06-12
-  CHOWTapeModel = chow-tape-model; # Added 2024-06-12
+  check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to/replaced by 'nagiosPlugins.check_esxi_hardware'"; # Converted to throw 2025-10-27
+  check-mssql-health = throw "'check-mssql-health' has been renamed to/replaced by 'nagiosPlugins.check_mssql_health'"; # Converted to throw 2025-10-27
+  check-nwc-health = throw "'check-nwc-health' has been renamed to/replaced by 'nagiosPlugins.check_nwc_health'"; # Converted to throw 2025-10-27
+  check-openvpn = throw "'check-openvpn' has been renamed to/replaced by 'nagiosPlugins.check_openvpn'"; # Converted to throw 2025-10-27
+  check-ups-health = throw "'check-ups-health' has been renamed to/replaced by 'nagiosPlugins.check_ups_health'"; # Converted to throw 2025-10-27
+  check-uptime = throw "'check-uptime' has been renamed to/replaced by 'nagiosPlugins.check_uptime'"; # Converted to throw 2025-10-27
+  check-wmiplus = throw "'check-wmiplus' has been renamed to/replaced by 'nagiosPlugins.check_wmi_plus'"; # Converted to throw 2025-10-27
+  check_smartmon = throw "'check_smartmon' has been renamed to/replaced by 'nagiosPlugins.check_smartmon'"; # Converted to throw 2025-10-27
+  check_systemd = throw "'check_systemd' has been renamed to/replaced by 'nagiosPlugins.check_systemd'"; # Converted to throw 2025-10-27
+  check_zfs = throw "'check_zfs' has been renamed to/replaced by 'nagiosPlugins.check_zfs'"; # Converted to throw 2025-10-27
+  checkSSLCert = throw "'checkSSLCert' has been renamed to/replaced by 'nagiosPlugins.check_ssl_cert'"; # Converted to throw 2025-10-27
+  chiaki4deck = throw "'chiaki4deck' has been renamed to/replaced by 'chiaki-ng'"; # Converted to throw 2025-10-27
   chkrootkit = throw "chkrootkit has been removed as it is unmaintained and archived upstream and didn't even work on NixOS"; # Added 2025-09-12
-  chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18
-  chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
-  cinnamon-common = cinnamon; # Added 2025-08-06
-  citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
+  chocolateDoom = throw "'chocolateDoom' has been renamed to/replaced by 'chocolate-doom'"; # Converted to throw 2025-10-27
+  ChowCentaur = throw "'ChowCentaur' has been renamed to/replaced by 'chow-centaur'"; # Converted to throw 2025-10-27
+  ChowKick = throw "'ChowKick' has been renamed to/replaced by 'chow-kick'"; # Converted to throw 2025-10-27
+  ChowPhaser = throw "'ChowPhaser' has been renamed to/replaced by 'chow-phaser'"; # Converted to throw 2025-10-27
+  CHOWTapeModel = throw "'CHOWTapeModel' has been renamed to/replaced by 'chow-tape-model'"; # Converted to throw 2025-10-27
+  chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
-  cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
+  cinnamon-common = cinnamon; # Added 2025-08-06
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
-  clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
-  clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
+  clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang15Stdenv = throw "clang15Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang-tools_14 = throw "clang-tools_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang-tools_15 = throw "clang-tools_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang-tools_18 = throw "'clang-tools_18' has been renamed to/replaced by 'llvmPackages_18.clang-tools'"; # Converted to throw 2025-10-27
+  clang-tools_19 = throw "'clang-tools_19' has been renamed to/replaced by 'llvmPackages_19.clang-tools'"; # Converted to throw 2025-10-27
+  clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clasp = throw "'clasp' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
-  clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  CoinMP = coinmp; # Added 2024-06-12
-  code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
+  cockroachdb-bin = throw "'cockroachdb-bin' has been renamed to/replaced by 'cockroachdb'"; # Converted to throw 2025-10-27
   code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
+  code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   code-browser-qt = throw "'code-browser-qt' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cog = throw "'cog' has been removed as it depends on unmaintained libraries"; # Added 2025-10-08
+  CoinMP = throw "'CoinMP' has been renamed to/replaced by 'coinmp'"; # Converted to throw 2025-10-27
   collada2gltf = throw "collada2gltf has been removed from Nixpkgs, as it has been unmaintained upstream for 5 years and does not build with supported GCC versions"; # Addd 2025-08-08
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
+  conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
-  copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
+  copilot-language-server-fhs = warnAlias "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
-  coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
-  corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  cosmic-tasks = tasks; # Added 2024-07-04
-  cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
-  crispyDoom = crispy-doom; # Added 2023-05-01
+  cosmic-tasks = throw "'cosmic-tasks' has been renamed to/replaced by 'tasks'"; # Converted to throw 2025-10-27
+  cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26
+  cpp-ipfs-api = throw "'cpp-ipfs-api' has been renamed to/replaced by 'cpp-ipfs-http-client'"; # Converted to throw 2025-10-27
+  create-cycle-app = throw "'create-cycle-app' has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
+  crispyDoom = throw "'crispyDoom' has been renamed to/replaced by 'crispy-doom'"; # Converted to throw 2025-10-27
+  critcl = throw "'critcl' has been renamed to/replaced by 'tclPackages.critcl'"; # Converted to throw 2025-10-27
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
-  crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06
-  crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
-  crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
-  crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
-  crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
+  crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27
   crystal_1_11 = throw "'crystal_1_11' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-09-04
-  crystal_1_12 = throw "'crystal_1_12' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-19
-  clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19
-  clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17
-  clasp = clingo; # added 2022-12-22
-  claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17
-  clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21
-  cockroachdb-bin = cockroachdb; # 2024-03-15
-  codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17
-  concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
-  conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
-  containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
-  crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
-  create-react-app = throw "'create-react-app' has been removed as it was deprecated. Upstream suggests using a framework for React."; # Added 2025-05-17
-  critcl = tclPackages.critcl; # Added 2024-10-02
-  crunchy-cli = throw "'crunchy-cli' was sunset, see <https://github.com/crunchy-labs/crunchy-cli/issues/362>"; # Added 2025-03-26
-  cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
+  csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07
+  cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
+  cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_0 = throw "CUDA 11.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_1 = throw "CUDA 11.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_2 = throw "CUDA 11.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
@@ -716,289 +469,144 @@ mapAliases {
   cudaPackages_11_6 = throw "CUDA 11.6 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_7 = throw "CUDA 11.7 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_8 = throw "CUDA 11.8 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
-  cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_0 = throw "CUDA 12.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_1 = throw "CUDA 12.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_2 = throw "CUDA 12.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_3 = throw "CUDA 12.3 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
-  cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
-  curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
-  cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
-  cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
+  cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27
+  curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
-
-  # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.
-  clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above
-  clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above
-
-  clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22
-  clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21
-
-  cligh = throw "'cligh' has been removed since it was unmaintained and its upstream deleted"; # Added 2025-05-05
-  cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13
-
-  ### D ###
-
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10
   daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
-  darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10
-  dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
-  dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as it is now included in Dart Sass itself."; # Added 2023-10-25
-  dat = nodePackages.dat; # Added 2020-02-04
-  dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
-  dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
   dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17
-  dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
   dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-2_0 = throw "'dbus-sharp-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
-  deadpixi-sam = deadpixi-sam-unstable;
-  debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
+  deadpixi-sam = throw "'deadpixi-sam' has been renamed to/replaced by 'deadpixi-sam-unstable'"; # Converted to throw 2025-10-27
   deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
-  deltachat-cursed = arcanechat-tui; # added 2025-02-25
-  deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17
-  demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
-  devdash = throw "'devdash' has been removed as the upstream project was archived"; # Added 2025-03-27
+  deltachat-cursed = throw "'deltachat-cursed' has been renamed to/replaced by 'arcanechat-tui'"; # Converted to throw 2025-10-27
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
-  dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09
-  dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
-  dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
-  dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17
-  directvnc = throw "'directvnc' has been removed as it was unmaintained upstream since 2015 and failed to build with gcc 14"; # Added 2025-05-17
-  diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25
-  dispad = throw "dispad has been remove because it doesn't compile and has been unmaintained since 2014"; # Added 2025-04-25
-  dleyna-core = dleyna; # Added 2025-04-19
-  dleyna-connector-dbus = dleyna; # Added 2025-04-19
-  dleyna-renderer = dleyna; # Added 2025-04-19
-  dleyna-server = dleyna; # Added 2025-04-19
-  dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
-  dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02
-  dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
-  docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02
-  docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21
+  dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dleyna-core = throw "'dleyna-core' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dleyna-renderer = throw "'dleyna-renderer' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dleyna-server = throw "'dleyna-server' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dnscrypt-proxy2 = throw "'dnscrypt-proxy2' has been renamed to/replaced by 'dnscrypt-proxy'"; # Converted to throw 2025-10-27
+  docker-distribution = throw "'docker-distribution' has been renamed to/replaced by 'distribution'"; # Converted to throw 2025-10-27
+  docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
-  docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
-  docker-distribution = distribution; # Added 2023-12-26
-  docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
-  dockerfile-language-server-nodejs = lib.warnOnInstantiate "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
-  dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
-  dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17
-  dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17
-  dotty = scala_3; # Added 2023-08-20
-  dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17
-  dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
-  dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
-  dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
+  dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
+  dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27
+  dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
+  dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27
   dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16
-  downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
-  dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
   dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25
-  dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
-  drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; # Added 2024-02-20
-  dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
-  dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
-  du-dust = dust; # Added 2024-01-19
+  dtv-scan-tables_linuxtv = throw "'dtv-scan-tables_linuxtv' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27
+  dtv-scan-tables_tvheadend = throw "'dtv-scan-tables_tvheadend' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27
+  du-dust = throw "'du-dust' has been renamed to/replaced by 'dust'"; # Converted to throw 2025-10-27
   duckstation-bin = duckstation; # Added 2025-09-20
   dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14
-  dump1090 = dump1090-fa; # Added 2024-02-12
-  dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17
-
-  ### E ###
-
-  EBTKS = ebtks; # Added 2024-01-21
-  eask = eask-cli; # Added 2024-09-05
+  dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27
+  eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
-  eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19
-  ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17
-  ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
-  ec2-utils = amazon-ec2-utils; # Added 2022-02-01
-
-  ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08
-  edbrowse = throw "'edbrowse' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18
-  edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
-  edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
-  edge-runtime = throw "'edge-runtime' was removed as it was unused, unmaintained, likely insecure and failed to build"; # Added 2025-05-18
+  EBTKS = throw "'EBTKS' has been renamed to/replaced by 'ebtks'"; # Converted to throw 2025-10-27
+  ec2-utils = throw "'ec2-utils' has been renamed to/replaced by 'amazon-ec2-utils'"; # Converted to throw 2025-10-27
   edid-decode = v4l-utils; # Added 2025-06-20
   eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
-  eintopf = lauti; # Project was renamed, added 2025-05-01
-  elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8
-  electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
-  elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
-  element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
+  eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27
+  electron_35 = throw "electron_35 has been removed in favor of newer versions"; # added 2025-11-06
+  electron_35-bin = throw "electron_35-bin has been removed in favor of newer versions"; # added 2025-11-06
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
-
-  elixir_ls = elixir-ls; # Added 2023-03-20
-
-  # Emacs
-  emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20
-  emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06
-  emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28NativeComp = emacs28; # Added 2022-06-08
-  emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17
-  emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17
-  emacs29 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs29-gtk3 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs29-nox = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs29-pgtk = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacsMacport = emacs-macport; # Added 2023-08-10
-  emacsNativeComp = emacs; # Added 2022-06-08
-  emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
-  emacsPackages = emacs.pkgs; # Added 2025-03-02
-
+  elixir_ls = throw "'elixir_ls' has been renamed to/replaced by 'elixir-ls'"; # Converted to throw 2025-10-27
+  elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
+  emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
+  emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
+  emanote = throw "'emanote' has been removed due to lack of a Nixpkgs maintainer"; # Added 2025-09-18
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
-  EmptyEpsilon = empty-epsilon; # Added 2024-07-14
-  enyo-doom = enyo-launcher; # Added 2022-09-09
-  eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15
+  emojione = throw "emojione has beem removed, as it has been archived upstream."; # Added 2025-11-06
+  EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
+  emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27
   epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15
-  epdfview = throw "'epdfview' has been removed due to lack of maintenance upstream. Consider using 'qpdfview' instead"; # Added 2024-10-19
-  ephemeral = throw "'ephemeral' has been archived upstream since 2022-04-02"; # added 2025-04-12
-  epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17
-
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-
-  erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; # Added 2024-12-26
-  erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20
-  erlang_nox = throw "erlang_nox has been removed in favor of beam_minimal.packages.erlang or beamMinimalPackages.erlang"; # added 2025-04-01
-  erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24
-  erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24
-  erlangR24_javac = throw "erlangR24_javac has been removed in favor of erlang_24_javac"; # added 2024-05-24
-  erlangR24_odbc_javac = throw "erlangR24_odbc_javac has been removed in favor of erlang_24_odbc_javac"; # added 2024-05-24
-  erlang_25 = throw "erlang_25 has been removed as it is unmaintained upstream"; # added 2025-03-31
-  erlangR25 = throw "erlangR25 has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_odbc = throw "erlangR25_odbc has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_javac = throw "erlangR25_javac has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_odbc_javac = throw "erlangR25_odbc_javac has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR26 = throw "erlangR26 has been removed in favor of erlang_26"; # added 2024-05-24
-  erlangR26_odbc = throw "erlangR26_odbc has been removed in favor of erlang_26_odbc"; # added 2024-05-24
-  erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24
-  erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24
-
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
-  erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04
-  est-sfs = throw "'est-sfs' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18
-  ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
-  eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; # Added 2024-02-17
-
-  ### F ###
-
-  f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
-  factor-lang-scope = throw "'factor-lang-scope' has been renamed to 'factorPackages'"; # added 2024-11-28
-  fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24
-  fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24
-  fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19
-  faustStk = faustPhysicalModeling; # Added 2023-05-16
-  fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17
-  fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
+  ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
+  eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
+  f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
+  fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27
+  faustStk = throw "'faustStk' has been renamed to/replaced by 'faustPhysicalModeling'"; # Converted to throw 2025-10-27
   fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25
-  fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
-  fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19
-  inherit (luaPackages) fennel; # Added 2022-09-24
-  ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
+  fcitx5-catppuccin = throw "'fcitx5-catppuccin' has been renamed to/replaced by 'catppuccin-fcitx5'"; # Converted to throw 2025-10-27
+  fcitx5-chinese-addons = throw "'fcitx5-chinese-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-chinese-addons'"; # Converted to throw 2025-10-27
+  fcitx5-configtool = throw "'fcitx5-configtool' has been renamed to/replaced by 'qt6Packages.fcitx5-configtool'"; # Converted to throw 2025-10-27
+  fcitx5-skk-qt = throw "'fcitx5-skk-qt' has been renamed to/replaced by 'qt6Packages.fcitx5-skk-qt'"; # Converted to throw 2025-10-27
+  fcitx5-unikey = throw "'fcitx5-unikey' has been renamed to/replaced by 'qt6Packages.fcitx5-unikey'"; # Converted to throw 2025-10-27
+  fcitx5-with-addons = throw "'fcitx5-with-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-with-addons'"; # Converted to throw 2025-10-27
+  fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
-  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12
-  FIL-plugins = fil-plugins; # Added 2024-06-12
-  fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19
-  filet = throw "'filet' has been removed as the upstream repo has been deleted"; # Added 2025-02-07
-  finger_bsd = bsd-finger; # Added 2022-03-14
-  fingerd_bsd = bsd-fingerd; # Added 2022-03-14
-  fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
+  FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27
+  filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17
+  finger_bsd = throw "'finger_bsd' has been renamed to/replaced by 'bsd-finger'"; # Converted to throw 2025-10-27
+  fingerd_bsd = throw "'fingerd_bsd' has been renamed to/replaced by 'bsd-fingerd'"; # Converted to throw 2025-10-27
+  fira-code-nerdfont = throw "'fira-code-nerdfont' has been renamed to/replaced by 'nerd-fonts.fira-code'"; # Converted to throw 2025-10-27
   firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
-  firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06
-  firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
-  firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; # Added 2024-10-13
-  firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead."; # Added 2024-10-13
+  firefox-beta-bin = warnAlias "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06
+  firefox-devedition-bin = warnAlias "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
   firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21
   firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; # Added 2025-08-21
-  firefox-wayland = firefox; # Added 2022-11-15
-  firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
-  fishfight = jumpy; # Added 2022-08-03
-  fit-trackee = fittrackee; # added 2024-09-03
-  flashrom-stable = flashprog; # Added 2024-03-01
-  flatbuffers_2_0 = flatbuffers; # Added 2022-05-12
-  flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25
+  firefox-wayland = throw "'firefox-wayland' has been renamed to/replaced by 'firefox'"; # Converted to throw 2025-10-27
+  firmwareLinuxNonfree = throw "'firmwareLinuxNonfree' has been renamed to/replaced by 'linux-firmware'"; # Converted to throw 2025-10-27
+  fishfight = throw "'fishfight' has been renamed to/replaced by 'jumpy'"; # Converted to throw 2025-10-27
+  fit-trackee = throw "'fit-trackee' has been renamed to/replaced by 'fittrackee'"; # Converted to throw 2025-10-27
+  flashrom-stable = throw "'flashrom-stable' has been renamed to/replaced by 'flashprog'"; # Converted to throw 2025-10-27
+  flatbuffers_2_0 = throw "'flatbuffers_2_0' has been renamed to/replaced by 'flatbuffers'"; # Converted to throw 2025-10-27
   flint3 = flint; # Added 2025-09-21
   floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
   floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
-  flow-editor = flow-control; # Added 2025-03-05
+  flow-editor = throw "'flow-editor' has been renamed to/replaced by 'flow-control'"; # Converted to throw 2025-10-27
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
-  flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
-  flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
-  flutter319 = throw "flutter319 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-12-03
-  flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
-  flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
+  flutter324 = throw "flutter324 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
-  fluxctl = throw "fluxctl is unmaintained and has been removed. Migration to flux2 is recommended"; # Added 2025-05-11
-  fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06
+  flutter327 = throw "flutter327 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
-  fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12
-  fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21
-  foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17
-  follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
-  forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
-  fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25
-  foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28
-
-  fractal-next = fractal; # added 2023-11-25
-  framework-system-tools = framework-tool; # added 2023-12-09
-  francis = kdePackages.francis; # added 2024-07-13
+  follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
+  forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" (
+    system: _: (import self.path { localSystem = { inherit system; }; })
+  ); # Converted to warning 2025-10-28
+  forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
+  fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
+  framework-system-tools = throw "'framework-system-tools' has been renamed to/replaced by 'framework-tool'"; # Converted to throw 2025-10-27
+  francis = throw "'francis' has been renamed to/replaced by 'kdePackages.francis'"; # Converted to throw 2025-10-27
+  freebsdCross = throw "'freebsdCross' has been renamed to/replaced by 'freebsd'"; # Converted to throw 2025-10-27
   freecad-qt6 = freecad; # added 2025-06-14
   freecad-wayland = freecad; # added 2025-06-14
-  freerdp3 = freerdp; # added 2025-03-25
-  freerdpUnstable = freerdp; # added 2025-03-25
-  frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
-  ftjam = throw "ftjam was removed, as it hasn't been updated since 2007 and fails to build"; # added 2025-01-02
-  fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
-  fuse-common = throw "fuse-common was removed, because the udev rule was early included by systemd-udevd and the config is done by NixOS module `programs.fuse`"; # added 2024-09-29
+  freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
+  freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
+  freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # added 2025-07-05
-  futuresql = libsForQt5.futuresql; # added 2023-11-11
-  fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
-
-  fcitx5-chinese-addons = qt6Packages.fcitx5-chinese-addons; # Added 2024-03-01
-  fcitx5-configtool = qt6Packages.fcitx5-configtool; # Added 2024-03-01
-  fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
-  fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
-  fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
-
-  ### G ###
-
-  g4music = gapless; # Added 2024-07-26
-  g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17
-  gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19
+  futuresql = throw "'futuresql' has been renamed to/replaced by 'libsForQt5.futuresql'"; # Converted to throw 2025-10-27
+  fx_cast_bridge = throw "'fx_cast_bridge' has been renamed to/replaced by 'fx-cast-bridge'"; # Converted to throw 2025-10-27
+  g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27
+  gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
   garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
   garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16
   garage_0_9_4 = throw "'garage_0_9_4' has been removed as it is unmaintained upstream"; # Added 2025-09-16
   garage_1_2_0 = throw "'garage_1_2_0' has been removed. Use 'garage_1' instead."; # Added 2025-09-16
-  garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
+  garage_1_x = warnAlias "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
   garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16
-  gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
-  gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10
-  gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
-  gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
-  gcc6 = throw "gcc6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcc6Stdenv = throw "gcc6Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcc7 = throw "gcc7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gcc7Stdenv = throw "gcc7Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gcc8 = throw "gcc8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc10 = throw "gcc10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
@@ -1008,844 +616,486 @@ mapAliases {
   gcc11Stdenv = throw "gcc11Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc12 = throw "gcc12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc12Stdenv = throw "gcc12Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-9 = throw "gcc-arm-embedded-9 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-10 = throw "gcc-arm-embedded-10 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-11 = throw "gcc-arm-embedded-11 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-12 = throw "gcc-arm-embedded-12 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gccgo12 = throw "gccgo12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gcj = gcj6; # Added 2024-09-13
-  gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
-  gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
-  gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
-  geocode-glib = throw "'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
+  gensgs = throw "gensgs has been removed as it was unmaintained, abandoned upstream since 2009 and relied on gtk2"; # Added 2025-10-29
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
-  geos_3_11 = throw "geos_3_11 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2024-11-29
-  gfbgraph = throw "'gfbgraph' has been removed as it was archived upstream and unused in nixpkgs"; # Added 2025-04-20
-  gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
-  gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
-  gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
+  gfn-electron = throw "gfn-electron has been removed from Nixpkgs as it's abandoned upstream"; # Added 2025-11-05
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gg = go-graft; # Added 2025-03-07
+  gg = throw "'gg' has been renamed to/replaced by 'go-graft'"; # Converted to throw 2025-10-27
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
-  ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
   gimp3 = gimp; # added 2025-10-03
   gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03
   gimp3Plugins = gimpPlugins; # added 2025-10-03
-  git-annex-utils = throw "'git-annex-utils' has been removed as it is unmaintained"; # Added 2025-05-18
-  git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
-  gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
-  gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
-  gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
-  gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
-  gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
-  gnome-settings-daemon43 = throw "'gnome-settings-daemon43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
-  gnu-cobol = gnucobol; # Added 2024-09-17
-  gnupg1orig = throw "'gnupg1orig' has been removed due to lack of active upstream maintainance. Consider using 'gnupg' instead"; # Added 2025-01-11
-  gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
-  go_1_22 = throw "Go 1.22 is end-of-life and 'go_1_22' has been removed. Please use a newer Go toolchain."; # Added 2024-03-28
-  go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
-  gogs = throw ''
-    Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
-    weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
-
-    Consider migrating to forgejo or gitea.
-  ''; # Added 2024-10-12
-  git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; # Added 2024-07-16
-  git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20
-  git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05
-
-  gitAndTools = self // {
-    darcsToGit = darcs-to-git; # Added 2021-01-14
-    gitAnnex = git-annex; # Added 2021-01-14
-    gitBrunch = git-brunch; # Added 2021-01-14
-    gitFastExport = git-fast-export; # Added 2021-01-14
-    gitRemoteGcrypt = git-remote-gcrypt; # Added 2021-01-14
-    svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14
-    topGit = top-git; # Added 2021-01-14
-  };
+  gitAndTools = throw "gitAndTools has been removed, as the packages are now available at the top level"; # Converted to throw 2025-10-26
   gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
-  givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
-  givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
-  gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22
+  gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
   glabels = throw "'glabels' has been removed because it is no longer maintained. Consider using 'glabels-qt', which is an active fork."; # Added 2025-09-16
   glaxnimate = kdePackages.glaxnimate; # Added 2025-09-17
-  glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
-  glfw-wayland = glfw; # Added 2024-04-19
-  glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
-  glxinfo = mesa-demos; # Added 2024-07-04
-  gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
+  glew-egl = throw "'glew-egl' has been renamed to/replaced by 'glew'"; # Converted to throw 2025-10-27
+  glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27
+  glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27
+  glxinfo = throw "'glxinfo' has been renamed to/replaced by 'mesa-demos'"; # Converted to throw 2025-10-27
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
-  gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17
-  gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
-  gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
-  gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatboot = gnat-bootstrap; # Added 2023-04-07
+  gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25
-  gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25
-  gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25
-  gnatcoll-iconv = gnatPackages.gnatcoll-iconv; # Added 2024-02-25
-  gnatcoll-lzma = gnatPackages.gnatcoll-lzma; # Added 2024-02-25
-  gnatcoll-omp = gnatPackages.gnatcoll-omp; # Added 2024-02-25
-  gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25
-  gnatcoll-python3 = gnatPackages.gnatcoll-python3; # Added 2024-02-25
-  gnatcoll-readline = gnatPackages.gnatcoll-readline; # Added 2024-02-25
-  gnatcoll-sql = gnatPackages.gnatcoll-sql; # Added 2024-02-25
-  gnatcoll-sqlite = gnatPackages.gnatcoll-sqlite; # Added 2024-02-25
-  gnatcoll-syslog = gnatPackages.gnatcoll-syslog; # Added 2024-02-25
-  gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25
-  gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25
-  gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25
-  gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14
-  gnome-firmware-updater = gnome-firmware; # added 2022-04-14
-  gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  gnome-passwordsafe = gnome-secrets; # added 2022-01-30
-  gnome-resources = resources; # added 2023-12-10
-  gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17
-  gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14
+  gnatboot = throw "'gnatboot' has been renamed to/replaced by 'gnat-bootstrap'"; # Converted to throw 2025-10-27
+  gnatcoll-core = throw "'gnatcoll-core' has been renamed to/replaced by 'gnatPackages.gnatcoll-core'"; # Converted to throw 2025-10-27
+  gnatcoll-db2ada = throw "'gnatcoll-db2ada' has been renamed to/replaced by 'gnatPackages.gnatcoll-db2ada'"; # Converted to throw 2025-10-27
+  gnatcoll-gmp = throw "'gnatcoll-gmp' has been renamed to/replaced by 'gnatPackages.gnatcoll-gmp'"; # Converted to throw 2025-10-27
+  gnatcoll-iconv = throw "'gnatcoll-iconv' has been renamed to/replaced by 'gnatPackages.gnatcoll-iconv'"; # Converted to throw 2025-10-27
+  gnatcoll-lzma = throw "'gnatcoll-lzma' has been renamed to/replaced by 'gnatPackages.gnatcoll-lzma'"; # Converted to throw 2025-10-27
+  gnatcoll-omp = throw "'gnatcoll-omp' has been renamed to/replaced by 'gnatPackages.gnatcoll-omp'"; # Converted to throw 2025-10-27
+  gnatcoll-postgres = throw "'gnatcoll-postgres' has been renamed to/replaced by 'gnatPackages.gnatcoll-postgres'"; # Converted to throw 2025-10-27
+  gnatcoll-python3 = throw "'gnatcoll-python3' has been renamed to/replaced by 'gnatPackages.gnatcoll-python3'"; # Converted to throw 2025-10-27
+  gnatcoll-readline = throw "'gnatcoll-readline' has been renamed to/replaced by 'gnatPackages.gnatcoll-readline'"; # Converted to throw 2025-10-27
+  gnatcoll-sql = throw "'gnatcoll-sql' has been renamed to/replaced by 'gnatPackages.gnatcoll-sql'"; # Converted to throw 2025-10-27
+  gnatcoll-sqlite = throw "'gnatcoll-sqlite' has been renamed to/replaced by 'gnatPackages.gnatcoll-sqlite'"; # Converted to throw 2025-10-27
+  gnatcoll-syslog = throw "'gnatcoll-syslog' has been renamed to/replaced by 'gnatPackages.gnatcoll-syslog'"; # Converted to throw 2025-10-27
+  gnatcoll-xref = throw "'gnatcoll-xref' has been renamed to/replaced by 'gnatPackages.gnatcoll-xref'"; # Converted to throw 2025-10-27
+  gnatcoll-zlib = throw "'gnatcoll-zlib' has been renamed to/replaced by 'gnatPackages.gnatcoll-zlib'"; # Converted to throw 2025-10-27
+  gnatinspect = throw "'gnatinspect' has been renamed to/replaced by 'gnatPackages.gnatinspect'"; # Converted to throw 2025-10-27
+  gnome-firmware-updater = throw "'gnome-firmware-updater' has been renamed to/replaced by 'gnome-firmware'"; # Converted to throw 2025-10-27
+  gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27
+  gnome-recipes = throw "'gnome-recipes' has been removed due to lack of upstream maintenance and dependency on insecure libraries"; # Added 2025-09-06
+  gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27
+  gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27
   gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16
-  gnufdisk = throw "'gnufdisk' has been removed due to lack of maintenance upstream"; # Added 2024-12-31
-  gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
-  gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
-  gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
-  gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnustep = throw "The gnustep scope has been replaced with top-level packages: gnustep-back, -base, -gui, -libobjc, -make, -systempreferences; gorm, gworkspace, projectcenter."; # Added 2025-01-25
-  go-thumbnailer = thud; # Added 2023-09-21
-  go-upower-notify = upower-notify; # Added 2024-07-21
-  gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
-  godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27
-  godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
-  godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
-  godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
+  go-thumbnailer = throw "'go-thumbnailer' has been renamed to/replaced by 'thud'"; # Converted to throw 2025-10-27
+  go-upower-notify = throw "'go-upower-notify' has been renamed to/replaced by 'upower-notify'"; # Converted to throw 2025-10-27
+  go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
+  godot-export-templates = throw "'godot-export-templates' has been renamed to/replaced by 'godot-export-templates-bin'"; # Converted to throw 2025-10-27
+  godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27
+  godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
+  godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
-  googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
-  gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
-  gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25;
+  gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06
+  gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
   gpxsee-qt6 = gpxsee; # added 2025-09-09
-  gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; # Added 2024-09-14
   gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25
-  graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
-  graalvm-oracle = graalvmPackages.graalvm-oracle; # Added 2024-12-17
-  graalvmCEPackages = graalvmPackages; # Added 2024-08-10
+  graalvm-ce = throw "'graalvm-ce' has been renamed to/replaced by 'graalvmPackages.graalvm-ce'"; # Converted to throw 2025-10-27
+  graalvm-oracle = throw "'graalvm-oracle' has been renamed to/replaced by 'graalvmPackages.graalvm-oracle'"; # Converted to throw 2025-10-27
+  graalvmCEPackages = throw "'graalvmCEPackages' has been renamed to/replaced by 'graalvmPackages'"; # Converted to throw 2025-10-27
   gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20
-  gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
-  gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
-  grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02
-  grafana_reporter = grafana-reporter; # Added 2024-06-09
-  grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23
+  gradleGen = throw "'gradleGen' has been moved to `gradle-packages.mkGradle`."; # Added 2025-11-02
+  grafana_reporter = throw "'grafana_reporter' has been renamed to/replaced by 'grafana-reporter'"; # Converted to throw 2025-10-27
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09
-  graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
-  graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
-  graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15
-  graylog-5_1 = throw "graylog 5.1.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.1.x to latest series."; # Added 2024-10-16
-  graylog-5_2 = throw "graylog 5.2 is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.2 to latest series."; # Added 2025-03-21
-  green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  gringo = clingo; # added 2022-11-27
-  grub2_full = grub2; # Added 2022-11-18
-  grun = throw "grun has been removed due to lack of maintenance upstream and depending on gtk2"; # Added 2025-03-29
-  gsignond = throw "'gsignond' and its plugins have been removed due to lack of maintenance upstream"; # added 2025-04-17
-  gsignondPlugins = throw "'gsignondPlugins' have been removed alongside 'gsignond' due to lack of maintenance upstream and depending on libsoup_2"; # added 2025-04-17
-  gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
-  gtk-engine-bluecurve = throw "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
-  gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
-  gtkcord4 = dissent; # Added 2024-03-10
+  gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
+  grub2_full = throw "'grub2_full' has been renamed to/replaced by 'grub2'"; # Converted to throw 2025-10-27
+  gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
-  gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09
-  guile-disarchive = disarchive; # Added 2023-10-27
+  guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
-  ### H ###
-
-  hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # added 2025-09-26
-  haka = throw "haka has been removed because it failed to build and was unmaintained for 9 years"; # Added 2025-03-11
-  hardinfo = throw "'hardinfo' has been removed as it was abandoned upstream. Consider using 'hardinfo2' instead."; # added 2025-04-17
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
-  hasura-graphql-engine = throw "hasura-graphql-engine has been removed because was broken and its packaging severly out of date"; # Added 2025-02-14
-  haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
-  hawknl = throw "'hawknl' has been removed as it was unmaintained and the upstream unavailable"; # Added 2025-05-07
-  HentaiAtHome = hentai-at-home; # Added 2024-06-12
+  HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
   hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10
   hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
   hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
-  hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
-  hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21
+  hiPrio = warnAlias "'hiPrio' has been removed from pkgs, use `lib.hiPrio` instead" lib.hiPrio; # Added 2025-10-30
   hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20
-  hmetis = throw "'hmetis' has been removed as it was unmaintained and the upstream was unavailable"; # Added 2025-05-05
-  hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13
+  hostPlatform = warnAlias "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'" stdenv.hostPlatform; # Converted to warning 2025-10-28
   hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
-  hpp-fcl = coal; # Added 2024-11-15
-  ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17
-  hydra_unstable = hydra; # Added 2024-08-22
-  hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; # Added 2024-08-03
-  hyenae = throw "hyenae has been removed because it fails to build and was unmaintained for 15 years"; # Added 2025-04-04
-  hyprgui = throw "hyprgui has been removed as the repository is deleted"; # Added 2024-12-27
-  hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27
-  hyprswitch = throw "hyprswitch has been renamed to hyprshell"; # Added 2025-06-01
-  hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
-
-  ### I ###
-
-  i3-gaps = i3; # Added 2023-01-03
-  i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  ibniz = throw "ibniz has been removed because it fails to compile and the source url is dead"; # Added 2025-04-07
-  ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15
-  ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15
+  hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27
+  hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
+  i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27
   ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
-  icuReal = throw "icuReal has been removed from nixpkgs as a mistake"; # Added 2025-02-18
   ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
-  imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
-  imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
   imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
-  immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
-  inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
-  incrtcl = tclPackages.incrtcl; # Added 2024-10-02
-  input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
-  inotifyTools = inotify-tools; # Added 2015-09-01
+  immersed-vr = throw "'immersed-vr' has been renamed to/replaced by 'immersed'"; # Converted to throw 2025-10-27
+  inconsolata-nerdfont = throw "'inconsolata-nerdfont' has been renamed to/replaced by 'nerd-fonts.inconsolata'"; # Converted to throw 2025-10-27
+  incrtcl = throw "'incrtcl' has been renamed to/replaced by 'tclPackages.incrtcl'"; # Converted to throw 2025-10-27
+  inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2025-10-27
   insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
-  inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
+  invalidateFetcherByDrvHash = throw "'invalidateFetcherByDrvHash' has been renamed to/replaced by 'testers.invalidateFetcherByDrvHash'"; # Converted to throw 2025-10-27
   invoiceplane = throw "'invoiceplane' doesn't support non-EOL PHP versions"; # Added 2025-10-03
   ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
-  ipfs = kubo; # Added 2022-09-27
-  ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27
-  ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
-  ipfs-migrator = kubo-migrator; # Added 2022-09-27
-  iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2024-10-17
+  ipfs = throw "'ipfs' has been renamed to/replaced by 'kubo'"; # Converted to throw 2025-10-27
+  ipfs-migrator = throw "'ipfs-migrator' has been renamed to/replaced by 'kubo-migrator'"; # Converted to throw 2025-10-27
+  ipfs-migrator-all-fs-repo-migrations = throw "'ipfs-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27
+  ipfs-migrator-unwrapped = throw "'ipfs-migrator-unwrapped' has been renamed to/replaced by 'kubo-migrator-unwrapped'"; # Converted to throw 2025-10-27
   ir.lv2 = ir-lv2; # Added 2025-09-37
-  irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12
-  isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  isl_0_17 = throw "isl_0_17 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
-  iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
-  itktcl = tclPackages.itktcl; # Added 2024-10-02
+  isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
+  iso-flags-png-320x420 = throw "'iso-flags-png-320x420' has been renamed to/replaced by 'iso-flags-png-320x240'"; # Converted to throw 2025-10-27
+  itktcl = throw "'itktcl' has been renamed to/replaced by 'tclPackages.itktcl'"; # Converted to throw 2025-10-27
   itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25
-  iv = throw "iv has been removed as it was no longer required for neuron and broken"; # Added 2025-04-18
-  ix = throw "ix has been removed from Nixpkgs, as the ix.io pastebin has been offline since Dec. 2023"; # Added 2025-04-11
-
-  ### J ###
-
-  jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17
   jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
-  jami-client-qt = jami-client; # Added 2022-11-06
-  jami-client = jami; # Added 2023-02-10
-  jami-daemon = jami.daemon; # Added 2023-02-10
-  javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
-  jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
-  jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
+  jami-client = throw "'jami-client' has been renamed to/replaced by 'jami'"; # Converted to throw 2025-10-27
+  jami-client-qt = throw "'jami-client-qt' has been renamed to/replaced by 'jami-client'"; # Converted to throw 2025-10-27
+  jami-daemon = throw "'jami-daemon' has been renamed to/replaced by 'jami.daemon'"; # Converted to throw 2025-10-27
+  jdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
+  jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
+  jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jing = jing-trang; # Added 2025-09-18
-  jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2024-08-07
+  joplin = joplin-cli; # Added 2025-11-03
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
-
-  # Julia
-  julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08
-
-  jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28
-
-  ### K ###
-
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
-  k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20
-  k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01
-  k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15
-  k3s_1_29 = throw "'k3s_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
-  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04
-  # now kube3d/k3d will take its place
-  kube3d = k3d; # Added 2022-07-05
-  kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17
-  kak-lsp = kakoune-lsp; # Added 2024-04-01
-  kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
-  kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
-  kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
+  kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27
+  kanidm = warnAlias "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
+  kanidmWithSecretProvisioning = warnAlias "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
+  kapitano = throw "'kapitano' has been removed, as it is unmaintained upstream"; # Added 2025-10-29
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06
-  kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17
-  keepkey_agent = keepkey-agent; # added 2024-01-06
-  kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17
-  kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17
-  kexi = makePlasma5Throw "kexi";
-  keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
-  keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
-  kgx = gnome-console; # Added 2022-02-19
-  kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
-  kibana = kibana7; # Added 2023-10-30
-  kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18
-  kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10
+  keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
+  kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
+  khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
-  kodiGBM = kodi-gbm; # Added 2021-03-09
-  kodiPlain = kodi; # Added 2021-03-09
-  kodiPlainWayland = kodi-wayland; # Added 2021-03-09
-  kodiPlugins = kodiPackages; # Added 2021-03-09
-  kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17
-  krb5Full = krb5; # Added 2022-11-17
-  kreative-square-fonts = throw "'kreative-square-fonts' has been renamed to 'kreative-square'"; # Added 2025-04-16
-  krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17
-  krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01
+  kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27
+  kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2025-10-27
+  kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2025-10-27
+  kodiPlugins = throw "'kodiPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2025-10-27
+  krb5Full = throw "'krb5Full' has been renamed to/replaced by 'krb5'"; # Converted to throw 2025-10-27
   krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
-  kubei = kubeclarity; # Added 2023-05-20
-  kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
-
-  ### L ###
-
-  l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14
-  languageMachines = {
-    ticcutils = ticcutils;
-    libfolia = libfolia;
-    ucto = ucto;
-    uctodata = uctodata;
-    timbl = timbl;
-    timblserver = timblserver;
-    mbt = mbt;
-    frog = frog;
-    frogdata = frogdata;
-    test = frog.tests.simple;
-  }; # Added 2025-10-07
-  larynx = piper-tts; # Added 2023-05-09
-  LASzip = laszip; # Added 2024-06-12
-  LASzip2 = laszip_2; # Added 2024-06-12
+  kube3d = throw "'kube3d' has been renamed to/replaced by 'k3d'"; # Converted to throw 2025-10-27
+  kubei = throw "'kubei' has been renamed to/replaced by 'kubeclarity'"; # Converted to throw 2025-10-27
+  kubo-migrator-all-fs-repo-migrations = throw "'kubo-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27
+  languageMachines.frog = frog; # Added 2025-10-7
+  languageMachines.frogdata = frogdata; # Added 2025-10-7
+  languageMachines.libfolia = libfolia; # Added 2025-10-7
+  languageMachines.mbt = mbt; # Added 2025-10-7
+  languageMachines.test = frog.tests.simple; # Added 2025-10-7
+  languageMachines.ticcutils = ticcutils; # Added 2025-10-7
+  languageMachines.timbl = timbl; # Added 2025-10-7
+  languageMachines.timblserver = timblserver; # Added 2025-10-7
+  languageMachines.ucto = ucto; # Added 2025-10-7
+  languageMachines.uctodata = uctodata; # Added 2025-10-7
   lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
-  latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  latinmodern-math = lmmath; # Added 2020-03-17
+  larynx = throw "'larynx' has been renamed to/replaced by 'piper-tts'"; # Converted to throw 2025-10-27
+  LASzip2 = throw "'LASzip2' has been renamed to/replaced by 'laszip_2'"; # Converted to throw 2025-10-27
+  LASzip = throw "'LASzip' has been renamed to/replaced by 'laszip'"; # Converted to throw 2025-10-27
+  latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2025-10-27
   latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  lazarus-qt = lazarus-qt5; # Added 2024-12-25
-  leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
-  ledger_agent = ledger-agent; # Added 2024-01-07
-  lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2024-06-09
-  lfs = dysk; # Added 2023-07-03
-  libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
+  lazarus-qt = throw "'lazarus-qt' has been renamed to/replaced by 'lazarus-qt5'"; # Converted to throw 2025-10-27
+  ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
+  lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
+  lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
-  libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
-  libav_0_8 = libav; # Added 2024-08-25
-  libav_11 = libav; # Added 2024-08-25
-  libav_12 = libav; # Added 2024-08-25
-  libav_all = libav; # Added 2024-08-25
-  libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
-  libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
-  libbencodetools = bencodetools; # Added 2022-07-30
-  libbpf_1 = libbpf; # Added 2022-12-06
-  libbson = mongoc; # Added 2024-03-11
-  libbitcoin = throw "libbitcoin has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-client = throw "libbitcoin-client has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02
+  libayatana-appindicator-gtk3 = throw "'libayatana-appindicator-gtk3' has been renamed to/replaced by 'libayatana-appindicator'"; # Converted to throw 2025-10-27
+  libayatana-indicator-gtk3 = throw "'libayatana-indicator-gtk3' has been renamed to/replaced by 'libayatana-indicator'"; # Converted to throw 2025-10-27
+  libbencodetools = throw "'libbencodetools' has been renamed to/replaced by 'bencodetools'"; # Converted to throw 2025-10-27
+  libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27
+  libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
-  libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28
+  libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
+  libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
   libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
-  libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
-  libgda = lib.warnOnInstantiate "'libgda' has been renamed to 'libgda5'" libgda5; # Added 2025-01-21
-  lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  libgme = game-music-emu; # Added 2022-07-20
-  libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
-  libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
-  libgrss = throw "'libgrss' has been removed as it was archived upstream and had no users in nixpkgs"; # Added 2025-04-17
-  libheimdal = heimdal; # Added 2022-11-18
-  libhttpseverywhere = throw "'libhttpseverywhere' has been removed due to lack of upstream maintenance. It was no longer used in nixpkgs."; # Added 2025-04-17
-  libiconv-darwin = darwin.libiconv; # Added 2024-09-22
-  libixp_hg = libixp; # Added 2022-04-25
-  libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
-  liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
+  libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27
+  libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
+  libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27
+  libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27
+  libiconv-darwin = throw "'libiconv-darwin' has been renamed to/replaced by 'darwin.libiconv'"; # Converted to throw 2025-10-27
+  libixp_hg = throw "'libixp_hg' has been renamed to/replaced by 'libixp'"; # Converted to throw 2025-10-27
+  libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # added 2025-08-28
+  libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20
   libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
   libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
-  libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  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
+  libosmo-sccp = throw "'libosmo-sccp' has been renamed to/replaced by 'libosmo-sigtran'"; # Converted to throw 2025-10-27
   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
+  libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27
+  libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
-  librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as its upstream is unmaintained"; # Added 2024-06-10
-  librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17
-  librdf_raptor = throw "librdf_raptor has been remove due to failing to build and being unmaintained"; # Added 2025-04-14
-  LibreArp = librearp; # Added 2024-06-12
-  LibreArp-lv2 = librearp-lv2; # Added 2024-06-12
-  libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17
-  librtlsdr = rtl-sdr; # Added 2023-02-18
+  LibreArp = throw "'LibreArp' has been renamed to/replaced by 'librearp'"; # Converted to throw 2025-10-27
+  LibreArp-lv2 = throw "'LibreArp-lv2' has been renamed to/replaced by 'librearp-lv2'"; # Converted to throw 2025-10-27
   libreoffice-qt6 = libreoffice-qt; # Added 2025-08-30
-  libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
   libreoffice-qt6-fresh = libreoffice-qt-fresh; # Added 2025-08-30
   libreoffice-qt6-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; # Added 2025-08-30
   libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30
   libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30
-  librewolf-wayland = librewolf; # Added 2022-11-15
-  libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
-  libsForQt515 = libsForQt5; # Added 2022-11-24
-  libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
-  libsoup = lib.warnOnInstantiate "'libsoup' has been renamed to 'libsoup_2_4'" libsoup_2_4; # Added 2024-12-02
-  libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
+  libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
+  librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27
+  librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27
+  libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27
+  libsmartcols = warnAlias "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
+  libsoup = throw "'libsoup' has been renamed to/replaced by 'libsoup_2_4'"; # Converted to throw 2025-10-27
   libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
   libtcod = throw "'libtcod' has been removed due to being unused and having an incompatible build-system"; # Added 2025-10-04
-  libtensorflow-bin = libtensorflow; # Added 2022-09-25
+  libtensorflow-bin = throw "'libtensorflow-bin' has been renamed to/replaced by 'libtensorflow'"; # Converted to throw 2025-10-27
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
-  libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17
-  libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17
-  libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17
-  libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2024-10-17
-  libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17
-  libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
-  libwnck3 = libwnck; # Added 2021-06-23
-  libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
-  libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16
-  licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
-  lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; # Added 2023-10-18
+  libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
+  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
+  libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
+  lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
+  lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
-  lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
-  lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22
-  lime = throw "'lime' has been removed due to being unmaintained"; # Added 2025-03-20
-  limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25
-  linenoise-ng = throw "'linenoise-ng' has been removed as the upstream project was archived. Consider using 'linenoise' instead."; # Added 2025-05-05
+  lima-bin = warnAlias "lima-bin has been replaced by lima" lima; # Added 2025-05-13
+  limbo = warnAlias "limbo has been renamed to turso" turso; # Added 2025-11-07
+  lincity_ng = warnAlias "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
-  lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  litecoin = throw "litecoin has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
-  litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
-  Literate = literate; # Added 2024-06-12
-  littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  live-chart = throw "live-chart has been removed as it is no longer used in Nixpkgs. livechart-2 (elementary's fork) is available as pantheon.live-chart"; # Added 2025-10-10
-  llama = walk; # Added 2023-01-23
-  lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
-
-  # Linux kernels
+  linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
+  linux-rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
   linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15;
-  linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
   linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1;
-  linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
-  linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
-  linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
-  linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
-  linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
-  linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
-  linuxPackages_6_9 = linuxKernel.packages.linux_6_9;
-  linuxPackages_6_10 = linuxKernel.packages.linux_6_10;
-  linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
-  linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
-  linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
-  linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
-  linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
-  linuxPackages_6_16 = linuxKernel.packages.linux_6_16;
-  linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
-  linuxPackages_ham = linuxKernel.packages.linux_ham;
-  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
-  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
-  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
-  linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
-  linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
-  linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4;
-  linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
-  linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
-  linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
-  linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
-  linux_4_19 = linuxKernel.kernels.linux_4_19;
-  linux_5_4 = linuxKernel.kernels.linux_5_4;
+  linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-26
+  linux_5_4_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_5_10 = linuxKernel.kernels.linux_5_10;
+  linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_5_15 = linuxKernel.kernels.linux_5_15;
+  linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_6_1 = linuxKernel.kernels.linux_6_1;
+  linux_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_6_6 = linuxKernel.kernels.linux_6_6;
-  linux_6_9 = linuxKernel.kernels.linux_6_9;
-  linux_6_10 = linuxKernel.kernels.linux_6_10;
-  linux_6_11 = linuxKernel.kernels.linux_6_11;
+  linux_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_6_12 = linuxKernel.kernels.linux_6_12;
-  linux_6_13 = linuxKernel.kernels.linux_6_13;
-  linux_6_14 = linuxKernel.kernels.linux_6_14;
-  linux_6_15 = linuxKernel.kernels.linux_6_15;
-  linux_6_16 = linuxKernel.kernels.linux_6_16;
+  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
+  linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; # Added 2025-08-30
+  linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
   linux_6_17 = linuxKernel.kernels.linux_6_17;
-  linux_ham = linuxKernel.kernels.linux_ham;
+  linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
+  linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
+  linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
-  linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi1 = linuxKernel.kernels.linux_rpi1;
   linux_rpi2 = linuxKernel.kernels.linux_rpi2;
+  linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi3 = linuxKernel.kernels.linux_rpi3;
   linux_rpi4 = linuxKernel.kernels.linux_rpi4;
-
-  linuxPackages_xen_dom0 = linuxPackages; # Added 2021-04-04
-  linuxPackages_latest_xen_dom0 = linuxPackages_latest; # Added 2021-04-04
-  linuxPackages_xen_dom0_hardened = linuxPackages_hardened; # Added 2021-04-04
-  linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; # Added 2021-04-04
-  linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; # Added 2021-08-16
-  linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; # Added 2021-08-16
-  linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; # Added 2021-08-16
-  linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # Added 2021-08-16
-  linuxPackages_latest_hardened = throw ''
-    The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
-    frequently lag behind the upstream kernel. In some cases this meant that this attribute
-    had to refer to an older kernel[1] because the latest hardened kernel was EOL and
-    the latest supported kernel didn't have patches.
-
-    If you want to use a hardened kernel, please check which kernel minors are supported
-    and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'.
-
-    [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587
-  ''; # Added 2021-08-16
-  linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16
-
-  linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
-  linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
-  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; # Added 2025-08-10
-  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; # Added 2025-08-10
-  linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; # Added 2025-08-10
-  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; # Added 2025-08-10
-  linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; # Added 2025-08-10
-  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Added 2025-08-10
-  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; # Added 2025-08-10
-  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; # Added 2025-08-10
-  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; # Added 2025-08-10
-  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; # Added 2025-08-10
+  linuxPackages-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
+  linuxPackages_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-26
+  linuxPackages_5_4_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
+  linuxPackages_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
+  linuxPackages_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
+  linuxPackages_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
+  linuxPackages_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
   linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; # Added 2025-08-10
-  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; # Added 2025-08-10
-
-  linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
-  linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
-
-  linuxPackages-libre = linuxKernel.packages.linux_libre;
-  linux-libre = linuxPackages-libre.kernel;
-  linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre;
-  linux_latest-libre = linuxPackages_latest-libre.kernel;
-
-  linuxstopmotion = stopmotion; # Added 2024-11-01
-
+  linuxPackages_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; # Added 2025-08-30
+  linuxPackages_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
+  linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
+  linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
+  linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
+  linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
+  linuxPackages_latest_xen_dom0 = throw "'linuxPackages_latest_xen_dom0' has been renamed to/replaced by 'linuxPackages_latest'"; # Converted to throw 2025-10-27
+  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
+  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
+  linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
+  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
+  linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
+  linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4;
+  linuxPackages_rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22
+  linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
+  linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
+  linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
+  linuxPackages_xen_dom0 = throw "'linuxPackages_xen_dom0' has been renamed to/replaced by 'linuxPackages'"; # Converted to throw 2025-10-27
+  linuxPackages_xen_dom0_hardened = throw "'linuxPackages_xen_dom0_hardened' has been renamed to/replaced by 'linuxPackages_hardened'"; # Converted to throw 2025-10-27
+  linuxstopmotion = throw "'linuxstopmotion' has been renamed to/replaced by 'stopmotion'"; # Converted to throw 2025-10-27
+  Literate = throw "'Literate' has been renamed to/replaced by 'literate'"; # Converted to throw 2025-10-27
+  littlenavmap = throw "littlenavmap has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
+  live-chart = throw "live-chart has been removed as it is no longer used in Nixpkgs. livechart-2 (elementary's fork) is available as pantheon.live-chart"; # Added 2025-10-10
   lixVersions = lixPackageSets.renamedDeprecatedLixVersions; # Added 2025-03-20, warning in ../tools/package-management/lix/default.nix
-
-  llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02
-
-  llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08
-  llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08
-  lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08
-  lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08
-  clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08
-  clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08
-  clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08
-
-  llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+  llama = throw "'llama' has been renamed to/replaced by 'walk'"; # Converted to throw 2025-10-27
   lld_12 = throw "lld_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-
-  llvmPackages_13 = throw "llvmPackages_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  llvm_13 = throw "llvm_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_13 = throw "lld_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  lldb_13 = throw "lldb_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-
-  llvmPackages_14 = throw "llvmPackages_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  llvm_14 = throw "llvm_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_14 = throw "lld_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  lldb_14 = throw "lldb_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang-tools_14 = throw "clang-tools_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-
-  llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  llvm_15 = throw "llvm_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   lld_15 = throw "lld_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  lldb_15 = throw "lldb_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  clang15Stdenv = throw "clang15Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  clang-tools_15 = throw "clang-tools_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-
-  llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  llvm_16 = throw "llvm_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lld_16 = throw "lld_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  lldb_16 = throw "lldb_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-
-  llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lld_17 = throw "lld_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lldb_13 = throw "lldb_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lldb_14 = throw "lldb_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lldb_15 = throw "lldb_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  lldb_16 = throw "lldb_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lldb_17 = throw "lldb_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-
-  lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17
-  loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25
-  loco-cli = loco; # Added 2025-02-24
-  loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  ltwheelconf = throw "'ltwheelconf' has been removed because it is obsolete"; # Added 2025-05-07
-  luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
-  lucene = throw "lucene has been removed since it was both wildly out of date and was not even built properly for 4 years"; # Added 2025-04-10
+  llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvm_13 = throw "llvm_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvm_14 = throw "llvm_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvm_15 = throw "llvm_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  llvm_16 = throw "llvm_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvmPackages_13 = throw "llvmPackages_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvmPackages_14 = throw "llvmPackages_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27
+  lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30
+  LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
-  lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07
-  lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
-  lxd = throw ''
+  lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-lts = throw ''
+  "; # Added 2025-09-05
+  lxd-lts = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-ui = throw ''
+  "; # Added 2025-09-05
+  lxd-ui = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-unwrapped = throw ''
+  "; # Added 2025-09-05
+  lxd-unwrapped = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-unwrapped-lts = throw ''
+  "; # Added 2025-09-05
+  lxd-unwrapped-lts = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-
-  lxde = {
-    gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31
-    lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31
-    lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31
-    lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31
-    lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31
-    lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31
-    lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
-    lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
-  };
-
+  "; # Added 2025-09-05
+  lxde.gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31
+  lxde.lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31
+  lxde.lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31
+  lxde.lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31
+  lxde.lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31
+  lxde.lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31
+  lxde.lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
+  lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
   lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
-  lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
-  lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
-
-  ### M ###
-
-  ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
-  mac = monkeysAudio; # Added 2024-11-30
-  MACS2 = macs2; # Added 2023-06-12
+  mac = throw "'mac' has been renamed to/replaced by 'monkeysAudio'"; # Converted to throw 2025-10-27
+  MACS2 = throw "'MACS2' has been renamed to/replaced by 'macs2'"; # Converted to throw 2025-10-27
   magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
-  mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
-  mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12
   mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
-  melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
-  mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
-  mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15
-  mariadb-client = hiPrio mariadb.client; # added 2019.07.28
-  maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 2024-08-24
-  manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
+  makeOverridable = warnAlias "'makeOverridable' has been removed from pkgs, use `lib.makeOverridable` instead" lib.makeOverridable; # Added 2025-10-30
   manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
-  manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
-  manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
-
-  maple-mono-NF = throw ''
-    maple-mono-NF had been moved to maple-mono.NF.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-otf = throw ''
-    maple-mono-otf had been moved to maple-mono.opentype.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-woff2 = throw ''
-    maple-mono-woff2 had been moved to maple-mono.woff2.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-SC-NF = throw ''
-    mono-SC-NF had been superseded by maple-mono.NF-CN.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-autohint = throw ''
-    maple-mono-autohint had been moved to maple-mono.truetype-autohint.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-
-  mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17
-  markets = throw "'markets' has been removed as it was archived upstream in 2023"; # Added 2025-04-17
-  marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
-  marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
-  marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
-  marwaita-pop_os = lib.warnOnInstantiate "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
-  masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
+  mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
+  marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27
+  marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27
+  marwaita-pop_os = throw "'marwaita-pop_os' has been renamed to/replaced by 'marwaita-yellow'"; # Converted to throw 2025-10-27
+  marwaita-ubuntu = throw "'marwaita-ubuntu' has been renamed to/replaced by 'marwaita-orange'"; # Converted to throw 2025-10-27
+  mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07
   material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
-  mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
-  mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09
-  matomo_5 = matomo; # Added 2024-12-12
-  matomo-beta = throw "matomo-beta has been removed as it mostly just pointed to the latest matomo release, use `matomo.overrideAttrs` to access a specific beta version instead"; # Added 2025-01-15
-  matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
-  matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
-  matrix-synapse-tools = recurseIntoAttrs {
-    rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; # Added 2025-03-04
-    synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; # Added 2025-02-20
-  }; # Added 2025-02-20
-  mcomix3 = mcomix; # Added 2022-06-05
-  mdt = md-tui; # Added 2024-09-03
-  meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
+  matomo_5 = throw "'matomo_5' has been renamed to/replaced by 'matomo'"; # Converted to throw 2025-10-27
+  matrix-synapse-tools.rust-synapse-compress-state = throw "'matrix-synapse-tools.rust-synapse-compress-state' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27
+  matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27
+  mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27
+  mdt = throw "'mdt' has been renamed to/replaced by 'md-tui'"; # Converted to throw 2025-10-27
   mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
-  meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17
-  memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  memstream = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  memstreamHook = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
+  meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
+  melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
+  meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21
   meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
-  mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; # Added 2024-09-15
-  microcodeAmd = microcode-amd; # Added 2024-09-08
-  microcodeIntel = microcode-intel; # Added 2024-09-08
-  micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24
-  microsoft_gsl = microsoft-gsl; # Added 2023-05-26
+  microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27
+  microcodeIntel = throw "'microcodeIntel' has been renamed to/replaced by 'microcode-intel'"; # Converted to throw 2025-10-27
+  microsoft_gsl = throw "'microsoft_gsl' has been renamed to/replaced by 'microsoft-gsl'"; # Converted to throw 2025-10-27
+  MIDIVisualizer = throw "'MIDIVisualizer' has been renamed to/replaced by 'midivisualizer'"; # Converted to throw 2025-10-27
   midori = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
-  midori-unwrapped = midori; # Added 2025-05-19
-  MIDIVisualizer = midivisualizer; # Added 2024-06-12
+  midori-unwrapped = throw "'midori' original project has been abandonned upstream and the package was broken for a while in nixpkgs"; # Added 2025-05-19
+  migra = throw "migra has been removed because it has transitively been marked as broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
   mihomo-party = throw "'mihomo-party' has been removed due to upstream license violation"; # Added 2025-08-20
-  mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
-  mime-types = mailcap; # Added 2022-01-21
+  mime-types = throw "'mime-types' has been renamed to/replaced by 'mailcap'"; # Converted to throw 2025-10-27
   minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06
-  minetest = luanti; # Added 2024-11-11
-  minetestclient = luanti-client; # Added 2024-11-11
-  minetestserver = luanti-server; # Added 2024-11-11
-  minetest-touch = luanti-client; # Added 2024-08-12
-  minizip2 = pkgs.minizip-ng; # Added 2022-12-28
+  minetest = throw "'minetest' has been renamed to/replaced by 'luanti'"; # Converted to throw 2025-10-27
+  minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
+  minetestclient = throw "'minetestclient' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
+  minetestserver = throw "'minetestserver' has been renamed to/replaced by 'luanti-server'"; # Converted to throw 2025-10-27
+  minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27
   miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
+  mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29
-  mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
-  mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
-  mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17
-  mod_wsgi = throw "'mod_wsgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_wsgi'"; # Converted to throw 2024-10-17
-  mod_ca = throw "'mod_ca' has been renamed to/replaced by 'apacheHttpdPackages.mod_ca'"; # Converted to throw 2024-10-17
-  mod_crl = throw "'mod_crl' has been renamed to/replaced by 'apacheHttpdPackages.mod_crl'"; # Converted to throw 2024-10-17
-  mod_csr = throw "'mod_csr' has been renamed to/replaced by 'apacheHttpdPackages.mod_csr'"; # Converted to throw 2024-10-17
-  mod_ocsp = throw "'mod_ocsp' has been renamed to/replaced by 'apacheHttpdPackages.mod_ocsp'"; # Converted to throw 2024-10-17
-  mod_scep = throw "'mod_scep' has been renamed to/replaced by 'apacheHttpdPackages.mod_scep'"; # Converted to throw 2024-10-17
-  mod_spkac = throw "'mod_spkac' has been renamed to/replaced by 'apacheHttpdPackages.mod_spkac'"; # Converted to throw 2024-10-17
-  mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17
-  mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17
+  moar = warnAlias "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
+  mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
   monitor = pantheon.elementary-monitor; # Added 2025-10-10
-  mono-addins = throw "mono-addins has been removed due to its dependency on the removed mono4. Consider alternative frameworks or migrate to newer .NET technologies."; # Added 2025-08-25
   mono4 = mono6; # Added 2025-08-25
   mono5 = mono6; # Added 2025-08-25
-  monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17
-  mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11
-  mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01
-  mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
-  moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
+  mono-addins = throw "mono-addins has been removed due to its dependency on the removed mono4. Consider alternative frameworks or migrate to newer .NET technologies."; # Added 2025-08-25
+  monotoneViz = throw "monotoneViz was removed because it relies on a broken version of graphviz"; # added 2025-10-19
   moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30
+  moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
-  moz-phab = mozphab; # Added 2022-08-09
-  mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14
+  moz-phab = throw "'moz-phab' has been renamed to/replaced by 'mozphab'"; # Converted to throw 2025-10-27
   mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
-  mpc-cli = mpc; # Added 2024-10-14
-  mpc_cli = mpc; # Added 2024-10-14
-  mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17
-  mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
-  mpdevil = plattenalbum; # Added 2024-05-22
-  mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
+  mpc-cli = throw "'mpc-cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27
+  mpc_cli = throw "'mpc_cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27
+  mpdevil = throw "'mpdevil' has been renamed to/replaced by 'plattenalbum'"; # Converted to throw 2025-10-27
+  mpdWithFeatures = warnAlias "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   mpris-discord-rpc = throw "'mpris-discord-rpc' has been renamed to 'music-discord-rpc'."; # Added 2025-09-14
-  mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21
+  mpw = throw "'mpw' has been removed, as upstream development has moved to Spectre, which is packaged as 'spectre-cli'"; # Added 2025-10-26
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
-  msp430NewlibCross = msp430Newlib; # Added 2024-09-06
   msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14
-  mumps_par = lib.warnOnInstantiate "mumps_par has been renamed to mumps-mpi" mumps-mpi; # Added 2025-05-07
-  mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22
-  music-player = throw "'music-player' has been removed due to lack of maintenance upstream. Consider using 'fum' or 'termusic' instead."; # Added 2025-05-02
-  mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02
-  mutt-with-sidebar = mutt; # Added 2022-09-17
-  mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
+  msp430NewlibCross = throw "'msp430NewlibCross' has been renamed to/replaced by 'msp430Newlib'"; # Converted to throw 2025-10-27
+  mumps_par = throw "'mumps_par' has been renamed to/replaced by 'mumps-mpi'"; # Converted to throw 2025-10-27
+  mustache-tcl = throw "'mustache-tcl' has been renamed to/replaced by 'tclPackages.mustache-tcl'"; # Converted to throw 2025-10-27
+  mutt-with-sidebar = throw "'mutt-with-sidebar' has been renamed to/replaced by 'mutt'"; # Converted to throw 2025-10-27
   mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
-  mysql-client = hiPrio mariadb.client;
-  mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
-  mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' instead."; # Converted to throw 2024-07-11
-
-  ### N ###
-
+  mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
+  nagiosPluginsOfficial = throw "'nagiosPluginsOfficial' has been renamed to/replaced by 'monitoring-plugins'"; # Converted to throw 2025-10-27
   namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
   nanoblogger = throw "nanoblogger has been removed as upstream stopped developement in 2013"; # Added 2025-09-10
   nasc = throw "'nasc' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
-  ncdu_2 = ncdu; # Added 2022-07-22
+  nats-streaming-server = throw "'nats-streaming-server' has been removed as critical bug fixes and security fixes will no longer be performed as of June of 2023"; # added 2025-10-13
+  ncdu_2 = throw "'ncdu_2' has been renamed to/replaced by 'ncdu'"; # Converted to throw 2025-10-27
   neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
-  neocities-cli = neocities; # Added 2024-07-31
-  neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
-  netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
-  netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
-  netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
+  neocities-cli = throw "'neocities-cli' has been renamed to/replaced by 'neocities'"; # Converted to throw 2025-10-27
   netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14
-  netsurf = recurseIntoAttrs {
-    browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
-    buildsystem = lib.warnOnInstantiate "'netsurf.buildsystem' has been renamed to 'netsurf-buildsystem'" netsurf-buildsystem; # Added 2025-03-26
-    libcss = lib.warnOnInstantiate "'netsurf.libcss' has been renamed to 'libcss'" libcss; # Added 2025-03-26
-    libdom = lib.warnOnInstantiate "'netsurf.libdom' has been renamed to 'libdom'" libdom; # Added 2025-03-26
-    libhubbub = lib.warnOnInstantiate "'netsurf.libhubbub' has been renamed to 'libhubbub'" libhubbub; # Added 2025-03-26
-    libnsbmp = lib.warnOnInstantiate "'netsurf.libnsbmp' has been renamed to 'libnsbmp'" libnsbmp; # Added 2025-03-26
-    libnsfb = lib.warnOnInstantiate "'netsurf.libnsfb' has been renamed to 'libnsfb'" libnsfb; # Added 2025-03-26
-    libnsgif = lib.warnOnInstantiate "'netsurf.libnsgif' has been renamed to 'libnsgif'" libnsgif; # Added 2025-03-26
-    libnslog = lib.warnOnInstantiate "'netsurf.libnslog' has been renamed to 'libnslog'" libnslog; # Added 2025-03-26
-    libnspsl = lib.warnOnInstantiate "'netsurf.libnspsl' has been renamed to 'libnspsl'" libnspsl; # Added 2025-03-26
-    libnsutils = lib.warnOnInstantiate "'netsurf.libnsutils' has been renamed to 'libnsutils'" libnsutils; # Added 2025-03-26
-    libparserutils = lib.warnOnInstantiate "'netsurf.libparserutils' has been renamed to 'libparserutils'" libparserutils; # Added 2025-03-26
-    libsvgtiny = lib.warnOnInstantiate "'netsurf.libsvgtiny' has been renamed to 'libsvgtiny'" libsvgtiny; # Added 2025-03-26
-    libutf8proc = lib.warnOnInstantiate "'netsurf.libutf8proc' has been renamed to 'libutf8proc'" libutf8proc; # Added 2025-03-26
-    libwapcaplet = lib.warnOnInstantiate "'netsurf.libwapcaplet' has been renamed to 'libwapcaplet'" libwapcaplet; # Added 2025-03-26
-    nsgenbind = lib.warnOnInstantiate "'netsurf.nsgenbind' has been renamed to 'nsgenbind'" nsgenbind; # Added 2025-03-26
-  };
+  netbsdCross = throw "'netbsdCross' has been renamed to/replaced by 'netbsd'"; # Converted to throw 2025-10-27
+  netsurf.browser = throw "'netsurf.browser' has been renamed to/replaced by 'netsurf-browser'"; # Converted to throw 2025-10-27
+  netsurf.buildsystem = throw "'netsurf.buildsystem' has been renamed to/replaced by 'netsurf-buildsystem'"; # Converted to throw 2025-10-27
+  netsurf.libcss = throw "'netsurf.libcss' has been renamed to/replaced by 'libcss'"; # Converted to throw 2025-10-27
+  netsurf.libdom = throw "'netsurf.libdom' has been renamed to/replaced by 'libdom'"; # Converted to throw 2025-10-27
+  netsurf.libhubbub = throw "'netsurf.libhubbub' has been renamed to/replaced by 'libhubbub'"; # Converted to throw 2025-10-27
+  netsurf.libnsbmp = throw "'netsurf.libnsbmp' has been renamed to/replaced by 'libnsbmp'"; # Converted to throw 2025-10-27
+  netsurf.libnsfb = throw "'netsurf.libnsfb' has been renamed to/replaced by 'libnsfb'"; # Converted to throw 2025-10-27
+  netsurf.libnsgif = throw "'netsurf.libnsgif' has been renamed to/replaced by 'libnsgif'"; # Converted to throw 2025-10-27
+  netsurf.libnslog = throw "'netsurf.libnslog' has been renamed to/replaced by 'libnslog'"; # Converted to throw 2025-10-27
+  netsurf.libnspsl = throw "'netsurf.libnspsl' has been renamed to/replaced by 'libnspsl'"; # Converted to throw 2025-10-27
+  netsurf.libnsutils = throw "'netsurf.libnsutils' has been renamed to/replaced by 'libnsutils'"; # Converted to throw 2025-10-27
+  netsurf.libparserutils = throw "'netsurf.libparserutils' has been renamed to/replaced by 'libparserutils'"; # Converted to throw 2025-10-27
+  netsurf.libsvgtiny = throw "'netsurf.libsvgtiny' has been renamed to/replaced by 'libsvgtiny'"; # Converted to throw 2025-10-27
+  netsurf.libutf8proc = throw "'netsurf.libutf8proc' has been renamed to/replaced by 'libutf8proc'"; # Converted to throw 2025-10-27
+  netsurf.libwapcaplet = throw "'netsurf.libwapcaplet' has been renamed to/replaced by 'libwapcaplet'"; # Converted to throw 2025-10-27
+  netsurf.nsgenbind = throw "'netsurf.nsgenbind' has been renamed to/replaced by 'nsgenbind'"; # Converted to throw 2025-10-27
   nettools = net-tools; # Added 2025-06-11
+  networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
+  newlib-nanoCross = throw "'newlib-nanoCross' has been renamed to/replaced by 'newlib-nano'"; # Converted to throw 2025-10-27
+  newlibCross = throw "'newlibCross' has been renamed to/replaced by 'newlib'"; # Converted to throw 2025-10-27
   newt-go = fosrl-newt; # Added 2025-06-24
-  notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
-  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
-  nextcloud30 = throw ''
+  nextcloud30 = throw "
     Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped
     by upstream in 2025-09. Please upgrade to at least Nextcloud v31 by declaring
 
@@ -1855,1082 +1105,570 @@ mapAliases {
 
     WARNING: if you were on Nextcloud 29 you have to upgrade to Nextcloud 30
     first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions!
-  ''; # Added 2025-09-25
+  "; # Added 2025-09-25
   nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
-  nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28
-  nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
-  nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
-  neochat = makePlasma5Throw "neochat"; # added 2022-05-10
-  nerdfonts = throw ''
-    nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
-    For example change:
-      fonts.packages = [
-        ...
-        (pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; })
-      ]
-    to
-      fonts.packages = [
-        ...
-        pkgs.nerd-fonts._0xproto
-        pkgs.nerd-fonts.droid-sans-mono
-      ]
-    or for all fonts
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
-  ''; # Added 2024-11-09
-  networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
-  newlibCross = newlib; # Added 2024-09-06
-  newlib-nanoCross = newlib-nano; # Added 2024-09-06
   nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
-  nix-direnv-flakes = nix-direnv; # Added 2021-11-09
-  nix-ld-rs = nix-ld; # Added 2024-08-17
+  nix-direnv-flakes = throw "'nix-direnv-flakes' has been renamed to/replaced by 'nix-direnv'"; # Converted to throw 2025-10-27
+  nix-ld-rs = throw "'nix-ld-rs' has been renamed to/replaced by 'nix-ld'"; # Converted to throw 2025-10-27
   nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06
   nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18
-  nix-repl = throw "nix-repl has been removed because it's not maintained anymore, use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"; # Added 2018-08-26
-  nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17
-  nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21
-  nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17
+  nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
   nixfmt-classic =
     (
       if lib.oldestSupportedReleaseIsAtLeast 2605 then
         throw "nixfmt-classic has been removed as it is deprecated and unmaintained."
       else if lib.oldestSupportedReleaseIsAtLeast 2511 then
-        lib.warnOnInstantiate "nixfmt-classic is deprecated and unmaintained. We recommend switching to nixfmt."
+        warnAlias "nixfmt-classic is deprecated and unmaintained. We recommend switching to nixfmt."
       else
         lib.id
     )
       haskellPackages.nixfmt.bin;
-  nixStable = nixVersions.stable; # Added 2022-01-24
-  nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22
-  nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
   nixfmt-rfc-style =
     if lib.oldestSupportedReleaseIsAtLeast 2511 then
-      lib.warnOnInstantiate
-        "nixfmt-rfc-style is now the same as pkgs.nixfmt which should be used instead."
-        nixfmt # Added 2025-07-14
+      warnAlias "nixfmt-rfc-style is now the same as pkgs.nixfmt which should be used instead." nixfmt # Added 2025-07-14
     else
       nixfmt;
-
-  # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.
-
-  nixosTest = testers.nixosTest; # Added 2022-05-05
+  nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
+  nixosTest = throw "'nixosTest' has been renamed to/replaced by 'testers.nixosTest'"; # Converted to throw 2025-10-27
+  nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
-  nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
-  noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
-  nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
-  nodejs-slim_18 = nodejs_18; # Added 2025-04-23
-  corepack_18 = nodejs_18; # Added 2025-04-23
-  nodejs-18_x = nodejs_18; # Added 2022-11-06
-  nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
   nomacs-qt6 = nomacs; # Added 2025-08-30
-  nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-  nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-  nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-  nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27
-  nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
-  noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17
-  noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09
-  noto-fonts-extra = noto-fonts; # Added 2023-04-08
-  NSPlist = nsplist; # Added 2024-01-05
+  notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
+  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
+  noto-fonts-emoji = throw "'noto-fonts-emoji' has been renamed to/replaced by 'noto-fonts-color-emoji'"; # Converted to throw 2025-10-27
+  noto-fonts-extra = throw "'noto-fonts-extra' has been renamed to/replaced by 'noto-fonts'"; # Converted to throw 2025-10-27
+  NSPlist = throw "'NSPlist' has been renamed to/replaced by 'nsplist'"; # Converted to throw 2025-10-27
   nuget-to-nix = throw "nuget-to-nix has been removed as it was deprecated in favor of nuget-to-json. Please use nuget-to-json instead"; # Added 2025-08-28
-  nushellFull = lib.warnOnInstantiate "`nushellFull` has has been replaced by `nushell` as its features no longer exist" nushell; # Added 2024-05-30
-  nux = throw "nux has been removed because it has been abandoned for 4 years"; # Added 2025-03-22
-  nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02
-  nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated. Use cudaPackages.cuda_cccl"; # Added 2023-12-04
-
-  ### O ###
-
-  o = orbiton; # Added 2023-04-09
-  oathToolkit = oath-toolkit; # Added 2022-04-04
-  oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
+  nushellFull = throw "'nushellFull' has been renamed to/replaced by 'nushell'"; # Converted to throw 2025-10-27
+  o = throw "'o' has been renamed to/replaced by 'orbiton'"; # Converted to throw 2025-10-27
+  oathToolkit = throw "'oathToolkit' has been renamed to/replaced by 'oath-toolkit'"; # Converted to throw 2025-10-27
   obb = throw "obb has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18
-  ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30
   oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
-  offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
-  oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
-  onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
+  oil = throw "'oil' has been renamed to/replaced by 'oils-for-unix'"; # Converted to throw 2025-10-27
+  onevpl-intel-gpu = throw "'onevpl-intel-gpu' has been renamed to/replaced by 'vpl-gpu-rt'"; # Converted to throw 2025-10-27
+  onlyoffice-bin = throw "'onlyoffice-bin' has been renamed to/replaced by 'onlyoffice-desktopeditors'"; # Converted to throw 2025-10-27
+  onlyoffice-bin_latest = throw "'onlyoffice-bin_latest' has been renamed to/replaced by 'onlyoffice-bin'"; # Converted to throw 2025-10-27
+  onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
   onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
-  openai-triton-llvm = triton-llvm; # added 2024-07-18
-  openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
+  opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
+  open-timeline-io = warnAlias "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
+  openafs_1_8 = throw "'openafs_1_8' has been renamed to/replaced by 'openafs'"; # Converted to throw 2025-10-27
+  openai-triton-llvm = throw "'openai-triton-llvm' has been renamed to/replaced by 'triton-llvm'"; # Converted to throw 2025-10-27
+  openai-whisper-cpp = throw "'openai-whisper-cpp' has been renamed to/replaced by 'whisper-cpp'"; # Converted to throw 2025-10-27
   openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17
   openbabel3 = openbabel; # Added 2025-09-17
-  opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
-  opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
-  openafs_1_8 = openafs; # Added 2022-08-22
+  openbsdCross = throw "'openbsdCross' has been renamed to/replaced by 'openbsd'"; # Converted to throw 2025-10-27
   opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
-  opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12
-  opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07
-  openconnect_gnutls = openconnect; # Added 2022-03-29
-  opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15
-  opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15
-  openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17
-  openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13
-  openexr_3 = openexr; # Added 2025-03-12
-  openimageio2 = openimageio; # Added 2023-01-05
-  openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17
-  openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  openjdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
+  openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
+  openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27
+  openimageio2 = throw "'openimageio2' has been renamed to/replaced by 'openimageio'"; # Converted to throw 2025-10-27
+  openjdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
+  openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26
-  openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07
-  openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjfx22 = throw "OpenJFX 22 was removed as it has reached its end of life"; # Added 2024-09-24
+  openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04
   openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2024-10-17
-  openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04
-  openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
-  openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17
   openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
-  opensmtpd-extras = throw "opensmtpd-extras has been removed in favor of separate opensmtpd-table-* packages"; # Added 2025-01-26
-  openssl_3_0 = openssl_3; # Added 2022-06-27
-  opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
-  opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
-  open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
-  opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
-  openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
+  openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
+  opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27
+  opensyclWithRocm = throw "'opensyclWithRocm' has been renamed to/replaced by 'adaptivecppWithRocm'"; # Converted to throw 2025-10-27
+  opentofu-ls = warnAlias "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
+  opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
   opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
-  orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
+  orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
-  omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
-  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
-  onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
-  onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
-  onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
-  openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
-  oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  OSCAR = oscar; # Added 2024-06-12
+  OSCAR = throw "'OSCAR' has been renamed to/replaced by 'oscar'"; # Converted to throw 2025-10-27
   osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
-  osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
-  overrideLibcxx = "overrideLibcxx has beeen removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
-  overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
-  ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
-  oxygen-icons5 = throw ''
-    The top-level oxygen-icons5 alias has been removed.
-
-    Please explicitly use kdePackages.oxygen-icons for the latest Qt 6-based version,
-    or libsForQt5.oxygen-icons5 for the deprecated Qt 5 version.
-
-    Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  ''; # Added 2025-03-15;
-  oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
-
-  ### P ###
-
-  pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
-  PageEdit = pageedit; # Added 2024-01-21
-  passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
-  p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
-  packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
-  paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30
-  inherit (perlPackages) pacup;
+  overrideLibcxx = throw "overrideLibcxx has been removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
+  overrideSDK = throw "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
+  pacup = throw "'pacup' has been renamed to/replaced by 'perlPackages.pacup'"; # Converted to throw 2025-10-27
+  PageEdit = throw "'PageEdit' has been renamed to/replaced by 'pageedit'"; # Converted to throw 2025-10-27
   pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
-  panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25
-  paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
-  paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17
-  pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead"; # Added 2025-01-23
-  paperless-ng = paperless-ngx; # Added 2022-04-11
-  partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08
-  patchelfStable = patchelf; # Added 2024-01-25
-  paup = paup-cli; # Added 2024-09-11
+  paperless-ng = throw "'paperless-ng' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2025-10-27
+  parcellite = throw "'parcellite' was remove due to lack of maintenance and relying on gtk2"; # Added 2025-10-03
+  patchelfStable = throw "'patchelfStable' has been renamed to/replaced by 'patchelf'"; # Converted to throw 2025-10-27
+  path-of-building = lib.warnOnInstantiate "'path-of-building' has been replaced by 'rusty-path-of-building'" rusty-path-of-building; # Added 2025-10-30
+  paup = throw "'paup' has been renamed to/replaced by 'paup-cli'"; # Converted to throw 2025-10-27
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
-  pcsctools = pcsc-tools; # Added 2023-12-07
-  pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
-  pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
-  pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
-  pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
-  peach = asouldocs; # Added 2022-08-28
-  percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
-  percona-server_lts = percona-server; # Added 2024-10-13
-  percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
-  percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13
-  peroxide = throw "'peroxide' has been dropped due to lack of upstream maintenance."; # Added 2025-03-31
-  pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
-  perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09
-  perldevelPackages = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09
+  pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27
+  pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27
+  pds = warnAlias "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
+  pdsadmin = warnAlias "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
+  peach = throw "'peach' has been renamed to/replaced by 'asouldocs'"; # Converted to throw 2025-10-27
+  pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
+  perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
+  percona-server_lts = throw "'percona-server_lts' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
+  percona-xtrabackup_innovation = throw "'percona-xtrabackup_innovation' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
+  percona-xtrabackup_lts = throw "'percona-xtrabackup_lts' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
   peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
-  pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30
-  pgadmin = pgadmin4; # Added 2022-01-14
-  pharo-spur64 = pharo; # Added 2022-08-03
-  phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
-  php81 = throw "php81 is EOL";
-  php81Extensions = php81;
-  php81Packages = php81;
-  picom-next = picom; # Added 2024-02-13
-  pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
-  pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17
-  pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17
-  pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17
-  pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
-  pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
-  pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
-  pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; # Added 2023-03-09
-  platformioPackages = {
-    inherit
-      platformio-core
-      platformio-chrootenv
-      ;
-  }; # Added 2025-09-04
-  platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
-  pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
-  plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
-  plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
-  pltScheme = racket; # Added 2013-02-24
-  poac = cabinpkg; # Added 2025-01-22
-  podofo010 = podofo_0_10; # Added 2025-06-01
-  polkit-kde-agent = throw ''
-    The top-level polkit-kde-agent alias has been removed.
-
-    Please explicitly use kdePackages.polkit-kde-agent-1 for the latest Qt 6-based version,
-    or libsForQt5.polkit-kde-agent for the deprecated Qt 5 version.
-
-    Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  ''; # Added 2025-03-07
-  polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
-  poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
-  posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
-  powerdns = pdns; # Added 2022-03-28
-  postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
-  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
-  preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-  projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10
-
-  cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
   pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19
   pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19
   pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19
   pg_similarity = throw "'pg_similarity' has been removed. Use 'postgresqlPackages.pg_similarity' instead."; # Added 2025-07-19
   pg_topn = throw "'pg_topn' has been removed. Use 'postgresqlPackages.pg_topn' instead."; # Added 2025-07-19
-  pgf1 = throw "'pgf1' has been removed since it is unmaintained. Consider using 'pgf' instead"; # Added 2025-05-10
+  pgadmin = throw "'pgadmin' has been renamed to/replaced by 'pgadmin4'"; # Converted to throw 2025-10-27
+  pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   pgjwt = throw "'pgjwt' has been removed. Use 'postgresqlPackages.pgjwt' instead."; # Added 2025-07-19
   pgroonga = throw "'pgroonga' has been removed. Use 'postgresqlPackages.pgroonga' instead."; # Added 2025-07-19
   pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19
-  plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
-  postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24
-  postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
-  tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
-  tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
-  tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24
-  texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
-  timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
-  thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
-  tsearch_extras = throw "'tsearch_extras' has been removed from nixpkgs"; # Added 2024-12-15
-
-  postgresql_12 = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql_12_jit = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql12Packages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql12JitPackages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-
-  # Ever since building with JIT by default, those are the same.
-  postgresqlJitPackages = postgresqlPackages; # Added 2025-04-12
-  postgresql13JitPackages = postgresql13Packages; # Added 2025-04-12
-  postgresql14JitPackages = postgresql14Packages; # Added 2025-04-12
-  postgresql15JitPackages = postgresql15Packages; # Added 2025-04-12
-  postgresql16JitPackages = postgresql16Packages; # Added 2025-04-12
-  postgresql17JitPackages = postgresql17Packages; # Added 2025-04-12
-
-  # pinentry was using multiple outputs, this emulates the old interface for i.e. home-manager
-  # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'";
-  pinentry = pinentry-all // {
-    curses = pinentry-curses;
-    emacs = pinentry-emacs;
-    gnome3 = pinentry-gnome3;
-    gtk2 = pinentry-gtk2;
-    qt = pinentry-qt;
-    tty = pinentry-tty;
-    flavors = [
-      "curses"
-      "emacs"
-      "gnome3"
-      "gtk2"
-      "qt"
-      "tty"
-    ];
-  }; # added 2024-01-15
-  pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17
+  pharo-spur64 = throw "'pharo-spur64' has been renamed to/replaced by 'pharo'"; # Converted to throw 2025-10-27
+  php81 = throw "php81 is EOL"; # Added 2025-10-04
+  php81Extensions = throw "php81 is EOL"; # Added 2025-10-04
+  php81Packages = throw "php81 is EOL"; # Added 2025-10-04
+  picom-next = throw "'picom-next' has been renamed to/replaced by 'picom'"; # Converted to throw 2025-10-27
+  pidgin-carbons = throw "'pidgin-carbons' has been renamed to/replaced by 'pidginPackages.pidgin-carbons'"; # Converted to throw 2025-10-27
+  pidgin-indicator = throw "'pidgin-indicator' has been renamed to/replaced by 'pidginPackages.pidgin-indicator'"; # Converted to throw 2025-10-27
+  pidgin-latex = throw "'pidgin-latex' has been renamed to/replaced by 'pidginPackages.pidgin-latex'"; # Converted to throw 2025-10-27
+  pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17
+  pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17
+  pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17
+  pidgin-osd = throw "'pidgin-osd' has been renamed to/replaced by 'pidginPackages.pidgin-osd'"; # Converted to throw 2025-10-27
+  pidgin-otr = throw "'pidgin-otr' has been renamed to/replaced by 'pidginPackages.pidgin-otr'"; # Converted to throw 2025-10-27
+  pidgin-sipe = throw "'pidgin-sipe' has been renamed to/replaced by 'pidginPackages.pidgin-sipe'"; # Converted to throw 2025-10-27
+  pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
+  pidgin-window-merge = throw "'pidgin-window-merge' has been renamed to/replaced by 'pidginPackages.pidgin-window-merge'"; # Converted to throw 2025-10-27
+  pidgin-xmpp-receipts = throw "'pidgin-xmpp-receipts' has been renamed to/replaced by 'pidginPackages.pidgin-xmpp-receipts'"; # Converted to throw 2025-10-27
+  pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
+  pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26
   piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03
-  pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15
-  pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15
-
   plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  PlistCpp = plistcpp; # Added 2024-01-05
-  pocket-updater-utility = pupdate; # Added 2024-01-25
+  platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
+  platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
+  plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
+  PlistCpp = throw "'PlistCpp' has been renamed to/replaced by 'plistcpp'"; # Converted to throw 2025-10-27
+  pltScheme = throw "'pltScheme' has been renamed to/replaced by 'racket'"; # Converted to throw 2025-10-27
+  plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
+  pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
+  poac = throw "'poac' has been renamed to/replaced by 'cabinpkg'"; # Converted to throw 2025-10-27
+  pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27
+  podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
-  poppler_utils = poppler-utils; # Added 2025-02-27
+  polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
+  poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27
+  posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
+  postgres-lsp = warnAlias "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
+  postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27
+  postgresql14JitPackages = throw "'postgresql14JitPackages' has been renamed to/replaced by 'postgresql14Packages'"; # Converted to throw 2025-10-27
+  postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27
+  postgresql16JitPackages = throw "'postgresql16JitPackages' has been renamed to/replaced by 'postgresql16Packages'"; # Converted to throw 2025-10-27
+  postgresql17JitPackages = throw "'postgresql17JitPackages' has been renamed to/replaced by 'postgresql17Packages'"; # Converted to throw 2025-10-27
+  postgresqlJitPackages = throw "'postgresqlJitPackages' has been renamed to/replaced by 'postgresqlPackages'"; # Converted to throw 2025-10-27
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
-  powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
+  powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
-  premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10
-  prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
-  prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
+  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2025-06-19
+  preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
-  probe-rs = probe-rs-tools; # Added 2024-05-23
-  probe-run = throw "probe-run is deprecated upstream.  Use probe-rs instead."; # Added 2024-05-23
+  probe-rs = throw "'probe-rs' has been renamed to/replaced by 'probe-rs-tools'"; # Converted to throw 2025-10-27
   proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
-  prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
-  prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
-  prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
-  prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10
-  prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
-  protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
+  prometheus-dmarc-exporter = throw "'prometheus-dmarc-exporter' has been renamed to/replaced by 'dmarc-metrics-exporter'"; # Converted to throw 2025-10-27
+  prometheus-dovecot-exporter = throw "'prometheus-dovecot-exporter' has been renamed to/replaced by 'dovecot_exporter'"; # Converted to throw 2025-10-27
+  protobuf3_21 = throw "'protobuf3_21' has been renamed to/replaced by 'protobuf_21'"; # Converted to throw 2025-10-27
+  protobuf3_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29
   protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
-  protobuf3_24 = protobuf_24; # Added 2023-10-05
-  protobuf3_23 = protobuf_23; # Added 2023-10-05
-  protobuf3_21 = protobuf_21; # Added 2023-10-05
-  protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
-  protonup = protonup-ng; # Added 2022-11-06
-  protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
-  proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" (
-    python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent
-  ); # Added 2025-04-23
-  proxmark3-rrg = proxmark3; # Added 2023-07-25
-  psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
-  psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10
-  ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10
+  proton-vpn-local-agent = throw "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'"; # Converted to throw 2025-10-26
+  protonup = throw "'protonup' has been renamed to/replaced by 'protonup-ng'"; # Converted to throw 2025-10-27
+  protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
+  protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
+  proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27
+  purple-discord = throw "'purple-discord' has been renamed to/replaced by 'pidginPackages.purple-discord'"; # Converted to throw 2025-10-27
   purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17
-  purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
+  purple-googlechat = throw "'purple-googlechat' has been renamed to/replaced by 'pidginPackages.purple-googlechat'"; # Converted to throw 2025-10-27
   purple-hangouts = throw "'purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; # Added 2025-09-17
+  purple-lurch = throw "'purple-lurch' has been renamed to/replaced by 'pidginPackages.purple-lurch'"; # Converted to throw 2025-10-27
+  purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
+  purple-mm-sms = throw "'purple-mm-sms' has been renamed to/replaced by 'pidginPackages.purple-mm-sms'"; # Converted to throw 2025-10-27
+  purple-plugin-pack = throw "'purple-plugin-pack' has been renamed to/replaced by 'pidginPackages.purple-plugin-pack'"; # Converted to throw 2025-10-27
+  purple-slack = throw "'purple-slack' has been renamed to/replaced by 'pidginPackages.purple-slack'"; # Converted to throw 2025-10-27
   purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17
-  pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
-  pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
-  pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
-  pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18
-  pyo3-pack = maturin; # Added 2019-08-30
-  pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; # Added 2023-06-02
-  pypolicyd-spf = spf-engine; # Added 2022-10-09
-  pypy39Packages = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-07
-  python = python2; # Added 2022-01-11
-  python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
-  pythonFull = python2Full; # Added 2022-01-11
-  python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  pythonPackages = python.pkgs; # Added 2022-01-11
-  pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
-
-  ### Q ###
-
-  qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
+  purple-xmpp-http-upload = throw "'purple-xmpp-http-upload' has been renamed to/replaced by 'pidginPackages.purple-xmpp-http-upload'"; # Converted to throw 2025-10-27
+  pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27
+  pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27
+  python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python = throw "`python` previously pointed to Python 2; use `python3` or `python2` if necessary"; # Converted to throw 2025-10-27
+  pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` or `python2Full` if necessary"; # Converted to throw 2025-10-27
+  pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` or `python2.pkgs` if necessary"; # Converted to throw 2025-10-27
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  qflipper = qFlipper; # Added 2022-02-11
+  qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
-  qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
-  qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
+  qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27
+  qscintilla-qt6 = throw "'qscintilla-qt6' has been renamed to/replaced by 'qt6Packages.qscintilla'"; # Converted to throw 2025-10-27
+  qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
+  qt6ct = throw "'qt6ct' has been renamed to/replaced by 'qt6Packages.qt6ct'"; # Converted to throw 2025-10-27
+  qt515 = throw "'qt515' has been renamed to/replaced by 'qt5'"; # Converted to throw 2025-10-27
   qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  qt515 = qt5; # Added 2022-11-24
-  qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
-  qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
-  qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
-  qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
-  quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
+  qtile-unwrapped = throw "'qtile-unwrapped' has been renamed to/replaced by 'python3.pkgs.qtile'"; # Converted to throw 2025-10-27
+  quantum-espresso-mpi = throw "'quantum-espresso-mpi' has been renamed to/replaced by 'quantum-espresso'"; # Converted to throw 2025-10-27
   quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
   qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
-  quickbms = throw "'quickbms' has been removed due to being unmaintained for many years."; # Added 2025-05-17
-  quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesABCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesCCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesClisp = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesECL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quickserve = throw "'quickserve' has been removed because its upstream is unavailable"; # Added 2025-05-10
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
+  quorum = throw "'quorum' has been removed as it was broken and unmaintained upstream"; # Added 2025-11-07
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
-  qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
-
-  ### R ###
-
-  rabbitmq-java-client = throw "rabbitmq-java-client has been removed due to its dependency on Python2 and a lack of maintenance within the nixpkgs tree"; # Added 2025-03-29
-  rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15
-  racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06
-  radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17
-  radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29
-  radicale3 = radicale; # Added 2024-11-29
-  railway-travel = diebahn; # Added 2024-04-01
-  rambox-pro = rambox; # Added 2022-12-12
-  rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28
-  rargs = throw "'rargs' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  rebazel = throw "'rebazel' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
+  radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27
+  railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27
+  rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27
+  rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27
+  react-static = throw "'react-static' has been removed due to lack of maintainance upstream"; # Added 2025-11-04
+  recurseIntoAttrs = warnAlias "'recurseIntoAttrs' has been removed from pkgs, use `lib.recurseIntoAttrs` instead" lib.recurseIntoAttrs; # Added 2025-10-30
+  redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16
   redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01
-  redocly-cli = redocly; # Added 2024-04-14
-  redpanda = redpanda-client; # Added 2023-10-14
-  redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10
-  relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02
+  redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27
+  redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27
   remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11
-  replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13
-  restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04
-  retroarchBare = retroarch-bare; # Added 2024-11-23
-  retroarchFull = retroarch-full; # Added 2024-11-23
-  retroshare06 = retroshare; # Added 2020-11-07
-  rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
   responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25
-  rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  rigsofrods = rigsofrods-bin; # Added 2023-03-22
-  ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
-  riko4 = throw "'riko4' has been removed as it was unmaintained, failed to build and dependend on outdated libraries"; # Added 2025-05-18
-  rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
-  rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
+  retroarchBare = throw "'retroarchBare' has been renamed to/replaced by 'retroarch-bare'"; # Converted to throw 2025-10-27
+  retroarchFull = throw "'retroarchFull' has been renamed to/replaced by 'retroarch-full'"; # Converted to throw 2025-10-27
+  retroshare06 = throw "'retroshare06' has been renamed to/replaced by 'retroshare'"; # Converted to throw 2025-10-27
+  rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
+  rigsofrods = throw "'rigsofrods' has been renamed to/replaced by 'rigsofrods-bin'"; # Converted to throw 2025-10-27
   river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30
   rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
-  rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02
-  rl_json = tclPackages.rl_json; # Added 2025-05-03
-  rockbox_utility = rockbox-utility; # Added 2022-03-17
+  rl_json = throw "'rl_json' has been renamed to/replaced by 'tclPackages.rl_json'"; # Converted to throw 2025-10-27
+  rockbox_utility = throw "'rockbox_utility' has been renamed to/replaced by 'rockbox-utility'"; # Converted to throw 2025-10-27
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
-  rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18
   rofi-emoji-wayland = throw "'rofi-emoji-wayland' has been merged into `rofi-emoji as 'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06
   root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17
   rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10
-  rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17
   rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
-  rr-unstable = rr; # Added 2022-09-17
-  rtx = mise; # Added 2024-01-05
+  rr-unstable = throw "'rr-unstable' has been renamed to/replaced by 'rr'"; # Converted to throw 2025-10-27
+  rtx = throw "'rtx' has been renamed to/replaced by 'mise'"; # Converted to throw 2025-10-27
+  ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
   ruby_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   ruby_3_2 = throw "ruby_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
   rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
-  ruby-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
-  runCommandNoCC = runCommand; # Added 2021-08-15
-  runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15
-  run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
-  rust-synapse-state-compress = rust-synapse-compress-state; # Added 2025-03-08
-  rustc-wasm32 = rustc; # Added 2023-12-01
-  rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  rustic-rs = rustic; # Added 2024-08-02
-  rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17
-  rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17
+  rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  runCommandNoCC = warnAlias "'runCommandNoCC' has been renamed to/replaced by 'runCommand'" runCommand; # Converted to warning 2025-10-28
+  runCommandNoCCLocal = warnAlias "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'" runCommandLocal; # Converted to warning 2025-10-28
+  rust-synapse-state-compress = throw "'rust-synapse-state-compress' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27
+  rustc-wasm32 = throw "'rustc-wasm32' has been renamed to/replaced by 'rustc'"; # Converted to throw 2025-10-27
+  rustic-rs = throw "'rustic-rs' has been renamed to/replaced by 'rustic'"; # Converted to throw 2025-10-27
   ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30
-  ryujinx-greemdev = ryubing; # Added 2025-01-20
-
-  # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
-  # due to it being inside the linuxPackagesFor function.
-  rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17
-  rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
-
-  ### S ###
-
-  SDL_classic = SDL1; # Added 2024-09-03
-  SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
-  SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
-  SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20
-  SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
+  ryujinx-greemdev = throw "'ryujinx-greemdev' has been renamed to/replaced by 'ryubing'"; # Converted to throw 2025-10-27
+  scantailor = throw "'scantailor' has been renamed to/replaced by 'scantailor-advanced'"; # Converted to throw 2025-10-27
+  scitoken-cpp = throw "'scitoken-cpp' has been renamed to/replaced by 'scitokens-cpp'"; # Converted to throw 2025-10-27
+  scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
   SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
   SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
-  SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
   SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
-  s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17
-  sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06
-  sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17
-  samtools_0_1_19 = throw "'samtools_0_1_19' has been removed because it is unmaintained. Consider using 'samtools' instead"; # Added 2025-05-10
-  scantailor = scantailor-advanced; # Added 2022-05-26
-  schildichat-web = throw ''
-    schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes.
-    Please participate in upstream discussion on getting out new releases:
-    https://github.com/SchildiChat/schildichat-desktop/issues/212
-    https://github.com/SchildiChat/schildichat-desktop/issues/215''; # Added 2023-12-05
-  schildichat-desktop = schildichat-web; # Added 2023-12-07
-  schildichat-desktop-wayland = schildichat-web; # Added 2023-12-07
-  scitoken-cpp = scitokens-cpp; # Added 2024-02-12
-  scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12
-  scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
-  semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28
-  serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  serious-sans = throw "'serious-sans' has been renamed to 'serious-shanns', which is not currently packaged"; # Added 2025-01-26
-  session-desktop-appimage = session-desktop; # Added 2022-08-31
+  semiphemeral = throw "'semiphemeral' has been removed as it is archived upstream"; # Added 2025-11-06
+  sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
+  session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27
   setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
-  sequoia = sequoia-sq; # Added 2023-06-26
-  sexp = sexpp; # Added 2023-07-03
-  sgrep = throw "'sgrep' has been removed as it was unmaintained upstream since 1998 and broken with gcc 14"; # Added 2025-05-17
-  shallot = throw "'shallot' has been removed as it is broken and the upstream repository was removed. Consider using 'mkp224o'"; # Added 2025-03-16
-  shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  shipyard = jumppad; # Added 2023-06-06
-  siduck76-st = st-snazzy; # Added 2024-12-24
+  sexp = throw "'sexp' has been renamed to/replaced by 'sexpp'"; # Converted to throw 2025-10-27
+  shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
+  shipyard = throw "'shipyard' has been renamed to/replaced by 'jumppad'"; # Converted to throw 2025-10-27
+  siduck76-st = throw "'siduck76-st' has been renamed to/replaced by 'st-snazzy'"; # Converted to throw 2025-10-27
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; # Added 2024-11-20
-  signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
-  silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12
-  silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12
+  signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27
+  simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17
   siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
-  sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  shout = nodePackages.shout; # Added unknown; moved 2024-10-19
-  sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
+  sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
+  SkypeExport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
-  SkypeExport = skypeexport; # Added 2024-06-12
-  skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05
-  slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
   sladeUnstable = slade-unstable; # Added 2025-08-26
   slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26
-  slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06
   sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
-  slurm-llnl = slurm; # renamed July 2017
-  sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
-  smartgithg = smartgit; # renamed March 2025
+  slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2025-10-27
+  smartgithg = throw "'smartgithg' has been renamed to/replaced by 'smartgit'"; # Converted to throw 2025-10-27
   snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
-  snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # Added 2024-03-04
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
-  soldat-unstable = opensoldat; # Added 2022-07-02
+  soldat-unstable = throw "'soldat-unstable' has been renamed to/replaced by 'opensoldat'"; # Converted to throw 2025-10-27
+  somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
+  sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27
   soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
   soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
-  soundOfSorting = sound-of-sorting; # Added 2023-07-07
-  SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
-  SPAdes = spades; # Added 2024-06-12
-  spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
-  spark2014 = gnatprove; # Added 2024-02-25
-  space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
-  spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
-  spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
-  sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27
-
-  sourceHanSansPackages = {
-    japanese = source-han-sans; # Added 2020-02-10
-    korean = source-han-sans; # Added 2020-02-10
-    simplified-chinese = source-han-sans; # Added 2020-02-10
-    traditional-chinese = source-han-sans; # Added 2020-02-10
-  };
-  source-han-sans-japanese = source-han-sans; # Added 2020-02-10
-  source-han-sans-korean = source-han-sans; # Added 2020-02-10
-  source-han-sans-simplified-chinese = source-han-sans; # Added 2020-02-10
-  source-han-sans-traditional-chinese = source-han-sans; # Added 2020-02-10
-  sourceHanSerifPackages = {
-    japanese = source-han-serif; # Added 2020-02-10
-    korean = source-han-serif; # Added 2020-02-10
-    simplified-chinese = source-han-serif; # Added 2020-02-10
-    traditional-chinese = source-han-serif; # Added 2020-02-10
-  };
-  source-han-serif-japanese = source-han-serif; # Added 2020-02-10
-  source-han-serif-korean = source-han-serif; # Added 2020-02-10
-  source-han-serif-simplified-chinese = source-han-serif; # Added 2020-02-10
-  source-han-serif-traditional-chinese = source-han-serif; # Added 2020-02-10
-
+  soundOfSorting = throw "'soundOfSorting' has been renamed to/replaced by 'sound-of-sorting'"; # Converted to throw 2025-10-27
+  source-han-sans-japanese = throw "'source-han-sans-japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-sans-korean = throw "'source-han-sans-korean' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-sans-simplified-chinese = throw "'source-han-sans-simplified-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-sans-traditional-chinese = throw "'source-han-sans-traditional-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-serif-japanese = throw "'source-han-serif-japanese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  source-han-serif-korean = throw "'source-han-serif-korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  source-han-serif-simplified-chinese = throw "'source-han-serif-simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  source-han-serif-traditional-chinese = throw "'source-han-serif-traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.japanese = throw "'sourceHanSansPackages.japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.korean = throw "'sourceHanSansPackages.korean' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.simplified-chinese = throw "'sourceHanSansPackages.simplified-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.traditional-chinese = throw "'sourceHanSansPackages.traditional-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.japanese = throw "'sourceHanSerifPackages.japanese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.korean = throw "'sourceHanSerifPackages.korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.simplified-chinese = throw "'sourceHanSerifPackages.simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.traditional-chinese = throw "'sourceHanSerifPackages.traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
   sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15
-  solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20
-  spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17
-  # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
-  spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17
-  spidermonkey_78 = throw "'spidermonkey_78' has been removed because it was unused."; # Added 2025-02-02
+  SP800-90B_EntropyAssessment = throw "'SP800-90B_EntropyAssessment' has been renamed to/replaced by 'sp800-90b-entropyassessment'"; # Converted to throw 2025-10-27
+  space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
+  SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27
+  spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
+  spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27
   spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26
-  spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07
-  spotify-unwrapped = spotify; # added 2022-11-06
+  spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27
   spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16
   springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
-  spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
-  sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
-  srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
-  ssm-agent = amazon-ssm-agent; # Added 2023-10-17
-  starpls-bin = starpls; # Added 2024-10-30
-  starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
+  sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
+  ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27
+  stacer = throw "'stacer' has been removed because it was abandoned upstream and relied upon vulnerable software"; # Added 2025-11-08
+  starpls-bin = throw "'starpls-bin' has been renamed to/replaced by 'starpls'"; # Converted to throw 2025-10-27
   station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16
+  steam-run-native = throw "'steam-run-native' has been renamed to/replaced by 'steam-run'"; # Converted to throw 2025-10-27
+  steam-small = throw "'steam-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
   steamcontroller = throw "'steamcontroller' has been removed due to lack of upstream maintenance. Consider using 'sc-controller' instead."; # Added 2025-09-20
-  steamPackages = {
-    steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16
-    steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16
-    steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; # Added 2024-10-16
-    steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; # Added 2024-10-16
-    steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
-    steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
-    steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16
-  };
-  steam-small = steam; # Added 2024-09-12
-  steam-run-native = steam-run; # added 2022-02-21
-  StormLib = stormlib; # Added 2024-01-21
-  strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
+  steamPackages.steam = throw "'steamPackages.steam' has been renamed to/replaced by 'steam-unwrapped'"; # Converted to throw 2025-10-27
+  steamPackages.steam-fhsenv = throw "'steamPackages.steam-fhsenv' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
+  steamPackages.steam-fhsenv-small = throw "'steamPackages.steam-fhsenv-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
+  steamPackages.steamcmd = throw "'steamPackages.steamcmd' has been renamed to/replaced by 'steamcmd'"; # Converted to throw 2025-10-27
+  StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27
+  strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
-  strelka = throw "strelka depends on Python 2.6+, and does not support Python 3."; # Added 2025-03-17
+  stringsWithDeps = warnAlias "'stringsWithDeps' has been removed from pkgs, use `lib.stringsWithDeps` instead" lib.stringsWithDeps; # Added 2025-10-30
   subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20
   substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23
   substituteAllFiles = throw "`substituteAllFiles` has been removed. Use `replaceVars` for each file instead."; # Added 2025-05-23
-  suidChroot = throw "'suidChroot' has been dropped as it was unmaintained, failed to build and had questionable security considerations"; # Added 2025-05-17
   suitesparse_4_2 = throw "'suitesparse_4_2' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   suitesparse_4_4 = throw "'suitesparse_4_4' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sumaclust = throw "'sumaclust' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumalibs = throw "'sumalibs' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumatra = throw "'sumatra' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
-  sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
-  sumokoin = throw "sumokoin has been removed as it was abandoned upstream"; # Added 2024-11-23
-  supertag = throw "supertag has been removed as it was abandoned upstream and fails to build"; # Added 2025-04-20
-  suyu = throw "suyu has been removed from nixpkgs, as it is subject to a DMCA takedown"; # Added 2025-05-12
-  swiProlog = lib.warnOnInstantiate "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07
-  swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
-  swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
-  swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
-  swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-11-18
-  swig4 = swig; # Added 2024-09-12
-  swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
-  swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
-  swt_jdk8 = throw "'swt_jdk8' has been removed due to being unused and broken for a long time"; # Added 2025-01-07
-  Sylk = sylk; # Added 2024-06-12
-  symbiyosys = sby; # Added 2024-08-18
+  sumneko-lua-language-server = throw "'sumneko-lua-language-server' has been renamed to/replaced by 'lua-language-server'"; # Converted to throw 2025-10-27
+  swig4 = throw "'swig4' has been renamed to/replaced by 'swig'"; # Converted to throw 2025-10-27
+  swiProlog = throw "'swiProlog' has been renamed to/replaced by 'swi-prolog'"; # Converted to throw 2025-10-27
+  swiPrologWithGui = throw "'swiPrologWithGui' has been renamed to/replaced by 'swi-prolog-gui'"; # Converted to throw 2025-10-27
+  Sylk = throw "'Sylk' has been renamed to/replaced by 'sylk'"; # Converted to throw 2025-10-27
+  symbiyosys = throw "'symbiyosys' has been renamed to/replaced by 'sby'"; # Converted to throw 2025-10-27
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
-  sync = taler-sync; # Added 2024-09-04
-  syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
-  syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
+  sync = throw "'sync' has been renamed to/replaced by 'taler-sync'"; # Converted to throw 2025-10-27
+  syncall = throw "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
+  syncthingtray-qt6 = throw "'syncthingtray-qt6' has been renamed to/replaced by 'syncthingtray'"; # Converted to throw 2025-10-27
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-
-  ### T ###
-
+  system = warnAlias "'system' has been renamed to/replaced by 'stdenv.hostPlatform.system'" stdenv.hostPlatform.system; # Converted to warning 2025-10-28
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
-  tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
-  tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02
-  tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17
   tamgamp.lv2 = tamgamp-lv2; # Added 2025-09-27
-  taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; # Added 2024-08-14
-  taplo-cli = taplo; # Added 2022-07-30
-  taplo-lsp = taplo; # Added 2022-07-30
-  targetcli = targetcli-fb; # Added 2025-03-14
-  taro = taproot-assets; # Added 2023-07-04
+  taplo-cli = throw "'taplo-cli' has been renamed to/replaced by 'taplo'"; # Converted to throw 2025-10-27
+  taplo-lsp = throw "'taplo-lsp' has been renamed to/replaced by 'taplo'"; # Converted to throw 2025-10-27
+  targetcli = throw "'targetcli' has been renamed to/replaced by 'targetcli-fb'"; # Converted to throw 2025-10-27
+  targetPlatform = warnAlias "'targetPlatform' has been renamed to/replaced by 'stdenv.targetPlatform'" stdenv.targetPlatform; # Converted to warning 2025-10-28
+  taro = throw "'taro' has been renamed to/replaced by 'taproot-assets'"; # Converted to throw 2025-10-27
+  taskwarrior = throw "'taskwarrior' has been renamed to/replaced by 'taskwarrior2'"; # Converted to throw 2025-10-27
   tbb = onetbb; # Added 2025-09-14
   tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14
   tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13
   tbb_2022 = onetbb; # Added 2025-09-14
-  tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
-  tclcurl = tclPackages.tclcurl; # Added 2024-10-02
-  tcllib = tclPackages.tcllib; # Added 2024-10-02
-  tclmagick = tclPackages.tclmagick; # Added 2024-10-02
-  tcltls = tclPackages.tcltls; # Added 2024-10-02
-  tcludp = tclPackages.tcludp; # Added 2024-10-02
-  tclvfs = tclPackages.tclvfs; # Added 2024-10-02
-  tclx = tclPackages.tclx; # Added 2024-10-02
+  tcl-fcgi = throw "'tcl-fcgi' has been renamed to/replaced by 'tclPackages.tcl-fcgi'"; # Converted to throw 2025-10-27
+  tclcurl = throw "'tclcurl' has been renamed to/replaced by 'tclPackages.tclcurl'"; # Converted to throw 2025-10-27
+  tcllib = throw "'tcllib' has been renamed to/replaced by 'tclPackages.tcllib'"; # Converted to throw 2025-10-27
+  tclmagick = throw "'tclmagick' has been renamed to/replaced by 'tclPackages.tclmagick'"; # Converted to throw 2025-10-27
+  tcltls = throw "'tcltls' has been renamed to/replaced by 'tclPackages.tcltls'"; # Converted to throw 2025-10-27
+  tcludp = throw "'tcludp' has been renamed to/replaced by 'tclPackages.tcludp'"; # Converted to throw 2025-10-27
+  tclvfs = throw "'tclvfs' has been renamed to/replaced by 'tclPackages.tclvfs'"; # Converted to throw 2025-10-27
+  tclx = throw "'tclx' has been renamed to/replaced by 'tclPackages.tclx'"; # Converted to throw 2025-10-27
   tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
-  tdesktop = telegram-desktop; # Added 2023-04-07
-  tdom = tclPackages.tdom; # Added 2024-10-02
-  teamspeak_client = teamspeak3; # Added 2024-11-07
-  teamspeak5_client = teamspeak6-client; # Added 2025-01-29
-  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # Added 2024-08-23
-  telepathy-gabble = throw "'telepathy-gabble' has been removed as it was unmaintained, unused, broken and used outdated libraries"; # Added 2025-04-20
-  telepathy-logger = throw "'telepathy-logger' has been removed as it was unmaintained, unused and broken"; # Added 2025-04-20
-  teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
-  teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
-  teleport_15 = throw "teleport 15 has been removed as it is EOL. Please upgrade to Teleport 16 or later"; # Added 2025-03-28
+  tdesktop = throw "'tdesktop' has been renamed to/replaced by 'telegram-desktop'"; # Converted to throw 2025-10-27
+  tdlib-purple = throw "'tdlib-purple' has been renamed to/replaced by 'pidginPackages.tdlib-purple'"; # Converted to throw 2025-10-27
+  tdom = throw "'tdom' has been renamed to/replaced by 'tclPackages.tdom'"; # Converted to throw 2025-10-27
+  teamspeak5_client = throw "'teamspeak5_client' has been renamed to/replaced by 'teamspeak6-client'"; # Converted to throw 2025-10-27
+  teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
+  tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
+  telepathy-haze = throw "'telepathy-haze' has been removed due to being unmaintained and broken since 2023"; # Added 2025-11-04
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
-  terminus-nerdfont = lib.warnOnInstantiate "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
-  temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
-  temurin-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
+  temurin-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
+  temurin-jre-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
-  tepl = libgedit-tepl; # Added 2024-04-29
-  termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
-  testVersion = testers.testVersion; # Added 2022-04-20
-  textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
+  tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27
+  terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27
+  testVersion = throw "'testVersion' has been renamed to/replaced by 'testers.testVersion'"; # Converted to throw 2025-10-27
+  tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
   texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
-  tezos-rust-libs = ligo; # Added 2025-06-03
-  tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
-  theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
-  thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20
+  textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
+  tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
+  tfplugindocs = throw "'tfplugindocs' has been renamed to/replaced by 'terraform-plugin-docs'"; # Converted to throw 2025-10-27
   thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
-  thunderbird-128 = throw "Thunderbird 128 support ended in August 2025";
-  thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025";
-  invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
+  theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
+  thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
+  thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
+  thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
   ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10
-  tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27
-  timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
-  tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
-  timelens = throw "'timelens' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
   tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
-  tix = tclPackages.tix; # Added 2024-10-02
-  tkcvs = tkrev; # Added 2022-03-07
+  tix = throw "'tix' has been renamed to/replaced by 'tclPackages.tix'"; # Converted to throw 2025-10-27
+  tkcvs = throw "'tkcvs' has been renamed to/replaced by 'tkrev'"; # Converted to throw 2025-10-27
   tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
-  tkimg = tclPackages.tkimg; # Added 2024-10-02
+  tkimg = throw "'tkimg' has been renamed to/replaced by 'tclPackages.tkimg'"; # Converted to throw 2025-10-27
   tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21
-  todiff = throw "'todiff' was removed due to lack of known users"; # Added 2025-01-25
-  toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
-  tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
-  tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07
-  ton = throw "'ton' has been removed as there were insufficient maintainer resources to keep up with updates"; # Added 2025-04-27
+  tokyo-night-gtk = throw "'tokyo-night-gtk' has been renamed to/replaced by 'tokyonight-gtk-theme'"; # Converted to throw 2025-10-27
+  tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27
   tooling-language-server = deputy; # Added 2025-06-22
-  tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
-  torrenttools = throw "torrenttools has been removed due to lack of maintanance upstream"; # Added 2025-04-06
-  torq = throw "torq has been removed because the project went closed source"; # Added 2024-11-24
-  torzu = throw "torzu has been removed from nixpkgs, as it is subject to a DMCA takedown"; # Added 2025-05-12
-  transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10
-  transmission-gtk = lib.warnOnInstantiate (transmission3Warning {
-    suffix = "-gtk";
-  }) transmission_3-gtk; # Added 2024-06-10
-  transmission-qt = lib.warnOnInstantiate (transmission3Warning {
-    suffix = "-qt";
-  }) transmission_3-qt; # Added 2024-06-10
-  treefmt1 = throw "treefmt1 has been removed as it is not maintained anymore. Consider using `treefmt` instead."; # 2025-03-06
-  treefmt2 = lib.warnOnInstantiate "treefmt2 has been renamed to treefmt" treefmt; # 2025-03-06
-  libtransmission = lib.warnOnInstantiate (transmission3Warning {
-    prefix = "lib";
-  }) libtransmission_3; # Added 2024-06-10
-  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
-  LPCNet = lpcnet; # Added 2025-05-05
-  tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
-  tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
-  transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11
-  transfig = fig2dev; # Added 2022-02-15
-  transifex-client = transifex-cli; # Added 2023-12-29
-  trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
-  trezor_agent = trezor-agent; # Added 2024-01-07
+  tor-browser-bundle-bin = throw "'tor-browser-bundle-bin' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2025-10-27
+  tracker = throw "'tracker' has been renamed to/replaced by 'tinysparql'"; # Converted to throw 2025-10-27
+  tracker-miners = throw "'tracker-miners' has been renamed to/replaced by 'localsearch'"; # Converted to throw 2025-10-27
+  transfig = throw "'transfig' has been renamed to/replaced by 'fig2dev'"; # Converted to throw 2025-10-27
+  transifex-client = throw "'transifex-client' has been renamed to/replaced by 'transifex-cli'"; # Converted to throw 2025-10-27
+  transmission = throw "transmission_3 has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  transmission-gtk = throw "transmission_3-gtk has been removed in favour of transmission_4-gtk. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  transmission-qt = throw "transmission_3-qt has been removed in favour of transmission_4-qt. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  transmission_3 = throw "transmission_3 has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  transmission_3-gtk = throw "transmission_3-gtk has been removed in favour of transmission_4-gtk. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  transmission_3-qt = throw "transmission_3-qt has been removed in favour of transmission_4-qt. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  transmission_3_noSystemd = throw "transmission_3_noSystemd has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  treefmt2 = throw "'treefmt2' has been renamed to/replaced by 'treefmt'"; # Converted to throw 2025-10-27
+  trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-27
   trilium-next-desktop = trilium-desktop; # Added 2025-08-30
   trilium-next-server = trilium-server; # Added 2025-08-30
   trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
-  trust-dns = hickory-dns; # Added 2024-08-07
+  trust-dns = throw "'trust-dns' has been renamed to/replaced by 'hickory-dns'"; # Converted to throw 2025-10-27
   tt-rss = throw "'tt-rss' has been removed, as it was discontinued on 2025-11-01"; # Added 2025-10-03
   tt-rss-plugin-auth-ldap = throw "'tt-rss-plugin-auth-ldap' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-data-migration = throw "'tt-rss-plugin-data-migration' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-feediron = throw "'tt-rss-plugin-feediron' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
+  tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-ff-instagram = throw "'tt-rss-plugin-ff-instagram' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-freshapi = throw "'tt-rss-plugin-freshapi' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
-  tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
-  ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17
-  tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08
-  tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
-  turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25
-  tvbrowser-bin = tvbrowser; # Added 2023-03-02
-  tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
-  typst-fmt = typstfmt; # Added 2023-07-15
-  typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25
-  typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
-
-  ### U ###
-
-  uade123 = uade; # Added 2022-07-30
+  tvbrowser-bin = throw "'tvbrowser-bin' has been renamed to/replaced by 'tvbrowser'"; # Converted to throw 2025-10-27
+  typst-fmt = throw "'typst-fmt' has been renamed to/replaced by 'typstfmt'"; # Converted to throw 2025-10-27
+  typstfmt = throw "'typstfmt' has been removed due to lack of upstream maintenance, consider using 'typstyle' instead"; # Added 2025-10-26
+  uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   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
-  uclibc = uclibc-ng; # Added 2022-06-16
+  ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
+  udisks2 = udisks; # added 2025-10-30
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
-  unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17
-  uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; # Added 2023-05-27
-  unifi-poller = unpoller; # Added 2022-11-24
-  unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01
-  unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
-  unifi6 = throw "'unifi6' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
-  unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01
-  unifi8 = throw "'unifi8' has been removed. Use `pkgs.unifi` instead."; # Converted to throw 2025-05-10
-  unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11
-  unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11
-  unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; # Removed 2024-12-20
-  untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17
+  unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
-  uq = throw "'uq' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17
-  urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17
-  urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17
-  urxvt_perl = throw "'urxvt_perl' has been renamed to/replaced by 'rxvt-unicode-plugins.perl'"; # Converted to throw 2024-10-17
-  urxvt_perls = throw "'urxvt_perls' has been renamed to/replaced by 'rxvt-unicode-plugins.perls'"; # Converted to throw 2024-10-17
-  urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17
-  urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17
-  urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17
-  ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
-  ut2004demo = ut2004Packages; # Added 2024-11-24
-  util-linuxCurses = util-linux; # Added 2022-04-12
-  utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
-
-  ### V ###
-
-  v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21
-  validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21
-  vamp = {
-    vampSDK = vamp-plugin-sdk; # Added 2020-03-26
-  };
-  vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
-  vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
+  util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
+  utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28
+  vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
+  vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
-  varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
-  varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
-  varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
-  varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
-  varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
-  varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
+  vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27
+  vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
-  vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
-  ventoy-bin = ventoy; # Added 2023-04-12
-  ventoy-bin-full = ventoy-full; # Added 2023-04-12
-  verilog = iverilog; # Added 2024-07-12
+  vboot_reference = vboot-utils; # Added 2025-11-01
+  vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
+  vdirsyncerStable = throw "'vdirsyncerStable' has been renamed to/replaced by 'vdirsyncer'"; # Converted to throw 2025-10-27
+  ventoy-bin = throw "'ventoy-bin' has been renamed to/replaced by 'ventoy'"; # Converted to throw 2025-10-27
+  ventoy-bin-full = throw "'ventoy-bin-full' has been renamed to/replaced by 'ventoy-full'"; # Converted to throw 2025-10-27
+  verilog = throw "'verilog' has been renamed to/replaced by 'iverilog'"; # Converted to throw 2025-10-27
   veriT = verit; # Added 2025-08-21
   vieb = throw "'vieb' has been removed as it doesn't satisfy our security criteria for browsers."; # Added 2025-06-25
-  ViennaRNA = viennarna; # Added 2023-08-23
-  vimHugeX = vim-full; # Added 2022-12-04
-  vim_configurable = vim-full; # Added 2022-12-04
-  vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14
-  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-  libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
-  vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04
-  viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
-  viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-27
+  vim_configurable = throw "'vim_configurable' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27
+  vimHugeX = throw "'vimHugeX' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27
   virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   virtkey = throw "'virtkey' has been removed, as it was unmaintained, abandoned upstream, and relied on gtk2."; # Added 2025-10-12
-  virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
-  vistafonts = vista-fonts; # Added 2025-02-03
-  vistafonts-chs = vista-fonts-chs; # Added 2025-02-03
-  vistafonts-cht = vista-fonts-cht; # Added 2025-02-03
-  vkBasalt = vkbasalt; # Added 2022-11-22
-  vkdt-wayland = vkdt; # Added 2024-04-19
-  vmware-horizon-client = throw "'vmware-horizon-client' has been renamed to 'omnissa-horizon-client'"; # Added 2025-04-24
-  vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
-  void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
+  vistafonts = throw "'vistafonts' has been renamed to/replaced by 'vista-fonts'"; # Converted to throw 2025-10-27
+  vistafonts-chs = throw "'vistafonts-chs' has been renamed to/replaced by 'vista-fonts-chs'"; # Converted to throw 2025-10-27
+  vistafonts-cht = throw "'vistafonts-cht' has been renamed to/replaced by 'vista-fonts-cht'"; # Converted to throw 2025-10-27
+  vkBasalt = throw "'vkBasalt' has been renamed to/replaced by 'vkbasalt'"; # Converted to throw 2025-10-27
+  vkdt-wayland = throw "'vkdt-wayland' has been renamed to/replaced by 'vkdt'"; # Converted to throw 2025-10-27
+  volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
   voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
-  vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
-  vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
+  vtk_9 = warnAlias "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
+  vtk_9_egl = warnAlias "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18
   vtkWithQt5 = throw "'vtkWithQt5' has been removed. Consider using 'vtkWithQt6' instead."; # Added 2025-09-06
-  vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
   vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-
-  ### W ###
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  wakatime = wakatime-cli; # 2024-05-30
-  wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
-  wapp = tclPackages.wapp; # Added 2024-10-02
-  wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
+  wakatime = throw "'wakatime' has been renamed to/replaced by 'wakatime-cli'"; # Converted to throw 2025-10-27
+  wapp = throw "'wapp' has been renamed to/replaced by 'tclPackages.wapp'"; # Converted to throw 2025-10-27
+  warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03
+  warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
+  warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;
-  watershot = throw "'watershot' has been removed as it is unmaintained upstream and no longer works"; # Added 2025-06-01
-  wayfireApplications-unwrapped = throw ''
-    'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
-    'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
-    'wayfireApplications-unwrapped.wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'
-    'wayfireApplications-unwrapped.wlroots' has been removed
-  ''; # Add 2023-07-29
-  waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
+  wasm-strip = throw "'wasm-strip' has been removed due to upstream deprecation. Use 'wabt' instead."; # Added 2025-11-06
+  wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
+  wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
+  wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
   webfontkitgenerator = webfont-bundler; # Added 2025-07-27
   webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11
-  webmetro = throw "'webmetro' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  whatsapp-for-linux = wasistlos; # Added 2025-01-30
+  webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08
+  whatsapp-for-linux = throw "'whatsapp-for-linux' has been renamed to/replaced by 'wasistlos'"; # Converted to throw 2025-10-27
   wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29
-  wineWayland = wine-wayland;
-  winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
   win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
-  win-virtio = virtio-win; # Added 2023-10-17
-  wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
-  wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
-  wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
+  win-virtio = throw "'win-virtio' has been renamed to/replaced by 'virtio-win'"; # Converted to throw 2025-10-27
+  wineWayland = throw "'wineWayland' has been renamed to/replaced by 'wine-wayland'"; # Converted to throw 2025-10-27
+  winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
+  wkhtmltopdf-bin = throw "'wkhtmltopdf-bin' has been renamed to/replaced by 'wkhtmltopdf'"; # Converted to throw 2025-10-27
+  wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
-  wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
-  wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
-  wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03
-  wordpress6_5 = wordpress_6_5; # Added 2024-08-03
-  wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
-  wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
-  wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
-  wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
-  wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  wmii_hg = wmii; # Added 2022-04-26
-  wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
-  write_stylus = styluslabs-write-bin; # Added 2024-10-09
+  worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
+  wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27
+  wrapGAppsHook = throw "'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'"; # Converted to throw 2025-10-27
+  wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02
+  wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07
+  write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
-
-  ### X ###
-
-  x11idle = throw "'x11idle' has been removed as the upstream is no longer available. Please see 'xprintidle' as an alternative"; # Added 2025-03-10
-  x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
-  xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
-  xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
-  xboxdrv = throw "'xboxdrv' has been dropped as it has been superseded by an in-tree kernel driver"; # Added 2024-12-25
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
-  xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
-  xdragon = dragon-drop; # Added 2025-03-22
-  xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30
-  xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05
-  xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-10-05
-  xen_4_17 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.17 would have been the 'n-2' version, it was removed"; # Added 2024-10-05
-  xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05
-  xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05
-  xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; # Added 2024-10-05
-  xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
+  xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
-  xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
-  xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
+  xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
-  xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
-  xmlada = gnatPackages.xmlada; # Added 2024-02-25
+  xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
-  xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
-  xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
+  xonsh-unwrapped = throw "'xonsh-unwrapped' has been renamed to/replaced by 'python3Packages.xonsh'"; # Converted to throw 2025-10-27
   xorg-autoconf = util-macros; # Added 2025-08-18
-  xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
-  xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
-  xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27
-  xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
-  xsd = throw "'xsd' has been removed."; # Added 2025-04-02
-  xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative"; # Added 2025-01-30
   xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
-  xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25
-  xulrunner = firefox-unwrapped; # Added 2023-11-03
-  xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17
-  xwaylandvideobridge = makePlasma5Throw "xwaylandvideobridge"; # Added 2024-09-27
-  xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-
-  ### Y ###
-
-  yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
-  yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
-  yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
-  yafaray-core = libyafaray; # Added 2022-09-23
-  yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  yandex-browser = throw "'yandex-browser' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
-  yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
-  yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
-  youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
+  xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
-  yabar-unstable = yabar; # Added 2025-06-10
+  yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
+  yafaray-core = throw "'yafaray-core' has been renamed to/replaced by 'libyafaray'"; # Converted to throw 2025-10-27
+  yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
+  yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12
-  yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
   yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
-  yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-
-  ### Z ###
-
-  z3_4_11 = throw "'z3_4_11' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_12 = throw "'z3_4_12' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_13 = throw "'z3_4_13' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_14 = throw "'z3_4_14' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_8_5 = throw "'z3_4_8_5' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22
-  zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22
+  zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
+  zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
-  zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
-  zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
-  zeroadPackages = recurseIntoAttrs {
-    zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
-    zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
-    zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
-  };
-  zeromq4 = zeromq; # Added 2024-11-03
-  zfsStable = zfs; # Added 2024-02-26
-  zfsUnstable = zfs_unstable; # Added 2024-02-26
-  zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
-  zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
-  zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
-  zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09
+  zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
+  zeal-qt6 = warnAlias "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
+  zeroadPackages.zeroad = throw "'zeroadPackages.zeroad' has been renamed to/replaced by 'zeroad'"; # Converted to throw 2025-10-27
+  zeroadPackages.zeroad-data = throw "'zeroadPackages.zeroad-data' has been renamed to/replaced by 'zeroad-data'"; # Converted to throw 2025-10-27
+  zeroadPackages.zeroad-unwrapped = throw "'zeroadPackages.zeroad-unwrapped' has been renamed to/replaced by 'zeroad-unwrapped'"; # Converted to throw 2025-10-27
+  zeromq4 = throw "'zeromq4' has been renamed to/replaced by 'zeromq'"; # Converted to throw 2025-10-27
+  zfsStable = throw "'zfsStable' has been renamed to/replaced by 'zfs'"; # Converted to throw 2025-10-27
+  zfsUnstable = throw "'zfsUnstable' has been renamed to/replaced by 'zfs_unstable'"; # Converted to throw 2025-10-27
   zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18
   zigbee2mqtt_1 = throw "Zigbee2MQTT 1.x has been removed, upgrade to the unversioned attribute."; # Added 2025-08-11
   zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11
-  zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
-  zinc = zincsearch; # Added 2023-05-28
-  zint = zint-qt; # Added 2025-05-15
+  zinc = throw "'zinc' has been renamed to/replaced by 'zincsearch'"; # Converted to throw 2025-10-27
+  zint = throw "'zint' has been renamed to/replaced by 'zint-qt'"; # Converted to throw 2025-10-27
   zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
-  zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17
-  zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
-  zkg = throw "'zkg' has been replaced by 'zeek'"; # Added 2023-10-20
+  zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
   zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
-  zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17
-  zq = zed.overrideAttrs (old: {
-    meta = old.meta // {
-      mainProgram = "zq";
-    };
-  }); # Added 2023-02-06
-  zyn-fusion = zynaddsubfx; # Added 2022-08-05
-  zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
-
-  ### UNSORTED ###
-
-  inherit (stdenv.hostPlatform) system; # Added 2021-10-22
-  inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09
-
-  freebsdCross = freebsd; # Added 2024-09-06
-  netbsdCross = netbsd; # Added 2024-09-06
-  openbsdCross = openbsd; # Added 2024-09-06
-
-  # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
-  llvmPackages_latest = llvmPackages_21;
-
-  /*
-    If these are in the scope of all-packages.nix, they cause collisions
-      between mixed versions of qt. See:
-    https://github.com/NixOS/nixpkgs/pull/101369
-  */
-
-  kalendar = merkuro; # Renamed in 23.08
-  kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; # Added 2023-08-24
-
-  inherit (pidginPackages)
-    pidgin-indicator
-    pidgin-latex
-    pidgin-carbons
-    pidgin-xmpp-receipts
-    pidgin-otr
-    pidgin-osd
-    pidgin-sipe
-    pidgin-window-merge
-    purple-discord
-    purple-googlechat
-    purple-lurch
-    purple-mm-sms
-    purple-plugin-pack
-    purple-slack
-    purple-xmpp-http-upload
-    tdlib-purple
-    ;
-
+  zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27
+  # keep-sorted end
 }
 // plasma5Throws
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 028cf5698409..0039910c1de1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12,6 +12,17 @@
   config,
   overlays,
 }:
+let
+  # Add inherited lib functions only here, so they are not exported from pkgs
+  inherit (lib)
+    lowPrio
+    hiPrio
+    recurseIntoAttrs
+    dontRecurseIntoAttrs
+    makeOverridable
+    ;
+in
+
 res: pkgs: super:
 
 with pkgs;
@@ -32,6 +43,12 @@ with pkgs;
   # all-packages.nix)
   _type = "pkgs";
 
+  ### Helper functions.
+  inherit lib config overlays;
+
+  # For convenience, allow callers to get the path to Nixpkgs.
+  path = ../..;
+
   # A stdenv capable of building 32-bit binaries.
   # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux,
   # it's just the plain stdenv.
@@ -91,35 +108,13 @@ with pkgs;
   gccStdenvNoLibs = mkStdenvNoLibs gccStdenv;
   clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
 
-  # For convenience, allow callers to get the path to Nixpkgs.
-  path = ../..;
-
-  ### Helper functions.
-  inherit lib config overlays;
-
-  # do not import 'appendToName' to get consistent package-names with the same
-  # set of package-parameters: https://github.com/NixOS/nixpkgs/issues/68519
-  inherit (lib) lowPrio hiPrio makeOverridable;
-
-  inherit (lib) recurseIntoAttrs;
-
-  # This is intended to be the reverse of recurseIntoAttrs, as it is
-  # defined now it exists mainly for documentation purposes, but you
-  # can also override this with recurseIntoAttrs to recurseInto all
-  # the Attrs which is useful for testing massive changes. Ideally,
-  # every package subset not marked with recurseIntoAttrs should be
-  # marked with this.
-  inherit (lib) dontRecurseIntoAttrs;
-
-  stringsWithDeps = lib.stringsWithDeps;
-
   ### Evaluating the entire Nixpkgs naively will likely fail, make failure fast
   AAAAAASomeThingsFailToEvaluate = throw ''
     This pseudo-package is likely not the only part of Nixpkgs that fails to evaluate.
     You should not evaluate entire Nixpkgs without measures to handle failing packages.
   '';
 
-  tests = lib.recurseIntoAttrs (callPackages ../test { });
+  tests = recurseIntoAttrs (callPackages ../test { });
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.
@@ -769,8 +764,6 @@ with pkgs;
   mkShell = callPackage ../build-support/mkshell { };
   mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
 
-  mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
-
   nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix {
     inherit lib writeText;
     inherit (emacs.pkgs) inherit-local;
@@ -973,8 +966,6 @@ with pkgs;
 
   ### TOOLS
 
-  _3llo = callPackage ../tools/misc/3llo { };
-
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
   acquire = with python3Packages; toPythonApplication acquire;
@@ -1133,6 +1124,8 @@ with pkgs;
 
   vprof = with python3Packages; toPythonApplication vprof;
 
+  waydroid-nftables = waydroid.override { withNftables = true; };
+
   winbox = winbox3;
   winbox3 = callPackage ../tools/admin/winbox {
     wine = wineWowPackages.stable;
@@ -1244,8 +1237,6 @@ with pkgs;
 
   gitRepo = git-repo;
 
-  gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
-
   merge-fmt = callPackage ../applications/version-management/merge-fmt {
     inherit (ocamlPackages)
       buildDunePackage
@@ -1259,7 +1250,7 @@ with pkgs;
     python3Packages.callPackage ../applications/version-management/pass-git-helper
       { };
 
-  qgit = qt5.callPackage ../applications/version-management/qgit { };
+  qgit = qt6Packages.callPackage ../applications/version-management/qgit { };
 
   silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };
 
@@ -1315,10 +1306,6 @@ with pkgs;
 
   cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
 
-  dosbox = callPackage ../applications/emulators/dosbox {
-    SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat;
-  };
-
   fceux-qt5 = fceux.override { ___qtVersion = "5"; };
   fceux-qt6 = fceux.override { ___qtVersion = "6"; };
 
@@ -1328,8 +1315,6 @@ with pkgs;
 
   gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
 
-  gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
-
   goldberg-emu = callPackage ../applications/emulators/goldberg-emu {
     protobuf = protobuf_21;
   };
@@ -1430,7 +1415,7 @@ with pkgs;
 
   vifm-full = vifm.override {
     mediaSupport = true;
-    inherit lib udisks2 python3;
+    inherit lib udisks python3;
   };
 
   xfe = callPackage ../by-name/xf/xfe/package.nix {
@@ -1459,9 +1444,11 @@ with pkgs;
     rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji;
   };
 
-  rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins {
-    inherit callPackage;
-  };
+  rxvt-unicode-plugins = recurseIntoAttrs (
+    import ../applications/terminal-emulators/rxvt-unicode-plugins {
+      inherit callPackage;
+    }
+  );
 
   rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
 
@@ -1532,8 +1519,6 @@ with pkgs;
   arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
   arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
 
-  apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { };
-
   arpack-mpi = arpack.override { useMpi = true; };
 
   asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };
@@ -1595,9 +1580,8 @@ with pkgs;
 
   blocksat-cli = with python3Packages; toPythonApplication blocksat-cli;
 
+  bucklespring-x11 = callPackage ../by-name/bu/bucklespring-libinput/package.nix { legacy = true; };
   bucklespring = bucklespring-x11;
-  bucklespring-libinput = callPackage ../applications/audio/bucklespring { };
-  bucklespring-x11 = callPackage ../applications/audio/bucklespring { legacy = true; };
 
   buildbotPackages = recurseIntoAttrs (
     callPackage ../development/tools/continuous-integration/buildbot { }
@@ -1617,7 +1601,7 @@ with pkgs;
     withDriver = false;
   };
 
-  fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
+  fedora-backgrounds = recurseIntoAttrs (callPackage ../data/misc/fedora-backgrounds { });
 
   coconut = with python312Packages; toPythonApplication coconut;
 
@@ -1766,8 +1750,6 @@ with pkgs;
 
   biliass = with python3.pkgs; toPythonApplication biliass;
 
-  birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
-
   charles = charles5;
   inherit (callPackages ../applications/networking/charles { })
     charles3
@@ -1882,6 +1864,8 @@ with pkgs;
 
   coreboot-configurator = libsForQt5.callPackage ../tools/misc/coreboot-configurator { };
 
+  intel-oneapi = callPackage ../development/libraries/intel-oneapi { };
+
   sway-unwrapped = callPackage ../by-name/sw/sway-unwrapped/package.nix {
     wlroots = wlroots_0_19;
   };
@@ -1951,8 +1935,6 @@ with pkgs;
     enableSSH = true;
   };
 
-  easyaudiosync = qt6Packages.callPackage ../applications/audio/easyaudiosync { };
-
   easycrypt = callPackage ../applications/science/logic/easycrypt {
     why3 = pkgs.why3.override {
       ideSupport = false;
@@ -2033,10 +2015,6 @@ with pkgs;
     inherit (darwin) libresolv;
   };
 
-  greg = callPackage ../applications/audio/greg {
-    pythonPackages = python3Packages;
-  };
-
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   hopper = qt5.callPackage ../development/tools/analysis/hopper { };
@@ -2194,7 +2172,7 @@ with pkgs;
 
   mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
 
-  nltk-data = lib.recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
+  nltk-data = recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
 
   seabios-coreboot = seabios.override { ___build-type = "coreboot"; };
   seabios-csm = seabios.override { ___build-type = "csm"; };
@@ -2228,8 +2206,6 @@ with pkgs;
 
   renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; };
 
-  rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
-
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
   ropgadget = with python3Packages; toPythonApplication ropgadget;
@@ -2243,7 +2219,7 @@ with pkgs;
     rainloop-standard
     ;
 
-  razergenie = libsForQt5.callPackage ../applications/misc/razergenie { };
+  razergenie = callPackage ../applications/misc/razergenie { };
 
   roundcube = callPackage ../servers/roundcube { };
 
@@ -2310,10 +2286,6 @@ with pkgs;
     enableExtraPlugins = true;
   };
 
-  asciidoctor = callPackage ../tools/typesetting/asciidoctor { };
-
-  asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
-
   b2sum = callPackage ../tools/security/b2sum {
     inherit (llvmPackages) openmp;
   };
@@ -2330,9 +2302,6 @@ with pkgs;
     usePoppler = true;
   };
 
-  beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
-  inherit (beetsPackages) beets;
-
   binlore = callPackage ../development/tools/analysis/binlore { };
 
   birdfont = callPackage ../tools/misc/birdfont { };
@@ -2353,25 +2322,7 @@ with pkgs;
   cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
 
   libceph = ceph.lib;
-  inherit
-    (callPackages ../tools/filesystems/ceph {
-      lua = lua5_4; # Ceph currently requires >= 5.3
-
-      # To see which `fmt` version Ceph upstream recommends, check its `src/fmt` submodule.
-      #
-      # Ceph does not currently build with `fmt_11`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557
-      # If we want to switch for that before upstream fixes it, use this patch:
-      # https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899648638
-      fmt = fmt_9;
-
-      # Remove once Ceph supports arrow-cpp >= 20, see:
-      # * https://tracker.ceph.com/issues/71269
-      # * https://github.com/NixOS/nixpkgs/issues/406306
-      arrow-cpp = callPackage ../tools/filesystems/ceph/arrow-cpp-19.nix { };
-    })
-    ceph
-    ceph-client
-    ;
+  ceph-client = ceph.client;
   ceph-dev = ceph;
 
   clementine = libsForQt5.callPackage ../applications/audio/clementine {
@@ -2384,8 +2335,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
-
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })
@@ -2442,8 +2391,6 @@ with pkgs;
 
   unify = with python3Packages; toPythonApplication unify;
 
-  inherit (nodePackages) uppy-companion;
-
   usb-modeswitch-data = callPackage ../by-name/us/usb-modeswitch/data.nix { };
 
   persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };
@@ -2458,7 +2405,7 @@ with pkgs;
 
   libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { };
 
-  skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { };
+  skkDictionaries = recurseIntoAttrs (callPackages ../tools/inputmethods/skk/skk-dicts { });
 
   ibus = callPackage ../tools/inputmethods/ibus { };
 
@@ -2473,8 +2420,6 @@ with pkgs;
 
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
 
-    kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { };
-
     libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
 
     libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { };
@@ -2538,10 +2483,6 @@ with pkgs;
 
   cmdpack = callPackages ../tools/misc/cmdpack { };
 
-  cocoapods = callPackage ../development/tools/cocoapods { };
-
-  cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; });
-
   comet-gog_heroic = callPackage ../by-name/co/comet-gog/package.nix { comet-gog_kind = "heroic"; };
 
   compass = callPackage ../development/tools/compass { };
@@ -2557,17 +2498,29 @@ with pkgs;
     singleBinary = false;
   };
 
-  create-cycle-app = nodePackages.create-cycle-app;
-
   cron = isc-cron;
 
   # Top-level fix-point used in `cudaPackages`' internals
   _cuda = import ../development/cuda-modules/_cuda;
 
-  cudaPackages_12_6 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.6"; };
-  cudaPackages_12_8 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.8"; };
-  cudaPackages_12_9 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.9"; };
-  cudaPackages_12 = cudaPackages_12_8; # Latest supported by cudnn
+  inherit
+    (import ./cuda-packages.nix {
+      inherit
+        _cuda
+        callPackage
+        config
+        lib
+        ;
+    })
+    cudaPackages_12_6
+    cudaPackages_12_8
+    cudaPackages_12_9
+    cudaPackages_13_0
+    ;
+
+  cudaPackages_12 = cudaPackages_12_8;
+
+  cudaPackages_13 = cudaPackages_13_0;
 
   cudaPackages = recurseIntoAttrs cudaPackages_12;
 
@@ -2588,6 +2541,7 @@ with pkgs;
       pslSupport = true;
       zstdSupport = true;
       http3Support = true;
+      c-aresSupport = true;
     }
     // lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
       brotliSupport = true;
@@ -2777,10 +2731,6 @@ with pkgs;
 
   fluentd = callPackage ../tools/misc/fluentd { };
 
-  gemstash = callPackage ../development/tools/gemstash { };
-
-  lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor { };
-
   lp_solve = callPackage ../applications/science/math/lp_solve {
     inherit (darwin) autoSignDarwinBinariesHook;
   };
@@ -2925,9 +2875,7 @@ with pkgs;
     godot-export-templates-bin
     ;
 
-  goattracker = callPackage ../applications/audio/goattracker { };
-
-  goattracker-stereo = callPackage ../applications/audio/goattracker {
+  goattracker-stereo = callPackage ../by-name/go/goattracker/package.nix {
     isStereo = true;
   };
 
@@ -3067,8 +3015,6 @@ with pkgs;
 
   hpccm = with python3Packages; toPythonApplication hpccm;
 
-  hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { };
-
   html-proofer = callPackage ../tools/misc/html-proofer { };
 
   httpie = with python3Packages; toPythonApplication httpie;
@@ -3083,10 +3029,6 @@ with pkgs;
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { });
 
-  iannix = libsForQt5.callPackage ../applications/audio/iannix { };
-
-  iaito = libsForQt5.callPackage ../tools/security/iaito { };
-
   icemon = libsForQt5.callPackage ../applications/networking/icemon { };
 
   icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;
@@ -3106,8 +3048,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  in-formant = qt6Packages.callPackage ../applications/audio/in-formant { };
-
   incus-lts = callPackage ../by-name/in/incus/lts.nix { };
 
   indexed-bzip2 = with python3Packages; toPythonApplication indexed-bzip2;
@@ -3136,20 +3076,17 @@ with pkgs;
       isl = isl_0_20;
       isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
       isl_0_23 = callPackage ../development/libraries/isl/0.23.0.nix { };
-      isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
       isl_0_27 = callPackage ../development/libraries/isl/0.27.0.nix { };
     })
     isl
     isl_0_20
     isl_0_23
-    isl_0_24
     isl_0_27
     ;
 
   jackett = callPackage ../servers/jackett { };
 
-  jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
-  jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
+  jamesdsp-pulse = callPackage ../by-name/ja/jamesdsp/package.nix {
     usePipewire = false;
     usePulseaudio = true;
   };
@@ -3160,7 +3097,7 @@ with pkgs;
 
   jl = haskellPackages.jl;
 
-  joplin = nodePackages.joplin;
+  jkqtplotter = libsForQt5.callPackage ../development/libraries/jkqtplotter { };
 
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;
 
@@ -3201,6 +3138,8 @@ with pkgs;
 
   kbfs = callPackage ../tools/security/keybase/kbfs.nix { };
 
+  kbdVlock = callPackage ../../pkgs/by-name/kb/kbd/package.nix { withVlock = true; };
+
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
 
   kio-fuse = libsForQt5.callPackage ../tools/filesystems/kio-fuse { };
@@ -3219,6 +3158,8 @@ with pkgs;
     gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
   };
 
+  limine-full = limine.override { enableAll = true; };
+
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg_6-full;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
@@ -3321,7 +3262,7 @@ with pkgs;
 
   buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
 
-  npmHooks = callPackage ../build-support/node/build-npm-package/hooks { };
+  npmHooks = recurseIntoAttrs (callPackage ../build-support/node/build-npm-package/hooks { });
 
   inherit (callPackages ../build-support/node/fetch-npm-deps { })
     fetchNpmDeps
@@ -3521,7 +3462,7 @@ with pkgs;
   };
 
   # Not in aliases because it wouldn't get picked up by callPackage
-  netbox = netbox_4_3;
+  netbox = netbox_4_4;
 
   netcap-nodpi = callPackage ../by-name/ne/netcap/package.nix {
     withDpi = false;
@@ -3593,8 +3534,6 @@ with pkgs;
   pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
 
-  pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend { };
-
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
 
   nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };
@@ -3671,8 +3610,6 @@ with pkgs;
 
   sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { };
 
-  opentrack = libsForQt5.callPackage ../applications/misc/opentrack { };
-
   openvpn = callPackage ../tools/networking/openvpn { };
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };
@@ -3726,10 +3663,6 @@ with pkgs;
 
   packagekit = callPackage ../tools/package-management/packagekit { };
 
-  padthv1 = libsForQt5.callPackage ../applications/audio/padthv1 { };
-
-  pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
-
   pakcs = callPackage ../development/compilers/pakcs { };
 
   paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };
@@ -3751,16 +3684,12 @@ with pkgs;
     percona-xtrabackup
     ;
 
-  pipecontrol = libsForQt5.callPackage ../applications/audio/pipecontrol { };
-
   pulumiPackages = recurseIntoAttrs pulumi.pkgs;
 
   pulumi-bin = callPackage ../tools/admin/pulumi-bin { };
 
   patch = gnupatch;
 
-  patchance = python3Packages.callPackage ../applications/audio/patchance { };
-
   pcscliteWithPolkit = pcsclite.override {
     pname = "pcsclite-with-polkit";
     polkitSupport = true;
@@ -3845,8 +3774,6 @@ with pkgs;
 
   polaris-web = callPackage ../servers/polaris/web.nix { };
 
-  projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };
-
   proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
 
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;
@@ -3863,8 +3790,6 @@ with pkgs;
 
   pywal = with python3Packages; toPythonApplication pywal;
 
-  raysession = python3Packages.callPackage ../applications/audio/raysession { };
-
   remarshal = with python3Packages; toPythonApplication remarshal;
 
   riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {
@@ -3888,8 +3813,6 @@ with pkgs;
 
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
-
   qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { };
 
   qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };
@@ -3985,8 +3908,6 @@ with pkgs;
 
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
-  selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
-
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
   inherit (semgrep.passthru) semgrep-core;
 
@@ -4058,8 +3979,6 @@ with pkgs;
     openssl = openssl.override { withZlib = true; };
   };
 
-  stacer = libsForQt5.callPackage ../tools/system/stacer { };
-
   staticjinja = with python3.pkgs; toPythonApplication staticjinja;
 
   stoken = callPackage ../tools/security/stoken (config.stoken or { });
@@ -4084,8 +4003,6 @@ with pkgs;
     w3m = w3m-batch;
   };
 
-  systemdgenie = libsForQt5.callPackage ../applications/system/systemdgenie { };
-
   tartube = callPackage ../applications/video/tartube { };
 
   tartube-yt-dlp = callPackage ../applications/video/tartube {
@@ -4120,11 +4037,7 @@ with pkgs;
 
   tldr-hs = haskellPackages.tldr;
 
-  tmuxPlugins = recurseIntoAttrs (
-    callPackage ../misc/tmux-plugins {
-      pkgs = pkgs.__splicedPackages;
-    }
-  );
+  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
 
   tpm2-totp-with-plymouth = tpm2-totp.override {
     withPlymouth = true;
@@ -4136,8 +4049,6 @@ with pkgs;
 
   trackma-qt = trackma.override { withQT = true; };
 
-  tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
-
   trezorctl = with python3Packages; toPythonApplication trezor;
 
   trezor-agent = with python3Packages; toPythonApplication trezor-agent;
@@ -4179,8 +4090,6 @@ with pkgs;
 
   vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { };
 
-  vcmi = libsForQt5.callPackage ../games/vcmi { };
-
   video2midi = callPackage ../tools/audio/video2midi {
     pythonPackages = python3Packages;
   };
@@ -4218,15 +4127,8 @@ with pkgs;
     inherit (perlPackages) Po4a;
   };
 
-  webassemblyjs-cli = nodePackages."@webassemblyjs/cli-1.11.1";
-  webassemblyjs-repl = nodePackages."@webassemblyjs/repl-1.11.1";
-
   buildWasmBindgenCli = callPackage ../build-support/wasm-bindgen-cli { };
 
-  wasm-strip = nodePackages."@webassemblyjs/wasm-strip";
-  wasm-text-gen = nodePackages."@webassemblyjs/wasm-text-gen-1.11.1";
-  wast-refmt = nodePackages."@webassemblyjs/wast-refmt-1.11.1";
-
   wasmedge = callPackage ../development/tools/wasmedge {
     stdenv = clangStdenv;
   };
@@ -4252,8 +4154,6 @@ with pkgs;
     libjpeg_turbo = libjpeg_turbo.override { enableJava = true; };
   };
 
-  ufmt = with python3Packages; toPythonApplication ufmt;
-
   unbound-with-systemd = unbound.override {
     withSystemd = true;
   };
@@ -4313,8 +4213,6 @@ with pkgs;
     wlroots = wlroots_0_19;
   };
 
-  wring = nodePackages.wring;
-
   wyrd = callPackage ../tools/misc/wyrd {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
@@ -4344,9 +4242,7 @@ with pkgs;
   yarn-berry_4 = yarn-berry.override { berryVersion = 4; };
   yarn-berry_3 = yarn-berry.override { berryVersion = 3; };
 
-  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea {
-    pkgs = pkgs.__splicedPackages;
-  };
+  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
 
   inherit (yarn2nix-moretea)
     yarn2nix
@@ -4355,8 +4251,6 @@ with pkgs;
     fixup_yarn_lock
     ;
 
-  yamlfix = with python3Packages; toPythonApplication yamlfix;
-
   yamllint = with python3Packages; toPythonApplication yamllint;
 
   # To expose more packages for Yi, override the extraPackages arg.
@@ -4402,9 +4296,6 @@ with pkgs;
   temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25;
   temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25;
 
-  temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23;
-  temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23;
-
   temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21;
   temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21;
 
@@ -4524,6 +4415,7 @@ with pkgs;
     crystal_1_15
     crystal_1_16
     crystal_1_17
+    crystal_1_18
     crystal
     ;
 
@@ -4558,11 +4450,10 @@ with pkgs;
   );
   flutterPackages = flutterPackages-bin;
   flutter = flutterPackages.stable;
+  flutter338 = flutterPackages.v3_38;
   flutter335 = flutterPackages.v3_35;
   flutter332 = flutterPackages.v3_32;
   flutter329 = flutterPackages.v3_29;
-  flutter327 = flutterPackages.v3_27;
-  flutter324 = flutterPackages.v3_24;
 
   fpc = callPackage ../development/compilers/fpc { };
 
@@ -5050,7 +4941,6 @@ with pkgs;
   idrisPackages = recurseIntoAttrs (
     callPackage ../development/idris-modules {
       idris-no-deps = haskellPackages.idris;
-      pkgs = pkgs.__splicedPackages;
     }
   );
 
@@ -5058,15 +4948,11 @@ with pkgs;
 
   idris2Packages = recurseIntoAttrs (callPackage ../development/compilers/idris2 { });
 
-  inherit (idris2Packages) idris2;
-
   inherit (callPackage ../development/tools/database/indradb { })
     indradb-server
     indradb-client
     ;
 
-  instawow = callPackage ../games/instawow/default.nix { };
-
   irony-server = callPackage ../development/tools/irony-server {
     # The repository of irony to use -- must match the version of the employed emacs
     # package.  Wishing we could merge it into one irony package, to avoid this issue,
@@ -5077,7 +4963,6 @@ with pkgs;
 
   openjfx17 = openjfx;
   openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
-  openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
   openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; };
 
   openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
@@ -5105,11 +4990,6 @@ with pkgs;
   jdk21 = openjdk21;
   jdk21_headless = openjdk21_headless;
 
-  openjdk23 = javaPackages.compiler.openjdk23;
-  openjdk23_headless = javaPackages.compiler.openjdk23.headless;
-  jdk23 = openjdk23;
-  jdk23_headless = openjdk23_headless;
-
   openjdk25 = javaPackages.compiler.openjdk25;
   openjdk25_headless = javaPackages.compiler.openjdk25.headless;
   jdk25 = openjdk25;
@@ -5170,17 +5050,19 @@ with pkgs;
     julia_19-bin
     julia_110-bin
     julia_111-bin
+    julia_112-bin
     julia_19
     julia_110
     julia_111
+    julia_112
     ;
 
   julia-lts = julia_110-bin;
-  julia-stable = julia_111;
+  julia-stable = julia_112;
   julia = julia-stable;
 
   julia-lts-bin = julia_110-bin;
-  julia-stable-bin = julia_111-bin;
+  julia-stable-bin = julia_112-bin;
   julia-bin = julia-stable-bin;
 
   kotlin = callPackage ../development/compilers/kotlin { };
@@ -5349,6 +5231,7 @@ with pkgs;
   inherit (ocamlPackages)
     ocamlformat # latest version
     ocamlformat_0_27_0
+    ocamlformat_0_28_1
     ;
 
   inherit (ocamlPackages) odig;
@@ -5372,15 +5255,15 @@ with pkgs;
   wrapRustcWith = { rustc-unwrapped, ... }@args: callPackage ../build-support/rust/rustc-wrapper args;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
-  rust_1_89 = callPackage ../development/compilers/rust/1_89.nix { };
-  rust = rust_1_89;
+  rust_1_91 = callPackage ../development/compilers/rust/1_91.nix { };
+  rust = rust_1_91;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
   mrustc-bootstrap = callPackage ../development/compilers/mrustc/bootstrap.nix { };
 
-  rustPackages_1_89 = rust_1_89.packages.stable;
-  rustPackages = rustPackages_1_89;
+  rustPackages_1_91 = rust_1_91.packages.stable;
+  rustPackages = rustPackages_1_91;
 
   inherit (rustPackages)
     cargo
@@ -5421,8 +5304,8 @@ with pkgs;
   inherit (callPackages ../development/tools/rust/cargo-pgrx { })
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_6
-    cargo-pgrx_0_14_1
     cargo-pgrx_0_16_0
+    cargo-pgrx_0_16_1
     cargo-pgrx
     ;
 
@@ -5615,7 +5498,7 @@ with pkgs;
   cbqn-standalone-replxx = cbqn-bootstrap.phase0-replxx;
 
   # Below, the classic self-bootstrapping process
-  cbqn-bootstrap = lib.dontRecurseIntoAttrs {
+  cbqn-bootstrap = dontRecurseIntoAttrs {
     # Use clang to compile CBQN if we aren't already.
     # CBQN's upstream primarily targets and tests clang which means using gcc
     # will result in slower binaries and on some platforms failing/broken builds.
@@ -5830,10 +5713,6 @@ with pkgs;
   luarocks = luaPackages.luarocks;
   luarocks-nix = luaPackages.luarocks-nix;
 
-  luarocks-packages-updater = callPackage ../by-name/lu/luarocks-packages-updater/package.nix {
-    pluginupdate = ../../maintainers/scripts/pluginupdate-py;
-  };
-
   toluapp = callPackage ../development/tools/toluapp {
     lua = lua5_1; # doesn't work with any other :(
   };
@@ -5859,7 +5738,7 @@ with pkgs;
     enableQt = true;
   };
 
-  octave-kernel = callPackage ../applications/editors/jupyter-kernels/octave { };
+  octave-kernel = recurseIntoAttrs (callPackage ../applications/editors/jupyter-kernels/octave { });
 
   octavePackages = recurseIntoAttrs octave.pkgs;
 
@@ -5867,8 +5746,8 @@ with pkgs;
   #
   # Set default PHP interpreter, extensions and packages
   php = php84;
-  phpExtensions = php.extensions;
-  phpPackages = php.packages;
+  phpExtensions = recurseIntoAttrs php.extensions;
+  phpPackages = recurseIntoAttrs php.packages;
 
   # Import PHP84 interpreter, extensions and packages
   php84 = callPackage ../development/interpreters/php/8.4.nix {
@@ -6047,14 +5926,14 @@ with pkgs;
   rubyPackages_3_4 = recurseIntoAttrs ruby_3_4.gems;
   rubyPackages_3_5 = recurseIntoAttrs ruby_3_5.gems;
 
-  samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
-
   inherit (callPackages ../applications/networking/cluster/spark { })
+    spark_4_0
     spark_3_5
     spark_3_4
     ;
   spark3 = spark_3_5;
-  spark = spark3;
+  spark4 = spark_4_0;
+  spark = spark_4_0;
 
   inherit
     ({
@@ -6156,7 +6035,8 @@ with pkgs;
   ansible_2_18 = python3Packages.toPythonApplication (
     python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
       version = "2.18.8";
-      src = oldAttrs.src.override {
+      src = fetchPypi {
+        pname = "ansible_core";
         inherit version;
         hash = "sha256-sHZiFalqR845kz0n4emWyivrVM8bOQfHQtNckTsfeM0=";
       };
@@ -6165,7 +6045,8 @@ with pkgs;
   ansible_2_17 = python3Packages.toPythonApplication (
     python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
       version = "2.17.8";
-      src = oldAttrs.src.override {
+      src = fetchPypi {
+        pname = "ansible_core";
         inherit version;
         hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc=";
       };
@@ -6174,7 +6055,8 @@ with pkgs;
   ansible_2_16 = python3Packages.toPythonApplication (
     python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
       version = "2.16.14";
-      src = oldAttrs.src.override {
+      src = fetchPypi {
+        pname = "ansible_core";
         inherit version;
         hash = "sha256-gCef/9mGhrrfqjLh7HhdmKbfGy/B5Al97AWXZA10ZBU=";
       };
@@ -6201,7 +6083,6 @@ with pkgs;
   antlr3 = antlr3_5;
 
   inherit (callPackages ../development/tools/parsing/antlr/4.nix { })
-    antlr4_8
     antlr4_9
     antlr4_10
     antlr4_11
@@ -6230,10 +6111,10 @@ with pkgs;
   electron-source = callPackage ../development/tools/electron { };
 
   inherit (callPackages ../development/tools/electron/binary { })
-    electron_35-bin
     electron_36-bin
     electron_37-bin
     electron_38-bin
+    electron_39-bin
     ;
 
   inherit (callPackages ../development/tools/electron/chromedriver { })
@@ -6241,14 +6122,10 @@ with pkgs;
     electron-chromedriver_36
     electron-chromedriver_37
     electron-chromedriver_38
+    electron-chromedriver_39
     ;
 
-  electron_35 = electron_35-bin;
-  electron_36 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_36 then
-      electron-source.electron_36
-    else
-      electron_36-bin;
+  electron_36 = electron_36-bin;
   electron_37 =
     if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then
       electron-source.electron_37
@@ -6259,6 +6136,11 @@ with pkgs;
       electron-source.electron_38
     else
       electron_38-bin;
+  electron_39 =
+    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_39 then
+      electron-source.electron_39
+    else
+      electron_39-bin;
   electron = electron_38;
   electron-bin = electron_38-bin;
   electron-chromedriver = electron-chromedriver_38;
@@ -6363,7 +6245,7 @@ with pkgs;
       null;
   bintoolsNoLibc = wrapBintoolsWith {
     bintools = bintools-unwrapped;
-    libc = targetPackages.preLibcHeaders;
+    libc = targetPackages.preLibcHeaders or preLibcHeaders;
   };
   bintools = wrapBintoolsWith {
     bintools = bintools-unwrapped;
@@ -6505,8 +6387,6 @@ with pkgs;
     inherit (llvmPackages_18) llvm libclang;
   };
 
-  inherit (nodePackages) csslint;
-
   css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
 
   cvise = python3Packages.callPackage ../development/tools/misc/cvise {
@@ -6580,10 +6460,10 @@ with pkgs;
   dot2tex = with python3.pkgs; toPythonApplication dot2tex;
 
   doxygen = callPackage ../development/tools/documentation/doxygen {
-    qt5 = null;
+    qt6 = null;
   };
 
-  doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
+  doxygen_gui = lowPrio (doxygen.override { inherit qt6; });
 
   drake = callPackage ../development/tools/build-managers/drake { };
 
@@ -6888,10 +6768,6 @@ with pkgs;
 
   sloc = nodePackages.sloc;
 
-  slurm = callPackage ../by-name/sl/slurm/package.nix {
-    nvml = cudaPackages.cuda_nvml_dev;
-  };
-
   speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
 
   splint = callPackage ../development/tools/analysis/splint {
@@ -6924,7 +6800,7 @@ with pkgs;
     withTeensyduino = true;
   };
 
-  tytools = libsForQt5.callPackage ../development/embedded/tytools { };
+  tytools = callPackage ../development/embedded/tytools { };
 
   texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
   inherit (texinfoPackages)
@@ -6959,6 +6835,20 @@ with pkgs;
 
   vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; };
 
+  wild-wrapped =
+    let
+      ldWrapper = ../build-support/bintools-wrapper/ld-wrapper.sh;
+    in
+    wrapBintoolsWith {
+      bintools = wild;
+      extraBuildCommands = ''
+        wrap wild ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap ${stdenv.cc.bintools.targetPrefix}ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap ${stdenv.cc.bintools.targetPrefix}ld ${ldWrapper} ${lib.getExe buildPackages.wild}
+      '';
+    };
+
   whatstyle = callPackage ../development/tools/misc/whatstyle {
     inherit (llvmPackages) clang-unwrapped;
   };
@@ -7063,14 +6953,6 @@ with pkgs;
 
   boost = boost187;
 
-  inherit
-    (callPackages ../development/libraries/botan {
-      # botan3 only sensibly works with libcxxStdenv when building static binaries
-      stdenv = if stdenv.hostPlatform.isStatic then buildPackages.libcxxStdenv else stdenv;
-    })
-    botan2
-    botan3
-    ;
   botanEsdm = botan3.override { withEsdm = true; };
 
   c-ares = callPackage ../development/libraries/c-ares { };
@@ -7178,9 +7060,6 @@ with pkgs;
 
   vapoursynth-editor = libsForQt5.callPackage ../by-name/va/vapoursynth/editor.nix { };
 
-  # TODO: Fix references and add justStaticExecutables https://github.com/NixOS/nixpkgs/issues/318013
-  emanote = haskellPackages.emanote;
-
   enchant2 = callPackage ../development/libraries/enchant/2.x.nix { };
   enchant = enchant2;
 
@@ -7253,17 +7132,18 @@ with pkgs;
   fltk = fltk13;
   fltk-minimal = fltk13-minimal;
 
-  inherit (callPackages ../development/libraries/fmt { }) fmt_9 fmt_10 fmt_11;
+  inherit (callPackages ../development/libraries/fmt { })
+    fmt_9
+    fmt_10
+    fmt_11
+    fmt_12
+    ;
 
-  fmt = fmt_11;
+  fmt = fmt_12;
 
   fplll = callPackage ../development/libraries/fplll { };
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
 
-  freeimage = callPackage ../by-name/fr/freeimage/package.nix {
-    openexr = openexr_2;
-  };
-
   freeipa = callPackage ../os-specific/linux/freeipa {
     # NOTE: freeipa and sssd need to be built with the same version of python
     kerberos = krb5.override {
@@ -8226,7 +8106,6 @@ with pkgs;
   };
 
   nss_latest = callPackage ../development/libraries/nss/latest.nix { };
-  nss_3_115 = callPackage ../development/libraries/nss/3_115.nix { };
   nss_esr = callPackage ../development/libraries/nss/esr.nix { };
   nss = nss_esr;
   nssTools = nss.tools;
@@ -8242,12 +8121,14 @@ with pkgs;
   nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; };
   nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; };
 
-  nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { };
+  nvidiaCtkPackages = recurseIntoAttrs (
+    callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { }
+  );
   inherit (nvidiaCtkPackages)
     nvidia-docker
     ;
 
-  nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
+  nvidia-vaapi-driver = hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
 
   nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { };
 
@@ -8327,15 +8208,12 @@ with pkgs;
   watcherclient = with python313Packages; toPythonApplication python-watcherclient;
   zunclient = with python313Packages; toPythonApplication python-zunclient;
 
-  inherit (callPackages ../development/libraries/libressl { })
-    libressl_3_9
-    libressl_4_0
+  inherit (callPackages ../by-name/li/libressl { })
     libressl_4_1
+    libressl_4_2
     ;
 
-  libressl = libressl_4_1;
-
-  openssl = openssl_3_5;
+  openssl = openssl_3_6;
 
   openssl_legacy = openssl.override {
     conf = ../development/libraries/openssl/3.0/legacy.cnf;
@@ -8344,7 +8222,7 @@ with pkgs;
   inherit (callPackages ../development/libraries/openssl { })
     openssl_1_1
     openssl_3
-    openssl_3_5
+    openssl_3_6
     ;
 
   pcre = callPackage ../development/libraries/pcre { };
@@ -8394,7 +8272,7 @@ with pkgs;
 
   prospector = callPackage ../development/tools/prospector { };
 
-  protobuf = protobuf_32;
+  protobuf = protobuf_33;
 
   inherit
     ({
@@ -8406,7 +8284,10 @@ with pkgs;
         # More recent versions of abseil seem to be missing absl::if_constexpr
         abseil-cpp = abseil-cpp_202407;
       };
-      protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { };
+      protobuf_27 = callPackage ../development/libraries/protobuf/27.nix {
+        # More recent versions of abseil seem to be missing absl::if_constexpr
+        abseil-cpp = abseil-cpp_202407;
+      };
       protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };
       protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {
         abseil-cpp = abseil-cpp_202103;
@@ -8494,7 +8375,6 @@ with pkgs;
   plasma5Packages = libsForQt5;
 
   qtEnv = qt5.env;
-  qt5Full = qt5.full;
 
   qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
 
@@ -8764,8 +8644,6 @@ with pkgs;
 
   vc = callPackage ../development/libraries/vc { };
 
-  vc_0_7 = callPackage ../development/libraries/vc/0.7.nix { };
-
   vencord-web-extension = callPackage ../by-name/ve/vencord/package.nix { buildWebExtension = true; };
 
   vid-stab = callPackage ../development/libraries/vid-stab {
@@ -8811,19 +8689,13 @@ with pkgs;
     graphviz = graphviz-nox;
   };
 
-  webkitgtk_4_0 = callPackage ../development/libraries/webkitgtk {
+  webkitgtk_6_0 = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzzFull;
-    libsoup = libsoup_2_4;
     inherit (gst_all_1) gst-plugins-base gst-plugins-bad;
   };
 
-  webkitgtk_4_1 = webkitgtk_4_0.override {
-    libsoup = libsoup_3;
-  };
-
-  webkitgtk_6_0 = webkitgtk_4_0.override {
-    libsoup = libsoup_3;
-    gtk3 = gtk4;
+  webkitgtk_4_1 = webkitgtk_6_0.override {
+    gtk4 = gtk3;
   };
 
   wlr-protocols = callPackage ../development/libraries/wlroots/protocols.nix { };
@@ -8892,11 +8764,9 @@ with pkgs;
 
   ### DEVELOPMENT / LIBRARIES / DARWIN SDKS
 
-  apple-sdk_11 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "11"; };
-  apple-sdk_12 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "12"; };
-  apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; };
   apple-sdk_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "14"; };
   apple-sdk_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "15"; };
+  apple-sdk_26 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "26"; };
 
   darwinMinVersionHook =
     deploymentTarget:
@@ -8925,8 +8795,6 @@ with pkgs;
   );
   agda = agdaPackages.agda;
 
-  ### DEVELOPMENT / LIBRARIES / BASH
-
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   saxonb = saxonb_8_8;
@@ -9063,16 +8931,10 @@ with pkgs;
       "3000"
     ];
   };
-  sbcl_2_4_10 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl { version = "2.4.10"; };
-    faslExt = "fasl";
-    flags = [
-      "--dynamic-space-size"
-      "3000"
-    ];
-  };
+
   sbcl_2_5_9 = wrapLisp {
     pkg = callPackage ../development/compilers/sbcl { version = "2.5.9"; };
+
     faslExt = "fasl";
     flags = [
       "--dynamic-space-size"
@@ -9280,9 +9142,9 @@ with pkgs;
     asterisk
     asterisk-stable
     asterisk-lts
-    asterisk_18
     asterisk_20
     asterisk_22
+    asterisk_23
     ;
 
   asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });
@@ -9313,9 +9175,6 @@ with pkgs;
 
   dodgy = with python3Packages; toPythonApplication dodgy;
 
-  etcd = etcd_3_5;
-  etcd_3_5 = callPackage ../servers/etcd/3_5 { };
-
   prosody = callPackage ../servers/xmpp/prosody {
     withExtraLibs = [ ];
     withExtraLuaPackages = _: [ ];
@@ -9350,13 +9209,13 @@ with pkgs;
   home-assistant = callPackage ../servers/home-assistant { };
 
   buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { };
-  home-assistant-custom-components = lib.recurseIntoAttrs (
+  home-assistant-custom-components = recurseIntoAttrs (
     lib.packagesFromDirectoryRecursive {
       inherit (home-assistant.python.pkgs) callPackage;
       directory = ../servers/home-assistant/custom-components;
     }
   );
-  home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (
+  home-assistant-custom-lovelace-modules = recurseIntoAttrs (
     lib.packagesFromDirectoryRecursive {
       inherit callPackage;
       directory = ../servers/home-assistant/custom-lovelace-modules;
@@ -9370,7 +9229,7 @@ with pkgs;
   icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { };
   icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { };
   icingaweb2 = callPackage ../servers/icingaweb2 { };
-  icingaweb2Modules = {
+  icingaweb2Modules = recurseIntoAttrs {
     theme-april = callPackage ../servers/icingaweb2/theme-april { };
     theme-lsd = callPackage ../servers/icingaweb2/theme-lsd { };
     theme-particles = callPackage ../servers/icingaweb2/theme-particles { };
@@ -9591,7 +9450,7 @@ with pkgs;
     mariadb_114
     mariadb_118
     ;
-  mariadb = mariadb_1011;
+  mariadb = mariadb_114;
   mariadb-embedded = mariadb.override { withEmbedded = true; };
 
   mongodb = hiPrio mongodb-7_0;
@@ -9811,7 +9670,7 @@ with pkgs;
   qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { };
 
   rabbitmq-server = callPackage ../by-name/ra/rabbitmq-server/package.nix {
-    beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_17; });
+    beamPackages = beam27Packages.extend (self: super: { elixir = elixir_1_18; });
   };
 
   rethinkdb = callPackage ../servers/nosql/rethinkdb {
@@ -9930,8 +9789,6 @@ with pkgs;
 
   zabbix = zabbix60;
 
-  ### SERVERS / GEOSPATIAL
-
   ### OS-SPECIFIC
 
   alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
@@ -10023,7 +9880,7 @@ with pkgs;
 
   elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { };
 
-  error-inject = callPackages ../os-specific/linux/error-inject { };
+  error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { });
 
   ffado = callPackage ../os-specific/linux/ffado { };
   ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
@@ -10075,8 +9932,6 @@ with pkgs;
   libkrun-sev = libkrun.override { variant = "sev"; };
   libkrun-tdx = libkrun.override { variant = "tdx"; };
 
-  linthesia = callPackage ../games/linthesia/default.nix { };
-
   projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { };
 
   lklWithFirewall = lkl.override { firewallSupport = true; };
@@ -10094,6 +9949,8 @@ with pkgs;
 
   inherit (linuxKernel) buildLinux linuxConfig kernelPatches;
 
+  kernelPackagesExtensions = [ ];
+
   linuxPackagesFor = linuxKernel.packagesFor;
 
   hardenedLinuxPackagesFor = linuxKernel.hardenedPackagesFor;
@@ -10353,6 +10210,12 @@ with pkgs;
     withVmspawn = false;
     withQrencode = false;
     withLibarchive = false;
+    withVConsole = false;
+    # withKmod = false; # breaks udevCheckHook of bcache-tools
+    withFirstboot = false;
+    withKexectools = false;
+    withLibseccomp = false;
+    withNspawn = false;
   };
   systemdLibs = systemdMinimal.override {
     pname = "systemd-minimal-libs";
@@ -10390,6 +10253,7 @@ with pkgs;
     ubootLibreTechCC
     ubootNanoPCT4
     ubootNanoPCT6
+    ubootNanoPiR5S
     ubootNovena
     ubootOdroidC2
     ubootOdroidXU3
@@ -10444,9 +10308,6 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
-  udisks = udisks2;
-
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
 
@@ -10722,9 +10583,9 @@ with pkgs;
 
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
 
-  tex-gyre = callPackages ../data/fonts/tex-gyre { };
+  tex-gyre = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre { });
 
-  tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
+  tex-gyre-math = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre-math { });
 
   xkeyboard_config = xkeyboard-config;
 
@@ -10771,8 +10632,6 @@ with pkgs;
     pdfstudioviewer
     ;
 
-  airwave = libsForQt5.callPackage ../applications/audio/airwave { };
-
   androidStudioPackages = recurseIntoAttrs (callPackage ../applications/editors/android-studio { });
   android-studio = androidStudioPackages.stable;
   android-studio-full = android-studio.full;
@@ -10785,8 +10644,6 @@ with pkgs;
   apngasm = callPackage ../applications/graphics/apngasm { };
   apngasm_2 = callPackage ../applications/graphics/apngasm/2.nix { };
 
-  ardour = callPackage ../applications/audio/ardour { };
-
   arelle = with python3Packages; toPythonApplication arelle;
 
   astroid = callPackage ../applications/networking/mailreaders/astroid {
@@ -10828,7 +10685,6 @@ with pkgs;
     callPackage ../applications/science/electronics/bitscope/packages.nix { }
   );
 
-  bitwig-studio3 = callPackage ../applications/audio/bitwig-studio/bitwig-studio3.nix { };
   bitwig-studio4 = callPackage ../applications/audio/bitwig-studio/bitwig-studio4.nix {
     libjpeg = libjpeg8;
   };
@@ -10872,8 +10728,6 @@ with pkgs;
     confd-calico
     ;
 
-  carla = libsForQt5.callPackage ../applications/audio/carla { };
-
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbconvert-gui = cbconvert.gui;
@@ -10909,10 +10763,6 @@ with pkgs;
 
   copyq = qt6Packages.callPackage ../applications/misc/copyq { };
 
-  csound = callPackage ../applications/audio/csound { };
-
-  csound-qt = libsForQt5.callPackage ../applications/audio/csound/csound-qt { };
-
   codeblocksFull = codeblocks.override { contribPlugins = true; };
 
   cudatext-qt = callPackage ../applications/editors/cudatext { widgetset = "qt5"; };
@@ -10923,8 +10773,6 @@ with pkgs;
     hamlib = hamlib_4;
   };
 
-  cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
-
   darcs = haskell.lib.compose.disableCabalFlag "library" (
     haskell.lib.compose.justStaticExecutables haskellPackages.darcs
   );
@@ -10948,9 +10796,7 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  deadbeef = callPackage ../applications/audio/deadbeef { };
-
-  deadbeefPlugins = {
+  deadbeefPlugins = recurseIntoAttrs {
     headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { };
     lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };
     mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
@@ -10966,8 +10812,6 @@ with pkgs;
 
   inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop;
 
-  dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
-
   djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
 
   djview4 = djview;
@@ -11042,15 +10886,18 @@ with pkgs;
   emacsPackagesFor =
     emacs:
     import ./emacs-packages.nix {
-      inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
+      inherit lib;
       emacs' = emacs;
       pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
     };
 
+  # emacsPackages is exposed on search.nixos.org.
+  # Also see pkgs/top-level/packages-config.nix
+  emacsPackages = dontRecurseIntoAttrs emacs.pkgs;
+
   espeak-classic = callPackage ../applications/audio/espeak { };
 
-  espeak-ng = callPackage ../applications/audio/espeak-ng { };
-  espeak = res.espeak-ng;
+  espeak = espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 
@@ -11072,13 +10919,8 @@ with pkgs;
         ];
       };
 
-  fetchmail = callPackage ../applications/misc/fetchmail { };
-  fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
-
   firewalld-gui = firewalld.override { withGui = true; };
 
-  flacon = libsForQt5.callPackage ../applications/audio/flacon { };
-
   fldigi = callPackage ../applications/radio/fldigi {
     hamlib = hamlib_4;
   };
@@ -11089,8 +10931,6 @@ with pkgs;
     sqlite = sqlite.override { enableDeserialize = true; };
   };
 
-  fritzing = qt6Packages.callPackage ../applications/science/electronics/fritzing { };
-
   fvwm = fvwm2;
 
   gaucheBootstrap = callPackage ../development/interpreters/gauche/boot.nix { };
@@ -11109,7 +10949,7 @@ with pkgs;
       python = python3;
     };
   };
-  gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
+  gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
   goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
@@ -11326,8 +11166,6 @@ with pkgs;
 
   linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
-  linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { };
-
   deadd-notification-center = haskell.lib.compose.justStaticExecutables (
     haskellPackages.callPackage ../applications/misc/deadd-notification-center { }
   );
@@ -11357,12 +11195,10 @@ with pkgs;
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
-  q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };
+  q4wine = kdePackages.callPackage ../applications/misc/q4wine { };
 
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
-
   gpsbabel-gui = gpsbabel.override {
     withGUI = true;
     withDoc = true;
@@ -11407,18 +11243,12 @@ with pkgs;
 
   hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
+  hyperglot = with python3Packages; toPythonApplication hyperglot;
+
   jackline = callPackage ../applications/networking/instant-messengers/jackline {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  libmt32emu = callPackage ../applications/audio/munt/libmt32emu.nix { };
-
-  mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
-
-  mt32emu-smf2wav = callPackage ../applications/audio/munt/mt32emu-smf2wav.nix { };
-
-  noson = libsForQt5.callPackage ../applications/audio/noson { };
-
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
 
   pinboard = with python3Packages; toPythonApplication pinboard;
@@ -11624,7 +11454,6 @@ with pkgs;
     subproject = "reader";
   };
 
-  jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
   js8call = qt5.callPackage ../applications/radio/js8call { };
@@ -11637,10 +11466,9 @@ with pkgs;
     k3s_1_31
     k3s_1_32
     k3s_1_33
+    k3s_1_34
     ;
-  k3s = k3s_1_33;
-
-  kapow = libsForQt5.callPackage ../applications/misc/kapow { };
+  k3s = k3s_1_34;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
@@ -11709,19 +11537,15 @@ with pkgs;
 
   kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { };
 
-  ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { };
-
   ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
     fftw = fftwSinglePrec;
   };
 
-  ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
-
   lemonbar = callPackage ../applications/window-managers/lemonbar { };
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };
 
-  lenovo-legion = libsForQt5.callPackage ../os-specific/linux/lenovo-legion/app.nix { };
+  lenovo-legion = qt6Packages.callPackage ../os-specific/linux/lenovo-legion/app.nix { };
 
   libkiwix = callPackage ../applications/misc/kiwix/lib.nix { };
 
@@ -11796,8 +11620,6 @@ with pkgs;
     steamSupport = false;
   };
 
-  lv2lint = callPackage ../applications/audio/lv2lint/default.nix { };
-
   lxi-tools = callPackage ../tools/networking/lxi-tools { };
   lxi-tools-gui = callPackage ../tools/networking/lxi-tools { withGui = true; };
 
@@ -11805,7 +11627,7 @@ with pkgs;
 
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
 
-  magnetophonDSP = lib.recurseIntoAttrs {
+  magnetophonDSP = recurseIntoAttrs {
     CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
     CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };
     ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { };
@@ -11818,16 +11640,10 @@ with pkgs;
     shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { };
   };
 
-  mastodon-bot = nodePackages.mastodon-bot;
-
   matrix-commander =
     python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander
       { };
 
-  mbrola = callPackage ../applications/audio/mbrola { };
-
-  mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { };
-
   mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; };
   mediaelch-qt6 = mediaelch;
 
@@ -11837,26 +11653,12 @@ with pkgs;
 
   mercurialFull = mercurial.override { fullBuild = true; };
 
-  meshlab = callPackage ../by-name/me/meshlab/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
-    llvmPackages = llvmPackages_18;
-  };
-
-  meshlab-unstable = callPackage ../by-name/me/meshlab-unstable/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
-    llvmPackages = llvmPackages_18;
-  };
-
   meshcentral = callPackage ../tools/admin/meshcentral { };
 
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };
 
-  miniaudicle = qt6Packages.callPackage ../applications/audio/miniaudicle { };
-
   minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
-  mixxx = qt6Packages.callPackage ../applications/audio/mixxx { };
-
   mldonkey = callPackage ../applications/networking/p2p/mldonkey {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
@@ -11875,19 +11677,13 @@ with pkgs;
     lua = lua5;
   };
 
-  monotoneViz = callPackage ../applications/version-management/monotone-viz {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string;
-  };
-
   moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
 
-  mopidyPackages =
-    (callPackages ../applications/audio/mopidy {
+  mopidyPackages = recurseIntoAttrs (
+    callPackages ../applications/audio/mopidy {
       python = python3;
-    })
-    // {
-      __attrsFailEvaluation = true;
-    };
+    }
+  );
 
   inherit (mopidyPackages)
     mopidy
@@ -11924,23 +11720,6 @@ with pkgs;
     withConplay = false;
   };
 
-  pragha = libsForQt5.callPackage ../applications/audio/pragha { };
-
-  rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
-
-  rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {
-    waylandSupport = false;
-    x11Support = false;
-  };
-
-  rofi-rbw-wayland = python3Packages.callPackage ../applications/misc/rofi-rbw {
-    waylandSupport = true;
-  };
-
-  rofi-rbw-x11 = python3Packages.callPackage ../applications/misc/rofi-rbw {
-    x11Support = true;
-  };
-
   # a somewhat more maintained fork of ympd
   memento = qt6Packages.callPackage ../applications/video/memento { };
 
@@ -11978,8 +11757,6 @@ with pkgs;
 
   mumble_overlay = (callPackages ../applications/networking/mumble { }).overlay;
 
-  musescore = qt6.callPackage ../applications/audio/musescore { };
-
   mwic = callPackage ../applications/misc/mwic {
     pythonPackages = python3Packages;
   };
@@ -11991,8 +11768,6 @@ with pkgs;
 
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  nootka = qt5.callPackage ../applications/audio/nootka { };
-
   opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { };
 
   ostinato = libsForQt5.callPackage ../applications/networking/ostinato {
@@ -12003,8 +11778,6 @@ with pkgs;
 
   pcmanfm-qt = lxqt.pcmanfm-qt;
 
-  pdfmixtool = libsForQt5.callPackage ../applications/office/pdfmixtool { };
-
   pijuice = with python3Packages; toPythonApplication pijuice;
 
   pinegrow6 = callPackage ../applications/editors/pinegrow { pinegrowVersion = "6"; };
@@ -12029,8 +11802,6 @@ with pkgs;
     i3Support = true;
   };
 
-  polyphone = qt6.callPackage ../applications/audio/polyphone { };
-
   scx = recurseIntoAttrs (callPackage ../os-specific/linux/scx { });
 
   shogun = callPackage ../applications/science/machine-learning/shogun {
@@ -12054,9 +11825,7 @@ with pkgs;
     lua = lua5;
   };
 
-  pdfsam-basic = callPackage ../applications/misc/pdfsam-basic {
-    jdk21 = openjdk21.override { enableJavaFX = true; };
-  };
+  pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
 
   mupdf-headless = mupdf.override {
     enableX11 = false;
@@ -12110,7 +11879,7 @@ with pkgs;
     inherit (darwin) DarwinTools;
   };
 
-  open-music-kontrollers = lib.recurseIntoAttrs {
+  open-music-kontrollers = recurseIntoAttrs {
     eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };
     jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { };
     mephisto = callPackage ../applications/audio/open-music-kontrollers/mephisto.nix { };
@@ -12166,10 +11935,6 @@ with pkgs;
     sed = gnused;
   };
 
-  petrifoo = callPackage ../applications/audio/petrifoo {
-    inherit (gnome2) libgnomecanvas;
-  };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer
@@ -12191,10 +11956,6 @@ with pkgs;
 
   inherit (pidginPackages) pidgin;
 
-  pithos = callPackage ../applications/audio/pithos {
-    pythonPackages = python3Packages;
-  };
-
   pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };
@@ -12213,9 +11974,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { };
-  protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { };
-
   protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
 
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };
@@ -12224,9 +11982,8 @@ with pkgs;
 
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
-  puredata = callPackage ../applications/audio/puredata { };
   puredata-with-plugins =
-    plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
+    plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };
 
   pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };
 
@@ -12266,29 +12023,17 @@ with pkgs;
 
   wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
 
-  qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
-
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
-
-  qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
-
-  qpwgraph = qt6Packages.callPackage ../applications/audio/qpwgraph { };
-
-  qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
-
   qsstv = qt5.callPackage ../applications/radio/qsstv { };
 
   qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };
 
   qsudo = libsForQt5.callPackage ../applications/misc/qsudo { };
 
-  qsynth = libsForQt5.callPackage ../applications/audio/qsynth { };
-
   qtbitcointrader = libsForQt5.callPackage ../applications/misc/qtbitcointrader { };
 
   qtemu = libsForQt5.callPackage ../applications/virtualization/qtemu { };
@@ -12366,10 +12111,6 @@ with pkgs;
     fftw = fftwSinglePrec;
   };
 
-  rclone = callPackage ../applications/networking/sync/rclone { };
-
-  rclone-browser = libsForQt5.callPackage ../applications/networking/sync/rclone/browser.nix { };
-
   reaper = callPackage ../applications/audio/reaper {
     jackLibrary = libjack2; # Another option is "pipewire.jack".
     ffmpeg = ffmpeg_4-headless;
@@ -12418,18 +12159,12 @@ with pkgs;
 
   rusty-psn-gui = rusty-psn.override { withGui = true; };
 
-  sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
-
   scantailor-advanced = callPackage ../applications/graphics/scantailor/advanced.nix { };
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  seq66 = qt5.callPackage ../applications/audio/seq66 { };
-
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
-  spotify-qt = qt6Packages.callPackage ../applications/audio/spotify-qt { };
-
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };
@@ -12480,7 +12215,7 @@ with pkgs;
 
   cura = libsForQt5.callPackage ../applications/misc/cura { };
 
-  curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
+  curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });
 
   prusa-slicer = callPackage ../applications/misc/prusa-slicer {
     # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
@@ -12497,21 +12232,15 @@ with pkgs;
 
   socialscan = with python3.pkgs; toPythonApplication socialscan;
 
-  sonic-lineup = libsForQt5.callPackage ../applications/audio/sonic-lineup { };
-
-  sonic-visualiser = libsForQt5.callPackage ../applications/audio/sonic-visualiser { };
-
   squeezelite-pulse = callPackage ../by-name/sq/squeezelite/package.nix {
     audioBackend = "pulse";
   };
 
   inherit (ocaml-ng.ocamlPackages) stog;
 
-  # Stumpwm is broken on SBCL 2.4.11, see
-  # https://github.com/NixOS/nixpkgs/pull/360320
   stumpwm = callPackage ../applications/window-managers/stumpwm {
     stdenv = stdenvNoCC;
-    sbcl = sbcl_2_4_10.withPackages (
+    sbcl = sbcl.withPackages (
       ps: with ps; [
         alexandria
         cl-ppcre
@@ -12521,7 +12250,7 @@ with pkgs;
     );
   };
 
-  stumpwm-unwrapped = sbcl_2_4_10.pkgs.stumpwm;
+  stumpwm-unwrapped = sbcl.pkgs.stumpwm;
 
   sublime3Packages = recurseIntoAttrs (
     callPackage ../applications/editors/sublime/3/packages.nix { }
@@ -12583,8 +12312,6 @@ with pkgs;
     systemdSupport = true;
   };
 
-  synergy = libsForQt5.callPackage ../applications/misc/synergy { };
-
   synergyWithoutGUI = synergy.override { withGUI = false; };
 
   tabbed = callPackage ../applications/window-managers/tabbed {
@@ -12676,19 +12403,8 @@ with pkgs;
     inherit (linuxPackages) x86_energy_perf_policy;
   };
 
-  tony = libsForQt5.callPackage ../applications/audio/tony { };
-
   trustedqsl = tqsl; # Alias added 2019-02-10
 
-  libtransmission_3 = transmission_3.override {
-    installLib = true;
-    enableDaemon = false;
-    enableCli = false;
-  };
-  transmission_3-gtk = transmission_3.override { enableGTK3 = true; };
-  transmission_3-qt = transmission_3.override { enableQt = true; };
-  transmission_3_noSystemd = transmission_3.override { enableSystemd = false; };
-
   transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix {
     fmt = fmt_9;
     libutp = libutp_3_4;
@@ -12703,8 +12419,6 @@ with pkgs;
   transmission_4-qt6 = transmission_4.override { enableQt6 = true; };
   transmission_4-qt = transmission_4-qt5;
 
-  traverso = libsForQt5.callPackage ../applications/audio/traverso { };
-
   tinywl = callPackage ../applications/window-managers/tinywl {
     wlroots = wlroots_0_19;
   };
@@ -12794,7 +12508,7 @@ with pkgs;
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative
   wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
-  wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
+  wrapNeovim = neovim-unwrapped: makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
   neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix {
     lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
   };
@@ -12978,12 +12692,10 @@ with pkgs;
     xwaylandSupport = false;
   };
 
-  inherit (windowmaker) dockapps;
+  dockapps = recurseIntoAttrs windowmaker.dockapps;
 
   wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { };
 
-  worldengine-cli = python3Packages.worldengine;
-
   wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
@@ -13019,8 +12731,6 @@ with pkgs;
 
   xca = qt6Packages.callPackage ../applications/misc/xca { };
 
-  inherit (xorg) xcompmgr;
-
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
   xdg-desktop-portal-hyprland =
@@ -13066,6 +12776,11 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
+  inherit (callPackage ../applications/misc/xppen { })
+    xppen_3
+    xppen_4
+    ;
+
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
 
   ydiff = with python3.pkgs; toPythonApplication ydiff;
@@ -13090,7 +12805,7 @@ with pkgs;
 
   youtube-viewer = perlPackages.WWWYoutubeViewer;
 
-  zathuraPkgs = callPackage ../applications/misc/zathura { };
+  zathuraPkgs = recurseIntoAttrs (callPackage ../applications/misc/zathura { });
   zathura = zathuraPkgs.zathuraWrapper;
 
   zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
@@ -13155,8 +12870,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
-
   gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
     boost = boost179;
   };
@@ -13194,8 +12907,6 @@ with pkgs;
     stdenv = llvmPackages.stdenv;
   };
 
-  samplv1 = qt6.callPackage ../applications/audio/samplv1 { };
-
   beancount = with python3.pkgs; toPythonApplication beancount;
 
   beancount_2 = with python3.pkgs; toPythonApplication beancount_2;
@@ -13221,10 +12932,6 @@ with pkgs;
   cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
   cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
 
-  drumkv1 = libsForQt5.callPackage ../applications/audio/drumkv1 { };
-
-  phonemizer = with python3Packages; toPythonApplication phonemizer;
-
   ### GAMES
 
   inherit (callPackages ../games/fteqw { })
@@ -13239,37 +12946,8 @@ with pkgs;
 
   vanillara = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillara"; };
 
-  ### GAMES/DOOM-PORTS
-
-  doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
-
-  enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
-
-  zandronum = callPackage ../games/doom-ports/zandronum { };
-
-  zandronum-server = zandronum.override {
-    serverOnly = true;
-  };
-
-  zandronum-alpha = callPackage ../games/doom-ports/zandronum/alpha { };
-
-  zandronum-alpha-server = zandronum-alpha.override {
-    serverOnly = true;
-  };
-
-  fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
-
-  pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
-
-  qgo = libsForQt5.callPackage ../games/qgo { };
-
-  anki = callPackage ../games/anki {
-    protobuf = protobuf_31;
-  };
-  anki-utils = callPackage ../games/anki/addons/anki-utils.nix { };
-  ankiAddons = recurseIntoAttrs (callPackage ../games/anki/addons { });
-  anki-bin = callPackage ../games/anki/bin.nix { };
-  anki-sync-server = callPackage ../games/anki/sync-server.nix { };
+  anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
+  ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
 
   art = callPackage ../by-name/ar/art/package.nix {
     fftw = fftwSinglePrec;
@@ -13296,10 +12974,6 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  chiaki = libsForQt5.callPackage ../games/chiaki { };
-
-  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
-
   cockatrice = libsForQt5.callPackage ../games/cockatrice {
     protobuf = protobuf_21;
   };
@@ -13316,12 +12990,10 @@ with pkgs;
     inherit libGL libGLU libglut;
   };
 
-  crawlTiles = callPackage ../games/crawl {
+  crawlTiles = callPackage ../by-name/cr/crawl/package.nix {
     tileMode = true;
   };
 
-  crawl = callPackage ../games/crawl { };
-
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 
@@ -13335,14 +13007,12 @@ with pkgs;
 
   dfhack = dwarf-fortress-packages.dwarf-fortress-full;
 
-  dxx-rebirth = callPackage ../games/dxx-rebirth { };
-
-  inherit (callPackages ../games/dxx-rebirth/assets.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets
     ;
 
-  inherit (callPackages ../games/dxx-rebirth/full.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/full.nix { })
     d1x-rebirth-full
     d2x-rebirth-full
     ;
@@ -13381,8 +13051,6 @@ with pkgs;
 
   factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
 
-  flightgear = libsForQt5.callPackage ../games/flightgear { };
-
   freeciv = callPackage ../by-name/fr/freeciv/package.nix {
     sdl2Client = false;
     gtkClient = true;
@@ -13403,21 +13071,12 @@ with pkgs;
 
   freeciv_gtk = freeciv;
 
-  garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
-
-  gl-gsync-demo = callPackage ../games/gl-gsync-demo {
-    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-  };
-
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
-  qtads = qt5.callPackage ../games/qtads { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
-  iortcw = callPackage ../games/iortcw { };
   # used as base package for iortcw forks
-  iortcw_sp = callPackage ../games/iortcw/sp.nix { };
+  iortcw_sp = callPackage ../by-name/io/iortcw/sp.nix { };
 
   katagoWithCuda = katago.override {
     backend = "cuda";
@@ -13431,9 +13090,7 @@ with pkgs;
     backend = "tensorrt";
   };
 
-  koboredux = callPackage ../games/koboredux { };
-
-  koboredux-free = callPackage ../games/koboredux {
+  koboredux-free = callPackage ../by-name/ko/koboredux/package.nix {
     useProprietaryAssets = false;
   };
 
@@ -13447,10 +13104,6 @@ with pkgs;
     pythonSupport = true;
   };
 
-  leela-zero = libsForQt5.callPackage ../games/leela-zero { };
-
-  legendary-gl = python3Packages.callPackage ../games/legendary-gl { };
-
   liquidwar = callPackage ../games/liquidwar {
     guile = guile_2_0;
   };
@@ -13472,16 +13125,9 @@ with pkgs;
   luanti-client = luanti.override { buildServer = false; };
   luanti-server = luanti.override { buildClient = false; };
 
-  mudlet = libsForQt5.callPackage ../games/mudlet {
-    lua = lua5_1;
-  };
+  blightmud-tts = callPackage ../by-name/bl/blightmud/package.nix { withTTS = true; };
 
-  blightmud = callPackage ../games/blightmud { };
-
-  blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
-
-  npush = callPackage ../games/npush { };
-  run-npush = callPackage ../games/npush/run.nix { };
+  run-npush = callPackage ../by-name/np/npush/run.nix { };
 
   openloco = pkgsi686Linux.callPackage ../games/openloco { };
 
@@ -13509,8 +13155,6 @@ with pkgs;
   openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
   openttd-nml = callPackage ../games/openttd/nml.nix { };
 
-  openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
-
   openxray = callPackage ../games/openxray {
     # Builds with Clang, but hits an assertion failure unless GCC is used
     # https://github.com/OpenXRay/xray-16/issues/1224
@@ -13521,8 +13165,6 @@ with pkgs;
 
   papermc = papermcServers.papermc;
 
-  path-of-building = qt6Packages.callPackage ../games/path-of-building { };
-
   pentobi = libsForQt5.callPackage ../games/pentobi { };
 
   pokerth = libsForQt5.callPackage ../games/pokerth {
@@ -13546,20 +13188,11 @@ with pkgs;
     quake3hires
     ;
 
-  quakespasm = callPackage ../games/quakespasm { };
-  vkquake = callPackage ../games/quakespasm/vulkan.nix { };
-
-  rogue = callPackage ../games/rogue {
-    ncurses = ncurses5;
-  };
-
   rott-shareware = callPackage ../by-name/ro/rott/package.nix {
     buildShareware = true;
   };
 
-  scummvm = callPackage ../games/scummvm { };
-
-  inherit (callPackage ../games/scummvm/games.nix { })
+  inherit (callPackage ../by-name/sc/scummvm/games.nix { })
     beneath-a-steel-sky
     broken-sword-25
     drascula-the-vampire-strikes-back
@@ -13572,23 +13205,20 @@ with pkgs;
     isMobile = true;
   };
 
-  shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
-  rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2 { };
-  rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure { };
+  rkpd2 = callPackage ../by-name/sh/shattered-pixel-dungeon/rkpd2 { };
+  rat-king-adventure = callPackage ../by-name/sh/shattered-pixel-dungeon/rat-king-adventure { };
   experienced-pixel-dungeon =
-    callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon
+    callPackage ../by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon
       { };
-  summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { };
-  shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { };
-  tower-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/tower-pixel-dungeon { };
+  summoning-pixel-dungeon =
+    callPackage ../by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon
+      { };
+  shorter-pixel-dungeon = callPackage ../by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon { };
+  tower-pixel-dungeon = callPackage ../by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon { };
 
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;
 
-  soi = callPackage ../games/soi {
-    lua = lua5_1;
-  };
-
   steam-run = steam.run;
   steam-run-free = steam.run-free;
 
@@ -13603,8 +13233,6 @@ with pkgs;
 
   stuntrally = callPackage ../games/stuntrally { boost = boost183; };
 
-  synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
-
   the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
     lua = lua5_2;
   };
@@ -13641,9 +13269,7 @@ with pkgs;
 
   vessel = pkgsi686Linux.callPackage ../games/vessel { };
 
-  warsow-engine = callPackage ../games/warsow/engine.nix { };
-
-  warsow = callPackage ../games/warsow { };
+  wesnoth-devel = callPackage ../by-name/we/wesnoth/package.nix { enableDevel = true; };
 
   inherit (callPackage ../games/xonotic { })
     xonotic-data
@@ -13818,10 +13444,6 @@ with pkgs;
     libxc = pkgs.libxc_7;
   };
 
-  ### SCIENCE/GEOMETRY
-
-  ### SCIENCE/BENCHMARK
-
   ### SCIENCE/BIOLOGY
 
   cd-hit = callPackage ../applications/science/biology/cd-hit {
@@ -13947,6 +13569,7 @@ with pkgs;
   gromacsDouble = lowPrio (
     gromacs.override {
       singlePrec = false;
+      enableCuda = false; # CUDA is only implemented for single precision
       fftw = fftw;
     }
   );
@@ -13954,6 +13577,7 @@ with pkgs;
   gromacsDoubleMpi = lowPrio (
     gromacs.override {
       singlePrec = false;
+      enableCuda = false; # CUDA is only implemented for single precision
       enableMpi = true;
       fftw = fftw;
     }
@@ -13968,8 +13592,6 @@ with pkgs;
     }
   );
 
-  ### SCIENCE/MEDICINE
-
   ### SCIENCE/PHYSICS
 
   mcfm = callPackage ../applications/science/physics/MCFM {
@@ -13982,8 +13604,6 @@ with pkgs;
 
   xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
 
-  ### SCIENCE/PROGRAMMING
-
   ### SCIENCE/LOGIC
 
   abella = callPackage ../applications/science/logic/abella {
@@ -14122,8 +13742,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };
 
-  ### SCIENCE / ENGINEERING
-
   ### SCIENCE / ELECTRONICS
 
   simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; };
@@ -14133,8 +13751,6 @@ with pkgs;
 
   eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
 
-  caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
-
   degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
 
   geda = callPackage ../applications/science/electronics/geda {
@@ -14215,8 +13831,6 @@ with pkgs;
     };
   };
 
-  yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
-
   yacas-gui = yacas.override {
     enableGui = true;
     enableJupyter = false;
@@ -14230,8 +13844,6 @@ with pkgs;
     inherit (gnome2) gtkglext;
   };
 
-  convertall = qt5.callPackage ../applications/science/misc/convertall { };
-
   faissWithCuda = faiss.override {
     cudaSupport = true;
   };
@@ -14244,8 +13856,6 @@ with pkgs;
 
   spyder = with python3.pkgs; toPythonApplication spyder;
 
-  stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };
-
   tulip = libsForQt5.callPackage ../applications/science/misc/tulip {
     python3 = python312; # fails to build otherwise
   };
@@ -14309,8 +13919,6 @@ with pkgs;
 
   faust = faust2;
 
-  flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
-
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };
@@ -14333,7 +13941,6 @@ with pkgs;
 
   libjack2 = jack2.override { prefix = "lib"; };
 
-  jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
   jack_autoconnect = jack-autoconnect;
 
   j2cli = with python311Packages; toPythonApplication j2cli;
@@ -14367,9 +13974,7 @@ with pkgs;
 
   lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
 
-  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
-
-  muse = libsForQt5.callPackage ../applications/audio/muse { };
+  openlilylib-fonts = recurseIntoAttrs (callPackage ../misc/lilypond/fonts.nix { });
 
   nixDependencies = recurseIntoAttrs (
     callPackage ../tools/package-management/nix/dependencies-scope.nix { }
@@ -14546,7 +14151,7 @@ with pkgs;
 
   nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
 
-  nixos-artwork = callPackage ../data/misc/nixos-artwork { };
+  nixos-artwork = recurseIntoAttrs (callPackage ../data/misc/nixos-artwork { });
 
   nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
 
@@ -14595,8 +14200,6 @@ with pkgs;
 
   qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };
 
-  qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };
@@ -14745,7 +14348,7 @@ with pkgs;
 
   buildDartApplication = callPackage ../build-support/dart/build-dart-application { };
 
-  dartHooks = callPackage ../build-support/dart/build-dart-application/hooks { };
+  dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { });
 
   httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
 
@@ -14852,8 +14455,6 @@ with pkgs;
 
   swift-corelibs-libdispatch = swiftPackages.Dispatch;
 
-  aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };
-
   tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
 
   duden = python3Packages.toPythonApplication python3Packages.duden;
@@ -14884,11 +14485,11 @@ with pkgs;
     libsoup = libsoup_3;
   };
 
-  rustdesk-flutter = callPackage ../by-name/ru/rustdesk-flutter/package.nix {
-    flutter = flutter324;
-  };
-
   davis = callPackage ../by-name/da/davis/package.nix {
     php = php83; # https://github.com/tchapi/davis/issues/195
   };
+
+  gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
+    releaseChannel = "unstable";
+  };
 }
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index c46d12eca8eb..fecf5d78208b 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -6,16 +6,23 @@
   wxSupport ? true,
   systemd,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  __splicedPackages,
 }:
 
 let
   self = beam;
 
+  pkgs = __splicedPackages;
+  callErlang =
+    drv: args:
+    let
+      genericBuilder =
+        versionArgs: import ../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
+    in
+    pkgs.callPackage (import drv genericBuilder) { };
 in
 
 {
-  beamLib = callPackage ../development/beam-modules/lib.nix { };
-
   latestVersion = "erlang_28";
 
   # Each
@@ -27,15 +34,15 @@ in
     #
     # Three versions are supported according to https://github.com/erlang/otp/security
 
-    erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix {
+    erlang_28 = callErlang ../development/interpreters/erlang/28.nix {
       inherit wxSupport systemdSupport;
     };
 
-    erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix {
+    erlang_27 = callErlang ../development/interpreters/erlang/27.nix {
       inherit wxSupport systemdSupport;
     };
 
-    erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix {
+    erlang_26 = callErlang ../development/interpreters/erlang/26.nix {
       inherit wxSupport systemdSupport;
     };
 
diff --git a/pkgs/top-level/by-name-overlay.nix b/pkgs/top-level/by-name-overlay.nix
index 9a011439596a..e6fe5b721556 100644
--- a/pkgs/top-level/by-name-overlay.nix
+++ b/pkgs/top-level/by-name-overlay.nix
@@ -41,10 +41,6 @@ let
   # if the overlay has to be applied multiple times
   packageFiles = mergeAttrsList (mapAttrsToList namesForShard (readDir baseDirectory));
 in
-# TODO: Consider optimising this using `builtins.deepSeq packageFiles`,
-# which could free up the above thunks and reduce GC times.
-# Currently this would be hard to measure until we have more packages
-# and ideally https://github.com/NixOS/nix/pull/8895
 self: super:
 {
   # This attribute is necessary to allow CI to ensure that all packages defined in `pkgs/by-name`
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 09d31a2d117c..c8e8a3f58590 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -139,6 +139,39 @@ let
           null;
     };
 
+    npmRegistryOverrides = mkOption {
+      type = types.attrsOf types.str;
+      description = ''
+        The default NPM registry overrides for all `fetchNpmDeps` calls, as an attribute set.
+
+        For each attribute, all files fetched from the host corresponding to the name will instead be fetched from the host (and sub-path) specified in the value.
+
+        For example, an override like `"registry.npmjs.org" = "my-mirror.local/registry.npmjs.org"` will replace a URL like `https://registry.npmjs.org/foo.tar.gz` with `https://my-mirror.local/registry.npmjs.org/foo.tar.gz`.
+
+        To set the string directly, see [`npmRegistryOverridesString`](#opt-npmRegistryOverridesString).
+      '';
+      default = { };
+      example = {
+        "registry.npmjs.org" = "my-mirror.local/registry.npmjs.org";
+      };
+    };
+
+    npmRegistryOverridesString = mkOption {
+      type = types.addCheck types.str (
+        s:
+        let
+          j = builtins.fromJSON s;
+        in
+        lib.isAttrs j && lib.all builtins.isString (builtins.attrValues j)
+      );
+      description = ''
+        A string containing a string with a JSON representation of NPM registry overrides for `fetchNpmDeps`.
+
+        This overrides the [`npmRegistryOverrides`](#opt-npmRegistryOverrides) option, see its documentation for more details.
+      '';
+      default = builtins.toJSON config.npmRegistryOverrides;
+    };
+
     doCheckByDefault = mkMassRebuild {
       feature = "run `checkPhase` by default";
     };
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 6d9d9fab80d6..8a35e3a59feb 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -5,7 +5,6 @@
   fetchzip,
   callPackage,
   newScope,
-  recurseIntoAttrs,
   ocamlPackages_4_09,
   ocamlPackages_4_10,
   ocamlPackages_4_12,
@@ -42,7 +41,7 @@ let
       };
       mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq { });
 
-      contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs { });
+      contribs = lib.recurseIntoAttrs (callPackage ../development/coq-modules/contribs { });
 
       aac-tactics = callPackage ../development/coq-modules/aac-tactics { };
       addition-chains = callPackage ../development/coq-modules/addition-chains { };
@@ -337,6 +336,6 @@ rec {
   coqPackages_9_0 = mkCoqPackages coq_9_0;
   coqPackages_9_1 = mkCoqPackages coq_9_1;
 
-  coqPackages = recurseIntoAttrs coqPackages_9_0;
+  coqPackages = lib.recurseIntoAttrs coqPackages_9_0;
   coq = coqPackages.coq;
 }
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index cc92f7ae3491..3c90f71ed35e 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -1,240 +1,105 @@
-# Notes:
-#
-# Silvan (Tweag) covered some things on recursive attribute sets in the Nix Hour:
-# https://www.youtube.com/watch?v=BgnUFtd1Ivs
-#
-# I (@connorbaker) highly recommend watching it.
-#
-# Most helpful comment regarding recursive attribute sets:
-#
-# https://github.com/NixOS/nixpkgs/pull/256324#issuecomment-1749935979
-#
-# To summarize:
-#
-# - `prev` should only be used to access attributes which are going to be overridden.
-# - `final` should only be used to access `callPackage` to build new packages.
-# - Attribute names are evaluated eagerly ("NAMESET STRICTNESS").
-#   - Extensions must not depend on `final` when computing names and count of new attributes.
-#
-# Silvan's recommendation then is to explicitly use `callPackage` to provide everything our
-# extensions need to compute the attribute names, without relying on `final`.
-#
-# I've (@connorbaker) attempted to do that, though I'm unsure of how this will interact with overrides.
 {
-  config,
   _cuda,
-  cudaMajorMinorVersion,
+  callPackage,
+  config,
   lib,
-  pkgs,
-  stdenv,
-  runCommand,
 }:
 let
-  inherit (lib)
-    attrsets
-    customisation
-    fixedPoints
-    lists
-    strings
-    versions
-    ;
+  mkCudaPackages =
+    manifestVersions:
+    callPackage ../development/cuda-modules {
+      manifests = _cuda.lib.selectManifests manifestVersions;
+    };
 
-  cudaLib = _cuda.lib;
-
-  # Since Jetson capabilities are never built by default, we can check if any of them were requested
-  # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.
-  # Copied from backendStdenv.
-  jetsonCudaCapabilities = lib.filter (
-    cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.isJetson
-  ) _cuda.db.allSortedCudaCapabilities;
-  hasJetsonCudaCapability =
-    lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
-  redistSystem = _cuda.lib.getRedistSystem hasJetsonCudaCapability stdenv.hostPlatform.system;
-
-  # We must use an instance of Nixpkgs where the CUDA package set we're building is the default; if we do not, members
-  # of the versioned, non-default package sets may rely on (transitively) members of the default, unversioned CUDA
-  # package set.
-  # See `Using cudaPackages.pkgs` in doc/languages-frameworks/cuda.section.md for more information.
-  pkgs' =
+  cudaPackages_12_6 =
     let
-      cudaPackagesUnversionedName = "cudaPackages";
-      cudaPackagesMajorVersionName = cudaLib.mkVersionedName cudaPackagesUnversionedName (
-        versions.major cudaMajorMinorVersion
-      );
-      cudaPackagesMajorMinorVersionName = cudaLib.mkVersionedName cudaPackagesUnversionedName cudaMajorMinorVersion;
+      inherit (cudaPackages_12_6.backendStdenv) hasJetsonCudaCapability;
     in
-    # If the CUDA version of pkgs matches our CUDA version, we are constructing the default package set and can use
-    # pkgs without modification.
-    if pkgs.cudaPackages.cudaMajorMinorVersion == cudaMajorMinorVersion then
-      pkgs
-    else
-      pkgs.extend (
-        final: _: {
-          recurseForDerivations = false;
-          # The CUDA package set will be available as cudaPackages_x_y, so we need only update the aliases for the
-          # minor-versioned and unversioned package sets.
-          # cudaPackages_x = cudaPackages_x_y
-          ${cudaPackagesMajorVersionName} = final.${cudaPackagesMajorMinorVersionName};
-          # cudaPackages = cudaPackages_x
-          ${cudaPackagesUnversionedName} = final.${cudaPackagesMajorVersionName};
-        }
-      );
+    mkCudaPackages {
+      cublasmp = "0.6.0";
+      cuda = "12.6.3";
+      cudnn = "9.13.0";
+      cudss = "0.6.0";
+      cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
+      cusparselt = "0.6.3";
+      cutensor = "2.3.1";
+      nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
+      nvpl = "25.5";
+      nvtiff = "0.5.1";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
 
-  passthruFunction = final: {
-    # NOTE:
-    # It is important that _cuda is not part of the package set fixed-point. As described by
-    # @SomeoneSerge:
-    # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
-    # > No arrows should point in the reverse directions.
-    # That is to say that cudaLib should only know about package sets and configurations, because it implements
-    # functionality for interpreting configurations, resolving them against data, and constructing package sets.
-    # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).
-    # Also see the comment in `pkgs/top-level/all-packages.nix` about the `_cuda` attribute.
+  cudaPackages_12_8 =
+    let
+      inherit (cudaPackages_12_8.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
+      cublasmp = "0.6.0";
+      cuda = "12.8.1";
+      cudnn = "9.13.0";
+      cudss = "0.6.0";
+      cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
+      cusparselt = "0.8.1";
+      cutensor = "2.3.1";
+      nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
+      nvpl = "25.5";
+      nvtiff = "0.5.1";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
 
-    inherit cudaMajorMinorVersion;
+  cudaPackages_12_9 =
+    let
+      inherit (cudaPackages_12_9.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
+      cublasmp = "0.6.0";
+      cuda = "12.9.1";
+      cudnn = "9.13.0";
+      cudss = "0.6.0";
+      cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
+      cusparselt = "0.8.1";
+      cutensor = "2.3.1";
+      nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
+      nvpl = "25.5";
+      nvtiff = "0.5.1";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
 
-    pkgs = pkgs';
-
-    cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
-
-    cudaMajorVersion = versions.major cudaMajorMinorVersion;
-    cudaOlder = strings.versionOlder cudaMajorMinorVersion;
-    cudaAtLeast = strings.versionAtLeast cudaMajorMinorVersion;
-
-    flags =
-      cudaLib.formatCapabilities {
-        inherit (final.backendStdenv) cudaCapabilities cudaForwardCompat;
-        inherit (_cuda.db) cudaCapabilityToInfo;
-      }
-      # TODO(@connorbaker): Enable the corresponding warnings in `../development/cuda-modules/aliases.nix` after some
-      # time to allow users to migrate to cudaLib and backendStdenv.
-      // {
-        inherit (cudaLib) dropDots;
-        cudaComputeCapabilityToName =
-          cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.archName;
-        dropDot = cudaLib.dropDots;
-        isJetsonBuild = final.backendStdenv.hasJetsonCudaCapability;
-      };
-
-    # Loose packages
-    # Barring packages which share a home (e.g., cudatoolkit), new packages
-    # should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically
-    # discovered and added to the package set.
-
-    # TODO: Move to aliases.nix once all Nixpkgs has migrated to the splayed CUDA packages
-    cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { };
-
-    tests =
-      let
-        bools = [
-          true
-          false
-        ];
-        configs = {
-          openCVFirst = bools;
-          useOpenCVDefaultCuda = bools;
-          useTorchDefaultCuda = bools;
-        };
-        builder =
-          {
-            openCVFirst,
-            useOpenCVDefaultCuda,
-            useTorchDefaultCuda,
-          }@config:
-          {
-            name = strings.concatStringsSep "-" (
-              [
-                "test"
-                (if openCVFirst then "opencv" else "torch")
-              ]
-              ++ lists.optionals (if openCVFirst then useOpenCVDefaultCuda else useTorchDefaultCuda) [
-                "with-default-cuda"
-              ]
-              ++ [
-                "then"
-                (if openCVFirst then "torch" else "opencv")
-              ]
-              ++ lists.optionals (if openCVFirst then useTorchDefaultCuda else useOpenCVDefaultCuda) [
-                "with-default-cuda"
-              ]
-            );
-            value = final.callPackage ../development/cuda-modules/tests/opencv-and-torch config;
-          };
-      in
-      attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs)
-      // {
-        flags = final.callPackage ../development/cuda-modules/tests/flags.nix { };
-      };
-  };
-
-  composedExtension = fixedPoints.composeManyExtensions (
-    [
-      (
-        final: _:
-        {
-          # Prevent missing attribute errors
-          # NOTE(@connorbaker): CUDA 12.3 does not have a cuda_compat package; indeed, none of the release supports
-          # Jetson devices. To avoid errors in the case that cuda_compat is not defined, we have a dummy package which
-          # is always defined, but does nothing, will not build successfully, and has no platforms.
-          cuda_compat = runCommand "cuda_compat" { meta.platforms = [ ]; } "false";
-        }
-        // lib.packagesFromDirectoryRecursive {
-          inherit (final) callPackage;
-          directory = ../development/cuda-modules/packages;
-        }
-      )
-      (import ../development/cuda-modules/cuda/extension.nix { inherit cudaMajorMinorVersion lib; })
-      (import ../development/cuda-modules/generic-builders/multiplex.nix {
-        inherit
-          cudaLib
-          cudaMajorMinorVersion
-          lib
-          redistSystem
-          stdenv
-          ;
-        pname = "cudnn";
-        redistName = "cudnn";
-        releasesModule = ../development/cuda-modules/cudnn/releases.nix;
-        shimsFn = ../development/cuda-modules/cudnn/shims.nix;
-      })
-      (import ../development/cuda-modules/cutensor/extension.nix {
-        inherit
-          cudaLib
-          cudaMajorMinorVersion
-          lib
-          redistSystem
-          ;
-      })
-      (import ../development/cuda-modules/cusparselt/extension.nix {
-        inherit
-          cudaLib
-          lib
-          redistSystem
-          ;
-      })
-      (import ../development/cuda-modules/generic-builders/multiplex.nix {
-        inherit
-          cudaLib
-          cudaMajorMinorVersion
-          lib
-          redistSystem
-          stdenv
-          ;
-        pname = "tensorrt";
-        redistName = "tensorrt";
-        releasesModule = ../development/cuda-modules/tensorrt/releases.nix;
-        shimsFn = ../development/cuda-modules/tensorrt/shims.nix;
-      })
-      (import ../development/cuda-modules/cuda-library-samples/extension.nix { inherit lib stdenv; })
-    ]
-    ++ lib.optionals config.allowAliases [
-      (import ../development/cuda-modules/aliases.nix { inherit lib; })
-    ]
-    ++ _cuda.extensions
-  );
-
-  cudaPackages = customisation.makeScope pkgs'.newScope (
-    fixedPoints.extends composedExtension passthruFunction
-  );
+  cudaPackages_13_0 =
+    let
+      inherit (cudaPackages_13_0.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
+      cublasmp = "0.6.0";
+      cuda = "13.0.2";
+      cudnn = "9.13.0";
+      cudss = "0.6.0";
+      cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
+      cusparselt = "0.8.1";
+      cutensor = "2.3.1";
+      nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
+      nvpl = "25.5";
+      nvtiff = "0.5.1";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
 in
-cudaPackages
+{
+  inherit
+    cudaPackages_12_6
+    cudaPackages_12_8
+    cudaPackages_12_9
+    cudaPackages_13_0
+    ;
+}
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 717f2f58763a..cb0f6d7c6d47 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -116,6 +116,7 @@ stubs
   ### D ###
 
   discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27
+  ditto = throw "'darwin.ditto' has been removed, because it was impure and unused"; # added 2025-10-18
 
   ### I ###
 
@@ -150,5 +151,6 @@ stubs
 
   stdenvNoCF = throw "darwin.stdenvNoCF has been removed; use `stdenv` or `stdenvNoCC`"; # converted to throw 2025-07-29
   stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20
+  sudo = throw "'darwin.sudo' has been removed, because it was impure and unused"; # added 2025-10-18
   swift-corelibs-foundation = throw "'darwin.swift-corelibs-foundation' has been removed, as it was broken and is no longer used"; # added 2025-04-20
 }
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 9adaebefedc5..a2e77afd2513 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -39,14 +39,10 @@ makeScopeWithSplicing' {
         callPackage = self.callPackage;
         directory = ../os-specific/darwin/apple-source-releases;
       };
-
-      # Must use pkgs.callPackage to avoid infinite recursion.
-      impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };
     in
 
     lib.recurseIntoAttrs (
-      impure-cmds
-      // apple-source-packages
+      apple-source-packages
       // {
 
         inherit (self.adv_cmds) ps;
@@ -176,6 +172,8 @@ makeScopeWithSplicing' {
           xcode_16_4
           xcode_26
           xcode_26_Apple_silicon
+          xcode_26_0_1
+          xcode_26_0_1_Apple_silicon
           xcode
           requireXcode
           ;
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 12329d0af82f..ecfef757909e 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -79,17 +79,12 @@ let
   inherit (lib) throwIfNot;
 
   checked =
-    throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." lib.foldr
-      (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.")
-      (r: r)
-      overlays
-      throwIfNot
-      (lib.isList crossOverlays)
-      "The crossOverlays argument to nixpkgs must be a list."
-      lib.foldr
-      (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.")
-      (r: r)
-      crossOverlays;
+    (throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.")
+      (throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.")
+      (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.")
+      (
+        throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions."
+      );
 
   localSystem = lib.systems.elaborate args.localSystem;
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c1eaf78f1532..6055b609e506 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -15,11 +15,9 @@
 */
 
 {
+  lib,
   pkgs',
   emacs',
-  makeScope,
-  makeOverridable,
-  dontRecurseIntoAttrs,
 }:
 
 let
@@ -73,9 +71,9 @@ let
     };
 
 in
-makeScope pkgs'.newScope (
+lib.makeScope pkgs'.newScope (
   self:
-  makeOverridable (
+  lib.makeOverridable (
     {
       pkgs ? pkgs',
       lib ? pkgs.lib,
@@ -122,7 +120,7 @@ makeScope pkgs'.newScope (
         # Propagate overridden scope
         emacs = emacs'.overrideAttrs (old: {
           passthru = (old.passthru or { }) // {
-            pkgs = dontRecurseIntoAttrs self;
+            pkgs = lib.dontRecurseIntoAttrs self;
           };
         });
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 827685681415..6cf6be084b43 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -14,8 +14,6 @@ let
     "native-bignum"
     # Binary GHCs
     "ghc902Binary"
-    "ghc924Binary"
-    "ghc963Binary"
     "ghc984Binary"
   ];
 
@@ -48,6 +46,16 @@ let
   # Use this rather than `rec { ... }` below for sake of overlays.
   inherit (pkgs.haskell) compiler packages;
 
+  # The GHC LLVM backend rarely sees significant changes relating to
+  # LLVM version support, as it uses the textual IR format and invokes
+  # the LLVM binary tools rather than linking to the C++ libraries.
+  #
+  # Consider backporting upstream GHC changes to support new LLVM
+  # versions in `common-llvm-patches.nix` to allow the version to be
+  # shared across our supported versions of GHC. If the required
+  # changes are too invasive, it’s fine to decouple individual versions
+  # from this default or disable their LLVM support if it’s not load‐
+  # bearing (e.g. GHC 9.4.8 is important for cross‐compiling GHC).
   buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_20;
   llvmPackages = pkgs.llvmPackages_20;
 
@@ -78,123 +86,50 @@ in
         inherit llvmPackages;
       };
 
-      ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { };
-
-      ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix { };
-
       ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { };
 
       ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix {
         bootPkgs =
           # Building with 9.2 is broken due to
-          # https://gitlab.haskell.org/ghc/ghc/-/issues/21914
+          # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 krank:ignore-line
           bb.packages.ghc902Binary;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
       ghc94 = compiler.ghc948;
       ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix {
-        bootPkgs = bb.packages.ghc924Binary;
+        bootPkgs = bb.packages.ghc948;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
       ghc96 = compiler.ghc967;
       ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix {
-        bootPkgs =
-          if stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl then
-            bb.packages.ghc984Binary
-          else
-            bb.packages.ghc963Binary;
+        bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc948 else bb.packages.ghc984Binary;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
       ghc98 = compiler.ghc984;
-      ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix {
-        bootPkgs =
-          if stdenv.buildPlatform.isDarwin then
-            # it seems like the GHC 9.6.* bindists are built with a different
-            # toolchain than we are using (which I'm guessing from the fact
-            # that 9.6.4 bindists pass linker flags our ld doesn't support).
-            # With both 9.6.3 and 9.6.4 binary it is impossible to link against
-            # the clock package (probably a hsc2hs problem).
-            bb.packages.ghc967
-          else
-            bb.packages.ghc963Binary;
-        inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
-        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
-        inherit buildTargetLlvmPackages llvmPackages;
-      };
       ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix {
-        bootPkgs =
-          if stdenv.buildPlatform.isDarwin then
-            # it seems like the GHC 9.6.* bindists are built with a different
-            # toolchain than we are using (which I'm guessing from the fact
-            # that 9.6.4 bindists pass linker flags our ld doesn't support).
-            # With both 9.6.3 and 9.6.4 binary it is impossible to link against
-            # the clock package (probably a hsc2hs problem).
-            bb.packages.ghc967
-          else
-            bb.packages.ghc963Binary;
+        bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
       ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix {
-        bootPkgs =
-          if stdenv.buildPlatform.isDarwin then
-            # it seems like the GHC 9.6.* bindists are built with a different
-            # toolchain than we are using (which I'm guessing from the fact
-            # that 9.6.4 bindists pass linker flags our ld doesn't support).
-            # With both 9.6.3 and 9.6.4 binary it is impossible to link against
-            # the clock package (probably a hsc2hs problem).
-            bb.packages.ghc967
-          else
-            bb.packages.ghc963Binary;
+        bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
       ghc910 = compiler.ghc9103;
-      ghc9121 = callPackage ../development/compilers/ghc/9.12.1.nix {
-        bootPkgs =
-          # No suitable bindist packaged yet
-          bb.packages.ghc9103;
-        inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
-        inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
-        inherit buildTargetLlvmPackages llvmPackages;
-      };
       ghc9122 = callPackage ../development/compilers/ghc/9.12.2.nix {
         bootPkgs =
           # No suitable bindist packaged yet
           bb.packages.ghc9103;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
@@ -202,9 +137,6 @@ in
       ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
         bootPkgs = bb.packages.ghc984Binary;
         inherit (buildPackages.python3Packages) sphinx;
-        # Need to use apple's patched xattr until
-        # https://github.com/xattr/xattr/issues/44 and
-        # https://github.com/xattr/xattr/issues/55 are solved.
         inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
         inherit buildTargetLlvmPackages llvmPackages;
       };
@@ -217,7 +149,7 @@ in
             pkgs.lib.attrNames compiler
           );
         in
-        pkgs.recurseIntoAttrs (
+        pkgs.lib.recurseIntoAttrs (
           pkgs.lib.genAttrs nativeBignumGhcNames (
             name: compiler.${name}.override { enableNativeBignum = true; }
           )
@@ -248,18 +180,6 @@ in
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
         packageSetConfig = bootstrapPackageSet;
       };
-      ghc924Binary = callPackage ../development/haskell-modules {
-        buildHaskellPackages = bh.packages.ghc924Binary;
-        ghc = bh.compiler.ghc924Binary;
-        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
-        packageSetConfig = bootstrapPackageSet;
-      };
-      ghc963Binary = callPackage ../development/haskell-modules {
-        buildHaskellPackages = bh.packages.ghc963Binary;
-        ghc = bh.compiler.ghc963Binary;
-        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { };
-        packageSetConfig = bootstrapPackageSet;
-      };
       ghc984Binary = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc984Binary;
         ghc = bh.compiler.ghc984Binary;
@@ -284,11 +204,6 @@ in
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
       };
       ghc98 = packages.ghc984;
-      ghc9101 = callPackage ../development/haskell-modules {
-        buildHaskellPackages = bh.packages.ghc9101;
-        ghc = bh.compiler.ghc9101;
-        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
-      };
       ghc9102 = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc9102;
         ghc = bh.compiler.ghc9102;
@@ -300,11 +215,6 @@ in
         compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { };
       };
       ghc910 = packages.ghc9103;
-      ghc9121 = callPackage ../development/haskell-modules {
-        buildHaskellPackages = bh.packages.ghc9121;
-        ghc = bh.compiler.ghc9121;
-        compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
-      };
       ghc9122 = callPackage ../development/haskell-modules {
         buildHaskellPackages = bh.packages.ghc9122;
         ghc = bh.compiler.ghc9122;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index fd91ab54cda7..974c4d59611d 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -1,11 +1,15 @@
 { pkgs }:
-
-with pkgs;
-
+let
+  inherit (pkgs)
+    stdenv
+    callPackage
+    config
+    lib
+    ;
+in
 {
-  inherit (pkgs) openjfx17 openjfx21 openjfx23;
-
-  compiler =
+  inherit (pkgs) openjfx17 openjfx21 openjfx25;
+  compiler = lib.recurseIntoAttrs (
     let
       # merge meta.platforms of both packages so that dependent packages and hydra build them
       mergeMetaPlatforms =
@@ -48,7 +52,6 @@ with pkgs;
       openjdk11 = mkOpenjdk "11";
       openjdk17 = mkOpenjdk "17";
       openjdk21 = mkOpenjdk "21";
-      openjdk23 = mkOpenjdk "23";
       openjdk25 = mkOpenjdk "25";
 
       # Legacy aliases
@@ -56,7 +59,7 @@ with pkgs;
       openjdk11-bootstrap = temurin-bin.jdk-11;
       openjdk17-bootstrap = temurin-bin.jdk-17;
 
-      temurin-bin = recurseIntoAttrs (
+      temurin-bin = lib.recurseIntoAttrs (
         let
           temurinLinux = import ../development/compilers/temurin-bin/jdk-linux.nix {
             inherit (pkgs) lib callPackage stdenv;
@@ -68,7 +71,7 @@ with pkgs;
         lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux
       );
 
-      semeru-bin = recurseIntoAttrs (
+      semeru-bin = lib.recurseIntoAttrs (
         let
           semeruLinux = import ../development/compilers/semeru-bin/jdk-linux.nix {
             inherit (pkgs) lib callPackage;
@@ -79,7 +82,8 @@ with pkgs;
         in
         lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux
       );
-    };
+    }
+  );
 }
 // lib.optionalAttrs config.allowAliases {
   jogl_2_4_0 = throw "'jogl_2_4_0' is renamed to/replaced by 'jogl'";
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 531a9689a73b..5b649e3be8ae 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -1,12 +1,10 @@
 {
   pkgs,
   linuxKernel,
+  kernelPackagesExtensions,
   config,
   buildPackages,
   callPackage,
-  makeOverridable,
-  recurseIntoAttrs,
-  dontRecurseIntoAttrs,
   stdenv,
   stdenvNoCC,
   newScope,
@@ -18,9 +16,20 @@
 # - Update packageAliases.linux_latest to the latest version
 # - Update linux_latest_hardened when the patches become available
 
-with linuxKernel;
-
 let
+  inherit (lib) recurseIntoAttrs dontRecurseIntoAttrs;
+  inherit (linuxKernel)
+    kernels
+    kernelPatches
+    manualConfig
+    packages
+    packagesFor
+    packageAliases
+    vanillaPackages
+    rtPackages
+    rpiPackages
+    ;
+
   markBroken =
     drv:
     drv.overrideAttrs (
@@ -115,22 +124,6 @@ in
           rpiVersion = 4;
         };
 
-        linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "5.4";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-            kernelPatches.rtl8761b_support
-          ];
-        };
-
-        linux_rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix {
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_5_10 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "5.10";
           kernelPatches = [
@@ -203,14 +196,6 @@ in
           ];
         };
 
-        linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.16";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_6_17 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "6.17";
           kernelPatches = [
@@ -292,12 +277,14 @@ in
         linux_latest_libre = throw "linux_latest_libre has been removed due to lack of maintenance";
 
         linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
+        linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11";
         linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream";
         linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream";
         linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
         linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
         linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
         linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream";
+        linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream";
 
         linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
         linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
@@ -313,6 +300,8 @@ in
         linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
         linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream";
 
+        linux_rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11";
+
         linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages";
       }
     )
@@ -327,7 +316,7 @@ in
 
   packagesFor =
     kernel_:
-    lib.makeExtensible (
+    (lib.makeExtensible (
       self:
       with self;
       let
@@ -577,6 +566,8 @@ in
 
         mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };
 
+        mdio-netlink = callPackage ../os-specific/linux/mdio-netlink { };
+
         mwprocapture = callPackage ../os-specific/linux/mwprocapture { };
 
         mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };
@@ -721,38 +712,41 @@ in
         phc-intel = throw "phc-intel drivers are no longer supported by any kernel >=4.17"; # added 2025-07-18
         prl-tools = throw "Parallel Tools no longer provide any kernel module, please use pkgs.prl-tools instead."; # added 2025-10-04
       }
-    );
+    )).extend
+      (lib.fixedPoints.composeManyExtensions kernelPackagesExtensions);
 
   hardenedPackagesFor = kernel: overrides: packagesFor (hardenedKernelFor kernel overrides);
 
   vanillaPackages = {
     # recurse to build modules for the kernels
-    linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
     linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
     linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
     linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
-    linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
     linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17);
   }
   // lib.optionalAttrs config.allowAliases {
     linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
+    linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-22
     linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
     linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
     linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
     linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
     linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
     linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
+    linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22
   };
 
   rtPackages = {
     # realtime kernel packages
-    linux_rt_5_4 = packagesFor kernels.linux_rt_5_4;
     linux_rt_5_10 = packagesFor kernels.linux_rt_5_10;
     linux_rt_5_15 = packagesFor kernels.linux_rt_5_15;
     linux_rt_6_1 = packagesFor kernels.linux_rt_6_1;
     linux_rt_6_6 = packagesFor kernels.linux_rt_6_6;
+  }
+  // lib.optionalAttrs config.allowAliases {
+    linux_rt_5_4 = throw "linux_rt 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-22
   };
 
   rpiPackages = {
@@ -813,7 +807,7 @@ in
     linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
   };
 
-  manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix { };
+  manualConfig = callPackage ../os-specific/linux/kernel/build.nix { };
 
   customPackage =
     {
diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c9f0b72cd552..6ac705ba1ade 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -160,13 +160,13 @@ rec {
     { fetchFromGitHub }:
     buildLuaPackage rec {
       pname = "lua-resty-core";
-      version = "0.1.28";
+      version = "0.1.31";
 
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-core";
         rev = "v${version}";
-        sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI=";
+        sha256 = "sha256-WUiBFJ8L8NzSGoEwTAw/iHAzPqJqaOUSFyqGeEf+f94==";
       };
 
       propagatedBuildInputs = [ lua-resty-lrucache ];
@@ -184,13 +184,13 @@ rec {
     { fetchFromGitHub }:
     buildLuaPackage rec {
       pname = "lua-resty-lrucache";
-      version = "0.13";
+      version = "0.15";
 
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-lrucache";
         rev = "v${version}";
-        sha256 = "sha256-J8RNAMourxqUF8wPKd8XBhNwGC/x1KKvrVnZtYDEu4Q=";
+        sha256 = "sha256-G2l4Zo9Xm/m4zRfxrgzEvRE5LMO+UuX3kd7FwlCnxDA=";
       };
 
       meta = with lib; {
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 05a44028b266..4a5d517627a4 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -232,8 +232,6 @@ let
 
         cfstream = callPackage ../development/ocaml-modules/cfstream { };
 
-        chacha = callPackage ../development/ocaml-modules/chacha { };
-
         checkseum = callPackage ../development/ocaml-modules/checkseum { };
 
         chrome-trace = callPackage ../development/ocaml-modules/chrome-trace { };
@@ -426,6 +424,8 @@ let
 
         dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { };
 
+        dolmen_model = callPackage ../development/ocaml-modules/dolmen/model.nix { };
+
         dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { };
 
         dolog = callPackage ../development/ocaml-modules/dolog { };
@@ -466,21 +466,9 @@ let
 
         dune_1 = callPackage ../development/tools/ocaml/dune/1.nix { };
 
-        dune_2 =
-          if lib.versionAtLeast ocaml.version "4.08" then
-            callPackage ../development/tools/ocaml/dune/2.nix { }
-          else if lib.versionAtLeast ocaml.version "4.02" then
-            pkgs.dune_2
-          else
-            throw "dune_2 is not available for OCaml ${ocaml.version}";
+        dune_2 = callPackage ../development/tools/ocaml/dune/2.nix { };
 
-        dune_3 =
-          if lib.versionAtLeast ocaml.version "4.08" then
-            callPackage ../development/tools/ocaml/dune/3.nix { }
-          else if lib.versionAtLeast ocaml.version "4.02" then
-            pkgs.dune_3
-          else
-            throw "dune_3 is not available for OCaml ${ocaml.version}";
+        dune_3 = callPackage ../development/tools/ocaml/dune/3.nix { };
 
         dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { };
 
@@ -610,6 +598,8 @@ let
 
         farfadet = callPackage ../development/ocaml-modules/farfadet { };
 
+        farith = callPackage ../development/ocaml-modules/farith { };
+
         fdkaac = callPackage ../development/ocaml-modules/fdkaac { };
 
         ff = callPackage ../development/ocaml-modules/ff { };
@@ -1471,6 +1461,7 @@ let
         ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; };
         ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; };
         ocamlformat_0_27_0 = ocamlformat.override { version = "0.27.0"; };
+        ocamlformat_0_28_1 = ocamlformat.override { version = "0.28.1"; };
 
         ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix { };
 
@@ -1509,6 +1500,8 @@ let
 
         ocolor = callPackage ../development/ocaml-modules/ocolor { };
 
+        ocp-browser = callPackage ../development/tools/ocaml/ocp-browser { };
+
         ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
 
         ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { };
@@ -1578,16 +1571,22 @@ let
 
         omd = callPackage ../development/ocaml-modules/omd { };
 
+        opam-0install-cudf = callPackage ../development/ocaml-modules/opam-0install-cudf { };
+
         opam-core = callPackage ../development/ocaml-modules/opam-core {
           inherit (pkgs) opam;
         };
 
+        opam-client = callPackage ../development/ocaml-modules/opam-client { };
+
         opam-file-format = callPackage ../development/ocaml-modules/opam-file-format { };
 
         opam-format = callPackage ../development/ocaml-modules/opam-format { };
 
         opam-repository = callPackage ../development/ocaml-modules/opam-repository { };
 
+        opam-solver = callPackage ../development/ocaml-modules/opam-solver { };
+
         opam-state = callPackage ../development/ocaml-modules/opam-state { };
 
         opium = callPackage ../development/ocaml-modules/opium { };
@@ -1612,6 +1611,8 @@ let
 
         otr = callPackage ../development/ocaml-modules/otr { };
 
+        oui = callPackage ../development/ocaml-modules/oui { };
+
         ounit = callPackage ../development/ocaml-modules/ounit { };
 
         ounit2 = callPackage ../development/ocaml-modules/ounit2 { };
@@ -2091,6 +2092,8 @@ let
 
         ### U ###
 
+        ubase = callPackage ../development/ocaml-modules/ubase { };
+
         uchar = callPackage ../development/ocaml-modules/uchar { };
 
         uecc = callPackage ../development/ocaml-modules/uecc { };
@@ -2215,6 +2218,10 @@ let
 
         zmq-lwt = callPackage ../development/ocaml-modules/zmq/lwt.nix { };
 
+        ### _ ###
+
+        _0install-solver = callPackage ../development/ocaml-modules/0install-solver { };
+
         ### Exceptional packages kept out of order ###
 
         # Libs
@@ -2229,13 +2236,23 @@ let
 
         google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
-        hol_light = callPackage ../applications/science/logic/hol_light { };
+        hol_light = callPackage ../applications/science/logic/hol_light {
+          camlp5 =
+            if lib.versionAtLeast camlp5.version "8.04.00" then
+              camlp5.overrideAttrs {
+                version = "8.03.2";
+                __intentionallyOverridingVersion = true;
+              }
+            else
+              camlp5;
+        };
 
         ### End ###
 
       }
       // lib.optionalAttrs config.allowAliases {
         biocaml = throw "biocaml has been removed"; # 2025-06-04
+        chacha = throw "chacha has been removed because it has been marked as broken since at least November 2024. It is now vendored inside mirage-crypto, consider using that instead."; # Added 2025-10-11
         gd4o = throw "ocamlPackages.gd4o is not maintained, use ocamlPackages.gd instead";
         ocaml-vdom = throw "2023-10-09: ocamlPackages.ocaml-vdom was renamed to ocamlPackages.vdom";
       }
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index ccff7dba3fd0..cb09d08eed98 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -9,7 +9,7 @@
   packageOverrides =
     super:
     with super;
-    lib.mapAttrs (_: set: recurseIntoAttrs set) {
+    lib.mapAttrs (_: set: lib.recurseIntoAttrs set) {
       inherit (super)
         rPackages
         sourceHanPackages
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4c712e9d854e..beba321f8b99 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12322,11 +12322,11 @@ with self;
       hash = "sha256-VaUsIz4troYRP58Zs09hftz8hBb5vs5nEme9GBGxIRE=";
     };
     outputs = [ "out" ];
-    meta = with lib; {
+    meta = {
       description = "Simplified safe evaluation of Perl code";
       homepage = "https://github.com/mkende/perl-eval-safe";
-      license = licenses.mit;
-      maintainers = with maintainers; [ figsoda ];
+      license = lib.licenses.mit;
+      maintainers = [ ];
     };
   };
 
@@ -24770,14 +24770,14 @@ with self;
       TestPod
       TestPodCoverage
     ];
-    meta = with lib; {
+    meta = {
       description = "Perl bindings to the msgpack C library";
       homepage = "https://github.com/jacquesg/p5-MsgPack-Raw";
-      license = with licenses; [
+      license = with lib.licenses; [
         gpl1Plus # or
         artistic1
       ];
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
     };
   };
 
@@ -24927,14 +24927,14 @@ with self;
     ];
     # TODO: fix tests
     doCheck = false;
-    meta = with lib; {
+    meta = {
       description = "Perl bindings for Neovim";
       homepage = "https://github.com/jacquesg/p5-Neovim-Ext";
-      license = with licenses; [
+      license = with lib.licenses; [
         gpl1Plus # or
         artistic1
       ];
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
     };
   };
 
@@ -33293,12 +33293,12 @@ with self;
     };
   };
 
-  Test2Harness = buildPerlPackage {
+  Test2Harness = buildPerlPackage rec {
     pname = "Test2-Harness";
-    version = "1.000155";
+    version = "1.000161";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000155.tar.gz";
-      hash = "sha256-Hvi/euDKALaHu24RXzq4yVBI5ICsmuUylzabxpSkc4s=";
+      url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-${version}.tar.gz";
+      hash = "sha256-SXO3mx7tUwVxXuc9itySNtp5XH1AkNg7FQ6hMc1ltBQ=";
     };
 
     checkPhase = ''
@@ -33324,6 +33324,7 @@ with self;
       gotofile
     ];
     meta = {
+      changelog = "https://github.com/Test-More/Test2-Harness/blob/v${version}/Changes";
       description = "New and improved test harness with better Test2 integration";
       license = with lib.licenses; [
         artistic1
@@ -38852,7 +38853,7 @@ with self;
     ];
     postPatch = ''
       substituteInPlace Makefile.PL \
-        --replace-fail "\$(PERL)" "${lib.getExe buildPackages.perl}"
+        --replace-fail "\$(PERL)" "${lib.getExe perl.perlOnBuild}"
     '';
     meta = {
       description = "Simple API for XML";
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 2e3fe3d68310..5a2781659262 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -447,12 +447,14 @@ lib.makeScope pkgs.newScope (
               configureFlags = [
                 "--enable-dom"
               ];
-              patches = lib.optionals (lib.versionAtLeast php.version "8.4") [
-                # Fix build of ext-dom.
-                # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14)
+              patches = lib.optionals (lib.versionOlder php.version "8.3") [
+                # Fix gh10234 test with libxml 2.15.0
                 (fetchpatch {
-                  url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch";
-                  hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA=";
+                  url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch";
+                  hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic=";
+                  includes = [
+                    "ext/dom/tests/gh10234.phpt"
+                  ];
                 })
               ];
             }
diff --git a/pkgs/top-level/pkg-config/pkg-config-data.json b/pkgs/top-level/pkg-config/pkg-config-data.json
index a7a118056d37..a38da975f623 100644
--- a/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -388,11 +388,6 @@
         "libjack2"
       ]
     },
-    "javascriptcoregtk-4.0": {
-      "attrPath": [
-        "webkitgtk_4_0"
-      ]
-    },
     "lapack": {
       "attrPath": [
         "liblapack"
@@ -820,16 +815,6 @@
         "isDarwin": false
       }
     },
-    "webkit2gtk-4.0": {
-      "attrPath": [
-        "webkitgtk_4_0"
-      ]
-    },
-    "webkit2gtk-web-extension-4.0": {
-      "attrPath": [
-        "webkitgtk_4_0"
-      ]
-    },
     "x11": {
       "attrPath": [
         "xorg",
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b0802068b303..c8e64dee24c7 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -54,872 +54,455 @@ mapAliases {
   pypy3 = throw "do not use pypy3 when building Python packages, use the generic python parameter instead"; # do not remove
   pypy310 = throw "do not use pypy310 when building Python packages, use the generic python parameter instead"; # do not remove
   pypy311 = throw "do not use pypy311 when building Python packages, use the generic python parameter instead"; # do not remove
+  fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25, too many usages
 
-  aadict = throw "aadict was removed, it was introduced as a dependency for a package that never manifested and has been an unused leaf package ever since"; # added 2024-07-08
-  abodepy = jaraco-abode; # added 2023-02-01
-  acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19
-  acoustics = throw "acoustics has been removed because the upstream repository was archived in 2024"; # Added 2024-10-04
-  adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19
-  aeppl = throw "aeppl was removed as it depends on aesara, which is unmaintained"; # added 2025-01-12
-  aesara = throw "aesara was removed as the upstream repository is unmaintained"; # added 2025-01-12
-  aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07
-  aiohttp-isal = throw "aiohttp-isal has been removed, as it has been archived and replace by aiohttp-fast-zlib"; # Added 2024-08-11
-  aiohttp-zlib-ng = throw "aiohttp-zlib-ng has been removed, as it has been archived and replaced by aiohttp-fast-zlib"; # Added 2024-11-14
-  aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07
-  aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
-  aiolip = throw "aiolip has been removed because the upstream repository was archived in 2021"; # Added 2024-10-04
-  aiolivisi = throw "aiolivisi was removed because Home Assistant switched to livisi"; # added 2025-01-09
-  aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27
-  aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05
-  aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16
+  # keep-sorted start case=no numeric=yes
+  abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
+  amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
+  amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
   ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  amazon_kclpy = amazon-kclpy; # added 2023-08-08
-  ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07
-  ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
-  amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13
-  ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
-  ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16
-  ansible-lint = throw "ansible-lint has been promoted to a top-level attribute name: `pkgs.ansible-lint`"; # Added 2023-05-16
-  ansible-navigator = throw "ansible-navigator has been promoted to a top-level attribute name: pkgs.ansible-navigator"; # Added 2024-08-07
-  anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05
   apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
-  argon2_cffi = argon2-cffi; # added 2022-05-09
-  arnparse = throw "arnparse has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
-  APScheduler = apscheduler; # added 2023-02-19
-  async_generator = async-generator; # added 2023-08-08
-  async_stagger = async-stagger; # added 2023-08-08
-  asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07
-  asyncio-nats-client = nats-py; # added 2022-02-08
-  atsim_potentials = atsim-potentials; # added 2023-10-08
-  inherit (super.pkgs) autotrash; # added 2024-09-23
-  awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
-  azure-functions-devops-build = throw "azure-functions-devops-build has been removed, because it is abandoned"; # added 2024-10-04
-  Babel = babel; # added 2022-05-06
-  backports-cached-property = throw "backports-cached-property has been removed, since we no longer need to backport to python3.7"; # added 2024-11-12
-  backports-shutil-get-terminal-size = throw "backports-shutil-get-terminal-size has been removed, since we no longer need to backport to python3.2"; # added 2024-11-12
-  backports-shutil-which = throw "backports-shutil-which has been removed, since we no longer need to backport to python3.2"; # added 2024-11-12
-  backports-zoneinfo = throw "backports-zoneinfo has been removed, since we no longer need to backport to python3.8"; # added 2024-11-12
-  backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28
-  backports_functools_lru_cache = throw "backports_functools_lru_cache has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
-  backports_shutil_get_terminal_size = backports-shutil-get-terminal-size; # added 2024-04-21
-  backports_tempfile = throw "backports_tempfile has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
-  backports_unittest-mock = throw "backports_unittest-mock has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
-  backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
-  bash_kernel = bash-kernel; # added 2023-11-10
-  beancount_docverif = beancount-docverif; # added 2023-10-08
-  bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
-  bip_utils = bip-utils; # 2023-10-08
-  bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
+  APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29
+  argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29
+  astropy-extension-helpers = extension-helpers; # Added 2025-10-15
+  asyauth-bad = throw "'asyauth-bad' has been renamed to/replaced by 'badauth'"; # added 2025-11-06
+  async_generator = throw "'async_generator' has been renamed to/replaced by 'async-generator'"; # Converted to throw 2025-10-29
+  async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29
+  asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29
+  atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29
+  autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29
+  Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29
+  backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29
+  bash_kernel = throw "'bash_kernel' has been renamed to/replaced by 'bash-kernel'"; # Converted to throw 2025-10-29
+  beancount_docverif = throw "'beancount_docverif' has been renamed to/replaced by 'beancount-docverif'"; # Converted to throw 2025-10-29
+  beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
+  beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
+  bip_utils = throw "'bip_utils' has been renamed to/replaced by 'bip-utils'"; # Converted to throw 2025-10-29
   bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01
   bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26
-  blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20
-  BlinkStick = blinkstick; # added 2023-02-19
-  blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
-  boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22
-  boxx = throw "boxx was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08
-  bpycv = throw "bpycv was removed as it is incompatible with blender version 4 or later."; # added 2025-02-08
-  bsblan = python-bsblan; # added 2022-11-04
-  btchip = btchip-python; # added 2023-03-03
-  bugz = throw "use pkgs.pybugz instead"; # added 2024-12-31
-  bugzilla = python-bugzilla; # added 2024-10-17
-  buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07
-  buildbot-ui = throw "use pkgs.buildbot-ui instead"; # added 2022-04-07
-  buildbot-full = throw "use pkgs.buildbot-full instead"; # added 2022-04-07
-  buildbot-plugins = throw "use pkgs.buildbot-plugins instead"; # added 2022-04-07
-  buildbot-worker = throw "use pkgs.buildbot-worker instead"; # added 2022-04-07
-  buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07
+  BlinkStick = throw "'BlinkStick' has been renamed to/replaced by 'blinkstick'"; # Converted to throw 2025-10-29
+  bsblan = throw "'bsblan' has been renamed to/replaced by 'python-bsblan'"; # Converted to throw 2025-10-29
+  bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2025-10-29
+  btchip = throw "'btchip' has been renamed to/replaced by 'btchip-python'"; # Converted to throw 2025-10-29
+  BTrees = throw "'BTrees' has been renamed to/replaced by 'btrees'"; # Converted to throw 2025-10-29
+  btsmarthub_devicelist = throw "'btsmarthub_devicelist' has been renamed to/replaced by 'btsmarthub-devicelist'"; # Converted to throw 2025-10-29
+  bugzilla = throw "'bugzilla' has been renamed to/replaced by 'python-bugzilla'"; # Converted to throw 2025-10-29
   bunch = throw "bunch has been removed as it is unmaintained since inception"; # added 2025-05-31
-  btsmarthub_devicelist = btsmarthub-devicelist; # added 2024-01-03
-  bt_proximity = bt-proximity; # added 2021-07-02
   bz2file = throw "'bz2file' has beem removed, as it was not longed maintained upstream since 2020"; # added 2025-08-26
-  BTrees = btrees; # added 2023-02-19
-  cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21
-  cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13
-  caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
-  can = python-can; # added 2024-08-12
-  carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
+  can = throw "'can' has been renamed to/replaced by 'python-can'"; # Converted to throw 2025-10-29
   casbin = pycasbin; # added 2025-06-12
-  case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
-  cchardet = faust-cchardet; # added 2023-03-02
-  cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
-  chainer = throw "chainer has been removed, as it is abandoned and broken"; # added 2024-12-31
-  chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  class-registry = phx-class-registry; # added 2021-10-05
-  cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31
+  cchardet = throw "'cchardet' has been renamed to/replaced by 'faust-cchardet'"; # Converted to throw 2025-10-29
   cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13
-  ciscoconfparse = throw "ciscoconfparse was archived by upstream, use ciscoconfparse2"; # added 2025-03-08
-  cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
-  clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
-  codecov = throw "python-codecov has been removed, as it was broken and archived by upstream."; # Added 2024-10-24
-  codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02
-  ColanderAlchemy = colanderalchemy; # added 2023-02-19
-  command_runner = command-runner; # added 2024-03-06
+  class-registry = throw "'class-registry' has been renamed to/replaced by 'phx-class-registry'"; # Converted to throw 2025-10-29
+  ColanderAlchemy = throw "'ColanderAlchemy' has been renamed to/replaced by 'colanderalchemy'"; # Converted to throw 2025-10-29
+  command_runner = throw "'command_runner' has been renamed to/replaced by 'command-runner'"; # Converted to throw 2025-10-29
   commitizen = throw "commitizen has been promoted to a top-level attribute name: `pkgs.commitizen`"; # added 2025-09-14
-  CommonMark = commonmark; # added 2023-02-1
-  ConfigArgParse = configargparse; # added 2021-03-18
-  configshell = configshell-fb; # added 2025-03-14
-  coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04
-  covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20
-  cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21
-  cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
-  criticality-score = throw "use pkgs.criticality-score instead"; # added 2024-12-31
-  cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
-  cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
-  cufflinks = throw "cufflinks has removed, since it is abandoned and broken"; # added 2025-02-16
-  curve25519-donna = throw "curve25519-donna was removed, since it is abandoned and unmaintained since 2015"; # added 2025-05-21
-  cx_Freeze = cx-freeze; # added 2023-08-02
-  cx_oracle = cx-oracle; # added 2024-01-03
-  d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
-  dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07
-  dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
-  dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01
-  dateutil = python-dateutil; # added 2021-07-03
-  debian = python-debian; # added 2024-12-10
-  deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09
-  demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  deprecat = throw "deprecat has been removed, it unmaintained and archived by upstream"; # added 2025-03-08
-  descartes = throw "descartes has been removed, since it is abandoned and broken"; # added 2023-06-21
-  detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
-  dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04
-  dictpath = pathable; # added 2023-01-28
-  diff_cover = diff-cover; # added 2021-07-02
-  discogs_client = discogs-client; # added 2021-07-02
-  distutils_extra = distutils-extra; # added 2023-10-12
-  digital-ocean = python-digitalocean; # addad 2024-04-12
+  CommonMark = throw "'CommonMark' has been renamed to/replaced by 'commonmark'"; # Converted to throw 2025-10-29
+  ConfigArgParse = throw "'ConfigArgParse' has been renamed to/replaced by 'configargparse'"; # Converted to throw 2025-10-29
+  configshell = throw "'configshell' has been renamed to/replaced by 'configshell-fb'"; # Converted to throw 2025-10-29
+  cx_Freeze = throw "'cx_Freeze' has been renamed to/replaced by 'cx-freeze'"; # Converted to throw 2025-10-29
+  cx_oracle = throw "'cx_oracle' has been renamed to/replaced by 'cx-oracle'"; # Converted to throw 2025-10-29
+  dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2025-10-29
+  debian = throw "'debian' has been renamed to/replaced by 'python-debian'"; # Converted to throw 2025-10-29
+  dictpath = throw "'dictpath' has been renamed to/replaced by 'pathable'"; # Converted to throw 2025-10-29
+  diff_cover = throw "'diff_cover' has been renamed to/replaced by 'diff-cover'"; # Converted to throw 2025-10-29
+  digital-ocean = throw "'digital-ocean' has been renamed to/replaced by 'python-digitalocean'"; # Converted to throw 2025-10-29
+  discogs_client = throw "'discogs_client' has been renamed to/replaced by 'discogs-client'"; # Converted to throw 2025-10-29
+  distutils_extra = throw "'distutils_extra' has been renamed to/replaced by 'distutils-extra'"; # Converted to throw 2025-10-29
   dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
-  djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
-  djangorestframework-jwt = drf-jwt; # added 2021-07-20
-  django-allauth-2fa = throw "django-allauth-2fa was removed because it was unused and django-allauth now contains 2fa logic itself."; # added 2025-02-15
-  django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18
-  django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
-  django_3 = throw "Django 3 has reached it#s EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
-  django_appconf = django-appconf; # added 2022-03-03
-  django_classytags = django-classy-tags; # added 2023-07-25
-  django_colorful = django-colorful; # added 2023-07-25
-  django_compat = django-compat; # added 2023-07-25
-  django-compat = throw "django-compat has been removed. It provided forward/backport compat for django 1.x, which is long end of life."; # added 2023-07-26
-  django_contrib_comments = django-contrib-comments; # added 2023-07-25
   django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
   django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
   django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
-  django-crontab = throw "django-crontabe has been removed beacause it is unmaintained since 2018"; # added 2024-08-21
-  django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21
-  django_environ = django-environ; # added 2021-12-25
-  django_extensions = django-extensions; # added 2022-01-09
-  django_guardian = django-guardian; # added 2022-05-19
-  django_hijack = django-hijack; # added 2023-05-16
-  django_hijack_admin = django-hijack-admin; # added 2023-05-16
-  django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21
-  django_modelcluster = django-modelcluster; # added 2022-04-02
-  django-mysql = throw "django-mysql has been removed, since it was an unused leaf package"; # added 2024-07-02
-  django_nose = django-nose; # added 2023-07-25
-  django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21
-  django-q = throw "django-q has been removed because it is unmaintained and was unused"; # added 2024-12-13
-  django_reversion = django-reversion; # added 2022-06-18
-  django_polymorphic = django-polymorphic; # added 2022-05-24
-  django_redis = django-redis; # added 2021-10-11
-  django_silk = django-silk; # added 2023-07-25
-  django-sr = throw "django-sr has been removed since it has been unmaintained for 10 years"; # added 2024-05-26
-  django_tagging = django-tagging; # added 2023-07-25
-  django_taggit = django-taggit; # added 2021-10-11
-  django_treebeard = django-treebeard; # added 2023-07-25
-  dns = dnspython; # added 2017-12-10
-  docker_pycreds = docker-pycreds; # added 2024-01-03
-  docker-py = throw "docker-py was renamed to docker in version 2.0.0 back in 2016"; # added 2024-05-29
-  doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20
-  dogpile_cache = dogpile-cache; # added 2021-10-28
-  dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
-  dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12
-  editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
+  django_3 = throw "Django 3 has reached it#s EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
+  django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29
+  django_classytags = throw "'django_classytags' has been renamed to/replaced by 'django-classy-tags'"; # Converted to throw 2025-10-29
+  django_colorful = throw "'django_colorful' has been renamed to/replaced by 'django-colorful'"; # Converted to throw 2025-10-29
+  django_compat = throw "'django_compat' has been renamed to/replaced by 'django-compat'"; # Converted to throw 2025-10-29
+  django_contrib_comments = throw "'django_contrib_comments' has been renamed to/replaced by 'django-contrib-comments'"; # Converted to throw 2025-10-29
+  django_environ = throw "'django_environ' has been renamed to/replaced by 'django-environ'"; # Converted to throw 2025-10-29
+  django_extensions = throw "'django_extensions' has been renamed to/replaced by 'django-extensions'"; # Converted to throw 2025-10-29
+  django_guardian = throw "'django_guardian' has been renamed to/replaced by 'django-guardian'"; # Converted to throw 2025-10-29
+  django_hijack = throw "'django_hijack' has been renamed to/replaced by 'django-hijack'"; # Converted to throw 2025-10-29
+  django_hijack_admin = throw "'django_hijack_admin' has been renamed to/replaced by 'django-hijack-admin'"; # Converted to throw 2025-10-29
+  django_modelcluster = throw "'django_modelcluster' has been renamed to/replaced by 'django-modelcluster'"; # Converted to throw 2025-10-29
+  django_nose = throw "'django_nose' has been renamed to/replaced by 'django-nose'"; # Converted to throw 2025-10-29
+  django_polymorphic = throw "'django_polymorphic' has been renamed to/replaced by 'django-polymorphic'"; # Converted to throw 2025-10-29
+  django_redis = throw "'django_redis' has been renamed to/replaced by 'django-redis'"; # Converted to throw 2025-10-29
+  django_reversion = throw "'django_reversion' has been renamed to/replaced by 'django-reversion'"; # Converted to throw 2025-10-29
+  django_silk = throw "'django_silk' has been renamed to/replaced by 'django-silk'"; # Converted to throw 2025-10-29
+  django_tagging = throw "'django_tagging' has been renamed to/replaced by 'django-tagging'"; # Converted to throw 2025-10-29
+  django_taggit = throw "'django_taggit' has been renamed to/replaced by 'django-taggit'"; # Converted to throw 2025-10-29
+  django_treebeard = throw "'django_treebeard' has been renamed to/replaced by 'django-treebeard'"; # Converted to throw 2025-10-29
+  djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
+  djangorestframework-jwt = throw "'djangorestframework-jwt' has been renamed to/replaced by 'drf-jwt'"; # Converted to throw 2025-10-29
+  dns = throw "'dns' has been renamed to/replaced by 'dnspython'"; # Converted to throw 2025-10-29
+  docker_pycreds = throw "'docker_pycreds' has been renamed to/replaced by 'docker-pycreds'"; # Converted to throw 2025-10-29
+  dogpile_cache = throw "'dogpile_cache' has been renamed to/replaced by 'dogpile-cache'"; # Converted to throw 2025-10-29
+  duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
   easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08
-  eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
-  EasyProcess = easyprocess; # added 2023-02-19
-  email_validator = email-validator; # added 2022-06-22
+  EasyProcess = throw "'EasyProcess' has been renamed to/replaced by 'easyprocess'"; # Converted to throw 2025-10-29
+  editdistance-s = throw "editdistance-s has been removed since it was added solely for the identity package, which has moved on to ukkonen"; # added 2025-08-04
+  elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
+  email_validator = throw "'email_validator' has been renamed to/replaced by 'email-validator'"; # Converted to throw 2025-10-29
   embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14
-  enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
-  enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15
-  enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06
   eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-  et_xmlfile = et-xmlfile; # added 2023-10-16
-  etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
-  ev3dev2 = python-ev3dev2; # added 2023-06-19
-  evernote = throw "evernote is intended for use with Python 2.X";
-  eyeD3 = eyed3; # added 2024-01-03
+  et_xmlfile = throw "'et_xmlfile' has been renamed to/replaced by 'et-xmlfile'"; # Converted to throw 2025-10-29
+  ev3dev2 = throw "'ev3dev2' has been renamed to/replaced by 'python-ev3dev2'"; # Converted to throw 2025-10-29
+  eyeD3 = throw "'eyeD3' has been renamed to/replaced by 'eyed3'"; # Converted to throw 2025-10-29
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
-  Fabric = fabric; # addedd 2023-02-19
-  face_recognition = face-recognition; # added 2022-10-15
-  face_recognition_models = face-recognition-models; # added 2022-10-15
-  factory_boy = factory-boy; # added 2023-10-08
-  fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
-  farm-haystack = throw "farm-haystack was removed in favor of haystack-ai"; # added 2024-07-03
-  faster-fifo = throw "faster-fifo has been removed since it was an unused leaf package"; # added 2024-07-02
-  fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03
-  fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01
-  faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
-  inherit (super.pkgs) fetchPypi; # added 2023-05-25
+  Fabric = throw "'Fabric' has been renamed to/replaced by 'fabric'"; # Converted to throw 2025-10-29
+  face_recognition = throw "'face_recognition' has been renamed to/replaced by 'face-recognition'"; # Converted to throw 2025-10-29
+  face_recognition_models = throw "'face_recognition_models' has been renamed to/replaced by 'face-recognition-models'"; # Converted to throw 2025-10-29
+  factory_boy = throw "'factory_boy' has been renamed to/replaced by 'factory-boy'"; # Converted to throw 2025-10-29
+  fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-29
+  fb-re2 = throw "fb-re2 has been removed since it is unmaintained upstream, consider google-re2 instead"; # added 2025-10-18
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
-  filebrowser_safe = filebrowser-safe; # added 2024-01-03
-  filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
+  filebrowser_safe = throw "'filebrowser_safe' has been renamed to/replaced by 'filebrowser-safe'"; # Converted to throw 2025-10-29
   filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
-  flaskbabel = flask-babel; # added 2023-01-19
-  flask-babelex = throw "flask-babelex package has been removed, use flask-babel instead"; # added 2024-10-07
-  flask_assets = flask-assets; # added 2023-08-23
-  flask_elastic = flask-elastic; # added 2023-08-23
-  flask_login = flask-login; # added 2022-10-17
-  flask_mail = flask-mail; # added 2023-08-23
-  flask_marshmallow = flask-marshmallow; # added 2023-08-16
-  flask_migrate = flask-migrate; # added 2023-08-23
-  flask_principal = flask-principal; # added 2023-08-23
-  flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21
-  flask_script = flask-script; # added 2023-08-23
-  flask-security-too = flask-security; # added 2024-08-26
-  flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
-  flask_testing = flask-testing; # added 2022-04-25
-  flask_wtf = flask-wtf; # added 2022-05-24
-  flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020.";
-  flask-common = throw "flask-common was removed, as it is not compatible with flask 3.0 and unmaintained since 2018."; # added 2025-01-11
-  flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016.";
-  flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017.";
+  flask-security-too = throw "'flask-security-too' has been renamed to/replaced by 'flask-security'"; # Converted to throw 2025-10-29
   flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
-  flask-sockets = throw "flask-sockets has been removed as the upstream repository was archived in 2022"; # Added 2025-01-01
-  flowlogs_reader = flowlogs-reader; # added 2024-01-03
-  flufl_bounce = flufl-bounce; # added 2023-11-03
-  flufl_i18n = flufl-i18n; # added 2023-11-03
-  flufl_lock = flufl-lock; # added 2023-11-03
-  fn = throw "fn was removed as it is no longer used by any package in nixpkgs, it is not compatible with python 3.11 or newer and it was last updated in 2014."; # added 2025-02-08 # added 2024-07-08
-  FormEncode = formencode; # added 2023-02-19
-  foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb71 = throw "foundationdb71 has been removed, use foundationdb73 instead"; # added 2024-12-28
-  functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
-  functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16
-  fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05
-  garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
-  garminconnect-ha = garminconnect; # added 2022-02-05
-  gbulb = throw "gbulb has been removed as it is unmaintained and no longer compatible with PyGObject 3.50."; # added 2024-10-14
-  gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22
-  gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15
-  geeknote = throw "geeknote depends on the Python2-only library evernote"; # Added 2025-03-22
-  GeoIP = geoip; # added 2023-02-19
-  gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02
-  gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
-  github3_py = github3-py; # added 2024-01-04
-  GitPython = gitpython; # added 2022-10-28
-  glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
-  glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05
-  globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13
-  goobook = throw "goobook has been promoted to a top-level attribute name: `pkgs.goobook`"; # Added 2025-03-25
-  google-reauth = throw "google-reauth has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
-  google_api_python_client = google-api-python-client; # added 2021-03-19
-  googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
-  google-apitools = throw "google-apitools was removed because it is deprecated and unsupported by upstream"; # added 2023-02-25
-  gpyopt = throw "gpyopt was remove because it's been archived upstream"; # added 2023-06-07
-  gradient_statsd = gradient-statsd; # added 2024-01-06
-  graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10
-  graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09
-  grappelli_safe = grappelli-safe; # added 2023-10-08
-  groestlcoin_hash = groestlcoin-hash; # added 2024-01-06
-  grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
-  inherit (pkgs) gtimelog;
-  guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
-  ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
-  HAP-python = hap-python; # added 2021-06-01
+  flask_assets = throw "'flask_assets' has been renamed to/replaced by 'flask-assets'"; # Converted to throw 2025-10-29
+  flask_elastic = throw "'flask_elastic' has been renamed to/replaced by 'flask-elastic'"; # Converted to throw 2025-10-29
+  flask_login = throw "'flask_login' has been renamed to/replaced by 'flask-login'"; # Converted to throw 2025-10-29
+  flask_mail = throw "'flask_mail' has been renamed to/replaced by 'flask-mail'"; # Converted to throw 2025-10-29
+  flask_marshmallow = throw "'flask_marshmallow' has been renamed to/replaced by 'flask-marshmallow'"; # Converted to throw 2025-10-29
+  flask_migrate = throw "'flask_migrate' has been renamed to/replaced by 'flask-migrate'"; # Converted to throw 2025-10-29
+  flask_principal = throw "'flask_principal' has been renamed to/replaced by 'flask-principal'"; # Converted to throw 2025-10-29
+  flask_script = throw "'flask_script' has been renamed to/replaced by 'flask-script'"; # Converted to throw 2025-10-29
+  flask_sqlalchemy = throw "'flask_sqlalchemy' has been renamed to/replaced by 'flask-sqlalchemy'"; # Converted to throw 2025-10-29
+  flask_testing = throw "'flask_testing' has been renamed to/replaced by 'flask-testing'"; # Converted to throw 2025-10-29
+  flask_wtf = throw "'flask_wtf' has been renamed to/replaced by 'flask-wtf'"; # Converted to throw 2025-10-29
+  flaskbabel = throw "'flaskbabel' has been renamed to/replaced by 'flask-babel'"; # Converted to throw 2025-10-29
+  flowlogs_reader = throw "'flowlogs_reader' has been renamed to/replaced by 'flowlogs-reader'"; # Converted to throw 2025-10-29
+  flufl_bounce = throw "'flufl_bounce' has been renamed to/replaced by 'flufl-bounce'"; # Converted to throw 2025-10-29
+  flufl_i18n = throw "'flufl_i18n' has been renamed to/replaced by 'flufl-i18n'"; # Converted to throw 2025-10-29
+  flufl_lock = throw "'flufl_lock' has been renamed to/replaced by 'flufl-lock'"; # Converted to throw 2025-10-29
+  FormEncode = throw "'FormEncode' has been renamed to/replaced by 'formencode'"; # Converted to throw 2025-10-29
+  garminconnect-ha = throw "'garminconnect-ha' has been renamed to/replaced by 'garminconnect'"; # Converted to throw 2025-10-29
+  GeoIP = throw "'GeoIP' has been renamed to/replaced by 'geoip'"; # Converted to throw 2025-10-29
+  github3_py = throw "'github3_py' has been renamed to/replaced by 'github3-py'"; # Converted to throw 2025-10-29
+  GitPython = throw "'GitPython' has been renamed to/replaced by 'gitpython'"; # Converted to throw 2025-10-29
+  google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29
+  googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2025-10-29
+  gpapi = throw "'gpapi' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09
+  gplaycli = throw "'gplaycli' has been removed as it was broken and lacked maintenance"; # Added 2025-11-09
+  gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29
+  grappelli_safe = throw "'grappelli_safe' has been renamed to/replaced by 'grappelli-safe'"; # Converted to throw 2025-10-29
+  groestlcoin_hash = throw "'groestlcoin_hash' has been renamed to/replaced by 'groestlcoin-hash'"; # Converted to throw 2025-10-29
+  grpc_google_iam_v1 = throw "'grpc_google_iam_v1' has been renamed to/replaced by 'grpc-google-iam-v1'"; # Converted to throw 2025-10-29
+  gtimelog = throw "'gtimelog' has been renamed to/replaced by 'gtimelog'"; # Converted to throw 2025-10-29
+  guzzle_sphinx_theme = throw "'guzzle_sphinx_theme' has been renamed to/replaced by 'guzzle-sphinx-theme'"; # Converted to throw 2025-10-29
   hahomematic = throw "hahomematic has been superseded by aiohomematic"; # added 2025-08-16
-  hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13
-  hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
-  hcs_utils = hcs-utils; # added 2024-01-06
-  hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
+  HAP-python = throw "'HAP-python' has been renamed to/replaced by 'hap-python'"; # Converted to throw 2025-10-29
+  hcs_utils = throw "'hcs_utils' has been renamed to/replaced by 'hcs-utils'"; # Converted to throw 2025-10-29
   heif-image-plugin = throw "heif-image-plugin has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
-  hglib = python-hglib; # added 2023-10-13
+  hglib = throw "'hglib' has been renamed to/replaced by 'python-hglib'"; # Converted to throw 2025-10-29
   hijri-converter = hijridate; # added 2025-08-07
-  hkdf = throw "hkdf has been removed, as it is no longer maintained upstream."; # added 2024-10-04
-  homeassistant-bring-api = bring-api; # added 2024-04-11
-  homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05
-  htmllaundry = throw "htmllaundry has been removed because it is abandoned"; # added 2024-06-04
-  HTSeq = htseq; # added 2023-02-19
-  hug = throw "hug was marked broken since 2021 and has not established compatibility with newer dependency versions. It has therefore been removed."; # added 2024-11-15
-  huisbaasje-client = throw "huisbaasje-client has been removed because it was replaced with energyflip-client"; # added 2025-05-12
-  hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
-  hydra-check = throw "The Python package hydra-check was removed in favor of the top-level rust based pkgs.hydra-check"; # added 2022-04-29
-  ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08
-  IMAPClient = imapclient; # added 2021-10-28
-  imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08
-  image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10
-  imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10
-  imgtool = throw "imgtool has been promoted to a top-level attribute name: `mcuboot-imgtool`"; # added 2024-10-09
-  intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11
+  homeassistant-bring-api = throw "'homeassistant-bring-api' has been renamed to/replaced by 'bring-api'"; # Converted to throw 2025-10-29
+  HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29
+  IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29
+  inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
   ionhash = throw "ionhash has been removed due to being unmaintained upstream"; # added 2025-07-30
   iotawattpy = ha-iotawattpy; # added 2025-07-06
-  ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
-  ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21
-  ipython_genutils = ipython-genutils; # added 2023-10-12
-  influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
-  inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
-  itanium_demangler = itanium-demangler; # added 2022-10-17
-  jaeger-client = throw "jaeger-client was removed because it is deprecated upstream. OpenTelemetry is recommended instead."; # Added 2024-12-09
-  jaraco_classes = jaraco-classes; # added 2023-07-14
-  jaraco_collections = jaraco-collections; # added 2023-07-14
-  jaraco_functools = jaraco-functools; # added 2023-07-14
-  jaraco_itertools = jaraco-itertools; # added 2023-07-14
-  jaraco_logging = jaraco-logging; # added 2023-07-14
-  jaraco_text = jaraco-text; # added 2023-07-14
-  jaraco_stream = jaraco-stream; # added 2023-07-14
-  JayDeBeApi = jaydebeapi; # added 2023-02-19
-  jinja2_pluralize = jinja2-pluralize; # added 2023-11-01
-  jinja2_time = jinja2-time; # added 2022-11-07
-  JPype1 = jpype1; # added 2023-02-19
-  js2py = throw "js2py has been removed, as it is unmaintained and insecure"; # added 2024-10-17
-  jsonpath_rw = jsonpath-rw; # added 2024-01-06
-  jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28
-  jupyter_client = jupyter-client; # added 2021-10-15
-  jupyter_console = jupyter-console; # added  2023-07-31
-  jupyter-contrib-nbextensions = throw "jupyter-contrib-nbextensions has been removed, as it does not work with Jupyter Notebook 7"; # added 2024-09-22
-  jupyter_core = jupyter-core; # added 2023-01-05
-  jupyter_server = jupyter-server; # added 2023-01-05
-  jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18
-  jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11
-  jupyterlab_server = jupyterlab-server; # added 2023-11-12
-  kafka-python = kafka-python-ng; # added 2024-07-19
-  Kajiki = kajiki; # added 2023-02-19
-  keepkey_agent = keepkey-agent; # added 2024-01-06
-  Keras = keras; # added 2021-11-25
-  keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12
-  keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12
-  keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
+  ipython_genutils = throw "'ipython_genutils' has been renamed to/replaced by 'ipython-genutils'"; # Converted to throw 2025-10-29
+  itanium_demangler = throw "'itanium_demangler' has been renamed to/replaced by 'itanium-demangler'"; # Converted to throw 2025-10-29
+  jaraco_classes = throw "'jaraco_classes' has been renamed to/replaced by 'jaraco-classes'"; # Converted to throw 2025-10-29
+  jaraco_collections = throw "'jaraco_collections' has been renamed to/replaced by 'jaraco-collections'"; # Converted to throw 2025-10-29
+  jaraco_functools = throw "'jaraco_functools' has been renamed to/replaced by 'jaraco-functools'"; # Converted to throw 2025-10-29
+  jaraco_itertools = throw "'jaraco_itertools' has been renamed to/replaced by 'jaraco-itertools'"; # Converted to throw 2025-10-29
+  jaraco_logging = throw "'jaraco_logging' has been renamed to/replaced by 'jaraco-logging'"; # Converted to throw 2025-10-29
+  jaraco_stream = throw "'jaraco_stream' has been renamed to/replaced by 'jaraco-stream'"; # Converted to throw 2025-10-29
+  jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29
+  JayDeBeApi = throw "'JayDeBeApi' has been renamed to/replaced by 'jaydebeapi'"; # Converted to throw 2025-10-29
+  jinja2_pluralize = throw "'jinja2_pluralize' has been renamed to/replaced by 'jinja2-pluralize'"; # Converted to throw 2025-10-29
+  jinja2_time = throw "'jinja2_time' has been renamed to/replaced by 'jinja2-time'"; # Converted to throw 2025-10-29
+  JPype1 = throw "'JPype1' has been renamed to/replaced by 'jpype1'"; # Converted to throw 2025-10-29
+  jsonpath_rw = throw "'jsonpath_rw' has been renamed to/replaced by 'jsonpath-rw'"; # Converted to throw 2025-10-29
+  jupyter-server-ydoc = throw "'jupyter-server-ydoc' has been renamed to/replaced by 'jupyter-collaboration'"; # Converted to throw 2025-10-29
+  jupyter_client = throw "'jupyter_client' has been renamed to/replaced by 'jupyter-client'"; # Converted to throw 2025-10-29
+  jupyter_console = throw "'jupyter_console' has been renamed to/replaced by 'jupyter-console'"; # Converted to throw 2025-10-29
+  jupyter_core = throw "'jupyter_core' has been renamed to/replaced by 'jupyter-core'"; # Converted to throw 2025-10-29
+  jupyter_server = throw "'jupyter_server' has been renamed to/replaced by 'jupyter-server'"; # Converted to throw 2025-10-29
+  jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
+  kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
+  Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
+  keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-29
+  Keras = throw "'Keras' has been renamed to/replaced by 'keras'"; # Converted to throw 2025-10-29
   keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2505-05-25
-  ldap = python-ldap; # added 2022-09-16
-  lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
-  langchain-standard-tests = langchain-tests; # added 2025-01-22
-  langchainplus-sdk = langsmith; # added 2023-08-01
-  langgraph-checkpoint-duckdb = throw "langgraph-checkpoint-duckdb has been removed as of langgraph 0.2.63"; # added 2025-04-04
-  lazr_config = lazr-config; # added 2023-11-03
-  lazr_delegates = lazr-delegates; # added 2023-11-03
-  lazy_import = lazy-import; # added 2024-01-07
-  lazy-import = throw "lazy-import has been removed because it was unused."; # added 2024-05-20
-  lazy_imports = lazy-imports; # added 2023-10-13
-  ledger_agent = ledger-agent; # Added 2024-01-07
-  lektor = throw "lektor has been promoted to a top-level attribute name: `pkgs.lektor`"; # added 2023-08-01
-  libgpuarray = throw "libgpuarray has been removed, as it was unmaintained."; # added 2024-08-03
+  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
+  langchain-standard-tests = throw "'langchain-standard-tests' has been renamed to/replaced by 'langchain-tests'"; # Converted to throw 2025-10-29
+  langchainplus-sdk = throw "'langchainplus-sdk' has been renamed to/replaced by 'langsmith'"; # Converted to throw 2025-10-29
+  lazr_config = throw "'lazr_config' has been renamed to/replaced by 'lazr-config'"; # Converted to throw 2025-10-29
+  lazr_delegates = throw "'lazr_delegates' has been renamed to/replaced by 'lazr-delegates'"; # Converted to throw 2025-10-29
+  lazy_import = throw "'lazy_import' has been renamed to/replaced by 'lazy-import'"; # Converted to throw 2025-10-29
+  lazy_imports = throw "'lazy_imports' has been renamed to/replaced by 'lazy-imports'"; # Converted to throw 2025-10-29
+  lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
+  ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
+  ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
   libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
-  line_profiler = line-profiler; # added 2023-11-04
-  linear_operator = linear-operator; # added 2024-01-07
-  livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14
-  livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14
-  lmcloud = pylamarzocco; # added 2024-11-26
-  localstack = throw "localstack was promoted to a top-level attribute"; # added 2025-02-21
-  logi-circle = throw "logi-circle has been removed because the logi_circle integration was removed from Home Assistant"; # added 2025-05-13
-  logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
-  logilab_common = logilab-common; # added 2022-11-21
-  loo-py = loopy; # added 2022-05-03
-  ludios_wpull = throw "ludios_wpull has been removed because it's unmaintained and broken"; # added 2023-11-12
-  luxor = throw "luxor has been removed because it is unmaintained and broken"; # added 2025-01-25
-  lcov_cobertura = lcov-cobertura; # added 2024-01-07
-  Mako = mako; # added 2023-02-19
-  Markups = markups; # added 2022-02-14
-  markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10
-  mask-rcnn = throw "mask-rcnn has been removed as it is unmaintained and its dependency imgaug no longer builds"; # added 2023-07-10
-  mac_alias = mac-alias; # added 2024-01-07
+  line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
+  linear_operator = throw "'linear_operator' has been renamed to/replaced by 'linear-operator'"; # Converted to throw 2025-10-29
+  lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
+  logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
+  loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
+  lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07
+  mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29
   macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
-  MDP = mdp; # added 2023-02-19
-  mdp = throw "mdp has been removed as it is unmaintained and broken"; # added 2024-11-23
-  MechanicalSoup = mechanicalsoup; # added 2021-06-01
-  memcached = python-memcached; # added 2022-05-06
-  mailman = throw "Please use pkgs.mailman"; # added 2022-04-29
-  mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29
-  mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29
-  manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20
-  mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
-  marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
-  markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19
+  Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29
+  Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29
   mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
-  matrix-api-async = throw "matrix-api-async has been removed as it is an old wrapper and no longer in use"; # added 2025-01-01
-  memory_profiler = memory-profiler; # added 2023-10-09
+  matlink-gpapi = throw "'matlink-gpapi' has been removed as it was broken and unmaintained"; # Added 2025-11-09
+  MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
+  MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
+  memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29
+  memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29
   mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  mir_eval = mir-eval; # added 2024-01-07
-  mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12
-  mistune_2_0 = mistune; # added 2022-08-12
-  mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06
-  mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10
+  mesonpep517 = throw "'mesonpep517' has been removed as it was broken and unmaintained."; # added 2025-11-08
+  minikerberos-bad = throw "'minikerberos-bad' has been renamed to/replaced by 'kerbad'"; # added 2025-11-06
+  mir_eval = throw "'mir_eval' has been renamed to/replaced by 'mir-eval'"; # Converted to throw 2025-10-29
+  mistune_2_0 = throw "'mistune_2_0' has been renamed to/replaced by 'mistune'"; # Converted to throw 2025-10-29
+  mkdocs-awesome-pages-plugin = throw "'mkdocs-awesome-pages-plugin' has been renamed to/replaced by 'mkdocs-awesome-nav'"; # Converted to throw 2025-10-29
   mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02
-  mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28
-  mne-python = mne; # added 2025-05-02
-  modestmaps = throw "modestmaps is unmaintained and was never enabled for anything except Python27"; # Added 2025-03-23
-  mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21
-  mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30
-  mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
-  multi_key_dict = multi-key-dict; # added 2023-11-05
+  mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29
+  mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29
+  msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06
+  multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29
   mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
-  mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02
-  n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24
-  nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05
-  mypy-boto3-alexaforbusiness = throw "mypy-boto3-alexaforbusiness was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-backupstorage = throw "mypy-boto3-backupstorage was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-gamesparks = throw "mypy-boto3-gamesparks was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-honeycode = throw "mypy-boto3-honeycode was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-iot-roborunner = throw "mypy-boto3-iot-roborunner was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-macie = throw "mypy-boto3-macie was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-mobile = throw "mypy-boto3-mobile was removed because it is unmaintained"; # added 2024-09-04
-  net2grid = gridnet; # add 2022-04-22
-  nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
+  net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29
+  ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29
   nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
-  niko-home-control = throw "niko-home-control was removed because Home Assistant switched to nhc"; # added 2025-01-09
-  ninja-python = ninja; # add 2022-08-03
   nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
-  nose = throw "nose has been removed since it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12; please switch to pytest or another test runner/framework"; # added 2024-07-28
-  nose3 = throw "nose3 has been removed since it is unmaintained and does not work with Python 3.12"; # added 2024-07-28
-  nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21
-  nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21
-  nosexcover = throw "nosexcover has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21
-  nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
-  nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21
-  nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21
-  nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22
-  nose-pattern-exclude = throw "nose-pattern-exclude has been removed as it has been unmaintained since 2014"; # added 2024-07-27
-  nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-21
-  nose-timer = throw "nose-timer has been removed as it depends on the abandoned nose test framework"; # added 2024-07-27
-  nose-warnings-filters = throw "nose-warnings-filters has been removed as it has been unmaintained since 2016"; # added 2024-07-27
-  nose_warnings_filters = nose-warnings-filters; # added 2024-01-07
-  nose-xunitmp = throw "nose-xunitmp has been removed as it depends on the abandoned nose test framework"; # added 2024-07-29
-  notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02
-  Nuitka = nuitka; # added 2023-02-19
-  ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
-  oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
+  Nuitka = throw "'Nuitka' has been renamed to/replaced by 'nuitka'"; # Converted to throw 2025-10-29
   oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
+  oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
   objax = throw "objax has been removed because the upstream project was archived."; # Added 2025-10-04
-  openai-triton = triton; # added 2024-07-18
-  openai-triton-bin = triton-bin; # added 2024-07-18
-  openai-triton-cuda = triton-cuda; # added 2024-07-18
-  openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18
-  openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
+  openai-triton = throw "'openai-triton' has been renamed to/replaced by 'triton'"; # Converted to throw 2025-10-29
+  openai-triton-bin = throw "'openai-triton-bin' has been renamed to/replaced by 'triton-bin'"; # Converted to throw 2025-10-29
+  openai-triton-cuda = throw "'openai-triton-cuda' has been renamed to/replaced by 'triton-cuda'"; # Converted to throw 2025-10-29
+  openai-triton-no-cuda = throw "'openai-triton-no-cuda' has been renamed to/replaced by 'triton-no-cuda'"; # Converted to throw 2025-10-29
   openbabel-bindings = openbabel; # added 2025-09-17
-  opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
-  openllm = throw "openllm has moved to pkgs.openllm"; # added 2021-12-31
-  openllm-client = throw "openllm-client has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24
-  openllm-core = throw "openllm-core has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24
-  opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
-  opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09
-  ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
+  opsdroid_get_image_size = throw "'opsdroid_get_image_size' has been renamed to/replaced by 'opsdroid-get-image-size'"; # Converted to throw 2025-10-29
   orderedset = throw "orderedset has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
-  pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
-  paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05
-  paho-mqtt_2 = paho-mqtt; # added 2025-03-05
-  pam = python-pam; # added 2020-09-07.
-  PasteDeploy = pastedeploy; # added 2021-10-07
-  pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13
-  pathpy = path; # added 2022-04-12
-  pcbnew-transition = pcbnewtransition; # added 2024-03-21
-  pc-ble-driver-py = throw "pc-ble-driver-py has been removed because the upstream repository was archived in 2024"; # Added 2024-10-04
-  pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29
-  pdfminer = pdfminer-six; # added 2022-05-25
-  pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
-  pep257 = pydocstyle; # added 2022-04-12
+  paho-mqtt_2 = throw "'paho-mqtt_2' has been renamed to/replaced by 'paho-mqtt'"; # Converted to throw 2025-10-29
+  pam = throw "'pam' has been renamed to/replaced by 'python-pam'"; # Converted to throw 2025-10-29
+  PasteDeploy = throw "'PasteDeploy' has been renamed to/replaced by 'pastedeploy'"; # Converted to throw 2025-10-29
+  pathpy = throw "'pathpy' has been renamed to/replaced by 'path'"; # Converted to throw 2025-10-29
+  pcbnew-transition = throw "'pcbnew-transition' has been renamed to/replaced by 'pcbnewtransition'"; # Converted to throw 2025-10-29
+  pdfminer = throw "'pdfminer' has been renamed to/replaced by 'pdfminer-six'"; # Converted to throw 2025-10-29
+  pep257 = throw "'pep257' has been renamed to/replaced by 'pydocstyle'"; # Converted to throw 2025-10-29
   percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
-  pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24
-  pipenv-poetry-migrate = throw "pipenv-poetry-migrate was promoted to a top-level attribute"; # added 2025-01-14
-  pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18
-  pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28
-  poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09
-  poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02
-  Polygon3 = polygon3; # Added 2023-08-08
-  posix_ipc = posix-ipc; # added 2024-01-07
-  poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
-  postgrest-py = postgrest; # added 2024-08-29
-  postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
-  powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
-  prayer-times-calculator = prayer-times-calculator-offline; # added 2024-08-11
-  premailer = throw "premailer was removed, as it is not compatible with lxml>4.9.4.";
-  privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31
-  proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20
-  prometheus_client = prometheus-client; # added 2021-06-10
-  prompt_toolkit = prompt-toolkit; # added 2021-07-22
-  protonup = protonup-ng; # Added 2022-11-06
-  proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16
-  proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proton-vpn-killswitch-network-manager = throw "proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-killswitch-network-manager-wireguard = throw "proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-logger = throw "proton-vpn-logger functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proxy_tools = proxy-tools; # added 2023-11-05
+  plumlightpad = throw "plumlightpad has been removed because the API was shut down"; # added 2025-11-04
+  Polygon3 = throw "'Polygon3' has been renamed to/replaced by 'polygon3'"; # Converted to throw 2025-10-29
+  posix_ipc = throw "'posix_ipc' has been renamed to/replaced by 'posix-ipc'"; # Converted to throw 2025-10-29
+  postgrest-py = postgrest; # added 2025-08-29
+  powerlineMemSegment = throw "'powerlineMemSegment' has been renamed to/replaced by 'powerline-mem-segment'"; # Converted to throw 2025-10-29
+  prayer-times-calculator = throw "'prayer-times-calculator' has been renamed to/replaced by 'prayer-times-calculator-offline'"; # Converted to throw 2025-10-29
+  primp = throw "primp was removed as it required a very outdated version of boringssl"; # added 2025-10-20
+  prometheus_client = throw "'prometheus_client' has been renamed to/replaced by 'prometheus-client'"; # Converted to throw 2025-10-29
+  prompt_toolkit = throw "'prompt_toolkit' has been renamed to/replaced by 'prompt-toolkit'"; # Converted to throw 2025-10-29
+  protonup = throw "'protonup' has been renamed to/replaced by 'protonup-ng'"; # Converted to throw 2025-10-29
+  protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16
+  proxy_tools = throw "'proxy_tools' has been renamed to/replaced by 'proxy-tools'"; # Converted to throw 2025-10-29
   ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25
-  pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
-  pushbullet = pushbullet-py; # Added 2022-10-15
   push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
-  Pweave = pweave; # added 2023-02-19
-  pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
-  pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
-  py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23
+  pushbullet = throw "'pushbullet' has been renamed to/replaced by 'pushbullet-py'"; # Converted to throw 2025-10-29
+  Pweave = throw "'Pweave' has been renamed to/replaced by 'pweave'"; # Converted to throw 2025-10-29
   py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
-  pytedee-async = aiotedee; # added 2025-07-06
-  pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
-  py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
-  py_stringmatching = py-stringmatching; # added 2023-11-12
-  py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08
-  pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
-  pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
-  pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
-  pychart = throw "pychart does not support Python3"; # added 2025-03-23
-  pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
-  pydns = py3dns; # added 2024-10-25
-  pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
-  pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
-  pyephember = throw "pyephember was removed because Home Assistant switched to pyephember2"; # added 2025-05-07
-  pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11
-  pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10
-  pygame_sdl2 = pygame-sdl2; # added 2024-01-07
-  pygogo = throw "pygogo has been removed, since it is abandoned and had no maintainer"; # added 2024-07-27
-  pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20
-  PyGithub = pygithub; # added 2023-02-19
-  pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
-  pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
-  pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14
-  PyChromecast = pychromecast; # added 2023-02-19
-  pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28
-  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
-  pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17
-  pyflunearyou = pyoutbreaksnearme; # added 2023-02-11
-  pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
-  pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07
-  PyICU = pyicu; # Added 2022-12-22
-  pyhiveapi = pyhive-integration; # Added 2025-02-22
-  pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05
-  pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
-  pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
-  PyLD = pyld; # added 2022-06-22
-  pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21
-  pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
-  pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
-  pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20
-  pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16
-  pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
-  pymelcloud = python-melcloud; # added 2025-05-08
-  pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
-  PyMVGLive = pymvglive; # added 2023-02-19
-  pymyq = python-myq; # added 2023-10-20
-  pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT.";
-  python-ethtool = ethtool; # added 2024-07-23
-  python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
-  python-picnic-api = throw "python-picnic-api was removed because Home Assistant switched to python-picnic-api2"; # added 2025-03-05
-  python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
-  pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
-  pytrends = throw "pytrends has been removed, as it no longer works and is abandoned upstream"; # added 2025-02-02
-  pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
-  pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
-  pyqt5_sip = pyqt5-sip; # added 2024-01-07
-  pyqt5_with_qtmultimedia = pyqt5-multimedia; # added 2024-01-07
-  pyqt5_with_qtwebkit = pyqt5-webkit; # added 2024-01-07
-  pyramid_beaker = pyramid-beaker; # added 2023-08-23
-  pyramid_chameleon = pyramid-chameleon; # added 2023-08-23
-  pyramid_exclog = pyramid-exclog; # added 2023-08-24
-  pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2
-  pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06
-  pyramid_mako = pyramid-mako; # added 2023-08-24
-  pyramid_multiauth = pyramid-multiauth; # added 2023-08-24
-  pyreadability = readability-lxml; # added 2022-05-24
-  pyres = throw "pyres has been removed, since it is abandoned and broken"; # added 2023-06-20
-  pygeoip = throw "pygeoip has been removed, since it wash archived in April 2018"; # added 2024-07-27
-  pygeos = throw "pygeos has been removed, since it was merged with shapely 2.0"; # added 2024-05-26
-  pyreqwest-impersonate = throw "pyreqwest has been renamed to primp"; # added 2024-10-22
-  pyRFC3339 = pyrfc3339; # added 2024-01-07
-  pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ipdb = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ipset = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ndb = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-nftables = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-nslink = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-protocols = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  Pyro4 = pyro4; # added 2023-02-19
-  Pyro5 = pyro5; # added 2023-02-19
-  PyRSS2Gen = pyrss2gen; # added 2023-02-19
-  pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07
   py-scrypt = scrypt; # added 2025-08-07
-  pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
-  pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
+  py_stringmatching = throw "'py_stringmatching' has been renamed to/replaced by 'py-stringmatching'"; # Converted to throw 2025-10-29
+  pycategories = throw "'pycategories' has been removed as it was broken and unmaintained"; # added 2025-11-08
+  PyChromecast = throw "'PyChromecast' has been renamed to/replaced by 'pychromecast'"; # Converted to throw 2025-10-29
+  pydns = throw "'pydns' has been renamed to/replaced by 'py3dns'"; # Converted to throw 2025-10-29
+  pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
+  pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11
+  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
+  pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29
+  pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29
+  PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29
+  pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
+  pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29
+  pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29
+  PyICU = throw "'PyICU' has been renamed to/replaced by 'pyicu'"; # Converted to throw 2025-10-29
+  PyLD = throw "'PyLD' has been renamed to/replaced by 'pyld'"; # Converted to throw 2025-10-29
+  pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
+  pymc3 = throw "'pymc3' has been renamed to/replaced by 'pymc'"; # Converted to throw 2025-10-29
+  pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29
+  PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29
+  pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29
+  pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31
+  pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
+  pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
+  pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
+  pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
+  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been renamed to/replaced by 'pyqt5-webkit'"; # Converted to throw 2025-10-29
+  pyramid_beaker = throw "'pyramid_beaker' has been renamed to/replaced by 'pyramid-beaker'"; # Converted to throw 2025-10-29
+  pyramid_chameleon = throw "'pyramid_chameleon' has been renamed to/replaced by 'pyramid-chameleon'"; # Converted to throw 2025-10-29
+  pyramid_exclog = throw "'pyramid_exclog' has been renamed to/replaced by 'pyramid-exclog'"; # Converted to throw 2025-10-29
+  pyramid_jinja2 = throw "'pyramid_jinja2' has been renamed to/replaced by 'pyramid-jinja2'"; # Converted to throw 2025-10-29
+  pyramid_mako = throw "'pyramid_mako' has been renamed to/replaced by 'pyramid-mako'"; # Converted to throw 2025-10-29
+  pyramid_multiauth = throw "'pyramid_multiauth' has been renamed to/replaced by 'pyramid-multiauth'"; # Converted to throw 2025-10-29
+  pyreadability = throw "'pyreadability' has been renamed to/replaced by 'readability-lxml'"; # Converted to throw 2025-10-29
+  pyRFC3339 = throw "'pyRFC3339' has been renamed to/replaced by 'pyrfc3339'"; # Converted to throw 2025-10-29
+  Pyro4 = throw "'Pyro4' has been renamed to/replaced by 'pyro4'"; # Converted to throw 2025-10-29
+  Pyro5 = throw "'Pyro5' has been renamed to/replaced by 'pyro5'"; # Converted to throw 2025-10-29
+  PyRSS2Gen = throw "'PyRSS2Gen' has been renamed to/replaced by 'pyrss2gen'"; # Converted to throw 2025-10-29
   pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
   pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
-  pysmart-smartx = pysmart; # added 2021-10-22
-  pySmartDL = pysmartdl; # added 2023-10-11
-  pysmi-lextudio = pysmi; # added 2024-07-18
-  pysnmp-lextudio = pysnmp; # added 2024-07-18
-  pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28
-  pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
-  PyStemmer = pystemmer; # added 2023-02-19
-  pysuez = pysuezv2; # added 2025-03-14
-  pytado = python-tado; # added 2024-12-02
-  pytest_6 = pytest; # added 2022-02-10
-  pytestcov = pytest-cov; # added 2021-01-04
-  pytest-ordering = throw "pytest-ordering has been removed, since it is no longer maintained and broken"; # added 2023-06-22
-  pytest-openfiles = throw "pytest-openfiles has been removed, since it is unmaintained and archived"; # added 2024-06-19
-  pytest-pep8 = pytestpep8; # added 2021-01-04
-  pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12
-  pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09
-  pytest-runner = throw "pytest-runner has been removed as it uses deprecated features of setuptools and is deprecated by upstream"; # added 2024-09-15
-  pytest-sanic = throw "pytest-sanic has been removed because it is unmaintained and broken"; # added 2023-06-22
-  pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
-  pytestquickcheck = pytest-quickcheck; # added 2021-07-20
-  pytestrunner = pytest-runner; # added 2021-01-04
-  python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05
-  python-igraph = igraph; # added 2021-11-11
-  python_openzwave = python-openzwave; # added 2024-01-07
-  python-openzwave-mqtt = throw "python-openzwave was removed, as it was packaged as a dependency of home-assistant, which it is no longer."; # added 2024-01-05
-  python_docs_theme = python-docs-theme; # added 2023-11-04
-  python_fedora = python-fedora; # added 2023-11-15
-  python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16
-  python-lz4 = lz4; # added 2018-06-01
-  python_magic = python-magic; # added 2022-05-07
-  python_mimeparse = python-mimeparse; # added 2021-10-31
-  python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03
-  python-Levenshtein = levenshtein;
-  python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03
+  pysmart-smartx = throw "'pysmart-smartx' has been renamed to/replaced by 'pysmart'"; # Converted to throw 2025-10-29
+  pySmartDL = throw "'pySmartDL' has been renamed to/replaced by 'pysmartdl'"; # Converted to throw 2025-10-29
+  pysmi-lextudio = throw "'pysmi-lextudio' has been renamed to/replaced by 'pysmi'"; # Converted to throw 2025-10-29
+  pysnmp-lextudio = throw "'pysnmp-lextudio' has been renamed to/replaced by 'pysnmp'"; # Converted to throw 2025-10-29
+  PyStemmer = throw "'PyStemmer' has been renamed to/replaced by 'pystemmer'"; # Converted to throw 2025-10-29
+  pysuez = throw "'pysuez' has been renamed to/replaced by 'pysuezv2'"; # Converted to throw 2025-10-29
+  pytado = throw "'pytado' has been renamed to/replaced by 'python-tado'"; # Converted to throw 2025-10-29
+  pytedee-async = aiotedee; # added 2025-07-06
+  pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29
+  pytest_6 = throw "'pytest_6' has been renamed to/replaced by 'pytest'"; # Converted to throw 2025-10-29
+  pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2025-10-29
+  pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2025-10-29
+  pytestquickcheck = throw "'pytestquickcheck' has been renamed to/replaced by 'pytest-quickcheck'"; # Converted to throw 2025-10-29
+  pytestrunner = throw "'pytestrunner' has been renamed to/replaced by 'pytest-runner'"; # Converted to throw 2025-10-29
+  python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03
+  python-ethtool = throw "'python-ethtool' has been renamed to/replaced by 'ethtool'"; # Converted to throw 2025-10-29
+  python-igraph = throw "'python-igraph' has been renamed to/replaced by 'igraph'"; # Converted to throw 2025-10-29
+  python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29
+  python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29
   python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
-  python-subunit = subunit; # added 2021-09-10
-  python-wifi = throw "python-wifi does not support Python3";
-  pytest_xdist = pytest-xdist; # added 2021-01-04
-  python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
-  pytoml = throw "pytoml has been removed because it is unmaintained and is superseded by toml"; # Added 2023-04-11
-  pytorch = torch; # added 2022-09-30
-  pytorch-bin = torch-bin; # added 2022-09-30
-  pytorchWithCuda = torchWithCuda; # added 2022-09-30
-  pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30
-  pytwitchapi = twitchapi; # added 2022-03-07
-  pytzdata = throw "pytzdata has been removed, because iit is unmaintained upstream. Use pytz or tzdata instead."; # added 2025-03-03
-  pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09
-  pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17
-  pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28
-  pyvicare-neo = pyvicare; # Added 2024-11-06
-  pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19
-  PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
-  pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01
-  pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05
-  pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14
-  qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
-  qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22
-  qds_sdk = qds-sdk; # added 2023-10-21
-  qmk-dotty-dict = throw "qmk-dotty-dict has been removed. It is no longer needed since the fixes have been merged into dotty-dict."; # added 2025-01-01
-  Quandl = quandl; # added 2023-02-19
-  quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17
-  querystring_parser = querystring-parser; # added 2024-01-07
-  qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
-  qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
-  rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
+  python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29
+  python-u2flib-server = throw "'python-u2flib-server' has been removed, since it was broken and archived upstream"; # added 2025-11-08
+  python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
+  python_docs_theme = throw "'python_docs_theme' has been renamed to/replaced by 'python-docs-theme'"; # Converted to throw 2025-10-29
+  python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29
+  python_magic = throw "'python_magic' has been renamed to/replaced by 'python-magic'"; # Converted to throw 2025-10-29
+  python_mimeparse = throw "'python_mimeparse' has been renamed to/replaced by 'python-mimeparse'"; # Converted to throw 2025-10-29
+  python_openzwave = throw "'python_openzwave' has been renamed to/replaced by 'python-openzwave'"; # Converted to throw 2025-10-29
+  python_simple_hipchat = throw "'python_simple_hipchat' has been renamed to/replaced by 'python-simple-hipchat'"; # Converted to throw 2025-10-29
+  pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
+  pytorch = throw "'pytorch' has been renamed to/replaced by 'torch'"; # Converted to throw 2025-10-29
+  pytorch-bin = throw "'pytorch-bin' has been renamed to/replaced by 'torch-bin'"; # Converted to throw 2025-10-29
+  pytorchWithCuda = throw "'pytorchWithCuda' has been renamed to/replaced by 'torchWithCuda'"; # Converted to throw 2025-10-29
+  pytorchWithoutCuda = throw "'pytorchWithoutCuda' has been renamed to/replaced by 'torchWithoutCuda'"; # Converted to throw 2025-10-29
+  pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
+  pytwitchapi = throw "'pytwitchapi' has been renamed to/replaced by 'twitchapi'"; # Converted to throw 2025-10-29
+  pyvicare-neo = throw "'pyvicare-neo' has been renamed to/replaced by 'pyvicare'"; # Converted to throw 2025-10-29
+  PyVirtualDisplay = throw "'PyVirtualDisplay' has been renamed to/replaced by 'pyvirtualdisplay'"; # Converted to throw 2025-10-29
+  pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11
+  qds_sdk = throw "'qds_sdk' has been renamed to/replaced by 'qds-sdk'"; # Converted to throw 2025-10-29
+  Quandl = throw "'Quandl' has been renamed to/replaced by 'quandl'"; # Converted to throw 2025-10-29
+  querystring_parser = throw "'querystring_parser' has been renamed to/replaced by 'querystring-parser'"; # Converted to throw 2025-10-29
   radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
-  radicale_infcloud = radicale-infcloud; # added 2024-01-07
-  radio_beam = radio-beam; # added 2023-11-04
-  ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
-  rauth = throw "rauth has beed removed, since it is unmaintained upstream"; # added 2024-07-27
-  rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
-  readme_renderer = readme-renderer; # added 2024-01-07
-  recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20
-  recursivePthLoader = recursive-pth-loader; # added 2024-01-07
-  rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06
-  repeated_test = repeated-test; # added 2022-11-15
-  repocheck = throw "repocheck has been promoted to a top-level attribute name: `pkgs.repocheck`"; # Added 2024-11-03
-  reportengine = throw "reportengine has been removed, since it is unmaintained and broken"; # added 2024-08-21
-  repoze_lru = repoze-lru; # added 2023-11-11
-  repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11
-  repoze_who = repoze-who; # added 2023-11-11
-  requests_download = requests-download; # added 2024-01-07
-  requests_ntlm = requests-ntlm; # added 2024-01-07
-  requests_oauthlib = requests-oauthlib; # added 2022-02-12
-  requests_toolbelt = requests-toolbelt; # added 2017-09-26
-  restructuredtext_lint = restructuredtext-lint; # added 2023-11-04
-  retry_decorator = retry-decorator; # added 2024-01-07
-  retworkx = rustworkx; # added 2023-05-14
-  rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28
-  rising = throw "rising has been removed because it was abandoned and archived by upstream"; # added 2024-11-15
+  radicale_infcloud = throw "'radicale_infcloud' has been renamed to/replaced by 'radicale-infcloud'"; # Converted to throw 2025-10-29
+  radio_beam = throw "'radio_beam' has been renamed to/replaced by 'radio-beam'"; # Converted to throw 2025-10-29
+  random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17
+  readme_renderer = throw "'readme_renderer' has been renamed to/replaced by 'readme-renderer'"; # Converted to throw 2025-10-29
+  recursivePthLoader = throw "'recursivePthLoader' has been renamed to/replaced by 'recursive-pth-loader'"; # Converted to throw 2025-10-29
+  repeated_test = throw "'repeated_test' has been renamed to/replaced by 'repeated-test'"; # Converted to throw 2025-10-29
+  repoze_lru = throw "'repoze_lru' has been renamed to/replaced by 'repoze-lru'"; # Converted to throw 2025-10-29
+  repoze_sphinx_autointerface = throw "'repoze_sphinx_autointerface' has been renamed to/replaced by 'repoze-sphinx-autointerface'"; # Converted to throw 2025-10-29
+  repoze_who = throw "'repoze_who' has been renamed to/replaced by 'repoze-who'"; # Converted to throw 2025-10-29
+  requests_download = throw "'requests_download' has been renamed to/replaced by 'requests-download'"; # Converted to throw 2025-10-29
+  requests_ntlm = throw "'requests_ntlm' has been renamed to/replaced by 'requests-ntlm'"; # Converted to throw 2025-10-29
+  requests_oauthlib = throw "'requests_oauthlib' has been renamed to/replaced by 'requests-oauthlib'"; # Converted to throw 2025-10-29
+  requests_toolbelt = throw "'requests_toolbelt' has been renamed to/replaced by 'requests-toolbelt'"; # Converted to throw 2025-10-29
+  restructuredtext_lint = throw "'restructuredtext_lint' has been renamed to/replaced by 'restructuredtext-lint'"; # Converted to throw 2025-10-29
+  retry_decorator = throw "'retry_decorator' has been renamed to/replaced by 'retry-decorator'"; # Converted to throw 2025-10-29
+  retworkx = throw "'retworkx' has been renamed to/replaced by 'rustworkx'"; # Converted to throw 2025-10-29
   rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20
-  rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03
-  roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15
-  ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21
-  ROPGadget = ropgadget; # added 2021-07-06
-  rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
-  rtslib = rtslib-fb; # added 2025-03-14
+  ROPGadget = throw "'ROPGadget' has been renamed to/replaced by 'ropgadget'"; # Converted to throw 2025-10-29
+  rtslib = throw "'rtslib' has been renamed to/replaced by 'rtslib-fb'"; # Converted to throw 2025-10-29
   rtsp-to-webrtc = throw "rtsp-to-webrtc has been removed because it is unmaintained"; # added 2025-09-20
-  ruamel_base = ruamel-base; # added 2021-11-01
-  ruamel_yaml = ruamel-yaml; # added 2021-11-01
-  ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
-  ruff-lsp = throw "ruff-lsp has been deprecated, use `ruff server` instead"; # added 2025-04-21
-  runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
-  safe = throw "safe has been removed, it was unmaintained sinced October 2019"; # added 2024-07-28
-  sabyenc = throw "sabyenc has been removed, due to no updates since June 2019 and being superseded by sabyenc3"; # added 2025-05-03
-  sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27
-  sapi-python-client = kbcstorage; # added 2022-04-20
-  scikitimage = scikit-image; # added 2023-05-14
-  scikitlearn = scikit-learn; # added 2021-07-21
-  scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30
-  scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23
+  ruamel_base = throw "'ruamel_base' has been renamed to/replaced by 'ruamel-base'"; # Converted to throw 2025-10-29
+  ruamel_yaml = throw "'ruamel_yaml' has been renamed to/replaced by 'ruamel-yaml'"; # Converted to throw 2025-10-29
+  ruamel_yaml_clib = throw "'ruamel_yaml_clib' has been renamed to/replaced by 'ruamel-yaml-clib'"; # Converted to throw 2025-10-29
+  sapi-python-client = throw "'sapi-python-client' has been renamed to/replaced by 'kbcstorage'"; # Converted to throw 2025-10-29
+  schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
+  scikitimage = throw "'scikitimage' has been renamed to/replaced by 'scikit-image'"; # Converted to throw 2025-10-29
+  scikitlearn = throw "'scikitlearn' has been renamed to/replaced by 'scikit-learn'"; # Converted to throw 2025-10-29
   seaserv = throw "seaserv has been removed as it is unmaintained"; # Added 2025-08-21
-  selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27
-  selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
-  sentry-sdk_2 = sentry-sdk; # added 2025-04-20
-  sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24
-  setuptools_dso = setuptools-dso; # added 2024-03-03
-  setuptools_scm = setuptools-scm; # added 2021-06-03
-  setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0."; # added 2024-08-06
-  setuptoolsTrial = setuptools-trial; # added 2023-11-11
-  sharkiqpy = sharkiq; # added 2022-05-21
+  sentry-sdk_2 = throw "'sentry-sdk_2' has been renamed to/replaced by 'sentry-sdk'"; # Converted to throw 2025-10-29
+  setuptools_dso = throw "'setuptools_dso' has been renamed to/replaced by 'setuptools-dso'"; # Converted to throw 2025-10-29
+  setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2025-10-29
+  setuptoolsTrial = throw "'setuptoolsTrial' has been renamed to/replaced by 'setuptools-trial'"; # Converted to throw 2025-10-29
+  sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29
   shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
-  shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12
-  sip_4 = sip4; # added 2024-01-07
-  slackclient = slack-sdk; # added 2024-06-27
-  slimit = throw "slimit was removed, because it was an unused and broken leaf package last updated in 2018."; # added 2025-05-17
-  ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09
-  smart_open = smart-open; # added 2021-03-14
-  smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
-  smpp_pdu = smpp-pdu; # added 2024-03-05
-  somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01
-  sonarr = throw "sonarr has been deprecated and removed"; # added 2025-01-13
-  solaredge = throw "solaredge was removed because Home Assistant switched to aiosolaredge"; # added 2024-07-15
-  sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
-  spacy_models = spacy-models; # added 2024-04-21
-  SPARQLWrapper = sparqlwrapper;
-  spark_parser = spark-parser; # added 2024-01-07
+  sip_4 = throw "'sip_4' has been renamed to/replaced by 'sip4'"; # Converted to throw 2025-10-29
+  slackclient = throw "'slackclient' has been renamed to/replaced by 'slack-sdk'"; # Converted to throw 2025-10-29
+  smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2025-10-29
+  smpp_pdu = throw "'smpp_pdu' has been renamed to/replaced by 'smpp-pdu'"; # Converted to throw 2025-10-29
+  sorl_thumbnail = throw "'sorl_thumbnail' has been renamed to/replaced by 'sorl-thumbnail'"; # Converted to throw 2025-10-29
+  spacy_models = throw "'spacy_models' has been renamed to/replaced by 'spacy-models'"; # Converted to throw 2025-10-29
+  spark_parser = throw "'spark_parser' has been renamed to/replaced by 'spark-parser'"; # Converted to throw 2025-10-29
+  SPARQLWrapper = throw "'SPARQLWrapper' has been renamed to/replaced by 'sparqlwrapper'"; # Converted to throw 2025-10-29
   sparsezoo = throw "sparsezoo has been removed since it is abandonned"; # added 2025-09-01
-  sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24
-  sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11
-  sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03
-  sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02-28
-  sphinxcontrib_httpdomain = sphinxcontrib-httpdomain; # added 2023-07-20
-  sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20
-  sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
-  sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03
-  sqlalchemy-migrate = throw "sqlalchemy-migrate has been removed because it is abandoned upstream and incompatible with SQLAlchemy 2"; # added 2024-07-29
-  sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
-  SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
-  sqlsoup = throw "sqlsoup has been removed as it is incompatible with modern SQLAlchemy and unmaintained"; # added 2024-05-13
-  subdownloader = throw "subdownloader has been removed, because it depended on pyqt4"; # added 2022-06-09
+  sphinx-jquery = throw "'sphinx-jquery' has been renamed to/replaced by 'sphinxcontrib-jquery'"; # Converted to throw 2025-10-29
+  sphinx_rtd_theme = throw "'sphinx_rtd_theme' has been renamed to/replaced by 'sphinx-rtd-theme'"; # Converted to throw 2025-10-29
+  sphinxcontrib-autoapi = throw "'sphinxcontrib-autoapi' has been renamed to/replaced by 'sphinx-autoapi'"; # Converted to throw 2025-10-29
+  sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29
+  sphinxcontrib_newsfeed = throw "'sphinxcontrib_newsfeed' has been renamed to/replaced by 'sphinxcontrib-newsfeed'"; # Converted to throw 2025-10-29
+  sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2025-10-29
+  sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29
   subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27
-  supervise_api = supervise-api; # added 2023-10-11
-  suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
-  synologydsm-api = py-synologydsm-api; # added 2024-07-29
-  sysv_ipc = sysv-ipc; # added 2024-01-07
-  telegram = throw "telegram has been removed since it is abandoned"; # added 2024-11-06
-  tempita = throw "tempita has been removed because it is unmaintained and the upstream repository is gone"; # added 2024-07-29
-  tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
-  tensorflow-build_2 = tensorflow-build; # added 2021-11-25
-  tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17
-  tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
-  tensorflow-tensorboard = tensorboard; # added 2022-03-06
-  tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
+  supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29
+  synologydsm-api = throw "'synologydsm-api' has been renamed to/replaced by 'py-synologydsm-api'"; # Converted to throw 2025-10-29
+  sysv_ipc = throw "'sysv_ipc' has been renamed to/replaced by 'sysv-ipc'"; # Converted to throw 2025-10-29
+  tensorflow-bin_2 = throw "'tensorflow-bin_2' has been renamed to/replaced by 'tensorflow-bin'"; # Converted to throw 2025-10-29
+  tensorflow-build_2 = throw "'tensorflow-build_2' has been renamed to/replaced by 'tensorflow-build'"; # Converted to throw 2025-10-29
+  tensorflow-estimator = throw "'tensorflow-estimator' has been renamed to/replaced by 'tensorflow-estimator-bin'"; # Converted to throw 2025-10-29
+  tensorflow-estimator_2 = throw "'tensorflow-estimator_2' has been renamed to/replaced by 'tensorflow-estimator'"; # Converted to throw 2025-10-29
+  tensorflow-tensorboard = throw "'tensorflow-tensorboard' has been renamed to/replaced by 'tensorboard'"; # Converted to throw 2025-10-29
+  tensorflow-tensorboard_2 = throw "'tensorflow-tensorboard_2' has been renamed to/replaced by 'tensorflow-tensorboard'"; # Converted to throw 2025-10-29
   testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25
-  tilestache = throw "tilestache is unmaintained and Python3 compatibility is unknown"; # Added 2025-03-23
-  Theano = theano; # added 2023-02-19
-  TheanoWithCuda = theanoWithCuda; # added 2023-02-19
-  TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19
-  theano = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
-  theanoWithCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
-  theanoWithoutCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
-  theano-pymc = throw "theano-pymc has been removed because it is no longer maintained"; # added 2024-05-20
-  thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07
-  tissue = throw "tissue has been removed, because it is archived since October 2022"; # added 2024-07-27
-  torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18
-  tornado_4 = throw "tornado_4 has been removed, use tornado instead"; # added 2025-01-13
-  tornado_5 = throw "tornado_5 has been removed, use tornado instead"; # added 2025-01-13
-  torrent_parser = torrent-parser; # added 2023-11-04
-  transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27
-  py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20
-  transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12
-  trezor_agent = trezor-agent; # Added 2024-01-07
-  tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
-  tvdb_api = tvdb-api; # added 2023-10-20
-  tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
-  twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14
+  Theano = throw "'Theano' has been renamed to/replaced by 'theano'"; # Converted to throw 2025-10-29
+  TheanoWithCuda = throw "'TheanoWithCuda' has been renamed to/replaced by 'theanoWithCuda'"; # Converted to throw 2025-10-29
+  TheanoWithoutCuda = throw "'TheanoWithoutCuda' has been renamed to/replaced by 'theanoWithoutCuda'"; # Converted to throw 2025-10-29
+  torrent_parser = throw "'torrent_parser' has been renamed to/replaced by 'torrent-parser'"; # Converted to throw 2025-10-29
+  treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
+  treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
+  trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-29
+  tvdb_api = throw "'tvdb_api' has been renamed to/replaced by 'tvdb-api'"; # Converted to throw 2025-10-29
   typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
-  types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
-  types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
-  types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
   types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
   uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
-  ufoLib2 = ufolib2; # added 2024-01-07
-  ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
-  unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
+  ufoLib2 = throw "'ufoLib2' has been renamed to/replaced by 'ufolib2'"; # Converted to throw 2025-10-29
   unicode-slugify = throw "'unicode-slugify' has been removed becaues it was broken and unmaintained. Consider using 'python-slugify' instead."; # added 2025-10-05
   unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25
-  unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
-  update_checker = update-checker; # added 2024-01-07
-  uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
-  uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
-  urwid-mitmproxy-mitmproxy = throw "urwid-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-07-26
-  uuid = throw "uuid is a Python standard module"; # added 2024-04-18
-  validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
-  validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07
+  update_checker = throw "'update_checker' has been renamed to/replaced by 'update-checker'"; # Converted to throw 2025-10-29
   vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
-  vega_datasets = vega-datasets; # added 2023-11-04
-  ViennaRNA = viennarna; # added 2023-08-23
-  virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
+  vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29
+  ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29
   vulcan-api = throw "vulcan-api has been removed. Their API has changed and they don't allow access from unofficial software anymore."; # added 2025-09-05
-  Wand = wand; # added 2022-11-13
-  wasm = throw "wasm has been removed because it no longer builds and is unmaintained"; # added 2023-05-20
-  WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
-  weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
-  webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
-  weboob = throw "weboob has been removed, please use woob instead"; # added 2024-07-27
-  webhelpers = throw "webhelpers has been removed because it is unmaintained and upstream is gone"; # added 2024-07-27
-  websocket_client = websocket-client; # added 2021-06-15
-  word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
-  wsnsimpy = throw "wsnsimpy has been removed, it was unmaintained and no more compatible with Python 3.12"; # added 2025-04-01
-  wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19
-  wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19
-  wxPython_4_2 = wxpython; # added 2024-01-07
-  WSME = wsme; # added 2023-02-19
-  x11_hash = x11-hash; # added 2023-11-05
-  xapp = python-xapp; # added 2024-07-19
-  xarray-datatree = throw "Datatree has been merged upstream into pydata/xarray, and released as of xarray version 2024.10.0."; # added 2024-11-02
-  xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
-  XlsxWriter = xlsxwriter; # added 2023-02-19
-  yahooweather = throw "yahooweather has been removed because it is no longer maintained"; # added 2025-01-13
-  xsser = "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27
-  Yapsy = yapsy; # added 2023-02-19
-  yanc = throw "yanc has been removed because it relies on nose"; # added 2024-07-27
-  z3 = z3-solver; # added 2023-12-03
-  zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20
-  zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";
-  zc-buildout221 = zc-buildout; # added 2021-07-21
-  zc_lockfile = zc-lockfile; # added 2024-01-06
-  zcs = throw "zcs was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08
-  zipstream = throw "zipstream has been removed, because it has been unmaintained for 6 years and there are no dependent packages"; # added 2024-05-26
-  zipstream-new = throw "zipstream-new has been removed, because it  was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05
-  zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26
-  zope_component = zope-component; # added 2023-07-28
-  zope_configuration = zope-configuration; # added 2023-11-12
-  zope_contenttype = zope-contenttype; # added 2023-10-11
-  zope_copy = zope-copy; # added 2024-01-06
-  zope_deprecation = zope-deprecation; # added 2023-10-07
-  zope_dottedname = zope-dottedname; # added 2023-11-12
-  zope_event = zope-event; # added 2024-01-06
-  zope_exceptions = zope-exceptions; # added 2023-10-11
-  zope_filerepresentation = zope-filerepresentation; # added 2024-01-06
-  zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
-  zope_interface = zope-interface; # added 2024-01-06
-  zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
-  zope_location = zope-location; # added 2024-01-06
-  zope_proxy = zope-proxy; # added 2023-10-07
-  zope_schema = zope-schema; # added 2024-01-06
-  zope_size = zope-size; # added 2024-01-06
-  zope_testing = zope-testing; # added 2023-11-12
-  zope_testrunner = zope-testrunner; # added 2024-01-06
-  zxing_cpp = zxing-cpp; # added 2023-11-05
+  Wand = throw "'Wand' has been renamed to/replaced by 'wand'"; # Converted to throw 2025-10-29
+  WazeRouteCalculator = throw "'WazeRouteCalculator' has been renamed to/replaced by 'wazeroutecalculator'"; # Converted to throw 2025-10-29
+  websocket_client = throw "'websocket_client' has been renamed to/replaced by 'websocket-client'"; # Converted to throw 2025-10-29
+  worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
+  WSME = throw "'WSME' has been renamed to/replaced by 'wsme'"; # Converted to throw 2025-10-29
+  wxPython_4_2 = throw "'wxPython_4_2' has been renamed to/replaced by 'wxpython'"; # Converted to throw 2025-10-29
+  x11_hash = throw "'x11_hash' has been renamed to/replaced by 'x11-hash'"; # Converted to throw 2025-10-29
+  xapp = throw "'xapp' has been renamed to/replaced by 'python-xapp'"; # Converted to throw 2025-10-29
+  XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29
+  Yapsy = throw "'Yapsy' has been renamed to/replaced by 'yapsy'"; # Converted to throw 2025-10-29
+  z3 = throw "'z3' has been renamed to/replaced by 'z3-solver'"; # Converted to throw 2025-10-29
+  zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2025-10-29
+  zc_lockfile = throw "'zc_lockfile' has been renamed to/replaced by 'zc-lockfile'"; # Converted to throw 2025-10-29
+  zope_component = throw "'zope_component' has been renamed to/replaced by 'zope-component'"; # Converted to throw 2025-10-29
+  zope_configuration = throw "'zope_configuration' has been renamed to/replaced by 'zope-configuration'"; # Converted to throw 2025-10-29
+  zope_contenttype = throw "'zope_contenttype' has been renamed to/replaced by 'zope-contenttype'"; # Converted to throw 2025-10-29
+  zope_copy = throw "'zope_copy' has been renamed to/replaced by 'zope-copy'"; # Converted to throw 2025-10-29
+  zope_deprecation = throw "'zope_deprecation' has been renamed to/replaced by 'zope-deprecation'"; # Converted to throw 2025-10-29
+  zope_dottedname = throw "'zope_dottedname' has been renamed to/replaced by 'zope-dottedname'"; # Converted to throw 2025-10-29
+  zope_event = throw "'zope_event' has been renamed to/replaced by 'zope-event'"; # Converted to throw 2025-10-29
+  zope_exceptions = throw "'zope_exceptions' has been renamed to/replaced by 'zope-exceptions'"; # Converted to throw 2025-10-29
+  zope_filerepresentation = throw "'zope_filerepresentation' has been renamed to/replaced by 'zope-filerepresentation'"; # Converted to throw 2025-10-29
+  zope_i18nmessageid = throw "'zope_i18nmessageid' has been renamed to/replaced by 'zope-i18nmessageid'"; # Converted to throw 2025-10-29
+  zope_interface = throw "'zope_interface' has been renamed to/replaced by 'zope-interface'"; # Converted to throw 2025-10-29
+  zope_lifecycleevent = throw "'zope_lifecycleevent' has been renamed to/replaced by 'zope-lifecycleevent'"; # Converted to throw 2025-10-29
+  zope_location = throw "'zope_location' has been renamed to/replaced by 'zope-location'"; # Converted to throw 2025-10-29
+  zope_proxy = throw "'zope_proxy' has been renamed to/replaced by 'zope-proxy'"; # Converted to throw 2025-10-29
+  zope_schema = throw "'zope_schema' has been renamed to/replaced by 'zope-schema'"; # Converted to throw 2025-10-29
+  zope_size = throw "'zope_size' has been renamed to/replaced by 'zope-size'"; # Converted to throw 2025-10-29
+  zope_testing = throw "'zope_testing' has been renamed to/replaced by 'zope-testing'"; # Converted to throw 2025-10-29
+  zope_testrunner = throw "'zope_testrunner' has been renamed to/replaced by 'zope-testrunner'"; # Converted to throw 2025-10-29
+  zxing_cpp = throw "'zxing_cpp' has been renamed to/replaced by 'zxing-cpp'"; # Converted to throw 2025-10-29
+  # keep-sorted end
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59c777b281b3..cc52245960af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -59,6 +59,8 @@ self: super: with self; {
 
   actdiag = callPackage ../development/python-modules/actdiag { };
 
+  actron-neo-api = callPackage ../development/python-modules/actron-neo-api { };
+
   acunetix = callPackage ../development/python-modules/acunetix { };
 
   adafruit-board-toolkit = callPackage ../development/python-modules/adafruit-board-toolkit { };
@@ -124,6 +126,8 @@ self: super: with self; {
 
   affine-gaps = callPackage ../development/python-modules/affine-gaps { };
 
+  affinegap = callPackage ../development/python-modules/affinegap { };
+
   afsapi = callPackage ../development/python-modules/afsapi { };
 
   agate = callPackage ../development/python-modules/agate { };
@@ -176,6 +180,8 @@ self: super: with self; {
 
   aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
 
+  aio-ownet = callPackage ../development/python-modules/aio-ownet { };
+
   aio-pika = callPackage ../development/python-modules/aio-pika { };
 
   aioacaia = callPackage ../development/python-modules/aioacaia { };
@@ -294,6 +300,8 @@ self: super: with self; {
 
   aiohomematic = callPackage ../development/python-modules/aiohomematic { };
 
+  aiohomematic-test-support = callPackage ../development/python-modules/aiohomematic-test-support { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
   aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };
@@ -594,12 +602,7 @@ self: super: with self; {
 
   algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { };
 
-  aligator = toPythonModule (
-    pkgs.aligator.override {
-      python3Packages = self;
-      pythonSupport = true;
-    }
-  );
+  aligator = callPackage ../development/python-modules/aligator { inherit (pkgs) aligator; };
 
   alive-progress = callPackage ../development/python-modules/alive-progress { };
 
@@ -651,8 +654,6 @@ self: super: with self; {
 
   amazon-ion = callPackage ../development/python-modules/amazon-ion { };
 
-  amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { };
-
   amberelectric = callPackage ../development/python-modules/amberelectric { };
 
   amcrest = callPackage ../development/python-modules/amcrest { };
@@ -801,6 +802,8 @@ self: super: with self; {
 
   appium-python-client = callPackage ../development/python-modules/appium-python-client { };
 
+  apple-compress = callPackage ../development/python-modules/apple-compress { };
+
   apple-weatherkit = callPackage ../development/python-modules/apple-weatherkit { };
 
   applicationinsights = callPackage ../development/python-modules/applicationinsights { };
@@ -1001,8 +1004,6 @@ self: super: with self; {
 
   astropy = callPackage ../development/python-modules/astropy { };
 
-  astropy-extension-helpers = callPackage ../development/python-modules/astropy-extension-helpers { };
-
   astropy-healpix = callPackage ../development/python-modules/astropy-healpix { };
 
   astropy-helpers = callPackage ../development/python-modules/astropy-helpers { };
@@ -1019,8 +1020,6 @@ self: super: with self; {
 
   asyauth = callPackage ../development/python-modules/asyauth { };
 
-  asyauth-bad = callPackage ../development/python-modules/asyauth-bad { };
-
   async-cache = callPackage ../development/python-modules/async-cache { };
 
   async-dns = callPackage ../development/python-modules/async-dns { };
@@ -1687,12 +1686,24 @@ self: super: with self; {
 
   backports-tarfile = callPackage ../development/python-modules/backports-tarfile { };
 
+  backports-zstd =
+    if pythonAtLeast "3.14" then
+      null
+    else
+      callPackage ../development/python-modules/backports-zstd {
+        inherit (pkgs) zstd;
+      };
+
   backrefs = callPackage ../development/python-modules/backrefs { };
 
   backtesting = callPackage ../development/python-modules/backtesting { };
 
   bacpypes = callPackage ../development/python-modules/bacpypes { };
 
+  badauth = callPackage ../development/python-modules/badauth { };
+
+  badldap = callPackage ../development/python-modules/badldap { };
+
   badsecrets = callPackage ../development/python-modules/badsecrets { };
 
   bagit = callPackage ../development/python-modules/bagit { };
@@ -1841,7 +1852,21 @@ self: super: with self; {
 
   beetcamp = callPackage ../development/python-modules/beetcamp { };
 
-  beets = toPythonModule (pkgs.beets.override { python3Packages = self; });
+  beets = callPackage ../development/python-modules/beets {
+    inherit (pkgs) chromaprint;
+  };
+
+  beets-alternatives = callPackage ../development/python-modules/beets-alternatives { };
+
+  beets-audible = callPackage ../development/python-modules/beets-audible { };
+
+  beets-copyartifacts = callPackage ../development/python-modules/beets-copyartifacts { };
+
+  beets-filetote = callPackage ../development/python-modules/beets-filetote { };
+
+  beets-minimal = beets.override {
+    disableAllPlugins = true;
+  };
 
   beewi-smartclim = callPackage ../development/python-modules/beewi-smartclim { };
 
@@ -2402,6 +2427,8 @@ self: super: with self; {
     };
   };
 
+  categorical-distance = callPackage ../development/python-modules/categorical-distance { };
+
   catkin-pkg = callPackage ../development/python-modules/catkin-pkg { };
 
   catppuccin = callPackage ../development/python-modules/catppuccin { };
@@ -2480,7 +2507,7 @@ self: super: with self; {
 
   cffconvert = callPackage ../development/python-modules/cffconvert { };
 
-  cffi = callPackage ../development/python-modules/cffi { };
+  cffi = if isPyPy then null else callPackage ../development/python-modules/cffi { };
 
   cffsubr = callPackage ../development/python-modules/cffsubr { };
 
@@ -2560,6 +2587,8 @@ self: super: with self; {
 
   chex = callPackage ../development/python-modules/chex { };
 
+  chipwhisperer = callPackage ../development/python-modules/chipwhisperer { };
+
   chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
 
   chispa = callPackage ../development/python-modules/chispa { };
@@ -2704,6 +2733,13 @@ self: super: with self; {
 
   clikit = callPackage ../development/python-modules/clikit { };
 
+  clingo = toPythonModule (
+    pkgs.clingo.override {
+      inherit python;
+      withPython = true;
+    }
+  );
+
   clint = callPackage ../development/python-modules/clint { };
 
   clintermission = callPackage ../development/python-modules/clintermission { };
@@ -2774,12 +2810,7 @@ self: super: with self; {
 
   co2signal = callPackage ../development/python-modules/co2signal { };
 
-  coal = toPythonModule (
-    pkgs.coal.override {
-      pythonSupport = true;
-      python3Packages = self;
-    }
-  );
+  coal = callPackage ../development/python-modules/coal { inherit (pkgs) coal; };
 
   coapthon3 = callPackage ../development/python-modules/coapthon3 { };
 
@@ -2853,6 +2884,8 @@ self: super: with self; {
 
   collidoscope = callPackage ../development/python-modules/collidoscope { };
 
+  color-matcher = callPackage ../development/python-modules/color-matcher { };
+
   color-operations = callPackage ../development/python-modules/color-operations { };
 
   color-parser-py = callPackage ../development/python-modules/color-parser-py { };
@@ -2891,6 +2924,8 @@ self: super: with self; {
 
   colout = callPackage ../development/python-modules/colout { };
 
+  columnize = callPackage ../development/python-modules/columnize { };
+
   comet-ml = callPackage ../development/python-modules/comet-ml { };
 
   cometblue-lite = callPackage ../development/python-modules/cometblue-lite { };
@@ -2917,6 +2952,8 @@ self: super: with self; {
 
   commonregex = callPackage ../development/python-modules/commonregex { };
 
+  compit-inext-api = callPackage ../development/python-modules/compit-inext-api { };
+
   compliance-trestle = callPackage ../development/python-modules/compliance-trestle { };
 
   complycube = callPackage ../development/python-modules/complycube { };
@@ -3113,12 +3150,7 @@ self: super: with self; {
 
   crochet = callPackage ../development/python-modules/crochet { };
 
-  crocoddyl = toPythonModule (
-    pkgs.crocoddyl.override {
-      pythonSupport = true;
-      python3Packages = self;
-    }
-  );
+  crocoddyl = callPackage ../development/python-modules/crocoddyl { inherit (pkgs) crocoddyl; };
 
   cron-converter = callPackage ../development/python-modules/cron-converter { };
 
@@ -3200,16 +3232,24 @@ self: super: with self; {
 
   cu2qu = callPackage ../development/python-modules/cu2qu { };
 
+  cucumber-expressions = callPackage ../development/python-modules/cucumber-expressions { };
+
   cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
 
   cupy = callPackage ../development/python-modules/cupy {
-    cudaPackages = pkgs.cudaPackages.overrideScope (
-      cu-fi: _: {
-        # CuDNN 9 is not supported:
-        # https://github.com/cupy/cupy/issues/8215
-        cudnn = cu-fi.cudnn_8_9;
-      }
-    );
+    cudaPackages =
+      # CuDNN 9 is not supported:
+      # https://github.com/cupy/cupy/issues/8215
+      # NOTE: cupy 14 will drop support for cuDNN entirely.
+      # https://github.com/cupy/cupy/pull/9326
+      let
+        version = if pkgs.cudaPackages.backendStdenv.hasJetsonCudaCapability then "8.9.5" else "8.9.7";
+      in
+      pkgs.cudaPackages.override (prevArgs: {
+        manifests = prevArgs.manifests // {
+          cudnn = pkgs._cuda.manifests.cudnn.${version};
+        };
+      });
   };
 
   curated-tokenizers = callPackage ../development/python-modules/curated-tokenizers { };
@@ -3545,6 +3585,12 @@ self: super: with self; {
 
   decorator = callPackage ../development/python-modules/decorator { };
 
+  dedupe = callPackage ../development/python-modules/dedupe { };
+
+  dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { };
+
+  dedupe-pylbfgs = callPackage ../development/python-modules/dedupe-pylbfgs { };
+
   deebot-client = callPackage ../development/python-modules/deebot-client { };
 
   deemix = callPackage ../development/python-modules/deemix { };
@@ -3649,6 +3695,8 @@ self: super: with self; {
 
   detectron2 = callPackage ../development/python-modules/detectron2 { };
 
+  developer-disk-image = callPackage ../development/python-modules/developer-disk-image { };
+
   devgoldyutils = callPackage ../development/python-modules/devgoldyutils { };
 
   devialet = callPackage ../development/python-modules/devialet { };
@@ -3823,6 +3871,8 @@ self: super: with self; {
 
   distro = callPackage ../development/python-modules/distro { };
 
+  distro-info = callPackage ../development/python-modules/distro-info { };
+
   distutils =
     if pythonOlder "3.12" then null else callPackage ../development/python-modules/distutils { };
 
@@ -4075,6 +4125,8 @@ self: super: with self; {
 
   django-polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
+  django-postgres-extra = callPackage ../development/python-modules/django-postgres-extra { };
+
   django-postgres-partition = callPackage ../development/python-modules/django-postgres-partition { };
 
   django-postgresql-netfields =
@@ -4165,6 +4217,8 @@ self: super: with self; {
 
   django-treebeard = callPackage ../development/python-modules/django-treebeard { };
 
+  django-treenode = callPackage ../development/python-modules/django-treenode { };
+
   django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { };
 
   django-types = callPackage ../development/python-modules/django-types { };
@@ -4378,6 +4432,8 @@ self: super: with self; {
 
   dotwiz = callPackage ../development/python-modules/dotwiz { };
 
+  doublemetaphone = callPackage ../development/python-modules/doublemetaphone { };
+
   doubleratchet = callPackage ../development/python-modules/doubleratchet { };
 
   doubles = callPackage ../development/python-modules/doubles { };
@@ -4490,8 +4546,6 @@ self: super: with self; {
 
   duckdb-engine = callPackage ../development/python-modules/duckdb-engine { };
 
-  duckduckgo-search = callPackage ../development/python-modules/duckduckgo-search { };
-
   duct-py = callPackage ../development/python-modules/duct-py { };
 
   duden = callPackage ../development/python-modules/duden { };
@@ -4681,8 +4735,6 @@ self: super: with self; {
 
   electrum-ecc = callPackage ../development/python-modules/electrum-ecc { };
 
-  elegy = callPackage ../development/python-modules/elegy { };
-
   elementpath = callPackage ../development/python-modules/elementpath { };
 
   elevate = callPackage ../development/python-modules/elevate { };
@@ -4903,12 +4955,9 @@ self: super: with self; {
 
   ewmhlib = callPackage ../development/python-modules/ewmhlib { };
 
-  example-robot-data = toPythonModule (
-    pkgs.example-robot-data.override {
-      pythonSupport = true;
-      python3Packages = self;
-    }
-  );
+  example-robot-data = callPackage ../development/python-modules/example-robot-data {
+    inherit (pkgs) example-robot-data;
+  };
 
   exceptiongroup = callPackage ../development/python-modules/exceptiongroup { };
 
@@ -5147,8 +5196,6 @@ self: super: with self; {
 
   favicon = callPackage ../development/python-modules/favicon { };
 
-  fb-re2 = callPackage ../development/python-modules/fb-re2 { };
-
   fe25519 = callPackage ../development/python-modules/fe25519 { };
 
   feather-format = callPackage ../development/python-modules/feather-format { };
@@ -6245,8 +6292,6 @@ self: super: with self; {
 
   gower = callPackage ../development/python-modules/gower { };
 
-  gpapi = callPackage ../development/python-modules/gpapi { };
-
   gpaw = callPackage ../development/python-modules/gpaw { };
 
   gpgme = callPackage ../development/python-modules/gpgme { inherit (pkgs) gpgme; };
@@ -6257,8 +6302,6 @@ self: super: with self; {
 
   gpiozero = callPackage ../development/python-modules/gpiozero { };
 
-  gplaycli = callPackage ../development/python-modules/gplaycli { };
-
   gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; };
 
   gps3 = callPackage ../development/python-modules/gps3 { };
@@ -6570,6 +6613,8 @@ self: super: with self; {
 
   hatch-requirements-txt = callPackage ../development/python-modules/hatch-requirements-txt { };
 
+  hatch-sphinx = callPackage ../development/python-modules/hatch-sphinx { };
+
   hatch-vcs = callPackage ../development/python-modules/hatch-vcs { };
 
   hatchling = callPackage ../development/python-modules/hatchling { };
@@ -6662,6 +6707,8 @@ self: super: with self; {
 
   highdicom = callPackage ../development/python-modules/highdicom { };
 
+  highered = callPackage ../development/python-modules/highered { };
+
   highspy = callPackage ../development/python-modules/highspy { };
 
   hightime = callPackage ../development/python-modules/hightime { };
@@ -6686,6 +6733,8 @@ self: super: with self; {
 
   histoprint = callPackage ../development/python-modules/histoprint { };
 
+  hive-metastore-client = callPackage ../development/python-modules/hive-metastore-client { };
+
   hiyapyco = callPackage ../development/python-modules/hiyapyco { };
 
   hjson = callPackage ../development/python-modules/hjson { };
@@ -6898,6 +6947,8 @@ self: super: with self; {
 
   hyperframe = callPackage ../development/python-modules/hyperframe { };
 
+  hyperglot = callPackage ../development/python-modules/hyperglot { };
+
   hyperion-py = callPackage ../development/python-modules/hyperion-py { };
 
   hyperlink = callPackage ../development/python-modules/hyperlink { };
@@ -7151,6 +7202,8 @@ self: super: with self; {
 
   inquirer = callPackage ../development/python-modules/inquirer { };
 
+  inquirer3 = callPackage ../development/python-modules/inquirer3 { };
+
   inquirerpy = callPackage ../development/python-modules/inquirerpy { };
 
   inscriptis = callPackage ../development/python-modules/inscriptis { };
@@ -7235,6 +7288,8 @@ self: super: with self; {
 
   iplotx = callPackage ../development/python-modules/iplotx { };
 
+  ipsw-parser = callPackage ../development/python-modules/ipsw-parser { };
+
   iptools = callPackage ../development/python-modules/iptools { };
 
   ipv8-rust-tunnels = callPackage ../development/python-modules/ipv8-rust-tunnels { };
@@ -7827,6 +7882,8 @@ self: super: with self; {
 
   keras = callPackage ../development/python-modules/keras { };
 
+  kerbad = callPackage ../development/python-modules/kerbad { };
+
   kerberos = callPackage ../development/python-modules/kerberos { };
 
   kernels = callPackage ../development/python-modules/kernels { };
@@ -7936,6 +7993,8 @@ self: super: with self; {
 
   kserve = callPackage ../development/python-modules/kserve { };
 
+  kserve-storage = callPackage ../development/python-modules/kserve-storage { };
+
   kubernetes = callPackage ../development/python-modules/kubernetes { };
 
   kubernetes-asyncio = callPackage ../development/python-modules/kubernetes-asyncio { };
@@ -7948,6 +8007,8 @@ self: super: with self; {
 
   l18n = callPackage ../development/python-modules/l18n { };
 
+  la-panic = callPackage ../development/python-modules/la-panic { };
+
   labelbox = callPackage ../development/python-modules/labelbox { };
 
   labgrid = callPackage ../development/python-modules/labgrid { };
@@ -7964,6 +8025,12 @@ self: super: with self; {
 
   lammps = callPackage ../development/python-modules/lammps { inherit (pkgs) lammps; };
 
+  lance-namespace = callPackage ../development/python-modules/lance-namespace { };
+
+  lance-namespace-urllib3-client =
+    callPackage ../development/python-modules/lance-namespace-urllib3-client
+      { };
+
   lancedb = callPackage ../development/python-modules/lancedb { inherit (pkgs) protobuf; };
 
   langchain = callPackage ../development/python-modules/langchain { };
@@ -8149,7 +8216,8 @@ self: super: with self; {
 
   legacy-api-wrap = callPackage ../development/python-modules/legacy-api-wrap { };
 
-  legacy-cgi = callPackage ../development/python-modules/legacy-cgi { };
+  legacy-cgi =
+    if pythonOlder "3.13" then null else callPackage ../development/python-modules/legacy-cgi { };
 
   leidenalg = callPackage ../development/python-modules/leidenalg { igraph-c = pkgs.igraph; };
 
@@ -8347,6 +8415,8 @@ self: super: with self; {
     }
   );
 
+  librehardwaremonitor-api = callPackage ../development/python-modules/librehardwaremonitor-api { };
+
   librepo = lib.pipe pkgs.librepo [
     toPythonModule
     (
@@ -8886,6 +8956,8 @@ self: super: with self; {
 
   lunarcalendar = callPackage ../development/python-modules/lunarcalendar { };
 
+  lunatone-rest-api-client = callPackage ../development/python-modules/lunatone-rest-api-client { };
+
   lupa = callPackage ../development/python-modules/lupa { };
 
   lupupy = callPackage ../development/python-modules/lupupy { };
@@ -8902,14 +8974,14 @@ self: super: with self; {
 
   lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { };
 
-  lxml-stubs = callPackage ../development/python-modules/lxml-stubs { };
-
   lyricwikia = callPackage ../development/python-modules/lyricwikia { };
 
   lz4 = callPackage ../development/python-modules/lz4 { };
 
   lzallright = callPackage ../development/python-modules/lzallright { };
 
+  lzfse = callPackage ../development/python-modules/lzfse { };
+
   lzstring = callPackage ../development/python-modules/lzstring { };
 
   m2crypto = callPackage ../development/python-modules/m2crypto { };
@@ -9080,8 +9152,6 @@ self: super: with self; {
 
   mathutils = callPackage ../development/python-modules/mathutils { };
 
-  matlink-gpapi = callPackage ../development/python-modules/matlink-gpapi { };
-
   matplotlib = callPackage ../development/python-modules/matplotlib {
     stdenv = if stdenv.hostPlatform.isDarwin then pkgs.clangStdenv else pkgs.stdenv;
   };
@@ -9278,8 +9348,6 @@ self: super: with self; {
 
   meson-python = callPackage ../development/python-modules/meson-python { inherit (pkgs) ninja; };
 
-  mesonpep517 = callPackage ../development/python-modules/mesonpep517 { };
-
   messagebird = callPackage ../development/python-modules/messagebird { };
 
   metaflow = callPackage ../development/python-modules/metaflow { };
@@ -9290,6 +9358,8 @@ self: super: with self; {
 
   metawear = callPackage ../development/python-modules/metawear { };
 
+  meteo-lt-pkg = callPackage ../development/python-modules/meteo-lt-pkg { };
+
   meteoalertapi = callPackage ../development/python-modules/meteoalertapi { };
 
   meteocalc = callPackage ../development/python-modules/meteocalc { };
@@ -9372,12 +9442,7 @@ self: super: with self; {
 
   millheater = callPackage ../development/python-modules/millheater { };
 
-  mim-solvers = toPythonModule (
-    pkgs.mim-solvers.override {
-      python3Packages = self;
-      pythonSupport = true;
-    }
-  );
+  mim-solvers = callPackage ../development/python-modules/mim-solvers { inherit (pkgs) mim-solvers; };
 
   minari = callPackage ../development/python-modules/minari { };
 
@@ -9401,8 +9466,6 @@ self: super: with self; {
 
   minikerberos = callPackage ../development/python-modules/minikerberos { };
 
-  minikerberos-bad = callPackage ../development/python-modules/minikerberos-bad { };
-
   minimal-snowplow-tracker = callPackage ../development/python-modules/minimal-snowplow-tracker { };
 
   minimock = callPackage ../development/python-modules/minimock { };
@@ -9759,6 +9822,8 @@ self: super: with self; {
 
   mpris-server = callPackage ../development/python-modules/mpris-server { };
 
+  mprisify = callPackage ../development/python-modules/mprisify { };
+
   mpv = callPackage ../development/python-modules/mpv { inherit (pkgs) mpv; };
 
   mpyq = callPackage ../development/python-modules/mpyq { };
@@ -9793,8 +9858,6 @@ self: super: with self; {
 
   msldap = callPackage ../development/python-modules/msldap { };
 
-  msldap-bad = callPackage ../development/python-modules/msldap-bad { };
-
   mslex = callPackage ../development/python-modules/mslex { };
 
   msmart-ng = callPackage ../development/python-modules/msmart-ng { };
@@ -10384,12 +10447,7 @@ self: super: with self; {
 
   nclib = callPackage ../development/python-modules/nclib { };
 
-  ndcurves = toPythonModule (
-    pkgs.ndcurves.override {
-      python3Packages = self;
-      pythonSupport = true;
-    }
-  );
+  ndcurves = callPackage ../development/python-modules/ndcurves { inherit (pkgs) ndcurves; };
 
   ndeflib = callPackage ../development/python-modules/ndeflib { };
 
@@ -10602,6 +10660,8 @@ self: super: with self; {
 
   nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { };
 
+  nixpkgs-plugin-update = callPackage ../development/python-modules/nixpkgs-plugin-update { };
+
   nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };
 
   nixpkgs-updaters-library = callPackage ../development/python-modules/nixpkgs-updaters-library { };
@@ -10658,6 +10718,8 @@ self: super: with self; {
 
   noneprompt = callPackage ../development/python-modules/noneprompt { };
 
+  nonestorage = callPackage ../development/python-modules/nonestorage { };
+
   norfair = callPackage ../development/python-modules/norfair { };
 
   normality = callPackage ../development/python-modules/normality { };
@@ -10712,6 +10774,8 @@ self: super: with self; {
 
   ntc-templates = callPackage ../development/python-modules/ntc-templates { };
 
+  ntfy-webpush = callPackage ../development/python-modules/ntfy-webpush { };
+
   ntplib = callPackage ../development/python-modules/ntplib { };
 
   nuclear = callPackage ../development/python-modules/nuclear { };
@@ -10750,6 +10814,8 @@ self: super: with self; {
 
   numpy-stl = callPackage ../development/python-modules/numpy-stl { };
 
+  numpy-typing-compat = callPackage ../development/python-modules/numpy-typing-compat { };
+
   numpy_1 = callPackage ../development/python-modules/numpy/1.nix { };
 
   numpy_2 = callPackage ../development/python-modules/numpy/2.nix { };
@@ -10940,6 +11006,8 @@ self: super: with self; {
 
   oocsi = callPackage ../development/python-modules/oocsi { };
 
+  opack2 = callPackage ../development/python-modules/opack2 { };
+
   opaque = callPackage ../development/python-modules/opaque { };
 
   opcua-widgets = callPackage ../development/python-modules/opcua-widgets { };
@@ -11001,6 +11069,33 @@ self: super: with self; {
     }
   );
 
+  opencv4Full = toPythonModule (
+    pkgs.opencv4.override rec {
+      enablePython = true;
+      pythonPackages = self;
+      enableCuda = pkgs.config.cudaSupport;
+      enableCublas = enableCuda;
+      enableCudnn = enableCuda;
+      enableCufft = enableCuda;
+      enableLto = !stdenv.hostPlatform.isLinux; # https://github.com/NixOS/nixpkgs/issues/343123
+      enableUnfree = false; # prevents cache
+      enableIpp = true;
+      enableGtk2 = true;
+      enableGtk3 = true;
+      enableVtk = true;
+      enableFfmpeg = true;
+      enableGStreamer = true;
+      enableTesseract = true;
+      enableTbb = true;
+      enableOvis = true;
+      enableGPhoto2 = true;
+      enableDC1394 = true;
+      enableDocs = true;
+    }
+  );
+
+  opendal = callPackage ../development/python-modules/opendal { };
+
   openerz-api = callPackage ../development/python-modules/openerz-api { };
 
   openevsewifi = callPackage ../development/python-modules/openevsewifi { };
@@ -11429,6 +11524,8 @@ self: super: with self; {
 
   panphon = callPackage ../development/python-modules/panphon { };
 
+  panzi-json-logic = callPackage ../development/python-modules/panzi-json-logic { };
+
   paperbush = callPackage ../development/python-modules/paperbush { };
 
   papermill = callPackage ../development/python-modules/papermill { };
@@ -11451,6 +11548,8 @@ self: super: with self; {
 
   paramax = callPackage ../development/python-modules/paramax { };
 
+  parameter-decorators = callPackage ../development/python-modules/parameter-decorators { };
+
   parameter-expansion-patched =
     callPackage ../development/python-modules/parameter-expansion-patched
       { };
@@ -11493,6 +11592,8 @@ self: super: with self; {
 
   partd = callPackage ../development/python-modules/partd { };
 
+  partftpy = callPackage ../development/python-modules/partftpy { };
+
   partial-json-parser = callPackage ../development/python-modules/partial-json-parser { };
 
   particle = callPackage ../development/python-modules/particle { };
@@ -11728,6 +11829,8 @@ self: super: with self; {
 
   pgvector = callPackage ../development/python-modules/pgvector { };
 
+  phart = callPackage ../development/python-modules/phart { };
+
   phe = callPackage ../development/python-modules/phe { };
 
   phik = callPackage ../development/python-modules/phik { };
@@ -11840,12 +11943,7 @@ self: super: with self; {
 
   ping3 = callPackage ../development/python-modules/ping3 { };
 
-  pinocchio = toPythonModule (
-    pkgs.pinocchio.override {
-      pythonSupport = true;
-      python3Packages = self;
-    }
-  );
+  pinocchio = callPackage ../development/python-modules/pinocchio { inherit (pkgs) pinocchio; };
 
   pins = callPackage ../development/python-modules/pins { };
 
@@ -12000,8 +12098,6 @@ self: super: with self; {
 
   plumbum = callPackage ../development/python-modules/plumbum { };
 
-  plumlightpad = callPackage ../development/python-modules/plumlightpad { };
-
   pluthon = callPackage ../development/python-modules/pluthon { };
 
   plux = callPackage ../development/python-modules/plux { };
@@ -12157,6 +12253,8 @@ self: super: with self; {
 
   precisely = callPackage ../development/python-modules/precisely { };
 
+  prefect = toPythonModule pkgs.prefect;
+
   prefixed = callPackage ../development/python-modules/prefixed { };
 
   preggy = callPackage ../development/python-modules/preggy { };
@@ -12175,14 +12273,14 @@ self: super: with self; {
 
   prettytable = callPackage ../development/python-modules/prettytable { };
 
+  price-parser = callPackage ../development/python-modules/price-parser { };
+
   primecountpy = callPackage ../development/python-modules/primecountpy { };
 
   primepy = callPackage ../development/python-modules/primepy { };
 
   primer3 = callPackage ../development/python-modules/primer3 { };
 
-  primp = callPackage ../development/python-modules/primp { };
-
   print-color = callPackage ../development/python-modules/print-color { };
 
   priority = callPackage ../development/python-modules/priority { };
@@ -12287,10 +12385,6 @@ self: super: with self; {
 
   protonup-ng = callPackage ../development/python-modules/protonup-ng { };
 
-  protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {
-    pkgs-systemd = pkgs.systemd;
-  };
-
   prov = callPackage ../development/python-modules/prov { };
 
   prox-tv = callPackage ../development/python-modules/prox-tv { };
@@ -12304,13 +12398,6 @@ self: super: with self; {
     }
   );
 
-  proxsuite-nlp = toPythonModule (
-    pkgs.proxsuite-nlp.override {
-      pythonSupport = true;
-      python3Packages = self;
-    }
-  );
-
   proxy-db = callPackage ../development/python-modules/proxy-db { };
 
   proxy-py = callPackage ../development/python-modules/proxy-py { };
@@ -12620,6 +12707,8 @@ self: super: with self; {
 
   pyannote-pipeline = callPackage ../development/python-modules/pyannote-pipeline { };
 
+  pyannoteai-sdk = callPackage ../development/python-modules/pyannoteai-sdk { };
+
   pyaprilaire = callPackage ../development/python-modules/pyaprilaire { };
 
   pyarlo = callPackage ../development/python-modules/pyarlo { };
@@ -12734,8 +12823,6 @@ self: super: with self; {
 
   pycatch22 = callPackage ../development/python-modules/pycatch22 { };
 
-  pycategories = callPackage ../development/python-modules/pycategories { };
-
   pycayennelpp = callPackage ../development/python-modules/pycayennelpp { };
 
   pycddl = callPackage ../development/python-modules/pycddl { };
@@ -12810,6 +12897,8 @@ self: super: with self; {
 
   pycparser = callPackage ../development/python-modules/pycparser { };
 
+  pycrashreport = callPackage ../development/python-modules/pycrashreport { };
+
   pycrc = callPackage ../development/python-modules/pycrc { };
 
   pycrdt = callPackage ../development/python-modules/pycrdt { };
@@ -12844,6 +12933,8 @@ self: super: with self; {
 
   pycycling = callPackage ../development/python-modules/pycycling { };
 
+  pycync = callPackage ../development/python-modules/pycync { };
+
   pycyphal = callPackage ../development/python-modules/pycyphal { };
 
   pydaikin = callPackage ../development/python-modules/pydaikin { };
@@ -12938,6 +13029,8 @@ self: super: with self; {
 
   pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
 
+  pydroplet = callPackage ../development/python-modules/pydroplet { };
+
   pydruid = callPackage ../development/python-modules/pydruid { };
 
   pydsdl = callPackage ../development/python-modules/pydsdl { };
@@ -13056,6 +13149,8 @@ self: super: with self; {
 
   pyfiglet = callPackage ../development/python-modules/pyfiglet { };
 
+  pyfirefly = callPackage ../development/python-modules/pyfirefly { };
+
   pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
 
   pyflakes = callPackage ../development/python-modules/pyflakes { };
@@ -13144,7 +13239,17 @@ self: super: with self; {
 
   pyglm = callPackage ../development/python-modules/pyglm { };
 
-  pygls = callPackage ../development/python-modules/pygls { };
+  pyglossary = callPackage ../development/python-modules/pyglossary { };
+
+  pygls = pygls_1;
+
+  pygls_1 = callPackage ../development/python-modules/pygls/1.nix {
+    lsprotocol = lsprotocol_2023;
+  };
+
+  pygls_2 = callPackage ../development/python-modules/pygls/2.nix {
+    lsprotocol = lsprotocol_2025;
+  };
 
   pygltflib = callPackage ../development/python-modules/pygltflib { };
 
@@ -13164,6 +13269,8 @@ self: super: with self; {
 
   pygnmi = callPackage ../development/python-modules/pygnmi { };
 
+  pygnuutils = callPackage ../development/python-modules/pygnuutils { };
+
   pygobject-stubs = callPackage ../development/python-modules/pygobject-stubs { };
 
   pygobject3 = callPackage ../development/python-modules/pygobject/3.nix {
@@ -13193,6 +13300,8 @@ self: super: with self; {
 
   pygtrie = callPackage ../development/python-modules/pygtrie { };
 
+  pyhacrf-datamade = callPackage ../development/python-modules/pyhacrf-datamade { };
+
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
 
   pyhanko = callPackage ../development/python-modules/pyhanko { };
@@ -13243,6 +13352,8 @@ self: super: with self; {
 
   pyicumessageformat = callPackage ../development/python-modules/pyicumessageformat { };
 
+  pyimg4 = callPackage ../development/python-modules/pyimg4 { };
+
   pyimgbox = callPackage ../development/python-modules/pyimgbox { };
 
   pyimpfuzzy = callPackage ../development/python-modules/pyimpfuzzy { inherit (pkgs) ssdeep; };
@@ -13319,6 +13430,8 @@ self: super: with self; {
 
   pykcs11 = callPackage ../development/python-modules/pykcs11 { };
 
+  pykdebugparser = callPackage ../development/python-modules/pykdebugparser { };
+
   pykdl = callPackage ../development/python-modules/pykdl { };
 
   pykdtree = callPackage ../development/python-modules/pykdtree {
@@ -13471,6 +13584,8 @@ self: super: with self; {
 
   pylzma = callPackage ../development/python-modules/pylzma { };
 
+  pylzss = callPackage ../development/python-modules/pylzss { };
+
   pym3u8downloader = callPackage ../development/python-modules/pym3u8downloader { };
 
   pymacaroons = callPackage ../development/python-modules/pymacaroons { };
@@ -13547,6 +13662,8 @@ self: super: with self; {
 
   pymitv = callPackage ../development/python-modules/pymitv { };
 
+  pymobiledevice3 = callPackage ../development/python-modules/pymobiledevice3 { };
+
   pymochad = callPackage ../development/python-modules/pymochad { };
 
   pymodbus = callPackage ../development/python-modules/pymodbus { };
@@ -13637,6 +13754,8 @@ self: super: with self; {
 
   pynina = callPackage ../development/python-modules/pynina { };
 
+  pynintendoparental = callPackage ../development/python-modules/pynintendoparental { };
+
   pynipap = callPackage ../development/python-modules/pynipap { };
 
   pynisher = callPackage ../development/python-modules/pynisher { };
@@ -13705,6 +13824,8 @@ self: super: with self; {
 
   pyomo = callPackage ../development/python-modules/pyomo { };
 
+  pyopen-wakeword = callPackage ../development/python-modules/pyopen-wakeword/default.nix { };
+
   pyopencl = callPackage ../development/python-modules/pyopencl { };
 
   pyopengl = callPackage ../development/python-modules/pyopengl {
@@ -13757,8 +13878,6 @@ self: super: with self; {
 
   pyowm = callPackage ../development/python-modules/pyowm { };
 
-  pyownet = callPackage ../development/python-modules/pyownet { };
-
   pyoxigraph = callPackage ../development/python-modules/pyoxigraph { };
 
   pypager = callPackage ../development/python-modules/pypager { };
@@ -13848,6 +13967,8 @@ self: super: with self; {
 
   pyppeteer = callPackage ../development/python-modules/pyppeteer { };
 
+  pyppeteer-ng = callPackage ../development/python-modules/pyppeteer-ng { };
+
   pyppmd = callPackage ../development/python-modules/pyppmd { };
 
   pyprecice = callPackage ../development/python-modules/pyprecice {
@@ -14351,6 +14472,8 @@ self: super: with self; {
 
   pysqueezebox = callPackage ../development/python-modules/pysqueezebox { };
 
+  pysrdaligateway = callPackage ../development/python-modules/pysrdaligateway { };
+
   pysrim = callPackage ../development/python-modules/pysrim { };
 
   pysrt = callPackage ../development/python-modules/pysrt { };
@@ -14436,6 +14559,8 @@ self: super: with self; {
 
   pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
 
+  pytest-aioresponses = callPackage ../development/python-modules/pytest-aioresponses { };
+
   pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
 
   pytest-ansible = callPackage ../development/python-modules/pytest-ansible { };
@@ -14456,16 +14581,6 @@ self: super: with self; {
 
   pytest-asyncio_0 = callPackage ../development/python-modules/pytest-asyncio/0.nix { };
 
-  pytest-asyncio_0_21 = pytest-asyncio.overridePythonAttrs (old: rec {
-    version = "0.21.2";
-    src = pkgs.fetchFromGitHub {
-      owner = "pytest-dev";
-      repo = "pytest-asyncio";
-      rev = "refs/tags/v${version}";
-      hash = "sha256-AVVvdo/CDF9IU6l779sLc7wKz5h3kzMttdDNTPLYxtQ=";
-    };
-  });
-
   pytest-base-url = callPackage ../development/python-modules/pytest-base-url { };
 
   pytest-bdd = callPackage ../development/python-modules/pytest-bdd { };
@@ -14784,8 +14899,6 @@ self: super: with self; {
 
   python-box = callPackage ../development/python-modules/python-box { };
 
-  python-bring-api = callPackage ../development/python-modules/python-bring-api { };
-
   python-bsblan = callPackage ../development/python-modules/python-bsblan { };
 
   python-bugzilla = callPackage ../development/python-modules/python-bugzilla { };
@@ -14796,6 +14909,8 @@ self: super: with self; {
 
   python-cinderclient = callPackage ../development/python-modules/python-cinderclient { };
 
+  python-citybikes = callPackage ../development/python-modules/python-citybikes { };
+
   python-clementine-remote = callPackage ../development/python-modules/python-clementine-remote { };
 
   python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };
@@ -14936,6 +15051,8 @@ self: super: with self; {
 
   python-json-logger = callPackage ../development/python-modules/python-json-logger { };
 
+  python-jsonpath = callPackage ../development/python-modules/python-jsonpath { };
+
   python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { };
 
   python-juicenet = callPackage ../development/python-modules/python-juicenet { };
@@ -15092,6 +15209,8 @@ self: super: with self; {
 
   python-path = callPackage ../development/python-modules/python-path { };
 
+  python-pcapng = callPackage ../development/python-modules/python-pcapng { };
+
   python-periphery = callPackage ../development/python-modules/python-periphery { };
 
   python-picnic-api2 = callPackage ../development/python-modules/python-picnic-api2 { };
@@ -15190,8 +15309,6 @@ self: super: with self; {
 
   python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { };
 
-  python-u2flib-server = callPackage ../development/python-modules/python-u2flib-server { };
-
   python-uinput = callPackage ../development/python-modules/python-uinput { };
 
   python-ulid = callPackage ../development/python-modules/python-ulid { };
@@ -15346,6 +15463,8 @@ self: super: with self; {
 
   pytun = callPackage ../development/python-modules/pytun { };
 
+  pytun-pmd3 = callPackage ../development/python-modules/pytun-pmd3 { };
+
   pyturbojpeg = callPackage ../development/python-modules/pyturbojpeg { };
 
   pytweening = callPackage ../development/python-modules/pytweening { };
@@ -15426,8 +15545,6 @@ self: super: with self; {
 
   pyvolumio = callPackage ../development/python-modules/pyvolumio { };
 
-  pyvoro = callPackage ../development/python-modules/pyvoro { };
-
   pyvows = callPackage ../development/python-modules/pyvows { };
 
   pyw215 = callPackage ../development/python-modules/pyw215 { };
@@ -15712,8 +15829,6 @@ self: super: with self; {
 
   ramlfications = callPackage ../development/python-modules/ramlfications { };
 
-  random-user-agent = callPackage ../development/python-modules/random-user-agent { };
-
   random2 = callPackage ../development/python-modules/random2 { };
 
   randomfiletree = callPackage ../development/python-modules/randomfiletree { };
@@ -15861,6 +15976,8 @@ self: super: with self; {
 
   reflink = callPackage ../development/python-modules/reflink { };
 
+  reflink-copy = callPackage ../development/python-modules/reflink-copy { };
+
   refoss-ha = callPackage ../development/python-modules/refoss-ha { };
 
   regenmaschine = callPackage ../development/python-modules/regenmaschine { };
@@ -15891,10 +16008,14 @@ self: super: with self; {
 
   remotezip = callPackage ../development/python-modules/remotezip { };
 
+  remotezip2 = callPackage ../development/python-modules/remotezip2 { };
+
   renault-api = callPackage ../development/python-modules/renault-api { };
 
   rencode = callPackage ../development/python-modules/rencode { };
 
+  rendercanvas = callPackage ../development/python-modules/rendercanvas { };
+
   rendercv-fonts = callPackage ../development/python-modules/rendercv-fonts { };
 
   reno = callPackage ../development/python-modules/reno { };
@@ -16218,6 +16339,8 @@ self: super: with self; {
 
   rosbags = callPackage ../development/python-modules/rosbags { };
 
+  rospkg = callPackage ../development/python-modules/rospkg { };
+
   rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { };
 
   rouge-score = callPackage ../development/python-modules/rouge-score { };
@@ -16456,8 +16579,6 @@ self: super: with self; {
 
   schema-salad = callPackage ../development/python-modules/schema-salad { };
 
-  schemainspect = callPackage ../development/python-modules/schemainspect { };
-
   schemdraw = callPackage ../development/python-modules/schemdraw { };
 
   schiene = callPackage ../development/python-modules/schiene { };
@@ -16850,6 +16971,8 @@ self: super: with self; {
 
   simplebayes = callPackage ../development/python-modules/simplebayes { };
 
+  simplecosine = callPackage ../development/python-modules/simplecosine { };
+
   simpleeval = callPackage ../development/python-modules/simpleeval { };
 
   simplefin4py = callPackage ../development/python-modules/simplefin4py { };
@@ -17176,6 +17299,8 @@ self: super: with self; {
 
   solaredge-local = callPackage ../development/python-modules/solaredge-local { };
 
+  solaredge-web = callPackage ../development/python-modules/solaredge-web { };
+
   solarlog-cli = callPackage ../development/python-modules/solarlog-cli { };
 
   solax = callPackage ../development/python-modules/solax { };
@@ -17540,8 +17665,6 @@ self: super: with self; {
 
   sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { };
 
-  sqlbag = callPackage ../development/python-modules/sqlbag { };
-
   sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { };
 
   sqlcipher3-binary = callPackage ../development/python-modules/sqlcipher3-binary { };
@@ -17624,6 +17747,8 @@ self: super: with self; {
 
   sslib = callPackage ../development/python-modules/sslib { };
 
+  sslpsk-pmd3 = callPackage ../development/python-modules/sslpsk-pmd3 { };
+
   ssort = callPackage ../development/python-modules/ssort { };
 
   sss = callPackage ../development/python-modules/sss { };
@@ -17662,6 +17787,12 @@ self: super: with self; {
   standard-pipes =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null;
 
+  standard-sndhdr =
+    if pythonAtLeast "3.13" then
+      callPackage ../development/python-modules/standard-sndhdr { }
+    else
+      null;
+
   standard-sunau =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-sunau { } else null;
 
@@ -17933,6 +18064,8 @@ self: super: with self; {
 
   swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { };
 
+  swagger-ui-py = callPackage ../development/python-modules/swagger-ui-py { };
+
   swcgeom = callPackage ../development/python-modules/swcgeom { };
 
   swh-auth = callPackage ../development/python-modules/swh-auth { };
@@ -17953,6 +18086,8 @@ self: super: with self; {
 
   swh-scheduler = callPackage ../development/python-modules/swh-scheduler { };
 
+  swh-shard = callPackage ../development/python-modules/swh-shard { };
+
   swh-storage = callPackage ../development/python-modules/swh-storage { };
 
   swh-web-client = callPackage ../development/python-modules/swh-web-client { };
@@ -18088,7 +18223,12 @@ self: super: with self; {
   tblib = callPackage ../development/python-modules/tblib { };
 
   tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix {
-    inherit (pkgs) tblite meson simple-dftd3;
+    inherit (pkgs)
+      tblite
+      meson
+      simple-dftd3
+      dftd4
+      ;
   };
 
   tbm-utils = callPackage ../development/python-modules/tbm-utils { };
@@ -18509,8 +18649,11 @@ self: super: with self; {
       null
     else
       callPackage ../development/python-modules/tkinter {
-        tcl = pkgs.tcl-9_0;
-        tk = pkgs.tk-9_0;
+        # Tcl/Tk 9.0 support in Tkinter is not quite ready yet:
+        # - https://github.com/python/cpython/issues/124111
+        # - https://github.com/python/cpython/issues/104568
+        tcl = pkgs.tcl-8_6;
+        tk = pkgs.tk-8_6;
       };
 
   tkinter-gl = callPackage ../development/python-modules/tkinter-gl { };
@@ -18614,6 +18757,8 @@ self: super: with self; {
 
   torchbench = callPackage ../development/python-modules/torchbench { };
 
+  torchcodec = callPackage ../development/python-modules/torchcodec { };
+
   torchcrepe = callPackage ../development/python-modules/torchcrepe { };
 
   torchdiffeq = callPackage ../development/python-modules/torchdiffeq { };
@@ -18773,16 +18918,14 @@ self: super: with self; {
 
   tree-sitter-yaml = callPackage ../development/python-modules/tree-sitter-yaml { };
 
+  tree-sitter-zeek = callPackage ../development/python-modules/tree-sitter-zeek { };
+
   treelib = callPackage ../development/python-modules/treelib { };
 
   treelog = callPackage ../development/python-modules/treelog { };
 
-  treeo = callPackage ../development/python-modules/treeo { };
-
   treescope = callPackage ../development/python-modules/treescope { };
 
-  treex = callPackage ../development/python-modules/treex { };
-
   treq = callPackage ../development/python-modules/treq { };
 
   trevorproxy = callPackage ../development/python-modules/trevorproxy { };
@@ -18850,12 +18993,7 @@ self: super: with self; {
 
   tsfresh = callPackage ../development/python-modules/tsfresh { };
 
-  tsid = toPythonModule (
-    pkgs.tsid.override {
-      pythonSupport = true;
-      python3Packages = self;
-    }
-  );
+  tsid = callPackage ../development/python-modules/tsid { inherit (pkgs) tsid; };
 
   tskit = callPackage ../development/python-modules/tskit { };
 
@@ -19499,6 +19637,8 @@ self: super: with self; {
 
   uharfbuzz = callPackage ../development/python-modules/uharfbuzz { };
 
+  uhashring = callPackage ../development/python-modules/uhashring { };
+
   uhi = callPackage ../development/python-modules/uhi { };
 
   uiprotect = callPackage ../development/python-modules/uiprotect { };
@@ -19563,6 +19703,8 @@ self: super: with self; {
 
   unidiff = callPackage ../development/python-modules/unidiff { };
 
+  unidns = callPackage ../development/python-modules/unidns { };
+
   unifi-ap = callPackage ../development/python-modules/unifi-ap { };
 
   unifi-discovery = callPackage ../development/python-modules/unifi-discovery { };
@@ -19807,6 +19949,8 @@ self: super: with self; {
 
   vharfbuzz = callPackage ../development/python-modules/vharfbuzz { };
 
+  victron-vrm = callPackage ../development/python-modules/victron-vrm { };
+
   videocr = callPackage ../development/python-modules/videocr { };
 
   vidstab = callPackage ../development/python-modules/vidstab { };
@@ -19966,7 +20110,10 @@ self: super: with self; {
 
   warlock = callPackage ../development/python-modules/warlock { };
 
-  warp-lang = callPackage ../development/python-modules/warp-lang { };
+  warp-lang = callPackage ../development/python-modules/warp-lang {
+    stdenv = if stdenv.hostPlatform.isDarwin then pkgs.llvmPackages_19.stdenv else pkgs.stdenv;
+    llvmPackages = pkgs.llvmPackages_19;
+  };
 
   warrant = callPackage ../development/python-modules/warrant { };
 
@@ -19981,7 +20128,7 @@ self: super: with self; {
     wasmer-compiler-singlepass
     ;
 
-  wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { });
+  wasmerPackages = lib.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { });
 
   wasserstein = callPackage ../development/python-modules/wasserstein { };
 
@@ -20210,8 +20357,6 @@ self: super: with self; {
 
   world-bank-data = callPackage ../development/python-modules/world-bank-data { };
 
-  worldengine = callPackage ../development/python-modules/worldengine { };
-
   wrapcco = callPackage ../development/python-modules/wrapcco { };
 
   wrapio = callPackage ../development/python-modules/wrapio { };
@@ -20306,6 +20451,8 @@ self: super: with self; {
 
   xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { });
 
+  xeger = callPackage ../development/python-modules/xeger { };
+
   xen = toPythonModule (pkgs.xen.override { python3Packages = self; });
 
   xformers = callPackage ../development/python-modules/xformers {
@@ -20466,6 +20613,8 @@ self: super: with self; {
 
   yattag = callPackage ../development/python-modules/yattag { };
 
+  yaxmldiff = callPackage ../development/python-modules/yaxmldiff { };
+
   ydata-profiling = callPackage ../development/python-modules/ydata-profiling { };
 
   ydiff = callPackage ../development/python-modules/ydiff { };
@@ -20654,6 +20803,8 @@ self: super: with self; {
 
   zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { };
 
+  zope-index = callPackage ../development/python-modules/zope-index { };
+
   zope-interface = callPackage ../development/python-modules/zope-interface { };
 
   zope-lifecycleevent = callPackage ../development/python-modules/zope-lifecycleevent { };
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index c70f900e794b..73baf1bc0cc0 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -92,8 +92,6 @@ makeScopeWithSplicing' {
 
         kdsoap = callPackage ../development/libraries/kdsoap { };
 
-        kf5gpgmepp = callPackage ../development/libraries/kf5gpgmepp { };
-
         kirigami-addons = libsForQt5.callPackage ../development/libraries/kirigami-addons { };
 
         kimageannotator = callPackage ../development/libraries/kimageannotator { };
@@ -225,6 +223,12 @@ makeScopeWithSplicing' {
 
         xp-pen-deco-01-v2-driver = callPackage ../os-specific/linux/xp-pen-drivers/deco-01-v2 { };
       }
+      // lib.optionalAttrs config.allowAliases {
+        kf5gpgmepp = throw ''
+          'libsForQt5.kf5gpgmepp' has been removed because it has been unmaintained upstream since 2017.
+          Consider switching to the gpgmepp included in gpgme (gpgme <2), or to the GnuPG fork of gpgmepp (gpgme 2+), instead.
+        ''; # Added 2025-10-25
+      }
     ))
   );
 }
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 6aae3abf5efd..1f47e74579e3 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -151,8 +151,6 @@ makeScopeWithSplicing' {
       waylib = callPackage ../development/libraries/waylib { };
 
       wayqt = callPackage ../development/libraries/wayqt { };
-
-      xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
     }
   );
 }
diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index a008444caa58..9ca2ab7dc30f 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -2,10 +2,7 @@
     Test CUDA packages.
 
     This release file is currently not tested on hydra.nixos.org
-    because it requires unfree software, but it is tested by
-    https://hydra.nix-community.org/jobset/nixpkgs/cuda-nixos-unstable.
-
-    Cf. https://github.com/nix-community/infra/pull/1335
+    because it requires unfree software.
 
     Test for example like this:
 
@@ -92,12 +89,14 @@ let
       firefox-beta-unwrapped = linux;
       firefox-devedition = linux;
       firefox-devedition-unwrapped = linux;
+      freecad = linux;
       gimp = linux;
       gimp3 = linux;
       gpu-screen-recorder = linux;
       gst_all_1.gst-plugins-bad = linux;
       jellyfin-ffmpeg = linux;
       kdePackages.kdenlive = linux;
+      krita = linux;
       lightgbm = linux;
       llama-cpp = linux;
       meshlab = linux;
@@ -146,6 +145,7 @@ let
         triton = linux;
         openai-whisper = linux;
         opencv4 = linux;
+        opencv4Full = linux;
         opensfm = linux;
         pycuda = linux;
         pymc = linux;
diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix
index 5013bf119de8..f803f7f47dc3 100644
--- a/pkgs/top-level/release-haskell.nix
+++ b/pkgs/top-level/release-haskell.nix
@@ -66,10 +66,8 @@ let
     ghc948
     ghc967
     ghc984
-    ghc9101
     ghc9102
     ghc9103
-    # exclude ghc9121 due to severe miscompilation bug
     ghc9122
   ];
 
@@ -232,8 +230,9 @@ let
       tests.haskell = packagePlatforms pkgs.tests.haskell;
 
       nixosTests = {
+        agda = packagePlatforms pkgs.nixosTests.agda;
+
         inherit (packagePlatforms pkgs.nixosTests)
-          agda
           kmonad
           xmonad
           xmonad-xdg-autostart
@@ -255,9 +254,10 @@ let
         cachix
         # carp broken on 2024-04-09
         changelog-d
-        cornelis
         cedille
         client-ip-echo
+        cornelis
+        codd
         darcs
         dconf2nix
         dhall
@@ -271,7 +271,6 @@ let
         diagrams-builder
         echidna
         elm2nix
-        emanote
         fffuu
         futhark
         ghcid
@@ -317,7 +316,6 @@ let
         nix-output-monitor
         nix-script
         nix-tree
-        nixfmt-classic
         nixfmt
         nota
         nvfetcher
@@ -541,7 +539,6 @@ let
       ] released;
       Cabal_3_10_3_0 = lib.subtractLists [
         # time < 1.13 conflicts with time == 1.14.*
-        compilerNames.ghc9121
         compilerNames.ghc9122
       ] released;
       Cabal_3_12_1_0 = released;
@@ -552,14 +549,12 @@ let
       funcmp = released;
       git-annex = [
         # for 9.10, test that using filepath (instead of filepath-bytestring) works.
-        compilerNames.ghc9101
         compilerNames.ghc9102
         compilerNames.ghc9103
       ];
       haskell-language-server = released;
       hoogle = released;
       hlint = lib.subtractLists [
-        compilerNames.ghc9101
         compilerNames.ghc9102
         compilerNames.ghc9103
         compilerNames.ghc9122
@@ -587,7 +582,6 @@ let
         compilerNames.ghc967
       ];
       weeder = lib.subtractLists [
-        compilerNames.ghc9101
         compilerNames.ghc9102
         compilerNames.ghc9103
         compilerNames.ghc9122
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index c7d5252f4966..db6955850668 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -154,7 +154,6 @@ let
             jobs.gimp2.x86_64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved
             jobs.emacs.x86_64-darwin
             jobs.wireshark.x86_64-darwin
-            jobs.transmission_3-gtk.x86_64-darwin
             jobs.transmission_4-gtk.x86_64-darwin
 
             # Tests
@@ -198,7 +197,6 @@ let
             jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved
             jobs.emacs.aarch64-darwin
             jobs.wireshark.aarch64-darwin
-            jobs.transmission_3-gtk.aarch64-darwin
             jobs.transmission_4-gtk.aarch64-darwin
 
             # Tests
@@ -363,7 +361,6 @@ let
           packages =
             genAttrs
               [
-                "ghc94"
                 "ghc96"
                 "ghc98"
                 "ghc910"
@@ -397,9 +394,6 @@ let
           "aarch64-linux"
         ];
 
-        # Fails CI in its current state
-        ocamlPackages = { };
-
         pkgsRocm = pkgs.rocmPackages.meta.release-packagePlatforms;
       };
       mapTestOn-packages = if attrNamesOnly then packageJobs else mapTestOn packageJobs;
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 1d84b16196f1..a4fc9459776b 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -5,7 +5,6 @@
   fetchzip,
   callPackage,
   newScope,
-  recurseIntoAttrs,
   ocamlPackages_4_14,
   fetchpatch,
   makeWrapper,
@@ -93,6 +92,6 @@ rec {
   rocqPackages_9_0 = mkRocqPackages rocq-core_9_0;
   rocqPackages_9_1 = mkRocqPackages rocq-core_9_1;
 
-  rocqPackages = recurseIntoAttrs rocqPackages_9_0;
+  rocqPackages = lib.recurseIntoAttrs rocqPackages_9_0;
   rocq-core = rocqPackages.rocq-core;
 }
diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 7d5d53b82af6..0c1aa36b17ae 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -3701,10 +3701,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af";
+      sha256 = "103h6wjpcqp3i034hi44za2v365yz7qk9s5df8lmasq43nqvkbmp";
       type = "gem";
     };
-    version = "4.1.1";
+    version = "4.2.1";
   };
   singleton = {
     groups = [ "default" ];
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index fe4566bb175e..66721e3bee56 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -17,48 +17,30 @@
 lib: pkgs: actuallySplice:
 
 let
+  inherit (lib.customisation) mapCrossIndex renameCrossIndexFrom;
 
   spliceReal =
-    {
-      pkgsBuildBuild,
-      pkgsBuildHost,
-      pkgsBuildTarget,
-      pkgsHostHost,
-      pkgsHostTarget,
-      pkgsTargetTarget,
-    }:
+    inputs:
     let
       mash =
         # Other pkgs sets
-        pkgsBuildBuild
-        // pkgsBuildTarget
-        // pkgsHostHost
-        // pkgsTargetTarget
+        inputs.buildBuild
+        // inputs.buildTarget
+        // inputs.hostHost
+        // inputs.targetTarget
         # The same pkgs sets one probably intends
-        // pkgsBuildHost
-        // pkgsHostTarget;
+        // inputs.buildHost
+        // inputs.hostTarget;
       merge = name: {
         inherit name;
         value =
           let
             defaultValue = mash.${name};
             # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
-            valueBuildBuild = pkgsBuildBuild.${name} or { };
-            valueBuildHost = pkgsBuildHost.${name} or { };
-            valueBuildTarget = pkgsBuildTarget.${name} or { };
-            valueHostHost = pkgsHostHost.${name} or { };
-            valueHostTarget = pkgsHostTarget.${name} or { };
-            valueTargetTarget = pkgsTargetTarget.${name} or { };
+            value' = mapCrossIndex (x: x.${name} or { }) inputs;
+
             augmentedValue = defaultValue // {
-              __spliced =
-                (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
-                // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
-                // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
-                // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
-                // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
-                // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) {
-                  targetTarget = valueTargetTarget;
-                });
+              __spliced = lib.filterAttrs (k: v: inputs.${k} ? ${name}) value';
             };
             # Get the set of outputs of a derivation. If one derivation fails to
             # evaluate we don't want to diverge the entire splice, so we fall back
@@ -76,27 +58,12 @@ let
           # on to splice them together.
           if lib.isDerivation defaultValue then
             augmentedValue
-            // spliceReal {
-              pkgsBuildBuild = tryGetOutputs valueBuildBuild;
-              pkgsBuildHost = tryGetOutputs valueBuildHost;
-              pkgsBuildTarget = tryGetOutputs valueBuildTarget;
-              pkgsHostHost = tryGetOutputs valueHostHost;
-              pkgsHostTarget = getOutputs valueHostTarget;
-              pkgsTargetTarget = tryGetOutputs valueTargetTarget;
-              # Just recur on plain attrsets
-            }
+            // spliceReal (mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; })
           else if lib.isAttrs defaultValue then
-            spliceReal {
-              pkgsBuildBuild = valueBuildBuild;
-              pkgsBuildHost = valueBuildHost;
-              pkgsBuildTarget = valueBuildTarget;
-              pkgsHostHost = valueHostHost;
-              pkgsHostTarget = valueHostTarget;
-              pkgsTargetTarget = valueTargetTarget;
-              # Don't be fancy about non-derivations. But we could have used used
-              # `__functor__` for functions instead.
-            }
+            spliceReal value'
           else
+            # Don't be fancy about non-derivations. But we could have used used
+            # `__functor__` for functions instead.
             defaultValue;
       };
     in
@@ -111,7 +78,7 @@ let
       pkgsHostTarget,
       pkgsTargetTarget,
     }@args:
-    if actuallySplice then spliceReal args else pkgsHostTarget;
+    if actuallySplice then spliceReal (renameCrossIndexFrom "pkgs" args) else pkgsHostTarget;
 
   splicedPackages =
     splicePackages {
@@ -173,6 +140,8 @@ in
 
   newScope = extra: lib.callPackageWith (pkgsForCall // extra);
 
+  pkgs = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
+
   # prefill 2 fields of the function for convenience
   makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
   makeScopeWithSplicing' = lib.makeScopeWithSplicing' {
diff --git a/pkgs/top-level/variants.nix b/pkgs/top-level/variants.nix
index ea288206dfbc..e3a12fcadcf5 100644
--- a/pkgs/top-level/variants.nix
+++ b/pkgs/top-level/variants.nix
@@ -165,6 +165,7 @@ self: super: {
               "nostrictaliasing"
               "pacret"
               "glibcxxassertions"
+              "libcxxhardeningfast"
               "trivialautovarinit"
             ]
           ) super'.stdenv;